Request 5248 (accepted)

obs-studio.changes Changed

@@ -1,4 +1,442 @@
 -------------------------------------------------------------------
+Mon Sep 28 16:27:40 UTC 2020 - jimmy@boombatower.com
+
+- Update to version 26.0.0:
+  * libobs: Update version to 26.0.0
+  * Fix translator names
+  * Update translations from Crowdin
+  * UI: Clarify system tray code
+  * UI: Fix formatting
+  * UI: Miscellaneous code cleanups
+  * UI: Fix "Add [transition]" not being translated
+  * UI: Add translation for "Add [x]"
+  * UI: Always parse log contents for Log Viewer as UTF-8
+  * v4l2-linux: Fix fourcc order
+  * v4l2-linux: Fix nv12 linesize
+  * UI: Fix screenshots preventing auto-remux
+  * UI: Use correct APPDATA for installer
+  * UI: Various installer script updates
+  * rtmp-services: Updatge Vaughn Live / iNSTAGIB & Breakers
+  * deps/media-playback: Fix time at non-standard speeds
+  * libobs: Check if output active when setting encoders
+  * frontend-tools: Free xdisplay on Linux auto scene switcher
+  * UI: Add file-in-use check for virtualcam module dlls
+  * rtmp-services: Added Mux to services.json
+  * UI: Create output before calling start stream event
+  * UI: Do not always have log viewer loaded
+  * win-dshow: Set current working directory in VirtualCam scripts
+  * linux-v4l2: Fix boolean and menu control types
+  * UI: Fix certain buttons turning up white in dark theme
+  * obs-scripting: Fix script_path() python mem corruption
+  * UI:Fix crash on log upload
+  * CI: Update notarisation process for Github CI
+  * obs-ffmpeg: Add missing translable string for "Profile"
+  * CI: Sign and notarize macOS builds on new tags
+  * win-capture: Increment graphics hook version
+  * CI: Fix Azure macOS pipeline to use new build script
+  * obs-filters: Remove unnecessary files
+  * obs-filters: Use builtin rnnoise dep if not found
+  * CI: Bump macOS-deps version to include rnnoise
+  * obs-ffmpeg: fix crash with rawvideo
+  * UI: Fix recording check when using url output
+  * CMake: Set PIC for all library targets
+  * UI: Unset bandwidth test on non-Twitch service / disconnect
+  * UI: Don't warn about bandwidth test mode if not authed
+  * rtmp-services: Add SHOWROOM
+  * win-capture: Improve game capture messages
+  * deps/media-playback: Fix fast-forward after reset
+  * win-dshow: Fix bug determining closest audio config
+  * UI: Fix vcam button not changing colors when checked
+  * UI: Replace/simplify device toolbar
+  * win-dshow: Add "activate" proc to proc handler
+  * win-dshow: Fix 24bit audio not being detected correctly
+  * win-dshow: Fix AJA devices crashing
+  * UI: Remove duplicate media timer code
+  * libobs: Deprecate service multitrack check
+  * deps/media-playback: Fix pause continually running loop
+  * UI: Remove redundant word
+  * enc-amf: Update AMD encoder submodule
+  * UI: Fix scene tree event handling
+  * Update VIDEO_CS_DEFAULT to mean 709 instead of 601
+  * win-dshow: Add VirtualCam installer scripts
+  * cmake: Add function for installing data from abs path
+  * win-dshow: Use cmake-based GUID for virtualcam
+  * UI: Ensure tray icon is themed in all cases
+  * UI: Change the default color setting in the UI from sRGB to 709
+  * UI: Refine context bar
+  * UI: Allow adjusting media slider with arrow buttons
+  * UI: Use correct constant for CryptDecodeObjectEx
+  * libobs/media-io: Fix suspicious memset behavior
+  * UI: Set restart state when there is no media
+  * UI: Make SetupOutputs virtual instead of ignoring vcam
+  * UI: Save Freetype Text source color from Source Toolbar
+  * win-capture: Put window capture update data in a mutex
+  * UI: Fix auto-remux not working w/ slash filesnames
+  * UI: Do not show tray icon if not active
+  * UI: Do not show media controls on network media source
+  * UI: Fix crash when starting vcam before other outputs
+  * UI: Fix maximum size on image source toolbar
+  * UI: Fix source toolbar color selection on color source
+  * UI: Fix studio mode load bug
+  * UI: Fix rec time left not showing in stats
+  * vlc-video: Fix format conversion typos
+  * UI: Fix memory leak when dropping files
+  * UI: Fix source ref bug causing crash on exit
+  * mac-capture: Filter non-trivial windows
+  * win-capture: Fix Vulkan crash on minimize restore
+  * win-capture: Add Vulkan instance creation fallback
+  * win-capture: Vulkan variable naming consistency
+  * UI: Fix compiler warning about needing parenthesis
+  * docs/sphinx: Fix mismatched typedefs
+  * docs/sphinx: Fix incorrect callback information
+  * CI: Remove clang format Mac check
+  * win-dshow: Add file description for virtual camera DLL
+  * obs-vst: Support older Qt versions
+  * win-dshow: Use constant reference for virtualcam CLSID
+  * win-dshow: Reduce size of virtualcam placeholder image
+  * libobs: Check data validity for media sources
+  * vlc-video: Fix possible undefined behavior in format conversion
+  * obs-vst: Fix VST detection in home directory on Linux
+  * obs-browser: Update to 2.8.7
+  * CI: Update macOS deps to fix crash from invalid linking
+  * obs-filters: Cleanup CMake
+  * UI: Add missing tab stop fields in Settings
+  * UI: Fix compile warnings about deprecated QT usage
+  * libobs: Log Windows 10 Hardware GPU Scheduler
+  * plugins: Clear compile warnings on Linux
+  * UI: Fix output channels not being deleted
+  * UI: Disable scene rename shortcut key while renaming
+  * UI: Fix tray icon appearing when disabled in settings
+  * win-capture: Fix excessive window capture logging
+  * UI: Remove unnecessary obs_properties_apply_settings
+  * UI: Defer device properties to separate thread
+  * UI: Put context combo box operations in functions
+  * CI: Update macOS CLI build script
+  * UI: Make image source toolbar expand
+  * UI: Disable properties button if no properties
+  * UI: Remove null source warnings
+  * UI: Clear context bar on scene collection change
+  * UI: Align Advanced Audio Percent toggle to Volume text
+  * UI: Add maximize and minimize support to Log Viewer
+  * UI: Bring Log Viewer to front instead of closing
+  * CI: Add Sphinx Docs generator Github Action
+  * obs-outputs: Remove legacy multitrack code
+  * UI: Don't open second dialog if close event is ignored
+  * obs-ffmpeg: Fix crash when seeking with no media
+  * UI: Fix projector not working on secondary monitors
+  * obs-filters/obs-outputs: Cleanup unused var warns
+  * win-capture: Robust Vulkan swap chain handling
+  * UI: Fix always on top w/ projectors on Linux
+  * UI: Add OBSBasic::ClearProjectors()
+  * UI: Fix transition enumeration
+  * UI: Change cursor when interacting with the preview
+  * UI: Fix hotkeys auto repeating
+  * obs-filters: Fix building without noise reduction
+  * win-capture: Update graphics hook version
+  * obs-outputs: Check support for mbedtls func
+  * obs-outputs: Fix Windows memory leak
+  * UI: Fix multiview update regression
+  * obs-outputs: Add support for metadata-based multitrack
+  * obs-outputs: Don't assume @setDataFrame
+  * obs-x264: Fix memory leak
+  * libobs: Fix underlinking X11
+  * text-freetype2: Fix x,y bounds for text outline and shadow
+  * libobs-winrt: Device loss crash prevention
+  * win-capture: Remove unused strings
+  * UI: Do not process unnamed sources for hotkeys
+  * UI: Render tabs and spaces in Log Viewer
+  * obs-outputs: Enable Windows mbedTLS threading support
+  * UI: Change default sample rate to 48 kHz
+  * obs-filters: Add option to use RNNoise for noise reduction
+  * UI: Fix obsolete filters showing up
+  * oss-audio: Improve /dev/sndstat parsing on FreeBSD
+  * obs-x264: Discard excess warning for e2k
+  * cmake: Discard excess warnings for e2k
+  * cmake: Enable SIMD for Elbrus architecture
+  * cmake: Conditionalize -fopenmp-simd
+  * UI: Source Toolbar
+  * image-source: Transition when restarting slideshow
+  * obs-scripting: Fix removing signal handlers in python Closes #3218
+  * UI: Provide Open button in the Log Viewer
+  * UI:Show "Get Stream Key" to users of Facebook CDN
+  * image-source: Use media control api for slideshow
+  * Revert "image-source: Add proc handler calls to slideshow"
+  * CI: Add QtNetwork to bundle to restore Streamdeck support
+  * README.rst: Remove Mantis
+  * libobs: Add functions to get locale text from modules
+  * libobs: Add function to get module pointer
+  * libobs: Add OBSRef::Get()
+  * image-source: Add proc handler calls to slideshow
+  * image-source: Play if play_pause() called while stopped
+  * UI: Add missing refresh icon to acri qss file
+  * libobs: Fix undefined behavior
+  * win-capture: Remove Vulkan CTS workaround
+  * mac-decklink: Fix C++ virtual function warnings
+  * CI: Update macOS deps version to fix unmet Qt plugin dependencies
+  * libobs: Fix deferred update sometimes using stale data
+  * UI: Clarify and improve locale text
+  * UI: Move View -> Toolbars -> Listboxes
+  * UI: Remove unused action
+  * UI: Mac fix — remove wizard background padding
+  * UI: Check and fail when launched under ChromeOS
+  * UI: Remove unused variable
+  * UI: Add log viewer window
+  * frontend-tools: Add "Open file location" menu item for scripts
+  * frontend-tools: Add context menu to Scripts list
+  * UI: Redesign transitions dock
+  * UI: Use case-insensitive sort for "show all" services
+  * UI: Add ability to make screenshots
+  * UI: Simplify path generation code
+  * oss-audio: Use util_mul_div64() to do time scaling
+  * obs-ffmpeg: Set async video frame immediately when seeking
+  * deps/media-playback: Add seek callback
+  * libobs: Add func to set async video frame immediately
+  * CI: Fix Brew Bundler breaking without prior brew update
+  * rtmp-services: Add api.video service
+  * rtmp-services: Add Nimo TV auto server
+  * UI: Make macOS 'always on top' more aggressive
+  * UI: Fix clickable text on properties with tooltips
+  * libobs: Add util/sse2neon.h to CMakeLists
+  * obs-qsv11: Fix bug mapping old qsv settings to new
+  * libobs: Call enum_all_sources in check for enum_all_sources
+  * win-capture: Make Vulkan frame data local to queue
+  * win-capture: Hide Vulkan linked list internals
+  * win-capture: Improve Vulkan hook stability
+  * obs-ffmpeg: Clear texture when starting playback
+  * libobs: Update async texture when showing preloaded video
+  * UI: Remove OBSContext class and shutdown in run_program
+  * CI: Disable Python on macOS
+  * CI: Disable Python for Mac PR automation
+  * CI: Remove Mixer cmake variables
+  * rtmp-services: Remove Mixer servers and checks
+  * UI: Remove Mixer integration
+  * deps/media-playback: Don't EOF while paused and seeking
+  * deps/media-playback: Preload video when seeking paused
+  * win-dshow: Fix virtual camera filter name
+  * win-dshow: Fix virtual camera enable bug
+  * rtmp-services: Fix memory leak
+  * obs-ffmpeg: Fix race and deprecation warnings
+  * libobs/media-io: Add missing codec_tag set
+  * deps/media-playback: Remove unused #define
+  * deps/libff: Remove very old version check
+  * UI: Fix warning about missing override
+  * UI: Switch 601 to sRGB as default color space
+  * UI: Add sRGB option to colorSpace output setting
+  * media-playback: Leverage VIDEO_CS_SRGB
+  * obs-x264: Improve color space handling
+  * obs-ffmpeg: Improve color space handling
+  * libobs: Add VIDEO_CS_SRGB support
+  * obs-ffmpeg: Fix FFmpeg deprecation warnings
+  * libobs/media-io: Fix FFmpeg deprecation warnings
+  * libobs: Fix FFmpeg deprecation warnings
+  * UI: Add flag/file to disable built-in updater
+  * frontend-tools: Make links in script description clickable
+  * UI: Use non-native file dialog w/ Linux
+  * rtmp-services: drop Restream.io FTL support
+  * libobs: Add arm support
+  * UI, obs-ffmpeg, obs-filters: Fix compile warnings
+  * coreaudio-encoder: Fix encoding of 4.0 speaker layout
+  * deps/media-playback: Reset TS when seeking
+  * CI: Disable building OBS with Python scripting support on macOS
+  * CI: Add fix for macOS builds failing on push for Azure CI
+  * rtmp-services: Update Uscreen service
+  * win-capture: Log duplicator display when updating properties
+  * linux-v4l2: Fix case of variables to snake_case
+  * obs-outputs: Use FLV codec IDs for videocodecid/audiocodecid
+  * obs-ffmpeg: Fix play pause crash
+  * libobs/util: Use is_padding() for wcsdepad as well
+  * libobs/util: Fix potential crash
+  * Revert "UI: Match Windows taskbar state to tray icon"
+  * Revert "Merge pull request #3110 from WizardCM/taskbar-color-setting"
+  * libobs: Translate F13-F24 hotkeys on Windows
+  * win-capture: Remove fixed-size Vulkan arrays
+  * rtmp-services: Add "Taryana - Apachat" streaming service
+  * UI: Add setting for taskbar color
+  * UI: Add informative messages to auto-config dialog
+  * UI: Set remove prompt default action
+  * win-capture: Fix 32-bit Vulkan capture
+  * CI: Update build script to use pre-built SWIG and QT dependencies
+  * obs-qsv11: Simplify UI quality parameters
+  * obs-qsv11: Enable VDEnc on ICL+
+  * obs-qsv11: Add latency mode to QSV settings
+  * UI: Update Facebook get stream key URL
+  * UI: Make color consistent, don't show alpha value
+  * obs-qsv11: Set preference for encode to iGPU in case of i+i
+  * UI: Delete projector when monitor is disconnected
+  * obs-ffmpeg: Allow continuous network streaming
+  * UI: Show help text for launch parameters on Windows
+  * libobs: Fix video scalar copy heights
+  * UI: Add virtual camera to UI
+  * win-dshow: Add Virtual Camera (Windows)
+  * UI: Add TBar controls to obs-frontend-api
+  * UI: Allow the use of Esc key to quit settings window
+  * frontend-tools: Add defaults button to script dialog
+  * obs-ffmpeg: Add auto reconnect to remote media sources
+  * UI: Fix scene switcher not detecting some windows
+  * UI: Fix unreadable Connecting Stream button
+  * win-capture: Don't use Chrome classes for priority
+  * win-capture: Decouple swap and frame indices
+  * obs-ffmpeg, UI: Allow slash in recording names
+  * UI: Add always on top checkbox to projector context menu
+  * mac-capture: Add several virtual audio drivers to Desktop audio
+  * libobs: Add sample unit tests leveraging cmocka
+  * CI: Quick fix to cover pre-installed Homebrew dependencies for macOS
+  * UI: Add window projector option "fit to content"
+  * rtmp-services: Add weabook.live
+  * UI: Fix pause/replay buttons having large width
+  * rtmp-services: Update Lahzenegar RTMP
+  * win-capture: Remove game capture scaling
+  * UI: Update volmeters at 60hz
+  * UI: Fix warnings for Qt 5.15
+  * rtmp-services: Remove offline servers/services
+  * win-capture: Reset command pool rather than buffer
+  * rtmp-services: Add VIMM
+  * color-source: Change default color to d1d1d1
+  * rtmp-services: Update AfreecaTV
+  * UI: Enable Get Stream Key Button for Trovo service
+  * rtmp-services: Update Madcat service
+  * UI: Add 64bit windows checks to installer
+  * libobs: Reset audio data on timestamp jump
+  * rtmp-services: add angelthump
+  * UI/updater: Use 1 MB static memory for hashing
+  * UI/updater: Fix running updater as different user
+  * UI/updater: Exit with error if elevation failed
+  * obs-outputs: Log unhandled rtmp status responses
+  * obs-outputs: Handle rtmp NetStream.Publish.BadName response
+  * UI: Don't try to create service if missing file
+  * UI: Don't try to load replay buffer hotkey if null
+  * libobs: Fix right edge for "video scaler"
+  * libobs: Fix right edge of some videos
+  * libobs: Fix right edge for JPEG images
+  * UI: Auto update projector settings
+  * UI: Fix projector always on top not working on Linux
+  * UI: Delete existing fullscreen projector
+  * deps/media-playback: Use SWS_POINT instead of SWS_FAST_BILINEAR
+  * deps/media-playback: Use OBS YUV(A)444P to RGB conversion
+  * libobs: Use autoreleasepool for graphics thread
+  * win-capture: Remove dead VkResult values
+  * libobs/media-io: Remove unused code
+  * oss-audio: Add en-US translation data file
+  * UI: Fix GetPreferredLocales locale detection
+  * cmake: Update minimum Windows SDK version
+  * UI: Update NSIS installer script
+  * libobs-winrt: Require Windows 10 SDK 19041
+  * image-source: Don't check for changes when hidden
+  * Revert "Merge pull request #2993 from brittneysclark/enable_vdenc"
+  * rtmp-services: Add Mixcloud
+  * libobs: Unload modules while OBS core is active
+  * libobs: Remove excessive null checks
+  * libobs: Use correct data pointer for hotkey pair
+  * win-capture: Improve Vulkan synchronization
+  * libobs: Fix os_get_executable_path_ptr on Linux
+  * libobs-winrt: Move project to core VS filter
+  * cmake: SIMDe & GCC? then enable OpenMP 4 SIMD
+  * libos: Freshen SIMDe code copy
+  * docs: Remove Doxyfile
+  * docs: Remove Doxygen
+  * obs-qsv11: Simplify UI subjective quality parameters
+  * UI: Change audio device string in settings
+  * CI: Improve formatcode.sh efficiency
+  * obs-filters: Misc code cleanups detected by PVS Studio
+  * linux-v4l2: Selective stream restart
+  * obs-ffmpeg: Show friendly error for NV_ENC_ERR_INVALID_VERSION
+  * UI: Set 8x8 as minimum selectable resolution
+  * UI: Add percent checkbox to advanced audio dialog
+  * win-capture: Better matching of internal UWP windows
+  * UI: Don't show alpha value for color source
+  * UI: Fixed case to match what the files are named
+  * CI: Require VLC in CI builds, Fix VLC
+  * cmake: Fix warnings and normalize variables/errors
+  * libobs: Fix potential truncation warnings
+  * libobs: WinRT and dispatcher init on graphics thread
+  * libobs-winrt: Add dispatcher queue API
+  * Revert "Merge pull request #2637 from kkartaltepe/cmake-variety-fixes"
+  * UI: Install public headers for frontend-api
+  * obs-vst: Fix crash when the blocksize is smaller than frames
+  * obs-vst: Compile the vst plugin on linux
+  * UI: Fix wrong path in the crash message dialog
+  * UI: Swap to new srt output
+  * obs-ffmpeg: Use obs-ffmpeg-mux for mpegts network output
+  * obs-ffmpeg: Move file read error to separate function
+  * UI: Fix GetUnusedSceneCollectionFile filename creation
+  * UI: Make select/deselect signals work w/ group items
+  * obs-ffmpeg: Enable mpegts network URL for ffmpeg-mux
+  * UI: Allow drag & drop reorder of property lists
+  * UI: Fix bug where stats dock steals focus of main windows
+  * UI: Hide script tabs if no python settings
+  * obs-x264: Log ignored options
+  * obs-x264: Log only options given to libx264
+  * obs-x264: Refactor tokenizing of options
+  * win-capture: Ignore cloaked windows
+  * obs-qsv11: Enable VDEnc on ICL+
+  * obs-qsv11: Add latency mode to QSV settings
+  * UI: Log monitoring type for global audio devices
+  * libobs-winrt: Fix WGC minimize handling
+  * libobs: Return target instead of current in calc_torquef
+  * win-capture: Reset WGC fail flag for new window
+  * cmake: Add cmake folders
+  * win-capture: Fail on unsupported Vulkan formats
+  * UI: Restore theme if settings window exit with [x]
+  * frontend-tools: Automatically select scripts
+  * libobs: Remove log entry for CoInitializeEx pass
+  * libobs/util: Fix POSIX event bugs
+  * libobs: Fix da_reserve early return logic
+  * mac-capture: Use resize instead of reserve
+  * CI: Add all-in-one macOS build script
+  * win-capture: Log window capture method
+  * UI: Match Windows taskbar state to tray icon
+  * libobs-winrt: win-capture: Detect GraphicsCaptureItem closure
+  * CI: Update Github Actions with caching and macOS improvements
+  * obs-ffmpeg: Fix AVFrame handling in FFmpeg output
+  * UI/updater: Fix launching OBS as admin post-update
+  * deps/glad: Fix build with GCC-10
+  * vlc-video: Allow metadata retrieval through proc_handler
+  * rtmp-services: Update Switchboard Live servers
+  * rtmp-services: Add Xlovecam.com streaming service
+  * libobs: Use SetThreadDescription if possible
+  * libobs: Fix unnecessary duplication
+  * UI: Remove unused variable
+  * libobs: Update version to 25.0.8
+  * libobs-opengl: Lock Mac parent context during present
+  * plugins: Add oss-audio plugin
+  * libobs: Add Windows 10 release version to crash log
+  * obs-ffmpeg: Update error message in process_packet
+  * text-freetype2: Add Enable Antialiasing option
+  * rtmp-services: Update GameTips.TV
+  * obs-text: Add Enable Antialiasing option
+  * obs-scripting: Expose platform functions to scripts
+  * obs-plugins: Check if sources are showing for media hotkeys
+  * vlc-video: Enable building the plugin on FreeBSD
+  * libobs: add ppc64(le) specific flags to libobs.pc
+  * rtmp-services: Add Nimo TV
+  * linux-capture: Add support for cropping input source
+  * libobs: Don't check filter compatibility on not loaded sources
+  * UI: Remove first run auto-config prompts
+  * libobs: Don't allow duplicating scene sources
+  * UI: Highlight unknown audio device label in settings
+  * UI: sort audio sources by name locale aware
+  * obs-filters: 3D LUT tetrahedral interpolation
+  * UI: Add button to Analyzer in the Log Reply window
+  * UI: Add description to Log Reply window
+  * UI: Differentiate between crash & session log dialogs
+  * UI: Hide Help icon in Log Reply window
+  * libobs: Implement and use better scaling function for 64-bit integers
+  * cmake: Fix warnings and normalize variables/errors
+  * obs-ffmpeg: Rename and add more VAAPI levels
+  * obs-ffmpeg: Expose VAAPI profile choices
+  * win-capture: Verify VK_KHR_external_memory_win32 support
+  * win-capture: Cleaner COM usage
+  * win-capture: Use VkAllocationCallbacks
+  * UI: Remove language region
+  * UI: Use standard resolutions with auto-config
+  * libobs-opengl: Support 3D texelFetch
+  * obs-filters: Implement CUBE LUT domain properly
+  * UI: Don't clip meters when resizing with no input
+  * UI: Fix buttons changing minimum window width
+  * media-playback: Unbuffered Media Source
+- Remove c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch.
+
+-------------------------------------------------------------------
 Wed Jul  8 01:42:05 UTC 2020 - Jimmy Berry <jimmy@boombatower.com>
 
 - Add c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch to resolve

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-25.0.8.tar.xz/CI/scripts/macos/package/dylibBundler Deleted

obs-studio-25.0.8.tar.xz/CI/scripts/macos/package/settings.json Deleted

obs-studio-25.0.8.tar.xz/Doxyfile Deleted

@@ -1,2267 +0,0 @@
-# Doxyfile 1.8.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "Open Broadcaster Software"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Free, open source software for live streaming\
-			 and recording"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           = docs/doxygen/obs.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = docs
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
-# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
-# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# Turkish, Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = libobs
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.h
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            = docs/doxygen/header.html
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = docs/doxygen/obs.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 0
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 0
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = com.obsproject.libobs
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = com.obsproject.docs
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = OBS Project
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools. See
-# the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
-# all uppercase name, and do not end with a semicolon. Such function macros are
-# typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES

obs-studio-25.0.8.tar.xz/UI/auth-mixer.cpp Deleted

@@ -1,313 +0,0 @@
-#include "auth-mixer.hpp"
-
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-
-#include <qt-wrappers.hpp>
-#include <obs-app.hpp>
-
-#include "window-dock-browser.hpp"
-#include "window-basic-main.hpp"
-#include "remote-text.hpp"
-
-#include <json11.hpp>
-
-#include <ctime>
-
-#include "ui-config.h"
-#include "obf.h"
-
-using namespace json11;
-
-/* ------------------------------------------------------------------------- */
-
-#define MIXER_AUTH_URL "https://obsproject.com/app-auth/mixer?action=redirect"
-#define MIXER_TOKEN_URL "https://obsproject.com/app-auth/mixer-token"
-
-#define MIXER_SCOPE_VERSION 1
-
-static Auth::Def mixerDef = {"Mixer", Auth::Type::OAuth_StreamKey};
-
-/* ------------------------------------------------------------------------- */
-
-MixerAuth::MixerAuth(const Def &d) : OAuthStreamKey(d) {}
-
-bool MixerAuth::GetChannelInfo(bool allow_retry)
-try {
-	std::string client_id = MIXER_CLIENTID;
-	deobfuscate_str(&client_id[0], MIXER_HASH);
-
-	if (!GetToken(MIXER_TOKEN_URL, client_id, MIXER_SCOPE_VERSION))
-		return false;
-	if (token.empty())
-		return false;
-	if (!key_.empty())
-		return true;
-
-	std::string auth;
-	auth += "Authorization: Bearer ";
-	auth += token;
-
-	std::vector<std::string> headers;
-	headers.push_back(std::string("Client-ID: ") + client_id);
-	headers.push_back(std::move(auth));
-
-	std::string output;
-	std::string error;
-	Json json;
-	bool success;
-
-	if (id.empty()) {
-		auto func = [&]() {
-			success = GetRemoteFile(
-				"https://mixer.com/api/v1/users/current",
-				output, error, nullptr, "application/json",
-				nullptr, headers, nullptr, 5);
-		};
-
-		ExecThreadedWithoutBlocking(
-			func, QTStr("Auth.LoadingChannel.Title"),
-			QTStr("Auth.LoadingChannel.Text").arg(service()));
-		if (!success || output.empty())
-			throw ErrorInfo("Failed to get user info from remote",
-					error);
-
-		Json json = Json::parse(output, error);
-		if (!error.empty())
-			throw ErrorInfo("Failed to parse json", error);
-
-		error = json["error"].string_value();
-		if (!error.empty())
-			throw ErrorInfo(
-				error,
-				json["error_description"].string_value());
-
-		id = std::to_string(json["channel"]["id"].int_value());
-		name = json["channel"]["token"].string_value();
-	}
-
-	/* ------------------ */
-
-	std::string url;
-	url += "https://mixer.com/api/v1/channels/";
-	url += id;
-	url += "/details";
-
-	output.clear();
-
-	auto func = [&]() {
-		success = GetRemoteFile(url.c_str(), output, error, nullptr,
-					"application/json", nullptr, headers,
-					nullptr, 5);
-	};
-
-	ExecThreadedWithoutBlocking(
-		func, QTStr("Auth.LoadingChannel.Title"),
-		QTStr("Auth.LoadingChannel.Text").arg(service()));
-	if (!success || output.empty())
-		throw ErrorInfo("Failed to get stream key from remote", error);
-
-	json = Json::parse(output, error);
-	if (!error.empty())
-		throw ErrorInfo("Failed to parse json", error);
-
-	error = json["error"].string_value();
-	if (!error.empty())
-		throw ErrorInfo(error,
-				json["error_description"].string_value());
-
-	std::string key_suffix = json["streamKey"].string_value();
-
-	/* Mixer does not throw an error; instead it gives you the channel data
-	 * json without the data you normally have privileges for, which means
-	 * it'll be an empty stream key usually.  So treat empty stream key as
-	 * an error. */
-	if (key_suffix.empty()) {
-		if (allow_retry && RetryLogin()) {
-			return GetChannelInfo(false);
-		}
-		throw ErrorInfo("Auth Failure", "Could not get channel data");
-	}
-
-	key_ = id + "-" + key_suffix;
-
-	return true;
-} catch (ErrorInfo info) {
-	QString title = QTStr("Auth.ChannelFailure.Title");
-	QString text = QTStr("Auth.ChannelFailure.Text")
-			       .arg(service(), info.message.c_str(),
-				    info.error.c_str());
-
-	QMessageBox::warning(OBSBasic::Get(), title, text);
-
-	blog(LOG_WARNING, "%s: %s: %s", __FUNCTION__, info.message.c_str(),
-	     info.error.c_str());
-	return false;
-}
-
-void MixerAuth::SaveInternal()
-{
-	OBSBasic *main = OBSBasic::Get();
-	config_set_string(main->Config(), service(), "Name", name.c_str());
-	config_set_string(main->Config(), service(), "Id", id.c_str());
-	if (uiLoaded) {
-		config_set_string(main->Config(), service(), "DockState",
-				  main->saveState().toBase64().constData());
-	}
-	OAuthStreamKey::SaveInternal();
-}
-
-static inline std::string get_config_str(OBSBasic *main, const char *section,
-					 const char *name)
-{
-	const char *val = config_get_string(main->Config(), section, name);
-	return val ? val : "";
-}
-
-bool MixerAuth::LoadInternal()
-{
-	if (!cef)
-		return false;
-
-	OBSBasic *main = OBSBasic::Get();
-	name = get_config_str(main, service(), "Name");
-	id = get_config_str(main, service(), "Id");
-	firstLoad = false;
-	return OAuthStreamKey::LoadInternal();
-}
-
-static const char *elixr_script = "\
-var elixr = document.createElement('script');\
-elixr.setAttribute('src','https://api.mixrelixr.com/scripts/elixr-emotes-embedded-chat.bundle.js');\
-document.head.appendChild(elixr);";
-
-void MixerAuth::LoadUI()
-{
-	if (!cef)
-		return;
-	if (uiLoaded)
-		return;
-	if (!GetChannelInfo())
-		return;
-
-	OBSBasic::InitBrowserPanelSafeBlock();
-	OBSBasic *main = OBSBasic::Get();
-
-	std::string script = "";
-	std::string url;
-	url += "https://mixer.com/embed/chat/";
-	url += id;
-
-	QSize size = main->frameSize();
-	QPoint pos = main->pos();
-
-	chat.reset(new BrowserDock());
-	chat->setObjectName("mixerChat");
-	chat->resize(300, 600);
-	chat->setMinimumSize(200, 300);
-	chat->setWindowTitle(QTStr("Auth.Chat"));
-	chat->setAllowedAreas(Qt::AllDockWidgetAreas);
-
-	QCefWidget *browser = cef->create_widget(nullptr, url, panel_cookies);
-	chat->SetWidget(browser);
-
-	const int mxAddonChoice =
-		config_get_int(main->Config(), service(), "AddonChoice");
-	if (mxAddonChoice) {
-		if (mxAddonChoice & 0x1)
-			script += elixr_script;
-	}
-
-	browser->setStartupScript(script);
-
-	main->addDockWidget(Qt::RightDockWidgetArea, chat.data());
-	chatMenu.reset(main->AddDockWidget(chat.data()));
-
-	/* ----------------------------------- */
-
-	chat->setFloating(true);
-	chat->move(pos.x() + size.width() - chat->width() - 50, pos.y() + 50);
-
-	if (firstLoad) {
-		chat->setVisible(true);
-	} else {
-		const char *dockStateStr = config_get_string(
-			main->Config(), service(), "DockState");
-		QByteArray dockState =
-			QByteArray::fromBase64(QByteArray(dockStateStr));
-		main->restoreState(dockState);
-	}
-
-	uiLoaded = true;
-}
-
-bool MixerAuth::RetryLogin()
-{
-	if (!cef)
-		return false;
-
-	OAuthLogin login(OBSBasic::Get(), MIXER_AUTH_URL, false);
-	cef->add_popup_whitelist_url("about:blank", &login);
-
-	if (login.exec() == QDialog::Rejected) {
-		return false;
-	}
-
-	std::shared_ptr<MixerAuth> auth = std::make_shared<MixerAuth>(mixerDef);
-	std::string client_id = MIXER_CLIENTID;
-	deobfuscate_str(&client_id[0], MIXER_HASH);
-
-	return GetToken(MIXER_TOKEN_URL, client_id, MIXER_SCOPE_VERSION,
-			QT_TO_UTF8(login.GetCode()), true);
-}
-
-std::shared_ptr<Auth> MixerAuth::Login(QWidget *parent)
-{
-	if (!cef) {
-		return nullptr;
-	}
-
-	OAuthLogin login(parent, MIXER_AUTH_URL, false);
-	cef->add_popup_whitelist_url("about:blank", &login);
-
-	if (login.exec() == QDialog::Rejected) {
-		return nullptr;
-	}
-
-	std::shared_ptr<MixerAuth> auth = std::make_shared<MixerAuth>(mixerDef);
-
-	std::string client_id = MIXER_CLIENTID;
-	deobfuscate_str(&client_id[0], MIXER_HASH);
-
-	if (!auth->GetToken(MIXER_TOKEN_URL, client_id, MIXER_SCOPE_VERSION,
-			    QT_TO_UTF8(login.GetCode()))) {
-		return nullptr;
-	}
-
-	std::string error;
-	if (auth->GetChannelInfo(false)) {
-		return auth;
-	}
-
-	return nullptr;
-}
-
-static std::shared_ptr<Auth> CreateMixerAuth()
-{
-	return std::make_shared<MixerAuth>(mixerDef);
-}
-
-static void DeleteCookies()
-{
-	if (panel_cookies) {
-		panel_cookies->DeleteCookies("mixer.com", std::string());
-		panel_cookies->DeleteCookies("microsoft.com", std::string());
-	}
-}
-
-void RegisterMixerAuth()
-{
-	OAuth::RegisterOAuth(mixerDef, CreateMixerAuth, MixerAuth::Login,
-			     DeleteCookies);
-}

obs-studio-25.0.8.tar.xz/UI/auth-mixer.hpp Deleted

obs-studio-25.0.8.tar.xz/cmake/Modules/FindLibUDev.cmake Deleted

obs-studio-25.0.8.tar.xz/docs/doxygen Deleted

obs-studio-25.0.8.tar.xz/docs/doxygen/header.html Deleted

@@ -1,56 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<title>$projectname: $title</title>
-<title>$title</title>
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,400,700" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
-</head>
-<body>
-<div id="top">
-
-
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  
-  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
-  
-  
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">$projectname
-   &#160;<span id="projectnumber">$projectnumber</span>
-   </div>
-   <div id="projectbrief">$projectbrief</div>
-  </td>
-  
-  
-   
-    <td style="padding-left: 0.5em;">
-    <div id="projectbrief">$projectbrief</div>
-    </td>
-   
-  
-  
-   
-   <td>$searchbox</td>
-   
-  
- </tr>
- </tbody>
-</table>
-</div>
-
-

obs-studio-25.0.8.tar.xz/docs/doxygen/obs.css Deleted

@@ -1,145 +0,0 @@
-@charset 'UTF-8';
-
-* {
-	font-family: "Source Sans Pro", sans-serif;
-}
-
-body {
-	/* white_carbon2.png */
-	background: #f6f8f9 url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEX19PXo5ujv7u/o5ej29fb18/X29PaHCvlgAAAAIklEQVQIHWNgEARCBiUgNHQQdAAzGAIgYglKDIIOgglgMQA+hAOJM/f1wAAAAABJRU5ErkJggg==");
-}
-
-div#doc-content {
-	background: rgb(244, 244, 244);
-}
-
-/* glowing stuff */
-h1.glow, h2.glow, h3.glow,
-h4.glow, h5.glow, h6.glow {
-	text-shadow: 0 0 15px rgb(183, 28, 28);
-}
-div.memitem.glow {
-	box-shadow: 0 0 15px rgb(183, 28, 28);
-}
-
-/* header */
-div#titlearea {
-	background: #f5f5f5;
-	margin-bottom: 20px;
-	padding: 10px 0;
-	box-shadow: 0 3px 3px rgba(0, 0, 0, 0.35);
-
-	border-bottom: 0;
-
-	background-image: linear-gradient(
-		bottom, rgb(239,239,239) 0%, rgb(255,255,255) 100%);
-	background-image: -o-linear-gradient(
-		bottom, rgb(239,239,239) 0%, rgb(255,255,255) 100%);
-	background-image: -moz-linear-gradient(
-		bottom, rgb(239,239,239) 0%, rgb(255,255,255) 100%);
-	background-image: -webkit-linear-gradient(
-		bottom, rgb(239,239,239) 0%, rgb(255,255,255) 100%);
-}
-
-div#projectname {
-	font-family: 'Source Sans Pro', sans-serif;
-	font-size: 25px;
-	font-weight: bold;
-}
-
-div#projectbrief {
-	font-family: 'Source Sans Pro', sans-serif;
-	font-size: 13px;
-}
-
-/* the first tab bar is different ... */
-div.tabs {
-	background: #3b3d3e;
-	height: 30px;
-	font-size: 14px;
-}
-
-div.tabs li {
-	background: transparent;
-	line-height: 30px;
-}
-
-div.tabs li:hover {
-	background: rgb(46, 46, 46);
-}
-
-div.tabs a {
-	color: rgba(255, 255, 255, 0.75);
-	background: transparent;
-
-	text-transform: uppercase;
-	text-shadow: none;
-}
-
-div.tabs a:hover {
-	color: rgb(233, 233, 233);
-	background: transparent;
-}
-
-div.tabs li.current a {
-	color: rgb(74, 74, 74);
-	background: rgb(250, 250, 250);
-
-	text-shadow: none;
-}
-
-/* the other tabs are the same */
-div.tabs2,
-div.tabs3 {
-	background: rgb(250, 250, 250);
-	border: 1px solid rgb(196, 196, 196);
-	border-top: 0;
-	font-size: 13px;
-}
-
-div.tabs2 li,
-div.tabs3 li {
-	background: transparent;
-	line-height: 30px;
-}
-
-div.tabs2 a,
-div.tabs3 a {
-	padding: 0 8px;
-	color: rgb(183, 28, 28);
-	background: transparent;
-}
-
-div.tabs2 a:hover,
-div.tabs3 a:hover {
-	color: rgb(74, 74, 74);
-	background: transparent;
-
-	text-shadow: none;
-}
-
-div.tabs2 li.current a,
-div.tabs3 li.current a {
-	color: rgb(74, 74, 74);
-	background: transparent;
-	text-shadow: none;
-}
-
-/* nav path (at the bottom of the page) */
-div.navpath {
-	background: rgb(233, 233, 233);
-	border: 1px solid rgb(196, 196, 196);
-	border-width: 1px 0;
-	font-size: 13px;
-	line-height: 20px;
-}
-
-div.navpath ul {
-	background: transparent;
-	border: 0;
-}
-
-/* directories */
-div.directory {
-	border-color: rgba(0, 0, 0, 0.35);
-}

obs-studio-25.0.8.tar.xz/docs/doxygen/obs.png Deleted

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/ffmpeg-encoded-output.c Deleted

@@ -1,873 +0,0 @@
-/******************************************************************************
-    Copyright (C) 2019 Haivision Systems Inc.
-    Copyright (C) 2014 by Hugh Bailey <obs.jim@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 <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-#include "ffmpeg-encoded-output.h"
-
-static int proto_init(struct ffmpeg_encoded_output *stream);
-static int proto_try_connect(struct ffmpeg_encoded_output *stream);
-static int proto_connect_time(struct ffmpeg_encoded_output *stream);
-static void proto_close(struct ffmpeg_encoded_output *stream);
-static void proto_set_output_error(struct ffmpeg_encoded_output *stream);
-static int proto_send_packet(struct ffmpeg_encoded_output *stream,
-			     struct encoder_packet *packet, bool is_header);
-
-static inline size_t num_buffered_packets(struct ffmpeg_encoded_output *stream);
-static inline void free_packets(struct ffmpeg_encoded_output *stream);
-static inline bool stopping(struct ffmpeg_encoded_output *stream);
-static inline bool connecting(struct ffmpeg_encoded_output *stream);
-static inline bool active(struct ffmpeg_encoded_output *stream);
-static inline bool disconnected(struct ffmpeg_encoded_output *stream);
-static inline bool get_next_packet(struct ffmpeg_encoded_output *stream,
-				   struct encoder_packet *packet);
-#ifdef TEST_FRAMEDROPS
-static void droptest_cap_data_rate(struct ffmpeg_encoded_output *stream,
-				   size_t size);
-#endif
-static inline bool can_shutdown_stream(struct ffmpeg_encoded_output *stream,
-				       struct encoder_packet *packet);
-static void *send_thread(void *data);
-static bool send_sps_pps(struct ffmpeg_encoded_output *stream);
-static inline bool reset_semaphore(struct ffmpeg_encoded_output *stream);
-static bool init_connect(struct ffmpeg_encoded_output *stream);
-static int init_send(struct ffmpeg_encoded_output *stream);
-static void *connect_thread(void *data);
-static inline bool add_packet(struct ffmpeg_encoded_output *stream,
-			      struct encoder_packet *packet);
-static inline size_t num_buffered_packets(struct ffmpeg_encoded_output *stream);
-static void drop_frames(struct ffmpeg_encoded_output *stream, const char *name,
-			int highest_priority, bool pframes);
-static bool find_first_video_packet(struct ffmpeg_encoded_output *stream,
-				    struct encoder_packet *first);
-static void check_to_drop_frames(struct ffmpeg_encoded_output *stream,
-				 bool pframes);
-static bool add_video_packet(struct ffmpeg_encoded_output *stream,
-			     struct encoder_packet *packet);
-
-static const char *ffmpeg_encoded_output_getname(void *unused)
-{
-	UNUSED_PARAMETER(unused);
-
-	return obs_module_text("FFmpegEncodedOutput");
-}
-
-static inline bool add_packet(struct ffmpeg_encoded_output *stream,
-			      struct encoder_packet *packet)
-{
-	circlebuf_push_back(&stream->packets, packet,
-			    sizeof(struct encoder_packet));
-
-	return true;
-}
-
-static bool add_video_packet(struct ffmpeg_encoded_output *stream,
-			     struct encoder_packet *packet)
-{
-	check_to_drop_frames(stream, false);
-	check_to_drop_frames(stream, true);
-
-	/* if currently dropping frames, drop packets until it reaches the
-	 * desired priority */
-	if (packet->drop_priority < stream->min_priority) {
-		stream->dropped_frames++;
-		return false;
-	} else {
-		stream->min_priority = 0;
-	}
-
-	stream->last_dts_usec = packet->dts_usec;
-
-	return add_packet(stream, packet);
-}
-
-static inline bool get_next_packet(struct ffmpeg_encoded_output *stream,
-				   struct encoder_packet *packet)
-{
-	bool new_packet = false;
-
-	pthread_mutex_lock(&stream->packets_mutex);
-	if (stream->packets.size) {
-		circlebuf_pop_front(&stream->packets, packet,
-				    sizeof(struct encoder_packet));
-		new_packet = true;
-	}
-	pthread_mutex_unlock(&stream->packets_mutex);
-
-	return new_packet;
-}
-
-static inline void free_packets(struct ffmpeg_encoded_output *stream)
-{
-	size_t num_packets;
-
-	pthread_mutex_lock(&stream->packets_mutex);
-
-	num_packets = num_buffered_packets(stream);
-	if (num_packets)
-		info("Freeing %d remaining packets", (int)num_packets);
-
-	while (stream->packets.size) {
-		struct encoder_packet packet;
-		circlebuf_pop_front(&stream->packets, &packet, sizeof(packet));
-		obs_encoder_packet_release(&packet);
-	}
-	pthread_mutex_unlock(&stream->packets_mutex);
-}
-
-static inline bool stopping(struct ffmpeg_encoded_output *stream)
-{
-	return os_event_try(stream->stop_event) != EAGAIN;
-}
-
-static inline bool connecting(struct ffmpeg_encoded_output *stream)
-{
-	return os_atomic_load_bool(&stream->connecting);
-}
-
-static inline bool active(struct ffmpeg_encoded_output *stream)
-{
-	return os_atomic_load_bool(&stream->active);
-}
-
-static inline bool disconnected(struct ffmpeg_encoded_output *stream)
-{
-	return os_atomic_load_bool(&stream->disconnected);
-}
-
-#ifdef TEST_FRAMEDROPS
-static void droptest_cap_data_rate(struct ffmpeg_encoded_output *stream,
-				   size_t size)
-{
-	uint64_t ts = os_gettime_ns();
-	struct droptest_info info;
-
-	info.ts = ts;
-	info.size = size;
-
-	circlebuf_push_back(&stream->droptest_info, &info, sizeof(info));
-	stream->droptest_size += size;
-
-	if (stream->droptest_info.size) {
-		circlebuf_peek_front(&stream->droptest_info, &info,
-				     sizeof(info));
-
-		if (stream->droptest_size > DROPTEST_MAX_BYTES) {
-			uint64_t elapsed = ts - info.ts;
-
-			if (elapsed < 1000000000ULL) {
-				elapsed = 1000000000ULL - elapsed;
-				os_sleepto_ns(ts + elapsed);
-			}
-
-			while (stream->droptest_size > DROPTEST_MAX_BYTES) {
-				circlebuf_pop_front(&stream->droptest_info,
-						    &info, sizeof(info));
-				stream->droptest_size -= info.size;
-			}
-		}
-	}
-}
-#endif
-
-static void *send_thread(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	os_set_thread_name("ffmpeg-stream: send_thread");
-
-	while (os_sem_wait(stream->send_sem) == 0) {
-		struct encoder_packet packet;
-
-		if (stopping(stream) && stream->stop_ts == 0)
-			break;
-
-		if (!get_next_packet(stream, &packet))
-			continue;
-
-		if (stopping(stream)) {
-			if (can_shutdown_stream(stream, &packet)) {
-				obs_encoder_packet_release(&packet);
-				break;
-			}
-		}
-		if (!stream->sent_sps_pps) {
-			if (!send_sps_pps(stream)) {
-				os_atomic_set_bool(&stream->disconnected, true);
-				break;
-			}
-		}
-		if (proto_send_packet(stream, &packet, false) < 0) {
-			os_atomic_set_bool(&stream->disconnected, true);
-			break;
-		}
-	}
-
-	if (disconnected(stream))
-		info("Disconnected from %s", stream->path.array);
-	else
-		info("User stopped the stream");
-
-	proto_set_output_error(stream);
-	proto_close(stream);
-
-	if (!stopping(stream)) {
-		pthread_detach(stream->send_thread);
-		obs_output_signal_stop(stream->output, OBS_OUTPUT_DISCONNECTED);
-	} else {
-		obs_output_end_data_capture(stream->output);
-	}
-
-	free_packets(stream);
-	os_event_reset(stream->stop_event);
-	os_atomic_set_bool(&stream->active, false);
-	stream->sent_sps_pps = false;
-
-	return NULL;
-}
-
-static bool send_sps_pps(struct ffmpeg_encoded_output *stream)
-{
-	obs_output_t *context = stream->output;
-	obs_encoder_t *vencoder = obs_output_get_video_encoder(context);
-	uint8_t *header;
-	struct encoder_packet packet = {
-		.type = OBS_ENCODER_VIDEO, .timebase_den = 1, .keyframe = true};
-
-	if (obs_encoder_get_extra_data(vencoder, &header, &packet.size)) {
-		packet.data = bmemdup(header, packet.size);
-		stream->sent_sps_pps =
-			proto_send_packet(stream, &packet, true) >= 0;
-	}
-	return stream->sent_sps_pps;
-}
-
-static inline bool reset_semaphore(struct ffmpeg_encoded_output *stream)
-{
-	os_sem_destroy(stream->send_sem);
-
-	return os_sem_init(&stream->send_sem, 0) == 0;
-}
-
-static bool init_connect(struct ffmpeg_encoded_output *stream)
-{
-	obs_service_t *service;
-	obs_data_t *settings;
-	int64_t drop_p;
-	int64_t drop_b;
-
-	if (stopping(stream))
-		pthread_join(stream->send_thread, NULL);
-
-	free_packets(stream);
-
-	service = obs_output_get_service(stream->output);
-	if (!service)
-		return false;
-
-	os_atomic_set_bool(&stream->disconnected, false);
-	stream->total_bytes_sent = 0;
-	stream->dropped_frames = 0;
-	stream->min_priority = 0;
-	stream->got_first_video = false;
-
-	settings = obs_output_get_settings(stream->output);
-	dstr_copy(&stream->path, obs_service_get_url(service));
-	dstr_copy(&stream->key, obs_service_get_key(service));
-	dstr_copy(&stream->username, obs_service_get_username(service));
-	dstr_copy(&stream->password, obs_service_get_password(service));
-	dstr_depad(&stream->path);
-	dstr_depad(&stream->key);
-	drop_b = (int64_t)obs_data_get_int(settings, OPT_DROP_THRESHOLD);
-	drop_p = (int64_t)obs_data_get_int(settings, OPT_PFRAME_DROP_THRESHOLD);
-	stream->max_shutdown_time_sec =
-		(int)obs_data_get_int(settings, OPT_MAX_SHUTDOWN_TIME_SEC);
-
-	if (drop_p < (drop_b + 200))
-		drop_p = drop_b + 200;
-
-	stream->drop_threshold_usec = 1000 * drop_b;
-	stream->pframe_drop_threshold_usec = 1000 * drop_p;
-
-	obs_data_release(settings);
-
-	return true;
-}
-
-static void *connect_thread(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-	int ret;
-
-	os_set_thread_name("ffmpeg-stream: connect_thread");
-
-	if (!init_connect(stream)) {
-		obs_output_signal_stop(stream->output, OBS_OUTPUT_BAD_PATH);
-		return NULL;
-	}
-
-	ret = proto_try_connect(stream);
-	if (ret == OBS_OUTPUT_SUCCESS)
-		ret = init_send(stream);
-
-	if (ret != OBS_OUTPUT_SUCCESS) {
-		obs_output_signal_stop(stream->output, ret);
-		info("Connection to %s failed: %d", stream->path.array, ret);
-	}
-
-	if (!stopping(stream))
-		pthread_detach(stream->connect_thread);
-
-	os_atomic_set_bool(&stream->connecting, false);
-
-	return NULL;
-}
-
-static inline size_t num_buffered_packets(struct ffmpeg_encoded_output *stream)
-{
-	return stream->packets.size / sizeof(struct encoder_packet);
-}
-
-static void drop_frames(struct ffmpeg_encoded_output *stream, const char *name,
-			int highest_priority, bool pframes)
-{
-	UNUSED_PARAMETER(pframes);
-	struct circlebuf new_buf = {0};
-	int num_frames_dropped = 0;
-
-#ifdef _DEBUG
-	int start_packets = (int)num_buffered_packets(stream);
-#else
-	UNUSED_PARAMETER(name);
-#endif
-
-	circlebuf_reserve(&new_buf, sizeof(struct encoder_packet) * 8);
-
-	while (stream->packets.size) {
-		struct encoder_packet packet;
-		circlebuf_pop_front(&stream->packets, &packet, sizeof(packet));
-
-		/* do not drop audio data or video keyframes */
-		if (packet.type == OBS_ENCODER_AUDIO ||
-		    packet.drop_priority >= highest_priority) {
-			circlebuf_push_back(&new_buf, &packet, sizeof(packet));
-
-		} else {
-			num_frames_dropped++;
-			obs_encoder_packet_release(&packet);
-		}
-	}
-
-	circlebuf_free(&stream->packets);
-	stream->packets = new_buf;
-
-	if (stream->min_priority < highest_priority)
-		stream->min_priority = highest_priority;
-	if (!num_frames_dropped)
-		return;
-
-	stream->dropped_frames += num_frames_dropped;
-#ifdef _DEBUG
-	debug("Dropped %s, prev packet count: %d, new packet count: %d", name,
-	      start_packets, (int)num_buffered_packets(stream));
-#endif
-}
-
-static bool find_first_video_packet(struct ffmpeg_encoded_output *stream,
-				    struct encoder_packet *first)
-{
-	size_t count = stream->packets.size / sizeof(*first);
-
-	for (size_t i = 0; i < count; i++) {
-		struct encoder_packet *cur =
-			circlebuf_data(&stream->packets, i * sizeof(*first));
-		if (cur->type == OBS_ENCODER_VIDEO && !cur->keyframe) {
-			*first = *cur;
-			return true;
-		}
-	}
-
-	return false;
-}
-
-static void check_to_drop_frames(struct ffmpeg_encoded_output *stream,
-				 bool pframes)
-{
-	struct encoder_packet first;
-	int64_t buffer_duration_usec;
-	size_t num_packets = num_buffered_packets(stream);
-	const char *name = pframes ? "p-frames" : "b-frames";
-	int priority = pframes ? OBS_NAL_PRIORITY_HIGHEST
-			       : OBS_NAL_PRIORITY_HIGH;
-	int64_t drop_threshold = pframes ? stream->pframe_drop_threshold_usec
-					 : stream->drop_threshold_usec;
-
-	if (num_packets < 5) {
-		if (!pframes)
-			stream->congestion = 0.0f;
-		return;
-	}
-
-	if (!find_first_video_packet(stream, &first))
-		return;
-
-	/* if the amount of time stored in the buffered packets waiting to be
-	 * sent is higher than threshold, drop frames */
-	buffer_duration_usec = stream->last_dts_usec - first.dts_usec;
-
-	if (!pframes) {
-		stream->congestion =
-			(float)buffer_duration_usec / (float)drop_threshold;
-	}
-
-	if (buffer_duration_usec > drop_threshold) {
-		debug("buffer_duration_usec: %" PRId64, buffer_duration_usec);
-		drop_frames(stream, name, priority, pframes);
-	}
-}
-
-static int init_send(struct ffmpeg_encoded_output *stream)
-{
-	int ret;
-	reset_semaphore(stream);
-
-	ret = pthread_create(&stream->send_thread, NULL, send_thread, stream);
-	if (ret != 0) {
-		proto_close(stream);
-		warn("Failed to create send thread");
-		return OBS_OUTPUT_ERROR;
-	}
-
-	os_atomic_set_bool(&stream->active, true);
-	obs_output_begin_data_capture(stream->output, 0);
-
-	return OBS_OUTPUT_SUCCESS;
-}
-
-static inline bool can_shutdown_stream(struct ffmpeg_encoded_output *stream,
-				       struct encoder_packet *packet)
-{
-	uint64_t cur_time = os_gettime_ns();
-	bool timeout = cur_time >= stream->shutdown_timeout_ts;
-
-	if (timeout)
-		info("Stream shutdown timeout reached (%d second(s))",
-		     stream->max_shutdown_time_sec);
-
-	return timeout || packet->sys_dts_usec >= (int64_t)stream->stop_ts;
-}
-
-static int proto_init(struct ffmpeg_encoded_output *stream)
-{
-	AVOutputFormat *outfmt = NULL;
-	int ret = 0;
-
-	//1. set up output format
-	outfmt = av_guess_format("mpegts", NULL, "video/MP2T");
-	if (outfmt == NULL) {
-		ret = -1;
-	} else {
-		stream->ff_data.output = avformat_alloc_context();
-		if (stream->ff_data.output)
-			stream->ff_data.output->oformat = outfmt;
-		else
-			ret = -1;
-	}
-
-	return ret;
-}
-
-static int get_audio_mix_count(int audio_mix_mask)
-{
-	int mix_count = 0;
-
-	for (int i = 0; i < MAX_AUDIO_MIXES; i++) {
-		if ((audio_mix_mask & (1 << i)) != 0)
-			mix_count++;
-	}
-
-	return mix_count;
-}
-
-static inline int encoder_bitrate(obs_encoder_t *encoder)
-{
-	obs_data_t *settings = obs_encoder_get_settings(encoder);
-	const int bitrate = (int)obs_data_get_int(settings, "bitrate");
-
-	obs_data_release(settings);
-
-	return bitrate;
-}
-
-static int proto_try_connect(struct ffmpeg_encoded_output *stream)
-{
-	int ret = 0;
-	const char *url = stream->path.array;
-	obs_encoder_t *vencoder = obs_output_get_video_encoder(stream->output);
-	obs_encoder_t *aencoder =
-		obs_output_get_audio_encoder(stream->output, 0);
-	video_t *video = obs_encoder_video(vencoder);
-	audio_t *audio = obs_encoder_audio(aencoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-	struct ffmpeg_cfg config;
-	bool success;
-
-	config.url = url;
-	config.format_name = "mpegts";
-	config.format_mime_type = "video/MP2T";
-	config.muxer_settings = "";
-	config.video_bitrate = encoder_bitrate(vencoder);
-	config.audio_bitrate = encoder_bitrate(aencoder);
-	config.gop_size = 250;
-	config.video_encoder = "";
-	config.video_encoder_id = AV_CODEC_ID_H264;
-	config.audio_encoder = "";
-	config.audio_encoder_id = AV_CODEC_ID_AAC;
-	config.video_settings = "";
-	config.audio_settings = "";
-	config.scale_width = 0;
-	config.scale_height = 0;
-	config.width = obs_encoder_get_width(vencoder);
-	config.height = obs_encoder_get_height(vencoder);
-	config.audio_tracks = (int)obs_output_get_mixer(stream->output);
-	config.audio_mix_count = 1;
-	config.format =
-		obs_to_ffmpeg_video_format(video_output_get_format(video));
-
-	if (format_is_yuv(voi->format)) {
-		config.color_range = voi->range == VIDEO_RANGE_FULL
-					     ? AVCOL_RANGE_JPEG
-					     : AVCOL_RANGE_MPEG;
-		config.color_space = voi->colorspace == VIDEO_CS_709
-					     ? AVCOL_SPC_BT709
-					     : AVCOL_SPC_BT470BG;
-	} else {
-		config.color_range = AVCOL_RANGE_UNSPECIFIED;
-		config.color_space = AVCOL_SPC_RGB;
-	}
-
-	if (config.format == AV_PIX_FMT_NONE) {
-		blog(LOG_DEBUG, "invalid pixel format used for FFmpeg output");
-		return false;
-	}
-
-	if (!config.scale_width)
-		config.scale_width = config.width;
-	if (!config.scale_height)
-		config.scale_height = config.height;
-
-	success = ffmpeg_data_init(&stream->ff_data, &config);
-	if (!success)
-		return -1;
-
-	return ret;
-}
-
-static int proto_connect_time(struct ffmpeg_encoded_output *stream)
-{
-	UNUSED_PARAMETER(stream);
-
-	return 0;
-}
-
-static void proto_close(struct ffmpeg_encoded_output *stream)
-{
-	ffmpeg_data_free(&stream->ff_data);
-}
-
-static inline int64_t _rescale_ts(struct ffmpeg_encoded_output *stream,
-				  int64_t val, int idx)
-{
-	AVStream *avstream = stream->ff_data.output->streams[idx];
-
-	return av_rescale_q_rnd(val / avstream->codec->time_base.num,
-				avstream->codec->time_base, avstream->time_base,
-				AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
-}
-
-static int proto_send_packet(struct ffmpeg_encoded_output *stream,
-			     struct encoder_packet *obs_packet, bool is_header)
-{
-	AVPacket av_packet = {0};
-	int ret = 0;
-	int streamIdx = (obs_packet->type == OBS_ENCODER_VIDEO) ? 0 : 1;
-
-	//2. send
-	av_init_packet(&av_packet);
-
-	av_packet.data = obs_packet->data;
-	av_packet.size = (int)obs_packet->size;
-	av_packet.stream_index = streamIdx;
-	av_packet.pts = _rescale_ts(stream, obs_packet->pts, streamIdx);
-	av_packet.dts = _rescale_ts(stream, obs_packet->dts, streamIdx);
-
-	if (obs_packet->keyframe)
-		av_packet.flags = AV_PKT_FLAG_KEY;
-
-	ret = av_interleaved_write_frame(stream->ff_data.output, &av_packet);
-	stream->total_bytes_sent += obs_packet->size;
-	if (is_header)
-		bfree(obs_packet->data);
-	else
-		obs_encoder_packet_release(obs_packet);
-
-	return ret;
-}
-
-static void proto_set_output_error(struct ffmpeg_encoded_output *stream)
-{
-	UNUSED_PARAMETER(stream);
-}
-
-static void ffmpeg_encoded_output_destroy(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	if (stopping(stream) && !connecting(stream)) {
-		pthread_join(stream->send_thread, NULL);
-
-	} else if (connecting(stream) || active(stream)) {
-		if (stream->connecting)
-			pthread_join(stream->connect_thread, NULL);
-
-		stream->stop_ts = 0;
-		os_event_signal(stream->stop_event);
-
-		if (active(stream)) {
-			os_sem_post(stream->send_sem);
-			obs_output_end_data_capture(stream->output);
-			pthread_join(stream->send_thread, NULL);
-		}
-	}
-
-	free_packets(stream);
-	dstr_free(&stream->path);
-	dstr_free(&stream->key);
-	dstr_free(&stream->username);
-	dstr_free(&stream->password);
-	dstr_free(&stream->encoder_name);
-	os_event_destroy(stream->stop_event);
-	os_sem_destroy(stream->send_sem);
-	pthread_mutex_destroy(&stream->packets_mutex);
-	circlebuf_free(&stream->packets);
-#ifdef TEST_FRAMEDROPS
-	circlebuf_free(&stream->droptest_info);
-#endif
-
-	os_event_destroy(stream->buffer_space_available_event);
-	os_event_destroy(stream->buffer_has_data_event);
-	os_event_destroy(stream->send_thread_signaled_exit);
-	pthread_mutex_destroy(&stream->write_buf_mutex);
-	ffmpeg_data_free(&stream->ff_data);
-	if (stream->write_buf)
-		bfree(stream->write_buf);
-	bfree(stream);
-}
-
-static void *ffmpeg_encoded_output_create(obs_data_t *settings,
-					  obs_output_t *output)
-{
-	struct ffmpeg_encoded_output *stream =
-		bzalloc(sizeof(struct ffmpeg_encoded_output));
-
-	stream->output = output;
-	pthread_mutex_init_value(&stream->packets_mutex);
-
-	proto_init(stream);
-
-	if (pthread_mutex_init(&stream->packets_mutex, NULL) != 0)
-		goto fail;
-	if (os_event_init(&stream->stop_event, OS_EVENT_TYPE_MANUAL) != 0)
-		goto fail;
-
-	if (pthread_mutex_init(&stream->write_buf_mutex, NULL) != 0) {
-		warn("Failed to initialize write buffer mutex");
-		goto fail;
-	}
-
-	if (os_event_init(&stream->buffer_space_available_event,
-			  OS_EVENT_TYPE_AUTO) != 0) {
-		warn("Failed to initialize write buffer event");
-		goto fail;
-	}
-	if (os_event_init(&stream->buffer_has_data_event, OS_EVENT_TYPE_AUTO) !=
-	    0) {
-		warn("Failed to initialize data buffer event");
-		goto fail;
-	}
-	if (os_event_init(&stream->send_thread_signaled_exit,
-			  OS_EVENT_TYPE_MANUAL) != 0) {
-		warn("Failed to initialize socket exit event");
-		goto fail;
-	}
-
-	UNUSED_PARAMETER(settings);
-
-	return stream;
-
-fail:
-	ffmpeg_encoded_output_destroy(stream);
-	return NULL;
-}
-
-static bool ffmpeg_encoded_output_start(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	if (!obs_output_can_begin_data_capture(stream->output, 0))
-		return false;
-	if (!obs_output_initialize_encoders(stream->output, 0))
-		return false;
-
-	os_atomic_set_bool(&stream->connecting, true);
-
-	return pthread_create(&stream->connect_thread, NULL, connect_thread,
-			      stream) == 0;
-}
-
-#define MILLISECOND_DEN 1000
-
-static int32_t get_ms_time(struct encoder_packet *packet, int64_t val)
-{
-	return (int32_t)(val * MILLISECOND_DEN / packet->timebase_den);
-}
-
-static void ffmpeg_encoded_output_data(void *data,
-				       struct encoder_packet *packet)
-{
-	struct ffmpeg_encoded_output *stream = data;
-	struct encoder_packet new_packet;
-	bool added_packet = false;
-
-	if (disconnected(stream) || !active(stream))
-		return;
-
-	if (packet->type == OBS_ENCODER_VIDEO) {
-		if (!stream->got_first_video) {
-			stream->start_dts_offset =
-				get_ms_time(packet, packet->dts);
-			stream->got_first_video = true;
-		}
-	}
-	obs_encoder_packet_ref(&new_packet, packet);
-
-	pthread_mutex_lock(&stream->packets_mutex);
-
-	if (!disconnected(stream))
-		added_packet = (packet->type == OBS_ENCODER_VIDEO)
-				       ? add_video_packet(stream, &new_packet)
-				       : add_packet(stream, &new_packet);
-
-	pthread_mutex_unlock(&stream->packets_mutex);
-
-	if (added_packet)
-		os_sem_post(stream->send_sem);
-	else
-		obs_encoder_packet_release(&new_packet);
-}
-
-static void ffmpeg_encoded_output_stop(void *data, uint64_t ts)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	if (stopping(stream) && ts != 0)
-		return;
-
-	if (connecting(stream))
-		pthread_join(stream->connect_thread, NULL);
-
-	stream->stop_ts = ts / 1000ULL;
-
-	if (ts)
-		stream->shutdown_timeout_ts =
-			ts +
-			(uint64_t)stream->max_shutdown_time_sec * 1000000000ULL;
-
-	if (active(stream)) {
-		os_event_signal(stream->stop_event);
-		if (stream->stop_ts == 0)
-			os_sem_post(stream->send_sem);
-	} else {
-		obs_output_signal_stop(stream->output, OBS_OUTPUT_SUCCESS);
-	}
-}
-
-static void ffmpeg_encoded_output_defaults(obs_data_t *defaults)
-{
-	obs_data_set_default_int(defaults, OPT_DROP_THRESHOLD, 700);
-	obs_data_set_default_int(defaults, OPT_PFRAME_DROP_THRESHOLD, 900);
-	obs_data_set_default_int(defaults, OPT_MAX_SHUTDOWN_TIME_SEC, 30);
-}
-
-static obs_properties_t *ffmpeg_encoded_output_properties(void *unused)
-{
-	UNUSED_PARAMETER(unused);
-	obs_properties_t *props = obs_properties_create();
-
-	obs_properties_add_int(
-		props, OPT_DROP_THRESHOLD,
-		obs_module_text("FFmpegEncodedOutput.DropThreshold"), 200,
-		10000, 100);
-
-	return props;
-}
-
-static uint64_t ffmpeg_encoded_output_total_bytes_sent(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	return stream->total_bytes_sent;
-}
-
-static int ffmpeg_encoded_output_dropped_frames(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	return stream->dropped_frames;
-}
-
-static float ffmpeg_encoded_output_congestion(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	return stream->min_priority > 0 ? 1.0f : stream->congestion;
-}
-
-static int ffmpeg_encoded_output_connect_time(void *data)
-{
-	struct ffmpeg_encoded_output *stream = data;
-
-	return proto_connect_time(stream);
-}
-
-struct obs_output_info ffmpeg_encoded_output_info = {
-	.id = "ffmpeg_encoded_output",
-	.flags = OBS_OUTPUT_AV | OBS_OUTPUT_ENCODED | OBS_OUTPUT_SERVICE |
-		 OBS_OUTPUT_MULTI_TRACK,
-	.encoded_video_codecs = "h264",
-	.encoded_audio_codecs = "aac",
-	.get_name = ffmpeg_encoded_output_getname,
-	.create = ffmpeg_encoded_output_create,
-	.destroy = ffmpeg_encoded_output_destroy,
-	.start = ffmpeg_encoded_output_start,
-	.stop = ffmpeg_encoded_output_stop,
-	.encoded_packet = ffmpeg_encoded_output_data,
-	.get_defaults = ffmpeg_encoded_output_defaults,
-	.get_properties = ffmpeg_encoded_output_properties,
-	.get_total_bytes = ffmpeg_encoded_output_total_bytes_sent,
-	.get_congestion = ffmpeg_encoded_output_congestion,
-	.get_connect_time_ms = ffmpeg_encoded_output_connect_time,
-	.get_dropped_frames = ffmpeg_encoded_output_dropped_frames};

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/ffmpeg-encoded-output.h Deleted

@@ -1,108 +0,0 @@
-/******************************************************************************
-    Copyright (C) 2019 Haivision Systems Inc.
-    Copyright (C) 2014 by Hugh Bailey <obs.jim@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 <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-#include <obs-module.h>
-#include <obs-avc.h>
-#include <util/platform.h>
-#include <util/circlebuf.h>
-#include <util/dstr.h>
-#include <util/threading.h>
-#include <inttypes.h>
-#include "obs-ffmpeg-output.h"
-#include "obs-ffmpeg-formats.h"
-
-#define do_log(level, format, ...)                           \
-	blog(level, "[ffmpeg-encoded-output: '%s'] " format, \
-	     obs_output_get_name(stream->output), ##__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 OPT_DROP_THRESHOLD "drop_threshold_ms"
-#define OPT_PFRAME_DROP_THRESHOLD "pframe_drop_threshold_ms"
-#define OPT_MAX_SHUTDOWN_TIME_SEC "max_shutdown_time_sec"
-#define OPT_LOWLATENCY_ENABLED "low_latency_mode_enabled"
-
-//#define TEST_FRAMEDROPS
-
-#ifdef TEST_FRAMEDROPS
-
-#define DROPTEST_MAX_KBPS 3000
-#define DROPTEST_MAX_BYTES (DROPTEST_MAX_KBPS * 1000 / 8)
-
-struct droptest_info {
-	uint64_t ts;
-	size_t size;
-};
-#endif
-
-struct ffmpeg_encoded_output {
-	obs_output_t *output;
-
-	pthread_mutex_t packets_mutex;
-	struct circlebuf packets;
-	bool sent_sps_pps;
-
-	bool got_first_video;
-	int64_t start_dts_offset;
-
-	volatile bool connecting;
-	pthread_t connect_thread;
-
-	volatile bool active;
-	volatile bool disconnected;
-	pthread_t send_thread;
-
-	int max_shutdown_time_sec;
-
-	os_sem_t *send_sem;
-	os_event_t *stop_event;
-	uint64_t stop_ts;
-	uint64_t shutdown_timeout_ts;
-
-	struct dstr path, key;
-	struct dstr username, password;
-	struct dstr encoder_name;
-
-	/* frame drop variables */
-	int64_t drop_threshold_usec;
-	int64_t pframe_drop_threshold_usec;
-	int min_priority;
-	float congestion;
-
-	int64_t last_dts_usec;
-
-	uint64_t total_bytes_sent;
-	int dropped_frames;
-
-#ifdef TEST_FRAMEDROPS
-	struct circlebuf droptest_info;
-	size_t droptest_size;
-#endif
-
-	uint8_t *write_buf;
-	size_t write_buf_len;
-	size_t write_buf_size;
-	pthread_mutex_t write_buf_mutex;
-	os_event_t *buffer_space_available_event;
-	os_event_t *buffer_has_data_event;
-	os_event_t *send_thread_signaled_exit;
-
-	struct ffmpeg_data ff_data;
-};

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/d3d1x_shaders.hpp Deleted

obs-studio-25.0.8.tar.xz/.github/workflows/clang-format.yml -> obs-studio-26.0.0.tar.xz/.github/workflows/clang-format.yml Changed

obs-studio-26.0.0.tar.xz/.github/workflows/docs.yml Added

@@ -0,0 +1,45 @@
+name: Generate Documentation
+
+on:
+  push:
+    paths-ignore:
+      - "cmake/**"
+  pull_request:
+    paths:
+      - "docs/sphinx/**"
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Bump Version Number
+        shell: bash
+        if: github.event_name == 'push'
+        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_REMATCH[1]}"; else VER+="."; fi
+                  VER+="${BASH_REMATCH[1]}"
+              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: ammaraskar/sphinx-action@master
+        with:
+          docs-folder: "docs/sphinx/"
+      - uses: actions/upload-artifact@v1
+        with:
+          name: OBS Studio Documentation (HTML)
+          path: docs/sphinx/_build/html/

obs-studio-25.0.8.tar.xz/.github/workflows/main.yml -> obs-studio-26.0.0.tar.xz/.github/workflows/main.yml Changed

@@ -2,8 +2,12 @@
 
 on:
   push:
+    paths-ignore:
+      - '**.md'
     branches:
       - master
+    tags:
+      - '*'
   pull_request:
     paths-ignore:
       - '**.md'
@@ -19,10 +23,11 @@
     name: 'macOS 64-bit'
     runs-on: [macos-latest]
     env:
-      MACOS_DEPS_VERSION: '2020-04-24'
+      MACOS_DEPS_VERSION: '2020-08-30'
       VLC_VERSION: '3.0.8'
       SPARKLE_VERSION: '1.23.0'
       QT_VERSION: '5.14.1'
+      SIGN_IDENTITY: ''
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
@@ -34,38 +39,91 @@
           echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)
           echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)
           echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)
+      - name: 'Check for Github Labels'
+        if: github.event_name == 'pull_request'
+        run: |
+          LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"
+          LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "$.*$",/\1/p' | grep 'Seeking Testers' || true)"
+          if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then
+            echo ::set-env name=SEEKING_TESTERS::1
+          else
+            echo ::set-env name=SEEKING_TESTERS::0
+          fi
       - name: 'Install prerequisites (Homebrew)'
         shell: bash
         run: |
+          brew update --preinstall
           brew bundle --file ./CI/scripts/macos/Brewfile
+      - name: 'Restore Chromium Embedded Framework from cache'
+        id: cef-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'cef-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION }}
+      - name: 'Restore pre-built dependencies from cache'
+        id: deps-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'deps-cache'
+        with:
+          path: /tmp/obsdeps
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.MACOS_DEPS_VERSION }}
+      - name: 'Restore pre-built Qt dependency from cache'
+        id: deps-qt-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'deps-qt-cache'
+        with:
+          path: /tmp/obsdeps
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.MACOS_DEPS_VERSION }}
+      - name: 'Restore VLC dependency from cache'
+        id: vlc-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'vlc-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.VLC_VERSION }}
+      - name: 'Restore Sparkle dependency from cache'
+        id: sparkle-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'sparkle-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/sparkle
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.SPARKLE_VERSION }}
       - name: 'Install prerequisite: Pre-built dependencies'
+        if: steps.deps-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-deps-${{ env.MACOS_DEPS_VERSION }}.tar.gz
+          tar -xf ./macos-deps-${{ env.MACOS_DEPS_VERSION }}.tar.gz -C "/tmp"
+      - name: 'Install prerequisite: Pre-built dependency Qt'
+        if: steps.deps-qt-cache.outputs.cache-hit != 'true'
         shell: bash
         run: |
-          curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/osx-deps-${{ env.MACOS_DEPS_VERSION }}.tar.gz
-          tar -xf ./osx-deps-${{ env.MACOS_DEPS_VERSION }}.tar.gz -C "/tmp"
+          curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-qt-${{ env.QT_VERSION }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz
+          tar -xf ./macos-qt-${{ env.QT_VERSION }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz -C "/tmp"
+          xattr -r -d com.apple.quarantine /tmp/obsdeps
       - name: 'Install prerequisite: VLC'
+        if: steps.vlc-cache.outputs.cache-hit != 'true'
         shell: bash
         run: |
           curl -L -O https://downloads.videolan.org/vlc/${{ env.VLC_VERSION }}/vlc-${{ env.VLC_VERSION }}.tar.xz
           if [ ! -d "${{ github.workspace }}/cmbuild" ]; then mkdir "${{ github.workspace }}/cmbuild"; fi
           tar -xf ./vlc-${{ env.VLC_VERSION }}.tar.xz -C "${{ github.workspace }}/cmbuild"
       - name: 'Install prerequisite: Sparkle'
+        if: steps.sparkle-cache.outputs.cache-hit != 'true'
         shell: bash
         run: |
           curl -L -o sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/${{ env.SPARKLE_VERSION }}/Sparkle-${{ env.SPARKLE_VERSION }}.tar.bz2
           mkdir ${{ github.workspace }}/cmbuild/sparkle
           tar -xf ./sparkle.tar.bz2 -C ${{ github.workspace }}/cmbuild/sparkle
-          sudo cp -R ${{ github.workspace }}/cmbuild/sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
-      - name: 'Restore Chromium Embedded Framework from cache'
-        id: cef-cache
-        uses: actions/cache@v1
-        env:
-          CACHE_NAME: 'cef-cache'
-        with:
-          path: ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64
-          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION }}
-          restore-keys: |
-            ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-
+      - name: 'Setup prerequisite: Sparkle'
+        shell: bash
+        run: sudo cp -R ${{ github.workspace }}/cmbuild/sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
       - name: 'Install prerequisite: Chromium Embedded Framework'
         if: steps.cef-cache.outputs.cache-hit != 'true'
         shell: bash
@@ -86,39 +144,170 @@
         run: |
           mkdir ./build
           cd ./build
-          cmake -DENABLE_SPARKLE_UPDATER=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DQTDIR="/usr/local/Cellar/qt/${{ env.QT_VERSION }}" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..
+          cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..
       - name: 'Build'
         shell: bash
         working-directory: ${{ github.workspace }}/build
         run: make -j4
-      - name: 'Install prerequisite: Packages app'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+      - name: 'Test'
         shell: bash
-        run: |
-          curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
-          sudo installer -pkg ./Packages.pkg -target /
+        working-directory: ${{ github.workspace }}/build
+        run: make CTEST_OUTPUT_ON_FAILURE=1 test
       - name: 'Install prerequisite: DMGbuild'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         shell: bash
         run: |
           pip3 install dmgbuild
+      - name: 'Install Apple Developer Certificate'
+        if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'
+        uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
+        with:
+          p12-file-base64: ${{ secrets.MACOS_SIGNING_CERT }}
+          p12-password: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
+      - name: 'Set Signing Identity'
+        if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'
+        run: |
+          echo "::set-env name=SIGN_IDENTITY::${{ secrets.MACOS_SIGNING_IDENTITY }}"
+      - name: 'Create macOS application bundle'
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
+        working-directory: ${{ github.workspace }}/build
+        shell: bash
+        run: |
+          if [ -d ./OBS.app ]; then rm -rf ./OBS.app; fi
+          mkdir -p OBS.app/Contents/MacOS
+          mkdir OBS.app/Contents/PlugIns
+          mkdir OBS.app/Contents/Resources
+
+          cp rundir/RelWithDebInfo/bin/obs ./OBS.app/Contents/MacOS
+          cp rundir/RelWithDebInfo/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
+          cp rundir/RelWithDebInfo/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
+          cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources
+          cp ../CI/scripts/macos/app/obs.icns ./OBS.app/Contents/Resources
+          cp -R rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/PlugIns
+          cp ../CI/scripts/macos/app/Info.plist ./OBS.app/Contents
+
+          if [ -d ./OBS.app/Contents/Resources/data/obs-scripting ]; then
+            mv ./OBS.app/Contents/Resources/data/obs-scripting/obslua.so ./OBS.app/Contents/MacOS/
+            # mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/
+            # mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/
+            rm -rf ./OBS.app/Contents/Resources/data/obs-scripting/
+          fi
+
+          ../CI/scripts/macos/app/dylibBundler -cd -of -a ./OBS.app -q -f \
+            -s ./OBS.app/Contents/MacOS \
+            -s "${{ github.workspace }}/cmbuild/sparkle/Sparkle.framework" \
+            -s ./rundir/RelWithDebInfo/bin \
+            -x ./OBS.app/Contents/PlugIns/coreaudio-encoder.so \
+            -x ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so \
+            -x ./OBS.app/Contents/PlugIns/frontend-tools.so \
+            -x ./OBS.app/Contents/PlugIns/image-source.so \
+            -x ./OBS.app/Contents/PlugIns/linux-jack.so \
+            -x ./OBS.app/Contents/PlugIns/mac-avcapture.so \
+            -x ./OBS.app/Contents/PlugIns/mac-capture.so \
+            -x ./OBS.app/Contents/PlugIns/mac-decklink.so \
+            -x ./OBS.app/Contents/PlugIns/mac-syphon.so \
+            -x ./OBS.app/Contents/PlugIns/mac-vth264.so \
+            -x ./OBS.app/Contents/PlugIns/obs-browser.so \
+            -x ./OBS.app/Contents/PlugIns/obs-browser-page \
+            -x ./OBS.app/Contents/PlugIns/obs-ffmpeg.so \
+            -x ./OBS.app/Contents/PlugIns/obs-filters.so \
+            -x ./OBS.app/Contents/PlugIns/obs-transitions.so \
+            -x ./OBS.app/Contents/PlugIns/obs-vst.so \
+            -x ./OBS.app/Contents/PlugIns/rtmp-services.so \
+            -x ./OBS.app/Contents/MacOS/obs-ffmpeg-mux \
+            -x ./OBS.app/Contents/MacOS/obslua.so \
+            -x ./OBS.app/Contents/PlugIns/obs-x264.so \
+            -x ./OBS.app/Contents/PlugIns/text-freetype2.so \
+            -x ./OBS.app/Contents/PlugIns/obs-libfdk.so \
+            -x ./OBS.app/Contents/PlugIns/obs-outputs.so
+
+          mv ./libobs-opengl/libobs-opengl.so ./OBS.app/Contents/Frameworks
+
+          cp -R /tmp/obsdeps/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks
+          chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework
+          rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers
+          rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/
+          chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist
+          install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
+          install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
+
+          sudo cp -R "${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
+          sudo chown -R $(whoami) ./OBS.app/Contents/Frameworks/
+
+          cp ../CI/scripts/macos/app/OBSPublicDSAKey.pem ./OBS.app/Contents/Resources
+
+          plutil -insert CFBundleVersion -string ${{ env.OBS_GIT_TAG }}-${{ env.OBS_GIT_HASH }} ./OBS.app/Contents/Info.plist
+          plutil -insert CFBundleShortVersionString -string ${{ env.OBS_GIT_TAG }}-${{ env.OBS_GIT_HASH }} ./OBS.app/Contents/Info.plist
+          plutil -insert OBSFeedsURL -string https://obsproject.com/osx_update/feeds.xml ./OBS.app/Contents/Info.plist
+          plutil -insert SUFeedURL -string https://obsproject.com/osx_update/stable/updates.xml ./OBS.app/Contents/Info.plist
+          plutil -insert SUPublicDSAKeyFile -string OBSPublicDSAKey.pem ./OBS.app/Contents/Info.plist
+
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop"
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate"
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" --deep ./OBS.app/Contents/Frameworks/Sparkle.framework
+
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libEGL.dylib"
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib"
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib"
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib"
+          codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework"
+
+          codesign --force --options runtime --entitlements "../CI/scripts/macos/app/entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep ./OBS.app
+
+          codesign -dvv ./OBS.app
       - name: 'Package'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
+        working-directory: ${{ github.workspace }}/build
         shell: bash
         run: |
           FILE_DATE=$(date +%Y-%m-%d)
-          FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-osx.dmg
+          FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-macOS.dmg
           echo "::set-env name=FILE_NAME::${FILE_NAME}"
-          ./CI/scripts/macos/prepareApp.sh
-          dmgbuild -s ./CI/scripts/macos/package/settings.json "OBS" OBS.dmg
-          mkdir ./nightly
-          sudo mv ./OBS.dmg ./nightly/${FILE_NAME}
+
+          cp ../CI/scripts/macos/package/settings.json.template ./settings.json
+          sed -i '' 's#\$\$VERSION\$\$#${{ env.OBS_GIT_TAG }}#g' ./settings.json
+          sed -i '' 's#\$\$CI_PATH\$\$#../CI/scripts/macos#g' ./settings.json
+          sed -i '' 's#\$\$BUNDLE_PATH\$\$#${{ github.workspace }}/build#g' ./settings.json
+
+          dmgbuild "OBS-Studio ${{ env.OBS_GIT_TAG }}" "${FILE_NAME}" -s ./settings.json
+          mkdir ../nightly
+          codesign --force --sign "${SIGN_IDENTITY:--}" ./"${FILE_NAME}"
+          codesign -dvv ./"${FILE_NAME}"
+          sudo cp ./${FILE_NAME} ../nightly/${FILE_NAME}
       - name: 'Publish'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         uses: actions/upload-artifact@v2-preview
         with:
           name: '${{ env.FILE_NAME }}'
           path: ./nightly/*.dmg
+      - name: 'Package Release'
+        if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'
+        working-directory: ${{ github.workspace }}/build
+        shell: bash
+        run: |
+          FILE_DATE=$(date +%Y-%m-%d)
+          FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-macOS.dmg
+          RELEASE_FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-rel-macOS.dmg
+          echo "::set-env name=RELEASE_FILE_NAME::${RELEASE_FILE_NAME}"
+
+          xcrun altool --store-password-in-keychain-item "AC_PASSWORD" -u "${{ secrets.MACOS_NOTARIZATION_USERNAME }}" -p "${{ secrets.MACOS_NOTARIZATION_PASSWORD }}"
+
+          xcnotary precheck "./OBS.app"
+
+          if [ "$?" -eq 0 ]; then
+            xcnotary notarize "$FILE_NAME" --developer-account "${{ secrets.MACOS_NOTARIZATION_USERNAME }}" --developer-password-keychain-item "AC_PASSWORD" --provider "${{ secrets.ASC_PROVIDER_SHORTNAME }}"
+          else
+            return 1
+          fi
+
+          mkdir ../release
+          sudo mv ./$FILE_NAME ../release/$RELEASE_FILE_NAME
+      - name: 'Publish Release'
+        if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'
+        uses: actions/upload-artifact@v2-preview
+        with:
+          name: '${{ env.RELEASE_FILE_NAME }}'
+          path: ./release/*.dmg
   ubuntu64:
     name: 'Linux/Ubuntu 64-bit'
     runs-on: [ubuntu-latest]
@@ -133,6 +322,16 @@
           echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)
           echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)
           echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)
+      - name: 'Check for Github Labels'
+        if: github.event_name == 'pull_request'
+        run: |
+          LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"
+          LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "$.*$",/\1/p' | grep 'Seeking Testers' || true)"
+          if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then
+            echo ::set-env name=SEEKING_TESTERS::1
+          else
+            echo ::set-env name=SEEKING_TESTERS::0
+          fi
       - name: Install prerequisites (Apt)
         shell: bash
         run: |
@@ -177,8 +376,18 @@
            python3-dev \
            qtbase5-dev \
            libqt5svg5-dev \
-           swig
+           swig \
+           libcmocka-dev
+      - name: 'Restore Chromium Embedded Framework from cache'
+        id: cef-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'cef-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION }}
       - name: 'Install prerequisite: Chromium Embedded Framework'
+        if: steps.cef-cache.outputs.cache-hit != 'true'
         shell: bash
         run: |
           curl -kL https://cdn-fastly.obsproject.com/downloads/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64.tar.bz2 -f --retry 5 -o cef.tar.bz2
@@ -189,13 +398,17 @@
         run: |
           mkdir ./build
           cd ./build
-          cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64" ..
+          cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64" ..
       - name: 'Build'
         shell: bash
         working-directory: ${{ github.workspace }}/build
         run: make -j4
+      - name: 'Test'
+        shell: bash
+        working-directory: ${{ github.workspace }}/build
+        run: make CTEST_OUTPUT_ON_FAILURE=1 test
       - name: 'Package'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         shell: bash
         run: |
           FILE_DATE=$(date +%Y-%m-%d)
@@ -208,7 +421,7 @@
           mv "${FILE_NAME}" ../nightly/
           cd -
       - name: 'Publish'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         uses: actions/upload-artifact@v2-preview
         with:
           name: '${{ env.FILE_NAME }}'
@@ -221,10 +434,9 @@
       CMAKE_GENERATOR: "Visual Studio 16 2019"
       CMAKE_SYSTEM_VERSION: "10.0.18363.657"
       WINDOWS_DEPS_VERSION: '2017'
+      VLC_VERSION: '3.0.0-git'
       TWITCH-CLIENTID: ${{ secrets.TWITCH_CLIENTID }}
       TWITCH-HASH: ${{ secrets.TWITCH_HASH }}
-      MIXER-CLIENTID: ${{ secrets.MIXER_CLIENTID }}
-      MIXER-HASH: ${{ secrets.MIXER_HASH }}
       RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }}
       RESTREAM-HASH: ${{ secrets.RESTREAM-HASH }}
     steps:
@@ -241,19 +453,66 @@
           echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)
           echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)
           echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)
+      - name: 'Check for Github Labels'
+        if: github.event_name == 'pull_request'
+        shell: bash
+        run: |
+          LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"
+          LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "$.*$",/\1/p' | grep 'Seeking Testers' || true)"
+          if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then
+            echo ::set-env name=SEEKING_TESTERS::1
+          else
+            echo ::set-env name=SEEKING_TESTERS::0
+          fi
+      - name: 'Restore QT dependency from cache'
+        id: qt-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'windows-qt-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/QT
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.QT_VERSION }}
+      - name: 'Restore pre-built dependencies from cache'
+        id: deps-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'windows-deps-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/deps
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.WINDOWS_DEPS_VERSION }}
+      - name: 'Restore VLC dependency from cache'
+        id: vlc-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'windows-vlc-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/vlc
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.VLC_VERSION }}
+      - name: 'Restore CEF dependency from cache (64 bit)'
+        id: cef-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'windows-cef-64-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION }}
       - name: 'Install prerequisite: QT'
+        if: steps.qt-cache.outputs.cache-hit != 'true'
         run: |
           curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_${{ env.QT_VERSION }}.7z -f --retry 5 -C -
           7z x Qt_${{ env.QT_VERSION }}.7z -o"${{ github.workspace }}/cmbuild/QT"
       - name: 'Install prerequisite: Pre-built dependencies'
+        if: steps.deps-cache.outputs.cache-hit != 'true'
         run: |
           curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -f --retry 5 -C -
           7z x dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -o"${{ github.workspace }}/cmbuild/deps"
       - name: 'Install prerequisite: VLC'
+        if: steps.vlc-cache.outputs.cache-hit != 'true'
         run: |
           curl -kL https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -o vlc.zip
           7z x vlc.zip -o"${{ github.workspace }}/cmbuild/vlc"
       - name: 'Install prerequisite: Chromium Embedded Framework'
+        if: steps.cef-cache.outputs.cache-hit != 'true'
         run: |
           curl -kL https://cdn-fastly.obsproject.com/downloads/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal.zip -f --retry 5 -o cef.zip
           7z x cef.zip -o"${{ github.workspace }}/cmbuild"
@@ -262,11 +521,11 @@
           mkdir ./build
           mkdir ./build64
           cd ./build64
-          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DCEF_ROOT_DIR="${{ github.workspace }}/cmdbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
+          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
       - name: 'Build'
         run: msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln
       - name: 'Package'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         run: |
           $env:FILE_DATE=(Get-Date -UFormat "%F")
           $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win64.zip"
@@ -274,7 +533,7 @@
           robocopy .\build64\rundir\RelWithDebInfo .\build\ /E /XF .gitignore
           7z a ${env:FILE_NAME} .\build\*
       - name: 'Publish'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         uses: actions/upload-artifact@v2-preview
         with:
           name: '${{ env.FILE_NAME }}'
@@ -290,8 +549,6 @@
       WINDOWS_DEPS_VERSION: '2017'
       TWITCH-CLIENTID: ${{ secrets.TWITCH_CLIENTID }}
       TWITCH-HASH: ${{ secrets.TWITCH_HASH }}
-      MIXER-CLIENTID: ${{ secrets.MIXER_CLIENTID }}
-      MIXER-HASH: ${{ secrets.MIXER_HASH }}
       RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }}
       RESTREAM-HASH: ${{ secrets.RESTREAM-HASH }}
     steps:
@@ -308,19 +565,66 @@
           echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)
           echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)
           echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)
+      - name: 'Check for Github Labels'
+        if: github.event_name == 'pull_request'
+        shell: bash
+        run: |
+          LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"
+          LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "$.*$",/\1/p' | grep 'Seeking Testers' || true)"
+          if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then
+            echo ::set-env name=SEEKING_TESTERS::1
+          else
+            echo ::set-env name=SEEKING_TESTERS::0
+          fi
+      - name: 'Restore QT dependency from cache'
+        id: qt-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'qt-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/QT
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.QT_VERSION }}
+      - name: 'Restore pre-built dependencies from cache'
+        id: deps-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'deps-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/deps
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.WINDOWS_DEPS_VERSION }}
+      - name: 'Restore VLC dependency from cache'
+        id: vlc-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'vlc-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/vlc
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.WINDOWS_VLC_VERSION }}
+      - name: 'Restore CEF dependency from cache (32 bit)'
+        id: cef-cache
+        uses: actions/cache@v1
+        env:
+          CACHE_NAME: 'cef-32-cache'
+        with:
+          path: ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal
+          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION }}
       - name: 'Install prerequisite: QT'
+        if: steps.qt-cache.outputs.cache-hit != 'true'
         run: |
           curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_${{ env.QT_VERSION }}.7z -f --retry 5 -C -
           7z x Qt_${{ env.QT_VERSION }}.7z -o"${{ github.workspace }}/cmbuild/QT"
       - name: 'Install prerequisite: Pre-built dependencies'
+        if: steps.deps-cache.outputs.cache-hit != 'true'
         run: |
           curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -f --retry 5 -C -
           7z x dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -o"${{ github.workspace }}/cmbuild/deps"
       - name: 'Install prerequisite: VLC'
+        if: steps.vlc-cache.outputs.cache-hit != 'true'
         run: |
           curl -kL https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -o vlc.zip
           7z x vlc.zip -o"${{ github.workspace }}/cmbuild/vlc"
       - name: 'Install prerequisite: Chromium Embedded Framework'
+        if: steps.cef-cache.outputs.cache-hit != 'true'
         run: |
           curl -kL https://cdn-fastly.obsproject.com/downloads/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal.zip -f --retry 5 -o cef.zip
           7z x cef.zip -o"${{ github.workspace }}/cmbuild"
@@ -329,11 +633,11 @@
           mkdir ./build
           mkdir ./build32
           cd ./build32
-          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCEF_ROOT_DIR="${{ github.workspace }}/cmdbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
+          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
       - name: 'Build'
         run: msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-studio.sln
       - name: 'Package'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         run: |
           $env:FILE_DATE=(Get-Date -UFormat "%F")
           $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win32.zip"
@@ -341,7 +645,7 @@
           robocopy .\build32\rundir\RelWithDebInfo .\build\ /E /XF .gitignore
           7z a ${env:FILE_NAME} .\build\*
       - name: 'Publish'
-        if: success() && (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'Seeking Testers'))
+        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
         uses: actions/upload-artifact@v2-preview
         with:
           name: '${{ env.FILE_NAME }}'

obs-studio-25.0.8.tar.xz/AUTHORS -> obs-studio-26.0.0.tar.xz/AUTHORS Changed

@@ -269,65 +269,80 @@
 wayne wang
 
 Translators:
-Translators:
  Afrikaans:
   - Samuel Nthoroane (Samuel_Nthoroane)
   - speedytechdev
+  - Vainock
   - Gol D. Ace (goldace)
  Albanian:
   - Aredio Vani (aredio.vani)
   - Albin Pllana (albinnpllanaa)
+  - avnidj
+  - unknowndomain
   - Gol D. Ace (goldace)
  Arabic:
   - ZILZAL
   - Abdullah AL-Qahtani (Za7ef_SA)
   - majdcomp
   - aaakjt
+  - Tareq Almutairi (Tareq_s)
+  - ibrahim younis (sintorea_incyx)
   - معتصم دعنا (rozana-media)
+  - Mohamed Zain (Thecheeseman)
   - Gol D. Ace (goldace)
-  - REMOVED_USER
-  - Saleh oukiki (salehoukiki)
   - Vainock
+  - Saleh oukiki (salehoukiki)
   - Tensai
   - Mustafa2018
-  - BeleganStartup (BeleganStartup)
+  - BeleganStartup
   - Ndalabo Taema (hake_bsowq)
+  - Ahmad Alkurbi (DontPlay)
   - Hani Sweileh (hno.sweileh)
   - BWU Wheelman (Wheelman)
+  - Nasser Bin Laboun (nasserbinlaboun)
   - FC Barcelona HD (kurdnews)
+  - osmansalih (hpcplus2016)
+  - unknowndomain
   - Yhea Ahmad (yhea.ahmad7741)
   - Ahmed Hawam (Hawam)
   - Mnsor The-Ghost (mnsor1722011)
+  - Malaz Gold Edition (Malo7zz)
   - dodgepong
   - chaironeko
   - Hadi Gamer (hadigamer3131)
  Azerbaijani:
   - Shahin Farzaliyev (Khan27)
+  - Javid-An
+  - unknowndomain
+  - Kənan Axundov (kenanaxundov2)
  Bashkir:
+  - Әлмәт Ак Арыслан (19082004amir)
   - Churikov Radmir Sergeevich (RadMir2)
+  - unknowndomain
+  - Synbulat Biishev (Syjalo)
  Basque:
   - Alexander Gabilondo (alexgabi)
   - Xabier Aramendi (azpidatziak)
-  - REMOVED_USER
-  - Osoitz (Osoitz)
+  - Osoitz
   - Gol D. Ace (goldace)
   - Vainock
   - EG Gamer (eggamer131)
-  - REMOVED_USER
-  - txaro (txaro)
+  - txaro
   - etxondoko
+  - unknowndomain
   - dodgepong
   - jolaus
-  - ziztazale
   - alaitzgabi
+  - ziztazale
   - zientek
  Bengali:
   - shamuntohamd
   - Rudro Rasel (rdrrsl)
-  - REMOVED_USER
   - Vainock
+  - Oymate
   - Nurul Huda (nurulhuda859)
   - Gol D. Ace (goldace)
+  - unknowndomain
   - Al Arafat (zonoiko)
  Bulgarian:
   - j3dy
@@ -337,13 +352,15 @@
   - Seyhan Halil (yildirim17)
   - Martin Georgiev (DivideByNone)
   - Vainock
-  - REMOVED_USER
   - Viktor Kitov (viktorkitov)
+  - djradimix
   - Stoyan Stoyanov (sstoyanov)
   - Stanislav_Evtimov
+  - Deivid Ivanov (GODMANEX)
   - Gol D. Ace (goldace)
   - Ivan (SKDown)
-  - djradimix
+  - unknowndomain
+  - Salif Mehmed (salifm)
   - Warchamp7
   - dodgepong
  Catalan:
@@ -353,29 +370,30 @@
   - Nil Campamà (Soifam)
   - Aleix Vidal i Gaya (leixet)
   - Vainock
-  - REMOVED_USER
+  - Lluís R (LluisR98)
   - Gol D. Ace (goldace)
+  - jan (test83318)
+  - vilagamer999
   - Pere O. (gotrunks)
+  - unknowndomain
+  - Adolfo Jayme (fitoschido)
   - Aniol Pagès (aniolpages)
-  - REMOVED_USER
   - dodgepong
-  - REMOVED_USER
  Chinese Simplified:
   - Bob Liu (Akagi201)
-  - AlexGuo1998 (AlexGuo1998)
+  - AlexGuo1998
   - wwj402_github
+  - fangzheng
   - Forbidden (Origami)
-  - Hexcolyte (Hexcolyte)
-  - AthlonHD (AthlonHD)
+  - Hexcolyte
+  - AthlonHD
   - Gol D. Ace (goldace)
-  - Licardo (Licardo)
+  - Licardo
   - PabloLiu (719018105)
-  - REMOVED_USER
-  - fangzheng (fangzheng)
-  - Sasasu (Sasasu)
+  - Sasasu
+  - Steven (stevenlele)
   - David Kuo (s50407s)
   - Vainock
-  - REMOVED_USER
   - 鲜童 (xiananjyzy)
   - Rudro Rasel (rdrrsl)
   - cai_miao
@@ -388,23 +406,23 @@
   - copyliu
   - Boyuan Yang (073plan)
   - Richard Stanway (r1ch)
+  - Gō̤ Brian Dìng (brightlikesun)
   - Bing Feng (fengbing123)
   - 科技小白堂 (lipeng0820)
   - WeiYuanStudio
+  - unknowndomain
   - WaterOtaku
   - sorayuki
-  - REMOVED_USER
   - dodgepong
-  - Bob Wei (BobWaver)
   - OYYZ
-  - FaZe Fakay (fazefakay)
+  - Bob Wei (BobWaver)
   - wordlessWind (wordlesswind)
+  - FaZe Fakay (fazefakay)
   - cylin
-  - Jiaxun Yang (flygoatfree)
   - 赵杭灵 (h1679083640)
-  - Martinzzz
+  - Jiaxun Yang (flygoatfree)
   - defeng
-  - REMOVED_USER
+  - Martinzzz
  Chinese Traditional:
   - TzeKei Lee (chikei)
   - Yi-Jyun Pan (pan93412)
@@ -413,64 +431,76 @@
   - Michael Yeh (hinet60613)
   - dodgepong
   - myjourney in Steemit (myjourney)
-  - You-Ruei Tzeng (e222et)
-  - open3 (kanbi99999)
+  - Yu-Juei Tseng (e222et)
+  - Kanbi Dungaitj (open3)
   - David Kuo (s50407s)
+  - loulou921222
   - Gol D. Ace (goldace)
   - Vainock
-  - louis921222
   - craftwar
   - Thomas (thomassth)
-  - REMOVED_USER
   - xixiaofan (Hs0)
   - Watson Tsai (ashaneba)
   - Han-Jen Cheng (notexist)
   - Inndy.Lin (inndy)
-  - ak-47root
+  - khng300
   - abc0922001
+  - ak-47root
   - Meng Hao Li (GazCore)
+  - Edison Lee (edisonlee55)
   - Append Huang (append)
-  - fangzheng (fangzheng)
+  - fangzheng
   - zhtw
   - JackYeah
+  - unknowndomain
   - Rudro Rasel (rdrrsl)
   - cai_miao
-  - REMOVED_USER
-  - Jimmy Huang (f56112000)
   - 曹恩逢 (nelson22768384)
+  - Jimmy Huang (f56112000)
   - FaZe Fakay (fazefakay)
-  - tomoe-musashi
   - chaironeko
+  - tomoe-musashi
+  - watadon
   - WeingHong
   - Bob Wei (BobWaver)
   - Tatsujin (c910335)
-  - watadon
-  - REMOVED_USER
+  - Tommy Chiang (oToToT)
  Croatian:
   - medicmomcilo
   - srdjan_m
+  - Fran Kelava (fkelava)
   - Runicar (dajtisina)
   - Wildrage
+  - schwabengeiz
+  - penta (junp5i)
   - OfficialwobY
   - Gol D. Ace (goldace)
   - Maky (the.real.maky)
   - Vainock
-  - REMOVED_USER
+  - unknowndomain
+  - CroatianTranslator
   - dodgepong
  Czech:
   - Jirka 'Venty' Michel (VentyCZ)
+  - Vít Loyd Kolomazník (nirczech)
+  - Matěj Kozák (GrrrandyCZ)
   - Kryštof Černý (cleverline1mc)
   - Vainock
+  - Stewio MC (stepandolsky)
   - Gol D. Ace (goldace)
   - JIMMY (vopasek)
   - Kiznoh
   - Sawanyo
+  - MrJaroslavik#8412 (MJaroslavik)
+  - TheWolfiKK
   - Erik Bročko (ericek111)
-  - Daniel Padrta (dpadrta)
+  - unknowndomain
   - dodgepong
-  - REMOVED_USER
+  - Martin Pilát (piltmartin)
+  - Daniel Padrta (dpadrta)
+  - Jáchym Plánička (Jacerros)
  Danish:
-  - NCAA (NCAA)
+  - NCAA
   - Jens Hyllegaard (Hyllegaard)
   - scootergrisen
   - MaltahlGaming (maltahlgaming)
@@ -479,22 +509,26 @@
   - Vainock
   - Anders Urban (minikaliffen)
   - Richard Stanway (r1ch)
+  - Kenneth Nielsen (kenneth.nielsen)
   - Marque Ziqulr (lugtelort)
-  - REMOVED_USER
   - Johan Keller Jensen (JKeller)
   - HeroGamers (Fido2603)
   - Christian Henriksen (cnhenriksen)
+  - unknowndomain
   - Nicolai Skødt Holmgaard (Nicolai9852)
   - Daniel Aundal (aundal)
   - dodgepong
+  - Mytologi
  Dutch:
   - Eric Bataille (ThoNohT)
   - Michel Snippe (michelsnippe)
   - Greendweller
+  - exeldro
   - Albakham (albakham)
-  - exeldro (exeldro)
   - Coen (Trigstur)
+  - Lars Acou (lars.acou)
   - Danny (Dkamps18)
+  - Richard Stanway (r1ch)
   - Nicole (Dutchess_Nicole)
   - robbert0891 (robbertoorschot38)
   - Gol D. Ace (goldace)
@@ -502,38 +536,55 @@
   - Harm van den Hoek (harm27)
   - Jasper J (JassieJ)
   - Vainock
+  - b__dm
   - Lars van Wijk (lhjvanwijk98)
+  - Chunlu chunnyluny (Chunnyluny)
   - Bond-009
   - markpc
   - Jennifer Falco (JenTheBluePanda)
   - andymidside
   - F_Producktions
-  - b__dm
+  - Thom Knepper (MrKnepp)
   - Bo Alsemgeest (bo.alsemgeest.wausie)
   - lokerhp
-  - REMOVED_USER
+  - unknowndomain
   - JorRy
   - Julian Meijboom (julianmeijboom)
   - RyyzQ
-  - JustMaffie (JustMaffie)
+  - JustMaffie
+  - Roeland Kussé (roeland)
   - Rik Roukens (rikroukens)
   - dodgepong
+ English, United Kingdom:
+  - Andi Chandler (andibing)
+  - unknowndomain
+  - matwey
+  - Vainock
+  - Noah Husby (noahhusby)
+  - Endysis
+  - Pete Russell (pete.russell.photos)
  Estonian:
   - MartinEwing
+  - Oliver Jõgar (treier57lol) (difiter23)
   - AndresTraks
-  - REMOVED_USER
   - C3kos (C3kos1)
   - Gol D. Ace (goldace)
+  - unknowndomain
   - Vainock
+  - Agu Ratas (aguratas)
  Filipino:
-  - dwaeji-aizelle (dwaeji-aizelle)
-  - nyakayed (nyakayed)
+  - dwaeji-aizelle
+  - nyakayed
   - Loyd Stephen Jayme (loydjayme25)
+  - CodeYan01
   - jermel
   - Gol D. Ace (goldace)
   - Vainock
-  - REMOVED_USER
+  - Raffy (Tested)
+  - arnoldsecret
   - Raylir
+  - unknowndomain
+  - Jake Llabres Rabelas (rabelasj)
   - vinzruzell
  Finnish:
   - Arkkis (j)
@@ -541,10 +592,10 @@
   - dodgepong
   - Tero Keso (tero.keso)
   - Gol D. Ace (goldace)
-  - Pyscowicz (Pyscowicz)
+  - Pyscowicz
   - Vainock
-  - REMOVED_USER
   - Obama (Obama44)
+  - unknowndomain
   - Ville Närhi (daimaah)
   - Arttu Ylhävuori (arttu.ylhavuori)
   - chaironeko
@@ -553,68 +604,76 @@
   - radzaquiel
   - Stéphane Lepin (Palakis)
   - Tocram2 (tocram2)
-  - REMOVED_USER
   - Benjamin Cambour (lesinfox)
   - Yberion
   - Léo (leeo97one)
   - RisedSky (THEMINECRAFT951)
-  - Pikana (Pikana)
+  - Pikana
+  - Guillaume Turchini (orion78fr)
   - BoboopTeam
   - DoK_-
-  - Guillaume Turchini (orion78fr)
   - DarckCrystale
   - Ben Turner (ben-turner)
+  - MaxALEau
   - DarkInFire
   - Theguiguix
   - Gol D. Ace (goldace)
-  - Youtubeur FR│Giaco35 (Giaco35)
   - Vainock
+  - Youtubeur FR│Giaco35 (Giaco35)
   - steve_fr
   - kyllian (tardigradeus)
-  - Deski_ (Deski_)
+  - Deski_
   - GANGAT Naeem (zboggum)
-  - REMOVED_USER
   - Aime23
   - Grisou2907
   - BaguetteDePain_
+  - Keter LordFR (YorHaDen)
+  - Jérémy LITIQUE (JeremyLTE)
   - illusdidi
-  - Mathieu Hautebas (matteyeux)
   - 🌠 DarK | #Hello 🌠 (DarKTV_FR)
+  - Mathieu Hautebas (matteyeux)
   - Yolopix
   - Gabriel Dugny (Gabigabigo)
   - tburette
   - Adrien “GameZone Tv” de Decker (redcraft007)
   - Richard Stanway (r1ch)
   - Zalki
-  - McGuygnol
   - SkytAsul (skytasul)
+  - McGuygnol
   - Alexis Brandner (Alexinfos)
   - Camille Nury (kamsdu30)
   - dodgepong
+  - Lexane Sirac (Exilexi)
+  - Jean-Mathieu Jm Samson (sjm450666)
   - Albakham (albakham)
+  - HistoriCode97
   - Warchamp7
   - SkylixX
-  - Jean-Mathieu Jm Samson (sjm450666)
   - chaironeko
+  - Lucas Juif (trycarnage)
   - William Dunn (williamdunnperso)
+  - Marc André Audet (Manhim)
   - HoPollo (HoPolloTV)
+  - E Ju (enuajenuaj)
+  - Parfum
   - Antwan
  Galician:
   - mbouzada
   - Xesús M. Mosquera Carregal (xesusmosquera)
   - Iváns (Ivans_translator)
   - Vainock
-  - REMOVED_USER
   - Gol D. Ace (goldace)
+  - unknowndomain
   - chaironeko
+  - aluaces
   - dodgepong
   - Máximo A. Coejo (mcoejo)
  Georgian:
   - georgianizator
   - Vainock
   - EduCare Razmik Badalyan (badalyanrazmik)
-  - REMOVED_USER
   - Gol D. Ace (goldace)
+  - unknowndomain
  German:
   - Gol D. Ace (goldace)
   - Vainock
@@ -622,104 +681,133 @@
   - Sven Kirschbaum (fallobst22) (fallobst22)
   - Gregor Bigalke (gregtcltk)
   - dodgepong
-  - Manuel (ElectronicWar)
   - Dennis Giebert (Isegrim) (isegrimderwolf)
+  - Manuel (ElectronicWar)
   - Tim (robske_110) (robske110)
   - Marvin J. (juettemarvin)
+  - lebaston100
   - mdod
   - Benjamin Klettbach (benklett)
+  - cryxgio
   - Jonas Otto (jottosmail)
-  - REMOVED_USER
   - WurstOnAir
-  - lebaston100.de
-  - REMOVED_USER
+  - BENNY (Elfaustus)
   - Richard Stanway (r1ch)
   - Palana
   - Jonathan (macburgerjunior)
+  - Achampnator
   - Enderdrache LP (enderdrachelp)
   - Prince_of_Raop
   - Robin Hielscher (Jack0r)
+  - unknowndomain
   - Patrick Frings (Ragnos)
-  - Lord Aidan (BadSideofBright)
-  - REMOVED_USER
   - AndreLeonardo (andreleonardoyt)
+  - Lord Aidan (BadSideofBright)
   - BoJustus
-  - REMOVED_USER
-  - REMOVED_USER
+  - hakuchi
   - Hadi Gamer (hadigamer3131)
+  - degra78 (degra789)
   - Tiim
-  - Fabian Küntzler (tringlp)
-  - Lasse Niermann (TheLasseHD)
-  - Fruxh#3282 (Fruxh)
-  - Glocker | Felix L. (Haard22)
   - Dominik Weissenseel (domisum)
+  - Lasse Niermann (TheLasseHD)
   - Elementies
+  - Fabian Küntzler (tringlp)
+  - Glocker | Felix L. (Haard22)
+  - Reboot (reboot)
+  - Laurenz (El3ctroGh0stL)
+  - Fruxh#3282 (Fruxh)
+  - Poolitzer
   - CisBetter
   - Martina Rauscheder (pixelpuppe)
+  - Enderdrache LP (EnderdracheLP2)
   - korte.jan (jkoankerich)
-  - Enderdrache LP (michaelroth882)
-  - Laurenz (El3ctroGh0stL)
-  - Reboot (reboot)
   - Kilian von Pflugk (kilianvonpflugk)
-  - Poolitzer
+  - Oldsmegga
  Greek:
-  - REMOVED_USER
   - Katerina (katerinaramm)
   - Scourgemcdak
   - Mepharees
+  - Pigot :P (pigot715)
   - Tasos Sahanidis (tatokis)
   - George T. (tzikas97)
   - Vainock
   - Alex Kalles (alexakis1997)
+  - Kostas F (Kostas-F)
   - Warmaster
   - Gol D. Ace (goldace)
+  - Ανδρέας Γεωργόπουλος (andrewgeo)
   - iosifidis
-  - Giorgos (giorgospap206)
+  - Giorgos (bigdiskboi)
   - Themis T. (Deminho)
-  - REMOVED_USER
+  - Jason_M
+  - unknowndomain
   - dodgepong
+  - Christis Andreou (ch.andreou)
   - chaironeko
   - Dimitris P. (dimitrisp2)
  Hebrew:
   - amirsher
   - lonelywolf11
   - djsavta
+  - Omeritzics Games (omeritzicschwartz)
+  - nachmanpop
   - Vainock
-  - Chemi (Chemi)
+  - Yotam Ziv (yotamziv87)
+  - עידו דנה (idodana01)
+  - Chemi
   - Gol D. Ace (goldace)
-  - REMOVED_USER
   - Light1c3
-  - epic_ziver_D (epic_ziver_D)
-  - REMOVED_USER
+  - Yoel (ye8323)
+  - epic_ziver_D
+  - Netro (roi_adler)
   - TheOver (upmeboost)
+  - unknowndomain
   - yair (5shekel)
   - אפיק רוזנר (afikr333)
   - ghsi
   - Tal Machani (talmachani)
  Hindi:
   - Saswata Banerjee (azure.saswata)
+  - Ravindra Pednekar (raviped)
   - Rahul Dhangar (rahuldhangar)
   - SneakyFish5
   - shamuntohamd
+  - unknowndomain
   - Gol D. Ace (goldace)
  Hungarian:
   - Gige
   - Balázs Meskó (mesko.balazs)
   - Gol D. Ace (goldace)
+  - Sárga Pulcsis (SargaPulcsis)
+  - sarkanyka444
   - Vainock
-  - REMOVED_USER
+  - Dániel P. (Daniii_)
   - Balázs Meskó (meskobalazs)
+  - TOM005
   - Adam Liszkai (adamos42)
   - vargag159
+  - unknowndomain
   - abydosan (abydoshun)
   - dodgepong
   - Sigge Stjärnholm (Kladdy)
+ Igbo:
+  - EzigboOmenana
+ Indonesian:
+  - M Akmal (akmalcakep59)
+  - Rendi (rendiazmi)
+  - ziasukmana
+  - GudankGaming GG (GudankGaming)
+  - Vainock
+  - Lieba Natur Brilian (naturbrilian)
+  - Anbiya Shafaat (Anfia)
+  - doplank
+  - unknowndomain
  Italian:
   - Manfre#9262 (manfre)
   - LordShadow95
   - Marocco2
-  - imcesca
   - Tiwi90 (tiwi90)
+  - imcesca
   - smart2128
   - Sergio Beneduce (sbeneduce)
   - Michele (ScrappyCocco)
@@ -728,83 +816,100 @@
   - Alessandro Sarto (alesarto03)
   - Tommaso Cammelli (tomganguz) (tomganguz)
   - mauriziopersi
-  - Martazza (Martazza)
+  - Martazza
   - ScemEnzo
+  - Christian Mazzola (_Alpha06)
   - Edoardo Macrì (edomacri)
   - Vainock
+  - Alessandro (AlexzanDev)
   - riccardotornesello
   - Gol D. Ace (goldace)
   - Edoardo “OfficialDJMela” Macrì (agersforum)
+  - Elena Shevaara (elenapinna15)
   - Silpheel
   - gianni morandi (strabbioboy)
-  - REMOVED_USER
   - Andrea-M3
   - Fisherozzo
-  - DomenicoDD (DomenicoDD)
+  - icovada
+  - DomenicoDD
   - SkyLion
+  - Asbesbopispa
+  - unknowndomain
+  - Owly
   - Federico Tensi (habby1337)
-  - NightMat (NightMat)
-  - Alessandro Iepure (alessandro_iepure)
+  - NightMat
   - Daniele02_777
-  - Valerio Ragni (ragni.valerio)
+  - Alessandro Iepure (alessandro_iepure)
+  - Flavio Rinaldi (flaviorinaldi)
   - Alessandro Levante (lallo2401)
+  - Valerio Ragni (ragni.valerio)
+  - Marco Scardovi (ScardracS)
   - Umberto Croci (umbertolb)
  Japanese:
   - shousa
-  - Kenta Takumi (kenta0644)
+  - Kenta Takumi (ClaraStyle)
   - Bhanu Victor DiCara (SplatRT)
+  - saygo1125
   - dodgepong
   - 森の子リスのミーコの大冒険 (Phroneris)
   - CKK COBALT (CKKCOBALT)
   - Vainock
+  - kotobato
   - Gol D. Ace (goldace)
+  - 青柳和宏 (sherlock1891holmes)
   - ato lash (hal_shu_sato)
-  - REMOVED_USER
+  - unknowndomain
   - 神成フィルム (kami00nari)
   - Bob Liu (Akagi201)
   - Alex Shafer (enzanki-ars)
-  - Yuki Yu (Yukiyu)
   - chaironeko
+  - Yuki Yu (Yukiyu)
   - TH_238
+  - Teimu Tekura (diglateam3)
  Khmer:
   - ប៉ុកណូ រ៉ូយ៉ាល់ (poknoroyal68)
   - បងមាន តែអូន (cheaiphone267)
   - Gol D. Ace (goldace)
  Korean:
-  - ynetwork (ynetwork)
+  - ynetwork
+  - Alex Lee (alex01763)
   - Vainock
   - Gol D. Ace (goldace)
   - RedditRook
   - Jong Kwon Choi (dailypro)
   - Ra.Workspace (RaWouk)
-  - REMOVED_USER
   - Russell (crimeroyal)
-  - REMOVED_USER
+  - unknowndomain
   - Charles Wallis (charlestw127)
   - antome
   - 김동현 (ehehguu)
   - dodgepong
-  - REMOVED_USER
  Kurdish:
   - Omer Kurdish (OmerKurd)
   - Vainock
+  - RanjdarAbdulrazzaq
+  - Aga Mangure (agaesmaeel)
  Lithuanian:
   - Justas Vilimas (tyntas)
   - xNaii (lyrikas5)
-  - REMOVED_USER
-  - Vainock
+  - Rolic
+  - TitasK (titukas1572)
+  - dnew (dbot)
+  - unknowndomain
   - Gol D. Ace (goldace)
+  - Vainock
  Malay:
   - amsyar ZeRo (amsyarminer555)
   - WeingHong
-  - REMOVED_USER
+  - Srap Dsign (srapdsign)
   - Gol D. Ace (goldace)
   - Vainock
+  - unknowndomain
   - dodgepong
  Mongolian:
   - begjan
   - Bilguun Ochirbat (Bil0203)
-  - REMOVED_USER
+  - unknowndomain
   - Vainock
   - Gol D. Ace (goldace)
  Norwegian Bokmal:
@@ -818,16 +923,16 @@
   - areedw
   - mgKaiztra
   - Tommy (nwgat)
+  - Vainock
+  - Jordan Stutzmann (J-Stutzmann)
   - Syver Stensholt (sssandum)
   - Alex Thomassen (Decicus)
-  - Vainock
   - Sander Skjegstad (r530er)
   - Gol D. Ace (goldace)
   - LBlend
   - OsteHovel
-  - REMOVED_USER
   - Legend27
-  - REMOVED_USER
+  - unknowndomain
   - chaironeko
   - Mats Andreassen (MatsA)
  Norwegian Nynorsk:
@@ -835,7 +940,8 @@
   - Eiliv
   - morden
   - LandyLERThERmfLOpi
-  - REMOVED_USER
+  - unknowndomain
+  - Yngve Spjeld Landro (yslandro)
   - Gol D. Ace (goldace)
  Persian:
   - koper
@@ -844,31 +950,34 @@
   - peymanr34
   - Vainock
   - Gol D. Ace (goldace)
+  - KinxShar (yasharaminasghari6)
   - Berrely
-  - Navid Sadeghieh (nsadeghieh)
+  - unknowndomain
   - Amirhossein yousefi (amir.sara)
+  - Navid Sadeghieh (nsadeghieh)
  Pirate English:
   - Matt Gajownik (WizardCM)
+  - ljcool2006
   - Matthew Hatcher (MatthewSH)
   - Uaiquqjwnsns
-  - Isabel L (william__)
-  - REMOVED_USER
+  - Isabel L (isabel_)
   - jkcoaster
   - Vainock
   - Coen (Trigstur)
   - Charlie W. (wallichc)
+  - unknowndomain
   - Emu-Phoenix
+  - WaterWater32
   - Gol D. Ace (goldace)
   - iltrof
   - Berrely
+  - Lol Wut (OldGrandmaFarts)
   - chaironeko
   - ncb
   - MaltahlGaming (maltahlgaming)
+  - Redback93
   - Mepharees
-  - Redback93 (Redback93)
-  - REMOVED_USER
   - kkartaltepe
-  - REMOVED_USER
  Polish:
   - Tomasz 'grocal' Grodzki (grocal)
   - Albakham (albakham)
@@ -882,22 +991,23 @@
   - sebek1pan
   - Mateusz (Silesianek)
   - Gol D. Ace (goldace)
-  - REMOVED_USER
   - opl
-  - popek069
+  - Popke
+  - Skajdrovski
+  - Michal (progamesmicrok)
+  - unknowndomain
   - Piteriuz
-  - Julia Drewniak (ewagsi)
   - dodgepong
-  - Michał Lewczak (michal200507)
+  - Julia Drewniak (ewagsi)
   - Patryk Kunda (ner.i.ol)
-  - REMOVED_USER
+  - Michał Lewczak (michal200507)
+  - Nojterone
   - Kubix1
-  - REMOVED_USER
+  - Jarsa132
  Portuguese:
   - Ev1lbl0w
-  - REMOVED_USER
-  - Manuela Silva (mansil)
   - joaofvieira
+  - Manuela Silva (mansil)
   - André Biscaia (LazP)
   - Tomás Antunes (tomasantunes)
   - Albakham (albakham)
@@ -905,41 +1015,57 @@
   - joaoboia
   - alexandre433
   - Vainock
-  - REMOVED_USER
-  - REMOVED_USER
+  - pedro.moreira.359 (pmmorsoft)
   - Gol D. Ace (goldace)
-  - REMOVED_USER
-  - Gabriell (gabriellpt04)
+  - Gabriel L. (realgabriell)
+  - Diogo Soares (DabliwAga)
+  - unknowndomain
+  - Tiago Mesquita (tiagomesquita)
+  - Gost_Evil
  Portuguese, Brazilian:
   - Shaolin (admshao)
   - Ramon Mendes (rbrgameplays)
   - Fabio Madia (Shaolin)
   - Burkes
-  - Guilherme Dias (ThisGuy)
+  - Guilherme Dias (Darkaiser)
   - Emanoel Lopes (emanoelopes)
-  - REMOVED_USER
   - TFSThiagoBR98
-  - CaioWzy
+  - Lincoln H. (LincolnH)
   - Vainock
+  - CaioWzy
   - mizifih
   - André Gama (ToeOficial)
   - Avellar (BetaTester)
+  - ドージェ (Doges)
   - clr0dr1g
   - aalonsomb
   - Gol D. Ace (goldace)
-  - REMOVED_USER
-  - DaDodger
+  - LoboMetalurgico
+  - Pragmata
+  - maribatis
+  - lakitoo
+  - João (fror)
   - DevilLorde
-  - João (florretardada)
+  - unknowndomain
   - Ramon Gonzalez (ramon200000)
   - Esdras Tarsis (esdrastarsis)
   - dodgepong
+  - andre.krdoso
+  - dlageBR
+  - park (TheBugMeNot)
+  - Finhawk
+  - Guilherme Cruz (gcrz)
+  - Tiago Danin (TiagoDanin)
   - sauloleite_quim
+  - hakimgrr
+  - Eliezer de Almeida (Eliezer62)
  Punjabi:
   - manjotsingh0202
+  - unknowndomain
  Romanian:
-  - Cristian Silaghi (stelistcristi)
+  - Cristian Silaghi (sno_w)
   - banrek
+  - Kele Ion Ion (krovyoll)
   - Hisashi
   - Andrei Ionescu (abcdedjdmddx)
   - BlakeNowah
@@ -948,9 +1074,12 @@
   - Mihai G (babasghenciu)
   - Vainock
   - Gol D. Ace (goldace)
-  - REMOVED_USER
+  - Johnthenoone
+  - AlexTheDacian
   - Diamyx
+  - unknowndomain
   - dodgepong
+  - alex123 alex123 (dumitruvalentin44)
   - chaironeko
   - Andrei Daniel (AndrelinYT)
  Russian:
@@ -959,62 +1088,86 @@
   - Andrei Stepanov (adem4ik)
   - Pavel (Shevalie)
   - VNGXR
-  - Bugo (Bugo)
+  - EDNVKjldr8vyu9
+  - Bugo
   - MaximGribanov
   - dodgepong
   - Vainock
   - Gol D. Ace (goldace)
   - Әлмәт Ак Арыслан (19082004amir)
   - Runoff Screen (glebpozbnakov62)
-  - Yaroslav (MrYadro)
-  - fromgate (fromgate)
-  - Strange Grey Cat (StrangeGreyCat)
   - Artem4ik
+  - Yaroslav (MrYadro)
+  - Пахомов Александр (GXTrus)
+  - fromgate
+  - Synbulat Biishev (Syjalo)
   - Sirboys
-  - REMOVED_USER
+  - Антон Илясов (Vewa9907)
   - Andy (anry025)
+  - er123rin (se123rin)
   - Nemesis (Nemesis07)
   - Serge Sklyarov (sergesklyarov)
+  - Андрей Курдюков (sandrix)
   - Makatavin # (makatavin0)
-  - ExZo (ExZo)
+  - HSD Channel (kvdbve34)
+  - Fik Dencer (4Soul)
+  - ExZo
   - Vlad (KoTmaxHo)
   - Vladimir (jeffors)
+  - RaspingMango (RaspingMango637)
   - Myasko
   - Mixaill
+  - Иван Геймеров (hronos-2t)
+  - Super 2004 (pe86ki)
   - Nikita Bibanaev (nicky18013)
   - Sergei Fug1t1v3 (fug)
+  - Максим Куренков (kuplay)
+  - Цезарь Ролл (vanessik78)
   - Walt Gee (vovanych)
+  - bxkr
+  - unknowndomain
+  - zy9c 1337 (zy9c228)
   - allan walpy (AndreyLysenkov)
   - Drahonn
   - SandoBY
+  - Mr. Games (oohskofgs)
   - Yuri Mihaqlov (yurijmi)
+  - Meldone (meldone)
+  - Anatoly (Atsupak)
+  - Kcurett TM (thekcurett)
   - TR1D
-  - Sigge Stjärnholm (Kladdy)
-  - iLefty
+  - TOWUK (towuk118)
   - Evgeny Bogdanov (vtrifonov548)
+  - iLefty
+  - Sigge Stjärnholm (Kladdy)
   - Kuji Kitamura (KujiKita)
+  - MeoWStraY
+  - Kirill Arkhipov (dokl957)
   - MUHADDIS MEDIA (muhaddismedia)
   - Milise_Tailise
+  - The ZedIvan (ZedIvan)
   - Churikov Radmir Sergeevich (RadMir2)
-  - chaironeko
+  - Sasha Sorokin (Sasha-Sorokin)
   - Юрій (Devinit)
+  - chaironeko
   - L1Q
-  - Sasha Sorokin (DaFri-Nochiterov)
+  - Sam Vo (samvo)
  Scottish Gaelic:
   - GunChleoc
   - Vainock
-  - REMOVED_USER
+  - unknowndomain
   - Gol D. Ace (goldace)
+  - matwey
  Serbian (Cyrillic):
   - nikolanikola
   - medicmomcilo
   - Vainock
+  - lukazivanovic
   - Acamicamacaraca
   - Gol D. Ace (goldace)
   - veles330
   - LittleGirl_WithPonyTail (alexs1320)
-  - Лука Живановић (lukazivanovic)
-  - REMOVED_USER
+  - unknowndomain
   - dodgepong
   - scienceangel
  Serbian (Latin):
@@ -1024,52 +1177,57 @@
   - Vainock
   - Gol D. Ace (goldace)
   - Rale Sarcevic (ralesarcevic)
-  - REMOVED_USER
+  - unknowndomain
   - dodgepong
   - scienceangel
+ Sinhala:
+  - Store (HelaBasa)
  Slovak:
   - Luki (luki1412)
   - Erik Bročko (ericek111)
+  - Daniel Dekan (daniel.dekan111)
   - Ján M (longmoped)
   - Anton Lokaj (anlo)
   - Vainock
-  - pelledani_
+  - Dániel P. (Daniii_)
+  - mickkymouse
+  - TheWolfiKK
   - Gol D. Ace (goldace)
+  - Miroslav Machala (Miroslav_Machala)
   - LoLLy Nka (lollynka279)
-  - REMOVED_USER
+  - unknowndomain
   - dodgepong
  Slovenian:
-  - REMOVED_USER
   - Arnold Marko (atomicmind)
   - kristjan.krusic (krusic22)
+  - Aleksander Kovač (Acookook)
   - MG lolenstine (mglolenstine)
-  - REMOVED_USER
   - Vainock
   - Grimpy
-  - REMOVED_USER
   - Gol D. Ace (goldace)
   - ArcaneWater
-  - REMOVED_USER
+  - unknowndomain
   - dodgepong
  Southern Sotho:
   - Samuel Nthoroane (Samuel_Nthoroane)
   - Gol D. Ace (goldace)
  Spanish:
   - Marcos Vidal Martinez (M4RK22)
-  - Jaime Martinez Rincon (mrjaime1999)
   - Monsteer
+  - Jaime Martinez Rincon (mrjaime1999)
   - Roberto Lorenzo (HonzoNebro)
   - Jaime Muñoz Martín (jmmartin_5)
   - Dalia Sofía Magallón Páramo (SweetSofiMC)
   - Alex E. D. B. (alexedb)
   - EG Gamer (eggamer131)
-  - REMOVED_USER
   - Pilar G. (TheMadnessLady)
   - Gol D. Ace (goldace)
+  - Lluís R (LluisR98)
   - Vainock
   - Maximiliano Schtroumpftech Pena-Roig (som2tokmynam)
+  - MarioMey
+  - Pakotoyako
   - Carlos Plata (carlosesgenial33)
-  - REMOVED_USER
   - eemiroj
   - henrycontreras
   - Skiddome (sergiomalagonmartin)
@@ -1082,15 +1240,20 @@
   - David Sonico (davidsubsonico)
   - Eleazar (MtrElee3)
   - amssusgameplays (willifake052)
+  - Adolfo Jayme (fitoschido)
   - Jaire (corpi.98)
   - Sigge Stjärnholm (Kladdy)
+  - unknowndomain
   - dodgepong
   - Rodrigo Ipince (ipince)
+  - Gloriana Cocozza (gcocozza)
   - chaironeko
+  - Mogabie's Nation (Mogabie)
   - Rubén Pérez (RixzZ)
-  - Rumope
-  - SneakyFish5
   - Stuttero
+  - SneakyFish5
+  - LuisAlfredo92
+  - Rumope
  Swedish:
   - Anton R (FirePhoenix)
   - Sigge Stjärnholm (Kladdy)
@@ -1101,18 +1264,19 @@
   - Vainock
   - Jonatan Nyberg (sweuser)
   - ArvidTheSwe
-  - REMOVED_USER
   - Olle Dahström (odahlstrom)
   - Gol D. Ace (goldace)
+  - unknowndomain
   - Henrik Mattsson-Mårn (rchk)
   - chaironeko
   - Jonas Svensson (jonassanojj99)
   - Hannes Blåman (thebluis)
   - TacticalKebab
+  - kronblom2
   - dodgepong
   - granbom
-  - MaltahlGaming (maltahlgaming)
   - Carl Fürstenberg (azatoth)
+  - MaltahlGaming (maltahlgaming)
  Tagalog:
   - dandalion
   - jermel
@@ -1121,62 +1285,74 @@
   - Vainock
   - Gol D. Ace (goldace)
   - Red Dayao (steemitph)
-  - REMOVED_USER
   - Laarnice
+  - unknowndomain
   - Raylir
  Tamil:
   - anto27
-  - REMOVED_USER
-  - REMOVED_USER
+  - Jaiganesh Kumaran (Jaiganesh)
   - Gol D. Ace (goldace)
   - Vainock
+  - unknowndomain
  Thai:
   - Nawin Somprasong (thaipirch98)
   - ธีรภัทร์ โยชนา (Gataro)
   - sakuhanachan* (sakuhanachanloli)
+  - SurachaiJUI
   - Sakia Normal Human (arcanaarcana5)
-  - 盛凤阁 (execzero)
+  - PolaX3
   - nongnoobjung (kitcharuk_4)
+  - 盛凤阁 (execzero)
+  - unknowndomain
   - แมน ทศพร (lovemanna456)
-  - REMOVED_USER
   - Vainock
   - dodgepong
   - Gol D. Ace (goldace)
+  - Ryan Gleeson (Ryan_7149)
  Turkish:
   - monolifed
   - Ali Kömesöğütlü (Mobile46) (byzlo685)
   - omer.karagoz (mrkaragoz)
   - Kizil Elma (tcerit87)
-  - REMOVED_USER
   - Cemal Dursun (cmldrs)
   - Savas Tokmak (Laserist)
   - Umut kılıç (kilic190787)
-  - furkanbicici (furkanbicici)
+  - vgezer
+  - furkanbicici
   - Murat Karagöz (anemon_1994)
   - Vainock
-  - REMOVED_USER
-  - Alperen Yıldız (Sparrow34)
-  - berkcan uçan (ibnehayati)
+  - Bilgehan Demirel (bilgehandemirel)
   - Gol D. Ace (goldace)
+  - berkcan uçan (ibnehayati)
+  - Alperen Yıldız (Sparrow34)
   - gecebekcisi1
+  - Furkan Korhan (furkankorhan)
+  - Emin Can OGUZ (emincanoguz11)
+  - Onur Yılmaz (Makaron3422)
   - mustafaa
   - Richard Stanway (r1ch)
-  - REMOVED_USER
+  - AdGuard-User-TR
+  - Ömer (upp4r)
   - Khedi
-  - Hydroboost (Hydroboost)
+  - unknowndomain
+  - Hydroboost
   - Mustafa Arslan (mstfaa)
   - Alican Gultekin (Vitaefinis)
-  - REMOVED_USER
+  - Fatih Güneş (fatihgunes)
   - Türker Yıldırım (turkeryildirim)
   - basakbk
+  - NOYB
   - chaironeko
+  - Efe kemal Gürses (efetr1)
+  - Özkan Özeşme (ozkanozsm)
   - dodgepong
  Ukrainian:
   - SuslikV
-  - Lino Bico (bicolino34)
+  - Mykola Ronik (Mantikor)
+  - Anatoly Belibov (anatoly136ua)
+  - Sergey (Megadragon)
   - Vainock
-  - REMOVED_USER
-  - REMOVED_USER
+  - Lino Bico (bicolino34)
   - Юрій (Devinit)
   - Gol D. Ace (goldace)
   - Andy (anry025)
@@ -1184,28 +1360,33 @@
   - បងមាន តែអូន (cheaiphone267)
   - geimfis
   - L1Q
+  - Sergii Raboshchuk (Fallenbard)
   - powerdef
+  - unknowndomain
   - Maksym Tymoshyk (maximillian_)
   - dodgepong
  Urdu (Pakistan):
   - Rana Awais (ehtisham)
   - tahirsada
   - shamuntohamd
+  - unknowndomain
   - Gol D. Ace (goldace)
  Vietnamese:
   - Johnny “max20091” Utah (boostyourprogram)
   - Hưng Nguyễn (hoyostudio)
   - IoeCmcomc (ioecmcomc)
-  - ngoisaosang (ngoisaosang)
-  - REMOVED_USER
-  - Gol D. Ace (goldace)
+  - ngoisaosang
+  - Dũng Nguyễn (ctctk9)
   - Drake Strike (phjtieudoc)
+  - Gol D. Ace (goldace)
   - BIGO - 지혜 (parkjihye96)
   - Blog Đào Lê Minh (daoleminh2010)
-  - REMOVED_USER
   - Hà Phi Hùng (haphihungcom)
   - Vainock
+  - rezarria
+  - unknowndomain
   - Vũ Hải Tây (tayngungo1999)
+  - V4Ki3t_VN
   - Dawkin Nguyen (dawkinit)
   - dodgepong
-  - NCAA (NCAA)
+  - NCAA

obs-studio-25.0.8.tar.xz/CI/before-deploy-osx.sh -> obs-studio-26.0.0.tar.xz/CI/before-deploy-osx.sh Changed

@@ -23,8 +23,8 @@
 
 # Move obspython
 hr "Moving OBS Python"
-mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/
-mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/
+# mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/
+# mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/
 
 # Package everything into a nice .app
 hr "Packaging .app"
@@ -38,16 +38,30 @@
 ../CI/install/osx/packageApp.sh
 
 # fix obs outputs plugin it doesn't play nicely with dylibBundler at the moment
-cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/
-cp /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/
-cp /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/
-chmod +w ./OBS.app/Contents/Frameworks/*.dylib
-install_name_tool -id @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/libmbedtls.12.dylib
-install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/libmbedcrypto.3.dylib
-install_name_tool -id @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/libmbedx509.0.dylib
-install_name_tool -change libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
-install_name_tool -change libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
-install_name_tool -change libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+if [ -f /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ]; then
+    cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/
+    cp /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/
+    cp /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/
+    chmod +w ./OBS.app/Contents/Frameworks/*.dylib
+    install_name_tool -id @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/libmbedtls.12.dylib
+    install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/libmbedcrypto.3.dylib
+    install_name_tool -id @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/libmbedx509.0.dylib
+    install_name_tool -change libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+    install_name_tool -change libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+    install_name_tool -change libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+elif [ -f /usr/local/opt/mbedtls/lib/libmbedtls.13.dylib ]; then
+    cp /usr/local/opt/mbedtls/lib/libmbedtls.13.dylib ./OBS.app/Contents/Frameworks/
+    cp /usr/local/opt/mbedtls/lib/libmbedcrypto.5.dylib ./OBS.app/Contents/Frameworks/
+    cp /usr/local/opt/mbedtls/lib/libmbedx509.1.dylib ./OBS.app/Contents/Frameworks/
+    chmod +w ./OBS.app/Contents/Frameworks/*.dylib
+    install_name_tool -id @executable_path/../Frameworks/libmbedtls.13.dylib ./OBS.app/Contents/Frameworks/libmbedtls.13.dylib
+    install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.5.dylib ./OBS.app/Contents/Frameworks/libmbedcrypto.5.dylib
+    install_name_tool -id @executable_path/../Frameworks/libmbedx509.1.dylib ./OBS.app/Contents/Frameworks/libmbedx509.1.dylib
+    install_name_tool -change libmbedtls.13.dylib @executable_path/../Frameworks/libmbedtls.13.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+    install_name_tool -change libmbedcrypto.5.dylib @executable_path/../Frameworks/libmbedcrypto.5.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+    install_name_tool -change libmbedx509.1.dylib @executable_path/../Frameworks/libmbedx509.1.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
+fi
+
 install_name_tool -change /usr/local/opt/curl/lib/libcurl.4.dylib @executable_path/../Frameworks/libcurl.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
 install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/libobs.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so
 install_name_tool -change /tmp/obsdeps/bin/libjansson.4.dylib @executable_path/../Frameworks/libjansson.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

obs-studio-25.0.8.tar.xz/CI/before-script-osx.sh -> obs-studio-26.0.0.tar.xz/CI/before-script-osx.sh Changed

obs-studio-26.0.0.tar.xz/CI/full-build-macos.sh Added

@@ -0,0 +1,650 @@
+#!/usr/bin/env bash
+
+##############################################################################
+# macOS full build script
+##############################################################################
+#
+# This script contains all steps necessary to:
+#
+#   * Build OBS with all default plugins and dependencies
+#   * Create a macOS application bundle
+#   * Code-sign the macOS application-bundle
+#   * Package a macOS installation image
+#   * Notarize macOS application-bundle and/or installation image
+#
+# Parameters:
+#   -b: Create macOS bundle
+#   -d: Skip dependency checks
+#   -p: Create macOS distribution image
+#   -n: Notarize macOS app and disk image (implies bundling)
+#   -s: Skip the build process (useful for bundling/packaging only)
+#   -h: Print usage help
+#
+# Environment Variables (optional):
+#   MACOS_DEPS_VERSION  : Pre-compiled macOS dependencies version
+#   CEF_BUILD_VERSION   : Chromium Embedded Framework version
+#   VLC_VERISON         : VLC version
+#   SPARKLE_VERSION     : Sparke Framework version
+#   BUILD_DIR           : Alternative directory to build OBS in
+#
+##############################################################################
+
+# Halt on errors
+set -eE
+
+## SET UP ENVIRONMENT ##
+PRODUCT_NAME="OBS-Studio"
+
+CHECKOUT_DIR="$(git rev-parse --show-toplevel)"
+DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
+BUILD_DIR="${BUILD_DIR:-build}"
+CI_SCRIPTS="${CHECKOUT_DIR}/CI/scripts/macos"
+CI_WORKFLOW="${CHECKOUT_DIR}/.github/workflows/main.yml"
+CI_CEF_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+CEF_BUILD_VERSION: '([0-9]+)'/\1/p")
+CI_DEPS_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+MACOS_DEPS_VERSION: '([0-9\-]+)'/\1/p")
+CI_VLC_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+VLC_VERSION: '([0-9\.]+)'/\1/p")
+CI_SPARKLE_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+SPARKLE_VERSION: '([0-9\.]+)'/\1/p")
+CI_QT_VERSION=$(cat ${CI_WORKFLOW} | sed -En "s/[ ]+QT_VERSION: '([0-9\.]+)'/\1/p" | head -1)
+
+BUILD_DEPS=(
+    "obs-deps ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
+    "qt-deps ${QT_VERSION:-${CI_QT_VERSION}} ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
+    "cef ${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}"
+    "vlc ${VLC_VERSION:-${CI_VLC_VERSION}}"
+    "sparkle ${SPARKLE_VERSION:-${CI_SPARKLE_VERSION}}"
+)
+
+if [ -n "${TERM-}" ]; 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
+
+
+MACOS_VERSION="$(sw_vers -productVersion)"
+MACOS_MAJOR="$(echo ${MACOS_VERSION} | cut -d '.' -f 1)"
+MACOS_MINOR="$(echo ${MACOS_VERSION} | cut -d '.' -f 2)"
+
+## DEFINE UTILITIES ##
+
+hr() {
+    echo -e "${COLOR_BLUE}[${PRODUCT_NAME}] ${1}${COLOR_RESET}"
+}
+
+step() {
+    echo -e "${COLOR_GREEN}  + ${1}${COLOR_RESET}"
+}
+
+info() {
+    echo -e "${COLOR_ORANGE} + ${1}${COLOR_RESET}"
+}
+
+error() {
+    echo -e "${COLOR_RED}  + ${1}${COLOR_RESET}"
+}
+
+exists() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+ensure_dir() {
+    [[ -n ${1} ]] && mkdir -p ${1} && builtin cd ${1}
+}
+
+cleanup() {
+    rm -rf "${CHECKOUT_DIR}/${BUILD_DIR}/settings.json"
+    unset CODESIGN_IDENT
+    unset CODESIGN_IDENT_USER
+    unset CODESIGN_IDENT_PASS
+}
+
+caught_error() {
+    error "ERROR during build step: ${1}"
+    cleanup
+    exit 1
+}
+
+## CHECK AND INSTALL DEPENDENCIES ##
+install_homebrew_deps() {
+    if ! exists brew; then
+        error "Homebrew not found - please install homebrew (https://brew.sh)"
+        exit 1
+    fi
+
+    brew update
+    brew bundle --file ${CI_SCRIPTS}/Brewfile
+
+    check_curl
+}
+
+check_curl() {
+    if [ "${MACOS_MAJOR}" -lt "11" ] && [ "${MACOS_MINOR}" -lt "15" ]; then
+        if [ ! -d /usr/local/opt/curl ]; then
+            step "Installing Homebrew curl.."
+            brew install curl
+        fi
+        export CURLCMD="/usr/local/opt/curl/bin/curl"
+    else
+        export CURLCMD="curl"
+    fi
+}
+
+check_ccache() {
+    export PATH=/usr/local/opt/ccache/libexec:${PATH}
+    CCACHE_STATUS=$(ccache -s >/dev/null 2>&1 && echo "CCache available." || echo "CCache is not available.")
+    info "${CCACHE_STATUS}"
+}
+
+install_obs-deps() {
+    hr "Setting up pre-built macOS OBS dependencies v${1}"
+    ensure_dir ${DEPS_BUILD_DIR}
+    step "Download..."
+    ${CURLCMD} --progress-bar -L -C - -O https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-${1}.tar.gz
+    step "Unpack..."
+    tar -xf ./macos-deps-${1}.tar.gz -C /tmp
+}
+
+install_qt-deps() {
+    hr "Setting up pre-built dependency QT v${1}"
+    ensure_dir ${DEPS_BUILD_DIR}
+    step "Download..."
+    ${CURLCMD} --progress-bar -L -C - -O https://github.com/obsproject/obs-deps/releases/download/${2}/macos-qt-${1}-${2}.tar.gz
+    step "Unpack..."
+    tar -xf ./macos-qt-${1}-${2}.tar.gz -C /tmp
+    xattr -r -d com.apple.quarantine /tmp/obsdeps
+}
+
+install_vlc() {
+    hr "Setting up dependency VLC v${1}"
+    ensure_dir ${DEPS_BUILD_DIR}
+    step "Download..."
+    ${CURLCMD} --progress-bar -L -C - -O https://downloads.videolan.org/vlc/${1}/vlc-${1}.tar.xz
+    step "Unpack ..."
+    tar -xf vlc-${1}.tar.xz
+}
+
+install_sparkle() {
+    hr "Setting up dependency Sparkle v${1} (might prompt for password)"
+    ensure_dir ${DEPS_BUILD_DIR}/sparkle
+    step "Download..."
+    ${CURLCMD} --progress-bar -L -C - -o sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/${1}/Sparkle-${1}.tar.bz2
+    step "Unpack..."
+    tar -xf ./sparkle.tar.bz2
+    step "Copy to destination..."
+    if [ -d /Library/Frameworks/Sparkle.framework/ ]; then
+        info "Warning - Sparkle framework already found in /Library/Frameworks"
+    else
+        sudo cp -R ./Sparkle.framework/ /Library/Frameworks/Sparkle.framework/
+    fi
+}
+
+install_cef() {
+    hr "Building dependency CEF v${1}"
+    ensure_dir ${DEPS_BUILD_DIR}
+    step "Download..."
+    ${CURLCMD} --progress-bar -L -C - -O https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${1}_macosx64.tar.bz2
+    step "Unpack..."
+    tar -xf ./cef_binary_${1}_macosx64.tar.bz2
+    cd ./cef_binary_${1}_macosx64
+    step "Fix tests..."
+    # remove a broken test
+    sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
+    # target 10.11
+    sed -i '.orig' s/\"10.9\"/\"10.11\"/ ./cmake/cef_variables.cmake
+    ensure_dir ./build
+    step "Run CMAKE..."
+    cmake \
+        -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++"\
+        -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++"\
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
+        ..
+    step "Build..."
+    make -j4
+    if [ ! -d libcef_dll ]; then mkdir libcef_dll; fi
+}
+
+## CHECK AND INSTALL PACKAGING DEPENDENCIES ##
+install_dmgbuild() {
+    if ! exists dmgbuild; then
+        if exists "pip3"; then
+            PIPCMD="pip3"
+        elif exists "pip"; then
+            PIPCMD="pip"
+        else
+            error "Pip not found - please install pip via 'python -m ensurepip'"
+            exit 1
+        fi
+
+        ${PIPCMD} install dmgbuild
+    fi
+}
+
+## OBS BUILD FROM SOURCE ##
+configure_obs_build() {
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    CUR_DATE=$(date +"%Y-%m-%d@%H%M%S")
+    NIGHTLY_DIR="${CHECKOUT_DIR}/nightly-${CUR_DATE}"
+    PACKAGE_NAME=$(find . -name "*.dmg")
+
+    if [ -d ./OBS.app ]; then
+        ensure_dir "${NIGHTLY_DIR}"
+        mv ../${BUILD_DIR}/OBS.app .
+        info "You can find OBS.app in ${NIGHTLY_DIR}"
+    fi
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+    if ([ -n "${PACKAGE_NAME}" ] && [ -f ${PACKAGE_NAME} ]); then
+        ensure_dir "${NIGHTLY_DIR}"
+        mv ../${BUILD_DIR}/$(basename "${PACKAGE_NAME}") .
+        info "You can find ${PACKAGE_NAME} in ${NIGHTLY_DIR}"
+    fi
+
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    hr "Run CMAKE for OBS..."
+    cmake -DENABLE_SPARKLE_UPDATER=ON \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
+        -DDISABLE_PYTHON=ON  \
+        -DQTDIR="/tmp/obsdeps" \
+        -DSWIGDIR="/tmp/obsdeps" \
+        -DDepsPath="/tmp/obsdeps" \
+        -DVLCPath="${DEPS_BUILD_DIR}/vlc-${VLC_VERSION:-${CI_VLC_VERSION}}" \
+        -DBUILD_BROWSER=ON \
+        -DBROWSER_DEPLOY=ON \
+        -DBUILD_CAPTIONS=ON \
+        -DWITH_RTMPS=ON \
+        -DCEF_ROOT_DIR="${DEPS_BUILD_DIR}/cef_binary_${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}_macosx64" \
+        ..
+
+}
+
+run_obs_build() {
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+    hr "Build OBS..."
+    make -j4
+}
+
+## OBS BUNDLE AS MACOS APPLICATION ##
+bundle_dylibs() {
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    if [ ! -d ./OBS.app ]; then
+        error "No OBS.app bundle found"
+        exit 1
+    fi
+
+    hr "Bundle dylibs for macOS application"
+
+    step "Run dylibBundler.."
+    ${CI_SCRIPTS}/app/dylibbundler -cd -of -a ./OBS.app -q -f \
+        -s ./OBS.app/Contents/MacOS \
+        -s "${DEPS_BUILD_DIR}/sparkle/Sparkle.framework" \
+        -s ./rundir/RelWithDebInfo/bin/ \
+        -x ./OBS.app/Contents/PlugIns/coreaudio-encoder.so \
+        -x ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so \
+        -x ./OBS.app/Contents/PlugIns/frontend-tools.so \
+        -x ./OBS.app/Contents/PlugIns/image-source.so \
+        -x ./OBS.app/Contents/PlugIns/linux-jack.so \
+        -x ./OBS.app/Contents/PlugIns/mac-avcapture.so \
+        -x ./OBS.app/Contents/PlugIns/mac-capture.so \
+        -x ./OBS.app/Contents/PlugIns/mac-decklink.so \
+        -x ./OBS.app/Contents/PlugIns/mac-syphon.so \
+        -x ./OBS.app/Contents/PlugIns/mac-vth264.so \
+        -x ./OBS.app/Contents/PlugIns/obs-browser.so \
+        -x ./OBS.app/Contents/PlugIns/obs-browser-page \
+        -x ./OBS.app/Contents/PlugIns/obs-ffmpeg.so \
+        -x ./OBS.app/Contents/PlugIns/obs-filters.so \
+        -x ./OBS.app/Contents/PlugIns/obs-transitions.so \
+        -x ./OBS.app/Contents/PlugIns/obs-vst.so \
+        -x ./OBS.app/Contents/PlugIns/rtmp-services.so \
+        -x ./OBS.app/Contents/MacOS/obs-ffmpeg-mux \
+        -x ./OBS.app/Contents/MacOS/obslua.so \
+        -x ./OBS.app/Contents/PlugIns/obs-x264.so \
+        -x ./OBS.app/Contents/PlugIns/text-freetype2.so \
+        -x ./OBS.app/Contents/PlugIns/obs-libfdk.so \
+        -x ./OBS.app/Contents/PlugIns/obs-outputs.so
+    step "Move libobs-opengl to final destination"
+    cp ./libobs-opengl/libobs-opengl.so ./OBS.app/Contents/Frameworks
+
+    step "Copy QtNetwork for plugin support"
+    cp -R /tmp/obsdeps/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks
+    chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework
+    rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers
+    rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/
+    chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist
+    install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
+    install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
+}
+
+install_frameworks() {
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    if [ ! -d ./OBS.app ]; then
+        error "No OBS.app bundle found"
+        exit 1
+    fi
+
+    hr "Adding Chromium Embedded Framework"
+    step "Copy Framework..."
+    sudo cp -R "${DEPS_BUILD_DIR}/cef_binary_${CEF_BUILD_VERSION:-${CI_CEF_VERSION}}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
+    sudo chown -R $(whoami) ./OBS.app/Contents/Frameworks/
+}
+
+prepare_macos_bundle() {
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    if [ ! -d ./rundir/RelWithDebInfo/bin ]; then
+        error "No OBS build found"
+        return
+    fi
+
+    if [ -d ./OBS.app ]; then rm -rf ./OBS.app; fi
+
+    hr "Preparing OBS.app bundle"
+    step "Copy binary and plugins..."
+    mkdir -p OBS.app/Contents/MacOS
+    mkdir OBS.app/Contents/PlugIns
+    mkdir OBS.app/Contents/Resources
+
+    cp rundir/RelWithDebInfo/bin/obs ./OBS.app/Contents/MacOS
+    cp rundir/RelWithDebInfo/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
+    cp rundir/RelWithDebInfo/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
+    cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources
+    cp ${CI_SCRIPTS}/app/obs.icns ./OBS.app/Contents/Resources
+    cp -R rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/PlugIns
+    cp ${CI_SCRIPTS}/app/Info.plist ./OBS.app/Contents
+    # Scripting plugins are required to be placed in same directory as binary
+    if [ -d ./OBS.app/Contents/Resources/data/obs-scripting ]; then
+        mv ./OBS.app/Contents/Resources/data/obs-scripting/obslua.so ./OBS.app/Contents/MacOS/
+        # mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/
+        # mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/
+        rm -rf ./OBS.app/Contents/Resources/data/obs-scripting/
+    fi
+
+    bundle_dylibs
+    install_frameworks
+
+    cp ${CI_SCRIPTS}/app/OBSPublicDSAKey.pem ./OBS.app/Contents/Resources
+
+    step "Set bundle meta information..."
+    plutil -insert CFBundleVersion -string ${GIT_TAG}-${GIT_HASH} ./OBS.app/Contents/Info.plist
+    plutil -insert CFBundleShortVersionString -string ${GIT_TAG}-${GIT_HASH} ./OBS.app/Contents/Info.plist
+    plutil -insert OBSFeedsURL -string https://obsproject.com/osx_update/feeds.xml ./OBS.app/Contents/Info.plist
+    plutil -insert SUFeedURL -string https://obsproject.com/osx_update/stable/updates.xml ./OBS.app/Contents/Info.plist
+    plutil -insert SUPublicDSAKeyFile -string OBSPublicDSAKey.pem ./OBS.app/Contents/Info.plist
+}
+
+## CREATE MACOS DISTRIBUTION AND INSTALLER IMAGE ##
+prepare_macos_image() {
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    if [ ! -d ./OBS.app ]; then
+        error "No OBS.app bundle found"
+        return
+    fi
+
+    hr "Preparing macOS installation image"
+
+    if [ -f "${FILE_NAME}" ]; then
+        rm "${FILE_NAME}"
+    fi
+
+    step "Run dmgbuild..."
+    cp "${CI_SCRIPTS}/package/settings.json.template" ./settings.json
+    sed -i '' 's#\$\$VERSION\$\$#'"${GIT_TAG}"'#g' ./settings.json
+    sed -i '' 's#\$\$CI_PATH\$\$#'"${CI_SCRIPTS}"'#g' ./settings.json
+    sed -i '' 's#\$\$BUNDLE_PATH\$\$#'"${CHECKOUT_DIR}"'/build#g' ./settings.json
+    echo -n "${COLOR_ORANGE}"
+    dmgbuild "OBS-Studio ${GIT_TAG}" "${FILE_NAME}" -s ./settings.json
+    echo -n "${COLOR_RESET}"
+
+    if [ -n "${CODESIGN_OBS}" ]; then
+        codesign_image
+    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 [ ! -n "${CODESIGN_IDENT}" ]; then
+        step "Code-signing Setup"
+        read -p "${COLOR_ORANGE}  + Apple developer identity: ${COLOR_RESET}" CODESIGN_IDENT
+    fi
+}
+
+##############################################################################
+# 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 'altool' only.
+##############################################################################
+
+read_codesign_pass() {
+    if [ ! -n "${CODESIGN_IDENT_PASS}" ]; then
+        step "Notarization Setup"
+        read -p "${COLOR_ORANGE}  + Apple account id: ${COLOR_RESET}" CODESIGN_IDENT_USER
+        CODESIGN_IDENT_PASS=$(stty -echo; read -p "${COLOR_ORANGE}  + Apple developer password: ${COLOR_RESET}" pwd; stty echo; echo $pwd)
+        echo -n "${COLOR_ORANGE}"
+        xcrun altool --store-password-in-keychain-item "OBS-Codesign-Password" -u "${CODESIGN_IDENT_USER}" -p "${CODESIGN_IDENT_PASS}"
+        echo -n "${COLOR_RESET}"
+        CODESIGN_IDENT_SHORT=$(echo "${CODESIGN_IDENT}" | sed -En "s/.+$(.+)$/\1/p")
+    fi
+}
+
+codesign_bundle() {
+    if [ ! -n "${CODESIGN_OBS}" ]; then step "Skipping application bundle code signing"; return; fi
+
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+    trap "caught_error 'code-signing app'" ERR
+
+    if [ ! -d ./OBS.app ]; then
+        error "No OBS.app bundle found"
+        return
+    fi
+
+    hr "Code-signing application bundle"
+
+    xattr -crs ./OBS.app
+
+    read_codesign_ident
+    step "Code-sign Sparkle framework..."
+    echo -n "${COLOR_ORANGE}"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" --deep ./OBS.app/Contents/Frameworks/Sparkle.framework
+    echo -n "${COLOR_RESET}"
+
+    step "Code-sign CEF framework..."
+    echo -n "${COLOR_ORANGE}"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libEGL.dylib"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib"
+    codesign --force --options runtime --sign "${CODESIGN_IDENT}" --deep "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework"
+    echo -n "${COLOR_RESET}"
+
+    step "Code-sign OBS code..."
+    echo -n "${COLOR_ORANGE}"
+    codesign --force --options runtime --entitlements "${CI_SCRIPTS}/app/entitlements.plist" --sign "${CODESIGN_IDENT}" --deep ./OBS.app
+    echo -n "${COLOR_RESET}"
+    step "Check code-sign result..."
+    codesign -dvv ./OBS.app
+}
+
+codesign_image() {
+    if [ ! -n "${CODESIGN_OBS}" ]; then step "Skipping installer image code signing"; return; fi
+
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+    trap "caught_error 'code-signing image'" ERR
+
+    if [ ! -f "${FILE_NAME}" ]; then
+        error "No OBS disk image found"
+        return
+    fi
+
+    hr "Code-signing installation image"
+
+    read_codesign_ident
+
+    step "Code-sign OBS installer image..."
+    echo -n "${COLOR_ORANGE}";
+    codesign --force --sign "${CODESIGN_IDENT}" "${FILE_NAME}"
+    echo -n "${COLOR_RESET}"
+    step "Check code-sign result..."
+    codesign -dvv "${FILE_NAME}"
+}
+
+## BUILD FROM SOURCE META FUNCTION ##
+full-build-macos() {
+    if [ -n "${SKIP_BUILD}" ]; then step "Skipping full build"; return; fi
+
+    if [ ! -n "${SKIP_DEPS}" ]; then
+
+        hr "Installing Homebrew dependencies"
+        install_homebrew_deps
+
+        for DEPENDENCY in "${BUILD_DEPS[@]}"; do
+            set -- ${DEPENDENCY}
+            trap "caught_error ${DEPENDENCY}" ERR
+            FUNC_NAME="install_${1}"
+            ${FUNC_NAME} ${2} ${3}
+        done
+
+        check_ccache
+        trap "caught_error 'cmake'" ERR
+    fi
+
+    configure_obs_build
+    run_obs_build
+}
+
+## BUNDLE MACOS APPLICATION META FUNCTION ##
+bundle_macos() {
+    if [ ! -n "${BUNDLE_OBS}" ]; then step "Skipping application bundle creation"; return; fi
+
+    hr "Creating macOS app bundle"
+    trap "caught_error 'bundle app'" ERR
+    ensure_dir ${CHECKOUT_DIR}
+    prepare_macos_bundle
+}
+
+## PACKAGE MACOS DISTRIBUTION IMAGE META FUNCTION ##
+package_macos() {
+    if [ ! -n "${PACKAGE_OBS}" ]; then step "Skipping installer image creation"; return; fi
+
+    hr "Creating macOS .dmg image"
+    trap "caught_error 'package app'" ERR
+
+    install_dmgbuild
+    prepare_macos_image
+}
+
+## NOTARIZATION META FUNCTION ##
+notarize_macos() {
+    if [ ! -n "${NOTARIZE_OBS}" ]; then step "Skipping macOS notarization"; return; fi;
+
+    hr "Notarizing OBS for macOS"
+    trap "caught_error 'notarizing app'" ERR
+
+    ensure_dir "${CHECKOUT_DIR}/${BUILD_DIR}"
+
+    if [ -f "${FILE_NAME}" ]; then
+        NOTARIZE_TARGET="${FILE_NAME}"
+        xcnotary precheck "./OBS.app"
+    elif [ -d "OBS.app" ]; then
+        NOTARIZE_TARGET="./OBS.app"
+    else
+        error "No notarization app bundle ('OBS.app') or disk image ('${FILE_NAME}') found"
+        return
+    fi
+
+    if [ "$?" -eq 0 ]; then
+        read_codesign_ident
+        read_codesign_pass
+
+        step "Run xcnotary with ${NOTARIZE_TARGET}..."
+        xcnotary notarize "${NOTARIZE_TARGET}" --developer-account "${CODESIGN_IDENT_USER}" --developer-password-keychain-item "OBS-Codesign-Password" --provider "${CODESIGN_IDENT_SHORT}"
+    fi
+}
+
+## MAIN SCRIPT FUNCTIONS ##
+print_usage() {
+    echo -e "full-build-macos.sh - Build helper script for OBS-Studio\n"
+    echo -e "Usage: ${0}\n" \
+        "-d: Skip dependency checks\n" \
+        "-b: Create macOS app bundle\n" \
+        "-c: Codesign macOS app bundle\n" \
+        "-p: Package macOS app into disk image\n" \
+        "-n: Notarize macOS app and disk image (implies -b)\n" \
+        "-s: Skip build process (useful for bundling/packaging only)\n" \
+        "-h: Print this help"
+    exit 0
+}
+
+obs-build-main() {
+    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)
+    FILE_NAME="obs-studio-${GIT_TAG}-${GIT_HASH}-macOS.dmg"
+
+    ##########################################################################
+    # IMPORTANT:
+    #
+    # Be careful when choosing to notarize and code-sign. The script will try
+    # to sign any pre-existing bundle but also pre-existing images.
+    #
+    # This could lead to a package containing a non-signed bundle, which
+    # will then fail notarization.
+    #
+    # To avoid this, run this script with -b -c first, then -p -c or -p -n
+    # after to make sure that a code-signed bundle will be packaged.
+    #
+    ##########################################################################
+
+    while getopts ":hdsbnpc" OPTION; do
+        case ${OPTION} in
+            h) print_usage ;;
+            d) SKIP_DEPS=1 ;;
+            s) SKIP_BUILD=1 ;;
+            b) BUNDLE_OBS=1 ;;
+            n) CODESIGN_OBS=1; NOTARIZE_OBS=1 ;;
+            p) PACKAGE_OBS=1 ;;
+            c) CODESIGN_OBS=1 ;;
+            \?) ;;
+        esac
+    done
+
+    full-build-macos
+    bundle_macos
+    codesign_bundle
+    package_macos
+    codesign_image
+    notarize_macos
+
+    cleanup
+}
+
+obs-build-main $*
\ No newline at end of file

obs-studio-25.0.8.tar.xz/CI/install-dependencies-osx.sh -> obs-studio-26.0.0.tar.xz/CI/install-dependencies-osx.sh Changed

obs-studio-25.0.8.tar.xz/CI/install-script-win.cmd -> obs-studio-26.0.0.tar.xz/CI/install-script-win.cmd Changed

@@ -17,13 +17,13 @@
 mkdir build build32 build64
 if "%TWITCH-CLIENTID%"=="$(twitch_clientid)" (
 cd ./build32
-cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% ..
+cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% ..
 cd ../build64
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% ..
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% ..
 ) else (
 cd ./build32
-cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" ..
+cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" ..
 cd ../build64
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" ..
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%"  -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" ..
 )
 cd ..

obs-studio-25.0.8.tar.xz/CI/install/osx/packageApp.sh -> obs-studio-26.0.0.tar.xz/CI/install/osx/packageApp.sh Changed

obs-studio-25.0.8.tar.xz/CI/scripts/macos/Brewfile -> obs-studio-26.0.0.tar.xz/CI/scripts/macos/Brewfile Changed

obs-studio-26.0.0.tar.xz/CI/scripts/macos/app/dylibbundler Added

obs-studio-26.0.0.tar.xz/CI/scripts/macos/app/entitlements.plist Added

obs-studio-26.0.0.tar.xz/CI/scripts/macos/package/settings.json.template Added

obs-studio-25.0.8.tar.xz/CI/scripts/macos/packageApp.sh -> obs-studio-26.0.0.tar.xz/CI/scripts/macos/packageApp.sh Changed

obs-studio-25.0.8.tar.xz/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/CMakeLists.txt Changed

@@ -9,10 +9,12 @@
 
 option(BUILD_CAPTIONS "Build captions" FALSE)
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 if(WIN32)
 	cmake_minimum_required(VERSION 3.16)
 
-	# Check for Win SDK version 10.0.18362 or above
+	# Check for Win SDK version 10.0.19041 or above
 	if(MSVC AND MSVC_VERSION LESS 1920)
 		message(STATUS "Windows API version is ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
 		string(REPLACE "." ";" WINAPI_VER "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
@@ -24,7 +26,7 @@
 		set(WINAPI_COMPATIBLE FALSE)
 		if(WINAPI_VER_MAJOR EQUAL 10)
 			if (WINAPI_VER_MINOR EQUAL 0)
-				if (WINAPI_VER_BUILD GREATER_EQUAL 18362)
+				if (WINAPI_VER_BUILD GREATER_EQUAL 19041)
 					set(WINAPI_COMPATIBLE TRUE)
 				endif()
 			else()
@@ -35,7 +37,7 @@
 		endif()
 
 		if(NOT WINAPI_COMPATIBLE)
-			message(FATAL_ERROR "OBS requires Windows 10 SDK version 10.0.18362.0 and above to compile.\nPlease download the most recent Windows 10 SDK in order to compile (or update to Visual Studio 2019).")
+			message(FATAL_ERROR "OBS requires Windows 10 SDK version 10.0.19041.0 and above to compile.\nPlease download the most recent Windows 10 SDK in order to compile (or update to Visual Studio 2019).")
 		endif()
 	endif()
 
@@ -60,6 +62,8 @@
 include(ObsHelpers)
 include(ObsCpack)
 include(GNUInstallDirs)
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
 
 # Must be a string in the format of "x.x.x-rcx"
 if(DEFINED RELEASE_CANDIDATE)
@@ -118,7 +122,7 @@
     string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
 endif ()
 
-if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86|x64|x86_64|amd64)")
+if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86|x64|x86_64|amd64|e2k)")
 	set(NEEDS_SIMDE "0")
 	if(NOT MSVC)
 		set(ARCH_SIMD_FLAGS "-mmmx" "-msse" "-msse2")
@@ -130,6 +134,18 @@
 else()
 	set(NEEDS_SIMDE "1")
 	add_definitions(-DNEEDS_SIMDE=1)
+	if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSIMDE_ENABLE_OPENMP")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSIMDE_ENABLE_OPENMP")
+		CHECK_C_COMPILER_FLAG("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD)
+		if(C_COMPILER_SUPPORTS_OPENMP_SIMD)
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp-simd")
+		endif()
+		CHECK_CXX_COMPILER_FLAG("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
+		if(CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp-simd")
+		endif()
+	endif()
 	set(ARCH_SIMD_FLAGS "")
 	message(STATUS "No Native SSE2 SIMD Support - Using SIMDE")
 endif()
@@ -198,6 +214,21 @@
 	endif()
 endif()
 
+if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "e2k")
+	foreach(TEST_C_FLAG "-Wno-unused-parameter" "-Wno-ignored-qualifiers" "-Wno-pointer-sign" "-Wno-unused-variable" "-Wno-sign-compare" "-Wno-bad-return-value-type" "-Wno-maybe-uninitialized")
+		CHECK_C_COMPILER_FLAG(${TEST_C_FLAG} C_COMPILER_SUPPORTS_FLAG_${TEST_C_FLAG})
+		if(C_COMPILER_SUPPORTS_FLAG_${TEST_C_FLAG})
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_C_FLAG}")
+		endif()
+	endforeach()
+	foreach(TEST_CXX_FLAG "-Wno-invalid-offsetof" "-Wno-maybe-uninitialized")
+		CHECK_CXX_COMPILER_FLAG(${TEST_CXX_FLAG} CXX_COMPILER_SUPPORTS_FLAG_${TEST_CXX_FLAG})
+		if(CXX_COMPILER_SUPPORTS_FLAG_${TEST_CXX_FLAG})
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_CXX_FLAG}")
+		endif()
+	endforeach()
+endif()
+
 option(BUILD_TESTS "Build test directory (includes test sources and possibly a platform test executable)" FALSE)
 mark_as_advanced(BUILD_TESTS)
 
@@ -238,7 +269,12 @@
 	add_subdirectory(libobs)
 	add_subdirectory(plugins)
 	add_subdirectory(UI)
-	if (BUILD_TESTS)
+
+	if (ENABLE_UNIT_TESTS)
+		enable_testing()
+	endif()
+
+	if (BUILD_TESTS OR ENABLE_UNIT_TESTS)
 		add_subdirectory(test)
 	endif()

obs-studio-25.0.8.tar.xz/README.rst -> obs-studio-26.0.0.tar.xz/README.rst Changed

obs-studio-25.0.8.tar.xz/UI/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/UI/CMakeLists.txt Changed

@@ -29,16 +29,6 @@
 	set(TWITCH_ENABLED TRUE)
 endif()
 
-if(NOT DEFINED MIXER_CLIENTID OR "${MIXER_CLIENTID}" STREQUAL "" OR
-   NOT DEFINED MIXER_HASH     OR "${MIXER_HASH}"     STREQUAL "" OR
-   NOT BROWSER_AVAILABLE_INTERNAL)
-	set(MIXER_ENABLED FALSE)
-	set(MIXER_CLIENTID "")
-	set(MIXER_HASH "0")
-else()
-	set(MIXER_ENABLED TRUE)
-endif()
-
 if(NOT DEFINED RESTREAM_CLIENTID OR "${RESTREAM_CLIENTID}" STREQUAL "" OR
    NOT DEFINED RESTREAM_HASH     OR "${RESTREAM_HASH}"     STREQUAL "" OR
    NOT BROWSER_AVAILABLE_INTERNAL)
@@ -56,6 +46,7 @@
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 set(CMAKE_AUTOMOC TRUE)
 
+find_package(Qt5Widgets ${FIND_MODE})
 find_package(Qt5Svg ${FIND_MODE})
 find_package(Qt5Xml ${FIND_MODE})
 
@@ -166,15 +157,6 @@
 			)
 	endif()
 
-	if(MIXER_ENABLED)
-		list(APPEND obs_PLATFORM_SOURCES
-			auth-mixer.cpp
-			)
-		list(APPEND obs_PLATFORM_HEADERS
-			auth-mixer.hpp
-			)
-	endif()
-
 	if(RESTREAM_ENABLED)
 		list(APPEND obs_PLATFORM_SOURCES
 			auth-restream.cpp
@@ -219,6 +201,7 @@
 	window-basic-main-outputs.cpp
 	window-basic-source-select.cpp
 	window-basic-settings-stream.cpp
+	window-basic-main-screenshot.cpp
 	window-basic-auto-config-test.cpp
 	window-basic-main-scene-collections.cpp
 	window-basic-main-transitions.cpp
@@ -232,6 +215,7 @@
 	window-basic-preview.cpp
 	window-basic-about.cpp
 	window-importer.cpp
+	media-controls.cpp
 	window-namedialog.cpp
 	window-log-reply.cpp
 	window-projector.cpp
@@ -252,6 +236,7 @@
 	volume-control.cpp
 	adv-audio-control.cpp
 	item-widget-helpers.cpp
+	context-bar-controls.cpp
 	horizontal-scroll-area.cpp
 	vertical-scroll-area.cpp
 	visibility-item-widget.cpp
@@ -262,7 +247,12 @@
 	source-label.cpp
 	remote-text.cpp
 	audio-encoders.cpp
-	qt-wrappers.cpp)
+	qt-wrappers.cpp
+	log-viewer.cpp
+	obs-proxy-style.cpp
+	locked-checkbox.cpp
+	visibility-checkbox.cpp
+	media-slider.cpp)
 
 set(obs_HEADERS
 	${obs_PLATFORM_HEADERS}
@@ -287,6 +277,7 @@
 	window-basic-transform.hpp
 	window-basic-preview.hpp
 	window-importer.hpp
+	media-controls.hpp
 	window-namedialog.hpp
 	window-log-reply.hpp
 	window-projector.hpp
@@ -307,11 +298,13 @@
 	mute-checkbox.hpp
 	record-button.hpp
 	ui-validation.hpp
+	screenshot-obj.hpp
 	url-push-button.hpp
 	volume-control.hpp
 	adv-audio-control.hpp
 	item-widget-helpers.hpp
 	visibility-checkbox.hpp
+	context-bar-controls.hpp
 	locked-checkbox.hpp
 	horizontal-scroll-area.hpp
 	expand-checkbox.hpp
@@ -325,7 +318,11 @@
 	remote-text.hpp
 	audio-encoders.hpp
 	qt-wrappers.hpp
-	clickable-label.hpp)
+	clickable-label.hpp
+	log-viewer.hpp
+	obs-proxy-style.hpp
+	obs-proxy-style.hpp
+	media-slider.hpp)
 
 set(obs_importers_HEADERS
 	importers/importers.hpp)
@@ -341,6 +338,13 @@
 source_group("importers\\Header Files" FILES ${obs_importers_HEADERS})
 
 set(obs_UI
+	forms/source-toolbar/browser-source-toolbar.ui
+	forms/source-toolbar/device-select-toolbar.ui
+	forms/source-toolbar/game-capture-toolbar.ui
+	forms/source-toolbar/image-source-toolbar.ui
+	forms/source-toolbar/color-source-toolbar.ui
+	forms/source-toolbar/text-source-toolbar.ui
+	forms/source-toolbar/media-controls.ui
 	forms/NameDialog.ui
 	forms/AutoConfigStartPage.ui
 	forms/AutoConfigVideoPage.ui
@@ -402,6 +406,7 @@
 			Qt5::MacExtras)
 	set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
 endif()
+set_target_properties(obs PROPERTIES FOLDER "frontend")
 
 define_graphic_modules(obs)

obs-studio-25.0.8.tar.xz/UI/api-interface.cpp -> obs-studio-26.0.0.tar.xz/UI/api-interface.cpp Changed

@@ -119,6 +119,9 @@
 			OBSSource tr = main->ui->transitions->itemData(i)
 					       .value<OBSSource>();
 
+			if (!tr)
+				continue;
+
 			obs_source_addref(tr);
 			da_push_back(sources->sources, &tr);
 		}
@@ -151,6 +154,17 @@
 					  "setValue", Q_ARG(int, duration));
 	}
 
+	void obs_frontend_release_tbar(void) override
+	{
+		QMetaObject::invokeMethod(main, "TBarReleased");
+	}
+
+	void obs_frontend_set_tbar_position(int position) override
+	{
+		QMetaObject::invokeMethod(main, "TBarChanged",
+					  Q_ARG(int, position));
+	}
+
 	void obs_frontend_get_scene_collections(
 		std::vector<std::string> &strings) override
 	{
@@ -523,6 +537,17 @@
 		}
 	}
 
+	void obs_frontend_take_screenshot(void) override
+	{
+		QMetaObject::invokeMethod(main, "Screenshot");
+	}
+
+	void obs_frontend_take_source_screenshot(obs_source_t *source) override
+	{
+		QMetaObject::invokeMethod(main, "Screenshot",
+					  Q_ARG(OBSSource, OBSSource(source)));
+	}
+
 	void on_load(obs_data_t *settings) override
 	{
 		for (size_t i = saveCallbacks.size(); i > 0; i--) {

obs-studio-25.0.8.tar.xz/UI/auth-twitch.cpp -> obs-studio-26.0.0.tar.xz/UI/auth-twitch.cpp Changed

obs-studio-26.0.0.tar.xz/UI/context-bar-controls.cpp Added

@@ -0,0 +1,657 @@
+#include "context-bar-controls.hpp"
+#include "qt-wrappers.hpp"
+#include "obs-app.hpp"
+
+#include <QStandardItemModel>
+#include <QColorDialog>
+#include <QFontDialog>
+
+#include "ui_browser-source-toolbar.h"
+#include "ui_device-select-toolbar.h"
+#include "ui_game-capture-toolbar.h"
+#include "ui_image-source-toolbar.h"
+#include "ui_color-source-toolbar.h"
+#include "ui_text-source-toolbar.h"
+
+#ifdef _WIN32
+#define get_os_module(win, mac, linux) obs_get_module(win)
+#define get_os_text(mod, win, mac, linux) obs_module_get_locale_text(mod, win)
+#elif __APPLE__
+#define get_os_module(win, mac, linux) obs_get_module(mac)
+#define get_os_text(mod, win, mac, linux) obs_module_get_locale_text(mod, mac)
+#else
+#define get_os_module(win, mac, linux) obs_get_module(linux)
+#define get_os_text(mod, win, mac, linux) obs_module_get_locale_text(mod, linux)
+#endif
+
+/* ========================================================================= */
+
+SourceToolbar::SourceToolbar(QWidget *parent, OBSSource source)
+	: QWidget(parent),
+	  weakSource(OBSGetWeakRef(source)),
+	  props(obs_source_properties(source), obs_properties_destroy)
+{
+}
+
+/* ========================================================================= */
+
+BrowserToolbar::BrowserToolbar(QWidget *parent, OBSSource source)
+	: SourceToolbar(parent, source), ui(new Ui_BrowserSourceToolbar)
+{
+	ui->setupUi(this);
+}
+
+BrowserToolbar::~BrowserToolbar()
+{
+	delete ui;
+}
+
+void BrowserToolbar::on_refresh_clicked()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	obs_property_t *p = obs_properties_get(props.get(), "refreshnocache");
+	obs_property_button_clicked(p, source.Get());
+}
+
+/* ========================================================================= */
+
+ComboSelectToolbar::ComboSelectToolbar(QWidget *parent, OBSSource source)
+	: SourceToolbar(parent, source), ui(new Ui_DeviceSelectToolbar)
+{
+	ui->setupUi(this);
+}
+
+ComboSelectToolbar::~ComboSelectToolbar()
+{
+	delete ui;
+}
+
+static int FillPropertyCombo(QComboBox *c, obs_property_t *p,
+			     const std::string &cur_id, bool is_int = false)
+{
+	size_t count = obs_property_list_item_count(p);
+	int cur_idx = -1;
+
+	for (size_t i = 0; i < count; i++) {
+		const char *name = obs_property_list_item_name(p, i);
+		std::string id;
+
+		if (is_int) {
+			id = std::to_string(obs_property_list_item_int(p, i));
+		} else {
+			const char *val = obs_property_list_item_string(p, i);
+			id = val ? val : "";
+		}
+
+		if (cur_id == id)
+			cur_idx = (int)i;
+
+		c->addItem(name, id.c_str());
+	}
+
+	return cur_idx;
+}
+
+static void SetComboItemDisabled(QComboBox *c, int idx)
+{
+	QStandardItemModel *model =
+		dynamic_cast<QStandardItemModel *>(c->model());
+	QStandardItem *item = model->item(idx);
+	item->setFlags(Qt::NoItemFlags);
+}
+
+void UpdateSourceComboToolbarProperties(QComboBox *combo, OBSSource source,
+					obs_properties_t *props,
+					const char *prop_name, bool is_int)
+{
+	std::string cur_id;
+
+	obs_data_t *settings = obs_source_get_settings(source);
+	if (is_int) {
+		cur_id = std::to_string(obs_data_get_int(settings, prop_name));
+	} else {
+		cur_id = obs_data_get_string(settings, prop_name);
+	}
+	obs_data_release(settings);
+
+	combo->blockSignals(true);
+
+	obs_property_t *p = obs_properties_get(props, prop_name);
+	int cur_idx = FillPropertyCombo(combo, p, cur_id, is_int);
+
+	if (cur_idx == -1 || obs_property_list_item_disabled(p, cur_idx)) {
+		if (cur_idx == -1) {
+			combo->insertItem(
+				0,
+				QTStr("Basic.Settings.Audio.UnknownAudioDevice"));
+			cur_idx = 0;
+		}
+
+		SetComboItemDisabled(combo, cur_idx);
+	}
+
+	combo->setCurrentIndex(cur_idx);
+	combo->blockSignals(false);
+}
+
+void ComboSelectToolbar::Init()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	UpdateSourceComboToolbarProperties(ui->device, source, props.get(),
+					   prop_name, is_int);
+}
+
+void UpdateSourceComboToolbarValue(QComboBox *combo, OBSSource source, int idx,
+				   const char *prop_name, bool is_int)
+{
+	QString id = combo->itemData(idx).toString();
+
+	obs_data_t *settings = obs_data_create();
+	if (is_int) {
+		obs_data_set_int(settings, prop_name, id.toInt());
+	} else {
+		obs_data_set_string(settings, prop_name, QT_TO_UTF8(id));
+	}
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}
+
+void ComboSelectToolbar::on_device_currentIndexChanged(int idx)
+{
+	OBSSource source = GetSource();
+	if (idx == -1 || !source) {
+		return;
+	}
+
+	UpdateSourceComboToolbarValue(ui->device, source, idx, prop_name,
+				      is_int);
+}
+
+AudioCaptureToolbar::AudioCaptureToolbar(QWidget *parent, OBSSource source)
+	: ComboSelectToolbar(parent, source)
+{
+}
+
+void AudioCaptureToolbar::Init()
+{
+	delete ui->activateButton;
+	ui->activateButton = nullptr;
+
+	obs_module_t *mod =
+		get_os_module("win-wasapi", "mac-capture", "linux-pulseaudio");
+	const char *device_str =
+		get_os_text(mod, "Device", "CoreAudio.Device", "Device");
+	ui->deviceLabel->setText(device_str);
+
+	prop_name = "device_id";
+
+	ComboSelectToolbar::Init();
+}
+
+WindowCaptureToolbar::WindowCaptureToolbar(QWidget *parent, OBSSource source)
+	: ComboSelectToolbar(parent, source)
+{
+}
+
+void WindowCaptureToolbar::Init()
+{
+	delete ui->activateButton;
+	ui->activateButton = nullptr;
+
+	obs_module_t *mod =
+		get_os_module("win-capture", "mac-capture", "linux-capture");
+	const char *device_str = get_os_text(mod, "WindowCapture.Window",
+					     "WindowUtils.Window", "Window");
+	ui->deviceLabel->setText(device_str);
+
+#if !defined(_WIN32) && !defined(__APPLE__) //linux
+	prop_name = "capture_window";
+#else
+	prop_name = "window";
+#endif
+
+#ifdef __APPLE__
+	is_int = true;
+#endif
+
+	ComboSelectToolbar::Init();
+}
+
+DisplayCaptureToolbar::DisplayCaptureToolbar(QWidget *parent, OBSSource source)
+	: ComboSelectToolbar(parent, source)
+{
+}
+
+void DisplayCaptureToolbar::Init()
+{
+	delete ui->activateButton;
+	ui->activateButton = nullptr;
+
+	obs_module_t *mod =
+		get_os_module("win-capture", "mac-capture", "linux-capture");
+	const char *device_str =
+		get_os_text(mod, "Monitor", "DisplayCapture.Display", "Screen");
+	ui->deviceLabel->setText(device_str);
+	is_int = true;
+
+#ifdef _WIN32
+	prop_name = "monitor";
+#elif __APPLE__
+	prop_name = "display";
+#else
+	prop_name = "screen";
+#endif
+
+	ComboSelectToolbar::Init();
+}
+
+/* ========================================================================= */
+
+DeviceCaptureToolbar::DeviceCaptureToolbar(QWidget *parent, OBSSource source)
+	: QWidget(parent),
+	  weakSource(OBSGetWeakRef(source)),
+	  ui(new Ui_DeviceSelectToolbar)
+{
+	ui->setupUi(this);
+
+	delete ui->deviceLabel;
+	delete ui->device;
+	ui->deviceLabel = nullptr;
+	ui->device = nullptr;
+
+	obs_data_t *settings = obs_source_get_settings(source);
+	active = obs_data_get_bool(settings, "active");
+	obs_data_release(settings);
+
+	obs_module_t *mod = obs_get_module("win-dshow");
+	activateText = obs_module_get_locale_text(mod, "Activate");
+	deactivateText = obs_module_get_locale_text(mod, "Deactivate");
+
+	ui->activateButton->setText(active ? deactivateText : activateText);
+}
+
+DeviceCaptureToolbar::~DeviceCaptureToolbar()
+{
+	delete ui;
+}
+
+void DeviceCaptureToolbar::on_activateButton_clicked()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return;
+	}
+
+	obs_data_t *settings = obs_source_get_settings(source);
+	bool now_active = obs_data_get_bool(settings, "active");
+	obs_data_release(settings);
+
+	bool desyncedSetting = now_active != active;
+
+	active = !active;
+
+	const char *text = active ? deactivateText : activateText;
+	ui->activateButton->setText(text);
+
+	if (desyncedSetting) {
+		return;
+	}
+
+	calldata_t cd = {};
+	calldata_set_bool(&cd, "active", active);
+	proc_handler_t *ph = obs_source_get_proc_handler(source);
+	proc_handler_call(ph, "activate", &cd);
+	calldata_free(&cd);
+}
+
+/* ========================================================================= */
+
+GameCaptureToolbar::GameCaptureToolbar(QWidget *parent, OBSSource source)
+	: SourceToolbar(parent, source), ui(new Ui_GameCaptureToolbar)
+{
+	obs_property_t *p;
+	int cur_idx;
+
+	ui->setupUi(this);
+
+	obs_module_t *mod = obs_get_module("win-capture");
+	ui->modeLabel->setText(obs_module_get_locale_text(mod, "Mode"));
+	ui->windowLabel->setText(
+		obs_module_get_locale_text(mod, "WindowCapture.Window"));
+
+	obs_data_t *settings = obs_source_get_settings(source);
+	std::string cur_mode = obs_data_get_string(settings, "capture_mode");
+	std::string cur_window = obs_data_get_string(settings, "window");
+	obs_data_release(settings);
+
+	ui->mode->blockSignals(true);
+	p = obs_properties_get(props.get(), "capture_mode");
+	cur_idx = FillPropertyCombo(ui->mode, p, cur_mode);
+	ui->mode->setCurrentIndex(cur_idx);
+	ui->mode->blockSignals(false);
+
+	ui->window->blockSignals(true);
+	p = obs_properties_get(props.get(), "window");
+	cur_idx = FillPropertyCombo(ui->window, p, cur_window);
+	ui->window->setCurrentIndex(cur_idx);
+	ui->window->blockSignals(false);
+
+	if (cur_idx != -1 && obs_property_list_item_disabled(p, cur_idx)) {
+		SetComboItemDisabled(ui->window, cur_idx);
+	}
+
+	UpdateWindowVisibility();
+}
+
+GameCaptureToolbar::~GameCaptureToolbar()
+{
+	delete ui;
+}
+
+void GameCaptureToolbar::UpdateWindowVisibility()
+{
+	QString mode = ui->mode->currentData().toString();
+	bool is_window = (mode == "window");
+	ui->windowLabel->setVisible(is_window);
+	ui->window->setVisible(is_window);
+	ui->empty->setVisible(!is_window);
+}
+
+void GameCaptureToolbar::on_mode_currentIndexChanged(int idx)
+{
+	OBSSource source = GetSource();
+	if (idx == -1 || !source) {
+		return;
+	}
+
+	QString id = ui->mode->itemData(idx).toString();
+
+	obs_data_t *settings = obs_data_create();
+	obs_data_set_string(settings, "capture_mode", QT_TO_UTF8(id));
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+
+	UpdateWindowVisibility();
+}
+
+void GameCaptureToolbar::on_window_currentIndexChanged(int idx)
+{
+	OBSSource source = GetSource();
+	if (idx == -1 || !source) {
+		return;
+	}
+
+	QString id = ui->window->itemData(idx).toString();
+
+	obs_data_t *settings = obs_data_create();
+	obs_data_set_string(settings, "window", QT_TO_UTF8(id));
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}
+
+/* ========================================================================= */
+
+ImageSourceToolbar::ImageSourceToolbar(QWidget *parent, OBSSource source)
+	: SourceToolbar(parent, source), ui(new Ui_ImageSourceToolbar)
+{
+	ui->setupUi(this);
+
+	obs_module_t *mod = obs_get_module("image-source");
+	ui->pathLabel->setText(obs_module_get_locale_text(mod, "File"));
+
+	obs_data_t *settings = obs_source_get_settings(source);
+	std::string file = obs_data_get_string(settings, "file");
+	obs_data_release(settings);
+
+	ui->path->setText(file.c_str());
+}
+
+ImageSourceToolbar::~ImageSourceToolbar()
+{
+	delete ui;
+}
+
+void ImageSourceToolbar::on_browse_clicked()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	obs_property_t *p = obs_properties_get(props.get(), "file");
+	const char *desc = obs_property_description(p);
+	const char *filter = obs_property_path_filter(p);
+	const char *default_path = obs_property_path_default_path(p);
+
+	QString path = OpenFile(this, desc, default_path, filter);
+	if (path.isEmpty()) {
+		return;
+	}
+
+	ui->path->setText(path);
+
+	obs_data_t *settings = obs_data_create();
+	obs_data_set_string(settings, "file", QT_TO_UTF8(path));
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}
+
+/* ========================================================================= */
+
+static inline QColor color_from_int(long long val)
+{
+	return QColor(val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff,
+		      (val >> 24) & 0xff);
+}
+
+static inline long long color_to_int(QColor color)
+{
+	auto shift = [&](unsigned val, int shift) {
+		return ((val & 0xff) << shift);
+	};
+
+	return shift(color.red(), 0) | shift(color.green(), 8) |
+	       shift(color.blue(), 16) | shift(color.alpha(), 24);
+}
+
+ColorSourceToolbar::ColorSourceToolbar(QWidget *parent, OBSSource source)
+	: SourceToolbar(parent, source), ui(new Ui_ColorSourceToolbar)
+{
+	ui->setupUi(this);
+
+	obs_data_t *settings = obs_source_get_settings(source);
+	unsigned int val = (unsigned int)obs_data_get_int(settings, "color");
+	obs_data_release(settings);
+
+	color = color_from_int(val);
+	UpdateColor();
+}
+
+ColorSourceToolbar::~ColorSourceToolbar()
+{
+	delete ui;
+}
+
+void ColorSourceToolbar::UpdateColor()
+{
+	color.setAlpha(255);
+
+	QPalette palette = QPalette(color);
+	ui->color->setFrameStyle(QFrame::Sunken | QFrame::Panel);
+	ui->color->setText(color.name(QColor::HexRgb));
+	ui->color->setPalette(palette);
+	ui->color->setStyleSheet(
+		QString("background-color :%1; color: %2;")
+			.arg(palette.color(QPalette::Window)
+				     .name(QColor::HexRgb))
+			.arg(palette.color(QPalette::WindowText)
+				     .name(QColor::HexRgb)));
+	ui->color->setAutoFillBackground(true);
+	ui->color->setAlignment(Qt::AlignCenter);
+}
+
+void ColorSourceToolbar::on_choose_clicked()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	obs_property_t *p = obs_properties_get(props.get(), "color");
+	const char *desc = obs_property_description(p);
+
+	QColorDialog::ColorDialogOptions options;
+
+#ifndef _WIN32
+	options |= QColorDialog::DontUseNativeDialog;
+#endif
+
+	QColor newColor = QColorDialog::getColor(color, this, desc, options);
+	if (!newColor.isValid()) {
+		return;
+	}
+
+	color = newColor;
+	UpdateColor();
+
+	obs_data_t *settings = obs_data_create();
+	obs_data_set_int(settings, "color", color_to_int(color));
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}
+
+/* ========================================================================= */
+
+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)
+{
+	ui->setupUi(this);
+
+	obs_data_t *settings = obs_source_get_settings(source);
+
+	const char *id = obs_source_get_unversioned_id(source);
+	bool ft2 = strcmp(id, "text_ft2_source") == 0;
+	bool read_from_file = obs_data_get_bool(
+		settings, ft2 ? "from_file" : "read_from_file");
+
+	obs_data_t *font_obj = obs_data_get_obj(settings, "font");
+	MakeQFont(font_obj, font);
+	obs_data_release(font_obj);
+
+	unsigned int val = (unsigned int)obs_data_get_int(settings, "color");
+	color = color_from_int(val);
+
+	const char *text = obs_data_get_string(settings, "text");
+
+	bool single_line = !read_from_file &&
+			   (!text || (strchr(text, '\n') == nullptr));
+	ui->emptySpace->setVisible(!single_line);
+	ui->text->setVisible(single_line);
+	if (single_line)
+		ui->text->setText(text);
+
+	obs_data_release(settings);
+}
+
+TextSourceToolbar::~TextSourceToolbar()
+{
+	delete ui;
+}
+
+void TextSourceToolbar::on_selectFont_clicked()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	QFontDialog::FontDialogOptions options;
+	uint32_t flags;
+	bool success;
+
+#ifndef _WIN32
+	options = QFontDialog::DontUseNativeDialog;
+#endif
+
+	font = QFontDialog::getFont(&success, font, this, "Pick a Font",
+				    options);
+	if (!success) {
+		return;
+	}
+
+	obs_data_t *font_obj = obs_data_create();
+
+	obs_data_set_string(font_obj, "face", QT_TO_UTF8(font.family()));
+	obs_data_set_string(font_obj, "style", QT_TO_UTF8(font.styleName()));
+	obs_data_set_int(font_obj, "size", font.pointSize());
+	flags = font.bold() ? OBS_FONT_BOLD : 0;
+	flags |= font.italic() ? OBS_FONT_ITALIC : 0;
+	flags |= font.underline() ? OBS_FONT_UNDERLINE : 0;
+	flags |= font.strikeOut() ? OBS_FONT_STRIKEOUT : 0;
+	obs_data_set_int(font_obj, "flags", flags);
+
+	obs_data_t *settings = obs_data_create();
+
+	obs_data_set_obj(settings, "font", font_obj);
+	obs_data_release(font_obj);
+
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}
+
+void TextSourceToolbar::on_selectColor_clicked()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	obs_property_t *p = obs_properties_get(props.get(), "color");
+	const char *desc = obs_property_description(p);
+
+	QColorDialog::ColorDialogOptions options;
+
+#ifndef _WIN32
+	options |= QColorDialog::DontUseNativeDialog;
+#endif
+
+	QColor newColor = QColorDialog::getColor(color, this, desc, options);
+	if (!newColor.isValid()) {
+		return;
+	}
+
+	color = newColor;
+
+	obs_data_t *settings = obs_data_create();
+	if (!strncmp(obs_source_get_id(source), "text_ft2_source", 15)) {
+		obs_data_set_int(settings, "color1", color_to_int(color));
+		obs_data_set_int(settings, "color2", color_to_int(color));
+	} else {
+		obs_data_set_int(settings, "color", color_to_int(color));
+	}
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}
+
+void TextSourceToolbar::on_text_textChanged()
+{
+	OBSSource source = GetSource();
+	if (!source) {
+		return;
+	}
+
+	obs_data_t *settings = obs_data_create();
+	obs_data_set_string(settings, "text", QT_TO_UTF8(ui->text->text()));
+	obs_source_update(source, settings);
+	obs_data_release(settings);
+}

obs-studio-26.0.0.tar.xz/UI/context-bar-controls.hpp Added

@@ -0,0 +1,167 @@
+#pragma once
+
+#include <memory>
+#include <obs.hpp>
+#include <QWidget>
+
+class Ui_BrowserSourceToolbar;
+class Ui_DeviceSelectToolbar;
+class Ui_GameCaptureToolbar;
+class Ui_ImageSourceToolbar;
+class Ui_ColorSourceToolbar;
+class Ui_TextSourceToolbar;
+
+class SourceToolbar : public QWidget {
+	Q_OBJECT
+
+	OBSWeakSource weakSource;
+
+protected:
+	using properties_delete_t = decltype(&obs_properties_destroy);
+	using properties_t =
+		std::unique_ptr<obs_properties_t, properties_delete_t>;
+
+	properties_t props;
+
+public:
+	SourceToolbar(QWidget *parent, OBSSource source);
+
+	OBSSource GetSource() { return OBSGetStrongRef(weakSource); }
+
+public slots:
+	virtual void Update() {}
+};
+
+class BrowserToolbar : public SourceToolbar {
+	Q_OBJECT
+
+	Ui_BrowserSourceToolbar *ui;
+
+public:
+	BrowserToolbar(QWidget *parent, OBSSource source);
+	~BrowserToolbar();
+
+public slots:
+	void on_refresh_clicked();
+};
+
+class ComboSelectToolbar : public SourceToolbar {
+	Q_OBJECT
+
+protected:
+	Ui_DeviceSelectToolbar *ui;
+	const char *prop_name;
+	bool is_int = false;
+
+public:
+	ComboSelectToolbar(QWidget *parent, OBSSource source);
+	~ComboSelectToolbar();
+	virtual void Init();
+
+public slots:
+	void on_device_currentIndexChanged(int idx);
+};
+
+class AudioCaptureToolbar : public ComboSelectToolbar {
+	Q_OBJECT
+
+public:
+	AudioCaptureToolbar(QWidget *parent, OBSSource source);
+	void Init() override;
+};
+
+class WindowCaptureToolbar : public ComboSelectToolbar {
+	Q_OBJECT
+
+public:
+	WindowCaptureToolbar(QWidget *parent, OBSSource source);
+	void Init() override;
+};
+
+class DisplayCaptureToolbar : public ComboSelectToolbar {
+	Q_OBJECT
+
+public:
+	DisplayCaptureToolbar(QWidget *parent, OBSSource source);
+	void Init() override;
+};
+
+class DeviceCaptureToolbar : public QWidget {
+	Q_OBJECT
+
+	OBSWeakSource weakSource;
+
+	Ui_DeviceSelectToolbar *ui;
+	const char *activateText;
+	const char *deactivateText;
+	bool active;
+
+public:
+	DeviceCaptureToolbar(QWidget *parent, OBSSource source);
+	~DeviceCaptureToolbar();
+
+public slots:
+	void on_activateButton_clicked();
+};
+
+class GameCaptureToolbar : public SourceToolbar {
+	Q_OBJECT
+
+	Ui_GameCaptureToolbar *ui;
+
+	void UpdateWindowVisibility();
+
+public:
+	GameCaptureToolbar(QWidget *parent, OBSSource source);
+	~GameCaptureToolbar();
+
+public slots:
+	void on_mode_currentIndexChanged(int idx);
+	void on_window_currentIndexChanged(int idx);
+};
+
+class ImageSourceToolbar : public SourceToolbar {
+	Q_OBJECT
+
+	Ui_ImageSourceToolbar *ui;
+
+public:
+	ImageSourceToolbar(QWidget *parent, OBSSource source);
+	~ImageSourceToolbar();
+
+public slots:
+	void on_browse_clicked();
+};
+
+class ColorSourceToolbar : public SourceToolbar {
+	Q_OBJECT
+
+	Ui_ColorSourceToolbar *ui;
+	QColor color;
+
+	void UpdateColor();
+
+public:
+	ColorSourceToolbar(QWidget *parent, OBSSource source);
+	~ColorSourceToolbar();
+
+public slots:
+	void on_choose_clicked();
+};
+
+class TextSourceToolbar : public SourceToolbar {
+	Q_OBJECT
+
+	Ui_TextSourceToolbar *ui;
+	QFont font;
+	QColor color;
+
+public:
+	TextSourceToolbar(QWidget *parent, OBSSource source);
+	~TextSourceToolbar();
+
+public slots:
+	void on_selectFont_clicked();
+	void on_selectColor_clicked();
+	void on_text_textChanged();
+};

obs-studio-25.0.8.tar.xz/UI/data/locale.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale.ini Changed

obs-studio-25.0.8.tar.xz/UI/data/locale/af-ZA.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/af-ZA.ini Changed

obs-studio-25.0.8.tar.xz/UI/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ar-SA.ini Changed

@@ -1,6 +1,5 @@
 
 Language="العربية"
-Region="الولايات المتحدة الأمريكية"
 
 OK="موافق"
 Apply="تطبيق"
@@ -38,6 +37,7 @@
 SourceWindow="عرض بالشاشة الكاملة (المصدر)"
 MultiviewProjector="معاينة متعددة (شاشة كاملة)"
 MultiviewWindowed="معاينة متعددة (داخل نافذة)"
+ResizeProjectorWindowToContent="ملاءمة النافذة للمحتوى"
 Clear="مسح"
 Revert="استعادة"
 Show="إظهار"
@@ -47,8 +47,8 @@
 New="جديد"
 Duplicate="تكرار مزدوج"
 Enable="تفعيل"
-DisableOSXVSync="تعطيل خاصية OSX V-Sync"
-ResetOSXVSyncOnExit="اعادة تعيين خاصية OSX V-sync عند الخروج"
+DisableOSXVSync="تعطيل خاصية macOS V-Sync"
+ResetOSXVSyncOnExit="اعادة تعيين خاصية macOS V-sync عند الخروج"
 HighResourceUsage="زيادة الحِمل في غملية ترميز الفيديو! خذ بعين الاعتبار تخفيض اعدادات الفيديو, او استخدم اعدادات ترميز اسرع."
 Transition="تبديل المشهد"
 QuickTransitions="تبديل سريع"
@@ -87,13 +87,21 @@
 Fullscreen="شاشة كاملة"
 Windowed="نافذة"
 Percent="بالمائة"
+RefreshBrowser="تحديث"
 AspectRatio="نسبة العرض إلى الارتفاع <b>%1:%2</b>"
 LockVolume="قفل الصوت"
+LogViewer="مشاهدة السجل"
+ShowOnStartup="إظهار عند بدء التشغيل"
+OpenFile="فتح ملف"
+AddValue="اضف %1"
 
 AlreadyRunning.Title="OBS قيد التشغيل بالفعل"
 AlreadyRunning.Text="OBS قيد التشغيل بالفعل! إلاّ إذا كنت تتعمد هذا, الرجاء إغلاق أي نسخة أخرى قيد التشغيل من OBS قبل محاولة تشغيل واحدة جديدة. إذا كان OBS لديك في وضعية التصغير إلى جانب الساعة, الرجاء التأكد إذا كان لازال يعمل هناك."
 AlreadyRunning.LaunchAnyway="إطلاق على أي حال"
 
+ChromeOS.Title="منصة غير مدعومة"
+ChromeOS.Text="يبدو أن OBS يعمل داخل حاوية ChromeOS. هذه المنصة غير معتمدة."
+
 DockCloseWarning.Title="إغلاق إطار قابل للإرساء"
 DockCloseWarning.Text="لقد قمت بإغلاق إطار قابل للإرساء. إذا كنت ترغب في إظهاره مرة أخرى، استخدم قائمة عرض ← أرصفة من شريط القوائم."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="آسيا"
 BandwidthTest.Region.Other="\"غير ذلك\""
 
-Basic.FirstStartup.RunWizard="هل تريد تشغيل معالج التكوين التلقائي؟ يمكنك أيضا يدوياً تكوين الإعدادات الخاصة بك بواسطة النقر فوق زر \"إعدادات\" في الواجهة الرئيسية."
-Basic.FirstStartup.RunWizard.NoClicked="إذا قمت بتغيير رأيك، يمكنك تشغيل معالج التكوين التلقائي في أي وقت مرة أخرى من قائمة أدوات."
-
 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.SubTitle="حدد إعدادات الفيديو التي ترغب في استخدامها"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="الاستخدام الحالي (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="العرض %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="الاستخدام الحالي (%1)"
@@ -171,6 +177,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="يقوم البرنامج الآن بتنفيذ مجموعة من الإختبارات لتقدير الإعدادات الأكثر مثالية"
 Basic.AutoConfig.TestPage.SubTitle.Complete="انتهى الاختبار"
 Basic.AutoConfig.TestPage.TestingBandwidth="إجراء اختبار النطاق الترددي، قد يستغرق هذا بضع دقائق..."
+Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="جاري الاتصال بـ: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="فشل الاتصال بأي سيرفر، رجاءا تحقق من اتصالك بالانترنت وأعد المحاولة."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="اختبار التدفق لـ: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="جاري فحص برمجية ترميز البث، قد تستغرق هذه العملية دقيقة..."
@@ -182,6 +189,8 @@
 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="استخدام المعالج"
@@ -291,14 +300,15 @@
 Output.RecordError.Title="خطأ في التسجيل"
 Output.RecordError.Msg="حدث خطأ غير محدد أثناء التسجيل."
 Output.RecordError.EncodeErrorMsg="حدث خطأ في الترميز أثناء التسجيل."
-Output.ReplayBuffer.NoHotkey.Title="لم يتم تعيين مفتاح اختصار!"
-Output.ReplayBuffer.NoHotkey.Msg="لم يتم تعيين مفتاح اختصار لحفظ التخزين المؤقَت للإعادة. الرجاء قم بتعيين مفتاح \"حفظ\" لاستخدامها في حفظ تسجيلات الإعادات."
 
 Output.BadPath.Title="مسار الملف غير صحيح"
 Output.BadPath.Text="مسار الإخراج ملف تكوين غير صالح. الرجاء التحقق من الإعدادات الخاصة بك للتأكد من أنه تم تعيين مسار ملف صحيح."
 
 LogReturnDialog="تم رفع السجل بنجاح"
+LogReturnDialog.Description="تم رفع ملف السجل الخاص بك. بإمكانك الآن مشاركة الرابط لأغراض تصحيح الأخطاء أو الدعم الفني."
+LogReturnDialog.Description.Crash="تم رفع تقرير الأعطال الخاص بك. يمكنك الآن مشاركة الرابط لأغراض تصحيح الأخطاء."
 LogReturnDialog.CopyURL="نسخ الرابط"
+LogReturnDialog.AnalyzeURL="تحليل"
 LogReturnDialog.ErrorUploadingLog="خطأ في رفع ملف السجل"
 
 Remux.SourceFile="تسجيل OBS"
@@ -317,6 +327,7 @@
 Remux.FileExists="الملفات التالية موجودة فعليا. هل ترغب في استبدالها؟"
 Remux.ExitUnfinishedTitle="تقدم عملية التحويل"
 Remux.ExitUnfinished="إيقاف عميلة التحويل الآن قد تجعل الملف غير قابل للاستخدام.\n هل أنت متأكد أنك تريد إيقاف عملية التحويل؟"
+Remux.HelpText="إسقط الملفات في هذه النافذة للremux، أو حدد خلية \"تسجيل OBS\" فارغة للتصفح من اجل ملف."
 
 UpdateAvailable="تحديث جديد متوفر"
 UpdateAvailable.Text="الإصدار %1.%2.%3 متوفر الآن. <a href='%4'>انقر هنا للتتحميل</a>"
@@ -340,6 +351,7 @@
 ScaleFiltering.Bilinear="ثنائي خطي"
 ScaleFiltering.Bicubic="ثنائي تكعيبي"
 ScaleFiltering.Lanczos="والغاوسي"
+ScaleFiltering.Area="المنطقة"
 
 Deinterlacing="تصحيح تشابك الصورة"
 Deinterlacing.Discard="تجاهل"
@@ -400,10 +412,18 @@
 Basic.PropertiesWindow.EditEditableListEntry="تعديل إدخال من '%1'"
 
 Basic.PropertiesView.FPS.Simple="صيغ مبسطة لعدد الإطارات/ث"
+Basic.PropertiesView.FPS.Rational="قيمة FPS كسرية"
+Basic.PropertiesView.FPS.ValidFPSRanges="مقاييس FPS صحيحة:"
 
 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.Filters="مرشحات"
 Basic.Filters.AsyncFilters="مرشحات الصوت/الفيديو"
@@ -446,17 +466,36 @@
 
 Basic.Main.Scenes="المشاهد"
 Basic.Main.Sources="المصادر"
+Basic.Main.Controls="التحكم"
 Basic.Main.Connecting="يتصل..."
 Basic.Main.StartRecording="بدء التسجيل"
+Basic.Main.StartReplayBuffer="بدء التخزين المؤقت لإعادة العرض"
 Basic.Main.SaveReplay="حفظ الإعادة"
 Basic.Main.StartStreaming="بدء البث"
+Basic.Main.StartVirtualCam="تشغيل الكاميرا الافتراضية"
 Basic.Main.StopRecording="إيقاف التسجيل"
+Basic.Main.PauseRecording="إيقاف التسجيل مؤقتا"
+Basic.Main.UnpauseRecording="إكمال التسجيل"
+Basic.Main.StoppingRecording="إيقاف التسجيل..."
+Basic.Main.StopReplayBuffer="إيقاف الخزن المؤقت لإعادة العرض"
+Basic.Main.StoppingReplayBuffer="يتم ايقاف الخزن المؤقت..."
 Basic.Main.StopStreaming="ايقاف البث"
+Basic.Main.StoppingStreaming="إيقاف البث..."
+Basic.Main.ForceStopStreaming="إيقاف البث (تجاهل التأخير)"
+Basic.Main.ShowContextBar="إظهار شريط أدوات المصدر"
+Basic.Main.HideContextBar="إخفاء شريط أدوات المصدر"
+Basic.Main.StopVirtualCam="إيقاف الكاميرا الافتراضية"
+Basic.Main.Group="مجموعة %1"
+Basic.Main.GroupItems="مجموعة العناصر المختارة"
+Basic.Main.Ungroup="فك التجميع"
+Basic.Main.GridMode="وضعية الشبكة"
+Basic.Main.ListMode="وضع القائمة"
 
 Basic.MainMenu.File="ملف (&F)"
 Basic.MainMenu.File.Export="تصدير (6) (&E)"
 Basic.MainMenu.File.Import="استيراد (&I)"
 Basic.MainMenu.File.ShowRecordings="إظهار التسجيلات (&R)"
+Basic.MainMenu.File.Remux="تسجيلات Remux"
 Basic.MainMenu.File.Settings="الإعدادات (&S)"
 Basic.MainMenu.File.ShowSettingsFolder="إظهار مجلد الإعدادات"
 Basic.MainMenu.File.ShowProfileFolder="إظهار مجلد الملف الشخصي"
@@ -468,8 +507,15 @@
 Basic.MainMenu.Edit.Redo="إعادة (&R)"
 Basic.MainMenu.Edit.UndoAction="تراجع $1 (&U)"
 Basic.MainMenu.Edit.RedoAction="إعادة $1 (&R)"
+Basic.MainMenu.Edit.LockPreview="&قفل المعاينة"
+Basic.MainMenu.Edit.Scale="مقاييس المعاينة"
+Basic.MainMenu.Edit.Scale.Window="القياس لحد النافذة"
+Basic.MainMenu.Edit.Scale.Canvas="كانفاس (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="المخرج (%1x%2)"
 Basic.MainMenu.Edit.Transform="تحويل (&T)"
 Basic.MainMenu.Edit.Transform.EditTransform="تحرير التحويل... (&E)"
+Basic.MainMenu.Edit.Transform.CopyTransform="نسخ التحويل"
+Basic.MainMenu.Edit.Transform.PasteTransform="لصق التحويل"
 Basic.MainMenu.Edit.Transform.ResetTransform="إعادة التحويل (&R)"
 Basic.MainMenu.Edit.Transform.Rotate90CW="تدوير 90 درجة CW"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="تدوير 90 درجة CCW"
@@ -493,22 +539,39 @@
 Basic.MainMenu.View.Docks="أرصفة"
 Basic.MainMenu.View.Docks.ResetUI="إعادة ضبط الواجهة"
 Basic.MainMenu.View.Docks.LockUI="قفل تعديل الواجهة"
+Basic.MainMenu.View.Docks.CustomBrowserDocks="أرصفة المتصفح المخصصة..."
+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.SceneCollection="مجموعة المشاهد (&S)"
 Basic.MainMenu.Profile="الملف الشخصي (&P)"
 Basic.MainMenu.Profile.Import="استيراد ملف تعريف"
-Basic.MainMenu.Profile.Export="تصدير ملف التعريف"
+Basic.MainMenu.Profile.Export="تصدير الملف الشخصي"
+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.Website="زيارة الموقع الإلكتروني (&W)"
+Basic.MainMenu.Help.HelpPortal="بوابة &المساعدة"
+Basic.MainMenu.Help.Website="زيارة الموقع"
+Basic.MainMenu.Help.Discord="الانضمام إلى خادم ديسكورد"
 Basic.MainMenu.Help.Logs="ملفات السجل (&L)"
+Basic.MainMenu.Help.Logs.ShowLogs="&عرض السجلات"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="رفع ملف السجل الحالي (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="رفع آخر ملف سجل (&L)"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&عرض السجل الحالي"
 Basic.MainMenu.Help.CheckForUpdates="التحقق من وجود تحديثات"
+Basic.MainMenu.Help.CrashLogs="تقارير &الأعطال"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&عرض تقارير الأعطال"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="رفع آخر تقرير كراش"
+Basic.MainMenu.Help.About="&حول"
 
 Basic.Settings.ProgramRestart="يجب إعادة تشغيل البرنامج حتى تصبح الإعدادات نافذة المفعول."
 Basic.Settings.ConfirmTitle="تأكيد التغييرات"
@@ -517,13 +580,43 @@
 Basic.Settings.General="عام"
 Basic.Settings.General.Theme="السمة"
 Basic.Settings.General.Language="اللغة"
+Basic.Settings.General.EnableAutoUpdates="التحقق تلقائيًا من وجود تحديثات عند بدء التشغيل"
+Basic.Settings.General.OpenStatsOnStartup="فتح مربع الإحصائيات عند بدء التشغيل"
+Basic.Settings.General.WarnBeforeStartingStream="إظهار مربع التأكيد عند بدء البث"
+Basic.Settings.General.WarnBeforeStoppingStream="إظهار مربع التأكيد عند إيقاف البث"
+Basic.Settings.General.WarnBeforeStoppingRecord="إظهار مربع التأكيد عند إيقاف التسجيل"
+Basic.Settings.General.Projectors="جهاز العرض"
+Basic.Settings.General.HideProjectorCursor="إخفاء المؤشر فوق أجهزة العرض"
+Basic.Settings.General.ProjectorAlwaysOnTop="اجعل أجهزة العرض دائمًا في المقدمة"
+Basic.Settings.General.Snapping="محاذاة المصدر المفاجئة"
 Basic.Settings.General.ScreenSnapping="جذب المصادر لحافة الشاشة"
 Basic.Settings.General.CenterSnapping="جذب المصادر للمركز العمودي والأفقي"
 Basic.Settings.General.SourceSnapping="جذب المصادر للمصادر الأخرى"
 Basic.Settings.General.SnapDistance="حساسية الجذب"
+Basic.Settings.General.RecordWhenStreaming="التسجيل تلقائيا عند البث"
+Basic.Settings.General.KeepRecordingWhenStreamStops="الاستمرار بالتسجيل عند توقف البث"
+Basic.Settings.General.SysTray="منطقة الإعلام (الإشعارات)"
+Basic.Settings.General.SysTrayWhenStarted="التصغير إلى منطقة الإشعارات عند بدء التشغيل"
+Basic.Settings.General.SystemTrayHideMinimize="التصغير دائماً إلى منطقة الإشعارات بدلاً من شريط المهام"
+Basic.Settings.General.SaveProjectors="حفظ العرض عند الخروج"
+Basic.Settings.General.Preview="المعاينة"
+Basic.Settings.General.OverflowHidden="إخفاء خلفية المعاينة"
+Basic.Settings.General.OverflowAlwaysVisible="اظهار خلفية المعاينة دائماََ"
+Basic.Settings.General.OverflowSelectionHidden="اظهار خلفية المعاينة حتى عندما يكون المصدر ظاهراََ"
+Basic.Settings.General.Importers="الموارد"
+Basic.Settings.General.AutomaticCollectionSearch="البحث عن المواقع المعروفة لمجموعات المشاهد عند الاستيراد"
+Basic.Settings.General.SwitchOnDoubleClick="الانتقال إلى المشهد عند النقر المزدوج"
+Basic.Settings.General.StudioPortraitLayout="تمكين التخطيط العامودي/الرأسي"
+Basic.Settings.General.TogglePreviewProgramLabels="إظهار تسميات المعاينة/البرنامج"
+Basic.Settings.General.Multiview.DrawSourceNames="إظهار أسماء المشهد"
 
 Basic.Settings.Stream="بث"
 Basic.Settings.Stream.StreamType="نوع البث"
+Basic.Settings.Stream.Custom.Username="اسم المستخدم"
+Basic.Settings.Stream.Custom.Password="كلمة السر"
+Basic.Settings.Stream.TTVAddon.None="بدون"
+Basic.Settings.Stream.MissingSettingAlert="إعداد البث مفقود"
+Basic.Settings.Stream.StreamSettingsWarning="فتح الإعدادات"
 
 Basic.Settings.Output="المخرج"
 Basic.Settings.Output.Format="صيغة التسجيل"
@@ -549,14 +642,37 @@
 Basic.Settings.Output.Reconnect="إعادة الاتصال تلقائياً"
 Basic.Settings.Output.MaxRetries="أقصى عدد للمحاولات"
 
+Basic.Settings.Output.Adv.Streaming="البث"
+Basic.Settings.Output.Adv.ApplyServiceSettings="فرض إعدادات الترميز الخاصة بمنصة البث"
+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.Recording.Type.Standard="قياسي"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="التصدير إلى رابط 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.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.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="إعدادات مُرمّز الصوت (إن وجد)"
+
+Screenshot="أخذ لقطة شاشة للمَخرج"
+Screenshot.SourceHotkey="أخذ لقطة شاشة للمصدر المحدد"
+Screenshot.StudioProgram="أخذ لقطة شاشة (للبرنامج)"
+Screenshot.Preview="أخذ لقطة شاشة (للمعاينة)"
+Screenshot.Scene="أخذ لقطة شاشة (للمشهد)"
+Screenshot.Source="أخذ لقطة شاشة (للمصدر)"
 
 
 
@@ -579,7 +695,11 @@
 Basic.Settings.Audio="الصوت"
 Basic.Settings.Audio.SampleRate="معدل العينات"
 Basic.Settings.Audio.Channels="قنوات"
-Basic.Settings.Audio.Devices="الأجهزة"
+Basic.Settings.Audio.Meters="العدادات"
+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.DesktopDevice="صوت سطح المكتب"
 Basic.Settings.Audio.DesktopDevice2="صوت سطح المكتب 2"
 Basic.Settings.Audio.UnknownAudioDevice="[الجهاز غير متصل أو غير متوفر]"
@@ -615,4 +735,18 @@
 
 
 
+Restart="إعادة التشغيل"
+NeedsRestart="يجب إعادة تشغيل OBS Studio. هل تريد إعادة التشغيل الآن؟"
+
+ContextBar.NoSelectedSource="لم يتم تحديد مصدر"
+ContextBar.ResetTransform="إعادة تعيين التحويل"
+
+ContextBar.MediaControls.PlayMedia="تشغيل الوسائط"
+ContextBar.MediaControls.PauseMedia="إيقاف الوسائط"
+ContextBar.MediaControls.StopMedia="‮أوقف الوسائط"
+ContextBar.MediaControls.RestartMedia="إعادة تشغيل الوسائط"
+ContextBar.MediaControls.PlaylistNext="التالي في قائمة التشغيل"
+ContextBar.MediaControls.PlaylistPrevious="السابق في قائمة التشغيل"
+ContextBar.MediaControls.MediaProperties="خصائص الوسائط"
+ContextBar.MediaControls.BlindSeek="أداة البحث عن الوسائط"

obs-studio-25.0.8.tar.xz/UI/data/locale/az-AZ.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/az-AZ.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Azərbaycanca"
-Region="Azərbaycan"
 
 OK="Oldu"
 Apply="Tətbiq et"
@@ -9,7 +8,7 @@
 Save="Saxla"
 Discard="Ləğv et"
 Disable="Sıradan çıxart"
-Yes="Bəli"
+Yes="Hə"
 No="Xeyr"
 Add="Əlavə et"
 Remove="Çıxart"
@@ -23,6 +22,7 @@
 Display="Ekran"
 Name="Ad"
 Exit="Çıxış"
+Mixer="Səs mikseri"
 Browse="Gözdən keçir"
 Mono="Mono"
 Stereo="Stereo"
@@ -46,8 +46,8 @@
 New="Yeni"
 Duplicate="Çoxalt"
 Enable="Fəallaşdır"
-DisableOSXVSync="OSX V-Sync-i sıradan çıxart"
-ResetOSXVSyncOnExit="OSX V-Sync-i Çıxışda Sıfırla"
+DisableOSXVSync="macOS V-Sync-i sıradan çıxart"
+ResetOSXVSyncOnExit="macOS V-Sync-i Çıxışda Sıfırla"
 HighResourceUsage="Kodlama həddindən artıq yükləndi! Video tənzimləmələrini azaltmağı və ya daha sürətli kodlama ön tənzimini istifadə etməyi düşünün."
 Left="Sol"
 Right="Sa]"
@@ -77,12 +77,14 @@
 DoNotShowAgain="Təkrar göstərmə"
 Default="(İlkin)"
 Calculating="Hesablanır..."
+OpenFile="Faylı aç"
 
 AlreadyRunning.Title="OBS artıq işləyir"
 AlreadyRunning.LaunchAnyway="Yenə də başlat"
 
 
 
+
 Auth.Authing.Title="Kimlik təsdiqlənir..."
 Auth.Authing.Text="%1 ilə təsdiqlənir, zəhmət olmasa gözləyin..."
 Auth.AuthFailure.Title="Kimlik Təsdiqləməsi Uğursuz Oldu"
@@ -112,12 +114,14 @@
 BandwidthTest.Region.Asia="Asiya"
 BandwidthTest.Region.Other="Digər"
 
-
 Basic.AutoConfig="Avto Konfiqurasiya Sehrbazı"
 Basic.AutoConfig.ApplySettings="Tənzimləmələri Tətbiq et"
 Basic.AutoConfig.StartPage="İstifadə Məlumatı"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Mən yalnız virtual kamera işlədəcəyəm"
 Basic.AutoConfig.VideoPage="Video Tənzimləmələri"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="İndikini İstifadə et (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Göstər %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="İndikini İşlət (%1)"
 Basic.AutoConfig.StreamPage.Service="Xidmət"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Hamısını Göstər..."
 Basic.AutoConfig.StreamPage.Service.Custom="Fərdi..."
@@ -251,6 +255,10 @@
 
 
 
+Basic.Settings.Stream.TTVAddon.None="Heç biri"
+
+
+
 
 
 
@@ -258,7 +266,12 @@
 
 
 
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Normaldan Üstün"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Normal"
+Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Normaldan Aşağı"
 
+Basic.AdvAudio.Mono="Mono"
+Basic.AdvAudio.Monitoring.None="Monitor Sönüb"

obs-studio-26.0.0.tar.xz/UI/data/locale/ba-RU.ini Added

@@ -0,0 +1,332 @@
+
+Language="Башҡортса"
+
+OK="Ярай"
+Apply="Файҙаланыу"
+Cancel="Бөтөрөү"
+Close="Ябыу"
+Save="Һаҡлау"
+Discard="Кире ҡағыу"
+Disable="Һүндереү"
+Yes="Эйе"
+No="Юҡ"
+Add="Өҫтәү"
+Remove="Юйыу"
+Rename="Атап бөтөрөү"
+Interact="Йоҡташыу"
+Filters="Фильтрҙар"
+Properties="Үҙенсәлектәр"
+MoveUp="Өҫкәрәк"
+MoveDown="Аҫҡараҡ"
+Settings="Көйләүҙәр"
+Display="Экран"
+Name="Атама"
+Exit="Сығыу"
+Mixer="Аудио миксеры"
+Browse="Күҙәтеү"
+Mono="Моно"
+Stereo="Стерео"
+DroppedFrames="%1 (%2%) тиклем кадрҙар үткәреү"
+StudioProgramProjector="Тулы экран проекторы (Програм)"
+PreviewProjector="Тулы экран проекторы (Алдан күҙәтеү)"
+SceneProjector="Тулы экран проекторы (Сәхнә)"
+SourceProjector="Тулы экран проекторы (Сығанаҡ)"
+StudioProgramWindow="Тәҙрә проекторы (Програм)"
+PreviewWindow="Тәҙрә проекторы (Алдан күҙәтеү)"
+SceneWindow="Тәҙрә проекторы (Сәхнә)"
+SourceWindow="Тәҙрә проекторы (Сығанаҡ)"
+MultiviewProjector="Мульти-күренеш (Тулы экранлы)"
+MultiviewWindowed="Мульти-күренеш (Тәҙрәле)"
+Clear="Таҙартыу"
+Revert="Ҡайтарыу"
+Show="Күрһәтеү"
+Hide="Йәшереү"
+UnhideAll="Бөтөн күрһәтеү"
+Untitled="Атамһыҙ"
+New="Яһау"
+Duplicate="Дубльләү"
+Enable="Ҡабыҙыу"
+DisableOSXVSync="macOS V-Sync һүндереү"
+ResetOSXVSyncOnExit="Сығыуҙа macOS V-Sync ташлатыу"
+HighResourceUsage="Билдәгәрткес артып тулған! Видео көйләүҙәрҙе кесерәйеп әллә тиҙерәк билдәгәрткестең көйләүҙәрҙе файҙалап маташып ҡарағыҙ."
+Transition="Әүрелеү"
+QuickTransitions="Тиҙ әүрелеүҙәр"
+FadeToBlack="Ҡараға һүнеүе"
+Left="Һулда"
+Right="Уңда"
+Top="Өҫтә"
+Bottom="Аҫта"
+Reset="Ташлатыу"
+Hours="Сәғәт"
+Minutes="Минут"
+Seconds="Секунд"
+Deprecated="Иҫкергән"
+ReplayBuffer="Ҡабатлау буферы"
+Import="Импорт"
+Export="Экспорт"
+Copy="Күсермәһең алыу"
+Paste="Ҡуйыу"
+PasteReference="Ҡуйыу (Һылтанма)"
+PasteDuplicate="Ҡуйыу (Дүпликәт)"
+RemuxRecordings="Яҙмаларҙың ремукслау"
+Next="Артабан"
+Back="Артҡа"
+Defaults="Ғәҙәти"
+HideMixer="Миксерҙа күрһәтмәҫкә"
+TransitionOverride="Әүрелеүҙең яңы билдәләүе"
+None="Юҡ"
+StudioMode.Preview="Алдынан ҡарау"
+StudioMode.Program="Програм"
+ShowInMultiview="Мульти-күренештә күрһәтеү"
+VerticalLayout="Вертикаль торош"
+Group="Төркөм"
+DoNotShowAgain="Бүтәнсә күрһәтмәү"
+Default="(Ғәҙәти)"
+Calculating="Һанау..."
+Fullscreen="Тулы экран үтәмлеге"
+Windowed="Тәҙрә үтәмлеге"
+Percent="Проценттар"
+AspectRatio="<b>%1:%2</b> яҡтарҙың мөнәсәбәттәре"
+LockVolume="Тауышты билдәләү"
+
+AlreadyRunning.Title="OBS ҡабыҙылған инде"
+AlreadyRunning.LaunchAnyway="Барабер ебәреү"
+
+
+DockCloseWarning.Title="Билдәләп торған тәҙрәне ябыу"
+DockCloseWarning.Text="Тағыла торған тәҙрәне һеҙ яңы ғына яптығыҙ. Уны тағы күрһәтергә теләһәгеҙ, меню Күренеш → Док-панельҙар менюның юлында файзалағыҙ."
+
+ExtraBrowsers="Браузерҙың панельдары"
+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.LoadingChannel.Title="Канал өсөн мәғлүмәт йөкләү..."
+Auth.Chat="Чат"
+Auth.StreamInfo="Стримдың мәғлүмәте"
+TwitchAuth.Stats="Twitch статистиктары"
+TwitchAuth.Feed="Twitch әүҙемлек таҫмаһы"
+TwitchAuth.TwoFactorFail.Title="Стримдың асҡысын алып булманы"
+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.VideoPage="Видео көйләүҙәре"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="(%1x%2) ағымдағыны файҙалау"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="%1 (%2x%3) дисплейы"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="(%1) ағымдағыны файҙалау"
+Basic.AutoConfig.StreamPage="Стримдың мәғлүмәте"
+Basic.AutoConfig.StreamPage.SubTitle="Зинһар, трансляция тураһында мәғлүмәтте яҙығыҙ"
+Basic.AutoConfig.StreamPage.UseStreamKey="Стримдың асҡысын файҙалау"
+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="Статистик"
+Basic.Stats.CPUUsage="ҮП файҙалау"
+Basic.Stats.HDDSpaceAvailable="Дисктың буш урыны"
+Basic.Stats.MemoryUsage="Хәтер файҙаланыу"
+Basic.Stats.Output.Stream="Стрим"
+Basic.Stats.Output.Recording="Яҙыу"
+Basic.Stats.Status="Хәләт"
+Basic.Stats.Status.Recording="Яҙыу бара"
+Basic.Stats.Status.Live="ТУРА ТАПШЫРЫУ"
+Basic.Stats.Status.Reconnecting="Кире тотошоу"
+Basic.Stats.Status.Inactive="Әүҙемһеҙ"
+Basic.Stats.Status.Active="Әүҙемле"
+Basic.Stats.DroppedFrames="Кадрҙар үткәреү (Селтәр)"
+Basic.Stats.MegabytesSent="Ебәрелгән мәғлүмәт"
+Basic.Stats.Bitrate="Битрейт"
+Basic.Stats.ResetStats="Статистик ташлатыу"
+
+
+Updater.Title="Яңырыш сыҡты"
+Updater.Text="Яңы яңырыш бар:"
+Updater.UpdateNow="Хәҙер яңыртыу"
+Updater.RemindMeLater="Һуңғыраҡ иҫкә төрөрөү"
+Updater.Skip="Юрама ҡалдырыу"
+Updater.NoUpdatesAvailable.Title="Яңырышар юҡ"
+Updater.NoUpdatesAvailable.Text="Яңырышар табылмаған"
+
+QuickTransitions.DuplicateScene="Сәхнәне дүпликәтләү"
+QuickTransitions.EditProperties="Сығанаҡтарҙы дүпликәтләү"
+QuickTransitions.HotkeyName="Тиҙ әүрелеү: %1"
+
+Basic.AddTransition="Көйләүле әүрелеүҙе өҫтәргә"
+Basic.RemoveTransition="Көйләүле әүрелеүҙе юйырға"
+Basic.TransitionDuration="Оҙайлыҡ"
+
+
+TitleBar.Scenes="Сәхнәләр"
+
+
+
+
+
+
+
+
+
+
+
+
+Output.StreamEncodeError.Title="Билдәгәрткес хатасы"
+
+Output.RecordError.Title="Яҙыу хатасы"
+
+
+
+
+
+
+Basic.Scene="Сәхнә"
+
+
+
+
+Deinterlacing.Discard="Кире ҡағыу"
+Deinterlacing.Retro="Ретро"
+
+
+Basic.Main.AddSceneDlg.Title="Сәхнәне өҫтәргә"
+
+Basic.Main.DefaultSceneName.Text="Сәхнә %1"
+
+
+
+
+
+
+
+
+
+
+
+
+
+Basic.Filters="Фильтрҙар"
+Basic.Filters.AddFilter.Title="Фильтр исеме"
+
+Basic.TransformWindow.Position="Позиция"
+
+
+
+
+Basic.Main.Scenes="Сәхнәләр"
+
+Basic.MainMenu.File="Файл (&F)"
+Basic.MainMenu.File.Export="Экспорт (&E)"
+Basic.MainMenu.File.Import="Импорт (&I)"
+Basic.MainMenu.File.Remux="Яҙмаларҙың ремукслау (&M)"
+Basic.MainMenu.File.Settings="Көйләүҙәр (&S)"
+
+
+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.Encoder="Билдәгәрткес"
+Basic.Settings.Output.ReplayBuffer.Suffix="Суффикс"
+Basic.Settings.Output.VideoBitrate="Видео битрейты"
+Basic.Settings.Output.AudioBitrate="Аудио битрейты"
+
+Basic.Settings.Output.Adv.Streaming="Стрим"
+
+Basic.Settings.Output.Adv.Recording="Яҙыу"
+Basic.Settings.Output.Adv.Recording.Type="Төр"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Барлыҡ файлдар"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Аудио"
+Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Видео"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Видео билдәгәрткесе"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Аудио билдәгәрткесе"
+
+
+FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
+
+
+
+Basic.Settings.Audio="Аудио"
+Basic.Settings.Audio.Channels="Каналлар"
+Basic.Settings.Audio.Disabled="Һүндерелгән"
+
+Basic.Settings.Advanced.StreamDelay.Duration="Оҙайлыҡ"
+Basic.Settings.Advanced.Network="Селтәр"
+
+Basic.AdvAudio.Name="Атама"
+Basic.AdvAudio.Mono="Моно"
+Basic.AdvAudio.AudioTracks="Тректар"
+
+Basic.Settings.Hotkeys.Filter="Фильтр"
+
+
+Basic.SystemTray.Show="Күрһәтеү"
+Basic.SystemTray.Hide="Йәшереү"
+
+
+Hotkeys.Insert="Insert"
+Hotkeys.Delete="Delete"
+Hotkeys.Home="Home"
+Hotkeys.End="End"
+Hotkeys.PageUp="Page Up"
+Hotkeys.PageDown="Page Down"
+Hotkeys.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
+Hotkeys.CapsLock="Caps Lock"
+Hotkeys.Backspace="Backspace"
+Hotkeys.Tab="Tab"
+Hotkeys.Print="Print"
+Hotkeys.Pause="Pause"
+Hotkeys.Left="Һулда"
+Hotkeys.Right="Уңда"
+
+
+
+
+
+
+
+
+About.Authors="Авторҙар"
+
+
+
+
+
+
+Restart="Яңынан ебәрергә"
+
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/bg-BG.ini Changed

@@ -1,19 +1,18 @@
 
 Language="български"
-Region="България"
 
-OK="Окей"
-Apply="Прилагане"
-Cancel="Отказ"
-Close="Затваряне"
+OK="OK"
+Apply="Приложи"
+Cancel="Откажи"
+Close="Затвори"
 Save="Запази"
 Discard="Отхвърли"
 Disable="Деактивирай"
 Yes="Да"
 No="Не"
-Add="Добавяне"
-Remove="Премахване"
-Rename="Преименуване"
+Add="Добави"
+Remove="Премахни"
+Rename="Преименувай"
 Interact="Взаимодействие"
 Filters="Филтри"
 Properties="Свойства"
@@ -38,17 +37,17 @@
 SourceWindow="Прожектиране във прозорец (от Източника)"
 MultiviewProjector="Множествен Изглед (цял екран)"
 MultiviewWindowed="Множествен Изглед (в прозорец)"
-Clear="Изчистване"
+Clear="Изчисти"
 Revert="Върни"
-Show="Показване"
-Hide="Скриване"
-UnhideAll="Разкриване на всичко"
-Untitled="Неозаглавено"
+Show="Покажи"
+Hide="Скрий"
+UnhideAll="Покажи всички"
+Untitled="Неозаглавен"
 New="Нов"
 Duplicate="Дублирай"
-Enable="Активиране"
-DisableOSXVSync="Изключване на OSX V-синхронизация"
-ResetOSXVSyncOnExit="Рестартиране на OSX V-синхронизация при излизане"
+Enable="Активирай"
+DisableOSXVSync="Изключване на macOS V-синхронизация"
+ResetOSXVSyncOnExit="Рестартиране на macOS V-синхронизация при излизане"
 HighResourceUsage="Претоварено кордиране! Моля намалете настройките за видео или ползвайте по-бърза настройка за кодиране."
 Transition="Преход"
 QuickTransitions="Бързи преходи"
@@ -72,7 +71,7 @@
 Next="Напред"
 Back="Назад"
 Defaults="По подразбиране"
-HideMixer="Скриване в смесителя"
+HideMixer="Скрий в Смесителя"
 TransitionOverride="Налагане на преминавания"
 None="Без"
 StudioMode.Preview="Преглед"
@@ -94,6 +93,10 @@
 
 
 
+
+Auth.Authing.Title="Удостоверяване..."
+Auth.AuthFailure.Title="Неуспешно удостоверяване"
+Auth.InvalidScope.Title="Изисква се удостоверяване"
 Auth.Chat="Чат"
 Auth.StreamInfo="Информация за потока"
 TwitchAuth.Stats="Статистика за Twitch"
@@ -110,9 +113,6 @@
 BandwidthTest.Region.Asia="Азия"
 BandwidthTest.Region.Other="Друго"
 
-Basic.FirstStartup.RunWizard="Искате ли да изпълните съветника за автоматично конфигуриране? Можете също ръчно да конфигурирате настройките, като щракнете върху бутона настройки в главния прозорец."
-Basic.FirstStartup.RunWizard.NoClicked="Ако промените решението си, можете да стартирате съветника за автоматично конфигуриране отново от меню \"Инструменти\"."
-
 Basic.AutoConfig="Съветник за автоматично конфигуриране"
 Basic.AutoConfig.ApplySettings="Прилагане на настройките"
 Basic.AutoConfig.StartPage="Информация за използване"
@@ -120,7 +120,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Оптимизирай за стрийминг, записът е второстепенен"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Оптимизирай за записи, няма да стриймвам"
 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)"
@@ -129,6 +128,8 @@
 Basic.AutoConfig.VideoPage.CanvasExplanation="Бележка: резолюцията на платно (основата) не е задължително да бъде същата като резолюцията, с която ще излъчвате или записвате. Реалната разделителна способност на потока / записа може да бъде намалена от резолюцията на платното, за да се намалят използваните системни ресурси или битрейт."
 Basic.AutoConfig.StreamPage="Стрийм информация"
 Basic.AutoConfig.StreamPage.SubTitle="Моля въведете информация за вашия стрийм"
+Basic.AutoConfig.StreamPage.GetStreamKey="Получи ключ за излъчване"
+Basic.AutoConfig.StreamPage.UseStreamKey="Използвай ключ за излъчване"
 Basic.AutoConfig.StreamPage.Service="Услуга"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Покажи всички..."
 Basic.AutoConfig.StreamPage.Server="Сървър"
@@ -170,10 +171,12 @@
 Basic.Stats.Status.Live="НА ЖИВО"
 Basic.Stats.Status.Reconnecting="Повторно свързване"
 Basic.Stats.Status.Inactive="Неактивно"
+Basic.Stats.Status.Active="Активен"
 Basic.Stats.DroppedFrames="Изпуснати Кадри (Мрежа)"
 Basic.Stats.MegabytesSent="Общо количество изпратени данни"
 Basic.Stats.Bitrate="Битрейт"
 Basic.Stats.DiskFullIn="Дискът е пълен за (около)"
+Basic.Stats.ResetStats="Изчисти статистика"
 
 
 Updater.Title="Има нова актуализация"
@@ -253,8 +256,6 @@
 Output.RecordNoSpace.Msg="Няма достатъчно място на диска за да продължите да записвате."
 Output.RecordError.Title="Грешка при записването"
 Output.RecordError.Msg="Неопределена грешка по време на записването."
-Output.ReplayBuffer.NoHotkey.Title="Без зададен клавиш!"
-Output.ReplayBuffer.NoHotkey.Msg="Без зададен клавиш на Буферa за повторение. Моля настройте клавиша за \"Запаметяване\" на записи от Буфера за Повторение."
 
 Output.BadPath.Title="Неправилен файлов път"
 Output.BadPath.Text="Невалиден файлов път. Моля, проверете дали сте задали правилен файлов път в настройките."
@@ -296,6 +297,7 @@
 
 Basic.Main.PreviewConextMenu.Enable="Разреши преглед"
 
+Basic.Main.Preview.Disable="Изключи прегледа"
 
 ScaleFiltering="Мащабно Филтриране"
 ScaleFiltering.Point="Точково"
@@ -421,8 +423,10 @@
 Basic.Main.Connecting="Свързване..."
 Basic.Main.StartRecording="Започни запис"
 Basic.Main.StartReplayBuffer="Включване на Буферa за Повторение"
+Basic.Main.SaveReplay="Записване на повторението"
 Basic.Main.StartStreaming="Започни стрийм"
 Basic.Main.StopRecording="Спри запис"
+Basic.Main.PauseRecording="Пауза при запис"
 Basic.Main.StoppingRecording="Спиране на записването..."
 Basic.Main.StopReplayBuffer="Изкючване на Буферa за Повторение"
 Basic.Main.StoppingReplayBuffer="Спиране на Буферa за Повторение..."
@@ -469,6 +473,8 @@
 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="Ред (&O)"
 Basic.MainMenu.Edit.Order.MoveUp="Премести нагоре (&U)"
 Basic.MainMenu.Edit.Order.MoveDown="Премести надолу (&D)"
@@ -481,7 +487,6 @@
 Basic.MainMenu.View.Docks="Докове"
 Basic.MainMenu.View.Docks.ResetUI="Върни UI"
 Basic.MainMenu.View.Docks.LockUI="Заключи UI"
-Basic.MainMenu.View.Toolbars.Listboxes="Често ползвани (&L)"
 Basic.MainMenu.View.SceneTransitions="Преминавания между сцени (&C)"
 Basic.MainMenu.View.StatusBar="Статус лента (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Изглед на цял екран"
@@ -574,7 +579,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимална Памет (Мегабайти)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Приблизително използвана памет: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Не може да се определи използваната памет. Моля нстройте максималния лимит за паметта."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Бележка: Моля проверете че има настроен клавиш за буфера във секцията с бързи-клавиши)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Представка на името на записи от Буферa за Повторение"
 Basic.Settings.Output.ReplayBuffer.Suffix="Надставка"
 Basic.Settings.Output.Simple.SavePath="Път към записа"
@@ -645,6 +649,7 @@
 
 
 
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео адаптер"
 Basic.Settings.Video.BaseResolution="Основна Резолюция на Платното"
@@ -677,10 +682,8 @@
 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, Mixer RTMP, Smashcast са примери, при които съраунд звукът е напълно поддържан. Въпреки че, Facebook Live и YouTube Live подържат и приемат съраунд, Facebook Live пемиксира към стерео звук, а YouTube Live възпроизвежда само два канала.\n\nЗвуковите филтъри на OBS подържат съраунд звук, въпреки това VST поддръжката не е гарантирана."
 Basic.Settings.Audio.MultichannelWarning.Title="Включи записването на съраунд звук?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Сигурни ли сте че искате да включите записването на съраунд звук?"
-Basic.Settings.Audio.Devices="Устройства"
 Basic.Settings.Audio.EnablePushToMute="Включи Натисни-за-да-заглуши"
 Basic.Settings.Audio.PushToMuteDelay="Натисни-за-да-заглуши забавяне"
 Basic.Settings.Audio.EnablePushToTalk="Включи Натисни-за-говорене"
@@ -817,3 +820,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/bn-BD.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/bn-BD.ini Changed

@@ -1,6 +1,5 @@
 
 Language="ইংরাজী"
-Region="মার্কিন যুক্তরাষ্ট্র"
 
 OK="ঠিক আছে"
 Apply="প্রয়োগ করুন"
@@ -23,6 +22,7 @@
 Display="প্রদর্শন"
 Name="নাম"
 Exit="প্রস্থান করুন"
+Mixer="অডিও মিক্সার"
 Browse="ব্রাউজ"
 Mono="মোনো"
 Stereo="স্টিরিও"
@@ -31,6 +31,8 @@
 PreviewProjector="পূর্ণ পর্দা জুড়ে প্রোজেক্টর (প্রিভিউ)"
 SceneProjector="পূর্ণ পর্দা জুড়ে প্রোজেক্টর (দৃশ্য)"
 SourceProjector="পূর্ণ পর্দা জুড়ে প্রোজেক্টর (সূত্র)"
+StudioProgramWindow="জানালাকৃত প্রজেক্টর (প্রোগ্রাম)"
+PreviewWindow="জানালাকৃত প্রজেক্টর (প্রিভিউ)"
 Clear="পরিষ্কার"
 Revert="প্রত্যাবর্তন"
 Show="প্রদর্শন করা হবে"
@@ -39,8 +41,8 @@
 New="নতুন"
 Duplicate="প্রতিলিপি"
 Enable="সচল"
-DisableOSXVSync="OSX ভি-সমকালীন নিষ্ক্রিয় করা হবে"
-ResetOSXVSyncOnExit="প্রস্থান করার সময় ভি-সমকালীন OSX রিসেট করুন"
+DisableOSXVSync="macOS ভি-সমকালীন নিষ্ক্রিয় করা হবে"
+ResetOSXVSyncOnExit="প্রস্থান করার সময় ভি-সমকালীন macOS রিসেট করুন"
 HighResourceUsage="এনকোডিং overloaded! ভিডিও সেটিংস ডাউন বাঁক বা দ্রুত এনকোডিং প্রিসেট ব্যবহার করে বিবেচনা করুন."
 Transition="স্থানান্তর"
 QuickTransitions="দ্রুত অবস্থান্তর"
@@ -144,8 +146,6 @@
 Output.RecordNoSpace.Msg="না চালিয়ে রেকর্ড করার জন্য পর্যাপ্ত ডিস্ক পরিসর নেই."
 Output.RecordError.Title="রেকর্ড করার ত্রুটির"
 Output.RecordError.Msg="রেকর্ড করার সময় একটি অনির্দিষ্ট ত্রুটি সংঘটিত হয়েছে."
-Output.ReplayBuffer.NoHotkey.Title="কোন hotkey সেট!"
-Output.ReplayBuffer.NoHotkey.Msg="কোন রিপ্লে বাফারের জন্য সেট hotkey ছাড়া। \"সংরক্ষণ\" hotkey রিপ্লে রেকর্ডিং সংরক্ষণের জন্য ব্যবহার করতে সেট করুন."
 
 Output.BadPath.Title="খারাপ পার্ট অনুসন্ধানname"
 Output.BadPath.Text="কনফিগার ফাইল আউটপুট পথটি সঠিক নয়। অনুগ্রহ করে একটি কার্যকর পথ তৈরি করা হয়েছে নিশ্চিত করতে, আপনার সেটিংস পরীক্ষা করুন."
@@ -352,7 +352,6 @@
 
 Basic.MainMenu.View="এবং প্রদর্শন করুন (&V)"
 Basic.MainMenu.View.Toolbars="এবং টুলবার (&T)"
-Basic.MainMenu.View.Toolbars.Listboxes="এবং &Listboxes"
 Basic.MainMenu.View.SceneTransitions="ঘটনাস্থলে অবস্থান্তর (&C)"
 Basic.MainMenu.View.StatusBar="স্ট্যাটাস বার (&S)"
 
@@ -444,6 +443,7 @@
 
 
 
+
 Basic.Settings.Video="ভিডিও"
 Basic.Settings.Video.Adapter="ভিডিও অভিযোজক"
 Basic.Settings.Video.BaseResolution="বেস (ক্যানভাস) নিয়মন"
@@ -558,3 +558,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ca-ES.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Català"
-Region="Països Catalans"
 
 OK="D'acord"
 Apply="Aplica"
@@ -38,6 +37,7 @@
 SourceWindow="Projector amb finestra (origen)"
 MultiviewProjector="Vista múltiple (pantalla completa)"
 MultiviewWindowed="Vista múltiple (finestra)"
+ResizeProjectorWindowToContent="Ajusta la finestra al contingut"
 Clear="Neteja"
 Revert="Reverteix"
 Show="Mostra"
@@ -47,8 +47,8 @@
 New="Nou"
 Duplicate="Duplica"
 Enable="Activa"
-DisableOSXVSync="Inhabilita V-Sync en OSX"
-ResetOSXVSyncOnExit="Reinicia V-Sync de OSX a la sortida"
+DisableOSXVSync="Inhabilita V-Sync en macOS"
+ResetOSXVSyncOnExit="Reinicia V-Sync de macOS a la sortida"
 HighResourceUsage="Sobrecàrrega en codificar! Consideri baixar els ajustos de vídeo o utilitzar una configuració del codificador mes ràpida."
 Transition="Transició"
 QuickTransitions="Transicions ràpides"
@@ -87,13 +87,21 @@
 Fullscreen="Pantalla completa"
 Windowed="En finestra"
 Percent="Percentatge"
+RefreshBrowser="Actualitza"
 AspectRatio="Relació d'aspecte <b>%1:%2</b>"
 LockVolume="Bloca el volum"
+LogViewer="Visor d'informes"
+ShowOnStartup="Mostra a l'inici"
+OpenFile="Obre el fitxer"
+AddValue="Afegeix %1"
 
 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"
 
+ChromeOS.Title="Plataforma no compatible"
+ChromeOS.Text="Sembla que l'OBS s'està executant dins d'un contingut de ChromeOS. Aquesta plataforma no és compatible"
+
 DockCloseWarning.Title="Tancament de la finestra acoblada"
 DockCloseWarning.Text="Heu tancat una finestra acoblada. Si voleu que es mostri novament, utilitzeu l'opció Visualitza → Acoblador de la barra de menús."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Àsia"
 BandwidthTest.Region.Other="Altre"
 
-Basic.FirstStartup.RunWizard="Voleu executar l'assistent de configuració automàtica? També podeu configurar els paràmetres manualment en fer clic al botó configuració de la finestra principal."
-Basic.FirstStartup.RunWizard.NoClicked="Si canvia la seva ment, pot executar l'assistent de configuració automàtica en qualsevol moment des del menú eines."
-
 Basic.AutoConfig="Assistent de configuració automàtic"
 Basic.AutoConfig.ApplySettings="Aplica la configuració"
 Basic.AutoConfig.StartPage="Informació sobre l'ús"
 Basic.AutoConfig.StartPage.SubTitle="Especifiqueu perquè vol fer servir el programa"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimitza per a transmissions, l'enregistrament és secundari"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimitza només per a l'enregistrament, no faré cap transmissió"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Utilitza només la càmera virtual"
 Basic.AutoConfig.VideoPage="Configuració de vídeo"
-Basic.AutoConfig.VideoPage.SubTitle="Especifiqueu la configuració de vídeo desitjats que vulgueu utilitzar"
+Basic.AutoConfig.VideoPage.SubTitle="Especifiqueu la configuració de vídeo que voleu utilitzar"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Utilitza l'actual (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Pantalla %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Utilitza l'actual (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificador de l'enregistrament"
 Basic.AutoConfig.TestPage.Result.Header="El programa ha determinat que aquesta configuració estimada és la més òptima per a vós:"
 Basic.AutoConfig.TestPage.Result.Footer="Per utilitzar aquesta configuració, feu clic a aplica la configuració. Per tornar a configurar l'assistent, feu clic a enrere. Per configurar els paràmetres vostè mateix, feu clic a cancel·lar i obriu la configuració."
+Basic.AutoConfig.Info="L'assistent de configuració automàtica determinarà la millor configuració segons les especificacions del vostre ordinador i la velocitat d'Internet."
+Basic.AutoConfig.RunAnytime="Podeu iniciar-ho en qualsevol moment des del menú Eines."
 
 Basic.Stats="Estadístiques"
 Basic.Stats.CPUUsage="Ús de CPU"
@@ -292,14 +300,15 @@
 Output.RecordError.Title="Error en l'enregistrament"
 Output.RecordError.Msg="S'ha produït un error desconegut mentre es gravava."
 Output.RecordError.EncodeErrorMsg="S'ha produït un error del codificador durant la gravació."
-Output.ReplayBuffer.NoHotkey.Title="Cap tecla d'accés ràpid!"
-Output.ReplayBuffer.NoHotkey.Msg="Cap tecla d'accés ràpid establerta per la memòria intermèdia de reproducció. Configureu la tecla d'accés \"Desa\" per desar els enregistraments de reproducció."
 
 Output.BadPath.Title="Ruta de l'arxiu incorrecta"
 Output.BadPath.Text="La ruta configurada pel fitxer de sortida no és vàlida. Si us plau, comproveu la configuració per confirmar que s'ha creat una ruta de fitxer vàlida."
 
 LogReturnDialog="Registre carregat amb èxit"
+LogReturnDialog.Description="S'ha carregat el fitxer de registre. Ara podeu compartir l'URL amb finalitats de depuració o assistència."
+LogReturnDialog.Description.Crash="S'ha carregat el vostre informe de fallada. Ara podeu compartir l'URL amb finalitats de depuració."
 LogReturnDialog.CopyURL="Copia l'URL"
+LogReturnDialog.AnalyzeURL="Analitza"
 LogReturnDialog.ErrorUploadingLog="Error en carregar el fitxer de registre"
 
 Remux.SourceFile="Enregistrament OBS"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Inicia la reproducció de la memòria intermèdia"
 Basic.Main.SaveReplay="Desa la repetició"
 Basic.Main.StartStreaming="Inicia la transmissió"
+Basic.Main.StartVirtualCam="Inicia la càmera virtual"
 Basic.Main.StopRecording="Atura l'enregistrament"
 Basic.Main.PauseRecording="Pausa la gravació"
 Basic.Main.UnpauseRecording="Reprèn la gravació"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Atura la transmissió"
 Basic.Main.StoppingStreaming="Aturant la transmissió..."
 Basic.Main.ForceStopStreaming="Atura l'enregistrament (descarta el retard)"
+Basic.Main.ShowContextBar="Mostra la barra d'eines d'origen"
+Basic.Main.HideContextBar="Amaga la barra d'eines d'origen"
+Basic.Main.StopVirtualCam="Atura la càmera virtual"
 Basic.Main.Group="Grup %1"
 Basic.Main.GroupItems="Agrupa els elements seleccionats"
 Basic.Main.Ungroup="Desagrupa"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Reinicia la interfície d'usuari"
 Basic.MainMenu.View.Docks.LockUI="Bloqueja la interfície d'usuari"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Panells de navegador personalitzats..."
-Basic.MainMenu.View.Toolbars.Listboxes="Quadre de &Llista"
+Basic.MainMenu.View.ListboxToolbars="Botons de la llista d'escenes/fonts"
+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"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memòria màxima (MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Ús aproximat de memòria: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="No es pot estimar l'ús de memòria. Establiu el límit màxim de memòria."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Assegureu-vos d'establir una tecla d'accés ràpid per la memòria intermèdia de reproducció a la secció de tecles ràpides)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefix del nom del fitxer de la memòria intermèdia"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufix"
 Basic.Settings.Output.Simple.SavePath="Camí d'enregistrament"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval de fotogrames clau (fotogrames)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Mostra tots els codificadors (encara que siguin potencialment incompatibles)"
 
+Screenshot="Sortida de la captura de pantalla"
+Screenshot.SourceHotkey="Captura de pantalla de la font seleccionada"
+Screenshot.StudioProgram="Captura de pantalla (programa)"
+Screenshot.Preview="Captura de pantalla (vista prèvia)"
+Screenshot.Scene="Captura de pantalla (escena)"
+Screenshot.Source="Captura de pantalla (origen)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Any, quatre dígits\n%YY		Any, darrers dos dígits (00-99)\n%MM		Mes en decimal (01-12)\n%DD		Dia del mes amb zero (01-31)\n%hh		Hora en format 24h (00-23)\n%mm		Minuts (00-59)\n%ss		Segons (00-61)\n%%		A % sign\n%a		Nom abreviat del dia de la setmana\n%A		Nom complet del dia\n%b		Nom abreviat del nom del mes\n%B		Nom complet del mes\n%d		Dia del mes amb zero (01-31)\n%H		Hora en format 24h (00-23)\n%I		Hora en format 12h (01-12)\n%m		Mes en decimal (01-12)\n%M		Minuts (00-59)\n%p		AM o PM\n%S		Segons (00-61)\n%y		Any, darrers dos dígits (00-99)\n%Y		Any\n%z		Norma ISO 8601 de la franja horària UTC\n%Z		Nom de la franja horària o abreviació\n%FPS		Fotogrames per segon\n%CRES		Resolució base (canvas)\n%ORES		Resolució de sortida (escalada)\n%VF		Format de vídeo"
@@ -753,7 +773,7 @@
 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.Title="Voleu habilitar el so envoltant?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Segur que voleu habilitar el so envoltant?"
-Basic.Settings.Audio.Devices="Dispositius"
+Basic.Settings.Audio.Devices="Dispositius d'àudio globals"
 Basic.Settings.Audio.DesktopDevice="Àudio de l'escriptori"
 Basic.Settings.Audio.DesktopDevice2="Àudio de l'escriptori 2"
 Basic.Settings.Audio.AuxDevice="Dispositiu d'àudio mic/auxiliar"
@@ -917,3 +937,16 @@
 Restart="Reinicia"
 NeedsRestart="Cal reiniciar l'OBS Studio. Voleu reiniciar-lo ara?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/cs-CZ.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Čeština"
-Region="Česká republika"
 
 OK="OK"
 Apply="Použít"
@@ -38,6 +37,7 @@
 SourceWindow="Projektor v okně (zdroj)"
 MultiviewProjector="Multiview (Celá obrazovka)"
 MultiviewWindowed="Multiview (V okně)"
+ResizeProjectorWindowToContent="Přizpůsobit okno obsahu"
 Clear="Vyčistit"
 Revert="Zvrátit"
 Show="Zobrazit"
@@ -47,8 +47,8 @@
 New="Nové"
 Duplicate="Duplikovat"
 Enable="Povolit"
-DisableOSXVSync="Zakázat OSX V-Sync"
-ResetOSXVSyncOnExit="Resetovat OSX V-Sync při ukončení"
+DisableOSXVSync="Zakázat macOS V-Sync"
+ResetOSXVSyncOnExit="Resetovat macOS V-Sync při ukončení"
 HighResourceUsage="Vysoké zatížení enkodéru! Zvažte snížení požadavků v nastavení obrazu nebo použití rychlé předvolby enkodéru."
 Transition="Přechod"
 QuickTransitions="Rychlé přechody"
@@ -87,13 +87,21 @@
 Fullscreen="Celá obrazovka"
 Windowed="V okně"
 Percent="Procent"
+RefreshBrowser="Obnovit"
 AspectRatio="Poměr stran <b>%1:%2</b>"
 LockVolume="Zamknout hlasitost"
+LogViewer="Prohlížeč záznamů"
+ShowOnStartup="Zobrazit při spuštění"
+OpenFile="Otevřít soubor"
+AddValue="Přidat %1"
 
 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"
 
+ChromeOS.Title="Nepodporovaná platforma"
+ChromeOS.Text="Zdá se, že OBS běží uvnitř kontejneru ChromeOS. Tato platforma není podporována."
+
 DockCloseWarning.Title="Zavření dokovatelného okna"
 DockCloseWarning.Text="Právě jste zavřeli dokovatelné okno. Pokud byste ho chtěli zobrazit znovu, tak použijte menu Zobrazit → Doky."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Asie"
 BandwidthTest.Region.Other="Jiná"
 
-Basic.FirstStartup.RunWizard="Chtěli byste použít průvodce nastavením? Pokud ne, nastavení můžete provést i manuálně a to po kliknutí na tlačítko Nastavení v hlavním okně."
-Basic.FirstStartup.RunWizard.NoClicked="Pokud změníte názor, tak můžete kdykoliv spustit průvodce z nabídky Nástrojů."
-
 Basic.AutoConfig="Průvodce nastavením"
 Basic.AutoConfig.ApplySettings="Použít"
 Basic.AutoConfig.StartPage="Informace o použití"
 Basic.AutoConfig.StartPage.SubTitle="Řekněte nám, k čemu chcete tento program používat"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimalizovat pro vysílání, nahrávání je druhořadé"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimalizovat pouze pro nahrávání, nebudu vysílat"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Budu používat pouze virtuální kameru"
 Basic.AutoConfig.VideoPage="Nastavení obrazu"
-Basic.AutoConfig.VideoPage.SubTitle="Specifikujte nastavení obrazu, které budete chtít použít"
+Basic.AutoConfig.VideoPage.SubTitle="Specifikujte nastavení obrazu, které chcete použít"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Použít aktuální (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Obrazovka %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Použít aktuální (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Kodér pro nahrávání"
 Basic.AutoConfig.TestPage.Result.Header="Tento program určil, že tato přibližná nastavení jsou pro vás jako dělaná:"
 Basic.AutoConfig.TestPage.Result.Footer="Pro použití těchto nastavení klikněte na Použít. Pro změnu v průvodci klikněte na Zpět. Pokud si přejete změnit nastavení manuálně, klikněte na Zrušit a poté otevřete Nastavení."
+Basic.AutoConfig.Info="Průvodce nastavením zjistí nejlepší nastavení podle výkonu počítače a rychlosti připojení k internetu."
+Basic.AutoConfig.RunAnytime="Tento proces může být spuštěn kdykoliv pomocí položky v menu Nástroje."
 
 Basic.Stats="Statistika"
 Basic.Stats.CPUUsage="Využití CPU"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Nepřiřazena žádná klávesová zkratka!"
-Output.ReplayBuffer.NoHotkey.Msg="Není nastavena žádná klávesová zkratka pro uložení záznamu. Nastavte ji prosím, abyste jej mohli ukládat."
 
 Output.BadPath.Title="Špatná cesta k souboru"
 Output.BadPath.Text="Nastavená cesta k výstupnímu souboru je chybná. Zkontrolujte nastavení, zda není cesta špatně napsána."
 
 LogReturnDialog="Záznam byl úspěšně nahrán"
+LogReturnDialog.Description="Váš soubor záznamu byl nahrán. Nyní můžete sdílet tuto adresu pro účely ladění nebo podpory."
+LogReturnDialog.Description.Crash="Váše hlášení o selhání bylo nahráno. Nyní můžete sdílet tuto adresu pro účely ladění."
 LogReturnDialog.CopyURL="Zkopírovat"
+LogReturnDialog.AnalyzeURL="Analyzovat"
 LogReturnDialog.ErrorUploadingLog="Nahrání záznamu se nezdařilo"
 
 Remux.SourceFile="OBS nahrávka"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Spustit záznam do paměti"
 Basic.Main.SaveReplay="Uložit záznam"
 Basic.Main.StartStreaming="Začít vysílat"
+Basic.Main.StartVirtualCam="Spustit virtuální kameru"
 Basic.Main.StopRecording="Zastavit nahrávání"
 Basic.Main.PauseRecording="Pozastavit nahrávání"
 Basic.Main.UnpauseRecording="Pokračovat v nahrávání"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Zastavit vysílání"
 Basic.Main.StoppingStreaming="Zastavuji vysílání..."
 Basic.Main.ForceStopStreaming="Zastavit vysílání (bez zpoždění)"
+Basic.Main.ShowContextBar="Zobrazit lištu nástrojů pro zdroje"
+Basic.Main.HideContextBar="Skrýt lištu nástrojů pro zdroje"
+Basic.Main.StopVirtualCam="Zastavit virtuální kameru"
 Basic.Main.Group="Skupina %1"
 Basic.Main.GroupItems="Seskupit vybrané"
 Basic.Main.Ungroup="Rozdělit skupinu"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Resetovat rozhraní"
 Basic.MainMenu.View.Docks.LockUI="Zamknout rozhraní"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Vlastní doky prohlížeče..."
-Basic.MainMenu.View.Toolbars.Listboxes="Seznamy (&L)"
+Basic.MainMenu.View.ListboxToolbars="Tlačítka pod seznamy scén/zdrojů"
+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"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximální využití paměti (MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Přibližné využití paměti: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nedokáži odhadnout využití paměti. Nastavte, prosím, maximální využití paměti."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Poznámka: Nezapomeňte si nastavit klávesovou zkratku pro tuto funkci)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Přípona souboru záznamu do paměti"
 Basic.Settings.Output.ReplayBuffer.Suffix="Přípona"
 Basic.Settings.Output.Simple.SavePath="Cesta pro nahrávání"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval klíčových snímků (snímky)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Zobrazit všechny kodeky (i když je možné, že nejsou kompatibilní)"
 
+Screenshot="Výstup snímků obrazovky"
+Screenshot.SourceHotkey="Vytvořit snímek obrazovky vybraného zdroje"
+Screenshot.StudioProgram="Snímek obrazovky (program)"
+Screenshot.Preview="Snímek obrazovky (náhled)"
+Screenshot.Scene="Snímek obrazovky (scéna)"
+Screenshot.Source="Snímek obrazovky (zdroj)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Rok, čtyři číslice\n%YY		Rok, poslední dvě číslice (00-99)\n%MM		Měsíc, číslem (01-12)\n%DD		Den v měsíci, dvě číslice (01-31)\n%hh		Hodina ve 24h formátu (00-23)\n%mm		Minuta (00-59)\n%ss		Vteřina (00-61)\n%%		Znak %\n%a		Zkrácený název dne v týdnu\n%A		Název dne v týdnu\n%b		Zkrácený název měsíce\n%B		Název měsíce\n%d		Den měsíce, dvě číslice (01-31)\n%H		Hodina ve 24h formátu (00-23)\n%I		Hodina ve 12h formátu (01-12)\n%m		Měsíc, číslem (01-12)\n%M		Minuta (00-59)\n%p		AM / PM\n%S		Vteřina (00-61)\n%y		Rok, poslední dvě číslice (00-99)\n%Y		Rok\n%z		ISO 8601 posun od UTC v časové zóně\n%Z		Název či zkratka časové zóny\n%FPS		Snímky za vteřinu\n%CRES		Základní rozlišení\n%ORES		Výstupní (škálované) rozlišení\n%VF		Formát obrazu"
@@ -750,10 +770,10 @@
 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, Mixer RTMP, Smashcast jsou příklady služeb, které jej plně podporují. 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="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.Title="Povolit prostorový zvuk?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Jste si jisti, že chcete povolit prostorový zvuk?"
-Basic.Settings.Audio.Devices="Zařízení"
+Basic.Settings.Audio.Devices="Globální zvuková zařízení"
 Basic.Settings.Audio.DesktopDevice="Zvuk plochy"
 Basic.Settings.Audio.DesktopDevice2="Zvuk plochy 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/AUX"
@@ -879,7 +899,7 @@
 NoSources.Title="Žádné zdroje"
 NoSources.Text="Vypadá to, že jste zatím nepřidali žádné zdroje obrazu, takže budete vysílat černou obrazovku. Opravdu chcete pokračovat ?"
 NoSources.Text.AddSource="Zdroje můžete kdykoliv přidat tlačítkem + pod seznamem Zdroje v hlavním okně."
-NoSources.Label="Nepřidali jste žádné zdroj.\nKlikněte na tlačítko + níže, nebo klikněte zde pravým tlačítkem, pro přidání nového zdroje."
+NoSources.Label="Nepřidali jste žádné zdroje.\nKlikněte na tlačítko + níže, nebo klikněte zde pravým tlačítkem, pro přidání nového zdroje."
 
 ChangeBG="Nastavit barvu"
 CustomColor="Vlastní barva"
@@ -917,3 +937,16 @@
 Restart="Restartování"
 NeedsRestart="OBS Studio je třeba restartovat. Chcete tak provést nyní?"
 
+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í"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/da-DK.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Dansk"
-Region="Danmark"
 
 OK="OK"
 Apply="Anvend"
@@ -38,6 +37,7 @@
 SourceWindow="Vinduesprojektering (kilde)"
 MultiviewProjector="Multivisning (fuldskærm)"
 MultiviewWindowed="Multivisning (vindue)"
+ResizeProjectorWindowToContent="Tilpas vindue til indhold"
 Clear="Ryd"
 Revert="Tilbagefør"
 Show="Vis"
@@ -47,8 +47,8 @@
 New="Ny"
 Duplicate="Dublere"
 Enable="Aktivér"
-DisableOSXVSync="Deaktivér OSX V-Sync"
-ResetOSXVSyncOnExit="Nulstil OSX V-Sync ved afslutning"
+DisableOSXVSync="Deaktivér macOS V-Sync"
+ResetOSXVSyncOnExit="Nulstil macOS V-Sync ved afslutning"
 HighResourceUsage="Encodingproces overbelastet! Overvej at reducere videoressourceforbruget eller benytte et hurtigere encoding-forvalg."
 Transition="Overgang"
 QuickTransitions="Hurtige overgange"
@@ -87,13 +87,21 @@
 Fullscreen="Fuldskærm"
 Windowed="I vindue"
 Percent="Procent"
+RefreshBrowser="Opfrisk"
 AspectRatio="Størrelsesforhold <b>%1:%2</b>"
 LockVolume="Lås lydstyrken"
+LogViewer="Logvisning"
+ShowOnStartup="Vis ved opstart"
+OpenFile="Åbn fil"
+AddValue="Tilføj %1"
 
 AlreadyRunning.Title="OBS kører allerede"
 AlreadyRunning.Text="OBS kører allerede! Medmindre dette er tilsigtet, så bør du lukke enhver eksisterende OBS-proces, inden du forsøger at køre en ny. Hvis du har OBS opsat til at minimeres sig til systembakken, så tjek om den stadig kører dér."
 AlreadyRunning.LaunchAnyway="Start alligevel"
 
+ChromeOS.Title="Uunderstøttet platform"
+ChromeOS.Text="OBS ser ud til at køre i en ChromeOS-container. Denne platform er uunderstøttet"
+
 DockCloseWarning.Title="Lukker dokbart vindue"
 DockCloseWarning.Text="Du har netop lukket et dokbart vindue. Hvis du vil vise det igen, så benyt menuen Vis → Dokke på menubjælken."
 
@@ -131,15 +139,13 @@
 BandwidthTest.Region.Asia="Asien"
 BandwidthTest.Region.Other="Anden"
 
-Basic.FirstStartup.RunWizard="Vil du at køre auto-opsætningsguiden? Du kan også opsætte dine indstillinger manuelt ved at klikke på knappen Indstillinger i hovedvinduet."
-Basic.FirstStartup.RunWizard.NoClicked="Skifter du mening, så kan du altid køre auto-opsætningsguiden igen fra menuen Værktøjer."
-
 Basic.AutoConfig="Auto-opsætningsguide"
 Basic.AutoConfig.ApplySettings="Effektuér indstillinger"
 Basic.AutoConfig.StartPage="Brugsoplysninger"
 Basic.AutoConfig.StartPage.SubTitle="Angiv, hvad du vil benytte programmet til"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimér til streaming, sekundært til optagelse"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimér kun til optagelse, jeg vil ikke foretage streaming"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Jeg kommer kun til at bruge det virtuelle kamera"
 Basic.AutoConfig.VideoPage="Videoindstillinger"
 Basic.AutoConfig.VideoPage.SubTitle="Angiv de ønskede videoindstillinger"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Benyt aktuelle (%1x%2)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Optagelses-encoder"
 Basic.AutoConfig.TestPage.Result.Header="Programmet har fastslået, at disse estimerede indstillinger er de mest idéelle for dig:"
 Basic.AutoConfig.TestPage.Result.Footer="Klik på Anvend indstillinger for at benytte denne opsætning. Klik på Tilbage for at genopsætte guiden og forsøge igen. For at opsætte manuelt, så klik på Annullér og åbn Indstillinger."
+Basic.AutoConfig.Info="Auto-opsætningsguiden vælger de bedste indstillinger ud fra dine computerspecifikationer og Internethastighed."
+Basic.AutoConfig.RunAnytime="Auto-opsætningen kan altid eksekveres via menuen Værktøjer."
 
 Basic.Stats="Statistikker"
 Basic.Stats.CPUUsage="CPU-forbrug"
@@ -292,14 +300,15 @@
 Output.RecordError.Title="Optagelsesfejl"
 Output.RecordError.Msg="En uspecificeret fejl opstod under optagelse."
 Output.RecordError.EncodeErrorMsg="En kodningsfejl opstod under optagelsen."
-Output.ReplayBuffer.NoHotkey.Title="Ingen genvejstast opsat!"
-Output.ReplayBuffer.NoHotkey.Msg="Ingen Gem-genvejstast opsat til genafspilnings-buffer. Opsæt en \"Gem\"-genvejstast til brug for at gemme genafspilningsoptagelser."
 
 Output.BadPath.Title="Ugyldig filsti"
 Output.BadPath.Text="Den opsatte filoutputsti er ugyldig, så tjek at en gyldig er opsat i Indstillinger."
 
 LogReturnDialog="Log er uploadet"
+LogReturnDialog.Description="Din logfil er uploadet. Du kan nu dele URL'en mhp. fejlfinding eller support."
+LogReturnDialog.Description.Crash="Din nedbrudsrapport er uploadet. Du kan nu dele URL'en mhp. fejlfinding."
 LogReturnDialog.CopyURL="Kopiér URL"
+LogReturnDialog.AnalyzeURL="Analysér"
 LogReturnDialog.ErrorUploadingLog="Fejl under upload af logfil"
 
 Remux.SourceFile="OBS-optagelse"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Start Genafspilnings-buffer"
 Basic.Main.SaveReplay="Gem Genafspilning"
 Basic.Main.StartStreaming="Start streaming"
+Basic.Main.StartVirtualCam="Start Virtuelt Kamera"
 Basic.Main.StopRecording="Stop optagelse"
 Basic.Main.PauseRecording="Sæt optagelse på pause"
 Basic.Main.UnpauseRecording="Genoptag optagelse"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Stop streaming"
 Basic.Main.StoppingStreaming="Stopper stream..."
 Basic.Main.ForceStopStreaming="Stop streaming (ignorér forsinkelse)"
+Basic.Main.ShowContextBar="Vis Kildeværktøjsbjælke"
+Basic.Main.HideContextBar="Skjul Kildeværktøjsbjælke"
+Basic.Main.StopVirtualCam="Stop Virtuelt Kamera"
 Basic.Main.Group="Gruppe %1"
 Basic.Main.GroupItems="Gruppér valgte emner"
 Basic.Main.Ungroup="Afgruppér"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Nulstil UI"
 Basic.MainMenu.View.Docks.LockUI="Lås UI"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Tilpassede Browserdokke..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Listebokse"
+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"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maksimal hukommelse (MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Estimeret hukommelsesforbrug: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Ikke kan estimere hukommelsesforbrug. Angiv en maks. hukommelsesgrænse."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Bemærk: Sørg for at opsætte en genvejstast til genafspilnings-bufferen i afsnittet for genvejstaster)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Genafspilnings-buffer, filnavnpræfiks"
 Basic.Settings.Output.ReplayBuffer.Suffix="Endelse"
 Basic.Settings.Output.Simple.SavePath="Optagelsessti"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Keyframe-Interval (billeder)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Vis alle codecs (selv potentielt inkompatible)"
 
+Screenshot="Slærmfoto, output"
+Screenshot.SourceHotkey="Slærmfoto, valgte kilde"
+Screenshot.StudioProgram="Slærmfoto (program)"
+Screenshot.Preview="Slærmfoto (forhåndsvisning)"
+Screenshot.Scene="Slærmfoto (scene)"
+Screenshot.Source="Slærmfoto (kilde)"
+
 FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%d-%m-%Y %I-%M-%S-%p\n%d-%m-%Y %H-%M-%S-%z\n%d-%m-%Y %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%DD		Månedsdag, nul-foranstillet (01-31)\n%MM				Måned som tal (01-12)\n%CCYY			År, fire cifre\n%YY				År, to sidste cifre (00-99)\n%hh				Time i 24-timersformat (00-23)\n%mm				Minut (00-59)\n%ss				Sekund (00-61)\n%%				Et %-tegn\n%a				Forkortet ugedagsnavn\n%A				Fuldt ugedagsnavn\n%b				Forkortet månedsnavn\n%B				Fuldt månedsnavn\n%d				Månedsdag, nul-foranstillet (01-31)\n%H				Time i 24-timersformat (00-23)\n%I				Time i 12-timersformat (01-12)\n%m				Måned som tal (01-12)\n%M				Minut (00-59)\n%p				AM-/PM-betegnelse\n%S				Sekund (00-61)\n%y				År, sidste to cifre (00-99)\n%Y				År\n%z				ISO 8601-forskydning fra UTC i tidszone\n%Z				Tidszonenavn eller -forkortelse\n%FPS				Billeder pr. sekund\n%CRES				Grundopløsning (lærred)\n%ORES				Outputopløsning (skaleret)\n%VF				Videoformat"
@@ -750,10 +770,10 @@
 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="Tjek ifm. streaming om din streamingtjeneste understøtter både Surround Sound-input og -afspilning. Facebook 360 Live, Mixer RTMP og Smashcast er eksempler, hvor surroundlyd understøttes fuldt ud. Selvom Facebook Live og YouTube Live begge accepterer surround input, nedmikser Facebook Live til stereo, og YouTube Live afspiller kun to kanaler.\n\nOBS-lydfiltre er kompatible med surroundlyd, dog er VST-pluginsupport ikke garanteret."
+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.Title="Aktivér Surround Sound-lyd?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sikker på, at du vil aktivere Surround Sound-lyd?"
-Basic.Settings.Audio.Devices="Enheder"
+Basic.Settings.Audio.Devices="Global Lydenhed"
 Basic.Settings.Audio.DesktopDevice="Computerlyd"
 Basic.Settings.Audio.DesktopDevice2="Computerlyd 2"
 Basic.Settings.Audio.AuxDevice="Mic/Aux Lydenhed"
@@ -917,3 +937,16 @@
 Restart="Genstart"
 NeedsRestart="Genstart af OBS Studio er nødvendig. Genstart nu?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/de-DE.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Deutsch"
-Region="Deutschland"
 
 OK="Okay"
 Apply="Übernehmen"
@@ -38,6 +37,7 @@
 SourceWindow="Fenstermodusprojektor (Quelle)"
 MultiviewProjector="Multiview (Vollbild)"
 MultiviewWindowed="Multiview (Fenstermodus)"
+ResizeProjectorWindowToContent="Fenster an Inhalt anpassen"
 Clear="Leeren"
 Revert="Rückgängig"
 Show="Anzeigen"
@@ -47,9 +47,9 @@
 New="Neu"
 Duplicate="Duplizieren"
 Enable="Aktivieren"
-DisableOSXVSync="OSX V‐Sync deaktivieren"
-ResetOSXVSyncOnExit="OSX V‐Sync beim Beenden zurücksetzen"
-HighResourceUsage="Kodierung überlastet! Erwägen Sie Ihre Videoeinstellungen zu verringern oder benutzen Sie eine schnellere Kodierervoreinstellung."
+DisableOSXVSync="macOS V‐Sync deaktivieren"
+ResetOSXVSyncOnExit="macOS V‐Sync beim Beenden zurücksetzen"
+HighResourceUsage="Codierung überlastet! Erwägen Sie Ihre Videoeinstellungen zu verringern oder benutzen Sie eine schnellere Encodervoreinstellung."
 Transition="Übergang"
 QuickTransitions="Schnellübergänge"
 FadeToBlack="Zu Schwarz übergehen"
@@ -87,15 +87,23 @@
 Fullscreen="Vollbildmodus"
 Windowed="Fenstermodus"
 Percent="Prozent"
+RefreshBrowser="Aktualisieren"
 AspectRatio="Seitenverhältnis <b>%1:%2</b>"
 LockVolume="Lautstärke sperren"
+LogViewer="Log ansehen"
+ShowOnStartup="Beim Start anzeigen"
+OpenFile="Datei öffnen"
+AddValue="%1 hinzufügen"
 
 AlreadyRunning.Title="OBS wird bereits ausgeführt"
-AlreadyRunning.Text="OBS wird bereits ausgeführt! Wenn dies unabsichtlich ist, beenden Sie alle vorhandenen OBS‐Instanzen, bevor Sie eine neue Instanz starten. Wenn Sie OBS so eingestellt haben, dass es sich zum Infobereich minimiert, überprüfen Sie bitte, ob es dort läuft."
+AlreadyRunning.Text="OBS wird bereits ausgeführt! Wenn dies unabsichtlich ist, beenden Sie alle vorhandenen OBS‐Instanzen, bevor Sie eine neue starten. Wenn Sie OBS so eingestellt haben, dass es sich zum Infobereich minimiert, überprüfen Sie bitte, ob es dort läuft."
 AlreadyRunning.LaunchAnyway="Trotzdem starten"
 
+ChromeOS.Title="Nicht unterstützte Plattform"
+ChromeOS.Text="OBS scheint in einem ChromeOS‐Container zu laufen. Diese Plattform wird nicht unterstützt."
+
 DockCloseWarning.Title="Dockbares Fenster schließen"
-DockCloseWarning.Text="Sie haben gerade ein dockbares Fenster geschlossen. Wenn Sie es erneut anzeigen möchten, verwenden Sie das Menü „Ansicht“ → „Docks“ in der Menüleiste."
+DockCloseWarning.Text="Sie haben gerade ein dockbares Fenster geschlossen. Wenn Sie es erneut anzeigen möchten, verwenden Sie das Menü „Ansicht“ → „Docks“ in der Menüleiste."
 
 ExtraBrowsers="Benutzerdefinierte Browser‐Docks"
 ExtraBrowsers.Info="Fügen Sie Docks hinzu, indem Sie ihnen einen Namen und eine URL geben und dann auf „Übernehmen“ oder „Schließen“ klicken, um diese zu öffnen. Sie können jederzeit Docks hinzufügen oder entfernen."
@@ -131,15 +139,13 @@
 BandwidthTest.Region.Asia="Asien"
 BandwidthTest.Region.Other="Andere"
 
-Basic.FirstStartup.RunWizard="Möchten Sie den Autokonfigurationsassistent ausführen? Sie können Ihre Einstellungen auch manuell konfigurieren, indem Sie die „Einstellungen“‐Schaltfläche im Hauptfenster anklicken."
-Basic.FirstStartup.RunWizard.NoClicked="Wenn Sie sich umentscheiden, können Sie den Autokonfigurationsassistent jederzeit aus dem Menü „Werkzeuge“ erneut ausführen."
-
 Basic.AutoConfig="Autokonfigurationsassistent"
 Basic.AutoConfig.ApplySettings="Einstellungen übernehmen"
 Basic.AutoConfig.StartPage="Informationen zur Verwendung"
-Basic.AutoConfig.StartPage.SubTitle="Geben Sie an, wofür Sie das Programm verwenden möchten"
+Basic.AutoConfig.StartPage.SubTitle="Geben Sie an, wofür Sie das Programm verwenden möchten."
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Für das Streamen optimieren, Aufnehmen ist zweitrangig"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Für das Aufnehmen optimieren, Streamen ist zweitrangig"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Ich werde nur die virtuelle Kamera verwenden"
 Basic.AutoConfig.VideoPage="Videoeinstellungen"
 Basic.AutoConfig.VideoPage.SubTitle="Geben Sie die gewünschten Videoeinstellungen an, die Sie verwenden möchten"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Aktuelle verwenden (%1 × %2)"
@@ -163,33 +169,35 @@
 Basic.AutoConfig.StreamPage.StreamKey="Streamschlüssel"
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Bitrate mit Bandbreitentest schätzen (kann einige Minuten dauern)"
-Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Hardwarekodierung bevorzugen"
-Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardwarekodierung beseitigt die meiste CPU‐Auslastung, kann aber mehr Bitrate erfordern, um das gleiche Maß an Qualität zu erhalten."
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Hardwarecodierung bevorzugen"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardwarecodierung beseitigt die meiste CPU‐Auslastung, kann aber mehr Bitrate erfordern, um das gleiche Maß an Qualität zu erhalten."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Streamwarnung"
 Basic.AutoConfig.StreamPage.StreamWarning.Text="Der Bandbreitentest streamt zufällige Videodaten ohne Ton zu Ihrem Kanal. Wenn Sie in der Lage sind, empfiehlt es sich, das Speichern von Videos vorrübergehend zu deaktivieren und den Stream privat zu schalten, bis der Test abgeschlossen ist. Fortfahren?"
 Basic.AutoConfig.TestPage="Endergebnisse"
-Basic.AutoConfig.TestPage.SubTitle.Testing="Das Programm führt nun eine Reihe von Tests durch, um die besten Einstellungen für Ihr System zu finden"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Das Programm führt nun eine Reihe von Tests durch, um die besten 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.Connecting="Verbinde zu: %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 Streamkodierer, dies kann einige Minuten dauern …"
-Basic.AutoConfig.TestPage.TestingRecordingEncoder="Teste Aufnahmekodierer, dies kann einige Minuten dauern …"
+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="Teste Auflösungen, dies kann einige Minuten dauern …"
-Basic.AutoConfig.TestPage.TestingRes.Fail="Fehler beim Starten des Kodierers"
+Basic.AutoConfig.TestPage.TestingRes.Fail="Fehler beim Starten des Encoders"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="Teste Auflösung %1 × %2 mit %3 FPS …"
-Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streamkodierer"
-Basic.AutoConfig.TestPage.Result.RecordingEncoder="Aufnahmekodierer"
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streamencoder"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="Aufnahmeencoder"
 Basic.AutoConfig.TestPage.Result.Header="Das Programm hat festgestellt, dass diese geschätzten Einstellungen für Sie am besten sind:"
 Basic.AutoConfig.TestPage.Result.Footer="Um den Assistenten neu zu konfigurieren und es erneut zu versuchen, klicken Sie auf „Zurück“. Um die Einstellungen selbst anzupassen, klicken Sie auf „Abbrechen“ und öffnen Sie die Einstellungen."
+Basic.AutoConfig.Info="Der Autokonfigurationsassistent ermittelt die besten Einstellungen basierend auf Ihren Computerspezifikationen und der Internetgeschwindigkeit."
+Basic.AutoConfig.RunAnytime="Dies kann jederzeit über das Werkzeug‐Menü ausgeführt werden."
 
 Basic.Stats="Statistiken"
 Basic.Stats.CPUUsage="CPU‐Auslastung"
 Basic.Stats.HDDSpaceAvailable="Speicherplatz verfügbar"
 Basic.Stats.MemoryUsage="Speicherauslastung"
 Basic.Stats.AverageTimeToRender="Durchschnittliche Framerenderzeit"
-Basic.Stats.SkippedFrames="Übersprungene Frames durch Kodierungsverzögerung"
+Basic.Stats.SkippedFrames="Übersprungene Frames durch Codierungsverzögerung"
 Basic.Stats.MissedFrames="Ausgelassene Frames durch Renderverzögerung"
 Basic.Stats.Output.Stream="Stream"
 Basic.Stats.Output.Recording="Aufnahme"
@@ -202,11 +210,11 @@
 Basic.Stats.DroppedFrames="Ausgelassene Frames (Netzwerk)"
 Basic.Stats.MegabytesSent="Insgesamte Datenausgabe"
 Basic.Stats.Bitrate="Bitrate"
-Basic.Stats.DiskFullIn="Datenträger voll in ugf."
+Basic.Stats.DiskFullIn="Datenträger voll in ungefähr"
 Basic.Stats.ResetStats="Statistiken zurücksetzen"
 
 ResetUIWarning.Title="Sind Sie sicher, dass Sie die Benutzeroberfläche zurücksetzen möchten?"
-ResetUIWarning.Text="Das Zurücksetzen der Benutzeroberfläche wird zusätzliche Docks ausblenden. Sie müssen diese Docks im „Ansicht“‐Menü wieder aktivieren, wenn sie sichtbar sein sollen.\n\nSind Sie sicher, dass Sie die Benutzeroberfläche zurücksetzen möchten?"
+ResetUIWarning.Text="Das Zurücksetzen der Benutzeroberfläche wird zusätzliche Docks ausblenden. Sie müssen diese Docks im Menü Ansicht wieder aktivieren, wenn sie sichtbar sein sollen.\n\nSind Sie sicher, dass Sie die Benutzeroberfläche zurücksetzen möchten?"
 
 Updater.Title="Neues Update verfügbar"
 Updater.Text="Es ist ein neues Update verfügbar:"
@@ -214,7 +222,7 @@
 Updater.RemindMeLater="Später erinnern"
 Updater.Skip="Version überspringen"
 Updater.Running.Title="Programm derzeit aktiv"
-Updater.Running.Text="Ausgänge sind derzeit aktiv. Bitte beenden Sie alle aktiven Ausgänge, bevor Sie versuchen, OBS zu aktualisieren."
+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.FailedToLaunch="Konnte den Updater nicht starten"
@@ -251,17 +259,17 @@
 ConfirmStart.Title="Stream starten?"
 ConfirmStart.Text="Sind Sie sicher, dass Sie den Stream starten möchten?"
 
-ConfirmStop.Title="Stream stoppen?"
-ConfirmStop.Text="Sind Sie sicher, dass Sie den Stream stoppen möchten?"
+ConfirmStop.Title="Stream beenden?"
+ConfirmStop.Text="Sind Sie sicher, dass Sie den Stream beenden möchten?"
 
-ConfirmStopRecord.Title="Aufnahme stoppen?"
-ConfirmStopRecord.Text="Sind Sie sicher, dass Sie die Aufnahme stoppen möchten?"
+ConfirmStopRecord.Title="Aufnahme beenden?"
+ConfirmStopRecord.Text="Sind Sie sicher, dass Sie die Aufnahme beenden möchten?"
 
 ConfirmBWTest.Title="Bandbreitentest starten?"
 ConfirmBWTest.Text="Sie haben OBS im Bandbreitentestmodus konfiguriert. In diesem Modus können Sie Netzwerktests durchführen, ohne dass Ihr Kanal live geschaltet wird. Sobald Sie fertig mit dem Testen sind, müssen Sie ihn deaktivieren, damit die Zuschauer Ihren Stream sehen können.\n\nMöchten Sie fortfahren?"
 
 ConfirmExit.Title="OBS beenden?"
-ConfirmExit.Text="OBS ist derzeit aktiv. Alle Streams/Aufnahmen werden gestoppt. Sind Sie sicher, dass Sie OBS beenden möchten?"
+ConfirmExit.Text="OBS ist derzeit aktiv. Alle Streams und Aufnahmen werden beendet. Sind Sie sicher, dass Sie OBS schließen möchten?"
 
 ConfirmRemove.Title="Entfernen bestätigen"
 ConfirmRemove.Text="Sind Sie sicher, dass Sie „$1“ entfernen möchten?"
@@ -270,20 +278,20 @@
 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 Protokolldatei für Details.\n\nHinweis: Wenn Sie die NVENC‐ oder AMD‐Kodierer verwenden, stellen Sie sicher, dass Ihre Videotreiber aktuell sind."
+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.ReplayBuffer.PauseWarning.Title="Kann beim Pausieren keine Wiederholungen speichern"
 Output.ReplayBuffer.PauseWarning.Text="Warnung: Wiederholungen können beim Pausieren der Aufnahme nicht gespeichert werden."
 
 Output.ConnectFail.Title="Verbindung fehlgeschlagen"
-Output.ConnectFail.BadPath="Ungültiger Pfad oder Verbindungs‐URL. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass diese korrekt sind."
+Output.ConnectFail.BadPath="Der Pfad oder die Verbindungs‐URL ist ungültig. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass diese korrekt sind."
 Output.ConnectFail.ConnectFailed="Verbindung zum Server fehlgeschlagen"
 Output.ConnectFail.InvalidStream="Konnte nicht auf den angegebenen Kanal oder Streamschlüssel zugreifen. Bitte überprüfen Sie den eingegebenen Streamschlüssel. Wenn er richtig ist, kann es ein Problem beim Verbinden mit dem Server gegeben haben."
-Output.ConnectFail.Error="Ein unerwarteter Fehler ist beim Verbindungsversuch zum Server aufgetreten. Mehr Informationen finden Sie in der Protokolldatei."
+Output.ConnectFail.Error="Ein unerwarteter Fehler ist beim Verbindungsversuch zum Server aufgetreten. Mehr Informationen finden Sie in der Logdatei."
 Output.ConnectFail.Disconnected="Verbindung zum Server getrennt."
 
-Output.StreamEncodeError.Title="Kodierungsfehler"
-Output.StreamEncodeError.Msg="Ein Kodierungsfehler ist beim Streaming aufgetreten."
+Output.StreamEncodeError.Title="Codierungsfehler"
+Output.StreamEncodeError.Msg="Ein Encoderfehler ist beim Streamen aufgetreten."
 
 Output.RecordFail.Title="Fehler beim Starten der Aufnahme"
 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."
@@ -291,21 +299,22 @@
 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 Kodierungsfehler ist beim Aufnehmen aufgetreten."
-Output.ReplayBuffer.NoHotkey.Title="Kein Hotkey festgelegt"
-Output.ReplayBuffer.NoHotkey.Msg="Kein „Wiederholung speichern“‐Hotkey für den Wiederholungspuffer festgelegt. Legen Sie bitte den Speichern‐Hotkey fest, der zum Speichern der Wiederholungsaufnahmen verwendet werden soll."
+Output.RecordError.EncodeErrorMsg="Ein Encoderfehler ist beim Aufnehmen aufgetreten."
 
 Output.BadPath.Title="Ungültiger Dateipfad"
 Output.BadPath.Text="Der konfigurierte Ausgabepfad ist ungültig. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass ein gültiger Pfad angegeben wurde."
 
-LogReturnDialog="Protokoll erfolgreich hochgeladen"
+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."
 LogReturnDialog.CopyURL="URL kopieren"
-LogReturnDialog.ErrorUploadingLog="Fehler beim Hochladen der Protokolldatei"
+LogReturnDialog.AnalyzeURL="Analysieren"
+LogReturnDialog.ErrorUploadingLog="Fehler beim Hochladen der Logdatei"
 
 Remux.SourceFile="OBS‐Aufnahme"
 Remux.TargetFile="Zieldatei"
 Remux.Remux="Remuxen"
-Remux.Stop="Remuxen stoppen"
+Remux.Stop="Remuxen beenden"
 Remux.ClearFinished="Fertiggestellte Objekte entfernen"
 Remux.ClearAll="Alle Objekte entfernen"
 Remux.OBSRecording="OBS‐Aufnahme"
@@ -313,11 +322,11 @@
 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="Zieldatei auswählen"
+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.ExitUnfinished="Das Remuxen ist noch nicht beendet. Wenn Sie jetzt stoppen, kann die Zieldatei unbrauchbar werden.\nSind Sie sicher, dass Sie das Remuxen beenden möchten?"
+Remux.ExitUnfinished="Das Remuxen ist noch nicht abgeschlossen. Wenn Sie jetzt beenden, kann die Zieldatei unbrauchbar werden.\nSind Sie sicher, dass Sie das Remuxen abbrechen möchten?"
 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."
 
 UpdateAvailable="Neues Update verfügbar"
@@ -331,7 +340,7 @@
 Basic.AuxDevice4="Mikrofon/AUX‐Audio 4"
 
 Basic.Scene="Szene"
-Basic.DisplayCapture="Monitoraufnahme"
+Basic.DisplayCapture="Bildschirmaufnahme"
 
 Basic.Main.PreviewConextMenu.Enable="Vorschau aktivieren"
 
@@ -342,7 +351,7 @@
 ScaleFiltering.Bilinear="Bilinear"
 ScaleFiltering.Bicubic="Bicubic"
 ScaleFiltering.Lanczos="Lanczos"
-ScaleFiltering.Area="Bereich"
+ScaleFiltering.Area="Area"
 
 Deinterlacing="Zeilenentflechtung (Deinterlacing)"
 Deinterlacing.Discard="Verwerfen"
@@ -408,13 +417,13 @@
 
 Basic.InteractionWindow="Mit „%1“ interagieren"
 
-Basic.StatusBar.Reconnecting="Verbindung getrennt; Verbindungsversuch %1 in %2 Sekunde(n)"
-Basic.StatusBar.AttemptingReconnect="Versuche die Verbindung wiederherzustellen … (Versuch %1)"
-Basic.StatusBar.ReconnectSuccessful="Wiederverbinden erfolgreich"
+Basic.StatusBar.Reconnecting="Verbindung getrennt. Verbindungsaufbau in %2 Sekunde(n) (Versuch %1)"
+Basic.StatusBar.AttemptingReconnect="Versuche, die Verbindung wiederherzustellen … (Versuch %1)"
+Basic.StatusBar.ReconnectSuccessful="Wiederverbindung erfolgreich"
 Basic.StatusBar.Delay="Verzögerung (%1 s)"
 Basic.StatusBar.DelayStartingIn="Verzögerung (starte in %1 s)"
-Basic.StatusBar.DelayStoppingIn="Verzögerung (stoppe in %1 s)"
-Basic.StatusBar.DelayStartingStoppingIn="Verzögerung (stoppe in %1 s, starte in %2 s)"
+Basic.StatusBar.DelayStoppingIn="Verzögerung (beende in %1 s)"
+Basic.StatusBar.DelayStartingStoppingIn="Verzögerung (beende in %1 s, starte in %2 s)"
 
 Basic.Filters="Filter"
 Basic.Filters.AsyncFilters="Audio‐/Videofilter"
@@ -424,14 +433,14 @@
 Basic.Filters.AddFilter.Title="Filtername"
 Basic.Filters.AddFilter.Text="Bitte geben Sie einen Namen für den Filter ein"
 
-Basic.TransformWindow="Szenen‐Elementtransformation"
+Basic.TransformWindow="Transformation von Szenenelement"
 Basic.TransformWindow.Position="Position"
 Basic.TransformWindow.Rotation="Drehung"
 Basic.TransformWindow.Size="Größe"
 Basic.TransformWindow.Alignment="Ausrichtung"
 Basic.TransformWindow.BoundsType="Begrenzungsrahmentyp"
-Basic.TransformWindow.BoundsAlignment="Ausrichtung in Begrenzungsrahmen"
-Basic.TransformWindow.Bounds="BoundingBox Größe"
+Basic.TransformWindow.BoundsAlignment="Ausrichtung im Begrenzungsrahmen"
+Basic.TransformWindow.Bounds="Begrenzungsrahmengröße"
 Basic.TransformWindow.Crop="Zuschneiden"
 
 Basic.TransformWindow.Alignment.TopLeft="Oben links"
@@ -463,15 +472,19 @@
 Basic.Main.StartReplayBuffer="Wiederholungspuffer starten"
 Basic.Main.SaveReplay="Wiederholung speichern"
 Basic.Main.StartStreaming="Stream starten"
-Basic.Main.StopRecording="Aufnahme stoppen"
+Basic.Main.StartVirtualCam="Virtuelle Kamera starten"
+Basic.Main.StopRecording="Aufnahme beenden"
 Basic.Main.PauseRecording="Aufnahme pausieren"
 Basic.Main.UnpauseRecording="Aufnahme fortsetzen"
-Basic.Main.StoppingRecording="Stoppe Aufnahme ..."
-Basic.Main.StopReplayBuffer="Wiederholungspuffer stoppen"
-Basic.Main.StoppingReplayBuffer="Stoppe Wiederholungspuffer …"
-Basic.Main.StopStreaming="Stream stoppen"
-Basic.Main.StoppingStreaming="Stoppe Stream …"
-Basic.Main.ForceStopStreaming="Stream stoppen (Verzögerung missachten)"
+Basic.Main.StoppingRecording="Beende Aufnahme …"
+Basic.Main.StopReplayBuffer="Wiederholungspuffer beenden"
+Basic.Main.StoppingReplayBuffer="Beende Wiederholungspuffer …"
+Basic.Main.StopStreaming="Stream beenden"
+Basic.Main.StoppingStreaming="Beende Stream …"
+Basic.Main.ForceStopStreaming="Stream beenden (Verzögerung missachten)"
+Basic.Main.ShowContextBar="Quellenwerkzeugleiste anzeigen"
+Basic.Main.HideContextBar="Quellenwerkzeugleiste verstecken"
+Basic.Main.StopVirtualCam="Virtuelle Kamera beenden"
 Basic.Main.Group="Gruppe %1"
 Basic.Main.GroupItems="Ausgewählte Elemente gruppieren"
 Basic.Main.Ungroup="Gruppierung aufheben"
@@ -493,9 +506,9 @@
 Basic.MainMenu.Edit.Undo="Rückgängig machen (&U)"
 Basic.MainMenu.Edit.Redo="Wiede&rherstellen"
 Basic.MainMenu.Edit.UndoAction="$1 rückgängig machen (&U)"
-Basic.MainMenu.Edit.RedoAction="$1 Wiede&rherstellen"
+Basic.MainMenu.Edit.RedoAction="$1 wiede&rherstellen"
 Basic.MainMenu.Edit.LockPreview="Vorschau sperren (&L)"
-Basic.MainMenu.Edit.Scale="Vorschau&skalierung"
+Basic.MainMenu.Edit.Scale="Vor&schauskalierung"
 Basic.MainMenu.Edit.Scale.Window="An Fenstergröße anpassen"
 Basic.MainMenu.Edit.Scale.Canvas="Leinwand (%1 × %2)"
 Basic.MainMenu.Edit.Scale.Output="Ausgabe (%1 × %2)"
@@ -503,7 +516,7 @@
 Basic.MainMenu.Edit.Transform.EditTransform="Transformation b&earbeiten …"
 Basic.MainMenu.Edit.Transform.CopyTransform="Transformation kopieren"
 Basic.MainMenu.Edit.Transform.PasteTransform="Transformation einfügen"
-Basic.MainMenu.Edit.Transform.ResetTransform="Transformation zu&rücksetzen"
+Basic.MainMenu.Edit.Transform.ResetTransform="T&ransformation zurücksetzen"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Um 90° im Uhrzeigersinn drehen"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Um 90° gegen den Uhrzeigersinn drehen"
 Basic.MainMenu.Edit.Transform.Rotate180="Um 180° drehen"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="GUI zurücksetzen"
 Basic.MainMenu.View.Docks.LockUI="GUI sperren"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Benutzerdefinierte Browser‐Docks …"
-Basic.MainMenu.View.Toolbars.Listboxes="&Listenfelder"
+Basic.MainMenu.View.ListboxToolbars="Schaltflächen für Szenen‐/Quellenlisten"
+Basic.MainMenu.View.ContextBar="Quellenwerkzeugleiste"
 Basic.MainMenu.View.SceneTransitions="Szenenübergänge (&C)"
 Basic.MainMenu.View.SourceIcons="Quellsymbole (&I)"
 Basic.MainMenu.View.StatusBar="&Statusleiste"
@@ -548,15 +562,15 @@
 Basic.MainMenu.Help.HelpPortal="Hilfe&portal"
 Basic.MainMenu.Help.Website="&Webseite besuchen"
 Basic.MainMenu.Help.Discord="&Discord‐Server beitreten"
-Basic.MainMenu.Help.Logs="Protoko&lldateien"
-Basic.MainMenu.Help.Logs.ShowLogs="Protokolldateien anzeigen (&S)"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="Aktuelle Protokolldatei hochladen (&C)"
-Basic.MainMenu.Help.Logs.UploadLastLog="Letzte Protoko&lldatei hochladen"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="Aktuelles Protokoll anzeigen (&V)"
+Basic.MainMenu.Help.Logs="&Logdateien"
+Basic.MainMenu.Help.Logs.ShowLogs="Logdateien anzeigen (&S)"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Aktuelle Logdatei ho&chladen"
+Basic.MainMenu.Help.Logs.UploadLastLog="&Letzte Logdatei hochladen"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="Aktuelles Log ansehen (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Nach Updates suchen"
 Basic.MainMenu.Help.CrashLogs="Abstu&rzberichte"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Ab&sturzberichte anzeigen"
-Basic.MainMenu.Help.CrashLogs.UploadLastLog="Neusten Absturzbericht hoch&laden"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Letzen Absturzbericht hochladen"
 Basic.MainMenu.Help.About="Über (&A)"
 
 Basic.Settings.ProgramRestart="Das Programm muss neugestartet werden, damit die Änderungen wirksam werden."
@@ -568,9 +582,9 @@
 Basic.Settings.General.Language="Sprache"
 Basic.Settings.General.EnableAutoUpdates="Beim Start nach Updates suchen"
 Basic.Settings.General.OpenStatsOnStartup="Statistikenfenster beim Start öffnen"
-Basic.Settings.General.WarnBeforeStartingStream="Bestätigungsdialog beim Streamstart anzeigen"
-Basic.Settings.General.WarnBeforeStoppingStream="Bestätigungsdialog beim Streamstopp anzeigen"
-Basic.Settings.General.WarnBeforeStoppingRecord="Bestätigungsdialog beim Aufnahmestopp anzeigen"
+Basic.Settings.General.WarnBeforeStartingStream="Bestätigungsdialog beim Starten des Streams anzeigen"
+Basic.Settings.General.WarnBeforeStoppingStream="Bestätigungsdialog beim Beenden des Streams anzeigen"
+Basic.Settings.General.WarnBeforeStoppingRecord="Bestätigungsdialog beim Beenden der Aufnahme anzeigen"
 Basic.Settings.General.Projectors="Projektoren"
 Basic.Settings.General.HideProjectorCursor="Mauszeiger über Projektoren verstecken"
 Basic.Settings.General.ProjectorAlwaysOnTop="Projektoren immer im Vordergrund anzeigen"
@@ -580,9 +594,9 @@
 Basic.Settings.General.SourceSnapping="Quellen an anderen Quellen ausrichten"
 Basic.Settings.General.SnapDistance="Ausrichtungsempfindlichkeit"
 Basic.Settings.General.RecordWhenStreaming="Stream automatisch aufnehmen"
-Basic.Settings.General.KeepRecordingWhenStreamStops="Weiter aufnehmen, wenn der Stream stoppt"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Weiter aufnehmen, wenn der Stream beendet wird"
 Basic.Settings.General.ReplayBufferWhileStreaming="Wiederholungspuffer automatisch beim Streamen starten"
-Basic.Settings.General.KeepReplayBufferStreamStops="Wiederholungspuffer weiter aktiv lassen, wenn der Stream stoppt"
+Basic.Settings.General.KeepReplayBufferStreamStops="Wiederholungspuffer weiter aktiv 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"
@@ -594,10 +608,10 @@
 Basic.Settings.General.Importers="Importierung"
 Basic.Settings.General.AutomaticCollectionSearch="Beim Importieren bekannte Orte nach Szenensammlungen durchsuchen"
 Basic.Settings.General.SwitchOnDoubleClick="Übergang zu Szene bei Doppelklick"
-Basic.Settings.General.StudioPortraitLayout="Porträt‐/Vertikales Layout aktivieren"
+Basic.Settings.General.StudioPortraitLayout="Porträt‐/vertikales Layout aktivieren"
 Basic.Settings.General.TogglePreviewProgramLabels="Vorschau‐/Programmbeschriftung anzeigen"
 Basic.Settings.General.Multiview="Multiview"
-Basic.Settings.General.Multiview.MouseSwitch="Klicken, um zwischen den Szenen umzuschalten"
+Basic.Settings.General.Multiview.MouseSwitch="Klicken, um zwischen Szenen zu wechseln"
 Basic.Settings.General.Multiview.DrawSourceNames="Szenennamen anzeigen"
 Basic.Settings.General.Multiview.DrawSafeAreas="Sichere Bereiche anzeigen (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Mehrbildanordnung"
@@ -613,7 +627,7 @@
 Basic.Settings.Stream.Custom.Username="Nutzername"
 Basic.Settings.Stream.Custom.Password="Passwort"
 Basic.Settings.Stream.BandwidthTestMode="Bandbreitentestmodus aktivieren"
-Basic.Settings.Stream.TTVAddon="Twitch‐Chat‐Add-Ons"
+Basic.Settings.Stream.TTVAddon="Twitch‐Chat‐Add‐Ons"
 Basic.Settings.Stream.TTVAddon.None="Keins"
 Basic.Settings.Stream.TTVAddon.Both="BetterTTV und FrankerFaceZ"
 Basic.Settings.Stream.MissingSettingAlert="Unvollständige Streameinrichtung"
@@ -624,9 +638,9 @@
 
 Basic.Settings.Output="Ausgabe"
 Basic.Settings.Output.Format="Aufnahmeformat"
-Basic.Settings.Output.Encoder="Kodierer"
-Basic.Settings.Output.SelectDirectory="Aufnahmeordner auswählen"
-Basic.Settings.Output.SelectFile="Aufnahmedatei auswählen"
+Basic.Settings.Output.Encoder="Encoder"
+Basic.Settings.Output.SelectDirectory="Wählen Sie den Aufnahmeordner aus"
+Basic.Settings.Output.SelectFile="Wählen Sie ein Aufnahmedatei aus"
 Basic.Settings.Output.EnforceBitrate="Bitratenlimit des Streamingdienstes erzwingen"
 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)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximale RAM‐Nutzung in MB"
 Basic.Settings.Output.ReplayBuffer.Estimate="Geschätzte RAM‐Nutzung: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="RAM‐Nutzung kann nicht geschätzt werden. Stellen Sie diese bitte ein."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Hinweis: Achten Sie darauf, einen Hotkey für den Wiederholungspuffer im Abschnitt „Hotkeys“ festzulegen.)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Wiederholungspuffer‐Dateinamen‐Präfix"
 Basic.Settings.Output.ReplayBuffer.Suffix="Suffix"
 Basic.Settings.Output.Simple.SavePath="Aufnahmepfad"
@@ -649,33 +662,33 @@
 Basic.Settings.Output.Simple.RecordingQuality.Small="Hohe Qualität; mittelgroße Dateien"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Ununterscheidbare Qualität; große Dateien"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Verlustfreie Qualität; enorm große Dateien"
-Basic.Settings.Output.Simple.Warn.VideoBitrate="Warnung: Die Videobitrate beim Streamen wird auf %1 festgelegt, was der Obergrenze des aktuellen Streamingdienstes entspricht. Falls Sie sicher sind, dass Sie %1 überschreiten wollen, deaktivieren Sie „Bitratenlimit des Streamingdienstes erzwingen“ in den erweiterten Kodierereinstellungen."
-Basic.Settings.Output.Simple.Warn.AudioBitrate="Warnung: Die Audiobitrate beim Streamen wird auf %1 festgelegt, was der Obergrenze des aktuellen Streamingdienstes entspricht. Falls Sie sicher sind, dass Sie %1 überschreiten wollen, deaktivieren Sie „Bitratenlimit des Streamingdienstes erzwingen“ in den erweiterten Kodierereinstellungen."
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Warnung: Die Videobitrate beim Streamen wird auf %1 festgelegt, was der Obergrenze des aktuellen Streamingdienstes entspricht. Falls Sie sicher sind, dass Sie %1 überschreiten wollen, deaktivieren Sie „Bitratenlimit des Streamingdienstes erzwingen“ in den erweiterten Encodereinstellungen."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Warnung: Die Audiobitrate beim Streamen wird auf %1 festgelegt, was der Obergrenze des aktuellen Streamingdienstes entspricht. Falls Sie sicher sind, dass Sie %1 überschreiten wollen, deaktivieren Sie „Bitratenlimit des Streamingdienstes erzwingen“ in den erweiterten Encodereinstellungen."
 Basic.Settings.Output.Simple.Warn.CannotPause="Warnung: Aufnahmen können nicht pausiert werden, wenn die Aufnahmequalität „Gleich wie Stream“ ist."
-Basic.Settings.Output.Simple.Warn.Encoder="Warnung: Mit einem Software‐Kodierer 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="Warnung: Verlustfreie Qualität erzeugt enorm große Dateien! Bei dieser Einstellung kann mehr als 7 Gigabyte Speicherplatz pro Minute bei hohen Auflösungen und Frameraten in Anspruch genommen werden. Sie ist für lange Aufnahmen daher nicht empfohlen, es sei denn, Sie haben eine sehr große Menge an Speicherplatz zur Verfügung."
+Basic.Settings.Output.Simple.Warn.Encoder="Warnung: 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="Warnung: Verlustfreie Qualität erzeugt enorm große Dateien! Bei dieser Einstellung kann bei hohen Auflösungen und Frameraten mehr als 7 GB Speicherplatz pro Minute in Anspruch genommen werden. Sie ist für lange Aufnahmen daher nicht empfohlen, es sei denn, Sie haben eine sehr große Menge an Speicherplatz zur Verfügung."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sind Sie sicher, dass Sie verlustfreie Qualität verwenden möchten?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Warnung zur verlustfreien Qualität"
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 niedrige CPU‐Auslastungsvoreinstellung, erhöht die Dateigröße)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 niedrige CPU‐Auslastungsvoreinstellung; erhöht die Dateigröße)"
 Basic.Settings.Output.VideoBitrate="Videobitrate"
 Basic.Settings.Output.AudioBitrate="Audiobitrate"
 Basic.Settings.Output.Reconnect="Automatisch wiederverbinden"
 Basic.Settings.Output.RetryDelay="Wiederholungsverzögerung"
 Basic.Settings.Output.MaxRetries="Maximale Wiederholungsversuche"
-Basic.Settings.Output.Advanced="Erweiterte Kodierereinstellungen aktivieren"
-Basic.Settings.Output.EncoderPreset="Kodierervoreinstellung"
-Basic.Settings.Output.CustomEncoderSettings="Benutzerdefinierte Kodierereinstellungen"
+Basic.Settings.Output.Advanced="Erweiterte Encodereinstellungen aktivieren"
+Basic.Settings.Output.EncoderPreset="Encodervoreinstellung"
+Basic.Settings.Output.CustomEncoderSettings="Benutzerdefinierte Encodereinstellungen"
 Basic.Settings.Output.CustomMuxerSettings="Benutzerdefinierte Muxereinstellungen"
 Basic.Settings.Output.NoSpaceFileName="Dateinamen ohne Leerzeichen generieren"
 
 Basic.Settings.Output.Adv.Rescale="Ausgabe umskalieren"
 Basic.Settings.Output.Adv.AudioTrack="Audiospur"
 Basic.Settings.Output.Adv.Streaming="Streaming"
-Basic.Settings.Output.Adv.ApplyServiceSettings="Streamingdienst‐Kodierereinstellungen erzwingen"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Encodereinstellungen des Streamingdienstes erzwingen"
 Basic.Settings.Output.Adv.Audio.Track1="Spur 1"
 Basic.Settings.Output.Adv.Audio.Track2="Spur 2"
 Basic.Settings.Output.Adv.Audio.Track3="Spur 3"
@@ -687,7 +700,7 @@
 Basic.Settings.Output.Adv.Recording.Type="Art"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Normal"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Benutzerdefinierte Ausgabe (FFmpeg)"
-Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Streamkodierer verwenden)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Streamencoder verwenden)"
 Basic.Settings.Output.Adv.Recording.Filename="Dateinamenformatierung"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Überschreiben, wenn Datei vorhanden"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg‐Ausgabetyp"
@@ -702,15 +715,22 @@
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Standardformat"
 Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Container‐Formatbeschreibung"
 Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Audio‐/Videocodec wird aus Dateipfad oder URL gebildet"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Standardkodierer"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Kodierer deaktivieren"
-Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videokodierer"
-Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videokodierereinstellungen (falls angegeben)"
-Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audiokodierer"
-Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audiokodierereinstellungen (falls angegeben)"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Standardencoder"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Encoder deaktivieren"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videoencoder"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videoencodereinstellungen (falls angegeben)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audioencoder"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audioencodereinstellungen (falls angegeben)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer‐Einstellungen (falls angegeben)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Keyframeintervall (Frames)"
-Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Zeige alle Codecs (auch wenn möglicherweise inkompatibel)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Alle Codecs anzeigen (auch wenn möglicherweise inkompatibel)"
+
+Screenshot="Screenshot von Ausgabe erstellen"
+Screenshot.SourceHotkey="Screenshot von ausgewählter Quelle erstellen"
+Screenshot.StudioProgram="Screenshot erstellen (Programm)"
+Screenshot.Preview="Screenshot erstellen (Vorschau)"
+Screenshot.Scene="Screenshot erstellen (Szene)"
+Screenshot.Source="Screenshot erstellen (Quelle)"
 
 FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%FPS\n%CRES\n%ORES\n%VF"
 
@@ -736,7 +756,7 @@
 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="Bereich (gewichtete Summe, 4/6/9 Stichproben)"
+Basic.Settings.Video.DownscaleFilter.Area="Area (gewichtete Summe, 4/6/9 Stichproben)"
 
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Sample Rate"
@@ -750,10 +770,10 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Sample Peak"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (höhere CPU‐Auslastung)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="WARNUNG: Surround‐Sound‐Audio ist aktiviert."
-Basic.Settings.Audio.MultichannelWarning="Überprüfen Sie beim Streamen, ob Ihr Streamingdienst sowohl die Einspeisung von Surround‐Sound als auch die Surround‐Sound‐Wiedergabe unterstützt. Facebook 360 Live, Mixer RTMP und Smashcast sind Beispiele, bei denen Surround‐Sound voll unterstützt wird. 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, obwohl die VST‐Pluginunterstützung nicht garantiert ist."
+Basic.Settings.Audio.MultichannelWarning="Überprüfen Sie beim Streamen, ob Ihr Streamingdienst sowohl die Einspeisung von Surround‐Sound als auch die Surround‐Sound‐Wiedergabe unterstützt. Facebook 360 Live ist ein Beispiel, bei dem Surround‐Sound voll unterstützt wird. 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.MultichannelWarning.Title="Surround‐Sound‐Audio aktivieren?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sind Sie sicher, dass Sie Surround‐Sound‐Audio wirklich aktivieren möchten?"
-Basic.Settings.Audio.Devices="Geräte"
+Basic.Settings.Audio.Devices="Globale Audiogeräte"
 Basic.Settings.Audio.DesktopDevice="Desktop‐Audio"
 Basic.Settings.Audio.DesktopDevice2="Desktop‐Audio 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/AUX‐Audio"
@@ -792,7 +812,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Interface"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Netzwerkoptimierung aktivieren"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP Pacing aktivieren"
-Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Versucht, die RTMP‐Ausgabe für andere latenzempfindliche Anwendungen im Netzwerk durch Regulierung der Übertragungsrate zu erleichtern.\nKann zur Erhöhung des Risikos für ausgelassene Frames bei instabilen Verbindungen erhöhen."
+Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Versucht, die RTMP‐Ausgabe für andere latenzempfindliche Anwendungen im Netzwerk durch Regulierung der Übertragungsrate zu erleichtern.\nDies kann zur Erhöhung des Risikos für ausgelassene Frames bei instabilen Verbindungen führen."
 Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Hotkeyfokusverhalten"
 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Hotkeys nie deaktivieren"
 Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Hotkeys deaktivieren, wenn Hauptfenster im Fokus"
@@ -814,7 +834,7 @@
 Basic.AdvAudio.AudioTracks="Spuren"
 
 Basic.Settings.Hotkeys="Hotkeys"
-Basic.Settings.Hotkeys.Pair="Mit „%1“ geteilte Tastenkombinationen funktionieren als Schalter"
+Basic.Settings.Hotkeys.Pair="Mit „%1“ geteilte Tastenkombinationen fugieren als Schalter"
 Basic.Settings.Hotkeys.Filter="Filtern"
 
 Basic.Hotkeys.SelectScene="Zu Szene wechseln"
@@ -828,8 +848,8 @@
 Hotkeys.Delete="Entfernen"
 Hotkeys.Home="Pos1"
 Hotkeys.End="Ende"
-Hotkeys.PageUp="Bild‐auf"
-Hotkeys.PageDown="Bild‐ab"
+Hotkeys.PageUp="Bild nach oben"
+Hotkeys.PageDown="Bild nach unten"
 Hotkeys.NumLock="Num‐Taste"
 Hotkeys.ScrollLock="Rollen‐Taste"
 Hotkeys.CapsLock="Feststelltaste"
@@ -837,10 +857,10 @@
 Hotkeys.Tab="Tabulator"
 Hotkeys.Print="Drucken"
 Hotkeys.Pause="Pause"
-Hotkeys.Left="Pfeiltaste Links"
-Hotkeys.Right="Pfeiltaste Rechts"
-Hotkeys.Up="Pfeiltaste Hoch"
-Hotkeys.Down="Pfeiltaste Runter"
+Hotkeys.Left="Pfeiltaste nach links"
+Hotkeys.Right="Pfeiltaste nach rechts"
+Hotkeys.Up="Pfeiltaste nach oben"
+Hotkeys.Down="Pfeiltaste nach unten"
 Hotkeys.Windows="Windows"
 Hotkeys.Super="Super"
 Hotkeys.Menu="Menü"
@@ -870,8 +890,8 @@
 SceneItemHide="„%1“ verstecken"
 
 OutputWarnings.NoTracksSelected="Sie müssen mindestens eine Spur auswählen"
-OutputWarnings.MP4Recording="Warnung: Aufnahmen, die in MP4/MOV gespeichert werden, sind nicht wiederherstellbar, wenn die Datei nicht abgeschlossen 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 zu MP4/MOV remuxen, nachdem sie fertig ist. („Datei“ → „Aufnahmen remuxen“)"
-OutputWarnings.CannotPause="Warnung: Aufnahmen können nicht pausiert werden, wenn der Aufnahmekodierer auf „(Streamkodierer verwenden)“ gesetzt ist"
+OutputWarnings.MP4Recording="Warnung: Aufnahmen, die in MP4/MOV gespeichert werden, sind nicht wiederherstellbar, wenn die Datei nicht abgeschlossen 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 zu MP4/MOV remuxen, nachdem sie fertig ist. („Datei“ → „Aufnahmen remuxen“)"
+OutputWarnings.CannotPause="Warnung: Aufnahmen können nicht pausiert werden, wenn der Aufnahmeencoder auf „(Streamencoder verwenden)“ gesetzt ist"
 
 FinalScene.Title="Szene entfernen"
 FinalScene.Text="Es muss mindestens eine Szene vorhanden sein."
@@ -884,17 +904,17 @@
 ChangeBG="Farbe auswählen"
 CustomColor="Benutzerdefinierte Farbe"
 
-BrowserSource.EnableHardwareAcceleration="Browser‐Hardwarebeschleunigung aktivieren"
+BrowserSource.EnableHardwareAcceleration="Browserhardwarebeschleunigung aktivieren"
 
 About="Über OBS Studio"
 About.Info="OBS Studio ist eine freie und Open‐Source‐Videoaufnahme‐ und Livestreaming‐Software."
-About.Donate="Beitrag leisten"
-About.GetInvolved="Mitwirken"
+About.Donate="Leisten Sie einen Beitrag"
+About.GetInvolved="Wirken Sie mit"
 About.Authors="Autoren"
 About.License="Lizenzvereinbarung"
-About.Contribute="Das OBS‐Projekt unterstützen"
+About.Contribute="Unterstützen Sie das OBS‐Projekt"
 
-AddUrl.Title="Quelle über URL hinzufügen"
+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?"
 AddUrl.Text.Url="URL: %1"
 
@@ -911,9 +931,22 @@
 Importer.Path="Sammlungspfad"
 Importer.Program="Erkannte Anwendung"
 Importer.AutomaticCollectionPrompt="Automatisch nach Szenensammlungen suchen"
-Importer.AutomaticCollectionText="OBS kann automatisch importierbare Szenensammlungen von Drittanbieter‐Programmen finden. Möchten Sie, dass OBS automatisch nach Sammlungen für Sie sucht?\n\nSie können diese Einstellung später unter „Einstellungen“ → „Allgemein“ → „Importierung“ ändern."
+Importer.AutomaticCollectionText="OBS kann automatisch importierbare Szenensammlungen von Drittanbieter‐Programmen finden. Möchten Sie, dass OBS automatisch nach Sammlungen für Sie sucht?\n\nSie können diese Einstellung später unter „Einstellungen“ → „Allgemein“ → „Importierung“ ändern."
 
 
 Restart="Neustart"
-NeedsRestart="OBS Studio muss neugestartet werden. Möchten Sie jetzt neustarten?"
+NeedsRestart="OBS Studio muss neu gestartet werden. Möchten Sie jetzt neu starten?"
+
+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"

obs-studio-25.0.8.tar.xz/UI/data/locale/el-GR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/el-GR.ini Changed

@@ -1,11 +1,10 @@
 
 Language="Ελληνικά"
-Region="Ελλάδα"
 
-OK="ΟΚ"
+OK="Εντάξει"
 Apply="Εφαρμογή"
 Cancel="Ακύρωση"
-Close="Κλείσε"
+Close="Κλείσιμο"
 Save="Αποθήκευση"
 Discard="Απόρριψη"
 Disable="Απενεργοποίηση"
@@ -38,6 +37,7 @@
 SourceWindow="Προβολέας σε Παράθυρο (Πηγή)"
 MultiviewProjector="MultiView (Πλήρης Οθόνη)"
 MultiviewWindowed="MultiView (σε Παράθυρο)"
+ResizeProjectorWindowToContent="Ταίριασμα παραθύρου στο περιεχόμενο"
 Clear="Εκκαθάριση"
 Revert="Επαναφορά"
 Show="Εμφάνιση"
@@ -47,11 +47,12 @@
 New="Νέο"
 Duplicate="Διπλότυπο"
 Enable="Ενεργοποίηση"
-DisableOSXVSync="Απενεργοποίηση OSX V-Sync"
-ResetOSXVSyncOnExit="Επαναφορά OSX V-Sync κατά την έξοδο"
+DisableOSXVSync="Απενεργοποίηση macOS V-Sync"
+ResetOSXVSyncOnExit="Επαναφορά macOS V-Sync κατά την έξοδο"
 HighResourceUsage="Υπερφόρτωση κωδικοποίησης! Δοκιμάστε να χαμηλώσετε τις ρυθμίσεις βίντεο ή να χρησιμοποιήσετε μια ταχύτερη επιλογή κωδικοποίησης."
 Transition="Μετάβαση"
 QuickTransitions="Γρήγορες Μεταβάσεις"
+FadeToBlack="Ξεθωριάστε σε μαύρο"
 Left="Αριστερά"
 Right="Δεξιά"
 Top="Πάνω"
@@ -85,12 +86,24 @@
 Calculating="Υπολογισμός..."
 Fullscreen="Πλήρης οθόνη"
 Windowed="Παράθυρο"
+Percent="Ποσοστό"
+RefreshBrowser="Ανανέωση"
+AspectRatio="Λόγος Διαστάσεων <b>%1:%2</b>"
+LockVolume="Κλείδωμα Έντασης"
+LogViewer="Προβολή καταγραφών"
+ShowOnStartup="Εμφάνιση κατά την εκκίνηση"
+OpenFile="Άνοιγμα αρχείου"
 
 AlreadyRunning.Title="Το OBS εκτελείται ήδη"
 AlreadyRunning.Text="Το OBS εκτελείται ήδη! Εκτός αν αυτός ήταν ο σκοπός σας, παρακαλούμε τερματίστε τις τρέχουσες διεργασίες OBS πριν προσπαθήσετε να εκκινήσετε μια καινούρια. Εάν έχετε ρυθμίσει το OBS να ελαχιστοποιείται στην γραμμή εργαλείων, παρακαλούμε να ελέγξετε αν τρέχει ήδη εκεί."
 AlreadyRunning.LaunchAnyway="Εκκίνηση ούτως ή άλλως"
 
+ChromeOS.Title="Μη υποστηριγμένη πλατφόρμα"
+ChromeOS.Text="Φαίνεται πως το OBS τρέχει σε ένα ChromeOS container. Η πλατφόρμα αυτή δεν υποστηρίζεται"
 
+DockCloseWarning.Title="Κλείσιμο \"δεμένου\" παραθύρου"
+
+ExtraBrowsers="Προσαρμοσμένες αποβάθρες προγράμματος περιήγησης"
 ExtraBrowsers.DockName="Όνομα Dock"
 
 Auth.Authing.Title="Επαλήθευση ταυτότητας..."
@@ -98,10 +111,20 @@
 Auth.AuthFailure.Title="Αποτυχία ελέγχου ταυτότητας"
 Auth.AuthFailure.Text="Απέτυχε η πιστοποίηση με %1:\n\n%2: %3"
 Auth.InvalidScope.Title="Απαιτείται πιστοποίηση"
+Auth.LoadingChannel.Title="Φόρτωση πληροφοριών καναλιού..."
+Auth.ChannelFailure.Title="Απέτυχε η φόρτωση του καναλιού"
+Auth.Chat="Συνομιλία"
+Auth.StreamInfo="Πληροφορίες Ροής"
+TwitchAuth.Stats="Στατιστηκά Twitch"
+TwitchAuth.Feed="Twitch Ροή Δραστηριότητας"
+TwitchAuth.TwoFactorFail.Title="Δεν ήταν δυνατή η ερώτηση του κλειδιού ροής"
+RestreamAuth.Channels="Κανάλια Restream"
 
 Copy.Filters="Αντιγραφή Φίλτρων"
 Paste.Filters="Επικόλληση Φίλτρων"
 
+BrowserPanelInit.Title="Αρχικοποίηση προγράμματος περιήγησης..."
+BrowserPanelInit.Text="Αρχικοποίηση προγράμματος περιήγησης, παρακαλώ περιμένετε..."
 
 BandwidthTest.Region="Περιοχή"
 BandwidthTest.Region.US="Ηνωμένες Πολιτείες"
@@ -109,17 +132,14 @@
 BandwidthTest.Region.Asia="Ασία"
 BandwidthTest.Region.Other="Άλλη"
 
-Basic.FirstStartup.RunWizard="Θα θέλατε να εκτελέσετε τον Οδηγό αυτόματης ρύθμισης παραμέτρων; Μπορείτε επίσης να κάνετε ρύθμιση παραμέτρων χειροκίνητα, κάνοντας κλικ στο κουμπί ρυθμίσεις στο κύριο παράθυρο."
-Basic.FirstStartup.RunWizard.NoClicked="Εάν αλλάξετε γνώμη, μπορείτε να εκτελέσετε τον Οδηγό αυτόματης ρύθμισης παραμέτρων οποιαδήποτε στιγμή ξανά, από το μενού Εργαλεία."
-
 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)"
@@ -128,8 +148,14 @@
 Basic.AutoConfig.VideoPage.CanvasExplanation="Σημείωση: Η (βασική) ανάλυση του καμβά δεν είναι αναγκαστικά η ίδια με την ανάλυση που θα κάνετε ροή ή καταγραφή. Η πραγματική ανάλυση ροής/καταγραφής μπορεί να ελαττωθεί απο την ανάλυση του καμβά για να μειωθεί η χρήση πόρων ή οι ανάγκες ρυθμού μετάδοσης bits."
 Basic.AutoConfig.StreamPage="Πληροφορίες Ροής"
 Basic.AutoConfig.StreamPage.SubTitle="Παρακαλώ εισάγετε τις πληροφορίες της ροής σας"
+Basic.AutoConfig.StreamPage.ConnectAccount="Σύνδεση Λογαριασμού (προτείνεται)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Αποσύνδεση Λογαριασμού"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Αποσύνδεση Λογαριασμού;"
+Basic.AutoConfig.StreamPage.GetStreamKey="Κλειδί Ροής"
+Basic.AutoConfig.StreamPage.UseStreamKey="Χρησιμοποιήστε το κλειδί ζωντανής ροής"
 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.LinkToSite="(Σύνδεσμος)"
@@ -154,9 +180,11 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Κωδικοποιητής Καταγραφής"
 Basic.AutoConfig.TestPage.Result.Header="Το πρόγραμμα έχει καθορίσει πως οι ακόλουθες ρυθμίσεις είναι οι πιο ιδανικές για σας:"
 Basic.AutoConfig.TestPage.Result.Footer="Για χρήση αυτών των ρυθμίσεων, κάντε κλικ στο κουμπί Εφαρμογή Ρυθμίσεων. Για να ξαναρυθμίσετε τις παραμέτρους του οδηγού και να προσπαθήσετε ξανά, κάντε κλικ στο κουμπί Πίσω. Για να ρυθμίσετε χειροκίνητα οι ίδιοι τις ρυθμίσεις, κάντε κλικ στο κουμπί Άκυρο και ανοίξτε τις ρυθμίσεις."
+Basic.AutoConfig.RunAnytime="Αυτό μπορεί να τρέξει σε κάθε στιγμή πηγαίνοντας στο μενού εργαλίων."
 
 Basic.Stats="Στατιστικά"
 Basic.Stats.CPUUsage="Χρήση της CPU"
+Basic.Stats.HDDSpaceAvailable="Διαθέσιμος χώρος στο δίσκο"
 Basic.Stats.MemoryUsage="Χρήση Mνήμης"
 Basic.Stats.AverageTimeToRender="Μέσος χρόνος απόδοσης καρέ"
 Basic.Stats.SkippedFrames="Παραλειπόμενα καρέ λόγω καθυστέρησης κωδικοποίησης"
@@ -168,10 +196,14 @@
 Basic.Stats.Status.Live="ΖΩΝΤΑΝΑ"
 Basic.Stats.Status.Reconnecting="Επανασύνδεση"
 Basic.Stats.Status.Inactive="Ανενεργό"
+Basic.Stats.Status.Active="Ενεργό"
 Basic.Stats.DroppedFrames="Κομμένα Καρέ (Δίκτυο)"
 Basic.Stats.MegabytesSent="Συνολικά Δεδομένα Εξόδου"
 Basic.Stats.Bitrate="Ρυθμός μετάδοσης bit"
+Basic.Stats.DiskFullIn="Ο δίσκος θα γεμίσει σε (περίπου)"
+Basic.Stats.ResetStats="Επαναφορά Στατιστικών"
 
+ResetUIWarning.Title="Είστε βέβαιοι ότι θέλετε να επαναφέρετε το UI;"
 
 Updater.Title="Νέα έκδοση διαθέσιμη"
 Updater.Text="Υπάρχει διαθέσιμη μια νέα έκδοση:"
@@ -220,7 +252,9 @@
 ConfirmStop.Text="Είστε σίγουροι οτι θέλετε να διακόψετε τη ροή;"
 
 ConfirmStopRecord.Title="Διακοπή εγγραφής?"
+ConfirmStopRecord.Text="Είστε σίγουροι ότι θέλετε να διακόψετε την εγγραφή;"
 
+ConfirmBWTest.Title="Έναρξη δοκιμής εύρους ζώνης;"
 
 ConfirmExit.Title="Έξοδος από το OBS;"
 ConfirmExit.Text="Το OBS είναι προσωρινά ενεργό. Όλες οι ροές/καταγραφές θα τερματιστούν. Είστε σίγουροι ότι επιθυμείτε να το κλείσετε;"
@@ -234,6 +268,8 @@
 Output.StartReplayFailed="Αποτυχία εκκίνησης της προσωρινής μνήμης των επαναλήψεων"
 Output.StartFailedGeneric="Αποτυχία εκκίνησης εξόδου. Παρακαλούμε ελέγξτε το αρχείο καταγραφής για λεπτομέρειες.\n\nΣημείωση: Εάν χρησιμοποιείτε τους κωδικοποιητές NVENC ή AMD, βεβαιωθείτε ότι τα προγράμματα οδήγησης της κάρτας γραφικών σας είναι ενημερωμένα."
 
+Output.ReplayBuffer.PauseWarning.Title="Δεν είναι δυνατή η αποθήκευση των επαναλήψεων κατά την παύση"
+Output.ReplayBuffer.PauseWarning.Text="Προειδοποίηση: Οι επαναλύψεις δεν μπορούν να σωθούν όταν η καταγραφή είναι σε παύση."
 
 Output.ConnectFail.Title="Η σύνδεση απέτυχε"
 Output.ConnectFail.BadPath="Μη έγκυρη Διαδρομή ή URL Σύνδεσης. Παρακαλώ ελέγξτε τις ρυθμίσεις σας και επιβεβαιώστε ότι είναι έγκυρες."
@@ -243,6 +279,7 @@
 Output.ConnectFail.Disconnected="Αποσυνδεθήκατε από τον διακομιστή."
 
 Output.StreamEncodeError.Title="Σφάλμα κωδικοποίησης"
+Output.StreamEncodeError.Msg="Ένα πρόβλημα κωδικοποίησης συνέβει κατά τη ζωντανή ροή."
 
 Output.RecordFail.Title="Αποτυχία εκκίνησης της καταγραφής"
 Output.RecordFail.Unsupported="Η μορφή εξόδου είτε δεν υποστηρίζεται ή δεν υποστηρίζει παραπάνω από ένα κομμάτι ήχου. Παρακαλώ ελέγξτε τις ρυθμίσεις σας και δοκιμάστε ξανά."
@@ -250,25 +287,28 @@
 Output.RecordNoSpace.Msg="Δεν υπάρχει επαρκής χώρος στο δίσκο για να συνεχιστεί η καταγραφή."
 Output.RecordError.Title="Σφάλμα καταγραφής"
 Output.RecordError.Msg="Παρουσιάστηκε ένα αδιευκρίνιστο σφάλμα κατά την καταγραφή."
-Output.ReplayBuffer.NoHotkey.Title="Δεν έχουν επιλεγεί πλήκτρα συντόμευσης!"
-Output.ReplayBuffer.NoHotkey.Msg="Δεν έχει οριστεί πλήκτρο συντόμευσης για την επανάληψη προσωρινής μνήμης. Παρακαλώ ορίστε συντόμευση για «Αποθήκευση» και χρήση για την αποθήκευση επανάληψης καταγραφών."
+Output.RecordError.EncodeErrorMsg="Ένα πρόβλημα κωδικοποίησης συνέβει κατά τη καταγραφή."
 
 Output.BadPath.Title="Λάθος Διαδρομή Αρχείου"
 Output.BadPath.Text="Η προκαθορισμένη διαδρομή αρχείου δεν ειναι έγκυρη. Παρακαλώ ελέγξτε τις ρυθμίσεις σας για να επιβεβαιώσετε ότι έχει οριστεί μια έγκυρη διαδρομή αρχείου."
 
 LogReturnDialog="Ανέβασμα αρχείου καταγραφής επιτυχές"
 LogReturnDialog.CopyURL="Αντιγραφή Διεύθυνσης"
+LogReturnDialog.AnalyzeURL="Ανάλυση"
 LogReturnDialog.ErrorUploadingLog="Απέτυχε η μεταφόρτωση αρχείου καταγραφής"
 
 Remux.SourceFile="OBS Καταγραφή"
 Remux.TargetFile="Αρχείο Προορισμού"
 Remux.Remux="Μετατροπή"
+Remux.Stop="Διακοπή ανακατασκευής"
 Remux.ClearFinished="Εκκαθάριση Ολοκληρωμένων Στοιχείων"
 Remux.ClearAll="Εκκαθάριση Όλων"
 Remux.OBSRecording="Καταγραφή OBS"
 Remux.FinishedTitle="Η μετατροπή ολοκληρώθηκε"
 Remux.Finished="Η καταγραφή μετατράπηκε"
 Remux.FinishedError="Η καταγραφή μετατράπηκε, άλλα ενδέχεται το αρχείο να είναι ελλιπές"
+Remux.SelectRecording="Επιλέξτε καταγραφή OBS..."
+Remux.SelectTarget="Επιλέξτε το αρχείο προορισμού..."
 Remux.FileExistsTitle="Τα αρχεία προορισμού υπάρχουν"
 Remux.FileExists="Τα παρακάτω αρχεία προορισμού υπάρχουν ήδη. Θέλετε να τα αντικαταστήσετε;"
 Remux.ExitUnfinishedTitle="Μετατροπή σε εξέλιξη"
@@ -290,12 +330,14 @@
 
 Basic.Main.PreviewConextMenu.Enable="Ενεργοποίηση Προεπισκόπησης"
 
+Basic.Main.Preview.Disable="Απενεργοποίηση προεπισκόπησης"
 
 ScaleFiltering="Κλίμακα Φίλτρου"
 ScaleFiltering.Point="Point"
 ScaleFiltering.Bilinear="Bilinear"
 ScaleFiltering.Bicubic="Bicubic"
 ScaleFiltering.Lanczos="Lanczos"
+ScaleFiltering.Area="Περιοχή"
 
 Deinterlacing="Απόπλεξη"
 Deinterlacing.Discard="Απόρριψη"
@@ -414,17 +456,24 @@
 Basic.Main.Connecting="Σύνδεση..."
 Basic.Main.StartRecording="Έναρξη Καταγραφής"
 Basic.Main.StartReplayBuffer="Έναρξη επανάληψης προσωρινής μνήμης"
+Basic.Main.SaveReplay="Αποθήκευση επανάληψης"
 Basic.Main.StartStreaming="Έναρξη Ροής"
+Basic.Main.StartVirtualCam="Ξεκινήστε την εικονική κάμερα"
 Basic.Main.StopRecording="Διακοπή Καταγραφής"
+Basic.Main.PauseRecording="Παύση Εγγραφής"
+Basic.Main.UnpauseRecording="Επανέναρξη Εγγραφής"
 Basic.Main.StoppingRecording="Διακοπή Καταγραφής..."
 Basic.Main.StopReplayBuffer="Διακοπή Επανάληψης Προσωρινής Μνήμης"
 Basic.Main.StoppingReplayBuffer="Διακοπή Επανάληψης Προσωρινής Μνήμης..."
 Basic.Main.StopStreaming="Διακοπή Ροής"
 Basic.Main.StoppingStreaming="Διακοπή Ροής..."
 Basic.Main.ForceStopStreaming="Διακοπή Ροής(απόρριψη καθυστέρησης)"
+Basic.Main.StopVirtualCam="Σταματήστε την εικονική κάμερα"
 Basic.Main.Group="Ομάδα %1"
 Basic.Main.GroupItems="Ομάδα Επιλεγμένων Στοιχείων"
 Basic.Main.Ungroup="Κατάργηση Ομάδας"
+Basic.Main.GridMode="Πλαίσια Πλέγματος"
+Basic.Main.ListMode="Λειτουργία Λίστας"
 
 Basic.MainMenu.File="Αρχείο(&F)"
 Basic.MainMenu.File.Export="Εξαγωγή(&E)"
@@ -460,6 +509,8 @@
 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="Σειρά(&O)"
 Basic.MainMenu.Edit.Order.MoveUp="Μετακίνηση Πάνω(&U)"
 Basic.MainMenu.Edit.Order.MoveDown="Μετακίνηση Κάτω(&D)"
@@ -472,8 +523,9 @@
 Basic.MainMenu.View.Docks="Μπάρες εφαρμογών"
 Basic.MainMenu.View.Docks.ResetUI="Επαναφορά περιβάλλοντος χρήστη"
 Basic.MainMenu.View.Docks.LockUI="Κλείδωμα περιβάλλοντος χρήστη"
-Basic.MainMenu.View.Toolbars.Listboxes="Κουτιά Λίστας (&L)"
+Basic.MainMenu.View.Docks.CustomBrowserDocks="Προσαρμοσμένες αποβάθρες προγράμματος περιήγησης..."
 Basic.MainMenu.View.SceneTransitions="Μεταβάσεις Σκηνών(&C)"
+Basic.MainMenu.View.SourceIcons="Πηγές Εικονίδια"
 Basic.MainMenu.View.StatusBar="Γραμμή κατάστασης(&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Διεπαφή Πλήρους Οθόνης"
 
@@ -514,6 +566,7 @@
 Basic.Settings.General.OpenStatsOnStartup="Άνοιγμα παραθύρου στατιστικών κατά την εκκίνηση"
 Basic.Settings.General.WarnBeforeStartingStream="Εμφάνιση παραθύρου επιβεβαίωσης κατά την εκκίνηση των ροών"
 Basic.Settings.General.WarnBeforeStoppingStream="Εμφάνιση παραθύρου επιβεβαίωσης κατά τον τερματισμό των ροών"
+Basic.Settings.General.WarnBeforeStoppingRecord="Εμφάνιση παραθύρου επιβεβαίωσης κατά τον τερματισμό της καταγραφής"
 Basic.Settings.General.Projectors="Προβολείς"
 Basic.Settings.General.HideProjectorCursor="Απόκρυψη τού δρομέα πάνω από τούς προβολείς"
 Basic.Settings.General.ProjectorAlwaysOnTop="Προβολείς πάντα στην επιφάνεια"
@@ -530,8 +583,15 @@
 Basic.Settings.General.SysTrayWhenStarted="Ελαχιστοποίηση στη Γραμμή Εργαλείων κατά την εκκίνηση"
 Basic.Settings.General.SystemTrayHideMinimize="Συνεχής ελαχιστοποίηση στη γραμμή εργαλείων αντί για τη γραμμή εργασιών"
 Basic.Settings.General.SaveProjectors="Αποθήκευση προβολής στην έξοδο"
+Basic.Settings.General.Preview="Προεπισκόπηση"
+Basic.Settings.General.OverflowHidden="Απόκρυψη υπερχείλισης"
+Basic.Settings.General.OverflowAlwaysVisible="Η υπερχείλιση είναι πάντα ορατή"
+Basic.Settings.General.OverflowSelectionHidden="Εμφάνιση υπερχείλισης ακόμα και όταν η πηγή είναι είναι αόρατη"
+Basic.Settings.General.Importers="Εισαγώμενα"
+Basic.Settings.General.AutomaticCollectionSearch="Ψάξτε γνωστές τοποθεσίες για τις συλλογές σκηνής όταν είναι απαραίτητο"
 Basic.Settings.General.SwitchOnDoubleClick="Μετάβαση στην σκηνή με διπλό κλικ"
 Basic.Settings.General.StudioPortraitLayout="Ενεργοποίηση πορτρέτου/κατακόρυφης διάταξης"
+Basic.Settings.General.TogglePreviewProgramLabels="Προβολή επισκόποιηση/προγράμματος επιγραφής"
 Basic.Settings.General.Multiview="Multiview"
 Basic.Settings.General.Multiview.MouseSwitch="Κάντε κλικ για εναλλαγή μεταξύ σκηνών"
 Basic.Settings.General.Multiview.DrawSourceNames="Εμφάνιση ονομάτων σκηνών"
@@ -545,6 +605,18 @@
 
 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.BandwidthTestMode="Ενεργοποίηση λειτουργίας δοκιμής εύρους ζώνης"
+Basic.Settings.Stream.TTVAddon="Συνομιλία Twitch πρόσθετα"
+Basic.Settings.Stream.TTVAddon.None="Κανένα"
+Basic.Settings.Stream.TTVAddon.Both="BetterTTV και FrankerFaceZ"
+Basic.Settings.Stream.MissingSettingAlert="Ελείπει η ρύθμιση ροής"
+Basic.Settings.Stream.StreamSettingsWarning="Άνοιγμα Ρυθμίσεων"
+Basic.Settings.Stream.MissingUrlAndApiKey="Λείπει ο σύνδεσμος και το κλειδί ροής. Ανοίξτε τις ρυθμίσεις και βάλτε τον σύνδεσμο και το κλειδί ροής στη καρτέλα 'ροής'."
+Basic.Settings.Stream.MissingUrl="Λείπει ο σύνδεσμος ροής. Ανοίξτε τις ρυθμίσεις και βάλτε τον σύνδεσμο στη καρτέλα 'ροής'."
+Basic.Settings.Stream.MissingStreamKey="Λείπει το κλειδί ροής. Ανοίξτε τις ρυθμίσεις και βάλτε το κλειδί ροής στη καρτέλα 'ροής'."
 
 Basic.Settings.Output="Έξοδος"
 Basic.Settings.Output.Format="Μορφή Καταγραφής"
@@ -552,6 +624,8 @@
 Basic.Settings.Output.SelectDirectory="Επιλέξτε Φάκελο Καταγραφής"
 Basic.Settings.Output.SelectFile="Επιλέξτε Αρχείο Καταγραφής"
 Basic.Settings.Output.EnforceBitrate="Επιβολή υπηρεσίας ροής στα όρια ρυθμού μετάδοσης bits"
+Basic.Settings.Output.DynamicBitrate="Δυναμική αλλαγή ρυθμός μετάδοσης bit για τη διαχείρηση της συμφόρησης"
+Basic.Settings.Output.DynamicBitrate.Beta="Δυναμική αλλαγή ρυθμός μετάδοσης bit για τη διαχείρηση της συμφόρησης(Δοκιμαστική Έκδοση)"
 Basic.Settings.Output.Mode="Λειτουργία Εξόδου"
 Basic.Settings.Output.Mode.Simple="Απλό"
 Basic.Settings.Output.Mode.Adv="Για Προχωρημένους"
@@ -560,7 +634,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Μέγιστη Μνήμη (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Εκτιμώμενη χρήση μνήμης: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Δεν είναι δυνατή η εκτίμηση της χρήσης μνήμης. Ορίστε μέγιστο όριο μνήμης."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Σημείωση: Βεβαιωθείτε ότι ορίσατε μία συντόμευση για την επανάληψη προσωρινής μνήμης στην ενότητα πλήκτρων συντόμευσης)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Πρόθεμα ονόματος αρχείου Επανάληψης Προσωρινής Μνήμης"
 Basic.Settings.Output.ReplayBuffer.Suffix="Επίθεμα"
 Basic.Settings.Output.Simple.SavePath="Διαδρομή Καταγραφής"
@@ -629,7 +702,14 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Διάστημα καρέ-κλειδιού (σε καρέ)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Προβολή όλων των codecs (ακόμα και αν δεν είναι συμβατοί)"
 
+Screenshot.StudioProgram="Στιγμιότυπο οθόνης(Program)"
+Screenshot.Preview="Στιγμιότυπο οθόνης(Preview)"
+Screenshot.Scene="Στιγμιότυπο οθόνης(Scene)"
+Screenshot.Source="Στιγμιότυπο οθόνης(Source)"
+
+FilenameFormatting.completer="%CΕΕΕ-%ΜΜ-%ΗΗ %ωω-%λλ%sδ\n%ΕΕ-%ΜΜ-%ΗΗ %ωω-%λλ%sδ%Y-%m-%d%H-%M-%S\n%y-%m-%d%H-%M-%S\n%a%Y-%m-%d%H-%M-%S\n%A%Y-%m-%d%H-%M-%S%H-%M-%S\n%Y%b%d%H-%M-%S"
 
+FilenameFormatting.TT="%CCYY Έτος, τέσσερα ψηφία\n%YY Έτος, τα δύο τελευταία ψηφία (00-99) \n%MM Μήνας ως ένας δεκαδικός αριθμός (01-12) \n%DD Ημέρα του μήνα, μηδέν αποκοπή (01-31)\n%hh Ώρα σε 24ωρη μορφή (00-23) \n%mm Λεπτό (00-59) \n%ss Δευτερόλεπτο (00-61) \n%%		Ένα % σύμβολο\n%a Συντετμημένη ημέρα εβδομάδας\n%A		Πλήρης ημέρα της εβδομάδας \n%b		Συντετμημένο όνομα μήνα\n%B		Πλήρες όνομα μήνα \n%d		Ημέρα του μήνα, μηδέν-αποκοπή (01-31)\n%H		Ώρα σε 24ωρη μορφή (00-23) \n%I		Ώρα σε μορφή 12ωρη (01-12)\n%m Μήνας ως δεκαδικός αριθμός (01-12)\n%M Λεπτό (00-59)\n%p		π. μ. ή μ. μ. προσδιορισμός\n%S		Δευτερόλεπτο (00-61) \n%y		Έτος, τελευταία δύο ψηφία (00-99)\n%Y Έτος\n%z		ISO 8601 μετατόπιση από UTC ή ζώνη ώρας\n όνομα ή συντόμευση\n%Z		Όνομα ζώνης ώρας ή συντόμευση\n"
 
 Basic.Settings.Video="Βίντεο"
 Basic.Settings.Video.Adapter="Προσαρμογέας Βίντεο"
@@ -651,10 +731,12 @@
 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="Ρυθμός Δειγματοληψίας"
 Basic.Settings.Audio.Channels="Κανάλια"
+Basic.Settings.Audio.Meters="Μέτρα"
 Basic.Settings.Audio.MeterDecayRate.Fast="Γρήγορος"
 Basic.Settings.Audio.MeterDecayRate.Medium="Μεσαίος (τύπος Ι PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Αργός (Τύπος ΙΙ PPM)"
@@ -665,11 +747,19 @@
 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.Title="Ενεργοποίηση ήχου surround;"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Είστε βέβαιοι ότι θέλετε να ενεργοποιήσετε τον ήχο surround;"
+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="Push-to-talk καθυστέρηση"
 Basic.Settings.Audio.UnknownAudioDevice="[Η συσκευή δεν είναι συνδεδεμένη ή δεν είναι διαθέσιμη]"
+Basic.Settings.Audio.Disabled="Απενεργοποίηση"
 
 Basic.Settings.Advanced="Για Προχωρημένους"
 Basic.Settings.Advanced.General.ProcessPriority="Προτεραιότητα Διαδικασίας"
@@ -681,22 +771,35 @@
 Basic.Settings.Advanced.FormatWarning="Προειδοποίηση: Μορφές χρώματος εκτός του NV12 προορίζονται κυρίως για καταγραφή, και δεν συνιστώνται κατά τη ροή. Ενδέχεται να υπάρξει αυξημένη χρήση της CPU λόγω μετατροπής μορφής χρώματος."
 Basic.Settings.Advanced.Audio.BufferingTime="Χρόνος Προσωρινής Μνήμης Ήχου"
 Basic.Settings.Advanced.Video.ColorFormat="Μορφή Χρώματος"
+Basic.Settings.Advanced.Video.ColorSpace="Πηγή χρώματος"
+Basic.Settings.Advanced.Video.ColorRange="Εύρος Χρωμάτων Yuv"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Μερικό"
 Basic.Settings.Advanced.Video.ColorRange.Full="Πλήρες"
+Basic.Settings.Advanced.Audio.MonitoringDevice="Συσκευή Παρακολούθησης Ήχου"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Προεπιλεγμένη"
 Basic.Settings.Advanced.Audio.DisableAudioDucking="Απενεργοποίηση Σίγασης Ήχου Windows"
 Basic.Settings.Advanced.StreamDelay="Καθυστέρηση Ροής"
+Basic.Settings.Advanced.StreamDelay.Duration="Διάρκεια"
 Basic.Settings.Advanced.StreamDelay.Preserve="Διατήρηση σημείου αποκοπής (αύξηση καθυστέρησης) κατά την επανασύνδεση"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Εκτιμώμενη Χρήση Μνήμης: %1 MB"
 Basic.Settings.Advanced.Network="Δίκτυο"
 Basic.Settings.Advanced.Network.BindToIP="Σύνδεση με IP"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Ενεργοποίηση βελτιστοποίησεις δικτύου"
+Basic.Settings.Advanced.Network.EnableLowLatencyMode="Ενεργοποίηση TCP περιθωρίου"
+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"
 Basic.Settings.Advanced.AutoRemux.MP4="(καταγραφή ως mkv)"
 
 Basic.AdvAudio="Ιδιότητες Ήχου για Προχωρημένους"
+Basic.AdvAudio.ActiveOnly="Μόνο ενεργές πηγές"
 Basic.AdvAudio.Name="Όνομα"
+Basic.AdvAudio.Volume="Ένταση"
+Basic.AdvAudio.Mono="Μονοφωνικό"
 Basic.AdvAudio.Balance="Εξισορρόπηση"
+Basic.AdvAudio.SyncOffset="Μετατόπιση Συγχρονισμού"
 Basic.AdvAudio.Monitoring="Ηχητική Παρακολούθηση"
 Basic.AdvAudio.Monitoring.None="Τερματισμός Παρακολούθησης"
 Basic.AdvAudio.Monitoring.MonitorOnly="Παρακολούθηση Μόνο (σίγαση εξόδου)"
@@ -749,6 +852,7 @@
 Hotkeys.AppleKeypadDecimal=". (Keypad)"
 Hotkeys.AppleKeypadEqual="= (Keypad)"
 Hotkeys.MouseButton="Mouse %1"
+Hotkeys.Escape="Esc"
 
 Mute="Σίγαση"
 Unmute="Κατάργηση σίγασης"
@@ -759,6 +863,8 @@
 SceneItemHide="Απόκρυψη '%1'"
 
 OutputWarnings.NoTracksSelected="Πρέπει να επιλέξετε τουλάχιστον ένα κομμάτι"
+OutputWarnings.MP4Recording="Προειδοποίηση: Οι καταγραφές που έχουν αποθηκευτεί σε MP4 δε θα μπορούν να ανακτηθούν αν το αρχείο δεν είναι δυνατόν να ολοκληρωθεί (π.χ. λόγω BSODs, απώλεια ισχύος, κλπ.). Αν θέλετε να καταγράψετε πολλαπλά κομμάτια ήχου χρησιμοποιήστε το MKV και μετατροπή καταγραφής για mp4, αφού ολοκληρωθεί (αρχείο-> Μετατροπή Καταγραφών)"
+OutputWarnings.CannotPause="Προειδοποίηση: Οι καταγραφές δεν μπορούν να γίνουν παύση άμα ο κωδικοποιητής εγγραφής έχει οριστεί \"(Χρησιμοποιήστε κωδικοποιητή ροής)\""
 
 FinalScene.Title="Διαγραφή σκηνής"
 FinalScene.Text="Πρέπει να υπάρχει τουλάχιστον μία σκηνή."
@@ -766,6 +872,7 @@
 NoSources.Title="Δεν Υπάρχουν Πηγές"
 NoSources.Text="Δεν έχετε προσθέσει καμία πηγή βίντεο, επομένως θα εξαχθεί μία κενή οθόνη. Σίγουρα επιθυμείτε να συνεχίσετε;"
 NoSources.Text.AddSource="Μπορείτε να προσθέσετε πηγές οποιαδήποτε στιγμή κάνοντας κλικ στο εικονίδιο + κάτω από το πλαίσιο Πηγές στο κύριο παράθυρο."
+NoSources.Label="Δεν έχετε καμία πηγή\nΠατήστε το + ακόλουθο κουμπί,\nή πατήστε το δεξί κλίκ για να προσθέσετε ένα."
 
 ChangeBG="Ορίστε Χρώμα"
 CustomColor="Προσαρμοσμένο Χρώμα"
@@ -774,16 +881,33 @@
 
 About="Σχετικά"
 About.Info="Το OBS Studio είναι ένα ελεύθερο και ανοικτού κώδικα λογισμικό καταγραφής βίντεο και ζωντανής μετάδοσης."
+About.Donate="Κάντε μια Συνεισφορά"
 About.GetInvolved="Συμμετάσχετε"
 About.Authors="Δημιουργοί"
 About.License="Άδεια"
+About.Contribute="Υποστηρίξτε το εργο του OBS"
 
+AddUrl.Title="Εισάγεται Πηγή μέσω Συνδέσμου"
+AddUrl.Text="Έχετε τραβήξει ένα σύνδεσμο στο OBS. Αυτό αυτόματα θα προσπέσει τον σύνδεσμο ως πηγή. Θέλετε να συνεχίσετε;"
+AddUrl.Text.Url="Σύνδεσμος%1"
 
 ResizeOutputSizeOfSource="Αλλαγή διαστάσεων εξόδου (διαστάσεις πηγής)"
 ResizeOutputSizeOfSource.Text="Η βασική ανάλυση και η ανάλυση εξόδου θα μεταβληθούν σύμφωνα με τις διαστάσεις της τρέχουσας πηγής."
 ResizeOutputSizeOfSource.Continue="Θέλετε να συνεχίσετε;"
 
+PreviewTransition="Προεπισκόπηση Μετάβασης"
+
+Importer="Εισαγωγέας Συλλογής Σκηνής"
+Importer.SelectCollection="Επιλέξτε μία Συλλογή Σκηνών"
+Importer.Collection="Συλλογή Σκηνών"
+Importer.HelpText="Προσπέστε αρχία σε αυτό το παράθυρο για να εισαχθεί η συλλογή από το OBS ή σε άλλα προγράμματα που υποστηρίζονται."
+Importer.Path="Τοποθεσία Συλλογής"
+Importer.Program="Εντοπισμένη εφαρμογή"
+Importer.AutomaticCollectionPrompt="Αυτόματη Αναζήτηση για Συλλογές Σκηνών"
+
 
+Restart="Επανεκκίνηση"
+NeedsRestart="Το OBS Studio χρειάζεται να γίνει επανεκκίνηση. Θέλετε να το κάνετε επανεκκίνηση τώρα;"

obs-studio-26.0.0.tar.xz/UI/data/locale/en-GB.ini Added

@@ -0,0 +1,356 @@
+
+Language="English (UK)"
+
+OK="OK"
+Apply="Apply"
+Cancel="Cancel"
+Close="Close"
+Save="Save"
+Discard="Discard"
+Disable="Disable"
+Yes="Yes"
+No="No"
+Add="Add"
+Remove="Remove"
+Rename="Rename"
+Interact="Interact"
+Filters="Filters"
+Properties="Properties"
+MoveUp="Move Up"
+MoveDown="Move Down"
+Settings="Settings"
+Display="Display"
+Name="Name"
+Exit="Exit"
+Mixer="Audio Mixer"
+Browse="Browse"
+Mono="Mono"
+Stereo="Stereo"
+DroppedFrames="Dropped Frames %1 (%2%)"
+StudioProgramProjector="Fullscreen Projector (Program)"
+PreviewProjector="Fullscreen Projector (Preview)"
+SceneProjector="Fullscreen Projector (Scene)"
+SourceProjector="Fullscreen Projector (Source)"
+StudioProgramWindow="Windowed Projector (Program)"
+PreviewWindow="Windowed Projector (Preview)"
+SceneWindow="Windowed Projector (Scene)"
+SourceWindow="Windowed Projector (Source)"
+MultiviewProjector="Multiview (Fullscreen)"
+MultiviewWindowed="Multiview (Windowed)"
+ResizeProjectorWindowToContent="Fit window to content"
+Clear="Clear"
+Revert="Revert"
+Show="Show"
+Hide="Hide"
+UnhideAll="Unhide All"
+Untitled="Untitled"
+New="New"
+Duplicate="Duplicate"
+Enable="Enable"
+DisableOSXVSync="Disable macOS V-Sync"
+ResetOSXVSyncOnExit="Reset macOS V-Sync on Exit"
+HighResourceUsage="Encoding overloaded! Consider turning down video settings or using a faster encoding preset."
+Transition="Transition"
+QuickTransitions="Quick Transitions"
+FadeToBlack="Fade to Black"
+Left="Left"
+Right="Right"
+Top="Top"
+Bottom="Bottom"
+Reset="Reset"
+Hours="Hours"
+Minutes="Minutes"
+Seconds="Seconds"
+Deprecated="Deprecated"
+ReplayBuffer="Replay Buffer"
+Import="Import"
+Export="Export"
+Copy="Copy"
+Paste="Paste"
+PasteReference="Paste (Reference)"
+PasteDuplicate="Paste (Duplicate)"
+RemuxRecordings="Remux Recordings"
+Next="Next"
+Back="Back"
+Defaults="Defaults"
+HideMixer="Hide in Mixer"
+TransitionOverride="Transition Override"
+None="None"
+StudioMode.Preview="Preview"
+StudioMode.Program="Program"
+ShowInMultiview="Show in Multiview"
+VerticalLayout="Vertical Layout"
+Group="Group"
+DoNotShowAgain="Do not show again"
+Default="(Default)"
+Calculating="Calculating..."
+Fullscreen="Fullscreen"
+Windowed="Windowed"
+Percent="Percent"
+RefreshBrowser="Refresh"
+AspectRatio="Aspect Ratio <b>%1:%2</b>"
+LockVolume="Lock Volume"
+LogViewer="Log Viewer"
+ShowOnStartup="Show on startup"
+OpenFile="Open file"
+
+AlreadyRunning.Title="OBS is already running"
+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."
+AlreadyRunning.LaunchAnyway="Launch Anyway"
+
+ChromeOS.Title="Unsupported Platform"
+ChromeOS.Text="OBS appears to be running inside a ChromeOS container. This platform is unsupported"
+
+DockCloseWarning.Title="Closing Dockable Window"
+DockCloseWarning.Text="You just closed a dockable window. If you'd like to show it again, use the View → Docks menu on the menu bar."
+
+ExtraBrowsers="Custom Browser Docks"
+ExtraBrowsers.Info="Add docks by giving them a name and URL, then click Apply or Close to open the docks. You can add or remove docks at any time."
+ExtraBrowsers.DockName="Dock Name"
+
+Auth.Authing.Title="Authenticating..."
+Auth.Authing.Text="Authenticating with %1, please wait..."
+Auth.AuthFailure.Title="Authentication Failure"
+Auth.AuthFailure.Text="Failed to authenticate with %1:\n\n%2: %3"
+Auth.InvalidScope.Title="Authentication Required"
+Auth.InvalidScope.Text="The authentication requirements for %1 have changed. Some features may not be available."
+Auth.LoadingChannel.Title="Loading channel information..."
+Auth.LoadingChannel.Text="Loading channel information for %1, please wait..."
+Auth.ChannelFailure.Title="Failed to load channel"
+Auth.ChannelFailure.Text="Failed to load channel information for %1\n\n%2: %3"
+Auth.Chat="Chat"
+Auth.StreamInfo="Stream Information"
+TwitchAuth.Stats="Twitch Stats"
+TwitchAuth.Feed="Twitch Activity Feed"
+TwitchAuth.TwoFactorFail.Title="Could not query stream key"
+TwitchAuth.TwoFactorFail.Text="OBS was unable to connect to your Twitch account. Please make sure two-factor authentication is set up in your <a href='https://www.twitch.tv/settings/security'>Twitch security settings</a> as this is required to stream."
+RestreamAuth.Channels="Restream Channels"
+
+Copy.Filters="Copy Filters"
+Paste.Filters="Paste Filters"
+
+BrowserPanelInit.Title="Initialising Browser..."
+BrowserPanelInit.Text="Initialising browser, please wait..."
+
+BandwidthTest.Region="Region"
+BandwidthTest.Region.US="United States"
+BandwidthTest.Region.EU="Europe"
+BandwidthTest.Region.Asia="Asia"
+BandwidthTest.Region.Other="Other"
+
+Basic.AutoConfig="Auto-Configuration Wizard"
+Basic.AutoConfig.ApplySettings="Apply Settings"
+Basic.AutoConfig.StartPage="Usage Information"
+Basic.AutoConfig.StartPage.SubTitle="Specify what you want to use the program for"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimise for streaming, recording is secondary"
+Basic.AutoConfig.StartPage.PrioritizeRecording="Optimise just for recording, I will not be streaming"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="I will only be using the virtual camera"
+Basic.AutoConfig.VideoPage="Video Settings"
+Basic.AutoConfig.VideoPage.SubTitle="Specify the video settings you would like to use"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Use Current (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Display %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Use Current (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Either 60 or 30, but prefer 60 when possible"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Either 60 or 30, but prefer high resolution"
+Basic.AutoConfig.VideoPage.CanvasExplanation="Note: The canvas (base) resolution is not necessarily the same as the resolution you will stream or record with. Your actual stream/recording resolution may be scaled down from the canvas resolution to reduce resource usage or bitrate requirements."
+Basic.AutoConfig.StreamPage="Stream Information"
+Basic.AutoConfig.StreamPage.SubTitle="Please enter your stream information"
+Basic.AutoConfig.StreamPage.ConnectAccount="Connect Account (recommended)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Disconnect Account"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Disconnect Account?"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="This change will apply immediately. Are you sure you want to disconnect your account?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Get Stream Key"
+Basic.AutoConfig.StreamPage.UseStreamKey="Use Stream Key"
+Basic.AutoConfig.StreamPage.Service="Service"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Show All..."
+Basic.AutoConfig.StreamPage.Service.Custom="Custom..."
+Basic.AutoConfig.StreamPage.Server="Server"
+Basic.AutoConfig.StreamPage.StreamKey="Stream Key"
+Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimate bitrate with bandwidth test (may take a few minutes)"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Prefer hardware encoding"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardware Encoding eliminates most CPU usage, but may require more bitrate to obtain the same level of quality."
+Basic.AutoConfig.StreamPage.StreamWarning.Title="Stream warning"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="The bandwidth test is about to stream randomised video data without audio to your channel. If you're able, it's recommended to temporarily turn off saving videos of streams and set the stream to private until after the test has completed. Continue?"
+Basic.AutoConfig.TestPage="Final Results"
+Basic.AutoConfig.TestPage.SubTitle.Testing="The program is now executing a set of tests to estimate the most ideal settings"
+Basic.AutoConfig.TestPage.SubTitle.Complete="Testing complete"
+Basic.AutoConfig.TestPage.TestingBandwidth="Performing bandwidth test, this may take a few minutes..."
+Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Connecting to: %1..."
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Failed to connect to any servers, please check your Internet connection and try again."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Testing bandwidth for: %1"
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Testing stream encoder, this may take a minute..."
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="Testing recording encoder, this may take a minute..."
+Basic.AutoConfig.TestPage.TestingRes="Testing resolutions, this may take a few minutes..."
+Basic.AutoConfig.TestPage.TestingRes.Fail="Failed to start up encoder"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="Testing %1x%2 %3 FPS..."
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streaming Encoder"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="Recording Encoder"
+Basic.AutoConfig.TestPage.Result.Header="The program has determined that these estimated settings are the most ideal for you:"
+Basic.AutoConfig.TestPage.Result.Footer="To use these settings, click Apply Settings. To reconfigure the wizard and try again, click Back. To manually configure settings yourself, click Cancel and open Settings."
+Basic.AutoConfig.Info="The auto-configuration wizard will determine the best settings based on your computer specs and Internet speed."
+Basic.AutoConfig.RunAnytime="This can be run at any time by going to the Tools menu."
+
+Basic.Stats="Stats"
+Basic.Stats.CPUUsage="CPU Usage"
+Basic.Stats.HDDSpaceAvailable="Disk space available"
+Basic.Stats.MemoryUsage="Memory Usage"
+Basic.Stats.AverageTimeToRender="Average time to render frame"
+Basic.Stats.SkippedFrames="Skipped frames due to encoding lag"
+Basic.Stats.MissedFrames="Frames missed due to rendering lag"
+Basic.Stats.Output.Stream="Stream"
+Basic.Stats.Output.Recording="Recording"
+Basic.Stats.Status="Status"
+Basic.Stats.Status.Recording="Recording"
+Basic.Stats.Status.Live="LIVE"
+Basic.Stats.Status.Reconnecting="Reconnecting"
+Basic.Stats.Status.Inactive="Inactive"
+Basic.Stats.Status.Active="Active"
+Basic.Stats.DroppedFrames="Dropped Frames (Network)"
+Basic.Stats.MegabytesSent="Total Data Output"
+Basic.Stats.Bitrate="Bitrate"
+Basic.Stats.DiskFullIn="Disk full in (approx.)"
+Basic.Stats.ResetStats="Reset Stats"
+
+ResetUIWarning.Title="Are you sure you want to reset the UI?"
+ResetUIWarning.Text="Resetting the UI will hide additional docks. You will need to unhide these docks from the view menu if you want them to be visible.\n\nAre you sure you want to reset the UI?"
+
+Updater.Title="New update available"
+Updater.Text="There is a new update available:"
+Updater.UpdateNow="Update Now"
+Updater.RemindMeLater="Remind me Later"
+Updater.Skip="Skip Version"
+Updater.Running.Title="Program currently active"
+Updater.Running.Text="Outputs are currently active, please shut down any active outputs before attempting to update"
+Updater.NoUpdatesAvailable.Title="No updates available"
+Updater.NoUpdatesAvailable.Text="No updates are currently available"
+Updater.FailedToLaunch="Failed to launch updater"
+Updater.GameCaptureActive.Title="Game capture active"
+Updater.GameCaptureActive.Text="Game capture hook library is currently in use. Please close any games/programs being captured (or restart Windows) and try again."
+
+QuickTransitions.SwapScenes="Swap Preview/Output Scenes After Transitioning"
+QuickTransitions.SwapScenesTT="Swaps the preview and output scenes after transitioning (if the output's original scene still exists).\nThis will not undo any changes that may have been made to the output's original scene."
+QuickTransitions.DuplicateScene="Duplicate Scene"
+QuickTransitions.DuplicateSceneTT="When editing the same scene, allows editing transform/visibility of sources without modifying the output.\nTo edit properties of sources without modifying the output, enable 'Duplicate Sources'.\nChanging this value will reset the current output scene (if it still exists)."
+QuickTransitions.EditProperties="Duplicate Sources"
+QuickTransitions.EditPropertiesTT="When editing the same scene, allows editing properties of sources without modifying the output.\nThis can only be used if 'Duplicate Scene' is enabled.\nCertain sources (such as capture or media sources) do not support this and cannot be edited separately.\nChanging this value will reset the current output scene (if it still exists).\n\nWarning: Because sources will be duplicated, this may require extra system or video resources."
+QuickTransitions.HotkeyName="Quick Transition: %1"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+LogReturnDialog="Log Upload Successful"
+LogReturnDialog.Description="Your log file has been uploaded. You can now share the URL for debugging or support purposes."
+LogReturnDialog.Description.Crash="Your crash report has been uploaded. You can now share the URL for debugging purposes."
+LogReturnDialog.CopyURL="Copy URL"
+LogReturnDialog.AnalyzeURL="Analyse"
+LogReturnDialog.ErrorUploadingLog="Error uploading log file"
+
+Remux.SourceFile="OBS Recording"
+Remux.TargetFile="Target File"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Basic.PropertiesWindow.SelectColor="Select colour"
+
+
+
+
+
+
+Basic.TransformWindow.Alignment.TopCenter="Top Centre"
+Basic.TransformWindow.Alignment.CenterLeft="Centre Left"
+Basic.TransformWindow.Alignment.Center="Centre"
+Basic.TransformWindow.Alignment.CenterRight="Centre Right"
+Basic.TransformWindow.Alignment.BottomCenter="Bottom Centre"
+
+
+
+
+
+Basic.MainMenu.Edit.Transform.CenterToScreen="&Centre to screen"
+Basic.MainMenu.Edit.Transform.VerticalCenter="Centre Vertically"
+Basic.MainMenu.Edit.Transform.HorizontalCenter="Centre Horizontally"
+
+
+
+
+
+
+Basic.Settings.General.CenterSnapping="Snap Sources to horizontal and vertical centre"
+Basic.Settings.General.SysTrayWhenStarted="Minimise to system tray when started"
+Basic.Settings.General.SystemTrayHideMinimize="Always minimise to system tray instead of task bar"
+
+
+
+
+
+
+FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
+
+
+
+
+Basic.Settings.Advanced.FormatWarning="Warning: Colour formats other than NV12 are primarily intended for recording, and are not recommended when streaming. Streaming may incur increased CPU usage due to colour format conversion."
+Basic.Settings.Advanced.Video.ColorFormat="Colour Format"
+Basic.Settings.Advanced.Video.ColorSpace="Colour Space"
+Basic.Settings.Advanced.Video.ColorRange="Colour Range"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Enable network optimisations"
+
+
+
+
+
+
+
+
+
+OutputWarnings.MP4Recording="Warning: Recordings saved to MP4/MOV will be unrecoverable if the file cannot be finalised (e.g. as a result of BSODs, power losses, etc.). If you want to record multiple audio tracks consider using MKV and remux the recording to MP4/MOV after it is finished (File → Remux Recordings)"
+
+
+
+ChangeBG="Set Colour"
+CustomColor="Custom Colour"
+
+
+About.License="Licence"
+
+
+
+
+
+
+
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/en-US.ini Changed

@@ -2,9 +2,8 @@
 # Pull requests for translations outside of Crowdin will not be accepted.
 # Read this forum post for more instructions on submitting translations: https://obsproject.com/forum/threads/how-to-contribute-translations-for-obs.16327/
 
-# Language and language region of this file
+# Language of this file
 Language="English"
-Region="United States"
 
 # commonly shared locale
 OK="OK"
@@ -43,6 +42,7 @@
 SourceWindow="Windowed Projector (Source)"
 MultiviewProjector="Multiview (Fullscreen)"
 MultiviewWindowed="Multiview (Windowed)"
+ResizeProjectorWindowToContent="Fit window to content"
 Clear="Clear"
 Revert="Revert"
 Show="Show"
@@ -92,14 +92,22 @@
 Fullscreen="Fullscreen"
 Windowed="Windowed"
 Percent="Percent"
+RefreshBrowser="Refresh"
 AspectRatio="Aspect Ratio <b>%1:%2</b>"
 LockVolume="Lock Volume"
+LogViewer="Log Viewer"
+ShowOnStartup="Show on startup"
+OpenFile="Open file"
+AddValue="Add %1"
 
 # warning if program already open
 AlreadyRunning.Title="OBS is already running"
 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"
 
+ChromeOS.Title="Unsupported Platform"
+ChromeOS.Text="OBS appears to be running inside a ChromeOS container. This platform is unsupported"
+
 # warning when closing docks. it's frustrating that we actually need this.
 DockCloseWarning.Title="Closing Dockable Window"
 DockCloseWarning.Text="You just closed a dockable window. If you'd like to show it again, use the View → Docks menu on the menu bar."
@@ -143,10 +151,6 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Other"
 
-# first time startup
-Basic.FirstStartup.RunWizard="Would you like to run the auto-configuration wizard? You can also manually configure your settings by clicking the Settings button in the main window."
-Basic.FirstStartup.RunWizard.NoClicked="If you change your mind, you can run the auto-configuration wizard any time again from the Tools menu."
-
 # auto config wizard
 Basic.AutoConfig="Auto-Configuration Wizard"
 Basic.AutoConfig.ApplySettings="Apply Settings"
@@ -154,8 +158,9 @@
 Basic.AutoConfig.StartPage.SubTitle="Specify what you want to use the program for"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimize for streaming, recording is secondary"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimize just for recording, I will not be streaming"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="I will only be using the virtual camera"
 Basic.AutoConfig.VideoPage="Video Settings"
-Basic.AutoConfig.VideoPage.SubTitle="Specify the desired video settings you would like to use"
+Basic.AutoConfig.VideoPage.SubTitle="Specify the video settings you would like to use"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Use Current (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Display %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Use Current (%1)"
@@ -197,6 +202,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Recording Encoder"
 Basic.AutoConfig.TestPage.Result.Header="The program has determined that these estimated settings are the most ideal for you:"
 Basic.AutoConfig.TestPage.Result.Footer="To use these settings, click Apply Settings. To reconfigure the wizard and try again, click Back. To manually configure settings yourself, click Cancel and open Settings."
+Basic.AutoConfig.Info="The auto-configuration wizard will determine the best settings based on your computer specs and internet speed."
+Basic.AutoConfig.RunAnytime="This can be run at any time by going to the Tools menu."
 
 # stats
 Basic.Stats="Stats"
@@ -331,7 +338,10 @@
 
 # log upload dialog text and messages
 LogReturnDialog="Log Upload Successful"
+LogReturnDialog.Description="Your log file has been uploaded. You can now share the URL for debugging or support purposes."
+LogReturnDialog.Description.Crash="Your crash report has been uploaded. You can now share the URL for debugging purposes."
 LogReturnDialog.CopyURL="Copy URL"
+LogReturnDialog.AnalyzeURL="Analyze"
 LogReturnDialog.ErrorUploadingLog="Error uploading log file"
 
 # remux dialog
@@ -521,6 +531,7 @@
 Basic.Main.StartReplayBuffer="Start Replay Buffer"
 Basic.Main.SaveReplay="Save Replay"
 Basic.Main.StartStreaming="Start Streaming"
+Basic.Main.StartVirtualCam="Start Virtual Camera"
 Basic.Main.StopRecording="Stop Recording"
 Basic.Main.PauseRecording="Pause Recording"
 Basic.Main.UnpauseRecording="Unpause Recording"
@@ -530,6 +541,9 @@
 Basic.Main.StopStreaming="Stop Streaming"
 Basic.Main.StoppingStreaming="Stopping Stream..."
 Basic.Main.ForceStopStreaming="Stop Streaming (discard delay)"
+Basic.Main.ShowContextBar="Show Source Toolbar"
+Basic.Main.HideContextBar="Hide Source Toolbar"
+Basic.Main.StopVirtualCam="Stop Virtual Camera"
 Basic.Main.Group="Group %1"
 Basic.Main.GroupItems="Group Selected Items"
 Basic.Main.Ungroup="Ungroup"
@@ -588,7 +602,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Reset UI"
 Basic.MainMenu.View.Docks.LockUI="Lock UI"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Custom Browser Docks..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Listboxes"
+Basic.MainMenu.View.ListboxToolbars="Scene/Source List Buttons"
+Basic.MainMenu.View.ContextBar="Source Toolbar"
 Basic.MainMenu.View.SceneTransitions="S&cene Transitions"
 Basic.MainMenu.View.SourceIcons="Source &Icons"
 Basic.MainMenu.View.StatusBar="&Status Bar"
@@ -685,9 +700,6 @@
 Basic.Settings.Stream.TTVAddon.BTTV="BetterTTV"
 Basic.Settings.Stream.TTVAddon.FFZ="FrankerFaceZ"
 Basic.Settings.Stream.TTVAddon.Both="BetterTTV and FrankerFaceZ"
-Basic.Settings.Stream.MixerAddon="Mixer Chat Add-Ons"
-Basic.Settings.Stream.MixerAddon.None="None"
-Basic.Settings.Stream.MixerAddon.MEE="MixrElixr Emotes"
 Basic.Settings.Stream.MissingSettingAlert="Missing Stream Setup"
 Basic.Settings.Stream.StreamSettingsWarning="Open Settings"
 Basic.Settings.Stream.MissingUrlAndApiKey="URL and Stream Key are missing.\n\nOpen settings to enter the URL and Stream Key in the 'stream' tab."
@@ -786,6 +798,14 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Keyframe interval (frames)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Show all codecs (even if potentially incompatible)"
 
+# Screenshot
+Screenshot="Screenshot Output"
+Screenshot.SourceHotkey="Screenshot Selected Source"
+Screenshot.StudioProgram="Screenshot (Program)"
+Screenshot.Preview="Screenshot (Preview)"
+Screenshot.Scene="Screenshot (Scene)"
+Screenshot.Source="Screenshot (Source)"
+
 # basic mode 'output' settings - advanced section - recording subsection - completer
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
@@ -829,10 +849,10 @@
 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, Mixer RTMP, Smashcast are examples 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. 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.Title="Enable surround sound audio?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Are you sure you want to enable surround sound audio?"
-Basic.Settings.Audio.Devices="Devices"
+Basic.Settings.Audio.Devices="Global Audio Devices"
 Basic.Settings.Audio.DesktopDevice="Desktop Audio"
 Basic.Settings.Audio.DesktopDevice2="Desktop Audio 2"
 Basic.Settings.Audio.AuxDevice="Mic/Auxiliary Audio"
@@ -1019,3 +1039,18 @@
 # OBS restart
 Restart="Restart"
 NeedsRestart="OBS Studio needs to be restarted. Do you want to restart now?"
+
+# Context Bar
+ContextBar.NoSelectedSource="No source selected"
+ContextBar.ResetTransform="Reset Transform"
+ContextBar.FitToCanvas="Fit to Canvas"
+
+# Context Bar Media Controls
+ContextBar.MediaControls.PlayMedia="Play Media"
+ContextBar.MediaControls.PauseMedia="Pause Media"
+ContextBar.MediaControls.StopMedia="Stop Media"
+ContextBar.MediaControls.RestartMedia="Restart Media"
+ContextBar.MediaControls.PlaylistNext="Next in Playlist"
+ContextBar.MediaControls.PlaylistPrevious="Previous in Playlist"
+ContextBar.MediaControls.MediaProperties="Media Properties"
+ContextBar.MediaControls.BlindSeek="Media Seek Widget"

obs-studio-25.0.8.tar.xz/UI/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/es-ES.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Español"
-Region="España, América Latina"
 
 OK="Aceptar"
 Apply="Aplicar"
@@ -38,6 +37,7 @@
 SourceWindow="Proyector con ventana (Fuente)"
 MultiviewProjector="Vista múltiple (Pantalla completa)"
 MultiviewWindowed="Vista múltiple (Ventana)"
+ResizeProjectorWindowToContent="Ajustar ventana al contenido"
 Clear="Borrar"
 Revert="Revertir"
 Show="Mostrar"
@@ -47,8 +47,8 @@
 New="Nuevo"
 Duplicate="Duplicar"
 Enable="Habilitar"
-DisableOSXVSync="Desahabilitar V-Sync en OSX"
-ResetOSXVSyncOnExit="Resetear V-Sync de OSX a la salida"
+DisableOSXVSync="Desahabilitar V-Sync en macOS"
+ResetOSXVSyncOnExit="Resetear V-Sync de macOS a la salida"
 HighResourceUsage="¡Sobrecarga al codificar! Considera bajar los ajustes de vídeo o usa una configuración del codificador más rápida."
 Transition="Transición"
 QuickTransitions="Transiciones rápidas"
@@ -73,7 +73,7 @@
 Next="Siguiente"
 Back="Atrás"
 Defaults="Predeterminados"
-HideMixer="Ocultar en el Mezclador"
+HideMixer="Ocultar en el mezclador"
 TransitionOverride="Anulación de la transición"
 None="Ninguno"
 StudioMode.Preview="Vista Previa"
@@ -87,13 +87,21 @@
 Fullscreen="Pantalla completa"
 Windowed="En ventana"
 Percent="Porcentaje"
+RefreshBrowser="Actualizar"
 AspectRatio="Relación de aspecto <b>%1:%2</b>"
 LockVolume="Bloquear volumen"
+LogViewer="Visor de registros"
+ShowOnStartup="Mostrar al inicio"
+OpenFile="Abrir archivo"
+AddValue="Añadir %1"
 
 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"
 
+ChromeOS.Title="Plataforma no soportada"
+ChromeOS.Text="OBS parece estar corriendo dentro de un contenedor ChromeOS. Esta plataforma no está soportada."
+
 DockCloseWarning.Title="Cerrando ventana acoplable"
 DockCloseWarning.Text="Acabas de cerrar una ventana acoplable. Si quieres mostrarla de nuevo, usa Vista → Paneles en la barra de menús."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Otros"
 
-Basic.FirstStartup.RunWizard="¿Deseas ejecutar el asistente de configuración automática? También puedes configurar tus ajustes manualmente al hacer clic en el botón \"Configuración\" de la ventana principal."
-Basic.FirstStartup.RunWizard.NoClicked="Si cambia de opinión, puede ejecutar al asistente de configuración automática en cualquier momento desde el menú \"Herramientas\"."
-
 Basic.AutoConfig="Asistente de configuración automática"
 Basic.AutoConfig.ApplySettings="Aplicar configuración"
 Basic.AutoConfig.StartPage="Información sobre el uso"
 Basic.AutoConfig.StartPage.SubTitle="Especifique para que quiere usar el programa"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizar para transmisiones, la grabación es secundaria"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizar solo para grabación, no voy a hacer una transmisión"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Solo usaré la cámara virtual"
 Basic.AutoConfig.VideoPage="Ajustes de vídeo"
-Basic.AutoConfig.VideoPage.SubTitle="Especifique los ajustes de vídeo deseados que quiera usar"
+Basic.AutoConfig.VideoPage.SubTitle="Especifique la configuración de vídeo que le gustaría usar"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Usar Actual (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Pantalla %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Usar actual (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificador de grabación"
 Basic.AutoConfig.TestPage.Result.Header="El programa ha determinado que estos ajustes estimados son los ideales para ti:"
 Basic.AutoConfig.TestPage.Result.Footer="Para utilizar estos ajustes, haga clic en \"Aplicar Configuración\". Para volver a configurar el asistente, haga clic en Atrás. Para configurar los ajustes por ti mismo, haga clic en Cancelar y abra los ajustes."
+Basic.AutoConfig.Info="El asistente de configuración automática determinará la mejor configuración basada en las especificaciones de su computadora y la velocidad de Internet."
+Basic.AutoConfig.RunAnytime="Esto puede ejecutarse en cualquier momento desde el menú Herramientas."
 
 Basic.Stats="Estadísticas"
 Basic.Stats.CPUUsage="Uso de CPU"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="¡Sin tecla de acceso rápido!"
-Output.ReplayBuffer.NoHotkey.Msg="Sin tecla de acceso rápido establecida para el búfer de reproducción. Configure la tecla de acceso \"Guardar\" para guardar las grabaciones de reproducción."
 
 Output.BadPath.Title="Ruta de archivo incorrecta"
 Output.BadPath.Text="La ruta de salida de archivos establecida no es válida. Por favor, compruebe su configuración para confirmar que se ha establecido una ruta de archivos válida."
 
 LogReturnDialog="Carga de registro exitosa"
+LogReturnDialog.Description="Tu archivo de registro ha sido subido. Ahora puedes compartir la URL para fines de depuración o soporte."
+LogReturnDialog.Description.Crash="Tu informe de error ha sido subido. Ahora puede compartir la URL para fines de depuración."
 LogReturnDialog.CopyURL="Copiar dirección URL"
+LogReturnDialog.AnalyzeURL="Analizar"
 LogReturnDialog.ErrorUploadingLog="Error al cargar el archivo de registro"
 
 Remux.SourceFile="Grabación OBS"
@@ -337,7 +346,7 @@
 
 Basic.Main.Preview.Disable="Deshabilitar previsualización"
 
-ScaleFiltering="Escala de filtrado"
+ScaleFiltering="Filtrado de escala"
 ScaleFiltering.Point="Punto"
 ScaleFiltering.Bilinear="Bilineal"
 ScaleFiltering.Bicubic="Bicúbico"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Iniciar la reproducción del búfer"
 Basic.Main.SaveReplay="Guardar repetición"
 Basic.Main.StartStreaming="Iniciar Transmisión"
+Basic.Main.StartVirtualCam="Iniciar Cámara Virtual"
 Basic.Main.StopRecording="Detener grabación"
 Basic.Main.PauseRecording="Pausar la grabación"
 Basic.Main.UnpauseRecording="Reanudar la grabación"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Detener Transmisión"
 Basic.Main.StoppingStreaming="Deteniendo la trasmisión..."
 Basic.Main.ForceStopStreaming="Parar Transmisión (descartar retardo)"
+Basic.Main.ShowContextBar="Mostrar barra de herramientas de fuente"
+Basic.Main.HideContextBar="Ocultar barra de herramientas de fuente"
+Basic.Main.StopVirtualCam="Detener Cámara Virtual"
 Basic.Main.Group="Grupo %1"
 Basic.Main.GroupItems="Agrupar los elementos seleccionados"
 Basic.Main.Ungroup="Desagrupar"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Reestablecer Interfaz de Usuario"
 Basic.MainMenu.View.Docks.LockUI="Bloquear Interfaz de Usuario"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Paneles de navegador personalizados..."
-Basic.MainMenu.View.Toolbars.Listboxes="Cuadro de &Lista"
+Basic.MainMenu.View.ListboxToolbars="Botones de la lista de escenas/fuentes"
+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"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memoria máxima (MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Uso estimado de memoria: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="No se puede estimar el uso de memoria. Establezca el límite máximo de memoria."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Asegúrese de establecer una tecla de acceso rápido para el búfer de reproducción en la sección de teclas rápidas)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefijo del nombre de archivo del búfer"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufijo"
 Basic.Settings.Output.Simple.SavePath="Ruta de grabación"
@@ -683,7 +696,7 @@
 Basic.Settings.Output.Adv.Audio.Track5="Pista 5"
 Basic.Settings.Output.Adv.Audio.Track6="Pista 6"
 
-Basic.Settings.Output.Adv.Recording="Grabando"
+Basic.Settings.Output.Adv.Recording="Grabación"
 Basic.Settings.Output.Adv.Recording.Type="Tipo"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Estándar"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Salida personalizada (FFmpeg)"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervalo de fotogramas clave (en Fotogramas)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Mostrar todos los codecs (aunque sean potencialmente incompatibles)"
 
+Screenshot="Salida de captura de pantalla"
+Screenshot.SourceHotkey="Captura de pantalla de fuente seleccionada"
+Screenshot.StudioProgram="Captura de pantalla (Programa)"
+Screenshot.Preview="Captura de pantalla (Vista previa)"
+Screenshot.Scene="Captura de pantalla (Escena)"
+Screenshot.Source="Captura de pantalla (Fuente)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Año, cuatro dígitos\n%YY		Año, últimos dos dígitos (00-99)\n%MM		Mes como número decimal (01-12)\n%DD		Día del mes, añadiendo cero (01-31)\n%hh		Hora en formato 24h (00-23)\n%mm		Minuto (00-59)\n%ss		Segundo (00-61)\n%%		A % sign\n%a		Día de la semana abreviado\n%A		Día de la semana completo\n%b		Mes abreviado\n%B		Mes completo\n%d		Día del mes, añadiendo cero (01-31)\n%H		Hora en formato 24h (00-23)\n%I		Hora en formato 12h (01-12)\n%m		Mes como número decimal (01-12)\n%M		Minuto (00-59)\n%p		Designar AM o PM\n%S		Segundo (00-61)\n%y		Año, últimos dos dígitos (00-99)\n%Y		Año\n%z		Ajuste zona horaria UTC ISO 8601\n%Z		Nombre de la zona horaria o abreviatura\n%FPS		Fotogramas por segundo\n%CRES		Resolución base (canvas)\n%ORES		Resolución de salida (escalada)\n%VF		Formato de vídeo"
@@ -750,10 +770,10 @@
 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 se está transmitiendo, compruebe si su servicio de transmisión admite la ingesta de sonido envolvente y la reproducción de sonido envolvente. Facebook 360 Live, Mixer RTMP, Smashcast son ejemplos en los que el sonido envolvente es totalmente compatible. Aunque Facebook Live y YouTube Live aceptan la ingesta surround, Facebook Live mezcla a estéreo y YouTube Live solo reproduce dos canales.\n\nLos filtros de audio OBS son compatibles con sonido envolvente, aunque no se garantiza el soporte de complementos VST."
+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.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"
+Basic.Settings.Audio.Devices="Dispositivos de audio globales"
 Basic.Settings.Audio.DesktopDevice="Audio del escritorio"
 Basic.Settings.Audio.DesktopDevice2="Audio del escritorio 2"
 Basic.Settings.Audio.AuxDevice="Dispositivo de audio Mic/auxiliar"
@@ -884,7 +904,7 @@
 ChangeBG="Establecer color"
 CustomColor="Color personalizado"
 
-BrowserSource.EnableHardwareAcceleration="Habilitar Aceleración de Hardware de Recurso en el Navegador"
+BrowserSource.EnableHardwareAcceleration="Habilitar aceleración por hardware en el navegador"
 
 About="Acerca de"
 About.Info="OBS Studio es un software libre y gratuito de grabación de vídeo y transmisión en directo."
@@ -917,3 +937,16 @@
 Restart="Reiniciar"
 NeedsRestart="OBS Studio necesita ser reiniciado. ¿Desea reiniciar ahora?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/et-EE.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/et-EE.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Eesti"
-Region="Eesti"
 
 OK="Olgu"
 Apply="Rakenda"
@@ -23,14 +22,21 @@
 Display="Kuva"
 Name="Nimi"
 Exit="Välju"
+Mixer="Helimikser"
 Browse="Sirvi"
 Mono="Mono"
 Stereo="Stereo"
 DroppedFrames="Vahele jäetud kaadreid %1 (%2%)"
+StudioProgramProjector="Projektor täisekraanil (programm)"
 PreviewProjector="Projektor täisekraanil (eelvaade)"
 SceneProjector="Projektor täisekraanil (stseen)"
 SourceProjector="Projektor täisekraanil (allikas)"
+StudioProgramWindow="Projektor aknas (programm)"
+PreviewWindow="Projektor aknas (eelvaade)"
+SceneWindow="Projektor aknas (stseen)"
+SourceWindow="Projektor aknas (allikas)"
 MultiviewProjector="Mitmikvaade (täisekraanil)"
+MultiviewWindowed="Mitmikvaade (aknas)"
 Clear="Eemalda"
 Revert="Tühista"
 Show="Näita"
@@ -40,8 +46,8 @@
 New="Uus"
 Duplicate="Tee koopia"
 Enable="Sisse lülitatud"
-DisableOSXVSync="Lülita OSX V-Sync välja"
-ResetOSXVSyncOnExit="Lähtesta OSX V-Sync väljumisel"
+DisableOSXVSync="Lülita macOS V-Sync välja"
+ResetOSXVSyncOnExit="Lähtesta macOS V-Sync väljumisel"
 HighResourceUsage="Kodeering on ülekoormatud! Proovi kasutada madalamaid videosätteid või kiiremaid kodeerimissätteid."
 Transition="Üleminek"
 QuickTransitions="Valitud üleminekud"
@@ -61,39 +67,100 @@
 Paste="Kleebi"
 PasteReference="Kleebi (Viide)"
 PasteDuplicate="Kleebi (Koopia)"
+RemuxRecordings="Remuksi salvestusi"
 Next="Edasi"
 Back="Tagasi"
+Defaults="Vaikeseaded"
 HideMixer="Peida Mixeris"
+TransitionOverride="Sunni üleminekut"
 None="Puudub"
 StudioMode.Preview="Eelvaade"
 StudioMode.Program="Programm"
+ShowInMultiview="Näita mitmikvaates"
+VerticalLayout="Vertikaalne paigutus"
 Group="Grupp"
 DoNotShowAgain="Ära enam näita"
+Default="(Vaikeseade)"
 Calculating="Arvutamine..."
 Fullscreen="Täisekraan"
+Windowed="Akendatud"
 Percent="Protsent"
+AspectRatio="Kuvasuhe <b>%1:%2</b>"
+LockVolume="Lukusta helitugevus"
 
 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"
+
+
+DockCloseWarning.Title="Dokitava akna sulgemine"
+DockCloseWarning.Text="Sa just sulgesid dokitava akna. Kui sa tahad seda näidata uuesti, kasuta Vaade → Dokid menüüd menüüribal."
+
+ExtraBrowsers="Kohandatud veebilehe dokid"
+ExtraBrowsers.Info="Dokide lisamiseks anna neile nimi ja URL, siis klikki Rakenda või Sulge et avada dokid. Sa saad lisada või eemaldada dokke ükskõik millal."
+ExtraBrowsers.DockName="Doki nimi"
+
+Auth.Authing.Title="Autentimine..."
+Auth.Authing.Text="Autentimine teenusega %1, palun oota..."
+Auth.AuthFailure.Title="Autentimise viga"
+Auth.AuthFailure.Text="Autentimine teenusega %1 ebaõnnestus:\n\n%2: %3"
+Auth.InvalidScope.Title="Autentimine on vajalik"
+Auth.InvalidScope.Text="Autentimisvajadused teenusel %1 on muutunud. Mõned funktsioonid võivad olla kättesaamatud."
+Auth.LoadingChannel.Title="Kanaliinfo laadimine..."
+Auth.LoadingChannel.Text="Teenuse %1 kanaliinfo laadimine..."
+Auth.ChannelFailure.Title="Kanali laadimine ebaõnnestus"
+Auth.ChannelFailure.Text="Kanaliinfo laadimine teenusel %1 ebaõnnestus\n\n%2: %3"
+Auth.Chat="Chat"
+Auth.StreamInfo="Voogedastuse info"
+TwitchAuth.Stats="Twitch statistika"
+TwitchAuth.Feed="Twitch aktiivsuse voog"
+TwitchAuth.TwoFactorFail.Title="Voogedastuse võtme päring ebaõnnestus"
+TwitchAuth.TwoFactorFail.Text="OBS ei suutnud ühendada sinu Twitch kontot. Palun tee kindlaks, et kahefaktoriline autentimine on üles seatud sinu <a href='https://www.twitch.tv/settings/security'>Twitch turvalisuse seadetes</a>, sest see on vajalik voogestamiseks."
+RestreamAuth.Channels="Restream kanalid"
+
+Copy.Filters="Kopeeri filtrid"
+Paste.Filters="Kleebi filtrid"
+
+BrowserPanelInit.Title="Veebibrauseri käivitamine..."
+BrowserPanelInit.Text="Veebibrauser käivitub, palun oota..."
+
+BandwidthTest.Region="Piirkond"
 BandwidthTest.Region.US="Ameerika Ühendriigid"
 BandwidthTest.Region.EU="Euroopa"
 BandwidthTest.Region.Asia="Aasia"
 BandwidthTest.Region.Other="Muu"
 
-
+Basic.AutoConfig="Automaat-konfiguratsiooni viisard"
 Basic.AutoConfig.ApplySettings="Rakenda muutused"
+Basic.AutoConfig.StartPage="Kasutus info"
+Basic.AutoConfig.StartPage.SubTitle="Täpsustage, mille jaoks te programmi kasutate"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimiseeri voogestamiseks, salvestamine on teisane"
+Basic.AutoConfig.StartPage.PrioritizeRecording="Optimiseeri lihtsalt salvestamiseks, ma ei plaani voogestada"
+Basic.AutoConfig.VideoPage="Video sätted"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Kasuta praegust (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Kuva %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Kasuta praegust (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 või 30, aga eelista 60 kui võimalik"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 või 30, aga eelista kõrgemat resolutsiooni"
+Basic.AutoConfig.VideoPage.CanvasExplanation="NB: Lõuendi (aluse) resolutsioon ei ole tingimata sama mis voogestus või salvestus resolutsioon. Tegelik voogestus/salvestus resolutsioon võib olla väiksem lõuendist et vähendada bitikiirust või koormust arvutil."
+Basic.AutoConfig.StreamPage="Voogedastuse info"
+Basic.AutoConfig.StreamPage.SubTitle="Palun sisesta teavet voogedastuse kohta"
+Basic.AutoConfig.StreamPage.ConnectAccount="Ühenda konto (soovitatud)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Katkesta ühendus kontoga"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Katkesta ühendus kontoga?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Taotle voogedastuse võti"
+Basic.AutoConfig.StreamPage.UseStreamKey="Kasuta voogedastuse võtit"
 Basic.AutoConfig.StreamPage.Service="Teenus"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Kuva kõik..."
+Basic.AutoConfig.StreamPage.Service.Custom="Kohandatud..."
 Basic.AutoConfig.StreamPage.Server="Server"
 Basic.AutoConfig.StreamPage.StreamKey="Voogedastuse võti"
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"
+Basic.AutoConfig.TestPage="Lõpptulemused"
 
 Basic.Stats="Statistika"
 Basic.Stats.CPUUsage="CPU kasutus"
+Basic.Stats.Status.Live="OTSE"
 Basic.Stats.Status.Inactive="Inaktiivne"
 Basic.Stats.Bitrate="Bitikiirus"
 
@@ -142,6 +209,8 @@
 ConfirmStop.Text="Kas soovid kindlasti voogedastust lõpetada?"
 
 
+ConfirmBWTest.Title="Kas käivitada ülekandekiiruse test?"
+ConfirmBWTest.Text="OBS on konfigureeritud ülekandekiiruse testi režiimi. See režiim võimaldab võrgutesti sooritamist ilma, et kanalile voogedastataks. Kui test on valmis, peate režiimi välja lülitama, et vaatajad taas näeksid teie voogedastust.\n\nKas soovite jätkata?"
 
 ConfirmExit.Title="Kas väljuda OBS-ist?"
 ConfirmExit.Text="OBS on hetkel aktiivne. Kõik voogedastused ja salvestused peatatakse. Kas soovid kindlasti väljuda?"
@@ -152,7 +221,11 @@
 
 Output.StartStreamFailed="Voogedastuse alustamine nurjus"
 Output.StartRecordingFailed="Salvestamise alustamine nurjus"
+Output.StartReplayFailed="Taasesitus puhvri käivitamine ebaõnnestus"
+Output.StartFailedGeneric="Väljundi käivitamine ebaõnnestus. Palun vaadake logist üksiasju.\n\nNB! Kui kasutate NVENC või AMD enkoodereid, veenduge, et graafikadraiverid oleksid uuendatud."
 
+Output.ReplayBuffer.PauseWarning.Title="Ei saa salvestada taasesitusi pausitud olekus"
+Output.ReplayBuffer.PauseWarning.Text="Hoiatus: Taasesitusi ei saa salvestada pausitud olekus."
 
 Output.ConnectFail.Title="Ühendamine ei õnnestunud"
 Output.ConnectFail.BadPath="Vigane rada või ühenduse URL. Palun veendu, et valitud sätted on õiged."
@@ -164,8 +237,6 @@
 Output.RecordNoSpace.Msg="Pole piisavalt kettaruumi, et jätkata salvestamist."
 Output.RecordError.Title="Salvestamise tõrge"
 Output.RecordError.Msg="Salvestamise ajal ilmnes tundmatu tõrge."
-Output.ReplayBuffer.NoHotkey.Title="Kiirklahv pole seadistatud!"
-Output.ReplayBuffer.NoHotkey.Msg="\"Salvesta Taasesitus\" kiirklahv on seadistamata. Palun seadistage kiirklahv, mida soovite kasutada."
 
 Output.BadPath.Title="Halb failitee"
 Output.BadPath.Text="Konfigureeritud failiväljundi tee on vale. Palun kontrollige oma sätetes, kas õige failitee on valitud."
@@ -201,9 +272,11 @@
 
 
 ScaleFiltering.Point="Punkt"
+ScaleFiltering.Area="Ala"
 
 Deinterlacing.Retro="Retro"
 Deinterlacing.Blend="Sulanda"
+Deinterlacing.Yadif="Yadif"
 
 VolControl.Mute="Vaigista '%1'"
 VolControl.Properties="'%1' atribuudid"
@@ -279,6 +352,7 @@
 
 Basic.Main.Scenes="Stseenid"
 Basic.Main.Sources="Allikad"
+Basic.Main.Controls="Juhtnupud"
 Basic.Main.Connecting="Ühendamine..."
 Basic.Main.StartRecording="Alusta salvestamist"
 Basic.Main.StartStreaming="Alusta voogedastust"
@@ -320,6 +394,7 @@
 
 Basic.MainMenu.View="&Vaade"
 Basic.MainMenu.View.Toolbars="&Tööriistaribad"
+Basic.MainMenu.View.Docks="Dokid"
 Basic.MainMenu.View.SceneTransitions="Stseeni üleminekud (&C)"
 Basic.MainMenu.View.StatusBar="Olekuriba (&S)"
 
@@ -358,6 +433,7 @@
 
 Basic.Settings.Stream="Voogedastus"
 Basic.Settings.Stream.StreamType="Voogedastuse tüüp"
+Basic.Settings.Stream.TTVAddon.None="Puudub"
 
 Basic.Settings.Output="Väljund"
 Basic.Settings.Output.Format="Salvestusvorming"
@@ -417,6 +493,9 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Võtmekaadri intervall (kaadrit)"
 
 
+FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
+FilenameFormatting.TT="%CCYY	Aasta, neli numbrikohta\n%YY		Aasta, viimased kaks numbrikohta (00-99)\n%MM		Kuu kümnendnumbrina (01-12)\n%DD		Kuupäev, kaks numbrikohta (01-31)\n%hh		Tund 24h formaadis (00-23)\n%mm		Minut (00-59)\n%ss		Sekund (00-61)\n%%		% märk\n%a		Lühendatud nädalapäev\n%A		Nädalapäev\n%b		Lühendatud kuu nimi\n%B		Kuu\n%d		Kuupäev, kaks numbrikohta (01-31)\n%H		Tund 24h formaadis (00-23)\n%I		Tund 12h formaadis (01-12)\n%m		Kuu kümnendnumbrina (01-12)\n%M		Minut (00-59)\n%p		AM ja PM sufiks\n%S		Sekund (00-61)\n%y		Aasta, viimased kaks numbrikohta (00-99)\n%Y		Aasta\n%z		ISO 8601 nihutus UTC'st ajavööndis\n%Z		Ajavööndi nimi või lühend\n%FPS		Kaadrit sekundis\n%CRES		Aluse (lõuendi) resolutsioon\n%ORES		Väljundi (skaleeritud) resolutsioon\n%VF		Video formaat"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Kuvaadapter"
@@ -429,6 +508,7 @@
 
 Basic.Settings.Audio="Heli"
 Basic.Settings.Audio.Channels="Kanalid"
+Basic.Settings.Audio.MeterDecayRate.Fast="Kiire"
 Basic.Settings.Audio.UnknownAudioDevice="[Seade ühendamata või pole saadaval]"
 
 Basic.Settings.Advanced.General.ProcessPriority.High="Kõrge"
@@ -444,6 +524,7 @@
 Basic.Settings.Advanced.Network="Võrk"
 
 Basic.AdvAudio.Name="Nimi"
+Basic.AdvAudio.Mono="Mono"
 Basic.AdvAudio.Monitoring.None="Välja lülitatud"
 Basic.AdvAudio.AudioTracks="Rajad"
 
@@ -457,6 +538,7 @@
 Hotkeys.Insert="Sisesta"
 Hotkeys.Delete="Kustuta"
 Hotkeys.Home="Home"
+Hotkeys.End="End"
 Hotkeys.PageUp="Page Up"
 Hotkeys.PageDown="Page Down"
 Hotkeys.NumLock="Num Lock"
@@ -465,12 +547,16 @@
 Hotkeys.Backspace="Tagasisammuklahv"
 Hotkeys.Tab="Tab"
 Hotkeys.Print="Prindi"
+Hotkeys.Pause="Pause"
 Hotkeys.Left="Vasakule"
 Hotkeys.Right="Paremale"
 Hotkeys.Up="Üles"
 Hotkeys.Down="Alla"
 Hotkeys.Windows="Windows"
+Hotkeys.Super="Super"
 Hotkeys.Menu="Menüü"
+Hotkeys.Space="Tühik"
+Hotkeys.Escape="Esc"
 
 Mute="Vaigista"
 
@@ -480,6 +566,9 @@
 
 
 
+About="Teave"
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/eu-ES.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/eu-ES.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Euskara"
-Region="Euskal Herria"
 
 OK="Ados"
 Apply="Aplikatu"
@@ -47,8 +46,8 @@
 New="Berria"
 Duplicate="Bikoiztu"
 Enable="Gaitu"
-DisableOSXVSync="Desgaitu OSX V-Sync"
-ResetOSXVSyncOnExit="Berrezarri OSX V-Sync-a Irtetean"
+DisableOSXVSync="Desgaitu macOS V-Sync"
+ResetOSXVSyncOnExit="Berrezarri macOS V-Sync-a Irtetean"
 HighResourceUsage="Kodeketa gainzamatuta! Saia zaitez bideo ezarpenak arintzen edo kodetze aurrezarpen azkarragoa erabiltzen."
 Transition="Trantsizioa"
 QuickTransitions="Trantsizio azkarrak"
@@ -94,6 +93,7 @@
 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"
 
+
 DockCloseWarning.Title="Leiho moldagarria ixten"
 DockCloseWarning.Text="Leiho moldagarri bat itxi berri duzu. Berriro bistaratu nahi baduzu, erabili menu barrako Ikusi → Leiho moldagarriak menua."
 
@@ -117,7 +117,7 @@
 TwitchAuth.Feed="Twich aktibitateen jarioa"
 TwitchAuth.TwoFactorFail.Title="Ezin izan da transmisioaren gakoa galdetu"
 TwitchAuth.TwoFactorFail.Text="OBS-ek ez du lortu konektatzea zure Twitch kontuarekin. Egiazta ezazu bi urratsetako identifikazioa ezarrita dagoela zure <a href='https://www.twitch.tv/settings/security'>Twitch-eko segurtasun ezarpenetan</a> transmisiorako beharrezkoa da eta."
-RestreamAuth.Channels="Bir-trasmisio kanalak"
+RestreamAuth.Channels="Restream kanalak"
 
 Copy.Filters="Kopiatu iragazkiak"
 Paste.Filters="Itsatsi iragazkiak"
@@ -131,9 +131,6 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Beste bat"
 
-Basic.FirstStartup.RunWizard="Martxan jarri nahi duzu ezarpen automatikoen morroia? Bestela eskuz konfigura dezakezu zure ezarpenak leiho nagusiko Ezarpenak botoia klikatuta."
-Basic.FirstStartup.RunWizard.NoClicked="Iritziz aldatzen baduzu, martxan jar dezakezu ezarpen automatikoen morroia berriro Tresnen menuan."
-
 Basic.AutoConfig="Ezarpen automatikoen morroia"
 Basic.AutoConfig.ApplySettings="Aplikatu ezarpenak"
 Basic.AutoConfig.StartPage="Erabilera-informazioa"
@@ -141,7 +138,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizatu transmisiorako, grabazioa bigarren mailakoa da"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizatu grabazioa, ez du transmitituko"
 Basic.AutoConfig.VideoPage="Bideo-ezarpenak"
-Basic.AutoConfig.VideoPage.SubTitle="Zehaztu erabili nahi dituzun bideo-ezarpenak"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Erabili unekoa (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Erakutsi %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Erabili unekoa (%1)"
@@ -292,8 +288,6 @@
 Output.RecordError.Title="Grabazio akatsa"
 Output.RecordError.Msg="Zehaztugabeko akats bat gertatu da grabatzerakoan."
 Output.RecordError.EncodeErrorMsg="Kodetzailearen errore bat gertatu da grabatzean."
-Output.ReplayBuffer.NoHotkey.Title="Laster tekla ezarri gabe!"
-Output.ReplayBuffer.NoHotkey.Msg="Ez da ezarri gordetzeko laster teklarik erreprodukzio bufferrerako. Ezarri \"Gorde\" laster tekla erreprodukzio bufferrak gordetzeko."
 
 Output.BadPath.Title="Fitxategi-bide okerra"
 Output.BadPath.Text="Ezarritako fitxategiaren irteera-bidea baliogabea da. Egiaztatu zure ezarpenak baieztatzeko baliozko fitxategi-bidea ezarri dela."
@@ -527,7 +521,6 @@
 Basic.MainMenu.View.Docks.ResetUI="Berrabiarazi erabiltzaile-interfazea"
 Basic.MainMenu.View.Docks.LockUI="Blokeatu erabiltzaile-interfazea"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Nabigatzailearen atrake pertsonalizatuak..."
-Basic.MainMenu.View.Toolbars.Listboxes="Zerrenda-kutxak (&L)"
 Basic.MainMenu.View.SceneTransitions="Eszenen trantsizioak (&C)"
 Basic.MainMenu.View.SourceIcons="Iturburuen &ikonoak"
 Basic.MainMenu.View.StatusBar="Egoera-barra (&S)"
@@ -640,7 +633,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Gehienezko memoria (megabytetan)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Ustezko memoria erabilera: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Ezin da kalkulatu memoria erabilera. Ezarri gehienezko memoria."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Oharra: Aseguratu bufferraren erreprodukziorako laster tekla bat ezarri duzula laster teklen atalean)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Erreprodukzio bufferraren fitxategi aurrizkia"
 Basic.Settings.Output.ReplayBuffer.Suffix="Atzizkia"
 Basic.Settings.Output.Simple.SavePath="Grabazio-bidea"
@@ -712,6 +704,7 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Gako-fotogramen tartea (fotogramak)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Erakutsi kodek guztiak (bateragarriak ez balira ere)"
 
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Urtea, lau digituak\n%YY		Urtea, azken bi digituak (00-99)\n%MM		Hilabetea zenbaki hamartar gisa (01-12)\n%DD		Hilabeteko eguna, zeroz osatua (01-31)\n%hh		Ordua 24 orduko formatuan (00-23)\n%mm		Minutu (00-59)\n%ss		Segundo (00-61)\n%%		A % zeinu\n%a		Asteko eguna formatu laburrean\n%A		Asteko eguna formatu osoan\n%b		Hilaren izena formatu laburrean\n%B		Hilaren izena formatu osoan\n%d		Hilabeteko eguna, zeroz osatua (01-31)\n%H		Ordua 24 orduko formatuan (00-23)\n%I		Ordua 12 orduko formatuan (01-12)\n%m		Hilabetea zenbaki hamartar gisa (01-12)\n%M		Minutu (00-59)\n%p		AM edo PM izendapena\n%S		Segundo (00-61)\n%y		Urtea, azken bi digituak (00-99)\n%Y		Urtea\n%z		ISO 8601 desplazamendua UTC-tik ordu-eremuan\n%Z		Ordu-eremuaren izena edo laburdura\n%FPS		Fotograma segundoko\n%CRES		Oinarriaren (oihalaren) bereizmena\n%ORES		Irteerako bereizmena (eskalatua)\n%VF		Bideo-formatua"
@@ -750,10 +743,8 @@
 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.Title="Nahi duzu soinu inguratzailea aktibatzea?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Seguru zaude soinu inguratzailea aktibatu nahi duzula?"
-Basic.Settings.Audio.Devices="Gailuak"
 Basic.Settings.Audio.DesktopDevice="Mahaigaineko audioa"
 Basic.Settings.Audio.DesktopDevice2="Mahaigaineko audioa 2"
 Basic.Settings.Audio.AuxDevice="Mik/Audio osagarria"
@@ -917,3 +908,5 @@
 Restart="Berrabiarazi"
 NeedsRestart="OBS Studio berrabiarazi behar da. Nahi duzu orain berrabiaraztea?"
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/fa-IR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/fa-IR.ini Changed

@@ -1,6 +1,5 @@
 
 Language="انگلیسی"
-Region="ایالات متحده"
 
 OK="باشه"
 Apply="اعمال تغییرات"
@@ -47,8 +46,8 @@
 New="ایجاد"
 Duplicate="ایجاد مشابه"
 Enable="فعال کردن"
-DisableOSXVSync="غیرفعال کردن OSX V-Sync"
-ResetOSXVSyncOnExit="تنظیم مجدد OSX V-Sync هنگام خروج"
+DisableOSXVSync="غیرفعال کردن macOS V-Sync"
+ResetOSXVSyncOnExit="تنظیم مجدد macOS V-Sync هنگام خروج"
 HighResourceUsage="کد گذاری بیش از حد ! توجه کنید که تنظیمات ویدئویی را تغییر بدهید یا از یک پریست کد گذاری سریع تر استفاده کنید ."
 Transition="انتقال"
 QuickTransitions="جا به جایی سریع"
@@ -88,11 +87,13 @@
 Windowed="پنجره"
 Percent="درصد"
 AspectRatio="نسبت ابعاد <b>%1:%2</b>"
+LockVolume="قفل تنظیم صدا"
 
 AlreadyRunning.Title="OBS از قبل در حال اجراست"
 AlreadyRunning.Text="OBS از قبل در حال اجراست! در صورتی که به صورت عمد این کار را کرده اید، لطفاً قبل از اجرای یک نمونه جدید سایر نمونه های باز شده‌ی OBS را ببندید. اگر OBS را در حالت کوچک کردن در system try قرار داده اید، لطفاً چک کنید که آیا در آن جا هنوز در حال اجراست."
 AlreadyRunning.LaunchAnyway="در هر حال اجرا کن"
 
+
 DockCloseWarning.Title="بسته شدن پنجره قابل حمل"
 DockCloseWarning.Text="شما فقط یک پنجره قابل حمل را بسته اید. اگر می خواهید دوباره آن را نشان دهید ، از منوی نما زیر منوی بخش ها در نوار فهرست استفاده کنید."
 
@@ -115,6 +116,7 @@
 TwitchAuth.Feed="بازخورد فعالیت Twitch"
 TwitchAuth.TwoFactorFail.Title="کلید پخش زنده یافت نشد"
 TwitchAuth.TwoFactorFail.Text="OBS قادر به اتصال به حساب Twitch شما نبود. لطفاً اطمینان حاصل کنید که تأیید هویت دو عاملی در <a href='https://www.twitch.tv/settings/securance'> تنظیمات امنیتی Twitch </a> شما تنظیم شده است زیرا این کار برای پخش زنده لازم است."
+RestreamAuth.Channels="Restream کانال‌ها"
 
 Copy.Filters="کپی فیلتر ها"
 Paste.Filters="بازنشانی فیلتر ها"
@@ -128,9 +130,6 @@
 BandwidthTest.Region.Asia="آسیا"
 BandwidthTest.Region.Other="سایر"
 
-Basic.FirstStartup.RunWizard="آیا مایل به اجرای پیکربندی-خودکار هستید؟ شما همچنین می‌توانید تنظیمات خود را با کلیک بر روی دکمه تنظیمات در پنجره اصلی به صورت دستی پیکربندی کنید."
-Basic.FirstStartup.RunWizard.NoClicked="اگر نظر شما تغییر کرد، می توانید پیکربندی-خودکار را در هر زمانی از منوی ابزار اجرا کنید."
-
 Basic.AutoConfig="دستیار تنظیم خودکار"
 Basic.AutoConfig.ApplySettings="اعمال تنظیمات"
 Basic.AutoConfig.StartPage="اطلاعات نحوه استفاده"
@@ -138,7 +137,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="بهینه سازی برای پخش زنده، ضبط اولویت دوم است"
 Basic.AutoConfig.StartPage.PrioritizeRecording="فقط برای ضبط بهینه سازی می کنم ، پخش زنده ندارم"
 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)"
@@ -170,8 +168,14 @@
 Basic.AutoConfig.TestPage.TestingBandwidth="انجام آزمایش پهنای باند ، ممکن است چند دقیقه طول بکشد..."
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="در حال اتصال به:%1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="اتصال به هیچ سروری انجام نشد ، لطفا ارتباط اینترنت خود را بررسی کنید و دوباره امتحان کنید."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="در حال تست پهنای باند برای: %1"
+Basic.AutoConfig.TestPage.TestingStreamEncoder="در حال تست encoder استریم، این عملیات ممکن است کمی طول بکشد..."
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="در حال تست encoder ضبط، این عملیات ممکن است کمی طول بکشد..."
+Basic.AutoConfig.TestPage.TestingRes="در حال تست رزولوشن‌ها، این عملیات ممکن است چند دقیقه‌ای طول بکشد..."
 
+Basic.Stats="آمارها"
 Basic.Stats.CPUUsage="میزان استفاده CPU"
+Basic.Stats.HDDSpaceAvailable="فضای در دسترس دیسک"
 Basic.Stats.MemoryUsage="میزان استفاده حافظه"
 Basic.Stats.AverageTimeToRender="متوسط زمان ارائه فریم"
 Basic.Stats.Output.Stream="پخش جریانی"
@@ -181,10 +185,13 @@
 Basic.Stats.Status.Live="زنده"
 Basic.Stats.Status.Reconnecting="اتصال مجدد"
 Basic.Stats.Status.Inactive="غیر فعال"
+Basic.Stats.Status.Active="فعال"
 Basic.Stats.DroppedFrames="فریم های از دست رفته (شبکه)"
 Basic.Stats.MegabytesSent="مجموع خروجی داده ها"
 Basic.Stats.Bitrate="نرخ بیت"
+Basic.Stats.ResetStats="تنظیم مجدد آمار"
 
+ResetUIWarning.Title="آیا مطمئنید که می‌خواهید رابط کاربری را مجدداً تنظیم کنید؟"
 
 Updater.Title="بروزرسانی جدید موجود است"
 Updater.Text="نسخه جدیدی در دسترس است:"
@@ -226,6 +233,7 @@
 Output.StartRecordingFailed="شروع ضبط ناموفق بود"
 
 
+Output.ConnectFail.Title="اتصال ناموفق بود"
 Output.ConnectFail.ConnectFailed="اتصال به سرور ممکن نشد"
 Output.ConnectFail.InvalidStream="نمی توانید به کانال مشخص شده یا کلید پخش زنده دسترسی داشته باشید ، لطفاً کلید جریان خود را دو بار بررسی کنید. اگر صحیح باشد ، ممکن است هنگام اتصال به سرور مشکلی ایجاد شود."
 Output.ConnectFail.Error="هنگام تلاش برای اتصال به سرور ، یک خطای غیرمنتظره رخ داد. اطلاعات بیشتر در پرونده لاگ."
@@ -241,8 +249,6 @@
 Output.RecordError.Title="خطای ضبط"
 Output.RecordError.Msg="هنگام ضبط خطای نامشخص رخ داده است."
 Output.RecordError.EncodeErrorMsg="هنگام ضبط خطای رمزگذار رخ داده است."
-Output.ReplayBuffer.NoHotkey.Title="بدون کلید میانبر!"
-Output.ReplayBuffer.NoHotkey.Msg="هیچ کلید میانبری برای بازپخش بافر تنظیم نشده است. لطفا یک کلید میانبر را ذخیره بازپخش بافر ضبط شده تنظیم کنید."
 
 
 
@@ -255,7 +261,9 @@
 Basic.DesktopDevice2="صدای دسکتاپ 2"
 
 
+Basic.Main.PreviewConextMenu.Enable="فعال سازی پیش‌نمایش"
 
+Basic.Main.Preview.Disable="غیرفعال سازی پیش‌نمایش"
 
 
 
@@ -326,9 +334,12 @@
 
 
 
+
 ResizeOutputSizeOfSource.Continue="آیا مایلید ادامه دهید؟"
 
 
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/fi-FI.ini Changed

@@ -1,6 +1,5 @@
 
 Language="suomi"
-Region="Suomi"
 
 OK="OK"
 Apply="Käytä"
@@ -38,6 +37,7 @@
 SourceWindow="Peilaa ikkunaan (Lähde)"
 MultiviewProjector="Moninäkymä (Koko näyttö)"
 MultiviewWindowed="Moninäkymä (Ikkuna)"
+ResizeProjectorWindowToContent="Sovita ikkuna sisältöön"
 Clear="Tyhjennä"
 Revert="Palauta"
 Show="Näytä"
@@ -47,8 +47,8 @@
 New="Uusi"
 Duplicate="Kahdenna"
 Enable="Ota käyttöön"
-DisableOSXVSync="Poista OSX V-Sync käytöstä"
-ResetOSXVSyncOnExit="Palauta OSX V-Sync suljettaessa"
+DisableOSXVSync="Poista macOS V-Sync käytöstä"
+ResetOSXVSyncOnExit="Palauta macOS V-Sync suljettaessa"
 HighResourceUsage="Enkoodaus on ylikuormitettu! Harkitse laatu-asetusten laskemista tai käytä nopeampaa preset-asetusta."
 Transition="Siirtymä"
 QuickTransitions="Pikasiirtymät"
@@ -87,13 +87,20 @@
 Fullscreen="Koko näyttö"
 Windowed="Ikkunoitu"
 Percent="Prosentti"
+RefreshBrowser="Päivitä"
 AspectRatio="Kuvasuhde <b>%1:%2</b>"
 LockVolume="Lukitse äänitaso"
+LogViewer="Näytä loki"
+ShowOnStartup="Näytä käynnistyksessä"
+OpenFile="Avaa tiedosto"
 
 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"
 
+ChromeOS.Title="Alustaa ei tueta"
+ChromeOS.Text="OBS vaikuttaa olevan käynnissä ChromeOS-kontissa. Oh plz ei toimi"
+
 DockCloseWarning.Title="Telakoitu ikkuna suljettu"
 DockCloseWarning.Text="Suljit juuri telakoidun ikkunan. Jos haluat sen takaisin näkyviin, löydät sen Näkymät → Telakat -valikosta työkaluriviltä."
 
@@ -131,15 +138,13 @@
 BandwidthTest.Region.Asia="Aasia"
 BandwidthTest.Region.Other="Muu"
 
-Basic.FirstStartup.RunWizard="Haluatko määrittää asetukset automaattisesti? Voit myös määrittää asetukset käsin painamalla \"Asetukset\" -painiketta päänäkymässä."
-Basic.FirstStartup.RunWizard.NoClicked="Jos muutat mielesi, voit käynnistää automaattisen määritystoiminnon milloin tahansa \"Työkalut\" -valikosta."
-
 Basic.AutoConfig="Automaattinen määritystoiminto"
 Basic.AutoConfig.ApplySettings="Ota käyttöön"
 Basic.AutoConfig.StartPage="Käyttötiedot"
 Basic.AutoConfig.StartPage.SubTitle="Määrittele kuinka haluat käyttää ohjelmaa"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimoi lähettämiseen, tallentaminen on toissijaista"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimoi tallentamiseen, lähettäminen on toissijaista"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Käytän vain virtuaalista kameraa"
 Basic.AutoConfig.VideoPage="Kuva-asetukset"
 Basic.AutoConfig.VideoPage.SubTitle="Määrittele haluamasi kuva-asetukset"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Käytä nykyistä (%1x%2)"
@@ -183,6 +188,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Tallennusenkooderi"
 Basic.AutoConfig.TestPage.Result.Header="Ohjelma on määrittänyt nämä asetukset ihanteellisimmaksi juuri sinulle:"
 Basic.AutoConfig.TestPage.Result.Footer="Ottaaksesi asetukset käyttöön, paina \"Ota käyttöön\". Määrittääksesi asetukset uudelleen, paina \"Edellinen\". Jos haluat määrittää asetukset itse, paina \"Peruuta\" ja avaa asetukset."
+Basic.AutoConfig.Info="Automaattinen määritystoiminto määrittää parhaat asetukset perustuen tietokoneesi laitteistoon ja internetin nopeuteen."
+Basic.AutoConfig.RunAnytime="Tämän voi suorittaa milloin vain Työkalut-valikosta."
 
 Basic.Stats="Tilastot"
 Basic.Stats.CPUUsage="CPU-käyttö"
@@ -292,14 +299,15 @@
 Output.RecordError.Title="Tallennusvirhe"
 Output.RecordError.Msg="Tallennuksen aikana tapahtui määrittelemätön virhe."
 Output.RecordError.EncodeErrorMsg="Tallennuksen aikana tapahtui enkoodausvirhe."
-Output.ReplayBuffer.NoHotkey.Title="Pikanäppäintä ei ole asetettu!"
-Output.ReplayBuffer.NoHotkey.Msg="Tallennuksen pikanäppäintä ei ole asetettu toistopuskurille. Aseta \"Tallenna\"-pikanäppäin tallentaaksesi uusinnat."
 
 Output.BadPath.Title="Viallinen tiedostopolku"
 Output.BadPath.Text="Asetettu tiedostopolku on viallinen. Tarkista asetuksistasi, että tiedostopolku on asetettu oikein."
 
 LogReturnDialog="Lokitiedoston lähetys onnistui"
+LogReturnDialog.Description="Lokisi on ladattu. Nyt voit jakaa URL-osoitteen virheenkorjausta tai  tukea varten."
+LogReturnDialog.Description.Crash="Kaatumisraporttisi on ladattu. Nyt voit jakaa URL-osoitteen virheenkorjausta tai  tukea varten."
 LogReturnDialog.CopyURL="Kopioi osoite"
+LogReturnDialog.AnalyzeURL="Analysoi"
 LogReturnDialog.ErrorUploadingLog="Lokitiedoston lähetyksessä tapahtui virhe"
 
 Remux.SourceFile="OBS-tallenne"
@@ -463,6 +471,7 @@
 Basic.Main.StartReplayBuffer="Käynnistä toistopuskuri"
 Basic.Main.SaveReplay="Tallenna uusinta"
 Basic.Main.StartStreaming="Aloita lähetys"
+Basic.Main.StartVirtualCam="Käynnistä Virtuaalinen Kamera"
 Basic.Main.StopRecording="Pysäytä tallennus"
 Basic.Main.PauseRecording="Pysäytä tallennus"
 Basic.Main.UnpauseRecording="Jatka tallennusta"
@@ -472,6 +481,9 @@
 Basic.Main.StopStreaming="Pysäytä lähetys"
 Basic.Main.StoppingStreaming="Pysäytetään lähetystä..."
 Basic.Main.ForceStopStreaming="Lopeta lähetys (ohita viive)"
+Basic.Main.ShowContextBar="Näytä Lähdetyökalurivi"
+Basic.Main.HideContextBar="Piilota Lähdetyökalurivi"
+Basic.Main.StopVirtualCam="Pysäytä Virtuaalinen Kamera"
 Basic.Main.Group="Ryhmitä %1"
 Basic.Main.GroupItems="Ryhmitä valitut lähteet"
 Basic.Main.Ungroup="Poista ryhmästä"
@@ -527,7 +539,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Palauta käyttöliittymä"
 Basic.MainMenu.View.Docks.LockUI="Lukitse käyttöliittymä"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Mukautetut selaintelakat..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Luetteluruudut"
+Basic.MainMenu.View.ListboxToolbars="Skene/Lähde listan painikkeet"
+Basic.MainMenu.View.ContextBar="Lähdetyökalurivi"
 Basic.MainMenu.View.SceneTransitions="Skene-siirtymät (&C)"
 Basic.MainMenu.View.SourceIcons="Lähte&iden kuvakkeet"
 Basic.MainMenu.View.StatusBar="Tilapalkki (&S)"
@@ -640,7 +653,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Muistiraja (Megatavuja)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Arvioitu muistinkäyttö: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Muistin käyttöä ei voida arvioida. Valitse muistiraja."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Huomio: Varmista että toistopuskurin pikanäppäin on asetettuna asetuksista)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Toistopuskurin tiedostonimen etuliite"
 Basic.Settings.Output.ReplayBuffer.Suffix="Pääte"
 Basic.Settings.Output.Simple.SavePath="Tallennuksen polku"
@@ -668,8 +680,8 @@
 Basic.Settings.Output.MaxRetries="Uudelleenyhdistyksien määrä"
 Basic.Settings.Output.Advanced="Käytä enkooderin lisäasetuksia"
 Basic.Settings.Output.EncoderPreset="Enkooderin esiasetus"
-Basic.Settings.Output.CustomEncoderSettings="Valinnaiset enkooderin asetukset"
-Basic.Settings.Output.CustomMuxerSettings="Valinnaiset muuntajan asetukset"
+Basic.Settings.Output.CustomEncoderSettings="Mukautetut enkooderin asetukset"
+Basic.Settings.Output.CustomMuxerSettings="Mukautetut muuntajan asetukset"
 Basic.Settings.Output.NoSpaceFileName="Luo tiedostonimi ilman välilyöntejä"
 
 Basic.Settings.Output.Adv.Rescale="Uudelleenskaalaa ulostulo"
@@ -686,7 +698,7 @@
 Basic.Settings.Output.Adv.Recording="Tallennus"
 Basic.Settings.Output.Adv.Recording.Type="Tyyppi"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Tavallinen"
-Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Valinnainen lähtö (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Mukautettu lähtö (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Käytä lähetysenkooderia)"
 Basic.Settings.Output.Adv.Recording.Filename="Tiedostonimen muoto"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Korvaa olemassa oleva"
@@ -712,6 +724,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Keyframe-väli (frameina)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Näytä kaikki koodekit (myös mahdollisesti yhteensopimattomat)"
 
+Screenshot="Näyttökuva ulostulosta"
+Screenshot.SourceHotkey="Näyttökuva valitusta lähteestä"
+Screenshot.StudioProgram="Näyttökuva (Ohjelma)"
+Screenshot.Preview="Näyttökuva (Esikatselu)"
+Screenshot.Scene="Näyttökuva (Skene)"
+Screenshot.Source="Näyttökuva (Lähde)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Vuosi, neljä numeroa\n%YY		Vuosi, kaksi viimeistä numeroa (00-99)\n%MM		Vuosi desimaalilukuna (01-12)\n%DD		Päivä, nolla-etuliitteellä (01-31)\n%hh		Tunti 24-tunnin muodossa (00-23)\n%mm		Minuutti (00-59)\n%ss		Sekunti (00-61)\n%%	A %-merkki\n%a		Viikonpäivä lyhennettynä\n%A		Viikonpäivä\n%b		Lyhennetty kuukausi\n%B		Kuukausi\n%d		Päivä, nolla-etuliitteellä (01-31)\n%H		Tunti 24-tunnin muodossa (00-23)\n%I		Tunti 12-tunnin muodossa (01-12)\n%m		Kuukausi desimaalilukuna (01-12)\n%M		Minuutti (00-59)\n%p		AM tai PM määritys\n%S		Sekunti (00-61)\n%y		Vuosi, kaksi viimeistä numeroa (00-99)\n%Y		Vuosi\n%z		ISO 8601 standardin mukainen ajan esittämistapa, UTC tai aikavyöhykkeestä\n%Z		Aikavyöhykkeen nimi tai lyhenne\n%FPS		FPS\n%CRES		Piirtoalueen resolution\n%ORES 	Ulostulo(skaalattu) resoluutio\n%VF	Video formaatti"
@@ -750,10 +769,10 @@
 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, Mixer RTMP ja Smashcast ovat esimerkkejä palveluista joissa 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="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.Title="Käytä monikanava-ääntä?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Haluatko varmasti käyttää monikanavaista ääntä?"
-Basic.Settings.Audio.Devices="Laitteet"
+Basic.Settings.Audio.Devices="Yleiset äänilaitteet"
 Basic.Settings.Audio.DesktopDevice="Äänentoistolaite"
 Basic.Settings.Audio.DesktopDevice2="Äänentoistolaite 2"
 Basic.Settings.Audio.AuxDevice="Mic/Aux -äänilaite"
@@ -917,3 +936,16 @@
 Restart="Käynnistä uudelleen"
 NeedsRestart="OBS Studio pitää käynnistää uudelleen. Haluatko tehdä sen nyt?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/fil-PH.ini Changed

@@ -1,33 +1,35 @@
 
+Language="Filipino"
 
 OK="Sige"
-Apply="Ilagay"
+Apply="Gawin"
 Cancel="Kanselahin"
-Close="Sarado"
-Save="Mag-impok"
-Discard="Ialis"
+Close="Isara"
+Save="I-save"
+Discard="Baliwalain"
 Disable="Huwag paganahin"
 Yes="Oo"
 No="Hindi"
-Add="Idagdag"
-Remove="Tanggalin"
+Add="Magdagdag"
+Remove="Alisin"
 Rename="Baguhin ang pangalan"
 Interact="Makipag-ugnayan"
-Filters="Mga salaan"
-Properties="Mga pag-aari"
-MoveUp="Gumalaw pataas"
-MoveDown="Bumaba"
+Filters="Mga Filter"
+Properties="Mga Katangian"
+MoveUp="Itaas"
+MoveDown="Ibaba"
 Settings="Mga pagtatakda"
-Display="Ipamalas"
+Display="Tanghalan"
 Name="Pangalan"
-Exit="Labasan"
-Browse="Supling"
+Exit="Umalis"
+Mixer="Pang-mix ng Audio"
+Browse="Maghanap"
 Mono="Mono"
 Stereo="Stereo"
-DroppedFrames="Bumaba ang mga frame %1 (%2%)"
+DroppedFrames="Nalaglag na mga Frame %1 (%2%)"
 StudioProgramProjector="Fullscreen Projector (Programa)"
 PreviewProjector="Fullscreen Projector (Preview)"
-SceneProjector="Fullsreen Projector (Eksena)"
+SceneProjector="Projector sa Buong Screen (Eksena)"
 SourceProjector="Fullscreen Projector (Pinagmulan)"
 StudioProgramWindow="Windowed Projector (Programa)"
 PreviewWindow="Windowed Projector (Preview)"
@@ -35,59 +37,99 @@
 SourceWindow="Windowed Projector (Pinagmulan)"
 MultiviewProjector="Multiview (Fullscreen)"
 MultiviewWindowed="Multiview (Windowed)"
-Clear="Linisin"
+ResizeProjectorWindowToContent="I-fit ang content sa window"
+Clear="Alisin"
 Revert="Ibalik"
 Show="Ipakita"
 Hide="Itago"
-UnhideAll="Huwag itago lahat"
+UnhideAll="Ipakita Lahat"
 Untitled="Walang pamagat"
 New="Bago"
-Duplicate="Katulad"
+Duplicate="Doblehin"
 Enable="Paganahin"
-DisableOSXVSync="Huwag Paganahin OSX V-Sync"
-ResetOSXVSyncOnExit="I-reset ang OSX V-Sync sa Labasan"
+DisableOSXVSync="Huwag Paganahin ang macOS V-Sync"
+ResetOSXVSyncOnExit="I-reset ang macOS V-Sync sa Pag-alis"
 HighResourceUsage="Ang Encoding ay labis ang karga! Isaalang alang ang pagbaba ng video settings o gumamit ng mas mabilis na encoding preset."
-Transition="Paglipat"
-QuickTransitions="Mabilis na Paglipat"
+Transition="Pagpalit"
+QuickTransitions="Mabilis na Pagbago"
+FadeToBlack="I-fade to black"
 Left="Kaliwa"
 Right="Kanan"
-Top="Pinakamataas"
-Bottom="Kailaliman"
-Reset="Baguhin"
+Top="Taas"
+Bottom="Baba"
+Reset="Ulitin"
 Hours="Oras"
 Minutes="Minuto"
 Seconds="Segundo"
 Deprecated="Hindi na ginagamit"
 ReplayBuffer="Replay Buffer"
 Import="Mag-angkat"
-Export="I-export"
+Export="Magluwas"
 Copy="Kopyahin"
-Paste="I-paste"
+Paste="Idikit"
 PasteReference="I-paste (Banggit)"
 PasteDuplicate="I-paste (Pangalawang salin)"
 RemuxRecordings="Mga Pagtatala ng Remux"
 Next="Susunod"
 Back="Bumalik"
-Defaults="Mga hindi pagsipot"
+Defaults="Mga Default"
 HideMixer="Itago sa panghalo"
-TransitionOverride="Override na ang Paglipat"
+TransitionOverride="I-override ang Pagpalit"
 None="Wala"
-StudioMode.Preview="Balikan"
+StudioMode.Preview="Pribyu"
 StudioMode.Program="Programa"
 ShowInMultiview="Ipakita sa Multiview"
 VerticalLayout="Patayong Layout"
 Group="Grupo"
-
-AlreadyRunning.Title="Tumatakbo na ngayon ang OBS"
-AlreadyRunning.Text="Tumatakbo na ang OBS! Maliban na lamang kung gusto mong gawin ito, pakiusap patayin ang anomang nabubuhay na mga mungkahi ng OBS bago subukang magpatakbo ng panibagong mungkahi. Kung meron kang OBS set para mabawasan ang sistemang tray, pakiusap magsiyasat para makita kung ito ay tumatakbo parin."
-AlreadyRunning.LaunchAnyway="Maglunsad parin"
-
-
-
+DoNotShowAgain="Huwag ipakita muli"
+Default="(Default)"
+Calculating="Nagkakalkula..."
+Fullscreen="Buong screen"
+Windowed="Pa-window"
+Percent="Bahagdan"
+RefreshBrowser="I-refresh"
+AspectRatio="Aspect Ratio <b>%1%2</b>"
+LockVolume="I-lock ang volume"
+LogViewer="Viewer para sa Log"
+ShowOnStartup="Ipakita sa pasimula"
+OpenFile="Buksan ang file"
+
+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"
+
+ChromeOS.Title="Hindi suportadong Plataporma"
+ChromeOS.Text="Tila tumatakbo sa loob ng ChromeOS container ang OBS. Ang platapormang ito ay hindi suportado"
+
+DockCloseWarning.Title="Isinasara ang Dockable Window"
+DockCloseWarning.Text="Kasasara mo lang ng isang dockable window. Kung nais mong ipakita ulit ito, gamitin ang View → Docks menu sa menu bar."
+
+ExtraBrowsers="Mga Pasadyang Browser Dock"
+ExtraBrowsers.Info="Magdagdag ng mga dock sa pamamagitan ng pagbibigay sa kanila ng pangalan at URL, saka pindutin ang Ilagay o Isara para buksan ang mga dock. Maaaring magdagdag o magbawas ng mga dock kahit kailan."
+ExtraBrowsers.DockName="Pangalan ng Dock"
+
+Auth.Authing.Title="Pinapatunayan..."
+Auth.Authing.Text="Pinapatunayan sa %1, mangyaring maghintay..."
+Auth.AuthFailure.Title="Pagkabigo sa Pagpapatunay"
+Auth.AuthFailure.Text="Bigo sa pagpapatunay sa %1:\n\n%2: %3"
+Auth.InvalidScope.Title="Nangangailangan ng Pagpapatunay"
+Auth.InvalidScope.Text="Ang mga kinakailangan sa pagpapatunay para sa %1 ay nagbago na. Ang ilang mga katangian ay maaaring wala na."
+Auth.LoadingChannel.Title="Nilo-load ang impormasyon ng channel..."
+Auth.LoadingChannel.Text="Nilo-load ang impormasyon ng channel para sa %1, mangyaring maghintay..."
+Auth.ChannelFailure.Title="Nabigo sa pagload ng channel"
+Auth.ChannelFailure.Text="Nabigo sa pagload ng impormasyon sa channel para sa %1\n\n%2: %3"
+Auth.Chat="Magusap"
+Auth.StreamInfo="Mga batis ng impormasyon"
+TwitchAuth.Stats="Twitch Stats"
+TwitchAuth.TwoFactorFail.Title="Hindi ma-itanong ang stream key"
+TwitchAuth.TwoFactorFail.Text="Hindi naka-connect ang OBS sa iyong account sa Twitch. Pakisiguradong nakaayos na ang two-factor authentication sa <a href='https://www.twitch.tv/settings/security'>security settings ng iyong Twitch</a> dahil kailangan ito para makapag-stream."
+RestreamAuth.Channels="I-restream ang mga Channel"
 
 Copy.Filters="Kopyahin ang mga panala"
 Paste.Filters="I-paste ang mga panala"
 
+BrowserPanelInit.Title="Sinisimulan ang Browser..."
+BrowserPanelInit.Text="Sinisimulan ang Browser, mangyaring maghintay..."
 
 BandwidthTest.Region="Rehiyon"
 BandwidthTest.Region.US="Estados Unidos"
@@ -95,41 +137,46 @@
 BandwidthTest.Region.Asia="Asya"
 BandwidthTest.Region.Other="Iba pa"
 
-Basic.FirstStartup.RunWizard="Gusto mo bang mapatakbo ang dalubhasa sa kusang pagkonpigurasyon? Maaari mo ring mano-manuhin ang pagkonpigura ng iyong settings sa pagpindot ng Settings button sa pangunahing window."
-Basic.FirstStartup.RunWizard.NoClicked="Kung magbabago ka ng isip mo, pwede mong patakbuhin ang dalubhasang kusang konpigurasyon anomang oras ulit mula sa mga kasangkapan sa menu."
-
 Basic.AutoConfig="Dalubhasang Kusang Konpigurasyon"
-Basic.AutoConfig.ApplySettings="Ilapat ang mga Pagtatakda"
+Basic.AutoConfig.ApplySettings="Gamitin ang mga Setting"
 Basic.AutoConfig.StartPage="Paggamit ng Impormasyon"
-Basic.AutoConfig.StartPage.SubTitle="Tukuyin ang tamang program na gusto mong gamitin"
-Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimize para sa streaming, pangalawa ay ang recording"
-Basic.AutoConfig.StartPage.PrioritizeRecording="Optimize para sa recording, Hindi ako mag streaming"
+Basic.AutoConfig.StartPage.SubTitle="Tukuyin ang nais mong paggamitan ng programa"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="I-optimize para sa pag-stream, pangalawa lang ang pagrerecord"
+Basic.AutoConfig.StartPage.PrioritizeRecording="I-optimize para sa pagrerecord, hindi ako mag-iistream"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Virtual camera lang ang gagamitin ko"
 Basic.AutoConfig.VideoPage="Ang mga video settings"
-Basic.AutoConfig.VideoPage.SubTitle="Tukuyin ang naayong video settings na gusto mong gamitin"
-Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Kasulukuyang gamitin(%1x%2)"
-Basic.AutoConfig.VideoPage.BaseResolution.Display="I-Display %1 (%2x%3)"
-Basic.AutoConfig.VideoPage.FPS.UseCurrent="Pangsulukuyang Gamitin (%1)"
-Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Sa 60 or kaya sa 30, Pero mas mabuti 60 kung maaari"
-Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Sa 60 or kaya sa 30, Pero mas mabuti 60 para sa mas magandang resolusyon"
+Basic.AutoConfig.VideoPage.SubTitle="Tukuyin ang mga video setting na nais mong gamitin"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Gamitin ang Kasalukuyan(%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Display %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Gamitin ang Kasalukuyan (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Maaaring 60 o 30, pero piliin ang 60 kung maaari"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Maaaring 60 o 30, pero piliin ang mas mataas na resolusyon"
 Basic.AutoConfig.VideoPage.CanvasExplanation="Paalala: Ang kanbas (base) na ito ay hindi kinakailangan na kaparehas ng resolusyon ng iyong stream or record. Ang iyong actual stream/record na resolusyon ay maaaring pagkasyahin para sa resolusyon ng kanbas para mabawasan ang paggamit kinakailangan na bitrate."
-Basic.AutoConfig.StreamPage="Mga batis ng impormasyon"
-Basic.AutoConfig.StreamPage.SubTitle="Pakiusap ilagay ang iyong impormasyon pang stream"
+Basic.AutoConfig.StreamPage="Impormasyon sa Stream"
+Basic.AutoConfig.StreamPage.SubTitle="Pakilagay ang iyong impormasyon pang stream"
+Basic.AutoConfig.StreamPage.ConnectAccount="I-connect ang Account (ipinapayo)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="I-disconnect ang Account"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="I-disconnect ang Account?"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Ang pagbabagong ito ay mangyayari agad. Sigurado ka bang nais mong i-disconnect ang iyong account?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Ang susi ng iyong stream"
+Basic.AutoConfig.StreamPage.UseStreamKey="Gumamit ang Stream key"
 Basic.AutoConfig.StreamPage.Service="Serbisyo"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Ipakita lahat..."
+Basic.AutoConfig.StreamPage.Service.Custom="Pasadya..."
 Basic.AutoConfig.StreamPage.Server="Serber"
 Basic.AutoConfig.StreamPage.StreamKey="Ang susi ng iyong stream"
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(link)"
-Basic.AutoConfig.StreamPage.PerformBandwidthTest="I-estima ang bitrate kasama ang pag eksamina ng bandwidth (maaaring tumagal ng ilang minuto)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Tantiyahin ang bitrate sa pamamagitan ng pagsubok ng bandwidth (maaaring tumagal ng ilang minuto)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Piliin ang hardware encoding"
-Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Ang Hardware Encoding ay tinatanggal lahat ng nagamit na CPU, pero kailangan ng mas maraming bitrate para makuha ang parehong lebel ng kalidad"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Ang Hardware Encoding ay nag-aalis ng halos lahat na nagamit na CPU, pero maaaring kailangan ng mas maraming bitrate para makuha ang parehong antas ng kalidad."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Babala sa pag stream"
-Basic.AutoConfig.StreamPage.StreamWarning.Text="Ang bandwidth test ay tungkol sa stream randomized bidyo data at walang audio sa iyong channel. Kung maaari, mas inirerekomenda na pansamantalang i-off ang pag save ng vides of streams at itakda sa pribado hanggang matapos makumpleto ang pag eksamin"
-Basic.AutoConfig.TestPage="Huling Resulta"
-Basic.AutoConfig.TestPage.SubTitle.Testing="Ang program na ito ay isinasagawa ang mga set para eksamin para matantiya ang pinakamainam na settings"
-Basic.AutoConfig.TestPage.SubTitle.Complete="Ang iyong pagsusuri ay kumpleto na"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Ang pagsubok ng bandwidth ay magsisimulang magstream ng randomized na video data na walang audio tungo sa iyong channel. Kung kaya mo, ipinapayo na pansamantalang patayin ang pagsa-save ng mga bidyo ng mga stream at itakda sa stream na private hanggang matapos ang pagsubok. Tuloy?"
+Basic.AutoConfig.TestPage="Mga Huling Resulta"
+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.Connecting="Kumukunekta sa: %1..."
-Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Bigong kumunekta sa alin mang server, paki tignan ang koneksyon ng iyong internet at subukan ulet."
+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="Pagsusuri ng bandwidth para sa: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="Testingin ang stream encoder, ito ay maaaring tumagal ng isang minuto..."
 Basic.AutoConfig.TestPage.TestingRecordingEncoder="Testingin ang recording encoder, ito ay maaaring tumagal ng isang minuto..."
@@ -139,30 +186,38 @@
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streaming Encoder"
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Recording Encoder"
 Basic.AutoConfig.TestPage.Result.Header="Ang program na ito ay napagkaisahan na ang settings tinatayang lahat ay perpekto para sayo:"
-Basic.AutoConfig.TestPage.Result.Footer="Para sa pag gamit ng settings, pindutin ang Apply Settings. Para ma reconfigure ang wizard at simulan muli, pindutin ang Back. Mano-mano i-configure ang settings, at pindutin ang Cancel at buksan ang Settings."
+Basic.AutoConfig.TestPage.Result.Footer="Para gamitin ang mga setting na ito, pindutin ang Apply Settings. Para ma-reconfigure ang wizard at ulitin, pindutin ang Bumalik. Para mano-manong i-configure ang settings, pindutin ang Kanselahin at buksan ang Settings."
+Basic.AutoConfig.Info="Ang auto-configuration wizard ay magpapasiya ng pinakamabuting settings batay sa iyong computer specs at bilis ng internet."
+Basic.AutoConfig.RunAnytime="Maaaring itong patakbuhin kahit kailan sa pamamagitan ng pagpunta sa menu ng Mga Kasangkapan."
 
 Basic.Stats="Ang mga Statisktika"
 Basic.Stats.CPUUsage="Ang nagamit na CPU"
-Basic.Stats.MemoryUsage="Ang nagamit na Memory"
+Basic.Stats.HDDSpaceAvailable="Magagamit sa disk"
+Basic.Stats.MemoryUsage="Nagamit na Memory"
 Basic.Stats.AverageTimeToRender="Ang average time para ma render ang frame"
 Basic.Stats.SkippedFrames="Laktawin ang frames dahil sa encoding lag"
 Basic.Stats.MissedFrames="Nalampasan ang frames dahil sa rendering lag"
 Basic.Stats.Output.Stream="Stream"
 Basic.Stats.Output.Recording="Recording"
-Basic.Stats.Status="Ang estado"
-Basic.Stats.Status.Recording="Recording"
-Basic.Stats.Status.Live="Naka LIVE"
+Basic.Stats.Status="Kalagayan"
+Basic.Stats.Status.Recording="Nagrerecord"
+Basic.Stats.Status.Live="Naka-LIVE"
 Basic.Stats.Status.Reconnecting="Muling kumukonekta"
-Basic.Stats.Status.Inactive="Hindi na aktiba"
-Basic.Stats.DroppedFrames="Naihulog na Frames (Network)"
-Basic.Stats.MegabytesSent="Ang total na Data Output"
+Basic.Stats.Status.Inactive="Di-aktibo"
+Basic.Stats.Status.Active="Aktibo"
+Basic.Stats.DroppedFrames="Nalaglag na mga Frame (Network)"
+Basic.Stats.MegabytesSent="Kabuoang Nilabas na Data"
 Basic.Stats.Bitrate="Bitrate"
+Basic.Stats.DiskFullIn="Mapupuno sa loob ng halos"
+Basic.Stats.ResetStats="I-reset ang Stats"
 
+ResetUIWarning.Title="Sigurado ka bang nais mong i-reset ang UI?"
+ResetUIWarning.Text="Ang pagbalik sa dati ng UI ay magtatago ng mga karagdagang dock. Kakailanganin mong palabasin ang mga dock na ito mula sa view menu kung nais mong sila'y makita.\n\nSigurado ka bang nais mong ibalik sa dati ang UI?"
 
-Updater.Title="Available ang bagong pag-update"
-Updater.Text="May bagong update na magagamit:"
-Updater.UpdateNow="Mag update ngayon"
-Updater.RemindMeLater="Paalalahanan mo ako mamaya"
+Updater.Title="May bagong update na"
+Updater.Text="Mayroon nang bagong update:"
+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"
@@ -171,10 +226,10 @@
 Updater.FailedToLaunch="Nabigong ilunsad ang updater"
 Updater.GameCaptureActive.Title="Kumuha ng laro na aktibo"
 
-QuickTransitions.SwapScenes="Swap Preview / Output Scenes Pagkatapos Transitioning"
-QuickTransitions.SwapScenesTT="Mag swap ng mga preview at output scenes matapos ang transitioning (Kung may orihinal na output scene na umiiral).\nIto ay hindi pwede baguhin ang orihinal na eksena."
-QuickTransitions.DuplicateScene="Gayahin ang eksena"
-QuickTransitions.DuplicateSceneTT="Kung mag i-edit ng parehas na eksena. pinapayag ang editing transform/visibility of sources kahit baguhin ang output.\nPara ma edit ang properties wag baguhin ang output, paganahin 'Duplicate Sources'.\nAng pagbago ng kalidad nito ay maaaring ma reset ang eksena (kung ito ay umiiral pa rin)."
+QuickTransitions.SwapScenes="Pagpalitin ang Pribyu/Bunga na Eksena Matapos ang Pagbabago"
+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="Doblehin ang Eksena"
+QuickTransitions.DuplicateSceneTT="Kapag ineedit ang parehas na eksena, pinapayagan ang pagbabago ng anyo/kakayahang makita ng mga bukal nang hindi binabago ang bunga.\nPara mabago ang mga katangian ng mga bukal nang hindi binabago ang bunga, paganahin ang 'Doblehin ang mga Bukal'.\nMare-reset ang kasalukuyang eksenang bunga kapag binago ito (kung ito ay umiiral pa rin)."
 QuickTransitions.EditProperties="Gayahin ang mga pinagmulang"
 QuickTransitions.EditPropertiesTT="Kung mag i-edit ng kaparehas na eksena. payagan mag edit ng katangian ng mga pinagkukunan nang hindi binabago ang output.\nIto ay magagamit king 'Duplicate Scene' ay pinagana.\nAng mga pinagkukunan(gaya ng nakuhang media sources) hindi suportado at di pwede ma edit nang hiwalay.\nAng pagbago ng value nito ay maaaring ma reset ang kasulukuyang output scene(kung mayroon pa).\n\nBabala: Dahil sa pinagkukunan ay magiging doble, ito ay nangangailangan ng ekstrang sistema or video pagkukunan."
 QuickTransitions.HotkeyName="Ilipat ng mabilis: %1"
@@ -182,7 +237,7 @@
 Basic.AddTransition="Magdagdag ng configurable na transisyon"
 Basic.RemoveTransition="Tangalin ang configurable transition"
 Basic.TransitionProperties="Mga Properties ng Transisyon"
-Basic.SceneTransitions="Mga transisyon ng mga eksena"
+Basic.SceneTransitions="Pagbabago ng mga Eksena"
 Basic.TransitionDuration="Katagalan"
 Basic.TogglePreviewProgramMode="Ang Studio Mode"
 
@@ -190,7 +245,7 @@
 TransitionNameDlg.Title="Pangalan ng Transisyon"
 
 TitleBar.Profile="Ang Profile"
-TitleBar.Scenes="Ang mga Eksena"
+TitleBar.Scenes="Mga Eksena"
 
 NameExists.Title="Ang pangalan ay umiiral na"
 NameExists.Text="Ang pangalan ay nagamit na."
@@ -204,20 +259,24 @@
 ConfirmStop.Title="Itigil ba ang Steam?"
 ConfirmStop.Text="Sigurado ka itigil ang pag i-stream?"
 
+ConfirmStopRecord.Title="Itigil ang Pagrerecord?"
+ConfirmStopRecord.Text="Sigurado ka bang nais mong itigil ang pagrerecord?"
 
+ConfirmBWTest.Title="Simulan ang Pagsusuri ng Bandwidth?"
 
 ConfirmExit.Title="Lumabas sa OBS?"
-ConfirmExit.Text="Ang OBS ay kasulukuyang aktibo. Lahat ng streams/recordings ay magsasara. Sigurado ka ba gusto mong mag exit?"
+ConfirmExit.Text="Ang OBS ay kasulukuyang aktibo. Lahat ng stream o recording ay papatayin. Sigurado ka bang gusto mong umalis?"
 
 ConfirmRemove.Title="I-kumpirma ang pagtangal"
-ConfirmRemove.Text="Sigurado ka bang tangalin ang '$1'?"
-ConfirmRemove.TextMultiple="Sigurado ka bang tangalin %1 items?"
+ConfirmRemove.Text="Sigurado ka bang nais mong tanggalin ang '$1'?"
+ConfirmRemove.TextMultiple="Sigurado ka bang nais mong alisin ang %1 na mga bagay?"
 
-Output.StartStreamFailed="Bigong simulang ang pag stream"
-Output.StartRecordingFailed="Bigong simulan ang pag record"
-Output.StartReplayFailed="Bigong simulang ang replay buffer"
+Output.StartStreamFailed="Nabigong simulan ang pag-stream"
+Output.StartRecordingFailed="Nabigong simulan ang pag-record"
+Output.StartReplayFailed="Nabigong simulan ang replay buffer"
 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.ConnectFail.Title="Bigung kumunekta"
 Output.ConnectFail.BadPath="Hindi wasto ang Path or ang Connection URL. Pakitingnan ang settings para ma kumpirma na ito ay pwede."
@@ -233,23 +292,29 @@
 Output.RecordNoSpace.Msg="Di sapat ang espasyo para ipatuloy ang pagrerekord."
 Output.RecordError.Title="May error sa pagrekord"
 Output.RecordError.Msg="Hindi tiyak na error habang nagrerekord."
-Output.ReplayBuffer.NoHotkey.Title="Walang set ng hotkey!"
-Output.ReplayBuffer.NoHotkey.Msg="Walang na i-save na hotkey para sa replay buffer. Paki \"Save\" ang gagamiting hotkey para ma i-save ang replay recordings."
 
 Output.BadPath.Title="Di mabuting File Path"
 Output.BadPath.Text="Ang na configured na file output path ay di di-wasto. Pakitignan ang iyong settings para ma kumpirma na balido ang file path at na i-set ito."
 
 LogReturnDialog="Ang na i-uload na log ay tagumpay"
 LogReturnDialog.CopyURL="Kupyahin ang URL"
+LogReturnDialog.AnalyzeURL="Suriin"
 LogReturnDialog.ErrorUploadingLog="Error sa pag upload ng log file"
 
 Remux.SourceFile="Obs Recording"
 Remux.TargetFile="Target File"
 Remux.Remux="Remux"
+Remux.Stop="Itigil ang Pagre-remux"
+Remux.ClearFinished="Alisin ang mga Tapos na"
+Remux.ClearAll="Alisin Lahat"
 Remux.OBSRecording="OBS Recording"
 Remux.FinishedTitle="Tapos na ang Remuxing"
 Remux.Finished="Ang Recording remuxed"
 Remux.FinishedError="Ang Recording Remuxed, pero ang file ay hindi kumpleto"
+Remux.SelectRecording="Pumili ng ni-record ng OBS..."
+Remux.SelectTarget="Pumili ng patutunguhang file..."
+Remux.FileExistsTitle="Ang napiling mga file ay umiiral na"
+Remux.FileExists="Ang mga sumusunod na piniling file ay umiiral na. Nais mo bang palitan ang mga ito?"
 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?"
 
@@ -274,6 +339,7 @@
 ScaleFiltering.Bilinear="Bilinear"
 ScaleFiltering.Bicubic="Bicubic"
 ScaleFiltering.Lanczos="Lanczos"
+ScaleFiltering.Area="Laki"
 
 Deinterlacing="Deinterlacing"
 Deinterlacing.Discard="Baliwalain"
@@ -292,15 +358,15 @@
 VolControl.Mute="Mute '%1'"
 VolControl.Properties="Mga katangian '%1'"
 
-Basic.Main.AddSceneDlg.Title="Magdagdag ng mga eksena"
-Basic.Main.AddSceneDlg.Text="Pakiusap lagyan ng pangalan ang eksena"
+Basic.Main.AddSceneDlg.Title="Magdagdag ng mga Eksena"
+Basic.Main.AddSceneDlg.Text="Pakilagay ang pangalan ng eksena"
 
 Basic.Main.DefaultSceneName.Text="Eksena %1"
 
-Basic.Main.AddSceneCollection.Title="Magdagdag ng Collection ng Eksena"
+Basic.Main.AddSceneCollection.Title="Magdagdag ng Koleksyon ng Eksena"
 Basic.Main.AddSceneCollection.Text="Mangyaring ipasok ang pangalan ng koleksyon ng eksena"
 
-Basic.Main.RenameSceneCollection.Title="I-rename ang Scene Collection"
+Basic.Main.RenameSceneCollection.Title="Pangalanang muli ang Koleksyon ng Eksena"
 
 AddProfile.Title="Magdagdag ng Profile"
 AddProfile.Text="Pakipasok ang pangalan ng profile"
@@ -323,8 +389,8 @@
 Basic.PropertiesWindow.SelectFont="Piliin ang 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 magagamit na mga ari-arian"
-Basic.PropertiesWindow.AddFiles="Magdagdag ng Mga File"
+Basic.PropertiesWindow.NoProperties="Walang makikitang mga katangian"
+Basic.PropertiesWindow.AddFiles="Magdagdag ng mga File"
 Basic.PropertiesWindow.AddDir="Magdagdag ng Direktoryo"
 Basic.PropertiesWindow.AddURL="Magdagdag ng Path / URL"
 Basic.PropertiesWindow.AddEditableListDir="Magdagdag ng direktoryo sa '%1'"
@@ -354,15 +420,15 @@
 Basic.Filters.AddFilter.Title="Salain ang pangalan"
 Basic.Filters.AddFilter.Text="Mangyaring tukuyin ang pangalan ng filter"
 
-Basic.TransformWindow="Pagbabago ng Eksena ng Eksena"
-Basic.TransformWindow.Position="Posisyon"
+Basic.TransformWindow="Pagbabago ng Bagay ng Eksena"
+Basic.TransformWindow.Position="Puwesto"
 Basic.TransformWindow.Rotation="Pag-ikot"
 Basic.TransformWindow.Size="Sukat"
 Basic.TransformWindow.Alignment="Positional Alignment"
-Basic.TransformWindow.BoundsType="Bounding ng klase ng kahon"
-Basic.TransformWindow.BoundsAlignment="Ang pagkahanay ng Bounding Kahon"
-Basic.TransformWindow.Bounds="Ang Bounding Box Size"
-Basic.TransformWindow.Crop="I-crop ito"
+Basic.TransformWindow.BoundsType="Uri ng Hangganang Kahon"
+Basic.TransformWindow.BoundsAlignment="Pagkahanay ng Hangganang Kahon"
+Basic.TransformWindow.Bounds="Sukat ng Hangganang Kahon"
+Basic.TransformWindow.Crop="Putol"
 
 Basic.TransformWindow.Alignment.TopLeft="Sa taas na kaliwa"
 Basic.TransformWindow.Alignment.TopCenter="Sa gintang ibabaw"
@@ -375,30 +441,36 @@
 Basic.TransformWindow.Alignment.BottomRight="Baba sa Kanan"
 
 Basic.TransformWindow.BoundsType.None="Walang hangganan"
-Basic.TransformWindow.BoundsType.MaxOnly="Pinakamalaki na sukat lamang"
-Basic.TransformWindow.BoundsType.ScaleInner="Sukat sa panloob na hangganan"
-Basic.TransformWindow.BoundsType.ScaleOuter="Sukat sa panlabas na hangganan"
-Basic.TransformWindow.BoundsType.ScaleToWidth="Sukat sa lapad ng hangganan"
-Basic.TransformWindow.BoundsType.ScaleToHeight="Sukat sa taas ng hangganan"
-Basic.TransformWindow.BoundsType.Stretch="Mag-stretch sa hangganan"
+Basic.TransformWindow.BoundsType.MaxOnly="Pinakamalaking sukat lang"
+Basic.TransformWindow.BoundsType.ScaleInner="Humugis sa panloob na hangganan"
+Basic.TransformWindow.BoundsType.ScaleOuter="Humugis sa panlabas na hangganan"
+Basic.TransformWindow.BoundsType.ScaleToWidth="Humugis sa lapad ng hangganan"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Humugis sa taas ng hangganan"
+Basic.TransformWindow.BoundsType.Stretch="Umunat hanggang sa hangganan"
 
-Basic.Main.AddSourceHelp.Title="Hindi maaring magdagdag ng pinagmulan"
-Basic.Main.AddSourceHelp.Text="Kailangan mong magkaroon ng hindi bababa sa isang eksena sa pinagmulan."
+Basic.Main.AddSourceHelp.Title="Hindi Makapagdagdag ng Bukal"
+Basic.Main.AddSourceHelp.Text="Kailangan mong magkaroon ng kahit isang eksena para magdagdag ng bukal."
 
-Basic.Main.Scenes="Mga eksena"
+Basic.Main.Scenes="Mga Eksena"
 Basic.Main.Sources="Pinagmulan"
 Basic.Main.Controls="Mga kontrol"
 Basic.Main.Connecting="Kumukonekta..."
 Basic.Main.StartRecording="Simula ng Pagtatala"
 Basic.Main.StartReplayBuffer="Simulan na ang pag Replay Buffer"
 Basic.Main.StartStreaming="Simulan ang mag stream"
+Basic.Main.StartVirtualCam="Simulan ang Virtual Camera"
 Basic.Main.StopRecording="Itigil ang Pagtatala"
+Basic.Main.PauseRecording="I-pause ang Pagrerecord"
+Basic.Main.UnpauseRecording="Ituloy ang Pagrerecord"
 Basic.Main.StoppingRecording="Pagtigil sa Pagtatala..."
 Basic.Main.StopReplayBuffer="Itigil ang pag Re-replay Buffer"
 Basic.Main.StoppingReplayBuffer="Pagtigil sa Pagre-Replay Buffer..."
 Basic.Main.StopStreaming="Itiigil ang Pag-stream"
 Basic.Main.StoppingStreaming="Pagtigil sa Pag-stream..."
 Basic.Main.ForceStopStreaming="Itigil ang Pag-stream (Iwaksi ang Pagkaantala)"
+Basic.Main.ShowContextBar="Ipakita ang Toolbar ng Source"
+Basic.Main.HideContextBar="Itago ang Toolbar ng Source"
+Basic.Main.StopVirtualCam="Itigil ang Virtual Camera"
 Basic.Main.Group="Grupo %1"
 Basic.Main.GroupItems="I-grupo ang napiling mga aytem"
 Basic.Main.Ungroup="Alisin sa Grupo"
@@ -424,24 +496,26 @@
 Basic.MainMenu.Edit.Scale.Window="Scale to Window"
 Basic.MainMenu.Edit.Scale.Canvas="Kanbas (%1x%2)"
 Basic.MainMenu.Edit.Scale.Output="Output (%1x%2)"
-Basic.MainMenu.Edit.Transform="&Transform"
-Basic.MainMenu.Edit.Transform.EditTransform="Baguhin ang Transform... (&E)"
-Basic.MainMenu.Edit.Transform.CopyTransform="Kopyahin ang Transform"
-Basic.MainMenu.Edit.Transform.PasteTransform="I-paste ang Transform"
-Basic.MainMenu.Edit.Transform.ResetTransform="I-&reset ang Transform"
-Basic.MainMenu.Edit.Transform.Rotate90CW="I-rotate ang 90 degrees CW"
-Basic.MainMenu.Edit.Transform.Rotate90CCW="I-rotate ang 90 degrees CCW"
-Basic.MainMenu.Edit.Transform.Rotate180="I-rotate ang 180 degrees"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="Flip &Horizontal"
-Basic.MainMenu.Edit.Transform.FlipVertical="Flip &Vertical"
-Basic.MainMenu.Edit.Transform.FitToScreen="&Fit sa screen"
-Basic.MainMenu.Edit.Transform.StretchToScreen="Mag-&stretch sa screen"
-Basic.MainMenu.Edit.Transform.CenterToScreen="&Center sa screen"
-Basic.MainMenu.Edit.Order="&Order"
-Basic.MainMenu.Edit.Order.MoveUp="Ilipat at Pataas (&U)"
-Basic.MainMenu.Edit.Order.MoveDown="Ibaba or bumaba (&D)"
+Basic.MainMenu.Edit.Transform="Anyo (&T)"
+Basic.MainMenu.Edit.Transform.EditTransform="Baguhin ang Anyo (&E)..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Kopyahin ang Anyo"
+Basic.MainMenu.Edit.Transform.PasteTransform="I-dikit ang Anyo"
+Basic.MainMenu.Edit.Transform.ResetTransform="I-&reset ang Anyo"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Paikuting 90 degrees pakanan"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Paikuting 90 degrees pakaliwa"
+Basic.MainMenu.Edit.Transform.Rotate180="Paikuting 180 degrees"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Baligtaring Pa&halang"
+Basic.MainMenu.Edit.Transform.FlipVertical="Baligtaring Patayo (&v)"
+Basic.MainMenu.Edit.Transform.FitToScreen="I-sakto sa screen (&f)"
+Basic.MainMenu.Edit.Transform.StretchToScreen="Banatin para sa &screen"
+Basic.MainMenu.Edit.Transform.CenterToScreen="Igitna sa s&creen"
+Basic.MainMenu.Edit.Transform.VerticalCenter="Igitna sa Patayo"
+Basic.MainMenu.Edit.Transform.HorizontalCenter="Igitna sa Pahalang"
+Basic.MainMenu.Edit.Order="Ay&os"
+Basic.MainMenu.Edit.Order.MoveUp="Itaas (&U)"
+Basic.MainMenu.Edit.Order.MoveDown="Ibaba (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Ilipat sa &Tuktok"
-Basic.MainMenu.Edit.Order.MoveToBottom="Ilipat sa Ika (&B)"
+Basic.MainMenu.Edit.Order.MoveToBottom="Ilipat sa Ilalim (&B)"
 Basic.MainMenu.Edit.AdvAudio="&Advanced Audio Properties"
 
 Basic.MainMenu.View="&View"
@@ -449,19 +523,19 @@
 Basic.MainMenu.View.Docks="Docks"
 Basic.MainMenu.View.Docks.ResetUI="I-reset ang UI"
 Basic.MainMenu.View.Docks.LockUI="I-lock ang UI"
-Basic.MainMenu.View.Toolbars.Listboxes="Mga &Listbox"
-Basic.MainMenu.View.SceneTransitions="S&cene Mga Paglilipat"
+Basic.MainMenu.View.ListboxToolbars="Listahan ng Pindutan ng Eksena/Bukal"
+Basic.MainMenu.View.SceneTransitions="Pagbabagong Eksena (&c)"
 Basic.MainMenu.View.StatusBar="&Status bar"
 Basic.MainMenu.View.Fullscreen.Interface="Fullscreen Interface"
 
-Basic.MainMenu.SceneCollection="Kolek&syon ng Eksena"
+Basic.MainMenu.SceneCollection="Koleksyon ng Ek&sena"
 Basic.MainMenu.Profile="&Profile"
 Basic.MainMenu.Profile.Import="Mag-import ng Profile"
 Basic.MainMenu.Profile.Export="I-export ang Profile"
-Basic.MainMenu.SceneCollection.Import="Pag Angkat ng Nakolektang eksena"
-Basic.MainMenu.SceneCollection.Export="Magluwas ng Nakolektang Eksena"
+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 Nakolektang Eksena ay umiiral na ngayon"
+Basic.MainMenu.SceneCollection.Exists="Ang Koleksyon ng Eksena ay umiiral na"
 
 Basic.MainMenu.Tools="Mga Kasangkapan (&T)"
 
@@ -474,22 +548,23 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Mag-upload Kasalukuyang Mag-log ng File (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Mag-up&load Huling pagla-log ng File"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Tignan ang Kasalukuyang pagla-log (&V)"
-Basic.MainMenu.Help.CheckForUpdates="Magsiyasat para sa mga update"
+Basic.MainMenu.Help.CheckForUpdates="Maghanap ng mga Update"
+Basic.MainMenu.Help.About="&Tungkol"
 
 Basic.Settings.ProgramRestart="Ang mga programa ay dapat na-restart para sa mga maaapektuhan na setting."
-Basic.Settings.ConfirmTitle="Konpirmahin ang mga pagbabago"
-Basic.Settings.Confirm="Hindi mo nai-save ang mga pagbabago. Gusto mo bang i-save ang mga pagbabago?"
+Basic.Settings.ConfirmTitle="Kumpirmahin ang mga Pagbabago"
+Basic.Settings.Confirm="May mga hindi na-save na pagbabago. I-save ang mga pagbabago?"
 
 Basic.Settings.General="Pangkalahatan"
 Basic.Settings.General.Theme="Tema"
-Basic.Settings.General.Language="Lenguwahe"
-Basic.Settings.General.EnableAutoUpdates="Awtomatikong pagsusuri para sa mga update tungkol sa startup"
+Basic.Settings.General.Language="Wika"
+Basic.Settings.General.EnableAutoUpdates="Kusang maghanap ng mga update sa pasimula"
 Basic.Settings.General.OpenStatsOnStartup="Magbukas ng palitang-usap ng awtomatikongng stats tungkol sa startup"
 Basic.Settings.General.WarnBeforeStartingStream="Ipakita ang konpirmasyon ng palitang-usap nang magsimula ang mga stream"
 Basic.Settings.General.WarnBeforeStoppingStream="Ipakita ang konpirmasyon ng palitang-usap nang ihinto ang mga stream"
 Basic.Settings.General.Projectors="Mga prodyektor"
-Basic.Settings.General.HideProjectorCursor="Itago ang kursor sa kabila ng mga prodyektor"
-Basic.Settings.General.ProjectorAlwaysOnTop="Gumawa ng mga prodyektor na laging nakakataas"
+Basic.Settings.General.HideProjectorCursor="Itago ang kursor sa harap ng mga prodyektor"
+Basic.Settings.General.ProjectorAlwaysOnTop="Gawing laging nakakataas ang mga prodyektor"
 Basic.Settings.General.Snapping="Pinagmulan ng Paghahanay na isnaping"
 Basic.Settings.General.ScreenSnapping="Paglagot sa mga Pinagmulan ukol sa gilid ng iskrin"
 Basic.Settings.General.CenterSnapping="Paglagot sa mga Pinagmulan ukol sa pahalang at patayong sentro"
@@ -503,30 +578,44 @@
 Basic.Settings.General.SysTrayWhenStarted="Magbawas sa bandehadong sistema kapag nagsimula na"
 Basic.Settings.General.SystemTrayHideMinimize="Palaging magbawas sa bandehadong sistema sa halip na task bar"
 Basic.Settings.General.SaveProjectors="I-save ang mga prodyektor sa labasan"
-Basic.Settings.General.SwitchOnDoubleClick="Paglipat sa eksena kahit makadalawang-pindot"
+Basic.Settings.General.Preview="Pribyu"
+Basic.Settings.General.AutomaticCollectionSearch="Maghanap sa mga kilalang lugar para sa mga koleksyon ng eksena kapag nag-aangkat"
+Basic.Settings.General.SwitchOnDoubleClick="Lumipat sa eksena kapag nakadalawang-pindot"
 Basic.Settings.General.StudioPortraitLayout="Paganahin ang larawan/vertical layout"
+Basic.Settings.General.Multiview.MouseSwitch="Pindutin para lumipat sa mga eksena"
+Basic.Settings.General.Multiview.DrawSourceNames="Ipakita ang mga pangalan ng eksena"
 Basic.Settings.General.MultiviewLayout="Multiview Layout"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Pahalang, Taas (8 Eksena)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Pahalang, Baba (8 Eksena)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Patayo, Kaliwa (8 Eksena)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Patayo, Kanan (8 Eksena)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Pahalang, Taas (24 Eksena)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Mga uri ng Stream"
-
-Basic.Settings.Output="Ang awput"
+Basic.Settings.Stream.Custom.UseAuthentication="Gumamit ng pagpapatunay"
+Basic.Settings.Stream.Custom.Username="Pangalan"
+Basic.Settings.Stream.Custom.Password="Password"
+Basic.Settings.Stream.TTVAddon.None="Wala"
+Basic.Settings.Stream.TTVAddon.Both="BetterTTV at FrankerFaceZ"
+Basic.Settings.Stream.StreamSettingsWarning="Buksan ang mga Setting"
+
+Basic.Settings.Output="Bunga"
 Basic.Settings.Output.Format="Pagtatala ng recording"
 Basic.Settings.Output.Encoder="Encoder"
 Basic.Settings.Output.SelectDirectory="Piliin ang direktoryong pagtatala"
 Basic.Settings.Output.SelectFile="Piliin ang file ng pagtatala"
 Basic.Settings.Output.EnforceBitrate="Ipatupad ang serbisyo ng limitadong bitrate"
-Basic.Settings.Output.Mode="Awput Mode"
+Basic.Settings.Output.Mode="Uri ng Pagbunga"
 Basic.Settings.Output.Mode.Simple="Simple"
 Basic.Settings.Output.Mode.Adv="Pagsulong"
-Basic.Settings.Output.Mode.FFmpeg="FFmpeg Awput"
+Basic.Settings.Output.Mode.FFmpeg="Bungang FFmpeg"
 Basic.Settings.Output.UseReplayBuffer="Simulan ang pag replay ng buffer"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Pinakamataas na memorya (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Ang na estimang nagamit na memorya: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Hindi ma-estima ang nagamit na memorya. Pakilagay ng pinakamataas na limitasyon ng memorya."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Siguraduhin na naka takda ang hotkey para sa pag replay ng buffer sa bahaging hotkeys)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Ang panlapi ng Replay Buffer Filename"
-Basic.Settings.Output.ReplayBuffer.Suffix="Suffix"
+Basic.Settings.Output.ReplayBuffer.Suffix="Hulapi"
 Basic.Settings.Output.Simple.SavePath="Recording Path"
 Basic.Settings.Output.Simple.RecordingQuality="Pagrekord ng Kalidad"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Parehong stream"
@@ -555,7 +644,7 @@
 Basic.Settings.Output.Adv.Rescale="Rescale Output"
 Basic.Settings.Output.Adv.AudioTrack="Audio Track"
 Basic.Settings.Output.Adv.Streaming="Streaming"
-Basic.Settings.Output.Adv.ApplyServiceSettings="Ipatupad ang mga setting ng encoder ng streaming ng serbisyo"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Ipatupad ang mga setting ng encoder ng streaming service"
 Basic.Settings.Output.Adv.Audio.Track1="Subaybayan ang 1"
 Basic.Settings.Output.Adv.Audio.Track2="Subaybayan ang 2"
 Basic.Settings.Output.Adv.Audio.Track3="Subaybayan ang 3"
@@ -592,6 +681,8 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Ang pagitan ng Keyframe (frames)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Ipakita lahat ng codecs (kahit itoy posibleng di-kompatibol)"
 
+Screenshot.Scene="Kuha ng Screen (Eksena)"
+
 
 
 Basic.Settings.Video="Bidyo"
@@ -622,7 +713,6 @@
 Basic.Settings.Audio.MeterDecayRate.Medium="Katamtaman (Tipo I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Mabagal (Tipo II PPM)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="Babala: Ang Surround sound audio ay naka andar."
-Basic.Settings.Audio.MultichannelWarning="Kung nag streaming, paki tignan kung ang iyong streaming service ay parehong supportado ang surround sound ingest at surround sound playback. Facebook, 360 Live, Mixer RTMP, Smashcast ay ang mga halimbawa kung saan ang surround sound ay ganap na suportado, pati YouTube Live umaandar lamang sa dawalang channels.\n\nOBS audio filters ay kompatibol lamang sa surround sound, pero hindi siguradong supportado ang VST plugin."
 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.EnablePushToMute="Paganahin ang Push-to-mute"
@@ -646,6 +736,7 @@
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="I-Default"
 Basic.Settings.Advanced.Audio.DisableAudioDucking="Huwag paganahin ang Windows audio ducking"
 Basic.Settings.Advanced.StreamDelay="Ang Antala ng Stream"
+Basic.Settings.Advanced.StreamDelay.Duration="Katagalan"
 Basic.Settings.Advanced.StreamDelay.Preserve="Ingatang ang cutoff point (pataas ng antala) kapang kumokonekta"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Ang na estimang nagamit na memorya: %1 MB"
 Basic.Settings.Advanced.Network="Network"
@@ -653,6 +744,7 @@
 
 Basic.AdvAudio="Ang aria-arian ng Advanced Audio"
 Basic.AdvAudio.Name="Pangalan"
+Basic.AdvAudio.Balance="Balanse"
 Basic.AdvAudio.Monitoring="Ang subaybay ng Audio"
 Basic.AdvAudio.Monitoring.None="I-Off ang Monitor"
 Basic.AdvAudio.Monitoring.MonitorOnly="Monitor lamang (i-mute ang output)"
@@ -710,21 +802,33 @@
 Push-to-mute="Pindutin-para-i-mute"
 Push-to-talk="Pindutan-para-magsalita"
 
-SceneItemShow="Ipakita '%1'"
-SceneItemHide="Itago '%1'"
+SceneItemShow="Ipakita ang '%1'"
+SceneItemHide="Itago ang '%1'"
 
 OutputWarnings.NoTracksSelected="Dapat pumili ka ng kahit isang track"
 
-FinalScene.Title="Tanggaling ang Eksena"
-FinalScene.Text="Doon kailangan ng kahit isang eksena."
+FinalScene.Title="Tanggal-Eksena"
+FinalScene.Text="Kailangang mayroong kahit isang eksena."
+
+
 
 
+About="Tungkol dito"
+About.License="Lisensya"
 
+AddUrl.Text.Url="URL: %1"
 
+ResizeOutputSizeOfSource.Continue="Gusto mo bang magpatuloy?"
 
 
+Importer="Pang-angkat ng Koleksyon ng Eksena"
+Importer.SelectCollection="Pumili ng Koleksyon ng Eksena"
+Importer.Collection="Koleksyon ng Eksena"
+Importer.AutomaticCollectionPrompt="Awtomatikong Maghanap ng mga Koleksyon ng Eksena"
+Importer.AutomaticCollectionText="Kaya ng OBS na kusang maghanap ng maaangkas na koleksyon ng eksena mula sa mga suportadong third-party program. Nais mo bang kusang maghanap ng mga koleksyon ang OBS para sa iyo?\n\nMaaari mo itong palitan mamaya sa Settings > General > Importers."
 
 
+Restart="I-restart"

obs-studio-25.0.8.tar.xz/UI/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/fr-FR.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Français"
-Region="France"
 
 OK="Ok"
 Apply="Appliquer"
@@ -38,6 +37,7 @@
 SourceWindow="Projecteur fenêtré (source)"
 MultiviewProjector="Multi-aperçu (Plein écran)"
 MultiviewWindowed="Multi-aperçu (Fenêtré)"
+ResizeProjectorWindowToContent="Ajuster la fenêtre au contenu"
 Clear="Effacer"
 Revert="Annuler"
 Show="Afficher"
@@ -47,8 +47,8 @@
 New="Nouveau"
 Duplicate="Dupliquer"
 Enable="Activer"
-DisableOSXVSync="Désactiver la synchronisation verticale de macOS"
-ResetOSXVSyncOnExit="Réinitialiser la synchronisation verticale de macOS en quittant"
+DisableOSXVSync="Désactiver la synchronisation verticale de macOS (V-Sync)"
+ResetOSXVSyncOnExit="Réinitialiser la synchronisation verticale de macOS à la fermeture"
 HighResourceUsage="Encodage en surcharge ! Pensez à revoir vos paramètres vidéo à la baisse ou utilisez un préréglage d'encodage plus rapide."
 Transition="Transition"
 QuickTransitions="Transitions rapides"
@@ -87,13 +87,21 @@
 Fullscreen="Plein écran"
 Windowed="Fenêtré"
 Percent="Pourcentage"
+RefreshBrowser="Actualiser"
 AspectRatio="Format d'image <b>%1:%2</b>"
 LockVolume="Verrouiller le volume"
+LogViewer="Voir les logs"
+ShowOnStartup="Afficher au démarrage"
+OpenFile="Ouvrir le fichier"
+AddValue="Ajouter %1"
 
 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 quitter toute autre instance active d'OBS (y compris celles minimisées dans la zone de notifications) avant d'en ouvrir une nouvelle."
 AlreadyRunning.LaunchAnyway="Démarrer tout de même"
 
+ChromeOS.Title="Plateforme non prise en charge"
+ChromeOS.Text="OBS semble fonctionner dans un conteneur ChromeOS. Cette plateforme n'est pas prise en charge"
+
 DockCloseWarning.Title="Fermer une fenêtre dockable"
 DockCloseWarning.Text="Vous venez de fermer une fenêtre dockable. Si vous souhaitez l'afficher à nouveau, utilisez le menu Afficher → Docks dans la barre de menus."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Asie"
 BandwidthTest.Region.Other="Autre"
 
-Basic.FirstStartup.RunWizard="Souhaitez-vous lancer l'Assistant de configuration ? Vous pouvez aussi configurer manuellement vos paramètres en cliquant sur le bouton \"Paramètres\" situé dans la fenêtre principale."
-Basic.FirstStartup.RunWizard.NoClicked="Si vous changez d’avis, vous pouvez ré-exécuter l’Assistant de configuration automatique à n’importe quel moment depuis le menu Outils."
-
 Basic.AutoConfig="Assistant de Configuration automatique"
 Basic.AutoConfig.ApplySettings="Appliquer les paramètres"
 Basic.AutoConfig.StartPage="Informations sur l’utilisation"
 Basic.AutoConfig.StartPage.SubTitle="Sélectionnez le cas ci-dessous qui vous corresponds le mieux"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimiser pour la diffusion en direct, l’enregistrement est secondaire"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimiser pour l’enregistrement, je ne diffuse pas"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Je n'utiliserai que la caméra virtuelle"
 Basic.AutoConfig.VideoPage="Paramètres vidéo"
-Basic.AutoConfig.VideoPage.SubTitle="Spécifiez les réglages vidéo que vous souhaitez utiliser"
+Basic.AutoConfig.VideoPage.SubTitle="Précisez les réglages vidéos que vous souhaitez utiliser"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Garder tel quel (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Écran %1 (%2x%3)_"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Garder tel quel (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Erreur d'enregistrement"
 Basic.AutoConfig.TestPage.Result.Header="Le programme vous recommande ces paramètres :"
 Basic.AutoConfig.TestPage.Result.Footer="Pour utiliser ces paramètres, cliquez sur « Appliquer les paramètres ». Pour reconfigurer l’Assistant et essayer de nouveau, cliquez sur « Précédent ». Pour configurer les paramètres vous-même, cliquez sur « Annuler » et rendez-vous dans les Paramètres."
+Basic.AutoConfig.Info="L'assistant de configuration automatique déterminera les meilleurs paramètres en fonction des spécifications de votre ordinateur et du débit internet."
+Basic.AutoConfig.RunAnytime="Cet assistant peut être lancé à tout moment en allant dans le menu Outils."
 
 Basic.Stats="Statistiques"
 Basic.Stats.CPUUsage="Utilisation Processeur"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Aucun raccourci clavier défini !"
-Output.ReplayBuffer.NoHotkey.Msg="Aucun raccourci clavier défini pour le tampon de relecture. Veuillez en définir un pour utiliser cette fonction."
 
 Output.BadPath.Title="Chemin d'accès au fichier incorrect"
 Output.BadPath.Text="Le chemin configuré pour le flux sortant est invalide. Veuillez vérifier vos paramètres pour confirmer la présence d'un chemin valide."
 
 LogReturnDialog="Mise en ligne du journal réussie"
+LogReturnDialog.Description="Votre fichier journal a été téléversé. Vous pouvez maintenant partager l'URL à des fins de débogage ou de support."
+LogReturnDialog.Description.Crash="Votre rapport de plantage a été téléversé. Vous pouvez maintenant partager l'URL à des fins de débogage."
 LogReturnDialog.CopyURL="Copier l'adresse"
+LogReturnDialog.AnalyzeURL="Analyser"
 LogReturnDialog.ErrorUploadingLog="Échec de la mise en ligne du journal"
 
 Remux.SourceFile="Enregistrement OBS"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Démarrer le tampon de relecture"
 Basic.Main.SaveReplay="Sauvegarder la relecture"
 Basic.Main.StartStreaming="Commencer le streaming"
+Basic.Main.StartVirtualCam="Démarrer la caméra virtuelle"
 Basic.Main.StopRecording="Arrêter l'enregistrement"
 Basic.Main.PauseRecording="Mettre en pause l'enregistrement"
 Basic.Main.UnpauseRecording="Reprendre l'enregistrement"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Arrêter le streaming"
 Basic.Main.StoppingStreaming="Arrêt du stream..."
 Basic.Main.ForceStopStreaming="Arrêter le streaming (annule le retard)"
+Basic.Main.ShowContextBar="Afficher la barre d'outils Sources"
+Basic.Main.HideContextBar="Cacher la barre d'outils Sources"
+Basic.Main.StopVirtualCam="Arrêter la caméra virtuelle"
 Basic.Main.Group="Groupe %1"
 Basic.Main.GroupItems="Grouper les éléments sélectionnés"
 Basic.Main.Ungroup="Dissocier"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Réinitialiser l'Interface"
 Basic.MainMenu.View.Docks.LockUI="Verrouiller l'Interface"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Docks Internet personnalisés..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Listes"
+Basic.MainMenu.View.ListboxToolbars="Boutons de la liste Scène/Source"
+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)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Mémoire maximum (mégaoctets)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Estimation de la mémoire utilisée : %1 Mo"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Impossible d'estimer l'utilisation de la mémoire. Veuillez définir une limite de mémoire maximale."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Remarque : veillez à définir un raccourci clavier pour le tampon de relecture dans la section des raccourcis clavier)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Nom du fichier du tampon commençant par"
 Basic.Settings.Output.ReplayBuffer.Suffix="Finissant par"
 Basic.Settings.Output.Simple.SavePath="Chemin d'accès de l'enregistrement"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervalle d'images clés (en images)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Afficher tous les codecs (même si potentiellement incompatibles)"
 
+Screenshot="Capture d'écran de la sortie"
+Screenshot.SourceHotkey="Capture d'écran de la source sélectionnée"
+Screenshot.StudioProgram="Capture d'écran (programme)"
+Screenshot.Preview="Capture d'écran (aperçu)"
+Screenshot.Scene="Capture d'écran (scène)"
+Screenshot.Source="Capture d'écran (source)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Année, quatre chiffres\n%YY		Année, deux derniers chiffres(00-99)\n%MM		Mois en nombre décimal (01-12)\n%DD		Jour du mois avec zéro d'alignement(01-31)\n%hh		Heure au format 24h (00-23)\n%mm		Minute (00-59)\n%ss		Seconde (00-61)\n%%		Symbole %\n%a		Jour de la semaine abrégé\n%A		Jour de la semaine\n%b		Mois abrégé\n%B		Mois\n%d		Jour du mois avec zéro d'alignement (01-31)\n%H		Heure au format 24h (00-23)\n%I		Heure au format 12h (01-12)\n%m		Mois en nombre décimal (01-12)\n%M		Minute (00-59)\n%p		Désignation AM ou PM\n%S		Second (00-61)\n%y		Année, deux derniers chiffres (00-99)\n%Y		Année\n%z		Décalage ISO 8601 par rapport à l'UTC\n%Z		Nom ou abréviation du fuseau horaire\n%FPS		Images par seconde\n%CRES		Résolution de base du canevas\n%ORES		Résolution de sortie (redimensionnée)\n%VF		Format vidéo"
@@ -750,10 +770,10 @@
 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, Mixer RTMP ou Smashcast sont des exemples de services où le son multicanal est entièrement supporté. Bien que Facebook Live et YouTube Live acceptent l'intégration de son multicanal, Facebook Live 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 n'est pas garanti."
+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.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"
+Basic.Settings.Audio.Devices="Périphériques audio globaux"
 Basic.Settings.Audio.DesktopDevice="Audio du Bureau"
 Basic.Settings.Audio.DesktopDevice2="Audio du Bureau 2"
 Basic.Settings.Audio.AuxDevice="Audio Micro/Auxiliaire"
@@ -917,3 +937,16 @@
 Restart="Redémarrage"
 NeedsRestart="OBS Studio doit être redémarré. Voulez-vous le redémarrer maintenant ?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/gd-GB.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/gd-GB.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Gàidhlig"
-Region="Alba"
 
 OK="Ceart ma-thà"
 Apply="Cuir an sàs"
@@ -47,8 +46,8 @@
 New="Ùr"
 Duplicate="Dùblaich"
 Enable="Cuir an comas"
-DisableOSXVSync="Cuir à comas sioncronachadh-V air OSX"
-ResetOSXVSyncOnExit="Ath-shuidhich sioncronachadh-V air OSX nuar a dh’fhàgar"
+DisableOSXVSync="Cuir à comas sioncronachadh-V air macOS"
+ResetOSXVSyncOnExit="Ath-shuidhich sioncronachadh-V air macOS nuar a dh’fhàgar"
 HighResourceUsage="Tha an còdachadh ro thrang! Feuch an tagh thu roghainnean video nas ìsle no an cleachd thu ro-sheata còdachaidh nas luaithe."
 Transition="Tar-mhùthadh"
 QuickTransitions="Tar-mhùthaidhean luatha"
@@ -88,6 +87,7 @@
 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ù"
 
+
 DockCloseWarning.Title="A’ dùnadh uinneag doca"
 DockCloseWarning.Text="Tha thu air uinneag doca a dhùnadh. Nam gu toigh leat a sealltainn a-rithist, cleachd clàr-taice “Seall” → “Docaichean” air bàr a’ chlàir-thaice."
 
@@ -125,9 +125,6 @@
 BandwidthTest.Region.Asia="Àisia"
 BandwidthTest.Region.Other="Roinn-dùthcha eile"
 
-Basic.FirstStartup.RunWizard="A bheil thu airson draoidh an fhèin-rèiteachaidh a ruith? ’S urrainn dhut na roghainnean agad a rèiteachadh a làimh cuideachd ’s tu a’ briogadh air a’ phutan “Roghainnean” sa phrìomh-uinneag."
-Basic.FirstStartup.RunWizard.NoClicked="Ma chuireas tu an caochladh romhad, ’s urrainn dhut draoidh an fhèin-rèiteachaidh a ruith a-rithist on chlàr-taice “Innealan” uair sam bith."
-
 Basic.AutoConfig="Draoidh an fhèin-rèiteachaidh"
 Basic.AutoConfig.ApplySettings="Cuir na roghainnean an sàs"
 Basic.AutoConfig.StartPage="Fiosrachadh a’ chleachdaidh"
@@ -135,7 +132,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Gleus airson sruthadh is chan eil clàradh cho cudromach sin"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Gleus airson clàradh a-mhàin, cha dèan mi sruthadh"
 Basic.AutoConfig.VideoPage="Roghainnean video"
-Basic.AutoConfig.VideoPage.SubTitle="Sònraich na roghainnean video a bu toigh leat cleachdadh"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="An roghainn làithreach (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Uidheam-taisbeanaidh %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="An roghainn làithreach (%1)"
@@ -283,8 +279,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.ReplayBuffer.NoHotkey.Title="Cha deach grad-iuchair a shuidheachadh!"
-Output.ReplayBuffer.NoHotkey.Msg="Cha deach grad-iuchair sàbhalaidh a shuidheachadh airson bufair na h-ath-chluiche. Suidhich an grad-iuchair “Sàbhail” a thèid a chleachdadh airson clàraidhean air ath-chluichean a shàbhaladh."
 
 Output.BadPath.Title="Droch-shlighe faidhle"
 Output.BadPath.Text="Chan eil an t-slighe às-chuir a chaidh a rèiteachadh dligheach. Thoir sùil air na roghainnean agad airson dearbhadh gun deach slighe faidhle dhligheach a shuidheachadh."
@@ -515,7 +509,6 @@
 Basic.MainMenu.View.Docks.ResetUI="Ath-shuidhich an eadar-aghaidh"
 Basic.MainMenu.View.Docks.LockUI="Glais an eadar-aghaidh"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Docaichean brabhsair gnàthaichte…"
-Basic.MainMenu.View.Toolbars.Listboxes="Bogsaichean-&liosta"
 Basic.MainMenu.View.SceneTransitions="Tar-mhùthaidhean an t-seallaidh (&C)"
 Basic.MainMenu.View.StatusBar="Bàr-&staide"
 Basic.MainMenu.View.Fullscreen.Interface="Eadar-aghaidh làn-sgrìn"
@@ -617,7 +610,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="A’ chuimhne as motha (meaga-baidht)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Tuairmse air cleachdadh na cuimhne: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Chan urrainn dhuinn tuairmse a dhèanamh air cleachdadh na cuimhne. Suidhich crìoch as motha na cuimhne."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(An aire: Dèan cinnteach gun suidhich thu grad-iuchair airson bufair na h-ath-chluiche ann an earrann nan grad-iuchraichean)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Ro-leasachan air ainmean faidhle aig bufair na h-ath-chluiche"
 Basic.Settings.Output.ReplayBuffer.Suffix="Iar-leasachan"
 Basic.Settings.Output.Simple.SavePath="Slighe a’ chlàraidh"
@@ -691,6 +683,7 @@
 
 
 
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Adaptar video"
 Basic.Settings.Video.BaseResolution="Dùmhlachd-bhreacaidh bhunasach (a’ chanabhais)"
@@ -725,10 +718,8 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Ball-sampaill de bharr"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Barr 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, Mixer RTMP is Smashcast 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.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"
 Basic.Settings.Audio.DesktopDevice="Fuaim an deasg"
 Basic.Settings.Audio.DesktopDevice2="Fuaim an deasg 2"
 Basic.Settings.Audio.AuxDevice="Fuaim micreofoin/taice"
@@ -875,3 +866,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/gl-ES.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Galego"
-Region="Galicia"
 
 OK="Aceptar"
 Apply="Aplicar"
@@ -38,6 +37,7 @@
 SourceWindow="Proxector de xanelas (fonte)"
 MultiviewProjector="Vista múltiple (pantalla completa)"
 MultiviewWindowed="Vista múltiple (en xanelas)"
+ResizeProjectorWindowToContent="Axustara xanela ao contido"
 Clear="Limpar"
 Revert="Reverter"
 Show="Amosar"
@@ -87,13 +87,21 @@
 Fullscreen="Pantalla completa"
 Windowed="Na xanela"
 Percent="Porcentaxe"
+RefreshBrowser="Actualizar"
 AspectRatio="Proporción do aspecto <b>%1:%2</b>"
 LockVolume="Bloquear o volume"
+LogViewer="Visor de rexistros"
+ShowOnStartup="Amosar ao iniciar"
+OpenFile="Abrir ficheiro"
+AddValue="Engadir %1"
 
 AlreadyRunning.Title="OBS xa está en execución"
 AlreadyRunning.Text="OBS xa está en execución. A non ser que quixese facer isto, apague as instancias existentes de OBS antes de tentar executar unha nova instancia. Se ten OBS configurado para minimizar na bandexa do sistema, comprobe se aínda está en execución alí."
 AlreadyRunning.LaunchAnyway="Iniciar de todos os xeitos"
 
+ChromeOS.Title="Plataforma non compatíbel"
+ChromeOS.Text="OBS semella estar funcionando dentro dun contedor ChromeOS. Esta plataforma non é compatíbel"
+
 DockCloseWarning.Title="Pechar a xanela ancorábel"
 DockCloseWarning.Text="Acaba de pechar unha xanela ancorábel. Se quere amosalo de novo, use o menú Ver → Docas na barra de menú."
 
@@ -117,6 +125,7 @@
 TwitchAuth.Feed="Fonte de actividades do Twitch"
 TwitchAuth.TwoFactorFail.Title="Non foi posíbel consultar a clave da emisión"
 TwitchAuth.TwoFactorFail.Text="OBS non foi quen de conectarse á súa conta Twitch. Asegúrese de que a autenticación de dous factores estea configurada na súa <a href='https://www.twitch.tv/settings/security'>Configuración de seguridade do Twitch</a> porque é necesaria para facer a emisión."
+RestreamAuth.Channels="Canles Restream"
 
 Copy.Filters="Copiar os filtros"
 Paste.Filters="Pegar filtros"
@@ -130,17 +139,15 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Outra"
 
-Basic.FirstStartup.RunWizard="Quere executar o asistente de configuración automática? Tamén pode configurar manualmente os seus axustes premendo no botón Axustes na xanela principal."
-Basic.FirstStartup.RunWizard.NoClicked="Se cambia de opinión, pode executar o asistente de configuración automática de novo dende o menú Ferramentas."
-
 Basic.AutoConfig="Asistente de configuración automática"
 Basic.AutoConfig.ApplySettings="Aplicar os axustes"
 Basic.AutoConfig.StartPage="Información de uso"
 Basic.AutoConfig.StartPage.SubTitle="Especifique para que quere empregar o programa"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizar para distribución de emisións, a gravación é secundaria"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizar só para gravar, non imos facer distribución de emisións"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Solo usarei a cámara virtual"
 Basic.AutoConfig.VideoPage="Axustes de vídeo"
-Basic.AutoConfig.VideoPage.SubTitle="Especifique os axustes de vídeo que quere empregar"
+Basic.AutoConfig.VideoPage.SubTitle="Especifique os axustes de vídeo que lle gustaría usar"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Usar a actual (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Pantalla %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Usar a actual (%1)"
@@ -182,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificador da gravación"
 Basic.AutoConfig.TestPage.Result.Header="O programa determinou que estes axustes estimados son os máis idóneos para vostede:"
 Basic.AutoConfig.TestPage.Result.Footer="Para usar estes axustes, prema en Aplicar os axustes. Para volver configurar o asistente e téntalo de novo, prema en Atrás. Para configurar manualmente os axustes, prema en Cancelar e abra Axustes."
+Basic.AutoConfig.Info="O asistente de configuración automática determinará os mellores axustes baseandose nas especificacións do seu computador e a velocidade da Internet."
+Basic.AutoConfig.RunAnytime="Isto pódese executar en calquera momento dende o menú Ferramentas."
 
 Basic.Stats="Estatísticas"
 Basic.Stats.CPUUsage="Uso da CPU"
@@ -291,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Non hai estabelecida ningunha tecla rápida!"
-Output.ReplayBuffer.NoHotkey.Msg="Non hai estabelecida ningunha tecla rápida para a memoria temporal de reprodución. Estabeleza a tecla rápida «Gardar» para utilizala para gardar as gravacións de reproducións."
 
 Output.BadPath.Title="Ruta do ficheiro incorrecta"
 Output.BadPath.Text="A ruta dos ficheiros establecida non é válida. Comprobe os axustes para confirmar que foi estabelecida unha ruta válida."
 
 LogReturnDialog="Carga satisfactoria do rexistro"
+LogReturnDialog.Description="O seu ficheiro de rexistro foi enviado. Agora puede compartir o URL para depuración ou asistencia."
+LogReturnDialog.Description.Crash="O seu ficheiro de quebra foi enviado. Agora puede compartir o URL para depuración ou asistencia."
 LogReturnDialog.CopyURL="Copiar o URL"
+LogReturnDialog.AnalyzeURL="Analizar"
 LogReturnDialog.ErrorUploadingLog="Produciuse un erro ao cargar o ficheiro de rexistro"
 
 Remux.SourceFile="Gravación OBS"
@@ -462,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Iniciar a reprodución da memoria temporal"
 Basic.Main.SaveReplay="Gardar a reprodución"
 Basic.Main.StartStreaming="Comezar a emisión"
+Basic.Main.StartVirtualCam="Iniciar a cámara virtual"
 Basic.Main.StopRecording="Deter a gravación"
 Basic.Main.PauseRecording="Pór en pausa a gravación"
 Basic.Main.UnpauseRecording="Reiniciar a gravación"
@@ -471,6 +482,9 @@
 Basic.Main.StopStreaming="Deter a emisión"
 Basic.Main.StoppingStreaming="Detendo a emisión..."
 Basic.Main.ForceStopStreaming="Deter a emisión (desbotar o atraso)"
+Basic.Main.ShowContextBar="Amosar a barra de ferramentas da fonte"
+Basic.Main.HideContextBar="Agochar a barra de ferramentas da fonte"
+Basic.Main.StopVirtualCam="Deter a cámara virtual"
 Basic.Main.Group="Grupo %1"
 Basic.Main.GroupItems="Agrupar os elementos seleccionados"
 Basic.Main.Ungroup="Desagrupar"
@@ -484,7 +498,7 @@
 Basic.MainMenu.File.Remux="Gravacións de conversións (&M)"
 Basic.MainMenu.File.Settings="Axu&stes"
 Basic.MainMenu.File.ShowSettingsFolder="Amosar o cartafol dos axustes"
-Basic.MainMenu.File.ShowProfileFolder="Amosar o cartafol deo perfil"
+Basic.MainMenu.File.ShowProfileFolder="Amosar o cartafol do perfil"
 Basic.MainMenu.AlwaysOnTop="Sempre enriba"
 Basic.MainMenu.File.Exit="Saír (&X)"
 
@@ -526,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Restabelecer a interface de usuario"
 Basic.MainMenu.View.Docks.LockUI="Bloquear a interface de usuario"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Docas personalizadas do navegador..."
-Basic.MainMenu.View.Toolbars.Listboxes="Caixas de &listas"
+Basic.MainMenu.View.ListboxToolbars="Botóns da lista 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"
@@ -639,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memoria máxima (megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Uso estimado da memoria: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Non é posíbel estimar o uso de memoria. Estabeleza o límite máximo de memoria."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Asegúrese de establecer unha tecla rápida para a memoria temporal de reprodución na sección de teclas rápidas)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefixo do nome de ficheiro de reprodución da memoria temporal"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufixo"
 Basic.Settings.Output.Simple.SavePath="Ruta da gravación"
@@ -711,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervalo de fotogramas clave (en fotogramas)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Amosar todos os códecs (aínda que poidan ser incompatíbeis)"
 
+Screenshot="Saída de captura de pantalla"
+Screenshot.SourceHotkey="Captura de pantalla da fonte seleccionada"
+Screenshot.StudioProgram="Captura de pantalla (programa)"
+Screenshot.Preview="Captura de pantalla (vista previa)"
+Screenshot.Scene="Captura de pantalla (escena)"
+Screenshot.Source="Captura de pantalla (fonte)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%d-%m-%Y %I-%M-%S-%p\n%d-%m-%Y %H-%M-%S-%z\n%d-%m-%Y %H-%M-%S-%Z\n%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Ano, catro díxitos\n%YY		Ano, dous últimos díxitos (00-99)\n%MM		Mes como número decimal (01-12)\n%DD		Día do mes, recheo co cero (01-31)\n%hh		Hora en formato 24h (00-23)\n%mm		Minuto (00-59)\n%ss		Segundo (00-61)\n%%		Un signo %\n%a		Nome abreviado do día da semana\n%A		Nome completo do día da semana\n%b		Nome abreviado do mes\n%B		Nome completo do mes\n%d		Día do mes, recheo co cero (01-31)\n%H		Hora en formato 24h (00-23)\n%I		Hora en formato 12h (01-12)\n%m		Mes como número decimal (01-12)\n%M		Minuto (00-59)\n%p		Designación AM ou PM\n%S		Segundo (00-61)\n%y		Ano, dous últimos díxitos (00-99)\n%Y		Ano\n%z		Desviación ISO 8601 de UTC no fuso horario\n%Z		Fuso horario ou abreviatura\n%FPS		Cadros por segundo\n%CRES		Resolución da base (lenzo)\n%ORES		Resolución de saída (escalada)\n%VF		Formato de vídeo"
@@ -749,10 +770,10 @@
 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, comprobe se o servizo de emisión admite a inxección e a reprodución de son envolvente. Facebook 360 Live, Mixer RTMP, Smashcast son exemplos onde o son envolvente é totalmente compatíbel. Aínda que Facebook Live e YouTube Live aceptan a inxección de son envolvente, Facebook Live remestura a estéreo e 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="Se se emite, comprobe se o servizo de emisión admite a inxección e a reprodución de son envolvente. Facebook 360 Live é un exemplo onde o son envolvente é totalmente compatíbel. Aínda que Facebook Live e YouTube Live aceptan a inxección de son envolvente, Facebook Live remestura a estéreo e 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.Title="Activar o son envolvente?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Confirma que quere activar o son envolvente?"
-Basic.Settings.Audio.Devices="Dispositivos"
+Basic.Settings.Audio.Devices="Dispositivos de son globais"
 Basic.Settings.Audio.DesktopDevice="Son do escritorio"
 Basic.Settings.Audio.DesktopDevice2="Son do escritorio 2"
 Basic.Settings.Audio.AuxDevice="Son micro/auxiliar"
@@ -916,3 +937,16 @@
 Restart="Reiniciar"
 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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/he-IL.ini Changed

@@ -1,13 +1,12 @@
 
 Language="עברית"
-Region="ישראל"
 
 OK="אישור"
 Apply="החל"
-Cancel="בטל"
+Cancel="ביטול"
 Close="סגור"
 Save="שמור"
-Discard="אל תשמור"
+Discard="השלך"
 Disable="השבת"
 Yes="כן"
 No="לא"
@@ -17,8 +16,8 @@
 Interact="אינטרקציה"
 Filters="מסננים"
 Properties="מאפיינים"
-MoveUp="הזז למעלה"
-MoveDown="הזז למטה"
+MoveUp="להזיז למעלה"
+MoveDown="להזיז למטה"
 Settings="הגדרות"
 Display="תצוגה"
 Name="שם"
@@ -27,7 +26,7 @@
 Browse="עיון"
 Mono="מונו"
 Stereo="סטריאו"
-DroppedFrames="השמטת תמונות %1 (%2%)"
+DroppedFrames="פרייסים חסרים %1 (%2%)"
 StudioProgramProjector="מקרן מסך מלא (תוכנה)"
 PreviewProjector="מקרן מסך מלא (תצוגה מקדימה)"
 SceneProjector="מקרן מסך מלא (סצנה)"
@@ -38,6 +37,7 @@
 SourceWindow="הקרנה בחלון (מקור)"
 MultiviewProjector="תצוגה מרובה (מסך מלא)"
 MultiviewWindowed="תצוגה מרובה (חלון)"
+ResizeProjectorWindowToContent="התאם חלון לתוכן"
 Clear="נקה"
 Revert="החזר לקדמותו"
 Show="הצג"
@@ -47,11 +47,12 @@
 New="חדש"
 Duplicate="שכפל"
 Enable="אפשר"
-DisableOSXVSync="בטל סנכרון אנכי OSX"
-ResetOSXVSyncOnExit="איפוס סנכרון אנכי OSX ביציאה"
-HighResourceUsage="קידוד עמוס מידי! שקול להנמיך הגדרות וידאו או שימוש בקידוד מהיר יותר."
+DisableOSXVSync="בטל סנכרון אנכי macOS"
+ResetOSXVSyncOnExit="איפוס סנכרון אנכי macOS ביציאה"
+HighResourceUsage="קידוד עמוס מדיי! נא לשקול להנמיך את הגדרות הווידאו או להשתמש בקידוד מהיר יותר."
 Transition="מעבר"
 QuickTransitions="מעברים מהירים"
+FadeToBlack="עמעום לצבע שחור"
 Left="שמאל"
 Right="ימין"
 Top="עליון"
@@ -62,8 +63,8 @@
 Seconds="שניות"
 Deprecated="הוצא משימוש"
 ReplayBuffer="הרץ מחדש חוצץ"
-Import="יבא"
-Export="יצא"
+Import="ייבא"
+Export="ייצא"
 Copy="העתק"
 Paste="הדבק"
 PasteReference="הדבק (הפניה)"
@@ -81,13 +82,24 @@
 VerticalLayout="פריסה אנכית"
 Group="קבוצה"
 DoNotShowAgain="אל תציג שוב"
-Default="(ברירת מחדל)"
+Default="(ברירת־מחדל)"
 Calculating="מחשב..."
+Fullscreen="מסך מלא"
+Windowed="חלון"
+Percent="אחוז"
+RefreshBrowser="רענון"
+AspectRatio="יחס גובה-רוחב <b>%1:%2</b>"
+LockVolume="נעילת שמע"
+LogViewer="מציג היומן"
+ShowOnStartup="הצג בעת הפעלה"
+OpenFile="פתיחת קובץ"
 
 AlreadyRunning.Title="OBS פועל כבר"
 AlreadyRunning.Text="OBS פועל כבר! אלא אם התכוונת לעשות את זה, אנא סגור כל מופע קיים לפני נסיון להפעיל מופע חדש. אנא בדוק אם קיים מופע הגדר ממוזער במגש המערכת."
 AlreadyRunning.LaunchAnyway="הפעל בכל מקרה"
 
+ChromeOS.Title="פלטפורמה לא נתמכת"
+
 DockCloseWarning.Title="סגירת חלון ניתן להצמדה"
 DockCloseWarning.Text="סגרת עכשיו חלון הניתן להצמדה. אם ברצונך להציג אותו שוב, השתמש בתפריט תצוגה -> הצמדות בשורת התפריט."
 
@@ -125,17 +137,14 @@
 BandwidthTest.Region.Asia="אסיה"
 BandwidthTest.Region.Other="אחר"
 
-Basic.FirstStartup.RunWizard="האם ברצונך להפעיל את אשף קביעת התצורה האוטומטית? באפשרותך להגדיר את ההגדרות באופן ידני על ידי לחיצה על הלחצן ' קביעות ' בחלון הראשי."
-Basic.FirstStartup.RunWizard.NoClicked="אם תשנה את דעתך, באפשרותך להפעיל שוב את אשף קביעת התצורה האוטומטית בכל עת מתפריט הכלים."
-
 Basic.AutoConfig="אשף תצורה אוטומטית"
 Basic.AutoConfig.ApplySettings="החל הגדרות"
-Basic.AutoConfig.StartPage="מידע אודות השימוש"
+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)"
@@ -146,8 +155,9 @@
 Basic.AutoConfig.StreamPage.SubTitle="אנא הזן את פרטי הזרם"
 Basic.AutoConfig.StreamPage.ConnectAccount="התחבר לחשבון (מומלץ)"
 Basic.AutoConfig.StreamPage.DisconnectAccount="נתק את חשבון"
-Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="נתק את חשבון?"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="לנתק את חשבון?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="שינוי זה יחול באופן מיידי. האם אתה בטוח שברצונך לנתק את החשבון שלך?"
+Basic.AutoConfig.StreamPage.GetStreamKey="קבלת מפתח הזרמת נתונים"
 Basic.AutoConfig.StreamPage.UseStreamKey="השתמש במפתח הזרמת נתונים"
 Basic.AutoConfig.StreamPage.Service="שירות"
 Basic.AutoConfig.StreamPage.Service.ShowAll="הצג הכל..."
@@ -164,7 +174,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="התוכנית מתבצעת עכשיו סט של בדיקות כדי להעריך את ההגדרות המיטביות"
 Basic.AutoConfig.TestPage.SubTitle.Complete="הבדיקה הסתיימה"
 Basic.AutoConfig.TestPage.TestingBandwidth="מבצע מבחן רוחב פס, פעולה זו עשויה להימשך מספר דקות..."
-Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="התחברות ל-: %1..."
+Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="מתחבר אל: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="התחברות לשרת כלשהו נכשלה, אנא בדוק את חיבור האינטרנט ונסה שוב."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="בדיקות רוחב פס עבור: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="בדיקת זרם מקודד, זה עלול לקחת דקה..."
@@ -187,14 +197,16 @@
 Basic.Stats.Output.Stream="זרם נתונים"
 Basic.Stats.Output.Recording="הקלטה"
 Basic.Stats.Status="מצב"
-Basic.Stats.Status.Recording="הקלטה"
-Basic.Stats.Status.Live="שידור חי"
+Basic.Stats.Status.Recording="מקליט"
+Basic.Stats.Status.Live="בשידור חי"
 Basic.Stats.Status.Reconnecting="מתחבר מחדש"
 Basic.Stats.Status.Inactive="לא פעיל"
+Basic.Stats.Status.Active="פעיל"
 Basic.Stats.DroppedFrames="השמטת מסגרות (רשת)"
 Basic.Stats.MegabytesSent="פלט נתונים כולל"
 Basic.Stats.Bitrate="קצב נתונים"
 Basic.Stats.DiskFullIn="דיסק מלא בעוד (לערך)"
+Basic.Stats.ResetStats="לאפס סטטיסטיקה"
 
 ResetUIWarning.Title="האם את/ה בטוח/ה שברצונך לאפס את התצוגה?"
 ResetUIWarning.Text="איפוס התצוגה יחביא חלונות הצמדה נוספים. תוכל לחשוף את חלונות ההצמדה מתפריט התצוגה אם ברצונך להציג אותם.\n\nהאם את/ה בטוח/ה שברצונך לאפס את התצוגה?"
@@ -202,7 +214,7 @@
 Updater.Title="עידכון חדש זמין"
 Updater.Text="יש עדכון חדש זמין:"
 Updater.UpdateNow="עדכן עכשיו"
-Updater.RemindMeLater="הזכר לי מאוחר יותר"
+Updater.RemindMeLater="הזכר לי אחר כך"
 Updater.Skip="דלג על גירסה"
 Updater.Running.Title="תוכנית פעילה כעת"
 Updater.Running.Text="פלטים כרגע פעילים, אנא כבה פלטים פעילים לפני ביצוע עידכון"
@@ -231,21 +243,21 @@
 TransitionNameDlg.Title="שם מעבר"
 
 TitleBar.Profile="פרופיל"
-TitleBar.Scenes="סצינות"
+TitleBar.Scenes="סצנות"
 
-NameExists.Title="שם כבר קיים"
+NameExists.Title="השם כבר קיים"
 NameExists.Text="שם זה נמצא כבר בשימוש."
 
-NoNameEntered.Title="נא הזן שם תקף"
-NoNameEntered.Text="אינך יכול להשתמש בשדה שמות ריק."
+NoNameEntered.Title="נא להזין שם תקף"
+NoNameEntered.Text="אין באפשרותך להשתמש בשמות ריקים."
 
-ConfirmStart.Title="התחל הזרמת נתונים?"
-ConfirmStart.Text="האם אתה בטוח שברצונך להפעיל את הזרמת הנתונים?"
+ConfirmStart.Title="להתחל הזרמת נתונים?"
+ConfirmStart.Text="האם אתה בטוח שברצונך להתחיל את הזרמת הנתונים?"
 
-ConfirmStop.Title="עצור את הזרמת הנתונים?"
-ConfirmStop.Text="האם אתה בטוח שברצונך להפסיק את הזרמת הנתונים?"
+ConfirmStop.Title="לעצור את הזרמת הנתונים?"
+ConfirmStop.Text="האם אתה בטוח שברצונך לעצור את הזרמת הנתונים?"
 
-ConfirmStopRecord.Title="עצור הקלטה?"
+ConfirmStopRecord.Title="לעצור הקלטה?"
 ConfirmStopRecord.Text="האם את/ה בטוח/ה שברצונך לעצור את ההקלטה?"
 
 ConfirmBWTest.Title="האם ברצונך להתחיל בדיקת רוחב פס?"
@@ -255,18 +267,18 @@
 ConfirmExit.Text="תוכנת OBS פעילה כעת. כל הזרמת נתונים/הקלטות ייסגרו. האם אתה בטוח שאתה רוצה לצאת?"
 
 ConfirmRemove.Title="אשר הסרה"
-ConfirmRemove.Text="האם אתה בטוח שברצונך להסיר את '$1'?"
+ConfirmRemove.Text="האם אתה בטוח שברצונך להסיר את \"$1\"?"
 ConfirmRemove.TextMultiple="האם אתה בטוח שברצונך להסיר %1 פריטים?"
 
-Output.StartStreamFailed="נכשלה הפעלת זרימה"
-Output.StartRecordingFailed="נכשלה הפעלת הקלטה"
+Output.StartStreamFailed="נכשל בהתחלת הזרמה"
+Output.StartRecordingFailed="נכשל בהתחלת הקלטה"
 Output.StartReplayFailed="נכשלה הפעלת מאגר החוזר"
 Output.StartFailedGeneric="הפלט נכשל. בבקשה בדוק את הרישומים עבור. \n\nNote: אם אתה משתמש בNVNEC או AMD מקודדים, הקפד שמנהלי ההתקן של הכרטיס מסך מעודכנים."
 
 Output.ReplayBuffer.PauseWarning.Title="לא ניתן לשמור הילוכים חוזרים בזמן השהיה"
 Output.ReplayBuffer.PauseWarning.Text="אזהרה: הילוכים חוזרים לא ניתנים לשמירה כאשר ההקלטה מושהית."
 
-Output.ConnectFail.Title="ההתחברות נכשלה"
+Output.ConnectFail.Title="נכשל בהתחברות"
 Output.ConnectFail.BadPath="URL לא חוקי של נתיב או חיבור. נא בדוק את ההגדרות שלך כדי לוודא כי הם נכונים."
 Output.ConnectFail.ConnectFailed="ההתחברות לשרת נכשלה"
 Output.ConnectFail.InvalidStream="לא ניתן להתחבר לערוץ שצויין או למפתח זרם הנתונים, נא בדוק שנית את מפתח זרם הנתונים. אם הוא נכון, ככל הנראה יש בעיה בהתחברות לשרת."
@@ -283,17 +295,18 @@
 Output.RecordError.Title="שגיאה הקלטה"
 Output.RecordError.Msg="אירעה שגיאה לא מוגדרת בזמן ההקלטה."
 Output.RecordError.EncodeErrorMsg="התרחשה שגיאת מקודד בזמן הקלטה."
-Output.ReplayBuffer.NoHotkey.Title="אין מקש קיצור שנבחר!"
-Output.ReplayBuffer.NoHotkey.Msg="אין hotkey שמור למאגר החוזר. בבקשה הגדר את \"שמור\" hotkey לשימוש עבור שמירת מאגר חוזר להקלטות."
 
 Output.BadPath.Title="נתיב קובץ לא תקין"
 Output.BadPath.Text="נתיב פלט הקובץ שהוגדר אינו חוקי. נא בדוק את הגדרות כדי לוודא שנתיב קובץ תקני נקבע."
 
 LogReturnDialog="עידכון יומן הצליח"
+LogReturnDialog.Description="קובץ הלוג שלך הועלה. כעת תוכל לשתף את כתובת האתר למטרות ניפוי באגים או תמיכה."
+LogReturnDialog.Description.Crash="דוח הקריסה שלך הועלה. כעת תוכל לשתף את כתובת האתר למטרות ניפוי באגים או תמיכה."
 LogReturnDialog.CopyURL="העתק קישור"
-LogReturnDialog.ErrorUploadingLog="עידכון קובץ יומן נכשל"
+LogReturnDialog.AnalyzeURL="נתח"
+LogReturnDialog.ErrorUploadingLog="שגיאה בהעלאת קובץ יומן"
 
-Remux.SourceFile="הקלטת OBS"
+Remux.SourceFile="הקלטה ב־OBS"
 Remux.TargetFile="קובץ היעד"
 Remux.Remux="המרה"
 Remux.Stop="עצור המרה"
@@ -311,10 +324,10 @@
 Remux.ExitUnfinished="ההמרה לא הסתיימה, עצירה עכשיו עלולה להפוך את קובץ היעד לא שמיש. \n אתה בטוח שאתה רוצה לעצור את ההמרה?"
 Remux.HelpText="גרור קבצים להמרה לחלון זה, או בחר בתא \"הקלטת OBS\" בכדי לבחור קובץ ידנית."
 
-UpdateAvailable="עידכון חדש זמין"
-UpdateAvailable.Text="גירסה %1.%2.%3 זמין כעת. <a href='%4'> לחץ כאן כדי להוריד</a>"
+UpdateAvailable="עדכון חדש זמין"
+UpdateAvailable.Text="גרסה %1.%2.%3 זמינה כעת. <a href='%4'> לחץ כאן כדי להוריד</a>"
 
-Basic.DesktopDevice1="אודיו שולחן עבודה"
+Basic.DesktopDevice1="שמע בשולחן העבודה"
 Basic.DesktopDevice2="אודיו שולחן עבודה 2"
 Basic.AuxDevice1="מיקרופון/Aux"
 Basic.AuxDevice2="מיקרופון/Aux 2"
@@ -378,7 +391,7 @@
 Basic.SourceSelect.AddExisting="הוסף קיימים"
 Basic.SourceSelect.AddVisible="הפוך מקור לגלוי"
 
-Basic.PropertiesWindow="מאפיינים עבור '%1'"
+Basic.PropertiesWindow="מאפיינים עבור \"%1\""
 Basic.PropertiesWindow.AutoSelectFormat="%1 (בחירה אוטומטית: %2)"
 Basic.PropertiesWindow.SelectColor="בחר צבע"
 Basic.PropertiesWindow.SelectFont="בחר גופן"
@@ -408,7 +421,7 @@
 Basic.StatusBar.DelayStartingStoppingIn="השהיה (מסיים בעוד %1 שניות, מתחיל בעוד %2 שניות)"
 
 Basic.Filters="מסננים"
-Basic.Filters.AsyncFilters="מסנני אודיו/וידאו"
+Basic.Filters.AsyncFilters="מסנני שמע/וידאו"
 Basic.Filters.AudioFilters="מסנני שמע"
 Basic.Filters.EffectFilters="מסנני אפקטים"
 Basic.Filters.Title="מסננים עבור '%1'"
@@ -452,17 +465,24 @@
 Basic.Main.Connecting="מתחבר..."
 Basic.Main.StartRecording="התחל הקלטה"
 Basic.Main.StartReplayBuffer="התחל מאגר החוזר"
+Basic.Main.SaveReplay="שמירת הילוך חוזר"
 Basic.Main.StartStreaming="התחל הזרמת נתונים"
+Basic.Main.StartVirtualCam="הפעל מצלמה וירטואלית"
 Basic.Main.StopRecording="עצור הקלטה"
+Basic.Main.PauseRecording="להשהות הקלטה"
+Basic.Main.UnpauseRecording="בטל השהיית ההקלטה"
 Basic.Main.StoppingRecording="עוצר הקלטה..."
 Basic.Main.StopReplayBuffer="עצור את המאגר החוזר"
 Basic.Main.StoppingReplayBuffer="עצירת מאגר החוזר..."
 Basic.Main.StopStreaming="עצור זרם נתונים"
 Basic.Main.StoppingStreaming="עוצר זרם נתונים..."
 Basic.Main.ForceStopStreaming="עצור זרם נתונים (בטל השהייה)"
+Basic.Main.StopVirtualCam="עצור מצלמה וירטואלית"
 Basic.Main.Group="קבוצה %1"
 Basic.Main.GroupItems="קבץ פריטים נבחרים"
 Basic.Main.Ungroup="פירוק קבוצה"
+Basic.Main.GridMode="מצב רשת"
+Basic.Main.ListMode="מצב רשימה"
 
 Basic.MainMenu.File="קובץ(&F)"
 Basic.MainMenu.File.Export="ייצא(&E)"
@@ -478,9 +498,9 @@
 Basic.MainMenu.Edit="ערוך(&E)"
 Basic.MainMenu.Edit.Undo="בטל(&U)"
 Basic.MainMenu.Edit.Redo="בצע שוב(&R)"
-Basic.MainMenu.Edit.UndoAction="בטל 1$(&U)"
-Basic.MainMenu.Edit.RedoAction="בצע שוב 1$(&R)"
-Basic.MainMenu.Edit.LockPreview="נעילת תצוגה מקדימה (&L)"
+Basic.MainMenu.Edit.UndoAction="&בטל 1$"
+Basic.MainMenu.Edit.RedoAction="&בצע שוב $1"
+Basic.MainMenu.Edit.LockPreview="&נעל תצוגה מקדימה"
 Basic.MainMenu.Edit.Scale="תצוגה מקדימה שינוי קנה מידה (&S)"
 Basic.MainMenu.Edit.Scale.Window="שינוי קנה מידה לחלון"
 Basic.MainMenu.Edit.Scale.Canvas="בד (%1x%2)"
@@ -493,25 +513,28 @@
 Basic.MainMenu.Edit.Transform.Rotate90CW="סובב 90 מעלות בכיוון השעון"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="סובב 90 מעלות בניגוד לכיוון השעון"
 Basic.MainMenu.Edit.Transform.Rotate180="סובב 180 מעלות"
-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.Order="סדר(&O)"
-Basic.MainMenu.Edit.Order.MoveUp="הזז למעלה(&U)"
-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.View="מבט (&V)"
-Basic.MainMenu.View.Toolbars="סרגלי כלים (&T)"
+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.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.Docks="עגינה"
 Basic.MainMenu.View.Docks.ResetUI="איפוס UI"
 Basic.MainMenu.View.Docks.LockUI="נעילת UI"
-Basic.MainMenu.View.Toolbars.Listboxes="תיבות רשימה (&L)"
+Basic.MainMenu.View.Docks.CustomBrowserDocks="חלונות הצמדה מותאמים אישית של דפדפן..."
 Basic.MainMenu.View.SceneTransitions="מעברי סצינות (&C)"
+Basic.MainMenu.View.SourceIcons="אייקוני מקור"
 Basic.MainMenu.View.StatusBar="שורת מצב (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="ממשק מסך מלא"
 
@@ -529,12 +552,16 @@
 Basic.MainMenu.Help="עזרה(&H)"
 Basic.MainMenu.Help.HelpPortal="עזרה פורטל (&P)"
 Basic.MainMenu.Help.Website="בקר באתר(&W)"
+Basic.MainMenu.Help.Discord="הצטרפות לשרת הDiscord"
 Basic.MainMenu.Help.Logs="קבצי יומן רישום(&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="הצג קבצי יומן רישום(&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="העלה קובץ יומן רישום נוכחי(&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="העלה קובץ יומן רישום אחרון(&L)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="הצג את יומן הרישום הנוכחי(&V)"
 Basic.MainMenu.Help.CheckForUpdates="בדוק עדכונים"
+Basic.MainMenu.Help.CrashLogs="דוחות קריסה"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="הצגת דוחות קריסה"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="העלאת דוח הקריסה האחרון"
 Basic.MainMenu.Help.About="אודות (&A)"
 
 Basic.Settings.ProgramRestart="יש להפעיל מחדש את התוכנה בכדי שהגדרות האלה ייכנסו לתוקף."
@@ -548,6 +575,7 @@
 Basic.Settings.General.OpenStatsOnStartup="פתח סטטיסטיקת דיאלוג בעת ההפעלה"
 Basic.Settings.General.WarnBeforeStartingStream="הצג תיבת דו-שיח לאישור בעת הפעלת זרם נתונים"
 Basic.Settings.General.WarnBeforeStoppingStream="הצג תיבת דו-שיח לאישור בעת עצירת זרם נתונים"
+Basic.Settings.General.WarnBeforeStoppingRecord="הצגת תיבת דו-שיח לאישור בעת עצירת ההקלטה"
 Basic.Settings.General.Projectors="מקרנים"
 Basic.Settings.General.HideProjectorCursor="הסתר את הסמן מעל מקרנים"
 Basic.Settings.General.ProjectorAlwaysOnTop="הפוך מקרנים תמיד בעליון"
@@ -565,13 +593,39 @@
 Basic.Settings.General.SystemTrayHideMinimize="מזער תמיד למגש המערכת במקום שורת המשימות"
 Basic.Settings.General.SaveProjectors="שמור את המקרנים ביציאה"
 Basic.Settings.General.Preview="תצוגה מקדימה"
+Basic.Settings.General.OverflowHidden="החבא גלישה"
+Basic.Settings.General.OverflowAlwaysVisible="הצג גלישה תמיד"
+Basic.Settings.General.OverflowSelectionHidden="הצג גלישה אפילו אם המקור בלתי נראה"
+Basic.Settings.General.Importers="מייבאים"
+Basic.Settings.General.AutomaticCollectionSearch="חיפוש מקומות ידועים לאוספי סצנות כאשר מייבא"
 Basic.Settings.General.SwitchOnDoubleClick="מעבר לסצנה על ידי הקלקה כפולה"
 Basic.Settings.General.StudioPortraitLayout="אפשר פריסה אנכית/דיוקן"
+Basic.Settings.General.TogglePreviewProgramLabels="הצג תגיות תצוגה מקדימה/תוכנית"
+Basic.Settings.General.Multiview="ריבוי תצוגות"
+Basic.Settings.General.Multiview.MouseSwitch="לחיצה כדי להחליף בין סצנות"
 Basic.Settings.General.Multiview.DrawSourceNames="הצג שמות סצנה"
+Basic.Settings.General.Multiview.DrawSafeAreas="צייר אזורים בטוחים (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="פריסת תצוגה מרובה"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="מאוזן, עליון (8 סצנות)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="מאוזן, תחתון (8 סצנות)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="מאונך, שמאל (8 סצנות)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="מאונך, ימין (8 סצנות)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="מאוזן, עליון (24 סצנות)"
 
 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.BandwidthTestMode="הפעל מצב בדיקת רוחב-פס"
+Basic.Settings.Stream.TTVAddon="תוספי צ'אט Twitch"
+Basic.Settings.Stream.TTVAddon.None="ללא"
+Basic.Settings.Stream.TTVAddon.Both="BetterTTV וגם FrankerFaceZ"
+Basic.Settings.Stream.MissingSettingAlert="הגדרת הזרמה חסרה"
+Basic.Settings.Stream.StreamSettingsWarning="פתיחת הגדרות"
+Basic.Settings.Stream.MissingUrlAndApiKey="שרת ומפתח הזרמת נתונים חסרים\n\nגש לתפריט ההגדרות בכדי להכניס שרת ומפתח הזרמת נתונים בלשונית 'זרם נתונים'."
+Basic.Settings.Stream.MissingUrl="מפתח הזרמת נתונים חסר\n\nגש לתפריט ההגדרות בכדי להכניס מפתח הזרמת נתונים בלשונית 'זרם נתונים'."
+Basic.Settings.Stream.MissingStreamKey="מפתח הזרמת נתונים חסר\n\nגש לתפריט ההגדרות בכדי להכניס מפתח הזרמה בלשונית 'הזרמת נתונים'."
 
 Basic.Settings.Output="פלט"
 Basic.Settings.Output.Format="פורמט הקלטה"
@@ -579,15 +633,18 @@
 Basic.Settings.Output.SelectDirectory="בחר ספריית הקלטות"
 Basic.Settings.Output.SelectFile="בחר קובץ הקלטה"
 Basic.Settings.Output.EnforceBitrate="אכוף מגבלות קצב נתונים של שירות הזרמת הנתונים"
+Basic.Settings.Output.DynamicBitrate="התאם דינאמית את קצב הביטים בהתאם לעומס על הרשת"
+Basic.Settings.Output.DynamicBitrate.Beta="התאם דינאמית את קצב הביטים בהתאם לעומס על הרשת (בטא)"
+Basic.Settings.Output.DynamicBitrate.TT="במקום שפריימים יפלו כתוצאה מעומס על הרשת, קצב הביטים ישתנה באופן דינאמי.\n\nיש לשים לב כי הגדרה זו עלולה להעלות את ההשהייה לצופים בעת עומס פתאומי על הרשת.\nכאשר קצב הביטים יורד, עשויות לעבור כמה דקות עד שישוחזר.\n\nכרגע נתמך רק עבור RTMP."
 Basic.Settings.Output.Mode="מצב פלט"
 Basic.Settings.Output.Mode.Simple="פשוט"
 Basic.Settings.Output.Mode.Adv="מתקדם"
 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 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="אין אפשרות להעריך את השימוש בזיכרון. נא הגדר מגבלת זיכרון מירבי."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(הערה: הקפד להגדיר hotkey עבור מאגר החוזר במקטע מקשי הקיצור)"
 Basic.Settings.Output.ReplayBuffer.Prefix="קידומת שם קובץ מאגר החוזר"
 Basic.Settings.Output.ReplayBuffer.Suffix="סיומת"
 Basic.Settings.Output.Simple.SavePath="נתיב הקלטה"
@@ -598,6 +655,7 @@
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="ללא אובדן איכות, גודל קובץ עצום"
 Basic.Settings.Output.Simple.Warn.VideoBitrate="אזהרה: קצב הזרמת הוידאו יוגדר ל %1, כאשר זה הגבול העליון עבור שירות הזרמת הנתונים הנוכחי. אם אתה בטוח שאתה רוצה לעבור מעל %1, אפשר את אפשרויות קידוד מתקדמות ובטל סימון \"אכוף הגבלות קצב הזרמת נתונים\"."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="אזהרה: קצב הזרמת האודיו יוגדר ל %1, כאשר זה הגבול העליון עבור שירות הזרמת הנתונים הנוכחי. אם אתה בטוח שאתה רוצה לעבור מעל %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="האם אתה בטוח שברצונך להשתמש באיכות ללא אובדן איכות?"
@@ -610,8 +668,10 @@
 Basic.Settings.Output.VideoBitrate="קצב סיביות וידאו"
 Basic.Settings.Output.AudioBitrate="קצב סיביות שמע"
 Basic.Settings.Output.Reconnect="חיבור מחדש באופן אוטומטי"
+Basic.Settings.Output.RetryDelay="השהיית ניסיון חוזר"
 Basic.Settings.Output.MaxRetries="מרב נסינות"
 Basic.Settings.Output.Advanced="אפשר הגדרות מקודד מתקדמות"
+Basic.Settings.Output.EncoderPreset="ערכי מקודד קבועים מראש"
 Basic.Settings.Output.CustomEncoderSettings="הגדרות מקודד מותאמות אישית"
 Basic.Settings.Output.CustomMuxerSettings="הגדרות ממיר מותאמות אישית"
 Basic.Settings.Output.NoSpaceFileName="צור שם קובץ ללא רווחים"
@@ -621,11 +681,11 @@
 Basic.Settings.Output.Adv.Streaming="זרם נתונים"
 Basic.Settings.Output.Adv.ApplyServiceSettings="אכוף הגדרות מקודד של שירות זרם נתונים"
 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.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.Recording="הקלטה"
 Basic.Settings.Output.Adv.Recording.Type="סוג"
@@ -643,20 +703,29 @@
 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.FormatDefault="פורמט ברירת־מחדל"
 Basic.Settings.Output.Adv.FFmpeg.FormatDesc="תיאור סוג הקובץ"
 Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="ניחוש הקודקד של השמע/וידאו מנתיב קובץ או קישור"
 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.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="הצג את כל רכיבי codec (גם אם אינם תואמים)"
 
+Screenshot="פלט צילום מסך"
+Screenshot.SourceHotkey="צילום מסך של המקור הנבחר"
+Screenshot.StudioProgram="צילום מסך (תכנה)"
+Screenshot.Preview="צילום מסך (תצוגה מקדימה)"
+Screenshot.Scene="צילום מסך (סצנה)"
+Screenshot.Source="צילום מסך (מקור)"
+
+FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
+FilenameFormatting.TT="%CCYY	Year, four digits\n%YY		Year, last two digits (00-99)\n%MM		Month as a decimal number (01-12)\n%DD		Day of the month, zero-padded (01-31)\n%hh		Hour in 24h format (00-23)\n%mm		Minute (00-59)\n%ss		Second (00-61)\n%%		A % sign\n%a		Abbreviated weekday name\n%A		Full weekday name\n%b		Abbreviated month name\n%B		Full month name\n%d		Day of the month, zero-padded (01-31)\n%H		Hour in 24h format (00-23)\n%I		Hour in 12h format (01-12)\n%m		Month as a decimal number (01-12)\n%M		Minute (00-59)\n%p		AM or PM designation\n%S		Second (00-61)\n%y		Year, last two digits (00-99)\n%Y		Year\n%z		ISO 8601 offset from UTC in timezone\n%Z		Timezone name or abbreviation\n%FPS		Frames per second\n%CRES		Base (canvas) resolution\n%ORES		Output (scaled) resolution\n%VF		Video format"
 
 Basic.Settings.Video="וידאו"
 Basic.Settings.Video.Adapter="מתאם תצוגה"
@@ -678,23 +747,37 @@
 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="שמע"
 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="בינוני (סוג I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="איטי (סוג 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.MultichannelWarning.Confirm="אתה בטוח שאתה רוצה לאפשר קול שמע מקיף?"
+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.Advanced="הגדרות מתקדמות"
+Basic.Settings.Advanced="מתקדם"
 Basic.Settings.Advanced.General.ProcessPriority="עדיפות תהליך"
 Basic.Settings.Advanced.General.ProcessPriority.High="גבוה"
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="מעל לרגיל"
@@ -704,20 +787,36 @@
 Basic.Settings.Advanced.FormatWarning="אזהרה: תבניות צבע שונות מ-NV12 נועדו בעיקר עבור הקלטה, והם אינם מומלצות בעת הזרמת נתונים. הזרמת נתונים עלולה לגרום למשאבי עיבוד מוגברים כתוצאה מהמרת תבנית צבע."
 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="ברירת מחדל"
 Basic.Settings.Advanced.Audio.DisableAudioDucking="בטל צימוד השמע של Windows"
 Basic.Settings.Advanced.StreamDelay="השהיית זרם נתונים"
-Basic.Settings.Advanced.StreamDelay.Duration="משך זמן"
+Basic.Settings.Advanced.StreamDelay.Duration="משך"
 Basic.Settings.Advanced.StreamDelay.Preserve="שמר נקודת חיתוך (השהייה מוגדלת) בעת חיבור מחדש"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="שימוש זיכרון משוער: %1 MB"
 Basic.Settings.Advanced.Network="רשת"
 Basic.Settings.Advanced.Network.BindToIP="אגד ל- IP"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="הפעל מיטובי רשת"
+Basic.Settings.Advanced.Network.EnableLowLatencyMode="אפשר TCP pacing"
+Basic.Settings.Advanced.Network.TCPPacing.Tooltip="מנסה להפוך את פלט RTMP לידידותי יותר עבור אפליקציות רגישות ל-latency ברשת על ידי ויסות קצב השידור.\nזה עלול להעלות את הסיכון לנפילת פריימים בחיבורים לא יציבים."
+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"
+Basic.Settings.Advanced.AutoRemux.MP4="(הקלט כ-mkv)"
 
 Basic.AdvAudio="מאפייני קול מתקדמים"
+Basic.AdvAudio.ActiveOnly="מקורות פעילים בלבד"
 Basic.AdvAudio.Name="שם"
+Basic.AdvAudio.Volume="עוצמת שמע"
+Basic.AdvAudio.Mono="מונו"
 Basic.AdvAudio.Balance="איזון"
+Basic.AdvAudio.SyncOffset="היסט סינכרון"
 Basic.AdvAudio.Monitoring="ניטור אודיו"
 Basic.AdvAudio.Monitoring.None="בטל ניתור"
 Basic.AdvAudio.Monitoring.MonitorOnly="ניתור בלבד (השתק פלט)"
@@ -736,7 +835,7 @@
 Basic.SystemTray.Message.Reconnecting="ההתקשרות נותקה. התחברות מחדש..."
 
 Hotkeys.Insert="הוסף"
-Hotkeys.Delete="מחק"
+Hotkeys.Delete="הסר"
 Hotkeys.Home="בית"
 Hotkeys.End="סיום"
 Hotkeys.PageUp="דף למעלה"
@@ -770,6 +869,7 @@
 Hotkeys.AppleKeypadDecimal=". (מקלדת נומרית)"
 Hotkeys.AppleKeypadEqual="= (מקלדת נומרית)"
 Hotkeys.MouseButton="עכבר %1"
+Hotkeys.Escape="Esc"
 
 Mute="השתק"
 Unmute="בטל השתקה"
@@ -780,25 +880,59 @@
 SceneItemHide="הסתר '%1'"
 
 OutputWarnings.NoTracksSelected="עליך לבחור ערוץ אחד לפחות"
+OutputWarnings.MP4Recording="אזהרה: הקלטות שיישמרו ל-MP4/MOV יהיו בלתי שמישות במידה ולא ניתן להשלים את הקובץ (למשל כתוצאה ממסך כחול, אובדן כוח, וכו'). אם ברצונך להקליט מספר רצועות שמע, שקול להשתמש ב-MKV ובצע המרה ל-MP4/MOV לאחר הסיום (קובץ←המרת הקלטות)"
+OutputWarnings.CannotPause="אזהרה: לא ניתן להשהות הקלטות אם מקודד ההקלטה מוגדר על \"(השתמש במקודד זרם נתונים)\""
 
 FinalScene.Title="מחק סצינה"
 FinalScene.Text="נדרשת סצנה אחת לפחות."
 
 NoSources.Title="אין מקורות"
+NoSources.Text="נראה כי לא הוספת מקורות וידאו, לכן הפלט שלך יהיה מסך ריק. האם ברצונך לעשות זאת?"
+NoSources.Text.AddSource="אפשר להוסיף מקורות על ידי לחיצה על סמל ה + מתחת לתיבת המקורות בחלון הראשי בכל עת."
+NoSources.Label="אין לך מקורות.\n\לחץ על לחצן + למטה\nאו לחצן ימני כאן בכדי להוסיף אחד."
 
 ChangeBG="קבע צבע"
 CustomColor="צבע מותאם אישית"
 
+BrowserSource.EnableHardwareAcceleration="הפעל האצת חומרה עבור מקורות דפדפן"
 
 About="אודות"
+About.Info="OBS Studio היא תוכנת קוד-פתוח חינמית להקלטה ושידור וידאו."
+About.Donate="תרמי / תרום"
 About.GetInvolved="הייה מעורב"
-About.Authors="מחברים"
+About.Authors="יוצרים"
 About.License="רישיון"
+About.Contribute="תמוך בפרוייקט OBS"
 
+AddUrl.Title="הוסף מקור דרך כתובת URL"
+AddUrl.Text="גררת כתובת URL ל-OBS. זה יוסיף אוטומטית את הקישור כמקור. להמשיך?"
+AddUrl.Text.Url="URL: %1"
 
+ResizeOutputSizeOfSource="שינוי גודל פלט (גודל מקור)"
+ResizeOutputSizeOfSource.Text="גודל רזולוציות הפלט והבסיס ישתנה לגודל המקור הנוכחי."
 ResizeOutputSizeOfSource.Continue="האם אתה רוצה להמשיך?"
 
+PreviewTransition="תצוגה מקדימה של המעבר"
+
+Importer="יבואן אוספי סצינות"
+Importer.SelectCollection="בחר אוסף סצינות"
+Importer.Collection="אוסף סצינות"
+Importer.HelpText="הוסף קבצים לחלון זה בכדי לייבא אוספים מ-OBS או מתוכנות נתמכות אחרות."
+Importer.Path="נתיב אוסף"
+Importer.Program="יישום מזוהה"
+Importer.AutomaticCollectionPrompt="חפש אוספי סצינות באופן אוטומטי"
+Importer.AutomaticCollectionText="OBS יכולה למצוא באופן אוטומטי אוספי סצינות הניתנים לייבוא מתוכנות צד-שלישי נתמכות. האם ברצונך ש-OBS תמצא אוטומטית אוספים בשבילך?\n\nבאפשרותך לשנות הגדרה זו מאוחר יותר ב: הגדרות > כללי > יבואנים."
+
 
+Restart="אתחל"
+NeedsRestart="OBS Studio צריך לאתחל. ברצונך לאתחל עכשיו?"
 
+ContextBar.NoSelectedSource="לא נבחר מקור"
+ContextBar.FitToCanvas="התאם לקנבס"
 
+ContextBar.MediaControls.PlayMedia="ניגון מדיה"
+ContextBar.MediaControls.PauseMedia="השהה מדיה"
+ContextBar.MediaControls.StopMedia="עצור מדיה"
+ContextBar.MediaControls.PlaylistNext="הבא בפלייליסט"
+ContextBar.MediaControls.PlaylistPrevious="הקודם בפלייליסט"

obs-studio-25.0.8.tar.xz/UI/data/locale/hi-IN.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/hi-IN.ini Changed

@@ -1,6 +1,5 @@
 
 Language="हिन्दी"
-Region="इंडिया"
 
 OK="ठीक है"
 Apply="लागू करें"
@@ -47,9 +46,12 @@
 New="नया"
 Duplicate="दोहरा"
 Enable="सक्षम करें"
-DisableOSXVSync="OSX V-Sync अक्षम करें"
+DisableOSXVSync="macOS V-Sync अक्षम करें"
+ResetOSXVSyncOnExit="बंद करते समय macOS V-Sync रिसेट करें"
+HighResourceUsage="संकेतीकरण / एन्कोडिंग अतिभारित हुआ है! विडियो सेटिंग्स न्यून करें या गतिमान संकेतीकरण का चुनाव करें।"
 Transition="संक्रमण"
 QuickTransitions="त्वरित संक्रमण"
+FadeToBlack="काले रंग में लुप्त करें"
 Left="बाएं"
 Right="दाएँ"
 Top="शीर्ष"
@@ -64,13 +66,28 @@
 Export="निर्यात करें"
 Copy="प्रतिलिपि"
 Paste="चिपकाएँ"
+PasteReference="चिपकाएं (सन्दर्भ)"
+PasteDuplicate="चिपकाएं (प्रतिरूप)"
+RemuxRecordings="रिमक्स रिकॉर्डिंग्स"
 Next="अगले"
 Back="वापस"
+Defaults="पूर्व निर्धारित"
+HideMixer="मिक्सर में छिपायें"
+TransitionOverride="संक्रमण सद्द करें"
+None="कुछ नहीं"
+StudioMode.Preview="पूर्वावलोकन"
+StudioMode.Program="कार्यक्रम"
+ShowInMultiview="मल्टीव्यू में दिखाएं"
 VerticalLayout="लंबरूप लेआउट"
 Group="एकत्रित करना"
 DoNotShowAgain="फिर से मत दिखाना"
 Default="(डिफ़ॉल्ट)"
 Calculating="गणना जारी है"
+Fullscreen="पूर्ण पटल पर दिखाएं"
+Windowed="चौकट में दिखाएं"
+Percent="प्रतिशत"
+AspectRatio="पक्ष अनुपात"
+LockVolume="ध्वनि की तीव्रता को लॉक करें"
 
 AlreadyRunning.Title="OBS चल रहा है"
 AlreadyRunning.Text="OBS पहले से ही चल रहा है! अगर आप ऐसा नहीं करना चाहते हैं, कृपया एक नया उदाहरण चलाने की कोशिश करने से पहले OBS के किसी भी मौजूदा उदाहरण को बंद कर दें। यदि आपके पास सिस्टम ट्रे को कम करने के लिए OBS सेट है, तो कृपया जांचें कि क्या यह अभी भी वहां चल रहा है।"
@@ -81,14 +98,13 @@
 
 
 
+
 BandwidthTest.Region="क्षेत्र"
 BandwidthTest.Region.US="संयुक्त राज्य अमेरिका"
 BandwidthTest.Region.EU="यूरोप"
 BandwidthTest.Region.Asia="एशिया"
 BandwidthTest.Region.Other="अन्य"
 
-Basic.FirstStartup.RunWizard.NoClicked="यदि आप अपनी पसंद बदलते हैं, तो आप किसी भी समय टूल मेनू से ऑटो-कॉन्फ़िगरेशन विज़ार्ड चला सकते हैं।"
-
 Basic.AutoConfig="ऑटो-कॉन्फ़िगरेशन विज़ार्ड"
 Basic.AutoConfig.ApplySettings="सेटिंग लागू करें"
 Basic.AutoConfig.StartPage="उपयोग की जानकारी"
@@ -201,3 +217,6 @@
 
 
 
+
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/hr-HR.ini Changed

@@ -1,6 +1,5 @@
 
 Language="hrvatski"
-Region="Croatia"
 
 OK="U redu"
 Apply="Primijeni"
@@ -23,6 +22,7 @@
 Display="Zaslon"
 Name="Ime"
 Exit="Izlaz"
+Mixer="Audio Mikser"
 Browse="Pretraži"
 Mono="Mono"
 Stereo="Stereo"
@@ -31,11 +31,13 @@
 PreviewProjector="Projektor cijelog zaslona (pregled)"
 SceneProjector="Projektor cijelog zaslona (scena)"
 SourceProjector="Projektor cijelog zaslona (izvor)"
+StudioProgramWindow="Projektor Zaslona (Program)"
 PreviewWindow="Projektor zaslona (pretpregled)"
 SceneWindow="Projektor zaslona (Scena)"
 SourceWindow="Projektor zaslona (Izvor)"
 MultiviewProjector="Multi-prikaz (Fullscreen)"
 MultiviewWindowed="Multi-prikaz (u prozoru)"
+ResizeProjectorWindowToContent="Prilagodi prozor sadržaju"
 Clear="Poništi"
 Revert="Povrati"
 Show="Prikaži"
@@ -45,8 +47,8 @@
 New="Novi"
 Duplicate="Udvostruči"
 Enable="Omogući"
-DisableOSXVSync="Onemogući OSX vertikalnu sinkronizaciju"
-ResetOSXVSyncOnExit="Povrati OSX vertikalnu sinkronizaciju po izlasku"
+DisableOSXVSync="Onemogući macOS vertikalnu sinkronizaciju"
+ResetOSXVSyncOnExit="Povrati macOS vertikalnu sinkronizaciju po izlasku"
 HighResourceUsage="Kodiranje preopterećeno! Pokušajte sniziti postavke videa ili upotrijebiti brži predložak za kodiranje."
 Transition="Prijelaz"
 QuickTransitions="Brzi prijelazi"
@@ -77,11 +79,28 @@
 ShowInMultiview="Prikaži u Multi-prikazu"
 VerticalLayout="Okomito sučelje"
 Group="Grupa"
+DoNotShowAgain="Ne prikazuj ponovno"
+Default="(Zadano)"
+Calculating="Računam..."
+Fullscreen="Cijeli zaslon"
+Windowed="Zasebni prozor"
+Percent="Postotak"
+RefreshBrowser="Osvježi"
+AspectRatio="Omjer slike <b>%1:%2</b>"
+LockVolume="Zakoči glasnoću"
+LogViewer="Prikaz zapisnika"
+ShowOnStartup="Prikaži na startu"
+OpenFile="Otvori datoteku"
 
 AlreadyRunning.Title="OBS je već pokrenut"
 AlreadyRunning.Text="OBS je već pokrenut! Osim ako si mislio da biste to učinili, isključite sve postojeće pojave OBS prije nego što pokušate pokrenuti novu instancu. Ako imate OBS postavljen na smanjivanje u traku sustava, provjerite ako to još uvijek radi tamo."
 AlreadyRunning.LaunchAnyway="Svejedno pokreni"
 
+ChromeOS.Title="Nepodržana platforma"
+ChromeOS.Text="Čini se da je OBS aktivan unutar ChromeOS kontejnera. Ova platforma nije podržana"
+
+DockCloseWarning.Title="Zatvaranje prozora koji se može spojiti"
+DockCloseWarning.Text="Opravo ste zatvorili prozor koji se može spojiti. Ukoliko ga želite ponovno prikazati, otvorite meni Pogled →Spajanje na izborniku."
 
 
 Auth.Authing.Title="Autentikacija..."
@@ -89,6 +108,7 @@
 Auth.AuthFailure.Title="Greška kod autentikacije"
 Auth.AuthFailure.Text="Greška autentikacije s %1:\n\n%2: %3"
 Auth.InvalidScope.Title="Potrebna autentikacija"
+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."
 
 Copy.Filters="Kopiraj filtere"
 Paste.Filters="Zalijepi filtere"
@@ -100,9 +120,6 @@
 BandwidthTest.Region.Asia="Azija"
 BandwidthTest.Region.Other="Ostalo"
 
-Basic.FirstStartup.RunWizard="Želite li pokrenuti čarobnjak za automatsku konfiguraciju? Možete također ručno konfigurirati postavke tako da kliknete gumb Postavke u glavnom prozoru."
-Basic.FirstStartup.RunWizard.NoClicked="Ako se predomislite, možete pokrenuti čarobnjaka za automatsku konfiguraciju bilo kada opet u Alat meni."
-
 Basic.AutoConfig="Čarobnjak za automatske konfiguraciju"
 Basic.AutoConfig.ApplySettings="Primjeni postavke"
 Basic.AutoConfig.StartPage="Informacije o korištenju"
@@ -133,13 +150,29 @@
 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.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.SkippedFrames="Preskočeni okviri zbog zaostajanja kodiranja"
-
-
+Basic.Stats.Output.Recording="Snimak"
+Basic.Stats.Status="Status"
+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"
+
+
+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 pregleda/izlaza nakon prijelaza"
 QuickTransitions.SwapScenesTT="Zamjenjuje scene pregleda i izlaza nakon prijelaza (ako originalna scena izlaza još uvijek postoji).\nOvo neće poništiti promjene koje su načinjene nad originalnom scenom izlaza."
@@ -401,7 +434,6 @@
 Basic.MainMenu.View.Toolbars="Alatne &trake"
 Basic.MainMenu.View.Docks.ResetUI="Resetiraj korisničko sučelje"
 Basic.MainMenu.View.Docks.LockUI="Zaključaj korisničko sučelje"
-Basic.MainMenu.View.Toolbars.Listboxes="Popis stavki (&L)"
 Basic.MainMenu.View.SceneTransitions="S&censki prijelazi"
 Basic.MainMenu.View.StatusBar="Traka &stanja"
 Basic.MainMenu.View.Fullscreen.Interface="Sučelje preko cijelog zaslona"
@@ -531,6 +563,7 @@
 
 
 
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adapter"
 Basic.Settings.Video.BaseResolution="Osnovna (površinska) rezolucija"
@@ -649,3 +682,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/hu-HU.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Magyar"
-Region="Magyarország"
 
 OK="OK"
 Apply="Alkalmaz"
@@ -14,7 +13,7 @@
 Add="Hozzáadás"
 Remove="Eltávolítás"
 Rename="Átnevezés"
-Interact="Ráhatás"
+Interact="Interakció"
 Filters="Szűrők"
 Properties="Tulajdonságok"
 MoveUp="Mozgatás fel"
@@ -33,11 +32,12 @@
 SceneProjector="Teljes képernyős projektor (jelenet)"
 SourceProjector="Teljes képernyős projektor (forrás)"
 StudioProgramWindow="Ablakos projektor (program)"
-PreviewWindow="Ablakos projektor (előnézet)"
-SceneWindow="Ablakos projektor (jelenet)"
-SourceWindow="Ablakos projektor (forrás)"
-MultiviewProjector="Multiview (teljes képernyő)"
-MultiviewWindowed="Multiview (ablakos)"
+PreviewWindow="Ablakos projektor (Előnézet)"
+SceneWindow="Ablakos projektor (Jelenet)"
+SourceWindow="Ablakos projektor (Forrás)"
+MultiviewProjector="Multiview (Teljes képernyő)"
+MultiviewWindowed="Multiview (Ablakos)"
+ResizeProjectorWindowToContent="Ablak tartalomhoz igazítása"
 Clear="Törlés"
 Revert="Visszavonás"
 Show="Megjelenítés"
@@ -87,15 +87,23 @@
 Fullscreen="Teljes képernyő"
 Windowed="Ablakos"
 Percent="Százalék"
+RefreshBrowser="Frissítés"
 AspectRatio="Képarány <b>%1:%2</b>"
 LockVolume="Hangerő zárolása"
+LogViewer="Log Megjelenítő"
+ShowOnStartup="Mutatás indításkor"
+OpenFile="Fájl megnyitása"
+AddValue="%1 hozzáadása"
 
 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"
 
+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"
+
 DockCloseWarning.Title="Dokkolható ablak bezárása"
-DockCloseWarning.Text="Most zárt be egy dokkolható ablakot. Ha szeretné újra felfedni, akkor használja a Nézet → Dokkok menüt."
+DockCloseWarning.Text="Most zárt be egy dokkolható ablakot. Ha szeretné újra felfedni, akkor használja a Nézet -> Dokkolás menüt."
 
 ExtraBrowsers="Egyéni böngésződokkok"
 ExtraBrowsers.Info="Adjon hozzá dokkokat név és URL megadásával, majd kattintson az Alkalmaz vagy Bezárás gombra a dokkok megnyitásához. Bármikor tud dokkokat hozzáadni vagy eltávolítani."
@@ -116,7 +124,7 @@
 TwitchAuth.Stats="Twitch statisztika"
 TwitchAuth.Feed="Twitch tevékenységnapló"
 TwitchAuth.TwoFactorFail.Title="Nem lehetett a stream kulcsot lekérni"
-TwitchAuth.TwoFactorFail.Text="Az OBS nem tudott kapcsolódni a Twitch felhasználódhoz. Kérem ellenőrizze, hogy a kétfaktoros authentikációja be van állítva a <a href='https://www.twitch.tv/settings/security'>Twitch biztonsági beállítások</a> között, hiszen az szükséges az adáshoz."
+TwitchAuth.TwoFactorFail.Text="Az OBS nem tudott kapcsolódni a Twitch felhasználódhoz. Kérlek menj biztosra, hogy a kétfaktoros megerősítése be van állítva a <a href='https://www.twitch.tv/settings/security'>Twitch biztonsági beállítások</a> között, mivel ez szükséges az adáshoz."
 RestreamAuth.Channels="Restream csatornák"
 
 Copy.Filters="Szűrők másolása"
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Ázsia"
 BandwidthTest.Region.Other="Egyéb"
 
-Basic.FirstStartup.RunWizard="Kívánja futtatni az automatikus konfiguráció varázslót? Természetesen manuálisan is konfigurálhatja a beállításokat a Beállítások gombra kattintva a fő ablakban."
-Basic.FirstStartup.RunWizard.NoClicked="Ha meggondolja magát, bármikor futtathatja az automatikus konfiguráció varázslót az eszközök menüből."
-
 Basic.AutoConfig="Automatikus konfiguráció varázsló"
 Basic.AutoConfig.ApplySettings="Beállítások alkalmazása"
 Basic.AutoConfig.StartPage="Használati tudnivalók"
 Basic.AutoConfig.StartPage.SubTitle="Adja meg, hogy mire szeretné használni a programot"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Streamre optimalizálás, a felvétel másodlagos"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Felvételre optimalizálás, nem fogok streamelni"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Csak a virtuális kamerát fogom használni"
 Basic.AutoConfig.VideoPage="Videobeállítások"
-Basic.AutoConfig.VideoPage.SubTitle="Adja meg milyen videó beállításokat kíván használni"
+Basic.AutoConfig.VideoPage.SubTitle="Adja meg milyen videobeállításokat kíván használni"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Jelenlegi használata (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Megjelenítő %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Jelenlegi használata (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Felvétel kódoló"
 Basic.AutoConfig.TestPage.Result.Header="A program megállapította, hogy ezek a becsült beállítások a legideálisabbak az ön számára:"
 Basic.AutoConfig.TestPage.Result.Footer="A beállítások használatához kattintson a Beállítások alkalmazása gombra. A varázsló újrakonfigurálásához és az újrapróbálkozáshoz, kattintson a Vissza gombra. A manuális beállításokhoz kattintson a Mégse gombra és nyissa meg a Beállításokat."
+Basic.AutoConfig.Info="Az automatikus konfigurációs varázsló a számítógép műszaki adatait és az internet sebessége alapján meghatározza a legjobb beállításokat."
+Basic.AutoConfig.RunAnytime="Ezt bármikor futtathatod az eszközök menüjében."
 
 Basic.Stats="Statisztika"
 Basic.Stats.CPUUsage="Processzorhasználat"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Nincs gyorsbillentyű beállítva!"
-Output.ReplayBuffer.NoHotkey.Msg="Nincs mentés gyorsbillentyű a visszajátszási pufferhez. Kérem állítson be egy \"Mentés\" gyorsbillentyűt a visszajátszások felvételeinek mentésére."
 
 Output.BadPath.Title="A fájl elérési útja hibás"
 Output.BadPath.Text="A beállított elérési útvonal érvénytelen. Kérem ellenőrizze a beállításait és győződjön meg arról, hogy a fájl elérési útja érvényes."
 
 LogReturnDialog="Napló feltöltése sikeres"
+LogReturnDialog.Description="Logfájlod feltöltésre került. Megoszthatod az URL-t segítségkérésképpen."
+LogReturnDialog.Description.Crash="Logfájlod feltöltésre került. Megoszthatod az URL-t segítségkérés képpen."
 LogReturnDialog.CopyURL="URL másolása"
+LogReturnDialog.AnalyzeURL="Elemzés"
 LogReturnDialog.ErrorUploadingLog="Naplófájl feltöltésekor hiba lépett fel"
 
 Remux.SourceFile="OBS felvétel"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Visszajátszás puffer indítása"
 Basic.Main.SaveReplay="Visszajátszás mentése"
 Basic.Main.StartStreaming="Stream 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"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Stream leállítása"
 Basic.Main.StoppingStreaming="Stream leállítása..."
 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.Group="Csoport %1"
 Basic.Main.GroupItems="Kijelölt elemek csoportosítása"
 Basic.Main.Ungroup="Csoport megszüntetése"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Felület újraindítása"
 Basic.MainMenu.View.Docks.LockUI="Felület zárása"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Egyedi tallózó dokkoló..."
-Basic.MainMenu.View.Toolbars.Listboxes="Gombsor (&L)"
+Basic.MainMenu.View.ListboxToolbars="Jelenet/Forrás Lista Gombok"
+Basic.MainMenu.View.ContextBar="Forrás eszköztár"
 Basic.MainMenu.View.SceneTransitions="Jelenet átmenetek (&C)"
 Basic.MainMenu.View.SourceIcons="Forrás&ikonok"
 Basic.MainMenu.View.StatusBar="Állapot&sor"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximális memória (Megabájt)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Becsült memóriaigény: %1 MB"
 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.HotkeyMessage="(Megjegyzés: Bizonyosodjon meg róla, hogy beállított egy billentyűparancsot az újrajátszás pufferre a gyorsbillentyű szekcióban)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Visszajátszási puffer fájlév előtag"
 Basic.Settings.Output.ReplayBuffer.Suffix="Utótag"
 Basic.Settings.Output.Simple.SavePath="Felvétel helye"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Kulcsképkocka időköz (képkockák)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Minden kodek mutatása (még ha inkompatibilisek is)"
 
+Screenshot="Képernyőkép Kimenet"
+Screenshot.SourceHotkey="Képernyőkép Kiválasztott Forrás"
+Screenshot.StudioProgram="Képernyőkép (Program)"
+Screenshot.Preview="Képernyőkép (Előnézet)"
+Screenshot.Scene="Képernyőkép (Jelenet)"
+Screenshot.Source="Képernyőkép (Forrás)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Év, négy számjegy\n%YY		Év, utolsó két számjegy (00-99)\n%MM		Hónap decimális számként (01-12)\n%DD		Hónap napja, nulla kitöltéssel (01-31)\n%hh		Óra 24 órás formátumban (00-23)\n%mm		Perc (00-59)\n%ss		Másodperc (00-61)\n%%		Egy % jel\n%a		Hétköznap neve rövidítve\n%A		Hétköznap teljes neve\n%b		Hónap neve rövidítve\n%B		Hónap teljes neve\n%d		Hónap napja, nulla kitöltéssel (01-31)\n%H		Óra 24 órás formátumban (00-23)\n%I		Óra 12 órás formátumban (01-12)\n%m		Hónap decimális számként (01-12)\n%M		Perc (00-59)\n%p		DE vagy DU jelölés\n%S		Másodperc (00-61)\n%y		Év, két számjegy (00-99)\n%Y		Év\n%z		Időzóna ISO 8601 eltolása az UTC-hez képest\n%Z		Időzóna neve vagy rövidítése\n%FPS		Képkocka másodpercenként\n%CRES		Alap (vászon) felbontás\n%ORES		Kimeneti (méretezett) felbontás\n%VF		Videoformátum"
@@ -750,10 +770,10 @@
 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: Surround sound hang engedélyezve van."
-Basic.Settings.Audio.MultichannelWarning="Ha közvetít, ellenőrizze, hogy a stream szolgáltatója támogatja mind a surround sound kezelést, mind pedig a surround sound lejátszást. Facebook 360 Live, Mixer RTMP, Smashcast a legjobb példa, hogy mely platformokon van teljes támogatás. Ellenben a Facebook Live és a YouTube Live minden elfogadja a térhangzású hangot, a Facebook Live lekeveri stereora és a YouTube Live csak két csatornát játszik le.\n\nOBS audio szű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="Streaming esetén ellenőrizd, hogy a streaming szolgáltatása támogatja-e a surround hang bevitelét és a surround hang lejátszását is. A Facebook 360 Live egy olyan példa, amelyben a térhatású hangzás teljes mértékben támogatott. Noha a Facebook Live és a YouTube Live egyaránt elfogadja a surround bevitelt, a Facebook Live lekeveredik a sztereó lejátszóval, és a YouTube Live csak két csatornát játszik le.\n\nAz OBS audioszűrők kompatibilisek a surround hanggal, bár a VST plugin támogatása nem garantált."
 Basic.Settings.Audio.MultichannelWarning.Title="Engedélyezi a surround hangzást?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Biztos benne, hogy engedélyezi a surround hangzást?"
-Basic.Settings.Audio.Devices="Eszközök"
+Basic.Settings.Audio.Devices="Általános Hangeszközök"
 Basic.Settings.Audio.DesktopDevice="Asztal audio"
 Basic.Settings.Audio.DesktopDevice2="Asztal audio 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/Aux hang"
@@ -917,3 +937,16 @@
 Restart="Újraindítás"
 NeedsRestart="Az OBS Studio újraindítása szükséges. Szeretné újraindítani most?"
 
+ContextBar.NoSelectedSource="Nincs forrás kiválasztva"
+ContextBar.ResetTransform="Alakí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"
+

obs-studio-26.0.0.tar.xz/UI/data/locale/id-ID.ini Added

@@ -0,0 +1,951 @@
+
+Language="Bahasa Indonesia"
+
+OK="Oke"
+Apply="Terapkan"
+Cancel="Batal"
+Close="Tutup"
+Save="Simpan"
+Discard="Buang"
+Disable="Nonaktifkan"
+Yes="Ya"
+No="Tidak"
+Add="Tambah"
+Remove="Hapus"
+Rename="Ubah Nama"
+Interact="Interaksi"
+Filters="Filter"
+Properties="Properti"
+MoveUp="Ke Atas"
+MoveDown="Ke Bawah"
+Settings="Pengaturan"
+Display="Tampilan"
+Name="Nama"
+Exit="Keluar"
+Mixer="Mixer Audio"
+Browse="Telusuri"
+Mono="Mono"
+Stereo="Stereo"
+DroppedFrames="Frame drop %1 (%2%)"
+StudioProgramProjector="Proyektor Layar Penuh (Program)"
+PreviewProjector="Proyektor Layar Penuh (Pratinjau)"
+SceneProjector="Proyektor Layar Penuh (Adegan)"
+SourceProjector="Proyektor Layar Penuh (Sumber)"
+StudioProgramWindow="Proyektor Windowed (Program)"
+PreviewWindow="Proyektor Windowed (Pratinjau)"
+SceneWindow="Proyektor Windowed (Adegan)"
+SourceWindow="Proyektor Windowed (Sumber)"
+MultiviewProjector="Multiview (Layar Penuh)"
+MultiviewWindowed="Multiview (Windowed)"
+ResizeProjectorWindowToContent="Sesuaikan jendela dengan konten"
+Clear="Bersihkan"
+Revert="Pulihkan"
+Show="Tampilkan"
+Hide="Sembunyikan"
+UnhideAll="Tampilkan Semua"
+Untitled="Tanpa Judul"
+New="Baru"
+Duplicate="Duplikat"
+Enable="Aktifkan"
+DisableOSXVSync="Nonaktifkan macOS V-Sync"
+ResetOSXVSyncOnExit="Reset macOS V-Sync saat Keluar"
+HighResourceUsage="Pengkodean kelebihan beban! Pertimbangkan untuk mengecilkan pengaturan video atau memakai preset pengkodean yang lebih cepat."
+Transition="Transisi"
+QuickTransitions="Transisi Cepat"
+FadeToBlack="Pudar jadi Hitam"
+Left="Kiri"
+Right="Kanan"
+Top="Atas"
+Bottom="Bawah"
+Reset="Reset"
+Hours="Jam"
+Minutes="Menit"
+Seconds="Detik"
+Deprecated="Tidak digunakan lagi"
+ReplayBuffer="Buffer Replay"
+Import="Impor"
+Export="Ekspor"
+Copy="Salin"
+Paste="Tempel"
+PasteReference="Tempel (Referensi)"
+PasteDuplicate="Rekatkan (Duplikat)"
+RemuxRecordings="Remux Rekaman"
+Next="Selanjutnya"
+Back="Kembali"
+Defaults="Default"
+HideMixer="Sembunyikan di Mixer"
+TransitionOverride="Paksa Transisi"
+None="Tidak ada"
+StudioMode.Preview="Preview"
+StudioMode.Program="Program"
+ShowInMultiview="Tampilkan di Multiview"
+VerticalLayout="Tata Letak Vertikal"
+Group="Kelompok"
+DoNotShowAgain="Jangan tampilkan lagi"
+Default="(Default)"
+Calculating="Menghitung..."
+Fullscreen="Layar Penuh"
+Windowed="Windowed"
+Percent="Persen"
+RefreshBrowser="Refresh"
+AspectRatio="Rasio Aspek <b>%1:%2</b>"
+LockVolume="Kunci Volume"
+LogViewer="Penampil Log"
+ShowOnStartup="Tampilkan saat memulai"
+OpenFile="Buka file"
+
+AlreadyRunning.Title="OBS sudah berjalan"
+AlreadyRunning.Text="OBS sudah berjalan! Kecuali Anda bermaksud melakukan ini, harap matikan semua jendela OBS yang ada sebelum mencoba menjalankan jendela baru. Jika Anda memiliki OBS yang diatur untuk minimalkan ke system tray, periksa apakah OBS masih berjalan di situ."
+AlreadyRunning.LaunchAnyway="Jalankan Saja"
+
+ChromeOS.Title="Platform Tidak Didukung"
+ChromeOS.Text="Tampaknya OBS berjalan di dalam kontainer ChromeOS. Platform ini tidak didukung"
+
+DockCloseWarning.Title="Menutup Jendela Dockable"
+DockCloseWarning.Text="Anda baru saja menutup jendela dockable. Jika Anda ingin menampilkannya lagi, gunakan menu Tampilan → Dock pada bar menu."
+
+ExtraBrowsers="Dock Browser Kustom"
+ExtraBrowsers.Info="Tambahkan dock dengan memberi nama dan URL, lalu klik Terapkan atau Tutup untuk membuka dock. Anda dapat menambah atau menghapus dock kapan saja."
+ExtraBrowsers.DockName="Nama dock"
+
+Auth.Authing.Title="Otentikasi..."
+Auth.Authing.Text="Otentikasi dengan %1, tunggu sebentar..."
+Auth.AuthFailure.Title="Otentikasi Gagal"
+Auth.AuthFailure.Text="Gagal mengautentikasi dengan %1:\n\n%2: %3"
+Auth.InvalidScope.Title="Otentikasi Diperlukan"
+Auth.InvalidScope.Text="Persyaratan otentikasi untuk %1 telah berubah. Beberapa fitur mungkin tidak tersedia."
+Auth.LoadingChannel.Title="Memuat informasi saluran..."
+Auth.LoadingChannel.Text="Memuat informasi saluran untuk %1, tunggu sebentar..."
+Auth.ChannelFailure.Title="Gagal memuat saluran"
+Auth.ChannelFailure.Text="Gagal memuat informasi saluran untuk %1\n\n%2: %3"
+Auth.Chat="Chat"
+Auth.StreamInfo="Informasi Streaming"
+TwitchAuth.Stats="Status Twitch"
+TwitchAuth.Feed="Umpan Aktivitas Twitch"
+TwitchAuth.TwoFactorFail.Title="Tidak bisa meminta kunci streaming"
+TwitchAuth.TwoFactorFail.Text="OBS tidak dapat terhubung ke akun Twitch Anda. Harap pastikan otentikasi dua faktor diatur di <a href='https://www.twitch.tv/settings/security'>pengaturan keamanan Twitch</a> Anda karena ini diperlukan untuk streaming."
+RestreamAuth.Channels="Streaming Ulang Saluran"
+
+Copy.Filters="Salin Filter"
+Paste.Filters="Tempel Filter"
+
+BrowserPanelInit.Title="Inisialisasi Browser..."
+BrowserPanelInit.Text="Inisialisasi browser, tunggu sebentar..."
+
+BandwidthTest.Region="Wilayah"
+BandwidthTest.Region.US="Amerika Serikat"
+BandwidthTest.Region.EU="Eropa"
+BandwidthTest.Region.Asia="Asia"
+BandwidthTest.Region.Other="Lainnya"
+
+Basic.AutoConfig="Layanan Konfigurasi Otomatis"
+Basic.AutoConfig.ApplySettings="Terapkan Pengaturan"
+Basic.AutoConfig.StartPage="Informasi Penggunaan"
+Basic.AutoConfig.StartPage.SubTitle="Tentukan untuk apa Anda ingin menggunakan program ini"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="Dioptimalkan untuk streaming, rekaman adalah opsi kedua"
+Basic.AutoConfig.StartPage.PrioritizeRecording="Dioptimalkan hanya untuk merekam, saya tidak akan streaming"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Saya hanya akan menggunakan kamera virtual"
+Basic.AutoConfig.VideoPage="Pengaturan Video"
+Basic.AutoConfig.VideoPage.SubTitle="Tentukan pengaturan video yang ingin Anda gunakan"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Gunakan Saat Ini (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Tampilan %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Gunakan Saat Ini (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Antara 60 atau 30, tetapi lebih memilih 60 jika memungkinkan"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Antara 60 atau 30, tetapi lebih memilih beresolusi tinggi"
+Basic.AutoConfig.VideoPage.CanvasExplanation="Catatan: Resolusi kanvas (dasar) tidak harus sama dengan resolusi yang akan Anda siarkan atau rekam. Resolusi streaming/rekaman Anda yang sebenarnya dapat diturunkan dari resolusi kanvas untuk mengurangi penggunaan sumber daya atau bitrate yang diperlukan."
+Basic.AutoConfig.StreamPage="Informasi Streaming"
+Basic.AutoConfig.StreamPage.SubTitle="Silahkan masukkan informasi streaming Anda"
+Basic.AutoConfig.StreamPage.ConnectAccount="Hubungkan Akun (disarankan)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Putuskan Sambungan Akun"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Putuskan Sambungan Akun?"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Perubahan ini akan diterapkan segera. Apakah Anda yakin ingin memutuskan koneksi akun Anda?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Dapatkan Stream Key"
+Basic.AutoConfig.StreamPage.UseStreamKey="Gunakan Stream Key"
+Basic.AutoConfig.StreamPage.Service="Layanan"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Tampilkan Semua..."
+Basic.AutoConfig.StreamPage.Service.Custom="Kustom..."
+Basic.AutoConfig.StreamPage.Server="Server"
+Basic.AutoConfig.StreamPage.StreamKey="Stream Key"
+Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Tautan)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Perkirakan bitrate dengan uji bandwidth (mungkin perlu beberapa menit)"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Lebih memilih pengkodean hardware"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Pengkodean Hardware mengurangi sebagian besar pemakaian CPU, tetapi mungkin memerlukan bitrate lebih banyak untuk mendapatkan kualitas yang sama."
+Basic.AutoConfig.StreamPage.StreamWarning.Title="Peringatan streaming"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Tes bandwidth akan melakukan streaming data video acak tanpa audio ke saluran Anda. Jika bisa, disarankan untuk menonaktifkan sementara menyimpan video stream dan atur streaming ke pribadi hingga tes selesai. Lanjutkan?"
+Basic.AutoConfig.TestPage="Hasil Akhir"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Program sekarang menjalankan serangkaian tes untuk memperkirakan pengaturan yang paling ideal"
+Basic.AutoConfig.TestPage.SubTitle.Complete="Tes selesai"
+Basic.AutoConfig.TestPage.TestingBandwidth="Melakukan uji bandwidth, ini mungkin memerlukan waktu beberapa menit..."
+Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Menghubungkan ke: %1..."
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Gagal terhubung ke server mana pun, periksa koneksi internet Anda, lalu coba lagi."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Menguji bandwidth untuk: %1"
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Menguji enkoder streaming, ini mungkin memerlukan waktu satu menit..."
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="Menguji enkoder rekaman, ini mungkin memerlukan waktu satu menit..."
+Basic.AutoConfig.TestPage.TestingRes="Menguji resolusi, ini mungkin memerlukan waktu beberapa menit..."
+Basic.AutoConfig.TestPage.TestingRes.Fail="Gagal memulai enkoder"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="Menguji %1x%2 %3 FPS..."
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Enkoder Streaming"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="Enkoder Rekaman"
+Basic.AutoConfig.TestPage.Result.Header="Program telah menentukan perkiraan setingan yang paling ideal untuk Anda:"
+Basic.AutoConfig.TestPage.Result.Footer="Untuk menggunakan pengaturan ini, klik Terapkan Pengaturan. Untuk mengonfigurasi ulang layanan dan mencoba lagi, klik Kembali. Untuk mengonfigurasi sendiri pengaturan secara manual, klik Batal dan buka Pengaturan."
+Basic.AutoConfig.Info="Layanan konfigurasi otomatis akan menentukan pengaturan terbaik berdasarkan spesifikasi komputer dan kecepatan internet Anda."
+Basic.AutoConfig.RunAnytime="Ini dapat dijalankan kapan saja dengan membuka menu Alat."
+
+Basic.Stats="Statistik"
+Basic.Stats.CPUUsage="Pemakaian CPU"
+Basic.Stats.HDDSpaceAvailable="Ruang disk tersedia"
+Basic.Stats.MemoryUsage="Penggunaan Memori"
+Basic.Stats.AverageTimeToRender="Waktu rata-rata untuk merender frame"
+Basic.Stats.SkippedFrames="Frame yang dilewati karena enkoder lag"
+Basic.Stats.MissedFrames="Frame yang hilang karena rendering lag"
+Basic.Stats.Output.Stream="Streaming"
+Basic.Stats.Output.Recording="Merekam"
+Basic.Stats.Status="Status"
+Basic.Stats.Status.Recording="Merekam"
+Basic.Stats.Status.Live="LIVE"
+Basic.Stats.Status.Reconnecting="Menyambung ulang"
+Basic.Stats.Status.Inactive="Tidak aktif"
+Basic.Stats.Status.Active="Aktif"
+Basic.Stats.DroppedFrames="Frame Ter-drop (Jaringan)"
+Basic.Stats.MegabytesSent="Total Output Data"
+Basic.Stats.Bitrate="Bitrate"
+Basic.Stats.DiskFullIn="Disk penuh dalam (kira-kira)"
+Basic.Stats.ResetStats="Atur Ulang Statistik"
+
+ResetUIWarning.Title="Apakah Anda yakin ingin mengatur ulang UI?"
+ResetUIWarning.Text="Mengatur ulang UI akan menyembunyikan dok tambahan. Anda harus menampilkan dok ini dari menu tampilan jika Anda ingin terlihat.\n\nApakah Anda yakin ingin mengatur ulang UI?"
+
+Updater.Title="Update baru tersedia"
+Updater.Text="Ada update terbaru yang tersedia:"
+Updater.UpdateNow="Update sekarang"
+Updater.RemindMeLater="Ingatkan saya nanti"
+Updater.Skip="Lewati Versi"
+Updater.Running.Title="Program sedang aktif"
+Updater.Running.Text="Output saat ini aktif, harap matikan semua output yang aktif sebelum mencoba meng-update"
+Updater.NoUpdatesAvailable.Title="Tidak ada update tersedia"
+Updater.NoUpdatesAvailable.Text="Tidak ada update yang tersedia saat ini"
+Updater.FailedToLaunch="Gagal menjalankan updater"
+Updater.GameCaptureActive.Title="Tangkapan game aktif"
+Updater.GameCaptureActive.Text="Pustaka kait tangkapan game sedang digunakan. Harap tutup semua game/program yang sedang ditangkap (atau mulai ulang Windows) lalu coba lagi."
+
+QuickTransitions.SwapScenes="Tukar Adegan Preview/Output Setelah Transisi"
+QuickTransitions.SwapScenesTT="Tukar adegan preview dan output setelah transisi (jika adegan asli output masih ada).\nIni tidak akan dapat membatalkan perubahan apa pun yang mungkin telah dilakukan pada adegan asli output."
+QuickTransitions.DuplicateScene="Duplikat Adegan"
+QuickTransitions.DuplicateSceneTT="Saat mengedit adegan yang sama, perbolehkan mengedit transformasi/visibilitas sumber tanpa mengubah output.\nUntuk mengedit properti sumber tanpa mengubah output, aktifkan 'Duplikat Sumber'.\nMengubah pilihan ini dapat mengatur ulang adegan output saat ini (jika masih ada)."
+QuickTransitions.EditProperties="Duplikat Sumber"
+QuickTransitions.EditPropertiesTT="Saat mengedit adegan yang sama, membolehkan pengeditan properti sumber tanpa mengubah output.\n Ini hanya dapat digunakan jika 'Duplikat Adegan' diaktifkan.\nSumber-sumber tertentu (seperti sumber tangkapan atau media) tidak mendukung ini dan tidak dapat diedit secara terpisah.\nMengubah pilihan ini dapat mengatur ulang adegan output (jika masih ada).\n\nPeringatan: Karena sumber akan diduplikat, ini mungkin memerlukan sumber daya sistem atau video tambahan."
+QuickTransitions.HotkeyName="Transisi Cepat: %1"
+
+Basic.AddTransition="Tambahkan Transisi yang Bisa Diatur"
+Basic.RemoveTransition="Hapus Transisi yang Bisa Diatur"
+Basic.TransitionProperties="Properti Transisi"
+Basic.SceneTransitions="Transisi Adegan"
+Basic.TransitionDuration="Durasi"
+Basic.TogglePreviewProgramMode="Mode Studio"
+
+TransitionNameDlg.Text="Silahkan masukkan nama transisi"
+TransitionNameDlg.Title="Nama Transisi"
+
+TitleBar.Profile="Profil"
+TitleBar.Scenes="Adegan"
+
+NameExists.Title="Nama sudah ada"
+NameExists.Text="Nama sudah digunakan."
+
+NoNameEntered.Title="Masukkan nama yang valid"
+NoNameEntered.Text="Anda tidak bisa mengosongkan nama."
+
+ConfirmStart.Title="Mulai Streaming?"
+ConfirmStart.Text="Anda yakin ingin memulai streaming?"
+
+ConfirmStop.Title="Berhenti Streaming?"
+ConfirmStop.Text="Anda yakin ingin berhenti streaming?"
+
+ConfirmStopRecord.Title="Berhenti Merekam?"
+ConfirmStopRecord.Text="Anda yakin ingin berhenti merekam?"
+
+ConfirmBWTest.Title="Mulai Uji Bandwidth?"
+ConfirmBWTest.Text="Anda telah mengkonfigurasi OBS dalam mode uji bandwidth. Mode ini memungkinkan untuk pengujian jaringan tanpa membuat saluran Anda live. Setelah pengujian selesai, Anda harus menonaktifkannya agar penonton dapat melihat tayangan Anda. \n\nLanjutkan?"
+
+ConfirmExit.Title="Keluar OBS?"
+ConfirmExit.Text="OBS saat ini sedang berjalan. Semua tayangan/rekaman akan dihentikan. Anda yakin ingin keluar?"
+
+ConfirmRemove.Title="Konfirmasi Hapus"
+ConfirmRemove.Text="Anda yakin ingin menghapus '$1'?"
+ConfirmRemove.TextMultiple="Anda yakin ingin menghapus %1 item?"
+
+Output.StartStreamFailed="Gagal memulai streaming"
+Output.StartRecordingFailed="Gagal memulai rekaman"
+Output.StartReplayFailed="Gagal memulai buffer replay"
+Output.StartFailedGeneric="Gagal memulai output. Silakan periksa log untuk lebih detail. \n\nCatatan: Jika Anda menggunakan enkoder NVENC atau AMD, pastikan versi driver video Anda terbaru."
+
+Output.ReplayBuffer.PauseWarning.Title="Tidak dapat menyimpan replay saat dijeda"
+Output.ReplayBuffer.PauseWarning.Text="Peringatan: Replay tidak dapat disimpan saat rekaman dijeda."
+
+Output.ConnectFail.Title="Gagal menghubungkan"
+Output.ConnectFail.BadPath="Jalur atau URL Sambungan Tidak Valid. Periksa pengaturan Anda untuk mengonfirmasi jalur/URL dengan benar."
+Output.ConnectFail.ConnectFailed="Gagal menyambung ke server"
+Output.ConnectFail.InvalidStream="Tidak dapat mengakses saluran atau stream key yang ditentukan, periksa ulang stream key Anda. Jika sudah benar, mungkin ada masalah saat menyambung ke server."
+Output.ConnectFail.Error="Kesalahan tak terduga terjadi ketika mencoba terhubung ke server. Info lebih lanjut ada di file log."
+Output.ConnectFail.Disconnected="Terputus dari sever."
+
+Output.StreamEncodeError.Title="Kesalahan enkoder"
+Output.StreamEncodeError.Msg="Kesalahan enkoder terjadi saat streaming."
+
+Output.RecordFail.Title="Gagal memulai rekaman"
+Output.RecordFail.Unsupported="Format output tidak didukung atau tidak mendukung lebih dari satu trek audio. Periksa pengaturan Anda, lalu coba lagi."
+Output.RecordNoSpace.Title="Penyimpanan tidak cukup"
+Output.RecordNoSpace.Msg="Penyimpanan tidak cukup untuk melanjutkan rekaman."
+Output.RecordError.Title="Kesalahan perekaman"
+Output.RecordError.Msg="Terjadi kesalahan yang tidak ditentukan saat merekam."
+Output.RecordError.EncodeErrorMsg="Kesalahan enkoder terjadi saat merekam."
+
+Output.BadPath.Title="Jalur File Rusak"
+Output.BadPath.Text="Konfigurasi jalur output file tidak valid. Periksa pengaturan Anda untuk memeriksa jalur file dengan benar."
+
+LogReturnDialog="Upload log berhasil"
+LogReturnDialog.Description="Berkas log Anda telah diunggah. Kini Anda dapat membagikan URL untuk tujuan debugging atau bantuan."
+LogReturnDialog.Description.Crash="Laporan galat Anda telah diunggah. Kini Anda dapat membagikan URL untuk tujuan debugging."
+LogReturnDialog.CopyURL="Salin URL"
+LogReturnDialog.AnalyzeURL="Analisa"
+LogReturnDialog.ErrorUploadingLog="Kesalahan mengupload file log"
+
+Remux.SourceFile="Rekaman OBS"
+Remux.TargetFile="File Target"
+Remux.Remux="Remux"
+Remux.Stop="Berhenti Remux"
+Remux.ClearFinished="Bersihkan Item Jadi"
+Remux.ClearAll="Bersihkan Semua"
+Remux.OBSRecording="Rekaman OBS"
+Remux.FinishedTitle="Remux selesai"
+Remux.Finished="Rekaman telah di-remux"
+Remux.FinishedError="Rekaman telah di-remux, tetapi file mungkin tidak lengkap"
+Remux.SelectRecording="Pilih Rekaman OBS..."
+Remux.SelectTarget="Pilih file target..."
+Remux.FileExistsTitle="File target sudah ada"
+Remux.FileExists="File target tersebut sudah ada. Apakah Anda ingin menggantinya?"
+Remux.ExitUnfinishedTitle="Remuxing sedang diproses"
+Remux.ExitUnfinished="Remuxing belum selesai, menghentikan sekarang dapat membuat file target tidak bisa di-render.\nAnda yakin ingin menghentikan remuxing?"
+Remux.HelpText="Seret file ke jendela ini untuk di-remux, atau pilih baris \"Rekaman OBS\" yang kosong untuk mencari file."
+
+UpdateAvailable="Update Baru Telah Tersedia"
+UpdateAvailable.Text="Versi %1.%2.%3 telah tersedia. <a href='%4'>Klik disini untuk mendownload</a>"
+
+Basic.DesktopDevice1="Audio Desktop"
+Basic.DesktopDevice2="Audio Desktop 2"
+Basic.AuxDevice1="Mic/Aux"
+Basic.AuxDevice2="Mic/Aux 2"
+Basic.AuxDevice3="Mic/Aux 3"
+Basic.AuxDevice4="Mic/Aux 4"
+
+Basic.Scene="Adegan"
+Basic.DisplayCapture="Tangkapan Layar"
+
+Basic.Main.PreviewConextMenu.Enable="Aktifkan Preview"
+
+Basic.Main.Preview.Disable="Nonaktifkan Preview"
+
+ScaleFiltering="Skala Filter"
+ScaleFiltering.Point="Titik"
+ScaleFiltering.Bilinear="Bilinear"
+ScaleFiltering.Bicubic="Bikubik"
+ScaleFiltering.Lanczos="Lanczos"
+ScaleFiltering.Area="Area"
+
+Deinterlacing="Deinterlacing"
+Deinterlacing.Discard="Discard"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Bagian Atas Dahulu"
+Deinterlacing.BottomFieldFirst="Bagian Bawah Dahulu"
+
+VolControl.SliderUnmuted="Penggeser volume untuk '%1': %2"
+VolControl.SliderMuted="Penggeser volume untuk '%1': %2 (saat ini dibisukan)"
+VolControl.Mute="Bisukan '%1'"
+VolControl.Properties="Properti '%1'"
+
+Basic.Main.AddSceneDlg.Title="Tambahkan Adegan"
+Basic.Main.AddSceneDlg.Text="Silakan masukkan nama adegan"
+
+Basic.Main.DefaultSceneName.Text="Adegan %1"
+
+Basic.Main.AddSceneCollection.Title="Tambahkan Koleksi Adegan"
+Basic.Main.AddSceneCollection.Text="Silakan masukkan nama koleksi"
+
+Basic.Main.RenameSceneCollection.Title="Ubah Nama Koleksi Adegan"
+
+AddProfile.Title="Tambah Profil"
+AddProfile.Text="Silakan masukkan nama profil"
+
+RenameProfile.Title="Ubah Nama Profil"
+
+Basic.Main.MixerRename.Title="Ubah Nama Sumber Audio"
+Basic.Main.MixerRename.Text="Silakan masukkan nama sumber audio"
+
+
+Basic.Main.PreviewDisabled="Preview saat ini dinonaktifkan"
+
+Basic.SourceSelect="Buat/Pilih Sumber"
+Basic.SourceSelect.CreateNew="Buat baru"
+Basic.SourceSelect.AddExisting="Tambahkan Yang Ada"
+Basic.SourceSelect.AddVisible="Buat sumber terlihat"
+
+Basic.PropertiesWindow="Properti '%1'"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (pilih-otomatis: %2)"
+Basic.PropertiesWindow.SelectColor="Pilih warna"
+Basic.PropertiesWindow.SelectFont="Pilih font"
+Basic.PropertiesWindow.ConfirmTitle="Pengaturan Diubah"
+Basic.PropertiesWindow.Confirm="Ada perubahan yang belum disimpan. Apakah Anda ingin menyimpannya?"
+Basic.PropertiesWindow.NoProperties="Tidak ada properti tersedia"
+Basic.PropertiesWindow.AddFiles="Tambah File"
+Basic.PropertiesWindow.AddDir="Tambah Direktori"
+Basic.PropertiesWindow.AddURL="Tambah Jalur/URL"
+Basic.PropertiesWindow.AddEditableListDir="Tambahkan direktori untuk '%1'"
+Basic.PropertiesWindow.AddEditableListFiles="Tambahkan file untuk '%1'"
+Basic.PropertiesWindow.AddEditableListEntry="Tambahkan entri untuk '%1'"
+Basic.PropertiesWindow.EditEditableListEntry="Edit entri dari '%1'"
+
+Basic.PropertiesView.FPS.Simple="Nilai FPS sederhana"
+Basic.PropertiesView.FPS.Rational="Nilai FPS Rasional"
+Basic.PropertiesView.FPS.ValidFPSRanges="Rentang FPS yang valid:"
+
+Basic.InteractionWindow="Berinteraksi dengan '%1'"
+
+Basic.StatusBar.Reconnecting="Terputus, terhubung kembali dalam %2 detik (percobaan %1)"
+Basic.StatusBar.AttemptingReconnect="Mencoba menyambung kembali... (percobaan %1)"
+Basic.StatusBar.ReconnectSuccessful="Berhasil Menyambung Ulang"
+Basic.StatusBar.Delay="Delay (%1 detik)"
+Basic.StatusBar.DelayStartingIn="Delay (mulai dalam %1 dtk)"
+Basic.StatusBar.DelayStoppingIn="Tunda (berhenti dalam %1 dtk)"
+Basic.StatusBar.DelayStartingStoppingIn="Delay (berhenti dalam %1 dtk, mulai dalam %2 dtk)"
+
+Basic.Filters="Filter"
+Basic.Filters.AsyncFilters="Filter Audio/Video"
+Basic.Filters.AudioFilters="Filter Audio"
+Basic.Filters.EffectFilters="Filter Efek"
+Basic.Filters.Title="Filter '%1'"
+Basic.Filters.AddFilter.Title="Nama filter"
+Basic.Filters.AddFilter.Text="Silakan tentukan nama filter"
+
+Basic.TransformWindow="Transformasi Item Adegan"
+Basic.TransformWindow.Position="Posisi"
+Basic.TransformWindow.Rotation="Rotasi"
+Basic.TransformWindow.Size="Ukuran"
+Basic.TransformWindow.Alignment="Penjajaran Posisi"
+Basic.TransformWindow.BoundsType="Tipe Kotak Pembatas"
+Basic.TransformWindow.BoundsAlignment="Penjajaran dalam Kotak Pembatas"
+Basic.TransformWindow.Bounds="Ukuran Kotak Pembatas"
+Basic.TransformWindow.Crop="Potong"
+
+Basic.TransformWindow.Alignment.TopLeft="Kiri Atas"
+Basic.TransformWindow.Alignment.TopCenter="Tengah Atas"
+Basic.TransformWindow.Alignment.TopRight="Kanan Atas"
+Basic.TransformWindow.Alignment.CenterLeft="Kiri Tengah"
+Basic.TransformWindow.Alignment.Center="Tengah"
+Basic.TransformWindow.Alignment.CenterRight="Kanan Tengah"
+Basic.TransformWindow.Alignment.BottomLeft="Kiri Bawah"
+Basic.TransformWindow.Alignment.BottomCenter="Tengah Bawah"
+Basic.TransformWindow.Alignment.BottomRight="Kanan Bawah"
+
+Basic.TransformWindow.BoundsType.None="Tidak ada batas"
+Basic.TransformWindow.BoundsType.MaxOnly="Ukuran maksimal saja"
+Basic.TransformWindow.BoundsType.ScaleInner="Skalakan ke batas dalam"
+Basic.TransformWindow.BoundsType.ScaleOuter="Skalakan ke batas luar"
+Basic.TransformWindow.BoundsType.ScaleToWidth="Skalakan ke lebar batas"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Skalakan ke tinggi batas"
+Basic.TransformWindow.BoundsType.Stretch="Stretch ke batas"
+
+Basic.Main.AddSourceHelp.Title="Tidak Bisa Menambahkan Sumber"
+Basic.Main.AddSourceHelp.Text="Anda harus memiliki setidaknya 1 adegan untuk menambahkan sumber."
+
+Basic.Main.Scenes="Adegan"
+Basic.Main.Sources="Sumber"
+Basic.Main.Controls="Kontrol"
+Basic.Main.Connecting="Menyambungkan..."
+Basic.Main.StartRecording="Mulai Merekam"
+Basic.Main.StartReplayBuffer="Jalankan Buffer Replay"
+Basic.Main.SaveReplay="Simpan Replay"
+Basic.Main.StartStreaming="Mulai Streaming"
+Basic.Main.StartVirtualCam="Mulai Kamera Virtual"
+Basic.Main.StopRecording="Berhenti Merekam"
+Basic.Main.PauseRecording="Jeda Rekaman"
+Basic.Main.UnpauseRecording="Lanjut Merekam"
+Basic.Main.StoppingRecording="Menghentikan Perekaman..."
+Basic.Main.StopReplayBuffer="Hentikan Buffer Replay"
+Basic.Main.StoppingReplayBuffer="Menghentikan Buffer Replay..."
+Basic.Main.StopStreaming="Berhenti Streaming"
+Basic.Main.StoppingStreaming="Menghentikan Streaming..."
+Basic.Main.ForceStopStreaming="Hentikan Streaming (buang delay)"
+Basic.Main.ShowContextBar="Tampilkan Toolbar Sumber"
+Basic.Main.HideContextBar="Sembunyikan Toolbar Sumber"
+Basic.Main.StopVirtualCam="Hentikan Kamera Virtual"
+Basic.Main.Group="Kelompok %1"
+Basic.Main.GroupItems="Kelompokkan Item Terpilih"
+Basic.Main.Ungroup="Pisahkan Kelompok"
+Basic.Main.GridMode="Mode Grid"
+Basic.Main.ListMode="Mode Daftar"
+
+Basic.MainMenu.File="&File"
+Basic.MainMenu.File.Export="&Ekspor"
+Basic.MainMenu.File.Import="&Impor"
+Basic.MainMenu.File.ShowRecordings="Tampilkan &Rekaman"
+Basic.MainMenu.File.Remux="Re&mux Rekaman"
+Basic.MainMenu.File.Settings="Pengaturan (&S)"
+Basic.MainMenu.File.ShowSettingsFolder="Tampilkan Folder Pengaturan"
+Basic.MainMenu.File.ShowProfileFolder="Tampilkan Folder Profil"
+Basic.MainMenu.AlwaysOnTop="Sel&alu di Atas"
+Basic.MainMenu.File.Exit="Keluar (&X)"
+
+Basic.MainMenu.Edit="&Edit"
+Basic.MainMenu.Edit.Undo="Batalkan (&U)"
+Basic.MainMenu.Edit.Redo="Ulangi (&R)"
+Basic.MainMenu.Edit.UndoAction="Batalkan $1 (&U)"
+Basic.MainMenu.Edit.RedoAction="Ulangi $1 (&R)"
+Basic.MainMenu.Edit.LockPreview="Kunci Preview (&L)"
+Basic.MainMenu.Edit.Scale="&Skala Preview"
+Basic.MainMenu.Edit.Scale.Window="Skalakan ke Jendela"
+Basic.MainMenu.Edit.Scale.Canvas="Kanvas (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="Output (%1x%2)"
+Basic.MainMenu.Edit.Transform="&Transformasi"
+Basic.MainMenu.Edit.Transform.EditTransform="&Edit Transformasi..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Salin Transformasi"
+Basic.MainMenu.Edit.Transform.PasteTransform="Tempel Transformasi"
+Basic.MainMenu.Edit.Transform.ResetTransform="&Reset Transformasi"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Putar 90 derajat kekanan"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Putar 90 derajat kekiri"
+Basic.MainMenu.Edit.Transform.Rotate180="Putar 180 derajat"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Berbalik &Horizontal"
+Basic.MainMenu.Edit.Transform.FlipVertical="Berbalik &Vertikal"
+Basic.MainMenu.Edit.Transform.FitToScreen="Pas dengan layar (&F)"
+Basic.MainMenu.Edit.Transform.StretchToScreen="Regangkan ke layar (&S)"
+Basic.MainMenu.Edit.Transform.CenterToScreen="Di tengah layar (&C)"
+Basic.MainMenu.Edit.Transform.VerticalCenter="Tengah Vertikal"
+Basic.MainMenu.Edit.Transform.HorizontalCenter="Tengah Horizontal"
+Basic.MainMenu.Edit.Order="Atur (&O)"
+Basic.MainMenu.Edit.Order.MoveUp="Ke Atas (&U)"
+Basic.MainMenu.Edit.Order.MoveDown="Ke Bawah (&D)"
+Basic.MainMenu.Edit.Order.MoveToTop="Ke Paling Depan (&T)"
+Basic.MainMenu.Edit.Order.MoveToBottom="Ke Paling &Belakang"
+Basic.MainMenu.Edit.AdvAudio="Properti &Audio Lanjutan"
+
+Basic.MainMenu.View="Tampilan (&V)"
+Basic.MainMenu.View.Toolbars="&Toolbar"
+Basic.MainMenu.View.Docks="Dok"
+Basic.MainMenu.View.Docks.ResetUI="Atur Ulang UI"
+Basic.MainMenu.View.Docks.LockUI="Kunci UI"
+Basic.MainMenu.View.Docks.CustomBrowserDocks="Dok Browser Kustom..."
+Basic.MainMenu.View.ListboxToolbars="Tombol Daftar Adegan/Sumber"
+Basic.MainMenu.View.ContextBar="Toolbar 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.SceneCollection="Kolek&si Adegan"
+Basic.MainMenu.Profile="&Profil"
+Basic.MainMenu.Profile.Import="Impor Profil"
+Basic.MainMenu.Profile.Export="Ekspor Profil"
+Basic.MainMenu.SceneCollection.Import="Impor Koleksi Adegan"
+Basic.MainMenu.SceneCollection.Export="Ekspor Koleksi Adegan"
+Basic.MainMenu.Profile.Exists="Profil telah ada"
+Basic.MainMenu.SceneCollection.Exists="Koleksi adegan telah ada"
+
+Basic.MainMenu.Tools="Ala&t"
+
+Basic.MainMenu.Help="Bantuan (&H)"
+Basic.MainMenu.Help.HelpPortal="&Portal Bantuan"
+Basic.MainMenu.Help.Website="Kunjungi &Website"
+Basic.MainMenu.Help.Discord="Gabung Server &Discord"
+Basic.MainMenu.Help.Logs="File &Log"
+Basic.MainMenu.Help.Logs.ShowLogs="Tampilkan File Log (&S)"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Unggah File Log Saat Ini (&C)"
+Basic.MainMenu.Help.Logs.UploadLastLog="Up&load File Log Terakhir"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="Tampilkan Log Saat Ini (&V)"
+Basic.MainMenu.Help.CheckForUpdates="Periksa Update"
+Basic.MainMenu.Help.CrashLogs="Lapo&ran Crash"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Tampilkan Laporan Cra&sh"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Up&load Laporan Crash Terakhir"
+Basic.MainMenu.Help.About="Tent&ang"
+
+Basic.Settings.ProgramRestart="Program harus dimulai ulang agar pengaturan ini berlaku."
+Basic.Settings.ConfirmTitle="Konfirmasikan Perubahan"
+Basic.Settings.Confirm="Anda memiliki perubahan yang belum disimpan. Simpan perubahan?"
+
+Basic.Settings.General="Umum"
+Basic.Settings.General.Theme="Tema"
+Basic.Settings.General.Language="Bahasa"
+Basic.Settings.General.EnableAutoUpdates="Otomatis memeriksa pembaruan saat startup"
+Basic.Settings.General.OpenStatsOnStartup="Buka dialog statistik saat startup"
+Basic.Settings.General.WarnBeforeStartingStream="Tampilkan dialog konfirmasi saat memulai streaming"
+Basic.Settings.General.WarnBeforeStoppingStream="Tampilkan dialog konfirmasi saat menghentikan streaming"
+Basic.Settings.General.WarnBeforeStoppingRecord="Tampilkan dialog konfirmasi saat menghentikan rekaman"
+Basic.Settings.General.Projectors="Proyektor"
+Basic.Settings.General.HideProjectorCursor="Sembunyikan cursor di Proyektor"
+Basic.Settings.General.ProjectorAlwaysOnTop="Jadikan proyektor selalu di atas"
+Basic.Settings.General.Snapping="Sentakan Penjajaran Sumber"
+Basic.Settings.General.ScreenSnapping="Sentakkan Sumber ke tepi layar"
+Basic.Settings.General.CenterSnapping="Sentakkan Sumber ke pusat horizontal dan vertikal"
+Basic.Settings.General.SourceSnapping="Sentakkan Sumber ke sumber lain"
+Basic.Settings.General.SnapDistance="Sensitivitas Sentakan"
+Basic.Settings.General.RecordWhenStreaming="Otomatis merekam saat streaming"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Terus merekam saat streaming berhenti"
+Basic.Settings.General.ReplayBufferWhileStreaming="Otomatis memulai buffer replay saat streaming"
+Basic.Settings.General.KeepReplayBufferStreamStops="Tetap aktifkan buffer replay saat streaming berhenti"
+Basic.Settings.General.SysTray="System Tray"
+Basic.Settings.General.SysTrayWhenStarted="Minimalkan ke system tray saat dimulai"
+Basic.Settings.General.SystemTrayHideMinimize="Selalu minimalkan ke system tray daripada ke taskbar"
+Basic.Settings.General.SaveProjectors="Simpan proyektor saat keluar"
+Basic.Settings.General.Preview="Preview"
+Basic.Settings.General.OverflowHidden="Sembunyikan overflow"
+Basic.Settings.General.OverflowAlwaysVisible="Overflow selalu terlihat"
+Basic.Settings.General.OverflowSelectionHidden="Tampilkan overflow bahkan jika sumber tidak terlihat"
+Basic.Settings.General.Importers="Pengimpor"
+Basic.Settings.General.AutomaticCollectionSearch="Cari lokasi yang diketahui untuk koleksi adegan saat mengimpor"
+Basic.Settings.General.SwitchOnDoubleClick="Transisi ke adegan ketika diklik dua kali"
+Basic.Settings.General.StudioPortraitLayout="Aktifkan tata letak potret/vertikal"
+Basic.Settings.General.TogglePreviewProgramLabels="Tampilkan label preview/rogram"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Klik untuk beralih antar adegan"
+Basic.Settings.General.Multiview.DrawSourceNames="Tampilkan nama adegan"
+Basic.Settings.General.Multiview.DrawSafeAreas="Gambar area aman (EBU R 95)"
+Basic.Settings.General.MultiviewLayout="Tata Letak Multiview"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, Atas (8 Adegan)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, Bawah (8 Adegan)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikal, Kiri (8 Adegan)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikal, Kanan (8 Adegan)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, Atas (24 Adegan)"
+
+Basic.Settings.Stream="Streaming"
+Basic.Settings.Stream.StreamType="Jenis Streaming"
+Basic.Settings.Stream.Custom.UseAuthentication="Gunakan otentikasi"
+Basic.Settings.Stream.Custom.Username="Nama pengguna"
+Basic.Settings.Stream.Custom.Password="Kata sandi"
+Basic.Settings.Stream.BandwidthTestMode="Aktifkan Mode Uji Bandwidth"
+Basic.Settings.Stream.TTVAddon="Add-On Chat Twitch"
+Basic.Settings.Stream.TTVAddon.None="Tidak ada"
+Basic.Settings.Stream.TTVAddon.Both="BetterTTV dan FrankerFaceZ"
+Basic.Settings.Stream.MissingSettingAlert="Setup Streaming Tidak Ada"
+Basic.Settings.Stream.StreamSettingsWarning="Buka Pengaturan"
+Basic.Settings.Stream.MissingUrlAndApiKey="URL dan Stream Key tidak ada.\n\nBuka pengaturan untuk memasukkan URL dan Stream Key di tab 'streaming'."
+Basic.Settings.Stream.MissingUrl="URL tidak ada.\n\nBuka pengaturan untuk memasukkan URL di tab 'Streaming'."
+Basic.Settings.Stream.MissingStreamKey="Stream key tidak ada.\n\nBuka pengaturan untuk memasukkan stream key di tab 'Streaming'."
+
+Basic.Settings.Output="Output"
+Basic.Settings.Output.Format="Format Rekaman"
+Basic.Settings.Output.Encoder="Enkoder"
+Basic.Settings.Output.SelectDirectory="Pilih Direktori Rekaman"
+Basic.Settings.Output.SelectFile="Pilih File Rekaman"
+Basic.Settings.Output.EnforceBitrate="Tegakkan batas bitrate layanan streaming"
+Basic.Settings.Output.DynamicBitrate="Ubah bitrate secara dinamis untuk mengelola gangguan"
+Basic.Settings.Output.DynamicBitrate.Beta="Ubah bitrate secara dinamis untuk mengelola gangguan (Beta)"
+Basic.Settings.Output.DynamicBitrate.TT="Alih-alih men-dropkan frame untuk mengurangi gangguan, secara dinamis mengubah bitrate dengan cepat.\n\nPerhatikan bahwa ini dapat meningkatkan waktu delay bagi penoton jika ada gangguan tiba-tiba yang signifikan.\nKetika bitrate turun, diperlukan waktu beberapa menit untuk memulihkannya.\n\nSaat ini hanya didukung untuk RTMP."
+Basic.Settings.Output.Mode="Mode Output"
+Basic.Settings.Output.Mode.Simple="Sederhana"
+Basic.Settings.Output.Mode.Adv="Tingkat Lanjut"
+Basic.Settings.Output.Mode.FFmpeg="Output FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Aktifkan Buffer Replay"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Waktu Replay Maksimum"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memori Maksimum (Megabyte)"
+Basic.Settings.Output.ReplayBuffer.Estimate="Perkiraan penggunaan memori: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Tidak dapat memperkirakan penggunaan memori. Harap atur batas memori maksimum."
+Basic.Settings.Output.ReplayBuffer.Prefix="Awalan Nama File Buffer Replay"
+Basic.Settings.Output.ReplayBuffer.Suffix="Akhiran"
+Basic.Settings.Output.Simple.SavePath="Jalur Rekaman"
+Basic.Settings.Output.Simple.RecordingQuality="Kualitas Rekaman"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Sama seperti streaming"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Kualitas Tinggi, Ukuran File Sedang"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Kualitas Tidak Bisa Dibedakan, Ukuran File Besar"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Kualitas Lossless, Ukuran File Sangat Besar"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Peringatan: Bitrate video streaming akan diatur ke %1, yang merupakan batas atas untuk layanan streaming saat ini. Jika Anda yakin ingin lebih dari %1, aktifkan opsi enkoder tingkat lanjut dan hapus centang \"Paksa batas bitrate layanan streaming\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Peringatan: Bitrate audio streaming akan diatur ke %1, yang merupakan batas atas untuk layanan streaming saat ini. Jika Anda yakin ingin lebih dari %1, aktifkan opsi enkoder tingkat lanjut dan hapus centang \"Tegakkan batas bitrate layanan streaming\"."
+Basic.Settings.Output.Simple.Warn.CannotPause="Peringatan: Rekaman tidak dapat dijeda jika kualitas rekaman diatur ke \"Sama seperti streaming\"."
+Basic.Settings.Output.Simple.Warn.Encoder="Peringatan: Perekaman dengan enkoder software pada kualitas yang berbeda dengan streaming akan membutuhkan pemakaian CPU ekstra jika Anda melakukan streaming dan merekam bersamaan."
+Basic.Settings.Output.Simple.Warn.Lossless="Peringatan: Kualitas lossless menghasilkan ukuran file yang sangat besar! Kualitas lossless dapat menggunakan ruang disk hingga 7 gigabyte per menit pada resolusi dan framerate tinggi. Lossless tidak disarankan saat merekam lama kecuali Anda memiliki ruang disk yang sangat besar."
+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="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Perangkat lunak (x264 preset penggunaan CPU rendah, ukuran file meningkat)"
+Basic.Settings.Output.VideoBitrate="Bitrate Video"
+Basic.Settings.Output.AudioBitrate="Bitrate Audio"
+Basic.Settings.Output.Reconnect="Hubungkan Kembali Secara Otomatis"
+Basic.Settings.Output.RetryDelay="Delay Pengulangan"
+Basic.Settings.Output.MaxRetries="Maksimum Pengulangan"
+Basic.Settings.Output.Advanced="Aktifkan Setelan Enkoder Lanjutan"
+Basic.Settings.Output.EncoderPreset="Preset Enkoder"
+Basic.Settings.Output.CustomEncoderSettings="Setelan Kustom Enkoder"
+Basic.Settings.Output.CustomMuxerSettings="Setelan Kustom Muxer"
+Basic.Settings.Output.NoSpaceFileName="Buat Nama File tanpa Spasi"
+
+Basic.Settings.Output.Adv.Rescale="Skala Ulang Output"
+Basic.Settings.Output.Adv.AudioTrack="Trek Audio"
+Basic.Settings.Output.Adv.Streaming="Streaming"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Tegakkan pengaturan enkoder layanan streaming"
+Basic.Settings.Output.Adv.Audio.Track1="Trek 1"
+Basic.Settings.Output.Adv.Audio.Track2="Trek 2"
+Basic.Settings.Output.Adv.Audio.Track3="Trek 3"
+Basic.Settings.Output.Adv.Audio.Track4="Trek 4"
+Basic.Settings.Output.Adv.Audio.Track5="Trek 5"
+Basic.Settings.Output.Adv.Audio.Track6="Trek 6"
+
+Basic.Settings.Output.Adv.Recording="Rekaman"
+Basic.Settings.Output.Adv.Recording.Type="Tipe"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standar"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Output Kustom (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Gunakan enkoder streaming)"
+Basic.Settings.Output.Adv.Recording.Filename="Format Nama File"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Timpa jika file sudah ada"
+Basic.Settings.Output.Adv.FFmpeg.Type="Jenis output FFmpeg"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Output ke URL"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Output ke File"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Format rekaman umum"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Semua File"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Lokasi File atau URL"
+Basic.Settings.Output.Adv.FFmpeg.Format="Format Kontainer"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Audio"
+Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Format Default"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Deskripsi Format Kontainer"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Kodek Audio/Video menebak dari jalur File atau URL"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Enkoder Default"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Nonaktifkan Enkoder"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Enkoder Video"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Setelan Enkoder Video (jika ada)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Enkoder Audio"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Setelan Enkoder Audio (jika ada)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Setelan Muxer (jika ada)"
+Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval keyframe (frame)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Tampilkan semua kodek (bahkan jika berpotensi tidak kompatibel)"
+
+Screenshot="Screenshot Output"
+Screenshot.SourceHotkey="Screenshot Sumber Terpilih"
+Screenshot.StudioProgram="Screenshot (Program)"
+Screenshot.Preview="Screenshot (Preview)"
+Screenshot.Scene="Screenshot (Adegan)"
+Screenshot.Source="Screenshot (Sumber)"
+
+FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%d-%m-%Y %I-%M-%S-%p\n%d-%m-%Y %H-%M-%S-%z\n%d-%m-%Y %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
+FilenameFormatting.TT="%CCYY		Tahun, empat digit\n%YY		Tahun, dua digit terakhir (00-99)\n%MM		Nomor Bulan (01-12)\n%DD		nomor tanggal, dengan awalan nol (01-31)\n%hh			Jam dalam format 24-jam (00-23)\n%mm		Menit (00-59)\n%ss		Detik (00-61)\n%%		Simbol %\n%a		Nama hari (singkat)\n%A		Nama hari (lengkap)\n%b		Nama bulan (singkat)\n%B		Nama bulan (lengkap)\n%d		nomor tanggal, dengan awalan nol (01-31)\n%H		Jam dalam format 24-jam (00-23)\n%I		Jam dalam format 12-jam (01-12)\n%m		Nomor bulan (01-12)\n%M		Menit (00-59)\n%p		Tanda AM atau PM\n%S		Detik (00-61)\n%y		Tahun, dua digit terakhir (00-99)\n%Y		Tahun\n%z		Offset ISO 8601 dari UTC di zona waktu\n%Z		Nama atau singkatan zona waktu\n%FPS		Frame per detik\n%CRES		Resolusi dasar (kanvas)\n%ORES		Resolusi output (diskalakan)\n%VF		Format video"
+
+Basic.Settings.Video="Video"
+Basic.Settings.Video.Adapter="Adapter Video"
+Basic.Settings.Video.BaseResolution="Resolusi Dasar (Kanvas)"
+Basic.Settings.Video.ScaledResolution="Resolusi Output (Diskalakan)"
+Basic.Settings.Video.DownscaleFilter="Filter Downscale"
+Basic.Settings.Video.DisableAeroWindows="Matikan Aero (Windows saja)"
+Basic.Settings.Video.FPS="FPS"
+Basic.Settings.Video.FPSCommon="Nilai FPS Umum"
+Basic.Settings.Video.FPSInteger="Nilai FPS Integer"
+Basic.Settings.Video.FPSFraction="Nilai FPS pecahan"
+Basic.Settings.Video.Numerator="Pembilang"
+Basic.Settings.Video.Denominator="Penyebut"
+Basic.Settings.Video.Renderer="Renderer"
+Basic.Settings.Video.InvalidResolution="Nilai resolusi tidak valid. Harus [lebar]x[tinggi] (mis. 1920x1080)"
+Basic.Settings.Video.CurrentlyActive="Output video saat ini sedang aktif. Matikan semua output untuk mengubah pengaturan video."
+Basic.Settings.Video.DisableAero="Matikan Aero"
+
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (Tercepat, tapi ngeblur jika scaling)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (scaling tajam, 16 sampel)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lamczos (scaling tajam, 36 sampel)"
+Basic.Settings.Video.DownscaleFilter.Area="Area (Jumlah tertimbang, 4/6/9 sampel)"
+
+Basic.Settings.Audio="Audio"
+Basic.Settings.Audio.SampleRate="Tingkat Sampel"
+Basic.Settings.Audio.Channels="Saluran"
+Basic.Settings.Audio.Meters="Meter"
+Basic.Settings.Audio.MeterDecayRate="Tingkat Decay"
+Basic.Settings.Audio.MeterDecayRate.Fast="Cepat"
+Basic.Settings.Audio.MeterDecayRate.Medium="Sedang (PPM Tipe I)"
+Basic.Settings.Audio.MeterDecayRate.Slow="Lambat (PPM Tipe II)"
+Basic.Settings.Audio.PeakMeterType="Tipe Peak Meter"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Sample Peak"
+Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Pemakaian CPU lebih tinggi)"
+Basic.Settings.Audio.MultiChannelWarning.Enabled="PERINGATAN: Audio surround sound diaktifkan."
+Basic.Settings.Audio.MultichannelWarning="Jika streaming, periksa untuk melihat apakah layanan streaming Anda mendukung suara surround ingest dan pemutaran suara surround playback. 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 memainkan dua saluran.\n\nFilter audio OBS kompatibel dengan surround sound, meskipun dukungan plugin VST tidak dijamin."
+Basic.Settings.Audio.MultichannelWarning.Title="Aktifkan audio surround sound?"
+Basic.Settings.Audio.MultichannelWarning.Confirm="Yakin ingin mengaktifkan audio surround sound?"
+Basic.Settings.Audio.Devices="Perangkat Audio Global"
+Basic.Settings.Audio.DesktopDevice="Audio Desktop"
+Basic.Settings.Audio.DesktopDevice2="Audio Desktop 2"
+Basic.Settings.Audio.AuxDevice="Audio Mic/Auxiliary"
+Basic.Settings.Audio.AuxDevice2="Audio Mic/Auxiliary 2"
+Basic.Settings.Audio.AuxDevice3="Audio Mic/Auxiliary 3"
+Basic.Settings.Audio.AuxDevice4="Audio Mic/Auxiliary 4"
+Basic.Settings.Audio.EnablePushToMute="Aktifkan Push-to-mute"
+Basic.Settings.Audio.PushToMuteDelay="Delay Push-to-mute"
+Basic.Settings.Audio.EnablePushToTalk="Aktifkan Push-to-talk"
+Basic.Settings.Audio.PushToTalkDelay="Delay Push-to-talk"
+Basic.Settings.Audio.UnknownAudioDevice="[Perangkat tidak terhubung atau tidak tersedia]"
+Basic.Settings.Audio.Disabled="Dinonaktifkan"
+
+Basic.Settings.Advanced="Tingkat Lanjut"
+Basic.Settings.Advanced.General.ProcessPriority="Prioritas Proses"
+Basic.Settings.Advanced.General.ProcessPriority.High="Tinggi"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Diatas Normal"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Normal"
+Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Dibawah Normal"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="Diam"
+Basic.Settings.Advanced.FormatWarning="Peringatan: Format warna selain NV12 terutama ditujukan untuk perekaman, dan tidak disarankan saat streaming. Streaming dapat meningkatkan pemakaian CPU karena konversi format warna."
+Basic.Settings.Advanced.Audio.BufferingTime="Waktu Buffering Audio"
+Basic.Settings.Advanced.Video.ColorFormat="Format Warna"
+Basic.Settings.Advanced.Video.ColorSpace="Ruang Warna"
+Basic.Settings.Advanced.Video.ColorRange="Rentang Warna"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Sebagian"
+Basic.Settings.Advanced.Video.ColorRange.Full="Penuh"
+Basic.Settings.Advanced.Audio.MonitoringDevice="Perangkat Monitoring"
+Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Default"
+Basic.Settings.Advanced.Audio.DisableAudioDucking="Nonaktifkan peredaman audio Windows"
+Basic.Settings.Advanced.StreamDelay="Delay Streaming"
+Basic.Settings.Advanced.StreamDelay.Duration="Durasi"
+Basic.Settings.Advanced.StreamDelay.Preserve="Pertahankan titik potong (meningkatkan delay) saat menyambungkan kembali"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Perkiraan Penggunaan Memori: %1 MB"
+Basic.Settings.Advanced.Network="Jaringan"
+Basic.Settings.Advanced.Network.BindToIP="Kaitkan ke IP"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktifkan optimasi 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."
+Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Perilaku Fokus Hotkey"
+Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Jangan pernah mematikan hotkey"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Nonaktifkan hotkey saat jendela utama sedang fokus"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="Nonaktifkan hotkey saat jendela utama sedang tidak fokus"
+Basic.Settings.Advanced.AutoRemux="Remux otomatis ke mp4"
+Basic.Settings.Advanced.AutoRemux.MP4="(rekam sebagai mkv)"
+
+Basic.AdvAudio="Properti Audio Lanjutan"
+Basic.AdvAudio.ActiveOnly="Sumber Aktif Saja"
+Basic.AdvAudio.Name="Nama"
+Basic.AdvAudio.Volume="Volume"
+Basic.AdvAudio.Mono="Mono"
+Basic.AdvAudio.Balance="Keseimbangan"
+Basic.AdvAudio.SyncOffset="Sinkronkan Offset"
+Basic.AdvAudio.Monitoring="Monitoring Audio"
+Basic.AdvAudio.Monitoring.None="Monitor Mati"
+Basic.AdvAudio.Monitoring.MonitorOnly="Monitor Saja (bisukan output)"
+Basic.AdvAudio.Monitoring.Both="Monitor dan Output"
+Basic.AdvAudio.AudioTracks="Trek"
+
+Basic.Settings.Hotkeys="Hotkey"
+Basic.Settings.Hotkeys.Pair="Kombinasi tombol yang berbagi dengan '%1' bertindak sebagai pengalih"
+Basic.Settings.Hotkeys.Filter="Filter"
+
+Basic.Hotkeys.SelectScene="Beralih ke adegan"
+
+Basic.SystemTray.Show="Tampilkan"
+Basic.SystemTray.Hide="Sembunyikan"
+
+Basic.SystemTray.Message.Reconnecting="Terputus. Menghubungkan ulang..."
+
+Hotkeys.Insert="Insert"
+Hotkeys.Delete="Delete"
+Hotkeys.Home="Home"
+Hotkeys.End="End"
+Hotkeys.PageUp="Page Up"
+Hotkeys.PageDown="Page Down"
+Hotkeys.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
+Hotkeys.CapsLock="Caps Lock"
+Hotkeys.Backspace="Backspace"
+Hotkeys.Tab="Tab"
+Hotkeys.Print="Print"
+Hotkeys.Pause="Pause"
+Hotkeys.Left="Kiri"
+Hotkeys.Right="Kanan"
+Hotkeys.Up="Atas"
+Hotkeys.Down="Bawah"
+Hotkeys.Windows="Windows"
+Hotkeys.Super="Super"
+Hotkeys.Menu="Menu"
+Hotkeys.Space="Spasi"
+Hotkeys.NumpadNum="Numpad %1"
+Hotkeys.NumpadMultiply="Numpad Kali"
+Hotkeys.NumpadDivide="Numpad Bagi"
+Hotkeys.NumpadAdd="Numpad Tambah"
+Hotkeys.NumpadSubtract="Numpad Kurang"
+Hotkeys.NumpadDecimal="Numpad Koma"
+Hotkeys.AppleKeypadNum="%1 (Keypad)"
+Hotkeys.AppleKeypadMultiply="* (Keypad)"
+Hotkeys.AppleKeypadDivide="/ (Keypad)"
+Hotkeys.AppleKeypadAdd="+ (Keypad)"
+Hotkeys.AppleKeypadSubtract="- (Keypad)"
+Hotkeys.AppleKeypadDecimal=". (Keypad)"
+Hotkeys.AppleKeypadEqual="= (Keypad)"
+Hotkeys.MouseButton="Mouse %1"
+Hotkeys.Escape="Esc"
+
+Mute="Bisukan"
+Unmute="Matikan bisu"
+Push-to-mute="Push-to-mute"
+Push-to-talk="Push-to-talk"
+
+SceneItemShow="Tampilkan '%1'"
+SceneItemHide="Sembunyikan '%1'"
+
+OutputWarnings.NoTracksSelected="Anda harus memilih setidaknya satu trek"
+OutputWarnings.MP4Recording="Peringatan: Rekaman yang disimpan ke format MP4/MOV tidak akan dapat dipulihkan jika file 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 enkoder rekaman diatur ke \"(Gunakan enkoder streaming)\""
+
+FinalScene.Title="Hapus Adegan"
+FinalScene.Text="Harus ada setidaknya satu adegan."
+
+NoSources.Title="Tidak Ada Sumber"
+NoSources.Text="Sepertinya Anda belum menambah sumber video apa pun, jadi Anda hanya akan menghasilkan layar kosong. Anda yakin ingin melakukan ini?"
+NoSources.Text.AddSource="Anda dapat menambahkan sumber dengan mengklik ikon + di bawah kotak Sumber di jendela utama kapan saja."
+NoSources.Label="Anda tidak memiliki sumber apapun.\nKlik tombol + di bawah ini,\natau klik kanan disini untuk menambahkannya."
+
+ChangeBG="Atur Warna"
+CustomColor="Warna Kustom"
+
+BrowserSource.EnableHardwareAcceleration="Aktifkan Akselerasi Hardware Sumber Browser"
+
+About="Tentang"
+About.Info="OBS Studio adalah perangkat lunak perekam video dan live streaming gratis dan open source."
+About.Donate="Buat Sebuah Kontribusi"
+About.GetInvolved="Ayo terlibat"
+About.Authors="Author"
+About.License="Lisensi"
+About.Contribute="Dukung proyek OBS"
+
+AddUrl.Title="Tambahkan Sumber lewat URL"
+AddUrl.Text="Anda telah menyeret URL ke OBS. Ini secara otomatis akan menambahkan tautan sebagai sumber. Lanjutkan?"
+AddUrl.Text.Url="URL: %1"
+
+ResizeOutputSizeOfSource="Ubah ukuran output (ukuran sumber)"
+ResizeOutputSizeOfSource.Text="Resolusi dasar dan output akan diubah menjadi ukuran sumber saat ini."
+ResizeOutputSizeOfSource.Continue="Apakah Anda ingin melanjutkan?"
+
+PreviewTransition="Preview Transisi"
+
+Importer="Pengimpor Koleksi Adegan"
+Importer.SelectCollection="Pilih Koleksi Adegan"
+Importer.Collection="Koleksi Adegan"
+Importer.HelpText="Tambahkan file ke jendela ini untuk mengimpor koleksi dari OBS atau program lain yang didukung."
+Importer.Path="Lokasi Koleksi"
+Importer.Program="Aplikasi yg Terdeteksi"
+Importer.AutomaticCollectionPrompt="Cari Koleksi Adegan Secara Otomatis"
+Importer.AutomaticCollectionText="OBS dapat menemukan koleksi adegan yang dapat diimpor secara otomatis dari program pihak ke-3 yang didukung. Apakah Anda ingin OBS menemukan koleksi untuk Anda secara otomatis?\n\nAnda dapat mengubahnya nanti di Pengaturan > Umum > Pengimpor."
+
+
+Restart="Mulai Ulang"
+NeedsRestart="OBS Studio perlu dimulai ulang. Apakah Anda ingin melakukannya sekarang?"
+
+ContextBar.NoSelectedSource="Tidak ada sumber terpilih"
+ContextBar.ResetTransform="Reset Transformasi"
+ContextBar.FitToCanvas="Pas dengan Kanvas"
+
+ContextBar.MediaControls.PlayMedia="Putar Media"
+ContextBar.MediaControls.PauseMedia="Jeda Media"
+ContextBar.MediaControls.StopMedia="Stop Media"
+ContextBar.MediaControls.RestartMedia="Mulai 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"
+

obs-studio-26.0.0.tar.xz/UI/data/locale/ig-NG.ini Added

obs-studio-25.0.8.tar.xz/UI/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/it-IT.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Italiano"
-Region="Italia"
 
 OK="OK"
 Apply="Applica"
@@ -38,6 +37,7 @@
 SourceWindow="Proiettore a finestra (fonte)"
 MultiviewProjector="Visualizzazione multipla (a schermo intero)"
 MultiviewWindowed="Visualizzazione multipla (in finestra)"
+ResizeProjectorWindowToContent="Adatta la finestra al contenuto"
 Clear="Rimuovi"
 Revert="Ripristina"
 Show="Mostra"
@@ -47,8 +47,8 @@
 New="Nuovo"
 Duplicate="Duplica"
 Enable="Attiva"
-DisableOSXVSync="Disattiva il V-Sync di OSX"
-ResetOSXVSyncOnExit="Ripristina il V-Sync di OSX alla chiusura"
+DisableOSXVSync="Disattiva il V-Sync di macOS"
+ResetOSXVSyncOnExit="Ripristina il V-Sync di macOS alla chiusura"
 HighResourceUsage="Codifica in sovraccarico! È consigliabile abbassare le impostazioni video o utilizzare un preset di codifica più veloce."
 Transition="Transizione"
 QuickTransitions="Transizioni rapide"
@@ -87,13 +87,21 @@
 Fullscreen="Schermo intero"
 Windowed="In finestra"
 Percent="Percento"
+RefreshBrowser="Aggiorna"
 AspectRatio="Proporzioni <b>%1:%2</b>"
 LockVolume="Blocca volume"
+LogViewer="Visualizzatore Log"
+ShowOnStartup="Mostra all'avvio"
+OpenFile="Apri file"
+AddValue="Aggiungi %1"
 
 AlreadyRunning.Title="OBS è già in esecuzione"
 AlreadyRunning.Text="OBS è già in esecuzione! A meno che non intendevi effettuare questa operazione, ricordati sempre di chiudere tutte le istanze esistenti di OBS prima di eseguirne una nuova. Se hai impostato OBS per ridursi nell'area di notifica, controlla che non sia ancora in esecuzione."
 AlreadyRunning.LaunchAnyway="Avvia comunque"
 
+ChromeOS.Title="Piattaforma non supportata"
+ChromeOS.Text="OBS sembra essere in esecuzione all'interno di un contenitore ChromeOS. Questa piattaforma non è supportata"
+
 DockCloseWarning.Title="Hai chiuso la finestra di un pannello"
 DockCloseWarning.Text="Hai appena chiuso la finestra di un pannello. Se vuoi mostrarlo di nuovo, vai sul menù Visualizza → Pannelli, nella barra multifunzione in alto."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Altre"
 
-Basic.FirstStartup.RunWizard="Vuoi eseguire la procedura di configurazione guidata? È possibile configurare manualmente le impostazioni facendo clic sul pulsante «Impostazioni» nella finestra principale."
-Basic.FirstStartup.RunWizard.NoClicked="Se cambi idea, è possibile rieseguire la procedura guidata di configurazione automatica in qualsiasi momento dal menu strumenti."
-
 Basic.AutoConfig="Configurazione guidata automatica"
 Basic.AutoConfig.ApplySettings="Applica le impostazioni"
 Basic.AutoConfig.StartPage="Informazioni sull'utilizzo"
 Basic.AutoConfig.StartPage.SubTitle="Specifica per cosa desideri utilizzare il programma"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Ottimizza per le dirette, le registrazioni sono meno importanti"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Ottimizza solo per le registrazioni, non faccio dirette"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Userò solo la fotocamera virtuale"
 Basic.AutoConfig.VideoPage="Impostazioni video"
-Basic.AutoConfig.VideoPage.SubTitle="Specifica le impostazioni video che desideri utilizzare"
+Basic.AutoConfig.VideoPage.SubTitle="Specifica le impostazioni video che vuoi utilizzare"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Usa quella attuale (%1×%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Schermo %1 (%2×%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Usa quelli attuali (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codifica per le registrazioni"
 Basic.AutoConfig.TestPage.Result.Header="Il programma ha rilevato che queste impostazioni sono le più adatte per questo dispositivo:"
 Basic.AutoConfig.TestPage.Result.Footer="Per utilizzare queste impostazioni, fai clic su «Applica le impostazioni». Per riprovare a configurare la procedura guidata, fai clic su «Indietro». Per configurare manualmente le impostazioni, fai clic su «Annulla» e apri le «Impostazioni»."
+Basic.AutoConfig.Info="La configurazione guidata automatica determinerà le migliori impostazioni in base alle specifiche del computer e alla velocità di Internet."
+Basic.AutoConfig.RunAnytime="Questo può essere eseguito in qualsiasi momento andando al menu Strumenti."
 
 Basic.Stats="Statistiche"
 Basic.Stats.CPUUsage="Utilizzo della CPU"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Nessuna scorciatoia assegnata!"
-Output.ReplayBuffer.NoHotkey.Msg="Nessuna scorciatoia impostata per salvare il buffer di replay. Imposta la scorciatoia «Salva» per poter salvare le registrazioni dei replay."
 
 Output.BadPath.Title="Percorso del file non valido"
 Output.BadPath.Text="Il percorso configurato per il file di uscita non è valido. Controlla le tue impostazioni per confermare che un percorso dei file valido è stato impostato."
 
 LogReturnDialog="Caricamento del file di log avvenuto con successo"
+LogReturnDialog.Description="Il tuo file di log è stato caricato. Puoi condividere l'URL per il debug o per ottenere supporto."
+LogReturnDialog.Description.Crash="Il tuo rapporto sui crash è stato caricato. Puoi condividere l'URL per il debug."
 LogReturnDialog.CopyURL="Copia l'URL"
+LogReturnDialog.AnalyzeURL="Analizza"
 LogReturnDialog.ErrorUploadingLog="Errore nel caricamento del file di log"
 
 Remux.SourceFile="Registrazioni di OBS"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Avvia il buffer di replay"
 Basic.Main.SaveReplay="Salva il replay"
 Basic.Main.StartStreaming="Avvia la diretta"
+Basic.Main.StartVirtualCam="Avvia la fotocamera virtuale"
 Basic.Main.StopRecording="Termina la registrazione"
 Basic.Main.PauseRecording="Registrazione in pausa"
 Basic.Main.UnpauseRecording="Riprendi la registrazione"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Termina la diretta"
 Basic.Main.StoppingStreaming="Terminazione della diretta in corso..."
 Basic.Main.ForceStopStreaming="Termina la diretta (annulla ritardo)"
+Basic.Main.ShowContextBar="Mostra la barra degli strumenti delle fonti"
+Basic.Main.HideContextBar="Nascondi la barra degli strumenti delle fonti"
+Basic.Main.StopVirtualCam="Ferma la fotocamera virtuale"
 Basic.Main.Group="Gruppo %1"
 Basic.Main.GroupItems="Raggruppa gli elementi selezionati"
 Basic.Main.Ungroup="Separa"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Ripristina l'interfaccia"
 Basic.MainMenu.View.Docks.LockUI="Blocca l'interfaccia"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Pannelli Browser Personalizzati..."
-Basic.MainMenu.View.Toolbars.Listboxes="Pu&lsanti di navigazione"
+Basic.MainMenu.View.ListboxToolbars="Elenco Pulsanti Scena/Sorgente"
+Basic.MainMenu.View.ContextBar="Barra degli strumenti delle fonti"
 Basic.MainMenu.View.SceneTransitions="Transizioni di s&cena"
 Basic.MainMenu.View.SourceIcons="Sorgente &Icone"
 Basic.MainMenu.View.StatusBar="Barra di &stato"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memoria massima (in megabyte)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Uso della memoria stimato: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Impossibile stimare la memoria utilizzata. Imposta un limite massimo di memoria."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(nota: assicurati di aver impostato una scorciatoia per il buffer di replay nella sezione delle scorciatoie)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefisso del nome dei file del buffer di replay"
 Basic.Settings.Output.ReplayBuffer.Suffix="Suffisso"
 Basic.Settings.Output.Simple.SavePath="Percorso di registrazione"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervallo dei fotogrammi chiave (in fotogrammi)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Mostra tutti i codec (anche se potenzialmente incompatibili)"
 
+Screenshot="Output Screenshot"
+Screenshot.SourceHotkey="Sorgente Screenshot Selezionata"
+Screenshot.StudioProgram="Screenshot (Programma)"
+Screenshot.Preview="Screenshot (Anteprima)"
+Screenshot.Scene="Screenshot (Scena)"
+Screenshot.Source="Screenshot (Fonte)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Anno, quattro cifre\n%YY		Anno, ultime due cifre (00-99)\n%MM		Mese come numero decimale (01-12)\n%DD		Giorno del mese, due cifre (01-31)\n%hh		Ora in formato 24h (00-23)\n%mm		Minuti (00-59)\n%ss		Secondi (00-61)\n%%		Un simbolo %\n%a		Giorno della settimana abbreviato\n%A		Giorno della settimana completo\n%b		Nome del mese abbreviato\n%B		Nome del mese completo\n%d		Giorno del mese, due cifre (01-31)\n%H		Ora in formato 24h (00-23)\n%I		Ora in formato 12h (01-12)\n%m		Mese come numero decimale (01-12)\n%M		Minuti (00-59)\n%p		Designazione AM o PM\n%S		Secondi (00-61)\n%y		Anno, ultime due cifre (00-99)\n%Y		Anno\n%z		Offset del fuso orario da UTC secondo ISO 860\n%Z		Nome o abbreviazione del fuso orario\n%FPS		Frames per secondo\n%CRES		Risoluzione base (canvas)\N%ORES		Risoluzione di output (scalata)\n%VF		Formato video"
@@ -750,10 +770,10 @@
 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, Mixer RTMP e Smashcast sono esempi di servizi che offrono 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="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.Title="Vuoi attivare l'audio surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sei sicuro di voler attivare l'audio surround?"
-Basic.Settings.Audio.Devices="Dispositivi"
+Basic.Settings.Audio.Devices="Dispositivi audio globali"
 Basic.Settings.Audio.DesktopDevice="Audio desktop"
 Basic.Settings.Audio.DesktopDevice2="Audio desktop 2"
 Basic.Settings.Audio.AuxDevice="Audio mic/ausiliario"
@@ -917,3 +937,16 @@
 Restart="Riavvia"
 NeedsRestart="OBS Studio deve essere riavviato. Vuoi riavviarlo ora?"
 
+ContextBar.NoSelectedSource="Nessuna fonte selezionata"
+ContextBar.ResetTransform="Ripristina Trasformazione"
+ContextBar.FitToCanvas="Adatta allo schermo"
+
+ContextBar.MediaControls.PlayMedia="Riproduci Media"
+ContextBar.MediaControls.PauseMedia="Pausa il media"
+ContextBar.MediaControls.StopMedia="Ferma media"
+ContextBar.MediaControls.RestartMedia="Riavvia media"
+ContextBar.MediaControls.PlaylistNext="Successivo nella playlist"
+ContextBar.MediaControls.PlaylistPrevious="Precedente nella playlist"
+ContextBar.MediaControls.MediaProperties="Proprietà del media"
+ContextBar.MediaControls.BlindSeek="Widget ricerca multimediale"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ja-JP.ini Changed

@@ -1,6 +1,5 @@
 
 Language="日本語"
-Region="日本"
 
 OK="OK"
 Apply="適用"
@@ -38,6 +37,7 @@
 SourceWindow="ウィンドウ プロジェクター (ソース)"
 MultiviewProjector="マルチビュー (全画面)"
 MultiviewWindowed="マルチビュー (ウィンドウ)"
+ResizeProjectorWindowToContent="ウィンドウをコンテンツに合わせる"
 Clear="クリア"
 Revert="元に戻す"
 Show="表示"
@@ -47,8 +47,8 @@
 New="新規"
 Duplicate="複製"
 Enable="有効にする"
-DisableOSXVSync="OSX の V-Sync を無効にする"
-ResetOSXVSyncOnExit="終了時に OSX の V-Sync をリセットする"
+DisableOSXVSync="macOS の V-Sync を無効にする"
+ResetOSXVSyncOnExit="終了時に macOS の V-Sync をリセットする"
 HighResourceUsage="エンコードが高負荷です！ 映像設定を下げるかより高速のエンコードプリセットの使用を検討してください。"
 Transition="トランジション"
 QuickTransitions="クイックトランジション"
@@ -87,13 +87,21 @@
 Fullscreen="全画面表示"
 Windowed="ウィンドウ表示"
 Percent="パーセント"
+RefreshBrowser="再読み込み"
 AspectRatio="アスペクト比 <b>%1:%2</b>"
 LockVolume="音量をロック"
+LogViewer="ログビューア"
+ShowOnStartup="起動時に表示"
+OpenFile="ファイルを開く"
+AddValue="%1 を追加"
 
 AlreadyRunning.Title="OBSは既に実行中です"
 AlreadyRunning.Text="OBSは既に実行されています！ この操作を行うつもりがない限り、新しいインスタンスを実行する前に既存のOBSインスタンスを終了してください。OBSがシステムトレイに最小化されるように設定されている場合は、まだ実行中であるかどうかを確認してください。"
 AlreadyRunning.LaunchAnyway="とにかく起動する"
 
+ChromeOS.Title="サポートされていないプラットフォーム"
+ChromeOS.Text="OBSはChromeOSコンテナ内で実行されているようです。 このプラットフォームはサポートされていません"
+
 DockCloseWarning.Title="ドッキング可能ウィンドウを閉じる"
 DockCloseWarning.Text="ドッキング可能なウィンドウを閉じました。もう一度表示したい場合は、メニューバーの表示 → ドックメニューを使用してください。"
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="アジア"
 BandwidthTest.Region.Other="その他"
 
-Basic.FirstStartup.RunWizard="自動構成ウィザードを実行しますか？ メインウィンドウの設定ボタンをクリックして手動で設定を構成することもできます。"
-Basic.FirstStartup.RunWizard.NoClicked="あなたの気が変わったら、ツールメニューからいつでも自動構成ウィザードを実行できます。"
-
 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.SubTitle="使用する映像設定を指定"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="現在の値を使用 (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="画面 %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="現在の値を使用 (%1)"
@@ -183,6 +189,8 @@
 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="CPU使用率"
@@ -292,14 +300,15 @@
 Output.RecordError.Title="録画エラー"
 Output.RecordError.Msg="録画中に不明なエラーが発生しました。"
 Output.RecordError.EncodeErrorMsg="録画中にエンコーダでエラーが発生しました。"
-Output.ReplayBuffer.NoHotkey.Title="ホットキーが設定されていません！"
-Output.ReplayBuffer.NoHotkey.Msg="リプレイバッファ保存のホットキー設定がありません。 リプレイ録画保存用に使用する「保存」のホットキーを設定してください。"
 
 Output.BadPath.Title="無効なパス"
 Output.BadPath.Text="設定されたファイルの出力パスが無効です。有効なファイルパスが設定されていることを確認してください。"
 
 LogReturnDialog="ログの送信成功"
+LogReturnDialog.Description="ログファイルがアップロードされました。 デバッグまたはサポートのために、URLをシェアできます。"
+LogReturnDialog.Description.Crash="クラッシュレポートがアップロードされました。 デバッグのために、URLをシェアできます。"
 LogReturnDialog.CopyURL="URLのコピー"
+LogReturnDialog.AnalyzeURL="分析"
 LogReturnDialog.ErrorUploadingLog="ログの送信失敗"
 
 Remux.SourceFile="OBS 録画"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="リプレイバッファ開始"
 Basic.Main.SaveReplay="リプレイを保存"
 Basic.Main.StartStreaming="配信開始"
+Basic.Main.StartVirtualCam="仮想カメラ開始"
 Basic.Main.StopRecording="録画終了"
 Basic.Main.PauseRecording="録画一時停止"
 Basic.Main.UnpauseRecording="録画再開"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="配信終了"
 Basic.Main.StoppingStreaming="配信停止処理中..."
 Basic.Main.ForceStopStreaming="配信停止 (遅延破棄)"
+Basic.Main.ShowContextBar="ソースツールバーを表示"
+Basic.Main.HideContextBar="ソースツールバーを非表示"
+Basic.Main.StopVirtualCam="仮想カメラ停止"
 Basic.Main.Group="グループ化 %1"
 Basic.Main.GroupItems="選択したアイテムのグループ化"
 Basic.Main.Ungroup="グループ化の解除"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="UIをリセット"
 Basic.MainMenu.View.Docks.LockUI="UIをロック"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="カスタムブラウザドック..."
-Basic.MainMenu.View.Toolbars.Listboxes="リストボックス(&L)"
+Basic.MainMenu.View.ListboxToolbars="シーン/ソースリストボタン"
+Basic.MainMenu.View.ContextBar="ソースツールバー"
 Basic.MainMenu.View.SceneTransitions="シーントランジション(&C)"
 Basic.MainMenu.View.SourceIcons="ソースアイコン(&I)"
 Basic.MainMenu.View.StatusBar="ステータスバー(&S)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="最大メモリ (メガバイト)"
 Basic.Settings.Output.ReplayBuffer.Estimate="概算メモリ使用量: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="メモリ使用量を見積もることができません。 最大メモリ制限を設定してください。"
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(注: ホットキーでリプレイバッファのホットキーを設定してください)"
 Basic.Settings.Output.ReplayBuffer.Prefix="リプレイバッファのファイル名の接頭辞"
 Basic.Settings.Output.ReplayBuffer.Suffix="接尾辞"
 Basic.Settings.Output.Simple.SavePath="録画ファイルのパス"
@@ -712,9 +725,16 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="キーフレーム間隔 (フレーム)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="すべてのコーデックを表示 (潜在的に互換性がない場合でも)"
 
+Screenshot="スクリーンショットの出力"
+Screenshot.SourceHotkey="選択したソースをスクリーンショット"
+Screenshot.StudioProgram="スクリーンショット (番組)"
+Screenshot.Preview="スクリーンショット (プレビュー)"
+Screenshot.Scene="スクリーンショット (シーン)"
+Screenshot.Source="スクリーンショット (ソース)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
-FilenameFormatting.TT="%CCYY\t\t年, 4桁\n%YY\t\t年, 下2桁 (00-99)\n%MM\t\t月, 数値 (01-12)\n%DD\t\t日, 0埋め (01-31)\n%hh\t\t時, 24時間形式 (00-23)\n%mm\t\t分 (00-59)\n%ss\t\t秒 (00-61)\n%%\t\t% (パーセント) 記号そのもの\n%a\t\t曜日, 略記\n%A\t\t曜日, 完全名\n%b\t\t月, 略記\n%B\t\t月, 完全名\n%d\t\t日, 0埋め (01-31)\n%H\t\t時, 24時間形式 (00-23)\n%I\t\t時, 12時間形式 (01-12)\n%m\t\t月, 数値 (01-12)\n%M\t\t分 (00-59)\n%p\t\t午前または午後の指定\n%S\t\t秒 (00-61)\n%y\t\t年, 下2桁 (00-99)\n%Y\t\t年\n%z\t\tUTCからのISO 8601式オフセット\n%Z\t\tタイムゾーンの名称または略称\n%FPS\t\tフレーム毎秒\n%CRES\t\t基本 (キャンバス) 解像度\n%ORES\t\t出力 (スケーリング) 解像度\n%VF\t\t映像フォーマット"
+FilenameFormatting.TT="%CCYY\t\t年, 4桁\n%YY\t\t年, 下2桁 (00-99)\n%MM\t\t月, 数値 (01-12)\n%DD\t\t日, 0埋め (01-31)\n%hh\t\t時, 24時間形式 (00-23)\n%mm\t\t分 (00-59)\n%ss\t\t秒 (00-61)\n%%\t\t% (パーセント) 記号そのもの\n%a\t\t曜日, 略記\n%A\t\t曜日, 完全名\n%b\t\t月, 略記\n%B\t\t月, 完全名\n%d\t\t日, 0埋め (01-31)\n%H\t\t時, 24時間形式 (00-23)\n%I\t\t時, 12時間形式 (01-12)\n%m\t\t月, 数値 (01-12)\n%M\t\t分 (00-59)\n%p\t\t午前または午後の指定\n%S\t\t秒 (00-61)\n%y\t\t年, 下2桁 (00-99)\n%Y\t\t年\n%z\t\tUTC (協定世界時) との時差 - ISO 8601\n%Z\t\tタイムゾーンの名称または略称\n%FPS\t\tフレーム毎秒\n%CRES\t\t基本 (キャンバス) 解像度\n%ORES\t\t出力 (スケーリング) 解像度\n%VF\t\t映像フォーマット"
 
 Basic.Settings.Video="映像"
 Basic.Settings.Video.Adapter="ビデオアダプター"
@@ -750,10 +770,10 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="サンプル ピーク"
 Basic.Settings.Audio.PeakMeterType.TruePeak="真のピーク (CPU使用率高い)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="警告: サラウンド音声が有効です。"
-Basic.Settings.Audio.MultichannelWarning="配信する場合、配信サービスがサラウンド音声の取り込みと再生の両方をサポートしているかどうかを確認してください。Facebook 360 Live、Mixer RTMP、Smashcastは、サラウンド音声が完全にサポートされている例です。しかしFacebook LiveとYouTube Liveはどちらもサラウンド取り込みを受信しますが、Facebook Liveはステレオにダウンミックスし、YouTube Liveは2チャンネルのみしか再生できません。\n\nVSTプラグインのサポートは保証されていませんが、OBS音声フィルタはサラウンド音声と互換性があります。"
+Basic.Settings.Audio.MultichannelWarning="配信する場合、配信サービスがサラウンド音声の取り込みと再生の両方をサポートしているかどうかを確認してください。Facebook 360 Liveは、サラウンド音声が完全にサポートされている例です。しかしFacebook LiveとYouTube Liveはどちらもサラウンド取り込みを受信しますが、Facebook Liveはステレオにダウンミックスし、YouTube Liveは2チャンネルのみしか再生できません。\n\nVSTプラグインのサポートは保証されていませんが、OBS音声フィルタはサラウンド音声と互換性があります。"
 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="マイク音声"
@@ -792,7 +812,7 @@
 Basic.Settings.Advanced.Network.BindToIP="IP選択"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="ネットワークの最適化を有効にする"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCPペーシングを有効にする"
-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="メインウィンドウにフォーカスがあるときはホットキーを無効にする"
@@ -907,13 +927,26 @@
 Importer="シーンコレクションインポーター"
 Importer.SelectCollection="シーンコレクションを選択"
 Importer.Collection="シーンコレクション"
-Importer.HelpText="このウィンドウにファイルを追加してOBSまたは他のサポートされているプログラムからコレクションをインポートします。"
+Importer.HelpText="OBSまたは他の対応アプリからエクスポートされたシーンコレクションファイルを、このウィンドウに追加してインポートします。"
 Importer.Path="コレクションのパス"
 Importer.Program="検出されたアプリケーション"
 Importer.AutomaticCollectionPrompt="シーンコレクションの自動検索"
-Importer.AutomaticCollectionText="OBSはサポートされているサードパーティプログラムからインポート可能なシーンコレクションを自動的に見つけることができます。 OBSでコレクションを自動的に検索しますか？\n\nこれは後で設定 > 一般 > インポーターで変更できます。"
+Importer.AutomaticCollectionText="対応するサードパーティプログラムからインポート可能なシーンコレクションを自動的に見つけることができます。 シーンコレクションを自動検索しますか？\n\nこれは後で設定 > 一般 > インポーターで変更できます。"
 
 
 Restart="再起動"
 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="メディアシークウィジェット"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ka-GE.ini Changed

@@ -1,6 +1,5 @@
 
 Language="ქართული"
-Region="საქართველო"
 
 OK="კარგი"
 Apply="მიღება"
@@ -23,7 +22,7 @@
 Display="ეკრანი"
 Name="სახელი"
 Exit="გასვლა"
-Mixer="ხმის მიქშერი"
+Mixer="ხმის შემრევი"
 Browse="მოძიება"
 Mono="მონო"
 Stereo="სტერეო"
@@ -38,6 +37,7 @@
 SourceWindow="ფანჯარაში ჩვენება (წყარო)"
 MultiviewProjector="მრავალხედიანი (სრულ ეკრანზე)"
 MultiviewWindowed="მრავალხედიანი (ფანჯარაში)"
+ResizeProjectorWindowToContent="ფანჯრის შიგთავსის ზომაზე მორგება"
 Clear="გასუფთავება"
 Revert="დაბრუნება"
 Show="ჩვენება"
@@ -47,8 +47,8 @@
 New="ახალი"
 Duplicate="ასლის შექმნა"
 Enable="ჩართვა"
-DisableOSXVSync="OSX V-Sync-ის გამორთვა"
-ResetOSXVSyncOnExit="OSX V-Sync-ის გადატვირთვა გასვლისას"
+DisableOSXVSync="macOS V-Sync-ის გამორთვა"
+ResetOSXVSyncOnExit="macOS V-Sync-ის გადატვირთვა გასვლისას"
 HighResourceUsage="დამშიფრავი გადაიტვირთა! სცადეთ ვიდეოს პარამეტრების შემცირება, ან უფრო სწრაფი შიფრაციის პარამეტრების გამოყენება."
 Transition="გადასვლა"
 QuickTransitions="სწრაფი გადასვლები"
@@ -73,7 +73,7 @@
 Next="შემდეგ"
 Back="უკან"
 Defaults="ნაგულისხმევი"
-HideMixer="ხმის მიქშერში დამალვა"
+HideMixer="ხმის შემრევში დამალვა"
 TransitionOverride="გადასვლა გადაფარვით"
 None="არცერთი"
 StudioMode.Preview="შეთვალიერება"
@@ -87,13 +87,20 @@
 Fullscreen="სრულეკრანიანი"
 Windowed="ფანჯარიანი"
 Percent="პროცენტი"
+RefreshBrowser="განახლება"
 AspectRatio="თანაფარდობა <b>%1:%2</b>"
 LockVolume="ხმის ჩაკეტვა"
+LogViewer="აღრიცხვის მნახველი"
+ShowOnStartup="ჩვენება გაშვებისას"
+OpenFile="ფაილის გახსნა"
 
 AlreadyRunning.Title="OBS უკვე გაშვებულია"
 AlreadyRunning.Text="OBS უკვე გაშვებულია! გთხოვთ, ჯერ დახუროთ OBS-ის ყველა გაშვებული პროცესი, სანამ ახლის გაშვებას შეეცდებით. თუ მითითებული გაქვთ, რომ დახურვის ნაცვლად, OBS სისტემურ არეში უნდა ჩაიკეცოს, გთხოვთ მანდაც გადაამოწმოთ, დარჩენილი ხომ არაა."
 AlreadyRunning.LaunchAnyway="მაინც გაშვება"
 
+ChromeOS.Title="მხარდაუჭერელი პლატფორმა"
+ChromeOS.Text="OBS ჩანს, გაშვებულია ChromeOS-სათავსში. ეს პლატფორმა არაა მხარდაჭერილი"
+
 DockCloseWarning.Title="იერსახის ნაწილის დამალვა"
 DockCloseWarning.Text="თქვენ ახლახან დამალეთ იერსახის ნაწილი. თუ გსურთ მისი კვლავ გამოჩენა, მენიუს ზოლიდან გამოიყენეთ ხედი → იერსახის ნაწილები."
 
@@ -131,17 +138,15 @@
 BandwidthTest.Region.Asia="აზია"
 BandwidthTest.Region.Other="სხვა"
 
-Basic.FirstStartup.RunWizard="გსურთ, გაეშვას თვითგამართვის მეგზური? ამასთან, შეგიძლიათ პარამეტრების ხელით გამართვა მთავარ ფანჯარაში, პარამეტრების ღილაკზე დაწკაპებით."
-Basic.FirstStartup.RunWizard.NoClicked="თუ გადაიფიქრებთ, თვითგამართვის გაშვება შეგეძლებათ ნებისმიერ დროს, ხელსაწყოების მენიუდან."
-
 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.SubTitle="მიუთითეთ ვიდეოს სასურველი პარამეტრები"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="მიმდინარეს გამოყენება (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="ეკრანი %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="მიმდინარეს გამოყენება (%1)"
@@ -183,6 +188,8 @@
 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="CPU დატვირთვა"
@@ -292,14 +299,15 @@
 Output.RecordError.Title="შეცდომა ჩაწერისას"
 Output.RecordError.Msg="ჩაწერის დროს დაუდგენელი სახის შეცდომა წარმოიშვა."
 Output.RecordError.EncodeErrorMsg="დამშიფრავის შეცდომა წარმოიშვა ჩაწერისას."
-Output.ReplayBuffer.NoHotkey.Title="სწრაფი ღილაკი არაა მითითებული!"
-Output.ReplayBuffer.NoHotkey.Msg="სწრაფი ღილაკი არაა მითითებული გადახვევისთვის. გთხოვთ, მიუთითოთ „შენახვის“ ღილაკი, გადასახვევი მასალის შესანახად."
 
 Output.BadPath.Title="ფაილის არამართებული მისამართი"
 Output.BadPath.Text="ფაილის მითითებული მდებარეობა არასწორია. გთხოვთ, გადაამოწმოთ თქვენი პარამეტრების სისწორე."
 
 LogReturnDialog="ჩანაწერი წარმატებით აიტვირთა"
+LogReturnDialog.Description="აღრიცხვის ფაილი გაიგზავნა. შეგიძლიათ ბმულის გაზიარება, ხარვეზების გამოსარკვევად ან მხარდაჭერის მისაღებად."
+LogReturnDialog.Description.Crash="უეცარი გათიშვის მოხსენება გაიგზავნა. შეგიძლიათ ბმულის გაზიარება, ხარვეზების გამორკვევის მიზნით."
 LogReturnDialog.CopyURL="ბმულის ასლი"
+LogReturnDialog.AnalyzeURL="გამოკვლევა"
 LogReturnDialog.ErrorUploadingLog="შეცდომა აღრიცხვის ფაილის ატვირთვისას"
 
 Remux.SourceFile="OBS ჩანაწერი"
@@ -463,6 +471,7 @@
 Basic.Main.StartReplayBuffer="გადახვევის ჩართვა"
 Basic.Main.SaveReplay="გადახვევის შენახვა"
 Basic.Main.StartStreaming="ნაკადის გაშვება"
+Basic.Main.StartVirtualCam="ვირტუალური კამერის ჩართვა"
 Basic.Main.StopRecording="ჩაწერის შეწყვეტა"
 Basic.Main.PauseRecording="ჩაწერის შეჩერება"
 Basic.Main.UnpauseRecording="ჩაწერის გაგრძელება"
@@ -472,6 +481,9 @@
 Basic.Main.StopStreaming="ნაკადის შეწყვეტა"
 Basic.Main.StoppingStreaming="ნაკადი წყდება..."
 Basic.Main.ForceStopStreaming="ნაკადის შეწყვეტა (დაუყოვნებლივ)"
+Basic.Main.ShowContextBar="წყაროს ზოლის ჩვენება"
+Basic.Main.HideContextBar="წყაროს ზოლის დამალვა"
+Basic.Main.StopVirtualCam="ვირტუალური კამერის გათიშვა"
 Basic.Main.Group="ჯგუფი %1"
 Basic.Main.GroupItems="შერჩეულების დაჯგუფება"
 Basic.Main.Ungroup="განჯგუფება"
@@ -527,7 +539,8 @@
 Basic.MainMenu.View.Docks.ResetUI="იერსახის აღდგენა"
 Basic.MainMenu.View.Docks.LockUI="იერსახის ჩაკეტვა"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="ბრაუზერის მორგებული ნაწილები..."
-Basic.MainMenu.View.Toolbars.Listboxes="სიები (&L)"
+Basic.MainMenu.View.ListboxToolbars="სცენის/წყაროს სიის ღილაკები"
+Basic.MainMenu.View.ContextBar="წყაროს ხელსაწყოთა ზოლი"
 Basic.MainMenu.View.SceneTransitions="სცენებს შორის გადასვლები (&C)"
 Basic.MainMenu.View.SourceIcons="წყაროს ხატულები (&I)"
 Basic.MainMenu.View.StatusBar="მდგომარეობის ზოლი (&S)"
@@ -552,10 +565,10 @@
 Basic.MainMenu.Help.Logs.ShowLogs="აღრიცხვის ფაილების ჩვენება (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="მიმდინარე აღრიცხვის ფაილის ატვირთვა (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="ბოლო აღრიცხვის ფაილის ატვირთვა (&L)"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="მიმდინარე აღრიცხვის ფაილის ნახვა (&V)"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="მიმდინარე აღრიცხვის ნახვა (&V)"
 Basic.MainMenu.Help.CheckForUpdates="განახლებებზე შემოწმება"
 Basic.MainMenu.Help.CrashLogs="უეცარი გათიშვების მოხსენებები (&R)"
-Basic.MainMenu.Help.CrashLogs.ShowLogs="უეცარი გათიშვების მოხსენებების ჩვენება (&S)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="გათიშვების მოხსენებების ჩვენება (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="ბოლო მოხსენების ატვირთვა (&L)"
 Basic.MainMenu.Help.About="შესახებ (&A)"
 
@@ -640,7 +653,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="მეხსიერების დასაშვები მოცულობა (მეგაბაიტებში)"
 Basic.Settings.Output.ReplayBuffer.Estimate="მეხსიერების მიახლოებითი მოხმარება: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="შეუძლებელია მეხსიერების მიახლოებითი მოხმარების დადგენა. გთხოვთ, მიუთითოთ მეხსიერების დასაშვები ზღვარი."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(შენიშვნა: დარწმუნდით, რომ გადახვევისთვის სწრაფი ღილაკები დაყენებულია შესაბამის განყოფილებაში)"
 Basic.Settings.Output.ReplayBuffer.Prefix="გადასახვევი მასალის შესანახი ფაილის თავსართი"
 Basic.Settings.Output.ReplayBuffer.Suffix="ბოლოსართი"
 Basic.Settings.Output.Simple.SavePath="ჩანაწერის მდებარეობა"
@@ -712,6 +724,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="საკვანძო კადრების შუალედი (კადრები)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="ყველა კოდეკის ჩვენება (მათ შორის არათავსებადებისაც)"
 
+Screenshot="გამოტანილის სურათის გადაღება"
+Screenshot.SourceHotkey="შერჩეული წყაროს სურათის გადაღება"
+Screenshot.StudioProgram="სურათის გადაღება (პროგრამის)"
+Screenshot.Preview="სურათის გადაღება (შეთვალიერების)"
+Screenshot.Scene="სურათის გადაღება (სცენის)"
+Screenshot.Source="სურათის გადაღება (წყაროსი)"
+
 FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	წელიწადი, ოთხი ციფრი\n%YY		წელიწადი, ბოლო ორი ციფრი (00-99)\n%MM		თვე, ათობითი რიცხვის სახით (01-12)\n%DD		თვის რიცხვი, წინ ნულით (01-31)\n%hh		საათი, 24-საათიანი ფორმატით (00-23)\n%mm		წუთი (00-59)\n%ss		წამი(00-61)\n%%		% პროცენტის ნიშანი\n%a		კვირის დღე შემოკლებულად\n%A		კვირის დღის სრული დასახელება\n%b		თვე შემოკლებულად\n%B		თვის სრული დასახელება\n%d		თვის რიცხვი, წინ ნულით (01-31)\n%H		საათი, 24-საათიანი ფორმატით (00-23)\n%I		საათი, 12-საათიანი ფორმატით (01-12)\n%m		თვე, ათობითი რიცხვის სახით (01-12)\n%M		წუთი (00-59)\n%p		AM ან PM აღნიშვნა\n%S		წამი (00-61)\n%y		წელიწადი, ბოლო ორი ციფრი (00-99)\n%Y		წელიწადი\n%z		ISO 8601 სხვაობა UTC სასაათე სარტყელში\n		სრული ან შემოკლებული დასახელება\n%Z		სასაათე სარტყელი ან მისი შემოკლებული დასახელება\n%FPS		კადრი წამში\n%CRES		ძირითადი (ფონის) გაფართოება\n%ORES		გამოტანის (ზომაშეცვლილის) გაფართოება\n%VF		ვიდეოფორმატი"
@@ -750,10 +769,10 @@
 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="ნაკადის გაშვებისას გადაამოწმეთ, მომსახურების მომწოდებელი, იძლევა თუ არა მოცულობითი ხმოვანი სიგნალის როგორც მიღების, ასევე მოსმენის შესაძლებლობას. ერთ-ერთი მაგალითია Facebook 360 Live, სადაც სრულადაა მხარდაჭერილი მოცულობითი ხმოვანი სიგნალი. ხოლო Facebook Live და YouTube Live, მიუხედავად იმისა, რომ ორივე იღებს მოცულობით ხმოვან სიგნალს, Facebook Live გარდაქმნის მას სტერეო-სიგნალად, ხოლო YouTube Live უშვებს მხოლოდ ორი არხით.\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="მიკროფონი/დამატებითი მოწყობილობა"
@@ -917,3 +936,16 @@
 Restart="ხელახლა გაშვება"
 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="მასალის ძიების ხელსაწყო"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ko-KR.ini Changed

@@ -1,6 +1,5 @@
 
 Language="한국어"
-Region="대한민국"
 
 OK="확인"
 Apply="적용"
@@ -38,6 +37,7 @@
 SourceWindow="창 프로젝터 (소스)"
 MultiviewProjector="다중화면 (전체화면)"
 MultiviewWindowed="다중화면 (창)"
+ResizeProjectorWindowToContent="창 크기를 내용물에 맞춤"
 Clear="단축키 해제"
 Revert="되돌리기"
 Show="보이기"
@@ -47,8 +47,8 @@
 New="새로 만들기"
 Duplicate="복제"
 Enable="사용"
-DisableOSXVSync="OSX 수직동기화 끄기"
-ResetOSXVSyncOnExit="종료 시 OSX 수직동기화 재설정"
+DisableOSXVSync="macOS 수직동기화 끄기"
+ResetOSXVSyncOnExit="종료 시 macOS 수직동기화 재설정"
 HighResourceUsage="인코딩 과부하! 비디오 설정을 낮추거나 더 빠른 인코딩 사전설정을 사용하는 것을 고려하세요."
 Transition="전환"
 QuickTransitions="빠른 전환"
@@ -87,13 +87,21 @@
 Fullscreen="전체화면"
 Windowed="테두리가 있는 창"
 Percent="백분율"
+RefreshBrowser="새로고침"
 AspectRatio="화면비율 <b>%1%2</b>"
 LockVolume="음량 잠그기"
+LogViewer="로그 보기"
+ShowOnStartup="시작 시 보여주기"
+OpenFile="파일 열기"
+AddValue="추가 %1"
 
 AlreadyRunning.Title="OBS가 이미 실행 중입니다"
 AlreadyRunning.Text="OBS가 이미 실행 중입니다! 의도한 것이 아니라면 새로운 OBS를 실행하기 전에 이미 동작 중인 프로그램을 종료하십시오. OBS가 시스템 트레이에 최소화되어 있는지도 확인하십시오."
 AlreadyRunning.LaunchAnyway="경고를 무시하고 실행"
 
+ChromeOS.Title="지원하지 않는 플랫폼"
+ChromeOS.Text="OBS가 ChromeOS 컨테이너 안에서 작동 중입니다. 이 플랫폼은 지원되지 않습니다."
+
 DockCloseWarning.Title="도킹 가능한 창을 닫는 중입니다"
 DockCloseWarning.Text="도킹 가능한 창을 닫았습니다. 이 창을 다시 보려면 상단 메뉴에서 보기 -> 독을 확인하세요."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="아시아"
 BandwidthTest.Region.Other="기타"
 
-Basic.FirstStartup.RunWizard="구성 마법사를 실행하겠습니까? 설정 창에서 수동으로 설정할 수도 있습니다."
-Basic.FirstStartup.RunWizard.NoClicked="언제든지 도구 창에서 구성 마법사를 실행할 수 있습니다."
-
 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.SubTitle="사용하고자 하는 영상 설정을 지정하세요"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="현재 설정 사용 (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="디스플레이 %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="현재 설정 사용 (%1)"
@@ -183,6 +189,8 @@
 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="CPU 이용률"
@@ -212,7 +220,7 @@
 Updater.Text="새 판올림이 준비되었습니다:"
 Updater.UpdateNow="지금 판올림하기"
 Updater.RemindMeLater="나중에 다시 알림"
-Updater.Skip="이번 버전 건너뛰기"
+Updater.Skip="이번 판올림 건너뛰기"
 Updater.Running.Title="현재 활성화된 프로그램"
 Updater.Running.Text="판올림 전에 활성화되어 있는 출력을 먼저 꺼주세요"
 Updater.NoUpdatesAvailable.Title="가능한 판올림이 없습니다"
@@ -292,14 +300,15 @@
 Output.RecordError.Title="녹화 오류"
 Output.RecordError.Msg="녹화 중 예기치 못한 오류가 발생했습니다."
 Output.RecordError.EncodeErrorMsg="녹화 중 인코더 오류가 발생했습니다."
-Output.ReplayBuffer.NoHotkey.Title="단축키가 없습니다!"
-Output.ReplayBuffer.NoHotkey.Msg="리플레이를 저장하는 단축키를 지정하지 않았습니다. 리플레이 녹화 기능을 사용하려면 \"저장\" 단축키를 지정하십시오."
 
 Output.BadPath.Title="잘못된 파일 경로"
 Output.BadPath.Text="설정된 출력 파일 경로가 올바르지 않습니다. 경로가 제대로 설정이 되었는지 확인하십시오."
 
 LogReturnDialog="기록 업로드 성공"
+LogReturnDialog.Description="기록 파일을 올렸습니다. 해당 URL을 디버깅 혹은 문제 해결을 위해 공유할 수 있습니다."
+LogReturnDialog.Description.Crash="튕김 현상에 관한 기록이 업로드되었습니다. 이제 URL을 디버깅의 목적으로 공유할 수 있습니다."
 LogReturnDialog.CopyURL="주소 복사"
+LogReturnDialog.AnalyzeURL="분석"
 LogReturnDialog.ErrorUploadingLog="업로드하는 기록 파일 오류"
 
 Remux.SourceFile="OBS 녹화"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="리플레이 버퍼 시작"
 Basic.Main.SaveReplay="리플레이 저장"
 Basic.Main.StartStreaming="방송 시작"
+Basic.Main.StartVirtualCam="가상 카메라 시작"
 Basic.Main.StopRecording="녹화 중단"
 Basic.Main.PauseRecording="녹화 일시정지"
 Basic.Main.UnpauseRecording="녹화 일시정지 해제"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="방송 중단"
 Basic.Main.StoppingStreaming="방송을 중지합니다..."
 Basic.Main.ForceStopStreaming="방송 중지 (지연된 분량도 마무리없이 즉시 송출 중단)"
+Basic.Main.ShowContextBar="소스 도구 모음 사용"
+Basic.Main.HideContextBar="소스 도구 모음 숨기기"
+Basic.Main.StopVirtualCam="가상 카메라 중단"
 Basic.Main.Group="묶음: %1"
 Basic.Main.GroupItems="선택한 항목 묶기"
 Basic.Main.Ungroup="묶음 해체"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="사용자 인터페이스 초기화"
 Basic.MainMenu.View.Docks.LockUI="사용자 인터페이스 잠금"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="사용자 임의 브라우저 독..."
-Basic.MainMenu.View.Toolbars.Listboxes="목록 상자(&L)"
+Basic.MainMenu.View.ListboxToolbars="장면/소스 목록 버튼"
+Basic.MainMenu.View.ContextBar="소스 도구 모음"
 Basic.MainMenu.View.SceneTransitions="장면 전환(&C)"
 Basic.MainMenu.View.SourceIcons="소스 아이콘(&I)"
 Basic.MainMenu.View.StatusBar="상태 표시줄(&S)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="최대 메모리 (메가바이트 단위)"
 Basic.Settings.Output.ReplayBuffer.Estimate="예상되는 메모리 사용량: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="메모리 사용량을 계산할 수 없습니다. 최대 메모리 사용량을 설정하세요."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(참고: 단축키 설정에서 리플레이 버퍼의 단축키를 꼭 지정하세요)"
 Basic.Settings.Output.ReplayBuffer.Prefix="리플레이 버퍼 파일이름 접두사"
 Basic.Settings.Output.ReplayBuffer.Suffix="접미사"
 Basic.Settings.Output.Simple.SavePath="녹화 경로"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="키프레임 간격 (프레임 단위)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="모든 코덱을 표시 (호환이 안되는 것도 포함)"
 
+Screenshot="스크린샷 출력"
+Screenshot.SourceHotkey="선택한 소스를 스크린샷"
+Screenshot.StudioProgram="스크린샷 (프로그램)"
+Screenshot.Preview="스크린샷 (미리보기)"
+Screenshot.Scene="스크린샷 (장면)"
+Screenshot.Source="스크린샷 (소스)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY		연도, 네 자리\n%YY		연도, 마지막 두 자리 (00-99)\n%MM		월 십진법 (01-12)\n%DD		일, 선행 0 포함 (01-31)\n%hh		시 24 시간 형식 (00-23)\n%mm		Minute (00-59)\n%ss		초 (00-61)\n%%		A % sign\n%a		요일 축약\n%A		요일\n%b		월 축약\n%B		월\n%d		일, 선행 0 포함 (01-31)\n%H		시 24 시간 형식 (00-23)\n%I		시 12 시간 형식 (01-12)\n%m		월 십진법 (01-12)\n%M		분 (00-59)\n%p		AM 혹은 PM 구분\n%S		초 (00-61)\n%y		연도, 마지막 두 자리 (00-99)\n%Y		연도\n%z		UTC에서 ISO 8601 기준만큼 조정 혹은 시간대\n		이름 혹은 축약\n%Z		시간대 이름 혹은 축약\n%FPS		초당 프레임 수\n%CRES		기본 (캔버스) 해상도\n%ORES		출력 (조정된) 해상도\n%VF		비디오 형식"
@@ -750,10 +770,10 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="샘플 피크"
 Basic.Settings.Audio.PeakMeterType.TruePeak="트루 피크 (더 높은 CPU 자원 요구)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="경고: 서라운드 음향이 켜져 있습니다."
-Basic.Settings.Audio.MultichannelWarning="방송 중이라면 서비스에서 서라운드 음향에 대한 입력 및 재생을 지원하는지 확인하세요. 페이스북 360 라이브, Mixer RTMP, Smashcast 는 해당 기능을 사용할 수 있습니다. 페이스북 Live와 유튜브 Live 서비스는 입력은 할 수 있지만 스테레오로 전환하며 유튜브 Live는 오로지 2채널로만 재생합니다.\n\nOBS 오디오 필터는 서라운드 음향을 지원하지만 VST 플러그인 지원은 보장하지 않습니다."
+Basic.Settings.Audio.MultichannelWarning="방송 중이라면 서비스에서 서라운드 음향에 대한 입력 및 재생을 지원하는지 확인하세요. 페이스북 360 라이브는 해당 기능이 완전히 지원되는 곳 중 하나입니다. 페이스북 Live와 유튜브 Live 서비스는 입력은 할 수 있지만 페이스북 Live에서는 스테레오로 다운믹싱되고 유튜브 Live는 2채널에서만 재생됩니다.\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="마이크/보조 오디오"
@@ -917,3 +937,16 @@
 Restart="재시작"
 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="미디어 탐색 도구"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ku-TR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ku-TR.ini Changed

obs-studio-25.0.8.tar.xz/UI/data/locale/lt-LT.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/lt-LT.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Anglų"
-Region="Jungtinės Valstijos"
 
 OK="ОК"
 Apply="Pritaikyti"
@@ -23,13 +22,19 @@
 Display="Ekranas"
 Name="Vardas"
 Exit="Išeiti"
+Mixer="Audio mikseris"
 Browse="Naršyti"
 Mono="Mono"
 Stereo="Stereo"
 DroppedFrames="Atmesti kadrai %1 (%2%)"
+StudioProgramProjector="Pilno ekrano projekcija (Programa)"
 PreviewProjector="Pilno ekrano projektorius (Peržiūra)"
 SceneProjector="Pilno ekrano projektorius (Scena)"
 SourceProjector="Pilno ekrano projektorius (Šaltinis)"
+StudioProgramWindow="Ne pilno ekrano projekcija (Programa)"
+PreviewWindow="Ne pilno ekrano projekcija (Peržiūra)"
+SceneWindow="Ne pilno ekrano projekcija (Scena)"
+SourceWindow="Ne pilno ekrano projekcija (Šaltinis)"
 Clear="Išvalyti"
 Revert="Atstatyti"
 Show="Parodyti"
@@ -39,8 +44,8 @@
 New="Naujas"
 Duplicate="Dubliuoti"
 Enable="Įjungti"
-DisableOSXVSync="Išjungti OSX V-Sync"
-ResetOSXVSyncOnExit="Iš naujo nustatyti OSX V-Sync išeinant"
+DisableOSXVSync="Išjungti macOS V-Sync"
+ResetOSXVSyncOnExit="Iš naujo nustatyti macOS V-Sync išeinant"
 HighResourceUsage="Kodavimas perkrautas! Mažinkite vaizdo parametrus arba naudokite greitesnę kodavimo parengtį."
 Transition="Perėjimas"
 QuickTransitions="Greitieji perėjimai"
@@ -53,18 +58,59 @@
 Minutes="Minutės"
 Seconds="Sekundės"
 Import="Importuoti"
+Export="Eksportuoti"
+Copy="Kopijuoti"
+Paste="Įklijuoti"
+Next="Kitas"
+Back="Atgal"
+Defaults="Numatytieji"
+None="Nieko"
+StudioMode.Preview="Peržiūra"
+StudioMode.Program="Programa"
+Group="Grupė"
+Default="(Numatytas)"
+Fullscreen="Visas ekranas"
+Percent="Procentai"
 
+AlreadyRunning.Title="OBS jau yra ijungtas"
+AlreadyRunning.LaunchAnyway="Vistiek paleisti"
 
 
 
 
+Auth.Authing.Title="Autentifikuojama..."
+Auth.AuthFailure.Title="Autentifikacijos klaida"
+Auth.InvalidScope.Title="Reikalingas autentifikavimas"
+Auth.Chat="chat'as"
+Auth.StreamInfo="Transliacijos informacija"
 
+Copy.Filters="Kopijuoti filtrus"
 
 
+BandwidthTest.Region="Regionas"
+BandwidthTest.Region.US="Jungtinės Valstijos"
+BandwidthTest.Region.EU="Europa"
+BandwidthTest.Region.Asia="Azija"
+BandwidthTest.Region.Other="Kita"
 
+Basic.AutoConfig.ApplySettings="Taikyti nustatymus"
+Basic.AutoConfig.StartPage="Naudojimo informacija"
+Basic.AutoConfig.VideoPage="Video nustatymai"
+Basic.AutoConfig.StreamPage="Transliacijos informacija"
+Basic.AutoConfig.StreamPage.UseStreamKey="Naudoti transliacijos raktą"
+Basic.AutoConfig.StreamPage.Service="Platforma"
+Basic.AutoConfig.StreamPage.Server="Serveris"
+Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Nuoroda)"
 
+Basic.Stats.Output.Stream="Transliacija"
+Basic.Stats.Status="Statusas"
+Basic.Stats.Status.Live="TIESIOGIAI"
 
 
+Updater.UpdateNow="Atnaujinti dabar"
+Updater.RemindMeLater="Priminti vėliau"
+Updater.Skip="Praleisti versiją"
+Updater.NoUpdatesAvailable.Title="Nėra naujų atnaujinimų"
 
 QuickTransitions.SwapScenes="Sukeisti Peržiūros/Išvesties scenas po Perėjimo"
 QuickTransitions.SwapScenesTT="Sukeičia peržiūros ir išvesties scenas po perėjimo įvykdymo (jei originali išvesties scena vis dar egzistuoja).\nTai neatšauks jokių pakeitimų kurie galima buvo atlikti originalioje išvesties scenoje."
@@ -105,6 +151,8 @@
 ConfirmRemove.Title="Pašalinimo patvirtinimas"
 ConfirmRemove.Text="Ar tikrai norite pašalinti '$1'?"
 
+Output.StartStreamFailed="Nepavyko pradėti transliuoti"
+Output.StartRecordingFailed="Nepavyko pradėti įrašyti"
 
 
 Output.ConnectFail.Title="Nepavyko prisijungti"
@@ -135,6 +183,7 @@
 Remux.FinishedTitle="Permiksavimas baigtas"
 Remux.Finished="Įrašas permiksuotas"
 Remux.FinishedError="Įrašas permiksuotas, tačiau failas gali būti neužbaigtas"
+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ą?"
 
@@ -211,6 +260,10 @@
 
 
 
+Basic.Filters="Filtrai"
+Basic.Filters.AsyncFilters="Audio/Video filtrai"
+Basic.Filters.AudioFilters="Audio filtrai"
+Basic.Filters.EffectFilters="Efektų filtrai"
 
 Basic.TransformWindow.Position="Padėtis"
 Basic.TransformWindow.Rotation="Pasukimas"
@@ -284,6 +337,7 @@
 
 
 
+
 Basic.Settings.Advanced.General.ProcessPriority.High="Aukštas"
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Virš vidutionio"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Vidutinis"
@@ -330,3 +384,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/mn-MN.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/mn-MN.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Монгол"
-Region="Монгол"
 
 OK="За"
 Apply="Хэрэглэх"
@@ -23,11 +22,22 @@
 Display="Харагдах байдал"
 Name="Нэр"
 Exit="Гарах"
+Mixer="Дуу холигч"
 Browse="Хайх"
 Mono="Моно"
 Stereo="Стерео"
+DroppedFrames="Орхигдсон дүрсүүд %1 (%2%)"
+StudioProgramProjector="Дэлгэц дүүрэн Проектор (Хөтөлбөр)"
+PreviewProjector="Дэлгэц дүүрэн Проектор (Урьдчилж харах)"
 SceneProjector="Дэлгэц дүүрэн Проектор (Хөшиг)"
+SourceProjector="Дэлгэц дүүрэн Проектор (Эх сурвалж)"
+StudioProgramWindow="Цонх дүүрэн Проектор (Хөтөлбөр)"
+PreviewWindow="Цонх дүүрэн Проектор (Урьдчилж харах)"
 SceneWindow="Цонх дүүрэн Проектор (Хөшиг)"
+SourceWindow="Цонх дүүрэн Проектор (Эх сурвалж)"
+MultiviewProjector="Хэсэгчлэн Харах (Дэлгэц дүүрэн)"
+MultiviewWindowed="Хэсэгчлэн Харах (Цонх дүүрэн)"
+ResizeProjectorWindowToContent="Цонхыг өгөгдсөн зүйлд тааруулах"
 Clear="Арилгах"
 Revert="Буцаах"
 Show="Харуулах"
@@ -37,32 +47,64 @@
 New="Шинэ"
 Duplicate="Хувилах"
 Enable="Идэвхжүүлэх"
-DisableOSXVSync="OSX V-Sync-ийг хориглох"
-ResetOSXVSyncOnExit="OSX V-Sync-ийг гарахдаа хэвэнд нь оруулах"
+DisableOSXVSync="macOS V-Sync-ийг хориглох"
+ResetOSXVSyncOnExit="macOS V-Sync-ийг гарахдаа хэвэнд нь оруулах"
+HighResourceUsage="Хөрвүүлэх явц нь хэт их ачаалсан! Видеоны тохиргоог бууруулах эсвэл хурдасгасан хөрвүүлэх тохиргоог ашиглана уу."
 Transition="Шилжилт"
 QuickTransitions="Түргэн шилжилт"
+FadeToBlack="Хар өнгөөр бүдгэрэх"
 Left="Зүүн"
 Right="Баруун"
 Top="Дээд хэсэг"
 Bottom="Доод хэсэг"
+Reset="Дахин тохируулах"
 Hours="Цаг"
 Minutes="Минут"
 Seconds="Секунд"
+ReplayBuffer="Нөөц дүрс дахин тоглуулах"
 Import="Импортлох"
 Export="Экспортлох"
 Copy="Хуулах"
 Paste="Зөөж тавих"
+PasteReference="Буулгах (Лавлагаа)"
+PasteDuplicate="Буулгах (Хувилах)"
+RemuxRecordings="Бичлэгийг шинэчлэн хуулан нэмэх"
 Next="Дараачийх"
 Back="Буцах"
+Defaults="Үндсэн"
+HideMixer="Холигч дотор нуух"
+TransitionOverride="Шилжүүлэлтийг, нэмэлтээр гүйцэтгэх"
 None="Байхгүй"
+StudioMode.Preview="Урьдчилж харах"
 StudioMode.Program="Програм"
+ShowInMultiview="Олон харагдацаар үзүүлэх"
+VerticalLayout="Босоо Байрлал"
 Group="Групп"
+DoNotShowAgain="Дахин харуулах хэрэггүй"
+Default="(Үндсэн)"
+Calculating="Тооцоолж байна..."
+Fullscreen="Дэлгэц дүүрэн"
+Windowed="Цонхтой"
+Percent="Хувь"
+RefreshBrowser="Сэргээх"
+LockVolume="Дууг түгжих"
+LogViewer="Лог Харагч"
+ShowOnStartup="Эхлэх үед харуулах"
+OpenFile="Файлыг нээх"
 
 AlreadyRunning.Title="OBS нь аль хэдийнээ ажиллаж байна"
 AlreadyRunning.LaunchAnyway="Юутай ч эхлүүл"
 
+ChromeOS.Title="Дэмжигдээгүй тавцан"
 
+DockCloseWarning.Title="Залгагддаг цонхыг хааж байна"
 
+ExtraBrowsers="Хувийн Хөтчийн Холбоос"
+ExtraBrowsers.DockName="Холбогдсон Нэр"
+
+Auth.Authing.Title="Баталгаажуулж нэвтрүүлж байна..."
+Auth.AuthFailure.Title="Баталгаажуулж нэвтрүүлэх явцад алдаа гарлаа"
+Auth.InvalidScope.Title="Баталгаажуулж нэвтрүүлэх шаардлагатай"
 
 
 
@@ -72,16 +114,31 @@
 BandwidthTest.Region.Asia="Ази"
 BandwidthTest.Region.Other="Бусад"
 
-
 Basic.AutoConfig.ApplySettings="Тохиргоог хэрэглэх"
 Basic.AutoConfig.VideoPage="Видео Тохиргоо"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Одоо байгааг ашиглах (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Харуулах %1(%2x%3)"
+Basic.AutoConfig.StreamPage.SubTitle="Өөрийн цацалтын мэдээллийг оруулна уу"
+Basic.AutoConfig.StreamPage.ConnectAccount="Хэрэглэгчийг холбох (зөвлөж байна)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Хэрэглэгчийг салгах"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Хэрэглэгчийг салгах уу?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Цацалтын түлхүүр үгс авах"
+Basic.AutoConfig.StreamPage.UseStreamKey="Цацалтын түлхүүр үгс хэрэглэх"
 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.LinkToSite="(Линк)"
+Basic.AutoConfig.StreamPage.StreamWarning.Title="Цацалтын анхааруулга"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="%1x%2 %3 FPS Туршилт хийх байна..."
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Цацалтыг Кодлох төрөл"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="Бичлэгийг Кодлох төрөл"
 
+Basic.Stats="Статистикууд"
 Basic.Stats.CPUUsage="CPU-ний хэрэглээ"
+Basic.Stats.HDDSpaceAvailable="Дискний боломжтой зай"
+Basic.Stats.MemoryUsage="Санах ойн хэрэглээ"
 Basic.Stats.Output.Stream="Цацалт"
 Basic.Stats.Output.Recording="Бичлэг хийж байна"
 Basic.Stats.Status="Статус"
@@ -89,6 +146,9 @@
 Basic.Stats.Status.Live="Шууд"
 Basic.Stats.Status.Reconnecting="Дахин холбогдож байна"
 Basic.Stats.Status.Inactive="Идэвхигүй"
+Basic.Stats.Status.Active="Идэвхтэй"
+Basic.Stats.Bitrate="Битийн хурд"
+Basic.Stats.ResetStats="Статистикийг дахин тохируулах"
 
 
 Updater.Title="Шинж шинэчлэлт билэн байна"
@@ -96,6 +156,8 @@
 Updater.UpdateNow="Одоо шинэчлэх"
 Updater.RemindMeLater="Дараа нь надад сануул"
 Updater.Skip="Хувилбар алгасах"
+Updater.GameCaptureActive.Title="Тоглоом чагнагч идэвхтэй байна"
+Updater.GameCaptureActive.Text="Тоглоом чагнагч дэгээ холбоосны сан одоогоор хэрэглэж байна. Бүх тоглоом/програмыг чагнахаас сэргийлж хаах (эсвэл Windows-ийг дахин ажиллуулаад) ба дахин оролдоно уу."
 
 QuickTransitions.DuplicateScene="Давхардсан хөшиг"
 QuickTransitions.HotkeyName="Түргэн шилжилт: %1"
@@ -118,6 +180,7 @@
 
 ConfirmStop.Title="Цацалтыг зогсоох?"
 
+ConfirmStopRecord.Title="Бичлэгийг зогсоох?"
 
 
 ConfirmExit.Title="OBS-ийг хаах"
@@ -126,6 +189,7 @@
 ConfirmRemove.Text="Та '$1' устгахыг хүсч байгаадаа итгэлтэй байна уу?"
 
 Output.StartStreamFailed="Цацалт хийж эхлэхгээд амжилтгүй болсон"
+Output.StartRecordingFailed="Бичлэг хийж эхэлсэнгүй"
 
 
 Output.ConnectFail.Disconnected="Серверээс салгагдсан байна."
@@ -134,15 +198,18 @@
 Output.RecordFail.Title="Бичлэг хийх эхлэхгээд амжилтгүй болсон"
 Output.RecordError.Title="Бичлэгийн алдаа"
 Output.RecordError.Msg="Бичлэг хийж байх үед тодорхойгүй алдаа гарлаа."
-Output.ReplayBuffer.NoHotkey.Title="Ямарч богино холбооc хийгдээгүй байна!"
 
 
 
+Remux.SourceFile="OBS-ийн бичлэг"
 Remux.ClearAll="Бүх зүйлсийг арилгах"
+Remux.OBSRecording="OBS-ийн бичлэг"
+Remux.SelectRecording="OBS-ийн бичлэгийг сонгох..."
 
 
 
 Basic.Scene="Хөшиг"
+Basic.DisplayCapture="Дэлгэц Чагнагч"
 
 
 
@@ -192,25 +259,34 @@
 Basic.TransformWindow.BoundsType.MaxOnly="Зөвхөн хамгийн их хэмжээ"
 
 Basic.Main.AddSourceHelp.Title="Эх үүсвэр нэмэх боломжгүй"
+Basic.Main.AddSourceHelp.Text="Та \"Эх үүсвэр\" нэмэхийн тулд дор хаяж 1 \"Хөшигтэй\" байх ёстой."
 
-Basic.Main.Scenes="Хөшиг"
+Basic.Main.Scenes="Хөшигнүүд"
 Basic.Main.Sources="Эх үүсвэр"
 Basic.Main.Controls="Удирдлага"
 Basic.Main.Connecting="Холбогдож байна..."
 Basic.Main.StartRecording="Бичлэг хийж эхлэх"
 Basic.Main.StartStreaming="Цацаж эхлэх"
 Basic.Main.StopRecording="Бичлэгийг зогсоох"
+Basic.Main.PauseRecording="Бичлэгийг түр зогсоох"
+Basic.Main.UnpauseRecording="Бичлэгийг түр зогсооcныг болиулах"
+Basic.Main.StoppingRecording="Бичлэгийг зогсоох..."
 Basic.Main.StopStreaming="Цацалтыг зогсоох"
 Basic.Main.Ungroup="Груплэхгүй"
 
+Basic.MainMenu.File="&Хавтас"
+Basic.MainMenu.File.ShowRecordings="Хийсэн бичлэгүүдийг харуулах"
 Basic.MainMenu.File.Settings="Тохиргоо (&S)"
 Basic.MainMenu.File.ShowSettingsFolder="Тохиргооны хавтасыг харуулах"
 Basic.MainMenu.File.ShowProfileFolder="Профайлын хавтасыг харуулах"
 Basic.MainMenu.AlwaysOnTop="Үргэлж дээд хэсэгт (&A)"
 Basic.MainMenu.File.Exit="Гарах (&X)"
 
+Basic.MainMenu.Edit="&Засах"
 Basic.MainMenu.Edit.Scale.Window="Цонх дүүрэн болгох"
+Basic.MainMenu.Edit.Scale.Output="Гаралтын (%1x%2)"
 
+Basic.MainMenu.View="&Харах"
 
 Basic.MainMenu.SceneCollection="Хөшигний цуглуулга (&S)"
 Basic.MainMenu.Profile="Профайл (&P)"
@@ -222,8 +298,16 @@
 Basic.MainMenu.Help="Тусламж (&H)"
 Basic.MainMenu.Help.HelpPortal="Портал Тусламж (&P)"
 Basic.MainMenu.Help.Website="Вэбсайтаар Зочлох (&W)"
+Basic.MainMenu.Help.Discord="&Дискорд Серверт нэгдэх"
+Basic.MainMenu.Help.Logs="&Бүртгэл файлууд"
+Basic.MainMenu.Help.Logs.ShowLogs="&Бүртгэлийн файлыг харуулах"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="&Одоогийн бүртгэлийн файлыг байршуулах"
+Basic.MainMenu.Help.Logs.UploadLastLog="&Сүүлийн бүртгэлийн файлыг байршуулах"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Одоогийн бүртгэлийг харах"
+Basic.MainMenu.Help.CheckForUpdates="Шинэчлэл шалгах"
 Basic.MainMenu.Help.CrashLogs="Эвдрэлийн мэдээлэл (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Эвдрэлийн мэдээлэлүүдийг харуулах (&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Сүүлийн гэмтлийн тайланг байршуулах"
 Basic.MainMenu.Help.About="Тухай (&A)"
 
 Basic.Settings.ConfirmTitle="Өөрчлөлтийг батлах"
@@ -244,13 +328,19 @@
 Basic.Settings.Output.Mode="Гаралтын Горим"
 Basic.Settings.Output.Mode.Simple="Энгийн"
 Basic.Settings.Output.Mode.Adv="Дэвшилттэй"
+Basic.Settings.Output.Simple.SavePath="Бичлэгийн зам"
+Basic.Settings.Output.Simple.RecordingQuality="Бичлэгийн Чанар"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Цацалттай адилхан"
 Basic.Settings.Output.VideoBitrate="Видео Битийн хурд"
 Basic.Settings.Output.AudioBitrate="Аудио Битийн хурд"
 Basic.Settings.Output.MaxRetries="Олон удаа оролдлого хийх"
 
+Basic.Settings.Output.Adv.Streaming="Цацалт"
 
+Basic.Settings.Output.Adv.Recording="Бичлэг хийх"
 Basic.Settings.Output.Adv.Recording.Type="Төрөл"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Стандарт"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Бичлэгийн нийтлэг өргөтгөлүүд"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Бүх файлууд"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Аудио"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Видео"
@@ -259,8 +349,12 @@
 
 
 
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео Адаптер"
+Basic.Settings.Video.BaseResolution="Суурийн (Canvas) Хэмжээс"
+Basic.Settings.Video.DownscaleFilter="Бууруулах Шүүлтүүр"
+Basic.Settings.Video.FPSCommon="Түгээмэл өгөгдсөн FPS"
 Basic.Settings.Video.Numerator="Тоонжуулагч"
 Basic.Settings.Video.Denominator="Деноматор"
 Basic.Settings.Video.Renderer="Рэндэрлэгч"
@@ -337,3 +431,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ms-MY.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ms-MY.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Bahasa Melayu"
-Region="Malaysia"
 
 OK="OK"
 Apply="Letak"
@@ -38,8 +37,8 @@
 New="Baharu"
 Duplicate="Salin semula"
 Enable="Benarkan"
-DisableOSXVSync="Nyahaktifkan V-Sync OSX"
-ResetOSXVSyncOnExit="Set semula OSX V-Sync apabila keluar"
+DisableOSXVSync="Nyahaktifkan V-Sync macOS"
+ResetOSXVSyncOnExit="Set semula macOS V-Sync apabila keluar"
 HighResourceUsage="Pengekodan terbeban! Cuba turunkan tetapan video ataupun gunakan pratetap pengekodan yang lebih laju."
 Transition="Peralihan"
 QuickTransitions="Peralihan Pantas"
@@ -66,11 +65,11 @@
 
 
 
+
 BandwidthTest.Region.EU="Eropah"
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Lain-lain"
 
-
 Basic.AutoConfig.ApplySettings="Gunakan seting"
 Basic.AutoConfig.StartPage="Maklumat penggunaan"
 Basic.AutoConfig.VideoPage="Seting video"
@@ -392,6 +391,7 @@
 
 
 
+
 Basic.Settings.Audio.EnablePushToMute="Benarkan Tekan-untuk-senyap"
 Basic.Settings.Audio.PushToMuteDelay="Kelewatan Tekan-untuk-senyap"
 Basic.Settings.Audio.EnablePushToTalk="Benarkan Tekan-untuk-cakap"
@@ -459,3 +459,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/nb-NO.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Norsk bokmål"
-Region="Norge"
 
 OK="Ok"
 Apply="Bruk"
@@ -47,7 +46,7 @@
 New="Ny"
 Duplicate="Dupliser"
 Enable="Aktiver"
-DisableOSXVSync="Deaktiver OS X v-sync"
+DisableOSXVSync="Deaktiver macOS v-sync"
 ResetOSXVSyncOnExit="Tilbakestill macOS sin V-sync ved avslutning"
 HighResourceUsage="Koderen er overbelastet! Vurder nedjustering av videokvaliteten eller en raskere forhåndsinnstilling for koderen."
 Transition="Overgang"
@@ -94,6 +93,7 @@
 AlreadyRunning.Text="OBS kjører allerede! Med mindre du ikke mente dette, vennligst lukk alle eksisterende kjørende tilfeller av OBS før du kjører noen nye. Hvis du har satt OBS til å minimere til systemkurven, vennligst sjekk om den fortsatt kjører der."
 AlreadyRunning.LaunchAnyway="Start uansett"
 
+
 DockCloseWarning.Title="Lukker festbart vindu"
 DockCloseWarning.Text="Du stengte nettopp et festbart vindu. Hvis du vil vise det igjen, kan du gå til Vis → Festede elementer i menylinjen."
 
@@ -131,9 +131,6 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Andre"
 
-Basic.FirstStartup.RunWizard="Vil du kjøre veiviseren for automatisk konfigurasjon? Du kan også manuelt konfigurere innstillingene ved å klikke på Innstillinger-knappen i hovedvinduet."
-Basic.FirstStartup.RunWizard.NoClicked="Hvis du ombestemmer deg, kan du kjøre veiviseren for automatisk konfigurasjon fra Verktøy-menyen."
-
 Basic.AutoConfig="Auto-oppsettsveiviser"
 Basic.AutoConfig.ApplySettings="Bruk innstillinger"
 Basic.AutoConfig.StartPage="Bruksinformasjon"
@@ -141,7 +138,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimaliser for strømming, innspilling kommer i andre rekke"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimaliser for innspilling, jeg skal ikke streame"
 Basic.AutoConfig.VideoPage="Videoinnstillinger"
-Basic.AutoConfig.VideoPage.SubTitle="Velg de ønskede videoinnstillingene du ønsker å bruke"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Bruk Gjeldende (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Skjerm %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Bruk Gjeldende (%1)"
@@ -292,8 +288,6 @@
 Output.RecordError.Title="Innspillingsfeil"
 Output.RecordError.Msg="Det oppstod en uspesifisert feil under opptaket."
 Output.RecordError.EncodeErrorMsg="En kodingsfeil skjedde under opptaket."
-Output.ReplayBuffer.NoHotkey.Title="Ingen hurtigtast satt!"
-Output.ReplayBuffer.NoHotkey.Msg="Ingen lagringshurtigtast er valgt for omspillingsbufferen. Vennligst velg en \"Lagre\"-hurtigknapp, sånn at den kan brukes til å lagre opptak."
 
 Output.BadPath.Title="Ugyldig Filbane"
 Output.BadPath.Text="Den oppgitte fillagringsbanen er ugyldig. Vennligst sjekk innstillingene dine og bekreft at filbanen er gyldig."
@@ -527,7 +521,6 @@
 Basic.MainMenu.View.Docks.ResetUI="Omstart grensesnittet"
 Basic.MainMenu.View.Docks.LockUI="Lås grensesnittet"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Tilpassede nettleseroppgavelinjer..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Listebokser"
 Basic.MainMenu.View.SceneTransitions="S&ceneoverganger"
 Basic.MainMenu.View.SourceIcons="Kilde &ikoner"
 Basic.MainMenu.View.StatusBar="&Statuslinje"
@@ -640,7 +633,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maksimal minnebruk (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Anslått minnebruk: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Kan ikke beregne minnebruk. Vennligst sett maksimalt minnebrukgrense."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Merk: Sørg for å angi en hurtigtast for omspillingsbufferen i hurtigtastsinnstillingene)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Reprisebufferens filnavnprefiks"
 Basic.Settings.Output.ReplayBuffer.Suffix="Suffiks"
 Basic.Settings.Output.Simple.SavePath="Opptaksbane"
@@ -714,6 +706,7 @@
 
 
 
+
 Basic.Settings.Video="Bilde"
 Basic.Settings.Video.Adapter="Bildeadapter"
 Basic.Settings.Video.BaseResolution="Grunnoppløsning (lerret)"
@@ -747,10 +740,8 @@
 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 strømmetjenesten din støtter både surround-lydinnføring og surround-lydavspilling. Facebook 360 Live, Mixer RTMP, og Smashcast er eksempler hvor surroundlyd er full 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.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="Enheter"
 Basic.Settings.Audio.DesktopDevice="Skrivebordslyd"
 Basic.Settings.Audio.DesktopDevice2="Skrivebordslyd 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/Aux"
@@ -914,3 +905,5 @@
 Restart="Omstart"
 NeedsRestart="OBS Studio må startes på nytt. Vil du starte på nytt nå?"
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/nl-NL.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Nederlands"
-Region="Nederland"
 
 OK="OK"
 Apply="Toepassen"
@@ -38,6 +37,7 @@
 SourceWindow="Projectorvenster (Bron)"
 MultiviewProjector="Multiview (Fullscreen)"
 MultiviewWindowed="Multiview (Venster)"
+ResizeProjectorWindowToContent="Venster aanpassen naar inhoud"
 Clear="Wissen"
 Revert="Herstellen"
 Show="Weergeven"
@@ -47,8 +47,8 @@
 New="Nieuw"
 Duplicate="Dupliceren"
 Enable="Inschakelen"
-DisableOSXVSync="OSX V-Sync uitschakelen"
-ResetOSXVSyncOnExit="OSX V-Sync resetten bij afsluiten"
+DisableOSXVSync="macOS V-Sync uitschakelen"
+ResetOSXVSyncOnExit="macOS V-Sync resetten bij afsluiten"
 HighResourceUsage="Encoden overbelast! Overweeg de video-instellingen te verlagen of een snellere encoder preset te gebruiken."
 Transition="Overgang"
 QuickTransitions="Snelle overgangen"
@@ -87,13 +87,21 @@
 Fullscreen="Volledig scherm"
 Windowed="Venster"
 Percent="Procent"
+RefreshBrowser="Herlaad"
 AspectRatio="Beeldverhouding <b>%1:%2</b>"
 LockVolume="Volume vergrendelen"
+LogViewer="Log Bekijker"
+ShowOnStartup="Weergeven tijdens opstarten"
+OpenFile="Bestand openen"
+AddValue="%1 toevoegen"
 
 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"
 
+ChromeOS.Title="Niet-ondersteund platform"
+ChromeOS.Text="OBS lijkt te worden uitgevoerd in een ChromeOS container. Dit platform wordt niet ondersteund"
+
 DockCloseWarning.Title="Dokbaar Venster Sluiten"
 DockCloseWarning.Text="Je hebt net een dokbaar venster gesloten. Als je het opnieuw wilt zien, gebruik dan het menu Beeld → Docks in de menubalk."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Azië"
 BandwidthTest.Region.Other="Overig"
 
-Basic.FirstStartup.RunWizard="Wil je de automatische configuratieassistent gebruiken? Je kan ook de instellingen handmatig aanpassen door op Instellingen te klikken in het hoofdscherm."
-Basic.FirstStartup.RunWizard.NoClicked="Mocht je van gedachten veranderen, dan kun je de automatische configuratieassistent opnieuw starten vanuit het Help menu."
-
 Basic.AutoConfig="Automatische configuratieassistent"
 Basic.AutoConfig.ApplySettings="Instellingen toepassen"
 Basic.AutoConfig.StartPage="Gebruiksinformatie"
 Basic.AutoConfig.StartPage.SubTitle="Waar wil je het programma voor gebruiken?"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimaliseren voor streamen, lokaal opnemen is minder belangrijk"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimaliseren voor lokaal opnemen, ik ga niet streamen"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Ik ga alleen de virtuele camera gebruiken"
 Basic.AutoConfig.VideoPage="Video-instellingen"
-Basic.AutoConfig.VideoPage.SubTitle="Geef aan welke gewenste video-instellingen je wil gebruiken"
+Basic.AutoConfig.VideoPage.SubTitle="Specifieer welke videoinstellingen u wenst te gebruiken"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Gebruik huidige (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Beeldscherm %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Gebruik huidige (%1)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Opname-encoder"
 Basic.AutoConfig.TestPage.Result.Header="Het programma heeft vastgesteld dat deze geschatte instellingen het meest ideaal zijn voor jou:"
 Basic.AutoConfig.TestPage.Result.Footer="Om deze instellingen te gebruiken, klik op Instellingen Toepassen. Om de configuratieassistent aan te passen, klik op Terug. Om de instellingen handmatig te bepalen, klik op Annuleren en open de instellingen."
+Basic.AutoConfig.Info="De automatische configuratiewizard bepaalt de beste instellingen op basis van uw computerspecificaties en de snelheid van de internetverbinding."
+Basic.AutoConfig.RunAnytime="Dit kan op elk moment worden uitgevoerd door naar het Tools menu te gaan."
 
 Basic.Stats="Statistieken"
 Basic.Stats.CPUUsage="Processorgebruik"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Er is geen sneltoets ingesteld!"
-Output.ReplayBuffer.NoHotkey.Msg="Er is geen opslaan sneltoets ingesteld voor de replay buffer. Zet aub de \"Opslaan\" sneltoets voor het opslaan van replay-opnames."
 
 Output.BadPath.Title="Ongeldig Bestandspad"
 Output.BadPath.Text="Het geconfigureerde bestandsuitvoerpad is ongeldig. Controleer a.u.b. je instellingen om te bevestigen dat er een geldig bestandspad is ingesteld."
 
 LogReturnDialog="Log succesvol geüpload"
+LogReturnDialog.Description="Uw logbestand is geüpload. U kunt nu de URL delen voor debugging of ondersteuningsdoeleinden."
+LogReturnDialog.Description.Crash="Uw crashrapport is geüpload. U kunt nu de URL delen voor debugging doeleinden."
 LogReturnDialog.CopyURL="URL kopiëren"
+LogReturnDialog.AnalyzeURL="Analyseren"
 LogReturnDialog.ErrorUploadingLog="Fout bij het uploaden van het logbestand"
 
 Remux.SourceFile="OBS Opname"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Start Replay Buffer"
 Basic.Main.SaveReplay="Replay Opslaan"
 Basic.Main.StartStreaming="Stream Starten"
+Basic.Main.StartVirtualCam="Virtuele camera starten"
 Basic.Main.StopRecording="Opname Stoppen"
 Basic.Main.PauseRecording="Opname pauzeren"
 Basic.Main.UnpauseRecording="Opname vervolgen"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Stream Stoppen"
 Basic.Main.StoppingStreaming="Stream Stoppen..."
 Basic.Main.ForceStopStreaming="Stop Stream (vertraging negeren)"
+Basic.Main.ShowContextBar="Toon bronwerkbalk"
+Basic.Main.HideContextBar="Verberg bronwerkbalk"
+Basic.Main.StopVirtualCam="Virtuele camera stoppen"
 Basic.Main.Group="Groep %1"
 Basic.Main.GroupItems="Groepeer geselecteerde items"
 Basic.Main.Ungroup="Degroeperen"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Herstel UI"
 Basic.MainMenu.View.Docks.LockUI="Zet UI Vast"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Aangepaste Browser Docks..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Lijsten"
+Basic.MainMenu.View.ListboxToolbars="Scène/Bronlijst knoppen"
+Basic.MainMenu.View.ContextBar="Bron werkbalk"
 Basic.MainMenu.View.SceneTransitions="S&cène-overgangen"
 Basic.MainMenu.View.SourceIcons="Bron &iconen"
 Basic.MainMenu.View.StatusBar="&Statusbalk"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximale hoeveelheid geheugen (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Geschat geheugengebruik: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Kan geheugengebruik niet inschatten. Stel een limiet in op het geheugengebruik."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Let op: Maak een sneltoets voor de replay buffer in de Sneltoetsen sectie)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Replay Buffer Bestandsnaam Prefix"
 Basic.Settings.Output.ReplayBuffer.Suffix="Achtervoegsel"
 Basic.Settings.Output.Simple.SavePath="Opnamepad"
@@ -712,7 +725,16 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Tijd tussen keyframes (frames)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Toon alle codecs (ongeacht compatibiliteit)"
 
+Screenshot="Schermopname Uitvoer"
+Screenshot.SourceHotkey="Schermopname Geselecteerde Bron"
+Screenshot.StudioProgram="Schermopname (Programma)"
+Screenshot.Preview="Schermopname (Preview)"
+Screenshot.Scene="Schermopname (Scene)"
+Screenshot.Source="Schermopname (Bron)"
 
+FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n-%DD%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%d-%m-%Y %I-%M-%S-%p\n%d-%m-%Y %H-%M-%S-%z\n%d-%m-%Y %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
+FilenameFormatting.TT="%CCYY	Jaar, vier cijfers\n%YY		Jaar, laatste twee cijfers (00-99)\n%MM		Maand decimaal (01-12)\n%DD		Dag van de maand, zero-padded (01-31)\n%hh		Uur in 24h-opmaak (00-23)\n%mm		Minuut (00-59)\n%ss		Seconde (00-61)\n%%		A % teken\n%a		Afkorting weekdag\n%A		Volledige weekdag\n%b		Afkorting maand\n%B		Volledige maand\n%d		Dag van de maand, zero-padded (01-31)\n%H		Uur in 24h-opmaak (00-23)\n%I		Uur in 12h-opmaak (01-12)\n%m		Maand decimaal (01-12)\n%M		Minuut (00-59)\n%p		AM of PM aanduiding\n%S		Seconde (00-61)\n%y		Jaar, laatste twee cijfers (00-99)\n%Y		Jaar\n%z		ISO 8601 aanpassing tegenover UTC in tijdzone\n%Z		Tijdzone naam of afkorting\n%FPS		Frames per seconde\n%CRES		Basis (canvas) resolutie\n%ORES		Uitvoer (geschaald) resolutie\n%VF		Videoformaat"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Videoadapter"
@@ -748,10 +770,10 @@
 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 je streaming service zowel surround sound ingest als surround sound afspelen ondersteunt. Facebook 360 Live, Mixer RTMP, Smashcast zijn voorbeelden waar surround sound volledig ondersteund is. 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 audio filters kunnen overweg met surround sound, maar ondersteuning bij VST plugins is niet gegarandeerd."
+Basic.Settings.Audio.MultichannelWarning="Als je streamt, controleer dan of je streaming service zowel surround sound ingest als surround sound afspelen ondersteunt. Facebook 360 Live is een voorbeeld waar surround sound volledig ondersteund is. 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 audio filters kunnen overweg met surround sound, maar ondersteuning bij VST plugins is niet gegarandeerd."
 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="Apparaten"
+Basic.Settings.Audio.Devices="Globale Audio-apparaten"
 Basic.Settings.Audio.DesktopDevice="Desktop Audio"
 Basic.Settings.Audio.DesktopDevice2="Desktop Audio 2"
 Basic.Settings.Audio.AuxDevice="Mic/Aux Audioapparaat"
@@ -790,6 +812,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Bind aan IP"
 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."
 Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Sneltoets Focus Gedrag"
 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Nooit sneltoetsen uitschakelen"
 Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Hotkeys uitschakelen wanneer hoofdvenster in focus is"
@@ -914,3 +937,16 @@
 Restart="Opnieuw opstarten"
 NeedsRestart="OBS Studio moet opnieuw worden opgestart. Wil je nu opnieuw opstarten?"
 
+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.StopMedia="Stop Media"
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/nn-NO.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/nn-NO.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Norsk Nynorsk"
-Region="Noreg"
 
 OK="OK"
 Apply="Bruk"
@@ -42,8 +41,8 @@
 New="Ny"
 Duplicate="Dupliser"
 Enable="Aktiver"
-DisableOSXVSync="Slå av OSX V-Sync"
-ResetOSXVSyncOnExit="Tilbakestill OSX V-Sync når du avsluttar"
+DisableOSXVSync="Slå av macOS V-Sync"
+ResetOSXVSyncOnExit="Tilbakestill macOS V-Sync når du avsluttar"
 Transition="Overgang"
 QuickTransitions="Raske overgangar"
 FadeToBlack="Falme til svart"
@@ -75,12 +74,12 @@
 
 
 
+
 BandwidthTest.Region="Region"
 BandwidthTest.Region.EU="Europa"
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Andre stader"
 
-
 Basic.AutoConfig.ApplySettings="Bruk innstillingane"
 Basic.AutoConfig.StartPage="Bruksinformasjon"
 Basic.AutoConfig.VideoPage="Videoinnstillingar"
@@ -172,7 +171,7 @@
 Basic.Main.Sources="Kjelder"
 Basic.Main.Controls="Kontrollere"
 Basic.Main.StartRecording="Byrje å ta opp"
-Basic.Main.StartStreaming="Byrje å straume"
+Basic.Main.StartStreaming="Byrje å strøyme"
 
 Basic.MainMenu.File="&Fil"
 Basic.MainMenu.File.Export="&Eksporter"
@@ -231,3 +230,6 @@
 
 
 
+
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/pa-IN.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/pa-IN.ini Changed

@@ -1,6 +1,5 @@
 
 Language="ਅੰਗਰੇਜ਼ੀ"
-Region="ਅਮਰੀਕਾ"
 
 OK="ਠੀਕ ਹੈ"
 Apply="ਲਾਗੂ ਕਰੋ"
@@ -27,6 +26,7 @@
 Browse="ਖੋਜ ਕਰੋ"
 Mono="ਮੋਨੋ - ਕਲਾ ਇੱਕ ਟਰੈਕ"
 Stereo="ਸਟੀਰੀਓ - ਦੋ ਟਰੈਕ"
+DroppedFrames="ਖੁੰਝ ਗਏ ਫਰੇਮ %1 (%2%)"
 StudioProgramProjector="ਪੂਰੀ ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਗਰਾਮ ਦੇਖੋ"
 PreviewProjector="ਪੂਰੀ ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੀਵੀਊ ਦੇਖੋ"
 SceneProjector="ਪੂਰੀ ਸਕ੍ਰੀਨ ਤੇ ਸੀਨ ਦੇਖੋ"
@@ -46,10 +46,11 @@
 New="ਨਵਾਂ"
 Duplicate="ਨਕਲ"
 Enable="ਚਾਲੂ"
-DisableOSXVSync="OSX V-Sync ਨੂੰ ਬੰਦ ਕਰੋ"
-ResetOSXVSyncOnExit="ਪ੍ਰੋਗਰਾਮ ਬੰਦ ਹੋਣ ਤੇ OSX V-Sync ਨੂੰ ਫਿਰ ਚਾਲੂ"
+DisableOSXVSync="macOS V-Sync ਨੂੰ ਬੰਦ ਕਰੋ"
+ResetOSXVSyncOnExit="ਪ੍ਰੋਗਰਾਮ ਬੰਦ ਹੋਣ ਤੇ macOS V-Sync ਨੂੰ ਫਿਰ ਚਾਲੂ"
 HighResourceUsage="ਇਨਕੋਡਰ ਜਿਆਦਾ ਬੋਝ ਤੇ ਹੈ! ਵੀਡੀਓ ਸੈਟਿੰਗ ਨੂੰ ਘਟਾਓਨ ਜਾਂ ਤੇਜ ਪ੍ਰੀਸੈਟ ਵਰਤਣ ਬਾਰੇ ਵੀਚਾਰੋ!"
 Transition="ਸੀਨ ਬਦਲੋ"
+QuickTransitions="ਤੇਜੀ ਨਾਲ ਤਬਦੀਲ ਕਰੋ"
 FadeToBlack="ਕਾਲੀ ਸਕ੍ਰੀਨ ਦਖਾਓ"
 Left="ਖਬਾ"
 Right="ਸਜਾ"
@@ -67,6 +68,7 @@
 PasteDuplicate="ਚੇਪ (ਦੂਪਲੀਕਟ)"
 Next="ਅਗੇ"
 Back="ਪਿਸ਼ੇ"
+Defaults="ਮੂਲ"
 HideMixer="ਮਿਕਸਰ ਵਿੱਚ ਲੁਕੋ"
 None="ਕੋਈ ਨਹੀਂ"
 StudioMode.Preview="ਪ੍ਰੀਵਿਊ"
@@ -74,8 +76,11 @@
 ShowInMultiview="ਮੁਲਟੀ ਵੀਓ ਦੇ ਵਿੱਚ ਦਖਓ"
 Group="ਗਰੁੱਪ"
 DoNotShowAgain="ਇਸ ਨੂੰ ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"
+Default="(ਮੂਲ)"
+Calculating="ਗਿਣਤੀ ਹੋ ਰਹੀ ਹੈ..."
 Fullscreen="ਪੂਰੀ ਸਕ੍ਰੀਨ"
 Windowed="ਵਿੰਡੋ"
+Percent="ਪ੍ਰਤੀਸ਼ਤ"
 
 AlreadyRunning.Title="OBS ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ"
 
@@ -85,10 +90,19 @@
 
 
 
+BandwidthTest.Region="ਜ੍ਗਾ"
+BandwidthTest.Region.US="ਅਮਰੀਕਾ"
+BandwidthTest.Region.EU="ਯੋਰਪ"
+BandwidthTest.Region.Asia="ਏਸ਼ੀਆ"
+BandwidthTest.Region.Other="ਹੋਰ"
 
+Basic.AutoConfig.ApplySettings="ਲਾਗੂ ਕਰੋ"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="ਮੌਜੂਦਾ ਵਰਤੋ (%1x%2)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="ਮੌਜੂਦਾ ਵਰਤੋ (%1)"
 Basic.AutoConfig.StreamPage.DisconnectAccount="ਇਹ ਖਾਤਾ ਡਿਸਕਨੈਕਟ ਕਰੋ"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="ਇਹ ਖਾਤਾ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"
 Basic.AutoConfig.StreamPage.Service.ShowAll="ਸਾਰੇ ਦਿਖਾਓ..."
+Basic.AutoConfig.TestPage="ਆਖਰੀ ਨਤੀਜੇ"
 
 Basic.Stats="ਅੰਕੜੇ"
 Basic.Stats.CPUUsage="CPU ਦੀ ਵਰਤੋਂ"
@@ -186,3 +200,6 @@
 
 
 
+
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/pl-PL.ini Changed

@@ -1,6 +1,5 @@
 
 Language="polski"
-Region="Polska"
 
 OK="Ok"
 Apply="Zastosuj"
@@ -38,6 +37,7 @@
 SourceWindow="Podgląd w oknie (źródło)"
 MultiviewProjector="MultiView (pełny ekran)"
 MultiviewWindowed="MultiView (w oknie)"
+ResizeProjectorWindowToContent="Dopasuj okno do zawartości"
 Clear="Wyczyść"
 Revert="Przywróć"
 Show="Pokaż"
@@ -47,8 +47,8 @@
 New="Nowy"
 Duplicate="Utwórz duplikat"
 Enable="Włącz"
-DisableOSXVSync="Wyłącz synchronizację pionową OSX"
-ResetOSXVSyncOnExit="Przywróć synchronizację pionową OSX po zamknięciu aplikacji"
+DisableOSXVSync="Wyłącz synchronizację pionową macOS"
+ResetOSXVSyncOnExit="Przywróć synchronizację pionową macOS po zamknięciu aplikacji"
 HighResourceUsage="Enkodowanie przeciążone! Zmień ustawienia wideo lub użyj szybszego presetu kodowania."
 Transition="Efekt przejścia"
 QuickTransitions="Szybkie efekty przejścia"
@@ -87,13 +87,21 @@
 Fullscreen="Pełny ekran"
 Windowed="W oknie"
 Percent="Procent"
+RefreshBrowser="Odśwież"
 AspectRatio="Współczynnik proporcji <b>%1:%2</b>"
 LockVolume="Zablokuj głośność"
+LogViewer="Podgląd logów"
+ShowOnStartup="Pokaż przy starcie"
+OpenFile="Otwórz plik"
+AddValue="Dodaj %1"
 
 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"
 
+ChromeOS.Title="Platforma nieobsługiwana"
+ChromeOS.Text="Najprawdopodobniej OBS uruchomiony jest jako kontener w systemie ChromeOS. Platforma ta nie jest oficjalnie obsługiwana."
+
 DockCloseWarning.Title="Zamykanie dokowalnego okna"
 DockCloseWarning.Text="Zostało zamknięte dokowalne okno/panel. Jeżeli chcesz ponownie je pokazać, wybierz Widok → Panele z głównego menu."
 
@@ -131,15 +139,13 @@
 BandwidthTest.Region.Asia="Azja"
 BandwidthTest.Region.Other="Inny"
 
-Basic.FirstStartup.RunWizard="Czy chcesz uruchomić kreatora konfiguracji automatycznej? Można również ręcznie skonfigurować ustawienia, klikając przycisk Ustawienia w oknie głównym."
-Basic.FirstStartup.RunWizard.NoClicked="Jeżeli zmienisz zdanie, można uruchomić kreatora konfiguracji automatycznej każdej chwili ponownie z menu Narzędzia."
-
 Basic.AutoConfig="Kreator konfiguracji automatycznej"
 Basic.AutoConfig.ApplySettings="Zastosuj ustawienia"
 Basic.AutoConfig.StartPage="Sposób użytkowania"
 Basic.AutoConfig.StartPage.SubTitle="Określ w jaki sposób chcesz używać aplikacji"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optymalizuj pod kątem przesyłania strumieniowego, nagrywanie lokalne jest mniej istotne"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optymalizuj pod nagrywanie lokalne, nie będę strumieniować"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Będę używać tylko wirtualnej kamery"
 Basic.AutoConfig.VideoPage="Ustawienia wideo"
 Basic.AutoConfig.VideoPage.SubTitle="Określ wybrane ustawienia wideo, których chcesz użyć"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Użyj bieżącej (%1x%2)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Enkoder nagrywania"
 Basic.AutoConfig.TestPage.Result.Header="Aplikacja ustaliła poniższe ustawienia jako najbardziej idealne dla Ciebie:"
 Basic.AutoConfig.TestPage.Result.Footer="Aby użyć tych ustawień, kliknij przycisk Zastosuj ustawienia. Aby ponownie skonfigurować kreatora i spróbować ponownie, kliknij przycisk Wstecz. Aby ręcznie skonfigurować ustawienia, kliknij przycisk Anuluj i otwórz Ustawienia."
+Basic.AutoConfig.Info="Kreator automatycznej konfiguracji określi najlepsze ustawienia w oparciu o specyfikację komputera i szybkość połączenia."
+Basic.AutoConfig.RunAnytime="Możesz to uruchomić w dowolnym momencie, przechodząc do menu Narzędzia."
 
 Basic.Stats="Statystyki"
 Basic.Stats.CPUUsage="Użycie procesora"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Brak klawisza skrótu!"
-Output.ReplayBuffer.NoHotkey.Msg="Klawisz skrótu do zapisu nagranej powtórki nie został ustawiony. Ustaw skrót dla opcji \"Zapisz powtórkę\", aby móc używać go do zapisywania tego typu nagrań."
 
 Output.BadPath.Title="Nieprawidłowa ścieżka pliku"
 Output.BadPath.Text="Ustawiona ścieżka pliku wynikowego jest nieprawidłowa. Proszę sprawdzić ustawienia."
 
 LogReturnDialog="Wysłanie pliku dziennika powiodło się"
+LogReturnDialog.Description="Twój plik dziennika został przesłany. Możesz teraz udostępnić adres URL w celu debugowania lub wsparcia technicznego."
+LogReturnDialog.Description.Crash="Twój raport o awarii został przesłany. Możesz teraz udostępnić adres URL do celów debugowania."
 LogReturnDialog.CopyURL="Skopiuj adres URL"
+LogReturnDialog.AnalyzeURL="Analizuj"
 LogReturnDialog.ErrorUploadingLog="Błąd podczas wysyłania pliku dziennika"
 
 Remux.SourceFile="Plik nagrania OBS"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Rozpocznij nagrywanie powtórek"
 Basic.Main.SaveReplay="Zapisz powtórkę"
 Basic.Main.StartStreaming="Rozpocznij stream"
+Basic.Main.StartVirtualCam="Rozpocznij Kamerę Wirtualną"
 Basic.Main.StopRecording="Zatrzymaj nagrywanie"
 Basic.Main.PauseRecording="Pauzuj nagrywanie"
 Basic.Main.UnpauseRecording="Wznów nagrywanie"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Zatrzymaj stream"
 Basic.Main.StoppingStreaming="Zatrzymywanie streamowania..."
 Basic.Main.ForceStopStreaming="Zatrzymaj stream (anuluj opóźnienie)"
+Basic.Main.ShowContextBar="Pokaż pasek narzędziowy źródła"
+Basic.Main.HideContextBar="Ukryj pasek narzędziowy źródła"
+Basic.Main.StopVirtualCam="Zatrzymaj Kamerę Wirtualną"
 Basic.Main.Group="Grupa %1"
 Basic.Main.GroupItems="Grupuj wybrane elementy"
 Basic.Main.Ungroup="Rozgrupuj"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Przywróć domyślny interfejs"
 Basic.MainMenu.View.Docks.LockUI="Zablokuj interfejs"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Panele przeglądarki..."
-Basic.MainMenu.View.Toolbars.Listboxes="Panele kontrolne &list elementów"
+Basic.MainMenu.View.ListboxToolbars="Przyciski pod listą scen / źródeł obrazu"
+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"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maksymalna ilość pamięci (w megabajtach)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Szacowane użycie pamięci: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nie można oszacować użycia pamięci. Należy ustawić limit maksymalnej pamięci."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Uwaga: Upewnij się, czy ustawiony został klawisz skrótu do zapisu powtórek w sekcji \"Skróty klawiszowe\")"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefiks nazwy pliku buforu replay"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufiks"
 Basic.Settings.Output.Simple.SavePath="Ścieżka pliku"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Odstęp między klatkami kluczowymi (klatki)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Pokaż wszystkie kodeki (nawet potencjalnie niezgodne)"
 
+Screenshot="Zrzut ekranu - ekran wyjściowy"
+Screenshot.SourceHotkey="Zrzut ekranu - wybrane źródło"
+Screenshot.StudioProgram="Zrzut ekranu (aplikacja)"
+Screenshot.Preview="Zrzut ekranu (podgląd)"
+Screenshot.Scene="Zrzut ekranu (scena)"
+Screenshot.Source="Zrzut ekranu (źródło)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Rok, cztery cyfry\n%YY		Rok, dwie ostatnie cyfry (00-99)\n%MM		Miesiąc jako liczba dziesiętna (01-12)\n%DD		Dzień, z zerem przed 1-9 (01-31)\n%hh		Godzina w formacie 24 godzinnym (00-23)\n%mm		Minuta (00-59)\n%ss		Sekunda (00-61)\n%%		% znak\n%a		Skrócona nazwa dnia tygodnia\n%A		Pełna nazwa dnia tygodnia\n%b		Skrócona nazwa dnia miesiąca\n%B		Pełna nazwa dnia miesiąca\n%d		Dzień, z zerem przed 1-9 (01-31)\n%H		Godzina w formacie 24 godzinnym (00-23)\n%I		Godzina w formacie 12 godzinnym (01-12)\n%m		Miesiąc jako liczba dziesiętna (01-12)\n%M		Minuta (00-59)\n%p		Określenie AM lub PM \n%S		Sekunda (00-61)\n%y		Rok, dwie ostatnie cyfry (00-99)\n%Y		Rok\n%z		Przesunięcie ISO 8601 względem strefy czasowej UTCj\n%Z		Nazwa lub skrót strefy czasowej\n%FPS		Ramek na sekundę\n%CRES		Rozdzielczość bazy aza(kanwy)\n%ORES		Rozdzielczość wyjściowa (skalowana)\n%VF		Format wideo"
@@ -750,10 +770,10 @@
 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 wielokanałowe wejście oraz odtwarzanie dźwięku surround. Facebook, 360 Live, Mixer RTMP, Smashcast to przykłady usług obsługujących dźwięk wielokanałowy. O ile Facebook Live i Youtube Live obsługują wejście dźwięku wielokanałowego, to w przypadku odtwarzania Facebook miksuje kanału do stereo a Youtube Live odtwarza tylko dwa kanały.\n\nFiltry dźwiękowe OBS są w pełni kompatybilne z dźwiękiem kanałowym, natomiast wsparcie pluginów VST nie jest gwarantowane."
+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.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="Urządzenia"
+Basic.Settings.Audio.Devices="Globalne urządzenia audio"
 Basic.Settings.Audio.DesktopDevice="Urządzenie audio"
 Basic.Settings.Audio.DesktopDevice2="Urządzenie audio 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/dodatkowe urządzenie audio"
@@ -917,3 +937,16 @@
 Restart="Restart"
 NeedsRestart="Należy ponownie uruchomić OBS Studio. Czy chcesz teraz zrestartować?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/pt-BR.ini Changed

@@ -1,13 +1,12 @@
 
 Language="Português"
-Region="Estados Unidos"
 
 OK="Ok"
 Apply="Aplicar"
 Cancel="Cancelar"
 Close="Fechar"
 Save="Salvar"
-Discard="Não Salvar"
+Discard="Descartar"
 Disable="Desabilitar"
 Yes="Sim"
 No="Não"
@@ -38,6 +37,7 @@
 SourceWindow="Projetor em janela (Fonte)"
 MultiviewProjector="Visualização múltipla (tela inteira)"
 MultiviewWindowed="Visualização múltipla (janela)"
+ResizeProjectorWindowToContent="Ajustar janela ao conteúdo"
 Clear="Limpar"
 Revert="Desfazer"
 Show="Exibir"
@@ -47,8 +47,8 @@
 New="Novo"
 Duplicate="Duplicar"
 Enable="Habilitar"
-DisableOSXVSync="Desabilitar V-Sync em OSX"
-ResetOSXVSyncOnExit="Redefinir V-Sync em OSX na saída"
+DisableOSXVSync="Desabilitar V-Sync em macOS"
+ResetOSXVSyncOnExit="Redefinir V-Sync em macOS na saída"
 HighResourceUsage="Codificação sobrecarregada! Considere abaixar 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"
@@ -62,7 +62,7 @@
 Minutes="Minutos"
 Seconds="Segundos"
 Deprecated="Obsoleto"
-ReplayBuffer="Buffer do Replay"
+ReplayBuffer="Buffer de Repetição"
 Import="Importar"
 Export="Exportar"
 Copy="Copiar"
@@ -87,13 +87,21 @@
 Fullscreen="Tela Cheia"
 Windowed="Em janela"
 Percent="Por cento"
+RefreshBrowser="Atualizar"
 AspectRatio="Proporção da tela <b>%1:%2</b>"
 LockVolume="Travar Volume"
+LogViewer="Visualizador de registro"
+ShowOnStartup="Exibir ao iniciar"
+OpenFile="Abrir arquivo"
+AddValue="Adicionar %1"
 
 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"
 
+ChromeOS.Title="Plataforma Não Suportada"
+ChromeOS.Text="O OBS parece estar sendo executado dentro de um contêiner ChromeOS. Esta plataforma não é suportada"
+
 DockCloseWarning.Title="Fechar janela ancorável"
 DockCloseWarning.Text="Você acabou de fechar uma janela ancorável. Se você gostaria de abri-la novamente, use o menu Mostrar → Docas."
 
@@ -117,6 +125,7 @@
 TwitchAuth.Feed="Feed de Atividade do Twitch"
 TwitchAuth.TwoFactorFail.Title="Não foi possível consultar a chave de transmissão"
 TwitchAuth.TwoFactorFail.Text="O OBS não foi capaz de se conectar à sua conta do Twitch. Por favor, certifique-se de que a autenticação de dois fatores está configurada em suas <a href='https://www.twitch.tv/settings/security'>Configurações de segurança do Twitch</a> pois isso é necessário para transmitir."
+RestreamAuth.Channels="Canais do Restream"
 
 Copy.Filters="Copiar Filtros"
 Paste.Filters="Colar Filtros"
@@ -130,17 +139,15 @@
 BandwidthTest.Region.Asia="Ásia"
 BandwidthTest.Region.Other="Outro"
 
-Basic.FirstStartup.RunWizard="Você gostaria de executar o assistente de configuração? Você também pode definir manualmente suas configurações clicando no botão \"Configurações\" na janela principal."
-Basic.FirstStartup.RunWizard.NoClicked="Se você mudar de ideia, você pode executar o assistente de configuração a qualquer momento no menu \"Ferramentas\"."
-
 Basic.AutoConfig="Assistente de configuração"
 Basic.AutoConfig.ApplySettings="Aplicar Configurações"
 Basic.AutoConfig.StartPage="Informações de Uso"
 Basic.AutoConfig.StartPage.SubTitle="Marque para que você deseja usar o programa"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Otimizar para transmissão, gravação é opcional"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Otimizar somente para gravação, eu não farei transmissão"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Apenas usarei a câmera virtual"
 Basic.AutoConfig.VideoPage="Configurações de Vídeo"
-Basic.AutoConfig.VideoPage.SubTitle="Marque as configurações desejadas que você gostaria de usar"
+Basic.AutoConfig.VideoPage.SubTitle="Especifique as configurações do vídeo que você gostaria de usar"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Usar Atual (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Monitor %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Usar Atual (%1)"
@@ -150,7 +157,7 @@
 Basic.AutoConfig.StreamPage="Informações da transmissão"
 Basic.AutoConfig.StreamPage.SubTitle="Por favor, digite suas informações para a transmissão"
 Basic.AutoConfig.StreamPage.ConnectAccount="Conectar Conta (recomendado)"
-Basic.AutoConfig.StreamPage.DisconnectAccount="Desconectar conta"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Desconectar Conta"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Desconectar conta?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Esta mudança será aplicada imediatamente. Tem certeza de que deseja desconectar sua conta?"
 Basic.AutoConfig.StreamPage.GetStreamKey="Obter chave da transmissão"
@@ -182,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificador da Gravação"
 Basic.AutoConfig.TestPage.Result.Header="O programa determinou que estas configurações estimadas são as mais ideais para você:"
 Basic.AutoConfig.TestPage.Result.Footer="Para usar essas configurações, clique em \"Aplicar Configurações\". Para reconfigurar o assistente e tentar novamente, clique em \"Voltar\". Para definir manualmente, clique em \"Cancelar\" e abra as \"Configurações\"."
+Basic.AutoConfig.Info="O assistente de configuração automática irá determinar as melhores configurações baseadas nas especificações do seu computador e na velocidade da internet."
+Basic.AutoConfig.RunAnytime="Isto pode ser executado a qualquer momento indo para o menu Ferramentas."
 
 Basic.Stats="Estatísticas"
 Basic.Stats.CPUUsage="Uso de CPU"
@@ -291,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Nenhuma atalho adicionado!"
-Output.ReplayBuffer.NoHotkey.Msg="Tecla de Atalho para salvar o Buffer do replay não definida. Por favor, configure uma tecla de atalho para salvar gravações de replays."
 
 Output.BadPath.Title="Caminho de Arquivo Inválido"
 Output.BadPath.Text="O caminho do arquivo de saída é inválido. Por Favor, certifique-se de que um caminho válido foi informado."
 
 LogReturnDialog="Carregamento do arquivo de registro efetuado com êxito"
+LogReturnDialog.Description="Seu arquivo de log foi enviado. Agora você pode compartilhar a URL para fins de depuração ou suporte."
+LogReturnDialog.Description.Crash="Seu relatório de falha foi enviado. Agora você pode compartilhar o URL para fins de depuração."
 LogReturnDialog.CopyURL="Copiar URL"
+LogReturnDialog.AnalyzeURL="Analisar"
 LogReturnDialog.ErrorUploadingLog="Erro no carregamento do arquivo de registro"
 
 Remux.SourceFile="Gravação do OBS"
@@ -332,7 +342,7 @@
 Basic.Scene="Cena"
 Basic.DisplayCapture="Captura de tela"
 
-Basic.Main.PreviewConextMenu.Enable="Ativar pré-vizualização"
+Basic.Main.PreviewConextMenu.Enable="Ativar pré-visualização"
 
 Basic.Main.Preview.Disable="Desativar pré-visualização"
 
@@ -462,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Iniciar Buffer do Replay"
 Basic.Main.SaveReplay="Salvar Replay"
 Basic.Main.StartStreaming="Iniciar transmissão"
+Basic.Main.StartVirtualCam="Iniciar Câmera Virtual"
 Basic.Main.StopRecording="Parar Gravação"
 Basic.Main.PauseRecording="Pausar Gravação"
 Basic.Main.UnpauseRecording="Continuar Gravação"
@@ -471,6 +482,9 @@
 Basic.Main.StopStreaming="Interromper transmissão"
 Basic.Main.StoppingStreaming="Interrompendo a transmissão..."
 Basic.Main.ForceStopStreaming="Pare de transmitir (descartar atraso)"
+Basic.Main.ShowContextBar="Mostrar barra de ferramentas da fonte"
+Basic.Main.HideContextBar="Ocultar barra de ferramentas da fonte"
+Basic.Main.StopVirtualCam="Parar Câmera Virtual"
 Basic.Main.Group="Grupo %1"
 Basic.Main.GroupItems="Agrupar Itens Selecionados"
 Basic.Main.Ungroup="Desagrupar"
@@ -526,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Redefinir IU"
 Basic.MainMenu.View.Docks.LockUI="Travar IU"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Docas para Navegador Personalizado..."
-Basic.MainMenu.View.Toolbars.Listboxes="Caixa de &Listagem"
+Basic.MainMenu.View.ListboxToolbars="Botões da Lista de Cena/Origem"
+Basic.MainMenu.View.ContextBar="Barra de ferramenta das fontes"
 Basic.MainMenu.View.SceneTransitions="Transições de &Cena"
 Basic.MainMenu.View.SourceIcons="Ícones em Fontes (&I)"
 Basic.MainMenu.View.StatusBar="Barra de &Status"
@@ -639,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memória Máxima (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Uso de memória estimado: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Impossível estimar o uso de memória. Por favor, defina o limite máximo de memória."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Não se esqueça de configurar uma Tecla de Atalho para o Buffer de Replay na seção Teclas de Atalhos)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefixo do Buffer de Repetição"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufixo"
 Basic.Settings.Output.Simple.SavePath="Caminho de gravação"
@@ -711,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervalo de Keyframes (frames)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Mostrar todos os codecs (incluir potencialmente incompatíveis)"
 
+Screenshot="Caminho da captura de tela"
+Screenshot.SourceHotkey="Capturar tela da fonte selecionada"
+Screenshot.StudioProgram="Capturar tela (Programa)"
+Screenshot.Preview="Capturar tela (Pré-visualização)"
+Screenshot.Scene="Capturar tela (Cena)"
+Screenshot.Source="Capturar tela (Fonte)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY		Ano, quatro dígitos\n%YY		Ano, últimos dois dígitos (00-99)\n%MM		Mês como um número decimal (01-12)\n%DD		Dia do mês, começando com 0 (01-31)\n%hh		Hora, em formato de 24h (00-23)\n%mm		Minuto (00-59)\n%ss		Segundo (00-61)\n%%		A % sign\n%a		Dia da Semana abreviado\n%A		Nome da Semana completo\n%b		Nome do Mês abreviado\n%B		Nome do Mês completo\n%d		Dia do Mês, começando com 0 (01-31)\n%H		Hora, no formato de 24h (00-23)\n%I		Hora no formato de 12h (01-12)\n%m		Mês como um número decimal (01-12)\n%M		Minuto (00-59)\n%p		Designação AM ou PM\n%S		Segundo (00-61)\n%y		Ano, últimos dois dígitos (00-99)\n%Y		Ano\n%z		diferença do UTC em fuso horários ISO 8601 \n%Z		Nome do Fuso Horário ou abreviação\n%FPS		Quadros por segundo\n%CRES		Resolução de base (tela)\n%ORES		Resolução de saída (escala)\n%VF		Formato de Vídeo"
@@ -749,10 +770,10 @@
 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á habilitado."
-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, Mixer RTMP, Smashcast são exemplos 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="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.Title="Ativar o som surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Você tem certeza de que deseja habilitar o som surround?"
-Basic.Settings.Audio.Devices="Dispositivos"
+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.AuxDevice="Dispositivo de Áudio Mic/Auxiliar"
@@ -916,3 +937,16 @@
 Restart="Reiniciar"
 NeedsRestart="OBS Studio precisa ser reiniciado. Deseja reiniciá-lo agora?"
 
+ContextBar.NoSelectedSource="Nenhuma fonte selecionada"
+ContextBar.ResetTransform="Redefinir 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="Ferramenta de Procura de Mídia"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/pt-PT.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Português"
-Region="Portugal"
 
 OK="OK"
 Apply="Aplicar"
@@ -38,6 +37,7 @@
 SourceWindow="Projetor em janela (Fonte)"
 MultiviewProjector="Multi-visualização (Ecrã inteiro)"
 MultiviewWindowed="Multi-visualização (Modo de Janela)"
+ResizeProjectorWindowToContent="Ajustar janela ao conteúdo"
 Clear="Limpar"
 Revert="Reverter"
 Show="Mostrar"
@@ -47,8 +47,8 @@
 New="Novo"
 Duplicate="Duplicar"
 Enable="Ativar"
-DisableOSXVSync="Desativar OSX V-Sync"
-ResetOSXVSyncOnExit="Redefinir OSX V-Sync ao Sair"
+DisableOSXVSync="Desativar macOS V-Sync"
+ResetOSXVSyncOnExit="Redefinir macOS V-Sync ao Sair"
 HighResourceUsage="Codificação sobrecarregado! Considere diminuir a configurações de vídeo ou usar uma predefinição mais rápido de codificação."
 Transition="Transição"
 QuickTransitions="Transições Rápidas"
@@ -86,12 +86,20 @@
 Calculating="A calcular..."
 Fullscreen="Ecrã Completo"
 Windowed="Em janela"
+Percent="Por cento"
+RefreshBrowser="Atualizar"
 AspectRatio="Proporção <b>%1:%2</b>"
+LockVolume="Bloquear Volume"
+ShowOnStartup="Mostrar no arranque"
+OpenFile="Abrir ficheiro"
 
 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="Executar de qualquer modo"
 
+ChromeOS.Title="Plataforma Incompatível"
+ChromeOS.Text="O OBS parece estar a ser executado dentro de um recipiente ChromeOS. Esta plataforma é incompatível"
+
 DockCloseWarning.Title="Janela Fechar dockável"
 DockCloseWarning.Text="Acabaste de fechar uma janela acoplável. Se você quiser mostrá-la novamente, use o menu Exibir → Docks na barra de menus."
 
@@ -115,6 +123,7 @@
 TwitchAuth.Feed="Alimentação de atividade de Twitch"
 TwitchAuth.TwoFactorFail.Title="Não foi possível fazer query da chave da transmissão"
 TwitchAuth.TwoFactorFail.Text="O OBS não conseguiu conectar-se à sua conta Twitch. Por favor certifique-se de que a autenticação por dois passos está configurada nas <a href='https://www.twitch.tv/settings/security'>definições de segurança da Twitch</a>, pois é necessário para poder transmitir."
+RestreamAuth.Channels="Canais de Restream"
 
 Copy.Filters="Copiar filtros"
 Paste.Filters="Colar Filtros"
@@ -128,17 +137,15 @@
 BandwidthTest.Region.Asia="Ásia"
 BandwidthTest.Region.Other="Outra"
 
-Basic.FirstStartup.RunWizard="Gostaria de executar o assistente de configuração automática? Pode também definir as suas configurações na janela principal."
-Basic.FirstStartup.RunWizard.NoClicked="Se muder de ideias pode correr o assistente de configuração automática a qualquer momento no menu Ferramentas."
-
 Basic.AutoConfig="Assistente de Configuração Automática"
 Basic.AutoConfig.ApplySettings="Aplicar Configurações"
 Basic.AutoConfig.StartPage="Informação de Utilização"
 Basic.AutoConfig.StartPage.SubTitle="Especifique qual vai ser a utilização do programa"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Otimizar para transmissão, gravação é secundária"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Otimizar para gravação, a transmissão é secundária"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Só irei utilizar a câmara virtual"
 Basic.AutoConfig.VideoPage="Definições de Video"
-Basic.AutoConfig.VideoPage.SubTitle="Especifique as definições de video que pretende"
+Basic.AutoConfig.VideoPage.SubTitle="Especifique as definições de vídeo que pretende usar"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Usar atual (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Monitor %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Utilizar atual (%1)"
@@ -180,6 +187,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificador de Gravação"
 Basic.AutoConfig.TestPage.Result.Header="O programa determinou que estas definições são as mais ideais para si:"
 Basic.AutoConfig.TestPage.Result.Footer="Para utilizar estas definições, carregue em Aplicar Definições. Para reconfigurar o assistente e tentar novamente, carregue em Voltar. Para configurar manualmente as definições, carregue em Cancelar e abra as Definições."
+Basic.AutoConfig.Info="O assistente de configuração automática irá determinar as melhores configurações baseadas nas especificações do seu computador e na velocidade da sua internet."
+Basic.AutoConfig.RunAnytime="Isto pode ser executado a qualquer momento através para o menu Ferramentas."
 
 Basic.Stats="Estatísticas"
 Basic.Stats.CPUUsage="Utilização de CPU"
@@ -269,6 +278,8 @@
 Output.StartReplayFailed="Falha ao iniciar o buffer de repetição"
 Output.StartFailedGeneric="Falha ao iniciar o output. Verifica o log para mais detalhes.\n\nNota: Se estás a usar codificadores NVENC ou AMD, certifica-te de que os drivers da placa gráfica estão atualizados."
 
+Output.ReplayBuffer.PauseWarning.Title="Não é possível salvar replays quando pausado"
+Output.ReplayBuffer.PauseWarning.Text="Aviso: Replays não podem ser salvos enquanto a gravação estiver pausada."
 
 Output.ConnectFail.Title="Falha ao ligar"
 Output.ConnectFail.BadPath="Caminho ou endereço de ligação inválido. Por favor, verifique as suas definições para confirmar que são válidas."
@@ -287,14 +298,15 @@
 Output.RecordError.Title="Erro de gravação"
 Output.RecordError.Msg="Ocorreu um erro desconhecido durante a gravação."
 Output.RecordError.EncodeErrorMsg="Ocorreu um erro no encoder durante a gravação."
-Output.ReplayBuffer.NoHotkey.Title="Nenhuma atalho adicionado!"
-Output.ReplayBuffer.NoHotkey.Msg="Nenhum atalho gravado para o buffer de repetição. Por favor defina o atalho \"Gravar\" para gravar as repetições da gravação."
 
 Output.BadPath.Title="Caminho de Ficheiro de Gravação Inválido"
 Output.BadPath.Text="O caminho de ficheiro de gravação definido é inválido. Por favor verifique as definições e confirme que um caminho válido foi introduzido."
 
 LogReturnDialog="Envio de Log Sucedido"
+LogReturnDialog.Description="O seu arquivo de log foi carregado. Agora pode partilhar a URL para fins de depuração ou suporte."
+LogReturnDialog.Description.Crash="O seu relatório de falha foi carregado. Agora pode partilhar a URL para fins de depuração."
 LogReturnDialog.CopyURL="Copiar endereço"
+LogReturnDialog.AnalyzeURL="Analisar"
 LogReturnDialog.ErrorUploadingLog="Erro no envio de ficheiro Log"
 
 Remux.SourceFile="Gravação do OBS"
@@ -456,15 +468,20 @@
 Basic.Main.Connecting="A ligar..."
 Basic.Main.StartRecording="Começar Gravação"
 Basic.Main.StartReplayBuffer="Iniciar Replay Buffer"
+Basic.Main.SaveReplay="Salvar Repetição"
 Basic.Main.StartStreaming="Iniciar transmissão"
+Basic.Main.StartVirtualCam="Iniciar Câmara Virtual"
 Basic.Main.StopRecording="Parar Gravação"
 Basic.Main.PauseRecording="Pausar Gravação"
+Basic.Main.UnpauseRecording="Retomar Gravação"
 Basic.Main.StoppingRecording="A parar gravação..."
 Basic.Main.StopReplayBuffer="Parar Replay Buffer"
 Basic.Main.StoppingReplayBuffer="A Parar Replay Buffer..."
 Basic.Main.StopStreaming="Parar transmissão"
 Basic.Main.StoppingStreaming="A parar transmissão..."
 Basic.Main.ForceStopStreaming="Parar transmissão (ignorar atraso)"
+Basic.Main.HideContextBar="Ocultar Barra de Ferramentas"
+Basic.Main.StopVirtualCam="Parar Câmara Virtual"
 Basic.Main.Group="Grupo %1"
 Basic.Main.GroupItems="Agrupar Itens Selecionados"
 Basic.Main.Ungroup="Desagrupar"
@@ -520,7 +537,6 @@
 Basic.MainMenu.View.Docks.ResetUI="Reiniciar Interface"
 Basic.MainMenu.View.Docks.LockUI="Bloquear Interface"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Docas de Browser Personalizadas..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Lista de Caixas"
 Basic.MainMenu.View.SceneTransitions="Transições de &cenas"
 Basic.MainMenu.View.StatusBar="Barra de e&stado"
 Basic.MainMenu.View.Fullscreen.Interface="Interface de ecrã inteiro"
@@ -583,6 +599,8 @@
 Basic.Settings.General.OverflowHidden="Esconder excesso"
 Basic.Settings.General.OverflowAlwaysVisible="Tornar excesso visível"
 Basic.Settings.General.OverflowSelectionHidden="Mostrar excesso mesmo quando a fonte está invisível"
+Basic.Settings.General.Importers="Importadores"
+Basic.Settings.General.AutomaticCollectionSearch="Procurar locais conhecidos por coleções de cena ao importar"
 Basic.Settings.General.SwitchOnDoubleClick="Transição para cena ao fazer duplo clique"
 Basic.Settings.General.StudioPortraitLayout="Habilitar layout horizontal/vertical"
 Basic.Settings.General.TogglePreviewProgramLabels="Mostrar etiquetas de pré-visualização/programas"
@@ -603,6 +621,7 @@
 Basic.Settings.Stream.Custom.Username="Nome de usuário"
 Basic.Settings.Stream.Custom.Password="Senha"
 Basic.Settings.Stream.BandwidthTestMode="Habilitar Modo de Teste de Largura de Banda"
+Basic.Settings.Stream.TTVAddon="Complementos para Chat da Twitch"
 Basic.Settings.Stream.TTVAddon.None="Nenhum"
 Basic.Settings.Stream.TTVAddon.Both="BetterTTV e FrankerFaceZ"
 Basic.Settings.Stream.MissingSettingAlert="Configuração do Stream em falta"
@@ -625,10 +644,10 @@
 Basic.Settings.Output.Mode.Adv="Avançado"
 Basic.Settings.Output.Mode.FFmpeg="Saída FFmpeg"
 Basic.Settings.Output.UseReplayBuffer="Ativar Replay Buffer"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Tempo máximo de Replay"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memória Máxima (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Utilização estimada de memória: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Não é possível estimar a utilização de memória. Defina o limite máximo de memória."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Certifica-te de definires uma tecla de atalho para o replay buffer na secção de teclas de atalho)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Buffer de repetição de nome prefixo"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufixo"
 Basic.Settings.Output.Simple.SavePath="Caminho da gravação"
@@ -701,6 +720,8 @@
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Mostrar todos os codecs (mesmo que potencialmente incompatíveis)"
 
 
+FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
 
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de Vídeo"
@@ -736,10 +757,12 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pico Pré-definido"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Pico Verdadeiro (Maior Uso da CPU)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="AVISO: O som surround está ativo."
-Basic.Settings.Audio.MultichannelWarning="Se transmitir, verifique se o seu serviço de transmissão suporta tanto ingestão de áudio surround como playback de áudio surround. Facebook 360 Live, Mixer RTMP, Smashcast são exemplos onde o áudio surround é totalmente suportado. Embora o Facebook Live e o YouTube Live aceitem os dois ingestão de áudio surround, o Facebook Live transforma-o em stereo, e o YouTube Live só toca dois canais.\n\nOs filtros de áudio do OBS são compatíveis com áudio surround, embora não esteja garantido o suporte para plugins VST."
+Basic.Settings.Audio.MultichannelWarning="Se transmitir, verifique se o seu serviço de transmissão suporta tanto a inserção como a reprodução de áudio surround. O Facebook 360 Live, Mixer RTMP e o Smashcast são exemplos de plataformas onde esse tipo de audio é totalmente suportado. Apesar do Facebook Live e o YouTube Live aceitarem a inserção de áudio surround, o Facebook Live transforma-o em stereo e o YouTube Live só toca dois canais.\n\nOs Filtros de áudio do OBS são compatíveis com áudio surround, embora não esteja garantido o suporte para plugins VST."
 Basic.Settings.Audio.MultichannelWarning.Title="Ativar audio surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Tem a certeza que quer ativar audio surround?"
-Basic.Settings.Audio.Devices="Dispositivos"
+Basic.Settings.Audio.Devices="Dispositivos de Áudio Globais"
+Basic.Settings.Audio.DesktopDevice="Desktop Audio"
+Basic.Settings.Audio.DesktopDevice2="Desktop Audio 2"
 Basic.Settings.Audio.AuxDevice="Áudio Mic./Auxiliar"
 Basic.Settings.Audio.AuxDevice2="Áudio Mic./Auxiliar 2"
 Basic.Settings.Audio.AuxDevice3="Áudio Mic./Auxiliar 3"
@@ -775,13 +798,17 @@
 Basic.Settings.Advanced.Network="Rede"
 Basic.Settings.Advanced.Network.BindToIP="Ligar pelo IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Ativar otimizações de rede"
+Basic.Settings.Advanced.Network.EnableLowLatencyMode="Ativar o espaçamento TCP"
+Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Tentativas de tornar a saída RTMP mais amigável para outras aplicações sensíveis de latência na rede, regulando a taxa de transmissão.\nIsso pode aumentar o risco de quadros soltos em conexões instáveis."
 Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Comportamento do Foco das Hotkeys"
 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Nunca desativar hotkeys"
 Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Desativar teclas de atalho quando a janela principal está em foco"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="Desativar teclas de atalho quando a janela principal não estiver em foco"
 Basic.Settings.Advanced.AutoRemux="Fazer automaticamente remux para mp4"
 Basic.Settings.Advanced.AutoRemux.MP4="(gravar como mkv)"
 
 Basic.AdvAudio="Propriedades avançadas de áudio"
+Basic.AdvAudio.ActiveOnly="Apenas Fontes Ativas"
 Basic.AdvAudio.Name="Nome"
 Basic.AdvAudio.Volume="Volume"
 Basic.AdvAudio.Mono="Mono"
@@ -851,6 +878,7 @@
 
 OutputWarnings.NoTracksSelected="Tem de selecionar pelo menos uma faixa"
 OutputWarnings.MP4Recording="Aviso: Gravações salvas em MP4/MOV serão irrecuperáveis se o arquivo não puder ser finalizado (por exemplo, como resultado de BSODs, perdas de energia, etc.). Se você quiser gravar várias pistas de áudio, considere usar MKV e remuxar a gravação para MP4/MOV depois de terminada (Arquivo → Remux Recordings)"
+OutputWarnings.CannotPause="Aviso: As gravações não podem ser paradas se o codificador estiver definido como \"(Usar codificador de transmissão)\""
 
 FinalScene.Title="Apagar Cena"
 FinalScene.Text="É preciso que exista pelo menos uma cena."
@@ -873,6 +901,7 @@
 About.License="Licença"
 About.Contribute="Apoiar o Projeto OBS"
 
+AddUrl.Title="Adicionar Fonte via URL"
 AddUrl.Text="Arrastou um URL para o OBS. O link será adicionado automaticamente como uma fonte. Continuar?"
 AddUrl.Text.Url="URL: %1"
 
@@ -882,6 +911,18 @@
 
 PreviewTransition="Pré-visualizar Transição"
 
+Importer="Importador de Coleção de Cenas"
+Importer.SelectCollection="Selecione uma coleção de cenas"
+Importer.Collection="Coleção de Cenas"
+Importer.HelpText="Adicione ficheiros nesta janela para importar coleções do OBS ou de outros programas suportados."
+Importer.Path="Caminho da coleção"
+Importer.Program="Aplicação Detetada"
+Importer.AutomaticCollectionPrompt="Pesquisar Automaticamente por Coleções de Cenas"
+Importer.AutomaticCollectionText="O OBS pode encontrar automaticamente coleções de cenas importáveis de programas de terceiros suportados. Gostaria que o OBS encontrasse automaticamente coleções?\n\nPode alterar isso mais tarde em Configurações > Geral > Importadores."
+
+
+Restart="Reiniciar"
+NeedsRestart="OBS Studio precisa ser reiniciado. Deseja reiniciar agora?"

obs-studio-25.0.8.tar.xz/UI/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ro-RO.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Română"
-Region="România"
 
 OK="Ok"
 Apply="Aplică"
@@ -38,6 +37,7 @@
 SourceWindow="Proiector în fereastră (Sursă)"
 MultiviewProjector="Vizualizare multiplă (Ecran complet)"
 MultiviewWindowed="Vizualizare multiplă (În fereastră)"
+ResizeProjectorWindowToContent="Potrivește fereastra pe conținut"
 Clear="Șterge"
 Revert="Inversează"
 Show="Afișează"
@@ -47,11 +47,12 @@
 New="Nou"
 Duplicate="Duplică"
 Enable="Activează"
-DisableOSXVSync="Dezactivează V-Sync în OSX"
-ResetOSXVSyncOnExit="Resetează V-Sync în OSX la ieșire"
+DisableOSXVSync="Dezactivează V-Sync în macOS"
+ResetOSXVSyncOnExit="Resetează V-Sync în macOS la ieșire"
 HighResourceUsage="Codificare supraîncărcată! Ia în considerare reducerea setărilor video sau folosirea unei presetări de codare mai rapidă."
 Transition="Tranziție"
 QuickTransitions="Tranziții rapide"
+FadeToBlack="Estompare la negru"
 Left="Stânga"
 Right="Dreapta"
 Top="Sus"
@@ -61,7 +62,7 @@
 Minutes="Minute"
 Seconds="Secunde"
 Deprecated="Perimat"
-ReplayBuffer="Reluare Buffer"
+ReplayBuffer="Buffer de reluări"
 Import="Importă"
 Export="Exportă"
 Copy="Copiază"
@@ -83,12 +84,23 @@
 DoNotShowAgain="Nu afișa din nou"
 Default="(Implicit)"
 Calculating="Se calculează..."
+Fullscreen="Ecran complet"
+Windowed="Ferestră"
+Percent="Procentaj"
+RefreshBrowser="Reîmprospătează"
 AspectRatio="Raport de aspect <b>%1:%2</b>"
+LockVolume="Blochează volumul"
+LogViewer="Vizualizator de jurnale"
+ShowOnStartup="Afișează la pornire"
+OpenFile="Deschide fișierul"
 
 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"
 
+ChromeOS.Title="Platformă nesuportată"
+ChromeOS.Text="OBS pare să ruleze într-un container ChromeOS. Această platformă nu este suportată"
+
 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."
 
@@ -99,17 +111,20 @@
 Auth.Authing.Title="Se autentifică..."
 Auth.Authing.Text="Se autentifică cu %1, te rugăm să aștepți..."
 Auth.AuthFailure.Title="Eșec la autentificare"
+Auth.AuthFailure.Text="Autentificarea cu %1 a eșuat:\n\n%2: %3"
 Auth.InvalidScope.Title="Autentificare necesară"
+Auth.InvalidScope.Text="Cerințele de autentificare pentru %1 s-au schimbat. Unele funcții pot să nu fie disponibile."
 Auth.LoadingChannel.Title="Se încarcă informațiile canalului..."
 Auth.LoadingChannel.Text="Se încarcă informațiile canalului pentru %1, te rugăm să aștepți..."
-Auth.ChannelFailure.Title="Eșec la încărcarea canalului"
-Auth.ChannelFailure.Text="Eșec la încărcarea informațiilor canalului pentru %1\n\n%2: %3"
+Auth.ChannelFailure.Title="Încărcarea canalului a eșuat"
+Auth.ChannelFailure.Text="Încărcarea informațiilor canalului pentru %1 a eșuat\n\n%2: %3"
 Auth.Chat="Chat"
 Auth.StreamInfo="Informații privind transmisiunea"
 TwitchAuth.Stats="Statistici Twitch"
 TwitchAuth.Feed="Fluxul activității Twitch"
 TwitchAuth.TwoFactorFail.Title="Nu se poate interoga cheia de transmisiune"
 TwitchAuth.TwoFactorFail.Text="OBS nu a putut să se conecteze la contul tău Twitch. Te rugăm să te asiguri că autentificarea cu doi factori este configurată în <a href='https://www.twitch.tv/settings/security'>setările de securitate din Twitch</a>, deoarece acest lucru este necesar pentru a transmite."
+RestreamAuth.Channels="Restream canalele"
 
 Copy.Filters="Copiază filtrele"
 Paste.Filters="Lipește filtrele"
@@ -123,23 +138,21 @@
 BandwidthTest.Region.Asia="Asia"
 BandwidthTest.Region.Other="Alta"
 
-Basic.FirstStartup.RunWizard="Vrei să rulezi asistentul de configurare automată? Poți, de asemenea, să configurezi setările manual dând clic pe butonul Setări din fereastra principală."
-Basic.FirstStartup.RunWizard.NoClicked="Dacă te răzgândești, poți rula asistentul de configurare automată oricând din meniul Unelte."
-
-Basic.AutoConfig="Asistentul de configurare automată"
+Basic.AutoConfig="Asistent de configurare automată"
 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.PrioritizeVirtualCam="Voi folosi doar camera virtuală"
 Basic.AutoConfig.VideoPage="Setări video"
-Basic.AutoConfig.VideoPage.SubTitle="Specifică setările video dorite pe care dorești să le folosești"
+Basic.AutoConfig.VideoPage.SubTitle="Specifică setările video pe care dorești să le folosești"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Folosește-o pe cea actuală (%1x%2)"
-Basic.AutoConfig.VideoPage.BaseResolution.Display="Ecranul %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Display-ul %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Folosește valoarea actuală (%1)"
 Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Fie 60 sau 30, însă prefer 60 când este posibil"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Fie 60 sau 30, însă prefer rezoluție înaltă"
-Basic.AutoConfig.VideoPage.CanvasExplanation="Notă: Rezoluția (de bază) a planșei nu este neapărat aceeași cu rezoluția cu care vei transmite sau înregistra. Rezoluția efectivă de transmisiune/înregistrare poate fi scalată în jos de la rezoluția planșei pentru a reduce necesarul de resurse sau de rată de biți."
+Basic.AutoConfig.VideoPage.CanvasExplanation="Notă: Rezoluția (de bază) a planșei nu este neapărat aceeași cu rezoluția cu care vei transmite sau înregistra. Rezoluția efectivă de transmisiune/înregistrare poate fi subscalată de la rezoluția planșei pentru a reduce utilizarea de resurse sau cerințele privind rata de biți."
 Basic.AutoConfig.StreamPage="Informații privind transmisiunea"
 Basic.AutoConfig.StreamPage.SubTitle="Te rugăm să introduci informațiile pentru transmisiune"
 Basic.AutoConfig.StreamPage.ConnectAccount="Conectează un cont (recomandat)"
@@ -160,28 +173,30 @@
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Avertisment privind transmisiunea"
 Basic.AutoConfig.StreamPage.StreamWarning.Text="Testarea lățimii de bandă este pe cale să transmită date video aleatorii fără audio către canalul tău. Dacă ai posibilitatea, este recomandat să oprești temporar salvarea videoclipurilor transmisiunilor și să setezi transmisiunea pe privat până la încheierea testării. Continui?"
 Basic.AutoConfig.TestPage="Rezultate finale"
-Basic.AutoConfig.TestPage.SubTitle.Testing="Programul rulează acum o serie de teste pentru identificarea setărilor ideale"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Programul execută acum o serie de teste pentru estimarea celor mai ideale setări"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Testare completă"
 Basic.AutoConfig.TestPage.TestingBandwidth="Se efectuează testarea lățimii de bandă, acest lucru poate dura câteva minute..."
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Se conectează la: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Nu s-a putut conecta la niciun server. Te rugăm să verifici conexiunea la Internet și să încerci din nou."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Se testează lățimea de bandă pentru: %1"
-Basic.AutoConfig.TestPage.TestingStreamEncoder="Testare encoder transmisie, poate dura câteva minute..."
-Basic.AutoConfig.TestPage.TestingRecordingEncoder="Testare encoder înregistrare, poate dura câteva minute..."
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Se testează codificatorul de transmisiune, poate dura câteva minute..."
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="Se testează codificatorul de înregistrare, poate dura câteva minute..."
 Basic.AutoConfig.TestPage.TestingRes="Testare rezoluții, aceasta ar putea dura câteva minute..."
-Basic.AutoConfig.TestPage.TestingRes.Fail="Nu s-a putut porni encodarea"
-Basic.AutoConfig.TestPage.TestingRes.Resolution="Testare %1x%2 %3 FPS..."
-Basic.AutoConfig.TestPage.Result.StreamingEncoder="Codificator pentru transmisiune"
-Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificator pentru înregistrare"
-Basic.AutoConfig.TestPage.Result.Header="Programul a determinat că următoarele setări sunt cele mai potrivite:"
+Basic.AutoConfig.TestPage.TestingRes.Fail="Pornirea codificatorului a eșuat"
+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"
+Basic.AutoConfig.TestPage.Result.Header="Programul a determinat că aceste setări sunt cele mai ideale:"
 Basic.AutoConfig.TestPage.Result.Footer="Pentru a folosi aceste setări, dă clic pe Aplică setările. Pentru a reconfigura și a încerca din nou, dă clic pe Înapoi. Pentru a configura manual setările, apasă Anulează și deschide Setările."
+Basic.AutoConfig.Info="Asistentul de configurare automată va determina cele mai bune setări în funcție de specificațiile calculatorului și viteza la internet."
+Basic.AutoConfig.RunAnytime="Acesta poate fi rulat oricând mergând la meniul Unelte."
 
 Basic.Stats="Statistici"
 Basic.Stats.CPUUsage="Utilizare CPU"
 Basic.Stats.HDDSpaceAvailable="Spațiu disponibil pe disc"
 Basic.Stats.MemoryUsage="Utilizarea memoriei"
 Basic.Stats.AverageTimeToRender="Timp mediu de randare a unui cadru"
-Basic.Stats.SkippedFrames="Cadre sărite din pricina întârzierilor de codificare"
+Basic.Stats.SkippedFrames="Cadre sărite din pricina întârzierii de codificare"
 Basic.Stats.MissedFrames="Cadre sărite din pricina întârzierii de redare"
 Basic.Stats.Output.Stream="Transmisiune"
 Basic.Stats.Output.Recording="Înregistrare"
@@ -189,10 +204,13 @@
 Basic.Stats.Status.Recording="Se înregistrează"
 Basic.Stats.Status.Live="LIVE"
 Basic.Stats.Status.Reconnecting="Se reconectează"
-Basic.Stats.Status.Inactive="Inactiv"
+Basic.Stats.Status.Inactive="Inactivă"
+Basic.Stats.Status.Active="Activă"
 Basic.Stats.DroppedFrames="Cadre pierdute (Rețea)"
 Basic.Stats.MegabytesSent="Date transmise în total"
 Basic.Stats.Bitrate="Rată de biți"
+Basic.Stats.DiskFullIn="Disc plin în (aprox.)"
+Basic.Stats.ResetStats="Resetează statisticile"
 
 ResetUIWarning.Title="Sigur vrei să resetezi UI-ul?"
 ResetUIWarning.Text="Resetarea UI-ului va ascunde andocările suplimentare. Va trebui să reafișezi aceste andocări din meniul Vizualizare dacă vrei să fie vizibile.\n\nSigur vrei să resetezi UI-ul?"
@@ -202,11 +220,15 @@
 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.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="Comută previzualizarea/scenele de ieșire după tranziționare"
+QuickTransitions.SwapScenes="Comută previzualizarea/scenele de output după tranziție"
 QuickTransitions.SwapScenesTT="Schimba previzualizarea si scenele de output dupa tranzitionare (în cazul în care încă există outputul scenei originale). \nAceasta nu va anula nicio modificăre care au fost făcute la outputul scenei originale."
 QuickTransitions.DuplicateScene="Duplică scena"
 QuickTransitions.DuplicateSceneTT="Atunci când editezi aceeași scenă, permite editarea transformării/vizibilității surselor fără modificarea outputului.\nPentru a edita proprietățile surselor fără a modifica outputul, activează 'Duplică scenele'.\nModificarea acestei valori va reseta outputul scenei actuale (în cazul în care încă există)."
@@ -254,11 +276,15 @@
 
 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"
+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ă."
 
 Output.ConnectFail.Title="Conectarea a eșuat"
 Output.ConnectFail.BadPath="URL-ul conexiunii sau calea este nevalidă. Te rugăm să verifici setările pentru a confirma că acestea sunt valide."
-Output.ConnectFail.ConnectFailed="Nu se poate conecta la server"
+Output.ConnectFail.ConnectFailed="Conectarea la server a eșuat"
 Output.ConnectFail.InvalidStream="Nu a putut fi accesat canalul sau cheia de transmisiune specificată, te rugăm să verifici cheia de transmisiune. Dacă aceasta este corectă, poate fi o problemă cu conectarea la server."
 Output.ConnectFail.Error="Eroare neașteptată la încercarea de a conecta la server. Mai multe informaţii în fişierul jurnal."
 Output.ConnectFail.Disconnected="Deconectat de la server."
@@ -266,20 +292,22 @@
 Output.StreamEncodeError.Title="Eroare privind codificarea"
 Output.StreamEncodeError.Msg="A apărut o eroare de codificare în timpul transmisiunii."
 
-Output.RecordFail.Title="Eșec la pornirea înregistrării"
-Output.RecordFail.Unsupported="Formatul de ieşire 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.RecordFail.Title="Pornirea înregistrării a eșuat"
+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="S-a produs o eroare nespecificată în timpul înregistrării."
 Output.RecordError.EncodeErrorMsg="A apărut o eroare de codificare în timpul înregistrării."
-Output.ReplayBuffer.NoHotkey.Title="Nicio tastă rapidă setată!"
 
 Output.BadPath.Title="Calea fișierului greșită"
-Output.BadPath.Text="Calea de ieşire pentru fişiere invalidă. Vă rugăm să verificaţi setările pentru a confirma că s-a stabilit o cale de fişier validă."
+Output.BadPath.Text="Calea configurată pentru fișierul de output este nevalidă. Te rugăm să verifici setările pentru a confirma că a fost setată o cale validă a fișierului."
 
-LogReturnDialog="Jurnal incărcat cu succes"
+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ță."
 LogReturnDialog.CopyURL="Copiază URL-ul"
+LogReturnDialog.AnalyzeURL="Analizează"
 LogReturnDialog.ErrorUploadingLog="Eroare la încărcarea fișierului jurnal"
 
 Remux.SourceFile="Înregistrare OBS"
@@ -325,17 +353,19 @@
 ScaleFiltering.Area="Zonă"
 
 Deinterlacing="Deîntrețesere"
-Deinterlacing.Discard="Înlătură"
+Deinterlacing.Discard="Semicadru înlăturat"
 Deinterlacing.Retro="Retro"
-Deinterlacing.Blend="Amestecare"
-Deinterlacing.Blend2x="Amestecare 2x"
+Deinterlacing.Blend="Mixată"
+Deinterlacing.Blend2x="Mixată 2x"
 Deinterlacing.Linear="Liniară"
 Deinterlacing.Linear2x="Liniară 2x"
 Deinterlacing.Yadif="Yadif"
 Deinterlacing.Yadif2x="Yadif 2x"
-Deinterlacing.TopFieldFirst="Câmpul de sus prima oară"
-Deinterlacing.BottomFieldFirst="Câmpul de jos prima oară"
+Deinterlacing.TopFieldFirst="Câmpul superior prima oară"
+Deinterlacing.BottomFieldFirst="Câmpul inferior prima oară"
 
+VolControl.SliderUnmuted="Glisor de volum pentru '%1': %2"
+VolControl.SliderMuted="Glisor de volum pentru '%1': %2 (în prezent muțit)"
 VolControl.Mute="Mut '%1'"
 VolControl.Properties="Proprietăți pentru „%1”"
 
@@ -349,7 +379,7 @@
 
 Basic.Main.RenameSceneCollection.Title="Redenumește colecția de scene"
 
-AddProfile.Title="Adaugă profil"
+AddProfile.Title="Adaugă un profil"
 AddProfile.Text="Te rugăm să introduci numele profilului"
 
 RenameProfile.Title="Redenumește profilul"
@@ -365,7 +395,7 @@
 Basic.SourceSelect.AddExisting="Adaugă una existentă"
 Basic.SourceSelect.AddVisible="Fă sursa vizibilă"
 
-Basic.PropertiesWindow="Proprietăți pentru '%1'"
+Basic.PropertiesWindow="Proprietăți pentru „%1”"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (selectare automată: %2)"
 Basic.PropertiesWindow.SelectColor="Selectează culoarea"
 Basic.PropertiesWindow.SelectFont="Selectează fontul"
@@ -397,7 +427,7 @@
 Basic.Filters="Filtre"
 Basic.Filters.AsyncFilters="Filtre audio/video"
 Basic.Filters.AudioFilters="Filtre audio"
-Basic.Filters.EffectFilters="Filtre de efect"
+Basic.Filters.EffectFilters="Filtre de efecte"
 Basic.Filters.Title="Filtre pentru '%1'"
 Basic.Filters.AddFilter.Title="Numele filtrului"
 Basic.Filters.AddFilter.Text="Te rugăm să specifici numele filtrului"
@@ -409,8 +439,8 @@
 Basic.TransformWindow.Alignment="Aliniere pozițională"
 Basic.TransformWindow.BoundsType="Tipul casetei de încadrare"
 Basic.TransformWindow.BoundsAlignment="Aliniere în caseta de încadrare"
-Basic.TransformWindow.Bounds="Mărime pentru caseta de încadrare"
-Basic.TransformWindow.Crop="Trunchiază"
+Basic.TransformWindow.Bounds="Dimensiunea casetei de încadrare"
+Basic.TransformWindow.Crop="Trunchiere"
 
 Basic.TransformWindow.Alignment.TopLeft="Stânga sus"
 Basic.TransformWindow.Alignment.TopCenter="Centru sus"
@@ -430,7 +460,7 @@
 Basic.TransformWindow.BoundsType.ScaleToHeight="Scalează la înălțimea limitei"
 Basic.TransformWindow.BoundsType.Stretch="Întinde la limite"
 
-Basic.Main.AddSourceHelp.Title="Nu se poate adăuga sursă"
+Basic.Main.AddSourceHelp.Title="Nu se poate adăuga sursa"
 Basic.Main.AddSourceHelp.Text="Trebuie să ai cel puțin 1 scenă pentru a adăuga o sursă."
 
 Basic.Main.Scenes="Scene"
@@ -438,16 +468,27 @@
 Basic.Main.Controls="Comenzi"
 Basic.Main.Connecting="Se conectează..."
 Basic.Main.StartRecording="Pornește înregistrarea"
+Basic.Main.StartReplayBuffer="Pornește bufferul de reluări"
+Basic.Main.SaveReplay="Salvează rejucare"
 Basic.Main.StartStreaming="Pornește transmisiunea"
+Basic.Main.StartVirtualCam="Pornește camera virtuală"
 Basic.Main.StopRecording="Oprește înregistrarea"
 Basic.Main.PauseRecording="Pune pe pauză înregistrarea"
 Basic.Main.UnpauseRecording="Scoate de pe pauză înregistrarea"
 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.StopStreaming="Oprește transmisiunea"
 Basic.Main.StoppingStreaming="Se oprește transmisiunea..."
 Basic.Main.ForceStopStreaming="Oprește transmisiunea (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ă"
+Basic.Main.Group="Grup: %1"
 Basic.Main.GroupItems="Grupează elementele selectate"
 Basic.Main.Ungroup="Anulează grupul"
+Basic.Main.GridMode="Mod grilă"
+Basic.Main.ListMode="Mod listă"
 
 Basic.MainMenu.File="&Fișier"
 Basic.MainMenu.File.Export="&Exportă"
@@ -469,6 +510,7 @@
 Basic.MainMenu.Edit.Scale="Previzualizează &scalarea"
 Basic.MainMenu.Edit.Scale.Window="Scalează la fereastră"
 Basic.MainMenu.Edit.Scale.Canvas="Planșă (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="Output (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Transformare"
 Basic.MainMenu.Edit.Transform.EditTransform="&Editează transformarea..."
 Basic.MainMenu.Edit.Transform.CopyTransform="Copiază transformarea"
@@ -479,9 +521,11 @@
 Basic.MainMenu.Edit.Transform.Rotate180="Rotește la 180°"
 Basic.MainMenu.Edit.Transform.FlipHorizontal="Răstoarnă orizontal (&H)"
 Basic.MainMenu.Edit.Transform.FlipVertical="Răstoarnă &vertical"
-Basic.MainMenu.Edit.Transform.FitToScreen="Potrivește pe ecran (&F)"
+Basic.MainMenu.Edit.Transform.FitToScreen="Potrivește la ecran (&F)"
 Basic.MainMenu.Edit.Transform.StretchToScreen="Întinde pe ecran (&S)"
 Basic.MainMenu.Edit.Transform.CenterToScreen="&Centrează pe ecran"
+Basic.MainMenu.Edit.Transform.VerticalCenter="Centrează vertical"
+Basic.MainMenu.Edit.Transform.HorizontalCenter="Centrează orizontal"
 Basic.MainMenu.Edit.Order="&Ordonare"
 Basic.MainMenu.Edit.Order.MoveUp="Mută s&us"
 Basic.MainMenu.Edit.Order.MoveDown="Mută jos (&D)"
@@ -495,15 +539,17 @@
 Basic.MainMenu.View.Docks.ResetUI="Resetează UI-ul"
 Basic.MainMenu.View.Docks.LockUI="Blochează UI-ul"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Andocări personalizate pentru browser..."
-Basic.MainMenu.View.Toolbars.Listboxes="Casete cu &liste"
+Basic.MainMenu.View.ListboxToolbars="Butoane pentru lista scenelor/surselor"
+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.SceneCollection="Colecție de &scene"
 Basic.MainMenu.Profile="&Profil"
-Basic.MainMenu.Profile.Import="Importă profil"
-Basic.MainMenu.Profile.Export="Exportă profil"
+Basic.MainMenu.Profile.Import="Importă un profil"
+Basic.MainMenu.Profile.Export="Exportă un profil"
 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"
@@ -512,14 +558,14 @@
 Basic.MainMenu.Tools="Unel&te"
 
 Basic.MainMenu.Help="Ajutor (&H)"
-Basic.MainMenu.Help.HelpPortal="&Portalul de ajutor"
+Basic.MainMenu.Help.HelpPortal="&Portal pentru ajutor"
 Basic.MainMenu.Help.Website="Vizitează site-ul &web"
 Basic.MainMenu.Help.Discord="Alătură-te serverului de &Discord"
 Basic.MainMenu.Help.Logs="Fișiere jurna&l"
 Basic.MainMenu.Help.Logs.ShowLogs="Afișează fișierele jurnal (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Încarcă a&ctualul fișier jurnal"
 Basic.MainMenu.Help.Logs.UploadLastLog="Încarcă u&ltimul fișier jurnal"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vezi log-ul actual"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vezi fișierul log actual"
 Basic.MainMenu.Help.CheckForUpdates="Caută actualizări"
 Basic.MainMenu.Help.CrashLogs="&Rapoarte de defecțiuni"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Afișează rapoartele de defecțiuni (&S)"
@@ -534,29 +580,39 @@
 Basic.Settings.General.Theme=" Temă"
 Basic.Settings.General.Language="Limbă"
 Basic.Settings.General.EnableAutoUpdates="Caută automat actualizări la pornire"
-Basic.Settings.General.OpenStatsOnStartup="Deschide dialogul cu statistici la pornire"
-Basic.Settings.General.WarnBeforeStartingStream="Afișează dialog de confirmare când pornește transmisiunea"
-Basic.Settings.General.WarnBeforeStoppingStream="Afișează dialog de confirmare când se oprește transmisiunea"
+Basic.Settings.General.OpenStatsOnStartup="Deschide caseta de dialog pentru statistici la pornire"
+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.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"
 Basic.Settings.General.ProjectorAlwaysOnTop="Pune proiectoarele mereu deasupra"
-Basic.Settings.General.Snapping="Alipire la alinierea cu sursa"
+Basic.Settings.General.Snapping="Alipire la alinierea cu sursele"
 Basic.Settings.General.ScreenSnapping="Aliniază sursele la marginea ecranului"
 Basic.Settings.General.CenterSnapping="Aliniază sursele la centrul vertical și orizontal"
 Basic.Settings.General.SourceSnapping="Aliniază sursele la alte surse"
 Basic.Settings.General.SnapDistance="Sensibilitatea alinierii"
-Basic.Settings.General.RecordWhenStreaming="Înregistrează automat atunci când faci transmisiune"
+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.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.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"
 Basic.Settings.General.SaveProjectors="Salvează proiectoarele la ieșire"
 Basic.Settings.General.Preview="Previzualizare"
+Basic.Settings.General.OverflowHidden="Ascunde zona excedentară"
+Basic.Settings.General.OverflowAlwaysVisible="Zona excedentară întotdeauna vizibilă"
+Basic.Settings.General.OverflowSelectionHidden="Afișează zona excedentară chiar și când sursa este invizibilă"
+Basic.Settings.General.Importers="Importatoare"
+Basic.Settings.General.AutomaticCollectionSearch="Caută locații cunoscute pentru colecțiile de scene atunci când le imporți"
 Basic.Settings.General.SwitchOnDoubleClick="Efectuează tranziția către scenă la dublu clic"
 Basic.Settings.General.StudioPortraitLayout="Activează aranjamentul de tip portret/vertical"
+Basic.Settings.General.TogglePreviewProgramLabels="Afișează etichete pentru previzualizare/program"
 Basic.Settings.General.Multiview="Vizualizare multiplă"
 Basic.Settings.General.Multiview.MouseSwitch="Efectuează clic pentru a comuta între scene"
 Basic.Settings.General.Multiview.DrawSourceNames="Afișează numele scenelor"
+Basic.Settings.General.Multiview.DrawSafeAreas="Afișează zonele sigure (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Aranjament pentru vizualizare multiplă"
 Basic.Settings.General.MultiviewLayout.Horizontal.Top="Orizontal, sus (8 scene)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Orizontal, jos (8 scene)"
@@ -570,33 +626,48 @@
 Basic.Settings.Stream.Custom.Username="Nume de utilizator"
 Basic.Settings.Stream.Custom.Password="Parolă"
 Basic.Settings.Stream.BandwidthTestMode="Activează modul de testare a lățimii de bandă"
-
-Basic.Settings.Output="Ieșire"
+Basic.Settings.Stream.TTVAddon="Suplimente pentru chatul Twitch"
+Basic.Settings.Stream.TTVAddon.None="Niciuna"
+Basic.Settings.Stream.TTVAddon.Both="BetterTTV și FrankerFaceZ"
+Basic.Settings.Stream.MissingSettingAlert="Lipsește configurarea pentru transmisiune"
+Basic.Settings.Stream.StreamSettingsWarning="Deschide Setările"
+Basic.Settings.Stream.MissingUrlAndApiKey="Cheia URL și Stream lipsesc.\n\nDeschideți setările pentru a introduce cheia URL și Stream în fila 'stream'."
+Basic.Settings.Stream.MissingUrl="URL-ul de stream lipsește.\n\nDeschideți setările pentru a introduce URL-ul în tab-ul 'Stream'."
+Basic.Settings.Stream.MissingStreamKey="Cheia de stream lipsește.\n\nDeschideți setările pentru a introduce cheia de transmisiune în fila 'Stream'."
+
+Basic.Settings.Output="Output"
 Basic.Settings.Output.Format="Format de înregistrare"
 Basic.Settings.Output.Encoder="Codificator"
 Basic.Settings.Output.SelectDirectory="Selectează directorul de înregistrări"
 Basic.Settings.Output.SelectFile="Selectează fișierul înregistrării"
 Basic.Settings.Output.EnforceBitrate="Impune limitele ratei de biți pentru serviciul de transmisiune"
-Basic.Settings.Output.Mode="Mod de ieșire"
+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ă semnificativă.\nCâ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."
+Basic.Settings.Output.Mode="Mod de output"
 Basic.Settings.Output.Mode.Simple="Simplu"
 Basic.Settings.Output.Mode.Adv="Avansat"
-Basic.Settings.Output.Mode.FFmpeg="Ieșire FFmpeg"
+Basic.Settings.Output.Mode.FFmpeg="Output FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Activează bufferul de reluări"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Timpul maxim de reluare"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memorie maximă (megabyți)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Utilizare estimată a memoriei: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nu se poate estima utilizarea memoriei. Vă rugăm să setați 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.Simple.SavePath="Cale de înregistrare"
 Basic.Settings.Output.Simple.RecordingQuality="Calitatea înregistrării"
-Basic.Settings.Output.Simple.RecordingQuality.Stream="La fel cu cea a streamului"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="La fel cu cea a transmisiunii"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Calitate înaltă, dimensiune medie pentru fișiere"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Calitate imposibil de distins, dimensiune mare pentru fișiere"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Calitate lossless, dimensiune extrem de mare pentru fișiere"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Calitate fără pierderi, dimensiune extrem de mare pentru fișiere"
 Basic.Settings.Output.Simple.Warn.VideoBitrate="Avertisment: Rata de biți a transmisiei video va fi setată la %1, care este limita superioară pentru serviciul de transmisiune actual. Dacă ești sigur că vrei să depășești %1, activează opțiunile avansate ale codificatorului și debifează „Impune limitele ratei de biți pentru serviciul de transmisiune”."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Avertisment: Rata de biți a transmisiei audio va fi setată la %1, care este limita superioară pentru serviciul de transmisiune actual. Dacă ești sigur că vrei să depășești %1, activează opțiunile avansate ale codificatorului și debifează „Impune limitele ratei de biți pentru serviciul de transmisiune”."
-Basic.Settings.Output.Simple.Warn.CannotPause="Avertisment: Înregistrările nu pot fi puse pe pauză dacă calitatea de înregistrare este setată pe „La fel cu cea a streamului”."
+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.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 lossless generează dimensiuni extrem de mari de fișiere! Calitatea lossless poate folosi până la 7GB spațiu de disc per minut la frecvențe de cadre și rezoluții ridicate. Lossless 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 lossless?"
-Basic.Settings.Output.Simple.Warn.Lossless.Title="Avertizare privind calitatea lossless!"
+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.Software="Software (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)"
@@ -605,6 +676,7 @@
 Basic.Settings.Output.VideoBitrate="Rată de biți video"
 Basic.Settings.Output.AudioBitrate="Rată de biți audio"
 Basic.Settings.Output.Reconnect="Reconectare automată"
+Basic.Settings.Output.RetryDelay="Întârziere la reîncercare"
 Basic.Settings.Output.MaxRetries="Reîncercări maxime"
 Basic.Settings.Output.Advanced="Activează setările avansate ale codificatorului"
 Basic.Settings.Output.EncoderPreset="Presetare pentru codificator"
@@ -612,7 +684,7 @@
 Basic.Settings.Output.CustomMuxerSettings="Setări personalizate pentru muxer"
 Basic.Settings.Output.NoSpaceFileName="Generează nume de fișiere fără spațiu"
 
-Basic.Settings.Output.Adv.Rescale="Rescalează ieșirea"
+Basic.Settings.Output.Adv.Rescale="Rescalează outputul"
 Basic.Settings.Output.Adv.AudioTrack="Pistă audio"
 Basic.Settings.Output.Adv.Streaming="Transmisiune"
 Basic.Settings.Output.Adv.ApplyServiceSettings="Impune setările codificatorului pentru serviciul de transmisiune"
@@ -626,13 +698,13 @@
 Basic.Settings.Output.Adv.Recording="Înregistrare"
 Basic.Settings.Output.Adv.Recording.Type="Tip"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
-Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Ieșire personalizată (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Output personalizat (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Folosește codificatorul de transmisiune)"
 Basic.Settings.Output.Adv.Recording.Filename="Formatarea numelui pentru fișiere"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Suprascrie în cazul în care fișierul există"
-Basic.Settings.Output.Adv.FFmpeg.Type="Tipul ieșirii FFmpeg"
-Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ieșire spre URL"
-Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ieșire spre fișier"
+Basic.Settings.Output.Adv.FFmpeg.Type="Tipul outpului FFmpeg"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Output spre URL"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Output spre fișier"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Formate comune de înregistrare"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Toate fișierele"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Calea fișierului sau URL-ul"
@@ -650,14 +722,23 @@
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Setările codificatorului audio (dacă există)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Setările muxerului (dacă există)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval de cadre cheie (cadre)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Afișează toate codecurile (chiar dacă este potențial incompatibil)"
 
+Screenshot="Realizează o captură de ecran a outputului"
+Screenshot.SourceHotkey="Realizează o captură de ecran a sursei selectate"
+Screenshot.StudioProgram="Realizează o captură de ecran (Program)"
+Screenshot.Preview="Realizează o captură de ecran (Previzualizare)"
+Screenshot.Scene="Realizează o captură de ecran (Scenă)"
+Screenshot.Source="Realizează o captură de ecran (Sursă)"
+
+FilenameFormatting.completer="%CCDD-%MM-%YY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M- %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Adaptor video"
-Basic.Settings.Video.BaseResolution="Rezoluție (planșă) de bază"
-Basic.Settings.Video.ScaledResolution="Rezoluție (scalată) la ieșire"
-Basic.Settings.Video.DownscaleFilter="Filtru pentru descalare"
+Basic.Settings.Video.BaseResolution="Rezoluție de bază (a planșei)"
+Basic.Settings.Video.ScaledResolution="Rezoluție a outputului (scalată)"
+Basic.Settings.Video.DownscaleFilter="Filtru pentru subscalare"
 Basic.Settings.Video.DisableAeroWindows="Dezactivează Aero (numai Windows)"
 Basic.Settings.Video.FPS="FPS"
 Basic.Settings.Video.FPSCommon="Valori FPS comune"
@@ -667,7 +748,7 @@
 Basic.Settings.Video.Denominator="Numitor"
 Basic.Settings.Video.Renderer="Renderer"
 Basic.Settings.Video.InvalidResolution="Valoare nevalidă pentru rezoluție. Trebuie să fie [lățime]x[înălțime] (de ex., 1920x1080)"
-Basic.Settings.Video.CurrentlyActive="Ieşirea video este în prezent activă. Vă rugăm să opriţi orice ieşiri pentru a schimba setările video."
+Basic.Settings.Video.CurrentlyActive="Outputul video este în prezent activ. Te rugăm să oprești orice output pentru a schimba setările video."
 Basic.Settings.Video.DisableAero="Dezactivează Aero"
 
 Basic.Settings.Video.DownscaleFilter.Bilinear="Biliniar (Cel mai rapid, dar neclar în cazul scalării)"
@@ -678,19 +759,25 @@
 Basic.Settings.Audio="Audio"
 Basic.Settings.Audio.SampleRate="Rată de eșantionare"
 Basic.Settings.Audio.Channels="Canale"
+Basic.Settings.Audio.Meters="Metrică"
+Basic.Settings.Audio.MeterDecayRate="Rată de atenuare"
 Basic.Settings.Audio.MeterDecayRate.Fast="Rapidă"
 Basic.Settings.Audio.MeterDecayRate.Medium="Medie (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lentă (Type II PPM)"
+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ă faceți streaming, verificați dacă serviciul dvs. de streaming suportă redarea de sunet intermitentă cât și redarea de sunet intermitentă. Facebook 360 Live, Mixer RTMP, Smashcast sunt exemple în care sunetul surround este pe deplin suportat. Deşi Facebook Live şi YouTube Live acceptă ambele în surround ingest, Facebook Live downmixes la stereo, iar YouTube Live joacă doar două canale.\n\nFiltrele audio OBS sunt compatibile cu sunetul surround deși suportul pentru plugin-uri VST nu este garantat."
 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"
+Basic.Settings.Audio.Devices="Dispozitive audio globale"
 Basic.Settings.Audio.DesktopDevice="Audio desktop"
 Basic.Settings.Audio.DesktopDevice2="Audio desktop 2"
-Basic.Settings.Audio.AuxDevice="Audio microfon/auxiliar"
-Basic.Settings.Audio.AuxDevice2="Audio microfon/auxiliar 2"
-Basic.Settings.Audio.AuxDevice3="Audio microfon/auxiliar 3"
-Basic.Settings.Audio.AuxDevice4="Audio microfon/auxiliar 4"
+Basic.Settings.Audio.AuxDevice="Microfon/Audio auxiliar"
+Basic.Settings.Audio.AuxDevice2="Microfon/Audio auxiliar 2"
+Basic.Settings.Audio.AuxDevice3="Microfon/Audio auxiliar 3"
+Basic.Settings.Audio.AuxDevice4="Microfon/Audio auxiliar 4"
 Basic.Settings.Audio.EnablePushToMute="Activează push-to-mute"
 Basic.Settings.Audio.PushToMuteDelay="Întârziere la push-to-mute"
 Basic.Settings.Audio.EnablePushToTalk="Activează push-to-talk"
@@ -701,12 +788,12 @@
 Basic.Settings.Advanced="Avansate"
 Basic.Settings.Advanced.General.ProcessPriority="Prioritatea procesului"
 Basic.Settings.Advanced.General.ProcessPriority.High="Ridicată"
-Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Peste normal"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Peste normală"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Normală"
-Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Sub normal"
-Basic.Settings.Advanced.General.ProcessPriority.Idle="Inactiv"
+Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Sub normală"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="Inactivă"
 Basic.Settings.Advanced.FormatWarning="Atentie: Formatele de culori diferite de NV12 sunt facute pentru inregistrare si nu sunt recomandate in cazul streaming-ului. Streaming-ul e posibil sa ceara mai multe resurse CPU datorita conversiei formatului culorii."
-Basic.Settings.Advanced.Audio.BufferingTime="Timp pentru zona tampon audio"
+Basic.Settings.Advanced.Audio.BufferingTime="Timp pentru bufferingul audio"
 Basic.Settings.Advanced.Video.ColorFormat="Format de culori"
 Basic.Settings.Advanced.Video.ColorSpace="Spațiu de culori"
 Basic.Settings.Advanced.Video.ColorRange="Gamă de culori"
@@ -714,11 +801,16 @@
 Basic.Settings.Advanced.Video.ColorRange.Full="Completă"
 Basic.Settings.Advanced.Audio.MonitoringDevice="Dispozitiv de monitorizare"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Implicit"
+Basic.Settings.Advanced.Audio.DisableAudioDucking="Dezactivează efectul audio de ducking din Windows"
 Basic.Settings.Advanced.StreamDelay="Întârziere pentru transmisiune"
+Basic.Settings.Advanced.StreamDelay.Duration="Durată"
 Basic.Settings.Advanced.StreamDelay.Preserve="Păstrează punctul de tăiere (crește întârzierea) la reconectare"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Utilizare estimată a memoriei: %1 MB"
 Basic.Settings.Advanced.Network="Rețea"
 Basic.Settings.Advanced.Network.BindToIP="Leagă de IP"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Activează optimizările pentru rețea"
+Basic.Settings.Advanced.Network.EnableLowLatencyMode="Activează TCP pacing"
+Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Încercările de a face RTMP mai prietenos cu alte aplicații sensibile la latență din rețea, prin reglementarea ratei de transmisie.\nAcest lucru poate crește riscul de cadre abandonate la conexiunile instabile."
 Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Comportamentul focalizării pentru tastele rapide"
 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Nu dezactiva niciodată tastele rapide"
 Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Dezactivează tastele rapide când fereastra principală este în prim-plan"
@@ -727,14 +819,16 @@
 Basic.Settings.Advanced.AutoRemux.MP4="(înregistrează ca mkv)"
 
 Basic.AdvAudio="Proprietăți audio avansate"
+Basic.AdvAudio.ActiveOnly="Numai surse active"
 Basic.AdvAudio.Name="Nume"
 Basic.AdvAudio.Volume="Volum"
+Basic.AdvAudio.Mono="Mono"
 Basic.AdvAudio.Balance="Balans"
 Basic.AdvAudio.SyncOffset="Decalajul sincronizării"
 Basic.AdvAudio.Monitoring="Monitorizare audio"
 Basic.AdvAudio.Monitoring.None="Monitorizare dezactivată"
-Basic.AdvAudio.Monitoring.MonitorOnly="Numai monitorizare (amuțește ieșirea)"
-Basic.AdvAudio.Monitoring.Both="Monitorizare și ieșire"
+Basic.AdvAudio.Monitoring.MonitorOnly="Numai monitorizare (amuțește outputul)"
+Basic.AdvAudio.Monitoring.Both="Monitorizare și output"
 Basic.AdvAudio.AudioTracks="Piste"
 
 Basic.Settings.Hotkeys="Taste rapide"
@@ -794,6 +888,7 @@
 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 rezultat al BSOD-urilor, pierderilor de energie etc.). Dacă doriţi să înregistraţi mai multe piese audio, luaţi în considerare utilizarea MKV şi remuxaţi înregistrarea în MP4/MOV după terminarea (Înregistrări File → Remux)"
 OutputWarnings.CannotPause="Avertisment: Înregistrările nu pot fi puse pe pauză dacă codificatorul de înregistrare este setat pe „(Folosește codificatorul de transmisiune)”"
 
 FinalScene.Title="Șterge scena"
@@ -801,6 +896,7 @@
 
 NoSources.Title="Nicio sursă"
 NoSources.Text="Se pare că nu ai adăugat încă nicio sursă video, așa că se va afișa doar un ecran negru. Sigur vrei să faci asta?"
+NoSources.Text.AddSource="Puteți adăuga surse făcând clic pe pictograma + din caseta Surse în fereastra principală în orice moment."
 NoSources.Label="Nu ai nicio sursă. Dă clic pe\nbutonul + de mai jos sau\nclic dreapta aici pentru a adăuga una."
 
 ChangeBG="Setează culoarea"
@@ -809,17 +905,46 @@
 BrowserSource.EnableHardwareAcceleration="Activează accelerarea hardware pentru Browser Source"
 
 About="Despre"
-About.Info="OBS Studio este un program gratuit și cu sursă deschisă de înregistrare video și transmisiune live."
+About.Info="OBS Studio este un program gratuit și open-source de înregistrare video și transmisiune live."
 About.Donate="Contribuie"
 About.GetInvolved="Implică-te"
 About.Authors="Autori"
 About.License="Licență"
 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?"
+AddUrl.Text.Url="URL: %1"
 
+ResizeOutputSizeOfSource="Redimensionează outputul (dimensiunea sursei)"
+ResizeOutputSizeOfSource.Text="Rezoluțiile de bază și a outputului vor fi redimensionate la dimensiunea sursei actuale."
+ResizeOutputSizeOfSource.Continue="Vrei să continui?"
 
 PreviewTransition="Previzualizează tranziția"
 
-
-
+Importer="Importator pentru colecții de scene"
+Importer.SelectCollection="Selectează o colecție de scene"
+Importer.Collection="Colecție de scene"
+Importer.HelpText="Adaugă fișiere în această fereastră pentru a importa colecții din OBS sau alte programe suportate."
+Importer.Path="Calea colecției"
+Importer.Program="Aplicație detectată"
+Importer.AutomaticCollectionPrompt="Caută automat colecții de scene"
+Importer.AutomaticCollectionText="OBS poate găsi automat colecții de scene importabile din programe terțe suportate. Dorești ca OBS să găsească automat colecții pentru tine?\n\nPoți modifica acest lucru mai târziu în Setări > Generale > Importatoare."
+
+
+Restart="Repornește"
+NeedsRestart="OBS Studio trebuie să fie repornit. Vrei să repornești acum?"
+
+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"

obs-studio-25.0.8.tar.xz/UI/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ru-RU.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Русский"
-Region="Российская Федерация"
 
 OK="OK"
 Apply="Применить"
@@ -38,6 +37,7 @@
 SourceWindow="Оконный проектор (Источник)"
 MultiviewProjector="Мульти-обзор (Полноэкранный)"
 MultiviewWindowed="Мульти-обзор (Оконный)"
+ResizeProjectorWindowToContent="Окно по размеру содержимого"
 Clear="Очистить"
 Revert="Вернуть"
 Show="Показать"
@@ -47,8 +47,8 @@
 New="Создать"
 Duplicate="Дублировать"
 Enable="Включить"
-DisableOSXVSync="Отключить OSX V-Sync"
-ResetOSXVSyncOnExit="Сброс OSX V-Sync на выходе"
+DisableOSXVSync="Отключить macOS V-Sync"
+ResetOSXVSyncOnExit="Сброс macOS V-Sync на выходе"
 HighResourceUsage="Кодировщик перегружен! Попробуйте понизить настройки видео или использовать более быстрые настройки кодировщика."
 Transition="Переход"
 QuickTransitions="Быстрые переходы"
@@ -73,8 +73,8 @@
 Next="Далее"
 Back="Назад"
 Defaults="По умолчанию"
-HideMixer="Скрыть в микшер"
-TransitionOverride="Переопределение перехода"
+HideMixer="Не показывать в микшере"
+TransitionOverride="Указать другой переход"
 None="Нет"
 StudioMode.Preview="Предпросмотр"
 StudioMode.Program="Программа"
@@ -83,17 +83,24 @@
 Group="Группа"
 DoNotShowAgain="Не показывать снова"
 Default="(По умолчанию)"
-Calculating="Расчёт..."
+Calculating="Идёт подсчёт..."
 Fullscreen="Полноэкранный режим"
 Windowed="Оконный режим"
 Percent="Проценты"
-AspectRatio="Соотношение <b>%1:%2</b>"
+RefreshBrowser="Обновить"
+AspectRatio="Соотношение сторон <b>%1:%2</b>"
 LockVolume="Зафиксировать громкость"
+LogViewer="Просмотр журнала"
+ShowOnStartup="Показывать при запуске"
+OpenFile="Открыть файл"
 
 AlreadyRunning.Title="OBS уже запущен"
 AlreadyRunning.Text="OBS уже запущен! Пожалуйста, закройте все запущенные экземпляры OBS перед попыткой запустить новые (только если вы не хотели именно этого). Если вы настроили OBS на сворачивание в системный трей, пожалуйста, проверьте, возможно он до сих пор запущен."
 AlreadyRunning.LaunchAnyway="Запустить в любом случае"
 
+ChromeOS.Title="Неподдерживаемая платформа"
+ChromeOS.Text="OBS запущена внутри контейнера ChromeOS. Эта платформа не поддерживается"
+
 DockCloseWarning.Title="Закрытие закрепляемого окна"
 DockCloseWarning.Text="Вы только что закрыли закрепляемое окно. Если вы хотите показать его снова, используйте меню Вид → Док-панели в строке меню."
 
@@ -101,8 +108,8 @@
 ExtraBrowsers.Info="Добавьте док-панели, указав имя или ссылку, затем нажмите Принять или Закрыть, чтобы открыть док-панели. Вы можете добавлять или удалять док-панели когда угодно."
 ExtraBrowsers.DockName="Название дока"
 
-Auth.Authing.Title="Аутентификация..."
-Auth.Authing.Text="Аутентификация с %1, пожалуйста подождите..."
+Auth.Authing.Title="Выполняется вход..."
+Auth.Authing.Text="Выполняется вход на %1, пожалуйста подождите..."
 Auth.AuthFailure.Title="Ошибка аутентификации"
 Auth.AuthFailure.Text="Ошибка аутентификации с %1:\n\n%2: %3"
 Auth.InvalidScope.Title="Требуется аутентификация"
@@ -116,7 +123,7 @@
 TwitchAuth.Stats="Статистика 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="Не удалось подключиться к вашей учётной записи Twitch. Убедитесь, что двухфакторная аутентицикация включена в <a href='https://www.twitch.tv/settings/security'>Настройках безопасности Twitch</a>; это требуется для начала прямых трансляций на Twitch."
 RestreamAuth.Channels="Restream каналы"
 
 Copy.Filters="Копировать фильтры"
@@ -131,17 +138,15 @@
 BandwidthTest.Region.Asia="Азия"
 BandwidthTest.Region.Other="Другой"
 
-Basic.FirstStartup.RunWizard="Хотите ли вы запустить Мастер автоматической настройки? Вы также можете настроить параметры вручную, нажав кнопку Настройки в главном окне."
-Basic.FirstStartup.RunWizard.NoClicked="Если вы передумаете, то в любой момент сможете запустить Мастер автоматической настройки из пункта меню Инструменты."
-
 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.SubTitle="Укажите настройки видео, которые вы хотите использовать"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Использовать текущий (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Дисплей %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Использовать текущий (%1)"
@@ -151,10 +156,10 @@
 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.DisconnectAccount="Выйти из аккаунта"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Выход из аккаунта"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Это изменение вступит в силу немедленно. Вы уверены, что хотите выйти?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Получить ключ потока"
 Basic.AutoConfig.StreamPage.UseStreamKey="Использовать ключ потока"
 Basic.AutoConfig.StreamPage.Service="Сервис"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Показать все..."
@@ -183,30 +188,32 @@
 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.MissedFrames="Пропуск кадров из-за задержки рендеринга"
+Basic.Stats.SkippedFrames="Пропуск кадров (кодирование)"
+Basic.Stats.MissedFrames="Пропуск кадров (рендеринг)"
 Basic.Stats.Output.Stream="Трансляция"
 Basic.Stats.Output.Recording="Запись"
-Basic.Stats.Status="Статус"
-Basic.Stats.Status.Recording="Включена"
+Basic.Stats.Status="Состояние"
+Basic.Stats.Status.Recording="Записывает"
 Basic.Stats.Status.Live="ПРЯМОЙ ЭФИР"
 Basic.Stats.Status.Reconnecting="Переподключение"
 Basic.Stats.Status.Inactive="Неактивна"
 Basic.Stats.Status.Active="Активно"
 Basic.Stats.DroppedFrames="Пропуск кадров (сеть)"
-Basic.Stats.MegabytesSent="Данных отправлено"
+Basic.Stats.MegabytesSent="Всего вышло"
 Basic.Stats.Bitrate="Битрейт"
 Basic.Stats.DiskFullIn="Переполнение диска (пример.)"
 Basic.Stats.ResetStats="Сбросить статистику"
 
-ResetUIWarning.Title="Вы уверены, что хотите сбросить пользовательский интерфейс?"
-ResetUIWarning.Text="Сброс пользовательского интерфейса скроет дополнительные док-панели. Если вы хотите чтобы эти панели были видимыми, вам нужно будет отметить их в меню Вид.\n\nВы уверены, что хотите сбросить пользовательский интерфейс?"
+ResetUIWarning.Title="Вы уверены, что хотите сбросить настройки пользовательского интерфейса?"
+ResetUIWarning.Text="При сбросе настроек пользовательского интерфейса все дополнительные панели будут скрыты. Вы можете включить их обратно в меню Вид > Док-панели.\n\nВы уверены, что хотите сбросить настройки пользовательского интерфейса?"
 
 Updater.Title="Доступно обновление"
 Updater.Text="Доступно новое обновление:"
@@ -219,7 +226,7 @@
 Updater.NoUpdatesAvailable.Text="Обновления не обнаружены"
 Updater.FailedToLaunch="Не удалось проверить обновления"
 Updater.GameCaptureActive.Title="Производится захват игры"
-Updater.GameCaptureActive.Text="Библиотека захвата игр уже используется. Закройте захватываемые игры/программы (или перезапустите Windows) и попробуйте ещё раз."
+Updater.GameCaptureActive.Text="Библиотека захвата игр загружена. Закройте все захватываемые игры и программы (или перезапустите Windows) и попробуйте ещё раз."
 
 QuickTransitions.SwapScenes="Менять местами сцены предпросмотра и вывода после перехода"
 QuickTransitions.SwapScenesTT="Меняет местами сцены предпросмотра и вывода после перехода (если оригинальная выходная сцена до сих пор существует).\nЭто не отменяет никаких изменений, которые возможно были сделаны в оригинальной выходной сцене."
@@ -269,10 +276,10 @@
 
 Output.StartStreamFailed="Не удалось запустить вещание"
 Output.StartRecordingFailed="Не удалось начать запись"
-Output.StartReplayFailed="Не удалось запустить воспроизведение из буфера"
+Output.StartReplayFailed="Не удалось запустить буфер повтора"
 Output.StartFailedGeneric="Сбой вывода. Подробности отражены в журнале.\n\nПримечание: Если вы используете кодировщики NVENC или AMD, убедитесь что у вас установлена последняя версия видеодрайвера."
 
-Output.ReplayBuffer.PauseWarning.Title="Не удаётся сохранить повторы во время паузы"
+Output.ReplayBuffer.PauseWarning.Title="Во время паузы нельзя сохранять повторы"
 Output.ReplayBuffer.PauseWarning.Text="Предупреждение: Повторы не могут быть сохранены во время приостановления записи."
 
 Output.ConnectFail.Title="Не удалось подключиться"
@@ -292,30 +299,31 @@
 Output.RecordError.Title="Ошибка записи"
 Output.RecordError.Msg="Во время записи произошла неопознанная ошибка."
 Output.RecordError.EncodeErrorMsg="Произошла ошибка кодировщика во время записи."
-Output.ReplayBuffer.NoHotkey.Title="Нет набора горячих клавиш!"
-Output.ReplayBuffer.NoHotkey.Msg="Не установлено клавиши для сохранения повтора. Пожалуйста, установите горячую клавишу для сохранения записей повторов."
 
 Output.BadPath.Title="Неправильный путь к файлу"
-Output.BadPath.Text="Некорректный путь к файлу. Пожалуйста, проверьте настройки, чтобы убедиться в корректности установленного пути."
+Output.BadPath.Text="Некорректный путь для записи файлов. Пожалуйста, убедитесь, что указанный в настройках путь для записи доступен."
 
-LogReturnDialog="Журнал успешно отгружен"
+LogReturnDialog="Журнал успешно загружен"
+LogReturnDialog.Description="Ваши логи были загружены. Теперь вы можете поделиться URL-адресом для отладки."
+LogReturnDialog.Description.Crash="Отчет об ошибке был загружен. Теперь вы можете поделиться URL-адресом для отладки."
 LogReturnDialog.CopyURL="Скопировать URL"
+LogReturnDialog.AnalyzeURL="Анализировать"
 LogReturnDialog.ErrorUploadingLog="Ошибка отгрузки файла журнала"
 
 Remux.SourceFile="OBS Запись"
 Remux.TargetFile="Конечный файл"
 Remux.Remux="Ремультиплексирование"
 Remux.Stop="Остановить ремультиплексирование"
-Remux.ClearFinished="Очистить завершённые элементы"
-Remux.ClearAll="Очистить все элементы"
+Remux.ClearFinished="Убрать завершенные из списка"
+Remux.ClearAll="Очистить список"
 Remux.OBSRecording="OBS Запись"
 Remux.FinishedTitle="Ремультиплексирование завершено"
 Remux.Finished="Запись ремультиплексирована"
 Remux.FinishedError="Запись ремультиплексирована, но файл может быть неполон"
 Remux.SelectRecording="Выберите запись OBS..."
-Remux.SelectTarget="Выберите целевой файл..."
+Remux.SelectTarget="Выберите файл..."
 Remux.FileExistsTitle="Конечные файлы существуют"
-Remux.FileExists="Следующие конечные файлы уже существуют. Хотите их заменить?"
+Remux.FileExists="Следующие конечные файлы уже существуют. Хотите их перезаписать?"
 Remux.ExitUnfinishedTitle="Ремультиплексирование в процессе"
 Remux.ExitUnfinished="Ремультиплексирование не закончено, остановка процесса сейчас может сделать файл непригодным.\nВы уверены, что хотите остановить ремультиплексирование?"
 Remux.HelpText="Перетащите файлы в это окно для ремультиплексирования или выберите пустую ячейку \"OBS Запись\" для выбора файла."
@@ -342,7 +350,7 @@
 ScaleFiltering.Bilinear="Билинейный"
 ScaleFiltering.Bicubic="Бикубический"
 ScaleFiltering.Lanczos="Метод Ланцоша"
-ScaleFiltering.Area="Область экрана"
+ScaleFiltering.Area="Область"
 
 Deinterlacing="Устранение чересстрочности"
 Deinterlacing.Discard="Отклонить"
@@ -408,7 +416,7 @@
 
 Basic.InteractionWindow="Взаимодействие с '%1'"
 
-Basic.StatusBar.Reconnecting="Соединение прервано, переподключение через %2 секунд(ы) (попытка %1)"
+Basic.StatusBar.Reconnecting="Потеряно соединение, переподключение через %2 секунд(ы) (попытка %1)"
 Basic.StatusBar.AttemptingReconnect="Попытка подключения... (попытка %1)"
 Basic.StatusBar.ReconnectSuccessful="Переподключение успешно"
 Basic.StatusBar.Delay="Задержка (%1 с)"
@@ -463,6 +471,7 @@
 Basic.Main.StartReplayBuffer="Запустить повтор"
 Basic.Main.SaveReplay="Сохранить повтор"
 Basic.Main.StartStreaming="Запустить трансляцию"
+Basic.Main.StartVirtualCam="Запустить виртуальную камеру"
 Basic.Main.StopRecording="Остановить запись"
 Basic.Main.PauseRecording="Приостановить запись"
 Basic.Main.UnpauseRecording="Возобновить запись"
@@ -472,6 +481,9 @@
 Basic.Main.StopStreaming="Остановить трансляцию"
 Basic.Main.StoppingStreaming="Остановка вещания..."
 Basic.Main.ForceStopStreaming="Остановить трансляцию (сбросить задержку)"
+Basic.Main.ShowContextBar="Показать панель инструментов источников"
+Basic.Main.HideContextBar="Скрыть панель инструментов источников"
+Basic.Main.StopVirtualCam="Остановить виртуальную камеру"
 Basic.Main.Group="Группа %1"
 Basic.Main.GroupItems="Сгруппировать выбранные элементы"
 Basic.Main.Ungroup="Разгруппировать"
@@ -484,9 +496,9 @@
 Basic.MainMenu.File.ShowRecordings="Показать записи (&R)"
 Basic.MainMenu.File.Remux="Ремультиплексирование записей (&M)"
 Basic.MainMenu.File.Settings="Настройки (&S)"
-Basic.MainMenu.File.ShowSettingsFolder="Показать папку с настройками"
-Basic.MainMenu.File.ShowProfileFolder="Показать папку с профилями"
-Basic.MainMenu.AlwaysOnTop="Поверх других окон (&A)"
+Basic.MainMenu.File.ShowSettingsFolder="Открыть папку настроек"
+Basic.MainMenu.File.ShowProfileFolder="Открыть папку профиля"
+Basic.MainMenu.AlwaysOnTop="Поверх всех окон (&A)"
 Basic.MainMenu.File.Exit="Выход (&X)"
 
 Basic.MainMenu.Edit="Правка (&E)"
@@ -507,7 +519,7 @@
 Basic.MainMenu.Edit.Transform.Rotate90CW="Повернуть на 90 градусов по часовой"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Повернуть на 90 градусов против часовой"
 Basic.MainMenu.Edit.Transform.Rotate180="Повернуть на 180 градусов"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="Отразить горизонтально (&H)"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Отразить по горизонтали"
 Basic.MainMenu.Edit.Transform.FlipVertical="Отразить вертикально (&V)"
 Basic.MainMenu.Edit.Transform.FitToScreen="Подогнать по размеру экрана (&F)"
 Basic.MainMenu.Edit.Transform.StretchToScreen="Растянуть на весь экран (&S)"
@@ -527,9 +539,10 @@
 Basic.MainMenu.View.Docks.ResetUI="Сбросить интерфейс"
 Basic.MainMenu.View.Docks.LockUI="Зафиксировать интерфейс"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Пользовательские доки браузера..."
-Basic.MainMenu.View.Toolbars.Listboxes="Списки (&L)"
+Basic.MainMenu.View.ListboxToolbars="Показывать иконки под доками \"Сцены\" и \"Источники\""
+Basic.MainMenu.View.ContextBar="Панель инструментов источников"
 Basic.MainMenu.View.SceneTransitions="Сцена переходов (&C)"
-Basic.MainMenu.View.SourceIcons="Источник и иконки"
+Basic.MainMenu.View.SourceIcons="Иконки источников (&I)"
 Basic.MainMenu.View.StatusBar="Строка состояния (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Полный экран"
 
@@ -552,7 +565,7 @@
 Basic.MainMenu.Help.Logs.ShowLogs="Показать файлы журнала (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Отгрузить текущий файл журнала (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Отгрузить последний файл журнала (&L)"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="Просмотреть текущий журнал (&V)"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="Открыть текущий журнал (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Проверить наличие обновлений"
 Basic.MainMenu.Help.CrashLogs="Отчёты об ошибках (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Показать отчёты об ошибках (&S)"
@@ -595,7 +608,7 @@
 Basic.Settings.General.AutomaticCollectionSearch="Поиск известных мест для коллекций сцен при импорте"
 Basic.Settings.General.SwitchOnDoubleClick="Переход к сцене при двойном щелчке"
 Basic.Settings.General.StudioPortraitLayout="Включить портретное/вертикальное расположение"
-Basic.Settings.General.TogglePreviewProgramLabels="Показывать отметки предпросмотра/программы"
+Basic.Settings.General.TogglePreviewProgramLabels="Показывать отметки \"Предпросмотр\" и \"Программа\""
 Basic.Settings.General.Multiview="Мульти-обзор"
 Basic.Settings.General.Multiview.MouseSwitch="Переключение сцен щелчком мыши"
 Basic.Settings.General.Multiview.DrawSourceNames="Показывать названия сцен"
@@ -616,18 +629,18 @@
 Basic.Settings.Stream.TTVAddon="Дополнения чата Twitch"
 Basic.Settings.Stream.TTVAddon.None="Нет"
 Basic.Settings.Stream.TTVAddon.Both="BetterTTV и FrankerFaceZ"
-Basic.Settings.Stream.MissingSettingAlert="Отсутствует настройка потока"
+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.MissingUrlAndApiKey="URL и ключ потока отсутствуют.\n\nОткройте настройки, чтобы ввести URL-адрес и ключ потока на вкладке «Вещание»."
+Basic.Settings.Stream.MissingUrl="Отсутствует URL потока.\n\nОткройте настройки, чтобы ввести URL на вкладке «Вещание»."
+Basic.Settings.Stream.MissingStreamKey="Ключ потока отсутствует.\n\nОткройте настройки, чтобы ввести ключ потока на вкладке «Вещание»."
 
 Basic.Settings.Output="Вывод"
 Basic.Settings.Output.Format="Формат записи"
 Basic.Settings.Output.Encoder="Кодировщик"
 Basic.Settings.Output.SelectDirectory="Выбрать каталог записи"
 Basic.Settings.Output.SelectFile="Выбрать файл записи"
-Basic.Settings.Output.EnforceBitrate="Следовать ограничениям битрейта, накладываемые потоковой службой"
+Basic.Settings.Output.EnforceBitrate="Следовать ограничениям битрейта сервиса вещания"
 Basic.Settings.Output.DynamicBitrate="Динамически изменять битрейт для управления перегрузкой сети"
 Basic.Settings.Output.DynamicBitrate.Beta="Динамически изменять битрейт для управления перегрузкой сети (бета)"
 Basic.Settings.Output.DynamicBitrate.TT="Вместо пропуска кадров, будет задействовано динамическое изменение битрейта на лету, чтобы уменьшить перегрузку сети.\n\nОбратите внимание, что это может увеличить задержку для зрителей, в случае внезапного забивания канала.\nПосле уменьшения битрейта может потребоваться несколько минут для его восстановления.\n\nВ настоящее время поддерживается только для RTMP."
@@ -636,11 +649,10 @@
 Basic.Settings.Output.Mode.Adv="Расширенный"
 Basic.Settings.Output.Mode.FFmpeg="Вывод FFmpeg"
 Basic.Settings.Output.UseReplayBuffer="Включить буфер повтора"
-Basic.Settings.Output.ReplayBuffer.SecondsMax="Максимальное время повтора"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Максимальная длительность повтора"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимальный объем памяти (МБ)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Предполагаемое использование памяти: %1 МБ"
-Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Невозможно оценить использование памяти. Пожалуйста, установите максимальный объем памяти."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Примечание: Убедитесь, что установили горячую клавишу для воспроизведения буфера в разделе горячие клавиши)"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Приблизительная оценка расхода памяти невозможна. Пожалуйста, укажите лимит расхода памяти вручную."
 Basic.Settings.Output.ReplayBuffer.Prefix="Префикс имени файла повтора"
 Basic.Settings.Output.ReplayBuffer.Suffix="Суффикс"
 Basic.Settings.Output.Simple.SavePath="Путь записи"
@@ -650,8 +662,8 @@
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Неотличимое качество, большой размер файла"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Без потери качества, чрезвычайно большой размер файла"
 Basic.Settings.Output.Simple.Warn.VideoBitrate="Предупреждение: битрейт видео при вещании будет установлен на %1, что является максимумом для текущей потоковой службы. Если вы уверены, что хотите получить битрейт больше %1, включите дополнительные настройки кодировщика и снимите флажок с \"Принудительно использовать ограничения битрейта потоковой службы\"."
-Basic.Settings.Output.Simple.Warn.AudioBitrate="Предупреждение: битрейт аудио при вещании будет установлен на %1, что является максимумом для текущей потоковой службы. Если вы уверены, что хотите получить битрейт больше %1, включите дополнительные настройки кодировщика и снимите флажок с \"Принудительно использовать ограничения битрейта потоковой службы\"."
-Basic.Settings.Output.Simple.Warn.CannotPause="Предупреждение: Записи не могут быть приостановлены, если качество записи установлено на \"То же самое как поток\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Предупреждение: битрейт аудио при вещании будет установлен на %1, что является максимумом для текущей потоковой службы. Если вы уверены, что хотите получить битрейт больше %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="Вы уверены, что хотите записывать без потери качества?"
@@ -701,7 +713,7 @@
 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="Аудио- и видеокодеки будут угаданы по URL или пути к файлу"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Кодировщик по умолчанию"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Отключить кодировщик"
 Basic.Settings.Output.Adv.FFmpeg.VEncoder="Кодировщик видео"
@@ -710,7 +722,14 @@
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Настройки кодировщика аудио (если есть)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Настройки мультиплексора (если есть)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Интервал ключевых кадров (кадры)"
-Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Показать все кодеки (даже потенциально несовместимые)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Показать все кодеки (в т.ч. потенциально несовместимые)"
+
+Screenshot="Сделать скриншот вывода"
+Screenshot.SourceHotkey="Сделать скриншот этого источника"
+Screenshot.StudioProgram="Сделать скриншот (\"Программа\")"
+Screenshot.Preview="Сделать скриншот (предпросмотра)"
+Screenshot.Scene="Сделать скриншот (сцены)"
+Screenshot.Source="Сделать скриншот (источника)"
 
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
@@ -729,7 +748,7 @@
 Basic.Settings.Video.Numerator="Числитель"
 Basic.Settings.Video.Denominator="Знаменатель"
 Basic.Settings.Video.Renderer="Рендер"
-Basic.Settings.Video.InvalidResolution="Неверное разрешение. Должно быть [Ширина]x[Высота] (т.е. 1920x1080)"
+Basic.Settings.Video.InvalidResolution="Неверное разрешение. Должно быть [Ширина]x[Высота] (например, 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Видео выход в данный момент активен. Пожалуйста, отключите все выходы, чтобы изменить настройки видео."
 Basic.Settings.Video.DisableAero="Отключить Aero"
 
@@ -750,10 +769,10 @@
 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="При запуске трансляции убедитесь, что ваш сервис потокового вещания поддерживает объёмный звук (как запись, так и воспроизведение). Facebook 360 Live, Mixer RTMP и Smashcast — примеры сервисов, полностью поддерживающих объёмное звучание. Несмотря на то, что Facebook Live и Youtube Live принимают объёмный звук, Facebook Live микширует его в стерео, а Youtube Live воспроизводит только два канала.\n\nЗвуковые фильтры OBS совместимы с объёмным звучанием, хотя поддержка плагинов 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="Микрофон/Дополнительное аудио"
@@ -770,7 +789,7 @@
 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.AboveNormal="Выше среднего"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Средний"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Ниже среднего"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Низкий"
@@ -792,7 +811,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Привязать к 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="Отключать горячие клавиши, когда главное окно в фокусе"
@@ -824,12 +843,12 @@
 
 Basic.SystemTray.Message.Reconnecting="Соединение потеряно. Подключаемся заново..."
 
-Hotkeys.Insert="Insert"
-Hotkeys.Delete="Delete"
-Hotkeys.Home="Home"
-Hotkeys.End="End"
-Hotkeys.PageUp="Page Up"
-Hotkeys.PageDown="Page Down"
+Hotkeys.Insert="Вставить"
+Hotkeys.Delete="Удалить"
+Hotkeys.Home="Главная страница"
+Hotkeys.End="В конец"
+Hotkeys.PageUp="Предыдущий"
+Hotkeys.PageDown="Следующий"
 Hotkeys.NumLock="Num Lock"
 Hotkeys.ScrollLock="Scroll Lock"
 Hotkeys.CapsLock="Caps Lock"
@@ -874,7 +893,7 @@
 OutputWarnings.CannotPause="Предупреждение: Записи не могут быть приостановлены, если кодировщик записи установлен на \"(Использовать кодировщик потока)\""
 
 FinalScene.Title="Удалить сцену"
-FinalScene.Text="Здесь должна быть по крайней мере одна сцена."
+FinalScene.Text="Нельзя удалить последнюю сцену."
 
 NoSources.Title="Нет источников"
 NoSources.Text="Похоже, вы ещё не добавили ни одного источника. Вы будете выводить только пустой экран. Вы уверены, что хотите этого?"
@@ -899,7 +918,7 @@
 AddUrl.Text.Url="URL: %1"
 
 ResizeOutputSizeOfSource="Масштабировать вывод (по размеру источника)"
-ResizeOutputSizeOfSource.Text="Базовое и выходное разрешение будет изменено до размера текущего источника."
+ResizeOutputSizeOfSource.Text="Разрешения холста и вывода будут изменены до размера выбранного источника."
 ResizeOutputSizeOfSource.Continue="Хотите продолжить?"
 
 PreviewTransition="Предпросмотр перехода"
@@ -917,3 +936,16 @@
 Restart="Перезапуск"
 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="Виджет перемотки медиа"
+

obs-studio-26.0.0.tar.xz/UI/data/locale/si-LK.ini Added

obs-studio-25.0.8.tar.xz/UI/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/sk-SK.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Slovenčina"
-Region="Slovensko"
 
 OK="OK"
 Apply="Použiť"
@@ -8,7 +7,7 @@
 Close="Zatvoriť"
 Save="Uložiť"
 Discard="Zahodiť"
-Disable="Zakázať"
+Disable="Vypnúť"
 Yes="Áno"
 No="Nie"
 Add="Pridať"
@@ -38,17 +37,18 @@
 SourceWindow="Projektor v okne (zdroj)"
 MultiviewProjector="Multiview (celá obrazovka)"
 MultiviewWindowed="Multiview (okno)"
+ResizeProjectorWindowToContent="Upraviť veľkosť okna podľa obsahu"
 Clear="Vymazať"
 Revert="Vrátiť"
-Show="Zobraziť"
+Show="Ukázať"
 Hide="Skryť"
 UnhideAll="Odkryť Všetky"
 Untitled="Bez názvu"
 New="Nový"
 Duplicate="Duplikovať"
 Enable="Povoliť"
-DisableOSXVSync="Vypnúť OSX V-Sync"
-ResetOSXVSyncOnExit="Resetovať OSX V-Sync po zavretí"
+DisableOSXVSync="Vypnúť macOS V-Sync"
+ResetOSXVSyncOnExit="Resetovať macOS V-Sync po zavretí"
 HighResourceUsage="Kódovanie preťažené! Uvažujte o znížení nastavení videa alebo vyberte rýchlejšiu predvoľbu kódovania."
 Transition="Prechod"
 QuickTransitions="Rýchle prechody"
@@ -87,13 +87,21 @@
 Fullscreen="Celá obrazovka"
 Windowed="Okno"
 Percent="Percent"
+RefreshBrowser="Obnoviť"
 AspectRatio="Pomer strán <b>%1:%2</b>"
 LockVolume="Uzamknúť hlasitosť"
+LogViewer="Prehliadač logov"
+ShowOnStartup="Ukázať pri spustení"
+OpenFile="Otvoriť súbor"
+AddValue="Pridať %1"
 
 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ť"
 
+ChromeOS.Title="Nepodporovaná platforma"
+ChromeOS.Text="OBS pravdepodobne beží v ChromeOS kontajneri. Táto platforma nie je podporovaná"
+
 DockCloseWarning.Title="Zatvorenie dokovateľného okna"
 DockCloseWarning.Text="Práve ste zatvorili dokovateľné okno. Ak ho chcete znovu zobraziť, použite menu Zobraziť → Doky."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Ázia"
 BandwidthTest.Region.Other="Iné"
 
-Basic.FirstStartup.RunWizard="Chcete spustiť sprievodcu automatickej konfigurácie? Nastavenie môžete nakonfigurovať aj manuálne kliknutím na tlačidlo nastavenia v hlavnom okne."
-Basic.FirstStartup.RunWizard.NoClicked="Ak zmeníte názor, môžete spustiť sprievodcu automatickou konfiguráciou kedykoľvek znova z ponuky Nástroje."
-
 Basic.AutoConfig="Sprievodca automatickou konfiguráciou"
 Basic.AutoConfig.ApplySettings="Použiť nastavenia"
 Basic.AutoConfig.StartPage="Informácie o používaní"
 Basic.AutoConfig.StartPage.SubTitle="Vyberte na čo chcete program použiť"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimalizovať pre streamovanie, nahrávanie je sekundárne"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimalizovať len pre nahrávanie, streamovať nebudem"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Budem používať iba virtuálnu kameru"
 Basic.AutoConfig.VideoPage="Nastavenia videa"
-Basic.AutoConfig.VideoPage.SubTitle="Vyberte nastavenia videa, ktoré by ste chceli používať"
+Basic.AutoConfig.VideoPage.SubTitle="Vyberte nastavenia videa, ktoré by ste chceli použiť"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Použiť aktuálne (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Monitor %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Použiť aktuálne (%1)"
@@ -150,7 +156,7 @@
 Basic.AutoConfig.VideoPage.CanvasExplanation="Poznámka: rozlíšenie (základné) plátna nie je nevyhnutne rovnaké ako rozlíšenie, v ktorom budete vysielať alebo nahrávať. Skutočné vysielacie/nahrávacie rozlíšenie môže byť zmenšené preto, aby sa znížilo používanie dát alebo zdrojov."
 Basic.AutoConfig.StreamPage="Informácie o streame"
 Basic.AutoConfig.StreamPage.SubTitle="Prosím, zadajte svoje údaje o vysielaní"
-Basic.AutoConfig.StreamPage.ConnectAccount="Pripojiť Účet (odporúčané)"
+Basic.AutoConfig.StreamPage.ConnectAccount="Pripojiť účet (odporúčané)"
 Basic.AutoConfig.StreamPage.DisconnectAccount="Odpojiť účet"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Odpojiť účet?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Táto zmena sa uplatní okamžite. Naozaj chcete odpojiť svoj účet?"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Kodér nahrávania"
 Basic.AutoConfig.TestPage.Result.Header="Program zistil, že nasledujúce nastavenia by mohli byť pre vás najvhodnejšie:"
 Basic.AutoConfig.TestPage.Result.Footer="Pre použitie týchto nastavení kliknite na Použiť. Pre úpravu nastavení sprievodcu kliknite na Späť. Ak si želáte nastaviť program manuálne, kliknite na Zrušiť a následne na tlačidlo Nastavenia."
+Basic.AutoConfig.Info="Sprievodca automatickou konfiguráciou určí najlepšie nastavenia na základe špecifikácií vášho počítača a rýchlosti internetu."
+Basic.AutoConfig.RunAnytime="Túto funkciu môžete spustiť kedykoľvek v ponuke Nástroje."
 
 Basic.Stats="Štatistiky"
 Basic.Stats.CPUUsage="Využitie CPU"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Nepriradená žiadna klávesová skratka!"
-Output.ReplayBuffer.NoHotkey.Msg="Nie je nastavená žiadna klávesová skratka pre uloženie záznamu v pamäti. Nastavte ju, prosím, aby ste mohli ukladať záznam."
 
 Output.BadPath.Title="Nesprávna cesta k súboru"
 Output.BadPath.Text="Nastavená cesta k výstupnému súboru je chybná. Prosím, skontrolujte správnosť nastavenej cesty."
 
 LogReturnDialog="Nahranie logu bolo úspešné"
+LogReturnDialog.Description="Váš výpisový súbor bol nahratý. Môžete teraz zdieľať URL pre potreby ladenia alebo podpory."
+LogReturnDialog.Description.Crash="Váš výpis výpadkov aplikácie bol nahratý. Môžete teraz zdieľať URL pre potreby ladenia."
 LogReturnDialog.CopyURL="Kopírovať URL"
+LogReturnDialog.AnalyzeURL="Analyzovať"
 LogReturnDialog.ErrorUploadingLog="Chyba pri nahrávaní súboru denníka chýb"
 
 Remux.SourceFile="OBS nahrávka"
@@ -325,8 +334,8 @@
 
 Basic.DesktopDevice1="Zvuk plochy"
 Basic.DesktopDevice2="Zvuk plochy 2"
-Basic.AuxDevice1="Mik/Aux"
-Basic.AuxDevice2="Mik/Aux 2"
+Basic.AuxDevice1="Mikrofón/Aux"
+Basic.AuxDevice2="Mikrofón/Aux 2"
 Basic.AuxDevice3="Mikrofon / AUX 3"
 Basic.AuxDevice4="Mikrofon / AUX 4"
 
@@ -338,9 +347,9 @@
 Basic.Main.Preview.Disable="Vypnúť nahľad"
 
 ScaleFiltering="Filter škálovania"
-ScaleFiltering.Point="Bodové"
-ScaleFiltering.Bilinear="Bilineárne"
-ScaleFiltering.Bicubic="Bikubické"
+ScaleFiltering.Point="Bodový"
+ScaleFiltering.Bilinear="Bilineárny"
+ScaleFiltering.Bicubic="Bikubický"
 ScaleFiltering.Lanczos="Lanczos"
 ScaleFiltering.Area="Oblastný"
 
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Spustiť záznam do pamäte"
 Basic.Main.SaveReplay="Uložiť záznam"
 Basic.Main.StartStreaming="Spustiť stream"
+Basic.Main.StartVirtualCam="Spustite virtuálnu kameru"
 Basic.Main.StopRecording="Ukončiť nahrávanie"
 Basic.Main.PauseRecording="Pozastaviť nahrávanie"
 Basic.Main.UnpauseRecording="Pokračovať v nahrávaní"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Ukončiť stream"
 Basic.Main.StoppingStreaming="Zastavenie streamu..."
 Basic.Main.ForceStopStreaming="Zastaviť vysielanie (bez oneskorenia)"
+Basic.Main.ShowContextBar="Zobraziť panel nástrojov zdroja"
+Basic.Main.HideContextBar="Skryť panel nástrojov zdroja"
+Basic.Main.StopVirtualCam="Vypnite virtuálnu kameru"
 Basic.Main.Group="Skupina %1"
 Basic.Main.GroupItems="Zoskupiť vybrané položky"
 Basic.Main.Ungroup="Rozdeliť skupinu"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Resetovať UI"
 Basic.MainMenu.View.Docks.LockUI="Zamknúť UI"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Vlastné doky prehliadača..."
-Basic.MainMenu.View.Toolbars.Listboxes="Zoznamy (&L)"
+Basic.MainMenu.View.ListboxToolbars="Tlačidlá zoznamu scén/zdrojov"
+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"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximálna pamäť (v megabajtoch)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Odhadované využitie pamäte: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nemožno odhadnúť využitie pamäte. Prosím, nastavte maximálny pamäťový limit."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Poznámka: Uistite sa, že ste nastavili klávesovú skratku pre záznam do pamäte v sekcii klávesových skratiek)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Predpona názvu súboru záznamu do pamäte"
 Basic.Settings.Output.ReplayBuffer.Suffix="Prípona"
 Basic.Settings.Output.Simple.SavePath="Nahrávacia cesta"
@@ -663,7 +676,7 @@
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softvérový (x264, nízke zaťaženie CPU, zvyšuje veľkosť súboru)"
 Basic.Settings.Output.VideoBitrate="Bitrate videa"
 Basic.Settings.Output.AudioBitrate="Bitrate zvuku"
-Basic.Settings.Output.Reconnect="Automaticky znovupripájať"
+Basic.Settings.Output.Reconnect="Automatické znovupripojenie"
 Basic.Settings.Output.RetryDelay="Oneskorenie opakovania"
 Basic.Settings.Output.MaxRetries="Maximálny počet pokusov"
 Basic.Settings.Output.Advanced="Povoliť pokročilé nastavenia enkodéra"
@@ -712,6 +725,13 @@
 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é)"
 
+Screenshot="Výstup snímkov obrazovky"
+Screenshot.SourceHotkey="Vybratý zdroj snímkov obrazovky"
+Screenshot.StudioProgram="Snímok obrazovky (Program)"
+Screenshot.Preview="Snímok obrazovky (Náhľad)"
+Screenshot.Scene="Snímok obrazovky (Scéna)"
+Screenshot.Source="Snímok obrazovky (Zdroj)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Rok, štyri číslice\n%YY		Rok, posledné dve číslice (00-99)\n%MM		Mesiac ako číslo (01-12)\n%DD		Deň v mesiaci, s úvodnou nulou (01-31)\n%hh		Hodina vo 24-hod. formáte (00-23)\n%mm		Minúta (00-59)\n%ss		Sekunda (00-61)\n%% Znak percenta\n%a		Skrátený názov dňa v týždni\n%A		Celý názov dňa v týždni\n%b		Skrátený názov mesiaca\n%B		Celý názov mesiaca\n%d		Deň v mesiaci, s úvodnou nulou (01-31)\n%H		Hodina v 24-hod. formáte (00-23)\n%I		Hodina v 12-hod. formáte (01-12)\n%m		Mesiac ako číslo (01-12)\n%M		Minúta (00-59)\n%p		Časť dňa AM/PM\n%S		Sekunda (00-61)\n%y		Rok, posledné dve číslice (00-99)\n%Y		Rok\n%z		ISO 8601 časový posun od UTC\n%Z		Názov alebo skratka časového pásma\n%FPS		Snímky za sekundu\n%CRES		Základné (plátnové) rozlíšenie\n%ORES		Výstupné (škálované) rozlíšenie\n%VF		Video formát"
@@ -733,27 +753,27 @@
 Basic.Settings.Video.CurrentlyActive="Výstup videa je práve aktívny. Prosím, vypnite všetky výstupy na zmenu nastavení videa."
 Basic.Settings.Video.DisableAero="Vypnúť Aero"
 
-Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineárne (Najrýchlejšie, ale rozmazané pri škálovaní)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubické (ostrejšie pri škálovaní, 16 vzoriek)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczosov (ostrejšie pri škálovaní, 36 vzoriek)"
-Basic.Settings.Video.DownscaleFilter.Area="Oblasť (Vážená suma, 4/6/9 vzoriek)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineárny (Najrýchlejší, ale rozmazaný pri škálovaní)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubický (Zaostrené škálovanie, 16 vzoriek)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Zaostrené škálovanie, 36 vzoriek)"
+Basic.Settings.Video.DownscaleFilter.Area="Oblastný (Váhová suma, 4/6/9 vzoriek)"
 
 Basic.Settings.Audio="Zvuk"
 Basic.Settings.Audio.SampleRate="Vzorkovacia frekvencia"
 Basic.Settings.Audio.Channels="Kanály"
-Basic.Settings.Audio.Meters="Metre"
-Basic.Settings.Audio.MeterDecayRate="Rýchlosť slabnutia"
+Basic.Settings.Audio.Meters="Merače"
+Basic.Settings.Audio.MeterDecayRate="Rýchlosť rozpadu"
 Basic.Settings.Audio.MeterDecayRate.Fast="Rýchlo"
 Basic.Settings.Audio.MeterDecayRate.Medium="Stredne (typ I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Pomaly (typ II PPM)"
-Basic.Settings.Audio.PeakMeterType="Typ merača špičiek"
-Basic.Settings.Audio.PeakMeterType.SamplePeak="Špička vzorky"
-Basic.Settings.Audio.PeakMeterType.TruePeak="Pravý Špička (Vyššie využitie CPU)"
+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="Ak vysielate, uistite sa že vaša vysielacia služba podporuje prijímanie a aj prehrávanie priestorového zvuku. Facebook 360 Live, Mixer RTMP, Smashcast sú príklady služieb ktoré priestorový zvuk plne podporujú. Avšak 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="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?"
-Basic.Settings.Audio.Devices="Zariadenia"
+Basic.Settings.Audio.Devices="Globálne zvukové zariadenia"
 Basic.Settings.Audio.DesktopDevice="Zvuk plochy"
 Basic.Settings.Audio.DesktopDevice2="Zvuk plochy 2"
 Basic.Settings.Audio.AuxDevice="Mikrofón/Aux - Zvukové zariadenie"
@@ -917,3 +937,16 @@
 Restart="Reštartovať"
 NeedsRestart="Aplikáciu OBS Studio je potrebné reštartovať. Chcete teraz reštartovať?"
 
+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í"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/sl-SI.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Slovenščina"
-Region="Slovenija"
 
 OK="V redu"
 Apply="Uporabi"
@@ -38,6 +37,7 @@
 SourceWindow="Projektor v oknu (vir)"
 MultiviewProjector="Več pogledov (celozaslonsko)"
 MultiviewWindowed="Več pogledov (v oknu)"
+ResizeProjectorWindowToContent="Prilagodi okno vsebini"
 Clear="Počisti"
 Revert="Povrni"
 Show="Prikaži"
@@ -88,11 +88,13 @@
 Windowed="Okensko"
 Percent="Odstotkov"
 AspectRatio="Razmerje slike <b>%1%2</b>"
+LockVolume="Zakleni glasnost"
 
 AlreadyRunning.Title="OBS se že izvaja"
 AlreadyRunning.Text="OBS se že izvaja! Razen če ste imeli namen zagnati več primerkov, pred zagonom novega primerka OBS-a zaustavite vse obstoječe. Če imate OBS nastavljen, da se skrči v sistemsko vrstico, preverite, če se tam še izvaja."
 AlreadyRunning.LaunchAnyway="Vseeno zaženi"
 
+
 DockCloseWarning.Title="Zapiranje sidrnega okna"
 DockCloseWarning.Text="Pravkar ste zaprli okno sidrišča. Če bi ga radi zopet prikazali, uporabite meni Pogled → Sidrišča."
 
@@ -130,17 +132,14 @@
 BandwidthTest.Region.Asia="Azija"
 BandwidthTest.Region.Other="Drugo"
 
-Basic.FirstStartup.RunWizard="Želite zagnati čarovnika za samodejno nastavitev? Svoje nastavitve lahko tudi spremenite, tako da kliknete na gumb Nastavitve v glavnem oknu."
-Basic.FirstStartup.RunWizard.NoClicked="Če si premislite, lahko iz menija Orodja kadarkoli znova zaženete čarovnika za samodejno nastavitev."
-
 Basic.AutoConfig="Čarovnik za samodejno nastavitev"
 Basic.AutoConfig.ApplySettings="Uporabi nastavitve"
 Basic.AutoConfig.StartPage="Informacije o uporabi"
 Basic.AutoConfig.StartPage.SubTitle="Navedite, za kaj želite program uporabljati"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimiziraj za pretakanje - snemanje je drugotnega pomena"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimiziraj samo za snemanje - ne bom pretakal"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Uporabljala se bo samo virtualna kamera"
 Basic.AutoConfig.VideoPage="Nastavitve videa"
-Basic.AutoConfig.VideoPage.SubTitle="Določite želene nastavitve videa, ki bi jih radi uporabili"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Uporabi trenutno (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Zaslon %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Uporabi trenutno (%1)"
@@ -182,6 +181,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Snemalni kodirnik"
 Basic.AutoConfig.TestPage.Result.Header="Program je ocenil, da so te nastavitve najprimernejše za vas:"
 Basic.AutoConfig.TestPage.Result.Footer="Za uporabo teh nastavitev kliknite 'Uporabi nastavitve'. Za ponovno nastavitev čarovnika in vnovičen poizkus kliknite 'Nazaj'. Za ročno nastavitev kliknite 'Prekliči' in odprite nastavitve."
+Basic.AutoConfig.Info="Namestitveni čarovnik bo določil najboljše nastavitve glede na tehnične specifikacije računalnika in na internetno povezavo."
+Basic.AutoConfig.RunAnytime="To lahko kadarkoli zaženete iz menija Orodja."
 
 Basic.Stats="Statistika"
 Basic.Stats.CPUUsage="Obremenitev procesorja"
@@ -291,14 +292,15 @@
 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.ReplayBuffer.NoHotkey.Title="Hitra tipka ni nastavljena!"
-Output.ReplayBuffer.NoHotkey.Msg="Ni nastavljene hitre tipke za shranjevanje medpomnilnika ponovitve. Nastavite hitro tipko \"Shrani\", ki bo uporabljena za shranjevanje ponovitev."
 
 Output.BadPath.Title="Nepravilna pot do datoteke"
 Output.BadPath.Text="Nastavljena pot do datoteke ni veljavna. Preverite, da je nastavljena veljavna pot do datoteke."
 
 LogReturnDialog="Dnevnik je bil uspešno poslan"
+LogReturnDialog.Description="Dnevniška datoteka je bila naložena. URL se sedaj lahko deli za razhroščevanje ali podporo."
+LogReturnDialog.Description.Crash="Poročilo sesutja se je bilo naloženo. URL se sedaj lahko deli za razhroščevanje ali podporo."
 LogReturnDialog.CopyURL="Kopiraj URL"
+LogReturnDialog.AnalyzeURL="Analiziraj"
 LogReturnDialog.ErrorUploadingLog="Napaka pri pošiljanju dnevniške datoteke"
 
 Remux.SourceFile="Posnetek OBS"
@@ -462,6 +464,7 @@
 Basic.Main.StartReplayBuffer="Zaženi medpomnilnik za ponovitev"
 Basic.Main.SaveReplay="Shrani ponovitev"
 Basic.Main.StartStreaming="Začni pretakati"
+Basic.Main.StartVirtualCam="Zagon virtualne kamere"
 Basic.Main.StopRecording="Prenehaj snemati"
 Basic.Main.PauseRecording="Premor snemanja"
 Basic.Main.UnpauseRecording="Nadaljuj snemanje"
@@ -471,6 +474,7 @@
 Basic.Main.StopStreaming="Prenehaj pretakati"
 Basic.Main.StoppingStreaming="Ustavljanje pretoka …"
 Basic.Main.ForceStopStreaming="Prenehaj pretakati (zavrzi zakasnitev)"
+Basic.Main.StopVirtualCam="Zaustavitev virtualne kamere"
 Basic.Main.Group="%1. skupina"
 Basic.Main.GroupItems="Združi izbrane predmete"
 Basic.Main.Ungroup="Razdruži"
@@ -526,8 +530,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Ponastavi up. vmesnik"
 Basic.MainMenu.View.Docks.LockUI="Zakleni up. vmesnik"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Prilagojena sidrišča brskalnika..."
-Basic.MainMenu.View.Toolbars.Listboxes="Vrstice seznamov (&L)"
 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"
 
@@ -589,6 +593,8 @@
 Basic.Settings.General.OverflowHidden="Skrij prekoračitev"
 Basic.Settings.General.OverflowAlwaysVisible="Prekoračitev je vedno vidna"
 Basic.Settings.General.OverflowSelectionHidden="Prikaži prekoračitev, tudi ko je vir neviden"
+Basic.Settings.General.Importers="Uvozniki"
+Basic.Settings.General.AutomaticCollectionSearch="Med uvažanjem išči zbirke scen v znanih lokacijah"
 Basic.Settings.General.SwitchOnDoubleClick="Ob dvokliku izvedi prehod na prizor"
 Basic.Settings.General.StudioPortraitLayout="Omogoči pokončno/navpično razporeditev"
 Basic.Settings.General.TogglePreviewProgramLabels="Prikaži oznake za predogled/program"
@@ -636,7 +642,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Največja količina pomnilnika (MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Ocenjena poraba pomnilnika: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Porabe pomnilnika ni mogoče oceniti. Nastavite zgornjo omejitev porabe."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Opomba: prepričajte se, da v oddelku za hitre tipke nastavite hitro tipko za medpomnilnik ponovitve)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Predpona datoteke medp. ponovitve"
 Basic.Settings.Output.ReplayBuffer.Suffix="Pripona"
 Basic.Settings.Output.Simple.SavePath="Pot za snemanje"
@@ -708,6 +713,7 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Razmik med ključnimi sličicami (sličic)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Prikaže vse kodeke (tudi če so mogoče nezdružljivi)"
 
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	Leto, štiri števila\n%YY		Leto zadnji dve številki (00-99)\n%MM		Mesec, kot desetiško število (01-12)\n%DD		Dan mesec, kot desetiško število (01-31)\n%hh		Ure v 24-urnem zapisu (00-23)\n%mm		Minute (00-59)\n%ss		Sekunde (00-61)\n%%		A % sign\n%a		Skrajšano ime dneva\n%A		Polno ime dneva\n%b		Skrajšano ime meseca\n%B		Polno ime meseca\n%d		Dan v mesecu v desetiškem zapisu (01-31)\n%H		Ure v 24-urnem formatu (00-23)\n%I		Ure v 12-urnem formatu (01-12)\n%m		Mesec, kot desetiško število (01-12)\n%M		Minute (00-59)\n%p		AM ali PM oznaka\n%S		Sekunda (00-61)\n%y		Leto, zadnji dve številki (00-99)\n%Y		Leto\n%z		ISO 8601 odmik od UTC časovnega pasu\n%Z		Ime ali okrajšava časovnega pasu\n%FPS		Sličic na sekundo\n%CRES		Osnovna ločljivost (platno)\n%ORES		Izhodna (povečava) ločljivost\n%VF		Video format"
@@ -746,10 +752,10 @@
 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 preverite, ali pretočna storitev podpira tako snemanje, kot tudi predvajanje prostorskega zvoka. Facebook 360 Live, Mixer RTMP in Smashcast so primeri, ki prostorski zvok v celoti podpirajo. Č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="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.Title="Omogoči prostorski zvok?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Ali res želite omogočiti prostorski zvok?"
-Basic.Settings.Audio.Devices="Naprave"
+Basic.Settings.Audio.Devices="Globalne avdio naprave"
 Basic.Settings.Audio.DesktopDevice="Namizni zvok"
 Basic.Settings.Audio.DesktopDevice2="Namizni zvok 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/Dodatni zvok"
@@ -900,6 +906,18 @@
 
 PreviewTransition="Predogled prehoda"
 
+Importer="Uvoz zbirk prizorov"
+Importer.SelectCollection="Izberi zbirko prizorov"
+Importer.Collection="Zbirka prizorov"
+Importer.HelpText="Dodaj datoteke v ta seznam, da uvoziš zbirke iz OBS-a ali drugih podprtih programov."
+Importer.Path="Pot do zbirke"
+Importer.Program="Zaznan program"
+Importer.AutomaticCollectionPrompt="Samodejno iskanje zbirk prizorov"
+Importer.AutomaticCollectionText="OBS lahko samodejno najde zbirke prizorov, ki se ji lahko uvozi, od podprtih programov tretjih razvijalcev. Ali želiš, da OBS samodejno poišče zbirke za vas?\n\nTo lahko spremeniš pozneje v Nastavitve > Splošno > Uvozniki."
+
+
+Restart="Ponovni zagon"
+NeedsRestart="OBS Studi zahteva ponovni zagon? Ponovno zaženem zdaj?"

obs-studio-25.0.8.tar.xz/UI/data/locale/sq-AL.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/sq-AL.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Gjuha Angleze"
-Region="Shtetet e Bashkuara"
 
 OK="OK"
 Apply="Aplikoni"
@@ -23,6 +22,7 @@
 Display="Ekrani"
 Name="Emri"
 Exit="Dil"
+Mixer="Mikseri Audio"
 Browse="Shfleto"
 Mono="Mono"
 Stereo="Stereo"
@@ -37,6 +37,7 @@
 SourceWindow="Projektor Windowed (Burimi)"
 MultiviewProjector="Shumë pamje (Ekran i plotë)"
 MultiviewWindowed="Shumë pamje (Windowed)"
+ResizeProjectorWindowToContent="Përshtateni faqen me përmbajtje"
 Clear="Pastro"
 Revert="Rikthe"
 Show="Shfaq"
@@ -46,11 +47,12 @@
 New="I ri"
 Duplicate="Dublikatë"
 Enable="Aktivizo"
-DisableOSXVSync="Çaktivizo OSX V-Sync"
-ResetOSXVSyncOnExit="Rivendos OSX V-Sync në Mbyllje"
+DisableOSXVSync="Çaktivizo macOS V-Sync"
+ResetOSXVSyncOnExit="Rivendos macOS V-Sync në Mbyllje"
 HighResourceUsage="Kodimi i mbingarkuar! Merrni parasysh uljen e cilësimeve të videos ose duke përdorur një parazgjedhje më të shpejtë të kodimit."
 Transition="Tranzicion"
 QuickTransitions="Tranzicione të shpejta"
+FadeToBlack="Venite në të zezë"
 Left="Majtas"
 Right="Djathtas"
 Top="Kreu"
@@ -79,11 +81,28 @@
 ShowInMultiview="Shfaqe në Shumë Pamje"
 VerticalLayout="Plani vertikal"
 Group="Grup"
+DoNotShowAgain="Mos e shfaq përsëri"
+Default="(E parazgjedhur)"
+Calculating="Duke kalkuluar..."
+Fullscreen="Ekran i plotë"
+Windowed="Në dritare"
+Percent="Përqindje"
+RefreshBrowser="Rifresko"
+AspectRatio="Raport i aspektit <b>%1:%2</b>"
+LockVolume="Kyc volumin"
+LogViewer="Kycje shikuesi"
+ShowOnStartup="Shfaqe në fillim"
+OpenFile="Hap skedën"
 
 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"
 
+ChromeOS.Title="Platformë e pambështetur"
+ChromeOS.Text="OBS duket të jetë aktive përbrenda ChromeOS. Platforma është e pambështetur"
+
+DockCloseWarning.Title="Duke mbyllur dritaren e ankorueshme"
+DockCloseWarning.Text="Sapo mbyllët dritaren e ankorueshme. Nëse doni ta shfaqni prap, shkoni tek View - Docks Menu tek bari i Menysë."
 
 
 
@@ -97,9 +116,6 @@
 BandwidthTest.Region.Asia="Azi"
 BandwidthTest.Region.Other="Të tjera"
 
-Basic.FirstStartup.RunWizard="A deshironi te nisni konfigurimin automatik? Ju gjithashtu mund ta konfiguroni manualisht ne parametrat e tua duke klikuar Parametrat ne butonin tek dritarja kryesore."
-Basic.FirstStartup.RunWizard.NoClicked="Nese ju ndryshoni mendjen, ju mund te nisni konfigurimin automatik ne menune e Mjeteve."
-
 Basic.AutoConfig="Konfigurimi automatik"
 Basic.AutoConfig.ApplySettings="Aplikoni Parametrat"
 Basic.AutoConfig.StartPage="Informacion mbi perdorimin"
@@ -107,7 +123,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizo per transmetim, rregjistrimi eshte dytesore"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizo vetem per rregjistrim, une nuk do te rregjistroj"
 Basic.AutoConfig.VideoPage="Parametrat e videos"
-Basic.AutoConfig.VideoPage.SubTitle="Specifikoni parametrat e videos qe ju deshironi"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Perdorni Aktualen (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Ekrani %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Perdor Aktualen (%1)"
@@ -223,3 +238,6 @@
 
 
 
+
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/sr-CS.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/sr-CS.ini Changed

@@ -1,6 +1,5 @@
 
 Language="srpski"
-Region="Serbia"
 
 OK="OK"
 Apply="Primeni"
@@ -46,8 +45,8 @@
 New="Novi"
 Duplicate="Dupliraj"
 Enable="Omogući"
-DisableOSXVSync="Onemogući OSX vertikalnu sinhronizaciju"
-ResetOSXVSyncOnExit="Povrati OSX vertikalnu sinhronizaciju po izlasku"
+DisableOSXVSync="Onemogući macOS vertikalnu sinhronizaciju"
+ResetOSXVSyncOnExit="Povrati macOS vertikalnu sinhronizaciju po izlasku"
 HighResourceUsage="Enkodiranje preopterećeno! Razmotrite snižavanje video podešavanja ili korišćenje bržeg šablona za enkodiranje."
 Transition="Prelaz"
 QuickTransitions="Brzi prelazi"
@@ -89,6 +88,7 @@
 
 
 
+
 Auth.Authing.Title="Provera autentičnosti.."
 Auth.Authing.Text="Provera autentičnosti pomoću %1, molim sačekajte.."
 Auth.AuthFailure.Title="Nije moguće utvrditi autentičnost"
@@ -115,9 +115,6 @@
 BandwidthTest.Region.Asia="Azija"
 BandwidthTest.Region.Other="Ostatak sveta"
 
-Basic.FirstStartup.RunWizard="Da li želite da pokrenete čarobnjaka za automatsko konfigurisanje? Ovo takođe možete uraditi i ručno, ako kliknete na podešavanja (settings) u glavnom prozoru."
-Basic.FirstStartup.RunWizard.NoClicked="Ako se predomislite, možete pokrenuti čarobnjaka za automatsko konfigurisanje kad god poželite, iz menija Alata (Tools)."
-
 Basic.AutoConfig="Čarobnjak za automatsko konfigurisanje"
 Basic.AutoConfig.ApplySettings="Premeni podešavanja"
 Basic.AutoConfig.StartPage="Način upotrebe programa"
@@ -125,7 +122,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizuj za steaming (prenos uživo), snimanje je sekindarno"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizuj za snimanje, streaming (prenos uživo) se neće izvršiti"
 Basic.AutoConfig.VideoPage="Podešavanje videa"
-Basic.AutoConfig.VideoPage.SubTitle="Definišite željena video podešavanja koja bisteeleli da koristite"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Koristi trenutna (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Prikaz %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Koristite trenutni (%1)"
@@ -262,8 +258,6 @@
 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.ReplayBuffer.NoHotkey.Title="Nije podešena prečica na tastaturi!"
-Output.ReplayBuffer.NoHotkey.Msg="Nije podešena prečica za bafer ponovnog prikazivanja. Molimo podesite prečicu ''Sačuvaj'', za čuvanje snimaka koji su ponovo prikazivani."
 
 Output.BadPath.Title="Neispravna putanja datoteke"
 Output.BadPath.Text="Podešena putanja za izlaz dokumenta je neispravna. Molim proverite vaša podešavanja da potvrdite ispravnost putanje."
@@ -485,7 +479,6 @@
 Basic.MainMenu.View.Docks="Dokovi"
 Basic.MainMenu.View.Docks.ResetUI="Resetuj korisnički interfejs"
 Basic.MainMenu.View.Docks.LockUI="Zaključaj korisnički interfejs"
-Basic.MainMenu.View.Toolbars.Listboxes="Spisak stavki (&L)"
 Basic.MainMenu.View.SceneTransitions="S&censki prelazi"
 Basic.MainMenu.View.StatusBar="&Statusna linija"
 Basic.MainMenu.View.Fullscreen.Interface="Interfejs na celom ekranu"
@@ -580,7 +573,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maksimalna memorija (MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Procenjena iskorišćenost memorije: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nemoguće je proceniti iskorišćenost memorije. Molimo podesite maksimalnu granicu memorije."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Obaveštenje: Pobrinite se da u sekciji za prečice namestite prečicu na tastaturi za bafer ponovnog prikazivanja)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefiks imena fajla bafera reprodukovanja"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufiks"
 Basic.Settings.Output.Simple.SavePath="Putanja za snimanje"
@@ -652,6 +644,7 @@
 
 
 
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adapter"
 Basic.Settings.Video.BaseResolution="Osnovna (površinska) rezolucija"
@@ -683,10 +676,8 @@
 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="Ako je strim u toku, proverite da li vaša striming usluga podržava integraciju i plejbek zvuka okruženja. Facebook 360 Live, Mixer RTMP, Smashcast su primeri gde je zvuk okruženja u potpunosti podržan. Iako i Facebook Live i YouTube Live podržavaju integraciju okruženja, Facebook Live miksuje kao stereo, a YouTube Live reprodukuje samo dva kanala.\n\nOBS zvučni filteri su kompatibilni sa zvukom okruženja, mada podrška za VST priključke nije zagarantovana."
 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.Devices="Uređaji"
 Basic.Settings.Audio.EnablePushToMute="Omogući stisni-za-mutiranje"
 Basic.Settings.Audio.PushToMuteDelay="Kašnjenje opcije stisni-za-mutiranje"
 Basic.Settings.Audio.EnablePushToTalk="Omogući Stisni-za-govor"
@@ -811,3 +802,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/sr-SP.ini Changed

@@ -1,6 +1,5 @@
 
 Language="српски"
-Region="Србија"
 
 OK="У реду"
 Apply="Примени"
@@ -47,8 +46,8 @@
 New="Нови"
 Duplicate="Дуплирај"
 Enable="Омогући"
-DisableOSXVSync="Онемогући OSX вертикалну синхронизацију"
-ResetOSXVSyncOnExit="Поврати OSX вертикалну синхронизацију по изласку"
+DisableOSXVSync="Онемогући macOS вертикалну синхронизацију"
+ResetOSXVSyncOnExit="Поврати macOS вертикалну синхронизацију по изласку"
 HighResourceUsage="Енкодирање преоптерећено! Размотрите снижавање видео подешавања ли коришћење бржег шаблона за енкодирање."
 Transition="Прелаз"
 QuickTransitions="Брзи прелази"
@@ -88,12 +87,14 @@
 Windowed="У прозору"
 Percent="проценат"
 AspectRatio="Размера <b>%1:%2</b>"
+LockVolume="Закључај јачину звука"
 
 AlreadyRunning.Title="OBS је већ покренут"
 AlreadyRunning.Text="OBS je већ покренут! Осим ако заиста желите да урадите ово, молимо Вас да прекинете све процесе везане за OBS пре него што покренете нов задатак. У случају да OBS ради у позадини, молимо вас да проверите system tray (иконице доле десно, поред сата)."
 AlreadyRunning.LaunchAnyway="Свеједно покрени"
 
 
+
 ExtraBrowsers.DockName="Име дока"
 
 Auth.Authing.Title="Потврда идентитета"
@@ -122,9 +123,6 @@
 BandwidthTest.Region.Asia="Азија"
 BandwidthTest.Region.Other="Други"
 
-Basic.FirstStartup.RunWizard="Да ли желите да покренете чаробњака за аутоматско конфигурисање? Ово такође можете урадити и ручно, ако кликнете на подешавања (settings) у главном прозору."
-Basic.FirstStartup.RunWizard.NoClicked="Ако се предомислите можете покренути чаробњака за аутоматско конфигурисање кад год пожелите, из менија Алата (Tools)."
-
 Basic.AutoConfig="Чаробњак за аутоматско конфигурисање (Бета верзија)"
 Basic.AutoConfig.ApplySettings="Промени подешавања"
 Basic.AutoConfig.StartPage="Информације о коришћењу"
@@ -132,7 +130,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Оптимизуј за стримовање, снимање је секундарно"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Оптимизуј за снимање, стримовање се неће извршити"
 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)"
@@ -144,6 +141,7 @@
 Basic.AutoConfig.StreamPage.DisconnectAccount="Дисконектуј налог"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Дисконектуј налог?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Ова промена ће бити примењена одмах. Да ли сте сигурни да желите да дисконектујете Ваш налог?"
+Basic.AutoConfig.StreamPage.GetStreamKey="Нађи кључ за стримовање"
 Basic.AutoConfig.StreamPage.UseStreamKey="Користи шифру за стримовање"
 Basic.AutoConfig.StreamPage.Service="Услуга"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Прикажи све..."
@@ -187,6 +185,7 @@
 Basic.Stats.Status.Live="УЖИВО"
 Basic.Stats.Status.Reconnecting="Поновно повезивање"
 Basic.Stats.Status.Inactive="Неактивно"
+Basic.Stats.Status.Active="Активно"
 Basic.Stats.DroppedFrames="Пропуштени фрејмови (Мрежа)"
 Basic.Stats.MegabytesSent="Укупни подаци на излазу"
 Basic.Stats.Bitrate="Брзина протока"
@@ -272,8 +271,6 @@
 Output.RecordNoSpace.Msg="Нема довољно простора на диску да се настави снимање."
 Output.RecordError.Title="Грешка при снимању"
 Output.RecordError.Msg="Неодређена грешка се догодила при снимању."
-Output.ReplayBuffer.NoHotkey.Title="Није подешена пречица на тастатури!"
-Output.ReplayBuffer.NoHotkey.Msg="Није подешена пречица за бафер поновног приказивања. Молимо подесите пречицу ''Сачувај'' за чување снимака који су поново приказивани."
 
 Output.BadPath.Title="Неисправна путања датотеке"
 Output.BadPath.Text="Подешена путања за излаз документа је неисправна. Молим проверите ваша подешавања да потврдите исправност путање."
@@ -438,7 +435,9 @@
 Basic.Main.StartRecording="Почни снимање"
 Basic.Main.StartReplayBuffer="Покрени бафер за поновно приказивање"
 Basic.Main.StartStreaming="Почни стримовање"
+Basic.Main.StartVirtualCam="Покрени виртуалну камеру"
 Basic.Main.StopRecording="Заустави снимање"
+Basic.Main.PauseRecording="Паузирај снимање"
 Basic.Main.StoppingRecording="Заустављање снимања..."
 Basic.Main.StopReplayBuffer="Заустави бафер за поновно приказивање"
 Basic.Main.StoppingReplayBuffer="Заустављање бафера за поновно приказивање је у току..."
@@ -495,7 +494,6 @@
 Basic.MainMenu.View.Docks="Докови"
 Basic.MainMenu.View.Docks.ResetUI="Ресетуј кориснички интерфејс"
 Basic.MainMenu.View.Docks.LockUI="Закључаj кориснички интерфејс"
-Basic.MainMenu.View.Toolbars.Listboxes="Списак ставки (&L)"
 Basic.MainMenu.View.SceneTransitions="Сценски прелази (&C)"
 Basic.MainMenu.View.StatusBar="Статусна линија (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Интерфејс на целом екрану"
@@ -557,6 +555,7 @@
 Basic.Settings.General.OverflowHidden="Сакриј вишак"
 Basic.Settings.General.OverflowAlwaysVisible="Вишак је увек видљив"
 Basic.Settings.General.OverflowSelectionHidden="Прикажи вишак чак и када је извор невидљив"
+Basic.Settings.General.Importers="Увозници"
 Basic.Settings.General.SwitchOnDoubleClick="Прелаз на сцену дуплим кликом"
 Basic.Settings.General.StudioPortraitLayout="Укључи портрет/вертикални приказ"
 Basic.Settings.General.Multiview="Симултани приказ"
@@ -592,7 +591,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимална меморија (мегабајти)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Процењена искоришћеност меморије: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Немогуће је проценити искоришћеност меморије. Молимо подесите максималну границу меморије."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Обавештење: побрините се да у секцији за пречице подесите пречицу на тастатури за бафер поновног приказивања)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Префикс имена фајла бафера репродуковања"
 Basic.Settings.Output.ReplayBuffer.Suffix="Суфикс"
 Basic.Settings.Output.Simple.SavePath="Путања за снимање"
@@ -664,6 +662,7 @@
 
 
 
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео адаптер"
 Basic.Settings.Video.BaseResolution="Основна (површинска) резолуција"
@@ -695,7 +694,6 @@
 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.Title="Да ли желите да укључите звук окружења?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Да ли сте сигурни да желите да укључите звук окружења?"
 Basic.Settings.Audio.EnablePushToMute="Омогући стисни-за-мутирање"
@@ -731,6 +729,8 @@
 
 Basic.AdvAudio="Напредна подешавања звука"
 Basic.AdvAudio.Name="Име"
+Basic.AdvAudio.Volume="Јачина звука"
+Basic.AdvAudio.Mono="Моно"
 Basic.AdvAudio.Balance="Баланс"
 Basic.AdvAudio.Monitoring="Аудио надзор"
 Basic.AdvAudio.Monitoring.None="Искључи надзор"
@@ -813,11 +813,15 @@
 About.Authors="Аутори"
 About.License="Лиценца"
 
+AddUrl.Text.Url="УРЛ: %1"
 
 ResizeOutputSizeOfSource="Промени величину излаза (величина извора)"
 ResizeOutputSizeOfSource.Text="Резолуција излаза и основна резолуција ће бити промењене како би одговарале величини тренутног извора."
 ResizeOutputSizeOfSource.Continue="Да ли желите да наставите?"
 
+PreviewTransition="Прегледај прелаз"
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/sv-SE.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Svenska"
-Region="Sverige"
 
 OK="OK"
 Apply="Verkställ"
@@ -38,6 +37,7 @@
 SourceWindow="Fönsterprojektor (källa)"
 MultiviewProjector="Multivy (helskärm)"
 MultiviewWindowed="Multivy (fönster)"
+ResizeProjectorWindowToContent="Anpassa fönstret till innehållet"
 Clear="Rensa"
 Revert="Nollställ"
 Show="Visa"
@@ -47,8 +47,8 @@
 New="Ny"
 Duplicate="Duplicera"
 Enable="Aktivera"
-DisableOSXVSync="Inaktivera OSX V-Sync"
-ResetOSXVSyncOnExit="Återställ OSX V-Sync vid avslutning"
+DisableOSXVSync="Inaktivera macOS V-Sync"
+ResetOSXVSyncOnExit="Återställ macOS V-Sync vid avslutning"
 HighResourceUsage="Kodning överlastad! Överväg att dra ned videoinställningar eller använd en snabbare kodnings-förinställning."
 Transition="Övergång"
 QuickTransitions="Snabba övergångar"
@@ -61,7 +61,7 @@
 Hours="timmar"
 Minutes="minuter"
 Seconds="sekunder"
-Deprecated="Föråldrat"
+Deprecated="Föråldrade"
 ReplayBuffer="Reprisbuffert"
 Import="Importera"
 Export="Exportera"
@@ -87,13 +87,20 @@
 Fullscreen="Fullskärm"
 Windowed="I fönster"
 Percent="Procent"
+RefreshBrowser="Uppdatera"
 AspectRatio="Bildförhållande <b>%1:%2</b>"
 LockVolume="Lås volym"
+LogViewer="Loggvisare"
+ShowOnStartup="Visa vid uppstart"
+OpenFile="Öppna fil"
 
 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å"
 
+ChromeOS.Title="Plattformen stöds inte"
+ChromeOS.Text="OBS verkar köras inuti en ChromeOS-behållare. Denna plattform stöds inte"
+
 DockCloseWarning.Title="Stäng flytande fönster"
 DockCloseWarning.Text="Du stängde precis ett flytande fönster. Om du vill visa det igen, använd Visa → Flytande fönster i menyfältet."
 
@@ -131,17 +138,15 @@
 BandwidthTest.Region.Asia="Asien"
 BandwidthTest.Region.Other="Övrigt"
 
-Basic.FirstStartup.RunWizard="Skulle du vilja köra den automatiska konfigurationsguiden? Du kan konfigurera dina inställningar manuellt genom att klicka på knappen Inställningar i huvudfönstret."
-Basic.FirstStartup.RunWizard.NoClicked="Om du ändrar dig kan du köra den automatiska konfigurationsguiden när som helst från verktygsmenyn."
-
 Basic.AutoConfig="Automatisk konfigurationsguide"
 Basic.AutoConfig.ApplySettings="Verkställ inställningar"
 Basic.AutoConfig.StartPage="Användningsinformation"
 Basic.AutoConfig.StartPage.SubTitle="Ange vad du vill använda programmet för"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimera för strömning, inspelning sekundärt"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Optimera endast för inspelning, jag kommer inte att strömma"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Jag kommer bara att använda den virtuella kameran"
 Basic.AutoConfig.VideoPage="Videoinställningar"
-Basic.AutoConfig.VideoPage.SubTitle="Ange önskade videoinställningar som du vill använda"
+Basic.AutoConfig.VideoPage.SubTitle="Ange videoinställningarna du vill använda"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Använd nuvarande (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Bildskärm %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Använd nuvarande (%1)"
@@ -183,6 +188,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Inspelningskodare"
 Basic.AutoConfig.TestPage.Result.Header="Programmet har bestämt att dessa uppskattade inställningar är de mest idealiska för dig:"
 Basic.AutoConfig.TestPage.Result.Footer="För att använda dessa inställningar, klicka på Verkställ inställningar. För att omkonfigurera guiden och försöka igen, klicka på Tillbaka. För att konfigurera inställningarna manuellt, klicka på Avbryt och öppna Inställningar."
+Basic.AutoConfig.Info="Autokonfigurationsguiden bestämmer de bästa inställningarna baserat på dina datorspecifikationer och din internethastighet."
+Basic.AutoConfig.RunAnytime="Detta kan köras när som helst via verktygsmenyn."
 
 Basic.Stats="Statistik"
 Basic.Stats.CPUUsage="Processoranvändning"
@@ -292,14 +299,15 @@
 Output.RecordError.Title="Inspelningsfel"
 Output.RecordError.Msg="Ett okänt fel uppstod vid inspelning."
 Output.RecordError.EncodeErrorMsg="Ett kodarfel uppstod under inspelning."
-Output.ReplayBuffer.NoHotkey.Title="Ingen angivet kortkommando!"
-Output.ReplayBuffer.NoHotkey.Msg="Inget kortkommando för att spara reprisbufferten har angivits. Ange kortkommandot \"Spara\" för att kunna spara reprisinspelningar."
 
 Output.BadPath.Title="Ogiltig sökväg"
 Output.BadPath.Text="Den angivna sökvägen för utmatningsfil är ogiltig. Kontrollera att dina inställningar är korrekta och att en giltig sökväg har angetts."
 
 LogReturnDialog="Loggfilen laddades upp utan problem."
+LogReturnDialog.Description="Din loggfil har laddats upp. Du kan nu dela webbadressen för felsökning eller support."
+LogReturnDialog.Description.Crash="Din kraschrapport har laddats upp. Du kan nu dela webbadressen för felsökning eller support."
 LogReturnDialog.CopyURL="Kopiera URL"
+LogReturnDialog.AnalyzeURL="Analysera"
 LogReturnDialog.ErrorUploadingLog="Ett fel uppstod när loggfilen skulle laddas upp"
 
 Remux.SourceFile="OBS Inspelning"
@@ -394,7 +402,7 @@
 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"
-Basic.PropertiesWindow.AddFiles="Lägg till Filer"
+Basic.PropertiesWindow.AddFiles="Lägg till filer"
 Basic.PropertiesWindow.AddDir="Lägg till mapp"
 Basic.PropertiesWindow.AddURL="Lägg till Sökväg/URL"
 Basic.PropertiesWindow.AddEditableListDir="Lägg till mapp i \"%1\""
@@ -463,6 +471,7 @@
 Basic.Main.StartReplayBuffer="Starta reprisbuffert"
 Basic.Main.SaveReplay="Spara repris"
 Basic.Main.StartStreaming="Börja strömma"
+Basic.Main.StartVirtualCam="Starta virtuell kamera"
 Basic.Main.StopRecording="Sluta spela in"
 Basic.Main.PauseRecording="Pausa inspelning"
 Basic.Main.UnpauseRecording="Återuppta inspelning"
@@ -472,6 +481,9 @@
 Basic.Main.StopStreaming="Sluta strömma"
 Basic.Main.StoppingStreaming="Slutar strömma..."
 Basic.Main.ForceStopStreaming="Sluta strömma (ignorera fördröjning)"
+Basic.Main.ShowContextBar="Visa verktygsfält för källor"
+Basic.Main.HideContextBar="Dölj verktygsfält för källor"
+Basic.Main.StopVirtualCam="Stoppa virtuell kamera"
 Basic.Main.Group="Grupp %1"
 Basic.Main.GroupItems="Gruppera markerade föremål"
 Basic.Main.Ungroup="Avgruppera"
@@ -527,7 +539,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Återställ gränssnitt"
 Basic.MainMenu.View.Docks.LockUI="Lås gränssnitt"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Anpassade flytande webbläsarfönster..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Listrutor"
+Basic.MainMenu.View.ListboxToolbars="Knappar för scen/källista"
+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"
@@ -566,7 +579,7 @@
 Basic.Settings.General="Allmänt"
 Basic.Settings.General.Theme=" Tema"
 Basic.Settings.General.Language="Språk"
-Basic.Settings.General.EnableAutoUpdates="Sök efter uppdateringar automatiskt vid start"
+Basic.Settings.General.EnableAutoUpdates="Sök efter uppdateringar automatiskt vid uppstart"
 Basic.Settings.General.OpenStatsOnStartup="Öppna statistikfönstret vid uppstart"
 Basic.Settings.General.WarnBeforeStartingStream="Visa bekräftelsedialog när ström startas"
 Basic.Settings.General.WarnBeforeStoppingStream="Visa bekräftelsedialog när ström stoppas"
@@ -584,7 +597,7 @@
 Basic.Settings.General.ReplayBufferWhileStreaming="Starta reprisbufferten automatiskt vid strömning"
 Basic.Settings.General.KeepReplayBufferStreamStops="Håll reprisbufferten aktiv när ström stoppas"
 Basic.Settings.General.SysTray="Systemfält"
-Basic.Settings.General.SysTrayWhenStarted="Minimera till meddelandefältet vid start"
+Basic.Settings.General.SysTrayWhenStarted="Minimera till meddelandefältet vid uppstart"
 Basic.Settings.General.SystemTrayHideMinimize="Minimera alltid till meddelandefältet i stället för aktivitetsfältet"
 Basic.Settings.General.SaveProjectors="Spara projektorer vid avslut"
 Basic.Settings.General.Preview="Förhandsvisning"
@@ -640,7 +653,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximalt minne (Megabyte)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Uppskattad minnesanvändning: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Kan inte uppskatta minnesanvändningen. Ange maximal minnesgräns."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(OBS: Se till att ange ett kortkommando för reprisbufferten i avsnittet för kortkommandon)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Filnamnsprefix för reprisbuffert"
 Basic.Settings.Output.ReplayBuffer.Suffix="Suffix"
 Basic.Settings.Output.Simple.SavePath="Inspelningssökväg"
@@ -701,7 +713,7 @@
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Standardformat"
 Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Kontainerformatsbeskrivning"
-Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Audio/Videokodning gissat från sökväg eller URL"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Ljud-/videoomkodare gissades från sökväg eller webbadress"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Standardkodare"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Inaktivera Kodare"
 Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videokodare"
@@ -710,7 +722,14 @@
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ljudkodar-inställningar (om något)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxerinställningar (om det finns)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervall för keyframes (bildrutor)"
-Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Visa alla kodekar (även de som eventuellt inte är kompatibla)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Visa alla omkodare (även de som eventuellt inte är kompatibla)"
+
+Screenshot="Utmatning för skärmdump"
+Screenshot.SourceHotkey="Vald källa för skärmdump"
+Screenshot.StudioProgram="Skärmdump (program)"
+Screenshot.Preview="Skärmdump (förhandsvisning)"
+Screenshot.Scene="Skärmdump (scen)"
+Screenshot.Source="Skärmdump (källa)"
 
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
@@ -750,10 +769,10 @@
 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, Mixer RTMP, Smashcast är några exempel på tjänster 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="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.Title="Aktivera surroundljud?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Är du säker på att du vill aktivera surroundljud?"
-Basic.Settings.Audio.Devices="Enheter"
+Basic.Settings.Audio.Devices="Globala ljudenheter"
 Basic.Settings.Audio.DesktopDevice="Skrivbordsljud"
 Basic.Settings.Audio.DesktopDevice2="Skrivbordsljud 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/extra ljud"
@@ -917,3 +936,16 @@
 Restart="Starta om"
 NeedsRestart="OBS Studio behöver startas om. Vill du starta om nu?"
 
+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"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ta-IN.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ta-IN.ini Changed

@@ -1,6 +1,5 @@
 
 Language="ஆங்கிலம்"
-Region="அமெரிக்கா"
 
 OK="சரி"
 Apply="அமல்படுத்து"
@@ -23,6 +22,7 @@
 Display="காட்சித்திரை"
 Name="பெயர்"
 Exit="வெளியேறு"
+Mixer="ஒலி மிக்சர்"
 Browse="உலாவு"
 Mono="ஒற்றை ஒலி"
 Stereo="பல ஒலி"
@@ -46,7 +46,7 @@
 Duplicate="நகல்"
 Enable="இயக்கு"
 DisableOSXVSync="OSX V ஒத்திசைவை முடக்கு"
-ResetOSXVSyncOnExit="V-ஒத்திசைவு வெளியேறுகையில் OSX மீட்டமை"
+ResetOSXVSyncOnExit="V-ஒத்திசைவு வெளியேறுகையில் macOS மீட்டமை"
 HighResourceUsage="குறியீட்டு சுமை அதிகமாக உள்ளது! வீடியோ அமைப்புகளைத் திருத்துவது அல்லது ஒரு வேகமான குறியீட்டு முன்னுரிமையைப் பயன்படுத்துவதைக் கருத்தில் கொள்ளவும்."
 Transition="மாற்றம்"
 QuickTransitions="விரைவான மாற்றங்கள்"
@@ -79,11 +79,18 @@
 VerticalLayout="செங்குத்து வடிவமைப்பு"
 Group="குழு"
 DoNotShowAgain="மீண்டும் காட்ட வேண்டாம்"
+Default="(இயல்புநிலை)"
+Calculating="கணிக்கிறது..."
+Fullscreen="முழுத்திரை"
+Windowed="சாளரபட்ட"
+Percent="சதவீதம்"
+LockVolume="ஒலியளவை பூட்டு"
 
 AlreadyRunning.Title="OBS ஏற்கனவே இயங்கிக்கொண்டிருக்கிறது"
 AlreadyRunning.Text="OBS ஏற்கனவே இயங்குகிறது! இதை தொடர நீங்கள் விரும்பவில்லை எனில், புதிய நிகழ்வை இயக்க முயற்சிக்கும் முன் OBS இன் எந்தவொரு நிகழ்வுகளையும் மூடவும். நீங்கள் கணினி தட்டில் OBS ஐ குறைத்து அமைத்திருந்தால், அது இன்னமும் இயங்கிக்கொண்டிருக்கிறதா என்பதைப் பார்க்கவும்."
 AlreadyRunning.LaunchAnyway="எப்படியும் தொடங்கு"
 
+
 DockCloseWarning.Title="நகரக்கூடிய சாளரத்தை மூடு"
 DockCloseWarning.Text="நீங்கள் ஒரு நகர்த்தக்கூடிய சாளரத்தை மூடியுள்ளீர்கள். நீங்கள் அதை மீண்டும் காண்பிக்க விரும்பினால், மெனு பட்டியில் காட்சி → டாக்ஸ் மெனுவைப் பயன்படுத்தவும்."
 
@@ -115,9 +122,6 @@
 BandwidthTest.Region.Asia="ஆசியா"
 BandwidthTest.Region.Other="மற்ற"
 
-Basic.FirstStartup.RunWizard="தானியங்கு உள்ளமைவு வழிகாட்டியை இயக்க விரும்புகிறீர்களா? நீங்கள் கைமுறையாக மேலும் உங்கள் அமைப்புகளை பிரதான சாளரத்தில் அமைப்புகள் பொத்தானை கிளிக் செய்வதன் மூலம் உள்ளமைக்கலாம்."
-Basic.FirstStartup.RunWizard.NoClicked="உங்கள் மனதை மாற்றினால், நீங்கள் தானியங்கு உள்ளமைவு வழிகாட்டி எந்த நேரத்திலும் மீண்டும் பட்டியலிருந்து கருவிகளை இயக்கலாம்."
-
 Basic.AutoConfig="தானியங்கு உள்ளமைவு வழிகாட்டி"
 Basic.AutoConfig.ApplySettings="அமைப்புகளைப் பயன்படுத்து"
 Basic.AutoConfig.StartPage="தகவல் பயன்பாடு"
@@ -125,7 +129,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="நேரலைக்கு உகந்ததாகக்கு, பதிவு இரண்டாம் நிலையாக"
 Basic.AutoConfig.StartPage.PrioritizeRecording="பதிவுக்கு மட்டும் உகந்ததாக்கு, நேரலை செய்ய மாட்டேன்"
 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)"
@@ -137,6 +140,7 @@
 Basic.AutoConfig.StreamPage.DisconnectAccount="கணக்கைத் துண்டிக்கவும்"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="கணக்கைத் துண்டிக்கவா?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="இந்த மாற்றம் உடனடியாக பொருந்தும். உங்கள் கணக்கு துண்டிக்க விரும்புகிறீர்களா?"
+Basic.AutoConfig.StreamPage.GetStreamKey="நேரலை குறியீட்டை பெறுக"
 Basic.AutoConfig.StreamPage.UseStreamKey="நேரலை குறியீட்டை பயன்படுத்தவும்"
 Basic.AutoConfig.StreamPage.Service="சேவை"
 Basic.AutoConfig.StreamPage.Service.ShowAll="அனைத்தும் காண்பி..."
@@ -183,6 +187,7 @@
 Basic.Stats.DroppedFrames="கைவிடப்பட்ட சட்டங்கள் (இணையம்)"
 Basic.Stats.MegabytesSent="மொத்த தகவல் வெளியீடு"
 Basic.Stats.Bitrate="Bit விகிதம்"
+Basic.Stats.ResetStats="புள்ளிவிவரங்களை மீட்டமை"
 
 ResetUIWarning.Title="UI மீட்டமைக்க விரும்புகிறீர்களா?"
 ResetUIWarning.Text="UI ஐ மீட்டமைப்பது கூடுதலான துறைகளை மறைக்கும். பார்வை மெனுவிலிருந்து இந்த டாக்ஸை நீங்கள் தெரிவு செய்ய வேண்டும் எனில் அவற்றை நீங்கள் மறைக்க வேண்டும். \n\n நீங்கள் UI ஐ மீட்டமைக்க விரும்புகிறீர்களா?"
@@ -232,6 +237,7 @@
 ConfirmStop.Title="அலை நிறுத்த?"
 ConfirmStop.Text="அலை நிறுத்த நீங்கள் உறுதியாக இருக்கிறீர்களா?"
 
+ConfirmStopRecord.Title="பதிவெடுப்பதை நிறுத்து?"
 
 
 ConfirmExit.Title="OBS ஐ வெளியேற்றவா?"
@@ -252,6 +258,7 @@
 Output.ConnectFail.Error="சேவையகத்துடன் இணைக்க முயற்சிக்கும் போது எதிர்பாராத பிழை ஏற்பட்டது. மேலும் தகவல்கள் பதிவு கோப்பில் உள்ளன."
 Output.ConnectFail.Disconnected="சேவையகத்திலிருந்து துண்டிக்கப்பட்டது."
 
+Output.StreamEncodeError.Title="குறியாக்கப் பிழை"
 
 Output.RecordFail.Title="பதிவு துவக்க இயலவில்லை"
 Output.RecordFail.Unsupported="வெளியீட்டு வடிவமைப்பு ஒன்று ஆதரிக்கப்படவில்லை அல்லது ஒன்றுக்கு மேற்பட்ட ஒலி தடங்கள் ஆதரிக்கவில்லை. தயவுசெய்து உங்கள் அமைப்புகளை சரிபார்த்து மீண்டும் முயற்சிக்கவும்."
@@ -259,13 +266,13 @@
 Output.RecordNoSpace.Msg="பதிவைத் தொடர போதுமான வட்டு இடம் இல்லை."
 Output.RecordError.Title="பதிவு பிழை"
 Output.RecordError.Msg="பதிவு செய்யும் போது ஒரு குறிப்பிடப்படாத பிழை ஏற்பட்டது."
-Output.ReplayBuffer.NoHotkey.Title="குறுக்குவிசை அமைப்பு இல்லை!"
 
 Output.BadPath.Title="தவறான கோப்பு பாதை"
 Output.BadPath.Text="கட்டமைக்கப்பட்ட கோப்பு வெளியீடு பாதை தவறானது. செல்லுபடியாகும் கோப்பு பாதை அமைக்கப்பட்டுள்ளதா என்பதை உறுதிப்படுத்த உங்கள் அமைப்புகளை சரிபார்க்கவும்."
 
 LogReturnDialog="பதிவு பதிவேற்றம் வெற்றி"
 LogReturnDialog.CopyURL="URL-ஐ நகலெடு"
+LogReturnDialog.AnalyzeURL="பகுப்பாய்வு"
 LogReturnDialog.ErrorUploadingLog="பதிவு கோப்பை பதிவேற்றுவதில் பிழை"
 
 Remux.SourceFile="OBS பதிவு"
@@ -300,6 +307,7 @@
 
 Basic.Main.PreviewConextMenu.Enable="முன்னோட்டம் இயக்கு"
 
+Basic.Main.Preview.Disable="முன்னோட்டத்தை முடக்கு"
 
 ScaleFiltering="அளவு வடிகட்டுதல்"
 ScaleFiltering.Point="புள்ளி"
@@ -427,6 +435,7 @@
 Basic.Main.StartReplayBuffer="மறுபிரதி தாங்கல் தொடங்கு"
 Basic.Main.StartStreaming="நேரலை தொடக்கம்"
 Basic.Main.StopRecording="பதிவெடுப்பதை நிறுத்து"
+Basic.Main.PauseRecording="பதிவை இடைநிறுத்து"
 Basic.Main.StoppingRecording="பதிவு நிறுத்துகிறது..."
 Basic.Main.StopReplayBuffer="மறுபிரதி தாங்கல் நிறுத்து"
 Basic.Main.StoppingReplayBuffer="மறுபிரதி தாங்கல் நிறுத்துகிறது..."
@@ -436,6 +445,8 @@
 Basic.Main.Group="குழு %1"
 Basic.Main.GroupItems="தேர்ந்தெடுத்த உருப்படிகளை குழுப்படுத்த"
 Basic.Main.Ungroup="குழு நீக்கம்"
+Basic.Main.GridMode="கட்டப் பயன்முறை"
+Basic.Main.ListMode="பட்டியல் பயன்முறை"
 
 Basic.MainMenu.File="கோப்பு (&F)"
 Basic.MainMenu.File.Export="ஏற்றுமதி (&E)"
@@ -483,7 +494,6 @@
 Basic.MainMenu.View.Docks="பாகங்கள்"
 Basic.MainMenu.View.Docks.ResetUI="UI மீட்டமை"
 Basic.MainMenu.View.Docks.LockUI="UI பூட்டு"
-Basic.MainMenu.View.Toolbars.Listboxes="பட்டியல் பெட்டி (&L)"
 Basic.MainMenu.View.SceneTransitions="காட்சி மாற்றங்கள் (&C)"
 Basic.MainMenu.View.StatusBar="நிலை பட்டை (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="முழுத்திரை இடைமுகம்"
@@ -529,6 +539,7 @@
 Basic.Settings.General.ProjectorAlwaysOnTop="பிரதிபலிப்பானை எப்போதும் மேலே வைக்கவும்"
 Basic.Settings.General.SysTray="கணினி தட்டு"
 Basic.Settings.General.SysTrayWhenStarted="தொடங்கிய போது கணினி தட்டில் சிறிதாக்கு"
+Basic.Settings.General.Preview="முன்னோட்டம்"
 
 Basic.Settings.Stream="நேரலை"
 Basic.Settings.Stream.StreamType="நேரலை வகை"
@@ -536,6 +547,8 @@
 Basic.Settings.Stream.Custom.Username="பயனர் பெயர்"
 Basic.Settings.Stream.Custom.Password="கடவுச்சொல்"
 Basic.Settings.Stream.BandwidthTestMode="அலைவரிசை சோதனை பயன்முறையை இயக்கு"
+Basic.Settings.Stream.TTVAddon.None="எதுவுமில்லை"
+Basic.Settings.Stream.StreamSettingsWarning="அமைப்புகளைத் திற"
 
 Basic.Settings.Output="வெளியீடு"
 Basic.Settings.Output.Format="பதிவு வடிவமைப்பு"
@@ -555,6 +568,8 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="வன்பொருள் (QSV)"
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD="வன்பொருள் (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="வன்பொருள் (NVENC)"
+Basic.Settings.Output.VideoBitrate="காணொளி பிட்விகிதம்"
+Basic.Settings.Output.AudioBitrate="ஒலி பிட்விகிதம்"
 Basic.Settings.Output.MaxRetries="அதிகபட்ச முயற்சிகள்"
 Basic.Settings.Output.Advanced="மேம்பட்ட குறியாக்கி அமைப்புகளை இயக்கு"
 Basic.Settings.Output.CustomEncoderSettings="விருப்ப குறியாக்கி அமைப்புகள்"
@@ -595,32 +610,45 @@
 
 
 
+
 Basic.Settings.Video="காணொளி"
 Basic.Settings.Video.BaseResolution="அடிப்படை (சுற்றளவு) தெளிவுத்திறன்"
 Basic.Settings.Video.ScaledResolution="(அளவிட்ட) வெளியீட்டு தெளிவுத்திறன்"
+Basic.Settings.Video.DisableAeroWindows="Aeroஐ முடக்கு (Windows மட்டும்)"
 Basic.Settings.Video.FPS="FPS"
 Basic.Settings.Video.InvalidResolution="தவறான தெளிவுத்திறன் மதிப்பு. [width]x[height] இருக்க வேண்டும் (அதாவது 1920 x 1080)"
+Basic.Settings.Video.DisableAero="Aeroஐ முடக்கு"
 
 
 Basic.Settings.Audio="ஒலி"
 Basic.Settings.Audio.SampleRate="மாதிரி விகிதம்"
 Basic.Settings.Audio.MeterDecayRate.Fast="வேகமாக"
+Basic.Settings.Audio.DesktopDevice="திரைப்பலக ஒலி"
+Basic.Settings.Audio.DesktopDevice2="திரைப்பலக ஒலி 2"
 Basic.Settings.Audio.Disabled="முடக்கப்பட்டது"
 
 Basic.Settings.Advanced="மேம்பட்டவை"
+Basic.Settings.Advanced.General.ProcessPriority="செயலாக்க முன்னுரிமை"
 Basic.Settings.Advanced.General.ProcessPriority.High="உயர்"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="இயல்பு"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="செயலின்றி"
 Basic.Settings.Advanced.Video.ColorFormat="வண்ண வடிவமைப்பு"
 Basic.Settings.Advanced.Video.ColorRange.Full="முழு"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="இயல்புநிலை"
+Basic.Settings.Advanced.StreamDelay.Duration="கால அளவு"
+Basic.Settings.Advanced.Network="பிணையம்"
+Basic.Settings.Advanced.AutoRemux.MP4="(mkv ஆகப் பதிவிடு)"
 
+Basic.AdvAudio="மேம்பட்ட ஒலி பண்புகள்"
 Basic.AdvAudio.Name="பெயர்"
+Basic.AdvAudio.Volume="ஒலியளவு"
+Basic.AdvAudio.Mono="ஒற்றை ஒலி"
 Basic.AdvAudio.Balance="சமநிலை"
 
 Basic.Settings.Hotkeys.Filter="வடிகட்டிகள்"
 
 
+Basic.SystemTray.Show="காட்டு"
 Basic.SystemTray.Hide="மறை"
 
 
@@ -631,22 +659,53 @@
 Hotkeys.PageUp="பக்கத்தில் மேலே"
 Hotkeys.PageDown="பக்கத்தில் கீழே"
 Hotkeys.NumLock="எண் பூட்டு"
+Hotkeys.Print="அச்சிடு"
+Hotkeys.Pause="இடைநிறுத்து"
+Hotkeys.Left="இடது"
+Hotkeys.Right="வலது"
+Hotkeys.Up="மேல்"
+Hotkeys.Down="கீழ்"
+Hotkeys.Windows="Windows"
+Hotkeys.Super="Super"
 Hotkeys.Menu="பட்டியல்"
 Hotkeys.Space="இடைவெளி"
 Hotkeys.NumpadNum="எண் திண்டு %1"
 
+Mute="ஒலியடக்கு"
+Unmute="ஒலிதடைநீக்கு"
 
 
+OutputWarnings.NoTracksSelected="குறைந்தப் பட்சம் ஒரு தடத்தை நீங்கள் தேர்ந்தெடுக்க வேண்டும்"
 
 
 
+ChangeBG="வண்ணத்தை அமை"
+CustomColor="தனிப்பயன் நிறம்"
 
+BrowserSource.EnableHardwareAcceleration="Browser Source மென்பொருள் விரைவுபடுத்துதலை இயக்கு"
 
+About="பற்றி"
+About.Info="OBS Studio ஒரு இலவச மற்றும் திற மூல காணொளி பதிவிடுதல் மற்றும் நேரலை ஸ்ட்ரீமிங் மென்பொருள்."
+About.Donate="ஒரு பங்களிப்பைச் செய்க"
+About.GetInvolved="உங்களை ஈடுபடுத்திக் கொள்ளுங்கள்"
+About.Authors="ஆசிரியர்கள்"
+About.License="உரிமம்"
+About.Contribute="OBS திட்டப்பணியை ஆதரவி"
 
+AddUrl.Title="URL மூலம் மூலத்தைச் சேர்"
+AddUrl.Text="நீங்கள் ஒரு URLஐ OBSஇற்குள் இழுத்திருக்கிறீர்கள். இது இந்த இணைப்பைத் தானாக ஒரு மூலமாகச் சேர்க்கும். தொடரவா?"
+AddUrl.Text.Url="URL: %1"
 
+ResizeOutputSizeOfSource="வெளியீட்டை மறு அளவிடு (மூல அளவு)"
 ResizeOutputSizeOfSource.Text="அடிப்படை மற்றும் வெளியீடு தெளிவுத்திறன்கள் தற்போதைய மூலத்தின் அளவிற்கு மாற்றப்படும்."
+ResizeOutputSizeOfSource.Continue="தொடர விரும்புகிறீர்களா?"
+
+
+Importer.Path="தொகுப்புப் பாதை"
+Importer.Program="கண்டறியப்பட்ட செயலி"
 
 
+NeedsRestart="OBS Studio மறுதொடங்க வேண்டும். இப்போது மறுதொடக்கம் செய்ய விரும்புகிறீர்களா?"

obs-studio-25.0.8.tar.xz/UI/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/th-TH.ini Changed

@@ -1,6 +1,5 @@
 
 Language="ไทย"
-Region="ประเทศไทย"
 
 OK="ตกลง"
 Apply="นำไปใช้"
@@ -23,6 +22,7 @@
 Display="แสดงผล"
 Name="ชื่อ"
 Exit="ออก"
+Mixer="ตั้งค่าเสียง"
 Browse="เปิดหา"
 Mono="โมโน"
 Stereo="สเตอริโอ"
@@ -46,11 +46,12 @@
 New="ใหม่"
 Duplicate="ทำสำเนา"
 Enable="เปิดใช้งาน"
-DisableOSXVSync="ไม่ใช้ OSX V-Sync"
-ResetOSXVSyncOnExit="คืนค่า OSX V-Sync เมื่อออก"
+DisableOSXVSync="ไม่ใช้ macOS V-Sync"
+ResetOSXVSyncOnExit="คืนค่า macOS V-Sync เมื่อออก"
 HighResourceUsage="การเข้ารหัสเกินขีดจำกัด! โปรดปรับลดการกำหนดค่าวีดีโอ หรือใช้รูปแบบการเข้ารหัสอื่นที่เร็วขึ้น"
 Transition="เปลี่ยนภาพ"
 QuickTransitions="ช่วงการเปลี่ยนภาพอย่างรวดเร็ว"
+FadeToBlack="เปลี่ยนเป็นสีดำ"
 Left="ซ้าย"
 Right="ขวา"
 Top="บน"
@@ -83,18 +84,26 @@
 Calculating="กำลังคำนวณ..."
 Fullscreen="เต็มจอ"
 Windowed="หน้าต่าง"
+Percent="เปอร์เซ็นต์"
 AspectRatio="อัตราส่วนภาพ <b>%1:%2</b>"
+LockVolume="ล็อค ระดับเสียง"
 
 AlreadyRunning.Title="OBS กำลังทำงานอยู่"
+AlreadyRunning.Text="โปรแกรม OBS กำลังทำงานอยู่ หากคุณไม่ต้องการดำเนินการดังกล่าวโปรดปิดโปรแกรม OBS ที่มีอยู่ ก่อนที่จะพยายามเรียกใช้อินสแตนซ์ใหม่ หากคุณตั้งค่าโปรแกรม OBS ให้ย่อเล็กสุด ให้ดูที่แถบบาร์ของระบบว่าโปรแกรมยังคงเปิดยังใช้งานอยู่หรือไม่"
 AlreadyRunning.LaunchAnyway="ยังไงก็จะเปิด"
 
+
 DockCloseWarning.Title="ปิดหน้าต่างเครื่องมือ"
 DockCloseWarning.Text="คุณกำลังจะปิดหน้าต่างเครื่องมือ ถ้าคุณต้องการให้มันแสดงอีกครั้ง ให้ไปที่แถบเมนูแล้วเลือกเมนู มุมมอง → หน้าต่างเครื่องมือ"
 
+ExtraBrowsers="ถาดงานแบบตั้งค่าเอง"
+ExtraBrowsers.Info="เพิ่ม แถบงานโดยตั้งชื่อ และ เพิ่ม URL จากนั้นคลิก นำไปใช้ หรือ ปิด เพื่อทำการเปิดแถบงาน คุณสามารถเพิ่มหรือลบ แถบงานได้ตลอดเวลา"
+ExtraBrowsers.DockName="ขนาดแถบรายการโปรด"
 
 Auth.Authing.Title="การตรวจสอบสิทธิ์"
 Auth.Authing.Text="กำลังตรวจสอบสิทธิ์ไปยัง %1, โปรดรอสักครู่..."
 Auth.AuthFailure.Title="การตรวจสอบล้มเหลว"
+Auth.AuthFailure.Text="การตรวจสอบความถูกต้องผิดพลาด จาก"
 Auth.InvalidScope.Title="จำเป็นต้องมีการตรวจสอบสิทธิ์"
 Auth.LoadingChannel.Title="กำลังโหลดรายละเอียดของช่อง..."
 Auth.LoadingChannel.Text="กำลังโหลดรายละเอียดของช่องสำหรับ %1, โปรดรอสักครู่..."
@@ -103,6 +112,8 @@
 Auth.Chat="ห้องสนทนา"
 Auth.StreamInfo="รายละเอียดการสตรีม"
 TwitchAuth.Stats="สถิติ Twitch"
+TwitchAuth.TwoFactorFail.Title="ไม่สามารถสืบค้น คีย์สตรีม"
+RestreamAuth.Channels="สตรีมช่องอีกครั้ง"
 
 Copy.Filters="คัดลอก Filters"
 Paste.Filters="วาง Filters"
@@ -116,9 +127,6 @@
 BandwidthTest.Region.Asia="เอเชีย"
 BandwidthTest.Region.Other="อื่นๆ"
 
-Basic.FirstStartup.RunWizard="คุณต้องการเรียกใช้ตัวช่วยสร้างการกำหนดค่าอัตโนมัติ นอกจากนี้คุณด้วยตนเองสามารถกำหนดค่าการตั้งค่า โดยคลิกปุ่มการตั้งค่าในหน้าต่างหลัก"
-Basic.FirstStartup.RunWizard.NoClicked="ถ้าคุณเปลี่ยนใจ คุณสามารถเรียกใช้ตัวช่วยการกำหนดค่าอัตโนมัติได้ตลอดเวลาจากแถบเมนู เครื่องมือ"
-
 Basic.AutoConfig="การปรับแต่งอัตโนมัติ"
 Basic.AutoConfig.ApplySettings="ใช้การตั้งค่า"
 Basic.AutoConfig.StartPage="ข้อมูลการใช้งาน"
@@ -126,7 +134,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="เพิ่มประสิทธิภาพสำหรับการสตรีม บันทึกเป็นรอง"
 Basic.AutoConfig.StartPage.PrioritizeRecording="เพิ่มประสิทธิภาพสำหรับการบันทึก ฉันจะไม่สามารถส่งข้อมูล Steam"
 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)"
@@ -135,9 +142,11 @@
 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.UseStreamKey="ใช้รหัสสตรีม"
 Basic.AutoConfig.StreamPage.Service="บริการ"
 Basic.AutoConfig.StreamPage.Service.ShowAll="แสดงทั้งหมด..."
@@ -147,15 +156,18 @@
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(เชื่อมโยง)"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="ทดสอบการประเมินค่าบิตเรตกับแบนด์วิดท์ (อาจใช้เวลาสักพัก)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="กำหนดการเข้ารหัสด้วยฮาร์ดแวร์"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="กำลังทดสอบที่ %1x%2 %3 FPS..."
 
 Basic.Stats="สถานะ"
 Basic.Stats.CPUUsage="การใช้ CPU"
 Basic.Stats.Output.Stream="สตรีม"
 Basic.Stats.Status="สถานะ"
+Basic.Stats.Status.Recording="กำลังบันทึก"
 Basic.Stats.Status.Live="ออกอากาศ"
 Basic.Stats.Status.Reconnecting="กำลังเชื่อมต่อใหม่"
 Basic.Stats.Status.Inactive="ไม่ใช้งาน"
 Basic.Stats.Bitrate="บิตเรต"
+Basic.Stats.DiskFullIn="พื้นที่จัดเก็บเต็ม"
 
 
 Updater.Title="มีการอัปเดตใหม่"
@@ -211,7 +223,6 @@
 
 Output.RecordNoSpace.Title="พื้นที่เก็บข้อมูลไม่เพียงพอ"
 Output.RecordError.Title="บันทึกข้อผิดพลาด"
-Output.ReplayBuffer.NoHotkey.Title="ไม่มีการตั้งค่าคีย์ลัด"
 
 Output.BadPath.Title="เส้นทางของแฟ้มไม่ถูกต้อง"
 
@@ -220,6 +231,8 @@
 LogReturnDialog.ErrorUploadingLog="มีข้อผิดพลาดในการอัปโหลด Log File"
 
 
+UpdateAvailable="มีอัปเดตใหม่พร้อมใช้งาน"
+UpdateAvailable.Text="เวอร์ชั่น %1.%2.%3 พร้อมใช้งานแล้ว <a href='%4'>คลิกที่นี่เพื่อดาวน์โหลด</a>"
 
 
 Basic.Scene="ฉาก"
@@ -267,6 +280,7 @@
 
 
 Basic.Main.Scenes="ฉาก"
+Basic.Main.Sources="แหล่งสัญญาณ"
 Basic.Main.Connecting="กำลังเชื่อมต่อ..."
 Basic.Main.StartRecording="เริ่มบันทึก"
 Basic.Main.StartStreaming="เริ่มสตรีมมิ่ง"
@@ -313,6 +327,7 @@
 
 
 
+
 Basic.Settings.Video="วีดีโอ"
 Basic.Settings.Video.DisableAeroWindows="ปิดการใช้งาน Aero (เฉพาะ Windows เท่านั้น)"
 Basic.Settings.Video.FPS="FPS"
@@ -357,3 +372,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/tl-PH.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/tl-PH.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Ingles"
-Region="Estados Unidos"
 
 OK="OK"
 Apply="Gamitin"
@@ -46,8 +45,8 @@
 New="Bago"
 Duplicate="Kahalintulad"
 Enable="I-enable"
-DisableOSXVSync="I-disable ang OSX V-Sync"
-ResetOSXVSyncOnExit="I-set muli ang OSX V-Sync sa Exit"
+DisableOSXVSync="I-disable ang macOS V-Sync"
+ResetOSXVSyncOnExit="I-set muli ang macOS V-Sync sa Exit"
 HighResourceUsage="Labis na ang karga sa pag-eencode! Pagisipan ang pagpapababa ng mga video setting o ang pag-gamit ng mas mabilis na encoding preset."
 Transition="Transisyon"
 QuickTransitions="Mabilis na mga Transisyon"
@@ -85,6 +84,7 @@
 
 
 
+
 Copy.Filters="Kopyahin ang mga Panala"
 Paste.Filters="I-paste ang mga Panala"
 
@@ -95,9 +95,6 @@
 BandwidthTest.Region.Asia="Asya"
 BandwidthTest.Region.Other="Iba pa"
 
-Basic.FirstStartup.RunWizard="Nais mo bang patakbuhin ang auto-configuration wizard? Maaari mo ring i-configure ang iyong mga setting ng mano-mano sa pamamagitan ng pagpindot ng Settings na button sa pangunahing window."
-Basic.FirstStartup.RunWizard.NoClicked="Kung magbabago ang iyong isip, maaari mong patakbuhin ang auto-configuration wizard sa anumang oras mula muli sa Tools na menu."
-
 Basic.AutoConfig="Auto-Configuration Wizard"
 Basic.AutoConfig.ApplySettings="Gamitin ang mga Setting"
 Basic.AutoConfig.StartPage="Impormasyon ukol sa Paggamit"
@@ -105,7 +102,6 @@
 Basic.AutoConfig.StartPage.PrioritizeStreaming="I-optimize para sa pag-stream, pangalawa lamang pag-rerekord"
 Basic.AutoConfig.StartPage.PrioritizeRecording="I-optimize para lamang sa pag-rerekord, Hindi ako mag-iistream"
 Basic.AutoConfig.VideoPage="Mga Setting sa Video"
-Basic.AutoConfig.VideoPage.SubTitle="Tukuyin ang mga setting ng video na gusto mong gamitin"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Gamitin ang Pangkasalukuyang (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Ipakita ang %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Gamitin ang Pangkasalukuyang (%1)"
@@ -234,8 +230,6 @@
 Output.RecordNoSpace.Msg="Hindi sapat ang espasyo sa disk upang magpatuloy sa pag-rerekord."
 Output.RecordError.Title="Error sa Pag-rerekord"
 Output.RecordError.Msg="Isang hindi matukoy na error ang naganap habang nag-rerekord."
-Output.ReplayBuffer.NoHotkey.Title="Walang set ng hotkey!"
-Output.ReplayBuffer.NoHotkey.Msg="Walang naka-save na hotkey set para sa replay buffer. Mangyari lamang magtalaga ng \"Save\" hotkey na gagamitin para sa pag-save ng mga replay recording."
 
 Output.BadPath.Title="Maling File Path"
 Output.BadPath.Text="Ang na-configure na output path ay hindi wasto. Mangyari lamang tingnan ang iyong mga setting upang makumpirma na isang balidong file path ay nakatalaga."
@@ -448,7 +442,6 @@
 Basic.MainMenu.View.Docks="Mga Dock"
 Basic.MainMenu.View.Docks.ResetUI="I-set muli ang UI"
 Basic.MainMenu.View.Docks.LockUI="I-lock UI"
-Basic.MainMenu.View.Toolbars.Listboxes="Mga &Listbox"
 Basic.MainMenu.View.SceneTransitions="Mga Transisyon ng S&cene"
 Basic.MainMenu.View.StatusBar="&Status Bar"
 Basic.MainMenu.View.Fullscreen.Interface="Interface gamit ang buong screen"
@@ -522,7 +515,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Pinakamataas na Memorya (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Tantiyang gamit sa memorya: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Hindi matantiya ang gamit sa memorya. Mangyari lamang mag-takda ng pinakamataas na limitasyon sa memorya."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Tandaan: Siguruhing nakapagtakda ka ng hotkey para sa replay buffer sa hotkeys section)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Panlapi para Filename ng Replay Buffer"
 Basic.Settings.Output.ReplayBuffer.Suffix="Hulapi"
 Basic.Settings.Output.Simple.SavePath="Landas ng Recording"
@@ -593,6 +585,7 @@
 
 
 
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video Adapter"
 Basic.Settings.Video.BaseResolution="Resolusyon ng Base (Kanbas)"
@@ -621,7 +614,6 @@
 Basic.Settings.Audio.MeterDecayRate.Medium="Medium (Type I PPM)"
 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="Kung nagsi-stream, tingnan kung ang streaming service ay sinusuportahan ang parehong surround sound ingest pat ang surround sound playback. Ang Facebook 360 Live, Mixer RTMP, Smashcast ay mga halimbawa kung saan ang surround sound ay sinusuportahan ng buo. Kahit na ang Facebook Live at YouTube live ay parehong tumatanggap ng surround ingest, ang Facebook Live ay nagda-downmix sa stereo, at ang YouTube Live ay nagpapakita lamang ng dalawang channel. \n\nAng OBS audio na mga filter ay akma sa surround sound, pero ang suporta sa VST plugin ay hindi garantisado."
 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"
@@ -727,3 +719,5 @@
 
 
 
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/tr-TR.ini Changed

@@ -1,8 +1,7 @@
 
 Language="Türkçe"
-Region="Türkiye"
 
-OK="TAMAM"
+OK="Tamam"
 Apply="Uygula"
 Cancel="İptal"
 Close="Kapat"
@@ -23,7 +22,7 @@
 Display="Ekran"
 Name="İsim"
 Exit="Çıkış"
-Mixer="Ses Düzenleyici"
+Mixer="Ses Karıştırıcı"
 Browse="Gözat"
 Mono="Mono"
 Stereo="Stereo"
@@ -38,8 +37,9 @@
 SourceWindow="Pencereli Projektör (Kaynak)"
 MultiviewProjector="Çoklu Görüntü (Tam ekran)"
 MultiviewWindowed="Çoklu görüntü (Pencere)"
+ResizeProjectorWindowToContent="Pencereyi içeriğe sığdır"
 Clear="Temizle"
-Revert="Eski Haline Döndür"
+Revert="Geri Al"
 Show="Göster"
 Hide="Gizle"
 UnhideAll="Tümünü Göster"
@@ -47,7 +47,7 @@
 New="Yeni"
 Duplicate="Çoğalt"
 Enable="Etkinleştir"
-DisableOSXVSync="OSX V-Sync'i Devre Dışı Bırak"
+DisableOSXVSync="macOS V-Sync'i Devre Dışı Bırak"
 ResetOSXVSyncOnExit="OSX V-Sync'i Çıkışta Sıfırla"
 HighResourceUsage="Kodlama aşırı yüklendi! Video ayarlarını kapatmayı veya daha hızlı bir kodlama ön ayarını kullanmayı düşünün."
 Transition="Geçiş"
@@ -73,7 +73,7 @@
 Next="İleri"
 Back="Geri"
 Defaults="Varsayılanlar"
-HideMixer="Karıştırıcıda gizle"
+HideMixer="Karıştırıcıda Gizle"
 TransitionOverride="Geçişi Etkisiz Kıl"
 None="Hiçbiri"
 StudioMode.Preview="Önizleme"
@@ -87,13 +87,21 @@
 Fullscreen="Tam Ekran"
 Windowed="Pencereli"
 Percent="Yüzde"
+RefreshBrowser="Yenile"
 AspectRatio="En-Boy Oranı <b>%1:%2</b>"
 LockVolume="Ses Düzeyini Kilitle"
+LogViewer="Günlük Görüntüleyici"
+ShowOnStartup="Başlangıçta göster"
+OpenFile="Dosya aç"
+AddValue="%1 Ekle"
 
 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"
 
+ChromeOS.Title="Desteklenmeyen Platform"
+ChromeOS.Text="OBS ChromeOS konteyneri içinde çalışıyor gibi görünüyor. Bu platform desteklenmiyor"
+
 DockCloseWarning.Title="Yuvalanabilir Pencere Kapatma"
 DockCloseWarning.Text="Az önce yuvalanabilir bir pencere kapattınız. Eğer tekrardan göstermek istiyorsanız, Menü çubuğundan Görüntüle → Paneller menüsünü kullanın."
 
@@ -131,15 +139,13 @@
 BandwidthTest.Region.Asia="Asya"
 BandwidthTest.Region.Other="Diğer"
 
-Basic.FirstStartup.RunWizard="Otomatik yapılandırma sihirbazını çalıştırmak istiyor musunuz? Ana penceredeki Ayarlar düğmesine tıklayarak ayarlarınızı elle de yapılandırabilirsiniz."
-Basic.FirstStartup.RunWizard.NoClicked="Fikrinizi değiştirirseniz, otomatik yapılandırma sihirbazını istediğiniz zaman Araçlar menüsünden yeniden çalıştırabilirsiniz."
-
 Basic.AutoConfig="Otomatik Yapılandırma Sihirbazı"
 Basic.AutoConfig.ApplySettings="Ayarları Uygula"
 Basic.AutoConfig.StartPage="Kullanım Bilgileri"
 Basic.AutoConfig.StartPage.SubTitle="Programı ne için kullanmak istediğinizi belirtin"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Yayın için en iyi hale getir, kayıt ikinci sırada"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Sadece kayıt için en iyi hale getir, yayın yapmayacağım"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Sadece sanal kamerayı kullanacağım"
 Basic.AutoConfig.VideoPage="Video Ayarları"
 Basic.AutoConfig.VideoPage.SubTitle="Kullanmak istediğiniz video ayarlarını belirtin"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Şimdikini Kullan (%1x%2)"
@@ -166,7 +172,7 @@
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Donanım kodlamayı tercih et"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Donanım Kodlama çoğu CPU kullanımını ortadan kaldırır, ancak aynı kalite düzeyini elde etmek için daha fazla bit hızı gerektirebilir."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Yayın uyarısı"
-Basic.AutoConfig.StreamPage.StreamWarning.Text="Bant genişliği testi kanalınıza ses olmayan rastlantısallaştırılmış video veri yayını yapmak üzere. Yapabiliyorsanız, test bitene kadar geçici bir süre yayınların videosunu kaydetmeyi kapatmanız ve yayını gizli olarak ayarlamanız önerilir. Devam edilsin mi?"
+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ı"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Kayıt Kodlayıcı"
 Basic.AutoConfig.TestPage.Result.Header="Program tahmin edilen bu ayarların sizin için en uygunu olduğunu belirledi:"
 Basic.AutoConfig.TestPage.Result.Footer="Bu ayarları kullanmak için, Ayarları Uygula'ya tıklayın. Sihirbazı yeniden yapılandırmak ve denemek için Geri'ye tıklayın. Ayarları kendiniz elle yapılandırmak için İptal'e tıklayın ve Ayarlar'ı açın."
+Basic.AutoConfig.Info="Otomatik yapılandırma sihirbazı, bilgisayar özellikleriniz ve internet hızınıza göre en iyi ayarlara karar verecektir."
+Basic.AutoConfig.RunAnytime="Bu, Araçlar menüsüne gidilerek herhangi bir zaman çalıştırılabilir."
 
 Basic.Stats="İstatistikler"
 Basic.Stats.CPUUsage="İşlemci Kullanımı"
@@ -292,14 +300,15 @@
 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.ReplayBuffer.NoHotkey.Title="Kısayol tuşu ayarlanmadı!"
-Output.ReplayBuffer.NoHotkey.Msg="Yeniden oynatma arabelleği için ayarlı bir kısayol tuşu yok. Lütfen yeniden oynatma kayıtlarını kaydetmek için \"Kaydet\" kısayol tuşunu ayarlayın."
 
 Output.BadPath.Title="Geçersiz Dosya Dizini"
 Output.BadPath.Text="Ayarlanan dosya kayıt yolu geçersiz. Lütfen ayarlarınızı kontrol ederek geçerli bir dosya yolunun girilmiş olduğundan emin olunuz."
 
 LogReturnDialog="Günlük Dosyası Başarıyla Karşıya Yüklendi"
+LogReturnDialog.Description="Günlük dosyanız yüklendi. Artık URL'yi hata ayıklama ya da destek amacıyla paylaşabilirsiniz."
+LogReturnDialog.Description.Crash="Çökme raporunuz yüklendi. Artık URL'yi hata ayıklama amacıyla paylaşabilirsiniz."
 LogReturnDialog.CopyURL="URL'yi Kopyala"
+LogReturnDialog.AnalyzeURL="Analiz Et"
 LogReturnDialog.ErrorUploadingLog="Günlük dosyası yüklenirken hata oluştu"
 
 Remux.SourceFile="OBS Kaydı"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="Tekrar Oynatma Arabelleğini Başlat"
 Basic.Main.SaveReplay="Yeniden Oynatmayı Kaydet"
 Basic.Main.StartStreaming="Yayını Başlat"
+Basic.Main.StartVirtualCam="Sanal Kamerayı Başlat"
 Basic.Main.StopRecording="Kaydı Durdur"
 Basic.Main.PauseRecording="Kaydı Duraklat"
 Basic.Main.UnpauseRecording="Kaydı Devam Ettir"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="Yayını Durdur"
 Basic.Main.StoppingStreaming="Canlı Yayın Durduruluyor..."
 Basic.Main.ForceStopStreaming="Yayını Durdur (gecikmeyi yoksay)"
+Basic.Main.ShowContextBar="Kaynak menüsünü göster"
+Basic.Main.HideContextBar="Kaynak menüsünü kapat"
+Basic.Main.StopVirtualCam="Sanal Kamerayı Durdur"
 Basic.Main.Group="Grup %1"
 Basic.Main.GroupItems="Seçilen Ögeleri Grupla"
 Basic.Main.Ungroup="Grubu Çöz"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="Arayüzü Sıfırla"
 Basic.MainMenu.View.Docks.LockUI="Arayüzü Kilitle"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Özel Tarayıcı Yuvaları..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Liste Kutuları"
+Basic.MainMenu.View.ListboxToolbars="Sahne/Kaynak Liste Düğmeleri"
+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)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maksimum Bellek (Megabayt)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Tahmini bellek kullanımı: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Bellek kullanımını tahmin edemezsin. Lütfen maksimum bellek sınırını ayarlayın."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Not: kısayol tuşları bölümünde yeniden oynatma ara belleği için kısayol tuşu ayarladığınızdan emin olun)"
 Basic.Settings.Output.ReplayBuffer.Prefix="Tekrar Oynatma Arabelleği Dosya Adı Ön Eki"
 Basic.Settings.Output.ReplayBuffer.Suffix="Son Eki"
 Basic.Settings.Output.Simple.SavePath="Kayıt Yolu"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Anahtar Kare Aralığı (kare)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Tüm kodekleri göster (potansiyel olarak uyumsuz olsa bile)"
 
+Screenshot="Ekran Görüntüsü Çıktısı"
+Screenshot.SourceHotkey="Seçili Ekran Görüntüsü Kaynağı"
+Screenshot.StudioProgram="Ekran Görüntüsü (Program)"
+Screenshot.Preview="Ekran Görüntüsü (Önizleme)"
+Screenshot.Scene="Ekran Görüntüsü (Sahne)"
+Screenshot.Source="Ekran Görüntüsü (Kaynak)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z"
 
 FilenameFormatting.TT="%CCYY	Yıl, dört hane\n%YY		Yıl, son iki hane (00-99)\n%MM		Ay rakamla (01-12)\n%DD		Ayın günü, önü-sıfırlı (01-31)\n%hh		Saat 24s formatlı (00-23)\n%mm		Dakika (00-59)\n%ss		Saniye (00-61)\n%%		A % sign\n%a		Kısaltılmış gün adı\n%A		Tam gün adı\n%b		Kısaltılmış ay adı\n%B		Tam ay adı\n%d		Ayın günü, önü-sıfırlı (01-31)\n%H		Saat 24s formatlı (00-23)\n%I		Saat 12s formatlı (01-12)\n%m		Ay rakamla (01-12)\n%M		Dakika (00-59)\n%p		AM veya PM belirteci\n%S		Saniye (00-61)\n%y		Yıl, son iki hane (00-99)\n%Y		Yıl\n%z		UTC'ye göre ISO 8601 farkı veya zaman dilimi\n		adı veya kısaltması\n%Z		Zaman dilimi adı veya kısaltması\n"
@@ -750,10 +770,10 @@
 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, Karıştırıcı RTMP, Smashcast, surround sesin tam desteklendiği örneklerdir. 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="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.Title="Surround ses etkinleştirilsin mi?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Surround sesi etkinleştirmek istediğinize emin misiniz?"
-Basic.Settings.Audio.Devices="Cihazlar"
+Basic.Settings.Audio.Devices="Global Ses Cihazları"
 Basic.Settings.Audio.DesktopDevice="Masaüstü Sesi"
 Basic.Settings.Audio.DesktopDevice2="Masaüstü Sesi 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/Yardımcı Ses"
@@ -917,3 +937,16 @@
 Restart="Yeniden Başlat"
 NeedsRestart="OBS Studio'nun yeniden başlatılması gerekiyor. Şimdi 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'ı"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/uk-UA.ini Changed

@@ -1,14 +1,13 @@
 
 Language="Українська"
-Region="Україна"
 
-OK="Так"
+OK="OK"
 Apply="Застосувати"
 Cancel="Скасувати"
 Close="Закрити"
 Save="Зберегти"
 Discard="Відхилити"
-Disable="Вимкнено"
+Disable="Вимкнуто"
 Yes="Так"
 No="Ні"
 Add="Додати"
@@ -20,26 +19,27 @@
 MoveUp="Вище"
 MoveDown="Нижче"
 Settings="Налаштування"
-Display="Екран"
-Name="Ім'я"
+Display="Дисплей"
+Name="Назва"
 Exit="Вихід"
-Mixer="Мікшер Аудіо"
+Mixer="Мікшер аудіо"
 Browse="Огляд"
 Mono="Моно"
 Stereo="Стерео"
-DroppedFrames="Пропущено кадрів %1 (%2%)"
-StudioProgramProjector="Повноекранний Проектор (вікно Програма наживо)"
-PreviewProjector="Повноекранний Проектор (вікно Перегляду)"
-SceneProjector="Повноекранний Проектор (Сцена)"
-SourceProjector="Повноекранний Проектор (Джерело)"
-StudioProgramWindow="Віконний Проектор (вікно Програма наживо)"
-PreviewWindow="Віконний Проектор (вікно Перегляду)"
-SceneWindow="Віконний Проектор (Сцена)"
-SourceWindow="Віконний Проектор (Джерело)"
-MultiviewProjector="Мульти-перегляд (Повноекранний)"
-MultiviewWindowed="Мульти-перегляд (Віконний)"
+DroppedFrames="Пропущено кадрів: %1 (%2%)"
+StudioProgramProjector="Повноекранний проектор (програма)"
+PreviewProjector="Повноекранний проєктор (попередній перегляд)"
+SceneProjector="Повноекранний проєктор (сцена)"
+SourceProjector="Повноекранний проєктор (джерело)"
+StudioProgramWindow="Віконний проектор (програма)"
+PreviewWindow="Віконний проектор (попередній перегляд)"
+SceneWindow="Віконний проектор (сцена)"
+SourceWindow="Віконний проектор (джерело)"
+MultiviewProjector="Багатоекранний перегляд (на весь екран)"
+MultiviewWindowed="Багатоекранний перегляд (в окремому вікні)"
+ResizeProjectorWindowToContent="Підігнати вікно до вмісту"
 Clear="Очистити"
-Revert="Відмінити"
+Revert="Повернути"
 Show="Показати"
 Hide="Приховати"
 UnhideAll="Показувати всі приховані"
@@ -47,298 +47,307 @@
 New="Новий"
 Duplicate="Дублювати"
 Enable="Увімкнути"
-DisableOSXVSync="Вимкнути OSX V-Sync"
-ResetOSXVSyncOnExit="Відновити OSX V-Sync при виході"
+DisableOSXVSync="Вимкнути macOS V-Sync"
+ResetOSXVSyncOnExit="Відновити macOS V-Sync при виході"
 HighResourceUsage="Кодування перевантажено! Треба знизити вимоги до налаштування відео або спробувати швидші налаштування енкодера."
-Transition="Відео-перехід"
-QuickTransitions="Швидкі відео-переходи"
+Transition="Монтажний перехід"
+QuickTransitions="Швидкі монтажні переходи"
 FadeToBlack="Fade to Black"
-Left="Зліва"
-Right="Зправа"
+Left="Ліворуч"
+Right="Праворуч"
 Top="Зверху"
 Bottom="Знизу"
 Reset="Скинути"
-Hours="Годин"
-Minutes="Хвилин"
-Seconds="Секунд"
-Deprecated="Припинено підтримку"
-ReplayBuffer="Буфер Повторів"
+Hours="год."
+Minutes="хв."
+Seconds="сек."
+Deprecated="Застарілі"
+ReplayBuffer="Буфер повторів"
 Import="Імпорт"
 Export="Експорт"
 Copy="Копіювати"
 Paste="Вставити"
-PasteReference="Встивити (як вже існуюче)"
-PasteDuplicate="Вставити (як повну копію)"
-RemuxRecordings="Ремультиплексація Записів"
+PasteReference="Вставити (посилання)"
+PasteDuplicate="Вставити (дублікат)"
+RemuxRecordings="Ремультиплексування записів"
 Next="Далі"
 Back="Назад"
-Defaults="За замовчанням"
-HideMixer="Приховати з Мікшеру"
-TransitionOverride="Перевизначення Відео-переходу"
+Defaults="За замовчуванням"
+HideMixer="Приховати у мікшері"
+TransitionOverride="Перевизначення монтажного переходу"
 None="Немає"
-StudioMode.Preview="вікно Перегляду"
-StudioMode.Program="Програма наживо"
-ShowInMultiview="Показувати у Мульти-перегляді"
+StudioMode.Preview="Попередній перегляд"
+StudioMode.Program="Програма"
+ShowInMultiview="Показувати у багатоекранному перегляді"
 VerticalLayout="Вертикальне компонування"
 Group="Група"
 DoNotShowAgain="Більше не показувати"
-Default="(За замовчуванням)"
-Calculating="Обчислення..."
-Fullscreen="У повний екран"
+Default="(Типово)"
+Calculating="Обчислення…"
+Fullscreen="На весь екран"
 Windowed="У вікні"
 Percent="Відсотки"
+RefreshBrowser="Оновити"
 AspectRatio="Співвідношення сторін <b>%1:%2</b>"
-LockVolume="Блокування гучності"
-
-AlreadyRunning.Title="OBS вже виконується"
-AlreadyRunning.Text="OBS вже запущено! Тільки якщо ви дійсно не намагаєтесь цього зробити, будь ласка позакривайте всі відкриті OBS перед тим як запускати нову копію. Якщо OBS налаштовано згортатися в трей, перевірте чи не виконується він там й досі."
+LockVolume="Зафіксувати гучність"
+LogViewer="Перегляд журналу"
+ShowOnStartup="Показувати при запуску"
+OpenFile="Відкрити файл"
+AddValue="Додати %1"
+
+AlreadyRunning.Title="OBS уже запущено"
+AlreadyRunning.Text="OBS вже запущено! Якщо ви дійсно намагаєтесь це зробити – перед тим як запустити нову копію, спершу закрийте всі відкриті екземпляри OBS. Якщо OBS налаштовано згортатися в трей, перевірте чи він там і досі працює."
 AlreadyRunning.LaunchAnyway="Все одно запустити"
 
+ChromeOS.Title="Непідтримувана платформа"
+ChromeOS.Text="Схоже, OBS запущено всередині контейнера ChromeOS. Ця платформа не підтримується"
+
 DockCloseWarning.Title="Закриття панелі інтерфейсу"
-DockCloseWarning.Text="Ви щойно закрили одну з панелей інтерфейсу. Якщо ви бажаєте вивести її знов - використайте опції з головного меню Вид → Панелі інтерфейсу."
+DockCloseWarning.Text="Ви щойно закрили одну з панелей інтерфейсу. Якщо ви бажаєте вивести її знов – використайте опції з головного меню Вигляд → Панелі інтерфейсу."
 
-ExtraBrowsers="Панелі браузера"
-ExtraBrowsers.Info="Додавайте панелі через надання їм назви та URL-адреси. Натисніть Застосувати або Закрити щоб відкрити щойно додані панелі. Список можна редагувати."
+ExtraBrowsers="Користувацькі панелі браузера"
+ExtraBrowsers.Info="Додавайте панелі вказавши назву та URL-адреси, потім натисніть «Застосувати» або «Закрити», щоб відкрити щойно додані панелі. Список панелей можна редагувати."
 ExtraBrowsers.DockName="Назва панелі"
 
-Auth.Authing.Title="Перевірка автентичності..."
-Auth.Authing.Text="Перевірка автентичності з %1, будь ласка зачекайте..."
+Auth.Authing.Title="Автентифікація…"
+Auth.Authing.Text="Автентифікація на %1, зачекайте, будь ласка…"
 Auth.AuthFailure.Title="Помилка автентифікації"
-Auth.AuthFailure.Text="Не вдалося завершити перевірку автентичності з %1:\n\n%2: %3"
-Auth.InvalidScope.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.Title="Завантаження інформації про канал…"
+Auth.LoadingChannel.Text="Завантажується інформація про канал з %1, будь ласка, зачекайте…"
 Auth.ChannelFailure.Title="Не вдалося завантажити канал"
 Auth.ChannelFailure.Text="Не вдалося завантажити інформацію про канал з %1\n\n%2: %3"
-Auth.Chat="Розмова (мій чат)"
-Auth.StreamInfo="Інформація про Трансляцію"
+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 security settings</a> бо це вимога для здійснення трансляцій."
-RestreamAuth.Channels="Канали Restream"
+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="Ініціалізація браузеру, будь ласка, зачекайте..."
+BrowserPanelInit.Title="Ініціалізація браузера…"
+BrowserPanelInit.Text="Триває ініціалізація браузеру, зачекайте..."
 
 BandwidthTest.Region="Регіон"
 BandwidthTest.Region.US="США"
 BandwidthTest.Region.EU="Європа"
 BandwidthTest.Region.Asia="Азія"
-BandwidthTest.Region.Other="Інше"
+BandwidthTest.Region.Other="Інший"
 
-Basic.FirstStartup.RunWizard="Бажаєте запустити майстр з автонастроювання? Можна також вручну настроїти параметри, натиснувши кнопку Налаштування в головному вікні."
-Basic.FirstStartup.RunWizard.NoClicked="Якщо ви передумаєте, ви можете повторно запустити майстер з автонастроювання у будь-який час з меню Додаткові засоби."
-
-Basic.AutoConfig="Майстер з автонастроювання"
-Basic.AutoConfig.ApplySettings="Застосувати Налаштування"
+Basic.AutoConfig="Майстер з автоналаштування"
+Basic.AutoConfig.ApplySettings="Застосувати налаштування"
 Basic.AutoConfig.StartPage="Інформація про використання"
-Basic.AutoConfig.StartPage.SubTitle="Вкажіть, для чого вам потрібна ця програма"
-Basic.AutoConfig.StartPage.PrioritizeStreaming="Оптимізувати для трансляцій, запис буде вторинний"
-Basic.AutoConfig.StartPage.PrioritizeRecording="Оптимізувати тільки для запису, трансляції мене не хвилюють"
-Basic.AutoConfig.VideoPage="Налаштування Відео"
-Basic.AutoConfig.VideoPage.SubTitle="Вкажіть бажані налаштування Відео, які ви б хотіли використовувати"
-Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Використовувати поточне (%1x%2)"
+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.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.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.UseStreamKey="Використовувати ключ трансляції"
+Basic.AutoConfig.StreamPage.UseStreamKey="Використати ключ трансляції"
 Basic.AutoConfig.StreamPage.Service="Сервіс"
-Basic.AutoConfig.StreamPage.Service.ShowAll="Показати всі..."
-Basic.AutoConfig.StreamPage.Service.Custom="Визначається користувачем..."
+Basic.AutoConfig.StreamPage.Service.ShowAll="Показати всі…"
+Basic.AutoConfig.StreamPage.Service.Custom="Користувацький…"
 Basic.AutoConfig.StreamPage.Server="Сервер"
 Basic.AutoConfig.StreamPage.StreamKey="Ключ трансляції"
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Посилання)"
-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.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.Testing="Зараз програма виконує набір тестів для оцінки найкращих налаштувань"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Тестування завершено"
-Basic.AutoConfig.TestPage.TestingBandwidth="Тест пропускної здатності триває, це може зайняти кілька хвилин..."
+Basic.AutoConfig.TestPage.TestingBandwidth="Виконується тест пропускної здатності, це може зайняти кілька хвилин…"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Підключення до: %1..."
-Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Не вдалося підключитися до жодного з серверів, будь ласка, перевірте підключення до Інтернету і спробуйте знову."
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Не вдалося під'єднатися до жодного з серверів, будь ласка, перевірте підключення до Інтернету і спробуйте знову."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Тестування пропускної здатності для: %1"
-Basic.AutoConfig.TestPage.TestingStreamEncoder="Тестування енкодера трансляцій, це може зайняти хвилину..."
-Basic.AutoConfig.TestPage.TestingRecordingEncoder="Тестування енкодера записів, це може зайняти хвилину..."
-Basic.AutoConfig.TestPage.TestingRes="Тестування роздільної здатності, це може зайняти кілька хвилин..."
-Basic.AutoConfig.TestPage.TestingRes.Fail="Не вдалося запустити енкодер"
-Basic.AutoConfig.TestPage.TestingRes.Resolution="Тестування %1x%2 %3 Кадр/сек..."
-Basic.AutoConfig.TestPage.Result.StreamingEncoder="Енкодер Трансляцій"
-Basic.AutoConfig.TestPage.Result.RecordingEncoder="Енкодер Записів"
-Basic.AutoConfig.TestPage.Result.Header="Програма визначила, що дані налаштування є ідеальним для вас:"
-Basic.AutoConfig.TestPage.Result.Footer="Щоб використовувати ці параметри, натисніть кнопку Застосувати Налаштування. Щоб переналаштувати майстра та спробувати знов, натисніть кнопку Назад. Можна вручну вказати всі параметри, для цього натисніть кнопку Скасувати та відкрите Налаштування."
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Тестування кодувальника для трансляції, це може зайняти хвилину…"
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="Тестування кодувальника для запису, це може зайняти хвилину…"
+Basic.AutoConfig.TestPage.TestingRes="Тестування роздільної здатності, це може зайняти кілька хвилин…"
+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.MissedFrames="Кадри пропущені через перевантаження візуалізації"
+Basic.Stats.SkippedFrames="Кадри пропущені через затримки кодування"
+Basic.Stats.MissedFrames="Кадри, пропущені через затримки рендерингу"
 Basic.Stats.Output.Stream="Трансляція"
 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="Неактивно"
+Basic.Stats.Status.Reconnecting="Перепідключення"
+Basic.Stats.Status.Inactive="Неактивний"
 Basic.Stats.Status.Active="Активовано"
 Basic.Stats.DroppedFrames="Пропущено кадрів (мережа)"
-Basic.Stats.MegabytesSent="Загалом до Виводу"
+Basic.Stats.MegabytesSent="Загалом вийшло даних"
 Basic.Stats.Bitrate="Бітрейт"
-Basic.Stats.DiskFullIn="Повний диск через (прибл.)"
+Basic.Stats.DiskFullIn="Диск заповниться через (прибл.)"
 Basic.Stats.ResetStats="Скинути статистику"
 
-ResetUIWarning.Title="Ви дійсно бажаєте скинути інтерфейс?"
-ResetUIWarning.Text="Скидання інтерфейсу користувача приховує всі додаткові вікна. Вам потрібно буде знов увімкнути ці додаткові вікна з меню Вид, якщо ви хочете, щоб вони були видимі.\n\nВи дійсно бажаєте скинути інтерфейс?"
+ResetUIWarning.Title="Скинути інтерфейс?"
+ResetUIWarning.Text="Скидання налаштувань інтерфейсу приховує всі додаткові панелі. Якщо ви захочете їх побачити – потрібно буде знов увімкнути ці панелі з меню вигляду.\n\nВи дійсно бажаєте скинути налаштування інтерфейсу?"
 
-Updater.Title="З'явилось оновлення"
-Updater.Text="Існує нове оновлення:"
+Updater.Title="Нове оновлення"
+Updater.Text="Доступне нове оновлення:"
 Updater.UpdateNow="Оновити зараз"
 Updater.RemindMeLater="Нагадати пізніше"
 Updater.Skip="Пропустити цю версію"
 Updater.Running.Title="Програма зараз активна"
-Updater.Running.Text="Вивід активний в даний час, будь ласка, завершіть роботу будь-якого активного Виводу перед спробою оновлення"
-Updater.NoUpdatesAvailable.Title="Оновлень немає"
-Updater.NoUpdatesAvailable.Text="На даний час оновлень немає"
+Updater.Running.Text="Знайдено активну операцію виводу, будь ласка, завершіть роботу будь-якої операції виводу перед спробою оновлення"
+Updater.NoUpdatesAvailable.Title="Оновлення відсутні"
+Updater.NoUpdatesAvailable.Text="Наразі немає доступних оновлень"
 Updater.FailedToLaunch="Не вдалося перевірити оновлення"
-Updater.GameCaptureActive.Title="Захват гри активний"
-Updater.GameCaptureActive.Text="Бібліотека для Захвату гри наразі використовується. Будь ласка, закрийте всі ігри/програми для яких використовувався захват (або перезавантажте Windows) та спробуйте знов."
-
-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="Відео-переходи між Сценами"
+Updater.GameCaptureActive.Title="Відбувається захоплення гри"
+Updater.GameCaptureActive.Text="Бібліотека для захоплення ігор зараз використовується. Будь ласка, закрийте усі ігри/програми для яких використовується захоплення (або перезавантажте Windows), та спробуйте знову."
+
+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="Монтажні переходи між сценами"
 Basic.TransitionDuration="Тривалість"
-Basic.TogglePreviewProgramMode="Режим Студії"
+Basic.TogglePreviewProgramMode="Режим студії"
 
-TransitionNameDlg.Text="Будь ласка, введіть назву для Відео-переходу"
-TransitionNameDlg.Title="Назва Відео-переходу"
+TransitionNameDlg.Text="Будь ласка, введіть назву для монтажного переходу"
+TransitionNameDlg.Title="Назва монтажного переходу"
 
 TitleBar.Profile="Профіль"
 TitleBar.Scenes="Сцени"
 
-NameExists.Title="Ім'я вже існує"
-NameExists.Text="Ім'я вже використовується."
+NameExists.Title="Назва вже існує"
+NameExists.Text="Ця назва вже використовується."
 
-NoNameEntered.Title="Невірно введено ім'я"
+NoNameEntered.Title="Введіть дійсну назву"
 NoNameEntered.Text="Не можна використовувати порожні назви."
 
 ConfirmStart.Title="Почати трансляцію?"
-ConfirmStart.Text="Ви впевнені, що хочете почати трансляцію?"
+ConfirmStart.Text="Ви дійсно бажаєте почати трансляцію?"
 
-ConfirmStop.Title="Закінчити трансляцію?"
-ConfirmStop.Text="Ви впевнені, що хочете закінчити трансляцію?"
+ConfirmStop.Title="Зупинити трансляцію?"
+ConfirmStop.Text="Справді зупинити трансляцію?"
 
-ConfirmStopRecord.Title="Зупинити запис?"
-ConfirmStopRecord.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 елементів?"
+ConfirmRemove.Text="Справді видалити «$1»?"
+ConfirmRemove.TextMultiple="Справді видалити ці (%1) елементи?"
 
 Output.StartStreamFailed="Не вдалося розпочати трансляцію"
-Output.StartRecordingFailed="Не вдалося розпочати запис"
-Output.StartReplayFailed="Не вдалося запустити Буфер Повторів"
-Output.StartFailedGeneric="Помилка. Вивід не було розпочато. За додатковою інформацією, будь ласка зверніться до файлу журналу.\n\nПримітка: якщо ви використовуєте NVENC або AMD енкодер, перевірте чи оновлений драйвер відео."
+Output.StartRecordingFailed="Не вдалося розпочати записування"
+Output.StartReplayFailed="Не вдалося запустити буфер повторів"
+Output.StartFailedGeneric="Помилка виводу. Додаткова інформація знаходиться у файлі журналу.\n\nПримітка: якщо ви використовуєте кодувальники NVENC або AMD, переконайтесь, що маєте відеодрайвер найновішої версії."
 
-Output.ReplayBuffer.PauseWarning.Title="Не можливо зберегти файл Повторів коли запис Призупинено"
-Output.ReplayBuffer.PauseWarning.Text="Попередження: Повтори не можуть бути збережені якщо запис Призупинено."
+Output.ReplayBuffer.PauseWarning.Title="Неможливо зберегти повтори під час паузи"
+Output.ReplayBuffer.PauseWarning.Text="Попередження: неможливо зберегти повтори, якщо записування призупинено."
 
-Output.ConnectFail.Title="Не вдалося підключитися"
-Output.ConnectFail.BadPath="Шлях або URL-адреса недосяжні. Будь ласка, перевірте налаштування програмного забезпечення."
-Output.ConnectFail.ConnectFailed="Не вдалося підключитися до сервера"
-Output.ConnectFail.InvalidStream="Немає доступу до вказаного каналу або до ключа трансляції, будь ласка перевірте свій ключ для трансляцій. Якщо він дійсний, то можливо є проблеми зв'язку з сервером."
-Output.ConnectFail.Error="Під час зв'язку з сервером відбулася несподівана помилка. Подробиці знаходяться у лог-файлі."
-Output.ConnectFail.Disconnected="Від'єднаний від серверу."
+Output.ConnectFail.Title="Помилка підключення"
+Output.ConnectFail.BadPath="Хибний шлях або URL-адреса підключення. Будь ласка, перевірте налаштування щоб перевірити коректність цих параметрів."
+Output.ConnectFail.ConnectFailed="Не вдалося під'єднатися до сервера"
+Output.ConnectFail.InvalidStream="Не вдалося отримати доступ до вказаного каналу або ключа трансляції, перевірте свій ключ трансляції ще раз. Якщо він дійсний – можливо, виникла проблема з підключенням до сервера."
+Output.ConnectFail.Error="При спробі підключення до сервера сталася несподівана помилка. Більше інформації у файлі журналу."
+Output.ConnectFail.Disconnected="Відключено від сервера."
 
 Output.StreamEncodeError.Title="Помилка кодування"
-Output.StreamEncodeError.Msg="Під час трансляції відбулася помилка у енкодері."
-
-Output.RecordFail.Title="Не вдалося розпочати запис"
-Output.RecordFail.Unsupported="Формат виводу на жаль не підтримується або форматом не підтримується більш однієї звукової доріжки. Будь ласка, перевірте налаштування та повторіть спробу."
-Output.RecordNoSpace.Title="Недостатньо простору на диску"
-Output.RecordNoSpace.Msg="На диску недостатньо простору для запису."
-Output.RecordError.Title="Помилка запису"
-Output.RecordError.Msg="Під час запису відбулася несподівана помилка."
-Output.RecordError.EncodeErrorMsg="Під час запису відбулася помилка у енкодері."
-Output.ReplayBuffer.NoHotkey.Title="Гарячу клавішу не вказано!"
-Output.ReplayBuffer.NoHotkey.Msg="Гарячу клавішу для Буферу Повторів не вказано. Будь ласка, встановіть гарячу клавішу на дію \"Зберегти Повтор\", щоб використовувати її для збереження повторів."
-
-Output.BadPath.Title="Недійсний шлях до файлу"
-Output.BadPath.Text="Шлях вказаний для виводу файлу недійсний. Будь ласка, перевірте у налаштуваннях, що шлях було вказано вірно."
-
-LogReturnDialog="Файл журналу успішно завантажено"
-LogReturnDialog.CopyURL="Копіювати посилання"
-LogReturnDialog.ErrorUploadingLog="Помилка завантаження файлу журналу"
-
-Remux.SourceFile="OBS запис"
+Output.StreamEncodeError.Msg="Під час трансляції відбулася помилка кодувальника."
+
+Output.RecordFail.Title="Не вдалося розпочати записування"
+Output.RecordFail.Unsupported="Формат виводу або не підтримується, або не підтримує більше однієї звукової доріжки. Будь ласка, перевірте налаштування та повторіть спробу."
+Output.RecordNoSpace.Title="Недостатньо місця на диску"
+Output.RecordNoSpace.Msg="Для продовження запису немає достатньо місця на диску."
+Output.RecordError.Title="Помилка записування"
+Output.RecordError.Msg="Під час записування сталася невідома помилка."
+Output.RecordError.EncodeErrorMsg="Під час запису відбулася помилка кодувальника."
+
+Output.BadPath.Title="Неправильний шлях до файлу"
+Output.BadPath.Text="Вибрано неприпустимий вихідний шлях. Перевірте налаштування та переконайтеся, що припустимий шлях вибрано."
+
+LogReturnDialog="Файл журналу успішно вивантажено"
+LogReturnDialog.Description="Ваш файл журналу було завантажено. Ви тепер можете поділитися URL з метою налагодження чи підтримки."
+LogReturnDialog.Description.Crash="Ваш звіт про падіння було завантажено. Ви тепер можете поділитися URL з метою налагодження."
+LogReturnDialog.CopyURL="Копіювати URL"
+LogReturnDialog.AnalyzeURL="Аналіз"
+LogReturnDialog.ErrorUploadingLog="Помилка вивантаження файлу журналу"
+
+Remux.SourceFile="Запис OBS"
 Remux.TargetFile="Кінцевий файл"
-Remux.Remux="Ремуксити"
-Remux.Stop="Зупинити Ремультіплекс"
-Remux.ClearFinished="Прибрати завершені"
-Remux.ClearAll="Прибрати всі"
-Remux.OBSRecording="OBS запис"
-Remux.FinishedTitle="Ремультиплексацію завершено"
+Remux.Remux="Ремультиплексування"
+Remux.Stop="Зупинити ремультиплексування"
+Remux.ClearFinished="Очистити завершені елементи"
+Remux.ClearAll="Очистити усі елементи"
+Remux.OBSRecording="Запис OBS"
+Remux.FinishedTitle="Ремультиплексування завершено"
 Remux.Finished="Запис ремультиплексовано"
-Remux.FinishedError="Запис ремультиплексовано, але схоже файл неповний"
-Remux.SelectRecording="Виберіть OBS запис..."
-Remux.SelectTarget="Виберіть кінцевий файл..."
-Remux.FileExistsTitle="Кінцевий файл існує"
-Remux.FileExists="Наступні кінцеві файли вже існують. Бажаєте їх замінити?"
-Remux.ExitUnfinishedTitle="Ремультиплексація триває"
-Remux.ExitUnfinished="Ремультиплексацію не завершено, якщо зупинити зараз, то файл може лишитись пошкодженим.\nВи впевнені, що хочете зупинити ремультиплексацію?"
-Remux.HelpText="Перетягніть файли до цього вікна щоб ремультиплексувати їх, або клацніть пусту клітинку з графи \"OBS запис\" щоб обрати файл."
+Remux.FinishedError="Запис ремультиплексовано, але файл може бути неповний"
+Remux.SelectRecording="Виберіть запис OBS…"
+Remux.SelectTarget="Виберіть файл призначення…"
+Remux.FileExistsTitle="Файли призначення існують"
+Remux.FileExists="Такі кінцеві файли вже існують. Замінити їх?"
+Remux.ExitUnfinishedTitle="Ремультиплексування триває"
+Remux.ExitUnfinished="Ремультиплексування не завершено, якщо зупинити зараз, то кінцевий файл може бути пошкодженим.\nВи впевнені, що хочете зупинити ремультиплексування?"
+Remux.HelpText="Перетягніть файли до цього вікна щоб ремультиплексувати їх, або виберіть пусту клітинку «Запис OBS», щоб обрати файл."
 
 UpdateAvailable="Доступне оновлення"
-UpdateAvailable.Text="Доступна версія %1.%2.%3. <a href='%4'>Натисніть тут, щоб завантажити</a>"
+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"
+Basic.DesktopDevice1="Пристрій відтворення"
+Basic.DesktopDevice2="Пристрій відтворення 2"
+Basic.AuxDevice1="Мікрофон/Aux"
+Basic.AuxDevice2="Мікрофон/Aux 2"
+Basic.AuxDevice3="Мікрофон/Aux 3"
+Basic.AuxDevice4="Мікрофон/Aux 4"
 
 Basic.Scene="Сцена"
-Basic.DisplayCapture="Захват екрану"
+Basic.DisplayCapture="Захоплення екрану"
 
-Basic.Main.PreviewConextMenu.Enable="Увімкнути вікно Перегляду"
+Basic.Main.PreviewConextMenu.Enable="Увімкнути попередній перегляд"
 
-Basic.Main.Preview.Disable="Відключити попередній перегляд"
+Basic.Main.Preview.Disable="Вимкнути попередній перегляд"
 
 ScaleFiltering="Фільтр масштабування"
-ScaleFiltering.Point="Ступінчастий"
+ScaleFiltering.Point="Точковий"
 ScaleFiltering.Bilinear="Білінійний"
 ScaleFiltering.Bicubic="Бікубічний"
 ScaleFiltering.Lanczos="Ланцош"
@@ -357,121 +366,125 @@
 Deinterlacing.BottomFieldFirst="Спочатку парні рядки"
 
 VolControl.SliderUnmuted="Повзунок гучності для '%1': %2"
-VolControl.SliderMuted="Повзунок гучності для '%1': %2 (в даний час звук вимкнено)"
-VolControl.Mute="Вимкнути звук '%1'"
-VolControl.Properties="Властивості для '%1'"
+VolControl.SliderMuted="Повзунок гучності для '%1': %2 (зараз заглушено)"
+VolControl.Mute="Заглушити '%1'"
+VolControl.Properties="Параметри '%1'"
 
-Basic.Main.AddSceneDlg.Title="Додати Сцену"
-Basic.Main.AddSceneDlg.Text="Будь ласка, введіть назву для Сцени"
+Basic.Main.AddSceneDlg.Title="Додати сцену"
+Basic.Main.AddSceneDlg.Text="Будь ласка, введіть назву сцени"
 
 Basic.Main.DefaultSceneName.Text="Сцена %1"
 
-Basic.Main.AddSceneCollection.Title="Додати Набір Сцен"
-Basic.Main.AddSceneCollection.Text="Будь ласка, введіть назву для Набору Сцен"
+Basic.Main.AddSceneCollection.Title="Додати колекцію сцен"
+Basic.Main.AddSceneCollection.Text="Будь ласка, введіть назву колекції сцен"
 
-Basic.Main.RenameSceneCollection.Title="Перейменування Набору Сцен"
+Basic.Main.RenameSceneCollection.Title="Перейменувати колекцію сцен"
 
-AddProfile.Title="Додати Профіль"
-AddProfile.Text="Будь ласка, введіть назву для Профілю"
+AddProfile.Title="Додати профіль"
+AddProfile.Text="Будь ласка, введіть назву профілю"
 
-RenameProfile.Title="Перейменування Профілю"
+RenameProfile.Title="Перейменувати профіль"
 
-Basic.Main.MixerRename.Title="Перейменування джерела Аудіо"
-Basic.Main.MixerRename.Text="Будь ласка, введіть назву для джерела аудіо"
+Basic.Main.MixerRename.Title="Перейменувати джерело аудіо"
+Basic.Main.MixerRename.Text="Будь ласка, введіть назву джерела аудіо"
 
 
-Basic.Main.PreviewDisabled="Вікно Перегляду вимкнено"
+Basic.Main.PreviewDisabled="Попередній перегляд зараз вимкнено"
 
-Basic.SourceSelect="Створити/Вибрати Джерело"
+Basic.SourceSelect="Створити/вибрати джерело"
 Basic.SourceSelect.CreateNew="Створити нове"
-Basic.SourceSelect.AddExisting="Додати вже існуюче"
+Basic.SourceSelect.AddExisting="Додати існуюче"
 Basic.SourceSelect.AddVisible="Зробити джерело видимим"
 
-Basic.PropertiesWindow="Властивості для '%1'"
-Basic.PropertiesWindow.AutoSelectFormat="%1 (вибрано: %2)"
-Basic.PropertiesWindow.SelectColor="Вибір кольору"
-Basic.PropertiesWindow.SelectFont="Вибір шрифту"
-Basic.PropertiesWindow.ConfirmTitle="Змінено налаштування"
-Basic.PropertiesWindow.Confirm="Зміни незбережені. Ви хочете їх зберегти?"
+Basic.PropertiesWindow="Параметри '%1'"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (автовибір: %2)"
+Basic.PropertiesWindow.SelectColor="Вибрати колір"
+Basic.PropertiesWindow.SelectFont="Вибрати шрифт"
+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.PropertiesView.FPS.Simple="Кадр/сек, загальні значення"
-Basic.PropertiesView.FPS.Rational="Кадр/сек, дробові значення"
-Basic.PropertiesView.FPS.ValidFPSRanges="Кадр/сек, діапазон:"
-
-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.PropertiesWindow.AddURL="Додати шлях/URL"
+Basic.PropertiesWindow.AddEditableListDir="Додати каталог в '%1'"
+Basic.PropertiesWindow.AddEditableListFiles="Додати файли в '%1'"
+Basic.PropertiesWindow.AddEditableListEntry="Додати запис в '%1'"
+Basic.PropertiesWindow.EditEditableListEntry="Редагувати запис із '%1'"
+
+Basic.PropertiesView.FPS.Simple="Прості значення FPS"
+Basic.PropertiesView.FPS.Rational="Раціональні значення FPS"
+Basic.PropertiesView.FPS.ValidFPSRanges="Допустимі діапазони FPS:"
+
+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.Filters="Фільтри"
-Basic.Filters.AsyncFilters="Аудіо/Відео фільтри"
+Basic.Filters.AsyncFilters="Фільтри аудіо/відео"
 Basic.Filters.AudioFilters="Аудіо фільтри"
 Basic.Filters.EffectFilters="Фільтри ефектів"
-Basic.Filters.Title="Фільтри до '%1'"
+Basic.Filters.Title="Фільтри для '%1'"
 Basic.Filters.AddFilter.Title="Назва фільтру"
-Basic.Filters.AddFilter.Text="Будь ласка, введіть назву для Фільтру"
+Basic.Filters.AddFilter.Text="Будь ласка, введіть назву фільтру"
 
-Basic.TransformWindow="Розміри елемента Сцени"
+Basic.TransformWindow="Перетворення елемента сцени"
 Basic.TransformWindow.Position="Позиція"
 Basic.TransformWindow.Rotation="Обертання"
 Basic.TransformWindow.Size="Розмір"
-Basic.TransformWindow.Alignment="Вирівнювання у рамці"
-Basic.TransformWindow.BoundsType="Тип рамки розміру"
-Basic.TransformWindow.BoundsAlignment="Вирівнювання у рамці розміру"
-Basic.TransformWindow.Bounds="Розмір самої рамки"
-Basic.TransformWindow.Crop="Кадрування"
+Basic.TransformWindow.Alignment="Позиційне вирівнювання"
+Basic.TransformWindow.BoundsType="Тип обмежувача"
+Basic.TransformWindow.BoundsAlignment="Вирівнювання всередині обмежувача"
+Basic.TransformWindow.Bounds="Розмір обмежувача"
+Basic.TransformWindow.Crop="Обрізати"
 
-Basic.TransformWindow.Alignment.TopLeft="Верхній лівий кут"
+Basic.TransformWindow.Alignment.TopLeft="Зверху ліворуч"
 Basic.TransformWindow.Alignment.TopCenter="Зверху по центру"
-Basic.TransformWindow.Alignment.TopRight="Верхній правий кут"
-Basic.TransformWindow.Alignment.CenterLeft="Зліва по центру"
+Basic.TransformWindow.Alignment.TopRight="Зверху праворуч"
+Basic.TransformWindow.Alignment.CenterLeft="По центру ліворуч"
 Basic.TransformWindow.Alignment.Center="По центру"
-Basic.TransformWindow.Alignment.CenterRight="Праворуч по центру"
-Basic.TransformWindow.Alignment.BottomLeft="Нижній лівий кут"
-Basic.TransformWindow.Alignment.BottomCenter="Внизу по центру"
-Basic.TransformWindow.Alignment.BottomRight="Нижній правий кут"
+Basic.TransformWindow.Alignment.CenterRight="По центру праворуч"
+Basic.TransformWindow.Alignment.BottomLeft="Знизу ліворуч"
+Basic.TransformWindow.Alignment.BottomCenter="Знизу по центру"
+Basic.TransformWindow.Alignment.BottomRight="Знизу праворуч"
 
-Basic.TransformWindow.BoundsType.None="Нема обмежень"
-Basic.TransformWindow.BoundsType.MaxOnly="Лише по максимальний розмір"
+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.ScaleToWidth="Масштабувати до ширини границь"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Масштабувати до висоти границь"
 Basic.TransformWindow.BoundsType.Stretch="Розтягнути до границь"
 
-Basic.Main.AddSourceHelp.Title="Не вдалося додати Джерело"
-Basic.Main.AddSourceHelp.Text="Ви повинні мати принаймні 1 сцену щоб додати джерело."
+Basic.Main.AddSourceHelp.Title="Неможливо додати джерело"
+Basic.Main.AddSourceHelp.Text="Щоб додати джерело, потрібно мати принаймні одну сцену."
 
 Basic.Main.Scenes="Сцени"
 Basic.Main.Sources="Джерела"
-Basic.Main.Controls="Елементи керування"
-Basic.Main.Connecting="З'єднання..."
-Basic.Main.StartRecording="Почати запис"
-Basic.Main.StartReplayBuffer="Запустити Буфер Повторів"
-Basic.Main.SaveReplay="Зберегти Повтор"
+Basic.Main.Controls="Керування"
+Basic.Main.Connecting="Підключення…"
+Basic.Main.StartRecording="Почати записування"
+Basic.Main.StartReplayBuffer="Запустити буфер повторів"
+Basic.Main.SaveReplay="Зберегти повтор"
 Basic.Main.StartStreaming="Почати трансляцію"
-Basic.Main.StopRecording="Зупинити запис"
-Basic.Main.PauseRecording="Призупинити Запис"
-Basic.Main.UnpauseRecording="Продовжити Запис"
-Basic.Main.StoppingRecording="Запис зупиняється..."
-Basic.Main.StopReplayBuffer="Зупинити Буфер Повторів"
-Basic.Main.StoppingReplayBuffer="Буфер Повторів зупиняється..."
-Basic.Main.StopStreaming="Закінчити трансляцію"
-Basic.Main.StoppingStreaming="Припинення трансляції..."
-Basic.Main.ForceStopStreaming="Закінчити трансляцію (миттєво)"
+Basic.Main.StartVirtualCam="Запустити віртуальну камеру"
+Basic.Main.StopRecording="Зупинити записування"
+Basic.Main.PauseRecording="Призупинити запис"
+Basic.Main.UnpauseRecording="Відновити запис"
+Basic.Main.StoppingRecording="Припинення запису…"
+Basic.Main.StopReplayBuffer="Зупинити буфер повторів"
+Basic.Main.StoppingReplayBuffer="Зупинення буферу повторів…"
+Basic.Main.StopStreaming="Зупинити трансляцію"
+Basic.Main.StoppingStreaming="Зупинення трансляції…"
+Basic.Main.ForceStopStreaming="Зупинити трансляцію (миттєво)"
+Basic.Main.ShowContextBar="Показати панель джерела"
+Basic.Main.HideContextBar="Приховати панель джерела"
+Basic.Main.StopVirtualCam="Зупинити віртуальну камеру"
 Basic.Main.Group="Група %1"
 Basic.Main.GroupItems="Згрупувати вибрані елементи"
 Basic.Main.Ungroup="Розгрупувати"
@@ -479,203 +492,203 @@
 Basic.Main.ListMode="Режим списку"
 
 Basic.MainMenu.File="Файл (&F)"
-Basic.MainMenu.File.Export="Експорт (&E)"
-Basic.MainMenu.File.Import="Імпорт (&I)"
-Basic.MainMenu.File.ShowRecordings="Показати Записи (&R)"
-Basic.MainMenu.File.Remux="Ремультиплексація Записів (&M)"
+Basic.MainMenu.File.Export="&Експортувати"
+Basic.MainMenu.File.Import="Імпортувати (&I)"
+Basic.MainMenu.File.ShowRecordings="Показати записи (&R)"
+Basic.MainMenu.File.Remux="Ремультиплексувати записи (&M)"
 Basic.MainMenu.File.Settings="Налаштування (&S)"
-Basic.MainMenu.File.ShowSettingsFolder="Показати папку Налаштувань"
-Basic.MainMenu.File.ShowProfileFolder="Показати папку Профілю"
-Basic.MainMenu.AlwaysOnTop="Поверх всіх вікон (&A)"
-Basic.MainMenu.File.Exit="Вихід (&X)"
+Basic.MainMenu.File.ShowSettingsFolder="Показати каталог налаштувань"
+Basic.MainMenu.File.ShowProfileFolder="Показати каталог профілю"
+Basic.MainMenu.AlwaysOnTop="Поверх інших вікон (&A)"
+Basic.MainMenu.File.Exit="Вийти (&X)"
 
 Basic.MainMenu.Edit="Редагування (&E)"
-Basic.MainMenu.Edit.Undo="Відмінити (&U)"
-Basic.MainMenu.Edit.Redo="Відновити (&R)"
-Basic.MainMenu.Edit.UndoAction="Відмінити $1 (&U)"
-Basic.MainMenu.Edit.RedoAction="Відновити $1 (&R)"
-Basic.MainMenu.Edit.LockPreview="&Заблокувати вікно Перегляду"
-Basic.MainMenu.Edit.Scale="Масштабувати вікно Перегляду (&S)"
-Basic.MainMenu.Edit.Scale.Window="В розмір вікна"
-Basic.MainMenu.Edit.Scale.Canvas="Як Полотно (%1x%2)"
-Basic.MainMenu.Edit.Scale.Output="Як Вивід (%1x%2)"
-Basic.MainMenu.Edit.Transform="Розміри (&T)"
-Basic.MainMenu.Edit.Transform.EditTransform="Редагувати Розміри... (&E)"
-Basic.MainMenu.Edit.Transform.CopyTransform="Копіювати Розміри"
-Basic.MainMenu.Edit.Transform.PasteTransform="Вставити Розміри"
-Basic.MainMenu.Edit.Transform.ResetTransform="Розміри за замовчуванням (&R)"
-Basic.MainMenu.Edit.Transform.Rotate90CW="Повернути на 90 За годинниковою стрілкою"
-Basic.MainMenu.Edit.Transform.Rotate90CCW="Повернути на 90 Проти годинникової стрілки"
+Basic.MainMenu.Edit.Undo="Скасувати (&U)"
+Basic.MainMenu.Edit.Redo="Повторити (&R)"
+Basic.MainMenu.Edit.UndoAction="Скасувати $1 (&U)"
+Basic.MainMenu.Edit.RedoAction="Повторити $1 (&R)"
+Basic.MainMenu.Edit.LockPreview="Заблокувати попередній перегляд (&L)"
+Basic.MainMenu.Edit.Scale="Масштабування попереднього перегляду (&S)"
+Basic.MainMenu.Edit.Scale.Window="Масштабувати до розміру вікна"
+Basic.MainMenu.Edit.Scale.Canvas="Полотно (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="Вивід (%1x%2)"
+Basic.MainMenu.Edit.Transform="Перетворити (&T)"
+Basic.MainMenu.Edit.Transform.EditTransform="Редагувати перетворення… (&E)"
+Basic.MainMenu.Edit.Transform.CopyTransform="Копіювати перетворення"
+Basic.MainMenu.Edit.Transform.PasteTransform="Вставити перетворення"
+Basic.MainMenu.Edit.Transform.ResetTransform="Скинути перетворення (&R)"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Повернути ліворуч на 90 градусів"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Повернути праворуч на 90 градусів"
 Basic.MainMenu.Edit.Transform.Rotate180="Повернути на 180 градусів"
-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.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="Упорядкувати (&O)"
-Basic.MainMenu.Edit.Order.MoveUp="Нагору (&U)"
-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.Order.MoveUp="Вище (&U)"
+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.View="Вид (&V)"
+Basic.MainMenu.View="Вигляд (&V)"
 Basic.MainMenu.View.Toolbars="Панелі інструментів (&T)"
 Basic.MainMenu.View.Docks="Панелі інтерфейсу"
 Basic.MainMenu.View.Docks.ResetUI="Скинути інтерфейс"
-Basic.MainMenu.View.Docks.LockUI="Зафіксувати інтерфейс"
-Basic.MainMenu.View.Docks.CustomBrowserDocks="Панелі браузера..."
-Basic.MainMenu.View.Toolbars.Listboxes="У Списках (&L)"
-Basic.MainMenu.View.SceneTransitions="Відео-переходи між Сценами (&C)"
-Basic.MainMenu.View.SourceIcons="Іконки поряд с Джерелами"
-Basic.MainMenu.View.StatusBar="Панель стану (&S)"
+Basic.MainMenu.View.Docks.LockUI="Закріпити інтерфейс"
+Basic.MainMenu.View.Docks.CustomBrowserDocks="Настроювані панелі браузера…"
+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.SceneCollection="Набір Сцен (&S)"
-Basic.MainMenu.Profile="Профіль (&P)"
-Basic.MainMenu.Profile.Import="Імпорт Профілю"
-Basic.MainMenu.Profile.Export="Експорт Профілю"
-Basic.MainMenu.SceneCollection.Import="Імпорт Набору Сцен"
-Basic.MainMenu.SceneCollection.Export="Експорт Набору Сцен"
+Basic.MainMenu.SceneCollection="Колекція сцен (&S)"
+Basic.MainMenu.Profile="&Профіль"
+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.SceneCollection.Exists="Колекція сцен вже існує"
 
-Basic.MainMenu.Tools="Додаткові засоби (&T)"
+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.Logs="Файли журналів (&L)"
-Basic.MainMenu.Help.Logs.ShowLogs="Показати файли журналів (&S)"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="Завантажити на сервер Поточний журнал (&C)"
-Basic.MainMenu.Help.Logs.UploadLastLog="Завантажити на сервер Останній журнал (&L)"
+Basic.MainMenu.Help.HelpPortal="Портал з довідкою (&P)"
+Basic.MainMenu.Help.Website="Перейти на вебсайт (&W)"
+Basic.MainMenu.Help.Discord="Приєднатися до сервера &Discord"
+Basic.MainMenu.Help.Logs="&Файли журналів"
+Basic.MainMenu.Help.Logs.ShowLogs="&Показати файли журналів"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Передати поточний файл журналу (&C)"
+Basic.MainMenu.Help.Logs.UploadLastLog="Передати останній файл журналу (&L)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Переглянути поточний журнал (&V)"
-Basic.MainMenu.Help.CheckForUpdates="Перевірити оновлення"
+Basic.MainMenu.Help.CheckForUpdates="Перевірити наявність оновлень"
 Basic.MainMenu.Help.CrashLogs="Звіти про збої (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Показати звіти про збої (&S)"
-Basic.MainMenu.Help.CrashLogs.UploadLastLog="Завантажити на сервер останній звіт про збій (&L)"
-Basic.MainMenu.Help.About="Про програму (&A)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Передати останній звіт про збій (&L)"
+Basic.MainMenu.Help.About="Про OBS (&A)"
 
-Basic.Settings.ProgramRestart="Програма потребує перезапуску, щоб нові налаштування набрали сили."
+Basic.Settings.ProgramRestart="Щоб ці параметри набули чинності – необхідно перезапустити програму."
 Basic.Settings.ConfirmTitle="Підтвердження змін"
-Basic.Settings.Confirm="Є незбережені зміни. Зберегти ці зміни?"
+Basic.Settings.Confirm="У вас є незбережені зміни. Зберегти їх?"
 
 Basic.Settings.General="Загальні"
 Basic.Settings.General.Theme="Тема"
 Basic.Settings.General.Language="Мова"
-Basic.Settings.General.EnableAutoUpdates="Автоматично перевіряти наявність оновлень під час запуску"
-Basic.Settings.General.OpenStatsOnStartup="Відкривати вікно статистики під час запуску"
-Basic.Settings.General.WarnBeforeStartingStream="Показувати підтвердження для початку трансляції"
-Basic.Settings.General.WarnBeforeStoppingStream="Показувати підтвердження для закінчення трансляції"
-Basic.Settings.General.WarnBeforeStoppingRecord="Показувати підтвердження для зупинення запису"
-Basic.Settings.General.Projectors="Проектор"
-Basic.Settings.General.HideProjectorCursor="Приховати курсор у режимі Проектор"
-Basic.Settings.General.ProjectorAlwaysOnTop="Режим Проектор показувати поверх всіх вікон"
-Basic.Settings.General.Snapping="Прив'язка та вирівнювання"
-Basic.Settings.General.ScreenSnapping="Примагнітити Джерела до краю екрана"
-Basic.Settings.General.CenterSnapping="Примагнітити Джерела до центру по вертикалі та горизонталі"
-Basic.Settings.General.SourceSnapping="Примагнітити Джерела до інших джерел"
-Basic.Settings.General.SnapDistance="Чутливість примагничування"
-Basic.Settings.General.RecordWhenStreaming="Автоматично почати запис з початком трансляції"
-Basic.Settings.General.KeepRecordingWhenStreamStops="Не припиняти запис, якщо трансляцію закінчено"
-Basic.Settings.General.ReplayBufferWhileStreaming="Автоматично запустити Буфер Повторів з початком трансляції"
-Basic.Settings.General.KeepReplayBufferStreamStops="Не припиняти Буфер Повторів, якщо трансляцію закінчено"
+Basic.Settings.General.EnableAutoUpdates="Автоматично перевіряти наявність оновлень при запуску"
+Basic.Settings.General.OpenStatsOnStartup="Відкрийте вікно статистики при запуску"
+Basic.Settings.General.WarnBeforeStartingStream="Показати вікно підтвердження при запуску трансляцій"
+Basic.Settings.General.WarnBeforeStoppingStream="Показати вікно підтвердження при зупинці трансляцій"
+Basic.Settings.General.WarnBeforeStoppingRecord="Показати вікно підтвердження при зупинці запису"
+Basic.Settings.General.Projectors="Проєктори"
+Basic.Settings.General.HideProjectorCursor="Приховати курсор над проєкторами"
+Basic.Settings.General.ProjectorAlwaysOnTop="Показувати проєктори поверх інших вікон"
+Basic.Settings.General.Snapping="Прив’язування та вирівнювання джерел"
+Basic.Settings.General.ScreenSnapping="Прив’язувати джерела до краю екрана"
+Basic.Settings.General.CenterSnapping="Прив’язувати джерела посередині по горизонталі та вертикалі"
+Basic.Settings.General.SourceSnapping="Прив’язувати джерела до інших джерел"
+Basic.Settings.General.SnapDistance="Чутливість прив’язування"
+Basic.Settings.General.RecordWhenStreaming="Автоматично записувати під час трансляції"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Продовжувати запис після завершення трансляції"
+Basic.Settings.General.ReplayBufferWhileStreaming="Автоматично запускати буфер повторів під час трансляції"
+Basic.Settings.General.KeepReplayBufferStreamStops="Тримати буфер повторів запущеним після завершення трансляції"
 Basic.Settings.General.SysTray="Системний трей"
-Basic.Settings.General.SysTrayWhenStarted="Згорнути програму до трею при запуску"
-Basic.Settings.General.SystemTrayHideMinimize="Згортати в трей замість того, щоб мінімізувати до панелі завдань"
-Basic.Settings.General.SaveProjectors="Зберегти налаштування режиму Проектор при виході"
-Basic.Settings.General.Preview="вікно Перегляду"
-Basic.Settings.General.OverflowHidden="Не показувати надлишок з джерел за межами робочої зони"
-Basic.Settings.General.OverflowAlwaysVisible="Завжди показувати надлишок з джерел за межами робочої зони"
-Basic.Settings.General.OverflowSelectionHidden="Показувати надлишок за межами робочої зони навіть для прихованих джерел"
-Basic.Settings.General.Importers="Імпорт"
-Basic.Settings.General.AutomaticCollectionSearch="Задіяти пошук у відомих місцях розташування Наборів Сцен під час їх імпорту"
-Basic.Settings.General.SwitchOnDoubleClick="Відео-перехід до сцени за подвійним клацанням"
+Basic.Settings.General.SysTrayWhenStarted="Згорнути в системний трей при запуску"
+Basic.Settings.General.SystemTrayHideMinimize="Завжди згортати в трей замість панелі завдань"
+Basic.Settings.General.SaveProjectors="Зберігати проектори при виході"
+Basic.Settings.General.Preview="Попередній перегляд"
+Basic.Settings.General.OverflowHidden="Приховувати вихід за межі"
+Basic.Settings.General.OverflowAlwaysVisible="Вихід за межі завжди видимий"
+Basic.Settings.General.OverflowSelectionHidden="Показувати вихід за межі навіть коли джерело невидиме"
+Basic.Settings.General.Importers="Імпортери"
+Basic.Settings.General.AutomaticCollectionSearch="Шукати відомі розташування для колекцій сцен під час імпорту"
+Basic.Settings.General.SwitchOnDoubleClick="Монтажний перехід до сцени при подвійному клацанні"
 Basic.Settings.General.StudioPortraitLayout="Увімкнути портретне/вертикальне компонування"
-Basic.Settings.General.TogglePreviewProgramLabels="Показати написи: вікно Перегляду/Програма наживо"
-Basic.Settings.General.Multiview="Мульти-перегляд"
-Basic.Settings.General.Multiview.MouseSwitch="Переходити до сцени за клацанням миші"
+Basic.Settings.General.TogglePreviewProgramLabels="Показувати позначки попереднього перегляду/програми"
+Basic.Settings.General.Multiview="Багатоекранний перегляд"
+Basic.Settings.General.Multiview.MouseSwitch="Перемикання між сценами клацанням миші"
 Basic.Settings.General.Multiview.DrawSourceNames="Показувати назви сцен"
-Basic.Settings.General.Multiview.DrawSafeAreas="Показати зони безпеки (EBU R 95)"
-Basic.Settings.General.MultiviewLayout="Мульти-перегляд компонування"
+Basic.Settings.General.Multiview.DrawSafeAreas="Малювати зони безпеки (EBU R 95)"
+Basic.Settings.General.MultiviewLayout="Компонування багатоекранного перегляду"
 Basic.Settings.General.MultiviewLayout.Horizontal.Top="Горизонтально, зверху (8 сцен)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Горизонтально, знизу (8 сцен)"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Вертикально, зліва (8 сцен)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Вертикально, ліворуч (8 сцен)"
 Basic.Settings.General.MultiviewLayout.Vertical.Right="Вертикально, праворуч (8 сцен)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Горизонтально, зверху (24 сцени)"
 
 Basic.Settings.Stream="Трансляція"
-Basic.Settings.Stream.StreamType="Тип Трансляції"
+Basic.Settings.Stream.StreamType="Тип трансляції"
 Basic.Settings.Stream.Custom.UseAuthentication="Використовувати автентифікацію"
-Basic.Settings.Stream.Custom.Username="Логін"
+Basic.Settings.Stream.Custom.Username="Ім’я користувача"
 Basic.Settings.Stream.Custom.Password="Пароль"
-Basic.Settings.Stream.BandwidthTestMode="Увімкнути тест пропускної здатності"
-Basic.Settings.Stream.TTVAddon="Додатки до чату Twitch"
+Basic.Settings.Stream.BandwidthTestMode="Увімкнути режим тестування пропускної здатності"
+Basic.Settings.Stream.TTVAddon="Доповнення Twitch чату"
 Basic.Settings.Stream.TTVAddon.None="Немає"
 Basic.Settings.Stream.TTVAddon.Both="BetterTTV та FrankerFaceZ"
-Basic.Settings.Stream.MissingSettingAlert="Відсутні налаштування Трансляції"
+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.MissingUrlAndApiKey="URL-адреса та ключ трансляції відсутні.\n\nВідкрийте налаштування, щоб вказати URL-адресу та ключ трансляції на вкладці «Трансляція»."
+Basic.Settings.Stream.MissingUrl="URL-адреса трансляції відсутня.\n\nВідкрийте налаштування, щоб вказати URL-адресу трансляції на вкладці «Трансляція»."
+Basic.Settings.Stream.MissingStreamKey="Ключ трансляції відсутній.\n\nВідкрийте налаштування, щоб вказати ключ трансляції на вкладці «Трансляція»."
 
 Basic.Settings.Output="Вивід"
 Basic.Settings.Output.Format="Формат запису"
-Basic.Settings.Output.Encoder="Енкодер"
-Basic.Settings.Output.SelectDirectory="Вибір каталогу для Запису"
-Basic.Settings.Output.SelectFile="Вибір файлу для Запису"
-Basic.Settings.Output.EnforceBitrate="Застосувати примусовий бітрейт з сервісу трансляцій"
-Basic.Settings.Output.DynamicBitrate="Змінювати бітрейт підлаштовуючись до низької якості мережі"
-Basic.Settings.Output.DynamicBitrate.Beta="Змінювати бітрейт підлаштовуючись до низької якості мережі (Бета)"
-Basic.Settings.Output.DynamicBitrate.TT="Замість пропуску кадрів змінює бітрейт, підлаштовуючись до низької якості мережі.\n\nПримітка: з цією опцією, надзвичайно високе несподіване зростання помилок у мережі,\nможе викликати зростання затримки для глядачів. Відновлення бітрейту після\nпадіння може зайняти до кількох хвилин.\n\nЗараз підтримується лише для RTMP з'єднань."
+Basic.Settings.Output.Encoder="Кодувальник"
+Basic.Settings.Output.SelectDirectory="Виберіть каталог записів"
+Basic.Settings.Output.SelectFile="Виберіть файл запису"
+Basic.Settings.Output.EnforceBitrate="Примусово обмежувати бітрейт згідно з правилами сервісу трансляцій"
+Basic.Settings.Output.DynamicBitrate="Динамічно змінювати бітрейт підлаштовуючись під мережу"
+Basic.Settings.Output.DynamicBitrate.Beta="Динамічно змінювати бітрейт підлаштовуючись під мережу (бета)"
+Basic.Settings.Output.DynamicBitrate.TT="Замість пропуску кадрів динамічно змінює бітрейт на ходу, підлаштовуючись під мережу.\n\nЗауважте, що це може збільшити затримку для глядачів, якщо є значні раптові помилки мережі.\nВідновлення бітрейту до початкового значення після падіння, може зайняти до кількох хвилин.\n\nНаразі підтримується лише для RTMP протоколу."
 Basic.Settings.Output.Mode="Режим виводу"
 Basic.Settings.Output.Mode.Simple="Простий"
 Basic.Settings.Output.Mode.Adv="Розширений"
 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.EstimateUnknown="Не вдалося оцінити об'єм використання пам'яті. Будь ласка, встановіть максимальний об'єм пам'яті для Буферу Повторів вручну."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Примітка: переконайтеся, що встановили гарячу клавішу для Буферу Повторів в розділі гарячі клавіші)"
-Basic.Settings.Output.ReplayBuffer.Prefix="Буфер Повторів, Ім'я файлу, Префікс"
+Basic.Settings.Output.UseReplayBuffer="Увімкнути буфер повторів"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Максимальна тривалість повтору"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимальний обсяг пам'яті (у мегабайтах)"
+Basic.Settings.Output.ReplayBuffer.Estimate="Орієнтовне використання пам'яті: %1 МБ"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Неможливо оцінити використання пам'яті. Будь ласка, встановіть максимальний обсяг пам’яті."
+Basic.Settings.Output.ReplayBuffer.Prefix="Префікс назви файлу буфера повторів"
 Basic.Settings.Output.ReplayBuffer.Suffix="Суфікс"
-Basic.Settings.Output.Simple.SavePath="Шлях до запису"
+Basic.Settings.Output.Simple.SavePath="Шлях запису"
 Basic.Settings.Output.Simple.RecordingQuality="Якість запису"
-Basic.Settings.Output.Simple.RecordingQuality.Stream="Так само як трансляція"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Така ж як у трансляції"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Висока якість, середній розмір файлу"
-Basic.Settings.Output.Simple.RecordingQuality.HQ="Якість майже без втрат, великий розмір файлу"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Надзвичайна якість, великий розмір файлу"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Без втрат якості, надзвичайно великий розмір файлу"
-Basic.Settings.Output.Simple.Warn.VideoBitrate="Увага! Буде встановлено відео бітрейт трансляції %1, що є верхней межою для обраного сервісу трансляцій. Якщо ви хочете встановити бітрейт вищий за %1, то увімкніть Додаткові Налаштування Енкодера та зніміть прапорець \"Застосувати примусовий бітрейт з сервісу трансляцій\"."
-Basic.Settings.Output.Simple.Warn.AudioBitrate="Увага! Буде встановлено аудіо бітрейт трансляції %1, що є верхней межою для обраного сервісу трансляцій. Якщо ви хочете встановити бітрейт вищий за %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.Warn.VideoBitrate="Попередження: бітрейт відео в трансляції буде встановлено %1, що є верхньою межею для обраного сервісу трансляцій. Якщо ви впевнені, що хочете встановити бітрейт вищий за %1 – увімкніть розширені налаштування кодувальника, та зніміть прапорець «Примусово обмежувати бітрейт згідно з правилами сервісу трансляцій»."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Попередження: бітрейт аудіо в трансляції буде встановлено %1, що є верхньою межею для обраного сервісу трансляцій. Якщо ви впевнені, що хочете встановити бітрейт вищий за %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)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Апаратний (QSV)"
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Апаратний (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Апаратний (NVENC)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Програмний (x264, шаблон з низьким завантаженням ЦП, збільшує файл)"
-Basic.Settings.Output.VideoBitrate="Відео бітрейт"
-Basic.Settings.Output.AudioBitrate="Аудіо бітрейт"
-Basic.Settings.Output.Reconnect="Поновити зв'язок автоматично"
-Basic.Settings.Output.RetryDelay="Затримка перед повторною спробою"
-Basic.Settings.Output.MaxRetries="Кількість спроб"
-Basic.Settings.Output.Advanced="Увімкнути Додаткові Налаштування Енкодера"
-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="Аудіо доріжка"
-Basic.Settings.Output.Adv.Streaming="Трансляція"
-Basic.Settings.Output.Adv.ApplyServiceSettings="Застосувати примусові настройки з сервісу трансляцій"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Програмний (шаблон x264 з низьким навантаженням на ЦП, збільшує розмір файлу)"
+Basic.Settings.Output.VideoBitrate="Бітрейт відео"
+Basic.Settings.Output.AudioBitrate="Бітрейт аудіо"
+Basic.Settings.Output.Reconnect="Автоматично перепідключатися"
+Basic.Settings.Output.RetryDelay="Затримка повторення"
+Basic.Settings.Output.MaxRetries="Максимальна кількість спроб"
+Basic.Settings.Output.Advanced="Увімкнути розширені налаштування кодувальника"
+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="Звукова доріжка"
+Basic.Settings.Output.Adv.Streaming="Потокова передача"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Примусово застосувати налаштування кодувальника із сервісу трансляцій"
 Basic.Settings.Output.Adv.Audio.Track1="Доріжка 1"
 Basic.Settings.Output.Adv.Audio.Track2="Доріжка 2"
 Basic.Settings.Output.Adv.Audio.Track3="Доріжка 3"
@@ -683,134 +696,141 @@
 Basic.Settings.Output.Adv.Audio.Track5="Доріжка 5"
 Basic.Settings.Output.Adv.Audio.Track6="Доріжка 6"
 
-Basic.Settings.Output.Adv.Recording="Запис"
+Basic.Settings.Output.Adv.Recording="Записування"
 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.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="Перезаписувати, якщо файл існує"
 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.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.SaveFilter.All="Усі файли"
+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="Відео"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Формат за замовчанням"
-Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Формат контейнера, опис"
-Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Аудіо/Відео-кодек визначається з шляху до Файла або URL-адреси"
-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.GOPSize="Ключові кадри, період (кадрів)"
-Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Показати всі кодеки (навіть якщо потенційно несумісні)"
-
-FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
-
-FilenameFormatting.TT="%CCYY	Рік, чотири цифри\n%YY		Рік, останні дві цифри (00-99)\n%MM		Місяць за номером (01-12)\n%DD		День місяця, ноль попереду (01-31)\n%hh		Години у 24-год. форматі (00-23)\n%mm		Мінути (00-59)\n%ss		Секунди (00-61)\n%%		Знак % \n%a		Абревіатура дня тижня\n%A		День тижня повністю\n%b		Абревіатура місяця\n%B		Місяць повністю\n%d		День місяця, ноль попереду (01-31)\n%H		Години у 24-год. форматі (00-23)\n%I		Години у 12-год. форматі (01-12)\n%m		Місяць за номером (01-12)\n%M		Мінути (00-59)\n%p		ДП або ПП позначення\n%S		Секунди (00-61)\n%y		Рік, останні дві цифри (00-99)\n%Y		Рік\n%z		ISO 8601 поправка від UTC або часовий\n		пояс чи абревіатура\n%Z		Часовий пояс чи абревіатура\n%FPS		Кадрів на секунду\n%CRES		Роздільна здатність (Полотно)\n%ORES		Роздільна здатність (Вивід)\n%VF		Формат кольору"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Опис формату контейнера"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Аудіо/відеокодек вгаданий зі шляху або URL-адреси файлу"
+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.GOPSize="Інтервал ключових кадрів (кадри)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Показати всі кодеки (навіть потенційно несумісні)"
+
+Screenshot="Вивід знімку екрана"
+Screenshot.SourceHotkey="Вибране джерело знімку екрана"
+Screenshot.StudioProgram="Знімок екрана (програма)"
+Screenshot.Preview="Знімок екрана (попередній перегляд)"
+Screenshot.Scene="Знімок екрана (сцена)"
+Screenshot.Source="Знімок екрана (джерело)"
+
+FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S\n%d-%m-%Y %H-%M-%S-%z\n%d-%m-%Y %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
+
+FilenameFormatting.TT="%CCYY	Рік, чотири цифри\n%YY		Рік, останні дві цифри (00-99)\n%MM		Місяць, у вигляді десяткового числа (01-12)\n%DD		День місяця, доповнений нулем (01-31)\n%hh		Година, у 24-годинному форматі (00-23)\n%mm		Хвилина (00-59)\n%ss		Секунда (00-61)\n%%		Знак % \n%a		Скорочена назва дня тижня\n%A		Повна назва дня тижня\n%b		Скорочена назва місяця\n%B		Повна назва місяця\n%d		День місяця, доповнений нулем (01-31)\n%H		Година, у 24-годинному форматі (00-23)\n%I		Година, у 12-годинному форматі (01-12)\n%m		Місяць, у вигляді десяткового числа (01-12)\n%M		Хвилина (00-59)\n%p		Позначка AM чи PM\n%S		Секунда (00-61)\n%y		Рік, останні дві цифри (00-99)\n%Y		Рік\n%z		Зміщення UTC в часовій зоні за стандартом ISO 8601\n%Z		Назва або абревіатура часового поясу\n%FPS		Кадрів в секунду\n%CRES		Основна роздільна здатність (полотно)\n%ORES		Роздільна здатність виводу (масштабована)\n%VF		Формат відео"
 
 Basic.Settings.Video="Відео"
-Basic.Settings.Video.Adapter="Відеокарта"
-Basic.Settings.Video.BaseResolution="Роздільна здатність (Полотно)"
-Basic.Settings.Video.ScaledResolution="Роздільна здатність (Вивід)"
-Basic.Settings.Video.DownscaleFilter="Фільтр масштабування"
+Basic.Settings.Video.Adapter="Відеоадаптер"
+Basic.Settings.Video.BaseResolution="Основна роздільність (полотно)"
+Basic.Settings.Video.ScaledResolution="Роздільність виводу (масштабована)"
+Basic.Settings.Video.DownscaleFilter="Фільтр зменшення масштабу"
 Basic.Settings.Video.DisableAeroWindows="Вимкнути Aero (лише для Windows)"
-Basic.Settings.Video.FPS="Кадрів в секунду"
-Basic.Settings.Video.FPSCommon="Кадр/сек, загальні значення"
-Basic.Settings.Video.FPSInteger="Кадр/сек, цілі значення"
-Basic.Settings.Video.FPSFraction="Кадр/сек, дробові значення"
+Basic.Settings.Video.FPS="FPS"
+Basic.Settings.Video.FPSCommon="Поширені значення кадрів/с"
+Basic.Settings.Video.FPSInteger="Ціле значення кадрів/с"
+Basic.Settings.Video.FPSFraction="Дробове значення кадрів/с"
 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.Renderer="Рендерер"
+Basic.Settings.Video.InvalidResolution="Неприпустима роздільна здатність. Має бути [ширина]x[висота] (наприклад, 1920x1080)"
+Basic.Settings.Video.CurrentlyActive="На цю мить відео вивід активний. Вимкніть будь-які виводи, щоб змінити налаштування відео."
 Basic.Settings.Video.DisableAero="Вимкнути Aero"
 
-Basic.Settings.Video.DownscaleFilter.Bilinear="Білінійний (найшвидший, але розмито, якщо масштабувати)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="Бікубічний (чітке масштабування, 16 проб)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Ланцош (чітке масштабування, 36 проб)"
-Basic.Settings.Video.DownscaleFilter.Area="Усереднення площ (зважена сума, 4/6/9 проб)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Білінійний (найшвидший, але розмитий якщо масштабувати)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Бікубічний (чітке масштабування, 16 зразків)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Ланцош (чітке масштабування, 36 зразків)"
+Basic.Settings.Video.DownscaleFilter.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.Meters="Вимірювачі"
+Basic.Settings.Audio.MeterDecayRate="Швидкість затухання"
 Basic.Settings.Audio.MeterDecayRate.Fast="Швидко"
-Basic.Settings.Audio.MeterDecayRate.Medium="Середньо (PPM типу I)"
-Basic.Settings.Audio.MeterDecayRate.Slow="Повільно (PPM типу II)"
-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.Title="Увімкнути об'ємний звук для виводу аудіо?"
-Basic.Settings.Audio.MultichannelWarning.Confirm="Ви справді бажаєте увімкнути об'ємний звук для виводу аудіо?"
-Basic.Settings.Audio.Devices="Пристрої"
-Basic.Settings.Audio.DesktopDevice="Системне аудіо"
-Basic.Settings.Audio.DesktopDevice2="Системне аудіо 2"
+Basic.Settings.Audio.MeterDecayRate.Medium="Середня (PPM типу I)"
+Basic.Settings.Audio.MeterDecayRate.Slow="Повільна (PPM типу II)"
+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.Title="Увімкнути об'ємний звук?"
+Basic.Settings.Audio.MultichannelWarning.Confirm="Справді увімкнути об'ємний звук?"
+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.Advanced="Розширені"
+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.Advanced="Додатково"
 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.FormatWarning="Попередження: Формати кольору, які відрізняються від NV12, в першу чергу призначені для запису, і не рекомендуються для трансляцій. Трансляція може додатково навантажити ЦП через перетворення форматів."
-Basic.Settings.Advanced.Audio.BufferingTime="Розмір аудіо буфера, (мс)"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="Бездіяльність"
+Basic.Settings.Advanced.FormatWarning="Попередження: формати кольору, відмінні від NV12, в першу чергу призначені для запису, і не рекомендуються для трансляцій. Трансляція може збільшити навантаження на ЦП через перетворення формату кольору."
+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="За замовчанням"
-Basic.Settings.Advanced.Audio.DisableAudioDucking="Вимкнути у Windows опцію зменшення гучності під час зв'язку"
+Basic.Settings.Advanced.Audio.MonitoringDevice="Пристрій прослуховування"
+Basic.Settings.Advanced.Audio.MonitoringDevice.Default="За замовчуванням"
+Basic.Settings.Advanced.Audio.DisableAudioDucking="Вимкнути приглушення звуку Windows"
 Basic.Settings.Advanced.StreamDelay="Затримка трансляції"
 Basic.Settings.Advanced.StreamDelay.Duration="Тривалість"
-Basic.Settings.Advanced.StreamDelay.Preserve="Зберегати точку роз'єднання (збільшує затримку) під час встановлення нового зв'язку"
-Basic.Settings.Advanced.StreamDelay.MemoryUsage="Буде використано пам'яті: %1 МБ"
+Basic.Settings.Advanced.StreamDelay.Preserve="Зберігати точку роз'єднання (збільшує затримку) під час відновлення з’єднання"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Розрахункове використання пам'яті: %1 МБ"
 Basic.Settings.Advanced.Network="Мережа"
-Basic.Settings.Advanced.Network.BindToIP="Прив'язати до адаптера (IP)"
-Basic.Settings.Advanced.Network.EnableNewSocketLoop="Увімкнути оптимізації в управлінні мережею"
-Basic.Settings.Advanced.Network.EnableLowLatencyMode="Увімкнути заспокоєння TCP активності програми"
-Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Намагається зробити RTMP вивід таким, щоб він менш заважав іншим програмам чутливими до затримки\nу передачі даних. Досягається через керування обсягу пакетів у буфері передачі. У мережах\nз низькою якістю зв'язку може збільшити кількість втрачених кадрів."
-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"
-Basic.Settings.Advanced.AutoRemux.MP4="(записувати як .mkv)"
-
-Basic.AdvAudio="Розширені Налаштування Аудіо"
-Basic.AdvAudio.ActiveOnly="Лише активні Джерела"
+Basic.Settings.Advanced.Network.BindToIP="Прив'язати до IP"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Увімкнути оптимізації мережі"
+Basic.Settings.Advanced.Network.EnableLowLatencyMode="Увімкнути TCP pacing"
+Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Намагається регулюванням швидкості передачі зменшити вплив RTMP виводу на інші, чутливі до затримки програми в мережі.\nЦе може збільшити шанс втрати кадрів на нестабільних з'єднаннях."
+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"
+Basic.Settings.Advanced.AutoRemux.MP4="(записувати як mkv)"
+
+Basic.AdvAudio="Розширені налаштування аудіо"
+Basic.AdvAudio.ActiveOnly="Лише активні джерела"
 Basic.AdvAudio.Name="Назва"
 Basic.AdvAudio.Volume="Гучність"
 Basic.AdvAudio.Mono="Моно"
 Basic.AdvAudio.Balance="Баланс"
 Basic.AdvAudio.SyncOffset="Зсув синхронізації"
-Basic.AdvAudio.Monitoring="Тестування Аудіо (на слух)"
-Basic.AdvAudio.Monitoring.None="Тест вимкнено"
-Basic.AdvAudio.Monitoring.MonitorOnly="Слухати, але не Виводити"
-Basic.AdvAudio.Monitoring.Both="Слухати та Виводити"
+Basic.AdvAudio.Monitoring="Прослуховування звуку"
+Basic.AdvAudio.Monitoring.None="Прослуховування вимкнено"
+Basic.AdvAudio.Monitoring.MonitorOnly="Тільки прослуховування (заглушити вивід)"
+Basic.AdvAudio.Monitoring.Both="Прослуховування та вивід"
 Basic.AdvAudio.AudioTracks="Доріжки"
 
 Basic.Settings.Hotkeys="Гарячі клавіші"
@@ -822,7 +842,7 @@
 Basic.SystemTray.Show="Показати"
 Basic.SystemTray.Hide="Приховати"
 
-Basic.SystemTray.Message.Reconnecting="З'єднання розірвано. Повторне підключення..."
+Basic.SystemTray.Message.Reconnecting="З'єднання розірвано. Відновлюю з’єднання…"
 
 Hotkeys.Insert="Insert"
 Hotkeys.Delete="Delete"
@@ -837,13 +857,13 @@
 Hotkeys.Tab="Tab"
 Hotkeys.Print="Print"
 Hotkeys.Pause="Pause"
-Hotkeys.Left="Left"
-Hotkeys.Right="Right"
-Hotkeys.Up="Up"
-Hotkeys.Down="Down"
+Hotkeys.Left="Стрілка вліво"
+Hotkeys.Right="Стрілка вправо"
+Hotkeys.Up="Стрілка вверх"
+Hotkeys.Down="Стрілка вниз"
 Hotkeys.Windows="Windows"
 Hotkeys.Super="Super"
-Hotkeys.Menu="Menu"
+Hotkeys.Menu="Меню"
 Hotkeys.Space="Пробіл"
 Hotkeys.NumpadNum="Numpad %1"
 Hotkeys.NumpadMultiply="Numpad Multiply"
@@ -858,62 +878,75 @@
 Hotkeys.AppleKeypadSubtract="- (Keypad)"
 Hotkeys.AppleKeypadDecimal=". (Keypad)"
 Hotkeys.AppleKeypadEqual="= (Keypad)"
-Hotkeys.MouseButton="Mouse %1"
+Hotkeys.MouseButton="Миша %1"
 Hotkeys.Escape="Esc"
 
 Mute="Вимкнути звук"
 Unmute="Увімкнути звук"
-Push-to-mute="Натисніть-щоб-відключити"
-Push-to-talk="Натисніть-щоб-говорити"
+Push-to-mute="Вимкнути утримуванням клавіші"
+Push-to-talk="Увімкнути утримуванням клавіші"
 
-SceneItemShow="Показувати '%1'"
+SceneItemShow="Показати '%1'"
 SceneItemHide="Приховати '%1'"
 
-OutputWarnings.NoTracksSelected="Ви повинні вибрати хоча б одну аудіо-доріжку"
-OutputWarnings.MP4Recording="Попередження: Запис в MP4/MOV може стати невиправно пошкодженим, якщо файл не буде завершено (наприклад, в результаті BSOD, втрати живлення і т.п.). Якщо ви хочете, мати запис декількох звукових доріжок спробуйте використати MKV та зробіть ремультиплексацію запису до MP4/MOV після того, як запис буде закінчено (Файл → Ремультиплексація Записів)"
-OutputWarnings.CannotPause="Попередження: Запис не може бути Призупинено, якщо якість встановлено у \"(Використовувати енкодер трансляцій)\""
+OutputWarnings.NoTracksSelected="Ви повинні вибрати хоча б одну доріжку"
+OutputWarnings.MP4Recording="Попередження: записи, збережені у форматі MP4/MOV, які не вдасться завершити (наприклад, внаслідок BSOD, втрат електроенергії тощо), не підлягають відновленню. Якщо ви хочете записати кілька аудіозаписів, подумайте про використання MKV та зробіть ремультиплексування запису в MP4/MOV після завершення запису (Файл → Ремультиплексувати записи)"
+OutputWarnings.CannotPause="Попередження: неможливо призупинити записування, якщо вибрано «(Використовувати кодувальник трансляції)»"
 
 FinalScene.Title="Видалення сцени"
-FinalScene.Text="Повинна бути принаймні одна сцена."
+FinalScene.Text="Тут має бути хоча б одна сцена."
 
-NoSources.Title="Немає Джерел"
-NoSources.Text="Схоже, що ви не ще додали будь-якого відео Джерела. Таким чином на виводі буде лише порожній екран. Ви справді бажаєте це зробити?"
-NoSources.Text.AddSource="Ви можете будь-коли додати Джерела, натиснувши на значок (+) під панеллю Джерела в головному вікні."
-NoSources.Label="У вас немає джерел.\nКлацніть кнопку + , що нижче,\nчи клацніть правою та додайте нове."
+NoSources.Title="Немає джерел"
+NoSources.Text="Схоже, жодних джерел відео ще не додано, тому на виводі буде лише порожній екран. Ви впевнені, що хочете це зробити?"
+NoSources.Text.AddSource="Ви можете будь-коли додати джерела, натискаючи піктограму + під панеллю «Джерела» у головному вікні."
+NoSources.Label="У вас немає джерел.\nКлацніть на кнопку + внизу,\nчи додайте його в контекстному меню."
 
-ChangeBG="Позначити кольором"
-CustomColor="Особливий колір"
+ChangeBG="Встановити колір"
+CustomColor="Спеціальний колір"
 
-BrowserSource.EnableHardwareAcceleration="Задіяти апаратне прискорення для джерела 'Браузер'"
+BrowserSource.EnableHardwareAcceleration="Увімкнути апаратне прискорення для джерела «Браузер»"
 
 About="Про програму"
-About.Info="OBS Studio - це програмне забезпечення для відео запису та трансляцій наживо з відкритим вихідним кодом."
+About.Info="OBS Studio – це вільне та відкрите програмне забезпечення для запису відео та трансляцій в прямому ефірі."
 About.Donate="Зробити внесок"
 About.GetInvolved="Взяти участь"
 About.Authors="Автори"
 About.License="Ліцензія"
 About.Contribute="Підтримати проект OBS"
 
-AddUrl.Title="Додати джерело через додавання URL-адреси"
-AddUrl.Text="Ви перетягнули URL-адресу до OBS. Це автоматично додасть посилання як нове джерело. Продовжити?"
-AddUrl.Text.Url="URL-адреса: %1"
+AddUrl.Title="Додати джерело через URL-адресу"
+AddUrl.Text="Ви перетягнули URL-адресу в OBS. Це автоматично додасть посилання як джерело. Продовжити?"
+AddUrl.Text.Url="URL: %1"
 
-ResizeOutputSizeOfSource="Встановити (Вивід) за розміром Джерела"
-ResizeOutputSizeOfSource.Text="Параметри: Роздільна здатність (Полотно) та Роздільна здатність (Вивід), буде встановлено у розмір обраного Джерела."
+ResizeOutputSizeOfSource="Масштабувати вивід (розмір джерела)"
+ResizeOutputSizeOfSource.Text="Роздільна здатність полотна та виводу будуть змінені на роздільність поточного джерела."
 ResizeOutputSizeOfSource.Continue="Ви хочете продовжити?"
 
-PreviewTransition="Перегляд Відео-переходу"
+PreviewTransition="Перегляд переходу"
 
-Importer="Імпорт Набору Сцен"
-Importer.SelectCollection="Оберіть Набір Сцен"
-Importer.Collection="Набір Сцен"
-Importer.HelpText="Додайте файли до цього вікна для імпорту набору сцен з OBS чи інших підтримуваних програм."
-Importer.Path="Шлях до Набору Сцен"
+Importer="Імпортер колекції сцен"
+Importer.SelectCollection="Виберіть колекцію сцен"
+Importer.Collection="Колекція сцен"
+Importer.HelpText="Додайте файли до цього вікна для імпорту колекції сцен з OBS чи інших підтримуваних програм."
+Importer.Path="Шлях до колекції"
 Importer.Program="Виявлена програма"
-Importer.AutomaticCollectionPrompt="Автоматичний пошук Набору Сцен"
-Importer.AutomaticCollectionText="OBS може автоматично знайти Набір Сцен для імпорту з підтримуваних сторонніх програм. Бажаєте, щоб OBS автоматично знайшов для вас наявні набори для імпорту?\n\nВи можете змінити це пізніше в меню Налаштування > Загальні > Імпорт."
+Importer.AutomaticCollectionPrompt="Автоматичний пошук колекцій сцен"
+Importer.AutomaticCollectionText="OBS може автоматично знаходити колекції сцен для імпорту з підтримуваних сторонніх програм. Бажаєте, щоб OBS автоматично знаходив для вас такі колекції?\n\nВи можете змінити це пізніше у Налаштування > Загальні > Імпортери."
 
 
 Restart="Перезапуск"
 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="Віджет пошуку медіафайлів"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/ur-PK.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/ur-PK.ini Changed

obs-studio-25.0.8.tar.xz/UI/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/vi-VN.ini Changed

@@ -1,6 +1,5 @@
 
 Language="Tiếng Việt"
-Region="Việt Nam"
 
 OK="Đồng ý"
 Apply="Áp dụng"
@@ -38,6 +37,7 @@
 SourceWindow="Hình chiếu dạng cửa sổ (phần nguồn)"
 MultiviewProjector="Giao diện nhiều lớp (Toàn màn hình)"
 MultiviewWindowed="Đa góc nhìn (chỉ cửa sổ)"
+ResizeProjectorWindowToContent="Chỉnh cửa sổ vừa với nội dung"
 Clear="Xóa"
 Revert="Phục hồi"
 Show="Hiện"
@@ -87,13 +87,21 @@
 Fullscreen="Toàn màn hình"
 Windowed="Dạng cửa sổ"
 Percent="Phần trăm"
+RefreshBrowser="Làm mới"
 AspectRatio="Tỉ lệ hiển thị <b>%1:%2</b>"
 LockVolume="Khoá âm lượng"
+LogViewer="Xem log"
+ShowOnStartup="Hiện lên khi khởi động nguồn"
+OpenFile="Mở tệp"
+AddValue="Thêm %1"
 
 AlreadyRunning.Title="OBS đã chạy"
 AlreadyRunning.Text="OBS đã chạy rồi! Trừ khi bạn muốn làm điều này, xin vui lòng tắt mọi chương trình hiện tại của OBS trước khi cố gắng chạy một chương trình mới. Nếu bạn có OBS thiết lập để thu nhỏ trên khay hệ thống, xin vui lòng kiểm tra để xem nếu nó vẫn đang chạy hay không."
 AlreadyRunning.LaunchAnyway="Khởi động luôn"
 
+ChromeOS.Title="Nền tảng không được hỗ trợ"
+ChromeOS.Text="Có vẻ OBS đang được chạy trên ChromeOS. Nền tảng này không được hỗ trợ"
+
 DockCloseWarning.Title="Đóng cửa sổ gắn đế được"
 DockCloseWarning.Text="Bạn vừa đóng một cửa số gắn đế được. Nếu bạn muốn hiển thị lại lần nữa, sử dụng trình đơn Hiển thị → Thanh đế trên thanh trình đơn."
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="Châu Á"
 BandwidthTest.Region.Other="Khác"
 
-Basic.FirstStartup.RunWizard="Bạn có muốn chạy trình cấu hình tự động? Bạn có thể cấu hình bằng tay các thiết đặt của bạn bằng cách nhấn vào nút Thiết đặt trong cửa sổ chính."
-Basic.FirstStartup.RunWizard.NoClicked="Nếu bạn thay đổi, bạn có thể chạy trình cấu hình tự động bất kỳ lúc nào từ menu Công 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.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 streaming, quay phim là thứ cấp"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Tối ưu hóa chỉ cho quay hình, tôi sẽ không phát luồng"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Tôi sẽ chỉ sử dụng máy quay ảo"
 Basic.AutoConfig.VideoPage="Thiết đặt video"
-Basic.AutoConfig.VideoPage.SubTitle="Chỉ rõ các thiết đặt video bạn muốn sử dụng"
+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)"
@@ -183,6 +189,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Mã hóa quay video"
 Basic.AutoConfig.TestPage.Result.Header="Chương trình đã xác định được cài đặt lý tưởng nhất dành cho bạn:"
 Basic.AutoConfig.TestPage.Result.Footer="Để sử dụng các thiết đặt này, nhấp vào Áp dụng thiết đặt. Để cấu hình lại và thử lại, bấm Lùi lại. Để cấu hình thiết đặt bằng tay, bấm Hủy bỏ và mở Thiết đặt."
+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 Công cụ."
 
 Basic.Stats="Thống kê"
 Basic.Stats.CPUUsage="Sử dụng CPU"
@@ -290,14 +298,15 @@
 Output.RecordError.Title="Lỗi ghi âm"
 Output.RecordError.Msg="Một lỗi không xác định xảy ra trong khi ghi âm."
 Output.RecordError.EncodeErrorMsg="Xảy ra lỗi mã hóa trong khi ghi."
-Output.ReplayBuffer.NoHotkey.Title="Không có hotkey!"
-Output.ReplayBuffer.NoHotkey.Msg="Không hotkey lưu replay buffer. Vui lòng đặt hotkey \"Lưu\" để sử dụng để lưu video."
 
 Output.BadPath.Title="Đường dẫn tệp xấu"
 Output.BadPath.Text="Đường dẫn đầu ra của cấu hình tệp không hợp lệ. Xin vui lòng kiểm tra thiết đặt của bạn để xác nhận rằng một đường dẫn hợp lệ tập tin đã được đặt."
 
 LogReturnDialog="Đăng tải lên thành công"
+LogReturnDialog.Description="File log của bạn đã được đăng tải. Bạn có thể chia sẻ đường dẫn URL để được gỡ rối hoặc với mục đích hỗ trợ."
+LogReturnDialog.Description.Crash="File báo cáo crash của bạn đã được đăng tải. Bạn có thể chia sẻ đường dẫn URL để được gỡ rỗi hoặc với mục đích hỗ trợ."
 LogReturnDialog.CopyURL="Chép địa chỉ"
+LogReturnDialog.AnalyzeURL="Phân tích"
 LogReturnDialog.ErrorUploadingLog="Lỗi tải lên tập tin đăng nhập"
 
 Remux.SourceFile="Ghi âm OBS"
@@ -461,6 +470,7 @@
 Basic.Main.StartReplayBuffer="Bắt đầu Replay Buffer"
 Basic.Main.SaveReplay="Lưu bản phát lại"
 Basic.Main.StartStreaming="Bắt đầu phát luồng"
+Basic.Main.StartVirtualCam="Bắt đầu máy quay ảo"
 Basic.Main.StopRecording="Dừng ghi"
 Basic.Main.PauseRecording="Tạm dừng ghi hình"
 Basic.Main.UnpauseRecording="Tiếp tục ghi hình"
@@ -470,6 +480,7 @@
 Basic.Main.StopStreaming="Ngừng phát luồng"
 Basic.Main.StoppingStreaming="Đang dừng stream..."
 Basic.Main.ForceStopStreaming="Ngừng phát luồng (huỷ chậm trễ)"
+Basic.Main.StopVirtualCam="Dừng máy quay ảo"
 Basic.Main.Group="Nhóm %1"
 Basic.Main.GroupItems="Nhóm đã chọn"
 Basic.Main.Ungroup="Tháo nhóm"
@@ -525,7 +536,6 @@
 Basic.MainMenu.View.Docks.ResetUI="Đặt lại UI"
 Basic.MainMenu.View.Docks.LockUI="Khóa UI"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="Thanh đế trình duyệt tùy chỉnh..."
-Basic.MainMenu.View.Toolbars.Listboxes="&Listboxes"
 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)"
@@ -587,7 +597,9 @@
 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.StudioPortraitLayout="Bật bố cục theo chiều ngang/dọc"
+Basic.Settings.General.TogglePreviewProgramLabels="Hiện nhãn của xem trước/chương trình"
 Basic.Settings.General.Multiview="Đa góc nhìn"
+Basic.Settings.General.Multiview.MouseSwitch="Click để chuyển cảnh"
 Basic.Settings.General.Multiview.DrawSourceNames="Hiện tên cảnh"
 Basic.Settings.General.Multiview.DrawSafeAreas="Vẽ khu vực an toàn (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Giao diện nhiều lớp"
@@ -627,7 +639,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Bộ nhớ tối đa (Megabyte)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Ước tính bộ nhớ sử dụng: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Không thể ước tính sử dụng bộ nhớ. Xin vui lòng thiết lập giới hạn bộ nhớ tối đa."
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Lưu ý: Hãy chắc chắn thiết lập một hotkey cho replay buffer trong phần hotkey)"
 Basic.Settings.Output.ReplayBuffer.Suffix="Hậu tố"
 Basic.Settings.Output.Simple.SavePath="Đường dẫn ghi âm"
 Basic.Settings.Output.Simple.RecordingQuality="Chất lượng ghi âm"
@@ -635,6 +646,7 @@
 Basic.Settings.Output.Simple.RecordingQuality.Small="Chất lượng cao, Trung bình kích thước"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Không thể phân biệt chất lượng, lớn kích thước"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Lossless chất lượng, rất lớn tập tin kích thước"
+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.Encoder="Chú ý: Ghi âm với một phần mềm mã hóa ở một chất lượng khác nhau hơn dòng sẽ yêu cầu phụ CPU sử dụng nếu bạn suối và hồ sơ cùng một lúc."
 Basic.Settings.Output.Simple.Warn.Lossless="Cảnh báo: Lossless chất lượng tạo ra kích thước tập tin rất lớn! Lossless chất lượng có thể sử dụng upward of 7 GB không gian đĩa cho một phút ở độ phân giải cao và framerates. Lossless không nên dùng cho bản ghi âm dài trừ khi bạn có một số lượng rất lớn của không gian đĩa sẵn dùng."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Bạn có chắc bạn muốn sử dụng lossless chất lượng?"
@@ -695,6 +707,11 @@
 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ộ mã hóa (ngay cả khi không tương thích)"
 
+Screenshot="Đầu ra chụp màn hình"
+Screenshot.StudioProgram="Chụp màn hình (Chương trình)"
+Screenshot.Scene="Chụp màn hình (Cảnh)"
+Screenshot.Source="Chụp màn hình (Nguồn)"
+
 
 
 Basic.Settings.Video="Video"
@@ -724,7 +741,12 @@
 Basic.Settings.Audio.Meters="Công tơ"
 Basic.Settings.Audio.MeterDecayRate="Tốc độ phân rã"
 Basic.Settings.Audio.MeterDecayRate.Fast="Nhanh"
-Basic.Settings.Audio.Devices="Thiết bị"
+Basic.Settings.Audio.MeterDecayRate.Medium="Trung bình (Loại I PPM)"
+Basic.Settings.Audio.MeterDecayRate.Slow="Chậm (Loại II PPM)"
+Basic.Settings.Audio.MultiChannelWarning.Enabled="CẢNH BÁO: Âm thanh vòm đang kích hoạt."
+Basic.Settings.Audio.MultichannelWarning.Title="Kích hoạt âm thanh vòm?"
+Basic.Settings.Audio.MultichannelWarning.Confirm="Bạn có chắc chắc muốn kích hoạt âm thanh vòm?"
+Basic.Settings.Audio.Devices="Thiết bị âm thanh chung"
 Basic.Settings.Audio.DesktopDevice="Âm thanh máy tính để bàn"
 Basic.Settings.Audio.DesktopDevice2="Âm thanh máy tính để bàn 2"
 Basic.Settings.Audio.AuxDevice="Âm thanh mic/phụ"
@@ -761,10 +783,12 @@
 Basic.Settings.Advanced.Network="Mạng"
 Basic.Settings.Advanced.Network.BindToIP="Liên kết với IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Bật tối ưu hóa mạng"
+Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Không bao giờ tắt phím nóng"
 Basic.Settings.Advanced.AutoRemux="Tự động ghép lại thành mp4"
 Basic.Settings.Advanced.AutoRemux.MP4="(ghi với định dạng mkv)"
 
 Basic.AdvAudio="Thuộc tính âm thanh nâng cao"
+Basic.AdvAudio.ActiveOnly="Chỉ những nguồn hoạt động"
 Basic.AdvAudio.Name="Tên"
 Basic.AdvAudio.Volume="Âm lượng"
 Basic.AdvAudio.Mono="Đơn"
@@ -838,12 +862,15 @@
 FinalScene.Text="Cần có ít nhất một cảnh."
 
 NoSources.Title="Không có nguồn"
+NoSources.Label="Bạn không có nguồn nào cả.\nNháy vào nút + bên dưới,\nHoặc nháy chuột phải vào đây để thêm một cái."
 
 ChangeBG="Thiết lập màu sắc"
 CustomColor="Tùy chỉnh màu sắc"
 
+BrowserSource.EnableHardwareAcceleration="Kích hoạt tăng tốc phần cứng cho nguồn trình duyệt"
 
 About="Giới thiệu"
+About.Info="OBS Studio là một phần mềm phát trực tiếp và quay video mã nguồn mở và miễn phí."
 About.Donate="Quyên góp"
 About.GetInvolved="Tham gia"
 About.Authors="Các tác giả"
@@ -854,8 +881,11 @@
 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ứ?"
 AddUrl.Text.Url="URL: %1"
 
+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 đổi kích thước theo kích thước của nguồn hiện tại."
 ResizeOutputSizeOfSource.Continue="Bạn có muốn tiếp tục không?"
 
+PreviewTransition="Xem trước chuyển cảnh"
 
 Importer="Bộ nhập bộ sưu tập cảnh"
 Importer.SelectCollection="Chọn một bộ sưu tập cảnh"
@@ -870,3 +900,6 @@
 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?"
 
+ContextBar.NoSelectedSource="Chưa chọn nguồn nào"
+
+

obs-studio-25.0.8.tar.xz/UI/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/zh-CN.ini Changed

@@ -1,6 +1,5 @@
 
 Language="简体中文"
-Region="中华人民共和国"
 
 OK="确定"
 Apply="应用"
@@ -38,6 +37,7 @@
 SourceWindow="窗口投影（源）"
 MultiviewProjector="多视图（全屏）"
 MultiviewWindowed="多视图（窗口）"
+ResizeProjectorWindowToContent="调整窗口到内容"
 Clear="清除"
 Revert="还原"
 Show="显示"
@@ -47,8 +47,8 @@
 New="新建"
 Duplicate="复制"
 Enable="启用"
-DisableOSXVSync="禁用 OSX V-Sync"
-ResetOSXVSyncOnExit="退出时重置 OSX V-Sync"
+DisableOSXVSync="禁用 macOS V-Sync"
+ResetOSXVSyncOnExit="退出时重置 macOS V-Sync"
 HighResourceUsage="编码过载！请考虑降低视频设置或使用更快的编码预设。"
 Transition="转场特效"
 QuickTransitions="快速转场特效"
@@ -67,11 +67,11 @@
 Export="导出"
 Copy="复制"
 Paste="粘贴"
-PasteReference="粘贴(引用)"
-PasteDuplicate="粘贴(重复)"
+PasteReference="粘贴 (引用)"
+PasteDuplicate="粘贴 (副本)"
 RemuxRecordings="录像转封装"
-Next="前进"
-Back="后退"
+Next="下一步"
+Back="上一步"
 Defaults="默认"
 HideMixer="在混音器中隐藏"
 TransitionOverride="覆盖默认转场特效"
@@ -87,13 +87,21 @@
 Fullscreen="全屏"
 Windowed="窗口化"
 Percent="百分比"
+RefreshBrowser="刷新"
 AspectRatio="长宽比 <b>%1:%2</b>"
 LockVolume="锁定音量"
+LogViewer="日志查看器"
+ShowOnStartup="启动时显示"
+OpenFile="打开文件"
+AddValue="添加 %1"
 
 AlreadyRunning.Title="OBS 已在运行"
 AlreadyRunning.Text="OBS 已经在运行中！若你真的想要这样做，请在启动新的 OBS 前关闭其他正在在运行中的 OBS。如果你把 OBS 设置成最小化到系统托盘，请检查它是否仍在运行。"
 AlreadyRunning.LaunchAnyway="仍然启动"
 
+ChromeOS.Title="不支持的平台"
+ChromeOS.Text="OBS 似乎在 ChromeOS 容器内运行。此平台不受支持"
+
 DockCloseWarning.Title="关闭可停靠窗口"
 DockCloseWarning.Text="您刚关闭了一个可停靠的窗口。如果想要再次显示它，请使用菜单栏上的 查看→停靠部件 菜单。"
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="亚洲"
 BandwidthTest.Region.Other="其他"
 
-Basic.FirstStartup.RunWizard="你想要运行自动配置向导吗？你也可以通过单击主窗口中的设置按钮来手动调节你的设置。"
-Basic.FirstStartup.RunWizard.NoClicked="如果你改变了主意，可以随时从工具菜单再次运行自动配置向导。"
-
 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.SubTitle="指定您想要使用的视频设置"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="使用当前的（%1x%2）"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="显示器 %1（%2x%3）"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="使用当前（%1）"
@@ -183,6 +189,8 @@
 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="CPU 使用率"
@@ -218,8 +226,8 @@
 Updater.NoUpdatesAvailable.Title="无可用更新"
 Updater.NoUpdatesAvailable.Text="当前没有可用更新"
 Updater.FailedToLaunch="启动更新程序失败"
-Updater.GameCaptureActive.Title="游戏捕获活跃"
-Updater.GameCaptureActive.Text="游戏捕获钩子库正在使用中。请关闭所有正在被捕获的游戏/程序（或重新启动 Windows），然后重试。"
+Updater.GameCaptureActive.Title="游戏采集运行中"
+Updater.GameCaptureActive.Text="游戏采集钩子库正在使用中。请关闭所有正在采集的游戏和程序（或重新启动 Windows）然后重试。"
 
 QuickTransitions.SwapScenes="在转场后交换预览/输出场景"
 QuickTransitions.SwapScenesTT="（如果输出的原始场景仍存在）在转场后交换预览和输出场景。\n这将不会撤消任何对输出的原始场景的更改。"
@@ -243,7 +251,7 @@
 TitleBar.Scenes="场景"
 
 NameExists.Title="名称已存在"
-NameExists.Text="该名称已被使用"
+NameExists.Text="该名称已被使用。"
 
 NoNameEntered.Title="请输入一个有效的名称"
 NoNameEntered.Text="您不能使用空白名称。"
@@ -261,10 +269,10 @@
 ConfirmBWTest.Text="您已经在带宽测试模式下配置了 OBS。此模式允许在不启用频道的情况下进行网络测试。完成测试后，您需要禁用它，以便观众能够看到您的流。\n\n是否继续？"
 
 ConfirmExit.Title="退出OBS?"
-ConfirmExit.Text="OBS工作中. 所有的流/录像将会停止. 你确定想要退出吗?"
+ConfirmExit.Text="OBS 正在运行。将停止所有的推流和录像。确定要退出吗？"
 
-ConfirmRemove.Title="确认移除"
-ConfirmRemove.Text="确定要删除 '$1' 吗？"
+ConfirmRemove.Title="确认删除"
+ConfirmRemove.Text="确定要删除“$1”吗？"
 ConfirmRemove.TextMultiple="您确定要删除 %1 项目吗？"
 
 Output.StartStreamFailed="启动串流失败"
@@ -292,14 +300,15 @@
 Output.RecordError.Title="录像错误"
 Output.RecordError.Msg="录像时发生了预料外的错误。"
 Output.RecordError.EncodeErrorMsg="录制时发生了编码器错误。"
-Output.ReplayBuffer.NoHotkey.Title="没有设置快捷键！"
-Output.ReplayBuffer.NoHotkey.Msg="没有为回放缓存设置保存快捷键。请设置“保存回放”的快捷键，用于保存回放录像。"
 
 Output.BadPath.Title="文件路径错误"
 Output.BadPath.Text="输出路径无效。请检查您的设置，并确认文件路径有效。"
 
 LogReturnDialog="日志上传成功"
+LogReturnDialog.Description="您的日志文件已上传。您现在可以分享URL用来调试。"
+LogReturnDialog.Description.Crash="您的崩溃报告已上传。您现在可以分享URL用来调试。"
 LogReturnDialog.CopyURL="复制链接"
+LogReturnDialog.AnalyzeURL="分析"
 LogReturnDialog.ErrorUploadingLog="日志上传失败"
 
 Remux.SourceFile="OBS 录像"
@@ -331,7 +340,7 @@
 Basic.AuxDevice4="麦克风/Aux 4"
 
 Basic.Scene="场景"
-Basic.DisplayCapture="显示器捕获"
+Basic.DisplayCapture="显示器采集"
 
 Basic.Main.PreviewConextMenu.Enable="开启预览"
 
@@ -344,17 +353,17 @@
 ScaleFiltering.Lanczos="兰索斯算法"
 ScaleFiltering.Area="区域"
 
-Deinterlacing="去隔行扫描"
-Deinterlacing.Discard="舍弃"
-Deinterlacing.Retro="复古"
-Deinterlacing.Blend="混合"
-Deinterlacing.Blend2x="混合 2x"
-Deinterlacing.Linear="线性"
-Deinterlacing.Linear2x="线性 2x"
+Deinterlacing="反交错"
+Deinterlacing.Discard="Discard"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
 Deinterlacing.Yadif="Yadif"
 Deinterlacing.Yadif2x="Yadif 2x"
-Deinterlacing.TopFieldFirst="上场优先"
-Deinterlacing.BottomFieldFirst="下场优先"
+Deinterlacing.TopFieldFirst="顶场优先"
+Deinterlacing.BottomFieldFirst="底场优先"
 
 VolControl.SliderUnmuted="音量滑动条 '%1': %2"
 VolControl.SliderMuted="音量滑动条 '%1': %2 (当前静音)"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="开始回放缓存"
 Basic.Main.SaveReplay="保存回放"
 Basic.Main.StartStreaming="开始推流"
+Basic.Main.StartVirtualCam="启动虚拟摄像机"
 Basic.Main.StopRecording="停止录制"
 Basic.Main.PauseRecording="暂停录制"
 Basic.Main.UnpauseRecording="恢复录制"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="停止推流"
 Basic.Main.StoppingStreaming="停止推流..."
 Basic.Main.ForceStopStreaming="停止流 (放弃延迟)"
+Basic.Main.ShowContextBar="显示源工具栏"
+Basic.Main.HideContextBar="隐藏源工具栏"
+Basic.Main.StopVirtualCam="停止虚拟摄像机"
 Basic.Main.Group="分组 %1"
 Basic.Main.GroupItems="对所选项目进行分组"
 Basic.Main.Ungroup="取消分组"
@@ -521,13 +534,14 @@
 Basic.MainMenu.Edit.Order.MoveToBottom="移至底层(&B)"
 Basic.MainMenu.Edit.AdvAudio="高级音频属性(&A)"
 
-Basic.MainMenu.View="查看(&V)"
+Basic.MainMenu.View="视图(&V)"
 Basic.MainMenu.View.Toolbars="工具栏(&T)"
 Basic.MainMenu.View.Docks="停靠部件"
 Basic.MainMenu.View.Docks.ResetUI="重置界面"
 Basic.MainMenu.View.Docks.LockUI="锁定界面"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="自定义浏览器 Dock..."
-Basic.MainMenu.View.Toolbars.Listboxes="列表框(&L)"
+Basic.MainMenu.View.ListboxToolbars="场景/源列表按钮"
+Basic.MainMenu.View.ContextBar="源工具栏"
 Basic.MainMenu.View.SceneTransitions="转场特效(&C)"
 Basic.MainMenu.View.SourceIcons="源图标(&I)"
 Basic.MainMenu.View.StatusBar="状态栏(&S)"
@@ -539,7 +553,7 @@
 Basic.MainMenu.Profile.Export="导出配置文件"
 Basic.MainMenu.SceneCollection.Import="导入场景集合"
 Basic.MainMenu.SceneCollection.Export="导出场景集合"
-Basic.MainMenu.Profile.Exists="配置文件已存在"
+Basic.MainMenu.Profile.Exists="配置文件已存在。"
 Basic.MainMenu.SceneCollection.Exists="场景集合已存在"
 
 Basic.MainMenu.Tools="工具(&T)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="最大内存（MB）"
 Basic.Settings.Output.ReplayBuffer.Estimate="估计内存使用量：%1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="无法估计内存使用量。请设置最大内存限制。"
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="（注意：一定要在快捷键部分为保存回放缓存设置快捷键）"
 Basic.Settings.Output.ReplayBuffer.Prefix="回放缓存文件名前缀"
 Basic.Settings.Output.ReplayBuffer.Suffix="后缀"
 Basic.Settings.Output.Simple.SavePath="录像路径"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="关键帧间隔（帧）"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="显示所有编码器（即使可能不兼容）"
 
+Screenshot="截屏输出"
+Screenshot.SourceHotkey="当前所选源截屏"
+Screenshot.StudioProgram="截屏 (程序)"
+Screenshot.Preview="截屏 (预览)"
+Screenshot.Scene="截屏 (场景)"
+Screenshot.Source="截屏 (源)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY		年，4位\n%YY		年，后两位（00-99）\n%MM		月份（01-12）\n%DD		日，用0补全（01-31）\n%hh		24小时制小时（00-23）\n%mm		分钟（00-59）\n%ss		秒（00-61）\n%%		一个“%”符号\n%a		缩写工作日名称\n%A		完整工作日名称\n%b		缩写月份名称\n%B		完整月份名称\n%d		日，用0补全（01-31）\n%H		24小时制小时（00-23）\n%I		12小时制小时（01-12）\n%m		月份（01-12）\n%M		分钟（00-59）\n%p		AM 或 PM\n%S		秒（00-61）\n%y		年，后两位（00-99）\n%Y		年\n%z		与UTC的时差（ISO 8601 格式）\n%Z		时区名称或缩写\n%FPS		每秒帧数\n%CRES		基础（画布）分辨率\n%ORES		输出（缩放）分辨率\n%VF		视频格式"
@@ -750,10 +770,10 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="采样峰值"
 Basic.Settings.Audio.PeakMeterType.TruePeak="真峰值 (更高的的 CPU 使用率)"
 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虽然无法保证 VST 插件对其的支持，但 OBS 的音频滤镜与环绕立体声兼容。"
+Basic.Settings.Audio.MultichannelWarning="如果是串流，请检查您的流媒体服务是否支持环绕立体声的接收和播放。 Facebook 360 Live 是完全支持环绕立体声的一个例子。 虽然Facebook Live 和 YouTube Live都能接收环绕立体声，但是FacebookLive会缩混成双声道，而YouTube Live 仅播放两个声道。\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="麦克风/辅助音频"
@@ -779,8 +799,8 @@
 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.Video.ColorRange.Partial="Limited (推荐)"
+Basic.Settings.Advanced.Video.ColorRange.Full="Full"
 Basic.Settings.Advanced.Audio.MonitoringDevice="监听设备"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="默认"
 Basic.Settings.Advanced.Audio.DisableAudioDucking="禁用 Windows 音频闪避（检测到通信活动时降低其他声音的音量）"
@@ -874,7 +894,7 @@
 OutputWarnings.CannotPause="警告：当录像编码器设为“（使用推流编码器）”时，无法暂停录制。"
 
 FinalScene.Title="删除场景"
-FinalScene.Text="至少要有一个场景."
+FinalScene.Text="至少要有一个场景。"
 
 NoSources.Title="无来源"
 NoSources.Text="看起来您未添加任何视频源，所以我们将只会输出黑色画面。确实要这样做吗？"
@@ -917,3 +937,16 @@
 Restart="重启"
 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="媒体跳转小工具"
+

obs-studio-25.0.8.tar.xz/UI/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/UI/data/locale/zh-TW.ini Changed

@@ -1,6 +1,5 @@
 
 Language="繁體中文"
-Region="臺灣/香港/澳門"
 
 OK="確定"
 Apply="套用"
@@ -38,6 +37,7 @@
 SourceWindow="視窗化投影（來源）"
 MultiviewProjector="多檢視畫面（全螢幕）"
 MultiviewWindowed="多檢視畫面（視窗）"
+ResizeProjectorWindowToContent="縮放視窗至內容大小"
 Clear="清除"
 Revert="復原"
 Show="顯示"
@@ -47,8 +47,8 @@
 New="新增"
 Duplicate="複製"
 Enable="啟用"
-DisableOSXVSync="關閉 OSX 垂直同步"
-ResetOSXVSyncOnExit="離開時重設 OSX 垂直同步"
+DisableOSXVSync="關閉 macOS 垂直同步"
+ResetOSXVSyncOnExit="結束時重設 macOS 垂直同步"
 HighResourceUsage="編碼過載！請考慮調低影像設定，或使用更快的編碼設定檔。"
 Transition="轉場特效"
 QuickTransitions="快速轉場"
@@ -87,13 +87,21 @@
 Fullscreen="全螢幕"
 Windowed="視窗化"
 Percent="百分比"
+RefreshBrowser="重新整理"
 AspectRatio="長寬比 <b>%1:%2</b>"
 LockVolume="鎖定音量"
+LogViewer="記錄檢視器"
+ShowOnStartup="啟動時顯示"
+OpenFile="開啟檔案"
+AddValue="加入 %1"
 
 AlreadyRunning.Title="OBS 已在執行中"
 AlreadyRunning.Text="OBS 已經執行！除非你正要這麼做，否則請在執行新實體前，先關閉現存的 OBS 實體。如果你已將 OBS 設定成最小化到系統工具列，那請檢查 OBS 是否仍在該處執行。"
 AlreadyRunning.LaunchAnyway="仍然啟動"
 
+ChromeOS.Title="不支援的平台"
+ChromeOS.Text="OBS 似乎是在 ChromeOS 容器中執行。此平台不受支援"
+
 DockCloseWarning.Title="關閉停駐視窗"
 DockCloseWarning.Text="您剛關閉了一個停駐視窗。若想再次顯示，請重新在選單欄的「檢視」->「停駐視窗」選單開啟此視窗。"
 
@@ -131,17 +139,15 @@
 BandwidthTest.Region.Asia="亞洲"
 BandwidthTest.Region.Other="其他"
 
-Basic.FirstStartup.RunWizard="是否執行「自動設定精靈」？您亦可藉由按下主視窗的「設定」按鈕手動設定。"
-Basic.FirstStartup.RunWizard.NoClicked="若您改變主意，您隨時皆可在「工具」選單重新執行「自動設定精靈」。"
-
 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.SubTitle="指定想用的影片設定"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="使用現在的 (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="顯示器 %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="使用現在的 (%1)"
@@ -183,6 +189,8 @@
 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="CPU 使用率"
@@ -202,11 +210,11 @@
 Basic.Stats.DroppedFrames="丟棄的訊框 （網路）"
 Basic.Stats.MegabytesSent="總輸出資料"
 Basic.Stats.Bitrate="位元率"
-Basic.Stats.DiskFullIn="（估計）硬碟空間用盡前剩餘錄影時長"
+Basic.Stats.DiskFullIn="（估計）離磁碟空間用盡前還剩下"
 Basic.Stats.ResetStats="重設統計資料"
 
-ResetUIWarning.Title="確定要重置介面嗎?"
-ResetUIWarning.Text="重設介面將隱藏額外的停駐視窗。若想重新顯示這些停駐視窗，則需要進入「檢視」選單解除隱藏。\n\n是否重設介面？"
+ResetUIWarning.Title="您是否要重設介面？"
+ResetUIWarning.Text="重設介面會隱藏額外的停駐視窗。若想重新顯示這些停駐視窗，則需要進入「檢視」選單解除隱藏。\n\n是否重設介面？"
 
 Updater.Title="有新更新"
 Updater.Text="有新更新︰"
@@ -219,7 +227,7 @@
 Updater.NoUpdatesAvailable.Text="目前沒有更新"
 Updater.FailedToLaunch="無法啟動更新程式"
 Updater.GameCaptureActive.Title="遊戲擷取使用中"
-Updater.GameCaptureActive.Text="遊戲擷取函式庫正在使用中。 請關閉所有被擷取的遊戲/程式 （或重新開機 Windows），然後重試。"
+Updater.GameCaptureActive.Text="遊戲擷取掛鉤函式庫正在使用中。 請關閉所有正在擷取的遊戲或程式 （或重新啟動 Windows），然後重試。"
 
 QuickTransitions.SwapScenes="轉場後交換預覽/輸出場景"
 QuickTransitions.SwapScenesTT="(如果輸出的原始場景仍然存在) 轉場後交換預覽和輸出場景。\n這並不會復原任何對輸出原始場景所作的改動。"
@@ -233,7 +241,7 @@
 Basic.RemoveTransition="移除可選的轉場特效"
 Basic.TransitionProperties="轉場特效屬性"
 Basic.SceneTransitions="轉場特效"
-Basic.TransitionDuration="持續時間"
+Basic.TransitionDuration="時長"
 Basic.TogglePreviewProgramMode="工作室模式"
 
 TransitionNameDlg.Text="請輸入轉場特效名稱"
@@ -292,14 +300,15 @@
 Output.RecordError.Title="錄製錯誤"
 Output.RecordError.Msg="在錄製時發生了預料外的錯誤。"
 Output.RecordError.EncodeErrorMsg="錄影時編碼器發生錯誤。"
-Output.ReplayBuffer.NoHotkey.Title="沒有設定熱鍵 ！"
-Output.ReplayBuffer.NoHotkey.Msg="沒有為重播緩衝設定儲存重播熱鍵。請設定\"儲存重播\"熱鍵以保存重播。"
 
 Output.BadPath.Title="無效的路徑"
 Output.BadPath.Text="無效的輸出路徑。 請確認您的檔案路徑是正確的。"
 
 LogReturnDialog="上傳 Log 成功"
+LogReturnDialog.Description="已上傳您的記錄檔。您現在可以透過分享這個 URL 來偵錯及尋求支援。"
+LogReturnDialog.Description.Crash="已上傳您的當機報告。您現在可以透過分享這個 URL 來偵錯。"
 LogReturnDialog.CopyURL="複製連結"
+LogReturnDialog.AnalyzeURL="分析"
 LogReturnDialog.ErrorUploadingLog="上傳 Log 失敗"
 
 Remux.SourceFile="OBS 錄影"
@@ -463,6 +472,7 @@
 Basic.Main.StartReplayBuffer="開始重播緩衝"
 Basic.Main.SaveReplay="儲存重播"
 Basic.Main.StartStreaming="開始串流"
+Basic.Main.StartVirtualCam="啟動虛擬相機"
 Basic.Main.StopRecording="停止錄製"
 Basic.Main.PauseRecording="暫停錄影"
 Basic.Main.UnpauseRecording="繼續錄製"
@@ -472,6 +482,9 @@
 Basic.Main.StopStreaming="停止串流"
 Basic.Main.StoppingStreaming="停止串流..."
 Basic.Main.ForceStopStreaming="停止實況（丟棄延遲）"
+Basic.Main.ShowContextBar="顯示來源工具列"
+Basic.Main.HideContextBar="隱藏來源工具列"
+Basic.Main.StopVirtualCam="停止虛擬相機"
 Basic.Main.Group="群組 %1"
 Basic.Main.GroupItems="群組選取項目"
 Basic.Main.Ungroup="取消群組"
@@ -527,7 +540,8 @@
 Basic.MainMenu.View.Docks.ResetUI="重設使用者介面"
 Basic.MainMenu.View.Docks.LockUI="鎖定使用者介面"
 Basic.MainMenu.View.Docks.CustomBrowserDocks="自訂瀏覽器停駐視窗…"
-Basic.MainMenu.View.Toolbars.Listboxes="列表控制項(&L)"
+Basic.MainMenu.View.ListboxToolbars="場景/來源清單按鈕"
+Basic.MainMenu.View.ContextBar="來源工具列"
 Basic.MainMenu.View.SceneTransitions="轉場特效(&c)"
 Basic.MainMenu.View.SourceIcons="來源圖示(&I)"
 Basic.MainMenu.View.StatusBar="狀態列(&S)"
@@ -640,7 +654,6 @@
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="最大記憶體使用量(MB)"
 Basic.Settings.Output.ReplayBuffer.Estimate="估計記憶體使用量︰ %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="無法預估記憶體使用量。請設定最大記憶體使用量。"
-Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(注意：請確定在熱鍵區有為重播緩衝設定熱鍵)"
 Basic.Settings.Output.ReplayBuffer.Prefix="重播緩衝檔案名稱前綴"
 Basic.Settings.Output.ReplayBuffer.Suffix="後綴"
 Basic.Settings.Output.Simple.SavePath="錄影路徑"
@@ -698,7 +711,7 @@
 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="影像"
+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推測音訊/影像格式"
@@ -712,6 +725,13 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="關鍵訊框間隔 (訊框)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="顯示所有編碼解碼器 （即使可能不相容）"
 
+Screenshot="螢幕擷取輸出"
+Screenshot.SourceHotkey="螢幕擷取選取來源"
+Screenshot.StudioProgram="螢幕擷取 (程式)"
+Screenshot.Preview="螢幕擷取 (預覽)"
+Screenshot.Scene="螢幕擷取 (場景)"
+Screenshot.Source="螢幕擷取 (來源)"
+
 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
 
 FilenameFormatting.TT="%CCYY	年 (四位數)\n%YY		年 (末兩位數) (00-99)\n%MM		數字月 (01-12)\n%DD		月份天數 (用空白填充) (01-31)\n%hh		24 小時制小時 (00-23)\n%mm		分 (00-59)\n%ss		秒 (00-61)\n%%		% 符號\n%a		星期 (縮寫)\n%A		星期 (完整)\n%b		月份 (縮寫)\n%B		月份 (完整)\n%d		月份天數 (用空白填充) (01-31)\n%H		24 小時制小時 (00-23)\n%I		12 小時制小時 (01-12)\n%m		數字月 (01-12)\n%M		分 (00-59)\n%p		AM 或 PM 標示\n%S		秒 (00-61)\n%y		年 (末兩位數) (00-99)\n%Y		年\n%z		ISO 8601 指出自 UTC 的時區時間位移\n%Z		時區名稱或簡寫\n%FPS		每秒影格數 (FPS)\n%CRES		基礎 (畫布) 解析度\n%ORES		輸出 (縮放) 解析度\n%VF		影片格式"
@@ -750,10 +770,10 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="範例峰值"
 Basic.Settings.Audio.PeakMeterType.TruePeak="真實峰值（較高的 CPU 用量）"
 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 儘管不支持VST插件，但OBS音頻濾波器與環繞聲兼容。"
+Basic.Settings.Audio.MultichannelWarning="如果使用直播，請確認您的直播服務支援立體聲的接收和撥放。Facebook 360 live就是一個完全完整支援立體聲的例子。雖然Facebook Live和YouTube Live都支援立體聲的接收，Facebook Live會把音訊降為雙聲道，而YouTube Live只會撥放兩個聲道。\n\nOBS音訊濾鏡支援立體聲，但是無法保證VST Plugin的支援。"
 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="麥克風 / 輔助音效"
@@ -917,3 +937,16 @@
 Restart="重新啟動"
 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="媒體跳轉元件"
+

obs-studio-25.0.8.tar.xz/UI/data/themes/Acri.qss -> obs-studio-26.0.0.tar.xz/UI/data/themes/Acri.qss Changed

@@ -155,8 +155,8 @@
 
 /* Dock stuff */
 QDockWidget {
-	titlebar-close-icon: url('./Dark/Close.svg');
-	titlebar-normal-icon: url('./Dark/Popout.svg');
+	titlebar-close-icon: url('./Dark/close.svg');
+	titlebar-normal-icon: url('./Dark/popout.svg');
 }
 
 QDockWidget {
@@ -311,6 +311,24 @@
 	color: none;
 }
 
+/* Source Context */
+#contextContainer {
+    min-height: 40px;
+    max-height: 40px;
+}
+
+#contextContainer QPushButton[themeID2=contextBarButton] {
+    padding: 0px;
+}
+
+QPushButton#sourcePropertiesButton {
+    qproperty-icon: url(./Dark/settings/general.svg);
+}
+
+QPushButton#sourceFiltersButton {
+    qproperty-icon: url(./Dark/filter.svg);
+}
+
 /* Scenes and Sources toolbar */
 
 QToolBar {
@@ -345,6 +363,10 @@
 	qproperty-icon: url(./Dark/settings/general.svg);
 }
 
+* [themeID="refreshIconSmall"] {
+    qproperty-icon: url(./Dark/refresh.svg);
+}
+
 * [themeID="upArrowIconSmall"] {
 	qproperty-icon: url(./Dark/up.svg);
 }
@@ -1104,3 +1126,29 @@
 	height: 28px;
 	margin: -28px 0px;
 }
+
+/* Media icons */
+
+* [themeID="playIcon"] {
+    qproperty-icon: url(./Dark/media/media_play.svg);
+}
+
+* [themeID="pauseIcon"] {
+    qproperty-icon: url(./Dark/media/media_pause.svg);
+}
+
+* [themeID="restartIcon"] {
+    qproperty-icon: url(./Dark/media/media_restart.svg);
+}
+
+* [themeID="stopIcon"] {
+    qproperty-icon: url(./Dark/media/media_stop.svg);
+}
+
+* [themeID="nextIcon"] {
+    qproperty-icon: url(./Dark/media/media_next.svg);
+}
+
+* [themeID="previousIcon"] {
+    qproperty-icon: url(./Dark/media/media_previous.svg);
+}

obs-studio-25.0.8.tar.xz/UI/data/themes/Dark.qss -> obs-studio-26.0.0.tar.xz/UI/data/themes/Dark.qss Changed

@@ -120,8 +120,8 @@
 /* Dock Widget */
 
 QDockWidget {
-	titlebar-close-icon: url('./Dark/Close.svg');
-	titlebar-normal-icon: url('./Dark/Popout.svg');
+	titlebar-close-icon: url('./Dark/close.svg');
+	titlebar-normal-icon: url('./Dark/popout.svg');
 }
 
 QDockWidget::title {
@@ -220,6 +220,19 @@
     color: none;
 }
 
+/* Source Context */
+#contextContainer QPushButton[themeID2=contextBarButton] {
+    padding: 3px;
+    margin: 0px;
+}
+
+#contextContainer QPushButton#sourcePropertiesButton {
+    qproperty-icon: url(./Dark/settings/general.svg);
+}
+
+#contextContainer QPushButton#sourceFiltersButton {
+    qproperty-icon: url(./Dark/filter.svg);
+}
 
 /* Scenes and Sources toolbar */
 
@@ -839,3 +852,29 @@
 	height: 24px;
 	margin: -24px 0px;
 }
+
+/* Media icons */
+
+* [themeID="playIcon"] {
+    qproperty-icon: url(./Dark/media/media_play.svg);
+}
+
+* [themeID="pauseIcon"] {
+    qproperty-icon: url(./Dark/media/media_pause.svg);
+}
+
+* [themeID="restartIcon"] {
+    qproperty-icon: url(./Dark/media/media_restart.svg);
+}
+
+* [themeID="stopIcon"] {
+    qproperty-icon: url(./Dark/media/media_stop.svg);
+}
+
+* [themeID="nextIcon"] {
+    qproperty-icon: url(./Dark/media/media_next.svg);
+}
+
+* [themeID="previousIcon"] {
+    qproperty-icon: url(./Dark/media/media_previous.svg);
+}

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/filter.svg Added

@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="185.25 184.25 100 100" enable-background="new 185.25 184.25 100 100" xml:space="preserve"><g><g><g><path fill="#FFFFFF" d="M204.608,244.706l11.525,11.525c2.041,0.365,4.142,0.556,6.288,0.556c1.898,0,3.761-0.151,5.579-0.438l-22.379-22.38     c0.704-2.995,1.747-5.863,3.092-8.559l28.263,28.263c2.623-1.181,5.076-2.672,7.314-4.426l-30.99-30.99     c1.723-2.143,3.667-4.102,5.796-5.847l31.043,31.043c1.776-2.22,3.29-4.658,4.497-7.268l-28.425-28.426     c2.683-1.367,5.545-2.44,8.546-3.17l22.646,22.646c0.324-1.926,0.495-3.905,0.495-5.923c0-1.985-0.166-3.93-0.479-5.826     l-12.002-12.002c2.857,0.088,5.641,0.482,8.321,1.148c-5.969-11.183-17.752-18.795-31.315-18.795     c-19.592,0-35.475,15.883-35.475,35.475c0,13.563,7.612,25.346,18.796,31.315C205.11,250.078,204.721,247.429,204.608,244.706z"></path></g><path fill="#FFFFFF" d="M243.651,282.651c-0.88-0.002-1.77-0.034-2.644-0.095l0.587-8.494c1.239,0.086,2.503,0.097,3.757,0.035    c1.263-0.063,2.531-0.203,3.768-0.416l1.442,8.392c-1.572,0.27-3.182,0.448-4.785,0.528    C245.069,282.636,244.354,282.653,243.651,282.651z"></path><path fill="#FFFFFF"  d="M231.594,280.743c-3.043-0.982-5.969-2.335-8.695-4.023l4.482-7.24c2.142,1.326,4.439,2.389,6.828,3.159L231.594,280.743z    "></path><path fill="#FFFFFF" d="M259.738,279.319l-3.419-7.798c2.297-1.007,4.474-2.295,6.47-3.83l5.189,6.751    C265.437,276.395,262.665,278.036,259.738,279.319z"></path><path fill="#FFFFFF"  d="M215.423,270.741c-2.244-2.286-4.208-4.839-5.837-7.587l7.325-4.341c1.28,2.16,2.824,4.166,4.588,5.964L215.423,270.741z"></path><path fill="#FFFFFF"  d="M274.813,267.741l-6.647-5.322c1.575-1.967,2.909-4.12,3.965-6.398l7.725,3.58    C278.512,262.501,276.815,265.239,274.813,267.741z"></path><path fill="#FFFFFF"  d="M282.803,250.48l-8.36-1.614c0.369-1.911,0.559-3.874,0.564-5.833c0.001-0.555-0.012-1.119-0.04-1.675l-0.004-0.072    l8.504-0.425l0.004,0.073c0.035,0.703,0.052,1.418,0.05,2.122C283.515,245.547,283.273,248.046,282.803,250.48z"></path><path fill="#FFFFFF"  d="M273.677,233.877c-0.725-2.404-1.744-4.719-3.028-6.881l7.32-4.349c1.637,2.755,2.935,5.706,3.86,8.771L273.677,233.877z"></path><path fill="#FFFFFF"  d="M266.055,221.036c-1.766-1.795-3.746-3.376-5.885-4.697l4.475-7.244c2.72,1.68,5.237,3.689,7.481,5.971L266.055,221.036z"></path></g></g></svg>
\ No newline at end of file

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media Added

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media/media_next.svg Added

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media/media_pause.svg Added

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media/media_play.svg Added

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media/media_previous.svg Added

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media/media_restart.svg Added

obs-studio-26.0.0.tar.xz/UI/data/themes/Dark/media/media_stop.svg Added

obs-studio-25.0.8.tar.xz/UI/data/themes/Rachni.qss -> obs-studio-26.0.0.tar.xz/UI/data/themes/Rachni.qss Changed

@@ -189,8 +189,8 @@
 /***********************/
 
 QDockWidget {
-	titlebar-close-icon: url('./Dark/Close.svg');
-	titlebar-normal-icon: url('./Dark/Popout.svg');
+	titlebar-close-icon: url('./Dark/close.svg');
+	titlebar-normal-icon: url('./Dark/popout.svg');
 }
 
 QDockWidget {
@@ -962,7 +962,8 @@
 QPushButton:checked#modeSwitch,
 QPushButton:checked#settingsButton,
 QPushButton:checked#exitButton,
-QPushButton:checked[themeID="pauseIconSmall"] {
+QPushButton:checked[themeID="pauseIconSmall"],
+QPushButton:checked[themeID="vcamButton"] {
 	background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */
 	border: 1px solid rgba(240, 98, 146, 0.5); /* Pink (Secondary) */
 }
@@ -981,6 +982,12 @@
 QPushButton[themeID="configIconSmall"],
 QPushButton[themeID="trashIcon"],
 QPushButton[themeID="revertIcon"],
+QPushButton[themeID="playIcon"],
+QPushButton[themeID="pauseIcon"],
+QPushButton[themeID="restartIcon"],
+QPushButton[themeID="stopIcon"],
+QPushButton[themeID="nextIcon"],
+QPushButton[themeID="previousIcon"],
 QPushButton#transitionRemove,
 QPushButton#moveAsyncFilterUp,
 QPushButton#moveAsyncFilterDown,
@@ -996,6 +1003,12 @@
 QPushButton:hover[themeID="configIconSmall"],
 QPushButton:hover[themeID="trashIcon"],
 QPushButton:hover[themeID="revertIcon"],
+QPushButton:hover[themeID="playIcon"],
+QPushButton:hover[themeID="pauseIcon"],
+QPushButton:hover[themeID="restartIcon"],
+QPushButton:hover[themeID="stopIcon"],
+QPushButton:hover[themeID="nextIcon"],
+QPushButton:hover[themeID="previousIcon"],
 QPushButton:hover#transitionRemove,
 QPushButton:hover#moveAsyncFilterUp,
 QPushButton:hover#moveAsyncFilterDown,
@@ -1409,3 +1422,40 @@
 	height: 24px;
 	margin: -24px 0px;
 }
+
+/* Source Context */
+#contextContainer QPushButton[themeID2=contextBarButton] {
+    padding: 0px;
+    background: transparent;
+    border: none;
+}
+
+QPushButton#sourcePropertiesButton {
+    qproperty-icon: url(./Dark/settings/general.svg);
+}
+
+QPushButton#sourceFiltersButton {
+    qproperty-icon: url(./Dark/filter.svg);
+}
+
+/* Media icons */
+
+* [themeID="playIcon"] {
+    qproperty-icon: url(./Dark/media/media_play.svg);
+}
+
+* [themeID="pauseIcon"] {
+    qproperty-icon: url(./Dark/media/media_pause.svg);
+}
+
+* [themeID="restartIcon"] {
+    qproperty-icon: url(./Dark/media/media_restart.svg);
+}
+
+* [themeID="stopIcon"] {
+    qproperty-icon: url(./Dark/media/media_stop.svg);
+}
+
+* [themeID="nextIcon"] {
+    qproperty-icon: url(./Dark/media/media_next.svg);
+}

obs-studio-25.0.8.tar.xz/UI/data/themes/System.qss -> obs-studio-26.0.0.tar.xz/UI/data/themes/System.qss Changed

obs-studio-25.0.8.tar.xz/UI/forms/AutoConfigStartPage.ui -> obs-studio-26.0.0.tar.xz/UI/forms/AutoConfigStartPage.ui Changed

@@ -32,10 +32,77 @@
     </widget>
    </item>
    <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Basic.AutoConfig.Info</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Basic.AutoConfig.RunAnytime</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>

obs-studio-25.0.8.tar.xz/UI/forms/OBSBasic.ui -> obs-studio-26.0.0.tar.xz/UI/forms/OBSBasic.ui Changed

@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>1079</width>
-    <height>730</height>
+    <height>729</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -195,6 +195,229 @@
       </item>
      </layout>
     </item>
+    <item>
+     <widget class="QWidget" name="contextContainer" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>30</height>
+       </size>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout9">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="sizeConstraint">
+        <enum>QLayout::SetDefaultConstraint</enum>
+       </property>
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>4</number>
+       </property>
+       <item>
+        <widget class="QWidget" name="contextSubContainer" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_5">
+          <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="contextSourceLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>250</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>250</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="Line" name="line_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="sourcePropertiesButton">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Properties</string>
+            </property>
+            <property name="text">
+             <string>Properties</string>
+            </property>
+            <property name="icon">
+             <iconset resource="obs.qrc">
+              <normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
+            </property>
+            <property name="themeID2" stdset="0">
+             <string notr="true">contextBarButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="sourceFiltersButton">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Filters</string>
+            </property>
+            <property name="text">
+             <string>Filters</string>
+            </property>
+            <property name="icon">
+             <iconset resource="obs.qrc">
+              <normaloff>:/res/images/filter.svg</normaloff>:/res/images/filter.svg</iconset>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
+            </property>
+            <property name="themeID2" stdset="0">
+             <string notr="true">contextBarButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="Line" name="line">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QWidget" name="emptySpace" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>22</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>22</height>
+          </size>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <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>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
@@ -203,7 +426,7 @@
      <x>0</x>
      <y>0</y>
      <width>1079</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -376,12 +599,6 @@
     <property name="title">
      <string>Basic.MainMenu.View</string>
     </property>
-    <widget class="QMenu" name="viewMenuToolbars">
-     <property name="title">
-      <string>Basic.MainMenu.View.Toolbars</string>
-     </property>
-     <addaction name="toggleListboxToolbars"/>
-    </widget>
     <widget class="QMenu" name="viewMenuDocks">
      <property name="title">
       <string>Basic.MainMenu.View.Docks</string>
@@ -407,7 +624,8 @@
     <addaction name="actionFullscreenInterface"/>
     <addaction name="separator"/>
     <addaction name="viewMenuDocks"/>
-    <addaction name="viewMenuToolbars"/>
+    <addaction name="toggleListboxToolbars"/>
+    <addaction name="toggleContextBar"/>
     <addaction name="toggleSourceIcons"/>
     <addaction name="toggleStatusBar"/>
     <addaction name="separator"/>
@@ -431,7 +649,7 @@
   <widget class="OBSBasicStatusBar" name="statusbar"/>
   <widget class="OBSDock" name="scenesDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.Main.Scenes</string>
@@ -566,7 +784,7 @@
   </widget>
   <widget class="OBSDock" name="sourcesDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.Main.Sources</string>
@@ -702,7 +920,7 @@
   </widget>
   <widget class="OBSDock" name="mixerDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Mixer</string>
@@ -753,7 +971,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>71</width>
+           <width>94</width>
            <height>16</height>
           </rect>
          </property>
@@ -842,7 +1060,7 @@
   </widget>
   <widget class="OBSDock" name="transitionsDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.SceneTransitions</string>
@@ -883,106 +1101,20 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="QComboBox" name="transitions">
-          <property name="minimumSize">
-           <size>
-            <width>120</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="accessibleName">
-           <string>Transition</string>
-          </property>
-         </widget>
-        </item>
-        <item>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <property name="spacing">
            <number>4</number>
           </property>
           <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="transitionAdd">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>22</width>
-              <height>22</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Basic.AddTransition</string>
-            </property>
-            <property name="accessibleName">
-             <string>Basic.AddTransition</string>
-            </property>
-            <property name="text">
-             <string notr="true"/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-            <property name="themeID" stdset="0">
-             <string notr="true">addIconSmall</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="transitionRemove">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
+           <widget class="QComboBox" name="transitions">
+            <property name="minimumSize">
              <size>
-              <width>22</width>
-              <height>22</height>
+              <width>120</width>
+              <height>0</height>
              </size>
             </property>
-            <property name="toolTip">
-             <string>Basic.RemoveTransition</string>
-            </property>
             <property name="accessibleName">
-             <string>Basic.RemoveTransition</string>
-            </property>
-            <property name="text">
-             <string notr="true"/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
-            </property>
-            <property name="flat">
-             <bool>true</bool>
-            </property>
-            <property name="themeID" stdset="0">
-             <string notr="true">removeIconSmall</string>
+             <string>Transition</string>
             </property>
            </widget>
           </item>
@@ -1089,7 +1221,7 @@
   </widget>
   <widget class="OBSDock" name="controlsDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.Main.Controls</string>
@@ -1120,11 +1252,17 @@
         <bool>true</bool>
        </property>
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Basic.Main.StartStreaming</string>
        </property>
@@ -1156,14 +1294,14 @@
           <bool>true</bool>
          </property>
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
-           <width>130</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
@@ -1179,6 +1317,18 @@
      </item>
      <item>
       <widget class="QPushButton" name="modeSwitch">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Basic.TogglePreviewProgramMode</string>
        </property>
@@ -1190,11 +1340,17 @@
      <item>
       <widget class="QPushButton" name="settingsButton">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Settings</string>
        </property>
@@ -1203,11 +1359,17 @@
      <item>
       <widget class="QPushButton" name="exitButton">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>Exit</string>
        </property>
@@ -1640,7 +1802,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Basic.MainMenu.View.Toolbars.Listboxes</string>
+    <string>Basic.MainMenu.View.ListboxToolbars</string>
    </property>
   </action>
   <action name="toggleStatusBar">
@@ -1824,6 +1986,25 @@
     <string>Basic.MainMenu.View.SourceIcons</string>
    </property>
   </action>
+  <action name="toggleContextToolbars">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Basic.MainMenu.View.Toolbars.Context</string>
+   </property>
+  </action>
+  <action name="toggleContextBar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Basic.MainMenu.View.ContextBar</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

obs-studio-25.0.8.tar.xz/UI/forms/OBSBasicSettings.ui -> obs-studio-26.0.0.tar.xz/UI/forms/OBSBasicSettings.ui Changed

@@ -151,8 +151,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>803</width>
-              <height>1026</height>
+              <width>806</width>
+              <height>1254</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -1146,7 +1146,7 @@
                </property>
               </widget>
              </item>
-             <item row="9" column="0">
+             <item row="8" column="0">
               <widget class="QLabel" name="authUsernameLabel">
                <property name="text">
                 <string>Basic.Settings.Stream.Custom.Username</string>
@@ -1156,10 +1156,10 @@
                </property>
               </widget>
              </item>
-             <item row="9" column="1">
+             <item row="8" column="1">
               <widget class="QLineEdit" name="authUsername"/>
              </item>
-             <item row="10" column="0">
+             <item row="9" column="0">
               <widget class="QLabel" name="authPwLabel">
                <property name="text">
                 <string>Basic.Settings.Stream.Custom.Password</string>
@@ -1169,7 +1169,7 @@
                </property>
               </widget>
              </item>
-             <item row="10" column="1">
+             <item row="9" column="1">
               <widget class="QWidget" name="authPwWidget" native="true">
                <layout class="QHBoxLayout" name="horizontalLayout_25">
                 <property name="leftMargin">
@@ -1214,19 +1214,6 @@
                </property>
               </widget>
              </item>
-             <item row="8" column="0">
-              <widget class="QLabel" name="mixerAddonLabel">
-               <property name="text">
-                <string>Basic.Settings.Stream.MixerAddon</string>
-               </property>
-               <property name="buddy">
-                <cstring>mixerAddonDropdown</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="1">
-              <widget class="QComboBox" name="mixerAddonDropdown"/>
-             </item>
             </layout>
            </widget>
           </widget>
@@ -1263,8 +1250,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>603</width>
-              <height>631</height>
+              <width>813</width>
+              <height>761</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -3758,8 +3745,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>555</width>
-              <height>469</height>
+              <width>767</width>
+              <height>582</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_50">
@@ -4614,8 +4601,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>596</width>
-              <height>781</height>
+              <width>791</width>
+              <height>970</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -4824,6 +4811,11 @@
                       <widget class="QComboBox" name="colorSpace">
                        <item>
                         <property name="text">
+                         <string notr="true">sRGB</string>
+                        </property>
+                       </item>
+                       <item>
+                        <property name="text">
                          <string notr="true">709</string>
                         </property>
                        </item>
@@ -5454,8 +5446,10 @@
   <tabstop>overflowHide</tabstop>
   <tabstop>overflowAlwaysVisible</tabstop>
   <tabstop>overflowSelectionHide</tabstop>
+  <tabstop>automaticSearch</tabstop>
   <tabstop>doubleClickSwitch</tabstop>
   <tabstop>studioPortraitLayout</tabstop>
+  <tabstop>prevProgLabelToggle</tabstop>
   <tabstop>multiviewMouseSwitch</tabstop>
   <tabstop>multiviewDrawNames</tabstop>
   <tabstop>multiviewDrawAreas</tabstop>
@@ -5467,9 +5461,12 @@
   <tabstop>customServer</tabstop>
   <tabstop>key</tabstop>
   <tabstop>show</tabstop>
+  <tabstop>getStreamKeyButton</tabstop>
   <tabstop>connectAccount2</tabstop>
   <tabstop>disconnectAccount</tabstop>
+  <tabstop>bandwidthTestEnable</tabstop>
   <tabstop>useAuth</tabstop>
+  <tabstop>twitchAddonDropdown</tabstop>
   <tabstop>authUsername</tabstop>
   <tabstop>authPw</tabstop>
   <tabstop>authPwShow</tabstop>
@@ -5508,6 +5505,12 @@
   <tabstop>advOutRecPathBrowse</tabstop>
   <tabstop>advOutNoSpace</tabstop>
   <tabstop>advOutRecFormat</tabstop>
+  <tabstop>flvTrack1</tabstop>
+  <tabstop>flvTrack2</tabstop>
+  <tabstop>flvTrack3</tabstop>
+  <tabstop>flvTrack4</tabstop>
+  <tabstop>flvTrack5</tabstop>
+  <tabstop>flvTrack6</tabstop>
   <tabstop>advOutRecTrack1</tabstop>
   <tabstop>advOutRecTrack2</tabstop>
   <tabstop>advOutRecTrack3</tabstop>
@@ -5556,6 +5559,7 @@
   <tabstop>advReplayBuf</tabstop>
   <tabstop>advRBSecMax</tabstop>
   <tabstop>advRBMegsMax</tabstop>
+  <tabstop>scrollArea_50</tabstop>
   <tabstop>sampleRate</tabstop>
   <tabstop>channelSetup</tabstop>
   <tabstop>desktopAudioDevice1</tabstop>
@@ -5568,6 +5572,8 @@
   <tabstop>peakMeterType</tabstop>
   <tabstop>monitoringDevice</tabstop>
   <tabstop>disableAudioDucking</tabstop>
+  <tabstop>baseResolution</tabstop>
+  <tabstop>outputResolution</tabstop>
   <tabstop>downscaleFilter</tabstop>
   <tabstop>fpsType</tabstop>
   <tabstop>fpsCommon</tabstop>
@@ -5595,9 +5601,11 @@
   <tabstop>reconnectRetryDelay</tabstop>
   <tabstop>reconnectMaxRetries</tabstop>
   <tabstop>bindToIP</tabstop>
+  <tabstop>dynBitrate</tabstop>
   <tabstop>enableNewSocketLoop</tabstop>
   <tabstop>enableLowLatencyMode</tabstop>
   <tabstop>browserHWAccel</tabstop>
+  <tabstop>hotkeyFocusType</tabstop>
  </tabstops>
  <resources>
   <include location="obs.qrc"/>

obs-studio-25.0.8.tar.xz/UI/forms/OBSLogReply.ui -> obs-studio-26.0.0.tar.xz/UI/forms/OBSLogReply.ui Changed

obs-studio-26.0.0.tar.xz/UI/forms/images/filter.svg Added

@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="185.25 184.25 100 100" enable-background="new 185.25 184.25 100 100" xml:space="preserve"><g><g><g><path d="M204.608,244.706l11.525,11.525c2.041,0.365,4.142,0.556,6.288,0.556c1.898,0,3.761-0.151,5.579-0.438l-22.379-22.38     c0.704-2.995,1.747-5.863,3.092-8.559l28.263,28.263c2.623-1.181,5.076-2.672,7.314-4.426l-30.99-30.99     c1.723-2.143,3.667-4.102,5.796-5.847l31.043,31.043c1.776-2.22,3.29-4.658,4.497-7.268l-28.425-28.426     c2.683-1.367,5.545-2.44,8.546-3.17l22.646,22.646c0.324-1.926,0.495-3.905,0.495-5.923c0-1.985-0.166-3.93-0.479-5.826     l-12.002-12.002c2.857,0.088,5.641,0.482,8.321,1.148c-5.969-11.183-17.752-18.795-31.315-18.795     c-19.592,0-35.475,15.883-35.475,35.475c0,13.563,7.612,25.346,18.796,31.315C205.11,250.078,204.721,247.429,204.608,244.706z"></path></g><path d="M243.651,282.651c-0.88-0.002-1.77-0.034-2.644-0.095l0.587-8.494c1.239,0.086,2.503,0.097,3.757,0.035    c1.263-0.063,2.531-0.203,3.768-0.416l1.442,8.392c-1.572,0.27-3.182,0.448-4.785,0.528    C245.069,282.636,244.354,282.653,243.651,282.651z"></path><path d="M231.594,280.743c-3.043-0.982-5.969-2.335-8.695-4.023l4.482-7.24c2.142,1.326,4.439,2.389,6.828,3.159L231.594,280.743z    "></path><path d="M259.738,279.319l-3.419-7.798c2.297-1.007,4.474-2.295,6.47-3.83l5.189,6.751    C265.437,276.395,262.665,278.036,259.738,279.319z"></path><path d="M215.423,270.741c-2.244-2.286-4.208-4.839-5.837-7.587l7.325-4.341c1.28,2.16,2.824,4.166,4.588,5.964L215.423,270.741z"></path><path d="M274.813,267.741l-6.647-5.322c1.575-1.967,2.909-4.12,3.965-6.398l7.725,3.58    C278.512,262.501,276.815,265.239,274.813,267.741z"></path><path d="M282.803,250.48l-8.36-1.614c0.369-1.911,0.559-3.874,0.564-5.833c0.001-0.555-0.012-1.119-0.04-1.675l-0.004-0.072    l8.504-0.425l0.004,0.073c0.035,0.703,0.052,1.418,0.05,2.122C283.515,245.547,283.273,248.046,282.803,250.48z"></path><path d="M273.677,233.877c-0.725-2.404-1.744-4.719-3.028-6.881l7.32-4.349c1.637,2.755,2.935,5.706,3.86,8.771L273.677,233.877z"></path><path d="M266.055,221.036c-1.766-1.795-3.746-3.376-5.885-4.697l4.475-7.244c2.72,1.68,5.237,3.689,7.481,5.971L266.055,221.036z"></path></g></g></svg>
\ No newline at end of file

obs-studio-26.0.0.tar.xz/UI/forms/images/media Added

obs-studio-26.0.0.tar.xz/UI/forms/images/media/media_next.svg Added

obs-studio-26.0.0.tar.xz/UI/forms/images/media/media_pause.svg Added

obs-studio-26.0.0.tar.xz/UI/forms/images/media/media_play.svg Added

obs-studio-26.0.0.tar.xz/UI/forms/images/media/media_previous.svg Added

obs-studio-26.0.0.tar.xz/UI/forms/images/media/media_restart.svg Added

obs-studio-26.0.0.tar.xz/UI/forms/images/media/media_stop.svg Added

obs-studio-25.0.8.tar.xz/UI/forms/obs.qrc -> obs-studio-26.0.0.tar.xz/UI/forms/obs.qrc Changed

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar Added

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/browser-source-toolbar.ui Added

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BrowserSourceToolbar</class>
+ <widget class="QWidget" name="BrowserSourceToolbar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>628</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <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="QPushButton" name="refresh">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>RefreshBrowser</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../obs.qrc">
+       <normaloff>:/res/images/refresh.svg</normaloff>:/res/images/refresh.svg</iconset>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <property name="themeID" stdset="0">
+      <string notr="true">refreshIconSmall</string>
+     </property>
+     <property name="themeID2" stdset="0">
+      <string notr="true">contextBarButton</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../obs.qrc"/>
+ </resources>
+ <connections/>
+</ui>

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/color-source-toolbar.ui Added

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ColorSourceToolbar</class>
+ <widget class="QWidget" name="ColorSourceToolbar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>565</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <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="color">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>80</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">color here</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="choose">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Basic.PropertiesWindow.SelectColor</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/device-select-toolbar.ui Added

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DeviceSelectToolbar</class>
+ <widget class="QWidget" name="DeviceSelectToolbar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>665</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetNoConstraint</enum>
+   </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="deviceLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">Device</string>
+     </property>
+     <property name="buddy">
+      <cstring>device</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="device">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="currentText">
+      <string notr="true"/>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="activateButton">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">Activate</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/game-capture-toolbar.ui Added

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GameCaptureToolbar</class>
+ <widget class="QWidget" name="GameCaptureToolbar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>650</width>
+    <height>24</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>24</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <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="modeLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">Mode</string>
+     </property>
+     <property name="buddy">
+      <cstring>mode</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="mode">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="currentText">
+      <string notr="true"/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="windowLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">Window</string>
+     </property>
+     <property name="buddy">
+      <cstring>window</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="window">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="currentText">
+      <string notr="true"/>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="empty" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/image-source-toolbar.ui Added

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ImageSourceToolbar</class>
+ <widget class="QWidget" name="ImageSourceToolbar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>580</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <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="pathLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true">Image File</string>
+     </property>
+     <property name="buddy">
+      <cstring>path</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="path">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="browse">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Browse</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/media-controls.ui Added

@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MediaControls</class>
+ <widget class="QWidget" name="MediaControls">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>888</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">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>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QPushButton" name="playPauseButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>ContextBar.MediaControls.RestartMedia</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../obs.qrc">
+       <normaloff>:/res/images/media/media_restart.svg</normaloff>:/res/images/media/media_restart.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="shortcut">
+      <string>Space</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>8</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QPushButton" name="previousButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>ContextBar.MediaControls.PlaylistPrevious</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../obs.qrc">
+       <normaloff>:/res/images/media/media_previous.svg</normaloff>:/res/images/media/media_previous.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="shortcut">
+      <string>P</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="stopButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>ContextBar.MediaControls.StopMedia</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../obs.qrc">
+       <normaloff>:/res/images/media/media_stop.svg</normaloff>:/res/images/media/media_stop.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="shortcut">
+      <string>S</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="nextButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>22</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>ContextBar.MediaControls.PlaylistNext</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../obs.qrc">
+       <normaloff>:/res/images/media/media_next.svg</normaloff>:/res/images/media/media_next.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="shortcut">
+      <string>N</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="MediaSlider" name="slider">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="accessibleName">
+      <string>ContextBar.MediaControls.BlindSeek</string>
+     </property>
+     <property name="maximum">
+      <number>1024</number>
+     </property>
+     <property name="tracking">
+      <bool>false</bool>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>6</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="timerLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>--:--:--</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>4</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>/</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>4</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="ClickableLabel" name="durationLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>--:--:--</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="emptySpaceAgain" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>MediaSlider</class>
+   <extends>QSlider</extends>
+   <header>media-slider.hpp</header>
+  </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>clickable-label.hpp</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../obs.qrc"/>
+ </resources>
+ <connections/>
+</ui>

obs-studio-26.0.0.tar.xz/UI/forms/source-toolbar/text-source-toolbar.ui Added

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TextSourceToolbar</class>
+ <widget class="QWidget" name="TextSourceToolbar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>726</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>22</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <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="QPushButton" name="selectFont">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Basic.PropertiesWindow.SelectFont</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="selectColor">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Basic.PropertiesWindow.SelectColor</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="emptySpace" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="text">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>22</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-nix.cpp -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-nix.cpp Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-osx.mm -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-osx.mm Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-win.cpp -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-win.cpp Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.cpp -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.cpp Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.hpp -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.hpp Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/bg-BG.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/bn-BD.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/bn-BD.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/de-DE.ini Changed

@@ -9,7 +9,7 @@
 Active="Aktiv"
 Inactive="Inaktiv"
 Start="Starten"
-Stop="Stoppen"
+Stop="Beenden"
 
 Captions="Untertitel (experimentell)"
 Captions.AudioSource="Audioquelle"
@@ -18,10 +18,10 @@
 Captions.Error.GenericFail="Fehler beim Starten der Untertitel"
 
 OutputTimer="Ausgabetimer"
-OutputTimer.Stream="Stream stoppen nach:"
-OutputTimer.Record="Aufnahme stoppen nach:"
-OutputTimer.Stream.StoppingIn="Stream stoppt in:"
-OutputTimer.Record.StoppingIn="Aufnahme stoppt in:"
+OutputTimer.Stream="Stream endet nach:"
+OutputTimer.Record="Aufnahme endet nach:"
+OutputTimer.Stream.StoppingIn="Stream endet in:"
+OutputTimer.Record.StoppingIn="Aufnahme endet in:"
 OutputTimer.Stream.EnableEverytime="Streamingtimer jedes Mal aktivieren"
 OutputTimer.Record.EnableEverytime="Aufnahmetimer jedes Mal aktivieren"
 OutputTimer.Record.PauseTimer="Timer beim Pausieren der Aufnahme anhalten"
@@ -30,13 +30,18 @@
 LoadedScripts="Geladene Skripte"
 AddScripts="Skripte hinzufügen"
 RemoveScripts="Skripte entfernen"
-ReloadScripts="Skripte neuladen"
+ReloadScripts="Skripte neu laden"
+Reload="Neu laden"
+OpenFileLocation="Dateipfad öffnen"
 PythonSettings="Python‐Einstellungen"
 PythonSettings.PythonInstallPath32bit="Python‐Installationspfad (32bit)"
 PythonSettings.PythonInstallPath64bit="Python‐Installationspfad (64bit)"
 PythonSettings.BrowsePythonPath="Python‐Pfad öffnen"
-ScriptLogWindow="Skriptprotokoll"
+ScriptLogWindow="Skriptlog"
 Description="Beschreibung"
+ScriptDescriptionLink.Text="Diesen Link in Ihrem Standard‐Webbrowser öffnen?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="URL öffnen"
 
 FileFilter.ScriptFiles="Skriptdateien"
 FileFilter.AllFiles="Alle Dateien"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/el-GR.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/el-GR.ini Changed

obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-GB.ini Added

@@ -0,0 +1,48 @@
+SceneSwitcher="Automatic Scene Switcher"
+SceneSwitcher.OnNoMatch="When no window matches:"
+SceneSwitcher.OnNoMatch.DontSwitch="Don't switch"
+SceneSwitcher.OnNoMatch.SwitchTo="Switch to:"
+SceneSwitcher.CheckInterval="Check active window title every:"
+SceneSwitcher.ActiveOrNotActive="Scene Switcher is:"
+InvalidRegex.Title="Invalid Regular Expression"
+InvalidRegex.Text="The regular expression that you entered is invalid."
+Active="Active"
+Inactive="Inactive"
+Start="Start"
+Stop="Stop"
+
+Captions="Captions (Experimental)"
+Captions.AudioSource="Audio source"
+Captions.CurrentSystemLanguage="Current System Language (%1)"
+Captions.Provider="Provider"
+Captions.Error.GenericFail="Failed to start captions"
+
+OutputTimer="Output Timer"
+OutputTimer.Stream="Stop streaming after:"
+OutputTimer.Record="Stop recording after:"
+OutputTimer.Stream.StoppingIn="Streaming stopping in:"
+OutputTimer.Record.StoppingIn="Recording stopping in:"
+OutputTimer.Stream.EnableEverytime="Enable streaming timer every time"
+OutputTimer.Record.EnableEverytime="Enable recording timer every time"
+OutputTimer.Record.PauseTimer="Pause timer when recording is paused"
+
+Scripts="Scripts"
+LoadedScripts="Loaded Scripts"
+AddScripts="Add Scripts"
+RemoveScripts="Remove Scripts"
+ReloadScripts="Reload Scripts"
+Reload="Reload"
+OpenFileLocation="Open file location"
+PythonSettings="Python Settings"
+PythonSettings.PythonInstallPath32bit="Python Install Path (32bit)"
+PythonSettings.PythonInstallPath64bit="Python Install Path (64bit)"
+PythonSettings.BrowsePythonPath="Browse Python Path"
+ScriptLogWindow="Script Log"
+Description="Description"
+ScriptDescriptionLink.Text="Open this link in your default web browser?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Open URL"
+
+FileFilter.ScriptFiles="Script Files"
+FileFilter.AllFiles="All Files"
+

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/et-EE.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/et-EE.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/fil-PH.ini Changed

@@ -1,42 +1,47 @@
-SceneSwitcher="Awyomatikong Eskana Tagalipat"
-SceneSwitcher.OnNoMatch="Kapag walang tumutugma sa bintana:"
+SceneSwitcher="Awyomatikong Tagalipat ng Tagpuan"
+SceneSwitcher.OnNoMatch="Kapag walang tumutugma na window:"
 SceneSwitcher.OnNoMatch.DontSwitch="Huwag lumipat"
 SceneSwitcher.OnNoMatch.SwitchTo="Lumipat sa:"
 SceneSwitcher.CheckInterval="Suriin ang aktibong pamagat ng bintana bawat:"
-SceneSwitcher.ActiveOrNotActive="Ang Eskana Tagalipat ay:"
+SceneSwitcher.ActiveOrNotActive="Ang Tagalipat ng Tagpuan ay:"
 InvalidRegex.Title="Di-wastong Regular Expression"
-InvalidRegex.Text="Siya ay regular na expression na ipinasok mo ay hindi wasto."
+InvalidRegex.Text="Ang regular na expression na ipinasok mo ay hindi wasto."
 Active="Aktibo"
 Inactive="Di-aktibo"
-Start="Magsimula"
+Start="Simulan"
 Stop="Ihinto"
 
 Captions="Mga Caption (Experimental)"
-Captions.AudioSource="Pinagmulan ng audio"
-Captions.CurrentSystemLanguage="Kasalukuyang Wika ng Wika (%1)"
+Captions.AudioSource="Bukal ng audio"
+Captions.CurrentSystemLanguage="Kasalukuyang Wika ng Sistema (%1)"
 Captions.Provider="Tagapagbigay"
-Captions.Error.GenericFail="Nabigong magsimula ng mga caption"
+Captions.Error.GenericFail="Nabigong simulan ang mga caption"
 
-OutputTimer="Output ng Timer"
-OutputTimer.Stream="Itigil ang streaming pagkatapos:"
+OutputTimer="Timer ng Output"
+OutputTimer.Stream="Itigil ang pag-iistream pagkatapos ng:"
 OutputTimer.Record="Itigil ang pag-record pagkatapos ng:"
-OutputTimer.Stream.StoppingIn="Ang pagtigil ng streaming sa:"
-OutputTimer.Record.StoppingIn="Pagre-record ng pagtigil sa:"
+OutputTimer.Stream.StoppingIn="Matitigil ang pag-iistream sa:"
+OutputTimer.Record.StoppingIn="Matitigil ang pagre-record sa:"
 OutputTimer.Stream.EnableEverytime="Paganahin ang streaming timer sa bawat oras"
-OutputTimer.Record.EnableEverytime="Paganahin ang timer ng pag-record sa bawat oras"
+OutputTimer.Record.EnableEverytime="Paganahin ang timer ng pagrerecord palagi"
+OutputTimer.Record.PauseTimer="I-pause ang timer kapag naka-pause ang pagrerecord"
 
-Scripts="Mga script"
-LoadedScripts="Mga Loaded na Mga Script"
-AddScripts="Magdagdag ng Mga Script"
-RemoveScripts="Alisin ang Mga Script"
-ReloadScripts="I-reload ang Mga Script"
-PythonSettings="Mga Setting ng Python"
-PythonSettings.PythonInstallPath32bit="Path ng Pag-install ng Python (32bit)"
-PythonSettings.PythonInstallPath64bit="Path ng Pag-install ng Python (64bit)"
-PythonSettings.BrowsePythonPath="Mag-browse sa Python Path"
-ScriptLogWindow="Mag-log ng Script"
+Scripts="Mga iskrip"
+LoadedScripts="Mga nakaload na mga Iskrip"
+AddScripts="Magdagdag ng mga Iskrip"
+RemoveScripts="Alisin ang mga Iskrip"
+ReloadScripts="I-reload ang mga Iskrip"
+Reload="I-reload"
+OpenFileLocation="Buksan ang lokasyon ng file"
+PythonSettings="Mga setting ng Python"
+PythonSettings.PythonInstallPath32bit="Path kung saan naka-install ang Python (32bit)"
+PythonSettings.PythonInstallPath64bit="Path kung saan naka-install ang Python (64bit)"
+PythonSettings.BrowsePythonPath="Hanapin ang Path ng Python"
+ScriptLogWindow="Window ng Log ng Iskrip"
 Description="Paglalarawan"
+ScriptDescriptionLink.Text="Buksan ang link na ito sa iyong default na pang-browse ng web?"
+ScriptDescriptionLink.OpenURL="Buksan ang URL"
 
-FileFilter.ScriptFiles="Mga File ng Script"
-FileFilter.AllFiles="Lahat ng Mga File"
+FileFilter.ScriptFiles="Mga File ng Iskrip"
+FileFilter.AllFiles="Lahat ng mga File"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/gl-ES.ini Changed

@@ -17,7 +17,7 @@
 Captions.Provider="Fornecedor"
 Captions.Error.GenericFail="Produciuse un erro ao iniciar os suntítulos"
 
-OutputTimer="Temporizador de Saída"
+OutputTimer="Temporizador de saída"
 OutputTimer.Stream="Deter a emisión após:"
 OutputTimer.Record="Deter a gravación após:"
 OutputTimer.Stream.StoppingIn="Detendo a emisión en:"
@@ -31,12 +31,17 @@
 AddScripts="Engadir scripts"
 RemoveScripts="Retirar scripts"
 ReloadScripts="Volver cargar scripts"
+Reload="Volver cargar"
+OpenFileLocation="Abrir a localización do ficheiro"
 PythonSettings="Axustes de Python"
 PythonSettings.PythonInstallPath32bit="Ruta de instalación de Python (32bit)"
 PythonSettings.PythonInstallPath64bit="Ruta de instalación de Python (64bit)"
 PythonSettings.BrowsePythonPath="Examinar a ruta de Python"
 ScriptLogWindow="Rexistro de script"
 Description="Descrición"
+ScriptDescriptionLink.Text="Abrir esta ligazón no seu navegador predeterminado?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Abrir URL"
 
 FileFilter.ScriptFiles="Ficheiros de scripts"
 FileFilter.AllFiles="Todos os ficheiros"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/hr-HR.ini Changed

@@ -1,25 +1,48 @@
-SceneSwitcher="Automatski menjač scena"
-SceneSwitcher.OnNoMatch="Kada se nijedan naslov prozora ne poklapa:"
-SceneSwitcher.OnNoMatch.DontSwitch="Ne menjaj"
-SceneSwitcher.OnNoMatch.SwitchTo="Promeni na:"
-SceneSwitcher.CheckInterval="Proveravaj naziv aktivnog prozora svakih:"
-SceneSwitcher.ActiveOrNotActive="Menjač scena je:"
-InvalidRegex.Title="Neispravan regularni izraz"
-InvalidRegex.Text="Regularni izraz koji ste uneli nije ispravan."
+SceneSwitcher="Automatski mjenjač scena"
+SceneSwitcher.OnNoMatch="Kada nema odgovarajućeg prozora:"
+SceneSwitcher.OnNoMatch.DontSwitch="Ne prebacuj scenu"
+SceneSwitcher.OnNoMatch.SwitchTo="Prebaci se na:"
+SceneSwitcher.CheckInterval="Provjeri naziv aktivnog prozora svakih:"
+SceneSwitcher.ActiveOrNotActive="Mjenjač scena je:"
+InvalidRegex.Title="Nevažeć regularni izraz"
+InvalidRegex.Text="Regularni izraz koji ste unijeli je nevažeć."
 Active="Aktivan"
 Inactive="Neaktivan"
 Start="Pokreni"
 Stop="Zaustavi"
 
-Captions="Opisi (experimentalno)"
+Captions="Titlovi (eksperimentalno)"
+Captions.AudioSource="Izvor zvuka"
+Captions.CurrentSystemLanguage="Trenutni sistemski jezik (%1)"
+Captions.Provider="Opskrbljivač"
+Captions.Error.GenericFail="Greška u inicijalizaciji titlova"
 
-OutputTimer="Tempomat snimanja i emitovanja"
-OutputTimer.Stream="Zaustavi emitovanje nakon:"
-OutputTimer.Record="Zaustavi snimanje nakon:"
-OutputTimer.Stream.StoppingIn="Prekidanje emitiranja za:"
-OutputTimer.Record.StoppingIn="Prekidanje snimanja za:"
-OutputTimer.Stream.EnableEverytime="Omogući štopovanje emitovanja svaki put"
-OutputTimer.Record.EnableEverytime="Omogući štopovanje snimanja svaki put"
+OutputTimer="Štoperica"
+OutputTimer.Stream="Prekini emitiranje za:"
+OutputTimer.Record="Prekini snimanje za:"
+OutputTimer.Stream.StoppingIn="Emitiranje se prekida za:"
+OutputTimer.Record.StoppingIn="Snimanje se prekida za:"
+OutputTimer.Stream.EnableEverytime="Uvijek omogući štopericu za emitiranje"
+OutputTimer.Record.EnableEverytime="Uvijek omogući štopericu za snimanje"
+OutputTimer.Record.PauseTimer="Zaustavi štopericu dok je snimanje pauzirano"
 
+Scripts="Skripte"
+LoadedScripts="Učitane skripte"
+AddScripts="Dodaj skripte"
+RemoveScripts="Ukloni skripte"
+ReloadScripts="Osvježi skripte"
+Reload="Učitaj iznova"
+OpenFileLocation="Otvori lokaciju datoteke"
+PythonSettings="Postavke Pythona"
+PythonSettings.PythonInstallPath32bit="Put do Python instalacije (32-bitne)"
+PythonSettings.PythonInstallPath64bit="Put do Python instalacije (64-bitne)"
+PythonSettings.BrowsePythonPath="Lociraj Python ručno"
+ScriptLogWindow="Zapisnik"
+Description="Opis"
+ScriptDescriptionLink.Text="Želite li otvoriti poveznicu u zadanom pregledniku?"
+ScriptDescriptionLink.Text.Url="Adresa: %1"
+ScriptDescriptionLink.OpenURL="Otvori adresu"
 
+FileFilter.ScriptFiles="Skripte"
+FileFilter.AllFiles="Sve datoteke"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/id-ID.ini Added

@@ -0,0 +1,48 @@
+SceneSwitcher="Pengalih Adegan Otomatis"
+SceneSwitcher.OnNoMatch="Ketika tidak ada jendela yang cocok:"
+SceneSwitcher.OnNoMatch.DontSwitch="Jangan alihkan"
+SceneSwitcher.OnNoMatch.SwitchTo="Beralih ke:"
+SceneSwitcher.CheckInterval="Periksa judul jendela aktif setiap:"
+SceneSwitcher.ActiveOrNotActive="Pengalih Adegan sedang:"
+InvalidRegex.Title="Ekspresi Reguler Tidak Valid"
+InvalidRegex.Text="Ekspresi reguler yang Anda masukkan tidak valid."
+Active="Aktif"
+Inactive="Tidak aktif"
+Start="Mulai"
+Stop="Hentikan"
+
+Captions="Closed Caption (CC) (Eksperimental)"
+Captions.AudioSource="Sumber Audio"
+Captions.CurrentSystemLanguage="Bahasa Sistem Sekarang (%1)"
+Captions.Provider="Penyedia"
+Captions.Error.GenericFail="Gagal memulai caption"
+
+OutputTimer="Timer Output"
+OutputTimer.Stream="Berhenti streaming setelah:"
+OutputTimer.Record="Berhenti merekam setelah:"
+OutputTimer.Stream.StoppingIn="Streaming berhenti dalam:"
+OutputTimer.Record.StoppingIn="Perekaman berhenti dalam:"
+OutputTimer.Stream.EnableEverytime="Aktifkan timer streaming sekali"
+OutputTimer.Record.EnableEverytime="Aktifkan timer rekaman sekali"
+OutputTimer.Record.PauseTimer="Jeda timer saat perekaman dijeda"
+
+Scripts="Skrip"
+LoadedScripts="Skrip yang Dimuat"
+AddScripts="Tambahkan Script"
+RemoveScripts="Hapus Skrip"
+ReloadScripts="Muat Ulang Skrip"
+Reload="Muat ulang"
+OpenFileLocation="Buka lokasi file"
+PythonSettings="Setelan Python"
+PythonSettings.PythonInstallPath32bit="Lokasi Install Phyton (32bit)"
+PythonSettings.PythonInstallPath64bit="Lokasi Install Phyton (64bit)"
+PythonSettings.BrowsePythonPath="Temukan Lokasi Folder Phyton"
+ScriptLogWindow="Log Skrip"
+Description="Deskripsi"
+ScriptDescriptionLink.Text="Buka tautan ini di browser web default Anda?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Buka URL"
+
+FileFilter.ScriptFiles="File Skrip"
+FileFilter.AllFiles="Semua File"
+

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/it-IT.ini Changed

@@ -24,19 +24,24 @@
 OutputTimer.Record.StoppingIn="La registrazione terminerà tra:"
 OutputTimer.Stream.EnableEverytime="Attiva il conto alla rovescia per le dirette ogni volta"
 OutputTimer.Record.EnableEverytime="Attiva il conto alla rovescia per le registrazioni ogni volta"
-OutputTimer.Record.PauseTimer="Pausa il timer quando la registrazione è in pausa"
+OutputTimer.Record.PauseTimer="Ferma il timer quando la registrazione è in pausa"
 
 Scripts="Script"
 LoadedScripts="Script caricati"
 AddScripts="Aggiungi script"
 RemoveScripts="Rimuovi script"
 ReloadScripts="Ricarica script"
+Reload="Ricarica"
+OpenFileLocation="Apri Posizione File"
 PythonSettings="Impostazioni di Python"
 PythonSettings.PythonInstallPath32bit="Percorso d'installazione di Python (32 bit)"
 PythonSettings.PythonInstallPath64bit="Percorso d'installazione di Python (64 bit)"
 PythonSettings.BrowsePythonPath="Sfoglia il percorso di Python"
 ScriptLogWindow="Log degli script"
 Description="Descrizione"
+ScriptDescriptionLink.Text="Vuoi aprire questo link con il tuo browser predefinito?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Apri URL"
 
 FileFilter.ScriptFiles="Lista degli script"
 FileFilter.AllFiles="Tutti i file"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ro-RO.ini Changed

@@ -4,6 +4,8 @@
 SceneSwitcher.OnNoMatch.SwitchTo="Schimbă la:"
 SceneSwitcher.CheckInterval="Verifică titlul ferestrei active la fiecare:"
 SceneSwitcher.ActiveOrNotActive="Schimbătorul de scene este:"
+InvalidRegex.Title="Expresie regulată invalidă"
+InvalidRegex.Text="Expresia obișnuită pe care ați introdus-o este invalidă."
 Active="Activ"
 Inactive="Inactiv"
 Start="Pornește"
@@ -13,21 +15,34 @@
 Captions.AudioSource="Sursă audio"
 Captions.CurrentSystemLanguage="Limba actuală a sistemului (%1)"
 Captions.Provider="Furnizor"
+Captions.Error.GenericFail="Pornirea subtitrărilor a eșuat"
 
+OutputTimer="Temporizator pentru output"
+OutputTimer.Stream="Oprește transmisiunea după:"
 OutputTimer.Record="Oprește înregistrarea după:"
-OutputTimer.Stream.StoppingIn="Se oprește transmisiunea în:"
+OutputTimer.Stream.StoppingIn="Transmisiunea se oprește în:"
 OutputTimer.Record.StoppingIn="Înregistrarea se oprește în:"
+OutputTimer.Stream.EnableEverytime="Activează temporizatorul pentru transmisiune de fiecare dată"
+OutputTimer.Record.EnableEverytime="Activează temporizatorul pentru înregistrare de fiecare dată"
+OutputTimer.Record.PauseTimer="Pune pe pauză temporizatorul când înregistrarea este pusă pe pauză"
 
 Scripts="Scripturi"
 LoadedScripts="Scripturi încărcate"
 AddScripts="Adaugă scripturi"
 RemoveScripts="Elimină scripturi"
 ReloadScripts="Reîncarcă scripturile"
+Reload="Reîncarcă"
+OpenFileLocation="Deschide locația fișierului"
 PythonSettings="Setări Python"
 PythonSettings.PythonInstallPath32bit="Calea instalării Python (32bit)"
 PythonSettings.PythonInstallPath64bit="Calea instalării Python (64bit)"
 PythonSettings.BrowsePythonPath="Răsfoiește calea Python"
 ScriptLogWindow="Jurnalul scripturilor"
 Description="Descriere"
+ScriptDescriptionLink.Text="Deschideți acest link în browser-ul web implicit?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Deschide URL-ul"
 
+FileFilter.ScriptFiles="Fișiere Script"
+FileFilter.AllFiles="Toate fișierele"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ru-RU.ini Changed

@@ -24,19 +24,24 @@
 OutputTimer.Record.StoppingIn="Запись будет завершена через:"
 OutputTimer.Stream.EnableEverytime="Включать таймер трансляции каждый раз"
 OutputTimer.Record.EnableEverytime="Включать таймер записи каждый раз"
-OutputTimer.Record.PauseTimer="Таймер паузы при приостановке записи"
+OutputTimer.Record.PauseTimer="Приостановить таймер при паузе записи"
 
 Scripts="Скрипты"
 LoadedScripts="Загруженные скрипты"
 AddScripts="Добавить скрипты"
 RemoveScripts="Удалить скрипты"
 ReloadScripts="Перезагрузить скрипты"
+Reload="Обновить"
+OpenFileLocation="Открыть место расположения файла"
 PythonSettings="Параметры Python"
 PythonSettings.PythonInstallPath32bit="Путь установки Python (32 бита)"
 PythonSettings.PythonInstallPath64bit="Путь установки Python (64 бита)"
 PythonSettings.BrowsePythonPath="Обзор пути Python"
 ScriptLogWindow="Лог скрипта"
 Description="Описание"
+ScriptDescriptionLink.Text="Открыть эту ссылку в браузере по умолчанию?"
+ScriptDescriptionLink.Text.Url="URL-адрес: %1"
+ScriptDescriptionLink.OpenURL="Открыть URL"
 
 FileFilter.ScriptFiles="Файлы скриптов"
 FileFilter.AllFiles="Все файлы"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sk-SK.ini Changed

@@ -7,7 +7,7 @@
 InvalidRegex.Title="Neplatný regulárny výraz"
 InvalidRegex.Text="Zadaný regulárny výraz je chybný."
 Active="Aktívny"
-Inactive="Neaktivní"
+Inactive="Neaktívny"
 Start="Spustiť"
 Stop="Zastaviť"
 
@@ -24,19 +24,24 @@
 OutputTimer.Record.StoppingIn="Nahrávanie za zastaví za:"
 OutputTimer.Stream.EnableEverytime="Povoliť časovač streamovania zakaždým"
 OutputTimer.Record.EnableEverytime="Zapnúť časovač nahrávania zakaždým"
-OutputTimer.Record.PauseTimer="Pozastaviť časovač keď je nahrávanie pozastavené"
+OutputTimer.Record.PauseTimer="Pozastaviť časovač keď je pozastavené nahrávanie"
 
 Scripts="Skripty"
 LoadedScripts="Načítané skripty"
 AddScripts="Pridať skripty"
 RemoveScripts="Odstrániť skripty"
 ReloadScripts="Znovu-načítať skripty"
+Reload="Znovu načítať"
+OpenFileLocation="Otvoriť umiestnenie súboru"
 PythonSettings="Python nastavenia"
 PythonSettings.PythonInstallPath32bit="Python inštalačná cesta (32bitová)"
 PythonSettings.PythonInstallPath64bit="Python inštalačná cesta (64bitová)"
 PythonSettings.BrowsePythonPath="Prehliadať cestu k Pythonu"
 ScriptLogWindow="Log skriptu"
 Description="Popis"
+ScriptDescriptionLink.Text="Otvoriť tento odkaz v predvolenom webovom prehliadači?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Otvoriť URL"
 
 FileFilter.ScriptFiles="Súbory skriptu"
 FileFilter.AllFiles="Všetky súbory"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sr-SP.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sv-SE.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ta-IN.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ta-IN.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/uk-UA.ini Changed

@@ -1,43 +1,48 @@
-SceneSwitcher="Автоматичний перехід між Сценами"
-SceneSwitcher.OnNoMatch="Якщо нема відповідних вікон:"
+SceneSwitcher="Автоматичний перемикач сцен"
+SceneSwitcher.OnNoMatch="Якщо відповідні вікна відсутні:"
 SceneSwitcher.OnNoMatch.DontSwitch="Нічого не робити"
 SceneSwitcher.OnNoMatch.SwitchTo="Перейти до:"
 SceneSwitcher.CheckInterval="Перевіряти заголовок активного вікна кожні:"
-SceneSwitcher.ActiveOrNotActive="Автоматичний перехід між Сценами:"
+SceneSwitcher.ActiveOrNotActive="Перемикач сцен:"
 InvalidRegex.Title="Неприпустимий регулярний вираз"
-InvalidRegex.Text="Ви ввели неприпустимий регулярний вираз (шаблон)."
+InvalidRegex.Text="Уведений регулярний вираз недійсний."
 Active="Активний"
 Inactive="Неактивний"
 Start="Запустити"
 Stop="Зупинити"
 
 Captions="Субтитри (експериментально)"
-Captions.AudioSource="Джерело Аудіо"
-Captions.CurrentSystemLanguage="Поточна мова Системи (%1)"
+Captions.AudioSource="Джерело аудіо"
+Captions.CurrentSystemLanguage="Поточна мова системи (%1)"
 Captions.Provider="Постачальник"
 Captions.Error.GenericFail="Не вдалося запустити субтитри"
 
-OutputTimer="Таймер для Виводу"
-OutputTimer.Stream="Закінчити трансляцію за:"
+OutputTimer="Таймер виводу"
+OutputTimer.Stream="Завершити трансляцію за:"
 OutputTimer.Record="Зупинити запис за:"
 OutputTimer.Stream.StoppingIn="Трансляція припиниться за:"
-OutputTimer.Record.StoppingIn="Запис зупиниться за:"
-OutputTimer.Stream.EnableEverytime="Щоразу запускається трансляція - вмикати Таймер для Виводу"
-OutputTimer.Record.EnableEverytime="Щоразу починається запис - вмикати Таймер для Виводу"
-OutputTimer.Record.PauseTimer="Призупиняти таймер коли запис Призупинено"
+OutputTimer.Record.StoppingIn="Запис припиниться за:"
+OutputTimer.Stream.EnableEverytime="Щоразу вмикати таймер трансляції"
+OutputTimer.Record.EnableEverytime="Щоразу вмикати таймер запису"
+OutputTimer.Record.PauseTimer="Призупиняти таймер, коли записування на паузі"
 
 Scripts="Скрипти"
 LoadedScripts="Завантажені скрипти"
 AddScripts="Додати скрипти"
 RemoveScripts="Видалити скрипти"
 ReloadScripts="Перезавантажити скрипти"
-PythonSettings="Python налаштування"
-PythonSettings.PythonInstallPath32bit="Шлях до програми Python (32 біти)"
-PythonSettings.PythonInstallPath64bit="Шлях до програми Python (64 біти)"
+Reload="Перезавантажити"
+OpenFileLocation="Відкрити папку файлу"
+PythonSettings="Налаштування Python"
+PythonSettings.PythonInstallPath32bit="Шлях інсталяції Python (32 біти)"
+PythonSettings.PythonInstallPath64bit="Шлях інсталяції Python (64 біти)"
 PythonSettings.BrowsePythonPath="Огляд шляху до програми Python"
-ScriptLogWindow="Журнал роботи скрипта"
+ScriptLogWindow="Журнал скрипта"
 Description="Опис"
+ScriptDescriptionLink.Text="Відкрити це посилання у стандартному веббраузері?"
+ScriptDescriptionLink.Text.Url="URL: %1"
+ScriptDescriptionLink.OpenURL="Відкрити URL"
 
 FileFilter.ScriptFiles="Файли скриптів"
-FileFilter.AllFiles="Всі файли"
+FileFilter.AllFiles="Усі файли"

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/forms/scripts.ui -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/forms/scripts.ui Changed

@@ -19,6 +19,9 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
+     <property name="tabBarAutoHide">
+      <bool>true</bool>
+     </property>
      <widget class="QWidget" name="scriptsTab">
       <attribute name="title">
        <string>Scripts</string>
@@ -38,6 +41,9 @@
          </item>
          <item>
           <widget class="QListWidget" name="scripts">
+           <property name="contextMenuPolicy">
+            <enum>Qt::CustomContextMenu</enum>
+           </property>
            <property name="sortingEnabled">
             <bool>true</bool>
            </property>
@@ -134,6 +140,13 @@
             </spacer>
            </item>
            <item>
+            <widget class="QPushButton" name="defaults">
+             <property name="text">
+              <string>Defaults</string>
+             </property>
+            </widget>
+           </item>
+           <item>
             <widget class="QPushButton" name="scriptLog">
              <property name="text">
               <string>ScriptLogWindow</string>
@@ -164,6 +177,9 @@
            <property name="text">
             <string notr="true"/>
            </property>
+           <property name="openExternalLinks">
+            <bool>false</bool>
+           </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp Changed

@@ -1,6 +1,8 @@
+#include "obs-module.h"
 #include "scripts.hpp"
 #include "frontend-tools-config.h"
 #include "../../properties-view.hpp"
+#include "../../qt-wrappers.hpp"
 
 #include <QFileDialog>
 #include <QPlainTextEdit>
@@ -13,6 +15,10 @@
 #include <QDialogButtonBox>
 #include <QResizeEvent>
 #include <QAction>
+#include <QMessageBox>
+#include <QMenu>
+#include <QUrl>
+#include <QDesktopServices>
 
 #include <obs.hpp>
 #include <obs-module.h>
@@ -192,6 +198,7 @@
 #else
 	delete ui->pythonSettingsTab;
 	ui->pythonSettingsTab = nullptr;
+	ui->tabWidget->setStyleSheet("QTabWidget::pane {border: 0;}");
 #endif
 
 	delete propertiesView;
@@ -199,10 +206,19 @@
 	propertiesView->setSizePolicy(QSizePolicy::Expanding,
 				      QSizePolicy::Expanding);
 	ui->propertiesLayout->addWidget(propertiesView);
+
+	config_t *global_config = obs_frontend_get_global_config();
+	int row =
+		config_get_int(global_config, "scripts-tool", "prevScriptRow");
+	ui->scripts->setCurrentRow(row);
 }
 
 ScriptsTool::~ScriptsTool()
 {
+	config_t *global_config = obs_frontend_get_global_config();
+	config_set_int(global_config, "scripts-tool", "prevScriptRow",
+		       ui->scripts->currentRow());
+
 	delete ui;
 }
 
@@ -254,6 +270,22 @@
 	}
 }
 
+void ScriptsTool::SetScriptDefaults(const char *path)
+{
+	for (OBSScript &script : scriptData->scripts) {
+		const char *script_path = obs_script_get_path(script);
+		if (strcmp(script_path, path) == 0) {
+			obs_data_t *settings = obs_script_get_settings(script);
+			obs_data_clear(settings);
+			obs_data_release(settings);
+
+			obs_script_update(script, nullptr);
+			on_reloadScripts_clicked();
+			break;
+		}
+	}
+}
+
 void ScriptsTool::on_close_clicked()
 {
 	close();
@@ -293,19 +325,16 @@
 		lastBrowsedDir = baseScriptPath;
 	}
 
-	QFileDialog dlg(this, obs_module_text("AddScripts"));
-	dlg.setFileMode(QFileDialog::ExistingFiles);
-	dlg.setDirectory(QDir(lastBrowsedDir.c_str()));
-	dlg.setNameFilter(filter);
-	dlg.exec();
-
-	QStringList files = dlg.selectedFiles();
+	QStringList files = OpenFiles(this,
+				      QT_UTF8(obs_module_text("AddScripts")),
+				      QT_UTF8(lastBrowsedDir.c_str()), filter);
 	if (!files.count())
 		return;
 
-	lastBrowsedDir = dlg.directory().path().toUtf8().constData();
-
 	for (const QString &file : files) {
+		lastBrowsedDir =
+			QFileInfo(file).absolutePath().toUtf8().constData();
+
 		QByteArray pathBytes = file.toUtf8();
 		const char *path = pathBytes.constData();
 
@@ -331,6 +360,8 @@
 				obs_script_get_properties(script);
 			obs_properties_apply_settings(prop, settings);
 			obs_properties_destroy(prop);
+
+			ui->scripts->setCurrentItem(item);
 		}
 	}
 }
@@ -359,6 +390,43 @@
 	on_scripts_currentRowChanged(ui->scripts->currentRow());
 }
 
+void ScriptsTool::OpenScriptParentDirectory()
+{
+	QList<QListWidgetItem *> items = ui->scripts->selectedItems();
+	for (QListWidgetItem *item : items) {
+		QDir dir(item->data(Qt::UserRole).toString());
+		dir.cdUp();
+		QDesktopServices::openUrl(
+			QUrl::fromLocalFile(dir.absolutePath()));
+	}
+}
+
+void ScriptsTool::on_scripts_customContextMenuRequested(const QPoint &pos)
+{
+
+	QListWidgetItem *item = ui->scripts->itemAt(pos);
+
+	QMenu popup(this);
+
+	obs_frontend_push_ui_translation(obs_module_get_string);
+
+	popup.addAction(tr("Add"), this, SLOT(on_addScripts_clicked()));
+
+	if (item) {
+		popup.addSeparator();
+		popup.addAction(obs_module_text("Reload"), this,
+				SLOT(on_reloadScripts_clicked()));
+		popup.addAction(obs_module_text("OpenFileLocation"), this,
+				SLOT(OpenScriptParentDirectory()));
+		popup.addSeparator();
+		popup.addAction(tr("Remove"), this,
+				SLOT(on_removeScripts_clicked()));
+	}
+	obs_frontend_pop_ui_translation();
+
+	popup.exec(QCursor::pos());
+}
+
 void ScriptsTool::on_scriptLog_clicked()
 {
 	scriptLogWindow->show();
@@ -368,8 +436,8 @@
 void ScriptsTool::on_pythonPathBrowse_clicked()
 {
 	QString curPath = ui->pythonPath->text();
-	QString newPath = QFileDialog::getExistingDirectory(
-		this, ui->pythonPathLabel->text(), curPath);
+	QString newPath =
+		SelectDirectory(this, ui->pythonPathLabel->text(), curPath);
 
 	if (newPath.isEmpty())
 		return;
@@ -432,6 +500,50 @@
 	ui->description->setText(obs_script_get_description(script));
 }
 
+void ScriptsTool::on_defaults_clicked()
+{
+	QListWidgetItem *item = ui->scripts->currentItem();
+	if (!item)
+		return;
+
+	SetScriptDefaults(
+		item->data(Qt::UserRole).toString().toUtf8().constData());
+}
+
+void ScriptsTool::on_description_linkActivated(const QString &link)
+{
+	QUrl url(link, QUrl::StrictMode);
+	if (url.isValid() && (url.scheme().compare("http") == 0 ||
+			      url.scheme().compare("https") == 0)) {
+		QString msg(obs_module_text("ScriptDescriptionLink.Text"));
+		msg += "\n\n";
+		msg += QString(obs_module_text(
+				       "ScriptDescriptionLink.Text.Url"))
+			       .arg(link);
+
+		const char *open =
+			obs_module_text("ScriptDescriptionLink.OpenURL");
+
+		QMessageBox messageBox(this);
+		messageBox.setWindowTitle(open);
+		messageBox.setText(msg);
+
+		obs_frontend_push_ui_translation(obs_module_get_string);
+		QPushButton *yesButton =
+			messageBox.addButton(open, QMessageBox::YesRole);
+		QPushButton *noButton =
+			messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
+		obs_frontend_pop_ui_translation();
+		messageBox.setDefaultButton(yesButton);
+		messageBox.setEscapeButton(noButton);
+		messageBox.setIcon(QMessageBox::Question);
+		messageBox.exec();
+
+		if (messageBox.clickedButton() == yesButton)
+			QDesktopServices::openUrl(url);
+	}
+}
+
 /* ----------------------------------------------------------------- */
 
 extern "C" void FreeScripts()

obs-studio-25.0.8.tar.xz/UI/frontend-plugins/frontend-tools/scripts.hpp -> obs-studio-26.0.0.tar.xz/UI/frontend-plugins/frontend-tools/scripts.hpp Changed

obs-studio-25.0.8.tar.xz/UI/importers/classic.cpp -> obs-studio-26.0.0.tar.xz/UI/importers/classic.cpp Changed

@@ -258,8 +258,6 @@
 		string winClass = in_settings["windowClass"].string_value();
 		string exec = in_settings["executable"].string_value();
 
-		string window = ":" + winClass + ":" + exec;
-
 		settings["window"] = ":" + winClass + ":" + exec;
 
 		translate_bool("captureMouse", in_settings, "capture_cursor",
@@ -298,10 +296,9 @@
 	for (size_t i = 0; i < scenes.size(); i++) {
 		Json in_scene = scenes[i];
 
-		if (first_name == "")
+		if (first_name.empty())
 			first_name = in_scene["name"].string_value();
 
-		Json::object settings = Json::object{};
 		Json::array items = Json::array{};
 
 		Json::array sources = in_scene["sources"].array_items();
@@ -391,7 +388,7 @@
 				Json::array new_arr = Json::array{};
 				string str = out[c_name].string_value();
 				create_string_obj(str, new_arr);
-				arr = new_arr;
+				arr = std::move(new_arr);
 			}
 
 			create_string_obj(first, arr);
@@ -408,7 +405,7 @@
 				Json::array new_arr = Json::array{};
 				string str1 = out[c_name].string_value();
 				create_string_obj(str1, new_arr);
-				arr = new_arr;
+				arr = std::move(new_arr);
 			}
 
 			create_string_obj(str, arr);
@@ -431,7 +428,7 @@
 
 	line = ReadLine(src);
 	size_t l_len = line.size();
-	while (line != "" && line[l_len - 1] != '}') {
+	while (!line.empty() && line[l_len - 1] != '}') {
 		size_t end_pos = line.find(':');
 
 		if (end_pos == string::npos)
@@ -478,7 +475,7 @@
 
 	size_t l_len = line.size() - 1;
 
-	while (line != "" && line[l_len] != '}') {
+	while (!line.empty() && line[l_len] != '}') {
 		start_pos = 0;
 		while (line[start_pos] == ' ')
 			start_pos++;
@@ -511,10 +508,8 @@
 	if (!file_data)
 		return IMPORTER_FILE_WONT_OPEN;
 
-	string sc_name = GetFilenameFromPath(path);
-
-	if (name == "")
-		name = sc_name;
+	if (name.empty())
+		name = GetFilenameFromPath(path);
 
 	Json::object data = Json::object{};
 	data["name"] = name;
@@ -522,7 +517,7 @@
 	string file = file_data.Get();
 	string line = ReadLine(file);
 
-	while (line != "" && line[0] != '\0') {
+	while (!line.empty() && line[0] != '\0') {
 		string key = line != "global sources : {" ? "scenes"
 							  : "globals";

obs-studio-25.0.8.tar.xz/UI/importers/sl.cpp -> obs-studio-26.0.0.tar.xz/UI/importers/sl.cpp Changed

obs-studio-25.0.8.tar.xz/UI/importers/xsplit.cpp -> obs-studio-26.0.0.tar.xz/UI/importers/xsplit.cpp Changed

@@ -233,7 +233,7 @@
 		}
 
 		name = attr.namedItem("cname").nodeValue().toStdString();
-		if (name == "" || name[0] == '\0')
+		if (name.empty() || name[0] == '\0')
 			name = attr.namedItem("name").nodeValue().toStdString();
 
 		temp_name = name;
@@ -264,7 +264,7 @@
 		} else if (type == 2) {
 			QString audio = attr.namedItem("itemaudio").nodeValue();
 
-			if (audio == "") {
+			if (audio.isEmpty()) {
 				source["id"] = "dshow_input";
 			} else {
 				source["id"] = "wasapi_input_capture";
@@ -294,7 +294,7 @@
 			QString display =
 				o_attr.namedItem("desktop").nodeValue();
 
-			if (display != "") {
+			if (!display.isEmpty()) {
 				source["id"] = "monitor_capture";
 				int cursor = attr.namedItem("ScrCapShowMouse")
 						     .nodeValue()
@@ -312,7 +312,7 @@
 
 				int pos = exec.lastIndexOf('\\');
 
-				if (_class == "") {
+				if (_class.isEmpty()) {
 					_class = "class";
 				}
 
@@ -421,7 +421,7 @@
 			QString name = attr.namedItem("name").nodeValue();
 			QString id = attr.namedItem("id").nodeValue();
 
-			if (first == "")
+			if (first.isEmpty())
 				first = name;
 
 			Json out = Json::object{
@@ -492,7 +492,7 @@
 	string pos = file_data.Get();
 
 	string line = ReadLine(pos);
-	while (line != "") {
+	while (!line.empty()) {
 		if (line.substr(0, 5) == "<?xml") {
 			line = ReadLine(pos);
 		} else {

obs-studio-26.0.0.tar.xz/UI/installer/OBSBanner.bmp Added

obs-studio-26.0.0.tar.xz/UI/installer/OBSHeader.bmp Added

obs-studio-25.0.8.tar.xz/UI/installer/mp-installer.nsi -> obs-studio-26.0.0.tar.xz/UI/installer/mp-installer.nsi Changed

@@ -1,18 +1,31 @@
-; Script generated with the Venis Install Wizard
+;
+; NSIS Installer Script for OBS Studio, https://obsproject.com/
+;
+; This installer script is designed only for the release process
+; of OBS Studio. It requires a lot of files to be in exactly the
+; right places. If you're making a fork, it's strongly suggested
+; that you make your own installer.
+;
+; If you choose to use this script anyway, be absolutely sure you
+; have replaced every OBS specific check, whether process names,
+; application names, files, registry entries, etc.
+;
+; This script also requires OBSInstallerUtils for additional
+; functions. You can find it at
+; https://github.com/notr1ch/OBSInstallerUtils
 
 Unicode true
+ManifestDPIAware true
 
 ; Define your application name
 !define APPNAME "OBS Studio"
 
 !ifndef APPVERSION
-!define APPVERSION "17.0.2"
-!define SHORTVERSION "17.0.2"
+!define APPVERSION "25.0.8"
+!define SHORTVERSION "25.0.8"
 !endif
 
 !define APPNAMEANDVERSION "OBS Studio ${SHORTVERSION}"
-; !define FULL
-!define REALSENSE_PLUGIN
 
 ; Additional script dependencies
 !include WinVer.nsh
@@ -20,12 +33,17 @@
 
 ; Main Install settings
 Name "${APPNAMEANDVERSION}"
+!ifdef INSTALL64
+InstallDir "$PROGRAMFILES64\obs-studio"
+!else
 InstallDir "$PROGRAMFILES32\obs-studio"
+!endif
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-!ifdef FULL
-OutFile "OBS-Studio-${SHORTVERSION}-Full-Installer.exe"
+
+!ifdef INSTALL64
+ OutFile "OBS-Studio-${SHORTVERSION}-Full-Installer-x64.exe"
 !else
-OutFile "OBS-Studio-${SHORTVERSION}-Small-Installer.exe"
+ OutFile "OBS-Studio-${SHORTVERSION}-Full-Installer-x86.exe"
 !endif
 
 ; Use compression
@@ -37,23 +55,29 @@
 ; Modern interface settings
 !include "MUI.nsh"
 
+!define MUI_ICON "obs.ico"
+!define MUI_HEADERIMAGE_BITMAP "OBSHeader.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "OBSBanner.bmp"
+
 !define MUI_ABORTWARNING
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_TEXT "Launch OBS Studio ${SHORTVERSION}"
 !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchOBS"
 
-; GPL is not an EULA, no need to agree to it.
-!define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
-!define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."
+!define MUI_WELCOMEPAGE_TEXT "This setup will guide you through installing OBS Studio.\n\nIt is recommended that you close all other applications before starting, including OBS Studio. This will make it possible to update relevant files without having to reboot your computer.\n\nClick Next to continue."
 
 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE PreReqCheck
 
+!define MUI_HEADERIMAGE
+!define MUI_PAGE_HEADER_TEXT "License Information"
+!define MUI_PAGE_HEADER_SUBTEXT "Please review the license terms before installing OBS Studio."
+!define MUI_LICENSEPAGE_TEXT_TOP "Press Page Down or scroll to see the rest of the license."
+!define MUI_LICENSEPAGE_TEXT_BOTTOM " "
+!define MUI_LICENSEPAGE_BUTTON "&Next >"
+
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "new\core\data\obs-studio\license\gplv2.txt"
 !insertmacro MUI_PAGE_DIRECTORY
-!ifdef FULL
-	!insertmacro MUI_PAGE_COMPONENTS
-!endif
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
@@ -66,68 +90,51 @@
 !insertmacro MUI_RESERVEFILE_LANGDLL
 
 Function PreReqCheck
-	; Abort on XP or lower
-	${If} ${AtMostWinXP}
-		MessageBox MB_OK|MB_ICONSTOP "Due to extensive use of DirectX 10 features, ${APPNAME} requires Windows Vista SP2 or higher and cannot be installed on this version of Windows."
-		Quit
+!ifdef INSTALL64
+	${if} ${RunningX64}
+	${Else}
+		MessageBox MB_OK|MB_ICONSTOP "This version of OBS Studio is not compatible with your system.  Please use the 32bit (x86) installer."
 	${EndIf}
+	; Abort on XP or lower
+!endif
 
-	; Vista specific checks
-	${If} ${IsWinVista}
-		; Check Vista SP2
-		${If} ${AtMostServicePack} 1
-			MessageBox MB_YESNO|MB_ICONEXCLAMATION "${APPNAME} requires Service Pack 2 when running on Vista. Would you like to download it?" IDYES sptrue IDNO spfalse
-			sptrue:
-				ExecShell "open" "http://windows.microsoft.com/en-US/windows-vista/Learn-how-to-install-Windows-Vista-Service-Pack-2-SP2"
-			spfalse:
-			Quit
-		${EndIf}
-
-		; Check Vista Platform Update
-		nsexec::exectostack "$SYSDIR\wbem\wmic.exe qfe where HotFixID='KB971512' get HotFixID /Format:list"
-		pop $0
-		pop $0
-		strcpy $1 $0 17 6
-		strcmps $1 "HotFixID=KB971512" gotPatch
-			MessageBox MB_YESNO|MB_ICONEXCLAMATION "${APPNAME} requires the Windows Vista Platform Update. Would you like to download it?" IDYES putrue IDNO pufalse
-			putrue:
-				${If} ${RunningX64}
-					; 64 bit
-					ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=4390"
-				${Else}
-					; 32 bit
-					ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=3274"
-				${EndIf}
-			pufalse:
-			Quit
-		gotPatch:
+	${If} ${AtMostWinVista}
+		MessageBox MB_OK|MB_ICONSTOP "Due to extensive use of DirectX 10 features, ${APPNAME} requires Windows 7 or higher and cannot be installed on this version of Windows."
+		Quit
 	${EndIf}
 
-	; 32 bit Visual Studio 2013 runtime check
+!ifdef INSTALL64
+	; 64 bit Visual Studio 2017 runtime check
 	ClearErrors
-	GetDLLVersion "MSVCR120.DLL" $R0 $R1
-	GetDLLVersion "MSVCP120.DLL" $R0 $R1
-	IfErrors vs2013Missing vs2013OK1
-	vs2013Missing:
-		MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Please make sure to install both vcredist_x64 and vcredist_x86. Would you like to download them?" IDYES vs2013true IDNO vs2013false
-		vs2013true:
-			ExecShell "open" "https://obsproject.com/visual-studio-2013-runtimes"
-		vs2013false:
+	SetOutPath "$TEMP\OBS"
+	File check_for_64bit_visual_studio_2017_runtimes.exe
+	ExecWait "$TEMP\OBS\check_for_64bit_visual_studio_2017_runtimes.exe" $R0
+	Delete "$TEMP\OBS\check_for_64bit_visual_studio_2017_runtimes.exe"
+	RMDir "$TEMP\OBS"
+	IntCmp $R0 126 vs2017Missing_64 vs2017OK_64
+	vs2017Missing_64:
+		MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Would you like to download them?" IDYES vs2017true_64 IDNO vs2017false_64
+		vs2017true_64:
+			ExecShell "open" "https://obsproject.com/visual-studio-2017-runtimes-64-bit"
+		vs2017false_64:
 		Quit
-	vs2013OK1:
+	vs2017OK_64:
 	ClearErrors
-
-	; 64 bit Visual Studio 2013 runtime check
-	${if} ${RunningX64}
-		SetOutPath "$TEMP\OBS"
-		File check_for_64bit_visual_studio_2013_runtimes.exe
-		ExecWait "$TEMP\OBS\check_for_64bit_visual_studio_2013_runtimes.exe" $R0
-		Delete "$TEMP\OBS\check_for_64bit_visual_studio_2013_runtimes.exe"
-		RMDir "$TEMP\OBS"
-		IntCmp $R0 126 vs2013Missing vs2013OK2
-		vs2013OK2:
-		ClearErrors
-	${endif}
+!else
+	; 32 bit Visual Studio 2017 runtime check
+	ClearErrors
+	GetDLLVersion "vcruntime140.DLL" $R0 $R1
+	GetDLLVersion "msvcp140.DLL" $R0 $R1
+	IfErrors vs2017Missing_32 vs2017OK_32
+	vs2017Missing_32:
+		MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Would you like to download them?" IDYES vs2017true_32 IDNO vs2017false_32
+		vs2017true_32:
+			ExecShell "open" "https://obsproject.com/visual-studio-2017-runtimes-32-bit"
+		vs2017false_32:
+		Quit
+	vs2017OK_32:
+	ClearErrors
+!endif
 
 	; DirectX Version Check
 	ClearErrors
@@ -178,6 +185,10 @@
 	GetDLLVersion "D3DCompiler_47.dll" $R0 $R1
 	IfErrors dxMissing47 dxOK
 	dxMissing47:
+	ClearErrors
+	GetDLLVersion "D3DCompiler_49.dll" $R0 $R1
+	IfErrors dxMissing49 dxOK
+	dxMissing49:
 	MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing DirectX components that ${APPNAME} requires. Would you like to download them?" IDYES dxtrue IDNO dxfalse
 	dxtrue:
 		ExecShell "open" "https://obsproject.com/go/dxwebsetup"
@@ -187,173 +198,188 @@
 	ClearErrors
 
 	; Check previous instance
-
+	check32BitRunning:
 	OBSInstallerUtils::IsProcessRunning "obs32.exe"
 	IntCmp $R0 1 0 notRunning1
-		MessageBox MB_OK|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDOK
+		MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDCANCEL IDRETRY check32BitRunning
 		Quit
 	notRunning1:
 
 	${if} ${RunningX64}
+		check64BitRunning:
 		OBSInstallerUtils::IsProcessRunning "obs64.exe"
 		IntCmp $R0 1 0 notRunning2
-			MessageBox MB_OK|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDOK
+			MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "${APPNAME} is already running. Please close it first before installing a new version." /SD IDCANCEL IDRETRY check64BitRunning
 			Quit
 		notRunning2:
 	${endif}
+FunctionEnd
 
+Var dllFilesInUse
+
+Function checkDLLs
+	OBSInstallerUtils::ResetInUseFileChecks
 	OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook32.dll"
 	OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook64.dll"
+	OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll"
+	OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll"
+	OBSInstallerUtils::AddInUseFileCheck "$APPDATA\obs-studio-hook\graphics-hook32.dll"
+	OBSInstallerUtils::AddInUseFileCheck "$APPDATA\obs-studio-hook\graphics-hook64.dll"
 	OBSInstallerUtils::GetAppNameForInUseFiles
-	StrCmp $R0 "" gameCaptureNotRunning
-		MessageBox MB_OK|MB_ICONEXCLAMATION "Game Capture is still in use by the following applications:$\r$\n$\r$\n$R0$\r$\nPlease close these applications before installing a new version of OBS." /SD IDOK
-		Quit
-	gameCaptureNotRunning:
+	StrCpy $dllFilesInUse "$R0"
 FunctionEnd
 
-Function filesInUse
-	MessageBox MB_OK|MB_ICONEXCLAMATION "Some files were not able to be installed. If this is the first time you are installing OBS, please disable any anti-virus or other security software and try again. If you are re-installing or updating OBS, close any applications that may be have been hooked, or reboot and try again."  /SD IDOK
+Function checkFilesInUse
+	retryFileChecks:
+	Call checkDLLs
+	StrCmp $dllFilesInUse "" dllsNotInUse
+	MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "OBS files are being used by the following applications:$\r$\n$\r$\n$dllFilesInUse$\r$\nPlease close these applications to continue setup." /SD IDCANCEL IDRETRY retryFileChecks
+	Quit
+
+	dllsNotInUse:
 FunctionEnd
 
 Function LaunchOBS
-	${if} ${RunningX64}
-		Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"'
-	${else}
-		Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk"'
-	${endif}
+!ifdef INSTALL64
+	Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk"'
+!else
+	Exec '"$WINDIR\explorer.exe" "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk"'
+!endif
 FunctionEnd
 
-Var outputErrors
-
 Section "OBS Studio" SecCore
+	SetShellVarContext all
+
+	Call checkFilesInUse
 
 	; Set Section properties
 	SectionIn RO
 	SetOverwrite on
 	AllowSkipFiles off
 
-	SetShellVarContext all
-
 	; Set Section Files and Shortcuts
 	SetOutPath "$INSTDIR"
 	OBSInstallerUtils::KillProcess "obs-plugins\32bit\cef-bootstrap.exe"
 	OBSInstallerUtils::KillProcess "obs-plugins\64bit\cef-bootstrap.exe"
+
 	File /r "new\core\data"
+
+!ifdef INSTALL64
+	SetOutPath "$INSTDIR\bin"
+	File /r "new\core\bin\64bit"
+	SetOutPath "$INSTDIR\obs-plugins"
+	File /r "new\core\obs-plugins\64bit"
+!else
 	SetOutPath "$INSTDIR\bin"
 	File /r "new\core\bin\32bit"
 	SetOutPath "$INSTDIR\obs-plugins"
 	File /r "new\core\obs-plugins\32bit"
+!endif
 
+	# ----------------------------
+
+	SetShellVarContext all
+
+	SetOutPath "$INSTDIR"
+	File /r "new\obs-browser\data"
+	SetOutPath "$INSTDIR\obs-plugins"
+	OBSInstallerUtils::KillProcess "32bit\cef-bootstrap.exe"
+	OBSInstallerUtils::KillProcess "32bit\obs-browser-page.exe"
 	${if} ${RunningX64}
-		SetOutPath "$INSTDIR\bin"
-		File /r "new\core\bin\64bit"
-		SetOutPath "$INSTDIR\obs-plugins"
-		File /r "new\core\obs-plugins\64bit"
+		OBSInstallerUtils::KillProcess "64bit\cef-bootstrap.exe"
+		OBSInstallerUtils::KillProcess "64bit\obs-browser-page.exe"
 	${endif}
+!ifdef INSTALL64
+	File /r "new\obs-browser\obs-plugins\64bit"
+	SetOutPath "$INSTDIR\bin\64bit"
+!else
+	File /r "new\obs-browser\obs-plugins\32bit"
+	SetOutPath "$INSTDIR\bin\32bit"
+!endif
 
-	ClearErrors
-
-	IfErrors 0 +2
-		StrCpy $outputErrors "yes"
+	# ----------------------------
+	# Copy game capture files to ProgramData
+	SetOutPath "$APPDATA\obs-studio-hook"
+	File "new\core\data\obs-plugins\win-capture\graphics-hook32.dll"
+	File "new\core\data\obs-plugins\win-capture\graphics-hook64.dll"
+	File "new\core\data\obs-plugins\win-capture\obs-vulkan32.json"
+	File "new\core\data\obs-plugins\win-capture\obs-vulkan64.json"
+	OBSInstallerUtils::AddAllApplicationPackages "$APPDATA\obs-studio-hook"
 
 	WriteUninstaller "$INSTDIR\uninstall.exe"
 
-	; Delete Old "Multiplatform" Shortcuts
-	Delete "$DESKTOP\OBS Multiplatform.lnk"
-	Delete "$SMPROGRAMS\OBS Multiplatform\OBS Multiplatform (32bit).lnk"
-	Delete "$SMPROGRAMS\OBS Multiplatform\Uninstall.lnk"
-	${if} ${RunningX64}
-		Delete "$SMPROGRAMS\OBS Multiplatform\OBS Multiplatform (64bit).lnk"
-	${endif}
+!ifdef INSTALL64
+	SetOutPath "$INSTDIR\bin\64bit"
+	CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\64bit\obs64.exe"
+!else
+	SetOutPath "$INSTDIR\bin\32bit"
+	CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\32bit\obs32.exe"
+!endif
 
-	${if} ${RunningX64}
-		SetOutPath "$INSTDIR\bin\64bit"
-		CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\64bit\obs64.exe"
-	${else}
-		SetOutPath "$INSTDIR\bin\32bit"
-		CreateShortCut "$DESKTOP\OBS Studio.lnk" "$INSTDIR\bin\32bit\obs32.exe"
-	${endif}
+	CreateDirectory "$SMPROGRAMS\OBS Studio"
+
+!ifdef INSTALL64
+	SetOutPath "$INSTDIR\bin\64bit"
+	CreateShortCut "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk" "$INSTDIR\bin\64bit\obs64.exe"
+!else
 	SetOutPath "$INSTDIR\bin\32bit"
 	CreateDirectory "$SMPROGRAMS\OBS Studio"
 	CreateShortCut "$SMPROGRAMS\OBS Studio\OBS Studio (32bit).lnk" "$INSTDIR\bin\32bit\obs32.exe"
+!endif
+
 	CreateShortCut "$SMPROGRAMS\OBS Studio\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+SectionEnd
+
+Section -FinishSection
+
+	SetShellVarContext all
+
+	# ---------------------------------------
+	# 64bit vulkan hook registry stuff
 
 	${if} ${RunningX64}
-		SetOutPath "$INSTDIR\bin\64bit"
-		CreateShortCut "$SMPROGRAMS\OBS Studio\OBS Studio (64bit).lnk" "$INSTDIR\bin\64bit\obs64.exe"
+		SetRegView 64
+		WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
+
+		ClearErrors
+		DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json"
+		ClearErrors
+		WriteRegDWORD HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" 0
 	${endif}
 
-	SetOutPath "$INSTDIR\bin\32bit"
+	# ---------------------------------------
+	# 32bit vulkan hook registry stuff
 
-	StrCmp $outputErrors "yes" 0 +2
-		Call filesInUse
-SectionEnd
+	SetRegView 32
+	WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
 
-!ifdef FULL
-SectionGroup /e "Plugins" SecPlugins
-	Section "Browser Source" SecPlugins_Browser
-		; Set Section properties
-		SetOverwrite on
-		AllowSkipFiles off
-		SetShellVarContext all
-
-		SetOutPath "$INSTDIR\obs-plugins"
-		OBSInstallerUtils::KillProcess "32bit\cef-bootstrap.exe"
-		File /r "new\obs-browser\obs-plugins\32bit"
-
-		${if} ${RunningX64}
-			OBSInstallerUtils::KillProcess "64bit\cef-bootstrap.exe"
-			File /r "new\obs-browser\obs-plugins\64bit"
-		${endif}
-
-		SetOutPath "$INSTDIR\bin\32bit"
-	SectionEnd
-
-	!ifdef REALSENSE_PLUGIN
-	Section /o "Realsense Source" SecPlugins_Realsense
-		SetOverwrite on
-		AllowSkipFiles off
-		SetShellVarContext all
-
-		SetOutPath "$INSTDIR\obs-plugins"
-		File /r "new\realsense\obs-plugins\32bit"
-
-		${if} ${RunningX64}
-			File /r "new\realsense\obs-plugins\64bit"
-		${endif}
-
-		SetOutPath "$INSTDIR\data\obs-plugins"
-		File /r "new\realsense\data\obs-plugins\win-ivcam"
-
-		ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /UnregServer'
-		ExecWait '"$INSTDIR\data\obs-plugins\win-ivcam\seg_service.exe" /RegServer'
-
-		ReadRegStr $0 HKLM "Software\Intel\RSSDK\Dispatch" "Core"
-		${if} ${Errors}
-			ReadRegStr $0 HKLM "Software\Intel\RSSDK\v10\Dispatch" "Core"
-		${endif}
-
-		${if} ${Errors}
-			InitPluginsDir
-			SetOutPath "$PLUGINSDIR\realsense"
-
-			File "intel_rs_sdk_runtime_websetup_10.0.26.0396.exe"
-			ExecWait '"$PLUGINSDIR\realsense\intel_rs_sdk_runtime_websetup_10.0.26.0396.exe" --finstall=personify --fnone=all'
-		${endif}
-
-		SetOutPath "$INSTDIR\bin\32bit"
-	SectionEnd
-	!endif
-SectionGroupEnd
-!endif
+	ClearErrors
+	DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan32.json"
+	ClearErrors
+	WriteRegDWORD HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan32.json" 0
 
-Section -FinishSection
+	# ---------------------------------------
+	# Register virtual camera dlls
+
+	Exec '"$SYSDIR\regsvr32.exe" /s "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll"'
+	${if} ${RunningX64}
+		Exec '"$SYSDIR\regsvr32.exe" /s "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll"'
+	${endif}
+
+	# ---------------------------------------
+
+	ClearErrors
+	SetRegView default
 
 	WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "ProductID" "d16d2409-3151-4331-a9b1-dfd8cf3f0d9c"
+!ifdef INSTALL64
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\bin\64bit\obs64.exe"
+!else
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\bin\32bit\obs32.exe"
+!endif
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "OBS Project"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "HelpLink" "https://obsproject.com"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${APPVERSION}"
@@ -363,13 +389,6 @@
 ; Modern install component descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "Core OBS Studio files"
-	!ifdef FULL
-		!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Optional Plugins"
-		!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins_Browser} "Browser plugin (a source you can add to your scenes that displays web pages)"
-		!ifdef REALSENSE_PLUGIN
-			!insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins_Realsense} "Plugin for Realsense cameras"
-		!endif
-	!endif
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;Uninstall section
@@ -377,7 +396,30 @@
 
 	SectionIn RO
 
-	;Remove from registry...
+	; Remove hook files and vulkan registry
+	SetShellVarContext all
+
+	RMDir /r "$APPDATA\obs-studio-hook"
+
+	SetRegView 32
+	DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan32.json"
+	DeleteRegValue HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan32.json"
+	${if} ${RunningX64}
+		SetRegView 64
+		DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json"
+		DeleteRegValue HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json"
+	${endif}
+	SetRegView default
+	SetShellVarContext current
+	ClearErrors
+
+	; Unregister virtual camera dlls
+	Exec '"$SYSDIR\regsvr32.exe" /u /s "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll"'
+	${if} ${RunningX64}
+		Exec '"$SYSDIR\regsvr32.exe" /u /s "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll"'
+	${endif}
+
+	; Remove from registry...
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
 	DeleteRegKey HKLM "SOFTWARE\${APPNAME}"
 
@@ -409,19 +451,19 @@
 SectionEnd
 
 Section /o "un.User Settings" UninstallSection2
-	RMDir /R "$APPDATA\obs-studio"
+	RMDir /r "$APPDATA\obs-studio"
 SectionEnd
 
 !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection1} "Remove the OBS program files."
-	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection2} "Removes all settings, plugins, scenes and sources, profiles, log files and other application data."
+	!insertmacro MUI_DESCRIPTION_TEXT ${UninstallSection2} "Removes all settings, scenes and sources, profiles, log files and other application data."
 !insertmacro MUI_UNFUNCTION_DESCRIPTION_END
 
 ; Version information
 VIProductVersion "${APPVERSION}.0"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "OBS Studio"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "obsproject.com"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "(c) 2012-2016"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "(c) 2012-2020"
 ; FileDescription is what shows in the UAC elevation prompt when signed
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "OBS Studio"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.0"

obs-studio-26.0.0.tar.xz/UI/installer/obs.ico Added

obs-studio-25.0.8.tar.xz/UI/item-widget-helpers.hpp -> obs-studio-26.0.0.tar.xz/UI/item-widget-helpers.hpp Changed

obs-studio-26.0.0.tar.xz/UI/locked-checkbox.cpp Added

obs-studio-25.0.8.tar.xz/UI/locked-checkbox.hpp -> obs-studio-26.0.0.tar.xz/UI/locked-checkbox.hpp Changed

obs-studio-26.0.0.tar.xz/UI/log-viewer.cpp Added

@@ -0,0 +1,167 @@
+#include <QFile>
+#include <QTextStream>
+#include <QScrollBar>
+#include <QFont>
+#include <QFontDatabase>
+#include <QPushButton>
+#include <QCheckBox>
+#include <QLayout>
+#include <QDesktopServices>
+#include <string>
+
+#include "log-viewer.hpp"
+#include "qt-wrappers.hpp"
+
+OBSLogViewer::OBSLogViewer(QWidget *parent) : QDialog(parent)
+{
+	setWindowFlags(windowFlags() & Qt::WindowMaximizeButtonHint &
+		       ~Qt::WindowContextHelpButtonHint);
+
+	QVBoxLayout *layout = new QVBoxLayout();
+	layout->setContentsMargins(0, 0, 0, 0);
+
+	const QFont fixedFont =
+		QFontDatabase::systemFont(QFontDatabase::FixedFont);
+
+	textArea = new QTextEdit();
+	textArea->setReadOnly(true);
+	textArea->setFont(fixedFont);
+
+	QHBoxLayout *buttonLayout = new QHBoxLayout();
+	QPushButton *clearButton = new QPushButton(QTStr("Clear"));
+	connect(clearButton, &QPushButton::clicked, this,
+		&OBSLogViewer::ClearText);
+	QPushButton *openButton = new QPushButton(QTStr("OpenFile"));
+	connect(openButton, &QPushButton::clicked, this,
+		&OBSLogViewer::OpenFile);
+	QPushButton *closeButton = new QPushButton(QTStr("Close"));
+	connect(closeButton, &QPushButton::clicked, this, &QDialog::hide);
+
+	bool showLogViewerOnStartup = config_get_bool(
+		App()->GlobalConfig(), "LogViewer", "ShowLogStartup");
+
+	QCheckBox *showStartup = new QCheckBox(QTStr("ShowOnStartup"));
+	showStartup->setChecked(showLogViewerOnStartup);
+	connect(showStartup, SIGNAL(toggled(bool)), this,
+		SLOT(ToggleShowStartup(bool)));
+
+	buttonLayout->addSpacing(10);
+	buttonLayout->addWidget(showStartup);
+	buttonLayout->addStretch();
+	buttonLayout->addWidget(openButton);
+	buttonLayout->addWidget(clearButton);
+	buttonLayout->addWidget(closeButton);
+	buttonLayout->addSpacing(10);
+	buttonLayout->setContentsMargins(0, 0, 0, 4);
+
+	layout->addWidget(textArea);
+	layout->addLayout(buttonLayout);
+	setLayout(layout);
+
+	setWindowTitle(QTStr("LogViewer"));
+	resize(800, 300);
+
+	const char *geom = config_get_string(App()->GlobalConfig(), "LogViewer",
+					     "geometry");
+
+	if (geom != nullptr) {
+		QByteArray ba = QByteArray::fromBase64(QByteArray(geom));
+		restoreGeometry(ba);
+	}
+
+	InitLog();
+}
+
+OBSLogViewer::~OBSLogViewer()
+{
+	config_set_string(App()->GlobalConfig(), "LogViewer", "geometry",
+			  saveGeometry().toBase64().constData());
+}
+
+void OBSLogViewer::ToggleShowStartup(bool checked)
+{
+	config_set_bool(App()->GlobalConfig(), "LogViewer", "ShowLogStartup",
+			checked);
+}
+
+extern QPointer<OBSLogViewer> obsLogViewer;
+
+void OBSLogViewer::InitLog()
+{
+	char logDir[512];
+	std::string path;
+
+	if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs")) {
+		path += logDir;
+		path += "/";
+		path += App()->GetCurrentLog();
+	}
+
+	QFile file(QT_UTF8(path.c_str()));
+
+	if (file.open(QIODevice::ReadOnly)) {
+		QTextStream in(&file);
+		in.setCodec("UTF-8");
+
+		while (!in.atEnd()) {
+			QString line = in.readLine();
+			AddLine(LOG_INFO, line);
+		}
+
+		file.close();
+	}
+
+	obsLogViewer = this;
+}
+
+void OBSLogViewer::AddLine(int type, const QString &str)
+{
+	QString msg = str.toHtmlEscaped();
+
+	switch (type) {
+	case LOG_WARNING:
+		msg = QStringLiteral("<font color=\"#c08000\">") + msg +
+		      QStringLiteral("</font>");
+		break;
+	case LOG_ERROR:
+		msg = QStringLiteral("<font color=\"#c00000\">") + msg +
+		      QStringLiteral("</font>");
+		break;
+	}
+
+	QScrollBar *scroll = textArea->verticalScrollBar();
+	bool bottomScrolled = scroll->value() >= scroll->maximum() - 10;
+
+	if (bottomScrolled)
+		scroll->setValue(scroll->maximum());
+
+	QTextCursor newCursor = textArea->textCursor();
+	newCursor.movePosition(QTextCursor::End);
+	newCursor.insertHtml(
+		QStringLiteral("<pre style=\"white-space: pre-wrap\">") + msg +
+		QStringLiteral("<br></pre>"));
+
+	if (bottomScrolled)
+		scroll->setValue(scroll->maximum());
+}
+
+void OBSLogViewer::ClearText()
+{
+	textArea->clear();
+}
+
+void OBSLogViewer::OpenFile()
+{
+	char logDir[512];
+	if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
+		return;
+
+	const char *log = App()->GetCurrentLog();
+
+	std::string path = logDir;
+	path += "/";
+	path += log;
+
+	QUrl url = QUrl::fromLocalFile(QT_UTF8(path.c_str()));
+	QDesktopServices::openUrl(url);
+}

obs-studio-26.0.0.tar.xz/UI/log-viewer.hpp Added

obs-studio-26.0.0.tar.xz/UI/media-controls.cpp Added

@@ -0,0 +1,472 @@
+#include "window-basic-main.hpp"
+#include "media-controls.hpp"
+#include "obs-app.hpp"
+#include <QToolTip>
+#include <QStyle>
+#include <QMenu>
+
+#include "ui_media-controls.h"
+
+void MediaControls::OBSMediaStopped(void *data, calldata_t *)
+{
+	MediaControls *media = static_cast<MediaControls *>(data);
+	QMetaObject::invokeMethod(media, "SetRestartState");
+}
+
+void MediaControls::OBSMediaPlay(void *data, calldata_t *)
+{
+	MediaControls *media = static_cast<MediaControls *>(data);
+	QMetaObject::invokeMethod(media, "SetPlayingState");
+}
+
+void MediaControls::OBSMediaPause(void *data, calldata_t *)
+{
+	MediaControls *media = static_cast<MediaControls *>(data);
+	QMetaObject::invokeMethod(media, "SetPausedState");
+}
+
+void MediaControls::OBSMediaStarted(void *data, calldata_t *)
+{
+	MediaControls *media = static_cast<MediaControls *>(data);
+	QMetaObject::invokeMethod(media, "SetPlayingState");
+}
+
+MediaControls::MediaControls(QWidget *parent)
+	: QWidget(parent), ui(new Ui::MediaControls)
+{
+	ui->setupUi(this);
+	ui->playPauseButton->setProperty("themeID", "playIcon");
+	ui->previousButton->setProperty("themeID", "previousIcon");
+	ui->nextButton->setProperty("themeID", "nextIcon");
+	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)));
+
+	countDownTimer = config_get_bool(App()->GlobalConfig(), "BasicWindow",
+					 "MediaControlsCountdownTimer");
+
+	QAction *restartAction = new QAction(this);
+	restartAction->setShortcut({Qt::Key_R});
+	connect(restartAction, SIGNAL(triggered()), this, SLOT(RestartMedia()));
+	addAction(restartAction);
+
+	QAction *sliderFoward = new QAction(this);
+	sliderFoward->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+	connect(sliderFoward, SIGNAL(triggered()), this,
+		SLOT(MoveSliderFoward()));
+	sliderFoward->setShortcut({Qt::Key_Right});
+	addAction(sliderFoward);
+
+	QAction *sliderBack = new QAction(this);
+	sliderBack->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+	connect(sliderBack, SIGNAL(triggered()), this,
+		SLOT(MoveSliderBackwards()));
+	sliderBack->setShortcut({Qt::Key_Left});
+	addAction(sliderBack);
+}
+
+MediaControls::~MediaControls()
+{
+	delete ui;
+}
+
+bool MediaControls::MediaPaused()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return false;
+	}
+
+	obs_media_state state = obs_source_media_get_state(source);
+	return state == OBS_MEDIA_STATE_PAUSED;
+}
+
+int64_t MediaControls::GetSliderTime(int val)
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return 0;
+	}
+
+	float percent = (float)val / (float)ui->slider->maximum();
+	float duration = (float)obs_source_media_get_duration(source);
+	int64_t seekTo = (int64_t)(percent * duration);
+
+	return seekTo;
+}
+
+void MediaControls::MediaSliderClicked()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return;
+	}
+
+	obs_media_state state = obs_source_media_get_state(source);
+
+	if (state == OBS_MEDIA_STATE_PAUSED) {
+		prevPaused = true;
+	} else if (state == OBS_MEDIA_STATE_PLAYING) {
+		prevPaused = false;
+		PauseMedia();
+		StopMediaTimer();
+	}
+
+	seek = ui->slider->value();
+	seekTimer.start(100);
+}
+
+void MediaControls::MediaSliderReleased()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return;
+	}
+
+	if (seekTimer.isActive()) {
+		seekTimer.stop();
+		if (lastSeek != seek) {
+			obs_source_media_set_time(source, GetSliderTime(seek));
+		}
+
+		seek = lastSeek = -1;
+	}
+
+	if (!prevPaused) {
+		PlayMedia();
+		StartMediaTimer();
+	}
+}
+
+void MediaControls::MediaSliderHovered(int val)
+{
+	float seconds = ((float)GetSliderTime(val) / 1000.0f);
+	QToolTip::showText(QCursor::pos(), FormatSeconds((int)seconds), this);
+}
+
+void MediaControls::MediaSliderMoved(int val)
+{
+	if (seekTimer.isActive()) {
+		seek = val;
+	}
+}
+
+void MediaControls::SeekTimerCallback()
+{
+	if (lastSeek != seek) {
+		OBSSource source = OBSGetStrongRef(weakSource);
+		if (source) {
+			obs_source_media_set_time(source, GetSliderTime(seek));
+		}
+		lastSeek = seek;
+	}
+}
+
+void MediaControls::StartMediaTimer()
+{
+	if (isSlideshow)
+		return;
+
+	if (!mediaTimer.isActive())
+		mediaTimer.start(1000);
+}
+
+void MediaControls::StopMediaTimer()
+{
+	if (mediaTimer.isActive())
+		mediaTimer.stop();
+}
+
+void MediaControls::SetPlayingState()
+{
+	ui->slider->setEnabled(true);
+	ui->playPauseButton->setProperty("themeID", "pauseIcon");
+	ui->playPauseButton->style()->unpolish(ui->playPauseButton);
+	ui->playPauseButton->style()->polish(ui->playPauseButton);
+	ui->playPauseButton->setToolTip(
+		QTStr("ContextBar.MediaControls.PauseMedia"));
+
+	prevPaused = false;
+
+	StartMediaTimer();
+}
+
+void MediaControls::SetPausedState()
+{
+	ui->playPauseButton->setProperty("themeID", "playIcon");
+	ui->playPauseButton->style()->unpolish(ui->playPauseButton);
+	ui->playPauseButton->style()->polish(ui->playPauseButton);
+	ui->playPauseButton->setToolTip(
+		QTStr("ContextBar.MediaControls.PlayMedia"));
+
+	StopMediaTimer();
+}
+
+void MediaControls::SetRestartState()
+{
+	ui->playPauseButton->setProperty("themeID", "restartIcon");
+	ui->playPauseButton->style()->unpolish(ui->playPauseButton);
+	ui->playPauseButton->style()->polish(ui->playPauseButton);
+	ui->playPauseButton->setToolTip(
+		QTStr("ContextBar.MediaControls.RestartMedia"));
+
+	ui->slider->setValue(0);
+	ui->timerLabel->setText("--:--:--");
+	ui->durationLabel->setText("--:--:--");
+	ui->slider->setEnabled(false);
+
+	StopMediaTimer();
+}
+
+void MediaControls::RefreshControls()
+{
+	OBSSource source;
+	source = OBSGetStrongRef(weakSource);
+
+	uint32_t flags = 0;
+	const char *id = nullptr;
+
+	if (source) {
+		flags = obs_source_get_output_flags(source);
+		id = obs_source_get_unversioned_id(source);
+	}
+
+	if (!source || !(flags & OBS_SOURCE_CONTROLLABLE_MEDIA)) {
+		SetRestartState();
+		setEnabled(false);
+		hide();
+		return;
+	} else {
+		setEnabled(true);
+		show();
+	}
+
+	bool has_playlist = strcmp(id, "ffmpeg_source") != 0;
+	ui->previousButton->setVisible(has_playlist);
+	ui->nextButton->setVisible(has_playlist);
+
+	isSlideshow = strcmp(id, "slideshow") == 0;
+	ui->slider->setVisible(!isSlideshow);
+	ui->timerLabel->setVisible(!isSlideshow);
+	ui->label->setVisible(!isSlideshow);
+	ui->durationLabel->setVisible(!isSlideshow);
+	ui->emptySpaceAgain->setVisible(isSlideshow);
+
+	obs_media_state state = obs_source_media_get_state(source);
+
+	switch (state) {
+	case OBS_MEDIA_STATE_STOPPED:
+	case OBS_MEDIA_STATE_ENDED:
+	case OBS_MEDIA_STATE_NONE:
+		SetRestartState();
+		break;
+	case OBS_MEDIA_STATE_PLAYING:
+		SetPlayingState();
+		break;
+	case OBS_MEDIA_STATE_PAUSED:
+		SetPausedState();
+		break;
+	default:
+		break;
+	}
+
+	SetSliderPosition();
+}
+
+OBSSource MediaControls::GetSource()
+{
+	return OBSGetStrongRef(weakSource);
+}
+
+void MediaControls::SetSource(OBSSource source)
+{
+	sigs.clear();
+
+	if (source) {
+		weakSource = OBSGetWeakRef(source);
+		signal_handler_t *sh = obs_source_get_signal_handler(source);
+		sigs.emplace_back(sh, "media_play", OBSMediaPlay, this);
+		sigs.emplace_back(sh, "media_pause", OBSMediaPause, this);
+		sigs.emplace_back(sh, "media_restart", OBSMediaPlay, this);
+		sigs.emplace_back(sh, "media_stopped", OBSMediaStopped, this);
+		sigs.emplace_back(sh, "media_started", OBSMediaStarted, this);
+		sigs.emplace_back(sh, "media_ended", OBSMediaStopped, this);
+	} else {
+		weakSource = nullptr;
+	}
+
+	RefreshControls();
+}
+
+void MediaControls::SetSliderPosition()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return;
+	}
+
+	float time = (float)obs_source_media_get_time(source);
+	float duration = (float)obs_source_media_get_duration(source);
+
+	float sliderPosition = (time / duration) * (float)ui->slider->maximum();
+
+	ui->slider->setValue((int)sliderPosition);
+
+	ui->timerLabel->setText(FormatSeconds((int)(time / 1000.0f)));
+
+	if (!countDownTimer)
+		ui->durationLabel->setText(
+			FormatSeconds((int)(duration / 1000.0f)));
+	else
+		ui->durationLabel->setText(
+			QString("-") +
+			FormatSeconds((int)((duration - time) / 1000.0f)));
+}
+
+QString MediaControls::FormatSeconds(int totalSeconds)
+{
+	int seconds = totalSeconds % 60;
+	int totalMinutes = totalSeconds / 60;
+	int minutes = totalMinutes % 60;
+	int hours = totalMinutes / 60;
+
+	return QString::asprintf("%02d:%02d:%02d", hours, minutes, seconds);
+}
+
+void MediaControls::on_playPauseButton_clicked()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (!source) {
+		return;
+	}
+
+	obs_media_state state = obs_source_media_get_state(source);
+
+	switch (state) {
+	case OBS_MEDIA_STATE_STOPPED:
+	case OBS_MEDIA_STATE_ENDED:
+		RestartMedia();
+		break;
+	case OBS_MEDIA_STATE_PLAYING:
+		PauseMedia();
+		break;
+	case OBS_MEDIA_STATE_PAUSED:
+		PlayMedia();
+		break;
+	default:
+		break;
+	}
+}
+
+void MediaControls::RestartMedia()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (source) {
+		obs_source_media_restart(source);
+	}
+}
+
+void MediaControls::PlayMedia()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (source) {
+		obs_source_media_play_pause(source, false);
+	}
+}
+
+void MediaControls::PauseMedia()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (source) {
+		obs_source_media_play_pause(source, true);
+	}
+}
+
+void MediaControls::StopMedia()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (source) {
+		obs_source_media_stop(source);
+	}
+}
+
+void MediaControls::PlaylistNext()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (source) {
+		obs_source_media_next(source);
+	}
+}
+
+void MediaControls::PlaylistPrevious()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+	if (source) {
+		obs_source_media_previous(source);
+	}
+}
+
+void MediaControls::on_stopButton_clicked()
+{
+	StopMedia();
+}
+
+void MediaControls::on_nextButton_clicked()
+{
+	PlaylistNext();
+}
+
+void MediaControls::on_previousButton_clicked()
+{
+	PlaylistPrevious();
+}
+
+void MediaControls::on_durationLabel_clicked()
+{
+	countDownTimer = !countDownTimer;
+
+	config_set_bool(App()->GlobalConfig(), "BasicWindow",
+			"MediaControlsCountdownTimer", countDownTimer);
+
+	if (MediaPaused())
+		SetSliderPosition();
+}
+
+void MediaControls::MoveSliderFoward(int seconds)
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+
+	if (!source)
+		return;
+
+	int ms = obs_source_media_get_time(source);
+	ms += seconds * 1000;
+
+	obs_source_media_set_time(source, ms);
+	SetSliderPosition();
+}
+
+void MediaControls::MoveSliderBackwards(int seconds)
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+
+	if (!source)
+		return;
+
+	int ms = obs_source_media_get_time(source);
+	ms -= seconds * 1000;
+
+	obs_source_media_set_time(source, ms);
+	SetSliderPosition();
+}

obs-studio-26.0.0.tar.xz/UI/media-controls.hpp Added

@@ -0,0 +1,75 @@
+#pragma once
+
+#include <QWidget>
+#include <QTimer>
+#include <vector>
+#include <obs.hpp>
+#include "qt-wrappers.hpp"
+
+class Ui_MediaControls;
+
+class MediaControls : public QWidget {
+	Q_OBJECT
+
+private:
+	std::vector<OBSSignal> sigs;
+	OBSWeakSource weakSource = nullptr;
+	QTimer mediaTimer;
+	QTimer seekTimer;
+	int seek;
+	int lastSeek;
+	bool prevPaused = false;
+	bool countDownTimer = false;
+	bool isSlideshow = false;
+
+	QString FormatSeconds(int totalSeconds);
+	void StartMediaTimer();
+	void StopMediaTimer();
+	void RefreshControls();
+	void SetScene(OBSScene scene);
+	int64_t GetSliderTime(int val);
+
+	static void OBSMediaStopped(void *data, calldata_t *calldata);
+	static void OBSMediaPlay(void *data, calldata_t *calldata);
+	static void OBSMediaPause(void *data, calldata_t *calldata);
+	static void OBSMediaStarted(void *data, calldata_t *calldata);
+
+	Ui_MediaControls *ui;
+
+private slots:
+	void on_playPauseButton_clicked();
+	void on_stopButton_clicked();
+	void on_nextButton_clicked();
+	void on_previousButton_clicked();
+	void on_durationLabel_clicked();
+
+	void MediaSliderClicked();
+	void MediaSliderReleased();
+	void MediaSliderHovered(int val);
+	void MediaSliderMoved(int val);
+	void SetSliderPosition();
+	void SetPlayingState();
+	void SetPausedState();
+	void SetRestartState();
+	void RestartMedia();
+	void StopMedia();
+	void PlaylistNext();
+	void PlaylistPrevious();
+
+	void SeekTimerCallback();
+
+	void MoveSliderFoward(int seconds = 5);
+	void MoveSliderBackwards(int seconds = 5);
+
+public slots:
+	void PlayMedia();
+	void PauseMedia();
+
+public:
+	MediaControls(QWidget *parent = nullptr);
+	~MediaControls();
+
+	OBSSource GetSource();
+	void SetSource(OBSSource newSource);
+	bool MediaPaused();
+};

obs-studio-26.0.0.tar.xz/UI/media-slider.cpp Added

obs-studio-26.0.0.tar.xz/UI/media-slider.hpp Added

obs-studio-25.0.8.tar.xz/UI/obs-app.cpp -> obs-studio-26.0.0.tar.xz/UI/obs-app.cpp Changed

@@ -38,6 +38,7 @@
 
 #include "qt-wrappers.hpp"
 #include "obs-app.hpp"
+#include "log-viewer.hpp"
 #include "window-basic-main.hpp"
 #include "window-basic-settings.hpp"
 #include "crash-report.hpp"
@@ -49,6 +50,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#include <filesystem>
 #else
 #include <signal.h>
 #include <pthread.h>
@@ -74,18 +76,19 @@
 bool opt_start_recording = false;
 bool opt_studio_mode = false;
 bool opt_start_replaybuffer = false;
+bool opt_start_virtualcam = false;
 bool opt_minimize_tray = false;
 bool opt_allow_opengl = false;
 bool opt_always_on_top = false;
+bool opt_disable_updater = false;
 string opt_starting_collection;
 string opt_starting_profile;
 string opt_starting_scene;
 
-bool remuxAfterRecord = false;
-string remuxFilename;
-
 bool restart = false;
 
+QPointer<OBSLogViewer> obsLogViewer;
+
 // GPU hint exports for AMD/NVIDIA laptops
 #ifdef _MSC_VER
 extern "C" __declspec(dllexport) DWORD NvOptimusEnablement = 1;
@@ -188,6 +191,9 @@
 					event->nativeVirtualKey());
 			}
 
+			if (event->isAutoRepeat())
+				return true;
+
 			hotkey.modifiers = TranslateQtKeyboardEventModifiers(
 				event->modifiers());
 
@@ -247,12 +253,22 @@
 }
 
 static inline void LogString(fstream &logFile, const char *timeString,
-			     char *str)
+			     char *str, int log_level)
 {
-	logFile << timeString << str << endl;
+	string msg;
+	msg += timeString;
+	msg += str;
+
+	logFile << msg << endl;
+
+	if (!!obsLogViewer)
+		QMetaObject::invokeMethod(obsLogViewer.data(), "AddLine",
+					  Qt::QueuedConnection,
+					  Q_ARG(int, log_level),
+					  Q_ARG(QString, QString(msg.c_str())));
 }
 
-static inline void LogStringChunk(fstream &logFile, char *str)
+static inline void LogStringChunk(fstream &logFile, char *str, int log_level)
 {
 	char *nextLine = str;
 	string timeString = CurrentTimeString();
@@ -269,12 +285,12 @@
 			nextLine[0] = 0;
 		}
 
-		LogString(logFile, timeString.c_str(), str);
+		LogString(logFile, timeString.c_str(), str, log_level);
 		nextLine++;
 		str = nextLine;
 	}
 
-	LogString(logFile, timeString.c_str(), str);
+	LogString(logFile, timeString.c_str(), str, log_level);
 }
 
 #define MAX_REPEATED_LINES 30
@@ -365,7 +381,7 @@
 	if (log_level <= LOG_INFO || log_verbose) {
 		if (too_many_repeated_entries(logFile, msg, str))
 			return;
-		LogStringChunk(logFile, str);
+		LogStringChunk(logFile, str, log_level);
 	}
 
 #if defined(_WIN32) && defined(OBS_DEBUGBREAK_ON_ERROR)
@@ -467,6 +483,10 @@
 	config_set_default_bool(globalConfig, "Video", "ResetOSXVSyncOnExit",
 				true);
 #endif
+
+	config_set_default_bool(globalConfig, "BasicWindow",
+				"MediaControlsCountdownTimer", true);
+
 	return true;
 }
 
@@ -1128,6 +1148,9 @@
 
 	os_inhibit_sleep_set_active(sleepInhibitor, false);
 	os_inhibit_sleep_destroy(sleepInhibitor);
+
+	if (libobs_initialized)
+		obs_shutdown();
 }
 
 static void move_basic_to_profiles(void)
@@ -1349,6 +1372,8 @@
 	if (!StartupOBS(locale.c_str(), GetProfilerNameStore()))
 		return false;
 
+	libobs_initialized = true;
+
 	obs_set_ui_task_handler(ui_task_handler);
 
 #ifdef _WIN32
@@ -1422,6 +1447,11 @@
 	return portable_mode;
 }
 
+bool OBSApp::IsUpdaterDisabled()
+{
+	return opt_disable_updater;
+}
+
 #ifdef __APPLE__
 #define INPUT_AUDIO_SOURCE "coreaudio_input_capture"
 #define OUTPUT_AUDIO_SOURCE "coreaudio_output_capture"
@@ -1629,19 +1659,122 @@
 string GenerateSpecifiedFilename(const char *extension, bool noSpace,
 				 const char *format)
 {
+	BPtr<char> filename =
+		os_generate_formatted_filename(extension, !noSpace, format);
+	return string(filename);
+}
+
+static void FindBestFilename(string &strPath, bool noSpace)
+{
+	int num = 2;
+
+	if (!os_file_exists(strPath.c_str()))
+		return;
+
+	const char *ext = strrchr(strPath.c_str(), '.');
+	if (!ext)
+		return;
+
+	int extStart = int(ext - strPath.c_str());
+	for (;;) {
+		string testPath = strPath;
+		string numStr;
+
+		numStr = noSpace ? "_" : " (";
+		numStr += to_string(num++);
+		if (!noSpace)
+			numStr += ")";
+
+		testPath.insert(extStart, numStr);
+
+		if (!os_file_exists(testPath.c_str())) {
+			strPath = testPath;
+			break;
+		}
+	}
+}
+
+static void ensure_directory_exists(string &path)
+{
+	replace(path.begin(), path.end(), '\\', '/');
+
+	size_t last = path.rfind('/');
+	if (last == string::npos)
+		return;
+
+	string directory = path.substr(0, last);
+	os_mkdirs(directory.c_str());
+}
+
+static void remove_reserved_file_characters(string &s)
+{
+	replace(s.begin(), s.end(), '\\', '/');
+	replace(s.begin(), s.end(), '*', '_');
+	replace(s.begin(), s.end(), '?', '_');
+	replace(s.begin(), s.end(), '"', '_');
+	replace(s.begin(), s.end(), '|', '_');
+	replace(s.begin(), s.end(), ':', '_');
+	replace(s.begin(), s.end(), '>', '_');
+	replace(s.begin(), s.end(), '<', '_');
+}
+
+string GetFormatString(const char *format, const char *prefix,
+		       const char *suffix)
+{
+	string f;
+
+	if (prefix && *prefix) {
+		f += prefix;
+		if (f.back() != ' ')
+			f += " ";
+	}
+
+	f += format;
+
+	if (suffix && *suffix) {
+		if (*suffix != ' ')
+			f += " ";
+		f += suffix;
+	}
+
+	remove_reserved_file_characters(f);
+
+	return f;
+}
+
+string GetOutputFilename(const char *path, const char *ext, bool noSpace,
+			 bool overwrite, const char *format)
+{
 	OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
-	bool autoRemux = config_get_bool(main->Config(), "Video", "AutoRemux");
 
-	if ((strcmp(extension, "mp4") == 0) && autoRemux)
-		extension = "mkv";
+	os_dir_t *dir = path && path[0] ? os_opendir(path) : nullptr;
 
-	BPtr<char> filename =
-		os_generate_formatted_filename(extension, !noSpace, format);
+	if (!dir) {
+		if (main->isVisible())
+			OBSMessageBox::warning(main,
+					       QTStr("Output.BadPath.Title"),
+					       QTStr("Output.BadPath.Text"));
+		else
+			main->SysTrayNotify(QTStr("Output.BadPath.Text"),
+					    QSystemTrayIcon::Warning);
+		return "";
+	}
 
-	remuxFilename = string(filename);
-	remuxAfterRecord = autoRemux;
+	os_closedir(dir);
 
-	return string(filename);
+	string strPath;
+	strPath += path;
+
+	char lastChar = strPath.back();
+	if (lastChar != '/' && lastChar != '\\')
+		strPath += "/";
+
+	strPath += GenerateSpecifiedFilename(ext, noSpace, format);
+	ensure_directory_exists(strPath);
+	if (!overwrite)
+		FindBestFilename(strPath, noSpace);
+
+	return strPath;
 }
 
 vector<pair<string, string>> GetLocaleNames()
@@ -1848,6 +1981,22 @@
 	run:
 #endif
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+		// Mounted by termina during chromeOS linux container startup
+		// https://chromium.googlesource.com/chromiumos/overlays/board-overlays/+/master/project-termina/chromeos-base/termina-lxd-scripts/files/lxd_setup.sh
+		os_dir_t *crosDir = os_opendir("/opt/google/cros-containers");
+		if (crosDir) {
+			QMessageBox::StandardButtons buttons(QMessageBox::Ok);
+			QMessageBox mb(QMessageBox::Critical,
+				       QTStr("ChromeOS.Title"),
+				       QTStr("ChromeOS.Text"), buttons,
+				       nullptr);
+
+			mb.exec();
+			return 0;
+		}
+#endif
+
 		if (!created_log) {
 			create_log_file(logFile);
 			created_log = true;
@@ -1888,8 +2037,7 @@
 
 #define CRASH_MESSAGE                                                      \
 	"Woops, OBS has crashed!\n\nWould you like to copy the crash log " \
-	"to the clipboard?  (Crash logs will still be saved to the "       \
-	"%appdata%\\obs-studio\\crashes directory)"
+	"to the clipboard? The crash log will still be saved to:\n\n%s"
 
 static void main_crash_handler(const char *format, va_list args, void *param)
 {
@@ -1898,10 +2046,12 @@
 	vsnprintf(text, MAX_CRASH_REPORT_SIZE, format, args);
 	text[MAX_CRASH_REPORT_SIZE - 1] = 0;
 
-	delete_oldest_file(true, "obs-studio/crashes");
+	string crashFilePath = "obs-studio/crashes";
+
+	delete_oldest_file(true, crashFilePath.c_str());
 
-	string name = "obs-studio/crashes/Crash ";
-	name += GenerateTimeDateFilename("txt");
+	string name = crashFilePath + "/";
+	name += "Crash " + GenerateTimeDateFilename("txt");
 
 	BPtr<char> path(GetConfigPathPtr(name.c_str()));
 
@@ -1919,7 +2069,26 @@
 	file << text;
 	file.close();
 
-	int ret = MessageBoxA(NULL, CRASH_MESSAGE, "OBS has crashed!",
+	string pathString(path.Get());
+
+#ifdef _WIN32
+	std::replace(pathString.begin(), pathString.end(), '/', '\\');
+#endif
+
+	string absolutePath =
+		canonical(filesystem::path(pathString)).u8string();
+
+	size_t size = snprintf(nullptr, 0, CRASH_MESSAGE, absolutePath.c_str());
+
+	unique_ptr<char[]> message_buffer(new char[size + 1]);
+
+	snprintf(message_buffer.get(), size + 1, CRASH_MESSAGE,
+		 absolutePath.c_str());
+
+	string finalMessage =
+		string(message_buffer.get(), message_buffer.get() + size);
+
+	int ret = MessageBoxA(NULL, finalMessage.c_str(), "OBS has crashed!",
 			      MB_YESNO | MB_ICONERROR | MB_TASKMODAL);
 
 	if (ret == IDYES) {
@@ -2404,6 +2573,9 @@
 		} else if (arg_is(argv[i], "--startreplaybuffer", nullptr)) {
 			opt_start_replaybuffer = true;
 
+		} else if (arg_is(argv[i], "--startvirtualcam", nullptr)) {
+			opt_start_virtualcam = true;
+
 		} else if (arg_is(argv[i], "--collection", nullptr)) {
 			if (++i < argc)
 				opt_starting_collection = argv[i];
@@ -2425,26 +2597,36 @@
 		} else if (arg_is(argv[i], "--allow-opengl", nullptr)) {
 			opt_allow_opengl = true;
 
+		} else if (arg_is(argv[i], "--disable-updater", nullptr)) {
+			opt_disable_updater = true;
+
 		} else if (arg_is(argv[i], "--help", "-h")) {
-			std::cout
-				<< "--help, -h: Get list of available commands.\n\n"
-				<< "--startstreaming: Automatically start streaming.\n"
-				<< "--startrecording: Automatically start recording.\n"
-				<< "--startreplaybuffer: Start replay buffer.\n\n"
-				<< "--collection <string>: Use specific scene collection."
-				<< "\n"
-				<< "--profile <string>: Use specific profile.\n"
-				<< "--scene <string>: Start with specific scene.\n\n"
-				<< "--studio-mode: Enable studio mode.\n"
-				<< "--minimize-to-tray: Minimize to system tray.\n"
-				<< "--portable, -p: Use portable mode.\n"
-				<< "--multi, -m: Don't warn when launching multiple instances.\n\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"
-				<< "--allow-opengl: Allow OpenGL on Windows.\n\n"
-				<< "--version, -V: Get current version.\n";
+			std::string help =
+				"--help, -h: Get list of available commands.\n\n"
+				"--startstreaming: Automatically start streaming.\n"
+				"--startrecording: Automatically start recording.\n"
+				"--startreplaybuffer: Start replay buffer.\n"
+				"--startvirtualcam: Start virtual camera (if available).\n\n"
+				"--collection <string>: Use specific scene collection."
+				"\n"
+				"--profile <string>: Use specific profile.\n"
+				"--scene <string>: Start with specific scene.\n\n"
+				"--studio-mode: Enable studio mode.\n"
+				"--minimize-to-tray: Minimize to system tray.\n"
+				"--portable, -p: Use portable mode.\n"
+				"--multi, -m: Don't warn when launching multiple instances.\n\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";
 
+#ifdef _WIN32
+			MessageBoxA(NULL, help.c_str(), "Help",
+				    MB_OK | MB_ICONASTERISK);
+#else
+			std::cout << help
+				  << "--version, -V: Get current version.\n";
+#endif
 			exit(0);
 
 		} else if (arg_is(argv[i], "--version", "-V")) {
@@ -2462,6 +2644,12 @@
 			os_file_exists(BASE_PATH "/portable_mode.txt") ||
 			os_file_exists(BASE_PATH "/obs_portable_mode.txt");
 	}
+
+	if (!opt_disable_updater) {
+		opt_disable_updater =
+			os_file_exists(BASE_PATH "/disable_updater") ||
+			os_file_exists(BASE_PATH "/disable_updater.txt");
+	}
 #endif
 
 	upgrade_settings();

obs-studio-25.0.8.tar.xz/UI/obs-app.hpp -> obs-studio-26.0.0.tar.xz/UI/obs-app.hpp Changed

@@ -40,6 +40,10 @@
 				     bool noSpace = false);
 std::string GenerateSpecifiedFilename(const char *extension, bool noSpace,
 				      const char *format);
+std::string GetFormatString(const char *format, const char *prefix,
+			    const char *suffix);
+std::string GetOutputFilename(const char *path, const char *ext, bool noSpace,
+			      bool overwrite, const char *format);
 QObject *CreateShortcutFilter();
 
 struct BaseLexer {
@@ -72,10 +76,11 @@
 	std::string theme;
 	ConfigFile globalConfig;
 	TextLookup textLookup;
-	OBSContext obsContext;
 	QPointer<OBSMainWindow> mainWindow;
 	profiler_name_store_t *profilerNameStore = nullptr;
 
+	bool libobs_initialized = false;
+
 	os_inhibit_t *sleepInhibitor = nullptr;
 	int sleepInhibitRefs = 0;
 
@@ -144,6 +149,7 @@
 
 	std::string GetVersionString() const;
 	bool IsPortableMode();
+	bool IsUpdaterDisabled();
 
 	const char *InputAudioSource() const;
 	const char *OutputAudioSource() const;
@@ -219,12 +225,10 @@
 
 extern bool portable_mode;
 
-extern bool remuxAfterRecord;
-extern std::string remuxFilename;
-
 extern bool opt_start_streaming;
 extern bool opt_start_recording;
 extern bool opt_start_replaybuffer;
+extern bool opt_start_virtualcam;
 extern bool opt_minimize_tray;
 extern bool opt_studio_mode;
 extern bool opt_allow_opengl;

obs-studio-25.0.8.tar.xz/UI/obs-frontend-api/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/UI/obs-frontend-api/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp -> obs-studio-26.0.0.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp Changed

obs-studio-25.0.8.tar.xz/UI/obs-frontend-api/obs-frontend-api.h -> obs-studio-26.0.0.tar.xz/UI/obs-frontend-api/obs-frontend-api.h Changed

obs-studio-25.0.8.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp -> obs-studio-26.0.0.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp Changed

obs-studio-26.0.0.tar.xz/UI/obs-proxy-style.cpp Added

@@ -0,0 +1,77 @@
+#include "obs-proxy-style.hpp"
+#include <QStyleOptionButton>
+
+static inline uint qt_intensity(uint r, uint g, uint b)
+{
+	/* 30% red, 59% green, 11% blue */
+	return (77 * r + 150 * g + 28 * b) / 255;
+}
+
+/* The constants in the default QT styles don't dim the icons enough in
+ * disabled mode
+ *
+ * https://code.woboq.org/qt5/qtbase/src/widgets/styles/qcommonstyle.cpp.html#6429
+ */
+QPixmap OBSProxyStyle::generatedIconPixmap(QIcon::Mode iconMode,
+					   const QPixmap &pixmap,
+					   const QStyleOption *option) const
+{
+	if (iconMode == QIcon::Disabled) {
+		QImage im =
+			pixmap.toImage().convertToFormat(QImage::Format_ARGB32);
+
+		/* Create a colortable based on the background
+		 * (black -> bg -> white) */
+
+		QColor bg = option->palette.color(QPalette::Disabled,
+						  QPalette::Window);
+		int red = bg.red();
+		int green = bg.green();
+		int blue = bg.blue();
+		uchar reds[256], greens[256], blues[256];
+
+		for (int i = 0; i < 128; ++i) {
+			reds[i] = uchar((red * (i << 1)) >> 8);
+			greens[i] = uchar((green * (i << 1)) >> 8);
+			blues[i] = uchar((blue * (i << 1)) >> 8);
+		}
+		for (int i = 0; i < 128; ++i) {
+			reds[i + 128] = uchar(qMin(red + (i << 1), 255));
+			greens[i + 128] = uchar(qMin(green + (i << 1), 255));
+			blues[i + 128] = uchar(qMin(blue + (i << 1), 255));
+		}
+
+		/* High intensity colors needs dark shifting in the color
+		 * table, while low intensity colors needs light shifting. This
+		 * is to increase the perceived contrast. */
+
+		int intensity = qt_intensity(red, green, blue);
+		const int factor = 191;
+
+		if ((red - factor > green && red - factor > blue) ||
+		    (green - factor > red && green - factor > blue) ||
+		    (blue - factor > red && blue - factor > green))
+			qMin(255, intensity + 20);
+		else if (intensity <= 128)
+			intensity += 100;
+
+		for (int y = 0; y < im.height(); ++y) {
+			QRgb *scanLine = (QRgb *)im.scanLine(y);
+			for (int x = 0; x < im.width(); ++x) {
+				QRgb pixel = *scanLine;
+				/* Calculate color table index, taking
+				 * intensity adjustment and a magic offset into
+				 * account. */
+				uint ci = uint(qGray(pixel) / 3 +
+					       (130 - intensity / 3));
+				*scanLine = qRgba(reds[ci], greens[ci],
+						  blues[ci], qAlpha(pixel));
+				++scanLine;
+			}
+		}
+
+		return QPixmap::fromImage(im);
+	}
+
+	return QProxyStyle::generatedIconPixmap(iconMode, pixmap, option);
+}

obs-studio-26.0.0.tar.xz/UI/obs-proxy-style.hpp Added

obs-studio-25.0.8.tar.xz/UI/platform-osx.mm -> obs-studio-26.0.0.tar.xz/UI/platform-osx.mm Changed

obs-studio-25.0.8.tar.xz/UI/platform-x11.cpp -> obs-studio-26.0.0.tar.xz/UI/platform-x11.cpp Changed

obs-studio-25.0.8.tar.xz/UI/properties-view.cpp -> obs-studio-26.0.0.tar.xz/UI/properties-view.cpp Changed

@@ -114,8 +114,6 @@
 	widget->setLayout(layout);
 
 	QSizePolicy mainPolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-	QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-	//widget->setSizePolicy(policy);
 
 	layout->setLabelAlignment(Qt::AlignRight);
 
@@ -596,6 +594,13 @@
 
 	WidgetInfo *info = new WidgetInfo(this, prop, list);
 
+	list->setDragDropMode(QAbstractItemView::InternalMove);
+	connect(list->model(),
+		SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)),
+		info,
+		SLOT(EditListReordered(const QModelIndex &, int, int,
+				       const QModelIndex &, int)));
+
 	QVBoxLayout *sideLayout = new QVBoxLayout();
 	NewButton(sideLayout, info, "addIconSmall", &WidgetInfo::EditListAdd);
 	NewButton(sideLayout, info, "removeIconSmall",
@@ -652,14 +657,15 @@
 
 	QPalette palette = QPalette(color);
 	colorLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
-	colorLabel->setText(color.name(QColor::HexArgb));
+	// The picker doesn't have an alpha option, show only RGB
+	colorLabel->setText(color.name(QColor::HexRgb));
 	colorLabel->setPalette(palette);
 	colorLabel->setStyleSheet(
 		QString("background-color :%1; color: %2;")
 			.arg(palette.color(QPalette::Window)
-				     .name(QColor::HexArgb))
+				     .name(QColor::HexRgb))
 			.arg(palette.color(QPalette::WindowText)
-				     .name(QColor::HexArgb)));
+				     .name(QColor::HexRgb)));
 	colorLabel->setAutoFillBackground(true);
 	colorLabel->setAlignment(Qt::AlignCenter);
 	colorLabel->setToolTip(QT_UTF8(obs_property_long_description(prop)));
@@ -678,7 +684,7 @@
 	layout->addRow(label, subLayout);
 }
 
-static void MakeQFont(obs_data_t *font_obj, QFont &font, bool limit = false)
+void MakeQFont(obs_data_t *font_obj, QFont &font, bool limit = false)
 {
 	const char *face = obs_data_get_string(font_obj, "face");
 	const char *style = obs_data_get_string(font_obj, "style");
@@ -1437,28 +1443,42 @@
 		return;
 
 	if (obs_property_long_description(property)) {
-		QString lStr = "<html>%1 <img src='%2' style=' \
-				vertical-align: bottom;  \
-				' /></html>";
 		bool lightTheme = palette().text().color().redF() < 0.5;
 		QString file = lightTheme ? ":/res/images/help.svg"
 					  : ":/res/images/help_light.svg";
 		if (label) {
+			QString lStr = "<html>%1 <img src='%2' style=' \
+				vertical-align: bottom;  \
+				' /></html>";
+
 			label->setText(lStr.arg(label->text(), file));
 			label->setToolTip(
 				obs_property_long_description(property));
 		} else if (type == OBS_PROPERTY_BOOL) {
+
+			QString bStr = "<html> <img src='%1' style=' \
+				vertical-align: bottom;  \
+				' /></html>";
+
+			const char *desc = obs_property_description(property);
+
 			QWidget *newWidget = new QWidget();
+
 			QHBoxLayout *boxLayout = new QHBoxLayout(newWidget);
 			boxLayout->setContentsMargins(0, 0, 0, 0);
 			boxLayout->setAlignment(Qt::AlignLeft);
+			boxLayout->setSpacing(0);
 
 			QCheckBox *check = qobject_cast<QCheckBox *>(widget);
-			QLabel *help =
-				new QLabel(lStr.arg(check->text(), file));
+			check->setText(desc);
+			check->setToolTip(
+				obs_property_long_description(property));
+
+			QLabel *help = new QLabel(check);
+			help->setText(bStr.arg(file));
 			help->setToolTip(
 				obs_property_long_description(property));
-			check->setText("");
+
 			boxLayout->addWidget(check);
 			boxLayout->addWidget(help);
 			widget = newWidget;
@@ -1625,18 +1645,14 @@
 	QString path;
 
 	if (type == OBS_PATH_DIRECTORY)
-		path = QFileDialog::getExistingDirectory(
-			view, QT_UTF8(desc), QT_UTF8(default_path),
-			QFileDialog::ShowDirsOnly |
-				QFileDialog::DontResolveSymlinks);
+		path = SelectDirectory(view, QT_UTF8(desc),
+				       QT_UTF8(default_path));
 	else if (type == OBS_PATH_FILE)
-		path = QFileDialog::getOpenFileName(view, QT_UTF8(desc),
-						    QT_UTF8(default_path),
-						    QT_UTF8(filter));
+		path = OpenFile(view, QT_UTF8(desc), QT_UTF8(default_path),
+				QT_UTF8(filter));
 	else if (type == OBS_PATH_FILE_SAVE)
-		path = QFileDialog::getSaveFileName(view, QT_UTF8(desc),
-						    QT_UTF8(default_path),
-						    QT_UTF8(filter));
+		path = SaveFile(view, QT_UTF8(desc), QT_UTF8(default_path),
+				QT_UTF8(filter));
 
 	if (path.isEmpty())
 		return false;
@@ -1688,7 +1704,7 @@
 	long long val = obs_data_get_int(view->settings, setting);
 	QColor color = color_from_int(val);
 
-	QColorDialog::ColorDialogOptions options = 0;
+	QColorDialog::ColorDialogOptions options;
 
 	/* The native dialog on OSX has all kinds of problems, like closing
 	 * other open QDialogs on exit, and
@@ -1705,14 +1721,14 @@
 		return false;
 
 	QLabel *label = static_cast<QLabel *>(widget);
-	label->setText(color.name(QColor::HexArgb));
+	label->setText(color.name(QColor::HexRgb));
 	QPalette palette = QPalette(color);
 	label->setPalette(palette);
 	label->setStyleSheet(QString("background-color :%1; color: %2;")
 				     .arg(palette.color(QPalette::Window)
-						  .name(QColor::HexArgb))
+						  .name(QColor::HexRgb))
 				     .arg(palette.color(QPalette::WindowText)
-						  .name(QColor::HexArgb)));
+						  .name(QColor::HexRgb)));
 
 	obs_data_set_int(view->settings, setting, color_to_int(color));
 
@@ -1776,6 +1792,19 @@
 						  : true);
 }
 
+void WidgetInfo::EditListReordered(const QModelIndex &parent, int start,
+				   int end, const QModelIndex &destination,
+				   int row)
+{
+	UNUSED_PARAMETER(parent);
+	UNUSED_PARAMETER(start);
+	UNUSED_PARAMETER(end);
+	UNUSED_PARAMETER(destination);
+	UNUSED_PARAMETER(row);
+
+	EditableListChanged();
+}
+
 void WidgetInfo::EditableListChanged()
 {
 	const char *setting = obs_property_name(property);
@@ -1886,9 +1915,8 @@
 		if (curPath.isEmpty())
 			curPath = default_path;
 
-		QString path = QFileDialog::getOpenFileName(
-			App()->GetMainWindow(), QTStr("Browse"), curPath,
-			filter);
+		QString path = OpenFile(App()->GetMainWindow(), QTStr("Browse"),
+					curPath, filter);
 		if (path.isEmpty())
 			return;
 
@@ -2007,9 +2035,8 @@
 	QString title = QTStr("Basic.PropertiesWindow.AddEditableListFiles")
 				.arg(QT_UTF8(desc));
 
-	QStringList files = QFileDialog::getOpenFileNames(
-		App()->GetMainWindow(), title, QT_UTF8(default_path),
-		QT_UTF8(filter));
+	QStringList files = OpenFiles(App()->GetMainWindow(), title,
+				      QT_UTF8(default_path), QT_UTF8(filter));
 
 	if (files.count() == 0)
 		return;
@@ -2028,8 +2055,8 @@
 	QString title = QTStr("Basic.PropertiesWindow.AddEditableListDir")
 				.arg(QT_UTF8(desc));
 
-	QString dir = QFileDialog::getExistingDirectory(
-		App()->GetMainWindow(), title, QT_UTF8(default_path));
+	QString dir = SelectDirectory(App()->GetMainWindow(), title,
+				      QT_UTF8(default_path));
 
 	if (dir.isEmpty())
 		return;
@@ -2067,15 +2094,11 @@
 		QString path;
 
 		if (pathDir.exists())
-			path = QFileDialog::getExistingDirectory(
-				App()->GetMainWindow(), QTStr("Browse"),
-				item->text(),
-				QFileDialog::ShowDirsOnly |
-					QFileDialog::DontResolveSymlinks);
+			path = SelectDirectory(App()->GetMainWindow(),
+					       QTStr("Browse"), item->text());
 		else
-			path = QFileDialog::getOpenFileName(
-				App()->GetMainWindow(), QTStr("Browse"),
-				item->text(), QT_UTF8(filter));
+			path = OpenFile(App()->GetMainWindow(), QTStr("Browse"),
+					item->text(), QT_UTF8(filter));
 
 		if (path.isEmpty())
 			return;

obs-studio-25.0.8.tar.xz/UI/properties-view.hpp -> obs-studio-26.0.0.tar.xz/UI/properties-view.hpp Changed

obs-studio-25.0.8.tar.xz/UI/qt-display.hpp -> obs-studio-26.0.0.tar.xz/UI/qt-display.hpp Changed

obs-studio-25.0.8.tar.xz/UI/qt-wrappers.cpp -> obs-studio-26.0.0.tar.xz/UI/qt-wrappers.cpp Changed

@@ -25,6 +25,7 @@
 #include <QMessageBox>
 #include <QDataStream>
 #include <QKeyEvent>
+#include <QFileDialog>
 
 #if !defined(_WIN32) && !defined(__APPLE__)
 #include <QX11Info>
@@ -168,6 +169,7 @@
 
 	obs_source_t *source = obs_get_source_by_name(QT_TO_UTF8(sceneName));
 	scene = obs_scene_from_source(source);
+	obs_source_release(source);
 
 	return in;
 }
@@ -264,7 +266,7 @@
 	dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowCloseButtonHint);
 	dlg.setWindowTitle(title);
 	dlg.setText(text);
-	dlg.setStandardButtons(0);
+	dlg.setStandardButtons(QMessageBox::StandardButtons());
 
 	auto wait = [&]() {
 		func();
@@ -335,3 +337,64 @@
 		widget->setStyleSheet(qss);
 	}
 }
+
+QString SelectDirectory(QWidget *parent, QString title, QString path)
+{
+#if defined(BROWSER_AVAILABLE) && defined(__linux__)
+	QString dir = QFileDialog::getExistingDirectory(
+		parent, title, path,
+		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks |
+			QFileDialog::DontUseNativeDialog);
+#else
+	QString dir = QFileDialog::getExistingDirectory(
+		parent, title, path,
+		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+#endif
+
+	return dir;
+}
+
+QString SaveFile(QWidget *parent, QString title, QString path,
+		 QString extensions)
+{
+#if defined(BROWSER_AVAILABLE) && defined(__linux__)
+	QString file = QFileDialog::getSaveFileName(
+		parent, title, path, extensions, nullptr,
+		QFileDialog::DontUseNativeDialog);
+#else
+	QString file =
+		QFileDialog::getSaveFileName(parent, title, path, extensions);
+#endif
+
+	return file;
+}
+
+QString OpenFile(QWidget *parent, QString title, QString path,
+		 QString extensions)
+{
+#if defined(BROWSER_AVAILABLE) && defined(__linux__)
+	QString file = QFileDialog::getOpenFileName(
+		parent, title, path, extensions, nullptr,
+		QFileDialog::DontUseNativeDialog);
+#else
+	QString file =
+		QFileDialog::getOpenFileName(parent, title, path, extensions);
+#endif
+
+	return file;
+}
+
+QStringList OpenFiles(QWidget *parent, QString title, QString path,
+		      QString extensions)
+{
+#if defined(BROWSER_AVAILABLE) && defined(__linux__)
+	QStringList files = QFileDialog::getOpenFileNames(
+		parent, title, path, extensions, nullptr,
+		QFileDialog::DontUseNativeDialog);
+#else
+	QStringList files =
+		QFileDialog::getOpenFileNames(parent, title, path, extensions);
+#endif
+
+	return files;
+}

obs-studio-25.0.8.tar.xz/UI/qt-wrappers.hpp -> obs-studio-26.0.0.tar.xz/UI/qt-wrappers.hpp Changed

obs-studio-25.0.8.tar.xz/UI/scene-tree.cpp -> obs-studio-26.0.0.tar.xz/UI/scene-tree.cpp Changed

@@ -6,6 +6,7 @@
 #include <QScrollBar>
 #include <QDropEvent>
 #include <QPushButton>
+#include <QTimer>
 
 SceneTree::SceneTree(QWidget *parent_) : QListWidget(parent_)
 {
@@ -67,8 +68,6 @@
 
 void SceneTree::resizeEvent(QResizeEvent *event)
 {
-	QListWidget::resizeEvent(event);
-
 	if (gridMode) {
 		int scrollWid = verticalScrollBar()->sizeHint().width();
 		int h = visualItemRect(item(count() - 1)).bottom();
@@ -96,6 +95,8 @@
 			item(i)->setData(Qt::SizeHintRole, QVariant());
 		}
 	}
+
+	QListWidget::resizeEvent(event);
 }
 
 void SceneTree::startDrag(Qt::DropActions supportedActions)
@@ -105,8 +106,12 @@
 
 void SceneTree::dropEvent(QDropEvent *event)
 {
-	QListWidget::dropEvent(event);
-	if (event->source() == this && gridMode) {
+	if (event->source() != this) {
+		QListWidget::dropEvent(event);
+		return;
+	}
+
+	if (gridMode) {
 		int scrollWid = verticalScrollBar()->sizeHint().width();
 		int h = visualItemRect(item(count() - 1)).bottom();
 
@@ -131,6 +136,10 @@
 		setCurrentItem(item);
 		resize(size());
 	}
+
+	QListWidget::dropEvent(event);
+
+	QTimer::singleShot(100, [this]() { emit scenesReordered(); });
 }
 
 void SceneTree::dragMoveEvent(QDragMoveEvent *event)
@@ -175,15 +184,15 @@
 			QPoint position(xPos * g.width(), yPos * g.height());
 			setPositionForIndex(position, index);
 		}
-	} else {
-		QListWidget::dragMoveEvent(event);
 	}
+
+	QListWidget::dragMoveEvent(event);
 }
 
 void SceneTree::rowsInserted(const QModelIndex &parent, int start, int end)
 {
-	QListWidget::rowsInserted(parent, start, end);
-
 	QResizeEvent event(size(), size());
 	SceneTree::resizeEvent(&event);
+
+	QListWidget::rowsInserted(parent, start, end);
 }

obs-studio-25.0.8.tar.xz/UI/scene-tree.hpp -> obs-studio-26.0.0.tar.xz/UI/scene-tree.hpp Changed

obs-studio-26.0.0.tar.xz/UI/screenshot-obj.hpp Added

@@ -0,0 +1,47 @@
+/******************************************************************************
+    Copyright (C) 2020 by Hugh Bailey <obs.jim@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 <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#include <QObject>
+#include <string>
+#include <thread>
+#include <obs.hpp>
+
+class ScreenshotObj : public QObject {
+	Q_OBJECT
+
+public:
+	ScreenshotObj(obs_source_t *source);
+	~ScreenshotObj() override;
+	void Screenshot();
+	void Download();
+	void Copy();
+	void MuxAndFinish();
+
+	gs_texrender_t *texrender = nullptr;
+	gs_stagesurf_t *stagesurf = nullptr;
+	OBSWeakSource weakSource;
+	std::string path;
+	QImage image;
+	uint32_t cx;
+	uint32_t cy;
+	std::thread th;
+
+	int stage = 0;
+
+public slots:
+	void Save();
+};

obs-studio-25.0.8.tar.xz/UI/source-label.hpp -> obs-studio-26.0.0.tar.xz/UI/source-label.hpp Changed

obs-studio-25.0.8.tar.xz/UI/source-tree.cpp -> obs-studio-26.0.0.tar.xz/UI/source-tree.cpp Changed

@@ -151,6 +151,7 @@
 {
 	sceneRemoveSignal.Disconnect();
 	itemRemoveSignal.Disconnect();
+	selectSignal.Disconnect();
 	deselectSignal.Disconnect();
 	visibleSignal.Disconnect();
 	lockedSignal.Disconnect();
@@ -212,6 +213,16 @@
 						  Q_ARG(bool, locked));
 	};
 
+	auto itemSelect = [](void *data, calldata_t *cd) {
+		SourceTreeItem *this_ =
+			reinterpret_cast<SourceTreeItem *>(data);
+		obs_sceneitem_t *curItem =
+			(obs_sceneitem_t *)calldata_ptr(cd, "item");
+
+		if (curItem == this_->sceneitem)
+			QMetaObject::invokeMethod(this_, "Select");
+	};
+
 	auto itemDeselect = [](void *data, calldata_t *cd) {
 		SourceTreeItem *this_ =
 			reinterpret_cast<SourceTreeItem *>(data);
@@ -236,6 +247,8 @@
 	itemRemoveSignal.Connect(signal, "item_remove", removeItem, this);
 	visibleSignal.Connect(signal, "item_visible", itemVisible, this);
 	lockedSignal.Connect(signal, "item_locked", itemLocked, this);
+	selectSignal.Connect(signal, "item_select", itemSelect, this);
+	deselectSignal.Connect(signal, "item_deselect", itemDeselect, this);
 
 	if (obs_sceneitem_is_group(sceneitem)) {
 		obs_source_t *source = obs_sceneitem_get_source(sceneitem);
@@ -245,10 +258,6 @@
 					   this);
 	}
 
-	if (scene != GetCurrentScene())
-		deselectSignal.Connect(signal, "item_deselect", itemDeselect,
-				       this);
-
 	/* --------------------------------------------------------- */
 
 	auto renamed = [](void *data, calldata_t *cd) {
@@ -516,9 +525,16 @@
 		tree->GetStm()->CollapseGroup(sceneitem);
 }
 
+void SourceTreeItem::Select()
+{
+	tree->SelectItem(sceneitem, true);
+	OBSBasic::Get()->UpdateContextBar();
+}
+
 void SourceTreeItem::Deselect()
 {
 	tree->SelectItem(sceneitem, false);
+	OBSBasic::Get()->UpdateContextBar();
 }
 
 /* ========================================================================= */

obs-studio-25.0.8.tar.xz/UI/source-tree.hpp -> obs-studio-26.0.0.tar.xz/UI/source-tree.hpp Changed

obs-studio-25.0.8.tar.xz/UI/ui-config.h.in -> obs-studio-26.0.0.tar.xz/UI/ui-config.h.in Changed

obs-studio-26.0.0.tar.xz/UI/visibility-checkbox.cpp Added

obs-studio-25.0.8.tar.xz/UI/visibility-checkbox.hpp -> obs-studio-26.0.0.tar.xz/UI/visibility-checkbox.hpp Changed

obs-studio-25.0.8.tar.xz/UI/volume-control.cpp -> obs-studio-26.0.0.tar.xz/UI/volume-control.cpp Changed

obs-studio-25.0.8.tar.xz/UI/win-update/updater/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/UI/win-update/updater/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/UI/win-update/updater/hash.cpp -> obs-studio-26.0.0.tar.xz/UI/win-update/updater/hash.cpp Changed

obs-studio-25.0.8.tar.xz/UI/win-update/updater/updater.cpp -> obs-studio-26.0.0.tar.xz/UI/win-update/updater/updater.cpp Changed

@@ -1153,17 +1153,31 @@
 		GetCurrentDirectory(_countof(lpAppDataPath), lpAppDataPath);
 		StringCbCat(lpAppDataPath, sizeof(lpAppDataPath), L"\\config");
 	} else {
-		CoTaskMemPtr<wchar_t> pOut;
-		HRESULT hr = SHGetKnownFolderPath(FOLDERID_RoamingAppData,
-						  KF_FLAG_DEFAULT, nullptr,
-						  &pOut);
-		if (hr != S_OK) {
+		DWORD ret;
+		ret = GetEnvironmentVariable(L"OBS_USER_APPDATA_PATH",
+					     lpAppDataPath,
+					     _countof(lpAppDataPath));
+
+		if (ret >= _countof(lpAppDataPath)) {
 			Status(L"Update failed: Could not determine AppData "
 			       L"location");
 			return false;
 		}
 
-		StringCbCopy(lpAppDataPath, sizeof(lpAppDataPath), pOut);
+		if (!ret) {
+			CoTaskMemPtr<wchar_t> pOut;
+			HRESULT hr = SHGetKnownFolderPath(
+				FOLDERID_RoamingAppData, KF_FLAG_DEFAULT,
+				nullptr, &pOut);
+			if (hr != S_OK) {
+				Status(L"Update failed: Could not determine AppData "
+				       L"location");
+				return false;
+			}
+
+			StringCbCopy(lpAppDataPath, sizeof(lpAppDataPath),
+				     pOut);
+		}
 	}
 
 	StringCbCat(lpAppDataPath, sizeof(lpAppDataPath), L"\\obs-studio");
@@ -1411,6 +1425,40 @@
 	}
 
 	/* ------------------------------------- *
+	 * Install virtual camera                */
+
+	if (!bIsPortable) {
+		wchar_t regsvr[MAX_PATH];
+		wchar_t src[MAX_PATH];
+		wchar_t tmp[MAX_PATH];
+		wchar_t tmp2[MAX_PATH];
+
+		SHGetFolderPathW(nullptr, CSIDL_SYSTEM, nullptr,
+				 SHGFP_TYPE_CURRENT, regsvr);
+		StringCbCat(regsvr, sizeof(regsvr), L"\\regsvr32.exe");
+
+		GetCurrentDirectoryW(_countof(src), src);
+		StringCbCat(src, sizeof(src),
+			    L"\\data\\obs-plugins\\win-dshow\\");
+
+		StringCbCopy(tmp, sizeof(tmp), L"\"\"");
+		StringCbCat(tmp, sizeof(tmp), regsvr);
+		StringCbCat(tmp, sizeof(tmp), L"\" /s \"");
+		StringCbCat(tmp, sizeof(tmp), src);
+		StringCbCat(tmp, sizeof(tmp), L"obs-virtualcam-module");
+
+		StringCbCopy(tmp2, sizeof(tmp2), tmp);
+		StringCbCat(tmp2, sizeof(tmp2), L"32.dll\"\"");
+		_wsystem(tmp2);
+
+		if (is_64bit_windows()) {
+			StringCbCopy(tmp2, sizeof(tmp2), tmp);
+			StringCbCat(tmp2, sizeof(tmp2), L"64.dll\"\"");
+			_wsystem(tmp2);
+		}
+	}
+
+	/* ------------------------------------- *
 	 * Update hook files and vulkan registry */
 
 	UpdateHookFiles();
@@ -1563,16 +1611,13 @@
 	return false;
 }
 
-static void RestartAsAdmin(LPWSTR lpCmdLine)
+static int RestartAsAdmin(LPCWSTR lpCmdLine, LPCWSTR cwd)
 {
 	wchar_t myPath[MAX_PATH];
 	if (!GetModuleFileNameW(nullptr, myPath, _countof(myPath) - 1)) {
-		return;
+		return 0;
 	}
 
-	wchar_t cwd[MAX_PATH];
-	GetCurrentDirectoryW(_countof(cwd) - 1, cwd);
-
 	SHELLEXECUTEINFO shExInfo = {0};
 	shExInfo.cbSize = sizeof(shExInfo);
 	shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
@@ -1588,16 +1633,27 @@
 	 * windows :( */
 	AllowSetForegroundWindow(ASFW_ANY);
 
+	/* if the admin is a different user, save the path to the user's
+	 * appdata so we can load the correct manifest */
+	CoTaskMemPtr<wchar_t> pOut;
+	HRESULT hr = SHGetKnownFolderPath(FOLDERID_RoamingAppData,
+					  KF_FLAG_DEFAULT, nullptr, &pOut);
+	if (hr == S_OK)
+		SetEnvironmentVariable(L"OBS_USER_APPDATA_PATH", pOut);
+
 	if (ShellExecuteEx(&shExInfo)) {
 		DWORD exitCode;
 
+		WaitForSingleObject(shExInfo.hProcess, INFINITE);
+
 		if (GetExitCodeProcess(shExInfo.hProcess, &exitCode)) {
 			if (exitCode == 1) {
-				LaunchOBS();
+				return exitCode;
 			}
 		}
 		CloseHandle(shExInfo.hProcess);
 	}
+	return 0;
 }
 
 static bool HasElevation()
@@ -1622,11 +1678,36 @@
 {
 	INITCOMMONCONTROLSEX icce;
 
+	wchar_t cwd[MAX_PATH];
+	wchar_t newPath[MAX_PATH];
+	GetCurrentDirectoryW(_countof(cwd) - 1, cwd);
+
+	is32bit = wcsstr(cwd, L"bin\\32bit") != nullptr;
+
 	if (!HasElevation()) {
+
+		WinHandle hMutex = OpenMutex(
+			SYNCHRONIZE, false, L"OBSUpdaterRunningAsNonAdminUser");
+		if (hMutex) {
+			MessageBox(
+				nullptr, L"Updater Error",
+				L"OBS Studio Updater must be run as an administrator.",
+				MB_ICONWARNING);
+			return 2;
+		}
+
 		HANDLE hLowMutex = CreateMutexW(
 			nullptr, true, L"OBSUpdaterRunningAsNonAdminUser");
 
-		RestartAsAdmin(lpCmdLine);
+		/* return code 1 =  user wanted to launch OBS */
+		if (RestartAsAdmin(lpCmdLine, cwd) == 1) {
+			StringCbCat(cwd, sizeof(cwd), L"\\..\\..");
+			GetFullPathName(cwd, _countof(newPath), newPath,
+					nullptr);
+			SetCurrentDirectory(newPath);
+
+			LaunchOBS();
+		}
 
 		if (hLowMutex) {
 			ReleaseMutex(hLowMutex);
@@ -1635,18 +1716,9 @@
 
 		return 0;
 	} else {
-		{
-			wchar_t cwd[MAX_PATH];
-			wchar_t newPath[MAX_PATH];
-			GetCurrentDirectoryW(_countof(cwd) - 1, cwd);
-
-			is32bit = wcsstr(cwd, L"bin\\32bit") != nullptr;
-			StringCbCat(cwd, sizeof(cwd), L"\\..\\..");
-
-			GetFullPathName(cwd, _countof(newPath), newPath,
-					nullptr);
-			SetCurrentDirectory(newPath);
-		}
+		StringCbCat(cwd, sizeof(cwd), L"\\..\\..");
+		GetFullPathName(cwd, _countof(newPath), newPath, nullptr);
+		SetCurrentDirectory(newPath);
 
 		hinstMain = hInstance;

obs-studio-25.0.8.tar.xz/UI/win-update/win-update.cpp -> obs-studio-26.0.0.tar.xz/UI/win-update/win-update.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-adv-audio.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-adv-audio.cpp Changed

@@ -26,6 +26,28 @@
 	QWidget *widget;
 	QLabel *label;
 
+	QLabel *volLabel = new QLabel(QTStr("Basic.AdvAudio.Volume"));
+	volLabel->setStyleSheet("font-weight: bold;");
+	volLabel->setContentsMargins(0, 0, 6, 0);
+
+	usePercent = new QCheckBox();
+	usePercent->setStyleSheet("font-weight: bold;");
+	usePercent->setText("%");
+	connect(usePercent, SIGNAL(toggled(bool)), this,
+		SLOT(SetVolumeType(bool)));
+
+	VolumeType volType = (VolumeType)config_get_int(
+		GetGlobalConfig(), "BasicWindow", "AdvAudioVolumeType");
+
+	if (volType == VolumeType::Percent)
+		usePercent->setChecked(true);
+
+	QHBoxLayout *volLayout = new QHBoxLayout();
+	volLayout->setContentsMargins(0, 0, 0, 0);
+	volLayout->addWidget(volLabel);
+	volLayout->addWidget(usePercent);
+	volLayout->addStretch();
+
 	int idx = 0;
 	mainLayout = new QGridLayout;
 	mainLayout->setContentsMargins(0, 0, 0, 0);
@@ -37,9 +59,7 @@
 	label = new QLabel(QTStr("Basic.Stats.Status"));
 	label->setStyleSheet("font-weight: bold;");
 	mainLayout->addWidget(label, 0, idx++);
-	label = new QLabel(QTStr("Basic.AdvAudio.Volume"));
-	label->setStyleSheet("font-weight: bold;");
-	mainLayout->addWidget(label, 0, idx++);
+	mainLayout->addLayout(volLayout, 0, idx++);
 	label = new QLabel(QTStr("Basic.AdvAudio.Mono"));
 	label->setStyleSheet("font-weight: bold;");
 	mainLayout->addWidget(label, 0, idx++);
@@ -193,10 +213,14 @@
 	}
 }
 
-void OBSBasicAdvAudio::SetVolumeType()
+void OBSBasicAdvAudio::SetVolumeType(bool percent)
 {
-	QAction *action = reinterpret_cast<QAction *>(sender());
-	VolumeType type = (VolumeType)action->property("volumeType").toInt();
+	VolumeType type;
+
+	if (percent)
+		type = VolumeType::Percent;
+	else
+		type = VolumeType::dB;
 
 	for (size_t i = 0; i < controls.size(); i++)
 		controls[i]->SetVolumeWidget(type);
@@ -205,38 +229,6 @@
 		       (int)type);
 }
 
-void OBSBasicAdvAudio::ShowContextMenu(const QPoint &pos)
-{
-	VolumeType type = (VolumeType)config_get_int(
-		GetGlobalConfig(), "BasicWindow", "AdvAudioVolumeType");
-
-	QMenu *contextMenu = new QMenu(this);
-
-	QAction *percent = new QAction(QTStr("Percent"), this);
-	QAction *dB = new QAction(QTStr("dB"), this);
-
-	percent->setProperty("volumeType", (int)VolumeType::Percent);
-	dB->setProperty("volumeType", (int)VolumeType::dB);
-
-	connect(percent, SIGNAL(triggered()), this, SLOT(SetVolumeType()),
-		Qt::DirectConnection);
-	connect(dB, SIGNAL(triggered()), this, SLOT(SetVolumeType()),
-		Qt::DirectConnection);
-
-	percent->setCheckable(true);
-	dB->setCheckable(true);
-
-	if (type == VolumeType::Percent)
-		percent->setChecked(true);
-	else if (type == VolumeType::dB)
-		dB->setChecked(true);
-
-	contextMenu->addAction(dB);
-	contextMenu->addAction(percent);
-
-	contextMenu->exec(mapToGlobal(pos));
-}
-
 void OBSBasicAdvAudio::ActiveOnlyChanged(bool checked)
 {
 	SetShowInactive(!checked);

obs-studio-25.0.8.tar.xz/UI/window-basic-adv-audio.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-adv-audio.hpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-auto-config-test.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-auto-config-test.cpp Changed

@@ -4,6 +4,7 @@
 
 #include <obs.hpp>
 #include <util/platform.h>
+#include <util/util_uint64.h>
 #include <graphics/vec4.h>
 #include <graphics/graphics.h>
 #include <graphics/math-extra.h>
@@ -249,9 +250,10 @@
 		GetServers(servers);
 
 	/* just use the first server if it only has one alternate server,
-	 * or if using Mixer or Restream due to their "auto" servers */
-	if (servers.size() < 3 || wiz->serviceName == "Mixer.com - FTL" ||
-	    wiz->serviceName.substr(0, 11) == "Restream.io") {
+	 * or if using Restream or Nimo TV due to their "auto" servers */
+	if (servers.size() < 3 ||
+	    wiz->serviceName.substr(0, 11) == "Restream.io" ||
+	    wiz->serviceName == "Nimo TV") {
 		servers.resize(1);
 
 	} else if (wiz->service == AutoConfig::Service::Twitch &&
@@ -413,12 +415,14 @@
 		cv.wait(ul);
 
 		uint64_t total_time = os_gettime_ns() - t_start;
+		if (total_time == 0)
+			total_time = 1;
 
 		int total_bytes =
 			(int)obs_output_get_total_bytes(output) - start_bytes;
-		uint64_t bitrate = (uint64_t)total_bytes * 8 * 1000000000 /
-				   total_time / 1000;
-
+		uint64_t bitrate = util_mul_div64(
+			total_bytes, 8ULL * 1000000000ULL / 1000ULL,
+			total_time);
 		if (obs_output_get_frames_dropped(output) ||
 		    (int)bitrate < (wiz->startingBitrate * 75 / 100)) {
 			server.bitrate = (int)bitrate * 70 / 100;
@@ -454,8 +458,8 @@
 		}
 	}
 
-	wiz->server = bestServer;
-	wiz->serverName = bestServerName;
+	wiz->server = std::move(bestServer);
+	wiz->serverName = std::move(bestServerName);
 	wiz->idealBitrate = bestBitrate;
 
 	QMetaObject::invokeMethod(this, "NextStage");
@@ -624,11 +628,13 @@
 	int i = 0;
 	int count = 1;
 
-	auto testRes = [&](long double div, int fps_num, int fps_den,
-			   bool force) {
+	auto testRes = [&](int cy, int fps_num, int fps_den, bool force) {
 		int per = ++i * 100 / count;
 		QMetaObject::invokeMethod(this, "Progress", Q_ARG(int, per));
 
+		if (cy > baseCY)
+			return true;
+
 		/* no need for more than 3 tests max */
 		if (results.size() >= 3)
 			return true;
@@ -640,8 +646,8 @@
 
 		long double fps = ((long double)fps_num / (long double)fps_den);
 
-		int cx = int((long double)baseCX / div);
-		int cy = int((long double)baseCY / div);
+		int cx = int(((long double)baseCX / (long double)baseCY) *
+			     (long double)cy);
 
 		if (!force && wiz->type != AutoConfig::Type::Recording) {
 			int est = EstimateMinBitrate(cx, cy, fps_num, fps_den);
@@ -697,38 +703,50 @@
 	};
 
 	if (wiz->specificFPSNum && wiz->specificFPSDen) {
-		count = 5;
-		if (!testRes(1.0, 0, 0, false))
+		count = 7;
+		if (!testRes(2160, 0, 0, false))
+			return false;
+		if (!testRes(1440, 0, 0, false))
 			return false;
-		if (!testRes(1.5, 0, 0, false))
+		if (!testRes(1080, 0, 0, false))
 			return false;
-		if (!testRes(1.0 / 0.6, 0, 0, false))
+		if (!testRes(720, 0, 0, false))
 			return false;
-		if (!testRes(2.0, 0, 0, false))
+		if (!testRes(480, 0, 0, false))
 			return false;
-		if (!testRes(2.25, 0, 0, true))
+		if (!testRes(360, 0, 0, false))
+			return false;
+		if (!testRes(240, 0, 0, true))
 			return false;
 	} else {
-		count = 10;
-		if (!testRes(1.0, 60, 1, false))
+		count = 14;
+		if (!testRes(2160, 60, 1, false))
+			return false;
+		if (!testRes(2160, 30, 1, false))
+			return false;
+		if (!testRes(1440, 60, 1, false))
+			return false;
+		if (!testRes(1440, 30, 1, false))
 			return false;
-		if (!testRes(1.0, 30, 1, false))
+		if (!testRes(1080, 60, 1, false))
 			return false;
-		if (!testRes(1.5, 60, 1, false))
+		if (!testRes(1080, 30, 1, false))
 			return false;
-		if (!testRes(1.5, 30, 1, false))
+		if (!testRes(720, 60, 1, false))
 			return false;
-		if (!testRes(1.0 / 0.6, 60, 1, false))
+		if (!testRes(720, 30, 1, false))
 			return false;
-		if (!testRes(1.0 / 0.6, 30, 1, false))
+		if (!testRes(480, 60, 1, false))
 			return false;
-		if (!testRes(2.0, 60, 1, false))
+		if (!testRes(480, 30, 1, false))
 			return false;
-		if (!testRes(2.0, 30, 1, false))
+		if (!testRes(360, 60, 1, false))
 			return false;
-		if (!testRes(2.25, 60, 1, false))
+		if (!testRes(360, 30, 1, false))
 			return false;
-		if (!testRes(2.25, 30, 1, true))
+		if (!testRes(240, 60, 1, false))
+			return false;
+		if (!testRes(240, 30, 1, true))
 			return false;
 	}
 
@@ -787,8 +805,10 @@
 		maxDataRate = 1280 * 720 * 30 + 1000;
 	}
 
-	auto testRes = [&](long double div, int fps_num, int fps_den,
-			   bool force) {
+	auto testRes = [&](int cy, int fps_num, int fps_den, bool force) {
+		if (cy > baseCY)
+			return;
+
 		if (results.size() >= 3)
 			return;
 
@@ -799,8 +819,8 @@
 
 		long double fps = ((long double)fps_num / (long double)fps_den);
 
-		int cx = int((long double)baseCX / div);
-		int cy = int((long double)baseCY / div);
+		int cx = int(((long double)baseCX / (long double)baseCY) *
+			     (long double)cy);
 
 		long double rate = (long double)cx * (long double)cy * fps;
 		if (!force && rate > maxDataRate)
@@ -825,22 +845,28 @@
 	};
 
 	if (wiz->specificFPSNum && wiz->specificFPSDen) {
-		testRes(1.0, 0, 0, false);
-		testRes(1.5, 0, 0, false);
-		testRes(1.0 / 0.6, 0, 0, false);
-		testRes(2.0, 0, 0, false);
-		testRes(2.25, 0, 0, true);
+		testRes(2160, 0, 0, false);
+		testRes(1440, 0, 0, false);
+		testRes(1080, 0, 0, false);
+		testRes(720, 0, 0, false);
+		testRes(480, 0, 0, false);
+		testRes(360, 0, 0, false);
+		testRes(240, 0, 0, true);
 	} else {
-		testRes(1.0, 60, 1, false);
-		testRes(1.0, 30, 1, false);
-		testRes(1.5, 60, 1, false);
-		testRes(1.5, 30, 1, false);
-		testRes(1.0 / 0.6, 60, 1, false);
-		testRes(1.0 / 0.6, 30, 1, false);
-		testRes(2.0, 60, 1, false);
-		testRes(2.0, 30, 1, false);
-		testRes(2.25, 60, 1, false);
-		testRes(2.25, 30, 1, true);
+		testRes(2160, 60, 1, false);
+		testRes(2160, 30, 1, false);
+		testRes(1440, 60, 1, false);
+		testRes(1440, 30, 1, false);
+		testRes(1080, 60, 1, false);
+		testRes(1080, 30, 1, false);
+		testRes(720, 60, 1, false);
+		testRes(720, 30, 1, false);
+		testRes(480, 60, 1, false);
+		testRes(480, 30, 1, false);
+		testRes(360, 60, 1, false);
+		testRes(360, 30, 1, false);
+		testRes(240, 60, 1, false);
+		testRes(240, 30, 1, true);
 	}
 
 	int minArea = 960 * 540 + 1000;
@@ -965,7 +991,7 @@
 		return new QLabel(QTStr(str), this);
 	};
 
-	if (wiz->type != AutoConfig::Type::Recording) {
+	if (wiz->type == AutoConfig::Type::Streaming) {
 		const char *serverType = wiz->customServer ? "rtmp_custom"
 							   : "rtmp_common";
 
@@ -1068,7 +1094,7 @@
 			started = true;
 		}
 
-		if (wiz->type == AutoConfig::Type::Recording) {
+		if (wiz->type != AutoConfig::Type::Streaming) {
 			stage = Stage::StreamEncoder;
 		} else if (!wiz->bandwidthTest) {
 			stage = Stage::BandwidthTest;
@@ -1138,8 +1164,17 @@
 
 void AutoConfigTestPage::initializePage()
 {
+	if (wiz->type == AutoConfig::Type::VirtualCam) {
+		wiz->idealResolutionCX = wiz->baseResolutionCX;
+		wiz->idealResolutionCY = wiz->baseResolutionCY;
+		wiz->idealFPSNum = 30;
+		wiz->idealFPSDen = 1;
+		stage = Stage::Finished;
+	} else {
+		stage = Stage::Starting;
+	}
+
 	setSubTitle(QTStr(SUBTITLE_TESTING));
-	stage = Stage::Starting;
 	softwareTested = false;
 	cancel = false;
 	DeleteLayout(results);

obs-studio-25.0.8.tar.xz/UI/window-basic-auto-config.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-auto-config.cpp Changed

@@ -69,6 +69,18 @@
 	ui->setupUi(this);
 	setTitle(QTStr("Basic.AutoConfig.StartPage"));
 	setSubTitle(QTStr("Basic.AutoConfig.StartPage.SubTitle"));
+
+	OBSBasic *main = OBSBasic::Get();
+	if (main->VCamEnabled()) {
+		QRadioButton *prioritizeVCam = new QRadioButton(
+			QTStr("Basic.AutoConfig.StartPage.PrioritizeVirtualCam"),
+			this);
+		QBoxLayout *box = reinterpret_cast<QBoxLayout *>(layout());
+		box->insertWidget(2, prioritizeVCam);
+
+		connect(prioritizeVCam, &QPushButton::clicked, this,
+			&AutoConfigStartPage::PrioritizeVCam);
+	}
 }
 
 AutoConfigStartPage::~AutoConfigStartPage()
@@ -78,7 +90,9 @@
 
 int AutoConfigStartPage::nextId() const
 {
-	return AutoConfig::VideoPage;
+	return wiz->type == AutoConfig::Type::VirtualCam
+		       ? AutoConfig::TestPage
+		       : AutoConfig::VideoPage;
 }
 
 void AutoConfigStartPage::on_prioritizeStreaming_clicked()
@@ -91,6 +105,11 @@
 	wiz->type = AutoConfig::Type::Recording;
 }
 
+void AutoConfigStartPage::PrioritizeVCam()
+{
+	wiz->type = AutoConfig::Type::VirtualCam;
+}
+
 /* ------------------------------------------------------------------------- */
 
 #define RES_TEXT(x) "Basic.AutoConfig.VideoPage." x
@@ -254,6 +273,10 @@
 		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()));
 
@@ -554,12 +577,8 @@
 
 void AutoConfigStreamPage::UpdateKeyLink()
 {
-	if (IsCustomService()) {
-		ui->doBandwidthTest->setEnabled(true);
-		return;
-	}
-
 	QString serviceName = ui->service->currentText();
+	QString customServer = ui->customServer->text();
 	bool isYoutube = false;
 	QString streamKeyLink;
 
@@ -572,12 +591,16 @@
 	} else if (serviceName.startsWith("Restream.io")) {
 		streamKeyLink =
 			"https://restream.io/settings/streaming-setup?from=OBS";
-	} else if (serviceName == "Facebook Live") {
-		streamKeyLink = "https://www.facebook.com/live/create?ref=OBS";
+	} else if (serviceName == "Facebook Live" ||
+		   (customServer.contains("fbcdn.net") && IsCustomService())) {
+		streamKeyLink =
+			"https://www.facebook.com/live/producer?ref=OBS";
 	} else if (serviceName.startsWith("Twitter")) {
 		streamKeyLink = "https://www.pscp.tv/account/producer";
 	} else if (serviceName.startsWith("YouStreamer")) {
 		streamKeyLink = "https://www.app.youstreamer.com/stream/";
+	} else if (serviceName == "Trovo") {
+		streamKeyLink = "https://studio.trovo.live/mychannel/stream";
 	}
 
 	if (QString(streamKeyLink).isNull()) {
@@ -620,7 +643,7 @@
 	}
 
 	if (showAll)
-		names.sort();
+		names.sort(Qt::CaseInsensitive);
 
 	for (QString &name : names)
 		ui->service->addItem(name);
@@ -723,7 +746,7 @@
 
 	std::string serviceType;
 	GetServiceInfo(serviceType, serviceName, server, key);
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__APPLE__)
 	setWizardStyle(QWizard::ModernStyle);
 #endif
 	streamPage = new AutoConfigStreamPage();
@@ -828,7 +851,7 @@
 		streamPage->ui->preferHardware->setChecked(preferHardware);
 	}
 
-	setOptions(0);
+	setOptions(QWizard::WizardOptions());
 	setButtonText(QWizard::FinishButton,
 		      QTStr("Basic.AutoConfig.ApplySettings"));
 	setButtonText(QWizard::BackButton, QTStr("Back"));

obs-studio-25.0.8.tar.xz/UI/window-basic-auto-config.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-auto-config.hpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-filters.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-filters.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-interaction.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-interaction.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-interaction.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-interaction.hpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-main-dropfiles.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main-dropfiles.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-main-outputs.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main-outputs.cpp Changed

@@ -14,6 +14,7 @@
 volatile bool recording_active = false;
 volatile bool recording_paused = false;
 volatile bool replaybuf_active = false;
+volatile bool virtualcam_active = false;
 
 #define RTMP_PROTOCOL "rtmp"
 
@@ -139,34 +140,28 @@
 	UNUSED_PARAMETER(params);
 }
 
-static void FindBestFilename(string &strPath, bool noSpace)
+static void OBSStartVirtualCam(void *data, calldata_t *params)
 {
-	int num = 2;
-
-	if (!os_file_exists(strPath.c_str()))
-		return;
+	BasicOutputHandler *output = static_cast<BasicOutputHandler *>(data);
 
-	const char *ext = strrchr(strPath.c_str(), '.');
-	if (!ext)
-		return;
+	output->virtualCamActive = true;
+	os_atomic_set_bool(&virtualcam_active, true);
+	QMetaObject::invokeMethod(output->main, "OnVirtualCamStart");
 
-	int extStart = int(ext - strPath.c_str());
-	for (;;) {
-		string testPath = strPath;
-		string numStr;
+	UNUSED_PARAMETER(params);
+}
 
-		numStr = noSpace ? "_" : " (";
-		numStr += to_string(num++);
-		if (!noSpace)
-			numStr += ")";
+static void OBSStopVirtualCam(void *data, calldata_t *params)
+{
+	BasicOutputHandler *output = static_cast<BasicOutputHandler *>(data);
+	int code = (int)calldata_int(params, "code");
 
-		testPath.insert(extStart, numStr);
+	output->virtualCamActive = false;
+	os_atomic_set_bool(&virtualcam_active, false);
+	QMetaObject::invokeMethod(output->main, "OnVirtualCamStop",
+				  Q_ARG(int, code));
 
-		if (!os_file_exists(testPath.c_str())) {
-			strPath = testPath;
-			break;
-		}
-	}
+	UNUSED_PARAMETER(params);
 }
 
 /* ------------------------------------------------------------------------ */
@@ -197,6 +192,52 @@
 
 /* ------------------------------------------------------------------------ */
 
+inline BasicOutputHandler::BasicOutputHandler(OBSBasic *main_) : main(main_)
+{
+	if (main->vcamEnabled) {
+		virtualCam = obs_output_create("virtualcam_output",
+					       "virtualcam_output", nullptr,
+					       nullptr);
+		obs_output_release(virtualCam);
+
+		signal_handler_t *signal =
+			obs_output_get_signal_handler(virtualCam);
+		startVirtualCam.Connect(signal, "start", OBSStartVirtualCam,
+					this);
+		stopVirtualCam.Connect(signal, "stop", OBSStopVirtualCam, this);
+	}
+}
+
+bool BasicOutputHandler::StartVirtualCam()
+{
+	if (main->vcamEnabled) {
+		obs_output_set_media(virtualCam, obs_get_video(),
+				     obs_get_audio());
+		if (!Active())
+			SetupOutputs();
+
+		return obs_output_start(virtualCam);
+	}
+	return false;
+}
+
+void BasicOutputHandler::StopVirtualCam()
+{
+	if (main->vcamEnabled) {
+		obs_output_stop(virtualCam);
+	}
+}
+
+bool BasicOutputHandler::VirtualCamActive() const
+{
+	if (main->vcamEnabled) {
+		return obs_output_active(virtualCam);
+	}
+	return false;
+}
+
+/* ------------------------------------------------------------------------ */
+
 struct SimpleOutput : BasicOutputHandler {
 	OBSEncoder aacStreaming;
 	OBSEncoder h264Streaming;
@@ -226,7 +267,7 @@
 	void UpdateRecordingAudioSettings();
 	virtual void Update() override;
 
-	void SetupOutputs();
+	void SetupOutputs() override;
 	int GetAudioBitrate() const;
 
 	void LoadRecordingPreset_h264(const char *encoder);
@@ -238,6 +279,7 @@
 	void UpdateRecording();
 	bool ConfigureRecording(bool useReplayBuffer);
 
+	virtual bool SetupStreaming(obs_service_t *service) override;
 	virtual bool StartStreaming(obs_service_t *service) override;
 	virtual bool StartRecording() override;
 	virtual bool StartReplayBuffer() override;
@@ -367,9 +409,14 @@
 		bool useReplayBuffer = config_get_bool(main->Config(),
 						       "SimpleOutput", "RecRB");
 		if (useReplayBuffer) {
+			obs_data_t *hotkey;
 			const char *str = config_get_string(
 				main->Config(), "Hotkeys", "ReplayBuffer");
-			obs_data_t *hotkey = obs_data_create_from_json(str);
+			if (str)
+				hotkey = obs_data_create_from_json(str);
+			else
+				hotkey = nullptr;
+
 			replayBuffer = obs_output_create("replay_buffer",
 							 Str("ReplayBuffer"),
 							 nullptr, hotkey);
@@ -680,7 +727,7 @@
 	return nullptr;
 }
 
-bool SimpleOutput::StartStreaming(obs_service_t *service)
+bool SimpleOutput::SetupStreaming(obs_service_t *service)
 {
 	if (!Active())
 		SetupOutputs();
@@ -697,7 +744,7 @@
 		const char *url = obs_service_get_url(service);
 		if (url != NULL &&
 		    strncmp(url, RTMP_PROTOCOL, strlen(RTMP_PROTOCOL)) != 0) {
-			type = "ffmpeg_encoded_output";
+			type = "ffmpeg_mpegts_muxer";
 		}
 	}
 
@@ -774,9 +821,11 @@
 	obs_output_set_video_encoder(streamOutput, h264Streaming);
 	obs_output_set_audio_encoder(streamOutput, aacStreaming, 0);
 	obs_output_set_service(streamOutput, service);
+	return true;
+}
 
-	/* --------------------- */
-
+bool SimpleOutput::StartStreaming(obs_service_t *service)
+{
 	bool reconnect = config_get_bool(main->Config(), "Output", "Reconnect");
 	int retryDelay =
 		config_get_uint(main->Config(), "Output", "RetryDelay");
@@ -825,36 +874,12 @@
 	else
 		lastError = string();
 
+	const char *type = obs_service_get_output_type(service);
 	blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s", type,
 	     hasLastError ? "  Last Error: " : "", hasLastError ? error : "");
 	return false;
 }
 
-static void remove_reserved_file_characters(string &s)
-{
-	replace(s.begin(), s.end(), '/', '_');
-	replace(s.begin(), s.end(), '\\', '_');
-	replace(s.begin(), s.end(), '*', '_');
-	replace(s.begin(), s.end(), '?', '_');
-	replace(s.begin(), s.end(), '"', '_');
-	replace(s.begin(), s.end(), '|', '_');
-	replace(s.begin(), s.end(), ':', '_');
-	replace(s.begin(), s.end(), '>', '_');
-	replace(s.begin(), s.end(), '<', '_');
-}
-
-static void ensure_directory_exists(string &path)
-{
-	replace(path.begin(), path.end(), '\\', '/');
-
-	size_t last = path.rfind('/');
-	if (last == string::npos)
-		return;
-
-	string directory = path.substr(0, last);
-	os_mkdirs(directory.c_str());
-}
-
 void SimpleOutput::UpdateRecording()
 {
 	if (replayBufferActive || recordingActive)
@@ -905,54 +930,15 @@
 	int rbSize =
 		config_get_int(main->Config(), "SimpleOutput", "RecRBSize");
 
-	os_dir_t *dir = path && path[0] ? os_opendir(path) : nullptr;
-
-	if (!dir) {
-		if (main->isVisible())
-			OBSMessageBox::warning(main,
-					       QTStr("Output.BadPath.Title"),
-					       QTStr("Output.BadPath.Text"));
-		else
-			main->SysTrayNotify(QTStr("Output.BadPath.Text"),
-					    QSystemTrayIcon::Warning);
-		return false;
-	}
-
-	os_closedir(dir);
-
+	string f;
 	string strPath;
-	strPath += path;
-
-	char lastChar = strPath.back();
-	if (lastChar != '/' && lastChar != '\\')
-		strPath += "/";
-
-	strPath += GenerateSpecifiedFilename(ffmpegOutput ? "avi" : format,
-					     noSpace, filenameFormat);
-	ensure_directory_exists(strPath);
-	if (!overwriteIfExists)
-		FindBestFilename(strPath, noSpace);
 
 	obs_data_t *settings = obs_data_create();
 	if (updateReplayBuffer) {
-		string f;
-
-		if (rbPrefix && *rbPrefix) {
-			f += rbPrefix;
-			if (f.back() != ' ')
-				f += " ";
-		}
-
-		f += filenameFormat;
-
-		if (rbSuffix && *rbSuffix) {
-			if (*rbSuffix != ' ')
-				f += " ";
-			f += rbSuffix;
-		}
-
-		remove_reserved_file_characters(f);
-
+		f = GetFormatString(filenameFormat, rbPrefix, rbSuffix);
+		strPath = GetOutputFilename(path, ffmpegOutput ? "avi" : format,
+					    noSpace, overwriteIfExists,
+					    f.c_str());
 		obs_data_set_string(settings, "directory", path);
 		obs_data_set_string(settings, "format", f.c_str());
 		obs_data_set_string(settings, "extension", format);
@@ -961,6 +947,11 @@
 		obs_data_set_int(settings, "max_size_mb",
 				 usingRecordingPreset ? rbSize : 0);
 	} else {
+		f = GetFormatString(filenameFormat, nullptr, nullptr);
+		strPath = GetRecordingFilename(path,
+					       ffmpegOutput ? "avi" : format,
+					       noSpace, overwriteIfExists,
+					       f.c_str(), ffmpegOutput);
 		obs_data_set_string(settings, ffmpegOutput ? "url" : "path",
 				    strPath.c_str());
 	}
@@ -1075,9 +1066,10 @@
 	inline void SetupStreaming();
 	inline void SetupRecording();
 	inline void SetupFFmpeg();
-	void SetupOutputs();
+	void SetupOutputs() override;
 	int GetAudioBitrate(size_t i) const;
 
+	virtual bool SetupStreaming(obs_service_t *service) override;
 	virtual bool StartStreaming(obs_service_t *service) override;
 	virtual bool StartRecording() override;
 	virtual bool StartReplayBuffer() override;
@@ -1512,7 +1504,7 @@
 	return FindClosestAvailableAACBitrate(bitrate);
 }
 
-bool AdvancedOutput::StartStreaming(obs_service_t *service)
+bool AdvancedOutput::SetupStreaming(obs_service_t *service)
 {
 	int streamTrack =
 		config_get_int(main->Config(), "AdvOut", "TrackIndex") - 1;
@@ -1539,7 +1531,7 @@
 		const char *url = obs_service_get_url(service);
 		if (url != NULL &&
 		    strncmp(url, RTMP_PROTOCOL, strlen(RTMP_PROTOCOL)) != 0) {
-			type = "ffmpeg_encoded_output";
+			type = "ffmpeg_mpegts_muxer";
 		}
 	}
 
@@ -1614,9 +1606,11 @@
 
 	obs_output_set_video_encoder(streamOutput, h264Streaming);
 	obs_output_set_audio_encoder(streamOutput, streamAudioEnc, 0);
+	return true;
+}
 
-	/* --------------------- */
-
+bool AdvancedOutput::StartStreaming(obs_service_t *service)
+{
 	obs_output_set_service(streamOutput, service);
 
 	bool reconnect = config_get_bool(main->Config(), "Output", "Reconnect");
@@ -1665,6 +1659,7 @@
 	else
 		lastError = string();
 
+	const char *type = obs_service_get_output_type(service);
 	blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s", type,
 	     hasLastError ? "  Last Error: " : "", hasLastError ? error : "");
 	return false;
@@ -1707,34 +1702,10 @@
 						  ? "FFFileNameWithoutSpace"
 						  : "RecFileNameWithoutSpace");
 
-		os_dir_t *dir = path && path[0] ? os_opendir(path) : nullptr;
-
-		if (!dir) {
-			if (main->isVisible())
-				OBSMessageBox::warning(
-					main, QTStr("Output.BadPath.Title"),
-					QTStr("Output.BadPath.Text"));
-			else
-				main->SysTrayNotify(
-					QTStr("Output.BadPath.Text"),
-					QSystemTrayIcon::Warning);
-			return false;
-		}
-
-		os_closedir(dir);
-
-		string strPath;
-		strPath += path;
-
-		char lastChar = strPath.back();
-		if (lastChar != '/' && lastChar != '\\')
-			strPath += "/";
-
-		strPath += GenerateSpecifiedFilename(recFormat, noSpace,
-						     filenameFormat);
-		ensure_directory_exists(strPath);
-		if (!overwriteIfExists)
-			FindBestFilename(strPath, noSpace);
+		string strPath = GetRecordingFilename(path, recFormat, noSpace,
+						      overwriteIfExists,
+						      filenameFormat,
+						      ffmpegRecording);
 
 		obs_data_t *settings = obs_data_create();
 		obs_data_set_string(settings, ffmpegRecording ? "url" : "path",
@@ -1807,53 +1778,11 @@
 		rbTime = config_get_int(main->Config(), "AdvOut", "RecRBTime");
 		rbSize = config_get_int(main->Config(), "AdvOut", "RecRBSize");
 
-		os_dir_t *dir = path && path[0] ? os_opendir(path) : nullptr;
-
-		if (!dir) {
-			if (main->isVisible())
-				OBSMessageBox::warning(
-					main, QTStr("Output.BadPath.Title"),
-					QTStr("Output.BadPath.Text"));
-			else
-				main->SysTrayNotify(
-					QTStr("Output.BadPath.Text"),
-					QSystemTrayIcon::Warning);
-			return false;
-		}
-
-		os_closedir(dir);
-
-		string strPath;
-		strPath += path;
-
-		char lastChar = strPath.back();
-		if (lastChar != '/' && lastChar != '\\')
-			strPath += "/";
-
-		strPath += GenerateSpecifiedFilename(recFormat, noSpace,
-						     filenameFormat);
-		ensure_directory_exists(strPath);
-		if (!overwriteIfExists)
-			FindBestFilename(strPath, noSpace);
+		string f = GetFormatString(filenameFormat, rbPrefix, rbSuffix);
+		string strPath = GetOutputFilename(
+			path, recFormat, noSpace, overwriteIfExists, f.c_str());
 
 		obs_data_t *settings = obs_data_create();
-		string f;
-
-		if (rbPrefix && *rbPrefix) {
-			f += rbPrefix;
-			if (f.back() != ' ')
-				f += " ";
-		}
-
-		f += filenameFormat;
-
-		if (rbSuffix && *rbSuffix) {
-			if (*rbSuffix != ' ')
-				f += " ";
-			f += rbSuffix;
-		}
-
-		remove_reserved_file_characters(f);
 
 		obs_data_set_string(settings, "directory", path);
 		obs_data_set_string(settings, "format", f.c_str());
@@ -1919,6 +1848,25 @@
 
 /* ------------------------------------------------------------------------ */
 
+bool BasicOutputHandler::SetupAutoRemux(const char *&ext)
+{
+	bool autoRemux = config_get_bool(main->Config(), "Video", "AutoRemux");
+	if (autoRemux && strcmp(ext, "mp4") == 0)
+		ext = "mkv";
+	return autoRemux;
+}
+
+std::string
+BasicOutputHandler::GetRecordingFilename(const char *path, const char *ext,
+					 bool noSpace, bool overwrite,
+					 const char *format, bool ffmpeg)
+{
+	bool remux = !ffmpeg && SetupAutoRemux(ext);
+	string dst = GetOutputFilename(path, ext, noSpace, overwrite, format);
+	lastRecordingPath = remux ? dst : "";
+	return dst;
+}
+
 BasicOutputHandler *CreateSimpleOutputHandler(OBSBasic *main)
 {
 	return new SimpleOutput(main);

obs-studio-25.0.8.tar.xz/UI/window-basic-main-outputs.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main-outputs.hpp Changed

@@ -8,47 +8,64 @@
 	OBSOutput fileOutput;
 	OBSOutput streamOutput;
 	OBSOutput replayBuffer;
+	OBSOutput virtualCam;
 	bool streamingActive = false;
 	bool recordingActive = false;
 	bool delayActive = false;
 	bool replayBufferActive = false;
+	bool virtualCamActive = false;
 	OBSBasic *main;
 
 	std::string outputType;
 	std::string lastError;
 
+	std::string lastRecordingPath;
+
 	OBSSignal startRecording;
 	OBSSignal stopRecording;
 	OBSSignal startReplayBuffer;
 	OBSSignal stopReplayBuffer;
 	OBSSignal startStreaming;
 	OBSSignal stopStreaming;
+	OBSSignal startVirtualCam;
+	OBSSignal stopVirtualCam;
 	OBSSignal streamDelayStarting;
 	OBSSignal streamStopping;
 	OBSSignal recordStopping;
 	OBSSignal replayBufferStopping;
 
-	inline BasicOutputHandler(OBSBasic *main_) : main(main_) {}
+	inline BasicOutputHandler(OBSBasic *main_);
 
 	virtual ~BasicOutputHandler(){};
 
+	virtual bool SetupStreaming(obs_service_t *service) = 0;
 	virtual bool StartStreaming(obs_service_t *service) = 0;
 	virtual bool StartRecording() = 0;
 	virtual bool StartReplayBuffer() { return false; }
+	virtual bool StartVirtualCam();
 	virtual void StopStreaming(bool force = false) = 0;
 	virtual void StopRecording(bool force = false) = 0;
 	virtual void StopReplayBuffer(bool force = false) { (void)force; }
+	virtual void StopVirtualCam();
 	virtual bool StreamingActive() const = 0;
 	virtual bool RecordingActive() const = 0;
 	virtual bool ReplayBufferActive() const { return false; }
+	virtual bool VirtualCamActive() const;
 
 	virtual void Update() = 0;
+	virtual void SetupOutputs() = 0;
 
 	inline bool Active() const
 	{
 		return streamingActive || recordingActive || delayActive ||
-		       replayBufferActive;
+		       replayBufferActive || virtualCamActive;
 	}
+
+protected:
+	bool SetupAutoRemux(const char *&ext);
+	std::string GetRecordingFilename(const char *path, const char *ext,
+					 bool noSpace, bool overwrite,
+					 const char *format, bool ffmpeg);
 };
 
 BasicOutputHandler *CreateSimpleOutputHandler(OBSBasic *main);

obs-studio-25.0.8.tar.xz/UI/window-basic-main-profiles.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main-profiles.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-main-scene-collections.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main-scene-collections.cpp Changed

obs-studio-26.0.0.tar.xz/UI/window-basic-main-screenshot.cpp Added

@@ -0,0 +1,215 @@
+/******************************************************************************
+    Copyright (C) 2020 by Hugh Bailey <obs.jim@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 <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#include "window-basic-main.hpp"
+#include "screenshot-obj.hpp"
+#include "qt-wrappers.hpp"
+
+static void ScreenshotTick(void *param, float);
+
+/* ========================================================================= */
+
+ScreenshotObj::ScreenshotObj(obs_source_t *source)
+	: weakSource(OBSGetWeakRef(source))
+{
+	obs_add_tick_callback(ScreenshotTick, this);
+}
+
+ScreenshotObj::~ScreenshotObj()
+{
+	obs_enter_graphics();
+	gs_stagesurface_destroy(stagesurf);
+	gs_texrender_destroy(texrender);
+	obs_leave_graphics();
+
+	obs_remove_tick_callback(ScreenshotTick, this);
+	if (th.joinable())
+		th.join();
+}
+
+void ScreenshotObj::Screenshot()
+{
+	OBSSource source = OBSGetStrongRef(weakSource);
+
+	if (source) {
+		cx = obs_source_get_base_width(source);
+		cy = obs_source_get_base_height(source);
+	} else {
+		obs_video_info ovi;
+		obs_get_video_info(&ovi);
+		cx = ovi.base_width;
+		cy = ovi.base_height;
+	}
+
+	if (!cx || !cy) {
+		blog(LOG_WARNING, "Cannot screenshot, invalid target size");
+		obs_remove_tick_callback(ScreenshotTick, this);
+		deleteLater();
+		return;
+	}
+
+	texrender = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
+	stagesurf = gs_stagesurface_create(cx, cy, GS_RGBA);
+
+	gs_texrender_reset(texrender);
+	if (gs_texrender_begin(texrender, cx, cy)) {
+		vec4 zero;
+		vec4_zero(&zero);
+
+		gs_clear(GS_CLEAR_COLOR, &zero, 0.0f, 0);
+		gs_ortho(0.0f, (float)cx, 0.0f, (float)cy, -100.0f, 100.0f);
+
+		gs_blend_state_push();
+		gs_blend_function(GS_BLEND_ONE, GS_BLEND_ZERO);
+
+		if (source) {
+			obs_source_inc_showing(source);
+			obs_source_video_render(source);
+			obs_source_dec_showing(source);
+		} else {
+			obs_render_main_texture();
+		}
+
+		gs_blend_state_pop();
+		gs_texrender_end(texrender);
+	}
+}
+
+void ScreenshotObj::Download()
+{
+	gs_stage_texture(stagesurf, gs_texrender_get_texture(texrender));
+}
+
+void ScreenshotObj::Copy()
+{
+	uint8_t *videoData = nullptr;
+	uint32_t videoLinesize = 0;
+
+	image = QImage(cx, cy, QImage::Format::Format_RGBX8888);
+
+	if (gs_stagesurface_map(stagesurf, &videoData, &videoLinesize)) {
+		int linesize = image.bytesPerLine();
+		for (int y = 0; y < (int)cy; y++)
+			memcpy(image.scanLine(y),
+			       videoData + (y * videoLinesize), linesize);
+
+		gs_stagesurface_unmap(stagesurf);
+	}
+}
+
+void ScreenshotObj::Save()
+{
+	OBSBasic *main = OBSBasic::Get();
+	config_t *config = main->Config();
+
+	const char *mode = config_get_string(config, "Output", "Mode");
+	const char *type = config_get_string(config, "AdvOut", "RecType");
+	const char *adv_path =
+		strcmp(type, "Standard")
+			? config_get_string(config, "AdvOut", "FFFilePath")
+			: config_get_string(config, "AdvOut", "RecFilePath");
+	const char *rec_path =
+		strcmp(mode, "Advanced")
+			? config_get_string(config, "SimpleOutput", "FilePath")
+			: adv_path;
+
+	const char *filenameFormat =
+		config_get_string(config, "Output", "FilenameFormatting");
+	bool overwriteIfExists =
+		config_get_bool(config, "Output", "OverwriteIfExists");
+
+	path = GetOutputFilename(
+		rec_path, "png", false, overwriteIfExists,
+		GetFormatString(filenameFormat, "Screenshot", nullptr).c_str());
+
+	th = std::thread([this] { MuxAndFinish(); });
+}
+
+void ScreenshotObj::MuxAndFinish()
+{
+	image.save(QT_UTF8(path.c_str()));
+	blog(LOG_INFO, "Saved screenshot to '%s'", path.c_str());
+	deleteLater();
+}
+
+/* ========================================================================= */
+
+#define STAGE_SCREENSHOT 0
+#define STAGE_DOWNLOAD 1
+#define STAGE_COPY_AND_SAVE 2
+#define STAGE_FINISH 3
+
+static void ScreenshotTick(void *param, float)
+{
+	ScreenshotObj *data = reinterpret_cast<ScreenshotObj *>(param);
+
+	if (data->stage == STAGE_FINISH) {
+		return;
+	}
+
+	obs_enter_graphics();
+
+	switch (data->stage) {
+	case STAGE_SCREENSHOT:
+		data->Screenshot();
+		break;
+	case STAGE_DOWNLOAD:
+		data->Download();
+		break;
+	case STAGE_COPY_AND_SAVE:
+		data->Copy();
+		QMetaObject::invokeMethod(data, "Save");
+		obs_remove_tick_callback(ScreenshotTick, data);
+		break;
+	}
+
+	obs_leave_graphics();
+
+	data->stage++;
+}
+
+void OBSBasic::Screenshot(OBSSource source)
+{
+	if (!!screenshotData) {
+		blog(LOG_WARNING, "Cannot take new screenshot, "
+				  "screenshot currently in progress");
+		return;
+	}
+
+	screenshotData = new ScreenshotObj(source);
+}
+
+void OBSBasic::ScreenshotSelectedSource()
+{
+	OBSSceneItem item = GetCurrentSceneItem();
+	if (item) {
+		Screenshot(obs_sceneitem_get_source(item));
+	} else {
+		blog(LOG_INFO, "Could not take a source screenshot: "
+			       "no source selected");
+	}
+}
+
+void OBSBasic::ScreenshotProgram()
+{
+	Screenshot(GetProgramSource());
+}
+
+void OBSBasic::ScreenshotScene()
+{
+	Screenshot(GetCurrentSceneSource());
+}

obs-studio-25.0.8.tar.xz/UI/window-basic-main-transitions.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main-transitions.cpp Changed

@@ -50,6 +50,7 @@
 
 void OBSBasic::InitDefaultTransitions()
 {
+	ui->transitions->blockSignals(true);
 	std::vector<OBSSource> transitions;
 	size_t idx = 0;
 	const char *id;
@@ -57,9 +58,9 @@
 	/* automatically add transitions that have no configuration (things
 	 * such as cut/fade/etc) */
 	while (obs_enum_transition_types(idx++, &id)) {
-		if (!obs_is_source_configurable(id)) {
-			const char *name = obs_source_get_display_name(id);
+		const char *name = obs_source_get_display_name(id);
 
+		if (!obs_is_source_configurable(id)) {
 			obs_source_t *tr =
 				obs_source_create_private(id, name, NULL);
 			InitTransition(tr);
@@ -67,15 +68,28 @@
 
 			if (strcmp(id, "fade_transition") == 0)
 				fadeTransition = tr;
+			else if (strcmp(id, "cut_transition") == 0)
+				cutTransition = tr;
 
 			obs_source_release(tr);
+		} else {
+			QString addString = QTStr("Add") +
+					    QStringLiteral(": ") +
+					    QT_UTF8(name);
+			ui->transitions->addItem(
+				addString,
+				QVariant::fromValue(QString(QT_UTF8(id))));
 		}
 	}
 
+	if (ui->transitions->count())
+		ui->transitions->insertSeparator(ui->transitions->count());
+
 	for (OBSSource &tr : transitions) {
 		ui->transitions->addItem(QT_UTF8(obs_source_get_name(tr)),
 					 QVariant::fromValue(OBSSource(tr)));
 	}
+	ui->transitions->blockSignals(false);
 }
 
 void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt)
@@ -171,15 +185,12 @@
 {
 	/* non-configurable transitions are always available, so add them
 	 * to the "default quick transitions" list */
-	quickTransitions.emplace_back(GetTransitionComboItem(ui->transitions,
-							     0),
-				      300, quickTransitionIdCounter++);
-	quickTransitions.emplace_back(GetTransitionComboItem(ui->transitions,
-							     1),
-				      300, quickTransitionIdCounter++);
-	quickTransitions.emplace_back(GetTransitionComboItem(ui->transitions,
-							     1),
-				      300, quickTransitionIdCounter++, true);
+	quickTransitions.emplace_back(cutTransition, 300,
+				      quickTransitionIdCounter++);
+	quickTransitions.emplace_back(fadeTransition, 300,
+				      quickTransitionIdCounter++);
+	quickTransitions.emplace_back(fadeTransition, 300,
+				      quickTransitionIdCounter++, true);
 }
 
 void OBSBasic::LoadQuickTransitions(obs_data_array_t *array)
@@ -246,9 +257,11 @@
 {
 	for (int i = 0; i < ui->transitions->count(); i++) {
 		OBSSource tr = ui->transitions->itemData(i).value<OBSSource>();
+		if (!tr)
+			continue;
 
 		const char *trName = obs_source_get_name(tr);
-		if (strcmp(trName, name) == 0)
+		if (trName && *trName && strcmp(trName, name) == 0)
 			return tr;
 	}
 
@@ -408,6 +421,10 @@
 void OBSBasic::SetTransition(OBSSource transition)
 {
 	obs_source_t *oldTransition = obs_get_output_source(0);
+	obs_source_release(oldTransition);
+
+	if (transition == oldTransition)
+		return;
 
 	if (oldTransition && transition) {
 		obs_transition_swap_begin(transition, oldTransition);
@@ -419,17 +436,15 @@
 		obs_set_output_source(0, transition);
 	}
 
-	if (oldTransition)
-		obs_source_release(oldTransition);
-
 	bool fixed = transition ? obs_transition_fixed(transition) : false;
 	ui->transitionDurationLabel->setVisible(!fixed);
 	ui->transitionDuration->setVisible(!fixed);
 
 	bool configurable = obs_source_configurable(transition);
-	ui->transitionRemove->setEnabled(configurable);
 	ui->transitionProps->setEnabled(configurable);
 
+	SetComboTransition(ui->transitions, transition);
+
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_TRANSITION_CHANGED);
 }
@@ -442,17 +457,21 @@
 void OBSBasic::on_transitions_currentIndexChanged(int)
 {
 	OBSSource transition = GetCurrentTransition();
-	SetTransition(transition);
+
+	if (transition)
+		SetTransition(transition);
+	else
+		AddTransition(ui->transitions->currentData().value<QString>());
 }
 
-void OBSBasic::AddTransition()
+void OBSBasic::AddTransition(QString id)
 {
-	QAction *action = reinterpret_cast<QAction *>(sender());
-	QString idStr = action->property("id").toString();
+	if (id.isEmpty())
+		return;
 
 	string name;
 	QString placeHolderText =
-		QT_UTF8(obs_source_get_display_name(QT_TO_UTF8(idStr)));
+		QT_UTF8(obs_source_get_display_name(QT_TO_UTF8(id)));
 	QString format = placeHolderText + " (%1)";
 	obs_source_t *source = nullptr;
 	int i = 1;
@@ -471,7 +490,7 @@
 			OBSMessageBox::warning(this,
 					       QTStr("NoNameEntered.Title"),
 					       QTStr("NoNameEntered.Text"));
-			AddTransition();
+			AddTransition(id);
 			return;
 		}
 
@@ -480,12 +499,12 @@
 			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(QT_TO_UTF8(id), name.c_str(),
+						   NULL);
 		InitTransition(source);
 		ui->transitions->addItem(
 			QT_UTF8(name.c_str()),
@@ -500,34 +519,13 @@
 
 		ClearQuickTransitionWidgets();
 		RefreshQuickTransitions();
+	} else {
+		obs_source_t *transition = obs_get_output_source(0);
+		SetComboTransition(ui->transitions, transition);
+		obs_source_release(transition);
 	}
 }
 
-void OBSBasic::on_transitionAdd_clicked()
-{
-	bool foundConfigurableTransitions = false;
-	QMenu menu(this);
-	size_t idx = 0;
-	const char *id;
-
-	while (obs_enum_transition_types(idx++, &id)) {
-		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()));
-
-			menu.addAction(action);
-			foundConfigurableTransitions = true;
-		}
-	}
-
-	if (foundConfigurableTransitions)
-		menu.exec(QCursor::pos());
-}
-
 void OBSBasic::on_transitionRemove_clicked()
 {
 	OBSSource tr = GetCurrentTransition();
@@ -624,6 +622,11 @@
 	action->setProperty("transition", QVariant::fromValue(source));
 	menu.addAction(action);
 
+	action = new QAction(QTStr("Remove"), &menu);
+	connect(action, SIGNAL(triggered()), this,
+		SLOT(on_transitionRemove_clicked()));
+	menu.addAction(action);
+
 	action = new QAction(QTStr("Properties"), &menu);
 	connect(action, &QAction::triggered, properties);
 	menu.addAction(action);
@@ -708,10 +711,12 @@
 
 	UpdateSceneSelection(scene);
 
-	bool userSwitched = (!force && !disableSaving);
-	blog(LOG_INFO, "%s to scene '%s'",
-	     userSwitched ? "User switched" : "Switched",
-	     obs_source_get_name(scene));
+	if (scene) {
+		bool userSwitched = (!force && !disableSaving);
+		blog(LOG_INFO, "%s to scene '%s'",
+		     userSwitched ? "User switched" : "Switched",
+		     obs_source_get_name(scene));
+	}
 }
 
 void OBSBasic::CreateProgramDisplay()
@@ -915,6 +920,8 @@
 	OBSSource transition = obs_get_output_source(0);
 	obs_source_release(transition);
 
+	tBar->setValue(value);
+
 	if (!tBarActive) {
 		OBSSource sceneSource = GetCurrentSceneSource();
 		OBSSource tBarTr = GetOverrideTransition(sceneSource);
@@ -985,9 +992,11 @@
 		}
 
 		OBSSource tr = GetTransitionComboItem(ui->transitions, idx);
-		const char *name = obs_source_get_name(tr);
 
-		obs_data_set_string(data, "transition", name);
+		if (tr) {
+			const char *name = obs_source_get_name(tr);
+			obs_data_set_string(data, "transition", name);
+		}
 	};
 
 	auto setDuration = [this](int duration) {
@@ -1007,6 +1016,8 @@
 		if (i >= 0) {
 			OBSSource tr;
 			tr = GetTransitionComboItem(ui->transitions, i);
+			if (!tr)
+				continue;
 			name = obs_source_get_name(tr);
 		}
 
@@ -1062,10 +1073,9 @@
 			this, &OBSBasic::QuickTransitionChangeDuration);
 	}
 
-	tr = GetTransitionComboItem(ui->transitions, 1);
+	tr = fadeTransition;
 
 	action = menu->addAction(QTStr("FadeToBlack"));
-	action->setProperty("transition_index", 1);
 	action->setProperty("fadeToBlack", true);
 
 	if (qt) {
@@ -1082,6 +1092,9 @@
 	for (int i = 0; i < ui->transitions->count(); i++) {
 		tr = GetTransitionComboItem(ui->transitions, i);
 
+		if (!tr)
+			continue;
+
 		action = menu->addAction(obs_source_get_name(tr));
 		action->setProperty("transition_index", i);
 
@@ -1151,12 +1164,18 @@
 {
 	int trIdx = sender()->property("transition_index").toInt();
 	QSpinBox *duration = sender()->property("duration").value<QSpinBox *>();
-	bool toBlack = sender()->property("fadeToBlack").value<bool>();
-	OBSSource transition = GetTransitionComboItem(ui->transitions, trIdx);
+	bool fadeToBlack = sender()->property("fadeToBlack").value<bool>();
+	OBSSource transition =
+		fadeToBlack ? OBSSource(fadeTransition)
+			    : GetTransitionComboItem(ui->transitions, trIdx);
+
+	if (!transition)
+		return;
+
 	int id = quickTransitionIdCounter++;
 
 	quickTransitions.emplace_back(transition, duration->value(), id,
-				      toBlack);
+				      fadeToBlack);
 	AddQuickTransitionId(id);
 
 	int idx = (int)quickTransitions.size() - 1;
@@ -1202,11 +1221,18 @@
 {
 	int id = sender()->property("id").toInt();
 	int trIdx = sender()->property("transition_index").toInt();
+	bool fadeToBlack = sender()->property("fadeToBlack").value<bool>();
 	QuickTransition *qt = GetQuickTransition(id);
 
 	if (qt) {
-		qt->source = GetTransitionComboItem(ui->transitions, trIdx);
-		ResetQuickTransitionText(qt);
+		OBSSource tr = fadeToBlack
+				       ? OBSSource(fadeTransition)
+				       : GetTransitionComboItem(ui->transitions,
+								trIdx);
+		if (tr) {
+			qt->source = tr;
+			ResetQuickTransitionText(qt);
+		}
 	}
 }
 
@@ -1480,7 +1506,7 @@
 
 	for (int i = 0; i < ui->transitions->count(); i++) {
 		OBSSource tr = ui->transitions->itemData(i).value<OBSSource>();
-		if (!obs_source_configurable(tr))
+		if (!tr || !obs_source_configurable(tr))
 			continue;
 
 		obs_data_t *sourceData = obs_data_create();
@@ -1517,8 +1543,6 @@
 			ui->transitions->addItem(
 				QT_UTF8(name),
 				QVariant::fromValue(OBSSource(source)));
-			ui->transitions->setCurrentIndex(
-				ui->transitions->count() - 1);
 		}
 
 		obs_data_release(settings);

obs-studio-25.0.8.tar.xz/UI/window-basic-main.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main.cpp Changed

@@ -52,10 +52,13 @@
 #include "window-projector.hpp"
 #include "window-remux.hpp"
 #include "qt-wrappers.hpp"
+#include "context-bar-controls.hpp"
+#include "obs-proxy-style.hpp"
 #include "display-helpers.hpp"
 #include "volume-control.hpp"
 #include "remote-text.hpp"
 #include "ui-validation.hpp"
+#include "media-controls.hpp"
 #include <fstream>
 #include <sstream>
 
@@ -185,7 +188,6 @@
 }
 
 extern void RegisterTwitchAuth();
-extern void RegisterMixerAuth();
 extern void RegisterRestreamAuth();
 
 OBSBasic::OBSBasic(QWidget *parent)
@@ -199,9 +201,6 @@
 #if TWITCH_ENABLED
 	RegisterTwitchAuth();
 #endif
-#if MIXER_ENABLED
-	RegisterMixerAuth();
-#endif
 #if RESTREAM_ENABLED
 	RegisterRestreamAuth();
 #endif
@@ -216,12 +215,15 @@
 
 	ui->setupUi(this);
 	ui->previewDisabledWidget->setVisible(false);
+	ui->contextContainer->setStyle(new OBSProxyStyle);
 
 	startingDockLayout = saveState();
 
 	statsDock = new OBSDock();
 	statsDock->setObjectName(QStringLiteral("statsDock"));
-	statsDock->setFeatures(QDockWidget::AllDockWidgetFeatures);
+	statsDock->setFeatures(QDockWidget::DockWidgetClosable |
+			       QDockWidget::DockWidgetMovable |
+			       QDockWidget::DockWidgetFloatable);
 	statsDock->setWindowTitle(QTStr("Basic.Stats"));
 	addDockWidget(Qt::BottomDockWidgetArea, statsDock);
 	statsDock->setVisible(false);
@@ -299,12 +301,12 @@
 	connect(diskFullTimer, SIGNAL(timeout()), this,
 		SLOT(CheckDiskSpaceRemaining()));
 
-	QAction *renameScene = new QAction(ui->scenesDock);
+	renameScene = new QAction(ui->scenesDock);
 	renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 	connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName()));
 	ui->scenesDock->addAction(renameScene);
 
-	QAction *renameSource = new QAction(ui->sourcesDock);
+	renameSource = new QAction(ui->sourcesDock);
 	renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 	connect(renameSource, SIGNAL(triggered()), this,
 		SLOT(EditSceneItemName()));
@@ -354,6 +356,8 @@
 
 	QPoint curPos;
 
+	UpdateContextBar();
+
 	//restore parent window geometry
 	const char *geometry = config_get_string(App()->GlobalConfig(),
 						 "BasicWindow", "geometry");
@@ -379,6 +383,7 @@
 	}
 
 	QPoint curSize(width(), height());
+
 	QPoint statsDockSize(statsDock->width(), statsDock->height());
 	QPoint statsDockPos = curSize / 2 - statsDockSize / 2;
 	QPoint newPos = curPos + statsDockPos;
@@ -402,11 +407,8 @@
 	connect(ui->enablePreviewButton, SIGNAL(clicked()), this,
 		SLOT(TogglePreview()));
 
-	connect(ui->scenes->model(),
-		SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)),
-		this,
-		SLOT(ScenesReordered(const QModelIndex &, int, int,
-				     const QModelIndex &, int)));
+	connect(ui->scenes, SIGNAL(scenesReordered()), this,
+		SLOT(ScenesReordered()));
 }
 
 static void SaveAudioDevice(const char *name, int channel, obs_data_t *parent,
@@ -590,6 +592,7 @@
 
 		obs_data_t *data = obs_data_create();
 		ProjectorType type = projector->GetProjectorType();
+
 		switch (type) {
 		case ProjectorType::Scene:
 		case ProjectorType::Source: {
@@ -601,11 +604,20 @@
 		default:
 			break;
 		}
+
 		obs_data_set_int(data, "monitor", projector->GetMonitor());
 		obs_data_set_int(data, "type", static_cast<int>(type));
 		obs_data_set_string(
 			data, "geometry",
 			projector->saveGeometry().toBase64().constData());
+
+		if (projector->IsAlwaysOnTopOverridden())
+			obs_data_set_bool(data, "alwaysOnTop",
+					  projector->IsAlwaysOnTop());
+
+		obs_data_set_bool(data, "alwaysOnTopOverridden",
+				  projector->IsAlwaysOnTopOverridden());
+
 		obs_data_array_push_back(savedProjectors, data);
 		obs_data_release(data);
 	};
@@ -686,6 +698,16 @@
 		const char *name = obs_source_get_name(source);
 		blog(LOG_INFO, "[Loaded global audio device]: '%s'", name);
 		obs_source_enum_filters(source, LogFilter, (void *)(intptr_t)1);
+		obs_monitoring_type monitoring_type =
+			obs_source_get_monitoring_type(source);
+		if (monitoring_type != OBS_MONITORING_TYPE_NONE) {
+			const char *type = (monitoring_type ==
+					    OBS_MONITORING_TYPE_MONITOR_ONLY)
+						   ? "monitor only"
+						   : "monitor and output";
+
+			blog(LOG_INFO, "    - monitoring: %s", type);
+		}
 		obs_source_release(source);
 	}
 
@@ -792,6 +814,10 @@
 		info->geometry =
 			std::string(obs_data_get_string(data, "geometry"));
 		info->name = std::string(obs_data_get_string(data, "name"));
+		info->alwaysOnTop = obs_data_get_bool(data, "alwaysOnTop");
+		info->alwaysOnTopOverridden =
+			obs_data_get_bool(data, "alwaysOnTopOverridden");
+
 		savedProjectorsArray.emplace_back(info);
 
 		obs_data_release(data);
@@ -879,6 +905,14 @@
 
 	ClearSceneData();
 	InitDefaultTransitions();
+	ClearContextBar();
+
+	if (devicePropertiesThread && devicePropertiesThread->isRunning()) {
+		devicePropertiesThread->wait();
+		devicePropertiesThread.reset();
+	}
+
+	QApplication::sendPostedEvents(this);
 
 	obs_data_t *modulesObj = obs_data_get_obj(data, "modules");
 	if (api)
@@ -1066,6 +1100,12 @@
 		opt_start_replaybuffer = false;
 	}
 
+	if (opt_start_virtualcam) {
+		QMetaObject::invokeMethod(this, "StartVirtualCam",
+					  Qt::QueuedConnection);
+		opt_start_virtualcam = false;
+	}
+
 	copyStrings.clear();
 	copyFiltersString = nullptr;
 
@@ -1118,6 +1158,9 @@
 	obs_data_t *data =
 		obs_data_create_from_json_file_safe(serviceJsonPath, "bak");
 
+	if (!data)
+		return false;
+
 	obs_data_set_default_string(data, "type", "rtmp_common");
 	type = obs_data_get_string(data, "type");
 
@@ -1348,7 +1391,7 @@
 	config_set_default_uint(basicConfig, "Video", "FPSDen", 1);
 	config_set_default_string(basicConfig, "Video", "ScaleType", "bicubic");
 	config_set_default_string(basicConfig, "Video", "ColorFormat", "NV12");
-	config_set_default_string(basicConfig, "Video", "ColorSpace", "601");
+	config_set_default_string(basicConfig, "Video", "ColorSpace", "709");
 	config_set_default_string(basicConfig, "Video", "ColorRange",
 				  "Partial");
 
@@ -1358,7 +1401,7 @@
 		basicConfig, "Audio", "MonitoringDeviceName",
 		Str("Basic.Settings.Advanced.Audio.MonitoringDevice"
 		    ".Default"));
-	config_set_default_uint(basicConfig, "Audio", "SampleRate", 44100);
+	config_set_default_uint(basicConfig, "Audio", "SampleRate", 48000);
 	config_set_default_string(basicConfig, "Audio", "ChannelSetup",
 				  "Stereo");
 	config_set_default_double(basicConfig, "Audio", "MeterDecayRate",
@@ -1501,6 +1544,18 @@
 		StartReplayBuffer();
 };
 
+void OBSBasic::AddVCamButton()
+{
+	vcamButton = new ReplayBufferButton(QTStr("Basic.Main.StartVirtualCam"),
+					    this);
+	vcamButton->setCheckable(true);
+	connect(vcamButton.data(), &QPushButton::clicked, this,
+		&OBSBasic::VCamButtonClicked);
+
+	vcamButton->setProperty("themeID", "vcamButton");
+	ui->buttonsVLayout->insertWidget(2, vcamButton);
+}
+
 void OBSBasic::ResetOutputs()
 {
 	ProfileScope("OBSBasic::ResetOutputs");
@@ -1524,6 +1579,9 @@
 				&QPushButton::clicked, this,
 				&OBSBasic::ReplayBufferClicked);
 
+			replayBufferButton->setSizePolicy(QSizePolicy::Ignored,
+							  QSizePolicy::Fixed);
+
 			replayLayout = new QHBoxLayout(this);
 			replayLayout->addWidget(replayBufferButton);
 
@@ -1625,6 +1683,13 @@
 	cef = obs_browser_init_panel();
 #endif
 
+	obs_data_t *obsData = obs_get_private_data();
+	vcamEnabled = obs_data_get_bool(obsData, "vcamEnabled");
+	if (vcamEnabled) {
+		AddVCamButton();
+	}
+	obs_data_release(obsData);
+
 	InitBasicConfigDefaults2();
 
 	CheckForSimpleModeX264Fallback();
@@ -1646,6 +1711,15 @@
 	editPropertiesMode = config_get_bool(
 		App()->GlobalConfig(), "BasicWindow", "EditPropertiesMode");
 
+	if (!opt_studio_mode) {
+		SetPreviewProgramMode(config_get_bool(App()->GlobalConfig(),
+						      "BasicWindow",
+						      "PreviewProgramMode"));
+	} else {
+		SetPreviewProgramMode(true);
+		opt_studio_mode = false;
+	}
+
 #define SET_VISIBILITY(name, control)                                         \
 	do {                                                                  \
 		if (config_has_user_value(App()->GlobalConfig(),              \
@@ -1664,6 +1738,18 @@
 		GetGlobalConfig(), "BasicWindow", "ShowSourceIcons");
 	ui->toggleSourceIcons->setChecked(sourceIconsVisible);
 
+	if (config_has_user_value(App()->GlobalConfig(), "BasicWindow",
+				  "ShowContextToolbars")) {
+		bool visible = config_get_bool(App()->GlobalConfig(),
+					       "BasicWindow",
+					       "ShowContextToolbars");
+		ui->toggleContextBar->setChecked(visible);
+		ui->contextContainer->setVisible(visible);
+	} else {
+		ui->toggleContextBar->setChecked(true);
+		ui->contextContainer->setVisible(true);
+	}
+
 	{
 		ProfileScope("OBSBasic::Load");
 		disableSaving--;
@@ -1746,6 +1832,7 @@
 
 	const char *dockStateStr = config_get_string(
 		App()->GlobalConfig(), "BasicWindow", "DockState");
+
 	if (!dockStateStr) {
 		on_resetUI_triggered();
 	} else {
@@ -1791,23 +1878,9 @@
 		config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
 	}
 
-	if (!first_run && !has_last_version && !Active()) {
-		QString msg;
-		msg = QTStr("Basic.FirstStartup.RunWizard");
-
-		QMessageBox::StandardButton button = OBSMessageBox::question(
-			this, QTStr("Basic.AutoConfig"), msg);
-
-		if (button == QMessageBox::Yes) {
-			QMetaObject::invokeMethod(this,
-						  "on_autoConfigure_triggered",
-						  Qt::QueuedConnection);
-		} else {
-			msg = QTStr("Basic.FirstStartup.RunWizard.NoClicked");
-			OBSMessageBox::information(
-				this, QTStr("Basic.AutoConfig"), msg);
-		}
-	}
+	if (!first_run && !has_last_version && !Active())
+		QMetaObject::invokeMethod(this, "on_autoConfigure_triggered",
+					  Qt::QueuedConnection);
 
 	ToggleMixerLayout(config_get_bool(App()->GlobalConfig(), "BasicWindow",
 					  "VerticalVolControl"));
@@ -1833,15 +1906,6 @@
 
 	ui->sources->UpdateIcons();
 
-	if (!opt_studio_mode) {
-		SetPreviewProgramMode(config_get_bool(App()->GlobalConfig(),
-						      "BasicWindow",
-						      "PreviewProgramMode"));
-	} else {
-		SetPreviewProgramMode(true);
-		opt_studio_mode = false;
-	}
-
 #if !defined(_WIN32) && !defined(__APPLE__)
 	delete ui->actionShowCrashLogs;
 	delete ui->actionUploadLastCrashLog;
@@ -1851,10 +1915,15 @@
 	ui->actionUploadLastCrashLog = nullptr;
 	ui->menuCrashLogs = nullptr;
 	ui->actionCheckForUpdates = nullptr;
+#elif _WIN32 || __APPLE__
+	if (App()->IsUpdaterDisabled())
+		ui->actionCheckForUpdates->setEnabled(false);
 #endif
 
 	OnFirstLoad();
 
+	activateWindow();
+
 #ifdef __APPLE__
 	QMetaObject::invokeMethod(this, "DeferredSysTrayLoad",
 				  Qt::QueuedConnection, Q_ARG(int, 10));
@@ -1870,18 +1939,24 @@
 	/* Attempt to load init screen if available */
 	if (cef) {
 		WhatsNewInfoThread *wnit = new WhatsNewInfoThread();
-		if (wnit) {
-			connect(wnit, &WhatsNewInfoThread::Result, this,
-				&OBSBasic::ReceivedIntroJson);
-		}
-		if (wnit) {
-			introCheckThread.reset(wnit);
-			introCheckThread->start();
-		}
+		connect(wnit, &WhatsNewInfoThread::Result, this,
+			&OBSBasic::ReceivedIntroJson);
+
+		introCheckThread.reset(wnit);
+		introCheckThread->start();
 	}
 #endif
 
 	Auth::Load();
+
+	bool showLogViewerOnStartup = config_get_bool(
+		App()->GlobalConfig(), "LogViewer", "ShowLogStartup");
+
+	if (showLogViewerOnStartup) {
+		if (!logView)
+			logView = new OBSLogViewer();
+		logView->show();
+	}
 }
 
 void OBSBasic::DeferredSysTrayLoad(int requeueCount)
@@ -1983,14 +2058,13 @@
 
 	WhatsNewBrowserInitThread *wnbit =
 		new WhatsNewBrowserInitThread(QT_UTF8(info_url.c_str()));
-	if (wnbit) {
-		connect(wnbit, &WhatsNewBrowserInitThread::Result, this,
-			&OBSBasic::ShowWhatsNew);
-	}
-	if (wnbit) {
-		whatsNewInitThread.reset(wnbit);
-		whatsNewInitThread->start();
-	}
+
+	connect(wnbit, &WhatsNewBrowserInitThread::Result, this,
+		&OBSBasic::ShowWhatsNew);
+
+	whatsNewInitThread.reset(wnbit);
+	whatsNewInitThread->start();
+
 #else
 	UNUSED_PARAMETER(text);
 #endif
@@ -2235,6 +2309,23 @@
 	LoadHotkeyPair(replayBufHotkeys, "OBSBasic.StartReplayBuffer",
 		       "OBSBasic.StopReplayBuffer");
 
+	if (vcamEnabled) {
+		vcamHotkeys = obs_hotkey_pair_register_frontend(
+			"OBSBasic.StartVirtualCam",
+			Str("Basic.Main.StartVirtualCam"),
+			"OBSBasic.StopVirtualCam",
+			Str("Basic.Main.StopVirtualCam"),
+			MAKE_CALLBACK(!basic.outputHandler->VirtualCamActive(),
+				      basic.StartVirtualCam,
+				      "Starting virtual camera"),
+			MAKE_CALLBACK(basic.outputHandler->VirtualCamActive(),
+				      basic.StopVirtualCam,
+				      "Stopping virtual camera"),
+			this, this);
+		LoadHotkeyPair(vcamHotkeys, "OBSBasic.StartVirtualCam",
+			       "OBSBasic.StopVirtualCam");
+	}
+
 	togglePreviewHotkeys = obs_hotkey_pair_register_frontend(
 		"OBSBasic.EnablePreview",
 		Str("Basic.Main.PreviewConextMenu.Enable"),
@@ -2246,6 +2337,17 @@
 		this, this);
 	LoadHotkeyPair(togglePreviewHotkeys, "OBSBasic.EnablePreview",
 		       "OBSBasic.DisablePreview");
+
+	contextBarHotkeys = obs_hotkey_pair_register_frontend(
+		"OBSBasic.ShowContextBar", Str("Basic.Main.ShowContextBar"),
+		"OBSBasic.HideContextBar", Str("Basic.Main.HideContextBar"),
+		MAKE_CALLBACK(!basic.ui->contextContainer->isVisible(),
+			      basic.ShowContextBar, "Showing Context Bar"),
+		MAKE_CALLBACK(basic.ui->contextContainer->isVisible(),
+			      basic.HideContextBar, "Hiding Context Bar"),
+		this, this);
+	LoadHotkeyPair(contextBarHotkeys, "OBSBasic.ShowContextBar",
+		       "OBSBasic.HideContextBar");
 #undef MAKE_CALLBACK
 
 	auto togglePreviewProgram = [](void *data, obs_hotkey_id,
@@ -2286,6 +2388,31 @@
 		"OBSBasic.ResetStats", Str("Basic.Stats.ResetStats"),
 		resetStats, this);
 	LoadHotkey(statsHotkey, "OBSBasic.ResetStats");
+
+	auto screenshot = [](void *data, obs_hotkey_id, obs_hotkey_t *,
+			     bool pressed) {
+		if (pressed)
+			QMetaObject::invokeMethod(static_cast<OBSBasic *>(data),
+						  "Screenshot",
+						  Qt::QueuedConnection);
+	};
+
+	screenshotHotkey = obs_hotkey_register_frontend(
+		"OBSBasic.Screenshot", Str("Screenshot"), screenshot, this);
+	LoadHotkey(screenshotHotkey, "OBSBasic.Screenshot");
+
+	auto screenshotSource = [](void *data, obs_hotkey_id, obs_hotkey_t *,
+				   bool pressed) {
+		if (pressed)
+			QMetaObject::invokeMethod(static_cast<OBSBasic *>(data),
+						  "ScreenshotSelectedSource",
+						  Qt::QueuedConnection);
+	};
+
+	sourceScreenshotHotkey = obs_hotkey_register_frontend(
+		"OBSBasic.SelectedSourceScreenshot",
+		Str("Screenshot.SourceHotkey"), screenshotSource, this);
+	LoadHotkey(sourceScreenshotHotkey, "OBSBasic.SelectedSourceScreenshot");
 }
 
 void OBSBasic::ClearHotkeys()
@@ -2299,6 +2426,8 @@
 	obs_hotkey_unregister(togglePreviewProgramHotkey);
 	obs_hotkey_unregister(transitionHotkey);
 	obs_hotkey_unregister(statsHotkey);
+	obs_hotkey_unregister(screenshotHotkey);
+	obs_hotkey_unregister(sourceScreenshotHotkey);
 }
 
 OBSBasic::~OBSBasic()
@@ -2309,6 +2438,8 @@
 	if (updateCheckThread && updateCheckThread->isRunning())
 		updateCheckThread->wait();
 
+	delete screenshotData;
+	delete logView;
 	delete multiviewProjectorMenu;
 	delete previewProjector;
 	delete studioProgramProjector;
@@ -2518,8 +2649,12 @@
 
 void OBSBasic::CreateInteractionWindow(obs_source_t *source)
 {
+	bool closed = true;
 	if (interaction)
-		interaction->close();
+		closed = interaction->close();
+
+	if (!closed)
+		return;
 
 	interaction = new OBSBasicInteraction(this, source);
 	interaction->Init();
@@ -2528,8 +2663,12 @@
 
 void OBSBasic::CreatePropertiesWindow(obs_source_t *source)
 {
+	bool closed = true;
 	if (properties)
-		properties->close();
+		closed = properties->close();
+
+	if (!closed)
+		return;
 
 	properties = new OBSBasicProperties(this, source);
 	properties->Init();
@@ -2538,8 +2677,12 @@
 
 void OBSBasic::CreateFiltersWindow(obs_source_t *source)
 {
+	bool closed = true;
 	if (filters)
-		filters->close();
+		closed = filters->close();
+
+	if (!closed)
+		return;
 
 	filters = new OBSBasicFilters(this, source);
 	filters->Init();
@@ -2580,11 +2723,6 @@
 	container.handlers.assign({
 		std::make_shared<OBSSignal>(handler, "item_add",
 					    OBSBasic::SceneItemAdded, this),
-		std::make_shared<OBSSignal>(handler, "item_select",
-					    OBSBasic::SceneItemSelected, this),
-		std::make_shared<OBSSignal>(handler, "item_deselect",
-					    OBSBasic::SceneItemDeselected,
-					    this),
 		std::make_shared<OBSSignal>(handler, "reorder",
 					    OBSBasic::SceneReordered, this),
 		std::make_shared<OBSSignal>(handler, "refresh",
@@ -2752,16 +2890,123 @@
 	obs_scene_t *scene = obs_scene_from_source(source);
 	if (scene)
 		OBSProjector::UpdateMultiviewProjectors();
+
+	UpdateContextBar();
 }
 
-void OBSBasic::SelectSceneItem(OBSScene scene, OBSSceneItem item, bool select)
+void OBSBasic::ClearContextBar()
 {
-	SignalBlocker sourcesSignalBlocker(ui->sources);
+	QLayoutItem *la = ui->emptySpace->layout()->itemAt(0);
+	if (la) {
+		delete la->widget();
+		ui->emptySpace->layout()->removeItem(la);
+	}
+}
 
-	if (scene != GetCurrentScene() || ignoreSelectionUpdate)
-		return;
+static bool is_network_media_source(obs_source_t *source, const char *id)
+{
+	if (strcmp(id, "ffmpeg_source") != 0)
+		return false;
 
-	ui->sources->SelectItem(item, select);
+	obs_data_t *s = obs_source_get_settings(source);
+	bool is_local_file = obs_data_get_bool(s, "is_local_file");
+	obs_data_release(s);
+
+	return !is_local_file;
+}
+
+void OBSBasic::UpdateContextBar()
+{
+	OBSSceneItem item = GetCurrentSceneItem();
+
+	ClearContextBar();
+
+	if (item) {
+		obs_source_t *source = obs_sceneitem_get_source(item);
+		const char *id = obs_source_get_unversioned_id(source);
+		uint32_t flags = obs_source_get_output_flags(source);
+
+		if (flags & OBS_SOURCE_CONTROLLABLE_MEDIA) {
+			if (!is_network_media_source(source, id)) {
+				MediaControls *mediaControls =
+					new MediaControls(ui->emptySpace);
+				mediaControls->SetSource(source);
+
+				ui->emptySpace->layout()->addWidget(
+					mediaControls);
+			}
+		} else if (strcmp(id, "browser_source") == 0) {
+			BrowserToolbar *c =
+				new BrowserToolbar(ui->emptySpace, source);
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "wasapi_input_capture") == 0 ||
+			   strcmp(id, "wasapi_output_capture") == 0 ||
+			   strcmp(id, "coreaudio_input_capture") == 0 ||
+			   strcmp(id, "coreaudio_output_capture") == 0 ||
+			   strcmp(id, "pulse_input_capture") == 0 ||
+			   strcmp(id, "pulse_output_capture") == 0 ||
+			   strcmp(id, "alsa_input_capture") == 0) {
+			AudioCaptureToolbar *c =
+				new AudioCaptureToolbar(ui->emptySpace, source);
+			c->Init();
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "window_capture") == 0 ||
+			   strcmp(id, "xcomposite_input") == 0) {
+			WindowCaptureToolbar *c = new WindowCaptureToolbar(
+				ui->emptySpace, source);
+			c->Init();
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "monitor_capture") == 0 ||
+			   strcmp(id, "display_capture") == 0 ||
+			   strcmp(id, "xshm_input") == 0) {
+			DisplayCaptureToolbar *c = new DisplayCaptureToolbar(
+				ui->emptySpace, source);
+			c->Init();
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "dshow_input") == 0) {
+			DeviceCaptureToolbar *c = new DeviceCaptureToolbar(
+				ui->emptySpace, source);
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "game_capture") == 0) {
+			GameCaptureToolbar *c =
+				new GameCaptureToolbar(ui->emptySpace, source);
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "image_source") == 0) {
+			ImageSourceToolbar *c =
+				new ImageSourceToolbar(ui->emptySpace, source);
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "color_source") == 0) {
+			ColorSourceToolbar *c =
+				new ColorSourceToolbar(ui->emptySpace, source);
+			ui->emptySpace->layout()->addWidget(c);
+
+		} else if (strcmp(id, "text_ft2_source") == 0 ||
+			   strcmp(id, "text_gdiplus") == 0) {
+			TextSourceToolbar *c =
+				new TextSourceToolbar(ui->emptySpace, source);
+			ui->emptySpace->layout()->addWidget(c);
+		}
+
+		const char *name = obs_source_get_name(source);
+		ui->contextSourceLabel->setText(name);
+
+		ui->sourceFiltersButton->setEnabled(true);
+		ui->sourcePropertiesButton->setEnabled(
+			obs_source_configurable(source));
+	} else {
+		ui->contextSourceLabel->setText(
+			QTStr("ContextBar.NoSelectedSource"));
+
+		ui->sourceFiltersButton->setEnabled(false);
+		ui->sourcePropertiesButton->setEnabled(false);
+	}
 }
 
 static inline bool SourceMixerHidden(obs_source_t *source)
@@ -3166,8 +3411,9 @@
 
 	QMessageBox remove_source(this);
 	remove_source.setText(text);
-	QAbstractButton *Yes =
+	QPushButton *Yes =
 		remove_source.addButton(QTStr("Yes"), QMessageBox::YesRole);
+	remove_source.setDefaultButton(Yes);
 	remove_source.addButton(QTStr("No"), QMessageBox::NoRole);
 	remove_source.setIcon(QMessageBox::Question);
 	remove_source.setWindowTitle(QTStr("ConfirmRemove.Title"));
@@ -3185,6 +3431,8 @@
 
 void OBSBasic::TimedCheckForUpdates()
 {
+	if (App()->IsUpdaterDisabled())
+		return;
 	if (!config_get_bool(App()->GlobalConfig(), "General",
 			     "EnableAutoUpdates"))
 		return;
@@ -3363,31 +3611,6 @@
 				  Q_ARG(OBSSceneItem, OBSSceneItem(item)));
 }
 
-void OBSBasic::SceneItemSelected(void *data, calldata_t *params)
-{
-	OBSBasic *window = static_cast<OBSBasic *>(data);
-
-	obs_scene_t *scene = (obs_scene_t *)calldata_ptr(params, "scene");
-	obs_sceneitem_t *item = (obs_sceneitem_t *)calldata_ptr(params, "item");
-
-	QMetaObject::invokeMethod(window, "SelectSceneItem",
-				  Q_ARG(OBSScene, scene),
-				  Q_ARG(OBSSceneItem, item), Q_ARG(bool, true));
-}
-
-void OBSBasic::SceneItemDeselected(void *data, calldata_t *params)
-{
-	OBSBasic *window = static_cast<OBSBasic *>(data);
-
-	obs_scene_t *scene = (obs_scene_t *)calldata_ptr(params, "scene");
-	obs_sceneitem_t *item = (obs_sceneitem_t *)calldata_ptr(params, "item");
-
-	QMetaObject::invokeMethod(window, "SelectSceneItem",
-				  Q_ARG(OBSScene, scene),
-				  Q_ARG(OBSSceneItem, item),
-				  Q_ARG(bool, false));
-}
-
 void OBSBasic::SourceCreated(void *data, calldata_t *params)
 {
 	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");
@@ -3692,8 +3915,11 @@
 	ovi.output_height =
 		(uint32_t)config_get_uint(basicConfig, "Video", "OutputCY");
 	ovi.output_format = GetVideoFormatFromName(colorFormat);
-	ovi.colorspace = astrcmpi(colorSpace, "601") == 0 ? VIDEO_CS_601
-							  : VIDEO_CS_709;
+	ovi.colorspace = astrcmpi(colorSpace, "601") == 0
+				 ? VIDEO_CS_601
+				 : (astrcmpi(colorSpace, "709") == 0
+					    ? VIDEO_CS_709
+					    : VIDEO_CS_SRGB);
 	ovi.range = astrcmpi(colorRange, "Full") == 0 ? VIDEO_RANGE_FULL
 						      : VIDEO_RANGE_PARTIAL;
 	ovi.adapter =
@@ -3701,14 +3927,14 @@
 	ovi.gpu_conversion = true;
 	ovi.scale_type = GetScaleType(basicConfig);
 
-	if (ovi.base_width == 0 || ovi.base_height == 0) {
+	if (ovi.base_width < 8 || ovi.base_height < 8) {
 		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 == 0 || ovi.output_height == 0) {
+	if (ovi.output_width < 8 || ovi.output_height < 8) {
 		ovi.output_width = ovi.base_width;
 		ovi.output_height = ovi.base_height;
 		config_set_uint(basicConfig, "Video", "OutputCX",
@@ -3887,6 +4113,16 @@
 	}
 }
 
+void OBSBasic::ClearProjectors()
+{
+	for (size_t i = 0; i < projectors.size(); i++) {
+		if (projectors[i])
+			delete projectors[i];
+	}
+
+	projectors.clear();
+}
+
 void OBSBasic::ClearSceneData()
 {
 	disableSaving++;
@@ -3899,19 +4135,11 @@
 	ClearQuickTransitions();
 	ui->transitions->clear();
 
-	for (size_t i = 0; i < projectors.size(); i++) {
-		if (projectors[i])
-			delete projectors[i];
-	}
+	ClearProjectors();
 
-	projectors.clear();
+	for (int i = 0; i < MAX_CHANNELS; i++)
+		obs_set_output_source(i, nullptr);
 
-	obs_set_output_source(0, nullptr);
-	obs_set_output_source(1, nullptr);
-	obs_set_output_source(2, nullptr);
-	obs_set_output_source(3, nullptr);
-	obs_set_output_source(4, nullptr);
-	obs_set_output_source(5, nullptr);
 	lastScene = nullptr;
 	swapScene = nullptr;
 	programScene = nullptr;
@@ -3980,6 +4208,12 @@
 		updateCheckThread->wait();
 	if (logUploadThread)
 		logUploadThread->wait();
+	if (devicePropertiesThread && devicePropertiesThread->isRunning()) {
+		devicePropertiesThread->wait();
+		devicePropertiesThread.reset();
+	}
+
+	QApplication::sendPostedEvents(this);
 
 	signalHandlers.clear();
 
@@ -4158,11 +4392,14 @@
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
 
+	UpdateContextBar();
+
 	UNUSED_PARAMETER(prev);
 }
 
 void OBSBasic::EditSceneName()
 {
+	ui->scenesDock->removeAction(renameScene);
 	QListWidgetItem *item = ui->scenes->currentItem();
 	Qt::ItemFlags flags = item->flags();
 
@@ -4266,6 +4503,8 @@
 			QTStr("SceneWindow"), this, SLOT(OpenSceneWindow()));
 
 		popup.addAction(sceneWindow);
+		popup.addAction(QTStr("Screenshot.Scene"), this,
+				SLOT(ScreenshotScene()));
 		popup.addSeparator();
 		popup.addAction(QTStr("Filters"), this,
 				SLOT(OpenSceneFilters()));
@@ -4617,6 +4856,9 @@
 
 		popup.addAction(previewWindow);
 
+		popup.addAction(QTStr("Screenshot.Preview"), this,
+				SLOT(ScreenshotScene()));
+
 		popup.addSeparator();
 	}
 
@@ -4722,7 +4964,7 @@
 
 		resizeOutput->setEnabled(!obs_video_active());
 
-		if (width == 0 || height == 0)
+		if (width < 8 || height < 8)
 			resizeOutput->setEnabled(false);
 
 		scaleFilteringMenu = new QMenu(QTStr("ScaleFiltering"));
@@ -4732,6 +4974,8 @@
 
 		popup.addMenu(sourceProjector);
 		popup.addAction(sourceWindow);
+		popup.addAction(QTStr("Screenshot.Source"), this,
+				SLOT(ScreenshotSelectedSource()));
 		popup.addSeparator();
 
 		action = popup.addAction(QTStr("Interact"), this,
@@ -4929,8 +5173,9 @@
 
 		QMessageBox remove_items(this);
 		remove_items.setText(text);
-		QAbstractButton *Yes = remove_items.addButton(
-			QTStr("Yes"), QMessageBox::YesRole);
+		QPushButton *Yes = remove_items.addButton(QTStr("Yes"),
+							  QMessageBox::YesRole);
+		remove_items.setDefaultButton(Yes);
 		remove_items.addButton(QTStr("No"), QMessageBox::NoRole);
 		remove_items.setIcon(QMessageBox::Question);
 		remove_items.setWindowTitle(QTStr("ConfirmRemove.Title"));
@@ -5024,7 +5269,7 @@
 	return file;
 }
 
-void OBSBasic::UploadLog(const char *subdir, const char *file)
+void OBSBasic::UploadLog(const char *subdir, const char *file, const bool crash)
 {
 	BPtr<char> fileString{ReadLogFile(subdir, file)};
 
@@ -5035,6 +5280,9 @@
 		return;
 
 	ui->menuLogFiles->setEnabled(false);
+#if defined(_WIN32) || defined(__APPLE__)
+	ui->menuCrashLogs->setEnabled(false);
+#endif
 
 	stringstream ss;
 	ss << "OBS " << App()->GetVersionString() << " log file uploaded at "
@@ -5050,8 +5298,13 @@
 				     "text/plain", ss.str().c_str());
 
 	logUploadThread.reset(thread);
-	connect(thread, &RemoteTextThread::Result, this,
-		&OBSBasic::logUploadFinished);
+	if (crash) {
+		connect(thread, &RemoteTextThread::Result, this,
+			&OBSBasic::crashUploadFinished);
+	} else {
+		connect(thread, &RemoteTextThread::Result, this,
+			&OBSBasic::logUploadFinished);
+	}
 	logUploadThread->start();
 }
 
@@ -5067,28 +5320,28 @@
 
 void OBSBasic::on_actionUploadCurrentLog_triggered()
 {
-	UploadLog("obs-studio/logs", App()->GetCurrentLog());
+	UploadLog("obs-studio/logs", App()->GetCurrentLog(), false);
 }
 
 void OBSBasic::on_actionUploadLastLog_triggered()
 {
-	UploadLog("obs-studio/logs", App()->GetLastLog());
+	UploadLog("obs-studio/logs", App()->GetLastLog(), false);
 }
 
 void OBSBasic::on_actionViewCurrentLog_triggered()
 {
-	char logDir[512];
-	if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
-		return;
+	if (!logView)
+		logView = new OBSLogViewer();
 
-	const char *log = App()->GetCurrentLog();
-
-	string path = logDir;
-	path += "/";
-	path += log;
-
-	QUrl url = QUrl::fromLocalFile(QT_UTF8(path.c_str()));
-	QDesktopServices::openUrl(url);
+	if (!logView->isVisible()) {
+		logView->setVisible(true);
+	} else {
+		logView->setWindowState(
+			(logView->windowState() & ~Qt::WindowMinimized) |
+			Qt::WindowActive);
+		logView->activateWindow();
+		logView->raise();
+	}
 }
 
 void OBSBasic::on_actionShowCrashLogs_triggered()
@@ -5103,7 +5356,7 @@
 
 void OBSBasic::on_actionUploadLastCrashLog_triggered()
 {
-	UploadLog("obs-studio/crashes", App()->GetLastCrashLog());
+	UploadLog("obs-studio/crashes", App()->GetLastCrashLog(), true);
 }
 
 void OBSBasic::on_actionCheckForUpdates_triggered()
@@ -5114,6 +5367,9 @@
 void OBSBasic::logUploadFinished(const QString &text, const QString &error)
 {
 	ui->menuLogFiles->setEnabled(true);
+#if defined(_WIN32) || defined(__APPLE__)
+	ui->menuCrashLogs->setEnabled(true);
+#endif
 
 	if (text.isEmpty()) {
 		OBSMessageBox::critical(
@@ -5121,13 +5377,34 @@
 			error);
 		return;
 	}
+	openLogDialog(text, false);
+}
+
+void OBSBasic::crashUploadFinished(const QString &text, const QString &error)
+{
+	ui->menuLogFiles->setEnabled(true);
+#if defined(_WIN32) || defined(__APPLE__)
+	ui->menuCrashLogs->setEnabled(true);
+#endif
+
+	if (text.isEmpty()) {
+		OBSMessageBox::critical(
+			this, QTStr("LogReturnDialog.ErrorUploadingLog"),
+			error);
+		return;
+	}
+	openLogDialog(text, true);
+}
+
+void OBSBasic::openLogDialog(const QString &text, const bool crash)
+{
 
 	obs_data_t *returnData = obs_data_create_from_json(QT_TO_UTF8(text));
 	string resURL = obs_data_get_string(returnData, "url");
 	QString logURL = resURL.c_str();
 	obs_data_release(returnData);
 
-	OBSLogReply logDialog(this, logURL);
+	OBSLogReply logDialog(this, logURL, crash);
 	logDialog.exec();
 }
 
@@ -5174,6 +5451,8 @@
 	obs_source_t *source = obs_scene_get_source(scene);
 	RenameListItem(this, ui->scenes, source, text);
 
+	ui->scenesDock->addAction(renameScene);
+
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
 
@@ -5208,6 +5487,27 @@
 	"==== Streaming Start ==============================================="
 #define STREAMING_STOP \
 	"==== Streaming Stop ================================================"
+#define VIRTUAL_CAM_START \
+	"==== Virtual Camera Start =========================================="
+#define VIRTUAL_CAM_STOP \
+	"==== Virtual Camera Stop ==========================================="
+
+void OBSBasic::DisplayStreamStartError()
+{
+	QString message = !outputHandler->lastError.empty()
+				  ? QTStr(outputHandler->lastError.c_str())
+				  : QTStr("Output.StartFailedGeneric");
+	ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
+	ui->streamButton->setEnabled(true);
+	ui->streamButton->setChecked(false);
+
+	if (sysTrayStream) {
+		sysTrayStream->setText(ui->streamButton->text());
+		sysTrayStream->setEnabled(true);
+	}
+
+	QMessageBox::critical(this, QTStr("Output.StartStreamFailed"), message);
+}
 
 void OBSBasic::StartStreaming()
 {
@@ -5216,12 +5516,18 @@
 	if (disableOutputsRef)
 		return;
 
+	if (!outputHandler->SetupStreaming(service)) {
+		DisplayStreamStartError();
+		return;
+	}
+
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTING);
 
 	SaveProject();
 
 	ui->streamButton->setEnabled(false);
+	ui->streamButton->setChecked(false);
 	ui->streamButton->setText(QTStr("Basic.Main.Connecting"));
 
 	if (sysTrayStream) {
@@ -5230,21 +5536,7 @@
 	}
 
 	if (!outputHandler->StartStreaming(service)) {
-		QString message =
-			!outputHandler->lastError.empty()
-				? QTStr(outputHandler->lastError.c_str())
-				: QTStr("Output.StartFailedGeneric");
-		ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
-		ui->streamButton->setEnabled(true);
-		ui->streamButton->setChecked(false);
-
-		if (sysTrayStream) {
-			sysTrayStream->setText(ui->streamButton->text());
-			sysTrayStream->setEnabled(true);
-		}
-
-		QMessageBox::critical(this, QTStr("Output.StartStreamFailed"),
-				      message);
+		DisplayStreamStartError();
 		return;
 	}
 
@@ -5292,7 +5584,7 @@
 		App()->IncrementSleepInhibition();
 		UpdateProcessPriority();
 
-		if (trayIcon)
+		if (trayIcon && trayIcon->isVisible())
 			trayIcon->setIcon(QIcon::fromTheme(
 				"obs-tray-active",
 				QIcon(":/res/images/tray_active.png")));
@@ -5310,15 +5602,19 @@
 		App()->DecrementSleepInhibition();
 		ClearProcessPriority();
 
-		if (trayIcon)
+		if (trayIcon && trayIcon->isVisible())
 			trayIcon->setIcon(QIcon::fromTheme(
 				"obs-tray", QIcon(":/res/images/obs.png")));
-	} else if (trayIcon) {
+	} else if (outputHandler->Active() && trayIcon &&
+		   trayIcon->isVisible()) {
 		if (os_atomic_load_bool(&recording_paused))
-			trayIcon->setIcon(QIcon(":/res/images/obs_paused.png"));
+			trayIcon->setIcon(QIcon::fromTheme(
+				"obs-tray-paused",
+				QIcon(":/res/images/obs_paused.png")));
 		else
-			trayIcon->setIcon(
-				QIcon(":/res/images/tray_active.png"));
+			trayIcon->setIcon(QIcon::fromTheme(
+				"obs-tray-active",
+				QIcon(":/res/images/tray_active.png")));
 	}
 }
 
@@ -5546,43 +5842,25 @@
 
 void OBSBasic::AutoRemux()
 {
-	const char *mode = config_get_string(basicConfig, "Output", "Mode");
-	bool advanced = astrcmpi(mode, "Advanced") == 0;
-
-	const char *path = !advanced ? config_get_string(basicConfig,
-							 "SimpleOutput",
-							 "FilePath")
-				     : config_get_string(basicConfig, "AdvOut",
-							 "RecFilePath");
-
-	/* do not save if using FFmpeg output in advanced output mode */
-	if (advanced) {
-		const char *type =
-			config_get_string(basicConfig, "AdvOut", "RecType");
-		if (astrcmpi(type, "FFmpeg") == 0) {
-			return;
-		}
-	}
-
-	QString input;
-	input += path;
-	input += "/";
-	input += remuxFilename.c_str();
+	QString input = outputHandler->lastRecordingPath.c_str();
+	if (input.isEmpty())
+		return;
 
-	QFileInfo fi(remuxFilename.c_str());
+	QFileInfo fi(input);
+	QString suffix = fi.suffix();
 
 	/* do not remux if lossless */
-	if (fi.suffix().compare("avi", Qt::CaseInsensitive) == 0) {
+	if (suffix.compare("avi", Qt::CaseInsensitive) == 0) {
 		return;
 	}
 
-	QString output;
-	output += path;
-	output += "/";
-	output += fi.completeBaseName();
-	output += ".mp4";
+	QString path = fi.path();
+
+	QString output = input;
+	output.resize(output.size() - suffix.size());
+	output += "mp4";
 
-	OBSRemux *remux = new OBSRemux(path, this, true);
+	OBSRemux *remux = new OBSRemux(QT_TO_UTF8(path), this, true);
 	remux->show();
 	remux->AutoRemux(input, output);
 }
@@ -5720,8 +5998,7 @@
 	if (diskFullTimer->isActive())
 		diskFullTimer->stop();
 
-	if (remuxAfterRecord)
-		AutoRemux();
+	AutoRemux();
 
 	OnDeactivate();
 	UpdatePause(false);
@@ -5899,6 +6176,61 @@
 	UpdateReplayBuffer(false);
 }
 
+void OBSBasic::StartVirtualCam()
+{
+	if (!outputHandler || !outputHandler->virtualCam)
+		return;
+	if (outputHandler->VirtualCamActive())
+		return;
+	if (disableOutputsRef)
+		return;
+
+	SaveProject();
+
+	if (!outputHandler->StartVirtualCam()) {
+		vcamButton->setChecked(false);
+	}
+}
+
+void OBSBasic::StopVirtualCam()
+{
+	if (!outputHandler || !outputHandler->virtualCam)
+		return;
+
+	SaveProject();
+
+	if (outputHandler->VirtualCamActive())
+		outputHandler->StopVirtualCam();
+
+	OnDeactivate();
+}
+
+void OBSBasic::OnVirtualCamStart()
+{
+	if (!outputHandler || !outputHandler->virtualCam)
+		return;
+
+	vcamButton->setText(QTStr("Basic.Main.StopVirtualCam"));
+	vcamButton->setChecked(true);
+
+	OnActivate();
+
+	blog(LOG_INFO, VIRTUAL_CAM_START);
+}
+
+void OBSBasic::OnVirtualCamStop(int)
+{
+	if (!outputHandler || !outputHandler->virtualCam)
+		return;
+
+	vcamButton->setText(QTStr("Basic.Main.StartVirtualCam"));
+	vcamButton->setChecked(false);
+
+	blog(LOG_INFO, VIRTUAL_CAM_STOP);
+
+	OnDeactivate();
+}
+
 void OBSBasic::on_streamButton_clicked()
 {
 	if (outputHandler->StreamingActive()) {
@@ -5943,9 +6275,14 @@
 		bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
 					       "WarnBeforeStartingStream");
 
-		obs_data_t *settings = obs_service_get_settings(service);
-		bool bwtest = obs_data_get_bool(settings, "bwtest");
-		obs_data_release(settings);
+		bool bwtest = false;
+
+		if (this->auth) {
+			obs_data_t *settings =
+				obs_service_get_settings(service);
+			bwtest = obs_data_get_bool(settings, "bwtest");
+			obs_data_release(settings);
+		}
 
 		if (bwtest && isVisible()) {
 			QMessageBox::StandardButton button =
@@ -6005,6 +6342,20 @@
 	}
 }
 
+void OBSBasic::VCamButtonClicked()
+{
+	if (outputHandler->VirtualCamActive()) {
+		StopVirtualCam();
+	} else {
+		if (!UIValidation::NoSourcesConfirmation(this)) {
+			vcamButton->setChecked(false);
+			return;
+		}
+
+		StartVirtualCam();
+	}
+}
+
 void OBSBasic::on_settingsButton_clicked()
 {
 	on_action_Settings_triggered();
@@ -6084,6 +6435,9 @@
 
 	popup.addAction(studioProgramWindow);
 
+	popup.addAction(QTStr("Screenshot.StudioProgram"), this,
+			SLOT(ScreenshotProgram()));
+
 	popup.exec(QCursor::pos());
 }
 
@@ -6681,11 +7035,19 @@
 	if (monitor > 9 || monitor > QGuiApplication::screens().size() - 1)
 		return nullptr;
 
+	if (monitor > -1) {
+		for (size_t i = 0; i < projectors.size(); i++) {
+			if (projectors[i]->GetMonitor() == monitor) {
+				DeleteProjector(projectors[i]);
+				break;
+			}
+		}
+	}
+
 	OBSProjector *projector =
 		new OBSProjector(nullptr, source, monitor, type);
 
-	if (projector)
-		projectors.emplace_back(projector);
+	projectors.emplace_back(projector);
 
 	return projector;
 }
@@ -6811,6 +7173,10 @@
 					Qt::LeftToRight, Qt::AlignCenter,
 					size(), rect));
 			}
+
+			if (info->alwaysOnTopOverridden)
+				projector->SetIsAlwaysOnTop(info->alwaysOnTop,
+							    true);
 		}
 	}
 }
@@ -6930,13 +7296,17 @@
 	resizeDocks(docks, {cy, cy, cy, cy, cy}, Qt::Vertical);
 	resizeDocks(docks, sizes, Qt::Horizontal);
 #endif
+
+	activateWindow();
 }
 
 void OBSBasic::on_lockUI_toggled(bool lock)
 {
 	QDockWidget::DockWidgetFeatures features =
 		lock ? QDockWidget::NoDockWidgetFeatures
-		     : QDockWidget::AllDockWidgetFeatures;
+		     : (QDockWidget::DockWidgetClosable |
+			QDockWidget::DockWidgetMovable |
+			QDockWidget::DockWidgetFloatable);
 
 	QDockWidget::DockWidgetFeatures mainFeatures = features;
 	mainFeatures &= ~QDockWidget::QDockWidget::DockWidgetClosable;
@@ -6966,6 +7336,23 @@
 			"ShowListboxToolbars", visible);
 }
 
+void OBSBasic::ShowContextBar()
+{
+	on_toggleContextBar_toggled(true);
+}
+
+void OBSBasic::HideContextBar()
+{
+	on_toggleContextBar_toggled(false);
+}
+
+void OBSBasic::on_toggleContextBar_toggled(bool visible)
+{
+	config_set_bool(App()->GlobalConfig(), "BasicWindow",
+			"ShowContextToolbars", visible);
+	this->ui->contextContainer->setVisible(visible);
+}
+
 void OBSBasic::on_toggleStatusBar_toggled(bool visible)
 {
 	ui->statusbar->setVisible(visible);
@@ -7182,7 +7569,8 @@
 void OBSBasic::SysTrayNotify(const QString &text,
 			     QSystemTrayIcon::MessageIcon n)
 {
-	if (trayIcon && QSystemTrayIcon::supportsMessages()) {
+	if (trayIcon && trayIcon->isVisible() &&
+	    QSystemTrayIcon::supportsMessages()) {
 		QSystemTrayIcon::MessageIcon icon =
 			QSystemTrayIcon::MessageIcon(n);
 		trayIcon->showMessage("OBS Studio", text, icon, 10000);
@@ -7204,12 +7592,11 @@
 	if (firstStarted)
 		SystemTrayInit();
 
-	if (!sysTrayWhenStarted && !sysTrayEnabled) {
+	if (!sysTrayEnabled) {
 		trayIcon->hide();
-	} else if ((sysTrayWhenStarted && sysTrayEnabled) ||
-		   opt_minimize_tray) {
+	} else {
 		trayIcon->show();
-		if (firstStarted) {
+		if (firstStarted && (sysTrayWhenStarted || opt_minimize_tray)) {
 			QTimer::singleShot(50, this, SLOT(hide()));
 			EnablePreviewDisplay(false);
 			setVisible(false);
@@ -7218,12 +7605,6 @@
 #endif
 			opt_minimize_tray = false;
 		}
-	} else if (sysTrayEnabled) {
-		trayIcon->show();
-	} else if (!sysTrayEnabled) {
-		trayIcon->hide();
-	} else if (!sysTrayWhenStarted && sysTrayEnabled) {
-		trayIcon->hide();
 	}
 
 	if (isVisible())
@@ -7606,7 +7987,9 @@
 	bool lock = ui->lockUI->isChecked();
 	QDockWidget::DockWidgetFeatures features =
 		lock ? QDockWidget::NoDockWidgetFeatures
-		     : QDockWidget::AllDockWidgetFeatures;
+		     : (QDockWidget::DockWidgetClosable |
+			QDockWidget::DockWidgetMovable |
+			QDockWidget::DockWidgetFloatable);
 
 	dock->setFeatures(features);
 
@@ -7698,8 +8081,10 @@
 
 		ui->statusbar->RecordingPaused();
 
-		if (trayIcon)
-			trayIcon->setIcon(QIcon(":/res/images/obs_paused.png"));
+		if (trayIcon && trayIcon->isVisible())
+			trayIcon->setIcon(QIcon::fromTheme(
+				"obs-tray-paused",
+				QIcon(":/res/images/obs_paused.png")));
 
 		os_atomic_set_bool(&recording_paused, true);
 
@@ -7727,9 +8112,10 @@
 
 		ui->statusbar->RecordingUnpaused();
 
-		if (trayIcon)
-			trayIcon->setIcon(
-				QIcon(":/res/images/tray_active.png"));
+		if (trayIcon && trayIcon->isVisible())
+			trayIcon->setIcon(QIcon::fromTheme(
+				"obs-tray-active",
+				QIcon(":/res/images/tray_active.png")));
 
 		os_atomic_set_bool(&recording_paused, false);
 
@@ -7789,6 +8175,11 @@
 		pause->setChecked(false);
 		pause->setProperty("themeID",
 				   QVariant(QStringLiteral("pauseIconSmall")));
+
+		QSizePolicy sp;
+		sp.setHeightForWidth(true);
+		pause->setSizePolicy(sp);
+
 		connect(pause.data(), &QAbstractButton::clicked, this,
 			&OBSBasic::PauseToggled);
 		ui->recordingLayout->addWidget(pause.data());
@@ -7812,6 +8203,11 @@
 	replay->setChecked(false);
 	replay->setProperty("themeID",
 			    QVariant(QStringLiteral("replayIconSmall")));
+
+	QSizePolicy sp;
+	sp.setHeightForWidth(true);
+	replay->setSizePolicy(sp);
+
 	connect(replay.data(), &QAbstractButton::clicked, this,
 		&OBSBasic::ReplayBufferSave);
 	replayLayout->addWidget(replay.data());
@@ -7854,6 +8250,18 @@
 
 bool OBSBasic::OutputPathValid()
 {
+	const char *mode = config_get_string(Config(), "Output", "Mode");
+	if (strcmp(mode, "Advanced") == 0) {
+		const char *advanced_mode =
+			config_get_string(Config(), "AdvOut", "RecType");
+		if (strcmp(advanced_mode, "FFmpeg") == 0) {
+			bool is_local = config_get_bool(Config(), "AdvOut",
+							"FFOutputToFile");
+			if (!is_local)
+				return true;
+		}
+	}
+
 	const char *path = GetCurrentOutputPath();
 	return path && *path && QDir(path).exists();
 }
@@ -7892,15 +8300,8 @@
 	}
 }
 
-void OBSBasic::ScenesReordered(const QModelIndex &parent, int start, int end,
-			       const QModelIndex &destination, int row)
+void OBSBasic::ScenesReordered()
 {
-	UNUSED_PARAMETER(parent);
-	UNUSED_PARAMETER(start);
-	UNUSED_PARAMETER(end);
-	UNUSED_PARAMETER(destination);
-	UNUSED_PARAMETER(row);
-
 	OBSProjector::UpdateMultiviewProjectors();
 }
 
@@ -7921,3 +8322,34 @@
 	if (!className || strstr(className, "Dock") != nullptr)
 		ui->viewMenuDocks->exec(mapToGlobal(pos));
 }
+
+void OBSBasic::UpdateProjectorHideCursor()
+{
+	for (size_t i = 0; i < projectors.size(); i++)
+		projectors[i]->SetHideCursor();
+}
+
+void OBSBasic::UpdateProjectorAlwaysOnTop(bool top)
+{
+	for (size_t i = 0; i < projectors.size(); i++)
+		SetAlwaysOnTop(projectors[i], top);
+}
+
+void OBSBasic::ResetProjectors()
+{
+	obs_data_array_t *savedProjectorList = SaveProjectors();
+	ClearProjectors();
+	LoadSavedProjectors(savedProjectorList);
+	OpenSavedProjectors();
+	obs_data_array_release(savedProjectorList);
+}
+
+void OBSBasic::on_sourcePropertiesButton_clicked()
+{
+	on_actionSourceProperties_triggered();
+}
+
+void OBSBasic::on_sourceFiltersButton_clicked()
+{
+	OpenFilters();
+}

obs-studio-25.0.8.tar.xz/UI/window-basic-main.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-main.hpp Changed

@@ -34,6 +34,7 @@
 #include "window-projector.hpp"
 #include "window-basic-about.hpp"
 #include "auth-base.hpp"
+#include "log-viewer.hpp"
 
 #include <obs-frontend-internal.hpp>
 
@@ -78,6 +79,8 @@
 	int monitor;
 	std::string geometry;
 	std::string name;
+	bool alwaysOnTop;
+	bool alwaysOnTopOverridden;
 };
 
 struct QuickTransition {
@@ -160,6 +163,9 @@
 	friend class ReplayBufferButton;
 	friend class ExtraBrowsersModel;
 	friend class ExtraBrowsersDelegate;
+	friend class DeviceCaptureToolbar;
+	friend class DeviceToolbarPropertiesThread;
+	friend struct BasicOutputHandler;
 	friend struct OBSStudioAPI;
 
 	enum class MoveDir { Up, Down, Left, Right };
@@ -194,6 +200,7 @@
 	bool copyVisible = true;
 
 	bool closing = false;
+	QScopedPointer<QThread> devicePropertiesThread;
 	QScopedPointer<QThread> whatsNewInitThread;
 	QScopedPointer<QThread> updateCheckThread;
 	QScopedPointer<QThread> introCheckThread;
@@ -207,6 +214,8 @@
 	QPointer<QDockWidget> statsDock;
 	QPointer<OBSAbout> about;
 
+	OBSLogViewer *logView = nullptr;
+
 	QPointer<QTimer> cpuUsageTimer;
 	QPointer<QTimer> diskFullTimer;
 
@@ -226,7 +235,6 @@
 	gs_vertbuffer_t *circle = nullptr;
 
 	bool sceneChanging = false;
-	bool ignoreSelectionUpdate = false;
 
 	int previewX = 0, previewY = 0;
 	int previewCX = 0, previewCY = 0;
@@ -250,6 +258,9 @@
 	QScopedPointer<QPushButton> pause;
 	QScopedPointer<QPushButton> replay;
 
+	QPointer<QPushButton> vcamButton;
+	bool vcamEnabled = false;
+
 	QScopedPointer<QSystemTrayIcon> trayIcon;
 	QPointer<QAction> sysTrayStream;
 	QPointer<QAction> sysTrayRecord;
@@ -271,6 +282,8 @@
 	QPointer<QMenu> deinterlaceMenu;
 	QPointer<QMenu> perSceneTransitionMenu;
 	QPointer<QObject> shortcutFilter;
+	QPointer<QAction> renameScene;
+	QPointer<QAction> renameSource;
 
 	QPointer<QWidget> programWidget;
 	QPointer<QVBoxLayout> programLayout;
@@ -292,7 +305,7 @@
 	void UpdateVolumeControlsPeakMeterType();
 	void ClearVolumeControls();
 
-	void UploadLog(const char *subdir, const char *file);
+	void UploadLog(const char *subdir, const char *file, const bool crash);
 
 	void Save(const char *file);
 	void Load(const char *file);
@@ -339,6 +352,7 @@
 
 	void CloseDialogs();
 	void ClearSceneData();
+	void ClearProjectors();
 
 	void Nudge(int dist, MoveDir dir);
 
@@ -371,7 +385,8 @@
 	QModelIndexList GetAllSelectedSourceItems();
 
 	obs_hotkey_pair_id streamingHotkeys, recordingHotkeys, pauseHotkeys,
-		replayBufHotkeys, togglePreviewHotkeys;
+		replayBufHotkeys, vcamHotkeys, togglePreviewHotkeys,
+		contextBarHotkeys;
 	obs_hotkey_id forceStreamingStopHotkey;
 
 	void InitDefaultTransitions();
@@ -382,6 +397,7 @@
 	void LoadTransitions(obs_data_array_t *transitions);
 
 	obs_source_t *fadeTransition;
+	obs_source_t *cutTransition;
 
 	void CreateProgramDisplay();
 	void CreateProgramOptions();
@@ -426,6 +442,8 @@
 	obs_hotkey_id togglePreviewProgramHotkey = 0;
 	obs_hotkey_id transitionHotkey = 0;
 	obs_hotkey_id statsHotkey = 0;
+	obs_hotkey_id screenshotHotkey = 0;
+	obs_hotkey_id sourceScreenshotHotkey = 0;
 	int quickTransitionIdCounter = 1;
 	bool overridingTransition = false;
 
@@ -516,10 +534,18 @@
 	OBSSource GetOverrideTransition(OBSSource source);
 	int GetOverrideTransitionDuration(OBSSource source);
 
+	void UpdateProjectorHideCursor();
+	void UpdateProjectorAlwaysOnTop(bool top);
+	void ResetProjectors();
+
+	QPointer<QObject> screenshotData;
+
 public slots:
 	void DeferSaveBegin();
 	void DeferSaveEnd();
 
+	void DisplayStreamStartError();
+
 	void StartStreaming();
 	void StopStreaming();
 	void ForceStopStreaming();
@@ -547,6 +573,12 @@
 	void ReplayBufferStopping();
 	void ReplayBufferStop(int code);
 
+	void StartVirtualCam();
+	void StopVirtualCam();
+
+	void OnVirtualCamStart();
+	void OnVirtualCamStop(int code);
+
 	void SaveProjectDeferred();
 	void SaveProject();
 
@@ -564,6 +596,8 @@
 
 	void UpdatePatronJson(const QString &text, const QString &error);
 
+	void ShowContextBar();
+	void HideContextBar();
 	void PauseRecording();
 	void UnpauseRecording();
 
@@ -573,8 +607,6 @@
 	void RemoveScene(OBSSource source);
 	void RenameSources(OBSSource source, QString newName, QString prevName);
 
-	void SelectSceneItem(OBSScene scene, OBSSceneItem item, bool select);
-
 	void ActivateAudioSource(OBSSource source);
 	void DeactivateAudioSource(OBSSource source);
 
@@ -589,7 +621,7 @@
 
 	void ProcessHotkey(obs_hotkey_id id, bool pressed);
 
-	void AddTransition();
+	void AddTransition(QString id);
 	void RenameTransition();
 	void TransitionClicked();
 	void TransitionStopped();
@@ -640,8 +672,7 @@
 	void CheckDiskSpaceRemaining();
 	void OpenSavedProjector(SavedProjectorInfo *info);
 
-	void ScenesReordered(const QModelIndex &parent, int start, int end,
-			     const QModelIndex &destination, int row);
+	void ScenesReordered();
 
 	void ResetStatsHotkey();
 
@@ -671,8 +702,6 @@
 	static void SceneReordered(void *data, calldata_t *params);
 	static void SceneRefreshed(void *data, calldata_t *params);
 	static void SceneItemAdded(void *data, calldata_t *params);
-	static void SceneItemSelected(void *data, calldata_t *params);
-	static void SceneItemDeselected(void *data, calldata_t *params);
 	static void SourceCreated(void *data, calldata_t *params);
 	static void SourceRemoved(void *data, calldata_t *params);
 	static void SourceActivated(void *data, calldata_t *params);
@@ -726,6 +755,8 @@
 		return os_atomic_load_bool(&previewProgramMode);
 	}
 
+	inline bool VCamEnabled() const { return vcamEnabled; }
+
 	bool StreamingActive() const;
 	bool Active() const;
 
@@ -733,6 +764,7 @@
 	int ResetVideo();
 	bool ResetAudio();
 
+	void AddVCamButton();
 	void ResetOutputs();
 
 	void ResetAudioDevice(const char *sourceId, const char *deviceId,
@@ -873,7 +905,12 @@
 
 	void on_streamButton_clicked();
 	void on_recordButton_clicked();
+	void VCamButtonClicked();
 	void on_settingsButton_clicked();
+	void Screenshot(OBSSource source_ = nullptr);
+	void ScreenshotSelectedSource();
+	void ScreenshotProgram();
+	void ScreenshotScene();
 
 	void on_actionHelpPortal_triggered();
 	void on_actionWebsite_triggered();
@@ -903,17 +940,21 @@
 	void on_actionAlwaysOnTop_triggered();
 
 	void on_toggleListboxToolbars_toggled(bool visible);
+	void on_toggleContextBar_toggled(bool visible);
 	void on_toggleStatusBar_toggled(bool visible);
 	void on_toggleSourceIcons_toggled(bool visible);
 
 	void on_transitions_currentIndexChanged(int index);
-	void on_transitionAdd_clicked();
 	void on_transitionRemove_clicked();
 	void on_transitionProps_clicked();
 	void on_transitionDuration_valueChanged(int value);
 
 	void on_modeSwitch_clicked();
 
+	// Source Context Buttons
+	void on_sourcePropertiesButton_clicked();
+	void on_sourceFiltersButton_clicked();
+
 	void on_autoConfigure_triggered();
 	void on_stats_triggered();
 
@@ -923,6 +964,8 @@
 	void PauseToggled();
 
 	void logUploadFinished(const QString &text, const QString &error);
+	void crashUploadFinished(const QString &text, const QString &error);
+	void openLogDialog(const QString &text, const bool crash);
 
 	void updateCheckFinished();
 
@@ -973,6 +1016,9 @@
 	bool RecordingActive();
 	bool ReplayBufferActive();
 
+	void ClearContextBar();
+	void UpdateContextBar();
+
 public:
 	explicit OBSBasic(QWidget *parent = 0);
 	virtual ~OBSBasic();

obs-studio-25.0.8.tar.xz/UI/window-basic-preview.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-preview.cpp Changed

@@ -495,13 +495,15 @@
 
 void OBSBasicPreview::wheelEvent(QWheelEvent *event)
 {
-	if (scrollMode && IsFixedScaling() &&
-	    event->orientation() == Qt::Vertical) {
-		if (event->delta() > 0)
-			SetScalingLevel(scalingLevel + 1);
-		else if (event->delta() < 0)
-			SetScalingLevel(scalingLevel - 1);
-		emit DisplayResized();
+	if (scrollMode && IsFixedScaling()) {
+		const int delta = event->angleDelta().y();
+		if (delta != 0) {
+			if (delta > 0)
+				SetScalingLevel(scalingLevel + 1);
+			else
+				SetScalingLevel(scalingLevel - 1);
+			emit DisplayResized();
+		}
 	}
 
 	OBSQTDisplay::wheelEvent(event);
@@ -581,6 +583,25 @@
 	mousePos = startPos;
 }
 
+void OBSBasicPreview::UpdateCursor(uint32_t &flags)
+{
+	if (!flags && cursor().shape() != Qt::OpenHandCursor)
+		unsetCursor();
+	if (cursor().shape() != Qt::ArrowCursor)
+		return;
+
+	if ((flags & ITEM_LEFT && flags & ITEM_TOP) ||
+	    (flags & ITEM_RIGHT && flags & ITEM_BOTTOM))
+		setCursor(Qt::SizeFDiagCursor);
+	else if ((flags & ITEM_LEFT && flags & ITEM_BOTTOM) ||
+		 (flags & ITEM_RIGHT && flags & ITEM_TOP))
+		setCursor(Qt::SizeBDiagCursor);
+	else if (flags & ITEM_LEFT || flags & ITEM_RIGHT)
+		setCursor(Qt::SizeHorCursor);
+	else if (flags & ITEM_TOP || flags & ITEM_BOTTOM)
+		setCursor(Qt::SizeVerCursor);
+}
+
 static bool select_one(obs_scene_t *scene, obs_sceneitem_t *item, void *param)
 {
 	obs_sceneitem_t *selectedItem =
@@ -683,6 +704,7 @@
 		mouseMoved = false;
 		cropping = false;
 		selectionBox = false;
+		unsetCursor();
 
 		OBSSceneItem item = GetItemAtPos(pos, true);
 
@@ -1088,6 +1110,9 @@
 	if (!scene)
 		return;
 
+	if (cursor().shape() != Qt::CrossCursor)
+		setCursor(Qt::CrossCursor);
+
 	SceneFindBoxData data(startPos, pos);
 	obs_scene_enum_items(scene, FindItemsInBox, &data);
 
@@ -1421,6 +1446,8 @@
 	if (locked)
 		return;
 
+	bool updateCursor = false;
+
 	if (mouseDown) {
 		vec2 pos = GetMouseEventPos(event);
 
@@ -1456,6 +1483,8 @@
 				StretchItem(pos);
 
 		} else if (mouseOverItems) {
+			if (cursor().shape() != Qt::SizeAllCursor)
+				setCursor(Qt::SizeAllCursor);
 			selectionBox = false;
 			MoveItems(pos);
 		} else {
@@ -1474,6 +1503,27 @@
 		std::lock_guard<std::mutex> lock(selectMutex);
 		hoveredPreviewItems.clear();
 		hoveredPreviewItems.push_back(item);
+
+		if (!mouseMoved && hoveredPreviewItems.size() > 0) {
+			mousePos = pos;
+			OBSBasic *main = reinterpret_cast<OBSBasic *>(
+				App()->GetMainWindow());
+#ifdef SUPPORTS_FRACTIONAL_SCALING
+			float scale = main->devicePixelRatioF();
+#else
+			float scale = main->devicePixelRatio();
+#endif
+			float x = float(event->x()) - main->previewX / scale;
+			float y = float(event->y()) - main->previewY / scale;
+			vec2_set(&startPos, x, y);
+			updateCursor = true;
+		}
+	}
+
+	if (updateCursor) {
+		GetStretchHandleData(startPos);
+		uint32_t stretchFlags = (uint32_t)stretchHandle;
+		UpdateCursor(stretchFlags);
 	}
 }

obs-studio-25.0.8.tar.xz/UI/window-basic-preview.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-preview.hpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-properties.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-properties.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-settings-stream.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-settings-stream.cpp Changed

@@ -41,8 +41,6 @@
 	ui->bandwidthTestEnable->setVisible(false);
 	ui->twitchAddonDropdown->setVisible(false);
 	ui->twitchAddonLabel->setVisible(false);
-	ui->mixerAddonDropdown->setVisible(false);
-	ui->mixerAddonLabel->setVisible(false);
 
 	int vertSpacing = ui->topStreamLayout->verticalSpacing();
 
@@ -69,15 +67,14 @@
 	ui->twitchAddonDropdown->addItem(
 		QTStr("Basic.Settings.Stream.TTVAddon.Both"));
 
-	ui->mixerAddonDropdown->addItem(
-		QTStr("Basic.Settings.Stream.MixerAddon.None"));
-	ui->mixerAddonDropdown->addItem(
-		QTStr("Basic.Settings.Stream.MixerAddon.MEE"));
-
 	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
 		SLOT(UpdateServerList()));
 	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
 		SLOT(UpdateKeyLink()));
+	connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
+		SLOT(UpdateKeyLink()));
+	connect(ui->customServer, SIGNAL(editingFinished(const QString &)),
+		this, SLOT(UpdateKeyLink()));
 }
 
 void OBSBasicSettings::LoadStream1Settings()
@@ -119,9 +116,6 @@
 
 		idx = config_get_int(main->Config(), "Twitch", "AddonChoice");
 		ui->twitchAddonDropdown->setCurrentIndex(idx);
-
-		idx = config_get_int(main->Config(), "Mixer", "AddonChoice");
-		ui->mixerAddonDropdown->setCurrentIndex(idx);
 	}
 
 	UpdateServerList();
@@ -183,9 +177,6 @@
 		}
 	}
 
-	obs_data_set_bool(settings, "bwtest",
-			  ui->bandwidthTestEnable->isChecked());
-
 	if (!!auth && strcmp(auth->service(), "Twitch") == 0) {
 		bool choiceExists = config_has_user_value(
 			main->Config(), "Twitch", "AddonChoice");
@@ -198,19 +189,11 @@
 
 		if (choiceExists && currentChoice != newChoice)
 			forceAuthReload = true;
-	}
-	if (!!auth && strcmp(auth->service(), "Mixer") == 0) {
-		bool choiceExists = config_has_user_value(
-			main->Config(), "Mixer", "AddonChoice");
-		int currentChoice =
-			config_get_int(main->Config(), "Mixer", "AddonChoice");
-		int newChoice = ui->mixerAddonDropdown->currentIndex();
 
-		config_set_int(main->Config(), "Mixer", "AddonChoice",
-			       newChoice);
-
-		if (choiceExists && currentChoice != newChoice)
-			forceAuthReload = true;
+		obs_data_set_bool(settings, "bwtest",
+				  ui->bandwidthTestEnable->isChecked());
+	} else {
+		obs_data_set_bool(settings, "bwtest", false);
 	}
 
 	obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
@@ -231,12 +214,8 @@
 
 void OBSBasicSettings::UpdateKeyLink()
 {
-	if (IsCustomService()) {
-		ui->getStreamKeyButton->hide();
-		return;
-	}
-
 	QString serviceName = ui->service->currentText();
+	QString customServer = ui->customServer->text();
 	QString streamKeyLink;
 	if (serviceName == "Twitch") {
 		streamKeyLink =
@@ -246,12 +225,16 @@
 	} else if (serviceName.startsWith("Restream.io")) {
 		streamKeyLink =
 			"https://restream.io/settings/streaming-setup?from=OBS";
-	} else if (serviceName == "Facebook Live") {
-		streamKeyLink = "https://www.facebook.com/live/create?ref=OBS";
+	} else if (serviceName == "Facebook Live" ||
+		   (customServer.contains("fbcdn.net") && IsCustomService())) {
+		streamKeyLink =
+			"https://www.facebook.com/live/producer?ref=OBS";
 	} else if (serviceName.startsWith("Twitter")) {
 		streamKeyLink = "https://www.pscp.tv/account/producer";
 	} else if (serviceName.startsWith("YouStreamer")) {
 		streamKeyLink = "https://app.youstreamer.com/stream/";
+	} else if (serviceName == "Trovo") {
+		streamKeyLink = "https://studio.trovo.live/mychannel/stream";
 	}
 
 	if (QString(streamKeyLink).isNull()) {
@@ -287,7 +270,7 @@
 	}
 
 	if (showAll)
-		names.sort();
+		names.sort(Qt::CaseInsensitive);
 
 	for (QString &name : names)
 		ui->service->addItem(name);
@@ -332,8 +315,6 @@
 	ui->bandwidthTestEnable->setVisible(false);
 	ui->twitchAddonDropdown->setVisible(false);
 	ui->twitchAddonLabel->setVisible(false);
-	ui->mixerAddonDropdown->setVisible(false);
-	ui->mixerAddonLabel->setVisible(false);
 
 #ifdef BROWSER_AVAILABLE
 	if (cef) {
@@ -491,10 +472,8 @@
 			ui->bandwidthTestEnable->setVisible(true);
 			ui->twitchAddonLabel->setVisible(true);
 			ui->twitchAddonDropdown->setVisible(true);
-		}
-		if (strcmp(a->service(), "Mixer") == 0) {
-			ui->mixerAddonLabel->setVisible(true);
-			ui->mixerAddonDropdown->setVisible(true);
+		} else {
+			ui->bandwidthTestEnable->setChecked(false);
 		}
 	}
 
@@ -555,6 +534,8 @@
 	OAuth::DeleteCookies(service);
 #endif
 
+	ui->bandwidthTestEnable->setChecked(false);
+
 	ui->streamKeyWidget->setVisible(true);
 	ui->streamKeyLabel->setVisible(true);
 	ui->connectAccount2->setVisible(true);

obs-studio-25.0.8.tar.xz/UI/window-basic-settings.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-settings.cpp Changed

@@ -27,7 +27,6 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QCloseEvent>
-#include <QFileDialog>
 #include <QDirIterator>
 #include <QVariant>
 #include <QTreeView>
@@ -55,6 +54,35 @@
 
 using namespace std;
 
+class SettingsEventFilter : public QObject {
+	QScopedPointer<OBSEventFilter> shortcutFilter;
+
+public:
+	inline SettingsEventFilter()
+		: shortcutFilter((OBSEventFilter *)CreateShortcutFilter())
+	{
+	}
+
+protected:
+	bool eventFilter(QObject *obj, QEvent *event) override
+	{
+		int key;
+
+		switch (event->type()) {
+		case QEvent::KeyPress:
+		case QEvent::KeyRelease:
+			key = static_cast<QKeyEvent *>(event)->key();
+			if (key == Qt::Key_Escape) {
+				return false;
+			}
+		default:
+			break;
+		}
+
+		return shortcutFilter->filter(obj, event);
+	}
+};
+
 // Used for QVariant in codec comboboxes
 namespace {
 static bool StringEquals(QString left, QString right)
@@ -103,6 +131,11 @@
 	return cx > 16384 || cy > 16384;
 }
 
+static inline bool ResTooLow(uint32_t cx, uint32_t cy)
+{
+	return cx < 8 || cy < 8;
+}
+
 /* parses "[width]x[height]", string, i.e. 1024x768 */
 static bool ConvertResText(const char *res, uint32_t &cx, uint32_t &cy)
 {
@@ -137,7 +170,7 @@
 	if (lexer_getbasetoken(lex, &token, IGNORE_WHITESPACE))
 		return false;
 
-	if (ResTooHigh(cx, cy)) {
+	if (ResTooHigh(cx, cy) || ResTooLow(cx, cy)) {
 		cx = cy = 0;
 		return false;
 	}
@@ -279,6 +312,24 @@
 	return std::make_tuple(newCX, newCY);
 }
 
+static inline void HighlightGroupBoxLabel(QGroupBox *gb, QWidget *widget,
+					  QString objectName)
+{
+	QFormLayout *layout = qobject_cast<QFormLayout *>(gb->layout());
+
+	if (!layout)
+		return;
+
+	QLabel *label = qobject_cast<QLabel *>(layout->labelForField(widget));
+
+	if (label) {
+		label->setObjectName(objectName);
+
+		label->style()->unpolish(label);
+		label->style()->polish(label);
+	}
+}
+
 void RestrictResetBitrates(initializer_list<QComboBox *> boxes, int maxbitrate);
 
 void OBSBasicSettings::HookWidget(QWidget *widget, const char *signal,
@@ -371,7 +422,6 @@
 	HookWidget(ui->key,                  EDIT_CHANGED,   STREAM1_CHANGED);
 	HookWidget(ui->bandwidthTestEnable,  CHECK_CHANGED,  STREAM1_CHANGED);
 	HookWidget(ui->twitchAddonDropdown,  COMBO_CHANGED,  STREAM1_CHANGED);
-	HookWidget(ui->mixerAddonDropdown,   COMBO_CHANGED,  STREAM1_CHANGED);
 	HookWidget(ui->useAuth,              CHECK_CHANGED,  STREAM1_CHANGED);
 	HookWidget(ui->authUsername,         EDIT_CHANGED,   STREAM1_CHANGED);
 	HookWidget(ui->authPw,               EDIT_CHANGED,   STREAM1_CHANGED);
@@ -633,7 +683,7 @@
 	// Initialize libff library
 	ff_init();
 
-	installEventFilter(CreateShortcutFilter());
+	installEventFilter(new SettingsEventFilter());
 
 	LoadEncoderTypes();
 	LoadColorRanges();
@@ -2096,6 +2146,8 @@
 						 "UnknownAudioDevice"),
 					   var);
 			widget->setCurrentIndex(0);
+			HighlightGroupBoxLabel(ui->audioDevicesGroupBox, widget,
+					       "errorLabel");
 		}
 	}
 
@@ -2683,7 +2735,7 @@
 
 		if (obs_scene_from_source(source))
 			scenes.emplace_back(source, label, hw);
-		else
+		else if (obs_source_get_name(source) != NULL)
 			sources.emplace_back(source, label, hw);
 
 		return false;
@@ -2895,11 +2947,24 @@
 			"WarnBeforeStoppingRecord",
 			ui->warnBeforeRecordStop->isChecked());
 
-	config_set_bool(GetGlobalConfig(), "BasicWindow", "HideProjectorCursor",
-			ui->hideProjectorCursor->isChecked());
-	config_set_bool(GetGlobalConfig(), "BasicWindow",
-			"ProjectorAlwaysOnTop",
+	if (WidgetChanged(ui->hideProjectorCursor)) {
+		config_set_bool(GetGlobalConfig(), "BasicWindow",
+				"HideProjectorCursor",
+				ui->hideProjectorCursor->isChecked());
+		main->UpdateProjectorHideCursor();
+	}
+
+	if (WidgetChanged(ui->projectorAlwaysOnTop)) {
+		config_set_bool(GetGlobalConfig(), "BasicWindow",
+				"ProjectorAlwaysOnTop",
+				ui->projectorAlwaysOnTop->isChecked());
+#if defined(_WIN32) || defined(__APPLE__)
+		main->UpdateProjectorAlwaysOnTop(
 			ui->projectorAlwaysOnTop->isChecked());
+#else
+		main->ResetProjectors();
+#endif
+	}
 
 	if (WidgetChanged(ui->recordWhenStreaming))
 		config_set_bool(GetGlobalConfig(), "BasicWindow",
@@ -3560,6 +3625,9 @@
 	} else if (button == QMessageBox::Yes) {
 		SaveSettings();
 	} else {
+		if (savedTheme != App()->GetTheme())
+			App()->SetTheme(savedTheme);
+
 		LoadSettings(true);
 #ifdef _WIN32
 		if (toggleAero)
@@ -3574,14 +3642,14 @@
 
 void OBSBasicSettings::closeEvent(QCloseEvent *event)
 {
-	if (Changed() && !QueryChanges())
+	if (!AskIfCanCloseSettings())
 		event->ignore();
+}
 
-	if (forceAuthReload) {
-		main->auth->Save();
-		main->auth->Load();
-		forceAuthReload = false;
-	}
+void OBSBasicSettings::reject()
+{
+	if (AskIfCanCloseSettings())
+		close();
 }
 
 void OBSBasicSettings::on_theme_activated(int idx)
@@ -3636,10 +3704,9 @@
 
 void OBSBasicSettings::on_simpleOutputBrowse_clicked()
 {
-	QString dir = QFileDialog::getExistingDirectory(
+	QString dir = SelectDirectory(
 		this, QTStr("Basic.Settings.Output.SelectDirectory"),
-		ui->simpleOutputPath->text(),
-		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+		ui->simpleOutputPath->text());
 	if (dir.isEmpty())
 		return;
 
@@ -3648,10 +3715,9 @@
 
 void OBSBasicSettings::on_advOutRecPathBrowse_clicked()
 {
-	QString dir = QFileDialog::getExistingDirectory(
+	QString dir = SelectDirectory(
 		this, QTStr("Basic.Settings.Output.SelectDirectory"),
-		ui->advOutRecPath->text(),
-		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+		ui->advOutRecPath->text());
 	if (dir.isEmpty())
 		return;
 
@@ -3660,10 +3726,9 @@
 
 void OBSBasicSettings::on_advOutFFPathBrowse_clicked()
 {
-	QString dir = QFileDialog::getExistingDirectory(
+	QString dir = SelectDirectory(
 		this, QTStr("Basic.Settings.Output.SelectDirectory"),
-		ui->advOutRecPath->text(),
-		QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+		ui->advOutRecPath->text());
 	if (dir.isEmpty())
 		return;
 
@@ -3835,6 +3900,22 @@
 	}
 }
 
+bool OBSBasicSettings::AskIfCanCloseSettings()
+{
+	bool canCloseSettings = false;
+
+	if (!Changed() || QueryChanges())
+		canCloseSettings = true;
+
+	if (forceAuthReload) {
+		main->auth->Save();
+		main->auth->Load();
+		forceAuthReload = false;
+	}
+
+	return canCloseSettings;
+}
+
 void OBSBasicSettings::on_filenameFormatting_textEdited(const QString &text)
 {
 #ifdef __APPLE__

obs-studio-25.0.8.tar.xz/UI/window-basic-settings.hpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-settings.hpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-stats.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-stats.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-basic-status-bar.cpp -> obs-studio-26.0.0.tar.xz/UI/window-basic-status-bar.cpp Changed

obs-studio-25.0.8.tar.xz/UI/window-importer.cpp -> obs-studio-26.0.0.tar.xz/UI/window-importer.cpp Changed

@@ -22,7 +22,6 @@
 #include <QPushButton>
 #include <QLineEdit>
 #include <QToolButton>
-#include <QFileDialog>
 #include <QMimeData>
 #include <QStyledItemDelegate>
 #include <QDirIterator>
@@ -169,7 +168,7 @@
 	QString currentPath = text->text();
 
 	bool isSet = false;
-	QStringList paths = QFileDialog::getOpenFileNames(
+	QStringList paths = OpenFiles(
 		container, QTStr("Importer.SelectCollection"), currentPath,
 		QTStr("Importer.Collection") + QString(" ") + Pattern);
 
@@ -284,7 +283,7 @@
 		std::string program = DetectProgram(entry.path.toStdString());
 		entry.program = QTStr(program.c_str());
 
-		if (program == "") {
+		if (program.empty()) {
 			entry.selected = false;
 		} else {
 			std::string name =
@@ -535,7 +534,7 @@
 {
 	QString Pattern = "(*.json *.bpres *.xml *.xconfig)";
 
-	QStringList paths = QFileDialog::getOpenFileNames(
+	QStringList paths = OpenFiles(
 		this, QTStr("Importer.SelectCollection"), "",
 		QTStr("Importer.Collection") + QString(" ") + Pattern);

obs-studio-25.0.8.tar.xz/UI/window-log-reply.cpp -> obs-studio-26.0.0.tar.xz/UI/window-log-reply.cpp Changed

@@ -16,14 +16,23 @@
 ******************************************************************************/
 
 #include <QClipboard>
+#include <QUrl>
+#include <QUrlQuery>
+#include <QDesktopServices>
 #include "window-log-reply.hpp"
 #include "obs-app.hpp"
 
-OBSLogReply::OBSLogReply(QWidget *parent, const QString &url)
+OBSLogReply::OBSLogReply(QWidget *parent, const QString &url, const bool crash)
 	: QDialog(parent), ui(new Ui::OBSLogReply)
 {
+	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 	ui->setupUi(this);
 	ui->urlEdit->setText(url);
+	if (crash) {
+		ui->analyzeURL->hide();
+		ui->description->setText(
+			Str("LogReturnDialog.Description.Crash"));
+	}
 
 	installEventFilter(CreateShortcutFilter());
 }
@@ -33,3 +42,13 @@
 	QClipboard *clipboard = QApplication::clipboard();
 	clipboard->setText(ui->urlEdit->text());
 }
+
+void OBSLogReply::on_analyzeURL_clicked()
+{
+	QUrlQuery param;
+	param.addQueryItem("log_url",
+			   QUrl::toPercentEncoding(ui->urlEdit->text()));
+	QUrl url("https://obsproject.com/tools/analyzer", QUrl::TolerantMode);
+	url.setQuery(param);
+	QDesktopServices::openUrl(url);
+}

obs-studio-25.0.8.tar.xz/UI/window-log-reply.hpp -> obs-studio-26.0.0.tar.xz/UI/window-log-reply.hpp Changed

obs-studio-25.0.8.tar.xz/UI/window-projector.cpp -> obs-studio-26.0.0.tar.xz/UI/window-projector.cpp Changed

@@ -10,6 +10,8 @@
 #include "platform.hpp"
 
 static QList<OBSProjector *> multiviewProjectors;
+static QList<OBSProjector *> allProjectors;
+
 static bool updatingMultiview = false, drawLabel, drawSafeArea, mouseSwitching,
 	    transitionOnDoubleClick;
 static MultiviewLayout multiviewLayout;
@@ -22,6 +24,12 @@
 	  removedSignal(obs_source_get_signal_handler(source), "remove",
 			OBSSourceRemoved, this)
 {
+	isAlwaysOnTop = config_get_bool(GetGlobalConfig(), "BasicWindow",
+					"ProjectorAlwaysOnTop");
+
+	if (isAlwaysOnTop)
+		setWindowFlags(Qt::WindowStaysOnTopHint);
+
 	type = type_;
 
 	setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
@@ -38,9 +46,6 @@
 	addAction(action);
 	connect(action, SIGNAL(triggered()), this, SLOT(EscapeTriggered()));
 
-	SetAlwaysOnTop(this, config_get_bool(GetGlobalConfig(), "BasicWindow",
-					     "ProjectorAlwaysOnTop"));
-
 	setAttribute(Qt::WA_DeleteOnClose, true);
 
 	//disable application quit when last window closed
@@ -57,6 +62,8 @@
 	};
 
 	connect(this, &OBSQTDisplay::DisplayCreated, addDrawCallback);
+	connect(App(), &QGuiApplication::screenRemoved, this,
+		&OBSProjector::ScreenRemoved);
 
 	if (type == ProjectorType::Multiview) {
 		obs_enter_graphics();
@@ -121,6 +128,8 @@
 	if (source)
 		obs_source_inc_showing(source);
 
+	allProjectors.push_back(this);
+
 	ready = true;
 
 	show();
@@ -160,12 +169,14 @@
 		multiviewProjectors.removeAll(this);
 
 	App()->DecrementSleepInhibition();
+
+	screen = nullptr;
 }
 
 void OBSProjector::SetMonitor(int monitor)
 {
 	savedMonitor = monitor;
-	QScreen *screen = QGuiApplication::screens()[monitor];
+	screen = QGuiApplication::screens()[monitor];
 	setGeometry(screen->geometry());
 	showFullScreen();
 	SetHideCursor();
@@ -173,6 +184,9 @@
 
 void OBSProjector::SetHideCursor()
 {
+	if (savedMonitor == -1)
+		return;
+
 	bool hideCursor = config_get_bool(GetGlobalConfig(), "BasicWindow",
 					  "HideProjectorCursor");
 
@@ -825,10 +839,25 @@
 					       SLOT(OpenFullScreenProjector()));
 		popup.addMenu(projectorMenu);
 
-		if (GetMonitor() > -1)
+		if (GetMonitor() > -1) {
 			popup.addAction(QTStr("Windowed"), this,
 					SLOT(OpenWindowedProjector()));
 
+		} else if (!this->isMaximized()) {
+			popup.addAction(QTStr("ResizeProjectorWindowToContent"),
+					this, SLOT(ResizeToContent()));
+		}
+
+		QAction *alwaysOnTopButton =
+			new QAction(QTStr("Basic.MainMenu.AlwaysOnTop"), this);
+		alwaysOnTopButton->setCheckable(true);
+		alwaysOnTopButton->setChecked(isAlwaysOnTop);
+
+		connect(alwaysOnTopButton, &QAction::toggled, this,
+			&OBSProjector::AlwaysOnTopToggled);
+
+		popup.addAction(alwaysOnTopButton);
+
 		popup.addAction(QTStr("Close"), this, SLOT(EscapeTriggered()));
 		popup.exec(QCursor::pos());
 	}
@@ -854,6 +883,8 @@
 {
 	OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
 	main->DeleteProjector(this);
+
+	allProjectors.removeAll(this);
 }
 
 void OBSProjector::UpdateMultiview()
@@ -1050,6 +1081,39 @@
 	savedMonitor = -1;
 
 	UpdateProjectorTitle(QT_UTF8(obs_source_get_name(source)));
+	screen = nullptr;
+}
+
+void OBSProjector::ResizeToContent()
+{
+	OBSSource source = GetSource();
+	uint32_t targetCX;
+	uint32_t targetCY;
+	int x, y, newX, newY;
+	float scale;
+
+	if (source) {
+		targetCX = std::max(obs_source_get_width(source), 1u);
+		targetCY = std::max(obs_source_get_height(source), 1u);
+	} else {
+		struct obs_video_info ovi;
+		obs_get_video_info(&ovi);
+		targetCX = ovi.base_width;
+		targetCY = ovi.base_height;
+	}
+
+	QSize size = this->size();
+	GetScaleAndCenterPos(targetCX, targetCY, size.width(), size.height(), x,
+			     y, scale);
+
+	newX = size.width() - (x * 2);
+	newY = size.height() - (y * 2);
+	resize(newX, newY);
+}
+
+void OBSProjector::AlwaysOnTopToggled(bool isAlwaysOnTop)
+{
+	SetIsAlwaysOnTop(isAlwaysOnTop, true);
 }
 
 void OBSProjector::closeEvent(QCloseEvent *event)
@@ -1057,3 +1121,30 @@
 	EscapeTriggered();
 	event->accept();
 }
+
+bool OBSProjector::IsAlwaysOnTop() const
+{
+	return isAlwaysOnTop;
+}
+
+bool OBSProjector::IsAlwaysOnTopOverridden() const
+{
+	return isAlwaysOnTopOverridden;
+}
+
+void OBSProjector::SetIsAlwaysOnTop(bool isAlwaysOnTop, bool isOverridden)
+{
+	this->isAlwaysOnTop = isAlwaysOnTop;
+	this->isAlwaysOnTopOverridden = isOverridden;
+
+	SetAlwaysOnTop(this, isAlwaysOnTop);
+}
+
+void OBSProjector::ScreenRemoved(QScreen *screen_)
+{
+	if (GetMonitor() < 0 || !screen)
+		return;
+
+	if (screen == screen_)
+		EscapeTriggered();
+}

obs-studio-25.0.8.tar.xz/UI/window-projector.hpp -> obs-studio-26.0.0.tar.xz/UI/window-projector.hpp Changed

@@ -36,6 +36,8 @@
 	void mouseDoubleClickEvent(QMouseEvent *event) override;
 	void closeEvent(QCloseEvent *event) override;
 
+	bool isAlwaysOnTop;
+	bool isAlwaysOnTopOverridden = false;
 	int savedMonitor = -1;
 	ProjectorType type = ProjectorType::Source;
 	std::vector<OBSWeakSource> multiviewScenes;
@@ -73,13 +75,17 @@
 	void UpdateProjectorTitle(QString name);
 
 	QRect prevGeometry;
-	void SetHideCursor();
 	void SetMonitor(int monitor);
 
+	QScreen *screen = nullptr;
+
 private slots:
 	void EscapeTriggered();
 	void OpenFullScreenProjector();
+	void ResizeToContent();
 	void OpenWindowedProjector();
+	void AlwaysOnTopToggled(bool alwaysOnTop);
+	void ScreenRemoved(QScreen *screen_);
 
 public:
 	OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
@@ -91,4 +97,9 @@
 	int GetMonitor();
 	static void UpdateMultiviewProjectors();
 	void RenameProjector(QString oldName, QString newName);
+	void SetHideCursor();
+
+	bool IsAlwaysOnTop() const;
+	bool IsAlwaysOnTopOverridden() const;
+	void SetIsAlwaysOnTop(bool isAlwaysOnTop, bool isOverridden);
 };

obs-studio-25.0.8.tar.xz/UI/window-remux.cpp -> obs-studio-26.0.0.tar.xz/UI/window-remux.cpp Changed

obs-studio-25.0.8.tar.xz/azure-pipelines.yml -> obs-studio-26.0.0.tar.xz/azure-pipelines.yml Changed

@@ -6,8 +6,6 @@
   CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100
   TWITCH-CLIENTID: $(twitch_clientid)
   TWITCH-HASH: $(twitch_hash)
-  MIXER-CLIENTID: $(mixer_clientid)
-  MIXER-HASH: $(mixer_hash)
   RESTREAM-CLIENTID: $(restream_clientid)
   RESTREAM-HASH: $(restream_hash)
 
@@ -34,23 +32,15 @@
   steps:
   - script: git submodule update --init --recursive
     displayName: 'Checkout Submodules'
-  - script: ./CI/install-dependencies-osx.sh
-    displayName: 'Install Dependencies'
-
-  - script: ./CI/before-script-osx.sh
-    displayName: 'Cmake'
-
-  - bash: |
-      set -e
-      cd ./build
-      make -j4
-      cd -
-    displayName: 'Build'
-
-  - script: ./CI/before-deploy-osx.sh
+  - script: TERM="" ./CI/full-build-macos.sh
+    displayName: 'Install dependencies and build'
+  - script: TERM="" ./CI/full-build-macos.sh -s -d -b -p
     condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['prHasCILabel'], true))
     displayName: 'Before Deploy'
-
+  - bash: |
+      mkdir -p ./nightly
+      find ./build -name \*.dmg -exec cp -PR \{\} ./nightly/ \;
+    displayName: 'Copy disk image'
   - task: PublishBuildArtifacts@1
     condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['prHasCILabel'], true))
     inputs:
@@ -72,7 +62,7 @@
     displayName: 'Download / Setup Deps / Run CMake'
   - task: MSBuild@1
     displayName: 'Build 32-bit'
-    inputs: 
+    inputs:
       msbuildArguments: '/m /p:Configuration=RelWithDebInfo'
       solution: .\build32\obs-studio.sln
   - script: ./CI/before-deploy-win.cmd
@@ -99,7 +89,7 @@
     displayName: 'Download / Setup Deps / Run CMake'
   - task: MSBuild@1
     displayName: 'Build 64-bit'
-    inputs: 
+    inputs:
       msbuildArguments: '/m /p:Configuration=RelWithDebInfo'
       solution: .\build64\obs-studio.sln
   - script: ./CI/before-deploy-win.cmd

obs-studio-25.0.8.tar.xz/cmake/Modules/FindLibVLC.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindLibVLC.cmake Changed

obs-studio-26.0.0.tar.xz/cmake/Modules/FindLibrnnoise.cmake Added

@@ -0,0 +1,68 @@
+# Once done these will be defined:
+#
+#  LIBRNNOISE_FOUND
+#  LIBRNNOISE_INCLUDE_DIRS
+#  LIBRNNOISE_LIBRARIES
+#
+# For use in OBS:
+#
+#  RNNOISE_INCLUDE_DIR
+
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(_RNNOISE QUIET rnnoise)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(_lib_suffix 64)
+else()
+	set(_lib_suffix 32)
+endif()
+
+find_path(RNNOISE_INCLUDE_DIR
+	NAMES rnnoise.h
+	HINTS
+		ENV rnnoisePath${_lib_suffix}
+		ENV rnnoisePath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${rnnoisePath${_lib_suffix}}
+		${rnnoisePath}
+		${DepsPath${_lib_suffix}}
+		${DepsPath}
+		${_RNNOISE_INCLUDE_DIRS}
+	PATHS
+		/usr/include /usr/local/include /opt/local/include /sw/include
+	PATH_SUFFIXES
+		include)
+
+find_library(RNNOISE_LIB
+	NAMES ${_RNNOISE_LIBRARIES} rnnoise
+	HINTS
+		ENV rnnoisePath${_lib_suffix}
+		ENV rnnoisePath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${rnnoisePath${_lib_suffix}}
+		${rnnoisePath}
+		${DepsPath${_lib_suffix}}
+		${DepsPath}
+		${_RNNOISE_LIBRARY_DIRS}
+	PATHS
+		/usr/lib /usr/local/lib /opt/local/lib /sw/lib
+	PATH_SUFFIXES
+		lib${_lib_suffix} lib
+		libs${_lib_suffix} libs
+		bin${_lib_suffix} bin
+		../lib${_lib_suffix} ../lib
+		../libs${_lib_suffix} ../libs
+		../bin${_lib_suffix} ../bin)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Librnnoise DEFAULT_MSG RNNOISE_LIB RNNOISE_INCLUDE_DIR)
+mark_as_advanced(RNNOISE_INCLUDE_DIR RNNOISE_LIB)
+
+if(LIBRNNOISE_FOUND)
+	set(LIBRNNOISE_INCLUDE_DIRS ${RNNOISE_INCLUDE_DIR})
+	set(LIBRNNOISE_LIBRARIES ${RNNOISE_LIB})
+endif()

obs-studio-25.0.8.tar.xz/cmake/Modules/FindLibv4l2.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindLibv4l2.cmake Changed

obs-studio-25.0.8.tar.xz/cmake/Modules/FindMbedTLS.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindMbedTLS.cmake Changed

@@ -1,12 +1,9 @@
 # Once done these will be defined:
 #
-#  LIBMBEDTLS_FOUND
-#  LIBMBEDTLS_INCLUDE_DIRS
-#  LIBMBEDTLS_LIBRARIES
+#  MBEDTLS_FOUND
+#  MBEDTLS_INCLUDE_DIRS
+#  MBEDTLS_LIBRARIES
 #
-# For use in OBS:
-#
-#  MBEDTLS_INCLUDE_DIR
 
 find_package(PkgConfig QUIET)
 if (PKG_CONFIG_FOUND)
@@ -122,22 +119,19 @@
 
 # If we find all three libraries, then go ahead.
 if(MBEDTLS_LIB AND MBEDCRYPTO_LIB AND MBEDX509_LIB)
-	set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
-	set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
-	set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
-	set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
+	set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
+	set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
 
 # Otherwise, if we find MBEDTLS_LIB, and it has both CRYPTO and x509
 # within the single lib (i.e. a windows build environment), then also
 # feel free to go ahead.
 elseif(MBEDTLS_LIB AND MBEDTLS_INCLUDES_CRYPTO AND MBEDTLS_INCLUDES_X509)
-	set(LIBMBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
-	set(LIBMBEDTLS_LIBRARIES ${MBEDTLS_LIB})
-	set(MBEDTLS_INCLUDE_DIRS ${LIBMBEDTLS_INCLUDE_DIRS})
-	set(MBEDTLS_LIBRARIES ${LIBMBEDTLS_LIBRARIES})
+	set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
+	set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB})
 endif()
 
 # Now we've accounted for the 3-vs-1 library case:
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libmbedtls DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
-mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
+find_package_handle_standard_args(MbedTLS DEFAULT_MSG MBEDTLS_LIBRARIES MBEDTLS_INCLUDE_DIRS)
+mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIB MBEDCRYPTO_LIB MBEDX509_LIB)
+

obs-studio-26.0.0.tar.xz/cmake/Modules/FindOSS.cmake Added

obs-studio-25.0.8.tar.xz/cmake/Modules/FindSwigDeps.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindSwigDeps.cmake Changed

obs-studio-26.0.0.tar.xz/cmake/Modules/FindUDev.cmake Added

obs-studio-25.0.8.tar.xz/cmake/Modules/FindVulkan.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindVulkan.cmake Changed

obs-studio-25.0.8.tar.xz/cmake/Modules/FindXCB.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindXCB.cmake Changed

@@ -204,30 +204,19 @@
 
     find_path(XCB_${_comp}_INCLUDE_DIR NAMES ${_header} HINTS ${PKG_XCB_INCLUDE_DIRS})
     find_library(XCB_${_comp}_LIBRARY NAMES ${_lib} HINTS ${PKG_XCB_LIBRARY_DIRS})
+    mark_as_advanced(XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
 
     if(XCB_${_comp}_INCLUDE_DIR AND XCB_${_comp}_LIBRARY)
+        set(XCB_${_comp}_FOUND TRUE)
         list(APPEND XCB_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR})
         list(APPEND XCB_LIBRARIES ${XCB_${_comp}_LIBRARY})
         if (NOT XCB_FIND_QUIETLY)
             message(STATUS "XCB[${_comp}]: Found component ${_comp}")
         endif()
     endif()
-
-    if(XCB_FIND_REQUIRED_${_comp})
-        list(APPEND requiredComponents XCB_${_comp}_FOUND)
-    endif()
-
-    find_package_handle_standard_args(XCB_${_comp} DEFAULT_MSG XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
-
-    mark_as_advanced(XCB_${_comp}_LIBRARY XCB_${_comp}_INCLUDE_DIR)
-
-    # compatibility for old variable naming
-    set(XCB_${_comp}_INCLUDE_DIRS ${XCB_${_comp}_INCLUDE_DIR})
-    set(XCB_${_comp}_LIBRARIES ${XCB_${_comp}_LIBRARY})
 endmacro()
 
 IF (NOT WIN32)
-    include(FindPackageHandleStandardArgs)
     # Use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
     find_package(PkgConfig)
@@ -243,9 +232,11 @@
         list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)
     endif()
 
-    find_package_handle_standard_args(XCB DEFAULT_MSG XCB_LIBRARIES XCB_INCLUDE_DIRS ${requiredComponents})
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(XCB
+        REQUIRED_VARS XCB_LIBRARIES XCB_INCLUDE_DIRS
+        HANDLE_COMPONENTS)
 
     # compatibility for old variable naming
     set(XCB_INCLUDE_DIR ${XCB_INCLUDE_DIRS})
-
 ENDIF (NOT WIN32)

obs-studio-25.0.8.tar.xz/cmake/Modules/FindZLIB.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/FindZLIB.cmake Changed

obs-studio-25.0.8.tar.xz/cmake/Modules/ObsHelpers.cmake -> obs-studio-26.0.0.tar.xz/cmake/Modules/ObsHelpers.cmake Changed

obs-studio-25.0.8.tar.xz/deps/blake2/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/blake2/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/file-updater/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/file-updater/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/glad/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/glad/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/glad/src/glad_glx.c -> obs-studio-26.0.0.tar.xz/deps/glad/src/glad_glx.c Changed

obs-studio-25.0.8.tar.xz/deps/ipc-util/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/ipc-util/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/jansson/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/jansson/CMakeLists.txt Changed

@@ -342,7 +342,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/src/utf.h
    ${CMAKE_CURRENT_BINARY_DIR}/private_include/jansson_private_config.h)
 
-set(JANSSON_HDR_PUBLIC 
+set(JANSSON_HDR_PUBLIC
    ${CMAKE_CURRENT_BINARY_DIR}/include/jansson_config.h
    ${CMAKE_CURRENT_SOURCE_DIR}/src/jansson.h)
 
@@ -351,21 +351,22 @@
 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} 
+   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 
+   add_library(jansson
       ${JANSSON_SRC}
-      ${JANSSON_HDR_PRIVATE} 
+      ${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")
@@ -379,12 +380,12 @@
    find_package(Sphinx)
 
    if (NOT SPHINX_FOUND)
-      message(WARNING "Sphinx not found. Cannot generate documentation! 
+      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 
+         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()
@@ -437,7 +438,7 @@
             list(APPEND DOC_TARGETS latex)
          endif()
       endif()
-      
+
       # The doc target will build all documentation targets.
       add_custom_target(doc)
 
@@ -579,7 +580,7 @@
 
    # 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} 
+   add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
                      DEPENDS json_process ${api_tests})
 endif ()
 
@@ -624,33 +625,33 @@
 export(PACKAGE jansson)
 
 # Generate the config file for the build-tree.
-set(JANSSON__INCLUDE_DIRS 
+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 
+                ${PROJECT_BINARY_DIR}/JanssonConfig.cmake
                 @ONLY)
 
 # Generate the config file for the installation tree.
-file(RELATIVE_PATH 
-    REL_INCLUDE_DIR 
+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, 
+# 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 
+# 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}") 
+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 
+                ${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 
+                ${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake
                 @ONLY)
 
 # Define the public headers.
@@ -671,7 +672,7 @@
         PUBLIC_HEADER DESTINATION "${JANSSON_INSTALL_INCLUDE_DIR}" COMPONENT dev)
 
 # Install the pkg-config.
-install (FILES 
+install (FILES
          ${CMAKE_CURRENT_BINARY_DIR}/jansson.pc
          DESTINATION ${JANSSON_INSTALL_LIB_DIR}/pkgconfig COMPONENT dev)
 
@@ -682,7 +683,7 @@
     DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev)
 
 # Install exports for the install-tree.
-install(EXPORT JanssonTargets 
+install(EXPORT JanssonTargets
         DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev)
 endif()
 
@@ -690,4 +691,4 @@
 set(JANSSON_LIBRARIES jansson CACHE STRING "Jansson libraries")
 
 target_include_directories(jansson
-        PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/include")
\ No newline at end of file
+        PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/include")

obs-studio-25.0.8.tar.xz/deps/libcaption/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/libcaption/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/libff/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/libff/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/libff/libff/ff-util.c -> obs-studio-26.0.0.tar.xz/deps/libff/libff/ff-util.c Changed

obs-studio-25.0.8.tar.xz/deps/lzma/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/lzma/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/media-playback/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/media-playback/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/media-playback/media-playback/closest-format.h -> obs-studio-26.0.0.tar.xz/deps/media-playback/media-playback/closest-format.h Changed

obs-studio-25.0.8.tar.xz/deps/media-playback/media-playback/decode.h -> obs-studio-26.0.0.tar.xz/deps/media-playback/media-playback/decode.h Changed

obs-studio-25.0.8.tar.xz/deps/media-playback/media-playback/media.c -> obs-studio-26.0.0.tar.xz/deps/media-playback/media-playback/media.c Changed

@@ -109,9 +109,21 @@
 	}
 }
 
-static inline enum video_colorspace convert_color_space(enum AVColorSpace s)
+static inline enum video_colorspace
+convert_color_space(enum AVColorSpace s, enum AVColorTransferCharacteristic trc)
 {
-	return s == AVCOL_SPC_BT709 ? VIDEO_CS_709 : VIDEO_CS_DEFAULT;
+	switch (s) {
+	case AVCOL_SPC_BT709:
+		return (trc == AVCOL_TRC_IEC61966_2_1) ? VIDEO_CS_SRGB
+						       : VIDEO_CS_709;
+	case AVCOL_SPC_FCC:
+	case AVCOL_SPC_BT470BG:
+	case AVCOL_SPC_SMPTE170M:
+	case AVCOL_SPC_SMPTE240M:
+		return VIDEO_CS_601;
+	default:
+		return VIDEO_CS_DEFAULT;
+	}
 }
 
 static inline enum video_range_type convert_color_range(enum AVColorRange r)
@@ -205,7 +217,7 @@
 					  m->v.decoder->pix_fmt,
 					  m->v.decoder->width,
 					  m->v.decoder->height, m->scale_format,
-					  SWS_FAST_BILINEAR, NULL, NULL, NULL);
+					  SWS_POINT, NULL, NULL, NULL);
 	if (!m->swscale) {
 		blog(LOG_WARNING, "MP: Failed to initialize scaler");
 		return false;
@@ -216,7 +228,7 @@
 
 	int ret = av_image_alloc(m->scale_pic, m->scale_linesizes,
 				 m->v.decoder->width, m->v.decoder->height,
-				 m->scale_format, 1);
+				 m->scale_format, 32);
 	if (ret < 0) {
 		blog(LOG_WARNING, "MP: Failed to create scale pic data");
 		return false;
@@ -227,13 +239,20 @@
 
 static bool mp_media_prepare_frames(mp_media_t *m)
 {
+	bool actively_seeking = m->seek_next_ts && m->pause;
+
 	while (!mp_media_ready_to_start(m)) {
 		if (!m->eof) {
 			int ret = mp_media_next_packet(m);
-			if (ret == AVERROR_EOF || ret == AVERROR_EXIT)
-				m->eof = true;
-			else if (ret < 0)
+			if (ret == AVERROR_EOF || ret == AVERROR_EXIT) {
+				if (!actively_seeking) {
+					m->eof = true;
+				} else {
+					break;
+				}
+			} else if (ret < 0) {
 				return false;
+			}
 		}
 
 		if (m->has_video && !mp_decode_frame(&m->v))
@@ -365,7 +384,7 @@
 		frame->data[0] -= frame->linesize[0] * (f->height - 1);
 
 	new_format = convert_pixel_format(m->scale_format);
-	new_space = convert_color_space(f->colorspace);
+	new_space = convert_color_space(f->colorspace, f->color_trc);
 	new_range = m->force_range == VIDEO_RANGE_DEFAULT
 			    ? convert_color_range(f->color_range)
 			    : m->force_range;
@@ -409,23 +428,34 @@
 		d->got_first_keyframe = true;
 	}
 
-	if (preload)
-		m->v_preload_cb(m->opaque, frame);
-	else
+	if (preload) {
+		if (m->seek_next_ts && m->v_seek_cb) {
+			m->v_seek_cb(m->opaque, frame);
+		} else {
+			m->v_preload_cb(m->opaque, frame);
+		}
+	} else {
 		m->v_cb(m->opaque, frame);
+	}
 }
 
 static void mp_media_calc_next_ns(mp_media_t *m)
 {
 	int64_t min_next_ns = mp_media_get_next_min_pts(m);
 	int64_t delta = min_next_ns - m->next_pts_ns;
+
+	if (m->seek_next_ts) {
+		delta = 0;
+		m->seek_next_ts = false;
+	} else {
 #ifdef _DEBUG
-	assert(delta >= 0);
+		assert(delta >= 0);
 #endif
-	if (delta < 0)
-		delta = 0;
-	if (delta > 3000000000)
-		delta = 0;
+		if (delta < 0)
+			delta = 0;
+		if (delta > 3000000000)
+			delta = 0;
+	}
 
 	m->next_ns += delta;
 	m->next_pts_ns = min_next_ns;
@@ -455,8 +485,12 @@
 		}
 	}
 
-	if (m->has_video && m->is_local_file)
+	if (m->has_video && m->is_local_file) {
 		mp_decode_flush(&m->v);
+		if (m->seek_next_ts && m->pause && m->v_preload_cb &&
+		    mp_media_prepare_frames(m))
+			mp_media_next_video(m, true);
+	}
 	if (m->has_audio && m->is_local_file)
 		mp_decode_flush(&m->a);
 }
@@ -473,6 +507,7 @@
 
 	m->eof = false;
 	m->base_ts += next_ts;
+	m->seek_next_ts = false;
 
 	pthread_mutex_lock(&m->mutex);
 	stopping = m->stopping;
@@ -583,7 +618,11 @@
 		av_dict_set_int(&opts, "buffer_size", m->buffering, 0);
 
 	m->fmt = avformat_alloc_context();
+	if (m->buffering == 0) {
+		m->fmt->flags |= AVFMT_FLAG_NOBUFFER;
+	}
 	if (!m->is_local_file) {
+		av_dict_set(&opts, "stimeout", "30000000", 0);
 		m->fmt->interrupt_callback.callback = interrupt_callback;
 		m->fmt->interrupt_callback.opaque = m;
 	}
@@ -593,7 +632,9 @@
 	av_dict_free(&opts);
 
 	if (ret < 0) {
-		blog(LOG_WARNING, "MP: Failed to open media: '%s'", m->path);
+		if (!m->reconnecting)
+			blog(LOG_WARNING, "MP: Failed to open media: '%s'",
+			     m->path);
 		return false;
 	}
 
@@ -603,6 +644,7 @@
 		return false;
 	}
 
+	m->reconnecting = false;
 	m->has_video = mp_decode_init(m, AVMEDIA_TYPE_VIDEO, m->hw);
 	m->has_audio = mp_decode_init(m, AVMEDIA_TYPE_AUDIO, m->hw);
 
@@ -643,11 +685,14 @@
 
 		pthread_mutex_lock(&m->mutex);
 		is_active = m->active;
+		pause = m->pause;
 		pthread_mutex_unlock(&m->mutex);
 
-		if (!is_active) {
+		if (!is_active || pause) {
 			if (os_sem_wait(m->sem) < 0)
 				return false;
+			if (pause)
+				reset_ts(m);
 		} else {
 			timeout = mp_media_sleepto(m);
 		}
@@ -677,6 +722,7 @@
 		}
 
 		if (seek) {
+			m->seek_next_ts = true;
 			seek_to(m, seek_pos);
 			continue;
 		}
@@ -754,6 +800,7 @@
 	media->v_cb = info->v_cb;
 	media->a_cb = info->a_cb;
 	media->stop_cb = info->stop_cb;
+	media->v_seek_cb = info->v_seek_cb;
 	media->v_preload_cb = info->v_preload_cb;
 	media->force_range = info->force_range;
 	media->buffering = info->buffering;
@@ -817,7 +864,7 @@
 	pthread_mutex_init_value(&media->mutex);
 }
 
-void mp_media_play(mp_media_t *m, bool loop)
+void mp_media_play(mp_media_t *m, bool loop, bool reconnecting)
 {
 	pthread_mutex_lock(&m->mutex);
 
@@ -826,6 +873,7 @@
 
 	m->looping = loop;
 	m->active = true;
+	m->reconnecting = reconnecting;
 
 	pthread_mutex_unlock(&m->mutex);
 
@@ -859,8 +907,7 @@
 
 int64_t mp_get_current_time(mp_media_t *m)
 {
-	int speed = (int)((float)m->speed / 100.0f);
-	return (mp_media_get_base_pts(m) / 1000000) * speed;
+	return mp_media_get_base_pts(m) * (int64_t)m->speed / 100000000LL;
 }
 
 void mp_media_seek_to(mp_media_t *m, int64_t pos)

obs-studio-25.0.8.tar.xz/deps/media-playback/media-playback/media.h -> obs-studio-26.0.0.tar.xz/deps/media-playback/media-playback/media.h Changed

@@ -46,6 +46,7 @@
 	AVFormatContext *fmt;
 
 	mp_video_cb v_preload_cb;
+	mp_video_cb v_seek_cb;
 	mp_stop_cb stop_cb;
 	mp_video_cb v_cb;
 	mp_audio_cb a_cb;
@@ -64,6 +65,7 @@
 	struct mp_decode v;
 	struct mp_decode a;
 	bool is_local_file;
+	bool reconnecting;
 	bool has_video;
 	bool has_audio;
 	bool is_file;
@@ -97,6 +99,7 @@
 	bool pause;
 	bool reset_ts;
 	bool seek;
+	bool seek_next_ts;
 	int64_t seek_pos;
 };
 
@@ -107,6 +110,7 @@
 
 	mp_video_cb v_cb;
 	mp_video_cb v_preload_cb;
+	mp_video_cb v_seek_cb;
 	mp_audio_cb a_cb;
 	mp_stop_cb stop_cb;
 
@@ -117,12 +121,13 @@
 	enum video_range_type force_range;
 	bool hardware_decoding;
 	bool is_local_file;
+	bool reconnecting;
 };
 
 extern bool mp_media_init(mp_media_t *media, const struct mp_media_info *info);
 extern void mp_media_free(mp_media_t *media);
 
-extern void mp_media_play(mp_media_t *media, bool loop);
+extern void mp_media_play(mp_media_t *media, bool loop, bool reconnecting);
 extern void mp_media_stop(mp_media_t *media);
 extern void mp_media_play_pause(mp_media_t *media, bool pause);
 extern int64_t mp_get_current_time(mp_media_t *m);

obs-studio-25.0.8.tar.xz/deps/obs-scripting/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/obs-scripting/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/obs-scripting/obs-scripting-python.c -> obs-studio-26.0.0.tar.xz/deps/obs-scripting/obs-scripting-python.c Changed

obs-studio-25.0.8.tar.xz/deps/obs-scripting/obslua/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/obs-scripting/obslua/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/obs-scripting/obslua/obslua.i -> obs-studio-26.0.0.tar.xz/deps/obs-scripting/obslua/obslua.i Changed

obs-studio-25.0.8.tar.xz/deps/obs-scripting/obspython/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/obs-scripting/obspython/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/deps/obs-scripting/obspython/obspython.i -> obs-studio-26.0.0.tar.xz/deps/obs-scripting/obspython/obspython.i Changed

obs-studio-25.0.8.tar.xz/deps/w32-pthreads/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/deps/w32-pthreads/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/docs/sphinx/reference-frontend-api.rst -> obs-studio-26.0.0.tar.xz/docs/sphinx/reference-frontend-api.rst Changed

obs-studio-25.0.8.tar.xz/docs/sphinx/reference-libobs-media-io.rst -> obs-studio-26.0.0.tar.xz/docs/sphinx/reference-libobs-media-io.rst Changed

obs-studio-25.0.8.tar.xz/docs/sphinx/reference-outputs.rst -> obs-studio-26.0.0.tar.xz/docs/sphinx/reference-outputs.rst Changed

obs-studio-25.0.8.tar.xz/docs/sphinx/reference-properties.rst -> obs-studio-26.0.0.tar.xz/docs/sphinx/reference-properties.rst Changed

@@ -230,6 +230,13 @@
    :param    description: Localized name shown to user
    :return:               The property
 
+   Relevant data types used with this function:
+
+.. code:: cpp
+
+   typedef bool (*obs_property_clicked_t)(obs_properties_t *props,
+                   obs_property_t *property, void *data);
+
 ---------------------
 
 .. function:: obs_property_t *obs_properties_add_font(obs_properties_t *props, const char *name, const char *description)
@@ -514,16 +521,20 @@
 -------------------------------
 
 .. function:: void obs_property_set_modified_callback(obs_property_t *p, obs_property_modified_t modified)
+              void obs_property_set_modified_callback2(obs_property_t *p, obs_property_modified2_t modified2, void *priv)
 
    Allows the ability to change the properties depending on what
    settings are used by the user.
 
-   Relevant data types used with this function:
+   Relevant data types used with these functions:
 
 .. code:: cpp
 
-   typedef bool (*obs_property_clicked_t)(obs_properties_t *props,
-                   obs_property_t *property, void *data);
+   typedef bool (*obs_property_modified_t)(obs_properties_t *props,
+                   obs_property_t *property, obs_data_t *settings);
+   typedef bool (*obs_property_modified2_t)(void *priv,
+                   obs_properties_t *props, obs_property_t *property,
+                   obs_data_t *settings);
 
 ---------------------

obs-studio-25.0.8.tar.xz/docs/sphinx/scripting.rst -> obs-studio-26.0.0.tar.xz/docs/sphinx/scripting.rst Changed

obs-studio-25.0.8.tar.xz/formatcode.sh -> obs-studio-26.0.0.tar.xz/formatcode.sh Changed

obs-studio-25.0.8.tar.xz/libobs-d3d11/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/libobs-d3d11/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/libobs-opengl/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/libobs-opengl/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/libobs-opengl/gl-cocoa.m -> obs-studio-26.0.0.tar.xz/libobs-opengl/gl-cocoa.m Changed

obs-studio-25.0.8.tar.xz/libobs-opengl/gl-shaderparser.c -> obs-studio-26.0.0.tar.xz/libobs-opengl/gl-shaderparser.c Changed

obs-studio-25.0.8.tar.xz/libobs-winrt/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/libobs-winrt/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/libobs-winrt/winrt-capture.cpp -> obs-studio-26.0.0.tar.xz/libobs-winrt/winrt-capture.cpp Changed

@@ -30,14 +30,10 @@
 
 extern "C" EXPORT BOOL winrt_capture_cursor_toggle_supported()
 try {
-#ifdef NTDDI_WIN10_VB
 	return winrt::Windows::Foundation::Metadata::ApiInformation::
 		IsPropertyPresent(
 			L"Windows.Graphics.Capture.GraphicsCaptureSession",
 			L"IsCursorCaptureEnabled");
-#else
-	return false;
-#endif
 } catch (const winrt::hresult_error &err) {
 	blog(LOG_ERROR, "winrt_capture_cursor_toggle_supported (0x%08X): %ls",
 	     err.to_abi(), err.message().c_str());
@@ -62,11 +58,14 @@
 static bool get_client_box(HWND window, uint32_t width, uint32_t height,
 			   D3D11_BOX *client_box)
 {
-	RECT client_rect, window_rect{};
+	RECT client_rect{}, window_rect{};
 	POINT upper_left{};
 
-	const bool client_box_available =
-		GetClientRect(window, &client_rect) &&
+	/* check iconic (minimized) twice, ABA is very unlikely */
+	bool client_box_available =
+		!IsIconic(window) && GetClientRect(window, &client_rect) &&
+		!IsIconic(window) && (client_rect.right > 0) &&
+		(client_rect.bottom > 0) &&
 		(DwmGetWindowAttribute(window, DWMWA_EXTENDED_FRAME_BOUNDS,
 				       &window_rect,
 				       sizeof(window_rect)) == S_OK) &&
@@ -100,6 +99,9 @@
 
 		client_box->front = 0;
 		client_box->back = 1;
+
+		client_box_available = (client_box->right <= width) &&
+				       (client_box->bottom <= height);
 	}
 
 	return client_box_available;
@@ -123,15 +125,16 @@
 	winrt::Windows::Graphics::Capture::GraphicsCaptureSession session{
 		nullptr};
 	winrt::Windows::Graphics::SizeInt32 last_size;
+	winrt::Windows::Graphics::Capture::GraphicsCaptureItem::Closed_revoker
+		closed;
 	winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool::
 		FrameArrived_revoker frame_arrived;
 
 	uint32_t texture_width;
 	uint32_t texture_height;
 	D3D11_BOX client_box;
-	bool client_box_available;
 
-	bool thread_changed;
+	BOOL active;
 	struct winrt_capture *next;
 
 	void draw_cursor()
@@ -186,6 +189,13 @@
 		DestroyIcon(icon);
 	}
 
+	void on_closed(
+		winrt::Windows::Graphics::Capture::GraphicsCaptureItem const &,
+		winrt::Windows::Foundation::IInspectable const &)
+	{
+		active = FALSE;
+	}
+
 	void on_frame_arrived(winrt::Windows::Graphics::Capture::
 				      Direct3D11CaptureFramePool const &sender,
 			      winrt::Windows::Foundation::IInspectable const &)
@@ -205,51 +215,54 @@
 		D3D11_TEXTURE2D_DESC desc;
 		frame_surface->GetDesc(&desc);
 
-		client_box_available = false;
-		if (client_area) {
-			client_box_available = get_client_box(
-				window, desc.Width, desc.Height, &client_box);
-		}
+		if (!client_area || get_client_box(window, desc.Width,
+						   desc.Height, &client_box)) {
+			if (client_area) {
+				texture_width =
+					client_box.right - client_box.left;
+				texture_height =
+					client_box.bottom - client_box.top;
+			} else {
+				texture_width = desc.Width;
+				texture_height = desc.Height;
+			}
 
-		if (client_box_available) {
-			texture_width = client_box.right - client_box.left;
-			texture_height = client_box.bottom - client_box.top;
-		} else {
-			texture_width = desc.Width;
-			texture_height = desc.Height;
-		}
+			if (texture) {
+				if (texture_width !=
+					    gs_texture_get_width(texture) ||
+				    texture_height !=
+					    gs_texture_get_height(texture)) {
+					gs_texture_destroy(texture);
+					texture = nullptr;
+				}
+			}
 
-		if (texture) {
-			if (texture_width != gs_texture_get_width(texture) ||
-			    texture_height != gs_texture_get_height(texture)) {
-				gs_texture_destroy(texture);
-				texture = nullptr;
+			if (!texture) {
+				texture = gs_texture_create_gdi(texture_width,
+								texture_height);
 			}
-		}
 
-		if (!texture) {
-			texture = gs_texture_create_gdi(texture_width,
-							texture_height);
-		}
+			if (client_area) {
+				context->CopySubresourceRegion(
+					(ID3D11Texture2D *)gs_texture_get_obj(
+						texture),
+					0, 0, 0, 0, frame_surface.get(), 0,
+					&client_box);
+			} else {
+				/* if they gave an SRV, we could avoid this copy */
+				context->CopyResource(
+					(ID3D11Texture2D *)gs_texture_get_obj(
+						texture),
+					frame_surface.get());
+			}
 
-		if (client_box_available) {
-			context->CopySubresourceRegion(
-				(ID3D11Texture2D *)gs_texture_get_obj(texture),
-				0, 0, 0, 0, frame_surface.get(), 0,
-				&client_box);
-		} else {
-			/* if they gave an SRV, we could avoid this copy */
-			context->CopyResource(
-				(ID3D11Texture2D *)gs_texture_get_obj(texture),
-				frame_surface.get());
-		}
+			if (capture_cursor && cursor_visible) {
+				draw_cursor();
+			}
 
-		if (capture_cursor && cursor_visible) {
-			draw_cursor();
+			texture_written = true;
 		}
 
-		texture_written = true;
-
 		if (frame_content_size.Width != last_size.Width ||
 		    frame_content_size.Height != last_size.Height) {
 			frame_pool.Recreate(
@@ -265,11 +278,13 @@
 	}
 };
 
-struct winrt_capture *capture_list;
+static struct winrt_capture *capture_list;
 
 static void winrt_capture_device_loss_release(void *data)
 {
 	winrt_capture *capture = static_cast<winrt_capture *>(data);
+	capture->active = FALSE;
+
 	capture->frame_arrived.revoke();
 	capture->frame_pool.Close();
 	capture->session.Close();
@@ -278,12 +293,32 @@
 	capture->frame_pool = nullptr;
 	capture->context = nullptr;
 	capture->device = nullptr;
+	capture->item = nullptr;
 }
 
 static void winrt_capture_device_loss_rebuild(void *device_void, void *data)
 {
 	winrt_capture *capture = static_cast<winrt_capture *>(data);
 
+	auto activation_factory = winrt::get_activation_factory<
+		winrt::Windows::Graphics::Capture::GraphicsCaptureItem>();
+	auto interop_factory =
+		activation_factory.as<IGraphicsCaptureItemInterop>();
+	winrt::Windows::Graphics::Capture::GraphicsCaptureItem item = {nullptr};
+	try {
+		interop_factory->CreateForWindow(
+			capture->window,
+			winrt::guid_of<ABI::Windows::Graphics::Capture::
+					       IGraphicsCaptureItem>(),
+			reinterpret_cast<void **>(winrt::put_abi(item)));
+	} catch (winrt::hresult_error &err) {
+		blog(LOG_ERROR, "CreateForWindow (0x%08X): %ls", err.to_abi(),
+		     err.message().c_str());
+	} catch (...) {
+		blog(LOG_ERROR, "CreateForWindow (0x%08X)",
+		     winrt::to_hresult());
+	}
+
 	ID3D11Device *const d3d_device = (ID3D11Device *)device_void;
 	ComPtr<IDXGIDevice> dxgi_device;
 	if (FAILED(d3d_device->QueryInterface(&dxgi_device)))
@@ -305,14 +340,13 @@
 					DirectXPixelFormat::B8G8R8A8UIntNormalized,
 				2, capture->last_size);
 	const winrt::Windows::Graphics::Capture::GraphicsCaptureSession session =
-		frame_pool.CreateCaptureSession(capture->item);
+		frame_pool.CreateCaptureSession(item);
 
 	/* disable cursor capture if possible since ours performs better */
-#ifdef NTDDI_WIN10_VB
 	if (winrt_capture_cursor_toggle_supported())
 		session.IsCursorCaptureEnabled(false);
-#endif
 
+	capture->item = item;
 	capture->device = device;
 	d3d_device->GetImmediateContext(&capture->context);
 	capture->frame_pool = frame_pool;
@@ -321,11 +355,17 @@
 		winrt::auto_revoke,
 		{capture, &winrt_capture::on_frame_arrived});
 
-	session.StartCapture();
+	try {
+		session.StartCapture();
+		capture->active = TRUE;
+	} catch (winrt::hresult_error &err) {
+		blog(LOG_ERROR, "StartCapture (0x%08X): %ls", err.to_abi(),
+		     err.message().c_str());
+	} catch (...) {
+		blog(LOG_ERROR, "StartCapture (0x%08X)", winrt::to_hresult());
+	}
 }
 
-thread_local bool initialized_tls;
-
 extern "C" EXPORT struct winrt_capture *
 winrt_capture_init(BOOL cursor, HWND window, BOOL client_area)
 try {
@@ -384,13 +424,8 @@
 	/* disable cursor capture if possible since ours performs better */
 	const BOOL cursor_toggle_supported =
 		winrt_capture_cursor_toggle_supported();
-#ifdef NTDDI_WIN10_VB
 	if (cursor_toggle_supported)
 		session.IsCursorCaptureEnabled(false);
-#endif
-
-	if (capture_list == nullptr)
-		initialized_tls = true;
 
 	struct winrt_capture *capture = new winrt_capture{};
 	capture->window = window;
@@ -402,6 +437,8 @@
 	capture->frame_pool = frame_pool;
 	capture->session = session;
 	capture->last_size = size;
+	capture->closed = item.Closed(winrt::auto_revoke,
+				      {capture, &winrt_capture::on_closed});
 	capture->frame_arrived = frame_pool.FrameArrived(
 		winrt::auto_revoke,
 		{capture, &winrt_capture::on_frame_arrived});
@@ -409,6 +446,7 @@
 	capture_list = capture;
 
 	session.StartCapture();
+	capture->active = TRUE;
 
 	gs_device_loss callbacks;
 	callbacks.device_loss_release = winrt_capture_device_loss_release;
@@ -449,6 +487,7 @@
 		obs_leave_graphics();
 
 		capture->frame_arrived.revoke();
+		capture->closed.revoke();
 		capture->frame_pool.Close();
 		capture->session.Close();
 
@@ -476,6 +515,11 @@
 	gs_technique_end(tech);
 }
 
+extern "C" EXPORT BOOL winrt_capture_active(const struct winrt_capture *capture)
+{
+	return capture->active;
+}
+
 extern "C" EXPORT void winrt_capture_show_cursor(struct winrt_capture *capture,
 						 BOOL visible)
 {
@@ -485,28 +529,8 @@
 extern "C" EXPORT void winrt_capture_render(struct winrt_capture *capture,
 					    gs_effect_t *effect)
 {
-	if (capture && capture->texture_written) {
-		if (!initialized_tls) {
-			struct winrt_capture *current = capture_list;
-			while (current) {
-				current->thread_changed = true;
-				current = current->next;
-			}
-
-			initialized_tls = true;
-		}
-
-		if (capture->thread_changed) {
-			/* new graphics thread. treat like device loss. */
-			winrt_capture_device_loss_release(capture);
-			winrt_capture_device_loss_rebuild(gs_get_device_obj(),
-							  capture);
-
-			capture->thread_changed = false;
-		}
-
+	if (capture->texture_written)
 		draw_texture(capture, effect);
-	}
 }
 
 extern "C" EXPORT uint32_t
@@ -520,3 +544,22 @@
 {
 	return capture ? capture->texture_height : 0;
 }
+
+extern "C" EXPORT void winrt_capture_thread_start()
+{
+	struct winrt_capture *capture = capture_list;
+	void *const device = gs_get_device_obj();
+	while (capture) {
+		winrt_capture_device_loss_rebuild(device, capture);
+		capture = capture->next;
+	}
+}
+
+extern "C" EXPORT void winrt_capture_thread_stop()
+{
+	struct winrt_capture *capture = capture_list;
+	while (capture) {
+		winrt_capture_device_loss_release(capture);
+		capture = capture->next;
+	}
+}

obs-studio-25.0.8.tar.xz/libobs-winrt/winrt-capture.h -> obs-studio-26.0.0.tar.xz/libobs-winrt/winrt-capture.h Changed

obs-studio-26.0.0.tar.xz/libobs-winrt/winrt-dispatch.cpp Added

@@ -0,0 +1,64 @@
+extern "C" EXPORT void winrt_initialize()
+{
+	winrt::init_apartment(winrt::apartment_type::single_threaded);
+}
+
+extern "C" EXPORT void winrt_uninitialize()
+{
+	winrt::uninit_apartment();
+}
+
+static winrt::Windows::System::DispatcherQueueController
+CreateDispatcherQueueController()
+{
+	DispatcherQueueOptions options{sizeof(DispatcherQueueOptions),
+				       DQTYPE_THREAD_CURRENT, DQTAT_COM_STA};
+
+	winrt::Windows::System::DispatcherQueueController controller{nullptr};
+	winrt::check_hresult(CreateDispatcherQueueController(
+		options,
+		reinterpret_cast<
+			ABI::Windows::System::IDispatcherQueueController **>(
+			winrt::put_abi(controller))));
+	return controller;
+}
+
+struct winrt_disaptcher {
+	winrt::Windows::System::DispatcherQueueController controller{nullptr};
+};
+
+extern "C" EXPORT struct winrt_disaptcher *winrt_dispatcher_init()
+{
+	struct winrt_disaptcher *dispatcher = NULL;
+	try {
+		if (winrt::Windows::Foundation::Metadata::ApiInformation::
+			    IsApiContractPresent(
+				    L"Windows.Foundation.UniversalApiContract",
+				    5)) {
+			winrt::Windows::System::DispatcherQueueController
+				controller = CreateDispatcherQueueController();
+
+			dispatcher = new struct winrt_disaptcher;
+			dispatcher->controller = std::move(controller);
+		}
+	} catch (const winrt::hresult_error &err) {
+		blog(LOG_ERROR, "winrt_dispatcher_init (0x%08X): %ls",
+		     err.to_abi(), err.message().c_str());
+	} catch (...) {
+		blog(LOG_ERROR, "winrt_dispatcher_init (0x%08X)",
+		     winrt::to_hresult());
+	}
+
+	return dispatcher;
+}
+
+extern "C" EXPORT void
+winrt_dispatcher_free(struct winrt_disaptcher *dispatcher)
+try {
+	delete dispatcher;
+} catch (const winrt::hresult_error &err) {
+	blog(LOG_ERROR, "winrt_dispatcher_free (0x%08X): %ls", err.to_abi(),
+	     err.message().c_str());
+} catch (...) {
+	blog(LOG_ERROR, "winrt_dispatcher_free (0x%08X)", winrt::to_hresult());
+}

obs-studio-26.0.0.tar.xz/libobs-winrt/winrt-dispatch.h Added

obs-studio-25.0.8.tar.xz/libobs/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/libobs/CMakeLists.txt Changed

@@ -13,6 +13,7 @@
 
 if(UNIX)
 	if (NOT APPLE)
+		find_package(X11 REQUIRED)
 		find_package(X11_XCB REQUIRED)
 		find_package(XCB OPTIONAL_COMPONENTS XINPUT)
 		if (XCB_XINPUT_FOUND)
@@ -74,7 +75,7 @@
 
 find_package(ZLIB REQUIRED)
 
-include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
 
 add_definitions(-DLIBOBS_EXPORTS)
 
@@ -221,11 +222,13 @@
 	endif()
 
 	include_directories(
+		${X11_X11_INCLUDE_PATH}
 		${X11_XCB_INCLUDE_DIRS})
 	add_definitions(
 		${X11_XCB_DEFINITIONS})
 	set(libobs_PLATFORM_DEPS
 		${libobs_PLATFORM_DEPS}
+		${X11_X11_LIB}
 		${X11_XCB_LIBRARIES})
 
 	if(USE_XINPUT)
@@ -362,6 +365,7 @@
 set(libobs_util_HEADERS
 	util/curl/curl-helper.h
 	util/sse-intrin.h
+	util/sse2neon.h
 	util/array-serializer.h
 	util/file-serializer.h
 	util/utf8.h
@@ -370,6 +374,7 @@
 	util/text-lookup.h
 	util/bmem.h
 	util/c99defs.h
+	util/util_uint64.h
 	util/util_uint128.h
 	util/cf-parser.h
 	util/threading.h
@@ -475,11 +480,15 @@
 	foreach(LIB "obs" "rt")
 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
 	endforeach()
+	if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64(le)?")
+		set(PPC64_CFLAGS "-DNO_WARN_X86_INTRINSICS -mvsx")
+	endif()
 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif()
 
 set_target_properties(libobs PROPERTIES
+	FOLDER "core"
 	OUTPUT_NAME obs
 	VERSION "0"
 	SOVERSION "0")

obs-studio-25.0.8.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c -> obs-studio-26.0.0.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c Changed

@@ -2,6 +2,7 @@
 #include "../../util/circlebuf.h"
 #include "../../util/platform.h"
 #include "../../util/darray.h"
+#include "../../util/util_uint64.h"
 #include "../../obs-internal.h"
 
 #include "wasapi-output.h"
@@ -78,8 +79,8 @@
 		monitor->prev_video_ts = last_frame_ts;
 
 	} else if (monitor->prev_video_ts == last_frame_ts) {
-		monitor->time_since_prev += (uint64_t)*frames * 1000000000ULL /
-					    (uint64_t)monitor->sample_rate;
+		monitor->time_since_prev += util_mul_div64(
+			*frames, 1000000000ULL, monitor->sample_rate);
 	} else {
 		monitor->time_since_prev = 0;
 	}
@@ -90,8 +91,8 @@
 
 		circlebuf_peek_front(&monitor->delay_buffer, &cur_ts,
 				     sizeof(ts));
-		front_ts = cur_ts - ((uint64_t)pad * 1000000000ULL /
-				     (uint64_t)monitor->sample_rate);
+		front_ts = cur_ts - util_mul_div64(pad, 1000000000ULL,
+						   monitor->sample_rate);
 		diff = (int64_t)front_ts - (int64_t)last_frame_ts;
 		bad_diff = !last_frame_ts || llabs(diff) > 5000000000 ||
 			   monitor->time_since_prev > 100000000ULL;

obs-studio-25.0.8.tar.xz/libobs/graphics/graphics-ffmpeg.c -> obs-studio-26.0.0.tar.xz/libobs/graphics/graphics-ffmpeg.c Changed

@@ -2,6 +2,7 @@
 
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
 #include <libswscale/swscale.h>
 
 #include "../obs-ffmpeg-compat.h"
@@ -10,9 +11,6 @@
 	const char *file;
 	AVFormatContext *fmt_ctx;
 	AVCodecContext *decoder_ctx;
-	AVCodec *decoder;
-	AVStream *stream;
-	int stream_idx;
 
 	int cx, cy;
 	enum AVPixelFormat format;
@@ -20,26 +18,46 @@
 
 static bool ffmpeg_image_open_decoder_context(struct ffmpeg_image *info)
 {
-	int ret = av_find_best_stream(info->fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, 1,
-				      NULL, 0);
+	AVFormatContext *const fmt_ctx = info->fmt_ctx;
+	int ret = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, 1, NULL,
+				      0);
 	if (ret < 0) {
 		blog(LOG_WARNING, "Couldn't find video stream in file '%s': %s",
 		     info->file, av_err2str(ret));
 		return false;
 	}
 
-	info->stream_idx = ret;
-	info->stream = info->fmt_ctx->streams[ret];
-	info->decoder_ctx = info->stream->codec;
-	info->decoder = avcodec_find_decoder(info->decoder_ctx->codec_id);
-
-	if (!info->decoder) {
+	AVStream *const stream = fmt_ctx->streams[ret];
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	AVCodecParameters *const codecpar = stream->codecpar;
+	AVCodec *const decoder = avcodec_find_decoder(codecpar->codec_id);
+#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;
 	}
 
-	ret = avcodec_open2(info->decoder_ctx, info->decoder, NULL);
+#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) {
 		blog(LOG_WARNING,
 		     "Failed to open video codec for file '%s': "
@@ -53,7 +71,11 @@
 
 static void ffmpeg_image_free(struct ffmpeg_image *info)
 {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	avcodec_free_context(&info->decoder_ctx);
+#else
 	avcodec_close(info->decoder_ctx);
+#endif
 	avformat_close_input(&info->fmt_ctx);
 }
 
@@ -66,7 +88,6 @@
 
 	memset(info, 0, sizeof(struct ffmpeg_image));
 	info->file = file;
-	info->stream_idx = -1;
 
 	ret = avformat_open_input(&info->fmt_ctx, file, NULL, NULL);
 	if (ret < 0) {
@@ -87,9 +108,6 @@
 	if (!ffmpeg_image_open_decoder_context(info))
 		goto fail;
 
-	info->cx = info->decoder_ctx->width;
-	info->cy = info->decoder_ctx->height;
-	info->format = info->decoder_ctx->pix_fmt;
 	return true;
 
 fail:
@@ -122,9 +140,11 @@
 		}
 
 	} else {
+		static const enum AVPixelFormat format = AV_PIX_FMT_BGRA;
+
 		sws_ctx = sws_getContext(info->cx, info->cy, info->format,
-					 info->cx, info->cy, AV_PIX_FMT_BGRA,
-					 SWS_POINT, NULL, NULL, NULL);
+					 info->cx, info->cy, format, SWS_POINT,
+					 NULL, NULL, NULL);
 		if (!sws_ctx) {
 			blog(LOG_WARNING,
 			     "Failed to create scale context "
@@ -133,17 +153,36 @@
 			return false;
 		}
 
+		uint8_t *pointers[4];
+		int linesizes[4];
+		ret = av_image_alloc(pointers, linesizes, info->cx, info->cy,
+				     format, 32);
+		if (ret < 0) {
+			blog(LOG_WARNING, "av_image_alloc failed for '%s': %s",
+			     info->file, av_err2str(ret));
+			sws_freeContext(sws_ctx);
+			return false;
+		}
+
 		ret = sws_scale(sws_ctx, (const uint8_t *const *)frame->data,
-				frame->linesize, 0, info->cy, &out, &linesize);
+				frame->linesize, 0, info->cy, pointers,
+				linesizes);
 		sws_freeContext(sws_ctx);
 
 		if (ret < 0) {
 			blog(LOG_WARNING, "sws_scale failed for '%s': %s",
 			     info->file, av_err2str(ret));
+			av_freep(pointers);
 			return false;
 		}
 
-		info->format = AV_PIX_FMT_BGRA;
+		for (size_t y = 0; y < (size_t)info->cy; y++)
+			memcpy(out + y * linesize,
+			       pointers[0] + y * linesizes[0], linesize);
+
+		av_freep(pointers);
+
+		info->format = format;
 	}
 
 	return true;

obs-studio-25.0.8.tar.xz/libobs/graphics/graphics.c -> obs-studio-26.0.0.tar.xz/libobs/graphics/graphics.c Changed

@@ -1143,33 +1143,38 @@
 {
 	uint8_t *ptr;
 	uint32_t linesize_out;
-	uint32_t row_copy;
-	int32_t height;
-	int32_t y;
+	size_t row_copy;
+	size_t height;
 
 	if (!gs_valid_p2("gs_texture_set_image", tex, data))
 		return;
 
-	height = (int32_t)gs_texture_get_height(tex);
-
 	if (!gs_texture_map(tex, &ptr, &linesize_out))
 		return;
 
 	row_copy = (linesize < linesize_out) ? linesize : linesize_out;
 
+	height = gs_texture_get_height(tex);
+
 	if (flip) {
-		for (y = height - 1; y >= 0; y--)
-			memcpy(ptr + (uint32_t)y * linesize_out,
-			       data + (uint32_t)(height - y - 1) * linesize,
-			       row_copy);
+		uint8_t *const end = ptr + height * linesize_out;
+		data += (height - 1) * linesize;
+		while (ptr < end) {
+			memcpy(ptr, data, row_copy);
+			ptr += linesize_out;
+			data -= linesize;
+		}
 
 	} else if (linesize == linesize_out) {
 		memcpy(ptr, data, row_copy * height);
 
 	} else {
-		for (y = 0; y < height; y++)
-			memcpy(ptr + (uint32_t)y * linesize_out,
-			       data + (uint32_t)y * linesize, row_copy);
+		uint8_t *const end = ptr + height * linesize_out;
+		while (ptr < end) {
+			memcpy(ptr, data, row_copy);
+			ptr += linesize_out;
+			data += linesize;
+		}
 	}
 
 	gs_texture_unmap(tex);

obs-studio-25.0.8.tar.xz/libobs/graphics/math-extra.c -> obs-studio-26.0.0.tar.xz/libobs/graphics/math-extra.c Changed

obs-studio-25.0.8.tar.xz/libobs/libobs.pc.in -> obs-studio-26.0.0.tar.xz/libobs/libobs.pc.in Changed

obs-studio-25.0.8.tar.xz/libobs/media-io/audio-io.c -> obs-studio-26.0.0.tar.xz/libobs/media-io/audio-io.c Changed

@@ -23,6 +23,7 @@
 #include "../util/circlebuf.h"
 #include "../util/platform.h"
 #include "../util/profiler.h"
+#include "../util/util_uint64.h"
 
 #include "audio-io.h"
 #include "audio-resampler.h"
@@ -72,51 +73,6 @@
 };
 
 /* ------------------------------------------------------------------------- */
-/* the following functions are used to calculate frame offsets based upon
- * timestamps.  this will actually work accurately as long as you handle the
- * values correctly */
-
-static inline double ts_to_frames(const audio_t *audio, uint64_t ts)
-{
-	double audio_offset_d = (double)ts;
-	audio_offset_d /= 1000000000.0;
-	audio_offset_d *= (double)audio->info.samples_per_sec;
-
-	return audio_offset_d;
-}
-
-static inline double positive_round(double val)
-{
-	return floor(val + 0.5);
-}
-
-static int64_t ts_diff_frames(const audio_t *audio, uint64_t ts1, uint64_t ts2)
-{
-	double diff = ts_to_frames(audio, ts1) - ts_to_frames(audio, ts2);
-	return (int64_t)positive_round(diff);
-}
-
-static int64_t ts_diff_bytes(const audio_t *audio, uint64_t ts1, uint64_t ts2)
-{
-	return ts_diff_frames(audio, ts1, ts2) * (int64_t)audio->block_size;
-}
-
-/* ------------------------------------------------------------------------- */
-
-static inline uint64_t min_uint64(uint64_t a, uint64_t b)
-{
-	return a < b ? a : b;
-}
-
-static inline size_t min_size(size_t a, size_t b)
-{
-	return a < b ? a : b;
-}
-
-#ifndef CLAMP
-#define CLAMP(val, minval, maxval) \
-	((val > maxval) ? maxval : ((val < minval) ? minval : val))
-#endif
 
 static bool resample_audio_output(struct audio_input *input,
 				  struct audio_data *data)
@@ -219,9 +175,7 @@
 	for (size_t mix_idx = 0; mix_idx < MAX_AUDIO_MIXES; mix_idx++) {
 		struct audio_mix *mix = &audio->mixes[mix_idx];
 
-		memset(mix->buffer[0], 0,
-		       AUDIO_OUTPUT_FRAMES * MAX_AUDIO_CHANNELS *
-			       sizeof(float));
+		memset(mix->buffer, 0, sizeof(mix->buffer));
 
 		for (size_t i = 0; i < audio->planes; i++)
 			data[mix_idx].data[i] = mix->buffer[i];

obs-studio-25.0.8.tar.xz/libobs/media-io/audio-io.h -> obs-studio-26.0.0.tar.xz/libobs/media-io/audio-io.h Changed

obs-studio-25.0.8.tar.xz/libobs/media-io/media-remux.c -> obs-studio-26.0.0.tar.xz/libobs/media-io/media-remux.c Changed

@@ -65,7 +65,7 @@
 		return false;
 	}
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
 	av_dump_format(job->ifmt_ctx, 0, in_filename, false);
 #endif
 	return true;
@@ -84,8 +84,12 @@
 
 	for (unsigned i = 0; i < job->ifmt_ctx->nb_streams; i++) {
 		AVStream *in_stream = job->ifmt_ctx->streams[i];
+#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");
@@ -93,30 +97,31 @@
 		}
 
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-		AVCodecParameters *par = avcodec_parameters_alloc();
-		ret = avcodec_parameters_from_context(par, in_stream->codec);
-		if (ret == 0)
-			ret = avcodec_parameters_to_context(out_stream->codec,
-							    par);
-		avcodec_parameters_free(&par);
+		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, "media_remux: Failed to copy context");
+			blog(LOG_ERROR,
+			     "media_remux: Failed to copy parameters");
 			return false;
 		}
-		out_stream->time_base = out_stream->codec->time_base;
 
 		av_dict_copy(&out_stream->metadata, in_stream->metadata, 0);
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+		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
+#ifndef NDEBUG
 	av_dump_format(job->ofmt_ctx, 0, out_filename, true);
 #endif

obs-studio-25.0.8.tar.xz/libobs/media-io/video-io.c -> obs-studio-26.0.0.tar.xz/libobs/media-io/video-io.c Changed

obs-studio-25.0.8.tar.xz/libobs/media-io/video-io.h -> obs-studio-26.0.0.tar.xz/libobs/media-io/video-io.h Changed

obs-studio-25.0.8.tar.xz/libobs/media-io/video-matrices.c -> obs-studio-26.0.0.tar.xz/libobs/media-io/video-matrices.c Changed

obs-studio-25.0.8.tar.xz/libobs/media-io/video-scaler-ffmpeg.c -> obs-studio-26.0.0.tar.xz/libobs/media-io/video-scaler-ffmpeg.c Changed

@@ -18,11 +18,15 @@
 #include "../util/bmem.h"
 #include "video-scaler.h"
 
+#include <libavutil/imgutils.h>
 #include <libswscale/swscale.h>
 
 struct video_scaler {
 	struct SwsContext *swscale;
 	int src_height;
+	int dst_heights[4];
+	uint8_t *dst_pointers[4];
+	int dst_linesizes[4];
 };
 
 static inline enum AVPixelFormat
@@ -87,16 +91,9 @@
 
 static inline const int *get_ffmpeg_coeffs(enum video_colorspace cs)
 {
-	switch (cs) {
-	case VIDEO_CS_DEFAULT:
-		return sws_getCoefficients(SWS_CS_ITU601);
-	case VIDEO_CS_601:
-		return sws_getCoefficients(SWS_CS_ITU601);
-	case VIDEO_CS_709:
-		return sws_getCoefficients(SWS_CS_ITU709);
-	default:
-		return sws_getCoefficients(SWS_CS_ITU601);
-	}
+	const int colorspace = (cs == VIDEO_CS_601) ? SWS_CS_ITU601
+						    : SWS_CS_ITU709;
+	return sws_getCoefficients(colorspace);
 }
 
 static inline int get_ffmpeg_range_type(enum video_range_type type)
@@ -139,6 +136,28 @@
 	scaler = bzalloc(sizeof(struct video_scaler));
 	scaler->src_height = src->height;
 
+	const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format_dst);
+	bool has_plane[4] = {0};
+	for (size_t i = 0; i < 4; i++)
+		has_plane[desc->comp[i].plane] = 1;
+
+	scaler->dst_heights[0] = dst->height;
+	for (size_t i = 1; i < 4; ++i) {
+		if (has_plane[i]) {
+			const int s = (i == 1 || i == 2) ? desc->log2_chroma_h
+							 : 0;
+			scaler->dst_heights[i] = dst->height >> s;
+		}
+	}
+
+	ret = av_image_alloc(scaler->dst_pointers, scaler->dst_linesizes,
+			     dst->width, dst->height, format_dst, 32);
+	if (ret < 0) {
+		blog(LOG_WARNING,
+		     "video_scaler_create: av_image_alloc failed: %d", ret);
+		goto fail;
+	}
+
 	scaler->swscale = sws_getCachedContext(NULL, src->width, src->height,
 					       format_src, dst->width,
 					       dst->height, format_dst,
@@ -169,6 +188,10 @@
 {
 	if (scaler) {
 		sws_freeContext(scaler->swscale);
+
+		if (scaler->dst_pointers[0])
+			av_freep(scaler->dst_pointers);
+
 		bfree(scaler);
 	}
 }
@@ -182,13 +205,37 @@
 		return false;
 
 	int ret = sws_scale(scaler->swscale, input, (const int *)in_linesize, 0,
-			    scaler->src_height, output,
-			    (const int *)out_linesize);
+			    scaler->src_height, scaler->dst_pointers,
+			    scaler->dst_linesizes);
 	if (ret <= 0) {
 		blog(LOG_ERROR, "video_scaler_scale: sws_scale failed: %d",
 		     ret);
 		return false;
 	}
 
+	for (size_t plane = 0; plane < 4; ++plane) {
+		if (!scaler->dst_pointers[plane])
+			continue;
+
+		const size_t scaled_linesize = scaler->dst_linesizes[plane];
+		const size_t plane_linesize = out_linesize[plane];
+		uint8_t *dst = output[plane];
+		const uint8_t *src = scaler->dst_pointers[plane];
+		const size_t height = scaler->dst_heights[plane];
+		if (scaled_linesize == plane_linesize) {
+			memcpy(dst, src, scaled_linesize * height);
+		} else {
+			size_t linesize = scaled_linesize;
+			if (linesize > plane_linesize)
+				linesize = plane_linesize;
+
+			for (size_t y = 0; y < height; y++) {
+				memcpy(dst, src, linesize);
+				dst += plane_linesize;
+				src += scaled_linesize;
+			}
+		}
+	}
+
 	return true;
 }

obs-studio-25.0.8.tar.xz/libobs/obs-audio.c -> obs-studio-26.0.0.tar.xz/libobs/obs-audio.c Changed

obs-studio-25.0.8.tar.xz/libobs/obs-cocoa.m -> obs-studio-26.0.0.tar.xz/libobs/obs-cocoa.m Changed

obs-studio-25.0.8.tar.xz/libobs/obs-config.h -> obs-studio-26.0.0.tar.xz/libobs/obs-config.h Changed

obs-studio-25.0.8.tar.xz/libobs/obs-encoder.c -> obs-studio-26.0.0.tar.xz/libobs/obs-encoder.c Changed

obs-studio-25.0.8.tar.xz/libobs/obs-hotkey.c -> obs-studio-26.0.0.tar.xz/libobs/obs-hotkey.c Changed

obs-studio-25.0.8.tar.xz/libobs/obs-internal.h -> obs-studio-26.0.0.tar.xz/libobs/obs-internal.h Changed

@@ -92,6 +92,8 @@
 	void (*unload)(void);
 	void (*post_load)(void);
 	void (*set_locale)(const char *locale);
+	bool (*get_string)(const char *lookup_string,
+			   const char **translated_string);
 	void (*free_locale)(void);
 	uint32_t (*ver)(void);
 	void (*set_pointer)(obs_module_t *module);
@@ -434,7 +436,27 @@
 
 extern struct obs_core *obs;
 
+struct obs_graphics_context {
+	uint64_t last_time;
+	uint64_t interval;
+	uint64_t frame_time_total_ns;
+	uint64_t fps_total_ns;
+	uint32_t fps_total_frames;
+#ifdef _WIN32
+	bool gpu_was_active;
+#endif
+	bool raw_was_active;
+	bool was_active;
+	const char *video_thread_name;
+};
+
 extern void *obs_graphics_thread(void *param);
+extern bool obs_graphics_thread_loop(struct obs_graphics_context *context);
+#ifdef __APPLE__
+extern void *obs_graphics_thread_autorelease(void *param);
+extern bool
+obs_graphics_thread_loop_autorelease(struct obs_graphics_context *context);
+#endif
 
 extern gs_effect_t *obs_load_effect(gs_effect_t **effect, const char *file);
 
@@ -579,7 +601,7 @@
 	bool owns_info_id;
 
 	/* signals to call the source update in the video thread */
-	bool defer_update;
+	long defer_update_count;
 
 	/* ensures show/hide are only called once */
 	volatile long show_refs;

obs-studio-25.0.8.tar.xz/libobs/obs-module.c -> obs-studio-26.0.0.tar.xz/libobs/obs-module.c Changed

@@ -55,9 +55,29 @@
 	mod->name = os_dlsym(mod->module, "obs_module_name");
 	mod->description = os_dlsym(mod->module, "obs_module_description");
 	mod->author = os_dlsym(mod->module, "obs_module_author");
+	mod->get_string = os_dlsym(mod->module, "obs_module_get_string");
 	return MODULE_SUCCESS;
 }
 
+bool obs_module_get_locale_string(const obs_module_t *mod,
+				  const char *lookup_string,
+				  const char **translated_string)
+{
+	if (mod->get_string) {
+		return mod->get_string(lookup_string, translated_string);
+	}
+
+	return false;
+}
+
+const char *obs_module_get_locale_text(const obs_module_t *mod,
+				       const char *text)
+{
+	const char *str = text;
+	obs_module_get_locale_string(mod, text, &str);
+	return str;
+}
+
 static inline char *get_module_name(const char *file)
 {
 	static size_t ext_len = 0;
@@ -189,6 +209,20 @@
 	return module ? module->data_path : NULL;
 }
 
+obs_module_t *obs_get_module(const char *name)
+{
+	obs_module_t *module = obs->first_module;
+	while (module) {
+		if (strcmp(module->mod_name, name) == 0) {
+			return module;
+		}
+
+		module = module->next;
+	}
+
+	return NULL;
+}
+
 char *obs_find_module_file(obs_module_t *module, const char *file)
 {
 	struct dstr output = {0};

obs-studio-25.0.8.tar.xz/libobs/obs-module.h -> obs-studio-26.0.0.tar.xz/libobs/obs-module.h Changed

obs-studio-25.0.8.tar.xz/libobs/obs-output.c -> obs-studio-26.0.0.tar.xz/libobs/obs-output.c Changed

@@ -17,6 +17,7 @@
 
 #include <inttypes.h>
 #include "util/platform.h"
+#include "util/util_uint64.h"
 #include "obs.h"
 #include "obs-internal.h"
 
@@ -806,6 +807,13 @@
 				  "encoder passed is not a video encoder");
 		return;
 	}
+	if (active(output)) {
+		blog(LOG_WARNING,
+		     "%s: tried to set video encoder on output \"%s\" "
+		     "while the output is still active!",
+		     __FUNCTION__, output->context.name);
+		return;
+	}
 
 	if (output->video_encoder == encoder)
 		return;
@@ -831,6 +839,13 @@
 				  "encoder passed is not an audio encoder");
 		return;
 	}
+	if (active(output)) {
+		blog(LOG_WARNING,
+		     "%s: tried to set audio encoder %d on output \"%s\" "
+		     "while the output is still active!",
+		     __FUNCTION__, (int)idx, output->context.name);
+		return;
+	}
 
 	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
 		if (idx >= MAX_AUDIO_MIXES) {
@@ -1017,27 +1032,10 @@
 	output->audio_conversion_set = true;
 }
 
-static inline bool service_supports_multitrack(const struct obs_output *output)
-{
-	const struct obs_service *service = output->service;
-
-	if (!service || !service->info.supports_multitrack) {
-		return false;
-	}
-
-	return service->info.supports_multitrack(service->context.data);
-}
-
 static inline size_t num_audio_mixes(const struct obs_output *output)
 {
 	size_t mix_count = 1;
 
-	if ((output->info.flags & OBS_OUTPUT_SERVICE) != 0) {
-		if (!service_supports_multitrack(output)) {
-			return 1;
-		}
-	}
-
 	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
 		mix_count = 0;
 
@@ -1731,8 +1729,8 @@
 	*new = *old;
 
 	if (old->timestamp < output->video_start_ts) {
-		uint64_t duration = (uint64_t)old->frames * 1000000000 /
-				    (uint64_t)output->sample_rate;
+		uint64_t duration = util_mul_div64(old->frames, 1000000000ULL,
+						   output->sample_rate);
 		uint64_t end_ts = (old->timestamp + duration);
 		uint64_t cutoff;
 
@@ -1742,7 +1740,8 @@
 		cutoff = output->video_start_ts - old->timestamp;
 		new->timestamp += cutoff;
 
-		cutoff = cutoff * (uint64_t)output->sample_rate / 1000000000;
+		cutoff = util_mul_div64(cutoff, output->sample_rate,
+					1000000000ULL);
 
 		for (size_t i = 0; i < output->planes; i++)
 			new->data[i] += output->audio_size *(uint32_t)cutoff;

obs-studio-25.0.8.tar.xz/libobs/obs-scene.c -> obs-studio-26.0.0.tar.xz/libobs/obs-scene.c Changed

@@ -17,6 +17,7 @@
 ******************************************************************************/
 
 #include "util/threading.h"
+#include "util/util_uint64.h"
 #include "graphics/math-defs.h"
 #include "obs-scene.h"
 
@@ -974,8 +975,8 @@
 		if (timestamp < ts)
 			timestamp = ts;
 
-		new_frame_num = (timestamp - ts) * (uint64_t)sample_rate /
-				1000000000ULL;
+		new_frame_num = util_mul_div64(timestamp - ts, sample_rate,
+					       1000000000ULL);
 
 		if (ts && new_frame_num >= AUDIO_OUTPUT_FRAMES)
 			break;
@@ -1024,8 +1025,8 @@
 	pthread_mutex_unlock(&item->actions_mutex);
 
 	if (actions_pending) {
-		uint64_t duration = (uint64_t)AUDIO_OUTPUT_FRAMES *
-				    1000000000ULL / (uint64_t)sample_rate;
+		uint64_t duration = util_mul_div64(AUDIO_OUTPUT_FRAMES,
+						   1000000000ULL, sample_rate);
 
 		if (!ts || action.timestamp < (ts + duration)) {
 			apply_scene_item_audio_actions(item, buf, ts,
@@ -1166,7 +1167,7 @@
 	.id = "scene",
 	.type = OBS_SOURCE_TYPE_SCENE,
 	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
-			OBS_SOURCE_COMPOSITE,
+			OBS_SOURCE_COMPOSITE | OBS_SOURCE_DO_NOT_DUPLICATE,
 	.get_name = scene_getname,
 	.create = scene_create,
 	.destroy = scene_destroy,

obs-studio-25.0.8.tar.xz/libobs/obs-service.h -> obs-studio-26.0.0.tar.xz/libobs/obs-service.h Changed

obs-studio-25.0.8.tar.xz/libobs/obs-source-transition.c -> obs-studio-26.0.0.tar.xz/libobs/obs-source-transition.c Changed

obs-studio-25.0.8.tar.xz/libobs/obs-source.c -> obs-studio-26.0.0.tar.xz/libobs/obs-source.c Changed

@@ -23,6 +23,7 @@
 #include "media-io/audio-io.h"
 #include "util/threading.h"
 #include "util/platform.h"
+#include "util/util_uint64.h"
 #include "callback/calldata.h"
 #include "graphics/matrix3.h"
 #include "graphics/vec3.h"
@@ -501,13 +502,12 @@
 	if (!obs_source_valid(source, "obs_source_duplicate"))
 		return NULL;
 
-	if ((source->info.output_flags & OBS_SOURCE_DO_NOT_DUPLICATE) != 0) {
-		obs_source_addref(source);
-		return source;
-	}
-
 	if (source->info.type == OBS_SOURCE_TYPE_SCENE) {
 		obs_scene_t *scene = obs_scene_from_source(source);
+		if (scene && !create_private) {
+			obs_source_addref(source);
+			return source;
+		}
 		if (!scene)
 			scene = obs_group_from_source(source);
 		if (!scene)
@@ -521,6 +521,11 @@
 		return new_source;
 	}
 
+	if ((source->info.output_flags & OBS_SOURCE_DO_NOT_DUPLICATE) != 0) {
+		obs_source_addref(source);
+		return source;
+	}
+
 	settings = obs_data_create();
 	obs_data_apply(settings, source->context.settings);
 
@@ -855,11 +860,13 @@
 
 static void obs_source_deferred_update(obs_source_t *source)
 {
-	if (source->context.data && source->info.update)
+	if (source->context.data && source->info.update) {
+		long count = os_atomic_load_long(&source->defer_update_count);
 		source->info.update(source->context.data,
 				    source->context.settings);
-
-	source->defer_update = false;
+		os_atomic_compare_swap_long(&source->defer_update_count, count,
+					    0);
+	}
 }
 
 void obs_source_update(obs_source_t *source, obs_data_t *settings)
@@ -871,7 +878,7 @@
 		obs_data_apply(source->context.settings, settings);
 
 	if (source->info.output_flags & OBS_SOURCE_VIDEO) {
-		source->defer_update = true;
+		os_atomic_inc_long(&source->defer_update_count);
 	} else if (source->context.data && source->info.update) {
 		source->info.update(source->context.data,
 				    source->context.settings);
@@ -1096,7 +1103,7 @@
 	if ((source->info.output_flags & OBS_SOURCE_ASYNC) != 0)
 		async_tick(source);
 
-	if (source->defer_update)
+	if (os_atomic_load_long(&source->defer_update_count) > 0)
 		obs_source_deferred_update(source);
 
 	/* reset the filter render texture information once every frame */
@@ -1165,13 +1172,13 @@
 	if (!sample_rate)
 		return 0;
 
-	return (uint64_t)frames * 1000000000ULL / (uint64_t)sample_rate;
+	return util_mul_div64(frames, 1000000000ULL, sample_rate);
 }
 
 static inline size_t conv_time_to_frames(const size_t sample_rate,
 					 const uint64_t duration)
 {
-	return (size_t)(duration * (uint64_t)sample_rate / 1000000000ULL);
+	return (size_t)util_mul_div64(duration, sample_rate, 1000000000ULL);
 }
 
 /* maximum buffer size */
@@ -1211,6 +1218,7 @@
 
 	pthread_mutex_lock(&source->audio_buf_mutex);
 	reset_audio_timing(source, ts, os_time);
+	reset_audio_data(source, os_time);
 	pthread_mutex_unlock(&source->audio_buf_mutex);
 }
 
@@ -1235,7 +1243,7 @@
 static inline size_t get_buf_placement(audio_t *audio, uint64_t offset)
 {
 	uint32_t sample_rate = audio_output_get_sample_rate(audio);
-	return (size_t)(offset * (uint64_t)sample_rate / 1000000000ULL);
+	return (size_t)util_mul_div64(offset, sample_rate, 1000000000ULL);
 }
 
 static void source_output_audio_place(obs_source_t *source,
@@ -2368,7 +2376,7 @@
 		return;
 	}
 
-	if (!filter_compatible(source, filter)) {
+	if (!source->owns_info_id && !filter_compatible(source, filter)) {
 		pthread_mutex_unlock(&source->filter_mutex);
 		return;
 	}
@@ -2882,8 +2890,6 @@
 	if (!frame)
 		return;
 
-	obs_enter_graphics();
-
 	if (preload_frame_changed(source, frame)) {
 		obs_source_frame_destroy(source->async_preload_frame);
 		source->async_preload_frame = obs_source_frame_create(
@@ -2891,13 +2897,8 @@
 	}
 
 	copy_frame_data(source->async_preload_frame, frame);
-	set_async_texture_size(source, source->async_preload_frame);
-	update_async_textures(source, source->async_preload_frame,
-			      source->async_textures, source->async_texrender);
 
 	source->last_frame_ts = frame->timestamp;
-
-	obs_leave_graphics();
 }
 
 void obs_source_preload_video(obs_source_t *source,
@@ -2956,8 +2957,18 @@
 	if (!obs_source_valid(source, "obs_source_show_preloaded_video"))
 		return;
 
+	if (!source->async_preload_frame)
+		return;
+
+	obs_enter_graphics();
+
+	set_async_texture_size(source, source->async_preload_frame);
+	update_async_textures(source, source->async_preload_frame,
+			      source->async_textures, source->async_texrender);
 	source->async_active = true;
 
+	obs_leave_graphics();
+
 	pthread_mutex_lock(&source->audio_buf_mutex);
 	sys_ts = (source->monitoring_type != OBS_MONITORING_TYPE_MONITOR_ONLY)
 			 ? os_gettime_ns()
@@ -2967,6 +2978,82 @@
 	pthread_mutex_unlock(&source->audio_buf_mutex);
 }
 
+static void
+obs_source_set_video_frame_internal(obs_source_t *source,
+				    const struct obs_source_frame *frame)
+{
+	if (!obs_source_valid(source, "obs_source_set_video_frame"))
+		return;
+	if (!frame)
+		return;
+
+	obs_enter_graphics();
+
+	if (preload_frame_changed(source, frame)) {
+		obs_source_frame_destroy(source->async_preload_frame);
+		source->async_preload_frame = obs_source_frame_create(
+			frame->format, frame->width, frame->height);
+	}
+
+	copy_frame_data(source->async_preload_frame, frame);
+	set_async_texture_size(source, source->async_preload_frame);
+	update_async_textures(source, source->async_preload_frame,
+			      source->async_textures, source->async_texrender);
+
+	source->last_frame_ts = frame->timestamp;
+
+	obs_leave_graphics();
+}
+
+void obs_source_set_video_frame(obs_source_t *source,
+				const struct obs_source_frame *frame)
+{
+	if (!frame) {
+		obs_source_preload_video_internal(source, NULL);
+		return;
+	}
+
+	struct obs_source_frame new_frame = *frame;
+	new_frame.full_range =
+		format_is_yuv(frame->format) ? new_frame.full_range : true;
+
+	obs_source_set_video_frame_internal(source, &new_frame);
+}
+
+void obs_source_set_video_frame2(obs_source_t *source,
+				 const struct obs_source_frame2 *frame)
+{
+	if (!frame) {
+		obs_source_preload_video_internal(source, NULL);
+		return;
+	}
+
+	struct obs_source_frame new_frame;
+	enum video_range_type range =
+		resolve_video_range(frame->format, frame->range);
+
+	for (size_t i = 0; i < MAX_AV_PLANES; i++) {
+		new_frame.data[i] = frame->data[i];
+		new_frame.linesize[i] = frame->linesize[i];
+	}
+
+	new_frame.width = frame->width;
+	new_frame.height = frame->height;
+	new_frame.timestamp = frame->timestamp;
+	new_frame.format = frame->format;
+	new_frame.full_range = range == VIDEO_RANGE_FULL;
+	new_frame.flip = frame->flip;
+
+	memcpy(&new_frame.color_matrix, &frame->color_matrix,
+	       sizeof(frame->color_matrix));
+	memcpy(&new_frame.color_range_min, &frame->color_range_min,
+	       sizeof(frame->color_range_min));
+	memcpy(&new_frame.color_range_max, &frame->color_range_max,
+	       sizeof(frame->color_range_max));
+
+	obs_source_set_video_frame_internal(source, &new_frame);
+}
+
 static inline struct obs_audio_data *
 filter_async_audio(obs_source_t *source, struct obs_audio_data *in)
 {
@@ -3747,7 +3834,7 @@
 			child, enum_source_full_tree_callback, param);
 	if (child->info.enum_all_sources) {
 		if (child->context.data) {
-			child->info.enum_active_sources(
+			child->info.enum_all_sources(
 				child->context.data,
 				enum_source_full_tree_callback, data);
 		}
@@ -4830,7 +4917,7 @@
 
 void obs_source_media_play_pause(obs_source_t *source, bool pause)
 {
-	if (!obs_source_valid(source, "obs_source_media_play_pause"))
+	if (!data_valid(source, "obs_source_media_play_pause"))
 		return;
 
 	if (!source->info.media_play_pause)
@@ -4846,7 +4933,7 @@
 
 void obs_source_media_restart(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_restart"))
+	if (!data_valid(source, "obs_source_media_restart"))
 		return;
 
 	if (!source->info.media_restart)
@@ -4859,7 +4946,7 @@
 
 void obs_source_media_stop(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_stop"))
+	if (!data_valid(source, "obs_source_media_stop"))
 		return;
 
 	if (!source->info.media_stop)
@@ -4872,7 +4959,7 @@
 
 void obs_source_media_next(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_next"))
+	if (!data_valid(source, "obs_source_media_next"))
 		return;
 
 	if (!source->info.media_next)
@@ -4885,7 +4972,7 @@
 
 void obs_source_media_previous(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_previous"))
+	if (!data_valid(source, "obs_source_media_previous"))
 		return;
 
 	if (!source->info.media_previous)
@@ -4898,7 +4985,7 @@
 
 int64_t obs_source_media_get_duration(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_get_duration"))
+	if (!data_valid(source, "obs_source_media_get_duration"))
 		return 0;
 
 	if (source->info.media_get_duration)
@@ -4909,7 +4996,7 @@
 
 int64_t obs_source_media_get_time(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_get_time"))
+	if (!data_valid(source, "obs_source_media_get_time"))
 		return 0;
 
 	if (source->info.media_get_time)
@@ -4920,7 +5007,7 @@
 
 void obs_source_media_set_time(obs_source_t *source, int64_t ms)
 {
-	if (!obs_source_valid(source, "obs_source_media_set_time"))
+	if (!data_valid(source, "obs_source_media_set_time"))
 		return;
 
 	if (source->info.media_set_time)
@@ -4929,7 +5016,7 @@
 
 enum obs_media_state obs_source_media_get_state(obs_source_t *source)
 {
-	if (!obs_source_valid(source, "obs_source_media_get_state"))
+	if (!data_valid(source, "obs_source_media_get_state"))
 		return OBS_MEDIA_STATE_NONE;
 
 	if (source->info.media_get_state)

obs-studio-25.0.8.tar.xz/libobs/obs-video.c -> obs-studio-26.0.0.tar.xz/libobs/obs-video.c Changed

@@ -539,7 +539,7 @@
 					      const uint8_t *in, uint8_t *out)
 {
 	if ((width == linesize_input) && (width == linesize_output)) {
-		size_t total = width * height;
+		size_t total = (size_t)width * (size_t)height;
 		memcpy(out, in, total);
 		in += total;
 	} else {
@@ -672,10 +672,12 @@
 
 	/* if the line sizes match, do a single copy */
 	if (input->linesize[0] == output->linesize[0]) {
-		memcpy(out_ptr, in_ptr, input->linesize[0] * info->height);
+		memcpy(out_ptr, in_ptr,
+		       (size_t)input->linesize[0] * (size_t)info->height);
 	} else {
+		const size_t copy_size = (size_t)info->width * 4;
 		for (size_t y = 0; y < info->height; y++) {
-			memcpy(out_ptr, in_ptr, info->width * 4);
+			memcpy(out_ptr, in_ptr, copy_size);
 			in_ptr += input->linesize[0];
 			out_ptr += output->linesize[0];
 		}
@@ -835,123 +837,224 @@
 	}
 }
 
-static const char *tick_sources_name = "tick_sources";
-static const char *render_displays_name = "render_displays";
-static const char *output_frame_name = "output_frame";
-void *obs_graphics_thread(void *param)
-{
-	uint64_t last_time = 0;
-	uint64_t interval = video_output_get_frame_time(obs->video.video);
-	uint64_t frame_time_total_ns = 0;
-	uint64_t fps_total_ns = 0;
-	uint32_t fps_total_frames = 0;
 #ifdef _WIN32
-	bool gpu_was_active = false;
-#endif
-	bool raw_was_active = false;
-	bool was_active = false;
 
-	is_graphics_thread = true;
+struct winrt_exports {
+	void (*winrt_initialize)();
+	void (*winrt_uninitialize)();
+	struct winrt_disaptcher *(*winrt_dispatcher_init)();
+	void (*winrt_dispatcher_free)(struct winrt_disaptcher *dispatcher);
+	void (*winrt_capture_thread_start)();
+	void (*winrt_capture_thread_stop)();
+};
+
+#define WINRT_IMPORT(func)                                        \
+	do {                                                      \
+		exports->func = os_dlsym(module, #func);          \
+		if (!exports->func) {                             \
+			success = false;                          \
+			blog(LOG_ERROR,                           \
+			     "Could not load function '%s' from " \
+			     "module '%s'",                       \
+			     #func, module_name);                 \
+		}                                                 \
+	} while (false)
+
+static bool load_winrt_imports(struct winrt_exports *exports, void *module,
+			       const char *module_name)
+{
+	bool success = true;
 
-	obs->video.video_time = os_gettime_ns();
-	obs->video.video_frame_interval_ns = interval;
+	WINRT_IMPORT(winrt_initialize);
+	WINRT_IMPORT(winrt_uninitialize);
+	WINRT_IMPORT(winrt_dispatcher_init);
+	WINRT_IMPORT(winrt_dispatcher_free);
+	WINRT_IMPORT(winrt_capture_thread_start);
+	WINRT_IMPORT(winrt_capture_thread_stop);
 
-	os_set_thread_name("libobs: graphics thread");
+	return success;
+}
 
-	const char *video_thread_name = profile_store_name(
-		obs_get_profiler_name_store(),
-		"obs_graphics_thread(%g" NBSP "ms)", interval / 1000000.);
-	profile_register_root(video_thread_name, interval);
+struct winrt_state {
+	bool loaded;
+	void *winrt_module;
+	struct winrt_exports exports;
+	struct winrt_disaptcher *dispatcher;
+};
 
-	srand((unsigned int)time(NULL));
+static void init_winrt_state(struct winrt_state *winrt)
+{
+	static const char *const module_name = "libobs-winrt";
+
+	winrt->winrt_module = os_dlopen(module_name);
+	winrt->loaded = winrt->winrt_module &&
+			load_winrt_imports(&winrt->exports, winrt->winrt_module,
+					   module_name);
+	winrt->dispatcher = NULL;
+	if (winrt->loaded) {
+		winrt->exports.winrt_initialize();
+		winrt->dispatcher = winrt->exports.winrt_dispatcher_init();
 
-	for (;;) {
-		/* defer loop break to clean up sources */
-		const bool stop_requested =
-			video_output_stopped(obs->video.video);
+		gs_enter_context(obs->video.graphics);
+		winrt->exports.winrt_capture_thread_start();
+		gs_leave_context();
+	}
+}
+
+static void uninit_winrt_state(struct winrt_state *winrt)
+{
+	if (winrt->winrt_module) {
+		if (winrt->loaded) {
+			winrt->exports.winrt_capture_thread_stop();
+			if (winrt->dispatcher)
+				winrt->exports.winrt_dispatcher_free(
+					winrt->dispatcher);
+			winrt->exports.winrt_uninitialize();
+		}
+
+		os_dlclose(winrt->winrt_module);
+	}
+}
 
-		uint64_t frame_start = os_gettime_ns();
-		uint64_t frame_time_ns;
-		bool raw_active = obs->video.raw_active > 0;
+#endif // #ifdef _WIN32
+
+static const char *tick_sources_name = "tick_sources";
+static const char *render_displays_name = "render_displays";
+static const char *output_frame_name = "output_frame";
+bool obs_graphics_thread_loop(struct obs_graphics_context *context)
+{
+	/* defer loop break to clean up sources */
+	const bool stop_requested = video_output_stopped(obs->video.video);
+
+	uint64_t frame_start = os_gettime_ns();
+	uint64_t frame_time_ns;
+	bool raw_active = obs->video.raw_active > 0;
 #ifdef _WIN32
-		const bool gpu_active = obs->video.gpu_encoder_active > 0;
-		const bool active = raw_active || gpu_active;
+	const bool gpu_active = obs->video.gpu_encoder_active > 0;
+	const bool active = raw_active || gpu_active;
 #else
-		const bool gpu_active = 0;
-		const bool active = raw_active;
+	const bool gpu_active = 0;
+	const bool active = raw_active;
 #endif
 
-		if (!was_active && active)
-			clear_base_frame_data();
-		if (!raw_was_active && raw_active)
-			clear_raw_frame_data();
+	if (!context->was_active && active)
+		clear_base_frame_data();
+	if (!context->raw_was_active && raw_active)
+		clear_raw_frame_data();
 #ifdef _WIN32
-		if (!gpu_was_active && gpu_active)
-			clear_gpu_frame_data();
+	if (!context->gpu_was_active && gpu_active)
+		clear_gpu_frame_data();
 
-		gpu_was_active = gpu_active;
+	context->gpu_was_active = gpu_active;
 #endif
-		raw_was_active = raw_active;
-		was_active = active;
+	context->raw_was_active = raw_active;
+	context->was_active = active;
 
-		profile_start(video_thread_name);
+	profile_start(context->video_thread_name);
 
-		gs_enter_context(obs->video.graphics);
-		gs_begin_frame();
-		gs_leave_context();
+	gs_enter_context(obs->video.graphics);
+	gs_begin_frame();
+	gs_leave_context();
 
-		profile_start(tick_sources_name);
-		last_time = tick_sources(obs->video.video_time, last_time);
-		profile_end(tick_sources_name);
+	profile_start(tick_sources_name);
+	context->last_time =
+		tick_sources(obs->video.video_time, context->last_time);
+	profile_end(tick_sources_name);
 
-		execute_graphics_tasks();
+	execute_graphics_tasks();
 
 #ifdef _WIN32
-		MSG msg;
-		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
+	MSG msg;
+	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
 #endif
 
-		profile_start(output_frame_name);
-		output_frame(raw_active, gpu_active);
-		profile_end(output_frame_name);
+	profile_start(output_frame_name);
+	output_frame(raw_active, gpu_active);
+	profile_end(output_frame_name);
 
-		profile_start(render_displays_name);
-		render_displays();
-		profile_end(render_displays_name);
+	profile_start(render_displays_name);
+	render_displays();
+	profile_end(render_displays_name);
 
-		frame_time_ns = os_gettime_ns() - frame_start;
+	frame_time_ns = os_gettime_ns() - frame_start;
 
-		profile_end(video_thread_name);
+	profile_end(context->video_thread_name);
 
-		profile_reenable_thread();
+	profile_reenable_thread();
 
-		video_sleep(&obs->video, raw_active, gpu_active,
-			    &obs->video.video_time, interval);
+	video_sleep(&obs->video, raw_active, gpu_active, &obs->video.video_time,
+		    context->interval);
 
-		frame_time_total_ns += frame_time_ns;
-		fps_total_ns += (obs->video.video_time - last_time);
-		fps_total_frames++;
+	context->frame_time_total_ns += frame_time_ns;
+	context->fps_total_ns += (obs->video.video_time - context->last_time);
+	context->fps_total_frames++;
 
-		if (fps_total_ns >= 1000000000ULL) {
-			obs->video.video_fps =
-				(double)fps_total_frames /
-				((double)fps_total_ns / 1000000000.0);
-			obs->video.video_avg_frame_time_ns =
-				frame_time_total_ns /
-				(uint64_t)fps_total_frames;
-
-			frame_time_total_ns = 0;
-			fps_total_ns = 0;
-			fps_total_frames = 0;
-		}
+	if (context->fps_total_ns >= 1000000000ULL) {
+		obs->video.video_fps =
+			(double)context->fps_total_frames /
+			((double)context->fps_total_ns / 1000000000.0);
+		obs->video.video_avg_frame_time_ns =
+			context->frame_time_total_ns /
+			(uint64_t)context->fps_total_frames;
 
-		if (stop_requested)
-			break;
+		context->frame_time_total_ns = 0;
+		context->fps_total_ns = 0;
+		context->fps_total_frames = 0;
 	}
 
+	return !stop_requested;
+}
+
+void *obs_graphics_thread(void *param)
+{
+#ifdef _WIN32
+	struct winrt_state winrt;
+	init_winrt_state(&winrt);
+#endif // #ifdef _WIN32
+
+	is_graphics_thread = true;
+
+	const uint64_t interval = video_output_get_frame_time(obs->video.video);
+
+	obs->video.video_time = os_gettime_ns();
+	obs->video.video_frame_interval_ns = interval;
+
+	os_set_thread_name("libobs: graphics thread");
+
+	const char *video_thread_name = profile_store_name(
+		obs_get_profiler_name_store(),
+		"obs_graphics_thread(%g" NBSP "ms)", interval / 1000000.);
+	profile_register_root(video_thread_name, interval);
+
+	srand((unsigned int)time(NULL));
+
+	struct obs_graphics_context context;
+	context.interval = video_output_get_frame_time(obs->video.video);
+	context.frame_time_total_ns = 0;
+	context.fps_total_ns = 0;
+	context.fps_total_frames = 0;
+	context.last_time = 0;
+#ifdef _WIN32
+	context.gpu_was_active = false;
+#endif
+	context.raw_was_active = false;
+	context.was_active = false;
+	context.video_thread_name = video_thread_name;
+
+#ifdef __APPLE__
+	while (obs_graphics_thread_loop_autorelease(&context))
+#else
+	while (obs_graphics_thread_loop(&context))
+#endif
+		;
+
+#ifdef _WIN32
+	uninit_winrt_state(&winrt);
+#endif
+
 	UNUSED_PARAMETER(param);
 	return NULL;
 }

obs-studio-25.0.8.tar.xz/libobs/obs-win-crash-handler.c -> obs-studio-26.0.0.tar.xz/libobs/obs-win-crash-handler.c Changed

@@ -246,6 +246,8 @@
 		data);
 }
 
+extern const char *get_win_release_id();
+
 static inline void write_header(struct exception_handler_data *data)
 {
 	char date_time[80];
@@ -260,18 +262,20 @@
 	else
 		obs_bitness = "32";
 
+	const char *release_id = get_win_release_id();
+
 	dstr_catf(&data->str,
 		  "Unhandled exception: %x\r\n"
 		  "Date/Time: %s\r\n"
 		  "Fault address: %" PRIX64 " (%s)\r\n"
 		  "libobs version: " OBS_VERSION " (%s-bit)\r\n"
-		  "Windows version: %d.%d build %d (revision: %d; "
+		  "Windows version: %d.%d build %d (release: %s; revision: %d; "
 		  "%s-bit)\r\n"
 		  "CPU: %s\r\n\r\n",
 		  data->exception->ExceptionRecord->ExceptionCode, date_time,
 		  data->main_trace.instruction_ptr, data->module_name.array,
 		  obs_bitness, data->win_version.major, data->win_version.minor,
-		  data->win_version.build, data->win_version.revis,
+		  data->win_version.build, release_id, data->win_version.revis,
 		  is_64_bit_windows() ? "64" : "32", data->cpu_info.array);
 }

obs-studio-25.0.8.tar.xz/libobs/obs-windows.c -> obs-studio-26.0.0.tar.xz/libobs/obs-windows.c Changed

@@ -199,6 +199,8 @@
 	L"SOFTWARE\\Policies\\Microsoft\\Windows\\GameDVR"
 #define WIN10_GAME_DVR_REG_KEY L"System\\GameConfigStore"
 #define WIN10_GAME_MODE_REG_KEY L"Software\\Microsoft\\GameBar"
+#define WIN10_HAGS_REG_KEY \
+	L"SYSTEM\\CurrentControlSet\\Control\\GraphicsDrivers"
 
 static void log_gaming_features(void)
 {
@@ -210,6 +212,7 @@
 	struct reg_dword game_dvr_enabled;
 	struct reg_dword game_dvr_bg_recording;
 	struct reg_dword game_mode_enabled;
+	struct reg_dword hags_enabled;
 
 	get_reg_dword(HKEY_CURRENT_USER, WIN10_GAME_BAR_REG_KEY,
 		      L"AppCaptureEnabled", &game_bar_enabled);
@@ -221,6 +224,9 @@
 		      L"HistoricalCaptureEnabled", &game_dvr_bg_recording);
 	get_reg_dword(HKEY_CURRENT_USER, WIN10_GAME_MODE_REG_KEY,
 		      L"AllowAutoGameMode", &game_mode_enabled);
+	get_reg_dword(HKEY_LOCAL_MACHINE, WIN10_HAGS_REG_KEY, L"HwSchMode",
+		      &hags_enabled);
+
 	if (game_mode_enabled.status != ERROR_SUCCESS) {
 		get_reg_dword(HKEY_CURRENT_USER, WIN10_GAME_MODE_REG_KEY,
 			      L"AutoGameModeEnabled", &game_mode_enabled);
@@ -251,6 +257,11 @@
 		blog(LOG_INFO, "\tGame Mode: %s",
 		     (bool)game_mode_enabled.return_value ? "On" : "Off");
 	}
+
+	if (hags_enabled.status == ERROR_SUCCESS) {
+		blog(LOG_INFO, "\tHardware GPU Scheduler: %s",
+		     (hags_enabled.return_value == 2) ? "On" : "Off");
+	}
 }
 
 static const char *get_str_for_state(int state)
@@ -1040,6 +1051,9 @@
 	if (key == OBS_KEY_NONE) {
 		return;
 
+	} else if (key >= OBS_KEY_F13 && key <= OBS_KEY_F24) {
+		dstr_printf(str, "F%d", (int)(key - OBS_KEY_F13 + 13));
+		return;
 	} else if (key >= OBS_KEY_MOUSE1 && key <= OBS_KEY_MOUSE29) {
 		if (obs->hotkeys.translations[key]) {
 			dstr_copy(str, obs->hotkeys.translations[key]);
@@ -1264,9 +1278,7 @@
 {
 	const HRESULT hr = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
 	const bool success = SUCCEEDED(hr);
-	if (success)
-		blog(LOG_INFO, "CoInitializeEx succeeded: 0x%08X", hr);
-	else
+	if (!success)
 		blog(LOG_ERROR, "CoInitializeEx failed: 0x%08X", hr);
 	return success;
 }

obs-studio-25.0.8.tar.xz/libobs/obs.c -> obs-studio-26.0.0.tar.xz/libobs/obs.c Changed

@@ -429,8 +429,13 @@
 	if (pthread_mutex_init(&video->task_mutex, NULL) < 0)
 		return OBS_VIDEO_FAIL;
 
+#ifdef __APPLE__
+	errorcode = pthread_create(&video->video_thread, NULL,
+				   obs_graphics_thread_autorelease, obs);
+#else
 	errorcode = pthread_create(&video->video_thread, NULL,
 				   obs_graphics_thread, obs);
+#endif
 	if (errorcode != 0)
 		return OBS_VIDEO_FAIL;
 
@@ -907,7 +912,6 @@
 {
 	struct dstr *new_path = da_push_back_new(core_module_paths);
 	dstr_init_copy(new_path, path);
-	da_push_back(core_module_paths, new_path);
 }
 
 bool obs_remove_data_path(const char *path)
@@ -989,10 +993,6 @@
 void obs_shutdown(void)
 {
 	struct obs_module *module;
-	struct obs_core *core;
-
-	if (!obs)
-		return;
 
 	for (size_t i = 0; i < obs->source_types.num; i++) {
 		struct obs_source_info *item = &obs->source_types.array[i];
@@ -1028,6 +1028,14 @@
 	stop_video();
 	stop_hotkeys();
 
+	module = obs->first_module;
+	while (module) {
+		struct obs_module *next = module->next;
+		free_module(module);
+		module = next;
+	}
+	obs->first_module = NULL;
+
 	obs_free_audio();
 	obs_free_data();
 	obs_free_video();
@@ -1038,27 +1046,17 @@
 	obs->procs = NULL;
 	obs->signals = NULL;
 
-	core = obs;
-	obs = NULL;
-
-	module = core->first_module;
-	while (module) {
-		struct obs_module *next = module->next;
-		free_module(module);
-		module = next;
-	}
-	core->first_module = NULL;
-
-	for (size_t i = 0; i < core->module_paths.num; i++)
-		free_module_path(core->module_paths.array + i);
-	da_free(core->module_paths);
+	for (size_t i = 0; i < obs->module_paths.num; i++)
+		free_module_path(obs->module_paths.array + i);
+	da_free(obs->module_paths);
 
-	if (core->name_store_owned)
-		profiler_name_store_free(core->name_store);
+	if (obs->name_store_owned)
+		profiler_name_store_free(obs->name_store);
 
-	bfree(core->module_config_path);
-	bfree(core->locale);
-	bfree(core);
+	bfree(obs->module_config_path);
+	bfree(obs->locale);
+	bfree(obs);
+	obs = NULL;
 	bfree(cmdline_args.argv);
 
 #ifdef _WIN32
@@ -1085,8 +1083,6 @@
 void obs_set_locale(const char *locale)
 {
 	struct obs_module *module;
-	if (!obs)
-		return;
 
 	if (obs->locale)
 		bfree(obs->locale);
@@ -1103,7 +1099,7 @@
 
 const char *obs_get_locale(void)
 {
-	return obs ? obs->locale : NULL;
+	return obs->locale;
 }
 
 #define OBS_SIZE_MIN 2
@@ -1193,9 +1189,6 @@
 {
 	struct audio_output_info ai;
 
-	if (!obs)
-		return false;
-
 	/* don't allow changing of audio settings if active. */
 	if (obs->audio.audio && audio_output_active(obs->audio.audio))
 		return false;
@@ -1224,7 +1217,7 @@
 {
 	struct obs_core_video *video = &obs->video;
 
-	if (!obs || !video->graphics)
+	if (!video->graphics)
 		return false;
 
 	*ovi = video->ovi;
@@ -1236,7 +1229,7 @@
 	struct obs_core_audio *audio = &obs->audio;
 	const struct audio_output_info *info;
 
-	if (!obs || !oai || !audio->audio)
+	if (!oai || !audio->audio)
 		return false;
 
 	info = audio_output_get_info(audio->audio);
@@ -1248,9 +1241,6 @@
 
 bool obs_enum_source_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->source_types.num)
 		return false;
 	*id = obs->source_types.array[idx].id;
@@ -1259,9 +1249,6 @@
 
 bool obs_enum_input_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->input_types.num)
 		return false;
 	*id = obs->input_types.array[idx].id;
@@ -1271,9 +1258,6 @@
 bool obs_enum_input_types2(size_t idx, const char **id,
 			   const char **unversioned_id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->input_types.num)
 		return false;
 	if (id)
@@ -1288,8 +1272,6 @@
 	struct obs_source_info *latest = NULL;
 	int version = -1;
 
-	if (!obs)
-		return NULL;
 	if (!unversioned_id)
 		return NULL;
 
@@ -1311,9 +1293,6 @@
 
 bool obs_enum_filter_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->filter_types.num)
 		return false;
 	*id = obs->filter_types.array[idx].id;
@@ -1322,9 +1301,6 @@
 
 bool obs_enum_transition_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->transition_types.num)
 		return false;
 	*id = obs->transition_types.array[idx].id;
@@ -1333,9 +1309,6 @@
 
 bool obs_enum_output_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->output_types.num)
 		return false;
 	*id = obs->output_types.array[idx].id;
@@ -1344,9 +1317,6 @@
 
 bool obs_enum_encoder_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->encoder_types.num)
 		return false;
 	*id = obs->encoder_types.array[idx].id;
@@ -1355,9 +1325,6 @@
 
 bool obs_enum_service_types(size_t idx, const char **id)
 {
-	if (!obs)
-		return false;
-
 	if (idx >= obs->service_types.num)
 		return false;
 	*id = obs->service_types.array[idx].id;
@@ -1366,24 +1333,24 @@
 
 void obs_enter_graphics(void)
 {
-	if (obs && obs->video.graphics)
+	if (obs->video.graphics)
 		gs_enter_context(obs->video.graphics);
 }
 
 void obs_leave_graphics(void)
 {
-	if (obs && obs->video.graphics)
+	if (obs->video.graphics)
 		gs_leave_context();
 }
 
 audio_t *obs_get_audio(void)
 {
-	return (obs != NULL) ? obs->audio.audio : NULL;
+	return obs->audio.audio;
 }
 
 video_t *obs_get_video(void)
 {
-	return (obs != NULL) ? obs->video.video : NULL;
+	return obs->video.video;
 }
 
 /* TODO: optimize this later so it's not just O(N) string lookups */
@@ -1442,17 +1409,12 @@
 {
 	struct obs_modeless_ui *callback;
 
-	if (!obs)
-		return NULL;
-
 	callback = get_modeless_ui_callback(name, task, target);
 	return callback ? callback->create(data, ui_data) : NULL;
 }
 
 obs_source_t *obs_get_output_source(uint32_t channel)
 {
-	if (!obs)
-		return NULL;
 	return obs_view_get_source(&obs->data.main_view, channel);
 }
 
@@ -1460,8 +1422,6 @@
 {
 	assert(channel < MAX_CHANNELS);
 
-	if (!obs)
-		return;
 	if (channel >= MAX_CHANNELS)
 		return;
 
@@ -1499,9 +1459,6 @@
 {
 	obs_source_t *source;
 
-	if (!obs)
-		return;
-
 	pthread_mutex_lock(&obs->data.sources_mutex);
 	source = obs->data.first_source;
 
@@ -1528,9 +1485,6 @@
 {
 	obs_source_t *source;
 
-	if (!obs)
-		return;
-
 	pthread_mutex_lock(&obs->data.sources_mutex);
 	source = obs->data.first_source;
 
@@ -1574,24 +1528,18 @@
 
 void obs_enum_outputs(bool (*enum_proc)(void *, obs_output_t *), void *param)
 {
-	if (!obs)
-		return;
 	obs_enum(&obs->data.first_output, &obs->data.outputs_mutex, enum_proc,
 		 param);
 }
 
 void obs_enum_encoders(bool (*enum_proc)(void *, obs_encoder_t *), void *param)
 {
-	if (!obs)
-		return;
 	obs_enum(&obs->data.first_encoder, &obs->data.encoders_mutex, enum_proc,
 		 param);
 }
 
 void obs_enum_services(bool (*enum_proc)(void *, obs_service_t *), void *param)
 {
-	if (!obs)
-		return;
 	obs_enum(&obs->data.first_service, &obs->data.services_mutex, enum_proc,
 		 param);
 }
@@ -1645,8 +1593,6 @@
 
 obs_source_t *obs_get_source_by_name(const char *name)
 {
-	if (!obs)
-		return NULL;
 	return get_context_by_name(&obs->data.first_source, name,
 				   &obs->data.sources_mutex,
 				   obs_source_addref_safe_);
@@ -1654,8 +1600,6 @@
 
 obs_output_t *obs_get_output_by_name(const char *name)
 {
-	if (!obs)
-		return NULL;
 	return get_context_by_name(&obs->data.first_output, name,
 				   &obs->data.outputs_mutex,
 				   obs_output_addref_safe_);
@@ -1663,8 +1607,6 @@
 
 obs_encoder_t *obs_get_encoder_by_name(const char *name)
 {
-	if (!obs)
-		return NULL;
 	return get_context_by_name(&obs->data.first_encoder, name,
 				   &obs->data.encoders_mutex,
 				   obs_encoder_addref_safe_);
@@ -1672,8 +1614,6 @@
 
 obs_service_t *obs_get_service_by_name(const char *name)
 {
-	if (!obs)
-		return NULL;
 	return get_context_by_name(&obs->data.first_service, name,
 				   &obs->data.services_mutex,
 				   obs_service_addref_safe_);
@@ -1681,9 +1621,6 @@
 
 gs_effect_t *obs_get_base_effect(enum obs_base_effect effect)
 {
-	if (!obs)
-		return NULL;
-
 	switch (effect) {
 	case OBS_EFFECT_DEFAULT:
 		return obs->video.default_effect;
@@ -1713,30 +1650,22 @@
 /* OBS_DEPRECATED */
 gs_effect_t *obs_get_default_rect_effect(void)
 {
-	if (!obs)
-		return NULL;
 	return obs->video.default_rect_effect;
 }
 
 signal_handler_t *obs_get_signal_handler(void)
 {
-	if (!obs)
-		return NULL;
 	return obs->signals;
 }
 
 proc_handler_t *obs_get_proc_handler(void)
 {
-	if (!obs)
-		return NULL;
 	return obs->procs;
 }
 
 /* OBS_DEPRECATED */
 void obs_render_main_view(void)
 {
-	if (!obs)
-		return;
 	obs_view_render(&obs->data.main_view);
 }
 
@@ -1750,9 +1679,6 @@
 	gs_effect_t *effect;
 	gs_eparam_t *param;
 
-	if (!obs)
-		return;
-
 	video = &obs->video;
 	if (!video->texture_rendered)
 		return;
@@ -1787,9 +1713,6 @@
 {
 	struct obs_core_video *video;
 
-	if (!obs)
-		return NULL;
-
 	video = &obs->video;
 	if (!video->texture_rendered)
 		return NULL;
@@ -1801,9 +1724,6 @@
 {
 	struct calldata data = {0};
 
-	if (!obs)
-		return;
-
 	calldata_set_float(&data, "volume", volume);
 	signal_handler_signal(obs->signals, "master_volume", &data);
 	volume = (float)calldata_float(&data, "volume");
@@ -1814,7 +1734,7 @@
 
 float obs_get_master_volume(void)
 {
-	return obs ? obs->audio.user_volume : 0.0f;
+	return obs->audio.user_volume;
 }
 
 static obs_source_t *obs_load_source_type(obs_data_t *source_data)
@@ -1956,9 +1876,6 @@
 void obs_load_sources(obs_data_array_t *array, obs_load_source_cb cb,
 		      void *private_data)
 {
-	if (!obs)
-		return;
-
 	struct obs_core_data *data = &obs->data;
 	DARRAY(obs_source_t *) sources;
 	size_t count;
@@ -2093,9 +2010,6 @@
 obs_data_array_t *obs_save_sources_filtered(obs_save_source_filter_cb cb,
 					    void *data_)
 {
-	if (!obs)
-		return NULL;
-
 	struct obs_core_data *data = &obs->data;
 	obs_data_array_t *array;
 	obs_source_t *source;
@@ -2262,30 +2176,27 @@
 
 profiler_name_store_t *obs_get_profiler_name_store(void)
 {
-	if (!obs)
-		return NULL;
-
 	return obs->name_store;
 }
 
 uint64_t obs_get_video_frame_time(void)
 {
-	return obs ? obs->video.video_time : 0;
+	return obs->video.video_time;
 }
 
 double obs_get_active_fps(void)
 {
-	return obs ? obs->video.video_fps : 0.0;
+	return obs->video.video_fps;
 }
 
 uint64_t obs_get_average_frame_time_ns(void)
 {
-	return obs ? obs->video.video_avg_frame_time_ns : 0;
+	return obs->video.video_avg_frame_time_ns;
 }
 
 uint64_t obs_get_frame_interval_ns(void)
 {
-	return obs ? obs->video.video_frame_interval_ns : 0;
+	return obs->video.video_frame_interval_ns;
 }
 
 enum obs_obj_type obs_obj_get_type(void *obj)
@@ -2335,7 +2246,7 @@
 
 bool obs_set_audio_monitoring_device(const char *name, const char *id)
 {
-	if (!obs || !name || !id || !*name || !*id)
+	if (!name || !id || !*name || !*id)
 		return false;
 
 #if defined(_WIN32) || HAVE_PULSEAUDIO || defined(__APPLE__)
@@ -2368,9 +2279,6 @@
 
 void obs_get_audio_monitoring_device(const char **name, const char **id)
 {
-	if (!obs)
-		return;
-
 	if (name)
 		*name = obs->audio.monitoring_device_name;
 	if (id)
@@ -2380,9 +2288,6 @@
 void obs_add_tick_callback(void (*tick)(void *param, float seconds),
 			   void *param)
 {
-	if (!obs)
-		return;
-
 	struct tick_callback data = {tick, param};
 
 	pthread_mutex_lock(&obs->data.draw_callbacks_mutex);
@@ -2393,9 +2298,6 @@
 void obs_remove_tick_callback(void (*tick)(void *param, float seconds),
 			      void *param)
 {
-	if (!obs)
-		return;
-
 	struct tick_callback data = {tick, param};
 
 	pthread_mutex_lock(&obs->data.draw_callbacks_mutex);
@@ -2407,9 +2309,6 @@
 					       uint32_t cy),
 				  void *param)
 {
-	if (!obs)
-		return;
-
 	struct draw_callback data = {draw, param};
 
 	pthread_mutex_lock(&obs->data.draw_callbacks_mutex);
@@ -2421,9 +2320,6 @@
 						  uint32_t cy),
 				     void *param)
 {
-	if (!obs)
-		return;
-
 	struct draw_callback data = {draw, param};
 
 	pthread_mutex_lock(&obs->data.draw_callbacks_mutex);
@@ -2433,12 +2329,12 @@
 
 uint32_t obs_get_total_frames(void)
 {
-	return obs ? obs->video.total_frames : 0;
+	return obs->video.total_frames;
 }
 
 uint32_t obs_get_lagged_frames(void)
 {
-	return obs ? obs->video.lagged_frames : 0;
+	return obs->video.lagged_frames;
 }
 
 void start_raw_video(video_t *v, const struct video_scale_info *conversion,
@@ -2465,8 +2361,6 @@
 				void *param)
 {
 	struct obs_core_video *video = &obs->video;
-	if (!obs)
-		return;
 	start_raw_video(video->video, conversion, callback, param);
 }
 
@@ -2475,14 +2369,12 @@
 				   void *param)
 {
 	struct obs_core_video *video = &obs->video;
-	if (!obs)
-		return;
 	stop_raw_video(video->video, callback, param);
 }
 
 void obs_apply_private_data(obs_data_t *settings)
 {
-	if (!obs || !settings)
+	if (!settings)
 		return;
 
 	obs_data_apply(obs->data.private_data, settings);
@@ -2490,9 +2382,6 @@
 
 void obs_set_private_data(obs_data_t *settings)
 {
-	if (!obs)
-		return;
-
 	obs_data_clear(obs->data.private_data);
 	if (settings)
 		obs_data_apply(obs->data.private_data, settings);
@@ -2500,9 +2389,6 @@
 
 obs_data_t *obs_get_private_data(void)
 {
-	if (!obs)
-		return NULL;
-
 	obs_data_t *private_data = obs->data.private_data;
 	obs_data_addref(private_data);
 	return private_data;
@@ -2568,8 +2454,6 @@
 bool obs_video_active(void)
 {
 	struct obs_core_video *video = &obs->video;
-	if (!obs)
-		return false;
 
 	return os_atomic_load_long(&video->raw_active) > 0 ||
 	       os_atomic_load_long(&video->gpu_encoder_active) > 0;
@@ -2578,9 +2462,6 @@
 bool obs_nv12_tex_active(void)
 {
 	struct obs_core_video *video = &obs->video;
-	if (!obs)
-		return false;
-
 	return video->using_nv12_tex;
 }
 
@@ -2616,9 +2497,6 @@
 void obs_queue_task(enum obs_task_type type, obs_task_t task, void *param,
 		    bool wait)
 {
-	if (!obs)
-		return;
-
 	if (type == OBS_TASK_UI) {
 		if (obs->ui_task_handler) {
 			obs->ui_task_handler(task, param, wait);
@@ -2652,7 +2530,5 @@
 
 void obs_set_ui_task_handler(obs_task_handler_t handler)
 {
-	if (!obs)
-		return;
 	obs->ui_task_handler = handler;
 }

obs-studio-25.0.8.tar.xz/libobs/obs.h -> obs-studio-26.0.0.tar.xz/libobs/obs.h Changed

@@ -420,6 +420,17 @@
  */
 EXPORT bool obs_init_module(obs_module_t *module);
 
+/** Returns a module based upon its name, or NULL if not found */
+EXPORT obs_module_t *obs_get_module(const char *name);
+
+/** Returns locale text from a specific module */
+EXPORT bool obs_module_get_locale_string(const obs_module_t *mod,
+					 const char *lookup_string,
+					 const char **translated_string);
+
+EXPORT const char *obs_module_get_locale_text(const obs_module_t *mod,
+					      const char *text);
+
 /** Logs loaded modules */
 EXPORT void obs_log_loaded_modules(void);
 
@@ -1210,6 +1221,18 @@
 /** Shows any preloaded video data */
 EXPORT void obs_source_show_preloaded_video(obs_source_t *source);
 
+/**
+ * Sets current async video frame immediately
+ *
+ * NOTE: Non-YUV formats will always be treated as full range with this
+ * function!  Use obs_source_preload_video2 instead if partial range support is
+ * desired for non-YUV video formats.
+ */
+EXPORT void obs_source_set_video_frame(obs_source_t *source,
+				       const struct obs_source_frame *frame);
+EXPORT void obs_source_set_video_frame2(obs_source_t *source,
+					const struct obs_source_frame2 *frame);
+
 /** Outputs audio data (always asynchronous) */
 EXPORT void obs_source_output_audio(obs_source_t *source,
 				    const struct obs_source_audio *audio);

obs-studio-25.0.8.tar.xz/libobs/obs.hpp -> obs-studio-26.0.0.tar.xz/libobs/obs.hpp Changed

obs-studio-25.0.8.tar.xz/libobs/util/darray.h -> obs-studio-26.0.0.tar.xz/libobs/util/darray.h Changed

obs-studio-25.0.8.tar.xz/libobs/util/dstr.c -> obs-studio-26.0.0.tar.xz/libobs/util/dstr.c Changed

obs-studio-25.0.8.tar.xz/libobs/util/platform-nix.c -> obs-studio-26.0.0.tar.xz/libobs/util/platform-nix.c Changed

obs-studio-26.0.0.tar.xz/libobs/util/simde/README.libobs Added

obs-studio-25.0.8.tar.xz/libobs/util/simde/check.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/check.h Changed

@@ -6,6 +6,8 @@
  *   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
  */
 
 #if !defined(SIMDE_CHECK_H)
@@ -15,6 +17,7 @@
 #define SIMDE_NDEBUG 1
 #endif
 
+#include "hedley.h"
 #include <stdint.h>
 
 #if !defined(_WIN32)
@@ -32,24 +35,47 @@
 #endif
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1500)
-#define SIMDE__PUSH_DISABLE_MSVC_C4127 \
+#define SIMDE_PUSH_DISABLE_MSVC_C4127_ \
 	__pragma(warning(push)) __pragma(warning(disable : 4127))
-#define SIMDE__POP_DISABLE_MSVC_C4127 __pragma(warning(pop))
+#define SIMDE_POP_DISABLE_MSVC_C4127_ __pragma(warning(pop))
 #else
-#define SIMDE__PUSH_DISABLE_MSVC_C4127
-#define SIMDE__POP_DISABLE_MSVC_C4127
+#define SIMDE_PUSH_DISABLE_MSVC_C4127_
+#define SIMDE_POP_DISABLE_MSVC_C4127_
 #endif
 
 #if !defined(simde_errorf)
+#if defined(__has_include)
+#if __has_include(<stdio.h>)
+#include <stdio.h>
+#endif
+#elif defined(SIMDE_STDC_HOSTED)
+#if SIMDE_STDC_HOSTED == 1
 #include <stdio.h>
-#include <stdlib.h>
+#endif
+#elif defined(__STDC_HOSTED__)
+#if __STDC_HOSTETD__ == 1
+#include <stdio.h>
+#endif
+#endif
+
+#include "debug-trap.h"
+
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_VARIADIC_MACROS_
+#if defined(EOF)
 #define simde_errorf(format, ...) \
 	(fprintf(stderr, format, __VA_ARGS__), abort())
+#else
+#define simde_errorf(format, ...) (simde_trap())
+#endif
+HEDLEY_DIAGNOSTIC_POP
 #endif
 
 #define simde_error(msg) simde_errorf("%s", msg)
 
-#if defined(SIMDE_NDEBUG)
+#if defined(SIMDE_NDEBUG) ||                                 \
+	(defined(__cplusplus) && (__cplusplus < 201103L)) || \
+	(defined(__STDC__) && (__STDC__ < 199901L))
 #if defined(SIMDE_CHECK_FAIL_DEFINED)
 #define simde_assert(expr)
 #else
@@ -78,8 +104,8 @@
 		if (!HEDLEY_LIKELY(expr)) {                           \
 			simde_error("assertion failed: " #expr "\n"); \
 		}                                                     \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                        \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                        \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_true(expr)                                \
 	do {                                                   \
@@ -87,8 +113,8 @@
 			simde_error("assertion failed: " #expr \
 				    " is not true\n");         \
 		}                                              \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                 \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                 \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_false(expr)                               \
 	do {                                                   \
@@ -96,8 +122,8 @@
 			simde_error("assertion failed: " #expr \
 				    " is not false\n");        \
 		}                                              \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                 \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                 \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_type_full(prefix, suffix, T, fmt, a, op, b)           \
 	do {                                                               \
@@ -110,8 +136,8 @@
 				     #a, #op, #b, simde_tmp_a_, #op,       \
 				     simde_tmp_b_);                        \
 		}                                                          \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                             \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                             \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_double_equal(a, b, precision)                           \
 	do {                                                                 \
@@ -127,8 +153,8 @@
 				"g == %0." #precision "g)\n",                \
 				#a, #b, simde_tmp_a_, simde_tmp_b_);         \
 		}                                                            \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                               \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                               \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #include <string.h>
 #define simde_assert_string_equal(a, b)                                                   \
@@ -141,8 +167,8 @@
 				"assertion failed: string %s == %s (\"%s\" == \"%s\")\n", \
 				#a, #b, simde_tmp_a_, simde_tmp_b_);                      \
 		}                                                                         \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                                            \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                                            \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_string_not_equal(a, b)                                               \
 	do {                                                                              \
@@ -154,8 +180,8 @@
 				"assertion failed: string %s != %s (\"%s\" == \"%s\")\n", \
 				#a, #b, simde_tmp_a_, simde_tmp_b_);                      \
 		}                                                                         \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                                            \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                                            \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_memory_equal(size, a, b)                                                                        \
 	do {                                                                                                         \
@@ -180,8 +206,8 @@
 				}                                                                                    \
 			}                                                                                            \
 		}                                                                                                    \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                                                                       \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                                                                       \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 
 #define simde_assert_memory_not_equal(size, a, b)                                          \
 	do {                                                                               \
@@ -197,8 +223,8 @@
 				"u bytes)\n",                                              \
 				#a, #b, simde_tmp_size_);                                  \
 		}                                                                          \
-		SIMDE__PUSH_DISABLE_MSVC_C4127                                             \
-	} while (0) SIMDE__POP_DISABLE_MSVC_C4127
+		SIMDE_PUSH_DISABLE_MSVC_C4127_                                             \
+	} while (0) SIMDE_POP_DISABLE_MSVC_C4127_
 #endif
 
 #define simde_assert_type(T, fmt, a, op, b) \

obs-studio-26.0.0.tar.xz/libobs/util/simde/debug-trap.h Added

@@ -0,0 +1,117 @@
+/* Debugging assertions and traps
+ * 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
+ */
+
+#if !defined(SIMDE_DEBUG_TRAP_H)
+#define SIMDE_DEBUG_TRAP_H
+
+#if !defined(SIMDE_NDEBUG) && defined(NDEBUG) && !defined(SIMDE_DEBUG)
+#define SIMDE_NDEBUG 1
+#endif
+
+#if defined(__has_builtin) && !defined(__ibmxl__)
+#if __has_builtin(__builtin_debugtrap)
+#define simde_trap() __builtin_debugtrap()
+#elif __has_builtin(__debugbreak)
+#define simde_trap() __debugbreak()
+#endif
+#endif
+#if !defined(simde_trap)
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
+#define simde_trap() __debugbreak()
+#elif defined(__ARMCC_VERSION)
+#define simde_trap() __breakpoint(42)
+#elif defined(__ibmxl__) || defined(__xlC__)
+#include <builtins.h>
+#define simde_trap() __trap(42)
+#elif defined(__DMC__) && defined(_M_IX86)
+static inline void simde_trap(void)
+{
+	__asm int 3h;
+}
+#elif defined(__i386__) || defined(__x86_64__)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__("int $03");
+}
+#elif defined(__thumb__)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__(".inst 0xde01");
+}
+#elif defined(__aarch64__)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__(".inst 0xd4200000");
+}
+#elif defined(__arm__)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__(".inst 0xe7f001f0");
+}
+#elif defined(__alpha__) && !defined(__osf__)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__("bpt");
+}
+#elif defined(_54_)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__("ESTOP");
+}
+#elif defined(_55_)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__(
+		";\n .if (.MNEMONIC)\n ESTOP_1\n .else\n ESTOP_1()\n .endif\n NOP");
+}
+#elif defined(_64P_)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__("SWBP 0");
+}
+#elif defined(_6x_)
+static inline void simde_trap(void)
+{
+	__asm__ __volatile__("NOP\n .word 0x10000000");
+}
+#elif defined(__STDC_HOSTED__) && (__STDC_HOSTED__ == 0) && defined(__GNUC__)
+#define simde_trap() __builtin_trap()
+#else
+#include <signal.h>
+#if defined(SIGTRAP)
+#define simde_trap() raise(SIGTRAP)
+#else
+#define simde_trap() raise(SIGABRT)
+#endif
+#endif
+#endif
+
+#if defined(HEDLEY_LIKELY)
+#define SIMDE_DBG_LIKELY(expr) HEDLEY_LIKELY(expr)
+#elif defined(__GNUC__) && (__GNUC__ >= 3)
+#define SIMDE_DBG_LIKELY(expr) __builtin_expect(!!(expr), 1)
+#else
+#define SIMDE_DBG_LIKELY(expr) (!!(expr))
+#endif
+
+#if !defined(SIMDE_NDEBUG) || (SIMDE_NDEBUG == 0)
+#define simde_dbg_assert(expr)                 \
+	do {                                   \
+		if (!SIMDE_DBG_LIKELY(expr)) { \
+			simde_trap();          \
+		}                              \
+	} while (0)
+#else
+#define simde_dbg_assert(expr)
+#endif
+
+#endif /* !defined(SIMDE_DEBUG_TRAP_H) */

obs-studio-25.0.8.tar.xz/libobs/util/simde/hedley.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/hedley.h Changed

@@ -10,11 +10,11 @@
  * SPDX-License-Identifier: CC0-1.0
  */
 
-#if !defined(HEDLEY_VERSION) || (HEDLEY_VERSION < 10)
+#if !defined(HEDLEY_VERSION) || (HEDLEY_VERSION < 12)
 #if defined(HEDLEY_VERSION)
 #undef HEDLEY_VERSION
 #endif
-#define HEDLEY_VERSION 10
+#define HEDLEY_VERSION 12
 
 #if defined(HEDLEY_STRINGIFY_EX)
 #undef HEDLEY_STRINGIFY_EX
@@ -263,12 +263,16 @@
 #if defined(HEDLEY_TI_VERSION)
 #undef HEDLEY_TI_VERSION
 #endif
-#if defined(__TI_COMPILER_VERSION__)
+#if defined(__TI_COMPILER_VERSION__) &&                                       \
+	(defined(__TMS470__) || defined(__TI_ARM__) || defined(__MSP430__) || \
+	 defined(__TMS320C2000__))
+#if (__TI_COMPILER_VERSION__ >= 16000000)
 #define HEDLEY_TI_VERSION                                                 \
 	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
 			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
 			      (__TI_COMPILER_VERSION__ % 1000))
 #endif
+#endif
 
 #if defined(HEDLEY_TI_VERSION_CHECK)
 #undef HEDLEY_TI_VERSION_CHECK
@@ -280,6 +284,127 @@
 #define HEDLEY_TI_VERSION_CHECK(major, minor, patch) (0)
 #endif
 
+#if defined(HEDLEY_TI_CL2000_VERSION)
+#undef HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+#define HEDLEY_TI_CL2000_VERSION                                          \
+	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
+			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
+			      (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(HEDLEY_TI_CL2000_VERSION_CHECK)
+#undef HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(HEDLEY_TI_CL2000_VERSION)
+#define HEDLEY_TI_CL2000_VERSION_CHECK(major, minor, patch) \
+	(HEDLEY_TI_CL2000_VERSION >= HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+#define HEDLEY_TI_CL2000_VERSION_CHECK(major, minor, patch) (0)
+#endif
+
+#if defined(HEDLEY_TI_CL430_VERSION)
+#undef HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+#define HEDLEY_TI_CL430_VERSION                                           \
+	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
+			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
+			      (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(HEDLEY_TI_CL430_VERSION_CHECK)
+#undef HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(HEDLEY_TI_CL430_VERSION)
+#define HEDLEY_TI_CL430_VERSION_CHECK(major, minor, patch) \
+	(HEDLEY_TI_CL430_VERSION >= HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+#define HEDLEY_TI_CL430_VERSION_CHECK(major, minor, patch) (0)
+#endif
+
+#if defined(HEDLEY_TI_ARMCL_VERSION)
+#undef HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && \
+	(defined(__TMS470__) || defined(__TI_ARM__))
+#define HEDLEY_TI_ARMCL_VERSION                                           \
+	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
+			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
+			      (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(HEDLEY_TI_ARMCL_VERSION_CHECK)
+#undef HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(HEDLEY_TI_ARMCL_VERSION)
+#define HEDLEY_TI_ARMCL_VERSION_CHECK(major, minor, patch) \
+	(HEDLEY_TI_ARMCL_VERSION >= HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+#define HEDLEY_TI_ARMCL_VERSION_CHECK(major, minor, patch) (0)
+#endif
+
+#if defined(HEDLEY_TI_CL6X_VERSION)
+#undef HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+#define HEDLEY_TI_CL6X_VERSION                                            \
+	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
+			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
+			      (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(HEDLEY_TI_CL6X_VERSION_CHECK)
+#undef HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(HEDLEY_TI_CL6X_VERSION)
+#define HEDLEY_TI_CL6X_VERSION_CHECK(major, minor, patch) \
+	(HEDLEY_TI_CL6X_VERSION >= HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+#define HEDLEY_TI_CL6X_VERSION_CHECK(major, minor, patch) (0)
+#endif
+
+#if defined(HEDLEY_TI_CL7X_VERSION)
+#undef HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+#define HEDLEY_TI_CL7X_VERSION                                            \
+	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
+			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
+			      (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(HEDLEY_TI_CL7X_VERSION_CHECK)
+#undef HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(HEDLEY_TI_CL7X_VERSION)
+#define HEDLEY_TI_CL7X_VERSION_CHECK(major, minor, patch) \
+	(HEDLEY_TI_CL7X_VERSION >= HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+#define HEDLEY_TI_CL7X_VERSION_CHECK(major, minor, patch) (0)
+#endif
+
+#if defined(HEDLEY_TI_CLPRU_VERSION)
+#undef HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+#define HEDLEY_TI_CLPRU_VERSION                                           \
+	HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000,          \
+			      (__TI_COMPILER_VERSION__ % 1000000) / 1000, \
+			      (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(HEDLEY_TI_CLPRU_VERSION_CHECK)
+#undef HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(HEDLEY_TI_CLPRU_VERSION)
+#define HEDLEY_TI_CLPRU_VERSION_CHECK(major, minor, patch) \
+	(HEDLEY_TI_CLPRU_VERSION >= HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+#define HEDLEY_TI_CLPRU_VERSION_CHECK(major, minor, patch) (0)
+#endif
+
 #if defined(HEDLEY_CRAY_VERSION)
 #undef HEDLEY_CRAY_VERSION
 #endif
@@ -408,7 +533,12 @@
 #if defined(HEDLEY_GNUC_VERSION) && !defined(__clang__) &&                \
 	!defined(HEDLEY_INTEL_VERSION) && !defined(HEDLEY_PGI_VERSION) && \
 	!defined(HEDLEY_ARM_VERSION) && !defined(HEDLEY_TI_VERSION) &&    \
-	!defined(__COMPCERT__)
+	!defined(HEDLEY_TI_ARMCL_VERSION) &&                              \
+	!defined(HEDLEY_TI_CL430_VERSION) &&                              \
+	!defined(HEDLEY_TI_CL2000_VERSION) &&                             \
+	!defined(HEDLEY_TI_CL6X_VERSION) &&                               \
+	!defined(HEDLEY_TI_CL7X_VERSION) &&                               \
+	!defined(HEDLEY_TI_CLPRU_VERSION) && !defined(__COMPCERT__)
 #define HEDLEY_GCC_VERSION HEDLEY_GNUC_VERSION
 #endif
 
@@ -456,12 +586,30 @@
 #if defined(HEDLEY_HAS_CPP_ATTRIBUTE)
 #undef HEDLEY_HAS_CPP_ATTRIBUTE
 #endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
+#if defined(__has_cpp_attribute) && defined(__cplusplus) && \
+	(!defined(HEDLEY_SUNPRO_VERSION) ||                 \
+	 HEDLEY_SUNPRO_VERSION_CHECK(5, 15, 0))
 #define HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
 #else
 #define HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
 #endif
 
+#if defined(HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+#undef HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+#define HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns, attribute) (0)
+#elif !defined(HEDLEY_PGI_VERSION) && !defined(HEDLEY_IAR_VERSION) && \
+	(!defined(HEDLEY_SUNPRO_VERSION) ||                           \
+	 HEDLEY_SUNPRO_VERSION_CHECK(5, 15, 0)) &&                    \
+	(!defined(HEDLEY_MSVC_VERSION) ||                             \
+	 HEDLEY_MSVC_VERSION_CHECK(19, 20, 0))
+#define HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns, attribute) \
+	HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+#define HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns, attribute) (0)
+#endif
+
 #if defined(HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
 #undef HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
 #endif
@@ -640,13 +788,99 @@
 	HEDLEY_GCC_VERSION_CHECK(major, minor, patch)
 #endif
 
+/* HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+#undef HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#if HEDLEY_HAS_WARNING("-Wc++98-compat")
+#if HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#define HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr)                  \
+	HEDLEY_DIAGNOSTIC_PUSH                                             \
+	_Pragma("clang diagnostic ignored \"-Wc++98-compat\"")             \
+		_Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+			xpr HEDLEY_DIAGNOSTIC_POP
+#else
+#define HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr)      \
+	HEDLEY_DIAGNOSTIC_PUSH                                 \
+	_Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+		xpr HEDLEY_DIAGNOSTIC_POP
+#endif
+#endif
+#endif
+#if !defined(HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+#define HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(HEDLEY_CONST_CAST)
+#undef HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#define HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif HEDLEY_HAS_WARNING("-Wcast-qual") ||   \
+	HEDLEY_GCC_VERSION_CHECK(4, 6, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
+#define HEDLEY_CONST_CAST(T, expr)                              \
+	(__extension__({                                        \
+		HEDLEY_DIAGNOSTIC_PUSH                          \
+		HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL((T)(expr)); \
+		HEDLEY_DIAGNOSTIC_POP                           \
+	}))
+#else
+#define HEDLEY_CONST_CAST(T, expr) ((T)(expr))
+#endif
+
+#if defined(HEDLEY_REINTERPRET_CAST)
+#undef HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+#define HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+#define HEDLEY_REINTERPRET_CAST(T, expr) ((T)(expr))
+#endif
+
+#if defined(HEDLEY_STATIC_CAST)
+#undef HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+#define HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+#define HEDLEY_STATIC_CAST(T, expr) ((T)(expr))
+#endif
+
+#if defined(HEDLEY_CPP_CAST)
+#undef HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#if HEDLEY_HAS_WARNING("-Wold-style-cast")
+#define HEDLEY_CPP_CAST(T, expr)                                            \
+	HEDLEY_DIAGNOSTIC_PUSH                                              \
+	_Pragma("clang diagnostic ignored \"-Wold-style-cast\"")((T)(expr)) \
+		HEDLEY_DIAGNOSTIC_POP
+#elif HEDLEY_IAR_VERSION_CHECK(8, 3, 0)
+#define HEDLEY_CPP_CAST(T, expr) \
+	HEDLEY_DIAGNOSTIC_PUSH   \
+	_Pragma("diag_suppress=Pe137") HEDLEY_DIAGNOSTIC_POP #else
+#define HEDLEY_CPP_CAST(T, expr) ((T)(expr))
+#endif
+#else
+#define HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
 #if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
 	defined(__clang__) || HEDLEY_GCC_VERSION_CHECK(3, 0, 0) ||  \
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                     \
 	HEDLEY_IAR_VERSION_CHECK(8, 0, 0) ||                        \
 	HEDLEY_PGI_VERSION_CHECK(18, 4, 0) ||                       \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                        \
-	HEDLEY_TI_VERSION_CHECK(6, 0, 0) ||                         \
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                       \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(4, 7, 0) ||                   \
+	HEDLEY_TI_CL430_VERSION_CHECK(2, 0, 1) ||                   \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 1, 0) ||                  \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 0, 0) ||                    \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                    \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0) ||                   \
 	HEDLEY_CRAY_VERSION_CHECK(5, 0, 0) ||                       \
 	HEDLEY_TINYC_VERSION_CHECK(0, 9, 17) ||                     \
 	HEDLEY_SUNPRO_VERSION_CHECK(8, 0, 0) ||                     \
@@ -679,7 +913,12 @@
 #elif HEDLEY_ARM_VERSION_CHECK(5, 6, 0)
 #define HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
 #define HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
-#elif HEDLEY_TI_VERSION_CHECK(8, 1, 0)
+#elif HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||       \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) || \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 4, 0) || \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 1, 0) ||  \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||  \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
 #define HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
 #elif HEDLEY_PELLES_VERSION_CHECK(2, 90, 0)
@@ -706,7 +945,21 @@
 	_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
 #elif HEDLEY_MSVC_VERSION_CHECK(15, 0, 0)
 #define HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable : 4996))
-#elif HEDLEY_TI_VERSION_CHECK(8, 0, 0)
+#elif HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||         \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&  \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||   \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) && \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||  \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&  \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||   \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&   \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||    \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||    \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
 #elif HEDLEY_SUNPRO_VERSION_CHECK(5, 13, 0) && !defined(__cplusplus)
 #define HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED \
@@ -740,7 +993,12 @@
 #elif HEDLEY_MSVC_VERSION_CHECK(15, 0, 0)
 #define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
 	__pragma(warning(disable : 4068))
-#elif HEDLEY_TI_VERSION_CHECK(8, 0, 0)
+#elif HEDLEY_TI_VERSION_CHECK(16, 9, 0) ||       \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 0, 0) || \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) || \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 3, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif HEDLEY_TI_CL6X_VERSION_CHECK(8, 0, 0)
 #define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
 #elif HEDLEY_IAR_VERSION_CHECK(8, 0, 0)
 #define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
@@ -748,6 +1006,39 @@
 #define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
 #endif
 
+#if defined(HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+#undef HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if HEDLEY_HAS_WARNING("-Wunknown-attributes")
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif HEDLEY_GCC_VERSION_CHECK(4, 6, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif HEDLEY_INTEL_VERSION_CHECK(17, 0, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("warning(disable:1292)")
+#elif HEDLEY_MSVC_VERSION_CHECK(19, 0, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	__pragma(warning(disable : 5030))
+#elif HEDLEY_PGI_VERSION_CHECK(17, 10, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("diag_suppress 1097")
+#elif HEDLEY_SUNPRO_VERSION_CHECK(5, 14, 0) && defined(__cplusplus)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("error_messages(off,attrskipunsup)")
+#elif HEDLEY_TI_VERSION_CHECK(18, 1, 0) ||       \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 3, 0) || \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("diag_suppress 1173")
+#elif HEDLEY_IAR_VERSION_CHECK(8, 0, 0)
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES \
+	_Pragma("diag_suppress=Pe1097")
+#else
+#define HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
 #if defined(HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
 #undef HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
 #endif
@@ -771,25 +1062,44 @@
 #undef HEDLEY_DEPRECATED_FOR
 #endif
 #if defined(__cplusplus) && (__cplusplus >= 201402L)
-#define HEDLEY_DEPRECATED(since) [[deprecated("Since " #since)]]
-#define HEDLEY_DEPRECATED_FOR(since, replacement) \
-	[[deprecated("Since " #since "; use " #replacement)]]
+#define HEDLEY_DEPRECATED(since)                      \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_( \
+		[[deprecated("Since " #since)]])
+#define HEDLEY_DEPRECATED_FOR(since, replacement)     \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_( \
+		[[deprecated("Since " #since "; use " #replacement)]])
 #elif HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \
 	HEDLEY_GCC_VERSION_CHECK(4, 5, 0) ||                     \
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                  \
 	HEDLEY_ARM_VERSION_CHECK(5, 6, 0) ||                     \
 	HEDLEY_SUNPRO_VERSION_CHECK(5, 13, 0) ||                 \
 	HEDLEY_PGI_VERSION_CHECK(17, 10, 0) ||                   \
-	HEDLEY_TI_VERSION_CHECK(8, 3, 0)
+	HEDLEY_TI_VERSION_CHECK(18, 1, 0) ||                     \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(18, 1, 0) ||               \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 3, 0) ||                 \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                 \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 3, 0)
 #define HEDLEY_DEPRECATED(since) \
 	__attribute__((__deprecated__("Since " #since)))
 #define HEDLEY_DEPRECATED_FOR(since, replacement) \
 	__attribute__((__deprecated__("Since " #since "; use " #replacement)))
 #elif HEDLEY_HAS_ATTRIBUTE(deprecated) || HEDLEY_GCC_VERSION_CHECK(3, 1, 0) || \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                   \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                                    \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                                   \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                                  \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                             \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                             \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                              \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                            \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                             \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                             \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                             \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                             \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                              \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                              \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                             \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                               \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                               \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
 #define HEDLEY_DEPRECATED_FOR(since, replacement) \
 	__attribute__((__deprecated__))
@@ -823,21 +1133,48 @@
 #if defined(HEDLEY_WARN_UNUSED_RESULT)
 #undef HEDLEY_WARN_UNUSED_RESULT
 #endif
-#if defined(__cplusplus) && (__cplusplus >= 201703L)
-#define HEDLEY_WARN_UNUSED_RESULT [[nodiscard]]
+#if defined(HEDLEY_WARN_UNUSED_RESULT_MSG)
+#undef HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if (HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+#define HEDLEY_WARN_UNUSED_RESULT \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#define HEDLEY_WARN_UNUSED_RESULT_MSG(msg) \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+#define HEDLEY_WARN_UNUSED_RESULT \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#define HEDLEY_WARN_UNUSED_RESULT_MSG(msg) \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
 #elif HEDLEY_HAS_ATTRIBUTE(warn_unused_result) ||                          \
 	HEDLEY_GCC_VERSION_CHECK(3, 4, 0) ||                               \
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                            \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                                \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                               \
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                              \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                         \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                          \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                        \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                         \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                         \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                          \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                          \
 	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                           \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                           \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0) ||                          \
 	(HEDLEY_SUNPRO_VERSION_CHECK(5, 15, 0) && defined(__cplusplus)) || \
 	HEDLEY_PGI_VERSION_CHECK(17, 10, 0)
 #define HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+#define HEDLEY_WARN_UNUSED_RESULT_MSG(msg) \
+	__attribute__((__warn_unused_result__))
 #elif defined(_Check_return_) /* SAL */
 #define HEDLEY_WARN_UNUSED_RESULT _Check_return_
+#define HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
 #else
 #define HEDLEY_WARN_UNUSED_RESULT
+#define HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
 #endif
 
 #if defined(HEDLEY_SENTINEL)
@@ -861,20 +1198,33 @@
 #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
 #define HEDLEY_NO_RETURN _Noreturn
 #elif defined(__cplusplus) && (__cplusplus >= 201103L)
-#define HEDLEY_NO_RETURN [[noreturn]]
+#define HEDLEY_NO_RETURN \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
 #elif HEDLEY_HAS_ATTRIBUTE(noreturn) || HEDLEY_GCC_VERSION_CHECK(3, 2, 0) || \
 	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) ||                             \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                 \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                                \
-	HEDLEY_TI_VERSION_CHECK(18, 0, 0) ||                                 \
-	(HEDLEY_TI_VERSION_CHECK(17, 3, 0) &&                                \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                                \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                           \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                           \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                            \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                          \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                           \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                           \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                           \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                           \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                            \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                            \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                           \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                             \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                             \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_NO_RETURN __attribute__((__noreturn__))
 #elif HEDLEY_SUNPRO_VERSION_CHECK(5, 10, 0)
 #define HEDLEY_NO_RETURN _Pragma("does_not_return")
 #elif HEDLEY_MSVC_VERSION_CHECK(13, 10, 0)
 #define HEDLEY_NO_RETURN __declspec(noreturn)
-#elif HEDLEY_TI_VERSION_CHECK(6, 0, 0) && defined(__cplusplus)
+#elif HEDLEY_TI_CL6X_VERSION_CHECK(6, 0, 0) && defined(__cplusplus)
 #define HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
 #elif HEDLEY_COMPCERT_VERSION_CHECK(3, 2, 0)
 #define HEDLEY_NO_RETURN __attribute((noreturn))
@@ -884,37 +1234,21 @@
 #define HEDLEY_NO_RETURN
 #endif
 
+#if defined(HEDLEY_NO_ESCAPE)
+#undef HEDLEY_NO_ESCAPE
+#endif
+#if HEDLEY_HAS_ATTRIBUTE(noescape)
+#define HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+#define HEDLEY_NO_ESCAPE
+#endif
+
 #if defined(HEDLEY_UNREACHABLE)
 #undef HEDLEY_UNREACHABLE
 #endif
 #if defined(HEDLEY_UNREACHABLE_RETURN)
 #undef HEDLEY_UNREACHABLE_RETURN
 #endif
-#if (HEDLEY_HAS_BUILTIN(__builtin_unreachable) && \
-     (!defined(HEDLEY_ARM_VERSION))) ||           \
-	HEDLEY_GCC_VERSION_CHECK(4, 5, 0) ||      \
-	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||   \
-	HEDLEY_IBM_VERSION_CHECK(13, 1, 5)
-#define HEDLEY_UNREACHABLE() __builtin_unreachable()
-#elif HEDLEY_MSVC_VERSION_CHECK(13, 10, 0)
-#define HEDLEY_UNREACHABLE() __assume(0)
-#elif HEDLEY_TI_VERSION_CHECK(6, 0, 0)
-#if defined(__cplusplus)
-#define HEDLEY_UNREACHABLE() std::_nassert(0)
-#else
-#define HEDLEY_UNREACHABLE() _nassert(0)
-#endif
-#define HEDLEY_UNREACHABLE_RETURN(value) return value
-#elif defined(EXIT_FAILURE)
-#define HEDLEY_UNREACHABLE() abort()
-#else
-#define HEDLEY_UNREACHABLE()
-#define HEDLEY_UNREACHABLE_RETURN(value) return value
-#endif
-#if !defined(HEDLEY_UNREACHABLE_RETURN)
-#define HEDLEY_UNREACHABLE_RETURN(value) HEDLEY_UNREACHABLE()
-#endif
-
 #if defined(HEDLEY_ASSUME)
 #undef HEDLEY_ASSUME
 #endif
@@ -922,24 +1256,55 @@
 #define HEDLEY_ASSUME(expr) __assume(expr)
 #elif HEDLEY_HAS_BUILTIN(__builtin_assume)
 #define HEDLEY_ASSUME(expr) __builtin_assume(expr)
-#elif HEDLEY_TI_VERSION_CHECK(6, 0, 0)
+#elif HEDLEY_TI_CL2000_VERSION_CHECK(6, 2, 0) || \
+	HEDLEY_TI_CL6X_VERSION_CHECK(4, 0, 0)
 #if defined(__cplusplus)
 #define HEDLEY_ASSUME(expr) std::_nassert(expr)
 #else
 #define HEDLEY_ASSUME(expr) _nassert(expr)
 #endif
-#elif (HEDLEY_HAS_BUILTIN(__builtin_unreachable) && \
-       !defined(HEDLEY_ARM_VERSION)) ||             \
-	HEDLEY_GCC_VERSION_CHECK(4, 5, 0) ||        \
-	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||     \
+#endif
+#if (HEDLEY_HAS_BUILTIN(__builtin_unreachable) && \
+     (!defined(HEDLEY_ARM_VERSION))) ||           \
+	HEDLEY_GCC_VERSION_CHECK(4, 5, 0) ||      \
+	HEDLEY_PGI_VERSION_CHECK(18, 10, 0) ||    \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||   \
 	HEDLEY_IBM_VERSION_CHECK(13, 1, 5)
-#define HEDLEY_ASSUME(expr) ((void)((expr) ? 1 : (__builtin_unreachable(), 1)))
+#define HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(HEDLEY_ASSUME)
+#define HEDLEY_UNREACHABLE() HEDLEY_ASSUME(0)
+#endif
+#if !defined(HEDLEY_ASSUME)
+#if defined(HEDLEY_UNREACHABLE)
+#define HEDLEY_ASSUME(expr) \
+	HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (HEDLEY_UNREACHABLE(), 1)))
 #else
-#define HEDLEY_ASSUME(expr) ((void)(expr))
+#define HEDLEY_ASSUME(expr) HEDLEY_STATIC_CAST(void, expr)
+#endif
+#endif
+#if defined(HEDLEY_UNREACHABLE)
+#if HEDLEY_TI_CL2000_VERSION_CHECK(6, 2, 0) || \
+	HEDLEY_TI_CL6X_VERSION_CHECK(4, 0, 0)
+#define HEDLEY_UNREACHABLE_RETURN(value) \
+	return (HEDLEY_STATIC_CAST(void, HEDLEY_ASSUME(0)), (value))
+#else
+#define HEDLEY_UNREACHABLE_RETURN(value) HEDLEY_UNREACHABLE()
+#endif
+#else
+#define HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(HEDLEY_UNREACHABLE)
+#define HEDLEY_UNREACHABLE() HEDLEY_ASSUME(0)
 #endif
 
 HEDLEY_DIAGNOSTIC_PUSH
-#if HEDLEY_HAS_WARNING("-Wvariadic-macros") || HEDLEY_GCC_VERSION_CHECK(4, 0, 0)
+#if HEDLEY_HAS_WARNING("-Wpedantic")
+#pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros", 4, 0, 0)
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wvariadic-macros"
 #elif defined(HEDLEY_GCC_VERSION)
@@ -973,9 +1338,21 @@
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                            \
 	HEDLEY_ARM_VERSION_CHECK(5, 6, 0) ||                               \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                              \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                                \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                               \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                              \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                         \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                          \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                        \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                         \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                         \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                          \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                          \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                           \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                           \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_PRINTF_FORMAT(string_idx, first_to_check) \
 	__attribute__((__format__(__printf__, string_idx, first_to_check)))
 #elif HEDLEY_PELLES_VERSION_CHECK(6, 0, 0)
@@ -990,7 +1367,7 @@
 #endif
 #if defined(__cplusplus)
 #if __cplusplus >= 201103L
-#define HEDLEY_CONSTEXPR constexpr
+#define HEDLEY_CONSTEXPR HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
 #endif
 #endif
 #if !defined(HEDLEY_CONSTEXPR)
@@ -1010,56 +1387,60 @@
 #undef HEDLEY_UNPREDICTABLE
 #endif
 #if HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
-#define HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable(!!(expr))
+#define HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
 #endif
 #if HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \
 	HEDLEY_GCC_VERSION_CHECK(9, 0, 0)
 #define HEDLEY_PREDICT(expr, value, probability) \
-	__builtin_expect_with_probability(expr, value, probability)
+	__builtin_expect_with_probability((expr), (value), (probability))
 #define HEDLEY_PREDICT_TRUE(expr, probability) \
-	__builtin_expect_with_probability(!!(expr), 1, probability)
+	__builtin_expect_with_probability(!!(expr), 1, (probability))
 #define HEDLEY_PREDICT_FALSE(expr, probability) \
-	__builtin_expect_with_probability(!!(expr), 0, probability)
+	__builtin_expect_with_probability(!!(expr), 0, (probability))
 #define HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1)
 #define HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#if !defined(HEDLEY_BUILTIN_UNPREDICTABLE)
-#define HEDLEY_BUILTIN_UNPREDICTABLE(expr) \
-	__builtin_expect_with_probability(!!(expr), 1, 0.5)
-#endif
 #elif HEDLEY_HAS_BUILTIN(__builtin_expect) ||                              \
 	HEDLEY_GCC_VERSION_CHECK(3, 0, 0) ||                               \
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                            \
 	(HEDLEY_SUNPRO_VERSION_CHECK(5, 15, 0) && defined(__cplusplus)) || \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                               \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                              \
-	HEDLEY_TI_VERSION_CHECK(6, 1, 0) ||                                \
-	HEDLEY_TINYC_VERSION_CHECK(0, 9, 27)
-#define HEDLEY_PREDICT(expr, expected, probability)                      \
-	(((probability) >= 0.9) ? __builtin_expect(!!(expr), (expected)) \
-				: (((void)(expected)), !!(expr)))
-#define HEDLEY_PREDICT_TRUE(expr, probability)                               \
-	(__extension__({                                                     \
-		HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
-		((hedley_probability_ >= 0.9)                                \
-			 ? __builtin_expect(!!(expr), 1)                     \
-			 : ((hedley_probability_ <= 0.1)                     \
-				    ? __builtin_expect(!!(expr), 0)          \
-				    : !!(expr)));                            \
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                              \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(4, 7, 0) ||                          \
+	HEDLEY_TI_CL430_VERSION_CHECK(3, 1, 0) ||                          \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 1, 0) ||                         \
+	HEDLEY_TI_CL6X_VERSION_CHECK(6, 1, 0) ||                           \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                           \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0) ||                          \
+	HEDLEY_TINYC_VERSION_CHECK(0, 9, 27) ||                            \
+	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0)
+#define HEDLEY_PREDICT(expr, expected, probability)     \
+	(((probability) >= 0.9)                         \
+		 ? __builtin_expect((expr), (expected)) \
+		 : (HEDLEY_STATIC_CAST(void, expected), (expr)))
+#define HEDLEY_PREDICT_TRUE(expr, probability)                      \
+	(__extension__({                                            \
+		double hedley_probability_ = (probability);         \
+		((hedley_probability_ >= 0.9)                       \
+			 ? __builtin_expect(!!(expr), 1)            \
+			 : ((hedley_probability_ <= 0.1)            \
+				    ? __builtin_expect(!!(expr), 0) \
+				    : !!(expr)));                   \
 	}))
-#define HEDLEY_PREDICT_FALSE(expr, probability)                              \
-	(__extension__({                                                     \
-		HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
-		((hedley_probability_ >= 0.9)                                \
-			 ? __builtin_expect(!!(expr), 0)                     \
-			 : ((hedley_probability_ <= 0.1)                     \
-				    ? __builtin_expect(!!(expr), 1)          \
-				    : !!(expr)));                            \
+#define HEDLEY_PREDICT_FALSE(expr, probability)                     \
+	(__extension__({                                            \
+		double hedley_probability_ = (probability);         \
+		((hedley_probability_ >= 0.9)                       \
+			 ? __builtin_expect(!!(expr), 0)            \
+			 : ((hedley_probability_ <= 0.1)            \
+				    ? __builtin_expect(!!(expr), 1) \
+				    : !!(expr)));                   \
 	}))
 #define HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1)
 #define HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
 #else
 #define HEDLEY_PREDICT(expr, expected, probability) \
-	(((void)(expected)), !!(expr))
+	(HEDLEY_STATIC_CAST(void, expected), (expr))
 #define HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
 #define HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
 #define HEDLEY_LIKELY(expr) (!!(expr))
@@ -1077,9 +1458,21 @@
 	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) ||                         \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                             \
 	HEDLEY_IBM_VERSION_CHECK(12, 1, 0) ||                            \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                              \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                             \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                            \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                       \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                       \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                        \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                      \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                       \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                       \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                       \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                       \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                        \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                        \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                       \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                         \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                         \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_MALLOC __attribute__((__malloc__))
 #elif HEDLEY_SUNPRO_VERSION_CHECK(5, 10, 0)
 #define HEDLEY_MALLOC _Pragma("returns_new_memory")
@@ -1097,14 +1490,28 @@
 	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) ||                        \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                            \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                           \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                             \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                            \
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                           \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                      \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                       \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                     \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                      \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                      \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                       \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                       \
 	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                        \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                        \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0) ||                       \
 	HEDLEY_PGI_VERSION_CHECK(17, 10, 0)
 #define HEDLEY_PURE __attribute__((__pure__))
 #elif HEDLEY_SUNPRO_VERSION_CHECK(5, 10, 0)
 #define HEDLEY_PURE _Pragma("does_not_write_global_data")
-#elif HEDLEY_TI_VERSION_CHECK(6, 0, 0) && defined(__cplusplus)
+#elif defined(__cplusplus) && (HEDLEY_TI_CL430_VERSION_CHECK(2, 0, 1) || \
+			       HEDLEY_TI_CL6X_VERSION_CHECK(4, 0, 0) ||  \
+			       HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0))
 #define HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
 #else
 #define HEDLEY_PURE
@@ -1118,9 +1525,21 @@
 	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) ||                        \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                            \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                           \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                             \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                            \
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                           \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                      \
 	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                       \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                     \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                      \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                      \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                       \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                       \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                      \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                        \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                        \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0) ||                       \
 	HEDLEY_PGI_VERSION_CHECK(17, 10, 0)
 #define HEDLEY_CONST __attribute__((__const__))
 #elif HEDLEY_SUNPRO_VERSION_CHECK(5, 10, 0)
@@ -1141,7 +1560,10 @@
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                               \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                              \
 	HEDLEY_PGI_VERSION_CHECK(17, 10, 0) ||                             \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                                \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                          \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 2, 4) ||                         \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 1, 0) ||                           \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                           \
 	(HEDLEY_SUNPRO_VERSION_CHECK(5, 14, 0) && defined(__cplusplus)) || \
 	HEDLEY_IAR_VERSION_CHECK(8, 0, 0) || defined(__clang__)
 #define HEDLEY_RESTRICT __restrict
@@ -1159,8 +1581,14 @@
 #define HEDLEY_INLINE inline
 #elif defined(HEDLEY_GCC_VERSION) || HEDLEY_ARM_VERSION_CHECK(6, 2, 0)
 #define HEDLEY_INLINE __inline__
-#elif HEDLEY_MSVC_VERSION_CHECK(12, 0, 0) || \
-	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) || HEDLEY_TI_VERSION_CHECK(8, 0, 0)
+#elif HEDLEY_MSVC_VERSION_CHECK(12, 0, 0) ||       \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||       \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 1, 0) ||  \
+	HEDLEY_TI_CL430_VERSION_CHECK(3, 1, 0) ||  \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 2, 0) || \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 0, 0) ||   \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||   \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_INLINE __inline
 #else
 #define HEDLEY_INLINE
@@ -1169,19 +1597,36 @@
 #if defined(HEDLEY_ALWAYS_INLINE)
 #undef HEDLEY_ALWAYS_INLINE
 #endif
-#if HEDLEY_HAS_ATTRIBUTE(always_inline) ||       \
-	HEDLEY_GCC_VERSION_CHECK(4, 0, 0) ||     \
-	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||  \
-	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) || \
-	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||     \
-	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||    \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||      \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&     \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+#if HEDLEY_HAS_ATTRIBUTE(always_inline) ||          \
+	HEDLEY_GCC_VERSION_CHECK(4, 0, 0) ||        \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||     \
+	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) ||    \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||        \
+	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||       \
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||       \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&  \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||   \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) && \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||  \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&  \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||   \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&   \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||  \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||    \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||    \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) HEDLEY_INLINE
 #elif HEDLEY_MSVC_VERSION_CHECK(12, 0, 0)
 #define HEDLEY_ALWAYS_INLINE __forceinline
-#elif HEDLEY_TI_VERSION_CHECK(7, 0, 0) && defined(__cplusplus)
+#elif defined(__cplusplus) && (HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||  \
+			       HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||  \
+			       HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) || \
+			       HEDLEY_TI_CL6X_VERSION_CHECK(6, 1, 0) ||   \
+			       HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||   \
+			       HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0))
 #define HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
 #elif HEDLEY_IAR_VERSION_CHECK(8, 0, 0)
 #define HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
@@ -1197,15 +1642,27 @@
 	HEDLEY_SUNPRO_VERSION_CHECK(5, 11, 0) ||                           \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                               \
 	HEDLEY_IBM_VERSION_CHECK(10, 1, 0) ||                              \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                                \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) &&                               \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+	HEDLEY_TI_VERSION_CHECK(15, 12, 0) ||                              \
+	(HEDLEY_TI_ARMCL_VERSION_CHECK(4, 8, 0) &&                         \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_ARMCL_VERSION_CHECK(5, 2, 0) ||                          \
+	(HEDLEY_TI_CL2000_VERSION_CHECK(6, 0, 0) &&                        \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL2000_VERSION_CHECK(6, 4, 0) ||                         \
+	(HEDLEY_TI_CL430_VERSION_CHECK(4, 0, 0) &&                         \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL430_VERSION_CHECK(4, 3, 0) ||                          \
+	(HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&                          \
+	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) ||                         \
+	HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0) ||                           \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) ||                           \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 1, 0)
 #define HEDLEY_NEVER_INLINE __attribute__((__noinline__))
 #elif HEDLEY_MSVC_VERSION_CHECK(13, 10, 0)
 #define HEDLEY_NEVER_INLINE __declspec(noinline)
 #elif HEDLEY_PGI_VERSION_CHECK(10, 2, 0)
 #define HEDLEY_NEVER_INLINE _Pragma("noinline")
-#elif HEDLEY_TI_VERSION_CHECK(6, 0, 0) && defined(__cplusplus)
+#elif HEDLEY_TI_CL6X_VERSION_CHECK(6, 0, 0) && defined(__cplusplus)
 #define HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
 #elif HEDLEY_IAR_VERSION_CHECK(8, 0, 0)
 #define HEDLEY_NEVER_INLINE _Pragma("inline=never")
@@ -1236,9 +1693,9 @@
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                              \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                 \
 	HEDLEY_IBM_VERSION_CHECK(13, 1, 0) ||                                \
-	HEDLEY_TI_VERSION_CHECK(8, 0, 0) ||                                  \
-	(HEDLEY_TI_VERSION_CHECK(7, 3, 0) && defined(__TI_EABI__) &&         \
-	 defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+	(defined(__TI_EABI__) && ((HEDLEY_TI_CL6X_VERSION_CHECK(7, 2, 0) &&  \
+				   defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+				  HEDLEY_TI_CL6X_VERSION_CHECK(7, 5, 0)))
 #define HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
 #define HEDLEY_PUBLIC __attribute__((__visibility__("default")))
 #else
@@ -1263,29 +1720,20 @@
 #if defined(HEDLEY_FALL_THROUGH)
 #undef HEDLEY_FALL_THROUGH
 #endif
-#if defined(__cplusplus) &&                        \
-	(!defined(HEDLEY_SUNPRO_VERSION) ||        \
-	 HEDLEY_SUNPRO_VERSION_CHECK(5, 15, 0)) && \
-	!defined(HEDLEY_PGI_VERSION)
-#if (__cplusplus >= 201703L) || \
-	((__cplusplus >= 201103L) && HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough))
-#define HEDLEY_FALL_THROUGH [[fallthrough]]
-#elif (__cplusplus >= 201103L) && HEDLEY_HAS_CPP_ATTRIBUTE(clang::fallthrough)
-#define HEDLEY_FALL_THROUGH [[clang::fallthrough]]
-#elif (__cplusplus >= 201103L) && HEDLEY_GCC_VERSION_CHECK(7, 0, 0)
-#define HEDLEY_FALL_THROUGH [[gnu::fallthrough]]
-#endif
-#endif
-#if !defined(HEDLEY_FALL_THROUGH)
 #if HEDLEY_GNUC_HAS_ATTRIBUTE(fallthrough, 7, 0, 0) && \
 	!defined(HEDLEY_PGI_VERSION)
 #define HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang, fallthrough)
+#define HEDLEY_FALL_THROUGH \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+#define HEDLEY_FALL_THROUGH \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
 #elif defined(__fallthrough) /* SAL */
 #define HEDLEY_FALL_THROUGH __fallthrough
 #else
 #define HEDLEY_FALL_THROUGH
 #endif
-#endif
 
 #if defined(HEDLEY_RETURNS_NON_NULL)
 #undef HEDLEY_RETURNS_NON_NULL
@@ -1315,19 +1763,18 @@
 #if defined(HEDLEY_REQUIRE_CONSTEXPR)
 #undef HEDLEY_REQUIRE_CONSTEXPR
 #endif
-/* Note the double-underscore. For internal use only; no API
- * guarantees! */
-#if defined(HEDLEY__IS_CONSTEXPR)
-#undef HEDLEY__IS_CONSTEXPR
+/* HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(HEDLEY_IS_CONSTEXPR_)
+#undef HEDLEY_IS_CONSTEXPR_
 #endif
-
 #if HEDLEY_HAS_BUILTIN(__builtin_constant_p) ||                             \
 	HEDLEY_GCC_VERSION_CHECK(3, 4, 0) ||                                \
 	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                             \
 	HEDLEY_TINYC_VERSION_CHECK(0, 9, 19) ||                             \
 	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                \
 	HEDLEY_IBM_VERSION_CHECK(13, 1, 0) ||                               \
-	HEDLEY_TI_VERSION_CHECK(6, 1, 0) ||                                 \
+	HEDLEY_TI_CL6X_VERSION_CHECK(6, 1, 0) ||                            \
 	(HEDLEY_SUNPRO_VERSION_CHECK(5, 10, 0) && !defined(__cplusplus)) || \
 	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0)
 #define HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
@@ -1341,49 +1788,53 @@
 	HEDLEY_ARM_VERSION_CHECK(5, 4, 0) ||            \
 	HEDLEY_TINYC_VERSION_CHECK(0, 9, 24)
 #if defined(__INTPTR_TYPE__)
-#define HEDLEY__IS_CONSTEXPR(expr)                                    \
+#define HEDLEY_IS_CONSTEXPR_(expr)                                    \
 	__builtin_types_compatible_p(                                 \
 		__typeof__((1 ? (void *)((__INTPTR_TYPE__)((expr)*0)) \
 			      : (int *)0)),                           \
 		int *)
 #else
 #include <stdint.h>
-#define HEDLEY__IS_CONSTEXPR(expr)                                           \
+#define HEDLEY_IS_CONSTEXPR_(expr)                                           \
 	__builtin_types_compatible_p(                                        \
 		__typeof__((1 ? (void *)((intptr_t)((expr)*0)) : (int *)0)), \
 		int *)
 #endif
-#elif (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) &&       \
-       !defined(HEDLEY_SUNPRO_VERSION) && !defined(HEDLEY_PGI_VERSION)) || \
-	HEDLEY_HAS_EXTENSION(c_generic_selections) ||                      \
-	HEDLEY_GCC_VERSION_CHECK(4, 9, 0) ||                               \
-	HEDLEY_INTEL_VERSION_CHECK(17, 0, 0) ||                            \
-	HEDLEY_IBM_VERSION_CHECK(12, 1, 0) ||                              \
+#elif (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) &&      \
+       !defined(HEDLEY_SUNPRO_VERSION) && !defined(HEDLEY_PGI_VERSION) && \
+       !defined(HEDLEY_IAR_VERSION)) ||                                   \
+	HEDLEY_HAS_EXTENSION(c_generic_selections) ||                     \
+	HEDLEY_GCC_VERSION_CHECK(4, 9, 0) ||                              \
+	HEDLEY_INTEL_VERSION_CHECK(17, 0, 0) ||                           \
+	HEDLEY_IBM_VERSION_CHECK(12, 1, 0) ||                             \
 	HEDLEY_ARM_VERSION_CHECK(5, 3, 0)
 #if defined(__INTPTR_TYPE__)
-#define HEDLEY__IS_CONSTEXPR(expr)                                       \
+#define HEDLEY_IS_CONSTEXPR_(expr)                                       \
 	_Generic((1 ? (void *)((__INTPTR_TYPE__)((expr)*0)) : (int *)0), \
 		 int * : 1, void * : 0)
 #else
 #include <stdint.h>
-#define HEDLEY__IS_CONSTEXPR(expr) \
+#define HEDLEY_IS_CONSTEXPR_(expr) \
 	_Generic((1 ? (void *)((intptr_t)*0) : (int *)0), int * : 1, void * : 0)
 #endif
-#elif defined(HEDLEY_GCC_VERSION) || defined(HEDLEY_INTEL_VERSION) ||  \
-	defined(HEDLEY_TINYC_VERSION) || defined(HEDLEY_TI_VERSION) || \
-	defined(__clang__)
-#define HEDLEY__IS_CONSTEXPR(expr)                                       \
+#elif defined(HEDLEY_GCC_VERSION) || defined(HEDLEY_INTEL_VERSION) ||         \
+	defined(HEDLEY_TINYC_VERSION) || defined(HEDLEY_TI_ARMCL_VERSION) ||  \
+	HEDLEY_TI_CL430_VERSION_CHECK(18, 12, 0) ||                           \
+	defined(HEDLEY_TI_CL2000_VERSION) ||                                  \
+	defined(HEDLEY_TI_CL6X_VERSION) || defined(HEDLEY_TI_CL7X_VERSION) || \
+	defined(HEDLEY_TI_CLPRU_VERSION) || defined(__clang__)
+#define HEDLEY_IS_CONSTEXPR_(expr)                                       \
 	(sizeof(void) != sizeof(*(1 ? ((void *)((expr)*0L)) : ((struct { \
 		 char v[sizeof(void) * 2];                               \
 	 } *)1))))
 #endif
 #endif
-#if defined(HEDLEY__IS_CONSTEXPR)
+#if defined(HEDLEY_IS_CONSTEXPR_)
 #if !defined(HEDLEY_IS_CONSTANT)
-#define HEDLEY_IS_CONSTANT(expr) HEDLEY__IS_CONSTEXPR(expr)
+#define HEDLEY_IS_CONSTANT(expr) HEDLEY_IS_CONSTEXPR_(expr)
 #endif
 #define HEDLEY_REQUIRE_CONSTEXPR(expr) \
-	(HEDLEY__IS_CONSTEXPR(expr) ? (expr) : (-1))
+	(HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
 #else
 #if !defined(HEDLEY_IS_CONSTANT)
 #define HEDLEY_IS_CONSTANT(expr) (0)
@@ -1420,56 +1871,29 @@
 	 HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) || defined(_Static_assert))
 #define HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
 #elif (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
-	HEDLEY_MSVC_VERSION_CHECK(16, 0, 0) ||              \
-	(defined(__cplusplus) && HEDLEY_TI_VERSION_CHECK(8, 3, 0))
-#define HEDLEY_STATIC_ASSERT(expr, message) static_assert(expr, message)
+	HEDLEY_MSVC_VERSION_CHECK(16, 0, 0)
+#define HEDLEY_STATIC_ASSERT(expr, message)           \
+	HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_( \
+		static_assert(expr, message))
 #else
 #define HEDLEY_STATIC_ASSERT(expr, message)
 #endif
 
-#if defined(HEDLEY_CONST_CAST)
-#undef HEDLEY_CONST_CAST
+#if defined(HEDLEY_NULL)
+#undef HEDLEY_NULL
 #endif
 #if defined(__cplusplus)
-#define HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
-#elif HEDLEY_HAS_WARNING("-Wcast-qual") ||   \
-	HEDLEY_GCC_VERSION_CHECK(4, 6, 0) || \
-	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
-#define HEDLEY_CONST_CAST(T, expr)                              \
-	(__extension__({                                        \
-		HEDLEY_DIAGNOSTIC_PUSH                          \
-		HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL((T)(expr)); \
-		HEDLEY_DIAGNOSTIC_POP                           \
-	}))
-#else
-#define HEDLEY_CONST_CAST(T, expr) ((T)(expr))
-#endif
-
-#if defined(HEDLEY_REINTERPRET_CAST)
-#undef HEDLEY_REINTERPRET_CAST
-#endif
-#if defined(__cplusplus)
-#define HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#if __cplusplus >= 201103L
+#define HEDLEY_NULL HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+#elif defined(NULL)
+#define HEDLEY_NULL NULL
 #else
-#define HEDLEY_REINTERPRET_CAST(T, expr) (*((T *)&(expr)))
+#define HEDLEY_NULL HEDLEY_STATIC_CAST(void *, 0)
 #endif
-
-#if defined(HEDLEY_STATIC_CAST)
-#undef HEDLEY_STATIC_CAST
-#endif
-#if defined(__cplusplus)
-#define HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#elif defined(NULL)
+#define HEDLEY_NULL NULL
 #else
-#define HEDLEY_STATIC_CAST(T, expr) ((T)(expr))
-#endif
-
-#if defined(HEDLEY_CPP_CAST)
-#undef HEDLEY_CPP_CAST
-#endif
-#if defined(__cplusplus)
-#define HEDLEY_CPP_CAST(T, expr) static_cast<T>(expr)
-#else
-#define HEDLEY_CPP_CAST(T, expr) (expr)
+#define HEDLEY_NULL ((void *)0)
 #endif
 
 #if defined(HEDLEY_MESSAGE)
@@ -1502,7 +1926,9 @@
 	HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
 	HEDLEY_PRAGMA(clang warning msg)          \
 	HEDLEY_DIAGNOSTIC_POP
-#elif HEDLEY_GCC_VERSION_CHECK(4, 8, 0) || HEDLEY_PGI_VERSION_CHECK(18, 4, 0)
+#elif HEDLEY_GCC_VERSION_CHECK(4, 8, 0) ||    \
+	HEDLEY_PGI_VERSION_CHECK(18, 4, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
 #define HEDLEY_WARNING(msg) HEDLEY_PRAGMA(GCC warning msg)
 #elif HEDLEY_MSVC_VERSION_CHECK(15, 0, 0)
 #define HEDLEY_WARNING(msg) HEDLEY_PRAGMA(message(msg))
@@ -1510,29 +1936,35 @@
 #define HEDLEY_WARNING(msg) HEDLEY_MESSAGE(msg)
 #endif
 
+#if defined(HEDLEY_REQUIRE)
+#undef HEDLEY_REQUIRE
+#endif
 #if defined(HEDLEY_REQUIRE_MSG)
 #undef HEDLEY_REQUIRE_MSG
 #endif
 #if HEDLEY_HAS_ATTRIBUTE(diagnose_if)
 #if HEDLEY_HAS_WARNING("-Wgcc-compat")
-#define HEDLEY_REQUIRE_MSG(expr, msg)                                   \
-	HEDLEY_DIAGNOSTIC_PUSH                                          \
-	_Pragma("clang diagnostic ignored \"-Wgcc-compat\"")            \
-		__attribute__((__diagnose_if__(!(expr), msg, "error"))) \
+#define HEDLEY_REQUIRE(expr)                                          \
+	HEDLEY_DIAGNOSTIC_PUSH                                        \
+	_Pragma("clang diagnostic ignored \"-Wgcc-compat\"")          \
+		__attribute__((diagnose_if(!(expr), #expr, "error"))) \
+			HEDLEY_DIAGNOSTIC_POP
+#define HEDLEY_REQUIRE_MSG(expr, msg)                               \
+	HEDLEY_DIAGNOSTIC_PUSH                                      \
+	_Pragma("clang diagnostic ignored \"-Wgcc-compat\"")        \
+		__attribute__((diagnose_if(!(expr), msg, "error"))) \
 			HEDLEY_DIAGNOSTIC_POP
 #else
+#define HEDLEY_REQUIRE(expr) \
+	__attribute__((diagnose_if(!(expr), #expr, "error")))
 #define HEDLEY_REQUIRE_MSG(expr, msg) \
-	__attribute__((__diagnose_if__(!(expr), msg, "error")))
+	__attribute__((diagnose_if(!(expr), msg, "error")))
 #endif
 #else
+#define HEDLEY_REQUIRE(expr)
 #define HEDLEY_REQUIRE_MSG(expr, msg)
 #endif
 
-#if defined(HEDLEY_REQUIRE)
-#undef HEDLEY_REQUIRE
-#endif
-#define HEDLEY_REQUIRE(expr) HEDLEY_REQUIRE_MSG(expr, #expr)
-
 #if defined(HEDLEY_FLAGS)
 #undef HEDLEY_FLAGS
 #endif

obs-studio-25.0.8.tar.xz/libobs/util/simde/mmx.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/mmx.h Changed

@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2018 Evan Nemerson <evan@nemerson.com>
+/* SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -19,64 +19,71 @@
  * 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>
  */
 
-#if !defined(SIMDE__MMX_H)
-#if !defined(SIMDE__MMX_H)
-#define SIMDE__MMX_H
-#endif
+#if !defined(SIMDE_X86_MMX_H)
+#define SIMDE_X86_MMX_H
+
 #include "simde-common.h"
 
-#if defined(SIMDE_MMX_FORCE_NATIVE)
-#define SIMDE_MMX_NATIVE
-#elif defined(__MMX__) && !defined(SIMDE_MMX_NO_NATIVE) && \
-	!defined(SIMDE_NO_NATIVE)
-#define SIMDE_MMX_NATIVE
-#elif defined(__ARM_NEON) && !defined(SIMDE_MMX_NO_NEON) && \
-	!defined(SIMDE_NO_NEON)
-#define SIMDE_MMX_NEON
+#if !defined(SIMDE_X86_MMX_NATIVE) && defined(SIMDE_ENABLE_NATIVE_ALIASES)
+#define SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES
+#endif
+
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DISABLE_UNWANTED_DIAGNOSTICS
+
+#if defined(SIMDE_X86_MMX_NATIVE)
+#define SIMDE_X86_MMX_USE_NATIVE_TYPE
+#elif defined(SIMDE_X86_SSE_NATIVE)
+#define SIMDE_X86_MMX_USE_NATIVE_TYPE
 #endif
 
-#if defined(SIMDE_MMX_NATIVE)
+#if defined(SIMDE_X86_MMX_USE_NATIVE_TYPE)
 #include <mmintrin.h>
-#else
-#if defined(SIMDE_MMX_NEON)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 #include <arm_neon.h>
 #endif
-#endif
+
 #include <stdint.h>
 #include <limits.h>
-#include <stdlib.h>
-#include <string.h>
 
-SIMDE__BEGIN_DECLS
+SIMDE_BEGIN_DECLS_
 
 typedef union {
-#if defined(SIMDE__ENABLE_GCC_VEC_EXT)
-	int8_t i8 __attribute__((__vector_size__(8), __may_alias__));
-	int16_t i16 __attribute__((__vector_size__(8), __may_alias__));
-	int32_t i32 __attribute__((__vector_size__(8), __may_alias__));
-	int64_t i64 __attribute__((__vector_size__(8), __may_alias__));
-	uint8_t u8 __attribute__((__vector_size__(8), __may_alias__));
-	uint16_t u16 __attribute__((__vector_size__(8), __may_alias__));
-	uint32_t u32 __attribute__((__vector_size__(8), __may_alias__));
-	uint64_t u64 __attribute__((__vector_size__(8), __may_alias__));
-	simde_float32 f32 __attribute__((__vector_size__(8), __may_alias__));
-#else
-	int8_t i8[8];
-	int16_t i16[4];
-	int32_t i32[2];
-	int64_t i64[1];
-	uint8_t u8[8];
-	uint16_t u16[4];
-	uint32_t u32[2];
-	uint64_t u64[1];
-	simde_float32 f32[2];
-#endif
-
-#if defined(SIMDE_MMX_NATIVE)
+#if defined(SIMDE_VECTOR_SUBSCRIPT)
+	SIMDE_ALIGN(8) int8_t i8 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) int16_t i16 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) int32_t i32 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) int64_t i64 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) uint8_t u8 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) uint16_t u16 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) uint32_t u32 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) uint64_t u64 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) simde_float32 f32 SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) int_fast32_t i32f SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(8) uint_fast32_t u32f SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+#else
+	SIMDE_ALIGN(8) int8_t i8[8];
+	SIMDE_ALIGN(8) int16_t i16[4];
+	SIMDE_ALIGN(8) int32_t i32[2];
+	SIMDE_ALIGN(8) int64_t i64[1];
+	SIMDE_ALIGN(8) uint8_t u8[8];
+	SIMDE_ALIGN(8) uint16_t u16[4];
+	SIMDE_ALIGN(8) uint32_t u32[2];
+	SIMDE_ALIGN(8) uint64_t u64[1];
+	SIMDE_ALIGN(8) simde_float32 f32[2];
+	SIMDE_ALIGN(8) int_fast32_t i32f[8 / sizeof(int_fast32_t)];
+	SIMDE_ALIGN(8) uint_fast32_t u32f[8 / sizeof(uint_fast32_t)];
+#endif
+
+#if defined(SIMDE_X86_MMX_USE_NATIVE_TYPE)
 	__m64 n;
-#elif defined(SIMDE_MMX_NEON)
+#endif
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 	int8x8_t neon_i8;
 	int16x4_t neon_i16;
 	int32x2_t neon_i32;
@@ -87,1270 +94,2177 @@
 	uint64x1_t neon_u64;
 	float32x2_t neon_f32;
 #endif
-} simde__m64;
+} simde__m64_private;
+
+#if defined(SIMDE_X86_MMX_USE_NATIVE_TYPE)
+typedef __m64 simde__m64;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+typedef int32x2_t simde__m64;
+#elif defined(SIMDE_VECTOR_SUBSCRIPT)
+typedef int32_t simde__m64 SIMDE_ALIGN(8) SIMDE_VECTOR(8) SIMDE_MAY_ALIAS;
+#else
+typedef simde__m64_private simde__m64;
+#endif
+
+#if !defined(SIMDE_X86_MMX_USE_NATIVE_TYPE) && \
+	defined(SIMDE_ENABLE_NATIVE_ALIASES)
+#define SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES
+typedef simde__m64 __m64;
+#endif
 
-#if defined(SIMDE_MMX_NATIVE)
-HEDLEY_STATIC_ASSERT(sizeof(__m64) == sizeof(simde__m64),
-		     "__m64 size doesn't match simde__m64 size");
-SIMDE__FUNCTION_ATTRIBUTES simde__m64 SIMDE__M64_C(__m64 v)
+HEDLEY_STATIC_ASSERT(8 == sizeof(simde__m64), "__m64 size incorrect");
+HEDLEY_STATIC_ASSERT(8 == sizeof(simde__m64_private), "__m64 size incorrect");
+#if defined(SIMDE_CHECK_ALIGNMENT) && defined(SIMDE_ALIGN_OF)
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m64) == 8,
+		     "simde__m64 is not 8-byte aligned");
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m64_private) == 8,
+		     "simde__m64_private is not 8-byte aligned");
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m64 simde__m64_from_private(simde__m64_private v)
 {
 	simde__m64 r;
-	r.n = v;
+	simde_memcpy(&r, &v, sizeof(r));
 	return r;
 }
-#elif defined(SIMDE_MMX_NEON)
-#define SIMDE__M64_NEON_C(T, expr) \
-	(simde__m64) { .neon_##T = (expr) }
-#endif
-HEDLEY_STATIC_ASSERT(8 == sizeof(simde__m64), "__m64 size incorrect");
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m64_private simde__m64_to_private(simde__m64 v)
+{
+	simde__m64_private r;
+	simde_memcpy(&r, &v, sizeof(r));
+	return r;
+}
+
+#define SIMDE_X86_GENERATE_CONVERSION_FUNCTION(simde_type, source_type, isax, \
+					       fragment)                      \
+	SIMDE_FUNCTION_ATTRIBUTES                                             \
+	simde__##simde_type simde__##simde_type##_from_##isax##_##fragment(   \
+		source_type value)                                            \
+	{                                                                     \
+		simde__##simde_type##_private r_;                             \
+		r_.isax##_##fragment = value;                                 \
+		return simde__##simde_type##_from_private(r_);                \
+	}                                                                     \
+                                                                              \
+	SIMDE_FUNCTION_ATTRIBUTES                                             \
+	source_type simde__##simde_type##_to_##isax##_##fragment(             \
+		simde__##simde_type value)                                    \
+	{                                                                     \
+		simde__##simde_type##_private r_ =                            \
+			simde__##simde_type##_to_private(value);              \
+		return r_.isax##_##fragment;                                  \
+	}
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, int8x8_t, neon, i8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, int16x4_t, neon, i16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, int32x2_t, neon, i32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, int64x1_t, neon, i64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, uint8x8_t, neon, u8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, uint16x4_t, neon, u16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, uint32x2_t, neon, u32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, uint64x1_t, neon, u64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m64, float32x2_t, neon, f32)
+#endif /* defined(SIMDE_ARM_NEON_A32V7_NATIVE) */
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_add_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_add_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_add_pi8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < 8; i++) {
-		r.i8[i] = a.i8[i] + b.i8[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vadd_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = a_.i8 + b_.i8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = a_.i8[i] + b_.i8[i];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddb(a, b) simde_mm_add_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_add_pi8(a, b) simde_mm_add_pi8(a, b)
+#define _m_paddb(a, b) simde_m_paddb(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_add_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_add_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_add_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		r.i16[i] = a.i16[i] + b.i16[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vadd_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = a_.i16 + b_.i16;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] + b_.i16[i];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddw(a, b) simde_mm_add_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_add_pi16(a, b) simde_mm_add_pi16(a, b)
+#define _m_add_paddw(a, b) simde_mm_add_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_add_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_add_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_add_pi32(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int32_t)); i++) {
-		r.i32[i] = a.i32[i] + b.i32[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vadd_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = a_.i32 + b_.i32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] + b_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddd(a, b) simde_mm_add_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_add_pi32(a, b) simde_mm_add_pi32(a, b)
+#define _m_add_paddd(a, b) simde_mm_add_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_adds_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_adds_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_adds_pi8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 8; i++) {
-		if ((((b.i8[i]) > 0) && ((a.i8[i]) > (INT8_MAX - (b.i8[i]))))) {
-			r.i8[i] = INT8_MAX;
-		} else if ((((b.i8[i]) < 0) &&
-			    ((a.i8[i]) < (INT8_MIN - (b.i8[i]))))) {
-			r.i8[i] = INT8_MIN;
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vqadd_s8(a_.neon_i8, b_.neon_i8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		if ((((b_.i8[i]) > 0) &&
+		     ((a_.i8[i]) > (INT8_MAX - (b_.i8[i]))))) {
+			r_.i8[i] = INT8_MAX;
+		} else if ((((b_.i8[i]) < 0) &&
+			    ((a_.i8[i]) < (INT8_MIN - (b_.i8[i]))))) {
+			r_.i8[i] = INT8_MIN;
 		} else {
-			r.i8[i] = (a.i8[i]) + (b.i8[i]);
+			r_.i8[i] = (a_.i8[i]) + (b_.i8[i]);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddsb(a, b) simde_mm_adds_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_pi8(a, b) simde_mm_adds_pi8(a, b)
+#define _m_add_paddsb(a, b) simde_mm_adds_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_adds_pu8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_adds_pu8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_adds_pu8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < 8; i++) {
-		const int32_t x = a.u8[i] + b.u8[i];
-		if (x < 0)
-			r.u8[i] = 0;
-		else if (x > UINT8_MAX)
-			r.u8[i] = UINT8_MAX;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vqadd_u8(a_.neon_u8, b_.neon_u8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		const uint_fast16_t x =
+			HEDLEY_STATIC_CAST(uint_fast16_t, a_.u8[i]) +
+			HEDLEY_STATIC_CAST(uint_fast16_t, b_.u8[i]);
+		if (x > UINT8_MAX)
+			r_.u8[i] = UINT8_MAX;
 		else
-			r.u8[i] = (uint8_t)x;
+			r_.u8[i] = HEDLEY_STATIC_CAST(uint8_t, x);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddusb(a, b) simde_mm_adds_pu8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_pu8(a, b) simde_mm_adds_pu8(a, b)
+#define _m_paddusb(a, b) simde_mm_adds_pu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_adds_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_adds_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_adds_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 4; i++) {
-		if ((((b.i16[i]) > 0) &&
-		     ((a.i16[i]) > (INT16_MAX - (b.i16[i]))))) {
-			r.i16[i] = INT16_MAX;
-		} else if ((((b.i16[i]) < 0) &&
-			    ((a.i16[i]) < (SHRT_MIN - (b.i16[i]))))) {
-			r.i16[i] = SHRT_MIN;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vqadd_s16(a_.neon_i16, b_.neon_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		if ((((b_.i16[i]) > 0) &&
+		     ((a_.i16[i]) > (INT16_MAX - (b_.i16[i]))))) {
+			r_.i16[i] = INT16_MAX;
+		} else if ((((b_.i16[i]) < 0) &&
+			    ((a_.i16[i]) < (SHRT_MIN - (b_.i16[i]))))) {
+			r_.i16[i] = SHRT_MIN;
 		} else {
-			r.i16[i] = (a.i16[i]) + (b.i16[i]);
+			r_.i16[i] = (a_.i16[i]) + (b_.i16[i]);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddsw(a, b) simde_mm_adds_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_pi16(a, b) simde_mm_adds_pi16(a, b)
+#define _m_paddsw(a, b) simde_mm_adds_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_adds_pu16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_adds_pu16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_adds_pu16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		const uint32_t x = a.u16[i] + b.u16[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vqadd_u16(a_.neon_u16, b_.neon_u16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		const uint32_t x = a_.u16[i] + b_.u16[i];
 		if (x > UINT16_MAX)
-			r.u16[i] = UINT16_MAX;
+			r_.u16[i] = UINT16_MAX;
 		else
-			r.u16[i] = (uint16_t)x;
+			r_.u16[i] = HEDLEY_STATIC_CAST(uint16_t, x);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_paddusw(a, b) simde_mm_adds_pu16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_pu16(a, b) simde_mm_adds_pu16(a, b)
+#define _m_paddusw(a, b) simde_mm_adds_pu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_and_si64(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_and_si64(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_and_si64(a, b);
 #else
-	simde__m64 r;
-	r.i64[0] = a.i64[0] & b.i64[0];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vand_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 & b_.i64;
+#else
+	r_.i64[0] = a_.i64[0] & b_.i64[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pand(a, b) simde_mm_and_si64(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_and_si64(a, b) simde_mm_and_si64(a, b)
+#define _m_pand(a, b) simde_mm_and_si64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_andnot_si64(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_andnot_si64(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_andnot_si64(a, b);
 #else
-	simde__m64 r;
-	r.i64[0] = ~(a.i64[0]) & b.i64[0];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vbic_s32(b_.neon_i32, a_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = ~a_.i32f & b_.i32f;
+#else
+	r_.u64[0] = (~(a_.u64[0])) & (b_.u64[0]);
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pandn(a, b) simde_mm_andnot_si64(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_andnot_si64(a, b) simde_mm_andnot_si64(a, b)
+#define _m_pandn(a, b) simde_mm_andnot_si64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cmpeq_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cmpeq_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cmpeq_pi8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 8; i++) {
-		r.i8[i] = (a.i8[i] == b.i8[i]) * 0xff;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vreinterpret_s8_u8(vceq_s8(a_.neon_i8, b_.neon_i8));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = (a_.i8[i] == b_.i8[i]) ? ~INT8_C(0) : INT8_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pcmpeqb(a, b) simde_mm_cmpeq_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_pi8(a, b) simde_mm_cmpeq_pi8(a, b)
+#define _m_pcmpeqb(a, b) simde_mm_cmpeq_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cmpeq_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cmpeq_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cmpeq_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 4; i++) {
-		r.i16[i] = (a.i16[i] == b.i16[i]) * 0xffff;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vreinterpret_s16_u16(vceq_s16(a_.neon_i16, b_.neon_i16));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] == b_.i16[i]) ? ~INT16_C(0) : INT16_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pcmpeqw(a, b) simde_mm_cmpeq_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_pi16(a, b) simde_mm_cmpeq_pi16(a, b)
+#define _m_pcmpeqw(a, b) simde_mm_cmpeq_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cmpeq_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cmpeq_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cmpeq_pi32(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 2; i++) {
-		r.i32[i] = (a.i32[i] == b.i32[i]) * 0xffffffff;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vreinterpret_s32_u32(vceq_s32(a_.neon_i32, b_.neon_i32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = (a_.i32[i] == b_.i32[i]) ? ~INT32_C(0) : INT32_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pcmpeqd(a, b) simde_mm_cmpeq_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_pi32(a, b) simde_mm_cmpeq_pi32(a, b)
+#define _m_pcmpeqd(a, b) simde_mm_cmpeq_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cmpgt_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cmpgt_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cmpgt_pi8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 8; i++) {
-		r.i8[i] = (a.i8[i] > b.i8[i]) * 0xff;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vreinterpret_s8_u8(vcgt_s8(a_.neon_i8, b_.neon_i8));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = (a_.i8[i] > b_.i8[i]) ? ~INT8_C(0) : INT8_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pcmpgtb(a, b) simde_mm_cmpgt_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_pi8(a, b) simde_mm_cmpgt_pi8(a, b)
+#define _m_pcmpgtb(a, b) simde_mm_cmpgt_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cmpgt_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cmpgt_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cmpgt_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 4; i++) {
-		r.i16[i] = (a.i16[i] > b.i16[i]) * 0xffff;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vreinterpret_s16_u16(vcgt_s16(a_.neon_i16, b_.neon_i16));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] > b_.i16[i]) ? ~INT16_C(0) : INT16_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pcmpgtw(a, b) simde_mm_cmpgt_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_pi16(a, b) simde_mm_cmpgt_pi16(a, b)
+#define _m_pcmpgtw(a, b) simde_mm_cmpgt_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cmpgt_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cmpgt_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cmpgt_pi32(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 2; i++) {
-		r.i32[i] = (a.i32[i] > b.i32[i]) * 0xffffffff;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vreinterpret_s32_u32(vcgt_s32(a_.neon_i32, b_.neon_i32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = (a_.i32[i] > b_.i32[i]) ? ~INT32_C(0) : INT32_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pcmpgtd(a, b) simde_mm_cmpgt_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_pi32(a, b) simde_mm_cmpgt_pi32(a, b)
+#define _m_pcmpgtd(a, b) simde_mm_cmpgt_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int64_t simde_mm_cvtm64_si64(simde__m64 a)
 {
-#if defined(SIMDE_MMX_NATIVE) && defined(SIMDE_ARCH_AMD64) && !defined(__PGI)
-	return _mm_cvtm64_si64(a.n);
+#if defined(SIMDE_X86_MMX_NATIVE) && defined(SIMDE_ARCH_AMD64) && \
+	!defined(__PGI)
+	return _mm_cvtm64_si64(a);
+#else
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vget_lane_s64(a_.neon_i64, 0);
 #else
-	return a.i64[0];
+	return a_.i64[0];
+#endif
 #endif
 }
 #define simde_m_to_int64(a) simde_mm_cvtm64_si64(a)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtm64_si64(a) simde_mm_cvtm64_si64(a)
+#define _m_to_int64(a) simde_mm_cvtm64_si64(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtsi32_si64(int32_t a)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_cvtsi32_si64(a));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtsi32_si64(a);
 #else
-	simde__m64 r;
-	r.i32[0] = a;
-	r.i32[1] = 0;
-	return r;
+	simde__m64_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int32_t av[sizeof(r_.neon_i32) / sizeof(r_.neon_i32[0])] = {a, 0};
+	r_.neon_i32 = vld1_s32(av);
+#else
+	r_.i32[0] = a;
+	r_.i32[1] = 0;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_from_int(a) simde_mm_cvtsi32_si64(a)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi32_si64(a) simde_mm_cvtsi32_si64(a)
+#define _m_from_int(a) simde_mm_cvtsi32_si64(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtsi64_m64(int64_t a)
 {
-#if defined(SIMDE_MMX_NATIVE) && defined(SIMDE_ARCH_AMD64) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_cvtsi64_m64(a));
+#if defined(SIMDE_X86_MMX_NATIVE) && defined(SIMDE_ARCH_AMD64) && \
+	!defined(__PGI)
+	return _mm_cvtsi64_m64(a);
 #else
-	simde__m64 r;
-	r.i64[0] = a;
-	return r;
+	simde__m64_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vld1_s64(&a);
+#else
+	r_.i64[0] = a;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_from_int64(a) simde_mm_cvtsi64_m64(a)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi64_m64(a) simde_mm_cvtsi64_m64(a)
+#define _m_from_int64(a) simde_mm_cvtsi64_m64(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvtsi64_si32(simde__m64 a)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return _mm_cvtsi64_si32(a.n);
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtsi64_si32(a);
+#else
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vget_lane_s32(a_.neon_i32, 0);
 #else
-	return a.i32[0];
+	return a_.i32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi64_si32(a) simde_mm_cvtsi64_si32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_empty(void)
 {
-#if defined(SIMDE_MMX_NATIVE)
+#if defined(SIMDE_X86_MMX_NATIVE)
 	_mm_empty();
 #else
 #endif
 }
 #define simde_m_empty() simde_mm_empty()
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_empty() simde_mm_empty()
+#define _m_empty() simde_mm_empty()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_madd_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_madd_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_madd_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 4; i += 2) {
-		r.i32[i / 2] =
-			(a.i16[i] * b.i16[i]) + (a.i16[i + 1] * b.i16[i + 1]);
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int32x4_t i1 = vmull_s16(a_.neon_i16, b_.neon_i16);
+	r_.neon_i32 = vpadd_s32(vget_low_s32(i1), vget_high_s32(i1));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i += 2) {
+		r_.i32[i / 2] = (a_.i16[i] * b_.i16[i]) +
+				(a_.i16[i + 1] * b_.i16[i + 1]);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pmaddwd(a, b) simde_mm_madd_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_madd_pi16(a, b) simde_mm_madd_pi16(a, b)
+#define _m_pmaddwd(a, b) simde_mm_madd_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_mulhi_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_mulhi_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_mulhi_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 4; i++) {
-		r.i16[i] = (int16_t)((a.i16[i] * b.i16[i]) >> 16);
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int32x4_t t1 = vmull_s16(a_.neon_i16, b_.neon_i16);
+	const uint32x4_t t2 = vshrq_n_u32(vreinterpretq_u32_s32(t1), 16);
+	const uint16x4_t t3 = vmovn_u32(t2);
+	r_.neon_i16 = vreinterpret_s16_u16(t3);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = HEDLEY_STATIC_CAST(int16_t,
+					       ((a_.i16[i] * b_.i16[i]) >> 16));
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pmulhw(a, b) simde_mm_mulhi_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_mulhi_pi16(a, b) simde_mm_mulhi_pi16(a, b)
+#define _m_pmulhw(a, b) simde_mm_mulhi_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_mullo_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_mullo_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_mullo_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (int i = 0; i < 4; i++) {
-		r.i16[i] = (int16_t)((a.i16[i] * b.i16[i]) & 0xffff);
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int32x4_t t1 = vmull_s16(a_.neon_i16, b_.neon_i16);
+	const uint16x4_t t2 = vmovn_u32(vreinterpretq_u32_s32(t1));
+	r_.neon_i16 = vreinterpret_s16_u16(t2);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = HEDLEY_STATIC_CAST(
+			int16_t, ((a_.i16[i] * b_.i16[i]) & 0xffff));
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pmullw(a, b) simde_mm_mullo_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_mullo_pi16(a, b) simde_mm_mullo_pi16(a, b)
+#define _m_pmullw(a, b) simde_mm_mullo_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_or_si64(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_or_si64(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_or_si64(a, b);
 #else
-	simde__m64 r;
-	r.i64[0] = a.i64[0] | b.i64[0];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vorr_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 | b_.i64;
+#else
+	r_.i64[0] = a_.i64[0] | b_.i64[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_por(a, b) simde_mm_or_si64(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_or_si64(a, b) simde_mm_or_si64(a, b)
+#define _m_por(a, b) simde_mm_or_si64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_packs_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_packs_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_packs_pi16(a, b);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		if (a.i16[i] < INT8_MIN) {
-			r.i8[i] = INT8_MIN;
-		} else if (a.i16[i] > INT8_MAX) {
-			r.i8[i] = INT8_MAX;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vqmovn_s16(vcombine_s16(a_.neon_i16, b_.neon_i16));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		if (a_.i16[i] < INT8_MIN) {
+			r_.i8[i] = INT8_MIN;
+		} else if (a_.i16[i] > INT8_MAX) {
+			r_.i8[i] = INT8_MAX;
 		} else {
-			r.i8[i] = (int8_t)a.i16[i];
+			r_.i8[i] = HEDLEY_STATIC_CAST(int8_t, a_.i16[i]);
 		}
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		if (b.i16[i] < INT8_MIN) {
-			r.i8[i + 4] = INT8_MIN;
-		} else if (b.i16[i] > INT8_MAX) {
-			r.i8[i + 4] = INT8_MAX;
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		if (b_.i16[i] < INT8_MIN) {
+			r_.i8[i + 4] = INT8_MIN;
+		} else if (b_.i16[i] > INT8_MAX) {
+			r_.i8[i + 4] = INT8_MAX;
 		} else {
-			r.i8[i + 4] = (int8_t)b.i16[i];
+			r_.i8[i + 4] = HEDLEY_STATIC_CAST(int8_t, b_.i16[i]);
 		}
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_packsswb(a, b) simde_mm_packs_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_packs_pi16(a, b) simde_mm_packs_pi16(a, b)
+#define _m_packsswb(a, b) mm_packs_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_packs_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_packs_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_packs_pi32(a, b);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(a.i32[0])); i++) {
-		if (a.i32[i] < SHRT_MIN) {
-			r.i16[i] = SHRT_MIN;
-		} else if (a.i32[i] > INT16_MAX) {
-			r.i16[i] = INT16_MAX;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vqmovn_s32(vcombine_s32(a_.neon_i32, b_.neon_i32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (8 / sizeof(a_.i32[0])); i++) {
+		if (a_.i32[i] < SHRT_MIN) {
+			r_.i16[i] = SHRT_MIN;
+		} else if (a_.i32[i] > INT16_MAX) {
+			r_.i16[i] = INT16_MAX;
 		} else {
-			r.i16[i] = (int16_t)a.i32[i];
+			r_.i16[i] = HEDLEY_STATIC_CAST(int16_t, a_.i32[i]);
 		}
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(b.i32[0])); i++) {
-		if (b.i32[i] < SHRT_MIN) {
-			r.i16[i + 2] = SHRT_MIN;
-		} else if (b.i32[i] > INT16_MAX) {
-			r.i16[i + 2] = INT16_MAX;
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (8 / sizeof(b_.i32[0])); i++) {
+		if (b_.i32[i] < SHRT_MIN) {
+			r_.i16[i + 2] = SHRT_MIN;
+		} else if (b_.i32[i] > INT16_MAX) {
+			r_.i16[i + 2] = INT16_MAX;
 		} else {
-			r.i16[i + 2] = (int16_t)b.i32[i];
+			r_.i16[i + 2] = HEDLEY_STATIC_CAST(int16_t, b_.i32[i]);
 		}
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_packssdw(a, b) simde_mm_packs_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_packs_pi32(a, b) simde_mm_packs_pi32(a, b)
+#define _m_packssdw(a, b) simde_mm_packs_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_packs_pu16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_packs_pu16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_packs_pu16(a, b);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		if (a.i16[i] > UINT8_MAX) {
-			r.u8[i] = UINT8_MAX;
-		} else if (a.i16[i] < 0) {
-			r.u8[i] = 0;
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	const int16x8_t t1 = vcombine_s16(a_.neon_i16, b_.neon_i16);
+
+	/* Set elements which are < 0 to 0 */
+	const int16x8_t t2 =
+		vandq_s16(t1, vreinterpretq_s16_u16(vcgezq_s16(t1)));
+
+	/* Vector with all s16 elements set to UINT8_MAX */
+	const int16x8_t vmax = vmovq_n_s16((int16_t)UINT8_MAX);
+
+	/* Elements which are within the acceptable range */
+	const int16x8_t le_max =
+		vandq_s16(t2, vreinterpretq_s16_u16(vcleq_s16(t2, vmax)));
+	const int16x8_t gt_max =
+		vandq_s16(vmax, vreinterpretq_s16_u16(vcgtq_s16(t2, vmax)));
+
+	/* Final values as 16-bit integers */
+	const int16x8_t values = vorrq_s16(le_max, gt_max);
+
+	r_.neon_u8 = vmovn_u16(vreinterpretq_u16_s16(values));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		if (a_.i16[i] > UINT8_MAX) {
+			r_.u8[i] = UINT8_MAX;
+		} else if (a_.i16[i] < 0) {
+			r_.u8[i] = 0;
 		} else {
-			r.u8[i] = (int8_t)a.i16[i];
+			r_.u8[i] = HEDLEY_STATIC_CAST(uint8_t, a_.i16[i]);
 		}
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		if (b.i16[i] > UINT8_MAX) {
-			r.u8[i + 4] = UINT8_MAX;
-		} else if (b.i16[i] < 0) {
-			r.u8[i + 4] = 0;
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		if (b_.i16[i] > UINT8_MAX) {
+			r_.u8[i + 4] = UINT8_MAX;
+		} else if (b_.i16[i] < 0) {
+			r_.u8[i + 4] = 0;
 		} else {
-			r.u8[i + 4] = (int8_t)b.i16[i];
+			r_.u8[i + 4] = HEDLEY_STATIC_CAST(uint8_t, b_.i16[i]);
 		}
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_packuswb(a, b) simde_mm_packs_pu16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_packs_pu16(a, b) simde_mm_packs_pu16(a, b)
+#define _m_packuswb(a, b) simde_mm_packs_pu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_set_pi8(int8_t e7, int8_t e6, int8_t e5, int8_t e4,
 			    int8_t e3, int8_t e2, int8_t e1, int8_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set_pi8(e7, e6, e5, e4, e3, e2, e1, e0));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set_pi8(e7, e6, e5, e4, e3, e2, e1, e0);
 #else
-	simde__m64 r;
-	r.i8[0] = e0;
-	r.i8[1] = e1;
-	r.i8[2] = e2;
-	r.i8[3] = e3;
-	r.i8[4] = e4;
-	r.i8[5] = e5;
-	r.i8[6] = e6;
-	r.i8[7] = e7;
-	return r;
+	simde__m64_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int8_t v[sizeof(r_.i8) / sizeof(r_.i8[0])] = {e0, e1, e2, e3,
+							    e4, e5, e6, e7};
+	r_.neon_i8 = vld1_s8(v);
+#else
+	r_.i8[0] = e0;
+	r_.i8[1] = e1;
+	r_.i8[2] = e2;
+	r_.i8[3] = e3;
+	r_.i8[4] = e4;
+	r_.i8[5] = e5;
+	r_.i8[6] = e6;
+	r_.i8[7] = e7;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_set_pi8(e7, e6, e5, e4, e3, e2, e1, e0) \
+	simde_mm_set_pi8(e7, e6, e5, e4, e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_x_mm_set_pu8(uint8_t e7, uint8_t e6, uint8_t e5, uint8_t e4,
 			      uint8_t e3, uint8_t e2, uint8_t e1, uint8_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set_pi8((int8_t)e7, (int8_t)e6, (int8_t)e5,
-					(int8_t)e4, (int8_t)e3, (int8_t)e2,
-					(int8_t)e1, (int8_t)e0));
+	simde__m64_private r_;
+
+#if defined(SIMDE_X86_MMX_NATIVE)
+	r_.n = _mm_set_pi8(
+		HEDLEY_STATIC_CAST(int8_t, e7), HEDLEY_STATIC_CAST(int8_t, e6),
+		HEDLEY_STATIC_CAST(int8_t, e5), HEDLEY_STATIC_CAST(int8_t, e4),
+		HEDLEY_STATIC_CAST(int8_t, e3), HEDLEY_STATIC_CAST(int8_t, e2),
+		HEDLEY_STATIC_CAST(int8_t, e1), HEDLEY_STATIC_CAST(int8_t, e0));
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const uint8_t v[sizeof(r_.u8) / sizeof(r_.u8[0])] = {e0, e1, e2, e3,
+							     e4, e5, e6, e7};
+	r_.neon_u8 = vld1_u8(v);
 #else
-	simde__m64 r;
-	r.u8[0] = e0;
-	r.u8[1] = e1;
-	r.u8[2] = e2;
-	r.u8[3] = e3;
-	r.u8[4] = e4;
-	r.u8[5] = e5;
-	r.u8[6] = e6;
-	r.u8[7] = e7;
-	return r;
+	r_.u8[0] = e0;
+	r_.u8[1] = e1;
+	r_.u8[2] = e2;
+	r_.u8[3] = e3;
+	r_.u8[4] = e4;
+	r_.u8[5] = e5;
+	r_.u8[6] = e6;
+	r_.u8[7] = e7;
 #endif
+
+	return simde__m64_from_private(r_);
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_set_pi16(int16_t e3, int16_t e2, int16_t e1, int16_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set_pi16(e3, e2, e1, e0));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set_pi16(e3, e2, e1, e0);
 #else
-	simde__m64 r;
-	r.i16[0] = e0;
-	r.i16[1] = e1;
-	r.i16[2] = e2;
-	r.i16[3] = e3;
-	return r;
+	simde__m64_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int16_t v[sizeof(r_.i16) / sizeof(r_.i16[0])] = {e0, e1, e2, e3};
+	r_.neon_i16 = vld1_s16(v);
+#else
+	r_.i16[0] = e0;
+	r_.i16[1] = e1;
+	r_.i16[2] = e2;
+	r_.i16[3] = e3;
+#endif
+	return simde__m64_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_set_pi16(e3, e2, e1, e0) simde_mm_set_pi16(e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_x_mm_set_pu16(uint16_t e3, uint16_t e2, uint16_t e1,
 			       uint16_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set_pi16((int16_t)e3, (int16_t)e2, (int16_t)e1,
-					 (int16_t)e0));
+	simde__m64_private r_;
+
+#if defined(SIMDE_X86_MMX_NATIVE)
+	r_.n = _mm_set_pi16(HEDLEY_STATIC_CAST(int16_t, e3),
+			    HEDLEY_STATIC_CAST(int16_t, e2),
+			    HEDLEY_STATIC_CAST(int16_t, e1),
+			    HEDLEY_STATIC_CAST(int16_t, e0));
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const uint16_t v[sizeof(r_.u16) / sizeof(r_.u16[0])] = {e0, e1, e2, e3};
+	r_.neon_u16 = vld1_u16(v);
 #else
-	simde__m64 r;
-	r.u16[0] = e0;
-	r.u16[1] = e1;
-	r.u16[2] = e2;
-	r.u16[3] = e3;
-	return r;
+	r_.u16[0] = e0;
+	r_.u16[1] = e1;
+	r_.u16[2] = e2;
+	r_.u16[3] = e3;
 #endif
+
+	return simde__m64_from_private(r_);
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_x_mm_set_pu32(uint32_t e1, uint32_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set_pi32((int32_t)e1, (int32_t)e0));
+	simde__m64_private r_;
+
+#if defined(SIMDE_X86_MMX_NATIVE)
+	r_.n = _mm_set_pi32(HEDLEY_STATIC_CAST(int32_t, e1),
+			    HEDLEY_STATIC_CAST(int32_t, e0));
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const uint32_t v[sizeof(r_.u32) / sizeof(r_.u32[0])] = {e0, e1};
+	r_.neon_u32 = vld1_u32(v);
 #else
-	simde__m64 r;
-	r.u32[0] = e0;
-	r.u32[1] = e1;
-	return r;
+	r_.u32[0] = e0;
+	r_.u32[1] = e1;
 #endif
+
+	return simde__m64_from_private(r_);
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_set_pi32(int32_t e1, int32_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set_pi32(e1, e0));
+	simde__m64_private r_;
+
+#if defined(SIMDE_X86_MMX_NATIVE)
+	r_.n = _mm_set_pi32(e1, e0);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int32_t v[sizeof(r_.i32) / sizeof(r_.i32[0])] = {e0, e1};
+	r_.neon_i32 = vld1_s32(v);
 #else
-	simde__m64 r;
-	r.i32[0] = e0;
-	r.i32[1] = e1;
-	return r;
+	r_.i32[0] = e0;
+	r_.i32[1] = e1;
 #endif
+
+	return simde__m64_from_private(r_);
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_set_pi32(e1, e0) simde_mm_set_pi32(e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m64 simde_x_mm_set_pi64(int64_t e0)
+{
+	simde__m64_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const int64_t v[sizeof(r_.i64) / sizeof(r_.i64[0])] = {e0};
+	r_.neon_i64 = vld1_s64(v);
+#else
+	r_.i64[0] = e0;
+#endif
+
+	return simde__m64_from_private(r_);
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m64 simde_x_mm_set_f32x2(simde_float32 e1, simde_float32 e0)
+{
+	simde__m64_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	const simde_float32 v[sizeof(r_.f32) / sizeof(r_.f32[0])] = {e0, e1};
+	r_.neon_f32 = vld1_f32(v);
+#else
+	r_.f32[0] = e0;
+	r_.f32[1] = e1;
+#endif
+
+	return simde__m64_from_private(r_);
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_set1_pi8(int8_t a)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set1_pi8(a));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set1_pi8(a);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	simde__m64_private r_;
+	r_.neon_i8 = vmov_n_s8(a);
+	return simde__m64_from_private(r_);
 #else
 	return simde_mm_set_pi8(a, a, a, a, a, a, a, a);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_pi8(a) simde_mm_set1_pi8(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_set1_pi16(int16_t a)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set1_pi16(a));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set1_pi16(a);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	simde__m64_private r_;
+	r_.neon_i16 = vmov_n_s16(a);
+	return simde__m64_from_private(r_);
 #else
 	return simde_mm_set_pi16(a, a, a, a);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_pi16(a) simde_mm_set1_pi16(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_set1_pi32(int32_t a)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_set1_pi32(a));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set1_pi32(a);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	simde__m64_private r_;
+	r_.neon_i32 = vmov_n_s32(a);
+	return simde__m64_from_private(r_);
 #else
 	return simde_mm_set_pi32(a, a);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_pi32(a) simde_mm_set1_pi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_setr_pi8(int8_t e7, int8_t e6, int8_t e5, int8_t e4,
 			     int8_t e3, int8_t e2, int8_t e1, int8_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_setr_pi8(e7, e6, e5, e4, e3, e2, e1, e0));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_setr_pi8(e7, e6, e5, e4, e3, e2, e1, e0);
 #else
 	return simde_mm_set_pi8(e0, e1, e2, e3, e4, e5, e6, e7);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_pi8(e7, e6, e5, e4, e3, e2, e1, e0) \
+	simde_mm_setr_pi8(e7, e6, e5, e4, e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_setr_pi16(int16_t e3, int16_t e2, int16_t e1, int16_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_setr_pi16(e3, e2, e1, e0));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_setr_pi16(e3, e2, e1, e0);
 #else
 	return simde_mm_set_pi16(e0, e1, e2, e3);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_pi16(e3, e2, e1, e0) simde_mm_setr_pi16(e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_setr_pi32(int32_t e1, int32_t e0)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_setr_pi32(e1, e0));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_setr_pi32(e1, e0);
 #else
 	return simde_mm_set_pi32(e0, e1);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_pi32(e1, e0) simde_mm_setr_pi32(e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_setzero_si64(void)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_setzero_si64());
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_setzero_si64();
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	simde__m64_private r_;
+	r_.neon_u32 = vmov_n_u32(0);
+	return simde__m64_from_private(r_);
 #else
 	return simde_mm_set_pi32(0, 0);
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_setzero_si64() simde_mm_setzero_si64()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m64 simde_x_mm_setone_si64(void)
+{
+	return simde_mm_set1_pi32(~INT32_C(0));
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sll_pi16(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sll_pi16(a.n, count.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sll_pi16(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
 
-	if (HEDLEY_UNLIKELY(count.u64[0] > 15)) {
-		memset(&r, 0, sizeof(r));
-		return r;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vshl_s16(a_.neon_i16, vmov_n_s16((int16_t)vget_lane_u64(
+						    count_.neon_u64, 0)));
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i16 = a_.i16 << count_.u64[0];
+#else
+	if (HEDLEY_UNLIKELY(count_.u64[0] > 15)) {
+		simde_memset(&r_, 0, sizeof(r_));
+		return simde__m64_from_private(r_);
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = a.u16[i] << count.u64[0];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(uint16_t,
+					       a_.u16[i] << count_.u64[0]);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psllw(a, count) simde_mm_sll_pi16(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sll_pi16(a, count) simde_mm_sll_pi16(a, count)
+#define _m_psllw(a, count) simde_mm_sll_pi16(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sll_pi32(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sll_pi32(a.n, count.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sll_pi32(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
 
-	if (HEDLEY_UNLIKELY(count.u64[0] > 31)) {
-		memset(&r, 0, sizeof(r));
-		return r;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vshl_s32(a_.neon_i32, vmov_n_s32((int32_t)vget_lane_u64(
+						    count_.neon_u64, 0)));
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i32 = a_.i32 << count_.u64[0];
+#else
+	if (HEDLEY_UNLIKELY(count_.u64[0] > 31)) {
+		simde_memset(&r_, 0, sizeof(r_));
+		return simde__m64_from_private(r_);
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u32) / sizeof(r.u32[0])); i++) {
-		r.u32[i] = a.u32[i] << count.u64[0];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] << count_.u64[0];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pslld(a, count) simde_mm_sll_pi32(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sll_pi32(a, count) simde_mm_sll_pi32(a, count)
+#define _m_pslld(a, count) simde_mm_sll_pi32(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_slli_pi16(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_slli_pi16(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_slli_pi16(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = a.u16[i] << count;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i16 = a_.i16 << count;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vshl_s16(a_.neon_i16, vmov_n_s16((int16_t)count));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(uint16_t, a_.u16[i] << count);
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psllwi(a, count) simde_mm_slli_pi16(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_slli_pi16(a, count) simde_mm_slli_pi16(a, count)
+#define _m_psllwi(a, count) simde_mm_slli_pi16(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_slli_pi32(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_slli_pi32(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_slli_pi32(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int)); i++) {
-		r.u32[i] = a.u32[i] << count;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i32 = a_.i32 << count;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vshl_s32(a_.neon_i32, vmov_n_s32((int32_t)count));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] << count;
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pslldi(a, b) simde_mm_slli_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_slli_pi32(a, count) simde_mm_slli_pi32(a, count)
+#define _m_pslldi(a, count) simde_mm_slli_pi32(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_slli_si64(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_slli_si64(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_slli_si64(a, count);
 #else
-	simde__m64 r;
-	r.u64[0] = a.u64[0] << count;
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i64 = a_.i64 << count;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vshl_s64(a_.neon_i64, vmov_n_s64((int64_t)count));
+#else
+	r_.u64[0] = a_.u64[0] << count;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psllqi(a, count) simde_mm_slli_si64(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_slli_si64(a, count) simde_mm_slli_si64(a, count)
+#define _m_psllqi(a, count) simde_mm_slli_si64(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sll_si64(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sll_si64(a.n, count.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sll_si64(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
 
-	if (HEDLEY_UNLIKELY(count.u64[0] > 63)) {
-		memset(&r, 0, sizeof(r));
-		return r;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vshl_s64(a_.neon_i64, count_.neon_i64);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 << count_.i64;
+#else
+	if (HEDLEY_UNLIKELY(count_.u64[0] > 63)) {
+		simde_memset(&r_, 0, sizeof(r_));
+		return simde__m64_from_private(r_);
 	}
 
-	r.u64[0] = a.u64[0] << count.u64[0];
+	r_.u64[0] = a_.u64[0] << count_.u64[0];
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psllq(a, count) simde_mm_sll_si64(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sll_si64(a, count) simde_mm_sll_si64(a, count)
+#define _m_psllq(a, count) simde_mm_sll_si64(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srl_pi16(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_srl_pi16(a.n, count.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_srl_pi16(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
 
-	if (HEDLEY_UNLIKELY(count.u64[0] > 15)) {
-		memset(&r, 0, sizeof(r));
-		return r;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u16 = a_.u16 >> count_.u64[0];
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vshl_u16(
+		a_.neon_u16,
+		vmov_n_s16(-((int16_t)vget_lane_u64(count_.neon_u64, 0))));
+#else
+	if (HEDLEY_UNLIKELY(count_.u64[0] > 15)) {
+		simde_memset(&r_, 0, sizeof(r_));
+		return simde__m64_from_private(r_);
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < sizeof(r.u16) / sizeof(r.u16[0]); i++) {
-		r.u16[i] = a.u16[i] >> count.u64[0];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < sizeof(r_.u16) / sizeof(r_.u16[0]); i++) {
+		r_.u16[i] = a_.u16[i] >> count_.u64[0];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrlw(a, count) simde_mm_srl_pi16(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srl_pi16(a, count) simde_mm_srl_pi16(a, count)
+#define _m_psrlw(a, count) simde_mm_srl_pi16(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srl_pi32(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_srl_pi32(a.n, count.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_srl_pi32(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
 
-	if (HEDLEY_UNLIKELY(count.u64[0] > 31)) {
-		memset(&r, 0, sizeof(r));
-		return r;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u32 = a_.u32 >> count_.u64[0];
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vshl_u32(
+		a_.neon_u32,
+		vmov_n_s32(-((int32_t)vget_lane_u64(count_.neon_u64, 0))));
+#else
+	if (HEDLEY_UNLIKELY(count_.u64[0] > 31)) {
+		simde_memset(&r_, 0, sizeof(r_));
+		return simde__m64_from_private(r_);
 	}
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < sizeof(r.u32) / sizeof(r.u32[0]); i++) {
-		r.u32[i] = a.u32[i] >> count.u64[0];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < sizeof(r_.u32) / sizeof(r_.u32[0]); i++) {
+		r_.u32[i] = a_.u32[i] >> count_.u64[0];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrld(a, count) simde_mm_srl_pi32(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srl_pi32(a, count) simde_mm_srl_pi32(a, count)
+#define _m_psrld(a, count) simde_mm_srl_pi32(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srli_pi16(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_srli_pi16(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_srli_pi16(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(uint16_t)); i++) {
-		r.u16[i] = a.u16[i] >> count;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u16 = a_.u16 >> count;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vshl_u16(a_.neon_u16, vmov_n_s16(-((int16_t)count)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = a_.u16[i] >> count;
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrlwi(a, count) simde_mm_srli_pi16(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srli_pi16(a, count) simde_mm_srli_pi16(a, count)
+#define _m_psrlwi(a, count) simde_mm_srli_pi16(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srli_pi32(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_srli_pi32(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_srli_pi32(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int)); i++) {
-		r.u32[i] = a.u32[i] >> count;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u32 = a_.u32 >> count;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vshl_u32(a_.neon_u32, vmov_n_s32(-((int32_t)count)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] >> count;
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrldi(a, count) simde_mm_srli_pi32(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srli_pi32(a, count) simde_mm_srli_pi32(a, count)
+#define _m_psrldi(a, count) simde_mm_srli_pi32(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srli_si64(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_srli_si64(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_srli_si64(a, count);
 #else
-	simde__m64 r;
-	r.u64[0] = a.u64[0] >> count;
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u64 = vshl_u64(a_.neon_u64, vmov_n_s64(-count));
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u64 = a_.u64 >> count;
+#else
+	r_.u64[0] = a_.u64[0] >> count;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrlqi(a, count) simde_mm_srli_si64(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srli_si64(a, count) simde_mm_srli_si64(a, count)
+#define _m_psrlqi(a, count) simde_mm_srli_si64(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srl_si64(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_srl_si64(a.n, count.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_srl_si64(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
 
-	if (HEDLEY_UNLIKELY(count.u64[0] > 63)) {
-		memset(&r, 0, sizeof(r));
-		return r;
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_u64 = vshl_u64(a_.neon_u64, vneg_s64(count_.neon_i64));
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.u64 = a_.u64 >> count_.u64;
+#else
+	if (HEDLEY_UNLIKELY(count_.u64[0] > 63)) {
+		simde_memset(&r_, 0, sizeof(r_));
+		return simde__m64_from_private(r_);
 	}
 
-	r.u64[0] = a.u64[0] >> count.u64[0];
-	return r;
+	r_.u64[0] = a_.u64[0] >> count_.u64[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrlq(a, count) simde_mm_srl_si64(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srl_si64(a, count) simde_mm_srl_si64(a, count)
+#define _m_psrlq(a, count) simde_mm_srl_si64(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srai_pi16(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_srai_pi16(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_srai_pi16(a, count);
 #else
-	simde__m64 r;
-
-	const uint16_t m =
-		(uint16_t)((~0U) << ((sizeof(int16_t) * CHAR_BIT) - count));
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		const uint16_t is_neg = ((uint16_t)(
-			((a.u16[i]) >> ((sizeof(int16_t) * CHAR_BIT) - 1))));
-		r.u16[i] = (a.u16[i] >> count) | (m * is_neg);
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i16 = a_.i16 >> (count & 0xff);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+  r_.neon_i16 = vshl_s16(a_.neon_i16, vmov_n_s16(-HEDLEY_STATIC_CAST(int16_t, count));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] >> (count & 0xff);
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrawi(a, count) simde_mm_srai_pi16(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srai_pi16(a, count) simde_mm_srai_pi16(a, count)
+#define _m_psrawi(a, count) simde_mm_srai_pi16(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_srai_pi32(simde__m64 a, int count)
 {
-#if defined(SIMDE_MMX_NATIVE) && !defined(__PGI)
-	return SIMDE__M64_C(_mm_srai_pi32(a.n, count));
+#if defined(SIMDE_X86_MMX_NATIVE) && !defined(__PGI)
+	return _mm_srai_pi32(a, count);
 #else
-	simde__m64 r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	const uint32_t m =
-		(uint32_t)((~0U) << ((sizeof(int) * CHAR_BIT) - count));
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int)); i++) {
-		const uint32_t is_neg = ((uint32_t)(
-			((a.u32[i]) >> ((sizeof(int) * CHAR_BIT) - 1))));
-		r.u32[i] = (a.u32[i] >> count) | (m * is_neg);
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i32 = a_.i32 >> (count & 0xff);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vshl_s32(a_.neon_i32,
+			       vmov_n_s32(-HEDLEY_STATIC_CAST(int32_t, count)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] >> (count & 0xff);
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
-#define simde_m_srai_pi32(a, count) simde_mm_srai_pi32(a, count)
+#define simde_m_psradi(a, count) simde_mm_srai_pi32(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_srai_pi32(a, count) simde_mm_srai_pi32(a, count)
+#define _m_srai_pi32(a, count) simde_mm_srai_pi32(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sra_pi16(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sra_pi16(a.n, count.n));
-#else
-	simde__m64 r;
-	int cnt = (int)count.i64[0];
-
-	if (cnt > 15 || cnt < 0) {
-		for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0]));
-		     i++) {
-			r.u16[i] = (a.i16[i] < 0) ? 0xffff : 0x0000;
-		}
-	} else {
-		const uint16_t m = (uint16_t)(
-			(~0U) << ((sizeof(int16_t) * CHAR_BIT) - cnt));
-		for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0]));
-		     i++) {
-			const uint16_t is_neg = a.i16[i] < 0;
-			r.u16[i] = (a.u16[i] >> cnt) | (m * is_neg);
-		}
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sra_pi16(a, count);
+#else
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
+	const int cnt = HEDLEY_STATIC_CAST(
+		int, (count_.i64[0] > 15 ? 15 : count_.i64[0]));
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i16 = a_.i16 >> cnt;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 =
+		vshl_s16(a_.neon_i16,
+			 vmov_n_s16(-HEDLEY_STATIC_CAST(
+				 int16_t, vget_lane_u64(count_.neon_u64, 0))));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] >> cnt;
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psraw(a, count) simde_mm_sra_pi16(a, count)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sra_pi16(a, count) simde_mm_sra_pi16(a, count)
+#define _m_psraw(a, count) simde_mm_sra_pi16(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sra_pi32(simde__m64 a, simde__m64 count)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sra_pi32(a.n, count.n));
-#else
-	simde__m64 r;
-	const uint64_t cnt = count.u64[0];
-
-	if (cnt > 31) {
-		for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0]));
-		     i++) {
-			r.u32[i] = (a.i32[i] < 0) ? UINT32_MAX : 0;
-		}
-	} else if (cnt == 0) {
-		memcpy(&r, &a, sizeof(r));
-	} else {
-		const uint32_t m = (uint32_t)(
-			(~0U) << ((sizeof(int32_t) * CHAR_BIT) - cnt));
-		for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0]));
-		     i++) {
-			const uint32_t is_neg = a.i32[i] < 0;
-			r.u32[i] = (a.u32[i] >> cnt) | (m * is_neg);
-		}
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sra_pi32(a, count);
+#else
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private count_ = simde__m64_to_private(count);
+	const int32_t cnt =
+		(count_.u64[0] > 31)
+			? 31
+			: HEDLEY_STATIC_CAST(int32_t, count_.u64[0]);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i32 = a_.i32 >> cnt;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 =
+		vshl_s32(a_.neon_i32,
+			 vmov_n_s32(-HEDLEY_STATIC_CAST(
+				 int32_t, vget_lane_u64(count_.neon_u64, 0))));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] >> cnt;
 	}
+#endif
 
-	return r;
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psrad(a, b) simde_mm_sra_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sra_pi32(a, count) simde_mm_sra_pi32(a, count)
+#define _m_psrad(a, count) simde_mm_sra_pi32(a, count)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sub_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sub_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sub_pi8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < 8; i++) {
-		r.i8[i] = a.i8[i] - b.i8[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vsub_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = a_.i8 - b_.i8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = a_.i8[i] - b_.i8[i];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubb(a, b) simde_mm_sub_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_pi8(a, b) simde_mm_sub_pi8(a, b)
+#define _m_psubb(a, b) simde_mm_sub_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sub_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sub_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sub_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		r.i16[i] = a.i16[i] - b.i16[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vsub_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = a_.i16 - b_.i16;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] - b_.i16[i];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubw(a, b) simde_mm_sub_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_pi16(a, b) simde_mm_sub_pi16(a, b)
+#define _m_psubw(a, b) simde_mm_sub_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sub_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_sub_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sub_pi32(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int)); i++) {
-		r.i32[i] = a.i32[i] - b.i32[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vsub_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = a_.i32 - b_.i32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] - b_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubd(a, b) simde_mm_sub_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_pi32(a, b) simde_mm_sub_pi32(a, b)
+#define _m_psubd(a, b) simde_mm_sub_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_subs_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_subs_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_subs_pi8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8); i++) {
-		if (((b.i8[i]) > 0 && (a.i8[i]) < INT8_MIN + (b.i8[i]))) {
-			r.i8[i] = INT8_MIN;
-		} else if ((b.i8[i]) < 0 && (a.i8[i]) > INT8_MAX + (b.i8[i])) {
-			r.i8[i] = INT8_MAX;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vqsub_s8(a_.neon_i8, b_.neon_i8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		if (((b_.i8[i]) > 0 && (a_.i8[i]) < INT8_MIN + (b_.i8[i]))) {
+			r_.i8[i] = INT8_MIN;
+		} else if ((b_.i8[i]) < 0 &&
+			   (a_.i8[i]) > INT8_MAX + (b_.i8[i])) {
+			r_.i8[i] = INT8_MAX;
 		} else {
-			r.i8[i] = (a.i8[i]) - (b.i8[i]);
+			r_.i8[i] = (a_.i8[i]) - (b_.i8[i]);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubsb(a, b) simde_mm_subs_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_pi8(a, b) simde_mm_subs_pi8(a, b)
+#define _m_psubsb(a, b) simde_mm_subs_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_subs_pu8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_subs_pu8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_subs_pu8(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8); i++) {
-		const int32_t x = a.u8[i] - b.u8[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vqsub_u8(a_.neon_u8, b_.neon_u8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		const int32_t x = a_.u8[i] - b_.u8[i];
 		if (x < 0) {
-			r.u8[i] = 0;
+			r_.u8[i] = 0;
 		} else if (x > UINT8_MAX) {
-			r.u8[i] = UINT8_MAX;
+			r_.u8[i] = UINT8_MAX;
 		} else {
-			r.u8[i] = (uint8_t)x;
+			r_.u8[i] = HEDLEY_STATIC_CAST(uint8_t, x);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubusb(a, b) simde_mm_subs_pu8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_pu8(a, b) simde_mm_subs_pu8(a, b)
+#define _m_psubusb(a, b) simde_mm_subs_pu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_subs_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_subs_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_subs_pi16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(int16_t)); i++) {
-		if (((b.i16[i]) > 0 && (a.i16[i]) < SHRT_MIN + (b.i16[i]))) {
-			r.i16[i] = SHRT_MIN;
-		} else if ((b.i16[i]) < 0 &&
-			   (a.i16[i]) > INT16_MAX + (b.i16[i])) {
-			r.i16[i] = INT16_MAX;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vqsub_s16(a_.neon_i16, b_.neon_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		if (((b_.i16[i]) > 0 && (a_.i16[i]) < SHRT_MIN + (b_.i16[i]))) {
+			r_.i16[i] = SHRT_MIN;
+		} else if ((b_.i16[i]) < 0 &&
+			   (a_.i16[i]) > INT16_MAX + (b_.i16[i])) {
+			r_.i16[i] = INT16_MAX;
 		} else {
-			r.i16[i] = (a.i16[i]) - (b.i16[i]);
+			r_.i16[i] = (a_.i16[i]) - (b_.i16[i]);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubsw(a, b) simde_mm_subs_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_pi16(a, b) simde_mm_subs_pi16(a, b)
+#define _m_psubsw(a, b) simde_mm_subs_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_subs_pu16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_subs_pu16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_subs_pu16(a, b);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (8 / sizeof(uint16_t)); i++) {
-		const int x = a.u16[i] - b.u16[i];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vqsub_u16(a_.neon_u16, b_.neon_u16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		const int x = a_.u16[i] - b_.u16[i];
 		if (x < 0) {
-			r.u16[i] = 0;
+			r_.u16[i] = 0;
 		} else if (x > UINT16_MAX) {
-			r.u16[i] = UINT16_MAX;
+			r_.u16[i] = UINT16_MAX;
 		} else {
-			r.u16[i] = (uint16_t)x;
+			r_.u16[i] = HEDLEY_STATIC_CAST(uint16_t, x);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_psubusw(a, b) simde_mm_subs_pu16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_pu16(a, b) simde_mm_subs_pu16(a, b)
+#define _m_psubusw(a, b) simde_mm_subs_pu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_unpackhi_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_unpackhi_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_unpackhi_pi8(a, b);
 #else
-	simde__m64 r;
-	r.i8[0] = a.i8[4];
-	r.i8[1] = b.i8[4];
-	r.i8[2] = a.i8[5];
-	r.i8[3] = b.i8[5];
-	r.i8[4] = a.i8[6];
-	r.i8[5] = b.i8[6];
-	r.i8[6] = a.i8[7];
-	r.i8[7] = b.i8[7];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i8 = vzip2_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i8 = SIMDE_SHUFFLE_VECTOR_(8, 8, a_.i8, b_.i8, 4, 12, 5, 13, 6, 14,
+				      7, 15);
+#else
+	r_.i8[0] = a_.i8[4];
+	r_.i8[1] = b_.i8[4];
+	r_.i8[2] = a_.i8[5];
+	r_.i8[3] = b_.i8[5];
+	r_.i8[4] = a_.i8[6];
+	r_.i8[5] = b_.i8[6];
+	r_.i8[6] = a_.i8[7];
+	r_.i8[7] = b_.i8[7];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_punpckhbw(a, b) simde_mm_unpackhi_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_pi8(a, b) simde_mm_unpackhi_pi8(a, b)
+#define _m_punpckhbw(a, b) simde_mm_unpackhi_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_unpackhi_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_unpackhi_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_unpackhi_pi16(a, b);
 #else
-	simde__m64 r;
-	r.i16[0] = a.i16[2];
-	r.i16[1] = b.i16[2];
-	r.i16[2] = a.i16[3];
-	r.i16[3] = b.i16[3];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i16 = vzip2_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i16 = SIMDE_SHUFFLE_VECTOR_(16, 8, a_.i16, b_.i16, 2, 6, 3, 7);
+#else
+	r_.i16[0] = a_.i16[2];
+	r_.i16[1] = b_.i16[2];
+	r_.i16[2] = a_.i16[3];
+	r_.i16[3] = b_.i16[3];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_punpckhwd(a, b) simde_mm_unpackhi_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_pi16(a, b) simde_mm_unpackhi_pi16(a, b)
+#define _m_punpckhwd(a, b) simde_mm_unpackhi_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_unpackhi_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_unpackhi_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_unpackhi_pi32(a, b);
 #else
-	simde__m64 r;
-	r.i32[0] = a.i32[1];
-	r.i32[1] = b.i32[1];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i32 = vzip2_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i32 = SIMDE_SHUFFLE_VECTOR_(32, 8, a_.i32, b_.i32, 1, 3);
+#else
+	r_.i32[0] = a_.i32[1];
+	r_.i32[1] = b_.i32[1];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_punpckhdq(a, b) simde_mm_unpackhi_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_pi32(a, b) simde_mm_unpackhi_pi32(a, b)
+#define _m_punpckhdq(a, b) simde_mm_unpackhi_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_unpacklo_pi8(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_unpacklo_pi8(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_unpacklo_pi8(a, b);
 #else
-	simde__m64 r;
-	r.i8[0] = a.i8[0];
-	r.i8[1] = b.i8[0];
-	r.i8[2] = a.i8[1];
-	r.i8[3] = b.i8[1];
-	r.i8[4] = a.i8[2];
-	r.i8[5] = b.i8[2];
-	r.i8[6] = a.i8[3];
-	r.i8[7] = b.i8[3];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i8 = vzip1_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i8 = SIMDE_SHUFFLE_VECTOR_(8, 8, a_.i8, b_.i8, 0, 8, 1, 9, 2, 10, 3,
+				      11);
+#else
+	r_.i8[0] = a_.i8[0];
+	r_.i8[1] = b_.i8[0];
+	r_.i8[2] = a_.i8[1];
+	r_.i8[3] = b_.i8[1];
+	r_.i8[4] = a_.i8[2];
+	r_.i8[5] = b_.i8[2];
+	r_.i8[6] = a_.i8[3];
+	r_.i8[7] = b_.i8[3];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_punpcklbw(a, b) simde_mm_unpacklo_pi8(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_pi8(a, b) simde_mm_unpacklo_pi8(a, b)
+#define _m_punpcklbw(a, b) simde_mm_unpacklo_pi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_unpacklo_pi16(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_unpacklo_pi16(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_unpacklo_pi16(a, b);
 #else
-	simde__m64 r;
-	r.i16[0] = a.i16[0];
-	r.i16[1] = b.i16[0];
-	r.i16[2] = a.i16[1];
-	r.i16[3] = b.i16[1];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i16 = vzip1_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i16 = SIMDE_SHUFFLE_VECTOR_(16, 8, a_.i16, b_.i16, 0, 4, 1, 5);
+#else
+	r_.i16[0] = a_.i16[0];
+	r_.i16[1] = b_.i16[0];
+	r_.i16[2] = a_.i16[1];
+	r_.i16[3] = b_.i16[1];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_punpcklwd(a, b) simde_mm_unpacklo_pi16(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_pi16(a, b) simde_mm_unpacklo_pi16(a, b)
+#define _m_punpcklwd(a, b) simde_mm_unpacklo_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_unpacklo_pi32(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_unpacklo_pi32(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_unpacklo_pi32(a, b);
 #else
-	simde__m64 r;
-	r.i32[0] = a.i32[0];
-	r.i32[1] = b.i32[0];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i32 = vzip1_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i32 = SIMDE_SHUFFLE_VECTOR_(32, 8, a_.i32, b_.i32, 0, 2);
+#else
+	r_.i32[0] = a_.i32[0];
+	r_.i32[1] = b_.i32[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_punpckldq(a, b) simde_mm_unpacklo_pi32(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_pi32(a, b) simde_mm_unpacklo_pi32(a, b)
+#define _m_punpckldq(a, b) simde_mm_unpacklo_pi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_xor_si64(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return SIMDE__M64_C(_mm_xor_si64(a.n, b.n));
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_xor_si64(a, b);
 #else
-	simde__m64 r;
-	r.i64[0] = a.i64[0] ^ b.i64[0];
-	return r;
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = veor_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f ^ b_.i32f;
+#else
+	r_.u64[0] = a_.u64[0] ^ b_.u64[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
 #define simde_m_pxor(a, b) simde_mm_xor_si64(a, b)
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _mm_xor_si64(a, b) simde_mm_xor_si64(a, b)
+#define _m_pxor(a, b) simde_mm_xor_si64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_m_to_int(simde__m64 a)
 {
-#if defined(SIMDE_MMX_NATIVE)
-	return _m_to_int(a.n);
+#if defined(SIMDE_X86_MMX_NATIVE)
+	return _m_to_int(a);
+#else
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vget_lane_s32(a_.neon_i32, 0);
 #else
-	return a.i32[0];
+	return a_.i32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_MMX_ENABLE_NATIVE_ALIASES)
+#define _m_to_int(a) simde_m_to_int(a)
+#endif
+
+SIMDE_END_DECLS_
 
-SIMDE__END_DECLS
+HEDLEY_DIAGNOSTIC_POP
 
-#endif /* !defined(SIMDE__MMX_H) */
+#endif /* !defined(SIMDE_X86_MMX_H) */

obs-studio-25.0.8.tar.xz/libobs/util/simde/simde-arch.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/simde-arch.h Changed

@@ -6,6 +6,8 @@
  *   details, see the Creative Commons Zero 1.0 Universal license at
  *   <https://creativecommons.org/publicdomain/zero/1.0/>
  *
+ * SPDX-License-Identifier: CC0-1.0
+ *
  * Different compilers define different preprocessor macros for the
  * same architecture.  This is an attempt to provide a single
  * interface which is usable on any compiler.
@@ -53,6 +55,11 @@
 #define SIMDE_ARCH_ALPHA 1
 #endif
 #endif
+#if defined(SIMDE_ARCH_ALPHA)
+#define SIMDE_ARCH_ALPHA_CHECK(version) ((version) <= SIMDE_ARCH_ALPHA)
+#else
+#define SIMDE_ARCH_ALPHA_CHECK(version) (0)
+#endif
 
 /* Atmel AVR
    <https://en.wikipedia.org/wiki/Atmel_AVR> */
@@ -64,7 +71,7 @@
    <https://en.wikipedia.org/wiki/X86-64> */
 #if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || \
 	defined(__x86_64) || defined(_M_X66) || defined(_M_AMD64)
-#define SIMDE_ARCH_AMD64 1
+#define SIMDE_ARCH_AMD64 1000
 #endif
 
 /* ARM
@@ -93,11 +100,30 @@
 	defined(_ARM) || defined(_M_ARM) || defined(_M_ARM)
 #define SIMDE_ARCH_ARM 1
 #endif
+#if defined(SIMDE_ARCH_ARM)
+#define SIMDE_ARCH_ARM_CHECK(version) ((version) <= SIMDE_ARCH_ARM)
+#else
+#define SIMDE_ARCH_ARM_CHECK(version) (0)
+#endif
 
 /* AArch64
    <https://en.wikipedia.org/wiki/ARM_architecture> */
 #if defined(__aarch64__) || defined(_M_ARM64)
-#define SIMDE_ARCH_AARCH64 10
+#define SIMDE_ARCH_AARCH64 1000
+#endif
+#if defined(SIMDE_ARCH_AARCH64)
+#define SIMDE_ARCH_AARCH64_CHECK(version) ((version) <= SIMDE_ARCH_AARCH64)
+#else
+#define SIMDE_ARCH_AARCH64_CHECK(version) (0)
+#endif
+
+/* ARM SIMD ISA extensions */
+#if defined(__ARM_NEON)
+#if defined(SIMDE_ARCH_AARCH64)
+#define SIMDE_ARCH_ARM_NEON SIMDE_ARCH_AARCH64
+#elif defined(SIMDE_ARCH_ARM)
+#define SIMDE_ARCH_ARM_NEON SIMDE_ARCH_ARM
+#endif
 #endif
 
 /* Blackfin
@@ -128,6 +154,11 @@
 #elif defined(__convex__)
 #define SIMDE_ARCH_CONVEX 1
 #endif
+#if defined(SIMDE_ARCH_CONVEX)
+#define SIMDE_ARCH_CONVEX_CHECK(version) ((version) <= SIMDE_ARCH_CONVEX)
+#else
+#define SIMDE_ARCH_CONVEX_CHECK(version) (0)
+#endif
 
 /* Adapteva Epiphany
    <https://en.wikipedia.org/wiki/Adapteva_Epiphany> */
@@ -159,6 +190,11 @@
 #elif defined(__hppa__) || defined(__HPPA__) || defined(__hppa)
 #define SIMDE_ARCH_HPPA 1
 #endif
+#if defined(SIMDE_ARCH_HPPA)
+#define SIMDE_ARCH_HPPA_CHECK(version) ((version) <= SIMDE_ARCH_HPPA)
+#else
+#define SIMDE_ARCH_HPPA_CHECK(version) (0)
+#endif
 
 /* x86
    <https://en.wikipedia.org/wiki/X86> */
@@ -177,6 +213,88 @@
 #elif defined(_X86_) || defined(__X86__) || defined(__THW_INTEL__)
 #define SIMDE_ARCH_X86 3
 #endif
+#if defined(SIMDE_ARCH_X86)
+#define SIMDE_ARCH_X86_CHECK(version) ((version) <= SIMDE_ARCH_X86)
+#else
+#define SIMDE_ARCH_X86_CHECK(version) (0)
+#endif
+
+/* SIMD ISA extensions for x86/x86_64 */
+#if defined(SIMDE_ARCH_X86) || defined(SIMDE_ARCH_AMD64)
+#if defined(_M_IX86_FP)
+#define SIMDE_ARCH_X86_MMX
+#if (_M_IX86_FP >= 1)
+#define SIMDE_ARCH_X86_SSE 1
+#endif
+#if (_M_IX86_FP >= 2)
+#define SIMDE_ARCH_X86_SSE2 1
+#endif
+#elif defined(_M_X64)
+#define SIMDE_ARCH_X86_SSE 1
+#define SIMDE_ARCH_X86_SSE2 1
+#else
+#if defined(__MMX__)
+#define SIMDE_ARCH_X86_MMX 1
+#endif
+#if defined(__SSE__)
+#define SIMDE_ARCH_X86_SSE 1
+#endif
+#if defined(__SSE2__)
+#define SIMDE_ARCH_X86_SSE2 1
+#endif
+#endif
+#if defined(__SSE3__)
+#define SIMDE_ARCH_X86_SSE3 1
+#endif
+#if defined(__SSSE3__)
+#define SIMDE_ARCH_X86_SSSE3 1
+#endif
+#if defined(__SSE4_1__)
+#define SIMDE_ARCH_X86_SSE4_1 1
+#endif
+#if defined(__SSE4_2__)
+#define SIMDE_ARCH_X86_SSE4_2 1
+#endif
+#if defined(__AVX__)
+#define SIMDE_ARCH_X86_AVX 1
+#if !defined(SIMDE_ARCH_X86_SSE3)
+#define SIMDE_ARCH_X86_SSE3 1
+#endif
+#if !defined(SIMDE_ARCH_X86_SSE4_1)
+#define SIMDE_ARCH_X86_SSE4_1 1
+#endif
+#if !defined(SIMDE_ARCH_X86_SSE4_1)
+#define SIMDE_ARCH_X86_SSE4_2 1
+#endif
+#endif
+#if defined(__AVX2__)
+#define SIMDE_ARCH_X86_AVX2 1
+#endif
+#if defined(__FMA__)
+#define SIMDE_ARCH_X86_FMA 1
+#if !defined(SIMDE_ARCH_X86_AVX)
+#define SIMDE_ARCH_X86_AVX 1
+#endif
+#endif
+#if defined(__AVX512BW__)
+#define SIMDE_ARCH_X86_AVX512BW 1
+#endif
+#if defined(__AVX512CD__)
+#define SIMDE_ARCH_X86_AVX512CD 1
+#endif
+#if defined(__AVX512DQ__)
+#define SIMDE_ARCH_X86_AVX512DQ 1
+#endif
+#if defined(__AVX512F__)
+#define SIMDE_ARCH_X86_AVX512F 1
+#endif
+#if defined(__AVX512VL__)
+#define SIMDE_ARCH_X86_AVX512VL 1
+#endif
+#if defined(__GFNI__)
+#define SIMDE_ARCH_X86_GFNI 1
+#endif
+#endif
 
 /* Itanium
    <https://en.wikipedia.org/wiki/Itanium> */
@@ -206,6 +324,11 @@
 #elif defined(__mc68000__) || defined(__MC68000__)
 #define SIMDE_ARCH_M68K 68000
 #endif
+#if defined(SIMDE_ARCH_M68K)
+#define SIMDE_ARCH_M68K_CHECK(version) ((version) <= SIMDE_ARCH_M68K)
+#else
+#define SIMDE_ARCH_M68K_CHECK(version) (0)
+#endif
 
 /* Xilinx MicroBlaze
    <https://en.wikipedia.org/wiki/MicroBlaze> */
@@ -234,6 +357,11 @@
 #elif defined(_MIPS_ISA_MIPS) || defined(__mips) || defined(__MIPS__)
 #define SIMDE_ARCH_MIPS 1
 #endif
+#if defined(SIMDE_ARCH_MIPS)
+#define SIMDE_ARCH_MIPS_CHECK(version) ((version) <= SIMDE_ARCH_MIPS)
+#else
+#define SIMDE_ARCH_MIPS_CHECK(version) (0)
+#endif
 
 /* Matsushita MN10300
    <https://en.wikipedia.org/wiki/MN103> */
@@ -245,6 +373,8 @@
    <https://en.wikipedia.org/wiki/IBM_POWER_Instruction_Set_Architecture> */
 #if defined(_M_PPC)
 #define SIMDE_ARCH_POWER _M_PPC
+#elif defined(_ARCH_PWR9)
+#define SIMDE_ARCH_POWER 900
 #elif defined(_ARCH_PWR8)
 #define SIMDE_ARCH_POWER 800
 #elif defined(_ARCH_PWR7)
@@ -274,6 +404,20 @@
 	defined(__ppc)
 #define SIMDE_ARCH_POWER 1
 #endif
+#if defined(SIMDE_ARCH_POWER)
+#define SIMDE_ARCH_POWER_CHECK(version) ((version) <= SIMDE_ARCH_POWER)
+#else
+#define SIMDE_ARCH_POWER_CHECK(version) (0)
+#endif
+
+#if defined(__ALTIVEC__)
+#define SIMDE_ARCH_POWER_ALTIVEC SIMDE_ARCH_POWER
+#endif
+#if defined(SIMDE_ARCH_POWER)
+#define SIMDE_ARCH_POWER_ALTIVEC_CHECK(version) ((version) <= SIMDE_ARCH_POWER)
+#else
+#define SIMDE_ARCH_POWER_ALTIVEC_CHECK(version) (0)
+#endif
 
 /* SPARC
    <https://en.wikipedia.org/wiki/SPARC> */
@@ -298,6 +442,11 @@
 #elif defined(__sparc__) || defined(__sparc)
 #define SIMDE_ARCH_SPARC 1
 #endif
+#if defined(SIMDE_ARCH_SPARC)
+#define SIMDE_ARCH_SPARC_CHECK(version) ((version) <= SIMDE_ARCH_SPARC)
+#else
+#define SIMDE_ARCH_SPARC_CHECK(version) (0)
+#endif
 
 /* SuperH
    <https://en.wikipedia.org/wiki/SuperH> */
@@ -345,6 +494,20 @@
 #elif defined(_TMS320C28X) || defined(__TMS320C28X__)
 #define SIMDE_ARCH_TMS320 280
 #endif
+#if defined(SIMDE_ARCH_TMS320)
+#define SIMDE_ARCH_TMS320_CHECK(version) ((version) <= SIMDE_ARCH_TMS320)
+#else
+#define SIMDE_ARCH_TMS320_CHECK(version) (0)
+#endif
+
+/* WebAssembly */
+#if defined(__wasm__)
+#define SIMDE_ARCH_WASM 1
+#endif
+
+#if defined(SIMDE_ARCH_WASM) && defined(__wasm_simd128__)
+#define SIMDE_ARCH_WASM_SIMD128
+#endif
 
 /* Xtensa
    <https://en.wikipedia.org/wiki/> */

obs-studio-25.0.8.tar.xz/libobs/util/simde/simde-common.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/simde-common.h Changed

@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2019 Evan Nemerson <evan@nemerson.com>
+/* SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -19,39 +19,254 @@
  * 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>
  */
 
 #if !defined(SIMDE_COMMON_H)
 #define SIMDE_COMMON_H
 
 #include "hedley.h"
-#include "check.h"
+
+#define SIMDE_VERSION_MAJOR 0
+#define SIMDE_VERSION_MINOR 5
+#define SIMDE_VERSION_MICRO 0
+#define SIMDE_VERSION                                                   \
+	HEDLEY_VERSION_ENCODE(SIMDE_VERSION_MAJOR, SIMDE_VERSION_MINOR, \
+			      SIMDE_VERSION_MICRO)
+
 #include "simde-arch.h"
+#include "simde-features.h"
+#include "simde-diagnostic.h"
 
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
-#define SIMDE_ALIGN(alignment) _Alignas(alignment)
-#elif (defined(__cplusplus) && (__cplusplus >= 201103L))
-#define SIMDE_ALIGN(alignment) alignas(alignment)
-#elif HEDLEY_GCC_VERSION_CHECK(2, 95, 0) ||     \
-	HEDLEY_CRAY_VERSION_CHECK(8, 4, 0) ||   \
-	HEDLEY_IBM_VERSION_CHECK(11, 1, 0) ||   \
-	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) || \
-	HEDLEY_PGI_VERSION_CHECK(19, 4, 0) ||   \
-	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||    \
-	HEDLEY_TINYC_VERSION_CHECK(0, 9, 24) || \
+#include <stddef.h>
+#include <stdint.h>
+
+#if HEDLEY_HAS_ATTRIBUTE(aligned) || HEDLEY_GCC_VERSION_CHECK(2, 95, 0) || \
+	HEDLEY_CRAY_VERSION_CHECK(8, 4, 0) ||                              \
+	HEDLEY_IBM_VERSION_CHECK(11, 1, 0) ||                              \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                            \
+	HEDLEY_PGI_VERSION_CHECK(19, 4, 0) ||                              \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                               \
+	HEDLEY_TINYC_VERSION_CHECK(0, 9, 24) ||                            \
 	HEDLEY_TI_VERSION_CHECK(8, 1, 0)
 #define SIMDE_ALIGN(alignment) __attribute__((aligned(alignment)))
-#elif defined(_MSC_VER) && (!defined(_M_IX86) || defined(_M_AMD64))
+#elif defined(_MSC_VER) && !(defined(_M_ARM) && !defined(_M_ARM64))
 #define SIMDE_ALIGN(alignment) __declspec(align(alignment))
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
+#define SIMDE_ALIGN(alignment) _Alignas(alignment)
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+#define SIMDE_ALIGN(alignment) alignas(alignment)
 #else
 #define SIMDE_ALIGN(alignment)
 #endif
 
-#define simde_assert_aligned(alignment, val) \
-	simde_assert_int(((uintptr_t)(val)) % (alignment), ==, 0)
+#if HEDLEY_GNUC_VERSION_CHECK(2, 95, 0) ||   \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) || \
+	HEDLEY_IBM_VERSION_CHECK(11, 1, 0)
+#define SIMDE_ALIGN_OF(T) (__alignof__(T))
+#elif (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+	HEDLEY_HAS_FEATURE(c11_alignof)
+#define SIMDE_ALIGN_OF(T) (_Alignof(T))
+#elif (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+	HEDLEY_HAS_FEATURE(cxx_alignof)
+#define SIMDE_ALIGN_OF(T) (alignof(T))
+#endif
+
+#if defined(SIMDE_ALIGN_OF)
+#define SIMDE_ALIGN_AS(N, T) SIMDE_ALIGN(SIMDE_ALIGN_OF(T))
+#else
+#define SIMDE_ALIGN_AS(N, T) SIMDE_ALIGN(N)
+#endif
 
-#if HEDLEY_GCC_HAS_ATTRIBUTE(vector_size, 4, 6, 0)
-#define SIMDE__ENABLE_GCC_VEC_EXT
+#define simde_assert_aligned(alignment, val)                                \
+	simde_assert_int(HEDLEY_REINTERPRET_CAST(                           \
+				 uintptr_t, HEDLEY_REINTERPRET_CAST(        \
+						    const void *, (val))) % \
+				 (alignment),                               \
+			 ==, 0)
+
+#if HEDLEY_HAS_BUILTIN(__builtin_constant_p) ||                             \
+	HEDLEY_GCC_VERSION_CHECK(3, 4, 0) ||                                \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                             \
+	HEDLEY_TINYC_VERSION_CHECK(0, 9, 19) ||                             \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                \
+	HEDLEY_IBM_VERSION_CHECK(13, 1, 0) ||                               \
+	HEDLEY_TI_CL6X_VERSION_CHECK(6, 1, 0) ||                            \
+	(HEDLEY_SUNPRO_VERSION_CHECK(5, 10, 0) && !defined(__cplusplus)) || \
+	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0)
+#define SIMDE_CHECK_CONSTANT_(expr) (__builtin_constant_p(expr))
+#elif defined(__cplusplus) && (__cplusplus > 201703L)
+#include <type_traits>
+#define SIMDE_CHECK_CONSTANT_(expr) (std::is_constant_evaluated())
+#endif
+
+/* diagnose_if + __builtin_constant_p was broken until clang 9,
+ * which is when __FILE_NAME__ was added. */
+#if defined(SIMDE_CHECK_CONSTANT_) && defined(__FILE_NAME__)
+#define SIMDE_REQUIRE_CONSTANT(arg)                    \
+	HEDLEY_REQUIRE_MSG(SIMDE_CHECK_CONSTANT_(arg), \
+			   "`" #arg "' must be constant")
+#else
+#define SIMDE_REQUIRE_CONSTANT(arg)
+#endif
+
+#define SIMDE_REQUIRE_RANGE(arg, min, max)                         \
+	HEDLEY_REQUIRE_MSG((((arg) >= (min)) && ((arg) <= (max))), \
+			   "'" #arg "' must be in [" #min ", " #max "]")
+
+#define SIMDE_REQUIRE_CONSTANT_RANGE(arg, min, max) \
+	SIMDE_REQUIRE_CONSTANT(arg)                 \
+	SIMDE_REQUIRE_RANGE(arg, min, max)
+
+/* SIMDE_ASSUME_ALIGNED allows you to (try to) tell the compiler
+ * that a pointer is aligned to an `alignment`-byte boundary. */
+#if HEDLEY_HAS_BUILTIN(__builtin_assume_aligned) || \
+	HEDLEY_GCC_VERSION_CHECK(4, 7, 0)
+#define SIMDE_ASSUME_ALIGNED(alignment, v)     \
+	HEDLEY_REINTERPRET_CAST(__typeof__(v), \
+				__builtin_assume_aligned(v, alignment))
+#elif defined(__cplusplus) && (__cplusplus > 201703L)
+#define SIMDE_ASSUME_ALIGNED(alignment, v) std::assume_aligned<alignment>(v)
+#elif HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
+#define SIMDE_ASSUME_ALIGNED(alignment, v)                            \
+	(__extension__({                                              \
+		__typeof__(v) simde_assume_aligned_t_ = (v);          \
+		__assume_aligned(simde_assume_aligned_t_, alignment); \
+		simde_assume_aligned_t_;                              \
+	}))
+#else
+#define SIMDE_ASSUME_ALIGNED(alignment, v) (v)
+#endif
+
+/* SIMDE_ALIGN_CAST allows you to convert to a type with greater
+ * aligment requirements without triggering a warning. */
+#if HEDLEY_HAS_WARNING("-Wcast-align")
+#define SIMDE_ALIGN_CAST(T, v)                                       \
+	(__extension__({                                             \
+		HEDLEY_DIAGNOSTIC_PUSH                               \
+		_Pragma("clang diagnostic ignored \"-Wcast-align\"") \
+			T simde_r_ = HEDLEY_REINTERPRET_CAST(T, v);  \
+		HEDLEY_DIAGNOSTIC_POP                                \
+		simde_r_;                                            \
+	}))
+#else
+#define SIMDE_ALIGN_CAST(T, v) HEDLEY_REINTERPRET_CAST(T, v)
+#endif
+
+#if (HEDLEY_HAS_ATTRIBUTE(may_alias) && !defined(HEDLEY_SUNPRO_VERSION)) || \
+	HEDLEY_GCC_VERSION_CHECK(3, 3, 0) ||                                \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                             \
+	HEDLEY_IBM_VERSION_CHECK(13, 1, 0)
+#define SIMDE_MAY_ALIAS __attribute__((__may_alias__))
+#else
+#define SIMDE_MAY_ALIAS
+#endif
+
+/*  Lots of compilers support GCC-style vector extensions, but many
+    don't support all the features.  Define different macros depending
+    on support for
+
+    * SIMDE_VECTOR - Declaring a vector.
+    * SIMDE_VECTOR_OPS - basic operations (binary and unary).
+    * SIMDE_VECTOR_SCALAR - For binary operators, the second argument
+        can be a scalar, in which case the result is as if that scalar
+        had been broadcast to all lanes of a vector.
+    * SIMDE_VECTOR_SUBSCRIPT - Supports array subscript notation for
+        extracting/inserting a single element.=
+
+    SIMDE_VECTOR can be assumed if any others are defined, the
+    others are independent. */
+#if !defined(SIMDE_NO_VECTOR)
+#if HEDLEY_GCC_VERSION_CHECK(4, 8, 0)
+#define SIMDE_VECTOR(size) __attribute__((__vector_size__(size)))
+#define SIMDE_VECTOR_OPS
+#define SIMDE_VECTOR_SCALAR
+#define SIMDE_VECTOR_SUBSCRIPT
+#elif HEDLEY_INTEL_VERSION_CHECK(16, 0, 0)
+#define SIMDE_VECTOR(size) __attribute__((__vector_size__(size)))
+#define SIMDE_VECTOR_OPS
+/* ICC only supports SIMDE_VECTOR_SCALAR for constants */
+#define SIMDE_VECTOR_SUBSCRIPT
+#elif HEDLEY_GCC_VERSION_CHECK(4, 1, 0) || HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
+#define SIMDE_VECTOR(size) __attribute__((__vector_size__(size)))
+#define SIMDE_VECTOR_OPS
+#elif HEDLEY_SUNPRO_VERSION_CHECK(5, 12, 0)
+#define SIMDE_VECTOR(size) __attribute__((__vector_size__(size)))
+#elif HEDLEY_HAS_ATTRIBUTE(vector_size)
+#define SIMDE_VECTOR(size) __attribute__((__vector_size__(size)))
+#define SIMDE_VECTOR_OPS
+#define SIMDE_VECTOR_SUBSCRIPT
+#if HEDLEY_HAS_ATTRIBUTE(diagnose_if) /* clang 4.0 */
+#define SIMDE_VECTOR_SCALAR
+#endif
+#endif
+
+/* GCC and clang have built-in functions to handle shuffling and
+   converting of vectors, but the implementations are slightly
+   different.  This macro is just an abstraction over them.  Note that
+   elem_size is in bits but vec_size is in bytes. */
+#if !defined(SIMDE_NO_SHUFFLE_VECTOR) && defined(SIMDE_VECTOR_SUBSCRIPT)
+HEDLEY_DIAGNOSTIC_PUSH
+/* We don't care about -Wvariadic-macros; all compilers that support
+      * shufflevector/shuffle support them. */
+#if HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic")
+#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if HEDLEY_HAS_WARNING("-Wvariadic-macros") || HEDLEY_GCC_VERSION_CHECK(4, 0, 0)
+#pragma GCC diagnostic ignored "-Wvariadic-macros"
+#endif
+
+#if HEDLEY_HAS_BUILTIN(__builtin_shufflevector)
+#define SIMDE_SHUFFLE_VECTOR_(elem_size, vec_size, a, b, ...) \
+	__builtin_shufflevector(a, b, __VA_ARGS__)
+#elif HEDLEY_GCC_HAS_BUILTIN(__builtin_shuffle, 4, 7, 0) && \
+	!defined(__INTEL_COMPILER)
+#define SIMDE_SHUFFLE_VECTOR_(elem_size, vec_size, a, b, ...) \
+	(__extension__({                                      \
+		int##elem_size##_t SIMDE_VECTOR(vec_size)     \
+			simde_shuffle_ = {__VA_ARGS__};       \
+		__builtin_shuffle(a, b, simde_shuffle_);      \
+	}))
+#endif
+HEDLEY_DIAGNOSTIC_POP
+#endif
+
+/* TODO: this actually works on XL C/C++ without SIMDE_VECTOR_SUBSCRIPT
+   but the code needs to be refactored a bit to take advantage. */
+#if !defined(SIMDE_NO_CONVERT_VECTOR) && defined(SIMDE_VECTOR_SUBSCRIPT)
+#if HEDLEY_HAS_BUILTIN(__builtin_convertvector) || \
+	HEDLEY_GCC_VERSION_CHECK(9, 0, 0)
+#if HEDLEY_GCC_VERSION_CHECK(9, 0, 0) && !HEDLEY_GCC_VERSION_CHECK(9, 3, 0)
+/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93557 */
+#define SIMDE_CONVERT_VECTOR_(to, from)                          \
+	((to) = (__extension__({                                 \
+		 __typeof__(from) from_ = (from);                \
+		 ((void)from_);                                  \
+		 __builtin_convertvector(from_, __typeof__(to)); \
+	 })))
+#else
+#define SIMDE_CONVERT_VECTOR_(to, from) \
+	((to) = __builtin_convertvector((from), __typeof__(to)))
+#endif
+#endif
+#endif
+#endif
+
+/* Since we currently require SUBSCRIPT before using a vector in a
+   union, we define these as dependencies of SUBSCRIPT.  They are
+   likely to disappear in the future, once SIMDe learns how to make
+   use of vectors without using the union members.  Do not use them
+   in your code unless you're okay with it breaking when SIMDe
+   changes. */
+#if defined(SIMDE_VECTOR_SUBSCRIPT)
+#if defined(SIMDE_VECTOR_OPS)
+#define SIMDE_VECTOR_SUBSCRIPT_OPS
+#endif
+#if defined(SIMDE_VECTOR_SCALAR)
+#define SIMDE_VECTOR_SUBSCRIPT_SCALAR
+#endif
 #endif
 
 #if !defined(SIMDE_ENABLE_OPENMP) &&                   \
@@ -60,81 +275,197 @@
 #define SIMDE_ENABLE_OPENMP
 #endif
 
-#if !defined(SIMDE_ENABLE_CILKPLUS) && defined(__cilk)
+#if !defined(SIMDE_ENABLE_CILKPLUS) && \
+	(defined(__cilk) || defined(HEDLEY_INTEL_VERSION))
 #define SIMDE_ENABLE_CILKPLUS
 #endif
 
 #if defined(SIMDE_ENABLE_OPENMP)
-#define SIMDE__VECTORIZE _Pragma("omp simd")
-#define SIMDE__VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(omp simd safelen(l))
-#define SIMDE__VECTORIZE_REDUCTION(r) HEDLEY_PRAGMA(omp simd reduction(r))
-#define SIMDE__VECTORIZE_ALIGNED(a) HEDLEY_PRAGMA(omp simd aligned(a))
+#define SIMDE_VECTORIZE _Pragma("omp simd")
+#define SIMDE_VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(omp simd safelen(l))
+#define SIMDE_VECTORIZE_REDUCTION(r) HEDLEY_PRAGMA(omp simd reduction(r))
+#define SIMDE_VECTORIZE_ALIGNED(a) HEDLEY_PRAGMA(omp simd aligned(a))
 #elif defined(SIMDE_ENABLE_CILKPLUS)
-#define SIMDE__VECTORIZE _Pragma("simd")
-#define SIMDE__VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(simd vectorlength(l))
-#define SIMDE__VECTORIZE_REDUCTION(r) HEDLEY_PRAGMA(simd reduction(r))
-#define SIMDE__VECTORIZE_ALIGNED(a) HEDLEY_PRAGMA(simd aligned(a))
-#elif defined(__INTEL_COMPILER)
-#define SIMDE__VECTORIZE _Pragma("simd")
-#define SIMDE__VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(simd vectorlength(l))
-#define SIMDE__VECTORIZE_REDUCTION(r) HEDLEY_PRAGMA(simd reduction(r))
-#define SIMDE__VECTORIZE_ALIGNED(a)
-#elif defined(__clang__)
-#define SIMDE__VECTORIZE _Pragma("clang loop vectorize(enable)")
-#define SIMDE__VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(clang loop vectorize_width(l))
-#define SIMDE__VECTORIZE_REDUCTION(r) SIMDE__VECTORIZE
-#define SIMDE__VECTORIZE_ALIGNED(a)
+#define SIMDE_VECTORIZE _Pragma("simd")
+#define SIMDE_VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(simd vectorlength(l))
+#define SIMDE_VECTORIZE_REDUCTION(r) HEDLEY_PRAGMA(simd reduction(r))
+#define SIMDE_VECTORIZE_ALIGNED(a) HEDLEY_PRAGMA(simd aligned(a))
+#elif defined(__clang__) && !defined(HEDLEY_IBM_VERSION)
+#define SIMDE_VECTORIZE _Pragma("clang loop vectorize(enable)")
+#define SIMDE_VECTORIZE_SAFELEN(l) HEDLEY_PRAGMA(clang loop vectorize_width(l))
+#define SIMDE_VECTORIZE_REDUCTION(r) SIMDE_VECTORIZE
+#define SIMDE_VECTORIZE_ALIGNED(a)
 #elif HEDLEY_GCC_VERSION_CHECK(4, 9, 0)
-#define SIMDE__VECTORIZE _Pragma("GCC ivdep")
-#define SIMDE__VECTORIZE_SAFELEN(l) SIMDE__VECTORIZE
-#define SIMDE__VECTORIZE_REDUCTION(r) SIMDE__VECTORIZE
-#define SIMDE__VECTORIZE_ALIGNED(a)
+#define SIMDE_VECTORIZE _Pragma("GCC ivdep")
+#define SIMDE_VECTORIZE_SAFELEN(l) SIMDE_VECTORIZE
+#define SIMDE_VECTORIZE_REDUCTION(r) SIMDE_VECTORIZE
+#define SIMDE_VECTORIZE_ALIGNED(a)
 #elif HEDLEY_CRAY_VERSION_CHECK(5, 0, 0)
-#define SIMDE__VECTORIZE _Pragma("_CRI ivdep")
-#define SIMDE__VECTORIZE_SAFELEN(l) SIMDE__VECTORIZE
-#define SIMDE__VECTORIZE_REDUCTION(r) SIMDE__VECTORIZE
-#define SIMDE__VECTORIZE_ALIGNED(a)
+#define SIMDE_VECTORIZE _Pragma("_CRI ivdep")
+#define SIMDE_VECTORIZE_SAFELEN(l) SIMDE_VECTORIZE
+#define SIMDE_VECTORIZE_REDUCTION(r) SIMDE_VECTORIZE
+#define SIMDE_VECTORIZE_ALIGNED(a)
 #else
-#define SIMDE__VECTORIZE
-#define SIMDE__VECTORIZE_SAFELEN(l)
-#define SIMDE__VECTORIZE_REDUCTION(r)
-#define SIMDE__VECTORIZE_ALIGNED(a)
+#define SIMDE_VECTORIZE
+#define SIMDE_VECTORIZE_SAFELEN(l)
+#define SIMDE_VECTORIZE_REDUCTION(r)
+#define SIMDE_VECTORIZE_ALIGNED(a)
 #endif
 
-#if HEDLEY_GCC_HAS_ATTRIBUTE(unused, 3, 1, 0)
-#define SIMDE__UNUSED __attribute__((__unused__))
+#define SIMDE_MASK_NZ_(v, mask) (((v) & (mask)) | !((v) & (mask)))
+
+/* Intended for checking coverage, you should never use this in
+   production. */
+#if defined(SIMDE_NO_INLINE)
+#define SIMDE_FUNCTION_ATTRIBUTES HEDLEY_NEVER_INLINE static
 #else
-#define SIMDE__UNUSED
+#define SIMDE_FUNCTION_ATTRIBUTES HEDLEY_ALWAYS_INLINE static
 #endif
 
-#if HEDLEY_GCC_HAS_ATTRIBUTE(artificial, 4, 3, 0)
-#define SIMDE__ARTIFICIAL __attribute__((__artificial__))
+#if HEDLEY_HAS_ATTRIBUTE(unused) || HEDLEY_GCC_VERSION_CHECK(2, 95, 0)
+#define SIMDE_FUNCTION_POSSIBLY_UNUSED_ __attribute__((__unused__))
 #else
-#define SIMDE__ARTIFICIAL
+#define SIMDE_FUNCTION_POSSIBLY_UNUSED_
 #endif
 
-/* Intended for checking coverage, you should never use this in
-   production. */
-#if defined(SIMDE_NO_INLINE)
-#define SIMDE__FUNCTION_ATTRIBUTES HEDLEY_NEVER_INLINE SIMDE__UNUSED static
+#if HEDLEY_HAS_WARNING("-Wused-but-marked-unused")
+#define SIMDE_DIAGNOSTIC_DISABLE_USED_BUT_MARKED_UNUSED \
+	_Pragma("clang diagnostic ignored \"-Wused-but-marked-unused\"")
 #else
-#define SIMDE__FUNCTION_ATTRIBUTES HEDLEY_INLINE SIMDE__ARTIFICIAL static
+#define SIMDE_DIAGNOSTIC_DISABLE_USED_BUT_MARKED_UNUSED
 #endif
 
 #if defined(_MSC_VER)
-#define SIMDE__BEGIN_DECLS                                            \
+#define SIMDE_BEGIN_DECLS_                                            \
 	HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(disable : 4996 4204)) \
 		HEDLEY_BEGIN_C_DECLS
-#define SIMDE__END_DECLS HEDLEY_DIAGNOSTIC_POP HEDLEY_END_C_DECLS
+#define SIMDE_END_DECLS_ HEDLEY_DIAGNOSTIC_POP HEDLEY_END_C_DECLS
+#else
+#define SIMDE_BEGIN_DECLS_                              \
+	HEDLEY_DIAGNOSTIC_PUSH                          \
+	SIMDE_DIAGNOSTIC_DISABLE_USED_BUT_MARKED_UNUSED \
+	HEDLEY_BEGIN_C_DECLS
+#define SIMDE_END_DECLS_   \
+	HEDLEY_END_C_DECLS \
+	HEDLEY_DIAGNOSTIC_POP
+#endif
+
+#if HEDLEY_HAS_WARNING("-Wpedantic")
+#define SIMDE_DIAGNOSTIC_DISABLE_INT128 \
+	_Pragma("clang diagnostic ignored \"-Wpedantic\"")
+#elif defined(HEDLEY_GCC_VERSION)
+#define SIMDE_DIAGNOSTIC_DISABLE_INT128 \
+	_Pragma("GCC diagnostic ignored \"-Wpedantic\"")
 #else
-#define SIMDE__BEGIN_DECLS HEDLEY_BEGIN_C_DECLS
-#define SIMDE__END_DECLS HEDLEY_END_C_DECLS
+#define SIMDE_DIAGNOSTIC_DISABLE_INT128
 #endif
 
 #if defined(__SIZEOF_INT128__)
-#define SIMDE__HAVE_INT128
+#define SIMDE_HAVE_INT128_
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_INT128
 typedef __int128 simde_int128;
 typedef unsigned __int128 simde_uint128;
+HEDLEY_DIAGNOSTIC_POP
+#endif
+
+#if !defined(SIMDE_ENDIAN_LITTLE)
+#define SIMDE_ENDIAN_LITTLE 1234
+#endif
+#if !defined(SIMDE_ENDIAN_BIG)
+#define SIMDE_ENDIAN_BIG 4321
+#endif
+
+#if !defined(SIMDE_ENDIAN_ORDER)
+/* GCC (and compilers masquerading as GCC) define  __BYTE_ORDER__. */
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+	(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
+	(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+/* TI defines _BIG_ENDIAN or _LITTLE_ENDIAN */
+#elif defined(_BIG_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+#elif defined(_LITTLE_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+/* We know the endianness of some common architectures.  Common
+ * architectures not listed (ARM, POWER, MIPS, etc.) here are
+ * bi-endian. */
+#elif defined(__amd64) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(__s390x__) || defined(__zarch__)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+/* Looks like we'll have to rely on the platform.  If we're missing a
+ * platform, please let us know. */
+#elif defined(_WIN32)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(sun) || defined(__sun) /* Solaris */
+#include <sys/byteorder.h>
+#if defined(_LITTLE_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(_BIG_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+#endif
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#if defined(__LITTLE_ENDIAN__)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(__BIG_ENDIAN__)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+#endif
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+	defined(__bsdi__) || defined(__DragonFly__) || defined(BSD)
+#include <machine/endian.h>
+#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+#endif
+#elif defined(__linux__) || defined(__linux) || defined(__gnu_linux__)
+#include <endian.h>
+#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
+	(__BYTE_ORDER == __LITTLE_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_LITTLE
+#elif defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
+	(__BYTE_ORDER == __BIG_ENDIAN)
+#define SIMDE_ENDIAN_ORDER SIMDE_ENDIAN_BIG
+#endif
+#endif
+#endif
+
+#if HEDLEY_HAS_BUILTIN(__builtin_bswap64) ||  \
+	HEDLEY_GCC_VERSION_CHECK(4, 3, 0) ||  \
+	HEDLEY_IBM_VERSION_CHECK(13, 1, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
+#define simde_bswap64(v) __builtin_bswap64(v)
+#elif HEDLEY_MSVC_VERSION_CHECK(13, 10, 0)
+#define simde_bswap64(v) _byteswap_uint64(v)
+#else
+SIMDE_FUNCTION_ATTRIBUTES
+uint64_t simde_bswap64(uint64_t v)
+{
+	return ((v & (((uint64_t)0xff) << 56)) >> 56) |
+	       ((v & (((uint64_t)0xff) << 48)) >> 40) |
+	       ((v & (((uint64_t)0xff) << 40)) >> 24) |
+	       ((v & (((uint64_t)0xff) << 32)) >> 8) |
+	       ((v & (((uint64_t)0xff) << 24)) << 8) |
+	       ((v & (((uint64_t)0xff) << 16)) << 24) |
+	       ((v & (((uint64_t)0xff) << 8)) << 40) |
+	       ((v & (((uint64_t)0xff))) << 56);
+}
+#endif
+
+#if !defined(SIMDE_ENDIAN_ORDER)
+#error Unknown byte order; please file a bug
+#else
+#if SIMDE_ENDIAN_ORDER == SIMDE_ENDIAN_LITTLE
+#define simde_endian_bswap64_be(value) simde_bswap64(value)
+#define simde_endian_bswap64_le(value) (value)
+#elif SIMDE_ENDIAN_ORDER == SIMDE_ENDIAN_BIG
+#define simde_endian_bswap64_be(value) (value)
+#define simde_endian_bswap64_le(value) simde_bswap64(value)
+#endif
 #endif
 
 /* TODO: we should at least make an attempt to detect the correct
@@ -148,8 +479,6 @@
 #define SIMDE_FLOAT32_C(value) ((SIMDE_FLOAT32_TYPE)value)
 #endif
 typedef SIMDE_FLOAT32_TYPE simde_float32;
-HEDLEY_STATIC_ASSERT(sizeof(simde_float32) == 4,
-		     "Unable to find 32-bit floating-point type.");
 
 #if !defined(SIMDE_FLOAT64_TYPE)
 #define SIMDE_FLOAT64_TYPE double
@@ -158,8 +487,6 @@
 #define SIMDE_FLOAT32_C(value) ((SIMDE_FLOAT64_TYPE)value)
 #endif
 typedef SIMDE_FLOAT64_TYPE simde_float64;
-HEDLEY_STATIC_ASSERT(sizeof(simde_float64) == 8,
-		     "Unable to find 64-bit floating-point type.");
 
 /* Whether to assume that the compiler can auto-vectorize reasonably
    well.  This will cause SIMDe to attempt to compose vector
@@ -189,67 +516,171 @@
 #if !defined(SIMDE_NO_ASSUME_VECTORIZATION) && \
 	!defined(SIMDE_ASSUME_VECTORIZATION)
 #if defined(__SSE__) || defined(__ARM_NEON) || defined(__mips_msa) || \
-	defined(__ALTIVEC__)
+	defined(__ALTIVEC__) || defined(__wasm_simd128__)
 #define SIMDE_ASSUME_VECTORIZATION
 #endif
 #endif
 
-/* GCC and clang have built-in functions to handle shuffling of
-   vectors, but the implementations are slightly different.  This
-   macro is just an abstraction over them.  Note that elem_size is in
-   bits but vec_size is in bytes. */
-#if HEDLEY_CLANG_HAS_BUILTIN(__builtin_shufflevector)
-#define SIMDE__SHUFFLE_VECTOR(elem_size, vec_size, a, b, ...) \
-	__builtin_shufflevector(a, b, __VA_ARGS__)
-#elif HEDLEY_GCC_HAS_BUILTIN(__builtin_shuffle, 4, 7, 0) && \
-	!defined(__INTEL_COMPILER)
-#define SIMDE__SHUFFLE_VECTOR(elem_size, vec_size, a, b, ...) \
-	__builtin_shuffle(a, b,                               \
-			  (int##elem_size##_t __attribute__(  \
-				  (__vector_size__(vec_size)))){__VA_ARGS__})
+#if HEDLEY_HAS_WARNING("-Wbad-function-cast")
+#define SIMDE_CONVERT_FTOI(T, v)                                    \
+	HEDLEY_DIAGNOSTIC_PUSH                                      \
+	_Pragma("clang diagnostic ignored \"-Wbad-function-cast\"") \
+		HEDLEY_STATIC_CAST(T, (v)) HEDLEY_DIAGNOSTIC_POP
+#else
+#define SIMDE_CONVERT_FTOI(T, v) ((T)(v))
+#endif
+
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
+#define SIMDE_CHECKED_REINTERPRET_CAST(to, from, value) \
+	(_Generic((value), to : (value), from : ((to)(value))))
+#define SIMDE_CHECKED_STATIC_CAST(to, from, value) \
+	(_Generic((value), to : (value), from : ((to)(value))))
+#else
+#define SIMDE_CHECKED_REINTERPRET_CAST(to, from, value) \
+	HEDLEY_REINTERPRET_CAST(to, value)
+#define SIMDE_CHECKED_STATIC_CAST(to, from, value) HEDLEY_STATIC_CAST(to, value)
 #endif
 
-/* Some algorithms are iterative, and fewer iterations means less
-   accuracy.  Lower values here will result in faster, but less
-   accurate, calculations for some functions. */
-#if !defined(SIMDE_ACCURACY_ITERS)
-#define SIMDE_ACCURACY_ITERS 2
+#if HEDLEY_HAS_WARNING("-Wfloat-equal")
+#define SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL \
+	_Pragma("clang diagnostic ignored \"-Wfloat-equal\"")
+#elif HEDLEY_GCC_VERSION_CHECK(3, 0, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL \
+	_Pragma("GCC diagnostic ignored \"-Wfloat-equal\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL
 #endif
 
-/* This will probably move into Hedley at some point, but I'd like to
-   more thoroughly check for other compilers which define __GNUC__
-   first. */
-#if defined(SIMDE__REALLY_GCC)
-#undef SIMDE__REALLY_GCC
+/* Some functions can trade accuracy for speed.  For those functions
+   you can control the trade-off using this macro.  Possible values:
+
+   0: prefer speed
+   1: reasonable trade-offs
+   2: prefer accuracy */
+#if !defined(SIMDE_ACCURACY_PREFERENCE)
+#define SIMDE_ACCURACY_PREFERENCE 1
 #endif
-#if !defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)
-#define SIMDE__REALLY_GCC 0
+
+#if defined(__STDC_HOSTED__)
+#define SIMDE_STDC_HOSTED __STDC_HOSTED__
+#else
+#if defined(HEDLEY_PGI_VERSION_CHECK) || defined(HEDLEY_MSVC_VERSION_CHECK)
+#define SIMDE_STDC_HOSTED 1
 #else
-#define SIMDE__REALLY_GCC 1
+#define SIMDE_STDC_HOSTED 0
+#endif
 #endif
 
-#if defined(SIMDE__ASSUME_ALIGNED)
-#undef SIMDE__ASSUME_ALIGNED
+/* Try to deal with environments without a standard library. */
+#if !defined(simde_memcpy) || !defined(simde_memset)
+#if !defined(SIMDE_NO_STRING_H) && defined(__has_include)
+#if __has_include(<string.h>)
+#include <string.h>
+#if !defined(simde_memcpy)
+#define simde_memcpy(dest, src, n) memcpy(dest, src, n)
+#endif
+#if !defined(simde_memset)
+#define simde_memset(s, c, n) memset(s, c, n)
 #endif
-#if HEDLEY_INTEL_VERSION_CHECK(9, 0, 0)
-#define SIMDE__ASSUME_ALIGNED(ptr, align) __assume_aligned(ptr, align)
-#elif HEDLEY_MSVC_VERSION_CHECK(13, 10, 0)
-#define SIMDE__ASSUME_ALIGNED(ptr, align) \
-	__assume((((char *)ptr) - ((char *)0)) % (align) == 0)
-#elif HEDLEY_GCC_HAS_BUILTIN(__builtin_assume_aligned, 4, 7, 0)
-#define SIMDE__ASSUME_ALIGNED(ptr, align) \
-	(ptr = (__typeof__(ptr))__builtin_assume_aligned((ptr), align))
-#elif HEDLEY_CLANG_HAS_BUILTIN(__builtin_assume)
-#define SIMDE__ASSUME_ALIGNED(ptr, align) \
-	__builtin_assume((((char *)ptr) - ((char *)0)) % (align) == 0)
-#elif HEDLEY_GCC_HAS_BUILTIN(__builtin_unreachable, 4, 5, 0)
-#define SIMDE__ASSUME_ALIGNED(ptr, align)              \
-	((((char *)ptr) - ((char *)0)) % (align) == 0) \
-		? (1)                                  \
-		: (__builtin_unreachable(), 0)
 #else
-#define SIMDE__ASSUME_ALIGNED(ptr, align)
+#define SIMDE_NO_STRING_H
+#endif
+#endif
+#endif
+#if !defined(simde_memcpy) || !defined(simde_memset)
+#if !defined(SIMDE_NO_STRING_H) && (SIMDE_STDC_HOSTED == 1)
+#include <string.h>
+#if !defined(simde_memcpy)
+#define simde_memcpy(dest, src, n) memcpy(dest, src, n)
 #endif
+#if !defined(simde_memset)
+#define simde_memset(s, c, n) memset(s, c, n)
+#endif
+#elif (HEDLEY_HAS_BUILTIN(__builtin_memcpy) &&  \
+       HEDLEY_HAS_BUILTIN(__builtin_memset)) || \
+	HEDLEY_GCC_VERSION_CHECK(4, 2, 0)
+#if !defined(simde_memcpy)
+#define simde_memcpy(dest, src, n) __builtin_memcpy(dest, src, n)
+#endif
+#if !defined(simde_memset)
+#define simde_memset(s, c, n) __builtin_memset(s, c, n)
+#endif
+#else
+/* These are meant to be portable, not fast.  If you're hitting them you
+     * should think about providing your own (by defining the simde_memcpy
+     * macro prior to including any SIMDe files) or submitting a patch to
+     * SIMDe so we can detect your system-provided memcpy/memset, like by
+     * adding your compiler to the checks for __builtin_memcpy and/or
+     * __builtin_memset. */
+#if !defined(simde_memcpy)
+SIMDE_FUNCTION_ATTRIBUTES
+void simde_memcpy_(void *dest, const void *src, size_t len)
+{
+	char *dest_ = HEDLEY_STATIC_CAST(char *, dest);
+	char *src_ = HEDLEY_STATIC_CAST(const char *, src);
+	for (size_t i = 0; i < len; i++) {
+		dest_[i] = src_[i];
+	}
+}
+#define simde_memcpy(dest, src, n) simde_memcpy_(dest, src, n)
+#endif
+
+#if !defined(simde_memset)
+SIMDE_FUNCTION_ATTRIBUTES
+void simde_memset_(void *s, int c, size_t len)
+{
+	char *s_ = HEDLEY_STATIC_CAST(char *, s);
+	char c_ = HEDLEY_STATIC_CAST(char, c);
+	for (size_t i = 0; i < len; i++) {
+		s_[i] = c_[i];
+	}
+}
+#define simde_memset(s, c, n) simde_memset_(s, c, n)
+#endif
+#endif /* !defined(SIMDE_NO_STRING_H) && (SIMDE_STDC_HOSTED == 1) */
+#endif /* !defined(simde_memcpy) || !defined(simde_memset) */
+
+#include "simde-math.h"
+
+#if defined(FE_ALL_EXCEPT)
+#define SIMDE_HAVE_FENV_H
+#elif defined(__has_include)
+#if __has_include(<fenv.h>)
+#include <fenv.h>
+#define SIMDE_HAVE_FENV_H
+#endif
+#elif SIMDE_STDC_HOSTED == 1
+#include <fenv.h>
+#define SIMDE_HAVE_FENV_H
+#endif
+
+#if defined(EXIT_FAILURE)
+#define SIMDE_HAVE_STDLIB_H
+#elif defined(__has_include)
+#if __has_include(<stdlib.h>)
+#include <stdlib.h>
+#define SIMDE_HAVE_STDLIB_H
+#endif
+#elif SIMDE_STDC_HOSTED == 1
+#include <stdlib.h>
+#define SIMDE_HAVE_STDLIB_H
+#endif
+
+#if defined(__has_include)
+#if defined(__cplusplus) && (__cplusplus >= 201103L) && __has_include(<cfenv>)
+#include <cfenv>
+#elif __has_include(<fenv.h>)
+#include <fenv.h>
+#endif
+#if __has_include(<stdlib.h>)
+#include <stdlib.h>
+#endif
+#elif SIMDE_STDC_HOSTED == 1
+#include <stdlib.h>
+#include <fenv.h>
+#endif
+
+#include "check.h"
 
 /* Sometimes we run into problems with specific versions of compilers
    which make the native versions unusable for us.  Often this is due
@@ -258,7 +689,7 @@
    start only defining them for problematic compiler versions. */
 
 #if !defined(SIMDE_IGNORE_COMPILER_BUGS)
-#if SIMDE__REALLY_GCC
+#if defined(HEDLEY_GCC_VERSION)
 #if !HEDLEY_GCC_VERSION_CHECK(4, 9, 0)
 #define SIMDE_BUG_GCC_REV_208793
 #endif
@@ -268,11 +699,53 @@
 #if !HEDLEY_GCC_VERSION_CHECK(4, 6, 0)
 #define SIMDE_BUG_GCC_BAD_MM_EXTRACT_EPI8 /* TODO: find relevant bug or commit */
 #endif
+#if !HEDLEY_GCC_VERSION_CHECK(8, 0, 0)
+#define SIMDE_BUG_GCC_REV_247851
+#endif
+#if !HEDLEY_GCC_VERSION_CHECK(10, 0, 0)
+#define SIMDE_BUG_GCC_REV_274313
+#define SIMDE_BUG_GCC_91341
+#endif
+#if !HEDLEY_GCC_VERSION_CHECK(9, 0, 0) && defined(SIMDE_ARCH_AARCH64)
+#define SIMDE_BUG_GCC_ARM_SHIFT_SCALAR
+#endif
+#if defined(SIMDE_ARCH_X86) && !defined(SIMDE_ARCH_AMD64)
+#define SIMDE_BUG_GCC_94482
+#endif
+#if !HEDLEY_GCC_VERSION_CHECK(9, 4, 0) && defined(SIMDE_ARCH_AARCH64)
+#define SIMDE_BUG_GCC_94488
 #endif
-#if defined(__EMSCRIPTEN__)
+#if defined(SIMDE_ARCH_POWER)
+#define SIMDE_BUG_GCC_95227
+#endif
+#define SIMDE_BUG_GCC_95399
+#elif defined(__clang__)
+#if defined(SIMDE_ARCH_AARCH64)
+#define SIMDE_BUG_CLANG_45541
+#endif
+#endif
+#if defined(HEDLEY_EMSCRIPTEN_VERSION)
 #define SIMDE_BUG_EMSCRIPTEN_MISSING_IMPL /* Placeholder for (as yet) unfiled issues. */
 #define SIMDE_BUG_EMSCRIPTEN_5242
 #endif
 #endif
 
+/* GCC and Clang both have the same issue:
+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95144
+ * https://bugs.llvm.org/show_bug.cgi?id=45931
+ */
+#if HEDLEY_HAS_WARNING("-Wsign-conversion") || HEDLEY_GCC_VERSION_CHECK(4, 3, 0)
+#define SIMDE_BUG_IGNORE_SIGN_CONVERSION(expr)                                      \
+	(__extension__({                                                            \
+		HEDLEY_DIAGNOSTIC_PUSH                                              \
+		HEDLEY_DIAGNOSTIC_POP                                               \
+		_Pragma("GCC diagnostic ignored \"-Wsign-conversion\"") __typeof__( \
+			expr) simde_bug_ignore_sign_conversion_v_ = (expr);         \
+		HEDLEY_DIAGNOSTIC_PUSH                                              \
+		simde_bug_ignore_sign_conversion_v_;                                \
+	}))
+#else
+#define SIMDE_BUG_IGNORE_SIGN_CONVERSION(expr) (expr)
+#endif
+
 #endif /* !defined(SIMDE_COMMON_H) */

obs-studio-26.0.0.tar.xz/libobs/util/simde/simde-diagnostic.h Added

@@ -0,0 +1,270 @@
+/* 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>
+ */
+
+/* SIMDe targets a very wide range of standards and compilers, and our
+ * goal is to compile cleanly even with extremely aggressive warnings
+ * (i.e., -Weverything in clang, -Wextra in GCC, /W4 for MSVC, etc.)
+ * treated as errors.
+ *
+ * While our preference is to resolve the underlying issue a given
+ * diagnostic is warning us about, sometimes that's not possible.
+ * Fixing a warning in one compiler may cause problems in another.
+ * Sometimes a warning doesn't really apply to us (false positives),
+ * and sometimes adhering to a warning would mean dropping a feature
+ * we *know* the compiler supports since we have tested specifically
+ * for the compiler or feature.
+ *
+ * When practical, warnings are only disabled for specific code.  For
+ * a list of warnings which are enabled by default in all SIMDe code,
+ * see SIMDE_DISABLE_UNWANTED_DIAGNOSTICS.  Note that we restore the
+ * warning stack when SIMDe is done parsing, so code which includes
+ * SIMDe is not deprived of these warnings.
+ */
+
+#if !defined(SIMDE_DIAGNOSTIC_H)
+
+#include "hedley.h"
+
+/* This is only to help us implement functions like _mm_undefined_ps. */
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+#undef SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_
+#endif
+#if HEDLEY_HAS_WARNING("-Wuninitialized")
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ \
+	_Pragma("clang diagnostic ignored \"-Wuninitialized\"")
+#elif HEDLEY_GCC_VERSION_CHECK(4, 2, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ \
+	_Pragma("GCC diagnostic ignored \"-Wuninitialized\"")
+#elif HEDLEY_PGI_VERSION_CHECK(19, 10, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ _Pragma("diag_suppress 549")
+#elif HEDLEY_SUNPRO_VERSION_CHECK(5, 14, 0) && defined(__cplusplus)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ \
+	_Pragma("error_messages(off,SEC_UNINITIALIZED_MEM_READ,SEC_UNDEFINED_RETURN_VALUE,unassigned)")
+#elif HEDLEY_SUNPRO_VERSION_CHECK(5, 14, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ \
+	_Pragma("error_messages(off,SEC_UNINITIALIZED_MEM_READ,SEC_UNDEFINED_RETURN_VALUE)")
+#elif HEDLEY_SUNPRO_VERSION_CHECK(5, 12, 0) && defined(__cplusplus)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ \
+	_Pragma("error_messages(off,unassigned)")
+#elif HEDLEY_TI_VERSION_CHECK(16, 9, 9) ||       \
+	HEDLEY_TI_CL6X_VERSION_CHECK(8, 0, 0) || \
+	HEDLEY_TI_CL7X_VERSION_CHECK(1, 2, 0) || \
+	HEDLEY_TI_CLPRU_VERSION_CHECK(2, 3, 2)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ _Pragma("diag_suppress 551")
+#elif HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ _Pragma("warning(disable:592)")
+#elif HEDLEY_MSVC_VERSION_CHECK(19, 0, 0) && !defined(__MSVC_RUNTIME_CHECKS)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_ \
+	__pragma(warning(disable : 4700))
+#endif
+
+/* GCC emits a lot of "notes" about the ABI being different for things
+ * in newer versions of GCC.  We don't really care because all our
+ * functions are inlined and don't generate ABI. */
+#if HEDLEY_GCC_VERSION_CHECK(7, 0, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_PSABI_ \
+	_Pragma("GCC diagnostic ignored \"-Wpsabi\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_PSABI_
+#endif
+
+/* Since MMX uses x87 FP registers, you're supposed to call _mm_empty()
+ * after each MMX function before any floating point instructions.
+ * Some compilers warn about functions which use MMX functions but
+ * don't call _mm_empty().  However, since SIMDe is implementyng the
+ * MMX API we shouldn't be calling _mm_empty(); we leave it to the
+ * caller to invoke simde_mm_empty(). */
+#if HEDLEY_INTEL_VERSION_CHECK(19, 0, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_NO_EMMS_INSTRUCTION_ \
+	_Pragma("warning(disable:13200 13203)")
+#elif defined(HEDLEY_MSVC_VERSION)
+#define SIMDE_DIAGNOSTIC_DISABLE_NO_EMMS_INSTRUCTION_ \
+	__pragma(warning(disable : 4799))
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_NO_EMMS_INSTRUCTION_
+#endif
+
+/* Intel is pushing people to use OpenMP SIMD instead of Cilk+, so they
+ * emit a diagnostic if you use #pragma simd instead of
+ * #pragma omp simd.  SIMDe supports OpenMP SIMD, you just need to
+ * compile with -qopenmp or -qopenmp-simd and define
+ * SIMDE_ENABLE_OPENMP.  Cilk+ is just a fallback. */
+#if HEDLEY_INTEL_VERSION_CHECK(18, 0, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_SIMD_PRAGMA_DEPRECATED_ \
+	_Pragma("warning(disable:3948)")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_SIMD_PRAGMA_DEPRECATED_
+#endif
+
+#if defined(HEDLEY_MSVC_VERSION)
+#define SIMDE_DIAGNOSTIC_DISABLE_NON_CONSTANT_AGGREGATE_INITIALIZER_ \
+	__pragma(warning(disable : 4204))
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_NON_CONSTANT_AGGREGATE_INITIALIZER_
+#endif
+
+/* This warning needs a lot of work.  It is triggered if all you do is
+ * pass the value to memcpy/__builtin_memcpy, or if you initialize a
+ * member of the union, even if that member takes up the entire union.
+ * Last tested with clang-10, hopefully things will improve in the
+ * future; if clang fixes this I'd love to enable it. */
+#if HEDLEY_HAS_WARNING("-Wconditional-uninitialized")
+#define SIMDE_DIAGNOSTIC_DISABLE_CONDITIONAL_UNINITIALIZED_ \
+	_Pragma("clang diagnostic ignored \"-Wconditional-uninitialized\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_CONDITIONAL_UNINITIALIZED_
+#endif
+
+/* This warning is meant to catch things like `0.3 + 0.4 == 0.7`, which
+ * will is false.  However, SIMDe uses these operations exclusively
+ * for things like _mm_cmpeq_ps, for which we really do want to check
+ * for equality (or inequality).
+ *
+ * If someone wants to put together a SIMDE_FLOAT_EQUAL(a, op, b) macro
+ * which just wraps a check in some code do disable this diagnostic I'd
+ * be happy to accept it. */
+#if HEDLEY_HAS_WARNING("-Wfloat-equal") || HEDLEY_GCC_VERSION_CHECK(3, 0, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL_ \
+	_Pragma("GCC diagnostic ignored \"-Wfloat-equal\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL_
+#endif
+
+/* This is because we use HEDLEY_STATIC_ASSERT for static assertions.
+ * If Hedley can't find an implementation it will preprocess to
+ * nothing, which means there will be a trailing semi-colon. */
+#if HEDLEY_HAS_WARNING("-Wextra-semi")
+#define SIMDE_DIAGNOSTIC_DISABLE_EXTRA_SEMI_ \
+	_Pragma("clang diagnostic ignored \"-Wextra-semi\"")
+#elif HEDLEY_GCC_VERSION_CHECK(8, 1, 0) && defined(__cplusplus)
+#define SIMDE_DIAGNOSTIC_DISABLE_EXTRA_SEMI_ \
+	_Pragma("GCC diagnostic ignored \"-Wextra-semi\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_EXTRA_SEMI_
+#endif
+
+/* We do use a few variadic macros, which technically aren't available
+ * until C99 and C++11, but every compiler I'm aware of has supported
+ * them for much longer.  That said, usage is isolated to the test
+ * suite and compilers known to support them. */
+#if HEDLEY_HAS_WARNING("-Wvariadic-macros") || HEDLEY_GCC_VERSION_CHECK(4, 0, 0)
+#if HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic")
+#define SIMDE_DIAGNOSTIC_DISABLE_VARIADIC_MACROS_                          \
+	_Pragma("clang diagnostic ignored \"-Wvariadic-macros\"") _Pragma( \
+		"clang diagnostic ignored \"-Wc++98-compat-pedantic\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_VARIADIC_MACROS_ \
+	_Pragma("GCC diagnostic ignored \"-Wvariadic-macros\"")
+#endif
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_VARIADIC_MACROS_
+#endif
+
+/* Triggered when assigning a float to a double implicitly.  We use
+ * explicit casts in SIMDe, this is only used in the test suite. */
+#if HEDLEY_HAS_WARNING("-Wdouble-promotion")
+#define SIMDE_DIAGNOSTIC_DISABLE_DOUBLE_PROMOTION_ \
+	_Pragma("clang diagnostic ignored \"-Wdouble-promotion\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_DOUBLE_PROMOTION_
+#endif
+
+/* Several compilers treat conformant array parameters as VLAs.  We
+ * test to make sure we're in C mode (C++ doesn't support CAPs), and
+ * that the version of the standard supports CAPs.  We also blacklist
+ * some buggy compilers like MSVC (the logic is in Hedley if you want
+ * to take a look), but with certain warnings enabled some compilers
+ * still like to emit a diagnostic. */
+#if HEDLEY_HAS_WARNING("-Wvla")
+#define SIMDE_DIAGNOSTIC_DISABLE_VLA_ \
+	_Pragma("clang diagnostic ignored \"-Wvla\"")
+#elif HEDLEY_GCC_VERSION_CHECK(4, 3, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_VLA_ \
+	_Pragma("GCC diagnostic ignored \"-Wvla\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_VLA_
+#endif
+
+#if HEDLEY_HAS_WARNING("-Wused-but-marked-unused")
+#define SIMDE_DIAGNOSTIC_DISABLE_USED_BUT_MARKED_UNUSED_ \
+	_Pragma("clang diagnostic ignored \"-Wused-but-marked-unused\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_USED_BUT_MARKED_UNUSED_
+#endif
+
+#if HEDLEY_HAS_WARNING("-Wunused-function")
+#define SIMDE_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION_ \
+	_Pragma("clang diagnostic ignored \"-Wunused-function\"")
+#elif HEDLEY_GCC_VERSION_CHECK(3, 4, 0)
+#define SIMDE_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION_ \
+	_Pragma("GCC diagnostic ignored \"-Wunused-function\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION_
+#endif
+
+#if HEDLEY_HAS_WARNING("-Wpass-failed")
+#define SIMDE_DIAGNOSTIC_DISABLE_PASS_FAILED_ \
+	_Pragma("clang diagnostic ignored \"-Wpass-failed\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_PASS_FAILED_
+#endif
+
+/* https://github.com/nemequ/simde/issues/277 */
+#if defined(HEDLEY_GCC_VERSION) && HEDLEY_GCC_VERSION_CHECK(4, 6, 0) && \
+	!HEDLEY_GCC_VERSION_CHECK(6, 0, 0) && defined(__cplusplus)
+#define SIMDE_DIAGNOSTIC_DISABLE_BUGGY_UNUSED_BUT_SET_VARIBALE \
+	_Pragma("GCC diagnostic ignored \"-Wunused-but-set-variable\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_BUGGY_UNUSED_BUT_SET_VARIBALE
+#endif
+
+/* Some compilers, such as clang, may use `long long` for 64-bit
+ * integers, but `long long` triggers a diagnostic with
+ * -Wc++98-compat-pedantic which says 'long long' is incompatible with
+ * C++98. */
+#if HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic")
+#define SIMDE_DIAGNOSTIC_DISABLE_CPP98_COMPAT_PEDANTIC \
+	_Pragma("clang diagnostic ignored \"-Wc++98-compat-pedantic\"")
+#else
+#define SIMDE_DIAGNOSTIC_DISABLE_CPP98_COMPAT_PEDANTIC
+#endif
+
+#define SIMDE_DISABLE_UNWANTED_DIAGNOSTICS                           \
+	SIMDE_DIAGNOSTIC_DISABLE_PSABI_                              \
+	SIMDE_DIAGNOSTIC_DISABLE_NO_EMMS_INSTRUCTION_                \
+	SIMDE_DIAGNOSTIC_DISABLE_SIMD_PRAGMA_DEPRECATED_             \
+	SIMDE_DIAGNOSTIC_DISABLE_CONDITIONAL_UNINITIALIZED_          \
+	SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL_                        \
+	SIMDE_DIAGNOSTIC_DISABLE_NON_CONSTANT_AGGREGATE_INITIALIZER_ \
+	SIMDE_DIAGNOSTIC_DISABLE_EXTRA_SEMI_                         \
+	SIMDE_DIAGNOSTIC_DISABLE_VLA_                                \
+	SIMDE_DIAGNOSTIC_DISABLE_USED_BUT_MARKED_UNUSED_             \
+	SIMDE_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION_                    \
+	SIMDE_DIAGNOSTIC_DISABLE_PASS_FAILED_                        \
+	SIMDE_DIAGNOSTIC_DISABLE_CPP98_COMPAT_PEDANTIC               \
+	SIMDE_DIAGNOSTIC_DISABLE_BUGGY_UNUSED_BUT_SET_VARIBALE
+
+#endif

obs-studio-26.0.0.tar.xz/libobs/util/simde/simde-features.h Added

@@ -0,0 +1,357 @@
+/* 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:
+ *   2020      Evan Nemerson <evan@nemerson.com>
+ */
+
+/* simde-arch.h is used to determine which features are available according
+   to the compiler.  However, we want to make it possible to forcibly enable
+   or disable APIs */
+
+#if !defined(SIMDE_FEATURES_H)
+#define SIMDE_FEATURES_H
+
+#include "simde-arch.h"
+
+#if !defined(SIMDE_X86_SVML_NATIVE) && !defined(SIMDE_X86_SVML_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SVML)
+#define SIMDE_X86_SVML_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_SVML_NATIVE) && !defined(SIMDE_X86_AVX512F_NATIVE)
+#define SIMDE_X86_AVX512F_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX512CD_NATIVE) && \
+	!defined(SIMDE_X86_AVX512CD_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX512CD)
+#define SIMDE_X86_AVX512CD_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX512CD_NATIVE) && !defined(SIMDE_X86_AVX512F_NATIVE)
+#define SIMDE_X86_AVX512F_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX512DQ_NATIVE) && \
+	!defined(SIMDE_X86_AVX512DQ_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX512DQ)
+#define SIMDE_X86_AVX512DQ_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX512DQ_NATIVE) && !defined(SIMDE_X86_AVX512F_NATIVE)
+#define SIMDE_X86_AVX512F_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX512VL_NATIVE) && \
+	!defined(SIMDE_X86_AVX512VL_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX512VL)
+#define SIMDE_X86_AVX512VL_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX512VL_NATIVE) && !defined(SIMDE_X86_AVX512F_NATIVE)
+#define SIMDE_X86_AVX512F_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX512BW_NATIVE) && \
+	!defined(SIMDE_X86_AVX512BW_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX512BW)
+#define SIMDE_X86_AVX512BW_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX512BW_NATIVE) && !defined(SIMDE_X86_AVX512F_NATIVE)
+#define SIMDE_X86_AVX512F_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX512F_NATIVE) && \
+	!defined(SIMDE_X86_AVX512F_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX512F)
+#define SIMDE_X86_AVX512F_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX512F_NATIVE) && !defined(SIMDE_X86_AVX2_NATIVE)
+#define SIMDE_X86_AVX2_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_FMA_NATIVE) && !defined(SIMDE_X86_FMA_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_FMA)
+#define SIMDE_X86_FMA_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_FMA_NATIVE) && !defined(SIMDE_X86_AVX_NATIVE)
+#define SIMDE_X86_AVX_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX2_NATIVE) && !defined(SIMDE_X86_AVX2_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX2)
+#define SIMDE_X86_AVX2_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX2_NATIVE) && !defined(SIMDE_X86_AVX_NATIVE)
+#define SIMDE_X86_AVX_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_AVX_NATIVE) && !defined(SIMDE_X86_AVX_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_AVX)
+#define SIMDE_X86_AVX_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_AVX_NATIVE) && !defined(SIMDE_X86_SSE4_1_NATIVE)
+#define SIMDE_X86_SSE4_2_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_SSE4_2_NATIVE) && \
+	!defined(SIMDE_X86_SSE4_2_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SSE4_2)
+#define SIMDE_X86_SSE4_2_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_SSE4_2_NATIVE) && !defined(SIMDE_X86_SSE4_1_NATIVE)
+#define SIMDE_X86_SSE4_1_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_SSE4_1_NATIVE) && \
+	!defined(SIMDE_X86_SSE4_1_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SSE4_1)
+#define SIMDE_X86_SSE4_1_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_SSE4_1_NATIVE) && !defined(SIMDE_X86_SSSE3_NATIVE)
+#define SIMDE_X86_SSSE3_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_SSSE3_NATIVE) && !defined(SIMDE_X86_SSSE3_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SSSE3)
+#define SIMDE_X86_SSSE3_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_SSSE3_NATIVE) && !defined(SIMDE_X86_SSE3_NATIVE)
+#define SIMDE_X86_SSE3_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_SSE3_NATIVE) && !defined(SIMDE_X86_SSE3_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SSE3)
+#define SIMDE_X86_SSE3_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_SSE3_NATIVE) && !defined(SIMDE_X86_SSE2_NATIVE)
+#define SIMDE_X86_SSE2_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_SSE2_NATIVE) && !defined(SIMDE_X86_SSE2_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SSE2)
+#define SIMDE_X86_SSE2_NATIVE
+#endif
+#endif
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(SIMDE_X86_SSE_NATIVE)
+#define SIMDE_X86_SSE_NATIVE
+#endif
+
+#if !defined(SIMDE_X86_SSE_NATIVE) && !defined(SIMDE_X86_SSE_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_SSE)
+#define SIMDE_X86_SSE_NATIVE
+#endif
+#endif
+
+#if !defined(SIMDE_X86_MMX_NATIVE) && !defined(SIMDE_X86_MMX_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_MMX)
+#define SIMDE_X86_MMX_NATIVE
+#endif
+#endif
+
+#if !defined(SIMDE_X86_GFNI_NATIVE) && !defined(SIMDE_X86_GFNI_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_X86_GFNI)
+#define SIMDE_X86_GFNI_NATIVE
+#endif
+#endif
+
+#if !defined(SIMDE_X86_SVML_NATIVE) && !defined(SIMDE_X86_SVML_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if defined(__INTEL_COMPILER)
+#define SIMDE_X86_SVML_NATIVE
+#endif
+#endif
+
+#if defined(HEDLEY_MSVC_VERSION)
+#pragma warning(push)
+#pragma warning(disable : 4799)
+#endif
+
+#if defined(SIMDE_X86_AVX_NATIVE) || defined(SIMDE_X86_GFNI_NATIVE) || \
+	defined(SIMDE_X86_SVML_NATIVE)
+#include <immintrin.h>
+#elif defined(SIMDE_X86_SSE4_2_NATIVE)
+#include <nmmintrin.h>
+#elif defined(SIMDE_X86_SSE4_1_NATIVE)
+#include <smmintrin.h>
+#elif defined(SIMDE_X86_SSSE3_NATIVE)
+#include <tmmintrin.h>
+#elif defined(SIMDE_X86_SSE3_NATIVE)
+#include <pmmintrin.h>
+#elif defined(SIMDE_X86_SSE2_NATIVE)
+#include <emmintrin.h>
+#elif defined(SIMDE_X86_SSE_NATIVE)
+#include <xmmintrin.h>
+#elif defined(SIMDE_X86_MMX_NATIVE)
+#include <mmintrin.h>
+#endif
+
+#if defined(HEDLEY_MSVC_VERSION)
+#pragma warning(pop)
+#endif
+
+#if !defined(SIMDE_ARM_NEON_A64V8_NATIVE) && \
+	!defined(SIMDE_ARM_NEON_A64V8_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_ARM_NEON) && defined(SIMDE_ARCH_AARCH64) && \
+	SIMDE_ARCH_ARM_CHECK(80)
+#define SIMDE_ARM_NEON_A64V8_NATIVE
+#endif
+#endif
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE) && \
+	!defined(SIMDE_ARM_NEON_A32V8_NATIVE)
+#define SIMDE_ARM_NEON_A32V8_NATIVE
+#endif
+
+#if !defined(SIMDE_ARM_NEON_A32V8_NATIVE) && \
+	!defined(SIMDE_ARM_NEON_A32V8_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_ARM_NEON) && SIMDE_ARCH_ARM_CHECK(80)
+#define SIMDE_ARM_NEON_A32V8_NATIVE
+#endif
+#endif
+#if defined(SIMDE_ARM_NEON_A32V8_NATIVE) && \
+	!defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define SIMDE_ARM_NEON_A32V7_NATIVE
+#endif
+
+#if !defined(SIMDE_ARM_NEON_A32V7_NATIVE) && \
+	!defined(SIMDE_ARM_NEON_A32V7_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_ARM_NEON) && SIMDE_ARCH_ARM_CHECK(70)
+#define SIMDE_ARM_NEON_A32V7_NATIVE
+#endif
+#endif
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#include <arm_neon.h>
+#endif
+
+#if !defined(SIMDE_WASM_SIMD128_NATIVE) && \
+	!defined(SIMDE_WASM_SIMD128_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
+#if defined(SIMDE_ARCH_WASM_SIMD128)
+#define SIMDE_WASM_SIMD128_NATIVE
+#endif
+#endif
+#if defined(SIMDE_WASM_SIMD128_NATIVE)
+#if !defined(__wasm_unimplemented_simd128__)
+#define __wasm_unimplemented_simd128__
+#endif
+#include <wasm_simd128.h>
+#endif
+
+#if !defined(SIMDE_POWER_ALTIVEC_P9_NATIVE) &&        \
+	!defined(SIMDE_POWER_ALTIVEC_P9_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if SIMDE_ARCH_POWER_ALTIVEC_CHECK(900)
+#define SIMDE_POWER_ALTIVEC_P9_NATIVE
+#endif
+#endif
+#if defined(SIMDE_POWER_ALTIVEC_P9_NATIVE) && !defined(SIMDE_POWER_ALTIVEC_P8)
+#define SIMDE_POWER_ALTIVEC_P8_NATIVE
+#endif
+
+#if !defined(SIMDE_POWER_ALTIVEC_P8_NATIVE) &&        \
+	!defined(SIMDE_POWER_ALTIVEC_P8_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if SIMDE_ARCH_POWER_ALTIVEC_CHECK(800)
+#define SIMDE_POWER_ALTIVEC_P8_NATIVE
+#endif
+#endif
+#if defined(SIMDE_POWER_ALTIVEC_P8_NATIVE) && !defined(SIMDE_POWER_ALTIVEC_P7)
+#define SIMDE_POWER_ALTIVEC_P7_NATIVE
+#endif
+
+#if !defined(SIMDE_POWER_ALTIVEC_P7_NATIVE) &&        \
+	!defined(SIMDE_POWER_ALTIVEC_P7_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if SIMDE_ARCH_POWER_ALTIVEC_CHECK(700)
+#define SIMDE_POWER_ALTIVEC_P7_NATIVE
+#endif
+#endif
+#if defined(SIMDE_POWER_ALTIVEC_P7_NATIVE) && !defined(SIMDE_POWER_ALTIVEC_P6)
+#define SIMDE_POWER_ALTIVEC_P6_NATIVE
+#endif
+
+#if !defined(SIMDE_POWER_ALTIVEC_P6_NATIVE) &&        \
+	!defined(SIMDE_POWER_ALTIVEC_P6_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if SIMDE_ARCH_POWER_ALTIVEC_CHECK(600)
+#define SIMDE_POWER_ALTIVEC_P6_NATIVE
+#endif
+#endif
+#if defined(SIMDE_POWER_ALTIVEC_P6_NATIVE) && !defined(SIMDE_POWER_ALTIVEC_P5)
+#define SIMDE_POWER_ALTIVEC_P5_NATIVE
+#endif
+
+#if !defined(SIMDE_POWER_ALTIVEC_P5_NATIVE) &&        \
+	!defined(SIMDE_POWER_ALTIVEC_P5_NO_NATIVE) && \
+	!defined(SIMDE_NO_NATIVE)
+#if SIMDE_ARCH_POWER_ALTIVEC_CHECK(500)
+#define SIMDE_POWER_ALTIVEC_P5_NATIVE
+#endif
+#endif
+#if defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+/* stdbool.h conflicts with the bool in altivec.h */
+#if defined(bool) && !defined(SIMDE_POWER_ALTIVEC_NO_UNDEF_BOOL_)
+#undef bool
+#endif
+#include <altivec.h>
+/* GCC allows you to undefine these macros to prevent conflicts with
+   * standard types as they become context-sensitive keywords. */
+#if defined(__cplusplus)
+#if defined(vector)
+#undef vector
+#endif
+#if defined(pixel)
+#undef pixel
+#endif
+#if defined(bool)
+#undef bool
+#endif
+#define SIMDE_POWER_ALTIVEC_VECTOR(T) vector T
+#define SIMDE_POWER_ALTIVEC_PIXEL pixel
+#define SIMDE_POWER_ALTIVEC_BOOL bool
+#else
+#define SIMDE_POWER_ALTIVEC_VECTOR(T) __vector T
+#define SIMDE_POWER_ALTIVEC_PIXEL __pixel
+#define SIMDE_POWER_ALTIVEC_BOOL __bool
+#endif /* defined(__cplusplus) */
+#endif
+
+#endif /* !defined(SIMDE_FEATURES_H) */

obs-studio-26.0.0.tar.xz/libobs/util/simde/simde-math.h Added

@@ -0,0 +1,1414 @@
+/* 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>
+ */
+
+/* Attempt to find math functions.  Functions may be in <cmath>,
+ * <math.h>, compiler built-ins/intrinsics, or platform/architecture
+ * specific headers.  In some cases, especially those not built in to
+ * libm, we may need to define our own implementations. */
+
+#if !defined(SIMDE_MATH_H)
+
+#include "hedley.h"
+#include "simde-features.h"
+
+#if defined(__has_builtin)
+#define SIMDE_MATH_BUILTIN_LIBM(func) __has_builtin(__builtin_##func)
+#elif HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) || \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) || HEDLEY_GCC_VERSION_CHECK(4, 4, 0)
+#define SIMDE_MATH_BUILTIN_LIBM(func) (1)
+#else
+#define SIMDE_MATH_BUILTIN_LIBM(func) (0)
+#endif
+
+#if defined(HUGE_VAL)
+/* Looks like <math.h> or <cmath> has already been included. */
+
+/* The math.h from libc++ (yes, the C header from the C++ standard
+   * library) will define an isnan function, but not an isnan macro
+   * like the C standard requires.  So we detect the header guards
+   * macro libc++ uses. */
+#if defined(isnan) || (defined(_LIBCPP_MATH_H) && !defined(_LIBCPP_CMATH))
+#define SIMDE_MATH_HAVE_MATH_H
+#elif defined(__cplusplus)
+#define SIMDE_MATH_HAVE_CMATH
+#endif
+#elif defined(__has_include)
+#if defined(__cplusplus) && (__cplusplus >= 201103L) && __has_include(<cmath>)
+#define SIMDE_MATH_HAVE_CMATH
+#include <cmath>
+#elif __has_include(<math.h>)
+#define SIMDE_MATH_HAVE_MATH_H
+#include <math.h>
+#elif !defined(SIMDE_MATH_NO_LIBM)
+#define SIMDE_MATH_NO_LIBM
+#endif
+#elif !defined(SIMDE_MATH_NO_LIBM)
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
+#define SIMDE_MATH_HAVE_CMATH
+HEDLEY_DIAGNOSTIC_PUSH
+#if defined(HEDLEY_MSVC_VERSION)
+/* VS 14 emits this diagnostic about noexcept being used on a
+       * <cmath> function, which we can't do anything about. */
+#pragma warning(disable : 4996)
+#endif
+#include <cmath>
+HEDLEY_DIAGNOSTIC_POP
+#else
+#define SIMDE_MATH_HAVE_MATH_H
+#include <math.h>
+#endif
+#endif
+
+#if !defined(__cplusplus)
+/* If this is a problem we *might* be able to avoid including
+   * <complex.h> on some compilers (gcc, clang, and others which
+   * implement builtins like __builtin_cexpf).  If you don't have
+   * a <complex.h> please file an issue and we'll take a look. */
+#include <complex.h>
+
+#if !defined(HEDLEY_MSVC_VERSION)
+typedef float _Complex simde_cfloat32;
+typedef double _Complex simde_cfloat64;
+#else
+typedef _Fcomplex simde_cfloat32;
+typedef _Dcomplex simde_cfloat64;
+#endif
+#if HEDLEY_HAS_BUILTIN(__builtin_complex) || \
+	HEDLEY_GCC_VERSION_CHECK(4, 7, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0)
+#define SIMDE_MATH_CMPLX(x, y) __builtin_complex((double)(x), (double)(y))
+#define SIMDE_MATH_CMPLXF(x, y) __builtin_complex((float)(x), (float)(y))
+#elif defined(HEDLEY_MSVC_VERSION)
+#define SIMDE_MATH_CMPLX(x, y) ((simde_cfloat64){(x), (y)})
+#define SIMDE_MATH_CMPLXF(x, y) ((simde_cfloat32){(x), (y)})
+#elif defined(CMPLX) && defined(CMPLXF)
+#define SIMDE_MATH_CMPLX(x, y) CMPLX(x, y)
+#define SIMDE_MATH_CMPLXF(x, y) CMPLXF(x, y)
+#else
+/* CMPLX / CMPLXF are in C99, but these seem to be necessary in
+     * some compilers that aren't even MSVC. */
+#define SIMDE_MATH_CMPLX(x, y) \
+	(HEDLEY_STATIC_CAST(double, x) + HEDLEY_STATIC_CAST(double, y) * I)
+#define SIMDE_MATH_CMPLXF(x, y) \
+	(HEDLEY_STATIC_CAST(float, x) + HEDLEY_STATIC_CAST(float, y) * I)
+#endif
+
+#if !defined(simde_math_creal)
+#if SIMDE_MATH_BUILTIN_LIBM(creal)
+#define simde_math_creal(z) __builtin_creal(z)
+#else
+#define simde_math_creal(z) creal(z)
+#endif
+#endif
+
+#if !defined(simde_math_crealf)
+#if SIMDE_MATH_BUILTIN_LIBM(crealf)
+#define simde_math_crealf(z) __builtin_crealf(z)
+#else
+#define simde_math_crealf(z) crealf(z)
+#endif
+#endif
+
+#if !defined(simde_math_cimag)
+#if SIMDE_MATH_BUILTIN_LIBM(cimag)
+#define simde_math_cimag(z) __builtin_cimag(z)
+#else
+#define simde_math_cimag(z) cimag(z)
+#endif
+#endif
+
+#if !defined(simde_math_cimagf)
+#if SIMDE_MATH_BUILTIN_LIBM(cimagf)
+#define simde_math_cimagf(z) __builtin_cimagf(z)
+#else
+#define simde_math_cimagf(z) cimagf(z)
+#endif
+#endif
+#else
+
+HEDLEY_DIAGNOSTIC_PUSH
+#if defined(HEDLEY_MSVC_VERSION)
+#pragma warning(disable : 4530)
+#endif
+#include <complex>
+HEDLEY_DIAGNOSTIC_POP
+
+typedef std::complex<float> simde_cfloat32;
+typedef std::complex<double> simde_cfloat64;
+#define SIMDE_MATH_CMPLX(x, y) (std::complex<double>(x, y))
+#define SIMDE_MATH_CMPLXF(x, y) (std::complex<float>(x, y))
+
+#if !defined(simde_math_creal)
+#define simde_math_creal(z) ((z).real())
+#endif
+#if !defined(simde_math_crealf)
+#define simde_math_crealf(z) ((z).real())
+#endif
+#if !defined(simde_math_cimag)
+#define simde_math_cimag(z) ((z).imag())
+#endif
+#if !defined(simde_math_cimagf)
+#define simde_math_cimagf(z) ((z).imag())
+#endif
+#endif
+
+#if !defined(SIMDE_MATH_INFINITY)
+#if HEDLEY_HAS_BUILTIN(__builtin_inf) || HEDLEY_GCC_VERSION_CHECK(3, 3, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                               \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                  \
+	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0)
+#define SIMDE_MATH_INFINITY (__builtin_inf())
+#elif defined(INFINITY)
+#define SIMDE_MATH_INFINITY INFINITY
+#endif
+#endif
+
+#if !defined(SIMDE_INFINITYF)
+#if HEDLEY_HAS_BUILTIN(__builtin_inff) || HEDLEY_GCC_VERSION_CHECK(3, 3, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                                \
+	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0) ||                                  \
+	HEDLEY_IBM_VERSION_CHECK(13, 1, 0)
+#define SIMDE_MATH_INFINITYF (__builtin_inff())
+#elif defined(INFINITYF)
+#define SIMDE_MATH_INFINITYF INFINITYF
+#elif defined(SIMDE_MATH_INFINITY)
+#define SIMDE_MATH_INFINITYF HEDLEY_STATIC_CAST(float, SIMDE_MATH_INFINITY)
+#endif
+#endif
+
+#if !defined(SIMDE_MATH_NAN)
+#if HEDLEY_HAS_BUILTIN(__builtin_nan) || HEDLEY_GCC_VERSION_CHECK(3, 3, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                               \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                  \
+	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0) ||                                 \
+	HEDLEY_IBM_VERSION_CHECK(13, 1, 0)
+#define SIMDE_MATH_NAN (__builtin_nan(""))
+#elif defined(NAN)
+#define SIMDE_MATH_NAN NAN
+#endif
+#endif
+
+#if !defined(SIMDE_NANF)
+#if HEDLEY_HAS_BUILTIN(__builtin_nanf) || HEDLEY_GCC_VERSION_CHECK(3, 3, 0) || \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) ||                                \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0) ||                                   \
+	HEDLEY_CRAY_VERSION_CHECK(8, 1, 0)
+#define SIMDE_MATH_NANF (__builtin_nanf(""))
+#elif defined(NANF)
+#define SIMDE_MATH_NANF NANF
+#elif defined(SIMDE_MATH_NAN)
+#define SIMDE_MATH_NANF HEDLEY_STATIC_CAST(float, SIMDE_MATH_NAN)
+#endif
+#endif
+
+#if !defined(SIMDE_MATH_PI)
+#if defined(M_PI)
+#define SIMDE_MATH_PI M_PI
+#else
+#define SIMDE_MATH_PI 3.14159265358979323846
+#endif
+#endif
+
+#if !defined(SIMDE_MATH_PIF)
+#if defined(M_PI)
+#define SIMDE_MATH_PIF HEDLEY_STATIC_CAST(float, M_PI)
+#else
+#define SIMDE_MATH_PIF 3.14159265358979323846f
+#endif
+#endif
+
+#if !defined(SIMDE_MATH_FLT_MIN)
+#if defined(FLT_MIN)
+#define SIMDE_MATH_FLT_MIN FLT_MIN
+#elif defined(__FLT_MIN__)
+#define SIMDE_MATH_FLT_MIN __FLT_MIN__
+#elif defined(__cplusplus)
+#include <cfloat>
+#define SIMDE_MATH_FLT_MIN FLT_MIN
+#else
+#include <float.h>
+#define SIMDE_MATH_FLT_MIN FLT_MIN
+#endif
+#endif
+
+#if !defined(SIMDE_MATH_DBL_MIN)
+#if defined(DBL_MIN)
+#define SIMDE_MATH_DBL_MIN DBL_MIN
+#elif defined(__DBL_MIN__)
+#define SIMDE_MATH_DBL_MIN __DBL_MIN__
+#elif defined(__cplusplus)
+#include <cfloat>
+#define SIMDE_MATH_DBL_MIN DBL_MIN
+#else
+#include <float.h>
+#define SIMDE_MATH_DBL_MIN DBL_MIN
+#endif
+#endif
+
+/*** Classification macros from C99 ***/
+
+#if !defined(simde_math_isinf)
+#if SIMDE_MATH_BUILTIN_LIBM(isinf)
+#define simde_math_isinf(v) __builtin_isinf(v)
+#elif defined(isinf) || defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_isinf(v) isinf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_isinf(v) std::isinf(v)
+#endif
+#endif
+
+#if !defined(simde_math_isinff)
+#if HEDLEY_HAS_BUILTIN(__builtin_isinff) ||     \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) || \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0)
+#define simde_math_isinff(v) __builtin_isinff(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_isinff(v) std::isinf(v)
+#elif defined(simde_math_isinf)
+#define simde_math_isinff(v) simde_math_isinf(HEDLEY_STATIC_CAST(double, v))
+#endif
+#endif
+
+#if !defined(simde_math_isnan)
+#if SIMDE_MATH_BUILTIN_LIBM(isnan)
+#define simde_math_isnan(v) __builtin_isnan(v)
+#elif defined(isnan) || defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_isnan(v) isnan(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_isnan(v) std::isnan(v)
+#endif
+#endif
+
+#if !defined(simde_math_isnanf)
+#if HEDLEY_HAS_BUILTIN(__builtin_isnanf) ||     \
+	HEDLEY_INTEL_VERSION_CHECK(13, 0, 0) || \
+	HEDLEY_ARM_VERSION_CHECK(4, 1, 0)
+/* XL C/C++ has __builtin_isnan but not __builtin_isnanf */
+#define simde_math_isnanf(v) __builtin_isnanf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_isnanf(v) std::isnan(v)
+#elif defined(simde_math_isnan)
+#define simde_math_isnanf(v) simde_math_isnan(HEDLEY_STATIC_CAST(double, v))
+#endif
+#endif
+
+#if !defined(simde_math_isnormal)
+#if SIMDE_MATH_BUILTIN_LIBM(isnormal)
+#define simde_math_isnormal(v) __builtin_isnormal(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_isnormal(v) isnormal(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_isnormal(v) std::isnormal(v)
+#endif
+#endif
+
+#if !defined(simde_math_isnormalf)
+#if HEDLEY_HAS_BUILTIN(__builtin_isnormalf)
+#define simde_math_isnormalf(v) __builtin_isnormalf(v)
+#elif SIMDE_MATH_BUILTIN_LIBM(isnormal)
+#define simde_math_isnormalf(v) __builtin_isnormal(v)
+#elif defined(isnormalf)
+#define simde_math_isnormalf(v) isnormalf(v)
+#elif defined(isnormal) || defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_isnormalf(v) isnormal(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_isnormalf(v) std::isnormal(v)
+#elif defined(simde_math_isnormal)
+#define simde_math_isnormalf(v) simde_math_isnormal(v)
+#endif
+#endif
+
+/*** Functions from C99 ***/
+
+#if !defined(simde_math_abs)
+#if SIMDE_MATH_BUILTIN_LIBM(abs)
+#define simde_math_abs(v) __builtin_abs(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_abs(v) std::abs(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_abs(v) abs(v)
+#endif
+#endif
+
+#if !defined(simde_math_absf)
+#if SIMDE_MATH_BUILTIN_LIBM(absf)
+#define simde_math_absf(v) __builtin_absf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_absf(v) std::abs(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_absf(v) absf(v)
+#endif
+#endif
+
+#if !defined(simde_math_acos)
+#if SIMDE_MATH_BUILTIN_LIBM(acos)
+#define simde_math_acos(v) __builtin_acos(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_acos(v) std::acos(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_acos(v) acos(v)
+#endif
+#endif
+
+#if !defined(simde_math_acosf)
+#if SIMDE_MATH_BUILTIN_LIBM(acosf)
+#define simde_math_acosf(v) __builtin_acosf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_acosf(v) std::acos(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_acosf(v) acosf(v)
+#endif
+#endif
+
+#if !defined(simde_math_acosh)
+#if SIMDE_MATH_BUILTIN_LIBM(acosh)
+#define simde_math_acosh(v) __builtin_acosh(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_acosh(v) std::acosh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_acosh(v) acosh(v)
+#endif
+#endif
+
+#if !defined(simde_math_acoshf)
+#if SIMDE_MATH_BUILTIN_LIBM(acoshf)
+#define simde_math_acoshf(v) __builtin_acoshf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_acoshf(v) std::acosh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_acoshf(v) acoshf(v)
+#endif
+#endif
+
+#if !defined(simde_math_asin)
+#if SIMDE_MATH_BUILTIN_LIBM(asin)
+#define simde_math_asin(v) __builtin_asin(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_asin(v) std::asin(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_asin(v) asin(v)
+#endif
+#endif
+
+#if !defined(simde_math_asinf)
+#if SIMDE_MATH_BUILTIN_LIBM(asinf)
+#define simde_math_asinf(v) __builtin_asinf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_asinf(v) std::asin(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_asinf(v) asinf(v)
+#endif
+#endif
+
+#if !defined(simde_math_asinh)
+#if SIMDE_MATH_BUILTIN_LIBM(asinh)
+#define simde_math_asinh(v) __builtin_asinh(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_asinh(v) std::asinh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_asinh(v) asinh(v)
+#endif
+#endif
+
+#if !defined(simde_math_asinhf)
+#if SIMDE_MATH_BUILTIN_LIBM(asinhf)
+#define simde_math_asinhf(v) __builtin_asinhf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_asinhf(v) std::asinh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_asinhf(v) asinhf(v)
+#endif
+#endif
+
+#if !defined(simde_math_atan)
+#if SIMDE_MATH_BUILTIN_LIBM(atan)
+#define simde_math_atan(v) __builtin_atan(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_atan(v) std::atan(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_atan(v) atan(v)
+#endif
+#endif
+
+#if !defined(simde_math_atan2)
+#if SIMDE_MATH_BUILTIN_LIBM(atan2)
+#define simde_math_atan2(y, x) __builtin_atan2(y, x)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_atan2(y, x) std::atan2(y, x)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_atan2(y, x) atan2(y, x)
+#endif
+#endif
+
+#if !defined(simde_math_atan2f)
+#if SIMDE_MATH_BUILTIN_LIBM(atan2f)
+#define simde_math_atan2f(y, x) __builtin_atan2f(y, x)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_atan2f(y, x) std::atan2(y, x)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_atan2f(y, x) atan2f(y, x)
+#endif
+#endif
+
+#if !defined(simde_math_atanf)
+#if SIMDE_MATH_BUILTIN_LIBM(atanf)
+#define simde_math_atanf(v) __builtin_atanf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_atanf(v) std::atan(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_atanf(v) atanf(v)
+#endif
+#endif
+
+#if !defined(simde_math_atanh)
+#if SIMDE_MATH_BUILTIN_LIBM(atanh)
+#define simde_math_atanh(v) __builtin_atanh(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_atanh(v) std::atanh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_atanh(v) atanh(v)
+#endif
+#endif
+
+#if !defined(simde_math_atanhf)
+#if SIMDE_MATH_BUILTIN_LIBM(atanhf)
+#define simde_math_atanhf(v) __builtin_atanhf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_atanhf(v) std::atanh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_atanhf(v) atanhf(v)
+#endif
+#endif
+
+#if !defined(simde_math_cbrt)
+#if SIMDE_MATH_BUILTIN_LIBM(cbrt)
+#define simde_math_cbrt(v) __builtin_cbrt(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_cbrt(v) std::cbrt(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cbrt(v) cbrt(v)
+#endif
+#endif
+
+#if !defined(simde_math_cbrtf)
+#if SIMDE_MATH_BUILTIN_LIBM(cbrtf)
+#define simde_math_cbrtf(v) __builtin_cbrtf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_cbrtf(v) std::cbrt(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cbrtf(v) cbrtf(v)
+#endif
+#endif
+
+#if !defined(simde_math_ceil)
+#if SIMDE_MATH_BUILTIN_LIBM(ceil)
+#define simde_math_ceil(v) __builtin_ceil(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_ceil(v) std::ceil(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_ceil(v) ceil(v)
+#endif
+#endif
+
+#if !defined(simde_math_ceilf)
+#if SIMDE_MATH_BUILTIN_LIBM(ceilf)
+#define simde_math_ceilf(v) __builtin_ceilf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_ceilf(v) std::ceil(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_ceilf(v) ceilf(v)
+#endif
+#endif
+
+#if !defined(simde_math_copysign)
+#if SIMDE_MATH_BUILTIN_LIBM(copysign)
+#define simde_math_copysign(x, y) __builtin_copysign(x, y)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_copysign(x, y) std::copysign(x, y)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_copysign(x, y) copysign(x, y)
+#endif
+#endif
+
+#if !defined(simde_math_copysignf)
+#if SIMDE_MATH_BUILTIN_LIBM(copysignf)
+#define simde_math_copysignf(x, y) __builtin_copysignf(x, y)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_copysignf(x, y) std::copysignf(x, y)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_copysignf(x, y) copysignf(x, y)
+#endif
+#endif
+
+#if !defined(simde_math_cos)
+#if SIMDE_MATH_BUILTIN_LIBM(cos)
+#define simde_math_cos(v) __builtin_cos(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_cos(v) std::cos(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cos(v) cos(v)
+#endif
+#endif
+
+#if !defined(simde_math_cosf)
+#if SIMDE_MATH_BUILTIN_LIBM(cosf)
+#define simde_math_cosf(v) __builtin_cosf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_cosf(v) std::cos(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cosf(v) cosf(v)
+#endif
+#endif
+
+#if !defined(simde_math_cosh)
+#if SIMDE_MATH_BUILTIN_LIBM(cosh)
+#define simde_math_cosh(v) __builtin_cosh(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_cosh(v) std::cosh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cosh(v) cosh(v)
+#endif
+#endif
+
+#if !defined(simde_math_coshf)
+#if SIMDE_MATH_BUILTIN_LIBM(coshf)
+#define simde_math_coshf(v) __builtin_coshf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_coshf(v) std::cosh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_coshf(v) coshf(v)
+#endif
+#endif
+
+#if !defined(simde_math_erf)
+#if SIMDE_MATH_BUILTIN_LIBM(erf)
+#define simde_math_erf(v) __builtin_erf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_erf(v) std::erf(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_erf(v) erf(v)
+#endif
+#endif
+
+#if !defined(simde_math_erff)
+#if SIMDE_MATH_BUILTIN_LIBM(erff)
+#define simde_math_erff(v) __builtin_erff(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_erff(v) std::erf(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_erff(v) erff(v)
+#endif
+#endif
+
+#if !defined(simde_math_erfc)
+#if SIMDE_MATH_BUILTIN_LIBM(erfc)
+#define simde_math_erfc(v) __builtin_erfc(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_erfc(v) std::erfc(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_erfc(v) erfc(v)
+#endif
+#endif
+
+#if !defined(simde_math_erfcf)
+#if SIMDE_MATH_BUILTIN_LIBM(erfcf)
+#define simde_math_erfcf(v) __builtin_erfcf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_erfcf(v) std::erfc(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_erfcf(v) erfcf(v)
+#endif
+#endif
+
+#if !defined(simde_math_exp)
+#if SIMDE_MATH_BUILTIN_LIBM(exp)
+#define simde_math_exp(v) __builtin_exp(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_exp(v) std::exp(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_exp(v) exp(v)
+#endif
+#endif
+
+#if !defined(simde_math_expf)
+#if SIMDE_MATH_BUILTIN_LIBM(expf)
+#define simde_math_expf(v) __builtin_expf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_expf(v) std::exp(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_expf(v) expf(v)
+#endif
+#endif
+
+#if !defined(simde_math_expm1)
+#if SIMDE_MATH_BUILTIN_LIBM(expm1)
+#define simde_math_expm1(v) __builtin_expm1(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_expm1(v) std::expm1(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_expm1(v) expm1(v)
+#endif
+#endif
+
+#if !defined(simde_math_expm1f)
+#if SIMDE_MATH_BUILTIN_LIBM(expm1f)
+#define simde_math_expm1f(v) __builtin_expm1f(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_expm1f(v) std::expm1(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_expm1f(v) expm1f(v)
+#endif
+#endif
+
+#if !defined(simde_math_exp2)
+#if SIMDE_MATH_BUILTIN_LIBM(exp2)
+#define simde_math_exp2(v) __builtin_exp2(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_exp2(v) std::exp2(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_exp2(v) exp2(v)
+#endif
+#endif
+
+#if !defined(simde_math_exp2f)
+#if SIMDE_MATH_BUILTIN_LIBM(exp2f)
+#define simde_math_exp2f(v) __builtin_exp2f(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_exp2f(v) std::exp2(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_exp2f(v) exp2f(v)
+#endif
+#endif
+
+#if HEDLEY_HAS_BUILTIN(__builtin_exp10) || HEDLEY_GCC_VERSION_CHECK(3, 4, 0)
+#define simde_math_exp10(v) __builtin_exp10(v)
+#else
+#define simde_math_exp10(v) pow(10.0, (v))
+#endif
+
+#if HEDLEY_HAS_BUILTIN(__builtin_exp10f) || HEDLEY_GCC_VERSION_CHECK(3, 4, 0)
+#define simde_math_exp10f(v) __builtin_exp10f(v)
+#else
+#define simde_math_exp10f(v) powf(10.0f, (v))
+#endif
+
+#if !defined(simde_math_fabs)
+#if SIMDE_MATH_BUILTIN_LIBM(fabs)
+#define simde_math_fabs(v) __builtin_fabs(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_fabs(v) std::fabs(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_fabs(v) fabs(v)
+#endif
+#endif
+
+#if !defined(simde_math_fabsf)
+#if SIMDE_MATH_BUILTIN_LIBM(fabsf)
+#define simde_math_fabsf(v) __builtin_fabsf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_fabsf(v) std::fabs(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_fabsf(v) fabsf(v)
+#endif
+#endif
+
+#if !defined(simde_math_floor)
+#if SIMDE_MATH_BUILTIN_LIBM(floor)
+#define simde_math_floor(v) __builtin_floor(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_floor(v) std::floor(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_floor(v) floor(v)
+#endif
+#endif
+
+#if !defined(simde_math_floorf)
+#if SIMDE_MATH_BUILTIN_LIBM(floorf)
+#define simde_math_floorf(v) __builtin_floorf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_floorf(v) std::floor(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_floorf(v) floorf(v)
+#endif
+#endif
+
+#if !defined(simde_math_hypot)
+#if SIMDE_MATH_BUILTIN_LIBM(hypot)
+#define simde_math_hypot(y, x) __builtin_hypot(y, x)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_hypot(y, x) std::hypot(y, x)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_hypot(y, x) hypot(y, x)
+#endif
+#endif
+
+#if !defined(simde_math_hypotf)
+#if SIMDE_MATH_BUILTIN_LIBM(hypotf)
+#define simde_math_hypotf(y, x) __builtin_hypotf(y, x)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_hypotf(y, x) std::hypot(y, x)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_hypotf(y, x) hypotf(y, x)
+#endif
+#endif
+
+#if !defined(simde_math_log)
+#if SIMDE_MATH_BUILTIN_LIBM(log)
+#define simde_math_log(v) __builtin_log(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log(v) std::log(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log(v) log(v)
+#endif
+#endif
+
+#if !defined(simde_math_logf)
+#if SIMDE_MATH_BUILTIN_LIBM(logf)
+#define simde_math_logf(v) __builtin_logf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_logf(v) std::log(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_logf(v) logf(v)
+#endif
+#endif
+
+#if !defined(simde_math_logb)
+#if SIMDE_MATH_BUILTIN_LIBM(logb)
+#define simde_math_logb(v) __builtin_logb(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_logb(v) std::logb(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_logb(v) logb(v)
+#endif
+#endif
+
+#if !defined(simde_math_logbf)
+#if SIMDE_MATH_BUILTIN_LIBM(logbf)
+#define simde_math_logbf(v) __builtin_logbf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_logbf(v) std::logb(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_logbf(v) logbf(v)
+#endif
+#endif
+
+#if !defined(simde_math_log1p)
+#if SIMDE_MATH_BUILTIN_LIBM(log1p)
+#define simde_math_log1p(v) __builtin_log1p(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log1p(v) std::log1p(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log1p(v) log1p(v)
+#endif
+#endif
+
+#if !defined(simde_math_log1pf)
+#if SIMDE_MATH_BUILTIN_LIBM(log1pf)
+#define simde_math_log1pf(v) __builtin_log1pf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log1pf(v) std::log1p(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log1pf(v) log1pf(v)
+#endif
+#endif
+
+#if !defined(simde_math_log2)
+#if SIMDE_MATH_BUILTIN_LIBM(log2)
+#define simde_math_log2(v) __builtin_log2(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log2(v) std::log2(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log2(v) log2(v)
+#endif
+#endif
+
+#if !defined(simde_math_log2f)
+#if SIMDE_MATH_BUILTIN_LIBM(log2f)
+#define simde_math_log2f(v) __builtin_log2f(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log2f(v) std::log2(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log2f(v) log2f(v)
+#endif
+#endif
+
+#if !defined(simde_math_log10)
+#if SIMDE_MATH_BUILTIN_LIBM(log10)
+#define simde_math_log10(v) __builtin_log10(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log10(v) std::log10(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log10(v) log10(v)
+#endif
+#endif
+
+#if !defined(simde_math_log10f)
+#if SIMDE_MATH_BUILTIN_LIBM(log10f)
+#define simde_math_log10f(v) __builtin_log10f(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_log10f(v) std::log10(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_log10f(v) log10f(v)
+#endif
+#endif
+
+#if !defined(simde_math_nearbyint)
+#if SIMDE_MATH_BUILTIN_LIBM(nearbyint)
+#define simde_math_nearbyint(v) __builtin_nearbyint(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_nearbyint(v) std::nearbyint(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_nearbyint(v) nearbyint(v)
+#endif
+#endif
+
+#if !defined(simde_math_nearbyintf)
+#if SIMDE_MATH_BUILTIN_LIBM(nearbyintf)
+#define simde_math_nearbyintf(v) __builtin_nearbyintf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_nearbyintf(v) std::nearbyint(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_nearbyintf(v) nearbyintf(v)
+#endif
+#endif
+
+#if !defined(simde_math_pow)
+#if SIMDE_MATH_BUILTIN_LIBM(pow)
+#define simde_math_pow(y, x) __builtin_pow(y, x)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_pow(y, x) std::pow(y, x)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_pow(y, x) pow(y, x)
+#endif
+#endif
+
+#if !defined(simde_math_powf)
+#if SIMDE_MATH_BUILTIN_LIBM(powf)
+#define simde_math_powf(y, x) __builtin_powf(y, x)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_powf(y, x) std::pow(y, x)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_powf(y, x) powf(y, x)
+#endif
+#endif
+
+#if !defined(simde_math_rint)
+#if SIMDE_MATH_BUILTIN_LIBM(rint)
+#define simde_math_rint(v) __builtin_rint(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_rint(v) std::rint(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_rint(v) rint(v)
+#endif
+#endif
+
+#if !defined(simde_math_rintf)
+#if SIMDE_MATH_BUILTIN_LIBM(rintf)
+#define simde_math_rintf(v) __builtin_rintf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_rintf(v) std::rint(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_rintf(v) rintf(v)
+#endif
+#endif
+
+#if !defined(simde_math_round)
+#if SIMDE_MATH_BUILTIN_LIBM(round)
+#define simde_math_round(v) __builtin_round(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_round(v) std::round(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_round(v) round(v)
+#endif
+#endif
+
+#if !defined(simde_math_roundf)
+#if SIMDE_MATH_BUILTIN_LIBM(roundf)
+#define simde_math_roundf(v) __builtin_roundf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_roundf(v) std::round(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_roundf(v) roundf(v)
+#endif
+#endif
+
+#if !defined(simde_math_sin)
+#if SIMDE_MATH_BUILTIN_LIBM(sin)
+#define simde_math_sin(v) __builtin_sin(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_sin(v) std::sin(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_sin(v) sin(v)
+#endif
+#endif
+
+#if !defined(simde_math_sinf)
+#if SIMDE_MATH_BUILTIN_LIBM(sinf)
+#define simde_math_sinf(v) __builtin_sinf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_sinf(v) std::sin(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_sinf(v) sinf(v)
+#endif
+#endif
+
+#if !defined(simde_math_sinh)
+#if SIMDE_MATH_BUILTIN_LIBM(sinh)
+#define simde_math_sinh(v) __builtin_sinh(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_sinh(v) std::sinh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_sinh(v) sinh(v)
+#endif
+#endif
+
+#if !defined(simde_math_sinhf)
+#if SIMDE_MATH_BUILTIN_LIBM(sinhf)
+#define simde_math_sinhf(v) __builtin_sinhf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_sinhf(v) std::sinh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_sinhf(v) sinhf(v)
+#endif
+#endif
+
+#if !defined(simde_math_sqrt)
+#if SIMDE_MATH_BUILTIN_LIBM(sqrt)
+#define simde_math_sqrt(v) __builtin_sqrt(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_sqrt(v) std::sqrt(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_sqrt(v) sqrt(v)
+#endif
+#endif
+
+#if !defined(simde_math_sqrtf)
+#if SIMDE_MATH_BUILTIN_LIBM(sqrtf)
+#define simde_math_sqrtf(v) __builtin_sqrtf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_sqrtf(v) std::sqrt(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_sqrtf(v) sqrtf(v)
+#endif
+#endif
+
+#if !defined(simde_math_tan)
+#if SIMDE_MATH_BUILTIN_LIBM(tan)
+#define simde_math_tan(v) __builtin_tan(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_tan(v) std::tan(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_tan(v) tan(v)
+#endif
+#endif
+
+#if !defined(simde_math_tanf)
+#if SIMDE_MATH_BUILTIN_LIBM(tanf)
+#define simde_math_tanf(v) __builtin_tanf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_tanf(v) std::tan(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_tanf(v) tanf(v)
+#endif
+#endif
+
+#if !defined(simde_math_tanh)
+#if SIMDE_MATH_BUILTIN_LIBM(tanh)
+#define simde_math_tanh(v) __builtin_tanh(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_tanh(v) std::tanh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_tanh(v) tanh(v)
+#endif
+#endif
+
+#if !defined(simde_math_tanhf)
+#if SIMDE_MATH_BUILTIN_LIBM(tanhf)
+#define simde_math_tanhf(v) __builtin_tanhf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_tanhf(v) std::tanh(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_tanhf(v) tanhf(v)
+#endif
+#endif
+
+#if !defined(simde_math_trunc)
+#if SIMDE_MATH_BUILTIN_LIBM(trunc)
+#define simde_math_trunc(v) __builtin_trunc(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_trunc(v) std::trunc(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_trunc(v) trunc(v)
+#endif
+#endif
+
+#if !defined(simde_math_truncf)
+#if SIMDE_MATH_BUILTIN_LIBM(truncf)
+#define simde_math_truncf(v) __builtin_truncf(v)
+#elif defined(SIMDE_MATH_HAVE_CMATH)
+#define simde_math_truncf(v) std::trunc(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_truncf(v) truncf(v)
+#endif
+#endif
+
+/***  Complex functions ***/
+
+#if !defined(simde_math_cexp)
+#if defined(__cplusplus)
+#define simde_math_cexp(v) std::cexp(v)
+#elif SIMDE_MATH_BUILTIN_LIBM(cexp)
+#define simde_math_cexp(v) __builtin_cexp(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cexp(v) cexp(v)
+#endif
+#endif
+
+#if !defined(simde_math_cexpf)
+#if defined(__cplusplus)
+#define simde_math_cexpf(v) std::exp(v)
+#elif SIMDE_MATH_BUILTIN_LIBM(cexpf)
+#define simde_math_cexpf(v) __builtin_cexpf(v)
+#elif defined(SIMDE_MATH_HAVE_MATH_H)
+#define simde_math_cexpf(v) cexpf(v)
+#endif
+#endif
+
+/*** Additional functions not in libm ***/
+
+#if defined(simde_math_fabs) && defined(simde_math_sqrt) && \
+	defined(simde_math_exp)
+static HEDLEY_INLINE double simde_math_cdfnorm(double x)
+{
+	/* https://www.johndcook.com/blog/cpp_phi/
+    * Public Domain */
+	static const double a1 = 0.254829592;
+	static const double a2 = -0.284496736;
+	static const double a3 = 1.421413741;
+	static const double a4 = -1.453152027;
+	static const double a5 = 1.061405429;
+	static const double p = 0.3275911;
+
+	const int sign = x < 0;
+	x = simde_math_fabs(x) / simde_math_sqrt(2.0);
+
+	/* A&S formula 7.1.26 */
+	double t = 1.0 / (1.0 + p * x);
+	double y = 1.0 - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t *
+				 simde_math_exp(-x * x);
+
+	return 0.5 * (1.0 + (sign ? -y : y));
+}
+#define simde_math_cdfnorm simde_math_cdfnorm
+#endif
+
+#if defined(simde_math_fabsf) && defined(simde_math_sqrtf) && \
+	defined(simde_math_expf)
+static HEDLEY_INLINE float simde_math_cdfnormf(float x)
+{
+	/* https://www.johndcook.com/blog/cpp_phi/
+    * Public Domain */
+	static const float a1 = 0.254829592f;
+	static const float a2 = -0.284496736f;
+	static const float a3 = 1.421413741f;
+	static const float a4 = -1.453152027f;
+	static const float a5 = 1.061405429f;
+	static const float p = 0.3275911f;
+
+	const int sign = x < 0;
+	x = simde_math_fabsf(x) / simde_math_sqrtf(2.0f);
+
+	/* A&S formula 7.1.26 */
+	float t = 1.0f / (1.0f + p * x);
+	float y = 1.0f - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t *
+				 simde_math_expf(-x * x);
+
+	return 0.5f * (1.0f + (sign ? -y : y));
+}
+#define simde_math_cdfnormf simde_math_cdfnormf
+#endif
+
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_FLOAT_EQUAL_
+
+#if !defined(simde_math_cdfnorminv) && defined(simde_math_log) && \
+	defined(simde_math_sqrt)
+/*https://web.archive.org/web/20150910081113/http://home.online.no/~pjacklam/notes/invnorm/impl/sprouse/ltqnorm.c*/
+static HEDLEY_INLINE double simde_math_cdfnorminv(double p)
+{
+	static const double a[] = {
+		-3.969683028665376e+01, 2.209460984245205e+02,
+		-2.759285104469687e+02, 1.383577518672690e+02,
+		-3.066479806614716e+01, 2.506628277459239e+00};
+
+	static const double b[] = {-5.447609879822406e+01,
+				   1.615858368580409e+02,
+				   -1.556989798598866e+02,
+				   6.680131188771972e+01,
+				   -1.328068155288572e+01};
+
+	static const double c[] = {
+		-7.784894002430293e-03, -3.223964580411365e-01,
+		-2.400758277161838e+00, -2.549732539343734e+00,
+		4.374664141464968e+00,  2.938163982698783e+00};
+
+	static const double d[] = {7.784695709041462e-03, 3.224671290700398e-01,
+				   2.445134137142996e+00,
+				   3.754408661907416e+00};
+
+	static const double low = 0.02425;
+	static const double high = 0.97575;
+	double q, r;
+
+	if (p < 0 || p > 1) {
+		return 0.0;
+	} else if (p == 0) {
+		return -SIMDE_MATH_INFINITY;
+	} else if (p == 1) {
+		return SIMDE_MATH_INFINITY;
+	} else if (p < low) {
+		q = simde_math_sqrt(-2.0 * simde_math_log(p));
+		return (((((c[0] * q + c[1]) * q + c[2]) * q + c[3]) * q +
+			 c[4]) * q +
+			c[5]) /
+		       (((((d[0] * q + d[1]) * q + d[2]) * q + d[3]) * q + 1));
+	} else if (p > high) {
+		q = simde_math_sqrt(-2.0 * simde_math_log(1.0 - p));
+		return -(((((c[0] * q + c[1]) * q + c[2]) * q + c[3]) * q +
+			  c[4]) * q +
+			 c[5]) /
+		       (((((d[0] * q + d[1]) * q + d[2]) * q + d[3]) * q + 1));
+	} else {
+		q = p - 0.5;
+		r = q * q;
+		return (((((a[0] * r + a[1]) * r + a[2]) * r + a[3]) * r +
+			 a[4]) * r +
+			a[5]) *
+		       q /
+		       (((((b[0] * r + b[1]) * r + b[2]) * r + b[3]) * r +
+			 b[4]) * r +
+			1);
+	}
+}
+#define simde_math_cdfnorminv simde_math_cdfnorminv
+#endif
+
+#if !defined(simde_math_cdfnorminvf) && defined(simde_math_logf) && \
+	defined(simde_math_sqrtf)
+static HEDLEY_INLINE float simde_math_cdfnorminvf(float p)
+{
+	static const float a[] = {
+		-3.969683028665376e+01f, 2.209460984245205e+02f,
+		-2.759285104469687e+02f, 1.383577518672690e+02f,
+		-3.066479806614716e+01f, 2.506628277459239e+00f};
+	static const float b[] = {-5.447609879822406e+01f,
+				  1.615858368580409e+02f,
+				  -1.556989798598866e+02f,
+				  6.680131188771972e+01f,
+				  -1.328068155288572e+01f};
+	static const float c[] = {
+		-7.784894002430293e-03f, -3.223964580411365e-01f,
+		-2.400758277161838e+00f, -2.549732539343734e+00f,
+		4.374664141464968e+00f,  2.938163982698783e+00f};
+	static const float d[] = {7.784695709041462e-03f,
+				  3.224671290700398e-01f,
+				  2.445134137142996e+00f,
+				  3.754408661907416e+00f};
+	static const float low = 0.02425f;
+	static const float high = 0.97575f;
+	float q, r;
+
+	if (p < 0 || p > 1) {
+		return 0.0f;
+	} else if (p == 0) {
+		return -SIMDE_MATH_INFINITYF;
+	} else if (p == 1) {
+		return SIMDE_MATH_INFINITYF;
+	} else if (p < low) {
+		q = simde_math_sqrtf(-2.0f * simde_math_logf(p));
+		return (((((c[0] * q + c[1]) * q + c[2]) * q + c[3]) * q +
+			 c[4]) * q +
+			c[5]) /
+		       (((((d[0] * q + d[1]) * q + d[2]) * q + d[3]) * q + 1));
+	} else if (p > high) {
+		q = simde_math_sqrtf(-2.0f * simde_math_logf(1.0f - p));
+		return -(((((c[0] * q + c[1]) * q + c[2]) * q + c[3]) * q +
+			  c[4]) * q +
+			 c[5]) /
+		       (((((d[0] * q + d[1]) * q + d[2]) * q + d[3]) * q + 1));
+	} else {
+		q = p - 0.5f;
+		r = q * q;
+		return (((((a[0] * r + a[1]) * r + a[2]) * r + a[3]) * r +
+			 a[4]) * r +
+			a[5]) *
+		       q /
+		       (((((b[0] * r + b[1]) * r + b[2]) * r + b[3]) * r +
+			 b[4]) * r +
+			1);
+	}
+}
+#define simde_math_cdfnorminvf simde_math_cdfnorminvf
+#endif
+
+#if !defined(simde_math_erfinv) && defined(simde_math_log) && \
+	defined(simde_math_copysign) && defined(simde_math_sqrt)
+static HEDLEY_INLINE double simde_math_erfinv(double x)
+{
+	/* https://stackoverflow.com/questions/27229371/inverse-error-function-in-c
+     *
+     * The original answer on SO uses a constant of 0.147, but in my
+     * testing 0.14829094707965850830078125 gives a lower average absolute error
+     * (0.0001410958211636170744895935 vs. 0.0001465479290345683693885803).
+     * That said, if your goal is to minimize the *maximum* absolute
+     * error, 0.15449436008930206298828125 provides significantly better
+     * results; 0.0009250640869140625000000000 vs ~ 0.005. */
+	double tt1, tt2, lnx;
+	double sgn = simde_math_copysign(1.0, x);
+
+	x = (1.0 - x) * (1.0 + x);
+	lnx = simde_math_log(x);
+
+	tt1 = 2.0 / (SIMDE_MATH_PI * 0.14829094707965850830078125) + 0.5 * lnx;
+	tt2 = (1.0 / 0.14829094707965850830078125) * lnx;
+
+	return sgn * simde_math_sqrt(-tt1 + simde_math_sqrt(tt1 * tt1 - tt2));
+}
+#define simde_math_erfinv simde_math_erfinv
+#endif
+
+#if !defined(simde_math_erfinvf) && defined(simde_math_logf) && \
+	defined(simde_math_copysignf) && defined(simde_math_sqrtf)
+static HEDLEY_INLINE float simde_math_erfinvf(float x)
+{
+	float tt1, tt2, lnx;
+	float sgn = simde_math_copysignf(1.0f, x);
+
+	x = (1.0f - x) * (1.0f + x);
+	lnx = simde_math_logf(x);
+
+	tt1 = 2.0f / (SIMDE_MATH_PIF * 0.14829094707965850830078125f) +
+	      0.5f * lnx;
+	tt2 = (1.0f / 0.14829094707965850830078125f) * lnx;
+
+	return sgn * simde_math_sqrtf(-tt1 + simde_math_sqrtf(tt1 * tt1 - tt2));
+}
+#define simde_math_erfinvf simde_math_erfinvf
+#endif
+
+#if !defined(simde_math_erfcinv) && defined(simde_math_erfinv) && \
+	defined(simde_math_log) && defined(simde_math_sqrt)
+static HEDLEY_INLINE double simde_math_erfcinv(double x)
+{
+	if (x >= 0.0625 && x < 2.0) {
+		return simde_math_erfinv(1.0 - x);
+	} else if (x < 0.0625 && x >= 1.0e-100) {
+		double p[6] = {0.1550470003116, 1.382719649631, 0.690969348887,
+			       -1.128081391617, 0.680544246825, -0.16444156791};
+		double q[3] = {0.155024849822, 1.385228141995, 1.000000000000};
+
+		const double t = 1.0 / simde_math_sqrt(-simde_math_log(x));
+		return (p[0] / t + p[1] +
+			t * (p[2] + t * (p[3] + t * (p[4] + t * p[5])))) /
+		       (q[0] + t * (q[1] + t * (q[2])));
+	} else if (x < 1.0e-100 && x >= SIMDE_MATH_DBL_MIN) {
+		double p[4] = {0.00980456202915, 0.363667889171, 0.97302949837,
+			       -0.5374947401};
+		double q[3] = {0.00980451277802, 0.363699971544,
+			       1.000000000000};
+
+		const double t = 1.0 / simde_math_sqrt(-simde_math_log(x));
+		return (p[0] / t + p[1] + t * (p[2] + t * p[3])) /
+		       (q[0] + t * (q[1] + t * (q[2])));
+	} else if (!simde_math_isnormal(x)) {
+		return SIMDE_MATH_INFINITY;
+	} else {
+		return -SIMDE_MATH_INFINITY;
+	}
+}
+
+#define simde_math_erfcinv simde_math_erfcinv
+#endif
+
+#if !defined(simde_math_erfcinvf) && defined(simde_math_erfinvf) && \
+	defined(simde_math_logf) && defined(simde_math_sqrtf)
+static HEDLEY_INLINE float simde_math_erfcinvf(float x)
+{
+	if (x >= 0.0625f && x < 2.0f) {
+		return simde_math_erfinvf(1.0f - x);
+	} else if (x < 0.0625f && x >= SIMDE_MATH_FLT_MIN) {
+		static const float p[6] = {0.1550470003116f, 1.382719649631f,
+					   0.690969348887f, -1.128081391617f,
+					   0.680544246825f - 0.164441567910f};
+		static const float q[3] = {0.155024849822f, 1.385228141995f,
+					   1.000000000000f};
+
+		const float t = 1.0f / simde_math_sqrtf(-simde_math_logf(x));
+		return (p[0] / t + p[1] +
+			t * (p[2] + t * (p[3] + t * (p[4] + t * p[5])))) /
+		       (q[0] + t * (q[1] + t * (q[2])));
+	} else if (x < SIMDE_MATH_FLT_MIN && simde_math_isnormalf(x)) {
+		static const float p[4] = {0.00980456202915f, 0.36366788917100f,
+					   0.97302949837000f,
+					   -0.5374947401000f};
+		static const float q[3] = {0.00980451277802f, 0.36369997154400f,
+					   1.00000000000000f};
+
+		const float t = 1.0f / simde_math_sqrtf(-simde_math_logf(x));
+		return (p[0] / t + p[1] + t * (p[2] + t * p[3])) /
+		       (q[0] + t * (q[1] + t * (q[2])));
+	} else {
+		return simde_math_isnormalf(x) ? -SIMDE_MATH_INFINITYF
+					       : SIMDE_MATH_INFINITYF;
+	}
+}
+
+#define simde_math_erfcinvf simde_math_erfcinvf
+#endif
+
+HEDLEY_DIAGNOSTIC_POP
+
+static HEDLEY_INLINE double simde_math_rad2deg(double radians)
+{
+	return radians * (180.0 / SIMDE_MATH_PI);
+}
+
+static HEDLEY_INLINE float simde_math_rad2degf(float radians)
+{
+	return radians * (180.0f / SIMDE_MATH_PIF);
+}
+
+static HEDLEY_INLINE double simde_math_deg2rad(double degrees)
+{
+	return degrees * (SIMDE_MATH_PI / 180.0);
+}
+
+static HEDLEY_INLINE float simde_math_deg2radf(float degrees)
+{
+	return degrees * (SIMDE_MATH_PIF / 180.0f);
+}
+
+#endif /* !defined(SIMDE_MATH_H) */

obs-studio-25.0.8.tar.xz/libobs/util/simde/sse.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/sse.h Changed

@@ -1,4 +1,6 @@
-/* Permission is hereby granted, free of charge, to any person
+/* 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,
@@ -19,2036 +21,2793 @@
  * SOFTWARE.
  *
  * Copyright:
- *   2017      Evan Nemerson <evan@nemerson.com>
+ *   2017-2020 Evan Nemerson <evan@nemerson.com>
  *   2015-2017 John W. Ratcliff <jratcliffscarab@gmail.com>
  *   2015      Brandon Rowlett <browlett@nvidia.com>
  *   2015      Ken Fast <kfast@gdeb.com>
  */
 
-#if !defined(SIMDE__SSE_H)
-#if !defined(SIMDE__SSE_H)
-#define SIMDE__SSE_H
-#endif
+#if !defined(SIMDE_X86_SSE_H)
+#define SIMDE_X86_SSE_H
+
 #include "mmx.h"
 
-#if defined(SIMDE_SSE_NATIVE)
-#undef SIMDE_SSE_NATIVE
+#if !defined(SIMDE_X86_AVX512F_NATIVE) && defined(SIMDE_ENABLE_NATIVE_ALIASES)
+#define SIMDE_X86_AVX512F_ENABLE_NATIVE_ALIASES
 #endif
-#if defined(SIMDE_SSE_FORCE_NATIVE)
-#define SIMDE_SSE_NATIVE
-#elif defined(__SSE__) && !defined(SIMDE_SSE_NO_NATIVE) && \
-	!defined(SIMDE_NO_NATIVE)
-#define SIMDE_SSE_NATIVE
-#elif defined(__ARM_NEON) && !defined(SIMDE_SSE_NO_NEON) && \
-	!defined(SIMDE_NO_NEON)
-#define SIMDE_SSE_NEON
+
+#if defined(_WIN32)
+#include <windows.h>
 #endif
 
-#if defined(SIMDE_SSE_NATIVE) && !defined(SIMDE_MMX_NATIVE)
-#if defined(SIMDE_SSE_FORCE_NATIVE)
-#error Native SSE support requires native MMX support
-#else
-#warning Native SSE support requires native MMX support, disabling
-#undef SIMDE_SSE_NATIVE
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DISABLE_UNWANTED_DIAGNOSTICS
+SIMDE_BEGIN_DECLS_
+
+typedef union {
+#if defined(SIMDE_VECTOR_SUBSCRIPT)
+	SIMDE_ALIGN(16) int8_t i8 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int16_t i16 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int32_t i32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int64_t i64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint8_t u8 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint16_t u16 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint32_t u32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint64_t u64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#if defined(SIMDE_HAVE_INT128_)
+	SIMDE_ALIGN(16) simde_int128 i128 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) simde_uint128 u128 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#endif
+	SIMDE_ALIGN(16) simde_float32 f32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int_fast32_t i32f SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint_fast32_t u32f SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#else
+	SIMDE_ALIGN(16) int8_t i8[16];
+	SIMDE_ALIGN(16) int16_t i16[8];
+	SIMDE_ALIGN(16) int32_t i32[4];
+	SIMDE_ALIGN(16) int64_t i64[2];
+	SIMDE_ALIGN(16) uint8_t u8[16];
+	SIMDE_ALIGN(16) uint16_t u16[8];
+	SIMDE_ALIGN(16) uint32_t u32[4];
+	SIMDE_ALIGN(16) uint64_t u64[2];
+#if defined(SIMDE_HAVE_INT128_)
+	SIMDE_ALIGN(16) simde_int128 i128[1];
+	SIMDE_ALIGN(16) simde_uint128 u128[1];
+#endif
+	SIMDE_ALIGN(16) simde_float32 f32[4];
+	SIMDE_ALIGN(16) int_fast32_t i32f[16 / sizeof(int_fast32_t)];
+	SIMDE_ALIGN(16) uint_fast32_t u32f[16 / sizeof(uint_fast32_t)];
+#endif
+
+	SIMDE_ALIGN(16) simde__m64_private m64_private[2];
+	SIMDE_ALIGN(16) simde__m64 m64[2];
+
+#if defined(SIMDE_X86_SSE_NATIVE)
+	SIMDE_ALIGN(16) __m128 n;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN(16) int8x16_t neon_i8;
+	SIMDE_ALIGN(16) int16x8_t neon_i16;
+	SIMDE_ALIGN(16) int32x4_t neon_i32;
+	SIMDE_ALIGN(16) int64x2_t neon_i64;
+	SIMDE_ALIGN(16) uint8x16_t neon_u8;
+	SIMDE_ALIGN(16) uint16x8_t neon_u16;
+	SIMDE_ALIGN(16) uint32x4_t neon_u32;
+	SIMDE_ALIGN(16) uint64x2_t neon_u64;
+	SIMDE_ALIGN(16) float32x4_t neon_f32;
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	SIMDE_ALIGN(16) float64x2_t neon_f64;
+#endif
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	SIMDE_ALIGN(16) v128_t wasm_v128;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned char) altivec_u8;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned short) altivec_u16;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned int) altivec_u32;
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(unsigned long long) altivec_u64;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed char) altivec_i8;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed short) altivec_i16;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed int) altivec_i32;
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(signed long long) altivec_i64;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(float) altivec_f32;
+#if defined(SIMDE_POWER_ALTIVEC_P7_NATIVE)
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(double) altivec_f64;
+#endif
+#endif
+} simde__m128_private;
+
+#if defined(SIMDE_X86_SSE_NATIVE)
+typedef __m128 simde__m128;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+typedef float32x4_t simde__m128;
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+typedef v128_t simde__m128;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+typedef SIMDE_POWER_ALTIVEC_VECTOR(float) simde__m128;
+#elif defined(SIMDE_VECTOR_SUBSCRIPT)
+typedef simde_float32 simde__m128 SIMDE_ALIGN(16)
+	SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#else
+typedef simde__m128_private simde__m128;
+#endif
+
+#if !defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_ENABLE_NATIVE_ALIASES)
+#define SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES
+typedef simde__m128 __m128;
+#endif
+
+HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128), "simde__m128 size incorrect");
+HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128_private),
+		     "simde__m128_private size incorrect");
+#if defined(SIMDE_CHECK_ALIGNMENT) && defined(SIMDE_ALIGN_OF)
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m128) == 16,
+		     "simde__m128 is not 16-byte aligned");
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m128_private) == 16,
+		     "simde__m128_private is not 16-byte aligned");
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde__m128_from_private(simde__m128_private v)
+{
+	simde__m128 r;
+	simde_memcpy(&r, &v, sizeof(r));
+	return r;
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128_private simde__m128_to_private(simde__m128 v)
+{
+	simde__m128_private r;
+	simde_memcpy(&r, &v, sizeof(r));
+	return r;
+}
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, int8x16_t, neon, i8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, int16x8_t, neon, i16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, int32x4_t, neon, i32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, int64x2_t, neon, i64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, uint8x16_t, neon, u8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, uint16x8_t, neon, u16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, uint32x4_t, neon, u32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, uint64x2_t, neon, u64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, float32x4_t, neon, f32)
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128, float64x2_t, neon, f64)
 #endif
-#elif defined(SIMDE_SSE_NEON) && !defined(SIMDE_MMX_NEON)
-#warning SSE3 NEON support requires MMX NEON support, disabling
-#undef SIMDE_SSE3_NEON
+#endif /* defined(SIMDE_ARM_NEON_A32V7_NATIVE) */
+
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_POP
 #endif
 
-#if defined(SIMDE_SSE_NATIVE)
-#include <xmmintrin.h>
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_set_ps(simde_float32 e3, simde_float32 e2,
+			    simde_float32 e1, simde_float32 e0)
+{
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_set_ps(e3, e2, e1, e0);
+#else
+	simde__m128_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN(16) simde_float32 data[4] = {e0, e1, e2, e3};
+	r_.neon_f32 = vld1q_f32(data);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_make(e0, e1, e2, e3);
 #else
-#if defined(SIMDE_SSE_NEON)
-#include <arm_neon.h>
+	r_.f32[0] = e0;
+	r_.f32[1] = e1;
+	r_.f32[2] = e2;
+	r_.f32[3] = e3;
 #endif
 
-#if !defined(__INTEL_COMPILER) && defined(__STDC_VERSION__) && \
-	(__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__)
-#include <stdatomic.h>
-#elif defined(_WIN32)
-#include <Windows.h>
+	return simde__m128_from_private(r_);
 #endif
+}
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_set_ps(e3, e2, e1, e0) simde_mm_set_ps(e3, e2, e1, e0)
 #endif
 
-#include <math.h>
-#include <fenv.h>
-
-#define SIMDE_ALIGN(alignment) __attribute__((aligned(alignment)))
-SIMDE__BEGIN_DECLS
-
-typedef SIMDE_ALIGN(16) union {
-#if defined(SIMDE__ENABLE_GCC_VEC_EXT)
-	int8_t i8 __attribute__((__vector_size__(16), __may_alias__));
-	int16_t i16 __attribute__((__vector_size__(16), __may_alias__));
-	int32_t i32 __attribute__((__vector_size__(16), __may_alias__));
-	int64_t i64 __attribute__((__vector_size__(16), __may_alias__));
-	uint8_t u8 __attribute__((__vector_size__(16), __may_alias__));
-	uint16_t u16 __attribute__((__vector_size__(16), __may_alias__));
-	uint32_t u32 __attribute__((__vector_size__(16), __may_alias__));
-	uint64_t u64 __attribute__((__vector_size__(16), __may_alias__));
-#if defined(SIMDE__HAVE_INT128)
-	simde_int128 i128 __attribute__((__vector_size__(16), __may_alias__));
-	simde_uint128 u128 __attribute__((__vector_size__(16), __may_alias__));
-#endif
-	simde_float32 f32 __attribute__((__vector_size__(16), __may_alias__));
-#else
-	int8_t i8[16];
-	int16_t i16[8];
-	int32_t i32[4];
-	int64_t i64[2];
-	uint8_t u8[16];
-	uint16_t u16[8];
-	uint32_t u32[4];
-	uint64_t u64[2];
-#if defined(SIMDE__HAVE_INT128)
-	simde_int128 i128[1];
-	simde_uint128 u128[1];
-#endif
-	simde_float32 f32[4];
-#endif
-
-#if defined(SIMDE_SSE_NATIVE)
-	__m128 n;
-#elif defined(SIMDE_SSE_NEON)
-	int8x16_t neon_i8;
-	int16x8_t neon_i16;
-	int32x4_t neon_i32;
-	int64x2_t neon_i64;
-	uint8x16_t neon_u8;
-	uint16x8_t neon_u16;
-	uint32x4_t neon_u32;
-	uint64x2_t neon_u64;
-	float32x4_t neon_f32;
-#endif
-} simde__m128;
-
-#if defined(SIMDE_SSE_NATIVE)
-HEDLEY_STATIC_ASSERT(sizeof(__m128) == sizeof(simde__m128),
-		     "__m128 size doesn't match simde__m128 size");
-SIMDE__FUNCTION_ATTRIBUTES simde__m128 SIMDE__M128_C(__m128 v)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_set_ps1(simde_float32 a)
 {
-	simde__m128 r;
-	r.n = v;
-	return r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_set_ps1(a);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vdupq_n_f32(a);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	(void)a;
+	return vec_splats(a);
+#else
+	return simde_mm_set_ps(a, a, a, a);
+#endif
 }
-#elif defined(SIMDE_SSE_NEON)
-#define SIMDE__M128_NEON_C(T, expr) \
-	(simde__m128) { .neon_##T = expr }
+#define simde_mm_set1_ps(a) simde_mm_set_ps1(a)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_set_ps1(a) simde_mm_set_ps1(a)
+#define _mm_set1_ps(a) simde_mm_set1_ps(a)
 #endif
-HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128), "simde__m128 size incorrect");
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_move_ss(simde__m128 a, simde__m128 b)
+{
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_move_ss(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 =
+		vsetq_lane_f32(vgetq_lane_f32(b_.neon_f32, 0), a_.neon_f32, 0);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	SIMDE_POWER_ALTIVEC_VECTOR(unsigned char)
+	m = {16, 17, 18, 19, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+	r_.altivec_f32 = vec_perm(a_.altivec_f32, b_.altivec_f32, m);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_v8x16_shuffle(b_.wasm_v128, a_.wasm_v128, 0, 1, 2,
+					  3, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+					  29, 30, 31);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.f32, b_.f32, 4, 1, 2, 3);
+#else
+	r_.f32[0] = b_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+#endif
+
+	return simde__m128_from_private(r_);
+#endif
+}
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_move_ss(a, b) simde_mm_move_ss((a), (b))
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_add_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_add_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_add_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vaddq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i] + b.f32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vaddq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_add(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_add(a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f32 = a_.f32 + b_.f32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = a_.f32[i] + b_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_add_ps(a, b) simde_mm_add_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_add_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_add_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_add_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_add_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32_t b0 = vgetq_lane_f32(b.neon_f32, 0);
-	float32x4_t value = vsetq_lane_f32(b0, vdupq_n_f32(0), 0);
-	/* the upper values in the result must be the remnants of <a>. */
-	r.neon_f32 = vaddq_f32(a.neon_f32, value);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32, simde_mm_add_ps(a, b).f32,
-				      4, 1, 2, 3);
-#else
-	r.f32[0] = a.f32[0] + b.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#endif
+	r_.f32[0] = a_.f32[0] + b_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_add_ss(a, b) simde_mm_add_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_and_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_and_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_and_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_i32 = vandq_s32(a.neon_i32, b.neon_i32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i] & b.i32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vandq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_v128_and(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = a_.i32 & b_.i32;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_and(a_.altivec_f32, b_.altivec_f32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] & b_.i32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_and_ps(a, b) simde_mm_and_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_andnot_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_andnot_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_andnot_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_i32 = vbicq_s32(b.neon_i32, a.neon_i32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = ~(a.i32[i]) & b.i32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vbicq_s32(b_.neon_i32, a_.neon_i32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_v128_andnot(b_.wasm_v128, a_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_andc(b_.altivec_f32, a_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = ~a_.i32 & b_.i32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = ~(a_.i32[i]) & b_.i32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_andnot_ps(a, b) simde_mm_andnot_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_avg_pu16(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_avg_pu16(a, b);
+#else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_avg_pu16(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u16 = vrhadd_u16(b.neon_u16, a.neon_u16);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < 4; i++) {
-		r.u16[i] = (a.u16[i] + b.u16[i] + 1) >> 1;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vrhadd_u16(b_.neon_u16, a_.neon_u16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS) &&      \
+	defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR) && \
+	defined(SIMDE_CONVERT_VECTOR_)
+	uint32_t wa SIMDE_VECTOR(16);
+	uint32_t wb SIMDE_VECTOR(16);
+	uint32_t wr SIMDE_VECTOR(16);
+	SIMDE_CONVERT_VECTOR_(wa, a_.u16);
+	SIMDE_CONVERT_VECTOR_(wb, b_.u16);
+	wr = (wa + wb + 1) >> 1;
+	SIMDE_CONVERT_VECTOR_(r_.u16, wr);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = (a_.u16[i] + b_.u16[i] + 1) >> 1;
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pavgw(a, b) simde_mm_avg_pu16(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_avg_pu16(a, b) simde_mm_avg_pu16(a, b)
+#define _m_pavgw(a, b) simde_mm_avg_pu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_avg_pu8(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_avg_pu8(a, b);
+#else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_avg_pu8(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u8 = vrhadd_u8(b.neon_u8, a.neon_u8);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < 8; i++) {
-		r.u8[i] = (a.u8[i] + b.u8[i] + 1) >> 1;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vrhadd_u8(b_.neon_u8, a_.neon_u8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS) &&      \
+	defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR) && \
+	defined(SIMDE_CONVERT_VECTOR_)
+	uint16_t wa SIMDE_VECTOR(16);
+	uint16_t wb SIMDE_VECTOR(16);
+	uint16_t wr SIMDE_VECTOR(16);
+	SIMDE_CONVERT_VECTOR_(wa, a_.u8);
+	SIMDE_CONVERT_VECTOR_(wb, b_.u8);
+	wr = (wa + wb + 1) >> 1;
+	SIMDE_CONVERT_VECTOR_(r_.u8, wr);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = (a_.u8[i] + b_.u8[i] + 1) >> 1;
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pavgb(a, b) simde_mm_avg_pu8(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_avg_pu8(a, b) simde_mm_avg_pu8(a, b)
+#define _m_pavgb(a, b) simde_mm_avg_pu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpeq_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpeq_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpeq_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vceqq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (a.f32[i] == b.f32[i]) ? 0xffffffff : 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vceqq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_eq(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = (SIMDE_POWER_ALTIVEC_VECTOR(float))vec_cmpeq(
+		a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), a_.f32 == b_.f32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (a_.f32[i] == b_.f32[i]) ? ~UINT32_C(0)
+						     : UINT32_C(0);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_ps(a, b) simde_mm_cmpeq_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpeq_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpeq_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmpeq_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpeq_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vceqq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmpeq_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (a.f32[0] == b.f32[0]) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = a.u32[i];
+	r_.u32[0] = (a_.f32[0] == b_.f32[0]) ? ~UINT32_C(0) : UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_ss(a, b) simde_mm_cmpeq_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpge_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpge_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpge_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcgeq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (a.f32[i] >= b.f32[i]) ? 0xffffffff : 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vcgeq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_ge(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = (SIMDE_POWER_ALTIVEC_VECTOR(float))vec_cmpge(
+		a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.f32 >= b_.f32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (a_.f32[i] >= b_.f32[i]) ? ~UINT32_C(0)
+						     : UINT32_C(0);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpge_ps(a, b) simde_mm_cmpge_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpge_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && !defined(__PGI)
+	return _mm_cmpge_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmpge_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-	r.n = _mm_cmpge_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcgeq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmpge_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (a.f32[0] >= b.f32[0]) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = a.u32[i];
+	r_.u32[0] = (a_.f32[0] >= b_.f32[0]) ? ~UINT32_C(0) : UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpge_ss(a, b) simde_mm_cmpge_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpgt_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpgt_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpgt_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcgtq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (a.f32[i] > b.f32[i]) ? 0xffffffff : 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vcgtq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_gt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = (SIMDE_POWER_ALTIVEC_VECTOR(float))vec_cmpgt(
+		a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.f32 > b_.f32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (a_.f32[i] > b_.f32[i]) ? ~UINT32_C(0)
+						    : UINT32_C(0);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_ps(a, b) simde_mm_cmpgt_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpgt_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && !defined(__PGI)
+	return _mm_cmpgt_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmpgt_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-	r.n = _mm_cmpgt_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcgtq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmpgt_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (a.f32[0] > b.f32[0]) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = a.u32[i];
+	r_.u32[0] = (a_.f32[0] > b_.f32[0]) ? ~UINT32_C(0) : UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_ss(a, b) simde_mm_cmpgt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmple_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmple_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmple_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcleq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (a.f32[i] <= b.f32[i]) ? 0xffffffff : 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vcleq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_le(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = (SIMDE_POWER_ALTIVEC_VECTOR(float))vec_cmple(
+		a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.f32 <= b_.f32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (a_.f32[i] <= b_.f32[i]) ? ~UINT32_C(0)
+						     : UINT32_C(0);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmple_ps(a, b) simde_mm_cmple_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmple_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmple_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmple_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmple_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcleq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmple_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (a.f32[0] <= b.f32[0]) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = a.u32[i];
+	r_.u32[0] = (a_.f32[0] <= b_.f32[0]) ? ~UINT32_C(0) : UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmple_ss(a, b) simde_mm_cmple_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmplt_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmplt_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmplt_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcltq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (a.f32[i] < b.f32[i]) ? 0xffffffff : 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vcltq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_lt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = (SIMDE_POWER_ALTIVEC_VECTOR(float))vec_cmplt(
+		a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.f32 < b_.f32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (a_.f32[i] < b_.f32[i]) ? ~UINT32_C(0)
+						    : UINT32_C(0);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_ps(a, b) simde_mm_cmplt_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmplt_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmplt_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmplt_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmplt_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcltq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmplt_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (a.f32[0] < b.f32[0]) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = a.u32[i];
+	r_.u32[0] = (a_.f32[0] < b_.f32[0]) ? ~UINT32_C(0) : UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_ss(a, b) simde_mm_cmplt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpneq_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpneq_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpneq_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vmvnq_u32(vceqq_f32(a.neon_f32, b.neon_f32));
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (a.f32[i] != b.f32[i]) ? 0xffffffff : 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vmvnq_u32(vceqq_f32(a_.neon_f32, b_.neon_f32));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_ne(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P9_NATIVE) && SIMDE_ARCH_POWER_CHECK(900) && \
+	!defined(HEDLEY_IBM_VERSION)
+	/* vec_cmpne(vector float, vector float) is missing from XL C/C++ v16.1.1,
+       though the documentation (table 89 on page 432 of the IBM XL C/C++ for
+       Linux Compiler Reference, Version 16.1.1) shows that it should be
+       present.  Both GCC and clang support it. */
+	r_.altivec_f32 = (SIMDE_POWER_ALTIVEC_VECTOR(float))vec_cmpne(
+		a_.altivec_f32, b_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.f32 != b_.f32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (a_.f32[i] != b_.f32[i]) ? ~UINT32_C(0)
+						     : UINT32_C(0);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpneq_ps(a, b) simde_mm_cmpneq_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpneq_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpneq_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmpneq_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpneq_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t e =
-		vreinterpretq_f32_u32(vceqq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t s =
-		vreinterpretq_f32_u32(vmvnq_u32(vreinterpretq_u32_f32(e)));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmpneq_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (a.f32[0] != b.f32[0]) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = a.u32[i];
+	r_.u32[0] = (a_.f32[0] != b_.f32[0]) ? ~UINT32_C(0) : UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpneq_ss(a, b) simde_mm_cmpneq_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpnge_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpnge_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcltq_f32(a.neon_f32, b.neon_f32);
-#else
-	r = simde_mm_cmplt_ps(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmplt_ps(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnge_ps(a, b) simde_mm_cmpnge_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpnge_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-	r.n = _mm_cmpnge_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcltq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#else
-	r = simde_mm_cmplt_ss(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmplt_ss(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnge_ss(a, b) simde_mm_cmpnge_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpngt_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpngt_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcleq_f32(a.neon_f32, b.neon_f32);
-#else
-	r = simde_mm_cmple_ps(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmple_ps(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpngt_ps(a, b) simde_mm_cmpngt_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpngt_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-	r.n = _mm_cmpngt_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcleq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#else
-	r = simde_mm_cmple_ss(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmple_ss(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpngt_ss(a, b) simde_mm_cmpngt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpnle_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpnle_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcgtq_f32(a.neon_f32, b.neon_f32);
-#else
-	r = simde_mm_cmpgt_ps(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmpgt_ps(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnle_ps(a, b) simde_mm_cmpnle_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpnle_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpnle_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t s =
-		vreinterpretq_f32_u32(vcgtq_f32(a.neon_f32, b.neon_f32));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#else
-	r = simde_mm_cmpgt_ss(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmpgt_ss(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnle_ss(a, b) simde_mm_cmpnle_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpnlt_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpnlt_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_u32 = vcgeq_f32(a.neon_f32, b.neon_f32);
-#else
-	r = simde_mm_cmpge_ps(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmpge_ps(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnlt_ps(a, b) simde_mm_cmpnlt_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpnlt_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpnlt_ss(a.n, b.n);
-#else
-	r = simde_mm_cmpge_ss(a, b);
-#endif
-
-	return r;
+	return simde_mm_cmpge_ss(a, b);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnlt_ss(a, b) simde_mm_cmpnlt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpord_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpord_ps(a, b);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	return wasm_v128_and(wasm_f32x4_eq(a, a), wasm_f32x4_eq(b, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpord_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 	/* Note: NEON does not have ordered compare builtin
      Need to compare a eq a and b eq b to check for NaN
      Do AND of results to get final */
-	uint32x4_t ceqaa = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t ceqbb = vceqq_f32(b.neon_f32, b.neon_f32);
-	r.neon_u32 = vandq_u32(ceqaa, ceqbb);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (isnan(a.f32[i]) || isnan(b.f32[i])) ? 0
-								: 0xffffffff;
+	uint32x4_t ceqaa = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t ceqbb = vceqq_f32(b_.neon_f32, b_.neon_f32);
+	r_.neon_u32 = vandq_u32(ceqaa, ceqbb);
+#elif defined(simde_math_isnanf)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (simde_math_isnanf(a_.f32[i]) ||
+			     simde_math_isnanf(b_.f32[i]))
+				    ? UINT32_C(0)
+				    : ~UINT32_C(0);
 	}
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
-}
-
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_cmpord_ss(simde__m128 a, simde__m128 b)
-{
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpord_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	uint32x4_t ceqaa = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t ceqbb = vceqq_f32(b.neon_f32, b.neon_f32);
-	float32x4_t s = vreinterpretq_f32_u32(vandq_u32(ceqaa, ceqbb));
-	float32x4_t t = vextq_f32(a.neon_f32, s, 1);
-	r.neon_f32 = vextq_f32(t, t, 3);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(32, 16, a.f32,
-				      simde_mm_cmpord_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (isnan(a.f32[0]) || isnan(b.f32[0])) ? 0 : 0xffffffff;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i];
-	}
+	return simde__m128_from_private(r_);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpord_ps(a, b) simde_mm_cmpord_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpunord_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cmpunord_ps(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpunord_ps(a, b);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	return wasm_v128_or(wasm_f32x4_ne(a, a), wasm_f32x4_ne(b, b));
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.u32[i] = (isnan(a.f32[i]) || isnan(b.f32[i])) ? 0xffffffff
-								: 0;
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t ceqaa = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t ceqbb = vceqq_f32(b_.neon_f32, b_.neon_f32);
+	r_.neon_u32 = vmvnq_u32(vandq_u32(ceqaa, ceqbb));
+#elif defined(simde_math_isnanf)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = (simde_math_isnanf(a_.f32[i]) ||
+			     simde_math_isnanf(b_.f32[i]))
+				    ? ~UINT32_C(0)
+				    : UINT32_C(0);
 	}
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpunord_ps(a, b) simde_mm_cmpunord_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cmpunord_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && !defined(__PGI)
+	return _mm_cmpunord_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmpunord_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-	r.n = _mm_cmpunord_ss(a.n, b.n);
-#elif defined(SIMDE__SHUFFLE_VECTOR) && defined(SIMDE_ASSUME_VECTORIZATION)
-	r.f32 = SIMDE__SHUFFLE_VECTOR(
-		32, 16, a.f32, simde_mm_cmpunord_ps(a, b).f32, 4, 1, 2, 3);
-#else
-	r.u32[0] = (isnan(a.f32[0]) || isnan(b.f32[0])) ? 0xffffffff : 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i];
+#if defined(simde_math_isnanf)
+	r_.u32[0] =
+		(simde_math_isnanf(a_.f32[0]) || simde_math_isnanf(b_.f32[0]))
+			? ~UINT32_C(0)
+			: UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
 	}
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpunord_ss(a, b) simde_mm_cmpunord_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comieq_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_comieq_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	uint32x4_t a_not_nan = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t b_not_nan = vceqq_f32(b.neon_f32, b.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_comieq_ss(a, b);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t a_not_nan = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t b_not_nan = vceqq_f32(b_.neon_f32, b_.neon_f32);
 	uint32x4_t a_or_b_nan = vmvnq_u32(vandq_u32(a_not_nan, b_not_nan));
-	uint32x4_t a_eq_b = vceqq_f32(a.neon_f32, b.neon_f32);
-	return (vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_eq_b), 0) != 0) ? 1 : 0;
+	uint32x4_t a_eq_b = vceqq_f32(a_.neon_f32, b_.neon_f32);
+	return !!(vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_eq_b), 0) != 0);
 #else
-	return a.f32[0] == b.f32[0];
+	return a_.f32[0] == b_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_comieq_ss(a, b) simde_mm_comieq_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comige_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_comige_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	uint32x4_t a_not_nan = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t b_not_nan = vceqq_f32(b.neon_f32, b.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_comige_ss(a, b);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t a_not_nan = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t b_not_nan = vceqq_f32(b_.neon_f32, b_.neon_f32);
 	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
-	uint32x4_t a_ge_b = vcgeq_f32(a.neon_f32, b.neon_f32);
-	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_ge_b), 0) != 0) ? 1
-									    : 0;
+	uint32x4_t a_ge_b = vcgeq_f32(a_.neon_f32, b_.neon_f32);
+	return !!(vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_ge_b), 0) != 0);
 #else
-	return a.f32[0] >= b.f32[0];
+	return a_.f32[0] >= b_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_comige_ss(a, b) simde_mm_comige_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comigt_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_comigt_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	uint32x4_t a_not_nan = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t b_not_nan = vceqq_f32(b.neon_f32, b.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_comigt_ss(a, b);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t a_not_nan = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t b_not_nan = vceqq_f32(b_.neon_f32, b_.neon_f32);
 	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
-	uint32x4_t a_gt_b = vcgtq_f32(a.neon_f32, b.neon_f32);
-	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_gt_b), 0) != 0) ? 1
-									    : 0;
+	uint32x4_t a_gt_b = vcgtq_f32(a_.neon_f32, b_.neon_f32);
+	return !!(vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_gt_b), 0) != 0);
 #else
-	return a.f32[0] > b.f32[0];
+	return a_.f32[0] > b_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_comigt_ss(a, b) simde_mm_comigt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comile_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_comile_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	uint32x4_t a_not_nan = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t b_not_nan = vceqq_f32(b.neon_f32, b.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_comile_ss(a, b);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t a_not_nan = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t b_not_nan = vceqq_f32(b_.neon_f32, b_.neon_f32);
 	uint32x4_t a_or_b_nan = vmvnq_u32(vandq_u32(a_not_nan, b_not_nan));
-	uint32x4_t a_le_b = vcleq_f32(a.neon_f32, b.neon_f32);
-	return (vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_le_b), 0) != 0) ? 1 : 0;
+	uint32x4_t a_le_b = vcleq_f32(a_.neon_f32, b_.neon_f32);
+	return !!(vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_le_b), 0) != 0);
 #else
-	return a.f32[0] <= b.f32[0];
+	return a_.f32[0] <= b_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_comile_ss(a, b) simde_mm_comile_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comilt_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_comilt_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NATIVE)
-	uint32x4_t a_not_nan = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t b_not_nan = vceqq_f32(b.neon_f32, b.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_comilt_ss(a, b);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t a_not_nan = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t b_not_nan = vceqq_f32(b_.neon_f32, b_.neon_f32);
 	uint32x4_t a_or_b_nan = vmvnq_u32(vandq_u32(a_not_nan, b_not_nan));
-	uint32x4_t a_lt_b = vcltq_f32(a.neon_f32, b.neon_f32);
-	return (vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_lt_b), 0) != 0) ? 1 : 0;
+	uint32x4_t a_lt_b = vcltq_f32(a_.neon_f32, b_.neon_f32);
+	return !!(vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_lt_b), 0) != 0);
 #else
-	return a.f32[0] < b.f32[0];
+	return a_.f32[0] < b_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_comilt_ss(a, b) simde_mm_comilt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comineq_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_comineq_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	uint32x4_t a_not_nan = vceqq_f32(a.neon_f32, a.neon_f32);
-	uint32x4_t b_not_nan = vceqq_f32(b.neon_f32, b.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_comineq_ss(a, b);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint32x4_t a_not_nan = vceqq_f32(a_.neon_f32, a_.neon_f32);
+	uint32x4_t b_not_nan = vceqq_f32(b_.neon_f32, b_.neon_f32);
 	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
-	uint32x4_t a_neq_b = vmvnq_u32(vceqq_f32(a.neon_f32, b.neon_f32));
-	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_neq_b), 0) != 0)
-		       ? 1
-		       : 0;
+	uint32x4_t a_neq_b = vmvnq_u32(vceqq_f32(a_.neon_f32, b_.neon_f32));
+	return !!(vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_neq_b), 0) != 0);
 #else
-	return a.f32[0] != b.f32[0];
+	return a_.f32[0] != b_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_comineq_ss(a, b) simde_mm_comineq_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvt_pi2ps(simde__m128 a, simde__m64 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvt_pi2ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcombine_f32(vcvt_f32_s32(b_.neon_i32),
+				   vget_high_f32(a_.neon_f32));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.m64_private[0].f32, b_.i32);
+	r_.m64_private[1] = a_.m64_private[1];
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvt_pi2ps(a.n, b.n);
 #else
-	r.f32[0] = (simde_float32)b.i32[0];
-	r.f32[1] = (simde_float32)b.i32[1];
-	r.i32[2] = a.i32[2];
-	r.i32[3] = a.i32[3];
+	r_.f32[0] = (simde_float32)b_.i32[0];
+	r_.f32[1] = (simde_float32)b_.i32[1];
+	r_.i32[2] = a_.i32[2];
+	r_.i32[3] = a_.i32[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvt_pi2ps(a, b) simde_mm_cvt_pi2ps((a), b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvt_ps2pi(simde__m128 a)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvt_ps2pi(a);
+#else
+	simde__m64_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvt_ps2pi(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vcvt_s32_f32(vget_low_f32(a_.neon_f32));
+#elif defined(SIMDE_CONVERT_VECTOR_) && !defined(__clang__)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.m64_private[0].f32);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (int32_t)a.f32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = HEDLEY_STATIC_CAST(int32_t, a_.f32[i]);
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvt_ps2pi(a) simde_mm_cvt_ps2pi((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvt_si2ss(simde__m128 a, int32_t b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cvt_si2ss(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvt_si2ss(a.n, b);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vsetq_lane_f32((float)b, a_.neon_f32, 0);
 #else
-	r.f32[0] = (simde_float32)b;
-	r.i32[1] = a.i32[1];
-	r.i32[2] = a.i32[2];
-	r.i32[3] = a.i32[3];
+	r_.f32[0] = HEDLEY_STATIC_CAST(simde_float32, b);
+	r_.i32[1] = a_.i32[1];
+	r_.i32[2] = a_.i32[2];
+	r_.i32[3] = a_.i32[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvt_si2ss(a, b) simde_mm_cvt_si2ss((a), b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvt_ss2si(simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_cvt_ss2si(a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cvt_ss2si(a);
 #else
-	return (int32_t)a.f32[0];
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V8_NATIVE) && !defined(SIMDE_BUG_GCC_95399)
+	return vgetq_lane_s32(vcvtnq_s32_f32(a_.neon_f32), 0);
+#elif defined(simde_math_nearbyintf)
+	return SIMDE_CONVERT_FTOI(int32_t, simde_math_nearbyintf(a_.f32[0]));
+#else
+	HEDLEY_UNREACHABLE();
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvt_ss2si(a) simde_mm_cvt_ss2si((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpi16_ps(simde__m64 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpi16_ps(a);
+#else
+	simde__m128_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtpi16_ps(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE) && 0 /* TODO */
+	r_.neon_f32 = vmovl_s16(
+		vget_low_s16(vuzp1q_s16(a_.neon_i16, vmovq_n_s16(0))));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.f32, a_.i16);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = (simde_float32)a.i16[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		simde_float32 v = a_.i16[i];
+		r_.f32[i] = v;
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpi16_ps(a) simde_mm_cvtpi16_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpi32_ps(simde__m128 a, simde__m64 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpi32_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
+	simde__m64_private b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtpi32_ps(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcombine_f32(vcvt_f32_s32(b_.neon_i32),
+				   vget_high_f32(a_.neon_f32));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.m64_private[0].f32, b_.i32);
+	r_.m64_private[1] = a_.m64_private[1];
 #else
-	r.f32[0] = (simde_float32)b.i32[0];
-	r.f32[1] = (simde_float32)b.i32[1];
-	r.i32[2] = a.i32[2];
-	r.i32[3] = a.i32[3];
+	r_.f32[0] = (simde_float32)b_.i32[0];
+	r_.f32[1] = (simde_float32)b_.i32[1];
+	r_.i32[2] = a_.i32[2];
+	r_.i32[3] = a_.i32[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpi32_ps(a, b) simde_mm_cvtpi32_ps((a), b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpi32x2_ps(simde__m64 a, simde__m64 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpi32x2_ps(a, b);
+#else
+	simde__m128_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a),
+			   b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtpi32x2_ps(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcvtq_f32_s32(vcombine_s32(a_.neon_i32, b_.neon_i32));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.m64_private[0].f32, a_.i32);
+	SIMDE_CONVERT_VECTOR_(r_.m64_private[1].f32, b_.i32);
 #else
-	r.f32[0] = (simde_float32)a.i32[0];
-	r.f32[1] = (simde_float32)a.i32[1];
-	r.f32[2] = (simde_float32)b.i32[0];
-	r.f32[3] = (simde_float32)b.i32[1];
+	r_.f32[0] = (simde_float32)a_.i32[0];
+	r_.f32[1] = (simde_float32)a_.i32[1];
+	r_.f32[2] = (simde_float32)b_.i32[0];
+	r_.f32[3] = (simde_float32)b_.i32[1];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpi32x2_ps(a, b) simde_mm_cvtpi32x2_ps(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpi8_ps(simde__m64 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpi8_ps(a);
+#else
+	simde__m128_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtpi8_ps(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 =
+		vcvtq_f32_s32(vmovl_s16(vget_low_s16(vmovl_s8(a_.neon_i8))));
 #else
-	r.f32[0] = (simde_float32)a.i8[0];
-	r.f32[1] = (simde_float32)a.i8[1];
-	r.f32[2] = (simde_float32)a.i8[2];
-	r.f32[3] = (simde_float32)a.i8[3];
+	r_.f32[0] = HEDLEY_STATIC_CAST(simde_float32, a_.i8[0]);
+	r_.f32[1] = HEDLEY_STATIC_CAST(simde_float32, a_.i8[1]);
+	r_.f32[2] = HEDLEY_STATIC_CAST(simde_float32, a_.i8[2]);
+	r_.f32[3] = HEDLEY_STATIC_CAST(simde_float32, a_.i8[3]);
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpi8_ps(a) simde_mm_cvtpi8_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtps_pi16(simde__m128 a)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtps_pi16(a);
+#else
+	simde__m64_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtps_pi16(a.n);
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i16, a_.f32);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vmovn_s32(vcvtq_s32_f32(a_.neon_f32));
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (int16_t)a.f32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = SIMDE_CONVERT_FTOI(int16_t, a_.f32[i]);
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtps_pi16(a) simde_mm_cvtps_pi16((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtps_pi32(simde__m128 a)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtps_pi32(a);
+#else
+	simde__m64_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtps_pi32(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vcvt_s32_f32(vget_low_f32(a_.neon_f32));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.m64_private[0].f32);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (int32_t)a.f32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = SIMDE_CONVERT_FTOI(int32_t, a_.f32[i]);
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtps_pi32(a) simde_mm_cvtps_pi32((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtps_pi8(simde__m128 a)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtps_pi8(a);
+#else
+	simde__m64_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtps_pi8(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int16x4_t b = vmovn_s32(vcvtq_s32_f32(a_.neon_f32));
+	int16x8_t c = vcombine_s16(b, vmov_n_s16(0));
+	r_.neon_i8 = vmovn_s16(c);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(a.f32) / sizeof(a.f32[0])); i++) {
-		r.i8[i] = (int8_t)a.f32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(a_.f32) / sizeof(a_.f32[0])); i++) {
+		r_.i8[i] = SIMDE_CONVERT_FTOI(int8_t, a_.f32[i]);
 	}
+	/* Note: the upper half is undefined */
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtps_pi8(a) simde_mm_cvtps_pi8((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpu16_ps(simde__m64 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpu16_ps(a);
+#else
+	simde__m128_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtpu16_ps(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcvtq_f32_u32(vmovl_u16(a_.neon_u16));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.f32, a_.u16);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = (simde_float32)a.u16[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = (simde_float32)a_.u16[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpu16_ps(a) simde_mm_cvtpu16_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpu8_ps(simde__m64 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpu8_ps(a);
+#else
+	simde__m128_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtpu8_ps(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 =
+		vcvtq_f32_u32(vmovl_u16(vget_low_u16(vmovl_u8(a_.neon_u8))));
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < 4; i++) {
-		r.f32[i] = (simde_float32)a.u8[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = HEDLEY_STATIC_CAST(simde_float32, a_.u8[i]);
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpu8_ps(a) simde_mm_cvtpu8_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtsi32_ss(simde__m128 a, int32_t b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cvtsi32_ss(a, b);
+#else
+	simde__m128_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtsi32_ss(a.n, b);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vsetq_lane_f32((simde_float32)b, a_.neon_f32, 0);
 #else
-	r.f32[0] = (simde_float32)b;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < 4; i++) {
-		r.i32[i] = a.i32[i];
+	r_.f32[0] = HEDLEY_STATIC_CAST(simde_float32, b);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi32_ss(a, b) simde_mm_cvtsi32_ss((a), b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtsi64_ss(simde__m128 a, int64_t b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if !defined(__PGI)
-	r.n = _mm_cvtsi64_ss(a.n, b);
+	return _mm_cvtsi64_ss(a, b);
 #else
-	r.n = _mm_cvtsi64x_ss(a.n, b);
+	return _mm_cvtsi64x_ss(a, b);
 #endif
 #else
-	r.f32[0] = (simde_float32)b;
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < 4; i++) {
-		r.i32[i] = a.i32[i];
-	}
+	simde__m128_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vsetq_lane_f32((simde_float32)b, a_.neon_f32, 0);
+#else
+	r_ = a_;
+	r_.f32[0] = HEDLEY_STATIC_CAST(simde_float32, b);
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi64_ss(a, b) simde_mm_cvtsi64_ss((a), b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde_float32 simde_mm_cvtss_f32(simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_cvtss_f32(a.n);
-#elif defined(SIMDE_SSE_NEON)
-	return vgetq_lane_f32(a.neon_f32, 0);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cvtss_f32(a);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vgetq_lane_f32(a_.neon_f32, 0);
 #else
-	return a.f32[0];
+	return a_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtss_f32(a) simde_mm_cvtss_f32((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvtss_si32(simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_cvtss_si32(a.n);
-#else
-	return (int32_t)a.f32[0];
-#endif
+	return simde_mm_cvt_ss2si(a);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtss_si32(a) simde_mm_cvtss_si32((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int64_t simde_mm_cvtss_si64(simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if !defined(__PGI)
-	return _mm_cvtss_si64(a.n);
+	return _mm_cvtss_si64(a);
 #else
-	return _mm_cvtss_si64x(a.n);
+	return _mm_cvtss_si64x(a);
 #endif
 #else
-	return (int64_t)a.f32[0];
+	simde__m128_private a_ = simde__m128_to_private(a);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return SIMDE_CONVERT_FTOI(int64_t, vgetq_lane_f32(a_.neon_f32, 0));
+#else
+	return SIMDE_CONVERT_FTOI(int64_t, a_.f32[0]);
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtss_si64(a) simde_mm_cvtss_si64((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtt_ps2pi(simde__m128 a)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtt_ps2pi(a);
+#else
+	simde__m64_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvtt_ps2pi(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vcvt_s32_f32(vget_low_f32(a_.neon_f32));
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.m64_private[0].f32);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.i32[i] = (int32_t)truncf(a.f32[i]);
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.i32[i] = SIMDE_CONVERT_FTOI(int32_t, a_.f32[i]);
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
+#define simde_mm_cvttps_pi32(a) simde_mm_cvtt_ps2pi(a)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtt_ps2pi(a) simde_mm_cvtt_ps2pi((a))
+#define _mm_cvttps_pi32(a) simde_mm_cvttps_pi32((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvtt_ss2si(simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_cvtt_ss2si(a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cvtt_ss2si(a);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return SIMDE_CONVERT_FTOI(int32_t, vgetq_lane_f32(a_.neon_f32, 0));
 #else
-	return (int32_t)truncf(a.f32[0]);
+	return SIMDE_CONVERT_FTOI(int32_t, a_.f32[0]);
+#endif
 #endif
 }
+#define simde_mm_cvttss_si32(a) simde_mm_cvtt_ss2si((a))
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtt_ss2si(a) simde_mm_cvtt_ss2si((a))
+#define _mm_cvttss_si32(a) simde_mm_cvtt_ss2si((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m64 simde_mm_cvttps_pi32(simde__m128 a)
+SIMDE_FUNCTION_ATTRIBUTES
+int64_t simde_mm_cvttss_si64(simde__m128 a)
 {
-	simde__m64 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_cvttps_pi32(a.n);
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_ARCH_AMD64) && \
+	!defined(_MSC_VER)
+#if defined(__PGI)
+	return _mm_cvttss_si64x(a);
 #else
-	r = simde_mm_cvtt_ps2pi(a);
+	return _mm_cvttss_si64(a);
 #endif
+#else
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-	return r;
-}
-
-SIMDE__FUNCTION_ATTRIBUTES
-int32_t simde_mm_cvttss_si32(simde__m128 a)
-{
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_cvttss_si32(a.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return SIMDE_CONVERT_FTOI(int64_t, vgetq_lane_f32(a_.neon_f32, 0));
 #else
-	return (int32_t)truncf(a.f32[0]);
+	return SIMDE_CONVERT_FTOI(int64_t, a_.f32[0]);
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cvttss_si64(a) simde_mm_cvttss_si64((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-int64_t simde_mm_cvttss_si64(simde__m128 a)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_cmpord_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE) && defined(SIMDE_ARCH_AMD64)
-#if defined(__PGI)
-	return _mm_cvttss_si64x(a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_cmpord_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_cmpord_ps(a, b));
 #else
-	return _mm_cvttss_si64(a.n);
-#endif
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
+
+#if defined(simde_math_isnanf)
+	r_.u32[0] = (simde_math_isnanf(simde_mm_cvtss_f32(a)) ||
+		     simde_math_isnanf(simde_mm_cvtss_f32(b)))
+			    ? UINT32_C(0)
+			    : ~UINT32_C(0);
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.u32[i] = a_.u32[i];
+	}
 #else
-	return (int64_t)truncf(a.f32[0]);
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpord_ss(a, b) simde_mm_cmpord_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_div_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_div_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_div_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t recip0 = vrecpeq_f32(b.neon_f32);
-	float32x4_t recip1 = vmulq_f32(recip0, vrecpsq_f32(recip0, b.neon_f32));
-	r.neon_f32 = vmulq_f32(a.neon_f32, recip1);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i] / b.f32[i];
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_f32 = vdivq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	float32x4_t recip0 = vrecpeq_f32(b_.neon_f32);
+	float32x4_t recip1 =
+		vmulq_f32(recip0, vrecpsq_f32(recip0, b_.neon_f32));
+	r_.neon_f32 = vmulq_f32(a_.neon_f32, recip1);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_div(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f32 = a_.f32 / b_.f32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = a_.f32[i] / b_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_div_ps(a, b) simde_mm_div_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_div_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_div_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_div_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_div_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32_t value = vgetq_lane_f32(simde_mm_div_ps(a, b).neon_f32, 0);
-	r.neon_f32 = vsetq_lane_f32(value, a.neon_f32, 0);
-#else
-	r.f32[0] = a.f32[0] / b.f32[0];
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i];
+	r_.f32[0] = a_.f32[0] / b_.f32[0];
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = a_.f32[i];
 	}
-#endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_div_ss(a, b) simde_mm_div_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-int32_t simde_mm_extract_pi16(simde__m64 a, const int imm8)
+SIMDE_FUNCTION_ATTRIBUTES
+int16_t simde_mm_extract_pi16(simde__m64 a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 3)
 {
-	return a.u16[imm8];
+	simde__m64_private a_ = simde__m64_to_private(a);
+	return a_.i16[imm8];
 }
-#if defined(SIMDE_SSE_NATIVE)
-#define simde_mm_extract_pi16(a, imm8) _mm_extract_pi16(a.n, imm8)
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE) && \
+	!defined(HEDLEY_PGI_VERSION)
+#if HEDLEY_HAS_WARNING("-Wvector-conversion")
+/* https://bugs.llvm.org/show_bug.cgi?id=44589 */
+#define simde_mm_extract_pi16(a, imm8)                                      \
+	(HEDLEY_DIAGNOSTIC_PUSH _Pragma(                                    \
+		"clang diagnostic ignored \"-Wvector-conversion\"")         \
+		 HEDLEY_STATIC_CAST(int16_t, _mm_extract_pi16((a), (imm8))) \
+			 HEDLEY_DIAGNOSTIC_POP)
+#else
+#define simde_mm_extract_pi16(a, imm8) \
+	HEDLEY_STATIC_CAST(int16_t, _mm_extract_pi16(a, imm8))
+#endif
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_extract_pi16(a, imm8) \
+	vget_lane_s16(simde__m64_to_private(a).neon_i16, imm8)
+#endif
+#define simde_m_pextrw(a, imm8) simde_mm_extract_pi16(a, imm8)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_extract_pi16(a, imm8) simde_mm_extract_pi16((a), (imm8))
 #endif
-#define simde_m_pextrw(a, imm8) simde_mm_extract_pi16(a.n, imm8)
 
 enum {
-#if defined(SIMDE_SSE_NATIVE)
-	simde_MM_ROUND_NEAREST = _MM_ROUND_NEAREST,
-	simde_MM_ROUND_DOWN = _MM_ROUND_DOWN,
-	simde_MM_ROUND_UP = _MM_ROUND_UP,
-	simde_MM_ROUND_TOWARD_ZERO = _MM_ROUND_TOWARD_ZERO
+#if defined(SIMDE_X86_SSE_NATIVE)
+	SIMDE_MM_ROUND_NEAREST = _MM_ROUND_NEAREST,
+	SIMDE_MM_ROUND_DOWN = _MM_ROUND_DOWN,
+	SIMDE_MM_ROUND_UP = _MM_ROUND_UP,
+	SIMDE_MM_ROUND_TOWARD_ZERO = _MM_ROUND_TOWARD_ZERO
 #else
-	simde_MM_ROUND_NEAREST
+	SIMDE_MM_ROUND_NEAREST
 #if defined(FE_TONEAREST)
 	= FE_TONEAREST
 #endif
 	,
 
-	simde_MM_ROUND_DOWN
+	SIMDE_MM_ROUND_DOWN
 #if defined(FE_DOWNWARD)
 	= FE_DOWNWARD
 #endif
 	,
 
-	simde_MM_ROUND_UP
+	SIMDE_MM_ROUND_UP
 #if defined(FE_UPWARD)
 	= FE_UPWARD
 #endif
 	,
 
-	simde_MM_ROUND_TOWARD_ZERO
+	SIMDE_MM_ROUND_TOWARD_ZERO
 #if defined(FE_TOWARDZERO)
 	= FE_TOWARDZERO
 #endif
 #endif
 };
 
-SIMDE__FUNCTION_ATTRIBUTES
-unsigned int simde_MM_GET_ROUNDING_MODE(void)
+SIMDE_FUNCTION_ATTRIBUTES
+unsigned int SIMDE_MM_GET_ROUNDING_MODE(void)
 {
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 	return _MM_GET_ROUNDING_MODE();
+#elif defined(SIMDE_HAVE_FENV_H)
+	return HEDLEY_STATIC_CAST(unsigned int, fegetround());
 #else
-	return fegetround();
+	HEDLEY_UNREACHABLE();
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _MM_GET_ROUNDING_MODE() SIMDE_MM_GET_ROUNDING_MODE()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-void simde_MM_SET_ROUNDING_MODE(unsigned int a)
+SIMDE_FUNCTION_ATTRIBUTES
+void SIMDE_MM_SET_ROUNDING_MODE(unsigned int a)
 {
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 	_MM_SET_ROUNDING_MODE(a);
-#else
-	fesetround((int)a);
+#elif defined(SIMDE_HAVE_FENV_H)
+	fesetround(HEDLEY_STATIC_CAST(int, a));
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _MM_SET_ROUNDING_MODE(a) SIMDE_MM_SET_ROUNDING_MODE(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_insert_pi16(simde__m64 a, int16_t i, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 3)
 {
-	simde__m64 r;
-	r.i64[0] = a.i64[0];
-	r.i16[imm8] = i;
-	return r;
+	simde__m64_private r_, a_ = simde__m64_to_private(a);
+
+	r_.i64[0] = a_.i64[0];
+	r_.i16[imm8] = i;
+
+	return simde__m64_from_private(r_);
 }
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE) && \
+	!defined(__PGI)
+#if HEDLEY_HAS_WARNING("-Wvector-conversion")
+/* https://bugs.llvm.org/show_bug.cgi?id=44589 */
+#define ssimde_mm_insert_pi16(a, i, imm8)                            \
+	(HEDLEY_DIAGNOSTIC_PUSH _Pragma(                             \
+		"clang diagnostic ignored \"-Wvector-conversion\"")( \
+		_mm_insert_pi16((a), (i), (imm8))) HEDLEY_DIAGNOSTIC_POP)
+#else
+#define simde_mm_insert_pi16(a, i, imm8) _mm_insert_pi16(a, i, imm8)
+#endif
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 #define simde_mm_insert_pi16(a, i, imm8) \
-	SIMDE__M64_C(_mm_insert_pi16((a).n, i, imm8));
+	simde__m64_from_neon_i16(        \
+		vset_lane_s16((i), simde__m64_to_neon_i16(a), (imm8)))
+#endif
+#define simde_m_pinsrw(a, i, imm8) (simde_mm_insert_pi16(a, i, imm8))
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_insert_pi16(a, i, imm8) simde_mm_insert_pi16(a, i, imm8)
+#define _m_pinsrw(a, i, imm8) simde_mm_insert_pi16(a, i, imm8)
 #endif
-#define simde_m_pinsrw(a, i, imm8) \
-	SIMDE__M64_C(simde_mm_insert_pi16((a).n, i, imm8));
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128
 simde_mm_load_ps(simde_float32 const mem_addr[HEDLEY_ARRAY_PARAM(4)])
 {
-	simde__m128 r;
-
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_load_ps(mem_addr);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vld1q_f32(mem_addr);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_load_ps(mem_addr);
+#else
+	simde__m128_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vld1q_f32(mem_addr);
+#elif defined(SIMDE_POWER_ALTIVEC_P7_NATIVE)
+	r_.altivec_f32 = vec_vsx_ld(0, mem_addr);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_ld(0, mem_addr);
 #else
-	memcpy(&r, mem_addr, sizeof(r.f32));
+	r_ = *SIMDE_ALIGN_CAST(simde__m128_private const *, mem_addr);
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_load_ps(mem_addr) simde_mm_load_ps(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_load_ps1(simde_float32 const *mem_addr)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_load_ps1(mem_addr);
+#else
+	simde__m128_private r_;
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_load_ps1(mem_addr);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vld1q_dup_f32(mem_addr);
 #else
-	const simde_float32 v = *mem_addr;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.f32[i] = v;
-	}
+	r_ = simde__m128_to_private(simde_mm_set1_ps(*mem_addr));
 #endif
 
-	return r;
-}
-
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_load_ss(simde_float32 const *mem_addr)
-{
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_load_ss(mem_addr);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vsetq_lane_f32(*mem_addr, vdupq_n_f32(0), 0);
-#else
-	r.f32[0] = *mem_addr;
-	r.i32[1] = 0;
-	r.i32[2] = 0;
-	r.i32[3] = 0;
+	return simde__m128_from_private(r_);
 #endif
-
-	return r;
 }
+#define simde_mm_load1_ps(mem_addr) simde_mm_load_ps1(mem_addr)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_load_ps1(mem_addr) simde_mm_load_ps1(mem_addr)
+#define _mm_load1_ps(mem_addr) simde_mm_load_ps1(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_load1_ps(simde_float32 const *mem_addr)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_load_ss(simde_float32 const *mem_addr)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_load_ss(mem_addr);
+#else
+	simde__m128_private r_;
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_load1_ps(mem_addr);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vld1q_dup_f32(mem_addr);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vsetq_lane_f32(*mem_addr, vdupq_n_f32(0), 0);
 #else
-	r = simde_mm_load_ps1(mem_addr);
+	r_.f32[0] = *mem_addr;
+	r_.i32[1] = 0;
+	r_.i32[2] = 0;
+	r_.i32[3] = 0;
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_load_ss(mem_addr) simde_mm_load_ss(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_loadh_pi(simde__m128 a, simde__m64 const *mem_addr)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_loadh_pi(a,
+			    HEDLEY_REINTERPRET_CAST(__m64 const *, mem_addr));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_loadh_pi(a.n, (__m64 *)mem_addr);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcombine_f32(
+		vget_low_f32(a_.neon_f32),
+		vld1_f32(HEDLEY_REINTERPRET_CAST(const float32_t *, mem_addr)));
 #else
-	r.f32[0] = a.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = mem_addr->f32[0];
-	r.f32[3] = mem_addr->f32[1];
+	simde__m64_private b_ =
+		*HEDLEY_REINTERPRET_CAST(simde__m64_private const *, mem_addr);
+	r_.f32[0] = a_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = b_.f32[0];
+	r_.f32[3] = b_.f32[1];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_loadh_pi(a, mem_addr) \
+	simde_mm_loadh_pi((a), (simde__m64 const *)(mem_addr))
+#endif
+
+/* The SSE documentation says that there are no alignment requirements
+   for mem_addr.  Unfortunately they used the __m64 type for the argument
+   which is supposed to be 8-byte aligned, so some compilers (like clang
+   with -Wcast-align) will generate a warning if you try to cast, say,
+   a simde_float32* to a simde__m64* for this function.
 
-SIMDE__FUNCTION_ATTRIBUTES
+   I think the choice of argument type is unfortunate, but I do think we
+   need to stick to it here.  If there is demand I can always add something
+   like simde_x_mm_loadl_f32(simde__m128, simde_float32 mem_addr[2]) */
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_loadl_pi(simde__m128 a, simde__m64 const *mem_addr)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_loadl_pi(a,
+			    HEDLEY_REINTERPRET_CAST(__m64 const *, mem_addr));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_loadl_pi(a.n, (__m64 *)mem_addr);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcombine_f32(
+		vld1_f32(HEDLEY_REINTERPRET_CAST(const float32_t *, mem_addr)),
+		vget_high_f32(a_.neon_f32));
 #else
-	r.f32[0] = mem_addr->f32[0];
-	r.f32[1] = mem_addr->f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
+	simde__m64_private b_;
+	simde_memcpy(&b_, mem_addr, sizeof(b_));
+	r_.i32[0] = b_.i32[0];
+	r_.i32[1] = b_.i32[1];
+	r_.i32[2] = a_.i32[2];
+	r_.i32[3] = a_.i32[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_loadl_pi(a, mem_addr) \
+	simde_mm_loadl_pi((a), (simde__m64 const *)(mem_addr))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128
 simde_mm_loadr_ps(simde_float32 const mem_addr[HEDLEY_ARRAY_PARAM(4)])
 {
-	simde__m128 r;
-
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_loadr_ps(mem_addr);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_loadr_ps(mem_addr);
 #else
-	r.f32[0] = mem_addr[3];
-	r.f32[1] = mem_addr[2];
-	r.f32[2] = mem_addr[1];
-	r.f32[3] = mem_addr[0];
+	simde__m128_private r_,
+		v_ = simde__m128_to_private(simde_mm_load_ps(mem_addr));
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vrev64q_f32(v_.neon_f32);
+	r_.neon_f32 = vextq_f32(r_.neon_f32, r_.neon_f32, 2);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, v_.f32, v_.f32, 3, 2, 1, 0);
+#else
+	r_.f32[0] = v_.f32[3];
+	r_.f32[1] = v_.f32[2];
+	r_.f32[2] = v_.f32[1];
+	r_.f32[3] = v_.f32[0];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_loadr_ps(mem_addr) simde_mm_loadr_ps(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128
 simde_mm_loadu_ps(simde_float32 const mem_addr[HEDLEY_ARRAY_PARAM(4)])
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_loadu_ps(mem_addr);
+#else
+	simde__m128_private r_;
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_loadu_ps(mem_addr);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vld1q_f32(mem_addr);
-#else
-	r.f32[0] = mem_addr[0];
-	r.f32[1] = mem_addr[1];
-	r.f32[2] = mem_addr[2];
-	r.f32[3] = mem_addr[3];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 =
+		vld1q_f32(HEDLEY_REINTERPRET_CAST(const float32_t *, mem_addr));
+#else
+	r_.f32[0] = mem_addr[0];
+	r_.f32[1] = mem_addr[1];
+	r_.f32[2] = mem_addr[2];
+	r_.f32[3] = mem_addr[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_loadu_ps(mem_addr) simde_mm_loadu_ps(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-void simde_mm_maskmove_si64(simde__m64 a, simde__m64 mask, char *mem_addr)
+SIMDE_FUNCTION_ATTRIBUTES
+void simde_mm_maskmove_si64(simde__m64 a, simde__m64 mask, int8_t *mem_addr)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_maskmove_si64(a.n, mask.n, mem_addr);
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	_mm_maskmove_si64(a, mask, HEDLEY_REINTERPRET_CAST(char *, mem_addr));
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(a.i8) / sizeof(a.i8[0])); i++)
-		if (mask.i8[i] < 0)
-			mem_addr[i] = a.i8[i];
+	simde__m64_private a_ = simde__m64_to_private(a),
+			   mask_ = simde__m64_to_private(mask);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(a_.i8) / sizeof(a_.i8[0])); i++)
+		if (mask_.i8[i] < 0)
+			mem_addr[i] = a_.i8[i];
 #endif
 }
 #define simde_m_maskmovq(a, mask, mem_addr) \
 	simde_mm_maskmove_si64(a, mask, mem_addr)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_maskmove_si64(a, mask, mem_addr) \
+	simde_mm_maskmove_si64(              \
+		(a), (mask),                 \
+		SIMDE_CHECKED_REINTERPRET_CAST(int8_t *, char *, (mem_addr)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_max_pi16(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_max_pi16(a, b);
+#else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_max_pi16(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vmax_s16(a_.neon_i16, b_.neon_i16);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] > b.i16[i]) ? a.i16[i] : b.i16[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] > b_.i16[i]) ? a_.i16[i] : b_.i16[i];
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pmaxsw(a, b) simde_mm_max_pi16(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_max_pi16(a, b) simde_mm_max_pi16(a, b)
+#define _m_pmaxsw(a, b) simde_mm_max_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_max_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_max_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_max_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vmaxq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = (a.f32[i] > b.f32[i]) ? a.f32[i] : b.f32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vmaxq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_max(a_.altivec_f32, b_.altivec_f32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = (a_.f32[i] > b_.f32[i]) ? a_.f32[i] : b_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_max_ps(a, b) simde_mm_max_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_max_pu8(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_max_pu8(a, b);
+#else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_max_pu8(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vmax_u8(a_.neon_u8, b_.neon_u8);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		r.u8[i] = (a.u8[i] > b.u8[i]) ? a.u8[i] : b.u8[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = (a_.u8[i] > b_.u8[i]) ? a_.u8[i] : b_.u8[i];
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pmaxub(a, b) simde_mm_max_pu8(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_max_pu8(a, b) simde_mm_max_pu8(a, b)
+#define _m_pmaxub(a, b) simde_mm_max_pu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_max_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_max_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_max_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_max_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32_t value = vgetq_lane_f32(vmaxq_f32(a.neon_f32, b.neon_f32), 0);
-	r.neon_f32 = vsetq_lane_f32(value, a.neon_f32, 0);
-#else
-	r.f32[0] = (a.f32[0] > b.f32[0]) ? a.f32[0] : b.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#endif
+	r_.f32[0] = (a_.f32[0] > b_.f32[0]) ? a_.f32[0] : b_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_max_ss(a, b) simde_mm_max_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_min_pi16(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_min_pi16(a, b);
+#else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_min_pi16(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vmin_s16(a_.neon_i16, b_.neon_i16);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] < b.i16[i]) ? a.i16[i] : b.i16[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] < b_.i16[i]) ? a_.i16[i] : b_.i16[i];
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pminsw(a, b) simde_mm_min_pi16(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_min_pi16(a, b) simde_mm_min_pi16(a, b)
+#define _m_pminsw(a, b) simde_mm_min_pi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_min_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_min_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_min_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vminq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = (a.f32[i] < b.f32[i]) ? a.f32[i] : b.f32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vminq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_min(a_.altivec_f32, b_.altivec_f32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = (a_.f32[i] < b_.f32[i]) ? a_.f32[i] : b_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_min_ps(a, b) simde_mm_min_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_min_pu8(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_min_pu8(a, b);
+#else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_min_pu8(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vmin_u8(a_.neon_u8, b_.neon_u8);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		r.u8[i] = (a.u8[i] < b.u8[i]) ? a.u8[i] : b.u8[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = (a_.u8[i] < b_.u8[i]) ? a_.u8[i] : b_.u8[i];
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pminub(a, b) simde_mm_min_pu8(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_min_pu8(a, b) simde_mm_min_pu8(a, b)
+#define _m_pminub(a, b) simde_mm_min_pu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_min_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_min_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_min_ps(a, b));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_min_ss(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32_t value = vgetq_lane_f32(vminq_f32(a.neon_f32, b.neon_f32), 0);
-	r.neon_f32 = vsetq_lane_f32(value, a.neon_f32, 0);
-#else
-	r.f32[0] = (a.f32[0] < b.f32[0]) ? a.f32[0] : b.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#endif
+	r_.f32[0] = (a_.f32[0] < b_.f32[0]) ? a_.f32[0] : b_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
 
-	return r;
-}
-
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_move_ss(simde__m128 a, simde__m128 b)
-{
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_move_ss(a.n, b.n);
-#else
-	r.f32[0] = b.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
+	return simde__m128_from_private(r_);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_min_ss(a, b) simde_mm_min_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_movehl_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_movehl_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_movehl_ps(a.n, b.n);
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.f32, b_.f32, 6, 7, 2, 3);
 #else
-	r.f32[0] = b.f32[2];
-	r.f32[1] = b.f32[3];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
+	r_.f32[0] = b_.f32[2];
+	r_.f32[1] = b_.f32[3];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_movehl_ps(a, b) simde_mm_movehl_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_movelh_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_movelh_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_movelh_ps(a.n, b.n);
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.f32, b_.f32, 0, 1, 4, 5);
 #else
-	r.f32[0] = a.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = b.f32[0];
-	r.f32[3] = b.f32[1];
+	r_.f32[0] = a_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = b_.f32[0];
+	r_.f32[3] = b_.f32[1];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_movelh_ps(a, b) simde_mm_movelh_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_movemask_pi8(simde__m64 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_movemask_pi8(a.n);
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_movemask_pi8(a);
 #else
+	simde__m64_private a_ = simde__m64_to_private(a);
 	int r = 0;
-	const size_t nmemb = sizeof(a.i8) / sizeof(a.i8[0]);
+	const size_t nmemb = sizeof(a_.i8) / sizeof(a_.i8[0]);
 
-	SIMDE__VECTORIZE_REDUCTION(| : r)
+	SIMDE_VECTORIZE_REDUCTION(| : r)
 	for (size_t i = 0; i < nmemb; i++) {
-		r |= (a.u8[nmemb - 1 - i] >> 7) << (nmemb - 1 - i);
+		r |= (a_.u8[nmemb - 1 - i] >> 7) << (nmemb - 1 - i);
 	}
 
 	return r;
 #endif
 }
 #define simde_m_pmovmskb(a, b) simde_mm_movemask_pi8(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_movemask_pi8(a) simde_mm_movemask_pi8(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_movemask_ps(simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_movemask_ps(a.n);
-#elif defined(SIMDE_SSE_NEON)
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_movemask_ps(a);
+#else
+	int r = 0;
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 	/* TODO: check to see if NEON version is faster than the portable version */
 	static const uint32x4_t movemask = {1, 2, 4, 8};
 	static const uint32x4_t highbit = {0x80000000, 0x80000000, 0x80000000,
 					   0x80000000};
-	uint32x4_t t0 = a.neon_u32;
+	uint32x4_t t0 = a_.neon_u32;
 	uint32x4_t t1 = vtstq_u32(t0, highbit);
 	uint32x4_t t2 = vandq_u32(t1, movemask);
 	uint32x2_t t3 = vorr_u32(vget_low_u32(t2), vget_high_u32(t2));
-	return vget_lane_u32(t3, 0) | vget_lane_u32(t3, 1);
+	r = vget_lane_u32(t3, 0) | vget_lane_u32(t3, 1);
 #else
-	int r = 0;
-
-	SIMDE__VECTORIZE_REDUCTION(| : r)
-	for (size_t i = 0; i < sizeof(a.u32) / sizeof(a.u32[0]); i++) {
-		r |= (a.u32[i] >> ((sizeof(a.u32[i]) * CHAR_BIT) - 1)) << i;
+	SIMDE_VECTORIZE_REDUCTION(| : r)
+	for (size_t i = 0; i < sizeof(a_.u32) / sizeof(a_.u32[0]); i++) {
+		r |= (a_.u32[i] >> ((sizeof(a_.u32[i]) * CHAR_BIT) - 1)) << i;
 	}
+#endif
 
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_movemask_ps(a) simde_mm_movemask_ps((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_mul_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_mul_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_mul_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vmulq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i] * b.f32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vmulq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_mul(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f32 = a_.f32 * b_.f32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = a_.f32[i] * b_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_mul_ps(a, b) simde_mm_mul_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_mul_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_mul_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_mul_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_mul_ps(a, b));
 #else
-	r.f32[0] = a.f32[0] * b.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#endif
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-	return r;
+	r_.f32[0] = a_.f32[0] * b_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_mul_ss(a, b) simde_mm_mul_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_mulhi_pu16(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_mulhi_pu16(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_mulhi_pu16(a, b);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = (a.u16[i] * b.u16[i]) >> 16;
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(
+			uint16_t, ((HEDLEY_STATIC_CAST(uint32_t, a_.u16[i]) *
+				    HEDLEY_STATIC_CAST(uint32_t, b_.u16[i])) >>
+				   UINT32_C(16)));
 	}
-#endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_pmulhuw(a, b) simde_mm_mulhi_pu16(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_mulhi_pu16(a, b) simde_mm_mulhi_pu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_or_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_or_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_or_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_i32 = vorrq_s32(a.neon_i32, b.neon_i32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u32) / sizeof(r.u32[0])); i++) {
-		r.u32[i] = a.u32[i] | b.u32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vorrq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_or(a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f | b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] | b_.u32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_or_ps(a, b) simde_mm_or_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_prefetch(char const *p, int i)
 {
 	(void)p;
 	(void)i;
 }
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 #define simde_mm_prefetch(p, i) _mm_prefetch(p, i)
 #endif
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_prefetch(p, i) simde_mm_prefetch(p, i)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_rcp_ps(simde__m128 a)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_rcp_ps(a.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t recip = vrecpeq_f32(a.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_rcp_ps(a);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if !defined(SIMDE_MM_RCP_PS_ITERS)
-#define SIMDE_MM_RCP_PS_ITERS SIMDE_ACCURACY_ITERS
-#endif
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	float32x4_t recip = vrecpeq_f32(a_.neon_f32);
 
-	for (int i = 0; i < SIMDE_MM_RCP_PS_ITERS; ++i) {
-		recip = vmulq_f32(recip, vrecpsq_f32(recip, a.neon_f32));
+#if SIMDE_ACCURACY_PREFERENCE > 0
+	for (int i = 0; i < SIMDE_ACCURACY_PREFERENCE; ++i) {
+		recip = vmulq_f32(recip, vrecpsq_f32(recip, a_.neon_f32));
 	}
+#endif
 
-	r.neon_f32 = recip;
+	r_.neon_f32 = recip;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_re(a_.altivec_f32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.f32 = 1.0f / a_.f32;
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = 1.0f / a.f32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = 1.0f / a_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_rcp_ps(a) simde_mm_rcp_ps((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_rcp_ss(simde__m128 a)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_rcp_ss(a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_rcp_ss(a);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_rcp_ps(a));
 #else
-	r.f32[0] = 1.0f / a.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#endif
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-	return r;
+	r_.f32[0] = 1.0f / a_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_rcp_ss(a) simde_mm_rcp_ss((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_rsqrt_ps(simde__m128 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_rsqrt_ps(a);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_rsqrt_ps(a.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vrsqrteq_f32(a.neon_f32);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vrsqrteq_f32(a_.neon_f32);
 #elif defined(__STDC_IEC_559__)
-	/* http://h14s.p5r.org/2012/09/0x5f3759df.html?mwh=1 */
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.i32[i] = INT32_C(0x5f3759df) - (a.i32[i] >> 1);
-
-#if SIMDE_ACCURACY_ITERS > 2
-		const float half = SIMDE_FLOAT32_C(0.5) * a.f32[i];
-		for (int ai = 2; ai < SIMDE_ACCURACY_ITERS; ai++)
-			r.f32[i] *= SIMDE_FLOAT32_C(1.5) -
-				    (half * r.f32[i] * r.f32[i]);
+	/* https://basesandframes.files.wordpress.com/2020/04/even_faster_math_functions_green_2020.pdf
+     Pages 100 - 103 */
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+#if SIMDE_ACCURACY_PREFERENCE <= 0
+		r_.i32[i] = INT32_C(0x5F37624F) - (a_.i32[i] >> 1);
+#else
+		simde_float32 x = a_.f32[i];
+		simde_float32 xhalf = SIMDE_FLOAT32_C(0.5) * x;
+		int32_t ix;
+
+		simde_memcpy(&ix, &x, sizeof(ix));
+
+#if SIMDE_ACCURACY_PREFERENCE == 1
+		ix = INT32_C(0x5F375A82) - (ix >> 1);
+#else
+		ix = INT32_C(0x5F37599E) - (ix >> 1);
+#endif
+
+		simde_memcpy(&x, &ix, sizeof(x));
+
+#if SIMDE_ACCURACY_PREFERENCE >= 2
+		x = x * (SIMDE_FLOAT32_C(1.5008909) - xhalf * x * x);
+#endif
+		x = x * (SIMDE_FLOAT32_C(1.5008909) - xhalf * x * x);
+
+		r_.f32[i] = x;
 #endif
 	}
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = 1.0f / sqrtf(a.f32[i]);
+#elif defined(simde_math_sqrtf)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = 1.0f / simde_math_sqrtf(a_.f32[i]);
 	}
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_rsqrt_ps(a) simde_mm_rsqrt_ps((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_rsqrt_ss(simde__m128 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_rsqrt_ss(a);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_rsqrt_ps(a));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_rsqrt_ss(a.n);
-#elif defined(__STDC_IEC_559__)
+#if defined(__STDC_IEC_559__)
 	{
-		r.i32[0] = INT32_C(0x5f3759df) - (a.i32[0] >> 1);
+#if SIMDE_ACCURACY_PREFERENCE <= 0
+		r_.i32[0] = INT32_C(0x5F37624F) - (a_.i32[0] >> 1);
+#else
+		simde_float32 x = a_.f32[0];
+		simde_float32 xhalf = SIMDE_FLOAT32_C(0.5) * x;
+		int32_t ix;
+
+		simde_memcpy(&ix, &x, sizeof(ix));
 
-#if SIMDE_ACCURACY_ITERS > 2
-		float half = SIMDE_FLOAT32_C(0.5) * a.f32[0];
-		for (int ai = 2; ai < SIMDE_ACCURACY_ITERS; ai++)
-			r.f32[0] *= SIMDE_FLOAT32_C(1.5) -
-				    (half * r.f32[0] * r.f32[0]);
-#endif
-	}
-	r.f32[0] = 1.0f / sqrtf(a.f32[0]);
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#else
-	r.f32[0] = 1.0f / sqrtf(a.f32[0]);
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
+#if SIMDE_ACCURACY_PREFERENCE == 1
+		ix = INT32_C(0x5F375A82) - (ix >> 1);
+#else
+		ix = INT32_C(0x5F37599E) - (ix >> 1);
 #endif
 
-	return r;
+		simde_memcpy(&x, &ix, sizeof(x));
+
+#if SIMDE_ACCURACY_PREFERENCE >= 2
+		x = x * (SIMDE_FLOAT32_C(1.5008909) - xhalf * x * x);
+#endif
+		x = x * (SIMDE_FLOAT32_C(1.5008909) - xhalf * x * x);
+
+		r_.f32[0] = x;
+#endif
+	}
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+#elif defined(simde_math_sqrtf)
+	r_.f32[0] = 1.0f / simde_math_sqrtf(a_.f32[0]);
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+#else
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_rsqrt_ss(a) simde_mm_rsqrt_ss((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sad_pu8(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_sad_pu8(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sad_pu8(a, b);
 #else
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 	uint16_t sum = 0;
 
-	SIMDE__VECTORIZE_REDUCTION(+ : sum)
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		sum += (uint8_t)abs(a.u8[i] - b.u8[i]);
+#if defined(SIMDE_HAVE_STDLIB_H)
+	SIMDE_VECTORIZE_REDUCTION(+ : sum)
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		sum += HEDLEY_STATIC_CAST(uint8_t, abs(a_.u8[i] - b_.u8[i]));
 	}
 
-	r.i16[0] = sum;
-	r.i16[1] = 0;
-	r.i16[2] = 0;
-	r.i16[3] = 0;
+	r_.i16[0] = HEDLEY_STATIC_CAST(int16_t, sum);
+	r_.i16[1] = 0;
+	r_.i16[2] = 0;
+	r_.i16[3] = 0;
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
 #define simde_m_psadbw(a, b) simde_mm_sad_pu8(a, b)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_sad_pu8(a, b) simde_mm_sad_pu8(a, b)
+#define _m_psadbw(a, b) simde_mm_sad_pu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_set_ps(simde_float32 e3, simde_float32 e2,
-			    simde_float32 e1, simde_float32 e0)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_set_ss(simde_float32 a)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_set_ps(e3, e2, e1, e0);
-#elif defined(SIMDE_SSE_NEON)
-	SIMDE_ALIGN(16) simde_float32 data[4] = {e0, e1, e2, e3};
-	r.neon_f32 = vld1q_f32(data);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_set_ss(a);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vsetq_lane_f32(a, vdupq_n_f32(SIMDE_FLOAT32_C(0.0)), 0);
 #else
-	r.f32[0] = e0;
-	r.f32[1] = e1;
-	r.f32[2] = e2;
-	r.f32[3] = e3;
+	return simde_mm_set_ps(SIMDE_FLOAT32_C(0.0), SIMDE_FLOAT32_C(0.0),
+			       SIMDE_FLOAT32_C(0.0), a);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_set_ss(a) simde_mm_set_ss(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_set_ps1(simde_float32 a)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_setr_ps(simde_float32 e3, simde_float32 e2,
+			     simde_float32 e1, simde_float32 e0)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_set1_ps(a);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vdupq_n_f32(a);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_setr_ps(e3, e2, e1, e0);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN(16) simde_float32 data[4] = {e3, e2, e1, e0};
+	return vld1q_f32(data);
 #else
-	r = simde_mm_set_ps(a, a, a, a);
+	return simde_mm_set_ps(e0, e1, e2, e3);
 #endif
-
-	return r;
 }
-#define simde_mm_set1_ps(a) simde_mm_set_ps1(a)
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_ps(e3, e2, e1, e0) simde_mm_setr_ps(e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_set_ss(simde_float32 a)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_setzero_ps(void)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_set_ss(a);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_setzero_ps();
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vdupq_n_f32(SIMDE_FLOAT32_C(0.0));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	return vec_splats((float)0);
 #else
-	r = simde_mm_set_ps(0, 0, 0, a);
-#endif
-
+	simde__m128 r;
+	simde_memset(&r, 0, sizeof(r));
 	return r;
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_setzero_ps() simde_mm_setzero_ps()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_setr_ps(simde_float32 e3, simde_float32 e2,
-			     simde_float32 e1, simde_float32 e0)
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_mm_undefined_ps(void)
 {
-	simde__m128 r;
+	simde__m128_private r_;
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_setr_ps(e3, e2, e1, e0);
-#elif defined(SIMDE_SSE_NEON)
-	SIMDE_ALIGN(16) simde_float32 data[4] = {e3, e2, e1, e0};
-	r.neon_f32 = vld1q_f32(data);
-#else
-	r = simde_mm_set_ps(e0, e1, e2, e3);
+#if defined(SIMDE_HAVE_UNDEFINED128)
+	r_.n = _mm_undefined_ps();
+#elif !defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+	r_ = simde__m128_to_private(simde_mm_setzero_ps());
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_undefined_ps() simde_mm_undefined_ps()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_setzero_ps(void)
-{
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_setzero_ps();
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vdupq_n_f32(0.0f);
-#else
-	r = simde_mm_set_ps(0.0f, 0.0f, 0.0f, 0.0f);
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_POP
 #endif
 
-	return r;
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128 simde_x_mm_setone_ps(void)
+{
+	simde__m128 t = simde_mm_setzero_ps();
+	return simde_mm_cmpeq_ps(t, t);
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_sfence(void)
 {
 	/* TODO: Use Hedley. */
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 	_mm_sfence();
 #elif defined(__GNUC__) && \
 	((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
@@ -2062,516 +2821,783 @@
 #endif
 #elif defined(_MSC_VER)
 	MemoryBarrier();
-#elif defined(__GNUC__) && \
-	((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
-	__atomic_thread_fence(__ATOMIC_SEQ_CST);
-#elif HEDLEY_CLANG_HAS_FEATURE(c_atomic)
-	__c11_atomic_thread_fence(__ATOMIC_SEQ_CST)
+#elif HEDLEY_HAS_EXTENSION(c_atomic)
+	__c11_atomic_thread_fence(__ATOMIC_SEQ_CST);
 #elif defined(__GNUC__) && \
 	((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
 	__sync_synchronize();
-#elif (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5140)) || \
-	(defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x5140))
-	__atomic_thread_fence(__ATOMIC_SEQ_CST);
 #elif defined(_OPENMP)
 #pragma omp critical(simde_mm_sfence_)
 	{
 	}
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_sfence() simde_mm_sfence()
+#endif
 
 #define SIMDE_MM_SHUFFLE(z, y, x, w) \
 	(((z) << 6) | ((y) << 4) | ((x) << 2) | (w))
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _MM_SHUFFLE(z, y, x, w) SIMDE_MM_SHUFFLE(z, y, x, w)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE) && \
+	!defined(__PGI)
+#define simde_mm_shuffle_pi16(a, imm8) _mm_shuffle_pi16(a, imm8)
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_shuffle_pi16(a, imm8)                                    \
+	(__extension__({                                                  \
+		const simde__m64_private simde__tmp_a_ =                  \
+			simde__m64_to_private(a);                         \
+		simde__m64_from_private((simde__m64_private){             \
+			.i16 = SIMDE_SHUFFLE_VECTOR_(                     \
+				16, 8, (simde__tmp_a_).i16,               \
+				(simde__tmp_a_).i16, (((imm8)) & 3),      \
+				(((imm8) >> 2) & 3), (((imm8) >> 4) & 3), \
+				(((imm8) >> 6) & 3))});                   \
+	}))
+#else
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_shuffle_pi16(simde__m64 a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m64 r;
-	for (size_t i = 0; i < sizeof(r.u16) / sizeof(r.u16[0]); i++) {
-		r.i16[i] = a.i16[(imm8 >> (i * 2)) & 3];
+	simde__m64_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+	for (size_t i = 0; i < sizeof(r_.i16) / sizeof(r_.i16[0]); i++) {
+		r_.i16[i] = a_.i16[(imm8 >> (i * 2)) & 3];
 	}
-	return r;
+
+	HEDLEY_DIAGNOSTIC_PUSH
+#if HEDLEY_HAS_WARNING("-Wconditional-uninitialized")
+#pragma clang diagnostic ignored "-Wconditional-uninitialized"
+#endif
+	return simde__m64_from_private(r_);
+	HEDLEY_DIAGNOSTIC_POP
 }
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-#define simde_mm_shuffle_pi16(a, imm8) SIMDE__M64_C(_mm_shuffle_pi16(a.n, imm8))
-#elif defined(SIMDE__SHUFFLE_VECTOR)
-#define simde_mm_shuffle_pi16(a, imm8)                                         \
-	({                                                                     \
-		const simde__m64 simde__tmp_a_ = a;                            \
-		(simde__m64){.i16 = SIMDE__SHUFFLE_VECTOR(                     \
-				     16, 8, (simde__tmp_a_).i16,               \
-				     (simde__tmp_a_).i16, (((imm8)) & 3),      \
-				     (((imm8) >> 2) & 3), (((imm8) >> 4) & 3), \
-				     (((imm8) >> 6) & 3))};                    \
-	})
 #endif
-
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-#define simde_m_pshufw(a, imm8) SIMDE__M64_C(_m_pshufw(a.n, imm8))
+#if defined(SIMDE_X86_SSE_NATIVE) && !defined(__PGI)
+#define simde_m_pshufw(a, imm8) _m_pshufw(a, imm8)
 #else
 #define simde_m_pshufw(a, imm8) simde_mm_shuffle_pi16(a, imm8)
 #endif
-
-SIMDE__FUNCTION_ATTRIBUTES
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_shuffle_pi16(a, imm8) simde_mm_shuffle_pi16(a, imm8)
+#define _m_pshufw(a, imm8) simde_mm_shuffle_pi16(a, imm8)
+#endif
+
+#if defined(SIMDE_X86_SSE_NATIVE) && !defined(__PGI)
+#define simde_mm_shuffle_ps(a, b, imm8) _mm_shuffle_ps(a, b, imm8)
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_shuffle_ps(a, b, imm8)                                        \
+	(__extension__({                                                       \
+		simde__m128_from_private((simde__m128_private){                \
+			.f32 = SIMDE_SHUFFLE_VECTOR_(                          \
+				32, 16, simde__m128_to_private(a).f32,         \
+				simde__m128_to_private(b).f32, (((imm8)) & 3), \
+				(((imm8) >> 2) & 3), (((imm8) >> 4) & 3) + 4,  \
+				(((imm8) >> 6) & 3) + 4)});                    \
+	}))
+#else
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_shuffle_ps(simde__m128 a, simde__m128 b, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128 r;
-	r.f32[0] = a.f32[(imm8 >> 0) & 3];
-	r.f32[1] = a.f32[(imm8 >> 2) & 3];
-	r.f32[2] = b.f32[(imm8 >> 4) & 3];
-	r.f32[3] = b.f32[(imm8 >> 6) & 3];
-	return r;
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
+
+	r_.f32[0] = a_.f32[(imm8 >> 0) & 3];
+	r_.f32[1] = a_.f32[(imm8 >> 2) & 3];
+	r_.f32[2] = b_.f32[(imm8 >> 4) & 3];
+	r_.f32[3] = b_.f32[(imm8 >> 6) & 3];
+
+	return simde__m128_from_private(r_);
 }
-#if defined(SIMDE_SSE_NATIVE) && !defined(__PGI)
-#define simde_mm_shuffle_ps(a, b, imm8) \
-	SIMDE__M128_C(_mm_shuffle_ps(a.n, b.n, imm8))
-#elif defined(SIMDE__SHUFFLE_VECTOR)
-#define simde_mm_shuffle_ps(a, b, imm8)                                    \
-	({                                                                 \
-		(simde__m128){.f32 = SIMDE__SHUFFLE_VECTOR(                \
-				      32, 16, (a).f32, (b).f32,            \
-				      (((imm8)) & 3), (((imm8) >> 2) & 3), \
-				      (((imm8) >> 4) & 3) + 4,             \
-				      (((imm8) >> 6) & 3) + 4)};           \
-	})
+#endif
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_shuffle_ps(a, b, imm8) simde_mm_shuffle_ps((a), (b), imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_sqrt_ps(simde__m128 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_sqrt_ps(a);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_sqrt_ps(a.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x4_t recipsq = vrsqrteq_f32(a.neon_f32);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	float32x4_t recipsq = vrsqrteq_f32(a_.neon_f32);
 	float32x4_t sq = vrecpeq_f32(recipsq);
 	/* ??? use step versions of both sqrt and recip for better accuracy? */
-	r.neon_f32 = sq;
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < sizeof(r.f32) / sizeof(r.f32[0]); i++) {
-		r.f32[i] = sqrtf(a.f32[i]);
+	r_.neon_f32 = sq;
+#elif defined(simde_math_sqrt)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < sizeof(r_.f32) / sizeof(r_.f32[0]); i++) {
+		r_.f32[i] = simde_math_sqrtf(a_.f32[i]);
 	}
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_sqrt_ps(a) simde_mm_sqrt_ps((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_sqrt_ss(simde__m128 a)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_sqrt_ss(a);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_sqrt_ps(a));
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_sqrt_ss(a.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32_t value = vgetq_lane_f32(simde_mm_sqrt_ps(a).neon_f32, 0);
-	r.neon_f32 = vsetq_lane_f32(value, a.neon_f32, 0);
-#else
-	r.f32[0] = sqrtf(a.f32[0]);
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
+#if defined(simde_math_sqrtf)
+	r_.f32[0] = simde_math_sqrtf(a_.f32[0]);
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+#else
+	HEDLEY_UNREACHABLE();
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_sqrt_ss(a) simde_mm_sqrt_ss((a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store_ps(simde_float32 mem_addr[4], simde__m128 a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_store_ps(mem_addr, a.n);
-#elif defined(SIMDE_SSE_NEON)
-	vst1q_f32(mem_addr, a.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_store_ps(mem_addr, a);
 #else
-	SIMDE__VECTORIZE_ALIGNED(mem_addr : 16)
-	for (size_t i = 0; i < sizeof(a.f32) / sizeof(a.f32[0]); i++) {
-		mem_addr[i] = a.f32[i];
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	vst1q_f32(mem_addr, a_.neon_f32);
+#elif defined(SIMDE_POWER_ALTIVE_P7_NATIVE)
+	vec_vsx_st(a_.altivec_32, 0, mem_addr);
+#elif defined(SIMDE_POWER_ALTIVE_P5_NATIVE)
+	vec_st(a_.altivec_32, 0, mem_addr);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	wasm_v128_store(mem_addr, a_.wasm_v128);
+#else
+	SIMDE_VECTORIZE_ALIGNED(mem_addr : 16)
+	for (size_t i = 0; i < sizeof(a_.f32) / sizeof(a_.f32[0]); i++) {
+		mem_addr[i] = a_.f32[i];
 	}
 #endif
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_store_ps(mem_addr, a)                                      \
+	simde_mm_store_ps(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				  float *, simde_float32 *, mem_addr), \
+			  (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store_ps1(simde_float32 mem_addr[4], simde__m128 a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_store_ps1(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_store_ps1(mem_addr, a);
 #else
-	SIMDE__VECTORIZE_ALIGNED(mem_addr : 16)
-	for (size_t i = 0; i < sizeof(a.f32) / sizeof(a.f32[0]); i++) {
-		mem_addr[i] = a.f32[0];
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+	SIMDE_VECTORIZE_ALIGNED(mem_addr : 16)
+	for (size_t i = 0; i < sizeof(a_.f32) / sizeof(a_.f32[0]); i++) {
+		mem_addr[i] = a_.f32[0];
 	}
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_store_ps1(mem_addr, a)                                      \
+	simde_mm_store_ps1(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				   float *, simde_float32 *, mem_addr), \
+			   (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store_ss(simde_float32 *mem_addr, simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_store_ss(mem_addr, a.n);
-#elif defined(SIMDE_SSE_NEON)
-	vst1q_lane_f32(mem_addr, a.neon_f32, 0);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_store_ss(mem_addr, a);
 #else
-	*mem_addr = a.f32[0];
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	vst1q_lane_f32(mem_addr, a_.neon_f32, 0);
+#else
+	*mem_addr = a_.f32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_store_ss(mem_addr, a)                                      \
+	simde_mm_store_ss(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				  float *, simde_float32 *, mem_addr), \
+			  (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store1_ps(simde_float32 mem_addr[4], simde__m128 a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_store1_ps(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_store1_ps(mem_addr, a);
 #else
 	simde_mm_store_ps1(mem_addr, a);
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_store1_ps(mem_addr, a)                                      \
+	simde_mm_store1_ps(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				   float *, simde_float32 *, mem_addr), \
+			   (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storeh_pi(simde__m64 *mem_addr, simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_storeh_pi(&(mem_addr->n), a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_storeh_pi(HEDLEY_REINTERPRET_CAST(__m64 *, mem_addr), a);
 #else
-	mem_addr->f32[0] = a.f32[2];
-	mem_addr->f32[1] = a.f32[3];
+	simde__m64_private *dest_ =
+		HEDLEY_REINTERPRET_CAST(simde__m64_private *, mem_addr);
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+	dest_->f32[0] = a_.f32[2];
+	dest_->f32[1] = a_.f32[3];
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_storeh_pi(mem_addr, a) simde_mm_storeh_pi(mem_addr, (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storel_pi(simde__m64 *mem_addr, simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_storel_pi(&(mem_addr->n), a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_storel_pi(HEDLEY_REINTERPRET_CAST(__m64 *, mem_addr), a);
 #else
-	mem_addr->f32[0] = a.f32[0];
-	mem_addr->f32[1] = a.f32[1];
+	simde__m64_private *dest_ =
+		HEDLEY_REINTERPRET_CAST(simde__m64_private *, mem_addr);
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+	dest_->f32[0] = a_.f32[0];
+	dest_->f32[1] = a_.f32[1];
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_storel_pi(mem_addr, a) simde_mm_storel_pi(mem_addr, (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storer_ps(simde_float32 mem_addr[4], simde__m128 a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_storer_ps(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_storer_ps(mem_addr, a);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	a_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.f32, a_.f32, 3, 2, 1, 0);
+	simde_mm_store_ps(mem_addr, simde__m128_from_private(a_));
 #else
-	SIMDE__VECTORIZE_ALIGNED(mem_addr : 16)
-	for (size_t i = 0; i < sizeof(a.f32) / sizeof(a.f32[0]); i++) {
+	SIMDE_VECTORIZE_ALIGNED(mem_addr : 16)
+	for (size_t i = 0; i < sizeof(a_.f32) / sizeof(a_.f32[0]); i++) {
 		mem_addr[i] =
-			a.f32[((sizeof(a.f32) / sizeof(a.f32[0])) - 1) - i];
+			a_.f32[((sizeof(a_.f32) / sizeof(a_.f32[0])) - 1) - i];
 	}
 #endif
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_storer_ps(mem_addr, a)                                      \
+	simde_mm_storer_ps(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				   float *, simde_float32 *, mem_addr), \
+			   (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storeu_ps(simde_float32 mem_addr[4], simde__m128 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_storeu_ps(mem_addr, a.n);
-#elif defined(SIMDE_SSE_NEON)
-	vst1q_f32(mem_addr, a.neon_f32);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_storeu_ps(mem_addr, a);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < sizeof(a.f32) / sizeof(a.f32[0]); i++) {
-		mem_addr[i] = a.f32[i];
-	}
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	vst1q_f32(mem_addr, a_.neon_f32);
+#else
+	simde_memcpy(mem_addr, &a_, sizeof(a_));
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_storeu_ps(mem_addr, a)                                      \
+	simde_mm_storeu_ps(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				   float *, simde_float32 *, mem_addr), \
+			   (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_sub_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_sub_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_sub_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_f32 = vsubq_f32(a.neon_f32, b.neon_f32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = a.f32[i] - b.f32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vsubq_f32(a_.neon_f32, b_.neon_f32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f32x4_sub(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f32 = a_.f32 - b_.f32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = a_.f32[i] - b_.f32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_ps(a, b) simde_mm_sub_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_sub_ss(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
-
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_sub_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_sub_ss(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_ss(a, simde_mm_sub_ps(a, b));
 #else
-	r.f32[0] = a.f32[0] - b.f32[0];
-	r.f32[1] = a.f32[1];
-	r.f32[2] = a.f32[2];
-	r.f32[3] = a.f32[3];
-#endif
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-	return r;
+	r_.f32[0] = a_.f32[0] - b_.f32[0];
+	r_.f32[1] = a_.f32[1];
+	r_.f32[2] = a_.f32[2];
+	r_.f32[3] = a_.f32[3];
+
+	return simde__m128_from_private(r_);
+#endif
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_ss(a, b) simde_mm_sub_ss((a), (b))
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomieq_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_ucomieq_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_ucomieq_ss(a, b);
 #else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f32[0] == b.f32[0];
+	r = a_.f32[0] == b_.f32[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f32[0] == b_.f32[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomieq_ss(a, b) simde_mm_ucomieq_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomige_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_ucomige_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_ucomige_ss(a, b);
 #else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f32[0] >= b.f32[0];
+	r = a_.f32[0] >= b_.f32[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f32[0] >= b_.f32[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomige_ss(a, b) simde_mm_ucomige_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomigt_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_ucomigt_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_ucomigt_ss(a, b);
 #else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f32[0] > b.f32[0];
+	r = a_.f32[0] > b_.f32[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f32[0] > b_.f32[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomigt_ss(a, b) simde_mm_ucomigt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomile_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_ucomile_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_ucomile_ss(a, b);
 #else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f32[0] <= b.f32[0];
+	r = a_.f32[0] <= b_.f32[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f32[0] <= b_.f32[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomile_ss(a, b) simde_mm_ucomile_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomilt_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_ucomilt_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_ucomilt_ss(a, b);
 #else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f32[0] < b.f32[0];
+	r = a_.f32[0] < b_.f32[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f32[0] < b_.f32[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomilt_ss(a, b) simde_mm_ucomilt_ss((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomineq_ss(simde__m128 a, simde__m128 b)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	return _mm_ucomineq_ss(a.n, b.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_ucomineq_ss(a, b);
 #else
+	simde__m128_private a_ = simde__m128_to_private(a),
+			    b_ = simde__m128_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f32[0] != b.f32[0];
+	r = a_.f32[0] != b_.f32[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f32[0] != b_.f32[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomineq_ss(a, b) simde_mm_ucomineq_ss((a), (b))
+#endif
 
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 #if defined(__has_builtin)
 #if __has_builtin(__builtin_ia32_undef128)
-#define SIMDE__HAVE_UNDEFINED128
+#define SIMDE_HAVE_UNDEFINED128
 #endif
-#elif !defined(__PGI) && !defined(SIMDE_BUG_GCC_REV_208793)
-#define SIMDE__HAVE_UNDEFINED128
+#elif !defined(__PGI) && !defined(SIMDE_BUG_GCC_REV_208793) && \
+	!defined(_MSC_VER)
+#define SIMDE_HAVE_UNDEFINED128
 #endif
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128 simde_mm_undefined_ps(void)
-{
-	simde__m128 r;
-
-#if defined(SIMDE__HAVE_UNDEFINED128)
-	r.n = _mm_undefined_ps();
-#else
-	r = simde_mm_setzero_ps();
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_
 #endif
 
-	return r;
-}
-
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_unpackhi_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_unpackhi_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_unpackhi_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x2_t a1 = vget_high_f32(a.neon_f32);
-	float32x2_t b1 = vget_high_f32(b.neon_f32);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	float32x2_t a1 = vget_high_f32(a_.neon_f32);
+	float32x2_t b1 = vget_high_f32(b_.neon_f32);
 	float32x2x2_t result = vzip_f32(a1, b1);
-	r.neon_f32 = vcombine_f32(result.val[0], result.val[1]);
+	r_.neon_f32 = vcombine_f32(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.f32, b_.f32, 2, 6, 3, 7);
 #else
-	r.f32[0] = a.f32[2];
-	r.f32[1] = b.f32[2];
-	r.f32[2] = a.f32[3];
-	r.f32[3] = b.f32[3];
+	r_.f32[0] = a_.f32[2];
+	r_.f32[1] = b_.f32[2];
+	r_.f32[2] = a_.f32[3];
+	r_.f32[3] = b_.f32[3];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_ps(a, b) simde_mm_unpackhi_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_unpacklo_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_unpacklo_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_unpacklo_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	float32x2_t a1 = vget_low_f32(a.neon_f32);
-	float32x2_t b1 = vget_low_f32(b.neon_f32);
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.f32, b_.f32, 0, 4, 1, 5);
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	float32x2_t a1 = vget_low_f32(a_.neon_f32);
+	float32x2_t b1 = vget_low_f32(b_.neon_f32);
 	float32x2x2_t result = vzip_f32(a1, b1);
-	r.neon_f32 = vcombine_f32(result.val[0], result.val[1]);
+	r_.neon_f32 = vcombine_f32(result.val[0], result.val[1]);
 #else
-	r.f32[0] = a.f32[0];
-	r.f32[1] = b.f32[0];
-	r.f32[2] = a.f32[1];
-	r.f32[3] = b.f32[1];
+	r_.f32[0] = a_.f32[0];
+	r_.f32[1] = b_.f32[0];
+	r_.f32[2] = a_.f32[1];
+	r_.f32[3] = b_.f32[1];
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_ps(a, b) simde_mm_unpacklo_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_xor_ps(simde__m128 a, simde__m128 b)
 {
-	simde__m128 r;
+#if defined(SIMDE_X86_SSE_NATIVE)
+	return _mm_xor_ps(a, b);
+#else
+	simde__m128_private r_, a_ = simde__m128_to_private(a),
+				b_ = simde__m128_to_private(b);
 
-#if defined(SIMDE_SSE_NATIVE)
-	r.n = _mm_xor_ps(a.n, b.n);
-#elif defined(SIMDE_SSE_NEON)
-	r.neon_i32 = veorq_s32(a.neon_i32, b.neon_i32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u32) / sizeof(r.u32[0])); i++) {
-		r.u32[i] = a.u32[i] ^ b.u32[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = veorq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_xor(a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f ^ b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] ^ b_.u32[i];
 	}
 #endif
 
-	return r;
+	return simde__m128_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_xor_ps(a, b) simde_mm_xor_ps((a), (b))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_stream_pi(simde__m64 *mem_addr, simde__m64 a)
 {
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_stream_pi(&(mem_addr->n), a.n);
+#if defined(SIMDE_X86_SSE_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	_mm_stream_pi(HEDLEY_REINTERPRET_CAST(__m64 *, mem_addr), a);
+#else
+	simde__m64_private *dest = HEDLEY_REINTERPRET_CAST(simde__m64_private *,
+							   mem_addr),
+			   a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	dest->i64[0] = vget_lane_s64(a_.neon_i64, 0);
 #else
-	mem_addr->i64[0] = a.i64[0];
+	dest->i64[0] = a_.i64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_stream_pi(mem_addr, a) simde_mm_stream_pi(mem_addr, (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_stream_ps(simde_float32 mem_addr[4], simde__m128 a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE_NATIVE)
-	_mm_stream_ps(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE_NATIVE)
+	_mm_stream_ps(mem_addr, a);
+#else
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	vst1q_f32(SIMDE_ASSUME_ALIGNED(16, mem_addr), a_.neon_f32);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(mem_addr, &a, sizeof(a));
+	simde_memcpy(SIMDE_ASSUME_ALIGNED(16, mem_addr), &a_, sizeof(a_));
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_stream_ps(mem_addr, a)                                      \
+	simde_mm_stream_ps(SIMDE_CHECKED_REINTERPRET_CAST(              \
+				   float *, simde_float32 *, mem_addr), \
+			   (a))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 uint32_t simde_mm_getcsr(void)
 {
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 	return _mm_getcsr();
 #else
 	uint32_t r = 0;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	int rounding_mode = fegetround();
 
 	switch (rounding_mode) {
+#if defined(FE_TONEAREST)
 	case FE_TONEAREST:
 		break;
+#endif
+#if defined(FE_UPWARD)
 	case FE_UPWARD:
 		r |= 2 << 13;
 		break;
+#endif
+#if defined(FE_DOWNWARD)
 	case FE_DOWNWARD:
 		r |= 1 << 13;
 		break;
+#endif
+#if defined(FE_TOWARDZERO)
 	case FE_TOWARDZERO:
 		r = 3 << 13;
 		break;
+#endif
 	}
+#else
+	HEDLEY_UNREACHABLE();
+#endif
 
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_getcsr() simde_mm_getcsr()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_setcsr(uint32_t a)
 {
-#if defined(SIMDE_SSE_NATIVE)
+#if defined(SIMDE_X86_SSE_NATIVE)
 	_mm_setcsr(a);
 #else
 	switch ((a >> 13) & 3) {
+#if defined(FE_TONEAREST)
 	case 0:
 		fesetround(FE_TONEAREST);
+#endif
+#if defined(FE_DOWNWARD)
 		break;
 	case 1:
 		fesetround(FE_DOWNWARD);
+#endif
+#if defined(FE_UPWARD)
 		break;
 	case 2:
 		fesetround(FE_UPWARD);
+#endif
+#if defined(FE_TOWARDZERO)
 		break;
 	case 3:
 		fesetround(FE_TOWARDZERO);
 		break;
+#endif
 	}
 #endif
 }
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _mm_setcsr(a) simde_mm_setcsr(a)
+#endif
 
 #define SIMDE_MM_TRANSPOSE4_PS(row0, row1, row2, row3)       \
 	do {                                                 \
@@ -2586,6 +3612,107 @@
 		row3 = simde_mm_movehl_ps(tmp3, tmp1);       \
 	} while (0)
 
-SIMDE__END_DECLS
+#if defined(SIMDE_X86_SSE_ENABLE_NATIVE_ALIASES)
+#define _MM_TRANSPOSE4_PS(row0, row1, row2, row3) \
+	SIMDE_MM_TRANSPOSE4_PS(row0, row1, row2, row3)
+#endif
+
+#if defined(_MM_EXCEPT_INVALID)
+#define SIMDE_MM_EXCEPT_INVALID _MM_EXCEPT_INVALID
+#else
+#define SIMDE_MM_EXCEPT_INVALID (0x0001)
+#endif
+#if defined(_MM_EXCEPT_DENORM)
+#define SIMDE_MM_EXCEPT_DENORM _MM_EXCEPT_DENORM
+#else
+#define SIMDE_MM_EXCEPT_DENORM (0x0002)
+#endif
+#if defined(_MM_EXCEPT_DIV_ZERO)
+#define SIMDE_MM_EXCEPT_DIV_ZERO _MM_EXCEPT_DIV_ZERO
+#else
+#define SIMDE_MM_EXCEPT_DIV_ZERO (0x0004)
+#endif
+#if defined(_MM_EXCEPT_OVERFLOW)
+#define SIMDE_MM_EXCEPT_OVERFLOW _MM_EXCEPT_OVERFLOW
+#else
+#define SIMDE_MM_EXCEPT_OVERFLOW (0x0008)
+#endif
+#if defined(_MM_EXCEPT_UNDERFLOW)
+#define SIMDE_MM_EXCEPT_UNDERFLOW _MM_EXCEPT_UNDERFLOW
+#else
+#define SIMDE_MM_EXCEPT_UNDERFLOW (0x0010)
+#endif
+#if defined(_MM_EXCEPT_INEXACT)
+#define SIMDE_MM_EXCEPT_INEXACT _MM_EXCEPT_INEXACT
+#else
+#define SIMDE_MM_EXCEPT_INEXACT (0x0020)
+#endif
+#if defined(_MM_EXCEPT_MASK)
+#define SIMDE_MM_EXCEPT_MASK _MM_EXCEPT_MASK
+#else
+#define SIMDE_MM_EXCEPT_MASK                                   \
+	(SIMDE_MM_EXCEPT_INVALID | SIMDE_MM_EXCEPT_DENORM |    \
+	 SIMDE_MM_EXCEPT_DIV_ZERO | SIMDE_MM_EXCEPT_OVERFLOW | \
+	 SIMDE_MM_EXCEPT_UNDERFLOW | SIMDE_MM_EXCEPT_INEXACT)
+#endif
+
+#if defined(_MM_MASK_INVALID)
+#define SIMDE_MM_MASK_INVALID _MM_MASK_INVALID
+#else
+#define SIMDE_MM_MASK_INVALID (0x0080)
+#endif
+#if defined(_MM_MASK_DENORM)
+#define SIMDE_MM_MASK_DENORM _MM_MASK_DENORM
+#else
+#define SIMDE_MM_MASK_DENORM (0x0100)
+#endif
+#if defined(_MM_MASK_DIV_ZERO)
+#define SIMDE_MM_MASK_DIV_ZERO _MM_MASK_DIV_ZERO
+#else
+#define SIMDE_MM_MASK_DIV_ZERO (0x0200)
+#endif
+#if defined(_MM_MASK_OVERFLOW)
+#define SIMDE_MM_MASK_OVERFLOW _MM_MASK_OVERFLOW
+#else
+#define SIMDE_MM_MASK_OVERFLOW (0x0400)
+#endif
+#if defined(_MM_MASK_UNDERFLOW)
+#define SIMDE_MM_MASK_UNDERFLOW _MM_MASK_UNDERFLOW
+#else
+#define SIMDE_MM_MASK_UNDERFLOW (0x0800)
+#endif
+#if defined(_MM_MASK_INEXACT)
+#define SIMDE_MM_MASK_INEXACT _MM_MASK_INEXACT
+#else
+#define SIMDE_MM_MASK_INEXACT (0x1000)
+#endif
+#if defined(_MM_MASK_MASK)
+#define SIMDE_MM_MASK_MASK _MM_MASK_MASK
+#else
+#define SIMDE_MM_MASK_MASK                                 \
+	(SIMDE_MM_MASK_INVALID | SIMDE_MM_MASK_DENORM |    \
+	 SIMDE_MM_MASK_DIV_ZERO | SIMDE_MM_MASK_OVERFLOW | \
+	 SIMDE_MM_MASK_UNDERFLOW | SIMDE_MM_MASK_INEXACT)
+#endif
+
+#if defined(_MM_FLUSH_ZERO_MASK)
+#define SIMDE_MM_FLUSH_ZERO_MASK _MM_FLUSH_ZERO_MASK
+#else
+#define SIMDE_MM_FLUSH_ZERO_MASK (0x8000)
+#endif
+#if defined(_MM_FLUSH_ZERO_ON)
+#define SIMDE_MM_FLUSH_ZERO_ON _MM_FLUSH_ZERO_ON
+#else
+#define SIMDE_MM_FLUSH_ZERO_ON (0x8000)
+#endif
+#if defined(_MM_FLUSH_ZERO_OFF)
+#define SIMDE_MM_FLUSH_ZERO_OFF _MM_FLUSH_ZERO_OFF
+#else
+#define SIMDE_MM_FLUSH_ZERO_OFF (0x0000)
+#endif
+
+SIMDE_END_DECLS_
+
+HEDLEY_DIAGNOSTIC_POP
 
-#endif /* !defined(SIMDE__SSE_H) */
+#endif /* !defined(SIMDE_X86_SSE_H) */

obs-studio-25.0.8.tar.xz/libobs/util/simde/sse2.h -> obs-studio-26.0.0.tar.xz/libobs/util/simde/sse2.h Changed

@@ -1,4 +1,6 @@
-/* Permission is hereby granted, free of charge, to any person
+/* 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,
@@ -19,7 +21,7 @@
  * SOFTWARE.
  *
  * Copyright:
- *   2017      Evan Nemerson <evan@nemerson.com>
+ *   2017-2020 Evan Nemerson <evan@nemerson.com>
  *   2015-2017 John W. Ratcliff <jratcliffscarab@gmail.com>
  *   2015      Brandon Rowlett <browlett@nvidia.com>
  *   2015      Ken Fast <kfast@gdeb.com>
@@ -27,1858 +29,2994 @@
  *   2018      Jeff Daily <jeff.daily@amd.com>
  */
 
-#if !defined(SIMDE__SSE2_H)
-#if !defined(SIMDE__SSE2_H)
-#define SIMDE__SSE2_H
-#endif
+#if !defined(SIMDE_X86_SSE2_H)
+#define SIMDE_X86_SSE2_H
+
 #include "sse.h"
 
-#if defined(SIMDE_SSE2_NATIVE)
-#undef SIMDE_SSE2_NATIVE
+#if !defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ENABLE_NATIVE_ALIASES)
+#define SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES
+#endif
+
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DISABLE_UNWANTED_DIAGNOSTICS
+SIMDE_BEGIN_DECLS_
+
+typedef union {
+#if defined(SIMDE_VECTOR_SUBSCRIPT)
+	SIMDE_ALIGN(16) int8_t i8 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int16_t i16 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int32_t i32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int64_t i64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint8_t u8 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint16_t u16 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint32_t u32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint64_t u64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#if defined(SIMDE_HAVE_INT128_)
+	SIMDE_ALIGN(16) simde_int128 i128 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) simde_uint128 u128 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#endif
+	SIMDE_ALIGN(16) simde_float32 f32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) simde_float64 f64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+
+	SIMDE_ALIGN(16) int_fast32_t i32f SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint_fast32_t u32f SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#else
+	SIMDE_ALIGN(16) int8_t i8[16];
+	SIMDE_ALIGN(16) int16_t i16[8];
+	SIMDE_ALIGN(16) int32_t i32[4];
+	SIMDE_ALIGN(16) int64_t i64[2];
+	SIMDE_ALIGN(16) uint8_t u8[16];
+	SIMDE_ALIGN(16) uint16_t u16[8];
+	SIMDE_ALIGN(16) uint32_t u32[4];
+	SIMDE_ALIGN(16) uint64_t u64[2];
+#if defined(SIMDE_HAVE_INT128_)
+	SIMDE_ALIGN(16) simde_int128 i128[1];
+	SIMDE_ALIGN(16) simde_uint128 u128[1];
+#endif
+	SIMDE_ALIGN(16) simde_float32 f32[4];
+	SIMDE_ALIGN(16) simde_float64 f64[2];
+
+	SIMDE_ALIGN(16) int_fast32_t i32f[16 / sizeof(int_fast32_t)];
+	SIMDE_ALIGN(16) uint_fast32_t u32f[16 / sizeof(uint_fast32_t)];
+#endif
+
+	SIMDE_ALIGN(16) simde__m64_private m64_private[2];
+	SIMDE_ALIGN(16) simde__m64 m64[2];
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	SIMDE_ALIGN(16) __m128i n;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN(16) int8x16_t neon_i8;
+	SIMDE_ALIGN(16) int16x8_t neon_i16;
+	SIMDE_ALIGN(16) int32x4_t neon_i32;
+	SIMDE_ALIGN(16) int64x2_t neon_i64;
+	SIMDE_ALIGN(16) uint8x16_t neon_u8;
+	SIMDE_ALIGN(16) uint16x8_t neon_u16;
+	SIMDE_ALIGN(16) uint32x4_t neon_u32;
+	SIMDE_ALIGN(16) uint64x2_t neon_u64;
+	SIMDE_ALIGN(16) float32x4_t neon_f32;
+#if defined(SIMDE_ARCH_AARCH64)
+	SIMDE_ALIGN(16) float64x2_t neon_f64;
+#endif
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	SIMDE_ALIGN(16) v128_t wasm_v128;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed char) altivec_i8;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed short) altivec_i16;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed int) altivec_i32;
+#if defined(__UINT_FAST32_TYPE__)
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(__INT_FAST32_TYPE__) altivec_i32f;
+#else
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed int) altivec_i32f;
+#endif
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(signed long long) altivec_i64;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned char) altivec_u8;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned short) altivec_u16;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned int) altivec_u32;
+#if defined(__UINT_FAST32_TYPE__)
+	SIMDE_ALIGN(16) vector __UINT_FAST32_TYPE__ altivec_u32f;
+#else
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned int) altivec_u32f;
+#endif
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(unsigned long long) altivec_u64;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(float) altivec_f32;
+#if defined(SIMDE_POWER_ALTIVEC_P7_NATIVE)
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(double) altivec_f64;
+#endif
+#endif
+} simde__m128i_private;
+
+typedef union {
+#if defined(SIMDE_VECTOR_SUBSCRIPT)
+	SIMDE_ALIGN(16) int8_t i8 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int16_t i16 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int32_t i32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int64_t i64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint8_t u8 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint16_t u16 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint32_t u32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint64_t u64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) simde_float32 f32 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) simde_float64 f64 SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) int_fast32_t i32f SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+	SIMDE_ALIGN(16) uint_fast32_t u32f SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#else
+	SIMDE_ALIGN(16) int8_t i8[16];
+	SIMDE_ALIGN(16) int16_t i16[8];
+	SIMDE_ALIGN(16) int32_t i32[4];
+	SIMDE_ALIGN(16) int64_t i64[2];
+	SIMDE_ALIGN(16) uint8_t u8[16];
+	SIMDE_ALIGN(16) uint16_t u16[8];
+	SIMDE_ALIGN(16) uint32_t u32[4];
+	SIMDE_ALIGN(16) uint64_t u64[2];
+	SIMDE_ALIGN(16) simde_float32 f32[4];
+	SIMDE_ALIGN(16) simde_float64 f64[2];
+	SIMDE_ALIGN(16) int_fast32_t i32f[16 / sizeof(int_fast32_t)];
+	SIMDE_ALIGN(16) uint_fast32_t u32f[16 / sizeof(uint_fast32_t)];
+#endif
+
+	SIMDE_ALIGN(16) simde__m64_private m64_private[2];
+	SIMDE_ALIGN(16) simde__m64 m64[2];
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	SIMDE_ALIGN(16) __m128d n;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN(16) int8x16_t neon_i8;
+	SIMDE_ALIGN(16) int16x8_t neon_i16;
+	SIMDE_ALIGN(16) int32x4_t neon_i32;
+	SIMDE_ALIGN(16) int64x2_t neon_i64;
+	SIMDE_ALIGN(16) uint8x16_t neon_u8;
+	SIMDE_ALIGN(16) uint16x8_t neon_u16;
+	SIMDE_ALIGN(16) uint32x4_t neon_u32;
+	SIMDE_ALIGN(16) uint64x2_t neon_u64;
+	SIMDE_ALIGN(16) float32x4_t neon_f32;
+#if defined(SIMDE_ARCH_AARCH64)
+	SIMDE_ALIGN(16) float64x2_t neon_f64;
+#endif
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	SIMDE_ALIGN(16) v128_t wasm_v128;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed char) altivec_i8;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed short) altivec_i16;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed int) altivec_i32;
+#if defined(__INT_FAST32_TYPE__)
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(__INT_FAST32_TYPE__) altivec_i32f;
+#else
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(signed int) altivec_i32f;
+#endif
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(signed long long) altivec_i64;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned char) altivec_u8;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned short) altivec_u16;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned int) altivec_u32;
+#if defined(__UINT_FAST32_TYPE__)
+	SIMDE_ALIGN(16) vector __UINT_FAST32_TYPE__ altivec_u32f;
+#else
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(unsigned int) altivec_u32f;
+#endif
+	SIMDE_ALIGN(16)
+	SIMDE_POWER_ALTIVEC_VECTOR(unsigned long long) altivec_u64;
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(float) altivec_f32;
+#if defined(SIMDE_POWER_ALTIVEC_P7_NATIVE)
+	SIMDE_ALIGN(16) SIMDE_POWER_ALTIVEC_VECTOR(double) altivec_f64;
+#endif
+#endif
+} simde__m128d_private;
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+typedef __m128i simde__m128i;
+typedef __m128d simde__m128d;
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+typedef int64x2_t simde__m128i;
+#if defined(SIMDE_ARCH_AARCH64)
+typedef float64x2_t simde__m128d;
+#elif defined(SIMDE_VECTOR_SUBSCRIPT)
+typedef simde_float64 simde__m128d SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#else
+typedef simde__m128d_private simde__m128d;
+#endif
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+typedef v128_t simde__m128i;
+typedef v128_t simde__m128d;
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+typedef SIMDE_POWER_ALTIVEC_VECTOR(float) simde__m128i;
+typedef SIMDE_POWER_ALTIVEC_VECTOR(double) simde__m128d;
+#elif defined(SIMDE_VECTOR_SUBSCRIPT)
+typedef int_fast32_t simde__m128i SIMDE_ALIGN(16)
+	SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+typedef simde_float64 simde__m128d SIMDE_ALIGN(16)
+	SIMDE_VECTOR(16) SIMDE_MAY_ALIAS;
+#else
+typedef simde__m128i_private simde__m128i;
+typedef simde__m128d_private simde__m128d;
+#endif
+
+#if !defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ENABLE_NATIVE_ALIASES)
+#define SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES
+typedef simde__m128i __m128i;
+typedef simde__m128d __m128d;
+#endif
+
+HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128i), "simde__m128i size incorrect");
+HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128i_private),
+		     "simde__m128i_private size incorrect");
+HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128d), "simde__m128d size incorrect");
+HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128d_private),
+		     "simde__m128d_private size incorrect");
+#if defined(SIMDE_CHECK_ALIGNMENT) && defined(SIMDE_ALIGN_OF)
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m128i) == 16,
+		     "simde__m128i is not 16-byte aligned");
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m128i_private) == 16,
+		     "simde__m128i_private is not 16-byte aligned");
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m128d) == 16,
+		     "simde__m128d is not 16-byte aligned");
+HEDLEY_STATIC_ASSERT(SIMDE_ALIGN_OF(simde__m128d_private) == 16,
+		     "simde__m128d_private is not 16-byte aligned");
 #endif
-#if defined(SIMDE_SSE2_FORCE_NATIVE)
-#define SIMDE_SSE2_NATIVE
-#elif defined(__SSE2__) && !defined(SIMDE_SSE2_NO_NATIVE) && \
-	!defined(SIMDE_NO_NATIVE)
-#define SIMDE_SSE2_NATIVE
-#elif defined(__ARM_NEON) && !defined(SIMDE_SSE2_NO_NEON) && \
-	!defined(SIMDE_NO_NEON)
-#define SIMDE_SSE2_NEON
-#endif
-
-#if defined(SIMDE_SSE2_NATIVE) && !defined(SIMDE_SSE_NATIVE)
-#if defined(SIMDE_SSE2_FORCE_NATIVE)
-#error Native SSE2 support requires native SSE support
-#else
-#warning Native SSE2 support requires native SSE support, disabling
-#undef SIMDE_SSE2_NATIVE
-#endif
-#elif defined(SIMDE_SSE2_NEON) && !defined(SIMDE_SSE_NEON)
-#warning SSE2 NEON support requires SSE NEON support, disabling
-#undef SIMDE_SSE_NEON
-#endif
-
-#if defined(SIMDE_SSE2_NATIVE)
-#include <emmintrin.h>
-#else
-#if defined(SIMDE_SSE2_NEON)
-#include <arm_neon.h>
-#endif
-#endif
-
-#include <stdint.h>
-#include <limits.h>
-#include <string.h>
-
-#define vreinterpretq_m128i_s32(v) \
-	(simde__m128i) { .neon_i32 = v }
-#define vreinterpretq_m128i_u64(v) \
-	(simde__m128i) { .neon_u64 = v }
-
-#define vreinterpretq_s32_m128i(a) a.neon_i32
-#define vreinterpretq_u64_m128i(a) a.neon_u64
-
-SIMDE__BEGIN_DECLS
-
-typedef SIMDE_ALIGN(16) union {
-#if defined(SIMDE__ENABLE_GCC_VEC_EXT)
-	int8_t i8 __attribute__((__vector_size__(16), __may_alias__));
-	int16_t i16 __attribute__((__vector_size__(16), __may_alias__));
-	int32_t i32 __attribute__((__vector_size__(16), __may_alias__));
-	int64_t i64 __attribute__((__vector_size__(16), __may_alias__));
-	uint8_t u8 __attribute__((__vector_size__(16), __may_alias__));
-	uint16_t u16 __attribute__((__vector_size__(16), __may_alias__));
-	uint32_t u32 __attribute__((__vector_size__(16), __may_alias__));
-	uint64_t u64 __attribute__((__vector_size__(16), __may_alias__));
-#if defined(SIMDE__HAVE_INT128)
-	simde_int128 i128 __attribute__((__vector_size__(16), __may_alias__));
-	simde_uint128 u128 __attribute__((__vector_size__(16), __may_alias__));
-#endif
-	simde_float32 f32 __attribute__((__vector_size__(16), __may_alias__));
-	simde_float64 f64 __attribute__((__vector_size__(16), __may_alias__));
-#else
-	int8_t i8[16];
-	int16_t i16[8];
-	int32_t i32[4];
-	int64_t i64[2];
-	uint8_t u8[16];
-	uint16_t u16[8];
-	uint32_t u32[4];
-	uint64_t u64[2];
-#if defined(SIMDE__HAVE_INT128)
-	simde_int128 i128[1];
-	simde_uint128 u128[1];
-#endif
-	simde_float32 f32[4];
-	simde_float64 f64[2];
-#endif
-
-#if defined(SIMDE_SSE2_NATIVE)
-	__m128i n;
-#elif defined(SIMDE_SSE2_NEON)
-	int8x16_t neon_i8;
-	int16x8_t neon_i16;
-	int32x4_t neon_i32;
-	int64x2_t neon_i64;
-	uint8x16_t neon_u8;
-	uint16x8_t neon_u16;
-	uint32x4_t neon_u32;
-	uint64x2_t neon_u64;
-	float32x4_t neon_f32;
-#if defined(SIMDE_ARCH_AMD64)
-	float64x2_t neon_f64;
-#endif
-#endif
-} simde__m128i;
-
-typedef SIMDE_ALIGN(16) union {
-#if defined(SIMDE__ENABLE_GCC_VEC_EXT)
-	int8_t i8 __attribute__((__vector_size__(16), __may_alias__));
-	int16_t i16 __attribute__((__vector_size__(16), __may_alias__));
-	int32_t i32 __attribute__((__vector_size__(16), __may_alias__));
-	int64_t i64 __attribute__((__vector_size__(16), __may_alias__));
-	uint8_t u8 __attribute__((__vector_size__(16), __may_alias__));
-	uint16_t u16 __attribute__((__vector_size__(16), __may_alias__));
-	uint32_t u32 __attribute__((__vector_size__(16), __may_alias__));
-	uint64_t u64 __attribute__((__vector_size__(16), __may_alias__));
-	simde_float32 f32 __attribute__((__vector_size__(16), __may_alias__));
-	simde_float64 f64 __attribute__((__vector_size__(16), __may_alias__));
-#else
-	int8_t i8[16];
-	int16_t i16[8];
-	int32_t i32[4];
-	int64_t i64[2];
-	uint8_t u8[16];
-	uint16_t u16[8];
-	uint32_t u32[4];
-	uint64_t u64[2];
-	simde_float32 f32[4];
-	simde_float64 f64[2];
-#endif
-
-#if defined(SIMDE_SSE2_NATIVE)
-	__m128d n;
-#elif defined(SIMDE_SSE2_NEON)
-	int8x16_t neon_i8;
-	int16x8_t neon_i16;
-	int32x4_t neon_i32;
-	int64x2_t neon_i64;
-	uint8x16_t neon_u8;
-	uint16x8_t neon_u16;
-	uint32x4_t neon_u32;
-	uint64x2_t neon_u64;
-	float32x4_t neon_f32;
-#if defined(SIMDE_ARCH_AMD64)
-	float64x2_t neon_f64;
-#endif
-#endif
-} simde__m128d;
-
-#if defined(SIMDE_SSE2_NATIVE)
-HEDLEY_STATIC_ASSERT(sizeof(__m128i) == sizeof(simde__m128i),
-		     "__m128i size doesn't match simde__m128i size");
-HEDLEY_STATIC_ASSERT(sizeof(__m128d) == sizeof(simde__m128d),
-		     "__m128d size doesn't match simde__m128d size");
-SIMDE__FUNCTION_ATTRIBUTES simde__m128i SIMDE__M128I_C(__m128i v)
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde__m128i_from_private(simde__m128i_private v)
 {
 	simde__m128i r;
-	r.n = v;
+	simde_memcpy(&r, &v, sizeof(r));
+	return r;
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i_private simde__m128i_to_private(simde__m128i v)
+{
+	simde__m128i_private r;
+	simde_memcpy(&r, &v, sizeof(r));
 	return r;
 }
-SIMDE__FUNCTION_ATTRIBUTES simde__m128d SIMDE__M128D_C(__m128d v)
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128d simde__m128d_from_private(simde__m128d_private v)
 {
 	simde__m128d r;
-	r.n = v;
+	simde_memcpy(&r, &v, sizeof(r));
 	return r;
 }
-#elif defined(SIMDE_SSE_NEON)
-#define SIMDE__M128I_NEON_C(T, expr) \
-	(simde__m128i) { .neon_##T = expr }
-#define SIMDE__M128D_NEON_C(T, expr) \
-	(simde__m128d) { .neon_##T = expr }
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128d_private simde__m128d_to_private(simde__m128d v)
+{
+	simde__m128d_private r;
+	simde_memcpy(&r, &v, sizeof(r));
+	return r;
+}
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, int8x16_t, neon, i8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, int16x8_t, neon, i16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, int32x4_t, neon, i32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, int64x2_t, neon, i64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, uint8x16_t, neon, u8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, uint16x8_t, neon, u16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, uint32x4_t, neon, u32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, uint64x2_t, neon, u64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, float32x4_t, neon, f32)
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128i, float64x2_t, neon, f64)
 #endif
-HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128i), "simde__m128i size incorrect");
-HEDLEY_STATIC_ASSERT(16 == sizeof(simde__m128d), "simde__m128d size incorrect");
+#endif /* defined(SIMDE_ARM_NEON_A32V7_NATIVE) */
 
-SIMDE__FUNCTION_ATTRIBUTES
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, int8x16_t, neon, i8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, int16x8_t, neon, i16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, int32x4_t, neon, i32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, int64x2_t, neon, i64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, uint8x16_t, neon, u8)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, uint16x8_t, neon, u16)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, uint32x4_t, neon, u32)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, uint64x2_t, neon, u64)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, float32x4_t, neon, f32)
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+SIMDE_X86_GENERATE_CONVERSION_FUNCTION(m128d, float64x2_t, neon, f64)
+#endif
+#endif /* defined(SIMDE_ARM_NEON_A32V7_NATIVE) */
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_add_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_add_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i8, vaddq_s8(a.neon_i8, b.neon_i8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_add_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		r.i8[i] = a.i8[i] + b.i8[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vaddq_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i8 = vec_add(a_.altivec_i8, b_.altivec_i8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = a_.i8 + b_.i8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = a_.i8[i] + b_.i8[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_epi8(a, b) simde_mm_add_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_add_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_add_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i16, vaddq_s16(a.neon_i16, b.neon_i16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_add_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = a.i16[i] + b.i16[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vaddq_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = vec_add(a_.altivec_i16, b_.altivec_i16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = a_.i16 + b_.i16;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] + b_.i16[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_epi16(a, b) simde_mm_add_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_add_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_add_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i32, vaddq_s32(a.neon_i32, b.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_add_epi32(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i] + b.i32[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vaddq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_add(a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = a_.i32 + b_.i32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] + b_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_epi32(a, b) simde_mm_add_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_add_epi64(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_add_epi64(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i64, vaddq_s64(a.neon_i64, b.neon_i64));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_add_epi64(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] + b.i64[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vaddq_s64(a_.neon_i64, b_.neon_i64);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i64 = vec_add(a_.altivec_i64, b_.altivec_i64);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 + b_.i64;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.i64[i] = a_.i64[i] + b_.i64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_epi64(a, b) simde_mm_add_epi64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_add_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_add_pd(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON) && defined(SIMDE_ARCH_AMD64)
-	return SIMDE__M128I_NEON_C(f64, vaddq_f64(a.neon_f64, b.neon_f64));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_add_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = a.f64[i] + b.f64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_f64 = vaddq_f64(a_.neon_f64, b_.neon_f64);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_add(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 = vec_add(a_.altivec_f64, b_.altivec_f64);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f64 = a_.f64 + b_.f64;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = a_.f64[i] + b_.f64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_pd(a, b) simde_mm_add_pd(a, b)
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128d simde_mm_move_sd(simde__m128d a, simde__m128d b)
+{
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_move_sd(a, b);
+#else
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_f64 =
+		vsetq_lane_f64(vgetq_lane_f64(b_.neon_f64, 0), a_.neon_f64, 0);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	SIMDE_POWER_ALTIVEC_VECTOR(unsigned char)
+	m = {16, 17, 18, 19, 20, 21, 22, 23, 8, 9, 10, 11, 12, 13, 14, 15};
+	r_.altivec_f64 = vec_perm(a_.altivec_f64, b_.altivec_f64, m);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f64 = SIMDE_SHUFFLE_VECTOR_(64, 16, a_.f64, b_.f64, 2, 1);
+#else
+	r_.f64[0] = b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+	return simde__m128d_from_private(r_);
+#endif
+}
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_move_sd(a, b) simde_mm_move_sd(a, b)
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_add_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_add_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_add_sd(a, b);
 #else
-	simde__m128d r;
-	r.f64[0] = a.f64[0] + b.f64[0];
-	r.f64[1] = a.f64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.f64[0] = a_.f64[0] + b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+
+#if defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_add_pd(a, b));
+#else
+	r_.f64[0] = a_.f64[0] + b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_sd(a, b) simde_mm_add_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_add_si64(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M64_C(_mm_add_si64(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M64_NEON_C(i64, vadd_s64(a.neon_i64, b.neon_i64));
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_add_si64(a, b);
 #else
-	simde__m64 r;
-	r.i64[0] = a.i64[0] + b.i64[0];
-	return r;
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vadd_s64(a_.neon_i64, b_.neon_i64);
+#else
+	r_.i64[0] = a_.i64[0] + b_.i64[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_add_si64(a, b) simde_mm_add_si64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_adds_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_adds_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i8, vqaddq_s8(a.neon_i8, b.neon_i8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_adds_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		if ((((b.i8[i]) > 0) && ((a.i8[i]) > (INT8_MAX - (b.i8[i]))))) {
-			r.i8[i] = INT8_MAX;
-		} else if ((((b.i8[i]) < 0) &&
-			    ((a.i8[i]) < (INT8_MIN - (b.i8[i]))))) {
-			r.i8[i] = INT8_MIN;
-		} else {
-			r.i8[i] = (a.i8[i]) + (b.i8[i]);
-		}
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vqaddq_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i8 = vec_adds(a_.altivec_i8, b_.altivec_i8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		const int32_t tmp = HEDLEY_STATIC_CAST(int16_t, a_.i8[i]) +
+				    HEDLEY_STATIC_CAST(int16_t, b_.i8[i]);
+		r_.i8[i] = HEDLEY_STATIC_CAST(
+			int8_t,
+			((tmp < INT8_MAX) ? ((tmp > INT8_MIN) ? tmp : INT8_MIN)
+					  : INT8_MAX));
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_epi8(a, b) simde_mm_adds_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_adds_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_adds_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i16, vqaddq_s16(a.neon_i16, b.neon_i16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_adds_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		if ((((b.i16[i]) > 0) &&
-		     ((a.i16[i]) > (INT16_MAX - (b.i16[i]))))) {
-			r.i16[i] = INT16_MAX;
-		} else if ((((b.i16[i]) < 0) &&
-			    ((a.i16[i]) < (INT16_MIN - (b.i16[i]))))) {
-			r.i16[i] = INT16_MIN;
-		} else {
-			r.i16[i] = (a.i16[i]) + (b.i16[i]);
-		}
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vqaddq_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = vec_adds(a_.altivec_i16, b_.altivec_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		const int32_t tmp = HEDLEY_STATIC_CAST(int32_t, a_.i16[i]) +
+				    HEDLEY_STATIC_CAST(int32_t, b_.i16[i]);
+		r_.i16[i] = HEDLEY_STATIC_CAST(
+			int16_t,
+			((tmp < INT16_MAX)
+				 ? ((tmp > INT16_MIN) ? tmp : INT16_MIN)
+				 : INT16_MAX));
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_epi16(a, b) simde_mm_adds_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_adds_epu8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_adds_epu8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(u8, vqaddq_u8(a.neon_u8, b.neon_u8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_adds_epu8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		r.u8[i] = ((UINT8_MAX - a.u8[i]) > b.u8[i])
-				  ? (a.u8[i] + b.u8[i])
-				  : UINT8_MAX;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vqaddq_u8(a_.neon_u8, b_.neon_u8);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u8 = vec_adds(a_.altivec_u8, b_.altivec_u8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = ((UINT8_MAX - a_.u8[i]) > b_.u8[i])
+				   ? (a_.u8[i] + b_.u8[i])
+				   : UINT8_MAX;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_epu8(a, b) simde_mm_adds_epu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_adds_epu16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_adds_epu16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(u16, vqaddq_u16(a.neon_u16, b.neon_u16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_adds_epu16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = ((UINT16_MAX - a.u16[i]) > b.u16[i])
-				   ? (a.u16[i] + b.u16[i])
-				   : UINT16_MAX;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vqaddq_u16(a_.neon_u16, b_.neon_u16);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u16 = vec_adds(a_.altivec_u16, b_.altivec_u16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = ((UINT16_MAX - a_.u16[i]) > b_.u16[i])
+				    ? (a_.u16[i] + b_.u16[i])
+				    : UINT16_MAX;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_adds_epu16(a, b) simde_mm_adds_epu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_and_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_and_pd(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128D_NEON_C(i32, vandq_s32(a.neon_i32, b.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_and_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u64) / sizeof(r.u64[0])); i++) {
-		r.u64[i] = a.u64[i] & b.u64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vandq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_v128_and(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 = vec_and(a_.altivec_f64, b_.altivec_f64);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f & b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = a_.i32f[i] & b_.i32f[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_and_pd(a, b) simde_mm_and_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_and_si128(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_and_si128(a.n, b.n));
-#elif defined(SIMDE_SSE_NEON)
-	return SIMDE__M128I_NEON_C(i32, vandq_s32(b.neon_i32, a.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_and_si128(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] & b.i64[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vandq_s32(b_.neon_i32, a_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u32f = vec_and(a_.altivec_u32f, b_.altivec_u32f);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f & b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = a_.i32f[i] & b_.i32f[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_and_si128(a, b) simde_mm_and_si128(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_andnot_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_andnot_pd(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128D_NEON_C(i32, vbicq_s32(a.neon_i32, b.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_andnot_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u64) / sizeof(r.u64[0])); i++) {
-		r.u64[i] = ~a.u64[i] & b.u64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vbicq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_v128_andnot(b_.wasm_v128, a_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32f = vec_andc(a_.altivec_i32f, b_.altivec_i32f);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = ~a_.i32f & b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u64) / sizeof(r_.u64[0])); i++) {
+		r_.u64[i] = ~a_.u64[i] & b_.u64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_andnot_pd(a, b) simde_mm_andnot_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_andnot_si128(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_andnot_si128(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i32, vbicq_s32(b.neon_i32, a.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_andnot_si128(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = ~(a.i64[i]) & b.i64[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vbicq_s32(b_.neon_i32, a_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_andc(b_.altivec_i32, a_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = ~a_.i32f & b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = ~(a_.i32f[i]) & b_.i32f[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_andnot_si128(a, b) simde_mm_andnot_si128(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_avg_epu8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_avg_epu8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(u8, vrhaddq_u8(b.neon_u8, a.neon_u8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_avg_epu8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		r.u8[i] = (a.u8[i] + b.u8[i] + 1) >> 1;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vrhaddq_u8(b_.neon_u8, a_.neon_u8);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u8 = vec_avg(a_.altivec_u8, b_.altivec_u8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS) &&      \
+	defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR) && \
+	defined(SIMDE_CONVERT_VECTOR_)
+	uint16_t wa SIMDE_VECTOR(32);
+	uint16_t wb SIMDE_VECTOR(32);
+	uint16_t wr SIMDE_VECTOR(32);
+	SIMDE_CONVERT_VECTOR_(wa, a_.u8);
+	SIMDE_CONVERT_VECTOR_(wb, b_.u8);
+	wr = (wa + wb + 1) >> 1;
+	SIMDE_CONVERT_VECTOR_(r_.u8, wr);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = (a_.u8[i] + b_.u8[i] + 1) >> 1;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_avg_epu8(a, b) simde_mm_avg_epu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_avg_epu16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_avg_epu16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(u16, vrhaddq_u16(b.neon_u16, a.neon_u16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_avg_epu16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = (a.u16[i] + b.u16[i] + 1) >> 1;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vrhaddq_u16(b_.neon_u16, a_.neon_u16);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u16 = vec_avg(a_.altivec_u16, b_.altivec_u16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS) &&      \
+	defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR) && \
+	defined(SIMDE_CONVERT_VECTOR_)
+	uint32_t wa SIMDE_VECTOR(32);
+	uint32_t wb SIMDE_VECTOR(32);
+	uint32_t wr SIMDE_VECTOR(32);
+	SIMDE_CONVERT_VECTOR_(wa, a_.u16);
+	SIMDE_CONVERT_VECTOR_(wb, b_.u16);
+	wr = (wa + wb + 1) >> 1;
+	SIMDE_CONVERT_VECTOR_(r_.u16, wr);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = (a_.u16[i] + b_.u16[i] + 1) >> 1;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_avg_epu16(a, b) simde_mm_avg_epu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_bslli_si128(simde__m128i a, const int imm8)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_setzero_si128(void)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_setzero_si128();
+#else
+	simde__m128i_private r_;
 
-	if (HEDLEY_UNLIKELY(imm8 > 15)) {
-		r.u64[0] = 0;
-		r.u64[1] = 0;
-		return r;
-	}
-
-	const int s = imm8 * 8;
-
-#if defined(SIMDE__HAVE_INT128)
-	r.u128[0] = a.u128[0] << s;
-#else
-	if (s < 64) {
-		r.u64[0] = (a.u64[0] << s);
-		r.u64[1] = (a.u64[1] << s) | (a.u64[0] >> (64 - s));
-	} else {
-		r.u64[0] = 0;
-		r.u64[1] = a.u64[0] << (s - 64);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vdupq_n_s32(0);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = 0;
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-#define simde_mm_bslli_si128(a, imm8) SIMDE__M128I_C(_mm_slli_si128(a.n, imm8))
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_bslli_si128(a, imm8)                                      \
-	SIMDE__M128I_NEON_C(                                               \
-		i8,                                                        \
-		(((imm8) <= 0) ? ((a).neon_i8)                             \
-			       : (((imm8) > 15) ? (vdupq_n_s8(0))          \
-						: (vextq_s8(vdupq_n_s8(0), \
-							    (a).neon_i8,   \
-							    16 - (imm8))))))
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setzero_si128() (simde_mm_setzero_si128())
 #endif
-#define simde_mm_slli_si128(a, imm8) simde_mm_bslli_si128(a, imm8)
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_bsrli_si128(simde__m128i a, const int imm8)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_bslli_si128(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
 
-	if (HEDLEY_UNLIKELY(imm8 > 15)) {
-		r.u64[0] = 0;
-		r.u64[1] = 0;
-		return r;
-	}
-
-	const int s = imm8 * 8;
-
-#if defined(SIMDE__HAVE_INT128)
-	r.u128[0] = a.u128[0] >> s;
-#else
-	if (s < 64) {
-		r.u64[0] = (a.u64[0] >> s) | (a.u64[1] << (64 - s));
-		r.u64[1] = (a.u64[1] >> s);
-	} else {
-		r.u64[0] = a.u64[1] >> (s - 64);
-		r.u64[1] = 0;
+	if (HEDLEY_UNLIKELY((imm8 & ~15))) {
+		return simde_mm_setzero_si128();
+	}
+
+#if defined(SIMDE_HAVE_INT128_) && defined(__BYTE_ORDER__) && \
+	(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) && 0
+	r_.u128[0] = a_.u128[0] << s;
+#else
+	r_ = simde__m128i_to_private(simde_mm_setzero_si128());
+	for (int i = imm8;
+	     i < HEDLEY_STATIC_CAST(int, sizeof(r_.i8) / sizeof(r_.i8[0]));
+	     i++) {
+		r_.i8[i] = a_.i8[i - imm8];
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-#define simde_mm_bsrli_si128(a, imm8) SIMDE__M128I_C(_mm_srli_si128(a.n, imm8))
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_bsrli_si128(a, imm8)                             \
-	SIMDE__M128I_NEON_C(                                      \
-		i8,                                               \
-		((imm8) <= 0)                                     \
-			? ((a).neon_i8)                           \
-			: (((imm8) > 15) ? (vdupq_n_s8(0))        \
-					 : (vextq_s8((a).neon_i8, \
-						     vdupq_n_s8(0), (imm8)))))
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+#define simde_mm_bslli_si128(a, imm8) _mm_slli_si128(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE) && !defined(__clang__)
+#define simde_mm_bslli_si128(a, imm8)                                      \
+	simde__m128i_from_neon_i8(                                         \
+		((imm8) <= 0)                                              \
+			? simde__m128i_to_neon_i8(a)                       \
+			: (((imm8) > 15)                                   \
+				   ? (vdupq_n_s8(0))                       \
+				   : (vextq_s8(vdupq_n_s8(0),              \
+					       simde__m128i_to_neon_i8(a), \
+					       16 - (imm8)))))
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_bslli_si128(a, imm8)                                          \
+	(__extension__({                                                       \
+		const simde__m128i_private simde__tmp_a_ =                     \
+			simde__m128i_to_private(a);                            \
+		const simde__m128i_private simde__tmp_z_ =                     \
+			simde__m128i_to_private(simde_mm_setzero_si128());     \
+		simde__m128i_private simde__tmp_r_;                            \
+		if (HEDLEY_UNLIKELY(imm8 > 15)) {                              \
+			simde__tmp_r_ = simde__m128i_to_private(               \
+				simde_mm_setzero_si128());                     \
+		} else {                                                       \
+			simde__tmp_r_.i8 = SIMDE_SHUFFLE_VECTOR_(              \
+				8, 16, simde__tmp_z_.i8, (simde__tmp_a_).i8,   \
+				HEDLEY_STATIC_CAST(int8_t, (16 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (17 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (18 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (19 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (20 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (21 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (22 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (23 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (24 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (25 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (26 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (27 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (28 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (29 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (30 - imm8) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (31 - imm8) & 31)); \
+		}                                                              \
+		simde__m128i_from_private(simde__tmp_r_);                      \
+	}))
+#endif
+#define simde_mm_slli_si128(a, imm8) simde_mm_bslli_si128(a, imm8)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_bslli_si128(a, b) simde_mm_bslli_si128(a, b)
+#define _mm_slli_si128(a, b) simde_mm_bslli_si128(a, b)
 #endif
-#define simde_mm_srli_si128(a, imm8) simde_mm_bsrli_si128(a, imm8)
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_bsrli_si128(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
+{
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		const int e = HEDLEY_STATIC_CAST(int, i) + imm8;
+		r_.i8[i] = (e < 16) ? a_.i8[e] : 0;
+	}
+
+	return simde__m128i_from_private(r_);
+}
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+#define simde_mm_bsrli_si128(a, imm8) _mm_srli_si128(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE) && !defined(__clang__)
+#define simde_mm_bsrli_si128(a, imm8)                                   \
+	simde__m128i_from_neon_i8(                                      \
+		((imm8 < 0) || (imm8 > 15))                             \
+			? vdupq_n_s8(0)                                 \
+			: (vextq_s8(simde__m128i_to_private(a).neon_i8, \
+				    vdupq_n_s8(0),                      \
+				    ((imm8 & 15) != 0) ? imm8 : (imm8 & 15))))
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_bsrli_si128(a, imm8)                                          \
+	(__extension__({                                                       \
+		const simde__m128i_private simde__tmp_a_ =                     \
+			simde__m128i_to_private(a);                            \
+		const simde__m128i_private simde__tmp_z_ =                     \
+			simde__m128i_to_private(simde_mm_setzero_si128());     \
+		simde__m128i_private simde__tmp_r_ =                           \
+			simde__m128i_to_private(a);                            \
+		if (HEDLEY_UNLIKELY(imm8 > 15)) {                              \
+			simde__tmp_r_ = simde__m128i_to_private(               \
+				simde_mm_setzero_si128());                     \
+		} else {                                                       \
+			simde__tmp_r_.i8 = SIMDE_SHUFFLE_VECTOR_(              \
+				8, 16, simde__tmp_z_.i8, (simde__tmp_a_).i8,   \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 16) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 17) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 18) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 19) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 20) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 21) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 22) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 23) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 24) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 25) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 26) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 27) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 28) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 29) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 30) & 31),  \
+				HEDLEY_STATIC_CAST(int8_t, (imm8 + 31) & 31)); \
+		}                                                              \
+		simde__m128i_from_private(simde__tmp_r_);                      \
+	}))
+#endif
+#define simde_mm_srli_si128(a, imm8) simde_mm_bsrli_si128((a), (imm8))
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_bsrli_si128(a, imm8) simde_mm_bsrli_si128((a), (imm8))
+#define _mm_srli_si128(a, imm8) simde_mm_bsrli_si128((a), (imm8))
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_clflush(void const *p)
 {
-#if defined(SIMDE_SSE2_NATIVE)
+#if defined(SIMDE_X86_SSE2_NATIVE)
 	_mm_clflush(p);
 #else
 	(void)p;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_clflush(a, b) simde_mm_clflush()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comieq_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_comieq_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_comieq_sd(a, b);
+#else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return !!vgetq_lane_u64(vceqq_f64(a_.neon_f64, b_.neon_f64), 0);
 #else
-	return a.f64[0] == b.f64[0];
+	return a_.f64[0] == b_.f64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_comieq_sd(a, b) simde_mm_comieq_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comige_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_comige_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_comige_sd(a, b);
+#else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return !!vgetq_lane_u64(vcgeq_f64(a_.neon_f64, b_.neon_f64), 0);
 #else
-	return a.f64[0] >= b.f64[0];
+	return a_.f64[0] >= b_.f64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_comige_sd(a, b) simde_mm_comige_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comigt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_comigt_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_comigt_sd(a, b);
+#else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return !!vgetq_lane_u64(vcgtq_f64(a_.neon_f64, b_.neon_f64), 0);
 #else
-	return a.f64[0] > b.f64[0];
+	return a_.f64[0] > b_.f64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_comigt_sd(a, b) simde_mm_comigt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comile_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_comile_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_comile_sd(a, b);
+#else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return !!vgetq_lane_u64(vcleq_f64(a_.neon_f64, b_.neon_f64), 0);
 #else
-	return a.f64[0] <= b.f64[0];
+	return a_.f64[0] <= b_.f64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_comile_sd(a, b) simde_mm_comile_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comilt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_comilt_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_comilt_sd(a, b);
 #else
-	return a.f64[0] < b.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return !!vgetq_lane_u64(vcltq_f64(a_.neon_f64, b_.neon_f64), 0);
+#else
+	return a_.f64[0] < b_.f64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_comilt_sd(a, b) simde_mm_comilt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_comineq_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_comineq_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_comineq_sd(a, b);
 #else
-	return a.f64[0] != b.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return !vgetq_lane_u64(vceqq_f64(a_.neon_f64, b_.neon_f64), 0);
+#else
+	return a_.f64[0] != b_.f64[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_comineq_sd(a, b) simde_mm_comineq_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_castpd_ps(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128_C(_mm_castpd_ps(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_castpd_ps(a);
 #else
-	union {
-		simde__m128d pd;
-		simde__m128 ps;
-	} r;
-	r.pd = a;
-	return r.ps;
+	simde__m128 r;
+	simde_memcpy(&r, &a, sizeof(a));
+	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_castpd_ps(a) simde_mm_castpd_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_castpd_si128(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_castpd_si128(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_castpd_si128(a);
 #else
-	union {
-		simde__m128d pd;
-		simde__m128i si128;
-	} r;
-	r.pd = a;
-	return r.si128;
+	simde__m128i r;
+	simde_memcpy(&r, &a, sizeof(a));
+	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_castpd_si128(a) simde_mm_castpd_si128(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_castps_pd(simde__m128 a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_castps_pd(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_castps_pd(a);
 #else
-	union {
-		simde__m128 ps;
-		simde__m128d pd;
-	} r;
-	r.ps = a;
-	return r.pd;
+	simde__m128d r;
+	simde_memcpy(&r, &a, sizeof(a));
+	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_castps_pd(a) simde_mm_castps_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_castps_si128(simde__m128 a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_castps_si128(a.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i32, a.neon_i32);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_castps_si128(a);
 #else
-	union {
-		simde__m128 ps;
-		simde__m128i si128;
-	} r;
-	r.ps = a;
-	return r.si128;
+	simde__m128i r;
+	simde_memcpy(&r, &a, sizeof(a));
+	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_castps_si128(a) simde_mm_castps_si128(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_castsi128_pd(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_castsi128_pd(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_castsi128_pd(a);
 #else
-	union {
-		simde__m128i si128;
-		simde__m128d pd;
-	} r;
-	r.si128 = a;
-	return r.pd;
+	simde__m128d r;
+	simde_memcpy(&r, &a, sizeof(a));
+	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_castsi128_pd(a) simde_mm_castsi128_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_castsi128_ps(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128_C(_mm_castsi128_ps(a.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128_NEON_C(f32, a.neon_f32);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_castsi128_ps(a);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	return a;
 #else
-	union {
-		simde__m128i si128;
-		simde__m128 ps;
-	} r;
-	r.si128 = a;
-	return r.ps;
+	simde__m128 r;
+	simde_memcpy(&r, &a, sizeof(a));
+	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_castsi128_ps(a) simde_mm_castsi128_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmpeq_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmpeq_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i8, vreinterpretq_s8_u8(vceqq_s8(b.neon_i8, a.neon_i8)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpeq_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		r.i8[i] = (a.i8[i] == b.i8[i]) ? 0xff : 0x00;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vreinterpretq_s8_u8(vceqq_s8(b_.neon_i8, a_.neon_i8));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i8x16_eq(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i8 = (SIMDE_POWER_ALTIVEC_VECTOR(signed char))vec_cmpeq(
+		a_.altivec_i8, b_.altivec_i8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = HEDLEY_STATIC_CAST(__typeof__(r_.i8), (a_.i8 == b_.i8));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = (a_.i8[i] == b_.i8[i]) ? ~INT8_C(0) : INT8_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_epi8(a, b) simde_mm_cmpeq_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmpeq_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmpeq_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i16, vreinterpretq_s16_u16(vceqq_s16(b.neon_i16, a.neon_i16)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpeq_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] == b.i16[i]) ? 0xffff : 0x0000;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 =
+		vreinterpretq_s16_u16(vceqq_s16(b_.neon_i16, a_.neon_i16));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i16x8_eq(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = (SIMDE_POWER_ALTIVEC_VECTOR(signed short))vec_cmpeq(
+		a_.altivec_i16, b_.altivec_i16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = (a_.i16 == b_.i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] == b_.i16[i]) ? ~INT16_C(0) : INT16_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_epi16(a, b) simde_mm_cmpeq_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmpeq_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmpeq_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i32, vreinterpretq_s32_u32(vceqq_s32(b.neon_i32, a.neon_i32)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpeq_epi32(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (a.i32[i] == b.i32[i]) ? 0xffffffff : 0x00000000;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 =
+		vreinterpretq_s32_u32(vceqq_s32(b_.neon_i32, a_.neon_i32));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i32x4_eq(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = (SIMDE_POWER_ALTIVEC_VECTOR(signed int))vec_cmpeq(
+		a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), a_.i32 == b_.i32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = (a_.i32[i] == b_.i32[i]) ? ~INT32_C(0) : INT32_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_epi32(a, b) simde_mm_cmpeq_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpeq_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpeq_pd(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128D_NEON_C(
-		i32, vreinterpretq_s32_u32(
-			     vceqq_s32(vreinterpretq_s32_f32(b.neon_f32),
-				       vreinterpretq_s32_f32(a.neon_f32))));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpeq_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (a.f64[i] == b.f64[i]) ? ~UINT64_C(0) : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_i64 = vreinterpretq_s64_u64(
+		vceqq_s64(vreinterpretq_s64_f64(b_.neon_f64),
+			  vreinterpretq_s64_f64(a_.neon_f64)));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_eq(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 = (SIMDE_POWER_ALTIVEC_VECTOR(double))vec_cmpeq(
+		a_.altivec_f64, b_.altivec_f64);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = HEDLEY_STATIC_CAST(__typeof__(r_.i64), (a_.f64 == b_.f64));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (a_.f64[i] == b_.f64[i]) ? ~UINT64_C(0)
+						     : UINT64_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_pd(a, b) simde_mm_cmpeq_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpeq_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpeq_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpeq_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmpeq_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (a.f64[0] == b.f64[0]) ? ~UINT64_C(0) : 0;
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.u64[0] = (a_.u64[0] == b_.u64[0]) ? ~UINT64_C(0) : 0;
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpeq_sd(a, b) simde_mm_cmpeq_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpneq_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpneq_pd(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128D_NEON_C(f32,
-				   vreinterpretq_f32_u16(vmvnq_u16(
-					   vceqq_s16(b.neon_i16, a.neon_i16))));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpneq_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (a.f64[i] != b.f64[i]) ? ~UINT64_C(0) : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vreinterpretq_f32_u16(
+		vmvnq_u16(vceqq_s16(b_.neon_i16, a_.neon_i16)));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_ne(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = HEDLEY_STATIC_CAST(__typeof__(r_.i64), (a_.f64 != b_.f64));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (a_.f64[i] != b_.f64[i]) ? ~UINT64_C(0)
+						     : UINT64_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpneq_pd(a, b) simde_mm_cmpneq_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpneq_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpneq_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpneq_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmpneq_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (a.f64[0] != b.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.u64[0] = (a_.f64[0] != b_.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpneq_sd(a, b) simde_mm_cmpneq_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmplt_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmplt_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i8, vreinterpretq_s8_u8(vcltq_s8(a.neon_i8, b.neon_i8)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmplt_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		r.i8[i] = (a.i8[i] < b.i8[i]) ? 0xff : 0x00;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vreinterpretq_s8_u8(vcltq_s8(a_.neon_i8, b_.neon_i8));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i8 = HEDLEY_REINTERPRET_CAST(
+		SIMDE_POWER_ALTIVEC_VECTOR(signed char),
+		vec_cmplt(a_.altivec_i8, b_.altivec_i8));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i8x16_lt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = HEDLEY_STATIC_CAST(__typeof__(r_.i8), (a_.i8 < b_.i8));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = (a_.i8[i] < b_.i8[i]) ? ~INT8_C(0) : INT8_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_epi8(a, b) simde_mm_cmplt_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmplt_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmplt_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i16, vreinterpretq_s16_u16(vcltq_s16(a.neon_i16, b.neon_i16)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmplt_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] < b.i16[i]) ? 0xffff : 0x0000;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 =
+		vreinterpretq_s16_u16(vcltq_s16(a_.neon_i16, b_.neon_i16));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = HEDLEY_REINTERPRET_CAST(
+		SIMDE_POWER_ALTIVEC_VECTOR(signed short),
+		vec_cmplt(a_.altivec_i16, b_.altivec_i16));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i16x8_lt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = HEDLEY_STATIC_CAST(__typeof__(r_.i16), (a_.i16 < b_.i16));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] < b_.i16[i]) ? ~INT16_C(0) : INT16_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_epi16(a, b) simde_mm_cmplt_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmplt_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmplt_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i32, vreinterpretq_s32_u32(vcltq_s32(a.neon_i32, b.neon_i32)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmplt_epi32(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (a.i32[i] < b.i32[i]) ? 0xffffffff : 0x00000000;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 =
+		vreinterpretq_s32_u32(vcltq_s32(a_.neon_i32, b_.neon_i32));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = HEDLEY_REINTERPRET_CAST(
+		SIMDE_POWER_ALTIVEC_VECTOR(signed int),
+		vec_cmplt(a_.altivec_i32, b_.altivec_i32));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i32x4_lt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.i32 < b_.i32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = (a_.i32[i] < b_.i32[i]) ? ~INT32_C(0) : INT32_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_epi32(a, b) simde_mm_cmplt_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmplt_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmplt_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmplt_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (a.f64[i] < b.f64[i]) ? ~UINT64_C(0) : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = HEDLEY_STATIC_CAST(__typeof__(r_.i64), (a_.f64 < b_.f64));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_lt(a_.wasm_v128, b_.wasm_v128);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (a_.f64[i] < b_.f64[i]) ? ~UINT64_C(0)
+						    : UINT64_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_pd(a, b) simde_mm_cmplt_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmplt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmplt_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmplt_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmplt_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (a.f64[0] < b.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.u64[0] = (a_.f64[0] < b_.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmplt_sd(a, b) simde_mm_cmplt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmple_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmple_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmple_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (a.f64[i] <= b.f64[i]) ? ~UINT64_C(0) : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = HEDLEY_STATIC_CAST(__typeof__(r_.i64), (a_.f64 <= b_.f64));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_le(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 = (SIMDE_POWER_ALTIVEC_VECTOR(double))vec_cmple(
+		a_.altivec_f64, b_.altivec_f64);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (a_.f64[i] <= b_.f64[i]) ? ~UINT64_C(0)
+						     : UINT64_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmple_pd(a, b) simde_mm_cmple_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmple_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmple_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmple_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmple_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (a.f64[0] <= b.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.u64[0] = (a_.f64[0] <= b_.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmple_sd(a, b) simde_mm_cmple_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmpgt_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmpgt_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i8, vreinterpretq_s8_u8(vcgtq_s8(a.neon_i8, b.neon_i8)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpgt_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		r.i8[i] = (a.i8[i] > b.i8[i]) ? 0xff : 0x00;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vreinterpretq_s8_u8(vcgtq_s8(a_.neon_i8, b_.neon_i8));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i8x16_gt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i8 = (SIMDE_POWER_ALTIVEC_VECTOR(signed char))vec_cmpgt(
+		a_.altivec_i8, b_.altivec_i8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = HEDLEY_STATIC_CAST(__typeof__(r_.i8), (a_.i8 > b_.i8));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = (a_.i8[i] > b_.i8[i]) ? ~INT8_C(0) : INT8_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_epi8(a, b) simde_mm_cmpgt_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmpgt_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmpgt_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i16, vreinterpretq_s16_u16(vcgtq_s16(a.neon_i16, b.neon_i16)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpgt_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] > b.i16[i]) ? 0xffff : 0x0000;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 =
+		vreinterpretq_s16_u16(vcgtq_s16(a_.neon_i16, b_.neon_i16));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i16x8_gt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = HEDLEY_REINTERPRET_CAST(
+		SIMDE_POWER_ALTIVEC_VECTOR(signed short),
+		vec_cmpgt(a_.altivec_i16, b_.altivec_i16));
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = HEDLEY_STATIC_CAST(__typeof__(r_.i16), (a_.i16 > b_.i16));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] > b_.i16[i]) ? ~INT16_C(0) : INT16_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_epi16(a, b) simde_mm_cmpgt_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cmpgt_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cmpgt_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(
-		i32, vreinterpretq_s32_u32(vcgtq_s32(a.neon_i32, b.neon_i32)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpgt_epi32(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (a.i32[i] > b.i32[i]) ? 0xffffffff : 0x00000000;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 =
+		vreinterpretq_s32_u32(vcgtq_s32(a_.neon_i32, b_.neon_i32));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i32x4_gt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = (SIMDE_POWER_ALTIVEC_VECTOR(signed int))vec_cmpgt(
+		a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = HEDLEY_STATIC_CAST(__typeof__(r_.i32), (a_.i32 > b_.i32));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = (a_.i32[i] > b_.i32[i]) ? ~INT32_C(0) : INT32_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_epi32(a, b) simde_mm_cmpgt_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpgt_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpgt_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpgt_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (a.f64[i] > b.f64[i]) ? ~UINT64_C(0) : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = HEDLEY_STATIC_CAST(__typeof__(r_.i64), (a_.f64 > b_.f64));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_gt(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 =
+		HEDLEY_STATIC_CAST(SIMDE_POWER_ALTIVEC_VECTOR(double),
+				   vec_cmpgt(a_.altivec_f64, b_.altivec_f64));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (a_.f64[i] > b_.f64[i]) ? ~UINT64_C(0)
+						    : UINT64_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_pd(a, b) simde_mm_cmpgt_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpgt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-	return SIMDE__M128D_C(_mm_cmpgt_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+	return _mm_cmpgt_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmpgt_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (a.f64[0] > b.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.u64[0] = (a_.f64[0] > b_.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpgt_sd(a, b) simde_mm_cmpgt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpge_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpge_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpge_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (a.f64[i] >= b.f64[i]) ? ~UINT64_C(0) : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = HEDLEY_STATIC_CAST(__typeof__(r_.i64), (a_.f64 >= b_.f64));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_ge(a_.wasm_v128, b_.wasm_v128);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 =
+		HEDLEY_STATIC_CAST(SIMDE_POWER_ALTIVEC_VECTOR(double),
+				   vec_cmpge(a_.altivec_f64, b_.altivec_f64));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (a_.f64[i] >= b_.f64[i]) ? ~UINT64_C(0)
+						     : UINT64_C(0);
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpge_pd(a, b) simde_mm_cmpge_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpge_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-	return SIMDE__M128D_C(_mm_cmpge_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+	return _mm_cmpge_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmpge_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (a.f64[0] >= b.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.u64[0] = (a_.f64[0] >= b_.f64[0]) ? ~UINT64_C(0) : UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpge_sd(a, b) simde_mm_cmpge_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpnge_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpnge_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpnge_pd(a, b);
 #else
 	return simde_mm_cmplt_pd(a, b);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnge_pd(a, b) simde_mm_cmpnge_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpnge_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-	return SIMDE__M128D_C(_mm_cmpnge_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+	return _mm_cmpnge_sd(a, b);
 #else
 	return simde_mm_cmplt_sd(a, b);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnge_sd(a, b) simde_mm_cmpnge_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpnlt_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpnlt_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpnlt_pd(a, b);
 #else
 	return simde_mm_cmpge_pd(a, b);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnlt_pd(a, b) simde_mm_cmpnlt_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpnlt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpnlt_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpnlt_sd(a, b);
 #else
 	return simde_mm_cmpge_sd(a, b);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnlt_sd(a, b) simde_mm_cmpnlt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpnle_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpnle_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpnle_pd(a, b);
 #else
 	return simde_mm_cmpgt_pd(a, b);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnle_pd(a, b) simde_mm_cmpnle_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpnle_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpnle_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpnle_sd(a, b);
 #else
 	return simde_mm_cmpgt_sd(a, b);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpnle_sd(a, b) simde_mm_cmpnle_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpord_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpord_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpord_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (!isnan(a.f64[i]) && !isnan(b.f64[i])) ? ~UINT64_C(0)
-								  : UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(simde_math_isnan)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (!simde_math_isnan(a_.f64[i]) &&
+			     !simde_math_isnan(b_.f64[i]))
+				    ? ~UINT64_C(0)
+				    : UINT64_C(0);
 	}
-	return r;
+#else
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpord_pd(a, b) simde_mm_cmpord_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde_float64 simde_mm_cvtsd_f64(simde__m128d a)
+{
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+	return _mm_cvtsd_f64(a);
+#else
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+	return a_.f64[0];
+#endif
+}
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsd_f64(a) simde_mm_cvtsd_f64(a)
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpord_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpord_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpord_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmpord_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (!isnan(a.f64[0]) && !isnan(b.f64[0])) ? ~UINT64_C(0)
-							  : UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(simde_math_isnan)
+	r_.u64[0] =
+		(!simde_math_isnan(a_.f64[0]) && !simde_math_isnan(b_.f64[0]))
+			? ~UINT64_C(0)
+			: UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+#else
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpord_sd(a, b) simde_mm_cmpord_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpunord_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpunord_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpunord_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.u64[i] = (isnan(a.f64[i]) || isnan(b.f64[i])) ? ~UINT64_C(0)
-								: UINT64_C(0);
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(simde_math_isnan)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.u64[i] = (simde_math_isnan(a_.f64[i]) ||
+			     simde_math_isnan(b_.f64[i]))
+				    ? ~UINT64_C(0)
+				    : UINT64_C(0);
 	}
-	return r;
+#else
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpunord_pd(a, b) simde_mm_cmpunord_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cmpunord_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cmpunord_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cmpunord_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_cmpunord_pd(a, b));
 #else
-	simde__m128d r;
-	r.u64[0] = (isnan(a.f64[0]) || isnan(b.f64[0])) ? ~UINT64_C(0)
-							: UINT64_C(0);
-	r.u64[1] = a.u64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(simde_math_isnan)
+	r_.u64[0] = (simde_math_isnan(a_.f64[0]) || simde_math_isnan(b_.f64[0]))
+			    ? ~UINT64_C(0)
+			    : UINT64_C(0);
+	r_.u64[1] = a_.u64[1];
+
+#else
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cmpunord_sd(a, b) simde_mm_cmpunord_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cvtepi32_pd(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cvtepi32_pd(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtepi32_pd(a);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = (simde_float64)a.i32[i];
+	simde__m128d_private r_;
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.f64, a_.m64_private[0].i32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = (simde_float64)a_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtepi32_pd(a) simde_mm_cvtepi32_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtepi32_ps(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128_C(_mm_cvtepi32_ps(a.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128_NEON_C(f32, vcvtq_f32_s32(a.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtepi32_ps(a);
 #else
-	simde__m128 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f32) / sizeof(r.f32[0])); i++) {
-		r.f32[i] = (simde_float32)a.i32[i];
+	simde__m128_private r_;
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_f32 = vcvtq_f32_s32(a_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f32 = vec_ctf(a_.altivec_i32, 0);
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.f32, a_.i32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f32) / sizeof(r_.f32[0])); i++) {
+		r_.f32[i] = (simde_float32)a_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m128_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtepi32_ps(a) simde_mm_cvtepi32_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cvtpd_epi32(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cvtpd_epi32(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtpd_epi32(a);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.i32[i] = (int32_t)a.f64[i];
+	simde__m128i_private r_;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.m64_private[0].i32, a_.f64);
+	r_.m64_private[1] = simde__m64_to_private(simde_mm_setzero_si64());
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(a_.f64) / sizeof(a_.f64[0])); i++) {
+		r_.i32[i] = HEDLEY_STATIC_CAST(int32_t, a_.f64[i]);
 	}
-	return r;
+	simde_memset(&(r_.m64_private[1]), 0, sizeof(r_.m64_private[1]));
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpd_epi32(a) simde_mm_cvtpd_epi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvtpd_pi32(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M64_C(_mm_cvtpd_pi32(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpd_pi32(a);
 #else
-	simde__m64 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (int32_t)a.f64[i];
+	simde__m64_private r_;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.f64);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = HEDLEY_STATIC_CAST(int32_t, a_.f64[i]);
 	}
-	return r;
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpd_pi32(a) simde_mm_cvtpd_pi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtpd_ps(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128_C(_mm_cvtpd_ps(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtpd_ps(a);
 #else
-	simde__m128 r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(a.f64) / sizeof(a.f64[0])); i++) {
-		r.f32[i] = (simde_float32)a.f64[i];
+	simde__m128_private r_;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.m64_private[0].f32, a_.f64);
+	r_.m64_private[1] = simde__m64_to_private(simde_mm_setzero_si64());
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(a_.f64) / sizeof(a_.f64[0])); i++) {
+		r_.f32[i] = (simde_float32)a_.f64[i];
 	}
-	return r;
+	simde_memset(&(r_.m64_private[1]), 0, sizeof(r_.m64_private[1]));
+#endif
+
+	return simde__m128_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpd_ps(a) simde_mm_cvtpd_ps(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cvtpi32_pd(simde__m64 a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cvtpi32_pd(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvtpi32_pd(a);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = (simde_float64)a.i32[i];
+	simde__m128d_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
+
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.f64, a_.i32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = (simde_float64)a_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtpi32_pd(a) simde_mm_cvtpi32_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cvtps_epi32(simde__m128 a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_cvtps_epi32(a.n));
-#elif defined(SIMDE_SSE2_NEON)
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtps_epi32(a);
+#else
+	simde__m128i_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 /* The default rounding mode on SSE is 'round to even', which ArmV7
      does not support!  It is supported on ARMv8 however. */
 #if defined(SIMDE_ARCH_AARCH64)
-	return SIMDE__M128I_NEON_C(i32, vcvtnq_s32_f32(a.neon_f32));
+	r_.neon_i32 = vcvtnq_s32_f32(a_.neon_f32);
 #else
 	uint32x4_t signmask = vdupq_n_u32(0x80000000);
-	float32x4_t half = vbslq_f32(signmask, a.neon_f32,
+	float32x4_t half = vbslq_f32(signmask, a_.neon_f32,
 				     vdupq_n_f32(0.5f)); /* +/- 0.5 */
 	int32x4_t r_normal = vcvtq_s32_f32(
-		vaddq_f32(a.neon_f32, half)); /* round to integer: [a + 0.5]*/
+		vaddq_f32(a_.neon_f32, half)); /* round to integer: [a + 0.5]*/
 	int32x4_t r_trunc =
-		vcvtq_s32_f32(a.neon_f32); /* truncate to integer: [a] */
+		vcvtq_s32_f32(a_.neon_f32); /* truncate to integer: [a] */
 	int32x4_t plusone = vshrq_n_s32(vnegq_s32(r_trunc), 31); /* 1 or 0 */
 	int32x4_t r_even = vbicq_s32(vaddq_s32(r_trunc, plusone),
 				     vdupq_n_s32(1)); /* ([a] + {0,1}) & ~1 */
 	float32x4_t delta = vsubq_f32(
-		a.neon_f32,
+		a_.neon_f32,
 		vcvtq_f32_s32(r_trunc)); /* compute delta: delta = (a - [a]) */
 	uint32x4_t is_delta_half =
 		vceqq_f32(delta, half); /* delta == +/- 0.5 */
-	return SIMDE__M128I_NEON_C(i32,
-				   vbslq_s32(is_delta_half, r_even, r_normal));
+	r_.neon_i32 = vbslq_s32(is_delta_half, r_even, r_normal);
 #endif
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_cts(a_.altivec_f32, 0);
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.f32);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (int32_t)a.f32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = HEDLEY_STATIC_CAST(int32_t, a_.f32[i]);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtps_epi32(a) simde_mm_cvtps_epi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cvtps_pd(simde__m128 a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cvtps_pd(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtps_pd(a);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = a.f32[i];
+	simde__m128d_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
+
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.f64, a_.m64_private[0].f32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = a_.f32[i];
 	}
-	return r;
 #endif
-}
 
-SIMDE__FUNCTION_ATTRIBUTES
-double simde_mm_cvtsd_f64(simde__m128d a)
-{
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-	return _mm_cvtsd_f64(a.n);
-#else
-	return a.f64[0];
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtps_pd(a) simde_mm_cvtps_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvtsd_si32(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_cvtsd_si32(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtsd_si32(a);
 #else
-	return (int32_t)a.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+	return SIMDE_CONVERT_FTOI(int32_t, a_.f64[0]);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsd_si32(a) simde_mm_cvtsd_si32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-int32_t simde_mm_cvtsd_si64(simde__m128d a)
+SIMDE_FUNCTION_ATTRIBUTES
+int64_t simde_mm_cvtsd_si64(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if defined(__PGI)
-	return _mm_cvtsd_si64x(a.n);
+	return _mm_cvtsd_si64x(a);
 #else
-	return _mm_cvtsd_si64(a.n);
+	return _mm_cvtsd_si64(a);
 #endif
 #else
-	return (int32_t)a.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+	return SIMDE_CONVERT_FTOI(int64_t, a_.f64[0]);
 #endif
 }
 #define simde_mm_cvtsd_si64x(a) simde_mm_cvtsd_si64(a)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsd_si64(a) simde_mm_cvtsd_si64(a)
+#define _mm_cvtsd_si64x(a) simde_mm_cvtsd_si64x(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128 simde_mm_cvtsd_ss(simde__m128 a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128_C(_mm_cvtsd_ss(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtsd_ss(a, b);
 #else
-	simde__m128 r;
+	simde__m128_private r_, a_ = simde__m128_to_private(a);
+	simde__m128d_private b_ = simde__m128d_to_private(b);
 
-	r.f32[0] = (simde_float32)b.f64[0];
+	r_.f32[0] = HEDLEY_STATIC_CAST(simde_float32, b_.f64[0]);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 1; i < (sizeof(r) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 1; i < (sizeof(r_) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i];
 	}
 
-	return r;
+	return simde__m128_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsd_ss(a, b) simde_mm_cvtsd_ss(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvtsi128_si32(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_cvtsi128_si32(a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	return vgetq_lane_s32(a.neon_i32, 0);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtsi128_si32(a);
+#else
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	return vgetq_lane_s32(a_.neon_i32, 0);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+#if defined(SIMDE_BUG_GCC_95227)
+	(void)a_;
+#endif
+	return vec_extract(a_.altivec_i32, 0);
 #else
-	return a.i32[0];
+	return a_.i32[0];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi128_si32(a) simde_mm_cvtsi128_si32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int64_t simde_mm_cvtsi128_si64(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if defined(__PGI)
-	return _mm_cvtsi128_si64x(a.n);
+	return _mm_cvtsi128_si64x(a);
 #else
-	return _mm_cvtsi128_si64(a.n);
+	return _mm_cvtsi128_si64(a);
 #endif
 #else
-	return a.i64[0];
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+#if defined(SIMDE_POWER_ALTIVEC_P5_NATIVE) && !defined(HEDLEY_IBM_VERSION)
+	return vec_extract(a_.i64, 0);
+#endif
+	return a_.i64[0];
 #endif
 }
 #define simde_mm_cvtsi128_si64x(a) simde_mm_cvtsi128_si64(a)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi128_si64(a) simde_mm_cvtsi128_si64(a)
+#define _mm_cvtsi128_si64x(a) simde_mm_cvtsi128_si64x(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cvtsi32_sd(simde__m128d a, int32_t b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_cvtsi32_sd(a.n, b));
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtsi32_sd(a, b);
 #else
-	simde__m128d r;
+	simde__m128d_private r_;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
 
-	r.f64[0] = (simde_float64)b;
-	r.i64[1] = a.i64[1];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE) && defined(SIMDE_ARCH_AMD64)
+	r_.neon_f64 = vsetq_lane_f64((simde_float64)b, a_.neon_f64, 0);
+#else
+	r_.f64[0] = HEDLEY_STATIC_CAST(simde_float64, b);
+	r_.i64[1] = a_.i64[1];
+#endif
 
-	return r;
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi32_sd(a, b) simde_mm_cvtsi32_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cvtsi32_si128(int32_t a)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtsi32_si128(a);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_cvtsi32_si128(a);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vsetq_lane_s32(a, vdupq_n_s32(0), 0);
-#else
-	r.i32[0] = a;
-	r.i32[1] = 0;
-	r.i32[2] = 0;
-	r.i32[3] = 0;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vsetq_lane_s32(a, vdupq_n_s32(0), 0);
+#else
+	r_.i32[0] = a;
+	r_.i32[1] = 0;
+	r_.i32[2] = 0;
+	r_.i32[3] = 0;
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi32_si128(a) simde_mm_cvtsi32_si128(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128d simde_mm_cvtsi64_sd(simde__m128d a, int32_t b)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128d simde_mm_cvtsi64_sd(simde__m128d a, int64_t b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if !defined(__PGI)
-	r.n = _mm_cvtsi64_sd(a.n, b);
+	return _mm_cvtsi64_sd(a, b);
 #else
-	r.n = _mm_cvtsi64x_sd(a.n, b);
+	return _mm_cvtsi64x_sd(a, b);
 #endif
 #else
-	r.f64[0] = (simde_float64)b;
-	r.f64[1] = a.f64[1];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_f64 = vsetq_lane_f64((simde_float64)b, a_.neon_f64, 0);
+#else
+	r_.f64[0] = HEDLEY_STATIC_CAST(simde_float64, b);
+	r_.f64[1] = a_.f64[1];
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
-#define simde_mm_cvtsi64x_sd(a, b) simde_mm_cvtsi64(a, b)
+#define simde_mm_cvtsi64x_sd(a, b) simde_mm_cvtsi64_sd(a, b)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi64_sd(a, b) simde_mm_cvtsi64_sd(a, b)
+#define _mm_cvtsi64x_sd(a, b) simde_mm_cvtsi64x_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cvtsi64_si128(int64_t a)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if !defined(__PGI)
-	r.n = _mm_cvtsi64_si128(a);
+	return _mm_cvtsi64_si128(a);
 #else
-	r.n = _mm_cvtsi64x_si128(a);
+	return _mm_cvtsi64x_si128(a);
 #endif
 #else
-	r.i64[0] = a;
-	r.i64[1] = 0;
-#endif
+	simde__m128i_private r_;
 
-	return r;
+	r_.i64[0] = a;
+	r_.i64[1] = 0;
+
+	return simde__m128i_from_private(r_);
+#endif
 }
 #define simde_mm_cvtsi64x_si128(a) simde_mm_cvtsi64_si128(a)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtsi64_si128(a) simde_mm_cvtsi64_si128(a)
+#define _mm_cvtsi64x_si128(a) simde_mm_cvtsi64x_si128(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_cvtss_sd(simde__m128d a, simde__m128 b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_cvtss_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvtss_sd(a, b);
 #else
-	r.f64[0] = b.f32[0];
-	r.i64[1] = a.i64[1];
-#endif
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+	simde__m128_private b_ = simde__m128_to_private(b);
 
-	return r;
+	a_.f64[0] = HEDLEY_STATIC_CAST(simde_float64, b_.f32[0]);
+
+	return simde__m128d_from_private(a_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvtss_sd(a, b) simde_mm_cvtss_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cvttpd_epi32(simde__m128d a)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_cvttpd_epi32(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvttpd_epi32(a);
 #else
-	for (size_t i = 0; i < (sizeof(a.f64) / sizeof(a.f64[0])); i++) {
-		r.i32[i] = (int32_t)trunc(a.f64[i]);
+	simde__m128i_private r_;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+	for (size_t i = 0; i < (sizeof(a_.f64) / sizeof(a_.f64[0])); i++) {
+		r_.i32[i] = SIMDE_CONVERT_FTOI(int32_t, a_.f64[i]);
 	}
-#endif
+	simde_memset(&(r_.m64_private[1]), 0, sizeof(r_.m64_private[1]));
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvttpd_epi32(a) simde_mm_cvttpd_epi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_cvttpd_pi32(simde__m128d a)
 {
-	simde__m64 r;
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_cvttpd_pi32(a);
+#else
+	simde__m64_private r_;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_cvttpd_pi32(a.n);
+#if defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.f64);
 #else
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (int32_t)trunc(a.f64[i]);
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = SIMDE_CONVERT_FTOI(int32_t, a_.f64[i]);
 	}
 #endif
 
-	return r;
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvttpd_pi32(a) simde_mm_cvttpd_pi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_cvttps_epi32(simde__m128 a)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvttps_epi32(a);
+#else
+	simde__m128i_private r_;
+	simde__m128_private a_ = simde__m128_to_private(a);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_cvttps_epi32(a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vcvtq_s32_f32(a.neon_f32);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vcvtq_s32_f32(a_.neon_f32);
+#elif defined(SIMDE_CONVERT_VECTOR_)
+	SIMDE_CONVERT_VECTOR_(r_.i32, a_.f32);
 #else
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = (int32_t)truncf(a.f32[i]);
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = SIMDE_CONVERT_FTOI(int32_t, a_.f32[i]);
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvttps_epi32(a) simde_mm_cvttps_epi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_cvttsd_si32(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_cvttsd_si32(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_cvttsd_si32(a);
 #else
-	return (int32_t)trunc(a.f64[0]);
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+	return SIMDE_CONVERT_FTOI(int32_t, a_.f64[0]);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvttsd_si32(a) simde_mm_cvttsd_si32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int64_t simde_mm_cvttsd_si64(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
 #if !defined(__PGI)
-	return _mm_cvttsd_si64(a.n);
+	return _mm_cvttsd_si64(a);
 #else
-	return _mm_cvttsd_si64x(a.n);
+	return _mm_cvttsd_si64x(a);
 #endif
 #else
-	return (int64_t)trunc(a.f64[0]);
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+	return SIMDE_CONVERT_FTOI(int64_t, a_.f64[0]);
 #endif
 }
 #define simde_mm_cvttsd_si64x(a) simde_mm_cvttsd_si64(a)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_cvttsd_si64(a) simde_mm_cvttsd_si64(a)
+#define _mm_cvttsd_si64x(a) simde_mm_cvttsd_si64x(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_div_pd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_div_pd(a, b);
+#else
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_div_pd(a.n, b.n);
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f64 = a_.f64 / b_.f64;
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_div(a_.wasm_v128, b_.wasm_v128);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = a.f64[i] / b.f64[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = a_.f64[i] / b_.f64[i];
 	}
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_div_pd(a, b) simde_mm_div_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_div_sd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_div_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_div_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_div_pd(a, b));
 #else
-	r.f64[0] = a.f64[0] / b.f64[0];
-	r.f64[1] = a.f64[1];
-#endif
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-	return r;
+	r_.f64[0] = a_.f64[0] / b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_div_sd(a, b) simde_mm_div_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_extract_epi16(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 7)
 {
-	return a.u16[imm8 & 7];
+	uint16_t r;
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+#if defined(SIMDE_BUG_GCC_95227)
+	(void)a_;
+	(void)imm8;
+#endif
+	r = vec_extract(a_.altivec_i16, imm8);
+#else
+	r = a_.u16[imm8 & 7];
+#endif
+
+	return HEDLEY_STATIC_CAST(int32_t, r);
 }
-#if defined(SIMDE_SSE2_NATIVE) && \
-	(!defined(SIMDE__REALLY_GCC) || HEDLEY_GCC_VERSION_CHECK(4, 6, 0))
-#define simde_mm_extract_epi16(a, imm8) _mm_extract_epi16(a.n, imm8)
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_extract_epi16(a, imm8) \
-	(vgetq_lane_s16((a).neon_i16, (imm8)) & ((int32_t)UINT32_C(0x0000ffff)))
+#if defined(SIMDE_X86_SSE2_NATIVE) && \
+	(!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(4, 6, 0))
+#define simde_mm_extract_epi16(a, imm8) _mm_extract_epi16(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_extract_epi16(a, imm8)                                        \
+	HEDLEY_STATIC_CAST(int32_t,                                            \
+			   vgetq_lane_s16(simde__m128i_to_private(a).neon_i16, \
+					  (imm8)) &                            \
+				   (UINT32_C(0x0000ffff)))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_extract_epi16(a, imm8) simde_mm_extract_epi16(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_insert_epi16(simde__m128i a, int32_t i, const int imm8)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_insert_epi16(simde__m128i a, int16_t i, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 7)
 {
-	a.u16[imm8 & 7] = (int16_t)i;
-	return a;
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+	a_.i16[imm8 & 7] = i;
+	return simde__m128i_from_private(a_);
 }
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-#define simde_mm_insert_epi16(a, i, imm8) \
-	SIMDE__M128I_C(_mm_insert_epi16((a).n, (i), (imm8)))
-#elif defined(SIMDE_SSE2_NEON)
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+#define simde_mm_insert_epi16(a, i, imm8) _mm_insert_epi16((a), (i), (imm8))
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 #define simde_mm_insert_epi16(a, i, imm8) \
-	SIMDE__M128I_NEON_C(i16, vsetq_lane_s16((i), a.neon_i16, (imm8)))
+	simde__m128i_from_neon_i16(       \
+		vsetq_lane_s16((i), simde__m128i_to_neon_i16(a), (imm8)))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_insert_epi16(a, i, imm8) simde_mm_insert_epi16(a, i, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d
 simde_mm_load_pd(simde_float64 const mem_addr[HEDLEY_ARRAY_PARAM(2)])
 {
-	simde__m128d r;
-
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_load_pd(mem_addr);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_u32 = vld1q_u32((uint32_t const *)mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_load_pd(mem_addr);
+#else
+	simde__m128d_private r_;
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 =
+		vld1q_u32(HEDLEY_REINTERPRET_CAST(uint32_t const *, mem_addr));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE) && !defined(HEDLEY_IBM_VERSION)
+	r_.altivec_f64 = vec_ld(
+		0, HEDLEY_REINTERPRET_CAST(SIMDE_POWER_ALTIVEC_VECTOR(double)
+						   const *,
+					   mem_addr));
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(&r, mem_addr, sizeof(r));
+	r_ = *SIMDE_ALIGN_CAST(simde__m128d_private const *, mem_addr);
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_load_pd(mem_addr) simde_mm_load_pd(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_load_pd1(simde_float64 const *mem_addr)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_load_pd1(mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_load1_pd(mem_addr);
 #else
-	r.f64[0] = *mem_addr;
-	r.f64[1] = *mem_addr;
-#endif
+	simde__m128d_private r_;
 
-	return r;
+	r_.f64[0] = *mem_addr;
+	r_.f64[1] = *mem_addr;
+
+	return simde__m128d_from_private(r_);
+#endif
 }
 #define simde_mm_load1_pd(mem_addr) simde_mm_load_pd1(mem_addr)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_load_pd1(mem_addr) simde_mm_load_pd1(mem_addr)
+#define _mm_load1_pd(mem_addr) simde_mm_load1_pd(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_load_sd(simde_float64 const *mem_addr)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_load_sd(mem_addr);
+#else
+	simde__m128d_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_load_sd(mem_addr);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_f64 = vsetq_lane_f64(*mem_addr, vdupq_n_f64(0), 0);
 #else
-	memcpy(&r, mem_addr, sizeof(simde_float64));
-	r.u64[1] = 0;
+	r_.f64[0] = *mem_addr;
+	r_.u64[1] = UINT64_C(0);
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_load_sd(mem_addr) simde_mm_load_sd(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_load_si128(simde__m128i const *mem_addr)
 {
-	simde__m128i r;
-
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_load_si128(&(mem_addr->n));
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vld1q_s32((int32_t const *)mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_load_si128(
+		HEDLEY_REINTERPRET_CAST(__m128i const *, mem_addr));
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	simde__m128i_private r_;
+
+#if defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_ld(
+		0, HEDLEY_REINTERPRET_CAST(
+			   SIMDE_POWER_ALTIVEC_VECTOR(int) const *, mem_addr));
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(&r, mem_addr, sizeof(r));
+	r_.neon_i32 = vld1q_s32((int32_t const *)mem_addr);
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#else
+	return *mem_addr;
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_load_si128(mem_addr) simde_mm_load_si128(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_loadh_pd(simde__m128d a, simde_float64 const *mem_addr)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_loadh_pd(a.n, mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_loadh_pd(a, mem_addr);
 #else
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a);
 	simde_float64 t;
-	memcpy(&t, mem_addr, sizeof(t));
-	r.f64[0] = a.f64[0];
-	r.f64[1] = t;
-#endif
 
-	return r;
+	simde_memcpy(&t, mem_addr, sizeof(t));
+	r_.f64[0] = a_.f64[0];
+	r_.f64[1] = t;
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_loadh_pd(a, mem_addr) simde_mm_loadh_pd(a, mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_loadl_epi64(simde__m128i const *mem_addr)
 {
-	simde__m128i r;
+	simde_assert_aligned(16, mem_addr);
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_loadl_epi64(
+		HEDLEY_REINTERPRET_CAST(__m128i const *, mem_addr));
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_loadl_epi64(&mem_addr->n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vcombine_s32(vld1_s32((int32_t const *)mem_addr),
-				  vcreate_s32(0));
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vcombine_s32(vld1_s32((int32_t const *)mem_addr),
+				   vcreate_s32(0));
 #else
-	r.u64[0] = mem_addr->u64[0];
-	r.u64[1] = 0;
+	r_.i64[0] = *HEDLEY_REINTERPRET_CAST(int64_t const *, mem_addr);
+	r_.i64[1] = 0;
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_loadl_epi64(mem_addr) simde_mm_loadl_epi64(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_loadl_pd(simde__m128d a, simde_float64 const *mem_addr)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_loadl_pd(a.n, mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_loadl_pd(a, mem_addr);
 #else
-	memcpy(&r, mem_addr, sizeof(simde_float64));
-	r.u64[1] = a.u64[1];
-#endif
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a);
 
-	return r;
+	r_.f64[0] = *mem_addr;
+	r_.u64[1] = a_.u64[1];
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_loadl_pd(a, mem_addr) simde_mm_loadl_pd(a, mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d
 simde_mm_loadr_pd(simde_float64 const mem_addr[HEDLEY_ARRAY_PARAM(2)])
 {
-	simde__m128d r;
-
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_loadr_pd(mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_loadr_pd(mem_addr);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	r.f64[0] = mem_addr[1];
-	r.f64[1] = mem_addr[0];
-#endif
+	simde__m128d_private r_;
 
-	return r;
+	r_.f64[0] = mem_addr[1];
+	r_.f64[1] = mem_addr[0];
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_loadr_pd(mem_addr) simde_mm_loadr_pd(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d
 simde_mm_loadu_pd(simde_float64 const mem_addr[HEDLEY_ARRAY_PARAM(2)])
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_loadu_pd(mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_loadu_pd(mem_addr);
 #else
-	simde_float64 l, h;
-	memcpy(&l, &mem_addr[0], sizeof(l));
-	memcpy(&h, &mem_addr[1], sizeof(h));
-	r.f64[0] = l;
-	r.f64[1] = h;
-#endif
+	simde__m128d_private r_;
 
-	return r;
+	simde_memcpy(&r_, mem_addr, sizeof(r_));
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_loadu_pd(mem_addr) simde_mm_loadu_pd(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_loadu_si128(simde__m128i const *mem_addr)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_loadu_si128(HEDLEY_STATIC_CAST(__m128i const *, mem_addr));
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_loadu_si128(&((*mem_addr).n));
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vld1q_s32((int32_t const *)mem_addr);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vld1q_s32((int32_t const *)mem_addr);
 #else
-	memcpy(&r, mem_addr, sizeof(r));
+	simde_memcpy(&r_, mem_addr, sizeof(r_));
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_loadu_si128(mem_addr) simde_mm_loadu_si128(mem_addr)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_madd_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_madd_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_madd_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
 	int32x4_t pl =
-		vmull_s16(vget_low_s16(a.neon_i16), vget_low_s16(b.neon_i16));
-	int32x4_t ph =
-		vmull_s16(vget_high_s16(a.neon_i16), vget_high_s16(b.neon_i16));
+		vmull_s16(vget_low_s16(a_.neon_i16), vget_low_s16(b_.neon_i16));
+	int32x4_t ph = vmull_s16(vget_high_s16(a_.neon_i16),
+				 vget_high_s16(b_.neon_i16));
 	int32x2_t rl = vpadd_s32(vget_low_s32(pl), vget_high_s32(pl));
 	int32x2_t rh = vpadd_s32(vget_low_s32(ph), vget_high_s32(ph));
-	r.neon_i32 = vcombine_s32(rl, rh);
+	r_.neon_i32 = vcombine_s32(rl, rh);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.i16[0])); i += 2) {
-		r.i32[i / 2] =
-			(a.i16[i] * b.i16[i]) + (a.i16[i + 1] * b.i16[i + 1]);
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i16[0])); i += 2) {
+		r_.i32[i / 2] = (a_.i16[i] * b_.i16[i]) +
+				(a_.i16[i + 1] * b_.i16[i + 1]);
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_madd_epi16(a, b) simde_mm_madd_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_maskmoveu_si128(simde__m128i a, simde__m128i mask,
 			      int8_t mem_addr[HEDLEY_ARRAY_PARAM(16)])
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_maskmoveu_si128(a.n, mask.n, (char *)mem_addr);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_maskmoveu_si128(a, mask, HEDLEY_REINTERPRET_CAST(char *, mem_addr));
 #else
-	for (size_t i = 0; i < 16; i++) {
-		if (mask.u8[i] & 0x80) {
-			mem_addr[i] = a.i8[i];
+	simde__m128i_private a_ = simde__m128i_to_private(a),
+			     mask_ = simde__m128i_to_private(mask);
+
+	for (size_t i = 0; i < (sizeof(a_.i8) / sizeof(a_.i8[0])); i++) {
+		if (mask_.u8[i] & 0x80) {
+			mem_addr[i] = a_.i8[i];
 		}
 	}
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_maskmoveu_si128(a, mask, mem_addr) \
+	simde_mm_maskmoveu_si128(              \
+		(a), (mask),                   \
+		SIMDE_CHECKED_REINTERPRET_CAST(int8_t *, char *, (mem_addr)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_movemask_epi8(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_movemask_epi8(a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	uint8x16_t input = a.neon_u8;
-	SIMDE_ALIGN(16)
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__INTEL_COMPILER)
+	/* ICC has trouble with _mm_movemask_epi8 at -O2 and above: */
+	return _mm_movemask_epi8(a);
+#else
+	int32_t r = 0;
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	uint8x16_t input = a_.neon_u8;
+	SIMDE_ALIGN_AS(16, int8x8_t)
 	static const int8_t xr[8] = {-7, -6, -5, -4, -3, -2, -1, 0};
 	uint8x8_t mask_and = vdup_n_u8(0x80);
 	int8x8_t mask_shift = vld1_s8(xr);
@@ -1900,2298 +3038,3177 @@
 	hi = vpadd_u8(hi, hi);
 	hi = vpadd_u8(hi, hi);
 
-	return ((hi[0] << 8) | (lo[0] & 0xFF));
+	r = ((hi[0] << 8) | (lo[0] & 0xFF));
+#elif defined(SIMDE_POWER_ALTIVEC_P8_NATIVE) && !defined(HEDLEY_IBM_VERSION)
+	static const SIMDE_POWER_ALTIVEC_VECTOR(unsigned char)
+		perm = {120, 112, 104, 96, 88, 80, 72, 64,
+			56,  48,  40,  32, 24, 16, 8,  0};
+	r = HEDLEY_STATIC_CAST(
+		int32_t, vec_extract(vec_vbpermq(a_.altivec_u8, perm), 1));
 #else
-	int32_t r = 0;
-	SIMDE__VECTORIZE_REDUCTION(| : r)
-	for (size_t i = 0; i < 16; i++) {
-		r |= (a.u8[15 - i] >> 7) << (15 - i);
+	SIMDE_VECTORIZE_REDUCTION(| : r)
+	for (size_t i = 0; i < (sizeof(a_.u8) / sizeof(a_.u8[0])); i++) {
+		r |= (a_.u8[15 - i] >> 7) << (15 - i);
 	}
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_movemask_epi8(a) simde_mm_movemask_epi8(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int32_t simde_mm_movemask_pd(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_movemask_pd(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_movemask_pd(a);
 #else
 	int32_t r = 0;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(a.u64) / sizeof(a.u64[0])); i++) {
-		r |= (a.u64[i] >> 63) << i;
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(a_.u64) / sizeof(a_.u64[0])); i++) {
+		r |= (a_.u64[i] >> 63) << i;
 	}
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_movemask_pd(a) simde_mm_movemask_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_movepi64_pi64(simde__m128i a)
 {
-	simde__m64 r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_movepi64_pi64(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_movepi64_pi64(a);
 #else
-	r.i64[0] = a.i64[0];
-#endif
+	simde__m64_private r_;
+	simde__m128i_private a_ = simde__m128i_to_private(a);
 
-	return r;
+	r_.i64[0] = a_.i64[0];
+
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_movepi64_pi64(a) simde_mm_movepi64_pi64(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_movpi64_epi64(simde__m64 a)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_movpi64_epi64(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_movpi64_epi64(a);
 #else
-	r.i64[0] = a.i64[0];
-	r.i64[1] = 0;
-#endif
+	simde__m128i_private r_;
+	simde__m64_private a_ = simde__m64_to_private(a);
 
-	return r;
+	r_.i64[0] = a_.i64[0];
+	r_.i64[1] = 0;
+
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_movpi64_epi64(a) simde_mm_movpi64_epi64(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_min_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_min_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_min_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i16 = vminq_s16(a.neon_i16, b.neon_i16);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] < b.i16[i]) ? a.i16[i] : b.i16[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vminq_s16(a_.neon_i16, b_.neon_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] < b_.i16[i]) ? a_.i16[i] : b_.i16[i];
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_min_epi16(a, b) simde_mm_min_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_min_epu8(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_min_epu8(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_min_epu8(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_u8 = vminq_u8(a.neon_u8, b.neon_u8);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		r.u8[i] = (a.u8[i] < b.u8[i]) ? a.u8[i] : b.u8[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vminq_u8(a_.neon_u8, b_.neon_u8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = (a_.u8[i] < b_.u8[i]) ? a_.u8[i] : b_.u8[i];
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_min_epu8(a, b) simde_mm_min_epu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_min_pd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_min_pd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_min_pd(a, b);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = (a.f64[i] < b.f64[i]) ? a.f64[i] : b.f64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = (a_.f64[i] < b_.f64[i]) ? a_.f64[i] : b_.f64[i];
 	}
-#endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_min_pd(a, b) simde_mm_min_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_min_sd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_min_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_min_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_min_pd(a, b));
 #else
-	r.f64[0] = (a.f64[0] < b.f64[0]) ? a.f64[0] : b.f64[0];
-	r.f64[1] = a.f64[1];
-#endif
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-	return r;
+	r_.f64[0] = (a_.f64[0] < b_.f64[0]) ? a_.f64[0] : b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_min_sd(a, b) simde_mm_min_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_max_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_max_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_max_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i16 = vmaxq_s16(a.neon_i16, b.neon_i16);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = (a.i16[i] > b.i16[i]) ? a.i16[i] : b.i16[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vmaxq_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = vec_max(a_.altivec_i16, b_.altivec_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = (a_.i16[i] > b_.i16[i]) ? a_.i16[i] : b_.i16[i];
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_max_epi16(a, b) simde_mm_max_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_max_epu8(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_max_epu8(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_max_epu8(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_u8 = vmaxq_u8(a.neon_u8, b.neon_u8);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u8) / sizeof(r.u8[0])); i++) {
-		r.u8[i] = (a.u8[i] > b.u8[i]) ? a.u8[i] : b.u8[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vmaxq_u8(a_.neon_u8, b_.neon_u8);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u8 = vec_max(a_.altivec_u8, b_.altivec_u8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u8) / sizeof(r_.u8[0])); i++) {
+		r_.u8[i] = (a_.u8[i] > b_.u8[i]) ? a_.u8[i] : b_.u8[i];
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_max_epu8(a, b) simde_mm_max_epu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_max_pd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_max_pd(a, b);
+#else
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_max_pd(a.n, b.n);
+#if defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_f64 = vec_max(a_.altivec_f64, b_.altivec_f64);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = (a.f64[i] > b.f64[i]) ? a.f64[i] : b.f64[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = (a_.f64[i] > b_.f64[i]) ? a_.f64[i] : b_.f64[i];
 	}
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_max_pd(a, b) simde_mm_max_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_max_sd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_max_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_max_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_max_pd(a, b));
 #else
-	r.f64[0] = (a.f64[0] > b.f64[0]) ? a.f64[0] : b.f64[0];
-	r.f64[1] = a.f64[1];
-#endif
-
-	return r;
-}
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_move_epi64(simde__m128i a)
-{
-	simde__m128i r;
+	r_.f64[0] = (a_.f64[0] > b_.f64[0]) ? a_.f64[0] : b_.f64[0];
+	r_.f64[1] = a_.f64[1];
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_move_epi64(a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i64 = vsetq_lane_s64(0, a.neon_i64, 1);
-#else
-	r.i64[0] = a.i64[0];
-	r.i64[1] = 0;
+	return simde__m128d_from_private(r_);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_max_sd(a, b) simde_mm_max_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128d simde_mm_move_sd(simde__m128d a, simde__m128d b)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_move_epi64(simde__m128i a)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_move_epi64(a);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_move_sd(a.n, b.n);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vsetq_lane_s64(0, a_.neon_i64, 1);
 #else
-	r.f64[0] = b.f64[0];
-	r.f64[1] = a.f64[1];
+	r_.i64[0] = a_.i64[0];
+	r_.i64[1] = 0;
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_move_epi64(a) simde_mm_move_epi64(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_mul_epu32(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_mul_epu32(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_mul_epu32(a, b);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u64) / sizeof(r.u64[0])); i++) {
-		r.u64[i] = ((uint64_t)a.u32[i * 2]) * ((uint64_t)b.u32[i * 2]);
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u64) / sizeof(r_.u64[0])); i++) {
+		r_.u64[i] = HEDLEY_STATIC_CAST(uint64_t, a_.u32[i * 2]) *
+			    HEDLEY_STATIC_CAST(uint64_t, b_.u32[i * 2]);
 	}
-#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mul_epu32(a, b) simde_mm_mul_epu32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_mul_epi64(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] * b.i64[i];
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 * b_.i64;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.i64[i] = a_.i64[i] * b_.i64[i];
 	}
+#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_mod_epi64(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] % b.i64[i];
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 % b_.i64;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.i64[i] = a_.i64[i] % b_.i64[i];
 	}
+#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_mul_pd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_mul_pd(a, b);
+#else
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_mul_pd(a.n, b.n);
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f64 = a_.f64 * b_.f64;
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_mul(a_.wasm_v128, b_.wasm_v128);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = a.f64[i] * b.f64[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = a_.f64[i] * b_.f64[i];
 	}
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mul_pd(a, b) simde_mm_mul_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_mul_sd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_mul_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_mul_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_mul_pd(a, b));
 #else
-	r.f64[0] = a.f64[0] * b.f64[0];
-	r.f64[1] = a.f64[1];
-#endif
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-	return r;
+	r_.f64[0] = a_.f64[0] * b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mul_sd(a, b) simde_mm_mul_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_mul_su32(simde__m64 a, simde__m64 b)
 {
-	simde__m64 r;
-
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-	r.n = _mm_mul_su32(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE) && \
+	!defined(__PGI)
+	return _mm_mul_su32(a, b);
 #else
-	r.u64[0] = ((uint64_t)a.u32[0]) * ((uint64_t)b.u32[0]);
-#endif
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
 
-	return r;
+	r_.u64[0] = HEDLEY_STATIC_CAST(uint64_t, a_.u32[0]) *
+		    HEDLEY_STATIC_CAST(uint64_t, b_.u32[0]);
+
+	return simde__m64_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mul_su32(a, b) simde_mm_mul_su32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_mulhi_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_mulhi_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_mulhi_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	int16x4_t a3210 = vget_low_s16(a.neon_i16);
-	int16x4_t b3210 = vget_low_s16(b.neon_i16);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int16x4_t a3210 = vget_low_s16(a_.neon_i16);
+	int16x4_t b3210 = vget_low_s16(b_.neon_i16);
 	int32x4_t ab3210 = vmull_s16(a3210, b3210); /* 3333222211110000 */
-	int16x4_t a7654 = vget_high_s16(a.neon_i16);
-	int16x4_t b7654 = vget_high_s16(b.neon_i16);
+	int16x4_t a7654 = vget_high_s16(a_.neon_i16);
+	int16x4_t b7654 = vget_high_s16(b_.neon_i16);
 	int32x4_t ab7654 = vmull_s16(a7654, b7654); /* 7777666655554444 */
 	uint16x8x2_t rv = vuzpq_u16(vreinterpretq_u16_s32(ab3210),
 				    vreinterpretq_u16_s32(ab7654));
-	r.neon_u16 = rv.val[1];
+	r_.neon_u16 = rv.val[1];
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.u16[i] = (uint16_t)(((uint32_t)(((int32_t)a.i16[i]) *
-						  ((int32_t)b.i16[i]))) >>
-				      16);
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(
+			uint16_t,
+			(HEDLEY_STATIC_CAST(
+				 uint32_t,
+				 HEDLEY_STATIC_CAST(int32_t, a_.i16[i]) *
+					 HEDLEY_STATIC_CAST(int32_t,
+							    b_.i16[i])) >>
+			 16));
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mulhi_epi16(a, b) simde_mm_mulhi_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_mulhi_epu16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-	r.n = _mm_mulhi_epu16(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+	return _mm_mulhi_epu16(a, b);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = (uint16_t)(
-			(((uint32_t)a.u16[i]) * ((uint32_t)b.u16[i])) >> 16);
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(
+			uint16_t,
+			HEDLEY_STATIC_CAST(uint32_t, a_.u16[i]) *
+					HEDLEY_STATIC_CAST(uint32_t,
+							   b_.u16[i]) >>
+				16);
 	}
-#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mulhi_epu16(a, b) simde_mm_mulhi_epu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_mullo_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_mullo_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_mullo_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i16 = vmulq_s16(a.neon_i16, b.neon_i16);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.u16[i] = (uint16_t)(((uint32_t)(((int32_t)a.i16[i]) *
-						  ((int32_t)b.i16[i]))) &
-				      0xffff);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vmulq_s16(a_.neon_i16, b_.neon_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(
+			uint16_t,
+			HEDLEY_STATIC_CAST(uint32_t, a_.u16[i]) *
+				HEDLEY_STATIC_CAST(uint32_t, b_.u16[i]));
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mullo_epi16(a, b) simde_mm_mullo_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_or_pd(simde__m128d a, simde__m128d b)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_or_pd(a, b);
+#else
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_or_pd(a.n, b.n);
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f | b_.i32f;
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] | b.i64[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = a_.i32f[i] | b_.i32f[i];
 	}
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_or_pd(a, b) simde_mm_or_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_or_si128(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_or_si128(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_or_si128(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vorrq_s32(a.neon_i32, b.neon_i32);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] | b.i64[i];
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vorrq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_or(a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f | b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = a_.i32f[i] | b_.i32f[i];
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_or_si128(a, b) simde_mm_or_si128(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_packs_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_packs_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_packs_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i8 = vcombine_s8(vqmovn_s16(a.neon_i16), vqmovn_s16(b.neon_i16));
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i8[i] = (a.i16[i] > INT8_MAX)
-				  ? INT8_MAX
-				  : ((a.i16[i] < INT8_MIN)
-					     ? INT8_MIN
-					     : ((int8_t)a.i16[i]));
-		r.i8[i + 8] = (b.i16[i] > INT8_MAX)
-				      ? INT8_MAX
-				      : ((b.i16[i] < INT8_MIN)
-						 ? INT8_MIN
-						 : ((int8_t)b.i16[i]));
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 =
+		vcombine_s8(vqmovn_s16(a_.neon_i16), vqmovn_s16(b_.neon_i16));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i8[i] = (a_.i16[i] > INT8_MAX)
+				   ? INT8_MAX
+				   : ((a_.i16[i] < INT8_MIN)
+					      ? INT8_MIN
+					      : HEDLEY_STATIC_CAST(int8_t,
+								   a_.i16[i]));
+		r_.i8[i + 8] = (b_.i16[i] > INT8_MAX)
+				       ? INT8_MAX
+				       : ((b_.i16[i] < INT8_MIN)
+						  ? INT8_MIN
+						  : HEDLEY_STATIC_CAST(
+							    int8_t, b_.i16[i]));
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_packs_epi16(a, b) simde_mm_packs_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_packs_epi32(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_packs_epi32(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_packs_epi32(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i16 =
-		vcombine_s16(vqmovn_s32(a.neon_i32), vqmovn_s32(b.neon_i32));
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i16[i] = (a.i32[i] > INT16_MAX)
-				   ? INT16_MAX
-				   : ((a.i32[i] < INT16_MIN)
-					      ? INT16_MIN
-					      : ((int16_t)a.i32[i]));
-		r.i16[i + 4] = (b.i32[i] > INT16_MAX)
-				       ? INT16_MAX
-				       : ((b.i32[i] < INT16_MIN)
-						  ? INT16_MIN
-						  : ((int16_t)b.i32[i]));
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 =
+		vcombine_s16(vqmovn_s32(a_.neon_i32), vqmovn_s32(b_.neon_i32));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i16 = vec_packs(a_.altivec_i32, b_.altivec_i32);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i16[i] = (a_.i32[i] > INT16_MAX)
+				    ? INT16_MAX
+				    : ((a_.i32[i] < INT16_MIN)
+					       ? INT16_MIN
+					       : HEDLEY_STATIC_CAST(int16_t,
+								    a_.i32[i]));
+		r_.i16[i + 4] =
+			(b_.i32[i] > INT16_MAX)
+				? INT16_MAX
+				: ((b_.i32[i] < INT16_MIN)
+					   ? INT16_MIN
+					   : HEDLEY_STATIC_CAST(int16_t,
+								b_.i32[i]));
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_packs_epi32(a, b) simde_mm_packs_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_packus_epi16(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_packus_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_packus_epi16(a.n, b.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_u8 =
-		vcombine_u8(vqmovun_s16(a.neon_i16), vqmovun_s16(b.neon_i16));
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.u8[i] = (a.i16[i] > UINT8_MAX)
-				  ? UINT8_MAX
-				  : ((a.i16[i] < 0) ? 0 : ((int8_t)a.i16[i]));
-		r.u8[i + 8] =
-			(b.i16[i] > UINT8_MAX)
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 =
+		vcombine_u8(vqmovun_s16(a_.neon_i16), vqmovun_s16(b_.neon_i16));
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_u8 = vec_packsu(a_.altivec_i16, b_.altivec_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.u8[i] = (a_.i16[i] > UINT8_MAX)
+				   ? UINT8_MAX
+				   : ((a_.i16[i] < 0)
+					      ? UINT8_C(0)
+					      : HEDLEY_STATIC_CAST(uint8_t,
+								   a_.i16[i]));
+		r_.u8[i + 8] =
+			(b_.i16[i] > UINT8_MAX)
 				? UINT8_MAX
-				: ((b.i16[i] < 0) ? 0 : ((int8_t)b.i16[i]));
+				: ((b_.i16[i] < 0)
+					   ? UINT8_C(0)
+					   : HEDLEY_STATIC_CAST(uint8_t,
+								b_.i16[i]));
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_packus_epi16(a, b) simde_mm_packus_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_pause(void)
 {
-#if defined(SIMDE_SSE2_NATIVE)
+#if defined(SIMDE_X86_SSE2_NATIVE)
 	_mm_pause();
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_pause() (simde_mm_pause())
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sad_epu8(simde__m128i a, simde__m128i b)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_sad_epu8(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sad_epu8(a, b);
 #else
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
 		uint16_t tmp = 0;
-		SIMDE__VECTORIZE_REDUCTION(+ : tmp)
-		for (size_t j = 0; j < ((sizeof(r.u8) / sizeof(r.u8[0])) / 2);
+		SIMDE_VECTORIZE_REDUCTION(+ : tmp)
+		for (size_t j = 0; j < ((sizeof(r_.u8) / sizeof(r_.u8[0])) / 2);
 		     j++) {
 			const size_t e = j + (i * 8);
-			tmp += (a.u8[e] > b.u8[e]) ? (a.u8[e] - b.u8[e])
-						   : (b.u8[e] - a.u8[e]);
+			tmp += (a_.u8[e] > b_.u8[e]) ? (a_.u8[e] - b_.u8[e])
+						     : (b_.u8[e] - a_.u8[e]);
 		}
-		r.i64[i] = tmp;
+		r_.i64[i] = tmp;
 	}
-#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sad_epu8(a, b) simde_mm_sad_epu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set_epi8(int8_t e15, int8_t e14, int8_t e13, int8_t e12,
 			       int8_t e11, int8_t e10, int8_t e9, int8_t e8,
 			       int8_t e7, int8_t e6, int8_t e5, int8_t e4,
 			       int8_t e3, int8_t e2, int8_t e1, int8_t e0)
 {
-	simde__m128i r;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5, e4,
-			   e3, e2, e1, e0);
-#else
-	r.i8[0] = e0;
-	r.i8[1] = e1;
-	r.i8[2] = e2;
-	r.i8[3] = e3;
-	r.i8[4] = e4;
-	r.i8[5] = e5;
-	r.i8[6] = e6;
-	r.i8[7] = e7;
-	r.i8[8] = e8;
-	r.i8[9] = e9;
-	r.i8[10] = e10;
-	r.i8[11] = e11;
-	r.i8[12] = e12;
-	r.i8[13] = e13;
-	r.i8[14] = e14;
-	r.i8[15] = e15;
-#endif
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5,
+			    e4, e3, e2, e1, e0);
+#else
+	simde__m128i_private r_;
 
-	return r;
-}
+#if defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i8x16_make(e0, e1, e2, e3, e4, e5, e6, e7, e8, e9,
+				       e10, e11, e12, e13, e14, e15);
+#else
+	r_.i8[0] = e0;
+	r_.i8[1] = e1;
+	r_.i8[2] = e2;
+	r_.i8[3] = e3;
+	r_.i8[4] = e4;
+	r_.i8[5] = e5;
+	r_.i8[6] = e6;
+	r_.i8[7] = e7;
+	r_.i8[8] = e8;
+	r_.i8[9] = e9;
+	r_.i8[10] = e10;
+	r_.i8[11] = e11;
+	r_.i8[12] = e12;
+	r_.i8[13] = e13;
+	r_.i8[14] = e14;
+	r_.i8[15] = e15;
+#endif
+
+	return simde__m128i_from_private(r_);
+#endif
+}
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5, e4, e3, \
+		     e2, e1, e0)                                               \
+	simde_mm_set_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5,    \
+			  e4, e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set_epi16(int16_t e7, int16_t e6, int16_t e5, int16_t e4,
 				int16_t e3, int16_t e2, int16_t e1, int16_t e0)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_epi16(e7, e6, e5, e4, e3, e2, e1, e0);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_epi16(e7, e6, e5, e4, e3, e2, e1, e0);
-#elif defined(SIMDE_SSE2_NEON)
-	SIMDE_ALIGN(16) int16_t data[8] = {e0, e1, e2, e3, e4, e5, e6, e7};
-	r.neon_i16 = vld1q_s16(data);
-#else
-	r.i16[0] = e0;
-	r.i16[1] = e1;
-	r.i16[2] = e2;
-	r.i16[3] = e3;
-	r.i16[4] = e4;
-	r.i16[5] = e5;
-	r.i16[6] = e6;
-	r.i16[7] = e7;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN_AS(16, int16x8_t)
+	int16_t data[8] = {e0, e1, e2, e3, e4, e5, e6, e7};
+	r_.neon_i16 = vld1q_s16(data);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i16x8_make(e0, e1, e2, e3, e4, e5, e6, e7);
+#else
+	r_.i16[0] = e0;
+	r_.i16[1] = e1;
+	r_.i16[2] = e2;
+	r_.i16[3] = e3;
+	r_.i16[4] = e4;
+	r_.i16[5] = e5;
+	r_.i16[6] = e6;
+	r_.i16[7] = e7;
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_epi16(e7, e6, e5, e4, e3, e2, e1, e0) \
+	simde_mm_set_epi16(e7, e6, e5, e4, e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set_epi32(int32_t e3, int32_t e2, int32_t e1, int32_t e0)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_epi32(e3, e2, e1, e0);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_epi32(e3, e2, e1, e0);
-#elif defined(SIMDE_SSE2_NEON)
-	SIMDE_ALIGN(16) int32_t data[4] = {e0, e1, e2, e3};
-	r.neon_i32 = vld1q_s32(data);
-#else
-	r.i32[0] = e0;
-	r.i32[1] = e1;
-	r.i32[2] = e2;
-	r.i32[3] = e3;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	SIMDE_ALIGN_AS(16, int32x4_t) int32_t data[4] = {e0, e1, e2, e3};
+	r_.neon_i32 = vld1q_s32(data);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i32x4_make(e0, e1, e2, e3);
+#else
+	r_.i32[0] = e0;
+	r_.i32[1] = e1;
+	r_.i32[2] = e2;
+	r_.i32[3] = e3;
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_epi32(e3, e2, e1, e0) simde_mm_set_epi32(e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set_epi64(simde__m64 e1, simde__m64 e0)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_epi64(e1.n, e0.n);
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set_epi64(e1, e0);
 #else
-	r.i64[0] = e0.i64[0];
-	r.i64[1] = e1.i64[0];
-#endif
+	simde__m128i_private r_;
 
-	return r;
+	r_.m64_private[0] = simde__m64_to_private(e0);
+	r_.m64_private[1] = simde__m64_to_private(e1);
+
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_epi64(e1, e0) (simde_mm_set_epi64((e1), (e0)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set_epi64x(int64_t e1, int64_t e0)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE) && \
+	(!defined(HEDLEY_MSVC_VERSION) || HEDLEY_MSVC_VERSION_CHECK(19, 0, 0))
+	return _mm_set_epi64x(e1, e0);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_epi64x(e1, e0);
-#elif defined(SIMDE_SSE2_NEON)
-	r = SIMDE__M128I_NEON_C(i64,
-				vcombine_s64(vdup_n_s64(e0), vdup_n_s64(e1)));
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vcombine_s64(vdup_n_s64(e0), vdup_n_s64(e1));
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i64x2_make(e0, e1);
 #else
-	r.i64[0] = e0;
-	r.i64[1] = e1;
+	r_.i64[0] = e0;
+	r_.i64[1] = e1;
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_epi64x(e1, e0) simde_mm_set_epi64x(e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_set_epu8(uint8_t e15, uint8_t e14, uint8_t e13,
 				 uint8_t e12, uint8_t e11, uint8_t e10,
 				 uint8_t e9, uint8_t e8, uint8_t e7, uint8_t e6,
 				 uint8_t e5, uint8_t e4, uint8_t e3, uint8_t e2,
 				 uint8_t e1, uint8_t e0)
 {
-	simde__m128i r;
-
-	r.u8[0] = e0;
-	r.u8[1] = e1;
-	r.u8[2] = e2;
-	r.u8[3] = e3;
-	r.u8[4] = e4;
-	r.u8[5] = e5;
-	r.u8[6] = e6;
-	r.u8[7] = e7;
-	r.u8[8] = e8;
-	r.u8[9] = e9;
-	r.u8[10] = e10;
-	r.u8[11] = e11;
-	r.u8[12] = e12;
-	r.u8[13] = e13;
-	r.u8[14] = e14;
-	r.u8[15] = e15;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_epi8(
+		HEDLEY_STATIC_CAST(char, e15), HEDLEY_STATIC_CAST(char, e14),
+		HEDLEY_STATIC_CAST(char, e13), HEDLEY_STATIC_CAST(char, e12),
+		HEDLEY_STATIC_CAST(char, e11), HEDLEY_STATIC_CAST(char, e10),
+		HEDLEY_STATIC_CAST(char, e9), HEDLEY_STATIC_CAST(char, e8),
+		HEDLEY_STATIC_CAST(char, e7), HEDLEY_STATIC_CAST(char, e6),
+		HEDLEY_STATIC_CAST(char, e5), HEDLEY_STATIC_CAST(char, e4),
+		HEDLEY_STATIC_CAST(char, e3), HEDLEY_STATIC_CAST(char, e2),
+		HEDLEY_STATIC_CAST(char, e1), HEDLEY_STATIC_CAST(char, e0));
+#else
+	simde__m128i_private r_;
+
+	r_.u8[0] = e0;
+	r_.u8[1] = e1;
+	r_.u8[2] = e2;
+	r_.u8[3] = e3;
+	r_.u8[4] = e4;
+	r_.u8[5] = e5;
+	r_.u8[6] = e6;
+	r_.u8[7] = e7;
+	r_.u8[8] = e8;
+	r_.u8[9] = e9;
+	r_.u8[10] = e10;
+	r_.u8[11] = e11;
+	r_.u8[12] = e12;
+	r_.u8[13] = e13;
+	r_.u8[14] = e14;
+	r_.u8[15] = e15;
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_set_epu16(uint16_t e7, uint16_t e6, uint16_t e5,
 				  uint16_t e4, uint16_t e3, uint16_t e2,
 				  uint16_t e1, uint16_t e0)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_epi16(
+		HEDLEY_STATIC_CAST(short, e7), HEDLEY_STATIC_CAST(short, e6),
+		HEDLEY_STATIC_CAST(short, e5), HEDLEY_STATIC_CAST(short, e4),
+		HEDLEY_STATIC_CAST(short, e3), HEDLEY_STATIC_CAST(short, e2),
+		HEDLEY_STATIC_CAST(short, e1), HEDLEY_STATIC_CAST(short, e0));
+#else
+	simde__m128i_private r_;
 
-	r.u16[0] = e0;
-	r.u16[1] = e1;
-	r.u16[2] = e2;
-	r.u16[3] = e3;
-	r.u16[4] = e4;
-	r.u16[5] = e5;
-	r.u16[6] = e6;
-	r.u16[7] = e7;
+	r_.u16[0] = e0;
+	r_.u16[1] = e1;
+	r_.u16[2] = e2;
+	r_.u16[3] = e3;
+	r_.u16[4] = e4;
+	r_.u16[5] = e5;
+	r_.u16[6] = e6;
+	r_.u16[7] = e7;
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_set_epu32(uint32_t e3, uint32_t e2, uint32_t e1,
 				  uint32_t e0)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_epi32(HEDLEY_STATIC_CAST(int, e3),
+			     HEDLEY_STATIC_CAST(int, e2),
+			     HEDLEY_STATIC_CAST(int, e1),
+			     HEDLEY_STATIC_CAST(int, e0));
+#else
+	simde__m128i_private r_;
 
-	r.u32[0] = e0;
-	r.u32[1] = e1;
-	r.u32[2] = e2;
-	r.u32[3] = e3;
+	r_.u32[0] = e0;
+	r_.u32[1] = e1;
+	r_.u32[2] = e2;
+	r_.u32[3] = e3;
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_set_epu64x(uint64_t e1, uint64_t e0)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE) && \
+	(!defined(HEDLEY_MSVC_VERSION) || HEDLEY_MSVC_VERSION_CHECK(19, 0, 0))
+	return _mm_set_epi64x(HEDLEY_STATIC_CAST(int64_t, e1),
+			      HEDLEY_STATIC_CAST(int64_t, e0));
+#else
+	simde__m128i_private r_;
 
-	r.u64[0] = e0;
-	r.u64[1] = e1;
+	r_.u64[0] = e0;
+	r_.u64[1] = e1;
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_set_pd(simde_float64 e1, simde_float64 e0)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_pd(e1, e0);
+#else
+	simde__m128d_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_pd(e1, e0);
+#if defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_make(e0, e1);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_make(e0, e1);
 #else
-	r.f64[0] = e0;
-	r.f64[1] = e1;
+	r_.f64[0] = e0;
+	r_.f64[1] = e1;
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_pd(e1, e0) simde_mm_set_pd(e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_set_pd1(simde_float64 a)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_pd(a);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set1_pd(a);
 #else
-	r.f64[0] = a;
-	r.f64[1] = a;
-#endif
+	simde__m128d_private r_;
 
-	return r;
+	r_.f64[0] = a;
+	r_.f64[1] = a;
+
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_pd1(a) simde_mm_set1_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_set_sd(simde_float64 a)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set_sd(a);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set_sd(a);
+#elif defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	return vsetq_lane_f64(a, vdupq_n_f64(SIMDE_FLOAT32_C(0.0)), 0);
 #else
-	r.f64[0] = a;
-	r.u64[1] = 0;
-#endif
+	return simde_mm_set_pd(SIMDE_FLOAT64_C(0.0), a);
 
-	return r;
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set_sd(a) simde_mm_set_sd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set1_epi8(int8_t a)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set1_epi8(a);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_epi8(a);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i8 = vdupq_n_s8(a);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		r.i8[i] = a;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vdupq_n_s8(a);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i8x16_splat(a);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = a;
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_epi8(a) simde_mm_set1_epi8(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set1_epi16(int16_t a)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set1_epi16(a);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_epi16(a);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i16 = vdupq_n_s16(a);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = a;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vdupq_n_s16(a);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i16x8_splat(a);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a;
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_epi16(a) simde_mm_set1_epi16(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set1_epi32(int32_t a)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set1_epi32(a);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_epi32(a);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vdupq_n_s32(a);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vdupq_n_s32(a);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i32x4_splat(a);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a;
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_epi32(a) simde_mm_set1_epi32(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set1_epi64x(int64_t a)
 {
-	simde__m128i r;
+#if defined(SIMDE_X86_SSE2_NATIVE) && \
+	(!defined(HEDLEY_MSVC_VERSION) || HEDLEY_MSVC_VERSION_CHECK(19, 0, 0))
+	return _mm_set1_epi64x(a);
+#else
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_epi64x(a);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i64 = vmovq_n_s64(a);
-#else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vmovq_n_s64(a);
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_i64x2_splat(a);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.i64[i] = a;
 	}
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_epi64x(a) simde_mm_set1_epi64x(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_set1_epi64(simde__m64 a)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_epi64(a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_set1_epi64(a);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[0];
-	}
+	simde__m64_private a_ = simde__m64_to_private(a);
+	return simde_mm_set1_epi64x(a_.i64[0]);
+#endif
+}
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_epi64(a) simde_mm_set1_epi64(a)
 #endif
 
-	return r;
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_x_mm_set1_epu8(uint8_t value)
+{
+	return simde_mm_set1_epi8(HEDLEY_STATIC_CAST(int8_t, value));
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_x_mm_set1_epu16(uint16_t value)
+{
+	return simde_mm_set1_epi16(HEDLEY_STATIC_CAST(int16_t, value));
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_x_mm_set1_epu32(uint32_t value)
+{
+	return simde_mm_set1_epi32(HEDLEY_STATIC_CAST(int32_t, value));
 }
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_x_mm_set1_epu64(uint64_t value)
+{
+	return simde_mm_set1_epi64x(HEDLEY_STATIC_CAST(int64_t, value));
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_set1_pd(simde_float64 a)
 {
-	simde__m128d r;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_set1_pd(a);
+#else
+	simde__m128d_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_set1_pd(a);
+#if defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_splat(a);
 #else
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.f64[i] = a;
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.f64[i] = a;
 	}
 #endif
 
-	return r;
+	return simde__m128d_from_private(r_);
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_set1_pd(a) simde_mm_set1_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_setr_epi8(int8_t e15, int8_t e14, int8_t e13, int8_t e12,
 				int8_t e11, int8_t e10, int8_t e9, int8_t e8,
 				int8_t e7, int8_t e6, int8_t e5, int8_t e4,
 				int8_t e3, int8_t e2, int8_t e1, int8_t e0)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setr_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5,
-			    e4, e3, e2, e1, e0);
-#elif defined(SIMDE_SSE2_NEON)
-	int8_t t[] = {e15, e14, e13, e12, e11, e10, e9, e8,
-		      e7,  e6,  e5,  e4,  e3,  e2,  e1, e0};
-	r.neon_i8 = vld1q_s8(t);
-#else
-	r.i8[0] = e15;
-	r.i8[1] = e14;
-	r.i8[2] = e13;
-	r.i8[3] = e12;
-	r.i8[4] = e11;
-	r.i8[5] = e10;
-	r.i8[6] = e9;
-	r.i8[7] = e8;
-	r.i8[8] = e7;
-	r.i8[9] = e6;
-	r.i8[10] = e5;
-	r.i8[11] = e4;
-	r.i8[12] = e3;
-	r.i8[13] = e2;
-	r.i8[14] = e1;
-	r.i8[15] = e0;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_setr_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5,
+			     e4, e3, e2, e1, e0);
+#else
+	return simde_mm_set_epi8(e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10,
+				 e11, e12, e13, e14, e15);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5, e4,  \
+		      e3, e2, e1, e0)                                        \
+	simde_mm_setr_epi8(e15, e14, e13, e12, e11, e10, e9, e8, e7, e6, e5, \
+			   e4, e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_setr_epi16(int16_t e7, int16_t e6, int16_t e5, int16_t e4,
 				 int16_t e3, int16_t e2, int16_t e1, int16_t e0)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setr_epi16(e7, e6, e5, e4, e3, e2, e1, e0);
-#elif defined(SIMDE_SSE2_NEON)
-	int16_t t[] = {e7, e6, e5, e4, e3, e2, e1, e0};
-	r.neon_i16 = vld1q_s16(t);
-#else
-	r.i16[0] = e7;
-	r.i16[1] = e6;
-	r.i16[2] = e5;
-	r.i16[3] = e4;
-	r.i16[4] = e3;
-	r.i16[5] = e2;
-	r.i16[6] = e1;
-	r.i16[7] = e0;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_setr_epi16(e7, e6, e5, e4, e3, e2, e1, e0);
+#else
+	return simde_mm_set_epi16(e0, e1, e2, e3, e4, e5, e6, e7);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_epi16(e7, e6, e5, e4, e3, e2, e1, e0) \
+	simde_mm_setr_epi16(e7, e6, e5, e4, e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_setr_epi32(int32_t e3, int32_t e2, int32_t e1, int32_t e0)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setr_epi32(e3, e2, e1, e0);
-#elif defined(SIMDE_SSE2_NEON)
-	int32_t t[] = {e3, e2, e1, e0};
-	r.neon_i32 = vld1q_s32(t);
-#else
-	r.i32[0] = e3;
-	r.i32[1] = e2;
-	r.i32[2] = e1;
-	r.i32[3] = e0;
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_setr_epi32(e3, e2, e1, e0);
+#else
+	return simde_mm_set_epi32(e0, e1, e2, e3);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_epi32(e3, e2, e1, e0) simde_mm_setr_epi32(e3, e2, e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_setr_epi64(simde__m64 e1, simde__m64 e0)
 {
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setr_epi64(e1.n, e0.n);
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i64 = vcombine_s64(e1.neon_i64, e0.neon_i64);
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_setr_epi64(e1, e0);
 #else
-	r.i64[0] = e1.i64[0];
-	r.i64[1] = e0.i64[0];
+	return simde_mm_set_epi64(e0, e1);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_epi64(e1, e0) (simde_mm_setr_epi64((e1), (e0)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_setr_pd(simde_float64 e1, simde_float64 e0)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setr_pd(e1, e0);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_setr_pd(e1, e0);
 #else
-	r.f64[0] = e1;
-	r.f64[1] = e0;
+	return simde_mm_set_pd(e0, e1);
 #endif
-
-	return r;
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setr_pd(e1, e0) simde_mm_setr_pd(e1, e0)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_setzero_pd(void)
 {
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setzero_pd();
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_setzero_pd();
 #else
-	r.u64[0] = 0;
-	r.u64[1] = 0;
+	simde__m128d_private r_;
+
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = 0;
+	}
+
+	return simde__m128d_from_private(r_);
+#endif
+}
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_setzero_pd() simde_mm_setzero_pd()
 #endif
 
-	return r;
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128d simde_mm_undefined_pd(void)
+{
+	simde__m128d_private r_;
+
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE__HAVE_UNDEFINED128)
+	r_.n = _mm_undefined_pd();
+#elif !defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+	r_ = simde__m128d_to_private(simde_mm_setzero_pd());
+#endif
+
+	return simde__m128d_from_private(r_);
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_undefined_pd() simde_mm_undefined_pd()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_setzero_si128(void)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_undefined_si128(void)
 {
-	simde__m128i r;
+	simde__m128i_private r_;
 
-#if defined(SIMDE_SSE2_NATIVE)
-	r.n = _mm_setzero_si128();
-#elif defined(SIMDE_SSE2_NEON)
-	r.neon_i32 = vdupq_n_s32(0);
-#else
-	r.u64[0] = 0;
-	r.u64[1] = 0;
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE__HAVE_UNDEFINED128)
+	r_.n = _mm_undefined_si128();
+#elif !defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+	r_ = simde__m128i_to_private(simde_mm_setzero_si128());
 #endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_undefined_si128() (simde_mm_undefined_si128())
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_POP
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128d simde_x_mm_setone_pd(void)
+{
+	return simde_mm_castps_pd(simde_x_mm_setone_ps());
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_x_mm_setone_si128(void)
+{
+	return simde_mm_castps_si128(simde_x_mm_setone_ps());
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_shuffle_epi32(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
 
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[(imm8 >> (i * 2)) & 3];
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[(imm8 >> (i * 2)) & 3];
 	}
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_shuffle_epi32(a, imm8) \
-	SIMDE__M128I_C(_mm_shuffle_epi32((a).n, (imm8)))
-#elif defined(SIMDE__SHUFFLE_VECTOR)
-#define simde_mm_shuffle_epi32(a, imm8)                                      \
-	({                                                                   \
-		const simde__m128i simde__tmp_a_ = a;                        \
-		(simde__m128i){.i32 = SIMDE__SHUFFLE_VECTOR(                 \
-				       32, 16, (simde__tmp_a_).i32,          \
-				       (simde__tmp_a_).i32, ((imm8)) & 3,    \
-				       ((imm8) >> 2) & 3, ((imm8) >> 4) & 3, \
-				       ((imm8) >> 6) & 3)};                  \
-	})
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_shuffle_epi32(a, imm8) _mm_shuffle_epi32((a), (imm8))
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_shuffle_epi32(a, imm8)                               \
+	(__extension__({                                              \
+		const simde__m128i_private simde__tmp_a_ =            \
+			simde__m128i_to_private(a);                   \
+		simde__m128i_from_private((simde__m128i_private){     \
+			.i32 = SIMDE_SHUFFLE_VECTOR_(                 \
+				32, 16, (simde__tmp_a_).i32,          \
+				(simde__tmp_a_).i32, ((imm8)) & 3,    \
+				((imm8) >> 2) & 3, ((imm8) >> 4) & 3, \
+				((imm8) >> 6) & 3)});                 \
+	}))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_shuffle_epi32(a, imm8) simde_mm_shuffle_epi32(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_shuffle_pd(simde__m128d a, simde__m128d b, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 3)
 {
-	simde__m128d r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
 
-	r.f64[0] = ((imm8 & 1) == 0) ? a.f64[0] : a.f64[1];
-	r.f64[1] = ((imm8 & 2) == 0) ? b.f64[0] : b.f64[1];
+	r_.f64[0] = ((imm8 & 1) == 0) ? a_.f64[0] : a_.f64[1];
+	r_.f64[1] = ((imm8 & 2) == 0) ? b_.f64[0] : b_.f64[1];
 
-	return r;
+	return simde__m128d_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE) && !defined(__PGI)
-#define simde_mm_shuffle_pd(a, b, imm8) \
-	SIMDE__M128D_C(_mm_shuffle_pd((a).n, (b).n, (imm8)))
-#elif defined(SIMDE__SHUFFLE_VECTOR)
-#define simde_mm_shuffle_pd(a, b, imm8)                           \
-	({                                                        \
-		(simde__m128d){.f64 = SIMDE__SHUFFLE_VECTOR(      \
-				       64, 16, (a).f64, (b).f64,  \
-				       (((imm8)) & 1),            \
-				       (((imm8) >> 1) & 1) + 2)}; \
-	})
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(__PGI)
+#define simde_mm_shuffle_pd(a, b, imm8) _mm_shuffle_pd((a), (b), (imm8))
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_shuffle_pd(a, b, imm8)                                     \
+	(__extension__({                                                    \
+		simde__m128d_from_private((simde__m128d_private){           \
+			.f64 = SIMDE_SHUFFLE_VECTOR_(                       \
+				64, 16, simde__m128d_to_private(a).f64,     \
+				simde__m128d_to_private(b).f64,             \
+				(((imm8)) & 1), (((imm8) >> 1) & 1) + 2)}); \
+	}))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_shuffle_pd(a, b, imm8) simde_mm_shuffle_pd(a, b, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_shufflehi_epi16(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-
-	r.i64[0] = a.i64[0];
-	for (size_t i = 4; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = a.i16[((imm8 >> ((i - 4) * 2)) & 3) + 4];
-	}
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
 
-	return r;
-}
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_shufflehi_epi16(a, imm8) \
-	SIMDE__M128I_C(_mm_shufflehi_epi16((a).n, (imm8)))
-#elif defined(SIMDE__SHUFFLE_VECTOR)
-#define simde_mm_shufflehi_epi16(a, imm8)                               \
-	({                                                              \
-		const simde__m128i simde__tmp_a_ = a;                   \
-		(simde__m128i){.i16 = SIMDE__SHUFFLE_VECTOR(            \
-				       16, 16, (simde__tmp_a_).i16,     \
-				       (simde__tmp_a_).i16, 0, 1, 2, 3, \
-				       (((imm8)) & 3) + 4,              \
-				       (((imm8) >> 2) & 3) + 4,         \
-				       (((imm8) >> 4) & 3) + 4,         \
-				       (((imm8) >> 6) & 3) + 4)};       \
-	})
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(a_.i16) / sizeof(a_.i16[0])) / 2);
+	     i++) {
+		r_.i16[i] = a_.i16[i];
+	}
+	for (size_t i = ((sizeof(a_.i16) / sizeof(a_.i16[0])) / 2);
+	     i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[((imm8 >> ((i - 4) * 2)) & 3) + 4];
+	}
+
+	return simde__m128i_from_private(r_);
+}
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_shufflehi_epi16(a, imm8) _mm_shufflehi_epi16((a), (imm8))
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_shufflehi_epi16(a, imm8)                                    \
+	(__extension__({                                                     \
+		const simde__m128i_private simde__tmp_a_ =                   \
+			simde__m128i_to_private(a);                          \
+		simde__m128i_from_private((simde__m128i_private){            \
+			.i16 = SIMDE_SHUFFLE_VECTOR_(                        \
+				16, 16, (simde__tmp_a_).i16,                 \
+				(simde__tmp_a_).i16, 0, 1, 2, 3,             \
+				(((imm8)) & 3) + 4, (((imm8) >> 2) & 3) + 4, \
+				(((imm8) >> 4) & 3) + 4,                     \
+				(((imm8) >> 6) & 3) + 4)});                  \
+	}))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_shufflehi_epi16(a, imm8) simde_mm_shufflehi_epi16(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_shufflelo_epi16(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-
-	for (size_t i = 0; i < ((sizeof(r.i16) / sizeof(r.i16[0])) / 2); i++) {
-		r.i16[i] = a.i16[((imm8 >> (i * 2)) & 3)];
-	}
-	r.i64[1] = a.i64[1];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
 
-	return r;
-}
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_shufflelo_epi16(a, imm8) \
-	SIMDE__M128I_C(_mm_shufflelo_epi16((a).n, (imm8)))
-#elif defined(SIMDE__SHUFFLE_VECTOR)
-#define simde_mm_shufflelo_epi16(a, imm8)                                   \
-	({                                                                  \
-		const simde__m128i simde__tmp_a_ = a;                       \
-		(simde__m128i){.i16 = SIMDE__SHUFFLE_VECTOR(                \
-				       16, 16, (simde__tmp_a_).i16,         \
-				       (simde__tmp_a_).i16, (((imm8)) & 3), \
-				       (((imm8) >> 2) & 3),                 \
-				       (((imm8) >> 4) & 3),                 \
-				       (((imm8) >> 6) & 3), 4, 5, 6, 7)};   \
-	})
+	for (size_t i = 0; i < ((sizeof(r_.i16) / sizeof(r_.i16[0])) / 2);
+	     i++) {
+		r_.i16[i] = a_.i16[((imm8 >> (i * 2)) & 3)];
+	}
+	SIMDE_VECTORIZE
+	for (size_t i = ((sizeof(a_.i16) / sizeof(a_.i16[0])) / 2);
+	     i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i];
+	}
+
+	return simde__m128i_from_private(r_);
+}
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_shufflelo_epi16(a, imm8) _mm_shufflelo_epi16((a), (imm8))
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+#define simde_mm_shufflelo_epi16(a, imm8)                                 \
+	(__extension__({                                                  \
+		const simde__m128i_private simde__tmp_a_ =                \
+			simde__m128i_to_private(a);                       \
+		simde__m128i_from_private((simde__m128i_private){         \
+			.i16 = SIMDE_SHUFFLE_VECTOR_(                     \
+				16, 16, (simde__tmp_a_).i16,              \
+				(simde__tmp_a_).i16, (((imm8)) & 3),      \
+				(((imm8) >> 2) & 3), (((imm8) >> 4) & 3), \
+				(((imm8) >> 6) & 3), 4, 5, 6, 7)});       \
+	}))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_shufflelo_epi16(a, imm8) simde_mm_shufflelo_epi16(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sll_epi16(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sll_epi16(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sll_epi16(a, count);
 #else
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (count.u64[0] > 15)
+	if (count_.u64[0] > 15)
 		return simde_mm_setzero_si128();
-	const int s = (int)(count.u64[0]);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = a.u16[i] << s;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u16 = (a_.u16 << count_.u64[0]);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = HEDLEY_STATIC_CAST(uint16_t,
+					       (a_.u16[i] << count_.u64[0]));
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sll_epi16(a, count) simde_mm_sll_epi16((a), (count))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sll_epi32(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sll_epi32(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sll_epi32(a, count);
 #else
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (count.u64[0] > 31)
+	if (count_.u64[0] > 31)
 		return simde_mm_setzero_si128();
-	const int s = (int)(count.u64[0]);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i] << s;
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u32 = (a_.u32 << count_.u64[0]);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = HEDLEY_STATIC_CAST(uint32_t,
+					       (a_.u32[i] << count_.u64[0]));
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sll_epi32(a, count) (simde_mm_sll_epi32(a, (count)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sll_epi64(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sll_epi64(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sll_epi64(a, count);
 #else
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (count.u64[0] > 63)
+	if (count_.u64[0] > 63)
 		return simde_mm_setzero_si128();
-	const int s = (int)(count.u64[0]);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] << s;
+	const int_fast16_t s = HEDLEY_STATIC_CAST(int_fast16_t, count_.u64[0]);
+#if !defined(SIMDE_BUG_GCC_94488)
+	SIMDE_VECTORIZE
+#endif
+	for (size_t i = 0; i < (sizeof(r_.u64) / sizeof(r_.u64[0])); i++) {
+		r_.u64[i] = a_.u64[i] << s;
 	}
-	return r;
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sll_epi64(a, count) (simde_mm_sll_epi64(a, (count)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_sqrt_pd(simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_sqrt_pd(a.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sqrt_pd(a);
 #else
-	simde__m128d r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a);
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = sqrt(a.f64[i]);
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	r_.neon_f64 = vsqrtq_f64(a_.neon_f64);
+#elif defined(simde_math_sqrt)
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = simde_math_sqrt(a_.f64[i]);
 	}
+#else
+	HEDLEY_UNREACHABLE();
+#endif
 
-	return r;
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sqrt_pd(a) simde_mm_sqrt_pd(a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_sqrt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_sqrt_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sqrt_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_sqrt_pd(b));
 #else
-	simde__m128d r;
-	r.f64[0] = sqrt(b.f64[0]);
-	r.f64[1] = a.f64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(simde_math_sqrt)
+	r_.f64[0] = simde_math_sqrt(b_.f64[0]);
+	r_.f64[1] = a_.f64[1];
+#else
+	HEDLEY_UNREACHABLE();
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sqrt_sd(a, b) simde_mm_sqrt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_srl_epi16(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_srl_epi16(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_srl_epi16(a, count);
 #else
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (count.u64[0] > 15)
-		return simde_mm_setzero_si128();
-	const int s = (int)(count.u64[0]);
+	const int cnt = HEDLEY_STATIC_CAST(
+		int, (count_.i64[0] > 16 ? 16 : count_.i64[0]));
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u16) / sizeof(r.u16[0])); i++) {
-		r.u16[i] = a.u16[i] >> s;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vshlq_u16(a_.neon_u16,
+				vdupq_n_s16(HEDLEY_STATIC_CAST(int16_t, -cnt)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u16) / sizeof(r_.u16[0])); i++) {
+		r_.u16[i] = a_.u16[i] >> cnt;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srl_epi16(a, count) (simde_mm_srl_epi16(a, (count)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_srl_epi32(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_srl_epi32(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_srl_epi32(a, count);
 #else
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (count.u64[0] > 31)
-		return simde_mm_setzero_si128();
-	const int s = (int)(count.u64[0]);
+	const int cnt = HEDLEY_STATIC_CAST(
+		int, (count_.i64[0] > 32 ? 32 : count_.i64[0]));
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u32) / sizeof(r.u32[0])); i++) {
-		r.u32[i] = a.u32[i] >> s;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u32 = vshlq_u32(a_.neon_u32,
+				vdupq_n_s32(HEDLEY_STATIC_CAST(int32_t, -cnt)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] >> cnt;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srl_epi32(a, count) (simde_mm_srl_epi32(a, (count)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_srl_epi64(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_srl_epi64(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_srl_epi64(a, count);
 #else
-	simde__m128i r;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (count.u64[0] > 31)
-		return simde_mm_setzero_si128();
-	const int s = (int)(count.u64[0]);
+	const int cnt = HEDLEY_STATIC_CAST(
+		int, (count_.i64[0] > 64 ? 64 : count_.i64[0]));
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.u64) / sizeof(r.u64[0])); i++) {
-		r.u64[i] = a.u64[i] >> s;
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u64 = vshlq_u64(a_.neon_u64,
+				vdupq_n_s64(HEDLEY_STATIC_CAST(int64_t, -cnt)));
+#else
+#if !defined(SIMDE_BUG_GCC_94488)
+	SIMDE_VECTORIZE
+#endif
+	for (size_t i = 0; i < (sizeof(r_.u64) / sizeof(r_.u64[0])); i++) {
+		r_.u64[i] = a_.u64[i] >> cnt;
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srl_epi64(a, count) (simde_mm_srl_epi64(a, (count)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_srai_epi16(simde__m128i a, int imm8)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_srai_epi16(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_CONSTANT_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
+	/* MSVC requires a range of (0, 255). */
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
 
-	const uint16_t m =
-		(uint16_t)((~0U) << ((sizeof(int16_t) * CHAR_BIT) - imm8));
+	const int cnt = (imm8 & ~15) ? 15 : imm8;
 
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.u16[0])); i++) {
-		const uint16_t is_neg = ((uint16_t)(
-			((a.u16[i]) >> ((sizeof(int16_t) * CHAR_BIT) - 1))));
-		r.u16[i] = (a.u16[i] >> imm8) | (m * is_neg);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vshlq_s16(a_.neon_i16, vdupq_n_s16(-cnt));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] >> cnt;
 	}
+#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_srai_epi16(a, imm8) \
-	SIMDE__M128I_C(_mm_srai_epi16((a).n, (imm8)));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_srai_epi16(a, imm8) _mm_srai_epi16((a), (imm8))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srai_epi16(a, imm8) simde_mm_srai_epi16(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_srai_epi32(simde__m128i a, int imm8)
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_mm_srai_epi32(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_CONSTANT_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
+	/* MSVC requires a range of (0, 255). */
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+	const int cnt = (imm8 & ~31) ? 31 : imm8;
 
-	const uint32_t m =
-		(uint32_t)((~0U) << ((sizeof(int) * CHAR_BIT) - imm8));
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.u32[0])); i++) {
-		uint32_t is_neg = ((uint32_t)(
-			((a.u32[i]) >> ((sizeof(int32_t) * CHAR_BIT) - 1))));
-		r.u32[i] = (a.u32[i] >> imm8) | (m * is_neg);
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vshlq_s32(a_.neon_i32, vdupq_n_s32(-cnt));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] >> cnt;
 	}
+#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_srai_epi32(a, imm8) \
-	SIMDE__M128I_C(_mm_srai_epi32((a).n, (imm8)))
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_srai_epi32(a, imm8)                                           \
-	SIMDE__M128I_NEON_C(                                                   \
-		i32,                                                           \
-		((imm8) <= 0)                                                  \
-			? (a.neon_i32)                                         \
-			: (((imm8) > 31)                                       \
-				   ? (vshrq_n_s32(vshrq_n_s32(a.neon_i32, 16), \
-						  16))                         \
-				   : (vshrq_n_s32(a.neon_i32, (imm8)))))
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_srai_epi32(a, imm8) _mm_srai_epi32((a), (imm8))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srai_epi32(a, imm8) simde_mm_srai_epi32(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sra_epi16(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sra_epi16(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sra_epi16(a, count);
 #else
-	simde__m128i r;
-	int cnt = (int)count.i64[0];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (cnt > 15 || cnt < 0) {
-		for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0]));
-		     i++) {
-			r.u16[i] = (a.i16[i] < 0) ? 0xffff : 0x0000;
-		}
-	} else {
-		const uint16_t m = (uint16_t)(
-			(~0U) << ((sizeof(int16_t) * CHAR_BIT) - cnt));
-		for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0]));
-		     i++) {
-			const uint16_t is_neg = a.i16[i] < 0;
-			r.u16[i] = (a.u16[i] >> cnt) | (m * is_neg);
-		}
+	const int cnt = HEDLEY_STATIC_CAST(
+		int, (count_.i64[0] > 15 ? 15 : count_.i64[0]));
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vshlq_s16(a_.neon_i16,
+				vdupq_n_s16(HEDLEY_STATIC_CAST(int16_t, -cnt)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] >> cnt;
 	}
+#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sra_epi16(a, count) (simde_mm_sra_epi16(a, count))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sra_epi32(simde__m128i a, simde__m128i count)
 {
-#if defined(SIMDE_SSE2_NATIVE) && !defined(SIMDE_BUG_GCC_BAD_MM_SRA_EPI32)
-	return SIMDE__M128I_C(_mm_sra_epi32(a.n, count.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && !defined(SIMDE_BUG_GCC_BAD_MM_SRA_EPI32)
+	return _mm_sra_epi32(a, count);
 #else
-	simde__m128i r;
-	const uint64_t cnt = count.u64[0];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 count_ = simde__m128i_to_private(count);
 
-	if (cnt > 31) {
-		for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0]));
-		     i++) {
-			r.u32[i] = (a.i32[i] < 0) ? UINT32_MAX : 0;
-		}
-	} else if (cnt == 0) {
-		memcpy(&r, &a, sizeof(r));
-	} else {
-		const uint32_t m = (uint32_t)(
-			(~0U) << ((sizeof(int32_t) * CHAR_BIT) - cnt));
-		for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0]));
-		     i++) {
-			const uint32_t is_neg = a.i32[i] < 0;
-			r.u32[i] = (a.u32[i] >> cnt) | (m * is_neg);
-		}
+	const int cnt = count_.u64[0] > 31
+				? 31
+				: HEDLEY_STATIC_CAST(int, count_.u64[0]);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vshlq_s32(a_.neon_i32,
+				vdupq_n_s32(HEDLEY_STATIC_CAST(int32_t, -cnt)));
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] >> cnt;
 	}
+#endif
 
-	return r;
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sra_epi32(a, count) (simde_mm_sra_epi32(a, (count)))
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_slli_epi16(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-	const int s = (imm8 > ((int)sizeof(r.i16[0]) * CHAR_BIT) - 1) ? 0
-								      : imm8;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = a.i16[i] << s;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i16 = a_.i16 << (imm8 & 0xff);
+#else
+	const int s =
+		(imm8 >
+		 HEDLEY_STATIC_CAST(int, sizeof(r_.i16[0]) * CHAR_BIT) - 1)
+			? 0
+			: imm8;
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = HEDLEY_STATIC_CAST(int16_t, a_.i16[i] << s);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_slli_epi16(a, imm8) SIMDE__M128I_C(_mm_slli_epi16(a.n, imm8));
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_slli_epi16(a, imm8)                                       \
-	SIMDE__M128I_NEON_C(                                               \
-		i16, ((imm8) <= 0)                                         \
-			     ? ((a).neon_i16)                              \
-			     : (((imm8) > 31) ? (vdupq_n_s16(0))           \
-					      : (vshlq_n_s16((a).neon_i16, \
-							     (imm8)))))
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_slli_epi16(a, imm8) _mm_slli_epi16(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_slli_epi16(a, imm8) \
+	simde__m128i_from_neon_u16(  \
+		vshlq_n_u16(simde__m128i_to_neon_u16(a), (imm8)))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_slli_epi16(a, imm8) simde_mm_slli_epi16(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_slli_epi32(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-	const int s = (imm8 > ((int)sizeof(r.i32[0]) * CHAR_BIT) - 1) ? 0
-								      : imm8;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i] << s;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i32 = a_.i32 << imm8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] << (imm8 & 0xff);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_slli_epi32(a, imm8) SIMDE__M128I_C(_mm_slli_epi32(a.n, imm8));
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_slli_epi32(a, imm8)                                       \
-	SIMDE__M128I_NEON_C(                                               \
-		i32, ((imm8) <= 0)                                         \
-			     ? ((a).neon_i32)                              \
-			     : (((imm8) > 31) ? (vdupq_n_s32(0))           \
-					      : (vshlq_n_s32((a).neon_i32, \
-							     (imm8)))))
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_slli_epi32(a, imm8) _mm_slli_epi32(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_slli_epi32(a, imm8) \
+	simde__m128i_from_neon_u32(  \
+		vshlq_n_u32(simde__m128i_to_neon_u32(a), (imm8)))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_slli_epi32(a, imm8) simde_mm_slli_epi32(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_slli_epi64(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-	const int s = (imm8 > ((int)sizeof(r.i64[0]) * CHAR_BIT) - 1) ? 0
-								      : imm8;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] << s;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.i64 = a_.i64 << imm8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.i64[i] = a_.i64[i] << (imm8 & 0xff);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_slli_epi64(a, imm8) SIMDE__M128I_C(_mm_slli_epi64(a.n, imm8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_slli_epi64(a, imm8) _mm_slli_epi64(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_slli_epi64(a, imm8) \
+	simde__m128i_from_neon_u64(  \
+		vshlq_n_u64(simde__m128i_to_neon_u64(a), (imm8)))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_slli_epi64(a, imm8) simde_mm_slli_epi64(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_srli_epi16(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-	const int s = (imm8 > ((int)sizeof(r.i16[0]) * CHAR_BIT) - 1) ? 0
-								      : imm8;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.u16[i] = a.u16[i] >> s;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u16 = a_.u16 >> imm8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.u16[i] = a_.u16[i] >> (imm8 & 0xff);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_srli_epi16(a, imm8) SIMDE__M128I_C(_mm_srli_epi16(a.n, imm8));
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_srli_epi16(a, imm8)                                       \
-	SIMDE__M128I_NEON_C(                                               \
-		u16, ((imm8) <= 0)                                         \
-			     ? ((a).neon_u16)                              \
-			     : (((imm8) > 31) ? (vdupq_n_u16(0))           \
-					      : (vshrq_n_u16((a).neon_u16, \
-							     (imm8)))))
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_srli_epi16(a, imm8) _mm_srli_epi16(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_srli_epi16(a, imm8) \
+	simde__m128i_from_neon_u16(  \
+		vshrq_n_u16(simde__m128i_to_neon_u16(a), imm8))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srli_epi16(a, imm8) simde_mm_srli_epi16(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_srli_epi32(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-	const int s = (imm8 > ((int)sizeof(r.i32[0]) * CHAR_BIT) - 1) ? 0
-								      : imm8;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.u32[i] = a.u32[i] >> s;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+	r_.u32 = a_.u32 >> (imm8 & 0xff);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.u32[i] = a_.u32[i] >> (imm8 & 0xff);
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_srli_epi32(a, imm8) SIMDE__M128I_C(_mm_srli_epi32(a.n, imm8))
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_srli_epi32(a, imm8)                                       \
-	SIMDE__M128I_NEON_C(                                               \
-		u32, ((imm8) <= 0)                                         \
-			     ? ((a).neon_u32)                              \
-			     : (((imm8) > 31) ? (vdupq_n_u32(0))           \
-					      : (vshrq_n_u32((a).neon_u32, \
-							     (imm8)))))
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_srli_epi32(a, imm8) _mm_srli_epi32(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+#define simde_mm_srli_epi32(a, imm8) \
+	simde__m128i_from_neon_u32(  \
+		vshrq_n_u32(simde__m128i_to_neon_u32(a), imm8))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srli_epi32(a, imm8) simde_mm_srli_epi32(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_srli_epi64(simde__m128i a, const int imm8)
+	SIMDE_REQUIRE_RANGE(imm8, 0, 255)
 {
-	simde__m128i r;
-	const unsigned char s = imm8 & 255;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		if (s > 63) {
-			r.u64[i] = 0;
-		} else {
-			r.u64[i] = a.u64[i] >> s;
-		}
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+	if (HEDLEY_UNLIKELY((imm8 & 63) != imm8))
+		return simde_mm_setzero_si128();
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u64 = vshlq_u64(a_.neon_u64, vdupq_n_s64(-imm8));
+#else
+#if defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR) && !defined(SIMDE_BUG_GCC_94488)
+	r_.u64 = a_.u64 >> imm8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.u64[i] = a_.u64[i] >> imm8;
 	}
-	return r;
+#endif
+#endif
+
+	return simde__m128i_from_private(r_);
 }
-#if defined(SIMDE_SSE2_NATIVE)
-#define simde_mm_srli_epi64(a, imm8) SIMDE__M128I_C(_mm_srli_epi64(a.n, imm8))
-#elif defined(SIMDE_SSE2_NEON)
-#define simde_mm_srli_epi64(a, imm8)                    \
-	SIMDE__M128I_NEON_C(                            \
-		u64,                                    \
-		(((imm8)&255) < 0 || ((imm8)&255) > 63) \
-			? (vdupq_n_u64(0))              \
-			: ((((imm8)&255) == 0)          \
-				   ? (a.neon_u64)       \
-				   : (vshrq_n_u64((a).neon_u64, (imm8)&255))))
+#if defined(SIMDE_X86_SSE2_NATIVE)
+#define simde_mm_srli_epi64(a, imm8) _mm_srli_epi64(a, imm8)
+#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE) && !defined(__clang__)
+#define simde_mm_srli_epi64(a, imm8)                            \
+	((imm8 == 0) ? (a)                                      \
+		     : (simde__m128i_from_neon_u64(vshrq_n_u64( \
+			       simde__m128i_to_neon_u64(a), imm8))))
+#endif
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_srli_epi64(a, imm8) simde_mm_srli_epi64(a, imm8)
 #endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store_pd(simde_float64 mem_addr[HEDLEY_ARRAY_PARAM(2)],
 		       simde__m128d a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_store_pd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_store_pd(mem_addr, a);
+#elif defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	vst1q_f64(mem_addr, simde__m128d_to_private(a).neon_f64);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(mem_addr, &a, sizeof(a));
+	simde_memcpy(mem_addr, &a, sizeof(a));
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_store_pd(mem_addr, a) \
+	simde_mm_store_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store1_pd(simde_float64 mem_addr[HEDLEY_ARRAY_PARAM(2)],
 			simde__m128d a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_store1_pd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_store1_pd(mem_addr, a);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	mem_addr[0] = a.f64[0];
-	mem_addr[1] = a.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+	mem_addr[0] = a_.f64[0];
+	mem_addr[1] = a_.f64[0];
 #endif
 }
-#define simde_mm_store_pd1(mem_addr, a) simde_mm_store1_pd(mem_addr, a)
+#define simde_mm_store_pd1(mem_addr, a) \
+	simde_mm_store1_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_store1_pd(mem_addr, a) \
+	simde_mm_store1_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#define _mm_store_pd1(mem_addr, a) \
+	simde_mm_store_pd1(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store_sd(simde_float64 *mem_addr, simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_store_sd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_store_sd(mem_addr, a);
+#else
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	simde_float64 v = vgetq_lane_f64(a_.neon_f64, 0);
+	simde_memcpy(mem_addr, &v, sizeof(simde_float64));
 #else
-	memcpy(mem_addr, &a, sizeof(a.f64[0]));
+	simde_float64 v = a_.f64[0];
+	simde_memcpy(mem_addr, &v, sizeof(simde_float64));
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_store_sd(mem_addr, a) \
+	simde_mm_store_sd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_store_si128(simde__m128i *mem_addr, simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_store_si128(&mem_addr->n, a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	vst1q_s32((int32_t *)mem_addr, a.neon_i32);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_store_si128(HEDLEY_STATIC_CAST(__m128i *, mem_addr), a);
+#else
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	vst1q_s32(HEDLEY_REINTERPRET_CAST(int32_t *, mem_addr), a_.neon_i32);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(mem_addr, &a, sizeof(a));
+	simde_memcpy(SIMDE_ASSUME_ALIGNED(16, mem_addr), &a_, sizeof(a_));
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_store_si128(mem_addr, a) simde_mm_store_si128(mem_addr, a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storeh_pd(simde_float64 *mem_addr, simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_storeh_pd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_storeh_pd(mem_addr, a);
 #else
-	*mem_addr = a.f64[1];
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
+	*mem_addr = vgetq_lane_f64(a_.neon_f64, 1);
+#else
+	*mem_addr = a_.f64[1];
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_storeh_pd(mem_addr, a) \
+	simde_mm_storeh_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storel_epi64(simde__m128i *mem_addr, simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_storel_epi64(&(mem_addr->n), a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	mem_addr->i64[0] = vgetq_lane_s64(a.neon_i64, 0);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_storel_epi64(HEDLEY_STATIC_CAST(__m128i *, mem_addr), a);
+#else
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+	int64_t tmp;
+
+	/* memcpy to prevent aliasing, tmp because we can't take the
+     * address of a vector element. */
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	tmp = vgetq_lane_s64(a_.neon_i64, 0);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+#if defined(SIMDE_BUG_GCC_95227)
+	(void)a_;
+#endif
+	tmp = vec_extract(a_.altivec_i64, 0);
 #else
-	mem_addr->i64[0] = a.i64[0];
+	tmp = a_.i64[0];
+#endif
+
+	simde_memcpy(mem_addr, &tmp, sizeof(tmp));
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_storel_epi64(mem_addr, a) simde_mm_storel_epi64(mem_addr, a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storel_pd(simde_float64 *mem_addr, simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_storel_pd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_storel_pd(mem_addr, a);
 #else
-	*mem_addr = a.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+	*mem_addr = a_.f64[0];
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_storel_pd(mem_addr, a) \
+	simde_mm_storel_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storer_pd(simde_float64 mem_addr[2], simde__m128d a)
 {
 	simde_assert_aligned(16, mem_addr);
 
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_storer_pd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_storer_pd(mem_addr, a);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	mem_addr[0] = a.f64[1];
-	mem_addr[1] = a.f64[0];
+	simde__m128d_private a_ = simde__m128d_to_private(a);
+
+	mem_addr[0] = a_.f64[1];
+	mem_addr[1] = a_.f64[0];
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_storer_pd(mem_addr, a) \
+	simde_mm_storer_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storeu_pd(simde_float64 *mem_addr, simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_storeu_pd(mem_addr, a.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_storeu_pd(mem_addr, a);
 #else
-	memcpy(mem_addr, &a, sizeof(a));
+	simde_memcpy(mem_addr, &a, sizeof(a));
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_storeu_pd(mem_addr, a) \
+	simde_mm_storeu_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_storeu_si128(simde__m128i *mem_addr, simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_storeu_si128(&mem_addr->n, a.n);
-#elif defined(SIMDE_SSE2_NEON)
-	int32_t v[4];
-	vst1q_s32(v, a.neon_i32);
-	memcpy(mem_addr, v, sizeof(v));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_storeu_si128(HEDLEY_STATIC_CAST(__m128i *, mem_addr), a);
 #else
-	memcpy(mem_addr, &a, sizeof(a));
+	simde__m128i_private a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	vst1q_s32(HEDLEY_REINTERPRET_CAST(int32_t *, mem_addr), a_.neon_i32);
+#else
+	simde_memcpy(mem_addr, &a_, sizeof(a_));
+#endif
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_storeu_si128(mem_addr, a) simde_mm_storeu_si128(mem_addr, a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_stream_pd(simde_float64 mem_addr[HEDLEY_ARRAY_PARAM(2)],
 			simde__m128d a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_stream_pd(mem_addr, a.n);
+	simde_assert_aligned(16, mem_addr);
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_stream_pd(mem_addr, a);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(mem_addr, &a, sizeof(a));
+	simde_memcpy(mem_addr, &a, sizeof(a));
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_stream_pd(mem_addr, a) \
+	simde_mm_stream_pd(HEDLEY_REINTERPRET_CAST(double *, mem_addr), a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_stream_si128(simde__m128i *mem_addr, simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	_mm_stream_si128(&mem_addr->n, a.n);
+	simde_assert_aligned(16, mem_addr);
+
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	_mm_stream_si128(HEDLEY_STATIC_CAST(__m128i *, mem_addr), a);
 #else
-	SIMDE__ASSUME_ALIGNED(mem_addr, 16);
-	memcpy(mem_addr, &a, sizeof(a));
+	simde_memcpy(mem_addr, &a, sizeof(a));
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_stream_si128(mem_addr, a) simde_mm_stream_si128(mem_addr, a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_stream_si32(int32_t *mem_addr, int32_t a)
 {
-#if defined(SIMDE_SSE2_NATIVE)
+#if defined(SIMDE_X86_SSE2_NATIVE)
 	_mm_stream_si32(mem_addr, a);
 #else
 	*mem_addr = a;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_stream_si32(mem_addr, a) simde_mm_stream_si32(mem_addr, a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_stream_si64(int64_t *mem_addr, int64_t a)
 {
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE_ARCH_AMD64)
-#if defined(SIMDE__REALLY_GCC) && !HEDLEY_GCC_VERSION_CHECK(4, 8, 0)
 	*mem_addr = a;
-#elif defined(__GNUC__)
-	_mm_stream_si64((long long *)mem_addr, a);
-#else
-	_mm_stream_si64(mem_addr, a);
-#endif
-#else
-	*mem_addr = a;
-#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_stream_si64(mem_addr, a)                                  \
+	simde_mm_stream_si64(SIMDE_CHECKED_REINTERPRET_CAST(          \
+				     int64_t *, __int64 *, mem_addr), \
+			     a)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sub_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sub_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i8, vsubq_s8(a.neon_i8, b.neon_i8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sub_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i8) / sizeof(r.i8[0])); i++) {
-		r.i8[i] = a.i8[i] - b.i8[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vsubq_s8(a_.neon_i8, b_.neon_i8);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i8 = a_.i8 - b_.i8;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i8) / sizeof(r_.i8[0])); i++) {
+		r_.i8[i] = a_.i8[i] - b_.i8[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_epi8(a, b) simde_mm_sub_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sub_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sub_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i16, vsubq_s16(a.neon_i16, b.neon_i16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sub_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i16) / sizeof(r.i16[0])); i++) {
-		r.i16[i] = a.i16[i] - b.i16[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vsubq_s16(a_.neon_i16, b_.neon_i16);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i16 = a_.i16 - b_.i16;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i16) / sizeof(r_.i16[0])); i++) {
+		r_.i16[i] = a_.i16[i] - b_.i16[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_epi16(a, b) simde_mm_sub_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sub_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sub_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i32, vsubq_s32(a.neon_i32, b.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sub_epi32(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i] - b.i32[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vsubq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32 = a_.i32 - b_.i32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32) / sizeof(r_.i32[0])); i++) {
+		r_.i32[i] = a_.i32[i] - b_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_epi32(a, b) simde_mm_sub_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_sub_epi64(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_sub_epi64(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i64, vsubq_s64(a.neon_i64, b.neon_i64));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sub_epi64(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] - b.i64[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i64 = vsubq_s64(a_.neon_i64, b_.neon_i64);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 - b_.i64;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i64) / sizeof(r_.i64[0])); i++) {
+		r_.i64[i] = a_.i64[i] - b_.i64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_epi64(a, b) simde_mm_sub_epi64(a, b)
+#endif
+
+SIMDE_FUNCTION_ATTRIBUTES
+simde__m128i simde_x_mm_sub_epu32(simde__m128i a, simde__m128i b)
+{
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
 
-SIMDE__FUNCTION_ATTRIBUTES
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.u32 = a_.u32 - b_.u32;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.u32) / sizeof(r_.u32[0])); i++) {
+		r_.u32[i] = a_.u32[i] - b_.u32[i];
+	}
+#endif
+
+	return simde__m128i_from_private(r_);
+}
+
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_sub_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_sub_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sub_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.f64) / sizeof(r.f64[0])); i++) {
-		r.f64[i] = a.f64[i] - b.f64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.f64 = a_.f64 - b_.f64;
+#elif defined(SIMDE_WASM_SIMD128_NATIVE)
+	r_.wasm_v128 = wasm_f64x2_sub(a_.wasm_v128, b_.wasm_v128);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.f64) / sizeof(r_.f64[0])); i++) {
+		r_.f64[i] = a_.f64[i] - b_.f64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_pd(a, b) simde_mm_sub_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_sub_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_sub_sd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_sub_sd(a, b);
+#elif defined(SIMDE_ASSUME_VECTORIZATION)
+	return simde_mm_move_sd(a, simde_mm_sub_pd(a, b));
 #else
-	simde__m128d r;
-	r.f64[0] = a.f64[0] - b.f64[0];
-	r.f64[1] = a.f64[1];
-	return r;
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+	r_.f64[0] = a_.f64[0] - b_.f64[0];
+	r_.f64[1] = a_.f64[1];
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_sd(a, b) simde_mm_sub_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m64 simde_mm_sub_si64(simde__m64 a, simde__m64 b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M64_C(_mm_sub_si64(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE) && defined(SIMDE_X86_MMX_NATIVE)
+	return _mm_sub_si64(a, b);
 #else
-	simde__m64 r;
-	r.i64[0] = a.i64[0] - b.i64[0];
-	return r;
+	simde__m64_private r_, a_ = simde__m64_to_private(a),
+			       b_ = simde__m64_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i64 = a_.i64 - b_.i64;
+#else
+	r_.i64[0] = a_.i64[0] - b_.i64[0];
+#endif
+
+	return simde__m64_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_sub_si64(a, b) simde_mm_sub_si64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_subs_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_subs_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i8, vqsubq_s8(a.neon_i8, b.neon_i8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_subs_epi8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.i8[0])); i++) {
-		if (((b.i8[i]) > 0 && (a.i8[i]) < INT8_MIN + (b.i8[i]))) {
-			r.i8[i] = INT8_MIN;
-		} else if ((b.i8[i]) < 0 && (a.i8[i]) > INT8_MAX + (b.i8[i])) {
-			r.i8[i] = INT8_MAX;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i8 = vqsubq_s8(a_.neon_i8, b_.neon_i8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i8[0])); i++) {
+		if (((b_.i8[i]) > 0 && (a_.i8[i]) < INT8_MIN + (b_.i8[i]))) {
+			r_.i8[i] = INT8_MIN;
+		} else if ((b_.i8[i]) < 0 &&
+			   (a_.i8[i]) > INT8_MAX + (b_.i8[i])) {
+			r_.i8[i] = INT8_MAX;
 		} else {
-			r.i8[i] = (a.i8[i]) - (b.i8[i]);
+			r_.i8[i] = (a_.i8[i]) - (b_.i8[i]);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_epi8(a, b) simde_mm_subs_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_subs_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_subs_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i16, vqsubq_s16(a.neon_i16, b.neon_i16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_subs_epi16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.i16[0])); i++) {
-		if (((b.i16[i]) > 0 && (a.i16[i]) < INT16_MIN + (b.i16[i]))) {
-			r.i16[i] = INT16_MIN;
-		} else if ((b.i16[i]) < 0 &&
-			   (a.i16[i]) > INT16_MAX + (b.i16[i])) {
-			r.i16[i] = INT16_MAX;
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i16 = vqsubq_s16(a_.neon_i16, b_.neon_i16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i16[0])); i++) {
+		if (((b_.i16[i]) > 0 &&
+		     (a_.i16[i]) < INT16_MIN + (b_.i16[i]))) {
+			r_.i16[i] = INT16_MIN;
+		} else if ((b_.i16[i]) < 0 &&
+			   (a_.i16[i]) > INT16_MAX + (b_.i16[i])) {
+			r_.i16[i] = INT16_MAX;
 		} else {
-			r.i16[i] = (a.i16[i]) - (b.i16[i]);
+			r_.i16[i] = (a_.i16[i]) - (b_.i16[i]);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_epi16(a, b) simde_mm_subs_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_subs_epu8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_subs_epu8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(u8, vqsubq_u8(a.neon_u8, b.neon_u8));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_subs_epu8(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.i8[0])); i++) {
-		const int32_t x = a.u8[i] - b.u8[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u8 = vqsubq_u8(a_.neon_u8, b_.neon_u8);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i8[0])); i++) {
+		const int32_t x = a_.u8[i] - b_.u8[i];
 		if (x < 0) {
-			r.u8[i] = 0;
+			r_.u8[i] = 0;
 		} else if (x > UINT8_MAX) {
-			r.u8[i] = UINT8_MAX;
+			r_.u8[i] = UINT8_MAX;
 		} else {
-			r.u8[i] = (uint8_t)x;
+			r_.u8[i] = HEDLEY_STATIC_CAST(uint8_t, x);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_epu8(a, b) simde_mm_subs_epu8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_subs_epu16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_subs_epu16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(u16, vqsubq_u16(a.neon_u16, b.neon_u16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_subs_epu16(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r) / sizeof(r.i16[0])); i++) {
-		const int32_t x = a.u16[i] - b.u16[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_u16 = vqsubq_u16(a_.neon_u16, b_.neon_u16);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_) / sizeof(r_.i16[0])); i++) {
+		const int32_t x = a_.u16[i] - b_.u16[i];
 		if (x < 0) {
-			r.u16[i] = 0;
+			r_.u16[i] = 0;
 		} else if (x > UINT16_MAX) {
-			r.u16[i] = UINT16_MAX;
+			r_.u16[i] = UINT16_MAX;
 		} else {
-			r.u16[i] = (uint16_t)x;
+			r_.u16[i] = HEDLEY_STATIC_CAST(uint16_t, x);
 		}
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_subs_epu16(a, b) simde_mm_subs_epu16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomieq_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_ucomieq_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_ucomieq_sd(a, b);
 #else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f64[0] == b.f64[0];
+	r = a_.f64[0] == b_.f64[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f64[0] == b_.f64[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomieq_sd(a, b) simde_mm_ucomieq_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomige_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_ucomige_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_ucomige_sd(a, b);
 #else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f64[0] >= b.f64[0];
+	r = a_.f64[0] >= b_.f64[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f64[0] >= b_.f64[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomige_sd(a, b) simde_mm_ucomige_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomigt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_ucomigt_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_ucomigt_sd(a, b);
 #else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f64[0] > b.f64[0];
+	r = a_.f64[0] > b_.f64[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f64[0] > b_.f64[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomigt_sd(a, b) simde_mm_ucomigt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomile_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_ucomile_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_ucomile_sd(a, b);
 #else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f64[0] <= b.f64[0];
+	r = a_.f64[0] <= b_.f64[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f64[0] <= b_.f64[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomile_sd(a, b) simde_mm_ucomile_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomilt_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_ucomilt_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_ucomilt_sd(a, b);
 #else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f64[0] < b.f64[0];
+	r = a_.f64[0] < b_.f64[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
+#else
+	r = a_.f64[0] < b_.f64[0];
+#endif
+
 	return r;
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomilt_sd(a, b) simde_mm_ucomilt_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 int simde_mm_ucomineq_sd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return _mm_ucomineq_sd(a.n, b.n);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_ucomineq_sd(a, b);
 #else
+	simde__m128d_private a_ = simde__m128d_to_private(a),
+			     b_ = simde__m128d_to_private(b);
+	int r;
+
+#if defined(SIMDE_HAVE_FENV_H)
 	fenv_t envp;
 	int x = feholdexcept(&envp);
-	int r = a.f64[0] != b.f64[0];
+	r = a_.f64[0] != b_.f64[0];
 	if (HEDLEY_LIKELY(x == 0))
 		fesetenv(&envp);
-	return r;
-#endif
-}
-
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128d simde_mm_undefined_pd(void)
-{
-	simde__m128d r;
-
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE__HAVE_UNDEFINED128)
-	r.n = _mm_undefined_pd();
 #else
-	r = simde_mm_setzero_pd();
+	r = a_.f64[0] != b_.f64[0];
 #endif
 
 	return r;
+#endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_ucomineq_sd(a, b) simde_mm_ucomineq_sd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
-simde__m128i simde_mm_undefined_si128(void)
-{
-	simde__m128i r;
-
-#if defined(SIMDE_SSE2_NATIVE) && defined(SIMDE__HAVE_UNDEFINED128)
-	r.n = _mm_undefined_si128();
-#else
-	r = simde_mm_setzero_si128();
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_PUSH
+SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_
 #endif
 
-	return r;
-}
+#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
+HEDLEY_DIAGNOSTIC_POP
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_lfence(void)
 {
-#if defined(SIMDE_SSE2_NATIVE)
+#if defined(SIMDE_X86_SSE2_NATIVE)
 	_mm_lfence();
 #else
 	simde_mm_sfence();
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_lfence() simde_mm_lfence()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 void simde_mm_mfence(void)
 {
-#if defined(SIMDE_SSE2_NATIVE)
+#if defined(SIMDE_X86_SSE2_NATIVE)
 	_mm_mfence();
 #else
 	simde_mm_sfence();
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_mfence() simde_mm_mfence()
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpackhi_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpackhi_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	int8x8_t a1 = vreinterpret_s8_s16(vget_high_s16(a.neon_i16));
-	int8x8_t b1 = vreinterpret_s8_s16(vget_high_s16(b.neon_i16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpackhi_epi8(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int8x8_t a1 = vreinterpret_s8_s16(vget_high_s16(a_.neon_i16));
+	int8x8_t b1 = vreinterpret_s8_s16(vget_high_s16(b_.neon_i16));
 	int8x8x2_t result = vzip_s8(a1, b1);
-	return SIMDE__M128I_NEON_C(i8,
-				   vcombine_s8(result.val[0], result.val[1]));
+	r_.neon_i8 = vcombine_s8(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i8 = SIMDE_SHUFFLE_VECTOR_(8, 16, a_.i8, b_.i8, 8, 24, 9, 25, 10, 26,
+				      11, 27, 12, 28, 13, 29, 14, 30, 15, 31);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i8[0])) / 2); i++) {
-		r.i8[(i * 2)] = a.i8[i + ((sizeof(r) / sizeof(r.i8[0])) / 2)];
-		r.i8[(i * 2) + 1] =
-			b.i8[i + ((sizeof(r) / sizeof(r.i8[0])) / 2)];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i8[0])) / 2); i++) {
+		r_.i8[(i * 2)] =
+			a_.i8[i + ((sizeof(r_) / sizeof(r_.i8[0])) / 2)];
+		r_.i8[(i * 2) + 1] =
+			b_.i8[i + ((sizeof(r_) / sizeof(r_.i8[0])) / 2)];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_epi8(a, b) simde_mm_unpackhi_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpackhi_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpackhi_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	int16x4_t a1 = vget_high_s16(a.neon_i16);
-	int16x4_t b1 = vget_high_s16(b.neon_i16);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpackhi_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int16x4_t a1 = vget_high_s16(a_.neon_i16);
+	int16x4_t b1 = vget_high_s16(b_.neon_i16);
 	int16x4x2_t result = vzip_s16(a1, b1);
-	return SIMDE__M128I_NEON_C(i16,
-				   vcombine_s16(result.val[0], result.val[1]));
+	r_.neon_i16 = vcombine_s16(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i16 = SIMDE_SHUFFLE_VECTOR_(16, 16, a_.i16, b_.i16, 4, 12, 5, 13, 6,
+				       14, 7, 15);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i16[0])) / 2); i++) {
-		r.i16[(i * 2)] =
-			a.i16[i + ((sizeof(r) / sizeof(r.i16[0])) / 2)];
-		r.i16[(i * 2) + 1] =
-			b.i16[i + ((sizeof(r) / sizeof(r.i16[0])) / 2)];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i16[0])) / 2); i++) {
+		r_.i16[(i * 2)] =
+			a_.i16[i + ((sizeof(r_) / sizeof(r_.i16[0])) / 2)];
+		r_.i16[(i * 2) + 1] =
+			b_.i16[i + ((sizeof(r_) / sizeof(r_.i16[0])) / 2)];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_epi16(a, b) simde_mm_unpackhi_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpackhi_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpackhi_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	int32x2_t a1 = vget_high_s32(a.neon_i32);
-	int32x2_t b1 = vget_high_s32(b.neon_i32);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpackhi_epi32(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int32x2_t a1 = vget_high_s32(a_.neon_i32);
+	int32x2_t b1 = vget_high_s32(b_.neon_i32);
 	int32x2x2_t result = vzip_s32(a1, b1);
-	return SIMDE__M128I_NEON_C(i32,
-				   vcombine_s32(result.val[0], result.val[1]));
+	r_.neon_i32 = vcombine_s32(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.i32, b_.i32, 2, 6, 3, 7);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i32[0])) / 2); i++) {
-		r.i32[(i * 2)] =
-			a.i32[i + ((sizeof(r) / sizeof(r.i32[0])) / 2)];
-		r.i32[(i * 2) + 1] =
-			b.i32[i + ((sizeof(r) / sizeof(r.i32[0])) / 2)];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i32[0])) / 2); i++) {
+		r_.i32[(i * 2)] =
+			a_.i32[i + ((sizeof(r_) / sizeof(r_.i32[0])) / 2)];
+		r_.i32[(i * 2) + 1] =
+			b_.i32[i + ((sizeof(r_) / sizeof(r_.i32[0])) / 2)];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_epi32(a, b) simde_mm_unpackhi_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpackhi_epi64(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpackhi_epi64(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpackhi_epi64(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i64[0])) / 2); i++) {
-		r.i64[(i * 2)] =
-			a.i64[i + ((sizeof(r) / sizeof(r.i64[0])) / 2)];
-		r.i64[(i * 2) + 1] =
-			b.i64[i + ((sizeof(r) / sizeof(r.i64[0])) / 2)];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i64 = SIMDE_SHUFFLE_VECTOR_(64, 16, a_.i64, b_.i64, 1, 3);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i64[0])) / 2); i++) {
+		r_.i64[(i * 2)] =
+			a_.i64[i + ((sizeof(r_) / sizeof(r_.i64[0])) / 2)];
+		r_.i64[(i * 2) + 1] =
+			b_.i64[i + ((sizeof(r_) / sizeof(r_.i64[0])) / 2)];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_epi64(a, b) simde_mm_unpackhi_epi64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_unpackhi_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_unpackhi_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpackhi_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.f64[0])) / 2); i++) {
-		r.f64[(i * 2)] =
-			a.f64[i + ((sizeof(r) / sizeof(r.f64[0])) / 2)];
-		r.f64[(i * 2) + 1] =
-			b.f64[i + ((sizeof(r) / sizeof(r.f64[0])) / 2)];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f64 = SIMDE_SHUFFLE_VECTOR_(64, 16, a_.f64, b_.f64, 1, 3);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.f64[0])) / 2); i++) {
+		r_.f64[(i * 2)] =
+			a_.f64[i + ((sizeof(r_) / sizeof(r_.f64[0])) / 2)];
+		r_.f64[(i * 2) + 1] =
+			b_.f64[i + ((sizeof(r_) / sizeof(r_.f64[0])) / 2)];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpackhi_pd(a, b) simde_mm_unpackhi_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpacklo_epi8(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpacklo_epi8(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	int8x8_t a1 = vreinterpret_s8_s16(vget_low_s16(a.neon_i16));
-	int8x8_t b1 = vreinterpret_s8_s16(vget_low_s16(b.neon_i16));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpacklo_epi8(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int8x8_t a1 = vreinterpret_s8_s16(vget_low_s16(a_.neon_i16));
+	int8x8_t b1 = vreinterpret_s8_s16(vget_low_s16(b_.neon_i16));
 	int8x8x2_t result = vzip_s8(a1, b1);
-	return SIMDE__M128I_NEON_C(i8,
-				   vcombine_s8(result.val[0], result.val[1]));
+	r_.neon_i8 = vcombine_s8(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i8 = SIMDE_SHUFFLE_VECTOR_(8, 16, a_.i8, b_.i8, 0, 16, 1, 17, 2, 18,
+				      3, 19, 4, 20, 5, 21, 6, 22, 7, 23);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i8[0])) / 2); i++) {
-		r.i8[(i * 2)] = a.i8[i];
-		r.i8[(i * 2) + 1] = b.i8[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i8[0])) / 2); i++) {
+		r_.i8[(i * 2)] = a_.i8[i];
+		r_.i8[(i * 2) + 1] = b_.i8[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_epi8(a, b) simde_mm_unpacklo_epi8(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpacklo_epi16(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpacklo_epi16(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	int16x4_t a1 = vget_low_s16(a.neon_i16);
-	int16x4_t b1 = vget_low_s16(b.neon_i16);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpacklo_epi16(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int16x4_t a1 = vget_low_s16(a_.neon_i16);
+	int16x4_t b1 = vget_low_s16(b_.neon_i16);
 	int16x4x2_t result = vzip_s16(a1, b1);
-	return SIMDE__M128I_NEON_C(i16,
-				   vcombine_s16(result.val[0], result.val[1]));
+	r_.neon_i16 = vcombine_s16(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i16 = SIMDE_SHUFFLE_VECTOR_(16, 16, a_.i16, b_.i16, 0, 8, 1, 9, 2,
+				       10, 3, 11);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i16[0])) / 2); i++) {
-		r.i16[(i * 2)] = a.i16[i];
-		r.i16[(i * 2) + 1] = b.i16[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i16[0])) / 2); i++) {
+		r_.i16[(i * 2)] = a_.i16[i];
+		r_.i16[(i * 2) + 1] = b_.i16[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_epi16(a, b) simde_mm_unpacklo_epi16(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpacklo_epi32(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpacklo_epi32(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	int32x2_t a1 = vget_low_s32(a.neon_i32);
-	int32x2_t b1 = vget_low_s32(b.neon_i32);
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpacklo_epi32(a, b);
+#else
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	int32x2_t a1 = vget_low_s32(a_.neon_i32);
+	int32x2_t b1 = vget_low_s32(b_.neon_i32);
 	int32x2x2_t result = vzip_s32(a1, b1);
-	return SIMDE__M128I_NEON_C(i32,
-				   vcombine_s32(result.val[0], result.val[1]));
+	r_.neon_i32 = vcombine_s32(result.val[0], result.val[1]);
+#elif defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i32 = SIMDE_SHUFFLE_VECTOR_(32, 16, a_.i32, b_.i32, 0, 4, 1, 5);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i32[0])) / 2); i++) {
-		r.i32[(i * 2)] = a.i32[i];
-		r.i32[(i * 2) + 1] = b.i32[i];
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i32[0])) / 2); i++) {
+		r_.i32[(i * 2)] = a_.i32[i];
+		r_.i32[(i * 2) + 1] = b_.i32[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_epi32(a, b) simde_mm_unpacklo_epi32(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_unpacklo_epi64(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_unpacklo_epi64(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpacklo_epi64(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.i64[0])) / 2); i++) {
-		r.i64[(i * 2)] = a.i64[i];
-		r.i64[(i * 2) + 1] = b.i64[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.i64 = SIMDE_SHUFFLE_VECTOR_(64, 16, a_.i64, b_.i64, 0, 2);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.i64[0])) / 2); i++) {
+		r_.i64[(i * 2)] = a_.i64[i];
+		r_.i64[(i * 2) + 1] = b_.i64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_epi64(a, b) simde_mm_unpacklo_epi64(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_unpacklo_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_unpacklo_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_unpacklo_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < ((sizeof(r) / sizeof(r.f64[0])) / 2); i++) {
-		r.f64[(i * 2)] = a.f64[i];
-		r.f64[(i * 2) + 1] = b.f64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_SHUFFLE_VECTOR_)
+	r_.f64 = SIMDE_SHUFFLE_VECTOR_(64, 16, a_.f64, b_.f64, 0, 2);
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < ((sizeof(r_) / sizeof(r_.f64[0])) / 2); i++) {
+		r_.f64[(i * 2)] = a_.f64[i];
+		r_.f64[(i * 2) + 1] = b_.f64[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_unpacklo_pd(a, b) simde_mm_unpacklo_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128d simde_mm_xor_pd(simde__m128d a, simde__m128d b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128D_C(_mm_xor_pd(a.n, b.n));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_xor_pd(a, b);
 #else
-	simde__m128d r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i64) / sizeof(r.i64[0])); i++) {
-		r.i64[i] = a.i64[i] ^ b.i64[i];
+	simde__m128d_private r_, a_ = simde__m128d_to_private(a),
+				 b_ = simde__m128d_to_private(b);
+
+#if defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f ^ b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = a_.i32f[i] ^ b_.i32f[i];
 	}
-	return r;
+#endif
+
+	return simde__m128d_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_xor_pd(a, b) simde_mm_xor_pd(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_mm_xor_si128(simde__m128i a, simde__m128i b)
 {
-#if defined(SIMDE_SSE2_NATIVE)
-	return SIMDE__M128I_C(_mm_xor_si128(a.n, b.n));
-#elif defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i32, veorq_s32(a.neon_i32, b.neon_i32));
+#if defined(SIMDE_X86_SSE2_NATIVE)
+	return _mm_xor_si128(a, b);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = a.i32[i] ^ b.i32[i];
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a),
+				 b_ = simde__m128i_to_private(b);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = veorq_s32(a_.neon_i32, b_.neon_i32);
+#elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+	r_.altivec_i32 = vec_xor(a_.altivec_i32, b_.altivec_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = a_.i32f ^ b_.i32f;
+#else
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = a_.i32f[i] ^ b_.i32f[i];
 	}
-	return r;
+#endif
+
+	return simde__m128i_from_private(r_);
 #endif
 }
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _mm_xor_si128(a, b) simde_mm_xor_si128(a, b)
+#endif
 
-SIMDE__FUNCTION_ATTRIBUTES
+SIMDE_FUNCTION_ATTRIBUTES
 simde__m128i simde_x_mm_not_si128(simde__m128i a)
 {
-#if defined(SIMDE_SSE2_NEON)
-	return SIMDE__M128I_NEON_C(i32, vmvnq_s32(a.neon_i32));
+	simde__m128i_private r_, a_ = simde__m128i_to_private(a);
+
+#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+	r_.neon_i32 = vmvnq_s32(a_.neon_i32);
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_OPS)
+	r_.i32f = ~(a_.i32f);
 #else
-	simde__m128i r;
-	SIMDE__VECTORIZE
-	for (size_t i = 0; i < (sizeof(r.i32) / sizeof(r.i32[0])); i++) {
-		r.i32[i] = ~(a.i32[i]);
+	SIMDE_VECTORIZE
+	for (size_t i = 0; i < (sizeof(r_.i32f) / sizeof(r_.i32f[0])); i++) {
+		r_.i32f[i] = ~(a_.i32f[i]);
 	}
-	return r;
 #endif
+
+	return simde__m128i_from_private(r_);
 }
 
-SIMDE__END_DECLS
+#define SIMDE_MM_SHUFFLE2(x, y) (((x) << 1) | (y))
+#if defined(SIMDE_X86_SSE2_ENABLE_NATIVE_ALIASES)
+#define _MM_SHUFFLE2(x, y) SIMDE_MM_SHUFFLE2(x, y)
+#endif
+
+SIMDE_END_DECLS_
+
+HEDLEY_DIAGNOSTIC_POP
 
-#endif /* !defined(SIMDE__SSE2_H) */
+#endif /* !defined(SIMDE_X86_SSE2_H) */

obs-studio-25.0.8.tar.xz/libobs/util/sse-intrin.h -> obs-studio-26.0.0.tar.xz/libobs/util/sse-intrin.h Changed

obs-studio-26.0.0.tar.xz/libobs/util/sse2neon.h Added

@@ -0,0 +1,4207 @@
+#ifndef SSE2NEON_H
+#define SSE2NEON_H
+
+// This header file provides a simple API translation layer
+// between SSE intrinsics to their corresponding Arm/Aarch64 NEON versions
+//
+// This header file does not yet translate all of the SSE intrinsics.
+//
+// Contributors to this work are:
+//   John W. Ratcliff <jratcliffscarab@gmail.com>
+//   Brandon Rowlett <browlett@nvidia.com>
+//   Ken Fast <kfast@gdeb.com>
+//   Eric van Beurden <evanbeurden@nvidia.com>
+//   Alexander Potylitsin <apotylitsin@nvidia.com>
+//   Hasindu Gamaarachchi <hasindu2008@gmail.com>
+//   Jim Huang <jserv@biilabs.io>
+//   Mark Cheng <marktwtn@biilabs.io>
+//   Malcolm James MacLeod <malcolm@gulden.com>
+//   Devin Hussey (easyaspi314) <husseydevin@gmail.com>
+//   Sebastian Pop <spop@amazon.com>
+//   Developer Ecosystem Engineering <DeveloperEcosystemEngineering@apple.com>
+//   Danila Kutenin <danilak@google.com>
+
+/*
+ * sse2neon is freely redistributable under 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.
+ */
+
+#if defined(__GNUC__) || defined(__clang__)
+#pragma push_macro("FORCE_INLINE")
+#pragma push_macro("ALIGN_STRUCT")
+#define FORCE_INLINE static inline __attribute__((always_inline))
+#define ALIGN_STRUCT(x) __attribute__((aligned(x)))
+#else
+#error "Macro name collisions may happen with unsupported compiler."
+#ifdef FORCE_INLINE
+#undef FORCE_INLINE
+#endif
+#define FORCE_INLINE static inline
+#ifndef ALIGN_STRUCT
+#define ALIGN_STRUCT(x) __declspec(align(x))
+#endif
+#endif
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <arm_neon.h>
+
+/* "__has_builtin" can be used to query support for built-in functions
+ * provided by gcc/clang and other compilers that support it.
+ */
+#ifndef __has_builtin /* GCC prior to 10 or non-clang compilers */
+/* Compatibility with gcc <= 9 */
+#if __GNUC__ <= 9
+#define __has_builtin(x) HAS##x
+#define HAS__builtin_popcount 1
+#define HAS__builtin_popcountll 1
+#else
+#define __has_builtin(x) 0
+#endif
+#endif
+
+/**
+ * MACRO for shuffle parameter for _mm_shuffle_ps().
+ * Argument fp3 is a digit[0123] that represents the fp from argument "b"
+ * of mm_shuffle_ps that will be placed in fp3 of result. fp2 is the same
+ * for fp2 in result. fp1 is a digit[0123] that represents the fp from
+ * argument "a" of mm_shuffle_ps that will be places in fp1 of result.
+ * fp0 is the same for fp0 of result.
+ */
+#define _MM_SHUFFLE(fp3, fp2, fp1, fp0) \
+	(((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | ((fp0)))
+
+/* indicate immediate constant argument in a given range */
+#define __constrange(a, b) const
+
+/* A few intrinsics accept traditional data types like ints or floats, but
+ * most operate on data types that are specific to SSE.
+ * If a vector type ends in d, it contains doubles, and if it does not have
+ * a suffix, it contains floats. An integer vector type can contain any type
+ * of integer, from chars to shorts to unsigned long longs.
+ */
+typedef float32x2_t __m64;
+typedef float32x4_t __m128; /* 128-bit vector containing 4 floats */
+// On ARM 32-bit architecture, the float64x2_t is not supported.
+// The data type __m128d should be represented in a different way for related
+// intrinsic conversion.
+#if defined(__aarch64__)
+typedef float64x2_t __m128d; /* 128-bit vector containing 2 doubles */
+#else
+typedef float32x4_t __m128d;
+#endif
+typedef int64x1_t __m64i;
+typedef int64x2_t __m128i; /* 128-bit vector containing integers */
+
+/* type-safe casting between types */
+
+#define vreinterpretq_m128_f16(x) vreinterpretq_f32_f16(x)
+#define vreinterpretq_m128_f32(x) (x)
+#define vreinterpretq_m128_f64(x) vreinterpretq_f32_f64(x)
+
+#define vreinterpretq_m128_u8(x) vreinterpretq_f32_u8(x)
+#define vreinterpretq_m128_u16(x) vreinterpretq_f32_u16(x)
+#define vreinterpretq_m128_u32(x) vreinterpretq_f32_u32(x)
+#define vreinterpretq_m128_u64(x) vreinterpretq_f32_u64(x)
+
+#define vreinterpretq_m128_s8(x) vreinterpretq_f32_s8(x)
+#define vreinterpretq_m128_s16(x) vreinterpretq_f32_s16(x)
+#define vreinterpretq_m128_s32(x) vreinterpretq_f32_s32(x)
+#define vreinterpretq_m128_s64(x) vreinterpretq_f32_s64(x)
+
+#define vreinterpretq_f16_m128(x) vreinterpretq_f16_f32(x)
+#define vreinterpretq_f32_m128(x) (x)
+#define vreinterpretq_f64_m128(x) vreinterpretq_f64_f32(x)
+
+#define vreinterpretq_u8_m128(x) vreinterpretq_u8_f32(x)
+#define vreinterpretq_u16_m128(x) vreinterpretq_u16_f32(x)
+#define vreinterpretq_u32_m128(x) vreinterpretq_u32_f32(x)
+#define vreinterpretq_u64_m128(x) vreinterpretq_u64_f32(x)
+
+#define vreinterpretq_s8_m128(x) vreinterpretq_s8_f32(x)
+#define vreinterpretq_s16_m128(x) vreinterpretq_s16_f32(x)
+#define vreinterpretq_s32_m128(x) vreinterpretq_s32_f32(x)
+#define vreinterpretq_s64_m128(x) vreinterpretq_s64_f32(x)
+
+#define vreinterpretq_m128i_s8(x) vreinterpretq_s64_s8(x)
+#define vreinterpretq_m128i_s16(x) vreinterpretq_s64_s16(x)
+#define vreinterpretq_m128i_s32(x) vreinterpretq_s64_s32(x)
+#define vreinterpretq_m128i_s64(x) (x)
+
+#define vreinterpretq_m128i_u8(x) vreinterpretq_s64_u8(x)
+#define vreinterpretq_m128i_u16(x) vreinterpretq_s64_u16(x)
+#define vreinterpretq_m128i_u32(x) vreinterpretq_s64_u32(x)
+#define vreinterpretq_m128i_u64(x) vreinterpretq_s64_u64(x)
+
+#define vreinterpretq_s8_m128i(x) vreinterpretq_s8_s64(x)
+#define vreinterpretq_s16_m128i(x) vreinterpretq_s16_s64(x)
+#define vreinterpretq_s32_m128i(x) vreinterpretq_s32_s64(x)
+#define vreinterpretq_s64_m128i(x) (x)
+
+#define vreinterpretq_u8_m128i(x) vreinterpretq_u8_s64(x)
+#define vreinterpretq_u16_m128i(x) vreinterpretq_u16_s64(x)
+#define vreinterpretq_u32_m128i(x) vreinterpretq_u32_s64(x)
+#define vreinterpretq_u64_m128i(x) vreinterpretq_u64_s64(x)
+
+#define vreinterpret_m64i_s8(x) vreinterpret_s64_s8(x)
+#define vreinterpret_m64i_s16(x) vreinterpret_s64_s16(x)
+#define vreinterpret_m64i_s32(x) vreinterpret_s64_s32(x)
+#define vreinterpret_m64i_s64(x) (x)
+
+#define vreinterpret_m64i_u8(x) vreinterpret_s64_u8(x)
+#define vreinterpret_m64i_u16(x) vreinterpret_s64_u16(x)
+#define vreinterpret_m64i_u32(x) vreinterpret_s64_u32(x)
+#define vreinterpret_m64i_u64(x) vreinterpret_s64_u64(x)
+
+#define vreinterpret_u8_m64i(x) vreinterpret_u8_s64(x)
+#define vreinterpret_u16_m64i(x) vreinterpret_u16_s64(x)
+#define vreinterpret_u32_m64i(x) vreinterpret_u32_s64(x)
+#define vreinterpret_u64_m64i(x) vreinterpret_u64_s64(x)
+
+#define vreinterpret_s8_m64i(x) vreinterpret_s8_s64(x)
+#define vreinterpret_s16_m64i(x) vreinterpret_s16_s64(x)
+#define vreinterpret_s32_m64i(x) vreinterpret_s32_s64(x)
+#define vreinterpret_s64_m64i(x) (x)
+
+// A struct is defined in this header file called 'SIMDVec' which can be used
+// by applications which attempt to access the contents of an _m128 struct
+// directly.  It is important to note that accessing the __m128 struct directly
+// is bad coding practice by Microsoft: @see:
+// https://msdn.microsoft.com/en-us/library/ayeb3ayc.aspx
+//
+// However, some legacy source code may try to access the contents of an __m128
+// struct directly so the developer can use the SIMDVec as an alias for it.  Any
+// casting must be done manually by the developer, as you cannot cast or
+// otherwise alias the base NEON data type for intrinsic operations.
+//
+// union intended to allow direct access to an __m128 variable using the names
+// that the MSVC compiler provides.  This union should really only be used when
+// trying to access the members of the vector as integer values.  GCC/clang
+// allow native access to the float members through a simple array access
+// operator (in C since 4.6, in C++ since 4.8).
+//
+// Ideally direct accesses to SIMD vectors should not be used since it can cause
+// a performance hit.  If it really is needed however, the original __m128
+// variable can be aliased with a pointer to this union and used to access
+// individual components.  The use of this union should be hidden behind a macro
+// that is used throughout the codebase to access the members instead of always
+// declaring this type of variable.
+typedef union ALIGN_STRUCT(16) SIMDVec {
+	float m128_f32[4];    // as floats - DON'T USE. Added for convenience.
+	int8_t m128_i8[16];   // as signed 8-bit integers.
+	int16_t m128_i16[8];  // as signed 16-bit integers.
+	int32_t m128_i32[4];  // as signed 32-bit integers.
+	int64_t m128_i64[2];  // as signed 64-bit integers.
+	uint8_t m128_u8[16];  // as unsigned 8-bit integers.
+	uint16_t m128_u16[8]; // as unsigned 16-bit integers.
+	uint32_t m128_u32[4]; // as unsigned 32-bit integers.
+	uint64_t m128_u64[2]; // as unsigned 64-bit integers.
+} SIMDVec;
+
+// casting using SIMDVec
+#define vreinterpretq_nth_u64_m128i(x, n) (((SIMDVec *)&x)->m128_u64[n])
+#define vreinterpretq_nth_u32_m128i(x, n) (((SIMDVec *)&x)->m128_u32[n])
+
+/* Backwards compatibility for compilers with lack of specific type support */
+
+// Older gcc does not define vld1q_u8_x4 type
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ <= 9
+FORCE_INLINE uint8x16x4_t vld1q_u8_x4(const uint8_t *p)
+{
+	uint8x16x4_t ret;
+	ret.val[0] = vld1q_u8(p + 0);
+	ret.val[1] = vld1q_u8(p + 16);
+	ret.val[2] = vld1q_u8(p + 32);
+	ret.val[3] = vld1q_u8(p + 48);
+	return ret;
+}
+#endif
+#endif
+
+/* Function Naming Conventions
+ * The naming convention of SSE intrinsics is straightforward. A generic SSE
+ * intrinsic function is given as follows:
+ *   _mm_<name>_<data_type>
+ *
+ * The parts of this format are given as follows:
+ * 1. <name> describes the operation performed by the intrinsic
+ * 2. <data_type> identifies the data type of the function's primary arguments
+ *
+ * This last part, <data_type>, is a little complicated. It identifies the
+ * content of the input values, and can be set to any of the following values:
+ * + ps - vectors contain floats (ps stands for packed single-precision)
+ * + pd - vectors cantain doubles (pd stands for packed double-precision)
+ * + epi8/epi16/epi32/epi64 - vectors contain 8-bit/16-bit/32-bit/64-bit
+ *                            signed integers
+ * + epu8/epu16/epu32/epu64 - vectors contain 8-bit/16-bit/32-bit/64-bit
+ *                            unsigned integers
+ * + si128 - unspecified 128-bit vector or 256-bit vector
+ * + m128/m128i/m128d - identifies input vector types when they are different
+ *                      than the type of the returned vector
+ *
+ * For example, _mm_setzero_ps. The _mm implies that the function returns
+ * a 128-bit vector. The _ps at the end implies that the argument vectors
+ * contain floats.
+ *
+ * A complete example: Byte Shuffle - pshufb (_mm_shuffle_epi8)
+ *   // Set packed 16-bit integers. 128 bits, 8 short, per 16 bits
+ *   __m128i v_in = _mm_setr_epi16(1, 2, 3, 4, 5, 6, 7, 8);
+ *   // Set packed 8-bit integers
+ *   // 128 bits, 16 chars, per 8 bits
+ *   __m128i v_perm = _mm_setr_epi8(1, 0,  2,  3, 8, 9, 10, 11,
+ *                                  4, 5, 12, 13, 6, 7, 14, 15);
+ *   // Shuffle packed 8-bit integers
+ *   __m128i v_out = _mm_shuffle_epi8(v_in, v_perm); // pshufb
+ *
+ * Data (Number, Binary, Byte Index):
+    +------+------+-------------+------+------+-------------+
+    |      1      |      2      |      3      |      4      | Number
+    +------+------+------+------+------+------+------+------+
+    | 0000 | 0001 | 0000 | 0010 | 0000 | 0011 | 0000 | 0100 | Binary
+    +------+------+------+------+------+------+------+------+
+    |    0 |    1 |    2 |    3 |    4 |    5 |    6 |    7 | Index
+    +------+------+------+------+------+------+------+------+
+
+    +------+------+------+------+------+------+------+------+
+    |      5      |      6      |      7      |      8      | Number
+    +------+------+------+------+------+------+------+------+
+    | 0000 | 0101 | 0000 | 0110 | 0000 | 0111 | 0000 | 1000 | Binary
+    +------+------+------+------+------+------+------+------+
+    |    8 |    9 |   10 |   11 |   12 |   13 |   14 |   15 | Index
+    +------+------+------+------+------+------+------+------+
+ * Index (Byte Index):
+    +------+------+------+------+------+------+------+------+
+    |    1 |    0 |    2 |    3 |    8 |    9 |   10 |   11 |
+    +------+------+------+------+------+------+------+------+
+
+    +------+------+------+------+------+------+------+------+
+    |    4 |    5 |   12 |   13 |    6 |    7 |   14 |   15 |
+    +------+------+------+------+------+------+------+------+
+ * Result:
+    +------+------+------+------+------+------+------+------+
+    |    1 |    0 |    2 |    3 |    8 |    9 |   10 |   11 | Index
+    +------+------+------+------+------+------+------+------+
+    | 0001 | 0000 | 0000 | 0010 | 0000 | 0101 | 0000 | 0110 | Binary
+    +------+------+------+------+------+------+------+------+
+    |     256     |      2      |      5      |      6      | Number
+    +------+------+------+------+------+------+------+------+
+
+    +------+------+------+------+------+------+------+------+
+    |    4 |    5 |   12 |   13 |    6 |    7 |   14 |   15 | Index
+    +------+------+------+------+------+------+------+------+
+    | 0000 | 0011 | 0000 | 0111 | 0000 | 0100 | 0000 | 1000 | Binary
+    +------+------+------+------+------+------+------+------+
+    |      3      |      7      |      4      |      8      | Number
+    +------+------+------+------+------+------+-------------+
+ */
+
+/* Set/get methods */
+
+/* Constants for use with _mm_prefetch.  */
+enum _mm_hint {
+	_MM_HINT_NTA = 0,  /* load data to L1 and L2 cache, mark it as NTA */
+	_MM_HINT_T0 = 1,   /* load data to L1 and L2 cache */
+	_MM_HINT_T1 = 2,   /* load data to L2 cache only */
+	_MM_HINT_T2 = 3,   /* load data to L2 cache only, mark it as NTA */
+	_MM_HINT_ENTA = 4, /* exclusive version of _MM_HINT_NTA */
+	_MM_HINT_ET0 = 5,  /* exclusive version of _MM_HINT_T0 */
+	_MM_HINT_ET1 = 6,  /* exclusive version of _MM_HINT_T1 */
+	_MM_HINT_ET2 = 7   /* exclusive version of _MM_HINT_T2 */
+};
+
+// Loads one cache line of data from address p to a location closer to the
+// processor. https://msdn.microsoft.com/en-us/library/84szxsww(v=vs.100).aspx
+FORCE_INLINE void _mm_prefetch(const void *p, int i)
+{
+	(void)i;
+	__builtin_prefetch(p);
+}
+
+// extracts the lower order floating point value from the parameter :
+// https://msdn.microsoft.com/en-us/library/bb514059%28v=vs.120%29.aspx?f=255&MSPPError=-2147217396
+FORCE_INLINE float _mm_cvtss_f32(__m128 a)
+{
+	return vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
+}
+
+// Sets the 128-bit value to zero
+// https://msdn.microsoft.com/en-us/library/vstudio/ys7dw0kh(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_setzero_si128(void)
+{
+	return vreinterpretq_m128i_s32(vdupq_n_s32(0));
+}
+
+// Clears the four single-precision, floating-point values.
+// https://msdn.microsoft.com/en-us/library/vstudio/tk1t2tbz(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_setzero_ps(void)
+{
+	return vreinterpretq_m128_f32(vdupq_n_f32(0));
+}
+
+// Sets the four single-precision, floating-point values to w.
+//
+//   r0 := r1 := r2 := r3 := w
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/2x1se8ha(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_set1_ps(float _w)
+{
+	return vreinterpretq_m128_f32(vdupq_n_f32(_w));
+}
+
+// Sets the four single-precision, floating-point values to w.
+// https://msdn.microsoft.com/en-us/library/vstudio/2x1se8ha(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_set_ps1(float _w)
+{
+	return vreinterpretq_m128_f32(vdupq_n_f32(_w));
+}
+
+// Sets the four single-precision, floating-point values to the four inputs.
+// https://msdn.microsoft.com/en-us/library/vstudio/afh0zf75(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_set_ps(float w, float z, float y, float x)
+{
+	float ALIGN_STRUCT(16) data[4] = {x, y, z, w};
+	return vreinterpretq_m128_f32(vld1q_f32(data));
+}
+
+// Copy single-precision (32-bit) floating-point element a to the lower element
+// of dst, and zero the upper 3 elements.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set_ss&expand=4901,4895,4901
+FORCE_INLINE __m128 _mm_set_ss(float a)
+{
+	float ALIGN_STRUCT(16) data[4] = {a, 0, 0, 0};
+	return vreinterpretq_m128_f32(vld1q_f32(data));
+}
+
+// Sets the four single-precision, floating-point values to the four inputs in
+// reverse order.
+// https://msdn.microsoft.com/en-us/library/vstudio/d2172ct3(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_setr_ps(float w, float z, float y, float x)
+{
+	float ALIGN_STRUCT(16) data[4] = {w, z, y, x};
+	return vreinterpretq_m128_f32(vld1q_f32(data));
+}
+
+// Sets the 8 signed 16-bit integer values in reverse order.
+//
+// Return Value
+//   r0 := w0
+//   r1 := w1
+//   ...
+//   r7 := w7
+FORCE_INLINE __m128i _mm_setr_epi16(short w0, short w1, short w2, short w3,
+				    short w4, short w5, short w6, short w7)
+{
+	int16_t ALIGN_STRUCT(16) data[8] = {w0, w1, w2, w3, w4, w5, w6, w7};
+	return vreinterpretq_m128i_s16(vld1q_s16((int16_t *)data));
+}
+
+// Sets the 4 signed 32-bit integer values in reverse order
+// https://technet.microsoft.com/en-us/library/security/27yb3ee5(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_setr_epi32(int i3, int i2, int i1, int i0)
+{
+	int32_t ALIGN_STRUCT(16) data[4] = {i3, i2, i1, i0};
+	return vreinterpretq_m128i_s32(vld1q_s32(data));
+}
+
+// Sets the 16 signed 8-bit integer values to b.
+//
+//   r0 := b
+//   r1 := b
+//   ...
+//   r15 := b
+//
+// https://msdn.microsoft.com/en-us/library/6e14xhyf(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_set1_epi8(signed char w)
+{
+	return vreinterpretq_m128i_s8(vdupq_n_s8(w));
+}
+
+// Sets the 8 signed 16-bit integer values to w.
+//
+//   r0 := w
+//   r1 := w
+//   ...
+//   r7 := w
+//
+// https://msdn.microsoft.com/en-us/library/k0ya3x0e(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_set1_epi16(short w)
+{
+	return vreinterpretq_m128i_s16(vdupq_n_s16(w));
+}
+
+// Sets the 16 signed 8-bit integer values.
+// https://msdn.microsoft.com/en-us/library/x0cx8zd3(v=vs.90).aspx
+FORCE_INLINE __m128i
+_mm_set_epi8(signed char b15, signed char b14, signed char b13, signed char b12,
+	     signed char b11, signed char b10, signed char b9, signed char b8,
+	     signed char b7, signed char b6, signed char b5, signed char b4,
+	     signed char b3, signed char b2, signed char b1, signed char b0)
+{
+	int8_t ALIGN_STRUCT(16)
+		data[16] = {(int8_t)b0,  (int8_t)b1,  (int8_t)b2,  (int8_t)b3,
+			    (int8_t)b4,  (int8_t)b5,  (int8_t)b6,  (int8_t)b7,
+			    (int8_t)b8,  (int8_t)b9,  (int8_t)b10, (int8_t)b11,
+			    (int8_t)b12, (int8_t)b13, (int8_t)b14, (int8_t)b15};
+	return (__m128i)vld1q_s8(data);
+}
+
+// Sets the 8 signed 16-bit integer values.
+// https://msdn.microsoft.com/en-au/library/3e0fek84(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_set_epi16(short i7, short i6, short i5, short i4,
+				   short i3, short i2, short i1, short i0)
+{
+	int16_t ALIGN_STRUCT(16) data[8] = {i0, i1, i2, i3, i4, i5, i6, i7};
+	return vreinterpretq_m128i_s16(vld1q_s16(data));
+}
+
+// Sets the 16 signed 8-bit integer values in reverse order.
+// https://msdn.microsoft.com/en-us/library/2khb9c7k(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_setr_epi8(
+	signed char b0, signed char b1, signed char b2, signed char b3,
+	signed char b4, signed char b5, signed char b6, signed char b7,
+	signed char b8, signed char b9, signed char b10, signed char b11,
+	signed char b12, signed char b13, signed char b14, signed char b15)
+{
+	int8_t ALIGN_STRUCT(16)
+		data[16] = {(int8_t)b0,  (int8_t)b1,  (int8_t)b2,  (int8_t)b3,
+			    (int8_t)b4,  (int8_t)b5,  (int8_t)b6,  (int8_t)b7,
+			    (int8_t)b8,  (int8_t)b9,  (int8_t)b10, (int8_t)b11,
+			    (int8_t)b12, (int8_t)b13, (int8_t)b14, (int8_t)b15};
+	return (__m128i)vld1q_s8(data);
+}
+
+// Sets the 4 signed 32-bit integer values to i.
+//
+//   r0 := i
+//   r1 := i
+//   r2 := i
+//   r3 := I
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/h4xscxat(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_set1_epi32(int _i)
+{
+	return vreinterpretq_m128i_s32(vdupq_n_s32(_i));
+}
+
+// Sets the 2 signed 64-bit integer values to i.
+// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/whtfzhzk(v=vs.100)
+FORCE_INLINE __m128i _mm_set1_epi64(int64_t _i)
+{
+	return vreinterpretq_m128i_s64(vdupq_n_s64(_i));
+}
+
+// Sets the 2 signed 64-bit integer values to i.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set1_epi64x&expand=4961
+FORCE_INLINE __m128i _mm_set1_epi64x(int64_t _i)
+{
+	return vreinterpretq_m128i_s64(vdupq_n_s64(_i));
+}
+
+// Sets the 4 signed 32-bit integer values.
+// https://msdn.microsoft.com/en-us/library/vstudio/019beekt(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_set_epi32(int i3, int i2, int i1, int i0)
+{
+	int32_t ALIGN_STRUCT(16) data[4] = {i0, i1, i2, i3};
+	return vreinterpretq_m128i_s32(vld1q_s32(data));
+}
+
+// Returns the __m128i structure with its two 64-bit integer values
+// initialized to the values of the two 64-bit integers passed in.
+// https://msdn.microsoft.com/en-us/library/dk2sdw0h(v=vs.120).aspx
+FORCE_INLINE __m128i _mm_set_epi64x(int64_t i1, int64_t i2)
+{
+	int64_t ALIGN_STRUCT(16) data[2] = {i2, i1};
+	return vreinterpretq_m128i_s64(vld1q_s64(data));
+}
+
+// Stores four single-precision, floating-point values.
+// https://msdn.microsoft.com/en-us/library/vstudio/s3h4ay6y(v=vs.100).aspx
+FORCE_INLINE void _mm_store_ps(float *p, __m128 a)
+{
+	vst1q_f32(p, vreinterpretq_f32_m128(a));
+}
+
+// Stores four single-precision, floating-point values.
+// https://msdn.microsoft.com/en-us/library/44e30x22(v=vs.100).aspx
+FORCE_INLINE void _mm_storeu_ps(float *p, __m128 a)
+{
+	vst1q_f32(p, vreinterpretq_f32_m128(a));
+}
+
+// Stores four 32-bit integer values as (as a __m128i value) at the address p.
+// https://msdn.microsoft.com/en-us/library/vstudio/edk11s13(v=vs.100).aspx
+FORCE_INLINE void _mm_store_si128(__m128i *p, __m128i a)
+{
+	vst1q_s32((int32_t *)p, vreinterpretq_s32_m128i(a));
+}
+
+// Stores four 32-bit integer values as (as a __m128i value) at the address p.
+// https://msdn.microsoft.com/en-us/library/vstudio/edk11s13(v=vs.100).aspx
+FORCE_INLINE void _mm_storeu_si128(__m128i *p, __m128i a)
+{
+	vst1q_s32((int32_t *)p, vreinterpretq_s32_m128i(a));
+}
+
+// Stores the lower single - precision, floating - point value.
+// https://msdn.microsoft.com/en-us/library/tzz10fbx(v=vs.100).aspx
+FORCE_INLINE void _mm_store_ss(float *p, __m128 a)
+{
+	vst1q_lane_f32(p, vreinterpretq_f32_m128(a), 0);
+}
+
+// Reads the lower 64 bits of b and stores them into the lower 64 bits of a.
+// https://msdn.microsoft.com/en-us/library/hhwf428f%28v=vs.90%29.aspx
+FORCE_INLINE void _mm_storel_epi64(__m128i *a, __m128i b)
+{
+	uint64x1_t hi = vget_high_u64(vreinterpretq_u64_m128i(*a));
+	uint64x1_t lo = vget_low_u64(vreinterpretq_u64_m128i(b));
+	*a = vreinterpretq_m128i_u64(vcombine_u64(lo, hi));
+}
+
+// Stores the lower two single-precision floating point values of a to the
+// address p.
+//
+//   *p0 := a0
+//   *p1 := a1
+//
+// https://msdn.microsoft.com/en-us/library/h54t98ks(v=vs.90).aspx
+FORCE_INLINE void _mm_storel_pi(__m64 *p, __m128 a)
+{
+	*p = vget_low_f32(a);
+}
+
+// Stores the upper two single-precision, floating-point values of a to the
+// address p.
+//
+//   *p0 := a2
+//   *p1 := a3
+//
+// https://msdn.microsoft.com/en-us/library/a7525fs8(v%3dvs.90).aspx
+FORCE_INLINE void _mm_storeh_pi(__m64 *p, __m128 a)
+{
+	*p = vget_high_f32(a);
+}
+
+// Loads a single single-precision, floating-point value, copying it into all
+// four words
+// https://msdn.microsoft.com/en-us/library/vstudio/5cdkf716(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_load1_ps(const float *p)
+{
+	return vreinterpretq_m128_f32(vld1q_dup_f32(p));
+}
+#define _mm_load_ps1 _mm_load1_ps
+
+// Sets the lower two single-precision, floating-point values with 64
+// bits of data loaded from the address p; the upper two values are passed
+// through from a.
+//
+// Return Value
+//   r0 := *p0
+//   r1 := *p1
+//   r2 := a2
+//   r3 := a3
+//
+// https://msdn.microsoft.com/en-us/library/s57cyak2(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_loadl_pi(__m128 a, __m64 const *p)
+{
+	return vreinterpretq_m128_f32(
+		vcombine_f32(vld1_f32((const float32_t *)p), vget_high_f32(a)));
+}
+
+// Sets the upper two single-precision, floating-point values with 64
+// bits of data loaded from the address p; the lower two values are passed
+// through from a.
+//
+//   r0 := a0
+//   r1 := a1
+//   r2 := *p0
+//   r3 := *p1
+//
+// https://msdn.microsoft.com/en-us/library/w92wta0x(v%3dvs.100).aspx
+FORCE_INLINE __m128 _mm_loadh_pi(__m128 a, __m64 const *p)
+{
+	return vreinterpretq_m128_f32(
+		vcombine_f32(vget_low_f32(a), vld1_f32((const float32_t *)p)));
+}
+
+// Loads four single-precision, floating-point values.
+// https://msdn.microsoft.com/en-us/library/vstudio/zzd50xxt(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_load_ps(const float *p)
+{
+	return vreinterpretq_m128_f32(vld1q_f32(p));
+}
+
+// Loads four single-precision, floating-point values.
+// https://msdn.microsoft.com/en-us/library/x1b16s7z%28v=vs.90%29.aspx
+FORCE_INLINE __m128 _mm_loadu_ps(const float *p)
+{
+	// for neon, alignment doesn't matter, so _mm_load_ps and _mm_loadu_ps are
+	// equivalent for neon
+	return vreinterpretq_m128_f32(vld1q_f32(p));
+}
+
+// Loads a double-precision, floating-point value.
+// The upper double-precision, floating-point is set to zero. The address p does
+// not need to be 16-byte aligned.
+// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/574w9fdd(v%3dvs.100)
+FORCE_INLINE __m128d _mm_load_sd(const double *p)
+{
+#if defined(__aarch64__)
+	return vsetq_lane_f64(*p, vdupq_n_f64(0), 0);
+#else
+	const float *fp = (const float *)p;
+	float ALIGN_STRUCT(16) data[4] = {fp[0], fp[1], 0, 0};
+	return vld1q_f32(data);
+#endif
+}
+
+// Loads an single - precision, floating - point value into the low word and
+// clears the upper three words.
+// https://msdn.microsoft.com/en-us/library/548bb9h4%28v=vs.90%29.aspx
+FORCE_INLINE __m128 _mm_load_ss(const float *p)
+{
+	return vreinterpretq_m128_f32(vsetq_lane_f32(*p, vdupq_n_f32(0), 0));
+}
+
+FORCE_INLINE __m128i _mm_loadl_epi64(__m128i const *p)
+{
+	/* Load the lower 64 bits of the value pointed to by p into the
+     * lower 64 bits of the result, zeroing the upper 64 bits of the result.
+     */
+	return vreinterpretq_m128i_s32(
+		vcombine_s32(vld1_s32((int32_t const *)p), vcreate_s32(0)));
+}
+
+/* Logic/Binary operations */
+
+// Compares for inequality.
+// https://msdn.microsoft.com/en-us/library/sf44thbx(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cmpneq_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_u32(vmvnq_u32(vceqq_f32(
+		vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b))));
+}
+
+// Computes the bitwise AND-NOT of the four single-precision, floating-point
+// values of a and b.
+//
+//   r0 := ~a0 & b0
+//   r1 := ~a1 & b1
+//   r2 := ~a2 & b2
+//   r3 := ~a3 & b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/68h7wd02(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_andnot_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_s32(
+		vbicq_s32(vreinterpretq_s32_m128(b),
+			  vreinterpretq_s32_m128(a))); // *NOTE* argument swap
+}
+
+// Computes the bitwise AND of the 128-bit value in b and the bitwise NOT of the
+// 128-bit value in a.
+//
+//   r := (~a) & b
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/1beaceh8(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_andnot_si128(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(
+		vbicq_s32(vreinterpretq_s32_m128i(b),
+			  vreinterpretq_s32_m128i(a))); // *NOTE* argument swap
+}
+
+// Computes the bitwise AND of the 128-bit value in a and the 128-bit value in
+// b.
+//
+//   r := a & b
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/6d1txsa8(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_and_si128(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vandq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Computes the bitwise AND of the four single-precision, floating-point values
+// of a and b.
+//
+//   r0 := a0 & b0
+//   r1 := a1 & b1
+//   r2 := a2 & b2
+//   r3 := a3 & b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/73ck1xc5(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_and_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_s32(vandq_s32(vreinterpretq_s32_m128(a),
+						vreinterpretq_s32_m128(b)));
+}
+
+// Computes the bitwise OR of the four single-precision, floating-point values
+// of a and b.
+// https://msdn.microsoft.com/en-us/library/vstudio/7ctdsyy0(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_or_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_s32(vorrq_s32(vreinterpretq_s32_m128(a),
+						vreinterpretq_s32_m128(b)));
+}
+
+// Computes bitwise EXOR (exclusive-or) of the four single-precision,
+// floating-point values of a and b.
+// https://msdn.microsoft.com/en-us/library/ss6k3wk8(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_xor_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_s32(veorq_s32(vreinterpretq_s32_m128(a),
+						vreinterpretq_s32_m128(b)));
+}
+
+// Computes the bitwise OR of the 128-bit value in a and the 128-bit value in b.
+//
+//   r := a | b
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/ew8ty0db(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_or_si128(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vorrq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Computes the bitwise XOR of the 128-bit value in a and the 128-bit value in
+// b.  https://msdn.microsoft.com/en-us/library/fzt08www(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_xor_si128(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(veorq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Moves the upper two values of B into the lower two values of A.
+//
+//   r3 := a3
+//   r2 := a2
+//   r1 := b3
+//   r0 := b2
+FORCE_INLINE __m128 _mm_movehl_ps(__m128 __A, __m128 __B)
+{
+	float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(__A));
+	float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(__B));
+	return vreinterpretq_m128_f32(vcombine_f32(b32, a32));
+}
+
+// Moves the lower two values of B into the upper two values of A.
+//
+//   r3 := b1
+//   r2 := b0
+//   r1 := a1
+//   r0 := a0
+FORCE_INLINE __m128 _mm_movelh_ps(__m128 __A, __m128 __B)
+{
+	float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(__A));
+	float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(__B));
+	return vreinterpretq_m128_f32(vcombine_f32(a10, b10));
+}
+
+FORCE_INLINE __m128i _mm_abs_epi32(__m128i a)
+{
+	return vreinterpretq_m128i_s32(vabsq_s32(vreinterpretq_s32_m128i(a)));
+}
+
+FORCE_INLINE __m128i _mm_abs_epi16(__m128i a)
+{
+	return vreinterpretq_m128i_s16(vabsq_s16(vreinterpretq_s16_m128i(a)));
+}
+
+FORCE_INLINE __m128i _mm_abs_epi8(__m128i a)
+{
+	return vreinterpretq_m128i_s8(vabsq_s8(vreinterpretq_s8_m128i(a)));
+}
+
+// Takes the upper 64 bits of a and places it in the low end of the result
+// Takes the lower 64 bits of b and places it into the high end of the result.
+FORCE_INLINE __m128 _mm_shuffle_ps_1032(__m128 a, __m128 b)
+{
+	float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(a));
+	float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_f32(vcombine_f32(a32, b10));
+}
+
+// takes the lower two 32-bit values from a and swaps them and places in high
+// end of result takes the higher two 32 bit values from b and swaps them and
+// places in low end of result.
+FORCE_INLINE __m128 _mm_shuffle_ps_2301(__m128 a, __m128 b)
+{
+	float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
+	float32x2_t b23 = vrev64_f32(vget_high_f32(vreinterpretq_f32_m128(b)));
+	return vreinterpretq_m128_f32(vcombine_f32(a01, b23));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_0321(__m128 a, __m128 b)
+{
+	float32x2_t a21 = vget_high_f32(vextq_f32(
+		vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a), 3));
+	float32x2_t b03 = vget_low_f32(vextq_f32(vreinterpretq_f32_m128(b),
+						 vreinterpretq_f32_m128(b), 3));
+	return vreinterpretq_m128_f32(vcombine_f32(a21, b03));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_2103(__m128 a, __m128 b)
+{
+	float32x2_t a03 = vget_low_f32(vextq_f32(vreinterpretq_f32_m128(a),
+						 vreinterpretq_f32_m128(a), 3));
+	float32x2_t b21 = vget_high_f32(vextq_f32(
+		vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b), 3));
+	return vreinterpretq_m128_f32(vcombine_f32(a03, b21));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_1010(__m128 a, __m128 b)
+{
+	float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
+	float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_f32(vcombine_f32(a10, b10));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_1001(__m128 a, __m128 b)
+{
+	float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
+	float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_f32(vcombine_f32(a01, b10));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_0101(__m128 a, __m128 b)
+{
+	float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
+	float32x2_t b01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(b)));
+	return vreinterpretq_m128_f32(vcombine_f32(a01, b01));
+}
+
+// keeps the low 64 bits of b in the low and puts the high 64 bits of a in the
+// high
+FORCE_INLINE __m128 _mm_shuffle_ps_3210(__m128 a, __m128 b)
+{
+	float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
+	float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_f32(vcombine_f32(a10, b32));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_0011(__m128 a, __m128 b)
+{
+	float32x2_t a11 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(a)), 1);
+	float32x2_t b00 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
+	return vreinterpretq_m128_f32(vcombine_f32(a11, b00));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_0022(__m128 a, __m128 b)
+{
+	float32x2_t a22 =
+		vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(a)), 0);
+	float32x2_t b00 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
+	return vreinterpretq_m128_f32(vcombine_f32(a22, b00));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_2200(__m128 a, __m128 b)
+{
+	float32x2_t a00 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(a)), 0);
+	float32x2_t b22 =
+		vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(b)), 0);
+	return vreinterpretq_m128_f32(vcombine_f32(a00, b22));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_3202(__m128 a, __m128 b)
+{
+	float32_t a0 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
+	float32x2_t a22 =
+		vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(a)), 0);
+	float32x2_t a02 = vset_lane_f32(a0, a22, 1); /* TODO: use vzip ?*/
+	float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_f32(vcombine_f32(a02, b32));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_1133(__m128 a, __m128 b)
+{
+	float32x2_t a33 =
+		vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(a)), 1);
+	float32x2_t b11 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 1);
+	return vreinterpretq_m128_f32(vcombine_f32(a33, b11));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_2010(__m128 a, __m128 b)
+{
+	float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
+	float32_t b2 = vgetq_lane_f32(vreinterpretq_f32_m128(b), 2);
+	float32x2_t b00 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
+	float32x2_t b20 = vset_lane_f32(b2, b00, 1);
+	return vreinterpretq_m128_f32(vcombine_f32(a10, b20));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_2001(__m128 a, __m128 b)
+{
+	float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
+	float32_t b2 = vgetq_lane_f32(b, 2);
+	float32x2_t b00 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
+	float32x2_t b20 = vset_lane_f32(b2, b00, 1);
+	return vreinterpretq_m128_f32(vcombine_f32(a01, b20));
+}
+
+FORCE_INLINE __m128 _mm_shuffle_ps_2032(__m128 a, __m128 b)
+{
+	float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(a));
+	float32_t b2 = vgetq_lane_f32(b, 2);
+	float32x2_t b00 =
+		vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
+	float32x2_t b20 = vset_lane_f32(b2, b00, 1);
+	return vreinterpretq_m128_f32(vcombine_f32(a32, b20));
+}
+
+// NEON does not support a general purpose permute intrinsic
+// Selects four specific single-precision, floating-point values from a and b,
+// based on the mask i.
+// https://msdn.microsoft.com/en-us/library/vstudio/5f0858x0(v=vs.100).aspx
+#if 0 /* C version */
+FORCE_INLINE __m128 _mm_shuffle_ps_default(__m128 a,
+                                           __m128 b,
+                                           __constrange(0, 255) int imm)
+{
+    __m128 ret;
+    ret[0] = a[imm & 0x3];
+    ret[1] = a[(imm >> 2) & 0x3];
+    ret[2] = b[(imm >> 4) & 0x03];
+    ret[3] = b[(imm >> 6) & 0x03];
+    return ret;
+}
+#endif
+#define _mm_shuffle_ps_default(a, b, imm)                                      \
+	__extension__({                                                        \
+		float32x4_t ret;                                               \
+		ret = vmovq_n_f32(vgetq_lane_f32(vreinterpretq_f32_m128(a),    \
+						 (imm) & (0x3)));              \
+		ret = vsetq_lane_f32(vgetq_lane_f32(vreinterpretq_f32_m128(a), \
+						    ((imm) >> 2) & 0x3),       \
+				     ret, 1);                                  \
+		ret = vsetq_lane_f32(vgetq_lane_f32(vreinterpretq_f32_m128(b), \
+						    ((imm) >> 4) & 0x3),       \
+				     ret, 2);                                  \
+		ret = vsetq_lane_f32(vgetq_lane_f32(vreinterpretq_f32_m128(b), \
+						    ((imm) >> 6) & 0x3),       \
+				     ret, 3);                                  \
+		vreinterpretq_m128_f32(ret);                                   \
+	})
+
+// FORCE_INLINE __m128 _mm_shuffle_ps(__m128 a, __m128 b, __constrange(0,255)
+// int imm)
+#if __has_builtin(__builtin_shufflevector)
+#define _mm_shuffle_ps(a, b, imm)                                            \
+	__extension__({                                                      \
+		float32x4_t _input1 = vreinterpretq_f32_m128(a);             \
+		float32x4_t _input2 = vreinterpretq_f32_m128(b);             \
+		float32x4_t _shuf = __builtin_shufflevector(                 \
+			_input1, _input2, (imm) & (0x3), ((imm) >> 2) & 0x3, \
+			(((imm) >> 4) & 0x3) + 4, (((imm) >> 6) & 0x3) + 4); \
+		vreinterpretq_m128_f32(_shuf);                               \
+	})
+#else // generic
+#define _mm_shuffle_ps(a, b, imm)                                      \
+	__extension__({                                                \
+		__m128 ret;                                            \
+		switch (imm) {                                         \
+		case _MM_SHUFFLE(1, 0, 3, 2):                          \
+			ret = _mm_shuffle_ps_1032((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(2, 3, 0, 1):                          \
+			ret = _mm_shuffle_ps_2301((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(0, 3, 2, 1):                          \
+			ret = _mm_shuffle_ps_0321((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(2, 1, 0, 3):                          \
+			ret = _mm_shuffle_ps_2103((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(1, 0, 1, 0):                          \
+			ret = _mm_movelh_ps((a), (b));                 \
+			break;                                         \
+		case _MM_SHUFFLE(1, 0, 0, 1):                          \
+			ret = _mm_shuffle_ps_1001((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(0, 1, 0, 1):                          \
+			ret = _mm_shuffle_ps_0101((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(3, 2, 1, 0):                          \
+			ret = _mm_shuffle_ps_3210((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(0, 0, 1, 1):                          \
+			ret = _mm_shuffle_ps_0011((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(0, 0, 2, 2):                          \
+			ret = _mm_shuffle_ps_0022((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(2, 2, 0, 0):                          \
+			ret = _mm_shuffle_ps_2200((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(3, 2, 0, 2):                          \
+			ret = _mm_shuffle_ps_3202((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(3, 2, 3, 2):                          \
+			ret = _mm_movehl_ps((b), (a));                 \
+			break;                                         \
+		case _MM_SHUFFLE(1, 1, 3, 3):                          \
+			ret = _mm_shuffle_ps_1133((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(2, 0, 1, 0):                          \
+			ret = _mm_shuffle_ps_2010((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(2, 0, 0, 1):                          \
+			ret = _mm_shuffle_ps_2001((a), (b));           \
+			break;                                         \
+		case _MM_SHUFFLE(2, 0, 3, 2):                          \
+			ret = _mm_shuffle_ps_2032((a), (b));           \
+			break;                                         \
+		default:                                               \
+			ret = _mm_shuffle_ps_default((a), (b), (imm)); \
+			break;                                         \
+		}                                                      \
+		ret;                                                   \
+	})
+#endif
+
+// Takes the upper 64 bits of a and places it in the low end of the result
+// Takes the lower 64 bits of a and places it into the high end of the result.
+FORCE_INLINE __m128i _mm_shuffle_epi_1032(__m128i a)
+{
+	int32x2_t a32 = vget_high_s32(vreinterpretq_s32_m128i(a));
+	int32x2_t a10 = vget_low_s32(vreinterpretq_s32_m128i(a));
+	return vreinterpretq_m128i_s32(vcombine_s32(a32, a10));
+}
+
+// takes the lower two 32-bit values from a and swaps them and places in low end
+// of result takes the higher two 32 bit values from a and swaps them and places
+// in high end of result.
+FORCE_INLINE __m128i _mm_shuffle_epi_2301(__m128i a)
+{
+	int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
+	int32x2_t a23 = vrev64_s32(vget_high_s32(vreinterpretq_s32_m128i(a)));
+	return vreinterpretq_m128i_s32(vcombine_s32(a01, a23));
+}
+
+// rotates the least significant 32 bits into the most signficant 32 bits, and
+// shifts the rest down
+FORCE_INLINE __m128i _mm_shuffle_epi_0321(__m128i a)
+{
+	return vreinterpretq_m128i_s32(vextq_s32(
+		vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(a), 1));
+}
+
+// rotates the most significant 32 bits into the least signficant 32 bits, and
+// shifts the rest up
+FORCE_INLINE __m128i _mm_shuffle_epi_2103(__m128i a)
+{
+	return vreinterpretq_m128i_s32(vextq_s32(
+		vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(a), 3));
+}
+
+// gets the lower 64 bits of a, and places it in the upper 64 bits
+// gets the lower 64 bits of a and places it in the lower 64 bits
+FORCE_INLINE __m128i _mm_shuffle_epi_1010(__m128i a)
+{
+	int32x2_t a10 = vget_low_s32(vreinterpretq_s32_m128i(a));
+	return vreinterpretq_m128i_s32(vcombine_s32(a10, a10));
+}
+
+// gets the lower 64 bits of a, swaps the 0 and 1 elements, and places it in the
+// lower 64 bits gets the lower 64 bits of a, and places it in the upper 64 bits
+FORCE_INLINE __m128i _mm_shuffle_epi_1001(__m128i a)
+{
+	int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
+	int32x2_t a10 = vget_low_s32(vreinterpretq_s32_m128i(a));
+	return vreinterpretq_m128i_s32(vcombine_s32(a01, a10));
+}
+
+// gets the lower 64 bits of a, swaps the 0 and 1 elements and places it in the
+// upper 64 bits gets the lower 64 bits of a, swaps the 0 and 1 elements, and
+// places it in the lower 64 bits
+FORCE_INLINE __m128i _mm_shuffle_epi_0101(__m128i a)
+{
+	int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
+	return vreinterpretq_m128i_s32(vcombine_s32(a01, a01));
+}
+
+FORCE_INLINE __m128i _mm_shuffle_epi_2211(__m128i a)
+{
+	int32x2_t a11 =
+		vdup_lane_s32(vget_low_s32(vreinterpretq_s32_m128i(a)), 1);
+	int32x2_t a22 =
+		vdup_lane_s32(vget_high_s32(vreinterpretq_s32_m128i(a)), 0);
+	return vreinterpretq_m128i_s32(vcombine_s32(a11, a22));
+}
+
+FORCE_INLINE __m128i _mm_shuffle_epi_0122(__m128i a)
+{
+	int32x2_t a22 =
+		vdup_lane_s32(vget_high_s32(vreinterpretq_s32_m128i(a)), 0);
+	int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
+	return vreinterpretq_m128i_s32(vcombine_s32(a22, a01));
+}
+
+FORCE_INLINE __m128i _mm_shuffle_epi_3332(__m128i a)
+{
+	int32x2_t a32 = vget_high_s32(vreinterpretq_s32_m128i(a));
+	int32x2_t a33 =
+		vdup_lane_s32(vget_high_s32(vreinterpretq_s32_m128i(a)), 1);
+	return vreinterpretq_m128i_s32(vcombine_s32(a32, a33));
+}
+
+// Shuffle packed 8-bit integers in a according to shuffle control mask in the
+// corresponding 8-bit element of b, and store the results in dst.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_shuffle_epi8&expand=5146
+FORCE_INLINE __m128i _mm_shuffle_epi8(__m128i a, __m128i b)
+{
+	int8x16_t tbl = vreinterpretq_s8_m128i(a);  // input a
+	uint8x16_t idx = vreinterpretq_u8_m128i(b); // input b
+	uint8x16_t idx_masked =
+		vandq_u8(idx, vdupq_n_u8(0x8F)); // avoid using meaningless bits
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s8(vqtbl1q_s8(tbl, idx_masked));
+#elif defined(__GNUC__)
+	int8x16_t ret;
+	// %e and %f represent the even and odd D registers
+	// respectively.
+	__asm__ __volatile__("vtbl.8  %e[ret], {%e[tbl], %f[tbl]}, %e[idx]\n"
+			     "vtbl.8  %f[ret], {%e[tbl], %f[tbl]}, %f[idx]\n"
+			     : [ret] "=&w"(ret)
+			     : [tbl] "w"(tbl), [idx] "w"(idx_masked));
+	return vreinterpretq_m128i_s8(ret);
+#else
+	// use this line if testing on aarch64
+	int8x8x2_t a_split = {vget_low_s8(tbl), vget_high_s8(tbl)};
+	return vreinterpretq_m128i_s8(
+		vcombine_s8(vtbl2_s8(a_split, vget_low_u8(idx_masked)),
+			    vtbl2_s8(a_split, vget_high_u8(idx_masked))));
+#endif
+}
+
+#if 0 /* C version */
+FORCE_INLINE __m128i _mm_shuffle_epi32_default(__m128i a,
+                                               __constrange(0, 255) int imm)
+{
+    __m128i ret;
+    ret[0] = a[imm & 0x3];
+    ret[1] = a[(imm >> 2) & 0x3];
+    ret[2] = a[(imm >> 4) & 0x03];
+    ret[3] = a[(imm >> 6) & 0x03];
+    return ret;
+}
+#endif
+#define _mm_shuffle_epi32_default(a, imm)                                    \
+	__extension__({                                                      \
+		int32x4_t ret;                                               \
+		ret = vmovq_n_s32(vgetq_lane_s32(vreinterpretq_s32_m128i(a), \
+						 (imm) & (0x3)));            \
+		ret = vsetq_lane_s32(                                        \
+			vgetq_lane_s32(vreinterpretq_s32_m128i(a),           \
+				       ((imm) >> 2) & 0x3),                  \
+			ret, 1);                                             \
+		ret = vsetq_lane_s32(                                        \
+			vgetq_lane_s32(vreinterpretq_s32_m128i(a),           \
+				       ((imm) >> 4) & 0x3),                  \
+			ret, 2);                                             \
+		ret = vsetq_lane_s32(                                        \
+			vgetq_lane_s32(vreinterpretq_s32_m128i(a),           \
+				       ((imm) >> 6) & 0x3),                  \
+			ret, 3);                                             \
+		vreinterpretq_m128i_s32(ret);                                \
+	})
+
+// FORCE_INLINE __m128i _mm_shuffle_epi32_splat(__m128i a, __constrange(0,255)
+// int imm)
+#if defined(__aarch64__)
+#define _mm_shuffle_epi32_splat(a, imm)                                      \
+	__extension__({                                                      \
+		vreinterpretq_m128i_s32(                                     \
+			vdupq_laneq_s32(vreinterpretq_s32_m128i(a), (imm))); \
+	})
+#else
+#define _mm_shuffle_epi32_splat(a, imm)                                      \
+	__extension__({                                                      \
+		vreinterpretq_m128i_s32(vdupq_n_s32(                         \
+			vgetq_lane_s32(vreinterpretq_s32_m128i(a), (imm)))); \
+	})
+#endif
+
+// Shuffles the 4 signed or unsigned 32-bit integers in a as specified by imm.
+// https://msdn.microsoft.com/en-us/library/56f67xbk%28v=vs.90%29.aspx
+// FORCE_INLINE __m128i _mm_shuffle_epi32(__m128i a,
+//                                        __constrange(0,255) int imm)
+#if __has_builtin(__builtin_shufflevector)
+#define _mm_shuffle_epi32(a, imm)                                          \
+	__extension__({                                                    \
+		int32x4_t _input = vreinterpretq_s32_m128i(a);             \
+		int32x4_t _shuf = __builtin_shufflevector(                 \
+			_input, _input, (imm) & (0x3), ((imm) >> 2) & 0x3, \
+			((imm) >> 4) & 0x3, ((imm) >> 6) & 0x3);           \
+		vreinterpretq_m128i_s32(_shuf);                            \
+	})
+#else // generic
+#define _mm_shuffle_epi32(a, imm)                                    \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		switch (imm) {                                       \
+		case _MM_SHUFFLE(1, 0, 3, 2):                        \
+			ret = _mm_shuffle_epi_1032((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(2, 3, 0, 1):                        \
+			ret = _mm_shuffle_epi_2301((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(0, 3, 2, 1):                        \
+			ret = _mm_shuffle_epi_0321((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(2, 1, 0, 3):                        \
+			ret = _mm_shuffle_epi_2103((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(1, 0, 1, 0):                        \
+			ret = _mm_shuffle_epi_1010((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(1, 0, 0, 1):                        \
+			ret = _mm_shuffle_epi_1001((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(0, 1, 0, 1):                        \
+			ret = _mm_shuffle_epi_0101((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(2, 2, 1, 1):                        \
+			ret = _mm_shuffle_epi_2211((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(0, 1, 2, 2):                        \
+			ret = _mm_shuffle_epi_0122((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(3, 3, 3, 2):                        \
+			ret = _mm_shuffle_epi_3332((a));             \
+			break;                                       \
+		case _MM_SHUFFLE(0, 0, 0, 0):                        \
+			ret = _mm_shuffle_epi32_splat((a), 0);       \
+			break;                                       \
+		case _MM_SHUFFLE(1, 1, 1, 1):                        \
+			ret = _mm_shuffle_epi32_splat((a), 1);       \
+			break;                                       \
+		case _MM_SHUFFLE(2, 2, 2, 2):                        \
+			ret = _mm_shuffle_epi32_splat((a), 2);       \
+			break;                                       \
+		case _MM_SHUFFLE(3, 3, 3, 3):                        \
+			ret = _mm_shuffle_epi32_splat((a), 3);       \
+			break;                                       \
+		default:                                             \
+			ret = _mm_shuffle_epi32_default((a), (imm)); \
+			break;                                       \
+		}                                                    \
+		ret;                                                 \
+	})
+#endif
+
+// Shuffles the lower 4 signed or unsigned 16-bit integers in a as specified
+// by imm.
+// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/y41dkk37(v=vs.100)
+// FORCE_INLINE __m128i _mm_shufflelo_epi16_function(__m128i a,
+//                                                   __constrange(0,255) int
+//                                                   imm)
+#define _mm_shufflelo_epi16_function(a, imm)                                 \
+	__extension__({                                                      \
+		int16x8_t ret = vreinterpretq_s16_m128i(a);                  \
+		int16x4_t lowBits = vget_low_s16(ret);                       \
+		ret = vsetq_lane_s16(vget_lane_s16(lowBits, (imm) & (0x3)),  \
+				     ret, 0);                                \
+		ret = vsetq_lane_s16(                                        \
+			vget_lane_s16(lowBits, ((imm) >> 2) & 0x3), ret, 1); \
+		ret = vsetq_lane_s16(                                        \
+			vget_lane_s16(lowBits, ((imm) >> 4) & 0x3), ret, 2); \
+		ret = vsetq_lane_s16(                                        \
+			vget_lane_s16(lowBits, ((imm) >> 6) & 0x3), ret, 3); \
+		vreinterpretq_m128i_s16(ret);                                \
+	})
+
+// FORCE_INLINE __m128i _mm_shufflelo_epi16(__m128i a,
+//                                          __constrange(0,255) int imm)
+#if __has_builtin(__builtin_shufflevector)
+#define _mm_shufflelo_epi16(a, imm)                                            \
+	__extension__({                                                        \
+		int16x8_t _input = vreinterpretq_s16_m128i(a);                 \
+		int16x8_t _shuf = __builtin_shufflevector(                     \
+			_input, _input, ((imm) & (0x3)), (((imm) >> 2) & 0x3), \
+			(((imm) >> 4) & 0x3), (((imm) >> 6) & 0x3), 4, 5, 6,   \
+			7);                                                    \
+		vreinterpretq_m128i_s16(_shuf);                                \
+	})
+#else // generic
+#define _mm_shufflelo_epi16(a, imm) _mm_shufflelo_epi16_function((a), (imm))
+#endif
+
+// Shuffles the upper 4 signed or unsigned 16-bit integers in a as specified
+// by imm.
+// https://msdn.microsoft.com/en-us/library/13ywktbs(v=vs.100).aspx
+// FORCE_INLINE __m128i _mm_shufflehi_epi16_function(__m128i a,
+//                                                   __constrange(0,255) int
+//                                                   imm)
+#define _mm_shufflehi_epi16_function(a, imm)                                  \
+	__extension__({                                                       \
+		int16x8_t ret = vreinterpretq_s16_m128i(a);                   \
+		int16x4_t highBits = vget_high_s16(ret);                      \
+		ret = vsetq_lane_s16(vget_lane_s16(highBits, (imm) & (0x3)),  \
+				     ret, 4);                                 \
+		ret = vsetq_lane_s16(                                         \
+			vget_lane_s16(highBits, ((imm) >> 2) & 0x3), ret, 5); \
+		ret = vsetq_lane_s16(                                         \
+			vget_lane_s16(highBits, ((imm) >> 4) & 0x3), ret, 6); \
+		ret = vsetq_lane_s16(                                         \
+			vget_lane_s16(highBits, ((imm) >> 6) & 0x3), ret, 7); \
+		vreinterpretq_m128i_s16(ret);                                 \
+	})
+
+// FORCE_INLINE __m128i _mm_shufflehi_epi16(__m128i a,
+//                                          __constrange(0,255) int imm)
+#if __has_builtin(__builtin_shufflevector)
+#define _mm_shufflehi_epi16(a, imm)                                         \
+	__extension__({                                                     \
+		int16x8_t _input = vreinterpretq_s16_m128i(a);              \
+		int16x8_t _shuf = __builtin_shufflevector(                  \
+			_input, _input, 0, 1, 2, 3, ((imm) & (0x3)) + 4,    \
+			(((imm) >> 2) & 0x3) + 4, (((imm) >> 4) & 0x3) + 4, \
+			(((imm) >> 6) & 0x3) + 4);                          \
+		vreinterpretq_m128i_s16(_shuf);                             \
+	})
+#else // generic
+#define _mm_shufflehi_epi16(a, imm) _mm_shufflehi_epi16_function((a), (imm))
+#endif
+
+// Blend packed 16-bit integers from a and b using control mask imm8, and store
+// the results in dst.
+//
+//   FOR j := 0 to 7
+//       i := j*16
+//       IF imm8[j]
+//           dst[i+15:i] := b[i+15:i]
+//       ELSE
+//           dst[i+15:i] := a[i+15:i]
+//       FI
+//   ENDFOR
+// FORCE_INLINE __m128i _mm_blend_epi16(__m128i a, __m128i b,
+//                                      __constrange(0,255) int imm)
+#define _mm_blend_epi16(a, b, imm)                                     \
+	__extension__({                                                \
+		const uint16_t _mask[8] = {                            \
+			((imm) & (1 << 0)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 1)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 2)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 3)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 4)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 5)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 6)) ? 0xFFFF : 0x0000,          \
+			((imm) & (1 << 7)) ? 0xFFFF : 0x0000};         \
+		uint16x8_t _mask_vec = vld1q_u16(_mask);               \
+		uint16x8_t _a = vreinterpretq_u16_m128i(a);            \
+		uint16x8_t _b = vreinterpretq_u16_m128i(b);            \
+		vreinterpretq_m128i_u16(vbslq_u16(_mask_vec, _b, _a)); \
+	})
+
+// Blend packed 8-bit integers from a and b using mask, and store the results in
+// dst.
+//
+//   FOR j := 0 to 15
+//       i := j*8
+//       IF mask[i+7]
+//           dst[i+7:i] := b[i+7:i]
+//       ELSE
+//           dst[i+7:i] := a[i+7:i]
+//       FI
+//   ENDFOR
+FORCE_INLINE __m128i _mm_blendv_epi8(__m128i _a, __m128i _b, __m128i _mask)
+{
+	// Use a signed shift right to create a mask with the sign bit
+	uint8x16_t mask = vreinterpretq_u8_s8(
+		vshrq_n_s8(vreinterpretq_s8_m128i(_mask), 7));
+	uint8x16_t a = vreinterpretq_u8_m128i(_a);
+	uint8x16_t b = vreinterpretq_u8_m128i(_b);
+	return vreinterpretq_m128i_u8(vbslq_u8(mask, b, a));
+}
+
+/* Shifts */
+
+// Shifts the 4 signed 32-bit integers in a right by count bits while shifting
+// in the sign bit.
+//
+//   r0 := a0 >> count
+//   r1 := a1 >> count
+//   r2 := a2 >> count
+//   r3 := a3 >> count immediate
+FORCE_INLINE __m128i _mm_srai_epi32(__m128i a, int count)
+{
+	return (__m128i)vshlq_s32((int32x4_t)a, vdupq_n_s32(-count));
+}
+
+// Shifts the 8 signed 16-bit integers in a right by count bits while shifting
+// in the sign bit.
+//
+//   r0 := a0 >> count
+//   r1 := a1 >> count
+//   ...
+//   r7 := a7 >> count
+FORCE_INLINE __m128i _mm_srai_epi16(__m128i a, int count)
+{
+	return (__m128i)vshlq_s16((int16x8_t)a, vdupq_n_s16(-count));
+}
+
+// Shifts the 8 signed or unsigned 16-bit integers in a left by count bits while
+// shifting in zeros.
+//
+//   r0 := a0 << count
+//   r1 := a1 << count
+//   ...
+//   r7 := a7 << count
+//
+// https://msdn.microsoft.com/en-us/library/es73bcsy(v=vs.90).aspx
+#define _mm_slli_epi16(a, imm)                                       \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		if ((imm) <= 0) {                                    \
+			ret = a;                                     \
+		} else if ((imm) > 31) {                             \
+			ret = _mm_setzero_si128();                   \
+		} else {                                             \
+			ret = vreinterpretq_m128i_s16(vshlq_n_s16(   \
+				vreinterpretq_s16_m128i(a), (imm))); \
+		}                                                    \
+		ret;                                                 \
+	})
+
+// Shifts the 4 signed or unsigned 32-bit integers in a left by count bits while
+// shifting in zeros. :
+// https://msdn.microsoft.com/en-us/library/z2k3bbtb%28v=vs.90%29.aspx
+// FORCE_INLINE __m128i _mm_slli_epi32(__m128i a, __constrange(0,255) int imm)
+#define _mm_slli_epi32(a, imm)                                       \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		if ((imm) <= 0) {                                    \
+			ret = a;                                     \
+		} else if ((imm) > 31) {                             \
+			ret = _mm_setzero_si128();                   \
+		} else {                                             \
+			ret = vreinterpretq_m128i_s32(vshlq_n_s32(   \
+				vreinterpretq_s32_m128i(a), (imm))); \
+		}                                                    \
+		ret;                                                 \
+	})
+
+// Shift packed 64-bit integers in a left by imm8 while shifting in zeros, and
+// store the results in dst.
+#define _mm_slli_epi64(a, imm)                                       \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		if ((imm) <= 0) {                                    \
+			ret = a;                                     \
+		} else if ((imm) > 63) {                             \
+			ret = _mm_setzero_si128();                   \
+		} else {                                             \
+			ret = vreinterpretq_m128i_s64(vshlq_n_s64(   \
+				vreinterpretq_s64_m128i(a), (imm))); \
+		}                                                    \
+		ret;                                                 \
+	})
+
+// Shifts the 8 signed or unsigned 16-bit integers in a right by count bits
+// while shifting in zeros.
+//
+//   r0 := srl(a0, count)
+//   r1 := srl(a1, count)
+//   ...
+//   r7 := srl(a7, count)
+//
+// https://msdn.microsoft.com/en-us/library/6tcwd38t(v=vs.90).aspx
+#define _mm_srli_epi16(a, imm)                                       \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		if ((imm) <= 0) {                                    \
+			ret = a;                                     \
+		} else if ((imm) > 31) {                             \
+			ret = _mm_setzero_si128();                   \
+		} else {                                             \
+			ret = vreinterpretq_m128i_u16(vshrq_n_u16(   \
+				vreinterpretq_u16_m128i(a), (imm))); \
+		}                                                    \
+		ret;                                                 \
+	})
+
+// Shifts the 4 signed or unsigned 32-bit integers in a right by count bits
+// while shifting in zeros.
+// https://msdn.microsoft.com/en-us/library/w486zcfa(v=vs.100).aspx FORCE_INLINE
+// __m128i _mm_srli_epi32(__m128i a, __constrange(0,255) int imm)
+#define _mm_srli_epi32(a, imm)                                       \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		if ((imm) <= 0) {                                    \
+			ret = a;                                     \
+		} else if ((imm) > 31) {                             \
+			ret = _mm_setzero_si128();                   \
+		} else {                                             \
+			ret = vreinterpretq_m128i_u32(vshrq_n_u32(   \
+				vreinterpretq_u32_m128i(a), (imm))); \
+		}                                                    \
+		ret;                                                 \
+	})
+
+// Shift packed 64-bit integers in a right by imm8 while shifting in zeros, and
+// store the results in dst.
+#define _mm_srli_epi64(a, imm)                                       \
+	__extension__({                                              \
+		__m128i ret;                                         \
+		if ((imm) <= 0) {                                    \
+			ret = a;                                     \
+		} else if ((imm) > 63) {                             \
+			ret = _mm_setzero_si128();                   \
+		} else {                                             \
+			ret = vreinterpretq_m128i_u64(vshrq_n_u64(   \
+				vreinterpretq_u64_m128i(a), (imm))); \
+		}                                                    \
+		ret;                                                 \
+	})
+
+// Shifts the 4 signed 32 - bit integers in a right by count bits while shifting
+// in the sign bit.
+// https://msdn.microsoft.com/en-us/library/z1939387(v=vs.100).aspx
+// FORCE_INLINE __m128i _mm_srai_epi32(__m128i a, __constrange(0,255) int imm)
+#define _mm_srai_epi32(a, imm)                                                \
+	__extension__({                                                       \
+		__m128i ret;                                                  \
+		if ((imm) <= 0) {                                             \
+			ret = a;                                              \
+		} else if ((imm) > 31) {                                      \
+			ret = vreinterpretq_m128i_s32(                        \
+				vshrq_n_s32(vreinterpretq_s32_m128i(a), 16)); \
+			ret = vreinterpretq_m128i_s32(vshrq_n_s32(            \
+				vreinterpretq_s32_m128i(ret), 16));           \
+		} else {                                                      \
+			ret = vreinterpretq_m128i_s32(vshrq_n_s32(            \
+				vreinterpretq_s32_m128i(a), (imm)));          \
+		}                                                             \
+		ret;                                                          \
+	})
+
+// Shifts the 128 - bit value in a right by imm bytes while shifting in
+// zeros.imm must be an immediate.
+//
+//   r := srl(a, imm*8)
+//
+// https://msdn.microsoft.com/en-us/library/305w28yz(v=vs.100).aspx
+// FORCE_INLINE _mm_srli_si128(__m128i a, __constrange(0,255) int imm)
+#define _mm_srli_si128(a, imm)                                      \
+	__extension__({                                             \
+		__m128i ret;                                        \
+		if ((imm) <= 0) {                                   \
+			ret = a;                                    \
+		} else if ((imm) > 15) {                            \
+			ret = _mm_setzero_si128();                  \
+		} else {                                            \
+			ret = vreinterpretq_m128i_s8(               \
+				vextq_s8(vreinterpretq_s8_m128i(a), \
+					 vdupq_n_s8(0), (imm)));    \
+		}                                                   \
+		ret;                                                \
+	})
+
+// Shifts the 128-bit value in a left by imm bytes while shifting in zeros. imm
+// must be an immediate.
+//
+//   r := a << (imm * 8)
+//
+// https://msdn.microsoft.com/en-us/library/34d3k2kt(v=vs.100).aspx
+// FORCE_INLINE __m128i _mm_slli_si128(__m128i a, __constrange(0,255) int imm)
+#define _mm_slli_si128(a, imm)                                            \
+	__extension__({                                                   \
+		__m128i ret;                                              \
+		if ((imm) <= 0) {                                         \
+			ret = a;                                          \
+		} else if ((imm) > 15) {                                  \
+			ret = _mm_setzero_si128();                        \
+		} else {                                                  \
+			ret = vreinterpretq_m128i_s8(vextq_s8(            \
+				vdupq_n_s8(0), vreinterpretq_s8_m128i(a), \
+				16 - (imm)));                             \
+		}                                                         \
+		ret;                                                      \
+	})
+
+// Shifts the 8 signed or unsigned 16-bit integers in a left by count bits while
+// shifting in zeros.
+//
+//   r0 := a0 << count
+//   r1 := a1 << count
+//   ...
+//   r7 := a7 << count
+//
+// https://msdn.microsoft.com/en-us/library/c79w388h(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_sll_epi16(__m128i a, __m128i count)
+{
+	uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
+	if (c > 15)
+		return _mm_setzero_si128();
+
+	int16x8_t vc = vdupq_n_s16((int16_t)c);
+	return vreinterpretq_m128i_s16(
+		vshlq_s16(vreinterpretq_s16_m128i(a), vc));
+}
+
+// Shifts the 4 signed or unsigned 32-bit integers in a left by count bits while
+// shifting in zeros.
+//
+// r0 := a0 << count
+// r1 := a1 << count
+// r2 := a2 << count
+// r3 := a3 << count
+//
+// https://msdn.microsoft.com/en-us/library/6fe5a6s9(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_sll_epi32(__m128i a, __m128i count)
+{
+	uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
+	if (c > 31)
+		return _mm_setzero_si128();
+
+	int32x4_t vc = vdupq_n_s32((int32_t)c);
+	return vreinterpretq_m128i_s32(
+		vshlq_s32(vreinterpretq_s32_m128i(a), vc));
+}
+
+// Shifts the 2 signed or unsigned 64-bit integers in a left by count bits while
+// shifting in zeros.
+//
+// r0 := a0 << count
+// r1 := a1 << count
+//
+// https://msdn.microsoft.com/en-us/library/6ta9dffd(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_sll_epi64(__m128i a, __m128i count)
+{
+	uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
+	if (c > 63)
+		return _mm_setzero_si128();
+
+	int64x2_t vc = vdupq_n_s64((int64_t)c);
+	return vreinterpretq_m128i_s64(
+		vshlq_s64(vreinterpretq_s64_m128i(a), vc));
+}
+
+// Shifts the 8 signed or unsigned 16-bit integers in a right by count bits
+// while shifting in zeros.
+//
+// r0 := srl(a0, count)
+// r1 := srl(a1, count)
+// ...
+// r7 := srl(a7, count)
+//
+// https://msdn.microsoft.com/en-us/library/wd5ax830(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_srl_epi16(__m128i a, __m128i count)
+{
+	uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
+	if (c > 15)
+		return _mm_setzero_si128();
+
+	int16x8_t vc = vdupq_n_s16(-(int16_t)c);
+	return vreinterpretq_m128i_u16(
+		vshlq_u16(vreinterpretq_u16_m128i(a), vc));
+}
+
+// Shifts the 4 signed or unsigned 32-bit integers in a right by count bits
+// while shifting in zeros.
+//
+// r0 := srl(a0, count)
+// r1 := srl(a1, count)
+// r2 := srl(a2, count)
+// r3 := srl(a3, count)
+//
+// https://msdn.microsoft.com/en-us/library/a9cbttf4(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_srl_epi32(__m128i a, __m128i count)
+{
+	uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
+	if (c > 31)
+		return _mm_setzero_si128();
+
+	int32x4_t vc = vdupq_n_s32(-(int32_t)c);
+	return vreinterpretq_m128i_u32(
+		vshlq_u32(vreinterpretq_u32_m128i(a), vc));
+}
+
+// Shifts the 2 signed or unsigned 64-bit integers in a right by count bits
+// while shifting in zeros.
+//
+// r0 := srl(a0, count)
+// r1 := srl(a1, count)
+//
+// https://msdn.microsoft.com/en-us/library/yf6cf9k8(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_srl_epi64(__m128i a, __m128i count)
+{
+	uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
+	if (c > 63)
+		return _mm_setzero_si128();
+
+	int64x2_t vc = vdupq_n_s64(-(int64_t)c);
+	return vreinterpretq_m128i_u64(
+		vshlq_u64(vreinterpretq_u64_m128i(a), vc));
+}
+
+// NEON does not provide a version of this function.
+// Creates a 16-bit mask from the most significant bits of the 16 signed or
+// unsigned 8-bit integers in a and zero extends the upper bits.
+// https://msdn.microsoft.com/en-us/library/vstudio/s090c8fk(v=vs.100).aspx
+FORCE_INLINE int _mm_movemask_epi8(__m128i a)
+{
+#if defined(__aarch64__)
+	uint8x16_t input = vreinterpretq_u8_m128i(a);
+	const int8_t ALIGN_STRUCT(16) xr[16] = {-7, -6, -5, -4, -3, -2, -1, 0,
+						-7, -6, -5, -4, -3, -2, -1, 0};
+	const uint8x16_t mask_and = vdupq_n_u8(0x80);
+	const int8x16_t mask_shift = vld1q_s8(xr);
+	const uint8x16_t mask_result =
+		vshlq_u8(vandq_u8(input, mask_and), mask_shift);
+	uint8x8_t lo = vget_low_u8(mask_result);
+	uint8x8_t hi = vget_high_u8(mask_result);
+
+	return vaddv_u8(lo) + (vaddv_u8(hi) << 8);
+#else
+	// Use increasingly wide shifts+adds to collect the sign bits
+	// together.
+	// Since the widening shifts would be rather confusing to follow in little
+	// endian, everything will be illustrated in big endian order instead. This
+	// has a different result - the bits would actually be reversed on a big
+	// endian machine.
+
+	// Starting input (only half the elements are shown):
+	// 89 ff 1d c0 00 10 99 33
+	uint8x16_t input = vreinterpretq_u8_m128i(a);
+
+	// Shift out everything but the sign bits with an unsigned shift right.
+	//
+	// Bytes of the vector::
+	// 89 ff 1d c0 00 10 99 33
+	// \  \  \  \  \  \  \  \    high_bits = (uint16x4_t)(input >> 7)
+	//  |  |  |  |  |  |  |  |
+	// 01 01 00 01 00 00 01 00
+	//
+	// Bits of first important lane(s):
+	// 10001001 (89)
+	// \______
+	//        |
+	// 00000001 (01)
+	uint16x8_t high_bits = vreinterpretq_u16_u8(vshrq_n_u8(input, 7));
+
+	// Merge the even lanes together with a 16-bit unsigned shift right + add.
+	// 'xx' represents garbage data which will be ignored in the final result.
+	// In the important bytes, the add functions like a binary OR.
+	//
+	// 01 01 00 01 00 00 01 00
+	//  \_ |  \_ |  \_ |  \_ |   paired16 = (uint32x4_t)(input + (input >> 7))
+	//    \|    \|    \|    \|
+	// xx 03 xx 01 xx 00 xx 02
+	//
+	// 00000001 00000001 (01 01)
+	//        \_______ |
+	//                \|
+	// xxxxxxxx xxxxxx11 (xx 03)
+	uint32x4_t paired16 =
+		vreinterpretq_u32_u16(vsraq_n_u16(high_bits, high_bits, 7));
+
+	// Repeat with a wider 32-bit shift + add.
+	// xx 03 xx 01 xx 00 xx 02
+	//     \____ |     \____ |  paired32 = (uint64x1_t)(paired16 + (paired16 >>
+	//     14))
+	//          \|          \|
+	// xx xx xx 0d xx xx xx 02
+	//
+	// 00000011 00000001 (03 01)
+	//        \\_____ ||
+	//         '----.\||
+	// xxxxxxxx xxxx1101 (xx 0d)
+	uint64x2_t paired32 =
+		vreinterpretq_u64_u32(vsraq_n_u32(paired16, paired16, 14));
+
+	// Last, an even wider 64-bit shift + add to get our result in the low 8 bit
+	// lanes. xx xx xx 0d xx xx xx 02
+	//            \_________ |   paired64 = (uint8x8_t)(paired32 + (paired32 >>
+	//            28))
+	//                      \|
+	// xx xx xx xx xx xx xx d2
+	//
+	// 00001101 00000010 (0d 02)
+	//     \   \___ |  |
+	//      '---.  \|  |
+	// xxxxxxxx 11010010 (xx d2)
+	uint8x16_t paired64 =
+		vreinterpretq_u8_u64(vsraq_n_u64(paired32, paired32, 28));
+
+	// Extract the low 8 bits from each 64-bit lane with 2 8-bit extracts.
+	// xx xx xx xx xx xx xx d2
+	//                      ||  return paired64[0]
+	//                      d2
+	// Note: Little endian would return the correct value 4b (01001011) instead.
+	return vgetq_lane_u8(paired64, 0) |
+	       ((int)vgetq_lane_u8(paired64, 8) << 8);
+#endif
+}
+
+// NEON does not provide this method
+// Creates a 4-bit mask from the most significant bits of the four
+// single-precision, floating-point values.
+// https://msdn.microsoft.com/en-us/library/vstudio/4490ys29(v=vs.100).aspx
+FORCE_INLINE int _mm_movemask_ps(__m128 a)
+{
+	uint32x4_t input = vreinterpretq_u32_m128(a);
+#if defined(__aarch64__)
+	static const int32x4_t shift = {-31, -30, -29, -28};
+	static const uint32x4_t highbit = {0x80000000, 0x80000000, 0x80000000,
+					   0x80000000};
+	return vaddvq_u32(vshlq_u32(vandq_u32(input, highbit), shift));
+#else
+	// Uses the exact same method as _mm_movemask_epi8, see that for details.
+	// Shift out everything but the sign bits with a 32-bit unsigned shift
+	// right.
+	uint64x2_t high_bits = vreinterpretq_u64_u32(vshrq_n_u32(input, 31));
+	// Merge the two pairs together with a 64-bit unsigned shift right + add.
+	uint8x16_t paired =
+		vreinterpretq_u8_u64(vsraq_n_u64(high_bits, high_bits, 31));
+	// Extract the result.
+	return vgetq_lane_u8(paired, 0) | (vgetq_lane_u8(paired, 8) << 2);
+#endif
+}
+
+// Compute the bitwise AND of 128 bits (representing integer data) in a and
+// mask, and return 1 if the result is zero, otherwise return 0.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_test_all_zeros&expand=5871
+FORCE_INLINE int _mm_test_all_zeros(__m128i a, __m128i mask)
+{
+	int64x2_t a_and_mask = vandq_s64(vreinterpretq_s64_m128i(a),
+					 vreinterpretq_s64_m128i(mask));
+	return (vgetq_lane_s64(a_and_mask, 0) | vgetq_lane_s64(a_and_mask, 1))
+		       ? 0
+		       : 1;
+}
+
+/* Math operations */
+
+// Subtracts the four single-precision, floating-point values of a and b.
+//
+//   r0 := a0 - b0
+//   r1 := a1 - b1
+//   r2 := a2 - b2
+//   r3 := a3 - b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/1zad2k61(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_sub_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_f32(vsubq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Subtract 2 packed 64-bit integers in b from 2 packed 64-bit integers in a,
+// and store the results in dst.
+//    r0 := a0 - b0
+//    r1 := a1 - b1
+FORCE_INLINE __m128i _mm_sub_epi64(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s64(vsubq_s64(vreinterpretq_s64_m128i(a),
+						 vreinterpretq_s64_m128i(b)));
+}
+
+// Subtracts the 4 signed or unsigned 32-bit integers of b from the 4 signed or
+// unsigned 32-bit integers of a.
+//
+//   r0 := a0 - b0
+//   r1 := a1 - b1
+//   r2 := a2 - b2
+//   r3 := a3 - b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/fhh866h0(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_sub_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vsubq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+FORCE_INLINE __m128i _mm_sub_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vsubq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+FORCE_INLINE __m128i _mm_sub_epi8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s8(
+		vsubq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
+}
+
+// Subtracts the 8 unsigned 16-bit integers of bfrom the 8 unsigned 16-bit
+// integers of a and saturates..
+// https://technet.microsoft.com/en-us/subscriptions/index/f44y0s19(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_subs_epu16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u16(vqsubq_u16(vreinterpretq_u16_m128i(a),
+						  vreinterpretq_u16_m128i(b)));
+}
+
+// Subtracts the 16 unsigned 8-bit integers of b from the 16 unsigned 8-bit
+// integers of a and saturates.
+//
+//   r0 := UnsignedSaturate(a0 - b0)
+//   r1 := UnsignedSaturate(a1 - b1)
+//   ...
+//   r15 := UnsignedSaturate(a15 - b15)
+//
+// https://technet.microsoft.com/en-us/subscriptions/yadkxc18(v=vs.90)
+FORCE_INLINE __m128i _mm_subs_epu8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(vqsubq_u8(vreinterpretq_u8_m128i(a),
+						vreinterpretq_u8_m128i(b)));
+}
+
+// Subtracts the 16 signed 8-bit integers of b from the 16 signed 8-bit integers
+// of a and saturates.
+//
+//   r0 := SignedSaturate(a0 - b0)
+//   r1 := SignedSaturate(a1 - b1)
+//   ...
+//   r15 := SignedSaturate(a15 - b15)
+//
+// https://technet.microsoft.com/en-us/subscriptions/by7kzks1(v=vs.90)
+FORCE_INLINE __m128i _mm_subs_epi8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s8(vqsubq_s8(vreinterpretq_s8_m128i(a),
+						vreinterpretq_s8_m128i(b)));
+}
+
+// Subtracts the 8 signed 16-bit integers of b from the 8 signed 16-bit integers
+// of a and saturates.
+//
+//   r0 := SignedSaturate(a0 - b0)
+//   r1 := SignedSaturate(a1 - b1)
+//   ...
+//   r7 := SignedSaturate(a7 - b7)
+//
+// https://technet.microsoft.com/en-us/subscriptions/3247z5b8(v=vs.90)
+FORCE_INLINE __m128i _mm_subs_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vqsubq_s16(vreinterpretq_s16_m128i(a),
+						  vreinterpretq_s16_m128i(b)));
+}
+
+FORCE_INLINE __m128i _mm_adds_epu16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u16(vqaddq_u16(vreinterpretq_u16_m128i(a),
+						  vreinterpretq_u16_m128i(b)));
+}
+
+// Negate packed 8-bit integers in a when the corresponding signed
+// 8-bit integer in b is negative, and store the results in dst.
+// Element in dst are zeroed out when the corresponding element
+// in b is zero.
+//
+//   for i in 0..15
+//     if b[i] < 0
+//       r[i] := -a[i]
+//     else if b[i] == 0
+//       r[i] := 0
+//     else
+//       r[i] := a[i]
+//     fi
+//   done
+FORCE_INLINE __m128i _mm_sign_epi8(__m128i _a, __m128i _b)
+{
+	int8x16_t a = vreinterpretq_s8_m128i(_a);
+	int8x16_t b = vreinterpretq_s8_m128i(_b);
+
+	int8x16_t zero = vdupq_n_s8(0);
+	// signed shift right: faster than vclt
+	// (b < 0) ? 0xFF : 0
+	uint8x16_t ltMask = vreinterpretq_u8_s8(vshrq_n_s8(b, 7));
+	// (b == 0) ? 0xFF : 0
+	int8x16_t zeroMask = vreinterpretq_s8_u8(vceqq_s8(b, zero));
+	// -a
+	int8x16_t neg = vnegq_s8(a);
+	// bitwise select either a or neg based on ltMask
+	int8x16_t masked = vbslq_s8(ltMask, a, neg);
+	// res = masked & (~zeroMask)
+	int8x16_t res = vbicq_s8(masked, zeroMask);
+	return vreinterpretq_m128i_s8(res);
+}
+
+// Negate packed 16-bit integers in a when the corresponding signed
+// 16-bit integer in b is negative, and store the results in dst.
+// Element in dst are zeroed out when the corresponding element
+// in b is zero.
+//
+//   for i in 0..7
+//     if b[i] < 0
+//       r[i] := -a[i]
+//     else if b[i] == 0
+//       r[i] := 0
+//     else
+//       r[i] := a[i]
+//     fi
+//   done
+FORCE_INLINE __m128i _mm_sign_epi16(__m128i _a, __m128i _b)
+{
+	int16x8_t a = vreinterpretq_s16_m128i(_a);
+	int16x8_t b = vreinterpretq_s16_m128i(_b);
+
+	int16x8_t zero = vdupq_n_s16(0);
+	// signed shift right: faster than vclt
+	// (b < 0) ? 0xFFFF : 0
+	uint16x8_t ltMask = vreinterpretq_u16_s16(vshrq_n_s16(b, 15));
+	// (b == 0) ? 0xFFFF : 0
+	int16x8_t zeroMask = vreinterpretq_s16_u16(vceqq_s16(b, zero));
+	// -a
+	int16x8_t neg = vnegq_s16(a);
+	// bitwise select either a or neg based on ltMask
+	int16x8_t masked = vbslq_s16(ltMask, a, neg);
+	// res = masked & (~zeroMask)
+	int16x8_t res = vbicq_s16(masked, zeroMask);
+	return vreinterpretq_m128i_s16(res);
+}
+
+// Negate packed 32-bit integers in a when the corresponding signed
+// 32-bit integer in b is negative, and store the results in dst.
+// Element in dst are zeroed out when the corresponding element
+// in b is zero.
+//
+//   for i in 0..3
+//     if b[i] < 0
+//       r[i] := -a[i]
+//     else if b[i] == 0
+//       r[i] := 0
+//     else
+//       r[i] := a[i]
+//     fi
+//   done
+FORCE_INLINE __m128i _mm_sign_epi32(__m128i _a, __m128i _b)
+{
+	int32x4_t a = vreinterpretq_s32_m128i(_a);
+	int32x4_t b = vreinterpretq_s32_m128i(_b);
+
+	int32x4_t zero = vdupq_n_s32(0);
+	// signed shift right: faster than vclt
+	// (b < 0) ? 0xFFFFFFFF : 0
+	uint32x4_t ltMask = vreinterpretq_u32_s32(vshrq_n_s32(b, 31));
+	// (b == 0) ? 0xFFFFFFFF : 0
+	int32x4_t zeroMask = vreinterpretq_s32_u32(vceqq_s32(b, zero));
+	// neg = -a
+	int32x4_t neg = vnegq_s32(a);
+	// bitwise select either a or neg based on ltMask
+	int32x4_t masked = vbslq_s32(ltMask, a, neg);
+	// res = masked & (~zeroMask)
+	int32x4_t res = vbicq_s32(masked, zeroMask);
+	return vreinterpretq_m128i_s32(res);
+}
+
+// Computes the average of the 16 unsigned 8-bit integers in a and the 16
+// unsigned 8-bit integers in b and rounds.
+//
+//   r0 := (a0 + b0) / 2
+//   r1 := (a1 + b1) / 2
+//   ...
+//   r15 := (a15 + b15) / 2
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/8zwh554a(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_avg_epu8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(vrhaddq_u8(vreinterpretq_u8_m128i(a),
+						 vreinterpretq_u8_m128i(b)));
+}
+
+// Computes the average of the 8 unsigned 16-bit integers in a and the 8
+// unsigned 16-bit integers in b and rounds.
+//
+//   r0 := (a0 + b0) / 2
+//   r1 := (a1 + b1) / 2
+//   ...
+//   r7 := (a7 + b7) / 2
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/y13ca3c8(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_avg_epu16(__m128i a, __m128i b)
+{
+	return (__m128i)vrhaddq_u16(vreinterpretq_u16_m128i(a),
+				    vreinterpretq_u16_m128i(b));
+}
+
+// Adds the four single-precision, floating-point values of a and b.
+//
+//   r0 := a0 + b0
+//   r1 := a1 + b1
+//   r2 := a2 + b2
+//   r3 := a3 + b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/c9848chc(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_add_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_f32(vaddq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// adds the scalar single-precision floating point values of a and b.
+// https://msdn.microsoft.com/en-us/library/be94x2y6(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_add_ss(__m128 a, __m128 b)
+{
+	float32_t b0 = vgetq_lane_f32(vreinterpretq_f32_m128(b), 0);
+	float32x4_t value = vsetq_lane_f32(b0, vdupq_n_f32(0), 0);
+	// the upper values in the result must be the remnants of <a>.
+	return vreinterpretq_m128_f32(vaddq_f32(a, value));
+}
+
+// Adds the 4 signed or unsigned 64-bit integers in a to the 4 signed or
+// unsigned 32-bit integers in b.
+// https://msdn.microsoft.com/en-us/library/vstudio/09xs4fkk(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_add_epi64(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s64(vaddq_s64(vreinterpretq_s64_m128i(a),
+						 vreinterpretq_s64_m128i(b)));
+}
+
+// Adds the 4 signed or unsigned 32-bit integers in a to the 4 signed or
+// unsigned 32-bit integers in b.
+//
+//   r0 := a0 + b0
+//   r1 := a1 + b1
+//   r2 := a2 + b2
+//   r3 := a3 + b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/09xs4fkk(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_add_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vaddq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Adds the 8 signed or unsigned 16-bit integers in a to the 8 signed or
+// unsigned 16-bit integers in b.
+// https://msdn.microsoft.com/en-us/library/fceha5k4(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_add_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vaddq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// Adds the 16 signed or unsigned 8-bit integers in a to the 16 signed or
+// unsigned 8-bit integers in b.
+// https://technet.microsoft.com/en-us/subscriptions/yc7tcyzs(v=vs.90)
+FORCE_INLINE __m128i _mm_add_epi8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s8(
+		vaddq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
+}
+
+// Adds the 8 signed 16-bit integers in a to the 8 signed 16-bit integers in b
+// and saturates.
+//
+//   r0 := SignedSaturate(a0 + b0)
+//   r1 := SignedSaturate(a1 + b1)
+//   ...
+//   r7 := SignedSaturate(a7 + b7)
+//
+// https://msdn.microsoft.com/en-us/library/1a306ef8(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_adds_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vqaddq_s16(vreinterpretq_s16_m128i(a),
+						  vreinterpretq_s16_m128i(b)));
+}
+
+// Adds the 16 unsigned 8-bit integers in a to the 16 unsigned 8-bit integers in
+// b and saturates..
+// https://msdn.microsoft.com/en-us/library/9hahyddy(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_adds_epu8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(vqaddq_u8(vreinterpretq_u8_m128i(a),
+						vreinterpretq_u8_m128i(b)));
+}
+
+// Multiplies the 8 signed or unsigned 16-bit integers from a by the 8 signed or
+// unsigned 16-bit integers from b.
+//
+//   r0 := (a0 * b0)[15:0]
+//   r1 := (a1 * b1)[15:0]
+//   ...
+//   r7 := (a7 * b7)[15:0]
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/9ks1472s(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_mullo_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vmulq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// Multiplies the 4 signed or unsigned 32-bit integers from a by the 4 signed or
+// unsigned 32-bit integers from b.
+// https://msdn.microsoft.com/en-us/library/vstudio/bb531409(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_mullo_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vmulq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Multiplies the four single-precision, floating-point values of a and b.
+//
+//   r0 := a0 * b0
+//   r1 := a1 * b1
+//   r2 := a2 * b2
+//   r3 := a3 * b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/22kbk6t9(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_mul_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_f32(vmulq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Multiply the low unsigned 32-bit integers from each packed 64-bit element in
+// a and b, and store the unsigned 64-bit results in dst.
+//
+//   r0 :=  (a0 & 0xFFFFFFFF) * (b0 & 0xFFFFFFFF)
+//   r1 :=  (a2 & 0xFFFFFFFF) * (b2 & 0xFFFFFFFF)
+FORCE_INLINE __m128i _mm_mul_epu32(__m128i a, __m128i b)
+{
+	// vmull_u32 upcasts instead of masking, so we downcast.
+	uint32x2_t a_lo = vmovn_u64(vreinterpretq_u64_m128i(a));
+	uint32x2_t b_lo = vmovn_u64(vreinterpretq_u64_m128i(b));
+	return vreinterpretq_m128i_u64(vmull_u32(a_lo, b_lo));
+}
+
+// Multiply the low signed 32-bit integers from each packed 64-bit element in
+// a and b, and store the signed 64-bit results in dst.
+//
+//   r0 :=  (int64_t)(int32_t)a0 * (int64_t)(int32_t)b0
+//   r1 :=  (int64_t)(int32_t)a2 * (int64_t)(int32_t)b2
+FORCE_INLINE __m128i _mm_mul_epi32(__m128i a, __m128i b)
+{
+	// vmull_s32 upcasts instead of masking, so we downcast.
+	int32x2_t a_lo = vmovn_s64(vreinterpretq_s64_m128i(a));
+	int32x2_t b_lo = vmovn_s64(vreinterpretq_s64_m128i(b));
+	return vreinterpretq_m128i_s64(vmull_s32(a_lo, b_lo));
+}
+
+// Multiplies the 8 signed 16-bit integers from a by the 8 signed 16-bit
+// integers from b.
+//
+//   r0 := (a0 * b0) + (a1 * b1)
+//   r1 := (a2 * b2) + (a3 * b3)
+//   r2 := (a4 * b4) + (a5 * b5)
+//   r3 := (a6 * b6) + (a7 * b7)
+// https://msdn.microsoft.com/en-us/library/yht36sa6(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_madd_epi16(__m128i a, __m128i b)
+{
+	int32x4_t low = vmull_s16(vget_low_s16(vreinterpretq_s16_m128i(a)),
+				  vget_low_s16(vreinterpretq_s16_m128i(b)));
+	int32x4_t high = vmull_s16(vget_high_s16(vreinterpretq_s16_m128i(a)),
+				   vget_high_s16(vreinterpretq_s16_m128i(b)));
+
+	int32x2_t low_sum = vpadd_s32(vget_low_s32(low), vget_high_s32(low));
+	int32x2_t high_sum = vpadd_s32(vget_low_s32(high), vget_high_s32(high));
+
+	return vreinterpretq_m128i_s32(vcombine_s32(low_sum, high_sum));
+}
+
+// Multiply packed signed 16-bit integers in a and b, producing intermediate
+// signed 32-bit integers. Shift right by 15 bits while rounding up, and store
+// the packed 16-bit integers in dst.
+//
+//   r0 := Round(((int32_t)a0 * (int32_t)b0) >> 15)
+//   r1 := Round(((int32_t)a1 * (int32_t)b1) >> 15)
+//   r2 := Round(((int32_t)a2 * (int32_t)b2) >> 15)
+//   ...
+//   r7 := Round(((int32_t)a7 * (int32_t)b7) >> 15)
+FORCE_INLINE __m128i _mm_mulhrs_epi16(__m128i a, __m128i b)
+{
+	// Has issues due to saturation
+	// return vreinterpretq_m128i_s16(vqrdmulhq_s16(a, b));
+
+	// Multiply
+	int32x4_t mul_lo = vmull_s16(vget_low_s16(vreinterpretq_s16_m128i(a)),
+				     vget_low_s16(vreinterpretq_s16_m128i(b)));
+	int32x4_t mul_hi = vmull_s16(vget_high_s16(vreinterpretq_s16_m128i(a)),
+				     vget_high_s16(vreinterpretq_s16_m128i(b)));
+
+	// Rounding narrowing shift right
+	// narrow = (int16_t)((mul + 16384) >> 15);
+	int16x4_t narrow_lo = vrshrn_n_s32(mul_lo, 15);
+	int16x4_t narrow_hi = vrshrn_n_s32(mul_hi, 15);
+
+	// Join together
+	return vreinterpretq_m128i_s16(vcombine_s16(narrow_lo, narrow_hi));
+}
+
+// Vertically multiply each unsigned 8-bit integer from a with the corresponding
+// signed 8-bit integer from b, producing intermediate signed 16-bit integers.
+// Horizontally add adjacent pairs of intermediate signed 16-bit integers,
+// and pack the saturated results in dst.
+//
+//   FOR j := 0 to 7
+//      i := j*16
+//      dst[i+15:i] := Saturate_To_Int16( a[i+15:i+8]*b[i+15:i+8] +
+//      a[i+7:i]*b[i+7:i] )
+//   ENDFOR
+FORCE_INLINE __m128i _mm_maddubs_epi16(__m128i _a, __m128i _b)
+{
+	// This would be much simpler if x86 would choose to zero extend OR sign
+	// extend, not both. This could probably be optimized better.
+	uint16x8_t a = vreinterpretq_u16_m128i(_a);
+	int16x8_t b = vreinterpretq_s16_m128i(_b);
+
+	// Zero extend a
+	int16x8_t a_odd = vreinterpretq_s16_u16(vshrq_n_u16(a, 8));
+	int16x8_t a_even =
+		vreinterpretq_s16_u16(vbicq_u16(a, vdupq_n_u16(0xff00)));
+
+	// Sign extend by shifting left then shifting right.
+	int16x8_t b_even = vshrq_n_s16(vshlq_n_s16(b, 8), 8);
+	int16x8_t b_odd = vshrq_n_s16(b, 8);
+
+	// multiply
+	int16x8_t prod1 = vmulq_s16(a_even, b_even);
+	int16x8_t prod2 = vmulq_s16(a_odd, b_odd);
+
+	// saturated add
+	return vreinterpretq_m128i_s16(vqaddq_s16(prod1, prod2));
+}
+
+// Computes the absolute difference of the 16 unsigned 8-bit integers from a
+// and the 16 unsigned 8-bit integers from b.
+//
+// Return Value
+// Sums the upper 8 differences and lower 8 differences and packs the
+// resulting 2 unsigned 16-bit integers into the upper and lower 64-bit
+// elements.
+//
+//   r0 := abs(a0 - b0) + abs(a1 - b1) +...+ abs(a7 - b7)
+//   r1 := 0x0
+//   r2 := 0x0
+//   r3 := 0x0
+//   r4 := abs(a8 - b8) + abs(a9 - b9) +...+ abs(a15 - b15)
+//   r5 := 0x0
+//   r6 := 0x0
+//   r7 := 0x0
+FORCE_INLINE __m128i _mm_sad_epu8(__m128i a, __m128i b)
+{
+	uint16x8_t t = vpaddlq_u8(vabdq_u8((uint8x16_t)a, (uint8x16_t)b));
+	uint16_t r0 = t[0] + t[1] + t[2] + t[3];
+	uint16_t r4 = t[4] + t[5] + t[6] + t[7];
+	uint16x8_t r = vsetq_lane_u16(r0, vdupq_n_u16(0), 0);
+	return (__m128i)vsetq_lane_u16(r4, r, 4);
+}
+
+// Divides the four single-precision, floating-point values of a and b.
+//
+//   r0 := a0 / b0
+//   r1 := a1 / b1
+//   r2 := a2 / b2
+//   r3 := a3 / b3
+//
+// https://msdn.microsoft.com/en-us/library/edaw8147(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_div_ps(__m128 a, __m128 b)
+{
+	float32x4_t recip0 = vrecpeq_f32(vreinterpretq_f32_m128(b));
+	float32x4_t recip1 = vmulq_f32(
+		recip0, vrecpsq_f32(recip0, vreinterpretq_f32_m128(b)));
+	return vreinterpretq_m128_f32(
+		vmulq_f32(vreinterpretq_f32_m128(a), recip1));
+}
+
+// Divides the scalar single-precision floating point value of a by b.
+// https://msdn.microsoft.com/en-us/library/4y73xa49(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_div_ss(__m128 a, __m128 b)
+{
+	float32_t value =
+		vgetq_lane_f32(vreinterpretq_f32_m128(_mm_div_ps(a, b)), 0);
+	return vreinterpretq_m128_f32(
+		vsetq_lane_f32(value, vreinterpretq_f32_m128(a), 0));
+}
+
+// Computes the approximations of reciprocals of the four single-precision,
+// floating-point values of a.
+// https://msdn.microsoft.com/en-us/library/vstudio/796k1tty(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_rcp_ps(__m128 in)
+{
+	float32x4_t recip = vrecpeq_f32(vreinterpretq_f32_m128(in));
+	recip = vmulq_f32(recip,
+			  vrecpsq_f32(recip, vreinterpretq_f32_m128(in)));
+	return vreinterpretq_m128_f32(recip);
+}
+
+// Computes the approximations of square roots of the four single-precision,
+// floating-point values of a. First computes reciprocal square roots and then
+// reciprocals of the four values.
+//
+//   r0 := sqrt(a0)
+//   r1 := sqrt(a1)
+//   r2 := sqrt(a2)
+//   r3 := sqrt(a3)
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/8z67bwwk(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_sqrt_ps(__m128 in)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128_f32(vsqrtq_f32(vreinterpretq_f32_m128(in)));
+#else
+	float32x4_t recipsq = vrsqrteq_f32(vreinterpretq_f32_m128(in));
+	float32x4_t sq = vrecpeq_f32(recipsq);
+	// ??? use step versions of both sqrt and recip for better accuracy?
+	return vreinterpretq_m128_f32(sq);
+#endif
+}
+
+// Computes the approximation of the square root of the scalar single-precision
+// floating point value of in.
+// https://msdn.microsoft.com/en-us/library/ahfsc22d(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_sqrt_ss(__m128 in)
+{
+	float32_t value =
+		vgetq_lane_f32(vreinterpretq_f32_m128(_mm_sqrt_ps(in)), 0);
+	return vreinterpretq_m128_f32(
+		vsetq_lane_f32(value, vreinterpretq_f32_m128(in), 0));
+}
+
+// Computes the approximations of the reciprocal square roots of the four
+// single-precision floating point values of in.
+// https://msdn.microsoft.com/en-us/library/22hfsh53(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_rsqrt_ps(__m128 in)
+{
+	return vreinterpretq_m128_f32(vrsqrteq_f32(vreinterpretq_f32_m128(in)));
+}
+
+// Compute the approximate reciprocal square root of the lower single-precision
+// (32-bit) floating-point element in a, store the result in the lower element
+// of dst, and copy the upper 3 packed elements from a to the upper elements of
+// dst.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_rsqrt_ss
+FORCE_INLINE __m128 _mm_rsqrt_ss(__m128 in)
+{
+	return vsetq_lane_f32(vgetq_lane_f32(_mm_rsqrt_ps(in), 0), in, 0);
+}
+
+// Computes the maximums of the four single-precision, floating-point values of
+// a and b.
+// https://msdn.microsoft.com/en-us/library/vstudio/ff5d607a(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_max_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_f32(vmaxq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Computes the minima of the four single-precision, floating-point values of a
+// and b.
+// https://msdn.microsoft.com/en-us/library/vstudio/wh13kadz(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_min_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_f32(vminq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Computes the maximum of the two lower scalar single-precision floating point
+// values of a and b.
+// https://msdn.microsoft.com/en-us/library/s6db5esz(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_max_ss(__m128 a, __m128 b)
+{
+	float32_t value = vgetq_lane_f32(vmaxq_f32(vreinterpretq_f32_m128(a),
+						   vreinterpretq_f32_m128(b)),
+					 0);
+	return vreinterpretq_m128_f32(
+		vsetq_lane_f32(value, vreinterpretq_f32_m128(a), 0));
+}
+
+// Computes the minimum of the two lower scalar single-precision floating point
+// values of a and b.
+// https://msdn.microsoft.com/en-us/library/0a9y7xaa(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_min_ss(__m128 a, __m128 b)
+{
+	float32_t value = vgetq_lane_f32(vminq_f32(vreinterpretq_f32_m128(a),
+						   vreinterpretq_f32_m128(b)),
+					 0);
+	return vreinterpretq_m128_f32(
+		vsetq_lane_f32(value, vreinterpretq_f32_m128(a), 0));
+}
+
+// Computes the pairwise maxima of the 16 unsigned 8-bit integers from a and the
+// 16 unsigned 8-bit integers from b.
+// https://msdn.microsoft.com/en-us/library/st6634za(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_max_epu8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vmaxq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
+}
+
+// Computes the pairwise minima of the 16 unsigned 8-bit integers from a and the
+// 16 unsigned 8-bit integers from b.
+// https://msdn.microsoft.com/ko-kr/library/17k8cf58(v=vs.100).aspxx
+FORCE_INLINE __m128i _mm_min_epu8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vminq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
+}
+
+// Computes the pairwise minima of the 8 signed 16-bit integers from a and the 8
+// signed 16-bit integers from b.
+// https://msdn.microsoft.com/en-us/library/vstudio/6te997ew(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_min_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vminq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// Computes the pairwise maxima of the 8 signed 16-bit integers from a and the 8
+// signed 16-bit integers from b.
+// https://msdn.microsoft.com/en-us/LIBRary/3x060h7c(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_max_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(vmaxq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// epi versions of min/max
+// Computes the pariwise maximums of the four signed 32-bit integer values of a
+// and b.
+//
+// A 128-bit parameter that can be defined with the following equations:
+//   r0 := (a0 > b0) ? a0 : b0
+//   r1 := (a1 > b1) ? a1 : b1
+//   r2 := (a2 > b2) ? a2 : b2
+//   r3 := (a3 > b3) ? a3 : b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/bb514055(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_max_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vmaxq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Computes the pariwise minima of the four signed 32-bit integer values of a
+// and b.
+//
+// A 128-bit parameter that can be defined with the following equations:
+//   r0 := (a0 < b0) ? a0 : b0
+//   r1 := (a1 < b1) ? a1 : b1
+//   r2 := (a2 < b2) ? a2 : b2
+//   r3 := (a3 < b3) ? a3 : b3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/bb531476(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_min_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s32(vminq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Multiplies the 8 signed 16-bit integers from a by the 8 signed 16-bit
+// integers from b.
+//
+//   r0 := (a0 * b0)[31:16]
+//   r1 := (a1 * b1)[31:16]
+//   ...
+//   r7 := (a7 * b7)[31:16]
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/59hddw1d(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_mulhi_epi16(__m128i a, __m128i b)
+{
+	/* FIXME: issue with large values because of result saturation */
+	// int16x8_t ret = vqdmulhq_s16(vreinterpretq_s16_m128i(a),
+	// vreinterpretq_s16_m128i(b)); /* =2*a*b */ return
+	// vreinterpretq_m128i_s16(vshrq_n_s16(ret, 1));
+	int16x4_t a3210 = vget_low_s16(vreinterpretq_s16_m128i(a));
+	int16x4_t b3210 = vget_low_s16(vreinterpretq_s16_m128i(b));
+	int32x4_t ab3210 = vmull_s16(a3210, b3210); /* 3333222211110000 */
+	int16x4_t a7654 = vget_high_s16(vreinterpretq_s16_m128i(a));
+	int16x4_t b7654 = vget_high_s16(vreinterpretq_s16_m128i(b));
+	int32x4_t ab7654 = vmull_s16(a7654, b7654); /* 7777666655554444 */
+	uint16x8x2_t r = vuzpq_u16(vreinterpretq_u16_s32(ab3210),
+				   vreinterpretq_u16_s32(ab7654));
+	return vreinterpretq_m128i_u16(r.val[1]);
+}
+
+// Computes pairwise add of each argument as single-precision, floating-point
+// values a and b.
+// https://msdn.microsoft.com/en-us/library/yd9wecaa.aspx
+FORCE_INLINE __m128 _mm_hadd_ps(__m128 a, __m128 b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128_f32(vpaddq_f32(vreinterpretq_f32_m128(a),
+						 vreinterpretq_f32_m128(b)));
+#else
+	float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
+	float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(a));
+	float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
+	float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_f32(
+		vcombine_f32(vpadd_f32(a10, a32), vpadd_f32(b10, b32)));
+#endif
+}
+
+// Computes pairwise add of each argument as a 16-bit signed or unsigned integer
+// values a and b.
+FORCE_INLINE __m128i _mm_hadd_epi16(__m128i _a, __m128i _b)
+{
+	int16x8_t a = vreinterpretq_s16_m128i(_a);
+	int16x8_t b = vreinterpretq_s16_m128i(_b);
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s16(vpaddq_s16(a, b));
+#else
+	return vreinterpretq_m128i_s16(
+		vcombine_s16(vpadd_s16(vget_low_s16(a), vget_high_s16(a)),
+			     vpadd_s16(vget_low_s16(b), vget_high_s16(b))));
+#endif
+}
+
+// Computes pairwise difference of each argument as a 16-bit signed or unsigned
+// integer values a and b.
+FORCE_INLINE __m128i _mm_hsub_epi16(__m128i _a, __m128i _b)
+{
+	int32x4_t a = vreinterpretq_s32_m128i(_a);
+	int32x4_t b = vreinterpretq_s32_m128i(_b);
+	// Interleave using vshrn/vmovn
+	// [a0|a2|a4|a6|b0|b2|b4|b6]
+	// [a1|a3|a5|a7|b1|b3|b5|b7]
+	int16x8_t ab0246 = vcombine_s16(vmovn_s32(a), vmovn_s32(b));
+	int16x8_t ab1357 = vcombine_s16(vshrn_n_s32(a, 16), vshrn_n_s32(b, 16));
+	// Subtract
+	return vreinterpretq_m128i_s16(vsubq_s16(ab0246, ab1357));
+}
+
+// Computes saturated pairwise sub of each argument as a 16-bit signed
+// integer values a and b.
+FORCE_INLINE __m128i _mm_hadds_epi16(__m128i _a, __m128i _b)
+{
+	int32x4_t a = vreinterpretq_s32_m128i(_a);
+	int32x4_t b = vreinterpretq_s32_m128i(_b);
+	// Interleave using vshrn/vmovn
+	// [a0|a2|a4|a6|b0|b2|b4|b6]
+	// [a1|a3|a5|a7|b1|b3|b5|b7]
+	int16x8_t ab0246 = vcombine_s16(vmovn_s32(a), vmovn_s32(b));
+	int16x8_t ab1357 = vcombine_s16(vshrn_n_s32(a, 16), vshrn_n_s32(b, 16));
+	// Saturated add
+	return vreinterpretq_m128i_s16(vqaddq_s16(ab0246, ab1357));
+}
+
+// Computes saturated pairwise difference of each argument as a 16-bit signed
+// integer values a and b.
+FORCE_INLINE __m128i _mm_hsubs_epi16(__m128i _a, __m128i _b)
+{
+	int32x4_t a = vreinterpretq_s32_m128i(_a);
+	int32x4_t b = vreinterpretq_s32_m128i(_b);
+	// Interleave using vshrn/vmovn
+	// [a0|a2|a4|a6|b0|b2|b4|b6]
+	// [a1|a3|a5|a7|b1|b3|b5|b7]
+	int16x8_t ab0246 = vcombine_s16(vmovn_s32(a), vmovn_s32(b));
+	int16x8_t ab1357 = vcombine_s16(vshrn_n_s32(a, 16), vshrn_n_s32(b, 16));
+	// Saturated subtract
+	return vreinterpretq_m128i_s16(vqsubq_s16(ab0246, ab1357));
+}
+
+// Computes pairwise add of each argument as a 32-bit signed or unsigned integer
+// values a and b.
+FORCE_INLINE __m128i _mm_hadd_epi32(__m128i _a, __m128i _b)
+{
+	int32x4_t a = vreinterpretq_s32_m128i(_a);
+	int32x4_t b = vreinterpretq_s32_m128i(_b);
+	return vreinterpretq_m128i_s32(
+		vcombine_s32(vpadd_s32(vget_low_s32(a), vget_high_s32(a)),
+			     vpadd_s32(vget_low_s32(b), vget_high_s32(b))));
+}
+
+// Computes pairwise difference of each argument as a 32-bit signed or unsigned
+// integer values a and b.
+FORCE_INLINE __m128i _mm_hsub_epi32(__m128i _a, __m128i _b)
+{
+	int64x2_t a = vreinterpretq_s64_m128i(_a);
+	int64x2_t b = vreinterpretq_s64_m128i(_b);
+	// Interleave using vshrn/vmovn
+	// [a0|a2|b0|b2]
+	// [a1|a2|b1|b3]
+	int32x4_t ab02 = vcombine_s32(vmovn_s64(a), vmovn_s64(b));
+	int32x4_t ab13 = vcombine_s32(vshrn_n_s64(a, 32), vshrn_n_s64(b, 32));
+	// Subtract
+	return vreinterpretq_m128i_s32(vsubq_s32(ab02, ab13));
+}
+
+/* Compare operations */
+
+// Compares for less than
+// https://msdn.microsoft.com/en-us/library/vstudio/f330yhc8(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cmplt_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_u32(vcltq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Compares for greater than.
+//
+//   r0 := (a0 > b0) ? 0xffffffff : 0x0
+//   r1 := (a1 > b1) ? 0xffffffff : 0x0
+//   r2 := (a2 > b2) ? 0xffffffff : 0x0
+//   r3 := (a3 > b3) ? 0xffffffff : 0x0
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/11dy102s(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cmpgt_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_u32(vcgtq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Compares for greater than or equal.
+// https://msdn.microsoft.com/en-us/library/vstudio/fs813y2t(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cmpge_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_u32(vcgeq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Compares for less than or equal.
+//
+//   r0 := (a0 <= b0) ? 0xffffffff : 0x0
+//   r1 := (a1 <= b1) ? 0xffffffff : 0x0
+//   r2 := (a2 <= b2) ? 0xffffffff : 0x0
+//   r3 := (a3 <= b3) ? 0xffffffff : 0x0
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/1s75w83z(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cmple_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_u32(vcleq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Compares for equality.
+// https://msdn.microsoft.com/en-us/library/vstudio/36aectz5(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cmpeq_ps(__m128 a, __m128 b)
+{
+	return vreinterpretq_m128_u32(vceqq_f32(vreinterpretq_f32_m128(a),
+						vreinterpretq_f32_m128(b)));
+}
+
+// Compares the 16 signed or unsigned 8-bit integers in a and the 16 signed or
+// unsigned 8-bit integers in b for equality.
+// https://msdn.microsoft.com/en-us/library/windows/desktop/bz5xk21a(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_cmpeq_epi8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vceqq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
+}
+
+// Compares the 8 signed or unsigned 16-bit integers in a and the 8 signed or
+// unsigned 16-bit integers in b for equality.
+// https://msdn.microsoft.com/en-us/library/2ay060te(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cmpeq_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u16(vceqq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// Compare packed 32-bit integers in a and b for equality, and store the results
+// in dst
+FORCE_INLINE __m128i _mm_cmpeq_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u32(vceqq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Compare packed 64-bit integers in a and b for equality, and store the results
+// in dst
+FORCE_INLINE __m128i _mm_cmpeq_epi64(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_u64(vceqq_u64(vreinterpretq_u64_m128i(a),
+						 vreinterpretq_u64_m128i(b)));
+#else
+	// ARMv7 lacks vceqq_u64
+	// (a == b) -> (a_lo == b_lo) && (a_hi == b_hi)
+	uint32x4_t cmp = vceqq_u32(vreinterpretq_u32_m128i(a),
+				   vreinterpretq_u32_m128i(b));
+	uint32x4_t swapped = vrev64q_u32(cmp);
+	return vreinterpretq_m128i_u32(vandq_u32(cmp, swapped));
+#endif
+}
+
+// Compares the 16 signed 8-bit integers in a and the 16 signed 8-bit integers
+// in b for lesser than.
+// https://msdn.microsoft.com/en-us/library/windows/desktop/9s46csht(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_cmplt_epi8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vcltq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
+}
+
+// Compares the 16 signed 8-bit integers in a and the 16 signed 8-bit integers
+// in b for greater than.
+//
+//   r0 := (a0 > b0) ? 0xff : 0x0
+//   r1 := (a1 > b1) ? 0xff : 0x0
+//   ...
+//   r15 := (a15 > b15) ? 0xff : 0x0
+//
+// https://msdn.microsoft.com/zh-tw/library/wf45zt2b(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cmpgt_epi8(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vcgtq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
+}
+
+// Compares the 8 signed 16-bit integers in a and the 8 signed 16-bit integers
+// in b for less than.
+//
+//   r0 := (a0 < b0) ? 0xffff : 0x0
+//   r1 := (a1 < b1) ? 0xffff : 0x0
+//   ...
+//   r7 := (a7 < b7) ? 0xffff : 0x0
+//
+// https://technet.microsoft.com/en-us/library/t863edb2(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cmplt_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u16(vcltq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// Compares the 8 signed 16-bit integers in a and the 8 signed 16-bit integers
+// in b for greater than.
+//
+//   r0 := (a0 > b0) ? 0xffff : 0x0
+//   r1 := (a1 > b1) ? 0xffff : 0x0
+//   ...
+//   r7 := (a7 > b7) ? 0xffff : 0x0
+//
+// https://technet.microsoft.com/en-us/library/xd43yfsa(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cmpgt_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u16(vcgtq_s16(vreinterpretq_s16_m128i(a),
+						 vreinterpretq_s16_m128i(b)));
+}
+
+// Compares the 4 signed 32-bit integers in a and the 4 signed 32-bit integers
+// in b for less than.
+// https://msdn.microsoft.com/en-us/library/vstudio/4ak0bf5d(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cmplt_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u32(vcltq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Compares the 4 signed 32-bit integers in a and the 4 signed 32-bit integers
+// in b for greater than.
+// https://msdn.microsoft.com/en-us/library/vstudio/1s9f2z0y(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cmpgt_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u32(vcgtq_s32(vreinterpretq_s32_m128i(a),
+						 vreinterpretq_s32_m128i(b)));
+}
+
+// Compares the 2 signed 64-bit integers in a and the 2 signed 64-bit integers
+// in b for greater than.
+FORCE_INLINE __m128i _mm_cmpgt_epi64(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_u64(vcgtq_s64(vreinterpretq_s64_m128i(a),
+						 vreinterpretq_s64_m128i(b)));
+#else
+	// ARMv7 lacks vcgtq_s64.
+	// This is based off of Clang's SSE2 polyfill:
+	// (a > b) -> ((a_hi > b_hi) || (a_lo > b_lo && a_hi == b_hi))
+
+	// Mask the sign bit out since we need a signed AND an unsigned comparison
+	// and it is ugly to try and split them.
+	int32x4_t mask = vreinterpretq_s32_s64(vdupq_n_s64(0x80000000ull));
+	int32x4_t a_mask = veorq_s32(vreinterpretq_s32_m128i(a), mask);
+	int32x4_t b_mask = veorq_s32(vreinterpretq_s32_m128i(b), mask);
+	// Check if a > b
+	int64x2_t greater = vreinterpretq_s64_u32(vcgtq_s32(a_mask, b_mask));
+	// Copy upper mask to lower mask
+	// a_hi > b_hi
+	int64x2_t gt_hi = vshrq_n_s64(greater, 63);
+	// Copy lower mask to upper mask
+	// a_lo > b_lo
+	int64x2_t gt_lo = vsliq_n_s64(greater, greater, 32);
+	// Compare for equality
+	int64x2_t equal = vreinterpretq_s64_u32(vceqq_s32(a_mask, b_mask));
+	// Copy upper mask to lower mask
+	// a_hi == b_hi
+	int64x2_t eq_hi = vshrq_n_s64(equal, 63);
+	// a_hi > b_hi || (a_lo > b_lo && a_hi == b_hi)
+	int64x2_t ret = vorrq_s64(gt_hi, vandq_s64(gt_lo, eq_hi));
+	return vreinterpretq_m128i_s64(ret);
+#endif
+}
+
+// Compares the four 32-bit floats in a and b to check if any values are NaN.
+// Ordered compare between each value returns true for "orderable" and false for
+// "not orderable" (NaN).
+// https://msdn.microsoft.com/en-us/library/vstudio/0h9w00fx(v=vs.100).aspx see
+// also:
+// http://stackoverflow.com/questions/8627331/what-does-ordered-unordered-comparison-mean
+// http://stackoverflow.com/questions/29349621/neon-isnanval-intrinsics
+FORCE_INLINE __m128 _mm_cmpord_ps(__m128 a, __m128 b)
+{
+	// Note: NEON does not have ordered compare builtin
+	// Need to compare a eq a and b eq b to check for NaN
+	// Do AND of results to get final
+	uint32x4_t ceqaa =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t ceqbb =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	return vreinterpretq_m128_u32(vandq_u32(ceqaa, ceqbb));
+}
+
+// Compares the lower single-precision floating point scalar values of a and b
+// using a less than operation. :
+// https://msdn.microsoft.com/en-us/library/2kwe606b(v=vs.90).aspx Important
+// note!! The documentation on MSDN is incorrect!  If either of the values is a
+// NAN the docs say you will get a one, but in fact, it will return a zero!!
+FORCE_INLINE int _mm_comilt_ss(__m128 a, __m128 b)
+{
+	uint32x4_t a_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t b_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
+	uint32x4_t a_lt_b =
+		vcltq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
+	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_lt_b), 0) != 0) ? 1
+									    : 0;
+}
+
+// Compares the lower single-precision floating point scalar values of a and b
+// using a greater than operation. :
+// https://msdn.microsoft.com/en-us/library/b0738e0t(v=vs.100).aspx
+FORCE_INLINE int _mm_comigt_ss(__m128 a, __m128 b)
+{
+	// return vgetq_lane_u32(vcgtq_f32(vreinterpretq_f32_m128(a),
+	// vreinterpretq_f32_m128(b)), 0);
+	uint32x4_t a_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t b_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
+	uint32x4_t a_gt_b =
+		vcgtq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
+	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_gt_b), 0) != 0) ? 1
+									    : 0;
+}
+
+// Compares the lower single-precision floating point scalar values of a and b
+// using a less than or equal operation. :
+// https://msdn.microsoft.com/en-us/library/1w4t7c57(v=vs.90).aspx
+FORCE_INLINE int _mm_comile_ss(__m128 a, __m128 b)
+{
+	// return vgetq_lane_u32(vcleq_f32(vreinterpretq_f32_m128(a),
+	// vreinterpretq_f32_m128(b)), 0);
+	uint32x4_t a_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t b_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
+	uint32x4_t a_le_b =
+		vcleq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
+	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_le_b), 0) != 0) ? 1
+									    : 0;
+}
+
+// Compares the lower single-precision floating point scalar values of a and b
+// using a greater than or equal operation. :
+// https://msdn.microsoft.com/en-us/library/8t80des6(v=vs.100).aspx
+FORCE_INLINE int _mm_comige_ss(__m128 a, __m128 b)
+{
+	// return vgetq_lane_u32(vcgeq_f32(vreinterpretq_f32_m128(a),
+	// vreinterpretq_f32_m128(b)), 0);
+	uint32x4_t a_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t b_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
+	uint32x4_t a_ge_b =
+		vcgeq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
+	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_ge_b), 0) != 0) ? 1
+									    : 0;
+}
+
+// Compares the lower single-precision floating point scalar values of a and b
+// using an equality operation. :
+// https://msdn.microsoft.com/en-us/library/93yx2h2b(v=vs.100).aspx
+FORCE_INLINE int _mm_comieq_ss(__m128 a, __m128 b)
+{
+	// return vgetq_lane_u32(vceqq_f32(vreinterpretq_f32_m128(a),
+	// vreinterpretq_f32_m128(b)), 0);
+	uint32x4_t a_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t b_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
+	uint32x4_t a_eq_b =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
+	return (vgetq_lane_u32(vandq_u32(a_and_b_not_nan, a_eq_b), 0) != 0) ? 1
+									    : 0;
+}
+
+// Compares the lower single-precision floating point scalar values of a and b
+// using an inequality operation. :
+// https://msdn.microsoft.com/en-us/library/bafh5e0a(v=vs.90).aspx
+FORCE_INLINE int _mm_comineq_ss(__m128 a, __m128 b)
+{
+	// return !vgetq_lane_u32(vceqq_f32(vreinterpretq_f32_m128(a),
+	// vreinterpretq_f32_m128(b)), 0);
+	uint32x4_t a_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
+	uint32x4_t b_not_nan =
+		vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
+	uint32x4_t a_or_b_nan = vmvnq_u32(vandq_u32(a_not_nan, b_not_nan));
+	uint32x4_t a_neq_b = vmvnq_u32(vceqq_f32(vreinterpretq_f32_m128(a),
+						 vreinterpretq_f32_m128(b)));
+	return (vgetq_lane_u32(vorrq_u32(a_or_b_nan, a_neq_b), 0) != 0) ? 1 : 0;
+}
+
+// according to the documentation, these intrinsics behave the same as the
+// non-'u' versions.  We'll just alias them here.
+#define _mm_ucomilt_ss _mm_comilt_ss
+#define _mm_ucomile_ss _mm_comile_ss
+#define _mm_ucomigt_ss _mm_comigt_ss
+#define _mm_ucomige_ss _mm_comige_ss
+#define _mm_ucomieq_ss _mm_comieq_ss
+#define _mm_ucomineq_ss _mm_comineq_ss
+
+/* Conversions */
+
+// Converts the four single-precision, floating-point values of a to signed
+// 32-bit integer values using truncate.
+// https://msdn.microsoft.com/en-us/library/vstudio/1h005y6x(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_cvttps_epi32(__m128 a)
+{
+	return vreinterpretq_m128i_s32(
+		vcvtq_s32_f32(vreinterpretq_f32_m128(a)));
+}
+
+// Converts the four signed 32-bit integer values of a to single-precision,
+// floating-point values
+// https://msdn.microsoft.com/en-us/library/vstudio/36bwxcx5(v=vs.100).aspx
+FORCE_INLINE __m128 _mm_cvtepi32_ps(__m128i a)
+{
+	return vreinterpretq_m128_f32(
+		vcvtq_f32_s32(vreinterpretq_s32_m128i(a)));
+}
+
+// Converts the four unsigned 8-bit integers in the lower 16 bits to four
+// unsigned 32-bit integers.
+FORCE_INLINE __m128i _mm_cvtepu8_epi16(__m128i a)
+{
+	uint8x16_t u8x16 = vreinterpretq_u8_m128i(a); /* xxxx xxxx xxxx DCBA */
+	uint16x8_t u16x8 =
+		vmovl_u8(vget_low_u8(u8x16)); /* 0x0x 0x0x 0D0C 0B0A */
+	return vreinterpretq_m128i_u16(u16x8);
+}
+
+// Converts the four unsigned 8-bit integers in the lower 32 bits to four
+// unsigned 32-bit integers.
+// https://msdn.microsoft.com/en-us/library/bb531467%28v=vs.100%29.aspx
+FORCE_INLINE __m128i _mm_cvtepu8_epi32(__m128i a)
+{
+	uint8x16_t u8x16 = vreinterpretq_u8_m128i(a); /* xxxx xxxx xxxx DCBA */
+	uint16x8_t u16x8 =
+		vmovl_u8(vget_low_u8(u8x16)); /* 0x0x 0x0x 0D0C 0B0A */
+	uint32x4_t u32x4 =
+		vmovl_u16(vget_low_u16(u16x8)); /* 000D 000C 000B 000A */
+	return vreinterpretq_m128i_u32(u32x4);
+}
+
+// Converts the two unsigned 8-bit integers in the lower 16 bits to two
+// unsigned 64-bit integers.
+FORCE_INLINE __m128i _mm_cvtepu8_epi64(__m128i a)
+{
+	uint8x16_t u8x16 = vreinterpretq_u8_m128i(a); /* xxxx xxxx xxxx xxBA */
+	uint16x8_t u16x8 =
+		vmovl_u8(vget_low_u8(u8x16)); /* 0x0x 0x0x 0x0x 0B0A */
+	uint32x4_t u32x4 =
+		vmovl_u16(vget_low_u16(u16x8)); /* 000x 000x 000B 000A */
+	uint64x2_t u64x2 =
+		vmovl_u32(vget_low_u32(u32x4)); /* 0000 000B 0000 000A */
+	return vreinterpretq_m128i_u64(u64x2);
+}
+
+// Converts the four unsigned 8-bit integers in the lower 16 bits to four
+// unsigned 32-bit integers.
+FORCE_INLINE __m128i _mm_cvtepi8_epi16(__m128i a)
+{
+	int8x16_t s8x16 = vreinterpretq_s8_m128i(a); /* xxxx xxxx xxxx DCBA */
+	int16x8_t s16x8 =
+		vmovl_s8(vget_low_s8(s8x16)); /* 0x0x 0x0x 0D0C 0B0A */
+	return vreinterpretq_m128i_s16(s16x8);
+}
+
+// Converts the four unsigned 8-bit integers in the lower 32 bits to four
+// unsigned 32-bit integers.
+FORCE_INLINE __m128i _mm_cvtepi8_epi32(__m128i a)
+{
+	int8x16_t s8x16 = vreinterpretq_s8_m128i(a); /* xxxx xxxx xxxx DCBA */
+	int16x8_t s16x8 =
+		vmovl_s8(vget_low_s8(s8x16)); /* 0x0x 0x0x 0D0C 0B0A */
+	int32x4_t s32x4 =
+		vmovl_s16(vget_low_s16(s16x8)); /* 000D 000C 000B 000A */
+	return vreinterpretq_m128i_s32(s32x4);
+}
+
+// Converts the two signed 8-bit integers in the lower 32 bits to four
+// signed 64-bit integers.
+FORCE_INLINE __m128i _mm_cvtepi8_epi64(__m128i a)
+{
+	int8x16_t s8x16 = vreinterpretq_s8_m128i(a); /* xxxx xxxx xxxx xxBA */
+	int16x8_t s16x8 =
+		vmovl_s8(vget_low_s8(s8x16)); /* 0x0x 0x0x 0x0x 0B0A */
+	int32x4_t s32x4 =
+		vmovl_s16(vget_low_s16(s16x8)); /* 000x 000x 000B 000A */
+	int64x2_t s64x2 =
+		vmovl_s32(vget_low_s32(s32x4)); /* 0000 000B 0000 000A */
+	return vreinterpretq_m128i_s64(s64x2);
+}
+
+// Converts the four signed 16-bit integers in the lower 64 bits to four signed
+// 32-bit integers.
+FORCE_INLINE __m128i _mm_cvtepi16_epi32(__m128i a)
+{
+	return vreinterpretq_m128i_s32(
+		vmovl_s16(vget_low_s16(vreinterpretq_s16_m128i(a))));
+}
+
+// Converts the two signed 16-bit integers in the lower 32 bits two signed
+// 32-bit integers.
+FORCE_INLINE __m128i _mm_cvtepi16_epi64(__m128i a)
+{
+	int16x8_t s16x8 = vreinterpretq_s16_m128i(a); /* xxxx xxxx xxxx 0B0A */
+	int32x4_t s32x4 =
+		vmovl_s16(vget_low_s16(s16x8)); /* 000x 000x 000B 000A */
+	int64x2_t s64x2 =
+		vmovl_s32(vget_low_s32(s32x4)); /* 0000 000B 0000 000A */
+	return vreinterpretq_m128i_s64(s64x2);
+}
+
+// Converts the four unsigned 16-bit integers in the lower 64 bits to four
+// unsigned 32-bit integers.
+FORCE_INLINE __m128i _mm_cvtepu16_epi32(__m128i a)
+{
+	return vreinterpretq_m128i_u32(
+		vmovl_u16(vget_low_u16(vreinterpretq_u16_m128i(a))));
+}
+
+// Converts the two unsigned 16-bit integers in the lower 32 bits to two
+// unsigned 64-bit integers.
+FORCE_INLINE __m128i _mm_cvtepu16_epi64(__m128i a)
+{
+	uint16x8_t u16x8 = vreinterpretq_u16_m128i(a); /* xxxx xxxx xxxx 0B0A */
+	uint32x4_t u32x4 =
+		vmovl_u16(vget_low_u16(u16x8)); /* 000x 000x 000B 000A */
+	uint64x2_t u64x2 =
+		vmovl_u32(vget_low_u32(u32x4)); /* 0000 000B 0000 000A */
+	return vreinterpretq_m128i_u64(u64x2);
+}
+
+// Converts the two unsigned 32-bit integers in the lower 64 bits to two
+// unsigned 64-bit integers.
+FORCE_INLINE __m128i _mm_cvtepu32_epi64(__m128i a)
+{
+	return vreinterpretq_m128i_u64(
+		vmovl_u32(vget_low_u32(vreinterpretq_u32_m128i(a))));
+}
+
+// Converts the two signed 32-bit integers in the lower 64 bits to two signed
+// 64-bit integers.
+FORCE_INLINE __m128i _mm_cvtepi32_epi64(__m128i a)
+{
+	return vreinterpretq_m128i_s64(
+		vmovl_s32(vget_low_s32(vreinterpretq_s32_m128i(a))));
+}
+
+// Converts the four single-precision, floating-point values of a to signed
+// 32-bit integer values.
+//
+//   r0 := (int) a0
+//   r1 := (int) a1
+//   r2 := (int) a2
+//   r3 := (int) a3
+//
+// https://msdn.microsoft.com/en-us/library/vstudio/xdc42k5e(v=vs.100).aspx
+// *NOTE*. The default rounding mode on SSE is 'round to even', which ARMv7-A
+// does not support! It is supported on ARMv8-A however.
+FORCE_INLINE __m128i _mm_cvtps_epi32(__m128 a)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s32(vcvtnq_s32_f32(a));
+#else
+	uint32x4_t signmask = vdupq_n_u32(0x80000000);
+	float32x4_t half = vbslq_f32(signmask, vreinterpretq_f32_m128(a),
+				     vdupq_n_f32(0.5f)); /* +/- 0.5 */
+	int32x4_t r_normal =
+		vcvtq_s32_f32(vaddq_f32(vreinterpretq_f32_m128(a),
+					half)); /* round to integer: [a + 0.5]*/
+	int32x4_t r_trunc = vcvtq_s32_f32(
+		vreinterpretq_f32_m128(a)); /* truncate to integer: [a] */
+	int32x4_t plusone = vreinterpretq_s32_u32(vshrq_n_u32(
+		vreinterpretq_u32_s32(vnegq_s32(r_trunc)), 31)); /* 1 or 0 */
+	int32x4_t r_even = vbicq_s32(vaddq_s32(r_trunc, plusone),
+				     vdupq_n_s32(1)); /* ([a] + {0,1}) & ~1 */
+	float32x4_t delta = vsubq_f32(
+		vreinterpretq_f32_m128(a),
+		vcvtq_f32_s32(r_trunc)); /* compute delta: delta = (a - [a]) */
+	uint32x4_t is_delta_half =
+		vceqq_f32(delta, half); /* delta == +/- 0.5 */
+	return vreinterpretq_m128i_s32(
+		vbslq_s32(is_delta_half, r_even, r_normal));
+#endif
+}
+
+// Moves the least significant 32 bits of a to a 32-bit integer.
+// https://msdn.microsoft.com/en-us/library/5z7a9642%28v=vs.90%29.aspx
+FORCE_INLINE int _mm_cvtsi128_si32(__m128i a)
+{
+	return vgetq_lane_s32(vreinterpretq_s32_m128i(a), 0);
+}
+
+// Extracts the low order 64-bit integer from the parameter.
+// https://msdn.microsoft.com/en-us/library/bb531384(v=vs.120).aspx
+FORCE_INLINE uint64_t _mm_cvtsi128_si64(__m128i a)
+{
+	return vgetq_lane_s64(vreinterpretq_s64_m128i(a), 0);
+}
+
+// Moves 32-bit integer a to the least significant 32 bits of an __m128 object,
+// zero extending the upper bits.
+//
+//   r0 := a
+//   r1 := 0x0
+//   r2 := 0x0
+//   r3 := 0x0
+//
+// https://msdn.microsoft.com/en-us/library/ct3539ha%28v=vs.90%29.aspx
+FORCE_INLINE __m128i _mm_cvtsi32_si128(int a)
+{
+	return vreinterpretq_m128i_s32(vsetq_lane_s32(a, vdupq_n_s32(0), 0));
+}
+
+// Moves 64-bit integer a to the least significant 64 bits of an __m128 object,
+// zero extending the upper bits.
+//
+//   r0 := a
+//   r1 := 0x0
+FORCE_INLINE __m128i _mm_cvtsi64_si128(int64_t a)
+{
+	return vreinterpretq_m128i_s64(vsetq_lane_s64(a, vdupq_n_s64(0), 0));
+}
+
+// Applies a type cast to reinterpret four 32-bit floating point values passed
+// in as a 128-bit parameter as packed 32-bit integers.
+// https://msdn.microsoft.com/en-us/library/bb514099.aspx
+FORCE_INLINE __m128i _mm_castps_si128(__m128 a)
+{
+	return vreinterpretq_m128i_s32(vreinterpretq_s32_m128(a));
+}
+
+// Applies a type cast to reinterpret four 32-bit integers passed in as a
+// 128-bit parameter as packed 32-bit floating point values.
+// https://msdn.microsoft.com/en-us/library/bb514029.aspx
+FORCE_INLINE __m128 _mm_castsi128_ps(__m128i a)
+{
+	return vreinterpretq_m128_s32(vreinterpretq_s32_m128i(a));
+}
+
+// Loads 128-bit value. :
+// https://msdn.microsoft.com/en-us/library/atzzad1h(v=vs.80).aspx
+FORCE_INLINE __m128i _mm_load_si128(const __m128i *p)
+{
+	return vreinterpretq_m128i_s32(vld1q_s32((const int32_t *)p));
+}
+
+// Loads 128-bit value. :
+// https://msdn.microsoft.com/zh-cn/library/f4k12ae8(v=vs.90).aspx
+FORCE_INLINE __m128i _mm_loadu_si128(const __m128i *p)
+{
+	return vreinterpretq_m128i_s32(vld1q_s32((const int32_t *)p));
+}
+
+// _mm_lddqu_si128 functions the same as _mm_loadu_si128.
+#define _mm_lddqu_si128 _mm_loadu_si128
+
+/* Miscellaneous Operations */
+
+// Shifts the 8 signed 16-bit integers in a right by count bits while shifting
+// in the sign bit.
+//
+//   r0 := a0 >> count
+//   r1 := a1 >> count
+//   ...
+//   r7 := a7 >> count
+//
+// https://msdn.microsoft.com/en-us/library/3c9997dk(v%3dvs.90).aspx
+FORCE_INLINE __m128i _mm_sra_epi16(__m128i a, __m128i count)
+{
+	int64_t c = (int64_t)vget_low_s64((int64x2_t)count);
+	if (c > 15)
+		return _mm_cmplt_epi16(a, _mm_setzero_si128());
+	return vreinterpretq_m128i_s16(
+		vshlq_s16((int16x8_t)a, vdupq_n_s16(-c)));
+}
+
+// Shifts the 4 signed 32-bit integers in a right by count bits while shifting
+// in the sign bit.
+//
+//   r0 := a0 >> count
+//   r1 := a1 >> count
+//   r2 := a2 >> count
+//   r3 := a3 >> count
+//
+// https://msdn.microsoft.com/en-us/library/ce40009e(v%3dvs.100).aspx
+FORCE_INLINE __m128i _mm_sra_epi32(__m128i a, __m128i count)
+{
+	int64_t c = (int64_t)vget_low_s64((int64x2_t)count);
+	if (c > 31)
+		return _mm_cmplt_epi32(a, _mm_setzero_si128());
+	return vreinterpretq_m128i_s32(
+		vshlq_s32((int32x4_t)a, vdupq_n_s32(-c)));
+}
+
+// Packs the 16 signed 16-bit integers from a and b into 8-bit integers and
+// saturates.
+// https://msdn.microsoft.com/en-us/library/k4y4f7w5%28v=vs.90%29.aspx
+FORCE_INLINE __m128i _mm_packs_epi16(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s8(
+		vcombine_s8(vqmovn_s16(vreinterpretq_s16_m128i(a)),
+			    vqmovn_s16(vreinterpretq_s16_m128i(b))));
+}
+
+// Packs the 16 signed 16 - bit integers from a and b into 8 - bit unsigned
+// integers and saturates.
+//
+//   r0 := UnsignedSaturate(a0)
+//   r1 := UnsignedSaturate(a1)
+//   ...
+//   r7 := UnsignedSaturate(a7)
+//   r8 := UnsignedSaturate(b0)
+//   r9 := UnsignedSaturate(b1)
+//   ...
+//   r15 := UnsignedSaturate(b7)
+//
+// https://msdn.microsoft.com/en-us/library/07ad1wx4(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_packus_epi16(const __m128i a, const __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vcombine_u8(vqmovun_s16(vreinterpretq_s16_m128i(a)),
+			    vqmovun_s16(vreinterpretq_s16_m128i(b))));
+}
+
+// Packs the 8 signed 32-bit integers from a and b into signed 16-bit integers
+// and saturates.
+//
+//   r0 := SignedSaturate(a0)
+//   r1 := SignedSaturate(a1)
+//   r2 := SignedSaturate(a2)
+//   r3 := SignedSaturate(a3)
+//   r4 := SignedSaturate(b0)
+//   r5 := SignedSaturate(b1)
+//   r6 := SignedSaturate(b2)
+//   r7 := SignedSaturate(b3)
+//
+// https://msdn.microsoft.com/en-us/library/393t56f9%28v=vs.90%29.aspx
+FORCE_INLINE __m128i _mm_packs_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_s16(
+		vcombine_s16(vqmovn_s32(vreinterpretq_s32_m128i(a)),
+			     vqmovn_s32(vreinterpretq_s32_m128i(b))));
+}
+
+// Packs the 8 unsigned 32-bit integers from a and b into unsigned 16-bit
+// integers and saturates.
+//
+//   r0 := UnsignedSaturate(a0)
+//   r1 := UnsignedSaturate(a1)
+//   r2 := UnsignedSaturate(a2)
+//   r3 := UnsignedSaturate(a3)
+//   r4 := UnsignedSaturate(b0)
+//   r5 := UnsignedSaturate(b1)
+//   r6 := UnsignedSaturate(b2)
+//   r7 := UnsignedSaturate(b3)
+FORCE_INLINE __m128i _mm_packus_epi32(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u16(
+		vcombine_u16(vqmovn_u32(vreinterpretq_u32_m128i(a)),
+			     vqmovn_u32(vreinterpretq_u32_m128i(b))));
+}
+
+// Interleaves the lower 8 signed or unsigned 8-bit integers in a with the lower
+// 8 signed or unsigned 8-bit integers in b.
+//
+//   r0 := a0
+//   r1 := b0
+//   r2 := a1
+//   r3 := b1
+//   ...
+//   r14 := a7
+//   r15 := b7
+//
+// https://msdn.microsoft.com/en-us/library/xf7k860c%28v=vs.90%29.aspx
+FORCE_INLINE __m128i _mm_unpacklo_epi8(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s8(vzip1q_s8(vreinterpretq_s8_m128i(a),
+						vreinterpretq_s8_m128i(b)));
+#else
+	int8x8_t a1 =
+		vreinterpret_s8_s16(vget_low_s16(vreinterpretq_s16_m128i(a)));
+	int8x8_t b1 =
+		vreinterpret_s8_s16(vget_low_s16(vreinterpretq_s16_m128i(b)));
+	int8x8x2_t result = vzip_s8(a1, b1);
+	return vreinterpretq_m128i_s8(
+		vcombine_s8(result.val[0], result.val[1]));
+#endif
+}
+
+// Interleaves the lower 4 signed or unsigned 16-bit integers in a with the
+// lower 4 signed or unsigned 16-bit integers in b.
+//
+//   r0 := a0
+//   r1 := b0
+//   r2 := a1
+//   r3 := b1
+//   r4 := a2
+//   r5 := b2
+//   r6 := a3
+//   r7 := b3
+//
+// https://msdn.microsoft.com/en-us/library/btxb17bw%28v=vs.90%29.aspx
+FORCE_INLINE __m128i _mm_unpacklo_epi16(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s16(vzip1q_s16(vreinterpretq_s16_m128i(a),
+						  vreinterpretq_s16_m128i(b)));
+#else
+	int16x4_t a1 = vget_low_s16(vreinterpretq_s16_m128i(a));
+	int16x4_t b1 = vget_low_s16(vreinterpretq_s16_m128i(b));
+	int16x4x2_t result = vzip_s16(a1, b1);
+	return vreinterpretq_m128i_s16(
+		vcombine_s16(result.val[0], result.val[1]));
+#endif
+}
+
+// Interleaves the lower 2 signed or unsigned 32 - bit integers in a with the
+// lower 2 signed or unsigned 32 - bit integers in b.
+//
+//   r0 := a0
+//   r1 := b0
+//   r2 := a1
+//   r3 := b1
+//
+// https://msdn.microsoft.com/en-us/library/x8atst9d(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_unpacklo_epi32(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s32(vzip1q_s32(vreinterpretq_s32_m128i(a),
+						  vreinterpretq_s32_m128i(b)));
+#else
+	int32x2_t a1 = vget_low_s32(vreinterpretq_s32_m128i(a));
+	int32x2_t b1 = vget_low_s32(vreinterpretq_s32_m128i(b));
+	int32x2x2_t result = vzip_s32(a1, b1);
+	return vreinterpretq_m128i_s32(
+		vcombine_s32(result.val[0], result.val[1]));
+#endif
+}
+
+FORCE_INLINE __m128i _mm_unpacklo_epi64(__m128i a, __m128i b)
+{
+	int64x1_t a_l = vget_low_s64(vreinterpretq_s64_m128i(a));
+	int64x1_t b_l = vget_low_s64(vreinterpretq_s64_m128i(b));
+	return vreinterpretq_m128i_s64(vcombine_s64(a_l, b_l));
+}
+
+// Selects and interleaves the lower two single-precision, floating-point values
+// from a and b.
+//
+//   r0 := a0
+//   r1 := b0
+//   r2 := a1
+//   r3 := b1
+//
+// https://msdn.microsoft.com/en-us/library/25st103b%28v=vs.90%29.aspx
+FORCE_INLINE __m128 _mm_unpacklo_ps(__m128 a, __m128 b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128_f32(vzip1q_f32(vreinterpretq_f32_m128(a),
+						 vreinterpretq_f32_m128(b)));
+#else
+	float32x2_t a1 = vget_low_f32(vreinterpretq_f32_m128(a));
+	float32x2_t b1 = vget_low_f32(vreinterpretq_f32_m128(b));
+	float32x2x2_t result = vzip_f32(a1, b1);
+	return vreinterpretq_m128_f32(
+		vcombine_f32(result.val[0], result.val[1]));
+#endif
+}
+
+// Selects and interleaves the upper two single-precision, floating-point values
+// from a and b.
+//
+//   r0 := a2
+//   r1 := b2
+//   r2 := a3
+//   r3 := b3
+//
+// https://msdn.microsoft.com/en-us/library/skccxx7d%28v=vs.90%29.aspx
+FORCE_INLINE __m128 _mm_unpackhi_ps(__m128 a, __m128 b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128_f32(vzip2q_f32(vreinterpretq_f32_m128(a),
+						 vreinterpretq_f32_m128(b)));
+#else
+	float32x2_t a1 = vget_high_f32(vreinterpretq_f32_m128(a));
+	float32x2_t b1 = vget_high_f32(vreinterpretq_f32_m128(b));
+	float32x2x2_t result = vzip_f32(a1, b1);
+	return vreinterpretq_m128_f32(
+		vcombine_f32(result.val[0], result.val[1]));
+#endif
+}
+
+// Interleaves the upper 8 signed or unsigned 8-bit integers in a with the upper
+// 8 signed or unsigned 8-bit integers in b.
+//
+//   r0 := a8
+//   r1 := b8
+//   r2 := a9
+//   r3 := b9
+//   ...
+//   r14 := a15
+//   r15 := b15
+//
+// https://msdn.microsoft.com/en-us/library/t5h7783k(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_unpackhi_epi8(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s8(vzip2q_s8(vreinterpretq_s8_m128i(a),
+						vreinterpretq_s8_m128i(b)));
+#else
+	int8x8_t a1 =
+		vreinterpret_s8_s16(vget_high_s16(vreinterpretq_s16_m128i(a)));
+	int8x8_t b1 =
+		vreinterpret_s8_s16(vget_high_s16(vreinterpretq_s16_m128i(b)));
+	int8x8x2_t result = vzip_s8(a1, b1);
+	return vreinterpretq_m128i_s8(
+		vcombine_s8(result.val[0], result.val[1]));
+#endif
+}
+
+// Interleaves the upper 4 signed or unsigned 16-bit integers in a with the
+// upper 4 signed or unsigned 16-bit integers in b.
+//
+//   r0 := a4
+//   r1 := b4
+//   r2 := a5
+//   r3 := b5
+//   r4 := a6
+//   r5 := b6
+//   r6 := a7
+//   r7 := b7
+//
+// https://msdn.microsoft.com/en-us/library/03196cz7(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_unpackhi_epi16(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s16(vzip2q_s16(vreinterpretq_s16_m128i(a),
+						  vreinterpretq_s16_m128i(b)));
+#else
+	int16x4_t a1 = vget_high_s16(vreinterpretq_s16_m128i(a));
+	int16x4_t b1 = vget_high_s16(vreinterpretq_s16_m128i(b));
+	int16x4x2_t result = vzip_s16(a1, b1);
+	return vreinterpretq_m128i_s16(
+		vcombine_s16(result.val[0], result.val[1]));
+#endif
+}
+
+// Interleaves the upper 2 signed or unsigned 32-bit integers in a with the
+// upper 2 signed or unsigned 32-bit integers in b.
+// https://msdn.microsoft.com/en-us/library/65sa7cbs(v=vs.100).aspx
+FORCE_INLINE __m128i _mm_unpackhi_epi32(__m128i a, __m128i b)
+{
+#if defined(__aarch64__)
+	return vreinterpretq_m128i_s32(vzip2q_s32(vreinterpretq_s32_m128i(a),
+						  vreinterpretq_s32_m128i(b)));
+#else
+	int32x2_t a1 = vget_high_s32(vreinterpretq_s32_m128i(a));
+	int32x2_t b1 = vget_high_s32(vreinterpretq_s32_m128i(b));
+	int32x2x2_t result = vzip_s32(a1, b1);
+	return vreinterpretq_m128i_s32(
+		vcombine_s32(result.val[0], result.val[1]));
+#endif
+}
+
+// Interleaves the upper signed or unsigned 64-bit integer in a with the
+// upper signed or unsigned 64-bit integer in b.
+//
+//   r0 := a1
+//   r1 := b1
+FORCE_INLINE __m128i _mm_unpackhi_epi64(__m128i a, __m128i b)
+{
+	int64x1_t a_h = vget_high_s64(vreinterpretq_s64_m128i(a));
+	int64x1_t b_h = vget_high_s64(vreinterpretq_s64_m128i(b));
+	return vreinterpretq_m128i_s64(vcombine_s64(a_h, b_h));
+}
+
+// Horizontally compute the minimum amongst the packed unsigned 16-bit integers
+// in a, store the minimum and index in dst, and zero the remaining bits in dst.
+//
+//   index[2:0] := 0
+//   min[15:0] := a[15:0]
+//   FOR j := 0 to 7
+//       i := j*16
+//       IF a[i+15:i] < min[15:0]
+//           index[2:0] := j
+//           min[15:0] := a[i+15:i]
+//       FI
+//   ENDFOR
+//   dst[15:0] := min[15:0]
+//   dst[18:16] := index[2:0]
+//   dst[127:19] := 0
+//
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_minpos_epu16&expand=3789
+FORCE_INLINE __m128i _mm_minpos_epu16(__m128i a)
+{
+	__m128i dst;
+	uint16_t min, idx = 0;
+	// Find the minimum value
+#if defined(__aarch64__)
+	min = vminvq_u16(vreinterpretq_u16_m128i(a));
+#else
+	__m64i tmp;
+	tmp = vreinterpret_m64i_u16(
+		vmin_u16(vget_low_u16(vreinterpretq_u16_m128i(a)),
+			 vget_high_u16(vreinterpretq_u16_m128i(a))));
+	tmp = vreinterpret_m64i_u16(vpmin_u16(vreinterpret_u16_m64i(tmp),
+					      vreinterpret_u16_m64i(tmp)));
+	tmp = vreinterpret_m64i_u16(vpmin_u16(vreinterpret_u16_m64i(tmp),
+					      vreinterpret_u16_m64i(tmp)));
+	min = vget_lane_u16(vreinterpret_u16_m64i(tmp), 0);
+#endif
+	// Get the index of the minimum value
+	int i;
+	for (i = 0; i < 8; i++) {
+		if (min == vgetq_lane_u16(vreinterpretq_u16_m128i(a), 0)) {
+			idx = (uint16_t)i;
+			break;
+		}
+		a = _mm_srli_si128(a, 2);
+	}
+	// Generate result
+	dst = _mm_setzero_si128();
+	dst = vreinterpretq_m128i_u16(
+		vsetq_lane_u16(min, vreinterpretq_u16_m128i(dst), 0));
+	dst = vreinterpretq_m128i_u16(
+		vsetq_lane_u16(idx, vreinterpretq_u16_m128i(dst), 1));
+	return dst;
+}
+
+// shift to right
+// https://msdn.microsoft.com/en-us/library/bb514041(v=vs.120).aspx
+// http://blog.csdn.net/hemmingway/article/details/44828303
+// Clang requires a macro here, as it is extremely picky about c being a
+// literal.
+#define _mm_alignr_epi8(a, b, c) \
+	((__m128i)vextq_s8((int8x16_t)(b), (int8x16_t)(a), (c)))
+
+// Extracts the selected signed or unsigned 8-bit integer from a and zero
+// extends.
+// FORCE_INLINE int _mm_extract_epi8(__m128i a, __constrange(0,16) int imm)
+#define _mm_extract_epi8(a, imm) vgetq_lane_u8(vreinterpretq_u8_m128i(a), (imm))
+
+// Inserts the least significant 8 bits of b into the selected 8-bit integer
+// of a.
+// FORCE_INLINE __m128i _mm_insert_epi8(__m128i a, int b,
+//                                      __constrange(0,16) int imm)
+#define _mm_insert_epi8(a, b, imm)                                             \
+	__extension__({                                                        \
+		vreinterpretq_m128i_s8(                                        \
+			vsetq_lane_s8((b), vreinterpretq_s8_m128i(a), (imm))); \
+	})
+
+// Extracts the selected signed or unsigned 16-bit integer from a and zero
+// extends.
+// https://msdn.microsoft.com/en-us/library/6dceta0c(v=vs.100).aspx
+// FORCE_INLINE int _mm_extract_epi16(__m128i a, __constrange(0,8) int imm)
+#define _mm_extract_epi16(a, imm) \
+	vgetq_lane_u16(vreinterpretq_u16_m128i(a), (imm))
+
+// Inserts the least significant 16 bits of b into the selected 16-bit integer
+// of a.
+// https://msdn.microsoft.com/en-us/library/kaze8hz1%28v=vs.100%29.aspx
+// FORCE_INLINE __m128i _mm_insert_epi16(__m128i a, int b,
+//                                       __constrange(0,8) int imm)
+#define _mm_insert_epi16(a, b, imm)                               \
+	__extension__({                                           \
+		vreinterpretq_m128i_s16(vsetq_lane_s16(           \
+			(b), vreinterpretq_s16_m128i(a), (imm))); \
+	})
+
+// Extracts the selected signed or unsigned 32-bit integer from a and zero
+// extends.
+// FORCE_INLINE int _mm_extract_epi32(__m128i a, __constrange(0,4) int imm)
+#define _mm_extract_epi32(a, imm) \
+	vgetq_lane_s32(vreinterpretq_s32_m128i(a), (imm))
+
+// Extracts the selected single-precision (32-bit) floating-point from a.
+// FORCE_INLINE int _mm_extract_ps(__m128 a, __constrange(0,4) int imm)
+#define _mm_extract_ps(a, imm) vgetq_lane_s32(vreinterpretq_s32_m128(a), (imm))
+
+// Inserts the least significant 32 bits of b into the selected 32-bit integer
+// of a.
+// FORCE_INLINE __m128i _mm_insert_epi32(__m128i a, int b,
+//                                       __constrange(0,4) int imm)
+#define _mm_insert_epi32(a, b, imm)                               \
+	__extension__({                                           \
+		vreinterpretq_m128i_s32(vsetq_lane_s32(           \
+			(b), vreinterpretq_s32_m128i(a), (imm))); \
+	})
+
+// Extracts the selected signed or unsigned 64-bit integer from a and zero
+// extends.
+// FORCE_INLINE __int64 _mm_extract_epi64(__m128i a, __constrange(0,2) int imm)
+#define _mm_extract_epi64(a, imm) \
+	vgetq_lane_s64(vreinterpretq_s64_m128i(a), (imm))
+
+// Inserts the least significant 64 bits of b into the selected 64-bit integer
+// of a.
+// FORCE_INLINE __m128i _mm_insert_epi64(__m128i a, __int64 b,
+//                                       __constrange(0,2) int imm)
+#define _mm_insert_epi64(a, b, imm)                               \
+	__extension__({                                           \
+		vreinterpretq_m128i_s64(vsetq_lane_s64(           \
+			(b), vreinterpretq_s64_m128i(a), (imm))); \
+	})
+
+// Count the number of bits set to 1 in unsigned 32-bit integer a, and
+// return that count in dst.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_popcnt_u32
+FORCE_INLINE int _mm_popcnt_u32(unsigned int a)
+{
+#if defined(__aarch64__)
+#if __has_builtin(__builtin_popcount)
+	return __builtin_popcount(a);
+#else
+	return (int)vaddlv_u8(vcnt_u8(vcreate_u8((uint64_t)a)));
+#endif
+#else
+	uint32_t count = 0;
+	uint8x8_t input_val, count8x8_val;
+	uint16x4_t count16x4_val;
+	uint32x2_t count32x2_val;
+
+	input_val = vld1_u8((uint8_t *)&a);
+	count8x8_val = vcnt_u8(input_val);
+	count16x4_val = vpaddl_u8(count8x8_val);
+	count32x2_val = vpaddl_u16(count16x4_val);
+
+	vst1_u32(&count, count32x2_val);
+	return count;
+#endif
+}
+
+// Count the number of bits set to 1 in unsigned 64-bit integer a, and
+// return that count in dst.
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_popcnt_u64
+FORCE_INLINE int64_t _mm_popcnt_u64(uint64_t a)
+{
+#if defined(__aarch64__)
+#if __has_builtin(__builtin_popcountll)
+	return __builtin_popcountll(a);
+#else
+	return (int64_t)vaddlv_u8(vcnt_u8(vcreate_u8(a)));
+#endif
+#else
+	uint64_t count = 0;
+	uint8x8_t input_val, count8x8_val;
+	uint16x4_t count16x4_val;
+	uint32x2_t count32x2_val;
+	uint64x1_t count64x1_val;
+
+	input_val = vld1_u8((uint8_t *)&a);
+	count8x8_val = vcnt_u8(input_val);
+	count16x4_val = vpaddl_u8(count8x8_val);
+	count32x2_val = vpaddl_u16(count16x4_val);
+	count64x1_val = vpaddl_u32(count32x2_val);
+	vst1_u64(&count, count64x1_val);
+	return count;
+#endif
+}
+
+// Macro: Transpose the 4x4 matrix formed by the 4 rows of single-precision
+// (32-bit) floating-point elements in row0, row1, row2, and row3, and store the
+// transposed matrix in these vectors (row0 now contains column 0, etc.).
+// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=MM_TRANSPOSE4_PS&expand=5949
+#define _MM_TRANSPOSE4_PS(row0, row1, row2, row3)   \
+	do {                                        \
+		__m128 tmp0, tmp1, tmp2, tmp3;      \
+		tmp0 = _mm_unpacklo_ps(row0, row1); \
+		tmp2 = _mm_unpacklo_ps(row2, row3); \
+		tmp1 = _mm_unpackhi_ps(row0, row1); \
+		tmp3 = _mm_unpackhi_ps(row2, row3); \
+		row0 = _mm_movelh_ps(tmp0, tmp2);   \
+		row1 = _mm_movehl_ps(tmp2, tmp0);   \
+		row2 = _mm_movelh_ps(tmp1, tmp3);   \
+		row3 = _mm_movehl_ps(tmp3, tmp1);   \
+	} while (0)
+
+/* Crypto Extensions */
+
+#if defined(__ARM_FEATURE_CRYPTO)
+// Wraps vmull_p64
+FORCE_INLINE uint64x2_t _sse2neon_vmull_p64(uint64x1_t _a, uint64x1_t _b)
+{
+	poly64_t a = vget_lane_p64(vreinterpret_p64_u64(_a), 0);
+	poly64_t b = vget_lane_p64(vreinterpret_p64_u64(_b), 0);
+	return vreinterpretq_u64_p128(vmull_p64(a, b));
+}
+#else // ARMv7 polyfill
+// ARMv7/some A64 lacks vmull_p64, but it has vmull_p8.
+//
+// vmull_p8 calculates 8 8-bit->16-bit polynomial multiplies, but we need a
+// 64-bit->128-bit polynomial multiply.
+//
+// It needs some work and is somewhat slow, but it is still faster than all
+// known scalar methods.
+//
+// Algorithm adapted to C from
+// https://www.workofard.com/2017/07/ghash-for-low-end-cores/, which is adapted
+// from "Fast Software Polynomial Multiplication on ARM Processors Using the
+// NEON Engine" by Danilo Camara, Conrado Gouvea, Julio Lopez and Ricardo Dahab
+// (https://hal.inria.fr/hal-01506572)
+static uint64x2_t _sse2neon_vmull_p64(uint64x1_t _a, uint64x1_t _b)
+{
+	poly8x8_t a = vreinterpret_p8_u64(_a);
+	poly8x8_t b = vreinterpret_p8_u64(_b);
+
+	// Masks
+	uint8x16_t k48_32 = vcombine_u8(vcreate_u8(0x0000ffffffffffff),
+					vcreate_u8(0x00000000ffffffff));
+	uint8x16_t k16_00 = vcombine_u8(vcreate_u8(0x000000000000ffff),
+					vcreate_u8(0x0000000000000000));
+
+	// Do the multiplies, rotating with vext to get all combinations
+	uint8x16_t d = vreinterpretq_u8_p16(vmull_p8(a, b)); // D = A0 * B0
+	uint8x16_t e = vreinterpretq_u8_p16(
+		vmull_p8(a, vext_p8(b, b, 1))); // E = A0 * B1
+	uint8x16_t f = vreinterpretq_u8_p16(
+		vmull_p8(vext_p8(a, a, 1), b)); // F = A1 * B0
+	uint8x16_t g = vreinterpretq_u8_p16(
+		vmull_p8(a, vext_p8(b, b, 2))); // G = A0 * B2
+	uint8x16_t h = vreinterpretq_u8_p16(
+		vmull_p8(vext_p8(a, a, 2), b)); // H = A2 * B0
+	uint8x16_t i = vreinterpretq_u8_p16(
+		vmull_p8(a, vext_p8(b, b, 3))); // I = A0 * B3
+	uint8x16_t j = vreinterpretq_u8_p16(
+		vmull_p8(vext_p8(a, a, 3), b)); // J = A3 * B0
+	uint8x16_t k = vreinterpretq_u8_p16(
+		vmull_p8(a, vext_p8(b, b, 4))); // L = A0 * B4
+
+	// Add cross products
+	uint8x16_t l = veorq_u8(e, f); // L = E + F
+	uint8x16_t m = veorq_u8(g, h); // M = G + H
+	uint8x16_t n = veorq_u8(i, j); // N = I + J
+
+	// Interleave. Using vzip1 and vzip2 prevents Clang from emitting TBL
+	// instructions.
+#if defined(__aarch64__)
+	uint8x16_t lm_p0 = vreinterpretq_u8_u64(
+		vzip1q_u64(vreinterpretq_u64_u8(l), vreinterpretq_u64_u8(m)));
+	uint8x16_t lm_p1 = vreinterpretq_u8_u64(
+		vzip2q_u64(vreinterpretq_u64_u8(l), vreinterpretq_u64_u8(m)));
+	uint8x16_t nk_p0 = vreinterpretq_u8_u64(
+		vzip1q_u64(vreinterpretq_u64_u8(n), vreinterpretq_u64_u8(k)));
+	uint8x16_t nk_p1 = vreinterpretq_u8_u64(
+		vzip2q_u64(vreinterpretq_u64_u8(n), vreinterpretq_u64_u8(k)));
+#else
+	uint8x16_t lm_p0 = vcombine_u8(vget_low_u8(l), vget_low_u8(m));
+	uint8x16_t lm_p1 = vcombine_u8(vget_high_u8(l), vget_high_u8(m));
+	uint8x16_t nk_p0 = vcombine_u8(vget_low_u8(n), vget_low_u8(k));
+	uint8x16_t nk_p1 = vcombine_u8(vget_high_u8(n), vget_high_u8(k));
+#endif
+	// t0 = (L) (P0 + P1) << 8
+	// t1 = (M) (P2 + P3) << 16
+	uint8x16_t t0t1_tmp = veorq_u8(lm_p0, lm_p1);
+	uint8x16_t t0t1_h = vandq_u8(lm_p1, k48_32);
+	uint8x16_t t0t1_l = veorq_u8(t0t1_tmp, t0t1_h);
+
+	// t2 = (N) (P4 + P5) << 24
+	// t3 = (K) (P6 + P7) << 32
+	uint8x16_t t2t3_tmp = veorq_u8(nk_p0, nk_p1);
+	uint8x16_t t2t3_h = vandq_u8(nk_p1, k16_00);
+	uint8x16_t t2t3_l = veorq_u8(t2t3_tmp, t2t3_h);
+
+	// De-interleave
+#if defined(__aarch64__)
+	uint8x16_t t0 = vreinterpretq_u8_u64(vuzp1q_u64(
+		vreinterpretq_u64_u8(t0t1_l), vreinterpretq_u64_u8(t0t1_h)));
+	uint8x16_t t1 = vreinterpretq_u8_u64(vuzp2q_u64(
+		vreinterpretq_u64_u8(t0t1_l), vreinterpretq_u64_u8(t0t1_h)));
+	uint8x16_t t2 = vreinterpretq_u8_u64(vuzp1q_u64(
+		vreinterpretq_u64_u8(t2t3_l), vreinterpretq_u64_u8(t2t3_h)));
+	uint8x16_t t3 = vreinterpretq_u8_u64(vuzp2q_u64(
+		vreinterpretq_u64_u8(t2t3_l), vreinterpretq_u64_u8(t2t3_h)));
+#else
+	uint8x16_t t1 = vcombine_u8(vget_high_u8(t0t1_l), vget_high_u8(t0t1_h));
+	uint8x16_t t0 = vcombine_u8(vget_low_u8(t0t1_l), vget_low_u8(t0t1_h));
+	uint8x16_t t3 = vcombine_u8(vget_high_u8(t2t3_l), vget_high_u8(t2t3_h));
+	uint8x16_t t2 = vcombine_u8(vget_low_u8(t2t3_l), vget_low_u8(t2t3_h));
+#endif
+	// Shift the cross products
+	uint8x16_t t0_shift = vextq_u8(t0, t0, 15); // t0 << 8
+	uint8x16_t t1_shift = vextq_u8(t1, t1, 14); // t1 << 16
+	uint8x16_t t2_shift = vextq_u8(t2, t2, 13); // t2 << 24
+	uint8x16_t t3_shift = vextq_u8(t3, t3, 12); // t3 << 32
+
+	// Accumulate the products
+	uint8x16_t cross1 = veorq_u8(t0_shift, t1_shift);
+	uint8x16_t cross2 = veorq_u8(t2_shift, t3_shift);
+	uint8x16_t mix = veorq_u8(d, cross1);
+	uint8x16_t r = veorq_u8(mix, cross2);
+	return vreinterpretq_u64_u8(r);
+}
+#endif // ARMv7 polyfill
+
+FORCE_INLINE __m128i _mm_clmulepi64_si128(__m128i _a, __m128i _b, const int imm)
+{
+	uint64x2_t a = vreinterpretq_u64_m128i(_a);
+	uint64x2_t b = vreinterpretq_u64_m128i(_b);
+	switch (imm & 0x11) {
+	case 0x00:
+		return vreinterpretq_m128i_u64(
+			_sse2neon_vmull_p64(vget_low_u64(a), vget_low_u64(b)));
+	case 0x01:
+		return vreinterpretq_m128i_u64(
+			_sse2neon_vmull_p64(vget_high_u64(a), vget_low_u64(b)));
+	case 0x10:
+		return vreinterpretq_m128i_u64(
+			_sse2neon_vmull_p64(vget_low_u64(a), vget_high_u64(b)));
+	case 0x11:
+		return vreinterpretq_m128i_u64(_sse2neon_vmull_p64(
+			vget_high_u64(a), vget_high_u64(b)));
+	default:
+		abort();
+	}
+}
+
+#if !defined(__ARM_FEATURE_CRYPTO) && defined(__aarch64__)
+// In the absence of crypto extensions, implement aesenc using regular neon
+// intrinsics instead. See:
+// https://www.workofard.com/2017/01/accelerated-aes-for-the-arm64-linux-kernel/
+// https://www.workofard.com/2017/07/ghash-for-low-end-cores/ and
+// https://github.com/ColinIanKing/linux-next-mirror/blob/b5f466091e130caaf0735976648f72bd5e09aa84/crypto/aegis128-neon-inner.c#L52
+// for more information Reproduced with permission of the author.
+FORCE_INLINE __m128i _mm_aesenc_si128(__m128i EncBlock, __m128i RoundKey)
+{
+	static const uint8_t crypto_aes_sbox[256] = {
+		0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01,
+		0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d,
+		0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4,
+		0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
+		0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, 0x04, 0xc7,
+		0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
+		0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e,
+		0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+		0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb,
+		0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, 0xd0, 0xef, 0xaa, 0xfb,
+		0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c,
+		0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+		0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c,
+		0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d,
+		0x64, 0x5d, 0x19, 0x73, 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a,
+		0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+		0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3,
+		0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
+		0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a,
+		0xae, 0x08, 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
+		0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e,
+		0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9,
+		0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9,
+		0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+		0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99,
+		0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16};
+	static const uint8_t shift_rows[] = {0x0, 0x5, 0xa, 0xf, 0x4, 0x9,
+					     0xe, 0x3, 0x8, 0xd, 0x2, 0x7,
+					     0xc, 0x1, 0x6, 0xb};
+	static const uint8_t ror32by8[] = {0x1, 0x2, 0x3, 0x0, 0x5, 0x6,
+					   0x7, 0x4, 0x9, 0xa, 0xb, 0x8,
+					   0xd, 0xe, 0xf, 0xc};
+
+	uint8x16_t v;
+	uint8x16_t w = vreinterpretq_u8_m128i(EncBlock);
+
+	// shift rows
+	w = vqtbl1q_u8(w, vld1q_u8(shift_rows));
+
+	// sub bytes
+	v = vqtbl4q_u8(vld1q_u8_x4(crypto_aes_sbox), w);
+	v = vqtbx4q_u8(v, vld1q_u8_x4(crypto_aes_sbox + 0x40), w - 0x40);
+	v = vqtbx4q_u8(v, vld1q_u8_x4(crypto_aes_sbox + 0x80), w - 0x80);
+	v = vqtbx4q_u8(v, vld1q_u8_x4(crypto_aes_sbox + 0xc0), w - 0xc0);
+
+	// mix columns
+	w = (v << 1) ^ (uint8x16_t)(((int8x16_t)v >> 7) & 0x1b);
+	w ^= (uint8x16_t)vrev32q_u16((uint16x8_t)v);
+	w ^= vqtbl1q_u8(v ^ w, vld1q_u8(ror32by8));
+
+	//  add round key
+	return vreinterpretq_m128i_u8(w) ^ RoundKey;
+}
+#elif defined(__ARM_FEATURE_CRYPTO)
+// Implements equivalent of 'aesenc' by combining AESE (with an empty key) and
+// AESMC and then manually applying the real key as an xor operation This
+// unfortunately means an additional xor op; the compiler should be able to
+// optimise this away for repeated calls however See
+// https://blog.michaelbrase.com/2018/05/08/emulating-x86-aes-intrinsics-on-armv8-a
+// for more details.
+inline __m128i _mm_aesenc_si128(__m128i a, __m128i b)
+{
+	return vreinterpretq_m128i_u8(
+		vaesmcq_u8(
+			vaeseq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0))) ^
+		vreinterpretq_u8_m128i(b));
+}
+#endif
+
+/* Streaming Extensions */
+
+// Guarantees that every preceding store is globally visible before any
+// subsequent store.
+// https://msdn.microsoft.com/en-us/library/5h2w73d1%28v=vs.90%29.aspx
+FORCE_INLINE void _mm_sfence(void)
+{
+	__sync_synchronize();
+}
+
+// Stores the data in a to the address p without polluting the caches.  If the
+// cache line containing address p is already in the cache, the cache will be
+// updated.Address p must be 16 - byte aligned.
+// https://msdn.microsoft.com/en-us/library/ba08y07y%28v=vs.90%29.aspx
+FORCE_INLINE void _mm_stream_si128(__m128i *p, __m128i a)
+{
+#if __has_builtin(__builtin_nontemporal_store)
+	__builtin_nontemporal_store(a, p);
+#else
+	vst1q_s64((int64_t *)p, vreinterpretq_s64_m128i(a));
+#endif
+}
+
+// Cache line containing p is flushed and invalidated from all caches in the
+// coherency domain. :
+// https://msdn.microsoft.com/en-us/library/ba08y07y(v=vs.100).aspx
+FORCE_INLINE void _mm_clflush(void const *p)
+{
+	(void)p;
+	// no corollary for Neon?
+}
+
+// Allocate aligned blocks of memory.
+// https://software.intel.com/en-us/
+//         cpp-compiler-developer-guide-and-reference-allocating-and-freeing-aligned-memory-blocks
+FORCE_INLINE void *_mm_malloc(size_t size, size_t align)
+{
+	void *ptr;
+	if (align == 1)
+		return malloc(size);
+	if (align == 2 || (sizeof(void *) == 8 && align == 4))
+		align = sizeof(void *);
+	if (!posix_memalign(&ptr, align, size))
+		return ptr;
+	return NULL;
+}
+
+FORCE_INLINE void _mm_free(void *addr)
+{
+	free(addr);
+}
+
+// Starting with the initial value in crc, accumulates a CRC32 value for
+// unsigned 8-bit integer v.
+// https://msdn.microsoft.com/en-us/library/bb514036(v=vs.100)
+FORCE_INLINE uint32_t _mm_crc32_u8(uint32_t crc, uint8_t v)
+{
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
+	__asm__ __volatile__("crc32cb %w[c], %w[c], %w[v]\n\t"
+			     : [c] "+r"(crc)
+			     : [v] "r"(v));
+#else
+	crc ^= v;
+	for (int bit = 0; bit < 8; bit++) {
+		if (crc & 1)
+			crc = (crc >> 1) ^ UINT32_C(0x82f63b78);
+		else
+			crc = (crc >> 1);
+	}
+#endif
+	return crc;
+}
+
+// Starting with the initial value in crc, accumulates a CRC32 value for
+// unsigned 16-bit integer v.
+// https://msdn.microsoft.com/en-us/library/bb531411(v=vs.100)
+FORCE_INLINE uint32_t _mm_crc32_u16(uint32_t crc, uint16_t v)
+{
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
+	__asm__ __volatile__("crc32ch %w[c], %w[c], %w[v]\n\t"
+			     : [c] "+r"(crc)
+			     : [v] "r"(v));
+#else
+	crc = _mm_crc32_u8(crc, v & 0xff);
+	crc = _mm_crc32_u8(crc, (v >> 8) & 0xff);
+#endif
+	return crc;
+}
+
+// Starting with the initial value in crc, accumulates a CRC32 value for
+// unsigned 32-bit integer v.
+// https://msdn.microsoft.com/en-us/library/bb531394(v=vs.100)
+FORCE_INLINE uint32_t _mm_crc32_u32(uint32_t crc, uint32_t v)
+{
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
+	__asm__ __volatile__("crc32cw %w[c], %w[c], %w[v]\n\t"
+			     : [c] "+r"(crc)
+			     : [v] "r"(v));
+#else
+	crc = _mm_crc32_u16(crc, v & 0xffff);
+	crc = _mm_crc32_u16(crc, (v >> 16) & 0xffff);
+#endif
+	return crc;
+}
+
+// Starting with the initial value in crc, accumulates a CRC32 value for
+// unsigned 64-bit integer v.
+// https://msdn.microsoft.com/en-us/library/bb514033(v=vs.100)
+FORCE_INLINE uint64_t _mm_crc32_u64(uint64_t crc, uint64_t v)
+{
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
+	__asm__ __volatile__("crc32cx %w[c], %w[c], %x[v]\n\t"
+			     : [c] "+r"(crc)
+			     : [v] "r"(v));
+#else
+	crc = _mm_crc32_u32((uint32_t)(crc), v & 0xffffffff);
+	crc = _mm_crc32_u32((uint32_t)(crc), (v >> 32) & 0xffffffff);
+#endif
+	return crc;
+}
+
+#if defined(__GNUC__) || defined(__clang__)
+#pragma pop_macro("ALIGN_STRUCT")
+#pragma pop_macro("FORCE_INLINE")
+#endif
+
+#endif

obs-studio-25.0.8.tar.xz/libobs/util/threading-posix.c -> obs-studio-26.0.0.tar.xz/libobs/util/threading-posix.c Changed

obs-studio-25.0.8.tar.xz/libobs/util/threading-windows.c -> obs-studio-26.0.0.tar.xz/libobs/util/threading-windows.c Changed

obs-studio-25.0.8.tar.xz/libobs/util/utf8.c -> obs-studio-26.0.0.tar.xz/libobs/util/utf8.c Changed

obs-studio-26.0.0.tar.xz/libobs/util/util_uint64.h Added

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 Hans Petter Selasky <hps@selasky.org>
+ *
+ * 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
+
+static inline uint64_t util_mul_div64(uint64_t num, uint64_t mul, uint64_t div)
+{
+	const uint64_t rem = num % div;
+
+	return (num / div) * mul + (rem * mul) / div;
+}

obs-studio-25.0.8.tar.xz/plugins/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/data/locale/fa-IR.ini -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/fa-IR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/encoder.cpp -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/encoder.cpp Changed

@@ -597,14 +597,34 @@
 
 	/*
 	 * Fix channel map differences between CoreAudio AAC, FFmpeg, Wav
-	 * New channel mappings below assume 2.1, 4.1, 5.1, 7.1 resp.
+	 * New channel mappings below assume 2.1, 4.0, 4.1, 5.1, 7.1 resp.
 	 */
+
 	if (ca->channels == 3) {
 		SInt32 channelMap3[3] = {2, 0, 1};
 		AudioConverterSetProperty(ca->converter,
 					  kAudioConverterChannelMap,
 					  sizeof(channelMap3), channelMap3);
 
+	} else if (ca->channels == 4) {
+		/*
+		 * For four channels coreaudio encoder has default channel "quad"
+		 * instead of 4.0. So explicitly set channel layout to
+		 * kAudioChannelLayoutTag_MPEG_4_0_B = (116L << 16) | 4.
+		 */
+		AudioChannelLayout inAcl = {0};
+		inAcl.mChannelLayoutTag = (116L << 16) | 4;
+		AudioConverterSetProperty(ca->converter,
+					  kAudioConverterInputChannelLayout,
+					  sizeof(inAcl), &inAcl);
+		AudioConverterSetProperty(ca->converter,
+					  kAudioConverterOutputChannelLayout,
+					  sizeof(inAcl), &inAcl);
+		SInt32 channelMap4[4] = {2, 0, 1, 3};
+		AudioConverterSetProperty(ca->converter,
+					  kAudioConverterChannelMap,
+					  sizeof(channelMap4), channelMap4);
+
 	} else if (ca->channels == 5) {
 		SInt32 channelMap5[5] = {2, 0, 1, 3, 4};
 		AudioConverterSetProperty(ca->converter,

obs-studio-25.0.8.tar.xz/plugins/coreaudio-encoder/windows-imports.h -> obs-studio-26.0.0.tar.xz/plugins/coreaudio-encoder/windows-imports.h Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/DecklinkBase.cpp -> obs-studio-26.0.0.tar.xz/plugins/decklink/DecklinkBase.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/DecklinkBase.h -> obs-studio-26.0.0.tar.xz/plugins/decklink/DecklinkBase.h Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/DecklinkInput.hpp -> obs-studio-26.0.0.tar.xz/plugins/decklink/DecklinkInput.hpp Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/bn-BD.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/bn-BD.ini Changed

obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/hr-HR.ini Changed

obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/lt-LT.ini Added

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/decklink/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/decklink-device-instance.cpp -> obs-studio-26.0.0.tar.xz/plugins/decklink/decklink-device-instance.cpp Changed

@@ -6,6 +6,7 @@
 
 #include <util/platform.h>
 #include <util/threading.h>
+#include <util/util_uint64.h>
 
 #include <sstream>
 #include <algorithm>
@@ -90,8 +91,8 @@
 	if (decklink && !static_cast<DeckLinkInput *>(decklink)->buffering) {
 		currentPacket.timestamp = os_gettime_ns();
 		currentPacket.timestamp -=
-			(uint64_t)frameCount * 1000000000ULL /
-			(uint64_t)currentPacket.samples_per_sec;
+			util_mul_div64(frameCount, 1000000000ULL,
+				       currentPacket.samples_per_sec);
 	}
 
 	int maxdevicechannel = device->GetMaxChannel();
@@ -113,7 +114,7 @@
 	}
 
 	nextAudioTS = timestamp +
-		      ((uint64_t)frameCount * 1000000000ULL / 48000ULL) + 1;
+		      util_mul_div64(frameCount, 1000000000ULL, 48000ULL) + 1;
 
 	obs_source_output_audio(
 		static_cast<DeckLinkInput *>(decklink)->GetSource(),
@@ -191,7 +192,7 @@
 #ifdef LOG_SETUP_VIDEO_FORMAT
 	LOG(LOG_INFO, "Setup video format: %s, %s, %s",
 	    pixelFormat == bmdFormat8BitYUV ? "YUV" : "RGB",
-	    activeColorSpace == VIDEO_CS_709 ? "BT.709" : "BT.601",
+	    activeColorSpace == VIDEO_CS_601 ? "BT.601" : "BT.709",
 	    colorRange == VIDEO_RANGE_FULL ? "full" : "limited");
 #endif
 }

obs-studio-25.0.8.tar.xz/plugins/decklink/decklink-output.cpp -> obs-studio-26.0.0.tar.xz/plugins/decklink/decklink-output.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/linux/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/decklink/linux/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/mac/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/decklink/mac/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/decklink/win/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/decklink/win/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/CMakeLists.txt Changed

@@ -96,12 +96,12 @@
 	Set(PROJECT_LEGAL_TRADEMARKS_1 "Advanced Micro Devices, AMD, AMD Ryzen, Ryzen, AMD Radeon and Radeon are Trademarks of Advanced Micro Devices.")
 	Set(PROJECT_LEGAL_TRADEMARKS_2 "")
 	Set(PROJECT_DESCRIPTION "AMD Encoder integration for OBS Studio")
-	
+
 	Configure_File(
 		"${PROJECT_SOURCE_DIR}/cmake/version.rc.in"
 		"${PROJECT_BINARY_DIR}/cmake/version.rc"
 		@ONLY
-	)	
+	)
 EndIf()
 
 # All Warnings, Extra Warnings, Pedantic
@@ -156,7 +156,7 @@
 # Detect OBS Studio Type
 if(TARGET libobs)
 	message(STATUS "${PROJECT_NAME}: Using native obs-studio.")
-	CacheSet(${PropertyPrefix}OBS_NATIVE TRUE)	
+	CacheSet(${PropertyPrefix}OBS_NATIVE TRUE)
 else()
 	CacheSet(${PropertyPrefix}OBS_NATIVE FALSE)
 	if(EXISTS "${OBS_STUDIO_DIR}/cmake/LibObs/LibObsConfig.cmake")
@@ -192,7 +192,7 @@
 
 # Load OBS Studio
 If(${PropertyPrefix}OBS_NATIVE)
-	Option(BUILD_AMD_ENCODER "Build AMD Encoder module" ON)	
+	Option(BUILD_AMD_ENCODER "Build AMD Encoder module" ON)
 	If (NOT BUILD_AMD_ENCODER)
 		Message(STATUS "Not building AMD Encoder")
 		Return()
@@ -280,6 +280,9 @@
 	${PROJECT_SOURCES}
 	${PROJECT_DATA}
 )
+If(${PropertyPrefix}OBS_NATIVE)
+	Set_Target_Properties(${PROJECT_NAME} PROPERTIES FOLDER "plugins/enc-amf")
+EndIf()
 
 # Include Directories
 Target_Include_Directories(${PROJECT_NAME}
@@ -432,18 +435,18 @@
 			OPTIONAL
 		)
 	ENDIF()
-	
+
 	Install(
 		DIRECTORY "${PROJECT_SOURCE_DIR}/resources/"
 		DESTINATION "./data/obs-plugins/${PROJECT_NAME}/"
 	)
-	
+
 	If("${CMAKE_PACKAGE_SUFFIX_OVERRIDE}" STREQUAL "")
 		Set(PackageFullName "${CMAKE_PACKAGE_PREFIX}/${CMAKE_PACKAGE_NAME}-${PROJECT_VERSION}")
 	Else()
 		Set(PackageFullName "${CMAKE_PACKAGE_PREFIX}/${CMAKE_PACKAGE_NAME}-${CMAKE_PACKAGE_SUFFIX_OVERRIDE}")
 	EndIf()
-	
+
 	Add_Custom_Target(
 		PACKAGE_7Z
 		${CMAKE_COMMAND} -E tar cfv "${PackageFullName}.7z" --format=7zip --

obs-studio-25.0.8.tar.xz/plugins/enc-amf/amf-test/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/amf-test/CMakeLists.txt Changed

@@ -30,7 +30,7 @@
 	else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
 	endif()
-	
+
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 	# Update if necessary
@@ -52,7 +52,7 @@
 #   ${PropertyPrefix}OBS_PACKAGE
 #   AMF_SDK_DIR
 
-IF(WIN32)	
+IF(WIN32)
 	# windows.h
 	add_definitions(-DWIN32_LEAN_AND_MEAN)
 	add_definitions(-DNOGPICAPMASKS)
@@ -126,7 +126,7 @@
 	"${enc-amf_SOURCE_DIR}/include/utility.hpp"
 )
 target_include_directories(enc-amf-test
-	PUBLIC 
+	PUBLIC
 		"${PROJECT_SOURCE_DIR}"
 		"${enc-amf_SOURCE_DIR}/include"
 		"${enc-amf_BINARY_DIR}/include"
@@ -160,10 +160,11 @@
 
 if(${PropertyPrefix}OBS_NATIVE)
 	install_obs_datatarget(enc-amf-test "obs-plugins/enc-amf")
+	Set_Target_Properties(enc-amf-test PROPERTIES FOLDER "plugins/enc-amf")
 else()
 	INSTALL(TARGETS enc-amf-test
 		RUNTIME DESTINATION "./data/obs-plugins/enc-amf/" COMPONENT Runtime
 		LIBRARY DESTINATION "./data/obs-plugins/enc-amf/" COMPONENT Runtime
 	)
-	INSTALL(FILES $<TARGET_PDB_FILE:enc-amf-test> DESTINATION "./data/obs-plugins/enc-amf/" OPTIONAL)	
+	INSTALL(FILES $<TARGET_PDB_FILE:enc-amf-test> DESTINATION "./data/obs-plugins/enc-amf/" OPTIONAL)
 endif()

obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/bg-BG.ini Changed

@@ -4,7 +4,9 @@
 Utility.Switch.Disabled="Изключено"
 Utility.Switch.Enabled="Включено"
 Preset="Шаблон"
+Preset.ResetToDefaults="Възстановяване на първоначалните настройки"
 Preset.Recording="Записване"
+Preset.HighQuality="Високо качество на записа"
 QualityPreset="Шаблон за качество"
 QualityPreset.Speed="Скорост"
 QualityPreset.Balanced="Балансирано"
@@ -14,12 +16,27 @@
 Tier="Клас"
 AspectRatio="Съотношение"
 CodingType="Тип на кодиране"
+RateControlMethod.CQP="Константно QP (CQP)"
+RateControlMethod.CBR="Постоянен битрейт (CBR)"
 Bitrate.Target="Целеви битрейт"
 Bitrate.Peak="Максимален битрейт"
+QP.IFrame="I-кадър QP"
+QP.IFrame.Description="Фиксирана стойност на QP, за да се употреби за I-Кадри."
+QP.PFrame="P-кадър QP"
+QP.BFrame="B-кадър QP"
+QP.Minimum="Минимално QP"
+QP.Maximum="Максимално QP"
+VBAQ="VBAQ"
 GOP.Type.Fixed="Фиксирано"
+GOP.Type.Variable="Променлива"
 GOP.Size="Големина на GOP"
+MotionEstimation="Оценяване на движение"
+MotionEstimation.Half="Половин пиксел"
+MotionEstimation.Full="Четвърт и половина пиксела"
 Video.API="API на видеото"
 Video.Adapter="Видеоадаптер"
+OpenCL.Transfer="Прехвърляне на OpenCL"
+MultiThreading="Многонишковост"
 QueueSize="Големина на опашката"
 View="Режим на преглед"
 View.Basic="Основни"

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/ca-ES.ini Changed

@@ -5,37 +5,44 @@
 Utility.Switch.Enabled="Activat"
 Preset="Configuració preestablerta"
 Preset.ResetToDefaults="Restaura la configuració per defecte"
-Preset.Recording="S'està enregistrant"
+Preset.Recording="Enregistrament"
 Preset.HighQuality="Enregistrament d'alta qualitat"
 Preset.Indistinguishable="Enregistrament indistingible"
 Preset.Lossless="Enregistrament gairebé sense pèrdua"
-Preset.Twitch="Transmissió de Twitch"
-Preset.YouTube="Transmissió de YouTube"
+Preset.Twitch="Transmissió del Twitch"
+Preset.YouTube="Transmissió del YouTube"
 QualityPreset="Qualitat del perfil"
+QualityPreset.Description="La qualitat de la Configuració preestablerta usada per a la codificació, afecta la velocitat i qualitat.\n- '\@QualityPreset.Speed\@' és la codificació més ràpida però amb la pitjor qualitat.\n- '\@QualityPreset.Quality\@' és la codificació més lenta, però obtenint la millor qualitat.\n- '\@QualityPreset.Balanced\@' és el balanç entre les dues variables.\n\nAquesta opció és estàtica i no es pot canviar durant la codificació."
 QualityPreset.Speed="Velocitat"
 QualityPreset.Balanced="Equilibrat"
 QualityPreset.Quality="Qualitat"
 Profile="Perfil"
+Profile.Description="El perfil que s'utilitza per a la codificació, amb millor suport del perfil a la zona superior i amb la millor qualitat a la inferior.\nPer a la majoria de casos, el més correcte és no modificar aquesta opció i deixar la configuració per defecte.\n\nAquesta opció és estàtica i no es pot canviar durant la codificació."
 ProfileLevel="Nivell de perfil"
+ProfileLevel.Description="El nivell a emprar per al perfil que s'utilitza per determinar la resolució màxima i el nombre de fotogrames d'un flux codificat.\nEls valors més alts impliquen menys dispositius compatibles però potencialment una qualitat millor, mentre que amb valors més baixos s'obté un nombre de dispositius compatibles més alt però una qualitat pitjor.\nÉs recomanable deixar el valor per defecte, establert en '\@Utility.Automatic\@' que determinarà el nivell més baix que pot suportar la resolució i el nombre de fotogrames per a una compatibilitat màxima.\n\nAquesta opció és estàtica i no es pot canviar durant la codificació."
 Tier="Nivell"
+Tier.Description="El nivell de codificació.\n- «High» s'utilitza per aconseguir un contingut de ràtio alt, proper a un enregistrament sense pèrdua.\n- «Main» s'utilitza per a retransmetre contingut o un enregistrament estàndard.\n\nAquesta opció és estàtica i no es pot canviar durant la codificació."
 AspectRatio="Relació d'aspecte"
 AspectRatio.Description="Quina relació d'aspecte s'ha d'escriure a l'arxiu de sortida."
 CodingType="Tipus de codificació"
+CodingType.Description="El tipus de codificació a utilitzar quan es codifica el paquet final.\n- '\@Utility.Automatic\@' tria automàticament el millor tipus de codificació (recomanat).\n- 'CALVC' (Context-Adaptive Variable-Length Coding o bé Codificació adaptativa segons el context de longitud variable) és un procés més ràpid, però produeix contingut amb mida més gran. \n- \"CABAC\" (Context-Adaptive Binary Arithmetic Coding o bé Codificació binària d'aritmètica adaptativa) és lleugerament més lent, però la mida del contingut codificat resultant és més petita.\n\nAquesta opció és estàtica i no es pot canviar durant la codificació."
 MaximumReferenceFrames="Fotogrames de referència màxims"
 MaximumReferenceFrames.Description="La quantitat màxima de marcs de referència a utilitzar en el contingut codificat. Afecta directament a la qualitat dels codificadors compatibles.\n\nAquesta opció és estàtica i no es pot canviar durant la codificació."
 RateControlMethod="Mètode de control del flux"
+RateControlMethod.Description="Quin mètode s'hauria d'utilitzar per controlar la ràtio?\n- '\@RateControlMethod.CQP\@' assigna paràmetres fixats de quantització a cada fotograma i es recomana per a enregistrament sense pèrdues de gran qualitat.\n- '\@RateControlMethod.CBR\@' intenta aproximar-se al màxim a la destinació de la \@Bitrate.Target\@, omplint opcionalment amb \@FillerData\@ i es recomana per a la retransmissió en temps real.\n- '\@RateControlMethod.VBR\@' intenta aproximar-se al màxim del \@Bitrate.Peak\@ i, si és possible, baixa el valor de \@Bitrate.Target\@, essent recomanat per a enregistraments de fitxer de mida petita.\n- '\@RateControlMethod.VBRLAT\@' és semblant a '\@RateControlMethod.VBR\@' però tenint en compte la codificació de la latència."
 RateControlMethod.CQP="QP constant (CQP)"
 RateControlMethod.CBR="Flux constant (CBR)"
 RateControlMethod.VBR="Flux variable (pic restringit) (VBR)"
 RateControlMethod.VBRLAT="Flux variable (latència restringida) (VBR_LAT)"
-PrePassMode="Mode passada prèvia"
+PrePassMode="Mode de passada prèvia"
+PrePassMode.Description="El Mode de passada prèvia millora la distribució de bits en una seqüència d'imatges (GOP), tot i que els efectes poden variar depenent del tipus de targeta utilitzada.\nActivar aquesta opció redueix el rendiment de la codificació aproximadament en un 10%, la qual cosa pot provocar una sobrecàrrega de la codificació."
 PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (1/4 de la mida)"
 PrePassMode.Half="\@Utility.Switch.Enabled\@ (1/2 de la mida)"
 PrePassMode.Full="\@Utility.Switch.Enabled\@ (mida completa)"
-Bitrate.Target="Tassa de bits desitjada"
-Bitrate.Target.Description="Tassa de bits a intentar arribar a la seqüència general."
-Bitrate.Peak="Pic de tassa de bits"
-Bitrate.Peak.Description="Tassa de bits a intentar aconseguir com a pic màxim en la seqüència general."
+Bitrate.Target="Taxa de bits desitjada"
+Bitrate.Target.Description="Taxa de bits a intentar arribar a la seqüència general."
+Bitrate.Peak="Pic de taxa de bits"
+Bitrate.Peak.Description="Taxa de bits a intentar aconseguir com a pic màxim en la seqüència general."
 QP.IFrame="I-Frame QP"
 QP.IFrame.Description="Valor fix de QP per I-Frames."
 QP.PFrame="P-Frame QP"
@@ -59,13 +66,13 @@
 FrameSkipping="Omissió de fotogrames"
 FrameSkipping.Description="L'omissió de fotogrames permet al codificador saltar fotogrames per complir amb el requeriment de la\@Bitrate.Target\@.\nQuan el codificador salta un fotograma inserirà una NAL que repetirà l'últim fotograma codificat a la transmissió.\nPot ajudar amb \@Bitrate.Target\@ molt baixes."
 FrameSkipping.Period="Període de salt de fotograma"
-FrameSkipping.Period.Description="Interval (en fotogrames) entre fotogrames omesos. Això es pot utilitzar per simular una tassa de refresc més baix que OBS es fixa mentre es pot tenir un flux vàlid."
+FrameSkipping.Period.Description="Interval (en fotogrames) entre fotogrames omesos. Això es pot utilitzar per simular una taxa de refresc més baix que l'OBS es fixa mentre es pot tenir un flux vàlid."
 FrameSkipping.Behaviour="Comportament del salt de fotograma"
 FrameSkipping.Behaviour.Description="Definiu com es comporta el salt de fotogrames."
 FrameSkipping.SkipNth="Omet només cada N fotograma"
 FrameSkipping.KeepNth="Mantén només cada N fotograma"
 VBAQ="VBAQ"
-VBAQ.Description="En activar l'ús de 'Quantització adaptativa basada en la variació' (VBAQ) que es basa en la variació del pixel per a una millor distribució de la taxa de bits. \nFunciona amb la idea que el sistema visual humà és menys sensible als artefactes en àrees altament texturades i així mourà la tassa de bits cap a superfícies més suaus. \nEn activar-lo pot portar a millores en la qualitat subjectiva en cert contingut."
+VBAQ.Description="En activar l'ús de 'Quantització adaptativa basada en la variació' (VBAQ) que es basa en la variació del píxel per a una millor distribució de la taxa de bits. \nFunciona amb la idea que el sistema visual humà és menys sensible als artefactes en àrees altament texturades i així mourà la taxa de bits cap a superfícies més suaus. \nEn activar-lo pot portar a millores en la qualitat subjectiva en cert contingut."
 EnforceHRD="Força l'HRD"
 EnforceHRD.Description="Força l'ús d'un descodificador de referència hipotètic que s'utilitza per verificar que el flux de marcs de sortida es correcte."
 VBVBuffer="Memòria intermèdia VBV"
@@ -73,7 +80,7 @@
 VBVBuffer.Strictness="Rigorositat de la memòria intermèdia VBV"
 VBVBuffer.Strictness.Description="Determina la rigidesa de la memòria intermèdia VBV, con 100% essent tant estricte com sigui possible i 0% sense restricció."
 VBVBuffer.Size="Mida de la memòria intermèdia VBV"
-VBVBuffer.Size.Description="La mida de la memòria intermèdia VBV que s'utilitza per al control de la tassa de marcs en una seqüencia."
+VBVBuffer.Size.Description="La mida de la memòria intermèdia VBV que s'utilitza per al control de la taxa de marcs en una seqüència."
 VBVBuffer.InitialFullness="Amplitud inicial de la memòria intermèdia VBV"
 VBVBuffer.InitialFullness.Description="Com de ple és la memòria intermèdia VMV inicialment (en %), només afectarà la seqüència inicial de la codificació."
 Interval.Keyframe="Interval de fotogrames clau"

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/cs-CZ.ini Changed

@@ -12,28 +12,37 @@
 Preset.Twitch="Twitch vysílání"
 Preset.YouTube="YouTube vysílání"
 QualityPreset="Profil kvality"
+QualityPreset.Description="Předvolba kvality, která se používá pro kódování, ovlivňuje rychlost a kvalitu.\n- '\@QualityPreset.Speed\@' má nejvyšší rychlost a nejhorší kvalitu.\n- '\@QualityPreset.Quality\@' má nejvyšší kvalitu a nejhorší rychlost.\n- '\@QualityPreset.Balanced\@' je vyvážená směs obou možností.\n\nTato možnost je statická a nelze ji měnit během kódování."
 QualityPreset.Speed="Rychlost"
 QualityPreset.Balanced="Vyvážený"
 QualityPreset.Quality="Kvalita"
 Profile="Profil"
+Profile.Description="Profil, který se používá pro kódování, s lépe podporovanými profily v horní a vyšší kvalitě v dolní části.\nPro většinu případů je nejlepší neměnit tuto možnost a ponechat ji na výchozí hodnotě.\n\nTato volba je statická a nelze ji změnit během kódování."
 ProfileLevel="Úroveň profilu"
 Tier="Úroveň"
 AspectRatio="Poměr stran"
+AspectRatio.Description="Jaký poměr stran by měl být zapsán do výstupního souboru."
 CodingType="Typ kódování"
 MaximumReferenceFrames="Maximum referenčních snímků"
 RateControlMethod.CQP="Konstantní QP (CQP)"
 RateControlMethod.CBR="Konstantní bitrate (CBR)"
 RateControlMethod.VBR="Proměnný bitrate (vázán špičkou) (VBR)"
 RateControlMethod.VBRLAT="Proměnný bitrate (vázán odezvou) (VBRLAT)"
+PrePassMode="Pre-Pass režim"
+PrePassMode.Description="Pre-Pass zlepšuje distribuci bitové rychlosti v rámci sekvence (GOP), ale účinky se mohou lišit podle karty na kartu.\nZapnutí této funkce snižuje výkon kódování přibližně o 10%, což může vést k přetížení kódování."
 PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (čtvrtinová velikost)"
 PrePassMode.Half="\@Utility.Switch.Enabled\@ (poloviční velikost)"
 PrePassMode.Full="\@Utility.Switch.Enabled\@ (plná velikost)"
 Bitrate.Target="Cílový bitrate"
 Bitrate.Peak="Špičkový bitrate"
 QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Pevná hodnota QP používaná pro I-Frames."
 QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Pevná hodnota QP používaná pro P-Frames."
 QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Pevná hodnota QP používaná pro B-Frames."
 QP.Minimum="Minimální QP"
+QP.Minimum.Description="Nejnižší hodnota QP pro použití v rámečku."
 QP.Maximum="Maximální QP"
 FillerData="Plnivo"
 FrameSkipping="Přeskakování snímků"
@@ -51,15 +60,42 @@
 Interval.Keyframe.Description="Interval mezi klíčovými snímky (vteřiny)."
 Period.IDR.H264="Interval IDR (snímky)"
 Period.IDR.H265="Interval IDR (GOP)"
+GOP.Type="Typ GOP"
+GOP.Type.Description="Jaký typ GOP by měl být použit:\n- '\@GOP.Type.Fixed\@' bude vždy používat pevné vzdálenosti mezi jednotlivými GOP.\n- '\@GOP.Type.Variable\@' umožňuje GOP různých velikostí v závislosti na potřebách.\n'\@GOP.Type.Fixed\@' funguje implementace H264 a je nejlepší pro lokální síťové streamování, zatímco '\@GOP.Type.Variable\@' je nejlepší pro málo kvalitní nahrávky."
 GOP.Type.Variable="Proměnná"
+BFrame.Pattern="Vzor B-Frame"
+BFrame.Pattern.Description="Množství B-snímků, které se mají použít při kódování.\nPodporováno kartami VCE 2. a 3. generace. Negativní dopad na výkonnost kódování."
+BFrame.DeltaQP="B-Frame Delta QP"
+BFrame.DeltaQP.Description="Hodnota Delta QP k poslednímu I- nebo P-snímku pro nereferenční B-snímky."
+BFrame.Reference="B-Frame reference"
+BFrame.Reference.Description="Povolit B-snímek, aby používal B-snímky jako referenci, namísto pouze P- a I-snímků."
+BFrame.ReferenceDeltaQP="B-Frame Reference Delta QP"
+BFrame.ReferenceDeltaQP.Description="Hodnota Delta QP k poslednímu I- nebo P-snímku pro referenční B-snímky."
+DeblockingFilter="Deblokovací filtr"
+DeblockingFilter.Description="Povolit dekodéru použít deblokovací filtr."
 MotionEstimation="Odhad pohybu"
+MotionEstimation.Description="Odhad pohybu umožňuje enkodéru snížit požadovaný bitrate předpovídáním, kam se určitý pixel posunul."
+MotionEstimation.Quarter="Čtvrtinový pixel"
+MotionEstimation.Half="Poloviční pixel"
+MotionEstimation.Full="Čtvrteční a poloviční pixel"
+Video.API="Grafické rozhraní (API)"
+Video.API.Description="Jaké API má být použito?"
 Video.Adapter="Grafický adaptér"
+Video.Adapter.Description="Na jakém adaptéru bychom se měli pokusit kódovat?"
+OpenCL.Transfer="Převod OpenCL"
+OpenCL.Transfer.Description="Přeneste snímek do GPU pomocí OpenCL místo mapované paměti. Přenos přes OpenCL je při používání GPU méně sporadický než přenos přes mapované paměti."
+OpenCL.Conversion="Převod OpenCL"
+OpenCL.Conversion.Description="Převést snímek na GPU pomocí OpenCL namísto DirectCompute."
 MultiThreading="Multi-Threading"
+MultiThreading.Description="Použijte více než jedno vlákno pro zpracování odesílaných snímků a načítání paketů. To může pomoci pomalejším procesorům, ale bude celkově využívat více systémových zdrojů. To bude mít negativní dopad na rychlejší procesory."
 QueueSize="Velikost fronty"
+QueueSize.Description="Přidej do fronty tolik snímků pro enkodér, předtím, než začnete načítat pakety. Vyšší hodnota zavádí vyšší latenci zatímco nižší hodnota může způsobit přetížení enkódování. Není doporučeno toto změnit od výchozího nastavení."
 View="Režim zobrazení"
+View.Description="Které vlastnosti by měly být viditelné?\n- '\@View.Basic\@' je nejzákladnější pohled a je doporučen pro všechny.\n- '\@View.Advanced\@' zobrazuje více možností, jako je podpora více GPU a je doporučeno pro pokročilé uživatele.\n- '\@View. xpert\@' ukazuje nebezpečné možnosti, které mohou způsobit vážné problémy, a je je doporučeno pouze pokud skutečně víte, co děláte.\n- '\@View.Master\@' odstraní všechna omezení prohlížení a zobrazí všechny možnosti, které mohou způsobit chyby hardwaru.\n\nOBS a správci pluginů nejsou odpovědní za žádné škody vyplývající z vašich akcí podle licenční smlouvy. Používání '\@View.Master\@' vás vylučuje z jakékoli podpory pro jakékoli problémy, které mohou nastat."
 View.Basic="Základní"
 View.Advanced="Pokročilý"
 View.Expert="Expert"
 View.Master="Mistr"
 Debug="Ladění"
+Debug.Description="Povolit další ladící zprávy do souboru protokolu OBS.\nTo vyžaduje, abyste OBS Studio spustili pomocí '--verbose --unfiltered_log' (odstraňte ' ) na příkazovém řádku.\nUpozornění: To způsobí nižší celkový výkon OBS z důvodu počtu zpráv o ladění, které vytváří, použijte pouze v případě, že je k tomu pokyn nebo při pokusu o vyřešení problému s kódováním."

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/de-DE.ini Changed

@@ -7,35 +7,35 @@
 Preset.ResetToDefaults="Standardeinstellungen wiederherstellen"
 Preset.Recording="Aufnahme"
 Preset.HighQuality="Hochqualitative Aufnahme"
-Preset.Indistinguishable="Ununterscheidbare Aufnahmequalität"
+Preset.Indistinguishable="Ununterscheidbare Aufnahme"
 Preset.Lossless="Fast verlustfreie Aufnahme"
 Preset.Twitch="Twitch‐Streaming"
 Preset.YouTube="YouTube‐Streaming"
 QualityPreset="Qualitätsvoreinstellung"
-QualityPreset.Description="Die für die Kodierung verwendete Qualitätsvoreinstellung beeinflusst Geschwindigkeit und Qualität.\n– „\@QualityPreset.Speed\@“ hat die höchste Geschwindigkeit und niedrigste Qualität.\n– „\@QualityPreset.Quality\@“ hat die niedrigste Geschwindigkeit und höchste Qualität.\n– „\@QualityPreset.Balanced\@“ ist ein ausgeglichender Mix aus beidem.\n\nDiese Option ist statisch und kann während dem Kodieren nicht verändert werden."
+QualityPreset.Description="Die für die Codierung verwendete Qualitätsvoreinstellung beeinflusst Geschwindigkeit und Qualität.\n– „\@QualityPreset.Speed\@“ hat die höchste Geschwindigkeit und niedrigste Qualität.\n– „\@QualityPreset.Quality\@“ hat die niedrigste Geschwindigkeit und höchste Qualität.\n– „\@QualityPreset.Balanced\@“ ist ein ausgeglichender Mix aus beidem.\n\nDiese Option ist statisch und kann während dem Codieren nicht verändert werden."
 QualityPreset.Speed="Geschwindigkeit"
 QualityPreset.Balanced="Ausgeglichen"
 QualityPreset.Quality="Qualität"
 Profile="Profil"
-Profile.Description="Das für die Kodierung verwendete Profil. Die am besten unterstützten Profile stehen oben, die qualitativ hochwertigeren unten.\nIn den meisten Fällen ist es das Beste, diesen Wert nicht zu verändern.\n\nDiese Option ist statisch und kann während dem Kodieren nicht verändert werden."
+Profile.Description="Das für die Codierung verwendete Profil. Die am besten unterstützten Profile stehen oben, die qualitativ hochwertigeren unten.\nIn den meisten Fällen ist es das Beste, diesen Wert nicht zu verändern.\n\nDiese Option ist statisch und kann während dem Codieren nicht verändert werden."
 ProfileLevel="Profillevel"
-ProfileLevel.Description="Das für die Bestimmung der Auflösung und Framerate für einen kodierten Stream verwendete Profillevel.\nHöhere Werte bedeuten weniger unterstützte Geräte, aber potenziell bessere Qualität, wobei niedrigere Werte mehr unterstützte Geräte bieten, aber für potenziell schlechtere Qualität sorgen.\nLassen Sie am besten den Wert auf „\@Utility.Automatic\@“, welcher automatisch das niedrigste Level wählt, welches die Auflösung und Framerate für die beste Kompatiblität unterstützt.\n\nDiese Option ist statisch und kann während dem Kodieren nicht verändert werden."
+ProfileLevel.Description="Das für die Bestimmung der Auflösung und Framerate für einen codierten Stream verwendete Profillevel.\nHöhere Werte bedeuten weniger unterstützte Geräte, aber potenziell bessere Qualität, wobei niedrigere Werte mehr unterstützte Geräte bieten, aber für potenziell schlechtere Qualität sorgen.\nLassen Sie am besten den Wert auf „\@Utility.Automatic\@“, welcher automatisch das niedrigste Level wählt, welches die Auflösung und Framerate für die beste Kompatiblität unterstützt.\n\nDiese Option ist statisch und kann während dem Codieren nicht verändert werden."
 Tier="Stufe"
-Tier.Description="Die Stufe für die Kodierung.\n– „High“ ist für eine hohe Bitrate, z. B. für fast verlustfreie Aufnahmen.\n– „Main“ ist für Streamingmedien oder normale Aufnahmen.\n\nDiese Option ist statisch und kann während dem Kodieren nicht verändert werden."
+Tier.Description="Die Stufe für die Codierung.\n– „High“ ist für eine hohe Bitrate, z. B. für fast verlustfreie Aufnahmen.\n– „Main“ ist für Streamingmedien oder normale Aufnahmen.\n\nDiese Option ist statisch und kann während dem Codieren nicht verändert werden."
 AspectRatio="Seitenverhältnis"
-AspectRatio.Description="Welches Seitenverhältnis in die kodierte Ausgabedatei geschrieben werden soll."
-CodingType="Kodierungstyp"
-CodingType.Description="Die Art des Codes, die beim Kodieren des letzten Pakets verwendet werden soll.\n– „\@Utility.Automatic\@“ wählt die automatisch beste Codeart (empfohlen).\n– „CALVC“ (Context‐Adaptive Variable‐Length Coding) ist etwas schneller, aber resultiert in eine größere Inhaltsgröße.\n– „CABAC“ (Context‐Adaptive Binary Arithmetic Coding) ist ein wenig langsamer, aber resultiert im Gegensatz in eine kleinere Größe.\n\nDiese Option ist statisch und kann während dem Kodieren nicht verändert werden."
+AspectRatio.Description="Welches Seitenverhältnis in die Ausgabedatei geschrieben werden soll."
+CodingType="Codierungstyp"
+CodingType.Description="Die Art des Codes, die beim Codieren des letzten Pakets verwendet werden soll.\n– „\@Utility.Automatic\@“ wählt die automatisch beste Codeart (empfohlen).\n– „CALVC“ (Context‐Adaptive Variable‐Length Coding) ist etwas schneller, aber resultiert in eine größere Inhaltsgröße.\n– „CABAC“ (Context‐Adaptive Binary Arithmetic Coding) ist ein wenig langsamer, aber resultiert in einer kleineren Größe.\n\nDiese Option ist statisch und kann während dem Codieren nicht verändert werden."
 MaximumReferenceFrames="Maximale Referenzframes"
-MaximumReferenceFrames.Description="Die maximale Anzahl an referenzierbaren Frames, die für die kodierten Inhalte verwendet werden können. Beeinflusst direkt die Qualität für Kodierer, die dies unterstützen.\n\nDiese Option ist statisch und kann während dem Kodieren nicht verändert werden."
+MaximumReferenceFrames.Description="Die maximale Anzahl an referenzierbaren Frames, die für die codierten Inhalte verwendet werden können. Beeinflusst direkt die Qualität für Encoder, die dies unterstützen.\n\nDiese Option ist statisch und kann während dem Codieren nicht verändert werden."
 RateControlMethod="Qualitätsregulierungsmethode"
-RateControlMethod.Description="Welche Methode soll für die Regulierung der (Bit‐)Rate verwendet werden?\n– „\@RateControlMethod.CQP\@“ weist festgelegte Quantisierungsparameter jedem Frame zu und ist für hochqualitative, fast verlustfreie Aufnahmen empfohlen.\n– „\@RateControlMethod.CBR\@“ versucht so nah wie möglich an die \@Bitrate.Target\@ zu kommen; füllt sie optional mit \@FillerData\@ auf und ist deswegen für das Sreamen geeignet.\n– „\@RateControlMethod.VBR\@“ versucht so nah wie möglich an der \@Bitrate.Peak\@ zu bleiben und geht so nah wie möglich an die \@Bitrate.Target\@; empfohlen für Aufnahmen mit kleiner Größe.\n– „\@RateControlMethod.VBRLAT\@“ ist gleich mit „\@RateControlMethod.VBR\@“, aber berücksichtigt stattdessen die Latenzzeit der Kodierung."
+RateControlMethod.Description="Welche Methode soll für die Regulierung der (Bit‐)Rate verwendet werden?\n– „\@RateControlMethod.CQP\@“ weist jedem Frame festgelegte Quantisierungsparameter zu und ist für hochqualitative, fast verlustfreie Aufnahmen empfohlen.\n– „\@RateControlMethod.CBR\@“ versucht so nah wie möglich an die \@Bitrate.Target\@ zu kommen; füllt sie optional mit \@FillerData\@ auf und ist deswegen für das Sreamen geeignet.\n– „\@RateControlMethod.VBR\@“ versucht so nah wie möglich an der \@Bitrate.Peak\@ zu bleiben und geht so nah wie möglich an die \@Bitrate.Target\@; empfohlen für Aufnahmen mit kleiner Größe.\n– „\@RateControlMethod.VBRLAT\@“ ist gleichgesetzt mit „\@RateControlMethod.VBR\@“, aber berücksichtigt stattdessen die Latenzzeit der Codierung."
 RateControlMethod.CQP="Konstanter QP (CQP)"
 RateControlMethod.CBR="Konstante Bitrate (CBR)"
 RateControlMethod.VBR="Variable Bitrate (Eingeschränkt durch Spitzenbitrate) (VBR)"
 RateControlMethod.VBRLAT="Variable Bitrate (Eingeschränkt durch Latenz) (VBRLAT)"
 PrePassMode="Vordurchlaufsmodus"
-PrePassMode.Description="Pre‐Pass verbessert die Bitratenverteilung innerhalb einer Sequenz (GOP), jedoch können die Auswirkungen davon von Karte zu Karte variieren.\nWenn Sie dies aktivieren, wird die Kodierungsleistung um etwa 10 % reduziert, was zu einer Überlastung der Kodierung führen kann."
+PrePassMode.Description="Pre‐Pass verbessert die Bitratenverteilung innerhalb einer Sequenz (GOP), jedoch können die Auswirkungen davon von Karte zu Karte variieren.\nWenn Sie dies aktivieren, wird die Codierungsleistung um etwa 10 % reduziert, was zu einer Überlastung der Codierung führen kann."
 PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (ein Viertel der Größe)"
 PrePassMode.Half="\@Utility.Switch.Enabled\@ (die Hälfte der Größe)"
 PrePassMode.Full="\@Utility.Switch.Enabled\@ (Volle Größe)"
@@ -62,9 +62,9 @@
 QP.PFrame.Maximum="Maximaler P‐Frame‐QP"
 QP.PFrame.Maximum.Description="Höchster QP‐Wert, der in einem P‐Frame verwendet wird."
 FillerData="Fülldaten"
-FillerData.Description="Das Aktivieren von Fülldaten erlaubt es dem Kodierer, mindestens die \@Bitrate.Target\@ zu erreichen, indem dieser den verbleibenden Platz mit leeren Informationen füllt."
+FillerData.Description="Das Aktivieren von Fülldaten erlaubt es dem Encoder, mindestens die \@Bitrate.Target\@ zu erreichen, indem dieser den verbleibenden Platz mit leeren Informationen füllt."
 FrameSkipping="Frameüberspringung"
-FrameSkipping.Description="Die Frameüberspringung erlaubt es dem Kodierer, Frames zu überspringen, um die \@Bitrate.Target\@ einzuhalten.\nWenn der Kodierer ein Frame überspringt, fügt dieser stattdessen ein Repeat‐Last‐Frame‐NAL in den Stream ein.\nKann bei sehr niedriger \@Bitrate.Target\@ helfen."
+FrameSkipping.Description="Die Frameüberspringung erlaubt es dem Encoder, Frames zu überspringen, um die \@Bitrate.Target\@ einzuhalten.\nWenn der Encoder ein Frame überspringt, fügt dieser stattdessen ein Repeat‐Last‐Frame‐NAL in den Stream ein.\nKann bei sehr niedriger \@Bitrate.Target\@ helfen."
 FrameSkipping.Period="Frameüberspringungsperiode"
 FrameSkipping.Period.Description="Intervall (in Frames) zwischen übersprungenen Frames. Dies kann eine niedrigere Framerate als von OBS benutzt simulieren und trotzdem korrekt streamen."
 FrameSkipping.Behaviour="Frameüberspringungsverhaltensweise"
@@ -72,9 +72,9 @@
 FrameSkipping.SkipNth="Nur jeden N‐ten Frame überspringen"
 FrameSkipping.KeepNth="Nur jeden N‐ten Frame behalten"
 VBAQ="VBAQ"
-VBAQ.Description="Aktivieren Sie die Verwendung von „Auf Varianz basierte adaptive Quantisierung“ (VBAQ), welche auf Pixelveränderung basiert ist, um die Bitrate besser zu verteilen.\nSie basiert auf der Idee, dass das menschliche Auge weniger anfällig für Artefakte in stark strukturierten Flächen ist und erhöt so die Bitrate bei glatten Oberflächen.\nDie Aktivierung kann zu Verbesserungen der subjektiven Qualität mit bestimmten Inhalten führen."
+VBAQ.Description="Aktivieren Sie die Verwendung von „Varianz‐basierte adaptive Quantisierung“ (VBAQ), welche auf Pixelveränderung basiert ist, um die Bitrate besser zu verteilen.\nSie basiert auf der Idee, dass das menschliche Auge weniger anfällig für Artefakte in stark strukturierten Flächen ist und erhöt so die Bitrate bei glatten Oberflächen.\nDie Aktivierung kann zu Verbesserungen der subjektiven Qualität mit bestimmten Inhalt führen."
 EnforceHRD="HRD erzwingen"
-EnforceHRD.Description="Die Nutzung eines hypothetischen Referenz‐Dekodierers, welcher für die Verifizierung des ausgehenden Datenstroms verwendet wird, erzwingen."
+EnforceHRD.Description="Die Nutzung eines hypothetischen Referenz‐Decoders, welcher für die Verifizierung des ausgehenden Datenstroms verwendet wird, erzwingen."
 VBVBuffer="VBV‐Puffer"
 VBVBuffer.Description="Welche Methode für die Bestimmung der VBV‐Puffergröße verwendet werden soll:\n– „\@Utility.Automatic\@“ berechnet die Größe nach einer bestimmten Beschränkung.\n– „\@Utility.Manual\@“ erlaubt es dem Nutzer, die Größe zu kontrollieren.\nDer VBV(Video Buffering Verifier)‐Puffer wird von mehreren Ratenkontrollmethoden verwendet, um die gesamte Bitrate in den Beschränkungen zu halten."
 VBVBuffer.Strictness="VBV‐Puffergenauigkeit"
@@ -82,13 +82,13 @@
 VBVBuffer.Size="VBV‐Puffergröße"
 VBVBuffer.Size.Description="Die VBV‐Puffergröße, die für die Bitratenkontrolle in einer Sequenz verwendet wird."
 VBVBuffer.InitialFullness="Anfangsfüllung des VBV‐Puffers"
-VBVBuffer.InitialFullness.Description="Wie voll der VBV‐Puffer am Anfang ist (in %), hat nur einen Effekt auf die erste Sequenz beim Kodieren."
+VBVBuffer.InitialFullness.Description="Wie voll der VBV‐Puffer am Anfang ist (in %), hat nur einen Effekt auf die erste Sequenz beim Codieren."
 Interval.Keyframe="Keyframeintervall"
 Interval.Keyframe.Description="Intervall (in Sekunden) zwischen Keyframes."
 Period.IDR.H264="IDR‐Intervall (in Frames)"
-Period.IDR.H264.Description="Definiert die Distanz zwischen Sofort‐Dekodiereraktualisierungen (IDR) in Frames."
+Period.IDR.H264.Description="Definiert die Distanz zwischen Sofort‐Decoderaktualisierungen (IDR) in Frames."
 Period.IDR.H265="IDR‐Periode (in GOPs)"
-Period.IDR.H265.Description="Definiert die Distanz zwischen sofortigen Dekodiereraktualisierungen (IDR) in GOPs."
+Period.IDR.H265.Description="Definiert die Distanz zwischen sofortigen Decoderaktualisierungen (IDR) in GOPs."
 Interval.IFrame="I‐Frame‐Intervall"
 Interval.IFrame.Description="Intervall (in Sekunden) zwischen I‐Frames. I‐Frames haben vorrang vor P‐ und B‐Frames."
 Period.IFrame="I‐Frameperiode (in Frames)"
@@ -114,7 +114,7 @@
 GOP.Alignment="GOP‐Ausrichtung"
 GOP.Alignment.Description="Experimentell, Effekte sind unbekannt. Verwendung auf eigene Gefahr."
 BFrame.Pattern="B‐Framestruktur"
-BFrame.Pattern.Description="Anzahl an B‐Frames, die beim Kodieren verwendet werden soll.\nWird von der 2. und 3. Generation von VCE‐Karten unterstützt. Hat negativen Einfluss auf Kodierungsleistung."
+BFrame.Pattern.Description="Anzahl an B‐Frames, die beim Codieren verwendet werden soll.\nWird von der 2. und 3. Generation von VCE‐Karten unterstützt. Hat negativen Einfluss auf Codierungsleistung."
 BFrame.DeltaQP="B‐Frame‐Delta‐QP"
 BFrame.DeltaQP.Description="Delta‐QP‐Wert zum letzten I‐ oder P‐Frame für nicht referenzierbare B‐Frames."
 BFrame.Reference="B‐Framereferenz"
@@ -122,16 +122,16 @@
 BFrame.ReferenceDeltaQP="B‐Framereferenz‐Delta‐QP"
 BFrame.ReferenceDeltaQP.Description="Delta‐QP‐Wert zum letzten I‐ oder P‐Frame für referenzierbare B‐Frames."
 DeblockingFilter="Entblockungsfilter"
-DeblockingFilter.Description="Erlaubt es dem Dekodierer einen Entblockungsfilter zu verwenden."
+DeblockingFilter.Description="Erlaubt es dem Decoder einen Entblockungsfilter zu verwenden."
 MotionEstimation="Bewegungsschätzung"
-MotionEstimation.Description="Bewegungsschätzung erlaubt es dem Kodierer, die benötigte Bitrate zu reduzieren, indem dieser versucht zu erkennen, wo sich ein Pixel hinbewegt hat."
+MotionEstimation.Description="Bewegungsschätzung erlaubt es dem Encoder, die benötigte Bitrate zu reduzieren, indem dieser versucht zu erkennen, wo sich ein Pixel hinbewegt hat."
 MotionEstimation.Quarter="Viertel‐Pixel"
 MotionEstimation.Half="Halb‐Pixel"
 MotionEstimation.Full="Viertel‐ & Halb‐Pixel"
 Video.API="Video‐API"
 Video.API.Description="Welche API soll im Hintergrund verwendet werden?"
 Video.Adapter="Video‐Adapter"
-Video.Adapter.Description="Auf welchem Adapter soll versucht werden zu kodieren?"
+Video.Adapter.Description="Auf welchem Adapter soll versucht werden, zu codieren?"
 OpenCL.Transfer="OpenCL‐Übertragung"
 OpenCL.Transfer.Description="Überträgt Frames auf die GPU mit OpenCL anstatt auf einen zugeordneten Speicher. Übertragungen mit OpenCL sind weniger unregelmäßig als Übertragungen über zugeordnetem Speicher, während die GPU benutzt wird."
 OpenCL.Conversion="OpenCL‐Konvertierung"
@@ -139,13 +139,13 @@
 MultiThreading="Multi‐Threading"
 MultiThreading.Description="Verwendet mehr als einen Thread für das Senden von Frames und Erhalten von Paketen. Dies kann auf langsameren CPUs helfen, aber nutzt dafür insgesamt mehr Systemressourcen. Dies hat einen negativen Leistungseinfluss auf schnelleren CPUs."
 QueueSize="Warteschlangengröße"
-QueueSize.Description="Reiht diese Menge an Frames ein und versucht erst danach Pakete zu erhalten. Ein höherer Wert führt zu höherer Latenz, während ein niedrigerer Wert möglicherweise den Kodierer überlastet. Es wird nicht empfohlen, die Standardeinstellung zu verändern."
+QueueSize.Description="Reiht diese Menge an Frames ein und versucht erst danach Pakete zu erhalten. Ein höherer Wert führt zu höherer Latenz, während ein niedrigerer Wert möglicherweise den Encoder überlastet. Es wird nicht empfohlen, die Standardeinstellung zu verändern."
 View="Ansichtsmodus"
-View.Description="Welche Optionen sollen sichtbar sein?\n– „\@View.Basic“ ist die einfachste Ansicht und für jedermann empfohlen.\n– „\@View.Advanced\@“ zeigt weitere Optionen wie Multi‐GPU‐Unterstützung an und ist nur für erfahrene Nutzer empfohlen.\n– „\@View.Expert“ zeigt unsichere Optionen an, welche möglicherweise schwerwiegende Probleme verursachen können und ist deshalb nur für Experten empfohlen.\n– „\@View.Master\@“ entfernt alle Einschränkungen und zeigt alle Optionen, inklusive denen, die Hardwaredefekte verursachen können, an.\n\nOBS und die Pluginentwickler können nach dem Lizenzabkommen für keinerlei Schäden, die durch Ihre Aktionen verursacht werden, haftbar gemacht werden. Das Verwenden von „\@View.Master\@“ verweigert Ihnen für alle entstehenden Probleme jegliche Art von Support."
+View.Description="Welche Optionen sollen sichtbar sein?\n– „\@View.Basic\@“ ist die einfachste Ansicht und für jeden empfohlen.\n– „\@View.Advanced\@“ zeigt weitere Optionen wie Multi‐GPU‐Unterstützung an und ist nur für erfahrene Nutzer empfohlen.\n– „\@View.Expert\@“ zeigt unsichere Optionen an, welche möglicherweise schwerwiegende Probleme verursachen können und ist deshalb nur für Experten empfohlen.\n– „\@View.Master\@“ entfernt alle Einschränkungen und zeigt alle Optionen, inklusive denen, die Hardwaredefekte verursachen können, an.\n\nOBS und die Pluginentwickler können nach dem Lizenzabkommen für keinerlei Schäden, die durch Ihre Aktionen verursacht werden, haftbar gemacht werden.\nDas Verwenden von „\@View.Master\@“ verweigert Ihnen für alle entstehenden Probleme jegliche Art von Support."
 View.Basic="Einfach"
 View.Advanced="Erweitert"
 View.Expert="Experte"
-View.Master="Meister"
+View.Master="Master"
 Debug="Protokollieren"
-Debug.Description="Zusätzliche Protokollnachrichten aktivieren, die in die OBS‐Protokolldatei geschrieben werden.\nDies benötigt den Start von OBS Studio mit „--verbose --unfiltered_log“ (ohne Anführungszeichen) in der Kommandozeile.\nWarnung: Dies wird die OBS‐Leistung durch eine enorme Menge an Protokollnachrichten verringern und sollte deshalb nur aktiviert werden, sofern man entweder ein Problem versucht zu lösen oder dazu angewiesen wurde."
+Debug.Description="Zusätzliche Lognachrichten aktivieren, die in die OBS‐Logdatei geschrieben werden.\nDies benötigt den Start von OBS Studio mit „--verbose --unfiltered_log“ (ohne Anführungszeichen) in der Kommandozeile.\nWarnung: Dies wird die OBS‐Leistung durch eine enorme Menge an Lognachrichten verringern und sollte deshalb nur aktiviert werden,\nsofern man entweder ein Problem versucht zu lösen oder dazu angewiesen wurde."

obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/en-GB.ini Added

@@ -0,0 +1,151 @@
+Utility.Default="Default"
+Utility.Automatic="Automatic"
+Utility.Manual="Manual"
+Utility.Switch.Disabled="Disabled"
+Utility.Switch.Enabled="Enabled"
+Preset="Preset"
+Preset.ResetToDefaults="Restore Default Settings"
+Preset.Recording="Recording"
+Preset.HighQuality="High Quality Recording"
+Preset.Indistinguishable="Indistinguishable Recording"
+Preset.Lossless="Near Lossless Recording"
+Preset.Twitch="Twitch Streaming"
+Preset.YouTube="YouTube Streaming"
+QualityPreset="Quality Preset"
+QualityPreset.Description="The Quality Preset that is used for encoding, affects speed and quality.\n- '\@QualityPreset.Speed\@' has the highest speed and worst quality.\n- '\@QualityPreset.Quality\@' has the highest quality and worst speed.\n- '\@QualityPreset.Balanced\@' is a balanced mixture of the two.\n\nThis option is static and can not be changed during encoding."
+QualityPreset.Speed="Speed"
+QualityPreset.Balanced="Balanced"
+QualityPreset.Quality="Quality"
+Profile="Profile"
+Profile.Description="The profile that is used for encoding, with better supported profiles at the top and higher quality profiles at the bottom.\nFor the majority of cases, it is best to not change this option and leave it on the default value.\n\nThis option is static and can not be changed during encoding."
+ProfileLevel="Profile Level"
+ProfileLevel.Description="The level to use for the profile which is used to determine the maximum resolution and framerate for an encoded stream.\nHigher values mean less supported devices but potentially better quality, while lower values mean more supported devices but potentially worse quality.\nIt is best to leave this at the default value of '\@Utility.Automatic\@' which will pick the lowest level that can support the resolution and framerate for maximum compatibility.\n\nThis option is static and can not be changed during encoding."
+Tier="Tier"
+Tier.Description="The tier to encode with.\n- 'High' is used for high bitrate content like near lossless recording.\n- 'Main' is used for streaming media or normal recording.\n\nThis option is static and can not be changed during encoding."
+AspectRatio="Aspect Ratio"
+AspectRatio.Description="Which Aspect Ratio should be written into the output file."
+CodingType="Coding Type"
+CodingType.Description="The type of coding to use when encoding the final packet.\n- '\@Utility.Automatic\@' automatically chooses the best coding type (recommended).\n- 'CALVC' (Context-Adaptive Variable-Length Coding) is slightly faster, but results in larger encoded content size.\n- 'CABAC' (Context-Adaptive Binary Arithmetic Coding) is slightly slower, but results in smaller encoded content size.\n\nThis option is static and can not be changed during encoding."
+MaximumReferenceFrames="Maximum Reference Frames"
+MaximumReferenceFrames.Description="The maximum amount of reference frames to use in the encoded content. Directly affects quality for encoders that support this.\n\nThis option is static and can not be changed during encoding."
+RateControlMethod="Rate Control Method"
+RateControlMethod.Description="What method should be used to control the (bit)rate?\n- '\@RateControlMethod.CQP\@' assigns fixed quantisation parameters to each frame and is recommended for high quality to near lossless recording.\n- '\@RateControlMethod.CBR\@' attempts to get as close as possible to the \@Bitrate.Target\@, optionally filling it with \@FillerData\@, and is recommended for streaming.\n- '\@RateControlMethod.VBR\@' attempts to get as close as possible to the \@Bitrate.Peak\@ and if possible goes as low as the \@Bitrate.Target\@, and is recommended for small size recording.\n- '\@RateControlMethod.VBRLAT\@' is similar to '\@RateControlMethod.VBR\@' but instead takes into account encoding latency."
+RateControlMethod.CQP="Constant QP (CQP)"
+RateControlMethod.CBR="Constant Bitrate (CBR)"
+RateControlMethod.VBR="Variable Bitrate (Peak Constrained) (VBR)"
+RateControlMethod.VBRLAT="Variable Bitrate (Latency Constrained) (VBRLAT)"
+PrePassMode="Pre-Pass Mode"
+PrePassMode.Description="Pre-Pass improves the bitrate distribution within a sequence (GOP), however the effects of this may vary from card to card.\nEnabling this reduces encoding performance by roughly 10%, which may result in encoding being overloaded."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (Quarter Size)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (Half Size)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (Full Size)"
+Bitrate.Target="Target Bitrate"
+Bitrate.Target.Description="Bitrate to attempt to achieve in the overall sequence."
+Bitrate.Peak="Peak Bitrate"
+Bitrate.Peak.Description="Bitrate to attempt to maximally peak to in the overall sequence."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Fixed QP value to use for I-Frames."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Fixed QP value to use for P-Frames."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Fixed QP value to use for B-Frames."
+QP.Minimum="Minimum QP"
+QP.Minimum.Description="Lowest QP value to use in a Frame."
+QP.IFrame.Minimum="Minimum I-Frame QP"
+QP.IFrame.Minimum.Description="Lowest QP value to use in an I-Frame."
+QP.PFrame.Minimum="Minimum P-Frame QP"
+QP.PFrame.Minimum.Description="Lowest QP value to use in a P-Frame."
+QP.Maximum="Maximum QP"
+QP.Maximum.Description="Highest QP value to use in a Frame."
+QP.IFrame.Maximum="Maximum I-Frame QP"
+QP.IFrame.Maximum.Description="Highest QP value to use in an I-Frame."
+QP.PFrame.Maximum="Maximum P-Frame QP"
+QP.PFrame.Maximum.Description="Highest QP value to use in a P-Frame."
+FillerData="Filler Data"
+FillerData.Description="Enabling Filler Data allows the encoder to keep at least the \@Bitrate.Target\@ by filling up the remaining space in a sequence with empty information."
+FrameSkipping="Frame Skipping"
+FrameSkipping.Description="Frame Skipping allows the encoder to skip frames in order to meet the \@Bitrate.Target\@ requirements.\nWhen the encoder skips a frame it instead insert a repeat-last-frame NAL into the stream.\nCan help with very low \@Bitrate.Target\@ requirements."
+FrameSkipping.Period="Skip-Frame Period"
+FrameSkipping.Period.Description="Interval (in Frames) between skipped frames. This can be used to simulate a lower framerate than OBS is set to while still having a valid stream."
+FrameSkipping.Behaviour="Skip-Frame Behaviour"
+FrameSkipping.Behaviour.Description="Define how Frame Skipping behaves."
+FrameSkipping.SkipNth="Skip only every Nth frame"
+FrameSkipping.KeepNth="Keep only every Nth frame"
+VBAQ="VBAQ"
+VBAQ.Description="Enable the use of 'Variance Based Adaptive Quantisation' (VBAQ) which is based on pixel variance to distribute bitrate better.\nIt works on the idea that the human visual system is less sensitive to artifacts in highly textured areas and thus will push the bitrate towards smoother surfaces.\nEnabling this may lead to improvements in subjective quality with certain content."
+EnforceHRD="Enforce HRD"
+EnforceHRD.Description="Enforce the use of a Hypothetical Reference Decoder which is used to verify that the output bitstream is correct."
+VBVBuffer="VBV Buffer"
+VBVBuffer.Description="What method should be used to determine the VBV Buffer Size:\n- '\@Utility.Automatic\@' calculates the size using a strictness constraint.\n- '\@Utility.Manual\@' allows the user to control the size.\nVBV (Video Buffering Verifier) Buffer is used by certain Rate Control Methods to keep the overall bitrate within the given constraints."
+VBVBuffer.Strictness="VBV Buffer Strictness"
+VBVBuffer.Strictness.Description="Determines the strictness of the VBV Buffer, with 100% being as strict as possible and 0% being unrestricted."
+VBVBuffer.Size="VBV Buffer Size"
+VBVBuffer.Size.Description="The size of the VBV Buffer which is used for Bitrate control in a sequence."
+VBVBuffer.InitialFullness="VBV Buffer Initial Fullness"
+VBVBuffer.InitialFullness.Description="How full the VBV Buffer initially is (in %), will only affect the initial sequence of encoding."
+Interval.Keyframe="Keyframe Interval"
+Interval.Keyframe.Description="Interval (in Seconds) between Keyframes."
+Period.IDR.H264="IDR Period (in Frames)"
+Period.IDR.H264.Description="Defines the distance between Instantaneous Decoding Refreshes (IDR) in frames."
+Period.IDR.H265="IDR Period (in GOPs)"
+Period.IDR.H265.Description="Defines the distance between Instantaneous Decoding Refreshes (IDR) in GOPs."
+Interval.IFrame="I-Frame Interval"
+Interval.IFrame.Description="Interval (in Seconds) between I-Frames. I-Frames override P-Frames and B-Frames."
+Period.IFrame="I-Frame Period (in Frames)"
+Period.IFrame.Description="Distance (in Frames) between I-Frames. I-Frames override P-Frames and B-Frames."
+Interval.PFrame="P-Frame Interval"
+Interval.PFrame.Description="Interval (in Seconds) between P-Frames. P-Frames override B-Frames."
+Period.PFrame="P-Frame Period (in Frames)"
+Period.PFrame.Description="Distance (in Frames) between P-Frames. P-Frames override B-Frames."
+Interval.BFrame="B-Frame Interval"
+Interval.BFrame.Description="Interval (in Seconds) between B-Frames."
+Period.BFrame="B-Frame Period (in Frames)"
+Period.BFrame.Description="Distance (in Frames) between B-Frames."
+GOP.Type="GOP Type"
+GOP.Type.Description="Which Type of GOP should be used:\n- '\@GOP.Type.Fixed\@' will always use fixed distances between each GOP.\n- '\@GOP.Type.Variable\@' allows for GOPs of varying sizes, depending on what is needed.\n'\@GOP.Type.Fixed\@' is how the H264 implementation works and best for local network streaming, while '\@GOP.Type.Variable\@' is best for low size high quality recordings."
+GOP.Type.Fixed="Fixed"
+GOP.Type.Variable="Variable"
+GOP.Size="GOP Size"
+GOP.Size.Description="Size of a GOP (Group Of Pictures) in Frames."
+GOP.Size.Minimum="GOP Size Minimum"
+GOP.Size.Minimum.Description="Minimum Size of a GOP (Group Of Pictures) in Frames."
+GOP.Size.Maximum="GOP Size Maximum"
+GOP.Size.Maximum.Description="Maximum Size of a GOP (Group Of Pictures) in Frames."
+GOP.Alignment="GOP Alignment"
+GOP.Alignment.Description="Experimental, Effects are Unknown. Use at your own Risk."
+BFrame.Pattern="B-Frame Pattern"
+BFrame.Pattern.Description="The amount of B-Frames to use while encoding.\nSupported by 2nd and 3rd Generation VCE cards. Negative impact on encoding performance."
+BFrame.DeltaQP="B-Frame Delta QP"
+BFrame.DeltaQP.Description="Delta QP value to the last I- or P-Frame for non-referenceable B-Frames."
+BFrame.Reference="B-Frame Reference"
+BFrame.Reference.Description="Allow a B-Frame to also use B-Frames as reference, instead of just P- and I-Frames."
+BFrame.ReferenceDeltaQP="B-Frame Reference Delta QP"
+BFrame.ReferenceDeltaQP.Description="Delta QP value to the last I- or P-Frame for referenceable B-Frames."
+DeblockingFilter="Deblocking Filter"
+DeblockingFilter.Description="Allow the decoder to apply a Deblocking Filter."
+MotionEstimation="Motion Estimation"
+MotionEstimation.Description="Motion Estimation allows the encoder to reduce needed bitrate by estimating where a pixel went."
+MotionEstimation.Quarter="Quarter-Pixel"
+MotionEstimation.Half="Half-Pixel"
+MotionEstimation.Full="Quarter- & Half-Pixel"
+Video.API="Video API"
+Video.API.Description="What API should the backend use?"
+Video.Adapter="Video Adapter"
+Video.Adapter.Description="On what Adapter should we attempt to encode on?"
+OpenCL.Transfer="OpenCL Transfer"
+OpenCL.Transfer.Description="Transfer the frame to the GPU using OpenCL instead of mapped memory. Transfer via OpenCL is less sporadic than transfer via mapped memory when the GPU is being used."
+OpenCL.Conversion="OpenCL Conversion"
+OpenCL.Conversion.Description="Convert the frame on the GPU using OpenCL instead of DirectCompute."
+MultiThreading="Multi-Threading"
+MultiThreading.Description="Use more than one thread to handle submitting frames and retrieving packets. This can help on slower CPUs but will use more system resources overall. It will negatively impact performance on faster CPUs."
+QueueSize="Queue Size"
+QueueSize.Description="Queue this many frames for the encoder before attempting to retrieve packets. A higher value introduces more latency while a lower value may cause overloaded encoding. It is not recommended to change this from the default."
+View="View Mode"
+View.Description="Which properties should be visible?\n- '\@View.Basic\@' is the most basic view and recommended for everyone.\n- '\@View.Advanced\@' shows more options like multi-GPU support and is recommended for advanced users.\n- '\@View.Expert\@' shows dangerous options that have the potential to cause serious problems and is only recommended if you truly know what you are doing.\n- '\@View.Master\@' removes all viewing restrictions and shows all options including ones that can cause hardware defects.\n\nOBS and the plugin maintainers are not responsible for any damages resulting from your actions, as per license agreement. Using '\@View.Master\@' disqualifies you from any kind of support for any issues that may arise."
+View.Basic="Basic"
+View.Advanced="Advanced"
+View.Expert="Expert"
+View.Master="Master"
+Debug="Debug"
+Debug.Description="Enable additional debug messages to be logged into the OBS log file.\nThis requires that you start OBS Studio with '--verbose --unfiltered_log' (remove the ') on the command line.\nWarning: This will cause lower overall OBS performance due to the number of debug messages this creates, use only when instructed to do so or when trying to figure out a problem with encoding."
+

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/eu-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/eu-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/fi-FI.ini Changed

@@ -19,12 +19,17 @@
 Profile="Profiili"
 Profile.Description="Profiili jota käytetään enkoodaukseen. Paremmin tuetut profiilit ylhäällä ja parempilaatuiset profiilit alhaalla.\nYleisimmin tätä asetusta tätä asetusta ei kannata muuttaa oletuksesta.\n\nTätä asetusta ei voi muuttaa enkoodauksen aikana."
 ProfileLevel="Profiilin taso"
+ProfileLevel.Description="Profiilin taso jolla määritetään maksimiresoluutio ja ruudunpäivitys enkoodattuun lähetykseen.\nSuuremmat arvot vähentävät tuettujen laitteiden määrää, mutta laatu on mahdollisesti parempi, kun taas pienemmät arvot tukevat enemmän laitteita, mutta laatu saattaa olla huonompi.\nOn suositeltavaa jättää tämä arvo oletusarvoonsa: '\@Utility.Automatic\@' joka valitsee pienimmän tason joka tukee resoluutiota ja ruudunpäivitystä suurimman yhteensopivuuden saavuttaessa.\n\nTämä asetus on pysyvä eikä sitä voi muuttaa kesken enkoodauksen."
 Tier="Tier -taso"
+Tier.Description="Enkoodauksen taso.\n- 'High' on käytössä korkean bitraten sisällölle lähes häviöttömällä tallennuksella.\n- 'Main' on käytössä striimatulle medialle tai normaaliin tallennukseen.\n\nTämä asetus on pysyvä eikä sitä voi muuttaa kesken enkoodauksen."
 AspectRatio="Kuvasuhde"
 AspectRatio.Description="Mikä kuvasuhde kirjataan kohdetiedostoon."
 CodingType="Koodaustyyppi"
+CodingType.Description="Käytetyn koodauksen tyyppi enkoodattaessa viimeistä pakettia.\n- '\@Utility.Automatic\@' valitsee automaattisesti parhaan koodaustyypin (suositeltu).\n- 'CALVC' (Context-Adaptive Variable-Length Coding) on hieman nopeampi mutta enkoodauksen sisällön koko kasvaa.\n- 'CABAC' (Context-Adaptive Binary Arithmetic Coding) on hieman hitaampi mutta enkoodauksen sisällön koko pienenee.\n\nTämä asetus on pysyvä eikä sitä voi muuttaa kesken enkoodauksen."
 MaximumReferenceFrames="Referenssi framejen enimmäismäärä"
+MaximumReferenceFrames.Description="Referenssi framejen enimmäismäärä enkoodatussa sisällössä. Vaikuttaa suoraan laatuun enkoodereilla jotka tätä tukevat.\n\nTämä asetus on pysyvä eikä sitä voi muuttaa kesken enkoodauksen."
 RateControlMethod="Rate Control -tapa"
+RateControlMethod.Description="Mitä tapaa tulisi käyttää bitrate-arvon kontrolloimisessa?\n- '\@RateControlMethod.CQP\@' asettaa muuttumattomat kvantisointimääritykset jokaiselle kehykselle ja se on suositeltu korkeasta laadusta lähes häviöttömään tallennukseen.\n- '\@RateControlMethod.CBR\@' pyrkii pääsemään mahdollisimman lähelle \@Bitrate.Target\@, valinnaisesti täyttäen sen \@FillerData\@, ja se on suositeltu lähetyksiin.\n- '\@RateControlMethod.VBR\@' pyrkii pääsemään mahdollisimman lähelle \@Bitrate.Peak\@ ja laskemaan vain niin alas kuin \@Bitrate.Target\@, ja se on suositeltu pienikokoisiin tallennuksiin.\n- '\@RateControlMethod.VBRLAT\@' on samankaltainen kuin '\@RateControlMethod.VBR\@' mutta ottaa huomioon enkoodauksen viiveen."
 RateControlMethod.CQP="Jatkuva QP (CQP)"
 RateControlMethod.CBR="Jatkuva bitrate (CBR)"
 RateControlMethod.VBR="Vaihteleva bitrate (Piikkiin sidottu) (VBR)"
@@ -71,6 +76,7 @@
 EnforceHRD="Pakota HRD"
 EnforceHRD.Description="Pakota hypoteettisen referenssi dekooderin käyttö, jota käytetään varmistamaan, että ulostulon bittistriimi on oikea."
 VBVBuffer="VBV-puskuri"
+VBVBuffer.Description="Mitä tapaa tulisi käyttää VBV-puskurin koon määrittämiseksi:\n- '\@Utility.Automatic\@' laskee koon käyttäen tiukkuusrajoitusta.\n- '\@Utility.Manual\@' antaa käyttäjän määrittää puskurin koon.\nVBV (Video Buffering Verifier) puskuri on käytössä tietyillä Rate Control -tavoilla, jotta bitrate saataisiin pidettyä sallituissa rajoissa."
 VBVBuffer.Strictness="VBV-puskurin tiukkuus"
 VBVBuffer.Strictness.Description="Määrittelee VBV puskurin tiukkuuden, 100% on niin tarkka kuin mahdollista ja 0% on rajoittamaton."
 VBVBuffer.Size="VBV-puskurin koko"
@@ -135,6 +141,7 @@
 QueueSize="Jonon koko"
 QueueSize.Description="Aseta näin monta framea jonoon enkooderille ennen pakettien noutamisen yrittämistä. Korkeampi arvo nostaa viivettä, kunnes taas matalampi arvo voi aiheuttaa enkooderin ylikuormitusta. Tätä ei suositella muutettavaksi vakio arvostaan."
 View="Katselutila"
+View.Description="Mitkä asetuksista pitäisi olla näkyvillä?\n- '\@View.Basic\@' on perusasetus ja suositeltu kaikille.\n- '\@View.Advanced\@' näyttää lisää valintoja, kuten multi-GPU tuen ja se on suositeltu osaavammille käyttäjille.\n- '\@View.Expert\@' näyttää mahdollisesti vaarallisia valintoja joilla on mahdollisuus aiheuttaa vakavia ongelmia ja se on suositeltu vain jos tiedät tarkkaan mitä teet.\n- '\@View.Master\@' näyttää kaikki asetukset mukaanlukien ne jotka voivat vahingoittaa laitteistoa.\n\nOBS ja liitännäiskehittäjät eivät ole vastuussa mistään vahingoista joita toimistasi aiheutuu loppukäyttäjän käyttöehtosopimuksen mukaan. Käyttämällä '\@View.Master\@' -asetusta, luovut kaikesta tuesta ongelmista joita saattaa ilmetä."
 View.Basic="Yksinkertainen"
 View.Advanced="Kehittynyt"
 View.Expert="Expertti"

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/hu-HU.ini Changed

@@ -1,23 +1,23 @@
 Utility.Default="Alapértelmezett"
 Utility.Automatic="Automatikus"
-Utility.Manual="Manuális"
+Utility.Manual="Kézi"
 Utility.Switch.Disabled="Letiltva"
 Utility.Switch.Enabled="Engedélyezve"
-Preset="Sablon"
+Preset="Profil"
 Preset.ResetToDefaults="Alapértelmezett beállítások visszaállítása"
 Preset.Recording="Felvétel"
-Preset.HighQuality="Kiváló Minőségű Felvétel"
-Preset.Indistinguishable="Megkülönböztethetetlen Minőségű Felvétel"
-Preset.Lossless="Közel Veszteségmentes Felvétel"
+Preset.HighQuality="Kiváló minőségű felvétel"
+Preset.Indistinguishable="Megkülönböztethetetlen minőségű felvétel"
+Preset.Lossless="Közel veszteségmentes felvétel"
 Preset.Twitch="Twitch stream"
-Preset.YouTube="YouTube stream"
+Preset.YouTube="YouTube streamelés"
 QualityPreset="Minőségi profil"
-QualityPreset.Description="A kódoláshoz használt Minőség Készlet befolyásolja a sebességet és a minőséget.\n- '\@QualityPreset.Speed\@' adja a legnagyobb gyorsaságot a legrosszabb minőséggel.\n- '\@QualityPreset.Quality\@' adja a legjobb minőséget a legrosszabb sebességgel.\n- '\@QualityPreset.Balanced\@' egy kiegyensúlyozott opció a kettő között.\n\nEz a beállítás statikus és a kódolás során nem változtatható meg."
+QualityPreset.Description="A kódoláshoz használt minőségi profil, befolyásolja a sebességet és a minőséget is.\n- A '\@QualityPreset.Speed\@' nyújtja a legnagyobb sebességet és a legrosszabb minőséget.\n- A '\@QualityPreset.Quality\@' adja a legjobb minőséget és a legrosszabb sebességet.\n- A '\@QualityPreset.Balanced\@' lehetőség a kettő kiegyensúlyozott keveréke.\n\nEz a beállítás statikus, és a kódolás során nem változtatható meg."
 QualityPreset.Speed="Sebesség"
 QualityPreset.Balanced="Kiegyensúlyozott"
 QualityPreset.Quality="Minőségi"
 Profile="Profil"
-Profile.Description="A kódoláshoz használt profilok esetén a jobban támogatottak vannak legfelül, míg a jobb minőséget adóak az alján.\nAz esetek legnagyobb többségében a legjobb nem változtatni a beállításon és az alapértelmezetten hagyni.\n\nEz az opció statikus és kódolás során nem változtatható."
+Profile.Description="A kódoláshoz használt profil, a jobban támogatott profilok vannak legfelül, míg a jobb minőséget nyújtók az alján.\nAz esetek többségében a legjobb nem változtatni a beállításon, és az alapértelmezetten hagyni.\n\nEz a beállítás statikus, és kódolás során nem változtatható meg."
 ProfileLevel="Profil szint"
 ProfileLevel.Description="A szint, amelyet a profilhoz használ, hogy meghatározza a felbontást és a képkockasebességet a stream kódolásához.\nMagasabb értékek esetén kevesebb eszköz támogatását élvezi viszont potenciálisan jobb minőséget ad, alacsonyabb értékek esetén jóval több eszköz támogatja, viszont minőségromlással járhat.\nA legjobb választás az alapértelmezett érték '\@Utility.Automatic\@' ami kiválasztja a legalacsonyabb szintet, amely a felbontást és a képkockasebességet támogatja maximális kompatibilizáshoz.\n\nAz opció statikus és nem lehet változtatni kódolás esetén."
 Tier="Szint"
@@ -25,6 +25,7 @@
 AspectRatio="Képarány"
 AspectRatio.Description="Milyen képarány kerüljön a kimeneti fájlba."
 CodingType="Kódolás típusa"
+CodingType.Description="A kódolás típusa az utolsó simításokhoz\n- '\@Utility.Automatic\@' automatikusan megválasztja a legjobb kódolási típust (ajánlott).\n- 'CALVC' (Context-Adaptive Variable-Length Coding) egy kicsivel gyorsabb, viszont nagyobb méretű tartalmat eredményez.\n- 'CABAC' (Context-Adaptive Binary Arithmetic Coding) egy kicsivel lassabb, viszont kisebb méretű tartalmat eredményez.\n\nEz az opció statikus és nem lehet kódolás közben változtatni."
 MaximumReferenceFrames="Maximális referencia képkockák"
 MaximumReferenceFrames.Description="A maximális mennyiségű referenciakockák száma tartalomkódolás során. Közvetlen hatással van a kódolókra, amelyek támogatják az opciót.\n\nEz a beállítás statikus és nem változtatható kódolás során."
 RateControlMethod="Sebességvezérlési metódus"
@@ -101,7 +102,7 @@
 Period.BFrame.Description="Távolság (Képkockákban) B-képkockák között."
 GOP.Type="GOP típusa"
 GOP.Type.Description="Melyik típusú GOP legyen használatban:\n- '\@GOP. Type.Fixed\@' mindig fix távolságot használ minden egyes GOP között.\n- '\@GOP. Type.Variable\@' lehetővé teszi a különböző méretű GOP-okat, attól függően, hogy melyik szükséges.\n'\@GOP.Type.Fixed\@' a legjobb helyi hálózati közvetítéshez, míg a\" \@GOP. Type.Variable\@ \"a legjobb az alacsony méretű de jó minőségű felvételekhez."
-GOP.Type.Fixed="Rögzített"
+GOP.Type.Fixed="Javított"
 GOP.Type.Variable="Változó"
 GOP.Size="GOP méret"
 GOP.Size.Description="GOP méret (Képek csoportja) a képkockákban."

obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/id-ID.ini Added

@@ -0,0 +1,89 @@
+Utility.Default="Bawaan"
+Utility.Automatic="Otomatis"
+Utility.Manual="Manual"
+Utility.Switch.Disabled="Dinonaktifkan"
+Utility.Switch.Enabled="Diaktifkan"
+Preset="Preset"
+Preset.ResetToDefaults="Pulihkan Pengaturan Default"
+Preset.Recording="Rekaman"
+Preset.HighQuality="Rekaman Berkualitas Tinggi"
+Preset.Indistinguishable="Rekaman Berkualitas Tidak Berbeda"
+Preset.Lossless="Rekaman Hampir Lossless"
+Preset.Twitch="Streaming Twitch"
+Preset.YouTube="Streaming YouTube"
+QualityPreset="Kualitas Preset"
+QualityPreset.Description="Kualitas Preset yang digunakan untuk enkoding, mempengaruhi kecepatan dan kualitas.\n- '\@QualityPreset.Speed\@' memiliki kecepatan tertinggi dan kualitas terburuk.\n- '\@QualityPreset.Quality\@' memiliki kualitas tertinggi dan kecepatan terburuk.\n- '\@QualityPreset.Balanced\@' adalah keduanya seimbang.\n\nOpsi ini statis dan tidak dapat diubah selama enkoding."
+QualityPreset.Speed="Kecepatan"
+QualityPreset.Balanced="Seimbang"
+QualityPreset.Quality="Kualitas"
+Profile="Profil"
+Profile.Description="Profil yang digunakan untuk enkoding, dengan profil dukungan lebih baik di bagian atas dan profil berkualitas lebih tinggi di bagian bawah.\nUntuk sebagian besar kejadian, lebih baik tidak diubah dan tetap pada posisinya semula.\n\nOpsi ini statis dan tidak dapat diubah selama enkoding."
+ProfileLevel="Level Profil"
+ProfileLevel.Description="Level yang digunakan untuk profil yang digunakan untuk mengatur resolusi dan framerate maksimum untuk streaming yang dienkode.\nNilai lebih tinggi berarti lebih sedikit perangkat yang didukung tetapi kualitas berpotensi lebih baik, sedangkan nilai lebih rendah berarti lebih banyak perangkat yang didukung tetapi berpotensi lebih buruk.\nLebih baik biarkan ini pada nilai default '\@Utility.Automatic\@' yang akan memilih level terendah yang dapat mendukung resolusi dan framerate untuk kompatibilitas maksimum.\n\nOpsi ini statis dan tidak dapat diubah selama enkoding."
+Tier="Tingkatan"
+Tier.Description="Tingkatan untuk enkoder dengan.\n- 'Tinggi' dipakai untuk konten bitrate tinggi seperti perekaman hampir lossless.\n- 'normal' digunakan untuk streaming media atau perekaman normal.\n\nOpsi ini statis dan tidak dapat diubah selama enkoding."
+AspectRatio="Rasio Aspek"
+AspectRatio.Description="Rasio Aspek yang akan dipakai ke dalam file output."
+CodingType="Tipe Koding"
+CodingType.Description="Jenis pengkodean yang akan digunakan ketika menyandikan paket akhir. \n- '\@ Utility.Automatic\@' secara otomatis memilih jenis pengkodean terbaik (disarankan).\n- 'CALVC' (Context-Adaptive Variable-Length Coding) sedikit lebih cepat, tetapi menghasilkan ukuran konten yang disandikan lebih besar. \n- 'CABAC' (Context-Adaptive Binary Arithmetic Coding) sedikit lebih lambat, tetapi menghasilkan ukuran konten yang disandikan lebih kecil. \n\nPilihan ini bersifat statis dan tidak dapat diubah selama pengkodean berlangsung."
+MaximumReferenceFrames="Reference Frame Maksimal"
+MaximumReferenceFrames.Description="Jumlah maksimal reference frame yang digunakan untuk menyandikan konten. Secara langsung memengaruhi kualitas enkoder untuk membantu. \n\nPilihan ini statis dan tidak dapat diubah selama encoding."
+RateControlMethod="Metode Kontrol Rate"
+RateControlMethod.Description="Metode apa yang harus digunakan untuk mengontrol (bit)rate?\n- '\@RateControlMethod.CQP\@' menetapkan parameter kuantisasi tetap untuk setiap frame dan direkomendasikan untuk kualitas tinggi hingga mendekati hasil rekaman lossless.\n- '\@RateControlMethod.CBR\@' mencoba untuk sedekat mungkin dengan \@Bitrate.Target\@, secara opsional mengisinya dengan \@FillerData\@, dan direkomendasikan untuk streaming.\n- '\@RateControlMethod.VBR\@' mencoba untuk sedekat mungkin dengan \@Bitrate.Peak\@ bahkan jika memungkinkan serendah \@Bitrate.Target\@, dan direkomendasikan untuk hasil ukuran rekaman kecil.\n- '\@RateControlMethod.VBRLAT\@' mirip dengan '\@RateControlMethod.VBR\@' tetapi dengan pertimbangan latensi enkoder."
+RateControlMethod.CQP="Constant QP (CQP)"
+RateControlMethod.CBR="Constant Bitrate (CBR)"
+RateControlMethod.VBR="Bitrate Variabel (Keterbatasan Peak) (VBR)"
+RateControlMethod.VBRLAT="Bitrate Variabel (Terkendala Latensi) (VBRLAT)"
+PrePassMode="Mode Pre-Pass"
+PrePassMode.Description="Pre-Pass meningkatkan distribusi bitrate dalam sequence (GOP), namun memiliki efek bervariasi di setiap kartu grafis\n Mengaktifkan ini mengurangi kinerja enkoding sekitar 10%, yang dapat mengakibatkan enkoder kelebihan beban."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (Ukuran Seperempat)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (Ukuran Setengah)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (Ukuran Penuh)"
+Bitrate.Target="Target Bitrate"
+Bitrate.Target.Description="Bitrate yang diusahakan dicapai dalam keseluruhan sequence."
+Bitrate.Peak="Puncak Bitrate"
+Bitrate.Peak.Description="Bitrate sebagai maksimum puncak dalam urutan keseluruhan."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Nilai QP tetap yang digunakan untuk I-Frame."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Nilai QP tetap yang digunakan untuk P-Frame."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Nilai QP tetap yang digunakan untuk B-Frame."
+QP.Minimum="QP Minimum"
+QP.Minimum.Description="Nilai QP terendah yang digunakan dalam Frame."
+QP.IFrame.Minimum="I-Frame QP Minimum"
+QP.IFrame.Minimum.Description="Nilai QP terendah yang digunakan dalam I-Frame."
+QP.PFrame.Minimum="P-Frame QP Minimum"
+QP.PFrame.Minimum.Description="Nilai QP terendah yang digunakan dalam P-Frame."
+QP.Maximum="QP Maksimum"
+QP.Maximum.Description="Nilai QP tertinggi yang digunakan dalam Frame."
+QP.IFrame.Maximum="I-Frame QP Maksimum"
+QP.IFrame.Maximum.Description="Nilai QP tertinggi yang digunakan dalam I-Frame."
+QP.PFrame.Maximum="P-Frame QP Maksimum"
+QP.PFrame.Maximum.Description="Nilai QP tertinggi yang digunakan dalam P-Frame."
+FillerData="Pengisi Data"
+FillerData.Description="Mengaktifkan Data Pengisi memungkinkan enkoder untuk setidaknya tetap pada \@Bitrate.Target\@ dengan mengisi ruang yang tersisa secara berurutan dengan informasi kosong."
+FrameSkipping="Frame Skipping"
+FrameSkipping.Description="Frame Skipping memungkinkan encoder untuk melewati frame untuk bisa memenuhi target \@Bitrate.Target\@ diwajibkan.\nketika encoder melewati fram itu selainya ulangi-frame-terakhir NAL ke stream.\nbisa bantu untuk tingkat rendah \@Bitrate.Target\@ diwajibkan."
+FrameSkipping.Period="PeriodeFrameSkipping"
+FrameSkipping.Period.Description="Jeda (Frame) diantara frame dilewati, ini bisa digunakan untuk simulasi fram terendah daripada yang sudah di set sambil masih melakukan stream."
+FrameSkipping.Behaviour="LewatiFrame. Tingkahlaku"
+FrameSkipping.Behaviour.Description="Definisikan bagaimana Frame Lewati perilaku."
+FrameSkipping.SkipNth="Lewati ketika frame tiap Nth"
+FrameSkipping.KeepNth="Teruskan ketika frame tiap Nth"
+VBAQ="VBAG"
+EnforceHRD="Tegakkan HRD"
+EnforceHRD.Description="Menegakkan penggunaan Hypothetical Reference Decoder yang digunakan untuk verifikasi bahwa bitstream output sudah benar."
+VBVBuffer="VBVBuffer"
+Video.API="API Video"
+Video.API.Description="API apa yang harus backend gunakan?"
+Video.Adapter="Adapter Video"
+Video.Adapter.Description="Pada Adaptor apa yang harus kita coba untuk enkode?"
+OpenCL.Transfer="OpenCL Transfer"
+View="Mode Tampilan"
+View.Basic="Dasar"
+View.Advanced="Lanjutan"
+View.Expert="Expert"
+View.Master="Master"
+Debug="Debug"
+

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/nb-NO.ini Changed

@@ -7,9 +7,12 @@
 Preset.ResetToDefaults="Gjenopprett standardinnstillinger"
 Preset.Recording="Opptak"
 Preset.HighQuality="Høykvalitets opptak"
+Preset.Indistinguishable="Umerkbart Opptak"
+Preset.Lossless="Et nesten tapsfritt opptak"
 Preset.Twitch="Twitch-strømming"
 Preset.YouTube="YouTube-strømming"
 QualityPreset="Kvalitetsforhåndsinnstilling"
+QualityPreset.Description="Kvalitet forhåndsinnstilling som brukes til koding, påvirker hastighet og kvalitet.\n- '\@QualityPreset.Speed\@' har høyeste hastighet og verste kvalitet.\n- '\@QualityPreset.Quality\@' har høyest kvalitet og størst hastighet.\n- '\@QualityPreset.Balanced\@' er en balansert blanding av de to.\n\nDette alternativet er statisk og kan ikke endres under kodingen."
 QualityPreset.Speed="Hastighet"
 QualityPreset.Balanced="Balansert"
 QualityPreset.Quality="Kvalitet"
@@ -30,6 +33,7 @@
 PrePassMode.Half="\@Utility.Switch.Enabled\@ (Halvstørrelse)"
 PrePassMode.Full="\@Utility.Switch.Enabled\@ (Full størrelse)"
 Bitrate.Target="Målbitfrekvens"
+Bitrate.Target.Description="Bitfrekvens som skal bli forsøkt oppnådd i totalsekvensen."
 Bitrate.Peak="Bitfrekvens-toppunkt"
 QP.IFrame="İ-ramme-QP"
 QP.IFrame.Description="Fastsatt QP-verdi å bruke for İ-rammer."

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/ro-RO.ini Changed

@@ -1,20 +1,41 @@
 Utility.Default="Implicit"
 Utility.Switch.Disabled="Dezactivat"
+Preset="Presetare"
+Preset.ResetToDefaults="Restaurează setările implicite"
+Preset.Recording="Înregistrare"
+Preset.HighQuality="Calitate înaltă de înregistrare"
+Preset.Lossless="Înregistrare aproape fără pierderi"
+Preset.Twitch="Transmisiune Twitch"
+Preset.YouTube="Transmisiune YouTube"
+QualityPreset="Presetare de calitate"
+QualityPreset.Speed="Viteză"
+QualityPreset.Balanced="Echilibrată"
 QualityPreset.Quality="Calitate"
 Profile="Profil"
 ProfileLevel="Nivelul profilului"
+AspectRatio="Raport de aspect"
 RateControlMethod="Metodă pentru controlul ratei"
 RateControlMethod.CQP="QP constant (CQP)"
 RateControlMethod.CBR="Rată de biți constantă (CBR)"
-RateControlMethod.VBR="Rată de biți variabilă (limitată pe baza unui punct de vârf) (VBRLAT)"
+RateControlMethod.VBR="Rată de biți variabilă (limitată pe baza vârfului) (VBRLAT)"
 RateControlMethod.VBRLAT="Rată de biți variabilă (limitată pe baza latenței) (VBRLAT)"
+VBAQ="VBAQ"
+VBVBuffer.Size="Dimensiunea bufferului VBV"
 Interval.Keyframe="Interval de cadre cheie"
 Interval.Keyframe.Description="Interval (în secunde) între cadrele cheie."
+Period.IDR.H264="Perioadă IDR (în cadrei)"
+Period.IDR.H265="Perioadă IDR (în GOP-uri)"
 Interval.IFrame="Interval I-Frame"
 Interval.BFrame="Interval B-Frame"
+GOP.Type="Tip GOP"
 GOP.Type.Fixed="Fix"
 GOP.Type.Variable="Variabil"
 GOP.Size="Dimensiune GOP"
+GOP.Size.Minimum="Dimensiune minimă GOP"
+GOP.Size.Maximum="Dimensiune maximă GOP"
+GOP.Alignment="Aliniere GOP"
+Video.API="API video"
+Video.API.Description="Ce API ar trebui să folosească backendul?"
 Video.Adapter="Adaptor video"
 OpenCL.Transfer="Transfer OpenCL"
 OpenCL.Conversion="Conversie OpenCL"

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/ru-RU.ini Changed

@@ -12,10 +12,6 @@
 Preset.Twitch="Трансляция Twitch"
 Preset.YouTube="Трансляция YouTube"
 QualityPreset="Предустановки качества"
-QualityPreset.Description="Предустановка качества для кодирования, влияет на скорость и качество.\n-
-'\@ПредустановкаКачества.Скорость\@'высокая скорость и хуже качество.\n-
-'\@ПредустановкаКачества.Качество\@'наилучшее качество и медленная скорость.\n-
-'\@ПредустановкаКачество.Сбалансированная\@'лучший баланс качества и скороти.\n\nДанная настройка статическая и не может изменяться во время процесса кодирования."
 QualityPreset.Speed="Скорость"
 QualityPreset.Balanced="Баланс"
 QualityPreset.Quality="Качество"
@@ -144,7 +140,7 @@
 QueueSize="Размер очереди"
 QueueSize.Description="Помещает такое количество кадров в очередь энкодера перед попыткой получить пакеты. Большее значение увеличивает задержку, в то время как меньшее значение может вызвать перегрузку кодирования. Не рекомендуется изменять значение, установленное по умолчанию."
 View="Режим просмотра"
-View.Description="Какие свойства должны быть видны?\n- '\@View.Basic\@' — самое базовое просматривание и рекомендуется для всех.\n- '\@View.Advanced\@' показывает больше опций как мульти-GPU поддержка и рекомендуется для продвинутых пользователей.\n- '\@View.Expert\@' показывает опасные опции, которые имеют потенциальную возможность вызова проблем и рекомендуется только если вы действительно знаете, что вы делаете.\n- '\@View.Master\@' удаляет все просматриваемые ограничения и показывает все опции, включая одной, которая может вызвать аппаратные дефекты.\n\nOBS и плагин не ответственны за любой урон, нанесённый в результате ваших действий, согласно лицензионному соглашению. Использование  '\@View.Master\@' дисквалифицирует вас от любого типа поддержки для любых проблем, которые могут возникнуть."
+View.Description="Какие свойства должны быть видны?\n- '\@View.Basic\@' — самое базовое просматривание и рекомендуется для всех.\n- '\@View.Advanced\@' показывает больше опций как мульти-GPU поддержка и рекомендуется для продвинутых пользователей.\n- '\@View.Expert\@' показывает опасные опции, которые имеют потенциальную возможность вызова проблем и рекомендуется только если вы действительно знаете, что вы делаете.\n- '\@View.Master\@' удаляет все просматриваемые ограничения и показывает все опции, включая одной, которая может вызвать аппаратные дефекты.\n\nOBS и плагин не ответственны за любой урон, нанесённый в результате ваших действий, согласно лицензионному соглашению. Использование '\@View.Master\@' дисквалифицирует вас от любого типа поддержки для любых проблем, которые могут возникнуть."
 View.Basic="Обычный"
 View.Advanced="Расширенный"
 View.Expert="Эксперт"

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/sk-SK.ini Changed

@@ -6,25 +6,146 @@
 Preset="Predvoľba"
 Preset.ResetToDefaults="Obnoviť predvolené nastavenia"
 Preset.Recording="Nahrávanie"
+Preset.HighQuality="Vysoko kvalitná nahrávka"
+Preset.Indistinguishable="Nerozoznateľná nahrávka"
+Preset.Lossless="Takmer bezstratová nahrávka"
 Preset.Twitch="Twitch vysielanie"
-Preset.YouTube="Youtube vysielanie"
+Preset.YouTube="YouTube vysielanie"
+QualityPreset="Profil Kvality"
+QualityPreset.Description="Predvoľba kvality, ktorá sa používa na kódovanie, ovplyvňuje rýchlosť a kvalitu.\n- '\@QualityPreset.Speed\@' má najvyššiu rýchlosť a najhoršiu kvalitu\n- '\@QualityPreset.Quality\@' má najvyššiu kvalitu a najhoršiu rýchlosť.\n- '\@QualityPreset.Balanced\@' je vyvážená zmes oboch.\n\nTáto voľba je statická a počas kódovania sa nedá zmeniť."
 QualityPreset.Speed="Rýchlosť"
 QualityPreset.Balanced="Vyvážené"
 QualityPreset.Quality="Kvalita"
 Profile="Profil"
+Profile.Description="Profil, ktorý sa používa na kódovanie, s lepšie podporovanými profilmi v hornej a kvalitnejšou v spodnej časti.\nVo väčšine prípadov je najlepšie túto možnosť nemeniť a ponechať ju na predvolenej hodnote..\n\nTáto voľba je statická a počas kódovania sa nedá zmeniť."
+ProfileLevel="Úroveň Profilu"
+ProfileLevel.Description="Úroveň pre profil, ktorá bude použitá na určenie maximálneho rozlíšenia a obnovovacej frekvencie pre enkódovaný stream.\nVyššie hodnoty znamenajú menej podporovaných zariadení ale potenciálne vyššiu kvalitu, kým nižšie hodnoty znamenajú viac podporovaných zariadení ale potenciálne nižšiu kvalitu.\nJe najlepšie to nechať na predvolenej hodnote '@Utility.Automatic\@', ktorá zvolí tú najnižšiu úroveň, ktorá dokáže podporovať rozlíšenie a obnovovaciu frekvenciu pre maximálnu kompatibilitu.\n\nTáto možnosť je stála a nemôže byť zmenená behom enkódovania."
 Tier="Úroveň"
+Tier.Description="Stupeň (tier) na enkódovanie.\n-'Vysoký (High)' sa používa na obsah s vysokým bitratom, ako takmer bezstratové nahrávanie.\n-'Hlavný (Main)' sa používa na streamovanie médií alebo bežné nahrávanie.\n\nTáto možnosť je stála a nemôže byť zmenená behom enkódovania."
 AspectRatio="Pomer strán"
+AspectRatio.Description="Aký pomer strán by mal byť zapísaný do výstupného súboru."
 CodingType="Typ kódovania"
+CodingType.Description="Typ kódovania, ktorý bude použitý na enkódovanie finálneho balíčka (paketu).\n- '\@Utility.Automatic\@' automaticky zvolí najlepší typ kódovania (odporúčané).\n- 'CALVC' (Context-Adaptive Variable-Lenght Coding, alebo tiež Kontextu prispôsobivé šifrovanie s rôznorodou dĺžkou) je o niečo rýchlejšie ale výsledkom je väčšia veľkosť enkódovaného obsahu.\n- 'CABAC' (Context-Adaptive Binary Arithmetic Coding, alebo tiež Kontextu prispôsobivé binárno-aritmetické šifrovanie) je o niečo pomalšie ale výsledkom je menšia veľkosť enkódovaného obsahu.\n\nTáto možnosť je stála a nemôže byť zmenená behom enkódovania."
+MaximumReferenceFrames="Maximum referenčných snímkov"
+MaximumReferenceFrames.Description="Maximálne množstvo referenčných snímkov použitých v enkódovanom obsahu. Priamo ovplyvňuje kvalitu enkodérov, ktoré toto podporujú.\n\nTáto možnosť je stála a nemôže byť zmenená behom enkódovania."
+RateControlMethod="Metóda riadenia rýchlosti"
+RateControlMethod.Description="Ktorá metóda by mala byť použitá na ovládanie (bit)ratu?\n- '\@RateControlMethod.CQP\@' priraďuje fixované parametre kvantovania ku každej snímke a je odporúčaná pre vysokú kvalitu, až takmer bezstratové nahrávanie.\n- '\@RateControlMethod.CBR\@' sa pokúša dostať čo najbližšie k \@Bitrate.Target\@, voliteľne vypĺňajúca to s \@FillerData\@ a je odporúčaná na streamovanie.\n- '\@RateControlMethod.VBR\@' sa pokúša dostať čo najbližšie k \@Bitrate.Peak\@ a prípadne ide tak nízko ako \@Bitrate.Target\@ a je odporúčaná pre nahrávanie menších súborov.\n- '\@RateControlMethod.VBRLAT\@' je podobná ako '\@RateControlMethod.VBR\@' ale namiesto toho berie do úvahy oneskorenie enkódovania."
+RateControlMethod.CQP="Konštantné QP (CQP)"
 RateControlMethod.CBR="Konštantný Bitrate (CBR)"
 RateControlMethod.VBR="Variabilný Bitrate (Obmedzený vrcholom) (VBR)"
 RateControlMethod.VBRLAT="Variabilný Bitrate (Obmedzený odozvou) (VBRLAT)"
+PrePassMode="Pre-Pass mód"
+PrePassMode.Description="Pre-Pass zlepšuje rozloženie bitratu v sekvencii (GOP), avšak účinky sa môžu líšiť v závislosti od karty.\nPovolením tejto možnosti sa zníži výkonnosť enkódovania zhruba o 10%, čo môže mať za následok preťaženie enkódovania."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (štvrtinová veľkosť)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (polovičná veľkosť)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (plná veľkosť)"
 Bitrate.Target="Cieľový bitrate"
+Bitrate.Target.Description="Bitrate, ktorý sa pokúsi dosiahnuť v celkovej sekvencii."
 Bitrate.Peak="Vrcholový bitrate"
-QP.IFrame="I-Frame QP"
+Bitrate.Peak.Description="Bitrate, ktorého vrchol celkovej sekvencie sa pokúsi dosiahnuť."
+QP.IFrame="I-Snímok QP"
+QP.IFrame.Description="Fixovaná QP hodnota, ktorá sa použije v I-snímkoch."
+QP.PFrame="P-Snímok QP"
+QP.PFrame.Description="Fixovaná QP hodnota, ktorá sa použije v P-snímkoch."
+QP.BFrame="B-Snímok QP"
+QP.BFrame.Description="Fixovaná QP hodnota, ktorá sa použije v B-snímkoch."
 QP.Minimum="Minimálne QP"
+QP.Minimum.Description="Najnižšia QP hodnota, ktorá sa použije v snímke."
+QP.IFrame.Minimum="Minimum I-Snímok QP"
+QP.IFrame.Minimum.Description="Najnižšia QP hodnota, ktorá sa použije v I-snímke."
+QP.PFrame.Minimum="Minimum P-Frame QP"
+QP.PFrame.Minimum.Description="Najnižšia QP hodnota, ktorá sa použije v P-snímke."
 QP.Maximum="Minimálne QP"
+QP.Maximum.Description="Najvyššia QP hodnota, ktorá sa použije v snímke."
+QP.IFrame.Maximum="Maximum I-Snímok QP"
+QP.IFrame.Maximum.Description="Najvyššia QP hodnota, ktorá sa použije v I-snímke."
+QP.PFrame.Maximum="Maximum P-Snímok QP"
+QP.PFrame.Maximum.Description="Najvyššia QP hodnota, ktorá sa použije v P-snímke."
+FillerData="Plňacie Dáta"
+FillerData.Description="Povolenie výplňových dát dá možnosť enkodéru ponechať aspoň \@Bitrate.Target\@ vyplnením zostávajúceho miesta v sekvencii s prázdnymi informáciami."
 FrameSkipping="Preskakovanie snímkov"
+FrameSkipping.Description="Preskakovanie snímkov dá možnosť enkodéru preskočiť snímky pre splnenie požiadaviek \@Bitrate.Target\@.\nKeď šifrovač preskočí snímok, namiesto neho vloží zopakovaný predchádzajúci snímok NAL do streamu.\nMôže pomôcť s veľmi nízkymi požiadavkami \@Bitrate.Target\@."
+FrameSkipping.Period="Perióda preskakovania snímkov"
+FrameSkipping.Period.Description="Interval (v snímkoch) medzi preskočenými snímkami. Toto môže byť použité na simuláciu nižšej snímkovacej frekvencie ako je OBS nastavený, pri zachovaní správneho streamu."
+FrameSkipping.Behaviour="Chovanie sa preskakovania snímkov"
+FrameSkipping.Behaviour.Description="Definuje ako sa preskakovanie snímkov chová."
+FrameSkipping.SkipNth="Preskočiť každý N-tý snímok"
+FrameSkipping.KeepNth="Ponechať každý N-tý snímok"
 VBAQ="VBAQ"
+VBAQ.Description="Povoliť použitie 'Variance Based Adaptive Quantization' (VBAQ) alebo 'Odchýlkovo založenej adaptívnej kvantizácie', ktorá je založená na odchýlke pixelov pre lepšie rozloženie bitratu.\nFunguje to na princípe, že ľudský systém zraku je menej citlivý na artefakty na vysoko-textúrovaných plochách, takže posunie bitrate bližšie k hladkým plochám.\nPovolenie tejto možnosti môže zlepšiť subjektívnu kvalitu istého obsahu."
+EnforceHRD="Vynútiť HRD"
+EnforceHRD.Description="Vynútiť použitie Hypotetického Referenčného Dekodéra (Hypothetical Reference Decoder), ktorý je používaný na overenie správnosti výstupného bitstreamu."
+VBVBuffer="VBV vyrovnávacia pamäť"
+VBVBuffer.Description="Ktorá metóda by mala byť použitá na určenie veľkosti VBV Buffera:\n- '\@Utility.Automatic\@' vypočítava veľkosť použitím vynúteného obmedzenia.\n- '\@Utility.Manual\@' dovoľuje používateľovi ovládanie veľkosti.\nVBV (Video Buffering Verifier) Buffer je používaný istými Metódami Ovládania Rýchlosti (Rate Control Methods) pre zaistenie celkového bitratu nepresahujúceho obmedzenia."
+VBVBuffer.Strictness="Prísnosť vyrovnávacej pamäte VBV"
+VBVBuffer.Strictness.Description="Určuje prísnosť VBV Buffera. 100% znamená najprísnejšie a 0% bez obmedzení."
+VBVBuffer.Size="Veľkosť vyrovnávacej pamäte VBV"
+VBVBuffer.Size.Description="Veľkosť VBV Buffera, ktorá je použitá na ovládanie bitratu v sekvencii."
+VBVBuffer.InitialFullness="Počiatočná plnosť vyrovnávacej pamäte VBV"
+VBVBuffer.InitialFullness.Description="Ako je VBV Buffer spočiatku plný (v %), ovplyvní iba počiatočnú sekvenciu enkódovania."
+Interval.Keyframe="Interval kľúčových snímkov"
+Interval.Keyframe.Description="Interval (v sekundách) medzi Kľúčovými Snímkami."
+Period.IDR.H264="Perióda IDR (v snímkoch)"
+Period.IDR.H264.Description="Definuje vzdialenosť medzi Okamžitými Dekódovacími Obnoveniami (Instantaneous Decoding Refreshes alebo IDR) v snímkoch."
+Period.IDR.H265="Perióda IDR (v GOP)"
+Period.IDR.H265.Description="Definuje vzdialenosť medzi Okamžitými Dekódovacími Obnoveniami (Instantaneous Decoding Refreshes alebo IDR) v GOP-ách."
+Interval.IFrame="Interval I-Snímku"
+Interval.IFrame.Description="Interval (v sekundách) medzi I-Snímkami. I-Snímky prevažujú nad P-Snímkami a B-Snímkami."
+Period.IFrame="Perióda I-Snímku (v snímkoch)"
+Period.IFrame.Description="Vzdialenosť (v sekundách) medzi I-Snímkami. I-Snímky prevažujú nad P-Snímkami a B-Snímkami."
+Interval.PFrame="Interval P-Snímku"
+Interval.PFrame.Description="Interval (v sekundách) medzi P-Snímkami. P-Snímky prevažujú B-Snímky."
+Period.PFrame="Perióda P-Snímku (v snímkoch)"
+Period.PFrame.Description="Vzdialenosť (v snímkoch) medzi P-Snímkami. P-Snímky prevažujú B-Snímky."
+Interval.BFrame="Interval B-Snímku"
+Interval.BFrame.Description="Interval (v sekundách) medzi B-Snímkami."
+Period.BFrame="Perióda B-Snímku (v snímkoch)"
+Period.BFrame.Description="Vzdialenosť (v snímkoch) medzi B-Snímkami."
+GOP.Type="GOP Typ"
+GOP.Type.Description="Ktorý typ GOP by mal byť použitý:\n- '\@GOP.Type.Fixed\@' bude vždy používať stále vzdialenosti medzi každou GOP.\n- '\@GOP.Type.Variable\@' povoľuje GOP-y rôznych veľkostí, záleží na tom, čo je potrebné.\n'\@GOP.Type.Fixed\@' ako H264 implementácia funguje najlepšie pre lokálne sieťové streamovanie, zatiaľ čo '\@GOP.Type.Variable\@' je najlepšia pre nahrávky s malou veľkosťou ale vysokou kvalitou."
 GOP.Type.Fixed="Fixný"
 GOP.Type.Variable="Premenlivá"
+GOP.Size="GOP Veľkosť"
+GOP.Size.Description="Veľkosť GOP (Group Of Pictures) v snímkoch."
+GOP.Size.Minimum="GOP minimálna veľkosť"
+GOP.Size.Minimum.Description="Najmenšia veľkosť GOP (Group Of Pictures alebo Skupina Obrázkov) v snímkoch."
+GOP.Size.Maximum="GOP maximálna veľkosť"
+GOP.Size.Maximum.Description="Najväčšia veľkosť GOP (Group Of Pictures alebo Skupina Obrázkov) v snímkoch."
+GOP.Alignment="GOP zarovnanie"
+GOP.Alignment.Description="Experimentálne, účinky nie sú známe. Používajte na vlastné riziko."
+BFrame.Pattern="Vzor B-Snímku"
+BFrame.Pattern.Description="Množstvo B-Snímkov, ktoré majú byť použité pri enkódovaní.\nPodporované druhou a treťou generáciou VCE kárt. Negatívny dopad na výkonnosť enkódovania."
+BFrame.DeltaQP="B-Snímok Delta QP"
+BFrame.DeltaQP.Description="Hodnota Delta QP k poslednému I- alebo P-Snímku pre neodkazovateľné B-Snímky."
+BFrame.Reference="Referencia B-Snímku"
+BFrame.Reference.Description="Povoliť B-Snímku používať B-Snímky ako odporúčanie, namiesto len P- a I-Snímkov."
+BFrame.ReferenceDeltaQP="Referencia B-Snímku Delta QP"
+BFrame.ReferenceDeltaQP.Description="Hodnota Delta QP k poslednému I- alebo P-Snímku pre odkazovateľné B-Snímky."
+DeblockingFilter="Deblokovací Filter"
+DeblockingFilter.Description="Povoliť dekodéru aplikovať Deblokovací Filter."
+MotionEstimation="Odhad Pohybu"
+MotionEstimation.Description="Motion Estimation (Odhad Pohybu) dovoľuje enkodéru znížiť potrebný bitrate odhadom, kam sa presunul pixel."
+MotionEstimation.Quarter="Štvrť-Pixel"
+MotionEstimation.Half="Polo-Pixel"
+MotionEstimation.Full="Štvrť a Polo-Pixel"
+Video.API="Video API"
+Video.API.Description="Ktoré API má backend použiť?"
+Video.Adapter="Video Adaptér"
+Video.Adapter.Description="Na ktorom Adaptéri máme enkódovať?"
+OpenCL.Transfer="OpenCL Transfer"
+OpenCL.Transfer.Description="Prenos snímku do GPU použitím OpenCL namiesto zmapovanej pamäte. Prenos cez OpenCL je menej sporadický ako prenos cez zmapovanú pamäť, keď sa používa GPU."
+OpenCL.Conversion="OpenCL Konverzia"
+OpenCL.Conversion.Description="Previesť snímok v GPU použitím OpenCL namiesto DirectCompute."
+MultiThreading="Multi-Threading"
+MultiThreading.Description="Použiť viac ako jedno vlákno pre unesenie predložených snímkov a vybraných balíčkov (paketov). Toto môže pomôcť na pomalších CPU ale celkovo budú použité moderné systémové zdroje. Negatívne to ovplyvní výkonnosť na rýchlejších CPU."
+QueueSize="Veľkosť fronty"
+QueueSize.Description="Zoradiť toľkoto snímkov pre enkodér pred pokusom získania paketov (balíčkov). Vyššia hodnota prináša vyššie oneskorenie, zatiaľ čo nižšia hodnota môže spôsobiť zahltenie enkódovania. Nie je odporučené toto meniť z predvolenej možnosti."
+View="Režim zobrazenia"
+View.Description="Ktoré vlastnosti by mali byť použité?\n- '\@View.Basic\@' je najzákladnejšie zobrazenie a je odporúčané pre všetkých.\n- '\@View.Advanced\@' zobrazuje viac možností, ako napríklad podporu viacerých GPU a je odporúčané pre pokročilých používateľov.\n- '\@View.Expert\@' zobrazuje nebezpečné možnosti, ktoré môžu spôsobiť vážne problémy a je odporúčané len ak viete, čo robíte.\n- '\@View.Master\@' odstraňuje všetky obmedzenia zobrazovania a zobrazuje všetky možnosti, vrátane takých, ktoré môžu spôsobiť nefunkčnosť hardvéru.\n\nOBS a udržiavatelia pluginov nepreberajú zodpovednosť za akékoľvek poškodenie spôsobené vašou činnosťou, ako je uvedené v licenčnej zmluve. Používanie '\@View.Master\@' vás diskvalifikuje z akejkoľvek podpory pre akékoľvek problémy, ktoré môžu nastať."
+View.Basic="Základný"
+View.Advanced="Pokročilý"
+View.Expert="Expert"
+View.Master="Majster"
+Debug="Ladenie"
+Debug.Description="Povoliť prídavným ladiacim správam ukladanie do výpisového súboru OBS.\nToto vyžaduje, že spustíte OBS Studio s '--verbose --unfiltered_log' (odstráňte ') na príkazovom riadku.\nUpozornenie: Toto spôsobí nižšiu výkonnosť OBS z dôvodu množstva ladiacich správ, ktoré toto vytvorí, používajte to, len ak vám je prikázané toto vykonať alebo ak chcete nájsť problém v enkódovaní."

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/sr-SP.ini Changed

obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/uk-UA.ini Changed

@@ -1,16 +1,16 @@
-Utility.Default="За замовчанням"
+Utility.Default="За замовчуванням"
 Utility.Automatic="Автоматично"
 Utility.Manual="Вручну"
 Utility.Switch.Disabled="Вимкнено"
 Utility.Switch.Enabled="Увімкнено"
 Preset="Шаблон"
 Preset.ResetToDefaults="Відновити налаштування за замовчуванням"
-Preset.Recording="Звичайний запис"
-Preset.HighQuality="Висока якість (запис)"
-Preset.Indistinguishable="Якість майже без втрат (запис)"
-Preset.Lossless="Без втрат якості (запис)"
-Preset.Twitch="Twitch (трансляція)"
-Preset.YouTube="YouTube (трансляція)"
+Preset.Recording="Записування"
+Preset.HighQuality="Запис високої якості"
+Preset.Indistinguishable="Запис не відрізнити від оригіналу"
+Preset.Lossless="Записування майже без втрат"
+Preset.Twitch="Трансляція Twitch"
+Preset.YouTube="Трансляція YouTube"
 QualityPreset="Шаблон якості"
 QualityPreset.Description="Визначає Шаблон якості до кодування, впливає на швидкість та якість.\n- 'Швидкість' - є найшвидшим, але має гіршу якість відео.\n- 'Якість' - дає найкращу якість відео та є найповільнішим.\n- 'Збалансований' - це баланс між шаблонами Швидкість та Якість.\n\nОпцію не може бути змінено під час кодування."
 QualityPreset.Speed="Швидкість"
@@ -21,17 +21,21 @@
 ProfileLevel="Рівень профілю"
 ProfileLevel.Description="Рівень, що використовується для профілю, який використовується для визначення максимального дозволу і частоти кадрів для кодованого потоку.\nБільш високі значення означають менш підтримувані пристрої, але потенційно кращу якість, тоді як нижчі значення означають більше підтримуваних пристроїв, але потенційно гіршу якість.\nНайкраще залишити це значення за замовчуванням '\@Utility.Automatic\@', яке вибере найнижчий рівень, який може підтримувати роздільну здатність і частоту кадрів для максимальної сумісності.\n\nЦей параметр є статичним і не може бути змінений під час кодування."
 Tier="Рівень додатку"
-AspectRatio="Пропорції"
-AspectRatio.Description="Співвідношення сторін яке буде записано до файлу Виводу."
+Tier.Description="Рівень кодування.\n- «High» використовується для вмісту із високим бітрейтом, таким як записи без втрати якості.\n- «Main» використовується для потокового мультимедійного вмісту чи звичайного записування.\n\nЦей параметр статичний і його неможливо змінювати під час кодування."
+AspectRatio="Співвідношення сторін"
+AspectRatio.Description="Співвідношення сторін яке буде записано до файлу виводу."
 CodingType="Схема кодування"
+CodingType.Description="Тип кодування, що використовується під час закодовування фінального пакету.\n- '\@Utility.Automatic\@' автоматично вибирає найкращий тип кодування (рекомендовано).\n- 'КАКЗД' (контекстно-адаптивне кодування змінної довжини) – дещо швидше, але має наслідком більший розмір закодованого вмісту.\n- 'КАДАК' (контекстно-адаптивне двійково-арифметичне кодування) – дещо повільніший, але має наслідком менший розмір закодованого вмісту.\n\nЦя опція статична і не може бути змінена протягом закодовування."
 MaximumReferenceFrames="Максимальна кількість опорних кадрів"
 MaximumReferenceFrames.Description="Максимальна кількість опорних кадрів для використання в кодованому вмісті. Безпосередньо впливає на якість кодерів, що підтримують це.\n\nЦей параметр є статичним і не може бути змінений під час кодування."
 RateControlMethod="Метод керування потоком"
-RateControlMethod.CQP="Фіксований QP (CQP)"
+RateControlMethod.Description="Який метод слід використовувати для контролю бітрейту?\n- «\@RateControlMethod.CQP\@» призначає фіксовані параметри квантування для кожного кадру і рекомендується для записів високої якості майже без втрат.\n- «\@RateControlMethod.CBR\@» намагається якомога ближче наблизитися до \@Bitrate.Target\@, додатково заповнюючи його за допомогою \@FillerData\@, і рекомендується для трансляцій.\n- «\@RateControlMethod.VBR\@» намагається якомога ближче наблизитися до \@Bitrate.Peak\@ і, якщо можливо, опускається до \@Bitrate.Target\@, і рекомендується для записів малого розміру.\n- «\@RateControlMethod.VBRLAT\@» схожий на «\@RateControlMethod.VBR\@», та натомість враховує затримку кодування."
+RateControlMethod.CQP="Постійна якість (CQP)"
 RateControlMethod.CBR="Постійний бітрейт (CBR)"
 RateControlMethod.VBR="Змінний бітрейт (максимальний бітрейт обмежено) (VBR)"
 RateControlMethod.VBRLAT="Змінний бітрейт (затримку обмежено) (VBR_LAT)"
 PrePassMode="Попередній прохід"
+PrePassMode.Description="Попередній прохід покращує розподіл бітрейту в межах послідовності (GOP), однак результати можуть відрізнятися від картки до картки.\nУвімкнення цього параметру зменшує швидкодію кодування приблизно на 10%, що може призвести до перевантаження кодування."
 PrePassMode.Quarter="Увімкнено (на чверть від повного розміру)"
 PrePassMode.Half="Увімкнено (на половину від повного розміру)"
 PrePassMode.Full="Увімкнено (на повний розмір)"
@@ -72,6 +76,7 @@
 EnforceHRD="Застосувати примусову сумісність з HRD"
 EnforceHRD.Description="Застосувати примусову сумісність з HRD (Hypothetical Reference Decoder) - накладає обмеження на енкодер задля забезпечення норм стандартного потоку."
 VBVBuffer="Буфер VBV"
+VBVBuffer.Description="Який метод слід використовувати для визначення розміру буферу VBV:\n- '\@Utility.Automatic\@' обраховує розмір за допомогою суворої константи.\n- '\@Utility.Manual\@' дозволяє користувачеві керувати розміром.\nБуфер VBV (Video Buffering Verifier) використовується певними Rate Control Methods для утримання загального бітрейту в заданих обмеженнях."
 VBVBuffer.Strictness="Буфер VBV, кореляція"
 VBVBuffer.Strictness.Description="Визначає як близько значення Буфер VBV дорівнює заданому, у відсотках."
 VBVBuffer.Size="Розмір VBV буфера"
@@ -136,9 +141,11 @@
 QueueSize="Розмір черги"
 QueueSize.Description="Становить у чергу енкодера саме таку кількість кадрів перед першою спробою отримати пакети. Вищі значення збільшують затримку, хоча замалі значення можуть спричинити перевантаження кодування. Не рекомендується змінювати це від значення за замовчанням."
 View="Вид для налаштувань"
+View.Description="Які властивості повинні бути видимими?\n- '\@View.Basic\@' — найосновніший вигляд, рекомендований для кожного.\n- '\@View.Advanced\@' показує більше опцій, таких як підтримка багатьох ГП і рекомендується для провідних користувачів.\n- '\@View.Expert\@' показує небезпечні опції, які потенційно можуть спричинити серйозні проблеми та рекомендуються тільки, якщо ви дійсно знаєте, що робите.\n- '\@View.Master\@' знімає всі обмеження на перегляд і показує всі опції, включно з тими, які можуть спричинити апаратні дефекти.\n\nПідтримувачі OBS і плагінів не не несуть відповідальності за будь-яку шкоду внаслідок ваших дій, відповідно до ліцензійної угоди. Використання '\@View.Master\@' позбавляє вас будь-якого виду підтримки для будь-яких проблем, які можуть виникнути."
 View.Basic="Базовий"
 View.Advanced="Розширений"
 View.Expert="Експерт"
 View.Master="Бог енкодерів"
 Debug="Налагодження внести до журналу"
+Debug.Description="Активує додаткові повідомлення про налагодження, яку будуть записуватися до файлу журналу OBS.\nДля цього потрібно перезапустити OBS Studio із параметром «--verbose --unfiltered_log» (приберіть «») в командному рядку.\nПопередження: це призведе до зменшення загальної швидкодії OBS через кількість створюваних повідомлень про налагодження; використовуйте тільки за вказівкою або під час спроби виявити проблему із кодуванням."

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/resources/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/resources/locale/zh-CN.ini Changed

@@ -21,7 +21,7 @@
 ProfileLevel="配置文件级别"
 ProfileLevel.Description="用于确定编码流的最大分辨率和帧速率的配置文件的级别。\n较高的值意味着受支持的设备更少，但质量可能更好，而较低的值意味着受支持的设备更多，但质量可能更差。\n最好将其保留为默认值“\@Utility.Automatic\@”将选择支持分辨率和帧速率以获得最大兼容性的最低级别。\n\n此选项是静态的，在编码期间无法更改。"
 Tier="层"
-Tier.Description="要编码的层。\n-“高”用于高比特率内容，如接近无损录制。\n-“基本”用于流媒体或正常录制。\n\n此选项是静态的，在编码过程中无法更改。"
+Tier.Description="要编码的层。\n-“High”用于高比特率内容，如接近无损录制。\n-“Main”用于流媒体或正常录制。\n\n此选项是静态的，在编码过程中无法更改。"
 AspectRatio="长宽比"
 AspectRatio.Description="哪个长宽比应写入输出文件."
 CodingType="编码类型"
@@ -29,8 +29,6 @@
 MaximumReferenceFrames="最大参考帧"
 MaximumReferenceFrames.Description="要在编码内容中使用的最大引用帧数。直接影响支持此功能的编码器的质量。\n\n此选项是静态的，在编码过程中无法更改。"
 RateControlMethod="速率控制方法"
-RateControlMethod.Description="应使用什么方法来控制（比特）率？\n-“\@RateControlMethod.CQP\@”为每帧分配固定量化参数，建议用于高质量到近乎无损的录制。\n-“\@RateControlMethod.CBR\@”尝试尽可能接近 
- \@Bitrate.Target\@，可以选择用 \@FillerData\@ 填充，建议用于流式处理。\n-“\@RateControlMethod.VBR\@”尝试尽可能接近 \@Bitrate.Peak\@，如果可能，则尽可能低至 \@Bitrate.Target\@，建议用于小尺寸录制。\n-“\@RateControlMethod.VBRLAT\@”与“@RateControlMethod.VBR\@”类似，但考虑到编码延迟。"
 RateControlMethod.CQP="恒定 QP (CQP)"
 RateControlMethod.CBR="固定比特率 (CBR)"
 RateControlMethod.VBR="变比特率 (峰值约束) (VBR)"

obs-studio-25.0.8.tar.xz/plugins/enc-amf/source/amf.cpp -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/source/amf.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/source/enc-h264.cpp -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/source/enc-h264.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/enc-amf/source/enc-h265.cpp -> obs-studio-26.0.0.tar.xz/plugins/enc-amf/source/enc-h265.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/image-source/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/image-source/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/image-source/color-source.c -> obs-studio-26.0.0.tar.xz/plugins/image-source/color-source.c Changed

@@ -113,6 +113,13 @@
 	obs_data_set_default_int(settings, "height", 1080);
 }
 
+static void color_source_defaults_v3(obs_data_t *settings)
+{
+	obs_data_set_default_int(settings, "color", 0xFFD1D1D1);
+	obs_data_set_default_int(settings, "width", 1920);
+	obs_data_set_default_int(settings, "height", 1080);
+}
+
 struct obs_source_info color_source_info_v1 = {
 	.id = "color_source",
 	.type = OBS_SOURCE_TYPE_INPUT,
@@ -134,7 +141,8 @@
 	.id = "color_source",
 	.version = 2,
 	.type = OBS_SOURCE_TYPE_INPUT,
-	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
+	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
+			OBS_SOURCE_CAP_OBSOLETE,
 	.create = color_source_create,
 	.destroy = color_source_destroy,
 	.update = color_source_update,
@@ -146,3 +154,20 @@
 	.get_properties = color_source_properties,
 	.icon_type = OBS_ICON_TYPE_COLOR,
 };
+
+struct obs_source_info color_source_info_v3 = {
+	.id = "color_source",
+	.version = 3,
+	.type = OBS_SOURCE_TYPE_INPUT,
+	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
+	.create = color_source_create,
+	.destroy = color_source_destroy,
+	.update = color_source_update,
+	.get_name = color_source_get_name,
+	.get_defaults = color_source_defaults_v3,
+	.get_width = color_source_getwidth,
+	.get_height = color_source_getheight,
+	.video_render = color_source_render,
+	.get_properties = color_source_properties,
+	.icon_type = OBS_ICON_TYPE_COLOR,
+};

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/ar-SA.ini Changed

@@ -1,8 +1,35 @@
 ImageInput="الصورة"
 File="ملف الصورة"
-UnloadWhenNotShowing="إلغاء تحميل الصورة إذا لم تظهر"
+UnloadWhenNotShowing="إلغاء تحميل الصورة عند عدم عرضها"
 
+SlideShow="عرض شرائح الصور"
+SlideShow.TransitionSpeed="سرعة الانتقال (مللي ثانية)"
+SlideShow.SlideTime="الوقت بين الشرائح (مللي ثانية)"
+SlideShow.Files="ملفات الصور"
+SlideShow.CustomSize="حجم الإرتباط/نسبة المشهد"
+SlideShow.CustomSize.Auto="تلقائي"
+SlideShow.Randomize="تشغيل عشوائي"
+SlideShow.Loop="تكرار"
+SlideShow.Transition="تأثير الإنتقال"
+SlideShow.Transition.Cut="قطع"
+SlideShow.Transition.Fade="تلاشي"
+SlideShow.Transition.Swipe="تمرير"
+SlideShow.Transition.Slide="انزلاق"
+SlideShow.PlaybackBehavior="السلوك و الظهور"
+SlideShow.PlaybackBehavior.StopRestart="إيقاف عندما يكون غير ظاهر, إعادة البدء عند الظهور"
+SlideShow.PlaybackBehavior.PauseUnpause="إيقاف مؤقت عندما يكون غير ظاهر, استكمال عند الظهور"
+SlideShow.PlaybackBehavior.AlwaysPlay="التشغيل دائماً حتى عندما يكون غير ظاهر"
+SlideShow.SlideMode="وضعية التنقل"
+SlideShow.SlideMode.Auto="تلقائي"
+SlideShow.SlideMode.Manual="يدوي (استخدم المفاتيح الساخنة للتحكم في عرض الشرائح)"
+SlideShow.PlayPause="تشغيل/إيقاف مؤقت"
+SlideShow.Restart="إعادة التشغيل"
+SlideShow.Stop="إيقاف"
+SlideShow.NextSlide="الشريحة التالية"
+SlideShow.PreviousSlide="الشريحة السابقة"
+SlideShow.HideWhenDone="إخفاء عندما يتم الانتهاء من عرض الشرائح"
 
+ColorSource="مصدر لون"
 ColorSource.Color="اللون"
 ColorSource.Width="العرض"
 ColorSource.Height="الإرتفاع"

obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/en-GB.ini Added

@@ -0,0 +1,36 @@
+ImageInput="Image"
+File="Image File"
+UnloadWhenNotShowing="Unload image when not showing"
+
+SlideShow="Image Slide Show"
+SlideShow.TransitionSpeed="Transition Speed (milliseconds)"
+SlideShow.SlideTime="Time Between Slides (milliseconds)"
+SlideShow.Files="Image Files"
+SlideShow.CustomSize="Bounding Size/Aspect Ratio"
+SlideShow.CustomSize.Auto="Automatic"
+SlideShow.Randomize="Randomise Playback"
+SlideShow.Loop="Loop"
+SlideShow.Transition="Transition"
+SlideShow.Transition.Cut="Cut"
+SlideShow.Transition.Fade="Fade"
+SlideShow.Transition.Swipe="Swipe"
+SlideShow.Transition.Slide="Slide"
+SlideShow.PlaybackBehavior="Visibility Behaviour"
+SlideShow.PlaybackBehavior.StopRestart="Stop when not visible, restart when visible"
+SlideShow.PlaybackBehavior.PauseUnpause="Pause when not visible, unpause when visible"
+SlideShow.PlaybackBehavior.AlwaysPlay="Always play even when not visible"
+SlideShow.SlideMode="Slide Mode"
+SlideShow.SlideMode.Auto="Automatic"
+SlideShow.SlideMode.Manual="Manual (Use hotkeys to control slideshow)"
+SlideShow.PlayPause="Play/Pause"
+SlideShow.Restart="Restart"
+SlideShow.Stop="Stop"
+SlideShow.NextSlide="Next Slide"
+SlideShow.PreviousSlide="Previous Slide"
+SlideShow.HideWhenDone="Hide when slideshow is done"
+
+ColorSource="Colour Source"
+ColorSource.Color="Colour"
+ColorSource.Width="Width"
+ColorSource.Height="Height"
+

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/fil-PH.ini Changed

@@ -1,35 +1,35 @@
 ImageInput="Larawan"
 File="Dokumentong Larawan"
-UnloadWhenNotShowing="Mag-ibis ng imahe kapag hindi nagpapakita"
+UnloadWhenNotShowing="I-unload ang imahe kapag hindi pinapakita"
 
-SlideShow="Ipakita ang Slide ng Larawan"
-SlideShow.TransitionSpeed="Bilis ng Paglipat (milliseconds)"
-SlideShow.SlideTime="Oras sa Pagitan ng Mga Slide (millisecond)"
+SlideShow="Slide Show ng Larawan"
+SlideShow.TransitionSpeed="Bilis ng Pagbago (milliseconds)"
+SlideShow.SlideTime="Oras sa Pagitan ng mga Slide (milliseconds)"
 SlideShow.Files="Dokumentong Larawan"
 SlideShow.CustomSize="Bounding Size / Aspect Ratio"
-SlideShow.CustomSize.Auto="Awtomatikong"
-SlideShow.Randomize="Simulan ang Pag-playback"
-SlideShow.Loop="Silo"
+SlideShow.CustomSize.Auto="Awtomatiko"
+SlideShow.Randomize="I-randomize ang Pagpapatugtog"
+SlideShow.Loop="Ulit-ulitin"
 SlideShow.Transition="Paglipat"
-SlideShow.Transition.Cut="Kunin"
-SlideShow.Transition.Fade="Fade"
+SlideShow.Transition.Cut="Cut"
+SlideShow.Transition.Fade="Maglaho"
 SlideShow.Transition.Swipe="Mag-swipe"
 SlideShow.Transition.Slide="Slide"
-SlideShow.PlaybackBehavior="Pag-uugali ng Pagtingin"
+SlideShow.PlaybackBehavior="Pag-uugali sa Pagkakita"
 SlideShow.PlaybackBehavior.StopRestart="Itigil kapag hindi nakikita, i-restart kapag nakikita"
 SlideShow.PlaybackBehavior.PauseUnpause="I-pause kapag hindi nakikita, i-unpause kapag nakikita"
 SlideShow.PlaybackBehavior.AlwaysPlay="Laging i-play kahit na hindi nakikita"
 SlideShow.SlideMode="Slide Mode"
 SlideShow.SlideMode.Auto="Awtomatikong"
-SlideShow.SlideMode.Manual="Mano-manong (Gamitin ang mga hotkey upang kontrolin ang slideshow)"
-SlideShow.PlayPause="I-play / I-pause"
-SlideShow.Restart="I-restart"
+SlideShow.SlideMode.Manual="Mano-mano (Gamitin ang mga hotkey upang kontrolin ang slideshow)"
+SlideShow.PlayPause="Patugtugin/I-pause"
+SlideShow.Restart="Ulitin"
 SlideShow.Stop="Itigil"
 SlideShow.NextSlide="Susunod na Slide"
 SlideShow.PreviousSlide="Nakaraang Slide"
 SlideShow.HideWhenDone="Itago kapag tapos na ang slideshow"
 
-ColorSource="Pinagmulan ng Kulay"
+ColorSource="Kulay na Source"
 ColorSource.Color="Kulay"
 ColorSource.Width="Lapad"
 ColorSource.Height="Taas"

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/hr-HR.ini Changed

@@ -2,15 +2,35 @@
 File="Datoteka slike"
 UnloadWhenNotShowing="Ukloni sliku iz memorije kada se ne prikazuje"
 
-SlideShow="Prikazivanje slajdova"
-SlideShow.TransitionSpeed="Brzina prelaza (milisekunde)"
-SlideShow.SlideTime="Vreme između slajdova (milisekunde)"
-SlideShow.Files="Datoteke slika"
-SlideShow.Randomize="Nasumična reprodukcija"
-SlideShow.Transition="Prelaz"
-SlideShow.Transition.Cut="Isecanje"
-SlideShow.Transition.Fade="Zatamnjenje"
-SlideShow.Transition.Swipe="Prevlačenje"
-SlideShow.Transition.Slide="Klizanje"
+SlideShow="Slideshow"
+SlideShow.TransitionSpeed="Brzina tranzicije (u milisekundama)"
+SlideShow.SlideTime="Vrijeme između slajdova (u milisekundama)"
+SlideShow.Files="Slike"
+SlideShow.CustomSize="Omjer zaslona"
+SlideShow.CustomSize.Auto="Automatski"
+SlideShow.Randomize="Izmiješaj redoslijed"
+SlideShow.Loop="Ponavljaj"
+SlideShow.Transition="Tranzicija"
+SlideShow.Transition.Cut="Cut"
+SlideShow.Transition.Fade="Fade"
+SlideShow.Transition.Swipe="Swipe"
+SlideShow.Transition.Slide="Slide"
+SlideShow.PlaybackBehavior="Ponašanje pri (ne)vidljivosti"
+SlideShow.PlaybackBehavior.StopRestart="Zaustavi kada se ne vidi, ponovo pokreni kada se opet vidi"
+SlideShow.PlaybackBehavior.PauseUnpause="Pauziraj kada se ne vidi, nastavi kada se opet vidi"
+SlideShow.PlaybackBehavior.AlwaysPlay="Reproduciraj i dok se ne vidi"
+SlideShow.SlideMode="Način upravljanja"
+SlideShow.SlideMode.Auto="Automatski"
+SlideShow.SlideMode.Manual="Ručno (kontrola tipkovničkim prečacima)"
+SlideShow.PlayPause="Pokreni/Pauziraj"
+SlideShow.Restart="Ponovno pokreni"
+SlideShow.Stop="Zaustavi"
+SlideShow.NextSlide="Idući slajd"
+SlideShow.PreviousSlide="Prethodni slajd"
+SlideShow.HideWhenDone="Sakrij kada slideshow završi"
 
+ColorSource="Čista boja"
+ColorSource.Color="Boja"
+ColorSource.Width="Širina"
+ColorSource.Height="Visina"

obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/id-ID.ini Added

@@ -0,0 +1,36 @@
+ImageInput="Gambar"
+File="File Gambar"
+UnloadWhenNotShowing="Lepas muatkan gambar jika tidak tampil"
+
+SlideShow="Gambar Slide Show"
+SlideShow.TransitionSpeed="Kecepatan Transisi (milidetik)"
+SlideShow.SlideTime="Durasi Antar Slide (milidetik)"
+SlideShow.Files="File Gambar"
+SlideShow.CustomSize="Ukuran Batas/Rasio Aspek"
+SlideShow.CustomSize.Auto="Otomatis"
+SlideShow.Randomize="Acak Pemutaran"
+SlideShow.Loop="Loop"
+SlideShow.Transition="Transisi"
+SlideShow.Transition.Cut="Potong"
+SlideShow.Transition.Fade="Pudar"
+SlideShow.Transition.Swipe="Usap"
+SlideShow.Transition.Slide="Geser"
+SlideShow.PlaybackBehavior="Perilaku Visibilitas"
+SlideShow.PlaybackBehavior.StopRestart="Berhenti jika tidak terlihat, ulangi saat terlihat"
+SlideShow.PlaybackBehavior.PauseUnpause="Jeda jika tidak terlihat, lanjutkan saat terlihat"
+SlideShow.PlaybackBehavior.AlwaysPlay="Putar terus meskipun tidak terlihat"
+SlideShow.SlideMode="Mode Slide"
+SlideShow.SlideMode.Auto="Otomatis"
+SlideShow.SlideMode.Manual="Manual (Gunakan hotkey untuk mengontrol slideshow)"
+SlideShow.PlayPause="Putar/Jeda"
+SlideShow.Restart="Ulangi"
+SlideShow.Stop="Berhenti"
+SlideShow.NextSlide="Slide Selanjutnya"
+SlideShow.PreviousSlide="Slide Sebelumnya"
+SlideShow.HideWhenDone="Sembunyikan jika slideshow sudah selesai"
+
+ColorSource="Sumber Warna"
+ColorSource.Color="Warna"
+ColorSource.Width="Lebar"
+ColorSource.Height="Tinggi"
+

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/ro-RO.ini Changed

@@ -4,22 +4,30 @@
 
 SlideShow="Diaporamă"
 SlideShow.TransitionSpeed="Viteză de tranziție (milisecunde)"
-SlideShow.SlideTime="Timpul dintre diapozitive (milisecunde)"
-SlideShow.Files="Fișiere imagine"
+SlideShow.SlideTime="Timp între diapozitive (milisecunde)"
+SlideShow.Files="Fișiere de imagini"
+SlideShow.CustomSize="Dimensiunea delimitării/Raport de aspect"
 SlideShow.CustomSize.Auto="Automat"
-SlideShow.Loop="Buclă"
+SlideShow.Randomize="Randomizează redarea"
+SlideShow.Loop="Redă în buclă"
 SlideShow.Transition="Tranziție"
 SlideShow.Transition.Cut="Decupare"
 SlideShow.Transition.Fade="Estompare"
 SlideShow.Transition.Swipe="Glisare"
 SlideShow.Transition.Slide="Culisare"
+SlideShow.PlaybackBehavior="Comportamentul vizibilității"
+SlideShow.PlaybackBehavior.StopRestart="Oprește când sursa nu este vizibilă, repornește când este vizibilă"
+SlideShow.PlaybackBehavior.PauseUnpause="Pune pe pauză când sursa nu este vizibilă, scoate de pe pauză când este vizibilă"
+SlideShow.PlaybackBehavior.AlwaysPlay="Redă întotdeauna chiar și atunci când sursa nu este vizibilă"
 SlideShow.SlideMode="Mod de culisare"
 SlideShow.SlideMode.Auto="Automat"
+SlideShow.SlideMode.Manual="Manual (Folosește tastele rapide pentru a controla diaporama)"
 SlideShow.PlayPause="Redă/Pune pe pauză"
 SlideShow.Restart="Repornește"
 SlideShow.Stop="Oprește"
 SlideShow.NextSlide="Diapozitivul următor"
 SlideShow.PreviousSlide="Diapozitivul anterior"
+SlideShow.HideWhenDone="Ascunde când slideshow este terminat"
 
 ColorSource="Sursă de culoare"
 ColorSource.Color="Culoare"

obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/th-TH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/image-source/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/image-source/data/locale/uk-UA.ini Changed

@@ -1,35 +1,35 @@
 ImageInput="Зображення"
 File="Файл зображення"
-UnloadWhenNotShowing="Вивантажувати зображення, коли воно не виводиться"
+UnloadWhenNotShowing="Вивантажувати зображення, які не виводяться"
 
-SlideShow="Слайд-шоу"
-SlideShow.TransitionSpeed="Тривалість відео-переходу (мілісекунд)"
-SlideShow.SlideTime="Час між слайдами (мілісекунд)"
+SlideShow="Показ слайдів"
+SlideShow.TransitionSpeed="Швидкість переходу (мілісекунди)"
+SlideShow.SlideTime="Час між слайдами (мілісекунди)"
 SlideShow.Files="Файли зображень"
 SlideShow.CustomSize="Розмір рамки/пропорції"
 SlideShow.CustomSize.Auto="Автоматично"
 SlideShow.Randomize="Випадкове відтворення"
-SlideShow.Loop="Циклічно відтворювати"
-SlideShow.Transition="Відео-перехід"
-SlideShow.Transition.Cut="Cut"
-SlideShow.Transition.Fade="Fade"
-SlideShow.Transition.Swipe="Swipe"
-SlideShow.Transition.Slide="Slide"
-SlideShow.PlaybackBehavior="Видимість та відтворення"
+SlideShow.Loop="Повторювати"
+SlideShow.Transition="Монтажний перехід"
+SlideShow.Transition.Cut="Вирізання"
+SlideShow.Transition.Fade="Вицвітання"
+SlideShow.Transition.Swipe="Переміщення"
+SlideShow.Transition.Slide="Зсув"
+SlideShow.PlaybackBehavior="Поведінка видимості"
 SlideShow.PlaybackBehavior.StopRestart="Зупинити, коли не видимий. Грати з початку, коли видимий"
 SlideShow.PlaybackBehavior.PauseUnpause="Призупинити, коли не видимий. Грати далі, коли видимий"
 SlideShow.PlaybackBehavior.AlwaysPlay="Завжди грати навіть тоді, коли не видимий"
 SlideShow.SlideMode="Режим слайдів"
-SlideShow.SlideMode.Auto="Автоматично"
-SlideShow.SlideMode.Manual="Вручну (використовувати Гарячі клавіші для контролю)"
-SlideShow.PlayPause="Відтворення / Пауза"
-SlideShow.Restart="Грати з початку"
+SlideShow.SlideMode.Auto="Автоматичний"
+SlideShow.SlideMode.Manual="Ручний (використовувати гарячі клавіші для контролю)"
+SlideShow.PlayPause="Відтворення/Пауза"
+SlideShow.Restart="Повторити"
 SlideShow.Stop="Зупинити"
 SlideShow.NextSlide="Наступний слайд"
 SlideShow.PreviousSlide="Попередній слайд"
-SlideShow.HideWhenDone="Не показувати джерело, коли відтворення слайд-шоу завершено"
+SlideShow.HideWhenDone="Приховати завершення показу слайдів"
 
-ColorSource="Щільний колір"
+ColorSource="Суцільний колір"
 ColorSource.Color="Колір"
 ColorSource.Width="Ширина"
 ColorSource.Height="Висота"

obs-studio-25.0.8.tar.xz/plugins/image-source/image-source.c -> obs-studio-26.0.0.tar.xz/plugins/image-source/image-source.c Changed

@@ -160,12 +160,14 @@
 
 	context->update_time_elapsed += seconds;
 
-	if (context->update_time_elapsed >= 1.0f) {
-		time_t t = get_modified_timestamp(context->file);
-		context->update_time_elapsed = 0.0f;
+	if (obs_source_showing(context->source)) {
+		if (context->update_time_elapsed >= 1.0f) {
+			time_t t = get_modified_timestamp(context->file);
+			context->update_time_elapsed = 0.0f;
 
-		if (context->file_timestamp != t) {
-			image_source_load(context);
+			if (context->file_timestamp != t) {
+				image_source_load(context);
+			}
 		}
 	}
 
@@ -279,12 +281,14 @@
 extern struct obs_source_info slideshow_info;
 extern struct obs_source_info color_source_info_v1;
 extern struct obs_source_info color_source_info_v2;
+extern struct obs_source_info color_source_info_v3;
 
 bool obs_module_load(void)
 {
 	obs_register_source(&image_source_info);
 	obs_register_source(&color_source_info_v1);
 	obs_register_source(&color_source_info_v2);
+	obs_register_source(&color_source_info_v3);
 	obs_register_source(&slideshow_info);
 	return true;
 }

obs-studio-25.0.8.tar.xz/plugins/image-source/obs-slideshow.c -> obs-studio-26.0.0.tar.xz/plugins/image-source/obs-slideshow.c Changed

@@ -112,8 +112,22 @@
 	obs_hotkey_id stop_hotkey;
 	obs_hotkey_id next_hotkey;
 	obs_hotkey_id prev_hotkey;
+
+	enum obs_media_state state;
 };
 
+static void set_media_state(void *data, enum obs_media_state state)
+{
+	struct slideshow *ss = data;
+	ss->state = state;
+}
+
+static enum obs_media_state ss_get_state(void *data)
+{
+	struct slideshow *ss = data;
+	return ss->state;
+}
+
 static obs_source_t *get_transition(struct slideshow *ss)
 {
 	obs_source_t *tr;
@@ -242,18 +256,21 @@
 	struct slideshow *ss = data;
 	bool valid = item_valid(ss);
 
-	if (valid && ss->use_cut)
+	if (valid && ss->use_cut) {
 		obs_transition_set(ss->transition,
 				   ss->files.array[ss->cur_item].source);
 
-	else if (valid && !to_null)
+	} else if (valid && !to_null) {
 		obs_transition_start(ss->transition, OBS_TRANSITION_MODE_AUTO,
 				     ss->tr_speed,
 				     ss->files.array[ss->cur_item].source);
 
-	else
+	} else {
 		obs_transition_start(ss->transition, OBS_TRANSITION_MODE_AUTO,
 				     ss->tr_speed, NULL);
+		set_media_state(ss, OBS_MEDIA_STATE_ENDED);
+		obs_source_media_ended(ss->source);
+	}
 }
 
 static void ss_update(void *data, obs_data_t *settings)
@@ -453,18 +470,37 @@
 		ss->cur_item = random_file(ss);
 	if (new_tr)
 		obs_source_add_active_child(ss->source, new_tr);
-	if (ss->files.num)
+	if (ss->files.num) {
 		do_transition(ss, false);
 
+		if (ss->manual)
+			set_media_state(ss, OBS_MEDIA_STATE_PAUSED);
+		else
+			set_media_state(ss, OBS_MEDIA_STATE_PLAYING);
+
+		obs_source_media_started(ss->source);
+	}
+
 	obs_data_array_release(array);
 }
 
-static void ss_play_pause(void *data)
+static void ss_play_pause(void *data, bool pause)
 {
 	struct slideshow *ss = data;
 
-	ss->paused = !ss->paused;
-	ss->manual = ss->paused;
+	if (ss->stop) {
+		ss->stop = false;
+		ss->paused = false;
+		do_transition(ss, false);
+	} else {
+		ss->paused = pause;
+		ss->manual = pause;
+	}
+
+	if (pause)
+		set_media_state(ss, OBS_MEDIA_STATE_PAUSED);
+	else
+		set_media_state(ss, OBS_MEDIA_STATE_PLAYING);
 }
 
 static void ss_restart(void *data)
@@ -473,12 +509,11 @@
 
 	ss->elapsed = 0.0f;
 	ss->cur_item = 0;
-
-	obs_transition_set(ss->transition,
-			   ss->files.array[ss->cur_item].source);
-
 	ss->stop = false;
 	ss->paused = false;
+	do_transition(ss, false);
+
+	set_media_state(ss, OBS_MEDIA_STATE_PLAYING);
 }
 
 static void ss_stop(void *data)
@@ -491,6 +526,8 @@
 	do_transition(ss, true);
 	ss->stop = true;
 	ss->paused = false;
+
+	set_media_state(ss, OBS_MEDIA_STATE_STOPPED);
 }
 
 static void ss_next_slide(void *data)
@@ -529,8 +566,8 @@
 
 	struct slideshow *ss = data;
 
-	if (pressed && obs_source_active(ss->source))
-		ss_play_pause(ss);
+	if (pressed && obs_source_showing(ss->source))
+		obs_source_media_play_pause(ss->source, !ss->paused);
 }
 
 static void restart_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
@@ -541,8 +578,8 @@
 
 	struct slideshow *ss = data;
 
-	if (pressed && obs_source_active(ss->source))
-		ss_restart(ss);
+	if (pressed && obs_source_showing(ss->source))
+		obs_source_media_restart(ss->source);
 }
 
 static void stop_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
@@ -553,8 +590,8 @@
 
 	struct slideshow *ss = data;
 
-	if (pressed && obs_source_active(ss->source))
-		ss_stop(ss);
+	if (pressed && obs_source_showing(ss->source))
+		obs_source_media_stop(ss->source);
 }
 
 static void next_slide_hotkey(void *data, obs_hotkey_id id,
@@ -568,8 +605,8 @@
 	if (!ss->manual)
 		return;
 
-	if (pressed && obs_source_active(ss->source))
-		ss_next_slide(ss);
+	if (pressed && obs_source_showing(ss->source))
+		obs_source_media_next(ss->source);
 }
 
 static void previous_slide_hotkey(void *data, obs_hotkey_id id,
@@ -583,8 +620,8 @@
 	if (!ss->manual)
 		return;
 
-	if (pressed && obs_source_active(ss->source))
-		ss_previous_slide(ss);
+	if (pressed && obs_source_showing(ss->source))
+		obs_source_media_previous(ss->source);
 }
 
 static void ss_destroy(void *data)
@@ -925,7 +962,7 @@
 	.id = "slideshow",
 	.type = OBS_SOURCE_TYPE_INPUT,
 	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
-			OBS_SOURCE_COMPOSITE,
+			OBS_SOURCE_COMPOSITE | OBS_SOURCE_CONTROLLABLE_MEDIA,
 	.get_name = ss_getname,
 	.create = ss_create,
 	.destroy = ss_destroy,
@@ -941,4 +978,10 @@
 	.get_defaults = ss_defaults,
 	.get_properties = ss_properties,
 	.icon_type = OBS_ICON_TYPE_SLIDESHOW,
+	.media_play_pause = ss_play_pause,
+	.media_restart = ss_restart,
+	.media_stop = ss_stop,
+	.media_next = ss_next_slide,
+	.media_previous = ss_previous_slide,
+	.media_get_state = ss_get_state,
 };

obs-studio-25.0.8.tar.xz/plugins/linux-alsa/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/linux-alsa/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/linux-alsa/alsa-input.c -> obs-studio-26.0.0.tar.xz/plugins/linux-alsa/alsa-input.c Changed

obs-studio-26.0.0.tar.xz/plugins/linux-alsa/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-alsa/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-alsa/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-alsa/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-alsa/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-alsa/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-capture/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/linux-capture/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-capture/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/hr-HR.ini Changed

obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-capture/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-capture/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-capture/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-capture/xshm-input.c -> obs-studio-26.0.0.tar.xz/plugins/linux-capture/xshm-input.c Changed

@@ -49,6 +49,16 @@
 
 	gs_texture_t *texture;
 
+	int_fast32_t cut_top;
+	int_fast32_t cut_left;
+	int_fast32_t cut_right;
+	int_fast32_t cut_bot;
+
+	int_fast32_t adj_x_org;
+	int_fast32_t adj_y_org;
+	int_fast32_t adj_width;
+	int_fast32_t adj_height;
+
 	bool show_cursor;
 	bool use_xinerama;
 	bool use_randr;
@@ -66,8 +76,8 @@
 {
 	if (data->texture)
 		gs_texture_destroy(data->texture);
-	data->texture = gs_texture_create(data->width, data->height, GS_BGRA, 1,
-					  NULL, GS_DYNAMIC);
+	data->texture = gs_texture_create(data->adj_width, data->adj_height,
+					  GS_BGRA, 1, NULL, GS_DYNAMIC);
 }
 
 /**
@@ -98,8 +108,8 @@
  */
 static int_fast32_t xshm_update_geometry(struct xshm_data *data)
 {
-	int_fast32_t old_width = data->width;
-	int_fast32_t old_height = data->height;
+	int_fast32_t prev_width = data->adj_width;
+	int_fast32_t prev_height = data->adj_height;
 
 	if (data->use_randr) {
 		if (randr_screen_geo(data->xcb, data->screen_id, &data->x_org,
@@ -129,12 +139,36 @@
 		return -1;
 	}
 
+	data->adj_y_org = data->y_org;
+	data->adj_x_org = data->x_org;
+	data->adj_height = data->height;
+	data->adj_width = data->width;
+
+	if (data->cut_top != 0) {
+		if (data->y_org > 0)
+			data->adj_y_org = data->y_org + data->cut_top;
+		else
+			data->adj_y_org = data->cut_top;
+		data->adj_height = data->adj_height - data->cut_top;
+	}
+	if (data->cut_left != 0) {
+		if (data->x_org > 0)
+			data->adj_x_org = data->x_org + data->cut_left;
+		else
+			data->adj_x_org = data->cut_left;
+		data->adj_width = data->adj_width - data->cut_left;
+	}
+	if (data->cut_right != 0)
+		data->adj_width = data->adj_width - data->cut_right;
+	if (data->cut_bot != 0)
+		data->adj_height = data->adj_height - data->cut_bot;
+
 	blog(LOG_INFO,
 	     "Geometry %" PRIdFAST32 "x%" PRIdFAST32 " @ %" PRIdFAST32
 	     ",%" PRIdFAST32,
 	     data->width, data->height, data->x_org, data->y_org);
 
-	if (old_width == data->width && old_height == data->height)
+	if (prev_width == data->adj_width && prev_height == data->adj_height)
 		return 0;
 
 	return 1;
@@ -208,14 +242,15 @@
 		goto fail;
 	}
 
-	data->xshm = xshm_xcb_attach(data->xcb, data->width, data->height);
+	data->xshm =
+		xshm_xcb_attach(data->xcb, data->adj_width, data->adj_height);
 	if (!data->xshm) {
 		blog(LOG_ERROR, "failed to attach shm !");
 		goto fail;
 	}
 
 	data->cursor = xcb_xcursor_init(data->xcb);
-	xcb_xcursor_offset(data->cursor, data->x_org, data->y_org);
+	xcb_xcursor_offset(data->cursor, data->adj_x_org, data->adj_y_org);
 
 	obs_enter_graphics();
 
@@ -242,6 +277,11 @@
 	data->advanced = obs_data_get_bool(settings, "advanced");
 	data->server = bstrdup(obs_data_get_string(settings, "server"));
 
+	data->cut_top = obs_data_get_int(settings, "cut_top");
+	data->cut_left = obs_data_get_int(settings, "cut_left");
+	data->cut_right = obs_data_get_int(settings, "cut_right");
+	data->cut_bot = obs_data_get_int(settings, "cut_bot");
+
 	xshm_capture_start(data);
 }
 
@@ -253,6 +293,10 @@
 	obs_data_set_default_int(defaults, "screen", 0);
 	obs_data_set_default_bool(defaults, "show_cursor", true);
 	obs_data_set_default_bool(defaults, "advanced", false);
+	obs_data_set_default_int(defaults, "cut_top", 0);
+	obs_data_set_default_int(defaults, "cut_left", 0);
+	obs_data_set_default_int(defaults, "cut_right", 0);
+	obs_data_set_default_int(defaults, "cut_bot", 0);
 }
 
 /**
@@ -371,6 +415,16 @@
 				obs_module_text("CaptureCursor"));
 	obs_property_t *advanced = obs_properties_add_bool(
 		props, "advanced", obs_module_text("AdvancedSettings"));
+
+	obs_properties_add_int(props, "cut_top", obs_module_text("CropTop"),
+			       -4096, 4096, 1);
+	obs_properties_add_int(props, "cut_left", obs_module_text("CropLeft"),
+			       -4096, 4096, 1);
+	obs_properties_add_int(props, "cut_right", obs_module_text("CropRight"),
+			       0, 4096, 1);
+	obs_properties_add_int(props, "cut_bot", obs_module_text("CropBottom"),
+			       0, 4096, 1);
+
 	obs_property_t *server = obs_properties_add_text(
 		props, "server", obs_module_text("XServer"), OBS_TEXT_DEFAULT);
 
@@ -432,9 +486,9 @@
 	xcb_xfixes_get_cursor_image_reply_t *cur_r;
 
 	img_c = xcb_shm_get_image_unchecked(data->xcb, data->xcb_screen->root,
-					    data->x_org, data->y_org,
-					    data->width, data->height, ~0,
-					    XCB_IMAGE_FORMAT_Z_PIXMAP,
+					    data->adj_x_org, data->adj_y_org,
+					    data->adj_width, data->adj_height,
+					    ~0, XCB_IMAGE_FORMAT_Z_PIXMAP,
 					    data->xshm->seg, 0);
 	cur_c = xcb_xfixes_get_cursor_image_unchecked(data->xcb);
 
@@ -447,7 +501,7 @@
 	obs_enter_graphics();
 
 	gs_texture_set_image(data->texture, (void *)data->xshm->data,
-			     data->width * 4, false);
+			     data->adj_width * 4, false);
 	xcb_xcursor_update(data->cursor, cur_r);
 
 	obs_leave_graphics();
@@ -491,7 +545,7 @@
 static uint32_t xshm_getwidth(void *vptr)
 {
 	XSHM_DATA(vptr);
-	return data->width;
+	return data->adj_width;
 }
 
 /**
@@ -500,7 +554,7 @@
 static uint32_t xshm_getheight(void *vptr)
 {
 	XSHM_DATA(vptr);
-	return data->height;
+	return data->adj_height;
 }
 
 struct obs_source_info xshm_input = {

obs-studio-25.0.8.tar.xz/plugins/linux-jack/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/linux-jack/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/linux-jack/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-jack/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-jack/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-jack/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-jack/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-jack/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-jack/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-pulseaudio/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-pulseaudio/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/data/locale/ro-RO.ini Changed

obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-pulseaudio/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-pulseaudio/pulse-input.c -> obs-studio-26.0.0.tar.xz/plugins/linux-pulseaudio/pulse-input.c Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/CMakeLists.txt Changed

@@ -5,23 +5,28 @@
 	return()
 endif()
 
-find_package(Libv4l2)
-find_package(LibUDev QUIET)
 
-if(NOT LIBV4L2_FOUND AND ENABLE_V4L2)
-	message(FATAL_ERROR "libv4l2 not found bit plugin set as enabled")
-elseif(NOT LIBV4L2_FOUND)
-	message(STATUS "libv4l2 not found, disabling v4l2 plugin")
-	return()
+if(ENABLE_V4L2)
+	find_package(Libv4l2 REQUIRED)
+else()
+	find_package(Libv4l2)
+	if(NOT LIBV4L2_FOUND)
+		message(STATUS "libv4l2 not found, disabling v4l2 plugin")
+		return()
+	endif()
 endif()
 
-if(NOT UDEV_FOUND OR DISABLE_UDEV)
-	message(STATUS "udev disabled for v4l2 plugin")
-else()
-	set(linux-v4l2-udev_SOURCES
-		v4l2-udev.c
-	)
+if(DISABLE_UDEV)
 	add_definitions(-DHAVE_UDEV)
+else()
+	find_package(UDev)
+	if(NOT UDEV_FOUND)
+		message(STATUS "udev disabled for v4l2 plugin")
+	else()
+		set(linux-v4l2-udev_SOURCES
+			v4l2-udev.c
+		)
+	endif()
 endif()
 
 include_directories(
@@ -45,5 +50,6 @@
 	${LIBV4L2_LIBRARIES}
 	${UDEV_LIBRARIES}
 )
+set_target_properties(linux-v4l2 PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-v4l2 data)

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/gl-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/v4l2-controls.c -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/v4l2-controls.c Changed

obs-studio-25.0.8.tar.xz/plugins/linux-v4l2/v4l2-input.c -> obs-studio-26.0.0.tar.xz/plugins/linux-v4l2/v4l2-input.c Changed

@@ -53,11 +53,11 @@
 #define timeval2ns(tv) \
 	(((uint64_t)tv.tv_sec * 1000000000) + ((uint64_t)tv.tv_usec * 1000))
 
-#define V4L2_FOURCC_STR(code)                                                 \
-	(char[5])                                                             \
-	{                                                                     \
-		(code >> 24) & 0xFF, (code >> 16) & 0xFF, (code >> 8) & 0xFF, \
-			code & 0xFF, 0                                        \
+#define V4L2_FOURCC_STR(code)                                         \
+	(char[5])                                                     \
+	{                                                             \
+		code & 0xFF, (code >> 8) & 0xFF, (code >> 16) & 0xFF, \
+			(code >> 24) & 0xFF, 0                        \
 	}
 
 #define blog(level, msg, ...) blog(level, "v4l2-input: " msg, ##__VA_ARGS__)
@@ -81,6 +81,8 @@
 	pthread_t thread;
 	os_event_t *event;
 
+	bool framerate_unchanged;
+	bool resolution_unchanged;
 	int_fast32_t dev;
 	int width;
 	int height;
@@ -91,6 +93,7 @@
 /* forward declarations */
 static void v4l2_init(struct v4l2_data *data);
 static void v4l2_terminate(struct v4l2_data *data);
+static void v4l2_update(void *vptr, obs_data_t *settings);
 
 /**
  * Prepare the output frame structure for obs and compute plane offsets
@@ -120,7 +123,7 @@
 	switch (data->pixfmt) {
 	case V4L2_PIX_FMT_NV12:
 		frame->linesize[0] = data->linesize;
-		frame->linesize[1] = data->linesize / 2;
+		frame->linesize[1] = data->linesize;
 		plane_offsets[1] = data->linesize * data->height;
 		break;
 	case V4L2_PIX_FMT_YVU420:
@@ -579,10 +582,18 @@
 		return false;
 
 	obs_property_t *prop = obs_properties_get(props, "input");
+	obs_properties_t *ctrl_props_new = obs_properties_create();
+
+	obs_properties_remove_by_name(props, "controls");
+
 	v4l2_input_list(dev, prop);
-	v4l2_update_controls(dev, props, settings);
+	v4l2_update_controls(dev, ctrl_props_new, settings);
 	v4l2_close(dev);
 
+	obs_properties_add_group(props, "controls",
+				 obs_module_text("CameraCtrls"),
+				 OBS_GROUP_NORMAL, ctrl_props_new);
+
 	obs_property_modified(prop, settings);
 
 	return true;
@@ -785,6 +796,12 @@
 	obs_properties_add_bool(props, "buffering",
 				obs_module_text("UseBuffering"));
 
+	// a group to contain the camera control
+	obs_properties_t *ctrl_props = obs_properties_create();
+	obs_properties_add_group(props, "controls",
+				 obs_module_text("CameraCtrls"),
+				 OBS_GROUP_NORMAL, ctrl_props);
+
 	obs_data_t *settings = obs_source_get_settings(data->source);
 	v4l2_device_list(device_list, settings);
 	obs_data_release(settings);
@@ -940,18 +957,77 @@
 }
 
 /**
+ * Checking if any of the settings have changed so that we can restart the
+ * stream
+ */
+static bool v4l2_settings_changed(struct v4l2_data *data, obs_data_t *settings)
+{
+	bool res = false;
+
+	if (obs_data_get_string(settings, "device_id") != NULL &&
+	    data->device_id != NULL) {
+		res |= strcmp(data->device_id,
+			      obs_data_get_string(settings, "device_id")) != 0;
+		res |= data->input != obs_data_get_int(settings, "input");
+		res |= data->pixfmt !=
+		       obs_data_get_int(settings, "pixelformat");
+		res |= data->standard != obs_data_get_int(settings, "standard");
+		res |= data->dv_timing !=
+		       obs_data_get_int(settings, "dv_timing");
+
+		if (obs_data_get_int(settings, "resolution") == -1 &&
+		    !data->resolution_unchanged) {
+			data->resolution_unchanged = true;
+			res |= true;
+		} else if (obs_data_get_int(settings, "resolution") == -1 &&
+			   data->resolution_unchanged) {
+			res |= false;
+		} else {
+			data->resolution_unchanged = false;
+			res |= (data->resolution !=
+				obs_data_get_int(settings, "resolution")) &&
+			       (obs_data_get_int(settings, "resolution") != -1);
+		}
+
+		if (obs_data_get_int(settings, "framerate") == -1 &&
+		    !data->framerate_unchanged) {
+			data->framerate_unchanged = true;
+			res |= true;
+		} else if (obs_data_get_int(settings, "framerate") == -1 &&
+			   data->framerate_unchanged) {
+			res |= false;
+		} else {
+			data->framerate_unchanged = false;
+			res |= (data->framerate !=
+				obs_data_get_int(settings, "framerate")) &&
+			       (obs_data_get_int(settings, "framerate") != -1);
+		}
+
+		res |= data->color_range !=
+		       obs_data_get_int(settings, "color_range");
+	} else {
+		res = true;
+	}
+
+	return res;
+}
+
+/**
  * Update the settings for the v4l2 source
  *
- * Since there are very few settings that can be changed without restarting the
- * stream we don't bother to even try. Whenever this is called the currently
- * active stream (if exists) is stopped, the settings are updated and finally
- * the new stream is started.
+ * There are a few settings that can be changed without restarting the stream
+ * Whenever this is called the currently active stream (if exists) is stopped,
+ * the settings are updated and finally the new stream is started.
  */
 static void v4l2_update(void *vptr, obs_data_t *settings)
 {
+
 	V4L2_DATA(vptr);
 
-	v4l2_terminate(data);
+	bool needs_restart = v4l2_settings_changed(data, settings);
+
+	if (needs_restart)
+		v4l2_terminate(data);
 
 	if (data->device_id)
 		bfree(data->device_id);
@@ -967,7 +1043,8 @@
 
 	v4l2_update_source_flags(data, settings);
 
-	v4l2_init(data);
+	if (needs_restart)
+		v4l2_init(data);
 }
 
 static void *v4l2_create(obs_data_t *settings, obs_source_t *source)
@@ -975,6 +1052,8 @@
 	struct v4l2_data *data = bzalloc(sizeof(struct v4l2_data));
 	data->dev = -1;
 	data->source = source;
+	data->resolution_unchanged = false;
+	data->framerate_unchanged = false;
 
 	/* Bitch about build problems ... */
 #ifndef V4L2_CAP_DEVICE_CAPS

obs-studio-25.0.8.tar.xz/plugins/mac-avcapture/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/mac-avcapture/av-capture.mm -> obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/av-capture.mm Changed

obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-avcapture/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/ro-RO.ini Changed

obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-avcapture/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/mac-avcapture/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-avcapture/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/audio-device-enum.c -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/audio-device-enum.c Changed

obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-capture/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/ro-RO.ini Changed

obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-capture/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/mac-window-capture.m -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/mac-window-capture.m Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/window-utils.h -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/window-utils.h Changed

obs-studio-25.0.8.tar.xz/plugins/mac-capture/window-utils.m -> obs-studio-26.0.0.tar.xz/plugins/mac-capture/window-utils.m Changed

obs-studio-25.0.8.tar.xz/plugins/mac-syphon/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/mac-syphon/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/mac-syphon/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/he-IL.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-syphon/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/ro-RO.ini Changed

obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-syphon/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-syphon/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/mac-vth264/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/mac-vth264/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-vth264/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/he-IL.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/mac-vth264/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/mac-vth264/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/README.md -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/README.md Changed

@@ -1,10 +1,14 @@
 # obs-browser
 
-CEF Based obs-studio browser plugin
+obs-browser introduces a cross-platform Browser Source, powered by CEF ([Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef/src/master/README.md)), to OBS Studio. A Browser Source allows the user to integrate web-based overlays into their scenes, with complete access to modern web APIs.
+
+On Windows, this also adds support for Service Integration (linking third party services) and Browser Docks (webpages loaded into the interface itself). macOS support for service integration & browser docks is in the works, and Linux support is planned.
+
+**This plugin is included by default** on official packages on Windows and macOS. While Linux is supported, the official ppa does not currently include the browser source [due to a conflict with GTK](https://github.com/obsproject/obs-browser/issues/219).
 
 ## JS Bindings
 
-obs-browser provides a global object that allows access to some OBS-specific functionality from JavaScript.
+obs-browser provides a global object that allows access to some OBS-specific functionality from JavaScript. This can be used to create an overlay that adapts dynamically to changes in OBS.
 
 ### Get Browser Plugin Version
 
@@ -190,7 +194,7 @@
 #### Getting
 
 *  Download CEF Windows 64bit from [http://opensource.spotify.com/cefbuilds/index.html](http://opensource.spotify.com/cefbuilds/index.html)
-  *  Use CEF branch 3440 or newer (3579 if you want shared texture support)
+  *  Use CEF branch 3770
 *  Extract and cd into the folder
 
 #### Setting Up the Project

obs-studio-25.0.8.tar.xz/plugins/obs-browser/browser-client.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/browser-client.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/bg-BG.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/de-DE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/el-GR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/el-GR.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/eu-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/eu-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/gl-ES.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/he-IL.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/nb-NO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-browser/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/data/locale/zh-TW.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-browser/obs-browser-page.manifest Added

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+    <description>OBS Browser Page (CEF)</description>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel
+                    level="asInvoker"
+                    uiAccess="false"
+                />
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <maxversiontested Id="10.0.19041.0"/>
+            
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+        </application>
+    </compatibility>
+</assembly>
\ No newline at end of file

obs-studio-25.0.8.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/bg-BG.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/bn-BD.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/bn-BD.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ca-ES.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Taxa de bits"
 MaxBitrate="Taxa de bits màxima"
 Preset="Valors predefinits"
+Profile="Perfil"
 RateControl="Control de freqüència"
 KeyframeIntervalSec="Interval de fotograma clau (en segons, 0 = automàtic)"
 Lossless="Sense pèrdues"
@@ -59,3 +60,13 @@
 UnableToWritePath="No s'ha pogut escriure a %1. Assegureu-vos que utilitzeu una ruta de gravació a la qual el vostre compte d'usuari tingui permisos per escriure i que hi hagi prou espai al disc."
 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ó."
 
+NVENC.Error="No s'ha pogut obrir el còdec NVENC: %1"
+NVENC.GenericError="Comproveu que els controladors de vídeo estiguin actualitzats. Proveu de tancar un altre programari de gravació que pugui utilitzar NVENC com ara NVIDIA Shadowplay o Windows 10 Game DVR."
+NVENC.BadGPUIndex="Heu seleccionat la GPU %1 a la configuració del codificador de sortida. Establiu-lo a 0 i torneu-ho a provar."
+NVENC.OutdatedDriver="El controlador actual de la targeta de vídeo no és compatible amb aquesta versió d'NVENC, actualitzeu els controladors."
+NVENC.UnsupportedDevice="Error d'NVENC: Dispositiu no compatible. Comproveu que la targeta de vídeo suporta NVENC i que els controladors estiguin actualitzats."
+NVENC.TooManySessions="Error d'NVENC: Hi ha massa sessions simultànies. Proveu de tancar un altre programari de gravació que pugui utilitzar NVENC com ara NVIDIA Shadowplay o Windows 10 Game DVR."
+NVENC.CheckDrivers="Comproveu que els controladors de vídeo estiguin actualitzats."
+
+ReconnectDelayTime="Demora de reconnexió"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini Changed

@@ -1,12 +1,13 @@
-FFmpegOutput="Výstup FFmpegu"
-FFmpegAAC="Výchozí FFmpeg AAC enkodér"
+FFmpegOutput="FFmpeg výstup"
+FFmpegAAC="Výchozí AAC enkodér pro FFmpeg"
 FFmpegOpus="FFmpeg Opus enkodér"
 Bitrate="Bitrate"
 MaxBitrate="Maximální bitrate"
 Preset="Předvolba"
+Profile="Profil"
 RateControl="Řízení toku"
 KeyframeIntervalSec="Interval klíč. snímků (vteřiny, 0=auto)"
-Lossless="Lossless"
+Lossless="Bezztrátový"
 
 BFrames="Maximum B-snímků"
 
@@ -22,7 +23,7 @@
 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="Psycho Visual Tuning"
 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."
-NVENC.CQLevel="CQ úroveň"
+NVENC.CQLevel="Úroveň CQ"
 
 FFmpegSource="Médium"
 LocalFile="Místní soubor"
@@ -59,3 +60,13 @@
 UnableToWritePath="Nelze zapsat do %1. Zkontrolujte prosím, zda používáte úložiště, do kterého může váš uživatelský účet zapisovat a je zde dostatek volného místa."
 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."
 
+NVENC.Error="Nezdařilo se otevřít NVENC kodek: %1"
+NVENC.GenericError="Zkontrolujte zda máte nejnovější verzi video ovladačů. Zkuzte zavřít ostatní nahrávací programy které by mohly využívat kódování NVENC (např. NVIDIA Shadowplay nebo Windows 10 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."
+NVENC.OutdatedDriver="Současná verze vašeho grafického ovladače nepodporuje tuto verzi NVENC. Aktualizujte prosím své ovladače."
+NVENC.UnsupportedDevice="Chyba NVENC: Nepodporované zařízení. Ujistěte se, že vaše video karta podporuje kódování NVENC a že má nejnovější ovladače."
+NVENC.TooManySessions="Chyba NVENC: Příliš mnoho souběžných relací. Zkuste zavřít ostatní nahrávací programy, které mohou používat NVENC, například NVIDIA Shadowplay nebo Windows 10 herní DVR."
+NVENC.CheckDrivers="Prosím zkontrolujte, že jsou ovladače vaší grafické karty aktuální."
+
+ReconnectDelayTime="Doba do obnovení spojení"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/da-DK.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bitrate"
 MaxBitrate="Maks. bithastighed"
 Preset="Forudindstillet"
+Profile="Profil"
 RateControl="Tempokontrol"
 KeyframeIntervalSec="Keyframe-interval (sekunder, 0= auto)"
 Lossless="Tabsfri"
@@ -59,3 +60,13 @@
 UnableToWritePath="Kan ikke skrive til %1. Tjek, at du benytter en optagelsessti, som din brugerkonto har skriverettighed til, og at der er tilstrækkelig ledig diskplads."
 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."
 
+NVENC.Error="Mislykkedes at åbne NVENC-codec: %1"
+NVENC.GenericError="Tjek, at dine videodrivere er opdaterede. Prøv at lukke anden optagesoftware, der muligvis bruger NVENC, såsom NVIDIA Shadowplay eller Windows 10 Game DVR."
+NVENC.BadGPUIndex="Du har valgt GPU %1 i dine outputkodningsindstillinger. Sæt dette tilbage til 0 og prøv igen."
+NVENC.OutdatedDriver="Din nuværende videokortdriver understøtter ikke denne NVENC-version. Opdatér dine drivere."
+NVENC.UnsupportedDevice="NVENC-fejl: Uunderstøttet enhed. Tjek, at dit videokort understøtter NVENC, samt at driverne er opdaterede."
+NVENC.TooManySessions="NVENC-fejl: For mange samtidige sessioner. Prøv at lukke anden optagesoftware, der muligvis bruger NVENC, såsom NVIDIA Shadowplay eller Windows 10 Game DVR."
+NVENC.CheckDrivers="Tjek, at dine videodrivere er opdaterede."
+
+ReconnectDelayTime="Anbefalet forsinkelse"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/de-DE.ini Changed

@@ -1,16 +1,17 @@
 FFmpegOutput="FFmpeg‐Ausgabe"
-FFmpegAAC="FFmpeg‐Standard‐AAC‐Kodierer"
-FFmpegOpus="FFmpeg‐Opus‐Kodierer"
+FFmpegAAC="FFmpeg‐Standard‐AAC‐Encoder"
+FFmpegOpus="FFmpeg‐Opus‐Encoder"
 Bitrate="Bitrate"
 MaxBitrate="Max. Bitrate"
 Preset="Voreinstellung"
+Profile="Profil"
 RateControl="Qualitätsregulierungsmethode"
 KeyframeIntervalSec="Keyframeintervall in Sek. (0 = automatisch)"
 Lossless="Verlustfrei"
 
 BFrames="Max. B‐Frames"
 
-NVENC.Use2Pass="Two‐Pass‐Kodierung verwenden"
+NVENC.Use2Pass="Two‐Pass‐Codierung verwenden"
 NVENC.Preset.default="Leistung"
 NVENC.Preset.hq="Qualität"
 NVENC.Preset.hp="Max. Leistung"
@@ -19,9 +20,9 @@
 NVENC.Preset.llhq="Niedrige Latenz und Qualität"
 NVENC.Preset.llhp="Niedrige Latenz und Leistung"
 NVENC.LookAhead="Lookahead"
-NVENC.LookAhead.ToolTip="Aktiviert dynamische B‐Frames.\n\nWenn deaktiviert, wird der Kodierer immer die Anzahl der B‐Frames verwenden, die in der Einstellung „Max. B‐Frames“ angegeben sind.\n\nWenn aktiviert, wird die visuelle Qualität erhöht, indem nur so viele B‐Frames bis zum Maximum verwendet werden, wie benötigt.\n(Resultiert in eine höhere GPU‐Nutzung.)"
+NVENC.LookAhead.ToolTip="Aktiviert dynamische B‐Frames.\n\nWenn deaktiviert, wird der Encoder immer die Anzahl der B‐Frames verwenden, die in der Einstellung „Max. B‐Frames“ angegeben sind.\n\nWenn aktiviert, wird die visuelle Qualität erhöht, indem nur so viele B‐Frames bis zum Maximum verwendet werden, wie benötigt.\n(Resultiert in eine höhere GPU‐Nutzung.)"
 NVENC.PsychoVisualTuning="Psycho Visual Tuning"
-NVENC.PsychoVisualTuning.ToolTip="Aktiviert Kodierereinstellungen, die die Verwendung der Bitrate für eine erhöhte wahrgenommene visuelle Qualität optimieren,\ninsbesondere in Situationen mit hoher Bewegung.\n(Resultiert in eine höhere GPU‐Nutzung.)"
+NVENC.PsychoVisualTuning.ToolTip="Aktiviert Encodereinstellungen, die die Verwendung der Bitrate für eine erhöhte wahrgenommene visuelle Qualität optimieren,\ninsbesondere in Situationen mit hoher Bewegung.\n(Resultiert in eine höhere GPU‐Nutzung.)"
 NVENC.CQLevel="CQ‐Level"
 
 FFmpegSource="Medienquelle"
@@ -30,7 +31,7 @@
 Input="Eingabe"
 InputFormat="Eingabeformat"
 BufferingMB="Netzwerkpufferung"
-HardwareDecode="Hardwaredekodierung verwenden, falls verfügbar"
+HardwareDecode="Hardwaredecodierung verwenden, falls verfügbar"
 ClearOnMediaEnd="Nichts anzeigen, wenn Wiedergabe endet"
 Advanced="Erweitert"
 RestartWhenActivated="Wiedergabe bei Quellenaktivierung erneut starten"
@@ -40,12 +41,12 @@
 ColorRange.Auto="Automatisch"
 ColorRange.Partial="Teilweise"
 ColorRange.Full="Voll"
-RestartMedia="Neustarten"
+RestartMedia="Neu starten"
 SpeedPercentage="Geschwindigkeit"
 Seekable="Durchsuchbar"
 Play="Abspielen"
 Pause="Pausieren"
-Stop="Stoppen"
+Stop="Beenden"
 
 MediaFileFilter.AllMediaFiles="Alle Mediendateien"
 MediaFileFilter.VideoFiles="Videodateien"
@@ -57,5 +58,15 @@
 
 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="Kann nicht zu %1 schreiben. Vergewissern Sie sich, dass Sie einen Aufnahmepfad verwenden, für den Ihr Benutzerkonto Schreibrechte hat und dass genügend Speicherplatz zur Verfügung steht."
-WarnWindowsDefender="Wenn Windows‐10‐Ransomware‐Schutz aktiviert ist, kann dies auch den Fehler auslösen. Versuchen Sie, den überwachten Ordnerzugriff in „Windows‐Sicherheit“ → „Viren‐ & Bedrohungsschutz“ auszuschalten."
+WarnWindowsDefender="Wenn Windows‐10‐Ransomware‐Schutz aktiviert ist, kann dies auch den Fehler auslösen. Versuchen Sie, den überwachten Ordnerzugriff in „Windows‐Sicherheit“ → „Viren‐ & Bedrohungsschutz“ auszuschalten."
+
+NVENC.Error="Fehler beim Öffnen des NVENC‐Codecs: %1"
+NVENC.GenericError="Überprüfen Sie, ob Ihre Grafiktreiber aktuell sind. Versuchen Sie, andere Aufnahmesoftware wie NVIDIA Shadowplay oder Windows 10 Game DVR zu schließen, welche NVENC möglicherweise verwendet."
+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="Ihr aktueller Grafikkartentreiber unterstützt diese NVENC‐Version nicht. Bitte aktualisieren Sie Ihre Treiber."
+NVENC.UnsupportedDevice="NVENC‐Fehler: Nicht unterstütztes Gerät. Überprüfen Sie, ob Ihre Grafikkarte NVENC unterstützt und Ihre Treiber aktuell sind."
+NVENC.TooManySessions="NVENC‐Fehler: Zu viele gleichzeitige Sitzungen. Versuchen Sie, andere Aufnahmesoftware wie NVIDIA Shadowplay oder Windows 10 Game DVR zu schließen, welche NVENC möglicherweise verwendet."
+NVENC.CheckDrivers="Bitte überprüfen Sie, ob Ihre Grafiktreiber aktuell sind."
+
+ReconnectDelayTime="Wiederverbindungsverzögerung"

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/en-GB.ini Added

@@ -0,0 +1,72 @@
+FFmpegOutput="FFmpeg Output"
+FFmpegAAC="FFmpeg Default AAC Encoder"
+FFmpegOpus="FFmpeg Opus Encoder"
+Bitrate="Bitrate"
+MaxBitrate="Max Bitrate"
+Preset="Preset"
+Profile="Profile"
+RateControl="Rate Control"
+KeyframeIntervalSec="Keyframe Interval (seconds, 0=auto)"
+Lossless="Lossless"
+
+BFrames="Max B-frames"
+
+NVENC.Use2Pass="Use Two-Pass Encoding"
+NVENC.Preset.default="Performance"
+NVENC.Preset.hq="Quality"
+NVENC.Preset.hp="Max Performance"
+NVENC.Preset.mq="Max Quality"
+NVENC.Preset.ll="Low-Latency"
+NVENC.Preset.llhq="Low-Latency Quality"
+NVENC.Preset.llhp="Low-Latency Performance"
+NVENC.LookAhead="Look-ahead"
+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="Psycho Visual Tuning"
+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."
+NVENC.CQLevel="CQ Level"
+
+FFmpegSource="Media Source"
+LocalFile="Local File"
+Looping="Loop"
+Input="Input"
+InputFormat="Input Format"
+BufferingMB="Network Buffering"
+HardwareDecode="Use hardware decoding when available"
+ClearOnMediaEnd="Show nothing when playback ends"
+Advanced="Advanced"
+RestartWhenActivated="Restart playback when source becomes active"
+CloseFileWhenInactive="Close file when inactive"
+CloseFileWhenInactive.ToolTip="Closes the file when the source is not being displayed on the stream or\nrecording. This allows the file to be changed when the source isn't active,\nbut there may be some startup delay when the source reactivates."
+ColorRange="YUV Colour Range"
+ColorRange.Auto="Auto"
+ColorRange.Partial="Partial"
+ColorRange.Full="Full"
+RestartMedia="Restart"
+SpeedPercentage="Speed"
+Seekable="Seekable"
+Play="Play"
+Pause="Pause"
+Stop="Stop"
+
+MediaFileFilter.AllMediaFiles="All Media Files"
+MediaFileFilter.VideoFiles="Video Files"
+MediaFileFilter.AudioFiles="Audio Files"
+MediaFileFilter.AllFiles="All Files"
+
+ReplayBuffer="Replay Buffer"
+ReplayBuffer.Save="Save Replay"
+
+HelperProcessFailed="Unable to start the recording helper process. Check that OBS files have not been blocked or removed by any 3rd party antivirus / security software."
+UnableToWritePath="Unable to write to %1. Make sure you're using a recording path which your user account is allowed to write to and that there is sufficient disk space."
+WarnWindowsDefender="If Windows 10 Ransomware Protection is enabled it can also cause this error. Try turning off controlled folder access in Windows Security / Virus & threat protection settings."
+
+NVENC.Error="Failed to open NVENC codec: %1"
+NVENC.GenericError="Check your video drivers are up to date. Try closing other recording software which might be using NVENC such as NVIDIA Shadowplay or Windows 10 Game DVR."
+NVENC.BadGPUIndex="You have selected GPU %1 in your output encoder settings. Set this back to 0 and try again."
+NVENC.OutdatedDriver="Your current video card driver does not support this NVENC version, please update your drivers."
+NVENC.UnsupportedDevice="NVENC Error: Unsupported device. Check your video card supports NVENC and that the drivers are up to date."
+NVENC.TooManySessions="NVENC Error: Too many concurrent sessions. Try closing other recording software which might be using NVENC such as NVIDIA Shadowplay or Windows 10 Game DVR."
+NVENC.CheckDrivers="Please check your video drivers are up to date."
+
+ReconnectDelayTime="Reconnect Delay"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/es-ES.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Tasa de bits"
 MaxBitrate="Tasa de bits máxima"
 Preset="Preajuste"
+Profile="Perfil"
 RateControl="Control de la frecuencia"
 KeyframeIntervalSec="Intervalo de keyframes (segundos, 0=auto)"
 Lossless="Sin pérdidas"
@@ -59,3 +60,13 @@
 UnableToWritePath="No se pudo escribir a %1. Asegúrese de que utiliza una ruta de grabación que su cuenta de usuario tenga permisos para escribir y que haya suficiente espacio en disco."
 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."
 
+NVENC.Error="No se pudo abrir el códec NVENC: %1"
+NVENC.GenericError="Compruebe que sus controladores de vídeo están actualizados. Pruebe a cerrar otro software de grabación que podría estar usando NVENC como NVIDIA Shadowplay o Windows 10 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."
+NVENC.OutdatedDriver="El controlador actual de tarjeta de vídeo no es compatible con esta versión de NVENC, por favor actualice sus controladores."
+NVENC.UnsupportedDevice="Error NVENC: Dispositivo no compatible. Compruebe que su tarjeta de vídeo soporta NVENC y que los controladores están actualizados."
+NVENC.TooManySessions="Error NVENC: Demasiadas sesiones simultáneas. Intenta cerrar otro software de grabación que podría estar usando NVENC como NVIDIA Shadowplay o Windows 10 Game DVR."
+NVENC.CheckDrivers="Por favor, compruebe que sus controladores de vídeo están actualizados."
+
+ReconnectDelayTime="Retraso de reconexión"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/et-EE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/et-EE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/eu-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/eu-ES.ini Changed

@@ -59,3 +59,12 @@
 UnableToWritePath="Ezin izan da idatzi %1-ean. Egiaztatu grabazio-tokian idazteko baimena duzula eta diskoan leku libre nahikoa dagoela."
 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."
 
+NVENC.Error="Huts egin du NVENC kodeka irekitzean: %1"
+NVENC.GenericError="Egiaztatu zure bideo kontrolatzaileak eguneratuta daudela. Saiatu NVENC erabiltzen ari diren beste grabazio software batzuk ixten, esaterako NVIDIA Shadowplay edo Windows 10 Game DVR."
+NVENC.BadGPUIndex="%1 GPUa aukeratu duzu zure irteerako kodetzailearen ezarpenetan. Leheneratu hau 0-ra eta saiatu berriro."
+NVENC.OutdatedDriver="Zure bideo txartelaren kontrolatzaileak ez du NVENC bertsio hau onartzen. Eguneratu kontrolatzaileak."
+NVENC.UnsupportedDevice="NVENC errorea: onartzen ez den gailua. Egiaztatu zure bideo-txartelak NVENC onartzen duela eta kontrolatzaileak eguneratuta daudela."
+NVENC.TooManySessions="NVENC errorea: Saio gehiegi aldi berean. Saiatu NVENC erabiltzen ari diren beste grabazio software batzuk ixten, esaterako NVIDIA Shadowplay edo Windows 10 Game DVR."
+NVENC.CheckDrivers="Egiaztatu zure bideo kontrolatzaileak eguneratuta daudela."
+
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/fa-IR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/fa-IR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/fi-FI.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bitrate"
 MaxBitrate="Maksimi bitrate"
 Preset="Esiasetus"
+Profile="Profiili"
 RateControl="Rate Control -tila"
 KeyframeIntervalSec="Keyframe-väli (sekunteina, 0=automaattinen)"
 Lossless="Häviötön"
@@ -59,3 +60,13 @@
 UnableToWritePath="Ei voida kirjoittaa %1. Tarkista, että käytät oikeaa tiedostopolkua johon käyttäjätililläsi on kirjoitusoikeus. Tarkista myös, että levyllä on tarpeeksi tilaa."
 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."
 
+NVENC.Error="NVENC-koodekin avaaminen epäonnistui: %1"
+NVENC.GenericError="Tarkista että näytönohjaimen ajurit on päivitetty ajantasalle. Sulje muut ruudunkaappausohjelmistot, jotka saattavat käyttää NVENC-enkooderia, kuten NVIDIA Shadowplay tai Windows 10 Game DVR."
+NVENC.BadGPUIndex="Olet valinnut GPU %1 \"Ulostulo\"-valikon enkooderi-asetuksesta. Aseta tämä takaisin arvoon 0 ja yritä uudelleen."
+NVENC.OutdatedDriver="Tämänhetkinen näytönohjainajurisi ei tue tätä NVENC-versiota. Ole hyvä ja päivitä näytönohjaimen ajurit."
+NVENC.UnsupportedDevice="NVENC-virhe: Ei tuettu laite. Tarkista että näytönohjaimesi tukee NVENC-ominaisuutta ja että sen ajurit ovat ajantasalla."
+NVENC.TooManySessions="NVENC-virhe: Liian monta samanaikaista istuntoa. Sulje muut ruudunkaappausohjelmistot, jotka saattavat käyttää NVENC-enkooderia, kuten NVIDIA Shadowplay tai Windows 10 Game DVR."
+NVENC.CheckDrivers="Tarkista että näytönohjaimesi ajurit ovat ajantasalla."
+
+ReconnectDelayTime="Uudelleenyhdistyksen viive"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/fr-FR.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Débit"
 MaxBitrate="Débit maximal"
 Preset="Pré-réglage"
+Profile="Profil"
 RateControl="Contrôle du débit"
 KeyframeIntervalSec="Intervalle d'image-clé (en secondes, 0 = auto)"
 Lossless="Sans perte"
@@ -40,7 +41,7 @@
 ColorRange.Auto="Auto"
 ColorRange.Partial="Partielle"
 ColorRange.Full="Complète"
-RestartMedia="Reprendre depuis le début"
+RestartMedia="Relancer"
 SpeedPercentage="Vitesse"
 Seekable="Navigable"
 Play="Lecture"
@@ -59,3 +60,13 @@
 UnableToWritePath="Impossible d’écrire dans %1. Assurez-vous que vous utilisez un chemin d’enregistrement où votre compte d’utilisateur est autorisé à écrire et qu’il y a suffisamment d’espace disque."
 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\"."
 
+NVENC.Error="Impossible d'ouvrir le codec NVENC : %1"
+NVENC.GenericError="Vérifiez que vos pilotes vidéo sont à jour. Essayez de fermer un autre logiciel d’enregistrement qui pourrait utiliser NVENC comme NVIDIA Shadowplay ou Windows 10 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."
+NVENC.OutdatedDriver="Votre pilote de carte vidéo actuel ne prend pas en charge cette version de NVENC, veuillez mettre à jour vos pilotes."
+NVENC.UnsupportedDevice="Erreur NVENC : périphérique non pris en charge. Vérifiez que votre carte vidéo prend en charge NVENC et que les pilotes sont à jour."
+NVENC.TooManySessions="Erreur NVENC : Trop de sessions simultanées. Essayez de fermer un autre logiciel d'enregistrement qui pourrait utiliser NVENC comme NVIDIA Shadowplay ou Windows 10 Game DVR."
+NVENC.CheckDrivers="Veuillez vérifier que vos pilotes vidéo sont à jour."
+
+ReconnectDelayTime="Délai de reconnexion"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/gd-GB.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/gd-GB.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/gl-ES.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Taxa de bits"
 MaxBitrate="Taxa de bits máxima"
 Preset="Preaxuste"
+Profile="Perfil"
 RateControl="Control da taxa"
 KeyframeIntervalSec="Intervalo de fotogramas clave (segundos, 0=auto)"
 Lossless="Sen perdas"
@@ -59,3 +60,13 @@
 UnableToWritePath="Non foi posíbel escribir en %1. Asegúrese de que está a usar unha ruta de gravación na que a súa conta de usuario teña permisos de escritura e que haxa espazo abondo no disco."
 WarnWindowsDefender="Se a protección do Ransomware do Windows está activada tamén pode causar este erro. Tente desactivar o acceso controlado ao cartafol nos axustes de seguridade do Windows / virus e protección contra ameazas."
 
+NVENC.Error="Non foi posíbel abrir o códec NVENC: %1"
+NVENC.GenericError="Comprobe que os seus controladores de vídeo están actualizados. Probe a pechar outro software de gravación que podería estar usando NVENC como NVIDIA Shadowplay ou Windows 10 Game DVR."
+NVENC.BadGPUIndex="Seleccionou a GPU %1 nos axustes do seu codificador de saída. Estabelézao de novo a 0 e tenteo de novo."
+NVENC.OutdatedDriver="O controlador actual da tarxeta de vídeo non é compatíbel con esta versión de NVENC, actualice os seus controladores."
+NVENC.UnsupportedDevice="Erro de NVENC: Dispositivo non compatíbel. Comprobe que a súa tarxeta de vídeo admite NVENC e que os controladores están actualizados."
+NVENC.TooManySessions="Erro de NVENC: Demasiadas sesións simultáneas. Probe a pechar outro software de gravación que podería estar usando NVENC como NVIDIA Shadowplay ou Windows 10 Game DVR."
+NVENC.CheckDrivers="Comprobe que os seus controladores de vídeo están actualizados."
+
+ReconnectDelayTime="Atraso para reconectar"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/hi-IN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/hi-IN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/hr-HR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/hu-HU.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bitsebesség"
 MaxBitrate="Max bitsebesség"
 Preset="Készlet"
+Profile="Profil"
 RateControl="Sebesség Vezérlés"
 KeyframeIntervalSec="Kulcsképkocka időköze (másodperc, 0=auto)"
 Lossless="Veszteségmentes"
@@ -59,3 +60,13 @@
 UnableToWritePath="Nem lehet megírni a %1. Győződjön meg róla, hogy a felhasználói fiókjának megvannak a szükséges engedélyei az íráshoz vagy rendelkezésre áll az elegendő lemezterület."
 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."
 
+NVENC.Error="Nem sikerült megnyitni az NVENC kodeket: %1"
+NVENC.GenericError="Ellenőrizze a videó illesztőprogramjai naprakészségét. Próbáljon meg bezárni más olyan felvevő programokat, amelyek esetleg NVENC-t használhatnak, például az NVIDIA Shadowplay vagy a Windows 10 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."
+NVENC.OutdatedDriver="A jelenlegi videokártya illesztőprogram nem támogatja ezt az NVENC-verziót, kérjük, frissítse az illesztőprogramokat."
+NVENC.UnsupportedDevice="NVENC hiba: Nem támogatott eszköz. Ellenőrizze, hogy a videokártyája támogatja az NVENC-t, és az illesztőprogramjai naprakészségét."
+NVENC.TooManySessions="NVENC hiba: Túl sok párhuzamos munkamenet. Próbáljon meg bezárni más olyan felvevő szoftvereket, amelyek esetleg NVENC-t használnak, például az NVIDIA Shadowplay vagy a Windows 10 Game DVR."
+NVENC.CheckDrivers="Ellenőrizze a videókártya illesztőprogramjainak naprakészségét."
+
+ReconnectDelayTime="Újracsatlakozás késleltetése"
+

obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/id-ID.ini Added

@@ -0,0 +1,72 @@
+FFmpegOutput="Output FFmpeg"
+FFmpegAAC="Enkoder AAC FFmpeg Default"
+FFmpegOpus="Enkoder Opus FFmpeg"
+Bitrate="Bitrate"
+MaxBitrate="Bitrate Maks"
+Preset="Preset"
+Profile="Profil"
+RateControl="Kontrol Rate"
+KeyframeIntervalSec="Interval Keyframe (detik, 0=otomatis)"
+Lossless="Lossless"
+
+BFrames="Maks B-frame"
+
+NVENC.Use2Pass="Gunakan Enkoding Dua Langkah"
+NVENC.Preset.default="Performa"
+NVENC.Preset.hq="Kualitas"
+NVENC.Preset.hp="Performa Maksimum"
+NVENC.Preset.mq="Kualitas Maksimum"
+NVENC.Preset.ll="Latensi Rendah"
+NVENC.Preset.llhq="Kualitas Latensi Rendah"
+NVENC.Preset.llhp="Performa Latensi Rendah"
+NVENC.LookAhead="Look-ahead"
+NVENC.LookAhead.ToolTip="Mengaktifkan B-frame dinamis.\n\nJika dimatikan, enkoder akan selalu menggunakan jumlah B-frame yang ditentukan di pengaturan 'Maks B-frame'.\n\nJika diaktifkan, akan meningkatkan kualitas visual dengan hanya memakai seberapa banyak B-frame yang diperlukan, hingga maksimum,\ndengan biaya peningkatan penggunaan GPU."
+NVENC.PsychoVisualTuning="Psycho Visual Tuning"
+NVENC.PsychoVisualTuning.ToolTip="Mengaktifkan pengaturan encoder yang mengoptimalkan penggunaan bitrate untuk meningkatkan kualitas visual yang dirasakan,\nterutama dalam situasi dengan motion tinggi, dengan biaya peningkatan penggunaan GPU."
+NVENC.CQLevel="Level CQ"
+
+FFmpegSource="Sumber Media"
+LocalFile="File Lokal"
+Looping="Berulang"
+Input="Masukan"
+InputFormat="Format Masukan"
+BufferingMB="Buffering Jaringan"
+HardwareDecode="Gunakan dekoder hardware jika tersedia"
+ClearOnMediaEnd="Tidak muncul apapun saat pemutaran berakhir"
+Advanced="Tingkat lanjut"
+RestartWhenActivated="Mulai ulang pemutaran ketika sumber sudah aktif"
+CloseFileWhenInactive="Tutup file jika tidak aktif"
+CloseFileWhenInactive.ToolTip="Menutup file ketika sumber tidak ditampilkan di streaming atau perekaman.\nIni memungkinkan file dapat diubah ketika sumbernya tidak aktif, tetapi\nmungkin akan ada delay startup saat sumber aktif kembali."
+ColorRange="Rentang Warna YUV"
+ColorRange.Auto="Otomatis"
+ColorRange.Partial="Sebagian"
+ColorRange.Full="Penuh"
+RestartMedia="Mulai Ulang"
+SpeedPercentage="Kecepatan"
+Seekable="Bisa digeser"
+Play="Mainkan"
+Pause="Jeda"
+Stop="Berhenti"
+
+MediaFileFilter.AllMediaFiles="Semua File Media"
+MediaFileFilter.VideoFiles="File Video"
+MediaFileFilter.AudioFiles="File Audio"
+MediaFileFilter.AllFiles="Semua File"
+
+ReplayBuffer="Buffer Replay"
+ReplayBuffer.Save="Simpan Replay"
+
+HelperProcessFailed="Tidak bisa menjalankan proses bantuan rekaman. Periksa apakah file OBS tidak diblokir atau dihapus oleh perangkat lunak antivirus/keamanan pihak ketiga."
+UnableToWritePath="Tidak dapat menulis ke %1. Pastikan Anda menggunakan lokasi rekaman tempat akun pengguna Anda diizinkan menulis dan ruang disk yang cukup."
+WarnWindowsDefender="Jika Windows 10 Ransomware Protection diaktifkan, ini juga dapat menyebabkan kesalahan ini. Coba matikan akses folder yang dikontrol di pengaturan Windows Security/Perlindungan dari virus & ancaman."
+
+NVENC.Error="Gagal untuk membuka kodek NVENC: %1"
+NVENC.GenericError="Periksa driver video anda sudah terbaru. Coba tutup perangkat lunak perekam lainnya yang mungkin menggunakan NVENC seperti NVIDIA Shadowplay atau Windows 10 Game DVR."
+NVENC.BadGPUIndex="Anda telah memilih GPU %1 pada pengaturan enkoder output. Atur kembali ke 0 dan coba lagi."
+NVENC.OutdatedDriver="Driver kartu video anda saat ini tidak mendukung versi NVENC ini, mohon untuk memperbarui driver anda."
+NVENC.UnsupportedDevice="NVENC Error: Perangkat tidak didukung. Periksa kartu video anda mendukung NVENC dan pastikan driver sudah terbaru."
+NVENC.TooManySessions="NVENC Error: Terlalu banyak sesi bersamaan. Coba tutup perangkat lunak perekam lainnya yang mungkin menggunakan NVENC seperti NVIDIA Shadowplay atau Windows 10 Game DVR."
+NVENC.CheckDrivers="Mohon cek driver video anda sudah terbaru."
+
+ReconnectDelayTime="Delay Menghubungkan Ulang"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Velocità in bit"
 MaxBitrate="Velocità in bit massima"
 Preset="Preset"
+Profile="Profilo"
 RateControl="Tipo di controllo della frequenza"
 KeyframeIntervalSec="Intervallo dei fotogrammi chiave (in secondi, 0=automatico)"
 Lossless="Lossless"
@@ -59,3 +60,13 @@
 UnableToWritePath="Impossibile scrivere su %1. Assicurati che il tuo account utente possa accedere al percorso di registrazione, e che ci sia spazio sufficiente sul disco."
 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."
 
+NVENC.Error="Impossibile aprire il codec NVENC: %1"
+NVENC.GenericError="Controlla che i driver della tua scheda video siano aggiornati. Prova a chiudere altri programmi di registrazione che potrebbero utilizzare NVENC come NVIDIA Shadowplay o Windows 10 Game DVR."
+NVENC.BadGPUIndex="Hai selezionato la GPU %1 nelle impostazioni di codifica dell'uscita. Riporta questa opzione a 0 e riprova."
+NVENC.OutdatedDriver="Il driver installato della tua scheda video non supporta questa versione di NVENC, si prega di aggiornare i propri driver."
+NVENC.UnsupportedDevice="Errore di NVENC: Dispositivo non supportato. Controllare che la scheda video supporti NVENC e che i driver siano aggiornati."
+NVENC.TooManySessions="Errore di NVENC: Troppe sessioni simultanee. Prova a chiudere altri programmi di registrazione che potrebbero utilizzare NVENC come NVIDIA Shadowplay o Windows 10 Game DVR."
+NVENC.CheckDrivers="Controlla che i driver video siano aggiornati."
+
+ReconnectDelayTime="Ritardo di riconnessione"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ja-JP.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="ビットレート"
 MaxBitrate="最大ビットレート"
 Preset="プリセット"
+Profile="プロファイル"
 RateControl="レート制御"
 KeyframeIntervalSec="キーフレーム間隔 (秒, 0=自動)"
 Lossless="無損失"
@@ -59,3 +60,13 @@
 UnableToWritePath="%1 に書き込めません。 あなたのユーザーアカウントが書き込みを許可されている録画のパスを使用していることと十分なディスク容量があることを確認してください。"
 WarnWindowsDefender="Windows 10 ランサムウェア保護が有効になっていると、このエラーが発生する可能性があります。Windowsのセキュリティ/ウイルス対策と脅威対策の設定で、フォルダへのアクセス制御を無効にしてみてください。"
 
+NVENC.Error="NVENC コーデックを開けませんでした: %1"
+NVENC.GenericError="ビデオドライバが最新のものであることを確認してください。NVIDIA ShadowplayやWindows 10 Game DVRなどNVENCを使用している可能性のある他の録画ソフトを終了してみてください。"
+NVENC.BadGPUIndex="出力エンコーダ設定でGPU %1 を選択しました。 これを0に戻してもう一度お試しください。"
+NVENC.OutdatedDriver="現在お使いのビデオカードドライバはこのNVENCバージョンをサポートしていません。ドライバを更新してください。"
+NVENC.UnsupportedDevice="NVENCエラー: サポートされていないデバイスです。お使いのビデオカードがNVENCをサポートしておりドライバが最新であることを確認してください。"
+NVENC.TooManySessions="NVENCエラー: 同時セッションが多すぎます。NVIDIA ShadowplayやWindows 10 Game DVRなどNVENCを使用している可能性のある他の録画ソフトウェアを終了してみてください。"
+NVENC.CheckDrivers="お使いのビデオドライバが最新のものであるかを確認してください。"
+
+ReconnectDelayTime="再接続の遅延"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ka-GE.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="ბიტური სიხშირე"
 MaxBitrate="უმაღლესი დასაშვები ბიტური სიხშირე"
 Preset="მზა პარამეტრები"
+Profile="პროფილი"
 RateControl="სიხშირის მართვა"
 KeyframeIntervalSec="საკვანძო კადრების შუალედი (წამი, 0=თვითშერჩევა)"
 Lossless="უდანაკარგო"
@@ -59,3 +60,13 @@
 UnableToWritePath="%1-ში ჩაწერა ვერ ხერხდება. დარწმუნდით, რომ ჩაწერისთვის ისეთი მისამართი გაქვთ მითითებული, სადაც ჩაწერის ნებართვაც გააჩნია თქვენს ანგარიშს და ამასთან, არის საკმარისი ადგილი დისკზე."
 WarnWindowsDefender="თუ ჩართულია Windows 10-ის დაცვა ფაილების მიმტაცებელი პროგრამებისგან (Ransomware), ამ შეცდომას ეგეც შეიძლება იწვევდეს. სცადეთ საქაღალდეებთან წვდომის შეზღუდვის მოხსნა, Windows-ის უსაფრთხოების ან ანტივირუსის პარამეტრებიდან."
 
+NVENC.Error="ვერ გაიხსნა NVENC დამშიფრავი: %1"
+NVENC.GenericError="გადაამოწმეთ თქვენი ვიდეოს დრაივერი განახლებულია თუ არა. სცადეთ სხვა ჩამწერი პროგრამების გათიშვა, რომლებიც შესაძლოა იყენებდეს NVENC-ს, ასეთი იქნება NVIDIA Shadowplay ან Windows 10 Game DVR."
+NVENC.BadGPUIndex="თქვენ გიყენიათ GPU %1 თქვენი გამოტანის დამშიფრავის პარამეტრებში. დააბრუნეთ 0 და სცადეთ ხელახლა."
+NVENC.OutdatedDriver="თქვენი ამჟამინდელი ვიდეოდაფის დრაივერით, არაა მხარდაჭერილი მოცემული ვერსიის NVENC, გთხოვთ განაახლოთ დრაივერები."
+NVENC.UnsupportedDevice="NVENC შეცდომა: მხარდაუჭერელი მოწყობილობა. გადაამოწმეთ, თქვენი ვიდეოდაფით მხარდაჭერილია თუ არა NVENC და განახლებულია თუ არა დრაივერები."
+NVENC.TooManySessions="NVENC შეცდომა: ზედმეტად ბევრი ხელისშემშლელი სეანსია. სცადეთ სხვა ჩამწერი პროგრამების გათიშვა, რომლებიც შესაძლოა იყენებდეს NVENC-ს, ასეთი იქნება NVIDIA Shadowplay ან Windows 10 Game DVR."
+NVENC.CheckDrivers="გადაამოწმეთ, თქვენი ვიდეოს დრაივერები განახლებულია თუ არა."
+
+ReconnectDelayTime="ხელახლა მიერთების დაყოვნება"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ko-KR.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="비트레이트"
 MaxBitrate="최대 비트레이트"
 Preset="사전 설정"
+Profile="프로파일"
 RateControl="데이터율 제어"
 KeyframeIntervalSec="키프레임 간격 (초 단위, 0=자동)"
 Lossless="무손실"
@@ -59,3 +60,13 @@
 UnableToWritePath="%1에 기록할 수 없습니다. 사용자 계정이 녹화 계정에 접근할 수 있는지 혹은 저장 공간이 충분한지 확인하십시오."
 WarnWindowsDefender="윈도우 10에서 제공하는 랜섬웨어 보호 기능이 켜져 있으면 이 오류가 일어날 수 있습니다. 윈도우 설정에서 '보호된 폴더' 기능을 검색하여 꺼주세요."
 
+NVENC.Error="NVENC 코덱을 여는데 실패함: %1"
+NVENC.GenericError="드라이버가 최신 버전인지 확인하세요. NVIDIA Shadowplay 혹은 Windows 10 게임 바 캡처 기능과 같이 NVENC를 사용하고 있는 다른 녹화 프로그램을 꺼보세요."
+NVENC.BadGPUIndex="출력 설정 내 인코더 항목에서 GPU %1 (을)를 지정했습니다. 이 항목을 0으로 되돌린 다음 다시 시도해보세요."
+NVENC.OutdatedDriver="현재 사용하고 있는 비디오 카드 드라이버가 이 NVENC 버전을 지원하지 않습니다. 드라이버를 판올림하여 주세요."
+NVENC.UnsupportedDevice="NVENC 오류: 지원하지 않는 장치입니다. 비디오 카드가 NVENC를 지원하고 있고 최신 버전으로 판올림 되어 있는지 확인하여 주세요."
+NVENC.TooManySessions="NVENC 오류: 너무 많은 세션을 동시에 처리하고 있습니다. NVIDIA Shadowplay 혹은 Windows 10 게임 바 캡처 기능과 같이 NVENC를 사용하고 있는 다른 녹화 프로그램을 꺼보세요."
+NVENC.CheckDrivers="사용 중인 그래픽 드라이버가 최신 버전인지 확인하여 주세요."
+
+ReconnectDelayTime="재접속 지연"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/nb-NO.ini Changed

@@ -40,8 +40,12 @@
 ColorRange.Auto="Automatisk"
 ColorRange.Partial="Delvis"
 ColorRange.Full="Hel"
+RestartMedia="Start på nytt"
 SpeedPercentage="Hastighet"
 Seekable="Søkbar"
+Play="Spill av"
+Pause="Pause"
+Stop="Stopp"
 
 MediaFileFilter.AllMediaFiles="Alle mediefiler"
 MediaFileFilter.VideoFiles="Videofiler"
@@ -55,3 +59,12 @@
 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."
 
+NVENC.Error="Kunne ikke åpne NVENC kodek: %1"
+NVENC.GenericError="Sjekk at videosjåføren dine er oppdatert. Prøv å lukke annen opptaksprogramvare at bruker kanskje NVENC, som NVIDIA Shadowplay eller Windows 10 Game DVR."
+NVENC.BadGPUIndex="Du har valgt GPU %1 i utdatakodesinstillinger. Setter dette tilbake til 0, og prøv igjen."
+NVENC.OutdatedDriver="Din nåværende videokortsjåfør støtter ikke denne NVENC versjonen, vennligst oppdater dine drivere."
+NVENC.UnsupportedDevice="NVENC Error: Ustøttet enhet. Sjekk at videokortet ditt støtter NVENC og at sjåførene er oppdatert."
+NVENC.TooManySessions="NVENC Feil: For mange samtidige økter. Prøv å lukke annen opptaksprogramvare at bruker kanskje NVENC, som NVIDIA Shadowplay eller Windows 10 Game DVR."
+NVENC.CheckDrivers="Vennligst sjekk at videosjåførene dine er oppdatert."
+
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/nl-NL.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bitrate"
 MaxBitrate="Maximale bitrate"
 Preset="Preset"
+Profile="Profiel"
 RateControl="Rate Control"
 KeyframeIntervalSec="Tijd tussen keyframes (seconden, 0=auto)"
 Lossless="Lossless"
@@ -59,3 +60,13 @@
 UnableToWritePath="Kan niet naar %1 schrijven. Controller of je een opnamepad gebruikt waar je gebruikersaccount naartoe kan schrijven, en dat er voldoende schijfruimte beschikbaar is."
 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."
 
+NVENC.Error="NVENC codec openen mislukt: %1"
+NVENC.GenericError="Controleer of je video stuurprogramma's up-to-date zijn. Probeer andere opnamesoftware af te sluiten die mogelijk NVENC gebruikt, zoals NVIDIA Shadowplay of Windows 10 Game DVR."
+NVENC.BadGPUIndex="Je hebt GPU %1 geselecteerd in je uitvoer encoder instellingen. Zet dit terug naar 0 en probeer het opnieuw."
+NVENC.OutdatedDriver="Uw huidige videokaart stuurprogramma ondersteunt deze NVENC versie niet, update uw stuurprogramma's alstublieft."
+NVENC.UnsupportedDevice="NVENC Fout: Niet-ondersteund apparaat. Controleer of je videokaart NVENC ondersteunt en of de stuurprogramma's up-to-date zijn."
+NVENC.TooManySessions="NVENC Fout: Te veel gelijktijdige sessies. Probeer andere opnamesoftware te sluiten die mogelijk NVENC gebruikt, zoals NVIDIA Shadowplay of Windows 10 Game DVR."
+NVENC.CheckDrivers="Controleer of uw videostuurprogramma's up-to-date zijn."
+
+ReconnectDelayTime="Opnieuw verbind vertraging"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/pl-PL.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Przepływność (bitrate)"
 MaxBitrate="Maksymalna przepływność (bitrate)"
 Preset="Profil ustawień"
+Profile="Profil"
 RateControl="Typ przepływności"
 KeyframeIntervalSec="Odstęp między klatkami kluczowymi (sekundy, 0=automatyczny)"
 Lossless="Bezstratny"
@@ -19,9 +20,9 @@
 NVENC.Preset.llhq="Niskie opóźnienie - jakość"
 NVENC.Preset.llhp="Niskie opóźnienie - wydajność"
 NVENC.LookAhead="Look-ahead"
-NVENC.LookAhead.ToolTip="Umożliwia dynamiczne klatki B.\n\nJeśli jest wyłączony, koder będzie zawsze używać liczbę klatek B określonego w ustawieniach 'Maksymalnych klatkach B'.\n\nJeśli włączony, zwiększy jakość obrazu przy użyciu jakkolwiek wiele klatek B które są konieczne, do maksymum\nkosztem zwiększenia wykorzystania procesora graficznego."
+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="Psycho Visual Tuning"
-NVENC.PsychoVisualTuning.ToolTip="Umożliwia ustawienia kodera, które optymalizują użycie bitratów dla zwiększonej jakość wizualnej,\n, zwłaszcza w sytuacjach z wysokim ruchem, kosztem zwiększonego wykorzystania procesora graficznego."
+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."
 NVENC.CQLevel="Poziom CQ"
 
 FFmpegSource="Źródło danych"
@@ -59,3 +60,13 @@
 UnableToWritePath="Nie można zapisać do %1. Sprawdź poprawność ścieżki zapisu, prawa dostępu do niej oraz wolne miejsce na dysku."
 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."
 
+NVENC.Error="Nie udało się otworzyć kodeka NVENC: %1"
+NVENC.GenericError="Sprawdź, czy sterowniki do karty graficznej są aktualne. Spróbuj zamknąć inne oprogramowanie do nagrywania, które może korzystać z NVENC, takie jak NVIDIA Shadowplay lub Windows 10 Game DVR."
+NVENC.BadGPUIndex="Wybrałeś GPU %1 w ustawieniach enkodera. Ustaw z powrotem wartość 0 i spróbuj ponownie."
+NVENC.OutdatedDriver="Bieżący sterownik karty graficznej nie obsługuje tej wersji NVENC. Proszę zaktualizować sterownik."
+NVENC.UnsupportedDevice="Błąd NVENC: Nieobsługiwane urządzenie. Sprawdź czy karta graficzna obsługuje NVENC i czy sterowniki do niej są aktualne."
+NVENC.TooManySessions="Błąd NVENC: Zbyt wiele równoczesnych sesji. Spróbuj zamknąć inne oprogramowanie nagrywające mogące używać NVENC, takie jak NVIDIA Shadowplay czy Windows 10 Game DVR."
+NVENC.CheckDrivers="Sprawdź, czy sterowniki karty graficznej są aktualne."
+
+ReconnectDelayTime="Opóźnienie ponownego połączenia"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/pt-BR.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Taxa de Bits"
 MaxBitrate="Taxa de Bits Máxima"
 Preset="Predefinição"
+Profile="Perfil"
 RateControl="Controle da Taxa de Bits"
 KeyframeIntervalSec="Intervalo de Keyframe (segundos, 0=auto)"
 Lossless="Sem perdas"
@@ -59,3 +60,13 @@
 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."
 
+NVENC.Error="Falha ao abrir o codec NVENC: %1"
+NVENC.GenericError="Verifique se os seus drivers de vídeo estão atualizados. Tente fechar outros softwares de gravação que possam estar usando NVENC como o NVIDIA Shadowplay ou o Windows 10 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.OutdatedDriver="Seu driver da placa de vídeo não suporta esta versão do NVENC, por favor atualize os seus drivers."
+NVENC.UnsupportedDevice="Erro no NVENC: Dispositivo não suportado. Verifique se a sua placa de vídeo suporta NVENC e que os drivers estão atualizados."
+NVENC.TooManySessions="Erro no NVENC: Muitas sessões simultâneas. Tente fechar outros softwares de gravação que possam estar usando NVENC como o NVIDIA Shadowplay ou o Windows 10 Game DVR."
+NVENC.CheckDrivers="Por favor, verifique se os seus drivers de vídeo estão atualizados."
+
+ReconnectDelayTime="Atraso para Reconectar"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/pt-PT.ini Changed

@@ -36,16 +36,31 @@
 ColorRange.Auto="Auto"
 ColorRange.Partial="Parcial"
 ColorRange.Full="Completo"
+RestartMedia="Reiniciar"
 SpeedPercentage="Velocidade"
 Seekable="Pesquisável"
+Play="Reproduzir"
+Pause="Pausa"
+Stop="Parar"
 
 MediaFileFilter.AllMediaFiles="Todos os Arquivos de Media"
 MediaFileFilter.VideoFiles="Arquivos de Vídeo"
 MediaFileFilter.AudioFiles="Arquivos de Áudio"
 MediaFileFilter.AllFiles="Todos os ficheiros"
 
+ReplayBuffer="Buffer de Repetição"
+ReplayBuffer.Save="Salvar Repetição"
 
 HelperProcessFailed="Não foi possível iniciar o processo auxiliar de gravação. Verifique se os ficheiros do OBS não bloqueados ou removidos por qualquer software de segurança ou antivírus de terceiros."
 UnableToWritePath="Não foi possível gravar em %1. Certifique-se de que está a usar um caminho de gravação no qual sua conta de utilizador tem permissão para escrever e que há espaço suficiente em disco."
 WarnWindowsDefender="Se a proteção contra Ransomware estiver habilitada no Windows 10, pode ser essa a causa deste erro. Tente desativar o acesso controlado a pastas nas configurações de segurança do Windows ou nas definições de proteção contra ameaças e vírus."
 
+NVENC.Error="Falha ao abrir o codec NVENC: %1"
+NVENC.GenericError="Verifique se os seus drivers de vídeo estão atualizados. Tente fechar outros softwares de gravação que possam estar a usar o NVENC como NVIDIA Shadowplay ou Windows 10 Game DVR."
+NVENC.BadGPUIndex="Selecionou a GPU %1 nas configurações do codificador de saída. Redefina este valor de volta a 0 e tente novamente."
+NVENC.OutdatedDriver="A sua placa gráfica atual não suporta esta versão NVENC, por favor atualize os drivers."
+NVENC.UnsupportedDevice="Erro NVENC: Dispositivo não suportado. Verifique se a sua placa gráfica suporta NVENC e se os drivers estão atualizados."
+NVENC.TooManySessions="Erro NVENC: Muitas sessões simultâneas. Tente fechar outros softwares de gravação que possam estar usando NVENC como NVIDIA Shadowplay ou Windows 10 Game DVR."
+NVENC.CheckDrivers="Por favor, verifique se os seus drivers de vídeo estão atualizados."
+
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ro-RO.ini Changed

@@ -1,12 +1,17 @@
-FFmpegOutput="Ieșire FFmpeg"
+FFmpegOutput="Output FFmpeg"
 FFmpegAAC="Codificator AAC implicit FFmpeg"
+FFmpegOpus="Codificator de Opus Fmpeg"
 Bitrate="Rată de biți"
 MaxBitrate="Rată de biți maximă"
 Preset="Presetare"
+Profile="Profil"
 RateControl="Controlul ratei"
 KeyframeIntervalSec="Interval de cadre cheie (secunde, 0=auto)"
+Lossless="Fără pierderi"
 
+BFrames="Max B-frames"
 
+NVENC.Use2Pass="Folosește codificarea în doi pași"
 NVENC.Preset.default="Performanță"
 NVENC.Preset.hq="Calitate"
 NVENC.Preset.hp="Performanță maximă"
@@ -14,24 +19,54 @@
 NVENC.Preset.ll="Latență redusă"
 NVENC.Preset.llhq="Calitate cu latență redusă"
 NVENC.Preset.llhp="Performanță cu latență redusă"
+NVENC.LookAhead="Privire"
+NVENC.LookAhead.ToolTip="Activează B-frames dinamic.\n\nDacă este dezactivat, encoder-ul va utiliza întotdeauna numărul de B-frames specificat în setările 'Max B-frames'.\n\nDacă este activat, va crește calitatea vizuală utilizând doar cât de multe cadre B sunt necesare, până la maximum,\nla costul unei utilizări crescute a GPU."
+NVENC.PsychoVisualTuning="Aranjare vizuală Psycho"
+NVENC.PsychoVisualTuning.ToolTip="Activează setările de codificare care optimizează utilizarea ratei de biți pentru creșterea calității vizuale percepute,\nîn special în situații cu mișcare mare, cu prețul unei utilizări mai mari a GPU."
+NVENC.CQLevel="Nivel CQ"
 
 FFmpegSource="Sursă media"
 LocalFile="Fișier local"
-Looping="Buclă"
-Input="Intrare"
-InputFormat="Format de intrare"
+Looping="Redă în buclă"
+Input="Input"
+InputFormat="Formatul inputului"
+BufferingMB="Buffer Rețea"
 HardwareDecode="Folosește decodarea 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\nînregistrare. Acest lucru permite fișierului să fie schimbat în momentul în care sursa nu este activă,\nînsă poate exista o întârziere la pornire în momentul reactivării sursei."
 ColorRange="Gamă de culori YUV"
 ColorRange.Auto="Automată"
 ColorRange.Partial="Parțială"
 ColorRange.Full="Completă"
+RestartMedia="Repornește"
+SpeedPercentage="Viteză"
+Seekable="Vizulizare"
+Play="Redare"
+Pause="Pauzează"
+Stop="Stop"
 
 MediaFileFilter.AllMediaFiles="Toate fișierele media"
 MediaFileFilter.VideoFiles="Fișiere video"
 MediaFileFilter.AudioFiles="Fișiere audio"
 MediaFileFilter.AllFiles="Toate fișierele"
 
+ReplayBuffer="Reluare Buffer"
+ReplayBuffer.Save="Salvează reluarea"
 
+HelperProcessFailed="Nu se poate porni procesul ajutător de înregistrare. Verifică dacă fișierele OBS nu au fost blocate sau eliminate de orice software terț antivirus / de securitate."
+UnableToWritePath="Imposibil de scris la %1. Asigurați-vă că folosiți o cale de înregistrare pe care contul dvs. de utilizator poate să o scrie și că există suficient spațiu pe disc."
+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."
+
+NVENC.Error="Deschiderea codecului NVENC a eșuat: %1"
+NVENC.GenericError="Verifică dacă driverele video sunt actualizate. Încercați să închideți alte programe de înregistrare care ar putea utiliza NVENC, cum ar fi NVIDIA Shadowplay sau Windows 10 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."
+NVENC.OutdatedDriver="Driver-ul dvs. actual de pe cardul video nu acceptă această versiune NVENC, vă rugăm să vă actualizați driverele."
+NVENC.UnsupportedDevice="Eroare NVENC. Dispozitivul nu este acceptat. Verificați dacă cardul video suportă NVENC și dacă driverele sunt actualizate."
+NVENC.TooManySessions="Eroare NVENC: Prea multe sesiuni concurente. Încercați să închideți alte programe de înregistrare care ar putea folosi NVENC, cum ar fi NVIDIA Shadowplay sau Windows 10 Game DVR."
+NVENC.CheckDrivers="Te rugăm să verifici dacă driverele video sunt actualizate."
+
+ReconnectDelayTime="Întârziere Reconectare"

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ru-RU.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Битрейт"
 MaxBitrate="Макс. битрейт"
 Preset="Пресет"
+Profile="Профиль"
 RateControl="Управление битрейтом"
 KeyframeIntervalSec="Интервал ключевых кадров (сек, 0=авто)"
 Lossless="Без потерь"
@@ -11,18 +12,18 @@
 BFrames="Макс. кол-во B-кадров"
 
 NVENC.Use2Pass="Использовать двухпроходное кодирование"
-NVENC.Preset.default="Производительность"
-NVENC.Preset.hq="Качество"
-NVENC.Preset.hp="Макс. производительность"
-NVENC.Preset.mq="Макс. качество"
-NVENC.Preset.ll="Малая задержка"
-NVENC.Preset.llhq="Малая задержка, высокое качество"
-NVENC.Preset.llhp="Малая задержка, высокая производительность"
-NVENC.LookAhead="Предугадывание"
+NVENC.Preset.default="Производительность (Performance)"
+NVENC.Preset.hq="Качество (Quality)"
+NVENC.Preset.hp="Макс. производительность (Max Performance)"
+NVENC.Preset.mq="Макс. качество (Max Quality)"
+NVENC.Preset.ll="Низкая задержка"
+NVENC.Preset.llhq="Низкая задержка, высокое качество (Low Latency Quality)"
+NVENC.Preset.llhp="Низкая задержка, высокая производительность (Low Latency Performance)"
+NVENC.LookAhead="Предугадывание (Look-ahead)"
 NVENC.LookAhead.ToolTip="Включает динамические B-кадры.\n\nЕсли отключено, кодировщик всегда будет использовать количество B-кадров, указанное в параметре 'Макс. кол-во B-кадров'.\n\nЕсли включено, то это увеличит визуальное качество изображения путем использования любого количества B-кадров, вплоть до максимума,\nза счет увеличения использования GPU."
-NVENC.PsychoVisualTuning="Психовизуальная корректировка"
+NVENC.PsychoVisualTuning="Психовизуальная корректировка (Psycho Visual Tuning)"
 NVENC.PsychoVisualTuning.ToolTip="Включает настройки кодировщика, которые оптимизируют использование битрейта для повышенного восприятия визуального качества,\nособенно в ситуациях с высоким движением, за счет увеличения использования GPU."
-NVENC.CQLevel="Уровень QC"
+NVENC.CQLevel="Значение CQ"
 
 FFmpegSource="Источник медиа"
 LocalFile="Локальный файл"
@@ -43,7 +44,7 @@
 RestartMedia="Перезапустить"
 SpeedPercentage="Скорость"
 Seekable="Перематываемый"
-Play="Запустить"
+Play="Воспроизвести"
 Pause="Приостановить"
 Stop="Остановить"
 
@@ -59,3 +60,13 @@
 UnableToWritePath="Невозможно записать в %1. Убедитесь, что для вашей учетной записи разрешена запись по этому пути, и что на диске достаточно свободного пространства."
 WarnWindowsDefender="Если включена Защита от программ-шантажистов Windows 10, это так же может вызывать эту ошибку. Попробуйте выключить контролируемый доступ к папкам в параметрах Безопасности Windows / Защита от вирусов и угроз."
 
+NVENC.Error="Не удалось открыть кодек NVENC: %1"
+NVENC.GenericError="Проверьте, что ваши видеодрайвера актуальны. Попробуйте закрыть другие программы, которые могут использовать NVENC, такие как NVIDIA Shadowplay или Windows 10 Game DVR."
+NVENC.BadGPUIndex="Вы выбрали видеокарту под номером %1 в настройках кодирования. Выберите видеокарту под номером 0 и повторите попытку."
+NVENC.OutdatedDriver="Ваш текущий драйвер видеокарты не поддерживает эту версию NVENC, пожалуйста, обновите ваши драйвера."
+NVENC.UnsupportedDevice="Ошибка NVENC: неподдерживаемое устройство. Проверьте, что ваша видеокарта поддерживает NVENC и что драйвера актуальны."
+NVENC.TooManySessions="Ошибка NVENC: слишком много одновременных сеансов. Попробуйте закрыть другие программы для записи, которое могут использовать NVENC, например, NVIDIA Shadowplay или Windows 10 Game DVR."
+NVENC.CheckDrivers="Пожалуйста, проверьте, что ваш драйвер видеокарты обновлён."
+
+ReconnectDelayTime="Задержка переподключения"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/sk-SK.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bitrate"
 MaxBitrate="Max. bitrate"
 Preset="Predvoľba"
+Profile="Profil"
 RateControl="Riadenie toku"
 KeyframeIntervalSec="Interval kľúčových snímok (sekúnd, 0 = automaticky)"
 Lossless="Bezstratová"
@@ -59,3 +60,13 @@
 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."
 
+NVENC.Error="Nepodarilo sa otvoriť kodek NVENC: %1"
+NVENC.GenericError="Skontrolujte, či sú vaše grafické ovládače aktualizované. Skúste zatvoriť ostatné nahrávacie programy, ktoré môžu používať NVENC, napríklad NVIDIA Shadowplay alebo Windows 10 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."
+NVENC.OutdatedDriver="Váš aktuálny ovládač grafickej karty nepodporuje túto verziu NVENC, prosím, aktualizujte svoje ovládače."
+NVENC.UnsupportedDevice="Chyba NVENC: Nepodporované zariadenie. Skontrolujte, či vaša grafická karta podporuje NVENC a či sú jej ovládače aktualizované."
+NVENC.TooManySessions="Chyba NVENC: Veľmi veľa súčasných aktivít. Skúste zatvoriť ostatné nahrávacie programy, ktoré môžu používať NVENC, napríklad NVIDIA Shadowplay alebo Windows 10 Game DVR."
+NVENC.CheckDrivers="Prosím, skontrolujte, či sú vaše grafické ovládače aktualizované."
+
+ReconnectDelayTime="Opätovné pripojenie oneskorenia"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/sl-SI.ini Changed

@@ -59,3 +59,13 @@
 UnableToWritePath="Ni mogoče pisati v %1. Prepričajte se, da uporabljate pot za snemanje, na katero lahko vaš uporabniški račun zapisuje in da imate dovolj prostora na disku."
 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."
 
+NVENC.Error="Napaka pri odpiranju NVENC kodeka: %1"
+NVENC.GenericError="Preveri, da imaš najnovejše gonilnike. Poizkusi zaprti druge naprave za zajem, ki uporabljajo NVENC, kot sta npr. NVIDIA Shadowplay ali Windows 10 Game DVR."
+NVENC.BadGPUIndex="Imaš izbrano grafično kartico %1 v izhodni nastavitvah kodirnika. Nastavi to vrednost nazaj na 0 in poizkusi ponovno."
+NVENC.OutdatedDriver="Trenutni gonilnik grafične kartice ne podpira te NVENC verzije, prosim posodobi gonilnike."
+NVENC.UnsupportedDevice="NVENC napaka: Nepodprta naprava. Preveri ali grafična kartica podpira NVENC in ali so gonilniki posodobljeni."
+NVENC.TooManySessions="NVENC napaka: Preveč hkratnih sej. Poizkusi zaprti druge naprave za zajem, ki uporabljajo NVENC, kot sta npr. NVIDIA Shadowplay ali Windows 10 Game DVR."
+NVENC.CheckDrivers="Prosim preveri, da imaš najnovejše gonilnike za grafično kartico."
+
+ReconnectDelayTime="Zakasnitev ponovne povezave"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/sr-CS.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/sr-CS.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/sr-SP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/sv-SE.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bithastighet"
 MaxBitrate="Max bithastighet"
 Preset="Förinställning"
+Profile="Profil"
 RateControl="Hastighetskontroll"
 KeyframeIntervalSec="Intervall för keyframes (sekunder, 0=automatisk)"
 Lossless="Förlustfri"
@@ -59,3 +60,13 @@
 UnableToWritePath="Kan inte skriva till %1. Se till att du använder en inspelningssökväg som ditt användarkonto har tillåtelse att skriva till och att det finns tillräckligt mycket diskutrymme."
 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."
 
+NVENC.Error="Det gick inte att öppna NVENC-codec: %1"
+NVENC.GenericError="Kontrollera att dina grafikkortsdrivrutiner är uppdaterade. Försök att avsluta alla andra inspelningsprogram som kanske använder NVENC som NVIDIA Shadowplay elller Windows 10 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."
+NVENC.OutdatedDriver="Din nuvarande grafikkortsdrivrutin stöder inte denna NVENC-version, var god uppdatera dina drivrutiner."
+NVENC.UnsupportedDevice="NVENC-fel: Enheten stöds inte. Kontrollera att ditt grafikkort stöder NVENC och att drivrutinerna är uppdaterade."
+NVENC.TooManySessions="NVENC-fel: För många samtidiga sessioner körs. Försök att avsluta alla andra inspelningsprogram som kanske använder NVENC som NVIDIA Shadowplay elller Windows 10 Game DVR."
+NVENC.CheckDrivers="Kontrollera att dina grafikkortsdrivrutiner är uppdaterade."
+
+ReconnectDelayTime="Återanslutningsfördröjning"
+

obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/th-TH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/tl-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/tl-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/tr-TR.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="Bit hızı"
 MaxBitrate="Maksimum Bit Hızı"
 Preset="Ön Tanımlı"
+Profile="Profil"
 RateControl="Oran Kontrolü"
 KeyframeIntervalSec="Anahtar Kare Aralığı (saniye, 0=otomatik)"
 Lossless="Kayıpsız"
@@ -59,3 +60,13 @@
 UnableToWritePath="%1 yazılamadı. Kullanıcı hesabınızın yazmasına izin verilen bir kayıt konumu kullanıyor olduğunuzdan ve yeterli disk alanı olduğundan emin olun."
 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."
 
+NVENC.Error="NVENC kodeği açılamadı: %1"
+NVENC.GenericError="Video sürücülerinizin güncel olup olmadığını kontrol edin. NVIDIA Shadowplay veya Windows 10 Game DVR gibi NVENC kullanıyor olabilecek diğer kayıt yazılımlarını kapatmayı deneyin."
+NVENC.BadGPUIndex="Çıkış kodlayıcı ayarlarınızda GPU %1 seçili. 0 olarak ayarlayın ve tekrar deneyin."
+NVENC.OutdatedDriver="Mevcut ekran kartı sürücünüz bu NVENC sürümünü desteklemiyor, lütfen sürücülerinizi güncelleyin."
+NVENC.UnsupportedDevice="NVENC Hatası: Desteklenmeyen cihaz. Ekran kartınızın NVENC'yi desteklediğinden ve sürücülerin güncel olduğundan emin olun."
+NVENC.TooManySessions="NVENC Hatası: Çok fazla eşzamanlı oturum. NVIDIA Shadowplay veya Windows 10 Game DVR gibi NVENC kullanıyor olabilecek diğer kayıt yazılımlarını kapatmayı deneyin."
+NVENC.CheckDrivers="Lütfen ekran kartı sürücülerinizin günel olup olmadığını kontrol edin."
+
+ReconnectDelayTime="Yeniden Bağlanma Gecikmesi"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/uk-UA.ini Changed

@@ -1,14 +1,15 @@
 FFmpegOutput="Вивід FFmpeg"
-FFmpegAAC="FFmpeg AAC енкодер за замовчанням"
-FFmpegOpus="FFmpeg Opus енкодер"
+FFmpegAAC="Кодувальник FFmpeg AAC за замовчанням"
+FFmpegOpus="Кодувальник FFmpeg Opus"
 Bitrate="Бітрейт"
 MaxBitrate="Максимальний бітрейт"
 Preset="Шаблон"
-RateControl="Керування потоком"
+Profile="Профіль"
+RateControl="Керування бітрейтом"
 KeyframeIntervalSec="Інтервал ключових кадрів (секунд, 0 = авто)"
 Lossless="Без втрат"
 
-BFrames="B-кадрів, максимально"
+BFrames="Максимальна кількість B-кадрів"
 
 NVENC.Use2Pass="Використовувати двопрохідне кодування"
 NVENC.Preset.default="Продуктивність"
@@ -16,46 +17,56 @@
 NVENC.Preset.hp="Максимальна продуктивність"
 NVENC.Preset.mq="Максимальна якість"
 NVENC.Preset.ll="З низькою затримкою"
-NVENC.Preset.llhq="З низькою затримкою, Якість"
-NVENC.Preset.llhp="З низькою затримкою, Продуктивність"
-NVENC.LookAhead="Передбачення"
-NVENC.LookAhead.ToolTip="Дозволяє використовувати динамічні B-кадри.\n\nЯкщо вимкнено, енкодер завжди буде використовувати кількість B-кадрів,\nвказаних у налаштуванні: B-кадрів, максимально.\n\nЯкщо увімкнено, це поліпшить якість завдяки використанню необхідної\nта достатньої кількості B-кадрів (не більше вказаного максимуму), однак це відбудеться\nза рахунок збільшення навантаження на графічний процессор."
-NVENC.PsychoVisualTuning="Психо-візуальні спрощення"
-NVENC.PsychoVisualTuning.ToolTip="Дозволяє енкодеру використовувати методи оптимізації з розподілення бітрейту\nдля підвищення візуального сприйняття якості, особливо в сценах з швидким рухом.\nВідбувається за рахунок збільшення навантаження на графічний процесор."
-NVENC.CQLevel="CQ (постійне квантування), рівень"
-
-FFmpegSource="Мультимедіа"
+NVENC.Preset.llhq="Якість з низькою затримкою"
+NVENC.Preset.llhp="Продуктивність з низькою затримкою"
+NVENC.LookAhead="Передбачення (Look-ahead)"
+NVENC.LookAhead.ToolTip="Дозволяє використовувати динамічні B-кадри.\n\nЯкщо опцію вимкнено – кодувальник завжди буде використовувати кількість B-кадрів, заданих у налаштуванні «Максимальна кількість B-кадрів».\n\nЯкщо увімкнено – це поліпшить якість зображення завдяки використанню необхідної кількості B-кадрів (не більше вказаного максимуму), але \nце збільшить навантаження на графічний процесор."
+NVENC.PsychoVisualTuning="Психовізуальне настроювання (Psycho Visual Tuning)"
+NVENC.PsychoVisualTuning.ToolTip="Вмикає налаштування кодувальника, що збільшує навантаження на графічний процесор для оптимізації \nвикористання бітрейта щоб підвищити якість зображення, особливо ефективно у сценах зі швидким рухом."
+NVENC.CQLevel="Рівень CQ"
+
+FFmpegSource="Джерело мультимедіа"
 LocalFile="Локальний файл"
-Looping="Циклічно відтворювати"
-Input="Вхід"
-InputFormat="Вхідний формат"
-BufferingMB="Буферизація мережевого контенту"
-HardwareDecode="Використовувати апаратне декодування, за наявності"
+Looping="Повторювати"
+Input="Ввід"
+InputFormat="Формат вводу"
+BufferingMB="Мережева буферизація"
+HardwareDecode="Використовувати апаратне декодування при наявності"
 ClearOnMediaEnd="Не показувати джерело, коли відтворення завершено"
 Advanced="Розширені параметри"
-RestartWhenActivated="Грати з початку, коли джерело стає активним"
-CloseFileWhenInactive="Закрити файл, коли неактивен"
-CloseFileWhenInactive.ToolTip="Завжди закриває файл, коли джерело не виводиться до трансляції чи запису.\nЦе дозволяє редагувати файл, якщо джерело не є активним, але може виникнути\nдеяка затримка запуску, коли джерело повторно активується."
-ColorRange="YUV, колірний діапазон"
+RestartWhenActivated="Перезапустити відтворення, коли джерело стає активним"
+CloseFileWhenInactive="Закрити файл, коли неактивний"
+CloseFileWhenInactive.ToolTip="Закриває файл, коли джерело не показується у трансляції чи записі.\nЦе дозволяє редагувати файл, коли джерело неактивне, але може виникнути\nдеяка затримка запуску, коли джерело знову активується."
+ColorRange="Колірний діапазон YUV"
 ColorRange.Auto="Автовизначення"
 ColorRange.Partial="Частковий"
 ColorRange.Full="Повний"
 RestartMedia="Перезавантажити"
 SpeedPercentage="Швидкість"
-Seekable="HTTP з перемотуванням"
+Seekable="З можливістю пошуку (Seekable)"
 Play="Відтворити"
 Pause="Призупинити"
 Stop="Зупинити"
 
-MediaFileFilter.AllMediaFiles="Файли мультимедіа"
+MediaFileFilter.AllMediaFiles="Усі медіафайли"
 MediaFileFilter.VideoFiles="Відео"
 MediaFileFilter.AudioFiles="Аудіо"
-MediaFileFilter.AllFiles="Всі файли"
+MediaFileFilter.AllFiles="Усі файли"
+
+ReplayBuffer="Буфер повторів"
+ReplayBuffer.Save="Зберегти повтор"
+
+HelperProcessFailed="Не вдається запустити допоміжний процес для запису. Переконайтеся, що файли OBS не були заблоковані чи видалені стороннім антивірусом / ПЗ для захисту."
+UnableToWritePath="Не вдається записати в %1. Переконайтеся, що ваш обліковий запис має дозвіл на запис по цьому шляху, і що на диску достатньо вільного місця."
+WarnWindowsDefender="Якщо Windows 10 Ransomware Protection (захист від програм-вимагачів) увімкнено – це також може спричинити цю помилку. Спробуйте вимкнути керований доступ до папок у «Безпека у Windows» - «Захист від вірусів і загроз»."
 
-ReplayBuffer="Запис Повторів"
-ReplayBuffer.Save="Зберегти Повтор"
+NVENC.Error="Не вдалося відкрити кодек NVENC: %1"
+NVENC.GenericError="Переконайтеся, що ваші відеодрайвери оновлено. Спробуйте закрити інше програмне забезпечення для запису, що може використовувати NVENC, на кшталт NVIDIA Shadowplay чи Windows 10 Game DVR."
+NVENC.BadGPUIndex="Ви обрали ГП %1 у своїх налаштуваннях виведення кодувальника. Поверніть його в 0 і спробуйте знову."
+NVENC.OutdatedDriver="Ваш поточний драйвер відеокарти не підтримує цю версію NVENC; будь ласка, оновіть свої драйвери."
+NVENC.UnsupportedDevice="Помилка NVENC: непідтримуваний пристрій. Перевірте, чи підтримує ваша відеокарта NVENC і що драйвери оновлені."
+NVENC.TooManySessions="Помилка NVENC: забагато паралельних сеансів. Спробуйте закрити інше програмне забезпечення для запису, що може використовувати NVENC, на кшталт NVIDIA Shadowplay чи Windows 10 Game DVR."
+NVENC.CheckDrivers="Переконайтеся, що ваші відеодрайвери оновлено."
 
-HelperProcessFailed="Не вдалося розпочати допоміжний процес для запису. Перевірте, що OBS файли не було заблоковано чи видалено антивірусом або будь-яким іншим програмним забезпеченням з безпеки."
-UnableToWritePath="Не вдалося записати до %1. Переконайтеся, що ви використовуєте для запису шлях, до якого ваш обліковий запис має дозвіл на запис, і що там є достатньо вільного місця."
-WarnWindowsDefender="Якщо Windows 10 Ransomware Protection (захист від програм-вимагачів) увімкнуто у системі - це також може бути причиною появи цієї помилки. Спробуйте вимкнути контроль за доступом до папок у Безпека Windows Захист від вірусів та загроз."
+ReconnectDelayTime="Затримка повторного під'єднання"

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/zh-CN.ini Changed

@@ -4,6 +4,7 @@
 Bitrate="比特率"
 MaxBitrate="最大比特率"
 Preset="预设"
+Profile="配置"
 RateControl="速率控制"
 KeyframeIntervalSec="关键帧间隔(秒, 0=自动)"
 Lossless="无损"
@@ -36,10 +37,10 @@
 RestartWhenActivated="当源变为活动状态时重新启动播放"
 CloseFileWhenInactive="非活跃状态时关闭文件"
 CloseFileWhenInactive.ToolTip="当源没有被用以串流或录像时关闭文件。\n这允许在源未被使用时更改文件，\n但在重新启动源时可能会有些许的启动延迟。"
-ColorRange="YUV 颜色范围"
+ColorRange="YUV 色彩范围"
 ColorRange.Auto="自动"
-ColorRange.Partial="局部"
-ColorRange.Full="全部"
+ColorRange.Partial="Limited"
+ColorRange.Full="Full"
 RestartMedia="重新开始"
 SpeedPercentage="速度"
 Seekable="可搜索"
@@ -59,3 +60,13 @@
 UnableToWritePath="无法写入到 %1。请确保您使用的录像路径允许您的用户帐户写入，并且磁盘空间充足。"
 WarnWindowsDefender="Windows 10 的勒索软件防护机制也可能导致该错误的发生。请尝试关闭 Windows 安全中心 - 勒索软件防护中的文件夹限制访问。"
 
+NVENC.Error="打开 NVENC 编解码器失败： %1"
+NVENC.GenericError="检查并确保您的视频驱动是最新的。 尝试关闭可能正在使用 NVENC 的其他录制软件，如NVIDIA Shadowplay 或 Windows 10 Game DVR 。"
+NVENC.BadGPUIndex="您已输出编码器设置中选择了 GPU %1 。请将其设为 0，然后重试。"
+NVENC.OutdatedDriver="您当前的视频卡驱动不支持此 NVENC 版本，请更新您的驱动。"
+NVENC.UnsupportedDevice="NVENC 错误：不支持的设备。请检查您的视频卡是否支持 NVENC 并确保驱动程序是最新的。"
+NVENC.TooManySessions="NVENC 错误：并发会话数太多。请尝试关闭可能使用NVENC 的其他录制软件，如NVIDIA Shadowplay 或 Windows 10 Game DVR。"
+NVENC.CheckDrivers="请检查您的视频驱动程序是否是最新的。"
+
+ReconnectDelayTime="重连时间间隔"
+

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c Changed

@@ -79,6 +79,10 @@
 	int height;
 	int fps_num;
 	int fps_den;
+	int color_primaries;
+	int color_trc;
+	int colorspace;
+	int color_range;
 	char *acodec;
 	char *muxer_settings;
 };
@@ -95,10 +99,16 @@
 	int size;
 };
 
+struct audio_info {
+	AVStream *stream;
+	AVCodecContext *ctx;
+};
+
 struct ffmpeg_mux {
 	AVFormatContext *output;
 	AVStream *video_stream;
-	AVStream **audio_streams;
+	AVCodecContext *video_ctx;
+	struct audio_info *audio_infos;
 	struct main_params params;
 	struct audio_params *audio;
 	struct header video_header;
@@ -116,6 +126,10 @@
 static void free_avformat(struct ffmpeg_mux *ffm)
 {
 	if (ffm->output) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+		avcodec_free_context(&ffm->video_ctx);
+#endif
+
 		if ((ffm->output->oformat->flags & AVFMT_NOFILE) == 0)
 			avio_close(ffm->output->pb);
 
@@ -123,12 +137,16 @@
 		ffm->output = NULL;
 	}
 
-	if (ffm->audio_streams) {
-		free(ffm->audio_streams);
+	if (ffm->audio_infos) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+		for (int i = 0; i < ffm->num_audio_streams; ++i)
+			avcodec_free_context(&ffm->audio_infos[i].ctx);
+#endif
+		free(ffm->audio_infos);
 	}
 
 	ffm->video_stream = NULL;
-	ffm->audio_streams = NULL;
+	ffm->audio_infos = NULL;
 	ffm->num_audio_streams = 0;
 }
 
@@ -235,6 +253,18 @@
 			return false;
 		if (!get_opt_int(argc, argv, &params->height, "video height"))
 			return false;
+		if (!get_opt_int(argc, argv, &params->color_primaries,
+				 "video color primaries"))
+			return false;
+		if (!get_opt_int(argc, argv, &params->color_trc,
+				 "video color trc"))
+			return false;
+		if (!get_opt_int(argc, argv, &params->colorspace,
+				 "video colorspace"))
+			return false;
+		if (!get_opt_int(argc, argv, &params->color_range,
+				 "video color range"))
+			return false;
 		if (!get_opt_int(argc, argv, &params->fps_num, "video fps num"))
 			return false;
 		if (!get_opt_int(argc, argv, &params->fps_den, "video fps den"))
@@ -245,7 +275,7 @@
 		if (!get_opt_str(argc, argv, &params->acodec, "audio codec"))
 			return false;
 
-		audio = calloc(1, sizeof(*audio) * params->tracks);
+		audio = calloc(params->tracks, sizeof(*audio));
 
 		for (int i = 0; i < params->tracks; i++) {
 			if (!get_audio_params(&audio[i], argc, argv)) {
@@ -263,25 +293,22 @@
 }
 
 static bool new_stream(struct ffmpeg_mux *ffm, AVStream **stream,
-		       const char *name, enum AVCodecID *id)
+		       const char *name, AVCodec **codec)
 {
 	const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(name);
-	AVCodec *codec;
 
 	if (!desc) {
 		fprintf(stderr, "Couldn't find encoder '%s'\n", name);
 		return false;
 	}
 
-	*id = desc->id;
-
-	codec = avcodec_find_encoder(desc->id);
-	if (!codec) {
+	*codec = avcodec_find_encoder(desc->id);
+	if (!*codec) {
 		fprintf(stderr, "Couldn't create encoder");
 		return false;
 	}
 
-	*stream = avformat_new_stream(ffm->output, codec);
+	*stream = avformat_new_stream(ffm->output, *codec);
 	if (!*stream) {
 		fprintf(stderr, "Couldn't create stream for encoder '%s'\n",
 			name);
@@ -294,11 +321,11 @@
 
 static void create_video_stream(struct ffmpeg_mux *ffm)
 {
+	AVCodec *codec;
 	AVCodecContext *context;
 	void *extradata = NULL;
 
-	if (!new_stream(ffm, &ffm->video_stream, ffm->params.vcodec,
-			&ffm->output->oformat->video_codec))
+	if (!new_stream(ffm, &ffm->video_stream, ffm->params.vcodec, &codec))
 		return;
 
 	if (ffm->video_header.size) {
@@ -306,12 +333,20 @@
 				      ffm->video_header.size);
 	}
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	context = avcodec_alloc_context3(codec);
+#else
 	context = ffm->video_stream->codec;
-	context->bit_rate = ffm->params.vbitrate * 1000;
+#endif
+	context->bit_rate = (int64_t)ffm->params.vbitrate * 1000;
 	context->width = ffm->params.width;
 	context->height = ffm->params.height;
 	context->coded_width = ffm->params.width;
 	context->coded_height = ffm->params.height;
+	context->color_primaries = ffm->params.color_primaries;
+	context->color_trc = ffm->params.color_trc;
+	context->colorspace = ffm->params.colorspace;
+	context->color_range = ffm->params.color_range;
 	context->extradata = extradata;
 	context->extradata_size = ffm->video_header.size;
 	context->time_base =
@@ -322,20 +357,24 @@
 
 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
 		context->flags |= CODEC_FLAG_GLOBAL_H;
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	avcodec_parameters_from_context(ffm->video_stream->codecpar, context);
+#endif
+
+	ffm->video_ctx = context;
 }
 
 static void create_audio_stream(struct ffmpeg_mux *ffm, int idx)
 {
+	AVCodec *codec;
 	AVCodecContext *context;
 	AVStream *stream;
 	void *extradata = NULL;
 
-	if (!new_stream(ffm, &stream, ffm->params.acodec,
-			&ffm->output->oformat->audio_codec))
+	if (!new_stream(ffm, &stream, ffm->params.acodec, &codec))
 		return;
 
-	ffm->audio_streams[idx] = stream;
-
 	av_dict_set(&stream->metadata, "title", ffm->audio[idx].name, 0);
 
 	stream->time_base = (AVRational){1, ffm->audio[idx].sample_rate};
@@ -345,8 +384,12 @@
 				      ffm->audio_header[idx].size);
 	}
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	context = avcodec_alloc_context3(codec);
+#else
 	context = stream->codec;
-	context->bit_rate = ffm->audio[idx].abitrate * 1000;
+#endif
+	context->bit_rate = (int64_t)ffm->audio[idx].abitrate * 1000;
 	context->channels = ffm->audio[idx].channels;
 	context->sample_rate = ffm->audio[idx].sample_rate;
 	context->sample_fmt = AV_SAMPLE_FMT_S16;
@@ -364,6 +407,12 @@
 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
 		context->flags |= CODEC_FLAG_GLOBAL_H;
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	avcodec_parameters_from_context(stream->codecpar, context);
+#endif
+
+	ffm->audio_infos[ffm->num_audio_streams].stream = stream;
+	ffm->audio_infos[ffm->num_audio_streams].ctx = context;
 	ffm->num_audio_streams++;
 }
 
@@ -373,8 +422,8 @@
 		create_video_stream(ffm);
 
 	if (ffm->params.tracks) {
-		ffm->audio_streams =
-			calloc(1, ffm->params.tracks * sizeof(void *));
+		ffm->audio_infos =
+			calloc(ffm->params.tracks, sizeof(*ffm->audio_infos));
 
 		for (int i = 0; i < ffm->params.tracks; i++)
 			create_audio_stream(ffm, i);
@@ -477,10 +526,6 @@
 		}
 	}
 
-	strncpy(ffm->output->filename, ffm->params.file,
-		sizeof(ffm->output->filename));
-	ffm->output->filename[sizeof(ffm->output->filename) - 1] = 0;
-
 	AVDictionary *dict = NULL;
 	if ((ret = av_dict_parse_string(&dict, ffm->params.muxer_settings, "=",
 					" ", 0))) {
@@ -516,12 +561,27 @@
 	return FFM_SUCCESS;
 }
 
+#define SRT_PROTO "srt"
+#define UDP_PROTO "udp"
+#define TCP_PROTO "tcp"
+
 static int ffmpeg_mux_init_context(struct ffmpeg_mux *ffm)
 {
 	AVOutputFormat *output_format;
 	int ret;
+	bool isNetwork = false;
+	if (strncmp(ffm->params.file, SRT_PROTO, sizeof(SRT_PROTO) - 1) == 0 ||
+	    strncmp(ffm->params.file, UDP_PROTO, sizeof(UDP_PROTO) - 1) == 0 ||
+	    strncmp(ffm->params.file, TCP_PROTO, sizeof(TCP_PROTO) - 1) == 0)
+		isNetwork = true;
+
+	if (isNetwork) {
+		avformat_network_init();
+		output_format = av_guess_format("mpegts", NULL, "video/M2PT");
+	} else {
+		output_format = av_guess_format(NULL, ffm->params.file, NULL);
+	}
 
-	output_format = av_guess_format(NULL, ffm->params.file, NULL);
 	if (output_format == NULL) {
 		fprintf(stderr, "Couldn't find an appropriate muxer for '%s'\n",
 			ffm->params.file);
@@ -529,7 +589,7 @@
 	}
 
 	ret = avformat_alloc_output_context2(&ffm->output, output_format, NULL,
-					     NULL);
+					     ffm->params.file);
 	if (ret < 0) {
 		fprintf(stderr, "Couldn't initialize output context: %s\n",
 			av_err2str(ret));
@@ -563,7 +623,7 @@
 
 	if (ffm->params.tracks) {
 		ffm->audio_header =
-			calloc(1, sizeof(struct header) * ffm->params.tracks);
+			calloc(ffm->params.tracks, sizeof(*ffm->audio_header));
 	}
 
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
@@ -599,24 +659,42 @@
 		}
 	} else {
 		if ((int)info->index < ffm->num_audio_streams) {
-			return ffm->audio_streams[info->index]->id;
+			return ffm->audio_infos[info->index].stream->id;
 		}
 	}
 
 	return -1;
 }
 
+static AVCodecContext *get_codec_context(struct ffmpeg_mux *ffm,
+					 struct ffm_packet_info *info)
+{
+	if (info->type == FFM_PACKET_VIDEO) {
+		if (ffm->video_stream) {
+			return ffm->video_ctx;
+		}
+	} else {
+		if ((int)info->index < ffm->num_audio_streams) {
+			return ffm->audio_infos[info->index].ctx;
+		}
+	}
+
+	return NULL;
+}
+
 static inline AVStream *get_stream(struct ffmpeg_mux *ffm, int idx)
 {
 	return ffm->output->streams[idx];
 }
 
-static inline int64_t rescale_ts(struct ffmpeg_mux *ffm, int64_t val, int idx)
+static inline int64_t rescale_ts(struct ffmpeg_mux *ffm,
+				 AVRational codec_time_base, int64_t val,
+				 int idx)
 {
 	AVStream *stream = get_stream(ffm, idx);
 
-	return av_rescale_q_rnd(val / stream->codec->time_base.num,
-				stream->codec->time_base, stream->time_base,
+	return av_rescale_q_rnd(val / codec_time_base.num, codec_time_base,
+				stream->time_base,
 				AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
 }
 
@@ -631,13 +709,16 @@
 		return true;
 	}
 
+	const AVRational codec_time_base =
+		get_codec_context(ffm, info)->time_base;
+
 	av_init_packet(&packet);
 
 	packet.data = buf;
 	packet.size = (int)info->size;
 	packet.stream_index = idx;
-	packet.pts = rescale_ts(ffm, info->pts, idx);
-	packet.dts = rescale_ts(ffm, info->dts, idx);
+	packet.pts = rescale_ts(ffm, codec_time_base, info->pts, idx);
+	packet.dts = rescale_ts(ffm, codec_time_base, info->dts, idx);
 
 	if (info->keyframe)
 		packet.flags = AV_PKT_FLAG_KEY;

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/jim-nvenc-helpers.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/jim-nvenc-helpers.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.c Changed

@@ -64,6 +64,8 @@
 	pthread_t mux_thread;
 	bool mux_thread_joinable;
 	volatile bool muxing;
+
+	bool is_network;
 };
 
 static const char *ffmpeg_mux_getname(void *type)
@@ -72,6 +74,12 @@
 	return obs_module_text("FFmpegMuxer");
 }
 
+static const char *ffmpeg_mpegts_mux_getname(void *type)
+{
+	UNUSED_PARAMETER(type);
+	return obs_module_text("FFmpegMpegtsMuxer");
+}
+
 static inline void replay_buffer_clear(struct ffmpeg_muxer *stream)
 {
 	while (stream->packets.size > 0) {
@@ -108,6 +116,9 @@
 	struct ffmpeg_muxer *stream = bzalloc(sizeof(*stream));
 	stream->output = output;
 
+	if (obs_output_get_flags(output) & OBS_OUTPUT_SERVICE)
+		stream->is_network = true;
+
 	UNUSED_PARAMETER(settings);
 	return stream;
 }
@@ -145,10 +156,37 @@
 
 	obs_data_release(settings);
 
-	dstr_catf(cmd, "%s %d %d %d %d %d ", obs_encoder_get_codec(vencoder),
-		  bitrate, obs_output_get_width(stream->output),
-		  obs_output_get_height(stream->output), (int)info->fps_num,
-		  (int)info->fps_den);
+	enum AVColorPrimaries pri = AVCOL_PRI_UNSPECIFIED;
+	enum AVColorTransferCharacteristic trc = AVCOL_TRC_UNSPECIFIED;
+	enum AVColorSpace spc = AVCOL_SPC_UNSPECIFIED;
+	switch (info->colorspace) {
+	case VIDEO_CS_601:
+		pri = AVCOL_PRI_SMPTE170M;
+		trc = AVCOL_TRC_SMPTE170M;
+		spc = AVCOL_SPC_SMPTE170M;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		pri = AVCOL_PRI_BT709;
+		trc = AVCOL_TRC_BT709;
+		spc = AVCOL_SPC_BT709;
+		break;
+	case VIDEO_CS_SRGB:
+		pri = AVCOL_PRI_BT709;
+		trc = AVCOL_TRC_IEC61966_2_1;
+		spc = AVCOL_SPC_BT709;
+		break;
+	}
+
+	const enum AVColorRange range = (info->range == VIDEO_RANGE_FULL)
+						? AVCOL_RANGE_JPEG
+						: AVCOL_RANGE_MPEG;
+
+	dstr_catf(cmd, "%s %d %d %d %d %d %d %d %d %d ",
+		  obs_encoder_get_codec(vencoder), bitrate,
+		  obs_output_get_width(stream->output),
+		  obs_output_get_height(stream->output), (int)pri, (int)trc,
+		  (int)spc, (int)range, (int)info->fps_num, (int)info->fps_den);
 }
 
 static void add_audio_encoder_params(struct dstr *cmd, obs_encoder_t *aencoder)
@@ -264,6 +302,27 @@
 	dstr_free(&cmd);
 }
 
+static void set_file_not_readable_error(struct ffmpeg_muxer *stream,
+					obs_data_t *settings, const char *path)
+{
+	struct dstr error_message;
+	dstr_init_copy(&error_message, obs_module_text("UnableToWritePath"));
+#ifdef _WIN32
+	/* special warning for Windows 10 users about Defender */
+	struct win_version_info ver;
+	get_win_ver(&ver);
+	if (ver.major >= 10) {
+		dstr_cat(&error_message, "\n\n");
+		dstr_cat(&error_message,
+			 obs_module_text("WarnWindowsDefender"));
+	}
+#endif
+	dstr_replace(&error_message, "%1", path);
+	obs_output_set_last_error(stream->output, error_message.array);
+	dstr_free(&error_message);
+	obs_data_release(settings);
+}
+
 static bool ffmpeg_mux_start(void *data)
 {
 	struct ffmpeg_muxer *stream = data;
@@ -276,34 +335,31 @@
 		return false;
 
 	settings = obs_output_get_settings(stream->output);
-	path = obs_data_get_string(settings, "path");
-
-	/* ensure output path is writable to avoid generic error message */
-	/* TODO: remove once ffmpeg-mux is refactored to pass errors back */
-	FILE *test_file = os_fopen(path, "wb");
-	if (!test_file) {
-		struct dstr error_message;
-		dstr_init_copy(&error_message,
-			       obs_module_text("UnableToWritePath"));
-#ifdef _WIN32
-		// special warning for Windows 10 users about Defender
-		struct win_version_info ver;
-		get_win_ver(&ver);
-		if (ver.major >= 10) {
-			dstr_cat(&error_message, "\n\n");
-			dstr_cat(&error_message,
-				 obs_module_text("WarnWindowsDefender"));
-		}
-#endif
-		dstr_replace(&error_message, "%1", path);
-		obs_output_set_last_error(stream->output, error_message.array);
-		dstr_free(&error_message);
-		obs_data_release(settings);
-		return false;
+	if (stream->is_network) {
+		obs_service_t *service;
+		service = obs_output_get_service(stream->output);
+		if (!service)
+			return false;
+		path = obs_service_get_url(service);
+	} else {
+		path = obs_data_get_string(settings, "path");
 	}
 
-	fclose(test_file);
-	os_unlink(path);
+	if (!stream->is_network) {
+		/* ensure output path is writable to avoid generic error
+		 * message.
+		 *
+		 * TODO: remove once ffmpeg-mux is refactored to pass
+		 * errors back */
+		FILE *test_file = os_fopen(path, "wb");
+		if (!test_file) {
+			set_file_not_readable_error(stream, settings, path);
+			return false;
+		}
+
+		fclose(test_file);
+		os_unlink(path);
+	}
 
 	start_pipe(stream, path);
 	obs_data_release(settings);
@@ -527,6 +583,37 @@
 	.get_properties = ffmpeg_mux_properties,
 };
 
+static int connect_time(struct ffmpeg_muxer *stream)
+{
+	UNUSED_PARAMETER(stream);
+	/* TODO */
+	return 0;
+}
+
+static int ffmpeg_mpegts_mux_connect_time(void *data)
+{
+	struct ffmpeg_muxer *stream = data;
+	/* TODO */
+	return connect_time(stream);
+}
+
+struct obs_output_info ffmpeg_mpegts_muxer = {
+	.id = "ffmpeg_mpegts_muxer",
+	.flags = OBS_OUTPUT_AV | OBS_OUTPUT_ENCODED | OBS_OUTPUT_MULTI_TRACK |
+		 OBS_OUTPUT_SERVICE,
+	.encoded_video_codecs = "h264",
+	.encoded_audio_codecs = "aac",
+	.get_name = ffmpeg_mpegts_mux_getname,
+	.create = ffmpeg_mux_create,
+	.destroy = ffmpeg_mux_destroy,
+	.start = ffmpeg_mux_start,
+	.stop = ffmpeg_mux_stop,
+	.encoded_packet = ffmpeg_mux_data,
+	.get_total_bytes = ffmpeg_mux_total_bytes,
+	.get_properties = ffmpeg_mux_properties,
+	.get_connect_time_ms = ffmpeg_mpegts_mux_connect_time,
+};
+
 /* ------------------------------------------------------------------------ */
 
 static const char *replay_buffer_getname(void *type)
@@ -803,6 +890,13 @@
 		dstr_cat_ch(&stream->path, '/');
 	dstr_cat(&stream->path, filename);
 
+	char *slash = strrchr(stream->path.array, '/');
+	if (slash) {
+		*slash = 0;
+		os_mkdirs(stream->path.array);
+		*slash = '/';
+	}
+
 	bfree(filename);
 	obs_data_release(settings);

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c Changed

@@ -235,14 +235,30 @@
 	enc->context->height = obs_encoder_get_height(enc->encoder);
 	enc->context->time_base = (AVRational){voi->fps_den, voi->fps_num};
 	enc->context->pix_fmt = obs_to_ffmpeg_video_format(info.format);
-	enc->context->colorspace = info.colorspace == VIDEO_CS_709
-					   ? AVCOL_SPC_BT709
-					   : AVCOL_SPC_BT470BG;
 	enc->context->color_range = info.range == VIDEO_RANGE_FULL
 					    ? AVCOL_RANGE_JPEG
 					    : AVCOL_RANGE_MPEG;
 	enc->context->max_b_frames = bf;
 
+	switch (info.colorspace) {
+	case VIDEO_CS_601:
+		enc->context->color_trc = AVCOL_TRC_SMPTE170M;
+		enc->context->color_primaries = AVCOL_PRI_SMPTE170M;
+		enc->context->colorspace = AVCOL_SPC_SMPTE170M;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		enc->context->color_trc = AVCOL_TRC_BT709;
+		enc->context->color_primaries = AVCOL_PRI_BT709;
+		enc->context->colorspace = AVCOL_SPC_BT709;
+		break;
+	case VIDEO_CS_SRGB:
+		enc->context->color_trc = AVCOL_TRC_IEC61966_2_1;
+		enc->context->color_primaries = AVCOL_PRI_BT709;
+		enc->context->colorspace = AVCOL_SPC_BT709;
+		break;
+	}
+
 	if (keyint_sec)
 		enc->context->gop_size =
 			keyint_sec * voi->fps_num / voi->fps_den;

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c Changed

@@ -135,7 +135,7 @@
 
 static bool open_video_codec(struct ffmpeg_data *data)
 {
-	AVCodecContext *context = data->video->codec;
+	AVCodecContext *const context = data->video_ctx;
 	char **opts = strlist_split(data->config.video_settings, ' ', false);
 	int ret;
 
@@ -169,8 +169,10 @@
 	data->vframe->format = context->pix_fmt;
 	data->vframe->width = context->width;
 	data->vframe->height = context->height;
-	data->vframe->colorspace = data->config.color_space;
 	data->vframe->color_range = data->config.color_range;
+	data->vframe->color_primaries = data->config.color_primaries;
+	data->vframe->color_trc = data->config.color_trc;
+	data->vframe->colorspace = data->config.colorspace;
 
 	ret = av_frame_get_buffer(data->vframe, base_get_alignment());
 	if (ret < 0) {
@@ -180,6 +182,10 @@
 		return false;
 	}
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	avcodec_parameters_from_context(data->video->codecpar, context);
+#endif
+
 	return true;
 }
 
@@ -215,18 +221,27 @@
 			data->config.video_encoder))
 		return false;
 
-	closest_format = avcodec_find_best_pix_fmt_of_list(
-		data->vcodec->pix_fmts, data->config.format, 0, NULL);
+	closest_format = data->config.format;
+	if (data->vcodec->pix_fmts) {
+		closest_format = avcodec_find_best_pix_fmt_of_list(
+			data->vcodec->pix_fmts, data->config.format, 0, 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;
 	context->time_base = (AVRational){ovi.fps_den, ovi.fps_num};
 	context->gop_size = data->config.gop_size;
 	context->pix_fmt = closest_format;
-	context->colorspace = data->config.color_space;
 	context->color_range = data->config.color_range;
+	context->color_primaries = data->config.color_primaries;
+	context->color_trc = data->config.color_trc;
+	context->colorspace = data->config.colorspace;
 	context->thread_count = 0;
 
 	data->video->time_base = context->time_base;
@@ -234,6 +249,8 @@
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
 		context->flags |= CODEC_FLAG_GLOBAL_H;
 
+	data->video_ctx = context;
+
 	if (!open_video_codec(data))
 		return false;
 
@@ -250,7 +267,7 @@
 
 static bool open_audio_codec(struct ffmpeg_data *data, int idx)
 {
-	AVCodecContext *context = data->audio_streams[idx]->codec;
+	AVCodecContext *const context = data->audio_infos[idx].ctx;
 	char **opts = strlist_split(data->config.audio_settings, ' ', false);
 	int ret;
 
@@ -292,6 +309,11 @@
 		return false;
 	}
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	avcodec_parameters_from_context(data->audio_infos[idx].stream->codecpar,
+					context);
+#endif
+
 	return true;
 }
 
@@ -311,8 +333,11 @@
 			data->config.audio_encoder))
 		return false;
 
-	data->audio_streams[idx] = stream;
-	context = data->audio_streams[idx]->codec;
+#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};
 	context->channels = get_audio_channels(aoi.speakers);
@@ -328,7 +353,7 @@
 				      ? data->acodec->sample_fmts[0]
 				      : AV_SAMPLE_FMT_FLTP;
 
-	data->audio_streams[idx]->time_base = context->time_base;
+	stream->time_base = context->time_base;
 
 	data->audio_samplerate = aoi.samples_per_sec;
 	data->audio_format = convert_ffmpeg_sample_format(context->sample_fmt);
@@ -338,6 +363,9 @@
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
 		context->flags |= CODEC_FLAG_GLOBAL_H;
 
+	data->audio_infos[idx].stream = stream;
+	data->audio_infos[idx].ctx = context;
+
 	return open_audio_codec(data, idx);
 }
 
@@ -351,8 +379,8 @@
 
 	if (format->audio_codec != AV_CODEC_ID_NONE &&
 	    data->num_audio_streams) {
-		data->audio_streams =
-			calloc(1, data->num_audio_streams * sizeof(void *));
+		data->audio_infos = calloc(data->num_audio_streams,
+					   sizeof(*data->audio_infos));
 		for (int i = 0; i < data->num_audio_streams; i++) {
 			if (!create_audio_stream(data, i))
 				return false;
@@ -402,10 +430,6 @@
 		}
 	}
 
-	strncpy(data->output->filename, data->config.url,
-		sizeof(data->output->filename));
-	data->output->filename[sizeof(data->output->filename) - 1] = 0;
-
 	ret = avformat_write_header(data->output, &dict);
 	if (ret < 0) {
 		ffmpeg_log_error(LOG_WARNING, data, "Error opening '%s': %s",
@@ -432,7 +456,11 @@
 
 static void close_video(struct ffmpeg_data *data)
 {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+	avcodec_free_context(&data->video_ctx);
+#else
 	avcodec_close(data->video->codec);
+#endif
 	av_frame_unref(data->vframe);
 
 	// This format for some reason derefs video frame
@@ -452,8 +480,13 @@
 
 		if (data->samples[idx][0])
 			av_freep(&data->samples[idx][0]);
-		if (data->audio_streams[idx])
-			avcodec_close(data->audio_streams[idx]->codec);
+		if (data->audio_infos[idx].ctx) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+			avcodec_free_context(&data->audio_infos[idx].ctx);
+#else
+			avcodec_close(data->audio_infos[idx].stream->codec);
+#endif
+		}
 		if (data->aframe[idx])
 			av_frame_free(&data->aframe[idx]);
 	}
@@ -466,10 +499,10 @@
 
 	if (data->video)
 		close_video(data);
-	if (data->audio_streams) {
+	if (data->audio_infos) {
 		close_audio(data);
-		free(data->audio_streams);
-		data->audio_streams = NULL;
+		free(data->audio_infos);
+		data->audio_infos = NULL;
 	}
 
 	if (data->output) {
@@ -555,7 +588,7 @@
 	}
 
 	avformat_alloc_output_context2(&data->output, output_format, NULL,
-				       NULL);
+				       data->config.url);
 
 	if (!data->output) {
 		ffmpeg_log_error(LOG_WARNING, data,
@@ -688,7 +721,7 @@
 	if (!data->video)
 		return;
 
-	AVCodecContext *context = data->video->codec;
+	AVCodecContext *context = data->video_ctx;
 	AVPacket packet = {0};
 	int ret = 0, got_packet;
 
@@ -699,6 +732,15 @@
 	if (!data->start_timestamp)
 		data->start_timestamp = frame->timestamp;
 
+	ret = av_frame_make_writable(data->vframe);
+	if (ret < 0) {
+		blog(LOG_WARNING,
+		     "receive_video: Error obtaining writable "
+		     "AVFrame: %s",
+		     av_err2str(ret));
+		//FIXME: stop the encode with an error
+		return;
+	}
 	if (!!data->swscale)
 		sws_scale(data->swscale, (const uint8_t *const *)frame->data,
 			  (const int *)frame->linesize, 0, data->config.height,
@@ -824,13 +866,13 @@
 		return;
 
 	packet.pts = rescale_ts(packet.pts, context,
-				data->audio_streams[idx]->time_base);
+				data->audio_infos[idx].stream->time_base);
 	packet.dts = rescale_ts(packet.dts, context,
-				data->audio_streams[idx]->time_base);
+				data->audio_infos[idx].stream->time_base);
 	packet.duration =
 		(int)av_rescale_q(packet.duration, context->time_base,
-				  data->audio_streams[idx]->time_base);
-	packet.stream_index = data->audio_streams[idx]->index;
+				  data->audio_infos[idx].stream->time_base);
+	packet.stream_index = data->audio_infos[idx].stream->index;
 
 	pthread_mutex_lock(&output->write_mutex);
 	da_push_back(output->packets, &packet);
@@ -859,7 +901,7 @@
 	int track_order;
 
 	// codec doesn't support audio or none configured
-	if (!data->audio_streams)
+	if (!data->audio_infos)
 		return;
 
 	/* check that the track was selected */
@@ -869,7 +911,7 @@
 	/* get track order (first selected, etc ...) */
 	track_order = get_track_order(data->audio_tracks, mix_idx);
 
-	AVCodecContext *context = data->audio_streams[track_order]->codec;
+	AVCodecContext *context = data->audio_infos[track_order].ctx;
 
 	if (!data->start_timestamp)
 		return;
@@ -907,7 +949,7 @@
 		time_base = data->video->time_base;
 		start_ts = output->video_start_ts;
 	} else {
-		time_base = data->audio_streams[0]->time_base;
+		time_base = data->audio_infos[0].stream->time_base;
 		start_ts = output->audio_start_ts;
 	}
 
@@ -940,10 +982,8 @@
 
 	if (stopping(output)) {
 		uint64_t sys_ts = get_packet_sys_dts(output, &packet);
-		if (sys_ts >= output->stop_ts) {
-			ffmpeg_output_full_stop(output);
+		if (sys_ts >= output->stop_ts)
 			return 0;
-		}
 	}
 
 	output->total_bytes += packet.size;
@@ -952,7 +992,7 @@
 	if (ret < 0) {
 		av_free_packet(&packet);
 		ffmpeg_log_error(LOG_WARNING, &output->ff_data,
-				 "receive_audio: Error writing packet: %s",
+				 "process_packet: Error writing packet: %s",
 				 av_err2str(ret));
 		return ret;
 	}
@@ -1048,16 +1088,30 @@
 	config.audio_tracks = (int)obs_output_get_mixers(output->output);
 	config.audio_mix_count = get_audio_mix_count(config.audio_tracks);
 
+	config.color_range = voi->range == VIDEO_RANGE_FULL ? AVCOL_RANGE_JPEG
+							    : AVCOL_RANGE_MPEG;
+	switch (voi->colorspace) {
+	case VIDEO_CS_601:
+		config.color_primaries = AVCOL_PRI_SMPTE170M;
+		config.color_trc = AVCOL_TRC_SMPTE170M;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		config.color_primaries = AVCOL_PRI_BT709;
+		config.color_trc = AVCOL_TRC_BT709;
+		break;
+	case VIDEO_CS_SRGB:
+		config.color_primaries = AVCOL_PRI_BT709;
+		config.color_trc = AVCOL_TRC_IEC61966_2_1;
+		break;
+	}
+
 	if (format_is_yuv(voi->format)) {
-		config.color_range = voi->range == VIDEO_RANGE_FULL
-					     ? AVCOL_RANGE_JPEG
-					     : AVCOL_RANGE_MPEG;
-		config.color_space = voi->colorspace == VIDEO_CS_709
-					     ? AVCOL_SPC_BT709
-					     : AVCOL_SPC_BT470BG;
+		config.colorspace = (voi->colorspace == VIDEO_CS_601)
+					    ? AVCOL_SPC_SMPTE170M
+					    : AVCOL_SPC_BT709;
 	} else {
-		config.color_range = AVCOL_RANGE_UNSPECIFIED;
-		config.color_space = AVCOL_SPC_RGB;
+		config.colorspace = AVCOL_SPC_RGB;
 	}
 
 	if (config.format == AV_PIX_FMT_NONE) {
@@ -1150,12 +1204,12 @@
 	struct ffmpeg_output *output = data;
 
 	if (output->active) {
-		if (ts == 0) {
-			ffmpeg_output_full_stop(output);
-		} else {
-			os_atomic_set_bool(&output->stopping, true);
+		if (ts > 0) {
 			output->stop_ts = ts;
+			os_atomic_set_bool(&output->stopping, true);
 		}
+
+		ffmpeg_output_full_stop(output);
 	}
 }

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.h -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c Changed

@@ -58,6 +58,12 @@
 	bool close_when_inactive;
 	bool seekable;
 
+	pthread_t reconnect_thread;
+	bool stop_reconnect;
+	bool reconnect_thread_valid;
+	volatile bool reconnecting;
+	int reconnect_delay_sec;
+
 	enum obs_media_state state;
 	obs_hotkey_pair_id play_pause_hotkey;
 	obs_hotkey_id stop_hotkey;
@@ -81,18 +87,18 @@
 	obs_property_t *local_file = obs_properties_get(props, "local_file");
 	obs_property_t *looping = obs_properties_get(props, "looping");
 	obs_property_t *buffering = obs_properties_get(props, "buffering_mb");
-	obs_property_t *close =
-		obs_properties_get(props, "close_when_inactive");
 	obs_property_t *seekable = obs_properties_get(props, "seekable");
 	obs_property_t *speed = obs_properties_get(props, "speed_percent");
+	obs_property_t *reconnect_delay_sec =
+		obs_properties_get(props, "reconnect_delay_sec");
 	obs_property_set_visible(input, !enabled);
 	obs_property_set_visible(input_format, !enabled);
 	obs_property_set_visible(buffering, !enabled);
-	obs_property_set_visible(close, enabled);
 	obs_property_set_visible(local_file, enabled);
 	obs_property_set_visible(looping, enabled);
 	obs_property_set_visible(speed, enabled);
 	obs_property_set_visible(seekable, !enabled);
+	obs_property_set_visible(reconnect_delay_sec, !enabled);
 
 	return true;
 }
@@ -103,6 +109,7 @@
 	obs_data_set_default_bool(settings, "looping", false);
 	obs_data_set_default_bool(settings, "clear_on_media_end", true);
 	obs_data_set_default_bool(settings, "restart_on_activate", true);
+	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);
 }
@@ -163,7 +170,7 @@
 				obs_module_text("RestartWhenActivated"));
 
 	prop = obs_properties_add_int_slider(props, "buffering_mb",
-					     obs_module_text("BufferingMB"), 1,
+					     obs_module_text("BufferingMB"), 0,
 					     16, 1);
 	obs_property_int_set_suffix(prop, " MB");
 
@@ -174,6 +181,11 @@
 				obs_module_text("InputFormat"),
 				OBS_TEXT_DEFAULT);
 
+	prop = obs_properties_add_int_slider(
+		props, "reconnect_delay_sec",
+		obs_module_text("ReconnectDelayTime"), 1, 60, 1);
+	obs_property_int_set_suffix(prop, " S");
+
 #ifndef __APPLE__
 	obs_properties_add_bool(props, "hw_decode",
 				obs_module_text("HardwareDecode"));
@@ -245,12 +257,24 @@
 
 	if (s->is_clear_on_media_end || s->is_looping)
 		obs_source_preload_video(s->source, f);
+
+	if (!s->is_local_file && os_atomic_set_bool(&s->reconnecting, false))
+		FF_BLOG(LOG_INFO, "Reconnected.");
+}
+
+static void seek_frame(void *opaque, struct obs_source_frame *f)
+{
+	struct ffmpeg_source *s = opaque;
+	obs_source_set_video_frame(s->source, f);
 }
 
 static void get_audio(void *opaque, struct obs_source_audio *a)
 {
 	struct ffmpeg_source *s = opaque;
 	obs_source_output_audio(s->source, a);
+
+	if (!s->is_local_file && os_atomic_set_bool(&s->reconnecting, false))
+		FF_BLOG(LOG_INFO, "Reconnected.");
 }
 
 static void media_stopped(void *opaque)
@@ -274,6 +298,7 @@
 			.opaque = s,
 			.v_cb = get_frame,
 			.v_preload_cb = preload_frame,
+			.v_seek_cb = seek_frame,
 			.a_cb = get_audio,
 			.stop_cb = media_stopped,
 			.path = s->input,
@@ -282,12 +307,51 @@
 			.speed = s->speed_percent,
 			.force_range = s->range,
 			.hardware_decoding = s->is_hw_decoding,
-			.is_local_file = s->is_local_file || s->seekable};
+			.is_local_file = s->is_local_file || s->seekable,
+			.reconnecting = s->reconnecting,
+		};
 
 		s->media_valid = mp_media_init(&s->media, &info);
 	}
 }
 
+static void ffmpeg_source_start(struct ffmpeg_source *s)
+{
+	if (!s->media_valid)
+		ffmpeg_source_open(s);
+
+	if (!s->media_valid)
+		return;
+
+	mp_media_play(&s->media, s->is_looping, s->reconnecting);
+	if (s->is_local_file && (s->is_clear_on_media_end || s->is_looping))
+		obs_source_show_preloaded_video(s->source);
+	else
+		obs_source_output_video(s->source, NULL);
+	set_media_state(s, OBS_MEDIA_STATE_PLAYING);
+	obs_source_media_started(s->source);
+}
+
+static void *ffmpeg_source_reconnect(void *data)
+{
+	struct ffmpeg_source *s = data;
+	os_sleep_ms(s->reconnect_delay_sec * 1000);
+
+	if (s->stop_reconnect || s->media_valid)
+		goto finish;
+
+	bool active = obs_source_active(s->source);
+	if (!s->close_when_inactive || active)
+		ffmpeg_source_open(s);
+
+	if (!s->restart_on_activate || active)
+		ffmpeg_source_start(s);
+
+finish:
+	s->reconnect_thread_valid = false;
+	return NULL;
+}
+
 static void ffmpeg_source_tick(void *data, float seconds)
 {
 	UNUSED_PARAMETER(seconds);
@@ -298,21 +362,22 @@
 			mp_media_free(&s->media);
 			s->media_valid = false;
 		}
-		s->destroy_media = false;
-	}
-}
 
-static void ffmpeg_source_start(struct ffmpeg_source *s)
-{
-	if (!s->media_valid)
-		ffmpeg_source_open(s);
+		s->destroy_media = false;
 
-	if (s->media_valid) {
-		mp_media_play(&s->media, s->is_looping);
-		if (s->is_local_file)
-			obs_source_show_preloaded_video(s->source);
-		set_media_state(s, OBS_MEDIA_STATE_PLAYING);
-		obs_source_media_started(s->source);
+		if (!s->is_local_file) {
+			if (!os_atomic_set_bool(&s->reconnecting, true)) {
+				FF_BLOG(LOG_WARNING, "Disconnected. "
+						     "Reconnecting...");
+			}
+			if (pthread_create(&s->reconnect_thread, NULL,
+					   ffmpeg_source_reconnect, s) != 0) {
+				FF_BLOG(LOG_WARNING, "Could not create "
+						     "reconnect thread");
+				return;
+			}
+			s->reconnect_thread_valid = true;
+		}
 	}
 }
 
@@ -332,16 +397,27 @@
 		input = (char *)obs_data_get_string(settings, "local_file");
 		input_format = NULL;
 		s->is_looping = obs_data_get_bool(settings, "looping");
-		s->close_when_inactive =
-			obs_data_get_bool(settings, "close_when_inactive");
 	} else {
 		input = (char *)obs_data_get_string(settings, "input");
 		input_format =
 			(char *)obs_data_get_string(settings, "input_format");
+		s->reconnect_delay_sec =
+			(int)obs_data_get_int(settings, "reconnect_delay_sec");
+		s->reconnect_delay_sec = s->reconnect_delay_sec == 0
+						 ? 10
+						 : s->reconnect_delay_sec;
 		s->is_looping = false;
-		s->close_when_inactive = true;
+
+		if (s->reconnect_thread_valid) {
+			s->stop_reconnect = true;
+			pthread_join(s->reconnect_thread, NULL);
+			s->stop_reconnect = false;
+		}
 	}
 
+	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;
 #ifndef __APPLE__
@@ -391,7 +467,7 @@
 		return;
 
 	struct ffmpeg_source *s = data;
-	if (obs_source_active(s->source))
+	if (obs_source_showing(s->source))
 		obs_source_media_restart(s->source);
 }
 
@@ -460,7 +536,7 @@
 	struct ffmpeg_source *s = data;
 
 	if (s->state == OBS_MEDIA_STATE_PLAYING ||
-	    !obs_source_active(s->source))
+	    !obs_source_showing(s->source))
 		return false;
 
 	obs_source_media_play_pause(s->source, false);
@@ -479,7 +555,7 @@
 	struct ffmpeg_source *s = data;
 
 	if (s->state != OBS_MEDIA_STATE_PLAYING ||
-	    !obs_source_active(s->source))
+	    !obs_source_showing(s->source))
 		return false;
 
 	obs_source_media_play_pause(s->source, true);
@@ -497,7 +573,7 @@
 
 	struct ffmpeg_source *s = data;
 
-	if (obs_source_active(s->source))
+	if (obs_source_showing(s->source))
 		obs_source_media_stop(s->source);
 }
 
@@ -539,6 +615,11 @@
 
 	if (s->hotkey)
 		obs_hotkey_unregister(s->hotkey);
+	if (!s->is_local_file) {
+		s->stop_reconnect = true;
+		if (s->reconnect_thread_valid)
+			pthread_join(s->reconnect_thread, NULL);
+	}
 	if (s->media_valid)
 		mp_media_free(&s->media);
 
@@ -576,6 +657,12 @@
 {
 	struct ffmpeg_source *s = data;
 
+	if (!s->media_valid)
+		ffmpeg_source_open(s);
+
+	if (!s->media_valid)
+		return;
+
 	mp_media_play_pause(&s->media, pause);
 
 	if (pause)
@@ -599,7 +686,7 @@
 {
 	struct ffmpeg_source *s = data;
 
-	if (obs_source_active(s->source))
+	if (obs_source_showing(s->source))
 		ffmpeg_source_start(s);
 
 	set_media_state(s, OBS_MEDIA_STATE_PLAYING);
@@ -627,6 +714,9 @@
 {
 	struct ffmpeg_source *s = data;
 
+	if (!s->media_valid)
+		return;
+
 	mp_media_seek_to(&s->media, ms);
 }

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c Changed

@@ -244,13 +244,29 @@
 
 	enc->context->time_base = (AVRational){voi->fps_den, voi->fps_num};
 	enc->context->pix_fmt = obs_to_ffmpeg_video_format(info.format);
-	enc->context->colorspace = info.colorspace == VIDEO_CS_709
-					   ? AVCOL_SPC_BT709
-					   : AVCOL_SPC_BT470BG;
 	enc->context->color_range = info.range == VIDEO_RANGE_FULL
 					    ? AVCOL_RANGE_JPEG
 					    : AVCOL_RANGE_MPEG;
 
+	switch (info.colorspace) {
+	case VIDEO_CS_601:
+		enc->context->color_trc = AVCOL_TRC_SMPTE170M;
+		enc->context->color_primaries = AVCOL_PRI_SMPTE170M;
+		enc->context->colorspace = AVCOL_SPC_SMPTE170M;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		enc->context->color_trc = AVCOL_TRC_BT709;
+		enc->context->color_primaries = AVCOL_PRI_BT709;
+		enc->context->colorspace = AVCOL_SPC_BT709;
+		break;
+	case VIDEO_CS_SRGB:
+		enc->context->color_trc = AVCOL_TRC_IEC61966_2_1;
+		enc->context->color_primaries = AVCOL_PRI_BT709;
+		enc->context->colorspace = AVCOL_SPC_BT709;
+		break;
+	}
+
 	if (keyint_sec > 0) {
 		enc->context->gop_size =
 			keyint_sec * voi->fps_num / voi->fps_den;
@@ -550,15 +566,27 @@
 
 	obs_property_list_add_int(list, "H.264 (default)", AV_CODEC_ID_H264);
 
+	list = obs_properties_add_list(props, "profile", "Profile",
+				       OBS_COMBO_TYPE_LIST,
+				       OBS_COMBO_FORMAT_INT);
+	obs_property_list_add_int(list, "Constrained Baseline (default)",
+				  FF_PROFILE_H264_CONSTRAINED_BASELINE);
+	obs_property_list_add_int(list, "Main", FF_PROFILE_H264_MAIN);
+	obs_property_list_add_int(list, "High", FF_PROFILE_H264_HIGH);
+
 	list = obs_properties_add_list(props, "level", "Level",
 				       OBS_COMBO_TYPE_LIST,
 				       OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, "480p30 (3.0)", 30);
-	obs_property_list_add_int(list, "720p30/480p60  (3.1)", 31);
-	obs_property_list_add_int(list, "Compatibility mode  (4.0 default)",
+	obs_property_list_add_int(list, "Auto", FF_LEVEL_UNKNOWN);
+	obs_property_list_add_int(list, "3.0", 30);
+	obs_property_list_add_int(list, "3.1", 31);
+	obs_property_list_add_int(list, "4.0 (default) (Compatibility mode)",
 				  40);
-	obs_property_list_add_int(list, "720p60/1080p30 (4.1)", 41);
-	obs_property_list_add_int(list, "1080p60 (4.2)", 42);
+	obs_property_list_add_int(list, "4.1", 41);
+	obs_property_list_add_int(list, "4.2", 42);
+	obs_property_list_add_int(list, "5.0", 50);
+	obs_property_list_add_int(list, "5.1", 51);
+	obs_property_list_add_int(list, "5.2", 52);
 
 	list = obs_properties_add_list(props, "rate_control",
 				       obs_module_text("RateControl"),

obs-studio-25.0.8.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg.c -> obs-studio-26.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg.c Changed

@@ -22,11 +22,11 @@
 extern struct obs_source_info ffmpeg_source;
 extern struct obs_output_info ffmpeg_output;
 extern struct obs_output_info ffmpeg_muxer;
+extern struct obs_output_info ffmpeg_mpegts_muxer;
 extern struct obs_output_info replay_buffer;
 extern struct obs_encoder_info aac_encoder_info;
 extern struct obs_encoder_info opus_encoder_info;
 extern struct obs_encoder_info nvenc_encoder_info;
-extern struct obs_output_info ffmpeg_encoded_output_info;
 
 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 27, 100)
 #define LIBAVUTIL_VAAPI_AVAILABLE
@@ -230,10 +230,10 @@
 	obs_register_source(&ffmpeg_source);
 	obs_register_output(&ffmpeg_output);
 	obs_register_output(&ffmpeg_muxer);
+	obs_register_output(&ffmpeg_mpegts_muxer);
 	obs_register_output(&replay_buffer);
 	obs_register_encoder(&aac_encoder_info);
 	obs_register_encoder(&opus_encoder_info);
-	obs_register_output(&ffmpeg_encoded_output_info);
 #ifndef __APPLE__
 	if (nvenc_supported()) {
 		blog(LOG_INFO, "NVENC supported");

obs-studio-25.0.8.tar.xz/plugins/obs-filters/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/CMakeLists.txt Changed

@@ -6,26 +6,41 @@
 	message(STATUS "SpeexDSP support disabled")
 	set(LIBSPEEXDSP_FOUND FALSE)
 else()
-	find_package(Libspeexdsp QUIET)
-
-	if(NOT LIBSPEEXDSP_FOUND)
-		message(STATUS "SpeexDSP support not found")
-		set(LIBSPEEXDSP_FOUND FALSE)
-	else()
-		message(STATUS "SpeexDSP supported")
-		set(obs-filters_LIBSPEEXDSP_SOURCES
-			noise-suppress-filter.c)
-		set(obs-filters_LIBSPEEXDSP_LIBRARIES
-			${LIBSPEEXDSP_LIBRARIES})
+	find_package(Libspeexdsp)
+	if(LIBSPEEXDSP_FOUND)
+		add_definitions(-DLIBSPEEXDSP_ENABLED)
 	endif()
 endif()
 
+find_package(Librnnoise QUIET)
+add_definitions(-DLIBRNNOISE_ENABLED)
+if(NOT LIBRNNOISE_FOUND)
+	file(GLOB rnnoise_SOURCES
+		"rnnoise/src/*.c"
+		"rnnoise/src/*.h"
+		"rnnoise/include/*.h")
+	add_definitions(-DCOMPILE_OPUS)
+	include_directories("rnnoise/include")
+	source_group("rnnoise" FILES ${rnnoise_SOURCES})
+	set(LIBRNNOISE_FOUND TRUE)
+endif()
+
+if(LIBSPEEXDSP_FOUND OR LIBRNNOISE_FOUND)
+	set(obs-filters_NOISEREDUCTION_SOURCES
+		noise-suppress-filter.c)
+	set(obs-filters_NOISEREDUCTION_LIBRARIES
+		${LIBSPEEXDSP_LIBRARIES} ${LIBRNNOISE_LIBRARIES})
+	set(NOISEREDUCTION_ENABLED TRUE)
+else()
+	set(NOISEREDUCTION_ENABLED FALSE)
+endif()
+
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/obs-filters-config.h.in"
 	"${CMAKE_BINARY_DIR}/plugins/obs-filters/config/obs-filters-config.h")
 
 set(obs-filters_config_HEADERS
 	"${CMAKE_BINARY_DIR}/plugins/obs-filters/config/obs-filters-config.h")
-include_directories(${LIBSPEEXDSP_INCLUDE_DIRS}
+include_directories(${LIBSPEEXDSP_INCLUDE_DIRS} ${LIBRNNOISE_INCLUDE_DIRS}
 	"${CMAKE_BINARY_DIR}/plugins/obs-filters/config")
 
 if(MSVC)
@@ -62,12 +77,14 @@
 endif()
 
 add_library(obs-filters MODULE
+	${rnnoise_SOURCES}
 	${obs-filters_SOURCES}
 	${obs-filters_config_HEADERS}
-	${obs-filters_LIBSPEEXDSP_SOURCES})
+	${obs-filters_NOISEREDUCTION_SOURCES})
 target_link_libraries(obs-filters
 	libobs
 	${obs-filters_PLATFORM_DEPS}
-	${obs-filters_LIBSPEEXDSP_LIBRARIES})
+	${obs-filters_NOISEREDUCTION_LIBRARIES})
+set_target_properties(obs-filters PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-filters data)

obs-studio-25.0.8.tar.xz/plugins/obs-filters/async-delay-filter.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/async-delay-filter.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/color-grade-filter.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/color-grade-filter.c Changed

@@ -16,6 +16,11 @@
 
 static const uint32_t LUT_WIDTH = 64;
 
+enum clut_dimension {
+	CLUT_1D,
+	CLUT_3D,
+};
+
 struct lut_filter_data {
 	obs_source_t *context;
 	gs_effect_t *effect;
@@ -28,8 +33,11 @@
 
 	char *file;
 	float clut_amount;
-	float clut_scale;
-	float clut_offset;
+	enum clut_dimension clut_dim;
+	struct vec3 clut_scale;
+	struct vec3 clut_offset;
+	struct vec3 domain_min;
+	struct vec3 domain_max;
 };
 
 static const char *color_grade_filter_get_name(void *unused)
@@ -109,6 +117,7 @@
 		4 * width * width * width * sizeof(struct half);
 	struct half *values = bmalloc(data_size);
 
+	size_t offset = 0;
 	bool data_found = true;
 	for (uint32_t index = 0; index < width; ++index) {
 		if (!data_found) {
@@ -117,38 +126,10 @@
 			break;
 		}
 
-		for (uint32_t z = 0; z < width; ++z) {
-			const uint32_t z_offset = z * width * width;
-			for (uint32_t y = 0; y < width; ++y) {
-				const uint32_t y_offset = y * width;
-				const uint32_t offset =
-					4 * (index + y_offset + z_offset);
-				values[offset] = half_from_float(red);
-				values[offset + 3] =
-					half_from_bits(0x3C00); // 1.0
-			}
-		}
-
-		for (uint32_t z = 0; z < width; ++z) {
-			const uint32_t z_offset = z * width * width;
-			for (uint32_t x = 0; x < width; ++x) {
-				const uint32_t offset =
-					4 * (x + (index * width) + z_offset) +
-					1;
-				values[offset] = half_from_float(green);
-			}
-		}
-
-		for (uint32_t y = 0; y < width; ++y) {
-			const uint32_t y_offset = y * width;
-			for (uint32_t x = 0; x < width; ++x) {
-				const uint32_t offset =
-					4 * (x + y_offset +
-					     (index * width * width)) +
-					2;
-				values[offset] = half_from_float(blue);
-			}
-		}
+		values[offset++] = half_from_float(red);
+		values[offset++] = half_from_float(green);
+		values[offset++] = half_from_float(blue);
+		values[offset++] = half_from_bits(0x3c00); // 1.0
 
 		data_found = get_cube_entry(file, &red, &green, &blue);
 	}
@@ -189,14 +170,14 @@
 	return values;
 }
 
-static void *load_cube_file(const char *const path, uint32_t *const width)
+static void *load_cube_file(const char *const path, uint32_t *const width,
+			    struct vec3 *domain_min, struct vec3 *domain_max,
+			    enum clut_dimension *dim)
 {
 	void *data = NULL;
 
 	FILE *const file = os_fopen(path, "rb");
 	if (file) {
-		float min_value[] = {0.0f, 0.0f, 0.0f};
-		float max_value[] = {1.0f, 1.0f, 1.0f};
 		float red, green, blue;
 		unsigned width_1d = 0;
 		unsigned width_3d = 0;
@@ -214,14 +195,10 @@
 				break;
 			} else if (sscanf(line, "DOMAIN_MIN %f %f %f", &f[0],
 					  &f[1], &f[2]) == 3) {
-				min_value[0] = f[0];
-				min_value[1] = f[1];
-				min_value[2] = f[2];
+				vec3_set(domain_min, f[0], f[1], f[2]);
 			} else if (sscanf(line, "DOMAIN_MAX %f %f %f", &f[0],
 					  &f[1], &f[2]) == 3) {
-				max_value[0] = f[0];
-				max_value[1] = f[1];
-				max_value[2] = f[2];
+				vec3_set(domain_max, f[0], f[1], f[2]);
 			} else if (sscanf(line, "LUT_1D_SIZE %u", &u) == 1) {
 				width_1d = u;
 			} else if (sscanf(line, "LUT_3D_SIZE %u", &u) == 1) {
@@ -229,17 +206,28 @@
 			}
 		}
 
-		if (data_found) {
+		if (domain_min->x >= domain_max->x ||
+		    domain_min->y >= domain_max->y ||
+		    domain_min->z >= domain_max->z) {
+			blog(LOG_WARNING,
+			     "Invalid CUBE LUT domain: [%f, %f], [%f, %f], [%f, %f]",
+			     domain_min->x, domain_max->x, domain_min->y,
+			     domain_max->y, domain_min->z, domain_max->z);
+		} else if (data_found) {
 			if (width_1d > 0) {
 				data = load_1d_lut(file, width_1d, red, green,
 						   blue);
-				if (data)
+				if (data) {
 					*width = width_1d;
+					*dim = CLUT_1D;
+				}
 			} else if (width_3d > 0) {
 				data = load_3d_lut(file, width_3d, red, green,
 						   blue);
-				if (data)
+				if (data) {
 					*width = width_3d;
+					*dim = CLUT_3D;
+				}
 			}
 		}
 
@@ -276,12 +264,18 @@
 	obs_leave_graphics();
 
 	if (path) {
+		vec3_set(&filter->domain_min, 0.0f, 0.0f, 0.0f);
+		vec3_set(&filter->domain_max, 1.0f, 1.0f, 1.0f);
+
 		const char *const ext = os_get_path_extension(path);
 		if (ext && astrcmpi(ext, ".cube") == 0) {
-			filter->cube_data =
-				load_cube_file(path, &filter->cube_width);
+			filter->cube_data = load_cube_file(
+				path, &filter->cube_width, &filter->domain_min,
+				&filter->domain_max, &filter->clut_dim);
 		} else {
 			gs_image_file_init(&filter->image, path);
+			filter->cube_width = LUT_WIDTH;
+			filter->clut_dim = CLUT_3D;
 		}
 	}
 
@@ -292,16 +286,48 @@
 			filter->target = make_clut_texture_png(
 				filter->image.format, filter->image.cx,
 				filter->image.cy, filter->image.texture_data);
-			filter->clut_scale =
-				(float)(LUT_WIDTH - 1) / (float)LUT_WIDTH;
-			filter->clut_offset = 0.5f / (float)LUT_WIDTH;
+			const float clut_scale = (float)(LUT_WIDTH - 1);
+			vec3_set(&filter->clut_scale, clut_scale, clut_scale,
+				 clut_scale);
+			vec3_set(&filter->clut_offset, 0.f, 0.f, 0.f);
 		} else if (filter->cube_data) {
 			const uint32_t width = filter->cube_width;
-			filter->target = gs_voltexture_create(
-				width, width, width, GS_RGBA16F, 1,
-				(uint8_t **)&filter->cube_data, 0);
-			filter->clut_scale = (float)(width - 1) / (float)width;
-			filter->clut_offset = 0.5f / (float)width;
+			if (filter->clut_dim == CLUT_1D) {
+				filter->target = gs_texture_create(
+					width, 1, GS_RGBA16F, 1,
+					(const uint8_t **)&filter->cube_data,
+					0);
+			} else {
+				filter->target = gs_voltexture_create(
+					width, width, width, GS_RGBA16F, 1,
+					(const uint8_t **)&filter->cube_data,
+					0);
+			}
+
+			struct vec3 domain_scale;
+			vec3_sub(&domain_scale, &filter->domain_max,
+				 &filter->domain_min);
+
+			const float width_minus_one = (float)(width - 1);
+			vec3_set(&filter->clut_scale, width_minus_one,
+				 width_minus_one, width_minus_one);
+			vec3_div(&filter->clut_scale, &filter->clut_scale,
+				 &domain_scale);
+
+			vec3_neg(&filter->clut_offset, &filter->domain_min);
+			vec3_mul(&filter->clut_offset, &filter->clut_offset,
+				 &filter->clut_scale);
+
+			/* 1D shader wants normalized UVW */
+			if (filter->clut_dim == CLUT_1D) {
+				vec3_divf(&filter->clut_scale,
+					  &filter->clut_scale, (float)width);
+
+				vec3_addf(&filter->clut_offset,
+					  &filter->clut_offset, 0.5f);
+				vec3_divf(&filter->clut_offset,
+					  &filter->clut_offset, (float)width);
+			}
 		}
 	}
 
@@ -398,19 +424,36 @@
 					     OBS_ALLOW_DIRECT_RENDERING))
 		return;
 
-	param = gs_effect_get_param_by_name(filter->effect, "clut");
+	const char *clut_texture_name = "clut_3d";
+	const char *tech_name = "Draw3D";
+	if (filter->clut_dim == CLUT_1D) {
+		clut_texture_name = "clut_1d";
+		tech_name = "Draw1D";
+	}
+
+	param = gs_effect_get_param_by_name(filter->effect, clut_texture_name);
 	gs_effect_set_texture(param, filter->target);
 
 	param = gs_effect_get_param_by_name(filter->effect, "clut_amount");
 	gs_effect_set_float(param, filter->clut_amount);
 
 	param = gs_effect_get_param_by_name(filter->effect, "clut_scale");
-	gs_effect_set_float(param, filter->clut_scale);
+	gs_effect_set_vec3(param, &filter->clut_scale);
 
 	param = gs_effect_get_param_by_name(filter->effect, "clut_offset");
-	gs_effect_set_float(param, filter->clut_offset);
+	gs_effect_set_vec3(param, &filter->clut_offset);
+
+	param = gs_effect_get_param_by_name(filter->effect, "domain_min");
+	gs_effect_set_vec3(param, &filter->domain_min);
+
+	param = gs_effect_get_param_by_name(filter->effect, "domain_max");
+	gs_effect_set_vec3(param, &filter->domain_max);
+
+	param = gs_effect_get_param_by_name(filter->effect, "cube_width_i");
+	gs_effect_set_float(param, 1.0f / filter->cube_width);
 
-	obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
+	obs_source_process_filter_tech_end(filter->context, filter->effect, 0,
+					   0, tech_name);
 
 	UNUSED_PARAMETER(effect);
 }

obs-studio-25.0.8.tar.xz/plugins/obs-filters/compressor-filter.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/compressor-filter.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/crop-filter.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/crop-filter.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/color_grade_filter.effect -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/color_grade_filter.effect Changed

@@ -1,10 +1,14 @@
 uniform float4x4 ViewProj;
 uniform texture2d image;
 
-uniform texture3d clut;
+uniform texture2d clut_1d;
+uniform texture3d clut_3d;
 uniform float clut_amount;
-uniform float clut_scale;
-uniform float clut_offset;
+uniform float3 clut_scale;
+uniform float3 clut_offset;
+uniform float3 domain_min;
+uniform float3 domain_max;
+uniform float cube_width_i;
 
 sampler_state textureSampler {
 	Filter    = Linear;
@@ -31,22 +35,133 @@
 	return vert_out;
 }
 
-float4 LUT(VertDataOut v_in) : TARGET
+float4 LUT1D(VertDataOut v_in) : TARGET
 {
 	float4 textureColor = image.Sample(textureSampler, v_in.uv);
 
-	float3 clut_uvw = textureColor.rgb * clut_scale + clut_offset;
-	float3 luttedColor = clut.Sample(textureSampler, clut_uvw).rgb;
+	if (textureColor.r >= domain_min.r && textureColor.r <= domain_max.r) {
+		float u = textureColor.r * clut_scale.r + clut_offset.r;
+		float channel = clut_1d.Sample(textureSampler, float2(u, 0.5)).r;
+		textureColor.r = lerp(textureColor.r, channel, clut_amount);
+	}
+
+	if (textureColor.g >= domain_min.g && textureColor.g <= domain_max.g) {
+		float u = textureColor.g * clut_scale.g + clut_offset.g;
+		float channel = clut_1d.Sample(textureSampler, float2(u, 0.5)).g;
+		textureColor.g = lerp(textureColor.g, channel, clut_amount);
+	}
+
+	if (textureColor.b >= domain_min.b && textureColor.b <= domain_max.b) {
+		float u = textureColor.b * clut_scale.b + clut_offset.b;
+		float channel = clut_1d.Sample(textureSampler, float2(u, 0.5)).b;
+		textureColor.b = lerp(textureColor.b, channel, clut_amount);
+	}
+
+	return textureColor;
+}
+
+float4 LUT3D(VertDataOut v_in) : TARGET
+{
+	float4 textureColor = image.Sample(textureSampler, v_in.uv);
+	float r = textureColor.r;
+	float g = textureColor.g;
+	float b = textureColor.b;
+	if (r >= domain_min.r && r <= domain_max.r &&
+		g >= domain_min.g && g <= domain_max.g &&
+		b >= domain_min.b && b <= domain_max.b)
+	{
+		float3 clut_pos = textureColor.rgb * clut_scale + clut_offset;
+		float3 floor_pos = floor(clut_pos);
+
+		float3 fracRGB = clut_pos - floor_pos;
+
+		float3 uvw0 = (floor_pos + 0.5) * cube_width_i;
+		float3 uvw3 = (floor_pos + 1.5) * cube_width_i;
 
-	float3 final_color = lerp(textureColor.rgb, luttedColor, clut_amount);
-	return float4(final_color.rgb, textureColor.a);
+		float fracL, fracM, fracS;
+		float3 uvw1, uvw2;
+		if (fracRGB.r < fracRGB.g) {
+			if (fracRGB.r < fracRGB.b) {
+				if (fracRGB.g < fracRGB.b) {
+					// f(R) < f(G) < f(B)
+					fracL = fracRGB.b;
+					fracM = fracRGB.g;
+					fracS = fracRGB.r;
+					uvw1 = float3(uvw0.x, uvw0.y, uvw3.z);
+					uvw2 = float3(uvw0.x, uvw3.y, uvw3.z);
+				} else {
+					// f(R) < f(B) <= f(G)
+					fracL = fracRGB.g;
+					fracM = fracRGB.b;
+					fracS = fracRGB.r;
+					uvw1 = float3(uvw0.x, uvw3.y, uvw0.z);
+					uvw2 = float3(uvw0.x, uvw3.y, uvw3.z);
+				}
+			} else {
+				// f(B) <= f(R) < f(G)
+				fracL = fracRGB.g;
+				fracM = fracRGB.r;
+				fracS = fracRGB.b;
+				uvw1 = float3(uvw0.x, uvw3.y, uvw0.z);
+				uvw2 = float3(uvw3.x, uvw3.y, uvw0.z);
+			}
+		} else if (fracRGB.r < fracRGB.b) {
+			// f(G) <= f(R) < f(B)
+			fracL = fracRGB.b;
+			fracM = fracRGB.r;
+			fracS = fracRGB.g;
+			uvw1 = float3(uvw0.x, uvw0.y, uvw3.z);
+			uvw2 = float3(uvw3.x, uvw0.y, uvw3.z);
+		} else if (fracRGB.g < fracRGB.b) {
+			// f(G) < f(B) <= f(R)
+			fracL = fracRGB.r;
+			fracM = fracRGB.b;
+			fracS = fracRGB.g;
+			uvw1 = float3(uvw3.x, uvw0.y, uvw0.z);
+			uvw2 = float3(uvw3.x, uvw0.y, uvw3.z);
+		} else {
+			// f(B) <= f(G) <= f(R)
+			fracL = fracRGB.r;
+			fracM = fracRGB.g;
+			fracS = fracRGB.b;
+			uvw1 = float3(uvw3.x, uvw0.y, uvw0.z);
+			uvw2 = float3(uvw3.x, uvw3.y, uvw0.z);
+		}
+
+		/* use filtering to collapse 4 taps to 2 */
+		/* use max to kill potential zero-divide NaN */
+
+		float coeff01 = (1.0 - fracM);
+		float weight01 = max((fracL - fracM) / coeff01, 0.0);
+		float3 uvw01 = lerp(uvw0, uvw1, weight01);
+		float3 sample01 = clut_3d.Sample(textureSampler, uvw01).rgb;
+
+		float coeff23 = fracM;
+		float weight23 = max(fracS / coeff23, 0.0);
+		float3 uvw23 = lerp(uvw2, uvw3, weight23);
+		float3 sample23 = clut_3d.Sample(textureSampler, uvw23).rgb;
+
+		float3 luttedColor = (coeff01 * sample01) + (coeff23 * sample23);
+		textureColor.rgb = lerp(textureColor.rgb, luttedColor, clut_amount);
+	}
+
+	return textureColor;
+}
+
+technique Draw1D
+{
+	pass
+	{
+		vertex_shader = VSDefault(v_in);
+		pixel_shader  = LUT1D(v_in);
+	}
 }
 
-technique Draw
+technique Draw3D
 {
 	pass
 	{
 		vertex_shader = VSDefault(v_in);
-		pixel_shader  = LUT(v_in);
+		pixel_shader  = LUT3D(v_in);
 	}
 }

obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/de-DE.ini Changed

@@ -1,7 +1,7 @@
 ColorFilter="Farbkorrektur"
 ColorGradeFilter="LUT anwenden"
-MaskFilter="Bildmaske/‐Vermischung"
-AsyncDelayFilter="Videoverzögerung (Asynchron)"
+MaskFilter="Bildmaske/‐vermischung"
+AsyncDelayFilter="Videoverzögerung (asynchron)"
 CropFilter="Zuschneiden/Pad"
 ScrollFilter="Bewegung"
 ChromaKeyFilter="Chroma Key"
@@ -12,9 +12,9 @@
 GPUDelayFilter="Renderverzögerung"
 UndistortCenter="Bildmitte bei Skalierung von Ultraweitwinkel entzerren"
 NoiseGate="Noise Gate"
-NoiseSuppress="Noise Suppression"
+NoiseSuppress="Rauschunterdrückung"
 InvertPolarity="Audiopolarität umkehren"
-Gain="Gain"
+Gain="Verstärkung"
 DelayMs="Verzögerung"
 Type="Art"
 MaskBlendType.MaskColor="Alphamaske (Farbkanal)"
@@ -57,7 +57,7 @@
 NoiseGate.AttackTime="Attack‐Zeit"
 NoiseGate.HoldTime="Hold‐Zeit"
 NoiseGate.ReleaseTime="Release‐Zeit"
-Gain.GainDB="Gain"
+Gain.GainDB="Verstärkung"
 StretchImage="Bild strecken (Bildseitenverhältnis verwerfen)"
 Resolution="Auflösung"
 Base.Canvas="Basis‐(Leinwand‐)Auflösung"
@@ -67,8 +67,11 @@
 ScaleFiltering.Bilinear="Bilinear"
 ScaleFiltering.Bicubic="Bicubic"
 ScaleFiltering.Lanczos="Lanczos"
-ScaleFiltering.Area="Bereich"
+ScaleFiltering.Area="Area"
 NoiseSuppress.SuppressLevel="Unterdrückungspegel"
+NoiseSuppress.Method="Methode"
+NoiseSuppress.Method.Speex="Speex (niedrigere CPU‐Auslastung)"
+NoiseSuppress.Method.RNNoise="RNNoise (höhere Qualität)"
 Saturation="Sättigung"
 HueShift="Farbtonverschiebung"
 Amount="Betrag"
@@ -77,7 +80,7 @@
 Compressor.Threshold="Schwellwert"
 Compressor.AttackTime="Attack"
 Compressor.ReleaseTime="Release"
-Compressor.OutputGain="Ausgabe‐Gain"
+Compressor.OutputGain="Ausgabeverstärkung"
 Compressor.SidechainSource="Sidechain‐/Ducking‐Quelle"
 Limiter="Limiter"
 Limiter.Threshold="Schwellwert"
@@ -87,7 +90,7 @@
 Expander.Threshold="Schwellwert"
 Expander.AttackTime="Attack"
 Expander.ReleaseTime="Release"
-Expander.OutputGain="Ausgabe‐Gain"
+Expander.OutputGain="Ausgabeverstärkung"
 Expander.Detector="Erkennung"
 Expander.RMS="RMS"
 Expander.Peak="Peak"

obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/en-GB.ini Added

@@ -0,0 +1,106 @@
+ColorFilter="Colour Correction"
+ColorGradeFilter="Apply LUT"
+MaskFilter="Image Mask/Blend"
+AsyncDelayFilter="Video Delay (Async)"
+CropFilter="Crop/Pad"
+ScrollFilter="Scroll"
+ChromaKeyFilter="Chroma Key"
+ColorKeyFilter="Colour Key"
+SharpnessFilter="Sharpen"
+Sharpness="Sharpness"
+ScaleFilter="Scaling/Aspect Ratio"
+GPUDelayFilter="Render Delay"
+UndistortCenter="Undistort centre of image when scaling from ultrawide"
+NoiseGate="Noise Gate"
+NoiseSuppress="Noise Suppression"
+InvertPolarity="Invert Polarity"
+Gain="Gain"
+DelayMs="Delay"
+Type="Type"
+MaskBlendType.MaskColor="Alpha Mask (Colour Channel)"
+MaskBlendType.MaskAlpha="Alpha Mask (Alpha Channel)"
+MaskBlendType.BlendMultiply="Blend (Multiply)"
+MaskBlendType.BlendAddition="Blend (Addition)"
+MaskBlendType.BlendSubtraction="Blend (Subtraction)"
+Path="Path"
+Color="Colour"
+Opacity="Opacity"
+Contrast="Contrast"
+Brightness="Brightness"
+Gamma="Gamma"
+BrowsePath.Images="All Image Files"
+BrowsePath.AllFiles="All Files"
+KeyColorType="Key Colour Type"
+KeyColor="Key Colour"
+Similarity="Similarity (1-1000)"
+Smoothness="Smoothness (1-1000)"
+ColorSpillReduction="Key Colour Spill Reduction (1-1000)"
+Crop.Left="Left"
+Crop.Right="Right"
+Crop.Top="Top"
+Crop.Bottom="Bottom"
+Crop.Width="Width"
+Crop.Height="Height"
+Crop.Relative="Relative"
+ScrollFilter.SpeedX="Horizontal Speed"
+ScrollFilter.SpeedY="Vertical Speed"
+ScrollFilter.LimitWidth="Limit Width"
+ScrollFilter.LimitHeight="Limit Height"
+ScrollFilter.Loop="Loop"
+CustomColor="Custom Colour"
+Red="Red"
+Green="Green"
+Blue="Blue"
+Magenta="Magenta"
+NoiseGate.OpenThreshold="Open Threshold"
+NoiseGate.CloseThreshold="Close Threshold"
+NoiseGate.AttackTime="Attack Time"
+NoiseGate.HoldTime="Hold Time"
+NoiseGate.ReleaseTime="Release Time"
+Gain.GainDB="Gain"
+StretchImage="Stretch Image (discard image aspect ratio)"
+Resolution="Resolution"
+Base.Canvas="Base (Canvas) Resolution"
+None="None"
+ScaleFiltering="Scale Filtering"
+ScaleFiltering.Point="Point"
+ScaleFiltering.Bilinear="Bilinear"
+ScaleFiltering.Bicubic="Bicubic"
+ScaleFiltering.Lanczos="Lanczos"
+ScaleFiltering.Area="Area"
+NoiseSuppress.SuppressLevel="Suppression Level"
+NoiseSuppress.Method="Method"
+NoiseSuppress.Method.Speex="Speex (lower CPU usage)"
+NoiseSuppress.Method.RNNoise="RNNoise (higher quality)"
+Saturation="Saturation"
+HueShift="Hue Shift"
+Amount="Amount"
+Compressor="Compressor"
+Compressor.Ratio="Ratio"
+Compressor.Threshold="Threshold"
+Compressor.AttackTime="Attack"
+Compressor.ReleaseTime="Release"
+Compressor.OutputGain="Output Gain"
+Compressor.SidechainSource="Sidechain/Ducking Source"
+Limiter="Limiter"
+Limiter.Threshold="Threshold"
+Limiter.ReleaseTime="Release"
+Expander="Expander"
+Expander.Ratio="Ratio"
+Expander.Threshold="Threshold"
+Expander.AttackTime="Attack"
+Expander.ReleaseTime="Release"
+Expander.OutputGain="Output Gain"
+Expander.Detector="Detection"
+Expander.RMS="RMS"
+Expander.Peak="Peak"
+Expander.None="None"
+Expander.Presets="Presets"
+Expander.Presets.Expander="Expander"
+Expander.Presets.Gate="Gate"
+LumaKeyFilter="Luma Key"
+Luma.LumaMax="Luma Max"
+Luma.LumaMin="Luma Min"
+Luma.LumaMaxSmooth="Luma Max Smooth"
+Luma.LumaMinSmooth="Luma Min Smooth"
+

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/gl-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/he-IL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/id-ID.ini Added

@@ -0,0 +1,106 @@
+ColorFilter="Koreksi Warna"
+ColorGradeFilter="Terapkan LUT"
+MaskFilter="Image Mask/Blend"
+AsyncDelayFilter="Delay Video (Async)"
+CropFilter="Potong/Posisi"
+ScrollFilter="Gulir"
+ChromaKeyFilter="Chroma Key"
+ColorKeyFilter="Color Key"
+SharpnessFilter="Pertajam"
+Sharpness="Ketajaman"
+ScaleFilter="Scaling/Rasio Aspek"
+GPUDelayFilter="Delay Rendering"
+UndistortCenter="Undistort pusat gambar saat scaling dari ultrawide"
+NoiseGate="Noise Gate"
+NoiseSuppress="Reduksi Gangguan Suara"
+InvertPolarity="Balik Polaritas"
+Gain="Gain"
+DelayMs="Delay"
+Type="Jenis"
+MaskBlendType.MaskColor="Alpha Mask (Color Channel)"
+MaskBlendType.MaskAlpha="Alpha Mask (Alpha Channel)"
+MaskBlendType.BlendMultiply="Blend (Multiply)"
+MaskBlendType.BlendAddition="Blend (Tambahan)"
+MaskBlendType.BlendSubtraction="Blend (Pengurangan)"
+Path="Lokasi"
+Color="Warna"
+Opacity="Opasitas"
+Contrast="Kontras"
+Brightness="Kecerahan"
+Gamma="Gamma"
+BrowsePath.Images="Semua File Gambar"
+BrowsePath.AllFiles="Semua File"
+KeyColorType="Jenis Warna Kunci"
+KeyColor="Warna Kunci"
+Similarity="Kesamaan (1-1000)"
+Smoothness="Kehalusan (1-1000)"
+ColorSpillReduction="Pengurangan Tumpahan Warna Kunci (1-1000)"
+Crop.Left="Kiri"
+Crop.Right="Kanan"
+Crop.Top="Atas"
+Crop.Bottom="Bawah"
+Crop.Width="Lebar"
+Crop.Height="Tinggi"
+Crop.Relative="Relatif"
+ScrollFilter.SpeedX="Kecepatan Horizontal"
+ScrollFilter.SpeedY="Kecepatan Vertikal"
+ScrollFilter.LimitWidth="Batas Lebar"
+ScrollFilter.LimitHeight="Batas Tinggi"
+ScrollFilter.Loop="Loop"
+CustomColor="Warna kustom"
+Red="Merah"
+Green="Hijau"
+Blue="Biru"
+Magenta="Magenta"
+NoiseGate.OpenThreshold="Ambang Batas Buka"
+NoiseGate.CloseThreshold="Ambang Batas Tutup"
+NoiseGate.AttackTime="Lama Attack"
+NoiseGate.HoldTime="Lama Hold"
+NoiseGate.ReleaseTime="Lama Release"
+Gain.GainDB="Gain"
+StretchImage="Regangkan Gambar (abaikan rasio aspek gambar)"
+Resolution="Resolusi"
+Base.Canvas="Resolusi Dasar (Kanvas)"
+None="Tidak ada"
+ScaleFiltering="Skala Filter"
+ScaleFiltering.Point="Titik"
+ScaleFiltering.Bilinear="Bilinear"
+ScaleFiltering.Bicubic="Bikubik"
+ScaleFiltering.Lanczos="Lanczos"
+ScaleFiltering.Area="Area"
+NoiseSuppress.SuppressLevel="Level Tekanan"
+NoiseSuppress.Method="Metode"
+NoiseSuppress.Method.Speex="Speex (penggunaan CPU lebih rendah)"
+NoiseSuppress.Method.RNNoise="RNNoise (kualitas lebih tinggi)"
+Saturation="Saturasi"
+HueShift="Hue Shift"
+Amount="Nominal"
+Compressor="Kompresor"
+Compressor.Ratio="Rasio"
+Compressor.Threshold="Batas"
+Compressor.AttackTime="Attack"
+Compressor.ReleaseTime="Release"
+Compressor.OutputGain="Gain Output"
+Compressor.SidechainSource="Sumber Sidechain/Ducking"
+Limiter="Limiter"
+Limiter.Threshold="Batas"
+Limiter.ReleaseTime="Lepas"
+Expander="Peluas"
+Expander.Ratio="Rasio"
+Expander.Threshold="Batas"
+Expander.AttackTime="Attack"
+Expander.ReleaseTime="Release"
+Expander.OutputGain="Gain Output"
+Expander.Detector="Deteksi"
+Expander.RMS="RMS"
+Expander.Peak="Peak"
+Expander.None="Tidak ada"
+Expander.Presets="Preset"
+Expander.Presets.Expander="Peluas"
+Expander.Presets.Gate="Gerbang"
+LumaKeyFilter="Kunci Luma"
+Luma.LumaMax="Luma Maks"
+Luma.LumaMin="Luma Min"
+Luma.LumaMaxSmooth="Penghalusan Luma Maks"
+Luma.LumaMinSmooth="Penghalusan Luma Min"
+

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ro-RO.ini Changed

@@ -1,12 +1,18 @@
 ColorFilter="Corecție de culoare"
+ColorGradeFilter="Aplică LUT"
 MaskFilter="Mască/amestec de imagine"
 AsyncDelayFilter="Întârziere video (asincron)"
+CropFilter="Trunchiere/Spațiere"
 ScrollFilter="Derulare"
 ChromaKeyFilter="Cheie chroma"
 ColorKeyFilter="Culoare cheie"
 SharpnessFilter="Accentuare"
+Sharpness="Claritate"
 ScaleFilter="Raport de scalare/aspect"
+GPUDelayFilter="Întârziere la randare"
+UndistortCenter="Nu distorsiona centrul imaginii atunci când scalezi de la ultrawide"
 NoiseGate="Poartă de zgomot"
+NoiseSuppress="Suprimare de zgomot"
 InvertPolarity="Inversează polaritatea"
 Gain="Amplificare"
 DelayMs="Întârziere"
@@ -40,6 +46,7 @@
 ScrollFilter.SpeedY="Viteză verticală"
 ScrollFilter.LimitWidth="Limitează lățimea"
 ScrollFilter.LimitHeight="Limitează înălțimea"
+ScrollFilter.Loop="Mișcare în buclă"
 CustomColor="Culoare personalizată"
 Red="Roșu"
 Green="Verde"
@@ -61,23 +68,39 @@
 ScaleFiltering.Bicubic="Bicubică"
 ScaleFiltering.Lanczos="Lanczos"
 ScaleFiltering.Area="Zonă"
+NoiseSuppress.SuppressLevel="Nivelul suprimării"
+NoiseSuppress.Method="Metodă"
+NoiseSuppress.Method.Speex="Speex (utilizare CPU mai mică)"
+NoiseSuppress.Method.RNNoise="RNNoise (calitate mai înaltă)"
 Saturation="Saturație"
+HueShift="Decalarea nuanței"
+Amount="Cantitate"
 Compressor="Compresor"
 Compressor.Ratio="Raport"
 Compressor.Threshold="Prag"
 Compressor.AttackTime="Atacare"
 Compressor.ReleaseTime="Eliberare"
-Compressor.OutputGain="Amplificare pentru ieșire"
+Compressor.OutputGain="Amplificare pentru output"
+Compressor.SidechainSource="Sursă pentru sidechain/ducking"
 Limiter="Limitor"
 Limiter.Threshold="Prag"
 Limiter.ReleaseTime="Eliberare"
+Expander="Expandor"
 Expander.Ratio="Raport"
 Expander.Threshold="Prag"
-Expander.OutputGain="Amplificare pentru ieșire"
+Expander.AttackTime="Atacare"
+Expander.ReleaseTime="Eliberare"
+Expander.OutputGain="Amplificare pentru output"
 Expander.Detector="Detectare"
 Expander.RMS="RMS"
-Expander.Peak="Valoare de vârf"
+Expander.Peak="Vârf"
 Expander.None="Niciuna"
 Expander.Presets="Presetări"
 Expander.Presets.Expander="Expandor"
+Expander.Presets.Gate="Poartă"
+LumaKeyFilter="Luma Key"
+Luma.LumaMax="Luma Max"
+Luma.LumaMin="Luma Min"
+Luma.LumaMaxSmooth="Luma Max Fin"
+Luma.LumaMinSmooth="Luma Min Fin"

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/sr-SP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/sv-SE.ini Changed

@@ -1,6 +1,6 @@
 ColorFilter="Färgkorrigering"
 ColorGradeFilter="Tillämpa LUT"
-MaskFilter="Bild Mask/Blandning"
+MaskFilter="Bildmask/-blandning"
 AsyncDelayFilter="Videofördröjning (Async)"
 CropFilter="Beskär/Fyll ut"
 ScrollFilter="Scrollning"
@@ -30,15 +30,15 @@
 Gamma="Gamma"
 BrowsePath.Images="Alla bildfiler"
 BrowsePath.AllFiles="Alla filer"
-KeyColorType="Huvudfärg typ"
-KeyColor="Huvudfärg"
+KeyColorType="Nyckelfärgtyp"
+KeyColor="Nyckelfärg"
 Similarity="Likhet (1-1000)"
 Smoothness="Jämnhet (1-1000)"
-ColorSpillReduction="Huvudfärgspillminskning (1-1000)"
-Crop.Left="Vänster"
-Crop.Right="Höger"
-Crop.Top="Överst"
-Crop.Bottom="Botten"
+ColorSpillReduction="Spillminskning av nyckelfärg (1-1000)"
+Crop.Left="Vänsterkant"
+Crop.Right="Högerkant"
+Crop.Top="Överkant"
+Crop.Bottom="Nederkant"
 Crop.Width="Bredd"
 Crop.Height="Höjd"
 Crop.Relative="Relativ"
@@ -69,6 +69,9 @@
 ScaleFiltering.Lanczos="Lanczos"
 ScaleFiltering.Area="Område"
 NoiseSuppress.SuppressLevel="Brusreduceringsnivå"
+NoiseSuppress.Method="Metod"
+NoiseSuppress.Method.Speex="Speex (lägre processoranvändning)"
+NoiseSuppress.Method.RNNoise="RNNoise (högre kvalitet)"
 Saturation="Mättnad"
 HueShift="Nyansväxling"
 Amount="Mängd"

obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/uk-UA.ini Changed

@@ -1,19 +1,19 @@
-ColorFilter="Коригування кольору"
-ColorGradeFilter="Таблиці підстановки кольору"
-MaskFilter="Маска до зображення"
+ColorFilter="Корекція кольору"
+ColorGradeFilter="Застосувати LUT"
+MaskFilter="Маска зображення/змішування"
 AsyncDelayFilter="Затримка відео (асинхронна)"
 CropFilter="Кадрування"
-ScrollFilter="Фільтр прокрутки"
-ChromaKeyFilter="Зелений екран"
+ScrollFilter="Прокрутка"
+ChromaKeyFilter="Хромакей"
 ColorKeyFilter="Фільтрування за кольором"
 SharpnessFilter="Різкість"
 Sharpness="Різкість"
 ScaleFilter="Масштабування/пропорції"
 GPUDelayFilter="Затримка візуалізації"
-UndistortCenter="Зменшити викривлення у центрі, якщо масштабувати з надширокоформатного"
+UndistortCenter="Зменшити викривлення у центрі, якщо масштабувати з формату Ultrawide"
 NoiseGate="Пороговий шумопонижувач"
 NoiseSuppress="Подавлення шуму"
-InvertPolarity="Інверсія сигналу"
+InvertPolarity="Інвертувати полярність"
 Gain="Підсилення"
 DelayMs="Затримка"
 Type="Тип"
@@ -27,11 +27,11 @@
 Opacity="Непрозорість"
 Contrast="Контрастність"
 Brightness="Яскравість"
-Gamma="Гамма-корекція"
-BrowsePath.Images="Файли зображень"
-BrowsePath.AllFiles="Всі файли"
-KeyColorType="Вид кольору для фільтрування"
-KeyColor="Колір що фільтрується"
+Gamma="Гамма"
+BrowsePath.Images="Усі файли зображень"
+BrowsePath.AllFiles="Усі файли"
+KeyColorType="Тип ключового кольору"
+KeyColor="Ключовий колір"
 Similarity="Подібність (1-1000)"
 Smoothness="Плавність (1-1000)"
 ColorSpillReduction="Зменшення проникнення кольору (1-1000)"
@@ -47,7 +47,7 @@
 ScrollFilter.LimitWidth="Обмежити ширину"
 ScrollFilter.LimitHeight="Обмежити висоту"
 ScrollFilter.Loop="Циклічно відтворювати"
-CustomColor="Колір за користувачем"
+CustomColor="Власний колір"
 Red="Червоний"
 Green="Зелений"
 Blue="Синій"
@@ -59,8 +59,8 @@
 NoiseGate.ReleaseTime="Тривалість спаду сигналу"
 Gain.GainDB="Підсилення"
 StretchImage="Розтягнути зображення (ігнорувати пропорції зображення)"
-Resolution="Новий розмір"
-Base.Canvas="Роздільна здатність (Полотно)"
+Resolution="Роздільність"
+Base.Canvas="Основна роздільна здатність (полотно)"
 None="Не вказано"
 ScaleFiltering="Фільтр масштабування"
 ScaleFiltering.Point="Ступінчастий"
@@ -69,6 +69,9 @@
 ScaleFiltering.Lanczos="Ланцош"
 ScaleFiltering.Area="Усереднення площ"
 NoiseSuppress.SuppressLevel="Рівень подавлення"
+NoiseSuppress.Method="Метод"
+NoiseSuppress.Method.Speex="Speex (менше використання ЦП)"
+NoiseSuppress.Method.RNNoise="RNNoise (вища якість)"
 Saturation="Насиченість"
 HueShift="Відтінок"
 Amount="Обсяг впливу"
@@ -78,7 +81,7 @@
 Compressor.AttackTime="Атака"
 Compressor.ReleaseTime="Затухання"
 Compressor.OutputGain="Підсилення виводу"
-Compressor.SidechainSource="Джерело Коригування/Приглушення"
+Compressor.SidechainSource="Джерело Sidechain-компресії/приглушення"
 Limiter="Обмежувач амплітуди"
 Limiter.Threshold="Поріг"
 Limiter.ReleaseTime="Затухання"
@@ -98,6 +101,6 @@
 LumaKeyFilter="Фільтр яскравості"
 Luma.LumaMax="Максимум яскравості"
 Luma.LumaMin="Мінімум яскравості"
-Luma.LumaMaxSmooth="Максимум яскравості припуск"
-Luma.LumaMinSmooth="Мінімум яскравості припуск"
+Luma.LumaMaxSmooth="Згладжування макс. яскравості"
+Luma.LumaMinSmooth="Згладжування мін. яскравості"

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/gpu-delay.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/gpu-delay.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/noise-suppress-filter.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/noise-suppress-filter.c Changed

@@ -3,7 +3,18 @@
 
 #include <util/circlebuf.h>
 #include <obs-module.h>
+
+#ifdef LIBSPEEXDSP_ENABLED
 #include <speex/speex_preprocess.h>
+#endif
+
+#ifdef LIBRNNOISE_ENABLED
+#ifdef _MSC_VER
+#define ssize_t intptr_t
+#endif
+#include <rnnoise.h>
+#include <media-io/audio-resampler.h>
+#endif
 
 /* -------------------------------------------------------- */
 
@@ -23,12 +34,25 @@
 /* -------------------------------------------------------- */
 
 #define S_SUPPRESS_LEVEL "suppress_level"
+#define S_METHOD "method"
+#define S_METHOD_SPEEX "speex"
+#define S_METHOD_RNN "rnnoise"
 
 #define MT_ obs_module_text
 #define TEXT_SUPPRESS_LEVEL MT_("NoiseSuppress.SuppressLevel")
+#define TEXT_METHOD MT_("NoiseSuppress.Method")
+#define TEXT_METHOD_SPEEX MT_("NoiseSuppress.Method.Speex")
+#define TEXT_METHOD_RNN MT_("NoiseSuppress.Method.RNNoise")
 
 #define MAX_PREPROC_CHANNELS 8
 
+/* RNNoise constants, these can't be changed */
+#define RNNOISE_SAMPLE_RATE 48000
+#define RNNOISE_FRAME_SIZE 480
+
+/* If the following constant changes, RNNoise breaks */
+#define BUFFER_SIZE_MSEC 10
+
 /* -------------------------------------------------------- */
 
 struct noise_suppress_data {
@@ -36,6 +60,7 @@
 	int suppress_level;
 
 	uint64_t last_timestamp;
+	uint64_t latency;
 
 	size_t frames;
 	size_t channels;
@@ -44,12 +69,30 @@
 	struct circlebuf input_buffers[MAX_PREPROC_CHANNELS];
 	struct circlebuf output_buffers[MAX_PREPROC_CHANNELS];
 
+	bool use_rnnoise;
+
+#ifdef LIBSPEEXDSP_ENABLED
 	/* Speex preprocessor state */
-	SpeexPreprocessState *states[MAX_PREPROC_CHANNELS];
+	SpeexPreprocessState *spx_states[MAX_PREPROC_CHANNELS];
+#endif
+
+#ifdef LIBRNNOISE_ENABLED
+	/* RNNoise state */
+	DenoiseState *rnn_states[MAX_PREPROC_CHANNELS];
 
-	/* 16 bit PCM buffers */
+	/* Resampler */
+	audio_resampler_t *rnn_resampler;
+	audio_resampler_t *rnn_resampler_back;
+#endif
+
+	/* PCM buffers */
 	float *copy_buffers[MAX_PREPROC_CHANNELS];
-	spx_int16_t *segment_buffers[MAX_PREPROC_CHANNELS];
+#ifdef LIBSPEEXDSP_ENABLED
+	spx_int16_t *spx_segment_buffers[MAX_PREPROC_CHANNELS];
+#endif
+#ifdef LIBRNNOISE_ENABLED
+	float *rnn_segment_buffers[MAX_PREPROC_CHANNELS];
+#endif
 
 	/* output data */
 	struct obs_audio_data output_audio;
@@ -77,12 +120,28 @@
 	struct noise_suppress_data *ng = data;
 
 	for (size_t i = 0; i < ng->channels; i++) {
-		speex_preprocess_state_destroy(ng->states[i]);
+#ifdef LIBSPEEXDSP_ENABLED
+		speex_preprocess_state_destroy(ng->spx_states[i]);
+#endif
+#ifdef LIBRNNOISE_ENABLED
+		rnnoise_destroy(ng->rnn_states[i]);
+#endif
 		circlebuf_free(&ng->input_buffers[i]);
 		circlebuf_free(&ng->output_buffers[i]);
 	}
 
-	bfree(ng->segment_buffers[0]);
+#ifdef LIBSPEEXDSP_ENABLED
+	bfree(ng->spx_segment_buffers[0]);
+#endif
+#ifdef LIBRNNOISE_ENABLED
+	bfree(ng->rnn_segment_buffers[0]);
+
+	if (ng->rnn_resampler) {
+		audio_resampler_destroy(ng->rnn_resampler);
+		audio_resampler_destroy(ng->rnn_resampler_back);
+	}
+#endif
+
 	bfree(ng->copy_buffers[0]);
 	circlebuf_free(&ng->info_buffer);
 	da_free(ng->output_data);
@@ -93,42 +152,111 @@
 				 uint32_t sample_rate, size_t channel,
 				 size_t frames)
 {
-	ng->states[channel] =
+#ifdef LIBSPEEXDSP_ENABLED
+	ng->spx_states[channel] =
 		speex_preprocess_state_init((int)frames, sample_rate);
-
+#endif
+#ifdef LIBRNNOISE_ENABLED
+	ng->rnn_states[channel] = rnnoise_create(NULL);
+#endif
 	circlebuf_reserve(&ng->input_buffers[channel], frames * sizeof(float));
 	circlebuf_reserve(&ng->output_buffers[channel], frames * sizeof(float));
 }
 
+static inline enum speaker_layout convert_speaker_layout(uint8_t channels)
+{
+	switch (channels) {
+	case 0:
+		return SPEAKERS_UNKNOWN;
+	case 1:
+		return SPEAKERS_MONO;
+	case 2:
+		return SPEAKERS_STEREO;
+	case 3:
+		return SPEAKERS_2POINT1;
+	case 4:
+		return SPEAKERS_4POINT0;
+	case 5:
+		return SPEAKERS_4POINT1;
+	case 6:
+		return SPEAKERS_5POINT1;
+	case 8:
+		return SPEAKERS_7POINT1;
+	default:
+		return SPEAKERS_UNKNOWN;
+	}
+}
+
 static void noise_suppress_update(void *data, obs_data_t *s)
 {
 	struct noise_suppress_data *ng = data;
 
 	uint32_t sample_rate = audio_output_get_sample_rate(obs_get_audio());
 	size_t channels = audio_output_get_channels(obs_get_audio());
-	size_t frames = (size_t)sample_rate / 100;
+	size_t frames = (size_t)sample_rate / (1000 / BUFFER_SIZE_MSEC);
+	const char *method = obs_data_get_string(s, S_METHOD);
 
 	ng->suppress_level = (int)obs_data_get_int(s, S_SUPPRESS_LEVEL);
+	ng->latency = 1000000000LL / (1000 / BUFFER_SIZE_MSEC);
+	ng->use_rnnoise = strcmp(method, S_METHOD_RNN) == 0;
 
 	/* Process 10 millisecond segments to keep latency low */
+	/* Also RNNoise only supports buffers of this exact size. */
 	ng->frames = frames;
 	ng->channels = channels;
 
 	/* Ignore if already allocated */
-	if (ng->states[0])
+#if defined(LIBSPEEXDSP_ENABLED)
+	if (ng->spx_states[0])
+		return;
+#else
+	if (ng->rnn_states[0])
 		return;
+#endif
 
-	/* One speex state for each channel (limit 2) */
+	/* One speex/rnnoise state for each channel (limit 2) */
 	ng->copy_buffers[0] = bmalloc(frames * channels * sizeof(float));
-	ng->segment_buffers[0] =
+#ifdef LIBSPEEXDSP_ENABLED
+	ng->spx_segment_buffers[0] =
 		bmalloc(frames * channels * sizeof(spx_int16_t));
+#endif
+#ifdef LIBRNNOISE_ENABLED
+	ng->rnn_segment_buffers[0] =
+		bmalloc(RNNOISE_FRAME_SIZE * channels * sizeof(float));
+#endif
 	for (size_t c = 1; c < channels; ++c) {
 		ng->copy_buffers[c] = ng->copy_buffers[c - 1] + frames;
-		ng->segment_buffers[c] = ng->segment_buffers[c - 1] + frames;
+#ifdef LIBSPEEXDSP_ENABLED
+		ng->spx_segment_buffers[c] =
+			ng->spx_segment_buffers[c - 1] + frames;
+#endif
+#ifdef LIBRNNOISE_ENABLED
+		ng->rnn_segment_buffers[c] =
+			ng->rnn_segment_buffers[c - 1] + RNNOISE_FRAME_SIZE;
+#endif
 	}
 
 	for (size_t i = 0; i < channels; i++)
 		alloc_channel(ng, sample_rate, i, frames);
+
+#ifdef LIBRNNOISE_ENABLED
+	if (sample_rate == RNNOISE_SAMPLE_RATE) {
+		ng->rnn_resampler = NULL;
+		ng->rnn_resampler_back = NULL;
+	} else {
+		struct resample_info src, dst;
+		src.samples_per_sec = sample_rate;
+		src.format = AUDIO_FORMAT_FLOAT_PLANAR;
+		src.speakers = convert_speaker_layout((uint8_t)channels);
+
+		dst.samples_per_sec = RNNOISE_SAMPLE_RATE;
+		dst.format = AUDIO_FORMAT_FLOAT_PLANAR;
+		dst.speakers = convert_speaker_layout((uint8_t)channels);
+
+		ng->rnn_resampler = audio_resampler_create(&dst, &src);
+		ng->rnn_resampler_back = audio_resampler_create(&src, &dst);
+	}
+#endif
 }
 
 static void *noise_suppress_create(obs_data_t *settings, obs_source_t *filter)
@@ -141,16 +269,12 @@
 	return ng;
 }
 
-static inline void process(struct noise_suppress_data *ng)
+static inline void process_speexdsp(struct noise_suppress_data *ng)
 {
-	/* Pop from input circlebuf */
-	for (size_t i = 0; i < ng->channels; i++)
-		circlebuf_pop_front(&ng->input_buffers[i], ng->copy_buffers[i],
-				    ng->frames * sizeof(float));
-
+#ifdef LIBSPEEXDSP_ENABLED
 	/* Set args */
 	for (size_t i = 0; i < ng->channels; i++)
-		speex_preprocess_ctl(ng->states[i],
+		speex_preprocess_ctl(ng->spx_states[i],
 				     SPEEX_PREPROCESS_SET_NOISE_SUPPRESS,
 				     &ng->suppress_level);
 
@@ -162,19 +286,113 @@
 				s = 1.0f;
 			else if (s < -1.0f)
 				s = -1.0f;
-			ng->segment_buffers[i][j] =
+			ng->spx_segment_buffers[i][j] =
 				(spx_int16_t)(s * c_32_to_16);
 		}
 
 	/* Execute */
 	for (size_t i = 0; i < ng->channels; i++)
-		speex_preprocess_run(ng->states[i], ng->segment_buffers[i]);
+		speex_preprocess_run(ng->spx_states[i],
+				     ng->spx_segment_buffers[i]);
 
 	/* Convert back to 32bit */
 	for (size_t i = 0; i < ng->channels; i++)
 		for (size_t j = 0; j < ng->frames; j++)
 			ng->copy_buffers[i][j] =
-				(float)ng->segment_buffers[i][j] / c_16_to_32;
+				(float)ng->spx_segment_buffers[i][j] /
+				c_16_to_32;
+#endif
+}
+
+static inline void process_rnnoise(struct noise_suppress_data *ng)
+{
+#ifdef LIBRNNOISE_ENABLED
+	/* Adjust signal level to what RNNoise expects, resample if necessary */
+	if (ng->rnn_resampler) {
+		float *output[MAX_PREPROC_CHANNELS];
+		uint32_t out_frames;
+		uint64_t ts_offset;
+		audio_resampler_resample(ng->rnn_resampler, (uint8_t **)output,
+					 &out_frames, &ts_offset,
+					 (const uint8_t **)ng->copy_buffers,
+					 (uint32_t)ng->frames);
+
+		for (size_t i = 0; i < ng->channels; i++) {
+			for (ssize_t j = 0, k = (ssize_t)out_frames -
+						RNNOISE_FRAME_SIZE;
+			     j < RNNOISE_FRAME_SIZE; ++j, ++k) {
+				if (k >= 0) {
+					ng->rnn_segment_buffers[i][j] =
+						output[i][k] * 32768.0f;
+				} else {
+					ng->rnn_segment_buffers[i][j] = 0;
+				}
+			}
+		}
+	} else {
+		for (size_t i = 0; i < ng->channels; i++) {
+			for (size_t j = 0; j < RNNOISE_FRAME_SIZE; ++j) {
+				ng->rnn_segment_buffers[i][j] =
+					ng->copy_buffers[i][j] * 32768.0f;
+			}
+		}
+	}
+
+	/* Execute */
+	for (size_t i = 0; i < ng->channels; i++) {
+		rnnoise_process_frame(ng->rnn_states[i],
+				      ng->rnn_segment_buffers[i],
+				      ng->rnn_segment_buffers[i]);
+	}
+
+	/* Revert signal level adjustment, resample back if necessary */
+	if (ng->rnn_resampler) {
+		float *output[MAX_PREPROC_CHANNELS];
+		uint32_t out_frames;
+		uint64_t ts_offset;
+		audio_resampler_resample(
+			ng->rnn_resampler_back, (uint8_t **)output, &out_frames,
+			&ts_offset, (const uint8_t **)ng->rnn_segment_buffers,
+			RNNOISE_FRAME_SIZE);
+
+		for (size_t i = 0; i < ng->channels; i++) {
+			for (ssize_t j = 0,
+				     k = (ssize_t)out_frames - ng->frames;
+			     j < (ssize_t)ng->frames; ++j, ++k) {
+				if (k >= 0) {
+					ng->copy_buffers[i][j] =
+						output[i][k] / 32768.0f;
+				} else {
+					ng->copy_buffers[i][j] = 0;
+				}
+			}
+		}
+	} else {
+		for (size_t i = 0; i < ng->channels; i++) {
+			for (size_t j = 0; j < RNNOISE_FRAME_SIZE; ++j) {
+				ng->copy_buffers[i][j] =
+					ng->rnn_segment_buffers[i][j] /
+					32768.0f;
+			}
+		}
+	}
+#else
+	UNUSED_PARAMETER(ng);
+#endif
+}
+
+static inline void process(struct noise_suppress_data *ng)
+{
+	/* Pop from input circlebuf */
+	for (size_t i = 0; i < ng->channels; i++)
+		circlebuf_pop_front(&ng->input_buffers[i], ng->copy_buffers[i],
+				    ng->frames * sizeof(float));
+
+	if (ng->use_rnnoise) {
+		process_rnnoise(ng);
+	} else {
+		process_speexdsp(ng);
+	}
 
 	/* Push to output circlebuf */
 	for (size_t i = 0; i < ng->channels; i++)
@@ -210,8 +428,13 @@
 	size_t segment_size = ng->frames * sizeof(float);
 	size_t out_size;
 
-	if (!ng->states[0])
+#ifdef LIBSPEEXDSP_ENABLED
+	if (!ng->spx_states[0])
+		return audio;
+#else
+	if (!ng->rnn_states[0])
 		return audio;
+#endif
 
 	/* -----------------------------------------------
 	 * if timestamp has dramatically changed, consider it a new stream of
@@ -269,24 +492,66 @@
 	}
 
 	ng->output_audio.frames = info.frames;
-	ng->output_audio.timestamp = info.timestamp;
+	ng->output_audio.timestamp = info.timestamp - ng->latency;
 	return &ng->output_audio;
 }
 
-static void noise_suppress_defaults(obs_data_t *s)
+static bool noise_suppress_method_modified(obs_properties_t *props,
+					   obs_property_t *property,
+					   obs_data_t *settings)
+{
+	obs_property_t *p_suppress_level =
+		obs_properties_get(props, S_SUPPRESS_LEVEL);
+	const char *method = obs_data_get_string(settings, S_METHOD);
+	bool enable_level = strcmp(method, S_METHOD_SPEEX) == 0;
+
+	obs_property_set_visible(p_suppress_level, enable_level);
+
+	UNUSED_PARAMETER(property);
+	return true;
+}
+
+static void noise_suppress_defaults_v1(obs_data_t *s)
 {
 	obs_data_set_default_int(s, S_SUPPRESS_LEVEL, -30);
+#if defined(LIBRNNOISE_ENABLED) && !defined(LIBSPEEXDSP_ENABLED)
+	obs_data_set_default_string(s, S_METHOD, S_METHOD_RNN);
+#else
+	obs_data_set_default_string(s, S_METHOD, S_METHOD_SPEEX);
+#endif
+}
+
+static void noise_suppress_defaults_v2(obs_data_t *s)
+{
+	obs_data_set_default_int(s, S_SUPPRESS_LEVEL, -30);
+#if defined(LIBRNNOISE_ENABLED)
+	obs_data_set_default_string(s, S_METHOD, S_METHOD_RNN);
+#else
+	obs_data_set_default_string(s, S_METHOD, S_METHOD_SPEEX);
+#endif
 }
 
 static obs_properties_t *noise_suppress_properties(void *data)
 {
 	obs_properties_t *ppts = obs_properties_create();
 
-	obs_property_t *p = obs_properties_add_int_slider(ppts,
-							  S_SUPPRESS_LEVEL,
-							  TEXT_SUPPRESS_LEVEL,
-							  SUP_MIN, SUP_MAX, 1);
-	obs_property_int_set_suffix(p, " dB");
+#if defined(LIBRNNOISE_ENABLED) && defined(LIBSPEEXDSP_ENABLED)
+	obs_property_t *method = obs_properties_add_list(
+		ppts, S_METHOD, TEXT_METHOD, OBS_COMBO_TYPE_LIST,
+		OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(method, TEXT_METHOD_SPEEX, S_METHOD_SPEEX);
+	obs_property_list_add_string(method, TEXT_METHOD_RNN, S_METHOD_RNN);
+
+	obs_property_set_modified_callback(method,
+					   noise_suppress_method_modified);
+#endif
+
+#ifdef LIBSPEEXDSP_ENABLED
+	obs_property_t *speex_slider = obs_properties_add_int_slider(
+		ppts, S_SUPPRESS_LEVEL, TEXT_SUPPRESS_LEVEL, SUP_MIN, SUP_MAX,
+		1);
+	obs_property_int_set_suffix(speex_slider, " dB");
+#endif
 
 	UNUSED_PARAMETER(data);
 	return ppts;
@@ -295,12 +560,26 @@
 struct obs_source_info noise_suppress_filter = {
 	.id = "noise_suppress_filter",
 	.type = OBS_SOURCE_TYPE_FILTER,
+	.output_flags = OBS_SOURCE_AUDIO | OBS_SOURCE_CAP_OBSOLETE,
+	.get_name = noise_suppress_name,
+	.create = noise_suppress_create,
+	.destroy = noise_suppress_destroy,
+	.update = noise_suppress_update,
+	.filter_audio = noise_suppress_filter_audio,
+	.get_defaults = noise_suppress_defaults_v1,
+	.get_properties = noise_suppress_properties,
+};
+
+struct obs_source_info noise_suppress_filter_v2 = {
+	.id = "noise_suppress_filter",
+	.version = 2,
+	.type = OBS_SOURCE_TYPE_FILTER,
 	.output_flags = OBS_SOURCE_AUDIO,
 	.get_name = noise_suppress_name,
 	.create = noise_suppress_create,
 	.destroy = noise_suppress_destroy,
 	.update = noise_suppress_update,
 	.filter_audio = noise_suppress_filter_audio,
-	.get_defaults = noise_suppress_defaults,
+	.get_defaults = noise_suppress_defaults_v2,
 	.get_properties = noise_suppress_properties,
 };

obs-studio-25.0.8.tar.xz/plugins/obs-filters/obs-filters-config.h.in -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/obs-filters-config.h.in Changed

obs-studio-25.0.8.tar.xz/plugins/obs-filters/obs-filters.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/obs-filters.c Changed

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/.clang-format Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/AUTHORS Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/COPYING Added

@@ -0,0 +1,31 @@
+Copyright (c) 2017, Mozilla
+Copyright (c) 2007-2017, Jean-Marc Valin
+Copyright (c) 2005-2017, Xiph.Org Foundation
+Copyright (c) 2003-2004, Mark Borgerding
+
+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 the Xiph.Org Foundation 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 FOUNDATION
+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-26.0.0.tar.xz/plugins/obs-filters/rnnoise/README Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/include Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/include/rnnoise.h Added

@@ -0,0 +1,71 @@
+/* Copyright (c) 2018 Gregor Richards
+ * Copyright (c) 2017 Mozilla */
+/*
+   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.
+
+   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 FOUNDATION 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.
+*/
+
+#ifndef RNNOISE_H
+#define RNNOISE_H 1
+
+#include <stdio.h>
+
+#ifndef RNNOISE_EXPORT
+# if defined(WIN32)
+#  if defined(RNNOISE_BUILD) && defined(DLL_EXPORT)
+#   define RNNOISE_EXPORT __declspec(dllexport)
+#  else
+#   define RNNOISE_EXPORT
+#  endif
+# elif defined(__GNUC__) && defined(RNNOISE_BUILD)
+#  define RNNOISE_EXPORT __attribute__ ((visibility ("default")))
+# else
+#  define RNNOISE_EXPORT
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct DenoiseState DenoiseState;
+typedef struct RNNModel RNNModel;
+
+RNNOISE_EXPORT int rnnoise_get_size();
+
+RNNOISE_EXPORT int rnnoise_init(DenoiseState *st, RNNModel *model);
+
+RNNOISE_EXPORT DenoiseState *rnnoise_create(RNNModel *model);
+
+RNNOISE_EXPORT void rnnoise_destroy(DenoiseState *st);
+
+RNNOISE_EXPORT float rnnoise_process_frame(DenoiseState *st, float *out, const float *in);
+
+RNNOISE_EXPORT RNNModel *rnnoise_model_from_file(FILE *f);
+
+RNNOISE_EXPORT void rnnoise_model_free(RNNModel *model);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/_kiss_fft_guts.h Added

@@ -0,0 +1,182 @@
+/*Copyright (c) 2003-2004, Mark Borgerding
+
+  All rights reserved.
+
+  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.
+
+  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.*/
+
+#ifndef KISS_FFT_GUTS_H
+#define KISS_FFT_GUTS_H
+
+#define MIN(a,b) ((a)<(b) ? (a):(b))
+#define MAX(a,b) ((a)>(b) ? (a):(b))
+
+/* kiss_fft.h
+   defines kiss_fft_scalar as either short or a float type
+   and defines
+   typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
+#include "kiss_fft.h"
+
+/*
+  Explanation of macros dealing with complex math:
+
+   C_MUL(m,a,b)         : m = a*b
+   C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
+   C_SUB( res, a,b)     : res = a - b
+   C_SUBFROM( res , a)  : res -= a
+   C_ADDTO( res , a)    : res += a
+ * */
+#ifdef FIXED_POINT
+#include "arch.h"
+
+
+#define SAMP_MAX 2147483647
+#define TWID_MAX 32767
+#define TRIG_UPSCALE 1
+
+#define SAMP_MIN -SAMP_MAX
+
+
+#   define S_MUL(a,b) MULT16_32_Q15(b, a)
+
+#   define C_MUL(m,a,b) \
+      do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
+          (m).i = ADD32_ovflw(S_MUL((a).r,(b).i) , S_MUL((a).i,(b).r)); }while(0)
+
+#   define C_MULC(m,a,b) \
+      do{ (m).r = ADD32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
+          (m).i = SUB32_ovflw(S_MUL((a).i,(b).r) , S_MUL((a).r,(b).i)); }while(0)
+
+#   define C_MULBYSCALAR( c, s ) \
+      do{ (c).r =  S_MUL( (c).r , s ) ;\
+          (c).i =  S_MUL( (c).i , s ) ; }while(0)
+
+#   define DIVSCALAR(x,k) \
+        (x) = S_MUL(  x, (TWID_MAX-((k)>>1))/(k)+1 )
+
+#   define C_FIXDIV(c,div) \
+        do {    DIVSCALAR( (c).r , div);  \
+                DIVSCALAR( (c).i  , div); }while (0)
+
+#define  C_ADD( res, a,b)\
+    do {(res).r=ADD32_ovflw((a).r,(b).r);  (res).i=ADD32_ovflw((a).i,(b).i); \
+    }while(0)
+#define  C_SUB( res, a,b)\
+    do {(res).r=SUB32_ovflw((a).r,(b).r);  (res).i=SUB32_ovflw((a).i,(b).i); \
+    }while(0)
+#define C_ADDTO( res , a)\
+    do {(res).r = ADD32_ovflw((res).r, (a).r);  (res).i = ADD32_ovflw((res).i,(a).i);\
+    }while(0)
+
+#define C_SUBFROM( res , a)\
+    do {(res).r = ADD32_ovflw((res).r,(a).r);  (res).i = SUB32_ovflw((res).i,(a).i); \
+    }while(0)
+
+#if defined(OPUS_ARM_INLINE_ASM)
+#include "arm/kiss_fft_armv4.h"
+#endif
+
+#if defined(OPUS_ARM_INLINE_EDSP)
+#include "arm/kiss_fft_armv5e.h"
+#endif
+#if defined(MIPSr1_ASM)
+#include "mips/kiss_fft_mipsr1.h"
+#endif
+
+#else  /* not FIXED_POINT*/
+
+#   define S_MUL(a,b) ( (a)*(b) )
+#define C_MUL(m,a,b) \
+    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
+        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
+#define C_MULC(m,a,b) \
+    do{ (m).r = (a).r*(b).r + (a).i*(b).i;\
+        (m).i = (a).i*(b).r - (a).r*(b).i; }while(0)
+
+#define C_MUL4(m,a,b) C_MUL(m,a,b)
+
+#   define C_FIXDIV(c,div) /* NOOP */
+#   define C_MULBYSCALAR( c, s ) \
+    do{ (c).r *= (s);\
+        (c).i *= (s); }while(0)
+#endif
+
+#ifndef CHECK_OVERFLOW_OP
+#  define CHECK_OVERFLOW_OP(a,op,b) /* noop */
+#endif
+
+#ifndef C_ADD
+#define  C_ADD( res, a,b)\
+    do { \
+            CHECK_OVERFLOW_OP((a).r,+,(b).r)\
+            CHECK_OVERFLOW_OP((a).i,+,(b).i)\
+            (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i; \
+    }while(0)
+#define  C_SUB( res, a,b)\
+    do { \
+            CHECK_OVERFLOW_OP((a).r,-,(b).r)\
+            CHECK_OVERFLOW_OP((a).i,-,(b).i)\
+            (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i; \
+    }while(0)
+#define C_ADDTO( res , a)\
+    do { \
+            CHECK_OVERFLOW_OP((res).r,+,(a).r)\
+            CHECK_OVERFLOW_OP((res).i,+,(a).i)\
+            (res).r += (a).r;  (res).i += (a).i;\
+    }while(0)
+
+#define C_SUBFROM( res , a)\
+    do {\
+            CHECK_OVERFLOW_OP((res).r,-,(a).r)\
+            CHECK_OVERFLOW_OP((res).i,-,(a).i)\
+            (res).r -= (a).r;  (res).i -= (a).i; \
+    }while(0)
+#endif /* C_ADD defined */
+
+#ifdef FIXED_POINT
+/*#  define KISS_FFT_COS(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * cos (phase))))
+#  define KISS_FFT_SIN(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * sin (phase))))*/
+#  define KISS_FFT_COS(phase)  floor(.5+TWID_MAX*cos (phase))
+#  define KISS_FFT_SIN(phase)  floor(.5+TWID_MAX*sin (phase))
+#  define HALF_OF(x) ((x)>>1)
+#elif defined(USE_SIMD)
+#  define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )
+#  define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
+#  define HALF_OF(x) ((x)*_mm_set1_ps(.5f))
+#else
+#  define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
+#  define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
+#  define HALF_OF(x) ((x)*.5f)
+#endif
+
+#define  kf_cexp(x,phase) \
+        do{ \
+                (x)->r = KISS_FFT_COS(phase);\
+                (x)->i = KISS_FFT_SIN(phase);\
+        }while(0)
+
+#define  kf_cexp2(x,phase) \
+   do{ \
+      (x)->r = TRIG_UPSCALE*celt_cos_norm((phase));\
+      (x)->i = TRIG_UPSCALE*celt_cos_norm((phase)-32768);\
+}while(0)
+
+#endif /* KISS_FFT_GUTS_H */

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/arch.h Added

@@ -0,0 +1,261 @@
+/* Copyright (c) 2003-2008 Jean-Marc Valin
+   Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/**
+   @file arch.h
+   @brief Various architecture definitions for CELT
+*/
+/*
+   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.
+
+   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.
+*/
+
+#ifndef ARCH_H
+#define ARCH_H
+
+#include "opus_types.h"
+#include "common.h"
+
+# if !defined(__GNUC_PREREQ)
+#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
+#   define __GNUC_PREREQ(_maj,_min) \
+ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
+#  else
+#   define __GNUC_PREREQ(_maj,_min) 0
+#  endif
+# endif
+
+#define CELT_SIG_SCALE 32768.f
+
+#define celt_fatal(str) _celt_fatal(str, __FILE__, __LINE__);
+#ifdef ENABLE_ASSERTIONS
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __GNUC__
+__attribute__((noreturn))
+#endif
+static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line)
+{
+   fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
+   abort();
+}
+#define celt_assert(cond) {if (!(cond)) {celt_fatal("assertion failed: " #cond);}}
+#define celt_assert2(cond, message) {if (!(cond)) {celt_fatal("assertion failed: " #cond "\n" message);}}
+#else
+#define celt_assert(cond)
+#define celt_assert2(cond, message)
+#endif
+
+#define IMUL32(a,b) ((a)*(b))
+
+#define MIN16(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 16-bit value.   */
+#define MAX16(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 16-bit value.   */
+#define MIN32(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 32-bit value.   */
+#define MAX32(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 32-bit value.   */
+#define IMIN(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum int value.   */
+#define IMAX(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum int value.   */
+#define UADD32(a,b) ((a)+(b))
+#define USUB32(a,b) ((a)-(b))
+
+/* Set this if opus_int64 is a native type of the CPU. */
+/* Assume that all LP64 architectures have fast 64-bit types; also x86_64
+   (which can be ILP32 for x32) and Win64 (which is LLP64). */
+#if defined(__x86_64__) || defined(__LP64__) || defined(_WIN64)
+#define OPUS_FAST_INT64 1
+#else
+#define OPUS_FAST_INT64 0
+#endif
+
+#define PRINT_MIPS(file)
+
+#ifdef FIXED_POINT
+
+typedef opus_int16 opus_val16;
+typedef opus_int32 opus_val32;
+typedef opus_int64 opus_val64;
+
+typedef opus_val32 celt_sig;
+typedef opus_val16 celt_norm;
+typedef opus_val32 celt_ener;
+
+#define Q15ONE 32767
+
+#define SIG_SHIFT 12
+/* Safe saturation value for 32-bit signals. Should be less than
+   2^31*(1-0.85) to avoid blowing up on DC at deemphasis.*/
+#define SIG_SAT (300000000)
+
+#define NORM_SCALING 16384
+
+#define DB_SHIFT 10
+
+#define EPSILON 1
+#define VERY_SMALL 0
+#define VERY_LARGE16 ((opus_val16)32767)
+#define Q15_ONE ((opus_val16)32767)
+
+#define SCALEIN(a)      (a)
+#define SCALEOUT(a)     (a)
+
+#define ABS16(x) ((x) < 0 ? (-(x)) : (x))
+#define ABS32(x) ((x) < 0 ? (-(x)) : (x))
+
+static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
+   return x > 32767 ? 32767 : x < -32768 ? -32768 : (opus_int16)x;
+}
+
+#ifdef FIXED_DEBUG
+#include "fixed_debug.h"
+#else
+
+#include "fixed_generic.h"
+
+#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR
+#include "arm/fixed_arm64.h"
+#elif OPUS_ARM_INLINE_EDSP
+#include "arm/fixed_armv5e.h"
+#elif defined (OPUS_ARM_INLINE_ASM)
+#include "arm/fixed_armv4.h"
+#elif defined (BFIN_ASM)
+#include "fixed_bfin.h"
+#elif defined (TI_C5X_ASM)
+#include "fixed_c5x.h"
+#elif defined (TI_C6X_ASM)
+#include "fixed_c6x.h"
+#endif
+
+#endif
+
+#else /* FIXED_POINT */
+
+typedef float opus_val16;
+typedef float opus_val32;
+typedef float opus_val64;
+
+typedef float celt_sig;
+typedef float celt_norm;
+typedef float celt_ener;
+
+#ifdef FLOAT_APPROX
+/* This code should reliably detect NaN/inf even when -ffast-math is used.
+   Assumes IEEE 754 format. */
+static OPUS_INLINE int celt_isnan(float x)
+{
+   union {float f; opus_uint32 i;} in;
+   in.f = x;
+   return ((in.i>>23)&0xFF)==0xFF && (in.i&0x007FFFFF)!=0;
+}
+#else
+#ifdef __FAST_MATH__
+#error Cannot build libopus with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
+#endif
+#define celt_isnan(x) ((x)!=(x))
+#endif
+
+#define Q15ONE 1.0f
+
+#define NORM_SCALING 1.f
+
+#define EPSILON 1e-15f
+#define VERY_SMALL 1e-30f
+#define VERY_LARGE16 1e15f
+#define Q15_ONE ((opus_val16)1.f)
+
+/* This appears to be the same speed as C99's fabsf() but it's more portable. */
+#define ABS16(x) ((float)fabs(x))
+#define ABS32(x) ((float)fabs(x))
+
+#define QCONST16(x,bits) (x)
+#define QCONST32(x,bits) (x)
+
+#define NEG16(x) (-(x))
+#define NEG32(x) (-(x))
+#define NEG32_ovflw(x) (-(x))
+#define EXTRACT16(x) (x)
+#define EXTEND32(x) (x)
+#define SHR16(a,shift) (a)
+#define SHL16(a,shift) (a)
+#define SHR32(a,shift) (a)
+#define SHL32(a,shift) (a)
+#define PSHR32(a,shift) (a)
+#define VSHR32(a,shift) (a)
+
+#define PSHR(a,shift)   (a)
+#define SHR(a,shift)    (a)
+#define SHL(a,shift)    (a)
+#define SATURATE(x,a)   (x)
+#define SATURATE16(x)   (x)
+
+#define ROUND16(a,shift)  (a)
+#define SROUND16(a,shift) (a)
+#define HALF16(x)       (.5f*(x))
+#define HALF32(x)       (.5f*(x))
+
+#define ADD16(a,b) ((a)+(b))
+#define SUB16(a,b) ((a)-(b))
+#define ADD32(a,b) ((a)+(b))
+#define SUB32(a,b) ((a)-(b))
+#define ADD32_ovflw(a,b) ((a)+(b))
+#define SUB32_ovflw(a,b) ((a)-(b))
+#define MULT16_16_16(a,b)     ((a)*(b))
+#define MULT16_16(a,b)     ((opus_val32)(a)*(opus_val32)(b))
+#define MAC16_16(c,a,b)     ((c)+(opus_val32)(a)*(opus_val32)(b))
+
+#define MULT16_32_Q15(a,b)     ((a)*(b))
+#define MULT16_32_Q16(a,b)     ((a)*(b))
+
+#define MULT32_32_Q31(a,b)     ((a)*(b))
+
+#define MAC16_32_Q15(c,a,b)     ((c)+(a)*(b))
+#define MAC16_32_Q16(c,a,b)     ((c)+(a)*(b))
+
+#define MULT16_16_Q11_32(a,b)     ((a)*(b))
+#define MULT16_16_Q11(a,b)     ((a)*(b))
+#define MULT16_16_Q13(a,b)     ((a)*(b))
+#define MULT16_16_Q14(a,b)     ((a)*(b))
+#define MULT16_16_Q15(a,b)     ((a)*(b))
+#define MULT16_16_P15(a,b)     ((a)*(b))
+#define MULT16_16_P13(a,b)     ((a)*(b))
+#define MULT16_16_P14(a,b)     ((a)*(b))
+#define MULT16_32_P16(a,b)     ((a)*(b))
+
+#define DIV32_16(a,b)     (((opus_val32)(a))/(opus_val16)(b))
+#define DIV32(a,b)     (((opus_val32)(a))/(opus_val32)(b))
+
+#define SCALEIN(a)      ((a)*CELT_SIG_SCALE)
+#define SCALEOUT(a)     ((a)*(1/CELT_SIG_SCALE))
+
+#define SIG2WORD16(x) (x)
+
+#endif /* !FIXED_POINT */
+
+#ifndef GLOBAL_STACK_SIZE
+#ifdef FIXED_POINT
+#define GLOBAL_STACK_SIZE 120000
+#else
+#define GLOBAL_STACK_SIZE 120000
+#endif
+#endif
+
+#endif /* ARCH_H */

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/celt_lpc.c Added

@@ -0,0 +1,282 @@
+/* Copyright (c) 2009-2010 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   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.
+
+   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.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "celt_lpc.h"
+#include "arch.h"
+#include "common.h"
+#include "pitch.h"
+
+void _celt_lpc(
+      opus_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
+const opus_val32 *ac,  /* in:  [0...p] autocorrelation values  */
+int          p
+)
+{
+   int i, j;
+   opus_val32 r;
+   opus_val32 error = ac[0];
+#ifdef FIXED_POINT
+   opus_val32 lpc[LPC_ORDER];
+#else
+   float *lpc = _lpc;
+#endif
+
+   RNN_CLEAR(lpc, p);
+   if (ac[0] != 0)
+   {
+      for (i = 0; i < p; i++) {
+         /* Sum up this iteration's reflection coefficient */
+         opus_val32 rr = 0;
+         for (j = 0; j < i; j++)
+            rr += MULT32_32_Q31(lpc[j],ac[i - j]);
+         rr += SHR32(ac[i + 1],3);
+         r = -SHL32(rr,3)/error;
+         /*  Update LPC coefficients and total error */
+         lpc[i] = SHR32(r,3);
+         for (j = 0; j < (i+1)>>1; j++)
+         {
+            opus_val32 tmp1, tmp2;
+            tmp1 = lpc[j];
+            tmp2 = lpc[i-1-j];
+            lpc[j]     = tmp1 + MULT32_32_Q31(r,tmp2);
+            lpc[i-1-j] = tmp2 + MULT32_32_Q31(r,tmp1);
+         }
+
+         error = error - MULT32_32_Q31(MULT32_32_Q31(r,r),error);
+         /* Bail out once we get 30 dB gain */
+#ifdef FIXED_POINT
+         if (error<SHR32(ac[0],10))
+            break;
+#else
+         if (error<.001f*ac[0])
+            break;
+#endif
+      }
+   }
+#ifdef FIXED_POINT
+   for (i=0;i<p;i++)
+      _lpc[i] = ROUND16(lpc[i],16);
+#endif
+}
+
+
+void celt_fir(
+         const opus_val16 *x,
+         const opus_val16 *num,
+         opus_val16 *y,
+         int N,
+         int ord)
+{
+   int i,j;
+   opus_val16 *rnum = malloc(sizeof(opus_val16) * ord);
+   for(i=0;i<ord;i++)
+      rnum[i] = num[ord-i-1];
+   for (i=0;i<N-3;i+=4)
+   {
+      opus_val32 sum[4];
+      sum[0] = SHL32(EXTEND32(x[i  ]), SIG_SHIFT);
+      sum[1] = SHL32(EXTEND32(x[i+1]), SIG_SHIFT);
+      sum[2] = SHL32(EXTEND32(x[i+2]), SIG_SHIFT);
+      sum[3] = SHL32(EXTEND32(x[i+3]), SIG_SHIFT);
+      xcorr_kernel(rnum, x+i-ord, sum, ord);
+      y[i  ] = ROUND16(sum[0], SIG_SHIFT);
+      y[i+1] = ROUND16(sum[1], SIG_SHIFT);
+      y[i+2] = ROUND16(sum[2], SIG_SHIFT);
+      y[i+3] = ROUND16(sum[3], SIG_SHIFT);
+   }
+   for (;i<N;i++)
+   {
+      opus_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+      for (j=0;j<ord;j++)
+         sum = MAC16_16(sum,rnum[j],x[i+j-ord]);
+      y[i] = ROUND16(sum, SIG_SHIFT);
+   }
+   free(rnum);
+}
+
+void celt_iir(const opus_val32 *_x,
+         const opus_val16 *den,
+         opus_val32 *_y,
+         int N,
+         int ord,
+         opus_val16 *mem)
+{
+#ifdef SMALL_FOOTPRINT
+   int i,j;
+   for (i=0;i<N;i++)
+   {
+      opus_val32 sum = _x[i];
+      for (j=0;j<ord;j++)
+      {
+         sum -= MULT16_16(den[j],mem[j]);
+      }
+      for (j=ord-1;j>=1;j--)
+      {
+         mem[j]=mem[j-1];
+      }
+      mem[0] = SROUND16(sum, SIG_SHIFT);
+      _y[i] = sum;
+   }
+#else
+   int i,j;
+   celt_assert((ord&3)==0);
+   opus_val16 *rden = malloc(sizeof(opus_val16) * ord);
+   opus_val16 *y = malloc(sizeof(opus_val16) * (N + ord));
+   for(i=0;i<ord;i++)
+      rden[i] = den[ord-i-1];
+   for(i=0;i<ord;i++)
+      y[i] = -mem[ord-i-1];
+   for(;i<N+ord;i++)
+      y[i]=0;
+   for (i=0;i<N-3;i+=4)
+   {
+      /* Unroll by 4 as if it were an FIR filter */
+      opus_val32 sum[4];
+      sum[0]=_x[i];
+      sum[1]=_x[i+1];
+      sum[2]=_x[i+2];
+      sum[3]=_x[i+3];
+      xcorr_kernel(rden, y+i, sum, ord);
+
+      /* Patch up the result to compensate for the fact that this is an IIR */
+      y[i+ord  ] = -SROUND16(sum[0],SIG_SHIFT);
+      _y[i  ] = sum[0];
+      sum[1] = MAC16_16(sum[1], y[i+ord  ], den[0]);
+      y[i+ord+1] = -SROUND16(sum[1],SIG_SHIFT);
+      _y[i+1] = sum[1];
+      sum[2] = MAC16_16(sum[2], y[i+ord+1], den[0]);
+      sum[2] = MAC16_16(sum[2], y[i+ord  ], den[1]);
+      y[i+ord+2] = -SROUND16(sum[2],SIG_SHIFT);
+      _y[i+2] = sum[2];
+
+      sum[3] = MAC16_16(sum[3], y[i+ord+2], den[0]);
+      sum[3] = MAC16_16(sum[3], y[i+ord+1], den[1]);
+      sum[3] = MAC16_16(sum[3], y[i+ord  ], den[2]);
+      y[i+ord+3] = -SROUND16(sum[3],SIG_SHIFT);
+      _y[i+3] = sum[3];
+   }
+   for (;i<N;i++)
+   {
+      opus_val32 sum = _x[i];
+      for (j=0;j<ord;j++)
+         sum -= MULT16_16(rden[j],y[i+j]);
+      y[i+ord] = SROUND16(sum,SIG_SHIFT);
+      _y[i] = sum;
+   }
+   for(i=0;i<ord;i++)
+      mem[i] = _y[N-i-1];
+   free(rden);
+   free(y);
+#endif
+}
+
+int _celt_autocorr(
+                   const opus_val16 *x,   /*  in: [0...n-1] samples x   */
+                   opus_val32       *ac,  /* out: [0...lag-1] ac values */
+                   const opus_val16       *window,
+                   int          overlap,
+                   int          lag,
+                   int          n)
+{
+   opus_val32 d;
+   int i, k;
+   int fastN=n-lag;
+   int shift;
+   const opus_val16 *xptr;
+   opus_val16 *xx = malloc(sizeof(opus_val16) * n);
+   celt_assert(n>0);
+   celt_assert(overlap>=0);
+   if (overlap == 0)
+   {
+      xptr = x;
+   } else {
+      for (i=0;i<n;i++)
+         xx[i] = x[i];
+      for (i=0;i<overlap;i++)
+      {
+         xx[i] = MULT16_16_Q15(x[i],window[i]);
+         xx[n-i-1] = MULT16_16_Q15(x[n-i-1],window[i]);
+      }
+      xptr = xx;
+   }
+   shift=0;
+#ifdef FIXED_POINT
+   {
+      opus_val32 ac0;
+      ac0 = 1+(n<<7);
+      if (n&1) ac0 += SHR32(MULT16_16(xptr[0],xptr[0]),9);
+      for(i=(n&1);i<n;i+=2)
+      {
+         ac0 += SHR32(MULT16_16(xptr[i],xptr[i]),9);
+         ac0 += SHR32(MULT16_16(xptr[i+1],xptr[i+1]),9);
+      }
+
+      shift = celt_ilog2(ac0)-30+10;
+      shift = (shift)/2;
+      if (shift>0)
+      {
+         for(i=0;i<n;i++)
+            xx[i] = PSHR32(xptr[i], shift);
+         xptr = xx;
+      } else
+         shift = 0;
+   }
+#endif
+   celt_pitch_xcorr(xptr, xptr, ac, fastN, lag+1);
+   for (k=0;k<=lag;k++)
+   {
+      for (i = k+fastN, d = 0; i < n; i++)
+         d = MAC16_16(d, xptr[i], xptr[i-k]);
+      ac[k] += d;
+   }
+#ifdef FIXED_POINT
+   shift = 2*shift;
+   if (shift<=0)
+      ac[0] += SHL32((opus_int32)1, -shift);
+   if (ac[0] < 268435456)
+   {
+      int shift2 = 29 - EC_ILOG(ac[0]);
+      for (i=0;i<=lag;i++)
+         ac[i] = SHL32(ac[i], shift2);
+      shift -= shift2;
+   } else if (ac[0] >= 536870912)
+   {
+      int shift2=1;
+      if (ac[0] >= 1073741824)
+         shift2++;
+      for (i=0;i<=lag;i++)
+         ac[i] = SHR32(ac[i], shift2);
+      shift += shift2;
+   }
+#endif
+   free(xx);
+   return shift;
+}

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/celt_lpc.h Added

@@ -0,0 +1,59 @@
+/* Copyright (c) 2009-2010 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   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.
+
+   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.
+*/
+
+#ifndef PLC_H
+#define PLC_H
+
+#include "arch.h"
+#include "common.h"
+
+#if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#include "x86/celt_lpc_sse.h"
+#endif
+
+#define LPC_ORDER 24
+
+void _celt_lpc(opus_val16 *_lpc, const opus_val32 *ac, int p);
+
+void celt_fir(
+         const opus_val16 *x,
+         const opus_val16 *num,
+         opus_val16 *y,
+         int N,
+         int ord);
+
+void celt_iir(const opus_val32 *x,
+         const opus_val16 *den,
+         opus_val32 *y,
+         int N,
+         int ord,
+         opus_val16 *mem);
+
+int _celt_autocorr(const opus_val16 *x, opus_val32 *ac,
+         const opus_val16 *window, int overlap, int lag, int n);
+
+#endif /* PLC_H */

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/common.h Added

@@ -0,0 +1,48 @@
+
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#include "stdlib.h"
+#include "string.h"
+
+#define RNN_INLINE inline
+#define OPUS_INLINE inline
+
+
+/** RNNoise wrapper for malloc(). To do your own dynamic allocation, all you need t
+o do is replace this function and rnnoise_free */
+#ifndef OVERRIDE_RNNOISE_ALLOC
+static RNN_INLINE void *rnnoise_alloc (size_t size)
+{
+   return malloc(size);
+}
+#endif
+
+/** RNNoise wrapper for free(). To do your own dynamic allocation, all you need to do is replace this function and rnnoise_alloc */
+#ifndef OVERRIDE_RNNOISE_FREE
+static RNN_INLINE void rnnoise_free (void *ptr)
+{
+   free(ptr);
+}
+#endif
+
+/** Copy n elements from src to dst. The 0* term provides compile-time type checking  */
+#ifndef OVERRIDE_RNN_COPY
+#define RNN_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+#endif
+
+/** Copy n elements from src to dst, allowing overlapping regions. The 0* term
+    provides compile-time type checking */
+#ifndef OVERRIDE_RNN_MOVE
+#define RNN_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+#endif
+
+/** Set n elements of dst to zero */
+#ifndef OVERRIDE_RNN_CLEAR
+#define RNN_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
+#endif
+
+
+
+#endif

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/compile.sh Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/denoise.c Added

@@ -0,0 +1,644 @@
+/* Copyright (c) 2018 Gregor Richards
+ * Copyright (c) 2017 Mozilla */
+/*
+   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.
+
+   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 FOUNDATION 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.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define _USE_MATH_DEFINES
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "kiss_fft.h"
+#include "common.h"
+#include <math.h>
+#include "rnnoise.h"
+#include "pitch.h"
+#include "arch.h"
+#include "rnn.h"
+#include "rnn_data.h"
+
+#define FRAME_SIZE_SHIFT 2
+#define FRAME_SIZE (120<<FRAME_SIZE_SHIFT)
+#define WINDOW_SIZE (2*FRAME_SIZE)
+#define FREQ_SIZE (FRAME_SIZE + 1)
+
+#define PITCH_MIN_PERIOD 60
+#define PITCH_MAX_PERIOD 768
+#define PITCH_FRAME_SIZE 960
+#define PITCH_BUF_SIZE (PITCH_MAX_PERIOD+PITCH_FRAME_SIZE)
+
+#define SQUARE(x) ((x)*(x))
+
+#define NB_BANDS 22
+
+#define CEPS_MEM 8
+#define NB_DELTA_CEPS 6
+
+#define NB_FEATURES (NB_BANDS+3*NB_DELTA_CEPS+2)
+
+
+#ifndef TRAINING
+#define TRAINING 0
+#endif
+
+
+/* The built-in model, used if no file is given as input */
+extern const struct RNNModel rnnoise_model_orig;
+
+
+static const opus_int16 eband5ms[] = {
+/*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 20k*/
+  0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100
+};
+
+
+typedef struct {
+  int init;
+  kiss_fft_state *kfft;
+  float half_window[FRAME_SIZE];
+  float dct_table[NB_BANDS*NB_BANDS];
+} CommonState;
+
+struct DenoiseState {
+  float analysis_mem[FRAME_SIZE];
+  float cepstral_mem[CEPS_MEM][NB_BANDS];
+  int memid;
+  float synthesis_mem[FRAME_SIZE];
+  float pitch_buf[PITCH_BUF_SIZE];
+  float pitch_enh_buf[PITCH_BUF_SIZE];
+  float last_gain;
+  int last_period;
+  float mem_hp_x[2];
+  float lastg[NB_BANDS];
+  RNNState rnn;
+};
+
+void compute_band_energy(float *bandE, const kiss_fft_cpx *X) {
+  int i;
+  float sum[NB_BANDS] = {0};
+  for (i=0;i<NB_BANDS-1;i++)
+  {
+    int j;
+    int band_size;
+    band_size = (eband5ms[i+1]-eband5ms[i])<<FRAME_SIZE_SHIFT;
+    for (j=0;j<band_size;j++) {
+      float tmp;
+      float frac = (float)j/band_size;
+      tmp = SQUARE(X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].r);
+      tmp += SQUARE(X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].i);
+      sum[i] += (1-frac)*tmp;
+      sum[i+1] += frac*tmp;
+    }
+  }
+  sum[0] *= 2;
+  sum[NB_BANDS-1] *= 2;
+  for (i=0;i<NB_BANDS;i++)
+  {
+    bandE[i] = sum[i];
+  }
+}
+
+void compute_band_corr(float *bandE, const kiss_fft_cpx *X, const kiss_fft_cpx *P) {
+  int i;
+  float sum[NB_BANDS] = {0};
+  for (i=0;i<NB_BANDS-1;i++)
+  {
+    int j;
+    int band_size;
+    band_size = (eband5ms[i+1]-eband5ms[i])<<FRAME_SIZE_SHIFT;
+    for (j=0;j<band_size;j++) {
+      float tmp;
+      float frac = (float)j/band_size;
+      tmp = X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].r * P[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].r;
+      tmp += X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].i * P[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].i;
+      sum[i] += (1-frac)*tmp;
+      sum[i+1] += frac*tmp;
+    }
+  }
+  sum[0] *= 2;
+  sum[NB_BANDS-1] *= 2;
+  for (i=0;i<NB_BANDS;i++)
+  {
+    bandE[i] = sum[i];
+  }
+}
+
+void interp_band_gain(float *g, const float *bandE) {
+  int i;
+  memset(g, 0, FREQ_SIZE);
+  for (i=0;i<NB_BANDS-1;i++)
+  {
+    int j;
+    int band_size;
+    band_size = (eband5ms[i+1]-eband5ms[i])<<FRAME_SIZE_SHIFT;
+    for (j=0;j<band_size;j++) {
+      float frac = (float)j/band_size;
+      g[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j] = (1-frac)*bandE[i] + frac*bandE[i+1];
+    }
+  }
+}
+
+
+CommonState common;
+
+static void check_init() {
+  int i;
+  if (common.init) return;
+  common.kfft = opus_fft_alloc_twiddles(2*FRAME_SIZE, NULL, NULL, NULL, 0);
+  for (i=0;i<FRAME_SIZE;i++)
+    common.half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i+.5)/FRAME_SIZE) * sin(.5*M_PI*(i+.5)/FRAME_SIZE));
+  for (i=0;i<NB_BANDS;i++) {
+    int j;
+    for (j=0;j<NB_BANDS;j++) {
+      common.dct_table[i*NB_BANDS + j] = cos((i+.5)*j*M_PI/NB_BANDS);
+      if (j==0) common.dct_table[i*NB_BANDS + j] *= sqrt(.5);
+    }
+  }
+  common.init = 1;
+}
+
+static void dct(float *out, const float *in) {
+  int i;
+  check_init();
+  for (i=0;i<NB_BANDS;i++) {
+    int j;
+    float sum = 0;
+    for (j=0;j<NB_BANDS;j++) {
+      sum += in[j] * common.dct_table[j*NB_BANDS + i];
+    }
+    out[i] = sum*sqrt(2./22);
+  }
+}
+
+#if 0
+static void idct(float *out, const float *in) {
+  int i;
+  check_init();
+  for (i=0;i<NB_BANDS;i++) {
+    int j;
+    float sum = 0;
+    for (j=0;j<NB_BANDS;j++) {
+      sum += in[j] * common.dct_table[i*NB_BANDS + j];
+    }
+    out[i] = sum*sqrt(2./22);
+  }
+}
+#endif
+
+static void forward_transform(kiss_fft_cpx *out, const float *in) {
+  int i;
+  kiss_fft_cpx x[WINDOW_SIZE];
+  kiss_fft_cpx y[WINDOW_SIZE];
+  check_init();
+  for (i=0;i<WINDOW_SIZE;i++) {
+    x[i].r = in[i];
+    x[i].i = 0;
+  }
+  opus_fft(common.kfft, x, y, 0);
+  for (i=0;i<FREQ_SIZE;i++) {
+    out[i] = y[i];
+  }
+}
+
+static void inverse_transform(float *out, const kiss_fft_cpx *in) {
+  int i;
+  kiss_fft_cpx x[WINDOW_SIZE];
+  kiss_fft_cpx y[WINDOW_SIZE];
+  check_init();
+  for (i=0;i<FREQ_SIZE;i++) {
+    x[i] = in[i];
+  }
+  for (;i<WINDOW_SIZE;i++) {
+    x[i].r = x[WINDOW_SIZE - i].r;
+    x[i].i = -x[WINDOW_SIZE - i].i;
+  }
+  opus_fft(common.kfft, x, y, 0);
+  /* output in reverse order for IFFT. */
+  out[0] = WINDOW_SIZE*y[0].r;
+  for (i=1;i<WINDOW_SIZE;i++) {
+    out[i] = WINDOW_SIZE*y[WINDOW_SIZE - i].r;
+  }
+}
+
+static void apply_window(float *x) {
+  int i;
+  check_init();
+  for (i=0;i<FRAME_SIZE;i++) {
+    x[i] *= common.half_window[i];
+    x[WINDOW_SIZE - 1 - i] *= common.half_window[i];
+  }
+}
+
+int rnnoise_get_size() {
+  return sizeof(DenoiseState);
+}
+
+int rnnoise_init(DenoiseState *st, RNNModel *model) {
+  memset(st, 0, sizeof(*st));
+  if (model)
+    st->rnn.model = model;
+  else
+    st->rnn.model = &rnnoise_model_orig;
+  st->rnn.vad_gru_state = calloc(sizeof(float), st->rnn.model->vad_gru_size);
+  st->rnn.noise_gru_state = calloc(sizeof(float), st->rnn.model->noise_gru_size);
+  st->rnn.denoise_gru_state = calloc(sizeof(float), st->rnn.model->denoise_gru_size);
+  return 0;
+}
+
+DenoiseState *rnnoise_create(RNNModel *model) {
+  DenoiseState *st;
+  st = malloc(rnnoise_get_size());
+  rnnoise_init(st, model);
+  return st;
+}
+
+void rnnoise_destroy(DenoiseState *st) {
+  free(st->rnn.vad_gru_state);
+  free(st->rnn.noise_gru_state);
+  free(st->rnn.denoise_gru_state);
+  free(st);
+}
+
+#if TRAINING
+int lowpass = FREQ_SIZE;
+int band_lp = NB_BANDS;
+#endif
+
+static void frame_analysis(DenoiseState *st, kiss_fft_cpx *X, float *Ex, const float *in) {
+  int i;
+  float x[WINDOW_SIZE];
+  RNN_COPY(x, st->analysis_mem, FRAME_SIZE);
+  for (i=0;i<FRAME_SIZE;i++) x[FRAME_SIZE + i] = in[i];
+  RNN_COPY(st->analysis_mem, in, FRAME_SIZE);
+  apply_window(x);
+  forward_transform(X, x);
+#if TRAINING
+  for (i=lowpass;i<FREQ_SIZE;i++)
+    X[i].r = X[i].i = 0;
+#endif
+  compute_band_energy(Ex, X);
+}
+
+static int compute_frame_features(DenoiseState *st, kiss_fft_cpx *X, kiss_fft_cpx *P,
+                                  float *Ex, float *Ep, float *Exp, float *features, const float *in) {
+  int i;
+  float E = 0;
+  float *ceps_0, *ceps_1, *ceps_2;
+  float spec_variability = 0;
+  float Ly[NB_BANDS];
+  float p[WINDOW_SIZE];
+  float pitch_buf[PITCH_BUF_SIZE>>1];
+  int pitch_index;
+  float gain;
+  float *(pre[1]);
+  float tmp[NB_BANDS];
+  float follow, logMax;
+  frame_analysis(st, X, Ex, in);
+  RNN_MOVE(st->pitch_buf, &st->pitch_buf[FRAME_SIZE], PITCH_BUF_SIZE-FRAME_SIZE);
+  RNN_COPY(&st->pitch_buf[PITCH_BUF_SIZE-FRAME_SIZE], in, FRAME_SIZE);
+  pre[0] = &st->pitch_buf[0];
+  pitch_downsample(pre, pitch_buf, PITCH_BUF_SIZE, 1);
+  pitch_search(pitch_buf+(PITCH_MAX_PERIOD>>1), pitch_buf, PITCH_FRAME_SIZE,
+               PITCH_MAX_PERIOD-3*PITCH_MIN_PERIOD, &pitch_index);
+  pitch_index = PITCH_MAX_PERIOD-pitch_index;
+
+  gain = remove_doubling(pitch_buf, PITCH_MAX_PERIOD, PITCH_MIN_PERIOD,
+          PITCH_FRAME_SIZE, &pitch_index, st->last_period, st->last_gain);
+  st->last_period = pitch_index;
+  st->last_gain = gain;
+  for (i=0;i<WINDOW_SIZE;i++)
+    p[i] = st->pitch_buf[PITCH_BUF_SIZE-WINDOW_SIZE-pitch_index+i];
+  apply_window(p);
+  forward_transform(P, p);
+  compute_band_energy(Ep, P);
+  compute_band_corr(Exp, X, P);
+  for (i=0;i<NB_BANDS;i++) Exp[i] = Exp[i]/sqrt(.001+Ex[i]*Ep[i]);
+  dct(tmp, Exp);
+  for (i=0;i<NB_DELTA_CEPS;i++) features[NB_BANDS+2*NB_DELTA_CEPS+i] = tmp[i];
+  features[NB_BANDS+2*NB_DELTA_CEPS] -= 1.3;
+  features[NB_BANDS+2*NB_DELTA_CEPS+1] -= 0.9;
+  features[NB_BANDS+3*NB_DELTA_CEPS] = .01*(pitch_index-300);
+  logMax = -2;
+  follow = -2;
+  for (i=0;i<NB_BANDS;i++) {
+    Ly[i] = log10(1e-2+Ex[i]);
+    Ly[i] = MAX16(logMax-7, MAX16(follow-1.5, Ly[i]));
+    logMax = MAX16(logMax, Ly[i]);
+    follow = MAX16(follow-1.5, Ly[i]);
+    E += Ex[i];
+  }
+  if (!TRAINING && E < 0.04) {
+    /* If there's no audio, avoid messing up the state. */
+    RNN_CLEAR(features, NB_FEATURES);
+    return 1;
+  }
+  dct(features, Ly);
+  features[0] -= 12;
+  features[1] -= 4;
+  ceps_0 = st->cepstral_mem[st->memid];
+  ceps_1 = (st->memid < 1) ? st->cepstral_mem[CEPS_MEM+st->memid-1] : st->cepstral_mem[st->memid-1];
+  ceps_2 = (st->memid < 2) ? st->cepstral_mem[CEPS_MEM+st->memid-2] : st->cepstral_mem[st->memid-2];
+  for (i=0;i<NB_BANDS;i++) ceps_0[i] = features[i];
+  st->memid++;
+  for (i=0;i<NB_DELTA_CEPS;i++) {
+    features[i] = ceps_0[i] + ceps_1[i] + ceps_2[i];
+    features[NB_BANDS+i] = ceps_0[i] - ceps_2[i];
+    features[NB_BANDS+NB_DELTA_CEPS+i] =  ceps_0[i] - 2*ceps_1[i] + ceps_2[i];
+  }
+  /* Spectral variability features. */
+  if (st->memid == CEPS_MEM) st->memid = 0;
+  for (i=0;i<CEPS_MEM;i++)
+  {
+    int j;
+    float mindist = 1e15f;
+    for (j=0;j<CEPS_MEM;j++)
+    {
+      int k;
+      float dist=0;
+      for (k=0;k<NB_BANDS;k++)
+      {
+        float tmp;
+        tmp = st->cepstral_mem[i][k] - st->cepstral_mem[j][k];
+        dist += tmp*tmp;
+      }
+      if (j!=i)
+        mindist = MIN32(mindist, dist);
+    }
+    spec_variability += mindist;
+  }
+  features[NB_BANDS+3*NB_DELTA_CEPS+1] = spec_variability/CEPS_MEM-2.1;
+  return TRAINING && E < 0.1;
+}
+
+static void frame_synthesis(DenoiseState *st, float *out, const kiss_fft_cpx *y) {
+  float x[WINDOW_SIZE];
+  int i;
+  inverse_transform(x, y);
+  apply_window(x);
+  for (i=0;i<FRAME_SIZE;i++) out[i] = x[i] + st->synthesis_mem[i];
+  RNN_COPY(st->synthesis_mem, &x[FRAME_SIZE], FRAME_SIZE);
+}
+
+static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
+  int i;
+  for (i=0;i<N;i++) {
+    float xi, yi;
+    xi = x[i];
+    yi = x[i] + mem[0];
+    mem[0] = mem[1] + (b[0]*(double)xi - a[0]*(double)yi);
+    mem[1] = (b[1]*(double)xi - a[1]*(double)yi);
+    y[i] = yi;
+  }
+}
+
+void pitch_filter(kiss_fft_cpx *X, const kiss_fft_cpx *P, const float *Ex, const float *Ep,
+                  const float *Exp, const float *g) {
+  int i;
+  float r[NB_BANDS];
+  float rf[FREQ_SIZE] = {0};
+  for (i=0;i<NB_BANDS;i++) {
+#if 0
+    if (Exp[i]>g[i]) r[i] = 1;
+    else r[i] = Exp[i]*(1-g[i])/(.001 + g[i]*(1-Exp[i]));
+    r[i] = MIN16(1, MAX16(0, r[i]));
+#else
+    if (Exp[i]>g[i]) r[i] = 1;
+    else r[i] = SQUARE(Exp[i])*(1-SQUARE(g[i]))/(.001 + SQUARE(g[i])*(1-SQUARE(Exp[i])));
+    r[i] = sqrt(MIN16(1, MAX16(0, r[i])));
+#endif
+    r[i] *= sqrt(Ex[i]/(1e-8+Ep[i]));
+  }
+  interp_band_gain(rf, r);
+  for (i=0;i<FREQ_SIZE;i++) {
+    X[i].r += rf[i]*P[i].r;
+    X[i].i += rf[i]*P[i].i;
+  }
+  float newE[NB_BANDS];
+  compute_band_energy(newE, X);
+  float norm[NB_BANDS];
+  float normf[FREQ_SIZE]={0};
+  for (i=0;i<NB_BANDS;i++) {
+    norm[i] = sqrt(Ex[i]/(1e-8+newE[i]));
+  }
+  interp_band_gain(normf, norm);
+  for (i=0;i<FREQ_SIZE;i++) {
+    X[i].r *= normf[i];
+    X[i].i *= normf[i];
+  }
+}
+
+float rnnoise_process_frame(DenoiseState *st, float *out, const float *in) {
+  int i;
+  kiss_fft_cpx X[FREQ_SIZE];
+  kiss_fft_cpx P[WINDOW_SIZE];
+  float x[FRAME_SIZE];
+  float Ex[NB_BANDS], Ep[NB_BANDS];
+  float Exp[NB_BANDS];
+  float features[NB_FEATURES];
+  float g[NB_BANDS];
+  float gf[FREQ_SIZE]={1};
+  float vad_prob = 0;
+  int silence;
+  static const float a_hp[2] = {-1.99599, 0.99600};
+  static const float b_hp[2] = {-2, 1};
+  biquad(x, st->mem_hp_x, in, b_hp, a_hp, FRAME_SIZE);
+  silence = compute_frame_features(st, X, P, Ex, Ep, Exp, features, x);
+
+  if (!silence) {
+    compute_rnn(&st->rnn, g, &vad_prob, features);
+    pitch_filter(X, P, Ex, Ep, Exp, g);
+    for (i=0;i<NB_BANDS;i++) {
+      float alpha = .6f;
+      g[i] = MAX16(g[i], alpha*st->lastg[i]);
+      st->lastg[i] = g[i];
+    }
+    interp_band_gain(gf, g);
+#if 1
+    for (i=0;i<FREQ_SIZE;i++) {
+      X[i].r *= gf[i];
+      X[i].i *= gf[i];
+    }
+#endif
+  }
+
+  frame_synthesis(st, out, X);
+  return vad_prob;
+}
+
+#if TRAINING
+
+static float uni_rand() {
+  return rand()/(double)RAND_MAX-.5;
+}
+
+static void rand_resp(float *a, float *b) {
+  a[0] = .75*uni_rand();
+  a[1] = .75*uni_rand();
+  b[0] = .75*uni_rand();
+  b[1] = .75*uni_rand();
+}
+
+int main(int argc, char **argv) {
+  int i;
+  int count=0;
+  static const float a_hp[2] = {-1.99599, 0.99600};
+  static const float b_hp[2] = {-2, 1};
+  float a_noise[2] = {0};
+  float b_noise[2] = {0};
+  float a_sig[2] = {0};
+  float b_sig[2] = {0};
+  float mem_hp_x[2]={0};
+  float mem_hp_n[2]={0};
+  float mem_resp_x[2]={0};
+  float mem_resp_n[2]={0};
+  float x[FRAME_SIZE];
+  float n[FRAME_SIZE];
+  float xn[FRAME_SIZE];
+  int vad_cnt=0;
+  int gain_change_count=0;
+  float speech_gain = 1, noise_gain = 1;
+  FILE *f1, *f2;
+  int maxCount;
+  DenoiseState *st;
+  DenoiseState *noise_state;
+  DenoiseState *noisy;
+  st = rnnoise_create(NULL);
+  noise_state = rnnoise_create(NULL);
+  noisy = rnnoise_create(NULL);
+  if (argc!=4) {
+    fprintf(stderr, "usage: %s <speech> <noise> <count>\n", argv[0]);
+    return 1;
+  }
+  f1 = fopen(argv[1], "r");
+  f2 = fopen(argv[2], "r");
+  maxCount = atoi(argv[3]);
+  for(i=0;i<150;i++) {
+    short tmp[FRAME_SIZE];
+    fread(tmp, sizeof(short), FRAME_SIZE, f2);
+  }
+  while (1) {
+    kiss_fft_cpx X[FREQ_SIZE], Y[FREQ_SIZE], N[FREQ_SIZE], P[WINDOW_SIZE];
+    float Ex[NB_BANDS], Ey[NB_BANDS], En[NB_BANDS], Ep[NB_BANDS];
+    float Exp[NB_BANDS];
+    float Ln[NB_BANDS];
+    float features[NB_FEATURES];
+    float g[NB_BANDS];
+    short tmp[FRAME_SIZE];
+    float vad=0;
+    float E=0;
+    if (count==maxCount) break;
+    if ((count%1000)==0) fprintf(stderr, "%d\r", count);
+    if (++gain_change_count > 2821) {
+      speech_gain = pow(10., (-40+(rand()%60))/20.);
+      noise_gain = pow(10., (-30+(rand()%50))/20.);
+      if (rand()%10==0) noise_gain = 0;
+      noise_gain *= speech_gain;
+      if (rand()%10==0) speech_gain = 0;
+      gain_change_count = 0;
+      rand_resp(a_noise, b_noise);
+      rand_resp(a_sig, b_sig);
+      lowpass = FREQ_SIZE * 3000./24000. * pow(50., rand()/(double)RAND_MAX);
+      for (i=0;i<NB_BANDS;i++) {
+        if (eband5ms[i]<<FRAME_SIZE_SHIFT > lowpass) {
+          band_lp = i;
+          break;
+        }
+      }
+    }
+    if (speech_gain != 0) {
+      fread(tmp, sizeof(short), FRAME_SIZE, f1);
+      if (feof(f1)) {
+        rewind(f1);
+        fread(tmp, sizeof(short), FRAME_SIZE, f1);
+      }
+      for (i=0;i<FRAME_SIZE;i++) x[i] = speech_gain*tmp[i];
+      for (i=0;i<FRAME_SIZE;i++) E += tmp[i]*(float)tmp[i];
+    } else {
+      for (i=0;i<FRAME_SIZE;i++) x[i] = 0;
+      E = 0;
+    }
+    if (noise_gain!=0) {
+      fread(tmp, sizeof(short), FRAME_SIZE, f2);
+      if (feof(f2)) {
+        rewind(f2);
+        fread(tmp, sizeof(short), FRAME_SIZE, f2);
+      }
+      for (i=0;i<FRAME_SIZE;i++) n[i] = noise_gain*tmp[i];
+    } else {
+      for (i=0;i<FRAME_SIZE;i++) n[i] = 0;
+    }
+    biquad(x, mem_hp_x, x, b_hp, a_hp, FRAME_SIZE);
+    biquad(x, mem_resp_x, x, b_sig, a_sig, FRAME_SIZE);
+    biquad(n, mem_hp_n, n, b_hp, a_hp, FRAME_SIZE);
+    biquad(n, mem_resp_n, n, b_noise, a_noise, FRAME_SIZE);
+    for (i=0;i<FRAME_SIZE;i++) xn[i] = x[i] + n[i];
+    if (E > 1e9f) {
+      vad_cnt=0;
+    } else if (E > 1e8f) {
+      vad_cnt -= 5;
+    } else if (E > 1e7f) {
+      vad_cnt++;
+    } else {
+      vad_cnt+=2;
+    }
+    if (vad_cnt < 0) vad_cnt = 0;
+    if (vad_cnt > 15) vad_cnt = 15;
+
+    if (vad_cnt >= 10) vad = 0;
+    else if (vad_cnt > 0) vad = 0.5f;
+    else vad = 1.f;
+
+    frame_analysis(st, Y, Ey, x);
+    frame_analysis(noise_state, N, En, n);
+    for (i=0;i<NB_BANDS;i++) Ln[i] = log10(1e-2+En[i]);
+    int silence = compute_frame_features(noisy, X, P, Ex, Ep, Exp, features, xn);
+    pitch_filter(X, P, Ex, Ep, Exp, g);
+    //printf("%f %d\n", noisy->last_gain, noisy->last_period);
+    for (i=0;i<NB_BANDS;i++) {
+      g[i] = sqrt((Ey[i]+1e-3)/(Ex[i]+1e-3));
+      if (g[i] > 1) g[i] = 1;
+      if (silence || i > band_lp) g[i] = -1;
+      if (Ey[i] < 5e-2 && Ex[i] < 5e-2) g[i] = -1;
+      if (vad==0 && noise_gain==0) g[i] = -1;
+    }
+    count++;
+#if 1
+    fwrite(features, sizeof(float), NB_FEATURES, stdout);
+    fwrite(g, sizeof(float), NB_BANDS, stdout);
+    fwrite(Ln, sizeof(float), NB_BANDS, stdout);
+    fwrite(&vad, sizeof(float), 1, stdout);
+#endif
+  }
+  fprintf(stderr, "matrix size: %d x %d\n", count, NB_FEATURES + 2*NB_BANDS + 1);
+  fclose(f1);
+  fclose(f2);
+  return 0;
+}
+
+#endif

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/kiss_fft.c Added

@@ -0,0 +1,603 @@
+/*Copyright (c) 2003-2004, Mark Borgerding
+  Lots of modifications by Jean-Marc Valin
+  Copyright (c) 2005-2007, Xiph.Org Foundation
+  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
+
+  All rights reserved.
+
+  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.
+
+  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.*/
+
+/* This code is originally from Mark Borgerding's KISS-FFT but has been
+   heavily modified to better suit Opus */
+
+#ifndef SKIP_CONFIG_H
+#  ifdef HAVE_CONFIG_H
+#    include "config.h"
+#  endif
+#endif
+
+#include "_kiss_fft_guts.h"
+#define CUSTOM_MODES
+
+/* The guts header contains all the multiplication and addition macros that are defined for
+   complex numbers.  It also delares the kf_ internal functions.
+*/
+
+static void kf_bfly2(
+                     kiss_fft_cpx * Fout,
+                     int m,
+                     int N
+                    )
+{
+   kiss_fft_cpx * Fout2;
+   int i;
+   (void)m;
+#ifdef CUSTOM_MODES
+   if (m==1)
+   {
+      celt_assert(m==1);
+      for (i=0;i<N;i++)
+      {
+         kiss_fft_cpx t;
+         Fout2 = Fout + 1;
+         t = *Fout2;
+         C_SUB( *Fout2 ,  *Fout , t );
+         C_ADDTO( *Fout ,  t );
+         Fout += 2;
+      }
+   } else
+#endif
+   {
+      opus_val16 tw;
+      tw = QCONST16(0.7071067812f, 15);
+      /* We know that m==4 here because the radix-2 is just after a radix-4 */
+      celt_assert(m==4);
+      for (i=0;i<N;i++)
+      {
+         kiss_fft_cpx t;
+         Fout2 = Fout + 4;
+         t = Fout2[0];
+         C_SUB( Fout2[0] ,  Fout[0] , t );
+         C_ADDTO( Fout[0] ,  t );
+
+         t.r = S_MUL(ADD32_ovflw(Fout2[1].r, Fout2[1].i), tw);
+         t.i = S_MUL(SUB32_ovflw(Fout2[1].i, Fout2[1].r), tw);
+         C_SUB( Fout2[1] ,  Fout[1] , t );
+         C_ADDTO( Fout[1] ,  t );
+
+         t.r = Fout2[2].i;
+         t.i = -Fout2[2].r;
+         C_SUB( Fout2[2] ,  Fout[2] , t );
+         C_ADDTO( Fout[2] ,  t );
+
+         t.r = S_MUL(SUB32_ovflw(Fout2[3].i, Fout2[3].r), tw);
+         t.i = S_MUL(NEG32_ovflw(ADD32_ovflw(Fout2[3].i, Fout2[3].r)), tw);
+         C_SUB( Fout2[3] ,  Fout[3] , t );
+         C_ADDTO( Fout[3] ,  t );
+         Fout += 8;
+      }
+   }
+}
+
+static void kf_bfly4(
+                     kiss_fft_cpx * Fout,
+                     const size_t fstride,
+                     const kiss_fft_state *st,
+                     int m,
+                     int N,
+                     int mm
+                    )
+{
+   int i;
+
+   if (m==1)
+   {
+      /* Degenerate case where all the twiddles are 1. */
+      for (i=0;i<N;i++)
+      {
+         kiss_fft_cpx scratch0, scratch1;
+
+         C_SUB( scratch0 , *Fout, Fout[2] );
+         C_ADDTO(*Fout, Fout[2]);
+         C_ADD( scratch1 , Fout[1] , Fout[3] );
+         C_SUB( Fout[2], *Fout, scratch1 );
+         C_ADDTO( *Fout , scratch1 );
+         C_SUB( scratch1 , Fout[1] , Fout[3] );
+
+         Fout[1].r = ADD32_ovflw(scratch0.r, scratch1.i);
+         Fout[1].i = SUB32_ovflw(scratch0.i, scratch1.r);
+         Fout[3].r = SUB32_ovflw(scratch0.r, scratch1.i);
+         Fout[3].i = ADD32_ovflw(scratch0.i, scratch1.r);
+         Fout+=4;
+      }
+   } else {
+      int j;
+      kiss_fft_cpx scratch[6];
+      const kiss_twiddle_cpx *tw1,*tw2,*tw3;
+      const int m2=2*m;
+      const int m3=3*m;
+      kiss_fft_cpx * Fout_beg = Fout;
+      for (i=0;i<N;i++)
+      {
+         Fout = Fout_beg + i*mm;
+         tw3 = tw2 = tw1 = st->twiddles;
+         /* m is guaranteed to be a multiple of 4. */
+         for (j=0;j<m;j++)
+         {
+            C_MUL(scratch[0],Fout[m] , *tw1 );
+            C_MUL(scratch[1],Fout[m2] , *tw2 );
+            C_MUL(scratch[2],Fout[m3] , *tw3 );
+
+            C_SUB( scratch[5] , *Fout, scratch[1] );
+            C_ADDTO(*Fout, scratch[1]);
+            C_ADD( scratch[3] , scratch[0] , scratch[2] );
+            C_SUB( scratch[4] , scratch[0] , scratch[2] );
+            C_SUB( Fout[m2], *Fout, scratch[3] );
+            tw1 += fstride;
+            tw2 += fstride*2;
+            tw3 += fstride*3;
+            C_ADDTO( *Fout , scratch[3] );
+
+            Fout[m].r = ADD32_ovflw(scratch[5].r, scratch[4].i);
+            Fout[m].i = SUB32_ovflw(scratch[5].i, scratch[4].r);
+            Fout[m3].r = SUB32_ovflw(scratch[5].r, scratch[4].i);
+            Fout[m3].i = ADD32_ovflw(scratch[5].i, scratch[4].r);
+            ++Fout;
+         }
+      }
+   }
+}
+
+
+#ifndef RADIX_TWO_ONLY
+
+static void kf_bfly3(
+                     kiss_fft_cpx * Fout,
+                     const size_t fstride,
+                     const kiss_fft_state *st,
+                     int m,
+                     int N,
+                     int mm
+                    )
+{
+   int i;
+   size_t k;
+   const size_t m2 = 2*m;
+   const kiss_twiddle_cpx *tw1,*tw2;
+   kiss_fft_cpx scratch[5];
+   kiss_twiddle_cpx epi3;
+
+   kiss_fft_cpx * Fout_beg = Fout;
+#ifdef FIXED_POINT
+   /*epi3.r = -16384;*/ /* Unused */
+   epi3.i = -28378;
+#else
+   epi3 = st->twiddles[fstride*m];
+#endif
+   for (i=0;i<N;i++)
+   {
+      Fout = Fout_beg + i*mm;
+      tw1=tw2=st->twiddles;
+      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+      k=m;
+      do {
+
+         C_MUL(scratch[1],Fout[m] , *tw1);
+         C_MUL(scratch[2],Fout[m2] , *tw2);
+
+         C_ADD(scratch[3],scratch[1],scratch[2]);
+         C_SUB(scratch[0],scratch[1],scratch[2]);
+         tw1 += fstride;
+         tw2 += fstride*2;
+
+         Fout[m].r = SUB32_ovflw(Fout->r, HALF_OF(scratch[3].r));
+         Fout[m].i = SUB32_ovflw(Fout->i, HALF_OF(scratch[3].i));
+
+         C_MULBYSCALAR( scratch[0] , epi3.i );
+
+         C_ADDTO(*Fout,scratch[3]);
+
+         Fout[m2].r = ADD32_ovflw(Fout[m].r, scratch[0].i);
+         Fout[m2].i = SUB32_ovflw(Fout[m].i, scratch[0].r);
+
+         Fout[m].r = SUB32_ovflw(Fout[m].r, scratch[0].i);
+         Fout[m].i = ADD32_ovflw(Fout[m].i, scratch[0].r);
+
+         ++Fout;
+      } while(--k);
+   }
+}
+
+
+#ifndef OVERRIDE_kf_bfly5
+static void kf_bfly5(
+                     kiss_fft_cpx * Fout,
+                     const size_t fstride,
+                     const kiss_fft_state *st,
+                     int m,
+                     int N,
+                     int mm
+                    )
+{
+   kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
+   int i, u;
+   kiss_fft_cpx scratch[13];
+   const kiss_twiddle_cpx *tw;
+   kiss_twiddle_cpx ya,yb;
+   kiss_fft_cpx * Fout_beg = Fout;
+
+#ifdef FIXED_POINT
+   ya.r = 10126;
+   ya.i = -31164;
+   yb.r = -26510;
+   yb.i = -19261;
+#else
+   ya = st->twiddles[fstride*m];
+   yb = st->twiddles[fstride*2*m];
+#endif
+   tw=st->twiddles;
+
+   for (i=0;i<N;i++)
+   {
+      Fout = Fout_beg + i*mm;
+      Fout0=Fout;
+      Fout1=Fout0+m;
+      Fout2=Fout0+2*m;
+      Fout3=Fout0+3*m;
+      Fout4=Fout0+4*m;
+
+      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+      for ( u=0; u<m; ++u ) {
+         scratch[0] = *Fout0;
+
+         C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
+         C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
+         C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
+         C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
+
+         C_ADD( scratch[7],scratch[1],scratch[4]);
+         C_SUB( scratch[10],scratch[1],scratch[4]);
+         C_ADD( scratch[8],scratch[2],scratch[3]);
+         C_SUB( scratch[9],scratch[2],scratch[3]);
+
+         Fout0->r = ADD32_ovflw(Fout0->r, ADD32_ovflw(scratch[7].r, scratch[8].r));
+         Fout0->i = ADD32_ovflw(Fout0->i, ADD32_ovflw(scratch[7].i, scratch[8].i));
+
+         scratch[5].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r,ya.r), S_MUL(scratch[8].r,yb.r)));
+         scratch[5].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i,ya.r), S_MUL(scratch[8].i,yb.r)));
+
+         scratch[6].r =  ADD32_ovflw(S_MUL(scratch[10].i,ya.i), S_MUL(scratch[9].i,yb.i));
+         scratch[6].i = NEG32_ovflw(ADD32_ovflw(S_MUL(scratch[10].r,ya.i), S_MUL(scratch[9].r,yb.i)));
+
+         C_SUB(*Fout1,scratch[5],scratch[6]);
+         C_ADD(*Fout4,scratch[5],scratch[6]);
+
+         scratch[11].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r,yb.r), S_MUL(scratch[8].r,ya.r)));
+         scratch[11].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i,yb.r), S_MUL(scratch[8].i,ya.r)));
+         scratch[12].r = SUB32_ovflw(S_MUL(scratch[9].i,ya.i), S_MUL(scratch[10].i,yb.i));
+         scratch[12].i = SUB32_ovflw(S_MUL(scratch[10].r,yb.i), S_MUL(scratch[9].r,ya.i));
+
+         C_ADD(*Fout2,scratch[11],scratch[12]);
+         C_SUB(*Fout3,scratch[11],scratch[12]);
+
+         ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
+      }
+   }
+}
+#endif /* OVERRIDE_kf_bfly5 */
+
+
+#endif
+
+
+#ifdef CUSTOM_MODES
+
+static
+void compute_bitrev_table(
+         int Fout,
+         opus_int16 *f,
+         const size_t fstride,
+         int in_stride,
+         opus_int16 * factors,
+         const kiss_fft_state *st
+            )
+{
+   const int p=*factors++; /* the radix  */
+   const int m=*factors++; /* stage's fft length/p */
+
+    /*printf ("fft %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N);*/
+   if (m==1)
+   {
+      int j;
+      for (j=0;j<p;j++)
+      {
+         *f = Fout+j;
+         f += fstride*in_stride;
+      }
+   } else {
+      int j;
+      for (j=0;j<p;j++)
+      {
+         compute_bitrev_table( Fout , f, fstride*p, in_stride, factors,st);
+         f += fstride*in_stride;
+         Fout += m;
+      }
+   }
+}
+
+/*  facbuf is populated by p1,m1,p2,m2, ...
+    where
+    p[i] * m[i] = m[i-1]
+    m0 = n                  */
+static
+int kf_factor(int n,opus_int16 * facbuf)
+{
+    int p=4;
+    int i;
+    int stages=0;
+    int nbak = n;
+
+    /*factor out powers of 4, powers of 2, then any remaining primes */
+    do {
+        while (n % p) {
+            switch (p) {
+                case 4: p = 2; break;
+                case 2: p = 3; break;
+                default: p += 2; break;
+            }
+            if (p>32000 || (opus_int32)p*(opus_int32)p > n)
+                p = n;          /* no more factors, skip to end */
+        }
+        n /= p;
+#ifdef RADIX_TWO_ONLY
+        if (p!=2 && p != 4)
+#else
+        if (p>5)
+#endif
+        {
+           return 0;
+        }
+        facbuf[2*stages] = p;
+        if (p==2 && stages > 1)
+        {
+           facbuf[2*stages] = 4;
+           facbuf[2] = 2;
+        }
+        stages++;
+    } while (n > 1);
+    n = nbak;
+    /* Reverse the order to get the radix 4 at the end, so we can use the
+       fast degenerate case. It turns out that reversing the order also
+       improves the noise behaviour. */
+    for (i=0;i<stages/2;i++)
+    {
+       int tmp;
+       tmp = facbuf[2*i];
+       facbuf[2*i] = facbuf[2*(stages-i-1)];
+       facbuf[2*(stages-i-1)] = tmp;
+    }
+    for (i=0;i<stages;i++)
+    {
+        n /= facbuf[2*i];
+        facbuf[2*i+1] = n;
+    }
+    return 1;
+}
+
+static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
+{
+   int i;
+#ifdef FIXED_POINT
+   for (i=0;i<nfft;++i) {
+      opus_val32 phase = -i;
+      kf_cexp2(twiddles+i, DIV32(SHL32(phase,17),nfft));
+   }
+#else
+   for (i=0;i<nfft;++i) {
+      const double pi=3.14159265358979323846264338327;
+      double phase = ( -2*pi /nfft ) * i;
+      kf_cexp(twiddles+i, phase );
+   }
+#endif
+}
+
+int opus_fft_alloc_arch_c(kiss_fft_state *st) {
+   (void)st;
+   return 0;
+}
+
+/*
+ *
+ * Allocates all necessary storage space for the fft and ifft.
+ * The return value is a contiguous block of memory.  As such,
+ * It can be freed with free().
+ * */
+kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
+                                        const kiss_fft_state *base, int arch)
+{
+    kiss_fft_state *st=NULL;
+    size_t memneeded = sizeof(struct kiss_fft_state); /* twiddle factors*/
+
+    if ( lenmem==NULL ) {
+        st = ( kiss_fft_state*)KISS_FFT_MALLOC( memneeded );
+    }else{
+        if (mem != NULL && *lenmem >= memneeded)
+            st = (kiss_fft_state*)mem;
+        *lenmem = memneeded;
+    }
+    if (st) {
+        opus_int16 *bitrev;
+        kiss_twiddle_cpx *twiddles;
+
+        st->nfft=nfft;
+#ifdef FIXED_POINT
+        st->scale_shift = celt_ilog2(st->nfft);
+        if (st->nfft == 1<<st->scale_shift)
+           st->scale = Q15ONE;
+        else
+           st->scale = (1073741824+st->nfft/2)/st->nfft>>(15-st->scale_shift);
+#else
+        st->scale = 1.f/nfft;
+#endif
+        if (base != NULL)
+        {
+           st->twiddles = base->twiddles;
+           st->shift = 0;
+           while (st->shift < 32 && nfft<<st->shift != base->nfft)
+              st->shift++;
+           if (st->shift>=32)
+              goto fail;
+        } else {
+           st->twiddles = twiddles = (kiss_twiddle_cpx*)KISS_FFT_MALLOC(sizeof(kiss_twiddle_cpx)*nfft);
+           compute_twiddles(twiddles, nfft);
+           st->shift = -1;
+        }
+        if (!kf_factor(nfft,st->factors))
+        {
+           goto fail;
+        }
+
+        /* bitrev */
+        st->bitrev = bitrev = (opus_int16*)KISS_FFT_MALLOC(sizeof(opus_int16)*nfft);
+        if (st->bitrev==NULL)
+            goto fail;
+        compute_bitrev_table(0, bitrev, 1,1, st->factors,st);
+
+        /* Initialize architecture specific fft parameters */
+        if (opus_fft_alloc_arch(st, arch))
+            goto fail;
+    }
+    return st;
+fail:
+    opus_fft_free(st, arch);
+    return NULL;
+}
+
+kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch)
+{
+   return opus_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch);
+}
+
+void opus_fft_free_arch_c(kiss_fft_state *st) {
+   (void)st;
+}
+
+void opus_fft_free(const kiss_fft_state *cfg, int arch)
+{
+   if (cfg)
+   {
+      opus_fft_free_arch((kiss_fft_state *)cfg, arch);
+      opus_free((opus_int16*)cfg->bitrev);
+      if (cfg->shift < 0)
+         opus_free((kiss_twiddle_cpx*)cfg->twiddles);
+      opus_free((kiss_fft_state*)cfg);
+   }
+}
+
+#endif /* CUSTOM_MODES */
+
+#ifdef COMPILE_OPUS
+void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout)
+{
+    int m2, m;
+    int p;
+    int L;
+    int fstride[MAXFACTORS];
+    int i;
+    int shift;
+
+    /* st->shift can be -1 */
+    shift = st->shift>0 ? st->shift : 0;
+
+    fstride[0] = 1;
+    L=0;
+    do {
+       p = st->factors[2*L];
+       m = st->factors[2*L+1];
+       fstride[L+1] = fstride[L]*p;
+       L++;
+    } while(m!=1);
+    m = st->factors[2*L-1];
+    for (i=L-1;i>=0;i--)
+    {
+       if (i!=0)
+          m2 = st->factors[2*i-1];
+       else
+          m2 = 1;
+       switch (st->factors[2*i])
+       {
+       case 2:
+          kf_bfly2(fout, m, fstride[i]);
+          break;
+       case 4:
+          kf_bfly4(fout,fstride[i]<<shift,st,m, fstride[i], m2);
+          break;
+ #ifndef RADIX_TWO_ONLY
+       case 3:
+          kf_bfly3(fout,fstride[i]<<shift,st,m, fstride[i], m2);
+          break;
+       case 5:
+          kf_bfly5(fout,fstride[i]<<shift,st,m, fstride[i], m2);
+          break;
+ #endif
+       }
+       m = m2;
+    }
+}
+
+void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+{
+   int i;
+   opus_val16 scale;
+#ifdef FIXED_POINT
+   /* Allows us to scale with MULT16_32_Q16(), which is faster than
+      MULT16_32_Q15() on ARM. */
+   int scale_shift = st->scale_shift-1;
+#endif
+   scale = st->scale;
+
+   celt_assert2 (fin != fout, "In-place FFT not supported");
+   /* Bit-reverse the input */
+   for (i=0;i<st->nfft;i++)
+   {
+      kiss_fft_cpx x = fin[i];
+      fout[st->bitrev[i]].r = SHR32(MULT16_32_Q16(scale, x.r), scale_shift);
+      fout[st->bitrev[i]].i = SHR32(MULT16_32_Q16(scale, x.i), scale_shift);
+   }
+   opus_fft_impl(st, fout);
+}
+
+
+void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+{
+   int i;
+   celt_assert2 (fin != fout, "In-place FFT not supported");
+   /* Bit-reverse the input */
+   for (i=0;i<st->nfft;i++)
+      fout[st->bitrev[i]] = fin[i];
+   for (i=0;i<st->nfft;i++)
+      fout[i].i = -fout[i].i;
+   opus_fft_impl(st, fout);
+   for (i=0;i<st->nfft;i++)
+      fout[i].i = -fout[i].i;
+}
+#endif
\ No newline at end of file

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/kiss_fft.h Added

@@ -0,0 +1,203 @@
+/*Copyright (c) 2003-2004, Mark Borgerding
+  Lots of modifications by Jean-Marc Valin
+  Copyright (c) 2005-2007, Xiph.Org Foundation
+  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
+
+  All rights reserved.
+
+  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.
+
+  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.*/
+
+#ifndef KISS_FFT_H
+#define KISS_FFT_H
+
+#include <stdlib.h>
+#include <math.h>
+#include "arch.h"
+
+#include <stdlib.h>
+#define opus_alloc(x) malloc(x)
+#define opus_free(x) free(x)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef USE_SIMD
+# include <xmmintrin.h>
+# define kiss_fft_scalar __m128
+#define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes)
+#else
+#define KISS_FFT_MALLOC opus_alloc
+#endif
+
+#ifdef FIXED_POINT
+#include "arch.h"
+
+#  define kiss_fft_scalar opus_int32
+#  define kiss_twiddle_scalar opus_int16
+
+
+#else
+# ifndef kiss_fft_scalar
+/*  default is float */
+#   define kiss_fft_scalar float
+#   define kiss_twiddle_scalar float
+#   define KF_SUFFIX _celt_single
+# endif
+#endif
+
+typedef struct {
+    kiss_fft_scalar r;
+    kiss_fft_scalar i;
+}kiss_fft_cpx;
+
+typedef struct {
+   kiss_twiddle_scalar r;
+   kiss_twiddle_scalar i;
+}kiss_twiddle_cpx;
+
+#define MAXFACTORS 8
+/* e.g. an fft of length 128 has 4 factors
+ as far as kissfft is concerned
+ 4*4*4*2
+ */
+
+typedef struct arch_fft_state{
+   int is_supported;
+   void *priv;
+} arch_fft_state;
+
+typedef struct kiss_fft_state{
+    int nfft;
+    opus_val16 scale;
+#ifdef FIXED_POINT
+    int scale_shift;
+#endif
+    int shift;
+    opus_int16 factors[2*MAXFACTORS];
+    const opus_int16 *bitrev;
+    const kiss_twiddle_cpx *twiddles;
+    arch_fft_state *arch_fft;
+} kiss_fft_state;
+
+#if defined(HAVE_ARM_NE10)
+#include "arm/fft_arm.h"
+#endif
+
+/*typedef struct kiss_fft_state* kiss_fft_cfg;*/
+
+/**
+ *  opus_fft_alloc
+ *
+ *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
+ *
+ *  typical usage:      kiss_fft_cfg mycfg=opus_fft_alloc(1024,0,NULL,NULL);
+ *
+ *  The return value from fft_alloc is a cfg buffer used internally
+ *  by the fft routine or NULL.
+ *
+ *  If lenmem is NULL, then opus_fft_alloc will allocate a cfg buffer using malloc.
+ *  The returned value should be free()d when done to avoid memory leaks.
+ *
+ *  The state can be placed in a user supplied buffer 'mem':
+ *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
+ *      then the function places the cfg in mem and the size used in *lenmem
+ *      and returns mem.
+ *
+ *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
+ *      then the function returns NULL and places the minimum cfg
+ *      buffer size in *lenmem.
+ * */
+
+kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch);
+
+kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
+
+/**
+ * opus_fft(cfg,in_out_buf)
+ *
+ * Perform an FFT on a complex input buffer.
+ * for a forward FFT,
+ * fin should be  f[0] , f[1] , ... ,f[nfft-1]
+ * fout will be   F[0] , F[1] , ... ,F[nfft-1]
+ * Note that each element is complex and can be accessed like
+    f[k].r and f[k].i
+ * */
+void opus_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+void opus_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+
+void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
+void opus_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
+
+void opus_fft_free(const kiss_fft_state *cfg, int arch);
+
+
+void opus_fft_free_arch_c(kiss_fft_state *st);
+int opus_fft_alloc_arch_c(kiss_fft_state *st);
+
+#if !defined(OVERRIDE_OPUS_FFT)
+/* Is run-time CPU detection enabled on this platform? */
+#if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10))
+
+extern int (*const OPUS_FFT_ALLOC_ARCH_IMPL[OPUS_ARCHMASK+1])(
+ kiss_fft_state *st);
+
+#define opus_fft_alloc_arch(_st, arch) \
+         ((*OPUS_FFT_ALLOC_ARCH_IMPL[(arch)&OPUS_ARCHMASK])(_st))
+
+extern void (*const OPUS_FFT_FREE_ARCH_IMPL[OPUS_ARCHMASK+1])(
+ kiss_fft_state *st);
+#define opus_fft_free_arch(_st, arch) \
+         ((*OPUS_FFT_FREE_ARCH_IMPL[(arch)&OPUS_ARCHMASK])(_st))
+
+extern void (*const OPUS_FFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+ const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
+#define opus_fft(_cfg, _fin, _fout, arch) \
+   ((*OPUS_FFT[(arch)&OPUS_ARCHMASK])(_cfg, _fin, _fout))
+
+extern void (*const OPUS_IFFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+ const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
+#define opus_ifft(_cfg, _fin, _fout, arch) \
+   ((*OPUS_IFFT[(arch)&OPUS_ARCHMASK])(_cfg, _fin, _fout))
+
+#else /* else for if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+
+#define opus_fft_alloc_arch(_st, arch) \
+         ((void)(arch), opus_fft_alloc_arch_c(_st))
+
+#define opus_fft_free_arch(_st, arch) \
+         ((void)(arch), opus_fft_free_arch_c(_st))
+
+#define opus_fft(_cfg, _fin, _fout, arch) \
+         ((void)(arch), opus_fft_c(_cfg, _fin, _fout))
+
+#define opus_ifft(_cfg, _fin, _fout, arch) \
+         ((void)(arch), opus_ifft_c(_cfg, _fin, _fout))
+
+#endif /* end if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+#endif /* end if !defined(OVERRIDE_OPUS_FFT) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/opus_types.h Added

@@ -0,0 +1,159 @@
+/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
+/* Modified by Jean-Marc Valin */
+/*
+   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.
+
+   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.
+*/
+/* opus_types.h based on ogg_types.h from libogg */
+
+/**
+   @file opus_types.h
+   @brief Opus reference implementation types
+*/
+#ifndef OPUS_TYPES_H
+#define OPUS_TYPES_H
+
+/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
+#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
+#include <stdint.h>
+
+   typedef int16_t opus_int16;
+   typedef uint16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef uint32_t opus_uint32;
+#elif defined(_WIN32)
+
+#  if defined(__CYGWIN__)
+#    include <_G_config.h>
+     typedef _G_int32_t opus_int32;
+     typedef _G_uint32_t opus_uint32;
+     typedef _G_int16 opus_int16;
+     typedef _G_uint16 opus_uint16;
+#  elif defined(__MINGW32__)
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+#  elif defined(__MWERKS__)
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+#  else
+     /* MSVC/Borland */
+     typedef __int32 opus_int32;
+     typedef unsigned __int32 opus_uint32;
+     typedef __int16 opus_int16;
+     typedef unsigned __int16 opus_uint16;
+#  endif
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt16 opus_int16;
+   typedef UInt16 opus_uint16;
+   typedef SInt32 opus_int32;
+   typedef UInt32 opus_uint32;
+
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef int16_t opus_int16;
+   typedef u_int16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined(__BEOS__)
+
+   /* Be */
+#  include <inttypes.h>
+   typedef int16 opus_int16;
+   typedef u_int16 opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef int opus_int32;
+   typedef unsigned opus_uint32;
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef signed int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef long opus_int32;
+   typedef unsigned long opus_uint32;
+
+#elif defined(CONFIG_TI_C6X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#else
+
+   /* Give up, take a reasonable guess */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#endif
+
+#define opus_int         int                     /* used for counters etc; at least 16 bits */
+#define opus_int64       long long
+#define opus_int8        signed char
+
+#define opus_uint        unsigned int            /* used for counters etc; at least 16 bits */
+#define opus_uint64      unsigned long long
+#define opus_uint8       unsigned char
+
+#endif  /* OPUS_TYPES_H */

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/pitch.c Added

@@ -0,0 +1,532 @@
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/**
+   @file pitch.c
+   @brief Pitch analysis
+ */
+
+/*
+   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.
+
+   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.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pitch.h"
+#include "common.h"
+//#include "modes.h"
+//#include "stack_alloc.h"
+//#include "mathops.h"
+#include "celt_lpc.h"
+#include "math.h"
+
+static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
+                            int max_pitch, int *best_pitch
+#ifdef FIXED_POINT
+                            , int yshift, opus_val32 maxcorr
+#endif
+                            )
+{
+   int i, j;
+   opus_val32 Syy=1;
+   opus_val16 best_num[2];
+   opus_val32 best_den[2];
+#ifdef FIXED_POINT
+   int xshift;
+
+   xshift = celt_ilog2(maxcorr)-14;
+#endif
+
+   best_num[0] = -1;
+   best_num[1] = -1;
+   best_den[0] = 0;
+   best_den[1] = 0;
+   best_pitch[0] = 0;
+   best_pitch[1] = 1;
+   for (j=0;j<len;j++)
+      Syy = ADD32(Syy, SHR32(MULT16_16(y[j],y[j]), yshift));
+   for (i=0;i<max_pitch;i++)
+   {
+      if (xcorr[i]>0)
+      {
+         opus_val16 num;
+         opus_val32 xcorr16;
+         xcorr16 = EXTRACT16(VSHR32(xcorr[i], xshift));
+#ifndef FIXED_POINT
+         /* Considering the range of xcorr16, this should avoid both underflows
+            and overflows (inf) when squaring xcorr16 */
+         xcorr16 *= 1e-12f;
+#endif
+         num = MULT16_16_Q15(xcorr16,xcorr16);
+         if (MULT16_32_Q15(num,best_den[1]) > MULT16_32_Q15(best_num[1],Syy))
+         {
+            if (MULT16_32_Q15(num,best_den[0]) > MULT16_32_Q15(best_num[0],Syy))
+            {
+               best_num[1] = best_num[0];
+               best_den[1] = best_den[0];
+               best_pitch[1] = best_pitch[0];
+               best_num[0] = num;
+               best_den[0] = Syy;
+               best_pitch[0] = i;
+            } else {
+               best_num[1] = num;
+               best_den[1] = Syy;
+               best_pitch[1] = i;
+            }
+         }
+      }
+      Syy += SHR32(MULT16_16(y[i+len],y[i+len]),yshift) - SHR32(MULT16_16(y[i],y[i]),yshift);
+      Syy = MAX32(1, Syy);
+   }
+}
+
+static void celt_fir5(const opus_val16 *x,
+         const opus_val16 *num,
+         opus_val16 *y,
+         int N,
+         opus_val16 *mem)
+{
+   int i;
+   opus_val16 num0, num1, num2, num3, num4;
+   opus_val32 mem0, mem1, mem2, mem3, mem4;
+   num0=num[0];
+   num1=num[1];
+   num2=num[2];
+   num3=num[3];
+   num4=num[4];
+   mem0=mem[0];
+   mem1=mem[1];
+   mem2=mem[2];
+   mem3=mem[3];
+   mem4=mem[4];
+   for (i=0;i<N;i++)
+   {
+      opus_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+      sum = MAC16_16(sum,num0,mem0);
+      sum = MAC16_16(sum,num1,mem1);
+      sum = MAC16_16(sum,num2,mem2);
+      sum = MAC16_16(sum,num3,mem3);
+      sum = MAC16_16(sum,num4,mem4);
+      mem4 = mem3;
+      mem3 = mem2;
+      mem2 = mem1;
+      mem1 = mem0;
+      mem0 = x[i];
+      y[i] = ROUND16(sum, SIG_SHIFT);
+   }
+   mem[0]=mem0;
+   mem[1]=mem1;
+   mem[2]=mem2;
+   mem[3]=mem3;
+   mem[4]=mem4;
+}
+
+
+void pitch_downsample(celt_sig *x[], opus_val16 *x_lp,
+      int len, int C)
+{
+   int i;
+   opus_val32 ac[5];
+   opus_val16 tmp=Q15ONE;
+   opus_val16 lpc[4], mem[5]={0,0,0,0,0};
+   opus_val16 lpc2[5];
+   opus_val16 c1 = QCONST16(.8f,15);
+#ifdef FIXED_POINT
+   int shift;
+   opus_val32 maxabs = celt_maxabs32(x[0], len);
+   if (C==2)
+   {
+      opus_val32 maxabs_1 = celt_maxabs32(x[1], len);
+      maxabs = MAX32(maxabs, maxabs_1);
+   }
+   if (maxabs<1)
+      maxabs=1;
+   shift = celt_ilog2(maxabs)-10;
+   if (shift<0)
+      shift=0;
+   if (C==2)
+      shift++;
+#endif
+   for (i=1;i<len>>1;i++)
+      x_lp[i] = SHR32(HALF32(HALF32(x[0][(2*i-1)]+x[0][(2*i+1)])+x[0][2*i]), shift);
+   x_lp[0] = SHR32(HALF32(HALF32(x[0][1])+x[0][0]), shift);
+   if (C==2)
+   {
+      for (i=1;i<len>>1;i++)
+         x_lp[i] += SHR32(HALF32(HALF32(x[1][(2*i-1)]+x[1][(2*i+1)])+x[1][2*i]), shift);
+      x_lp[0] += SHR32(HALF32(HALF32(x[1][1])+x[1][0]), shift);
+   }
+
+   _celt_autocorr(x_lp, ac, NULL, 0,
+                  4, len>>1);
+
+   /* Noise floor -40 dB */
+#ifdef FIXED_POINT
+   ac[0] += SHR32(ac[0],13);
+#else
+   ac[0] *= 1.0001f;
+#endif
+   /* Lag windowing */
+   for (i=1;i<=4;i++)
+   {
+      /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
+#ifdef FIXED_POINT
+      ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
+#else
+      ac[i] -= ac[i]*(.008f*i)*(.008f*i);
+#endif
+   }
+
+   _celt_lpc(lpc, ac, 4);
+   for (i=0;i<4;i++)
+   {
+      tmp = MULT16_16_Q15(QCONST16(.9f,15), tmp);
+      lpc[i] = MULT16_16_Q15(lpc[i], tmp);
+   }
+   /* Add a zero */
+   lpc2[0] = lpc[0] + QCONST16(.8f,SIG_SHIFT);
+   lpc2[1] = lpc[1] + MULT16_16_Q15(c1,lpc[0]);
+   lpc2[2] = lpc[2] + MULT16_16_Q15(c1,lpc[1]);
+   lpc2[3] = lpc[3] + MULT16_16_Q15(c1,lpc[2]);
+   lpc2[4] = MULT16_16_Q15(c1,lpc[3]);
+   celt_fir5(x_lp, lpc2, x_lp, len>>1, mem);
+}
+
+void celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
+      opus_val32 *xcorr, int len, int max_pitch)
+{
+
+#if 0 /* This is a simple version of the pitch correlation that should work
+         well on DSPs like Blackfin and TI C5x/C6x */
+   int i, j;
+#ifdef FIXED_POINT
+   opus_val32 maxcorr=1;
+#endif
+   for (i=0;i<max_pitch;i++)
+   {
+      opus_val32 sum = 0;
+      for (j=0;j<len;j++)
+         sum = MAC16_16(sum, _x[j], _y[i+j]);
+      xcorr[i] = sum;
+#ifdef FIXED_POINT
+      maxcorr = MAX32(maxcorr, sum);
+#endif
+   }
+#ifdef FIXED_POINT
+   return maxcorr;
+#endif
+
+#else /* Unrolled version of the pitch correlation -- runs faster on x86 and ARM */
+   int i;
+   /*The EDSP version requires that max_pitch is at least 1, and that _x is
+      32-bit aligned.
+     Since it's hard to put asserts in assembly, put them here.*/
+#ifdef FIXED_POINT
+   opus_val32 maxcorr=1;
+#endif
+   celt_assert(max_pitch>0);
+   celt_assert((((unsigned char *)_x-(unsigned char *)NULL)&3)==0);
+   for (i=0;i<max_pitch-3;i+=4)
+   {
+      opus_val32 sum[4]={0,0,0,0};
+      xcorr_kernel(_x, _y+i, sum, len);
+      xcorr[i]=sum[0];
+      xcorr[i+1]=sum[1];
+      xcorr[i+2]=sum[2];
+      xcorr[i+3]=sum[3];
+#ifdef FIXED_POINT
+      sum[0] = MAX32(sum[0], sum[1]);
+      sum[2] = MAX32(sum[2], sum[3]);
+      sum[0] = MAX32(sum[0], sum[2]);
+      maxcorr = MAX32(maxcorr, sum[0]);
+#endif
+   }
+   /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
+   for (;i<max_pitch;i++)
+   {
+      opus_val32 sum;
+      sum = celt_inner_prod(_x, _y+i, len);
+      xcorr[i] = sum;
+#ifdef FIXED_POINT
+      maxcorr = MAX32(maxcorr, sum);
+#endif
+   }
+#ifdef FIXED_POINT
+   return maxcorr;
+#endif
+#endif
+}
+
+void pitch_search(const opus_val16 *x_lp, opus_val16 *y,
+                  int len, int max_pitch, int *pitch)
+{
+   int i, j;
+   int lag;
+   int best_pitch[2]={0,0};
+#ifdef FIXED_POINT
+   opus_val32 maxcorr;
+   opus_val32 xmax, ymax;
+   int shift=0;
+#endif
+   int offset;
+
+   celt_assert(len>0);
+   celt_assert(max_pitch>0);
+   lag = len+max_pitch;
+
+   opus_val16 *x_lp4 = malloc(sizeof(opus_val16) * (len >> 2));
+   opus_val16 *y_lp4 = malloc(sizeof(opus_val16) * (lag >> 2));
+   opus_val32 *xcorr = malloc(sizeof(opus_val32) * (max_pitch >> 1));
+
+   /* Downsample by 2 again */
+   for (j=0;j<len>>2;j++)
+      x_lp4[j] = x_lp[2*j];
+   for (j=0;j<lag>>2;j++)
+      y_lp4[j] = y[2*j];
+
+#ifdef FIXED_POINT
+   xmax = celt_maxabs16(x_lp4, len>>2);
+   ymax = celt_maxabs16(y_lp4, lag>>2);
+   shift = celt_ilog2(MAX32(1, MAX32(xmax, ymax)))-11;
+   if (shift>0)
+   {
+      for (j=0;j<len>>2;j++)
+         x_lp4[j] = SHR16(x_lp4[j], shift);
+      for (j=0;j<lag>>2;j++)
+         y_lp4[j] = SHR16(y_lp4[j], shift);
+      /* Use double the shift for a MAC */
+      shift *= 2;
+   } else {
+      shift = 0;
+   }
+#endif
+
+   /* Coarse search with 4x decimation */
+
+#ifdef FIXED_POINT
+   maxcorr =
+#endif
+   celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2);
+
+   find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
+#ifdef FIXED_POINT
+                   , 0, maxcorr
+#endif
+                   );
+
+   /* Finer search with 2x decimation */
+#ifdef FIXED_POINT
+   maxcorr=1;
+#endif
+   for (i=0;i<max_pitch>>1;i++)
+   {
+      opus_val32 sum;
+      xcorr[i] = 0;
+      if (abs(i-2*best_pitch[0])>2 && abs(i-2*best_pitch[1])>2)
+         continue;
+#ifdef FIXED_POINT
+      sum = 0;
+      for (j=0;j<len>>1;j++)
+         sum += SHR32(MULT16_16(x_lp[j],y[i+j]), shift);
+#else
+      sum = celt_inner_prod(x_lp, y+i, len>>1);
+#endif
+      xcorr[i] = MAX32(-1, sum);
+#ifdef FIXED_POINT
+      maxcorr = MAX32(maxcorr, sum);
+#endif
+   }
+   find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
+#ifdef FIXED_POINT
+                   , shift+1, maxcorr
+#endif
+                   );
+
+   /* Refine by pseudo-interpolation */
+   if (best_pitch[0]>0 && best_pitch[0]<(max_pitch>>1)-1)
+   {
+      opus_val32 a, b, c;
+      a = xcorr[best_pitch[0]-1];
+      b = xcorr[best_pitch[0]];
+      c = xcorr[best_pitch[0]+1];
+      if ((c-a) > MULT16_32_Q15(QCONST16(.7f,15),b-a))
+         offset = 1;
+      else if ((a-c) > MULT16_32_Q15(QCONST16(.7f,15),b-c))
+         offset = -1;
+      else
+         offset = 0;
+   } else {
+      offset = 0;
+   }
+   *pitch = 2*best_pitch[0]-offset;
+
+   free(x_lp4);
+   free(y_lp4);
+   free(xcorr);
+}
+
+#ifdef FIXED_POINT
+static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy)
+{
+   opus_val32 x2y2;
+   int sx, sy, shift;
+   opus_val32 g;
+   opus_val16 den;
+   if (xy == 0 || xx == 0 || yy == 0)
+      return 0;
+   sx = celt_ilog2(xx)-14;
+   sy = celt_ilog2(yy)-14;
+   shift = sx + sy;
+   x2y2 = SHR32(MULT16_16(VSHR32(xx, sx), VSHR32(yy, sy)), 14);
+   if (shift & 1) {
+      if (x2y2 < 32768)
+      {
+         x2y2 <<= 1;
+         shift--;
+      } else {
+         x2y2 >>= 1;
+         shift++;
+      }
+   }
+   den = celt_rsqrt_norm(x2y2);
+   g = MULT16_32_Q15(den, xy);
+   g = VSHR32(g, (shift>>1)-1);
+   return EXTRACT16(MIN32(g, Q15ONE));
+}
+#else
+static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy)
+{
+   return xy/sqrt(1+xx*yy);
+}
+#endif
+
+static const int second_check[16] = {0, 0, 3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2};
+opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
+      int N, int *T0_, int prev_period, opus_val16 prev_gain)
+{
+   int k, i, T, T0;
+   opus_val16 g, g0;
+   opus_val16 pg;
+   opus_val32 xy,xx,yy,xy2;
+   opus_val32 xcorr[3];
+   opus_val32 best_xy, best_yy;
+   int offset;
+   int minperiod0;
+
+   minperiod0 = minperiod;
+   maxperiod /= 2;
+   minperiod /= 2;
+   *T0_ /= 2;
+   prev_period /= 2;
+   N /= 2;
+   x += maxperiod;
+   if (*T0_>=maxperiod)
+      *T0_=maxperiod-1;
+
+   T = T0 = *T0_;
+   opus_val32 *yy_lookup = malloc(sizeof(opus_val32) * (maxperiod + 1));
+   dual_inner_prod(x, x, x-T0, N, &xx, &xy);
+   yy_lookup[0] = xx;
+   yy=xx;
+   for (i=1;i<=maxperiod;i++)
+   {
+      yy = yy+MULT16_16(x[-i],x[-i])-MULT16_16(x[N-i],x[N-i]);
+      yy_lookup[i] = MAX32(0, yy);
+   }
+   yy = yy_lookup[T0];
+   best_xy = xy;
+   best_yy = yy;
+   g = g0 = compute_pitch_gain(xy, xx, yy);
+   /* Look for any pitch at T/k */
+   for (k=2;k<=15;k++)
+   {
+      int T1, T1b;
+      opus_val16 g1;
+      opus_val16 cont=0;
+      opus_val16 thresh;
+      T1 = (2*T0+k)/(2*k);
+      if (T1 < minperiod)
+         break;
+      /* Look for another strong correlation at T1b */
+      if (k==2)
+      {
+         if (T1+T0>maxperiod)
+            T1b = T0;
+         else
+            T1b = T0+T1;
+      } else
+      {
+         T1b = (2*second_check[k]*T0+k)/(2*k);
+      }
+      dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2);
+      xy = HALF32(xy + xy2);
+      yy = HALF32(yy_lookup[T1] + yy_lookup[T1b]);
+      g1 = compute_pitch_gain(xy, xx, yy);
+      if (abs(T1-prev_period)<=1)
+         cont = prev_gain;
+      else if (abs(T1-prev_period)<=2 && 5*k*k < T0)
+         cont = HALF16(prev_gain);
+      else
+         cont = 0;
+      thresh = MAX16(QCONST16(.3f,15), MULT16_16_Q15(QCONST16(.7f,15),g0)-cont);
+      /* Bias against very high pitch (very short period) to avoid false-positives
+         due to short-term correlation */
+      if (T1<3*minperiod)
+         thresh = MAX16(QCONST16(.4f,15), MULT16_16_Q15(QCONST16(.85f,15),g0)-cont);
+      else if (T1<2*minperiod)
+         thresh = MAX16(QCONST16(.5f,15), MULT16_16_Q15(QCONST16(.9f,15),g0)-cont);
+      if (g1 > thresh)
+      {
+         best_xy = xy;
+         best_yy = yy;
+         T = T1;
+         g = g1;
+      }
+   }
+   best_xy = MAX32(0, best_xy);
+   if (best_yy <= best_xy)
+      pg = Q15ONE;
+   else
+      pg = best_xy/(best_yy+1);
+
+   for (k=0;k<3;k++)
+      xcorr[k] = celt_inner_prod(x, x-(T+k-1), N);
+   if ((xcorr[2]-xcorr[0]) > MULT16_32_Q15(QCONST16(.7f,15),xcorr[1]-xcorr[0]))
+      offset = 1;
+   else if ((xcorr[0]-xcorr[2]) > MULT16_32_Q15(QCONST16(.7f,15),xcorr[1]-xcorr[2]))
+      offset = -1;
+   else
+      offset = 0;
+   if (pg > g)
+      pg = g;
+   *T0_ = 2*T+offset;
+
+   if (*T0_<minperiod0)
+      *T0_=minperiod0;
+
+   free(yy_lookup);
+   return pg;
+}

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/pitch.h Added

@@ -0,0 +1,149 @@
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/**
+   @file pitch.h
+   @brief Pitch analysis
+ */
+
+/*
+   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.
+
+   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.
+*/
+
+#ifndef PITCH_H
+#define PITCH_H
+
+//#include "modes.h"
+//#include "cpu_support.h"
+#include "arch.h"
+
+void pitch_downsample(celt_sig *x[], opus_val16 *x_lp,
+      int len, int C);
+
+void pitch_search(const opus_val16 *x_lp, opus_val16 *y,
+                  int len, int max_pitch, int *pitch);
+
+opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
+      int N, int *T0, int prev_period, opus_val16 prev_gain);
+
+
+/* OPT: This is the kernel you really want to optimize. It gets used a lot
+   by the prefilter and by the PLC. */
+static OPUS_INLINE void xcorr_kernel(const opus_val16 * x, const opus_val16 * y, opus_val32 sum[4], int len)
+{
+   int j;
+   opus_val16 y_0, y_1, y_2, y_3;
+   celt_assert(len>=3);
+   y_3=0; /* gcc doesn't realize that y_3 can't be used uninitialized */
+   y_0=*y++;
+   y_1=*y++;
+   y_2=*y++;
+   for (j=0;j<len-3;j+=4)
+   {
+      opus_val16 tmp;
+      tmp = *x++;
+      y_3=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_0);
+      sum[1] = MAC16_16(sum[1],tmp,y_1);
+      sum[2] = MAC16_16(sum[2],tmp,y_2);
+      sum[3] = MAC16_16(sum[3],tmp,y_3);
+      tmp=*x++;
+      y_0=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_1);
+      sum[1] = MAC16_16(sum[1],tmp,y_2);
+      sum[2] = MAC16_16(sum[2],tmp,y_3);
+      sum[3] = MAC16_16(sum[3],tmp,y_0);
+      tmp=*x++;
+      y_1=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_2);
+      sum[1] = MAC16_16(sum[1],tmp,y_3);
+      sum[2] = MAC16_16(sum[2],tmp,y_0);
+      sum[3] = MAC16_16(sum[3],tmp,y_1);
+      tmp=*x++;
+      y_2=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_3);
+      sum[1] = MAC16_16(sum[1],tmp,y_0);
+      sum[2] = MAC16_16(sum[2],tmp,y_1);
+      sum[3] = MAC16_16(sum[3],tmp,y_2);
+   }
+   if (j++<len)
+   {
+      opus_val16 tmp = *x++;
+      y_3=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_0);
+      sum[1] = MAC16_16(sum[1],tmp,y_1);
+      sum[2] = MAC16_16(sum[2],tmp,y_2);
+      sum[3] = MAC16_16(sum[3],tmp,y_3);
+   }
+   if (j++<len)
+   {
+      opus_val16 tmp=*x++;
+      y_0=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_1);
+      sum[1] = MAC16_16(sum[1],tmp,y_2);
+      sum[2] = MAC16_16(sum[2],tmp,y_3);
+      sum[3] = MAC16_16(sum[3],tmp,y_0);
+   }
+   if (j<len)
+   {
+      opus_val16 tmp=*x++;
+      y_1=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_2);
+      sum[1] = MAC16_16(sum[1],tmp,y_3);
+      sum[2] = MAC16_16(sum[2],tmp,y_0);
+      sum[3] = MAC16_16(sum[3],tmp,y_1);
+   }
+}
+
+static OPUS_INLINE void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
+      int N, opus_val32 *xy1, opus_val32 *xy2)
+{
+   int i;
+   opus_val32 xy01=0;
+   opus_val32 xy02=0;
+   for (i=0;i<N;i++)
+   {
+      xy01 = MAC16_16(xy01, x[i], y01[i]);
+      xy02 = MAC16_16(xy02, x[i], y02[i]);
+   }
+   *xy1 = xy01;
+   *xy2 = xy02;
+}
+
+/*We make sure a C version is always available for cases where the overhead of
+  vectorization and passing around an arch flag aren't worth it.*/
+static OPUS_INLINE opus_val32 celt_inner_prod(const opus_val16 *x,
+      const opus_val16 *y, int N)
+{
+   int i;
+   opus_val32 xy=0;
+   for (i=0;i<N;i++)
+      xy = MAC16_16(xy, x[i], y[i]);
+   return xy;
+}
+
+void celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
+      opus_val32 *xcorr, int len, int max_pitch);
+
+#endif

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/rnn.c Added

@@ -0,0 +1,178 @@
+/* Copyright (c) 2008-2011 Octasic Inc.
+                 2012-2017 Jean-Marc Valin */
+/*
+   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.
+
+   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 FOUNDATION 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.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+#include "opus_types.h"
+#include "common.h"
+#include "arch.h"
+#include "tansig_table.h"
+#include "rnn.h"
+#include "rnn_data.h"
+#include <stdio.h>
+
+static OPUS_INLINE float tansig_approx(float x)
+{
+    int i;
+    float y, dy;
+    float sign=1;
+    /* Tests are reversed to catch NaNs */
+    if (!(x<8))
+        return 1;
+    if (!(x>-8))
+        return -1;
+#ifndef FIXED_POINT
+    /* Another check in case of -ffast-math */
+    if (celt_isnan(x))
+       return 0;
+#endif
+    if (x<0)
+    {
+       x=-x;
+       sign=-1;
+    }
+    i = (int)floor(.5f+25*x);
+    x -= .04f*i;
+    y = tansig_table[i];
+    dy = 1-y*y;
+    y = y + x*dy*(1 - y*x);
+    return sign*y;
+}
+
+static OPUS_INLINE float sigmoid_approx(float x)
+{
+   return .5 + .5*tansig_approx(.5*x);
+}
+
+static OPUS_INLINE float relu(float x)
+{
+   return x < 0 ? 0 : x;
+}
+
+static void compute_dense(const DenseLayer *layer, float *output, const float *input)
+{
+   int i, j;
+   int N, M;
+   int stride;
+   M = layer->nb_inputs;
+   N = layer->nb_neurons;
+   stride = N;
+   for (i=0;i<N;i++)
+   {
+      /* Compute update gate. */
+      float sum = layer->bias[i];
+      for (j=0;j<M;j++)
+         sum += layer->input_weights[j*stride + i]*input[j];
+      output[i] = WEIGHTS_SCALE*sum;
+   }
+   if (layer->activation == ACTIVATION_SIGMOID) {
+      for (i=0;i<N;i++)
+         output[i] = sigmoid_approx(output[i]);
+   } else if (layer->activation == ACTIVATION_TANH) {
+      for (i=0;i<N;i++)
+         output[i] = tansig_approx(output[i]);
+   } else if (layer->activation == ACTIVATION_RELU) {
+      for (i=0;i<N;i++)
+         output[i] = relu(output[i]);
+   } else {
+     *(int*)0=0;
+   }
+}
+
+static void compute_gru(const GRULayer *gru, float *state, const float *input)
+{
+   int i, j;
+   int N, M;
+   int stride;
+   float z[MAX_NEURONS];
+   float r[MAX_NEURONS];
+   float h[MAX_NEURONS];
+   M = gru->nb_inputs;
+   N = gru->nb_neurons;
+   stride = 3*N;
+   for (i=0;i<N;i++)
+   {
+      /* Compute update gate. */
+      float sum = gru->bias[i];
+      for (j=0;j<M;j++)
+         sum += gru->input_weights[j*stride + i]*input[j];
+      for (j=0;j<N;j++)
+         sum += gru->recurrent_weights[j*stride + i]*state[j];
+      z[i] = sigmoid_approx(WEIGHTS_SCALE*sum);
+   }
+   for (i=0;i<N;i++)
+   {
+      /* Compute reset gate. */
+      float sum = gru->bias[N + i];
+      for (j=0;j<M;j++)
+         sum += gru->input_weights[N + j*stride + i]*input[j];
+      for (j=0;j<N;j++)
+         sum += gru->recurrent_weights[N + j*stride + i]*state[j];
+      r[i] = sigmoid_approx(WEIGHTS_SCALE*sum);
+   }
+   for (i=0;i<N;i++)
+   {
+      /* Compute output. */
+      float sum = gru->bias[2*N + i];
+      for (j=0;j<M;j++)
+         sum += gru->input_weights[2*N + j*stride + i]*input[j];
+      for (j=0;j<N;j++)
+         sum += gru->recurrent_weights[2*N + j*stride + i]*state[j]*r[j];
+      if (gru->activation == ACTIVATION_SIGMOID) sum = sigmoid_approx(WEIGHTS_SCALE*sum);
+      else if (gru->activation == ACTIVATION_TANH) sum = tansig_approx(WEIGHTS_SCALE*sum);
+      else if (gru->activation == ACTIVATION_RELU) sum = relu(WEIGHTS_SCALE*sum);
+      else *(int*)0=0;
+      h[i] = z[i]*state[i] + (1-z[i])*sum;
+   }
+   for (i=0;i<N;i++)
+      state[i] = h[i];
+}
+
+#define INPUT_SIZE 42
+
+void compute_rnn(RNNState *rnn, float *gains, float *vad, const float *input) {
+  int i;
+  float dense_out[MAX_NEURONS];
+  float noise_input[MAX_NEURONS*3];
+  float denoise_input[MAX_NEURONS*3];
+  compute_dense(rnn->model->input_dense, dense_out, input);
+  compute_gru(rnn->model->vad_gru, rnn->vad_gru_state, dense_out);
+  compute_dense(rnn->model->vad_output, vad, rnn->vad_gru_state);
+  for (i=0;i<rnn->model->input_dense_size;i++) noise_input[i] = dense_out[i];
+  for (i=0;i<rnn->model->vad_gru_size;i++) noise_input[i+rnn->model->input_dense_size] = rnn->vad_gru_state[i];
+  for (i=0;i<INPUT_SIZE;i++) noise_input[i+rnn->model->input_dense_size+rnn->model->vad_gru_size] = input[i];
+  compute_gru(rnn->model->noise_gru, rnn->noise_gru_state, noise_input);
+
+  for (i=0;i<rnn->model->vad_gru_size;i++) denoise_input[i] = rnn->vad_gru_state[i];
+  for (i=0;i<rnn->model->noise_gru_size;i++) denoise_input[i+rnn->model->vad_gru_size] = rnn->noise_gru_state[i];
+  for (i=0;i<INPUT_SIZE;i++) denoise_input[i+rnn->model->vad_gru_size+rnn->model->noise_gru_size] = input[i];
+  compute_gru(rnn->model->denoise_gru, rnn->denoise_gru_state, denoise_input);
+  compute_dense(rnn->model->denoise_output, gains, rnn->denoise_gru_state);
+}

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/rnn.h Added

@@ -0,0 +1,65 @@
+/* Copyright (c) 2017 Jean-Marc Valin */
+/*
+   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.
+
+   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 FOUNDATION 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.
+*/
+
+#ifndef RNN_H_
+#define RNN_H_
+
+#include "rnnoise.h"
+
+#include "opus_types.h"
+
+#define WEIGHTS_SCALE (1.f/256)
+
+#define MAX_NEURONS 128
+
+#define ACTIVATION_TANH    0
+#define ACTIVATION_SIGMOID 1
+#define ACTIVATION_RELU    2
+
+typedef signed char rnn_weight;
+
+typedef struct {
+  const rnn_weight *bias;
+  const rnn_weight *input_weights;
+  int nb_inputs;
+  int nb_neurons;
+  int activation;
+} DenseLayer;
+
+typedef struct {
+  const rnn_weight *bias;
+  const rnn_weight *input_weights;
+  const rnn_weight *recurrent_weights;
+  int nb_inputs;
+  int nb_neurons;
+  int activation;
+} GRULayer;
+
+typedef struct RNNState RNNState;
+
+void compute_rnn(RNNState *rnn, float *gains, float *vad, const float *input);
+
+#endif /* _MLP_H_ */

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/rnn_data.c Added

@@ -0,0 +1,11051 @@
+/*This file is automatically generated from a Keras model*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "rnn.h"
+#include "rnn_data.h"
+
+static const rnn_weight input_dense_weights[1008] = {
+   -10, 0, -3, 1, -8, -6, 3, -13,
+   1, 0, -3, -7, -5, -3, 6, -1,
+   -6, 0, -6, -4, -1, -2, 1, 1,
+   -7, 2, 21, 10, -5, -20, 24, 23,
+   37, 8, -2, 33, -6, 22, 13, -2,
+   50, 8, 13, 1, -15, 30, -10, 30,
+   0, 3, 5, 27, 1, 4, -3, 41,
+   56, 35, -2, 49, -13, 11, 13, -2,
+   -47, 5, -16, -60, -15, 77, -17, 26,
+   -3, 14, -21, 19, -5, -19, -13, 0,
+   10, 14, 9, 31, -13, -41, -10, 4,
+   22, 18, -48, -6, -10, 62, -3, -18,
+   -14, 12, 26, -28, 3, 14, 25, -13,
+   -19, 6, 5, 36, -3, -65, -12, 0,
+   31, -7, -9, 101, -4, 26, 16, 17,
+   -12, -12, 14, -36, -3, 5, -15, 21,
+   2, 30, -3, 38, -4, 1, -6, 7,
+   -7, 14, 38, -22, -30, -3, -7, 3,
+   -39, -70, -126, 25, 34, 94, -67, -22,
+   -33, 83, -47, -118, 4, 70, 33, 25,
+   62, -128, -76, -118, -113, 49, -12, -100,
+   -18, -114, -33, 43, 32, 61, 40, -9,
+   -106, 2, 36, -100, -40, -5, 20, -75,
+   61, -51, -9, 126, -27, -52, 5, -24,
+   -21, -126, -114, -12, 15, 106, -2, 73,
+   -125, 50, 13, -120, 35, 35, 4, -61,
+   29, -124, 6, -53, -69, -125, 64, -89,
+   36, -107, -103, -7, 27, 121, 69, 77,
+   -35, 35, 95, -125, -49, 97, -45, -43,
+   -23, 23, -28, -65, -118, 2, 8, -126,
+   27, -97, 92, 5, 55, 82, 17, -57,
+   -115, 37, 8, -106, -46, 41, -2, 21,
+   -44, 8, -73, -58, -39, 34, 89, -95,
+   95, -117, 120, -58, 31, 123, 1, -32,
+   -109, -110, 60, -120, -43, -74, 5, 91,
+   26, 21, 114, 82, -83, -126, 123, 22,
+   -16, -67, 25, -83, 46, 48, -34, -121,
+   -124, -63, -35, -9, 31, 82, 123, 6,
+   -3, 117, 93, -2, -13, -36, 124, -112,
+   -6, -102, -5, -33, -15, 44, -69, -127,
+   -23, -40, -34, -85, 68, 83, -1, 40,
+   8, 84, 118, -58, -55, -102, 123, -55,
+   -14, -123, 44, -63, -14, 21, 35, 16,
+   24, -126, -13, -114, 35, 20, -36, 61,
+   -9, 97, 34, 19, -32, -109, 76, -104,
+   99, -119, 45, -125, -51, -28, -8, -69,
+   -8, 125, -45, -93, 113, 103, -41, -82,
+   52, 7, 126, 0, -40, 104, 55, -58,
+   17, -124, -93, -58, 8, -45, 1, 56,
+   -123, 108, -47, -23, 115, 127, 17, -68,
+   -13, 116, -82, -44, 45, 67, -120, -101,
+   -15, -125, 120, -113, 17, -48, -73, 126,
+   -64, -86, -118, -19, 112, -1, -66, -27,
+   -62, 121, -86, -58, 50, 89, -38, -75,
+   95, -111, 12, -113, 2, -68, 2, -94,
+   -121, 91, -5, 0, 79, 43, -7, -18,
+   79, 35, -38, 47, 1, -45, 83, -50,
+   102, 32, 55, -96, 15, -122, -69, 45,
+   -27, 91, -62, -30, 46, -95, 22, -72,
+   -97, -1, 14, -122, 28, 127, 61, -126,
+   121, 9, 68, -120, 49, -60, 90, 3,
+   43, 68, 54, 34, -10, 28, 21, -24,
+   -54, 22, -113, -12, 82, -2, -17, -9,
+   127, 8, 116, -92, 0, -70, -33, 123,
+   66, 116, -74, -4, 74, -72, -22, -47,
+   1, -83, -60, -124, 1, 122, -57, -43,
+   49, 40, -126, -128, -8, -29, 28, -24,
+   -123, -121, -70, -93, -37, -126, 11, -125,
+   -37, 11, -31, -51, -124, 116, -128, 8,
+   -25, 109, 75, -12, 7, 8, 10, 117,
+   124, -128, -128, 29, -26, 101, 21, -128,
+   87, 8, -39, 23, -128, 127, -127, 74,
+   -55, 74, 112, 127, 4, 55, 44, -92,
+   123, 34, -93, 47, -21, -92, 17, 49,
+   -121, 92, 7, -126, -125, 124, -74, 3,
+   -59, 18, -91, 3, -9, 9, 56, 116,
+   7, -29, 33, 87, -21, -128, -13, 57,
+   74, 9, -29, -61, -97, -21, -95, -12,
+   -114, 16, 82, 125, -7, 10, -24, 9,
+   77, -128, -102, -25, 3, -126, 10, 13,
+   -18, 51, 26, 127, -79, 35, 51, 12,
+   -50, -24, 1, -7, 22, 81, 65, 120,
+   -30, -38, 85, 122, -4, -106, -11, 27,
+   53, 41, 8, -104, -66, -38, -124, 10,
+   12, 76, 117, -109, 9, 11, 2, -18,
+   3, 113, -16, -79, -39, -123, -20, -128,
+   2, 13, -33, -58, 10, 84, -104, 13,
+   64, 109, 1, 54, -12, 28, 24, 63,
+   -126, 118, -82, 46, -12, -15, 14, -43,
+   60, 22, -32, -19, -46, 91, -107, 24,
+   -94, 26, -47, 125, 6, 58, -15, -75,
+   -26, -38, -35, 103, -16, -17, -13, 63,
+   -2, 45, -45, -73, -23, 70, -87, 51,
+   -17, 53, 76, 14, -18, -31, -14, 103,
+   8, 21, -28, -33, -20, -47, 6, 39,
+   40, -30, 7, -76, 55, 31, -20, -21,
+   -59, 1, 25, -11, 17, 5, -13, -39,
+   0, -76, 50, -33, -29, -50, -16, -11,
+   -12, -1, -46, 40, -10, 65, -19, 21,
+   -41, -32, -83, -19, -4, 49, -60, 118,
+   -24, -46, 9, 102, -20, 8, -19, 25,
+   31, -3, -37, 0, 25, 7, 29, 2,
+   -39, 127, -64, -20, 64, 115, -30, 36,
+   100, 35, 122, 127, 127, -127, 127, -127,
+   19, 127, -89, -79, -32, 39, -127, 125,
+   -80, 126, -127, 26, 8, 98, -8, -57,
+   -90, -50, 126, 61, 127, -126, 40, -106,
+   -68, 104, -125, -119, 11, 10, -127, 66,
+   -56, -12, -126, -104, 27, 75, 38, -124,
+   -126, -125, 84, -123, -45, -114, -128, 127,
+   103, -101, -124, 127, -11, -23, -123, 92,
+   -123, 24, 126, 41, -2, -39, -27, -94,
+   40, -112, -48, 127, 58, 14, 38, -75,
+   -64, 73, 117, 100, -119, -11, 6, 32,
+   -126, -14, 35, 121, -10, 54, -60, 89,
+   -3, 69, -25, -20, 43, -86, -34, 24,
+   27, 7, -81, -99, -23, -16, -26, 13,
+   35, -97, 80, -29, -13, -121, -12, -65,
+   -94, 70, -89, -126, -95, 88, 33, 96,
+   29, -90, 69, 114, -78, 65, 90, -47,
+   -47, 89, 1, -12, 3, 8, 30, 5,
+   2, -30, -1, 6, -7, 10, -4, 46,
+   -27, -40, 22, -6, -17, 45, 24, -9,
+   23, -14, -63, -26, -12, -57, 27, 25,
+   55, -76, -47, 21, 34, 33, 26, 17,
+   14, 6, 9, 26, 25, -25, -25, -18
+};
+
+static const rnn_weight input_dense_bias[24] = {
+   38, -6, 127, 127, 127, -43, -127, 78,
+   127, 5, 127, 123, 127, 127, -128, -76,
+   -126, 28, 127, 125, -30, 127, -89, -20
+};
+
+static const DenseLayer input_dense = {
+   input_dense_bias,
+   input_dense_weights,
+   42, 24, ACTIVATION_TANH
+};
+
+static const rnn_weight vad_gru_weights[1728] = {
+   -124, 23, -123, -33, -95, -4, 8, -84,
+   4, 101, -119, 116, -4, 123, 103, -51,
+   29, -124, -114, -49, 31, 9, 75, -128,
+   0, -49, 37, -50, 46, -21, -63, -104,
+   54, 82, 33, 21, 70, 127, -9, -79,
+   -39, -23, -127, 107, 122, -96, -46, -18,
+   -39, 13, -28, -48, 14, 56, -52, 49,
+   -1, -121, 25, -18, -36, -52, -57, -30,
+   54, -124, -26, -47, 10, 39, 12, 2,
+   9, -127, -128, 102, 21, 11, -64, -71,
+   89, -113, -111, 54, 31, 94, 121, -40,
+   30, 40, -109, 73, -9, 108, -92, 2,
+   -127, 116, 127, 127, -122, 95, 127, -37,
+   -127, 28, 89, 10, 24, -104, -62, -67,
+   -14, 38, 14, -71, 22, -41, 20, -50,
+   39, 63, 86, 127, -18, 79, 4, -51,
+   2, 33, 117, -113, -78, 56, -91, 37,
+   34, -45, -44, -22, 21, -16, 56, 30,
+   -84, -79, 38, -74, 127, 9, -25, 2,
+   82, 61, 25, -26, 26, 11, 117, -65,
+   12, -58, 42, -62, -93, 11, 11, 124,
+   -123, 80, -125, 11, -90, 42, 94, 4,
+   -109, -1, 85, -52, 45, -26, -27, 77,
+   -5, 30, 90, 0, 95, -7, 53, 29,
+   -82, 22, -9, 74, 2, -12, -73, 114,
+   97, -64, 122, -77, 43, 91, 86, 126,
+   106, 72, 90, -43, 46, 96, -51, 21,
+   22, 68, 22, 41, 79, 75, -46, -105,
+   23, -116, 127, -123, 102, 57, 85, 10,
+   -29, 34, 125, 126, 124, 81, -15, 54,
+   96, -128, 39, -124, 103, 74, 126, 127,
+   -50, -71, -122, -64, 93, -75, 71, 105,
+   122, 123, 126, 122, -127, 33, -63, -74,
+   124, -71, 33, 41, -56, 19, 6, 65,
+   41, 90, -116, -3, -46, 75, -13, 98,
+   -74, -42, 74, -95, -96, 81, 24, 32,
+   -19, -123, 74, 55, 109, 115, 0, 32,
+   33, 12, -20, 9, 127, 127, -61, 79,
+   -48, -54, -49, 101, -9, 27, -106, 74,
+   119, 77, 87, -126, -24, 127, 124, 31,
+   34, 127, 40, 3, -90, 127, 23, 57,
+   -53, 127, -69, -88, -33, 127, 19, -46,
+   -9, -125, 13, -126, -113, 127, -41, 46,
+   106, -62, 3, -10, 111, 49, -34, -24,
+   -20, -112, 11, 101, -50, -34, 50, 65,
+   -64, -106, 70, -48, 60, 9, -122, -45,
+   15, -112, -26, -4, 1, 39, 23, 58,
+   -45, -80, 127, 82, 58, 30, -94, -119,
+   51, -89, 95, -107, 30, 127, 125, 58,
+   -52, -42, -38, -20, -122, 115, 39, -26,
+   5, 73, 13, -39, 43, -23, -20, -125,
+   23, 35, 53, -61, -66, 72, -20, 33,
+   8, 35, 4, 7, 18, 19, 16, -45,
+   -50, -71, 31, -29, -41, -27, 10, 14,
+   27, 9, -23, 98, 6, -94, 92, 127,
+   -114, 59, -26, -100, -62, -127, -17, -85,
+   -60, 126, -42, -6, 33, -120, -26, -126,
+   -127, -35, -114, -31, 25, -126, -100, -126,
+   -64, -46, -31, 30, 25, -74, -111, -97,
+   -81, -104, -114, -19, -9, -116, -69, 22,
+   30, 59, 8, -51, 16, -97, 18, -4,
+   -89, 80, -50, 3, 36, -67, 56, 69,
+   -26, 107, -10, 58, -28, -4, -57, -72,
+   -111, 0, -75, -119, 14, -75, -49, -66,
+   -49, 8, -121, 22, -54, 121, 30, 54,
+   -26, -126, -123, 56, 5, 48, 21, -127,
+   -11, 23, 25, -82, 6, -25, 119, 78,
+   4, -104, 27, 61, -48, 37, -13, -52,
+   50, -50, 44, -1, -22, -43, -59, -78,
+   -67, -32, -26, 9, -3, 40, 16, 19,
+   3, -9, 20, -6, -37, 28, 39, 17,
+   -19, -10, 1, 6, -59, 74, 47, 3,
+   -119, 0, -128, -107, -25, -22, -69, -23,
+   -111, -42, -93, -120, 90, -85, -54, -118,
+   76, -79, 124, 101, -77, -75, -17, -71,
+   -114, 68, 55, 79, -1, -123, -20, 127,
+   -65, -123, -128, -87, 123, 9, -115, -14,
+   7, -4, 127, -79, -115, 125, -28, 89,
+   -83, 49, 89, 119, -69, -5, 12, -49,
+   60, 57, -24, -99, -110, 76, -83, 125,
+   73, 81, 11, 8, -45, 1, 83, 13,
+   -70, -2, 97, 112, -97, 53, -9, -94,
+   124, 44, -49, -24, 52, 76, -110, -70,
+   -114, -12, 72, -4, -114, 43, -43, 81,
+   102, -84, -27, 62, -40, 52, 58, 124,
+   -35, -51, -123, -43, 56, -75, -34, -35,
+   -106, 93, -43, 14, -16, 46, 62, -97,
+   21, 30, -53, 21, -11, -33, -20, -95,
+   4, -126, 12, 45, 20, 108, 85, 11,
+   20, -40, 99, 4, -25, -18, -23, -12,
+   -126, -55, -20, -44, -51, 91, -127, 127,
+   -44, 7, 127, 78, 38, 125, -6, -94,
+   -103, 73, 126, -126, 18, 59, -46, 106,
+   76, 116, -31, 75, -4, 92, 102, 32,
+   -31, 73, 42, -21, -28, 57, 127, -8,
+   -107, 115, 124, -94, -4, -128, 29, -57,
+   70, -82, 50, -13, -44, 38, 67, -93,
+   6, -39, -46, 56, 68, 27, 61, 26,
+   18, -72, 127, 22, 18, -31, 127, 61,
+   -65, -38, 1, -67, -1, 8, -73, 46,
+   -116, -94, 58, -49, 71, -40, -63, -82,
+   -20, -60, 93, 76, 69, -106, 34, -31,
+   4, -25, 107, -18, 45, 4, -61, 126,
+   54, -126, -125, 41, 19, 44, 32, -98,
+   125, -24, 125, -96, -125, 15, 87, -4,
+   -90, 18, -40, 28, -69, 67, 22, 41,
+   39, 7, -48, -44, 12, 69, -13, 2,
+   44, -38, 111, -7, -126, -22, -9, 74,
+   -128, -36, -7, -123, -15, -79, -91, -37,
+   -127, -122, 104, 30, 7, 98, -37, 111,
+   -116, -47, 127, -45, 118, -111, -123, -120,
+   -77, -64, -125, 124, 77, 111, 77, 18,
+   -113, 117, -9, 67, -77, 126, 49, -20,
+   -124, 39, 41, -124, -34, 114, -87, -126,
+   98, -20, 59, -17, -24, 125, 107, 54,
+   35, 33, -44, 12, -29, 125, -71, -28,
+   -63, -114, 28, -17, 121, -36, 127, 89,
+   -122, -49, -18, -48, 17, 24, 19, -64,
+   -128, 13, 86, 45, 13, -49, 55, 84,
+   48, 80, -39, 99, -127, 70, -33, 30,
+   50, 126, -65, -117, -13, -20, -24, 127,
+   115, -72, -104, 63, 126, -42, 57, 17,
+   46, 21, 119, 110, -100, -60, -112, 62,
+   -33, 28, 26, -22, -60, -33, -54, 78,
+   25, 32, -114, 86, 44, 26, 43, 76,
+   121, 19, 97, -2, -3, -73, -68, 6,
+   -116, 6, -43, -97, 46, -128, -120, -31,
+   -119, -29, 16, 16, -126, -128, -126, -46,
+   -9, -3, 92, -31, -76, -126, -3, -107,
+   -12, -23, -69, 5, 51, 27, -42, 23,
+   -70, -128, -29, 22, 29, -126, -55, 50,
+   -71, -3, 127, 44, -27, -70, -63, -66,
+   -70, 104, 86, 115, 29, -92, 41, -90,
+   44, -11, -28, 20, -11, -63, -16, 43,
+   31, 17, -73, -31, -1, -17, -11, -39,
+   56, 18, 124, 72, -14, 28, 69, -121,
+   -125, 34, 127, 63, 86, -80, -126, -125,
+   -124, -47, 124, 77, 124, -19, 23, -7,
+   -50, 96, -128, -93, 102, -53, -36, -87,
+   119, -125, 92, -126, 118, 102, 72, -2,
+   125, 10, 97, 124, -125, 125, 71, -20,
+   -47, -116, -121, -4, -9, -32, 79, -124,
+   -36, 33, -128, -74, 125, 23, 127, -29,
+   -115, -32, 124, -89, 32, -107, 43, -17,
+   24, 24, 18, 29, -13, -15, -36, 62,
+   -91, 4, -41, 95, 28, -23, 6, 46,
+   84, 66, 77, 68, -70, -1, -23, -6,
+   65, 70, -21, 9, 77, -12, 2, -118,
+   4, 9, -108, 84, 52, 2, 52, 13,
+   -10, 58, -110, 18, 66, -95, -23, 70,
+   31, -3, 56, 56, -3, -7, 1, -27,
+   -48, -61, 41, -4, 10, -62, 32, -7,
+   -24, 9, -48, -60, -4, 79, -20, -38,
+   -76, 68, -49, -97, 0, -15, 5, -100,
+   -49, -95, -99, -115, -9, -40, 10, 104,
+   13, 56, 127, -27, -109, -94, -118, -102,
+   -44, -85, 52, 127, -4, 14, 62, 121,
+   -122, -26, -79, -42, -34, 1, 25, -38,
+   -79, -58, -31, -31, -90, -30, -123, 32,
+   -56, 125, 66, 124, -1, 3, 91, -103,
+   -7, 23, 78, -18, 9, 69, -69, 76,
+   -38, -33, -2, -98, 18, 106, 84, 55,
+   87, -47, 35, -124, 64, 41, -14, 46,
+   25, -2, 120, -21, 82, 19, -79, -37,
+   -3, -8, -16, 21, 19, -5, -28, -112,
+   39, -6, -30, 53, -69, 53, 46, 127,
+   123, 78, 20, 28, -7, 73, 72, 17,
+   -40, 41, 111, 57, 32, -95, 29, 28,
+   -39, -65, 54, -20, -63, 29, -67, 3,
+   44, -57, -47, 11, 61, -22, -44, 61,
+   48, -100, 20, 125, 96, -24, -16, 3,
+   -69, -126, 74, -125, 9, 45, -67, -123,
+   -59, -72, 118, 69, 45, 50, -57, 67,
+   13, -66, -106, 47, 62, 22, -1, -22,
+   -25, -40, -125, 3, 125, 32, 102, -56,
+   -25, -75, -30, 122, 60, -13, 36, -73,
+   7, -84, 124, 40, -118, 17, -87, -118,
+   -8, 3, -27, 111, -40, 40, -51, 127,
+   125, -45, -30, -54, 46, 80, -1, -30,
+   101, -17, 18, 26, 54, 7, -12, 1,
+   -127, 123, -122, -27, -75, 64, 10, 25,
+   -15, -44, 127, -127, 5, -84, -81, -7,
+   19, -26, 126, 15, 116, -126, 14, -76,
+   44, 62, -110, -124, 125, -29, -87, -3,
+   -69, 82, 90, 57, -123, 123, 100, -19,
+   -51, -32, 69, 37, -57, -128, -124, -72,
+   -13, 51, -7, -45, -73, 5, 99, -26,
+   -117, -96, -109, 4, -31, -12, 0, 31,
+   -42, -27, 12, -81, 118, 39, 83, 14,
+   41, -126, 107, -82, 94, -116, -122, -47,
+   -109, -84, -128, -35, -56, 66, 8, -65,
+   19, 42, -46, -72, -109, 41, 43, -127,
+   -113, 58, 127, 42, -75, -1, 65, 117,
+   -55, -113, -123, 124, 43, -96, -115, -19,
+   68, 15, 94, 3, 75, 0, 34, 9,
+   42, 110, -48, 92, -76, 99, -17, 27,
+   32, 13, 125, 50, -17, 56, 4, 53,
+   34, -8, 99, 80, -126, -21, -65, -11,
+   -46, 44, -81, -3, -121, 123, 66, -81,
+   -84, 119, 127, 84, 105, 45, -66, -42,
+   -23, 32, -25, 12, 111, 127, 88, 125,
+   30, 24, -127, -9, -54, 127, -116, -119,
+   88, 70, 94, -120, 35, -93, 15, 22,
+   -21, 25, -110, -123, -45, 8, -109, 125,
+   -122, -86, -126, 8, -14, -120, -45, -45,
+   69, -125, -122, 6, 81, 86, 125, 95,
+   54, 77, 54, -123, 126, -85, -117, 56,
+   11, 0, -61, -91, -12, -2, -113, -3,
+   -15, -122, -63, -91, 10, 84, -111, 125,
+   93, 21, 62, -78, -116, 13, -57, 28,
+   -124, 126, 110, 12, 15, 95, 15, -19,
+   -125, -97, 52, -7, 101, 9, 20, -125,
+   -26, -56, 72, 77, 12, -126, 22, -29,
+   47, 62, 95, 112, 69, 32, 97, -83,
+   -8, -5, 67, -63, -123, 79, 59, 0,
+   -6, -17, 4, -111, -52, 27, 65, 0
+};
+
+static const rnn_weight vad_gru_recurrent_weights[1728] = {
+   65, 83, 35, 56, 24, -34, -28, -2,
+   125, 19, 42, -9, 124, -53, 24, -87,
+   11, 35, -81, -35, -125, -31, 123, -21,
+   33, -91, 113, -93, 45, -6, 53, 38,
+   -92, 8, -27, 87, 4, 43, 43, 10,
+   -128, -128, -46, 127, -38, -45, 25, -87,
+   19, 5, 52, -96, -23, -29, 121, -126,
+   -24, -20, -2, 69, -50, 6, 71, -81,
+   -125, 90, -94, 1, -38, 36, 89, 17,
+   -60, 71, -48, 18, -15, 44, -18, 59,
+   11, 114, -51, 32, 110, 1, 4, 109,
+   -24, 127, 27, 60, 88, 24, 45, -59,
+   75, -36, 8, 57, -32, -25, 13, 126,
+   -89, -61, -76, 127, 18, -62, -68, 23,
+   -113, 5, 126, 43, -88, 26, -78, 18,
+   75, 21, 9, -74, 20, 41, 126, -118,
+   -15, 9, 116, 126, -127, 34, -6, 126,
+   -128, -53, -54, -55, -121, 70, 127, -12,
+   -68, 82, -25, 104, -126, 126, -21, -26,
+   124, -75, -127, -120, 13, 61, -64, -108,
+   -63, -65, -44, -35, -61, -39, 109, -74,
+   113, -3, 108, -30, 125, 120, 39, 125,
+   -128, -95, -99, 111, 9, 25, 114, -75,
+   -92, -54, -12, -32, -38, 10, 31, 10,
+   63, 51, 40, -99, 74, 4, 50, -128,
+   -36, -35, -11, -28, -126, -7, 66, -58,
+   -126, -22, -83, -61, -127, 49, 126, -8,
+   7, 62, 36, -11, -32, -44, 63, 116,
+   41, 65, -127, 126, 63, -30, -96, 74,
+   -92, 127, 38, -18, -128, 68, -5, 101,
+   -4, 85, 58, 79, 0, -58, 8, 119,
+   -70, -1, -79, -68, 114, -28, -90, -6,
+   -112, 2, 127, -8, 10, 55, -59, -126,
+   127, 125, 80, 72, 35, -54, 95, -124,
+   -124, 79, 23, -46, -61, -127, -100, 99,
+   -77, 8, -87, 5, -2, 49, 85, 7,
+   -71, 82, 53, -41, 22, -22, -93, -103,
+   6, 52, -56, 14, -8, -111, 85, 16,
+   54, 32, -118, -24, 61, -53, 96, -70,
+   -5, -17, -67, -84, -7, -82, -107, -96,
+   21, -83, -58, 50, 12, -126, -1, -28,
+   34, -126, 115, 17, 91, 1, -127, 72,
+   11, 126, -81, 6, 96, -8, 77, 15,
+   -6, 63, -27, 20, -123, -109, 85, -79,
+   -17, 126, -92, 2, -61, 20, 14, 17,
+   121, 123, 30, 57, 120, 127, 57, 42,
+   117, 98, 67, 39, -20, -70, 100, 7,
+   125, 122, 40, 16, -79, 125, 83, 41,
+   -106, -57, 24, 55, 27, -66, -111, -44,
+   -7, -43, -66, 121, 42, -128, -45, 35,
+   15, -127, 34, -35, -34, -40, -18, -6,
+   63, 111, 31, 116, 127, 19, 24, -71,
+   -39, 34, 11, 19, -40, 27, 12, 106,
+   -10, 56, -82, -106, -2, -50, -52, 114,
+   -126, -34, -43, -68, 10, 76, 57, -118,
+   -128, 37, -104, 76, 125, 3, -76, 127,
+   -29, 84, -94, -15, 55, 125, 79, 127,
+   -57, -125, 104, -68, 126, 126, -77, 51,
+   45, 33, -109, 115, -11, 1, 95, -121,
+   -5, -9, -126, -114, 39, 68, -126, -107,
+   -51, -42, 24, -8, 51, -27, -43, 66,
+   -45, 62, -98, -109, 69, 67, 0, -125,
+   -128, 49, 31, 126, -122, 2, -55, -67,
+   -126, -70, -128, -125, -77, 25, 16, -8,
+   -102, 11, -75, 82, 38, -5, 5, 19,
+   34, 47, -127, -93, 21, 24, -97, -18,
+   31, 39, 34, -20, 22, 123, 7, -77,
+   -81, -46, -9, 1, 23, 39, -127, -43,
+   -8, -50, 10, -21, 59, -9, -4, -13,
+   -27, 44, 127, 52, -47, 70, -43, 52,
+   101, -49, 27, 45, 49, 33, -125, 55,
+   114, 20, -1, 76, -24, -96, 105, 24,
+   126, 75, -21, -105, 13, -42, 40, 126,
+   -30, -39, -95, 125, -63, 11, 6, 125,
+   125, -14, 5, 42, -61, -4, 49, 88,
+   6, -107, -28, 19, -29, 47, 126, 6,
+   -46, -89, -18, 91, -20, -6, 118, -21,
+   -22, 39, 115, 11, -42, 54, 73, -55,
+   -77, 62, -27, -59, -99, -12, -127, -40,
+   56, -3, -124, -91, 71, -111, 6, -19,
+   82, -24, -35, 102, -42, 7, -126, -126,
+   -125, 18, 98, -52, 127, 105, -52, 40,
+   -83, 126, -122, 109, 5, 127, 48, 6,
+   5, -125, 100, -16, 29, 85, -89, 8,
+   4, 41, 62, -127, 62, 122, 85, 122,
+   -107, 8, -125, 93, -127, 127, 102, 19,
+   19, -66, 41, -42, 114, 127, -48, -117,
+   -29, -6, -73, -102, -3, -19, 0, 88,
+   42, 87, -117, -20, 2, 122, 28, 63,
+   71, 66, 120, 93, 124, -43, 49, 103,
+   31, 90, -91, -22, -126, 26, -24, -21,
+   51, -126, 87, -103, -69, -10, -66, -23,
+   20, 97, 36, 25, -127, 30, -20, -63,
+   30, 51, -116, 23, 40, -39, 36, -83,
+   -77, -25, -50, 110, 14, 13, -109, 125,
+   -65, -55, -87, 124, -126, -32, -72, -108,
+   127, 127, -125, -124, 61, 121, 102, -128,
+   -127, 16, 100, 127, -124, -68, 72, -93,
+   -128, 43, -93, -19, -125, -97, -113, -33,
+   83, 127, -44, 127, -75, 127, 16, 44,
+   50, -122, 23, 118, 46, 19, 26, -128,
+   10, 4, 99, -14, -82, -13, 30, 125,
+   57, 65, 60, -71, 35, 98, 28, 7,
+   1, 43, 89, 70, 75, 121, -59, 82,
+   -126, -53, -16, -116, -65, 52, -52, 0,
+   80, 35, 45, -61, 46, 8, 107, 27,
+   -26, -118, 90, 57, -10, 7, -15, 0,
+   -39, -4, 12, 29, -1, 116, 84, 79,
+   119, 125, -59, 28, -6, -25, -43, 2,
+   90, 79, 67, 103, -82, 2, -6, 125,
+   19, 73, 0, -105, 112, -17, 104, 107,
+   124, 106, 19, 56, -44, 55, -112, 6,
+   -39, -83, 126, -93, -98, 57, -120, -23,
+   -38, 2, -31, -48, 106, 127, 127, 69,
+   16, 110, 71, 104, 62, -12, -22, 42,
+   -37, -94, 34, -1, -32, -12, -124, -47,
+   -13, 60, -75, -66, 58, -127, -2, 64,
+   76, -106, 73, -49, -31, 127, 126, 31,
+   16, 127, -110, 107, -16, -53, 20, 69,
+   -14, -125, 59, -44, 15, 120, 125, 125,
+   43, 6, 19, -58, 127, 127, 43, 16,
+   82, 97, -127, 127, -93, -41, 88, 0,
+   77, -15, 116, 16, -124, -31, -3, 95,
+   -40, -126, -54, -126, -83, -8, -59, 6,
+   67, -29, 4, 124, -10, 112, -28, -8,
+   85, -21, 45, 84, 6, -8, 11, 72,
+   32, 84, -62, 77, 2, -36, 75, 31,
+   -50, 116, 126, 119, -88, -55, -14, -37,
+   126, 40, -108, -6, -6, 57, 64, -28,
+   -76, 30, -117, -93, 31, -92, -44, -64,
+   94, 58, 65, 114, 41, 47, 71, 42,
+   -26, 99, -126, 57, -5, 74, -19, -113,
+   -1, 67, -21, 126, 1, -3, 33, 60,
+   -82, 37, -48, 89, 114, -38, 127, -114,
+   35, 58, -5, 21, -46, 121, -123, -43,
+   127, 115, 123, 122, -101, 126, 127, 81,
+   52, 89, -127, 102, 42, 117, -9, -2,
+   125, 127, 110, 96, 120, 66, 70, 124,
+   55, 84, -38, -58, 119, -127, -16, -79,
+   123, 18, -127, -50, -38, 120, -85, 1,
+   7, -56, 108, -77, -2, 21, 37, 1,
+   13, -105, -69, 28, -87, 33, -104, -51,
+   126, 41, 3, -121, 28, 71, 58, 86,
+   -8, 127, 94, -55, 125, 40, -19, 127,
+   -33, -87, -23, 7, -111, -68, 9, 84,
+   -119, 55, -82, 78, -37, -20, -9, -23,
+   53, -13, 15, -46, 116, 126, -127, 56,
+   -126, 125, -7, -1, 45, 26, 125, 121,
+   29, 47, -86, 30, 10, 76, -125, -7,
+   23, 92, -12, -39, -18, 92, -97, -8,
+   -85, -41, 49, -50, 123, -37, -126, -30,
+   14, 79, -49, -65, 9, -36, -38, -96,
+   85, -24, -13, 37, -25, -5, -64, -127,
+   55, -60, -18, -61, -63, 127, 56, 67,
+   15, 124, 72, 120, 127, 40, -10, 114,
+   24, -23, 46, 78, -53, 125, 86, 124,
+   86, 0, 38, 93, 21, 127, 123, 75,
+   -72, 13, 48, 33, 83, -51, 15, -32,
+   -49, -33, 120, 64, 7, 9, 65, 60,
+   21, -21, -61, -53, -113, 84, -97, 101,
+   37, -114, -27, 41, 73, 126, -10, 59,
+   61, -15, 70, -13, 82, -4, 69, 56,
+   94, -91, -50, 92, -74, -48, 53, -7,
+   -107, 127, 28, 30, -26, -21, -61, 77,
+   82, 64, -91, -125, 122, -104, 127, 123,
+   122, 123, 76, -126, 127, -6, -80, 7,
+   40, -66, -65, 54, -2, 23, 96, -64,
+   74, 2, -53, -12, -123, 39, 60, -20,
+   16, -17, -97, 23, -4, -53, -122, 32,
+   -16, -54, -95, 43, 71, -1, -67, -33,
+   41, 18, 72, 28, -83, 31, -100, -91,
+   -27, 10, -128, -106, 2, 76, -13, 42,
+   34, 112, -19, 44, 40, -9, -11, 65,
+   92, -43, -125, 2, 47, -32, 25, 122,
+   -29, 12, 101, -8, -126, -23, 43, 7,
+   125, -20, -124, 82, -2, 13, -73, -106,
+   115, 31, 116, -23, -44, -71, 84, 3,
+   47, 91, 127, 127, -15, 95, 7, 93,
+   5, 113, -50, 54, 11, 13, -127, 17,
+   72, 43, -23, 5, -70, 20, 15, -27,
+   99, 69, -109, -122, -94, 16, 127, 0,
+   116, 104, 45, 108, -34, 87, 72, -14,
+   118, 46, 42, 109, -26, 95, 93, 127,
+   60, 127, -93, -54, -122, 34, -105, 56,
+   55, 103, 125, -71, -50, 95, -72, 127,
+   107, 21, 73, 126, 61, 127, 127, 24,
+   -62, 90, 73, 90, -46, -78, -124, 72,
+   123, -42, 50, -107, 17, -32, -62, -89,
+   124, 1, 80, -2, 117, 119, -65, -127,
+   -95, -121, -52, 103, 66, 75, -3, -62,
+   -127, 127, -74, 124, 79, 49, 40, 105,
+   -67, -71, -70, 43, 127, 119, -4, 66,
+   43, 23, 91, -126, 15, 63, -119, 112,
+   103, 15, -99, 31, -127, 69, 116, -46,
+   -67, 2, -126, -29, 30, 30, -69, -98,
+   -47, -87, -70, -127, 23, -73, 30, -7,
+   94, -52, -65, 98, -45, 97, 53, 23,
+   -9, -22, -52, -47, 6, -1, -85, -15,
+   -61, -14, 68, 110, -10, -121, -25, -35,
+   -15, -94, -123, 27, 75, 48, -66, -56,
+   -44, 93, 109, 67, -36, 24, 70, -126,
+   8, -127, 126, 52, 11, -32, 120, -13,
+   -26, -28, -125, 127, 106, -50, 124, 36,
+   -126, -12, 0, -23, 76, -71, -126, -12,
+   -17, -82, 12, 124, 57, 33, 4, 77,
+   -46, 71, -34, 72, 125, -128, 124, -24,
+   -128, 75, -120, 69, -45, 55, 33, 127,
+   -33, 4, -105, -41, -59, -91, 123, 44,
+   -127, 127, -67, 52, 25, -125, -65, 100,
+   -25, 123, 6, 11, -123, -92, -33, 126,
+   -17, -4, 29, 33, 127, 96, 3, 87,
+   -48, -18, -70, 123, 58, -127, -3, -52,
+   -1, -36, -41, 127, 51, -52, -27, 46,
+   -83, 57, 9, 126, 127, 94, 79, -37,
+   -127, -40, 67, 52, 82, -66, 122, -13,
+   -73, 127, -8, -80, 46, -48, 4, -54
+};
+
+static const rnn_weight vad_gru_bias[72] = {
+   124, 125, -57, -126, 53, 123, 127, -75,
+   68, 102, -2, 116, 124, 127, 124, 125,
+   126, 123, -16, 48, 125, 126, 78, 85,
+   11, 126, -30, -30, -64, -3, -105, -29,
+   -17, 69, 63, 2, -32, -10, -62, 113,
+   -52, 112, -109, 112, 7, -40, 73, 53,
+   62, 6, -2, 0, 0, 100, -16, 26,
+   -24, 56, 26, -10, -33, 41, 70, 109,
+   -29, 127, 34, -66, 49, 53, 27, 62
+};
+
+static const GRULayer vad_gru = {
+   vad_gru_bias,
+   vad_gru_weights,
+   vad_gru_recurrent_weights,
+   24, 24, ACTIVATION_RELU
+};
+
+static const rnn_weight noise_gru_weights[12960] = {
+   -10, -8, 5, -72, 7, 55, -38, 3,
+   10, 4, 21, 60, 73, 0, -3, 34,
+   49, -36, 17, 8, 18, 41, -51, -42,
+   34, -8, 126, 15, 112, 74, -60, -60,
+   53, -17, 65, 6, 74, -1, 26, 80,
+   -46, -99, -47, 40, 29, -21, 85, -75,
+   27, -117, 46, -22, -76, 56, 16, -67,
+   -49, -63, -35, -10, -20, 10, 68, 7,
+   -1, 37, 58, -53, 6, -79, -20, 12,
+   6, 91, -63, 67, 58, -13, -23, -74,
+   -50, -77, -53, -22, -56, 123, -33, 28,
+   74, -85, -9, -57, -32, 38, 21, 122,
+   40, 23, -30, -81, -68, -29, -14, -98,
+   -1, -62, -32, 19, 102, 26, 28, -23,
+   104, 28, -43, -20, -41, 28, 80, -22,
+   -88, 6, -26, 14, 34, -46, 57, -33,
+   -105, -16, 3, -17, -55, -1, -47, -122,
+   11, 16, 62, 78, -1, -64, 71, 57,
+   -5, 45, 65, -93, 31, 30, -25, 21,
+   23, 32, -1, -75, -10, 75, -90, 21,
+   7, -110, -77, -39, 18, -39, 54, -97,
+   12, 52, -97, 17, 73, 120, -81, -114,
+   67, 82, 29, -71, -47, 69, -64, 17,
+   -105, -24, -70, -32, -2, -112, -31, -48,
+   1, 22, 92, -21, -89, -65, 16, 49,
+   3, 15, 80, -21, -1, 37, -4, -25,
+   12, -80, -43, 56, -7, 36, -20, 18,
+   -12, 39, 66, 74, -100, 117, 76, -82,
+   -93, 63, 56, 36, 5, 41, -57, 31,
+   -47, -14, 52, -22, -56, 29, -123, -104,
+   41, -113, 124, -106, -36, 41, -86, -40,
+   44, 28, -6, 114, -32, -17, -26, -77,
+   -69, 42, -33, 61, 28, 82, -18, 71,
+   -53, -63, 122, -38, -49, -108, -32, 126,
+   126, 45, 43, -56, 61, 9, -20, -53,
+   122, 98, -3, 3, 24, -3, 80, -42,
+   -20, 57, -34, 108, -26, 48, 116, -14,
+   53, 5, -45, 21, -55, 114, -49, -29,
+   -44, -5, -70, 98, 63, -115, -66, 53,
+   -55, -19, 83, -12, 7, 47, 42, 15,
+   -36, 44, 75, -85, 105, -84, -17, -127,
+   15, -67, -105, 23, 36, -1, -16, -116,
+   21, 58, 69, -57, -104, -81, -49, 91,
+   26, -72, 33, -31, -37, -79, 5, 9,
+   123, -61, 11, 67, -14, -29, 41, -53,
+   37, -59, -20, -24, 95, 125, -66, -26,
+   17, 28, -43, -8, -100, 80, -6, 0,
+   37, -123, -54, -92, 28, 56, 127, 48,
+   11, -58, 99, -90, 63, -4, 6, 10,
+   37, -38, -15, 31, 5, -39, 25, -17,
+   24, -23, -64, -68, 41, 65, 28, -113,
+   -115, -27, -51, 50, 9, -101, 73, -41,
+   -104, 88, -71, 3, -87, 119, -73, 20,
+   -35, 0, -30, 34, -31, -9, -4, 23,
+   -19, 35, -16, 111, 66, -52, -107, 101,
+   54, -2, -3, 109, -40, -2, 119, 74,
+   -26, -116, -105, -90, 25, -111, -43, -92,
+   -3, -104, 102, 11, 19, -83, 14, -62,
+   38, 57, 50, -10, 36, -95, 124, 32,
+   -34, -123, -7, -109, 124, -119, -67, -116,
+   -31, 114, -65, -34, -126, 8, 8, 5,
+   53, -28, 53, 84, -9, -14, 92, -70,
+   74, 116, -4, 121, -49, 108, 0, 126,
+   123, -1, -25, 24, 56, -121, 20, -47,
+   -41, -11, -22, -32, -40, -41, -66, 29,
+   -128, -30, -28, 31, -39, 30, 57, -96,
+   63, -121, 71, 1, -29, -20, 72, 114,
+   12, -43, 23, -75, 24, -4, -123, 17,
+   18, -68, -23, 51, -30, 39, -125, -48,
+   13, -119, -75, -74, 51, 125, -10, 29,
+   -103, 6, -28, 22, -45, 19, 17, 19,
+   33, -3, -18, -30, -12, -25, -128, 61,
+   94, 47, -56, 59, -62, 66, -28, 18,
+   -115, 12, -3, -80, 60, -62, 55, -16,
+   68, 23, -6, 109, 11, 0, -7, -96,
+   -11, 21, 44, -75, -8, -10, -10, 69,
+   14, 14, -41, 26, 67, 37, -30, 44,
+   11, -16, 3, 66, 1, -18, 21, 96,
+   -29, -100, 27, -8, -98, 21, -2, 58,
+   -45, -15, 93, 37, -66, -48, -7, -5,
+   39, -57, 17, -81, 42, 0, -40, 123,
+   3, 118, -14, 56, -113, -68, -127, 74,
+   -78, 46, 97, -61, -42, 68, -32, 16,
+   -10, -82, -6, 1, 98, -48, 20, 32,
+   -102, -35, 45, -5, -91, 26, 37, 18,
+   59, -88, -29, 17, 43, 33, 14, 6,
+   -37, -37, 5, -7, -37, -13, 72, -6,
+   -128, -43, 17, 32, 45, -26, 4, -85,
+   -59, 8, 5, -27, 51, 55, 42, -79,
+   -13, -51, 49, 70, -26, -21, 9, 27,
+   21, -26, -76, 28, 1, 89, -76, 23,
+   -4, 10, 31, -13, -22, 3, 41, 24,
+   18, 25, -55, 10, -23, 4, -72, -18,
+   -91, -50, 1, -55, 12, -26, -43, 11,
+   -14, 27, -82, -73, 36, 27, -20, 62,
+   53, 100, 75, -12, -37, -77, -127, 32,
+   -21, -24, 34, -26, -39, -5, -66, 94,
+   -97, 19, 16, 61, 59, 65, 37, -64,
+   26, -34, 63, 74, 7, 38, -2, -27,
+   82, -73, -10, 37, -43, 1, 23, 24,
+   25, -5, 13, 6, -76, 78, 46, 44,
+   -107, 14, 7, -22, 28, -125, 47, -48,
+   28, -16, 15, 1, -16, 21, 15, 51,
+   37, -17, 2, 39, -23, -28, 10, -51,
+   -48, -1, 6, 88, 38, 22, -40, 37,
+   -22, -23, 67, -4, -3, -6, 9, 108,
+   -32, 31, 77, 28, -101, -23, -10, -38,
+   -13, 12, -34, 55, 24, -4, 48, 29,
+   -72, -83, 41, -31, -49, -68, 5, -3,
+   124, -19, 44, -94, -4, -8, -31, 9,
+   -21, 58, -60, 24, 13, -9, 97, 53,
+   93, -51, 105, 55, 36, -32, 6, -51,
+   -99, 19, 39, -63, -64, 29, 22, 5,
+   -24, -74, 72, -6, 35, 37, -25, 65,
+   74, 29, 30, 65, 91, 30, -42, 15,
+   42, -64, -87, -68, 53, -78, -33, 21,
+   -60, 33, 7, 6, 10, 68, 55, -47,
+   51, -56, 79, -29, -1, -66, -29, 50,
+   66, -12, -67, 69, -53, -90, -31, -123,
+   49, 7, 10, -6, 55, -61, -14, -6,
+   59, -2, -41, 21, 10, -21, -24, -23,
+   -34, 30, -49, -41, -27, 36, -56, 46,
+   7, 18, -23, 78, -49, 1, -37, 43,
+   77, -21, -19, 18, 14, 35, 92, 39,
+   -39, 44, -58, -1, 4, -63, 27, 79,
+   -14, -7, -41, -34, -24, -25, 13, -14,
+   -30, 5, -62, 13, -52, 53, 40, -18,
+   -29, 52, -20, 11, 20, 23, -47, 51,
+   30, -91, -46, 39, 4, 53, -18, 2,
+   -28, -12, 62, -29, -57, -13, -20, 60,
+   -15, 3, 49, -26, 0, -30, -18, 97,
+   11, 52, 43, 87, 107, -94, -30, 63,
+   -4, -62, 48, 2, 22, 7, -11, -79,
+   -41, 18, -28, 9, 30, -58, 80, -64,
+   45, 2, 28, -49, -25, -34, 25, 87,
+   108, -8, -42, -34, 61, -14, -13, 62,
+   -98, -5, 23, 15, -2, -1, -6, -52,
+   40, -33, 61, -38, 76, -115, -23, 22,
+   17, 25, 63, -37, -32, 26, -19, -8,
+   54, 6, -39, -28, 25, 40, -29, 33,
+   10, -50, 20, 25, 6, -22, 69, -24,
+   -115, 2, -13, -28, 28, -8, 109, -18,
+   -64, 96, 6, 7, 31, -10, 7, -34,
+   24, -10, 50, 23, -59, -55, 45, 37,
+   -98, 27, -17, -47, 63, 57, 13, 35,
+   4, -85, -65, 52, -54, -19, -40, 4,
+   -68, -61, -85, 98, -81, 44, 25, -17,
+   44, -33, -31, -44, 21, -6, -29, -32,
+   -2, 50, -31, -16, 46, 50, -54, -18,
+   70, -88, -44, 26, -51, -34, 21, 48,
+   -16, -15, 5, -28, -37, 25, -52, 25,
+   37, -60, 19, -18, -49, 72, -120, -1,
+   65, -61, -28, 25, -114, 89, -61, 126,
+   -48, -64, 69, 37, 46, 9, 18, -117,
+   -35, 64, -75, 28, 127, 33, -63, 22,
+   -15, -28, -9, -41, 27, 68, -4, 54,
+   4, -89, -8, -10, 83, 73, -11, -90,
+   -8, 14, -92, -38, 11, -22, -36, 33,
+   -37, -38, -126, -74, -5, -12, -8, -4,
+   -28, -47, -30, -30, -6, 43, -5, 56,
+   3, -16, -83, -73, -51, 23, -99, -10,
+   -2, 57, -18, -17, -53, 3, -21, 35,
+   25, -116, -20, -33, 89, -44, 49, 102,
+   -74, -57, -65, -127, -33, 59, 60, 20,
+   -60, -1, -18, 10, -30, 106, 3, -24,
+   -15, 93, 45, -22, 7, 55, 9, -27,
+   -82, 3, 19, 9, 4, -14, -43, -36,
+   -19, 97, 85, 31, 42, -35, -19, -12,
+   -1, 68, -53, 46, -127, -93, 16, -63,
+   -58, -126, 55, 6, -52, 97, -41, 59,
+   49, -9, 10, 54, -42, 5, -11, -25,
+   -1, 35, 72, 52, 28, -6, -54, 30,
+   -28, 18, 38, -17, 57, -8, -44, -20,
+   42, -20, 94, -46, -2, -81, 110, 27,
+   -66, 5, 63, 36, -51, -55, -27, 71,
+   125, -5, -12, -57, 65, -98, 36, -12,
+   17, -8, -13, -8, -17, -52, -109, 15,
+   -31, 31, 9, -23, -22, -11, 10, 55,
+   -11, -52, -69, 52, 10, -23, 47, -35,
+   -4, -65, 15, 33, 53, -14, -104, 26,
+   -26, -29, -8, 97, -2, 58, -127, -4,
+   -106, 35, 53, -2, -71, 2, 79, 54,
+   39, -74, -121, 124, 41, 25, -33, 4,
+   28, -18, -9, -43, 59, -11, 31, -19,
+   -122, 86, 25, 54, -40, -18, 49, -25,
+   -28, 118, 65, -102, 111, -39, -7, -89,
+   -38, -17, 79, 0, -50, 72, 51, 22,
+   24, 36, 59, 1, 66, -119, -84, -8,
+   102, 44, 15, 56, 26, -74, -29, 28,
+   13, -75, 32, 78, -38, -45, -80, -90,
+   13, 3, 34, -76, -122, 120, -82, -34,
+   6, -32, -100, -89, 14, -14, 73, 24,
+   -41, 53, 30, -80, -63, 51, -17, 33,
+   47, -17, 14, -17, 32, 74, -52, 2,
+   14, -67, -16, -18, -57, 18, -14, 44,
+   -73, 45, 107, 38, 69, -24, -12, 114,
+   -15, 91, 10, -26, -51, 78, 63, -78,
+   -5, -120, 14, 32, -6, -25, -49, 67,
+   20, -66, 7, 65, 46, -41, -32, 62,
+   41, -50, -87, -34, 64, 70, 23, -36,
+   44, -51, -127, -22, -102, 33, -58, -23,
+   105, -29, -33, 47, 9, -44, 35, -36,
+   -21, 126, -90, -34, 105, -6, 18, -35,
+   3, -14, 65, 114, -2, -25, -27, -72,
+   -63, 61, -109, -13, -113, 8, -45, 22,
+   105, 6, 45, -47, 65, 16, 79, 28,
+   -21, 82, 37, -15, -64, -34, -114, 29,
+   67, 43, 78, 52, 34, -84, -54, -48,
+   -65, 63, -8, 18, -16, 10, 3, 71,
+   -101, 119, -24, 88, -26, 33, -38, -80,
+   14, -123, 24, -33, -20, 52, -1, -40,
+   49, -13, 8, -39, 23, -5, -11, -23,
+   -10, -17, -25, 43, 29, -13, -34, -19,
+   -35, -18, -21, 51, -21, -3, -19, 12,
+   -2, 50, 48, 22, -56, 39, -5, -38,
+   -60, -11, 36, 33, 13, -53, -9, 94,
+   8, -62, 55, -11, 101, 22, 2, -8,
+   -127, 98, -25, -37, -73, 71, -16, 45,
+   67, 8, -17, -90, -91, 23, -120, -39,
+   -9, 28, -128, 8, -52, -107, -27, 68,
+   33, -31, 29, 124, -26, 30, -10, -31,
+   33, 47, 9, -65, -46, 13, -90, 126,
+   99, -37, -81, 1, -61, 15, -4, 4,
+   -9, -34, -33, -33, -28, -49, 14, -93,
+   87, -80, 59, -56, -50, -45, 45, -65,
+   -97, 6, -121, 6, -113, 19, 56, -21,
+   4, 12, 87, 5, -112, 126, 69, 27,
+   -70, 82, 31, -27, -123, -16, 21, 32,
+   -5, 83, -95, -7, -1, 93, -9, 15,
+   124, 21, 21, -7, -45, -16, -66, 5,
+   -34, -118, -16, -32, -34, -44, 2, 124,
+   -78, 8, 90, -27, 127, 44, -28, 114,
+   -30, 114, -8, 27, -56, 18, 59, -24,
+   -62, 16, -25, -31, 71, 17, 3, 12,
+   92, -4, -78, 37, 127, 85, -3, -17,
+   80, 32, -2, 84, -71, -31, 62, -26,
+   47, -81, -51, -95, 66, -52, -57, -31,
+   -10, 54, 116, 88, -3, -122, -93, 7,
+   37, -70, -28, -91, 39, 12, -94, 41,
+   44, 70, -55, 69, 20, 56, -34, 1,
+   9, -34, -37, -4, -2, 23, 68, -44,
+   2, -46, -5, -72, -104, -94, -56, -30,
+   -59, 56, 14, 108, 36, 115, -96, 29,
+   -114, 105, -64, 5, 65, -82, 25, -10,
+   117, 58, 20, -19, 122, 33, -37, 35,
+   -19, -120, 6, -10, 78, -34, 126, -116,
+   -37, 59, -30, 55, 47, 51, -42, 11,
+   -2, -26, 29, 25, 51, -5, -34, 89,
+   -29, 76, -51, -44, 9, -17, 46, -42,
+   5, -52, -24, -14, 6, 127, 127, -9,
+   -5, -81, -2, 65, -67, 72, 99, 14,
+   -13, -6, -7, -36, -54, -6, -4, 30,
+   -29, -27, -28, -56, 83, -1, 29, -24,
+   -48, -23, -20, 11, -2, -4, -31, 39,
+   -45, 0, -18, -73, -29, 48, 51, -20,
+   61, 24, -62, 75, -32, -18, -44, -38,
+   44, 26, 38, -56, 14, -34, -48, -7,
+   19, -55, 20, -95, 45, 16, 13, 93,
+   -13, 21, -72, 23, 124, -33, -52, 51,
+   5, 8, -25, -10, -77, 102, -25, -1,
+   -14, 14, 4, 16, -28, 98, 18, -43,
+   -26, 12, -30, -86, -68, 81, 9, -50,
+   80, -56, -11, 37, 24, -11, 28, 1,
+   55, 36, 34, 23, -87, -58, 10, 31,
+   -11, 19, -48, 48, 95, -12, 33, -46,
+   100, 52, 32, -49, -24, -27, 46, -6,
+   -31, 21, 39, 33, 63, -65, -35, 79,
+   127, 11, 34, -13, -124, 10, -54, 24,
+   3, 24, 11, 16, -19, -45, 36, 52,
+   -32, 90, -33, -68, -51, 33, -16, 34,
+   65, 98, -8, 125, 60, -83, -21, 6,
+   111, 87, -46, -59, 44, -7, 89, 124,
+   28, 32, 30, 68, 106, -37, -1, -2,
+   -97, -57, -92, -37, 56, -75, 22, -31,
+   100, -44, -10, 12, -2, 95, 36, 3,
+   74, 35, 127, 51, -41, 72, 27, 59,
+   -105, 103, -2, -32, -116, 23, 43, 6,
+   48, -20, 110, 66, -42, -28, -41, -10,
+   33, 117, 14, 89, -18, -36, 54, 39,
+   88, -72, -27, 109, 27, -13, -119, 54,
+   -18, -14, 85, -12, 64, 6, 44, -15,
+   -66, -46, -18, 90, 109, 98, 119, -28,
+   11, 46, 29, 115, -20, -106, -27, 97,
+   -45, -82, 43, -103, 122, -14, -122, 24,
+   10, -128, 14, 10, 72, 40, -71, -10,
+   -21, -99, -103, 2, -120, 50, 0, 35,
+   -100, 46, 77, 88, -28, -1, 26, -46,
+   -3, -22, -37, -11, -82, -82, -128, -21,
+   -16, -4, -9, -69, -5, 40, 0, -63,
+   33, 19, -14, 83, 54, 24, 66, -8,
+   24, -122, -44, -32, 86, 38, -3, 6,
+   48, 32, 62, 34, 3, -42, 28, -11,
+   -23, -23, 21, 12, -2, 36, 4, -20,
+   -1, 64, -20, 11, 73, 23, -7, -50,
+   42, 7, 99, 40, -19, 39, 26, 65,
+   117, 7, -16, -6, 79, 70, -48, -12,
+   47, 19, 7, -54, -7, -43, 39, 50,
+   23, 53, -48, -97, 28, 6, 83, -25,
+   42, 38, 19, 32, -59, 22, -60, -94,
+   -45, -45, 83, -3, -69, 75, 34, 61,
+   66, 30, 19, -14, -32, -4, 13, -38,
+   8, -36, 31, -48, -56, -49, -24, 72,
+   -73, 60, 17, -40, 6, 125, 27, -18,
+   41, 28, 44, 29, -32, 45, -33, -6,
+   -41, 123, 5, -31, 89, 92, 20, -66,
+   73, -39, -51, 0, -31, 21, 69, 99,
+   -50, -3, -13, -10, -5, 72, 14, -13,
+   -57, 20, -33, 107, -84, 5, -57, -37,
+   -10, -46, -80, -108, 3, 49, -36, -28,
+   -44, 34, -125, 41, 48, -3, -33, 2,
+   12, 27, -56, -41, 18, -42, -25, 81,
+   -67, -86, -29, -7, 94, -89, 30, 84,
+   73, -21, 40, 29, -27, -19, -35, 68,
+   64, -4, -100, -102, -94, -19, -18, -30,
+   -36, 26, -2, 33, -93, 56, 67, 103,
+   -73, -101, -45, 18, 11, 18, -33, 43,
+   34, 37, -71, 27, -38, -13, -26, -13,
+   -16, 113, 33, 84, -26, -55, -17, -13,
+   15, 32, -8, -37, 32, -5, 113, -10,
+   126, 53, 23, -24, -52, -11, -55, -9,
+   -37, -33, 40, 65, 3, -95, -65, 78,
+   -13, -75, -22, 9, 93, 68, 46, 127,
+   16, 87, -47, 59, -36, -5, -3, 37,
+   16, 66, 19, -69, 42, -15, -18, 76,
+   96, 91, -7, 24, -29, 47, -20, 56,
+   45, -54, 50, -70, -52, 54, 41, 20,
+   63, 71, -63, 40, 1, 80, 20, -39,
+   6, -35, 71, -40, 7, -28, 63, -7,
+   -49, -12, 1, -16, 73, 9, 50, -46,
+   -10, 73, -81, 94, -13, 6, -1, 31,
+   -19, 15, 41, 3, -17, 0, -85, -93,
+   -86, -10, -37, 47, -6, -62, 30, 35,
+   20, 99, 37, 63, -17, -42, -28, -96,
+   2, -22, 3, 15, 28, 11, -115, 48,
+   -34, 6, -30, -78, -85, 38, 25, -32,
+   -29, -97, 2, 14, 26, 47, 99, 119,
+   71, 8, -60, 42, -55, 30, 53, 1,
+   31, -103, -20, -11, 0, 87, 37, -5,
+   89, 15, -32, -12, 55, 60, 3, -32,
+   -124, -2, -88, 53, -51, 55, -4, -53,
+   -46, 94, 18, 57, -72, 14, -41, 11,
+   14, -29, -3, -4, -9, 34, 18, -10,
+   -72, -14, -82, -90, -31, 11, -120, -48,
+   44, 3, -6, 79, -15, 8, -16, -89,
+   20, -125, -72, 69, 19, 118, -54, -2,
+   -10, 50, -28, -3, 17, -22, 104, 17,
+   101, -61, -9, -117, 5, -24, -105, -117,
+   -115, 28, -120, 36, -62, -77, 50, 67,
+   79, -41, -9, 4, 2, 15, 114, -12,
+   -16, 15, -49, 50, -122, -46, 30, 39,
+   56, 49, 14, -28, -71, -125, 36, 115,
+   -46, 47, -45, -16, 69, 113, -7, -119,
+   -43, -16, 17, -11, 102, 120, -34, 64,
+   -5, -53, 14, 0, -124, 120, 14, -26,
+   42, 74, 55, -12, 103, -37, 27, -54,
+   13, -54, -9, 39, 6, 6, -28, 43,
+   54, 21, 46, -90, -58, 122, -21, -81,
+   -13, -39, 50, 106, -2, 49, 9, -16,
+   24, 15, -73, 110, 1, 104, 52, -104,
+   2, -35, -17, 8, -58, 60, 26, 68,
+   -123, 6, 44, 70, -40, -4, -95, -21,
+   -110, 51, 80, -19, -97, -5, -50, -100,
+   -23, -30, 46, -66, -18, -38, -48, 38,
+   -9, -26, -71, 21, 25, 14, 16, 53,
+   14, -56, 20, 79, -87, 50, -7, -28,
+   52, 4, 11, -17, -26, 39, 2, 25,
+   6, 13, 11, 18, -56, -36, 46, -115,
+   32, -80, -44, -7, -32, -13, 74, -61,
+   9, -89, 14, 80, 20, -61, 109, -21,
+   -66, -34, -126, -6, 12, 22, -14, 55,
+   -28, -47, -59, -12, 2, -38, 73, -42,
+   91, -87, 37, -4, 29, 33, 122, 43,
+   85, 41, -50, 11, 29, 60, -4, 31,
+   -18, 8, -27, -75, 76, -13, 35, 18,
+   -49, -34, -33, 6, 51, 51, -41, 53,
+   47, 21, 62, -52, 30, 5, 16, 78,
+   -22, 28, -21, 31, -16, 21, -2, 62,
+   -94, -30, -83, -92, 122, -41, -113, -27,
+   -51, -123, 4, -116, 4, -68, -14, 3,
+   -21, -5, 29, -31, -15, -4, -27, -24,
+   10, -121, -119, -30, -37, -74, -32, -63,
+   -46, -69, -72, -44, 90, 84, 21, -16,
+   79, -16, -32, -111, 10, -25, 97, 57,
+   -59, -69, -83, -36, -24, -90, 14, 76,
+   -23, -16, 2, 26, 26, -50, 23, 120,
+   44, 32, -12, -29, -11, -45, 8, 41,
+   -28, 107, -32, -40, -92, -8, -76, -52,
+   76, 79, 93, 16, 86, 46, -14, 53,
+   -65, 53, 92, 63, 44, -30, 7, 5,
+   -4, 20, 22, 14, 8, 9, -58, -99,
+   -30, -119, 46, 2, -23, 34, 51, -63,
+   45, -84, -8, 36, -59, -2, -98, -6,
+   29, 121, -26, -1, -20, 39, 25, -66,
+   -56, 8, -40, -7, 25, -79, 90, 72,
+   -55, -12, -20, -123, -39, -25, -65, -12,
+   47, 30, 33, 55, 18, 19, -22, 35,
+   86, 65, 11, 119, -32, -47, -107, 80,
+   -50, -43, 44, -1, -14, 49, 17, 33,
+   13, 84, 64, 125, 97, 17, 20, 20,
+   -62, -7, -13, -16, -8, 18, -36, -89,
+   -13, 98, 21, 108, -35, 51, 44, -127,
+   -31, 40, -83, 50, -122, 16, -82, -105,
+   -58, 65, 76, -31, 61, 40, 28, -92,
+   43, -59, 63, -33, -33, 24, -37, -22,
+   7, 51, 54, 29, 12, 40, 68, -44,
+   79, 52, -3, 10, -62, 35, -26, 70,
+   40, 61, 83, -73, 97, 16, 33, 49,
+   0, -83, -15, -101, 67, -26, 108, 113,
+   3, 93, -15, 83, 27, -67, 71, 119,
+   -48, -31, -28, 4, 4, -15, -46, 13,
+   -17, -70, 78, 49, 36, 21, -72, -45,
+   -1, -31, -52, 1, 61, -17, -18, -71,
+   69, -65, -11, 104, -25, 52, 7, -70,
+   -14, -8, -16, -13, 72, 37, -91, -80,
+   31, 7, -33, -59, -12, -20, 26, 48,
+   69, -16, -87, -13, -11, -14, -14, 58,
+   -2, -3, -119, -17, 31, -17, -23, 75,
+   62, 43, -97, -42, -23, -9, -5, -11,
+   -43, 21, 37, -37, 6, -3, 14, 8,
+   18, -98, 37, -14, -50, -36, 31, 123,
+   7, 19, 95, 17, 22, 15, -7, 59,
+   62, 18, -93, 10, 23, 42, -26, -23,
+   -32, -28, 10, 42, 19, 38, 8, 31,
+   -109, -5, 81, -25, -40, 35, -96, -117,
+   -12, -4, -15, 13, 84, -70, -4, -93,
+   24, 28, -66, -45, -70, -118, -33, 116,
+   -6, 7, -54, 2, 11, 85, 34, -4,
+   67, 67, -96, -13, 3, 11, 50, 62,
+   -61, -28, 7, -17, 11, 22, -61, 62,
+   45, 42, 50, -26, -43, 114, 69, 121,
+   53, 127, 15, -3, 50, 30, 70, 26,
+   25, -15, 35, -72, -48, -11, 15, 29,
+   42, -40, 12, -38, -3, 16, -81, 65,
+   53, 84, -48, -66, 11, 23, -22, 77,
+   21, 115, -87, -35, -50, -89, -121, 67,
+   18, 8, 40, 66, -3, 11, -24, -100,
+   70, 35, 16, 16, -31, -62, 71, 64,
+   74, -124, -15, -26, -17, -26, -55, 71,
+   -22, 20, -35, 24, -48, 40, 56, 27,
+   -35, -14, -8, -34, 113, 41, 58, -8,
+   -2, -114, -38, -73, -28, -57, 70, 3,
+   -22, 64, 31, 29, -46, -43, 88, 11,
+   -67, -6, 71, -27, -24, -38, -24, -80,
+   -21, 36, -32, -84, 37, 55, -22, 24,
+   -54, 11, -94, -28, 8, -30, -46, 39,
+   25, 0, 6, 93, 34, 8, 3, 26,
+   -76, -69, 4, -71, 57, -65, -90, -40,
+   -43, -56, -16, -53, -11, -11, 7, 45,
+   -16, 7, 11, 39, -38, -9, -81, -86,
+   -50, -16, -39, -18, -11, -10, -69, -44,
+   -58, -49, 58, -63, 2, 64, 5, -81,
+   -36, 42, 56, 24, 11, 2, 36, 92,
+   78, 33, -2, -98, -55, 46, 14, 14,
+   42, -14, -12, -6, -41, -69, 88, -122,
+   36, 34, 12, -15, 18, -98, 58, -28,
+   44, 4, -107, 85, 46, 27, 8, 58,
+   66, -70, -8, 21, -110, -9, 89, -83,
+   55, 59, -110, 51, 44, 11, 16, 108,
+   43, -33, -18, -34, 2, -3, 28, -50,
+   53, 14, 44, 6, -19, 23, 41, 75,
+   72, -18, 12, -51, 34, -86, 28, 30,
+   -103, 74, 4, -43, 49, 10, -31, -10,
+   -17, -65, -82, -92, -17, 25, 1, -9,
+   30, 81, 15, 9, 72, 52, 27, 19,
+   61, 14, -64, 62, 5, -1, -16, -21,
+   -25, -59, 28, -7, 28, -35, -28, -17,
+   -16, -46, -25, -25, -79, -33, -112, 21,
+   41, 13, -6, 53, 7, 17, -54, -39,
+   -91, -94, 70, -128, -66, 28, -7, -93,
+   -120, 54, -47, 35, -111, -58, 54, -5,
+   -48, 11, -18, -104, -70, -78, 54, -7,
+   17, -8, -96, 72, -119, -125, 28, -107,
+   14, 16, -38, -48, 63, -21, 74, -45,
+   -65, -94, 118, 39, -100, 39, -41, 13,
+   19, -122, -55, 10, 23, 33, 20, -68,
+   24, -41, -113, 12, 95, 26, 0, -17,
+   -42, -66, -11, -107, -86, 76, 29, 49,
+   -108, 112, -28, 124, -55, -96, -23, 34,
+   91, -30, 61, -94, 102, -18, 19, -77,
+   -60, 13, -125, -28, 7, -34, -91, 22,
+   -12, -50, 17, -8, 2, 7, -18, -62,
+   51, -37, -55, 19, 35, -30, 8, 46,
+   -42, -56, -128, 61, -35, -16, -81, -8,
+   -30, -59, -22, -111, 6, -45, -76, 29,
+   16, -72, -34, -28, 22, -5, -116, 3,
+   18, -9, -56, -48, 18, 56, -97, -21,
+   -121, -116, -6, -24, -62, -26, -21, -69,
+   -52, -48, -22, 23, 72, -35, 68, 39,
+   47, 37, -18, 0, -76, 26, 114, -10,
+   25, 5, -12, 70, 17, -105, -25, -112,
+   5, 24, -8, 7, -38, -119, -21, 34,
+   125, -125, -2, 5, -6, 81, 40, 60,
+   54, -104, 22, -42, -2, 120, -33, 16,
+   38, -30, -23, -83, -60, -1, 86, 92,
+   -59, -10, -6, -11, -68, -96, -53, -3,
+   -9, -17, -17, 109, 34, -15, -121, -40,
+   5, 89, -38, -26, 38, -47, -80, -40,
+   -116, -34, -30, -76, -35, -39, -118, 27,
+   0, -67, 76, 0, -5, -2, 72, -15,
+   -1, -94, -75, -62, 37, -6, -91, 59,
+   -15, -8, -124, -25, -46, 17, -22, 28,
+   5, -50, 21, 63, -7, 12, 67, 33,
+   16, -35, -73, -120, -30, -14, -113, -77,
+   45, 84, -16, -50, -21, 44, -97, 6,
+   -61, -40, 29, -104, 28, 4, -17, 50,
+   14, 44, 13, -61, -34, -28, -8, 105,
+   67, 0, 31, -113, -121, -65, -21, 24,
+   57, 12, -16, 9, -5, -1, 38, -61,
+   -30, 60, -7, -55, 7, 32, 39, -33,
+   12, 30, -60, 13, -75, 3, 55, -40,
+   -16, 20, -86, 68, 24, -57, 72, 24,
+   -8, 62, -126, -42, 54, 122, 125, 64,
+   25, -38, -45, -78, -33, -109, 57, 15,
+   -79, -1, 73, 7, -20, -42, -67, -13,
+   -24, -69, 38, -38, -22, -115, 70, 15,
+   -104, 67, -35, -114, 27, 31, -80, -5,
+   27, -8, -11, -58, 39, -29, 1, -18,
+   -4, 23, -12, 46, 33, 32, 21, -14,
+   8, -13, 43, -8, 25, -37, 55, -30,
+   -37, -39, -2, -117, -12, -14, -3, -10,
+   30, -27, 9, 7, -32, -25, -101, -115,
+   -40, -8, -5, -38, 34, 44, 45, -62,
+   45, -25, 100, -29, 52, 24, -32, 66,
+   31, 112, 72, 12, 121, -57, 21, 125,
+   55, 36, -33, 22, 2, 52, 40, 25,
+   -1, 26, 6, -23, -18, -16, 11, 25,
+   17, -62, 6, -60, -25, 65, 50, 114,
+   62, -44, -19, 43, 70, 76, 40, -8,
+   47, -31, -64, 17, -34, 42, 8, 20,
+   -19, -7, -59, 54, 26, -31, 120, 18,
+   -55, -3, 4, -2, 58, -113, 10, -41,
+   -6, -13, 2, 9, 28, -20, -34, 74,
+   -44, 45, 49, 1, -9, 72, -13, -65,
+   -50, 17, 22, 32, -10, 87, -21, -43,
+   -21, -24, 5, -83, 20, 29, -54, 14,
+   -20, -48, 94, 125, -17, 16, -15, 24,
+   15, 17, 26, -34, 52, -4, 18, -59,
+   -1, 4, 14, 62, 17, -54, -41, 29,
+   -77, -15, 31, 29, 13, 5, 27, -35,
+   33, 8, 48, -21, 30, -5, -22, -67,
+   -118, 18, 0, 69, 26, 2, -120, 65,
+   27, -28, 57, 41, 48, 7, -52, 14,
+   6, -11, 54, -17, -40, -28, 82, -14,
+   -27, -12, 2, 16, 30, -113, 13, -48,
+   -37, 61, 72, 2, 8, -30, -30, 39,
+   -78, -96, 42, -80, -16, 45, -28, 57,
+   24, -123, -47, -7, 32, -25, 6, -76,
+   50, 97, -89, -40, -49, 89, 70, 114,
+   -29, -14, -43, -127, 83, -100, -79, -16,
+   -19, 78, -27, 46, -30, -65, 37, 46,
+   34, -12, -41, -29, -17, -68, 53, 99,
+   59, 51, 69, -11, 32, -5, -53, 33,
+   -14, 4, 55, -68, 23, 26, -63, -123,
+   -31, -39, -67, 58, -6, 23, -3, 25,
+   41, 12, -31, -11, -55, -63, -90, 8,
+   -11, 27, -31, -127, 15, 29, 28, -74,
+   -46, 44, -1, -122, -46, -44, -113, 40,
+   11, 23, -44, 4, 6, -26, -118, 30,
+   -70, 42, 19, -29, 45, -76, 34, 11,
+   -94, 1, 125, -26, 11, 35, 39, 48,
+   -20, -83, 48, -36, -23, -53, 11, -53,
+   -38, 57, -34, 33, -59, -2, 51, 121,
+   -3, -29, 30, -48, 51, 20, 36, 2,
+   -22, -12, 42, -7, -8, -52, 20, -66,
+   61, -64, -53, -21, -83, 9, -20, -39,
+   61, 6, -75, -13, -12, 42, 90, 48,
+   -17, 47, -3, -97, 4, -87, -7, -39,
+   -19, -14, -64, 70, 27, 86, 30, -23,
+   -23, 110, -21, -81, -38, 63, 20, 44,
+   10, -1, -106, -26, -122, -45, -25, -61,
+   -7, -45, 3, -3, -8, 4, 1, -38,
+   -14, -41, -31, -10, 2, 0, -54, -37,
+   96, 25, -52, 4, -2, 25, -2, 16,
+   21, -15, 39, -29, 58, -77, 62, 39,
+   -53, -66, -14, -78, 31, 47, 5, -43,
+   12, 38, 45, 33, -33, 53, 31, -14,
+   18, -28, 40, 36, -32, 68, -77, 78,
+   -31, 10, 124, 23, 26, 61, -46, 80,
+   17, -17, -11, -64, -27, 72, -54, 55,
+   -1, -8, -102, 33, 9, 38, 39, 122,
+   -36, -21, 51, -27, -16, -12, 35, -7,
+   -13, 0, -117, 49, 0, -53, 4, -91,
+   -61, 5, -30, -102, -43, 17, 13, -48,
+   44, -40, 27, 84, -19, -13, 72, 101,
+   10, 12, -16, 15, -37, 18, -37, 1,
+   22, -79, -55, -42, 6, 123, -8, -31,
+   -19, 35, -31, -74, -35, 30, -21, 30,
+   -76, -8, -57, 11, -9, 29, -46, 29,
+   -30, -15, -1, -43, 13, -9, -3, -72,
+   -3, 36, -62, -91, -5, 32, 7, 10,
+   0, -46, -44, -8, 23, 39, -3, 15,
+   13, 19, -107, 7, -45, 11, 30, -72,
+   -23, -25, -93, -116, 19, -1, -36, -25,
+   -4, -59, 18, -22, -88, 0, -20, 12,
+   82, 10, 44, 89, 64, 100, -39, 101,
+   60, 70, 93, 108, 121, 120, -20, 31,
+   20, 66, 123, -11, -118, 4, 82, 32,
+   -19, 24, 4, 6, 28, -9, 57, 76,
+   -15, 79, 86, 123, 79, -94, 23, 73,
+   90, -54, -43, 4, 12, 12, 121, -49,
+   3, -45, -6, 33, -10, 74, -30, -56,
+   35, 54, -92, 29, 10, 82, 84, 95,
+   112, 36, -54, -120, -83, 78, -1, 36,
+   54, 57, 3, 26, -48, 1, -46, -3,
+   -22, 48, 45, -38, -51, -19, 33, -14,
+   -88, 61, -39, 17, -4, -56, -100, 19,
+   -40, -72, 7, -33, -6, 21, -64, -122,
+   -40, 14, -119, -102, -69, 14, -19, -8,
+   60, 23, -128, -37, -28, -40, -2, 13,
+   -4, -22, -15, 15, -2, -35, 42, -118,
+   -4, -77, -1, -127, -35, -19, -68, -58,
+   -72, -4, 8, -1, -15, -4, -125, 6,
+   -108, -9, 56, -121, -6, 13, 0, 1,
+   -118, 119, -13, 42, -52, -72, -72, 52,
+   -61, -18, -37, 63, -112, 23, 31, -119,
+   34, 61, 46, 127, -68, -120, 19, -21,
+   -12, 41, 25, -112, 21, 92, 83, 78,
+   -63, -20, -61, 8, -24, 27, -19, 76,
+   31, -4, -22, 2, 8, 88, 122, -27,
+   -72, -30, -52, -42, 25, -44, -67, 33,
+   -65, 28, -64, -36, -127, -5, 119, 23,
+   -112, -8, 84, 51, 77, -32, 93, 21,
+   -3, 9, 10, -23, -109, 40, -99, -9,
+   -10, 32, -21, -1, 1, -31, -54, 47,
+   -49, -5, -83, -61, 4, 1, -2, 7,
+   45, -85, -78, -9, 122, -24, 26, 57,
+   -10, 18, -14, -4, 3, -97, -7, -17,
+   -4, -24, 0, -69, 40, 67, -63, 20,
+   51, 6, -36, 21, 53, -57, -41, -103,
+   -34, 29, -88, 2, 49, 56, 31, -37,
+   -26, -8, -22, 28, 18, -44, 0, -54,
+   61, 52, -97, 56, 7, 90, -17, 97,
+   1, -116, -86, -80, -64, -18, -26, -47,
+   105, -111, -16, 49, 23, 116, 127, 1,
+   -11, 8, -2, -31, -51, 59, 21, 78,
+   90, 61, -4, -8, -82, 117, -34, 102,
+   8, -63, 96, -41, 25, 35, -15, -18,
+   -13, 79, -33, -34, -75, -103, -82, -41,
+   37, -56, 13, 54, -84, -56, 88, 7,
+   -66, -74, -3, -23, -118, -19, -34, 7,
+   -44, -8, 26, -37, -9, 52, -58, 27,
+   54, -128, -15, -5, -126, 27, 61, 50,
+   -15, 72, -37, -35, 17, -125, -16, 27,
+   -34, -41, 9, -77, -1, 23, -91, -66,
+   38, -38, 41, -90, 67, -18, 16, 58,
+   23, -22, -11, 25, -10, 13, -71, 90,
+   -13, 34, -41, 26, -124, 40, -42, -15,
+   -29, 33, -8, -41, -84, -17, 78, -73,
+   120, -31, 69, 77, 54, 96, 7, -25,
+   98, 48, 120, 78, 65, 59, 59, 124,
+   69, 41, 33, -93, 32, 51, 44, -3,
+   -127, -90, -25, -26, 37, 27, -14, 119,
+   -46, 84, 4, -27, -3, -53, -12, 49,
+   86, 44, -15, 69, 15, -95, -18, 99,
+   27, -17, 1, -35, -11, 27, 15, -30,
+   -78, -3, 41, 7, 127, -1, 102, 24,
+   45, 39, -37, -50, 11, 0, -16, 5,
+   23, -18, 63, 89, 63, 34, 47, -126,
+   -8, 77, 21, -121, -51, -9, 29, 42,
+   43, 60, -107, 24, -35, 40, -36, 42,
+   -35, -62, -23, -19, 43, 2, -52, 12,
+   -70, 17, -122, -23, -54, 45, 19, 31,
+   40, -60, -9, 8, -38, 3, -62, -38,
+   15, 29, -15, 45, 18, -42, 66, 17,
+   48, -124, 39, -53, -52, 36, -16, -10,
+   18, 90, -29, 2, 26, 15, -11, -22,
+   65, 18, 53, 89, -88, 122, -86, 82,
+   -63, -16, 111, 40, 55, 61, 22, 126,
+   17, -45, -58, 23, -30, 61, -98, 48,
+   -35, -72, -7, -52, 25, -89, 80, -98,
+   15, -85, 78, 13, 6, -11, 52, -2,
+   29, -3, -3, 7, -37, 88, 61, -98,
+   8, -35, 10, -73, 11, 63, 27, -38,
+   30, -46, 2, 45, 20, 7, 45, 74,
+   67, 78, 27, -28, 33, 53, -119, -42,
+   32, 56, 34, -67, 49, 3, -36, 11,
+   -62, 122, 6, -47, -3, -17, -40, 35,
+   -48, 98, -67, -31, -35, 11, -64, 42,
+   -18, -34, 33, -48, 26, -28, -6, -68,
+   33, 2, -70, -78, -27, 45, -20, 6,
+   13, -43, -35, -23, 4, 25, -49, 18,
+   8, 1, -15, -26, -41, 13, -16, -28,
+   -8, -24, 23, -87, -22, 6, -26, 33,
+   -16, -35, 19, -5, -27, -7, -74, 5,
+   -81, 26, 15, 119, -15, 35, -111, -64,
+   -70, -53, 34, -9, -30, -14, 20, -51,
+   57, 15, -13, 57, -74, -7, -39, -36,
+   -3, -30, 13, -32, 8, -20, 47, -61,
+   -63, -53, 33, 15, 32, 24, 81, -39,
+   -42, -43, 46, 29, 26, 6, -30, -6,
+   42, 11, 23, -31, -22, 18, 18, -53,
+   28, 30, -18, -49, 53, -57, -13, 27,
+   31, -1, -7, -21, -6, -100, 49, -69,
+   120, -53, 10, 59, 14, -24, -27, 80,
+   -63, -28, -26, -9, -13, -65, 8, -28,
+   -13, 1, 66, -4, -20, -5, 25, -41,
+   -18, 37, -16, -17, 9, -52, -32, 92,
+   -26, -8, 9, -42, 26, 2, -15, 81,
+   -13, -20, -7, -14, 75, -36, 44, 10,
+   6, 21, -38, -74, 15, 12, 58, -34,
+   -22, 69, -41, -19, -60, 42, -57, -12,
+   9, 19, 10, -18, 3, -42, -23, 32,
+   9, 83, 38, 76, -111, 76, -98, 88,
+   -114, -63, 0, -19, 41, 37, -33, 36,
+   -7, 8, 53, 74, 51, 12, -16, 6,
+   -15, -127, -5, 87, -51, 27, 72, 12,
+   -104, -7, 53, 124, -21, -103, 122, 14,
+   56, -21, 52, -64, -23, 88, 122, -82,
+   0, 13, -54, -52, 31, 93, 122, -49,
+   15, -71, 84, 41, -53, -124, -43, 88,
+   70, 42, -5, 120, 77, -23, -94, -57,
+   51, -79, 58, 0, 8, -21, -61, -19,
+   -37, 126, -11, -53, 20, -10, -68, 79,
+   -124, -30, -59, -25, -8, -29, -125, 26,
+   -36, -28, -64, -8, -5, 100, 70, -20,
+   7, -126, -54, 4, -1, 45, -18, 73,
+   -19, -123, -64, 11, 20, 22, 1, 1,
+   3, -12, -41, 91, -69, -75, 16, 46,
+   -29, -66, -31, -79, -85, -10, 41, -10,
+   -83, -121, -10, -17, -90, 6, -128, -51,
+   76, 40, -19, 81, -123, 104, -17, 88,
+   19, 30, 92, 58, 29, 95, 14, 84,
+   109, 12, 20, -96, -16, -20, -45, -120,
+   -13, -98, -126, 66, -104, 6, 106, 91,
+   -1, 59, -50, 5, -24, -66, 32, 69,
+   68, 29, 23, -24, 63, -17, 55, -57,
+   5, 20, 66, -9, -25, 74, -16, -115,
+   71, -6, 4, 63, 34, -45, 30, 58,
+   37, 26, -22, -26, -32, 6, 9, 83,
+   -30, -8, -2, 75, 43, 71, -62, -104,
+   44, 35, -75, -85, 21, -51, -1, 74,
+   -97, 26, -67, 28, -34, -75, -62, -4,
+   -55, -34, -24, 12, 16, -20, -4, -54,
+   -62, -7, 20, -126, -1, 24, 4, 10,
+   32, -44, -76, -13, -49, -28, 6, -6,
+   34, 1, 17, 84, -22, -2, -40, 30,
+   -34, -35, -91, -57, 30, 20, -15, 14,
+   -27, 25, 24, 5, 13, 7, -112, -3,
+   -30, 38, -33, 3, 25, 111, -20, -48,
+   -23, 58, 5, -30, 29, 122, -72, 45,
+   110, -16, 47, -21, -16, 0, 34, 13,
+   40, -19, -14, 36, 9, 24, -6, -59,
+   39, 121, 123, -29, 25, 38, 52, 53,
+   31, -107, -89, 12, -29, -9, 59, -3,
+   -13, 41, 67, 0, 64, 46, -23, 17,
+   -52, 4, 34, -41, -47, 54, -19, 125,
+   -13, -17, -56, -6, -1, 4, -28, -59,
+   72, 23, 39, 78, -114, 31, 5, -35,
+   -39, 80, -30, 19, -117, -45, -74, 53,
+   -26, 120, 22, -99, -24, 49, -60, -37,
+   -15, 24, -29, -1, -2, -19, 4, 34,
+   -8, -47, -15, 1, -78, 68, -33, 18,
+   -11, -14, -6, -29, 10, -57, 2, -22,
+   37, 1, 52, -118, -22, -81, 25, 4,
+   35, -25, 16, -22, -97, -12, -73, 26,
+   13, 11, -36, -48, -63, -24, -16, -31,
+   19, -67, -11, 127, -13, 9, -31, 110,
+   83, -107, 25, 33, 63, 122, -30, 18,
+   -61, -128, -49, -92, 10, -103, -37, 1,
+   -21, -91, 80, 61, 41, -84, -24, 112,
+   -15, -38, 2, -3, 7, 22, 68, -67,
+   44, -15, -75, -13, -71, 7, 52, -118,
+   -88, 27, -34, -69, 30, 4, 88, -91,
+   4, -5, 13, -14, -32, 9, 47, 93,
+   -27, 98, -5, 40, -65, 38, -21, 35,
+   62, -40, 10, 14, 4, 13, 17, -50,
+   -23, 12, -90, -13, 35, 63, 23, 35,
+   -128, 3, -103, 14, -53, -72, -31, 13,
+   -42, -63, 17, -58, 6, 25, -24, -116,
+   -48, -20, -41, -39, 80, -47, -54, -27,
+   38, -50, -116, -38, -76, 18, -39, -38,
+   12, 15, -75, 12, -62, 10, 33, -23,
+   -21, -38, -95, -118, -71, -11, -25, 4,
+   -52, -118, -2, -11, -117, -38, -119, 12,
+   -24, -53, 43, 8, 64, 21, -37, 53,
+   27, -54, 40, -83, 55, 90, -16, 48,
+   39, -35, 102, -15, -63, 94, -6, 45,
+   -23, -64, -123, 43, -29, 7, -23, 118,
+   -58, -46, 23, -73, 37, -53, -8, 7,
+   -9, -24, -33, -48, 31, 26, 28, 52,
+   -48, 43, 33, -22, 56, 77, -26, -85,
+   -66, 42, 0, -49, 12, -18, 26, 56,
+   -13, 13, -14, 7, -29, -4, -89, 40,
+   25, 45, -15, 35, -7, 42, -7, -59,
+   -10, 30, -92, -29, 3, -60, 1, 12,
+   -6, 64, 0, 57, -99, 24, -46, 13,
+   1, 56, -21, -11, 0, -41, -15, -28,
+   -36, 14, 17, -42, -57, 49, -9, -11,
+   -23, 16, -103, 18, -28, 1, 13, -86,
+   4, -7, -22, -6, 5, -11, 41, -32,
+   55, -45, 1, -125, -39, -20, -12, 0,
+   -20, 66, -17, -17, 3, 33, 24, 3,
+   55, -100, -103, 49, -127, 59, 74, -10,
+   -93, -60, 45, -27, -23, 13, 107, 38,
+   -75, -31, 70, -10, 12, -104, -68, -6,
+   31, 82, 17, 74, 56, 113, 72, 42,
+   -52, -4, 75, 40, -117, -16, 15, 42,
+   19, 6, 33, -41, 92, 60, -13, 28,
+   -12, -17, -11, -90, -118, 35, 21, -63,
+   -32, -48, -50, 22, -25, -20, 41, 28,
+   22, 24, 8, -7, 14, 30, -20, 5,
+   59, -28, -21, 2, -41, 65, 56, -47,
+   -94, -5, 19, -82, -60, -16, -22, -73,
+   16, 65, -35, 49, -34, 26, -20, 51,
+   -28, -2, -34, 81, 8, -53, 2, 50,
+   -43, 0, -48, -78, -5, -7, -37, 26,
+   98, -22, 7, -10, 37, 0, -23, 118,
+   -14, -33, -11, 23, 3, -64, 3, 41,
+   102, -56, -101, 34, 1, 82, -22, -66,
+   -1, 7, 58, 3, -27, -57, -7, -7,
+   -72, 0, 84, 17, 14, 126, -87, 35,
+   -3, 70, 126, -43, 50, 90, 52, 10,
+   102, -35, 23, -40, -91, 15, 26, 6,
+   102, -42, 16, -84, -9, -40, 63, 13,
+   27, -14, 98, 120, 59, -123, 21, 48,
+   121, -61, 32, 49, -23, 13, 45, 45,
+   58, -76, -14, -35, -6, 65, 32, -57,
+   99, 14, -81, 34, 34, 46, 70, 9,
+   31, -23, -48, -14, 14, -9, -62, -48,
+   -18, 103, -45, 9, -8, 29, 46, -17,
+   45, 41, -58, -53, 1, -35, 31, -80,
+   -26, 30, 88, -39, -76, 40, -9, 24,
+   10, -26, 31, -48, -17, 16, -10, -126,
+   -57, -22, -127, -20, -50, 62, 12, 65,
+   43, -23, -63, 6, -64, 23, -38, -11,
+   -91, -43, -6, 5, -21, 40, 49, -120,
+   -58, 7, 20, -13, 44, -27, 61, -7,
+   -21, -83, 44, -28, 9, -77, -45, -15,
+   -97, -80, -25, -29, 89, -43, -51, -7,
+   -3, -40, 89, -67, 118, 3, -38, 5,
+   4, 12, 6, 79, -28, -6, 27, -17,
+   -23, 74, 33, 29, 22, -97, -64, -119,
+   33, 10, -115, 124, 33, 59, -41, 49,
+   34, -77, 3, -31, -15, 67, 31, 47,
+   89, -66, 33, -40, 33, -5, -46, -44,
+   -25, 109, -93, 50, -119, 26, 122, 85,
+   10, -1, -29, -124, 61, 21, -67, -41,
+   -47, -55, -27, 123, -30, 20, -88, 78,
+   -49, -4, -88, -17, -10, -7, 86, -48,
+   -30, 82, 46, 42, 45, -23, -112, -32,
+   1, -35, 0, -70, 49, 5, -65, -128,
+   36, 86, 14, 127, 9, -24, -16, 6,
+   -42, 36, -127, -91, 24, -112, -48, 32,
+   -48, 17, 50, -123, -4, 68, -35, 10,
+   105, 5, -2, -126, -34, 57, -123, 14,
+   25, -27, 1, -85, 3, -28, -123, -51,
+   8, 15, -60, 9, 28, -71, -67, 88,
+   24, 65, 123, -28, 20, 65, 79, -45,
+   118, 63, -88, 83, -98, 91, 11, -31,
+   118, -109, 36, 53, -68, 11, 22, -76,
+   -38, -14, -85, 116, 109, -28, -34, 47,
+   41, -9, -27, -27, 4, 17, 2, 73,
+   86, -68, 56, 13, 40, -24, -23, -4,
+   -45, 80, -84, 28, 8, -32, 116, 87,
+   -19, -7, 10, 42, -43, 104, 34, 13,
+   39, 37, 13, 80, -1, -20, 51, 27,
+   -30, 79, -45, -5, 10, 25, 91, 24,
+   -43, 22, 99, 100, 32, 8, 60, 100,
+   48, -10, 5, 15, 15, 26, 6, -51,
+   40, 19, 45, 127, -11, -46, 31, -26,
+   -50, 54, -9, 21, 4, -126, -37, -16,
+   -66, 23, 17, -28, -10, 55, -31, 23,
+   37, 22, 13, -10, 86, -17, 6, 51,
+   16, 44, -5, -31, 42, 4, -73, -44,
+   14, -5, -2, 1, 14, 7, 37, 11,
+   1, 13, 11, 5, 4, -37, 10, 19,
+   5, 3, -15, 15, -26, 17, -5, -1,
+   30, 32, 8, -7, -5, -12, -12, 11,
+   6, -26, -19, -9, 8, 7, -10, 19,
+   11, -3, 13, 14, 6, 7, -13, -5,
+   39, -17, -6, 33, -8, -16, 31, -35,
+   1, -32, -62, 16, 11, -6, 37, -5,
+   -16, -10, -47, -10, 12, -9, 26, 4,
+   49, 1, -18, 26, 10, -5, -23, 17,
+   -21, -35, -70, 58, 22, 5, -62, 17,
+   -9, -15, 25, 7, 9, 14, 3, 17,
+   0, -9, 9, 8, -5, 22, 4, -1,
+   7, -7, 32, 24, 10, -39, 3, -27,
+   33, 3, 4, -3, -1, -9, -3, -1,
+   -27, -2, 4, -3, 4, 0, 1, 5,
+   -11, 11, 15, 10, 6, 0, -8, -13,
+   3, -1, 12, 9, 7, -6, 5, -15,
+   44, 18, -14, -17, -16, -15, -26, 25,
+   -7, 3, 9, 15, 0, -11, 10, 7,
+   2, -14, -43, 8, 45, 18, 1, -5,
+   1, 18, -12, 1, -25, -18, 1, -63,
+   4, 32, 8, -52, 15, -54, -27, 12,
+   -27, -35, -53, 18, -10, -14, 34, 4,
+   -23, -10, 51, 54, 5, 20, -19, 62,
+   -66, -38, 27, -18, 10, 43, 40, 67,
+   -9, -29, -34, 54, 1, 18, -17, 61,
+   26, 5, 113, 22, 1, 6, 63, -29,
+   47, 118, -41, -12, -4, 7, -41, -27,
+   -3, 14, 1, -20, 38, -15, 10, 12,
+   -35, -38, -33, -9, 10, -56, -38, -9,
+   -9, -55, 26, 26, -15, 5, 12, -43,
+   30, 8, -68, -11, 14, -33, -2, 23,
+   8, -8, 27, 3, 22, -15, -23, 14,
+   22, -44, 12, -52, 36, 1, 3, -40,
+   -55, 16, -40, 7, 27, 27, -45, 22,
+   -17, 26, -23, -26, -2, 30, -15, 19,
+   4, -1, 30, -24, -3, -36, -33, 13,
+   13, -21, -1, 28, 21, 32, 19, -7,
+   -13, 16, -9, -23, -33, -66, -13, -44,
+   15, -18, 14, 9, -23, -68, -7, 55,
+   -12, -98, -32, -4, -6, -13, 11, 33,
+   -30, -5, -27, -40, 52, 106, -40, -13,
+   19, -35, -17, -40, -24, 9, -90, 54,
+   -1, -58, 15, 101, 18, -15, -105, 90,
+   39, 23, -7, 70, 8, -24, -89, 19,
+   -21, -8, 18, -74, 112, -86, -14, 47,
+   -81, 43, -50, 2, 13, -9, -38, 23,
+   -12, -64, -10, 13, 23, 29, 106, -25,
+   -22, -115, -43, -5, -2, 5, 7, 7,
+   33, 8, -60, 10, -48, -47, 6, 50,
+   43, -3, 15, -17, 36, 1, -17, -14,
+   7, -22, -24, -110, 21, 3, 64, 99,
+   -31, 3, -10, -21, -7, 20, -61, -22,
+   -50, 31, 35, 0, 4, -8, -35, -26,
+   13, 56, 32, -12, -10, -7, -45, -5,
+   15, -17, 78, -11, 51, 15, -26, -16,
+   -40, -20, 31, 0, 12, -52, 25, -33,
+   22, -26, -12, 81, -17, -19, -12, 3,
+   60, -76, 11, -5, 24, 9, 34, 2,
+   54, 12, -68, -18, 10, -33, 50, -2,
+   -52, -43, 10, -18, -6, -20, 69, -4,
+   15, -59, -21, 5, -18, -45, 32, 21,
+   87, 19, -24, -85, 26, -56, 64, 27,
+   -14, -35, 13, -18, 45, -33, -77, -36,
+   -123, 55, 13, 61, -15, 6, -41, -21,
+   86, -19, 72, -10, -12, -27, -114, -25,
+   -8, -31, 8, -4, 17, -27, 31, -5,
+   -1, -10, 52, 55, -70, -55, 23, 52,
+   45, 32, -57, -30, 6, -20, -1, 20,
+   -48, -10, 47, -21, 13, -27, 50, -25,
+   46, -20, 7, 12, -3, -39, -36, 22,
+   -42, 24, 27, -12, -13, 3, -28, -52,
+   14, 48, -13, 30, -6, -4, -37, 13,
+   -12, 28, -9, 48, -30, -25, 0, -6,
+   49, -9, 39, 10, 66, -32, -43, 85,
+   5, -4, -9, 76, 16, 46, -18, -122,
+   -59, 48, -35, -26, 20, 13, -23, -41,
+   -26, 51, 120, -54, -38, -53, -1, 126,
+   3, 8, 84, -49, -40, 33, 88, 113,
+   22, -54, 0, 44, 10, -76, 80, -75,
+   66, -58, 10, 109, -24, -17, 49, 11,
+   -32, 1, 15, 55, 103, 56, 10, 48,
+   -28, 83, 6, 28, 19, 5, -46, 23,
+   89, 74, 32, 4, -24, 23, 0, 26,
+   11, 38, 42, -6, -2, -8, 5, -8,
+   -7, -9, -1, 40, 15, -59, 8, 43,
+   -36, 24, -75, 43, -37, 0, -43, -27,
+   -15, -78, -11, 17, 9, -12, -41, -36,
+   -87, 7, -36, 1, 15, -29, 27, -60,
+   106, 77, 4, 39, 20, -5, 123, -45,
+   -2, -28, 8, 6, -32, 20, -8, 3,
+   -27, 13, 0, -75, 6, -52, 8, -2,
+   105, 89, 6, 22, 29, -18, 20, -60,
+   39, 61, 39, 14, 2, 26, 15, -21,
+   14, 95, 57, -7, 29, -43, 10, -70,
+   -23, 112, -14, -24, -41, 2, -25, -121,
+   30, 111, -19, 23, 24, 48, 21, 85,
+   -3, -31, 6, 16, -3, -59, -120, 44,
+   33, -11, 7, -126, -128, 5, 10, 19,
+   73, -36, 24, -16, -18, 57, -103, -126,
+   -16, 67, 39, -40, 120, 61, 2, -44,
+   -1, 45, -14, 56, 12, 30, 46, -6,
+   13, -8, 30, 25, -54, -6, -8, -7,
+   -38, -23, -16, 16, 56, -19, -13, 36,
+   -70, 9, -22, -8, -67, -3, 16, 6,
+   -22, 87, -6, 23, 0, 3, -49, 71,
+   21, 41, 55, 14, -25, 8, -8, -8,
+   127, 62, -75, -25, -2, 4, -46, 49,
+   -123, -58, -92, -127, -23, 22, -125, -32,
+   34, 125, 13, 93, 53, -47, 122, -80,
+   50, 119, 1, 40, -127, -118, 33, 124,
+   22, -93, 9, -38, 49, 58, -52, -117,
+   41, 120, -120, 44, -74, -7, 9, -26,
+   -107, 7, 21, 13, 72, -7, 116, 45,
+   -82, 3, 60, 104, -127, -81, -122, -69,
+   -105, -28, -6, -16, -12, 97, -113, 119,
+   -48, 127, 124, 124, -126, -6, 78, -72,
+   72, 38, 127, 34, 116, 33, 34, 127,
+   45, -17, 28, 127, 65, -124, -29, 23,
+   -128, 50, -18, 110, 76, -70, -125, -20,
+   -65, -49, -44, 20, 20, -12, 93, -31,
+   -105, -120, 71, 113, 51, -125, -56, -46,
+   -70, 60, 68, -54, -126, 84, -121, -39,
+   -66, -125, 120, -13, 124, -24, 67, -8,
+   120, -14, -93, -52, -78, 11, -27, -52,
+   65, -128, 11, 17, 6, -5, 32, 120,
+   -121, 0, 45, -3, 93, 104, 108, -41,
+   -7, 46, 19, -10, 93, -27, -91, -112,
+   -128, -125, 45, 21, -125, 1, 64, 38,
+   -127, 97, -5, -37, 94, 52, 24, 122,
+   -125, 23, 98, 63, -37, 85, -40, -63,
+   -1, 93, 127, -8, 60, -56, 94, -16,
+   127, -96, 17, 58, -6, 110, 71, 66,
+   -4, -95, 12, 81, 105, 19, 83, -84,
+   125, -66, -46, -25, -58, -76, -125, 39,
+   127, -57, -75, -56, -64, 56, -123, 45,
+   -53, -83, -7, -111, 44, -126, 34, 97,
+   -65, 104, -67, 114, 11, 127, -122, 120,
+   -64, -8, 6, -106, 24, -55, 104, -4,
+   -52, -38, 21, 126, -119, -95, -8, -127,
+   122, -23, 126, -60, -54, 42, 36, 120,
+   -128, -46, -127, 55, -40, -38, 70, -8,
+   -125, -127, -124, -128, -14, -56, 115, 60,
+   60, -123, -37, -128, 48, 104, 125, -88,
+   -67, 38, 23, 23, 106, -83, 121, -30,
+   -44, 126, 17, -42, -23, 127, -1, -73,
+   -76, -124, 104, -5, -58, 86, -112, 23,
+   -57, -100, -2, 26, 21, 88, 75, -127,
+   71, 124, -27, 94, 25, 120, -125, -120,
+   -113, 126, -127, 31, 127, 18, -124, 74,
+   -125, 15, 23, 43, 103, 123, 74, -47,
+   96, -102, -14, 127, -20, 124, -82, -121,
+   106, -112, 5, 44, 99, -17, 122, 69,
+   -46, 74, 29, -56, -127, -53, 51, 93,
+   79, -85, 87, -126, -100, -29, 116, -121,
+   127, 126, -21, 119, 3, -77, 17, 120,
+   52, 127, 106, -4, -112, -30, 124, -34,
+   2, -103, 125, 127, -68, -109, -36, 3,
+   68, -119, 127, 118, 126, -99, -89, 38,
+   -53, -121, 67, 95, -44, -39, 82, 127,
+   75, -127, 91, -12, -67, -91, 37, 4,
+   40, -122, 65, -84, -8, 30, 46, -1,
+   55, -55, 106, 12, -61, 47, -11, -102,
+   54, 96, 18, -4, 75, -93, 76, 73,
+   119, -24, 108, -9, 124, -127, 116, -43,
+   110, 48, 15, -32, 33, -95, 23, -9,
+   78, 113, 123, 127, -104, 40, -29, -57,
+   74, -114, 121, -41, -113, 127, 6, 123,
+   83, 81, -39, -27, -30, -120, 58, 14,
+   16, 2, 6, 13, -41, 120, -112, 11,
+   121, 124, 58, -126, 77, 32, -124, -32,
+   -13, 39, -92, 36, -33, -46, -13, 125,
+   20, -127, 108, -109, -97, -57, 26, -108,
+   82, 78, -127, -84, 32, 31, -96, -124,
+   60, 96, -121, -107, -113, -14, 113, 15,
+   69, -53, 11, 91, -44, -33, 56, -75,
+   -127, -122, 114, -27, 34, 36, 120, 122,
+   -70, -16, -35, -122, -119, 4, 127, -86,
+   -18, -113, -74, 87, -83, -123, 65, -1,
+   -14, -119, 32, -20, -122, 31, -18, 23,
+   119, 120, 112, -107, 29, 24, -123, 22,
+   67, 127, 106, -128, 79, 17, 73, -53,
+   -27, 58, -10, -7, 127, -51, -119, 15,
+   -74, -113, -45, -36, 44, -120, 105, -80,
+   98, 103, -102, -22, -108, 7, -122, 70,
+   89, -127, 58, -33, -8, 91, -1, -4,
+   -62, 127, 65, 74, -124, -111, -67, 89,
+   12, -122, -25, 45, 117, -73, 23, 51,
+   15, 88, 25, 116, 77, 95, 121, -5,
+   103, 80, 108, 127, 100, 8, -113, -112,
+   119, -106, 127, -114, -82, 125, 81, -127,
+   -121, 127, -124, -8, -126, 58, 127, -126,
+   119, 25, 26, -68, -83, 77, 70, 51,
+   -64, -30, 127, 127, -126, -124, 127, -128,
+   -119, -1, 122, 112, 13, 94, 46, -22,
+   80, -26, 102, -122, -35, 37, -11, -108,
+   -128, -95, -111, 125, -123, -79, 116, 8,
+   90, 97, 26, -34, 109, 120, 61, 69,
+   -5, 4, 119, 11, -61, 91, -3, 38,
+   19, 127, -87, 125, 125, 33, 127, 46,
+   39, 4, 36, 121, 127, -124, -27, -25,
+   -79, 39, 105, -71, 30, -14, 78, -123,
+   119, 80, 106, 125, -59, 125, -106, 24,
+   30, -68, -116, -56, -78, -13, 103, 10,
+   120, -29, 82, 119, -107, -32, 17, -41,
+   123, -126, 54, 121, 54, 127, 10, 119,
+   126, -120, 40, 115, 121, 85, -13, -11,
+   103, 33, 60, 72, -21, 50, -66, 127,
+   -69, 33, -118, -128, 29, -12, 123, 125,
+   45, 127, -121, -74, -72, 80, -82, -55,
+   120, 0, -65, -39, -124, 63, 126, -20,
+   124, -21, 109, 127, -119, -125, 98, -125,
+   -36, -94, 58, -34, -123, 108, -24, -61,
+   42, -10, -63, -14, -76, -3, 22, -109,
+   -1, -126, 58, 119, 9, -83, 124, 75,
+   -17, -33, 58, 40, 114, -126, -31, 120,
+   64, 20, -21, -37, -33, -19, -51, 42,
+   1, 127, 39, 62, 125, -86, 62, 22,
+   -12, -22, 2, -48, -28, -117, -60, -3,
+   -60, 101, -29, 25, 83, 41, 75, -83,
+   65, -88, 10, 104, 22, 93, -11, -86,
+   -67, 98, -18, 44, 126, -100, -123, 49,
+   126, -80, -44, -39, -14, 108, -122, -126,
+   84, 102, 77, 112, -61, 125, 121, 35,
+   102, -124, -9, 119, -119, 45, 19, 114,
+   127, 61, -7, -57, -103, -104, 88, -30,
+   -125, 123, 123, -121, 125, -5, 127, -49,
+   28, 127, -69, 87, 5, 73, 127, 126,
+   -12, -9, 46, -4, -122, 42, -54, 18,
+   -17, 85, 39, 127, -117, -127, 0, -91,
+   24, -6, -103, -39, -126, 127, -7, -19,
+   95, 79, -36, 118, 95, -65, -89, 117,
+   76, -47, -124, -53, 5, -53, -15, 71,
+   124, -56, 35, 48, -54, 104, -76, 43,
+   65, -121, -70, -48, 40, 18, -128, -8,
+   42, 124, 33, -5, 102, -124, -128, 120,
+   -128, 51, -99, -88, -128, -121, -70, 92,
+   78, 112, 110, 122, 117, -107, 97, 111,
+   65, -52, -23, -116, -5, -113, 11, -38,
+   -37, 127, 119, 23, 124, -43, 79, 124,
+   125, -122, 67, -104, -127, -53, -24, -112,
+   120, 92, 69, -93, -6, -118, 110, 111,
+   -128, 15, -46, -118, -121, -35, 107, 115,
+   116, 67, 117, -30, -96, 126, -20, 127,
+   -127, 108, 22, 123, -46, 63, 112, 121,
+   8, 124, -125, -90, 14, 4, -5, 127,
+   -119, 99, -63, 1, -107, -103, -86, -28,
+   42, 103, 67, 32, -48, -95, 78, -77,
+   -91, -46, -128, -84, 14, 125, 8, -73,
+   -124, 11, 66, 111, -125, -4, -37, -125,
+   -83, -29, -47, 71, 122, -42, 34, -31,
+   103, 103, 21, 22, -103, -102, -83, -120,
+   127, -15, -80, 125, -92, -34, -123, 21,
+   80, -71, 111, -65, 119, -119, -109, 109,
+   -26, -100, 10, 16, -127, -79, -121, 4,
+   70, 19, 19, 39, -35, -25, 33, -118,
+   1, 113, 93, -63, 52, 30, -22, 39,
+   117, -7, 48, 50, 93, 9, -8, 45,
+   36, -125, -8, -121, 39, -76, -92, -19,
+   95, 101, 19, 59, -72, -106, 82, 121,
+   -74, -123, -66, 121, -24, -69, 116, -28,
+   6, -17, -69, -38, -90, 76, 33, -127,
+   -67, 127, 31, 122, -113, 106, 123, -120,
+   83, 117, -41, 83, -48, 29, 123, 42,
+   -5, -84, -103, 106, -116, -9, -124, 117,
+   17, 120, -121, -15, 73, -91, 120, -127,
+   -70, 126, -128, 99, 127, 117, 124, -13,
+   -118, -27, -82, -52, -31, 39, -104, -125,
+   102, 14, -120, -94, 60, -39, -58, 9,
+   51, 120, -111, -103, 126, 54, -112, -124,
+   126, -10, 108, -39, 54, 51, -116, 61,
+   126, -72, 69, -60, 125, -17, 4, 46,
+   43, 127, 26, -51, 9, -104, 125, 37,
+   95, 45, -67, -65, 62, 122, -66, -22,
+   -89, -28, -99, -117, -81, -31, -51, 127,
+   88, -121, 8, 62, -4, -45, 16, -68,
+   9, -3, -73, -71, 29, -42, 69, -46,
+   115, 123, -14, -118, 51, -3, 79, -91,
+   -74, 91, -7, -119, 127, -95, -30, -49,
+   62, -16, 62, 69, 58, 72, 5, 40,
+   -121, -66, -4, 117, -121, 101, 53, 97,
+   -118, -111, -127, 115, 122, 40, -3, -44,
+   -5, -13, 5, 121, 49, 40, -124, -59,
+   126, 6, -30, -98, -116, -2, 65, 29,
+   -126, -121, -123, 15, 127, 119, -120, -51,
+   -71, 127, 7, 1, -112, 33, 106, -20,
+   -114, 59, -105, -81, -11, 28, 96, 4,
+   -92, 27, 32, -125, -60, -107, 69, -106,
+   23, 100, -53, -105, 13, -68, -126, 109,
+   22, -127, 27, -127, 26, -127, -122, 127,
+   -88, 66, 2, -105, -3, -113, -126, -40,
+   74, 44, -9, 107, 41, -74, 77, -74,
+   77, 127, 106, 53, 108, -71, -105, 122,
+   99, -114, -123, 24, -127, -62, -20, 125,
+   -12, 38, -43, -108, -33, -125, 103, -9,
+   -67, 127, -3, -113, -128, 71, 120, 57,
+   -127, -117, -122, 127, 124, 15, -54, 122,
+   -24, -24, -58, -25, 50, 76, -56, -119,
+   64, -88, -36, 125, 8, -117, 126, -60,
+   -116, -127, 105, 69, 10, -127, -112, -31,
+   -89, -58, 71, 31, -62, -2, -127, 8,
+   -74, 124, -84, -87, -119, -103, 41, -128,
+   -66, 127, -93, 55, 127, 19, 127, -97,
+   -22, -54, -124, -78, 32, 70, 26, -1,
+   124, 101, -127, -125, -82, 80, 98, 1,
+   -40, 30, -66, 33, -15, 85, 125, 74,
+   75, -73, 11, 126, 127, -34, -44, -47,
+   117, -124, 118, -126, -68, -126, -111, 116,
+   27, 92, 101, 45, 15, -113, 44, 47,
+   122, -128, 45, -81, -90, 116, -117, 127,
+   10, -7, -2, 2, 79, 46, -70, 72,
+   35, -35, -125, -44, 34, -83, 9, -26,
+   92, -121, -73, -105, -116, -6, 113, 43,
+   47, -86, -1, -21, 78, -120, -31, 124,
+   118, 127, -78, -113, 79, -47, 124, 120,
+   -79, -31, 66, -4, -117, 125, 65, 127,
+   14, -69, 84, 126, 89, 82, 86, 114,
+   -65, 15, -68, 57, -10, 123, -110, -108,
+   -113, 93, 86, 83, -26, -118, -86, -87,
+   -41, -126, -14, -127, 127, 55, 126, -85,
+   -87, -62, -126, 59, 127, 89, -72, -123,
+   -44, -63, 5, -34, 107, 37, 127, -102,
+   -50, 39, -126, -85, 118, 122, 82, -125,
+   -124, 106, -128, 52, 26, -128, 40, 11,
+   105, 91, 23, -4, 88, 14, -44, -5,
+   111, -122, -27, -125, -81, -69, -25, 87,
+   23, 125, -64, -31, 50, -120, -124, -123,
+   -109, 118, 32, 103, -6, -54, -76, 76,
+   -97, -3, 126, -47, 122, -22, -52, -125,
+   -6, -75, -79, -38, 79, -49, 77, -104,
+   -77, -35, -104, -128, -81, 36, 124, -59,
+   -36, 74, -6, 39, -60, -31, 81, 123,
+   -84, -123, -10, 124, -69, -53, -125, -126,
+   5, -20, 28, -68, 33, 118, -62, -122,
+   78, -63, -3, 126, 22, 28, 127, 100,
+   111, 14, -28, -77, 89, 124, 27, 56,
+   -118, 126, 123, -35, -112, -7, 38, -122,
+   -61, -70, 124, -64, 127, -22, 84, -57,
+   -24, 17, -76, 24, 44, 115, 107, 118,
+   -39, 89, 35, 126, 121, 23, 50, -25,
+   116, 63, -107, -122, 67, 114, 126, 108,
+   -27, 38, -60, -44, -127, 7, -88, -46,
+   52, 119, -96, -84, 93, 43, -94, 39,
+   44, -98, 84, -69, -33, -116, -122, 81,
+   -22, 63, 104, -62, 126, -127, 78, -117,
+   109, 111, 108, -40, -52, 45, -118, -22,
+   -50, -125, 7, -51, 125, -33, -106, 17,
+   119, -122, -98, -18, 3, 16, 5, 101,
+   8, 50, -1, 102, -108, 85, 65, 95,
+   4, 116, 2, -67, 21, -47, 50, -67,
+   -31, 58, 28, -23, -32, -13, 59, -23,
+   -80, -21, -13, -45, -91, -2, -24, -123,
+   30, -92, 51, 127, -73, -10, 118, 127,
+   -12, -123, -57, -116, 46, 113, -128, -118,
+   33, -32, 87, -110, 121, -102, 125, -124,
+   -60, -50, 20, -110, -56, 0, 61, -107,
+   -75, -126, -46, 118, -14, 58, -125, 8,
+   13, 31, 73, -115, -120, 47, 122, -85,
+   -17, 31, 6, -65, 70, 106, 123, -108,
+   40, -71, -20, -89, -74, -88, -32, -12,
+   24, -45, 73, 127, -39, -43, 110, 36,
+   76, -1, 113, 83, 95, 15, 53, 8,
+   -9, -126, -33, -102, -51, 69, -128, -14,
+   -98, 15, 119, -79, -15, -57, 126, -55,
+   -82, -95, 37, 99, 73, 121, -1, -40,
+   120, -127, -24, -22, -15, 22, -24, 28,
+   -117, -3, -26, 18, -54, 122, 73, 127,
+   116, -114, -40, -123, -66, 9, 4, 35,
+   78, 57, 52, 51, -2, 85, -10, -9,
+   -20, -22, -69, 106, -11, 36, 19, 48,
+   127, 7, 70, -121, 16, -19, 114, -17,
+   -117, -126, -3, -60, 26, 72, -123, -126,
+   33, 26, -128, -118, -84, -86, 121, -84,
+   80, -87, -56, -106, -79, -127, -3, -44,
+   7, 17, 36, 103, -1, -31, 127, -106,
+   -20, -78, -45, -91, 120, 77, 114, -122,
+   -48, 16, -102, 6, 56, 26, 127, 105,
+   -103, -117, 31, -124, 1, 19, 31, -13,
+   -82, -118, 123, 88, -24, 26, 107, -98,
+   -46, -13, 24, -2, -6, 81, -25, 55,
+   10, -38, -75, -60, -73, -52, 87, -41,
+   -88, -127, -123, -113, -25, -120, -67, 40,
+   -58, 29, -87, 117, 88, 40, -50, -117,
+   124, -95, -12, -25, 100, -28, 0, 11,
+   13, 62, -30, 26, -74, 127, 78, 127,
+   -103, -128, 3, 31, 112, -35, -32, 121,
+   126, 69, -2, 4, 86, 123, 100, -127,
+   -83, -11, -34, 75, -75, 52, 9, 118,
+   127, 5, -12, -93, -108, 17, -9, -21,
+   -62, -101, -10, 122, -24, 39, -100, -121,
+   -118, -58, 0, -55, 97, 120, 120, 26,
+   -22, -75, -22, 57, -89, 107, 117, -32,
+   75, -100, 49, 17, -20, 96, -64, 72,
+   28, 125, 38, -127, -69, 108, 33, -100,
+   36, 39, 3, 82, -50, -1, 127, -86,
+   74, 44, -64, -124, -83, 13, 18, -39,
+   40, -20, 92, -70, -16, -15, -17, -61,
+   91, 51, 114, 1, -21, -29, 123, 20,
+   -20, 5, -19, 7, -1, 86, 121, 12,
+   77, 23, 17, -83, 16, -34, 28, -2,
+   -76, -27, -52, -33, 64, -83, 122, -2,
+   64, -128, -9, 122, 127, -42, -37, 97,
+   2, 118, 38, -32, 49, 46, 60, 52,
+   -128, 0, 72, -2, 114, -109, -8, -37,
+   48, 65, -21, 127, 66, -48, -128, 123,
+   -26, 39, 8, 63, 2, -122, 35, 99,
+   56, -89, -1, -37, 3, 2, -126, 52,
+   4, 17, 46, -104, -126, -105, -46, -125,
+   -2, 27, 35, 45, -119, 42, 115, -18,
+   34, 56, 104, 2, 61, 52, 124, -34,
+   -73, 110, 19, 9, -15, -74, -6, -56,
+   86, -96, 17, -127, 28, -126, 3, 29,
+   -127, 76, 37, 125, 7, -7, 127, 52,
+   94, 23, 123, -115, 120, 41, 91, -88,
+   87, -50, -49, 88, 51, 1, -7, -20,
+   77, -39, -92, -47, -49, 33, -67, -33,
+   25, 29, 44, 14, -37, 118, -126, -63,
+   125, -6, 19, -124, -9, 104, -121, -94,
+   47, -101, -5, 90, 86, 64, -126, 29,
+   126, -128, 59, -105, 63, 1, 34, 62,
+   -43, 101, -109, -112, -22, 39, 86, 48,
+   -84, -126, -110, -43, -51, 68, 7, -99,
+   -81, 109, -43, -127, 2, 118, 123, -127,
+   -31, 21, 55, 36, 113, 19, -48, 123,
+   60, -1, -123, -108, 20, 32, -128, -13,
+   -11, -123, 72, -115, 126, 47, 61, -126,
+   89, 118, -20, 14, -127, -19, 102, 20,
+   11, 98, -71, -87, 24, -3, 127, 13,
+   92, -127, 83, -69, 9, -118, -38, -53,
+   19, 14, 27, -125, -9, 110, 115, 7,
+   126, 112, -124, 119, -43, -8, 127, 29,
+   -9, -29, -32, -110, 64, -108, 0, -92,
+   127, -12, -19, 31, -18, 2, 79, -52,
+   32, 79, -79, -83, 27, -35, -89, -124,
+   -125, 67, 23, 82, -37, -125, 127, -92,
+   -1, 5, 14, -117, 52, 42, 57, 94,
+   -87, -123, -60, -11, -7, -47, -122, -20,
+   -8, 123, -118, -13, -128, -95, -127, 74,
+   -104, -69, -125, 35, -30, 87, -64, -11,
+   124, -69, -93, 125, -119, 123, 106, -121,
+   -22, -68, 81, 124, -22, -96, -126, 69,
+   35, 29, -125, -85, 106, -59, -60, -61,
+   -121, 88, 87, -67, -112, -65, 127, 73,
+   -47, -122, -42, 127, 113, -121, 23, 26,
+   -12, 109, 76, 19, -21, -30, -11, -31,
+   12, -66, -17, 118, -83, -109, -128, -53,
+   -49, -128, 96, -2, 76, 102, -6, -19,
+   -126, 30, 61, -96, 51, 54, -8, 75,
+   117, 111, 87, -126, 104, -123, -42, -82,
+   -112, 58, 39, 127, -123, 68, -107, -128,
+   13, -81, 76, -108, 28, -49, -52, -67,
+   16, -19, -23, 31, -127, 84, -15, 21,
+   3, -70, -119, 26, 91, -122, -122, 89,
+   -117, 24, -78, 41, -17, -65, -114, -49,
+   7, -113, 78, 48, 117, 53, -110, -28,
+   -49, -60, -128, -44, -67, 125, 16, -26,
+   -119, 72, -41, -83, 120, 51, 114, -56,
+   127, -20, -15, -45, 61, -62, 119, -43,
+   118, -126, -32, -38, -112, -108, 121, 15,
+   -84, -90, 87, 83, 43, -41, 85, -128,
+   -3, 103, -122, 124, 18, -52, -58, -128,
+   109, -122, -49, -21, -110, 105, 2, -19,
+   -4, 111, -16, 74, -73, -27, -126, -44,
+   125, -126, -1, 49, -59, -66, -53, 116,
+   123, 126, -105, 119, 127, 127, 40, 43,
+   -44, -63, 18, -111, 124, -91, 18, 10,
+   -83, 4, -17, 1, 78, 121, -79, 9,
+   -128, 5, 112, 3, 13, -104, 55, -54,
+   3, 58, 27, 41, -45, -46, -26, -38,
+   -59, 122, -41, -34, 63, -40, 8, -4,
+   -12, 4, -75, 2, 83, -25, 25, 109,
+   46, 30, -9, 75, -45, -57, -58, -118,
+   74, 89, -124, -6, 25, -82, -107, -58,
+   -30, 117, 116, -19, 123, -30, -23, 51,
+   -11, -13, 8, 50, -121, -11, 46, -78,
+   120, -127, -6, 33, 53, 52, 126, -72,
+   109, -113, -118, -16, -82, -71, 2, -43,
+   -122, 55, -33, 49, -26, -118, 24, 113,
+   -24, 28, 77, -118, 12, 90, 95, 25,
+   127, 29, 101, 116, -9, -87, -78, 120,
+   120, 114, -122, 79, -94, -89, 61, -39,
+   5, -127, -14, 29, -127, -74, 76, 9,
+   -94, 73, -125, -62, -28, 47, 86, -83,
+   -124, -68, -11, -68, -31, 98, -79, -123,
+   122, 62, -103, -16, -48, 49, -79, -106,
+   65, 118, 56, 73, 53, -11, -112, -97,
+   -73, -39, 5, -69, 111, -45, 13, -3,
+   65, 4, -4, -88, 121, 11, 45, -19,
+   87, 84, -67, -114, 73, -83, -19, 30,
+   35, -79, 55, 77, -81, 63, -71, 2,
+   -83, 44, 127, 61, -75, 9, -125, 65,
+   -128, -23, -110, 43, -11, -19, -36, -102,
+   -77, 122, 63, 95, 105, -18, 11, 36,
+   125, -71, -59, -8, 16, 95, -61, -102,
+   -125, -69, 29, -16, -52, -27, 55, 102,
+   -24, -105, 52, -10, -123, -39, 81, -128,
+   -11, 91, 40, 11, 123, 27, 26, -28,
+   -97, -122, -121, 27, 49, 24, 112, -34,
+   -71, 125, 115, 75, 73, -65, 68, 53,
+   -99, -37, -86, 59, 73, -115, -128, 37,
+   -66, -66, -76, 115, -128, 20, -56, 3,
+   36, 91, -85, -121, 120, 24, -17, 108,
+   38, -82, 87, -39, 92, -10, 58, -20,
+   -30, 46, 66, -10, -95, -16, -57, -108,
+   68, -14, -57, -113, -55, -7, -91, 53,
+   112, 22, 24, 26, 102, -29, 76, 41,
+   13, 27, 17, 86, -33, 126, 103, 50,
+   -11, -49, -118, -103, 26, 116, 47, -56,
+   -88, -40, -24, -56, -2, 87, 105, -99,
+   104, -54, 14, 25, 118, -125, 11, 28,
+   -76, -70, -32, -71, 97, 15, -22, -35,
+   -100, -21, 24, -25, 17, -31, 80, -65,
+   50, 37, 115, 84, 53, 5, -33, -33,
+   -99, 25, -11, 20, 86, -96, 44, 86,
+   126, -111, 66, 21, 0, 63, -123, 93,
+   -15, 36, 127, -76, -123, -72, -111, -127,
+   -62, 1, -85, 1, -32, 61, 50, 57,
+   27, 87, -34, -30, -2, 28, 111, -59,
+   -18, 16, 3, 82, 4, -128, 126, -76,
+   -21, -122, -21, -93, -28, 42, -52, 1,
+   -16, 37, 67, 17, -91, 29, 121, 6,
+   118, -43, -54, -125, 87, 4, -25, 50,
+   124, 57, 43, 22, -51, 21, -49, 21,
+   12, 71, 122, 45, -66, -58, -54, 44,
+   41, 52, -6, 84, -56, 127, -122, 57,
+   75, -42, 127, -11, -42, 31, -124, 54,
+   21, 5, -23, 108, 123, -64, 23, 45,
+   100, -28, -86, -50, -32, -27, 116, 99,
+   58, 35, -64, 71, 32, -51, 63, 0,
+   46, -89, -69, 40, -12, 27, 71, -24,
+   -76, 91, -40, -88, 119, 47, 126, -122,
+   -81, -81, 7, 10, 50, 113, 2, 58,
+   26, -55, -98, -59, -50, -59, -110, -125,
+   16, -59, -41, -16, 103, 48, 83, -26,
+   54, -119, 11, -36, 126, -16, 35, 38,
+   -96, 118, 0, -43, -30, -26, 21, -28,
+   32, -75, -17, 29, -7, -127, -16, -23,
+   3, 18, 75, -42, 97, 117, 26, 126,
+   118, 62, -126, 17, -112, -70, 119, -47,
+   60, -42, -49, -33, 69, -43, 79, 7,
+   80, 116, -45, 113, -45, -74, 72, 21,
+   63, 19, -116, -15, -110, -67, -121, -2,
+   -42, 101, 79, -36, 15, -50, 81, 127,
+   -51, 120, -47, 38, 22, -75, 126, -39,
+   -38, -123, -13, 31, 16, 62, -119, -76,
+   35, -7, 17, -11, -122, -6, 65, 93,
+   36, 104, -100, 73, -9, 95, 92, -80,
+   75, 34, -65, 18, -112, 20, 0, -27,
+   -2, -127, 54, 25, -45, -61, -126, -53,
+   -15, -29, -7, -1, -41, -126, 21, -124,
+   -75, 86, -43, 62, 75, 55, 122, 54,
+   -8, -124, -109, 108, 71, 20, -26, 28,
+   -29, 11, 125, -51, 90, -11, 29, 67,
+   -124, -80, 51, 8, 72, 46, -120, -75,
+   -44, -52, 34, 2, -19, 127, 113, -34,
+   -97, 85, -32, -58, -5, 35, 125, 80,
+   -17, 40, -34, -30, -50, 6, -63, -40,
+   102, -12, -17, -2, -80, 120, 66, 121,
+   -40, 87, -13, -38, 36, -36, 1, -6,
+   72, 61, -1, 82, -102, -37, -32, 4,
+   -6, 66, -73, 126, -6, -4, -42, -27,
+   24, 118, 5, 10, -32, -20, -36, -23,
+   -74, 5, 85, 67, -45, -115, -101, 115,
+   85, -75, -61, 29, -17, -89, 104, 91,
+   -46, 102, -68, 56, -112, -67, -75, -114,
+   45, 111, -35, -51, -125, -87, -20, 59,
+   -120, -15, -22, 1, -96, -95, 15, 119,
+   -14, -111, 18, -6, -42, -88, 42, -2,
+   22, 112, 89, 97, 40, 98, 117, -123,
+   -4, -27, 61, -96, -83, 10, -1, -1,
+   31, 51, 1, 9, -93, 47, -38, 88,
+   -75, -79, -28, 13, -16, -31, -94, 36,
+   63, 120, -72, -127, 4, 78, 21, 34,
+   -30, 43, 23, -123, -124, 17, -71, 38,
+   -103, 3, -15, 17, 124, 84, -88, -21,
+   73, 37, 50, 44, 107, 34, 81, 33,
+   -55, 2, 8, 33, -15, 10, -119, 33,
+   10, -10, 44, 74, -70, -67, 90, 7,
+   -67, 28, -123, 33, -27, 63, 2, 123,
+   87, 5, -76, 53, -128, -55, 120, -115,
+   111, -43, 16, 14, 98, -2, -24, 46,
+   -4, -123, 34, -50, 113, 27, 38, 117,
+   106, 46, 10, 2, -2, 72, -123, 3,
+   14, 28, 3, -124, -51, -40, 73, -117,
+   32, 86, 22, -32, -76, -119, 83, -96,
+   -94, -51, -51, -87, 53, 94, -87, -2,
+   -22, 36, -127, -34, 77, 127, 121, 57,
+   39, -71, 98, 13, 13, -43, 3, -34,
+   71, 124, 117, 48, 74, 10, 20, -2,
+   -105, -71, 10, 62, -74, 4, 74, -17,
+   -40, -50, -116, 29, 27, 47, 68, 7,
+   -60, 67, -58, -119, 53, -25, -79, -102,
+   70, 27, 5, -14, -74, 51, -12, -13,
+   1, 17, -22, -87, -12, 0, -50, 19,
+   -114, -33, -56, -99, 45, -27, -6, 47,
+   21, 21, -91, 35, 87, -32, 8, -126,
+   -2, -51, -122, 93, -63, -118, 4, -36,
+   40, -46, 56, -79, 126, 30, -4, 81,
+   11, 12, 106, -1, -89, -90, -45, 46,
+   -118, 12, -81, 75, -99, 20, -120, 78,
+   5, 93, 79, 9, 101, -47, -78, -104,
+   -62, 123, -13, 108, 101, -55, 27, -4,
+   -127, -35, 63, 79, -98, 36, 15, 62,
+   -9, -23, 45, -17, -37, -5, 49, -120,
+   -89, -10, 123, -38, 125, -103, 119, -104,
+   11, 8, 72, 39, -39, 110, -20, 19,
+   -38, 91, -104, 103, -47, -24, 25, -14,
+   -59, -29, -23, 82, -8, 7, -106, -11,
+   5, -15, -30, 87, 27, 102, -95, 52,
+   66, -48, -124, -58, -126, -30, 127, 63,
+   -121, -16, -42, -125, 77, -4, -107, -19,
+   -29, 22, 5, -56, 29, -88, 10, 26,
+   -127, 36, -17, 67, -26, 93, -16, -31,
+   7, -30, -17, -24, -56, 33, 10, -125,
+   120, 119, -128, -77, -68, -9, -33, -60,
+   7, 1, -88, 40, -6, -67, 43, 14,
+   -128, -26, 39, -26, -80, -120, 7, 125,
+   69, -86, 47, 5, 119, 76, 38, 52,
+   6, 62, -31, 15, 71, -25, -61, -75,
+   88, 109, -4, -93, -126, 56, -99, 103,
+   16, 93, 93, -11, -127, 106, 5, -126,
+   19, 56, 68, 59, -41, 9, 17, 29,
+   0, 112, -74, -51, -127, -119, -110, -122,
+   -9, -64, -86, -50, 61, 40, 33, -105,
+   127, -6, -28, -9, 26, -20, -81, 50,
+   -111, -118, -25, -49, -109, -35, -96, 127,
+   -51, -120, 127, 22, -125, 43, 29, 127,
+   1, 66, 19, 4, 15, 86, 42, -71,
+   -26, 125, 80, 48, -100, 125, -13, 126,
+   33, -14, 33, -16, -68, -33, -4, 75,
+   -127, 20, -12, -10, -3, 25, -43, -30,
+   14, 12, -33, 44, 51, 46, 63, -116,
+   76, 93, -128, -35, 13, 9, -39, -97,
+   33, 55, -39, 24, -33, 52, 84, -65,
+   120, 11, 103, -32, 101, 127, 23, 3,
+   20, 31, 53, 39, -38, 41, -19, 94,
+   -41, 67, -33, 15, 9, 24, -77, -26,
+   93, -71, -8, 46, -26, 51, -21, -127,
+   42, -12, 126, 48, -121, 48, 39, -123,
+   -5, -4, 45, 60, -122, -55, 13, -43,
+   -9, 100, -7, -122, 32, -63, -71, -85,
+   58, -59, -60, -70, 93, 68, 85, -77,
+   126, 43, -5, 63, -103, -69, -49, 59,
+   -51, -120, -53, -75, -98, -21, -20, 127,
+   -43, -35, 127, 27, 57, 83, -8, 127,
+   -50, 119, 126, -65, -14, -95, -22, 33,
+   -17, -39, -39, 12, 122, -118, 17, -26,
+   -94, 47, -30, 111, 26, 14, -79, 105,
+   127, 31, -51, -96, -75, 21, 67, 25,
+   22, 79, -98, 41, 110, 59, 127, 127,
+   -18, 3, 97, 124, 36, -8, 9, -99,
+   23, 1, 66, 39, -44, 116, 123, -5,
+   124, 84, -6, -55, -50, 121, 47, -117,
+   -80, 85, -113, 22, -126, 101, -81, 119,
+   6, 39, 1, 81, -30, -50, -120, -9,
+   42, -126, 1, 23, 111, -33, 14, -128,
+   -4, -57, 26, -45, 126, -115, 8, 14,
+   84, -11, 19, -3, -123, -127, 80, -37,
+   -100, 13, -57, -121, 122, 45, -59, 36,
+   50, 3, 39, -15, 7, -12, -15, 96,
+   -128, -7, 47, -47, -19, 71, 31, 26,
+   63, -67, -112, -36, 45, 14, 65, -103,
+   4, 59, -127, 37, 127, -47, -35, 44,
+   9, 115, 120, -127, 96, -125, -33, 114,
+   66, -120, -1, 15, -128, -126, 28, -125,
+   16, 8, 56, 83, 109, 116, -59, 111,
+   40, -4, -60, -15, -10, 101, 41, -100,
+   -3, -39, 91, 34, 26, -78, -4, 126,
+   -18, -11, 112, -108, 40, 11, 44, -50,
+   62, -67, 37, 80, 22, 11, 101, 21,
+   -115, -69, -32, 59, -125, -126, 107, 120,
+   -24, 119, -127, -48, -3, 6, -70, 65,
+   -114, -3, -5, 120, -23, -80, 72, 68,
+   63, 48, -7, -112, -109, 5, -34, 116,
+   -73, 126, -15, -87, 22, -7, -39, -12,
+   74, 14, 4, -113, 44, 33, 82, 32,
+   -113, -107, -20, 102, -111, 1, -122, 63,
+   -115, -45, -61, -53, -85, -16, -9, -23,
+   -24, -5, -38, -76, 37, 59, 4, 79,
+   23, 70, -113, 36, -42, -41, -68, -59,
+   9, -100, -105, 117, 127, -127, 45, -128,
+   9, 26, -115, -80, 99, 72, -74, 17,
+   8, 8, 60, 31, -128, 126, -122, 107,
+   7, -28, 28, -109, -32, -44, -81, 16,
+   -128, 13, -126, -39, 18, -69, -84, -22,
+   -113, -31, 48, 49, 0, -65, -109, 82,
+   57, -95, 12, 13, -43, 19, 36, 95,
+   -113, 40, 95, 116, -11, 61, 55, -61,
+   127, 67, 127, -46, 126, 31, 116, -30,
+   -67, 113, 90, -23, 54, -55, 13, -45,
+   127, 63, -22, 120, -13, -22, 58, 91,
+   52, 45, 13, 83, 40, 87, -25, 125,
+   91, 74, 50, -124, 86, 66, 5, 127,
+   -19, 116, 6, -12, 4, 42, 92, -40,
+   -100, -21, 123, 27, -45, 4, -97, -22,
+   -113, -4, -27, 18, 49, 78, 107, 6,
+   126, 127, 8, -47, -124, -110, -8, 17,
+   67, 51, 5, 13, -11, -76, 15, -124,
+   37, 58, -71, 25, -112, 45, 35, -128,
+   44, 127, 34, 39, 15, -17, 49, -3,
+   -24, -27, -49, 12, 127, 111, -78, -63,
+   30, 29, 29, -25, 73, -66, 94, 17,
+   6, 75, -82, 118, -96, 55, -47, -53,
+   16, 21, 115, 15, -10, 64, 7, 42,
+   73, -33, -38, 6, -88, 94, 31, 51,
+   -99, -27, 0, 123, -124, 81, 51, -54,
+   -112, 115, 42, -124, -60, 99, 23, 101,
+   62, -52, 20, 6, -43, 4, 9, 0,
+   44, 51, 8, -59, -11, 110, -6, 100,
+   29, 127, 0, 92, 127, 13, -38, 65,
+   23, 76, -1, -127, -69, -14, 59, -33,
+   -57, 11, 0, 83, -38, 52, 110, -36,
+   -35, -112, 99, -16, -113, 125, -50, -114,
+   63, -62, -6, 39, -9, 110, 0, -100,
+   -29, 123, 121, 7, 82, -51, -32, 51,
+   -34, 84, -76, -82, 90, -105, 111, 24,
+   17, -16, -41, -116, -123, 1, 48, -127,
+   55, 66, -16, -84, 74, -37, -91, 27,
+   83, 47, 49, 92, -80, 32, 72, 65,
+   29, 16, -7, 8, -106, -3, 15, -69,
+   -48, -27, 45, 8, -51, 58, 35, -10,
+   -15, 0, 15, 4, 50, -64, 6, -16,
+   -35, 59, -2, 14, 1, 7, 4, -74,
+   7, 124, 38, -46, 70, 0, -73, -35,
+   -5, -4, 0, 54, 7, -4, 10, 93,
+   -8, 42, -93, -38, -46, 1, 29, 50,
+   78, 75, 63, -73, 14, -26, 6, 58,
+   -81, 7, -3, 86, 69, 5, -6, 14,
+   48, -41, 124, 0, 43, 65, 24, 54,
+   -79, 32, 46, 17, -13, -57, -35, -10,
+   -19, 40, -78, -47, -4, 30, -86, -61,
+   0, 15, -15, 13, 127, 5, -22, 61,
+   68, -33, 8, -16, -34, 10, 33, 5,
+   -48, 14, 49, 126, -27, 20, 96, 26,
+   8, 24, -4, 57, 54, 45, -11, -126,
+   126, -13, -51, -32, 4, -65, 74, -77,
+   -35, -3, -7, -69, 10, 13, 0, -49,
+   -123, -56, -9, -61, 6, 18, -1, 12,
+   -67, 23, 5, -30, 7, 37, -34, 12,
+   -40, 3, -25, 32, -60, -66, 97, -27,
+   32, 20, -95, -3, 8, -76, -15, 61,
+   8, 19, 9, 18, -20, -13, 105, -13,
+   47, -11, 19, 10, -47, 1, 125, 77,
+   90, 34, -76, 49, 64, -28, -67, 2,
+   -32, -24, -1, -25, -120, 1, -68, 55,
+   81, -85, -11, -12, -29, -110, 2, -44,
+   41, -12, -16, 7, -1, -118, 76, -76,
+   -17, -43, -8, 101, 86, -123, 70, 45,
+   -13, -39, 114, -72, 101, -5, -8, -5,
+   -54, -49, -92, -26, -117, 19, 14, -116,
+   37, 8, 15, -15, 30, -22, -16, 23,
+   -83, 5, 57, 14, -19, -9, 51, -1,
+   -20, -26, -3, -8, 3, -14, -51, 11,
+   -56, 30, -5, -108, -10, -115, -89, -38,
+   -70, -4, -15, -30, 35, 48, -119, -63
+};
+
+static const rnn_weight noise_gru_recurrent_weights[6912] = {
+   20, -47, 122, 31, 41, -36, 18, -22,
+   0, 87, -28, -26, -68, 8, -54, 104,
+   112, 19, 31, -118, -31, -31, 9, 17,
+   11, 5, -53, -24, -17, 24, -35, 16,
+   53, -26, 6, 24, 48, 11, 17, -34,
+   17, -15, -51, -32, -44, -11, 10, 63,
+   25, -92, -52, -30, 26, -57, 44, -18,
+   20, 49, -40, 74, 96, -43, 99, 90,
+   -15, 40, 11, -119, -125, 42, 58, -127,
+   -27, 9, -64, -64, -87, -31, -53, -39,
+   -1, -11, 53, -6, -124, -6, -81, -67,
+   46, 23, 11, -124, -48, 100, -62, -6,
+   -17, -124, 10, 81, 39, 35, -125, -52,
+   4, 41, -43, 12, -48, 13, 27, 41,
+   25, -20, 4, -71, -59, -30, 43, 46,
+   22, 34, 50, -78, -117, -26, 67, 22,
+   -27, -86, 48, -51, -52, 32, 48, 1,
+   -11, 63, -38, 62, -13, 17, 32, -6,
+   11, -15, -65, -45, 69, -9, -33, -13,
+   -114, -30, 55, -29, -33, 3, -59, 44,
+   72, -52, 22, 65, 14, 5, -20, 19,
+   12, 81, -2, 100, -6, 125, -41, 124,
+   -2, 24, 107, 21, -38, 66, 46, -20,
+   -11, 8, 51, -59, 8, 50, -78, -26,
+   98, -21, 120, -30, 34, -49, 72, -22,
+   -74, 69, -86, -11, 23, -126, 10, 12,
+   -35, -36, 20, 21, -24, 39, 44, -110,
+   -54, 33, 1, 10, -83, 36, -37, 7,
+   -57, 0, -73, -23, 15, -10, -14, 12,
+   52, -80, -21, -40, 0, -47, 24, 8,
+   58, -41, -48, 14, 27, -83, -11, 62,
+   5, 101, 35, -75, 89, -101, 44, 50,
+   -77, -115, 1, 50, 25, -113, -64, -6,
+   -14, 30, -80, -91, -48, -126, -51, -93,
+   -103, -1, -49, 73, 25, -39, 51, 70,
+   -39, -53, 41, -60, -70, -72, -6, -19,
+   63, 75, 120, 79, 1, -57, 8, -3,
+   18, 5, -56, 31, -13, 73, 83, 77,
+   4, -122, 122, -127, -17, 63, -119, -30,
+   -74, -109, -106, 44, -12, 106, -15, -31,
+   -19, 17, 87, 15, -79, 81, 32, 35,
+   60, 127, 0, -53, -60, 30, -93, -31,
+   -19, 36, -19, -21, -46, 44, 16, 88,
+   -98, 61, 65, 25, 119, -70, 127, 52,
+   12, -1, -6, -72, 15, 99, -117, 22,
+   3, 99, -63, -54, -56, -1, -32, -2,
+   -120, 53, 66, -8, 112, 43, 2, -57,
+   -27, -92, 39, 100, 5, -20, -66, -7,
+   33, -81, -127, -80, 27, -112, -76, -53,
+   122, 12, 33, -88, -25, 47, -112, 10,
+   -38, 117, 29, -125, -65, 30, 60, -124,
+   -61, 14, 108, 7, -30, -50, -38, 44,
+   16, -35, 39, -2, 125, 83, -1, -24,
+   -27, 106, -76, 58, 122, 24, 15, -86,
+   -101, -82, 121, 6, -4, 33, 0, -40,
+   -80, 22, -24, -124, -39, 120, -53, -1,
+   63, 12, 48, -54, 83, -109, 40, 7,
+   26, -51, -74, 38, -12, 0, 33, -66,
+   50, -118, -25, -109, 18, 59, 124, 50,
+   10, -42, 12, 68, -85, -59, 46, 34,
+   5, -1, -2, -41, 53, 3, -8, -62,
+   -8, 33, -95, -24, 52, 30, -16, 98,
+   -13, -54, -54, 39, -30, 9, -78, -13,
+   -21, -39, -20, -21, 36, 24, 1, 63,
+   28, -72, 63, -15, -127, -19, 16, 56,
+   4, 22, -71, 9, -13, 18, -42, 5,
+   -10, -14, -71, -37, -47, -48, -68, 64,
+   56, 23, -90, 15, -67, -38, -1, 10,
+   -34, -119, 55, -61, -25, 24, 29, -47,
+   -53, -28, 32, 23, 51, 45, -17, 111,
+   12, -16, -63, -25, -50, 31, -18, -45,
+   2, -15, -79, -11, 78, -102, -46, 31,
+   -47, 69, 8, 63, -123, 107, -74, -78,
+   45, 55, 20, -64, 30, 95, 44, 6,
+   13, 28, -37, -70, -21, -84, 16, 6,
+   5, -53, 8, -9, -11, 24, 41, -39,
+   -84, -40, 24, -126, -41, -3, 13, -84,
+   59, -62, -43, 11, -15, 14, -46, -125,
+   -72, -38, -48, 22, -38, 84, 39, -29,
+   -97, 31, 8, -46, 22, -68, -60, 8,
+   -47, -123, -18, -102, -43, 34, -79, 30,
+   -74, -94, 64, -57, -1, 98, -9, 97,
+   -119, 45, 19, -24, -26, -99, -55, 24,
+   46, 7, -6, -126, -80, 15, 1, -20,
+   -72, -68, -23, -79, -74, 65, 8, 26,
+   118, 13, -82, -38, 20, -9, 104, 41,
+   42, 126, -15, -54, -65, -97, 59, 50,
+   12, 76, -47, 92, -126, -39, 2, 46,
+   27, 101, -87, -7, -26, -25, -2, 22,
+   12, 57, -99, -16, 54, 126, 80, -17,
+   54, 21, -21, 83, -54, 62, -11, 35,
+   -37, 80, -2, 20, 6, 39, -20, -74,
+   33, -53, 56, -21, -48, 37, 37, 0,
+   -40, 13, 44, 107, -47, -21, 19, -23,
+   -116, 104, 72, -43, 59, 37, 53, 70,
+   -59, 26, -14, 41, 13, 17, 32, 123,
+   -73, 62, 101, -47, -60, 15, -44, 7,
+   -114, -40, -39, -79, 84, 18, 114, 70,
+   103, 55, -24, -8, -80, 71, -50, 55,
+   54, 46, 25, -59, 15, 19, 122, -104,
+   121, -5, 45, -22, 118, 88, -2, 123,
+   -13, 21, -33, -70, -54, -86, -29, -85,
+   -40, -38, -20, -71, 8, -97, -23, -48,
+   -4, -9, 25, -122, -52, -119, -5, 3,
+   39, -28, -113, -65, -44, 5, 13, -14,
+   83, 9, 50, 27, -24, -13, -14, -37,
+   106, -31, 58, -26, 37, 1, -78, -128,
+   -12, -39, -127, 20, -53, 54, -61, 71,
+   16, 41, 54, -92, 57, 88, 48, -51,
+   -7, 18, 24, -12, 83, 29, 63, -20,
+   -88, 11, -17, -79, -84, -51, 53, -2,
+   -21, -64, -28, 98, -14, 7, 127, -122,
+   -22, -25, 6, 4, 121, 124, 111, 38,
+   -33, -17, -106, -2, -10, 12, -35, 67,
+   -2, 8, -15, -17, 48, 66, -5, -10,
+   -33, -2, -37, 73, -110, 124, -27, -14,
+   -7, 46, 6, -14, -37, -32, -32, -33,
+   39, 33, -21, -111, 1, 21, -126, -99,
+   -81, 31, -32, 58, 32, -104, 23, 61,
+   -48, 20, -5, -51, 57, -126, -10, 110,
+   -6, -32, -35, 65, 42, -95, -74, -72,
+   6, 45, -81, 34, -61, -128, 46, 22,
+   5, -30, -59, 116, -95, -31, -14, 16,
+   18, -39, 52, -36, -35, -1, -107, 59,
+   34, -24, 35, 28, 52, -65, -49, -66,
+   -1, 59, -87, 45, 42, 124, -47, -59,
+   -68, -85, 52, -18, -119, 19, 25, -126,
+   -118, -26, -9, 82, -111, 20, -72, -86,
+   6, -36, 18, -45, 100, 3, -86, -17,
+   125, -121, -50, 25, 37, 123, 20, 52,
+   -118, 53, 19, -31, -86, 123, 63, -110,
+   -12, -28, 64, -39, 75, 96, -95, 58,
+   45, 43, 97, -71, -25, -38, -8, -33,
+   -85, -56, -44, 41, 82, -77, 71, -35,
+   29, -36, -16, 21, -84, -7, -37, -82,
+   60, 21, 26, -39, -23, 87, -2, 46,
+   -27, 45, -38, -25, -67, 45, -48, -3,
+   11, -82, -15, -34, -35, 87, -94, -17,
+   47, -33, 41, -17, -36, 30, 41, -18,
+   81, 33, 25, -80, 65, -6, 65, -35,
+   -18, -105, 33, 57, 5, -12, 25, 120,
+   6, -69, 90, -41, 45, -59, -82, 80,
+   41, -11, 6, 38, 105, 51, 58, -73,
+   20, 19, -4, 40, -28, -124, 116, -33,
+   -15, 23, 124, 68, 28, 6, -25, -29,
+   18, 80, -35, -4, -25, 10, -118, -20,
+   9, 94, -111, -76, 43, -19, 15, 97,
+   -19, -21, 63, 92, 72, -67, -23, -66,
+   -49, -14, 6, -47, 17, -101, 21, -29,
+   89, -72, -86, 112, -92, 38, -71, 114,
+   -53, 47, -102, 6, -59, 64, -16, -116,
+   -22, 6, -43, 19, 9, 9, -37, -68,
+   86, -6, -84, -40, 10, -14, 80, -10,
+   -49, 76, 31, 47, 123, 90, -49, 35,
+   9, 64, 71, -29, -40, -107, 60, -33,
+   -23, 25, 63, -116, -16, -118, 82, -125,
+   -7, 26, -70, 77, 37, 124, 29, 80,
+   69, 88, -5, -56, -77, 68, -77, 61,
+   20, -72, -27, -120, -58, -70, -10, -126,
+   -49, -66, -44, 127, -28, 83, 63, 65,
+   -90, -29, -121, -1, -30, 85, -41, -91,
+   40, -43, 68, 85, 85, -75, -43, 122,
+   -24, -103, -82, 20, -113, -22, -36, -72,
+   29, -39, 28, -24, -16, 11, 27, 28,
+   -1, -61, 15, -126, 1, -31, -43, -26,
+   24, -27, -42, 28, -80, -34, 15, -44,
+   -42, 31, 23, -40, 30, -2, -54, -6,
+   -48, -114, 36, -71, 13, 57, -127, 94,
+   1, -28, 116, -62, -3, -29, -23, -75,
+   -110, 49, 42, 127, 19, -121, -92, 56,
+   -58, -28, -41, -19, -5, 38, 106, 120,
+   40, 2, 86, -58, -49, -20, 102, -56,
+   -86, -7, 1, -85, 10, 34, -11, -63,
+   -1, 85, -106, 31, -48, -64, 12, -14,
+   -111, -82, -28, -11, -26, -52, -43, -33,
+   -20, -57, -91, 27, -64, 54, -55, -32,
+   27, 97, 11, 13, -8, -120, -35, 35,
+   6, -117, 25, 104, 7, -1, -8, 0,
+   31, -29, -10, -20, -33, -23, -1, -6,
+   -107, 60, -62, 70, -28, -96, 48, 17,
+   -103, -64, 30, 42, 18, 66, 0, -69,
+   -16, 77, -21, -4, 35, 45, -70, 70,
+   36, 27, 97, -27, 57, 23, -23, 91,
+   118, -12, 24, 21, -54, 1, 40, -17,
+   -109, 39, 33, -22, -44, 46, 20, -15,
+   -42, 29, -10, -64, -16, 35, -95, -83,
+   40, -34, -63, 54, -12, 2, 104, -5,
+   -103, -79, -94, 126, -7, 18, -17, 116,
+   -15, 76, -48, 19, -5, 76, 58, 53,
+   1, 20, 22, -13, -63, 11, -15, -117,
+   -39, 43, -21, -5, 18, 16, -7, -72,
+   34, -103, 86, -76, -114, 26, 39, -4,
+   3, 45, -37, -55, -34, 56, -113, 14,
+   -56, 21, 83, -115, 52, -41, 71, -51,
+   -125, -95, 11, 93, -48, 5, -41, -128,
+   11, 22, -20, -103, 1, 17, -69, -28,
+   -32, 25, 119, 52, -92, -92, -19, 57,
+   77, -51, 59, -57, -8, -90, -17, -44,
+   -94, -43, -90, 5, 18, -27, -72, 42,
+   -18, -29, 32, -30, 19, -7, -27, -102,
+   -82, -20, -7, -127, -26, 60, 1, -37,
+   -124, -92, -47, -8, 8, -55, -25, -88,
+   -18, 98, -5, -35, -44, 15, 121, -38,
+   -13, 9, -88, -126, 68, -126, 62, -49,
+   -44, -56, -71, 3, 65, -27, -46, -103,
+   -78, 29, -65, -23, 100, 75, 47, 8,
+   57, -43, -47, 69, 112, -85, 51, -56,
+   36, -101, 13, -36, 73, 26, 31, -8,
+   53, 52, -38, 29, 81, -26, 116, -18,
+   35, -49, 2, -6, -4, 52, 94, 59,
+   -120, 68, -59, 6, -3, -54, -22, 18,
+   1, -126, -127, -34, 19, 105, -26, -16,
+   113, -43, -31, -7, -60, -4, 72, 39,
+   17, 38, 118, 31, 5, 19, -70, -14,
+   -93, -8, -107, -56, -59, 56, -127, 41,
+   -63, -30, -71, -27, -4, 13, -15, -66,
+   -50, 33, 38, 34, -47, 2, -50, 71,
+   -49, 18, -39, -18, 46, -3, 50, -18,
+   -32, -67, -25, 58, -14, -7, 23, -3,
+   -24, 7, 8, 118, -20, -55, -24, -30,
+   -16, -9, 73, 63, -74, 42, 112, -35,
+   -27, 38, 59, 13, 72, 2, 109, -11,
+   -75, 30, 28, -20, -74, 16, 103, -83,
+   -6, -115, -44, -11, -33, -120, 66, -58,
+   22, -12, 15, -32, -26, 1, 30, 35,
+   76, 62, -121, 9, -32, 12, 75, -77,
+   80, 25, -18, -78, -123, -61, 23, 36,
+   -127, -65, 15, 29, 100, -23, 2, 15,
+   21, 52, -120, -14, 12, -38, -39, 100,
+   13, -3, 22, -125, -115, -44, -65, 85,
+   -44, 35, -27, -44, 9, 77, 2, 4,
+   5, 35, -31, -126, -112, -91, 32, -24,
+   6, -73, -41, 41, -23, 42, -127, 41,
+   -51, -8, -55, -52, -32, -6, -52, 55,
+   -16, 26, 110, -63, 70, 127, 38, 80,
+   17, 87, 44, -51, 34, 127, -16, 117,
+   126, 22, -24, -123, -6, -76, 12, -4,
+   -3, 47, -31, 28, 30, 12, -24, 84,
+   110, -105, 64, 44, 84, 27, -13, 54,
+   104, -20, 60, -60, -10, 45, 120, -55,
+   -6, -91, 35, 10, 2, 38, -30, -125,
+   -100, -23, -126, 47, -16, -17, 20, -73,
+   6, 31, -28, -121, -53, 79, -100, -4,
+   69, 0, -20, 125, 35, 16, -44, -20,
+   -5, 44, -113, -11, -6, 57, 33, -3,
+   -21, 50, 101, -9, 42, 72, -10, 21,
+   95, 39, 8, 72, 42, -43, -24, 30,
+   33, -27, -17, 79, 52, -127, 3, 39,
+   1, -66, -43, 85, 11, -56, -20, 14,
+   -7, -30, -8, -10, -34, 48, -109, -12,
+   -99, -58, 123, -82, 35, -102, 7, -83,
+   -104, 29, 99, -91, 13, 15, -64, -111,
+   -17, -24, -98, -97, 86, 0, 12, 123,
+   -113, 61, -13, 3, 31, 4, -92, -115,
+   126, 7, 6, 74, -68, 46, 19, -85,
+   -94, -20, -20, -117, 59, -51, -59, 20,
+   18, 3, 6, 21, 1, 94, -78, 112,
+   -12, -46, -30, 67, -16, -83, 6, 42,
+   -118, 49, -82, -21, -4, 15, -12, -67,
+   20, -71, -69, 57, -10, -51, -46, 99,
+   -5, -9, -40, 59, -61, -11, -59, -69,
+   2, -55, -32, -48, -4, -6, -33, -110,
+   94, 43, -19, -18, 31, -126, -5, -19,
+   -80, -20, -20, -28, -56, -70, 45, -46,
+   43, 77, 6, 77, -90, 26, -37, 35,
+   -39, -48, 28, 9, -56, -42, -31, -46,
+   -31, 13, -65, 77, 34, -41, 9, 17,
+   20, 24, 51, -44, 11, -21, -44, -78,
+   -96, -23, -22, 6, 18, -126, -110, -33,
+   8, -32, 17, -123, -43, -7, -53, 17,
+   46, -53, 26, -15, 70, 19, -51, 67,
+   25, 117, 56, 7, -6, 74, 57, 101,
+   122, 41, -32, -44, -21, 54, 32, 22,
+   119, 120, 72, 68, -24, 29, 48, -6,
+   2, -14, 5, -35, -77, 4, -72, 53,
+   46, -31, 57, 25, 9, 69, -21, -7,
+   70, -41, 43, 63, 10, -53, -68, -31,
+   20, -19, -90, 48, -22, -54, 33, 64,
+   20, -79, -13, -17, 45, -41, 103, -16,
+   25, 6, -35, -24, 28, 9, -29, 76,
+   4, 40, 47, 23, 24, -51, 92, -17,
+   49, -23, 107, -13, 65, 72, 34, -19,
+   -20, -60, -45, -55, -2, 19, -58, -49,
+   7, 20, 78, 120, -69, 28, 45, -119,
+   -15, 13, 20, -45, 25, -108, -20, 12,
+   -54, -17, 32, -17, -13, -3, -3, 17,
+   -25, -48, 95, 8, 36, -66, -4, -26,
+   -17, 12, 39, 57, 53, -17, -33, -46,
+   -18, -61, 19, 64, -72, -12, -69, -31,
+   -31, 66, 65, -62, -10, 120, 4, 46,
+   122, -36, 75, -47, -5, -82, 49, -3,
+   -123, -125, -37, 127, 33, 111, 58, -68,
+   -36, 87, 51, 22, -49, -1, 115, -10,
+   -40, 37, -56, -90, 11, 34, 77, -5,
+   -37, 61, 123, -11, 17, 46, 64, -86,
+   -96, -5, -18, -84, 116, -126, 127, 55,
+   58, 27, -68, 42, 47, -63, -108, -103,
+   -33, -1, 77, 0, -9, 33, 126, -106,
+   -14, 127, 8, 2, -42, 37, 41, -23,
+   17, 11, 4, -65, -42, 0, -47, -36,
+   -11, 34, -83, -25, 52, -125, -25, 0,
+   7, 24, -83, -56, -21, 112, -60, 25,
+   -124, -114, -67, -14, -55, -28, -34, -9,
+   119, 8, -47, 52, -6, 20, 23, 9,
+   -104, -27, -46, -42, -32, 55, 118, 49,
+   -35, -41, -19, -103, 1, 63, -47, 9,
+   1, 0, 124, 72, 1, 8, 47, 118,
+   29, -39, -20, 26, -38, -17, 13, 68,
+   -52, -37, -30, 105, 7, -5, 27, 24,
+   71, 15, -48, 80, -9, -9, 66, 19,
+   19, -31, -74, 115, -4, 21, 78, -19,
+   2, 17, -51, 28, -109, 58, 78, -10,
+   -3, 119, -44, -12, -41, -57, 67, 38,
+   49, -113, -43, -101, 59, 104, -26, 116,
+   -23, -47, -33, 57, 17, -99, -123, -3,
+   -55, 9, 94, -50, 30, -48, -128, -63,
+   3, -61, 61, -31, -40, -31, 4, -54,
+   -123, 37, 70, 14, -13, -32, -115, 61,
+   21, -93, -34, -7, -32, 26, -20, -110,
+   73, -15, -123, -69, 41, 13, 106, 10,
+   -39, 69, -102, -80, 18, 51, -81, 86,
+   30, 39, 48, -78, 106, 14, 30, -27,
+   65, 62, -20, -113, -30, 47, 22, -101,
+   -24, 119, -15, -40, -95, 76, -112, -5,
+   38, -123, 77, -22, -84, 63, 17, 3,
+   -113, 50, -6, -60, 5, 16, 29, 21,
+   -1, -25, -16, -2, 58, -50, -58, -43,
+   -28, -85, -71, -45, 66, 46, 127, 37,
+   -63, -9, -60, 56, 22, 48, -47, 23,
+   28, 21, 27, -32, 7, -71, -82, -7,
+   -11, -27, -24, -2, -45, 67, 32, 21,
+   86, 62, -51, 39, -41, 2, -41, -31,
+   -15, 50, -50, 54, -8, -21, 39, 51,
+   -32, -24, -22, -27, 5, -8, 16, -2,
+   -17, 17, -43, -35, -32, 29, -21, -58,
+   27, 49, -2, -63, -109, 40, 26, -55,
+   63, 87, -37, 76, -88, -23, 42, 59,
+   24, -32, -47, 18, -16, -30, 71, 39,
+   -13, -10, -83, -2, 24, -12, -36, -44,
+   -79, 66, 17, -21, -27, 48, -4, -7,
+   101, 16, -13, 17, 20, 29, 70, -46,
+   19, -30, 25, 20, 8, 32, 86, -76,
+   -17, -59, 102, -29, 10, 38, -104, 6,
+   -86, 8, -39, 4, -2, -28, 8, -27,
+   8, -1, 36, -82, 17, -53, 44, 72,
+   43, -83, 16, 70, 42, -61, 12, -74,
+   -70, -10, -23, -43, 33, 29, 12, -3,
+   -18, -81, -26, -48, 10, 27, -37, 96,
+   -27, 24, 67, -36, -28, -6, -10, -26,
+   15, -41, 7, 110, 25, -101, -75, 62,
+   -54, -64, -11, -38, -126, -24, -93, 101,
+   0, 13, 20, 35, 41, -122, 91, 62,
+   -45, -12, 13, -36, 40, -43, -104, -29,
+   61, -117, -70, -121, 17, -21, -3, -127,
+   107, -22, 62, 47, -3, -36, -18, 69,
+   -67, -33, -19, -89, -13, -7, -4, -49,
+   -20, -112, -13, 35, -126, 38, -27, -114,
+   12, -54, 19, -108, -61, -79, 5, -65,
+   71, -121, -115, -64, -2, -52, 35, 22,
+   -46, -8, -82, 41, -113, -126, -6, -19,
+   43, -51, 35, -11, 84, -44, -100, 23,
+   67, -11, -20, 81, 52, 22, 21, 124,
+   12, -23, 4, -27, -128, 111, 25, 35,
+   48, 28, 9, 28, -24, 84, 56, 10,
+   71, -22, -22, 78, 16, 92, 117, -22,
+   33, 29, -10, -98, -35, 45, 1, 5,
+   24, -46, -69, 13, 21, 28, 4, -27,
+   -117, 44, -29, 116, 26, -21, -38, 111,
+   43, 14, 6, -7, -79, 82, -57, 4,
+   -127, 0, 86, 113, 2, 7, 42, -72,
+   -31, 11, -6, -97, 22, 113, 10, -31,
+   -30, -57, -35, 21, -21, 47, -3, -42,
+   -36, 74, -102, -24, -59, -58, -50, -67,
+   -113, 25, -128, 4, -108, 16, 113, 82,
+   32, -128, -17, 65, -121, -92, 81, 0,
+   28, 27, -8, -93, -31, -41, -22, -20,
+   -78, -111, 44, -105, -67, -117, -123, -72,
+   -76, -90, 9, 29, -48, -66, 4, -82,
+   -51, 16, -28, 11, -54, 4, 22, 10,
+   -91, -64, 6, 119, -63, -6, 24, 124,
+   75, -54, 70, 67, 38, -31, -48, 68,
+   71, -38, -7, 7, 34, 91, 53, 53,
+   -33, 10, 90, 3, -37, 55, 58, 38,
+   -17, 54, 19, -45, 63, 69, -9, 82,
+   9, -5, -33, -13, -35, -17, 4, -64,
+   -126, 102, -116, -3, 17, -42, 19, -50,
+   62, 41, -21, -103, 38, 36, 14, -9,
+   -10, -46, -35, -2, 43, 56, -112, -109,
+   70, -17, -35, -42, 34, -20, 94, -8,
+   -1, -29, -30, -47, 71, -29, 56, -12,
+   6, -76, 53, 1, 8, 55, -24, 63,
+   15, 61, -113, -27, -57, 71, -42, 47,
+   74, -72, -12, 13, -39, -75, -112, -46,
+   40, 24, 82, 32, 48, -20, 40, 14,
+   61, -11, -117, -37, -7, -67, -123, -21,
+   20, -36, -31, -7, 28, -95, 39, -5,
+   -98, -39, 10, 40, -67, -5, -47, 12,
+   -23, 31, -2, -4, -9, -70, 29, 45,
+   -37, 49, 15, -122, -47, 34, 9, 62,
+   -7, -42, -127, -72, -22, -55, -64, -24,
+   2, -12, 86, -77, -36, -6, 56, 55,
+   46, 117, 105, -72, 27, 1, 97, 81,
+   -24, -83, -94, 6, -16, 68, 9, -57,
+   12, 108, 11, 13, -89, 25, 59, -38,
+   49, -18, 16, -53, -2, -1, -5, 50,
+   17, 89, -9, -50, 27, -34, 62, -7,
+   4, -49, -6, -3, 12, -12, -118, -9,
+   26, -32, 29, 76, 37, -112, -26, -76,
+   -38, -22, -34, 125, 59, 1, -53, 40,
+   21, -4, -27, -83, -19, 47, -123, -123,
+   30, 111, 3, 27, -1, 127, -47, -97,
+   38, 87, -101, 1, 15, 79, -2, 44,
+   -18, -40, -17, 18, -49, -26, -125, -120,
+   16, -55, -37, -25, -86, -87, -23, 8,
+   29, 3, -14, 9, -9, 34, 10, 69,
+   4, -32, -20, 68, 10, 21, 15, -58,
+   16, -45, 81, 81, 104, -20, 45, 6,
+   45, 41, 55, 12, 18, 1, 11, -84,
+   -48, 88, 2, 50, 30, 11, 17, 5,
+   -23, 70, 121, 24, -31, 97, 36, 102,
+   -95, 88, 5, -43, 123, 92, -20, -43,
+   -28, 22, 127, -42, -47, -37, 86, 56,
+   -60, 94, -13, -108, 21, -82, 25, -76,
+   36, 21, 54, 123, -70, 39, 3, 9,
+   73, -9, 31, -35, -55, -128, 14, 36,
+   15, 32, -63, -80, 64, -76, -72, -58,
+   -115, -124, 127, 33, 17, 23, -65, 111,
+   18, 60, -34, -120, 80, 19, -125, 49,
+   -20, 53, -66, 31, 22, 35, -125, -86,
+   -42, -73, 37, -87, 22, 113, 70, -39,
+   1, -57, -44, -85, -12, 103, -49, -72,
+   79, -26, 89, -46, -67, 51, -11, 125,
+   -121, -87, 32, -90, 21, -42, -3, 77,
+   -6, 33, 38, -7, -27, 31, -28, 51,
+   18, 49, 55, 6, 22, 6, -29, 71,
+   -123, -10, -46, 64, 30, -52, 124, 33,
+   -1, -48, 27, 105, -74, -104, 38, -45,
+   102, -8, -28, 20, 19, 28, 8, -50,
+   -44, 43, 123, -23, 121, -28, 88, 3,
+   57, -31, 13, 17, 52, 27, 8, 53,
+   -25, -28, -34, 18, -68, 63, -21, -32,
+   11, 53, 66, -38, -79, 59, 5, -65,
+   50, -23, 61, -52, 64, -120, -20, 12,
+   -77, -9, -67, -95, 16, -127, -111, -74,
+   124, 126, 78, 45, -29, -3, -70, -68,
+   43, -27, 32, -127, -69, -16, -33, -127,
+   -125, -43, 13, 81, 67, -10, -41, -7,
+   -38, -26, -1, 64, -66, 106, 127, -15,
+   -28, 14, 117, 28, 41, -81, 46, -58,
+   -121, 48, -86, -39, 8, -36, -128, -3,
+   -78, 35, 45, 24, -7, -25, -3, 115,
+   -21, 15, 14, -30, -40, -30, -55, 39,
+   79, -29, 126, 69, -97, 18, -31, -11,
+   58, -60, 14, 99, 11, 54, 43, 30,
+   -50, -53, 4, 125, 26, 108, 32, 36,
+   -17, 9, -68, -104, 27, 7, 84, -73,
+   8, -58, 4, 35, 85, 76, 125, 31,
+   32, 42, 15, -65, 63, 89, 31, 44,
+   7, 24, -22, -117, -4, -84, -32, -2,
+   78, -53, -74, 108, -96, -26, 26, 27,
+   8, -62, 9, 61, -20, 32, -37, -39,
+   20, -5, -88, 38, -22, -47, -79, 30,
+   -35, -12, 13, -35, -79, 34, 10, -117,
+   34, -14, 106, 12, 11, -24, 59, 28,
+   25, -21, 10, -73, 9, 9, -18, -31,
+   -52, -70, -45, -5, -20, -22, 89, -21,
+   41, 39, 58, -16, -2, -128, 23, 9,
+   61, 22, 25, -43, -126, -27, -20, 14,
+   -57, -32, 126, -5, 25, -44, 32, 51,
+   108, 62, -3, 12, -16, -39, -35, 37,
+   41, -64, 37, 58, -63, 100, -29, 66,
+   31, 14, -3, -12, 98, -58, 9, -5,
+   -22, 35, -1, 2, 78, 46, 45, -33,
+   35, -62, 78, -54, -40, 17, 60, 99,
+   -43, 42, 47, 24, -42, -80, -72, -81,
+   14, -48, -41, -40, 83, 36, 24, 55,
+   48, 124, -39, -75, -57, 96, 28, -107,
+   -64, 88, 18, 4, -18, -47, 53, 35,
+   -61, 60, 21, -23, -15, -112, -55, -39,
+   -75, -17, -122, 78, 51, 15, 51, -126,
+   79, -100, 94, 35, -33, 42, 45, -26,
+   41, -20, -76, -2, 11, -82, -12, 60,
+   -44, -9, -40, 3, -93, -116, -125, 1,
+   -60, 34, -28, 43, -3, 18, 33, 29,
+   -117, 87, 19, -88, -92, -92, -64, 37,
+   -125, 68, -123, -113, 29, 39, 5, -8,
+   6, 100, 127, -7, 8, 62, -9, -10,
+   -48, 96, 104, 121, 122, 21, 46, 116,
+   124, -77, 0, -124, 120, -10, -72, 0,
+   -5, 100, -44, 124, 12, 52, 26, -46,
+   -18, 126, 8, -30, -124, 4, 94, 12,
+   10, -39, 126, -73, 109, 22, -72, -82,
+   32, -33, -56, 37, -58, -50, -24, -6,
+   114, -62, 33, -124, 44, 27, 111, -2,
+   50, -12, 35, 12, 126, 12, 21, 94,
+   25, 22, -8, 51, 74, 46, -102, 24,
+   -57, 0, -54, -51, -27, 116, 113, -25,
+   0, 9, -29, 16, 47, -69, 41, -63,
+   -66, -36, 21, -74, -40, 41, 65, 62,
+   8, -86, 59, 35, 90, 24, -9, -31,
+   -23, 25, 14, 50, -113, -48, 59, -9,
+   -48, 7, -37, -124, -25, 15, 18, 77,
+   -66, 35, -1, -15, -84, -29, 6, -9,
+   25, -26, -108, 53, 5, -13, 26, -124,
+   -47, -39, 21, -5, 21, -64, -43, 74,
+   51, -34, 42, 60, -30, 23, -32, -6,
+   -53, 58, 41, -92, 30, -67, -22, -16,
+   -30, -10, -43, 96, 22, 64, 121, 18,
+   -105, -61, 8, 69, -90, 80, 65, -118,
+   9, -16, 20, 54, 6, -68, 66, 31,
+   29, -101, 81, -79, 37, 68, 5, -123,
+   115, -9, -33, -94, 7, -42, 113, 39,
+   -3, 110, -74, -13, 37, -75, -62, -13,
+   119, 2, 0, -120, -114, 62, -53, 28,
+   -99, -58, -7, -63, -120, 85, -79, 4,
+   -28, 61, -126, -65, 62, -94, -60, 20,
+   125, -112, -124, -56, 31, 127, -59, -66,
+   -125, 62, -92, 25, 39, -128, -24, 24,
+   -34, 50, 2, -30, 127, -91, -43, 65,
+   127, -8, -21, 12, 99, 7, 120, -126,
+   -35, -5, 109, -117, -32, 10, 114, -11,
+   -18, -83, 66, -76, 87, 35, -12, -90,
+   17, -25, 123, 14, 20, -5, -62, 23,
+   -35, 125, 36, -5, 28, 64, -113, 5,
+   -11, -27, -123, 14, -48, -13, 26, 19,
+   -20, -4, -19, 33, 0, -81, 41, -47,
+   -30, 16, -67, -52, 39, 68, -7, 85,
+   6, -10, -6, 17, 59, 18, -48, 113,
+   73, 85, 60, -3, 94, -43, 21, 9,
+   15, -74, -40, -52, 45, -104, -34, 3,
+   26, 20, -36, 17, -121, 21, 44, 66,
+   -67, 5, 4, 63, 8, -23, -45, 12,
+   52, 4, 53, 8, -116, -64, -42, 68,
+   -124, 39, -25, -22, -2, -17, -31, -77,
+   43, 32, -55, -127, -40, -6, 44, 66,
+   27, -21, 60, -110, 16, -71, 65, 103,
+   -25, 50, 47, -49, 18, -35, 18, 21,
+   -29, -19, 38, 4, -47, -4, -66, -21,
+   -41, 43, -22, 50, -78, -62, 106, 71,
+   -66, 31, -38, -17, 45, -65, 92, 0,
+   -23, 13, 90, 48, -42, 103, -42, 18,
+   11, 50, -20, 19, -76, 74, 70, 43,
+   106, -119, 18, -40, 34, 24, 20, -17,
+   -83, -64, -10, 27, -6, 62, 127, -88,
+   -43, 49, 124, -23, -95, -17, 3, 75,
+   65, -45, -14, 88, 48, 30, -53, -35,
+   29, -87, 11, 66, -2, 109, -28, -29,
+   -71, 96, 28, 24, 38, 23, 63, -55,
+   57, -42, -18, -55, -42, 23, -40, 16,
+   18, 33, 10, 29, -24, 36, -79, -81,
+   -13, 38, 24, 10, 126, 46, -9, 7,
+   34, 59, -1, -52, -8, -28, -23, -95,
+   55, -128, -32, 17, 120, -89, 40, -62,
+   -63, 17, -97, -77, -46, 41, -121, -5,
+   45, -70, -50, -92, 94, 71, -121, -15,
+   127, -77, 6, 125, -34, -48, -21, -128,
+   127, -39, -47, -109, 36, 127, 76, -55,
+   -83, -30, -124, -128, 52, 23, -123, 127,
+   -21, -91, -9, 28, 36, -67, -51, 27,
+   33, -38, 4, -74, -123, 10, -120, -25,
+   -30, 54, -9, 123, -118, -14, -77, 30,
+   70, 8, -18, 106, -7, -55, -39, -75,
+   -59, -47, 25, 48, -6, 7, 83, -47,
+   25, -127, -33, -114, 33, 30, -3, 49,
+   105, -41, 72, 75, -91, 0, -36, -64,
+   -18, 16, -36, -99, 116, -85, 61, -70,
+   -14, -126, -39, 122, -81, 91, -42, -108,
+   -116, -41, 46, 119, -1, 15, -19, -47,
+   -19, 17, -73, -20, 3, -66, 40, -122,
+   81, -5, -61, 23, 45, -79, -25, -79,
+   66, -2, 6, -36, -47, 95, -9, -34,
+   -24, 3, 94, -11, 127, 75, 38, -6,
+   -45, 12, 25, -28, -124, 111, 108, -78,
+   -7, -87, -45, -3, 26, -66, 91, -87,
+   72, 64, -88, -78, -41, 29, -86, -59,
+   -1, -55, -35, 13, 124, 15, 40, -43,
+   29, 59, -112, -38, -10, -77, -9, 18,
+   20, -47, 39, 43, -34, -47, -17, 34,
+   1, 70, 90, 47, -63, -15, -4, 28,
+   102, 48, -78, 24, 58, -12, -33, 8,
+   16, 17, -52, 18, -4, 81, -28, -28,
+   28, 56, -40, -43, 9, -52, 5, -54,
+   -26, 15, 40, 6, 18, 29, -25, -35,
+   -87, -21, 17, -25, -5, 6, 65, 34,
+   59, 33, -38, -17, 6, -18, 42, -42,
+   -61, 45, -46, 63, -80, 16, -56, -118,
+   27, 44, -8, -74, -24, 7, -49, -47,
+   -87, 16, -64, -22, -16, 127, 24, -39,
+   -44, 42, -125, -75, -16, 52, -40, -39,
+   40, -48, -5, 16, 10, -59, 25, -13,
+   19, -23, -96, 43, 71, 51, -21, -24,
+   -22, -10, 66, -91, 23, 74, -119, 93,
+   -42, 5, 33, -95, 53, -121, -68, 35,
+   -63, 33, -50, -48, -65, -8, 21, -3,
+   -1, -87, 88, 82, -51, 33, -32, -26,
+   -72, 15, 61, 2, 55, 122, -32, 48,
+   15, -71, -3, -41, -11, -22, 19, 6,
+   -27, -85, -11, 1, 25, -52, 94, -104,
+   52, 42, -49, 49, 118, 79, 78, -46,
+   22, -7, 11, 63, 24, 5, 3, -2,
+   -37, 118, -4, 7, -50, 1, -27, 50,
+   39, -33, -20, -116, -67, 4, -13, 99,
+   58, 16, 38, 47, 65, 86, 68, -62,
+   62, 8, 9, -81, 10, -26, -87, -18,
+   89, 42, 51, -19, -71, 126, -87, -64,
+   -69, -80, -3, -13, -20, 33, -4, 89,
+   -6, -16, -45, 93, 29, -7, 58, 78,
+   45, 23, 32, -67, 5, -25, 59, -47,
+   33, 60, -23, 41, 12, -13, 26, -18,
+   15, -64, -30, -122, -31, 66, 120, -86,
+   98, -120, 66, -22, 6, -37, 39, 90,
+   -124, -75, -124, 16, -59, -42, 96, -4,
+   -51, -34, -10, 36, 8, 127, -60, -80,
+   44, 46, -31, -3, -20, 116, 45, 50,
+   5, -6, 78, -25, -27, 40, 49, -24,
+   68, 1, 25, -42, 0, -93, 94, -37,
+   8, 31, 27, -24, 22, 8, 15, -33,
+   33, 18, 75, -113, 75, -14, -63, 28,
+   -4, -63, 3, 45, -5, -6, -38, -66,
+   -4, 58, -4, 125, 89, 56, -21, -119,
+   54, -26, -35, 43, -51, -51, 74, -9,
+   -57, -30, -30, -126, -122, -42, 90, 5,
+   -74, 37, 49, -3, -69, 33, 20, -2,
+   70, -84, 0, -51, -74, -26, 100, 10,
+   -89, 3, -92, -119, 31, 50, 20, 24,
+   51, 23, 114, -120, -46, 70, -7, -11,
+   -11, -16, 36, 3, -122, 20, 46, -52,
+   -23, -35, 3, -53, -37, -35, -36, 28,
+   38, -69, -90, -4, -43, -58, 30, 13,
+   -70, 5, -44, -17, -59, -26, -48, -74,
+   29, -127, -23, -34, -31, 29, 14, -50,
+   -93, -20, -53, -35, -59, -42, 1, -44,
+   16, -126, 16, -125, 22, -22, -98, -8,
+   71, -57, -76, 13, 61, 125, 48, 52,
+   -110, -90, 37, -75, -41, 0, -36, 32,
+   33, -2, 28, -70, 59, 93, -116, 13,
+   79, -18, 83, -43, -12, 0, 4, -74,
+   -121, 0, -63, 42, 52, -65, 96, 7,
+   18, 11, -24, 100, 29, 23, 45, 24,
+   6, -33, 17, -75, -66, 59, -8, 42,
+   -8, 8, -36, -35, 3, 22, -26, -19,
+   -23, 17, -62, 44, -32, 120, -5, 26,
+   -14, 11, -54, -40, 43, -47, -62, 8,
+   11, 18, -5, -44, 9, 15, 41, -13,
+   -42, -58, 45, 32, 8, -28, 52, 29,
+   18, -14, 31, -18, 63, -19, -103, 60,
+   4, 75, -36, -86, -90, 68, 7, 17,
+   -24, -44, -16, 11, -62, -31, 71, -78,
+   15, -51, 1, -46, 71, 124, -2, 9,
+   -20, -9, 39, 5, 71, -12, 0, 54,
+   68, 41, 33, -19, 103, 1, -66, 20,
+   41, -56, -80, 7, -35, -85, 23, -37,
+   9, 62, 56, 63, -23, 25, 127, 26,
+   1, -76, 124, -23, 44, -55, 87, -58,
+   -47, -18, -15, -8, -24, -50, 54, -68,
+   -63, -12, 25, -14, -25, -49, -16, 109,
+   -55, 9, -49, -2, -73, -33, -101, 28,
+   -53, -10, 21, -42, 11, -53, -31, -125,
+   57, 24, 85, -11, -76, -39, -40, 34,
+   -30, -34, -127, -4, 55, 96, -3, -44,
+   -32, -24, 115, -9, -92, -63, 6, 71,
+   -23, -74, -16, -86, 84, -127, -116, -109,
+   108, 18, 91, -96, -76, 65, -55, -5,
+   29, -26, 23, 40, 9, -127, 40, -103,
+   69, -127, -10, -16, 99, -34, 53, -5,
+   -108, -40, -81, -42, 63, 61, 23, 123,
+   -72, 7, 55, 114, 24, 73, -15, 17,
+   37, -43, 48, -105, 77, -12, 33, 29,
+   -36, -1, 41, -35, -81, 81, -41, -80,
+   -29, -43, 115, 19, 50, 40, 32, 32,
+   -82, 87, 28, -5, -22, -77, 56, -12,
+   28, 26, 5, 49, 37, 25, -29, -35,
+   -13, -82, -57, -74, 36, 104, 62, -78,
+   -82, 46, -3, -57, -18, -57, -9, 61,
+   14, -12, -41, -84, 125, 124, 24, -80,
+   -44, -21, 21, 82, -48, 123, -72, -23,
+   -93, 38, 10, -103, 55, -126, 31, 29,
+   -48, 127, 26, -51, -74, -54, 4, 35,
+   -125, -40, -30, 37, 58, 31, 11, 10,
+   2, -24, -75, -18, 29, 35, 10, 37,
+   -3, -106, -56, -70, -11, 14, -59, -125,
+   27, -49, -18, 12, -59, -63, -74, -1,
+   -66, -13, -121, -73, -4, 5, -121, -70,
+   6, -128, -23, -20, -25, -65, 14, -23,
+   112, 67, 109, 41, -15, 71, 3, -9,
+   -21, 121, -119, 63, 93, 34, 35, 65,
+   126, -39, -46, -118, 105, -103, -25, -29,
+   76, 51, -77, 122, 95, 65, 77, 67,
+   11, -4, -119, -52, -39, 48, 6, -28,
+   68, -42, 113, 9, 23, -18, -7, -14,
+   23, -12, -9, 5, 6, -93, 43, -32,
+   7, 20, -65, 55, 18, -128, 53, -7,
+   -5, 21, -2, 13, 43, -5, 13, -126,
+   92, -60, 32, -84, -116, 62, 70, 115,
+   -21, -38, -116, 0, 39, -10, -10, -29,
+   -101, -40, -9, -29, 43, -16, -1, -4,
+   29, -42, -52, 13, 44, -126, -91, 39,
+   64, -52, -60, -52, 66, 15, -7, -35,
+   -105, -55, 63, -24, -76, 89, -18, 38,
+   -73, 57, 6, 67, -80, 64, -48, -42,
+   19, -74, -128, 36, 4, 20, -125, 15,
+   51, 13, -19, -29, -78, -60, 56, -9,
+   63, -23, -37, -57, -12, 7, 33, -115,
+   -30, 62, -32, 93, -19, 73, 20, 15,
+   -2, -48, -19, -128, -54, 126, -103, -39,
+   -27, -65, -24, 63, 7, -40, 27, -26,
+   71, -110, 116, 36, 20, 7, 2, 40,
+   45, -41, -62, -78, 28, -54, -59, -1,
+   -19, -75, 50, 32, 107, 20, -5, -104,
+   105, -39, -38, 72, 70, -121, -4, 99,
+   -23, 16, -47, 14, 89, 34, -65, -16,
+   -46, 18, 52, -65, -51, 11, -108, -37,
+   -57, -25, 27, 19, -36, -100, 97, -112,
+   -24, -118, -31, -39, 122, -61, -52, 95,
+   42, -53, -27, -71, -79, 3, -62, -126,
+   -115, -30, 65, -48, -98, -110, 77, 13,
+   55, 26, -4, 2, -73, -36, 50, 20,
+   -86, -70, 22, -35, 118, -119, 7, 62,
+   -124, -7, -107, -95, -119, -60, -47, -94,
+   14, 105, -70, 104, 16, 75, 114, -128,
+   -95, -113, 17, 7, -127, 24, 28, -53,
+   -76, -57, -118, -19, -59, -14, -64, -22,
+   -27, 0, -10, -103, 13, -116, -59, -1,
+   66, -123, -107, -5, -48, 4, -61, -86,
+   -50, 5, 51, -81, -108, -59, 19, 54,
+   -103, -17, -35, -127, -81, 59, -122, 0,
+   36, -24, 117, -29, 31, -9, 13, 15,
+   80, 81, 36, 123, 90, 77, 21, -49,
+   8, -12, -34, 65, -71, 35, -3, 15,
+   -54, -58, -41, -45, 10, 54, 102, 77,
+   23, 28, -39, -43, -47, -49, -87, -35,
+   24, -2, 21, 33, -22, 26, 19, 80,
+   -26, -32, -101, 34, 31, -6, -57, 20,
+   73, 78, -107, 36, -49, 2, 23, -17,
+   109, 5, 15, -34, 41, -23, 61, -5,
+   -56, -102, 88, -16, 49, -52, -57, 59,
+   90, -8, -125, 30, 72, 75, -46, -75,
+   -126, 97, -28, 118, -62, -47, 113, -29,
+   -48, -29, 101, 23, -7, -42, 18, 36,
+   0, 11, -29, 31, -53, -5, -18, -80,
+   46, -18, 29, 5, 17, 0, -19, 65,
+   -6, -1, 21, 11, -35, -40, 26, -68,
+   -29, -43, -4, -24, 29, 85, -25, -77,
+   -10, -27, 3, -34, 56, 74, -118, 13,
+   14, 101, -48, 22, -41, 59, 22, 21,
+   -20, -127, -73, -7, 70, -48, 13, -95,
+   31, -14, -63, 22, -71, -93, -74, -38,
+   -120, -28, -33, -45, -14, -48, -18, 81,
+   24, -60, -29, 0, -16, -7, 47, -84,
+   -72, 58, 14, -37, 71, 20, 41, -42,
+   -6, -105, -8, -2, -25, -16, 23, -50,
+   16, 33, 52, 22, 42, -4, -5, 54,
+   15, -22, -105, -18, -8, -25, -112, 26,
+   -32, -46, -70, 86, -41, 105, 46, -30,
+   -38, 1, -24, -20, -24, 3, -13, -44,
+   19, -79, 23, -60, 21, -54, -120, -21,
+   -3, 60, 4, -29, -2, 17, -2, -10,
+   -20, 12, -71, -108, 47, 4, 26, 20,
+   -11, -28, 0, -27, 2, -50, 7, 9,
+   -42, -59, -52, 65, 9, 77, -67, -21,
+   5, 44, -30, -33, -87, 8, 109, 120,
+   -80, -27, -74, 4, 40, 22, -17, 91,
+   13, -31, 80, 0, 34, 24, -29, -74,
+   -120, 71, -96, 85, 125, 117, 59, -53,
+   -75, -42, -21, -19, 9, 29, 47, -124,
+   97, -7, 54, 29, 9, 67, 56, 13,
+   -16, 33, -10, -11, 100, 26, -65, -10,
+   2, 80, -43, -1, -98, -37, -1, 63,
+   29, 41, -92, -5, 48, 36, -2, 48,
+   2, -23, 7, -2, 19, -121, 95, -85,
+   -2, -126, 47, 44, 4, -49, 53, 27,
+   -80, 48, -51, 127, 13, 84, -39, 2,
+   40, 29, 45, 53, 14, -21, 27, -38,
+   -79, -63, -28, -20, 7, -117, 62, 1,
+   58, -68, -6, 22, -5, 9, -16, -23,
+   55, -43, 25, -31, -85, 39, -5, 65,
+   1, 16, 11, 2, -27, 31, 65, 88,
+   -15, 16, -127, 58, 45, -45, -20, 45,
+   -22, -61, 62, -62, -74, -107, -62, 96,
+   37, 57, 23, -83, 3, 11, -69, 31,
+   -13, -67, 14, -93, 35, 61, -62, -31,
+   -61, 9, 25, -53, 127, 117, -4, 67,
+   59, -65, -38, -11, 46, -75, -20, -48,
+   -9, 55, 18, -39, 30, -55, 114, -45,
+   47, 15, -32, -27, -84, 12, -42, 85,
+   0, 4, -56, -48, -43, -24, 24, 26,
+   -85, -10, -90, 28, -9, 77, -111, -51,
+   -79, -41, 26, 16, 46, -65, -69, -106,
+   121, 68, 19, 16, -62, -25, -62, 115,
+   116, 20, -94, 61, 45, 78, 53, 55,
+   28, -42, 20, 7, -109, -34, 55, -124,
+   -39, 125, 40, 25, -28, 82, -60, -101,
+   -13, 25, -71, -34, 27, 71, 16, -7,
+   -33, -37, -1, 12, -1, 9, -52, -12,
+   25, 25, -34, -41, -37, 32, -18, -31,
+   -124, -85, -101, 0, -37, -122, 49, -21,
+   85, -68, 5, 36, -20, -13, -12, 43,
+   -26, -57, 30, -12, -46, -90, -83, -120,
+   -3, -26, -59, 16, 47, -83, 32, -44,
+   -14, 35, -94, 69, -61, 108, -20, -17,
+   54, 36, -49, 53, -50, 48, -4, 9,
+   38, -70, 56, -23, 80, -48, 56, 37,
+   -55, 20, 41, -9, -97, -55, 81, 18,
+   -42, -6, -110, 97, -86, -91, 21, 9,
+   -14, -10, -14, 92, -39, 45, -37, 62,
+   -43, 34, 114, -14, 24, -25, 126, -92,
+   -8, 6, 0, -59, 34, 26, 18, -3,
+   -53, 24, -36, -125, -75, -21, -36, -37,
+   75, -124, -50, -48, -117, -29, 38, -10,
+   117, -84, 82, -126, -4, -123, 9, 27,
+   -91, -81, -21, -126, 50, -29, 47, 51,
+   44, 51, -17, 125, -39, -56, 49, 44,
+   127, -14, 101, -46, -3, -21, -52, -2,
+   4, -35, 65, 25, 33, -47, 89, -36,
+   34, 72, 70, 43, -72, -38, 90, 54,
+   121, 13, 63, -18, 45, -41, 95, 23,
+   -4, 82, 14, 37, -10, 86, 47, 46,
+   -13, 15, -35, -123, -58, -7, 102, -79,
+   40, 13, -6, -42, 75, -127, -109, 20,
+   61, 20, -74, -113, -28, 96, -97, -67,
+   -41, -28, 118, 15, -10, 41, 26, 17,
+   -84, 34, 125, 7, 61, -126, -104, -124,
+   125, -109, -1, 50, -44, 40, 62, -118,
+   86, -50, -45, -58, 9, -126, -94, 26,
+   -45, -28, -77, 11, -54, -38, 70, -74,
+   -49, 39, -127, -21, -98, 39, 113, -109,
+   -123, -69, 47, -73, -111, -59, 1, 3,
+   -43, 25, 115, 102, 5, -83, -72, 122,
+   84, -126, -42, -51, -13, 17, 19, -106,
+   -56, 38, -40, -75, -20, 56, -7, 32,
+   58, 57, 39, -118, -23, -123, -82, 66,
+   -40, -115, -84, 29, 120, 28, 6, 12,
+   -66, 15, 58, -77, -26, -71, 80, 120,
+   38, -13, 92, -113, 23, 61, -122, -39,
+   -5, -114, -30, -11, 0, 43, 19, -122,
+   111, 73, 0, -51, 49, -36, -25, 101,
+   -41, -45, -33, -91, -52, 52, 65, 37,
+   -78, 93, 78, -73, 9, -9, 9, -79,
+   -35, 25, 16, -29, -36, 9, -16, -40,
+   33, 118, 7, 36, -19, 43, -46, -123,
+   -49, 18, -95, 101, 29, -35, -17, -7,
+   60, 20, -75, -25, -35, -17, -117, -106,
+   -30, -98, -40, 68, 35, -15, 14, -101,
+   -36, -83, 2, 20, 53, 126, 8, 74,
+   63, -57, -20, -13, 33, -9, -90, -75,
+   -2, -105, 86, 37, -48, 14, -40, -20,
+   5, -127, -12, -30, -53, -14, 39, 93,
+   -24, 0, -20, 66, 42, 7, -39, 68,
+   80, 25, 81, 4, 28, -22, -41, 56,
+   51, -39, 2, 28, 45, -3, 62, 92,
+   19, 73, 43, 45, 61, -53, 102, -35,
+   -34, 47, -85, -29, -12, 46, -31, -89,
+   47, -25, 120, -8, 30, 63, -27, 56,
+   -67, -10, 71, 30, -21, 88, 86, -72,
+   23, 16, -46, 126, 116, 45, -53, 15,
+   90, 20, 10, -47, -35, 61, 28, -68,
+   121, 108, -24, -8, -97, -13, -124, -27,
+   -21, -104, -22, -61, -118, -124, -41, -3,
+   -86, -31, -15, 71, -1, -42, -2, 45,
+   40, -33, -115, -38, -33, -36, -4, 34,
+   74, 98, -8, 107, -49, 11, 121, -29,
+   -49, -15, -37, 43, -80, -31, 19, 15,
+   18, -71, 78, -108, -87, 34, -4, -30,
+   -98, 124, -115, -18, -116, 35, 10, -125
+};
+
+static const rnn_weight noise_gru_bias[144] = {
+   51, 32, 88, 60, -64, 92, 5, -36,
+   -49, 95, 102, -20, -1, 14, 8, 21,
+   -36, -68, 62, 46, 10, -60, -103, -16,
+   -30, -42, -43, 35, -4, 23, 97, 46,
+   -29, -16, 71, 52, -20, -23, 91, 16,
+   69, -13, -23, 73, -17, 13, 30, 23,
+   1, -27, 53, -24, -71, 45, 42, -49,
+   28, -16, -20, 61, 40, -104, 54, -5,
+   31, 10, -51, -37, -6, -85, 9, 51,
+   16, 2, -26, 56, -39, -5, -27, -13,
+   -49, 30, 4, -64, -41, 45, -23, 14,
+   -19, -10, -55, -61, -35, 46, -31, -12,
+   -93, -28, 11, -6, -46, -12, 1, 15,
+   -37, -107, -50, 3, 54, -26, -86, 14,
+   66, -54, -38, -70, -1, 69, 46, -12,
+   -128, -55, 0, 17, 48, -64, -24, 9,
+   -67, -107, -101, -43, -4, 80, -52, -90,
+   -23, -64, 31, 86, -50, 2, -38, 7
+};
+
+static const GRULayer noise_gru = {
+   noise_gru_bias,
+   noise_gru_weights,
+   noise_gru_recurrent_weights,
+   90, 48, ACTIVATION_RELU
+};
+
+static const rnn_weight denoise_gru_weights[32832] = {
+   -53, 26, -20, 28, -57, -30, -79, 58,
+   -68, 103, 70, 4, 92, 14, -71, -3,
+   26, 54, -9, -86, -8, 49, -60, 121,
+   -98, -4, 103, -38, -89, 28, 85, 30,
+   33, -45, 42, 53, -37, -116, 72, -44,
+   24, 1, 17, -26, -7, 9, 5, -71,
+   -97, -86, -118, -59, -27, -51, 26, 14,
+   -89, -63, 76, -16, -5, 11, 86, 121,
+   67, 5, -20, -44, -43, -7, 18, 25,
+   -41, 14, 11, 24, -5, -58, 15, 10,
+   89, 41, -100, 42, 41, 89, -89, 30,
+   -16, -35, -29, -119, -45, -1, -104, 24,
+   9, 46, 21, 122, -5, -29, -64, 19,
+   72, -60, 79, -52, -15, -37, 15, 38,
+   -13, -9, 28, 56, -12, 121, 23, -104,
+   -81, -7, -94, 17, 124, 49, 108, -41,
+   118, -33, -106, 42, -27, 50, 57, -24,
+   26, -107, 15, -103, -23, -13, -7, 23,
+   -40, -113, 14, -36, -59, 25, 44, 54,
+   37, 40, -10, 59, 29, -16, -49, 18,
+   4, -27, 15, 15, 37, 29, 50, -61,
+   28, -16, -96, 48, -102, -97, 12, -31,
+   43, 54, 9, -58, -42, 18, 10, 115,
+   -16, -29, -14, -66, -38, 69, -65, 50,
+   7, 6, 11, 8, -53, -1, 25, 32,
+   77, -5, -42, 58, -43, -63, -86, -36,
+   18, 21, -49, 38, 72, 22, -25, 22,
+   -16, -95, 77, 16, 55, -8, 31, -39,
+   -117, 3, -38, -24, 27, 24, 25, -29,
+   21, -44, -13, -61, 6, 5, 19, -20,
+   -11, 89, 40, -113, -86, 65, -84, -21,
+   20, 10, 15, 28, -56, -14, -17, 50,
+   90, -15, 29, -27, -54, -40, -32, -58,
+   -59, 4, -17, 58, 3, -85, -9, 64,
+   -38, -5, 104, -21, -30, -4, 79, -44,
+   -55, 8, 44, 10, -58, 31, 7, 25,
+   -49, -2, -30, -29, -118, 49, 68, 17,
+   -34, 0, 46, -109, 28, -14, -47, 88,
+   13, -55, 24, 62, 44, -16, -54, -67,
+   40, 69, 3, -46, 1, -43, 127, -30,
+   -78, 25, 106, 16, -30, 104, -12, 20,
+   -58, 35, -71, -79, 18, 7, -12, -28,
+   -49, 17, 98, -64, 25, 84, 32, 33,
+   -36, 13, -31, 29, -9, -97, -78, 4,
+   16, 26, 86, 28, -29, 5, 23, -5,
+   -112, 83, -27, 9, -47, 43, 12, -7,
+   -11, 27, 92, -9, -14, -9, 69, 68,
+   32, -25, 20, -70, 40, -20, -32, 36,
+   -94, 19, 5, 101, 11, -47, 44, 65,
+   -40, -56, -21, -43, 72, 7, 36, 14,
+   1, -27, -18, -10, 18, 14, 58, -4,
+   12, 3, -60, -6, 68, -9, -42, 10,
+   40, -17, -17, 13, -16, 86, -62, -20,
+   -22, 24, 75, 61, -5, -32, -75, 0,
+   -41, -65, -19, -37, 21, -51, -54, -79,
+   3, 34, 10, 75, 91, -59, 25, 21,
+   -5, 26, -71, 9, 27, 28, 49, -17,
+   -12, -44, -28, -51, -8, -18, -4, -12,
+   -45, -50, 32, 26, 65, -54, 29, 16,
+   -80, 16, 38, -94, -27, 33, 3, 51,
+   17, 26, -10, -35, 18, 57, -6, 7,
+   -9, -35, 22, 10, -9, 5, -18, 7,
+   -3, 15, -82, -12, -18, 51, 6, 21,
+   -29, 58, 14, -16, 6, 29, -35, 59,
+   10, 32, 54, -11, 25, -27, -13, 33,
+   -19, 11, -83, 61, 37, 42, 20, 21,
+   13, 57, 40, -1, 8, 6, -8, 22,
+   57, -18, -1, -7, 29, -40, -17, 50,
+   8, -4, -4, 32, 26, 35, -60, -35,
+   -36, -17, -66, -63, 2, -124, 8, 26,
+   17, 31, -84, -12, 15, 49, 6, 39,
+   33, 28, 20, -48, 42, 8, -5, -6,
+   26, -33, 12, 42, 91, 25, 5, -91,
+   -27, 23, 6, -63, -119, -99, -38, -32,
+   -97, -31, 15, -28, -18, -59, -24, -7,
+   -2, -7, -119, -34, -121, -121, 26, 74,
+   -85, -7, -22, -26, -43, 2, -32, 34,
+   51, -82, -92, 14, 80, 19, -2, -39,
+   -81, -22, 48, -39, -21, -46, -49, -19,
+   -68, -111, 80, -45, -49, -86, 23, -2,
+   -55, -9, 2, 1, -55, -32, -32, 18,
+   -104, 88, 1, 25, -48, -100, 9, -89,
+   9, -8, 70, 43, -122, 90, 45, -60,
+   -48, -22, -47, -100, 48, 22, 6, 26,
+   -16, 18, -37, 5, -102, -6, 3, -55,
+   -87, -117, -33, -106, -63, -21, 10, 74,
+   16, -19, -14, -60, 15, -38, 90, -58,
+   -14, -2, -58, -45, 50, 30, -72, -26,
+   94, -108, -79, -4, 53, 63, -80, 45,
+   20, 35, 73, -9, -5, -83, 46, -6,
+   -68, 0, 0, -127, -17, -69, 25, -91,
+   -75, 3, -62, -31, -47, 16, 35, -39,
+   20, -22, -63, -17, -3, -72, 48, 15,
+   74, -33, -86, -63, -67, -44, -15, -32,
+   -42, -34, 37, 9, 18, -41, 19, -8,
+   27, 41, -81, -120, -113, 7, 83, -16,
+   17, -17, 22, -28, -73, -54, 1, 11,
+   3, 33, 33, 16, 6, -20, -64, 11,
+   2, -14, -69, -36, -42, -13, -115, -16,
+   -27, 9, 26, 7, -58, 6, -55, 52,
+   23, -20, 74, -61, -13, -31, -63, 68,
+   -7, -20, 64, 0, 17, -10, 24, 15,
+   47, 16, -23, -1, 9, -4, -69, 14,
+   -6, -7, 3, 9, -20, -29, -41, 64,
+   23, -21, -1, 41, 48, -46, 11, -22,
+   -2, -7, -54, -86, -44, -44, 8, 31,
+   -47, -25, 33, 95, -35, -125, -8, -3,
+   52, 19, 9, -27, 62, 32, -11, -7,
+   -60, -13, 110, -28, 118, -11, 45, 5,
+   -2, 22, 22, -61, 6, -72, -42, -12,
+   0, -17, 13, -91, -29, -50, -54, -126,
+   -60, 119, 25, 24, 51, -32, -15, 77,
+   14, 34, -33, -53, -53, 56, -72, -27,
+   57, -11, -61, 32, 3, -18, -54, 19,
+   70, 34, 17, -68, -65, -2, 48, 18,
+   10, -72, 88, -15, -63, -38, 2, -20,
+   -4, 42, -88, 96, 60, 79, 6, 77,
+   127, 9, 22, 21, -26, -55, -33, -69,
+   39, -62, 33, 5, -29, -40, 29, -51,
+   7, 18, 37, -14, 88, -25, 52, -6,
+   17, -104, -10, -68, -42, -116, 83, 81,
+   -74, -9, -127, -55, -79, 26, -59, 37,
+   -27, 20, 36, -46, -67, 51, 10, -19,
+   101, -28, 53, -62, 10, -6, -15, -13,
+   5, 9, -61, -123, -33, 30, -39, -48,
+   11, -126, 59, 21, -3, -121, 27, 46,
+   13, -59, -3, -122, 37, -120, 9, -43,
+   -33, 24, -33, -42, 9, -34, 68, 16,
+   6, -1, -49, -105, -9, -13, 41, -46,
+   78, 7, -55, -38, 82, -26, 9, 24,
+   43, -18, -91, -56, -34, 30, 28, 16,
+   4, -2, -120, -42, -125, -16, 45, -29,
+   42, -25, -1, -43, -12, 4, 39, 16,
+   -17, -12, 10, -37, -5, 8, 16, -12,
+   -14, -18, 19, 0, -30, -24, -101, 2,
+   -30, -6, -6, 3, -40, 0, 13, 52,
+   -31, 27, -56, 63, 35, 32, -64, 29,
+   34, -41, 47, -24, 13, 52, -26, 29,
+   -2, -30, 25, -44, 36, 93, -54, 3,
+   -3, -17, 15, 5, 72, -61, 48, -5,
+   63, -34, -26, -48, 2, -28, 69, -10,
+   42, 50, -89, -123, 12, -8, -10, 50,
+   -8, -30, -50, -40, 13, -26, -41, -8,
+   -23, -9, 61, -117, 29, 50, -20, 20,
+   31, 45, -82, 59, 12, -96, 8, 8,
+   -49, 28, -33, 14, -31, 9, -44, -60,
+   49, 98, -4, -19, 16, 3, 75, 31,
+   -55, -75, 114, -12, -113, 3, -116, 80,
+   -12, 19, 9, 74, -28, -109, 9, 21,
+   27, -15, 12, -37, 23, 81, 103, -19,
+   -40, -113, -42, -121, -104, 36, -29, -70,
+   -38, -75, 73, 16, 0, 30, -10, -82,
+   -35, 82, 112, -19, 43, 41, -65, 29,
+   -65, 7, -82, -14, -36, -32, -19, 76,
+   9, 71, -61, 79, 71, 8, -82, -31,
+   35, -33, 41, -46, 17, 23, 28, 33,
+   86, -21, 66, 65, 68, -55, 37, -50,
+   -92, -17, -8, -39, -90, -47, 81, -7,
+   57, -71, -2, 0, -18, -17, -18, -117,
+   -47, 60, -3, 19, -115, -17, -37, -64,
+   -7, -37, -36, -100, 2, 122, -68, 7,
+   -29, -46, -4, -67, 63, 44, -9, 40,
+   -94, -123, -6, -126, 2, -84, 31, -46,
+   -23, 51, -37, 31, -27, -64, -60, -16,
+   -125, -38, 29, -80, 5, 54, 10, 96,
+   46, -1, -34, 6, -37, -69, 17, -32,
+   31, 49, -31, -42, -120, -54, -6, -7,
+   43, -50, -15, 66, -124, 4, 21, 10,
+   -8, 31, 11, -35, -8, 81, 26, 9,
+   -14, -44, -87, -66, 9, -82, -45, -39,
+   -3, -17, -21, 61, 17, -4, -4, 15,
+   40, -23, 1, -44, -30, -24, -51, -56,
+   -21, 19, -45, -24, -22, 37, -50, -3,
+   -6, -17, -19, -54, -65, -51, -17, 15,
+   40, 19, -26, -61, -26, 0, 8, -17,
+   -26, 8, -5, 3, 22, -16, 7, -54,
+   -25, -15, 18, 47, -31, 6, -34, -22,
+   -25, -16, 31, -8, 49, -38, -33, 30,
+   -39, 21, 4, -26, -36, -48, -28, 24,
+   0, 32, 38, -21, 97, -10, 45, 10,
+   -31, -32, -39, -57, -52, 6, 11, 5,
+   7, -13, 25, 0, 54, 14, -32, -4,
+   59, 17, -30, -10, 23, 21, 29, 8,
+   -48, 39, 56, 18, -18, 10, 26, -16,
+   90, 8, 19, -55, -36, 49, -28, 39,
+   -28, -127, 123, 11, 8, 83, 4, 26,
+   -67, 21, 31, -43, -33, 25, -32, 92,
+   44, 9, 19, 108, 39, 53, -15, 94,
+   13, 28, 36, 38, 28, -6, -13, 14,
+   -99, -17, -17, 2, -15, -3, 10, 19,
+   56, -15, 124, 21, 39, -23, 3, 61,
+   59, -29, 48, -2, -1, 51, -11, 41,
+   -42, 76, -108, -50, -15, -43, 37, -38,
+   61, -47, -42, -62, 3, -6, -66, 18,
+   -48, -25, 19, 66, 1, 78, -26, -127,
+   26, 0, 10, 21, -25, -12, 3, 11,
+   126, -126, 1, 3, 17, 123, -9, -29,
+   96, 125, -2, 32, 21, 24, 52, 8,
+   42, -53, 42, -12, -18, 23, -11, -125,
+   43, 47, 40, -68, 3, -5, -14, -43,
+   -49, 23, -34, 35, 35, -33, 58, -126,
+   26, 42, 34, 8, -39, 20, 72, -2,
+   -61, -26, 32, 1, 31, 36, -107, 19,
+   -6, -128, -41, -65, 15, 21, 36, 6,
+   74, 27, 29, 6, -71, 46, -30, 37,
+   33, 43, 105, 31, -26, -59, -19, 20,
+   37, 30, -71, -9, 92, 1, -21, -11,
+   50, 81, 22, 62, 61, 23, -64, 77,
+   -22, -31, -2, 1, 17, 9, -7, 31,
+   20, 17, -12, 36, 42, 0, 71, 7,
+   -52, -101, 1, 2, 7, 45, 38, -103,
+   -24, 32, 4, 61, 60, 36, -33, 40,
+   60, 79, 15, -85, 74, -71, 26, -11,
+   46, 8, 40, 53, 26, 62, 19, -5,
+   39, 68, -57, -59, 67, 18, -20, -1,
+   -45, 9, 41, -33, -5, 46, 12, 14,
+   3, -10, -12, 42, -18, 118, 65, -32,
+   -2, -12, 112, -36, 18, -43, 38, 6,
+   -41, -22, 20, -31, -5, -25, -31, -54,
+   -35, -10, -5, -8, -44, -124, -122, 37,
+   -113, -24, -29, -18, -7, -69, 63, 3,
+   33, 50, -47, 114, 6, -15, 37, -38,
+   21, 23, -37, -44, -24, 48, 104, 47,
+   -8, -80, 37, -28, 76, 4, 3, 36,
+   19, 16, -45, -59, -17, 16, 5, -18,
+   -36, -26, -125, -24, 12, 29, -34, -6,
+   -76, 31, 50, -33, -38, 12, -14, -63,
+   24, 29, 116, 5, 26, 23, 31, -8,
+   91, 17, 0, 2, 125, -90, 33, 8,
+   -67, -99, -41, -64, -73, -15, -23, 7,
+   7, 10, -97, -127, -14, -77, -127, -40,
+   -45, -23, -12, 14, -3, -7, 12, 0,
+   -2, -80, -38, 22, -100, -60, -121, -11,
+   -1, 119, -2, 40, -20, -125, 63, 10,
+   -32, -110, -15, -103, -7, -7, 87, -32,
+   -7, -35, -33, -33, -54, -1, -12, -43,
+   15, 6, 12, 48, -1, -14, -100, -20,
+   95, 31, 41, -50, 18, -36, -9, 16,
+   -10, -6, -28, -17, -55, -79, -9, -3,
+   46, 29, -31, 44, -84, -23, -37, -40,
+   18, -8, 21, -33, 30, -44, -14, -13,
+   -7, -4, -116, -19, 45, -60, 2, 26,
+   13, -4, -4, -6, -15, 20, -122, 26,
+   -38, -46, 4, -101, -124, -12, 0, 46,
+   5, -20, -10, 35, -49, -46, -42, 19,
+   6, -21, -127, 108, -4, -7, -20, -25,
+   15, 67, -38, 12, 27, -28, 21, -19,
+   -11, 18, 5, -3, -23, 17, 32, -10,
+   -25, 19, -90, 27, -6, 9, -24, 19,
+   -123, -17, 50, -85, -16, -98, -8, -9,
+   27, 1, -24, -37, -27, -28, 5, -26,
+   26, -12, 1, 14, -16, -2, -12, 31,
+   0, -36, -9, 19, 13, -1, 9, 9,
+   -16, -51, -15, -34, -61, -3, -15, -30,
+   -17, 2, -8, 30, -39, -27, 23, 46,
+   17, -9, -29, 56, -91, -91, -58, 23,
+   -15, 19, -6, -30, -10, -31, -34, -14,
+   -41, -30, -78, 12, 16, 51, -7, -38,
+   0, -19, -16, -54, 4, 3, -1, -16,
+   17, 3, 7, -20, -14, -38, 30, -23,
+   27, 12, 84, 60, 19, -16, -55, -15,
+   5, 32, 33, 1, -15, -3, -35, -121,
+   52, 75, 31, 30, 0, -20, -26, 32,
+   38, -14, 33, 81, -17, -4, -16, -84,
+   -37, -29, 7, -14, 5, -30, -52, 27,
+   29, -119, -48, 0, -101, -28, -11, -69,
+   -56, -34, 48, 85, 22, 35, -18, -90,
+   53, 10, 8, 13, -60, 52, -54, 10,
+   99, -95, 32, -60, 0, 124, -19, -1,
+   4, 65, -48, -2, -18, -28, 0, -58,
+   43, -63, 40, -73, 0, 32, -26, -36,
+   -25, 16, -37, 7, -70, -50, 41, 0,
+   -18, 10, 21, -10, 24, 35, -35, -38,
+   48, 16, 26, -33, 94, 3, 27, -22,
+   -17, 69, 19, 21, -57, 78, -5, 8,
+   17, 5, 3, -39, -4, 19, -26, 14,
+   7, -1, 2, -31, -22, -8, -2, -9,
+   -48, -51, 71, 10, 20, 21, -1, 11,
+   26, 13, 1, -20, 60, 18, -38, -9,
+   -30, 30, -20, -30, 45, -39, 21, -6,
+   18, -16, 5, 42, -41, 58, 41, 9,
+   7, 38, 11, 41, 21, 35, -53, -49,
+   -43, -3, -30, 38, 1, -5, -34, -52,
+   -10, 22, -11, -20, 22, 13, -54, 20,
+   -19, 19, -24, -38, 24, -6, 67, 92,
+   -6, 46, 60, -25, 5, -68, 0, -36,
+   6, 14, -33, -40, -33, 38, -26, 1,
+   20, -23, -54, -13, 4, 25, -30, -7,
+   -51, 14, -37, -53, -11, -7, 5, 10,
+   7, 0, -29, 8, -27, 1, -14, -37,
+   60, -7, -41, -29, -31, -13, 22, -13,
+   52, 8, 65, 48, -10, -74, 5, -4,
+   31, 30, -25, -9, -13, 24, -12, -22,
+   64, 13, 18, 28, -22, 46, -8, 39,
+   -48, -14, -17, -6, -40, 16, -5, -29,
+   -2, -46, -47, -25, -19, 52, -1, -22,
+   21, -66, -5, 29, -3, -28, 17, 21,
+   18, 11, 67, -26, 31, -8, -1, 36,
+   46, -9, 14, 39, 18, 9, 23, 38,
+   56, -25, 46, 70, -22, -11, -19, 7,
+   -11, 49, -4, -25, -55, -43, -28, 66,
+   79, 16, 2, 17, -19, 20, -20, -2,
+   -26, 41, 27, 19, -11, 67, 33, -49,
+   69, 16, 0, -5, 3, 47, -2, -48,
+   56, -77, -22, -3, 21, 84, 67, -17,
+   10, 21, 19, 23, -4, 7, -45, 40,
+   -21, -64, 19, -23, -15, 68, -9, 7,
+   -3, 38, 14, 12, -73, -6, -28, 36,
+   15, 20, 15, 28, 40, 42, 100, 47,
+   37, -43, -31, -80, 39, 12, 20, -14,
+   19, 17, -117, 24, -36, 16, 34, 31,
+   -22, -48, 4, 4, 27, 33, 39, 38,
+   -12, 34, 13, 37, -9, 40, -23, -11,
+   75, -6, -14, -30, -61, 20, 20, -38,
+   -16, -6, 34, -14, -2, 4, 11, 9,
+   -1, -17, -24, -112, 59, 20, 25, -17,
+   -10, 9, -18, 11, -7, 16, -3, 17,
+   2, 66, 38, 12, 9, 3, -17, -10,
+   35, 22, -38, -23, 40, 19, -51, -32,
+   18, 17, 2, 21, 10, 16, -16, 0,
+   13, 6, -8, 28, 47, -6, -25, 43,
+   17, -4, -13, -94, -1, 18, 24, -1,
+   14, 15, 3, 1, 41, 36, 1, -16,
+   -10, -50, 27, -50, 18, 16, -6, 6,
+   -14, 38, -49, 73, 9, 57, 31, -41,
+   58, -45, -11, 20, 15, -61, 27, 4,
+   -3, 8, 56, -101, 29, 21, 27, 8,
+   73, 31, -16, -87, -17, -87, 4, -22,
+   -45, 59, 3, 7, 12, 13, 0, 17,
+   23, 94, -50, 3, -29, 55, -124, -10,
+   -32, 41, -38, 25, 2, 18, 34, 31,
+   34, 15, -82, 61, -13, 32, -17, 20,
+   -5, -19, 24, 14, 53, 38, 72, 41,
+   -47, 24, 43, 7, 82, -7, -7, 38,
+   -1, -28, 13, -7, 8, -7, 16, -26,
+   9, 12, 17, -48, -23, 33, 64, -8,
+   0, 71, -37, 67, -85, 20, 19, 25,
+   18, 15, -6, -34, 97, 17, 8, 30,
+   11, -23, -12, 41, 6, 62, 21, 4,
+   18, -31, 71, -70, 9, 2, -32, 21,
+   -11, 44, 47, -11, -34, -5, 3, -5,
+   11, 33, 59, 6, 6, 12, 49, 6,
+   43, 33, 3, -26, 34, 53, -11, -29,
+   -1, -10, 39, 82, 116, -25, -38, 28,
+   -18, 26, -59, -47, 21, 6, -31, 44,
+   -81, -72, 38, -104, 39, 98, 4, -68,
+   -4, -36, -49, -19, -18, -52, 37, 5,
+   -56, -44, 21, -5, 69, 42, 10, -26,
+   -45, 28, -6, -22, -37, 39, 44, 5,
+   -29, 54, -1, 90, -81, 118, -54, 20,
+   28, 7, 77, 0, 34, -2, -25, 60,
+   -64, 8, -49, -31, -46, -26, -18, 12,
+   4, 22, 5, 42, -6, 6, 59, 34,
+   11, 10, -62, 14, 4, -11, -15, -47,
+   -1, -15, -34, 38, 26, -33, -18, -12,
+   2, 6, 9, -15, 43, 13, 35, 25,
+   -53, 9, 10, 47, -27, 85, -25, 12,
+   -12, 5, 12, -125, 12, -89, -4, 55,
+   20, 17, 48, 22, -45, -7, 5, 65,
+   22, 13, 2, 22, 38, 12, 35, -17,
+   32, -40, -49, -10, -100, -97, 13, 17,
+   -29, -24, 32, -77, -4, -81, -83, 49,
+   -99, 41, -34, -58, -10, -69, -2, 33,
+   -120, -81, -36, -31, -78, -27, 83, 15,
+   -49, -51, -19, 83, 29, -63, 25, -15,
+   -84, 21, 30, -88, 45, -11, -44, -73,
+   -86, 22, 11, -126, 66, -41, 16, -5,
+   -59, 37, 62, -29, -5, -128, 116, 102,
+   -44, -30, -43, -73, -121, 86, -39, -14,
+   -127, -7, 63, -24, 12, -47, 4, 24,
+   -58, 31, -33, -34, -98, 90, 119, -56,
+   4, -16, -42, -35, 48, -24, -85, 12,
+   73, -48, 52, -22, -109, -26, -29, 31,
+   105, -5, -39, -60, -81, 24, -114, 46,
+   -51, 56, -5, -96, 58, 97, -26, 0,
+   84, 51, -85, -39, -20, -10, -11, -6,
+   -55, -47, -65, -50, -63, 77, -54, 3,
+   41, -127, 44, -63, 61, 17, -44, 29,
+   -22, 1, 2, -83, 36, -43, -7, -30,
+   -19, -37, 28, 7, -63, -73, 81, 51,
+   -37, -13, 18, -123, -7, 33, 75, 43,
+   85, 40, -56, 10, 91, -45, 7, -60,
+   14, -26, -13, -118, -33, 38, -27, 63,
+   7, 36, -30, -52, -115, 113, -42, 39,
+   3, 3, 26, 53, -109, -103, -23, 1,
+   121, 36, 60, -62, -124, 39, -60, -16,
+   -22, -12, -86, -13, 27, -9, -3, -22,
+   60, 9, -16, 100, 51, -33, -34, -57,
+   -9, -29, -1, -29, -42, 2, -19, -11,
+   -1, -8, 93, -46, -43, -42, 9, 9,
+   15, -23, -11, 14, -20, -73, -59, 17,
+   7, -26, -57, -6, 54, -43, -70, 82,
+   -12, -1, -99, 25, 4, -24, 5, 34,
+   39, 17, -89, 10, 32, -93, 18, -9,
+   -20, 8, 41, -37, -25, -19, 8, 28,
+   -72, 60, 66, -80, -52, -4, -19, 14,
+   -25, -16, -49, 15, -91, 84, 34, 47,
+   -123, 44, 18, 20, -77, 0, 9, -66,
+   20, -28, 13, -99, 24, 48, -1, 32,
+   -42, 33, 47, 20, 85, 71, 57, -27,
+   -53, -73, 60, 119, -81, -51, 4, 38,
+   38, -1, 5, 25, 38, 36, 92, 125,
+   122, 29, -89, -109, 65, 53, -17, 39,
+   121, -19, 71, -3, -97, 29, 55, 102,
+   8, -53, 101, 40, 78, -56, -77, 29,
+   81, 60, 117, -4, -45, -3, 100, 87,
+   -122, -12, -80, 100, -116, -18, 33, 121,
+   112, 21, 35, 5, 47, -51, 10, 46,
+   -95, -42, -28, 78, -39, -32, -114, -3,
+   -53, -104, -94, -1, -50, 27, -38, 20,
+   -30, -59, 111, -63, 21, -18, -31, 11,
+   17, 46, 21, 30, -22, 59, 13, 62,
+   -17, 42, -75, -42, 23, 30, 33, -39,
+   -49, -110, -46, 56, 21, 23, 24, -80,
+   -16, -69, 11, 80, -42, -27, -44, -46,
+   16, -24, -7, 35, 61, 43, 16, 24,
+   9, 43, 28, -88, 53, 26, -80, -128,
+   73, -34, -44, 10, 38, -114, 80, 2,
+   72, -1, 56, -52, 79, 9, -40, -103,
+   -35, 2, -40, 0, 49, -54, 110, 8,
+   3, -8, 17, -38, 38, -52, 45, -4,
+   -22, -82, 28, 79, 18, -56, -45, -13,
+   -57, -7, 14, -16, 8, -10, 44, -58,
+   22, 120, -30, 10, 22, -14, -104, 58,
+   7, 28, -30, 15, 7, -19, 39, 90,
+   51, 39, -128, 46, -34, -55, -37, -65,
+   -2, 29, 79, 63, 39, -38, -63, -30,
+   14, 4, 30, 74, 62, 17, -21, 40,
+   107, -62, 18, -85, 60, 2, -12, -67,
+   36, -65, -67, 23, 25, 14, -22, 12,
+   68, 10, 59, 28, 53, -16, 34, -116,
+   -15, 12, 66, 76, 111, -33, -58, -7,
+   21, -11, -50, 94, -55, -49, -102, 9,
+   -3, 17, -5, 83, 22, 29, 73, -17,
+   22, 1, -37, -90, 17, 14, -22, -39,
+   46, 13, 2, 77, 36, -25, 66, 17,
+   17, 25, 11, 9, 25, 15, 51, -24,
+   2, -53, -9, 24, 26, 14, -18, -2,
+   15, -34, 35, -15, 59, -36, -10, -7,
+   -26, -123, -10, -10, 69, -33, 5, 22,
+   3, 40, 0, 89, 29, 28, -37, -32,
+   23, -14, -25, -11, -22, 18, 36, 62,
+   21, -61, 26, 15, -68, 73, 59, -34,
+   1, 21, 17, 124, -16, 40, 7, -31,
+   -43, 80, -5, -14, -3, 27, -42, -70,
+   -31, -54, -25, 46, 112, -35, 35, -32,
+   -73, -33, 69, -13, 40, -2, 7, -17,
+   60, -3, -32, 41, 25, 108, 7, -41,
+   55, -76, -27, -4, -7, -19, 33, -2,
+   30, 17, -3, 43, 21, 9, 33, -36,
+   15, -29, 46, -36, -15, 81, 27, -14,
+   9, 10, 42, -6, -22, -49, 43, 5,
+   12, 10, 115, -13, 63, 43, 37, 50,
+   5, 7, -60, -7, 15, 0, 7, -48,
+   -8, 51, -61, -11, -12, 110, 83, -17,
+   6, -5, 19, 35, 41, -16, -5, -74,
+   -8, -22, -30, 17, -28, -19, 39, -15,
+   6, -32, -44, -26, -38, -54, -22, -7,
+   -55, 4, -33, -11, -3, 8, 14, -4,
+   -8, 21, 6, -77, 27, 13, -5, -5,
+   43, 55, 19, 3, -18, 10, -17, -6,
+   39, 20, -5, -28, 25, -33, 16, 7,
+   10, -43, -3, -7, 38, -26, 14, 18,
+   26, 27, -17, -28, -16, -24, -13, 6,
+   4, 12, -4, 20, -13, -2, -23, 79,
+   -6, -3, -8, -14, -47, 41, -18, 27,
+   27, -3, -49, -21, -1, -32, 25, 15,
+   -32, -25, -1, -121, -24, -11, 23, -7,
+   -12, 15, -48, 20, -14, 2, -27, -26,
+   24, -16, 65, -17, 26, 72, -33, 9,
+   -63, -63, -8, -63, -68, -22, 40, 6,
+   68, 24, 20, -44, 45, -15, -27, 4,
+   8, -37, 2, -1, 16, 16, -17, -2,
+   16, 93, -19, 89, -2, 65, 27, -6,
+   21, 44, 122, 45, 3, -2, 24, 44,
+   42, -30, 6, -18, 27, -21, -8, 24,
+   -14, 54, 6, 21, 56, 13, 55, 25,
+   32, 41, 62, -100, -37, 14, 15, 50,
+   -23, -22, 119, 10, 18, 61, 39, 45,
+   48, 110, 23, 73, -31, -19, -16, 5,
+   72, 41, -23, -47, 38, -14, 8, 53,
+   -7, 8, 41, -5, 65, 39, -12, 31,
+   34, -10, -15, 4, 21, -42, -39, -23,
+   112, -35, 93, -28, -11, -37, 40, 49,
+   54, -29, -39, 93, -11, 32, 48, -1,
+   -5, 93, 80, 0, 1, -37, 5, -17,
+   20, 16, 11, 13, 19, -10, -41, -29,
+   -19, 10, 44, -48, 62, 4, -37, -13,
+   -6, -28, 28, -42, 22, -14, -37, -18,
+   2, 19, 3, -50, -12, -16, -6, -7,
+   45, -43, -34, -88, -29, -95, 11, 33,
+   -31, -10, -53, -13, -7, -19, 30, -24,
+   10, 17, -5, 6, -22, 36, 45, -1,
+   -46, 10, 19, 8, 5, -65, 4, 27,
+   3, 11, -37, -45, 15, -3, -39, 24,
+   7, 35, 14, -35, -8, -14, -18, 49,
+   7, -37, -4, -14, 10, -2, -9, 4,
+   35, -6, -19, 17, 12, 23, 39, 22,
+   24, -63, -25, 1, 21, 38, 24, 7,
+   13, 6, 10, -9, 29, -19, 8, 45,
+   14, -21, 12, -22, -26, 2, 20, 60,
+   29, 67, -115, 8, -2, -32, 8, 42,
+   -13, -10, 5, 19, 0, -34, 2, 6,
+   42, 5, 33, -63, 13, 27, -19, 23,
+   23, 16, -38, -11, 21, 116, 3, -53,
+   -96, -88, 119, 56, -82, 4, -14, 4,
+   21, -3, -17, 103, 5, 38, 37, -33,
+   73, -1, -12, 7, -53, -19, -12, -41,
+   32, 18, -26, 65, -24, -113, 91, -35,
+   23, 47, -41, 51, -40, -48, 93, 22,
+   -51, 13, 51, -49, -37, -14, 19, 37,
+   22, -48, -55, 15, 72, -12, 30, -20,
+   51, -15, 56, 69, 30, -39, -37, 79,
+   101, 10, 3, 18, 40, 21, 3, -14,
+   -26, 4, 30, -18, -2, -20, -24, -19,
+   53, 43, 34, -26, 44, 13, -24, -56,
+   122, 13, -1, 96, -58, -40, -24, 10,
+   -85, -127, 26, -57, 35, -5, -4, 0,
+   -75, -33, 19, 66, 26, -38, -89, -40,
+   -7, 8, -25, 85, -48, 17, 44, -21,
+   54, -59, 37, -39, 57, 101, 64, 12,
+   39, 35, -7, -91, -22, -21, 125, -20,
+   55, -105, -26, -22, -17, 48, 124, -38,
+   -17, 15, -14, 41, -42, -25, -35, -9,
+   -34, -50, -19, 62, 15, -8, -16, 58,
+   58, 103, -38, 2, -51, -53, 45, -37,
+   32, 30, -33, 51, 82, -51, 1, 4,
+   65, -19, -12, 45, -71, -8, 40, -19,
+   -6, -14, 15, 29, -5, 25, 3, 3,
+   -39, -18, -42, 21, 32, 17, -10, 21,
+   32, 32, -7, -27, 13, -35, 68, 18,
+   -3, -37, 36, -67, -13, 5, -18, -15,
+   34, 6, -54, -25, 65, 55, -9, -1,
+   8, 22, -69, 26, 16, 42, 9, -23,
+   -3, -102, -46, -33, -19, -13, 49, -29,
+   23, -9, 12, 13, 15, 30, -12, 30,
+   -4, -5, -1, 12, 27, -40, -19, -42,
+   29, 18, -2, 29, 29, -73, -6, -31,
+   -1, 23, -10, -31, 40, 14, -4, 0,
+   -80, 5, -66, -9, -7, -13, 81, -8,
+   59, 48, -56, 7, 22, 71, -13, 24,
+   27, -28, 31, -69, 40, 52, 37, 73,
+   33, -38, -76, -31, 26, 23, 29, 13,
+   91, -88, 95, -14, 3, 31, 85, -22,
+   25, 59, -82, 31, -93, -2, 67, -9,
+   -19, -6, -119, 23, -15, 70, -7, 31,
+   -23, 98, 33, -6, -20, 33, -31, -27,
+   47, -107, -76, -51, -8, -108, 4, 1,
+   -50, -35, 62, 9, -8, 122, 28, 12,
+   45, 56, 49, -3, 14, -80, 34, 64,
+   -11, 40, 24, 49, -34, -32, 22, -17,
+   20, -28, 7, 43, -24, 1, -71, -21,
+   12, 45, -8, -34, 5, 6, -57, 93,
+   21, 40, 42, 19, -6, 51, 23, 12,
+   -106, 13, 25, -9, 21, 26, 75, -58,
+   95, 21, 15, -48, -11, 63, 61, 19,
+   37, -80, -1, 82, 46, 78, 47, -65,
+   -7, 9, 34, 50, 2, 25, 25, 17,
+   63, -58, -14, -8, 32, 17, -47, 19,
+   0, 22, -50, 10, -55, 8, -19, 27,
+   -22, -9, -9, 3, -66, 47, 111, 91,
+   -54, -21, -41, 24, -9, -4, 87, 11,
+   -22, 75, -59, 8, -14, 39, 71, -31,
+   -9, -5, -113, -58, 36, -6, 15, 10,
+   -38, 2, -39, 23, 12, 58, 24, -15,
+   -50, 3, 9, 24, -3, 8, 22, 7,
+   -16, 22, 33, -7, -26, -29, 23, 44,
+   3, 47, -60, -97, 33, -17, 36, 57,
+   50, 21, -2, -15, 66, 82, 61, 22,
+   16, 5, 110, 20, 35, 13, 2, -27,
+   18, -82, -40, 46, 23, -6, 4, 40,
+   45, 3, -34, 19, 46, -10, 47, 22,
+   -5, 3, 15, 29, 9, 30, -43, 9,
+   -73, 20, -16, -11, 7, 43, 44, -1,
+   49, -12, -27, -16, 79, 24, 24, 37,
+   -10, 41, 31, -93, 46, 20, 18, 33,
+   19, -103, 36, 41, 54, -10, 50, -5,
+   74, -17, -43, -14, -48, -60, 54, 3,
+   -25, 28, 41, -53, -30, 19, 36, 15,
+   -1, 8, -36, -37, 28, 35, 13, -33,
+   9, 26, 1, 4, -22, -35, -19, 48,
+   -8, 15, -23, -44, 35, -70, -34, -37,
+   -35, -15, -19, 15, 17, -31, -58, 69,
+   11, -29, -55, 21, -39, 1, 17, 0,
+   46, 69, 25, 60, 26, -46, 49, -99,
+   -71, 49, -2, -24, -25, -37, -1, -95,
+   44, -15, -49, 49, -3, 31, 36, 4,
+   67, -16, -17, -45, -21, 5, 7, -5,
+   -10, 37, -28, 71, 1, -53, -10, -1,
+   20, -18, -39, 8, -29, 9, -31, -10,
+   -4, -15, 17, 19, 46, -83, 57, -71,
+   97, 119, 1, -45, 6, 79, 40, 7,
+   44, -126, -19, -40, 23, 74, 54, -3,
+   14, 62, 74, -32, -19, 34, -5, -106,
+   12, -13, 46, -32, 40, 96, -8, -40,
+   -35, 20, -7, 55, -18, -41, -28, 1,
+   -36, -42, -71, -20, 1, 19, -72, -52,
+   -18, 0, 3, -73, 8, 18, 7, -18,
+   54, 21, -12, 13, -14, -62, 4, -38,
+   52, -30, -40, -6, 48, 29, 30, 25,
+   44, -48, -6, -24, 23, -42, -3, -20,
+   -50, -5, -31, -13, -14, 32, -11, 16,
+   46, 10, -81, -30, 3, -22, 24, 0,
+   28, 54, 25, -78, 60, 22, -12, 4,
+   -4, -47, -1, 4, -19, 33, 60, 27,
+   17, 16, -14, -88, 27, -87, 20, -31,
+   -3, -30, -12, 6, 6, 77, 13, -10,
+   7, -7, -5, -62, 22, 6, 39, 26,
+   25, 30, -3, -7, 11, 6, -65, -26,
+   -44, 30, 94, -68, 21, 48, 19, -14,
+   32, 32, -6, 36, -7, 17, -42, -2,
+   -2, 13, 18, 71, 1, 8, -9, 23,
+   -20, 16, 54, -47, 73, 38, 17, -11,
+   -83, 91, -11, 14, 79, 93, -65, 114,
+   -10, 21, 13, 8, -20, -23, -14, 45,
+   48, 23, 1, 2, -15, -18, 39, 56,
+   4, 63, 13, 21, 86, -33, 30, 12,
+   -31, 92, -88, 50, -4, 14, 7, 48,
+   23, 70, 123, -5, 42, 2, 16, -19,
+   127, -16, 95, -26, -72, 53, 37, 5,
+   46, -52, 42, 17, 30, -12, 65, 28,
+   22, -13, 125, -9, -7, -26, 17, -9,
+   -64, -84, 16, 8, 105, -30, 9, -58,
+   53, 126, 29, 39, 19, 47, 40, 14,
+   -22, -3, 19, -53, -105, -22, 11, -15,
+   34, -64, -46, -18, -2, -26, -45, -22,
+   -43, 1, -8, 15, -28, 64, 48, 59,
+   18, -4, -8, 31, -45, 53, -109, -10,
+   -3, -19, -3, 18, -20, -48, 34, 77,
+   -19, 117, -9, -43, 93, -30, -113, 11,
+   -15, -19, -6, 17, 24, -48, 74, -29,
+   67, -15, 45, -38, -9, 30, -18, 22,
+   60, 8, 72, 10, -1, -2, -32, -52,
+   47, -17, -35, -3, -2, -18, 36, 50,
+   18, -1, -19, -115, 8, 7, 28, 45,
+   -41, -25, -70, -6, -59, -68, -13, -76,
+   31, 22, 31, 7, 31, 12, 47, -19,
+   -28, -58, 21, -37, -23, -35, 59, -35,
+   -32, -25, -12, 2, -12, 23, 9, 39,
+   -30, -30, -1, -37, 2, -19, 35, 18,
+   18, 27, -50, 24, -38, -20, 3, -11,
+   13, -3, -30, 67, 8, 63, 7, -10,
+   2, 3, 75, -7, 31, -2, -10, -10,
+   15, -11, 48, -37, -4, 13, 25, -12,
+   72, -45, -37, -7, -49, 15, -36, 17,
+   -6, 1, -52, -3, -23, 29, 49, 18,
+   62, 0, 25, 27, -13, -4, 9, 6,
+   10, 40, 10, 46, 83, 68, 15, 9,
+   67, 71, -122, -15, 73, 44, -125, -44,
+   11, 12, -28, -56, 15, 3, 6, -7,
+   50, 35, -2, 125, -60, 60, 76, 55,
+   103, -42, 50, 19, -10, -104, -11, -1,
+   -1, -35, 3, -34, 27, 23, 24, -45,
+   -2, 19, -17, 56, -53, 52, 18, -53,
+   -121, 0, -10, -65, -47, 22, 81, -58,
+   33, 5, -84, -9, -10, -35, -40, 47,
+   -24, -73, 15, 49, -48, -127, -26, 11,
+   118, -75, -16, -69, -32, -74, -46, 127,
+   111, -6, 26, 25, 53, -10, -32, 33,
+   -3, 30, 54, 84, -14, -32, -73, -76,
+   77, 88, -9, -15, -6, -102, -59, 39,
+   13, 54, -64, 10, 67, 62, 7, -18,
+   -21, 73, 13, 53, -27, 34, 11, -81,
+   122, -21, 65, -27, 1, 104, 22, -96,
+   68, -111, 25, 4, -2, 66, 106, -21,
+   8, 49, 19, 10, 10, 5, -6, 45,
+   32, -116, -15, -68, 38, -1, -3, 13,
+   -22, 18, -20, -10, -119, -20, -4, 64,
+   -23, 56, 17, -28, -12, 16, 4, 45,
+   67, -76, -6, -60, 8, -59, -10, -65,
+   -29, 47, -68, -38, -76, -59, -16, 90,
+   -10, 1, -2, 72, -21, -20, -36, 50,
+   -23, 4, -9, -14, -14, 30, 5, 6,
+   -99, -49, -19, 16, 21, -2, 65, -15,
+   -39, -5, 25, 4, 17, -28, -8, -4,
+   -46, 31, 42, -17, -8, -29, -14, 45,
+   38, -32, -28, 24, 40, 28, -5, -22,
+   -32, 56, -6, 11, 5, 48, 5, -57,
+   -4, 11, -12, 32, 12, 23, 0, -10,
+   2, 10, -1, -17, 56, -25, 34, 12,
+   -37, 12, -4, -38, 9, -93, 36, 28,
+   32, 83, 48, -48, -21, 3, -18, -69,
+   45, 0, 36, 9, -37, 29, -6, -16,
+   36, -10, -29, 16, -39, -12, 23, -14,
+   2, -27, 77, -39, -77, -57, 23, 40,
+   32, 19, -13, 0, -18, 39, 33, 26,
+   -4, 6, 59, -121, -7, 24, 2, -53,
+   61, 4, 6, -4, -6, -38, 5, -12,
+   55, -9, -8, 2, -13, -14, -31, -18,
+   25, -46, 81, 26, 21, -25, -47, 37,
+   25, 8, -36, 19, -7, -42, 8, -19,
+   -13, 17, 45, -3, -12, -7, 5, 11,
+   -31, 49, 10, 34, 2, 64, -17, 75,
+   -61, 24, -1, 5, 22, 21, 24, -46,
+   -35, -15, 16, 14, 46, -12, -15, -60,
+   6, -14, -15, 48, -7, 22, -13, 33,
+   8, -25, -15, 0, 10, 33, 9, -36,
+   71, -115, 3, -29, -35, -73, -46, -68,
+   -17, -38, -24, -11, 31, -12, -3, -52,
+   52, -36, -6, -54, -18, -14, 13, -54,
+   13, -6, -4, 25, -22, 49, 9, 1,
+   18, 15, -4, -16, 10, -15, -32, 15,
+   -2, -67, 55, -63, -4, 48, -44, -14,
+   -43, -6, -4, -5, -32, 1, 11, 23,
+   -20, 36, 40, -28, 22, 22, -40, 2,
+   -4, 11, -14, -7, -25, -17, 9, 41,
+   -16, 10, 5, 10, -9, 9, 57, 25,
+   0, 1, -20, 8, 13, 127, -24, 17,
+   9, -24, -2, -6, -40, -2, -5, 4,
+   -49, -34, -25, -5, -2, 25, -99, 11,
+   -10, -13, -16, 8, -6, 0, -23, 21,
+   -42, 12, -22, -55, 18, -9, -13, -17,
+   -20, -10, 13, 23, 19, 10, 14, 5,
+   3, 17, -7, -4, 9, 126, 6, -29,
+   12, -19, -29, -38, 8, 4, 5, 22,
+   19, -20, 0, 98, -1, 12, -17, 12,
+   0, -15, 38, -25, -11, -17, -46, 48,
+   3, -19, 22, -89, 13, -37, 20, -26,
+   -2, 8, 23, -13, -3, -7, 28, 21,
+   -16, -3, -10, 12, -6, -22, 27, -14,
+   49, -16, 0, 54, 48, 67, -34, -37,
+   -56, 78, -24, 55, -23, -10, 30, -33,
+   92, 16, -61, -1, -30, -24, 38, -66,
+   79, 69, 16, 27, 19, 12, 48, 31,
+   40, -47, -106, -118, -51, 96, 30, -12,
+   -48, -15, 74, 117, 106, 24, 18, -39,
+   1, 38, 86, -28, 2, 17, 126, 22,
+   17, -121, -65, -9, -17, 47, 61, -7,
+   74, -107, 71, 68, 71, 95, 83, 127,
+   122, 53, -8, -2, -88, -49, -95, -23,
+   -36, 92, 58, -33, 41, -26, -61, 43,
+   -104, 63, 41, 41, -36, -55, -40, 36,
+   -26, 35, -19, -27, 5, 64, 27, -40,
+   46, 19, -57, 48, -19, 33, 127, -86,
+   28, 4, 83, 82, -15, 111, -30, 47,
+   -49, 34, 121, 30, -82, 24, 111, 73,
+   44, -13, 39, 79, 90, 77, 17, 13,
+   -92, 126, -32, 50, 123, 32, -66, 55,
+   21, 13, 24, 106, 71, -79, -19, 83,
+   25, 79, 27, 68, 33, 49, -42, -50,
+   126, 20, 8, 15, -25, -72, 10, 126,
+   40, -56, 23, -6, 121, 38, 33, 104,
+   -50, 38, -3, 123, 26, 31, 127, -67,
+   30, -123, -62, 27, -7, 28, -20, -39,
+   -28, 36, -43, 44, 41, 61, 38, -17,
+   -17, 4, 73, 49, -19, 87, 109, 92,
+   49, 60, 66, 38, -9, -32, 16, -13,
+   57, 21, -6, -53, -39, -84, 126, 79,
+   21, -46, -37, 56, 52, 102, 62, 36,
+   26, 83, 74, 77, 7, -124, -57, -22,
+   -6, -115, 18, 46, 122, 14, 7, 0,
+   45, 29, 1, 57, 8, -14, 58, -17,
+   49, 24, -66, 28, -15, -8, 82, -71,
+   13, 10, 91, -46, -24, -36, 18, -9,
+   59, -19, 10, -60, -27, -24, 28, 3,
+   127, 48, -2, -57, 77, -3, -7, -11,
+   -31, 31, -31, 78, 12, -127, -17, 15,
+   22, 51, -61, -59, -38, 87, 10, -23,
+   21, 10, 58, -58, -37, -14, -52, -4,
+   -48, -1, 10, 0, -44, -56, -46, -15,
+   -71, 16, 23, -2, 53, 11, -46, 2,
+   -52, 59, -104, 24, -26, 112, 45, -55,
+   -103, 17, -46, 0, 43, -51, 18, 16,
+   -30, 14, 4, 50, 14, -23, 44, -40,
+   -19, 64, -34, -8, -12, -27, -29, 88,
+   -73, -34, 7, -32, -27, 68, -44, -2,
+   -13, -15, 53, -13, -120, 18, -1, 56,
+   37, 96, 126, 17, 60, 15, -35, 74,
+   -13, -17, -32, 37, -28, -63, 68, 6,
+   10, -29, 89, 57, 20, 14, -118, 67,
+   -10, 71, 14, 73, 7, -37, -75, -27,
+   -69, -50, 48, 5, 34, -51, -4, -66,
+   23, -18, 7, -17, -19, 115, -82, -22,
+   42, 92, -52, 17, 9, 104, 118, -16,
+   58, 5, -24, 33, -41, -90, -97, 4,
+   80, -16, -37, 14, -9, -13, 38, -1,
+   -23, -25, 5, 13, -12, 18, -4, 35,
+   -68, 0, 2, -30, -21, 40, 36, 28,
+   -4, -6, -87, 90, 44, -6, -122, -36,
+   16, -104, 47, 60, -32, -61, 14, -107,
+   -4, 48, -3, -60, -11, 65, 37, 16,
+   -36, -5, 57, 1, -34, 1, -108, 14,
+   17, 54, -4, 33, 24, -25, -47, 3,
+   12, -46, 16, 5, 3, 27, 21, 54,
+   -35, 34, -1, -30, 4, -36, -13, -8,
+   4, -14, -91, 88, 0, -28, 19, 28,
+   7, 47, -45, 53, -2, -22, 15, 32,
+   24, 2, 7, 3, -34, -42, 39, -7,
+   1, 18, 5, 63, -34, -30, 2, 64,
+   -26, 16, -54, -96, -18, -91, -32, 20,
+   -58, 21, 49, 14, 96, -14, -8, 46,
+   26, 20, -61, -13, -8, 23, -9, -16,
+   44, 1, 23, -71, -3, 56, 43, -5,
+   -17, -29, 55, 74, -8, -82, 14, -1,
+   96, 12, -3, 16, -34, -4, 34, 3,
+   10, 79, 109, -32, -85, -120, -114, -69,
+   30, -10, -60, -67, 4, -22, -81, 45,
+   35, -54, 27, 29, 33, 127, -86, 42,
+   -7, -1, 29, -80, -38, 13, -3, -21,
+   12, -8, 48, -11, 4, 56, 4, 22,
+   -26, 41, -122, 28, 59, -49, 44, 125,
+   2, 8, -116, -3, -57, 14, 11, 42,
+   -45, -59, 1, -47, 16, -72, -101, -27,
+   22, -24, -24, 11, -14, 8, -36, 22,
+   45, 3, 33, 60, 66, -58, 5, 2,
+   10, -63, -122, -67, 26, -10, -24, 9,
+   -7, 23, -74, 10, -25, 43, -111, 40,
+   -69, 18, 9, -27, 0, -86, -6, 37,
+   -48, -42, 19, 16, -42, 23, -96, 46,
+   14, 115, 29, -11, -4, -119, 87, 25,
+   -13, 19, -1, 22, 22, -90, 19, 27,
+   23, -52, -10, 26, 31, 11, 20, -51,
+   68, -25, -15, 11, 3, -33, -65, -109,
+   94, -18, -64, 17, 61, -41, -22, 26,
+   -18, 23, -66, 9, -125, 7, 29, 2,
+   -48, -58, -36, -72, -127, -82, 30, -40,
+   28, 46, 14, 72, -9, -43, 9, 56,
+   51, 38, -53, 11, 45, -53, -1, 22,
+   -6, -29, 17, -37, 39, 11, -93, -68,
+   -10, -54, 13, -36, -38, 3, -46, -5,
+   -57, -16, -12, 19, -19, -59, -76, 15,
+   38, -81, -123, 13, 12, 89, 64, 41,
+   -12, -3, 27, -21, -11, 113, -27, -40,
+   26, 4, -3, 13, -35, 14, -33, 8,
+   29, -7, -17, 0, 38, 16, 69, -24,
+   41, 30, 24, -63, 15, -84, 1, 23,
+   52, 12, 37, -21, -35, 13, -31, -24,
+   35, 38, 75, 1, -42, 13, 23, 1,
+   10, -15, 66, -14, 47, -60, 11, 14,
+   47, -11, 77, 68, -47, 123, 47, 26,
+   -12, 18, 35, -65, 10, 21, 24, 12,
+   43, 2, -9, -42, 37, -55, -65, -11,
+   -23, 32, 2, 37, 26, -28, -22, -10,
+   62, -46, 43, -18, 56, 18, 19, -6,
+   -33, 69, -29, -37, 64, 23, -71, -3,
+   -50, -18, 79, 10, 29, 7, 67, 38,
+   -2, 91, -98, -22, -23, 31, 126, -4,
+   -2, 70, 76, -14, 36, -23, 22, 6,
+   -51, -46, -12, -56, -22, 70, -13, -19,
+   30, -36, 17, 13, -20, -17, -5, 11,
+   72, 18, 18, 76, -14, -60, 3, -29,
+   -23, -6, -37, -48, -31, -48, -17, -5,
+   -67, -71, -2, 88, -42, 52, 43, -11,
+   2, -60, 21, 42, -24, -24, 48, -20,
+   31, 12, 27, 25, 30, -123, -90, -19,
+   89, 112, -50, -51, 18, 64, 109, 8,
+   124, -74, 41, 53, 77, -96, -102, -25,
+   92, -70, 49, -48, 26, 16, 29, 27,
+   -35, -35, -8, 12, 37, -56, -38, -85,
+   87, 74, -46, 8, -22, 108, 7, 70,
+   -38, -4, -3, 93, -27, -13, -68, -27,
+   89, -48, 12, 38, -116, -30, 62, -48,
+   46, 30, 15, -47, 50, -21, -3, 88,
+   48, 81, 7, 35, 49, -90, -86, -33,
+   -17, -27, -4, -84, 53, 58, 51, -54,
+   14, 15, 32, -4, 98, 45, -99, 27,
+   -15, 79, -32, -28, -6, -39, 1, 6,
+   3, -34, -128, -66, -13, -16, 125, 41,
+   -50, -35, -31, -19, 12, 81, -52, -56,
+   7, 28, 6, 79, -50, 48, -57, 16,
+   65, -30, 27, -18, 56, -29, 27, 21,
+   -5, 46, -40, 43, 38, 95, -28, 0,
+   8, 53, -23, 71, 96, 11, -33, 6,
+   -16, 35, -4, -45, -53, 11, -49, 7,
+   -44, -21, 97, -23, 103, 37, -2, -11,
+   -9, -11, -57, 36, -8, -44, 125, 3,
+   78, 76, 42, 10, 79, 25, 75, 27,
+   34, -87, 20, -43, 17, -20, -57, 80,
+   40, 7, 111, -66, 4, 33, -19, 92,
+   25, -64, 51, 64, 28, -13, 66, 25,
+   31, 21, 21, -35, 81, 51, 127, -6,
+   3, 60, 52, -25, -17, 17, 42, -3,
+   -30, 55, -22, -41, 127, 28, -54, -119,
+   92, 77, -9, -47, -7, 35, 0, -40,
+   15, -25, 71, 104, 34, 36, 60, 38,
+   -16, -3, 6, 106, 42, 89, -16, 16,
+   -31, -8, 94, -3, 20, -26, 12, -68,
+   42, 45, -58, -59, 30, -64, 45, 122,
+   75, 22, 69, -42, -60, -114, -33, -99,
+   -99, 9, 14, 13, 99, -1, 65, 5,
+   -29, -121, 73, -3, 15, 40, 19, 37,
+   -31, 85, -43, -35, -34, 24, 80, -29,
+   -25, -23, 41, -24, 62, -6, -124, -24,
+   12, 7, -9, 103, 88, 18, -126, 123,
+   -70, -28, 12, -114, 6, -71, -13, -80,
+   31, -69, 56, 13, 109, -75, 3, 24,
+   -85, -58, 18, -91, -27, -48, 2, -67,
+   39, 70, -19, 82, -30, 37, -34, -2,
+   43, 77, 48, 22, 23, 39, -47, 65,
+   -36, -24, 4, -50, 9, 16, -89, 15,
+   11, 11, -107, -71, -54, 10, -52, 17,
+   -29, -19, -50, 10, -27, 80, 35, 35,
+   -67, 5, -5, -35, 40, -48, -24, -7,
+   -44, 1, -16, -52, -118, -20, -1, 24,
+   34, -105, -60, -50, -54, -17, 18, 79,
+   26, -11, -23, -63, -28, 10, 69, -124,
+   -45, 8, 7, 13, -96, -24, 35, 37,
+   24, 24, -73, -3, 44, 85, -3, 7,
+   -81, 12, -3, -30, -1, -18, -35, -36,
+   -67, 28, -39, -61, 1, -36, -27, 24,
+   29, 28, 3, -32, 40, -32, -46, 45,
+   58, -62, -104, 31, 45, -12, 87, 12,
+   7, -63, -17, 29, 102, 8, 57, 22,
+   9, 8, -11, 45, 125, 106, -65, -28,
+   93, 0, 53, -31, 49, -20, 6, 61,
+   39, -19, 43, -52, 6, 3, 91, 29,
+   -69, 11, -23, 32, -9, 31, 29, -47,
+   26, -66, 8, -44, 59, -6, -18, 34,
+   5, -33, -46, 59, -34, -23, -48, -19,
+   105, -30, -14, 31, 121, 88, 1, -1,
+   27, 70, 93, 31, -56, 20, 27, -75,
+   -35, -18, 18, 71, 24, 40, -3, -15,
+   -13, -10, -65, -13, -22, 41, 33, 3,
+   74, 25, 32, 49, 110, -5, 90, -23,
+   22, -64, -35, -15, 22, 77, 17, 1,
+   -51, 50, 107, 70, 26, 66, -78, -106,
+   40, -110, -60, 26, 41, -32, 54, -10,
+   32, -41, 30, -1, -25, 6, 69, 117,
+   6, 1, -8, -16, 8, -12, 49, -72,
+   22, -16, -34, 24, 0, -50, 57, 80,
+   -1, 55, 58, -122, 63, -63, 97, 60,
+   26, -43, -22, -29, 99, -30, 30, 53,
+   49, -49, 8, -21, -44, 127, -9, 38,
+   -58, 26, 38, 46, 48, 56, 58, 56,
+   -36, -25, -12, -45, -82, 7, -13, -48,
+   -116, -52, 7, 11, 37, 40, 95, 1,
+   -7, 14, 44, -33, -46, -19, -8, 52,
+   61, -37, -22, 9, 44, -11, -21, -35,
+   20, -53, 106, -45, -8, 11, 70, 49,
+   34, 91, -60, -25, -21, 14, 40, -65,
+   -12, -7, 6, 9, -9, -75, -40, 41,
+   53, 9, -31, -31, 48, -18, 11, -3,
+   30, 6, 40, -45, -35, 38, 72, 64,
+   -117, -32, 38, -53, 10, 1, -7, -10,
+   29, -36, 22, 6, -8, 33, 20, 44,
+   -89, 74, -66, 5, 60, 21, 26, 29,
+   31, -61, 11, 24, 29, -36, 33, -16,
+   -27, -40, 39, -75, 12, -25, 12, 46,
+   -2, 0, 3, 86, 14, 13, -26, 73,
+   10, 5, -16, 31, 35, -9, 96, -56,
+   22, 15, 51, 18, -60, -25, -34, -5,
+   19, -13, 20, 74, 70, 16, -120, 10,
+   103, -27, -92, -46, 25, 39, -49, 17,
+   40, -56, -25, -68, -81, -40, 126, 51,
+   -9, 4, 30, 5, -68, -33, 53, 60,
+   8, 34, -36, -14, 52, 30, 114, -25,
+   -65, 38, -53, 45, 38, 59, 12, 113,
+   9, -29, -9, -10, -81, 13, -56, 75,
+   19, 46, 21, -14, -49, 31, -100, -24,
+   -34, 38, 100, -60, -30, -9, -46, -104,
+   -21, -3, 12, 31, 65, 97, -14, 7,
+   27, 30, -83, 40, -74, -9, -62, -7,
+   112, -59, -49, -24, 23, 113, 96, 40,
+   -35, -42, 38, 69, 73, 42, 41, 18,
+   -3, 95, 96, 77, -32, -20, -90, 105,
+   40, 82, -1, 108, 58, 73, 118, -15,
+   -4, 26, -4, -16, 68, -50, -59, 10,
+   32, -58, 31, 44, 4, -50, 31, -19,
+   91, 43, 11, 40, -32, 119, 75, 86,
+   113, 0, -108, -14, 121, -104, 17, 126,
+   -38, 2, 52, 56, -20, 51, -16, -35,
+   -18, 26, -26, 13, -65, 25, -105, 67,
+   50, 18, 20, 13, -22, 24, -9, 27,
+   -9, 8, 3, 81, 40, 73, -26, -33,
+   -7, 22, 6, -7, -11, 19, 14, -47,
+   96, -16, 52, 60, 17, -71, 56, -50,
+   12, 7, 6, 31, -59, 1, 23, 17,
+   -49, -17, 21, -9, 30, 31, 35, -1,
+   -18, 7, 29, 15, 65, -68, -9, 89,
+   -8, -30, 44, 74, -4, 46, 28, -69,
+   62, 27, -22, -57, 28, -20, 11, -3,
+   5, -65, 28, 7, -26, -13, 20, 20,
+   32, 71, 115, -47, -11, 36, -65, 5,
+   -50, 52, 16, 22, 77, -9, -8, -16,
+   56, 30, 17, 50, -35, -69, 19, 71,
+   60, -55, 2, 55, -47, 3, -13, -109,
+   28, -3, -5, -38, 0, 34, 110, 38,
+   15, 46, 18, -1, 34, 32, 32, -1,
+   53, -3, 75, 65, -14, 63, 61, 0,
+   4, -78, 18, 21, 5, 47, 19, 26,
+   -65, -59, 84, 45, 2, -126, -38, 24,
+   56, 15, 47, -13, 45, -69, 7, 122,
+   -42, 34, 84, -8, 6, 21, 6, -11,
+   26, -47, 117, 3, 23, 10, 34, 29,
+   -48, 123, -11, 53, -47, 46, -8, 45,
+   4, -16, 14, -28, -30, -16, -67, 59,
+   10, 34, 15, 63, 1, -28, -11, -24,
+   8, 27, 54, -4, -110, 80, 57, 31,
+   7, 104, -35, 60, -10, -12, 41, 66,
+   -122, -18, 9, 52, 41, 42, -47, -28,
+   -32, 68, 8, -56, 13, 28, 115, 42,
+   31, 0, -55, 24, 39, -47, 9, -41,
+   -14, 41, 34, 53, 71, 0, -5, 53,
+   -55, 14, 17, 23, -59, -22, 52, 96,
+   -40, 72, -7, -7, -24, 5, 48, 33,
+   29, 18, -106, 36, 30, -53, -29, 88,
+   -21, 77, -5, -22, 29, 7, 21, 0,
+   27, 19, 63, 8, 37, 32, -45, 16,
+   -25, 45, -16, -2, 61, -13, -31, -8,
+   -19, 65, -14, -69, 29, -25, -83, -53,
+   35, -60, -23, 4, 52, -10, 29, 9,
+   -5, -80, -30, 3, -22, 8, -40, -28,
+   15, 66, 23, 64, 7, 41, 11, -24,
+   -97, -21, -16, 79, 7, -4, -29, -20,
+   -42, -33, -35, -66, -18, -76, -18, 22,
+   -59, -20, -59, 0, -72, -77, 6, -60,
+   28, 18, 19, -51, 96, -34, 8, 22,
+   2, -98, 38, 29, 21, 3, -15, -26,
+   31, 0, -7, -9, 26, -8, -128, 118,
+   -75, 33, -69, -8, 121, 26, 46, 37,
+   101, -19, 7, -82, -39, 34, -65, -14,
+   40, 20, 127, -126, 29, -44, -44, 29,
+   23, 2, 80, -14, 126, -31, -22, -21,
+   -12, 15, -16, 80, -18, 49, 41, -8,
+   -43, -121, -67, 59, 123, -24, -27, -28,
+   36, -103, 18, 36, 0, -64, 10, 69,
+   -11, -74, -99, 102, -64, 35, 6, 16,
+   122, -19, -6, 3, -21, 73, 5, 10,
+   121, 18, 87, -16, -28, 79, 4, 96,
+   39, -1, -21, -40, 110, 24, -42, -56,
+   109, -10, -57, -41, -76, -53, -126, 27,
+   63, -47, 51, -40, 17, 83, 79, 3,
+   31, 13, 13, 26, -86, 37, -96, 77,
+   31, 47, 127, 22, -5, -18, -48, 30,
+   19, 25, 106, 117, -66, -49, 124, -90,
+   -4, -90, 7, -1, -64, 30, -91, 32,
+   1, 103, 40, 96, -26, -47, 21, 8,
+   -23, -12, -29, 25, 36, -28, -115, -27,
+   80, 13, 65, 3, -2, 124, 86, 25,
+   108, -77, -57, 16, 19, 5, 26, -39,
+   126, 27, 14, 30, 5, -6, 47, 16,
+   4, 1, 3, 24, 44, -58, -27, -128,
+   -13, -25, 0, -13, -9, 18, -14, -19,
+   22, 92, -31, 14, -14, -20, 37, -27,
+   -37, -11, 36, 3, -27, 11, 4, 16,
+   -50, -2, -74, -2, 61, -5, 75, -5,
+   6, 31, -40, -6, 127, -63, 31, -7,
+   -4, -41, -50, -125, -33, -42, -3, -99,
+   14, 0, -12, 22, -22, 15, -14, 29,
+   9, 0, -4, 30, 31, -5, -17, -24,
+   13, -56, -6, -36, 37, -6, 53, 29,
+   -2, -3, 5, -34, -121, -68, -38, -33,
+   53, -23, 9, -12, 12, -10, 11, -69,
+   -4, -51, 16, 84, -71, 15, -38, 4,
+   -26, 31, -40, 11, -64, 13, -26, -7,
+   -14, -20, 27, 2, 31, 67, 30, 108,
+   28, 66, -14, -5, -9, -11, 9, -38,
+   35, 83, -49, -13, 81, 32, 40, -22,
+   -20, 91, 1, -24, -26, 53, 69, -66,
+   -48, 50, 12, -39, 11, 55, 13, -22,
+   -17, 67, -28, 21, 103, -45, 65, 11,
+   -18, -20, 28, 0, -5, -12, -15, 31,
+   -54, 14, 82, -99, -38, -46, -22, -81,
+   -20, -62, 65, -47, -21, -32, 14, -50,
+   73, 11, 14, 5, 38, -14, 53, 27,
+   -14, 39, -18, 63, -47, 61, -12, 12,
+   58, 0, 15, -47, -51, -50, 3, -10,
+   52, 20, 28, 23, -19, 4, -58, -3,
+   13, 97, -44, 10, -98, 31, -38, 4,
+   50, 72, 21, 24, 127, 33, 48, 64,
+   48, -100, 7, 46, 1, 105, 11, 59,
+   -16, -46, 86, -11, 23, 12, -42, -50,
+   -81, 21, 108, 91, -125, 19, 55, -21,
+   117, -75, -24, 9, -58, 39, 10, -12,
+   26, 126, -77, 31, -3, 127, -13, 76,
+   64, 40, -10, 10, -29, -56, 40, 7,
+   68, 4, 12, 119, 99, 36, 31, -20,
+   -117, 127, -122, -33, 97, 22, 43, 0,
+   -7, 4, 35, -16, -16, 16, -4, -15,
+   -50, -24, 85, -4, -59, 23, 11, -76,
+   21, 57, -19, 6, -32, -7, -58, 39,
+   -46, 14, -27, 6, -76, -5, 65, 24,
+   -30, -57, -22, 45, 23, -3, -11, -122,
+   -29, -38, -16, -10, 23, 25, -45, 12,
+   7, -69, 25, 19, 24, 2, 7, 9,
+   -40, 37, 26, 45, -92, 16, 22, 53,
+   22, -24, 15, 53, 35, -107, 56, 19,
+   20, 17, 1, -50, -31, 0, 18, 13,
+   -1, 11, 23, 71, -5, 21, 34, -63,
+   50, 77, 24, 29, 9, 77, -20, 66,
+   -3, 15, 24, 81, 83, 25, -5, 42,
+   -121, 126, 34, -84, 44, 16, 112, 38,
+   22, 24, -78, 102, 40, 14, -18, 95,
+   70, -15, 32, 28, 31, 82, 58, -1,
+   26, 30, 59, 16, 5, -41, -15, -45,
+   -29, -15, 71, -9, 17, -11, -6, 31,
+   30, 89, 48, -34, 95, -5, -72, -14,
+   108, -34, 41, -24, -45, -79, 117, 0,
+   25, 14, 68, -24, 23, -15, -23, -61,
+   -3, -21, 24, 55, 7, 46, 19, 17,
+   66, -75, 10, 95, 14, 18, 6, -54,
+   23, 90, 113, 34, 44, 57, 12, 66,
+   -9, 116, 9, 32, -88, -105, -123, -31,
+   -17, -7, -50, 16, 83, -57, 70, -110,
+   -127, -38, 55, 5, -108, -35, 49, 52,
+   -4, -19, 20, -41, -101, 89, -127, -121,
+   -6, 14, 61, -91, -47, 27, 62, 39,
+   -71, -64, -112, -21, 27, 8, -70, 17,
+   14, 5, -37, 10, -2, 61, -77, -23,
+   -40, -39, -67, 18, -124, -33, -40, 68,
+   11, 4, 118, -14, 24, -56, 67, 33,
+   52, -11, -13, -16, 122, -115, -34, 46,
+   -50, 43, 59, 78, 19, 120, 6, 41,
+   -50, 37, -28, 28, 103, -128, 24, -44,
+   -3, -14, 3, -10, 62, -51, 36, 2,
+   73, -93, -59, -26, 30, 17, 90, -21,
+   -31, -17, 23, 22, 39, 20, 17, -9,
+   -96, 57, -6, -60, -50, -18, -56, 19,
+   8, -76, 8, -21, -32, 14, -38, 1,
+   20, -90, 55, -54, 7, 35, 19, -28,
+   -33, -86, 54, 72, 29, -19, -32, -33,
+   97, 16, 11, -15, 23, 18, -56, 29,
+   -17, -9, 46, 30, 46, -122, 106, -21,
+   48, -63, 32, 16, -61, -55, 22, -21,
+   121, 29, -15, 30, -25, 39, -21, 62,
+   -25, -11, -34, 62, 42, 6, 26, -29,
+   80, -57, 7, 29, 17, 71, 2, 37,
+   -45, -111, 27, 47, 112, 7, 77, -22,
+   -29, -73, 39, 106, 37, 45, 65, 43,
+   26, -119, 33, -28, 16, 123, -52, -61,
+   64, 2, 34, -39, -3, 6, 18, 35,
+   4, 24, 2, -3, 53, -17, 19, 14,
+   -4, -30, -14, 72, -6, -50, -94, -23,
+   30, -115, 77, 17, 69, -20, 5, 13,
+   -13, -83, 25, 3, -23, 15, -128, 46,
+   112, 13, 41, -4, 125, 47, 23, -39,
+   -13, 123, 43, -18, 5, 6, 3, -32,
+   114, -11, -69, -23, 43, 13, 5, 106,
+   -8, -8, 22, 8, -22, 61, -27, 51,
+   28, -2, -75, 13, 61, -8, 71, 56,
+   -28, -15, -29, -53, 83, -33, -13, -26,
+   -76, 98, 75, 97, -11, 101, -126, 124,
+   29, -105, -36, 83, 6, 57, 45, 98,
+   -55, 9, 14, -45, 124, 42, 88, 62,
+   87, 43, 18, 8, -6, 28, 99, 26,
+   127, 27, 2, -20, -47, -41, -39, -52,
+   35, -18, -37, 41, -1, -4, 9, 29,
+   48, 46, -14, 42, 34, -38, 1, 87,
+   13, -22, 61, 123, 4, 26, -16, 32,
+   125, 19, 43, 28, -32, 114, 4, -87,
+   -61, -99, 22, -10, -8, -27, -7, 5,
+   -24, 6, 4, 23, 10, 23, -33, -31,
+   82, -48, -25, -74, 68, -9, 35, -16,
+   30, 10, 24, 71, 50, -127, -50, 21,
+   114, -31, -56, 2, 48, 39, 39, -14,
+   33, -9, 34, -13, -35, 49, 59, -27,
+   15, 61, 28, 17, 15, -14, -5, 38,
+   7, -8, 2, -62, -7, 1, -32, 22,
+   -30, 17, 6, -12, 42, 8, 24, 61,
+   -101, 1, 13, 48, -16, 27, -10, -9,
+   -5, -7, 75, 21, -39, -33, 25, -49,
+   -30, 17, 11, 75, 7, -11, 20, 3,
+   -49, 52, -25, 72, 52, -11, 57, -6,
+   21, 99, 32, -81, 37, -59, -65, 18,
+   -24, 119, -37, -69, 57, -20, -1, 78,
+   -32, -15, 6, 33, 108, 81, -120, 38,
+   -47, -82, -4, 62, 29, -11, -53, 9,
+   -23, -10, -78, 63, -12, 38, -37, 21,
+   64, 3, -17, -117, 24, 3, -24, -75,
+   -34, 34, -5, 26, 9, 15, 41, 51,
+   -8, 52, 25, -42, -101, 100, 57, 9,
+   -98, 127, -86, 36, -63, -92, 50, 43,
+   -7, -16, 30, 66, 56, 54, 33, 29,
+   -49, 8, -1, -8, -16, 73, -14, -72,
+   26, -34, 44, 43, -117, 12, -43, -121,
+   -70, -28, -5, -23, -68, 23, 123, -11,
+   70, -14, -64, -82, 99, 79, -113, -45,
+   118, -12, -35, -79, 94, -43, -125, -45,
+   121, -126, -45, 4, -18, -47, 11, 25,
+   -73, -51, 104, -19, 46, -116, 117, -32,
+   -11, 106, -14, -112, 52, -73, -127, 82,
+   14, -22, -2, 35, -65, -108, -88, -4,
+   8, -33, 28, -128, -23, 0, -20, 0,
+   97, -45, -31, -27, 126, -65, -31, 23,
+   -25, -53, -92, 65, -123, 62, 127, 4,
+   83, 40, 35, -14, -11, -32, -71, 6,
+   6, 51, 22, 30, -23, -46, -38, -11,
+   -24, 41, -31, -22, -123, 36, -57, -46,
+   -22, -10, -4, -21, 30, -12, -124, -27,
+   21, 38, -25, 8, -38, 73, 24, 27,
+   -2, 21, -7, -10, 19, 28, -78, 17,
+   -10, -8, 34, -60, 103, 27, -18, -36,
+   48, 24, -51, -34, -52, -11, -61, 102,
+   5, -1, -37, -70, -66, -19, 48, -90,
+   -18, -23, 70, 17, -100, 87, 55, -19,
+   -23, 73, -11, -65, -39, -83, -16, -10,
+   -68, 46, -92, -126, -66, -121, -94, -92,
+   47, 2, -39, -95, -43, 42, 2, -50,
+   8, 38, 81, -84, -1, 36, 0, 16,
+   -54, -61, 83, 51, -31, -50, -19, 0,
+   1, -64, 22, -3, -12, 5, 10, 58,
+   38, 71, 47, -23, -3, -4, -112, 35,
+   -44, -39, -44, -7, -121, 13, 33, -28,
+   41, 26, 60, 86, -87, 37, 11, 25,
+   42, -15, -25, -49, 27, 27, 58, -62,
+   91, 48, 59, 15, -11, 118, -55, 22,
+   -5, -1, -1, 68, -16, 86, -95, -95,
+   46, -9, -40, -18, 20, 5, 48, 44,
+   17, 10, 13, 1, 19, -17, 12, -66,
+   -44, -48, 33, 23, -50, -16, 59, -11,
+   -48, 2, -6, -5, -43, 33, 44, -12,
+   23, -63, 46, -23, -51, 3, 126, -54,
+   -50, 85, 15, -6, -3, 42, -58, 61,
+   -55, 75, 94, 26, -97, 71, -107, -80,
+   13, 61, -37, 30, 5, -36, 63, 9,
+   -68, -18, -32, 39, -58, 21, -21, -30,
+   -46, -127, 42, 34, 6, -84, 31, 39,
+   -10, 36, -58, 38, 10, 10, -4, 29,
+   -128, -28, 65, 29, 10, -78, 116, 19,
+   67, -122, 31, -43, -27, 68, 9, 35,
+   -90, -8, 7, -49, 56, -29, 25, -21,
+   31, 0, 28, -44, -51, 61, 30, -5,
+   57, 83, 2, 1, 54, 74, 27, -3,
+   20, -35, 6, 17, -17, 27, 65, 35,
+   -7, 67, -46, 19, -34, 23, 26, 34,
+   -26, 18, -22, -4, -113, -48, -10, -12,
+   -32, 1, 0, 15, 33, -11, 24, 35,
+   -18, 35, -85, 41, 52, -18, 29, 26,
+   -37, -25, 4, 34, 5, 1, -16, 4,
+   13, -12, -2, -66, 29, -29, 70, -15,
+   -48, 14, -6, -32, 36, -9, 25, -12,
+   25, -127, 27, -26, -54, -55, 13, 78,
+   26, -26, -15, -21, -4, -50, -17, 10,
+   -18, -11, -42, -19, -8, 12, 0, 24,
+   27, 64, 42, 83, 34, -23, 16, 7,
+   -123, 21, -16, -53, -5, 14, -24, 50,
+   -22, -20, 36, -9, 35, 9, 64, -16,
+   -6, -41, 99, 67, 26, 21, -59, 4,
+   -13, 48, 67, 38, 67, 127, 38, 14,
+   -5, 43, 3, 1, -3, 13, 62, 24,
+   -5, -49, 39, 74, 61, -44, -39, 70,
+   112, 6, 62, 52, 49, 17, 0, 80,
+   -21, 11, -19, -34, -2, 4, 38, 31,
+   -9, -3, 109, 51, -14, 121, 66, 15,
+   -12, 34, -33, -2, 0, 10, 27, 63,
+   -6, 37, -55, -36, 22, 15, 30, 68,
+   37, -65, -17, 79, -8, 32, -50, 4,
+   83, 36, -57, 18, -21, -48, 39, 98,
+   35, 27, -10, 24, 36, -13, 41, 22,
+   -15, 44, -98, 62, 32, -1, 116, 62,
+   -35, -78, -13, 34, -37, 123, -31, -26,
+   -2, 10, 52, -77, -35, 78, -67, 63,
+   -5, -60, -13, 71, -10, 22, 118, 42,
+   126, 59, -21, 30, 2, 9, 8, 14,
+   -31, 38, -70, 57, -36, 109, 9, -13,
+   -33, 88, -9, 70, 8, -44, -20, 73,
+   -2, -13, -19, 118, -27, 2, -16, 58,
+   -82, 39, -59, 36, -7, 4, 60, 23,
+   38, -6, 37, -3, 29, -32, 1, -34,
+   44, 45, -10, -29, -10, 9, -39, -58,
+   -25, -26, 37, 44, 71, 60, -1, -18,
+   45, -76, -12, -24, -5, 2, 15, 5,
+   10, -72, -38, 31, -58, -27, 4, -10,
+   6, -4, -110, 11, -34, 31, 36, 2,
+   32, -14, 19, -4, 13, 17, -8, 5,
+   -1, -18, 15, 16, 47, 56, 48, -6,
+   -53, -8, 66, 27, -57, 45, 51, -24,
+   35, -33, -29, 74, 16, 14, 22, 15,
+   -72, -26, 101, -27, -14, -22, 14, -79,
+   -9, 34, 81, -114, 33, 9, -24, -31,
+   31, 13, -79, -61, -40, 82, -115, 45,
+   -107, 57, -37, -66, 12, -25, 4, 7,
+   -24, 4, 27, 6, -64, 6, 89, -84,
+   -121, 75, 40, -36, 13, -57, 48, -59,
+   -128, -62, 7, -15, 26, 75, 16, -59,
+   27, -20, 16, 6, 13, 2, -84, 15,
+   -40, -70, -8, 56, 107, -1, 12, 15,
+   -1, 25, 58, -12, 53, -110, -67, -38,
+   -67, -46, -42, 16, -54, -103, -109, -5,
+   -70, -67, -56, -67, 80, -13, -53, 55,
+   15, 83, -124, -44, 0, -17, -44, -60,
+   -32, 8, -23, -17, -54, 36, -49, -9,
+   -65, 16, -39, 88, 43, 50, -8, 3,
+   -25, -57, 30, 37, 34, -60, 74, 57,
+   -27, -30, -104, -67, 46, -46, -12, -120,
+   52, 36, -117, -45, 35, 45, 62, -66,
+   58, -52, 54, 14, 28, -24, -86, -35,
+   49, 17, 91, 75, 39, 125, -24, -7,
+   -109, 70, -24, -88, 25, -59, 127, 55,
+   -81, -16, 17, 14, -41, 7, 69, -9,
+   15, 25, 46, 87, 13, -42, 20, 12,
+   -38, -14, 109, 16, -66, 107, 91, 30,
+   83, 4, 15, -41, 36, -38, -106, 75,
+   -120, 18, 92, 58, -123, 9, -42, 95,
+   4, -2, 26, 24, 1, -4, 22, -14,
+   -11, 3, -122, -53, -76, -53, -8, 1,
+   -100, -6, 26, 3, 1, -35, 105, 25,
+   11, -43, -105, -27, -35, -54, 56, -16,
+   8, 8, 14, 33, -13, 33, 39, 24,
+   8, 26, 27, 30, 19, -13, 13, 7,
+   67, 67, -20, -40, -50, -17, 22, -18,
+   18, -1, -2, 22, 35, -33, 5, 3,
+   -56, 9, -51, 6, 15, -74, 86, -11,
+   5, -11, -3, 95, 8, -44, 29, 1,
+   -26, -54, 101, -84, 33, 45, -34, 78,
+   61, 36, -20, 44, 10, 74, -84, 5,
+   13, -26, 35, 80, -43, 126, -75, 4,
+   23, -64, 54, -42, -20, 68, 87, 44,
+   -63, -39, 4, -99, -27, 14, 58, -17,
+   91, -10, -39, 82, -13, -47, -44, -22,
+   34, -17, 23, -128, -53, -2, 12, -8,
+   -5, -29, -19, 64, -42, 13, 28, -42,
+   28, 67, -65, 63, -47, -9, 37, -66,
+   -2, 56, 51, -3, 40, -22, 47, -2,
+   -24, -12, 25, -68, 89, -27, 18, 121,
+   59, -27, -46, -11, 6, -61, -15, -46,
+   2, 15, 16, -34, -17, -18, -3, 27,
+   55, 40, 31, 22, -19, 2, -72, -14,
+   89, 94, -24, 24, -96, -119, -65, -13,
+   40, -69, -62, 10, -49, -60, -52, 27,
+   -75, 8, 42, 57, 48, -15, -70, -117,
+   82, 71, 83, 34, 87, 22, 2, 22,
+   2, -114, 33, -46, -32, 99, 10, 4,
+   -44, 92, 67, 23, 42, -127, 33, -35,
+   -11, -25, 54, -15, -31, 26, -115, 18,
+   -6, -112, 3, 39, -63, -66, 0, -51,
+   -39, 26, 1, 37, 7, -25, 20, 5,
+   38, -21, -2, -9, 108, -77, 16, 12,
+   24, -5, 14, 88, 59, 1, 8, -5,
+   -20, 36, -124, -50, -23, 38, -67, 0,
+   -10, 4, 1, -42, 0, -64, 1, -10,
+   7, -32, -80, -17, -13, -113, 107, -54,
+   71, -24, -38, 11, 21, 24, -122, -6,
+   -31, -67, 56, -68, -12, -23, 0, 2,
+   37, -114, -1, -19, -1, -72, -91, -16,
+   32, -4, -22, 118, -17, 41, 45, 32,
+   -14, -27, -45, 6, 18, -62, 21, 33,
+   30, 14, 5, 39, 17, -10, 25, 12,
+   -15, -2, -4, 17, -9, -2, 38, -66,
+   -50, -18, 18, 41, -21, -24, 7, -18,
+   -15, -20, 61, 18, -1, 10, -24, -67,
+   -16, -17, 2, -21, -25, 21, 7, 24,
+   -8, 25, 47, -46, 122, -11, -48, 20,
+   -39, -60, -30, 53, -64, 14, 59, -82,
+   -10, -10, 37, -11, -1, 26, 1, 2,
+   41, -58, 87, -18, 20, 5, -36, 59,
+   -52, -18, 56, 80, 49, -115, -16, -2,
+   26, 20, 22, 28, -6, 24, -69, -6,
+   6, 8, 7, -8, 105, 49, -13, 46,
+   -86, 46, 31, 70, 10, -25, 51, 27,
+   -14, 12, -14, 5, 28, 8, 95, 56,
+   -4, 43, -18, 7, 3, 70, -5, -9,
+   -105, 21, -97, 2, -28, 67, 27, 18,
+   109, -52, 88, 32, 49, -1, 18, 25,
+   -35, 61, -47, 13, -124, -52, 71, 8,
+   -31, -6, -31, -32, 60, 62, -38, -9,
+   -83, -107, 126, -22, -16, -47, -78, -55,
+   30, 16, -24, -27, -45, 74, -58, 50,
+   6, 15, -7, 91, -127, -2, -8, -55,
+   81, 103, 14, 27, -16, 26, 125, -13,
+   98, -80, 68, -4, 35, 126, -59, -103,
+   58, -31, 92, -2, 16, 42, -5, -58,
+   45, -48, 64, -106, -14, -62, -30, 36,
+   10, 9, 50, -5, -6, 33, -39, -10,
+   -16, -71, 83, 38, -10, -70, -77, 42,
+   35, -128, 64, 37, 49, 60, -9, 33,
+   -33, -37, -23, 7, 8, -30, 19, 35,
+   -17, 16, 17, 6, -36, -22, -82, 54,
+   3, 6, 35, 12, 57, 0, 12, -32,
+   58, 108, 7, 49, -8, -38, -79, 30,
+   -1, 7, 15, 32, -20, 16, 68, 16,
+   22, -41, 33, -25, 13, -42, 49, 14,
+   2, 60, 41, 8, -25, -21, 46, -43,
+   -26, -9, -15, -10, 36, -19, 0, 36,
+   -12, 17, -7, 13, 16, -49, 79, 59,
+   -8, 10, 59, -12, 15, -125, -18, -8,
+   7, 6, 10, 39, -37, -64, 29, 0,
+   -50, -6, -24, 15, -32, -28, 27, -12,
+   -44, 84, -30, -10, -51, 5, -59, 77,
+   -26, 3, 3, 9, -39, 39, 100, -33,
+   -80, -7, -36, -83, -30, 19, -21, 59,
+   44, 86, -29, -4, -112, 28, 8, 97,
+   -24, -37, 13, 110, -2, 16, 72, -7,
+   9, 22, 10, 37, 32, -20, 66, 7,
+   -72, -127, -5, -11, 50, 22, 1, 5,
+   74, -74, -118, -36, 123, -8, 14, 29,
+   21, -71, 54, -94, 11, -27, 45, 95,
+   -126, 70, -39, -60, 52, -36, 73, 23,
+   48, 12, 36, 63, 33, 68, 88, -24,
+   -65, -4, -2, -20, -9, 48, -63, -121,
+   -66, 40, -128, -22, -13, 11, -105, 20,
+   -30, -127, 26, -21, -92, -108, 60, -14,
+   56, -117, -113, -123, -46, 57, 111, 124,
+   82, 58, 25, 5, -57, -42, 116, 9,
+   -24, 16, -17, 86, -116, 68, 10, -35,
+   124, 66, 53, -51, -65, -10, -14, -12,
+   26, 5, -51, -15, 12, 25, -3, -33,
+   -54, -20, -116, -10, -25, 117, -1, -24,
+   80, 55, 4, 112, -8, -67, 0, 41,
+   12, -31, 102, 36, -3, -69, 96, 18,
+   126, 116, 27, 16, 114, -28, -82, 113,
+   -57, -119, 123, 63, 126, 33, -1, 29,
+   -17, -28, -13, -4, 85, 39, -5, -53,
+   -53, -63, 5, 29, -76, 27, -23, 3,
+   -70, -31, -46, -48, -15, -93, -13, 50,
+   -1, -6, 0, 26, -34, -22, 3, -112,
+   39, 48, -12, 73, 18, 38, 17, -18,
+   -15, 35, -10, -72, -19, 13, -72, -21,
+   19, -58, -17, 70, 4, -32, -4, 35,
+   86, 11, -6, 14, 38, 4, 99, 29,
+   117, -7, -57, 11, 44, 2, 12, -37,
+   30, 117, 36, 5, 93, -56, 27, -4,
+   -104, -83, -76, -26, 70, -63, 108, 37,
+   57, 62, -23, 26, -9, 11, -12, 6,
+   22, -28, 24, 11, 63, 12, 28, 15,
+   78, -3, 85, -2, -29, 37, -41, -30,
+   -37, 39, -19, -39, 50, -5, 15, 39,
+   12, 3, -34, 17, 35, 5, -13, 10,
+   -45, 12, 109, 5, 71, -28, -11, 22,
+   3, 63, 11, -11, 40, -13, 53, 32,
+   -7, 41, 1, -14, 27, -1, -25, 54,
+   16, -64, 14, 92, 67, 94, -10, 52,
+   56, 84, 0, 28, 59, 39, -68, 6,
+   -31, 73, -87, -40, 1, 23, 31, -35,
+   -21, 34, -50, 82, -13, 62, 24, 84,
+   44, -11, 29, 56, -11, -14, 10, 18,
+   12, -85, -127, -3, -65, 4, 52, -27,
+   11, -89, 1, -64, -78, -24, -44, -12,
+   -20, -51, 13, 97, -77, 50, 63, -74,
+   -47, 31, 1, -8, 4, 23, -74, -126,
+   13, 62, 57, -25, -30, -125, -105, 13,
+   127, 90, 24, 3, 24, 22, -3, 3,
+   122, -59, -50, 18, -48, -20, -26, -37,
+   122, 109, 124, -29, -23, -114, -4, -120,
+   -2, 7, -70, 55, -73, 12, -80, -124,
+   -11, 33, 83, -14, 31, 2, 126, 78,
+   -101, 48, -104, 18, 53, -1, -28, 54,
+   87, -126, 40, 30, -85, -7, 86, -95,
+   86, 23, -70, 17, 10, -49, 2, 94,
+   -20, 123, -35, -22, 28, -31, -35, -13,
+   41, 38, -45, -58, 50, 8, 6, -96,
+   49, 9, -2, -70, 55, 66, -55, 38,
+   -86, 81, -72, -17, -11, -72, 18, 27,
+   17, 49, -84, -44, -7, 16, 82, 27,
+   -89, -18, 23, -28, 24, 36, -8, -92,
+   -24, 34, -20, 127, -23, 19, -6, 3,
+   28, 111, 14, -19, 7, 35, 10, 27,
+   27, 2, 95, 29, 66, -56, -55, 24,
+   -38, 127, -59, 4, 56, -20, -69, 14,
+   -12, 17, -37, -23, -43, 31, -35, -35,
+   -56, 29, -9, -11, 123, 24, 19, -23,
+   -52, -3, 7, -39, 25, 23, 34, 95,
+   -16, 35, -9, 39, -55, -25, -43, 47,
+   108, -3, -3, 61, 56, -9, 54, 54,
+   -8, 51, -20, 62, -92, -39, 40, -8,
+   34, 29, -41, 52, 18, 14, 21, -30,
+   39, 64, 81, -32, 71, 41, 28, -8,
+   -42, -75, 20, -14, 12, -32, 66, 34,
+   -30, -68, 31, -104, -37, 31, 86, 42,
+   14, 12, 3, -20, 15, -7, 29, -26,
+   -45, -32, -12, 9, 48, -25, 41, -70,
+   21, -3, 26, 3, 28, 41, 31, -6,
+   60, 76, 126, 5, -14, -32, -42, -36,
+   -3, -3, 4, 18, 3, -6, 51, 45,
+   -60, 104, -41, -8, 64, 7, 10, 125,
+   61, 6, -3, 43, 5, 9, -126, 83,
+   13, -126, 24, 51, 33, 118, -28, -25,
+   -127, -13, -20, 96, -27, 15, -124, 21,
+   -75, 86, -11, -9, -9, 40, -17, 111,
+   -52, -94, -126, 26, -3, 72, 7, 116,
+   55, 30, -2, -119, 127, 126, 32, 9,
+   -77, -1, -50, 24, 21, -55, -125, 6,
+   99, 13, -12, -3, -53, 26, 106, 113,
+   125, 125, -51, -12, -3, 2, -46, 69,
+   -35, -1, 57, 46, 65, 19, 43, -39,
+   -44, -24, 26, -4, 0, 26, 28, 64,
+   -22, 5, 32, 36, 1, 16, 3, 69,
+   18, -52, -20, -36, -56, -22, -19, 21,
+   75, -70, 56, 15, 23, -4, -50, 85,
+   48, -46, 43, 64, 53, -4, -46, 19,
+   35, -23, 18, 27, 13, -35, -4, 127,
+   -50, 7, 52, -41, 3, 31, 29, -9,
+   -19, -94, -22, -30, 58, 74, -53, -22,
+   -21, 0, -43, -6, -58, -3, 115, 10,
+   93, -71, 46, 10, -38, -19, 49, -60,
+   6, -30, 60, -22, 62, 24, 23, 63,
+   -22, 5, 57, -8, 64, 106, 28, -80,
+   112, -50, 57, -122, -128, 47, -12, -51,
+   -10, 4, 1, -124, -11, -87, 30, -36,
+   -10, -36, -21, -19, -125, -76, 53, 104,
+   -125, 32, 33, -64, 64, 6, -14, 15,
+   94, 12, -69, 2, 8, 0, -51, 28,
+   34, -124, -21, -49, -70, -71, 54, -56,
+   -2, 45, 70, -3, 127, 87, 101, -10,
+   -28, 100, 116, 19, -14, 43, 19, 100,
+   -113, -44, 52, -8, -90, -7, 15, 36,
+   39, 5, -79, -27, 8, -40, 24, 93,
+   -39, -3, 40, 56, 57, -33, 3, 48,
+   81, -41, 7, 111, 44, -62, 51, -126,
+   -51, -111, 40, -35, -122, -49, 70, 75,
+   84, 29, -72, -40, -119, -3, 14, 61,
+   127, 14, -38, -23, -26, -127, -116, -122,
+   -121, -96, -5, 40, 40, -12, -112, -1,
+   118, -102, 16, 26, -18, -34, -25, -95,
+   -40, 19, 47, -128, -18, -115, -23, -48,
+   -44, -99, -41, 30, -111, 4, -7, -16,
+   -52, -45, -16, -88, -115, 50, 59, -41,
+   -105, -121, 108, -42, 77, -109, -116, -51,
+   -60, -25, 2, 59, 55, 78, 104, -70,
+   23, 85, -123, 52, -2, 2, 26, -75,
+   -14, 50, 14, 21, 3, 85, -9, -38,
+   28, -72, 60, -116, 25, 37, -28, 41,
+   69, 19, -80, -53, 12, 32, -87, -5,
+   -48, 9, 80, 81, -79, -74, 37, 116,
+   -45, 41, -28, 19, -40, -103, -117, 51,
+   -44, 41, -80, 79, -61, 69, 10, -41,
+   15, 83, -35, -58, 65, -21, 32, 127,
+   62, 1, -1, -56, -15, 13, 37, -50,
+   11, 8, 25, 11, -90, 16, -12, -37,
+   -116, 77, -22, -62, 3, 45, -12, 34,
+   -43, 27, -50, 41, 31, -66, 36, -13,
+   -9, 3, 104, -11, 42, -25, -34, 17,
+   37, 30, 22, 1, 19, 26, -9, 27,
+   -106, -41, 97, 37, -16, 53, -10, -48,
+   -10, -17, 52, 18, 62, 38, -24, 48,
+   -8, 34, 96, -57, 27, 23, -18, 56,
+   105, -38, 63, -36, 51, 53, 82, 79,
+   -22, 64, -12, 28, 37, 50, 91, 59,
+   5, 12, 39, -19, 73, 38, 63, 26,
+   57, 35, -33, 124, 63, 49, 68, -6,
+   34, 63, 49, -43, 42, -39, 5, -34,
+   68, 65, 61, 52, 24, 36, 46, 63,
+   45, 92, 22, 22, -46, 24, 11, 73,
+   -30, 127, 15, 47, 38, 28, 43, -9,
+   -11, -42, 0, -9, -14, 56, -103, 9,
+   27, 15, -22, 65, -28, -18, 6, -43,
+   23, -25, 31, 54, -23, -41, -29, 27,
+   -9, -10, 29, 25, 116, 46, -84, 58,
+   19, -37, -6, 29, -20, -30, -8, 10,
+   -59, -20, -26, -27, 97, 64, 117, -7,
+   -61, 15, -14, 47, -61, -37, 36, 82,
+   18, 61, 17, 23, 30, -40, -65, -76,
+   0, -72, 59, 43, 49, -7, 20, 22,
+   101, 46, 31, 14, 72, -41, 24, -26,
+   7, -71, 14, 66, -6, -35, -23, 15,
+   32, 27, -34, 2, -12, -26, 44, -64,
+   33, 47, 23, 41, -7, -8, 17, 7,
+   -59, 44, -16, -18, -37, 4, -91, -4,
+   -38, 9, -31, 22, 57, -17, 68, 1,
+   24, -23, 43, -11, -18, 2, -72, 3,
+   11, 29, 48, 39, -34, -22, -36, -4,
+   13, -35, 43, 41, -57, -125, 97, -41,
+   -10, -57, -32, 10, 15, -10, -41, -62,
+   -17, 20, 33, -95, 17, 30, 6, -46,
+   -22, -24, 51, 89, -50, -78, -17, -24,
+   34, -124, 51, -35, 58, -6, 14, -27,
+   -51, -11, 6, -9, -32, -22, -16, -69,
+   -41, 7, -50, -61, 45, -47, 39, 17,
+   -12, -7, -12, -25, -11, -7, -30, -9,
+   57, -125, 20, 14, -66, 73, -17, 18,
+   -57, -20, 28, 58, 124, -31, -18, 14,
+   11, 38, -104, 65, -95, 125, -81, 24,
+   26, -31, 25, 40, 127, 17, -27, 62,
+   -13, -38, 120, 22, -29, 54, 56, -99,
+   16, -33, 32, -39, -5, -1, 31, 17,
+   10, -26, -52, -64, 9, 24, 38, -9,
+   28, 99, 30, 56, -18, 39, -85, -70,
+   55, 16, 118, 20, 4, -97, -18, -3,
+   6, -34, 69, 14, 107, -4, -30, -38,
+   24, 26, -114, 54, -36, -21, 33, -40,
+   -43, 29, -19, 20, -9, 114, 30, 6,
+   -65, -1, 75, 10, 12, -21, 41, -5,
+   113, -39, -12, -105, -43, 78, 74, 18,
+   -53, -28, 9, -25, -2, 23, -9, 84,
+   -26, -5, -21, -44, -49, 46, 63, -1,
+   2, 90, 72, -63, -44, 59, 18, 64,
+   13, 49, -21, -21, 64, 106, 30, -26,
+   73, -18, -83, -24, -77, -6, -47, 27,
+   -34, 8, 47, 4, -76, -117, -28, -22,
+   -32, 70, 94, -20, 35, -22, -12, 10,
+   -28, 72, -66, 103, 100, 46, 20, -42,
+   50, 21, -16, -35, 49, 104, 56, 111,
+   -48, -31, -1, -17, 20, -23, -12, 12,
+   -36, 32, -2, 9, 14, 77, 14, 17,
+   -11, -38, -88, -54, 30, -15, -37, -15,
+   27, 21, 29, -68, 14, -91, -6, 10,
+   13, -82, 11, 19, 124, 38, 80, -5,
+   6, -15, 7, 22, -4, 32, 20, -55,
+   24, 90, 5, -15, 18, -70, 25, -16,
+   52, 2, -15, -39, -17, 14, 47, -4,
+   41, 3, 45, 20, -26, -32, -66, -37,
+   -98, 65, -17, 24, 45, 22, -34, -36,
+   -68, -13, -24, 18, -29, -125, -1, 25,
+   13, -68, -82, 20, -85, -101, 13, 19,
+   4, 37, 28, -23, 47, 14, -50, 43,
+   -46, 52, -12, 82, 31, 77, 101, -28,
+   42, 27, 81, -117, -19, 14, 2, -69,
+   27, 23, -27, 127, 59, 101, 90, -4,
+   40, 26, 3, 64, -23, -53, 31, 42,
+   51, 8, -109, 35, -41, 25, 30, 42,
+   43, -54, -22, 38, -72, 11, 3, 38,
+   31, -69, -17, -1, -85, 15, -24, 17,
+   29, -1, -13, 11, 44, 33, 115, -36,
+   -11, -39, 112, 27, 20, -11, 9, -5,
+   -40, -21, 14, -31, -9, 28, -24, 22,
+   21, 19, -27, 19, 49, 9, 7, -79,
+   79, -81, -6, 48, -75, 72, -72, -62,
+   19, 4, 38, 18, -17, 54, 107, 60,
+   18, 14, -37, -9, 28, 52, 12, -33,
+   6, 50, 127, 42, -67, 46, 37, 43,
+   -18, 20, 74, 17, -10, 56, -30, 66,
+   27, 36, 27, -24, -34, 55, 12, -32,
+   -26, -46, 63, 21, -66, -14, 98, 16,
+   -3, 12, 29, 28, 17, 58, -5, -2,
+   23, 8, -10, 0, -23, 29, 28, -79,
+   -10, -21, 32, -15, -29, 47, 5, 31,
+   -49, -44, 21, 58, 81, -92, 48, -13,
+   119, 52, -6, 19, 11, -26, 13, -57,
+   23, -16, 30, 34, 35, -10, -28, 4,
+   -9, -6, -10, -47, -35, 7, -33, 28,
+   -28, -3, -3, -3, 19, 11, 30, -7,
+   -27, -14, 0, -90, 8, -62, -44, -13,
+   -5, -2, -27, 1, 34, 67, 13, -37,
+   -15, 32, 33, 15, 22, -113, 28, 18,
+   -6, -27, 31, 46, 10, -24, 60, -2,
+   -114, -7, 8, 8, 39, 14, 124, 55,
+   -6, -30, 10, -35, -5, -18, -1, -11,
+   -7, -11, -16, -51, 49, -30, 64, 3,
+   -10, -38, 2, -3, -2, 27, 22, 15,
+   46, 41, 0, 6, 4, 54, 8, -5,
+   2, 7, -10, 108, -43, 11, -30, 15,
+   -47, 51, 26, -21, 71, 22, -33, -54,
+   -29, 120, 11, 106, 1, 10, 55, 53,
+   38, 11, 19, 42, 45, 5, 20, -39,
+   44, 120, -68, 51, 127, 24, 66, -28,
+   60, 8, 10, 32, 17, -8, 35, -6,
+   -3, 57, -32, -8, -51, 8, 24, -63,
+   47, 28, 15, 18, -8, -70, 81, 10,
+   -125, 13, -86, 62, 37, -27, 28, 127,
+   -8, 18, 56, 6, -108, 22, -36, 10,
+   14, -10, -45, 19, 72, -27, -53, -12,
+   42, 6, 7, -2, 127, 1, -41, 13,
+   3, -81, -25, 1, -11, 45, -107, 62,
+   18, 54, 22, 4, 35, 34, -32, -120,
+   -106, 18, 38, 100, 11, 29, -56, 116,
+   -37, -23, 122, -1, -78, 31, 23, -4,
+   -2, 42, -28, -57, 97, -63, 12, 56,
+   -4, -127, -14, -45, 44, -65, 103, -52,
+   -67, 7, -11, 23, -38, -32, -3, -4,
+   -24, -38, 31, -20, 20, 42, -17, 79,
+   34, 29, 60, -71, 71, 49, 101, 35,
+   22, 19, -60, 40, 11, 25, -34, -102,
+   8, 62, -3, 17, -9, -57, 47, -26,
+   -44, -29, -43, 89, 121, 19, 49, 71,
+   6, -61, 15, 100, -124, -20, 0, 37,
+   -21, -56, 21, 59, 26, 15, -40, -34,
+   53, 11, 60, 15, 63, -3, -13, 16,
+   -34, 57, -13, 61, -15, 38, -3, 33,
+   7, 36, -1, 72, -59, 18, -90, -6,
+   78, 67, 14, 20, 34, 37, -12, -47,
+   -34, -123, 19, 53, -61, -4, -38, -37,
+   6, 4, 32, -46, -13, -18, 0, 27,
+   -73, 27, -11, -47, 63, 24, 66, -124,
+   -64, -5, 34, 6, 25, 44, 0, -42,
+   -26, 39, 95, -25, -45, 87, 10, -33,
+   -30, -18, -71, -3, 6, 31, -6, 10,
+   -21, -60, 39, 64, 24, -11, 102, -20,
+   127, -70, -119, -69, 103, -17, 42, 6,
+   -81, 43, 26, -12, -33, -72, 51, 55,
+   17, -57, -3, -12, -24, -22, -60, -18,
+   -57, -22, 22, 32, 101, 40, -47, 47,
+   -1, -38, -15, -56, 58, 57, -36, -7,
+   51, -6, -12, -66, 33, 73, 19, 26,
+   -6, 77, 74, -46, -50, -16, 125, 47,
+   -30, 41, 115, -91, -11, -4, -47, 127,
+   -121, 112, -83, 25, 22, -32, 31, 6,
+   -78, -84, -44, -15, -25, -1, 3, -50,
+   -46, -5, -28, 64, -74, 94, 8, 16,
+   28, 30, 41, -11, -17, -4, 57, -69,
+   -2, -32, -15, 12, 96, -96, -15, 61,
+   -38, -5, -20, -37, 61, -63, -50, -60,
+   34, 44, 53, 37, 47, 18, 22, -24,
+   -19, -54, -8, -7, -60, 56, 2, -41,
+   -22, 70, 33, 83, -46, -71, 35, 124,
+   22, -38, -43, -70, 7, -62, -22, -51,
+   15, -46, -6, -25, -34, -54, 51, -22,
+   -29, -13, 117, -53, 20, -9, 23, 27,
+   -13, 127, 68, 11, 41, -31, 18, -50,
+   -53, 29, -109, -2, -18, 13, -43, -125,
+   23, 15, -6, -25, -19, -95, 4, -106,
+   25, -24, -14, 21, -20, 28, 2, 38,
+   -92, -86, 47, 22, 108, 29, 118, -17,
+   22, 3, 61, 4, -3, 28, -125, 10,
+   81, -6, -19, 22, 22, 75, 16, 20,
+   -26, -14, 46, 89, 99, 29, 43, 20,
+   29, 87, -57, 108, 16, 39, 42, -39,
+   16, 69, -65, -11, 6, 12, -19, -6,
+   -60, 11, -32, -21, -41, -23, -128, 50,
+   -11, 24, -44, 17, 7, -1, -20, -91,
+   33, 47, 10, -6, 17, 57, 42, -30,
+   -41, 12, -50, -4, 22, -16, -31, -21,
+   10, -69, 20, -29, -51, -32, -6, -15,
+   -50, -1, 13, 9, 38, 33, 68, -12,
+   58, 115, 18, -68, 12, -127, -37, -8,
+   39, -4, -70, 15, 31, -3, -17, 58,
+   -56, -19, 25, 3, -22, -92, 63, -4,
+   122, -56, -9, 55, 39, -80, -90, 40,
+   7, -6, 59, 26, 38, 0, -46, -60,
+   43, 34, -127, -71, 32, -17, 29, -80,
+   -33, -11, -16, -7, 19, -5, 52, 25,
+   -16, 13, 108, -13, 53, -28, 11, 106,
+   99, 35, -113, -103, 9, 4, -6, -67,
+   37, -22, 1, -13, -9, -34, -9, -7,
+   -20, -12, 5, 84, 64, -35, -8, 48,
+   31, -20, 22, 61, 95, -55, 17, 32,
+   -4, -57, -120, 5, 30, -31, 85, -27,
+   22, -8, 101, -121, 32, 33, -117, -48,
+   -15, 18, 38, -13, -57, 30, 79, -127,
+   -50, -108, -56, -126, -121, 6, 36, -12,
+   -9, 2, 66, 85, 21, -48, -6, 14,
+   44, 18, 97, -127, -20, -128, -85, 31,
+   45, -54, 25, 22, -105, -127, 43, -10,
+   -37, -28, 32, -126, -13, -14, 73, 90,
+   127, -28, -13, -73, 97, -49, -52, -17,
+   -44, -9, -9, 11, -124, 0, -59, -69,
+   -18, -27, 19, -25, -120, 56, -32, 23,
+   18, 41, -6, -2, -57, -76, -9, -13,
+   70, -86, -92, 6, 39, -109, 28, -14,
+   70, 37, 37, 53, 42, 90, 24, -15,
+   -120, -14, -11, -10, 8, 22, -17, -61,
+   -9, -19, 96, -128, -68, 93, 77, 6,
+   36, 30, -128, 39, 1, -6, 8, 0,
+   4, -83, -124, -86, 6, -103, -58, 43,
+   19, -2, -39, -109, -111, -41, -107, 37,
+   1, 30, -46, -28, -23, 61, 49, -38,
+   31, -35, -96, -126, -38, 54, -24, 28,
+   19, 66, -126, -79, -119, 37, 7, -14,
+   24, -27, -59, -113, 55, -56, -15, 24,
+   -7, 5, 14, -92, -52, -43, 91, -23,
+   2, 93, -16, -93, -66, -34, -11, 46,
+   -48, 3, -75, 47, 8, -17, -40, -87,
+   113, 121, -117, 19, 16, 74, 106, 29,
+   -8, -1, 54, 8, 24, 33, 59, 64,
+   38, 68, -89, 72, -26, 9, -14, 20,
+   -34, -85, 33, 33, 48, 17, 120, -11,
+   16, 19, 80, 37, -18, 11, 8, 8,
+   5, -41, -76, 7, 31, -42, -14, -6,
+   -50, 114, 34, 45, -48, 66, 47, -8,
+   53, 53, -66, 15, -59, 2, 24, -49,
+   -17, 14, -22, -62, 73, 20, 5, -55,
+   57, 83, 91, 59, -49, 22, 64, -44,
+   -4, -60, -114, -88, -62, -23, 34, -29,
+   110, 123, 117, -49, 1, 124, -67, 123,
+   -52, -45, 0, -27, 13, -76, -44, 11,
+   -14, 16, -9, -92, 33, -72, -125, -1,
+   -41, -122, 13, -56, -29, -44, -121, 27,
+   -127, 9, 63, 47, -47, 23, -11, -2,
+   -119, -39, -32, -61, -36, -11, -32, -27,
+   98, 61, -122, -84, -23, 106, 114, 42,
+   11, -29, -9, -74, 124, 15, -11, 29,
+   67, -9, 12, 31, 68, 23, 13, -60,
+   -46, 40, -37, -41, -113, 70, 37, 7,
+   8, 92, 34, 46, -21, 0, 13, 63,
+   -50, -57, 8, -22, 13, 35, -52, -35,
+   -11, 24, -30, -47, -1, 56, -35, -11,
+   -123, -26, 93, 4, -28, -28, -56, 56,
+   -55, 26, 14, -41, -7, -14, -19, 35,
+   16, 21, -5, -19, -10, -26, -70, -5,
+   26, -5, 62, -15, -15, -97, 49, 56,
+   63, -30, 2, -103, 15, 22, -6, -30,
+   18, -55, 46, 16, -16, 41, 78, -18,
+   -53, 21, -11, -73, 27, -4, -19, 27,
+   -21, 37, 12, 50, 5, 0, 13, -26,
+   -60, -39, -61, -24, 75, 36, -26, -28,
+   26, 18, 10, 25, -47, -4, 35, 7,
+   21, -3, -51, 28, 16, -23, -44, 15,
+   -35, 89, -36, -81, 73, -7, 22, -34,
+   6, 24, -17, 72, 90, 92, -35, 43,
+   -14, 20, -26, 104, 78, -22, 39, 29,
+   38, -29, 15, -24, 55, -23, -18, 10,
+   51, -12, 84, 22, -10, 10, 127, -27,
+   127, 17, 6, -6, 54, 0, 117, 49,
+   8, -13, 114, -15, -28, 4, 8, -28,
+   -60, 125, -46, -60, -15, 10, 43, -23,
+   -121, -27, 20, 50, 25, 72, 61, -98,
+   35, -21, 39, -7, 81, 27, 10, -23,
+   41, -123, 97, -76, 65, 10, 125, -120,
+   -86, -73, -4, 73, 109, -126, 50, 94,
+   -47, -74, -8, -83, -50, 1, 16, 46,
+   -34, -62, 24, -25, -13, -58, -117, -108,
+   -28, -8, 63, -10, 56, 25, -65, 41,
+   53, -46, -47, -109, 98, 7, 72, -7,
+   -38, 47, -76, -126, 42, 124, -10, 65,
+   -52, -62, -25, -108, -101, 14, 3, 75,
+   -9, 4, 86, -124, -126, 72, 35, -2,
+   21, 26, -66, 43, 30, -123, -28, 46,
+   3, 29, -49, -96, -79, 40, -43, -98,
+   60, 27, -125, 72, 1, 63, -49, -3,
+   22, -49, 23, 27, -32, -20, -21, 52,
+   -20, -49, -11, 0, 24, -4, 20, -67,
+   12, -23, 6, 17, 1, -10, -27, 5,
+   -15, 3, -35, -5, 12, -14, -33, -20,
+   35, -68, -27, -66, -58, -14, 52, 40,
+   -5, 38, 96, 32, 11, -47, 27, 0,
+   44, -30, -70, -23, -33, -46, -58, 66,
+   -19, -14, 1, -24, 25, 12, -99, 30,
+   28, -14, 36, 19, 27, 10, 51, -47,
+   -118, 11, -44, 16, 30, 14, -16, -12,
+   -52, 1, 4, 4, 9, 27, -26, 47,
+   15, 7, -26, 11, 37, -30, 7, -22,
+   -13, -87, -56, 118, -31, 12, -61, -65,
+   22, 127, -69, -111, 115, -57, 86, 121,
+   66, 108, 61, -64, 52, -25, 33, 45,
+   -101, 123, -19, 20, -5, -34, 61, 62,
+   -14, 63, 55, 18, -31, -89, -60, 68,
+   63, -31, -46, 44, -44, 23, -125, -23,
+   -122, 103, 44, -102, -5, 124, -90, -71,
+   12, -5, 77, 40, -47, 54, 52, 47,
+   9, -53, -77, 33, -30, 23, 49, 39,
+   -126, -34, 2, -33, -123, 30, 48, -69,
+   11, -87, -109, -60, 27, 30, -26, -26,
+   -8, 56, 8, 0, 25, -1, 106, 1,
+   -35, -98, 79, 20, -37, 0, -79, 64,
+   -2, -99, -123, -65, 28, -31, -63, 48,
+   40, 68, 55, -32, -117, -2, -75, -67,
+   3, 111, -36, 7, -53, -63, 125, -73,
+   121, -74, -11, -63, -74, 54, -20, 21,
+   -91, 118, 30, 16, -33, -128, 69, -3,
+   -64, 19, -15, -100, -14, -127, -84, -86,
+   26, -37, -14, 13, -20, -46, 31, 34,
+   43, -4, 70, -128, -60, 19, -19, -75,
+   48, -79, 84, -34, 127, 14, -119, 82,
+   82, -63, 88, -28, -127, 59, -35, -127,
+   48, 11, -116, -126, -3, -110, 24, -78,
+   -4, 46, -25, -76, -29, 53, 10, 47,
+   16, 46, 5, 34, -18, -45, -30, -2,
+   88, 68, -4, -40, -21, 24, -112, -115,
+   -13, 5, -47, 21, -32, 109, -120, -51,
+   -8, -47, 127, 66, 28, 4, -76, -22,
+   -10, -4, -44, 5, -77, -12, 12, 35,
+   115, -92, -39, -123, 8, -106, 17, 124,
+   21, 9, 57, 42, -11, 49, 36, -115,
+   104, 18, -17, -20, -63, 47, 29, 19,
+   22, 82, -73, -128, -66, -102, 18, 20,
+   -74, 58, -22, -115, -121, -121, -66, -74,
+   4, -25, -34, 67, 42, -3, 0, -68,
+   50, 16, 47, 74, 30, 125, -49, -14,
+   105, -32, 97, -30, -67, -20, 10, 15,
+   4, 2, -18, -62, -43, 15, 8, -61,
+   -4, -33, 7, -46, 71, 46, -5, 66,
+   -24, -1, 86, -99, 27, 78, 41, 15,
+   14, 5, 100, 58, -50, -32, -35, -32,
+   89, 32, -93, -7, 69, 18, -43, 36,
+   97, -29, 68, 41, 77, -25, 65, 67,
+   89, 20, 25, 28, -35, -16, -10, 125,
+   101, 126, -53, 39, -112, 120, -23, 8,
+   -10, 9, -38, 43, 4, 127, 43, 51,
+   86, 5, -79, 38, -14, 36, 9, 29,
+   46, -9, 7, 34, -31, -89, 28, 18,
+   50, 84, -67, -12, -12, 23, -91, -95,
+   -28, -82, 44, -40, 10, 1, -10, 0,
+   12, 46, -5, -40, -76, 11, -27, -42,
+   -22, -5, -71, -39, -89, 96, -56, -89,
+   21, 73, 72, 1, 15, -122, 73, 13,
+   -31, -16, -57, -27, -10, -27, -51, -71,
+   -18, -48, 0, -5, -37, -6, 81, -7,
+   19, -25, 13, -28, 24, -82, 90, -73,
+   -66, 38, -11, 17, 19, 65, -30, 80,
+   -23, -68, 65, 16, 18, 66, -17, -58,
+   -52, -71, 14, -1, -2, 39, -2, 55,
+   10, 21, 10, 3, -110, -53, -10, 39,
+   36, 84, -45, 41, 28, -10, 22, 35,
+   8, 23, 32, -40, 37, 34, 39, 15,
+   7, 22, 70, 35, 18, -40, 5, -8,
+   33, 31, -36, 8, -6, -24, 25, -23,
+   6, 12, -79, -16, -21, 126, 54, 7,
+   4, 66, 18, -22, -4, 35, 40, -40,
+   68, 41, 13, 43, -8, -7, -34, 39,
+   21, 24, 6, 32, 16, 5, -38, -126,
+   -36, 26, 61, 61, -1, 78, -35, -19,
+   -44, 30, 12, -40, 12, -3, -13, -12,
+   48, 32, 32, 42, -4, -18, -26, 22,
+   11, -108, 88, 82, -39, 65, 39, 35,
+   -16, -95, 29, 63, 104, -17, -18, 12,
+   33, -81, 1, 103, 16, -39, 31, 6,
+   44, -102, 97, 10, 48, -38, 124, 34,
+   10, 23, -66, -35, -102, 19, 81, 87,
+   34, -27, 44, -14, -44, 1, -25, 27,
+   125, 10, -110, -27, 5, 2, 10, -60,
+   -28, 15, -75, -13, 52, 29, -17, -47,
+   10, -15, 98, 43, 1, -25, 37, -110,
+   76, -20, 24, 20, 24, 45, -50, -35,
+   -10, 80, -17, -62, 47, 17, -31, 16,
+   2, 77, 94, -108, -43, -12, 44, -124,
+   -31, -15, -78, -84, -114, 97, -47, 91,
+   33, 23, -104, -24, 127, 28, 61, -109,
+   -53, 68, -26, -108, -12, -88, 75, -10,
+   87, 99, 28, 32, -125, -48, 121, -70,
+   56, -61, 37, -90, 123, 87, -43, 3,
+   -14, 96, -6, -4, 91, 35, 11, 66,
+   -38, -108, -21, -7, -5, 96, -34, -52,
+   69, 28, 33, 82, 22, 36, 19, 6,
+   10, 47, 86, -122, -11, -13, -66, 41,
+   -24, 22, 89, 66, 24, -24, -11, -25,
+   -28, -67, 113, -110, -128, -109, -69, 102,
+   114, -8, 19, -51, -12, 120, -78, 41,
+   9, 125, -118, -11, -7, 60, 0, -68,
+   28, 124, -14, 50, 24, -37, 56, -21,
+   6, 26, 53, 0, 19, 19, -30, -60,
+   -53, 52, -26, -6, -19, -48, 37, 20,
+   -17, -9, -22, 69, 31, -27, -10, 7,
+   25, -65, -52, 39, -40, -80, 29, -32,
+   -78, -4, 13, -26, 22, -45, 94, -24,
+   1, -12, 17, 73, 116, -34, 69, -39,
+   -7, 7, -57, -45, 38, -70, 62, 7,
+   -12, 55, -35, 66, 48, -21, 48, -5,
+   98, -114, 81, 14, -127, 25, -17, 78,
+   -53, 124, 12, 65, -23, 15, -42, 79,
+   7, 0, 45, -20, 62, -20, 25, 35,
+   -34, -34, -104, 70, 74, 79, -26, -16,
+   -114, 31, 79, -23, -18, 15, 119, -110,
+   -54, -83, -7, -8, 57, -50, 3, 12,
+   48, -6, 23, -111, 9, -54, 19, -4,
+   14, 19, -26, 37, 84, 36, -12, -16,
+   39, -95, -65, -20, -23, -15, -7, -24,
+   -3, 0, 75, -23, 13, 6, 119, 5,
+   65, 9, -90, -112, -22, 30, 54, 26,
+   -58, 39, 116, -37, -22, -54, 44, -1,
+   40, -31, 6, 41, -35, 48, 79, -86,
+   26, -8, -12, -10, -4, 77, 59, 2,
+   58, -84, 14, -85, -7, -11, -22, 5,
+   3, -110, -53, -127, -23, -3, 93, 11,
+   19, 19, 13, -126, 29, 14, -28, 42,
+   -33, -50, 35, 94, 3, -56, -88, -115,
+   -9, -127, -74, -83, 34, 26, -21, -6,
+   -5, -73, -10, -25, 68, -77, 35, -5,
+   -114, 58, -64, 21, 2, -7, -111, 26,
+   1, -80, -35, -116, -124, -40, 87, 58,
+   -30, 18, 121, -125, -25, -20, 64, -3,
+   3, -44, -24, 59, 125, 10, 29, 26,
+   33, -7, -43, -42, 88, 44, 26, -84,
+   1, 5, -65, -50, -31, 100, -27, 37,
+   28, -14, 6, -61, -14, -106, -6, 16,
+   86, -124, -9, -91, -33, -27, -122, -28,
+   -8, -32, -99, -75, -1, 22, -69, -33,
+   -1, -45, -24, 38, -44, 45, -51, -127,
+   -5, -4, 111, -119, 3, -106, -84, -1,
+   30, -6, 16, -11, 18, -28, 18, -11,
+   -20, 48, -65, -29, -63, -104, 16, 60,
+   -18, 6, 6, -63, 6, 28, 16, -28,
+   14, -5, -25, 2, 3, 68, 80, -18,
+   101, -51, -126, 56, 61, -22, 37, 1,
+   106, 4, -14, 18, -12, 13, 77, 13,
+   -47, 36, -31, 10, 12, -15, 5, -7,
+   -7, -17, 7, -46, 5, -21, 81, -19,
+   -31, -103, 63, -27, -32, 3, 120, 65,
+   -21, 35, -12, -34, -26, -1, -33, 26,
+   -5, 35, -41, -13, -27, -78, 19, -5,
+   15, -43, 9, 22, -12, -64, -39, -16,
+   -49, 106, -13, 13, -6, -18, 0, -38,
+   12, 5, -44, -26, 116, -63, 76, 41,
+   19, -47, 1, -5, 39, 1, 110, -11,
+   59, -31, -33, 13, -31, -31, -43, -51,
+   48, -3, -76, -49, 10, 94, 11, -18,
+   -1, -31, -94, 14, -17, 35, 3, 55,
+   8, 46, -23, 31, -4, 31, -15, -41,
+   -50, 19, 47, -35, 80, -89, 27, -36,
+   -12, -32, 49, -64, -68, 62, -75, 11,
+   15, 9, -29, 3, 30, -36, 8, -57,
+   -40, 50, 19, 59, 39, -23, -60, 4,
+   2, -4, 3, -28, -2, 125, 10, 5,
+   -21, -77, 42, 71, 20, -18, 17, -8,
+   -24, 20, -17, 73, -30, -34, -71, -68,
+   40, 1, -1, 30, 47, -16, 84, -16,
+   16, 99, -13, -1, 4, 127, -37, 15,
+   15, 27, 35, 1, -23, 8, -10, -5,
+   48, 22, 9, 120, 110, -56, 6, -52,
+   67, 110, -32, 47, 21, -42, 39, -34,
+   -2, 0, 8, 32, -11, 1, -8, 29,
+   -34, 44, 50, 1, -8, -44, -32, 61,
+   40, 24, -17, -4, -21, 10, 22, 28,
+   51, 31, -34, -56, 22, 0, -9, -17,
+   -5, -48, 2, 34, -3, 37, -23, -8,
+   -6, 6, -105, -21, 14, 3, -53, 10,
+   -12, -47, 51, -15, 17, -45, 20, 25,
+   -19, 17, 10, 6, -59, 5, 35, 25,
+   39, 10, 59, 63, 5, -22, 59, 96,
+   22, 43, 33, -13, 10, -37, -20, 14,
+   -41, 9, 25, 40, 39, 32, -27, -45,
+   -43, 8, 28, -25, 19, 12, 22, 31,
+   -76, -46, -30, 32, -5, -103, -11, 0,
+   -19, 109, -115, -38, 31, -54, 76, -48,
+   9, 81, 38, -80, 8, -56, -44, 117,
+   -123, -69, -85, 3, -47, -42, 87, 40,
+   64, 124, -84, -128, -105, -41, -122, -38,
+   18, -21, -90, -64, 19, -34, -78, -125,
+   -51, -20, -7, -51, -126, 9, 13, -29,
+   -114, 61, 126, 13, -54, 83, 21, 5,
+   30, -27, -113, -83, -54, -65, -66, 17,
+   -15, -86, -127, -36, 20, 19, 17, -58,
+   37, -13, -24, -22, -125, 81, 12, -11,
+   84, -80, -127, -38, -73, 43, -37, -30,
+   53, -114, 56, -2, -52, -40, 8, -12,
+   17, -77, -89, 46, -13, 17, -95, -73,
+   -27, -32, 31, -115, -66, 24, 27, -3,
+   0, 27, 71, -72, -36, 37, -10, -73,
+   15, -35, 14, 7, 60, -17, -63, -11,
+   0, -103, 23, -94, 82, 20, 71, 7,
+   -38, -51, 18, 5, 99, -47, -114, 7,
+   -38, -58, 18, 31, -33, 13, 8, 62,
+   -21, 109, 47, -126, -10, 71, -12, -7,
+   11, -2, -5, -2, 121, 94, -53, -9,
+   -25, -20, 30, -7, -127, 67, -84, -118,
+   22, 34, -32, -106, -90, -91, -29, -75,
+   -21, 85, 0, -61, 2, -58, 16, 14,
+   68, 99, 5, 50, -12, -11, -5, -15,
+   -37, 10, 20, -29, 25, 20, 43, 24,
+   93, -18, 5, -12, -20, -13, -21, -78,
+   -68, -5, 82, -43, 13, -49, -26, -11,
+   -12, -40, 40, -12, -53, -21, -23, 41,
+   94, -41, -42, -96, -32, -62, 11, 116,
+   -9, 18, 24, -64, -97, 8, 71, -117,
+   37, 40, 34, 5, -48, 49, -7, -59,
+   -16, 36, -58, 54, -38, -37, -68, -2,
+   -33, 23, 9, -53, -126, -91, -87, -49,
+   -126, 42, 29, 52, 69, 35, 54, -11,
+   55, -5, 40, 6, 62, 2, 28, 20,
+   28, 0, 16, -53, -48, -7, 57, 11,
+   -17, 2, -89, 1, 42, -77, 31, 10,
+   47, 97, -52, -45, 37, 70, -37, -85,
+   -37, -11, 6, 68, 127, 2, -17, 28,
+   6, 35, -9, 27, 34, -25, 17, -45,
+   46, -32, 98, 55, -18, 25, -8, 1,
+   7, -24, 2, 64, -6, -48, -49, 57,
+   -37, -64, -4, 1, -81, 58, -44, 44,
+   -40, -27, -52, 69, 8, -8, 7, 7,
+   -62, -25, -1, -69, 117, 16, 15, 39,
+   -22, -5, 12, 6, 126, -6, 0, 16,
+   24, -60, -28, -3, -8, 66, 53, 15,
+   72, 23, 71, -45, -105, 2, 26, -111,
+   -82, -69, -9, -83, -5, -22, -120, 118,
+   94, -15, 125, -40, -81, -35, -6, 16,
+   -51, 119, 28, 40, -127, 18, 8, 42,
+   22, -125, 36, -30, -58, -62, 48, -1,
+   -96, 57, 86, -28, 4, -26, 87, 14,
+   -41, -39, -45, 11, 41, 55, 86, 33,
+   30, 74, -18, -24, 23, 5, 30, -25,
+   38, 34, -60, -75, 3, 84, 18, -29,
+   -96, 9, -12, -6, 1, -21, -4, 62,
+   33, 21, -18, 71, 65, 9, -46, -19,
+   31, -24, 5, 57, 47, -1, 32, -27,
+   22, 16, 51, 38, -54, -61, 26, -17,
+   -10, -1, 20, -44, -27, 15, 16, -22,
+   -36, 26, 18, 6, -3, -34, -57, 32,
+   -11, 40, -51, 11, 89, 51, -10, 25,
+   18, -117, 61, 54, 35, -61, 21, -39,
+   -3, 23, 65, 55, -8, -21, 44, -61,
+   -41, 6, 3, -5, 4, -7, 0, 89,
+   9, -10, -65, 64, -12, 23, -34, 11,
+   -29, -92, 7, -90, 50, -92, 53, -37,
+   -31, -6, 59, -15, 4, 18, -29, 70,
+   -55, 53, 13, -8, -121, -7, -33, 10,
+   28, 8, -17, -26, 14, -23, -71, -7,
+   -51, 86, -4, -12, -21, -3, 33, 19,
+   19, -39, 12, -69, 51, 24, -96, 8,
+   107, -17, -41, 105, 11, 16, -17, -71,
+   4, 65, 0, 29, 87, -24, 89, 90,
+   73, -20, 18, -9, 48, -55, -22, -1,
+   -43, -26, 47, 1, 79, 13, 68, 18,
+   -11, 90, -3, -11, -19, 20, 107, -1,
+   -8, -45, 4, 31, -5, 9, 41, 9,
+   71, 42, 79, -1, 6, -20, 13, 2,
+   5, -8, -10, -11, -25, -35, -19, 15,
+   26, -10, 47, -14, -37, 5, 10, -21,
+   -21, 98, -4, 62, -14, -30, -12, 25,
+   35, 39, -79, 25, -61, -21, -4, -79,
+   -20, 36, -98, 82, 3, -2, 36, -2,
+   -23, -1, -39, -20, -84, 49, 104, 10,
+   -32, -35, -20, 19, 51, -16, 10, 24,
+   -87, 90, -25, 0, 9, 25, 32, 37,
+   40, -51, -16, 24, -4, 4, -39, 49,
+   54, 48, -3, 44, -38, 12, 98, 28,
+   -40, -79, 41, 41, 17, 123, 34, 25,
+   27, -49, -48, -29, 51, 16, 19, -39,
+   57, 87, -18, 30, -22, -98, -45, 56,
+   18, 30, -6, -39, -64, 57, -109, 36,
+   15, 37, 0, 42, -15, -75, -13, 5,
+   42, -54, -18, -118, -28, -101, -5, -78,
+   -9, 43, 66, -24, 8, -22, -20, -47,
+   12, 42, 30, 23, 6, -19, -9, 15,
+   44, 58, 31, -44, -21, -25, -69, 26,
+   3, 57, 0, -4, 12, 29, 39, 18,
+   14, -2, -81, 8, -26, -66, -2, -3,
+   14, 3, -19, -27, 65, 17, -29, -20,
+   -24, 40, 35, -89, -8, 24, 57, 37,
+   31, -54, 16, -40, 13, 106, -18, -14,
+   -36, -18, 17, 88, 44, -7, -21, 18,
+   28, 35, 16, -3, -18, -9, 16, -1,
+   36, 16, -31, 37, 49, -48, -33, 32,
+   -12, 12, 25, -121, 92, 6, -1, 19,
+   22, 18, -7, -15, 28, -7, -79, 69,
+   35, -62, 113, -28, 52, -39, -24, 27,
+   -11, 14, 33, 21, 40, 20, -4, 4,
+   4, -29, 74, 49, -5, 8, -3, -48,
+   25, 23, -34, 64, 11, -15, -29, 38,
+   12, 86, -27, -18, -36, -46, 15, 42,
+   40, 12, -38, 51, -4, 30, -17, -37,
+   -63, -16, 35, 9, 26, 40, 60, -19,
+   19, 6, -9, 31, -13, 9, 5, -22,
+   -32, 93, -54, -43, 65, 31, 37, -60,
+   -6, 10, 11, 127, 32, 42, -58, -88,
+   32, -19, 109, 29, -27, -50, -51, 63,
+   40, -52, 6, -20, -10, 23, -17, 78,
+   -3, -27, 59, 31, 26, 26, 21, 31,
+   -72, -38, 80, -29, 9, 51, -76, -114,
+   -38, -19, 59, -54, 27, 43, 0, -8,
+   -60, 11, -1, 19, 18, -70, -78, 117,
+   -47, -65, 15, 56, 31, 4, 52, 38,
+   -14, -36, 67, 16, -20, 12, -88, 35,
+   18, -127, 15, 44, 125, -24, 56, 19,
+   20, -1, 47, -124, -1, -31, 83, 1,
+   -15, -125, 23, 70, 53, -61, 67, 36,
+   -16, 24, 31, 42, -25, 35, -25, -53,
+   22, 49, -19, -12, -67, 23, -72, 20,
+   -24, -118, 1, -9, -16, 8, 68, 10,
+   -5, -10, 35, -48, -66, -11, 87, 55,
+   3, -28, -53, -11, -3, -13, 3, 117,
+   12, 15, -51, 5, -69, -48, 31, 10,
+   14, 12, 1, 25, 113, -74, -28, -36,
+   37, 14, 14, 2, 1, -15, -31, 19,
+   21, 22, 20, -19, -10, 81, -44, 30,
+   9, -122, 30, 24, -24, 28, 4, 31,
+   -4, -29, 87, -18, 25, -21, 3, -56,
+   58, 39, 89, 34, 33, 10, -29, 29,
+   123, -88, -6, 19, 10, -42, -25, 47,
+   -47, -120, 89, 17, 73, -33, 31, -118,
+   -12, -10, -47, 6, 74, 116, 23, 94,
+   22, 69, 113, -4, 111, 68, 15, 56,
+   65, 51, 98, 31, -14, 119, -3, 26,
+   62, -9, -88, -21, 77, 62, 0, 86,
+   92, -17, 101, -30, 38, 53, -72, -38,
+   52, -42, -15, 35, -6, -7, 70, -25,
+   67, -42, 52, -83, 44, 2, -56, 60,
+   105, 116, -48, -29, 126, 76, -85, 42,
+   122, 118, 67, -4, -5, 5, 5, -37,
+   -29, 20, -34, 31, 117, 27, 75, 88,
+   38, -32, -80, 26, -29, 113, -60, 6,
+   64, 45, -49, -24, 16, -18, 119, -102,
+   5, -26, -25, 7, 26, 106, -75, 21,
+   -56, 74, 105, 89, 77, 109, -41, 114,
+   62, -6, -2, 125, 10, 87, 46, 71,
+   -48, 22, -27, -15, 75, 127, -55, 36,
+   25, 6, 67, -28, -9, 20, -4, 80,
+   14, 79, -10, 37, 49, 11, -31, -22,
+   54, -109, 8, 20, 36, -29, 15, 73,
+   102, -56, 19, -10, 49, 33, 72, 15,
+   -12, -57, 25, 120, -54, -86, 36, 60,
+   46, -71, 51, 15, -16, 14, -87, 10,
+   -41, -50, -19, 29, 2, 22, -8, 41,
+   -47, -5, -5, 30, -71, 51, 14, -39,
+   48, -1, 69, 36, -45, -57, -20, 53,
+   23, -15, 44, -19, -38, -75, 90, -2,
+   49, -9, -22, -2, -8, 22, 37, -50,
+   95, 57, 34, 77, -35, -81, 46, -34,
+   25, -4, -12, 29, 71, -32, -66, 0,
+   48, -39, 22, -30, 10, -53, -11, 16,
+   -32, 26, -13, -42, 18, -8, 76, -44,
+   -51, -66, 6, -30, 25, 0, -2, -77,
+   -26, -8, 42, 41, 28, -23, -46, -16,
+   -63, 37, -57, 7, 50, 7, 30, -22,
+   -34, 4, -35, 70, 19, -22, 43, 33,
+   20, 58, 4, -62, -8, 38, -25, 74,
+   -43, 10, -57, 121, 88, 6, -18, -16,
+   13, 1, 49, 73, -34, -17, -52, 32,
+   -59, -1, 19, -14, -38, -72, -23, -39,
+   -25, -54, -97, -13, 64, -31, -33, -33,
+   -7, -58, -15, 24, 34, -32, -34, -35,
+   -50, -89, 10, 1, -12, -7, 120, 28,
+   -41, -8, 81, -35, 65, 4, 45, -10,
+   -56, -11, -26, 13, 23, 45, -63, -65,
+   6, 40, -18, -10, 7, 2, -67, 5,
+   31, -34, -32, -9, 55, -4, 28, 75,
+   20, -56, -15, -21, -123, 88, -24, -16,
+   6, -21, 7, 14, 15, -112, -38, 35,
+   -42, -33, 30, 122, -58, -7, -23, -10,
+   10, 27, -32, 8, -112, 3, -67, 11,
+   27, 21, 0, -41, -5, 51, -51, -2,
+   -29, -55, 23, 8, 87, 9, 71, 25,
+   -53, -65, 84, 19, 52, -21, 22, 124,
+   -49, -3, -117, -34, -82, 45, -2, -3,
+   -50, 51, -20, 11, -6, 88, -3, -16,
+   25, -4, 14, -88, -83, -3, 43, 69,
+   4, -43, 2, -73, -26, -74, -57, -33,
+   -104, 14, -25, -90, -126, 9, 97, -48,
+   15, 29, 11, 18, 43, 2, 14, -39,
+   -75, -28, 12, 10, -9, -6, -43, -64,
+   -9, -26, 47, 36, 58, 10, 45, 23,
+   -21, -22, -30, 38, 5, -2, -56, 52,
+   16, 19, 55, 33, 2, -26, 7, -46,
+   24, 27, 46, 16, -2, -85, -61, -12,
+   17, 33, -33, 26, 12, -44, 30, -38,
+   20, -13, 13, 42, -61, -30, 25, 30,
+   41, -16, 1, 12, 5, -7, 68, 22,
+   1, -53, 40, -42, -16, 36, -63, 20,
+   57, 4, 12, -49, -56, -17, -65, 58,
+   -56, 92, -28, 2, 30, 11, -53, 8,
+   8, 28, -53, -60, 51, 62, -110, 32,
+   -85, -9, -92, -47, 73, 70, 47, -28,
+   102, -31, 14, -14, -10, 57, 2, 26,
+   109, -17, 46, 71, 13, -60, 12, -21,
+   3, 13, 25, -24, 1, 19, 52, -27,
+   2, 67, -56, 102, -5, 38, -23, 19,
+   -29, -114, -63, 27, 26, -14, 9, -14,
+   15, 2, -18, 53, -8, 10, 66, 15,
+   -60, -118, -55, 28, -54, -95, -2, 39,
+   88, -1, 57, 60, -11, 63, 25, -11,
+   110, 32, 47, 3, -42, 15, 74, -36,
+   0, 8, -49, 6, 71, 39, 13, -104,
+   25, 110, -39, -66, 37, -30, -89, 51,
+   -86, -21, 67, 8, 2, 88, -18, -69,
+   -76, 10, 75, 32, -112, -61, 50, 49,
+   19, 27, 119, 41, -81, 31, -124, 51,
+   39, -49, 87, -10, 3, 31, 123, -47,
+   -41, -34, 18, 31, 33, -24, -62, -59,
+   -37, 107, -3, 37, 39, -32, -77, 4,
+   -47, 6, -55, -4, 45, 38, -50, 8,
+   -9, -23, 77, -59, -13, -7, 80, 10,
+   127, -45, -121, -8, 88, 22, 12, 33,
+   75, 17, -69, 13, -31, 37, 47, -2,
+   27, -7, -39, 35, 22, -83, 0, 61,
+   12, 9, 0, 28, 13, -3, 11, -13,
+   -16, 83, -11, -23, -80, -9, 59, -24,
+   -2, 32, 20, 37, -51, -12, -41, 30,
+   -57, 34, -102, -91, 118, 3, 29, 25,
+   33, -34, -50, -1, -120, 10, 2, 19,
+   12, -44, -23, -57, 27, -61, -11, 60,
+   -4, 116, -25, 39, -9, -29, -103, 33,
+   -23, 13, 10, -17, -6, 21, 52, -15,
+   -22, 19, -31, 48, 64, -69, 23, 2,
+   19, 87, -43, -78, -84, -33, 19, 33,
+   71, 28, 43, -37, -51, 70, 9, -4,
+   10, 27, 56, -16, 28, 19, 10, 10,
+   8, 46, 12, 81, -16, 120, 1, -12,
+   -15, -7, 34, -55, -57, 93, 101, 67,
+   -68, -3, 64, 54, 14, 29, -40, 15,
+   -35, 24, -83, -68, 119, -66, 50, -67,
+   0, -48, 62, 15, 117, 26, 41, -12,
+   29, 49, 65, -59, 44, -79, 63, -65,
+   19, -78, 30, 36, 33, 63, 14, 127,
+   5, 22, 13, -6, -45, -66, -2, 4,
+   -3, 2, -34, -41, 50, -31, -22, 50,
+   -45, 67, -19, -47, -14, 123, -12, 36,
+   23, 11, -110, 46, 12, 92, -4, 86,
+   88, -23, 51, 34, 21, 50, -87, 35,
+   87, -3, 15, -37, 24, -23, -15, 1,
+   109, -43, 70, -109, -43, -23, 110, -113,
+   -114, 29, -61, 68, 31, -16, -13, 10,
+   -59, 1, 77, -56, 13, -8, 50, 30,
+   27, -58, -100, 6, -30, 1, 11, -7,
+   78, 8, 37, 44, 21, -61, 59, -33,
+   -11, -75, -44, 17, 17, 13, -9, 4,
+   -31, 70, 71, -88, 57, 26, 40, -39,
+   46, 41, -40, 45, 5, 11, -59, 31,
+   27, 35, 53, 70, -31, 14, -30, 16,
+   117, -24, 51, 16, 45, 127, -38, -48,
+   9, -32, 51, -18, 17, -70, -23, 5,
+   -11, -65, -8, -22, 32, -67, 22, -3,
+   0, 112, 23, 5, 61, 9, -10, 22,
+   32, -10, 34, -27, 17, 0, 37, 37,
+   110, 20, 41, 85, 4, 61, -9, 24,
+   -39, 46, 41, 35, -9, -59, 44, -2,
+   9, 19, 82, -66, 23, 80, 6, 40,
+   15, -31, 55, 59, -51, 107, 16, -24,
+   2, 37, -4, 71, 38, 16, 53, 23,
+   32, 8, -24, 20, -13, 40, -122, -26,
+   2, -5, 50, 105, 48, 47, -29, 22,
+   40, 38, 19, -33, 54, -65, 3, 16,
+   31, 85, 63, -58, 35, 33, 11, -3,
+   -51, -50, 31, -4, 38, 55, 63, 15,
+   38, -82, -4, -3, 53, -5, 98, 15,
+   -20, -61, -2, 69, 81, -30, 15, 1,
+   17, -78, -88, 58, 65, -87, 44, -80,
+   31, -10, -19, 5, -104, 27, 8, -71,
+   -7, -63, 38, 58, -29, 2, -25, 16,
+   -14, -5, 5, -26, -48, 7, 22, 15,
+   -50, -73, 24, -6, -88, -6, 53, -49,
+   3, 0, -7, 18, 13, -1, -112, 15,
+   -85, 28, 31, 53, -20, -57, -10, -28,
+   1, -12, -34, -14, 45, -13, -13, 74,
+   -36, 5, -73, 28, 10, -18, 2, 3,
+   -37, -57, 63, -75, -59, 33, -7, 53,
+   48, -7, 114, -29, -38, -4, 12, -121,
+   -53, -36, 42, 38, -6, 105, 58, 57,
+   -32, -14, -50, 87, -84, 31, -56, -35,
+   68, 21, 6, 79, 49, 2, -8, 9,
+   -42, -14, -125, 16, -45, 48, 125, 15,
+   -9, -19, 49, 64, -30, 11, -67, -38,
+   -125, -57, -19, 66, -8, 13, -52, -72,
+   0, -4, -52, 109, 92, 15, -61, 51,
+   36, -41, 26, 60, -59, 4, 17, 72,
+   -2, 48, 29, -11, -15, -7, -2, -23,
+   -9, 16, 2, 14, -18, -1, 92, -111,
+   -2, -9, 14, -17, -21, 23, 30, -4,
+   51, 53, -38, -20, 3, 47, -76, -10,
+   14, -105, -94, -8, -5, 16, -1, 41,
+   24, 38, -10, 31, -109, -16, -4, 39,
+   -46, -33, -20, -14, -39, -49, -13, -7,
+   0, 31, 19, 7, -9, -12, 17, 26,
+   16, -120, 6, 25, 39, 45, 24, -29,
+   -34, -20, 16, -64, -14, 2, -48, 53,
+   15, -17, 5, 30, 14, 127, 8, -49,
+   62, -89, 42, 66, 16, -14, 0, 30,
+   -12, 10, -49, 36, 36, -47, -35, -8,
+   39, 54, -24, 15, 57, -63, 12, -5,
+   -46, 1, 96, -119, 14, 4, -48, 17,
+   -123, 81, 1, 113, 89, 20, -39, -13,
+   34, -39, 52, 11, 35, -23, 34, -25,
+   -4, -9, 10, 23, 30, 27, 20, -30,
+   -1, -29, 24, -27, -37, -10, -15, -57,
+   -31, 22, -32, 75, 45, -35, 42, 3,
+   -32, 76, 21, -38, 14, -52, -9, 5,
+   -62, 35, -23, -33, -64, 42, 57, 45,
+   18, 10, 58, 50, -1, 11, -79, -14,
+   59, -61, 14, 58, 26, -21, 62, -44,
+   20, 15, 2, 77, 42, -14, 20, 108,
+   27, 7, 3, 48, 62, 0, 15, -33,
+   -13, -49, 29, 66, -66, 56, -127, -1,
+   10, -14, -64, 32, 1, 0, -34, 73,
+   82, 67, 85, -93, 29, -26, 9, -74,
+   -50, 20, -29, 40, -24, 70, -105, 51,
+   -18, -23, -40, 2, 39, 105, -33, -82,
+   -18, 127, 72, 6, 42, 59, -80, 1,
+   -22, -4, 36, 52, 117, -96, 123, -14,
+   -84, 33, -58, -18, -24, 41, 17, -15,
+   -70, -30, 42, -5, 21, -69, -83, 107,
+   96, 122, 70, 60, -109, -68, 21, 51,
+   90, 93, -34, -5, -13, -13, 77, 76,
+   70, 85, -56, 50, 5, -124, 0, 13,
+   -40, 57, 7, -23, -21, 20, -25, -87,
+   23, -53, -19, -41, -27, -3, 37, 65,
+   -33, -30, 42, -75, 15, 15, 76, 25,
+   37, 28, -60, -54, -99, 35, -53, -19,
+   4, -69, -46, 5, 25, -33, -31, 49,
+   16, -58, -23, -6, 53, -14, 68, 47,
+   -35, -4, -13, 3, 81, -16, -64, -37,
+   5, -4, 4, 33, -55, 29, 31, 44,
+   5, 13, 77, -24, -31, -56, 15, 41,
+   80, -35, -3, 24, -101, 30, 17, 63,
+   64, 16, -17, -20, -6, 11, 4, 1,
+   -35, -79, -3, 42, 46, -26, -29, -11,
+   -85, -62, 58, 8, 6, -61, 6, -123,
+   11, 0, -89, -121, -55, -123, -24, 5,
+   -81, 6, 123, 32, -62, -82, 2, -89,
+   -74, -48, -109, -6, 42, 20, -121, 34,
+   -117, -3, 42, -71, 82, 70, -88, 20,
+   -3, 9, -69, 11, 56, -23, -66, -49,
+   9, -121, -127, -124, 2, 10, 17, -60,
+   49, 30, 74, -40, 45, -87, 68, -7,
+   74, -26, -25, 0, -119, 14, -5, -16,
+   -103, 77, -31, 16, 43, 5, 53, -58,
+   35, 50, 72, -38, -121, 48, 70, -29,
+   33, -30, 36, 36, -61, 28, -18, 37,
+   104, -126, 44, -122, -120, -12, -13, -122,
+   -33, -86, -122, -86, -69, -30, -20, 70,
+   -60, 47, -52, -87, -51, 20, 125, -34,
+   106, 28, -71, -34, 64, -66, -36, -97,
+   -81, -127, 34, -93, 42, 115, -23, 2,
+   32, 66, 100, -32, 70, -44, 16, 52,
+   4, 24, -60, -126, 9, -122, -126, -118,
+   -96, 2, -4, -50, -30, -117, -67, 34,
+   -57, -1, 12, -70, -82, 17, 53, -39,
+   11, -88, -3, 35, 127, -77, -33, -21,
+   75, -30, -47, 80, 35, -35, 95, -118,
+   22, -12, 11, -7, -124, 127, -67, 64,
+   -37, -47, 14, -21, -20, -10, 11, 20,
+   18, 11, 24, -62, 18, -56, -24, 14,
+   -9, 9, -126, -56, -39, -3, -47, -35,
+   12, -23, -8, 10, 120, -21, 63, -36,
+   -44, 72, 69, -101, -2, -16, -102, 9,
+   9, 5, -100, -51, 116, -90, 42, 17,
+   43, 50, -64, -78, -82, -12, -107, 124,
+   50, -24, -14, -47, 11, -57, 43, 125,
+   -49, 3, 38, -4, -46, 46, 32, 20,
+   -65, -27, -83, -6, -5, -36, -2, 2,
+   -16, 23, -31, 3, -73, 57, -75, -94,
+   -24, 5, -13, 15, 9, -12, -5, 8,
+   5, 18, -37, 104, -50, 24, -81, 91,
+   33, -76, 10, 29, 45, 19, -25, -86,
+   -15, -81, -19, 62, 20, 41, 34, -11,
+   -37, 45, 88, -126, 77, 77, -63, -4,
+   -12, 28, 39, 63, 53, 12, 51, -51,
+   -13, -56, -117, 17, -27, 23, -66, 41,
+   -29, 77, 65, 62, 105, -51, -67, 24,
+   92, -118, 60, -6, -14, -23, -57, -35,
+   -11, -45, 19, 120, -42, -85, -51, 20,
+   120, 26, -24, -71, 92, -49, -11, 17,
+   34, 24, 64, -23, 27, 29, -29, 6,
+   39, -61, 7, 47, 9, -10, -10, -100,
+   67, 70, -64, 99, 57, 67, 17, -20,
+   58, 28, 15, -43, 57, 14, -97, 7,
+   89, 18, 24, -99, 9, 10, -27, 46,
+   -48, -124, -81, -41, 19, -32, -75, 4,
+   80, 58, 83, 59, 65, -26, -11, 42,
+   17, -64, -69, 1, -106, 28, -38, 54,
+   22, 7, -10, -10, -1, -46, 109, 27,
+   13, 6, -43, 5, 10, 17, 7, 65,
+   39, -80, 33, 93, -53, -107, -36, -3,
+   0, -61, 87, 69, -121, -83, 26, 33,
+   -62, 73, -77, 26, 125, -29, 31, 108,
+   -120, 40, -22, 104, 10, 117, -88, -10,
+   -29, 12, -4, 20, -39, -81, 51, -68,
+   41, 70, 9, 3, 63, 35, -14, 15,
+   -51, -44, 1, -41, 42, -18, 90, 0,
+   6, 28, -41, 19, -36, -49, -34, 75,
+   19, -8, 18, -2, -9, 46, 22, -22,
+   47, -8, 35, 22, 0, -19, -6, 1,
+   1, 39, 8, 64, -26, -42, 16, -15,
+   -16, -6, 8, 3, 39, -6, -1, 31,
+   -20, -51, 46, 32, 17, -50, -38, 64,
+   -18, -69, -3, 8, -24, -15, 30, 59,
+   31, -12, 9, 27, 56, 7, -32, 10,
+   7, -20, 11, -62, 13, -4, -37, 6,
+   -36, -63, 29, -10, 9, -4, -35, -16,
+   -36, 18, -18, -23, -57, -16, -38, 19,
+   21, 72, -45, -73, 16, -19, -7, -17,
+   70, -45, 13, 46, -29, -12, -3, -2,
+   -54, 122, -5, 91, -119, 4, -23, 39,
+   -1, -53, 19, -5, -76, 19, 22, -5,
+   -44, 32, 51, 45, -14, 30, -51, 18,
+   106, -18, -33, 43, -15, 9, 38, -22,
+   23, -104, 80, 19, 64, -11, 6, 10,
+   -70, 71, 97, 40, -49, 14, 31, 35,
+   -126, -5, -8, 15, 47, -20, -13, -4,
+   21, 14, 46, 18, -77, 34, 17, 0,
+   27, 32, -33, -5, -5, 4, 118, -15,
+   9, -10, 60, -16, -15, -48, -6, -86,
+   92, -25, -8, -24, 6, -4, -28, -17,
+   40, 116, -42, 21, -26, -15, 22, -14,
+   42, -12, 20, -37, 49, 53, -30, 11,
+   76, 65, -104, 50, -45, -26, 10, -127,
+   -9, -40, 10, -14, -53, 8, 56, -48,
+   26, 14, -7, 19, 55, 5, 28, -30,
+   -3, -44, 30, 68, 43, -16, -14, -4,
+   26, -74, 71, -35, 49, -56, -1, 7,
+   -30, 62, -95, 33, -9, -37, 74, 36,
+   49, -18, -16, 10, 54, -11, -13, -45,
+   2, 25, 8, -12, 20, 91, 8, 16,
+   8, -39, 20, -3, -17, 43, -8, 19,
+   3, -25, -3, 16, -1, 26, 39, -15,
+   6, 25, -43, -17, -65, 46, -39, 61,
+   21, -21, 29, 65, -56, 0, 93, 15,
+   17, 1, -40, 43, 11, 36, 35, 31,
+   -20, -66, -28, -6, -6, 89, -35, -41,
+   121, 17, -4, 71, 76, 19, -54, 18,
+   21, 10, 6, -44, -34, -14, 25, 4,
+   50, -92, -53, -61, -4, -38, -15, -5,
+   -37, -8, -28, -77, -11, -105, -64, -8,
+   53, -44, 5, 8, 30, 25, 8, 30,
+   -26, 68, -62, 52, -7, 66, -101, -3,
+   -1, -24, -49, -56, -105, -121, 47, 31,
+   58, 2, 19, 40, -14, -22, -1, -24,
+   -14, -51, 59, -19, -21, -47, -84, 15,
+   9, -30, -84, -120, -114, -52, 120, -47,
+   2, 81, 0, 19, -32, 16, -3, 4,
+   25, 56, -127, 3, 49, 21, 9, -28,
+   -50, -32, -5, 18, 45, 26, -47, -21,
+   12, -25, 21, -46, 6, -72, 6, -23,
+   -58, -5, -75, -52, -45, 19, 2, 52,
+   -7, -43, 26, 58, 24, 1, -34, -21,
+   -29, 89, 91, -5, -57, -38, 15, -21,
+   -41, -10, -16, 91, 52, 106, -58, 36,
+   -19, -20, 124, -37, 17, 5, 83, -102,
+   18, 25, 66, -48, 28, 27, -77, -32,
+   24, -31, 31, 0, 79, 25, -56, 28,
+   51, -80, 29, -33, -92, 33, -3, -58,
+   -59, 26, -126, 93, -63, 118, -50, 10,
+   -28, 59, 21, 27, 3, -109, 53, 78,
+   1, 46, 8, 19, -123, -56, 124, 39,
+   15, 59, 57, -18, 0, -72, 73, -36,
+   -6, -24, 6, -1, -54, -26, 5, 35,
+   72, -52, -31, -31, 22, -11, 30, 58,
+   -62, -62, 77, -49, 63, 10, 60, -59,
+   8, -15, -21, -91, 2, 37, 24, -57,
+   53, 36, -40, 2, -43, -127, -17, 23,
+   -29, 24, -7, -19, 24, 27, 3, -50,
+   -22, -13, -39, 76, -44, 100, -36, 6,
+   1, 2, 30, -38, -73, 60, -76, -7,
+   -18, 32, -107, 87, -94, -45, -18, -2,
+   -8, -21, -41, 45, 104, -4, 52, -8,
+   10, -18, -7, 9, -61, 10, -22, -102,
+   25, -34, -7, 46, -40, -14, -18, 19,
+   -35, -15, -28, 76, 15, -109, 45, -3,
+   35, 27, -27, -67, -40, -88, -123, 69,
+   -57, 2, -39, 26, -5, -47, 7, -23,
+   13, -29, 24, 70, 37, 14, 26, -67,
+   14, -6, 38, 39, 62, 13, 37, -27,
+   -14, 63, 120, -34, 113, -3, -41, -54,
+   41, -40, 17, -43, 85, -66, 30, -52,
+   55, 12, -15, -10, 12, 73, -32, 64,
+   80, -18, 18, 48, 26, 3, 88, 13,
+   9, -64, 15, -19, 30, 52, 117, -1,
+   50, 12, -7, 40, 23, 31, 110, -5,
+   -46, 51, 46, -116, 25, 88, 14, -24,
+   21, 79, 18, -58, -78, -29, 11, -37,
+   -86, -31, -40, -28, -17, 40, 23, 64,
+   17, 5, 15, 50, 26, -28, 13, 66,
+   57, 11, 51, -81, -26, -72, 39, -16,
+   -120, -51, -100, -85, 24, -76, -14, 72,
+   -42, -30, -103, 1, -75, 49, -38, -82,
+   32, 53, 113, -33, -40, -6, 24, 47,
+   0, -51, 118, -4, 16, 77, -35, -36,
+   -6, 4, -16, 124, -91, -65, -31, 35,
+   -12, 0, -36, -96, 0, 17, -108, -9,
+   -47, 10, 8, 58, -2, 11, 7, -1,
+   -17, -8, 8, -77, -10, 16, 111, 13,
+   10, -32, 47, -8, 62, 69, -35, -4,
+   39, 34, -92, -8, 45, 37, -7, -75,
+   -1, 45, -38, 71, -90, 37, 31, -43,
+   17, -33, 1, -17, -71, 35, 16, 86,
+   -113, -23, 0, -80, 5, -28, 14, 10,
+   33, 47, -6, -36, 19, -16, -52, 33,
+   -35, -12, 25, -21, -7, 63, 2, 32,
+   -17, 13, -6, 12, 14, -49, -43, 66,
+   5, 19, -103, 34, 27, -8, -20, 1,
+   10, -47, 35, -26, -11, -18, -61, 21,
+   -25, 9, 11, -16, -20, 8, 13, -19,
+   -14, 27, 5, 15, -16, 9, 59, 0,
+   52, 28, -66, -115, 68, 17, -17, 21,
+   -21, 11, -28, -20, 4, 26, 15, -9,
+   -25, -6, 17, 5, -19, -13, -11, -3,
+   34, -1, 29, -74, 115, 33, 20, -12,
+   49, 54, 127, -55, 9, -9, -87, -113,
+   120, 8, -25, 19, 63, 21, -44, -31,
+   17, 111, 93, 16, 10, -99, -125, 98,
+   -12, -58, -40, 14, -47, 92, -40, -6,
+   -38, -24, 30, 78, -22, 109, 76, -10,
+   66, 29, -15, -33, -18, 3, 63, 11,
+   47, 96, 49, 0, 74, 72, -43, 6,
+   24, -26, 80, -56, 66, -23, -109, 55,
+   -27, 52, 27, -59, -99, 58, -17, -34,
+   -7, -35, -89, 66, 15, 18, 36, 32,
+   0, -101, -40, 35, 121, 14, 37, 106,
+   -90, -62, -37, -73, -45, -18, -12, -48,
+   -21, -81, 113, -49, 33, -75, 74, -55,
+   -73, -85, -51, -116, 53, 16, -67, -5,
+   -49, 85, 23, 111, 19, 119, -107, -8,
+   29, -2, 50, -117, 83, 34, -42, -38,
+   7, -3, -46, 94, 95, 127, -45, 71,
+   37, 65, -2, 4, -1, -34, 118, 35,
+   0, 81, -56, -73, -6, 22, 89, -28,
+   7, -94, 40, 73, 37, 60, 33, 125,
+   57, 127, -37, 46, 67, 19, 89, 86,
+   -31, -11, -70, 126, 0, 2, 4, -45,
+   35, 39, 46, 78, 46, 93, 85, 89,
+   74, -72, -21, -11, -31, 93, 16, -38,
+   -2, -55, 49, -25, -21, -11, 21, 16,
+   -63, 19, 27, 25, 3, 70, -23, 52,
+   18, 15, -101, -47, -66, 99, -126, 101,
+   -37, 0, 46, 74, -10, 33, 29, 6,
+   60, 16, -41, 115, 17, -11, 14, 43,
+   -22, -11, 78, -69, 14, 69, 4, -98,
+   -73, 22, 5, 52, 17, -64, 65, 49,
+   -1, 21, -121, -39, 61, 20, 23, 36,
+   108, 57, 19, -36, 62, 38, -29, -8,
+   28, 87, -38, -86, -46, -86, -86, 9,
+   4, 39, 13, -20, 40, -15, -43, 4,
+   9, 24, -16, 4, 68, 41, -6, 74,
+   -78, -43, 27, -68, -7, -9, -54, -2,
+   -7, -49, -94, 100, 2, 0, 1, 15,
+   -53, 25, 117, 1, 125, -22, -2, -21,
+   -19, 73, 19, 75, -112, 30, 68, -13,
+   -55, -26, -12, 54, 26, 50, 67, 12,
+   44, 123, 8, 42, -14, -22, -70, 2,
+   58, -68, -24, -9, -20, 2, 30, -13,
+   -21, -21, 11, 98, 0, -63, 37, -22,
+   29, -1, 23, 50, 28, 74, -15, 23,
+   -48, 18, -5, -28, 54, -14, -15, -3,
+   -23, 13, 10, 63, -3, 11, 32, -21,
+   39, 80, -106, 41, 1, -55, -25, 53,
+   -17, -57, 54, -39, 21, -40, 8, 44,
+   112, 9, 88, 52, -24, -2, 7, 3,
+   -11, -13, -32, -6, 75, -14, 75, 21,
+   -66, 16, 14, 18, 12, 34, 94, -45,
+   30, 6, -36, 94, -125, -26, -23, -117,
+   -93, -3, 0, -1, -33, -33, 34, -91,
+   -76, 31, -16, 62, 47, -9, -27, 19,
+   23, 41, 9, 66, -3, -118, 83, 20,
+   118, 5, -22, 37, -91, 31, 3, 23,
+   5, 15, 11, 120, 89, 84, 7, 75,
+   -123, 15, 7, 28, 17, -101, -23, -9,
+   -5, 15, -2, 72, 21, 10, 19, -29,
+   60, 13, 20, 46, -27, 54, 7, 24,
+   -61, -25, 25, -17, -19, -14, -30, 21,
+   -37, 61, -63, 41, -48, -15, -20, 15,
+   44, 28, -13, -60, -55, 15, 18, -2,
+   57, 16, 102, -17, 1, 3, 23, 28,
+   -20, -104, 66, 99, -31, 44, -25, -59,
+   54, 15, 4, 66, 44, 13, -88, -3,
+   -4, -18, 21, -43, 12, -123, -14, 37,
+   -28, -11, -9, 73, -5, -62, -12, 25,
+   17, -25, 65, 22, -4, 2, -8, 9,
+   9, -7, 41, -62, 10, 34, -4, -6,
+   6, -6, 0, -10, 4, -9, -5, 9,
+   8, 2, 16, 4, -9, -9, -2, -28,
+   -6, 2, 32, 1, 2, 1, 10, -3,
+   -25, -4, 12, -18, 4, 5, -6, -4,
+   -10, 0, 20, -2, 18, -3, -16, 9,
+   1, -4, 15, -7, 13, 5, 1, 6,
+   -10, -1, -8, -5, -10, -3, -12, 18,
+   -3, 2, 3, 12, 7, 16, -5, 11,
+   7, 25, -7, 25, 14, 7, -14, 1,
+   -20, 11, -30, -18, 6, 4, 1, 2,
+   0, 8, 0, 4, -16, 9, -2, 20,
+   14, -7, -2, -8, 4, -3, -7, 5,
+   -12, -24, -41, -4, -4, 0, 22, -4,
+   6, 34, 7, 44, -6, -23, -14, -9,
+   8, -32, -47, 19, -26, 3, 20, -37,
+   -14, -16, -9, -46, -9, -6, 7, -27,
+   13, -28, -10, -10, -71, 21, -41, -6,
+   49, 41, -9, -16, 6, 12, 32, -1,
+   36, -9, -14, -22, 4, -19, -4, -13,
+   24, 24, 41, -8, -8, -19, -2, -38,
+   -6, -20, -12, 21, -21, -26, -90, -22,
+   8, 18, 67, 45, -12, -47, 33, 14,
+   -31, 7, 14, -4, 11, -5, -25, 8,
+   19, -49, -12, -19, -20, -1, 21, -26,
+   19, 3, -13, -3, -12, -6, -7, 22,
+   8, 17, -1, 0, 6, -3, -7, 1,
+   10, 5, 48, -13, 17, 2, -5, -26,
+   1, 11, 6, 11, 15, 11, -18, 6,
+   -21, 9, -13, -9, -2, -9, 9, 0,
+   -5, 23, 33, -14, -2, 1, 26, 7,
+   -17, -4, -8, -3, -2, 20, -5, -36,
+   4, 7, -9, 29, 2, -1, -6, 6,
+   13, 27, 6, -7, 1, -11, 20, 5,
+   10, 2, 5, 10, 17, 10, -28, 3,
+   -14, 27, -7, -12, 12, -6, -22, 3,
+   -5, 11, -21, 1, -17, 1, -14, -9,
+   3, -19, 18, -39, -16, -12, 29, 14,
+   12, 18, 8, 40, 34, -15, -33, 19,
+   3, -5, 9, -7, -26, -2, -38, 27,
+   -21, 28, -39, -40, -13, -53, -2, 5,
+   -42, 27, 10, -13, 11, 3, -2, -17,
+   -36, -5, -21, -13, -3, -6, -46, 25,
+   13, 2, 7, -17, 66, -16, 18, 15,
+   7, -15, 22, 16, -2, 45, 3, 0,
+   32, -5, 22, 37, 8, -1, -39, 14,
+   -21, 25, -67, 16, 0, 9, 7, -3,
+   4, -1, 9, 6, -29, -2, 14, -2,
+   1, -9, -9, -28, 3, 7, 14, 16,
+   -25, -18, 32, 42, -39, -32, -42, -60,
+   -9, 20, 4, -20, -61, 4, -37, -5,
+   17, -16, -25, 67, -35, 17, 33, 27,
+   90, 9, 17, -55, 112, -7, -33, -4,
+   17, 50, 13, -7, -81, -12, 9, 85,
+   22, -20, -2, 32, 10, -9, -4, -6,
+   3, -3, 10, -12, -24, -62, -10, 40,
+   6, 1, 13, -7, 2, -110, 24, 31,
+   -15, 42, -54, 69, 45, 88, 13, -5,
+   7, -25, 28, -49, -3, -59, 53, 34,
+   59, 80, -23, 58, 75, -4, 6, -14,
+   -27, 91, -16, -22, -5, -29, 12, -50,
+   26, 27, 5, -8, -1, -4, -22, -30,
+   -39, 18, 32, -45, -18, -12, 45, -33,
+   -14, -38, 36, -14, -21, 18, -20, -11,
+   -44, 6, -29, -32, -2, -5, 0, 47,
+   -40, -18, -49, 5, -2, -19, 0, -2,
+   -17, 37, -16, -10, 39, 17, -34, 14,
+   -18, -16, 12, 12, 20, -1, -27, -27,
+   36, 15, -6, 22, -28, 10, -17, 13,
+   46, 13, 28, 6, 32, -62, 33, 23,
+   16, 3, 16, -35, -5, -22, -13, 22,
+   10, 43, -18, 2, 46, -14, -35, -39,
+   31, -31, -19, 25, 15, 45, -23, 11,
+   24, -8, 32, -6, 6, 4, -4, -5,
+   -27, 40, -29, 19, 36, 4, 91, -20,
+   4, -19, 16, 47, -45, 20, -21, 2,
+   46, 26, 8, -56, -28, -74, -10, 9,
+   -52, -6, -42, -17, 0, 21, 11, -26,
+   -25, -36, -3, -5, -25, -1, -52, 23,
+   22, -29, -7, -3, -55, -31, 43, -13,
+   -13, -53, -23, 3, 28, 34, 14, 2,
+   18, -31, -5, 41, -15, 34, -14, 30,
+   -62, 15, -45, -81, -22, 5, 10, 9,
+   -1, 13, 30, -12, -45, -1, 1, -39,
+   -1, 4, -9, -39, 2, 17, 28, -15,
+   -11, -54, 83, 4, -5, -23, -45, -54,
+   -1, -48, 30, -29, -2, 45, 48, 60,
+   13, 10, -26, 5, -13, -8, 41, 23,
+   66, 15, -43, -8, -103, -5, 61, 16,
+   5, -31, 58, -38, -51, -10, 35, -112,
+   -25, 56, 28, 9, 8, 12, 1, -43,
+   26, 1, 36, 12, 84, -88, -63, 100,
+   -42, -4, -109, 10, -49, -88, -11, 27,
+   -28, -77, -53, 51, 45, -106, 13, 23,
+   59, -31, 79, 44, 12, -80, 6, 66,
+   -10, -35, 37, -8, 60, 39, -6, -45,
+   -12, -53, 59, -15, 27, -28, -1, -69,
+   23, 29, 19, -53, 36, -37, 0, -28,
+   -32, -31, 43, -31, -33, -20, 0, 44,
+   -61, -77, 19, -37, -32, 10, 3, -14,
+   49, -16, 10, -24, 11, -53, 2, 55,
+   -7, 26, -38, 18, -3, 2, 36, 61,
+   -18, 43, -28, -23, 66, 3, 11, 25,
+   4, 6, -16, 11, 33, -44, -24, 4,
+   -17, 11, 1, -5, -18, 33, -17, 8,
+   52, 5, 23, 19, 18, -19, -6, -2,
+   -21, 18, -5, 25, -3, -33, 45, 30,
+   -4, -17, 10, -1, 69, -77, -21, -60,
+   64, -2, -44, 9, 17, -29, -14, -18,
+   35, 7, -8, 42, -5, 23, -20, -12,
+   -19, -19, -20, 10, -22, 45, 33, -40,
+   -17, 25, -16, 44, 12, -4, 9, -75,
+   8, -35, -66, -2, -36, -22, -49, -9,
+   13, 16, -30, -19, -10, -8, 21, -12,
+   -24, -33, 47, 5, -14, 17, 25, 18,
+   -42, 6, -15, -3, 21, -21, 25, -25,
+   -22, 14, -5, 12, 46, 47, 13, 25,
+   18, 7, -8, 12, -30, -24, 0, 60,
+   -81, -4, 30, 103, -63, -18, -11, 5,
+   11, 7, 66, -13, -39, 8, -2, 12,
+   -2, -11, 1, 36, -37, -9, 18, -46,
+   12, -22, 3, 14, -43, -74, 15, 51,
+   52, -7, -46, -9, 10, -76, -40, 12,
+   -111, -20, 11, -85, -5, -69, 6, -102,
+   -15, -34, 50, 25, 121, -17, 118, -16,
+   -72, -33, -3, -10, 0, 14, -52, 35,
+   10, 62, -60, -49, -29, 4, 1, -17,
+   29, 3, 12, -48, -99, 7, 38, -36,
+   0, -13, -51, -43, -77, 10, -7, -4,
+   -6, 103, -58, 72, -19, 58, -43, -30,
+   44, 54, 42, 68, 3, -65, -64, 74,
+   -21, -72, -57, 67, 70, 63, -97, -24,
+   64, -11, 32, -3, -14, 5, 2, -74,
+   31, 3, 2, -36, -50, -19, 14, 94,
+   28, -11, 5, 32, 12, 15, -17, 18,
+   -23, 62, -3, -41, 34, -29, -7, -54,
+   26, -25, 33, 23, -9, 32, -8, 18,
+   3, -12, 40, -31, 10, 17, -22, -86,
+   -18, 34, 65, 8, -11, 13, 0, 11,
+   14, -22, 6, 17, -22, -14, 35, 3,
+   29, 15, 16, -24, -22, 51, 7, -42,
+   63, 11, 18, -7, 7, -38, -20, -30,
+   13, 81, 64, -94, 30, 45, 95, 9,
+   -5, -35, 6, 56, 25, -93, 22, -28,
+   8, 17, -48, -90, 12, -41, 5, -38,
+   -4, 13, -48, 11, -6, 9, -52, -10,
+   59, -33, -2, -60, -8, -24, 33, 45,
+   -31, 4, 34, -9, -8, -36, -22, -37,
+   -62, -31, -13, -108, -16, 76, 17, -23,
+   25, 25, -28, -3, -23, -15, 14, 20,
+   16, -3, -35, 9, 29, 2, 7, 17,
+   -52, 12, -32, 8, 17, -10, -41, -28,
+   -28, 56, 18, -39, 12, 64, 11, 2,
+   12, -22, 37, 5, 6, -10, 6, 42,
+   6, 3, -40, -122, -19, -5, -12, -14,
+   37, -9, 13, -16, -54, -12, -26, 5,
+   31, 0, -2, 100, -15, -12, 21, -22,
+   -13, -3, -45, -118, 39, 14, -90, 73,
+   -52, 10, 6, -116, -6, -60, 32, -39,
+   -35, 42, -12, -76, -16, -105, -9, -54,
+   71, 92, -121, -24, -123, 16, -26, -62,
+   -65, 0, 32, -24, 12, 24, -5, 59,
+   15, 21, 4, 5, 3, -4, -5, 36,
+   0, -20, 64, 3, 27, 16, 8, 14,
+   -2, 47, 33, -73, -24, 65, 46, 63,
+   5, -46, 49, 14, 3, -45, 44, 39,
+   -50, -45, 11, 0, 31, -87, -52, 12,
+   61, 92, -78, -41, -44, 42, -67, -9,
+   36, 94, -5, 71, 23, -7, -11, -52,
+   -5, -45, -11, 28, 57, 17, -7, -36,
+   -52, 3, -27, -12, -6, -62, 29, -71,
+   8, 27, -31, 21, -38, -58, 3, -12,
+   -69, 8, -54, 91, 22, 90, -11, -126,
+   23, -9, 67, -44, -3, -30, 22, 47,
+   21, 1, 38, 21, -85, 1, 26, 2,
+   46, 8, 3, 22, -1, -39, -28, 26,
+   -3, 16, 26, -35, -22, 34, -17, -26,
+   88, 30, 3, -19, -8, 9, -48, 0,
+   16, 4, -72, 67, -24, 57, 56, 23,
+   31, -7, 28, -23, -40, -14, 32, 7,
+   -1, -40, -9, -60, -2, 62, -16, -14,
+   -36, 28, -52, 0, 10, -1, 11, -2,
+   -31, -89, -3, -55, 1, -29, -83, -16,
+   -5, -39, -15, -41, -48, -20, -35, 49,
+   -31, -10, -2, 9, 15, 21, 62, -19,
+   -1, -42, -21, 34, -31, -1, -3, -18,
+   45, 17, -55, -10, -20, 6, -31, 21,
+   6, -14, -20, 7, -101, -5, -45, -1,
+   16, -21, -6, -12, 21, 73, -9, -17,
+   4, -2, 15, 9, 23, 7, 10, 20,
+   6, -11, 36, 30, 14, 22, 6, -5,
+   15, -31, -55, 13, -15, 7, -14, 38,
+   15, 22, -8, 36, 12, 6, -5, 56,
+   13, -31, -24, -16, 46, 25, 30, 6,
+   40, 0, -8, 100, 9, 43, 26, -86,
+   -47, 54, -119, -18, 36, 49, -38, 53,
+   27, -6, 122, -25, 125, -18, -108, -111,
+   91, -10, 87, 10, -120, -28, 21, -126,
+   -12, 42, -3, -76, -2, 58, -32, 75,
+   -13, -59, 22, -50, 89, -16, 23, 16,
+   1, 7, 89, -10, -19, 12, 54, -25,
+   -6, 124, 71, -13, 10, -7, -49, 9,
+   -10, -69, 76, -118, 33, -44, 41, -3,
+   -6, -46, -59, -126, 8, -76, -79, -34,
+   7, -93, -2, -25, -25, -50, 16, -66,
+   -41, -77, -14, 16, -83, 22, -12, -68,
+   7, 44, -2, -45, 22, 20, 45, 15,
+   21, -47, -71, 69, 25, -9, -5, 45,
+   127, 14, 21, -32, -18, -30, -3, -75,
+   22, -22, 19, -49, -3, -43, 4, 6,
+   2, 17, 36, 23, -77, 14, -36, -25,
+   34, -12, 37, 7, 83, -56, -14, 6,
+   -3, 2, 12, -40, -61, 48, 10, 96,
+   95, -19, 0, -15, 17, -66, -30, -28,
+   63, -81, 15, -126, -18, 36, -47, 7,
+   45, 17, -43, 13, -36, 35, 22, -9,
+   -44, 77, 0, 22, 4, -2, -17, 25,
+   -45, 82, -101, -5, -40, -5, 15, 32,
+   -23, -45, -51, 1, -57, -11, 120, -7,
+   91, 9, -24, -42, 37, 100, 80, 20,
+   -5, -125, 88, 11, -124, 42, -35, -127,
+   120, -123, 41, 125, -124, 21, -76, 81,
+   29, -11, 61, 15, -120, -115, -17, 79,
+   111, 74, 20, 63, 127, -42, 28, -26,
+   -30, -116, -71, -73, 98, 110, -114, 3,
+   -48, 2, 4, -64, -40, 36, -14, 18,
+   61, -16, -36, 12, 27, -11, -32, 124,
+   -34, 65, -51, -43, 53, 45, -44, -6,
+   13, 33, -25, -15, -119, -51, -26, 124,
+   118, 16, 18, -121, -33, -58, -79, 26,
+   18, -77, -12, -95, -79, -38, 23, 32,
+   83, 125, 17, 77, -32, 127, 104, -56,
+   -18, -9, -80, 17, -125, -127, 123, -61,
+   38, -1, -78, 22, 10, -21, 3, 126,
+   -125, 123, 49, -47, -126, 89, -113, 127,
+   89, -29, 15, -62, -128, 44, -5, 120,
+   123, 120, -15, 105, -126, 111, 25, -127,
+   -122, -127, 115, -65, 122, 24, -2, 38,
+   -88, 20, 20, 70, -7, -77, 50, 25,
+   73, 117, 20, 114, 93, -52, -125, 118,
+   -43, 127, 5, -8, 36, 22, 122, 42,
+   -128, -120, -123, -52, 127, -124, -125, 96,
+   1, -35, -76, 62, 60, 46, -102, -5,
+   70, 66, 13, 127, 2, 126, 77, 88,
+   -63, -91, 103, -7, -110, -128, -45, -127,
+   100, 109, 18, -51, 61, -18, 47, -127,
+   57, 13, 46, 23, 127, 127, 127, -52,
+   -66, -24, -68, -1, -126, -15, 10, -2,
+   33, -61, -127, 119, -75, 127, -34, 126,
+   127, -61, -1, 60, -9, -42, 22, -123,
+   19, -41, 50, 27, -46, -3, -75, -12,
+   -75, -55, -90, -99, 14, -2, 90, 47,
+   -35, -108, -78, 34, -27, -77, -21, 38,
+   32, 34, -115, 84, -62, -14, 33, 18,
+   30, -122, -3, -3, 10, 99, -7, 4,
+   51, 92, 9, 69, 23, 125, -60, -19,
+   25, -26, 3, -62, 92, 116, 20, -11,
+   86, -34, 105, 25, -98, 17, 45, -54,
+   -70, 58, -114, 38, 5, -51, -36, 56,
+   121, -55, 21, 68, -127, 76, -35, 28,
+   28, 49, -113, -30, 112, 125, 82, -12,
+   -68, 55, 17, 64, 14, 53, -25, 124,
+   -44, 84, -70, -60, 80, 35, -66, 88,
+   -25, 77, 107, -63, 125, 48, -101, 127,
+   -7, -50, 13, -12, -124, -109, -53, -87,
+   66, 81, -51, -79, 76, 8, -8, 106,
+   -26, -85, -113, 88, 99, -40, 84, 62,
+   106, -125, -124, 3, 75, 127, -22, 2,
+   76, -47, -128, 46, 127, -71, -40, -127,
+   -117, 9, -22, -92, -60, 72, 35, -128,
+   -74, 77, -117, -95, 123, 49, 127, -9,
+   8, -125, -58, -67, 127, 126, -128, -20,
+   126, 115, 122, 110, -127, 116, 0, -118,
+   -102, -126, -34, 56, -125, -87, 81, 19,
+   -95, 42, -4, -101, 80, -10, -62, -21,
+   -55, 127, 77, -128, -126, 127, -127, 109,
+   -95, -128, -80, -126, 81, 70, 122, 69,
+   -70, 101, -24, -22, -4, -43, -126, 77,
+   -51, -54, -122, 123, 41, -5, -50, -63,
+   4, -12, -103, -126, 115, 127, -88, -32,
+   -79, -125, -83, 95, 61, 56, 48, 127,
+   121, 60, 75, -3, 35, 22, 64, 126,
+   127, 83, 121, 46, -72, 117, -127, -83,
+   -128, 34, 31, 49, 121, 46, -53, -51,
+   6, 27, -124, -4, -119, 72, -119, -126,
+   57, -83, -61, 31, 83, -76, -119, -96,
+   -55, 101, -62, -128, 3, -36, -42, -61,
+   57, -124, 59, 25, 2, -116, 127, 95,
+   36, 127, -84, 80, -34, 35, 21, 49,
+   9, -12, -17, -39, -91, -24, 30, 40,
+   -26, 79, 30, -57, 23, 78, 114, 55,
+   -66, -34, 42, 64, -40, 105, 36, 127,
+   -43, -122, 35, -60, -73, 83, -44, -15,
+   102, -126, 35, 37, -122, -50, -44, -5,
+   -76, 10, 6, -89, 16, -70, 24, 79,
+   -41, -98, 100, 72, 108, 7, -71, 27,
+   25, -12, -128, -9, 127, 103, 50, -60,
+   -82, -39, 77, -46, 32, -1, 85, 124,
+   -9, 2, 43, 28, 122, 0, 1, 59,
+   13, 38, 120, 7, 113, 15, -10, 101,
+   79, 88, 121, -126, -126, -76, -41, -122,
+   -13, 79, -126, 102, 73, 126, -56, 99,
+   -58, 32, 127, 17, 12, -99, -120, -127,
+   101, 96, 79, -104, 126, -50, 115, 43,
+   -105, -50, 127, 71, -126, 73, 16, -29,
+   -94, 103, -126, -96, -113, -63, 87, 127,
+   -124, 94, -67, -123, 124, 19, 22, 76,
+   19, -111, 15, 87, -128, 123, -19, 88,
+   53, 120, 127, -116, -117, 108, 100, -99,
+   -127, 127, 119, 12, 103, 51, -121, 21,
+   -90, -126, 85, 98, 13, 27, -42, -102,
+   123, 26, 127, -91, 118, 121, 126, 123,
+   -117, 121, -41, -124, 82, 127, 118, 126,
+   -124, 100, 64, -62, 127, 88, -22, -89,
+   8, -63, -114, -125, 35, -42, 55, 68,
+   19, 37, 23, -127, -123, -126, -6, 121,
+   56, 73, -64, 121, 9, 88, -25, -115,
+   125, -42, 126, -91, 84, 18, 115, -79,
+   126, -17, -24, -83, -128, 42, 54, -75,
+   -104, 123, -108, 60, 50, 18, -121, 34,
+   -84, 97, -128, 27, -125, 70, -43, 20,
+   73, 19, -80, 115, 79, 16, -87, -107,
+   -17, 2, 103, 71, -17, 126, -55, -108,
+   -33, -115, 121, -5, -33, -4, 30, 125,
+   72, -64, -12, 124, -8, -38, 127, -63,
+   -48, -40, 101, -67, 123, -19, -55, 6,
+   -23, -29, 79, 62, -46, 69, -119, -44,
+   13, -33, 114, -126, 3, -106, 103, 126,
+   -17, -6, 27, -46, 125, -29, -76, -6,
+   54, -89, 10, 119, -125, 52, 123, -19,
+   -44, -9, 47, -35, -101, -59, 59, 81,
+   -64, -43, 22, 13, 38, 22, -42, 24,
+   45, 52, -89, -117, -17, 87, -94, -37,
+   -119, 13, -30, -59, -127, 68, -2, 48,
+   -125, -27, 97, 17, 67, 63, -19, 32,
+   10, -54, -39, -1, 32, -26, 27, 16,
+   25, 84, -34, -37, -117, -64, -103, -77,
+   -126, 90, -102, 55, 84, 20, 91, -32,
+   15, -7, 126, 41, 82, 40, 100, 30,
+   125, -39, 13, -67, 57, -126, 121, 105,
+   113, 45, -128, 31, 127, 124, -79, -49,
+   39, 21, -123, 65, -29, 46, 53, -105,
+   -36, -16, -61, -124, -92, -114, 123, 7,
+   -32, -126, -28, -53, -102, 18, -124, -62,
+   -102, 13, 127, -128, 127, 80, 49, -16,
+   -105, -128, 49, -34, 74, -127, -53, -61,
+   -111, -96, 67, 25, 16, -22, -23, -123,
+   -125, -59, 53, 111, 104, -127, 123, 38,
+   15, 68, -3, -125, -74, -119, 43, 124,
+   -128, 127, 89, 27, -20, 30, 127, -63,
+   3, 17, -13, 125, -39, 106, 32, -32,
+   75, -42, 17, 127, 102, -128, -70, 126,
+   46, -10, 82, 99, -86, -44, 96, 51,
+   81, 34, 88, -105, 58, -40, 46, 126,
+   -20, 78, 80, 16, -40, 116, -70, -69,
+   -8, -25, 45, 87, 3, 30, -40, -8,
+   11, 127, -127, -13, 75, 125, 38, -110,
+   63, 21, 15, -42, 55, -115, -72, -117,
+   121, -120, 0, -119, -17, -125, 34, -128,
+   35, -1, 31, -92, 69, 62, 16, 17,
+   -120, -37, -50, -17, -2, -1, 84, -33,
+   -58, -67, 125, 38, 127, 11, -128, -99,
+   86, 40, -104, 34, -14, -39, -29, 39,
+   126, 21, -85, -105, 122, -127, -72, 114,
+   -62, -25, -91, 122, 16, -80, -14, 20,
+   127, -108, -22, -13, -125, -1, -80, -48,
+   37, -16, 11, 114, 30, -9, -3, 12,
+   -70, 31, 31, 22, -94, 120, -57, 3,
+   -75, 120, -115, 33, -101, 67, -81, 67,
+   -114, -11, -116, -57, -81, -109, -109, -123,
+   -125, -27, 36, 1, -2, -127, -9, -14,
+   -37, -125, -104, 14, -49, 14, 49, 8,
+   94, -43, -17, 95, -126, 2, -110, 113,
+   -127, 118, 30, 3, -13, 15, 13, 30,
+   -52, 105, 75, 31, 123, -91, 122, -7,
+   116, -52, 70, 126, -127, -128, 78, 116,
+   -64, 108, 82, -51, -127, 64, -120, 127,
+   -111, -64, 90, 112, -29, -76, 5, 126,
+   3, -11, 64, 94, -117, -32, -4, 54,
+   -20, -121, -85, 115, 115, 126, 15, 80,
+   44, -27, 8, 126, 125, 119, -92, 39,
+   -122, 111, -52, -20, -111, -64, 1, 90,
+   -63, 85, -71, 1, 123, 85, 57, -124,
+   -14, 112, -73, -104, -90, 127, 127, -76,
+   -55, 21, 85, 125, 103, 55, 120, 126,
+   -127, 109, 116, -125, 25, 53, 127, 96,
+   -47, 50, -102, 43, -3, 127, 126, -4,
+   117, -4, 7, 124, -121, -48, 59, -6,
+   125, -98, -83, -123, -113, 17, -123, 82,
+   113, -122, 125, 60, 92, 14, 22, -127,
+   33, 18, 1, -21, -82, 105, 38, -75,
+   98, 107, -89, 2, 123, -83, -55, 91,
+   -64, 127, -69, 91, 126, 74, 33, -85,
+   112, 5, -35, 29, -69, -36, 35, 126,
+   34, 126, 121, 124, -61, 103, -123, -128,
+   15, 78, -124, -56, 109, 52, 52, -56,
+   -83, -28, 107, -128, 23, -79, 126, 126,
+   -4, -46, 38, -115, -109, 119, 16, 87,
+   11, -76, 54, 118, 13, 45, -55, 18,
+   94, -69, 14, 127, -120, -126, -98, 87,
+   100, -42, -44, 42, 18, 121, -128, -47,
+   -51, 3, -87, -28, -115, -46, 104, 89,
+   -88, 83, -112, 49, -17, -13, 43, 30,
+   9, -76, -111, 55, -41, 21, -4, -53,
+   -119, -16, -128, -9, -10, 46, -7, -50,
+   -124, -100, -27, -44, -26, -56, 23, 7,
+   -128, -2, -65, 45, 80, -107, -102, -14,
+   -8, -57, -120, -19, -58, -15, -43, 50,
+   -32, -13, 8, 108, -127, -66, -54, 123,
+   -127, 127, -85, 110, -108, 118, 6, -42,
+   -116, 108, 95, -23, 94, -2, -45, -126,
+   -34, -124, 43, -124, -73, -122, 127, 90,
+   64, 49, 126, 43, 127, -126, 122, 127,
+   33, -67, -128, 100, -125, -9, 92, -128,
+   -123, -21, -65, 125, -93, -125, 124, -119,
+   64, 6, -116, 4, -127, -86, 125, -128,
+   80, -89, -127, 127, -29, 125, -13, -71,
+   -86, -128, -124, 126, -53, -37, -117, -4,
+   -47, 126, 21, -98, 125, -45, 52, -124,
+   42, -22, -128, 120, 124, 126, 11, 127,
+   56, 99, 31, 121, 127, -122, 125, 116,
+   -117, 43, -65, -27, 124, 57, 126, -96,
+   3, -42, -67, 28, 30, -102, -45, -56,
+   4, -42, 69, -127, 43, 61, -79, -127,
+   -6, -13, -96, -5, 49, 37, -57, -100,
+   126, 36, 61, 22, 55, -114, -58, 116,
+   91, 30, 78, -48, 103, 16, -42, -58,
+   108, -17, -21, 126, -120, -127, 77, -19,
+   71, 126, -10, 49, 36, -44, -23, -110,
+   -34, -112, -26, -118, 48, -65, 23, 125,
+   24, 124, 84, -127, -69, 54, -124, -126,
+   82, -2, -118, 14, -2, 31, 122, 33,
+   124, -57, 44, -128, 22, -51, 111, 126,
+   20, -121, -30, 108, 115, -58, -62, -106,
+   -116, 61, -25, 127, -120, -82, 29, -117,
+   -103, 90, -62, 125, 63, 52, -41, 12,
+   75, 12, -100, 73, 41, 69, 4, 95,
+   -87, 74, -72, -65, -85, -36, -29, -60,
+   24, 65, 123, -34, 31, 88, -53, 15,
+   11, 34, 46, 4, -101, -97, -37, -85,
+   -14, 19, -16, -101, 76, 38, 8, -11,
+   -127, -103, -103, 118, 48, -27, -69, -78,
+   -77, -125, 29, 24, 10, 30, 32, -111,
+   -35, 23, -41, -96, 41, -22, 14, -44,
+   123, 12, -116, 100, -121, -22, -116, -36,
+   -123, 118, 73, -45, -81, 37, 113, -28,
+   77, 30, -21, 108, 124, 41, 57, 108,
+   67, 31, 13, -125, -51, 75, 2, 97,
+   -9, 59, 58, 67, -128, 100, -124, 126,
+   126, 56, -22, 53, -18, -73, -125, 123,
+   -124, -23, -1, 6, 68, -29, 117, -125,
+   45, -120, -37, 117, 126, -6, 121, 121,
+   -24, -124, 6, 52, -121, 108, -76, 0,
+   -89, 124, -125, 107, -128, 92, -42, 127,
+   -127, -81, 64, -33, 127, 82, 91, -127,
+   -121, -43, -35, -127, -124, 127, 90, -49,
+   -122, -100, -18, 125, 41, 60, 118, 127,
+   59, -77, -105, -119, 18, 102, -70, 71,
+   -65, -37, 54, -127, 39, 107, 124, 55,
+   79, -30, 72, -128, -104, 110, -52, -127,
+   64, 26, 64, 90, -124, -42, -123, -66,
+   -34, 19, -13, 126, 34, 55, 39, -100,
+   62, -24, -69, 95, 42, -32, 37, -114,
+   120, 117, 6, 126, 124, -16, 120, -34,
+   -122, 126, 49, 125, -14, -72, 116, -125,
+   33, -128, -111, 122, -102, 121, 18, 123,
+   -83, 124, -78, 31, 95, 55, -96, -127,
+   -123, -3, -125, -1, -47, 121, 8, -47,
+   -127, -23, 124, -124, 39, -128, 127, 127,
+   2, -69, 1, 24, -40, -45, 30, -51,
+   -66, -13, 8, 43, -2, -35, -85, 127,
+   -1, -41, 117, 125, 79, 91, -56, -106,
+   -66, -89, -49, -22, -28, 95, -128, 9,
+   -128, -106, 40, -43, -128, 77, 20, 85,
+   -38, 78, 31, 18, -94, 57, 8, 127,
+   119, -33, -38, 5, -18, -77, 115, -60,
+   -43, 46, 122, -43, -22, 19, 11, -34,
+   -127, -56, 27, 88, 110, 49, 71, 127,
+   76, 57, 127, 40, -62, 22, 43, -123,
+   -109, 46, -105, -97, 124, -20, -8, -88,
+   -109, -47, 30, 55, -127, 47, -42, 11,
+   -43, 121, 21, 48, -126, -78, -29, 53,
+   21, -18, -128, 39, 51, -76, 113, 20,
+   127, -23, 40, 115, -27, 123, 94, -71,
+   -69, 39, -26, 8, 127, -42, 107, 126,
+   11, 42, -87, -39, -77, 73, -35, -121,
+   -77, -64, -72, 121, -109, -47, -64, 58,
+   -87, 70, -36, 122, -51, -42, 48, -53,
+   -36, -121, -22, 124, 115, 47, -78, 74,
+   -108, -128, -90, 52, -70, -120, 29, -61,
+   49, 112, -20, -51, 69, 27, 34, -127,
+   125, -124, -81, 53, -127, 114, 127, 6,
+   -89, 124, -16, 34, 116, -58, 17, 124,
+   80, -77, -128, 122, 76, 19, -127, -55,
+   59, -2, 7, 109, 22, -8, 76, 26,
+   -51, -97, -77, -30, 36, 127, -123, -125,
+   114, 39, -15, 127, -40, 127, 91, -88,
+   3, 13, 109, -29, 123, 32, -123, 51,
+   127, -120, 1, 57, 96, -128, 25, -107,
+   76, 127, 114, 122, 3, -17, -2, 13,
+   -45, 126, 52, -37, 127, -37, -17, 7,
+   33, -121, -120, -51, -51, -55, -122, 43,
+   -127, 87, -124, -124, 79, -121, 16, -125,
+   -75, 9, -106, -47, -127, 127, -107, -8,
+   127, -66, 123, -122, -13, 76, 127, -94,
+   116, -126, -23, 117, 49, -93, 14, -71,
+   43, -121, 47, 94, -123, 127, 18, 63,
+   -94, 112, 122, 38, 34, 4, 119, -121,
+   9, 4, -125, 92, -122, -100, 123, -6,
+   -65, 80, 77, -116, -124, 41, -119, 37,
+   61, -15, 119, 116, -15, 46, -40, 103,
+   47, 62, 122, -37, -17, -17, 43, -4,
+   -29, -30, -87, -9, 116, -60, 10, 25,
+   -125, 74, -124, 55, -8, -105, 37, -122,
+   68, -128, -126, -21, -104, -117, 36, -120,
+   -21, -126, 9, -31, 9, -20, 52, -18,
+   67, -69, -124, -31, -126, 121, -46, 18,
+   -86, 89, 87, -75, -72, -68, 127, 23,
+   -50, 70, 89, 76, 104, 46, 111, 19,
+   47, -26, 28, 125, -66, -78, 48, 96,
+   -7, 64, 108, 65, -125, -9, -122, 126,
+   118, -78, 69, 127, 22, -36, 93, 127,
+   87, -26, -70, 48, 31, -42, 3, 115,
+   87, -120, -43, 121, 53, 8, -127, 124,
+   -117, -125, 20, 78, 48, 127, -126, -73,
+   -80, 124, 97, 127, -126, -29, 123, 123,
+   -61, -20, 86, 18, 120, 112, -3, -128,
+   17, -125, 57, -128, -122, 79, -10, -125,
+   121, -16, 50, -39, 125, 33, 17, 124,
+   108, -121, -81, -49, -122, 105, -123, 71,
+   -72, 97, 87, -125, 127, -121, -15, -31,
+   72, 75, 82, 126, -122, 108, -71, -60,
+   87, 2, 127, 12, -92, 53, -127, 119,
+   -76, -12, -128, 0, 118, 3, 127, 56,
+   93, -120, 14, 24, -1, -122, -5, -80,
+   67, 126, -62, 27, 124, 123, 7, -34,
+   -79, 127, 102, 122, 113, -40, 67, -3,
+   126, -109, -38, 87, -68, 1, 22, 124,
+   -126, 121, 125, -35, 31, 120, -74, -128,
+   -59, 79, 116, -54, -124, 127, -55, -120,
+   -123, 35, 116, 98, -35, -127, 105, -127,
+   62, 73, -10, 53, -19, 116, -116, 83,
+   10, -119, 123, 83, 127, 62, 118, -122,
+   -45, 40, 11, -31, -57, -52, -14, -119,
+   -29, 105, 62, -127, 120, -112, -29, -51,
+   -94, -33, 33, 86, -49, 80, -6, 72,
+   -110, 93, 2, -34, 107, 113, 127, 121,
+   50, -70, -127, -64, 31, 13, 96, -31,
+   -25, 45, 126, -17, -9, 57, 80, -3,
+   -104, 35, 106, 33, -46, -124, 83, -89,
+   -76, -73, 58, -37, -46, 59, 79, -125,
+   -67, -36, -62, 50, -19, -95, -52, -112,
+   56, 26, 110, -89, -92, -75, -100, 46,
+   16, 31, 3, -127, -118, -47, -126, -8,
+   -28, 54, 125, 30, -126, 13, -33, 99,
+   -38, -119, -107, 9, 117, -127, 93, 61,
+   65, -72, -118, 15, 119, 80, 66, 127,
+   -100, 126, 127, 28, 98, -77, -35, -19,
+   -54, 6, 35, 124, -127, 127, 56, -80,
+   -68, -49, -1, 126, 62, -50, 51, 53,
+   -22, -75, -72, -22, 70, -62, -67, 48,
+   86, -125, 14, 126, 14, -76, -11, -76,
+   -97, 127, 44, -87, -120, -21, -63, -125,
+   -2, -106, 51, 39, 70, 94, 55, -124,
+   27, 15, -123, -47, 88, -128, -113, 81,
+   61, -127, -105, -124, 15, -84, -8, -90,
+   -48, -25, -8, 77, -62, -127, 86, 19,
+   26, -118, -46, -26, 109, 10, -19, 127,
+   -68, 127, -88, 69, -121, 27, -102, -15,
+   3, 26, 19, -55, -14, -5, 58, 11,
+   15, -114, -121, 114, 126, -117, 56, -37,
+   31, 123, 19, 127, 116, -65, -118, -122,
+   -24, 127, 26, -67, 127, -128, -24, 12,
+   127, -33, 13, -51, -13, 127, -114, -34,
+   -126, 127, -87, -119, -123, -59, 11, -123,
+   -24, 49, 123, 122, -80, 127, -69, -44,
+   127, -70, 51, 124, 117, -124, -48, -128,
+   118, -60, -67, 124, 116, -31, 39, -94,
+   -21, -78, -18, 4, -128, 6, 77, 69,
+   108, 126, 82, -127, -23, -118, 56, -125,
+   -127, 24, -121, 29, 53, -117, 123, 38,
+   -25, -12, 55, 62, -67, 87, 44, -51,
+   70, 17, 109, 44, -69, 125, 104, 125,
+   62, 59, 114, 25, -124, -30, 124, 32,
+   41, 6, 126, -55, 1, -41, 58, 1,
+   -108, 26, -31, 32, 58, 85, 123, 41,
+   68, -15, 85, -80, -127, -103, 44, -113,
+   125, 5, 10, -36, 117, -77, 112, -111,
+   78, 51, 74, -112, 47, 95, -113, 121,
+   16, -48, 127, 17, 7, -125, 126, 25,
+   -113, 103, -126, 126, 119, 61, 31, 4,
+   -43, -119, 27, 125, 88, 48, -125, 84,
+   -57, 32, 21, 15, -127, -127, -126, 127,
+   110, -28, 90, 88, -49, 71, -51, 120,
+   82, -43, -75, 96, 125, 19, -4, 125,
+   -61, -33, -35, -85, 122, -24, -111, 124,
+   -110, -126, -44, 111, 59, 27, -126, -49,
+   52, 102, -95, -120, -127, 121, 50, 50,
+   93, -4, -20, -56, 127, -35, 28, -128,
+   112, -59, 127, -127, -123, 104, 100, -128,
+   111, -71, -6, -114, -71, 72, 120, 127,
+   127, -117, -17, -19, -122, 39, -66, 124,
+   -99, -18, 33, -89, 124, -107, 29, -103,
+   126, -7, 53, 124, -117, 122, 15, 124,
+   125, 42, 125, -53, 64, 7, -33, 127,
+   -126, 106, 69, -18, 78, -48, 57, -124,
+   -86, -127, -116, -85, -74, -66, -119, -24,
+   15, 22, 9, -82, -5, 52, -2, 8,
+   -105, 127, 21, -47, 53, -128, 107, -12,
+   97, -30, -37, 121, -68, 127, 74, -2,
+   -58, 126, -124, 68, 105, -53, -126, -60,
+   -48, 51, 127, -116, -124, 127, 17, -124,
+   -123, 41, 127, 127, 3, -127, -101, -121,
+   83, -111, 111, 125, -126, 62, -5, 49,
+   94, -87, -51, 62, 117, 126, 124, -95,
+   5, 93, 122, -124, -117, 74, -53, -118,
+   -27, -46, 127, 12, 112, -68, -93, -109,
+   108, -119, 52, -7, -71, 97, -123, 121,
+   38, 68, 85, 2, -87, 123, -124, 126,
+   69, -26, -57, 14, 127, -46, 89, 25,
+   -115, -27, 56, 124, -34, -14, 2, 73,
+   -128, 4, 118, -94, 117, -77, 124, 76,
+   -34, 3, 16, -42, -77, 45, 11, -116,
+   -32, 101, 24, 127, 92, -92, 126, -98,
+   -124, 111, 36, -113, -127, 98, -10, -10,
+   124, -93, -12, -116, 103, -126, -115, -47,
+   -126, 113, 34, 66, -55, -13, 95, 119,
+   -49, -43, 74, 127, 121, 124, -117, 25,
+   75, 117, -123, -9, 123, -118, 127, 126,
+   -86, -46, 99, 102, -126, 54, 126, 125,
+   91, 21, -86, 103, -127, -121, -35, 127,
+   -127, 65, -37, 123, -117, -56, 44, 58,
+   -123, 91, 13, 124, -8, -44, -123, -101,
+   127, -125, -85, -1, -63, -9, -111, -100,
+   -19, 118, -20, -94, -127, 7, -123, -128,
+   -18, -124, 108, 125, 109, -49, -76, -77,
+   11, -28, -126, -85, 126, 108, 116, 118,
+   79, -72, -39, 23, -60, -87, -29, -102,
+   79, 81, -14, 124, -64, -120, 109, 61,
+   -122, -77, 102, 127, -16, 119, -113, 103,
+   119, 118, -72, -82, -31, 127, 121, -49,
+   -13, 123, 124, -42, 124, 2, -74, 94,
+   12, -125, 44, -74, 17, -127, 103, -14,
+   11, 58, 17, -13, 62, 86, -127, 79,
+   -122, 121, -23, -87, 91, -128, -123, 100,
+   127, -85, -62, -127, -23, 121, -13, -69,
+   55, 94, 123, -119, 116, 111, -17, -35,
+   -77, -5, 126, 28, -31, 126, -42, -54,
+   127, 49, 86, 127, 60, 25, -128, -116,
+   62, -110, 113, 118, -26, 0, 69, -75,
+   116, -31, -115, -2, -112, -127, -61, -5,
+   -122, 44, -119, 117, 87, 26, -50, -115,
+   -122, 70, -110, -94, 65, -23, 125, 33,
+   -125, 103, 91, 123, 109, 123, -17, -13,
+   126, 46, 17, -102, -33, 125, 117, 120,
+   97, -82, 109, 14, 24, -24, 63, 16,
+   62, -3, 61, 42, 71, -38, -73, 72,
+   -127, 70, -68, -67, -36, -7, 90, -125,
+   124, -122, -117, -24, -78, 0, 113, -19,
+   -60, 52, 68, -7, -126, 10, 79, -22,
+   57, 22, 100, 126, -15, 66, -113, -85,
+   122, -128, -12, -58, 127, -125, 64, 105,
+   45, 107, 117, 88, 29, 62, 122, 106,
+   -83, -121, 7, 44, -97, -125, -127, 72,
+   2, 28, 118, 9, -124, 79, -57, 99,
+   38, 127, 43, 90, 26, -34, -59, -125,
+   118, 43, 24, 55, 127, 96, 49, 1,
+   -116, 106, -5, -90, 115, -48, -53, 127,
+   -39, 18, 125, -54, -124, 116, 18, -58,
+   -91, 68, 102, -8, -22, 110, -86, 88,
+   90, 121, -46, 19, -45, 113, -34, -119,
+   -68, 5, 3, 18, 106, 20, -127, -119,
+   127, -91, -45, 24, 119, -61, -69, 81,
+   56, -77, 104, -58, -107, -100, -46, 15,
+   45, 62, 108, 71, 6, 114, 11, 8,
+   -31, 9, 126, 127, 125, -86, -42, 15,
+   125, 81, 127, 89, -90, -53, -112, 12,
+   -34, 81, 79, 0, 127, -1, -124, 16,
+   1, -32, 127, -32, -92, -125, -77, 3,
+   85, 110, -18, -15, 51, 54, -83, -19,
+   -93, 65, -22, -3, -98, -128, -29, -84,
+   121, -125, -29, 27, 46, 119, 37, 125,
+   -96, 49, 119, 85, -40, 1, 92, -96,
+   34, 18, 15, 44, 58, 127, -27, 20,
+   10, 124, 44, -13, -108, 17, -128, 61,
+   37, 11, 73, 61, -28, 27, -96, 67,
+   29, 99, 53, -51, 125, 119, -59, -12,
+   -60, 30, 67, 121, -43, 64, 103, -11,
+   -20, 31, -81, 55, 66, -127, -39, -19,
+   -13, -122, 98, 69, 32, 46, -127, 111,
+   -36, 113, -72, 70, -65, 56, -125, 94,
+   47, -82, -117, -111, -58, -128, 32, -10,
+   51, 13, 99, 31, -27, -36, -52, 24,
+   33, -97, -98, -31, -86, -125, 122, -52,
+   -86, -107, 50, 57, -82, -124, 16, -93,
+   -108, 84, -52, -10, -92, -85, 83, 3,
+   -110, 127, 116, 76, -43, -42, -103, -111,
+   121, -120, 8, 37, 50, -122, -115, 34,
+   -22, -84, 127, 9, -19, 36, -126, -34,
+   -39, -118, -15, -112, -3, -80, -69, 77,
+   23, -73, -112, 44, 100, 51, 99, 38,
+   -112, -5, -69, -56, -120, 123, 113, 72,
+   84, -64, -51, -123, -90, -59, 3, -105,
+   -110, -3, 47, 117, -20, 123, 112, -7,
+   -120, -52, 85, 24, -36, -128, -51, -27,
+   -5, -90, -6, 103, -54, -89, -40, -116,
+   -42, 125, 111, -22, -126, 7, -93, -127,
+   -119, -67, -94, 127, 123, -118, -108, 27,
+   15, 1, -17, 23, 127, 45, -125, 124,
+   50, -68, 58, 47, 127, -125, 14, 56,
+   -51, -30, 36, 126, -113, 105, 119, -25,
+   -32, -43, 115, 44, -104, -57, -23, -33,
+   19, 22, -20, 26, 22, -95, -29, 9,
+   -32, 7, 107, 35, -47, -29, 2, -21,
+   55, -126, -90, -128, 3, -125, 127, -33,
+   74, 54, 121, 60, -77, 126, 65, -21,
+   18, 4, -70, -126, 48, -127, -20, -9,
+   30, -125, -125, 88, 58, 121, -69, -63,
+   -31, 125, -14, -125, -46, 26, 28, 20,
+   -115, -72, -120, 27, 127, 125, -71, 25,
+   123, -28, 122, -126, 61, -29, -124, 62,
+   101, -93, 47, -2, -120, -59, -97, 46,
+   -69, 127, 6, 74, -125, 83, -87, -123,
+   -30, 20, -74, 55, 71, -83, -123, 125,
+   36, 3, 4, 112, 64, -120, -18, 126,
+   37, -91, 63, 52, 32, 81, -71, -76,
+   50, -12, 17, 120, -105, 23, -106, 78,
+   -96, 60, 75, 57, -50, -11, -40, -65,
+   -111, 11, 25, 87, -97, -31, 35, -34,
+   -56, -8, 3, -122, -9, -39, 123, -127,
+   -127, -29, -124, 63, 84, 102, 44, 11,
+   80, -56, 41, -102, -13, 125, -95, -55,
+   50, 51, 5, 112, 100, -48, -17, -53,
+   0, -112, 14, -30, 61, -7, 32, 38,
+   89, -125, 122, 40, 35, 100, -1, -37,
+   -13, -73, -25, -37, -89, 126, -121, 18,
+   79, 76, 115, 21, -7, -54, -50, 124,
+   118, 100, -118, 92, -4, -117, 90, -107,
+   104, 40, 81, 16, 119, 93, 61, 126,
+   -127, -40, 25, -36, 16, 66, -5, -27,
+   -101, 57, 95, 114, 79, 13, -41, 5,
+   -12, -38, 13, 71, -55, -57, -76, 127,
+   16, 73, -31, 33, 75, -76, 25, -125,
+   3, -5, -61, -35, 119, -22, -114, 50,
+   -50, -59, 87, 69, 118, 70, 8, 126,
+   11, -30, 126, 18, -125, -39, 16, 37,
+   60, -120, 119, -20, 7, 26, 99, 12,
+   -38, -1, 103, 119, -22, -6, 24, -110,
+   111, 24, 110, -125, 24, -1, -85, -9,
+   42, -51, 113, 123, 6, -111, -37, 19,
+   1, -124, 127, -127, -32, -128, -104, 13,
+   89, -4, 92, -92, -114, 0, 120, -62,
+   2, -13, -36, -33, 127, -128, 51, -19,
+   52, -126, -54, 119, 51, 77, 123, 127,
+   40, 86, 77, 38, -15, -69, 28, 8,
+   13, -2, -127, -96, 121, 29, -1, 55,
+   67, 75, 127, -127, -41, -27, -108, 68,
+   18, -11, 40, 8, 127, 25, -52, 2,
+   -110, 18, 115, -70, 8, 117, -87, 22,
+   36, -16, -110, -14, 66, -54, -49, -57,
+   -7, -99, 42, -27, 28, 39, -64, 35,
+   18, 12, 109, -111, 77, 22, -120, 56,
+   -4, 75, -39, -102, -47, 18, -115, 121,
+   -22, -81, 54, -81, 13, -11, -125, -28,
+   112, 17, -74, 118, -5, -31, -6, 11,
+   -116, 28, -69, 10, 84, -121, -62, 46,
+   -127, 4, -33, -28, -9, 54, -25, 29,
+   -11, 105, -113, -124, 45, 17, -91, 74,
+   -107, -40, -89, 49, -43, -51, -70, -43,
+   69, -31, -34, -49, 48, 47, -119, -48,
+   -125, -50, 121, -15, 10, 5, 127, 117,
+   -19, -128, 30, -103, 81, -22, -28, 61,
+   4, -62, -11, 4, 24, -97, 47, 38,
+   -42, -59, -125, -49, 83, -15, -119, 102,
+   29, 89, 53, 116, -109, -95, 73, 16,
+   -17, -54, 3, 127, 63, 10, -61, -111,
+   104, -15, 41, 62, -43, -32, 74, 72,
+   -93, 125, 127, 122, 116, -115, -14, -91,
+   -63, 51, 14, 11, 121, 104, -33, -8,
+   -103, 31, -44, 81, -31, -79, -49, -29,
+   -39, -3, -87, 20, 37, -94, 26, 62,
+   20, 16, 49, -6, -43, 103, 37, 7,
+   -17, -122, -15, 10, -111, 13, 99, 14,
+   -95, 8, 69, 69, -64, -25, -8, -96,
+   113, 112, -15, -99, -127, -12, -31, -113,
+   16, 111, -12, 24, 116, -6, 10, 96,
+   -34, -63, 49, -14, 2, -126, 9, -20,
+   -10, 108, 2, 123, 127, -69, 40, 90,
+   -54, 12, -50, 125, 87, -106, 31, -127,
+   -36, -88, -26, -116, 70, -125, 15, -72,
+   104, 120, 74, -88, 105, 13, -20, -12,
+   -124, -40, -87, 6, 108, -125, -87, -1,
+   23, -39, -76, -87, -60, 62, -108, 28,
+   -31, 31, 9, 24, 79, 15, 17, 78,
+   4, -47, -12, -39, -14, 71, -17, 70,
+   69, 58, 30, 42, 60, 32, -16, -26,
+   71, 13, 101, 3, -99, 44, 98, 28,
+   -24, 14, -24, 125, -59, -29, 122, 16,
+   -35, 53, -36, -38, -4, 84, 2, 61,
+   -3, 115, 59, -85, 49, 73, 16, 85,
+   97, -92, -1, 41, 18, 6, 30, 9,
+   37, -26, 115, 9, 110, -22, -50, 45,
+   -127, -50, 4, -9, 54, 63, -55, -18,
+   -125, -12, 20, -4, -99, -8, -23, -42,
+   19, -9, -42, 3, -61, -11, 26, -10,
+   2, 43, -33, 44, 3, 105, 124, 26,
+   -21, 48, 21, 117, -63, -118, -126, -44,
+   -42, -122, -75, 127, -42, 25, 122, -75,
+   -122, 28, 18, -27, -127, 19, 15, -122,
+   27, 80, -13, -18, 25, 89, -16, -52,
+   127, 126, -89, 96, 45, 117, 82, 81,
+   103, -33, 84, -124, 69, -51, -113, 5,
+   80, 123, 125, 98, 61, -86, 59, -46,
+   -44, -29, -62, 124, -125, -118, -13, -10,
+   -13, 81, 103, 107, -24, -45, 82, 26,
+   -27, -34, -81, -41, -41, 10, -18, 40,
+   -128, -125, 44, 25, -80, -1, 3, -85,
+   63, 37, -6, 94, 47, -80, -12, -3,
+   -21, -17, 125, -28, 48, 19, -35, 46,
+   -12, 37, 3, -10, -51, 28, -70, -62,
+   22, 66, 34, 58, -70, 67, -106, 91,
+   -94, -12, 83, 111, 8, 114, -17, 8,
+   9, -20, 1, 113, 99, 69, 19, 35,
+   -26, -128, -54, -10, -41, 96, 71, -93,
+   12, 44, 3, 22, -21, -5, -18, 126,
+   42, 48, 85, 12, -54, 2, 25, -52,
+   93, -128, -26, 78, 123, -25, 27, 8,
+   -118, 50, -3, 75, 40, 35, -11, 107,
+   -13, -93, -13, -24, -24, 72, -85, 10,
+   -61, 51, 116, -100, 21, 67, 118, 36,
+   -71, 37, -20, 46, 16, 54, 126, -93,
+   -15, -5, 33, -114, -11, -5, -88, -11,
+   -24, 54, 82, -66, -44, -128, 82, 87,
+   -122, -51, -60, 123, -29, 33, -125, -13,
+   -59, -8, -22, -4, 37, 24, 28, 123,
+   93, 86, -66, -12, 44, 124, -106, 51,
+   104, 19, 49, 82, 77, 11, -109, 58,
+   -5, 19, -73, -56, 127, -74, -12, 120,
+   -118, 1, 121, 116, 20, 70, -15, 53,
+   84, -47, -27, -18, -123, -17, -3, -23,
+   5, 28, 68, 120, -65, -33, 111, 122,
+   -113, -45, -19, 18, -119, -90, -126, -33,
+   45, 36, 18, -35, -121, -10, -102, 37,
+   127, 112, -95, 44, -126, 59, 102, -81,
+   114, 85, 3, -50, 81, -52, -54, -32,
+   -13, 39, 66, 41, -88, 120, -123, 125,
+   87, 23, 67, -53, -43, -25, -125, 63,
+   41, -105, 35, -39, -108, -123, -34, -41,
+   10, 88, -7, -31, -127, -113, 31, -59,
+   -92, 62, -127, 96, 109, 127, -11, -27,
+   115, -71, -40, 45, 123, -40, 38, 60,
+   124, 17, -60, 95, 117, -23, -9, 64,
+   100, 126, -40, -56, -7, 126, 24, -125,
+   51, 37, 26, -115, 76, -51, -91, -29,
+   -75, -116, 72, -87, -71, 80, 63, -95,
+   -1, -24, -57, -32, 25, 105, 14, 20,
+   60, 74, -128, 126, -29, 92, 43, 127,
+   -75, 126, 116, 127, -10, 116, -126, -25,
+   -37, 26, 58, -92, 27, 67, -43, 56,
+   -78, -32, 76, 71, 73, 48, 76, -92,
+   -126, 55, 24, 55, -104, -18, -58, 24,
+   109, 30, -128, 115, 66, 7, 31, -85,
+   116, 85, 106, -53, 39, -33, 61, 10,
+   100, 79, -13, -5, 126, 25, -21, -98,
+   -74, -41, 7, 12, -8, -85, -121, 65,
+   -4, 11, -9, -89, -30, 5, -39, 49,
+   -44, 90, 100, -83, 42, 120, -24, 53,
+   122, -114, 2, -83, 38, 17, -31, -43,
+   -38, -56, -67, 26, -49, -48, -121, -41,
+   -125, -1, -3, 59, -77, 9, 76, -55,
+   -53, -11, 1, -38, 51, -112, -76, 101,
+   -24, -9, 3, 24, -48, 67, 26, -52,
+   47, 7, -24, 44, 82, 13, -47, 50,
+   3, -97, 39, 56, -18, 49, -69, 126,
+   -14, -3, 82, 6, -75, -18, 4, 14,
+   127, 57, 76, 23, -53, -7, 34, -45,
+   -100, -94, -97, 12, -32, 20, 51, -53,
+   -17, -77, 69, 103, -124, -112, -95, -122,
+   -18, -116, 35, -110, 79, 109, 38, 56,
+   -124, -13, -87, -86, -43, 54, 108, -108,
+   -6, -11, -68, -11, -124, 8, 122, -7,
+   86, -111, 117, -127, 65, 107, 63, -126,
+   -127, 126, 30, 42, 6, 53, 123, 32,
+   126, -71, 20, 32, 125, -125, 96, 126,
+   -106, -48, -125, 80, -127, -106, -105, 69,
+   -98, -126, -119, -20, 80, -128, -73, 55,
+   119, -127, 92, -12, -77, -12, -38, 35,
+   -117, 44, 3, 37, 126, 119, 28, 61,
+   -72, -127, 24, -24, 120, 123, 3, -127,
+   78, 61, 40, -128, -28, 71, 14, -47,
+   81, -111, -57, -127, -40, -40, -121, 36,
+   -116, -127, 4, -79, -20, 81, 62, -107,
+   24, 16, 105, -8, -38, -85, 127, 90,
+   13, -106, -15, 74, -68, -56, 4, 47,
+   -89, 28, 89, -68, 9, 40, -25, 32,
+   -33, -119, -21, 25, -74, 68, 112, 19,
+   -77, 30, -5, 108, -118, 27, 120, -127,
+   100, 0, 41, 67, 14, 43, 100, -107,
+   77, 127, 70, 48, -106, 52, 17, 40,
+   90, -11, -68, 34, 111, 77, -35, -56,
+   43, -126, -49, -31, 6, 5, -117, -74,
+   12, 49, -63, -68, -36, -97, -117, -123,
+   85, 112, -38, 124, -126, -110, 104, -106,
+   80, 125, 86, 60, 52, 32, -20, -15,
+   -102, -5, 23, -9, -31, -126, 121, 41,
+   -88, -97, 33, -20, -65, -10, 112, 45,
+   -85, 58, 114, -32, 25, -2, 35, 59,
+   -99, -22, -40, -71, 0, -58, 85, -58,
+   18, -55, 60, 0, 88, 9, -14, -56,
+   18, -34, -91, -18, -34, -14, 7, 122,
+   -121, -126, -35, 95, -40, 105, 6, -2,
+   -46, 115, -125, 52, -117, 17, 2, 9,
+   25, 52, 18, -112, -84, -71, 62, -97,
+   22, -80, 9, -22, -75, -104, 127, 76,
+   6, -127, -120, -104, 17, -86, -54, 98,
+   -127, -111, 57, -126, 68, -122, 13, -98,
+   -49, -125, -1, -118, 121, -37, 35, -111,
+   -122, -113, -125, -51, -90, 78, -124, 127,
+   1, 58, 17, -123, -51, -81, -122, 34,
+   -32, -66, 14, -113, -126, -124, 127, -126,
+   -15, 92, -95, -121, -100, 20, -3, 89,
+   -9, 127, -48, 15, 2, 126, -55, -10,
+   -20, 125, -109, -32, 68, -119, -15, 17,
+   -46, -10, -100, 13, 127, 120, 48, -121,
+   126, 46, 71, -76, -75, -89, -34, -122,
+   65, -21, 43, 11, 102, -128, 44, 127,
+   126, -120, -19, 81, 127, -1, -125, 31,
+   -36, 127, 43, -60, 66, -99, -127, -50,
+   -56, -80, 119, -22, -2, -84, -125, -17,
+   -65, 126, -63, 105, 51, 86, 46, -123,
+   -13, 106, -54, 117, -9, 119, -13, 30,
+   83, -121, 126, 17, 63, 7, -22, 60,
+   7, 26, 18, -23, -39, 8, -63, 43,
+   124, -39, 40, -27, 18, -42, -31, -90,
+   -51, -113, -51, -16, -62, -33, 96, 39,
+   -76, -78, 110, -49, 51, 11, -10, -72,
+   31, -110, -73, 2, 24, 66, -125, -49,
+   -45, 39, -128, -12, -117, -28, -23, 75,
+   1, -122, -13, -63, 104, -44, 14, 3,
+   -78, -25, -6, 104, -81, 123, -66, -96,
+   -47, 70, 127, -107, -124, -66, -102, -94,
+   127, -121, 32, 89, 53, -21, -128, 8,
+   24, 56, 36, -59, -70, -73, -43, 45,
+   -127, 73, -117, -35, -53, 34, -128, 2,
+   83, 127, 1, -45, -14, 6, -44, 6,
+   -34, 117, 127, -34, 64, 6, -43, -61,
+   -80, 0, 15, -29, 11, 22, -23, 38,
+   -124, -30, 108, -78, 25, -54, -57, 48,
+   -40, -108, -97, -94, -117, -47, 18, -96,
+   1, -120, -69, -84, 10, 126, -128, 112,
+   -14, -18, 14, -34, -119, 28, -105, -100,
+   113, 49, 30, -47, -70, -123, -4, -125,
+   15, -115, -128, -3, -110, 126, -42, -126,
+   -11, 21, -63, -123, 127, 121, 108, -80,
+   -45, 86, 60, 64, 115, 115, -91, 25,
+   18, -121, -117, 62, 47, 9, -125, 67,
+   4, 88, 106, -127, -125, 123, 69, 125,
+   -81, -126, 119, -88, 3, -128, 8, 66,
+   -42, -127, -17, -15, 4, 17, -97, 22,
+   127, 98, -114, -19, -67, -17, -90, 78,
+   -35, 114, -21, 110, 119, 122, 64, -90,
+   -8, -70, -94, -59, -49, 127, 0, -54,
+   55, -21, -113, -33, -127, 70, -100, -24,
+   10, 41, -76, -64, -52, -126, -46, -20,
+   19, 49, -126, -33, -127, 127, 125, -110,
+   -4, -56, -70, 45, 3, 18, -122, 91,
+   11, 102, -39, -53, -126, 111, 71, 33,
+   116, -105, -106, 12, -7, 30, 37, 47,
+   -92, 42, 9, -121, -45, 23, 87, -20,
+   125, 117, -13, -126, 56, -16, 28, -90,
+   -35, 77, 58, -10, 63, -67, -24, 45,
+   -29, 8, -31, 119, 0, -13, 100, 122,
+   -33, -50, -34, -18, -19, -58, -124, -22,
+   35, 29, -128, -89, 8, -86, -4, 0,
+   44, -114, -47, -32, -62, -35, -123, 19,
+   -72, -84, -60, 7, 110, -19, 45, 70,
+   -9, 120, -125, 9, -74, -97, 71, 17,
+   3, -40, 1, -103, -94, -33, 127, -31,
+   -12, 10, 0, -4, -20, -75, 28, 84,
+   -57, -15, 43, 17, 29, 40, 60, -9,
+   118, 58, 27, -89, 42, 75, -106, 122,
+   31, -114, -114, 43, -35, -90, 95, 116,
+   -106, 6, -22, 100, 37, -72, 11, -6,
+   87, -88, -126, -119, -31, 44, 29, 59,
+   50, -60, 32, 75, -115, -18, 28, 126,
+   -62, -126, 14, -21, -34, 126, 122, -74,
+   -36, -38, 106, -119, 116, 92, 58, -81,
+   -121, -78, -127, 6, 127, -70, -97, 112,
+   63, -105, -11, -40, 127, -23, -127, -127,
+   26, -34, 75, -124, -28, -115, 78, 28,
+   -30, -124, -41, 15, 120, 127, 81, 72,
+   -35, -114, -38, -93, 72, 71, 82, 57,
+   12, -8, 73, -126, -127, -39, 101, -95,
+   -92, 126, 54, -30, 11, 26, 34, 74,
+   39, -127, -22, -123, 113, 23, 23, -14,
+   -123, -73, -35, -128, 100, -122, -80, 32,
+   23, -118, -40, -53, 48, 18, 21, -42,
+   -104, -22, -127, -19, 55, -57, 64, -89,
+   24, 11, -1, -12, 99, 10, -52, 41,
+   37, -123, 62, 123, -4, -57, -51, 127,
+   -45, 121, 124, -39, -113, 10, 7, -111,
+   53, 55, 112, -124, 51, -85, 30, 7,
+   6, -4, -50, 21, -124, 110, -126, -6,
+   2, -71, 115, 13, 0, -64, -43, 8,
+   8, 7, 4, -49, 82, 10, -2, 125,
+   124, -58, 68, 29, 9, 37, 78, -86,
+   60, -34, 85, -106, -52, 19, 4, 86,
+   118, 46, 113, 20, -103, 113, -75, -57,
+   -54, -65, 86, -16, 12, 68, -90, 84,
+   -37, -31, 23, -37, 25, 26, -54, 32,
+   -27, -121, -26, -67, 124, -24, 20, 124,
+   -75, 74, -28, 14, -29, -19, 33, -36,
+   87, -2, 5, 6, -121, -17, -1, 106,
+   -20, -19, -17, 97, 15, -25, -53, -9,
+   -60, -34, 61, 35, 11, 84, 11, 0,
+   30, 127, 17, -43, 41, 93, -12, 75,
+   -71, -54, 47, 11, -47, -57, 40, 8,
+   -36, -36, 127, -120, 17, 57, -15, 38,
+   -101, 55, -72, -43, 32, -73, -12, -22,
+   -126, -20, -95, -17, -53, 23, 3, -53,
+   -9, 27, 122, -5, -25, -40, 18, -32,
+   -5, -20, 11, -64, 61, 68, 127, 20,
+   -41, 35, -22, 26, 127, -102, -55, -57,
+   51, -21, -45, 34, 47, 0, 85, -3,
+   -10, 42, 43, 11, -34, -10, -4, -67,
+   -89, 92, 25, -62, 7, 20, -117, -41,
+   103, 70, 34, 45, 38, 53, 26, 64,
+   39, 51, 27, -70, 42, -36, -14, 35,
+   -6, 121, -25, -23, -105, -44, 127, -64,
+   23, -10, -53, 70, -63, -23, 5, -15,
+   28, 85, -51, 101, -71, -41, 53, -52,
+   -26, 19, -46, -64, 25, -21, 16, -13,
+   -63, -68, 26, 52, -61, 116, 24, -88,
+   15, -20, 7, -3, 1, 97, -16, -16,
+   -100, -103, 4, -8, 88, -89, 24, 51,
+   -12, -6, 30, -32, -69, 20, 82, 18,
+   -8, -41, -56, -67, -111, 92, -77, 70,
+   -30, 5, -3, 11, 26, 10, -115, -30,
+   -17, 26, -30, 41, 84, -27, -1, -11,
+   -8, -125, -21, 12, -35, 124, -13, -48,
+   -13, 16, 9, 4, -75, 24, 11, 37,
+   -42, -11, 26, 22, 29, 54, -9, -94,
+   107, 112, 57, 18, 84, 97, 26, 0,
+   -121, 6, 28, -1, -55, 54, 9, 46,
+   68, -21, 55, -1, 6, -47, -28, 9,
+   -24, -28, 61, -45, -102, 114, 43, 45,
+   -37, 11, 6, -15, -102, -70, 49, -125,
+   -8, -16, -53, -24, 68, -6, 21, -13,
+   10, -28, 120, -54, 2, -77, 27, -62,
+   -112, -104, -14, -59, 45, 35, -117, 7,
+   34, -28, -63, 26, 59, -14, -43, 22,
+   36, -86, 18, -16, -12, -58, 15, 51,
+   56, -73, 24, -13, 67, -15, 125, -13,
+   12, 8, -56, 44, 62, -77, -10, 76,
+   -122, 87, -27, 21, 19, -39, 10, -2,
+   44, 12, 113, 31, -11, 37, 16, -19,
+   56, -53, 9, -43, -25, -13, 45, 34,
+   -45, -35, -10, 35, -118, -33, -126, 1,
+   122, -37, -21, -15, -128, -125, -29, 24,
+   -123, 21, -47, -36, -66, 35, -20, -9,
+   39, -50, -122, -2, -18, -12, -59, -24,
+   14, -87, 109, -46, -67, 51, -125, 66,
+   72, -13, 57, -112, -116, -42, -110, 68,
+   2, 43, -76, 34, -61, -114, -60, -81,
+   -33, 1, 33, 37, -36, -10, 35, 24,
+   -19, -17, -40, -32, 52, -28, -48, -13,
+   -89, -91, -66, -35, 126, -27, 1, -50,
+   74, -60, -17, 16, 75, 44, 28, 105,
+   103, -4, -9, -43, -76, 6, -10, -124,
+   39, -27, 19, -47, 25, 126, -44, -4,
+   -116, 22, -32, -49, -106, -95, 111, 15,
+   -10, 4, -121, -20, 84, 76, 70, 18,
+   -57, -23, -92, 69, 1, 70, 78, 13,
+   -21, 114, 58, -20, 23, 50, -28, -16,
+   -6, 118, -67, 127, -22, -79, -37, -31,
+   -40, 108, 42, 11, 79, -41, 59, -23,
+   -115, 11, 14, 38, 86, 3, -25, -3,
+   -102, 3, -113, -43, 38, -54, 30, -90,
+   120, -72, 9, -87, 49, 90, 49, -20,
+   14, 11, 15, 33, 115, 125, -12, -68,
+   -59, 21, 6, 27, 21, -127, -77, 20,
+   -45, -1, -46, -77, 57, 105, -77, 2,
+   29, 78, -35, -104, -75, 96, -50, 52,
+   22, -21, 38, -73, -14, -3, -49, 23,
+   -65, -13, -112, 95, 125, -120, -123, 96,
+   -74, 108, -5, -20, 17, -19, 67, -17,
+   -54, -47, 81, -7, -32, -10, 25, 7,
+   -5, 111, -128, -36, 51, -55, -1, -18,
+   3, -20, 20, -32, 31, -37, -24, -31,
+   -70, -95, -17, -1, 40, 73, 33, 10,
+   88, 45, 71, -24, 27, -47, -13, -78,
+   121, 63, -127, 26, -21, 104, -3, 31,
+   4, -21, 26, -38, -37, 42, -10, -3,
+   119, -15, 11, -119, -128, -128, 0, -11,
+   54, -109, 37, -96, -107, 55, 37, -17,
+   -97, 11, -88, 70, -29, -31, 6, -52,
+   -73, 17, 120, 69, -17, 12, 107, -10,
+   -23, 16, 117, 122, -47, 4, 61, -86,
+   -47, 27, -100, 50, 114, -92, 95, 43,
+   47, -31, -34, 107, 99, -127, 53, -11,
+   -26, 57, -16, 57, -97, 0, -113, 59,
+   6, -10, -99, -2, 60, -63, 5, 8,
+   -43, -15, 9, 39, 126, 28, -4, -74,
+   27, 34, 19, -71, 83, 78, 57, 37,
+   -98, -72, 33, -26, -103, 82, 29, -71,
+   20, -4, 1, -49, -127, -85, 24, -37,
+   28, 30, -39, -24, -15, 40, -6, -61,
+   -46, -39, -108, -26, -21, 17, 63, -61,
+   77, -29, 41, -20, 52, -49, 117, 2,
+   -35, 9, 127, -66, 7, 22, -10, -42,
+   -69, 14, 59, -106, 12, -87, 6, 2,
+   -13, -123, -94, 32, -116, -76, 35, 17,
+   -76, 21, -7, 53, -18, -13, 13, -110,
+   -30, -21, 109, 73, -24, 75, 4, -34,
+   46, 127, 78, 40, -84, -15, -66, -7,
+   96, -14, -58, -47, -12, 71, -4, -6,
+   -87, 28, 76, 0, 7, 84, -58, -34,
+   -45, 30, -84, 9, -125, -43, -25, -34,
+   -40, 127, 80, 72, 114, 107, 16, 60,
+   87, 12, 127, -29, -12, 84, 126, -86,
+   92, 127, 91, 86, -123, -91, 126, -45,
+   43, -103, -21, 60, 14, -15, 25, 50,
+   14, 19, 92, 25, 5, 6, -26, 50,
+   -18, -37, 120, -81, 46, 3, 31, -6,
+   -66, -107, -13, 73, -31, -94, -54, 7,
+   -58, -20, -16, 77, -30, -40, 127, -61,
+   69, -21, -66, -24, 48, -55, 9, -25,
+   -31, 44, 127, -17, -54, 71, -20, -28,
+   -42, 5, 6, 23, 33, 19, 4, -21,
+   74, -106, 32, -98, -119, -89, 102, 46,
+   -29, -50, -95, -115, 127, -34, 32, 10,
+   17, -23, -12, -69, 35, -7, -1, -76,
+   64, 37, -114, 59, 83, 34, -22, -61,
+   3, -31, -100, -120, -88, 22, -128, 127,
+   -11, 10, -100, -107, -122, -6, -49, 8,
+   -38, -28, -45, -83, -31, -20, -39, -1,
+   -63, 124, -22, -31, -33, -6, 23, 5,
+   -3, 38, -123, 73, -23, 104, 25, -27,
+   79, 115, -48, -44, -125, 25, -1, -67,
+   20, 117, -35, 112, 86, 15, 23, -111,
+   122, 21, 9, -7, -128, -2, 0, -125,
+   31, 42, 11, 37, 122, -119, 29, 51,
+   -31, 51, 46, 30, 127, -110, 29, 49,
+   -3, 30, -75, -21, -42, -29, -127, -49,
+   -43, 123, 102, -16, -106, -28, -127, -83,
+   -74, 24, -9, 126, 3, 36, 107, 67,
+   11, -18, 54, 77, 18, -28, -15, 15,
+   45, 69, 80, -47, 112, 82, -104, 2,
+   -24, 20, -10, -79, -39, 1, -27, 30,
+   13, -1, -77, -10, -3, -106, -6, 13,
+   -32, 123, -16, 27, 1, 90, -64, 12,
+   -96, -33, -61, 65, 53, 102, -41, -44,
+   51, -47, 65, -23, -9, 61, -81, -9,
+   -21, 61, -58, -48, 122, 58, -54, 6,
+   20, -112, -35, -104, 10, 122, 100, -69,
+   -51, 57, 52, -29, 90, 74, -115, 18,
+   35, -127, 124, 62, -9, -5, -82, 13,
+   8, -63, -42, 3, 15, -23, 23, 41,
+   -51, 87, 123, -36, 11, -34, -74, 38,
+   -5, 36, -52, -74, -4, -2, -122, 19,
+   -66, -11, 10, 50, 75, 4, -25, -1,
+   -12, 57, 108, 84, -38, 29, 123, 62,
+   -18, 39, -120, 14, 13, 78, -1, 2,
+   -82, 7, -93, -78, 5, 75, 48, 44,
+   -60, -33, -5, -48, -20, 39, 28, -86,
+   -25, -69, -28, -102, -103, 121, -120, 18,
+   108, 65, -62, -40, -128, 0, -49, 31,
+   37, 29, 88, 33, -96, -59, 23, -45,
+   59, -105, 84, -63, 11, -41, -13, -27,
+   -54, 83, 64, 117, 14, 5, 76, -112,
+   16, 94, -61, 28, 101, -56, -9, 2,
+   89, 23, -78, 58, -49, -22, 60, 18,
+   34, 19, 62, -93, -27, -47, 76, 4,
+   -33, -35, -12, -23, 87, -43, -2, 21,
+   26, -49, -68, 22, 18, -60, -43, -31,
+   32, -28, -93, -11, 11, 26, -45, 7,
+   -40, 6, -76, 86, -30, -79, -77, -34,
+   1, 47, -34, -83, -124, 57, -35, -17,
+   18, -1, -36, -18, -123, -119, 29, -2,
+   -4, 37, 34, -67, 84, -80, 49, 7,
+   89, -123, -127, 43, -55, 46, 66, 100,
+   -6, -31, -122, 81, -34, -71, -58, -15,
+   -15, -24, -18, 80, -24, -68, 28, -12,
+   71, -76, -32, 2, 12, -120, -24, -20,
+   -96, 15, 3, -88, 51, 0, 37, 37,
+   106, 73, -17, -23, 97, 39, 36, -1,
+   -88, -45, 87, -78, 75, -119, 4, 5,
+   -1, 11, 23, -18, -33, 114, -36, 90,
+   27, 91, 10, -15, 16, -90, -52, 16,
+   59, 41, -38, 19, -127, -91, -45, 26,
+   55, -61, 37, 45, -19, -10, -65, 127,
+   9, -44, -84, -79, -16, 69, 43, 1,
+   -63, 118, -123, -1, 121, 12, 53, -90,
+   15, -42, -19, -33, -62, 32, -24, -57,
+   36, 66, 77, 13, -37, 17, 97, 59,
+   -61, -126, -19, 35, 83, 91, 21, -18,
+   39, 78, 58, 55, -29, -44, -38, 20,
+   29, -26, -127, -84, 0, -7, 127, 70,
+   22, 24, -56, 58, 36, 44, 73, -33,
+   121, -85, 115, -106, -93, 82, 64, 26,
+   -16, -59, -24, 4, 24, 33, 36, 20,
+   -8, -45, -22, -75, 35, -15, 40, -21,
+   56, 80, -77, 36, 108, 90, 84, 6,
+   13, -67, -29, 56, 89, -24, 71, 17,
+   64, 6, -75, -10, 72, 28, -54, -70,
+   31, -39, -30, -110, 72, -21, 48, 86,
+   15, -127, 26, 65, 8, 30, 15, -17,
+   -89, -85, 112, 20, 21, 8, 30, 74,
+   -68, 40, -30, -64, 22, -14, 5, -10,
+   38, -1, 109, 73, -46, 107, -58, 5,
+   -67, -123, 0, 111, 124, 3, -68, 11,
+   -126, 50, 49, -53, 104, 20, 36, 116,
+   0, 15, -16, 18, 84, 47, -72, -84,
+   -26, 1, -74, -20, 122, -40, 47, -29,
+   96, 63, 20, -36, 101, 31, -46, 21,
+   31, -50, 5, 84, -42, 11, -117, 37,
+   -63, 86, 91, 112, -10, -12, -16, -41,
+   62, 16, -95, 25, -48, 30, 117, 0,
+   -1, -5, -57, 101, -6, -59, -52, -8,
+   -34, 83, -6, 51, 9, -95, 98, 18,
+   -74, 8, 1, 34, -13, 22, -58, -128,
+   36, -40, 5, -26, -49, -89, -14, -40,
+   -93, -92, 82, 25, -26, -60, 68, 6,
+   49, 18, 33, 18, -10, 15, 22, -7,
+   -63, -58, -52, 16, 35, 55, -32, 27,
+   12, -24, -19, 74, -21, -34, -124, -19,
+   -3, 112, -41, -117, -94, -91, -46, -116,
+   -108, -42, 59, -46, -61, -109, -66, 37,
+   -67, -47, -91, -74, 3, -23, -4, 30,
+   95, 75, -76, -122, -123, -9, -82, -68,
+   32, -48, 124, -81, -125, -90, -99, -127,
+   -102, 69, -12, 85, -60, -43, -126, -79,
+   -112, 59, 24, 54, -126, 127, -82, -18,
+   39, -126, 9, -53, -124, -19, 17, -49,
+   -86, 24, 1, 12, -80, 75, -35, 48,
+   2, 11, -26, 68, -119, 50, -9, -46,
+   17, 39, -95, -25, -60, -8, -60, 9,
+   121, 125, 2, -83, -99, 50, -47, -38,
+   -123, -42, -124, 50, -125, -40, -14, 102,
+   125, -88, -42, -127, -6, -27, -98, 58,
+   41, -21, -9, -39, -31, -78, -66, 115,
+   112, 8, -25, -105, 2, -84, 10, -13,
+   -67, 3, 105, 108, -28, 84, 37, -92,
+   -2, 116, 24, 68, -97, -127, 16, -125,
+   -73, 23, 105, 44, 127, -21, -67, -40,
+   -42, -88, 48, -32, -26, -105, 6, 36,
+   -56, 27, 18, -3, -97, 54, -30, -113,
+   0, -127, -23, -88, -123, 19, 36, -56,
+   -61, 4, 41, -61, 57, -128, -38, -68,
+   -3, 125, -10, 11, 4, -7, -10, 85,
+   38, 126, 5, 57, -124, -99, -94, -18,
+   -72, 79, -30, -97, -124, 123, -43, 46,
+   -33, -6, -88, 12, -6, 30, -76, -6,
+   27, -26, 47, -67, 126, -58, -23, -16,
+   -47, 15, -71, -97, 2, -127, -62, -124,
+   82, -60, 5, 13, -56, -50, -13, 75,
+   43, 12, -1, -127, -4, 30, 67, -38,
+   -77, 75, 10, 32, -127, -59, -24, 33,
+   4, 0, -108, 11, -89, 0, -86, 60,
+   1, -18, -127, 0, -122, -54, -48, 20,
+   -90, 102, 121, -86, 127, -25, 79, -13,
+   2, -54, -29, 66, 0, 15, -94, 24,
+   -33, 114, -12, 127, 66, -7, -11, 69,
+   -37, 38, 20, -58, 2, -71, -25, 69,
+   -119, -63, 60, -63, 41, -43, 24, -10,
+   82, 5, -29, -26, -125, -52, -45, -21,
+   54, 3, -4, 8, 39, -75, -83, -127,
+   -67, 16, -77, 72, -12, -10, 104, 14,
+   -127, 46, 22, 5, -4, 127, -34, 15,
+   72, 126, -8, -83, -10, 6, -57, -44,
+   -109, 35, 11, 2, 35, 9, -24, -29,
+   -12, -7, -114, -40, -127, 120, -48, 10,
+   48, -33, -39, -124, -119, 113, -63, 22,
+   123, 126, 33, 61, -11, -13, 95, 6,
+   87, -56, -122, 7, 127, -63, 37, -95,
+   125, 68, -30, -92, 28, -13, -105, 91,
+   -20, 21, 87, -58, 17, -20, 34, 113,
+   126, -26, -61, -127, 54, -11, -61, 11,
+   -29, -53, 71, 24, 60, 26, 76, 43,
+   15, 117, 12, -57, 25, -126, 12, -47,
+   -55, -2, 19, -43, 105, 115, -14, 12,
+   -58, -56, 47, -16, 56, 68, -7, 6,
+   -75, 57, -51, -4, 17, 21, 56, -30,
+   -2, -120, 20, -39, -127, -1, -1, 53,
+   -50, 29, 50, -27, -69, -128, -78, 37,
+   -85, 125, 5, 11, 66, -36, 22, -1,
+   124, 10, -50, -88, 116, -67, -3, -12,
+   24, -20, -22, -59, 89, 112, -19, 24,
+   -31, -46, 125, -7, -126, -6, 23, 24,
+   8, -26, 62, -88, 126, -77, -34, 7,
+   -39, 61, -4, -30, 3, -128, 12, -124,
+   -13, -83, -1, -24, 102, -6, -25, 91,
+   125, -3, 16, -125, -69, 34, 42, -43,
+   -29, -32, 59, -34, 13, -4, 10, 92,
+   74, -39, -79, -27, -7, 39, -51, 123,
+   -6, 20, -28, 75, -126, -46, -42, 30,
+   0, -29, 10, -4, 112, -19, 46, -10,
+   -48, -19, -20, 43, 65, 13, 16, 16,
+   84, 75, -39, 127, 125, 93, 105, 0,
+   75, 124, -31, -114, -48, -13, -12, 98,
+   126, -104, 66, 25, -9, -110, -95, -94,
+   -20, -118, 70, 121, -128, -118, 78, -29,
+   -34, 2, -9, 40, 107, 20, -81, -126,
+   -38, -42, -112, -55, 65, 123, 118, 56,
+   -46, 19, 17, 18, 127, 93, -47, 66,
+   121, 114, 8, -128, 123, 92, -37, -45,
+   25, -79, 19, 46, 32, -70, 11, -41,
+   94, -35, -79, 12, -49, 63, 46, 115,
+   -44, 26, -7, -122, -61, 74, 105, -22,
+   76, -70, 86, 120, 70, -84, -31, 53,
+   83, 65, -115, -72, 125, -90, 108, -105,
+   -128, 101, 74, 122, -66, -108, -126, -17,
+   -38, 17, 4, -15, 121, 115, -38, -43,
+   -120, 13, -117, -100, 100, 113, -122, -12,
+   45, -127, 60, -124, 68, -27, 48, 110,
+   85, 15, 111, 10, 58, -82, 102, 59,
+   42, 95, -111, -125, -126, 69, 120, 126,
+   -40, 50, -80, -103, 60, 112, 69, -19,
+   26, 41, -24, -6, 58, -115, -35, 94,
+   86, -62, 110, -22, -127, -14, -76, 121,
+   0, 4, -16, -3, -87, 1, 65, -34,
+   -26, 124, 37, 59, 40, -106, -13, -16,
+   104, -126, -5, -76, 126, -3, 77, 40,
+   120, -28, -39, 116, 120, 48, 90, -22,
+   -127, 96, 5, -88, -128, -95, 20, -19,
+   -50, 29, 25, -60, 127, -3, -80, -76,
+   6, -60, -43, -127, -59, 51, 9, -50,
+   -9, -110, -56, 61, 0, -17, 49, -34,
+   50, 8, 24, -126, -125, 35, 56, 109,
+   83, -18, 55, -122, 122, 119, 79, -115,
+   116, -8, 65, 59, 51, 127, -27, 119,
+   36, 27, 106, 122, -127, -21, 39, 96,
+   -88, 91, -31, 116, 56, -97, 27, 14,
+   -63, 99, 51, 117, -126, -98, -50, -16,
+   120, 3, 45, -125, -98, -31, 65, -116,
+   -66, -76, -82, -54, -110, 5, -127, 23,
+   16, -73, -127, -41, 22, 69, 39, 106,
+   97, -35, 124, 52, -128, -31, 14, 37,
+   -12, -85, -2, -79, 16, -61, -127, 8,
+   39, 57, 38, 111, -67, 77, -127, -21,
+   -46, -46, -102, -57, 74, 87, 53, 26,
+   48, -123, -71, -78, 31, 78, -82, 100,
+   61, 38, 79, 94, -39, 127, 1, -20,
+   -33, -22, 59, 37, 73, 42, -53, -77,
+   14, -23, -96, 53, -46, -61, -117, -22,
+   68, -111, 17, -62, -8, 53, -34, -78,
+   -126, 49, -9, 69, -127, -32, 24, 111,
+   -125, -124, 19, 125, 34, -6, -122, -13,
+   39, -5, -123, -21, -52, -8, -83, -15,
+   -126, 65, -41, -66, 114, -37, 85, 18,
+   -71, 69, 45, -19, 64, -2, 31, 125,
+   -45, 4, 114, 101, -82, 67, 19, -5,
+   25, 122, -117, 67, -122, 29, -20, -13,
+   -124, 12, -87, -125, -16, -33, 32, 30,
+   -22, 0, 24, 34, -52, -122, -35, 127,
+   -92, -21, -95, 12, -85, 50, 29, -36,
+   27, 19, -103, 117, 38, 64, 124, -63,
+   7, 50, -1, 24, -79, -44, -40, 113,
+   -125, -107, -85, 124, -124, 121, -90, 14,
+   22, 124, 71, 48, -121, -38, 22, -11,
+   -53, 4, -128, 52, 48, 18, -21, -123,
+   -123, -15, 32, 14, 127, -13, 33, 67,
+   -28, -32, -77, -127, 46, -14, -101, -63,
+   -47, 41, 3, -58, -118, -102, 62, 32,
+   -38, 4, 5, -25, -27, 58, -40, 60,
+   -44, 109, -120, -32, -56, 10, 105, -112,
+   -25, 43, -50, 9, -64, -52, -126, 73,
+   -37, -15, -71, -32, -85, 81, -48, 10,
+   16, 45, 17, -74, 95, -48, 78, -27,
+   67, 28, -4, -6, -13, -99, 8, 36,
+   69, 13, -54, 60, 54, 78, -28, 127,
+   -18, 47, -10, -88, -4, 13, -26, -23,
+   -98, -124, 92, 29, 43, 127, -19, 78,
+   9, 22, -21, 17, -126, -16, -30, 6,
+   31, -128, 22, 100, -21, -46, -126, -98,
+   92, -2, 38, -82, -51, -25, 92, 75,
+   -48, -51, -20, 88, -113, 80, -68, 45,
+   68, 127, 32, -74, -89, 120, -93, 49,
+   115, 51, 9, 8, 8, 19, 3, -34,
+   -73, -45, -72, -83, 51, -44, 62, -126,
+   -36, 2, -16, 82, -127, 118, -21, -19,
+   -49, 33, 8, 18, 33, -8, 39, -57,
+   -82, 14, 30, -39, 121, 5, 36, -23,
+   -103, -124, -124, -20, 38, 69, -104, 54,
+   30, -34, 92, -23, 51, 27, 59, -54,
+   -16, 20, 67, -60, 85, -46, 8, 27,
+   25, -62, -110, 31, -111, -49, -95, 116,
+   -40, -29, 25, -36, 56, -10, -12, 88,
+   -34, -43, -76, 3, 10, 90, -111, -103,
+   -31, -38, 19, -100, -115, 124, -75, 18,
+   -37, 44, -38, -21, -7, -13, 56, 75,
+   -120, 25, -128, -127, -38, 10, 41, 26,
+   -25, -43, 103, 117, -50, -44, 118, 7,
+   47, -69, -2, 46, -53, 122, 28, -92,
+   23, -14, -19, -16, 26, 54, -102, -94,
+   -95, -83, -104, -31, 43, -127, -85, 18,
+   72, 126, 121, -100, -118, 100, 7, 55,
+   8, 28, -53, 22, 127, -104, 124, 99,
+   11, -52, -32, -2, -57, 45, -80, -96,
+   -26, 32, -10, 72, 121, 127, -49, 40,
+   12, 1, 9, -75, -55, -30, 126, -84,
+   2, -70, 59, 93, -117, 64, 86, -33,
+   -8, -74, 64, -4, -49, 42, -59, 89,
+   7, -48, -19, -15, 43, -66, -81, 3,
+   -35, -123, 45, -64, 84, 4, -23, 39,
+   -79, -1, 17, 58, 11, -4, -57, -50,
+   -5, -100, 76, 127, 100, -48, 43, -96,
+   35, 12, -101, -96, -26, 7, -71, -72,
+   -7, -61, -105, 127, -4, -103, -15, 88,
+   46, 27, -16, 41, -125, -75, -22, -58,
+   -27, 11, -58, -5, -74, -125, -42, -13,
+   -77, -20, -80, 3, 19, -65, 61, -89,
+   -47, -56, -35, -80, 124, 86, -5, -49,
+   72, -117, -34, -54, 68, 67, -87, 54,
+   9, 1, 9, -21, -30, 32, -38, -2,
+   51, 21, -118, -25, 107, 30, -32, 60,
+   5, -48, 127, 28, -113, -65, -23, -1,
+   -69, -75, -65, -25, 17, -115, -19, 40,
+   49, 120, 42, 11, -48, 32, 66, -26,
+   75, -50, -75, 13, -29, 67, -126, -27,
+   25, 24, -126, -2, -59, -61, -89, -124,
+   78, -26, 76, -126, 36, 28, -3, -16,
+   -29, -81, 13, -123, 67, 52, 23, 37,
+   -73, -96, 40, -95, -112, 63, -55, 117,
+   63, 118, 34, -74, -119, -77, -23, -14,
+   -113, 111, 28, -80, 37, 103, 5, -25,
+   -79, 73, -76, -84, 45, 57, -67, 6,
+   8, -51, -67, -127, -58, -127, -33, 0,
+   -105, -24, -77, 48, -29, 125, 118, 77,
+   -112, -128, 41, 68, 126, -30, -34, 13,
+   115, 109, -9, -34, -44, 121, -11, 100,
+   -12, 43, -88, 51, -41, 37, -110, 43,
+   127, 36, -42, -58, -108, -119, 36, -107,
+   20, 23, 111, -4, 126, -9, 125, -69,
+   -42, 32, -33, 106, -7, 127, 6, -126,
+   29, 57, -29, -100, -91, 126, -4, 74,
+   33, -5, 5, 94, -20, 66, 34, 68,
+   37, 39, 82, -59, 69, 124, 75, -123,
+   86, -70, 91, -70, 17, 107, 93, 60,
+   -21, 51, 74, 21, -39, -90, -96, 13,
+   17, 121, -111, -30, 72, 28, 73, -13,
+   0, 12, -18, -7, 9, 32, 16, -21,
+   -87, 46, 37, 8, -7, 47, 8, 24,
+   0, -3, 36, -35, -20, 12, 36, -4,
+   -61, -5, 6, -77, -52, -4, 74, -23,
+   -4, -18, -25, -6, 127, 39, 44, -28,
+   13, 37, -22, 9, 24, -9, -36, 121,
+   7, 15, -10, -3, 2, 20, 15, 32,
+   -4, -71, -12, 57, 107, 21, 11, -9,
+   50, 2, 44, -6, 17, -5, -44, 13,
+   81, -6, 37, 7, 3, 56, 10, 2,
+   -20, 44, -36, 7, -6, -31, 17, -5,
+   -11, 20, 2, 61, 115, 0, 11, 3,
+   -8, -23, 3, -70, 4, -65, 11, 9,
+   52, -19, -51, -16, -3, -34, -32, -49,
+   -61, -12, 0, 49, 23, -52, 119, -12,
+   32, 68, 8, -5, 12, 32, -14, -18,
+   37, -11, 45, 6, -68, 9, 35, 15,
+   10, 89, 114, 38, 53, 26, -1, -51,
+   -24, -85, 25, -50, -10, 20, -16, -22,
+   -6, 127, 21, -7, -127, 12, 9, -18,
+   -42, 6, -58, 27, 1, 24, 18, 16,
+   -14, -2, -52, 63, -95, 10, -13, 127,
+   -35, -22, 6, 112, 64, 10, -16, -20,
+   -39, 1, 0, -19, -101, 5, -1, 110,
+   2, 44, 7, 4, -49, -17, 17, -8,
+   37, -61, -7, -6, -16, -99, 73, 2,
+   -16, 22, -2, 18, 15, 4, -27, 24,
+   11, -47, -3, 15, 127, 21, -7, 15,
+   15, -20, 3, 26, 127, 38, -38, 0,
+   6, 37, -10, 7, 23, 1, 36, -128,
+   -10, 13, 29, 16, 17, 39, -27, 8,
+   98, 5, 14, -75, -126, 12, -10, 30,
+   -31, 19, -36, -55, 0, 28, 83, 86,
+   11, 6, 15, 41, 13, 38, 9, 12,
+   15, 14, -21, 13, 116, 14, 0, 9,
+   10, 99, -53, -14, -128, 8, 19, -5,
+   5, -30, 2, 60, 36, 75, -69, 6,
+   53, 28, 44, 27, -33, -30, 36, 7,
+   -59, 11, 80, -71, 44, -39, -42, -25,
+   -38, 13, -123, -28, -24, 23, -58, 33,
+   4, -29, 16, 67, 19, 126, -7, 9,
+   -32, -7, -34, 51, 5, -5, -16, -3,
+   -41, 5, 23, -7, 26, -11, 126, -12,
+   37, 60, -2, 14, 11, 0, 42, 43,
+   11, -51, -50, -28, -15, -3, 21, 16,
+   -119, 55, 21, 71, -9, -17, 13, -60,
+   112, 36, 55, 2, 5, 0, -7, 1,
+   47, 4, 18, 44, -36, 51, 0, -41,
+   -47, -66, -9, 39, -19, 54, 11, 4,
+   -71, -35, -33, -17, -40, -92, 125, 31,
+   -28, -7, 25, -19, -89, 14, -94, 61,
+   124, -29, 8, -123, -8, -65, -30, 38,
+   2, -23, 23, -80, 5, -43, 21, -19,
+   -13, -17, 20, -23, 24, -126, 26, 8,
+   -27, 12, -111, -6, 42, 20, -126, -33,
+   -22, -81, -1, 42, 8, -59, 42, 96,
+   -11, -10, -44, -41, 6, 39, -3, 6,
+   -43, -30, -38, -8, 121, -41, 17, -13,
+   101, 7, -98, 1, 26, 35, 27, 15,
+   -56, -10, 4, -23, 12, 80, -25, 8,
+   8, -14, 1, 33, -17, -4, -18, -7,
+   -44, -80, -63, -50, 16, -125, 75, -17,
+   8, 16, -53, 5, -30, -6, -83, -16,
+   -22, -78, 13, -7, -89, 5, -6, -10,
+   11, 39, 8, -72, -28, -126, -32, -7,
+   -19, -1, -8, 38, 6, -34, 5, -1,
+   -12, 48, -71, -5, -11, -126, -33, -17,
+   -3, -17, 1, -83, 7, 8, 60, 27,
+   -1, 14, -69, -11, 27, -5, 73, 3,
+   -27, 64, -28, 2, 3, 22, 0, -12,
+   -41, 3, -25, 16, 9, 25, -27, 21,
+   22, 11, 0, 1, -1, 16, 6, -9
+};
+
+static const rnn_weight denoise_gru_recurrent_weights[27648] = {
+   -76, -99, -23, -18, 12, -119, -3, -53,
+   6, 9, -8, -124, 91, -33, 50, 0,
+   -52, 95, 19, 54, 43, 29, -17, -122,
+   -83, -29, -107, -57, -8, -4, -27, 118,
+   -96, 4, 81, -5, 44, -90, -103, 39,
+   -29, -25, -56, -13, 71, -13, -103, -1,
+   -15, -5, -100, -89, -14, 4, -16, 36,
+   -10, -44, 59, -44, -103, -109, 50, 37,
+   24, -48, -121, -9, -101, 30, 29, -5,
+   -69, 89, 56, -41, 39, -52, -4, -111,
+   -39, 16, -54, 31, -49, 34, -1, 12,
+   -20, -45, -121, -40, -28, -3, -13, -38,
+   23, -83, -13, -6, 97, 44, 13, 30,
+   -38, 2, -25, -82, 46, 38, -25, 31,
+   -106, 9, 20, -113, 27, 17, 12, -91,
+   34, -7, 10, -44, 3, -2, -66, -3,
+   -93, -70, -32, -58, -24, 20, -49, -31,
+   6, 87, -30, -89, 10, 23, -60, -16,
+   -113, 22, -1, -4, 60, -45, -41, 1,
+   17, -9, 39, -38, -36, -22, 47, 38,
+   -39, 10, -89, -27, 10, 45, 35, 2,
+   62, 5, 42, 14, 28, -27, 13, 10,
+   -22, -23, -67, 41, -10, 12, -55, -57,
+   -76, -35, -108, 12, -26, 0, -42, 104,
+   -48, -64, 4, -3, 34, -126, -19, -11,
+   36, 55, -54, -55, -123, -44, -45, 36,
+   -61, 18, 2, -127, 52, -30, -119, 33,
+   -8, -45, -26, -102, -91, 36, 49, 45,
+   51, -4, 5, -105, 56, -128, -83, 11,
+   -16, 16, -126, -108, -71, 9, -9, 36,
+   -6, -63, -100, -56, -10, -51, -34, -13,
+   15, -17, -28, 61, -65, -72, 32, -80,
+   38, -13, 75, 56, -15, 81, 50, 21,
+   -127, 12, -86, 45, -41, 57, 23, 11,
+   -28, -71, -119, -22, -62, 79, -96, 32,
+   -61, 20, 9, -117, -52, 33, -82, 82,
+   -16, -100, -47, -128, 39, -105, -15, 10,
+   -5, 90, -124, 19, -28, -66, -76, -13,
+   -40, 31, -20, -5, -24, 41, 14, 121,
+   -56, 56, 43, -123, -44, -24, 28, 73,
+   -37, -17, -19, -65, 45, 52, 63, -1,
+   30, 16, 51, -7, 45, -13, -70, 16,
+   -1, -4, -22, -116, -37, 37, -124, -10,
+   28, 12, -109, 2, 16, -30, 13, 28,
+   -24, 32, -26, -53, 72, 10, 40, 42,
+   -73, 36, 25, -51, 19, 27, 34, -6,
+   66, 36, -4, 38, -87, -33, 36, -41,
+   15, 3, -32, -72, 73, 35, -32, -124,
+   117, -36, 0, -22, -114, 76, 5, -125,
+   7, 1, -50, -104, 1, -74, 11, 8,
+   -28, -8, 13, -115, -50, 3, 89, 75,
+   22, 44, -99, -61, 97, 41, -123, -53,
+   91, 85, 108, -12, 11, -23, 13, 0,
+   -12, 102, -18, -74, -44, 54, -17, 16,
+   0, 53, 21, -19, 34, -11, 80, 25,
+   -58, 62, -55, 78, -29, 20, 35, 29,
+   -51, 42, 65, -86, -60, -25, 94, 14,
+   52, -18, 58, -54, 84, -115, -17, 18,
+   -64, -9, 27, -94, -5, -3, -46, 5,
+   11, 6, -125, -64, -54, 21, 59, -50,
+   49, 38, 47, -39, 60, 3, -11, 16,
+   71, -56, -7, 55, 51, -27, -51, -29,
+   7, -6, -63, 89, -16, 36, -76, -35,
+   -102, -93, 11, -84, -5, -25, -59, -6,
+   -19, -8, -23, -121, -60, -126, -71, 8,
+   -17, -128, -95, 15, 13, 64, 37, 16,
+   23, -78, 36, -111, -8, 69, -53, 62,
+   -37, 7, 9, -25, -63, -66, -25, -53,
+   -36, -7, -47, -40, -50, -42, -81, 127,
+   70, -22, -107, -115, 11, 95, -54, 12,
+   1, 15, 62, -14, -127, 47, 72, -43,
+   -2, -4, 127, 11, 22, 20, 11, -10,
+   4, 26, 71, -3, 85, -42, -9, -10,
+   -35, 27, 34, 35, 35, 0, -23, 27,
+   43, 0, 68, -13, 34, -21, 1, 70,
+   -34, 22, 16, 17, -11, -27, 0, -65,
+   41, -40, -28, -27, 18, 3, 1, 37,
+   -36, 16, 44, -17, 61, -32, 50, 3,
+   11, 1, -18, 24, -38, 19, 21, -8,
+   3, 50, 28, -14, -55, 6, 0, -23,
+   12, -17, 32, -18, 20, 22, -15, -2,
+   -17, -23, 48, -14, -9, -41, -4, -10,
+   20, -11, 23, -10, 40, -3, -4, -38,
+   4, -18, 8, 61, -7, 23, -31, -24,
+   -7, 45, -81, 12, -49, -19, -7, 38,
+   52, -26, 25, -54, -5, 23, 17, -14,
+   -32, 46, 1, 18, -24, 2, -94, 21,
+   34, -24, 36, -7, -11, 35, -62, 19,
+   15, -47, 45, 5, 30, 26, -23, -38,
+   -48, 6, 77, 50, 9, 25, 11, -29,
+   -7, 13, 12, 14, 40, 33, 21, 62,
+   -6, -27, 38, -45, -1, 87, 11, -27,
+   -20, 43, -68, -28, 27, 25, 3, -13,
+   53, -38, 4, 44, -41, -72, -7, -39,
+   41, -25, -35, 86, -59, 41, 127, -56,
+   34, -38, -25, 22, 0, -22, -24, -1,
+   -65, 19, -23, 25, -20, 79, -68, -87,
+   -123, -123, -28, -76, -114, -10, 1, -95,
+   -126, -128, 10, -68, -103, -11, -122, 127,
+   -119, -43, -28, -55, 69, -76, 60, 106,
+   122, -118, -40, -50, -11, -25, -30, -18,
+   39, -22, -80, -77, 121, -23, -88, -23,
+   -20, 80, 35, 71, -75, -114, -128, 127,
+   23, 11, 38, -52, -41, 7, -127, 29,
+   37, -74, -59, -47, 126, -16, -92, 10,
+   -92, 4, -59, 2, -127, -87, 126, 24,
+   122, -79, 97, 98, 1, 41, -61, -124,
+   71, -25, 37, -48, 32, 85, 34, 56,
+   -21, -31, 0, 85, -11, -10, 41, 14,
+   -41, 7, -17, 97, -79, 84, -98, -34,
+   17, -1, -60, 15, 39, -37, -35, 16,
+   26, -15, -37, 49, -20, -25, -56, -13,
+   5, 16, 6, 77, 67, 123, 96, 5,
+   29, -17, 46, -10, -23, 57, -79, 29,
+   -28, -17, 52, 86, -30, 6, 14, 51,
+   125, 17, -23, 90, 47, -8, -19, -42,
+   -19, 118, 27, 20, 38, 36, 12, 122,
+   42, 4, -14, -5, 1, 36, -6, 29,
+   -53, 15, 8, 21, 32, 31, -35, -2,
+   -56, -18, 12, 74, 48, 5, -4, 33,
+   60, -92, -21, 44, 92, -62, -2, 35,
+   4, 48, 69, -45, 73, -35, 3, 28,
+   81, -48, 18, -34, 29, 123, -32, 29,
+   6, 9, -118, 4, 30, -1, -24, 65,
+   3, 34, 40, 20, -13, -53, -50, 31,
+   9, -86, -87, -36, -57, -27, -35, -30,
+   -123, 18, 8, -107, -6, 5, 48, 21,
+   -54, -1, 60, 61, 26, -1, 12, -11,
+   41, -26, 110, 29, 27, 8, 48, 43,
+   -12, 123, -33, -8, -91, 122, 9, 120,
+   -18, 71, -23, 63, -34, -20, 30, 46,
+   -45, -24, 24, 57, -20, -15, -123, 3,
+   5, 59, 13, -87, 45, -15, -28, 38,
+   -3, 29, -23, -6, 31, 69, 33, -4,
+   -64, -31, -48, -1, -4, 23, 53, -4,
+   1, 96, 29, -44, -123, -19, 3, 32,
+   80, -28, 6, -57, 2, -67, -18, -50,
+   16, -125, -87, -25, -51, -127, -23, 5,
+   0, 62, 90, 67, -41, -11, 41, -64,
+   -67, 15, -3, 78, -86, -11, 30, -10,
+   -57, 23, -41, 23, 4, -103, -57, -119,
+   -94, -94, 69, -19, 48, 23, -32, -20,
+   -58, -17, 60, 113, 69, 57, -27, 24,
+   -25, -2, 23, 3, 8, -37, -35, -9,
+   5, -23, -38, -19, 26, 6, -49, 3,
+   95, 45, 0, 15, -102, 3, -46, -1,
+   -19, -2, 2, -86, 14, -3, 45, -20,
+   22, 23, -75, 93, 38, 54, -44, 107,
+   -87, 80, 19, 20, -54, 73, 4, 50,
+   14, -5, 32, 7, 32, 7, -46, 10,
+   -21, 8, -40, -45, 55, 33, 17, 31,
+   44, -10, 88, -11, -14, 29, 32, 54,
+   116, 33, -53, 107, -88, -34, 47, 124,
+   18, 14, -1, 5, 1, -39, 21, -15,
+   58, -27, -70, 100, -37, -25, 4, -56,
+   69, -22, 23, 3, -53, 20, -10, -48,
+   22, -95, -14, 39, -43, -70, 35, -6,
+   8, -95, -86, 9, 22, -59, 121, -127,
+   -1, 62, -18, 14, -13, 56, 76, -80,
+   -62, 10, 74, -56, 16, -11, 34, -52,
+   50, -7, 40, -61, 38, -38, 31, -51,
+   16, 23, -17, 25, 42, -51, 101, -19,
+   8, -19, -4, -46, -115, 3, 126, 41,
+   2, -1, -66, -26, -110, -49, -72, -39,
+   20, 92, -23, 60, -34, 80, -23, 32,
+   -4, 56, 59, -82, 81, 127, 61, -17,
+   44, -49, 33, -38, -119, 68, 74, -38,
+   87, -15, -21, -21, -70, -7, -8, -46,
+   -7, -107, 42, 20, -108, -37, -5, 7,
+   -123, 30, -125, -17, -48, 79, 26, -103,
+   -42, -18, 4, 48, -21, 14, 34, 12,
+   27, 37, 74, 57, -124, -5, -4, 5,
+   55, -36, 44, 64, 3, -48, -37, 51,
+   -45, 95, -59, -32, 5, 28, -80, 24,
+   18, -86, -6, -83, 5, -8, -16, 4,
+   -113, -23, 9, -24, -86, 8, -30, 16,
+   72, 12, 41, -55, -18, 101, -5, -17,
+   -108, -15, 62, -36, 29, 5, -16, 64,
+   -8, -10, -42, 22, -128, -37, 43, 82,
+   -42, -93, -20, -29, 46, 29, -41, 4,
+   18, -12, -51, 53, -43, 1, -61, 7,
+   21, 7, -94, -11, 99, 89, 84, -14,
+   14, -59, 56, 46, 22, -11, -35, 4,
+   40, -68, -32, 100, -8, 48, 1, 17,
+   1, 20, -4, 98, 3, 0, -21, 15,
+   39, 27, 66, -8, -37, 3, -8, -17,
+   -39, -53, -10, 9, 28, 82, -10, 33,
+   -36, -14, -47, 25, -8, -24, 8, 14,
+   10, -31, -44, -31, -53, 77, -18, -76,
+   35, -3, 124, -4, 92, 92, 34, 90,
+   125, 10, 63, 38, -16, 41, -4, 3,
+   27, 93, 62, 23, -48, 6, -36, -42,
+   -3, -3, -50, 2, 64, -36, -79, 122,
+   79, 22, 32, 19, 22, 34, -24, 5,
+   -11, 23, 38, -65, -15, -3, 61, -7,
+   -6, -41, -37, 15, -5, 1, 52, 11,
+   -42, -54, -7, 18, -34, 65, 113, -3,
+   -29, 61, 5, -36, -12, 106, 10, -95,
+   57, 124, 95, 32, -25, -26, 4, 13,
+   43, -22, -38, -26, 17, -46, -4, -122,
+   -39, 40, 79, 45, -48, -35, -74, 60,
+   -34, 50, 69, -68, -10, 94, -67, -80,
+   80, 55, 46, -61, 2, 14, 77, 8,
+   21, 4, 68, 53, 108, -3, -30, -18,
+   -102, -127, -12, 8, 77, -86, 27, -127,
+   -26, 100, -8, -77, -128, -47, -51, 2,
+   -111, -11, 13, -23, 44, -123, -2, 28,
+   21, -71, -124, 9, 28, -18, 66, 53,
+   64, 83, -31, 28, -8, 36, -21, 9,
+   8, -46, -23, -101, 12, -73, -49, -38,
+   52, 106, -82, 57, 41, -17, 59, 20,
+   -74, -7, 10, 28, 3, -15, 0, -92,
+   -9, -29, -64, 106, 36, -106, 4, -46,
+   -114, -59, -104, -71, -128, -68, -41, -4,
+   56, -115, 51, -34, 29, -21, -24, 14,
+   -59, -113, -57, 4, -6, 78, 24, -4,
+   23, 23, -12, -4, -24, -17, -79, 23,
+   -16, 17, -31, 6, 29, 26, 14, -50,
+   37, 27, -13, 22, 15, 1, 0, 72,
+   -62, 58, -6, -38, 18, 90, -2, 14,
+   65, 41, 48, 59, 53, 12, 55, 9,
+   14, 38, 34, -35, 19, 25, 55, 31,
+   -22, 22, 81, 48, 14, -15, -49, 19,
+   67, -54, 20, 13, 8, 3, 7, 32,
+   6, -6, -11, 19, 66, 40, 35, 19,
+   12, 29, -45, -61, 54, 105, 56, -20,
+   7, 46, 5, 4, 60, 10, 37, -19,
+   -37, 66, 44, 15, 19, 35, -21, 29,
+   55, 16, 61, 85, -26, -3, -93, -30,
+   9, -36, 2, -42, -67, -32, -23, -2,
+   15, 79, 27, -17, -4, -126, -29, 18,
+   -3, -40, -118, -28, 10, 42, 64, -30,
+   -9, 101, 4, 6, -20, -53, -10, 18,
+   -14, -62, -29, 8, -38, -3, 9, -21,
+   -26, 63, 31, -5, 20, -28, 33, -25,
+   -46, 6, 65, -6, 94, -13, 9, -8,
+   15, -21, 114, 12, -8, -42, -116, 5,
+   -22, -2, 1, -27, -18, 8, 4, -70,
+   14, 65, -22, -9, -23, -1, 56, 15,
+   -55, 20, 20, 44, -14, -70, -27, 33,
+   24, -12, 45, 78, 69, 50, -48, 91,
+   100, -29, 43, 19, 126, 57, -46, 16,
+   77, 70, -65, -18, 101, -27, -22, -53,
+   73, 39, 126, 96, -125, -20, -124, 19,
+   15, -99, 72, 36, -11, 108, 91, -123,
+   -6, -49, -68, 61, -54, 107, 9, -35,
+   63, 126, 33, -4, 23, 61, 127, -10,
+   -126, -1, -20, 29, 43, 20, -68, 56,
+   -40, 43, -90, 72, -37, 38, -48, 57,
+   -58, 48, -8, -57, 76, 36, 28, -34,
+   -110, -15, -116, 103, -30, 29, 14, 126,
+   -121, 127, -23, 49, -33, -125, 30, -13,
+   0, -3, -25, -93, 42, 36, -24, -19,
+   87, 8, -101, 54, -30, 27, -8, 69,
+   25, 33, 65, -17, 49, -1, 37, -92,
+   9, 46, -15, -40, -4, 3, -52, -13,
+   -11, -19, 3, -42, 1, -31, 55, 45,
+   8, 31, 16, -29, -15, -25, -7, 6,
+   7, -62, -35, 103, 33, 13, 67, 26,
+   -6, -53, -18, -36, 3, 32, 112, 0,
+   40, 12, -67, -27, -57, 37, 24, 8,
+   88, 70, -17, 48, 82, 37, 1, -1,
+   77, 5, -27, -17, 15, 8, 27, -85,
+   33, 0, 43, 37, 3, 19, 3, -47,
+   60, -55, 50, -23, 12, -12, 61, -86,
+   79, -37, -69, 38, 19, 10, -53, -26,
+   -6, 103, -5, 18, -29, 74, 11, 97,
+   -48, -36, 46, -45, -72, -65, -122, -39,
+   -101, 85, 31, -4, 6, 25, -45, -4,
+   -3, -107, 7, -120, 71, 19, 64, 43,
+   -87, 30, -31, 14, 7, 21, 83, 74,
+   -7, 30, -94, 66, 63, -85, 92, 8,
+   22, -24, -4, 31, -91, 39, 13, 37,
+   65, 60, -62, 92, -44, -8, 74, -7,
+   -63, 54, -24, -90, -34, 17, 84, -41,
+   -97, 13, 28, 14, -33, 1, -26, -25,
+   -9, -48, -2, -54, -104, 4, -5, 38,
+   -120, -48, -35, 124, 38, -57, -63, -8,
+   37, 91, -40, 7, 17, -58, 67, -56,
+   5, -86, 22, -17, -53, 6, 114, 37,
+   -24, -96, -17, -69, -44, -58, -123, -18,
+   -47, -123, -108, 2, -89, -38, -15, -34,
+   14, -31, -2, -99, 34, 28, 124, 92,
+   -16, -28, -22, -60, -22, -2, 126, -122,
+   31, -20, 32, 42, -128, -41, 61, 30,
+   -23, 79, -84, -36, -26, 87, 15, -2,
+   -125, -24, -22, 39, -108, 16, -26, -31,
+   -62, -22, 83, -123, 69, -108, 0, -12,
+   -19, -6, -13, -70, -83, -30, 36, -32,
+   3, 95, -111, -18, 6, -91, 34, 56,
+   -61, -92, -54, 23, -60, 17, -64, -54,
+   4, 39, -123, 24, -53, -46, 14, 65,
+   -100, 0, -54, 21, -4, -119, 72, -35,
+   95, -56, 14, 24, -68, -40, -49, 21,
+   -16, -91, -123, -75, -39, 25, 0, 38,
+   80, -32, 29, 25, -99, 0, -10, -28,
+   38, 34, 0, -3, -29, -74, -93, -1,
+   0, -26, 33, -65, -56, 28, -76, -22,
+   -68, 1, -22, 71, -21, -12, -59, -11,
+   66, 12, 0, -82, 17, 27, -66, -56,
+   -34, -11, -37, 75, 100, 78, 2, 12,
+   -29, 40, -92, -11, 52, -4, 5, 38,
+   25, 44, -63, 40, -4, -19, -38, -38,
+   44, 44, 11, -12, 84, 47, -127, -32,
+   2, -57, -102, -23, -51, -12, 26, -59,
+   17, -5, -97, 98, -117, -36, -65, -35,
+   -1, -1, 1, -93, -40, -39, 96, -120,
+   -2, -26, -25, 66, -33, -76, -67, -12,
+   -44, -8, 22, -58, -2, 4, -110, -21,
+   -6, 30, -30, -113, -57, 83, 38, 5,
+   -28, 14, -93, -35, -107, 6, 59, 17,
+   107, 74, -20, -19, 22, -93, -43, 49,
+   -6, 17, 21, -108, 12, -39, 33, -127,
+   -43, 14, -22, -18, 15, -74, 41, -6,
+   -20, 35, 4, 99, 10, -16, -58, -14,
+   -50, -20, -13, -30, -26, -82, 60, -28,
+   26, -110, -34, -51, 28, -128, -57, -20,
+   -47, 97, -54, 104, -127, 50, 63, 20,
+   -44, -126, -35, 13, -5, 5, 83, 34,
+   -45, -12, 27, 0, -33, -55, 29, -94,
+   70, -44, -97, -9, 25, 55, 48, 57,
+   -4, -27, -84, -93, -44, -36, -9, 49,
+   66, 39, 20, -11, -82, -66, 113, -18,
+   -15, -3, 98, -8, -26, 9, -83, -9,
+   41, 61, 84, -22, 65, -57, 34, 7,
+   61, -53, 97, 6, 20, 28, -21, -105,
+   -60, -63, 23, 41, -77, -54, -1, -18,
+   3, 51, -78, -96, 53, 83, -21, -39,
+   21, -104, -69, -12, -36, 76, 20, -77,
+   59, -37, 40, -31, -107, 29, 3, 5,
+   -18, -37, -16, -41, 10, 56, 51, -40,
+   -73, 25, 27, -80, -12, 73, 6, -34,
+   16, -64, -62, 28, 86, 39, 4, 78,
+   21, 8, 28, 55, -124, -107, -105, -24,
+   55, 6, 68, -23, -43, 60, -116, 1,
+   -37, -38, 88, 46, -45, -53, -44, 49,
+   -58, -40, -117, -63, 55, 62, 24, 53,
+   9, -20, 127, 83, 62, -12, -2, 3,
+   126, -26, -29, -110, 32, 33, 51, 43,
+   35, -8, 90, -3, -37, -120, -11, 100,
+   17, 0, 76, -21, 116, -24, 6, -116,
+   -87, 125, -3, -57, -13, 125, 13, -116,
+   13, 43, -86, 32, -45, -14, 70, 41,
+   -121, -18, -7, -51, 9, 57, 0, -6,
+   -41, -4, -14, -40, -51, 124, 47, 13,
+   -126, 124, -41, 5, 34, 7, 2, -34,
+   -16, 9, -39, -107, -49, 41, -52, -23,
+   -38, 39, -9, 92, -115, 45, -128, 35,
+   -95, -24, -20, -40, 5, 0, 7, -107,
+   37, 0, -63, 49, 38, 35, 40, -33,
+   -115, 55, -19, -77, -36, -88, 116, 74,
+   10, 73, 38, 12, -76, -127, -48, 79,
+   84, -57, 46, 78, 37, 102, 18, -95,
+   -61, 17, 26, -113, -12, 43, -1, 68,
+   -25, 67, -21, 69, -17, -14, -27, -21,
+   -52, -7, -70, 5, -29, -110, -105, 35,
+   -65, -25, -56, -1, 85, 18, -54, -81,
+   -91, -71, 24, 25, -26, -68, -64, 9,
+   91, -107, 26, 34, 17, 21, 116, 81,
+   67, 25, -122, -43, 70, 46, -22, 101,
+   -12, -42, 13, 10, 13, -38, 3, -3,
+   7, -81, -36, -23, 48, 76, 22, 22,
+   -123, 4, 31, 37, 2, -2, 25, 40,
+   47, -41, -66, -23, -53, -33, -127, 20,
+   -4, 18, 57, 38, -33, -19, 42, 40,
+   16, 94, 38, 0, 32, -36, -40, 29,
+   -5, -57, -7, 8, -1, 40, 40, 48,
+   12, -26, 7, -24, 5, -61, -21, -50,
+   46, 13, -63, -91, 1, 12, -76, -42,
+   -88, 26, 62, -35, -28, -51, -12, 8,
+   -9, -102, 38, 23, 11, 32, -9, -43,
+   -15, 30, 20, -9, 21, 63, -6, -61,
+   -81, -25, -63, 37, 85, -30, 36, -4,
+   -63, 64, -43, -15, -65, 75, 19, 51,
+   36, 4, -50, -9, -31, 35, 35, 36,
+   27, 27, 3, -41, -68, -118, 11, 88,
+   -38, -48, -49, 10, -42, 16, 63, 12,
+   -30, 3, -15, -6, -111, 15, 19, 13,
+   70, 34, -9, 37, 14, -26, 91, 51,
+   43, 5, 2, 5, 86, -31, -55, -86,
+   -51, 20, -1, 56, -34, -41, -7, -88,
+   -3, -24, 54, -27, 40, -40, -23, -72,
+   -51, -104, -27, 38, -29, -57, -2, 4,
+   -79, -1, 48, -36, 2, -62, 24, 20,
+   -34, -119, -29, 2, 64, 73, 22, -100,
+   -72, 7, 3, -3, -25, 68, -71, 26,
+   -18, 8, -46, -6, -2, -66, 50, 25,
+   44, 29, 3, -2, 18, -67, 21, 12,
+   15, -4, -65, 126, -34, 68, 66, 36,
+   9, -32, -22, -5, 19, 27, 35, 47,
+   -2, -70, -50, 60, 2, 12, -26, -18,
+   -107, 9, -11, -16, 24, -9, -16, -49,
+   -43, 9, 23, 6, -4, -26, -114, -125,
+   -72, -41, 42, 64, 32, -1, -3, -73,
+   -88, -37, 0, 63, 80, -46, -9, 86,
+   -6, -86, -17, 20, -1, -17, 2, -8,
+   -75, 22, -47, 26, -50, 65, -41, -13,
+   105, -75, 2, -47, 13, -2, 26, -10,
+   -11, -82, 50, -24, -7, 16, -66, -32,
+   52, 25, 24, 59, -11, -12, -90, 67,
+   -4, 1, 3, 33, -22, 77, -12, -90,
+   11, 28, 57, 17, 49, -31, -44, 68,
+   4, -54, 5, -2, 66, 73, -96, -50,
+   -7, -7, -5, 99, 32, 58, 66, -60,
+   0, -116, 53, 6, 116, -41, -62, -51,
+   -6, -24, -7, -113, -66, 21, 3, -39,
+   10, -62, 74, -5, 57, -56, -9, -26,
+   13, 114, 0, 80, 83, -29, -3, 80,
+   35, 55, 41, 94, -72, 8, -44, 77,
+   48, 21, -27, -11, 9, -5, -80, 32,
+   -20, 59, 26, -71, 90, 37, -51, 127,
+   -4, -51, -120, 38, -25, -43, -124, 46,
+   -75, 40, 9, -7, 36, -58, 22, 42,
+   -39, -123, -15, -20, -49, -76, -45, -127,
+   -82, 32, 56, 77, 41, -86, 108, -9,
+   12, -75, 119, -57, -6, -77, -17, -63,
+   11, -116, -20, 14, -55, -9, -8, 109,
+   -22, -30, 22, -71, -18, 19, 68, 119,
+   36, 34, -6, 2, -6, 29, 122, 50,
+   -128, 87, 22, 68, -3, 75, 6, -53,
+   -39, -54, 24, -43, 0, -9, -26, -42,
+   -28, -73, 50, -70, 40, 93, -102, 65,
+   -27, 53, 45, -17, 44, -15, 60, 69,
+   0, 38, -6, -49, 27, 25, -88, 15,
+   22, 13, -40, 55, -19, 26, 48, -52,
+   14, -6, -5, 14, -53, -61, 69, -44,
+   -71, 59, 66, 87, 117, -33, 15, 99,
+   -50, 7, -37, 98, 51, 62, 55, -39,
+   -36, -61, -103, 8, -52, 50, -27, -110,
+   12, 15, 87, -44, -22, -23, -56, -4,
+   -17, 18, 58, -73, -128, 17, 39, 87,
+   5, -69, -20, -47, 64, 13, -8, -27,
+   -26, -10, 2, 9, 64, 25, 26, -32,
+   -53, -22, -18, 35, -63, 7, 119, 43,
+   28, 100, 2, -54, 110, 5, 4, -5,
+   98, -32, 29, -17, 83, -95, -116, 73,
+   -47, -76, 13, -89, -12, -35, -62, 77,
+   36, 52, 116, 117, 61, -19, -33, -7,
+   31, -41, 16, -8, -51, 9, 13, 36,
+   63, 43, -22, 19, -36, 6, -40, 29,
+   -4, 26, 42, -69, -66, 77, -73, 110,
+   -104, 46, 47, -40, -11, -41, 73, -39,
+   59, -29, 18, -12, -6, 9, 47, 13,
+   7, -24, -45, -109, 40, 26, 26, -2,
+   42, -93, 46, 92, -1, -85, 69, -4,
+   115, -72, -11, -47, 1, -25, 9, 7,
+   -49, 34, 24, 30, -48, 116, 3, -12,
+   -126, -21, 36, 17, -38, -13, -73, 2,
+   -84, -64, 127, -45, -50, -79, -81, -35,
+   14, 49, 91, -122, -52, -73, -42, 17,
+   -34, -12, -102, -33, -28, 45, 27, 47,
+   -9, -28, -4, -53, -49, 15, -3, -68,
+   9, 25, 60, -69, 0, 126, -55, -9,
+   -52, -94, -90, -13, -27, 109, 16, -6,
+   20, -69, 46, 43, -119, 29, 78, -54,
+   55, 67, -40, -49, -84, 25, 27, -16,
+   -84, -94, 15, 127, -125, 56, -24, 29,
+   -93, -33, -80, -82, 45, -5, -49, -29,
+   46, 21, 18, 27, 52, 9, -111, 8,
+   -81, -125, 109, -9, -91, 72, -18, -9,
+   3, -97, 12, -119, -99, -69, 57, -25,
+   -25, -106, -43, 34, -36, 114, -14, -23,
+   2, 46, 69, -9, -103, 87, 127, 74,
+   14, -5, 0, 14, -16, 73, 93, -30,
+   -2, 10, -123, 26, 74, 116, 22, 51,
+   -94, 108, -38, -38, -81, -38, 1, -46,
+   -86, -12, 60, -53, 64, 1, 63, -125,
+   -125, -20, 106, 88, 20, -127, 60, -10,
+   85, 19, -11, 45, 33, 2, 6, 66,
+   -76, 86, 47, 63, 91, 119, 56, 114,
+   86, -6, -13, 21, -40, 20, 21, 8,
+   -27, 44, 59, 36, -13, 99, 118, -47,
+   26, -94, 52, -76, -62, -76, 9, -25,
+   94, -27, 123, 34, 119, -35, 8, -16,
+   8, -44, -54, 24, -8, 31, 36, 31,
+   101, -42, -4, 18, -18, -4, 31, 49,
+   -8, -17, -28, 10, -20, -104, -55, -39,
+   75, -63, -10, -1, 33, 102, 69, 43,
+   49, 53, -42, 42, 24, 75, 3, -55,
+   -24, -20, -65, 78, 63, -1, -33, -31,
+   -40, -36, -42, -49, -1, 48, -70, 63,
+   51, -3, 70, 45, -33, 32, 62, -11,
+   -94, -94, -11, 33, -27, 101, -70, -4,
+   32, -48, 15, 44, -33, 16, -3, 124,
+   4, 64, 14, 73, -119, -72, 71, -39,
+   15, -33, -32, 54, -53, -32, 9, 45,
+   -56, 111, 11, 42, 35, 75, 8, 34,
+   -29, 24, -12, 45, 59, 45, -52, 35,
+   126, 90, 8, 9, 16, -31, 99, -72,
+   80, -100, 2, 20, 21, -36, 42, -22,
+   -38, 44, -20, -13, -8, 19, 25, 31,
+   -22, -89, 105, -52, 64, -19, -2, -98,
+   38, -23, -13, 22, -18, 4, 29, 24,
+   34, 56, 66, -5, -82, -80, 5, 57,
+   57, 0, -25, 44, -7, -73, -45, 33,
+   93, 41, 36, -18, 3, -76, -41, -59,
+   -14, 65, 28, 9, -55, 22, 75, 27,
+   56, 104, 16, 35, 39, -50, -13, -90,
+   -59, -35, 85, 42, 13, 46, 38, -35,
+   -84, -13, -30, 54, -16, -11, 12, 19,
+   -21, -11, -25, -17, 40, -115, 64, -120,
+   -68, 19, 79, 35, 2, 17, 4, -6,
+   29, 26, -68, -65, 73, -48, -64, -64,
+   -58, 3, 1, -15, 4, -7, -11, 7,
+   -8, 11, -52, 4, 51, 28, 8, 18,
+   8, 16, 6, 14, -60, 88, 65, 51,
+   30, 6, -33, 47, -26, 9, 59, 7,
+   -6, 13, 91, 97, -104, -19, -105, -44,
+   90, 21, -55, 45, 5, 40, 10, 73,
+   9, 33, -109, 57, -14, -1, 51, -51,
+   19, -4, 64, 19, -45, -80, -18, -77,
+   38, -32, -66, -40, 18, -7, -7, -38,
+   -47, 11, -59, -31, -59, 6, 86, 5,
+   5, -82, -30, 15, 30, 44, 35, 45,
+   52, -21, 61, -75, 61, -58, -7, 92,
+   -57, -17, 88, 0, 20, -9, -49, 15,
+   32, 57, 54, -116, -59, -57, -47, -6,
+   -33, -2, 71, -121, 113, 48, -15, 41,
+   -6, 67, -19, 37, 25, 22, 28, -11,
+   112, 20, -25, -19, 79, -45, -14, 48,
+   -51, -105, 123, 23, -39, 127, -2, 23,
+   -46, 68, 45, -46, -53, 54, 102, 28,
+   63, 14, 40, -26, 25, 43, 33, -55,
+   48, 5, -67, 55, -17, 60, -87, -4,
+   -92, 23, 122, -9, -58, -85, 49, -34,
+   43, -37, -25, -14, -54, -86, 53, -68,
+   5, 84, -19, -117, -84, 38, 70, 95,
+   -76, -86, 36, 54, 42, 50, 40, 83,
+   -9, 16, -25, -85, 48, 122, -30, 5,
+   47, -124, 57, -63, 44, -28, -122, -113,
+   27, -12, -119, 38, -69, 44, -39, -29,
+   -17, -126, 12, -4, -29, -23, 90, 0,
+   41, -103, 21, -48, 8, 90, -15, -60,
+   -43, 90, -51, 63, -15, 70, -17, 0,
+   4, 19, -81, -100, 42, -54, -18, 76,
+   -39, -43, -29, 29, 25, 9, -16, -34,
+   -23, 27, 51, -78, -91, 40, 91, 0,
+   102, -36, -126, -52, 22, 73, 44, -41,
+   -35, -34, 110, 14, -55, -3, 29, 16,
+   -33, 106, -39, 39, -61, -42, -1, -49,
+   -7, -1, 28, 18, 7, -19, 40, -13,
+   6, -52, 3, 2, 19, -19, 119, -100,
+   -51, 73, -50, -89, 8, -30, 6, 33,
+   28, -24, -1, 47, 23, -35, 46, -4,
+   -6, -33, 78, 40, -28, -10, -1, 39,
+   14, 25, 52, -1, 11, -39, 59, -22,
+   -2, 61, 24, 40, 111, 30, -4, 61,
+   -92, -95, 4, 66, 37, 19, 3, -3,
+   107, 1, 5, -10, 11, 21, 12, 63,
+   -13, 71, -93, -41, -3, 82, 31, -1,
+   2, -31, 1, 55, -36, 35, 17, 7,
+   111, -8, -31, -2, -70, -15, 19, 41,
+   -58, 10, 6, 15, -55, -55, -58, 26,
+   12, 54, 35, 3, 19, 35, 124, -54,
+   19, -68, -114, -2, 27, 37, -37, 34,
+   -58, -3, -95, 51, -31, -1, -49, 26,
+   -62, -7, 12, 7, 101, 16, -17, 126,
+   -9, -27, -24, 95, -22, -40, 29, -15,
+   24, 15, 25, 30, -43, -4, 25, 12,
+   33, 29, 21, 6, -72, -9, 21, 65,
+   -54, 65, -48, -22, 45, -36, 6, 5,
+   0, -20, 14, 25, -6, -6, 14, -31,
+   21, -22, -7, 58, 5, 53, 50, -16,
+   53, 73, 8, 22, -4, 15, 29, 67,
+   -119, -9, -28, -14, 74, 54, 58, -17,
+   69, 29, 66, 96, -70, -108, -128, 16,
+   -35, 54, 2, -69, 94, -7, 19, 2,
+   -66, -3, -126, 44, 59, 43, -5, -34,
+   16, -2, -13, -126, 14, 109, 37, 9,
+   32, -26, -86, -39, -71, -34, 4, 9,
+   -4, -16, -31, 80, 106, 21, 23, 29,
+   -37, -37, 8, 75, 59, 10, -41, -32,
+   30, -17, -44, -11, -28, 34, -35, 24,
+   -18, -9, -111, -53, -78, -127, -19, 24,
+   -21, 16, -110, 32, -94, -4, -17, -46,
+   -1, -122, -53, -21, 11, -96, -3, -21,
+   7, 2, -32, 46, 90, 35, -33, -19,
+   74, 43, 34, 30, 37, 63, 28, 23,
+   -83, 8, 27, -18, 20, -13, -44, -8,
+   21, 29, 47, 7, 24, -13, -119, 27,
+   -54, 9, 14, 26, 32, 102, 89, 25,
+   20, -5, 2, 33, -12, 22, 46, -45,
+   52, -25, 97, -65, 79, 79, 32, 18,
+   28, -78, -6, 88, 32, -29, 81, 31,
+   -13, -38, 27, -44, -35, 19, 14, 30,
+   51, -27, -11, -16, -12, 45, 51, -37,
+   -3, 11, 39, -3, -36, 23, 47, -9,
+   -21, 22, 84, 55, 56, 47, -12, -8,
+   -97, 83, 61, -119, 44, 27, 7, -43,
+   -21, 88, 7, -30, -52, -9, 125, 31,
+   -81, 56, -5, -71, -30, -52, -2, -24,
+   -7, 39, 52, 101, -124, -3, 20, -41,
+   -83, 65, 23, -42, 8, -38, -60, -14,
+   -21, 33, -30, -18, 123, -25, 68, -120,
+   -66, -3, -89, 3, -22, 22, -42, 75,
+   -34, -33, 78, -28, -40, -5, 24, 28,
+   -49, 29, 2, -59, 2, 8, 5, -71,
+   33, -83, -110, 24, 99, 33, -70, -41,
+   56, -7, -29, -46, -106, 20, -19, -42,
+   24, 18, -35, 18, -67, 119, -15, -34,
+   56, -40, -26, -50, 61, 98, 30, -53,
+   44, 123, 55, 42, -99, -15, -21, 41,
+   -94, 25, 56, -125, 51, -126, -45, 27,
+   -83, 20, -19, 67, 10, -103, -34, 11,
+   4, 42, -117, -15, -38, -59, 66, -54,
+   -63, -1, -49, 36, -31, -57, -28, 14,
+   46, 69, -24, 38, -54, 79, -31, -32,
+   -73, 3, -19, 122, 61, -20, -65, 107,
+   -7, -57, -125, 65, 8, -55, -32, -10,
+   -30, -90, -104, -119, -12, 18, -34, 2,
+   -28, -99, 67, -117, -113, -9, 6, 58,
+   -62, 126, 35, -40, -16, 98, 21, -2,
+   -5, 14, 24, 43, 48, 44, -9, 47,
+   58, 61, 17, 20, -30, 19, 103, -121,
+   21, -15, 45, 73, 25, 25, 28, 35,
+   30, 27, 2, 68, 24, 23, 114, 55,
+   -85, -10, -44, 38, 80, -27, -12, -24,
+   -28, -22, 88, -10, -35, 23, 18, 16,
+   86, 14, 53, 33, -86, 0, 35, -21,
+   22, 40, 33, 50, 13, 22, 15, -44,
+   16, -5, 50, 50, 23, 57, 18, 9,
+   29, -53, 64, -10, 7, -26, 13, 1,
+   -33, -29, -54, -32, 70, 40, -38, 27,
+   25, -24, -7, 28, 9, 46, 30, 43,
+   19, 26, 25, 37, -18, -1, -36, 45,
+   -50, -43, 35, 17, -9, -10, 4, -88,
+   -43, 40, 39, 30, 31, 77, -8, 95,
+   -70, 40, 96, 45, -41, 16, -126, 15,
+   -29, -12, -19, -21, 17, 53, 22, -24,
+   -62, 6, 33, 17, -28, -16, 114, -51,
+   9, -45, 37, 30, 111, -28, 10, 0,
+   -30, -27, -5, 84, -75, -47, -2, 78,
+   -58, 0, 33, -14, 91, -124, -1, 32,
+   0, -61, 1, -56, -4, -15, 42, -38,
+   12, -7, 10, -26, -6, 40, 3, -57,
+   -77, 38, 79, 47, -14, 48, 15, -10,
+   -23, 25, 23, -41, 29, -5, 10, -127,
+   -61, -58, 25, -51, -37, 29, -5, 36,
+   -82, -95, -40, -9, 35, 42, 65, 24,
+   -9, -46, 3, -58, -11, -70, -48, -26,
+   28, -21, -53, 18, 10, -13, 75, 22,
+   54, 41, -29, -55, 50, -5, 28, 15,
+   15, -59, -22, -46, -35, -51, -33, -11,
+   -66, -23, 9, 2, 11, 20, 7, 55,
+   -52, -15, -28, -54, 5, -120, -63, -39,
+   14, -49, -18, -61, -87, 19, 20, 36,
+   113, -9, -28, -29, -64, 7, -13, -50,
+   -8, 18, 34, -29, -33, -25, -9, -2,
+   -39, 49, 14, -16, 37, 44, 67, -3,
+   -93, 57, -26, 14, 24, 77, 5, 38,
+   10, -10, -8, 38, -21, 20, -9, 71,
+   2, -3, -32, -34, 2, -125, -51, 3,
+   17, 26, -104, -98, -51, 30, 17, -5,
+   -19, -21, -21, -41, -93, 8, -52, -25,
+   54, -1, -12, 19, -2, 35, 56, -39,
+   49, 56, -52, -14, -58, 37, 50, -66,
+   -27, 18, 35, -80, 22, 12, -6, -77,
+   30, -22, -18, 37, -29, 19, 18, 15,
+   -34, -45, -1, -5, 58, 52, 9, -9,
+   -105, -115, 91, 45, -3, 20, 27, 2,
+   54, 116, 109, 84, -52, 9, 33, 7,
+   13, 13, -47, 14, 30, -3, 111, 11,
+   51, 98, -44, -112, 93, -41, -45, 122,
+   73, -9, -28, -48, -9, -61, -91, 18,
+   67, 91, -54, -52, -86, -124, 65, -50,
+   -56, 20, -42, 4, -75, 56, 90, -81,
+   -104, 42, 16, 102, 35, 107, 73, 51,
+   9, -50, -100, 24, 64, 38, -17, 120,
+   -16, 27, 114, -107, 85, 74, -50, -13,
+   -80, 3, -14, 6, 67, -23, -123, 49,
+   49, 22, -85, -69, -110, 126, 58, -15,
+   80, -16, 91, 51, 45, 55, -23, 96,
+   -90, -5, 20, -9, 69, 49, 6, -15,
+   124, 36, 38, 36, 29, -91, 56, 51,
+   26, 4, -120, 3, -42, -23, -12, 13,
+   5, 5, -69, -33, 12, -81, -2, -4,
+   59, 78, 100, -8, -109, 28, 5, -121,
+   -1, 35, 2, -13, -9, -67, -120, 6,
+   29, -111, -58, 45, -33, -30, 12, 123,
+   16, -43, 2, -24, 45, 19, -90, -12,
+   -36, -88, 0, 15, 18, -4, 35, 39,
+   -60, 34, -8, -35, 15, -120, 10, -22,
+   81, -100, -21, -37, 0, -19, 34, -87,
+   6, 54, -18, 41, 43, -4, 11, 25,
+   49, -19, 24, -20, 31, -97, 4, 13,
+   74, 90, -59, 27, -11, -19, -5, 53,
+   43, 20, -5, -84, 34, 13, 34, -47,
+   -56, -30, -64, 32, 37, 52, 28, 60,
+   19, 38, 72, -40, 16, 10, -36, -5,
+   -30, 50, 24, -13, 36, 25, 43, -39,
+   -23, -22, -24, 47, 95, 40, 40, 2,
+   11, -66, -7, 48, -24, -26, 27, -7,
+   25, -8, -31, 89, 25, -12, 40, -7,
+   22, 45, 56, -21, 4, -16, 70, 48,
+   13, 28, 3, 0, -27, -1, 30, -3,
+   31, 8, -1, 18, 8, 50, 15, -10,
+   76, 112, 27, -55, 41, 38, -23, 18,
+   -65, -74, -27, 9, 17, 21, 78, 60,
+   17, 29, -63, -49, -53, -102, 8, 52,
+   112, -7, -52, 37, 27, -39, -15, -5,
+   5, -14, 33, 109, 65, 64, 68, -1,
+   -18, -79, 74, -10, 50, 37, 20, -113,
+   -40, 84, -50, 2, -24, 122, 42, 60,
+   -16, -41, 44, 54, 15, -52, 29, 17,
+   4, -59, 85, -10, -11, 28, 29, 33,
+   -49, -72, -101, -45, 65, -21, -8, -25,
+   3, -36, 24, -59, 12, -1, -52, -31,
+   -59, 33, -17, -30, 53, 113, -116, 70,
+   20, 0, -20, 27, -119, -53, 19, -20,
+   -85, -92, -20, -32, 14, -120, 22, 22,
+   126, -47, -18, 50, -38, 81, -126, -62,
+   -86, -105, 26, 29, -44, 125, -54, -127,
+   -120, -21, -126, -54, 16, -112, 36, -3,
+   75, 123, 8, -54, 38, 59, -16, -23,
+   11, -127, -26, -64, -121, 56, -94, -5,
+   7, 13, -10, -18, 58, 25, -6, 29,
+   21, 42, 70, -33, -35, 36, 43, 48,
+   109, -9, -120, -123, -38, 36, -121, -34,
+   -112, 66, 16, -125, -78, 127, -128, -51,
+   -27, -102, -119, 118, -18, 127, -12, -24,
+   7, -16, 10, -66, -36, 9, -36, 9,
+   41, 67, 18, 82, 14, -15, -67, 67,
+   2, 5, -84, -16, -37, -10, -51, -27,
+   74, 41, -114, 0, 67, 0, 100, -22,
+   20, 8, -42, -15, -36, 11, -12, -85,
+   34, -24, 13, 18, -43, -18, 27, 38,
+   -28, 5, 49, -2, 36, -17, 101, -76,
+   27, -20, 58, -25, -27, 0, -17, -18,
+   23, -64, 24, 35, -21, -106, 24, 2,
+   -21, -63, -14, -19, -7, 19, -63, 10,
+   29, -35, 6, 10, 13, -10, -15, 1,
+   -8, 14, 16, -7, -7, 19, 25, -14,
+   -56, -32, 53, -10, -48, -28, -127, 7,
+   -49, -75, 3, 25, -7, 7, -49, -114,
+   2, 31, 19, 56, -56, 24, 103, 64,
+   51, -77, -66, -20, -28, 82, -85, 11,
+   -54, 49, -8, -10, 23, -101, -4, 103,
+   -70, -40, -4, 91, -45, -42, -73, 1,
+   -58, 1, -10, 7, 9, -52, 17, -30,
+   1, 6, -125, 12, -16, -70, 49, 126,
+   -8, -56, -26, 63, 127, -127, -70, 32,
+   -50, -88, -15, -19, 38, -32, -11, 25,
+   91, 124, -55, 77, 52, -22, -21, -66,
+   -66, 125, -41, 2, 33, -79, -42, 6,
+   -47, 44, 18, 32, 30, 15, 26, -8,
+   -97, 8, 49, -29, 51, 95, 90, -69,
+   -54, 2, -70, 17, -66, -41, -16, 116,
+   -14, 74, 8, 4, 51, -28, -125, 17,
+   74, -30, -44, 39, 30, -68, -6, 27,
+   68, -1, -46, 44, 39, -102, -69, -79,
+   81, -25, 62, 89, 5, 20, -43, -1,
+   46, 11, 29, -10, -57, 13, -21, -12,
+   37, -35, -3, 21, 78, -122, -90, -48,
+   -2, -16, 24, 45, -120, 4, 30, 15,
+   115, -80, 38, 95, -60, 80, 61, -29,
+   13, 58, 82, 29, 81, 3, 28, 31,
+   -14, -47, 40, -45, -6, -56, 17, 30,
+   -52, -21, -122, -102, 22, -17, -62, 12,
+   -7, -12, 94, -38, 11, -88, -44, -16,
+   37, -43, 31, -36, 31, -10, -89, 126,
+   -123, -2, 19, -81, 23, -78, -13, 25,
+   -5, -34, 2, -30, 24, -5, -33, 6,
+   44, 10, -9, 8, 6, 47, -8, 32,
+   9, 8, -4, 24, -17, 53, 89, 17,
+   40, -20, -57, -112, 31, 6, 55, -21,
+   -112, 111, -124, -26, -47, -16, 76, -8,
+   -21, -59, -38, -17, -10, 20, 73, -48,
+   50, 2, -33, -79, -40, 82, -2, 3,
+   101, -40, 14, 42, -94, 34, -55, -126,
+   -9, 12, 35, -112, 58, -30, -30, 4,
+   55, 37, -36, -126, -14, -68, 77, -37,
+   99, 2, -23, 11, -31, -120, 22, -101,
+   -51, 52, -17, -37, 1, -12, 15, 20,
+   45, 58, -37, -86, -13, 42, 53, 76,
+   -48, -1, -45, -60, 17, 42, -81, 1,
+   18, 48, -61, 127, 23, -23, -8, 27,
+   41, 6, 36, -125, -61, -64, 33, 1,
+   63, -44, 22, -63, 40, -118, -83, -3,
+   31, -83, -94, -105, -43, 84, -6, -69,
+   41, 25, -66, -13, 3, 91, 31, 72,
+   -25, 52, 73, -126, -8, -116, 72, 14,
+   -34, 12, -111, -26, 4, -102, 67, -28,
+   47, 5, -52, 114, -11, 55, -120, -93,
+   -105, -46, -24, -47, -16, 0, 15, -13,
+   -101, 64, 127, -96, -67, -128, -125, -29,
+   -30, -17, -56, 3, -33, 14, 4, 22,
+   56, -46, -60, -121, -21, 35, -16, 115,
+   6, 0, 11, -12, 19, -4, -4, -122,
+   46, 33, 40, -40, 42, 67, -39, -32,
+   -51, 67, -127, 54, 13, 23, 58, -3,
+   -88, -2, 61, 72, -69, 7, 123, -52,
+   10, 10, 17, 22, -17, 6, 21, -55,
+   -3, -23, -12, -47, 2, 66, 12, -7,
+   25, 78, -55, -29, -23, -36, -12, -58,
+   -115, -13, 13, -52, -17, 5, 30, -20,
+   69, 26, -45, -33, 19, 12, -16, 21,
+   -21, -37, 5, -18, -54, -43, -1, 49,
+   1, 34, 23, -24, 57, -86, -9, 48,
+   12, -95, -59, -47, -36, 6, 81, 28,
+   -2, 11, -4, -4, 27, 13, -21, 34,
+   60, -31, 11, -25, -5, 18, -32, 125,
+   51, 65, -68, 11, 22, 115, 56, -66,
+   24, 41, -90, -17, 20, -35, 81, 7,
+   58, 71, -24, 61, 17, 16, 22, -37,
+   61, 124, 88, 18, 11, -64, -73, -22,
+   58, -92, -96, 106, 18, -41, 88, 83,
+   122, 105, -77, -21, -97, -128, 13, 41,
+   -11, -70, 55, -12, 5, 35, -41, -80,
+   -33, 52, 10, -75, 0, -41, -35, -51,
+   -51, 18, 31, 25, 92, -107, 35, 28,
+   117, -2, 26, -127, -14, -48, -53, 9,
+   -123, -25, -62, 90, 14, -5, 43, 1,
+   25, 64, 90, -23, -35, -75, 25, -42,
+   18, -73, 2, 34, -65, 29, 28, 33,
+   -32, -37, 6, -7, -90, -83, 2, 29,
+   15, -47, -51, 47, 21, -8, -9, -43,
+   53, -23, 45, 19, 23, -57, -39, 14,
+   56, -114, -64, -2, 13, -64, -34, 61,
+   -8, 24, 26, -1, 6, 14, -126, 0,
+   -6, 21, -43, -18, -29, 21, 46, -26,
+   -3, -25, -23, 18, 60, -48, 47, -11,
+   -69, 74, -34, -41, 4, 18, 16, 41,
+   32, -128, -42, -59, 48, -17, -81, -40,
+   -56, 19, -3, -19, -53, -4, -36, 52,
+   93, 40, 123, -25, 26, -93, -122, -127,
+   38, 10, 37, 25, 18, -29, -24, 22,
+   3, 41, -15, 90, -64, -53, -23, -64,
+   -77, 91, -54, 80, -21, -41, 17, 19,
+   16, 7, -3, -19, -61, 31, -43, -57,
+   -29, -45, 44, 40, 30, 57, 43, -23,
+   -28, -53, 4, -38, -26, -87, -8, -11,
+   28, 42, -54, 75, 1, -42, 58, 3,
+   24, -26, -27, 37, 15, 96, 52, -20,
+   -5, 46, 52, -11, -30, -14, 22, 2,
+   -11, 3, 28, 38, 61, 23, 99, -27,
+   -20, -1, 21, 16, 31, 24, 16, -29,
+   -22, -21, -2, -76, 19, -81, -124, -47,
+   -4, 30, 18, -22, -74, 46, -43, 31,
+   33, -18, -54, -8, 43, 41, -19, 36,
+   -22, 41, 72, 87, 36, -24, -11, 2,
+   8, 98, -30, -37, 47, -21, 12, -30,
+   -128, -71, 91, -72, -39, -15, 100, -20,
+   98, 20, -29, -46, -36, -46, 40, -12,
+   -7, 45, -48, -10, -39, -8, -45, 9,
+   57, -49, -10, -21, -21, -49, -17, -18,
+   -28, -31, 90, -10, -63, 17, -33, -40,
+   -71, 34, 22, -9, -31, 121, 4, -1,
+   -83, -18, 25, 5, 18, -19, 20, 49,
+   9, 16, 27, 14, 23, 18, 53, 28,
+   -99, -42, 17, -43, -114, 3, -12, -13,
+   -10, -7, -37, -27, -7, 26, -14, 19,
+   -6, 25, 13, 17, 19, 63, -67, 47,
+   -39, -126, 12, 32, 17, 12, 9, -50,
+   -126, -90, -28, -70, 9, 102, -59, -19,
+   20, -58, -126, -13, -76, 1, -4, 69,
+   -42, -49, -18, -124, -59, -68, 32, -31,
+   18, 127, 24, 123, -18, 30, -25, -7,
+   13, -127, -71, -19, -43, -110, -11, -111,
+   53, 33, 77, 119, 74, -70, -127, 83,
+   68, -15, -2, -29, -48, -10, -38, 16,
+   -5, -32, -98, 25, -64, -51, -124, -126,
+   -126, -54, 62, -116, -28, -76, 2, -123,
+   -27, -52, 127, 102, -76, 99, 70, -64,
+   -3, -114, 124, -56, -29, -26, 1, 11,
+   55, 101, -38, 50, 111, 10, -43, 48,
+   -72, 20, -78, 23, 46, -25, -23, 44,
+   -30, -27, 31, -17, 55, 27, -75, 59,
+   81, -38, 25, -44, 111, 57, 19, 12,
+   84, 7, -15, -56, 42, 49, 15, 38,
+   -9, -56, 38, 92, 81, 17, 92, 32,
+   25, -39, 8, 40, 2, 34, -41, 26,
+   35, 64, 57, 47, -32, -120, 46, -5,
+   -51, -114, 82, 61, 55, 31, -59, 120,
+   106, 115, -3, 6, 16, 54, -12, 43,
+   12, 21, 3, -12, -35, 15, 41, 67,
+   67, -15, 48, 65, 57, -23, 3, -37,
+   -46, -72, 18, -69, 97, 12, -91, 13,
+   16, -61, 8, 12, -107, 26, 15, -61,
+   3, 42, -51, 39, 40, 69, 29, 6,
+   -4, 42, 16, 16, 94, 40, -9, 72,
+   40, -2, -2, 34, -18, 26, -20, 80,
+   8, 120, 30, 65, 98, -42, 83, 23,
+   -47, -30, -14, -25, -18, 22, -118, 90,
+   49, 2, 15, 41, 22, 11, -30, -27,
+   58, 30, 50, -66, 13, 100, -57, 5,
+   58, 26, -8, 94, 17, -61, 56, -72,
+   28, -113, -52, -24, -18, 28, 55, 0,
+   9, -109, -102, -1, 19, 67, -15, 61,
+   -20, -108, -1, -32, -89, -9, 35, -80,
+   -19, 66, 90, 76, -97, 34, -20, 51,
+   -69, 18, 42, -19, 76, -21, -1, 71,
+   -51, 72, -29, 40, -60, -8, 72, 16,
+   21, 36, 22, 55, 31, -17, 75, 70,
+   24, -10, 28, 1, -15, 22, 51, -17,
+   -31, 54, 75, 84, 51, 99, 55, 4,
+   26, 5, 6, 51, -1, -36, 53, 27,
+   -72, -63, -38, 17, 102, 114, -35, -61,
+   50, 66, 125, -14, -36, 25, -32, -17,
+   17, -9, -70, -83, 41, -36, -40, 8,
+   87, -60, 15, -75, -58, -54, -24, -4,
+   4, -109, 36, 46, 73, -66, -6, -34,
+   12, -30, 74, -55, -23, 70, 25, -1,
+   -52, 72, 35, 109, 27, -28, -37, 44,
+   39, -66, -125, 18, -49, -9, -5, 53,
+   -15, 42, 49, 80, -90, -60, 108, -46,
+   -13, 16, 37, 4, 55, 7, -47, -28,
+   -79, 38, 25, 57, -20, -9, 53, -74,
+   68, -22, 29, 20, 51, -114, -1, -23,
+   88, 16, 71, 30, 54, 82, -12, -21,
+   -34, 16, 35, -25, 54, -94, 36, -87,
+   0, -62, 29, -50, -22, -41, -108, -54,
+   28, 24, 122, 6, 74, 91, -35, 18,
+   -35, -3, -38, -62, 32, 112, 50, -53,
+   -73, 25, 58, -27, -69, -45, 44, -3,
+   -50, 63, -19, 47, -50, 44, -11, 10,
+   77, -1, -17, -24, -97, -98, 22, 33,
+   -34, 14, 10, -72, 123, -62, -47, 75,
+   -34, 9, -43, 61, -71, 42, -103, -38,
+   47, -114, 0, 16, -52, -24, 62, 27,
+   -29, -63, -13, 51, 126, -31, 19, 8,
+   -67, 11, -111, 126, -17, -15, 51, 127,
+   -18, 8, 20, 5, -24, -38, 19, -39,
+   -5, 94, 15, -21, 4, -64, -58, 71,
+   -92, 30, 43, -23, 3, 17, 58, 27,
+   38, -37, -22, -12, 40, 62, 33, 9,
+   5, 33, -34, 15, -35, 36, 118, 10,
+   17, 42, 45, 57, 19, 32, 55, 58,
+   79, -126, 16, -99, -28, 10, -22, 16,
+   45, 55, -1, 125, -38, -7, 40, 56,
+   4, -76, 41, -50, -20, -40, 59, -45,
+   -24, -60, 62, 97, 47, 65, 2, -57,
+   -4, -41, -7, 67, -4, -16, 41, -54,
+   15, -42, -4, 94, 20, -101, -63, -126,
+   56, -36, -5, 47, -11, -33, -24, 35,
+   64, 28, -24, 104, 44, 22, -19, 40,
+   -8, -49, -54, 80, 62, 43, -29, -8,
+   -7, -20, 3, 32, -59, 53, -4, 10,
+   -82, -122, -126, -98, -60, -33, 124, 126,
+   12, 68, 10, 1, 127, -12, -12, -46,
+   54, -127, -86, -41, 26, -35, -125, -14,
+   3, 56, -50, -123, -14, 59, -47, 109,
+   -12, -18, 115, 55, 32, 22, 108, 22,
+   -47, 18, -128, -50, 94, -4, 2, -17,
+   -25, -49, 37, 11, -30, -10, 70, 29,
+   -8, -81, 16, 56, -63, 0, 45, 40,
+   -2, 124, 15, -5, 22, -89, -9, 39,
+   -52, -1, -5, 70, -67, 15, 14, -27,
+   26, -18, -34, -22, 11, 1, -1, 6,
+   -65, -104, 30, -32, -18, -125, 72, -63,
+   70, 26, -82, -103, 7, -44, -26, 26,
+   115, 11, -1, -22, 10, 75, 42, 7,
+   -35, -105, 52, -9, -41, -1, -125, 22,
+   49, 8, 44, -128, -68, 47, -112, -121,
+   27, 108, 64, -118, 4, -68, -7, 42,
+   24, 64, -121, 47, -29, 120, -44, 124,
+   -29, 38, 21, -5, -7, -21, -8, 85,
+   4, 38, 16, 27, -32, 100, -3, -11,
+   -25, -18, -111, 40, 32, 46, -4, 28,
+   -70, 102, -23, 50, 13, -25, 41, -29,
+   -22, 25, 12, -50, -108, 36, -38, -3,
+   -12, -35, 21, 108, -103, -127, -11, 0,
+   -125, -39, -126, -122, 22, -123, 55, -123,
+   26, -89, 50, 14, -127, -21, 117, 26,
+   -69, -127, 95, 1, -81, -41, 51, -27,
+   10, -59, -18, -128, -50, -91, -123, -69,
+   21, -14, -63, -119, 75, 24, -73, 7,
+   52, -39, -100, -33, -127, -25, 19, 23,
+   56, 7, 2, -12, -26, -2, 27, -45,
+   24, 13, -32, 64, 40, -34, 47, -35,
+   -89, 76, -71, 70, -34, 30, 22, 9,
+   -124, 13, -105, -33, -31, 42, 9, -68,
+   110, -38, 54, -72, 21, -126, -27, 16,
+   19, -22, 1, -31, -63, 28, 3, -58,
+   37, -9, 10, -75, -6, 97, -54, 113,
+   -40, -37, 90, 63, 27, 52, -58, 61,
+   23, 118, -3, 23, 35, -14, -66, -60,
+   5, -38, 37, -94, -17, 47, 115, 36,
+   -87, -46, -29, 0, 4, 72, -9, -73,
+   -50, -10, 14, 31, -10, 20, -44, -89,
+   -12, 63, 63, 36, -50, -71, 59, 109,
+   -62, 48, 30, -19, -53, -95, -3, 60,
+   -48, 76, -12, 24, 98, -20, -99, 23,
+   58, 7, -7, -7, -9, -50, -13, 18,
+   80, -118, 22, -16, -48, -17, -36, 33,
+   -24, 47, 56, -114, -25, -120, -110, -73,
+   91, -41, -16, -46, -21, -73, 14, 113,
+   -24, -40, 63, 33, 17, 120, -53, -22,
+   127, 58, 25, 11, -16, -7, 17, 127,
+   -73, -95, 28, -18, 51, 121, 0, 42,
+   6, 17, -16, -18, -18, 114, 27, 61,
+   -29, -51, -15, 1, -71, 37, 25, 99,
+   85, -36, 8, 11, -88, -15, -114, 72,
+   23, -59, 50, 85, -55, -32, -16, 70,
+   84, -29, 50, 56, -5, -19, 62, 56,
+   11, 51, 43, -31, 5, 92, 1, 9,
+   -76, 18, -89, 3, 6, 44, 45, 40,
+   -1, -33, 35, 21, -25, 35, -11, 50,
+   -50, -61, 28, -108, -6, -62, 111, -13,
+   44, -66, -31, -9, -22, 18, -46, 8,
+   -14, -43, -5, -95, 77, 80, 31, 23,
+   32, -48, -3, -29, -9, -41, -25, -80,
+   -34, 55, 1, -11, -10, 22, -69, 6,
+   -19, 83, -49, -28, 20, -4, 52, -8,
+   -31, -18, -6, 48, -22, 53, -16, -24,
+   -56, -59, -32, -34, -11, -50, 49, 31,
+   55, -29, -53, 35, 6, -16, 1, -19,
+   -6, -12, -25, 21, 41, -1, -2, -38,
+   -43, -83, 18, -2, -18, -27, 54, 47,
+   24, -33, -50, 4, -6, -3, -23, -16,
+   34, 4, 34, 29, -72, 89, 58, 91,
+   25, -5, 35, -98, 33, 0, -14, -52,
+   96, -38, -81, -24, 36, 68, 0, -42,
+   8, -20, -14, 10, 115, 17, 6, 37,
+   0, -52, 64, -10, -28, 26, 89, 10,
+   16, 68, -7, 12, 26, 21, 73, -51,
+   -53, -65, 1, -30, -6, -17, 3, 1,
+   11, 7, 82, 39, -37, -59, 59, 3,
+   111, 13, 14, -19, -68, 44, 11, 11,
+   22, 120, 13, 18, -32, -17, 1, 18,
+   51, 53, 31, -15, -49, -16, -74, -39,
+   -52, 55, -68, -28, 116, 12, 25, 37,
+   60, 64, 54, 56, -60, 79, 51, -46,
+   62, -17, 2, 38, -46, 99, 123, 28,
+   114, 46, 87, 1, -61, 64, 67, 21,
+   0, -38, -19, 29, -61, 1, 50, 16,
+   -8, 51, 48, 89, 49, 47, 96, -13,
+   -29, 73, 27, 126, -12, 0, -23, -22,
+   18, -42, -39, -28, 23, 118, -26, -62,
+   63, -44, -27, 92, 32, -16, 42, 90,
+   -22, -63, -41, 19, -46, 98, -61, -70,
+   46, 0, -65, 37, -16, 54, 1, -3,
+   72, -56, -108, 7, 27, -38, -125, -41,
+   10, -6, -60, 127, -32, -71, 68, 10,
+   -35, 64, 44, 48, -21, -41, -37, 23,
+   -59, 40, 38, -22, 26, 18, -20, 73,
+   -114, -24, -53, -39, -27, -11, -98, -21,
+   5, 71, -115, 11, -37, -107, -60, -5,
+   72, -84, -62, -28, -5, -121, -86, -2,
+   -51, 53, 127, 124, -39, 44, -44, -125,
+   79, 29, 42, -6, -39, -29, 19, -26,
+   10, -72, 49, 13, 41, -51, -97, 0,
+   -93, 52, -84, -32, -66, 12, -35, 20,
+   3, 22, 69, 20, 97, -43, 41, 8,
+   -36, -26, 118, 26, 10, 35, -52, -2,
+   22, 8, -13, -43, 2, -44, -1, -18,
+   5, 61, -118, -103, -55, 5, 13, 10,
+   5, 4, 106, 2, -22, 30, -13, -117,
+   -121, -38, 29, 24, 14, -14, -62, 33,
+   -13, -18, -8, -69, -6, -113, -91, 1,
+   -36, -32, -17, -36, 40, -10, -34, 10,
+   -74, -27, -33, -33, 12, 18, 4, -1,
+   -1, -33, 34, 8, 26, -41, 120, 60,
+   -41, -5, 11, -41, 37, 10, -7, 31,
+   31, 26, -55, 25, -1, -12, 53, 43,
+   29, -8, -48, 29, -94, 39, 41, -45,
+   91, 15, 3, 29, 12, 69, 13, -68,
+   65, -12, 54, 55, -18, -11, -40, -18,
+   -36, 76, -11, -79, -11, -16, 38, -42,
+   86, -14, 37, -6, -8, 57, 2, -28,
+   11, -47, -89, -34, -47, -73, -121, -19,
+   -73, 69, -6, 35, -5, 114, 82, -39,
+   14, 5, -67, 12, -21, -17, -96, 14,
+   -20, -12, 2, 81, 12, -1, -126, 65,
+   -16, -36, -2, 4, -35, 2, -6, 49,
+   1, -42, 69, -11, -47, -25, 25, 9,
+   103, -50, -54, -8, 6, -56, -8, 21,
+   6, 7, -104, -18, -106, 51, 127, -85,
+   50, -6, -27, 20, 91, 22, 4, 39,
+   25, 43, -5, -20, -32, -95, -3, 40,
+   -104, -11, -55, -128, -46, -71, 37, -101,
+   77, -6, -44, 49, 26, -63, -105, -54,
+   60, -58, -13, -37, 39, 43, 72, 42,
+   22, 65, -60, -75, -59, -116, -106, -3,
+   25, 45, -109, -84, -123, -28, 35, -24,
+   0, -114, -82, -109, -114, 3, 14, 117,
+   55, -17, 19, 32, 68, 45, 8, -128,
+   75, -46, 82, 80, -85, -15, 106, -44,
+   92, -31, -106, 93, -33, 80, 37, 3,
+   -92, 15, -18, 40, -107, 28, -48, -87,
+   -127, 37, 47, -64, 14, 36, 20, 10,
+   25, 66, 18, -69, 92, 59, 17, -128,
+   -48, -39, 120, -14, -63, -31, -48, 8,
+   -9, 60, -21, -19, -2, -2, 37, -84,
+   98, 80, -120, 82, 21, -126, -14, 8,
+   -54, 3, -6, 52, 8, -16, 23, -3,
+   9, 61, -124, -9, 31, 14, -31, -2,
+   -30, -3, 2, 2, 0, 111, -42, 5,
+   -21, -43, 52, 36, 17, 39, 79, -30,
+   53, 15, 5, -97, -29, 10, -7, 1,
+   -91, 78, 35, 34, 14, 38, -9, -16,
+   -96, 15, -125, 7, -22, 32, 17, -101,
+   16, 15, 23, -30, -62, -15, 6, 27,
+   4, 55, 38, -37, 29, -70, 33, -101,
+   -59, -103, -50, -34, -50, -62, 53, -26,
+   127, 1, -1, -10, -6, -13, 7, -13,
+   95, -111, 55, 12, 6, -3, -108, -59,
+   27, -64, 36, -122, 125, 27, -75, 12,
+   1, -59, 84, -105, 109, -94, -76, 20,
+   23, 11, -36, -36, 43, -43, -123, 15,
+   -100, 65, 20, 16, -42, 25, 69, 28,
+   37, 22, 112, -78, 23, 17, -10, 34,
+   -63, -11, -127, -46, 39, 39, 12, -47,
+   -69, -67, -53, -60, 8, 15, 45, -83,
+   6, -30, -114, 9, -78, -43, -47, 69,
+   15, -72, 68, 44, -53, 20, -120, 58,
+   -4, 42, -11, -16, -125, 9, -65, -9,
+   -4, -84, 105, -12, -92, -105, -21, -33,
+   -121, -68, -8, 1, -39, -119, 38, -1,
+   -2, -127, 3, -104, -43, 127, -4, -35,
+   -125, 117, 106, -67, 49, 69, 15, -102,
+   80, 8, -84, -84, -96, -94, -27, -32,
+   4, -3, -16, 98, -25, 17, -24, 51,
+   11, 37, 23, -85, -61, -41, 62, 28,
+   -127, -124, -101, -27, 98, -71, 56, 1,
+   -92, 28, 7, 13, -11, 34, 23, -125,
+   56, 111, -124, -44, -15, -47, 5, -7,
+   2, 45, 1, 26, -54, 26, 11, 0,
+   5, -11, 22, 35, -41, 5, 41, -78,
+   24, 18, -5, -30, 49, 22, -1, -19,
+   39, -26, 1, -16, 8, -8, 3, 17,
+   75, -1, -50, 30, -49, 3, 24, 35,
+   38, 1, 3, -9, 10, -45, 42, -6,
+   -26, -35, 71, 75, 0, 17, 5, 11,
+   57, -90, -100, 0, 50, -1, 26, 32,
+   11, -20, 121, -41, -9, 22, 5, -2,
+   -40, 22, 4, -71, -14, 3, 10, 6,
+   -5, 0, 29, -22, 86, -3, 4, 8,
+   13, 8, -3, -58, -30, -19, -15, 18,
+   6, 16, -19, -87, 26, -11, -46, 64,
+   40, 6, 108, -16, 49, 67, -45, 15,
+   51, -6, 75, 87, -39, -92, 27, -14,
+   7, -32, -128, -15, 39, -4, 50, 0,
+   -26, 25, 62, -24, 67, -57, 27, 64,
+   -25, 29, -35, 69, 6, -56, -70, -1,
+   7, -69, -32, 45, 52, 31, 20, 27,
+   -29, 26, -72, -95, 38, 125, -8, 67,
+   -33, -126, 7, -13, 86, -111, -9, 23,
+   -52, 8, 16, 59, -26, -9, -19, 40,
+   -10, 87, 21, 17, -60, 126, 120, -22,
+   35, 22, -14, -24, -33, 2, -96, 97,
+   -126, -118, 17, 9, 41, 70, 14, -50,
+   11, -20, -37, -7, 76, 16, -52, 21,
+   -34, 34, 13, -13, -81, -126, 82, 65,
+   -14, 22, -23, -82, 61, -124, 34, -78,
+   76, 56, -128, 41, 36, -48, 45, -40,
+   33, 1, -102, -45, 0, -126, -58, -62,
+   -2, 60, 6, 108, -17, -37, -76, 13,
+   8, 24, -6, -9, 69, 62, 26, -11,
+   -9, 15, -30, -6, -48, -121, -98, -60,
+   -125, 26, 52, 18, -64, 108, -20, -126,
+   58, -123, 48, 70, -117, 75, 46, -62,
+   9, -34, -21, 39, -15, -91, 37, 1,
+   -32, 18, -10, 44, -11, 15, 39, -32,
+   -55, -55, 92, -52, 37, -6, -9, -45,
+   -89, -30, 14, -29, 11, -69, -35, -62,
+   21, 55, -1, 85, 21, 50, -20, 5,
+   9, -81, 22, 80, 33, 38, 35, 29,
+   -22, 39, 83, -54, -5, 5, 14, -25,
+   3, -20, 29, 20, -14, 7, 20, 7,
+   11, -32, -52, -15, -8, 8, 36, -8,
+   21, -9, -34, -116, -14, 32, -23, 38,
+   30, 5, 27, -5, -78, 67, -4, -53,
+   -75, 9, 53, -12, 8, -3, 15, -4,
+   -10, -4, 21, 52, -16, -13, -36, -20,
+   -67, 113, -57, -27, 46, -5, -9, -27,
+   -123, -71, 71, 38, -30, 113, 31, 24,
+   58, 8, 43, -77, -13, -81, -40, 55,
+   29, 9, 13, 30, 4, -29, 24, 10,
+   -124, -10, 1, -25, -77, -30, 25, -12,
+   -29, 5, 47, -36, -39, -41, -39, -19,
+   -44, 0, 72, 34, -10, 9, 58, 45,
+   24, -45, -75, -17, -9, 74, -20, -35,
+   28, -68, 5, -82, -22, 12, -63, 35,
+   -6, 23, 37, -9, -46, -19, -22, 32,
+   13, 7, 1, 14, -29, 65, 35, 4,
+   66, -23, 33, 42, -28, 111, -18, 19,
+   -26, -79, -3, -68, -89, 126, -56, 0,
+   -83, 19, 95, 24, 52, -66, 10, 98,
+   -18, 51, -31, -13, 8, -126, -5, -48,
+   91, -37, 127, -11, 105, -119, 18, 72,
+   60, -128, -117, -102, 36, 91, 17, 24,
+   4, 116, 11, 103, -15, -43, 22, -12,
+   -82, 74, -128, -49, -18, 54, -86, -2,
+   10, -2, 18, 50, -1, 66, 99, 118,
+   19, 46, -126, -90, 38, -126, -93, -24,
+   8, -2, 23, 2, -39, 5, 3, -13,
+   16, -80, -127, -37, -87, 29, 12, -54,
+   21, 0, 0, -122, -14, -38, 71, 45,
+   21, 16, -24, -72, -35, 18, -37, -20,
+   17, -30, -97, 50, 36, 127, -44, -19,
+   4, -40, 2, -25, -3, 25, -27, 55,
+   5, 28, -68, 39, 58, -61, -50, 22,
+   56, -68, -45, 75, -1, -8, 62, -59,
+   36, -5, -113, 71, -42, 29, 32, 4,
+   -73, -23, 55, 66, 37, -40, -25, -53,
+   18, -7, -78, -70, -22, 39, 48, -43,
+   77, -6, 35, 17, 23, -45, -22, 61,
+   15, 42, 35, -42, 0, -125, -65, -20,
+   31, 20, 74, -12, -37, -46, -33, 28,
+   31, -64, -13, 25, 69, 15, -23, -55,
+   93, 1, -20, 55, 81, 52, 18, 3,
+   -79, -22, 88, -29, 114, -6, -40, 12,
+   34, 19, 104, 45, 4, -43, 22, -10,
+   61, -82, 25, 35, 29, -30, 7, 107,
+   -72, 2, -52, 21, -28, -5, 127, 8,
+   -27, -96, -95, -14, -127, 12, 47, 32,
+   -116, 14, -48, 35, -34, 114, 100, -14,
+   -73, -36, 11, 50, -23, 11, -38, 12,
+   20, -20, -125, 67, -45, -28, 4, 88,
+   -5, 58, 10, -52, 21, 17, 41, -37,
+   66, -82, 21, 39, 0, -43, -9, -55,
+   42, -16, -81, -31, 11, -20, -17, 119,
+   -29, -68, 16, -125, 32, 107, -92, -126,
+   25, -35, -26, -51, -53, -79, 58, -19,
+   -127, -36, 3, -20, -55, -74, 47, 36,
+   -103, -52, -110, 62, 12, -123, 78, -43,
+   -127, 30, 36, 34, -110, 34, -39, -89,
+   -126, -29, -29, -60, -34, 39, -19, 4,
+   22, -70, -98, -52, -67, -77, 5, 33,
+   9, -23, -14, 28, 25, 9, -80, -99,
+   17, -26, -101, 47, -24, 24, -36, 53,
+   -126, -23, -84, -28, -105, 10, -60, -60,
+   -56, -87, -74, 26, -41, 60, -67, -10,
+   96, -89, -89, 42, -29, -3, 47, 4,
+   30, -4, -26, -70, -20, 70, -27, 44,
+   -74, -8, 54, 35, 115, 12, -21, -13,
+   10, -41, -70, 39, 86, 54, -40, 22,
+   42, 13, 6, 24, 13, -1, -58, -37,
+   -53, -3, -25, -23, 5, -30, 31, -28,
+   -103, -1, 13, -54, -70, 4, 2, 4,
+   10, 20, 32, 2, -38, -84, -3, 37,
+   23, 54, 5, 16, 12, -14, -10, -3,
+   -26, 2, -36, 83, 8, 33, -10, -5,
+   48, -32, -32, -36, 16, 9, -42, 38,
+   60, 36, -81, -52, 56, -88, -55, 21,
+   -26, 24, -26, 127, -59, -60, -12, 23,
+   -26, -2, -100, -58, -33, 17, -2, -71,
+   -40, -124, 102, -10, 72, -119, 121, 104,
+   -47, -35, -24, 113, -122, -23, 82, -101,
+   -60, 69, 27, -4, 110, 32, 16, -104,
+   44, 10, -89, 25, 30, 44, -1, 78,
+   82, -1, 29, 25, -58, 44, 70, 70,
+   9, -31, -30, -8, -17, 60, -102, -35,
+   4, 43, 85, 84, -6, -80, 5, -71,
+   -45, 22, -63, 52, -116, -37, 90, 93,
+   -58, 2, -2, 1, 20, -31, 35, -55,
+   31, -20, -70, -26, 59, -32, -24, 76,
+   -108, 27, -19, -6, 30, 68, -1, 4,
+   79, 45, -43, 45, -13, -47, -14, -66,
+   -41, 85, -39, -24, -17, -50, 22, 2,
+   51, 27, -28, 62, 12, 50, -107, -62,
+   2, -17, -9, -63, 34, -30, 35, -10,
+   -123, -24, -49, -12, 57, -45, -46, -63,
+   -29, 37, -103, 49, -80, -31, 31, 46,
+   -53, 6, 65, 10, -38, -44, -71, -4,
+   -23, 10, -61, -48, -46, -33, 17, -23,
+   77, 39, 25, 0, 58, 50, -1, 25,
+   44, 66, 42, -4, -6, -12, -36, 50,
+   1, 113, -5, -23, -54, -4, -5, -10,
+   3, 25, -4, -98, -37, 49, -33, -21,
+   -40, -18, -68, 93, -29, -3, -9, -1,
+   48, 22, -65, -12, 40, 2, 29, 2,
+   36, -119, -9, 4, -27, -40, -1, -17,
+   15, -44, -7, 2, 59, -23, -33, 10,
+   54, -17, -26, 111, -5, 46, 73, 50,
+   -5, -91, 45, 27, -105, -13, 37, -55,
+   -68, 25, -23, -7, 5, 80, -28, 4,
+   127, -59, -102, 18, -9, -29, 8, 32,
+   56, -123, 5, 19, -98, 52, -126, 36,
+   35, 26, -17, -78, -97, 71, 5, -38,
+   92, -31, -42, 39, 9, 81, 4, 33,
+   3, -49, -25, -1, 0, 106, -75, -85,
+   14, -127, -67, -41, 46, 32, 10, -3,
+   -40, 86, 73, 73, 20, 99, 42, 41,
+   30, 77, -1, -3, 57, 19, -13, -19,
+   43, 81, 41, -13, -16, -95, 17, 35,
+   -4, -30, -98, -59, -2, 103, 74, -103,
+   2, -13, -1, -2, 84, -3, 126, 15,
+   -103, 18, -30, -35, 20, -21, 72, -40,
+   46, -15, -10, -6, 11, -19, 17, -25,
+   110, 85, 48, -22, 2, -64, 42, -69,
+   6, -10, -37, 12, -50, 5, 31, 1,
+   61, 74, 60, -50, -29, 65, -67, -35,
+   -41, -128, 106, -4, 92, -21, -57, -44,
+   -127, -84, -57, 49, -32, -12, 56, -86,
+   17, 50, 47, 57, -20, 42, 11, 32,
+   26, 43, -12, 59, 27, -84, 62, 6,
+   7, 16, -5, -44, 36, -75, 9, 25,
+   17, 89, -7, -54, 1, -54, 12, 34,
+   -7, -4, -71, 18, 38, -26, -19, 13,
+   3, -10, 56, 48, 9, 100, 47, 34,
+   123, 98, 44, 84, -9, -16, -10, -17,
+   -20, 5, 50, 111, -28, -64, -20, -127,
+   -69, -3, 64, -27, -37, -79, -15, -84,
+   -81, -16, 55, -78, 98, -97, -20, 86,
+   -15, -79, 57, 24, 31, 29, 26, 33,
+   -21, -52, 31, -46, 73, -47, -17, -44,
+   102, 84, -63, -59, -69, 123, 39, 80,
+   -83, -37, 37, -116, -37, -2, -54, -101,
+   93, -21, 36, -19, -8, 93, -115, 69,
+   -18, -37, 13, 49, 99, 10, 2, -31,
+   -109, -127, 50, 49, -43, -20, -56, -43,
+   18, -10, -127, -52, 45, 82, 3, 11,
+   -82, -22, -90, 70, -55, 99, 82, -41,
+   39, 6, -104, -14, -104, -9, 34, 127,
+   -15, 7, 99, 0, -58, 1, -21, -9,
+   -17, -34, -28, -15, -41, -10, 16, 12,
+   46, -13, 10, -11, -15, 45, -73, 16,
+   -37, 114, -50, -79, 110, 81, 14, -17,
+   -1, -128, -124, -35, 77, 72, 61, 124,
+   41, 29, -40, 57, -3, -24, 115, -62,
+   -53, 35, -9, 15, 109, 71, 18, 22,
+   39, -128, -49, -127, 19, 116, 74, -10,
+   -36, 123, 102, 19, 108, 23, 4, 95,
+   126, 101, -16, -10, 13, -90, -95, -18,
+   61, 0, 79, -115, 18, 57, -5, 114,
+   -123, 35, 124, -126, 46, -18, 21, 98,
+   -117, 3, -123, -56, 119, 45, -61, 31,
+   34, -26, -51, 15, 34, -24, 61, -18,
+   -57, 3, -75, -116, 22, -117, -18, -3,
+   -22, -30, -33, 27, 33, 125, 24, -33,
+   35, -77, -92, -33, 25, -127, 32, 36,
+   -69, 34, -6, 54, -16, 34, -13, 64,
+   -126, -128, -8, -86, -8, -63, 70, 22,
+   11, -37, 37, -99, 40, 127, 68, -23,
+   -28, 126, -67, -43, 52, 39, 94, 13,
+   -62, 24, -110, -95, -11, -39, -67, 48,
+   -111, -12, 34, -66, 126, 35, -26, -59,
+   -127, 31, 73, 30, -128, 30, -126, -128,
+   -113, 28, -126, -127, -1, -2, -57, 23,
+   -53, -5, -56, -41, -76, 122, 8, 45,
+   76, -120, -86, 37, -123, 20, 0, 35,
+   -77, 63, -102, -63, -17, -51, 7, -116,
+   -7, -10, -79, -119, -29, 23, -18, 70,
+   -89, -33, -40, 14, -16, -102, -17, -77,
+   33, -11, 49, 58, -15, -61, 40, -49,
+   -36, -47, 18, -23, -81, 123, -15, -14,
+   -83, -32, 113, -1, 1, -85, -20, -85,
+   4, -66, -118, -31, -90, 79, -74, 7,
+   -45, -45, -54, 113, 59, -25, -23, 55,
+   23, -115, 18, -80, -111, -61, 15, -93,
+   -68, -59, 125, -50, -10, -40, 39, -113,
+   21, -92, -126, 79, -23, 34, 37, -16,
+   -6, 28, 31, 12, -96, 9, 34, -45,
+   -32, 114, -36, -5, 118, -49, -22, 119,
+   -5, 51, -37, 3, 17, 14, -52, -92,
+   41, 88, 2, -80, 98, -52, 46, 31,
+   52, -6, -40, 33, -25, 55, -16, 50,
+   -119, -41, 77, -91, 43, -70, 26, -4,
+   -2, 35, -68, 57, 10, -97, -21, -54,
+   18, 117, 121, 13, -40, 104, -10, 50,
+   48, 13, -5, 37, -23, -31, 13, -37,
+   11, 74, 43, -13, 35, -36, 23, 106,
+   -54, 40, -68, -58, -9, 52, 10, -58,
+   27, 90, 7, 43, -58, -4, 93, 1,
+   -89, -64, -42, -17, 20, -48, -126, 122,
+   71, -116, 8, 123, 52, 37, -17, -46,
+   0, 57, -11, 113, -93, 50, -61, 41,
+   -1, 33, 22, 73, 35, -43, 48, 98,
+   -55, 33, -10, -43, 37, -47, -3, 14,
+   -32, -126, -23, 25, 0, -41, 30, 40,
+   81, 102, 84, 15, 43, 28, -6, -68,
+   -10, 62, 83, 0, 13, -25, 35, 30,
+   39, 19, -8, 29, -12, -126, -21, 64,
+   3, 107, 29, -124, 19, 6, -114, -126,
+   -42, 23, -90, -67, 65, -127, 27, -70,
+   42, 5, 125, -3, 28, -72, 27, 14,
+   -72, -41, -80, 42, 0, -11, 28, -3,
+   -37, 39, 43, -47, 57, 41, -54, 23,
+   53, 100, 9, -31, -17, 42, 126, 32,
+   109, -3, 16, -57, -13, 36, -58, 63,
+   -30, 37, 38, 20, 55, 6, 14, -16,
+   24, 38, 23, -8, -13, 73, 127, -3,
+   21, 93, 36, 33, 12, 44, 36, -33,
+   -8, 29, -51, -26, -24, -7, 44, 66,
+   20, -9, 86, 33, 20, -56, 2, 48,
+   12, -83, 23, 72, 14, 39, 57, -78,
+   28, -23, -10, -8, 20, 31, 8, -70,
+   47, -16, -64, 1, 4, 42, -13, -1,
+   -45, 81, 64, 58, 48, -12, 45, -20,
+   -7, 32, -3, -75, 102, -18, -32, 66,
+   -16, -48, 21, 10, 52, 11, -70, 31,
+   -88, -46, -45, -37, 55, 111, 23, 44,
+   6, 40, 36, 40, -10, 127, -20, 6,
+   -42, -45, 6, 68, -4, 40, 37, 19,
+   -36, -61, 30, 26, 18, -57, -7, 5,
+   -121, 20, -15, -90, 23, 30, 11, -1,
+   26, -23, -8, 24, 15, -80, -96, 15,
+   29, 90, -51, 4, -42, 33, 13, 25,
+   48, -33, 96, -19, -45, 25, 17, -68,
+   16, -80, -1, -6, 30, -11, -23, 8,
+   -110, -39, 22, -32, 87, 76, -34, 62,
+   -62, -82, -20, 127, -28, -49, 54, -2,
+   -96, 30, 13, 53, -71, 5, -45, 52,
+   -6, 5, -19, -17, 12, 0, 74, 51,
+   71, 83, -11, 11, 88, -35, 10, -7,
+   8, 42, 13, -49, -29, 0, -75, 8,
+   10, 88, -12, 21, 23, -82, -17, 19,
+   -5, -62, 127, 93, 19, 26, 89, -15,
+   18, 12, 41, 24, 12, -22, 92, -21,
+   -7, -58, -9, -45, 38, -72, -15, -125,
+   -96, 9, 67, -7, -15, -17, -28, 30,
+   6, -7, 99, -47, 29, -31, 24, -14,
+   -107, 15, 12, 57, 26, 3, -57, 19,
+   1, 3, -16, 27, 12, 5, 52, 31,
+   16, -124, -2, 24, -26, -18, -76, -115,
+   3, 97, 30, -20, 127, 32, -6, 29,
+   -37, -59, -40, -20, 29, 49, 11, 20,
+   37, 33, 29, 7, 11, -12, -16, -84,
+   -49, 4, 38, -5, -9, -9, 50, 6,
+   2, -25, 103, 21, 73, 55, 15, -13,
+   58, -9, -4, 50, 7, 1, -8, -6,
+   19, 18, 12, 10, 10, -26, -3, -5,
+   62, 56, 21, -7, 41, -32, 0, 11,
+   -32, -14, 48, -1, 26, -19, 24, 46,
+   -8, 0, 26, 58, -5, -26, -27, 4,
+   36, 59, -25, 3, 4, -28, 26, 63,
+   51, 48, -61, -121, -19, -45, 49, 1,
+   -1, 58, 5, 38, 47, 28, 14, -2,
+   20, -11, -33, -13, 42, -29, -53, 38,
+   -44, 107, -9, 60, -10, -78, -15, 78,
+   21, -71, -36, 58, -27, 15, -4, -41,
+   -50, -85, -61, -62, -105, 59, 39, 29,
+   -27, -16, 68, -26, 26, -4, -48, 58,
+   -15, -13, -2, 48, -33, -47, 34, 1,
+   4, -36, -13, 32, -3, 63, 14, 15,
+   107, -31, -37, -25, 49, 112, -29, 22,
+   20, 89, -12, 5, -1, 91, -54, 44,
+   32, -42, -14, 43, 113, -61, -46, 126,
+   -99, 63, -16, -75, 119, 57, 42, -124,
+   99, 91, 57, 31, -81, 16, -57, -32,
+   -79, -6, 123, -36, -47, 109, -125, 1,
+   -72, 21, -50, 82, -4, -2, -36, -127,
+   -28, 8, -105, 51, 67, 34, 50, 9,
+   -25, -125, 54, 12, 28, 104, -15, -22,
+   29, 3, -14, 35, 9, 26, -25, -72,
+   -26, 98, 16, 23, 16, -8, 20, -112,
+   74, 98, -18, -56, 85, 127, -51, 1,
+   -84, 38, -31, -86, -45, 46, 5, -54,
+   -54, -114, 47, -43, 20, 121, 21, -18,
+   -11, 95, 23, -27, -25, 39, 8, -10,
+   17, 28, 61, 6, -56, 58, 4, -37,
+   35, 23, 51, -19, 5, 19, -1, -1,
+   14, 33, 15, 37, -11, 19, 35, 45,
+   13, -14, 46, 19, -42, 55, 28, 51,
+   30, 54, 120, 17, 66, 42, 66, -12,
+   -9, -13, 44, 38, 5, -7, 27, 75,
+   78, 35, 31, 78, 49, -4, -14, 40,
+   33, 41, 1, -68, 23, 53, -12, 11,
+   13, 28, 29, -43, -41, 42, -25, -12,
+   38, 18, -4, 7, 38, 29, 44, 31,
+   -26, 61, 37, 49, -19, -6, -17, -12,
+   49, 56, 33, 80, 43, 42, 29, 62,
+   4, -53, 34, -57, 30, 13, -55, -28,
+   19, -6, 43, -43, 19, 48, -16, 29,
+   -25, 64, 30, 51, -62, -18, -16, 15,
+   -30, 8, -14, 60, 20, -12, 49, -32,
+   -28, -42, 3, 17, -55, 11, 26, -51,
+   -25, -38, 47, 48, -29, 33, 9, -20,
+   -6, -12, -54, 111, 4, 31, 77, -5,
+   -2, -50, 46, -5, -18, -30, 28, 33,
+   11, 48, 22, -3, 3, -34, -41, -4,
+   -27, -16, -41, -10, -21, 34, 9, 46,
+   23, 46, 25, -28, 28, 32, -16, 47,
+   127, 36, -8, -21, 57, 20, 35, 80,
+   7, 18, 83, 16, 59, -56, 3, -23,
+   111, 40, -24, 23, 62, 101, 29, -122,
+   26, 74, 36, -27, 8, 79, -94, 47,
+   -121, 12, -63, -4, -2, -76, 8, -18,
+   -45, -3, -112, 66, -71, -7, 19, 21,
+   -108, -120, -10, -27, -43, 76, 67, -127,
+   -35, 12, -2, 61, 103, -34, -3, -6,
+   24, 80, 44, 5, -13, -52, -4, -14,
+   70, 38, -46, 65, 79, -62, -93, -5,
+   -101, 95, -20, -52, 55, 11, -126, 11,
+   -38, 23, 16, -47, 7, 66, -65, 2,
+   -16, -26, 21, 43, 27, 42, -41, -50,
+   9, -126, -21, -67, 34, 51, 47, 77,
+   -3, 0, 30, 19, 17, 3, 50, 1,
+   120, 20, -12, 90, 56, 1, -21, 24,
+   -15, 97, -2, -19, -35, -1, 45, 12,
+   -41, 34, 8, 12, -23, 43, 121, -33,
+   62, 39, -119, -26, 36, 44, 14, 26,
+   5, 8, -64, 16, -10, -43, -45, -22,
+   5, -16, -21, 40, 13, -16, 31, 109,
+   -31, -38, 121, 4, -59, 85, 14, -57,
+   20, 3, -51, 45, -40, 33, 13, -11,
+   -9, 27, 55, 43, 10, 6, 14, -37,
+   -31, 127, 22, -7, 34, 11, -102, -60,
+   29, -58, 21, 14, 99, -16, -101, 17,
+   -64, 36, -6, -62, 22, -37, -49, 30,
+   74, 88, 95, -33, 45, 20, 52, 55,
+   -98, -49, 19, 56, 9, 124, 93, 0,
+   -14, -66, 34, 20, -63, -40, -12, 59,
+   -7, -51, -9, 68, 4, 124, -37, -78,
+   32, -9, -4, 69, 21, -19, -27, -33,
+   -58, 60, -39, -32, -112, -5, -35, 124,
+   -18, 47, -99, -57, 15, -85, 49, -98,
+   104, -86, -104, -57, -17, 9, 21, -9,
+   -85, 65, -127, 75, 113, 71, -5, 127,
+   -53, -60, 14, -120, 35, -2, 20, -38,
+   -82, -50, -67, -8, -54, -52, -7, -8,
+   -10, 14, 11, 112, -5, -40, 37, 21,
+   -90, -39, -67, -127, -25, -27, 80, -14,
+   -39, 16, 61, -18, 38, 41, 93, -4,
+   -5, -80, -35, -47, -6, -12, 23, -37,
+   108, -8, -126, -125, 12, -54, -26, 40,
+   -52, -72, -26, 47, -35, -98, -15, -68,
+   -51, -21, 21, 40, -89, 121, -116, -5,
+   -23, -1, -123, -125, 21, -34, 2, -47,
+   -18, -49, -123, -19, -94, -21, 37, 13,
+   43, -79, 81, -2, -21, -11, 104, -16,
+   -37, -29, -46, -3, 64, -38, -120, -10,
+   25, 15, -17, 1, 110, -5, -24, -42,
+   -23, 43, -17, -93, -122, -3, -35, 0,
+   11, -84, 24, -49, 78, 0, -22, -49,
+   -54, 83, -8, 8, -13, 64, 46, 27,
+   -99, 89, -27, 69, 1, -53, -83, 5,
+   19, -91, 42, -97, 92, 62, 51, -79,
+   7, 13, 34, -37, 57, 16, -53, -55,
+   4, -26, -11, -29, -39, -60, 69, -25,
+   -8, 19, 4, -6, -123, 73, 26, -61,
+   21, -90, 8, 7, -123, -20, 12, 29,
+   53, -121, 83, -39, -24, -46, 15, 24,
+   31, 2, -89, -64, -3, 85, -8, 127,
+   7, 14, -25, -3, -64, 104, 84, 74,
+   -38, 39, 25, 119, 67, 15, -71, 28,
+   113, 65, -27, -25, -19, -11, 19, 76,
+   -3, -88, -75, -34, -110, -64, 19, 69,
+   -76, 102, -8, -68, -12, -43, -31, -9,
+   120, -36, 46, 96, -73, 89, 83, 98,
+   50, -81, 68, 34, 39, 68, -17, -19,
+   47, 111, 15, -58, 96, 1, 18, 2,
+   -73, 82, -59, 5, 47, -112, 9, -43,
+   4, 18, -47, 82, -93, 88, -48, 58,
+   -62, -57, 67, -41, 87, -29, 65, 69,
+   63, 54, 5, -75, -4, 38, 57, 24,
+   -48, -8, 13, -18, 38, 126, -128, -66,
+   43, -4, -103, -21, 47, 59, 19, 70,
+   26, 1, -9, 10, -60, 18, -120, 21,
+   -8, -36, 15, 120, -111, -5, 58, 2,
+   -33, -119, -77, -105, -7, 118, -116, -3,
+   18, 73, -35, 2, 17, 1, 56, 16,
+   -26, -26, 17, 27, 52, 0, -12, -5,
+   41, -19, 36, 68, -7, -7, 70, -127,
+   -49, -19, 44, -88, 22, -118, -52, 48,
+   63, 66, -97, 54, 46, 43, -47, 59,
+   -62, -91, -58, -39, 95, 35, 19, -15,
+   42, -31, -41, 31, -17, 36, -114, 34,
+   -105, 71, -4, -40, -40, 11, 47, 5,
+   -9, 101, 80, 36, -9, 8, 47, 23,
+   -19, 31, 22, 69, 39, -14, 124, -37,
+   23, 60, 69, 11, -3, 57, 28, 59,
+   1, -3, 125, 17, 65, 23, -24, 0,
+   33, 64, 34, 30, 33, 42, 29, 31,
+   71, 64, -16, 58, 40, -61, -46, 29,
+   2, -38, 11, 14, 68, -2, 21, -26,
+   25, 5, -19, -22, 92, 38, 51, 22,
+   127, -32, 99, 77, 42, 34, 75, -58,
+   46, -3, 2, 13, 66, 27, -22, 37,
+   13, 20, -29, 47, -56, 68, -78, 14,
+   43, -36, -9, 44, 39, -20, 18, -53,
+   18, -11, 9, 16, 33, 19, -23, -9,
+   40, 55, 52, 23, 21, -4, -31, -18,
+   22, 4, -12, 95, 2, -10, 63, -17,
+   -12, -15, 82, -23, 1, 16, -22, 88,
+   -34, -17, 4, 49, 9, 41, 62, -9,
+   -6, 32, -64, 35, -14, -11, -31, 19,
+   50, 41, 91, -2, -62, -16, -5, -23,
+   -10, 11, 66, -56, -2, -59, -1, 74,
+   11, 110, -15, -25, 90, 69, -18, 68,
+   -38, -7, 10, -14, 114, 1, -15, -57,
+   52, 118, 45, -61, -65, 116, -100, 11,
+   -73, -116, 81, 11, 24, -33, 1, -39,
+   -88, -48, 11, 70, 7, 59, -50, 13,
+   12, 30, -96, -65, 44, 60, 12, 23,
+   -50, 118, -28, 41, 59, -10, 47, -5,
+   -54, 97, -27, -102, 33, 31, -56, -4,
+   -8, -83, 45, -29, -19, 122, -15, -39,
+   89, 11, 3, -67, -21, -18, 71, -2,
+   -49, 49, 97, -69, -68, -8, -79, 63,
+   -27, 115, 1, -116, -40, -119, 19, 37,
+   -30, 86, -17, -85, 53, -40, -23, -78,
+   -58, -88, 99, 119, 47, 22, -30, 42,
+   25, 40, -62, 11, 34, -29, -32, -27,
+   26, 16, -15, -72, -5, 1, -81, 20,
+   -17, 13, 120, -30, 124, -29, 41, -72,
+   19, 34, -92, 63, 44, 76, 12, -33,
+   50, -2, 77, -1, 41, -1, 17, 41,
+   73, 40, -8, -22, 95, 46, 71, -1,
+   -80, 41, -44, 10, 4, 37, -43, 70,
+   43, -123, -36, 42, 39, -8, 13, -17,
+   3, 76, 29, 22, 9, 29, 28, 22,
+   -44, 14, -44, 4, 26, 55, 38, 23,
+   -38, -44, -8, 59, 14, 37, 43, 48,
+   49, -20, -3, 38, 12, 46, 5, -12,
+   -25, -21, -25, -71, 64, 55, 124, 18,
+   57, 28, 48, -118, -15, 41, 43, 45,
+   18, -76, -24, 11, -8, -72, -20, 41,
+   -45, 97, -35, -68, -1, 104, -95, -39,
+   9, -77, -23, -8, -9, 24, -13, -22,
+   86, -3, 55, -125, -10, -65, 44, 49,
+   49, 19, -122, -6, 41, 54, 80, -16,
+   -76, 48, 111, -125, -21, 98, -6, -21,
+   31, -16, 0, -33, -119, 42, 64, 12,
+   6, 56, -8, 55, 44, 66, 27, -20,
+   -73, -37, 31, -16, -24, 11, 126, 24,
+   26, -61, 13, -24, 69, -4, -33, 0,
+   14, 11, 60, -15, -125, -68, -56, 60,
+   -10, -126, -26, -124, 73, -54, 40, -70,
+   17, 57, -28, -37, -28, 20, -72, 27,
+   -13, -119, 6, -123, 23, 106, -18, 65,
+   28, 61, -126, -59, -16, -57, -35, -125,
+   3, 3, -122, -127, -36, 51, -3, -15,
+   42, -87, -71, -117, -117, 99, -120, -11,
+   -6, 0, -12, 48, -58, 15, -128, -59,
+   -19, 43, 2, 49, 49, -18, -75, 22,
+   105, 19, -73, 117, -20, 10, -4, 13,
+   -99, 25, -125, -79, -89, 51, -27, -28,
+   0, 40, 3, -55, 6, 31, -27, 39,
+   -3, -12, -14, -11, 28, -55, -57, 33,
+   54, -126, -74, 27, -8, 96, 17, -70,
+   -21, -35, -44, -7, -14, 19, 57, 33,
+   9, -46, 16, 18, -14, 43, -43, 0,
+   11, 16, -3, 0, -28, 80, 54, -3,
+   -12, 12, -13, -15, -26, 102, 4, -2,
+   16, -21, 31, 16, 3, 4, -4, -5,
+   37, 37, -61, 41, 27, -4, 1, -30,
+   13, -41, -14, 16, -2, -7, 31, 127,
+   -10, 31, 105, 19, 35, 100, -14, -30,
+   -3, 27, 82, 89, -71, 61, 9, -18,
+   26, 49, 78, 33, -22, 1, -47, -24,
+   -117, -54, -55, 6, -59, 116, -48, 41,
+   38, 3, 114, -65, 0, 21, 16, -16,
+   -13, -33, 7, 15, 12, 44, 69, 35,
+   11, -32, -59, -87, 71, 59, -20, 26,
+   -35, -3, 1, -25, 56, 56, 127, -15,
+   -15, 96, -4, 66, -47, -76, 57, -48,
+   84, 8, 42, 78, -10, 126, -40, -34,
+   -14, 33, 22, -23, 48, 8, -10, 3,
+   -32, 13, 61, 21, -2, 0, -62, -26,
+   -96, 61, -59, -93, -72, 119, 34, -58,
+   -18, 35, -18, -68, -13, -38, -49, -28,
+   -79, -30, 33, 78, 80, 69, 46, 50,
+   -8, 21, -69, -77, -41, 105, 7, -122,
+   42, 24, 69, 39, -69, 118, -125, 25,
+   -124, 12, -18, -59, -7, -31, 62, 8,
+   0, -2, -15, 0, -46, -99, 9, 86,
+   9, 33, 35, -42, 3, 121, 125, -50,
+   -76, 113, -85, 21, 8, -68, 73, -18,
+   -17, -30, -128, 8, -119, -33, 31, 28,
+   -11, -5, -9, 9, -31, -24, 42, -79,
+   25, 5, 30, 121, -1, -22, -95, 88,
+   -89, -29, -100, -104, -100, 94, -75, 31,
+   75, -65, -125, -91, 48, -125, -27, 20,
+   105, -126, -95, -49, -29, 14, -6, -35,
+   -36, -22, -25, 16, 53, 5, 52, 32,
+   -24, 80, 16, 83, 31, 42, -120, 17,
+   34, -56, -2, 32, -99, -40, -17, -27,
+   122, 87, -70, 38, -28, -116, 0, 17,
+   -41, 40, -82, 31, -27, -2, 39, -68,
+   17, 24, 81, 40, -47, -9, -22, 8,
+   30, 37, 30, -26, -20, 17, 41, -27,
+   64, -20, 31, 27, -38, 37, -13, -36,
+   -57, -32, -32, -31, -31, -63, -12, -23,
+   -26, -19, 13, -55, -23, 79, -17, 5,
+   30, -5, 22, -27, 34, 14, 4, -14,
+   -109, -1, -10, 21, -8, 19, 33, 44,
+   1, -2, 39, 16, 77, -22, 0, -8,
+   37, -30, -28, -125, 0, -48, -14, -117,
+   -71, -60, -55, 40, 27, 14, 98, 47,
+   120, -75, 93, 7, 5, -2, -18, 60,
+   -52, 66, -73, 11, 8, -75, -26, 38,
+   -15, -106, 91, 76, -94, -39, -87, -15,
+   -38, -13, 55, -26, -123, -68, 39, -60,
+   8, -18, -5, -7, -5, -37, 65, 55,
+   47, 115, -20, 48, 40, -34, 27, -23,
+   -65, 4, -79, -126, 36, 93, 43, 5,
+   84, 14, -49, 52, 65, -80, -50, -29,
+   -31, 56, -37, -56, -66, -51, 30, -43,
+   -24, 41, 3, 110, 56, 29, 40, -9,
+   23, 40, 6, -16, 5, -77, 73, 2,
+   -30, 6, 0, -42, 32, -1, -3, 82,
+   -106, 6, -47, -41, -58, -38, 85, 3,
+   12, -79, -18, -1, 48, -19, 9, 88,
+   4, 35, -66, 61, 72, -7, -42, -30,
+   -29, 21, 113, 28, 93, -4, 71, -116,
+   6, 4, 23, -51, 26, -3, 3, 26,
+   16, -28, 27, 1, 69, -50, -35, -19,
+   -47, -41, 12, -99, -72, 78, 19, 20,
+   110, 46, -65, -36, -9, -10, -18, 39,
+   -27, 43, 15, 15, 97, 57, -23, 11,
+   38, -24, -88, 18, -41, 71, 42, -34,
+   21, 94, 53, -19, -25, -23, -82, 61,
+   -61, -17, -1, -127, -19, -2, 53, -75,
+   44, -118, -45, -12, 80, -120, 36, -95,
+   -55, 46, -16, -29, -32, 46, -98, 30,
+   -52, 10, -44, 38, -29, -14, -63, -7,
+   21, 39, -66, 72, -17, -39, -17, 9,
+   -23, -40, 36, -51, 42, -87, 29, -42,
+   -122, -9, 44, -47, -39, -34, -76, 58,
+   -99, -7, 8, -18, -8, -44, -42, -11,
+   -71, -29, 59, 4, -82, -13, 25, 52,
+   31, 5, -22, -3, 67, -43, -68, -44,
+   29, -20, -63, 61, -55, 98, -31, 42,
+   -102, -8, 30, -88, -5, -24, -127, -110,
+   -38, -29, 81, -71, 33, 9, -27, -20,
+   67, -108, 55, -27, -94, 11, -60, -16,
+   33, -6, 24, 127, -94, -86, -85, 16,
+   4, -40, -70, 20, -43, -20, 48, -25,
+   49, -126, 78, -62, -22, 87, 36, 31,
+   33, -125, 39, 81, -117, -60, 2, -19,
+   -48, 18, 24, -27, 12, -22, -14, -14,
+   -70, -2, -42, -109, -1, 56, 9, -110,
+   103, 35, -17, -31, -60, 72, -49, 45,
+   70, 43, 37, 107, 124, 70, -13, 78,
+   -48, -47, -38, 82, 23, 127, -29, -22,
+   9, 30, -112, -9, 86, -69, 52, -77,
+   36, 67, 3, 113, -32, -53, -23, 18,
+   -122, -53, 7, 27, 22, 1, -71, -51,
+   87, 62, -56, 43, -116, -126, -27, 16,
+   53, 46, -62, -13, 36, 94, -27, 29,
+   6, 58, -14, 103, -21, -24, -48, -54,
+   2, 94, -3, 57, -124, -104, -9, 106,
+   38, -69, -13, -43, 35, -65, -83, -89,
+   -126, 35, -4, -45, -28, -47, -65, -82,
+   75, -36, 61, -81, 85, -112, 119, 59,
+   -7, -11, -63, 50, 23, -1, 59, 0,
+   4, -56, -68, -40, 8, 15, -20, 21,
+   58, 3, -85, -64, -2, -26, 28, 32,
+   -53, -27, 70, 9, 87, -1, -15, -121,
+   -34, -69, 10, 56, -10, 61, -58, 105,
+   25, -59, 28, -50, -32, 33, -14, 42,
+   -24, 9, -14, 10, -3, -28, 13, 56,
+   -59, 10, -68, 14, 37, 57, -20, -9,
+   -17, -80, 24, 20, -18, -1, 122, -8,
+   5, -72, -57, -118, 2, 14, 30, -27,
+   -127, 38, 39, -79, 18, -37, 93, 46,
+   27, 22, -9, 1, -9, 33, 45, -46,
+   43, -45, -43, 15, -7, 21, 2, -59,
+   34, 9, 41, -42, -28, 24, -12, -12,
+   5, -16, 6, -58, -51, 37, 49, 25,
+   -51, -5, 31, -124, -32, -39, -48, 6,
+   34, -86, -63, -9, 34, -4, -32, -27,
+   22, 6, -3, 94, -44, 1, 42, 3,
+   -34, -39, 127, -32, 53, 72, 20, -42,
+   -75, 27, -21, -9, -25, 17, -61, 62,
+   -77, 2, -8, -94, -26, -42, 40, -69,
+   0, 17, 56, -115, 1, -6, 12, 14,
+   23, 10, 12, -56, 107, -29, -28, -33,
+   -45, -64, -105, -22, -19, 59, -10, -69,
+   45, 4, -58, 32, -12, 22, -59, 35,
+   -22, 70, 19, 49, -17, -78, 4, 21,
+   50, -49, 28, 18, 32, 72, 60, 5,
+   47, 46, 30, 11, 73, 1, -57, -6,
+   87, -97, 32, -23, 55, 26, -35, 9,
+   37, 105, 10, 18, -118, 99, 125, 54,
+   45, 109, -26, 26, -39, -56, 7, -19,
+   -38, 35, -128, 47, 17, 0, 97, -69,
+   -63, 27, 23, -19, -79, 73, -46, 3,
+   -22, 19, -41, 123, -44, 109, 33, 34,
+   -2, 45, -126, -43, -14, -13, -5, 40,
+   26, -4, -127, -124, -19, -82, -111, 109,
+   76, -43, -30, -94, 77, -82, 0, -1,
+   -7, 9, -36, -60, -19, 42, 28, -10,
+   -90, 20, 83, -4, -60, -120, -8, -37,
+   -18, -37, -84, -85, -46, -37, 22, -36,
+   15, 71, -23, 14, -125, -2, -41, -9,
+   -40, 39, -43, -126, -6, -10, -94, -2,
+   10, -113, 15, -79, -7, -51, 25, -30,
+   -40, -28, -121, -25, -45, -70, -11, -51,
+   -128, 46, 81, -92, -89, -9, -54, -18,
+   -16, -96, -84, 37, -77, -66, 21, -38,
+   -54, -3, -33, -33, -111, -100, -11, 3,
+   -6, 20, -128, -3, -54, -41, -21, 54,
+   -53, -128, -127, 28, -55, -107, -10, 41,
+   112, 35, -25, 11, -43, 93, -61, 38,
+   -54, -52, -104, -1, 5, -60, -122, -101,
+   -22, -19, 104, -57, 7, -54, -84, -33,
+   78, 34, -2, 15, -122, -14, -60, 114,
+   -75, -31, -42, -86, -67, -66, 38, -26,
+   -5, -124, -15, -3, -52, -127, -13, -50,
+   -108, 64, 37, -19, -51, -67, -16, 32,
+   -128, 31, -46, -48, -66, 7, -31, -61,
+   -5, -53, -113, 47, -45, 0, 102, -18,
+   -46, -101, 16, -37, -11, 29, 14, 15,
+   -20, 23, -24, -30, 43, 3, -28, 16,
+   -21, 18, -42, 2, -16, -69, -75, -75,
+   27, 19, -20, 52, 37, -121, -22, 17,
+   12, 45, -84, -50, 12, -126, -15, 19,
+   -24, -60, -23, -61, -67, 6, 122, -116,
+   82, -35, 24, -30, -87, 26, -26, -17,
+   -42, 5, -25, -118, -17, -67, -60, 39,
+   15, -100, 30, -121, -39, -67, -13, 33,
+   20, -36, -10, -9, -94, -107, -22, 21,
+   -126, -34, -11, -83, -82, -46, -119, -35,
+   -86, 4, -123, 44, 23, -42, -84, -56,
+   4, -53, -6, 39, -12, -50, -18, 37,
+   42, 45, -123, -32, -6, -33, -39, -4,
+   -97, -68, 9, 74, -53, -125, -83, -2,
+   -22, 57, -21, -90, -69, -9, -76, 43,
+   -15, -1, -18, -20, 2, 18, 5, -93,
+   -31, 76, 5, -1, 5, 44, 14, -5,
+   6, -48, 48, -2, 38, -59, -36, 77,
+   -50, -32, -11, 46, 33, 69, 62, -63,
+   20, 110, 15, -42, 10, -4, 78, 8,
+   -24, -59, 33, 65, 34, 48, -22, 26,
+   122, 51, -7, 10, -58, -2, 18, -27,
+   7, -126, -84, -4, -40, 48, -124, -127,
+   -6, 46, 55, -13, -83, 84, 31, 2,
+   34, -1, -19, -65, 38, 41, 29, 11,
+   -121, -55, 74, 20, 19, -2, 14, 35,
+   -15, -80, -33, -46, 36, 13, -49, 40,
+   -71, -41, 65, -107, 32, 17, 3, 8,
+   45, -50, 24, 4, 2, 55, -43, 13,
+   -12, -20, 15, 9, 16, -26, -25, 126,
+   -9, 126, 31, 27, -20, -125, -41, -46,
+   -7, -39, -60, -31, -108, 8, -47, -12,
+   -89, 67, -8, 57, 7, -10, 95, -7,
+   -109, 29, 47, 93, 79, 44, 15, -45,
+   50, -41, -13, 7, -56, 43, 48, -54,
+   60, -10, -29, -47, 0, 82, 22, -84,
+   2, -8, -39, 31, 4, -27, 12, 24,
+   -91, -8, 39, 3, -23, 5, -122, -74,
+   64, -9, -42, -53, 27, -94, 18, 18,
+   -3, 73, 68, 18, 6, 98, -18, -2,
+   -78, 8, -45, 14, 54, 15, 58, 40,
+   33, -31, 6, -10, 7, -6, 0, 41,
+   37, 121, -29, 36, 14, -56, 63, 9,
+   15, -122, -7, -67, -4, -115, 0, -41,
+   19, 37, -13, 17, 11, -13, 10, -29,
+   -77, 18, -9, -10, -79, -3, -8, -40,
+   -25, -22, -9, 0, 27, -105, -23, -65,
+   7, -35, 29, -13, -29, -34, -71, 55,
+   37, -3, 24, 69, 7, 32, -24, 18,
+   -60, -20, 39, 101, 9, 28, -78, -68,
+   -88, 22, -19, 28, -87, -6, -33, 44,
+   1, 37, -69, 8, 18, 48, -15, -41,
+   -110, 23, 43, -32, 5, -75, 10, -16,
+   28, -31, -17, 68, 17, -38, 4, 47,
+   1, -4, 33, 35, 83, 50, 38, 11,
+   40, 51, 1, -20, -9, -35, 76, 34,
+   -4, -24, -27, -10, 6, 60, -44, 14,
+   104, 43, 19, -23, -16, -127, 21, 13,
+   -11, -27, 30, -42, -6, 70, 27, -52,
+   41, -13, 52, -22, 30, 29, -28, -85,
+   -55, -72, 125, -49, 6, -12, 23, -4,
+   -44, 32, 49, 68, 4, 13, -35, -61,
+   -6, 51, -124, 27, 82, 31, 28, 121,
+   -120, 26, -33, -42, -44, 107, 88, -16,
+   -98, 30, 25, -19, 6, -42, -77, -8,
+   35, -13, 35, -23, -70, -71, -35, -45,
+   -54, 127, -103, -46, -74, -110, 32, 33,
+   10, -38, -13, -29, -23, 56, 18, 59,
+   -110, 18, 11, -7, 41, 2, 126, 10,
+   6, -20, -7, -46, -55, -4, 22, -6,
+   35, -6, -79, -72, -11, 4, -8, 126,
+   -3, -18, 71, 21, -7, 2, -107, -123,
+   -22, -45, -68, 37, -45, 87, 48, -32,
+   -12, -54, 82, 76, -44, 26, -36, 48,
+   -127, -126, 65, -10, -28, -18, -49, -127,
+   -57, -75, -82, -57, -91, -17, 12, 18,
+   6, -1, 0, 38, 25, -121, 77, 38,
+   -109, 24, -119, -17, -22, 10, -10, -1,
+   -72, -44, -26, 49, -58, 48, 14, 9,
+   -30, -44, -26, -48, -30, -36, 84, -87,
+   54, 11, -42, -120, 56, -102, 17, 33,
+   65, -1, 27, -41, 11, 2, 30, -44,
+   12, -2, 86, -39, -59, -115, -46, -60,
+   -9, 75, -10, 4, -117, 62, -34, -126,
+   -33, -47, 54, 15, -127, 45, 3, -17,
+   -21, -55, -51, -104, -41, -20, 59, 21,
+   11, 25, 38, 74, 40, -23, 8, 23,
+   31, -75, -3, 56, 26, -38, 104, -11,
+   -8, 100, -5, -35, 39, -1, 67, -62,
+   47, 48, -8, 101, 39, 45, -20, -1,
+   -22, 39, -3, -17, -7, -17, 19, 10,
+   26, 4, -8, -5, 69, 4, 2, -3,
+   13, 45, 19, -8, 90, 12, 39, 10,
+   18, 1, -30, 15, 53, 19, -40, -20,
+   -4, 29, -7, 9, 14, 5, 16, 49,
+   -61, -31, -64, -36, -8, -8, 25, 21,
+   -26, 7, 0, 4, 2, 21, 2, -60,
+   42, 5, -48, 79, 8, 29, 34, -26,
+   -79, 22, -43, 69, 78, -72, 30, -41,
+   -103, -15, -35, -52, 8, 29, 110, -51,
+   -32, 1, 40, 33, -46, 22, 48, 24,
+   24, 58, -107, 6, -72, 39, 35, 8,
+   -28, 67, 28, 79, 118, 3, -45, 121,
+   0, 18, -40, 93, -61, -28, -33, 43,
+   19, 83, 45, -9, -123, 82, 39, -3,
+   -39, 16, -17, 25, -27, 25, -49, 71,
+   45, -59, 8, -44, 12, -84, 4, -3,
+   56, -97, -17, -84, 88, 61, 1, -22,
+   116, 35, -31, -13, 26, 120, 10, 51,
+   -17, 38, 48, -24, -21, 124, -8, 43,
+   -33, 29, -34, 32, 27, 31, 64, -127,
+   64, 4, 12, -50, -128, -33, -26, 45,
+   -124, -127, 3, 0, 4, -17, 0, 56,
+   -13, 86, -128, -46, -126, 52, 55, 54,
+   13, -10, -27, -52, 31, 6, 51, 121,
+   50, 9, -102, -32, -87, 8, 61, -4,
+   -19, 2, 24, 11, 74, -27, -114, -3,
+   58, -1, 40, -112, 70, -24, -71, 29,
+   -24, -75, 55, 1, 64, -1, -18, 39,
+   7, -78, -22, -111, -122, 108, 22, 37,
+   -13, 13, 17, -17, -113, 32, -9, 23,
+   71, -93, 11, 110, 74, 72, -26, -6,
+   50, 48, -51, -73, 120, 30, -8, 28,
+   41, 82, 34, 63, 9, 51, 123, 57,
+   16, -105, 29, 38, 18, -39, 47, 31,
+   0, -56, 39, -36, -24, 62, 87, 39,
+   -25, -38, -67, 84, 6, 48, 107, 26,
+   -49, -94, 52, -16, -17, -4, 1, 68,
+   -19, 90, -7, 53, -19, 10, -16, -38,
+   -9, -55, 12, -31, 44, 19, 70, 28,
+   28, -32, -11, 31, -3, -58, -3, 50,
+   46, 28, 37, 6, 31, 5, -27, 54,
+   26, 33, -43, 46, 126, 44, 80, 12,
+   8, 73, 20, -62, 86, 42, -10, -15,
+   25, -83, -25, -119, -54, 16, -35, -21,
+   -40, 35, 37, 5, 7, -8, -36, -20,
+   43, 38, 61, -124, 65, 33, -30, 107,
+   58, -26, -41, -14, -43, 29, 116, -40,
+   -55, 76, -83, 59, 36, -116, -1, -106,
+   -57, 121, 26, -67, -32, 77, -9, 35,
+   -111, 47, 36, -41, 80, -64, 11, 121,
+   -80, -4, -116, -71, -47, 56, -15, 27,
+   24, -74, 11, 86, -20, 66, -93, 18,
+   -35, 21, -14, -4, -37, 8, 19, 64,
+   -81, -57, -33, 126, 32, -32, -12, -22,
+   63, 43, -24, -36, -49, 29, -105, -115,
+   -73, -124, -43, 77, -99, 120, 4, 42,
+   -77, 46, 55, 61, 45, 108, -120, 34,
+   -49, -18, -61, -46, 8, -121, -79, 18,
+   91, 45, 29, -61, -20, -118, 41, -20,
+   105, -5, 46, -12, -4, 14, 8, 43,
+   1, -38, 56, 88, -22, -94, 109, -71,
+   13, -27, 16, 70, 74, -123, 60, 44,
+   -25, 18, -24, -85, 39, 72, 21, 22,
+   -35, 4, -18, 28, -1, -42, -53, 18,
+   32, -5, 45, -21, 35, 123, 63, 7,
+   45, -128, 1, -16, -86, 26, 25, -14,
+   20, 33, 112, 38, -3, -49, 67, -1,
+   -20, -74, 6, -46, -23, -23, -114, 31,
+   -77, -15, -24, -67, 74, 42, -61, 22,
+   25, -99, 50, 71, 6, -42, 58, 54,
+   -19, 17, -3, 60, 9, 56, 116, 32,
+   82, -28, -10, 15, -43, 25, 52, -105,
+   57, 4, -41, 2, -84, 43, 36, 15,
+   2, -60, -48, -34, -49, 2, -71, 66,
+   54, 33, 3, 60, -22, 18, 32, 30,
+   -8, 52, -64, -21, -16, -23, -13, 17,
+   -51, 0, 5, -58, 23, 5, -56, -5,
+   72, -27, 83, 18, 42, -24, 20, 10,
+   -30, -17, 49, -23, 51, -54, -7, 11,
+   20, 89, 21, 9, -83, -22, -121, -36,
+   95, 29, 42, -71, -38, 6, 60, -79,
+   -119, 35, 8, 35, 14, 110, 68, 35,
+   -62, -26, 14, 52, -51, -41, -3, -35,
+   35, -34, 64, -81, 74, 10, -7, -45,
+   33, 19, -55, -26, -71, -8, 19, -67,
+   -4, 49, -36, 25, -33, -40, -39, -10,
+   -25, 4, -30, 100, 8, 33, 8, 9,
+   22, 5, -39, 61, 10, 79, 89, 42,
+   -27, -9, -15, -64, 24, 80, 26, -9,
+   19, -11, -68, 43, -51, -14, 39, -16,
+   54, -11, -121, 48, 64, -95, -31, -46,
+   7, -43, -19, -61, -111, 79, -34, -126,
+   31, 5, 60, 51, -108, 42, -44, -43,
+   -31, -81, 29, 24, -55, 11, -21, 0,
+   50, 1, -66, -31, -40, 6, -35, -31,
+   -13, 41, -7, 74, -45, -123, 44, -25,
+   -78, -24, 40, 49, -3, -38, -25, 3,
+   -36, -93, 50, 53, 58, 81, -21, -24,
+   -47, 7, -15, -47, -13, 29, 124, -10,
+   13, -41, -82, 8, -51, -20, 13, -48,
+   57, 38, 26, 15, -78, -23, -46, -3,
+   -18, -16, -53, 6, 26, -43, 20, 12,
+   6, -1, -56, 40, 81, -62, 37, -30,
+   29, -10, 28, -44, -37, 11, -48, -7,
+   -29, -90, 23, -25, -35, 6, 49, -10,
+   -2, -30, 6, -79, -124, -13, 56, 44,
+   -8, -80, 66, -28, -56, -11, -41, -74,
+   14, -4, -33, 43, 0, -30, -40, -37,
+   10, 7, 30, -24, -13, 22, -33, 36,
+   -18, 64, -9, -25, -59, -72, -15, -31,
+   21, 56, -6, -102, 0, 46, -35, -3,
+   -23, 39, -15, 117, 54, -10, 48, 19,
+   -42, -31, -26, 11, -2, -35, -94, -30,
+   41, 26, 41, -23, -62, -47, -88, 51,
+   -16, 13, 0, 56, -21, -57, -26, -17,
+   64, -5, -128, -24, -51, 53, 32, -76,
+   39, -81, 87, -116, -32, -24, 63, 76,
+   -44, -128, 46, 69, -128, 12, 24, -128,
+   5, 88, -16, 76, 117, -6, 5, 26,
+   -27, -36, -40, -73, 2, 4, -69, 39,
+   127, 53, 93, -124, 16, 46, 19, 27,
+   82, 102, -58, -96, -1, 123, 64, 13,
+   121, 116, 127, -77, 6, -70, 19, -127,
+   -101, -23, -125, 126, -126, -17, 65, -65,
+   13, 124, 64, 35, -95, 0, 127, 42,
+   -18, -37, -64, -47, 85, -126, -122, 40,
+   7, -67, -12, 6, 1, 105, 86, 20,
+   22, -16, -36, -22, -13, 1, -14, 39,
+   70, 16, -40, -29, 16, 42, 8, -47,
+   11, -50, 1, 1, -33, 5, -31, -91,
+   -19, 21, -42, -65, 0, -10, 56, 12,
+   -48, -19, -4, -12, 3, -9, 16, -15,
+   -64, 5, -73, 9, 9, -4, 23, 14,
+   -46, 21, -8, -43, -32, 43, -6, -2,
+   15, 4, -19, 26, 11, -15, 28, -13,
+   18, 56, 34, 42, -18, 25, -32, -11,
+   45, -37, 1, 43, 38, 4, -42, -15,
+   -40, 8, -19, 19, -42, -31, -20, 34,
+   -16, -50, 3, 18, -18, 17, -6, -15,
+   -21, 5, 4, 91, 80, 8, -6, -33,
+   -13, -82, -1, 42, 22, 6, 25, -16,
+   7, 16, 22, 14, 12, 18, 57, -6,
+   92, 13, 50, -54, 18, 58, 8, -18,
+   14, 62, 16, 126, 16, 18, 57, 7,
+   39, 104, -84, -4, -8, 29, -35, 13,
+   24, 13, 75, 16, -32, 23, 5, 21,
+   -41, -94, -68, 31, 32, 0, -37, -5,
+   -12, 6, -44, -20, 27, 19, 48, -4,
+   -37, 23, 127, 24, 39, 97, 12, -1,
+   6, -13, 31, 7, 27, 8, 15, 44,
+   17, 97, 106, -68, -59, 20, -17, -13,
+   10, 9, 8, 89, 29, 47, 47, 39,
+   79, -18, 55, -5, 101, -2, 9, 105,
+   21, 87, -55, 26, 35, 49, 123, -13,
+   87, 10, -79, -40, -70, -50, 34, 6,
+   29, -17, 71, -18, 9, 111, 2, -21,
+   -4, 127, -24, -52, -2, 104, -15, -27,
+   126, -78, 41, 59, 52, 72, -23, -12,
+   -7, 52, -11, 17, -19, 79, -37, -23,
+   -8, -23, -13, -75, -40, -57, -125, 60,
+   -65, 24, -66, -72, -34, 79, 7, -29,
+   -24, -100, -62, -62, -54, 40, -55, 42,
+   81, -51, 55, 21, 33, 93, 9, 85,
+   -24, 37, 20, 21, -5, 72, 9, 60,
+   -22, 15, 9, 80, 68, 10, -61, 57,
+   67, 127, -11, 22, 108, 103, -42, 43,
+   -19, 97, 11, 33, 124, -61, 24, 23,
+   -35, 122, -72, -45, -90, -48, 15, -48,
+   -20, 48, 12, -4, 90, -3, 0, 13,
+   -33, 64, 86, 19, 74, 119, 120, -128,
+   -126, 37, 28, -7, 15, 72, -26, 62,
+   35, 8, -79, 4, -42, 9, -5, -37,
+   -39, 72, -99, 10, 25, -1, -88, 66,
+   39, 28, -73, -123, 37, -12, 29, 44,
+   7, 75, -11, -98, 27, 61, -11, -10,
+   -52, 74, 18, -62, -14, 66, -6, -2,
+   -53, 13, 48, 13, 4, 4, -9, 16,
+   -47, -16, 32, -49, 6, -51, -15, 55,
+   48, 64, 32, 41, -12, -72, 69, 7,
+   17, 26, 45, 53, -110, 16, 11, 20,
+   -75, 48, 77, 1, -31, 1, 74, -66,
+   -8, 73, 44, 19, -40, 41, 27, 62,
+   60, 93, 20, 12, 0, -39, -27, -1,
+   7, -13, -1, -15, 84, -47, 21, 62,
+   -18, 25, 19, 6, 64, 97, -3, 9,
+   12, 101, -14, 46, 30, 22, -9, 22,
+   13, -6, -17, -26, -63, 21, 105, 49,
+   -25, -26, -43, -22, 26, 17, 54, 101,
+   -25, 44, -4, 40, -5, 50, 37, -21,
+   62, 53, 19, 38, -60, -84, 13, 40,
+   15, 59, 105, 33, -14, 19, -17, 69,
+   -7, 13, -45, -20, -16, -16, 68, -17,
+   32, 12, 2, 40, -35, -23, 29, 9,
+   -25, -38, 51, -62, 13, -84, -3, -48,
+   -76, -76, -65, -24, 16, -21, 14, 2,
+   56, 18, -47, 49, -17, 31, 46, 18,
+   78, 44, 55, -72, 1, 34, -15, -46,
+   -8, 6, -39, -24, 3, 121, 1, -11,
+   -41, -61, 57, -33, 4, 3, -43, -47,
+   -1, 97, -14, -14, -5, -13, -40, -15,
+   31, 1, 22, -7, -83, -19, 15, -35,
+   -13, -2, 60, -31, 32, -20, -69, -50,
+   27, 69, -64, -48, 51, 40, -96, -63,
+   -88, -24, 3, 12, 127, -111, 75, 54,
+   -44, 14, -19, -59, 8, -16, 19, -128,
+   -27, -76, -25, -2, -73, 125, 27, -127,
+   12, -15, -55, 40, -126, -1, -81, 50,
+   126, 100, 29, -6, 43, 32, 19, -2,
+   52, -27, 28, -108, 53, -24, 0, 42,
+   -15, 20, -53, -51, 27, -108, -88, 49,
+   -6, 34, 0, -54, -48, 49, -53, 13,
+   57, -64, 8, -19, 48, 8, -2, 13,
+   44, 13, -8, 26, 62, -23, 35, -6,
+   -11, -16, 29, 94, 95, 22, 25, -42,
+   57, 41, 24, 43, 87, 49, 19, -18,
+   113, -11, 52, 102, 119, 31, 100, 47,
+   6, 16, 36, -11, 21, -23, 59, 8,
+   59, -14, 38, 82, 12, 58, -31, 39,
+   86, -52, -12, 51, -7, -65, 29, -44,
+   -39, 12, 39, -49, 13, -41, 23, -9,
+   24, 13, 43, -48, 37, 75, 9, 88,
+   -22, 22, -99, 24, 42, -20, 8, -31,
+   -17, 8, 48, -29, 64, -9, -32, -2,
+   -30, 11, 26, 124, -64, 25, 7, -5,
+   -11, 58, 73, -93, 64, 24, -43, -60,
+   -13, 8, 0, -16, -5, -83, -103, 108,
+   27, -20, -20, 32, -49, -2, -25, 126,
+   -18, 19, 126, 3, 25, -27, 90, -24,
+   -38, -38, 48, 55, 24, -28, 0, -22,
+   -31, -8, 98, 36, -12, -7, 7, 16,
+   -16, -88, -10, 102, 79, 117, -25, -40,
+   -11, 26, -8, 19, 25, 35, 73, 47,
+   33, 14, 82, -20, -42, 22, -74, -25,
+   90, 16, -45, -66, 81, -65, -66, 34,
+   -17, 22, -13, 102, 39, -3, -51, 32,
+   -35, 4, -9, 53, -17, -92, 35, 41,
+   66, 125, 35, -68, 13, -34, -22, 22,
+   2, 13, -59, 26, 41, 12, -76, -78,
+   4, 78, -6, -30, 1, 46, -22, 29,
+   -53, -44, -128, -83, 7, -128, -87, 45,
+   66, 21, -74, -13, -125, 2, -9, 0,
+   -63, -67, 37, 32, -28, 1, 74, -109,
+   9, 25, -51, 31, 98, -32, 10, -22,
+   -82, 30, 102, 41, -64, -43, 85, 40,
+   -13, -125, -98, -5, 4, -66, -69, 6,
+   -86, 125, 45, -81, -57, 76, -127, 91,
+   -57, 2, -22, -65, -36, 127, -54, -12,
+   -11, 6, -29, 20, 37, -13, -58, 32,
+   -55, -5, -67, -51, 1, 0, -77, -43,
+   31, -43, 12, -61, 24, 53, 27, 6,
+   19, 25, -29, -4, -11, -97, -64, -43,
+   17, 19, -96, 13, 35, -48, -43, -34,
+   75, 6, -30, -6, -29, 26, -18, -47,
+   -1, 42, -2, -29, -6, 40, -2, -95,
+   -22, -95, 7, 67, 12, -35, 25, -15,
+   -21, -72, -44, -89, -25, -97, 107, 4,
+   52, 11, 121, 0, 75, 9, -18, 23,
+   -27, -50, -15, 5, 45, -31, -18, -55,
+   -30, 40, 27, 2, 94, -14, -24, 26,
+   29, 86, 127, 16, -64, -38, 16, 110,
+   7, 22, -47, 64, 87, -11, 65, 92,
+   -43, 89, 15, -68, 113, 68, -79, 80,
+   55, -57, 48, 12, -61, 2, -71, 22,
+   28, -25, 35, 8, 124, -66, 30, -112,
+   -127, 74, -7, 52, -88, -15, -4, -45,
+   -40, 124, 13, 61, 60, 29, -124, -73,
+   -99, -85, -125, 79, 21, 124, -35, 123,
+   11, 28, 73, -62, 62, 44, 76, -1,
+   -58, -25, -58, -40, 99, -57, -126, 6,
+   -63, -124, -90, -105, -55, 84, -49, -17,
+   36, 66, 39, 19, 83, -34, -107, 27,
+   -17, 20, 90, 11, 17, 50, 7, -47,
+   35, -17, 24, 57, 29, -27, -77, 11,
+   -74, -49, -9, -39, 4, -25, 32, 117,
+   -8, 37, 52, -104, -13, -87, 0, -32,
+   126, -10, 59, 15, -44, 26, 46, 8,
+   -4, 25, -85, 24, 15, 20, -27, -6,
+   51, -8, 12, 50, -6, -23, 52, 109,
+   -47, 13, 69, -112, -54, 36, -15, 32,
+   -23, -106, -40, 19, 40, -49, -81, 23,
+   -28, -3, -61, -47, -62, -52, 90, -25,
+   69, -122, 5, 119, -13, 9, 38, 17,
+   -5, 34, -18, -34, 23, -27, 65, 59,
+   -3, 16, 9, -16, 1, 72, -9, 36,
+   -43, -8, 36, 27, 20, 35, 81, 4,
+   57, -25, 43, 0, 14, 31, -25, -32,
+   -9, 35, 55, 18, -78, 25, 80, 31,
+   11, 15, 37, 0, -74, -10, 49, 44,
+   1, 8, 120, -14, -2, 29, 122, 33,
+   96, 23, -95, 39, 67, 8, -18, 73,
+   9, -50, -105, 80, -23, 88, -23, 6,
+   108, -15, -8, 36, 12, 27, 34, -22,
+   46, 28, -10, 61, -60, 0, 20, -31,
+   -8, 32, -33, 87, 121, 35, 17, 45,
+   -19, 21, 61, 90, -33, 57, 38, 36,
+   -32, 119, -30, 25, 66, 14, -13, 28,
+   15, -34, 57, -56, -16, 27, 89, -63,
+   0, 3, -23, -37, -11, 43, 5, -65,
+   -15, 58, -15, 25, 1, -70, 21, -43,
+   -25, -52, -28, -52, 17, 2, 30, 5,
+   -36, 76, 63, 37, 79, 88, -4, -25,
+   79, -77, 16, -20, -6, 48, 52, -47,
+   66, 68, 4, -11, 10, -54, -60, -68,
+   -99, -16, 56, -67, 26, -70, 42, -13,
+   32, 57, 86, 40, 44, -8, -28, 30,
+   73, -29, -36, -22, 2, 4, 16, -52,
+   87, -29, 44, 26, 25, -21, 19, -64,
+   -127, -11, 12, 47, 86, 97, -6, -34,
+   2, 69, 0, 8, 29, -7, -117, 17,
+   -73, -19, 33, -86, 24, -124, 123, 94,
+   46, -103, -59, -5, 40, -114, 3, 68,
+   109, -2, -95, -33, -10, 8, 43, -10,
+   -19, 78, -66, 10, 58, -114, -54, 65,
+   28, 67, -10, 63, 40, 18, 7, -26,
+   32, -8, 3, 3, -35, 43, 15, -78,
+   -127, -2, -118, 47, 62, -124, -16, -57,
+   -111, -123, 3, -45, -108, -122, 83, -103,
+   114, -124, -35, 35, -62, 55, -9, 87,
+   127, -74, 56, -28, -41, 40, 6, 5,
+   -80, -6, 4, -4, -5, 57, -36, 17,
+   22, 47, -15, 22, 28, 37, 115, 36,
+   65, 21, -10, 0, 20, 18, 77, -51,
+   -30, 7, 52, 13, -61, 13, -30, 15,
+   28, 8, -63, 15, -2, 13, -11, -2,
+   -27, -68, 110, -43, -7, 81, 83, 24,
+   30, 33, -31, -28, -39, 15, 39, -46,
+   -2, 13, -21, 6, -17, -51, -22, -33,
+   -51, 54, 9, -54, 16, 35, 39, 44,
+   -84, 12, 45, -21, -37, -46, -18, -53,
+   8, 21, 1, 11, 14, -71, -20, -5,
+   -19, -9, -23, -16, 7, -3, -8, -16,
+   -30, 43, 20, 43, 19, 17, -25, 11,
+   -18, -24, 3, -31, -31, 82, -92, -69,
+   51, 3, -57, -82, 12, -86, -19, -10,
+   27, 23, -11, 3, -6, -34, -33, -29,
+   -56, 13, 52, 36, -62, -34, -4, 17,
+   -45, 2, 71, -48, -26, 17, -45, 25,
+   -43, -18, 38, -23, 33, -11, 38, 28,
+   15, -83, -7, -11, -46, -53, 46, -13,
+   31, -36, -79, 57, -54, -70, -11, -42,
+   -30, -35, 35, -11, -12, 18, -16, 111,
+   -23, 22, 64, 28, 48, -31, 48, -18,
+   -7, 11, -34, 1, -46, 31, -6, 71,
+   -108, -121, -31, -57, -28, 61, 25, 32,
+   -32, -126, 5, -13, 52, 117, -56, 17,
+   53, 9, -125, 48, 21, -42, -34, -16,
+   70, -48, 5, -2, -15, 78, -29, -121,
+   57, -28, 47, 19, -4, 45, 95, 13,
+   30, 31, -26, 54, -49, -65, 45, -97,
+   65, 98, -38, -30, -49, -36, 15, 34,
+   -94, -6, -57, -105, 73, 5, -49, 1,
+   -71, 22, -86, -124, -23, -53, -48, 4,
+   30, -1, 124, 29, 30, 68, 20, -128,
+   26, 12, -95, -8, -128, 75, 60, 6,
+   -23, 5, 17, -12, -45, -72, 7, -18,
+   -19, 48, -21, -46, 79, 31, -127, 36,
+   -69, -75, -5, 102, 40, -29, 1, -21,
+   18, 1, 60, -99, -102, 21, 24, -42,
+   43, -1, 46, 16, 84, -53, -45, 33,
+   -12, -3, 30, -1, -26, 0, 21, -48,
+   -4, -6, 16, -41, 22, 9, -25, 6,
+   -8, 15, 8, 6, 49, -18, 20, 10,
+   33, 62, 32, 15, 37, -16, 44, 5,
+   6, -47, 12, -16, 2, 50, 72, 94,
+   -4, 38, -103, -17, 73, 50, 25, 7,
+   -1, -15, -39, 0, 19, 24, 19, -49,
+   44, 3, 5, 85, -22, 33, 2, -16,
+   18, 53, -61, -2, 4, 6, -22, 66,
+   -39, 5, -30, -73, 45, -62, 121, -60,
+   113, -65, 26, 34, -44, 57, -23, 42,
+   -39, 31, 30, -79, 5, 31, 20, 22,
+   -24, 42, -59, 120, 108, -28, -8, -11,
+   5, -3, 63, 64, -91, -2, -71, -21,
+   10, -70, 58, -43, -16, -12, 73, 11,
+   -50, 15, -19, 41, -12, -9, -123, 35,
+   19, -19, -40, 34, -19, -43, -109, 24,
+   25, 1, 127, -7, -17, -91, 13, 3,
+   125, 2, -105, -53, 11, -28, 15, 66,
+   20, -10, 42, -45, 6, 20, -7, 38,
+   -8, 43, -49, -46, 15, 60, 9, -124,
+   75, -31, -14, -70, -119, 38, 9, -44,
+   -126, -92, -96, -17, -128, 1, -110, 40,
+   104, -23, -126, -61, 3, -78, 1, 75,
+   14, 41, -14, -43, 41, -80, -34, 52,
+   -128, -13, -106, 53, 77, 82, -61, 34,
+   32, -117, -29, -20, -44, 55, -78, 56,
+   3, -16, -9, 119, 41, 27, -71, 0,
+   7, -26, -41, -117, 73, -84, -122, 34,
+   51, 89, 11, -48, -74, -14, 21, 22,
+   -90, -96, -4, -86, 124, 19, 14, 101,
+   80, 10, -31, -32, 13, -32, 37, -21,
+   36, -52, 27, 15, 38, 16, 32, -33,
+   -55, -28, -1, 123, -10, -54, 27, 46,
+   -7, 127, 39, -1, 40, 3, 40, -12,
+   -22, -30, -5, -30, -62, -64, -34, 123,
+   -61, 39, 42, -31, 24, 49, -21, 77,
+   -20, 45, 49, 85, 127, 79, -3, -23,
+   -28, 77, 55, -31, 70, 4, 16, 59,
+   49, -36, 127, 85, -13, -27, -67, 67,
+   25, 8, 32, -3, -25, 104, 36, 44,
+   38, 48, -8, 22, -65, 71, 49, -10,
+   3, 6, 77, 49, 21, 6, 103, -17,
+   -11, 40, -25, -2, 89, 54, 37, -68,
+   -53, 68, -7, 58, -120, 56, 0, 66,
+   -49, -70, -53, -59, -9, 14, -101, -38,
+   46, -103, 1, -12, 30, -57, -17, -7,
+   10, -39, -50, 0, -65, 68, -109, -82,
+   -38, -36, 47, 99, -36, 2, 30, 34,
+   68, -39, 88, 6, 15, -20, 29, -40,
+   -11, 2, 62, -50, -34, -36, 70, 127,
+   -53, 55, 96, 38, 40, -46, -18, 65,
+   73, 56, 32, -48, -79, 17, -23, 105,
+   -82, -84, 71, 31, 15, -61, 40, 65,
+   8, 106, -47, 25, 5, 13, 12, 80,
+   102, 40, -45, -37, -89, -49, -14, -67,
+   89, 103, 66, -56, -26, 92, 33, 58,
+   -52, -78, 30, -47, 21, -116, -57, 17,
+   -44, -32, -104, -57, -46, 4, -127, 37,
+   -34, -42, -102, -72, 6, 126, -21, -94,
+   42, -18, -62, -77, -21, -14, -79, -34,
+   10, 2, -3, 27, 22, 9, -38, 5,
+   68, -73, 86, 20, 44, -34, -26, 88,
+   10, -12, 63, 32, -89, 39, -7, -56,
+   -6, -7, 6, -81, 43, -127, 37, 65,
+   -89, 22, -74, -57, -3, -13, 86, -4,
+   83, -38, -85, 18, 26, 12, 4, -128,
+   43, -1, 25, -41, 26, 75, 53, 18,
+   0, 13, -8, 35, 43, 0, -17, 3,
+   -77, 75, 47, 119, -31, 9, 34, 26,
+   39, 64, 65, 47, 60, 4, 65, 14,
+   -101, 10, -25, 102, 116, 76, 104, 33,
+   98, 28, 16, 23, 21, 60, -15, 53,
+   112, -3, -42, -19, 27, 12, 106, 16,
+   -33, -4, 101, 48, -9, 42, -19, 22,
+   48, 48, 65, 43, -42, -127, -79, 28,
+   -30, -9, -28, -26, -34, 54, 5, -47,
+   24, -41, 105, -27, 8, 85, 10, 52,
+   -9, 22, 18, 25, 99, 59, 22, -86,
+   -53, 20, 24, -77, 63, -6, 6, 41,
+   122, 60, -37, -2, 17, -21, 107, 15,
+   -62, 7, 87, -12, -1, -68, 65, -71,
+   -47, -100, 33, 120, 17, 6, -25, 116,
+   0, 39, 27, 19, 0, 47, 83, 37,
+   -12, 2, 83, 89, -70, -81, -21, 28,
+   16, 25, -36, 48, -21, -15, -6, -84,
+   -22, -44, 53, 44, 58, -27, 34, 118,
+   -3, -106, 85, 71, -1, 111, -44, -29,
+   127, 9, 81, -103, 11, 31, -125, -10,
+   53, 19, 111, 30, -34, -84, -43, 2,
+   36, -2, 122, 61, -96, 126, -34, 125,
+   18, -41, -35, 6, 51, 38, -16, 39,
+   33, 49, 42, 38, 11, 30, 46, 9,
+   -54, -17, 30, 8, 4, 16, 95, 23,
+   28, 100, -29, -22, -29, 41, -2, 93,
+   55, -58, 40, 6, -84, 1, 20, -46,
+   -3, -26, -33, 51, -101, 51, -15, -20,
+   54, -78, -90, 31, 47, -89, -49, 1,
+   -29, 1, 24, -11, -30, 16, -6, -15,
+   17, -57, 43, -33, 80, -93, -3, 31,
+   -124, 21, -66, -94, -6, 104, 72, 27,
+   -40, -85, -99, -57, 9, 7, -31, 1,
+   17, 24, 13, 29, -76, 88, 27, 50,
+   12, 56, 75, 102, -55, 20, 77, 25,
+   -7, -3, -21, 84, 1, -102, 56, -5,
+   14, 24, 29, -82, -17, -80, -44, 80,
+   -19, 53, 23, 23, 72, -9, -14, 35,
+   -72, -10, -74, -27, -13, -53, -51, 37,
+   -34, 62, 63, -42, 18, -95, -118, 25,
+   -23, -14, -33, -22, 63, 20, -22, 15,
+   18, -33, -124, -110, -36, 7, -20, 115,
+   -23, -8, -33, 53, -2, 49, -15, 18,
+   95, 12, -18, 103, 42, 7, 15, 17,
+   -1, 26, -34, -6, -13, 26, 27, 19,
+   -67, -9, 122, 32, -34, 18, 8, 37,
+   98, -7, -20, -54, -33, 59, -27, -44,
+   25, -15, 6, -108, 2, -9, 46, -20,
+   47, -17, -76, -10, -88, 11, -21, 40,
+   26, 13, 57, 72, -56, -31, 121, -127,
+   -24, 60, 24, -23, -13, 61, -43, -25,
+   14, -65, -36, -13, -2, 120, -12, -46,
+   88, 127, 20, -21, 3, -24, 43, 38,
+   102, -28, 101, -116, 16, -20, -22, -66,
+   19, 89, 93, 123, 23, -111, -6, -45,
+   -69, -46, -42, 21, 54, -73, 73, -13,
+   -21, 88, 51, -19, -18, 78, -12, 8,
+   -4, 50, -82, 1, -35, -86, -31, -25,
+   -55, -3, -63, -17, 11, 32, -69, -29,
+   22, 6, 37, -46, -6, -62, -50, 74,
+   -87, 43, -41, -84, 55, -43, 7, 12,
+   52, 29, 25, 58, -19, -1, 34, 5,
+   -106, -62, 50, -77, 28, -11, 2, -16,
+   -52, 3, -50, -2, -20, -90, 13, -92,
+   36, 11, -21, -78, -19, 24, -20, -12,
+   28, 9, -19, -6, -123, 35, 61, -47,
+   -34, -3, 12, 31, 17, 17, 101, -35,
+   47, 16, 45, 48, 0, 15, 16, -11,
+   2, 40, -34, -92, 42, -78, -25, 0,
+   -42, 35, -126, -126, -6, -83, -128, -48,
+   -105, -29, -10, -74, 11, 27, 26, 42,
+   1, 12, -24, -14, 0, 110, 29, -16,
+   -29, 59, -92, -35, -91, -26, 0, 11,
+   -1, 42, 54, 2, 15, 23, 42, -23,
+   -54, -29, 1, -120, 31, -16, -51, 71,
+   -32, -72, 51, 31, 40, -6, -13, 14,
+   37, -8, -71, -20, 76, -17, 41, 28,
+   -23, -119, 1, 107, 5, 43, -13, 117,
+   -41, 8, -26, -14, 33, -18, 57, 60,
+   7, 5, -11, -39, -32, -2, 15, 41,
+   98, 111, -44, 46, 44, 20, 88, 18,
+   62, 17, 107, 16, 5, -4, 40, 15,
+   -19, 9, 58, -77, -40, 119, -54, -35,
+   45, 75, 12, -45, -32, -3, 72, -41,
+   -21, 6, -5, 2, 106, -40, 41, 62,
+   57, 8, 24, -60, -44, -61, 104, -48,
+   -34, -58, 62, -20, 6, -60, 40, -29,
+   117, 76, -56, 22, 15, -1, 112, -1,
+   23, 42, 57, -53, 75, 26, -11, 35,
+   78, 85, 0, 19, 17, 3, -29, 20,
+   28, -54, 6, 5, -11, 45, 34, 37,
+   -13, 2, 15, 13, 9, -28, 32, 8,
+   27, -1, -63, 42, -33, -2, -19, 4,
+   -127, -15, -52, 38, -5, 35, -26, 44,
+   13, 1, -39, 73, 17, 24, 33, 103,
+   -56, -41, -1, -28, -40, -81, 21, 10,
+   -2, -79, -88, -42, -3, -44, -63, 81,
+   16, -42, -71, 37, -14, -27, -127, -6,
+   -108, -94, 19, -71, -80, -12, 65, -9,
+   -7, 92, 8, -125, -36, 2, 47, 0,
+   19, 8, -65, -58, -60, -1, 17, 33,
+   46, 78, -103, -127, 63, -3, -65, 16,
+   13, -10, 16, 0, 27, -8, -104, 2,
+   -17, -44, -24, 41, 37, -4, -124, -4,
+   18, -109, -125, 41, -7, 11, 29, 17,
+   -42, 24, -120, -70, -123, -26, -25, 14,
+   66, -12, -38, -106, -29, 45, 5, -6,
+   -11, 31, 6, 13, -85, 44, -15, -2,
+   -3, -39, -4, 4, 8, 78, 51, -47,
+   19, 3, -63, 22, -34, 28, -13, 22,
+   15, 23, 5, 1, -87, -122, -66, -14,
+   -10, -1, 19, 40, -40, 2, 24, 13,
+   -23, -27, -125, -3, -12, 9, 18, -4,
+   -12, 8, -8, 66, -2, -13, -27, 20,
+   -38, 33, -24, -20, -11, -6, 11, -9,
+   -3, -30, -1, -16, 23, -60, -19, 16,
+   -33, 21, -34, 9, -2, -33, -43, 21,
+   -39, 1, 54, -24, -24, -22, -30, -1,
+   -9, -27, -8, 14, 40, -5, 10, 4,
+   -30, -6, -21, 34, -34, 52, -12, -6,
+   -47, -95, -34, 43, 6, 31, 32, -38,
+   -23, -27, 42, -22, -118, 19, 34, 23,
+   5, -50, 22, 25, -19, -40, -17, -2,
+   26, -15, -69, -126, 10, 33, 23, -7,
+   13, -9, 26, -42, -62, -74, -9, 8,
+   -47, 38, -82, 38, -4, 11, 57, -10,
+   -12, -66, -25, -10, 24, 4, 16, 1,
+   41, -18, -96, 18, -11, -13, 103, 11,
+   17, -3, -76, 19, -81, 110, 18, -46,
+   -51, -53, 19, 3, -36, -31, -13, -32,
+   -44, -37, -70, 43, -128, -11, 35, 2,
+   -58, -33, 20, -62, -105, 11, -70, -77,
+   44, 125, -15, -25, 18, -60, 69, -96,
+   -125, -4, 95, -69, 13, -30, -43, -53,
+   -61, -6, -8, 60, 5, -75, -125, 5,
+   -12, 45, -101, 111, 11, -98, -17, 39,
+   -85, -7, -46, -56, -37, -97, -45, -37,
+   -16, 80, 64, 110, -74, -30, -34, -24,
+   -95, 2, 4, 56, -71, 39, -39, -14,
+   -46, -22, -124, -115, 8, 19, 69, -11,
+   -70, -68, 120, 95, -100, 112, -103, -70,
+   -35, -128, -97, -71, 29, -72, -123, -48,
+   10, -36, -51, -8, -8, -26, -15, -26,
+   -5, 34, 6, 38, 13, 67, -14, -35,
+   28, 21, 127, 6, -28, 41, 20, 8,
+   -48, -33, 1, 28, 9, 15, 48, -48,
+   88, 91, -19, 54, -22, -80, 35, -37,
+   -2, 7, -44, 18, -67, 36, 50, 21,
+   -60, 26, 26, 34, -29, 8, 28, 2,
+   -10, 19, 26, 43, 36, 0, 116, -24,
+   12, 13, 1, -33, -7, 0, -4, -13,
+   3, 8, 4, 32, 23, -72, -70, 42,
+   54, -16, -21, -48, -38, 22, -46, 22,
+   -40, -1, -64, 0, 40, -27, -26, 9,
+   12, 35, 59, -48, 46, -18, -25, 13,
+   -66, -14, -55, 57, 24, -67, -15, -15,
+   -38, -84, -11, 1, -45, 19, -60, -49,
+   24, 38, 22, 53, -52, 20, -1, 53,
+   82, 19, 43, 13, -32, -56, -51, 56,
+   16, -36, -33, -53, 7, -22, -20, -14,
+   -34, 11, 24, 22, -21, -127, -51, 15,
+   47, -20, -49, 22, -56, 40, -44, -20,
+   -2, -65, 9, -2, -27, 22, -1, -12,
+   -9, -17, -55, 89, -76, -16, -10, 37,
+   -35, 0, 4, 16, 52, -10, 23, 39,
+   -25, 9, 51, 79, -6, 21, -18, 10,
+   64, -37, -33, -48, 24, 78, 15, 17,
+   -34, 81, -35, -82, 32, 110, 59, -126,
+   -25, -124, 11, -55, 20, 63, 100, -10,
+   -123, -69, -6, 5, -74, 26, -14, 16,
+   -12, -13, -115, -76, -70, -124, -19, -81,
+   40, -96, -66, 62, -32, -79, 28, 59,
+   12, 31, -53, 119, 74, 26, -17, 44,
+   81, 100, -19, -25, 41, -11, -103, 48,
+   41, -8, -26, 4, -112, 53, 31, 28,
+   50, -73, -9, -127, 1, -84, -109, -35,
+   -80, 9, -38, 42, -105, 89, 32, 94,
+   68, -73, -8, 53, -32, -2, -8, -127,
+   101, -2, 43, 110, -13, 43, 27, -4,
+   -55, -12, 81, 52, 114, 30, 66, -67,
+   107, 88, 44, -63, -14, -92, -27, -58,
+   -16, 82, 98, -26, -9, 0, -108, -82,
+   -11, 23, 26, -22, -2, -82, 93, 89,
+   -67, -31, 5, 34, 36, 32, -49, -53,
+   -81, 86, 43, 34, 11, 59, -46, 4,
+   -60, 14, 12, 30, 34, 14, 29, 10,
+   -34, -105, 32, 122, 7, 63, 24, 43,
+   55, 34, 61, -26, 70, 9, 8, -3,
+   -40, 28, -42, -35, -3, 53, 35, -9,
+   -49, -26, 39, 61, -48, 64, 81, 18,
+   78, 27, -3, 0, -66, 108, 40, 28,
+   -45, 57, -17, 44, -56, -12, 18, -93,
+   -43, -7, 32, -38, 55, -17, 121, 71,
+   -27, 39, 36, -13, 26, -27, -13, 52,
+   30, 3, -26, 11, 21, 52, -7, 127,
+   -5, -84, 62, 47, -93, 89, -90, -8,
+   -18, 40, 21, -86, -10, -47, 28, -48,
+   69, -76, -66, 55, 28, -87, -11, -53,
+   38, -29, 13, 103, -79, -126, -39, 82,
+   -87, -6, 18, -54, 65, -24, 61, 0,
+   -60, 34, 43, -5, -15, 36, 25, 26,
+   60, 18, -28, -16, -9, 60, 36, 13,
+   34, 57, -43, 7, 82, 53, -7, -24,
+   33, 63, 49, -79, 110, 34, -11, 94,
+   -80, -43, 102, 22, 3, 30, 78, -60,
+   127, -126, -48, -15, -20, 63, -98, 27,
+   -60, 5, -7, 9, -39, 55, 20, 43,
+   32, -57, 34, 41, 20, -2, 53, -6,
+   2, 26, -105, -41, 21, -14, -84, -9,
+   57, 14, -63, 36, -62, 8, -45, 92,
+   -56, -1, 23, -17, -45, 42, -30, -14,
+   60, 17, -5, 87, -42, -18, 73, 5,
+   12, 6, 11, -2, -7, 13, -19, 40,
+   16, 87, 12, -76, 48, -18, -37, -105,
+   86, 4, -43, 20, 35, -53, -25, 49,
+   -31, -5, 71, 57, -127, 51, -49, -10,
+   -30, -41, -9, 15, 16, 40, 17, 13,
+   0, -3, 1, 43, -76, 5, 98, 20,
+   -4, 26, 53, 19, -65, 40, 47, -58,
+   79, 15, -19, 80, -28, 117, 50, -28,
+   11, -32, 28, -27, -72, -13, 9, 22,
+   -53, 13, 8, -29, -37, -34, 46, -68,
+   -18, -126, -89, -87, -36, -19, -2, -45,
+   16, -3, 1, 17, 4, 3, -72, -62,
+   51, -48, 3, -87, -23, 13, -117, 17,
+   24, -76, -42, -18, -128, 25, -95, -45,
+   -17, -48, -112, 106, 12, -97, -23, -18,
+   45, -42, 25, 65, -67, 84, -67, -110,
+   -7, 64, -8, -75, 83, 10, 49, 121,
+   -82, 125, 52, 82, -49, 20, 79, -3,
+   86, 60, 14, 35, 33, -46, -39, 85,
+   53, -17, 4, 59, 12, 111, -14, -29,
+   -23, 57, -24, -37, -125, 86, -58, 82,
+   77, 30, 67, 1, 113, 77, 49, 72,
+   -35, -90, 3, 106, 5, -85, -21, -87,
+   -76, -40, 32, 4, -76, 1, 13, -70,
+   -23, 4, -29, -12, -28, -18, -75, 22,
+   -100, -77, 17, 87, -56, -25, -13, 13,
+   -20, -37, -39, -75, -56, -1, 44, -25,
+   24, -12, -27, -35, -59, -122, -15, -42,
+   53, 0, -38, -28, -8, 75, 13, -78,
+   36, -110, 30, 19, -50, -14, -127, -22,
+   -69, 34, -25, -12, -6, -7, 49, -15,
+   -36, -19, 54, -55, -22, -117, -103, -36,
+   -26, 37, -41, -112, -17, -28, 15, -11,
+   6, -58, 3, -39, -74, -58, -60, -22,
+   25, 0, -24, -99, -22, 28, -58, -71,
+   35, 29, -9, 16, -20, -34, -45, 31,
+   77, -94, -70, 19, -11, 112, -26, -11,
+   -39, -19, -58, 57, -41, 41, -93, -35,
+   39, 22, -38, 80, -33, -91, 13, -7,
+   5, 11, 23, 0, -43, 127, 27, -38,
+   18, 12, 127, 11, 13, -88, 18, 47,
+   -19, -17, 15, -125, -34, -14, 32, 15,
+   59, 126, -36, 39, 16, -124, -85, 14,
+   5, -5, 32, 50, 114, 54, -82, -26,
+   -30, 31, 32, 54, 3, 4, -1, 24,
+   27, 0, 100, 89, -4, -16, 18, 0,
+   22, -35, 35, 10, -6, -79, 6, 17,
+   26, 0, 13, 42, 1, -21, 49, -67,
+   -110, -7, -25, -8, -30, 57, 17, 5,
+   50, -7, 62, 14, 49, 9, 3, -1,
+   8, 41, -11, 16, -23, -23, 31, -12,
+   44, -127, 27, -35, 6, -126, -55, 0,
+   -4, -14, -126, -123, 26, -86, 11, 40,
+   -4, 82, -105, -44, 23, 38, -119, 23,
+   8, -95, -48, 6, 81, 14, 113, -32,
+   -5, -48, 105, -59, -30, 55, -126, -24,
+   -30, 11, 0, -24, 50, -87, 14, -21,
+   -55, -90, -27, -126, 10, 2, -7, -10,
+   -24, 14, -19, 10, -14, 12, 3, 14,
+   20, 29, -50, -10, -28, 6, -67, -107,
+   35, 63, 84, 56, 37, -109, 36, -2,
+   77, -34, -48, 87, 7, 21, 66, -18,
+   112, 49, -59, -5, -99, 27, 33, -16,
+   18, -35, 36, -39, -124, -36, -56, -64,
+   -50, 8, 88, -102, 38, 57, -68, 35,
+   127, -45, -6, -36, -17, -2, -111, -22,
+   -124, -38, 44, -28, -75, -43, 58, -21,
+   -29, -110, 46, -107, -83, 121, 46, -14,
+   -50, -83, -73, 120, 7, -41, 0, 13,
+   31, 2, 43, -63, 39, -68, -110, 41,
+   -88, 10, -17, -23, 57, 79, -43, -15,
+   45, 33, -73, -56, -63, -32, 83, -32,
+   -16, -45, 55, 59, 19, 80, 3, -11,
+   -110, -29, 115, 85, -29, 125, 3, -25,
+   -9, -68, 126, -43, -19, 16, -28, 60,
+   18, -3, 28, -21, 77, 8, 45, 72,
+   -29, 32, -1, -27, 112, 4, 69, 30,
+   -26, 55, 44, 13, 35, 40, -41, 5,
+   -74, 38, -71, 30, 74, 11, 54, -25,
+   -34, 54, 87, 34, 8, 20, -2, 13,
+   2, 10, 46, 40, 95, 33, 2, 6,
+   -55, -36, 9, 49, 40, -52, -21, 108,
+   10, 32, 14, -13, 40, 6, 114, 63,
+   16, 62, -31, 57, -18, 6, 6, 72,
+   9, 4, 38, 25, 49, -21, 66, -7,
+   11, -12, -23, 81, -48, 51, 125, -14,
+   80, 9, -19, 39, 49, 92, 9, -13,
+   64, 43, 56, 98, 0, 7, -67, 15,
+   118, 63, -48, -46, -73, -19, -4, 88,
+   -7, 3, 1, -8, 82, 29, 35, -31,
+   30, 30, -23, -9, 57, -51, 71, 33,
+   -37, 76, 11, -69, 42, 117, -27, -34,
+   -15, -13, -56, -90, -50, 82, 104, 98,
+   -33, 10, 37, -69, 2, 7, 23, 10,
+   99, -66, -12, -54, -54, 8, -36, 4,
+   -33, -30, 9, -72, 26, -53, 35, -42,
+   27, 18, -36, 41, -35, -22, -14, -6,
+   22, -69, -111, -10, -12, 55, 47, -54,
+   -72, -21, 28, 13, 29, -43, 33, -62,
+   -6, -20, 29, -17, 31, -92, -9, 36,
+   -28, -49, -25, -121, -91, 27, -31, -17,
+   45, -80, -37, -16, -34, 17, 28, -48,
+   68, -51, 30, -23, 8, 17, -16, 23,
+   -25, -9, 114, -21, -18, -122, -81, -17,
+   -28, -42, -86, -107, -79, -60, 7, -35,
+   15, 44, 4, 38, -124, -37, -84, 31,
+   -8, -23, 10, -76, 8, 44, -123, -50,
+   45, -47, 59, 34, -1, -9, 24, -65,
+   41, -73, 9, 94, 5, 53, 20, -9,
+   28, 7, -16, 68, -24, 6, -5, -35,
+   -38, 43, -100, 29, 13, 35, 41, -59,
+   -7, 28, -24, 38, 94, -85, -85, 97,
+   -125, 78, 46, 90, 70, -77, 47, -12,
+   2, -97, 24, 88, -18, 14, 32, 97,
+   65, -22, 27, 63, 25, 11, -13, 52,
+   43, 65, 32, -9, 63, -13, -93, -61,
+   -33, 30, 66, -5, 100, 12, 21, -7,
+   -62, -41, 8, -26, 31, 36, 54, 6,
+   52, 106, -82, 38, 27, 26, 26, 26,
+   54, 19, 43, 6, 29, 125, 93, -49,
+   -6, 127, 33, -10, 26, 90, 75, 0,
+   106, -40, 3, 43, 52, 52, 48, -58,
+   34, 0, 58, 38, 44, 57, 31, 91,
+   -1, 80, -72, -45, -39, 25, -75, -52,
+   12, 30, 47, 2, -15, -36, 67, 89,
+   36, 21, -22, 25, 18, 16, -25, 7,
+   90, 10, 17, 18, -60, -9, 37, 84,
+   59, 2, 16, -27, -77, -1, 43, -31,
+   23, -46, -34, 127, 117, 127, 82, 27,
+   18, -7, 46, -71, 87, 35, 46, -85,
+   -60, -2, 11, -72, 32, -56, -105, -77,
+   51, 53, -46, 21, -42, 17, -12, -69,
+   19, 7, 58, -43, -104, -68, 5, -3,
+   -29, 27, -126, 88, 0, 127, -118, 52,
+   57, -10, -33, 41, 12, -28, 5, -5,
+   -57, 23, 21, -18, 34, -48, 28, -125,
+   120, -59, 25, 108, 71, -33, 80, 38,
+   -46, -12, 46, 6, -68, -44, 116, 106,
+   20, 93, -127, -56, 124, -105, -96, 122,
+   34, -57, -27, -67, 29, -124, -90, 120,
+   -88, 29, -118, 8, 33, -90, -64, 6,
+   43, -45, 14, 127, -47, 40, -26, -79,
+   -81, -3, 2, -51, -4, 12, 23, 66,
+   37, -118, -7, 7, 100, 13, 8, 85,
+   -85, -92, -123, -111, -124, -2, 15, 45,
+   -57, -58, 10, 82, -24, 46, 30, 127,
+   80, 41, -9, -64, 33, -7, -4, 10,
+   -21, 44, 15, -22, 26, 59, 31, 28,
+   -20, 18, 81, -50, 0, -69, 43, -18,
+   -23, -85, -28, 86, -62, 35, 20, 106,
+   -10, -74, 97, -17, -68, -40, -24, -78,
+   4, -116, -56, -86, 78, 34, -94, 49,
+   5, -97, -94, 62, 23, -13, -83, 53,
+   10, -12, 54, -27, -8, -16, 49, -38,
+   20, -43, 107, 9, -64, 22, 18, -53,
+   10, -7, -57, 33, 3, -127, 59, 7,
+   7, -57, 49, 14, 7, 29, -22, -82,
+   86, -63, -1, -10, 0, 29, -25, -72,
+   -69, -51, -124, 20, 49, -32, 35, 11,
+   4, 29, -109, -44, -67, 51, -45, 120,
+   7, -51, 96, 11, -1, 12, 45, -40,
+   -50, -46, 8, 49, -9, 10, -37, 69,
+   50, -45, 22, -12, -38, -19, 38, -13,
+   7, 82, -112, -16, -31, -69, 72, 0,
+   -58, 31, -8, 110, 20, -118, 77, -27,
+   -61, 40, -18, -32, -55, 33, -39, 25,
+   -49, 16, 0, -9, 9, 7, 48, 63,
+   99, 41, -2, -30, -32, 35, -34, 5,
+   -71, -45, -50, 10, -13, -58, -24, -31,
+   48, 13, 17, 44, 3, -7, 44, 63,
+   120, -55, 99, 2, 68, 9, -5, -122,
+   61, 29, 27, 3, 37, -56, -3, -43,
+   -11, 53, 10, 54, -66, 54, 34, 39,
+   2, 29, -80, 55, 13, 29, -55, -6,
+   124, 2, -39, 29, -126, -44, 25, -46,
+   39, 88, -55, 126, 10, 97, 83, 48,
+   25, -111, -41, 70, 4, -88, 33, -34,
+   -29, 28, 103, 101, -50, 13, 79, 13,
+   -64, -10, 6, -37, 4, 37, -11, -10,
+   -6, -11, -32, 56, 45, -18, -10, -87,
+   -100, -22, -38, -79, 23, -118, 14, 27,
+   -22, 14, 32, -34, 16, -78, -66, 4,
+   16, -62, -20, -18, -23, 57, -4, 10,
+   62, -39, 37, 71, -1, -77, 4, -128,
+   -69, -70, -117, 104, 52, 21, -21, -16,
+   6, 17, 5, 2, 64, 72, 16, -92,
+   -73, -109, 23, 2, -38, 9, -111, -10,
+   4, -82, 18, 100, 29, 47, -19, 100,
+   -94, 21, 106, 68, -3, -112, 58, 13,
+   47, 55, -119, 7, -11, 102, -61, -30,
+   85, -34, -73, 48, -116, -31, 49, 17,
+   -1, -37, -30, 68, -120, -66, -96, 126,
+   65, 69, 104, -19, -88, -73, 30, 89,
+   -75, 0, 29, 103, -81, -56, -68, -58,
+   26, 8, 8, 40, -8, -3, -33, 38,
+   -15, -13, 125, 13, 24, -25, -17, 25,
+   -6, -43, 6, -14, -47, -73, -67, -83,
+   25, 19, 32, -97, -15, 15, -4, 126,
+   -46, -6, 42, 32, 48, 13, -55, -6,
+   -33, 12, -81, -56, 85, 100, -48, 39,
+   -25, -98, -2, 47, 108, 87, 121, 32,
+   -114, -34, -13, 12, 97, -47, 1, -10,
+   13, -115, -23, -30, -15, -85, 15, 23,
+   -15, 82, -16, -8, 4, -31, 9, 102,
+   105, 2, -33, -10, -63, -89, 51, 75,
+   -12, 0, 28, 100, -78, 95, 47, -90,
+   74, 113, -19, 54, -58, -21, 20, 116,
+   29, -17, 55, -62, 46, 27, 13, 37,
+   -4, -123, -118, -68, 33, -52, -1, -108,
+   62, -46, 0, 21, 13, -35, 77, 23,
+   -12, -51, 50, -33, 113, -65, -104, 18,
+   -26, -49, -58, -3, -29, -19, -59, -45,
+   -45, -3, -61, -12, 120, -39, 54, -10,
+   74, -61, -57, -13, -43, 18, -6, 6,
+   -34, -18, 28, -54, 16, 36, 65, -57,
+   -3, -22, 71, -40, -13, -110, -9, -52,
+   35, -85, -19, 10, -5, 1, 3, -34,
+   -122, -36, -28, 26, 2, 45, 36, -76,
+   -105, 123, -77, 3, 26, 83, -16, 17,
+   7, 16, 37, -46, -67, -40, 33, -52,
+   -14, -11, -11, -53, -63, 28, -6, 35,
+   53, 62, 71, 47, 70, 19, 4, 23,
+   -70, -65, -33, -37, -19, -38, -125, 108,
+   35, -36, 8, -28, 17, 4, -73, 19,
+   4, 5, -52, 5, 44, -25, 14, 13,
+   27, -127, -69, -94, -62, -22, -26, 86,
+   -37, -25, 51, 29, 7, 15, 47, 105,
+   49, -12, -44, 3, -108, 23, 60, -11,
+   -95, 20, 37, -15, -68, -44, 127, 17,
+   -19, -55, 44, 26, -14, 22, 36, -84,
+   23, 10, -46, 68, -9, 121, -7, -12,
+   29, -11, 61, 2, -14, 28, -30, -102,
+   23, -105, 0, -35, 18, 8, 15, -4,
+   11, 33, -26, -89, 11, -14, -5, -112,
+   -8, -28, -43, 34, -10, -35, -30, -37,
+   -57, 14, 25, 45, -77, 28, 4, -50,
+   -4, 87, -24, -97, 14, -36, 53, 31,
+   18, -37, 16, -51, 11, 41, -87, -53,
+   -98, 1, 37, -30, -53, -29, 33, -4,
+   -40, -67, -13, -52, -56, 8, 60, 35,
+   -25, 44, 2, -6, -1, -31, -27, -41,
+   -26, 8, -43, -2, -3, 1, 24, -31,
+   -6, 9, -126, 2, -48, -33, 48, 6,
+   3, 32, 29, -50, 28, -31, -17, 27,
+   41, -122, -90, -41, 9, 86, -22, -89,
+   20, -61, -33, -21, 62, 41, -86, 3,
+   -42, 14, 25, 48, -125, 9, 25, -2,
+   9, -66, -11, -98, 2, -65, -4, -14,
+   6, -2, -66, -83, 38, -22, -13, -21,
+   -8, 41, -125, -24, -43, -100, 72, -52,
+   -43, -4, -1, -54, -59, 11, 96, -20,
+   48, 20, 60, 13, -15, 57, -30, 11,
+   -50, 121, -116, -31, 19, -32, -4, 9,
+   -111, 12, -84, -106, -54, -59, -67, -24,
+   10, 22, -25, -12, 16, -123, 15, 7,
+   -8, 14, -21, -45, 63, 47, 3, -14,
+   6, 100, 86, 40, 39, -23, -9, -127,
+   24, 20, 15, 41, 69, 13, 2, -36,
+   25, -18, 11, 23, 27, 51, -74, 8,
+   -69, 12, 61, 74, -14, 34, -7, 14,
+   1, -5, 2, -28, 46, 63, 56, 6,
+   -42, 34, 81, 18, -70, 6, 20, -26,
+   108, 11, -31, -1, -46, -29, -38, 22,
+   -9, -33, 43, -67, 71, -20, 30, -114,
+   62, -1, 97, -40, 23, -99, 5, 11,
+   -38, -55, 70, 9, -48, 9, 54, 23,
+   -24, -48, -120, 67, 27, -49, -55, -11,
+   88, -36, -4, -10, 80, 14, -65, -2,
+   -72, -46, -91, 99, -23, -78, -39, -84,
+   -11, -104, 27, -73, -12, 26, -1, -103,
+   -10, 2, 69, 43, 105, 19, -82, -45,
+   33, -26, 41, -38, 119, 16, -62, -34,
+   10, -10, 20, 38, 87, -67, -26, 91,
+   30, 113, -11, -28, -48, -93, -120, 43,
+   -88, 71, -80, 7, -21, -1, 17, 50,
+   -26, 55, 125, -35, -40, 0, -44, -15,
+   33, 5, -83, 7, 64, -49, 19, 56,
+   32, -25, -27, -15, -5, -16, -19, 66,
+   9, 114, -126, 12, -47, 15, 43, 18,
+   28, 52, 34, -50, 11, -11, -29, -43,
+   -14, -84, -39, -25, -75, -101, 111, 21,
+   33, -44, 90, 14, -36, 31, 29, -31,
+   -17, 22, 17, 48, -93, 30, 42, 30,
+   -86, -79, -12, -98, 49, 68, -53, -69,
+   53, 124, -29, 65, -89, -35, -1, 37,
+   -5, -111, -38, -76, -28, 6, 24, 47,
+   -61, 19, 12, 23, -49, -18, -77, 18,
+   33, 11, -17, -35, -16, 78, -32, 48,
+   62, -69, -78, -18, 72, -122, -29, 3,
+   11, 6, -17, 3, -74, 51, -10, 29,
+   21, 46, -31, 49, -1, 22, -69, 8,
+   -2, -74, -29, 29, 25, -29, 13, 20,
+   37, 9, 1, 16, 10, -20, -13, -13,
+   -24, 37, -11, 42, 35, 36, -12, 24,
+   -33, 43, 65, 64, 25, 23, 9, 27,
+   -124, 1, 92, 16, -4, 23, -5, 17,
+   5, 42, 32, 12, 53, -3, 41, 1,
+   37, 32, -11, 23, 37, 80, 21, 127,
+   29, -12, -102, 127, -21, 9, -9, 33,
+   41, 16, -4, 33, 57, 29, -55, -60,
+   11, -33, -25, -26, 35, -2, 116, -6,
+   -52, -31, -3, 14, -63, 13, 73, 76,
+   25, 5, 29, 8, 17, 50, -27, 88,
+   -96, -68, -67, 5, -56, 28, 25, -88,
+   -11, -19, 35, -78, 27, 11, -37, -21,
+   2, -11, -43, 78, -93, 34, 27, 5,
+   -21, 34, -48, -11, 86, 4, 20, -18,
+   -6, 39, 15, 14, 40, 36, -40, 46,
+   127, 12, 3, 1, -14, 33, 40, -3,
+   16, -58, 71, -38, -1, -103, -22, -16,
+   35, 10, 127, 59, -38, -67, -29, -126,
+   58, -11, -4, 14, -85, 22, 75, 10,
+   4, 19, 78, 32, -31, -33, 127, 7,
+   4, 48, -20, 13, 94, 45, -10, -9,
+   7, -55, -6, -43, 23, -58, 76, -1,
+   4, 21, 7, 65, -20, 70, -7, 4,
+   38, 104, 22, -44, 7, -8, 12, 9,
+   65, 31, -6, -1, 29, 36, -126, -45,
+   -25, 32, 45, 3, 7, -28, 4, 29,
+   -80, -34, -64, -3, 0, -63, -65, -11,
+   -6, 38, -119, 53, 17, -24, 19, 4,
+   -53, 85, 27, 26, 45, -51, 5, -126,
+   17, 32, 22, -52, 2, 7, 22, 60,
+   74, 74, 38, 53, 13, 4, 44, 32,
+   49, -46, 95, 70, 68, -50, -128, -10,
+   -79, 125, 26, 37, 24, -51, -12, 52,
+   27, 13, -16, -4, -2, 16, 2, 33,
+   10, -12, -5, 25, -40, 5, -31, 31,
+   2, 60, -93, -23, -118, 34, 3, 18,
+   12, 11, -38, -7, -35, 6, 18, -37,
+   -99, -68, 5, -103, -117, -108, -114, 43,
+   -115, -72, 46, 2, 50, 4, 37, 8,
+   -51, 10, -68, -29, 18, -63, -80, 34,
+   36, -49, -110, -28, 3, -40, -125, -9,
+   74, 10, 20, -25, 37, 74, -29, -25,
+   66, -34, -48, -27, -35, 0, 30, -26,
+   -121, 6, -123, 14, 11, -49, -13, -102,
+   18, -23, -98, -1, -8, 67, 52, 8,
+   -27, 33, -57, 7, -126, -13, -47, 12,
+   22, -109, -68, -34, -94, -122, 20, -63,
+   -18, 8, -124, -61, -32, -40, 117, -12,
+   -7, -36, 16, 89, -24, 71, -46, -122,
+   12, -101, -38, -70, -57, -39, -116, -60,
+   -125, -35, 37, -114, -14, -127, -77, 2,
+   -50, 115, 9, -79, -22, -74, -13, 103,
+   -79, 18, 11, -123, -26, -4, -1, 8,
+   -63, 124, 36, -32, 41, -99, -17, -18,
+   -124, 7, 122, -127, -23, 20, 41, -19,
+   106, -41, 7, -125, -21, -126, -24, -26,
+   -8, 26, -126, 125, -34, 33, 111, 46,
+   50, -20, -79, 6, -127, 97, -13, 52,
+   -32, -43, 2, 18, 17, -126, 35, 8,
+   67, -123, -127, -103, 3, -71, -32, 29,
+   6, 22, -110, -68, -6, -9, -44, 58,
+   -121, -127, -13, -50, -54, 22, -25, -78,
+   -7, 39, 104, -108, -94, -127, -36, 7,
+   5, 3, -124, -17, 18, 42, 1, -22,
+   19, 55, -99, -125, 38, -19, -38, 17,
+   5, -23, 7, 87, -125, -127, 7, 7,
+   -121, 16, -60, -9, 7, 33, 18, 30,
+   -62, 19, -125, -112, -2, -14, -25, 60,
+   1, -30, -124, -22, -65, -125, 64, 79,
+   -19, 9, -26, -127, -56, -84, 122, 63,
+   -2, -16, 26, 6, 35, -33, -21, -84,
+   -44, 72, -55, 52, -34, 66, 32, 17,
+   -37, -7, -41, 113, 1, -20, -58, -59,
+   68, 29, -125, -56, 42, -92, 3, -6,
+   19, -24, -11, 61, 39, 48, 30, -3,
+   -51, 15, 2, 11, -17, 3, 52, -7,
+   51, -11, 62, 30, 21, 71, 68, -27,
+   19, -32, -11, 40, -1, 11, 13, -10,
+   65, -39, 119, -114, 43, 19, -74, 62,
+   -45, -54, 37, -28, -120, 26, 63, 26,
+   58, 9, 20, -5, -12, 14, -5, 126,
+   16, 72, 40, -44, 52, -24, -7, 46,
+   -114, 101, 0, 15, 37, -112, 37, -46,
+   -76, 6, 70, -25, -24, 75, -43, -29,
+   76, -63, 93, 33, -24, 2, 2, 72,
+   -5, 57, 73, -31, -36, -103, 34, 10,
+   -25, 36, 20, -10, -36, 6, -83, -3,
+   13, -18, -73, 66, 46, -31, -51, -41,
+   -32, -17, 45, 41, -14, 30, -121, 10,
+   -39, -66, 15, 10, -77, -2, 43, 11,
+   28, 3, -77, 52, -26, 47, -75, 73,
+   -4, -110, -111, -20, -66, 27, -8, 17,
+   -3, 66, 22, 54, 21, 0, 68, -126,
+   85, -27, 82, 11, -25, 2, -109, -60,
+   -11, 35, 12, 3, 77, -43, -3, -68,
+   -30, -53, 21, -21, -75, -8, -54, -11,
+   -53, -16, -88, -7, -19, 14, 52, 12,
+   27, 18, -103, -128, 7, 1, -33, -7,
+   15, 32, -1, 90, 8, 41, 106, 18,
+   2, -11, -41, -93, 10, -18, -48, -12,
+   54, 10, -4, 21, 72, -18, -125, 10,
+   54, 0, -5, -66, -17, 57, -126, -4,
+   29, 19, -5, 80, -34, 13, -125, 78,
+   -81, -125, 76, 26, 3, 25, 22, 3,
+   -5, -18, 46, 39, 84, -18, 38, -110,
+   58, -128, 72, 39, 12, 5, 16, -47,
+   23, -58, -40, 13, 59, -32, 24, 3,
+   7, 83, -9, -67, -1, -2, 9, 16,
+   -55, 69, 50, 26, 20, -47, 3, 83,
+   -77, -21, -17, -7, 30, -27, 14, 71,
+   -8, 47, 99, -66, -12, -93, -59, 20,
+   -43, -24, -93, -19, 64, 4, -58, 5,
+   -42, 21, -122, -41, 19, 2, -33, 126,
+   -15, 3, 88, 3, 77, 48, 61, -8,
+   78, 7, -47, 37, -63, 57, 36, -31,
+   -9, 26, -46, 17, 55, 10, 47, -46,
+   6, -106, -123, 5, -97, 63, 40, 36,
+   23, 2, -15, 17, -65, 51, 12, -18,
+   29, -22, -6, 46, 10, -50, 29, -67,
+   58, 82, -20, -95, 15, -41, 57, 29,
+   0, 7, 29, 27, -90, -49, 49, 29,
+   1, 38, -13, 3, -32, -32, -46, 32,
+   -38, 9, 41, -7, -55, 87, 93, -18,
+   55, 11, -21, -104, -5, 45, 7, 62,
+   7, 35, 11, -30, -33, -10, -30, -13,
+   14, -9, 72, 127, -37, -16, 32, -57,
+   -37, -12, 5, 58, -66, 0, 59, 18,
+   116, 31, -53, -28, -8, -5, -74, 67,
+   39, -62, -77, 48, 25, -12, -5, -8,
+   -6, -36, 8, -53, -63, -22, -18, -5,
+   -36, 25, 26, -89, -106, -84, -40, -45,
+   -77, 47, -97, -64, -30, -51, -23, -75,
+   9, -31, 6, 33, -32, 31, -126, 13,
+   25, 4, -102, 40, 45, 47, 24, 71,
+   -55, 126, -125, -27, 9, -127, -93, 29,
+   -23, 20, 24, -123, -58, -20, -10, 5,
+   2, -67, -14, -23, -88, 113, 16, -81,
+   20, -14, 38, 124, -11, -9, 127, -127,
+   32, -36, 38, 93, 9, 14, 16, 28,
+   28, 97, -28, -58, -14, 88, -128, 0,
+   -121, 23, -2, -125, 0, 28, -127, -42,
+   -87, -12, -33, -21, -30, 125, 7, -30,
+   -53, 46, -56, -121, 34, -27, -64, -73,
+   5, 70, 8, -18, 7, -17, -89, -47,
+   -75, -30, -9, 7, -10, -55, 50, -63,
+   78, -71, 45, -1, 15, -11, -35, -10,
+   -55, -35, -41, 28, -75, 127, 119, -9,
+   -84, -74, 47, -23, -10, -40, 29, -59,
+   -20, 124, -124, -118, 9, 1, -22, -21,
+   127, -35, -55, 110, -113, 79, -4, 41,
+   4, 25, 22, 56, -69, 14, -31, -108,
+   -21, 5, 14, -82, 6, -1, 21, -92,
+   -52, -48, 19, 37, -75, -3, 63, 55,
+   -28, -51, 8, -54, 55, 15, 46, 50,
+   35, -3, -9, -27, 2, -1, 66, 56,
+   18, -16, 12, -19, 61, -5, -26, -37,
+   63, 58, 59, -62, -11, -127, 6, 7,
+   40, 114, 18, 7, 1, -123, 17, -20,
+   -76, 113, 122, 6, -56, -88, 34, 5,
+   -21, -101, -71, 77, -41, -106, 67, 31,
+   -128, 7, 11, -126, 31, -58, 69, 16,
+   -123, 44, -17, 61, 0, -8, -11, 28,
+   28, -37, -94, 28, -10, 48, -34, -93,
+   -11, 14, 7, -92, -78, -45, 22, 67,
+   14, 113, 5, 23, 40, 27, 31, 57,
+   -82, -1, -44, -29, 24, -31, -70, -87,
+   -100, 79, -122, -73, -46, 37, -68, -128,
+   65, -128, -126, 14, 85, -46, -61, 20,
+   -16, 48, 35, 30, 52, -15, -12, -83,
+   -89, -97, -60, -8, -36, -65, -56, -112,
+   -128, 113, -56, 22, -57, -84, 14, -5,
+   -26, 6, 2, 47, -1, 72, 19, 47,
+   31, 3, 0, -116, 24, 20, 64, 46,
+   28, 33, 126, -58, -9, -16, 61, -127,
+   17, -125, -80, -34, 57, -74, 21, 73,
+   -37, -2, -32, 13, -34, 31, -28, -121,
+   25, -84, 48, -120, -107, 39, 87, 32,
+   -104, -105, -119, 81, 23, -112, -90, 102,
+   -11, -50, -15, 14, 55, 20, -31, -16,
+   6, -11, 39, -8, -4, -29, -31, 56,
+   47, 26, -7, 7, -25, -4, 13, -43,
+   -42, -27, -13, -26, 47, -11, -18, 3,
+   -2, 10, 10, -39, 12, 70, 108, 88,
+   -10, -45, -69, 23, 79, -30, 12, 24,
+   29, 80, -32, -85, -21, 10, -20, 39,
+   74, -39, -54, -43, -18, -37, 14, 59,
+   55, 44, 44, 30, 30, 86, -96, 33,
+   -7, 2, -73, 35, -12, -36, 13, -29,
+   28, 31, 19, 75, 42, 79, -12, -30,
+   124, 11, -41, 31, 0, 9, -47, 74,
+   25, 16, 19, -16, 63, 21, -77, -25,
+   -43, 60, 36, 13, 38, 53, 22, -45,
+   53, 39, 15, 9, -43, -88, 42, -67,
+   -2, 34, -62, 16, 26, -4, 9, -57,
+   54, 17, 10, 3, 60, 23, 15, 72,
+   37, 0, 2, 12, 74, -91, -40, 8,
+   5, 69, -37, 0, 18, 21, 33, 33,
+   77, 20, 31, 52, -9, -33, -13, -46,
+   17, -26, 33, 22, 10, -49, -27, 8,
+   19, 17, -54, 27, 7, -29, 5, 25,
+   -19, 98, 11, 37, -112, 125, 63, 17,
+   -37, -10, -75, 31, 6, -24, -22, 2,
+   49, 11, 39, -87, 53, -65, 0, -25,
+   -93, -29, -32, -33, 2, 32, -34, 13,
+   51, -9, -46, 27, -53, 7, 16, -40,
+   8, -121, -58, -58, -12, 91, 8, -15,
+   -18, 51, 4, 23, 36, -125, -24, -10,
+   -55, 13, -36, -18, 40, 56, 26, 24,
+   -8, -64, -106, -73, 20, 23, 17, -23,
+   110, -12, -30, -62, -1, 21, 34, -62,
+   5, 66, -26, -78, -7, -3, -7, -39,
+   6, -43, 59, 68, 60, -10, -78, -53,
+   -57, 60, -83, -112, 25, 16, 12, -6,
+   7, 13, -29, 107, -19, 44, -5, 46,
+   -124, 67, -80, -30, 49, -1, 5, 20,
+   19, 34, -3, 2, -18, -19, 123, 14,
+   -67, -19, 44, -10, 24, -106, 2, 26,
+   6, 67, -16, -56, -89, -128, 96, 14,
+   38, -19, -81, 52, 32, 0, 60, -12,
+   60, -5, 89, -23, -30, 2, -39, -7,
+   -63, 73, 17, -40, 63, 22, -24, -18,
+   37, 8, 33, 7, -30, -123, -19, -1,
+   -2, 38, 55, -86, -44, -7, 28, -19,
+   1, -19, 36, 6, 48, -11, 4, 81,
+   -36, 80, -37, -12, -79, -19, 15, 8,
+   -8, -14, 59, 30, -42, 5, 14, -92,
+   -118, -25, -43, 20, 9, 34, -21, 93,
+   -32, -45, 58, -121, -49, 126, -1, 52,
+   -53, 15, -19, 27, -68, -23, 45, -9,
+   39, 57, 5, -117, -34, 10, 7, -61,
+   -18, 10, -44, 21, -77, -76, 103, -25,
+   -43, -36, 86, 44, 47, 27, 23, 0,
+   -77, -46, -12, 63, -111, -17, -16, 34,
+   -46, -17, 14, 98, 15, 126, -95, -45,
+   0, -67, -78, -5, -24, -9, 2, -11,
+   -6, -96, 73, -55, -19, -32, -7, -69,
+   0, 23, -24, 58, -19, -6, 101, -22,
+   24, -21, 57, -51, 100, -7, -4, -11,
+   -128, -13, 28, 28, 18, -56, 36, -7,
+   -89, -63, -8, 34, 52, -14, 23, 5,
+   -85, -10, 47, 50, 8, -126, 78, 43,
+   -9, 36, 1, 27, 8, -114, -3, -72,
+   -31, 34, 12, 54, -30, 20, 101, 1,
+   78, -121, 34, -64, 14, -106, -42, -33,
+   36, -5, 15, 40, -25, 56, -21, -42,
+   -53, 29, 25, -51, -108, 33, -8, -41,
+   51, -60, -60, 8, -45, -92, 0, -127,
+   -39, -53, -7, 17, -90, -15, -34, -126,
+   81, -127, 49, 1, 96, 8, 59, 7,
+   -58, -125, 121, 63, 49, 7, 42, 9,
+   23, -11, -45, -125, 17, -32, 1, -22,
+   -5, 78, 18, -40, -45, 19, -3, 85,
+   62, 24, -39, 4, 24, 22, -7, 2,
+   117, -81, -15, -31, -38, 50, 5, -41,
+   40, 21, 29, -56, -62, 8, 6, 32,
+   -6, -19, 71, -10, -12, 28, 25, 10,
+   -92, 23, -8, -76, 26, 33, 86, -23,
+   -22, -56, -108, 15, 68, 123, -12, 59,
+   124, 46, 40, 124, 24, 35, 17, -29,
+   29, 77, 2, 35, -48, -23, 3, -43,
+   102, 69, 47, 0, -93, 44, 13, -15,
+   -8, 10, -29, 28, -60, -12, 48, -26,
+   47, 22, 55, -80, -64, -29, -11, -25,
+   -41, 68, -52, -10, -42, 46, -53, 46,
+   27, -38, 90, -100, -34, -80, -30, -124,
+   8, -8, 2, -6, 41, -64, 19, -37,
+   5, -52, -55, -18, -5, -39, -96, -29,
+   5, 125, 2, 28, 16, 117, -14, 80,
+   -69, -61, -55, -117, 99, -32, -39, 41,
+   35, 9, -83, 87, -86, -125, -36, 28,
+   -126, 8, -77, 127, 12, -21, 65, -78,
+   -11, 24, -45, -24, -94, 71, -50, 33,
+   -25, -3, -40, -39, 12, -92, -122, 37,
+   120, -6, 52, -48, 12, -12, 65, -127,
+   78, -14, 15, -88, 38, -15, -34, 8,
+   31, -125, -18, -93, 30, -43, 3, 78,
+   18, 25, -29, -47, 25, 39, 7, -121,
+   -13, -118, 24, -59, -17, 3, -6, 36,
+   -37, -7, 20, -51, 54, -74, -19, -6,
+   -51, 17, -125, 30, 15, -4, 88, 69,
+   5, 15, -58, -114, 54, 30, -73, 8,
+   9, -32, -44, 14, -3, -27, -20, 11,
+   10, 122, 85, 32, -48, 12, 40, 34,
+   13, -21, 99, 11, 70, -77, 5, 82,
+   -37, 54, -89, -45, -126, -61, 12, -63,
+   8, 35, -7, 10, -51, 24, -25, -12,
+   10, -7, -35, 44, 84, -47, -80, 14,
+   93, 6, 11, 51, 60, 48, 30, 7,
+   -71, 6, 10, 0, -10, -5, -52, -3,
+   -48, 30, 30, 18, 70, -17, 43, 44,
+   -126, 33, 120, 53, 47, -18, 22, 52,
+   -35, 93, 47, -27, 85, 0, -17, 0,
+   -13, 53, -2, 28, 65, 17, 23, 121,
+   -5, 45, 50, 44, -4, 34, 7, 32,
+   76, 12, 35, 46, 30, 50, -35, 46,
+   -42, 28, 8, -36, -32, 2, 41, -40,
+   1, 0, -4, 14, -41, 74, 88, 33,
+   17, 71, 40, -20, -17, 32, -27, -41,
+   -48, 6, -56, 80, 42, -31, 33, 44,
+   -1, -98, -23, -61, -15, -4, 67, -36,
+   67, -37, -66, 50, -126, -18, 24, -128,
+   -55, -30, -12, -10, -9, -48, 45, -118,
+   -11, -29, -19, 57, -9, 32, -23, 18,
+   126, 65, -11, 4, 2, 17, 14, 18,
+   22, 23, 31, 9, -15, -74, 34, -27,
+   -20, 44, 125, -28, -19, -107, 11, -88,
+   -14, -39, -8, 11, -74, -37, 22, 15,
+   -50, 34, 14, 12, -24, -3, 107, 43,
+   -8, -17, -42, 69, 31, 31, -30, 14,
+   17, -65, 100, -34, -4, -28, 28, -69,
+   90, 14, -18, -23, 27, -4, -27, 26,
+   -76, -64, 9, -78, -36, -4, -101, -3,
+   47, 13, -122, 32, 7, -64, 30, -69,
+   -50, -98, -12, -59, -26, 14, 26, -40,
+   -126, 42, -51, 33, -26, -46, -32, -34,
+   17, -12, -89, -9, 32, -25, 15, 24,
+   -3, -4, -18, -39, -24, 16, -43, -41,
+   -52, 40, 2, -40, -14, -64, -3, 0,
+   18, 125, 42, 14, -35, 19, -101, -24,
+   15, 12, -12, 1, 7, -41, 9, 26,
+   -14, 118, 19, -36, 32, -18, -43, -11,
+   22, 11, 26, -1, 2, -12, -39, -54,
+   -5, 15, 32, -29, 55, -22, -78, -27,
+   -44, -120, 1, -5, -67, 12, -13, -46,
+   -81, -14, 64, -16, -70, -24, -23, 55,
+   -3, 31, -31, 12, 26, 33, 12, 16,
+   46, 71, -27, 64, 6, 24, 45, -69,
+   -33, 27, 41, 16, -34, 23, 7, -11,
+   1, -12, 126, 51, -18, 15, -75, 10,
+   -66, 1, -7, -13, -42, -25, -37, -3,
+   16, -22, 63, 54, 37, -67, -42, 37,
+   -81, -37, -9, -73, -39, -127, -15, 27,
+   127, -37, 40, -12, 2, -10, 5, -69,
+   -16, 38, 24, 97, 116, -33, -17, 10,
+   -58, 4, -67, 90, -45, 13, -126, 43,
+   22, -22, 49, -65, -46, -54, 2, -39,
+   -62, -32, -15, -42, -105, -28, 68, 43,
+   9, -23, -26, -113, -104, -46, -67, -18,
+   3, 51, 8, -50, -2, -33, -15, -22,
+   54, 7, -63, -19, -128, 47, -93, 13,
+   -13, 36, -98, 49, 20, -13, -9, 11,
+   -44, -35, -106, -37, -38, -32, -47, 42,
+   24, -45, -115, 79, 25, -5, 16, 36,
+   -87, -45, 73, -4, -53, -66, -11, 15,
+   0, 52, -55, -44, 37, -3, 23, -35,
+   13, -50, 22, 9, -5, -75, -46, 23,
+   -20, 34, 17, 35, 30, -5, 9, -106,
+   2, -39, 46, 1, 0, 30, -51, -16,
+   -125, -83, -4, -3, -127, -10, 90, 46,
+   -19, 33, -48, -14, 62, -54, -104, 0,
+   7, -13, -5, 7, 14, -70, 27, 27,
+   -4, 1, -84, -45, 30, -6, -71, 14,
+   31, -110, 44, 37, 35, 31, -56, -122,
+   -60, 6, -1, -28, -89, 24, 30, 13,
+   -2, -28, -108, -40, -12, -126, -126, 24,
+   -94, 49, 46, -20, -89, -123, 62, 23,
+   -125, -67, -20, 19, 38, 37, 54, 59,
+   92, -127, 107, -62, 90, -9, 24, 8,
+   -8, -40, -32, -33, -23, -78, 0, -76,
+   28, -27, 12, 24, -110, -34, 105, 38,
+   3, 36, -51, -28, -8, 38, 15, -3,
+   117, 45, -44, 45, 104, 94, 11, -53,
+   64, 41, 7, -7, -8, -39, -44, 89,
+   69, 29, -54, -55, -16, 15, -54, -5,
+   -14, 12, -67, 12, 20, -47, -12, 42,
+   -35, 38, 25, 11, 21, -11, -21, -20,
+   -1, 6, -51, 9, -48, -53, 40, -41,
+   -113, -42, 57, 22, 39, 61, -43, -2,
+   47, -29, -101, -58, 16, 21, 1, -29,
+   -8, 21, -24, 4, -20, 23, -30, 0,
+   18, 125, 20, 63, 25, 21, 127, -21,
+   -20, -55, -14, -98, 81, 3, 37, 58,
+   -33, -36, -5, -13, -124, -43, 127, -11,
+   -15, -48, 122, -111, -11, -15, 28, -42,
+   33, -127, 100, -72, -13, 127, -54, -3,
+   79, 2, -42, 38, 16, 8, -62, -19,
+   36, 19, 39, 78, -7, 121, -66, 11,
+   -36, 47, 83, -69, -23, 34, -79, -62,
+   39, -56, 73, -40, -87, 89, -96, 68,
+   101, -65, 25, -32, 26, -8, -25, -61,
+   -82, -9, -89, -28, -66, 126, 73, -15,
+   -31, 36, 40, -38, -9, 9, 35, 16,
+   16, -44, 38, -73, -14, -5, -26, 92,
+   -114, 63, 32, 22, 79, -30, -11, 77,
+   109, 66, 95, 27, -22, 14, -97, -22,
+   -51, 15, 41, -81, -10, 0, -44, 12,
+   58, -44, 23, -32, 5, 106, 10, -3,
+   -43, -13, -118, 57, -51, -88, 21, -12,
+   17, -81, 4, -20, 31, 18, -24, -2,
+   -121, 20, -5, 66, 20, 62, 4, -45,
+   14, 61, -36, -27, -26, -14, 20, 123,
+   35, -9, -31, -96, 11, -55, -60, -52,
+   -117, 32, -127, -45, -36, -10, 12, 87,
+   -101, -38, -30, -106, -50, -33, -5, 1,
+   -9, -7, 0, -32, 15, -12, -10, -25,
+   110, 5, -19, 1, -57, 83, 93, 8,
+   19, -3, 29, 5, 49, 26, 7, -7,
+   40, -12, -24, 63, 30, 11, -49, 2,
+   24, -7, 21, -34, 31, 12, 25, 39,
+   9, 46, 39, 21, 11, -28, 20, -5,
+   8, 10, 6, -28, 56, 8, -2, -7,
+   -3, 11, 3, -5, -5, -9, -41, 15,
+   18, -24, 9, 10, 0, -16, 30, -32,
+   23, 17, 117, 43, -52, 1, 12, 11,
+   9, -10, 0, 11, -5, -20, 3, -33,
+   0, 19, 101, 69, 34, 0, 29, 11,
+   -4, 126, 31, -95, -12, -27, -80, -38,
+   -85, -96, -7, 68, -126, 16, 84, -8,
+   -47, 33, -35, 54, -23, -12, 57, -40,
+   -23, 43, 71, 40, 49, -40, 37, 15,
+   -6, -46, -60, 25, -34, 49, -3, 29,
+   10, 38, -7, 21, 94, -6, 11, -16,
+   71, 3, -13, 32, -6, 93, -103, 56,
+   49, -7, -2, -22, 18, -36, 8, 49,
+   0, 21, -48, -3, 55, 94, -85, -24,
+   -26, -22, -81, -44, 51, 6, 3, -24,
+   86, 83, -14, 68, -40, -19, 41, 2,
+   51, 37, -100, 59, 98, 61, 6, 37,
+   -59, -13, 10, 126, 49, 29, -18, -123,
+   -128, -46, 46, -125, -126, -1, 88, -101,
+   -50, 70, 11, 41, -127, -16, -79, 81,
+   -38, 5, -125, -8, 47, 51, 66, -82,
+   47, 91, 28, 57, -15, 86, -94, -43,
+   -47, 32, -8, -63, 82, 19, -73, -25,
+   47, 55, 46, 45, -93, -82, -123, 36,
+   -12, 16, 14, -106, 25, 26, -36, -57,
+   -15, -10, -67, 123, 93, -33, 58, -5,
+   -80, 53, -94, -53, -22, 58, -11, -1,
+   67, -36, 125, 40, 11, 62, 79, -123,
+   33, -121, 2, -114, 6, 50, -17, 26,
+   -35, 19, -6, -85, 28, -1, -21, 17,
+   45, 125, 71, -29, -59, 16, 41, -63,
+   13, 7, 65, -36, -52, -51, 68, -44,
+   30, 24, -3, -4, -46, 63, 19, 58,
+   -78, 34, 8, 94, 69, -29, -51, -1,
+   28, -99, 39, 19, -14, -4, -92, 38,
+   -5, -21, 104, 13, 13, -81, -29, 29,
+   -54, -83, 91, -16, -2, 15, 0, -5,
+   33, 9, 35, 4, 13, 21, -113, 0,
+   -21, 25, -26, -89, 96, 34, -7, 27,
+   -12, -27, 16, -33, 7, -6, -1, 24,
+   43, 33, 9, 45, 87, 25, 54, 40,
+   -53, -122, -42, 55, 98, 23, 83, -5,
+   5, 73, -65, -110, 29, 12, -127, -3,
+   63, -64, 0, 14, 16, 36, 38, -44,
+   37, -84, -74, -7, -5, -41, -95, -119,
+   14, 66, -18, 120, -17, -40, -58, 2,
+   44, -26, 86, -11, 40, 59, 52, -20,
+   24, 11, -18, -68, -9, -126, -7, 62,
+   120, 79, 31, 69, -20, -53, 42, 86,
+   32, -52, 12, 32, 64, 74, -39, -66,
+   67, -4, 35, -51, -50, 50, 8, 69,
+   -112, 104, 51, 53, 15, 1, 55, 88,
+   34, -100, -21, -25, -117, -91, -4, -125,
+   -1, 1, 48, -29, -13, -20, 7, 29,
+   -61, -24, 26, 9, 73, -23, -128, -61,
+   -79, -17, -21, 17, -7, -23, -70, -18,
+   97, -30, 15, -28, 56, -41, -126, 21,
+   27, 122, -13, 41, -86, -109, 12, 35,
+   46, -57, 2, -47, 1, 7, 63, -53,
+   98, 51, -50, -7, -10, -37, 8, 6,
+   -110, 15, 42, 24, -34, 117, -4, 50,
+   14, 17, -37, 58, -46, 6, 115, -31,
+   -113, -40, 104, -47, -5, 118, 19, 30,
+   -78, -22, -126, 27, -3, 54, -63, -65,
+   21, -7, -45, -39, -10, -35, 2, -3,
+   53, 5, -119, -26, -66, -6, -46, 43,
+   -66, -2, -20, -27, -10, 27, -34, 29,
+   -21, -7, -103, 4, -26, -5, 17, 52,
+   -128, -28, -13, -1, 52, -38, 67, -24,
+   -41, -121, 65, 32, 84, -24, -112, 13,
+   106, -105, -9, -66, -18, -28, -52, 78,
+   -58, -33, 2, -18, 17, -33, -21, -30,
+   93, -28, -116, 80, -84, -51, -21, -1,
+   -15, -4, 24, -34, 50, -44, -54, 61,
+   -79, -41, 15, -48, -125, -29, -84, 93,
+   17, 1, -123, 106, -123, -17, 84, 0,
+   126, -34, -30, -81, 61, -96, 13, 71,
+   -40, -122, -19, 22, -89, -25, -119, 57,
+   -5, -98, 112, -71, 95, -94, -59, 74,
+   103, -12, 39, -61, -8, -125, 15, 7,
+   -69, -17, -119, -11, 69, -81, -17, 124,
+   43, 33, -127, -103, -88, 81, 56, -10,
+   1, -98, -97, -73, -71, -42, 17, 73,
+   -33, -123, -46, -80, 9, 91, 126, -127,
+   -21, -115, -110, 93, -126, -24, -53, -119,
+   -103, -117, -9, -28, 39, -11, -59, -103,
+   0, 53, 1, 59, 27, -86, -88, 95,
+   24, 51, 114, -6, 81, 107, 70, -80,
+   -95, -34, -24, 20, 18, 7, 31, -121,
+   72, -64, 101, 5, -28, -94, -121, 14,
+   19, 45, 23, -86, -34, -19, 5, -61,
+   73, -82, -11, 28, 10, 23, -46, 26,
+   108, 16, 5, -16, 32, -32, -81, 76,
+   -18, -19, -44, 13, -53, -97, 37, 36,
+   21, -62, 9, 9, 82, -65, -92, -61,
+   -128, 73, 33, -12, -126, -41, -3, 6,
+   63, -97, -127, -91, 31, -18, -3, 91,
+   -65, 27, 21, 57, -43, -40, 99, -62,
+   22, -6, -51, 127, 82, -14, -114, -31,
+   39, 39, -88, -17, -24, -10, -22, -113,
+   -36, 3, -67, -76, 47, 50, 85, -22,
+   22, 10, 60, -2, 34, 0, -25, 22,
+   -52, 48, 79, 48, -3, 17, -27, -6,
+   6, -17, 125, -12, 65, 1, -12, 35,
+   30, 91, 14, 88, -13, 26, 36, -17,
+   20, 9, -23, 37, 112, 25, 31, 56,
+   -7, 118, -78, 11, -13, 84, 41, 1,
+   46, 114, 123, 35, 40, 39, 18, 12,
+   116, -13, -13, -7, 64, -128, -22, 15,
+   -27, 11, 53, -13, -31, 13, 51, 74,
+   -21, -26, 81, -56, -4, 5, 24, -41,
+   20, 22, 18, -8, 70, 4, -14, -2,
+   17, 17, 71, -30, -128, 20, 20, 3,
+   40, -5, -35, 123, -23, 28, 21, -6,
+   -34, -5, 41, -33, -18, 3, -5, -44,
+   -46, 37, 37, 0, 14, 39, -69, 50,
+   18, -31, 39, 43, -51, 5, 6, 19,
+   -21, 40, -9, -5, 41, 3, 76, 4,
+   10, -41, -49, -43, -47, -66, -74, 53,
+   -77, 109, 51, 62, -19, 1, 33, 31,
+   -18, -107, -39, -72, 20, 21, -32, -35,
+   42, -8, -2, 10, -2, 1, 31, 9,
+   69, 24, 55, -60, 11, -14, -11, -69,
+   -63, 0, 107, 10, -61, 77, 57, 34,
+   38, 21, -55, -29, -126, 18, -54, -94,
+   -61, -41, 0, 20, 45, -21, -2, -52,
+   -47, 71, 12, 11, -11, 33, 117, 14,
+   -64, -4, -112, -21, 27, -46, 16, 25,
+   41, 36, -35, 45, -2, -24, -35, 10,
+   -4, 24, 18, 57, -126, 17, 21, -13,
+   31, -125, -1, -3, -8, -70, 22, -124,
+   1, -50, 75, 87, 60, 83, 27, -42,
+   21, 9, -3, -45, -40, -24, 8, -6,
+   -11, -3, -126, -15, -8, -75, -80, -124,
+   -70, 40, 48, 19, 29, -2, 25, -121,
+   -23, 4, -12, 90, 49, -40, 20, -13,
+   3, -123, 10, -59, -21, -25, -60, -10,
+   56, -5, 8, 24, 18, 4, 15, 33,
+   77, 4, 1, 8, -126, 23, 27, 34,
+   3, 51, 66, -14, 50, 51, 108, -40,
+   -2, -39, 10, 46, 60, 28, 5, 72,
+   11, -64, -82, 31, -52, -3, -29, 32,
+   63, -24, 44, 35, 8, -8, 25, -25,
+   6, 58, 41, 55, -24, -33, -7, -8,
+   -16, -36, -59, 6, 56, -68, 32, 16,
+   -14, 26, -19, 26, -41, -77, 41, 0,
+   -20, -21, 15, -49, -27, 7, 34, 41,
+   17, 14, 20, 62, 95, 40, -4, 65,
+   28, -11, -28, 27, -43, 85, -12, 2,
+   -11, -13, -5, 38, 4, -87, 126, 44,
+   -12, 3, 30, -89, 124, 24, -16, 35,
+   -30, -39, 0, -116, 122, 33, -8, -31,
+   80, -29, -12, -55, -17, 18, 58, 15,
+   34, -123, 19, 4, -51, 48, 7, -127,
+   -89, 127, 39, -86, -19, 46, 127, -52,
+   68, 3, -7, 9, -126, -13, -49, -45,
+   8, -20, -126, 42, -72, 127, -15, -2,
+   42, -33, 53, -34, 10, -128, 13, -78,
+   -60, -65, 52, -35, 36, 39, -30, 55,
+   -64, -81, 32, 41, 38, -17, -53, -65,
+   95, -115, 22, -52, 10, 64, -60, -9,
+   -45, -21, 24, -22, -25, -31, 64, 127,
+   -47, -33, 10, 98, 62, 30, 17, 19,
+   -46, 36, -67, -74, 75, -19, 56, 2,
+   11, 28, 127, -57, -52, -110, -44, -20,
+   106, -30, 49, 52, -1, 43, 38, -32,
+   41, -13, -2, -38, -12, -3, -17, -36,
+   42, -6, -22, -17, -74, -30, 95, 18,
+   23, 14, 17, -21, 34, 72, 24, 2,
+   -37, -49, -36, -34, 3, -126, -65, -37,
+   -24, -56, 14, 75, 28, 0, 41, -80,
+   -13, -90, -33, 39, 31, -14, -1, 15,
+   19, 63, -9, 45, 3, -122, 48, -35,
+   -38, 25, 22, 18, -27, 4, 1, -11,
+   -43, -101, -24, -2, 13, 64, 42, -45,
+   -20, -1, -6, 29, 0, 10, -5, 14,
+   98, -1, -18, 9, 44, -19, -24, -36,
+   -12, -42, -31, -28, 125, -21, -17, -12,
+   -12, 25, -21, 8, -6, 30, 39, -13,
+   -24, 25, 36, 48, -12, 31, 53, -23,
+   -57, -27, -53, -5, -18, 12, 1, -13,
+   -28, 8, -48, -64, 25, -12, -27, 66,
+   -28, 2, 12, -12, -8, -88, -16, -48,
+   -61, 12, 77, 41, -50, 7, -18, 12,
+   1, 2, 25, 80, 6, -63, -50, 29,
+   127, 37, -30, -102, 35, 39, -7, -26,
+   -27, -81, -4, -1, -7, -48, -28, 29,
+   37, 19, 49, -23, 19, -2, 15, -20,
+   -7, -1, 45, 33, -54, -2, 26, 23,
+   26, -101, -45, -32, 39, -24, -18, -9,
+   -7, 34, 75, 5, 15, 39, 19, 7,
+   34, 53, -13, -10, 11, 38, -29, -27,
+   -1, -104, -55, -10, 27, -9, -2, 6,
+   -14, 13, 29, -28, -21, 13, -1, 38,
+   -25, 32, -31, -50, 52, -34, -19, -39,
+   12, -29, -110, 10, -74, 47, 60, -6,
+   -2, 22, 4, -42, -55, 41, -66, 88,
+   -15, 123, 26, -7, 20, 20, 28, 35,
+   69, 5, -64, -21, 36, 26, 78, 122,
+   -6, 54, -44, 51, -7, 118, 60, 109,
+   12, -29, 36, 27, -50, 50, -37, 10,
+   56, -126, 107, 56, -8, 81, -101, 29,
+   21, -25, 15, 68, 81, -98, -28, -46,
+   -61, 12, 87, 96, 2, 4, 57, -123,
+   25, 12, 41, -5, -32, 78, 123, 28,
+   59, 58, -85, 16, -13, 60, -115, -23,
+   50, 127, -83, 39, 94, -50, -96, -97,
+   -17, 91, -28, 11, -127, -63, -25, -92,
+   -106, 89, 78, -11, -27, -22, 8, 13,
+   26, 53, 25, 19, 93, 49, -21, -10,
+   0, 37, 59, -6, -34, -22, 13, 80,
+   35, 0, 30, 89, 64, -17, -25, 16,
+   73, -32, -47, 92, 31, -32, 82, 3,
+   44, -22, 3, 44, 1, 1, 10, 22,
+   13, 9, -18, 20, -2, -15, 41, -1,
+   33, 18, 22, 51, 6, -16, -41, 17,
+   -5, -43, 78, 25, 45, 66, -15, 0,
+   14, 3, 51, -36, 24, -13, -7, -15,
+   -4, -11, 28, 29, 11, -20, -3, 54,
+   14, -9, -127, 8, 12, 61, 9, 28,
+   55, 0, 9, 13, -61, 28, 40, 39,
+   -49, -32, -20, 9, -16, 59, -15, -21,
+   5, -39, 28, -33, -26, 51, 4, -10,
+   -19, 27, -31, -4, -34, 74, 3, 16,
+   104, 2, 121, 23, -27, -1, 6, -32,
+   -15, -28, -32, -14, 65, 100, -2, 5,
+   -4, -8, 55, 67, 10, 6, 10, -9,
+   -39, -78, 42, 35, 9, 24, -24, 50,
+   -7, 44, -37, 4, 0, 14, 45, -29,
+   33, 21, 54, -3, 20, 46, 20, -34,
+   33, -71, -32, 8, -24, 8, -29, -19,
+   -7, 116, -27, 52, -9, 26, 121, 54,
+   -86, -5, -66, 44, -40, 56, -21, -38,
+   -24, -42, 2, -20, -11, 23, -8, -7,
+   -101, -44, 15, 38, 60, -15, -3, -4,
+   50, -12, -91, 10, -49, 7, 31, 30,
+   -61, -55, 20, -100, 17, 13, -57, 32,
+   88, -62, 56, -23, -9, -8, 3, 26,
+   4, 2, 9, 70, 11, 36, -30, -126,
+   -55, 71, 28, 47, 94, 44, -8, 20,
+   -3, 6, 18, 56, 124, 78, 1, 19,
+   -57, -19, -121, 42, 54, -51, -12, -39,
+   -44, -16, -80, -77, 31, 16, -13, -76,
+   29, -2, 1, -47, -4, 59, 79, -10,
+   22, -35, 69, -50, 7, -17, 64, -58
+};
+
+static const rnn_weight denoise_gru_bias[288] = {
+   -41, -76, -24, -96, 25, 117, -55, 54,
+   -73, -28, 53, -79, 20, -8, -87, 28,
+   44, 38, -66, -19, -45, 25, 119, 78,
+   54, -92, 31, 13, -3, -13, -28, -67,
+   3, 31, 54, -48, -16, -97, -12, 2,
+   -117, -48, -24, 56, 18, 115, -59, 126,
+   -30, 6, 16, -126, -11, -6, 15, -67,
+   33, -113, 59, -12, 126, -3, 61, 58,
+   -71, -4, 42, 41, -48, 11, -33, 50,
+   43, 4, 0, 15, -46, -16, 23, -18,
+   8, -30, 13, 66, 77, -6, 34, 103,
+   40, 50, 39, 72, -10, 22, -16, 24,
+   1, 127, -9, -48, -55, -27, 36, -16,
+   90, 4, 12, -17, 59, 23, -34, 20,
+   -84, 19, 41, 121, 116, 111, -10, -127,
+   41, 44, 4, 34, -1, 20, -11, 2,
+   127, -127, 44, 16, 21, 126, 66, 125,
+   126, 78, 25, 45, 72, 3, 123, 40,
+   105, -62, 25, -105, 44, 33, 13, -51,
+   119, 126, 126, 53, 0, -88, -32, -27,
+   -33, -18, 11, 1, 27, -62, -6, -57,
+   71, 46, 21, -7, -6, -55, 127, 30,
+   -41, -6, -21, -21, -38, 87, -16, 34,
+   44, -126, -112, -30, 61, -17, 115, 1,
+   -39, 19, -43, 76, -64, 48, -13, 11,
+   73, 71, 93, 104, 23, 10, 63, 34,
+   -7, 126, 57, 3, 127, 15, -71, -126,
+   -25, 125, 7, 7, 39, -18, -27, 126,
+   95, -127, -95, 36, -4, 125, 37, 72,
+   127, -29, 69, 84, 99, 39, 127, 40,
+   -127, -92, 0, 127, -14, 70, 39, -98,
+   25, 127, -54, 48, 47, 19, -21, 93,
+   61, 127, 3, -62, 127, -75, 24, -3,
+   -18, 102, 40, -6, -14, -36, -41, 46,
+   89, -17, 29, -55, 7, -10, -59, 22,
+   -21, 25, 18, -58, 25, 126, -84, 127
+};
+
+static const GRULayer denoise_gru = {
+   denoise_gru_bias,
+   denoise_gru_weights,
+   denoise_gru_recurrent_weights,
+   114, 96, ACTIVATION_RELU
+};
+
+static const rnn_weight denoise_output_weights[2112] = {
+   24, 90, 127, 108, 73, 38, 24, 13,
+   4, 16, 41, 51, 46, 35, 24, 14,
+   19, 23, 27, 23, 11, 10, 14, -1,
+   20, 67, 122, 95, 44, 11, 4, 5,
+   8, 15, 19, 17, 11, 5, 1, -2,
+   -1, 5, 5, 1, 28, 2, -25, -16,
+   -83, -45, 4, 36, 29, 24, 20, 12,
+   -1, -2, 4, 13, 17, 18, 21, 22,
+   20, 11, -11, -26, -15, -21, -18, -15,
+   -22, -22, -18, -22, -25, -20, -24, -25,
+   -19, -21, -22, -16, -18, -24, -22, -7,
+   6, 26, 25, 7, 12, 17, 11, 4,
+   11, 11, 1, 1, 6, 14, 19, 11,
+   13, 29, 37, 14, -16, -45, -3, -8,
+   -17, -22, -19, -11, -19, -21, -22, -24,
+   -25, -20, -19, -14, -7, -5, -3, -1,
+   0, 1, 14, 13, 10, -12, 27, 5,
+   -33, 11, 51, 26, -23, -22, -11, -8,
+   -4, -8, -21, -32, -41, -45, -43, -39,
+   -34, -16, -3, 2, -7, -10, -16, -12,
+   -12, -8, -4, 1, 24, 53, 81, 98,
+   99, 80, 60, 54, 49, 38, 16, 5,
+   0, 15, 5, 14, 11, 12, 3, 7,
+   16, 19, 17, 10, 6, 1, -11, -11,
+   -18, -26, -31, -26, -17, -14, -2, -15,
+   -23, -27, -28, -31, -25, -29, -36, -37,
+   -26, -22, -17, -15, -18, -17, -14, -14,
+   -9, -9, 1, 4, 1, -6, -29, -23,
+   -21, -14, -24, -24, -20, -21, -16, -13,
+   -14, -15, -12, -16, -13, -10, -10, -7,
+   4, 18, -8, -11, -24, -12, -6, -10,
+   -14, -21, -21, -20, -15, -22, -53, -65,
+   -58, -43, -27, -31, -38, -45, -48, 0,
+   -5, -8, -4, 2, 10, 12, 12, 6,
+   12, 21, 25, 22, 23, 23, 26, 38,
+   44, 41, 38, 36, 24, 18, -21, -31,
+   -28, -37, -20, -5, -4, -15, -14, -16,
+   -21, -21, -9, -10, -8, 0, -5, 4,
+   20, 14, 15, 47, 26, 26, 25, 5,
+   3, 8, 17, 17, 10, 14, 14, 4,
+   0, 5, 6, 12, 12, 11, 14, 28,
+   47, 62, 8, 8, -7, 2, 2, 2,
+   -5, -4, 2, 2, -4, -5, -11, -22,
+   -34, -46, -53, -55, -45, -39, -35, -43,
+   -15, -7, 24, 40, 50, 55, 62, 63,
+   60, 58, 50, 48, 46, 47, 45, 40,
+   30, 20, 12, 7, 3, 4, -9, 2,
+   -13, -9, -13, -15, -20, -17, -19, -32,
+   -45, -54, -65, -67, -63, -62, -48, -24,
+   -11, 5, 11, -38, -5, -7, -8, -12,
+   -17, -15, -11, -7, -8, -12, -10, -11,
+   -14, -13, -14, -17, -7, 12, 24, 15,
+   -11, -79, -1, 14, -8, 26, 14, 13,
+   13, 6, -16, -16, 10, 28, 16, 5,
+   -1, -1, 5, 9, 7, 6, 8, 14,
+   -10, -7, -2, -1, -9, -18, -20, -18,
+   -13, -11, -14, -20, -29, -37, -46, -46,
+   -48, -54, -56, -72, -83, 11, 0, 11,
+   37, 45, 52, 80, 118, 96, 33, -10,
+   -13, -10, 4, 7, -6, -3, 5, 3,
+   -2, -9, -9, -7, -4, -3, 12, 13,
+   17, 24, 20, 16, 10, 11, 15, 17,
+   11, 3, 1, -1, -6, -9, -5, -14,
+   -21, -16, 8, 1, -10, 5, -3, -51,
+   -14, -10, -28, -27, -21, -14, -4, -3,
+   -6, 1, 5, 4, 5, 13, 11, -1,
+   -3, 5, 11, 30, 37, 34, 31, 27,
+   24, 24, 29, 34, 28, 25, 29, 27,
+   29, 30, 36, 38, 38, 8, -17, -18,
+   -41, -58, -45, -39, -51, -52, -40, -47,
+   -60, -52, -38, -25, -27, -36, -43, -33,
+   -19, -3, 1, -3, 3, 1, 6, 14,
+   12, 9, 6, 3, 8, 13, 10, 8,
+   15, 31, 46, 69, 82, 81, 76, 67,
+   42, 15, 14, 28, 21, 36, 42, 27,
+   28, 26, 20, 11, 7, 4, 7, 6,
+   7, 20, 26, 17, 12, 1, -13, -22,
+   -16, -23, -16, -9, -11, -10, -12, -10,
+   -5, -6, -8, -6, -3, -2, 9, 10,
+   7, 7, 9, 22, 34, 25, -5, -8,
+   -3, 2, -14, -7, -2, 1, 7, 33,
+   56, 59, 58, 42, 2, -11, -10, -11,
+   -10, -12, -10, -4, 9, 14, 21, 11,
+   9, 6, 7, 8, 13, 16, 18, 22,
+   26, 30, 30, 30, 26, 18, 9, 5,
+   2, 3, -18, -29, -57, -45, -39, -45,
+   -35, -19, -7, -6, -2, -4, -11, -13,
+   -1, 0, -6, -22, -47, -50, -18, 12,
+   -13, -19, -45, -41, -43, -38, -34, -31,
+   -31, -21, -13, -10, -13, -13, -9, -8,
+   -9, -9, -6, -4, -4, 2, -9, -18,
+   -6, 2, 0, 5, 8, 5, 5, 7,
+   8, 7, 6, 2, -5, -6, -2, 3,
+   3, -8, -14, -1, 45, 35, 41, 21,
+   32, 31, 20, 17, 22, 20, 19, 16,
+   10, 4, 11, 15, 6, 4, 13, 4,
+   -7, -18, 7, -26, -11, 9, -12, -28,
+   -34, -16, -2, -8, -20, -20, -27, -10,
+   2, 4, 9, 1, -4, 4, 9, -1,
+   84, 95, 23, 17, 19, 21, 17, 25,
+   32, 23, 8, 2, 5, 9, 13, 17,
+   16, 16, 16, 18, 23, 24, -27, -32,
+   -10, -21, -8, -1, -10, -10, -5, -1,
+   2, 1, 3, 0, -9, -11, -10, 0,
+   10, 9, 18, 28, 12, 18, 15, 11,
+   2, 1, -4, 4, 8, 7, 8, 7,
+   3, 4, 3, 11, 14, 4, -5, -2,
+   3, -29, -4, -2, -7, 0, -4, -7,
+   -16, -7, 5, 2, 0, 0, -3, 2,
+   5, 1, -3, -18, -63, -113, -128, -117,
+   -23, -13, -2, -21, -21, -29, -54, -37,
+   -2, -2, -17, -29, -35, -29, -19, -16,
+   -14, -16, -19, -16, -15, -21, 28, 19,
+   29, 20, 30, 19, 13, 12, 11, 14,
+   17, 20, 28, 29, 25, 24, 24, 32,
+   31, 34, 60, 97, -37, -41, -57, -61,
+   -54, -50, -54, -57, -49, -49, -47, -45,
+   -45, -50, -56, -59, -54, -49, -52, -60,
+   -51, -40, -16, -16, 0, -9, -16, -11,
+   -5, -6, -10, -17, -27, -35, -29, -31,
+   -40, -42, -44, -38, -31, -25, -23, -6,
+   -5, -2, -17, -38, -24, -16, -19, -12,
+   12, 38, 47, 37, 24, 6, -15, -9,
+   13, 37, 61, 56, 11, -7, 27, 18,
+   -10, -14, -14, -14, -19, -18, -13, -12,
+   -12, -13, -15, -11, -5, -6, -8, -8,
+   -7, -4, -1, -8, -4, 0, -9, 2,
+   2, 6, -4, -7, -4, -6, -7, -12,
+   -15, -17, -10, -8, -15, -21, -25, -31,
+   -72, -127, -128, 20, 42, 17, 8, -4,
+   1, 6, 3, -18, -28, -2, 1, 5,
+   28, 8, -3, 8, 16, 24, 15, 0,
+   -9, 19, 12, 16, 43, 69, 55, 41,
+   35, 22, 14, 8, 3, 8, 16, 20,
+   26, 33, 34, 30, 19, 15, -10, -12,
+   -10, -10, -7, -11, -3, -4, -8, -7,
+   -2, 1, 0, -3, -7, -8, -8, -6,
+   -1, -2, -4, -4, -76, -91, -66, -74,
+   -76, -41, -48, -47, -44, -41, -39, -36,
+   -42, -48, -37, -37, -39, -41, -47, -58,
+   -68, -70, -78, -79, -69, -70, -70, -67,
+   -72, -72, -72, -68, -63, -60, -58, -58,
+   -55, -53, -49, -43, -43, -37, -34, -16,
+   -6, -3, -1, -11, -7, -4, -3, -3,
+   -2, 2, 1, -6, -7, -11, -11, -3,
+   -17, -41, -58, -44, -36, -43, 6, -15,
+   -19, -19, -21, -17, 0, 16, 16, 13,
+   12, -5, 0, -4, -27, -27, -12, -3,
+   0, -2, -7, -15, 7, 0, -8, -6,
+   -2, 8, 4, 0, -5, -7, -11, -13,
+   -13, -11, -7, -9, -9, -6, -10, -5,
+   6, 0, 37, 34, 32, 43, 40, 35,
+   34, 36, 40, 38, 35, 38, 37, 40,
+   44, 37, 31, 30, 25, 38, 44, 23,
+   18, 10, 8, 8, 3, 5, 4, 2,
+   3, 6, 6, 5, 7, 6, -3, -8,
+   -8, -13, -14, -24, -17, 9, -110, 22,
+   -17, -65, -43, -35, 5, 5, -19, -29,
+   -27, -18, -11, -6, -4, -6, -10, -9,
+   -4, 1, 3, 2, 36, -40, -99, -102,
+   20, 27, 7, -16, -27, -30, -23, -15,
+   -6, 1, 3, -2, -8, -10, -9, 4,
+   8, -10, -44, -30, -9, -2, -5, -15,
+   -9, -3, 1, -2, -18, -17, -21, -26,
+   -25, -34, -38, -44, -46, -46, -38, -87,
+   43, 32, 14, 5, 8, 12, 10, 4,
+   -12, -14, -4, 2, -1, -7, -6, 2,
+   3, -3, -2, -1, 4, 14, -89, -105,
+   -6, -8, 0, 1, -3, -7, -8, -4,
+   8, 15, 9, 3, -1, -5, -6, -4,
+   -2, 1, 5, 9, -4, -6, -1, -1,
+   -6, -1, -5, -3, 0, -3, -4, -2,
+   -4, -5, -5, -10, -9, -5, -8, -14,
+   -20, -44, -20, -5, 1, 20, 22, -17,
+   -35, -38, -33, -23, -2, 8, 10, 7,
+   -2, -40, -59, -50, -30, -8, -17, -32,
+   -125, -75, -53, -13, -1, -9, -12, -12,
+   -9, -7, -3, -1, -4, -9, -11, -13,
+   -8, -10, -14, -6, -6, -24, 46, -1,
+   8, -6, 4, 0, 34, 19, -20, -27,
+   -23, -19, -6, 3, 15, 33, 37, 29,
+   22, 11, 3, -6, 1, 0, 12, 7,
+   3, -4, 3, 3, 7, 12, 6, -1,
+   -2, -5, -4, -6, -7, -4, -3, -1,
+   3, 8, -7, 1, 9, 5, -1, -3,
+   -7, -3, 3, 6, 10, 7, 1, 0,
+   2, 0, 1, -3, -5, 2, 2, -9,
+   5, -2, -25, -17, -17, -14, -14, -13,
+   -24, -38, -48, -48, -43, -31, -24, -17,
+   -13, -12, -12, -12, -5, 7, 21, 21,
+   -5, 4, 10, -3, 2, 7, 8, 8,
+   6, 6, 3, -3, -11, -15, -13, -12,
+   -20, -26, -28, -41, 30, 17, 18, 26,
+   24, 22, 22, 32, 40, 39, 34, 32,
+   27, 34, 36, 26, 20, 18, 23, 35,
+   41, 27, -10, -7, 1, 7, 8, 0,
+   6, 14, 15, 11, 6, 7, 7, 6,
+   10, 11, 11, 14, 14, 17, 33, 71,
+   17, 10, -6, -1, 12, 14, 7, 7,
+   18, 15, 2, -7, -6, 0, 5, 7,
+   2, -3, -5, -6, -1, 4, -11, 6,
+   5, 3, 10, 13, 9, 5, 14, 19,
+   9, -4, -17, -18, -9, 1, 3, 5,
+   17, 38, 53, 31, -34, -26, -28, -22,
+   -17, -24, -23, -21, -26, -21, -21, -25,
+   -20, -17, -13, -19, -16, -23, -31, -23,
+   -9, -20, 21, 26, 16, 13, 20, 11,
+   15, 19, 19, 18, 24, 26, 29, 27,
+   29, 25, 25, 15, 28, 38, 44, 59,
+   14, 18, 31, 37, 42, 40, 43, 45,
+   49, 54, 54, 56, 53, 50, 43, 37,
+   30, 26, 23, 20, 14, 10, 9, 11,
+   16, 5, 15, 12, 14, 15, 13, 12,
+   14, 17, 17, 16, 16, 16, 15, 6,
+   4, 2, -14, 2, 0, -2, -7, 18,
+   26, 20, 22, 29, 29, 14, 9, 17,
+   21, 12, 2, 5, 9, 14, 10, 5,
+   2, 5, 86, 127, 127, 68, 29, -3,
+   -3, 15, 23, 28, 31, 21, 5, -3,
+   -7, -5, -2, -1, -6, -17, -18, -14,
+   3, -2, -24, -29, -32, -33, -40, -46,
+   -45, -45, -45, -44, -42, -39, -35, -29,
+   -28, -29, -28, -23, -7, 9, 24, 37,
+   62, 62, 67, 64, 59, 76, 105, 95,
+   61, 41, 28, 23, 23, 18, 14, 19,
+   22, 22, 14, 11, -51, -39, -20, -13,
+   -13, -6, -5, -7, -9, -14, -15, -18,
+   -25, -26, -30, -35, -35, -44, -44, -51,
+   -71, -105, -16, -4, -18, 2, 28, 7,
+   -3, 7, 13, 3, -3, 2, 9, 14,
+   14, 5, -8, -14, -4, 17, 47, 98,
+   -23, -41, -55, -45, -41, -38, -34, -32,
+   -31, -29, -25, -22, -19, -17, -14, -13,
+   -13, -13, -14, -13, -4, 0, 14, 26,
+   11, 2, 4, -7, -8, -15, -22, -28,
+   -26, -9, 6, 14, 11, -3, -4, -1,
+   3, 31, 65, 45, 4, -1, 37, 31,
+   2, -7, -21, -29, -20, 5, 10, -10,
+   -13, -13, -8, 1, 4, -4, -12, -31,
+   -15, 39, -3, -6, -12, -16, -24, -27,
+   -31, -28, -30, -38, -45, -45, -48, -50,
+   -50, -46, -43, -41, -38, -39, -34, -34,
+   15, 16, 3, 2, 10, 12, -4, -2,
+   15, 26, 25, 21, 27, 35, 44, 43,
+   28, 21, 43, 42, 17, 40, 9, 7,
+   10, 12, 10, 5, 1, 5, 11, 11,
+   9, 10, 16, 19, 22, 34, 44, 51,
+   48, 48, 48, 60, -43, -29, -12, -2,
+   -9, -24, -19, -13, -12, -14, -15, -13,
+   -17, -18, -19, -19, -17, -20, -23, -34,
+   -39, -44, -6, -31, -32, -25, 52, 106,
+   110, 19, -4, -14, -13, -5, -2, -8,
+   2, 6, 5, 11, 15, 20, 38, 61,
+   -40, -19, -2, -5, -2, -4, -1, -6,
+   -8, -6, -8, -4, -5, -4, 3, 0,
+   -2, -4, -5, -3, -14, -24, -16, -24,
+   -22, 2, -2, -29, -33, -27, -23, -25,
+   -24, -16, -18, -17, 5, 38, 47, 41,
+   37, 27, 13, 0, 67, 78, 39, -26,
+   -7, -10, -15, -6, 3, -3, -5, -3,
+   -2, 0, 3, 1, -3, -4, -3, -1,
+   1, 0, -2, -15, 24, -12, -48, 24,
+   -26, -82, -69, -40, -15, -16, -9, -1,
+   7, 12, 18, 20, 26, 33, 27, 30
+};
+
+static const rnn_weight denoise_output_bias[22] = {
+   -82, -66, -125, -95, -127, -127, -127, -127,
+   -127, -94, -113, -127, -80, -65, -109, -127,
+   -126, -105, -53, -49, -18, -9
+};
+
+static const DenseLayer denoise_output = {
+   denoise_output_bias,
+   denoise_output_weights,
+   96, 22, ACTIVATION_SIGMOID
+};
+
+static const rnn_weight vad_output_weights[24] = {
+   127, 127, 127, 127, 127, 20, 127, -126,
+   -126, -54, 14, 125, -126, -126, 127, -125,
+   -126, 127, -127, -127, -57, -30, 127, 80
+};
+
+static const rnn_weight vad_output_bias[1] = {
+   -50
+};
+
+static const DenseLayer vad_output = {
+   vad_output_bias,
+   vad_output_weights,
+   24, 1, ACTIVATION_SIGMOID
+};
+
+const struct RNNModel rnnoise_model_orig = {
+    24,
+    &input_dense,
+
+    24,
+    &vad_gru,
+
+    48,
+    &noise_gru,
+
+    96,
+    &denoise_gru,
+
+    22,
+    &denoise_output,
+
+    1,
+    &vad_output
+};

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/rnn_data.h Added

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/rnn_reader.c Added

@@ -0,0 +1,168 @@
+/* Copyright (c) 2018 Gregor Richards */
+/*
+   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.
+
+   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 FOUNDATION 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.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "rnn.h"
+#include "rnn_data.h"
+#include "rnnoise.h"
+
+/* Although these values are the same as in rnn.h, we make them separate to
+ * avoid accidentally burning internal values into a file format */
+#define F_ACTIVATION_TANH       0
+#define F_ACTIVATION_SIGMOID    1
+#define F_ACTIVATION_RELU       2
+
+RNNModel *rnnoise_model_from_file(FILE *f)
+{
+    int i, in;
+
+    if (fscanf(f, "rnnoise-nu model file version %d\n", &in) != 1 || in != 1)
+        return NULL;
+
+    RNNModel *ret = calloc(1, sizeof(RNNModel));
+    if (!ret)
+        return NULL;
+
+#define ALLOC_LAYER(type, name) \
+    type *name; \
+    name = calloc(1, sizeof(type)); \
+    if (!name) { \
+        rnnoise_model_free(ret); \
+        return NULL; \
+    } \
+    ret->name = name
+
+    ALLOC_LAYER(DenseLayer, input_dense);
+    ALLOC_LAYER(GRULayer, vad_gru);
+    ALLOC_LAYER(GRULayer, noise_gru);
+    ALLOC_LAYER(GRULayer, denoise_gru);
+    ALLOC_LAYER(DenseLayer, denoise_output);
+    ALLOC_LAYER(DenseLayer, vad_output);
+
+#define INPUT_VAL(name) do { \
+    if (fscanf(f, "%d", &in) != 1 || in < 0 || in > 128) { \
+        rnnoise_model_free(ret); \
+        return NULL; \
+    } \
+    name = in; \
+    } while (0)
+
+#define INPUT_ACTIVATION(name) do { \
+    int activation; \
+    INPUT_VAL(activation); \
+    switch (activation) { \
+        case F_ACTIVATION_SIGMOID: \
+            name = ACTIVATION_SIGMOID; \
+            break; \
+        case F_ACTIVATION_RELU: \
+            name = ACTIVATION_RELU; \
+            break; \
+        default: \
+            name = ACTIVATION_TANH; \
+    } \
+    } while (0)
+
+#define INPUT_ARRAY(name, len) do { \
+    rnn_weight *values = malloc((len) * sizeof(rnn_weight)); \
+    if (!values) { \
+        rnnoise_model_free(ret); \
+        return NULL; \
+    } \
+    name = values; \
+    for (i = 0; i < (len); i++) { \
+        if (fscanf(f, "%d", &in) != 1) { \
+            rnnoise_model_free(ret); \
+            return NULL; \
+        } \
+        values[i] = in; \
+    } \
+    } while (0)
+
+#define INPUT_DENSE(name) do { \
+    INPUT_VAL(name->nb_inputs); \
+    INPUT_VAL(name->nb_neurons); \
+    ret->name ## _size = name->nb_neurons; \
+    INPUT_ACTIVATION(name->activation); \
+    INPUT_ARRAY(name->input_weights, name->nb_inputs * name->nb_neurons); \
+    INPUT_ARRAY(name->bias, name->nb_neurons); \
+    } while (0)
+
+#define INPUT_GRU(name) do { \
+    INPUT_VAL(name->nb_inputs); \
+    INPUT_VAL(name->nb_neurons); \
+    ret->name ## _size = name->nb_neurons; \
+    INPUT_ACTIVATION(name->activation); \
+    INPUT_ARRAY(name->input_weights, name->nb_inputs * name->nb_neurons * 3); \
+    INPUT_ARRAY(name->recurrent_weights, name->nb_neurons * name->nb_neurons * 3); \
+    INPUT_ARRAY(name->bias, name->nb_neurons * 3); \
+    } while (0)
+
+    INPUT_DENSE(input_dense);
+    INPUT_GRU(vad_gru);
+    INPUT_GRU(noise_gru);
+    INPUT_GRU(denoise_gru);
+    INPUT_DENSE(denoise_output);
+    INPUT_DENSE(vad_output);
+
+    return ret;
+}
+
+void rnnoise_model_free(RNNModel *model)
+{
+#define FREE_MAYBE(ptr) do { if (ptr) free(ptr); } while (0)
+#define FREE_DENSE(name) do { \
+    if (model->name) { \
+        free((void *) model->name->input_weights); \
+        free((void *) model->name->bias); \
+        free((void *) model->name); \
+    } \
+    } while (0)
+#define FREE_GRU(name) do { \
+    if (model->name) { \
+        free((void *) model->name->input_weights); \
+        free((void *) model->name->recurrent_weights); \
+        free((void *) model->name->bias); \
+        free((void *) model->name); \
+    } \
+    } while (0)
+
+    if (!model)
+        return;
+    FREE_DENSE(input_dense);
+    FREE_GRU(vad_gru);
+    FREE_GRU(noise_gru);
+    FREE_GRU(denoise_gru);
+    FREE_DENSE(denoise_output);
+    FREE_DENSE(vad_output);
+    free(model);
+}

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/rnn_train.py Added

@@ -0,0 +1,66 @@
+#!/usr/bin/python
+
+from __future__ import print_function
+
+from keras.models import Sequential
+from keras.models import Model
+from keras.layers import Input
+from keras.layers import Dense
+from keras.layers import LSTM
+from keras.layers import GRU
+from keras.layers import SimpleRNN
+from keras.layers import Dropout
+from keras import losses
+import h5py
+
+from keras import backend as K
+import numpy as np
+
+print('Build model...')
+main_input = Input(shape=(None, 22), name='main_input')
+#x = Dense(44, activation='relu')(main_input)
+#x = GRU(44, dropout=0.0, recurrent_dropout=0.0, activation='tanh', recurrent_activation='sigmoid', return_sequences=True)(x)
+x=main_input
+x = GRU(128, activation='tanh', recurrent_activation='sigmoid', return_sequences=True)(x)
+#x = GRU(128, return_sequences=True)(x)
+#x = GRU(22, activation='relu', return_sequences=True)(x)
+x = Dense(22, activation='sigmoid')(x)
+#x = Dense(22, activation='softplus')(x)
+model = Model(inputs=main_input, outputs=x)
+
+batch_size = 32
+
+print('Loading data...')
+with h5py.File('denoise_data.h5', 'r') as hf:
+    all_data = hf['denoise_data'][:]
+print('done.')
+
+window_size = 500
+
+nb_sequences = len(all_data)//window_size
+print(nb_sequences, ' sequences')
+x_train = all_data[:nb_sequences*window_size, :-22]
+x_train = np.reshape(x_train, (nb_sequences, window_size, 22))
+
+y_train = np.copy(all_data[:nb_sequences*window_size, -22:])
+y_train = np.reshape(y_train, (nb_sequences, window_size, 22))
+
+#y_train = -20*np.log10(np.add(y_train, .03));
+
+all_data = 0;
+x_train = x_train.astype('float32')
+y_train = y_train.astype('float32')
+
+print(len(x_train), 'train sequences. x shape =', x_train.shape, 'y shape = ', y_train.shape)
+
+# try using different optimizers and different optimizer configs
+model.compile(loss='mean_squared_error',
+              optimizer='adam',
+              metrics=['binary_accuracy'])
+
+print('Train...')
+model.fit(x_train, y_train,
+          batch_size=batch_size,
+          epochs=200,
+          validation_data=(x_train, y_train))
+model.save("newweights.hdf5")

obs-studio-26.0.0.tar.xz/plugins/obs-filters/rnnoise/src/tansig_table.h Added

@@ -0,0 +1,45 @@
+/* This file is auto-generated by gen_tables */
+
+static const float tansig_table[201] = {
+0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f,
+0.197375f, 0.235496f, 0.272905f, 0.309507f, 0.345214f,
+0.379949f, 0.413644f, 0.446244f, 0.477700f, 0.507977f,
+0.537050f, 0.564900f, 0.591519f, 0.616909f, 0.641077f,
+0.664037f, 0.685809f, 0.706419f, 0.725897f, 0.744277f,
+0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
+0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f,
+0.885352f, 0.893698f, 0.901468f, 0.908698f, 0.915420f,
+0.921669f, 0.927473f, 0.932862f, 0.937863f, 0.942503f,
+0.946806f, 0.950795f, 0.954492f, 0.957917f, 0.961090f,
+0.964028f, 0.966747f, 0.969265f, 0.971594f, 0.973749f,
+0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
+0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f,
+0.989027f, 0.989867f, 0.990642f, 0.991359f, 0.992020f,
+0.992631f, 0.993196f, 0.993718f, 0.994199f, 0.994644f,
+0.995055f, 0.995434f, 0.995784f, 0.996108f, 0.996407f,
+0.996682f, 0.996937f, 0.997172f, 0.997389f, 0.997590f,
+0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
+0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f,
+0.999000f, 0.999076f, 0.999147f, 0.999213f, 0.999273f,
+0.999329f, 0.999381f, 0.999428f, 0.999472f, 0.999513f,
+0.999550f, 0.999585f, 0.999617f, 0.999646f, 0.999673f,
+0.999699f, 0.999722f, 0.999743f, 0.999763f, 0.999781f,
+0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
+0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f,
+0.999909f, 0.999916f, 0.999923f, 0.999929f, 0.999934f,
+0.999939f, 0.999944f, 0.999948f, 0.999952f, 0.999956f,
+0.999959f, 0.999962f, 0.999965f, 0.999968f, 0.999970f,
+0.999973f, 0.999975f, 0.999977f, 0.999978f, 0.999980f,
+0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
+0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f,
+0.999992f, 0.999992f, 0.999993f, 0.999994f, 0.999994f,
+0.999994f, 0.999995f, 0.999995f, 0.999996f, 0.999996f,
+0.999996f, 0.999997f, 0.999997f, 0.999997f, 0.999997f,
+0.999997f, 0.999998f, 0.999998f, 0.999998f, 0.999998f,
+0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
+0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+1.000000f,
+};

obs-studio-25.0.8.tar.xz/plugins/obs-filters/scale-filter.c -> obs-studio-26.0.0.tar.xz/plugins/obs-filters/scale-filter.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-libfdk/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-libfdk/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-libfdk/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-libfdk/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/CMakeLists.txt Changed

@@ -5,22 +5,21 @@
 
 option(STATIC_MBEDTLS "Statically link mbedTLS into binary" OFF)
 
-if (WITH_RTMPS OR (WITH_RTMPS STREQUAL "AUTO"))
-	find_package(MbedTLS QUIET)
-	find_package(ZLIB QUIET)
+if (WITH_RTMPS STREQUAL "AUTO")
+	find_package(MbedTLS)
+	find_package(ZLIB)
+	if (NOT MBEDTLS_FOUND OR NOT ZLIB_FOUND)
+		set(WITH_RTMPS "OFF")
+		message(WARNING "mbedTLS or zlib was not found, RTMPS will be auto-disabled")
+	endif()
 endif()
 
-if (LIBMBEDTLS_FOUND AND ZLIB_FOUND)
+if (WITH_RTMPS)
+	find_package(MbedTLS REQUIRED)
+	find_package(ZLIB REQUIRED)
 	add_definitions(-DCRYPTO -DUSE_MBEDTLS)
-	include_directories(${LIBMBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+	include_directories(${MBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
 else()
-	if(WITH_RTMPS STREQUAL "AUTO")
-		message(WARNING "mbedTLS was not found, RTMPS will be auto-disabled")
-	elseif (WITH_RTMPS)
-		message(FATAL_ERROR "RTMPS enabled by user, but mbedTLS was not found")
-	endif()
-	unset(LIBMBEDTLS_LIBRARIES)
-	unset(ZLIB_LIBRARIES)
 	add_definitions(-DNO_CRYPTO)
 endif()
 
@@ -172,9 +171,10 @@
 	${obs-outputs_librtmp_HEADERS})
 target_link_libraries(obs-outputs
 	libobs
-	${LIBMBEDTLS_LIBRARIES}
+	${MBEDTLS_LIBRARIES}
 	${ZLIB_LIBRARIES}
 	${ftl_IMPORTS}
 	${obs-outputs_PLATFORM_DEPS})
+set_target_properties(obs-outputs PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-outputs data)

obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/de-DE.ini Changed

@@ -8,8 +8,8 @@
 PermissionDenied="Die Verbindung wurde blockiert. Überprüfen Sie Ihre Firewall‐/Anti‐Virus‐Einstellungen, um sicherzustellen, dass OBS vollen Internetzugang hat."
 ConnectionAborted="Die Verbindung wurde abgebrochen. Dies bedeutet in der Regel Probleme mit der Internetverbindung zwischen Ihnen und dem Streamingdienst."
 ConnectionReset="Die Verbindung wurde durch den Kommunikationspartner zurückgesetzt. Dies bedeutet in der Regel Probleme mit der Internetverbindung zwischen Ihnen und dem Streamingdienst."
-HostNotFound="Hostname nicht gefunden. Stellen Sie sicher, dass Sie einen gültigen Streamingserver eingegeben haben und Ihre Internetverbindung/DNS korrekt arbeiten."
-NoData="Hostname gefunden, aber keine Daten des angeforderten Typs vorhanden. Dies kann auftreten, wenn Sie eine IPv6‐Adresse verwenden, aber Ihr Streamingdienst 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“)"
+HostNotFound="Hostname nicht gefunden. Stellen Sie sicher, dass Sie einen gültigen Streamingserver eingegeben haben und Ihr(e) Internetverbindung/DNS korrekt arbeiten."
+NoData="Hostname gefunden, aber keine Daten des angeforderten Typs vorhanden. Dies kann auftreten, wenn Sie eine IPv6‐Adresse verwenden, aber Ihr Streamingdienst 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."

obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/en-GB.ini Added

@@ -0,0 +1,15 @@
+RTMPStream="RTMP Stream"
+RTMPStream.DropThreshold="Drop Threshold (milliseconds)"
+FLVOutput="FLV File Output"
+FLVOutput.FilePath="File Path"
+Default="Default"
+
+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."
+ConnectionReset="The connection was reset by the peer. This usually indicates Internet connection problems between you and the streaming service."
+HostNotFound="Hostname not found. Make sure you entered a valid streaming server and your Internet connection / DNS are working correctly."
+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."
+

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/id-ID.ini Added

@@ -0,0 +1,15 @@
+RTMPStream="Stream RTMP"
+RTMPStream.DropThreshold="Ambang Batas Drop (milidetik)"
+FLVOutput="Output File FLV"
+FLVOutput.FilePath="Lokasi File"
+Default="Default"
+
+ConnectionTimedOut="Waktu koneksi habis. Pastikan Anda telah mengkonfigurasi layanan streaming dengan valid dan tidak ada firewall yang memblokir koneksi."
+PermissionDenied="Koneksi diblokir. Periksa pengaturan firewall/anti-virus Anda untuk memastikan OBS diizinkan akses internet penuh."
+ConnectionAborted="Koneksi dibatalkan. Biasanya mengindikasi masalah koneksi internet antara Anda dan layanan streaming."
+ConnectionReset="Koneksi diatur ulang oleh peer. Biasanya mengindikasi masalah koneksi internet antara Anda dan layanan streaming."
+HostNotFound="Hostname tidak ditemukan. Pastikan Anda memasukkan server streaming dengan valid dan koneksi internet / DNS Anda berfungsi dengan benar."
+NoData="Hostname 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 valid."
+

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/ro-RO.ini Changed

@@ -1,7 +1,15 @@
 RTMPStream="Flux RTMP"
 RTMPStream.DropThreshold="Prag de pierderi (milisecunde)"
-FLVOutput="Ieșire fișier FLV"
+FLVOutput="Output fișier FLV"
 FLVOutput.FilePath="Calea fișierului"
 Default="Implicit"
 
+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 dvs. și serviciul de streaming."
+ConnectionReset="Conexiunea a fost întreruptă. Acest lucru indică de obicei probleme de conexiune la internet între dvs. și serviciul de streaming."
+HostNotFound="Hostname nu a fost găsit. Asigură-te că ai introdus un server valid de streaming și că conexiunea la internet/DNS funcționează corect."
+NoData="A fost găsit numele gazdei, dar nu există date de tipul solicitat. Acest lucru poate apărea dacă aveți o adresă IPv6 și serviciul dvs. de streaming are doar adrese IPv4 (vezi Setări → Avansat)."
+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."

obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/data/locale/uk-UA.ini Changed

@@ -1,15 +1,15 @@
 RTMPStream="RTMP потік"
-RTMPStream.DropThreshold="Поріг втрат (мілісекунд)"
+RTMPStream.DropThreshold="Поріг втрат (мілісекунди)"
 FLVOutput="Вивід FLV файлу"
 FLVOutput.FilePath="Шлях до файлу"
-Default="За замовчанням"
+Default="За замовчуванням"
 
-ConnectionTimedOut="Вичерпано час підключення. Переконайтеся, що ви вказали правильний сервіс трансляцій і брандмауер не блокує з'єднання."
-PermissionDenied="З'єднання було заблоковано. Перевірте налаштування вашого брандмауеру / антивірусу, щоб переконатися, що OBS має повний доступ до Інтернету."
-ConnectionAborted="З'єднання було перервано. Зазвичай свідчить про проблеми з Інтернет підключенням між вами і постачальником з сервісу трансляцій."
-ConnectionReset="З'єднання було скинуте рівноправним вузлом (reset by peer). Зазвичай свідчить про проблеми з Інтернет підключенням між вами і постачальником з сервісу трансляцій."
-HostNotFound="Ім'я хоста, не знайдено. Переконайтеся, що ви ввели дійсний сервер трансляцій і підключення до Інтернету / DNS працює правильно."
-NoData="Ім'я хоста знайдено, але нема жодних даних вказаного типу. Це може статися, якщо ви вказали прив'язку до IPv6-адресу, але ваш сервіс трансляцій підтримує лише адреси IPv4 (див. Налаштування → Розширені)."
-AddressNotAvailable="Адреса недоступна. Напевно ви спробували прив'язатись до адаптера з неіснуючою IP-адресою (див. Налаштування → Розширені)."
-SSLCertVerifyFailed="RTMP сервер надіслав неприпустимий сертифікат SSL."
+ConnectionTimedOut="Час очікування підключення вичерпано. Переконайтеся, що ви вказали коректний сервіс трансляцій і брандмауер не блокує з'єднання."
+PermissionDenied="З'єднання було заблоковано. Перевірте налаштування вашого брандмауера / антивірусу, щоб переконатися чи має OBS повний доступ до Інтернету."
+ConnectionAborted="З'єднання було перервано. Зазвичай, це свідчить про проблеми з Інтернет підключенням між вами та сервісом трансляцій."
+ConnectionReset="З'єднання було скинуте рівноправним вузлом (reset by peer). Зазвичай свідчить про проблеми з Інтернет підключенням між вами та сервісом трансляцій."
+HostNotFound="Назву хоста не знайдено. Переконайтеся, що ви ввели дійсний сервер трансляцій і підключення до Інтернету / DNS працює правильно."
+NoData="Ім'я хоста знайдено, але нема жодних даних вказаного типу. Це трапляється, якщо ви вказали прив'язку до IPv6-адресу, а ваш сервіс трансляцій підтримує лише адреси IPv4 (див. Налаштування → Розширені)."
+AddressNotAvailable="Адреса недоступна. Напевно ви спробували прив'язатись до недійсної IP-адреси (див. Налаштування → Розширені)."
+SSLCertVerifyFailed="RTMP сервер надіслав недійсний SSL сертифікат."

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/flv-mux.c -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/flv-mux.c Changed

@@ -30,6 +30,8 @@
 //#define WRITE_FLV_HEADER
 
 #define VIDEO_HEADER_SIZE 5
+#define VIDEODATA_AVCVIDEOPACKET 7.0
+#define AUDIODATA_AAC 10.0
 
 static inline double encoder_bitrate(obs_encoder_t *encoder)
 {
@@ -56,11 +58,11 @@
 	fwrite(buf, 1, enc - buf, file);
 }
 
-static bool build_flv_meta_data(obs_output_t *context, uint8_t **output,
-				size_t *size, size_t a_idx)
+static void build_flv_meta_data(obs_output_t *context, uint8_t **output,
+				size_t *size)
 {
 	obs_encoder_t *vencoder = obs_output_get_video_encoder(context);
-	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, a_idx);
+	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, 0);
 	video_t *video = obs_encoder_video(vencoder);
 	audio_t *audio = obs_encoder_audio(aencoder);
 	char buf[4096];
@@ -68,31 +70,25 @@
 	char *end = enc + sizeof(buf);
 	struct dstr encoder_name = {0};
 
-	if (a_idx > 0 && !aencoder)
-		return false;
-
+	enc_str(&enc, end, "@setDataFrame");
 	enc_str(&enc, end, "onMetaData");
 
 	*enc++ = AMF_ECMA_ARRAY;
-	enc = AMF_EncodeInt32(enc, end, a_idx == 0 ? 20 : 15);
+	enc = AMF_EncodeInt32(enc, end, 20);
 
 	enc_num_val(&enc, end, "duration", 0.0);
 	enc_num_val(&enc, end, "fileSize", 0.0);
 
-	if (a_idx == 0) {
-		enc_num_val(&enc, end, "width",
-			    (double)obs_encoder_get_width(vencoder));
-		enc_num_val(&enc, end, "height",
-			    (double)obs_encoder_get_height(vencoder));
-
-		enc_str_val(&enc, end, "videocodecid", "avc1");
-		enc_num_val(&enc, end, "videodatarate",
-			    encoder_bitrate(vencoder));
-		enc_num_val(&enc, end, "framerate",
-			    video_output_get_frame_rate(video));
-	}
+	enc_num_val(&enc, end, "width",
+		    (double)obs_encoder_get_width(vencoder));
+	enc_num_val(&enc, end, "height",
+		    (double)obs_encoder_get_height(vencoder));
 
-	enc_str_val(&enc, end, "audiocodecid", "mp4a");
+	enc_num_val(&enc, end, "videocodecid", VIDEODATA_AVCVIDEOPACKET);
+	enc_num_val(&enc, end, "videodatarate", encoder_bitrate(vencoder));
+	enc_num_val(&enc, end, "framerate", video_output_get_frame_rate(video));
+
+	enc_num_val(&enc, end, "audiocodecid", AUDIODATA_AAC);
 	enc_num_val(&enc, end, "audiodatarate", encoder_bitrate(aencoder));
 	enc_num_val(&enc, end, "audiosamplerate",
 		    (double)obs_encoder_get_sample_rate(aencoder));
@@ -129,11 +125,10 @@
 
 	*size = enc - buf;
 	*output = bmemdup(buf, *size);
-	return true;
 }
 
-bool flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
-		   bool write_header, size_t audio_idx)
+void flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
+		   bool write_header)
 {
 	struct array_output_data data;
 	struct serializer s;
@@ -142,12 +137,7 @@
 	uint32_t start_pos;
 
 	array_output_serializer_init(&s, &data);
-
-	if (!build_flv_meta_data(context, &meta_data, &meta_data_size,
-				 audio_idx)) {
-		bfree(meta_data);
-		return false;
-	}
+	build_flv_meta_data(context, &meta_data, &meta_data_size);
 
 	if (write_header) {
 		s_write(&s, "FLV", 3);
@@ -173,7 +163,6 @@
 	*size = data.bytes.num;
 
 	bfree(meta_data);
-	return true;
 }
 
 #ifdef DEBUG_TIMESTAMPS
@@ -264,3 +253,251 @@
 	*output = data.bytes.array;
 	*size = data.bytes.num;
 }
+
+/* ------------------------------------------------------------------------- */
+/* stuff for additional media streams                                        */
+
+#define s_amf_conststring(s, str)                   \
+	do {                                        \
+		const size_t len = sizeof(str) - 1; \
+		s_wb16(s, (uint16_t)len);           \
+		serialize(s, str, len);             \
+	} while (false)
+
+#define s_amf_double(s, d)                            \
+	do {                                          \
+		double d_val = d;                     \
+		uint64_t u_val = *(uint64_t *)&d_val; \
+		s_wb64(s, u_val);                     \
+	} while (false)
+
+static void flv_build_additional_meta_data(uint8_t **data, size_t *size)
+{
+	struct array_output_data out;
+	struct serializer s;
+
+	array_output_serializer_init(&s, &out);
+
+	s_w8(&s, AMF_STRING);
+	s_amf_conststring(&s, "@setDataFrame");
+
+	s_w8(&s, AMF_STRING);
+	s_amf_conststring(&s, "onExpectAdditionalMedia");
+
+	s_w8(&s, AMF_OBJECT);
+	{
+		s_amf_conststring(&s, "processingIntents");
+
+		s_w8(&s, AMF_STRICT_ARRAY);
+		s_wb32(&s, 1);
+		{
+			s_w8(&s, AMF_STRING);
+			s_amf_conststring(&s, "ArchiveProgramNarrationAudio");
+		}
+
+		/* ---- */
+
+		s_amf_conststring(&s, "additionalMedia");
+
+		s_w8(&s, AMF_OBJECT);
+		{
+			s_amf_conststring(&s, "stream0");
+
+			s_w8(&s, AMF_OBJECT);
+			{
+				s_amf_conststring(&s, "type");
+
+				s_w8(&s, AMF_NUMBER);
+				s_amf_double(&s, RTMP_PACKET_TYPE_AUDIO);
+
+				/* ---- */
+
+				s_amf_conststring(&s, "mediaLabels");
+
+				s_w8(&s, AMF_OBJECT);
+				{
+					s_amf_conststring(&s, "contentType");
+
+					s_w8(&s, AMF_STRING);
+					s_amf_conststring(&s, "PNAR");
+				}
+				s_wb24(&s, AMF_OBJECT_END);
+			}
+			s_wb24(&s, AMF_OBJECT_END);
+		}
+		s_wb24(&s, AMF_OBJECT_END);
+
+		/* ---- */
+
+		s_amf_conststring(&s, "defaultMedia");
+
+		s_w8(&s, AMF_OBJECT);
+		{
+			s_amf_conststring(&s, "audio");
+
+			s_w8(&s, AMF_OBJECT);
+			{
+				s_amf_conststring(&s, "mediaLabels");
+
+				s_w8(&s, AMF_OBJECT);
+				{
+					s_amf_conststring(&s, "contentType");
+
+					s_w8(&s, AMF_STRING);
+					s_amf_conststring(&s, "PRM");
+				}
+				s_wb24(&s, AMF_OBJECT_END);
+			}
+			s_wb24(&s, AMF_OBJECT_END);
+		}
+		s_wb24(&s, AMF_OBJECT_END);
+	}
+	s_wb24(&s, AMF_OBJECT_END);
+
+	*data = out.bytes.array;
+	*size = out.bytes.num;
+}
+
+void flv_additional_meta_data(obs_output_t *context, uint8_t **data,
+			      size_t *size)
+{
+	UNUSED_PARAMETER(context);
+	struct array_output_data out;
+	struct serializer s;
+	uint8_t *meta_data = NULL;
+	size_t meta_data_size;
+
+	flv_build_additional_meta_data(&meta_data, &meta_data_size);
+
+	array_output_serializer_init(&s, &out);
+
+	s_w8(&s, RTMP_PACKET_TYPE_INFO); //18
+
+	s_wb24(&s, (uint32_t)meta_data_size);
+	s_wb32(&s, 0);
+	s_wb24(&s, 0);
+
+	s_write(&s, meta_data, meta_data_size);
+	bfree(meta_data);
+
+	s_wb32(&s, (uint32_t)serializer_get_pos(&s) - 1);
+
+	*data = out.bytes.array;
+	*size = out.bytes.num;
+}
+
+static inline void s_u29(struct serializer *s, uint32_t val)
+{
+	if (val <= 0x7F) {
+		s_w8(s, val);
+	} else if (val <= 0x3FFF) {
+		s_w8(s, 0x80 | (val >> 7));
+		s_w8(s, val & 0x7F);
+	} else if (val <= 0x1FFFFF) {
+		s_w8(s, 0x80 | (val >> 14));
+		s_w8(s, 0x80 | ((val >> 7) & 0x7F));
+		s_w8(s, val & 0x7F);
+	} else {
+		s_w8(s, 0x80 | (val >> 22));
+		s_w8(s, 0x80 | ((val >> 15) & 0x7F));
+		s_w8(s, 0x80 | ((val >> 8) & 0x7F));
+		s_w8(s, val & 0xFF);
+	}
+}
+
+static inline void s_u29b_value(struct serializer *s, uint32_t val)
+{
+	s_u29(s, 1 | ((val & 0xFFFFFFF) << 1));
+}
+
+static void flv_build_additional_audio(uint8_t **data, size_t *size,
+				       struct encoder_packet *packet,
+				       bool is_header, size_t index)
+{
+	UNUSED_PARAMETER(index);
+	struct array_output_data out;
+	struct serializer s;
+
+	array_output_serializer_init(&s, &out);
+
+	s_w8(&s, AMF_STRING);
+	s_amf_conststring(&s, "additionalMedia");
+
+	s_w8(&s, AMF_OBJECT);
+	{
+		s_amf_conststring(&s, "id");
+
+		s_w8(&s, AMF_STRING);
+		s_amf_conststring(&s, "stream0");
+
+		/* ----- */
+
+		s_amf_conststring(&s, "media");
+
+		s_w8(&s, AMF_AVMPLUS);
+		s_w8(&s, AMF3_BYTE_ARRAY);
+		s_u29b_value(&s, (uint32_t)packet->size + 2);
+		s_w8(&s, 0xaf);
+		s_w8(&s, is_header ? 0 : 1);
+		s_write(&s, packet->data, packet->size);
+	}
+	s_wb24(&s, AMF_OBJECT_END);
+
+	*data = out.bytes.array;
+	*size = out.bytes.num;
+}
+
+static void flv_additional_audio(struct serializer *s, int32_t dts_offset,
+				 struct encoder_packet *packet, bool is_header,
+				 size_t index)
+{
+	int32_t time_ms = get_ms_time(packet, packet->dts) - dts_offset;
+	uint8_t *data;
+	size_t size;
+
+	if (!packet->data || !packet->size)
+		return;
+
+	flv_build_additional_audio(&data, &size, packet, is_header, index);
+
+	s_w8(s, RTMP_PACKET_TYPE_INFO); //18
+
+#ifdef DEBUG_TIMESTAMPS
+	blog(LOG_DEBUG, "Audio2: %lu", time_ms);
+
+	if (last_time > time_ms)
+		blog(LOG_DEBUG, "Non-monotonic");
+
+	last_time = time_ms;
+#endif
+
+	s_wb24(s, (uint32_t)size);
+	s_wb24(s, time_ms);
+	s_w8(s, (time_ms >> 24) & 0x7F);
+	s_wb24(s, 0);
+
+	serialize(s, data, size);
+	bfree(data);
+
+	s_wb32(s, (uint32_t)serializer_get_pos(s) - 1);
+}
+
+void flv_additional_packet_mux(struct encoder_packet *packet,
+			       int32_t dts_offset, uint8_t **data, size_t *size,
+			       bool is_header, size_t index)
+{
+	struct array_output_data out;
+	struct serializer s;
+
+	array_output_serializer_init(&s, &out);
+
+	if (packet->type == OBS_ENCODER_VIDEO) {
+		//currently unsupported
+		bcrash("who said you could output an additional video packet?");
+	} else {
+		flv_additional_audio(&s, dts_offset, packet, is_header, index);
+	}
+
+	*data = out.bytes.array;
+	*size = out.bytes.num;
+}

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/flv-mux.h -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/flv-mux.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/flv-output.c -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/flv-output.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/librtmp/dh.h -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/librtmp/dh.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/librtmp/handshake.h -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/librtmp/handshake.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/librtmp/rtmp.c -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/librtmp/rtmp.c Changed

@@ -3064,6 +3064,8 @@
 static const AVal av_NetStream_Publish_Start = AVC("NetStream.Publish.Start");
 static const AVal av_NetStream_Publish_Rejected = AVC("NetStream.Publish.Rejected");
 static const AVal av_NetStream_Publish_Denied = AVC("NetStream.Publish.Denied");
+static const AVal av_NetStream_Publish_BadName = AVC("NetStream.Publish.BadName");
+
 
 /* Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' */
 static int
@@ -3314,7 +3316,8 @@
                 || AVMATCH(&code, &av_NetStream_Play_StreamNotFound)
                 || AVMATCH(&code, &av_NetConnection_Connect_InvalidApp)
                 || AVMATCH(&code, &av_NetStream_Publish_Rejected)
-                || AVMATCH(&code, &av_NetStream_Publish_Denied))
+                || AVMATCH(&code, &av_NetStream_Publish_Denied)
+                || AVMATCH(&code, &av_NetStream_Publish_BadName))
         {
             r->m_stream_id = -1;
             RTMP_Close(r);
@@ -3376,6 +3379,14 @@
                 r->m_pausing = 3;
             }
         }
+
+        else
+        {
+            if (description.av_len)
+                RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s (%s)", r->Link.tcUrl.av_val, code.av_val, description.av_val);
+            else
+                RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s", r->Link.tcUrl.av_val, code.av_val);
+        }
     }
     else if (AVMATCH(&method, &av_playlist_ready))
     {
@@ -5266,13 +5277,11 @@
     return total;
 }
 
-static const AVal av_setDataFrame = AVC("@setDataFrame");
-
 int
 RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx)
 {
     RTMPPacket *pkt = &r->m_write;
-    char *pend, *enc;
+    char *enc;
     int s2 = size, ret, num;
 
     pkt->m_nChannel = 0x04;	/* source channel */
@@ -5308,8 +5317,6 @@
                     !pkt->m_nTimeStamp) || pkt->m_packetType == RTMP_PACKET_TYPE_INFO)
             {
                 pkt->m_headerType = RTMP_PACKET_SIZE_LARGE;
-                if (pkt->m_packetType == RTMP_PACKET_TYPE_INFO)
-                    pkt->m_nBodySize += 16;
             }
             else
             {
@@ -5322,12 +5329,6 @@
                 return FALSE;
             }
             enc = pkt->m_body;
-            pend = enc + pkt->m_nBodySize;
-            if (pkt->m_packetType == RTMP_PACKET_TYPE_INFO)
-            {
-                enc = AMF_EncodeString(enc, pend, &av_setDataFrame);
-                pkt->m_nBytesRead = enc - pkt->m_body;
-            }
         }
         else
         {

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/obs-outputs.c -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/obs-outputs.c Changed

@@ -5,6 +5,7 @@
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
+#include <mbedtls/threading.h>
 #endif
 
 OBS_DECLARE_MODULE()
@@ -21,6 +22,37 @@
 extern struct obs_output_info ftl_output_info;
 #endif
 
+#if defined(_WIN32) && defined(MBEDTLS_THREADING_ALT)
+void mbed_mutex_init(mbedtls_threading_mutex_t *m)
+{
+	CRITICAL_SECTION *c = bzalloc(sizeof(CRITICAL_SECTION));
+	*m = c;
+	InitializeCriticalSection(c);
+}
+
+void mbed_mutex_free(mbedtls_threading_mutex_t *m)
+{
+	CRITICAL_SECTION *c = *m;
+	DeleteCriticalSection(c);
+	bfree(*m);
+	*m = NULL;
+}
+
+int mbed_mutex_lock(mbedtls_threading_mutex_t *m)
+{
+	CRITICAL_SECTION *c = *m;
+	EnterCriticalSection(c);
+	return 0;
+}
+
+int mbed_mutex_unlock(mbedtls_threading_mutex_t *m)
+{
+	CRITICAL_SECTION *c = *m;
+	LeaveCriticalSection(c);
+	return 0;
+}
+#endif
+
 bool obs_module_load(void)
 {
 #ifdef _WIN32
@@ -28,6 +60,11 @@
 	WSAStartup(MAKEWORD(2, 2), &wsad);
 #endif
 
+#if defined(_WIN32) && defined(MBEDTLS_THREADING_ALT)
+	mbedtls_threading_set_alt(mbed_mutex_init, mbed_mutex_free,
+				  mbed_mutex_lock, mbed_mutex_unlock);
+#endif
+
 	obs_register_output(&rtmp_output_info);
 	obs_register_output(&null_output_info);
 	obs_register_output(&flv_output_info);
@@ -40,6 +77,9 @@
 void obs_module_unload(void)
 {
 #ifdef _WIN32
+#ifdef MBEDTLS_THREADING_ALT
+	mbedtls_threading_free_alt();
+#endif
 	WSACleanup();
 #endif
 }

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/rtmp-stream.c -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/rtmp-stream.c Changed

@@ -423,14 +423,20 @@
 		}
 	}
 
-	flv_packet_mux(packet, is_header ? 0 : stream->start_dts_offset, &data,
-		       &size, is_header);
+	if (idx > 0) {
+		flv_additional_packet_mux(
+			packet, is_header ? 0 : stream->start_dts_offset, &data,
+			&size, is_header, idx);
+	} else {
+		flv_packet_mux(packet, is_header ? 0 : stream->start_dts_offset,
+			       &data, &size, is_header);
+	}
 
 #ifdef TEST_FRAMEDROPS
 	droptest_cap_data_rate(stream, size);
 #endif
 
-	ret = RTMP_Write(&stream->rtmp, (char *)data, (int)size, (int)idx);
+	ret = RTMP_Write(&stream->rtmp, (char *)data, (int)size, 0);
 	bfree(data);
 
 	if (is_header)
@@ -659,20 +665,30 @@
 	return NULL;
 }
 
-static bool send_meta_data(struct rtmp_stream *stream, size_t idx, bool *next)
+static bool send_additional_meta_data(struct rtmp_stream *stream)
 {
 	uint8_t *meta_data;
 	size_t meta_data_size;
 	bool success = true;
 
-	*next = flv_meta_data(stream->output, &meta_data, &meta_data_size,
-			      false, idx);
+	flv_additional_meta_data(stream->output, &meta_data, &meta_data_size);
+	success = RTMP_Write(&stream->rtmp, (char *)meta_data,
+			     (int)meta_data_size, 0) >= 0;
+	bfree(meta_data);
 
-	if (*next) {
-		success = RTMP_Write(&stream->rtmp, (char *)meta_data,
-				     (int)meta_data_size, (int)idx) >= 0;
-		bfree(meta_data);
-	}
+	return success;
+}
+
+static bool send_meta_data(struct rtmp_stream *stream)
+{
+	uint8_t *meta_data;
+	size_t meta_data_size;
+	bool success = true;
+
+	flv_meta_data(stream->output, &meta_data, &meta_data_size, false);
+	success = RTMP_Write(&stream->rtmp, (char *)meta_data,
+			     (int)meta_data_size, 0) >= 0;
+	bfree(meta_data);
 
 	return success;
 }
@@ -761,8 +777,7 @@
 static int init_send(struct rtmp_stream *stream)
 {
 	int ret;
-	size_t idx = 0;
-	bool next = true;
+	obs_output_t *context = stream->output;
 
 #if defined(_WIN32)
 	adjust_sndbuf_size(stream, MIN_SENDBUF_SIZE);
@@ -800,7 +815,6 @@
 			bfree(stream->write_buf);
 
 		int total_bitrate = 0;
-		obs_output_t *context = stream->output;
 
 		obs_encoder_t *vencoder = obs_output_get_video_encoder(context);
 		if (vencoder) {
@@ -865,14 +879,25 @@
 	}
 
 	os_atomic_set_bool(&stream->active, true);
-	while (next) {
-		if (!send_meta_data(stream, idx++, &next)) {
-			warn("Disconnected while attempting to connect to "
-			     "server.");
-			set_output_error(stream);
-			return OBS_OUTPUT_DISCONNECTED;
-		}
+
+	if (!send_meta_data(stream)) {
+		warn("Disconnected while attempting to send metadata");
+		set_output_error(stream);
+		return OBS_OUTPUT_DISCONNECTED;
+	}
+
+	obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, 1);
+	if (aencoder && !send_additional_meta_data(stream)) {
+		warn("Disconnected while attempting to send additional "
+		     "metadata");
+		return OBS_OUTPUT_DISCONNECTED;
+	}
+
+	if (obs_output_get_audio_encoder(context, 2) != NULL) {
+		warn("Additional audio streams not supported");
+		return OBS_OUTPUT_DISCONNECTED;
 	}
+
 	obs_output_begin_data_capture(stream->output, 0);
 
 	return OBS_OUTPUT_SUCCESS;
@@ -982,18 +1007,6 @@
 
 	RTMP_AddStream(&stream->rtmp, stream->key.array);
 
-	for (size_t idx = 1;; idx++) {
-		obs_encoder_t *encoder =
-			obs_output_get_audio_encoder(stream->output, idx);
-		const char *encoder_name;
-
-		if (!encoder)
-			break;
-
-		encoder_name = obs_encoder_get_name(encoder);
-		RTMP_AddStream(&stream->rtmp, encoder_name);
-	}
-
 	stream->rtmp.m_outChunkSize = 4096;
 	stream->rtmp.m_bSendChunkSizeInfo = true;
 	stream->rtmp.m_bUseNagle = true;

obs-studio-25.0.8.tar.xz/plugins/obs-outputs/rtmp-stream.h -> obs-studio-26.0.0.tar.xz/plugins/obs-outputs/rtmp-stream.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp Changed

@@ -63,6 +63,8 @@
 #include <string>
 #include <atomic>
 #include <intrin.h>
+#include <d3d11.h>
+#include <dxgi1_2.h>
 
 #define do_log(level, format, ...) \
 	blog(level, "[qsv encoder: '%s'] " format, "msdk_impl", ##__VA_ARGS__)
@@ -71,6 +73,74 @@
 mfxVersion ver = {{0, 1}}; // for backward compatibility
 std::atomic<bool> is_active{false};
 
+bool prefer_igpu_enc(int *iGPUIndex)
+{
+	IDXGIAdapter *pAdapter;
+	int adapterIndex = 0;
+	bool hasIGPU = false;
+	bool hasDGPU = false;
+	bool isDG1Primary = false;
+
+	HMODULE hDXGI = LoadLibrary(L"dxgi.dll");
+	if (hDXGI == NULL) {
+		return false;
+	}
+
+	typedef HRESULT(WINAPI * LPCREATEDXGIFACTORY)(REFIID riid,
+						      void **ppFactory);
+
+	LPCREATEDXGIFACTORY pCreateDXGIFactory =
+		(LPCREATEDXGIFACTORY)GetProcAddress(hDXGI,
+						    "CreateDXGIFactory1");
+	if (pCreateDXGIFactory == NULL) {
+		pCreateDXGIFactory = (LPCREATEDXGIFACTORY)GetProcAddress(
+			hDXGI, "CreateDXGIFactory");
+
+		if (pCreateDXGIFactory == NULL) {
+			FreeLibrary(hDXGI);
+			return false;
+		}
+	}
+
+	IDXGIFactory *pFactory = NULL;
+	if (FAILED((*pCreateDXGIFactory)(__uuidof(IDXGIFactory),
+					 (void **)(&pFactory)))) {
+		FreeLibrary(hDXGI);
+		return false;
+	}
+
+	while (SUCCEEDED(pFactory->EnumAdapters(adapterIndex, &pAdapter))) {
+		DXGI_ADAPTER_DESC AdapterDesc = {};
+		if (SUCCEEDED(pAdapter->GetDesc(&AdapterDesc))) {
+			if (AdapterDesc.VendorId == 0x8086) {
+				if (AdapterDesc.DedicatedVideoMemory <=
+				    512 * 1024 * 1024) {
+					hasIGPU = true;
+					if (iGPUIndex != NULL) {
+						*iGPUIndex = adapterIndex;
+					}
+				} else {
+					hasDGPU = true;
+				}
+				if ((AdapterDesc.DeviceId == 0x4905) ||
+				    (AdapterDesc.DeviceId == 0x4906) ||
+				    (AdapterDesc.DeviceId == 0x4907)) {
+					if (adapterIndex == 0) {
+						isDG1Primary = true;
+					}
+				}
+			}
+		}
+		adapterIndex++;
+		pAdapter->Release();
+	}
+
+	pFactory->Release();
+	FreeLibrary(hDXGI);
+
+	return hasIGPU && hasDGPU && isDG1Primary;
+}
+
 void qsv_encoder_version(unsigned short *major, unsigned short *minor)
 {
 	*major = ver.Major;
@@ -79,6 +149,13 @@
 
 qsv_t *qsv_encoder_open(qsv_param_t *pParams)
 {
+	mfxIMPL impl_list[4] = {MFX_IMPL_HARDWARE, MFX_IMPL_HARDWARE2,
+				MFX_IMPL_HARDWARE3, MFX_IMPL_HARDWARE4};
+	int igpu_index = -1;
+	if (prefer_igpu_enc(&igpu_index)) {
+		impl = impl_list[igpu_index];
+	}
+
 	QSV_Encoder_Internal *pEncoder = new QSV_Encoder_Internal(impl, ver);
 	mfxStatus sts = pEncoder->Open(pParams);
 	if (sts != MFX_ERR_NONE) {
@@ -196,6 +273,23 @@
 		return -1;
 }
 
+int qsv_encoder_encode_tex(qsv_t *pContext, uint64_t ts, uint32_t tex_handle,
+			   uint64_t lock_key, uint64_t *next_key,
+			   mfxBitstream **pBS)
+{
+	QSV_Encoder_Internal *pEncoder = (QSV_Encoder_Internal *)pContext;
+	mfxStatus sts = MFX_ERR_NONE;
+
+	sts = pEncoder->Encode_tex(ts, tex_handle, lock_key, next_key, pBS);
+
+	if (sts == MFX_ERR_NONE)
+		return 0;
+	else if (sts == MFX_ERR_MORE_DATA)
+		return 1;
+	else
+		return -1;
+}
+
 int qsv_encoder_close(qsv_t *pContext)
 {
 	QSV_Encoder_Internal *pEncoder = (QSV_Encoder_Internal *)pContext;
@@ -303,6 +397,8 @@
 	case 0x8e:
 	case 0x9e:
 		return QSV_CPU_PLATFORM_KBL;
+	case 0x66:
+		return QSV_CPU_PLATFORM_CNL;
 	case 0x7d:
 	case 0x7e:
 		return QSV_CPU_PLATFORM_ICL;

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/QSV_Encoder.h -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/QSV_Encoder.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp Changed

@@ -211,6 +211,17 @@
 	m_mfxEncParams.mfx.FrameInfo.CropH = pParams->nHeight;
 	m_mfxEncParams.mfx.GopRefDist = pParams->nbFrames + 1;
 
+	enum qsv_cpu_platform qsv_platform = qsv_get_cpu_platform();
+	if ((qsv_platform >= QSV_CPU_PLATFORM_ICL) &&
+	    (pParams->nbFrames == 0) &&
+	    (m_ver.Major == 1 && m_ver.Minor >= 31)) {
+		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;
+	}
+
 	m_mfxEncParams.mfx.RateControlMethod = pParams->nRateControl;
 
 	switch (pParams->nRateControl) {
@@ -268,10 +279,23 @@
 			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) {
+			m_co2.RepeatPPS = MFX_CODINGOPTION_OFF;
+			if (pParams->nRateControl == MFX_RATECONTROL_CBR ||
+			    pParams->nRateControl == MFX_RATECONTROL_VBR) {
+				m_co2.LookAheadDepth = pParams->nLADEPTH;
+			}
+		}
 		extendedBuffers[iBuffers++] = (mfxExtBuffer *)&m_co2;
 	}
 
-	if (pParams->bCQM) {
+	if (m_mfxEncParams.mfx.LowPower == MFX_CODINGOPTION_ON) {
+		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[iBuffers++] = (mfxExtBuffer *)&m_co3;
+	} else if (pParams->bCQM) {
 		if (m_ver.Major == 1 && m_ver.Minor >= 16) {
 			memset(&m_co3, 0, sizeof(mfxExtCodingOption3));
 			m_co3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3;
@@ -297,6 +321,11 @@
 	else
 		m_mfxEncParams.IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
 
+	mfxStatus sts = m_pmfxENC->Query(&m_mfxEncParams, &m_mfxEncParams);
+	if (sts == MFX_ERR_UNSUPPORTED || sts == MFX_ERR_UNDEFINED_BEHAVIOR) {
+		m_mfxEncParams.mfx.LowPower = MFX_CODINGOPTION_OFF;
+	}
+
 	return true;
 }
 
@@ -569,6 +598,70 @@
 	return sts;
 }
 
+mfxStatus QSV_Encoder_Internal::Encode_tex(uint64_t ts, uint32_t tex_handle,
+					   uint64_t lock_key,
+					   uint64_t *next_key,
+					   mfxBitstream **pBS)
+{
+	mfxStatus sts = MFX_ERR_NONE;
+	*pBS = NULL;
+	int nTaskIdx = GetFreeTaskIndex(m_pTaskPool, m_nTaskPool);
+	int nSurfIdx = GetFreeSurfaceIndex(m_pmfxSurfaces, m_nSurfNum);
+
+	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_pTaskPool[m_nFirstSyncTask].syncp, 60000);
+		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+		mfxU8 *pTemp = m_outBitstream.Data;
+		memcpy(&m_outBitstream, &m_pTaskPool[m_nFirstSyncTask].mfxBS,
+		       sizeof(mfxBitstream));
+
+		m_pTaskPool[m_nFirstSyncTask].mfxBS.Data = pTemp;
+		m_pTaskPool[m_nFirstSyncTask].mfxBS.DataLength = 0;
+		m_pTaskPool[m_nFirstSyncTask].mfxBS.DataOffset = 0;
+		m_pTaskPool[m_nFirstSyncTask].syncp = NULL;
+		nTaskIdx = m_nFirstSyncTask;
+		m_nFirstSyncTask = (m_nFirstSyncTask + 1) % m_nTaskPool;
+		*pBS = &m_outBitstream;
+
+		nSurfIdx = GetFreeSurfaceIndex(m_pmfxSurfaces, m_nSurfNum);
+	}
+
+	mfxFrameSurface1 *pSurface = m_pmfxSurfaces[nSurfIdx];
+	//copy to default surface directly
+	pSurface->Data.TimeStamp = ts;
+	if (m_bUseD3D11 || m_bD3D9HACK) {
+		sts = simple_copytex(m_mfxAllocator.pthis, pSurface->Data.MemId,
+				     tex_handle, lock_key, next_key);
+		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+	}
+
+	for (;;) {
+		// Encode a frame asynchronously (returns immediately)
+		sts = m_pmfxENC->EncodeFrameAsync(NULL, pSurface,
+						  &m_pTaskPool[nTaskIdx].mfxBS,
+						  &m_pTaskPool[nTaskIdx].syncp);
+
+		if (MFX_ERR_NONE < sts && !m_pTaskPool[nTaskIdx].syncp) {
+			// Repeat the call if warning and no output
+			if (MFX_WRN_DEVICE_BUSY == sts)
+				MSDK_SLEEP(
+					1); // Wait if device is busy, then repeat the same call
+		} else if (MFX_ERR_NONE < sts && m_pTaskPool[nTaskIdx].syncp) {
+			sts = MFX_ERR_NONE; // Ignore warnings if output is available
+			break;
+		} else if (MFX_ERR_NOT_ENOUGH_BUFFER == sts) {
+			// Allocate more bitstream buffer memory here if needed...
+			break;
+		} else
+			break;
+	}
+
+	return sts;
+}
+
 mfxStatus QSV_Encoder_Internal::Drain()
 {
 	mfxStatus sts = MFX_ERR_NONE;

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.h -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/common_directx11.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/common_directx11.cpp Changed

@@ -57,8 +57,8 @@
 		}
 	}
 
-	HRESULT hres = CreateDXGIFactory(__uuidof(IDXGIFactory2),
-					 (void **)(&g_pDXGIFactory));
+	HRESULT hres = CreateDXGIFactory1(__uuidof(IDXGIFactory2),
+					  (void **)(&g_pDXGIFactory));
 	if (FAILED(hres))
 		return NULL;
 
@@ -433,6 +433,46 @@
 	return MFX_ERR_NONE;
 }
 
+mfxStatus simple_copytex(mfxHDL pthis, mfxMemId mid, mfxU32 tex_handle,
+			 mfxU64 lock_key, mfxU64 *next_key)
+{
+	pthis; // To suppress warning for this unused parameter
+
+	CustomMemId *memId = (CustomMemId *)mid;
+	ID3D11Texture2D *pSurface = (ID3D11Texture2D *)memId->memId;
+
+	IDXGIKeyedMutex *km;
+	ID3D11Texture2D *input_tex;
+	HRESULT hr;
+
+	hr = g_pD3D11Device->OpenSharedResource((HANDLE)(uintptr_t)tex_handle,
+						IID_ID3D11Texture2D,
+						(void **)&input_tex);
+	if (FAILED(hr)) {
+		return MFX_ERR_INVALID_HANDLE;
+	}
+
+	hr = input_tex->QueryInterface(IID_IDXGIKeyedMutex, (void **)&km);
+	if (FAILED(hr)) {
+		input_tex->Release();
+		return MFX_ERR_INVALID_HANDLE;
+	}
+
+	input_tex->SetEvictionPriority(DXGI_RESOURCE_PRIORITY_MAXIMUM);
+
+	km->AcquireSync(lock_key, INFINITE);
+
+	D3D11_TEXTURE2D_DESC desc = {0};
+	input_tex->GetDesc(&desc);
+	D3D11_BOX SrcBox = {0, 0, 0, desc.Width, desc.Height, 1};
+	g_pD3D11Ctx->CopySubresourceRegion(pSurface, 0, 0, 0, 0, input_tex, 0,
+					   &SrcBox);
+
+	km->ReleaseSync(*next_key);
+
+	return MFX_ERR_NONE;
+}
+
 mfxStatus simple_gethdl(mfxHDL pthis, mfxMemId mid, mfxHDL *handle)
 {
 	pthis; // To suppress warning for this unused parameter

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/common_utils.h -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/common_utils.h Changed

obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/bg-BG.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/de-DE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/el-GR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/el-GR.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/eu-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/eu-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/gl-ES.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/he-IL.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/hr-HR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/nb-NO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/sr-CS.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/sr-CS.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/sr-SP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/ta-IN.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/th-TH.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/tl-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/tl-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxstructures.h -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxstructures.h Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/obs-qsv11-plugin-main.c -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/obs-qsv11-plugin-main.c Changed

obs-studio-25.0.8.tar.xz/plugins/obs-qsv11/obs-qsv11.c -> obs-studio-26.0.0.tar.xz/plugins/obs-qsv11/obs-qsv11.c Changed

@@ -60,6 +60,8 @@
 #include <util/platform.h>
 #include <obs-module.h>
 #include <obs-avc.h>
+#include <d3d11.h>
+#include <dxgi1_2.h>
 
 #ifndef _STDINT_H_INCLUDED
 #define _STDINT_H_INCLUDED
@@ -146,7 +148,6 @@
 	obs_data_set_default_int(settings, "bitrate", 2500);
 	obs_data_set_default_int(settings, "max_bitrate", 3000);
 	obs_data_set_default_string(settings, "profile", "high");
-	obs_data_set_default_int(settings, "async_depth", 4);
 	obs_data_set_default_string(settings, "rate_control", "CBR");
 
 	obs_data_set_default_int(settings, "accuracy", 1000);
@@ -155,11 +156,11 @@
 	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, "la_depth", 15);
 
 	obs_data_set_default_int(settings, "keyint_sec", 3);
+	obs_data_set_default_string(settings, "latency", "normal");
 	obs_data_set_default_int(settings, "bframes", 3);
-	obs_data_set_default_bool(settings, "mbbrc", true);
+	obs_data_set_default_bool(settings, "enhancements", false);
 }
 
 static inline void add_strings(obs_property_t *list, const char *const *strings)
@@ -174,21 +175,91 @@
 #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_ASYNC_DEPTH obs_module_text("AsyncDepth")
+#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_LA_DEPTH obs_module_text("LookAheadDepth")
 #define TEXT_KEYINT_SEC obs_module_text("KeyframeIntervalSec")
 #define TEXT_BFRAMES obs_module_text("B Frames")
-#define TEXT_MBBRC obs_module_text("Content Adaptive Quantization")
+#define TEXT_PERCEPTUAL_ENHANCEMENTS \
+	obs_module_text("SubjectiveVideoEnhancements")
 
 static inline bool is_skl_or_greater_platform()
 {
 	enum qsv_cpu_platform plat = qsv_get_cpu_platform();
 	return (plat >= QSV_CPU_PLATFORM_SKL);
 }
+
+static bool update_latency(obs_data_t *settings)
+{
+	bool update = false;
+	int async_depth = 4;
+	if (obs_data_item_byname(settings, "async_depth") != NULL) {
+		async_depth = (int)obs_data_get_int(settings, "async_depth");
+		obs_data_erase(settings, "async_depth");
+		update = true;
+	}
+
+	int la_depth = 15;
+	if (obs_data_item_byname(settings, "la_depth") != NULL) {
+		la_depth = (int)obs_data_get_int(settings, "la_depth");
+		obs_data_erase(settings, "la_depth");
+		update = true;
+	}
+
+	if (update) {
+		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;
+
+		if (lookahead) {
+			if (la_depth == 0 || la_depth >= 15)
+				obs_data_set_string(settings, "latency",
+						    "normal");
+			else
+				obs_data_set_string(settings, "latency", "low");
+		} else {
+			if (async_depth != 1)
+				obs_data_set_string(settings, "latency",
+						    "normal");
+			else
+				obs_data_set_string(settings, "latency",
+						    "ultra-low");
+		}
+	}
+
+	return true;
+}
+
+static bool update_enhancements(obs_data_t *settings)
+{
+	bool update = false;
+	bool mbbrc = true;
+	if (obs_data_item_byname(settings, "mbbrc") != NULL) {
+		mbbrc = (bool)obs_data_get_bool(settings, "mbbrc");
+		obs_data_erase(settings, "mbbrc");
+		update = true;
+	}
+
+	bool cqm = false;
+	if (obs_data_item_byname(settings, "CQM") != NULL) {
+		cqm = (bool)obs_data_get_bool(settings, "CQM");
+		obs_data_erase(settings, "CQM");
+		update = true;
+	}
+
+	if (update) {
+		bool enabled = (mbbrc && cqm);
+		obs_data_set_bool(settings, "enhancements", enabled);
+	}
+
+	return true;
+}
+
 static bool rate_control_modified(obs_properties_t *ppts, obs_property_t *p,
 				  obs_data_t *settings)
 {
@@ -225,18 +296,14 @@
 	p = obs_properties_get(ppts, "icq_quality");
 	obs_property_set_visible(p, bVisible);
 
-	bVisible = astrcmpi(rate_control, "LA_ICQ") == 0 ||
-		   astrcmpi(rate_control, "LA_CBR") == 0 ||
-		   astrcmpi(rate_control, "LA_VBR") == 0;
-	p = obs_properties_get(ppts, "la_depth");
-	obs_property_set_visible(p, bVisible);
-
 	bVisible = astrcmpi(rate_control, "CBR") == 0 ||
-		   astrcmpi(rate_control, "VBR") == 0 ||
-		   astrcmpi(rate_control, "AVBR") == 0;
-	p = obs_properties_get(ppts, "mbbrc");
+		   astrcmpi(rate_control, "VBR") == 0;
+	p = obs_properties_get(ppts, "enhancements");
 	obs_property_set_visible(p, bVisible);
 
+	update_latency(settings);
+	update_enhancements(settings);
+
 	return true;
 }
 
@@ -283,7 +350,6 @@
 	obs_property_set_modified_callback(list, profile_modified);
 
 	obs_properties_add_int(props, "keyint_sec", TEXT_KEYINT_SEC, 1, 20, 1);
-	obs_properties_add_int(props, "async_depth", TEXT_ASYNC_DEPTH, 1, 7, 1);
 
 	list = obs_properties_add_list(props, "rate_control", TEXT_RATE_CONTROL,
 				       OBS_COMBO_TYPE_LIST,
@@ -308,13 +374,18 @@
 	obs_properties_add_int(props, "qpb", "QPB", 1, 51, 1);
 	obs_properties_add_int(props, "icq_quality", TEXT_ICQ_QUALITY, 1, 51,
 			       1);
-	obs_properties_add_int(props, "la_depth", TEXT_LA_DEPTH, 10, 100, 1);
+	list = obs_properties_add_list(props, "latency", TEXT_LATENCY,
+				       OBS_COMBO_TYPE_LIST,
+				       OBS_COMBO_FORMAT_STRING);
+	add_strings(list, qsv_latency_names);
+	obs_property_set_long_description(list,
+					  obs_module_text("Latency.ToolTip"));
+
 	obs_properties_add_int(props, "bframes", TEXT_BFRAMES, 0, 3, 1);
 
 	if (is_skl_or_greater_platform())
-		obs_properties_add_bool(props, "mbbrc", TEXT_MBBRC);
-
-	obs_properties_add_bool(props, "CQM", "Customized quantization matrix");
+		obs_properties_add_bool(props, "enhancements",
+					TEXT_PERCEPTUAL_ENHANCEMENTS);
 
 	return props;
 }
@@ -323,13 +394,15 @@
 {
 	video_t *video = obs_encoder_video(obsqsv->encoder);
 	const struct video_output_info *voi = video_output_get_info(video);
+	update_latency(settings);
+	update_enhancements(settings);
 
 	const char *target_usage =
 		obs_data_get_string(settings, "target_usage");
 	const char *profile = obs_data_get_string(settings, "profile");
 	const char *rate_control =
 		obs_data_get_string(settings, "rate_control");
-	int async_depth = (int)obs_data_get_int(settings, "async_depth");
+	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");
@@ -338,11 +411,10 @@
 	int qpp = (int)obs_data_get_int(settings, "qpp");
 	int qpb = (int)obs_data_get_int(settings, "qpb");
 	int icq_quality = (int)obs_data_get_int(settings, "icq_quality");
-	int la_depth = (int)obs_data_get_int(settings, "la_depth");
 	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
 	bool cbr_override = obs_data_get_bool(settings, "cbr");
 	int bFrames = (int)obs_data_get_int(settings, "bframes");
-	bool mbbrc = obs_data_get_bool(settings, "mbbrc");
+	bool enhancements = obs_data_get_bool(settings, "enhancements");
 
 	if (obs_data_has_user_value(settings, "bf"))
 		bFrames = (int)obs_data_get_int(settings, "bf");
@@ -411,13 +483,30 @@
 	else if (astrcmpi(rate_control, "LA_CBR") == 0)
 		obsqsv->params.nRateControl = MFX_RATECONTROL_LA_HRD;
 
-	obsqsv->params.nAsyncDepth = (mfxU16)async_depth;
+	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.nLADEPTH > 0) {
+		if (obsqsv->params.nLADEPTH > 100)
+			obsqsv->params.nLADEPTH = 100;
+		else if (obsqsv->params.nLADEPTH < 10)
+			obsqsv->params.nLADEPTH = 10;
+	}
+
 	obsqsv->params.nAccuracy = (mfxU16)accuracy;
 	obsqsv->params.nConvergence = (mfxU16)convergence;
 	obsqsv->params.nQPI = (mfxU16)qpi;
 	obsqsv->params.nQPP = (mfxU16)qpp;
 	obsqsv->params.nQPB = (mfxU16)qpb;
-	obsqsv->params.nLADEPTH = (mfxU16)la_depth;
 	obsqsv->params.nTargetBitRate = (mfxU16)target_bitrate;
 	obsqsv->params.nMaxBitRate = (mfxU16)max_bitrate;
 	obsqsv->params.nWidth = (mfxU16)width;
@@ -427,7 +516,8 @@
 	obsqsv->params.nbFrames = (mfxU16)bFrames;
 	obsqsv->params.nKeyIntSec = (mfxU16)keyint_sec;
 	obsqsv->params.nICQQuality = (mfxU16)icq_quality;
-	obsqsv->params.bMBBRC = mbbrc;
+	obsqsv->params.bMBBRC = enhancements;
+	obsqsv->params.bCQM = enhancements;
 
 	info("settings:\n\trate_control:   %s", rate_control);
 
@@ -467,8 +557,6 @@
 	     "\theight:         %d",
 	     voi->fps_num, voi->fps_den, width, height);
 
-	obsqsv->params.bCQM = (bool)obs_data_get_bool(settings, "CQM");
-
 	info("debug info:");
 }
 
@@ -582,6 +670,98 @@
 	return obsqsv;
 }
 
+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 bool is_intel_gpu_primary()
+{
+	HMODULE dxgi = get_lib("DXGI.dll");
+	CREATEDXGIFACTORY1PROC create_dxgi;
+	IDXGIFactory1 *factory;
+	IDXGIAdapter *adapter;
+	DXGI_ADAPTER_DESC desc;
+	HRESULT hr;
+
+	if (!dxgi) {
+		return false;
+	}
+	create_dxgi = (CREATEDXGIFACTORY1PROC)GetProcAddress(
+		dxgi, "CreateDXGIFactory1");
+
+	if (!create_dxgi) {
+		blog(LOG_INFO, "Failed to load D3D11/DXGI procedures");
+		return false;
+	}
+
+	hr = create_dxgi(&IID_IDXGIFactory1, &factory);
+	if (FAILED(hr)) {
+		blog(LOG_INFO, "CreateDXGIFactory1 failed");
+		return false;
+	}
+
+	hr = factory->lpVtbl->EnumAdapters(factory, 0, &adapter);
+	factory->lpVtbl->Release(factory);
+	if (FAILED(hr)) {
+		blog(LOG_INFO, "EnumAdapters failed");
+		return false;
+	}
+
+	hr = adapter->lpVtbl->GetDesc(adapter, &desc);
+	adapter->lpVtbl->Release(adapter);
+	if (FAILED(hr)) {
+		blog(LOG_INFO, "GetDesc failed");
+		return false;
+	}
+
+	/*check whether adapter 0 is Intel*/
+	if (desc.VendorId == 0x8086) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+static void *obs_qsv_create_tex(obs_data_t *settings, obs_encoder_t *encoder)
+{
+	if (!is_intel_gpu_primary()) {
+		blog(LOG_INFO,
+		     ">>> app not on intel GPU, fall back to old qsv encoder");
+		return obs_encoder_create_rerouted(encoder, "obs_qsv11_soft");
+	}
+
+	if (!obs_nv12_tex_active()) {
+		blog(LOG_INFO,
+		     ">>> nv12 tex not active, fall back to old qsv encoder");
+		return obs_encoder_create_rerouted(encoder, "obs_qsv11_soft");
+	}
+
+	if (obs_encoder_scaling_enabled(encoder)) {
+		blog(LOG_INFO,
+		     ">>> encoder scaling active, fall back to old qsv encoder");
+		return obs_encoder_create_rerouted(encoder, "obs_qsv11_soft");
+	}
+
+	if (prefer_igpu_enc(NULL)) {
+		blog(LOG_INFO,
+		     ">>> prefer iGPU encoding, fall back to old qsv encoder");
+		return obs_encoder_create_rerouted(encoder, "obs_qsv11_soft");
+	}
+
+	blog(LOG_INFO, ">>> new qsv encoder");
+	return obs_qsv_create(settings, encoder);
+}
+
 static bool obs_qsv_extra_data(void *data, uint8_t **extra_data, size_t *size)
 {
 	struct obs_qsv *obsqsv = data;
@@ -792,8 +972,51 @@
 	return true;
 }
 
+static bool obs_qsv_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 obs_qsv *obsqsv = data;
+
+	if (handle == GS_INVALID_HANDLE) {
+		warn("Encode failed: bad texture handle");
+		*next_key = lock_key;
+		return false;
+	}
+
+	if (!packet || !received_packet)
+		return false;
+
+	EnterCriticalSection(&g_QsvCs);
+
+	video_t *video = obs_encoder_video(obsqsv->encoder);
+	const struct video_output_info *voi = video_output_get_info(video);
+
+	mfxBitstream *pBS = NULL;
+
+	int ret;
+
+	mfxU64 qsvPTS = pts * 90000 / voi->fps_num;
+
+	ret = qsv_encoder_encode_tex(obsqsv->context, qsvPTS, handle, lock_key,
+				     next_key, &pBS);
+
+	if (ret < 0) {
+		warn("encode failed");
+		LeaveCriticalSection(&g_QsvCs);
+		return false;
+	}
+
+	parse_packet(obsqsv, packet, pBS, voi->fps_num, received_packet);
+
+	LeaveCriticalSection(&g_QsvCs);
+
+	return true;
+}
+
 struct obs_encoder_info obs_qsv_encoder = {
-	.id = "obs_qsv11",
+	.id = "obs_qsv11_soft",
 	.type = OBS_ENCODER_VIDEO,
 	.codec = "h264",
 	.get_name = obs_qsv_getname,
@@ -806,5 +1029,22 @@
 	.get_extra_data = obs_qsv_extra_data,
 	.get_sei_data = obs_qsv_sei,
 	.get_video_info = obs_qsv_video_info,
-	.caps = OBS_ENCODER_CAP_DYN_BITRATE,
+	.caps = OBS_ENCODER_CAP_DYN_BITRATE | OBS_ENCODER_CAP_INTERNAL,
+};
+
+struct obs_encoder_info obs_qsv_encoder_tex = {
+	.id = "obs_qsv11",
+	.type = OBS_ENCODER_VIDEO,
+	.codec = "h264",
+	.get_name = obs_qsv_getname,
+	.create = obs_qsv_create_tex,
+	.destroy = obs_qsv_destroy,
+	.caps = OBS_ENCODER_CAP_DYN_BITRATE | OBS_ENCODER_CAP_PASS_TEXTURE,
+	.encode_texture = obs_qsv_encode_tex,
+	.update = obs_qsv_update,
+	.get_properties = obs_qsv_props,
+	.get_defaults = obs_qsv_defaults,
+	.get_extra_data = obs_qsv_extra_data,
+	.get_sei_data = obs_qsv_sei,
+	.get_video_info = obs_qsv_video_info,
 };

obs-studio-25.0.8.tar.xz/plugins/obs-text/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-text/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/en-GB.ini Added

@@ -0,0 +1,40 @@
+TextGDIPlus="Text (GDI+)"
+Font="Font"
+Text="Text"
+ReadFromFile="Read from file"
+TextFile="Text File (UTF-8)"
+Filter.TextFiles="Text Files"
+Filter.AllFiles="All Files"
+Color="Colour"
+Opacity="Opacity"
+Gradient="Gradient"
+Gradient.Color="Gradient Colour"
+Gradient.Opacity="Gradient Opacity"
+Gradient.Direction="Gradient Direction"
+BkColor="Background Colour"
+BkOpacity="Background Opacity"
+Alignment="Alignment"
+Alignment.Left="Left"
+Alignment.Center="Centre"
+Alignment.Right="Right"
+Vertical="Vertical"
+VerticalAlignment="Vertical Alignment"
+VerticalAlignment.Top="Top"
+VerticalAlignment.Bottom="Bottom"
+Outline="Outline"
+Outline.Size="Outline Size"
+Outline.Color="Outline Colour"
+Outline.Opacity="Outline Opacity"
+ChatlogMode="Chatlog Mode"
+ChatlogMode.Lines="Chatlog Line Limit"
+UseCustomExtents="Use Custom Text Extents"
+UseCustomExtents.Wrap="Wrap"
+Width="Width"
+Height="Height"
+Transform="Text Transform"
+Transform.None="None"
+Transform.Uppercase="Uppercase"
+Transform.Lowercase="Lowercase"
+Transform.Startcase="Start Case"
+Antialiasing="Enable Antialiasing"
+

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/gl-ES.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/he-IL.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/id-ID.ini Added

@@ -0,0 +1,40 @@
+TextGDIPlus="Teks (GDI+)"
+Font="Font"
+Text="Teks"
+ReadFromFile="Baca dari file"
+TextFile="File Teks (UTF-8)"
+Filter.TextFiles="File Teks"
+Filter.AllFiles="Semua File"
+Color="Warna"
+Opacity="Opasitas"
+Gradient="Gradien"
+Gradient.Color="Warna Gradien"
+Gradient.Opacity="Opasitas Gradien"
+Gradient.Direction="Arah Gradien"
+BkColor="Warna Latar Belakang"
+BkOpacity="Opasitas Latar Belakang"
+Alignment="Penjajaran"
+Alignment.Left="Kiri"
+Alignment.Center="Tengah"
+Alignment.Right="Kanan"
+Vertical="Vertikal"
+VerticalAlignment="Penjajaran Vertikal"
+VerticalAlignment.Top="Atas"
+VerticalAlignment.Bottom="Bawah"
+Outline="Garis Luar"
+Outline.Size="Ukuran Garis Luar"
+Outline.Color="Warna Garis Luar"
+Outline.Opacity="Opasitas Garis Luar"
+ChatlogMode="Mode Log Chat"
+ChatlogMode.Lines="Batas Baris Log Chat"
+UseCustomExtents="Gunakan Luas Teks Khusus"
+UseCustomExtents.Wrap="Atur Teks"
+Width="Lebar"
+Height="Tinggi"
+Transform="Transformasi Teks"
+Transform.None="Tidak ada"
+Transform.Uppercase="Huruf kapital"
+Transform.Lowercase="Huruf kecil"
+Transform.Startcase="Huruf Depan Kapital"
+Antialiasing="Aktifkan Antialiasing"
+

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ro-RO.ini Changed

@@ -7,6 +7,10 @@
 Filter.AllFiles="Toate fișierele"
 Color="Culoare"
 Opacity="Opacitate"
+Gradient="Degradeu"
+Gradient.Color="Culoare Gradient"
+Gradient.Opacity="Opacitate Gradient"
+Gradient.Direction="Direcție Gradient"
 BkColor="Culoarea fundalului"
 BkOpacity="Opacitatea fundalului"
 Alignment="Aliniere"
@@ -14,10 +18,22 @@
 Alignment.Center="Centru"
 Alignment.Right="Dreapta"
 Vertical="Vertical"
+VerticalAlignment="Aliniere verticală"
+VerticalAlignment.Top="Sus"
+VerticalAlignment.Bottom="Jos"
 Outline="Contur"
 Outline.Size="Dimensiunea conturului"
 Outline.Color="Culoarea conturului"
 Outline.Opacity="Opacitatea conturului"
+ChatlogMode="Mod Chatlog"
+ChatlogMode.Lines="Limită linie chatlog"
+UseCustomExtents="Utilizaţi extensii personalizate ale textului"
+UseCustomExtents.Wrap="Infașoară"
 Width="Lățime"
 Height="Înălțime"
+Transform="Transformare text"
+Transform.None="Niciuna"
+Transform.Uppercase="Majuscule"
+Transform.Lowercase="Litere mici"
+Transform.Startcase="Pornire Caz"

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/sr-SP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-text/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-text/gdiplus/obs-text.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-text/gdiplus/obs-text.cpp Changed

@@ -69,6 +69,7 @@
 #define S_EXTENTS_CX                    "extents_cx"
 #define S_EXTENTS_CY                    "extents_cy"
 #define S_TRANSFORM                     "transform"
+#define S_ANTIALIASING                  "antialiasing"
 
 #define S_ALIGN_LEFT                    "left"
 #define S_ALIGN_CENTER                  "center"
@@ -83,6 +84,9 @@
 #define S_TRANSFORM_LOWERCASE           2
 #define S_TRANSFORM_STARTCASE           3
 
+#define S_ANTIALIASING_NONE             0
+#define S_ANTIALIASING_STANDARD         1
+
 #define T_(v)                           obs_module_text(v)
 #define T_FONT                          T_("Font")
 #define T_USE_FILE                      T_("ReadFromFile")
@@ -110,6 +114,7 @@
 #define T_EXTENTS_CX                    T_("Width")
 #define T_EXTENTS_CY                    T_("Height")
 #define T_TRANSFORM                     T_("Transform")
+#define T_ANTIALIASING                  T_("Antialiasing")
 
 #define T_FILTER_TEXT_FILES             T_("Filter.TextFiles")
 #define T_FILTER_ALL_FILES              T_("Filter.AllFiles")
@@ -242,6 +247,7 @@
 	bool italic = false;
 	bool underline = false;
 	bool strikeout = false;
+	bool antialiasing = true;
 	bool vertical = false;
 
 	bool use_outline = false;
@@ -288,6 +294,7 @@
 	void RenderText();
 	void LoadFileText();
 	void TransformText();
+	void SetAntiAliasing(Graphics &graphics_bitmap);
 
 	const char *GetMainString(const char *str);
 
@@ -575,9 +582,8 @@
 		warn_stat("graphics_bitmap.Clear");
 	}
 
-	graphics_bitmap.SetTextRenderingHint(TextRenderingHintAntiAlias);
 	graphics_bitmap.SetCompositingMode(CompositingModeSourceOver);
-	graphics_bitmap.SetSmoothingMode(SmoothingModeAntiAlias);
+	SetAntiAliasing(graphics_bitmap);
 
 	if (!text.empty()) {
 		if (use_outline) {
@@ -684,6 +690,19 @@
 	}
 }
 
+void TextSource::SetAntiAliasing(Graphics &graphics_bitmap)
+{
+	if (!antialiasing) {
+		graphics_bitmap.SetTextRenderingHint(
+			TextRenderingHintSingleBitPerPixel);
+		graphics_bitmap.SetSmoothingMode(SmoothingModeNone);
+		return;
+	}
+
+	graphics_bitmap.SetTextRenderingHint(TextRenderingHintAntiAlias);
+	graphics_bitmap.SetSmoothingMode(SmoothingModeAntiAlias);
+}
+
 #define obs_data_get_uint32 (uint32_t) obs_data_get_int
 
 inline void TextSource::Update(obs_data_t *s)
@@ -712,6 +731,7 @@
 	uint32_t n_extents_cx = obs_data_get_uint32(s, S_EXTENTS_CX);
 	uint32_t n_extents_cy = obs_data_get_uint32(s, S_EXTENTS_CY);
 	int new_text_transform = (int)obs_data_get_int(s, S_TRANSFORM);
+	bool new_antialiasing = obs_data_get_bool(s, S_ANTIALIASING);
 
 	const char *font_face = obs_data_get_string(font_obj, "face");
 	int font_size = (int)obs_data_get_int(font_obj, "size");
@@ -763,6 +783,7 @@
 	extents_cx = n_extents_cx;
 	extents_cy = n_extents_cy;
 	text_transform = new_text_transform;
+	antialiasing = new_antialiasing;
 
 	if (!gradient) {
 		color2 = color;
@@ -965,6 +986,8 @@
 	obs_properties_add_path(props, S_FILE, T_FILE, OBS_PATH_FILE,
 				filter.c_str(), path.c_str());
 
+	obs_properties_add_bool(props, S_ANTIALIASING, T_ANTIALIASING);
+
 	p = obs_properties_add_list(props, S_TRANSFORM, T_TRANSFORM,
 				    OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_list_add_int(p, T_TRANSFORM_NONE, S_TRANSFORM_NONE);
@@ -976,6 +999,7 @@
 				  S_TRANSFORM_STARTCASE);
 
 	obs_properties_add_bool(props, S_VERTICAL, T_VERTICAL);
+
 	obs_properties_add_color(props, S_COLOR, T_COLOR);
 	p = obs_properties_add_int_slider(props, S_OPACITY, T_OPACITY, 0, 100,
 					  1);
@@ -1059,6 +1083,7 @@
 	obs_data_set_default_int(settings, S_EXTENTS_CX, 100);
 	obs_data_set_default_int(settings, S_EXTENTS_CY, 100);
 	obs_data_set_default_int(settings, S_TRANSFORM, S_TRANSFORM_NONE);
+	obs_data_set_default_bool(settings, S_ANTIALIASING, true);
 
 	obs_data_release(font_obj);
 };

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/en-GB.ini Added

@@ -0,0 +1,66 @@
+FadeTransition="Fade"
+CutTransition="Cut"
+SwipeTransition="Swipe"
+SlideTransition="Slide"
+StingerTransition="Stinger"
+FadeToColorTransition="Fade to Colour"
+Direction="Direction"
+Direction.Left="Left"
+Direction.Right="Right"
+Direction.Up="Up"
+Direction.Down="Down"
+SwipeIn="Swipe In"
+Color="Colour"
+VideoFile="Video File"
+TransitionPoint="Transition Point"
+TransitionPointFrame="Transition Point (frame)"
+TransitionPointType="Transition Point Type"
+TransitionPointTypeFrame="Frame"
+TransitionPointTypeTime="Time (milliseconds)"
+AudioFadeStyle="Audio Fade Style"
+AudioFadeStyle.FadeOutFadeIn="Fade out to transition point then fade in"
+AudioFadeStyle.CrossFade="Crossfade"
+SwitchPoint="Peak Colour Point"
+LumaWipeTransition="Luma Wipe"
+LumaWipe.Image="Image"
+LumaWipe.Invert="Invert"
+LumaWipe.Softness="Softness"
+LumaWipe.Type.BarndoorBottomLeft="Barndoor Bottom Left"
+LumaWipe.Type.BarndoorHorizontal="Barndoor Horizontal"
+LumaWipe.Type.BarndoorTopLeft="Barndoor Top Left"
+LumaWipe.Type.BarndoorVertical="Barndoor Vertical"
+LumaWipe.Type.BlindsHorizontal="Blinds Horizontal"
+LumaWipe.Type.BoxBottomLeft="Box Bottom Left"
+LumaWipe.Type.BoxBottomRight="Box Bottom Right"
+LumaWipe.Type.BoxTopLeft="Box Top Left"
+LumaWipe.Type.BoxTopRight="Box Top Right"
+LumaWipe.Type.Burst="Burst"
+LumaWipe.Type.CheckerboardSmall="Checkerboard Small"
+LumaWipe.Type.Circles="Circles"
+LumaWipe.Type.Clock="Clock"
+LumaWipe.Type.Cloud="Cloud"
+LumaWipe.Type.Curtain="Curtain"
+LumaWipe.Type.Fan="Fan"
+LumaWipe.Type.Fractal="Fractal"
+LumaWipe.Type.Iris="Iris"
+LumaWipe.Type.LinearHorizontal="Linear Horizontal"
+LumaWipe.Type.LinearTopLeft="Linear Top Left"
+LumaWipe.Type.LinearTopRight="Linear Top Right"
+LumaWipe.Type.LinearVertical="Linear Vertical"
+LumaWipe.Type.ParallelZigzagHorizontal="Parallel Zigzag Horizontal"
+LumaWipe.Type.ParallelZigzagVertical="Parallel Zigzag Vertical"
+LumaWipe.Type.Sinus9="Sinus 9"
+LumaWipe.Type.Spiral="Spiral"
+LumaWipe.Type.Square="Square"
+LumaWipe.Type.Squares="Squares"
+LumaWipe.Type.Stripes="Stripes"
+LumaWipe.Type.StripsHorizontal="Strips Horizontal"
+LumaWipe.Type.StripsVertical="Strips Vertical"
+LumaWipe.Type.Watercolor="Watercolour"
+LumaWipe.Type.ZigzagHorizontal="Zigzag Horizontal"
+LumaWipe.Type.ZigzagVertical="Zigzag Vertical"
+AudioMonitoring="Audio Monitoring"
+AudioMonitoring.None="Monitor Off"
+AudioMonitoring.MonitorOnly="Monitor Only (mute output)"
+AudioMonitoring.Both="Monitor and Output"
+

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/id-ID.ini Added

@@ -0,0 +1,66 @@
+FadeTransition="Pudar"
+CutTransition="Potong"
+SwipeTransition="Usap"
+SlideTransition="Geser"
+StingerTransition="Stinger"
+FadeToColorTransition="Pudarkan ke Warna"
+Direction="Arah"
+Direction.Left="Kiri"
+Direction.Right="Kanan"
+Direction.Up="Naik"
+Direction.Down="Turun"
+SwipeIn="Usap ke Dalam"
+Color="Warna"
+VideoFile="File Video"
+TransitionPoint="Titik Transisi"
+TransitionPointFrame="Titik Transisi (frame)"
+TransitionPointType="Tipe Titik Transisi"
+TransitionPointTypeFrame="Frame"
+TransitionPointTypeTime="Waktu (milidetik)"
+AudioFadeStyle="Tipe Fade Audio"
+AudioFadeStyle.FadeOutFadeIn="Fade out ke titik transisi kemudian fade in"
+AudioFadeStyle.CrossFade="Crossfade"
+SwitchPoint="Titik Warna Puncak"
+LumaWipeTransition="Luma Wipe"
+LumaWipe.Image="Gambar"
+LumaWipe.Invert="Balikkan"
+LumaWipe.Softness="Kehalusan"
+LumaWipe.Type.BarndoorBottomLeft="Bukaan Pintu Bawah Kiri"
+LumaWipe.Type.BarndoorHorizontal="Bukaan Pintu Horizontal"
+LumaWipe.Type.BarndoorTopLeft="Bukaan Pintu Kiri Atas"
+LumaWipe.Type.BarndoorVertical="Bukaan Pintu Vertikal"
+LumaWipe.Type.BlindsHorizontal="Blinds Horizontal"
+LumaWipe.Type.BoxBottomLeft="Kotak Kiri Bawah"
+LumaWipe.Type.BoxBottomRight="Kotak Kanan Bawah"
+LumaWipe.Type.BoxTopLeft="Kotak Kiri Atas"
+LumaWipe.Type.BoxTopRight="Kotak Kanan Atas"
+LumaWipe.Type.Burst="Burst"
+LumaWipe.Type.CheckerboardSmall="Kotak-kotak Kecil"
+LumaWipe.Type.Circles="Lingkaran"
+LumaWipe.Type.Clock="Jam"
+LumaWipe.Type.Cloud="Awan"
+LumaWipe.Type.Curtain="Tirai"
+LumaWipe.Type.Fan="Kipas"
+LumaWipe.Type.Fractal="Fraktal"
+LumaWipe.Type.Iris="Iris Mata"
+LumaWipe.Type.LinearHorizontal="Linear Horizontal"
+LumaWipe.Type.LinearTopLeft="Linear Kiri Atas"
+LumaWipe.Type.LinearTopRight="Linear Kanan Atas"
+LumaWipe.Type.LinearVertical="Linear Vertikal"
+LumaWipe.Type.ParallelZigzagHorizontal="Paralel Zigzag Horizontal"
+LumaWipe.Type.ParallelZigzagVertical="Paralel Zigzag Vertikal"
+LumaWipe.Type.Sinus9="Plasma"
+LumaWipe.Type.Spiral="Spiral"
+LumaWipe.Type.Square="Persegi"
+LumaWipe.Type.Squares="Segi Empat"
+LumaWipe.Type.Stripes="Garis-garis"
+LumaWipe.Type.StripsHorizontal="Garis-garis Horizontal"
+LumaWipe.Type.StripsVertical="Garis-garis Vertikal"
+LumaWipe.Type.Watercolor="Cat Air"
+LumaWipe.Type.ZigzagHorizontal="Zigzag Horizontal"
+LumaWipe.Type.ZigzagVertical="Zigzag Vertikal"
+AudioMonitoring="Monitoring Audio"
+AudioMonitoring.None="Monitor Mati"
+AudioMonitoring.MonitorOnly="Monitor Saja (bisukan output)"
+AudioMonitoring.Both="Monitor dan Output"
+

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/nb-NO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/ru-RU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-transitions/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-transitions/data/locale/uk-UA.ini Changed

@@ -12,13 +12,13 @@
 SwipeIn="В кадр"
 Color="Колір"
 VideoFile="Файл відео"
-TransitionPoint="Точка відео-переходу"
-TransitionPointFrame="Точка відео-переходу (кадр)"
-TransitionPointType="Тип точки відео-переходу"
+TransitionPoint="Точка переходу"
+TransitionPointFrame="Точка переходу (кадр)"
+TransitionPointType="Тип точки переходу"
 TransitionPointTypeFrame="Кадр"
 TransitionPointTypeTime="Час (мілісекунд)"
-AudioFadeStyle="Стиль затухання Аудіо"
-AudioFadeStyle.FadeOutFadeIn="Затухання до точки відео-переходу, потім гучність наростає"
+AudioFadeStyle="Стиль затухання звуку"
+AudioFadeStyle.FadeOutFadeIn="Затухання до точки переходу, потім гучність наростає"
 AudioFadeStyle.CrossFade="Плавний перехід (з початку)"
 SwitchPoint="Точка кольору, відстань"
 LumaWipeTransition="Luma Wipe"
@@ -59,8 +59,8 @@
 LumaWipe.Type.Watercolor="Водні розмиви"
 LumaWipe.Type.ZigzagHorizontal="Зигзаг по горизонталі"
 LumaWipe.Type.ZigzagVertical="Зигзаг по вертикалі"
-AudioMonitoring="Тестування Аудіо (на слух)"
-AudioMonitoring.None="Тест вимкнено"
-AudioMonitoring.MonitorOnly="Слухати, але не Виводити"
-AudioMonitoring.Both="Слухати та Виводити"
+AudioMonitoring="Прослуховування звуку"
+AudioMonitoring.None="Прослуховування вимкнено"
+AudioMonitoring.MonitorOnly="Тільки прослуховування (заглушити вивід)"
+AudioMonitoring.Both="Прослуховування та вивід"

obs-studio-25.0.8.tar.xz/plugins/obs-vst/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/obs-vst/VSTPlugin.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/VSTPlugin.cpp Changed

@@ -115,25 +115,29 @@
 
 obs_audio_data *VSTPlugin::process(struct obs_audio_data *audio)
 {
-
 	if (effect && effectReady) {
-		silenceChannel(outputs, VST_MAX_CHANNELS, audio->frames);
-
-		float *adata[VST_MAX_CHANNELS];
-		for (size_t d = 0; d < VST_MAX_CHANNELS; d++) {
-			if (audio->data[d] != NULL) {
-				adata[d] = (float *)audio->data[d];
-			} else {
-				adata[d] = inputs[d];
-			}
-		};
+		uint passes = (audio->frames + BLOCK_SIZE - 1) / BLOCK_SIZE;
+		uint extra  = audio->frames % BLOCK_SIZE;
+		for (uint pass = 0; pass < passes; pass++) {
+			uint frames = pass == passes - 1 && extra ? extra : BLOCK_SIZE;
+			silenceChannel(outputs, VST_MAX_CHANNELS, BLOCK_SIZE);
+
+			float *adata[VST_MAX_CHANNELS];
+			for (size_t d = 0; d < VST_MAX_CHANNELS; d++) {
+				if (audio->data[d] != nullptr) {
+					adata[d] = ((float *)audio->data[d]) + (pass * BLOCK_SIZE);
+				} else {
+					adata[d] = inputs[d];
+				}
+			};
 
-		effect->processReplacing(effect, adata, outputs, audio->frames);
+			effect->processReplacing(effect, adata, outputs, frames);
 
-		for (size_t c = 0; c < VST_MAX_CHANNELS; c++) {
-			if (audio->data[c]) {
-				for (size_t i = 0; i < audio->frames; i++) {
-					adata[c][i] = outputs[c][i];
+			for (size_t c = 0; c < VST_MAX_CHANNELS; c++) {
+				if (audio->data[c]) {
+					for (size_t i = 0; i < frames; i++) {
+						adata[c][i] = outputs[c][i];
+					}
 				}
 			}
 		}

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/bg-BG.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-vst/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-vst/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/fa-IR.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/gl-ES.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/he-IL.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-vst/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/it-IT.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/pt-PT.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/ro-RO.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/sl-SI.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-vst/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-vst/linux/EditorWidget-linux.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/linux/EditorWidget-linux.cpp Changed

@@ -20,64 +20,17 @@
 
 void EditorWidget::buildEffectContainer(AEffect *effect)
 {
-
-	/* First we open a connection to the X Server. */
-	xcb_connection_t *connection = xcb_connect(NULL, NULL);
-	if (xcb_connection_has_error(connection) >= 1) {
-		blog(LOG_ERROR, "VST: Couldn't connect to XCB.");
-		return;
-	}
-
-	/* Now get the default/first screen. */
-	const xcb_setup_t *   setup  = xcb_get_setup(connection);
-	xcb_screen_iterator_t iter   = xcb_setup_roots_iterator(setup);
-	xcb_screen_t *        screen = iter.data;
-	if (!screen) {
-		blog(LOG_WARNING, "VST: Couldn't setup screen.");
-		return;
-	}
-
-	/* Create the window */
-	xcb_window_t window = xcb_generate_id(connection);
-	xcb_create_window(connection,           /* Connection          */
-	                  XCB_COPY_FROM_PARENT, /* depth (same as root)*/
-	                  window,               /* window Id           */
-	                  screen->root,         /* parent window       */
-	                  0,
-	                  0, /* x, y                */
-	                  150,
-	                  150,                           /* width, height       */
-	                  10,                            /* border_width        */
-	                  XCB_WINDOW_CLASS_INPUT_OUTPUT, /* class               */
-	                  screen->root_visual,           /* visual              */
-	                  0,
-	                  NULL /* masks, not used yet */
-	);
-
-	/* Map the window on the screen */
-	xcb_map_window(connection, window);
-
-	/* Make sure to flush so the Window shows. */
-	xcb_flush(connection);
-
-	/* Now we re-parent the Window to QT so we can better control it. */
-	QWidget *widget = QWidget::createWindowContainer(QWindow::fromWinId(window), this);
-	widget->move(0, 0);
-	widget->resize(300, 300);
-
-	effect->dispatcher(effect, effEditOpen, 0, 0, (void *)window, 0);
-
+	WId id = winId();
+	effect->dispatcher(effect, effEditOpen, 0, 0, (void *)id, 0);
 	VstRect *vstRect = nullptr;
 	effect->dispatcher(effect, effEditGetRect, 0, 0, &vstRect, 0);
 
 	if (vstRect) {
-		widget->resize(vstRect->right - vstRect->left, vstRect->bottom - vstRect->top);
+		setFixedSize(vstRect->right - vstRect->left, vstRect->bottom - vstRect->top);
 	}
 }
 
 void EditorWidget::handleResizeRequest(int width, int height)
 {
-	// We don't have to do anything here as far as I can tell.
-	// The widget will resize the HWIND itself and then
-	// this widget will automatically size depending on that.
+	setFixedSize(width, height);
 }

obs-studio-25.0.8.tar.xz/plugins/obs-vst/obs-vst.cpp -> obs-studio-26.0.0.tar.xz/plugins/obs-vst/obs-vst.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/obs-x264/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/obs-x264/CMakeLists.txt Changed

@@ -4,6 +4,20 @@
 include_directories(${LIBX264_INCLUDE_DIRS})
 add_definitions(${LIBX264_DEFINITIONS})
 
+set(obs-x264-util_HEADERS
+	obs-x264-options.h)
+
+set(obs-x264-util_SOURCES
+	obs-x264-options.c)
+
+add_library(obs-x264-util STATIC
+	${obs-x264-util_HEADERS}
+	${obs-x264-util_SOURCES})
+target_link_libraries(obs-x264-util PRIVATE libobs)
+set_target_properties(obs-x264-util PROPERTIES
+	FOLDER "plugins"
+	POSITION_INDEPENDENT_CODE ON)
+
 set(obs-x264_SOURCES
 	obs-x264.c
 	obs-x264-plugin-main.c)
@@ -16,9 +30,17 @@
 endif()
 
 add_library(obs-x264 MODULE
+	${obs-x264_HEADERS}
 	${obs-x264_SOURCES})
 target_link_libraries(obs-x264
 	libobs
+	obs-x264-util
 	${LIBX264_LIBRARIES})
+set_target_properties(obs-x264 PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-x264 data)
+
+add_executable(obs-x264-test obs-x264-test.c)
+set_target_properties(obs-x264-test PROPERTIES FOLDER "plugins")
+target_link_libraries(obs-x264-test PRIVATE libobs obs-x264-util)
+add_test(NAME obs-x264-test COMMAND obs-x264-test)

obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-x264/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-x264/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/ro-RO.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/obs-x264/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/th-TH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/obs-x264/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/obs-x264/data/locale/uk-UA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/obs-x264/obs-x264-options.c Added

@@ -0,0 +1,72 @@
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <util/bmem.h>
+#include <util/dstr.h>
+#include "obs-x264-options.h"
+
+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;
+}
+
+struct obs_x264_options obs_x264_parse_options(const char *options_string)
+{
+	char **input_words = strlist_split(options_string, ' ', false);
+	if (!input_words) {
+		return (struct obs_x264_options){
+			.count = 0,
+			.options = NULL,
+			.ignored_word_count = 0,
+			.ignored_words = NULL,
+			.input_words = NULL,
+		};
+	}
+	size_t input_option_count = 0;
+	for (char **input_word = input_words; *input_word; ++input_word)
+		input_option_count += 1;
+	char **ignored_words =
+		bmalloc(input_option_count * sizeof(*ignored_words));
+	char **ignored_word = ignored_words;
+	struct obs_x264_option *out_options =
+		bmalloc(input_option_count * sizeof(*out_options));
+	struct obs_x264_option *out_option = out_options;
+	for (char **input_word = input_words; *input_word; ++input_word) {
+		if (getparam(*input_word, &out_option->name,
+			     (const char **)&out_option->value)) {
+			++out_option;
+		} else {
+			*ignored_word = *input_word;
+			++ignored_word;
+		}
+	}
+	return (struct obs_x264_options){
+		.count = out_option - out_options,
+		.options = out_options,
+		.ignored_word_count = ignored_word - ignored_words,
+		.ignored_words = ignored_words,
+		.input_words = input_words,
+	};
+}
+
+void obs_x264_free_options(struct obs_x264_options options)
+{
+	for (size_t i = 0; i < options.count; ++i) {
+		bfree(options.options[i].name);
+	}
+	bfree(options.options);
+	bfree(options.ignored_words);
+	strlist_free(options.input_words);
+}

obs-studio-26.0.0.tar.xz/plugins/obs-x264/obs-x264-options.h Added

obs-studio-26.0.0.tar.xz/plugins/obs-x264/obs-x264-test.c Added

@@ -0,0 +1,74 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "obs-x264-options.h"
+
+#define CHECK(condition)                                                    \
+	do {                                                                \
+		if (!(condition)) {                                         \
+			fprintf(stderr, "%s:%d: error: check failed: %s\n", \
+				__FILE__, __LINE__, #condition);            \
+			exit(1);                                            \
+		}                                                           \
+	} while (0)
+
+static void test_obs_x264_parse_options()
+{
+	struct obs_x264_options options;
+
+	options = obs_x264_parse_options(NULL);
+	CHECK(options.count == 0);
+	CHECK(options.ignored_word_count == 0);
+	obs_x264_free_options(options);
+
+	options = obs_x264_parse_options("");
+	CHECK(options.count == 0);
+	CHECK(options.ignored_word_count == 0);
+	obs_x264_free_options(options);
+
+	options = obs_x264_parse_options("ref=3");
+	CHECK(options.count == 1);
+	CHECK(strcmp(options.options[0].name, "ref") == 0);
+	CHECK(strcmp(options.options[0].value, "3") == 0);
+	CHECK(options.ignored_word_count == 0);
+	obs_x264_free_options(options);
+
+	options = obs_x264_parse_options("ref=3 bframes=8");
+	CHECK(options.count == 2);
+	CHECK(strcmp(options.options[0].name, "ref") == 0);
+	CHECK(strcmp(options.options[0].value, "3") == 0);
+	CHECK(strcmp(options.options[1].name, "bframes") == 0);
+	CHECK(strcmp(options.options[1].value, "8") == 0);
+	CHECK(options.ignored_word_count == 0);
+	obs_x264_free_options(options);
+
+	// Invalid options are ignored.
+	options = obs_x264_parse_options(
+		"ref=3 option_with_no_equal_sign bframes=8 1234");
+	CHECK(options.count == 2);
+	CHECK(strcmp(options.options[0].name, "ref") == 0);
+	CHECK(strcmp(options.options[0].value, "3") == 0);
+	CHECK(strcmp(options.options[1].name, "bframes") == 0);
+	CHECK(strcmp(options.options[1].value, "8") == 0);
+	CHECK(options.ignored_word_count == 2);
+	CHECK(strcmp(options.ignored_words[0], "option_with_no_equal_sign") ==
+	      0);
+	CHECK(strcmp(options.ignored_words[1], "1234") == 0);
+	obs_x264_free_options(options);
+
+	// Extra whitespace is ignored between and around options.
+	options = obs_x264_parse_options("  ref=3   bframes=8  ");
+	CHECK(options.count == 2);
+	CHECK(strcmp(options.options[0].name, "ref") == 0);
+	CHECK(strcmp(options.options[0].value, "3") == 0);
+	CHECK(strcmp(options.options[1].name, "bframes") == 0);
+	CHECK(strcmp(options.options[1].value, "8") == 0);
+	CHECK(options.ignored_word_count == 0);
+	obs_x264_free_options(options);
+}
+
+int main()
+{
+	test_obs_x264_parse_options();
+	return 0;
+}

obs-studio-25.0.8.tar.xz/plugins/obs-x264/obs-x264.c -> obs-studio-26.0.0.tar.xz/plugins/obs-x264/obs-x264.c Changed

@@ -16,10 +16,13 @@
 ******************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
+#include <util/bmem.h>
 #include <util/dstr.h>
 #include <util/darray.h>
 #include <util/platform.h>
 #include <obs-module.h>
+#include "obs-x264-options.h"
 
 #ifndef _STDINT_H_INCLUDED
 #define _STDINT_H_INCLUDED
@@ -255,72 +258,63 @@
 	return NULL;
 }
 
-static void override_base_param(struct obs_x264 *obsx264, const char *param,
-				char **preset, char **profile, char **tune)
+static void override_base_param(struct obs_x264 *obsx264,
+				struct obs_x264_option option, char **preset,
+				char **profile, char **tune)
 {
-	char *name;
-	const char *val;
-
-	if (getparam(param, &name, &val)) {
-		if (astrcmpi(name, "preset") == 0) {
-			const char *valid_name = validate(
-				obsx264, val, "preset", x264_preset_names);
-			if (valid_name) {
-				bfree(*preset);
-				*preset = bstrdup(val);
-			}
-
-		} else if (astrcmpi(name, "profile") == 0) {
-			const char *valid_name = validate(
-				obsx264, val, "profile", x264_profile_names);
-			if (valid_name) {
-				bfree(*profile);
-				*profile = bstrdup(val);
-			}
-
-		} else if (astrcmpi(name, "tune") == 0) {
-			const char *valid_name =
-				validate(obsx264, val, "tune", x264_tune_names);
-			if (valid_name) {
-				bfree(*tune);
-				*tune = bstrdup(val);
-			}
+	const char *name = option.name;
+	const char *val = option.value;
+	if (astrcmpi(name, "preset") == 0) {
+		const char *valid_name =
+			validate(obsx264, val, "preset", x264_preset_names);
+		if (valid_name) {
+			bfree(*preset);
+			*preset = bstrdup(val);
 		}
 
-		bfree(name);
+	} else if (astrcmpi(name, "profile") == 0) {
+		const char *valid_name =
+			validate(obsx264, val, "profile", x264_profile_names);
+		if (valid_name) {
+			bfree(*profile);
+			*profile = bstrdup(val);
+		}
+
+	} else if (astrcmpi(name, "tune") == 0) {
+		const char *valid_name =
+			validate(obsx264, val, "tune", x264_tune_names);
+		if (valid_name) {
+			bfree(*tune);
+			*tune = bstrdup(val);
+		}
 	}
 }
 
-static inline void override_base_params(struct obs_x264 *obsx264, char **params,
+static inline void override_base_params(struct obs_x264 *obsx264,
+					const struct obs_x264_options *options,
 					char **preset, char **profile,
 					char **tune)
 {
-	while (*params)
-		override_base_param(obsx264, *(params++), preset, profile,
-				    tune);
+	for (size_t i = 0; i < options->count; ++i)
+		override_base_param(obsx264, options->options[i], preset,
+				    profile, tune);
 }
 
 #define OPENCL_ALIAS "opencl_is_experimental_and_potentially_unstable"
 
-static inline void set_param(struct obs_x264 *obsx264, const char *param)
+static inline void set_param(struct obs_x264 *obsx264,
+			     struct obs_x264_option option)
 {
-	char *name;
-	const char *val;
-
-	if (getparam(param, &name, &val)) {
-		if (strcmp(name, "preset") != 0 &&
-		    strcmp(name, "profile") != 0 && strcmp(name, "tune") != 0 &&
-		    strcmp(name, "fps") != 0 &&
-		    strcmp(name, "force-cfr") != 0 &&
-		    strcmp(name, "width") != 0 && strcmp(name, "height") != 0 &&
-		    strcmp(name, "opencl") != 0) {
-			if (strcmp(name, OPENCL_ALIAS) == 0)
-				strcpy(name, "opencl");
-			if (x264_param_parse(&obsx264->params, name, val) != 0)
-				warn("x264 param: %s failed", param);
-		}
-
-		bfree(name);
+	const char *name = option.name;
+	const char *val = option.value;
+	if (strcmp(name, "preset") != 0 && strcmp(name, "profile") != 0 &&
+	    strcmp(name, "tune") != 0 && strcmp(name, "fps") != 0 &&
+	    strcmp(name, "force-cfr") != 0 && strcmp(name, "width") != 0 &&
+	    strcmp(name, "height") != 0 && strcmp(name, "opencl") != 0) {
+		if (strcmp(option.name, OPENCL_ALIAS) == 0)
+			name = "opencl";
+		if (x264_param_parse(&obsx264->params, name, val) != 0)
+			warn("x264 param: %s=%s failed", name, val);
 	}
 }
 
@@ -362,23 +356,9 @@
 	UNUSED_PARAMETER(level);
 }
 
-static inline const char *get_x264_colorspace_name(enum video_colorspace cs)
-{
-	switch (cs) {
-	case VIDEO_CS_DEFAULT:
-	case VIDEO_CS_601:
-	case VIDEO_CS_SRGB:
-		return "undef";
-	case VIDEO_CS_709:;
-	}
-
-	return "bt709";
-}
-
-static inline int get_x264_cs_val(enum video_colorspace cs,
+static inline int get_x264_cs_val(const char *const name,
 				  const char *const names[])
 {
-	const char *name = get_x264_colorspace_name(cs);
 	int idx = 0;
 	do {
 		if (strcmp(names[idx], name) == 0)
@@ -398,7 +378,7 @@
 };
 
 static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
-			  char **params, bool update)
+			  const struct obs_x264_options *options, bool update)
 {
 	video_t *video = obs_encoder_video(obsx264->encoder);
 	const struct video_output_info *voi = video_output_get_info(video);
@@ -481,13 +461,38 @@
 	if (obs_data_has_user_value(settings, "bf"))
 		obsx264->params.i_bframe = bf;
 
+	static const char *const smpte170m = "smpte170m";
+	static const char *const bt709 = "bt709";
+	static const char *const iec61966_2_1 = "iec61966-2-1";
+	const char *colorprim = NULL;
+	const char *transfer = NULL;
+	const char *colmatrix = NULL;
+	switch (info.colorspace) {
+	case VIDEO_CS_601:
+		colorprim = smpte170m;
+		transfer = smpte170m;
+		colmatrix = smpte170m;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		colorprim = bt709;
+		transfer = bt709;
+		colmatrix = bt709;
+		break;
+	case VIDEO_CS_SRGB:
+		colorprim = bt709;
+		transfer = iec61966_2_1;
+		colmatrix = bt709;
+		break;
+	}
+
+	obsx264->params.vui.b_fullrange = info.range == VIDEO_RANGE_FULL;
+	obsx264->params.vui.i_colorprim =
+		get_x264_cs_val(colorprim, x264_colorprim_names);
 	obsx264->params.vui.i_transfer =
-		get_x264_cs_val(info.colorspace, x264_transfer_names);
+		get_x264_cs_val(transfer, x264_transfer_names);
 	obsx264->params.vui.i_colmatrix =
-		get_x264_cs_val(info.colorspace, x264_colmatrix_names);
-	obsx264->params.vui.i_colorprim =
-		get_x264_cs_val(info.colorspace, x264_colorprim_names);
-	obsx264->params.vui.b_fullrange = info.range == VIDEO_RANGE_FULL;
+		get_x264_cs_val(colmatrix, x264_colmatrix_names);
 
 	/* use the new filler method for CBR to allow real-time adjusting of
 	 * the bitrate */
@@ -516,8 +521,11 @@
 	else
 		obsx264->params.i_csp = X264_CSP_NV12;
 
-	while (*params)
-		set_param(obsx264, *(params++));
+	for (size_t i = 0; i < options->ignored_word_count; ++i)
+		warn("ignoring invalid x264 option: %s",
+		     options->ignored_words[i]);
+	for (size_t i = 0; i < options->count; ++i)
+		set_param(obsx264, options->options[i]);
 
 	if (!update) {
 		info("settings:\n"
@@ -537,24 +545,52 @@
 	}
 }
 
+static void log_custom_options(struct obs_x264 *obsx264,
+			       const struct obs_x264_options *options)
+{
+	if (options->count == 0) {
+		return;
+	}
+	size_t settings_string_length = 0;
+	for (size_t i = 0; i < options->count; ++i)
+		settings_string_length += strlen(options->options[i].name) +
+					  strlen(options->options[i].value) + 5;
+	size_t buffer_size = settings_string_length + 1;
+	char *settings_string = bmalloc(settings_string_length + 1);
+	char *p = settings_string;
+	size_t remaining_buffer_size = buffer_size;
+	for (size_t i = 0; i < options->count; ++i) {
+		int chars_written = snprintf(p, remaining_buffer_size,
+					     "\n\t%s = %s",
+					     options->options[i].name,
+					     options->options[i].value);
+		assert(chars_written >= 0);
+		assert((size_t)chars_written <= remaining_buffer_size);
+		p += chars_written;
+		remaining_buffer_size -= chars_written;
+	}
+	assert(remaining_buffer_size == 1);
+	assert(*p == '\0');
+	info("custom settings: %s", settings_string);
+	bfree(settings_string);
+}
+
 static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings,
 			    bool update)
 {
 	char *preset = bstrdup(obs_data_get_string(settings, "preset"));
 	char *profile = bstrdup(obs_data_get_string(settings, "profile"));
 	char *tune = bstrdup(obs_data_get_string(settings, "tune"));
-	const char *opts = obs_data_get_string(settings, "x264opts");
+	struct obs_x264_options options = obs_x264_parse_options(
+		obs_data_get_string(settings, "x264opts"));
 
-	char **paramlist;
 	bool success = true;
 
-	paramlist = strlist_split(opts, ' ', false);
-
 	if (!update)
 		blog(LOG_INFO, "---------------------------------");
 
 	if (!obsx264->context) {
-		override_base_params(obsx264, paramlist, &preset, &profile,
+		override_base_params(obsx264, &options, &preset, &profile,
 				     &tune);
 
 		if (preset && *preset)
@@ -568,9 +604,10 @@
 	}
 
 	if (success) {
-		update_params(obsx264, settings, paramlist, update);
-		if (opts && *opts && !update)
-			info("custom settings: %s", opts);
+		update_params(obsx264, settings, &options, update);
+		if (!update) {
+			log_custom_options(obsx264, &options);
+		}
 
 		if (!obsx264->context)
 			apply_x264_profile(obsx264, profile);
@@ -578,7 +615,7 @@
 
 	obsx264->params.b_repeat_headers = false;
 
-	strlist_free(paramlist);
+	obs_x264_free_options(options);
 	bfree(preset);
 	bfree(profile);
 	bfree(tune);

obs-studio-26.0.0.tar.xz/plugins/oss-audio Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/CMakeLists.txt Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ca-ES.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/cs-CZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/da-DK.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/de-DE.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/en-GB.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/en-US.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/es-ES.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/fi-FI.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/fil-PH.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/fr-FR.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/gl-ES.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/he-IL.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/hu-HU.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/it-IT.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ja-JP.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ka-GE.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ko-KR.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/nb-NO.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/nl-NL.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/pl-PL.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/pt-BR.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ro-RO.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ru-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/sk-SK.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/sl-SI.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/sv-SE.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/ta-IN.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/tr-TR.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/uk-UA.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/vi-VN.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/zh-CN.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/data/locale/zh-TW.ini Added

obs-studio-26.0.0.tar.xz/plugins/oss-audio/oss-audio.c Added

@@ -0,0 +1,33 @@
+/*
+Copyright (C) 2020. Ka Ho Ng <khng300@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 <http://www.gnu.org/licenses/>.
+*/
+#include <obs-module.h>
+
+OBS_DECLARE_MODULE()
+OBS_MODULE_USE_DEFAULT_LOCALE("oss-audio", "en-US")
+
+MODULE_EXPORT const char *obs_module_description(void)
+{
+	return "OSS audio input capture";
+}
+
+extern struct obs_source_info oss_input_capture;
+
+bool obs_module_load(void)
+{
+	obs_register_source(&oss_input_capture);
+	return true;
+}

obs-studio-26.0.0.tar.xz/plugins/oss-audio/oss-input.c Added

@@ -0,0 +1,734 @@
+/*
+Copyright (C) 2020. Ka Ho Ng <khng300@gmail.com>
+Copyright (C) 2020. Ed Maste <emaste@freebsd.org>
+
+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 <util/bmem.h>
+#include <util/platform.h>
+#include <util/threading.h>
+#include <obs-module.h>
+
+#include <ctype.h>
+#include <poll.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include "oss-platform.h"
+
+#define blog(level, msg, ...) blog(level, "oss-audio: " msg, ##__VA_ARGS__)
+
+#define NSEC_PER_SEC 1000000000ULL
+
+#define OSS_MAX_CHANNELS 8
+
+#define OSS_DSP_DEFAULT "/dev/dsp"
+#define OSS_SNDSTAT_PATH "/dev/sndstat"
+#define OSS_RATE_DEFAULT 48000
+#define OSS_CHANNELS_DEFAULT 2
+
+#define OSS_DEVICE_BEGIN "Installed devices:"
+#define OSS_USERDEVICE_BEGIN "Installed devices from userspace:"
+#define OSS_FV_BEGIN "File Versions:"
+
+/**
+ * Control block of plugin instance
+ */
+struct oss_input_data {
+	obs_source_t *source;
+
+	char *device;
+	int channels;
+	int rate;
+	int sample_fmt;
+
+	pthread_t reader_thr;
+	int notify_pipe[2];
+
+	int dsp_fd;
+	void *dsp_buf;
+	size_t dsp_fragsize;
+};
+#define OBS_PROPS_DSP "dsp"
+#define OBS_PROPS_CUSTOM_DSP "custom_dsp"
+#define OBS_PATH_DSP_CUSTOM "/"
+#define OBS_PROPS_CHANNELS "channels"
+#define OBS_PROPS_RATE "rate"
+#define OBS_PROPS_SAMPLE_FMT "sample_fmt"
+
+/**
+ * Common sampling rate table
+ */
+struct rate_option {
+	int rate;
+	char *desc;
+} rate_table[] = {
+	{8000, "8000 Hz"},     {11025, "11025 Hz"}, {16000, "16000 Hz"},
+	{22050, "22050 Hz"},   {32000, "32000 Hz"}, {44100, "44100 Hz"},
+	{48000, "48000 Hz"},   {96000, "96000 Hz"}, {192000, "192000 Hz"},
+	{384000, "384000 Hz"},
+};
+
+static unsigned int oss_sample_size(unsigned int sample_fmt)
+{
+	switch (sample_fmt) {
+	case AFMT_U8:
+	case AFMT_S8:
+		return 8;
+	case AFMT_S16_LE:
+	case AFMT_S16_BE:
+	case AFMT_U16_LE:
+	case AFMT_U16_BE:
+		return 16;
+	case AFMT_S32_LE:
+	case AFMT_S32_BE:
+	case AFMT_U32_LE:
+	case AFMT_U32_BE:
+	case AFMT_S24_LE:
+	case AFMT_S24_BE:
+	case AFMT_U24_LE:
+	case AFMT_U24_BE:
+		return 32;
+	}
+	return 0;
+}
+
+static size_t oss_calc_framesize(unsigned int channels, unsigned int sample_fmt)
+{
+	return oss_sample_size(sample_fmt) * channels / 8;
+}
+
+static enum audio_format oss_fmt_to_obs_audio_format(int fmt)
+{
+	switch (fmt) {
+	case AFMT_U8:
+		return AUDIO_FORMAT_U8BIT;
+	case AFMT_S16_LE:
+		return AUDIO_FORMAT_16BIT;
+	case AFMT_S32_LE:
+		return AUDIO_FORMAT_32BIT;
+	}
+
+	return AUDIO_FORMAT_UNKNOWN;
+}
+
+static enum speaker_layout oss_channels_to_obs_speakers(unsigned int channels)
+{
+	switch (channels) {
+	case 1:
+		return SPEAKERS_MONO;
+	case 2:
+		return SPEAKERS_STEREO;
+	case 3:
+		return SPEAKERS_2POINT1;
+	case 4:
+		return SPEAKERS_4POINT0;
+	case 5:
+		return SPEAKERS_4POINT1;
+	case 6:
+		return SPEAKERS_5POINT1;
+	case 8:
+		return SPEAKERS_7POINT1;
+	}
+
+	return SPEAKERS_UNKNOWN;
+}
+
+static int oss_setup_device(struct oss_input_data *handle)
+{
+	size_t dsp_fragsize;
+	void *dsp_buf = NULL;
+	int fd = -1, err;
+	audio_buf_info bi;
+
+	fd = open(handle->device, O_RDONLY);
+	if (fd < 0) {
+		blog(LOG_ERROR, "Failed to open device '%s'.", handle->device);
+		return -1;
+	}
+	int val = handle->channels;
+	err = ioctl(fd, SNDCTL_DSP_CHANNELS, &val);
+	if (err) {
+		blog(LOG_ERROR, "Failed to set number of channels on DSP '%s'.",
+		     handle->device);
+		goto failed_state;
+	}
+	val = handle->sample_fmt;
+	err = ioctl(fd, SNDCTL_DSP_SETFMT, &val);
+	if (err) {
+		blog(LOG_ERROR, "Failed to set format on DSP '%s'.",
+		     handle->device);
+		goto failed_state;
+	}
+	val = handle->rate;
+	err = ioctl(fd, SNDCTL_DSP_SPEED, &val);
+	if (err) {
+		blog(LOG_ERROR, "Failed to set sample rate on DSP '%s'.",
+		     handle->device);
+		goto failed_state;
+	}
+	err = ioctl(fd, SNDCTL_DSP_GETISPACE, &bi);
+	if (err) {
+		blog(LOG_ERROR, "Failed to get fragment size on DSP '%s'.",
+		     handle->device);
+		goto failed_state;
+	}
+
+	dsp_fragsize = bi.fragsize;
+	dsp_buf = bmalloc(dsp_fragsize);
+	if (dsp_buf == NULL)
+		goto failed_state;
+
+	handle->dsp_buf = dsp_buf;
+	handle->dsp_fragsize = dsp_fragsize;
+	handle->dsp_fd = fd;
+	return 0;
+
+failed_state:
+	if (fd != -1)
+		close(fd);
+	bfree(dsp_buf);
+	return -1;
+}
+
+static void oss_close_device(struct oss_input_data *handle)
+{
+	if (handle->dsp_fd != -1)
+		close(handle->dsp_fd);
+	bfree(handle->dsp_buf);
+	handle->dsp_fd = -1;
+	handle->dsp_buf = NULL;
+	handle->dsp_fragsize = 0;
+}
+
+static void *oss_reader_thr(void *vptr)
+{
+	struct oss_input_data *handle = vptr;
+	struct pollfd fds[2] = {0};
+	size_t framesize;
+
+	framesize = oss_calc_framesize(handle->channels, handle->sample_fmt);
+
+	fds[0].fd = handle->dsp_fd;
+	fds[0].events = POLLIN;
+	fds[1].fd = handle->notify_pipe[0];
+	fds[1].events = POLLIN;
+
+	assert(handle->dsp_buf);
+
+	while (poll(fds, 2, INFTIM) >= 0) {
+		if (fds[0].revents & POLLIN) {
+			/*
+			 * Incoming audio frames
+			 */
+
+			struct obs_source_audio out;
+			ssize_t nbytes;
+
+			do {
+				nbytes = read(handle->dsp_fd, handle->dsp_buf,
+					      handle->dsp_fragsize);
+			} while (nbytes < 0 && errno == EINTR);
+
+			if (nbytes < 0) {
+				blog(LOG_ERROR,
+				     "%s: Failed to read buffer on DSP '%s'. Errno %d",
+				     __func__, handle->device, errno);
+				break;
+			} else if (!nbytes) {
+				blog(LOG_ERROR,
+				     "%s: Unexpected EOF on DSP '%s'.",
+				     __func__, handle->device);
+				break;
+			}
+
+			out.data[0] = handle->dsp_buf;
+			out.format =
+				oss_fmt_to_obs_audio_format(handle->sample_fmt);
+			out.speakers =
+				oss_channels_to_obs_speakers(handle->channels);
+			out.samples_per_sec = handle->rate;
+			out.frames = nbytes / framesize;
+			out.timestamp = os_gettime_ns() -
+					util_mul_div64(out.frames, NSEC_PER_SEC,
+						       handle->rate);
+			obs_source_output_audio(handle->source, &out);
+		}
+		if (fds[1].revents & POLLIN) {
+			char buf;
+			ssize_t nbytes;
+
+			do {
+				nbytes = read(handle->notify_pipe[0], &buf, 1);
+				assert(nbytes != 0);
+			} while (nbytes < 0 && errno == EINTR);
+
+			break;
+		}
+	}
+
+	return NULL;
+}
+
+static int oss_start_reader(struct oss_input_data *handle)
+{
+	int pfd[2];
+	int err;
+	pthread_t thr;
+
+	err = pipe(pfd);
+	if (err)
+		return -1;
+
+	err = pthread_create(&thr, NULL, oss_reader_thr, handle);
+	if (err) {
+		close(pfd[0]);
+		close(pfd[1]);
+		return -1;
+	}
+
+	handle->notify_pipe[0] = pfd[0];
+	handle->notify_pipe[1] = pfd[1];
+	handle->reader_thr = thr;
+	return 0;
+}
+
+static void oss_stop_reader(struct oss_input_data *handle)
+{
+	if (handle->reader_thr) {
+		char buf = 0x0;
+
+		write(handle->notify_pipe[1], &buf, 1);
+		pthread_join(handle->reader_thr, NULL);
+	}
+	if (handle->notify_pipe[0] != -1) {
+		close(handle->notify_pipe[0]);
+		close(handle->notify_pipe[1]);
+	}
+	handle->notify_pipe[0] = -1;
+	handle->notify_pipe[1] = -1;
+	handle->reader_thr = NULL;
+}
+
+/**
+ * Returns the name of the plugin
+ */
+static const char *oss_getname(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+	return obs_module_text("OSSInput");
+}
+
+/**
+ * Create the plugin object
+ */
+static void *oss_create(obs_data_t *settings, obs_source_t *source)
+{
+	const char *dsp;
+	const char *custom_dsp;
+	struct oss_input_data *handle;
+
+	dsp = obs_data_get_string(settings, OBS_PROPS_DSP);
+	custom_dsp = obs_data_get_string(settings, OBS_PROPS_CUSTOM_DSP);
+	handle = bmalloc(sizeof(struct oss_input_data));
+	if (handle == NULL)
+		return NULL;
+
+	handle->source = source;
+	handle->device = NULL;
+	handle->channels = 0;
+	handle->rate = 0;
+	handle->sample_fmt = 0;
+
+	handle->dsp_buf = NULL;
+	handle->dsp_fragsize = 0;
+	handle->dsp_fd = -1;
+
+	handle->notify_pipe[0] = -1;
+	handle->notify_pipe[1] = -1;
+	handle->reader_thr = NULL;
+
+	if (dsp == NULL)
+		return handle;
+	if (!strcmp(dsp, OBS_PATH_DSP_CUSTOM)) {
+		if (custom_dsp == NULL)
+			return handle;
+
+		handle->device = bstrdup(custom_dsp);
+	} else
+		handle->device = bstrdup(dsp);
+	if (handle->device == NULL)
+		goto failed_state;
+
+	handle->channels = obs_data_get_int(settings, OBS_PROPS_CHANNELS);
+	handle->rate = obs_data_get_int(settings, OBS_PROPS_RATE);
+	handle->sample_fmt = obs_data_get_int(settings, OBS_PROPS_SAMPLE_FMT);
+
+	int err = oss_setup_device(handle);
+	if (err)
+		goto failed_state;
+	err = oss_start_reader(handle);
+	if (err) {
+		oss_close_device(handle);
+		goto failed_state;
+	}
+
+	return handle;
+
+failed_state:
+	bfree(handle);
+	return NULL;
+}
+
+/**
+ * Destroy the plugin object and free all memory
+ */
+static void oss_destroy(void *vptr)
+{
+	struct oss_input_data *handle = vptr;
+
+	oss_stop_reader(handle);
+	oss_close_device(handle);
+	bfree(handle->device);
+	bfree(handle);
+}
+
+/**
+ * Update the input settings
+ */
+static void oss_update(void *vptr, obs_data_t *settings)
+{
+	struct oss_input_data *handle = vptr;
+
+	oss_stop_reader(handle);
+	oss_close_device(handle);
+
+	const char *dsp = obs_data_get_string(settings, OBS_PROPS_DSP);
+	const char *custom_dsp =
+		obs_data_get_string(settings, OBS_PROPS_CUSTOM_DSP);
+	if (dsp == NULL) {
+		bfree(handle->device);
+		handle->device = NULL;
+		return;
+	}
+
+	bfree(handle->device);
+	handle->device = NULL;
+	if (!strcmp(dsp, OBS_PATH_DSP_CUSTOM)) {
+		if (custom_dsp == NULL)
+			return;
+		handle->device = bstrdup(custom_dsp);
+	} else
+		handle->device = bstrdup(dsp);
+	if (handle->device == NULL)
+		return;
+
+	handle->channels = obs_data_get_int(settings, OBS_PROPS_CHANNELS);
+	handle->rate = obs_data_get_int(settings, OBS_PROPS_RATE);
+	handle->sample_fmt = obs_data_get_int(settings, OBS_PROPS_SAMPLE_FMT);
+
+	int err = oss_setup_device(handle);
+	if (err) {
+		goto failed_state;
+		return;
+	}
+	err = oss_start_reader(handle);
+	if (err) {
+		oss_close_device(handle);
+		goto failed_state;
+	}
+
+	return;
+
+failed_state:
+	bfree(handle->device);
+	handle->device = NULL;
+}
+
+/**
+ * Add audio devices to property
+ */
+static void oss_prop_add_devices(obs_property_t *p)
+{
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+	char *line = NULL;
+	size_t linecap = 0;
+	FILE *fp;
+	bool ud_matching = false;
+	bool skipall = false;
+
+	fp = fopen(OSS_SNDSTAT_PATH, "r");
+	if (fp == NULL) {
+		blog(LOG_ERROR, "Failed to open sndstat at '%s'.",
+		     OSS_SNDSTAT_PATH);
+		return;
+	}
+
+	while (getline(&line, &linecap, fp) > 0) {
+		int pcm;
+		char *ptr, *pdesc, *pmode;
+		char *descr = NULL, *devname = NULL;
+		char *udname = NULL;
+
+		if (!strncmp(line, OSS_FV_BEGIN, strlen(OSS_FV_BEGIN))) {
+			skipall = true;
+			continue;
+		}
+		if (!strncmp(line, OSS_DEVICE_BEGIN,
+			     strlen(OSS_DEVICE_BEGIN))) {
+			ud_matching = false;
+			skipall = false;
+			continue;
+		}
+		if (!strncmp(line, OSS_USERDEVICE_BEGIN,
+			     strlen(OSS_USERDEVICE_BEGIN))) {
+			ud_matching = true;
+			skipall = false;
+			continue;
+		}
+		if (skipall || isblank(line[0]))
+			continue;
+
+		if (!ud_matching) {
+			if (sscanf(line, "pcm%i: ", &pcm) != 1)
+				continue;
+		} else {
+			char *end = strchr(line, ':');
+			if (end == NULL || end - line == 0)
+				continue;
+
+			udname = strndup(line, end - line);
+			if (udname == NULL)
+				continue;
+		}
+		if ((ptr = strchr(line, '<')) == NULL)
+			goto free_all_str;
+		pdesc = ptr + 1;
+		if ((ptr = strrchr(pdesc, '>')) == NULL)
+			goto free_all_str;
+		*ptr++ = '\0';
+		if ((pmode = strchr(ptr, '(')) == NULL)
+			goto free_all_str;
+		pmode++;
+		if ((ptr = strrchr(pmode, ')')) == NULL)
+			goto free_all_str;
+		*ptr++ = '\0';
+		if (!isdigit(pmode[0])) {
+			if (strcmp(pmode, "rec") != 0 &&
+			    strcmp(pmode, "play/rec") != 0)
+				goto free_all_str;
+		} else {
+			int npcs, nrcs;
+			if (sscanf(pmode, "%dp:%*dv/%dr:%*dv", &npcs, &nrcs) !=
+			    2)
+				goto free_all_str;
+			if (nrcs < 1)
+				goto free_all_str;
+		}
+		if (!ud_matching) {
+			if (asprintf(&descr, "pcm%i: %s", pcm, pdesc) == -1)
+				goto free_all_str;
+			if (asprintf(&devname, "/dev/dsp%i", pcm) == -1)
+				goto free_all_str;
+		} else {
+			if (asprintf(&descr, "%s: %s", udname, pdesc) == -1)
+				goto free_all_str;
+			if (asprintf(&devname, "/dev/%s", udname) == -1)
+				goto free_all_str;
+		}
+
+		obs_property_list_add_string(p, descr, devname);
+
+	free_all_str:
+		free(descr);
+		free(devname);
+		free(udname);
+	}
+	free(line);
+
+	fclose(fp);
+#endif /* defined(__FreeBSD__) || defined(__DragonFly__) */
+}
+
+/**
+ * Get plugin defaults
+ */
+static void oss_defaults(obs_data_t *settings)
+{
+	obs_data_set_default_int(settings, OBS_PROPS_CHANNELS,
+				 OSS_CHANNELS_DEFAULT);
+	obs_data_set_default_int(settings, OBS_PROPS_RATE, OSS_RATE_DEFAULT);
+	obs_data_set_default_int(settings, OBS_PROPS_SAMPLE_FMT, AFMT_S16_LE);
+	obs_data_set_default_string(settings, OBS_PROPS_DSP, OSS_DSP_DEFAULT);
+}
+
+/**
+ * Get plugin properties:
+ *
+ * Fetch the engine information of the corresponding DSP
+ */
+static bool oss_fill_device_info(obs_property_t *rate, obs_property_t *channels,
+				 const char *device)
+{
+	oss_audioinfo ai;
+	int fd = -1;
+	int err;
+
+	obs_property_list_clear(rate);
+	obs_property_list_clear(channels);
+
+	if (!strcmp(device, OBS_PATH_DSP_CUSTOM))
+		goto cleanup;
+
+	fd = open(device, O_RDONLY);
+	if (fd < 0) {
+		blog(LOG_ERROR, "Failed to open device '%s'.", device);
+		goto cleanup;
+	}
+
+	ai.dev = -1;
+	err = ioctl(fd, SNDCTL_ENGINEINFO, &ai);
+	if (err) {
+		blog(LOG_ERROR,
+		     "Failed to issue ioctl(SNDCTL_ENGINEINFO) on device '%s'. Errno: %d",
+		     device, errno);
+		goto cleanup;
+	}
+
+	for (int i = ai.min_channels;
+	     i <= ai.max_channels && i <= OSS_MAX_CHANNELS; i++) {
+		enum speaker_layout layout = oss_channels_to_obs_speakers(i);
+
+		if (layout != SPEAKERS_UNKNOWN) {
+			char name[] = "xxx";
+			snprintf(name, sizeof(name), "%d", i);
+			obs_property_list_add_int(channels, name, i);
+		}
+	}
+
+	for (size_t i = 0; i < sizeof(rate_table) / sizeof(rate_table[0]);
+	     i++) {
+		if (ai.min_rate <= rate_table[i].rate &&
+		    ai.max_rate >= rate_table[i].rate)
+			obs_property_list_add_int(rate, rate_table[i].desc,
+						  rate_table[i].rate);
+	}
+
+cleanup:
+	if (!obs_property_list_item_count(rate))
+		obs_property_list_add_int(rate, "48000 Hz", OSS_RATE_DEFAULT);
+	if (!obs_property_list_item_count(channels))
+		obs_property_list_add_int(channels, "2", OSS_CHANNELS_DEFAULT);
+	if (fd != -1)
+		close(fd);
+	return true;
+}
+
+/**
+ * Get plugin properties
+ */
+static bool oss_on_devices_changed(obs_properties_t *props, obs_property_t *p,
+				   obs_data_t *settings)
+{
+	obs_property_t *rate, *channels;
+	obs_property_t *custom_dsp;
+	const char *device;
+
+	UNUSED_PARAMETER(p);
+
+	device = obs_data_get_string(settings, OBS_PROPS_DSP);
+	custom_dsp = obs_properties_get(props, OBS_PROPS_CUSTOM_DSP);
+	rate = obs_properties_get(props, OBS_PROPS_RATE);
+	channels = obs_properties_get(props, OBS_PROPS_CHANNELS);
+
+	if (!strcmp(device, OBS_PATH_DSP_CUSTOM))
+		obs_property_set_visible(custom_dsp, true);
+	else
+		obs_property_set_visible(custom_dsp, false);
+	oss_fill_device_info(rate, channels, device);
+	obs_property_modified(rate, settings);
+	obs_property_modified(channels, settings);
+
+	obs_property_modified(custom_dsp, settings);
+
+	return true;
+}
+
+/**
+ * Get plugin properties
+ */
+static obs_properties_t *oss_properties(void *unused)
+{
+	obs_properties_t *props;
+	obs_property_t *devices;
+	obs_property_t *rate;
+	obs_property_t *sample_fmt;
+	obs_property_t *channels;
+
+	UNUSED_PARAMETER(unused);
+
+	props = obs_properties_create();
+
+	devices = obs_properties_add_list(props, OBS_PROPS_DSP,
+					  obs_module_text("DSP"),
+					  OBS_COMBO_TYPE_LIST,
+					  OBS_COMBO_FORMAT_STRING);
+
+	obs_property_list_add_string(devices, obs_module_text("Default"),
+				     OSS_DSP_DEFAULT);
+	obs_property_list_add_string(devices, obs_module_text("Custom"),
+				     OBS_PATH_DSP_CUSTOM);
+	obs_property_set_modified_callback(devices, oss_on_devices_changed);
+
+	obs_properties_add_text(props, OBS_PROPS_CUSTOM_DSP,
+				obs_module_text("CustomDSPPath"),
+				OBS_TEXT_DEFAULT);
+
+	rate = obs_properties_add_list(props, OBS_PROPS_RATE,
+				       obs_module_text("SampleRate"),
+				       OBS_COMBO_TYPE_LIST,
+				       OBS_COMBO_FORMAT_INT);
+	channels = obs_properties_add_list(props, OBS_PROPS_CHANNELS,
+					   obs_module_text("Channels"),
+					   OBS_COMBO_TYPE_LIST,
+					   OBS_COMBO_FORMAT_INT);
+	oss_fill_device_info(rate, channels, OSS_DSP_DEFAULT);
+
+	sample_fmt = obs_properties_add_list(props, OBS_PROPS_SAMPLE_FMT,
+					     obs_module_text("SampleFormat"),
+					     OBS_COMBO_TYPE_LIST,
+					     OBS_COMBO_FORMAT_INT);
+
+	obs_property_list_add_int(sample_fmt, "pcm8", AFMT_U8);
+	obs_property_list_add_int(sample_fmt, "pcm16le", AFMT_S16_LE);
+	obs_property_list_add_int(sample_fmt, "pcm32le", AFMT_S32_LE);
+
+	oss_prop_add_devices(devices);
+
+	return props;
+}
+
+struct obs_source_info oss_input_capture = {
+	.id = "oss_input_capture",
+	.type = OBS_SOURCE_TYPE_INPUT,
+	.output_flags = OBS_SOURCE_AUDIO,
+	.get_name = oss_getname,
+	.create = oss_create,
+	.destroy = oss_destroy,
+	.update = oss_update,
+	.get_defaults = oss_defaults,
+	.get_properties = oss_properties,
+	.icon_type = OBS_ICON_TYPE_AUDIO_INPUT,
+};

obs-studio-26.0.0.tar.xz/plugins/oss-audio/oss-platform.h.in Added

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/th-TH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -217,6 +217,25 @@
             }
         },
         {
+            "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"
+            }
+        },
+        {
             "name": "Smashcast",
             "servers": [
                 {
@@ -272,178 +291,6 @@
             }
         },
         {
-            "name": "Mixer.com - FTL",
-            "common": true,
-            "servers": [
-                {
-                    "name": "US: Dallas, TX",
-                    "url": "ingest-dal.mixer.com"
-                },
-                {
-                    "name": "US: San Jose, CA",
-                    "url": "ingest-sjc.mixer.com"
-                },
-                {
-                    "name": "US: Seattle, WA",
-                    "url": "ingest-sea.mixer.com"
-                },
-                {
-                    "name": "US: Washington DC",
-                    "url": "ingest-wdc.mixer.com"
-                },
-                {
-                    "name": "Canada: Toronto",
-                    "url": "ingest-tor.mixer.com"
-                },
-                {
-                    "name": "EU: London",
-                    "url": "ingest-lon.mixer.com"
-                },
-                {
-                    "name": "EU: Amsterdam",
-                    "url": "ingest-ams.mixer.com"
-                },
-                {
-                    "name": "EU: Milan",
-                    "url": "ingest-mil.mixer.com"
-                },
-                {
-                    "name": "EU: Paris",
-                    "url": "ingest-par.mixer.com"
-                },
-                {
-                    "name": "EU: Frankfurt",
-                    "url": "ingest-fra.mixer.com"
-                },
-                {
-                    "name": "Brazil: Sao Paulo",
-                    "url": "ingest-sao.mixer.com"
-                },
-                {
-                    "name": "Australia: Melbourne",
-                    "url": "ingest-mel.mixer.com"
-                },
-                {
-                    "name": "Australia: Sydney",
-                    "url": "ingest-syd.mixer.com"
-                },
-                {
-                    "name": "Mexico: Mexico City",
-                    "url": "ingest-mex.mixer.com"
-                },
-                {
-                    "name": "Asia: Hong Kong",
-                    "url": "ingest-hkg.mixer.com"
-                },
-                {
-                    "name": "Asia: Tokyo",
-                    "url": "ingest-tok.mixer.com"
-                },
-                {
-                    "name": "South Korea: Seoul",
-                    "url": "ingest-seo.mixer.com"
-                },
-                {
-                    "name": "India: Chennai",
-                    "url": "ingest-che.mixer.com"
-                }
-            ],
-            "recommended": {
-                "keyint": 2,
-                "output": "ftl_output",
-                "max audio bitrate": 160,
-                "max video bitrate": 10000,
-                "profile": "main",
-                "bframes": 0,
-                "x264opts": "scenecut=0"
-            }
-        },
-        {
-            "name": "Mixer.com - RTMP",
-            "common": true,
-            "servers": [
-                {
-                    "name": "US: Dallas, TX",
-                    "url": "rtmp://ingest-dal.mixer.com:1935/beam"
-                },
-                {
-                    "name": "US: San Jose, CA",
-                    "url": "rtmp://ingest-sjc.mixer.com:1935/beam"
-                },
-                {
-                    "name": "US: Seattle, WA",
-                    "url": "rtmp://ingest-sea.mixer.com:1935/beam"
-                },
-                {
-                    "name": "US: Washington DC",
-                    "url": "rtmp://ingest-wdc.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Canada: Toronto",
-                    "url": "rtmp://ingest-tor.mixer.com:1935/beam"
-                },
-                {
-                    "name": "EU: London",
-                    "url": "rtmp://ingest-lon.mixer.com:1935/beam"
-                },
-                {
-                    "name": "EU: Amsterdam",
-                    "url": "rtmp://ingest-ams.mixer.com:1935/beam"
-                },
-                {
-                    "name": "EU: Milan",
-                    "url": "rtmp://ingest-mil.mixer.com:1935/beam"
-                },
-                {
-                    "name": "EU: Paris",
-                    "url": "rtmp://ingest-par.mixer.com:1935/beam"
-                },
-                {
-                    "name": "EU: Frankfurt",
-                    "url": "rtmp://ingest-fra.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Brazil: Sao Paulo",
-                    "url": "rtmp://ingest-sao.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Australia: Melbourne",
-                    "url": "rtmp://ingest-mel.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Australia: Sydney",
-                    "url": "rtmp://ingest-syd.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Mexico: Mexico City",
-                    "url": "rtmp://ingest-mex.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Asia: Hong Kong",
-                    "url": "rtmp://ingest-hkg.mixer.com:1935/beam"
-                },
-                {
-                    "name": "Asia: Tokyo",
-                    "url": "rtmp://ingest-tok.mixer.com:1935/beam"
-                },
-                {
-                    "name": "South Korea: Seoul",
-                    "url": "rtmp://ingest-seo.mixer.com:1935/beam"
-                },
-                {
-                    "name": "India: Chennai",
-                    "url": "rtmp://ingest-che.mixer.com:1935/beam"
-                }
-            ],
-            "recommended": {
-                "keyint": 2,
-                "max audio bitrate": 160,
-                "max video bitrate": 10000,
-                "profile": "main",
-                "x264opts": "scenecut=0"
-            }
-        },
-        {
             "name": "Mobcrush",
             "servers": [
                 {
@@ -495,76 +342,87 @@
             "name": "Vaughn Live / iNSTAGIB",
             "servers": [
                 {
-                    "name": "US: Primary",
-                    "url": "rtmp://live.vaughnsoft.net/live"
-                },
-                {
                     "name": "US: Chicago, IL",
                     "url": "rtmp://live-ord.vaughnsoft.net/live"
                 },
                 {
+                    "name": "US: Vint Hill, VA",
+                    "url": "rtmp://live-iad.vaughnsoft.net/live"
+                },
+                {
                     "name": "US: Denver, CO",
                     "url": "rtmp://live-den.vaughnsoft.net/live"
                 },
                 {
                     "name": "US: New York, NY",
                     "url": "rtmp://live-nyc.vaughnsoft.net/live"
+                },		    
+                {
+                    "name": "US: Miami, FL",
+                    "url": "rtmp://live-mia.vaughnsoft.net/live"
+                },
+                {
+                    "name": "US: Seattle, WA",
+                    "url": "rtmp://live-sea.vaughnsoft.net/live"
                 },
                 {
                     "name": "EU: Amsterdam, NL",
                     "url": "rtmp://live-ams.vaughnsoft.net/live"
+                },
+                {
+                    "name": "EU: London, UK",
+                    "url": "rtmp://live-lhr.vaughnsoft.net/live"
                 }
             ],
             "recommended": {
                 "keyint": 2,
-                "max video bitrate": 3500,
-                "max audio bitrate": 160
+                "max video bitrate": 15000,
+                "max audio bitrate": 320
             }
         },
         {
             "name": "Breakers.TV",
             "servers": [
                 {
-                    "name": "US: Primary",
-                    "url": "rtmp://live.vaughnsoft.net/live"
-                },
-                {
                     "name": "US: Chicago, IL",
                     "url": "rtmp://live-ord.vaughnsoft.net/live"
                 },
                 {
+                    "name": "US: Vint Hill, VA",
+                    "url": "rtmp://live-iad.vaughnsoft.net/live"
+                },
+                {
                     "name": "US: Denver, CO",
                     "url": "rtmp://live-den.vaughnsoft.net/live"
                 },
                 {
                     "name": "US: New York, NY",
                     "url": "rtmp://live-nyc.vaughnsoft.net/live"
+                },		    
+                {
+                    "name": "US: Miami, FL",
+                    "url": "rtmp://live-mia.vaughnsoft.net/live"
+                },
+                {
+                    "name": "US: Seattle, WA",
+                    "url": "rtmp://live-sea.vaughnsoft.net/live"
                 },
                 {
                     "name": "EU: Amsterdam, NL",
                     "url": "rtmp://live-ams.vaughnsoft.net/live"
+                },
+                {
+                    "name": "EU: London, UK",
+                    "url": "rtmp://live-lhr.vaughnsoft.net/live"
                 }
             ],
             "recommended": {
                 "keyint": 2,
-                "max video bitrate": 3500,
-                "max audio bitrate": 160
+                "max video bitrate": 15000,
+                "max audio bitrate": 320
             }
         },
         {
-            "name": "CyberGame.TV",
-            "servers": [
-                {
-                    "name": "RU Origin",
-                    "url": "rtmp://st.cybergame.tv:1953/live"
-                },
-                {
-                    "name": "RU Premium",
-                    "url": "rtmp://premium.cybergame.tv:1953/premium"
-                }
-            ]
-        },
-        {
             "name": "Facebook Live",
             "common": true,
             "servers": [
@@ -581,9 +439,10 @@
             }
         },
         {
-            "name": "Restream.io - RTMP",
+            "name": "Restream.io",
             "alt_names": [
-                "Restream.io"
+                "Restream.io - RTMP",
+                "Restream.io - FTL"
             ],
             "common": true,
             "servers": [
@@ -697,124 +556,6 @@
             }
         },
         {
-            "name": "Restream.io - FTL",
-            "common": true,
-            "servers": [
-                {
-                    "name": "Autodetect",
-                    "url": "live.restream.io"
-                },
-                {
-                    "name": "EU-West (London, GB)",
-                    "url": "london.restream.io"
-                },
-                {
-                    "name": "EU-West (Amsterdam, NL)",
-                    "url": "amsterdam.restream.io"
-                },
-                {
-                    "name": "EU-West (Luxembourg)",
-                    "url": "luxembourg.restream.io"
-                },
-                {
-                    "name": "EU-West (Paris, FR)",
-                    "url": "paris.restream.io"
-                },
-                {
-                    "name": "EU-West (Milan, IT)",
-                    "url": "milan.restream.io"
-                },
-                {
-                    "name": "EU-Central (Frankfurt, DE)",
-                    "url": "frankfurt.restream.io"
-                },
-                {
-                    "name": "EU-East (Falkenstein, DE)",
-                    "url": "falkenstein.restream.io"
-                },
-                {
-                    "name": "EU-East (Prague, Czech)",
-                    "url": "prague.restream.io"
-                },
-                {
-                    "name": "EU-South (Madrid, Spain)",
-                    "url": "madrid.restream.io"
-                },
-                {
-                    "name": "Russia (Moscow)",
-                    "url": "moscow.restream.io"
-                },
-                {
-                    "name": "Turkey (Istanbul)",
-                    "url": "istanbul.restream.io"
-                },
-                {
-                    "name": "Israel (Tel Aviv)",
-                    "url": "telaviv.restream.io"
-                },
-                {
-                    "name": "US-West (Seattle, WA)",
-                    "url": "seattle.restream.io"
-                },
-                {
-                    "name": "US-West (San Jose, CA)",
-                    "url": "sanjose.restream.io"
-                },
-                {
-                    "name": "US-Central (Dallas, TX)",
-                    "url": "dallas.restream.io"
-                },
-                {
-                    "name": "US-East (Washington, DC)",
-                    "url": "washington.restream.io"
-                },
-                {
-                    "name": "US-East (Miami, FL)",
-                    "url": "miami.restream.io"
-                },
-                {
-                    "name": "US-East (Chicago, IL)",
-                    "url": "chicago.restream.io"
-                },
-                {
-                    "name": "NA-East (Toronto, Canada)",
-                    "url": "toronto.restream.io"
-                },
-                {
-                    "name": "SA (Saint Paul, Brazil)",
-                    "url": "saopaulo.restream.io"
-                },
-                {
-                    "name": "India (Bangalore)",
-                    "url": "bangalore.restream.io"
-                },
-                {
-                    "name": "Asia (Singapore)",
-                    "url": "singapore.restream.io"
-                },
-                {
-                    "name": "Asia (Seoul, South Korea)",
-                    "url": "seoul.restream.io"
-                },
-                {
-                    "name": "Asia (Tokyo, Japan)",
-                    "url": "tokyo.restream.io"
-                },
-                {
-                    "name": "Australia (Sydney)",
-                    "url": "sydney.restream.io"
-                }
-            ],
-            "recommended": {
-                "keyint": 2,
-                "output": "ftl_output",
-                "max audio bitrate": 160,
-                "max video bitrate": 10000,
-                "profile": "main",
-                "bframes": 0
-            }
-        },
-        {
             "name": "Nood",
             "servers": [
                 {
@@ -973,10 +714,6 @@
                     "url": "rtmp://eu-central.castr.io/static"
                 },
                 {
-                    "name": "AU South",
-                    "url": "rtmp://au-central.castr.io/static"
-                },
-                {
                     "name": "Singapore",
                     "url": "rtmp://sg-central.castr.io/static"
                 }
@@ -995,21 +732,6 @@
             ]
         },
         {
-            "name": "Stream.live",
-            "servers": [
-                {
-                    "name": "Default",
-                    "url": "rtmp://media.stream.live:1935/live"
-                }
-            ],
-            "recommended": {
-                "keyint": 2,
-                "profile": "main",
-                "max video bitrate": 2500,
-                "max audio bitrate": 160
-            }
-        },
-        {
             "name": "Meridix Live Sports Platform",
             "servers": [
                 {
@@ -1022,40 +744,30 @@
             }
         },
         {
-            "name": "Afreeca.TV",
+            "name": "AfreecaTV",
+            "alt_names": ["아프리카TV", "Afreeca.TV"],
             "servers": [
                 {
+                    "name": "Asia : Korea",
+                    "url": "rtmp://rtmpmanager-freecat.afreeca.tv/app"
+                },
+                {
                     "name": "North America : US East",
-                    "url": "rtmp://rtmpmanager-aws-en-east.afreeca.tv/live"
+                    "url": "rtmp://rtmp-esu.afreecatv.com/app"
                 },
                 {
                     "name": "North America : US West",
-                    "url": "rtmp://rtmpmanager-aws-en-west.afreeca.tv/live"
+                    "url": "rtmp://rtmp-wsu.afreecatv.com/app"
                 },
                 {
                     "name": "Asia : Singapore",
-                    "url": "rtmp://rtmpmanager-aws-sg.afreeca.tv/live"
-                }
-            ],
-            "recommended": {
-                "keyint": 1,
-                "profile": "main",
-                "max video bitrate": 5000,
-                "max audio bitrate": 192
-            }
-        },
-        {
-            "name": "아프리카TV",
-            "servers": [
-                {
-                    "name": "Korea",
-                    "url": "rtmp://rtmpmanager-freecat.afreeca.tv/app/"
+                    "url": "rtmp://rtmp-sgp.afreecatv.com/app"
                 }
             ],
             "recommended": {
-                "keyint": 1,
+                "keyint": 2,
                 "profile": "main",
-                "max video bitrate": 5000,
+                "max video bitrate": 8000,
                 "max audio bitrate": 192
             }
         },
@@ -1119,9 +831,14 @@
             "servers": [
                 {
                     "name": "Default",
-                    "url": "rtmp://live.uscreen.app/app"
+                    "url": "rtmp://global-live.uscreen.app:5222/app"
                 }
-            ]
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 8000,
+                "max audio bitrate": 192
+            }
         },
         {
             "name": "Stripchat",
@@ -1262,33 +979,71 @@
             }
         },
         {
-            "name": "Switchboard Live (Joicaster)",
+            "name": "Switchboard Live",
+            "alt_names": ["Switchboard Live (Joicaster)"],
             "servers": [
                 {
-                    "name": "Default - Performance Global",
+                    "name": "Global Zone (geo based)",
                     "url": "rtmp://ingest-global-a.switchboard.zone/live"
                 },
                 {
-                    "name": "US West",
+                    "name": "US Zone (geo based)",
+                    "url": "rtmp://ingest-us.switchboard.zone/live"
+                },
+                {
+                    "name": "US West 1 (South)",
                     "url": "rtmp://ingest-us-west.a.switchboard.zone/live"
                 },
                 {
-                    "name": "US East",
+                    "name": "US West 2 (North)",
+                    "url": "rtmp://ingest-us-west.b.switchboard.zone/live"
+                },
+                {
+                    "name": "US East 1 (North)",
                     "url": "rtmp://ingest-us-east.a.switchboard.zone/live"
                 },
                 {
-                    "name": "Europe West",
+                    "name": "US East 2 (South)",
+                    "url": "rtmp://ingest-us-east.b.switchboard.zone/live"
+                },
+                {
+                    "name": "US Central (North)",
+                    "url": "rtmp://ingest-us-central.a.switchboard.zone/live"
+                },
+                {
+                    "name": "South America East (São Paulo, BR)",
+                    "url": "rtmp://ingest-sa-east.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Europe West (London, UK)",
                     "url": "rtmp://ingest-eu-west.a.switchboard.zone/live"
                 },
                 {
-                    "name": "Europe Central",
-                    "url": "rtmp://ingest-us-east.a.switchboard.zone/live"
+                    "name": "Europe North (Hamina, FI)",
+                    "url": "rtmp://ingest-eu-north.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Australia Southeast (Sydney, AU)",
+                    "url": "rtmp://ingest-au-southeast.a.switchboard.zone/live"
                 },
                 {
-                    "name": "Australia East",
-                    "url": "rtmp://ingest-au-east.a.switchboard.zone/live"
+                    "name": "Asia East (Changhua County, TW)",
+                    "url": "rtmp://ingest-as-east.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Asia Northeast (Tokyo, JP)",
+                    "url": "rtmp://ingest-as-northeast.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Asia South (Mumbai, IN)",
+                    "url": "rtmp://ingest-as-south.a.switchboard.zone/live"
                 }
-            ]
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max audio bitrate": 128,
+                "max video bitrate": 10000
+            }
         },
         {
             "name": "Looch",
@@ -1336,8 +1091,8 @@
             "recommended": {
                 "keyint": 2,
                 "profile": "main",
-                "max video bitrate": 2800,
-                "max audio bitrate": 128
+                "max video bitrate": 4000,
+                "max audio bitrate": 192
             }
         },
         {
@@ -1356,13 +1111,35 @@
             }
         },
         {
-            "name": "Madcat",
+            "name": "Trovo",
+            "alt_names": ["Madcat"],
             "servers": [
                 {
                     "name": "Default",
-                    "url": "rtmp://73846.livepush.myqcloud.com/live/"
+                    "url": "rtmp://livepush.trovo.live/live/"
                 }
-            ]
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 9000,
+                "max audio bitrate": 160,
+                "x264opts": "scenecut=0"
+            }
+        },
+        {
+            "name": "Mixcloud",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://rtmp.mixcloud.com/broadcast"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 6000,
+                "max audio bitrate": 320,
+                "x264opts": "scenecut=0"
+            }
         },
         {
             "name": "SermonAudio Cloud",
@@ -1399,6 +1176,27 @@
             ]
         },
         {
+            "name": "GameTips.TV",
+            "servers": [
+                {
+                    "name": "Iran - Tehran | AsiaTech",
+                    "url": "rtmp://rtmp.s2.gametips.tv:1935/live"
+                },
+                {
+                    "name": "Netherlands - Amsterdam | Serverius",
+                    "url": "rtmp://rtmp.s3.gametips.tv:1935/live"
+                },
+                {
+                    "name": "Iran - Tehran | ParsOnline",
+                    "url": "rtmp://rtmp.s4.gametips.tv:1935/live"
+                },
+                {
+                    "name": "Iran - Tehran | AfraNet",
+                    "url": "rtmp://rtmp.s5.gametips.tv:1935/live"
+                }
+            ]
+        },
+        {
             "name": "KakaoTV",
             "servers": [
                 {
@@ -1818,6 +1616,204 @@
                     "url": "rtmp://rtmp.virtwish.com/live"
                 }
             ]
+        },
+        {
+            "name": "Nimo TV",
+            "servers": [
+                {
+                    "name": "Global:1",
+                    "url": "rtmp://wspush.rtmp.nimo.tv/live/"
+                },
+                {
+                    "name": "Global:2",
+                    "url": "rtmp://txpush.rtmp.nimo.tv/live/"
+                },
+                {
+                    "name": "Global:3",
+                    "url": "rtmp://alpush.rtmp.nimo.tv/live/"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 6000,
+                "max audio bitrate": 160
+            }
+        },
+        {
+            "name": "XLoveCam.com",
+            "servers": [
+                {
+                    "name": "Europe(main)",
+                    "url": "rtmp://nl.eu.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "Europe(Romania)",
+                    "url": "rtmp://ro.eu.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "Europe(Russia)",
+                    "url": "rtmp://ru.eu.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "North America(US East)",
+                    "url": "rtmp://usec.na.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "North America(US West)",
+                    "url": "rtmp://uswc.na.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "North America(Canada)",
+                    "url": "rtmp://ca.na.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "South America",
+                    "url": "rtmp://co.sa.stream.xlove.com/performer-origin"
+                },
+                {
+                    "name": "Asia",
+                    "url": "rtmp://sg.as.stream.xlove.com/performer-origin"
+                }
+            ],
+            "recommended": {
+                "x264opts": "scenecut=0"
+            }
+        },
+        {
+            "name": "AngelThump",
+            "servers": [
+                {
+                    "name": "Auto",
+                    "url": "rtmp://ingest.angelthump.com/live"
+                },
+                {
+                    "name": "New York 3",
+                    "url": "rtmp://nyc-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "San Francisco 2",
+                    "url": "rtmp://sfo-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "Singapore 1",
+                    "url": "rtmp://sgp-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "London 1",
+                    "url": "rtmp://lon-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "Frankfurt 1",
+                    "url": "rtmp://fra-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "Toronto 1",
+                    "url": "rtmp://tor-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "Bangalore 1",
+                    "url": "rtmp://blr-ingest.angelthump.com:1935/live"
+                },
+                {
+                    "name": "Amsterdam 3",
+                    "url": "rtmp://ams-ingest.angelthump.com:1935/live"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "profile": "high",
+                "max video bitrate": 3500,
+                "max audio bitrate": 160
+            }
+        },
+        {
+            "name": "weabook.live",
+            "servers": [
+                {
+                    "name": "N.Virgina, US",
+                    "url": "rtmp://us-api.weabook.live/live"
+                },
+                {
+                    "name": "Singapore, SG",
+                    "url": "rtmp://sg-api.weabook.live/live"
+                },
+                {
+                    "name": "Tokyo, JP",
+                    "url": "rtmp://jp-api.weabook.live/live"
+                },
+                {
+                    "name": "Premium Streaming",
+                    "url": "rtmp://premium.rtmp.weabook.live/live"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max audio bitrate": 256,
+                "max video bitrate": 20480
+            }
+        },
+        {
+            "name": "Taryana - Apachat | تاریانا - آپاچت",
+            "servers": [
+                {
+                    "name": "Global: Fastest (Recommended)",
+                    "url": "rtmp://cdn.apachat.com:443/multistream"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "profile": "main",
+                "max video bitrate": 4000,
+                "max audio bitrate": 192
+            }
+        },
+        {
+            "name": "api.video",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://broadcast.api.video/s"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 20000,
+                "max audio bitrate": 192
+            }
+        },
+        {
+            "name": "SHOWROOM",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "https://www.showroom-live.com/api/obs/streaming_info?obs_key="
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "profile": "main",
+                "max video bitrate": 1500,
+                "max audio bitrate": 160,
+                "x264opts": "tune=zerolatency"
+            }
+	},
+        {
+            "name": "Mux",
+            "servers": [
+                {
+                    "name": "Global (RTMPS)",
+                    "url": "rtmps://global-live.mux.com:443/app"
+                },
+                {
+                    "name": "Global (RTMP)",
+                    "url": "rtmp://global-live.mux.com:5222/app"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 5000,
+                "max audio bitrate": 160
+            }
         }
     ]
 }

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/nimotv.c Added

@@ -0,0 +1,145 @@
+#include <util/curl/curl-helper.h>
+#include <stdlib.h>
+#include <string.h>
+#include <jansson.h>
+#include <util/dstr.h>
+#include "util/base.h"
+#include "nimotv.h"
+#include <time.h>
+
+struct nimotv_mem_struct {
+	char *memory;
+	size_t size;
+};
+static char *current_ingest = NULL;
+static time_t last_time = -1;
+
+static size_t nimotv_write_cb(void *contents, size_t size, size_t nmemb,
+			      void *userp)
+{
+	size_t realsize = size * nmemb;
+	struct nimotv_mem_struct *mem = (struct nimotv_mem_struct *)userp;
+
+	char *ptr = realloc(mem->memory, mem->size + realsize + 1);
+	if (ptr == NULL) {
+		blog(LOG_WARNING, "nimotv_write_cb: realloc returned NULL");
+		return 0;
+	}
+
+	mem->memory = ptr;
+	memcpy(&(mem->memory[mem->size]), contents, realsize);
+	mem->size += realsize;
+	mem->memory[mem->size] = 0;
+
+	return realsize;
+}
+
+static char *load_ingest(const char *json)
+{
+	json_t *root = json_loads(json, 0, NULL);
+	char *ingest = NULL;
+	if (!root)
+		return ingest;
+
+	json_t *recommended_ingests = json_object_get(root, "ingests");
+	if (recommended_ingests) {
+		json_t *recommended = json_array_get(recommended_ingests, 0);
+		if (recommended) {
+			json_t *item_url = json_object_get(recommended, "url");
+			if (item_url) {
+				const char *url = json_string_value(item_url);
+				ingest = bstrdup(url);
+			}
+		}
+	}
+
+	json_decref(root);
+	return ingest;
+}
+
+const char *nimotv_get_ingest(const char *key)
+{
+	if (current_ingest != NULL) {
+		time_t now = time(NULL);
+		double diff = difftime(now, last_time);
+		if (diff < 2) {
+			blog(LOG_INFO,
+			     "nimotv_get_ingest: returning ingest from cache: %s",
+			     current_ingest);
+			return current_ingest;
+		}
+	}
+
+	CURL *curl_handle;
+	CURLcode res;
+	struct nimotv_mem_struct chunk;
+	struct dstr uri;
+	long response_code;
+
+	curl_handle = curl_easy_init();
+	chunk.memory = malloc(1); /* will be grown as needed by realloc */
+	chunk.size = 0;           /* no data at this point */
+
+	char *encoded_key = curl_easy_escape(NULL, key, 0);
+	dstr_init(&uri);
+	dstr_copy(&uri, "https://globalcdnweb.nimo.tv/api/ingests/nimo?id=");
+	dstr_ncat(&uri, encoded_key, strlen(encoded_key));
+	curl_free(encoded_key);
+
+	curl_easy_setopt(curl_handle, CURLOPT_URL, uri.array);
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, true);
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2L);
+	curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 3L);
+	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, nimotv_write_cb);
+	curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chunk);
+	curl_obs_set_revoke_setting(curl_handle);
+
+#if LIBCURL_VERSION_NUM >= 0x072400
+	// A lot of servers don't yet support ALPN
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_ENABLE_ALPN, 0);
+#endif
+
+	res = curl_easy_perform(curl_handle);
+	dstr_free(&uri);
+
+	if (res != CURLE_OK) {
+		blog(LOG_WARNING,
+		     "nimotv_get_ingest: curl_easy_perform() failed: %s",
+		     curl_easy_strerror(res));
+		curl_easy_cleanup(curl_handle);
+		free(chunk.memory);
+		return NULL;
+	}
+
+	curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
+	if (response_code != 200) {
+		blog(LOG_WARNING,
+		     "nimotv_get_ingest: curl_easy_perform() returned code: %ld",
+		     response_code);
+		curl_easy_cleanup(curl_handle);
+		free(chunk.memory);
+		return NULL;
+	}
+
+	curl_easy_cleanup(curl_handle);
+
+	if (chunk.size == 0) {
+		blog(LOG_WARNING,
+		     "nimotv_get_ingest: curl_easy_perform() returned empty response");
+		free(chunk.memory);
+		return NULL;
+	}
+
+	if (current_ingest != NULL) {
+		bfree(current_ingest);
+	}
+
+	current_ingest = load_ingest(chunk.memory);
+	last_time = time(NULL);
+
+	free(chunk.memory);
+	blog(LOG_INFO, "nimotv_get_ingest: returning ingest: %s",
+	     current_ingest);
+
+	return current_ingest;
+}

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/nimotv.h Added

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/rtmp-common.c -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/rtmp-common.c Changed

@@ -2,10 +2,13 @@
 #include <util/dstr.h>
 #include <obs-module.h>
 #include <jansson.h>
+#include <obs-config.h>
 
 #include "rtmp-format-ver.h"
 #include "twitch.h"
 #include "younow.h"
+#include "nimotv.h"
+#include "showroom.h"
 
 struct rtmp_common {
 	char *service;
@@ -13,6 +16,8 @@
 	char *key;
 
 	char *output;
+
+	bool supports_additional_audio_track;
 };
 
 static const char *rtmp_common_getname(void *unused)
@@ -24,6 +29,7 @@
 static json_t *open_services_file(void);
 static inline json_t *find_service(json_t *root, const char *name,
 				   const char **p_new_name);
+static inline bool get_bool_val(json_t *service, const char *key);
 static inline const char *get_string_val(json_t *service, const char *key);
 
 extern void twitch_ingests_refresh(int seconds);
@@ -73,6 +79,7 @@
 	service->service = bstrdup(obs_data_get_string(settings, "service"));
 	service->server = bstrdup(obs_data_get_string(settings, "server"));
 	service->key = bstrdup(obs_data_get_string(settings, "key"));
+	service->supports_additional_audio_track = false;
 	service->output = NULL;
 
 	json_t *root = open_services_file();
@@ -93,6 +100,8 @@
 					service->output = bstrdup(out);
 			}
 
+			service->supports_additional_audio_track = get_bool_val(
+				serv, "supports_additional_audio_track");
 			ensure_valid_url(service, serv, settings);
 		}
 	}
@@ -340,15 +349,16 @@
 		return;
 	}
 
-	if (strcmp(name, "Mixer.com - FTL") == 0) {
-		obs_property_list_add_string(
-			servers_prop, obs_module_text("Server.Auto"), "auto");
-	}
 	if (strcmp(name, "Twitch") == 0) {
 		if (fill_twitch_servers(servers_prop))
 			return;
 	}
 
+	if (strcmp(name, "Nimo TV") == 0) {
+		obs_property_list_add_string(
+			servers_prop, obs_module_text("Server.Auto"), "auto");
+	}
+
 	json_array_foreach (servers, index, server) {
 		const char *server_name = get_string_val(server, "name");
 		const char *url = get_string_val(server, "url");
@@ -493,6 +503,8 @@
 		obs_data_set_string(settings, "profile", profile);
 	}
 
+	obs_data_item_release(&enc_item);
+
 	item = json_object_get(recommended, "max video bitrate");
 	if (json_is_integer(item)) {
 		int max_bitrate = (int)json_integer_value(item);
@@ -603,15 +615,43 @@
 		}
 	}
 
+	if (service->service && strcmp(service->service, "Nimo TV") == 0) {
+		if (service->server && strcmp(service->server, "auto") == 0) {
+			return nimotv_get_ingest(service->key);
+		}
+	}
+
+	if (service->service && strcmp(service->service, "SHOWROOM") == 0) {
+		if (service->server && service->key) {
+			struct showroom_ingest *ingest;
+			ingest = showroom_get_ingest(service->server,
+						     service->key);
+			return ingest->url;
+		}
+	}
 	return service->server;
 }
 
 static const char *rtmp_common_key(void *data)
 {
 	struct rtmp_common *service = data;
+	if (service->service && strcmp(service->service, "SHOWROOM") == 0) {
+		if (service->server && service->key) {
+			struct showroom_ingest *ingest;
+			ingest = showroom_get_ingest(service->server,
+						     service->key);
+			return ingest->key;
+		}
+	}
 	return service->key;
 }
 
+static bool supports_multitrack(void *data)
+{
+	struct rtmp_common *service = data;
+	return service->supports_additional_audio_track;
+}
+
 struct obs_service_info rtmp_common_service = {
 	.id = "rtmp_common",
 	.get_name = rtmp_common_getname,

obs-studio-25.0.8.tar.xz/plugins/rtmp-services/rtmp-services-main.c -> obs-studio-26.0.0.tar.xz/plugins/rtmp-services/rtmp-services-main.c Changed

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/showroom.c Added

@@ -0,0 +1,163 @@
+#include <util/curl/curl-helper.h>
+#include <stdlib.h>
+#include <string.h>
+#include <jansson.h>
+#include <util/dstr.h>
+#include <util/darray.h>
+#include "util/base.h"
+#include <obs-module.h>
+#include <util/platform.h>
+#include "showroom.h"
+#include <util/threading.h>
+
+struct showroom_ingest_info {
+	char *access_key;
+	uint64_t last_time;
+	struct showroom_ingest ingest;
+};
+
+static DARRAY(struct showroom_ingest_info) cur_ingests = {0};
+
+struct showroom_ingest invalid_ingest = {"", ""};
+
+void free_showroom_data(void)
+{
+	for (size_t i = 0; i < cur_ingests.num; i++) {
+		struct showroom_ingest_info *info = &cur_ingests.array[i];
+		bfree(info->access_key);
+		bfree((void *)info->ingest.key);
+		bfree((void *)info->ingest.url);
+	}
+
+	da_free(cur_ingests);
+}
+
+static size_t showroom_write_cb(void *data, size_t size, size_t nmemb,
+				void *user_pointer)
+{
+	struct dstr *json = user_pointer;
+	size_t realsize = size * nmemb;
+	dstr_ncat(json, data, realsize);
+	return realsize;
+}
+
+static struct showroom_ingest_info *find_ingest(const char *access_key)
+{
+	struct showroom_ingest_info *ret = NULL;
+	for (size_t i = 0; i < cur_ingests.num; i++) {
+		struct showroom_ingest_info *info = &cur_ingests.array[i];
+		if (strcmp(info->access_key, access_key) == 0) {
+			ret = info;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+#ifndef SEC_TO_NSEC
+#define SEC_TO_NSEC 1000000000ULL
+#endif
+
+static struct showroom_ingest_info *get_ingest_from_json(char *str,
+							 const char *access_key)
+{
+	json_error_t error;
+	json_t *root;
+	root = json_loads(str, JSON_REJECT_DUPLICATES, &error);
+	if (!root) {
+		return NULL;
+	}
+
+	const char *url_str =
+		json_string_value(json_object_get(root, "streaming_url_rtmp"));
+	const char *key_str =
+		json_string_value(json_object_get(root, "streaming_key"));
+
+	struct showroom_ingest_info *info = find_ingest(access_key);
+	if (!info) {
+		info = da_push_back_new(cur_ingests);
+		info->access_key = bstrdup(access_key);
+	}
+
+	bfree((void *)info->ingest.url);
+	bfree((void *)info->ingest.key);
+	info->ingest.url = bstrdup(url_str);
+	info->ingest.key = bstrdup(key_str);
+	info->last_time = os_gettime_ns() / SEC_TO_NSEC;
+
+	json_decref(root);
+	return info;
+}
+
+struct showroom_ingest *showroom_get_ingest(const char *server,
+					    const char *access_key)
+{
+	struct showroom_ingest_info *info = find_ingest(access_key);
+	CURL *curl_handle;
+	CURLcode res;
+	struct dstr json = {0};
+	struct dstr uri = {0};
+	long response_code;
+
+	if (info) {
+		/* this function is called a bunch of times for the same data,
+		 * so in order to prevent multiple unnecessary queries in a
+		 * short period of time, return the same data for 10 seconds */
+
+		uint64_t ts_sec = os_gettime_ns() / SEC_TO_NSEC;
+		if (ts_sec - info->last_time < 10) {
+			return &info->ingest;
+		} else {
+			info = NULL;
+		}
+	}
+
+	curl_handle = curl_easy_init();
+
+	dstr_copy(&uri, server);
+	dstr_cat(&uri, access_key);
+	curl_easy_setopt(curl_handle, CURLOPT_URL, uri.array);
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, true);
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2L);
+	curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 30L);
+	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, showroom_write_cb);
+	curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&json);
+	curl_obs_set_revoke_setting(curl_handle);
+
+#if LIBCURL_VERSION_NUM >= 0x072400
+	curl_easy_setopt(curl_handle, CURLOPT_SSL_ENABLE_ALPN, 0);
+#endif
+
+	res = curl_easy_perform(curl_handle);
+	dstr_free(&uri);
+	if (res != CURLE_OK) {
+		blog(LOG_WARNING,
+		     "showroom_get_ingest: curl_easy_perform() failed: %s",
+		     curl_easy_strerror(res));
+		goto cleanup;
+	}
+
+	curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
+	if (response_code != 200) {
+		blog(LOG_WARNING,
+		     "showroom_get_ingest: curl_easy_perform() returned "
+		     "code: %ld",
+		     response_code);
+		goto cleanup;
+	}
+
+	if (json.len == 0) {
+		blog(LOG_WARNING,
+		     "showroom_get_ingest: curl_easy_perform() returned "
+		     "empty response");
+		goto cleanup;
+	}
+
+	info = get_ingest_from_json(json.array, access_key);
+
+cleanup:
+	curl_easy_cleanup(curl_handle);
+	dstr_free(&json);
+	return info ? &info->ingest : &invalid_ingest;
+}

obs-studio-26.0.0.tar.xz/plugins/rtmp-services/showroom.h Added

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ar-SA.ini Changed

obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/gl-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/id-ID.ini Added

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/it-IT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/sl-SI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/text-freetype2.c -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/text-freetype2.c Changed

@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 Copyright (C) 2014 by Nibbles
 
 This program is free software: you can redistribute it and/or modify
@@ -125,14 +125,14 @@
 {
 	struct ft2_source *srcdata = data;
 
-	return srcdata->cx;
+	return srcdata->cx + srcdata->outline_width;
 }
 
 static uint32_t ft2_source_get_height(void *data)
 {
 	struct ft2_source *srcdata = data;
 
-	return srcdata->cy;
+	return srcdata->cy + srcdata->outline_width;
 }
 
 static obs_properties_t *ft2_source_properties(void *unused)
@@ -156,6 +156,9 @@
 	obs_properties_add_bool(props, "from_file",
 				obs_module_text("ReadFromFile"));
 
+	obs_properties_add_bool(props, "antialiasing",
+				obs_module_text("Antialiasing"));
+
 	obs_properties_add_bool(props, "log_mode",
 				obs_module_text("ChatLogMode"));
 
@@ -322,8 +325,16 @@
 	if (!font_obj)
 		return;
 
+	srcdata->outline_width = 0;
+
 	srcdata->drop_shadow = obs_data_get_bool(settings, "drop_shadow");
 	srcdata->outline_text = obs_data_get_bool(settings, "outline");
+
+	if (srcdata->outline_text && srcdata->drop_shadow)
+		srcdata->outline_width = 6;
+	else if (srcdata->outline_text || srcdata->drop_shadow)
+		srcdata->outline_width = 4;
+
 	word_wrap = obs_data_get_bool(settings, "word_wrap");
 
 	color[0] = (uint32_t)obs_data_get_int(settings, "color1");
@@ -365,6 +376,8 @@
 	if (ft2_lib == NULL)
 		goto error;
 
+	const size_t texbuf_size = (size_t)texbuf_w * (size_t)texbuf_h;
+
 	if (srcdata->draw_effect == NULL) {
 		char *effect_file = NULL;
 		char *error_string = NULL;
@@ -386,6 +399,16 @@
 	if (srcdata->font_size != font_size || srcdata->from_file != from_file)
 		vbuf_needs_update = true;
 
+	const bool new_aa_setting = obs_data_get_bool(settings, "antialiasing");
+	const bool aa_changed = srcdata->antialiasing != new_aa_setting;
+	if (aa_changed) {
+		srcdata->antialiasing = new_aa_setting;
+		if (srcdata->texbuf != NULL) {
+			memset(srcdata->texbuf, 0, texbuf_size);
+		}
+		cache_standard_glyphs(srcdata);
+	}
+
 	srcdata->file_load_failed = false;
 	srcdata->from_file = from_file;
 
@@ -422,7 +445,7 @@
 		bfree(srcdata->texbuf);
 		srcdata->texbuf = NULL;
 	}
-	srcdata->texbuf = bzalloc(texbuf_w * texbuf_h);
+	srcdata->texbuf = bzalloc(texbuf_size);
 
 	if (srcdata->font_face)
 		cache_standard_glyphs(srcdata);
@@ -505,6 +528,8 @@
 	obs_data_set_default_int(font_obj, "size", font_size);
 	obs_data_set_default_obj(settings, "font", font_obj);
 
+	obs_data_set_default_bool(settings, "antialiasing", true);
+
 	obs_data_set_default_int(settings, "log_lines", 6);
 
 	obs_data_set_default_int(settings, "color1", 0xFFFFFFFF);

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/text-freetype2.h -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/text-freetype2.h Changed

obs-studio-25.0.8.tar.xz/plugins/text-freetype2/text-functionality.c -> obs-studio-26.0.0.tar.xz/plugins/text-freetype2/text-functionality.c Changed

@@ -162,8 +162,14 @@
 
 	uint32_t dx = 0, dy = srcdata->max_h, max_y = dy;
 	uint32_t cur_glyph = 0;
+	uint32_t offset = 0;
 	size_t len = wcslen(srcdata->text);
 
+	if (srcdata->outline_text) {
+		offset = 2;
+		dx = offset;
+	}
+
 	if (srcdata->colorbuf != NULL) {
 		bfree(srcdata->colorbuf);
 		srcdata->colorbuf = NULL;
@@ -178,7 +184,7 @@
 	add_linebreak:;
 		if (srcdata->text[i] != L'\n')
 			goto draw_glyph;
-		dx = 0;
+		dx = offset;
 		i++;
 		dy += srcdata->max_h + 4;
 		if (i == wcslen(srcdata->text))
@@ -199,7 +205,7 @@
 			goto skip_custom_width;
 
 		if (dx + src_glyph->xadv > srcdata->custom_width) {
-			dx = 0;
+			dx = offset;
 			dy += srcdata->max_h + 4;
 		}
 
@@ -240,39 +246,110 @@
 			      L"!@#$%^&*()-_=+,<.>/?\\|[]{}`~ \'\"\0");
 }
 
-#define glyph_pos x + (y * slot->bitmap.pitch)
-#define buf_pos (dx + x) + ((dy + y) * texbuf_w)
+FT_Render_Mode get_render_mode(struct ft2_source *srcdata)
+{
+	return srcdata->antialiasing ? FT_RENDER_MODE_NORMAL
+				     : FT_RENDER_MODE_MONO;
+}
+
+void load_glyph(struct ft2_source *srcdata, const FT_UInt glyph_index,
+		const FT_Render_Mode render_mode)
+{
+	const FT_Int32 load_mode = render_mode == FT_RENDER_MODE_MONO
+					   ? FT_LOAD_TARGET_MONO
+					   : FT_LOAD_DEFAULT;
+	FT_Load_Glyph(srcdata->font_face, glyph_index, load_mode);
+}
 
-void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
+struct glyph_info *init_glyph(FT_GlyphSlot slot, const uint32_t dx,
+			      const uint32_t dy, const uint32_t g_w,
+			      const uint32_t g_h)
 {
-	FT_GlyphSlot slot;
-	FT_UInt glyph_index = 0;
+	struct glyph_info *glyph = bzalloc(sizeof(struct glyph_info));
+	glyph->u = (float)dx / (float)texbuf_w;
+	glyph->u2 = (float)(dx + g_w) / (float)texbuf_w;
+	glyph->v = (float)dy / (float)texbuf_h;
+	glyph->v2 = (float)(dy + g_h) / (float)texbuf_h;
+	glyph->w = g_w;
+	glyph->h = g_h;
+	glyph->yoff = slot->bitmap_top;
+	glyph->xoff = slot->bitmap_left;
+	glyph->xadv = slot->advance.x >> 6;
+
+	return glyph;
+}
+
+uint8_t get_pixel_value(const unsigned char *buf_row,
+			FT_Render_Mode render_mode, const uint32_t x)
+{
+	if (render_mode == FT_RENDER_MODE_NORMAL) {
+		return buf_row[x];
+	}
+
+	const uint32_t byte_index = x / 8;
+	const uint8_t bit_index = x % 8;
+	const bool pixel_set = (buf_row[byte_index] >> (7 - bit_index)) & 1;
+	return pixel_set ? 255 : 0;
+}
+
+void rasterize(struct ft2_source *srcdata, FT_GlyphSlot slot,
+	       const FT_Render_Mode render_mode, const uint32_t dx,
+	       const uint32_t dy)
+{
+	/**
+	 * The pitch's absolute value is the number of bytes taken by one bitmap
+	 * row, including padding.
+	 *
+	 * Source: https://www.freetype.org/freetype2/docs/reference/ft2-basic_types.html
+	 */
+	const int pitch = abs(slot->bitmap.pitch);
+
+	for (uint32_t y = 0; y < slot->bitmap.rows; y++) {
+		const uint32_t row_start = y * pitch;
+		const uint32_t row = (dy + y) * texbuf_w;
+
+		for (uint32_t x = 0; x < slot->bitmap.width; x++) {
+			const uint32_t row_pixel_position = dx + x;
+			const uint8_t pixel_value =
+				get_pixel_value(&slot->bitmap.buffer[row_start],
+						render_mode, x);
+			srcdata->texbuf[row_pixel_position + row] = pixel_value;
+		}
+	}
+}
 
+void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
+{
 	if (!srcdata->font_face || !cache_glyphs)
 		return;
 
-	slot = srcdata->font_face->glyph;
+	FT_GlyphSlot slot = srcdata->font_face->glyph;
 
-	uint32_t dx = srcdata->texbuf_x, dy = srcdata->texbuf_y;
+	uint32_t dx = srcdata->texbuf_x;
+	uint32_t dy = srcdata->texbuf_y;
 
 	int32_t cached_glyphs = 0;
-	size_t len = wcslen(cache_glyphs);
+	const size_t len = wcslen(cache_glyphs);
+
+	const FT_Render_Mode render_mode = get_render_mode(srcdata);
 
 	for (size_t i = 0; i < len; i++) {
-		glyph_index =
+		const FT_UInt glyph_index =
 			FT_Get_Char_Index(srcdata->font_face, cache_glyphs[i]);
 
-		if (src_glyph != NULL)
-			goto skip_glyph;
+		if (src_glyph != NULL) {
+			continue;
+		}
 
-		FT_Load_Glyph(srcdata->font_face, glyph_index, FT_LOAD_DEFAULT);
-		FT_Render_Glyph(slot, FT_RENDER_MODE_NORMAL);
+		load_glyph(srcdata, glyph_index, render_mode);
+		FT_Render_Glyph(slot, render_mode);
 
-		uint32_t g_w = slot->bitmap.width;
-		uint32_t g_h = slot->bitmap.rows;
+		const uint32_t g_w = slot->bitmap.width;
+		const uint32_t g_h = slot->bitmap.rows;
 
-		if (srcdata->max_h < g_h)
+		if (srcdata->max_h < g_h) {
 			srcdata->max_h = g_h;
+		}
 
 		if (dx + g_w >= texbuf_w) {
 			dx = 0;
@@ -285,22 +362,8 @@
 			break;
 		}
 
-		src_glyph = bzalloc(sizeof(struct glyph_info));
-		src_glyph->u = (float)dx / (float)texbuf_w;
-		src_glyph->u2 = (float)(dx + g_w) / (float)texbuf_w;
-		src_glyph->v = (float)dy / (float)texbuf_h;
-		src_glyph->v2 = (float)(dy + g_h) / (float)texbuf_h;
-		src_glyph->w = g_w;
-		src_glyph->h = g_h;
-		src_glyph->yoff = slot->bitmap_top;
-		src_glyph->xoff = slot->bitmap_left;
-		src_glyph->xadv = slot->advance.x >> 6;
-
-		for (uint32_t y = 0; y < g_h; y++) {
-			for (uint32_t x = 0; x < g_w; x++)
-				srcdata->texbuf[buf_pos] =
-					slot->bitmap.buffer[glyph_pos];
-		}
+		src_glyph = init_glyph(slot, dx, dy, g_w, g_h);
+		rasterize(srcdata, slot, render_mode, dx, dy);
 
 		dx += (g_w + 1);
 		if (dx >= texbuf_w) {
@@ -309,7 +372,6 @@
 		}
 
 		cached_glyphs++;
-	skip_glyph:;
 	}
 
 	srcdata->texbuf_x = dx;
@@ -320,8 +382,7 @@
 		obs_enter_graphics();
 
 		if (srcdata->tex != NULL) {
-			gs_texture_t *tmp_texture = NULL;
-			tmp_texture = srcdata->tex;
+			gs_texture_t *tmp_texture = srcdata->tex;
 			srcdata->tex = NULL;
 			gs_texture_destroy(tmp_texture);
 		}
@@ -497,18 +558,18 @@
 
 uint32_t get_ft2_text_width(wchar_t *text, struct ft2_source *srcdata)
 {
-	FT_GlyphSlot slot = srcdata->font_face->glyph;
-	FT_UInt glyph_index = 0;
-	uint32_t w = 0, max_w = 0;
-	size_t len;
-
-	if (!text)
+	if (!text) {
 		return 0;
+	}
 
-	len = wcslen(text);
+	FT_GlyphSlot slot = srcdata->font_face->glyph;
+	uint32_t w = 0, max_w = 0;
+	const size_t len = wcslen(text);
 	for (size_t i = 0; i < len; i++) {
-		glyph_index = FT_Get_Char_Index(srcdata->font_face, text[i]);
-		FT_Load_Glyph(srcdata->font_face, glyph_index, FT_LOAD_DEFAULT);
+		const FT_UInt glyph_index =
+			FT_Get_Char_Index(srcdata->font_face, text[i]);
+
+		load_glyph(srcdata, glyph_index, get_render_mode(srcdata));
 
 		if (text[i] == L'\n')
 			w = 0;

obs-studio-25.0.8.tar.xz/plugins/vlc-video/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/vlc-video/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/vlc-video/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/vlc-video/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/lt-LT.ini Added

obs-studio-25.0.8.tar.xz/plugins/vlc-video/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/vlc-video/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/ru-RU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/vlc-video/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/data/locale/uk-UA.ini Changed

@@ -1,18 +1,18 @@
-VLCSource="VLC-відео"
+VLCSource="Джерело відео VLC"
 Playlist="Список відтворення"
-LoopPlaylist="Повтор списку відтворення"
-Shuffle="Перемішати список відтворення"
-PlaybackBehavior="Видимість та відтворення"
-PlaybackBehavior.StopRestart="Зупинити, коли не видимий. Грати з початку, коли видимий"
-PlaybackBehavior.PauseUnpause="Призупинити, коли не видимий. Грати далі, коли видимий"
-PlaybackBehavior.AlwaysPlay="Завжди грати навіть тоді, коли не видимий"
-NetworkCaching="Кешування мережевого контенту (мс)"
-PlayPause="Відтворення / Пауза"
-Restart="Грати з початку"
+LoopPlaylist="Повторювати список відтворення"
+Shuffle="Відтворювати у довільному порядку"
+PlaybackBehavior="Поведінка відображення"
+PlaybackBehavior.StopRestart="Зупиняти, коли приховано; перезапускати, коли видно"
+PlaybackBehavior.PauseUnpause="Ставити на паузу, коли приховано; відновлювати, коли видно"
+PlaybackBehavior.AlwaysPlay="Завжди відтворювати, навіть коли приховано"
+NetworkCaching="Мережеве кешування (мс)"
+PlayPause="Відтворити/пауза"
+Restart="Перезапуск"
 Stop="Зупинити"
 PlaylistNext="Наступний"
 PlaylistPrev="Попередній"
-AudioTrack="Аудіо доріжка"
+AudioTrack="Звукова доріжка"
 SubtitleTrack="Доріжка субтитрів"
 SubtitleEnable="Увімкнути субтитри"

obs-studio-25.0.8.tar.xz/plugins/vlc-video/vlc-video-plugin.c -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/vlc-video-plugin.c Changed

@@ -24,6 +24,7 @@
 LIBVLC_MEDIA_ADD_OPTION libvlc_media_add_option_;
 LIBVLC_MEDIA_RELEASE libvlc_media_release_;
 LIBVLC_MEDIA_RELEASE libvlc_media_retain_;
+LIBVLC_MEDIA_GET_META libvlc_media_get_meta_;
 
 /* libvlc media player */
 LIBVLC_MEDIA_PLAYER_NEW libvlc_media_player_new_;
@@ -41,6 +42,7 @@
 LIBVLC_MEDIA_PLAYER_EVENT_MANAGER libvlc_media_player_event_manager_;
 LIBVLC_MEDIA_PLAYER_GET_STATE libvlc_media_player_get_state_;
 LIBVLC_MEDIA_PLAYER_GET_LENGTH libvlc_media_player_get_length_;
+LIBVLC_MEDIA_PLAYER_GET_MEDIA libvlc_media_player_get_media_;
 
 /* libvlc media list */
 LIBVLC_MEDIA_LIST_NEW libvlc_media_list_new_;
@@ -99,6 +101,7 @@
 	LOAD_VLC_FUNC(libvlc_media_add_option);
 	LOAD_VLC_FUNC(libvlc_media_release);
 	LOAD_VLC_FUNC(libvlc_media_retain);
+	LOAD_VLC_FUNC(libvlc_media_get_meta);
 
 	/* libvlc media player */
 	LOAD_VLC_FUNC(libvlc_media_player_new);
@@ -116,6 +119,7 @@
 	LOAD_VLC_FUNC(libvlc_media_player_event_manager);
 	LOAD_VLC_FUNC(libvlc_media_player_get_state);
 	LOAD_VLC_FUNC(libvlc_media_player_get_length);
+	LOAD_VLC_FUNC(libvlc_media_player_get_media);
 
 	/* libvlc media list */
 	LOAD_VLC_FUNC(libvlc_media_list_new);

obs-studio-25.0.8.tar.xz/plugins/vlc-video/vlc-video-plugin.h -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/vlc-video-plugin.h Changed

@@ -35,6 +35,8 @@
 					const char *options);
 typedef void (*LIBVLC_MEDIA_RETAIN)(libvlc_media_t *p_md);
 typedef void (*LIBVLC_MEDIA_RELEASE)(libvlc_media_t *p_md);
+typedef char *(*LIBVLC_MEDIA_GET_META)(libvlc_media_t *p_md,
+				       libvlc_meta_t e_meta);
 
 /* libvlc media player */
 typedef libvlc_media_player_t *(*LIBVLC_MEDIA_PLAYER_NEW)(
@@ -71,6 +73,8 @@
 	libvlc_media_player_t *p_mi);
 typedef libvlc_time_t (*LIBVLC_MEDIA_PLAYER_GET_LENGTH)(
 	libvlc_media_player_t *p_mi);
+typedef libvlc_media_t *(*LIBVLC_MEDIA_PLAYER_GET_MEDIA)(
+	libvlc_media_player_t *p_mi);
 
 /* libvlc media list */
 typedef libvlc_media_list_t *(*LIBVLC_MEDIA_LIST_NEW)(
@@ -118,6 +122,7 @@
 extern LIBVLC_MEDIA_ADD_OPTION libvlc_media_add_option_;
 extern LIBVLC_MEDIA_RELEASE libvlc_media_release_;
 extern LIBVLC_MEDIA_RETAIN libvlc_media_retain_;
+extern LIBVLC_MEDIA_GET_META libvlc_media_get_meta_;
 
 /* libvlc media player */
 extern LIBVLC_MEDIA_PLAYER_NEW libvlc_media_player_new_;
@@ -135,6 +140,7 @@
 extern LIBVLC_MEDIA_PLAYER_EVENT_MANAGER libvlc_media_player_event_manager_;
 extern LIBVLC_MEDIA_PLAYER_GET_STATE libvlc_media_player_get_state_;
 extern LIBVLC_MEDIA_PLAYER_GET_LENGTH libvlc_media_player_get_length_;
+extern LIBVLC_MEDIA_PLAYER_GET_MEDIA libvlc_media_player_get_media_;
 
 /* libvlc media list */
 extern LIBVLC_MEDIA_LIST_NEW libvlc_media_list_new_;

obs-studio-25.0.8.tar.xz/plugins/vlc-video/vlc-video-source.c -> obs-studio-26.0.0.tar.xz/plugins/vlc-video/vlc-video-source.c Changed

@@ -115,6 +115,10 @@
 	da_free(files);
 }
 
+#define MAKEFORMAT(ch0, ch1, ch2, ch3)                                \
+	((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) | \
+	 ((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24))
+
 static inline bool chroma_is(const char *chroma, const char *val)
 {
 	return *(uint32_t *)chroma == *(uint32_t *)val;
@@ -127,12 +131,12 @@
 #define CHROMA_TEST(val, ret)       \
 	if (chroma_is(chroma, val)) \
 	return ret
-#define CHROMA_CONV(val, new_val, ret)                              \
-	do {                                                        \
-		if (chroma_is(chroma, val)) {                       \
-			*(uint32_t *)chroma = *(uint32_t *)new_val; \
-			return ret;                                 \
-		}                                                   \
+#define CHROMA_CONV(val, new_val, ret)                           \
+	do {                                                     \
+		if (chroma_is(chroma, val)) {                    \
+			*(uint32_t *)chroma = (uint32_t)new_val; \
+			return ret;                              \
+		}                                                \
 	} while (false)
 #define CHROMA_CONV_FULL(val, new_val, ret)     \
 	do {                                    \
@@ -147,13 +151,14 @@
 	CHROMA_TEST("NV12", VIDEO_FORMAT_NV12);
 	CHROMA_TEST("I420", VIDEO_FORMAT_I420);
 	CHROMA_TEST("IYUV", VIDEO_FORMAT_I420);
-	CHROMA_CONV("NV21", "NV12", VIDEO_FORMAT_NV12);
-	CHROMA_CONV("I422", "NV12", VIDEO_FORMAT_NV12);
-	CHROMA_CONV("Y42B", "NV12", VIDEO_FORMAT_NV12);
-	CHROMA_CONV("YV12", "NV12", VIDEO_FORMAT_NV12);
-	CHROMA_CONV("yv12", "NV12", VIDEO_FORMAT_NV12);
+	CHROMA_CONV("NV21", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_NV12);
+	CHROMA_CONV("I422", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_NV12);
+	CHROMA_CONV("Y42B", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_NV12);
+	CHROMA_CONV("YV12", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_NV12);
+	CHROMA_CONV("yv12", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_NV12);
 
-	CHROMA_CONV_FULL("J420", "J420", VIDEO_FORMAT_I420);
+	CHROMA_CONV_FULL("J420", MAKEFORMAT('J', '4', '2', '0'),
+			 VIDEO_FORMAT_I420);
 
 	/* 4:2:2 formats */
 	CHROMA_TEST("UYVY", VIDEO_FORMAT_UYVY);
@@ -174,33 +179,34 @@
 
 	CHROMA_TEST("YVYU", VIDEO_FORMAT_YVYU);
 
-	CHROMA_CONV("v210", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("cyuv", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("CYUV", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("VYUY", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("NV16", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("NV61", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("I410", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("I422", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("Y42B", "UYVY", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("J422", "UYVY", VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("v210", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("cyuv", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("CYUV", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("VYUY", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("NV16", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("NV61", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("I410", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("I422", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("Y42B", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("J422", MAKEFORMAT('U', 'Y', 'V', 'Y'), VIDEO_FORMAT_UYVY);
 
 	/* 4:4:4 formats */
 	CHROMA_TEST("I444", VIDEO_FORMAT_I444);
-	CHROMA_CONV_FULL("J444", "RGBA", VIDEO_FORMAT_RGBA);
-	CHROMA_CONV("YUVA", "RGBA", VIDEO_FORMAT_RGBA);
+	CHROMA_CONV_FULL("J444", MAKEFORMAT('R', 'G', 'B', 'A'),
+			 VIDEO_FORMAT_RGBA);
+	CHROMA_CONV("YUVA", MAKEFORMAT('R', 'G', 'B', 'A'), VIDEO_FORMAT_RGBA);
 
 	/* 4:4:0 formats */
-	CHROMA_CONV("I440", "I444", VIDEO_FORMAT_I444);
-	CHROMA_CONV("J440", "I444", VIDEO_FORMAT_I444);
+	CHROMA_CONV("I440", MAKEFORMAT('I', '4', '4', '4'), VIDEO_FORMAT_I444);
+	CHROMA_CONV("J440", MAKEFORMAT('I', '4', '4', '4'), VIDEO_FORMAT_I444);
 
 	/* 4:1:0 formats */
-	CHROMA_CONV("YVU9", "NV12", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("I410", "NV12", VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("YVU9", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("I410", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_UYVY);
 
 	/* 4:1:1 formats */
-	CHROMA_CONV("I411", "NV12", VIDEO_FORMAT_UYVY);
-	CHROMA_CONV("Y41B", "NV12", VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("I411", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_UYVY);
+	CHROMA_CONV("Y41B", MAKEFORMAT('N', 'V', '1', '2'), VIDEO_FORMAT_UYVY);
 
 	/* greyscale formats */
 	CHROMA_TEST("GREY", VIDEO_FORMAT_Y800);
@@ -210,7 +216,7 @@
 #undef CHROMA_CONV
 #undef CHROMA_TEST
 
-	*(uint32_t *)chroma = *(uint32_t *)"BGRA";
+	*(uint32_t *)chroma = (uint32_t)MAKEFORMAT('B', 'G', 'R', 'A');
 	return VIDEO_FORMAT_BGRA;
 }
 
@@ -243,39 +249,94 @@
 #define AUDIO_TEST(val, ret)        \
 	if (chroma_is(format, val)) \
 	return ret
-#define AUDIO_CONV(val, new_val, ret)                               \
-	do {                                                        \
-		if (chroma_is(format, val)) {                       \
-			*(uint32_t *)format = *(uint32_t *)new_val; \
-			return ret;                                 \
-		}                                                   \
+#define AUDIO_CONV(val, new_val, ret)                            \
+	do {                                                     \
+		if (chroma_is(format, val)) {                    \
+			*(uint32_t *)format = (uint32_t)new_val; \
+			return ret;                              \
+		}                                                \
 	} while (false)
 
 	AUDIO_TEST("S16N", AUDIO_FORMAT_16BIT);
 	AUDIO_TEST("S32N", AUDIO_FORMAT_32BIT);
 	AUDIO_TEST("FL32", AUDIO_FORMAT_FLOAT);
 
-	AUDIO_CONV("U16N", "S16N", AUDIO_FORMAT_16BIT);
-	AUDIO_CONV("U32N", "S32N", AUDIO_FORMAT_32BIT);
-	AUDIO_CONV("S24N", "S32N", AUDIO_FORMAT_32BIT);
-	AUDIO_CONV("U24N", "S32N", AUDIO_FORMAT_32BIT);
-	AUDIO_CONV("FL64", "FL32", AUDIO_FORMAT_FLOAT);
-
-	AUDIO_CONV("S16I", "S16N", AUDIO_FORMAT_16BIT);
-	AUDIO_CONV("U16I", "S16N", AUDIO_FORMAT_16BIT);
-	AUDIO_CONV("S24I", "S32N", AUDIO_FORMAT_32BIT);
-	AUDIO_CONV("U24I", "S32N", AUDIO_FORMAT_32BIT);
-	AUDIO_CONV("S32I", "S32N", AUDIO_FORMAT_32BIT);
-	AUDIO_CONV("U32I", "S32N", AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("U16N", MAKEFORMAT('S', '1', '6', 'N'), AUDIO_FORMAT_16BIT);
+	AUDIO_CONV("U32N", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("S24N", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("U24N", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("FL64", MAKEFORMAT('F', 'L', '3', '2'), AUDIO_FORMAT_FLOAT);
+
+	AUDIO_CONV("S16I", MAKEFORMAT('S', '1', '6', 'N'), AUDIO_FORMAT_16BIT);
+	AUDIO_CONV("U16I", MAKEFORMAT('S', '1', '6', 'N'), AUDIO_FORMAT_16BIT);
+	AUDIO_CONV("S24I", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("U24I", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("S32I", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
+	AUDIO_CONV("U32I", MAKEFORMAT('S', '3', '2', 'N'), AUDIO_FORMAT_32BIT);
 #undef AUDIO_CONV
 #undef AUDIO_TEST
 
-	*(uint32_t *)format = *(uint32_t *)"FL32";
+	*(uint32_t *)format = (uint32_t)MAKEFORMAT('F', 'L', '3', '2');
 	return AUDIO_FORMAT_FLOAT;
 }
 
 /* ------------------------------------------------------------------------- */
 
+static void vlcs_get_metadata(void *data, calldata_t *cd)
+{
+	struct vlc_source *vlcs = data;
+	const char *data_id = calldata_string(cd, "tag_id");
+
+	if (!vlcs || !data_id)
+		return;
+	libvlc_media_t *media =
+		libvlc_media_player_get_media_(vlcs->media_player);
+
+	if (!media)
+		return;
+
+#define VLC_META(media, cd, did, tid, tag)                               \
+	else if (strcmp(did, tid) == 0)                                  \
+	{                                                                \
+		calldata_set_string(cd, "tag_data",                      \
+				    libvlc_media_get_meta_(media, tag)); \
+	}
+
+	if (strcmp(data_id, "title") == 0)
+		calldata_set_string(cd, "tag_data",
+				    libvlc_media_get_meta_(media,
+							   libvlc_meta_Title));
+
+	VLC_META(media, cd, data_id, "artist", libvlc_meta_Artist)
+	VLC_META(media, cd, data_id, "genre", libvlc_meta_Genre)
+	VLC_META(media, cd, data_id, "copyright", libvlc_meta_Copyright)
+	VLC_META(media, cd, data_id, "album", libvlc_meta_Album)
+	VLC_META(media, cd, data_id, "track_number", libvlc_meta_TrackNumber)
+	VLC_META(media, cd, data_id, "description", libvlc_meta_Description)
+	VLC_META(media, cd, data_id, "rating", libvlc_meta_Rating)
+	VLC_META(media, cd, data_id, "date", libvlc_meta_Date)
+	VLC_META(media, cd, data_id, "setting", libvlc_meta_Setting)
+	VLC_META(media, cd, data_id, "url", libvlc_meta_URL)
+	VLC_META(media, cd, data_id, "language", libvlc_meta_Language)
+	VLC_META(media, cd, data_id, "now_playing", libvlc_meta_NowPlaying)
+	VLC_META(media, cd, data_id, "publisher", libvlc_meta_Publisher)
+	VLC_META(media, cd, data_id, "encoded_by", libvlc_meta_EncodedBy)
+	VLC_META(media, cd, data_id, "artwork_url", libvlc_meta_ArtworkURL)
+	VLC_META(media, cd, data_id, "track_id", libvlc_meta_TrackID)
+	VLC_META(media, cd, data_id, "track_total", libvlc_meta_TrackTotal)
+	VLC_META(media, cd, data_id, "director", libvlc_meta_Director)
+	VLC_META(media, cd, data_id, "season", libvlc_meta_Season)
+	VLC_META(media, cd, data_id, "episode", libvlc_meta_Episode)
+	VLC_META(media, cd, data_id, "show_name", libvlc_meta_ShowName)
+	VLC_META(media, cd, data_id, "actors", libvlc_meta_Actors)
+	VLC_META(media, cd, data_id, "album_artist", libvlc_meta_AlbumArtist)
+	VLC_META(media, cd, data_id, "disc_number", libvlc_meta_DiscNumber)
+	VLC_META(media, cd, data_id, "disc_total", libvlc_meta_DiscTotal)
+#undef VLC_META
+}
+
+/* ------------------------------------------------------------------------- */
+
 static const char *vlcs_get_name(void *unused)
 {
 	UNUSED_PARAMETER(unused);
@@ -779,7 +840,7 @@
 
 	enum obs_media_state state = obs_source_media_get_state(c->source);
 
-	if (pressed && obs_source_active(c->source)) {
+	if (pressed && obs_source_showing(c->source)) {
 		if (state == OBS_MEDIA_STATE_PLAYING)
 			obs_source_media_play_pause(c->source, true);
 		else if (state == OBS_MEDIA_STATE_PAUSED)
@@ -795,7 +856,7 @@
 
 	struct vlc_source *c = data;
 
-	if (pressed && obs_source_active(c->source))
+	if (pressed && obs_source_showing(c->source))
 		obs_source_media_restart(c->source);
 }
 
@@ -807,7 +868,7 @@
 
 	struct vlc_source *c = data;
 
-	if (pressed && obs_source_active(c->source))
+	if (pressed && obs_source_showing(c->source))
 		obs_source_media_stop(c->source);
 }
 
@@ -819,7 +880,7 @@
 
 	struct vlc_source *c = data;
 
-	if (pressed && obs_source_active(c->source))
+	if (pressed && obs_source_showing(c->source))
 		obs_source_media_next(c->source);
 }
 
@@ -831,7 +892,7 @@
 
 	struct vlc_source *c = data;
 
-	if (pressed && obs_source_active(c->source))
+	if (pressed && obs_source_showing(c->source))
 		obs_source_media_previous(c->source);
 }
 
@@ -895,6 +956,11 @@
 	libvlc_event_attach_(event_manager, libvlc_MediaPlayerOpening,
 			     vlcs_started, c);
 
+	proc_handler_t *ph = obs_source_get_proc_handler(source);
+	proc_handler_add(
+		ph, "void get_metadata(in string tag_id out string tag_data)",
+		vlcs_get_metadata, c);
+
 	obs_source_update(source, NULL);
 
 	UNUSED_PARAMETER(settings);

obs-studio-25.0.8.tar.xz/plugins/win-capture/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-capture/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/cursor-capture.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/cursor-capture.c Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/cursor-capture.h -> obs-studio-26.0.0.tar.xz/plugins/win-capture/cursor-capture.h Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ar-SA.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ar-SA.ini Changed

@@ -1,19 +1,22 @@
 MonitorCapture="التقاط جهاز العرض"
 WindowCapture="التقاط النافذة"
 WindowCapture.Window="نافذة"
+WindowCapture.Method="طريقة الإلتقاط"
+WindowCapture.Method.Auto="تلقائي"
+WindowCapture.Method.BitBlt="BitBlt (ويندوز 7 وما فوق)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows Graphics Capture (ويندوز 10 نسخة 1903 و مافوق)"
 WindowCapture.Priority="أولوية النوافذ المختارة"
 WindowCapture.Priority.Title="يجب أن يتطابق مع عنوان النافذة"
 WindowCapture.Priority.Class="تطابق العنوان, عدا ذلك إيجاد نافذة أخرى من نفس النوع"
 WindowCapture.Priority.Exe="تطابق العنوان, عدا ذلك إيجاد نافذة أخرى من نفس التطبيق"
 CaptureCursor="مؤشر الالتقاط"
 Compatibility="توافق محول متعدد"
+ClientArea="بدون شريط العنوان"
 AllowTransparency="السماح بالشفافية"
 Monitor="جهاز العرض"
 PrimaryMonitor="الشاشة الأساسية"
 GameCapture="التقاط لعبة"
 GameCapture.AnyFullscreen="التقاط أي تطبيق في وضع ملء الشاشة"
-GameCapture.ForceScaling="إجبار التمدد"
-GameCapture.ScaleRes="دقة التمدد"
 GameCapture.HookRate.Slow="بطيء"
 GameCapture.HookRate.Normal="عادي (مسحتسن)"
 GameCapture.HookRate.Fast="سريع"

obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/az-AZ.ini Added

obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/bg-BG.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/bg-BG.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/bn-BD.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/bn-BD.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ca-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ca-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/cs-CZ.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/cs-CZ.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/da-DK.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/da-DK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/de-DE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/el-GR.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/el-GR.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/en-GB.ini Added

@@ -0,0 +1,34 @@
+MonitorCapture="Display Capture"
+WindowCapture="Window Capture"
+WindowCapture.Window="Window"
+WindowCapture.Method="Capture Method"
+WindowCapture.Method.Auto="Automatic"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 and up)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows Graphics Capture (Windows 10 1903 and up)"
+WindowCapture.Priority="Window Match Priority"
+WindowCapture.Priority.Title="Window title must match"
+WindowCapture.Priority.Class="Match title, otherwise find window of same type"
+WindowCapture.Priority.Exe="Match title, otherwise find window of same executable"
+CaptureCursor="Capture Cursor"
+Compatibility="Multi-adapter Compatibility"
+ClientArea="Client Area"
+SLIFix="SLI/Crossfire Capture Mode (Slow)"
+AllowTransparency="Allow Transparency"
+Monitor="Display"
+PrimaryMonitor="Primary Monitor"
+GameCapture="Game Capture"
+GameCapture.AnyFullscreen="Capture any fullscreen application"
+GameCapture.CaptureWindow="Capture specific window"
+GameCapture.UseHotkey="Capture foreground window with hotkey"
+GameCapture.LimitFramerate="Limit capture framerate"
+GameCapture.CaptureOverlays="Capture third-party overlays (such as steam)"
+GameCapture.AntiCheatHook="Use anti-cheat compatibility hook"
+GameCapture.HotkeyStart="Capture foreground window"
+GameCapture.HotkeyStop="Deactivate capture"
+GameCapture.HookRate="Hook Rate"
+GameCapture.HookRate.Slow="Slow"
+GameCapture.HookRate.Normal="Normal (recommended)"
+GameCapture.HookRate.Fast="Fast"
+GameCapture.HookRate.Fastest="Fastest"
+Mode="Mode"
+

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/en-US.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/en-US.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/es-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/eu-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/eu-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/fi-FI.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/fi-FI.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/fil-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/fil-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/fr-FR.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/fr-FR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/gd-GB.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/gd-GB.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/gl-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/gl-ES.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/he-IL.ini Changed

@@ -1,12 +1,17 @@
 MonitorCapture="לכידת תצוגה"
 WindowCapture="לכידת חלון"
 WindowCapture.Window="חלון"
+WindowCapture.Method="שיטת לכידה"
+WindowCapture.Method.Auto="אוטומטי"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 ומעלה)"
+WindowCapture.Method.WindowsGraphicsCapture="לכידת גרפיקת (Windows 10 1903 ומעלה)"
 WindowCapture.Priority="חלון התאמת עדיפות"
 WindowCapture.Priority.Title="כותרת חלון חייבת להתאים"
 WindowCapture.Priority.Class="התאם כותרת, אחרת מצא חלון מאותו סוג"
 WindowCapture.Priority.Exe="התאם כותרת, אחרת תמצא חלון של אותו קובץ הפעלה"
 CaptureCursor="לכד סמן"
 Compatibility="מתאם מרובה תאימות"
+ClientArea="אזור לקוח"
 SLIFix="SLI/Crossfire מצב לכידה (איטי)"
 AllowTransparency="אפשר שקיפות"
 Monitor="צג"
@@ -15,12 +20,14 @@
 GameCapture.AnyFullscreen="לכוד כל יישום מסך מלא"
 GameCapture.CaptureWindow="לכידת חלון ספציפי"
 GameCapture.UseHotkey="לכוד חלון חזית עם hotkey"
-GameCapture.ForceScaling="הכרח שינוי גודל"
-GameCapture.ScaleRes="גודל רזולוציה"
 GameCapture.LimitFramerate="מגבלת לכידת קצב פריימים"
 GameCapture.CaptureOverlays="לכידת כיסוי צד שלישי (כגון סטים)"
 GameCapture.AntiCheatHook="השתמש באנטי-צ'יט לרמות הוק"
 GameCapture.HotkeyStart="לכידת חלון חזית"
 GameCapture.HotkeyStop="בטל לכידה"
+GameCapture.HookRate.Slow="איטי"
+GameCapture.HookRate.Normal="רגיל (מומלץ)"
+GameCapture.HookRate.Fast="מהיר"
+GameCapture.HookRate.Fastest="הכי מהיר"
 Mode="מצב"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/hr-HR.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/hr-HR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/hu-HU.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/hu-HU.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/id-ID.ini Added

@@ -0,0 +1,34 @@
+MonitorCapture="Tangkapan Layar"
+WindowCapture="Tangkapan Jendela"
+WindowCapture.Window="Jendela"
+WindowCapture.Method="Metode Tangkapan"
+WindowCapture.Method.Auto="Otomatis"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 ke atas)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows Graphics Capture (Windows 10 1903 ke atas)"
+WindowCapture.Priority="Prioritas Kecocokan Jendela"
+WindowCapture.Priority.Title="Judul jendela harus cocok"
+WindowCapture.Priority.Class="Sesuai judul, jika tidak ada cari tipe jendela yang sama"
+WindowCapture.Priority.Exe="Sesuai judul, jika tidak ada cari jendela dengan executable sama"
+CaptureCursor="Tangkap Kursor"
+Compatibility="Kompatibilitas Multi-adapter"
+ClientArea="Area Client"
+SLIFix="Mode Tangkapan Gambar SLI/Crossfire (Lambat)"
+AllowTransparency="Bolehkan Transparansi"
+Monitor="Tampilan"
+PrimaryMonitor="Monitor Utama"
+GameCapture="Tangkapan Game"
+GameCapture.AnyFullscreen="Tangkap aplikasi layar penuh apapun"
+GameCapture.CaptureWindow="Tangkap jendela spesifik"
+GameCapture.UseHotkey="Ambil jendela foreground dengan hotkey"
+GameCapture.LimitFramerate="Batasi framerate tangkapan"
+GameCapture.CaptureOverlays="Tangkap overlay pihak ketiga (seperti steam)"
+GameCapture.AntiCheatHook="Gunakan hook kompatibilitas anti-cheat"
+GameCapture.HotkeyStart="Tangkap jendela foreground"
+GameCapture.HotkeyStop="Nonaktifkan tangkapan"
+GameCapture.HookRate="Tingkat Hook"
+GameCapture.HookRate.Slow="Lambat"
+GameCapture.HookRate.Normal="Normal (direkomendasikan)"
+GameCapture.HookRate.Fast="Cepat"
+GameCapture.HookRate.Fastest="Sangat cepat"
+Mode="Mode"
+

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/it-IT.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/it-IT.ini Changed

@@ -3,8 +3,8 @@
 WindowCapture.Window="Finestra"
 WindowCapture.Method="Metodo di acquisizione"
 WindowCapture.Method.Auto="Automatico"
-WindowCapture.Method.BitBlt="BitBlt (Windows 7 e superiore)"
-WindowCapture.Method.WindowsGraphicsCapture="Cattura Grafica Windows (Windows 10 1903 e superiore)"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 o superiore)"
+WindowCapture.Method.WindowsGraphicsCapture="Cattura Grafica di Windows (Windows 10 1903 o superiore)"
 WindowCapture.Priority="Tipo di ricerca della finestra"
 WindowCapture.Priority.Title="Il titolo della finestra deve corrispondere"
 WindowCapture.Priority.Class="Il titolo della finestra deve corrispondere, altrimenti cercare una finestra dello stesso tipo"
@@ -20,8 +20,6 @@
 GameCapture.AnyFullscreen="Cattura qualsiasi applicazione a schermo intero"
 GameCapture.CaptureWindow="Cattura una finestra specifica"
 GameCapture.UseHotkey="Cattura la finestra in primo piano con la scorciatoia"
-GameCapture.ForceScaling="Forza la scalatura"
-GameCapture.ScaleRes="Risoluzione scalata"
 GameCapture.LimitFramerate="Limita i fotogrammi della cattura"
 GameCapture.CaptureOverlays="Cattura gli overlay di terze parti (come quello di Steam)"
 GameCapture.AntiCheatHook="Utilizza il metodo di cattura compatibile con gli anti-cheat"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ja-JP.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ja-JP.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ka-GE.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ka-GE.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ko-KR.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ko-KR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/mn-MN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/mn-MN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/nb-NO.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/nb-NO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/nl-NL.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/nl-NL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/pl-PL.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/pl-PL.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/pt-BR.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/pt-BR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/pt-PT.ini Changed

@@ -1,12 +1,15 @@
 MonitorCapture="Ecrã de captura"
 WindowCapture="Captura de janela"
 WindowCapture.Window="Janela"
+WindowCapture.Method="Método de Captura"
+WindowCapture.Method.Auto="Automático"
 WindowCapture.Priority="Prioridade de emparelhamento de janela"
 WindowCapture.Priority.Title="O título da janela tem de corresponder"
 WindowCapture.Priority.Class="Corresponder título, caso contrário, encontrar janela do mesmo tipo"
 WindowCapture.Priority.Exe="Match title, otherwise find window of same executable"
 CaptureCursor="Capturar cursor"
 Compatibility="Compatibilidade multi-adaptador"
+ClientArea="Área do Cliente"
 SLIFix="SLI/Modo de captura de fogo cruzado (lento)"
 AllowTransparency="Permitir transparência"
 Monitor="Ecrã"
@@ -15,8 +18,6 @@
 GameCapture.AnyFullscreen="Capturar qualquer aplicação em ecrã inteiro"
 GameCapture.CaptureWindow="Captar uma janela especifica"
 GameCapture.UseHotkey="Captura de janela em primeiro plano com tecla de atalho"
-GameCapture.ForceScaling="Forçar escalamento"
-GameCapture.ScaleRes="Escalar resolução"
 GameCapture.LimitFramerate="Limitar taxa de fotogramas da captura"
 GameCapture.CaptureOverlays="Capturar sobreposições de terceiros (tais como as do Steam)"
 GameCapture.AntiCheatHook="Utilizar gancho de compatibilidade anti-batota"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ro-RO.ini Changed

@@ -1,12 +1,17 @@
 MonitorCapture="Captură de display"
 WindowCapture="Captură de fereastră"
 WindowCapture.Window="Fereastră"
+WindowCapture.Method="Metoda de captură"
+WindowCapture.Method.Auto="Automat"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 și versiunile ulterioare de Windows)"
+WindowCapture.Method.WindowsGraphicsCapture="Captură Windows Graphics (Windows 10 1903 și sus)"
 WindowCapture.Priority="Prioritate de potrivire a ferestrelor"
 WindowCapture.Priority.Title="Titlul ferestrei trebuie să se potrivească"
 WindowCapture.Priority.Class="Titlul să se potrivească, altminteri găsește o fereastră de același tip"
 WindowCapture.Priority.Exe="Titlul să se potrivească, altminteri găsește o fereastră a aceluiași executabil"
 CaptureCursor="Capturează cursorul"
 Compatibility="Compatibilitate pentru multiadaptoare"
+ClientArea="Zona clientului"
 SLIFix="Mod de captură SLI/Crossfire (Lent)"
 AllowTransparency="Permite transparență"
 Monitor="Display"
@@ -15,8 +20,6 @@
 GameCapture.AnyFullscreen="Capturează orice aplicație în ecran complet"
 GameCapture.CaptureWindow="Capturează o fereastră specifică"
 GameCapture.UseHotkey="Capturează fereastra din prim-plan cu o tastă rapidă"
-GameCapture.ForceScaling="Forțează scalarea"
-GameCapture.ScaleRes="Scalează rezoluția"
 GameCapture.LimitFramerate="Limitează frecvența de cadre a capturii"
 GameCapture.CaptureOverlays="Capturează overlay-uri terțe (precum Steam)"
 GameCapture.AntiCheatHook="Folosește hook pentru compatibilitate anticheat"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/sk-SK.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/sk-SK.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/sl-SI.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/sl-SI.ini Changed

@@ -1,12 +1,17 @@
 MonitorCapture="Zajemanje zaslona"
 WindowCapture="Zajemanje okna"
 WindowCapture.Window="Okno"
+WindowCapture.Method="Način zajema"
+WindowCapture.Method.Auto="Samodejno"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 in novejši)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows Graphics Capture (Windows 10 1903 in novejši)"
 WindowCapture.Priority="Prednost ujemanja okna"
 WindowCapture.Priority.Title="Ujemati se mora naziv okna"
 WindowCapture.Priority.Class="Naziv se mora ujemati, sicer poiščite okno iste vrste"
 WindowCapture.Priority.Exe="Naziv se mora ujemati, sicer poiščite okno istega programa"
 CaptureCursor="Zajemaj kazalec"
 Compatibility="Združljivo z več karticami"
+ClientArea="Območje klienta"
 SLIFix="Način zajemanja SLI/Crossfire (počasno)"
 AllowTransparency="Omogoči prozornost"
 Monitor="Zaslon"
@@ -15,8 +20,6 @@
 GameCapture.AnyFullscreen="Zajemaj katerikoli celozaslonski program"
 GameCapture.CaptureWindow="Zajemaj določeno okno"
 GameCapture.UseHotkey="Zajemaj okno v ospredju s hitro tipko"
-GameCapture.ForceScaling="Vsili sprem. velikosti"
-GameCapture.ScaleRes="Spremenjena ločljivost"
 GameCapture.LimitFramerate="Omeji hitrost sličic zajema"
 GameCapture.CaptureOverlays="Zajemaj prekrivne plast tretjih oseb (kot je npr. Steam)"
 GameCapture.AntiCheatHook="Uporabi priključek, združljiv s sistemom proti goljufanju"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/sr-CS.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/sr-CS.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/sr-SP.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/sr-SP.ini Changed

@@ -1,6 +1,10 @@
 MonitorCapture="Прикажи улаз"
 WindowCapture="Улаз са прозора"
 WindowCapture.Window="Прозор"
+WindowCapture.Method="Метода снимања"
+WindowCapture.Method.Auto="Аутоматски"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 и новије)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows Graphics Capture (Windows 10 1903 и новије)"
 WindowCapture.Priority="Приоритет прозора"
 WindowCapture.Priority.Title="Наслов прозора мора да се подудара"
 WindowCapture.Priority.Class="Ускладите наслов, или у супротном пронађите прозор истог типа"
@@ -15,8 +19,6 @@
 GameCapture.AnyFullscreen="Улаз са било које апликације која је преко целог екрана"
 GameCapture.CaptureWindow="Снимање одређеног прозора"
 GameCapture.UseHotkey="Снимање прозора у првом плану са тастатурном пречицом"
-GameCapture.ForceScaling="Присилно скалирање"
-GameCapture.ScaleRes="Скалирана резолуција"
 GameCapture.LimitFramerate="Ограничи framerate снимања"
 GameCapture.CaptureOverlays="Снимај overlay треће стране (као што је steam)"
 GameCapture.AntiCheatHook="Користи прикључак за компатибилност са заштитом од варања"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/sv-SE.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/sv-SE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/tl-PH.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/tl-PH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/tr-TR.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/tr-TR.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/uk-UA.ini Changed

@@ -1,36 +1,34 @@
-MonitorCapture="Захват екрану"
-WindowCapture="Захват вікна"
+MonitorCapture="Захоплення екрана"
+WindowCapture="Захоплення вікна"
 WindowCapture.Window="Вікно"
-WindowCapture.Method="Метод захвату"
-WindowCapture.Method.Auto="Автоматично"
+WindowCapture.Method="Метод захоплення"
+WindowCapture.Method.Auto="Автоматичний"
 WindowCapture.Method.BitBlt="BitBlt (Windows 7 та вище)"
-WindowCapture.Method.WindowsGraphicsCapture="Власний захват графіки у Windows (Windows 10 1903 та вище)"
-WindowCapture.Priority="Пріоритет схожості"
-WindowCapture.Priority.Title="Заголовок вікна має відповідати"
-WindowCapture.Priority.Class="Спочатку заголовок вікна, потім шукати схожий тип вікна"
-WindowCapture.Priority.Exe="Спочатку заголовок вікна, потім шукати вікно того ж виконавчого файлу"
-CaptureCursor="Захват курсору"
-Compatibility="Сумісність з Мульті-адаптерами"
+WindowCapture.Method.WindowsGraphicsCapture="Windows Graphics Capture (Windows 10 1903 та вище)"
+WindowCapture.Priority="Пріоритет відповідності вікна"
+WindowCapture.Priority.Title="Заголовок вікна має збігатись"
+WindowCapture.Priority.Class="Збіг заголовку, інакше знайти вікно такого ж типу"
+WindowCapture.Priority.Exe="Збіг заголовку, інакше знайти вікно такого ж виконуваного файлу"
+CaptureCursor="Захоплення курсору"
+Compatibility="Сумісність з мультиадаптерними конфігураціями"
 ClientArea="Область клієнта"
-SLIFix="Режим для захвату SLI/Crossfire (повільний)"
-AllowTransparency="Дозволяти прозорість"
-Monitor="Екран"
-PrimaryMonitor="Основний дисплей"
-GameCapture="Захват гри"
-GameCapture.AnyFullscreen="Захоплювати будь-яку програму, яка в повноекранному режимі"
-GameCapture.CaptureWindow="Захоплювати вказане вікно"
-GameCapture.UseHotkey="Захоплювати перше наявне вікно за гарячою клавішою"
-GameCapture.ForceScaling="Змінити масштаб"
-GameCapture.ScaleRes="Новий масштаб"
-GameCapture.LimitFramerate="Обмежити частоту кадрів захвату"
+SLIFix="Режим захоплення SLI/Crossfire (повільний)"
+AllowTransparency="Дозволити прозорість"
+Monitor="Дисплей"
+PrimaryMonitor="Основний монітор"
+GameCapture="Захоплення гри"
+GameCapture.AnyFullscreen="Захоплення будь-якої повноекранної програми"
+GameCapture.CaptureWindow="Захоплення конкретного вікна"
+GameCapture.UseHotkey="Захоплення вікна на передньому плані гарячою клавішею"
+GameCapture.LimitFramerate="Обмеження частоти кадрів захоплення"
 GameCapture.CaptureOverlays="Захоплювати сторонні оверлеї (наприклад, Steam)"
-GameCapture.AntiCheatHook="Використовувати сумісність з Anti-cheat технологіями"
-GameCapture.HotkeyStart="Захоплювати перше наявне вікно"
-GameCapture.HotkeyStop="Деактивувати захоплення"
-GameCapture.HookRate="Оновлення спроб захвату"
+GameCapture.AntiCheatHook="Використовувати обробник сумісний з античіт програмами"
+GameCapture.HotkeyStart="Захоплювати вікно на передньому плані"
+GameCapture.HotkeyStop="Вимкнути захоплення"
+GameCapture.HookRate="Частота спроб захоплення"
 GameCapture.HookRate.Slow="Повільно"
 GameCapture.HookRate.Normal="Нормально (рекомендовано)"
 GameCapture.HookRate.Fast="Швидко"
 GameCapture.HookRate.Fastest="Найшвидше"
-Mode="Тип захвату"
+Mode="Режим"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/zh-CN.ini Changed

@@ -1,32 +1,30 @@
-MonitorCapture="显示器捕获"
-WindowCapture="窗口捕获"
+MonitorCapture="显示器采集"
+WindowCapture="窗口采集"
 WindowCapture.Window="窗口"
-WindowCapture.Method="捕获方式"
+WindowCapture.Method="采集方式"
 WindowCapture.Method.Auto="自动"
 WindowCapture.Method.BitBlt="BitBlt (Windows 7 或更新版本)"
-WindowCapture.Method.WindowsGraphicsCapture="Windows 图形捕获(Windows 10 1903 及上)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows 图形采集 (Windows 10 1903 及以上)"
 WindowCapture.Priority="窗口匹配优先级"
 WindowCapture.Priority.Title="窗口标题必须匹配"
 WindowCapture.Priority.Class="匹配标题，否则查找相同类型的窗口"
 WindowCapture.Priority.Exe="匹配标题，否则查找相同可执行程序的窗口"
-CaptureCursor="捕捉光标"
+CaptureCursor="显示鼠标指针"
 Compatibility="多适配器的兼容性"
 ClientArea="客户端区域"
-SLIFix="SLI/Crossfire 捕获模式 (慢)"
+SLIFix="SLI/交火采集模式 (慢)"
 AllowTransparency="允许透明度"
 Monitor="显示器"
 PrimaryMonitor="主监视器"
-GameCapture="游戏捕获"
-GameCapture.AnyFullscreen="捕获任何全屏应用程序"
-GameCapture.CaptureWindow="捕获特定窗口"
-GameCapture.UseHotkey="用热键捕获前景窗口"
-GameCapture.ForceScaling="强制缩放"
-GameCapture.ScaleRes="缩放分辨率"
-GameCapture.LimitFramerate="限制捕获帧速率"
-GameCapture.CaptureOverlays="捕获第三方 (如: steam) 覆盖"
+GameCapture="游戏采集"
+GameCapture.AnyFullscreen="采集全屏应用程序"
+GameCapture.CaptureWindow="采集特定窗口"
+GameCapture.UseHotkey="用快捷键采集前台窗口"
+GameCapture.LimitFramerate="限制采集帧率"
+GameCapture.CaptureOverlays="采集第三方浮窗 (如 Steam)"
 GameCapture.AntiCheatHook="使用反作弊兼容性钩子"
-GameCapture.HotkeyStart="捕获前景窗口"
-GameCapture.HotkeyStop="停止捕获"
+GameCapture.HotkeyStart="采集前台窗口"
+GameCapture.HotkeyStop="停止采集"
 GameCapture.HookRate="钩子速率"
 GameCapture.HookRate.Slow="慢"
 GameCapture.HookRate.Normal="正常 (推荐)"

obs-studio-25.0.8.tar.xz/plugins/win-capture/data/locale/zh-TW.ini -> obs-studio-26.0.0.tar.xz/plugins/win-capture/data/locale/zh-TW.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/duplicator-monitor-capture.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/duplicator-monitor-capture.c Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/game-capture.c Changed

@@ -6,6 +6,7 @@
 #include <windows.h>
 #include <dxgi.h>
 #include <util/sse-intrin.h>
+#include <util/util_uint64.h>
 #include <ipc-util/pipe.h>
 #include "obfuscate.h"
 #include "inject-library.h"
@@ -31,8 +32,6 @@
 #define SETTING_ACTIVE_WINDOW    "active_window"
 #define SETTING_WINDOW_PRIORITY  "priority"
 #define SETTING_COMPATIBILITY    "sli_compatibility"
-#define SETTING_FORCE_SCALING    "force_scaling"
-#define SETTING_SCALE_RES        "scale_res"
 #define SETTING_CURSOR           "capture_cursor"
 #define SETTING_TRANSPARENCY     "allow_transparency"
 #define SETTING_LIMIT_FRAMERATE  "limit_framerate"
@@ -55,8 +54,6 @@
 #define TEXT_ANY_FULLSCREEN      obs_module_text("GameCapture.AnyFullscreen")
 #define TEXT_SLI_COMPATIBILITY   obs_module_text("SLIFix")
 #define TEXT_ALLOW_TRANSPARENCY  obs_module_text("AllowTransparency")
-#define TEXT_FORCE_SCALING       obs_module_text("GameCapture.ForceScaling")
-#define TEXT_SCALE_RES           obs_module_text("GameCapture.ScaleRes")
 #define TEXT_WINDOW              obs_module_text("WindowCapture.Window")
 #define TEXT_MATCH_PRIORITY      obs_module_text("WindowCapture.Priority")
 #define TEXT_MATCH_TITLE         obs_module_text("WindowCapture.Priority.Title")
@@ -103,11 +100,8 @@
 	char *executable;
 	enum window_priority priority;
 	enum capture_mode mode;
-	uint32_t scale_cx;
-	uint32_t scale_cy;
 	bool cursor;
 	bool force_shmem;
-	bool force_scaling;
 	bool allow_transparency;
 	bool limit_framerate;
 	bool capture_overlays;
@@ -391,8 +385,6 @@
 static inline void get_config(struct game_capture_config *cfg,
 			      obs_data_t *settings, const char *window)
 {
-	int ret;
-	const char *scale_str;
 	const char *mode_str = NULL;
 
 	build_window_strings(window, &cfg->class, &cfg->title,
@@ -418,7 +410,6 @@
 	cfg->cursor = obs_data_get_bool(settings, SETTING_CURSOR);
 	cfg->allow_transparency =
 		obs_data_get_bool(settings, SETTING_TRANSPARENCY);
-	cfg->force_scaling = obs_data_get_bool(settings, SETTING_FORCE_SCALING);
 	cfg->limit_framerate =
 		obs_data_get_bool(settings, SETTING_LIMIT_FRAMERATE);
 	cfg->capture_overlays =
@@ -427,20 +418,6 @@
 		obs_data_get_bool(settings, SETTING_ANTI_CHEAT_HOOK);
 	cfg->hook_rate =
 		(enum hook_rate)obs_data_get_int(settings, SETTING_HOOK_RATE);
-
-	scale_str = obs_data_get_string(settings, SETTING_SCALE_RES);
-	ret = sscanf(scale_str, "%" PRIu32 "x%" PRIu32, &cfg->scale_cx,
-		     &cfg->scale_cy);
-
-	cfg->scale_cx &= ~2;
-	cfg->scale_cy &= ~2;
-
-	if (cfg->force_scaling) {
-		if (ret != 2 || cfg->scale_cx == 0 || cfg->scale_cy == 0) {
-			cfg->scale_cx = 0;
-			cfg->scale_cy = 0;
-		}
-	}
 }
 
 static inline int s_cmp(const char *str1, const char *str2)
@@ -464,13 +441,6 @@
 		    cfg1->priority != cfg2->priority)) {
 		return true;
 
-	} else if (cfg1->force_scaling != cfg2->force_scaling) {
-		return true;
-
-	} else if (cfg1->force_scaling && (cfg1->scale_cx != cfg2->scale_cx ||
-					   cfg1->scale_cy != cfg2->scale_cy)) {
-		return true;
-
 	} else if (cfg1->force_shmem != cfg2->force_shmem) {
 		return true;
 
@@ -524,12 +494,7 @@
 	get_config(&cfg, settings, window);
 	reset_capture = capture_needs_reset(&cfg, &gc->config);
 
-	if (cfg.force_scaling && (cfg.scale_cx == 0 || cfg.scale_cy == 0)) {
-		gc->error_acquiring = true;
-		warn("error acquiring, scale is bad");
-	} else {
-		gc->error_acquiring = false;
-	}
+	gc->error_acquiring = false;
 
 	if (cfg.mode == CAPTURE_MODE_HOTKEY &&
 	    gc->config.mode != CAPTURE_MODE_HOTKEY) {
@@ -729,7 +694,8 @@
 	uint64_t interval = 0;
 
 	if (obs_get_video_info(&ovi)) {
-		interval = ovi.fps_den * 1000000000ULL / ovi.fps_num;
+		interval =
+			util_mul_div64(ovi.fps_den, 1000000000ULL, ovi.fps_num);
 
 		/* Always limit capture framerate to some extent.  If a game
 		 * running at 900 FPS is being captured without some sort of
@@ -769,11 +735,7 @@
 							     : offsets32;
 	gc->global_hook_info->capture_overlay = gc->config.capture_overlays;
 	gc->global_hook_info->force_shmem = gc->config.force_shmem;
-	gc->global_hook_info->use_scale = gc->config.force_scaling;
-	if (gc->config.scale_cx)
-		gc->global_hook_info->cx = gc->config.scale_cx;
-	if (gc->config.scale_cy)
-		gc->global_hook_info->cy = gc->config.scale_cy;
+	gc->global_hook_info->UNUSED_use_scale = false;
 	reset_frame_interval(gc);
 
 	obs_enter_graphics();
@@ -1815,7 +1777,7 @@
 	POINT p = {0};
 	HWND window;
 
-	if (!gc->global_hook_info->base_cx || !gc->global_hook_info->base_cy)
+	if (!gc->global_hook_info->cx || !gc->global_hook_info->cy)
 		return;
 
 	window = !!gc->global_hook_info->window
@@ -1824,14 +1786,8 @@
 
 	ClientToScreen(window, &p);
 
-	float x_scale = (float)gc->global_hook_info->cx /
-			(float)gc->global_hook_info->base_cx;
-	float y_scale = (float)gc->global_hook_info->cy /
-			(float)gc->global_hook_info->base_cy;
-
-	cursor_draw(&gc->cursor_data, -p.x, -p.y, x_scale, y_scale,
-		    gc->global_hook_info->base_cx,
-		    gc->global_hook_info->base_cy);
+	cursor_draw(&gc->cursor_data, -p.x, -p.y, gc->global_hook_info->cx,
+		    gc->global_hook_info->cy);
 }
 
 static void game_capture_render(void *data, gs_effect_t *effect)
@@ -1888,10 +1844,8 @@
 	obs_data_set_default_int(settings, SETTING_WINDOW_PRIORITY,
 				 (int)WINDOW_PRIORITY_EXE);
 	obs_data_set_default_bool(settings, SETTING_COMPATIBILITY, false);
-	obs_data_set_default_bool(settings, SETTING_FORCE_SCALING, false);
 	obs_data_set_default_bool(settings, SETTING_CURSOR, true);
 	obs_data_set_default_bool(settings, SETTING_TRANSPARENCY, false);
-	obs_data_set_default_string(settings, SETTING_SCALE_RES, "0x0");
 	obs_data_set_default_bool(settings, SETTING_LIMIT_FRAMERATE, false);
 	obs_data_set_default_bool(settings, SETTING_CAPTURE_OVERLAYS, false);
 	obs_data_set_default_bool(settings, SETTING_ANTI_CHEAT_HOOK, true);
@@ -1921,16 +1875,6 @@
 	return true;
 }
 
-static bool use_scaling_callback(obs_properties_t *ppts, obs_property_t *p,
-				 obs_data_t *settings)
-{
-	bool use_scale = obs_data_get_bool(settings, SETTING_FORCE_SCALING);
-
-	p = obs_properties_get(ppts, SETTING_SCALE_RES);
-	obs_property_set_enabled(p, use_scale);
-	return true;
-}
-
 static void insert_preserved_val(obs_property_t *p, const char *val, size_t idx)
 {
 	char *class = NULL;
@@ -1990,11 +1934,6 @@
 					     SETTING_CAPTURE_WINDOW, 1);
 }
 
-static const double default_scale_vals[] = {1.25, 1.5, 2.0, 2.5, 3.0};
-
-#define NUM_DEFAULT_SCALE_VALS \
-	(sizeof(default_scale_vals) / sizeof(default_scale_vals[0]))
-
 static BOOL CALLBACK EnumFirstMonitor(HMONITOR monitor, HDC hdc, LPRECT rc,
 				      LPARAM data)
 {
@@ -2080,29 +2019,6 @@
 	obs_properties_add_bool(ppts, SETTING_COMPATIBILITY,
 				TEXT_SLI_COMPATIBILITY);
 
-	p = obs_properties_add_bool(ppts, SETTING_FORCE_SCALING,
-				    TEXT_FORCE_SCALING);
-
-	obs_property_set_modified_callback(p, use_scaling_callback);
-
-	p = obs_properties_add_list(ppts, SETTING_SCALE_RES, TEXT_SCALE_RES,
-				    OBS_COMBO_TYPE_EDITABLE,
-				    OBS_COMBO_FORMAT_STRING);
-
-	for (size_t i = 0; i < NUM_DEFAULT_SCALE_VALS; i++) {
-		char scale_str[64];
-		uint32_t new_cx =
-			(uint32_t)((double)cx / default_scale_vals[i]) & ~2;
-		uint32_t new_cy =
-			(uint32_t)((double)cy / default_scale_vals[i]) & ~2;
-
-		sprintf(scale_str, "%" PRIu32 "x%" PRIu32, new_cx, new_cy);
-
-		obs_property_list_add_string(p, scale_str, scale_str);
-	}
-
-	obs_property_set_enabled(p, false);
-
 	obs_properties_add_bool(ppts, SETTING_TRANSPARENCY,
 				TEXT_ALLOW_TRANSPARENCY);

obs-studio-25.0.8.tar.xz/plugins/win-capture/get-graphics-offsets/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-capture/get-graphics-offsets/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook-info.h -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook-info.h Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook-ver.h -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook-ver.h Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/d3d10-capture.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/d3d10-capture.cpp Changed

@@ -7,13 +7,10 @@
 
 struct d3d10_data {
 	ID3D10Device *device; /* do not release */
-	uint32_t base_cx;
-	uint32_t base_cy;
 	uint32_t cx;
 	uint32_t cy;
 	DXGI_FORMAT format;
 	bool using_shtex;
-	bool using_scale;
 	bool multisampled;
 
 	ID3D10Texture2D *scale_tex;
@@ -42,8 +39,6 @@
 		struct {
 			struct shmem_data *shmem_info;
 			ID3D10Texture2D *copy_surfaces[NUM_BUFFERS];
-			ID3D10Texture2D *textures[NUM_BUFFERS];
-			ID3D10RenderTargetView *render_targets[NUM_BUFFERS];
 			bool texture_ready[NUM_BUFFERS];
 			bool texture_mapped[NUM_BUFFERS];
 			uint32_t pitch;
@@ -92,10 +87,6 @@
 					data.copy_surfaces[i]->Unmap(0);
 				data.copy_surfaces[i]->Release();
 			}
-			if (data.textures[i])
-				data.textures[i]->Release();
-			if (data.render_targets[i])
-				data.render_targets[i]->Release();
 		}
 	}
 
@@ -225,218 +216,8 @@
 	data.format = fix_dxgi_format(desc.BufferDesc.Format);
 	data.multisampled = desc.SampleDesc.Count > 1;
 	window = desc.OutputWindow;
-	data.base_cx = desc.BufferDesc.Width;
-	data.base_cy = desc.BufferDesc.Height;
-
-	if (data.using_scale) {
-		data.cx = global_hook_info->cx;
-		data.cy = global_hook_info->cy;
-	} else {
-		data.cx = desc.BufferDesc.Width;
-		data.cy = desc.BufferDesc.Height;
-	}
-	return true;
-}
-
-static inline bool d3d10_init_vertex_shader(void)
-{
-	D3D10_INPUT_ELEMENT_DESC desc[2];
-	uint8_t *vs_data;
-	size_t size;
-	HRESULT hr;
-
-	vs_data = get_d3d1x_vertex_shader(&size);
-
-	hr = data.device->CreateVertexShader(vs_data, size,
-					     &data.vertex_shader);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_vertex_shader: failed to create shader",
-			hr);
-		return false;
-	}
-
-	desc[0].SemanticName = "SV_Position";
-	desc[0].SemanticIndex = 0;
-	desc[0].Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-	desc[0].InputSlot = 0;
-	desc[0].AlignedByteOffset = 0;
-	desc[0].InputSlotClass = D3D10_INPUT_PER_VERTEX_DATA;
-	desc[0].InstanceDataStepRate = 0;
-
-	desc[1].SemanticName = "TEXCOORD";
-	desc[1].SemanticIndex = 0;
-	desc[1].Format = DXGI_FORMAT_R32G32_FLOAT;
-	desc[1].InputSlot = 0;
-	desc[1].AlignedByteOffset = D3D10_APPEND_ALIGNED_ELEMENT;
-	desc[1].InputSlotClass = D3D10_INPUT_PER_VERTEX_DATA;
-	desc[1].InstanceDataStepRate = 0;
-
-	hr = data.device->CreateInputLayout(desc, 2, vs_data, size,
-					    &data.vertex_layout);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_vertex_shader: failed to create layout",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d10_init_pixel_shader(void)
-{
-	uint8_t *ps_data;
-	size_t size;
-	HRESULT hr;
-
-	ps_data = get_d3d1x_pixel_shader(&size);
-
-	hr = data.device->CreatePixelShader(ps_data, size, &data.pixel_shader);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_pixel_shader: failed to create shader", hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d10_init_sampler_state(void)
-{
-	HRESULT hr;
-
-	D3D10_SAMPLER_DESC desc = {};
-	desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR;
-	desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP;
-	desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP;
-	desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP;
-
-	hr = data.device->CreateSamplerState(&desc, &data.sampler_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_sampler_state: failed to create sampler "
-			"state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d10_init_blend_state(void)
-{
-	D3D10_BLEND_DESC desc = {};
-	HRESULT hr;
-
-	for (size_t i = 0; i < 8; i++)
-		desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL;
-
-	hr = data.device->CreateBlendState(&desc, &data.blend_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_blend_state: failed to create blend state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d10_init_zstencil_state(void)
-{
-	D3D10_DEPTH_STENCIL_DESC desc = {}; /* defaults all to off */
-	HRESULT hr;
-
-	hr = data.device->CreateDepthStencilState(&desc, &data.zstencil_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_zstencil_state: failed to create "
-			"zstencil state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d10_init_raster_state(void)
-{
-	D3D10_RASTERIZER_DESC desc = {};
-	HRESULT hr;
-
-	desc.FillMode = D3D10_FILL_SOLID;
-	desc.CullMode = D3D10_CULL_NONE;
-
-	hr = data.device->CreateRasterizerState(&desc, &data.raster_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_raster_state: failed to create raster "
-			"state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-#define NUM_VERTS 4
-
-static inline bool d3d10_init_vertex_buffer(void)
-{
-	HRESULT hr;
-	const vertex verts[NUM_VERTS] = {
-		{{-1.0f, 1.0f, 0.0f, 1.0f}, {0.0f, 0.0f}},
-		{{-1.0f, -1.0f, 0.0f, 1.0f}, {0.0f, 1.0f}},
-		{{1.0f, 1.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-		{{1.0f, -1.0f, 0.0f, 1.0f}, {1.0f, 1.0f}}};
-
-	D3D10_BUFFER_DESC desc;
-	desc.ByteWidth = sizeof(vertex) * NUM_VERTS;
-	desc.Usage = D3D10_USAGE_DEFAULT;
-	desc.BindFlags = D3D10_BIND_VERTEX_BUFFER;
-	desc.CPUAccessFlags = 0;
-	desc.MiscFlags = 0;
-
-	D3D10_SUBRESOURCE_DATA srd = {};
-	srd.pSysMem = (const void *)verts;
-
-	hr = data.device->CreateBuffer(&desc, &srd, &data.vertex_buffer);
-	if (FAILED(hr)) {
-		hlog_hr("d3d10_init_vertex_buffer: failed to create vertex "
-			"buffer",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static bool d3d10_init_scaling(void)
-{
-	bool success;
-
-	success = create_d3d10_tex(data.base_cx, data.base_cy, &data.scale_tex,
-				   &data.scale_resource, nullptr, nullptr);
-	if (!success) {
-		hlog("d3d10_init_scaling: failed to create scale texture");
-		return false;
-	}
-
-	if (!d3d10_init_vertex_shader()) {
-		return false;
-	}
-	if (!d3d10_init_pixel_shader()) {
-		return false;
-	}
-	if (!d3d10_init_sampler_state()) {
-		return false;
-	}
-	if (!d3d10_init_blend_state()) {
-		return false;
-	}
-	if (!d3d10_init_zstencil_state()) {
-		return false;
-	}
-	if (!d3d10_init_raster_state()) {
-		return false;
-	}
-	if (!d3d10_init_vertex_buffer()) {
-		return false;
-	}
+	data.cx = desc.BufferDesc.Width;
+	data.cy = desc.BufferDesc.Height;
 
 	return true;
 }
@@ -467,13 +248,6 @@
 		data.copy_surfaces[idx]->Unmap(0);
 	}
 
-	success = create_d3d10_tex(data.cx, data.cy, &data.textures[idx],
-				   nullptr, &data.render_targets[idx], nullptr);
-	if (!success) {
-		hlog("d3d10_shmem_init_buffers: failed to create texture");
-		return false;
-	}
-
 	return true;
 }
 
@@ -486,9 +260,8 @@
 			return false;
 		}
 	}
-	if (!capture_init_shmem(&data.shmem_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.pitch,
-				data.format, false)) {
+	if (!capture_init_shmem(&data.shmem_info, window, data.cx, data.cy,
+				data.pitch, data.format, false)) {
 		return false;
 	}
 
@@ -512,9 +285,8 @@
 		hlog("d3d10_shtex_init: failed to create texture");
 		return false;
 	}
-	if (!capture_init_shtex(&data.shtex_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.format,
-				false, (uintptr_t)data.handle)) {
+	if (!capture_init_shtex(&data.shtex_info, window, data.cx, data.cy,
+				data.format, false, (uintptr_t)data.handle)) {
 		return false;
 	}
 
@@ -524,12 +296,9 @@
 
 static void d3d10_init(IDXGISwapChain *swap)
 {
-	bool success = true;
 	HWND window;
 	HRESULT hr;
 
-	data.using_scale = global_hook_info->use_scale;
-
 	hr = swap->GetDevice(__uuidof(ID3D10Device), (void **)&data.device);
 	if (FAILED(hr)) {
 		hlog_hr("d3d10_init: failed to get device from swap", hr);
@@ -542,169 +311,14 @@
 	if (!d3d10_init_format(swap, window)) {
 		return;
 	}
-	if (data.using_scale && !d3d10_init_scaling()) {
-		hlog("d3d10_init: failed to initialize scaling");
-		success = false;
-	}
-	if (success) {
-		if (global_hook_info->force_shmem) {
-			success = d3d10_shmem_init(window);
-		} else {
-			success = d3d10_shtex_init(window);
-		}
-	}
 
+	const bool success = global_hook_info->force_shmem
+				     ? d3d10_shmem_init(window)
+				     : d3d10_shtex_init(window);
 	if (!success)
 		d3d10_free();
 }
 
-#define MAX_RENDER_TARGETS D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT
-#define MAX_SO_TARGETS 4
-
-struct d3d10_state {
-	ID3D10GeometryShader *geom_shader;
-	ID3D10InputLayout *vertex_layout;
-	D3D10_PRIMITIVE_TOPOLOGY topology;
-	ID3D10Buffer *vertex_buffer;
-	UINT vb_stride;
-	UINT vb_offset;
-	ID3D10BlendState *blend_state;
-	float blend_factor[4];
-	UINT sample_mask;
-	ID3D10DepthStencilState *zstencil_state;
-	UINT zstencil_ref;
-	ID3D10RenderTargetView *render_targets[MAX_RENDER_TARGETS];
-	ID3D10DepthStencilView *zstencil_view;
-	ID3D10SamplerState *sampler_state;
-	ID3D10PixelShader *pixel_shader;
-	ID3D10ShaderResourceView *resource;
-	ID3D10RasterizerState *raster_state;
-	UINT num_viewports;
-	D3D10_VIEWPORT *viewports;
-	ID3D10Buffer *stream_output_targets[MAX_SO_TARGETS];
-	UINT so_offsets[MAX_SO_TARGETS];
-	ID3D10VertexShader *vertex_shader;
-};
-
-static inline void d3d10_save_state(struct d3d10_state *state)
-{
-	data.device->GSGetShader(&state->geom_shader);
-	data.device->IAGetInputLayout(&state->vertex_layout);
-	data.device->IAGetPrimitiveTopology(&state->topology);
-	data.device->IAGetVertexBuffers(0, 1, &state->vertex_buffer,
-					&state->vb_stride, &state->vb_offset);
-	data.device->OMGetBlendState(&state->blend_state, state->blend_factor,
-				     &state->sample_mask);
-	data.device->OMGetDepthStencilState(&state->zstencil_state,
-					    &state->zstencil_ref);
-	data.device->OMGetRenderTargets(MAX_RENDER_TARGETS,
-					state->render_targets,
-					&state->zstencil_view);
-	data.device->PSGetSamplers(0, 1, &state->sampler_state);
-	data.device->PSGetShader(&state->pixel_shader);
-	data.device->PSGetShaderResources(0, 1, &state->resource);
-	data.device->RSGetState(&state->raster_state);
-	data.device->RSGetViewports(&state->num_viewports, nullptr);
-	if (state->num_viewports) {
-		state->viewports = (D3D10_VIEWPORT *)malloc(
-			sizeof(D3D10_VIEWPORT) * state->num_viewports);
-		data.device->RSGetViewports(&state->num_viewports,
-					    state->viewports);
-	}
-	data.device->SOGetTargets(MAX_SO_TARGETS, state->stream_output_targets,
-				  state->so_offsets);
-	data.device->VSGetShader(&state->vertex_shader);
-}
-
-static inline void safe_release(IUnknown *p)
-{
-	if (p)
-		p->Release();
-}
-
-static inline void d3d10_restore_state(struct d3d10_state *state)
-{
-	data.device->GSSetShader(state->geom_shader);
-	data.device->IASetInputLayout(state->vertex_layout);
-	data.device->IASetPrimitiveTopology(state->topology);
-	data.device->IASetVertexBuffers(0, 1, &state->vertex_buffer,
-					&state->vb_stride, &state->vb_offset);
-	data.device->OMSetBlendState(state->blend_state, state->blend_factor,
-				     state->sample_mask);
-	data.device->OMSetDepthStencilState(state->zstencil_state,
-					    state->zstencil_ref);
-	data.device->OMSetRenderTargets(MAX_RENDER_TARGETS,
-					state->render_targets,
-					state->zstencil_view);
-	data.device->PSSetSamplers(0, 1, &state->sampler_state);
-	data.device->PSSetShader(state->pixel_shader);
-	data.device->PSSetShaderResources(0, 1, &state->resource);
-	data.device->RSSetState(state->raster_state);
-	data.device->RSSetViewports(state->num_viewports, state->viewports);
-	data.device->SOSetTargets(MAX_SO_TARGETS, state->stream_output_targets,
-				  state->so_offsets);
-	data.device->VSSetShader(state->vertex_shader);
-	safe_release(state->geom_shader);
-	safe_release(state->vertex_layout);
-	safe_release(state->vertex_buffer);
-	safe_release(state->blend_state);
-	safe_release(state->zstencil_state);
-	for (size_t i = 0; i < MAX_RENDER_TARGETS; i++)
-		safe_release(state->render_targets[i]);
-	safe_release(state->zstencil_view);
-	safe_release(state->sampler_state);
-	safe_release(state->pixel_shader);
-	safe_release(state->resource);
-	safe_release(state->raster_state);
-	for (size_t i = 0; i < MAX_SO_TARGETS; i++)
-		safe_release(state->stream_output_targets[i]);
-	safe_release(state->vertex_shader);
-	free(state->viewports);
-	memset(state, 0, sizeof(*state));
-}
-
-static inline void d3d10_setup_pipeline(ID3D10RenderTargetView *target,
-					ID3D10ShaderResourceView *resource)
-{
-	D3D10_VIEWPORT viewport = {0};
-	const float factor[4] = {1.0f, 1.0f, 1.0f, 1.0f};
-	void *emptyptr = nullptr;
-	UINT stride = sizeof(vertex);
-	UINT zero = 0;
-
-	viewport.Width = data.cx;
-	viewport.Height = data.cy;
-	viewport.MaxDepth = 1.0f;
-
-	data.device->GSSetShader(nullptr);
-	data.device->IASetInputLayout(data.vertex_layout);
-	data.device->IASetPrimitiveTopology(
-		D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-	data.device->IASetVertexBuffers(0, 1, &data.vertex_buffer, &stride,
-					&zero);
-	data.device->OMSetBlendState(data.blend_state, factor, 0xFFFFFFFF);
-	data.device->OMSetDepthStencilState(data.zstencil_state, 0);
-	data.device->OMSetRenderTargets(1, &target, nullptr);
-	data.device->PSSetSamplers(0, 1, &data.sampler_state);
-	data.device->PSSetShader(data.pixel_shader);
-	data.device->PSSetShaderResources(0, 1, &resource);
-	data.device->RSSetState(data.raster_state);
-	data.device->RSSetViewports(1, &viewport);
-	data.device->SOSetTargets(1, (ID3D10Buffer **)&emptyptr, &zero);
-	data.device->VSSetShader(data.vertex_shader);
-}
-
-static inline void d3d10_scale_texture(ID3D10RenderTargetView *target,
-				       ID3D10ShaderResourceView *resource)
-{
-	struct d3d10_state old_state = {};
-
-	d3d10_save_state(&old_state);
-	d3d10_setup_pipeline(target, resource);
-	data.device->Draw(4, 0);
-	d3d10_restore_state(&old_state);
-}
-
 static inline void d3d10_copy_texture(ID3D10Resource *dst, ID3D10Resource *src)
 {
 	if (data.multisampled) {
@@ -716,30 +330,21 @@
 
 static inline void d3d10_shtex_capture(ID3D10Resource *backbuffer)
 {
-	if (data.using_scale) {
-		d3d10_copy_texture(data.scale_tex, backbuffer);
-		d3d10_scale_texture(data.render_target, data.scale_resource);
-	} else {
-		d3d10_copy_texture(data.texture, backbuffer);
-	}
+	d3d10_copy_texture(data.texture, backbuffer);
 }
 
-static inline void d3d10_shmem_queue_copy()
+static void d3d10_shmem_capture_copy(int i)
 {
-	for (size_t i = 0; i < NUM_BUFFERS; i++) {
-		D3D10_MAPPED_TEXTURE2D map;
-		HRESULT hr;
+	D3D10_MAPPED_TEXTURE2D map;
+	HRESULT hr;
 
-		if (data.texture_ready[i]) {
-			data.texture_ready[i] = false;
+	if (data.texture_ready[i]) {
+		data.texture_ready[i] = false;
 
-			hr = data.copy_surfaces[i]->Map(0, D3D10_MAP_READ, 0,
-							&map);
-			if (SUCCEEDED(hr)) {
-				data.texture_mapped[i] = true;
-				shmem_copy_data(i, map.pData);
-			}
-			break;
+		hr = data.copy_surfaces[i]->Map(0, D3D10_MAP_READ, 0, &map);
+		if (SUCCEEDED(hr)) {
+			data.texture_mapped[i] = true;
+			shmem_copy_data(i, map.pData);
 		}
 	}
 }
@@ -748,32 +353,21 @@
 {
 	int next_tex;
 
-	d3d10_shmem_queue_copy();
-
-	next_tex = (data.cur_tex == NUM_BUFFERS - 1) ? 0 : data.cur_tex + 1;
-
-	if (data.using_scale) {
-		d3d10_copy_texture(data.scale_tex, backbuffer);
-		d3d10_scale_texture(data.render_targets[data.cur_tex],
-				    data.scale_resource);
-	} else {
-		d3d10_copy_texture(data.textures[data.cur_tex], backbuffer);
-	}
+	next_tex = (data.cur_tex + 1) % NUM_BUFFERS;
+	d3d10_shmem_capture_copy(next_tex);
 
 	if (data.copy_wait < NUM_BUFFERS - 1) {
 		data.copy_wait++;
 	} else {
-		ID3D10Texture2D *src = data.textures[next_tex];
-		ID3D10Texture2D *dst = data.copy_surfaces[next_tex];
-
-		if (shmem_texture_data_lock(next_tex)) {
-			dst->Unmap(0);
-			data.texture_mapped[next_tex] = false;
-			shmem_texture_data_unlock(next_tex);
+		if (shmem_texture_data_lock(data.cur_tex)) {
+			data.copy_surfaces[data.cur_tex]->Unmap(0);
+			data.texture_mapped[data.cur_tex] = false;
+			shmem_texture_data_unlock(data.cur_tex);
 		}
 
-		d3d10_copy_texture(dst, src);
-		data.texture_ready[next_tex] = true;
+		d3d10_copy_texture(data.copy_surfaces[data.cur_tex],
+				   backbuffer);
+		data.texture_ready[data.cur_tex] = true;
 	}
 
 	data.cur_tex = next_tex;

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/d3d11-capture.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/d3d11-capture.cpp Changed

@@ -8,13 +8,10 @@
 struct d3d11_data {
 	ID3D11Device *device;         /* do not release */
 	ID3D11DeviceContext *context; /* do not release */
-	uint32_t base_cx;
-	uint32_t base_cy;
 	uint32_t cx;
 	uint32_t cy;
 	DXGI_FORMAT format;
 	bool using_shtex;
-	bool using_scale;
 	bool multisampled;
 
 	ID3D11Texture2D *scale_tex;
@@ -42,8 +39,6 @@
 		/* shared memory */
 		struct {
 			ID3D11Texture2D *copy_surfaces[NUM_BUFFERS];
-			ID3D11Texture2D *textures[NUM_BUFFERS];
-			ID3D11RenderTargetView *render_targets[NUM_BUFFERS];
 			bool texture_ready[NUM_BUFFERS];
 			bool texture_mapped[NUM_BUFFERS];
 			uint32_t pitch;
@@ -94,10 +89,6 @@
 						data.copy_surfaces[i], 0);
 				data.copy_surfaces[i]->Release();
 			}
-			if (data.textures[i])
-				data.textures[i]->Release();
-			if (data.render_targets[i])
-				data.render_targets[i]->Release();
 		}
 	}
 
@@ -227,220 +218,8 @@
 	data.format = fix_dxgi_format(desc.BufferDesc.Format);
 	data.multisampled = desc.SampleDesc.Count > 1;
 	window = desc.OutputWindow;
-	data.base_cx = desc.BufferDesc.Width;
-	data.base_cy = desc.BufferDesc.Height;
-
-	if (data.using_scale) {
-		data.cx = global_hook_info->cx;
-		data.cy = global_hook_info->cy;
-	} else {
-		data.cx = desc.BufferDesc.Width;
-		data.cy = desc.BufferDesc.Height;
-	}
-	return true;
-}
-
-static inline bool d3d11_init_vertex_shader(void)
-{
-	D3D11_INPUT_ELEMENT_DESC desc[2];
-	uint8_t *vs_data;
-	size_t size;
-	HRESULT hr;
-
-	vs_data = get_d3d1x_vertex_shader(&size);
-
-	hr = data.device->CreateVertexShader(vs_data, size, nullptr,
-					     &data.vertex_shader);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_vertex_shader: failed to create shader",
-			hr);
-		return false;
-	}
-
-	desc[0].SemanticName = "SV_Position";
-	desc[0].SemanticIndex = 0;
-	desc[0].Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-	desc[0].InputSlot = 0;
-	desc[0].AlignedByteOffset = 0;
-	desc[0].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-	desc[0].InstanceDataStepRate = 0;
-
-	desc[1].SemanticName = "TEXCOORD";
-	desc[1].SemanticIndex = 0;
-	desc[1].Format = DXGI_FORMAT_R32G32_FLOAT;
-	desc[1].InputSlot = 0;
-	desc[1].AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-	desc[1].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-	desc[1].InstanceDataStepRate = 0;
-
-	hr = data.device->CreateInputLayout(desc, 2, vs_data, size,
-					    &data.vertex_layout);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_vertex_shader: failed to create layout",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d11_init_pixel_shader(void)
-{
-	uint8_t *ps_data;
-	size_t size;
-	HRESULT hr;
-
-	ps_data = get_d3d1x_pixel_shader(&size);
-
-	hr = data.device->CreatePixelShader(ps_data, size, nullptr,
-					    &data.pixel_shader);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_pixel_shader: failed to create shader", hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d11_init_sampler_state(void)
-{
-	HRESULT hr;
-
-	D3D11_SAMPLER_DESC desc = {};
-	desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-	desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
-	desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
-	desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-
-	hr = data.device->CreateSamplerState(&desc, &data.sampler_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_sampler_state: failed to create sampler "
-			"state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d11_init_blend_state(void)
-{
-	D3D11_BLEND_DESC desc = {};
-	HRESULT hr;
-
-	for (size_t i = 0; i < 8; i++)
-		desc.RenderTarget[i].RenderTargetWriteMask =
-			D3D11_COLOR_WRITE_ENABLE_ALL;
-
-	hr = data.device->CreateBlendState(&desc, &data.blend_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_blend_state: failed to create blend state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d11_init_zstencil_state(void)
-{
-	D3D11_DEPTH_STENCIL_DESC desc = {}; /* defaults all to off */
-	HRESULT hr;
-
-	hr = data.device->CreateDepthStencilState(&desc, &data.zstencil_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_zstencil_state: failed to create "
-			"zstencil state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static inline bool d3d11_init_raster_state(void)
-{
-	D3D11_RASTERIZER_DESC desc = {};
-	HRESULT hr;
-
-	desc.FillMode = D3D11_FILL_SOLID;
-	desc.CullMode = D3D11_CULL_NONE;
-
-	hr = data.device->CreateRasterizerState(&desc, &data.raster_state);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_raster_state: failed to create raster "
-			"state",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-#define NUM_VERTS 4
-
-static inline bool d3d11_init_vertex_buffer(void)
-{
-	HRESULT hr;
-	const vertex verts[NUM_VERTS] = {
-		{{-1.0f, 1.0f, 0.0f, 1.0f}, {0.0f, 0.0f}},
-		{{-1.0f, -1.0f, 0.0f, 1.0f}, {0.0f, 1.0f}},
-		{{1.0f, 1.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-		{{1.0f, -1.0f, 0.0f, 1.0f}, {1.0f, 1.0f}}};
-
-	D3D11_BUFFER_DESC desc;
-	desc.ByteWidth = sizeof(vertex) * NUM_VERTS;
-	desc.Usage = D3D11_USAGE_DEFAULT;
-	desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-	desc.CPUAccessFlags = 0;
-	desc.MiscFlags = 0;
-
-	D3D11_SUBRESOURCE_DATA srd = {};
-	srd.pSysMem = (const void *)verts;
-
-	hr = data.device->CreateBuffer(&desc, &srd, &data.vertex_buffer);
-	if (FAILED(hr)) {
-		hlog_hr("d3d11_init_vertex_buffer: failed to create vertex "
-			"buffer",
-			hr);
-		return false;
-	}
-
-	return true;
-}
-
-static bool d3d11_init_scaling(void)
-{
-	bool success;
-
-	success = create_d3d11_tex(data.base_cx, data.base_cy, &data.scale_tex,
-				   &data.scale_resource, nullptr, nullptr);
-	if (!success) {
-		hlog("d3d11_init_scaling: failed to create scale texture");
-		return false;
-	}
-
-	if (!d3d11_init_vertex_shader()) {
-		return false;
-	}
-	if (!d3d11_init_pixel_shader()) {
-		return false;
-	}
-	if (!d3d11_init_sampler_state()) {
-		return false;
-	}
-	if (!d3d11_init_blend_state()) {
-		return false;
-	}
-	if (!d3d11_init_zstencil_state()) {
-		return false;
-	}
-	if (!d3d11_init_raster_state()) {
-		return false;
-	}
-	if (!d3d11_init_vertex_buffer()) {
-		return false;
-	}
+	data.cx = desc.BufferDesc.Width;
+	data.cy = desc.BufferDesc.Height;
 
 	return true;
 }
@@ -472,13 +251,6 @@
 		data.context->Unmap(data.copy_surfaces[idx], 0);
 	}
 
-	success = create_d3d11_tex(data.cx, data.cy, &data.textures[idx],
-				   nullptr, &data.render_targets[idx], nullptr);
-	if (!success) {
-		hlog("d3d11_shmem_init_buffers: failed to create texture");
-		return false;
-	}
-
 	return true;
 }
 
@@ -491,9 +263,8 @@
 			return false;
 		}
 	}
-	if (!capture_init_shmem(&data.shmem_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.pitch,
-				data.format, false)) {
+	if (!capture_init_shmem(&data.shmem_info, window, data.cx, data.cy,
+				data.pitch, data.format, false)) {
 		return false;
 	}
 
@@ -517,9 +288,8 @@
 		hlog("d3d11_shtex_init: failed to create texture");
 		return false;
 	}
-	if (!capture_init_shtex(&data.shtex_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.format,
-				false, (uintptr_t)data.handle)) {
+	if (!capture_init_shtex(&data.shtex_info, window, data.cx, data.cy,
+				data.format, false, (uintptr_t)data.handle)) {
 		return false;
 	}
 
@@ -529,12 +299,9 @@
 
 static void d3d11_init(IDXGISwapChain *swap)
 {
-	bool success = true;
 	HWND window;
 	HRESULT hr;
 
-	data.using_scale = global_hook_info->use_scale;
-
 	hr = swap->GetDevice(__uuidof(ID3D11Device), (void **)&data.device);
 	if (FAILED(hr)) {
 		hlog_hr("d3d11_init: failed to get device from swap", hr);
@@ -549,201 +316,14 @@
 	if (!d3d11_init_format(swap, window)) {
 		return;
 	}
-	if (data.using_scale && !d3d11_init_scaling()) {
-		hlog("d3d11_init: failed to initialize scaling");
-		success = false;
-	}
-	if (success) {
-		if (global_hook_info->force_shmem) {
-			success = d3d11_shmem_init(window);
-		} else {
-			success = d3d11_shtex_init(window);
-		}
-	}
 
+	const bool success = global_hook_info->force_shmem
+				     ? d3d11_shmem_init(window)
+				     : d3d11_shtex_init(window);
 	if (!success)
 		d3d11_free();
 }
 
-#define MAX_RENDER_TARGETS D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT
-#define MAX_SO_TARGETS 4
-#define MAX_CLASS_INSTS 256
-
-struct d3d11_state {
-	ID3D11GeometryShader *geom_shader;
-	ID3D11InputLayout *vertex_layout;
-	D3D11_PRIMITIVE_TOPOLOGY topology;
-	ID3D11Buffer *vertex_buffer;
-	UINT vb_stride;
-	UINT vb_offset;
-	ID3D11BlendState *blend_state;
-	float blend_factor[4];
-	UINT sample_mask;
-	ID3D11DepthStencilState *zstencil_state;
-	UINT zstencil_ref;
-	ID3D11RenderTargetView *render_targets[MAX_RENDER_TARGETS];
-	ID3D11DepthStencilView *zstencil_view;
-	ID3D11SamplerState *sampler_state;
-	ID3D11PixelShader *pixel_shader;
-	ID3D11ShaderResourceView *resource;
-	ID3D11RasterizerState *raster_state;
-	UINT num_viewports;
-	D3D11_VIEWPORT *viewports;
-	ID3D11Buffer *stream_output_targets[MAX_SO_TARGETS];
-	ID3D11VertexShader *vertex_shader;
-	ID3D11ClassInstance *gs_class_instances[MAX_CLASS_INSTS];
-	ID3D11ClassInstance *ps_class_instances[MAX_CLASS_INSTS];
-	ID3D11ClassInstance *vs_class_instances[MAX_CLASS_INSTS];
-	UINT gs_class_inst_count;
-	UINT ps_class_inst_count;
-	UINT vs_class_inst_count;
-};
-
-static inline void d3d11_save_state(struct d3d11_state *state)
-{
-	state->gs_class_inst_count = MAX_CLASS_INSTS;
-	state->ps_class_inst_count = MAX_CLASS_INSTS;
-	state->vs_class_inst_count = MAX_CLASS_INSTS;
-
-	data.context->GSGetShader(&state->geom_shader,
-				  state->gs_class_instances,
-				  &state->gs_class_inst_count);
-	data.context->IAGetInputLayout(&state->vertex_layout);
-	data.context->IAGetPrimitiveTopology(&state->topology);
-	data.context->IAGetVertexBuffers(0, 1, &state->vertex_buffer,
-					 &state->vb_stride, &state->vb_offset);
-	data.context->OMGetBlendState(&state->blend_state, state->blend_factor,
-				      &state->sample_mask);
-	data.context->OMGetDepthStencilState(&state->zstencil_state,
-					     &state->zstencil_ref);
-	data.context->OMGetRenderTargets(MAX_RENDER_TARGETS,
-					 state->render_targets,
-					 &state->zstencil_view);
-	data.context->PSGetSamplers(0, 1, &state->sampler_state);
-	data.context->PSGetShader(&state->pixel_shader,
-				  state->ps_class_instances,
-				  &state->ps_class_inst_count);
-	data.context->PSGetShaderResources(0, 1, &state->resource);
-	data.context->RSGetState(&state->raster_state);
-	data.context->RSGetViewports(&state->num_viewports, nullptr);
-	if (state->num_viewports) {
-		state->viewports = (D3D11_VIEWPORT *)malloc(
-			sizeof(D3D11_VIEWPORT) * state->num_viewports);
-		data.context->RSGetViewports(&state->num_viewports,
-					     state->viewports);
-	}
-	data.context->SOGetTargets(MAX_SO_TARGETS,
-				   state->stream_output_targets);
-	data.context->VSGetShader(&state->vertex_shader,
-				  state->vs_class_instances,
-				  &state->vs_class_inst_count);
-}
-
-static inline void safe_release(IUnknown *p)
-{
-	if (p)
-		p->Release();
-}
-
-#define SO_APPEND ((UINT)-1)
-
-static inline void d3d11_restore_state(struct d3d11_state *state)
-{
-	UINT so_offsets[MAX_SO_TARGETS] = {SO_APPEND, SO_APPEND, SO_APPEND,
-					   SO_APPEND};
-
-	data.context->GSSetShader(state->geom_shader, state->gs_class_instances,
-				  state->gs_class_inst_count);
-	data.context->IASetInputLayout(state->vertex_layout);
-	data.context->IASetPrimitiveTopology(state->topology);
-	data.context->IASetVertexBuffers(0, 1, &state->vertex_buffer,
-					 &state->vb_stride, &state->vb_offset);
-	data.context->OMSetBlendState(state->blend_state, state->blend_factor,
-				      state->sample_mask);
-	data.context->OMSetDepthStencilState(state->zstencil_state,
-					     state->zstencil_ref);
-	data.context->OMSetRenderTargets(MAX_RENDER_TARGETS,
-					 state->render_targets,
-					 state->zstencil_view);
-	data.context->PSSetSamplers(0, 1, &state->sampler_state);
-	data.context->PSSetShader(state->pixel_shader,
-				  state->ps_class_instances,
-				  state->ps_class_inst_count);
-	data.context->PSSetShaderResources(0, 1, &state->resource);
-	data.context->RSSetState(state->raster_state);
-	data.context->RSSetViewports(state->num_viewports, state->viewports);
-	data.context->SOSetTargets(MAX_SO_TARGETS, state->stream_output_targets,
-				   so_offsets);
-	data.context->VSSetShader(state->vertex_shader,
-				  state->vs_class_instances,
-				  state->vs_class_inst_count);
-	safe_release(state->geom_shader);
-	safe_release(state->vertex_layout);
-	safe_release(state->vertex_buffer);
-	safe_release(state->blend_state);
-	safe_release(state->zstencil_state);
-	for (size_t i = 0; i < MAX_RENDER_TARGETS; i++)
-		safe_release(state->render_targets[i]);
-	safe_release(state->zstencil_view);
-	safe_release(state->sampler_state);
-	safe_release(state->pixel_shader);
-	safe_release(state->resource);
-	safe_release(state->raster_state);
-	for (size_t i = 0; i < MAX_SO_TARGETS; i++)
-		safe_release(state->stream_output_targets[i]);
-	safe_release(state->vertex_shader);
-	for (size_t i = 0; i < state->gs_class_inst_count; i++)
-		state->gs_class_instances[i]->Release();
-	for (size_t i = 0; i < state->ps_class_inst_count; i++)
-		state->ps_class_instances[i]->Release();
-	for (size_t i = 0; i < state->vs_class_inst_count; i++)
-		state->vs_class_instances[i]->Release();
-	free(state->viewports);
-	memset(state, 0, sizeof(*state));
-}
-
-static inline void d3d11_setup_pipeline(ID3D11RenderTargetView *target,
-					ID3D11ShaderResourceView *resource)
-{
-	const float factor[4] = {1.0f, 1.0f, 1.0f, 1.0f};
-	D3D11_VIEWPORT viewport = {0};
-	UINT stride = sizeof(vertex);
-	void *emptyptr = nullptr;
-	UINT zero = 0;
-
-	viewport.Width = (float)data.cx;
-	viewport.Height = (float)data.cy;
-	viewport.MaxDepth = 1.0f;
-
-	data.context->GSSetShader(nullptr, nullptr, 0);
-	data.context->IASetInputLayout(data.vertex_layout);
-	data.context->IASetPrimitiveTopology(
-		D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-	data.context->IASetVertexBuffers(0, 1, &data.vertex_buffer, &stride,
-					 &zero);
-	data.context->OMSetBlendState(data.blend_state, factor, 0xFFFFFFFF);
-	data.context->OMSetDepthStencilState(data.zstencil_state, 0);
-	data.context->OMSetRenderTargets(1, &target, nullptr);
-	data.context->PSSetSamplers(0, 1, &data.sampler_state);
-	data.context->PSSetShader(data.pixel_shader, nullptr, 0);
-	data.context->PSSetShaderResources(0, 1, &resource);
-	data.context->RSSetState(data.raster_state);
-	data.context->RSSetViewports(1, &viewport);
-	data.context->SOSetTargets(1, (ID3D11Buffer **)&emptyptr, &zero);
-	data.context->VSSetShader(data.vertex_shader, nullptr, 0);
-}
-
-static inline void d3d11_scale_texture(ID3D11RenderTargetView *target,
-				       ID3D11ShaderResourceView *resource)
-{
-	static struct d3d11_state old_state = {0};
-
-	d3d11_save_state(&old_state);
-	d3d11_setup_pipeline(target, resource);
-	data.context->Draw(4, 0);
-	d3d11_restore_state(&old_state);
-}
-
 static inline void d3d11_copy_texture(ID3D11Resource *dst, ID3D11Resource *src)
 {
 	if (data.multisampled) {
@@ -755,30 +335,22 @@
 
 static inline void d3d11_shtex_capture(ID3D11Resource *backbuffer)
 {
-	if (data.using_scale) {
-		d3d11_copy_texture(data.scale_tex, backbuffer);
-		d3d11_scale_texture(data.render_target, data.scale_resource);
-	} else {
-		d3d11_copy_texture(data.texture, backbuffer);
-	}
+	d3d11_copy_texture(data.texture, backbuffer);
 }
 
-static inline void d3d11_shmem_queue_copy()
+static void d3d11_shmem_capture_copy(int i)
 {
-	for (size_t i = 0; i < NUM_BUFFERS; i++) {
-		D3D11_MAPPED_SUBRESOURCE map;
-		HRESULT hr;
+	D3D11_MAPPED_SUBRESOURCE map;
+	HRESULT hr;
 
-		if (data.texture_ready[i]) {
-			data.texture_ready[i] = false;
+	if (data.texture_ready[i]) {
+		data.texture_ready[i] = false;
 
-			hr = data.context->Map(data.copy_surfaces[i], 0,
-					       D3D11_MAP_READ, 0, &map);
-			if (SUCCEEDED(hr)) {
-				data.texture_mapped[i] = true;
-				shmem_copy_data(i, map.pData);
-			}
-			break;
+		hr = data.context->Map(data.copy_surfaces[i], 0, D3D11_MAP_READ,
+				       0, &map);
+		if (SUCCEEDED(hr)) {
+			data.texture_mapped[i] = true;
+			shmem_copy_data(i, map.pData);
 		}
 	}
 }
@@ -787,32 +359,22 @@
 {
 	int next_tex;
 
-	d3d11_shmem_queue_copy();
-
-	next_tex = (data.cur_tex == NUM_BUFFERS - 1) ? 0 : data.cur_tex + 1;
-
-	if (data.using_scale) {
-		d3d11_copy_texture(data.scale_tex, backbuffer);
-		d3d11_scale_texture(data.render_targets[data.cur_tex],
-				    data.scale_resource);
-	} else {
-		d3d11_copy_texture(data.textures[data.cur_tex], backbuffer);
-	}
+	next_tex = (data.cur_tex + 1) % NUM_BUFFERS;
+	d3d11_shmem_capture_copy(next_tex);
 
 	if (data.copy_wait < NUM_BUFFERS - 1) {
 		data.copy_wait++;
 	} else {
-		ID3D11Texture2D *src = data.textures[next_tex];
-		ID3D11Texture2D *dst = data.copy_surfaces[next_tex];
-
-		if (shmem_texture_data_lock(next_tex)) {
-			data.context->Unmap(dst, 0);
-			data.texture_mapped[next_tex] = false;
-			shmem_texture_data_unlock(next_tex);
+		if (shmem_texture_data_lock(data.cur_tex)) {
+			data.context->Unmap(data.copy_surfaces[data.cur_tex],
+					    0);
+			data.texture_mapped[data.cur_tex] = false;
+			shmem_texture_data_unlock(data.cur_tex);
 		}
 
-		d3d11_copy_texture(dst, src);
-		data.texture_ready[next_tex] = true;
+		d3d11_copy_texture(data.copy_surfaces[data.cur_tex],
+				   backbuffer);
+		data.texture_ready[data.cur_tex] = true;
 	}
 
 	data.cur_tex = next_tex;

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/d3d12-capture.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/d3d12-capture.cpp Changed

@@ -14,13 +14,10 @@
 
 struct d3d12_data {
 	ID3D12Device *device; /* do not release */
-	uint32_t base_cx;
-	uint32_t base_cy;
 	uint32_t cx;
 	uint32_t cy;
 	DXGI_FORMAT format;
 	bool using_shtex;
-	bool using_scale;
 	bool multisampled;
 	bool dxgi_1_4;
 
@@ -197,9 +194,8 @@
 	if (!create_d3d12_tex(bb)) {
 		return false;
 	}
-	if (!capture_init_shtex(&data.shtex_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.format,
-				false, (uintptr_t)data.handle)) {
+	if (!capture_init_shtex(&data.shtex_info, window, data.cx, data.cy,
+				data.format, false, (uintptr_t)data.handle)) {
 		return false;
 	}
 
@@ -223,8 +219,8 @@
 	data.format = fix_dxgi_format(desc.BufferDesc.Format);
 	data.multisampled = desc.SampleDesc.Count > 1;
 	window = desc.OutputWindow;
-	data.base_cx = desc.BufferDesc.Width;
-	data.base_cy = desc.BufferDesc.Height;
+	data.cx = desc.BufferDesc.Width;
+	data.cy = desc.BufferDesc.Height;
 
 	hr = swap->QueryInterface(__uuidof(IDXGISwapChain3), (void **)&swap3);
 	if (SUCCEEDED(hr)) {
@@ -260,25 +256,15 @@
 		}
 	}
 
-	if (data.using_scale) {
-		data.cx = global_hook_info->cx;
-		data.cy = global_hook_info->cy;
-	} else {
-		data.cx = desc.BufferDesc.Width;
-		data.cy = desc.BufferDesc.Height;
-	}
 	return true;
 }
 
 static void d3d12_init(IDXGISwapChain *swap)
 {
-	bool success = true;
 	bb_info bb = {};
 	HWND window;
 	HRESULT hr;
 
-	data.using_scale = global_hook_info->use_scale;
-
 	hr = swap->GetDevice(__uuidof(ID3D12Device), (void **)&data.device);
 	if (FAILED(hr)) {
 		hlog_hr("d3d12_init: failed to get device from swap", hr);
@@ -290,19 +276,13 @@
 	if (!d3d12_init_format(swap, window, bb)) {
 		return;
 	}
-	if (data.using_scale) {
-		hlog("d3d12_init: scaling currently unsupported; ignoring");
-	}
-	if (success) {
-		if (global_hook_info->force_shmem) {
-			hlog("d3d12_init: shared memory capture currently "
-			     "unsupported; ignoring");
-		}
 
-		success = d3d12_shtex_init(window, bb);
+	if (global_hook_info->force_shmem) {
+		hlog("d3d12_init: shared memory capture currently "
+		     "unsupported; ignoring");
 	}
 
-	if (!success)
+	if (!d3d12_shtex_init(window, bb))
 		d3d12_free();
 }

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp Changed

@@ -24,6 +24,7 @@
 	HWND window;
 	uint32_t pitch;
 	IDirect3DSurface8 *copy_surfaces[NUM_BUFFERS];
+	bool texture_ready[NUM_BUFFERS];
 	bool surface_locked[NUM_BUFFERS];
 	int cur_surface;
 	int copy_wait;
@@ -145,8 +146,7 @@
 		}
 	}
 	if (!capture_init_shmem(&data.shmem_info, data.window, data.cx, data.cy,
-				data.cx, data.cy, data.pitch, data.dxgi_format,
-				false)) {
+				data.pitch, data.dxgi_format, false)) {
 		return false;
 	}
 
@@ -184,45 +184,50 @@
 
 static void d3d8_shmem_capture_copy(int idx)
 {
-	IDirect3DSurface8 *target = data.copy_surfaces[idx];
 	D3DLOCKED_RECT rect;
 	HRESULT hr;
 
-	if (data.surface_locked[idx])
-		return;
+	if (data.texture_ready[idx]) {
+		data.texture_ready[idx] = false;
 
-	hr = target->LockRect(&rect, nullptr, D3DLOCK_READONLY);
-	if (SUCCEEDED(hr)) {
-		shmem_copy_data(idx, rect.pBits);
+		IDirect3DSurface8 *target = data.copy_surfaces[idx];
+		hr = target->LockRect(&rect, nullptr, D3DLOCK_READONLY);
+		if (SUCCEEDED(hr)) {
+			data.surface_locked[idx] = true;
+			shmem_copy_data(idx, rect.pBits);
+		}
 	}
 }
 
 static void d3d8_shmem_capture(IDirect3DDevice8 *device,
 			       IDirect3DSurface8 *backbuffer)
 {
-	int cur_surface;
 	int next_surface;
 	HRESULT hr;
 
-	cur_surface = data.cur_surface;
-	next_surface = (cur_surface == NUM_BUFFERS - 1) ? 0 : cur_surface + 1;
+	next_surface = (data.cur_surface + 1) % NUM_BUFFERS;
+	d3d8_shmem_capture_copy(next_surface);
 
 	if (data.copy_wait < NUM_BUFFERS - 1) {
 		data.copy_wait++;
 	} else {
 		IDirect3DSurface8 *src = backbuffer;
-		IDirect3DSurface8 *dst = data.copy_surfaces[cur_surface];
+		IDirect3DSurface8 *dst = data.copy_surfaces[data.cur_surface];
 
-		if (shmem_texture_data_lock(next_surface)) {
+		if (shmem_texture_data_lock(data.cur_surface)) {
 			dst->UnlockRect();
-			data.surface_locked[next_surface] = false;
-			shmem_texture_data_unlock(next_surface);
+			data.surface_locked[data.cur_surface] = false;
+			shmem_texture_data_unlock(data.cur_surface);
 		}
 
 		hr = device->CopyRects(src, nullptr, 0, dst, nullptr);
-		if (SUCCEEDED(hr)) {
-			d3d8_shmem_capture_copy(cur_surface);
+		if (FAILED(hr)) {
+			hlog_hr("d3d8_shmem_capture: CopyRects "
+				"failed",
+				hr);
 		}
+
+		data.texture_ready[data.cur_surface] = true;
 	}
 
 	data.cur_surface = next_surface;

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/d3d9-capture.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/d3d9-capture.cpp Changed

@@ -38,7 +38,6 @@
 	D3DFORMAT d3d9_format;
 	DXGI_FORMAT dxgi_format;
 	bool using_shtex;
-	bool using_scale;
 
 	/* shared texture */
 	IDirect3DSurface9 *d3d9_copytex;
@@ -51,7 +50,6 @@
 
 	/* shared memory */
 	IDirect3DSurface9 *copy_surfaces[NUM_BUFFERS];
-	IDirect3DSurface9 *render_targets[NUM_BUFFERS];
 	IDirect3DQuery9 *queries[NUM_BUFFERS];
 	struct shmem_data *shmem_info;
 	bool texture_mapped[NUM_BUFFERS];
@@ -83,8 +81,6 @@
 					data.copy_surfaces[i]->UnlockRect();
 				data.copy_surfaces[i]->Release();
 			}
-			if (data.render_targets[i])
-				data.render_targets[i]->Release();
 			if (data.queries[i])
 				data.queries[i]->Release();
 		}
@@ -289,7 +285,7 @@
 	return true;
 }
 
-static bool d3d9_shtex_init(uint32_t cx, uint32_t cy, HWND window)
+static bool d3d9_shtex_init(HWND window)
 {
 	data.using_shtex = true;
 
@@ -302,8 +298,8 @@
 	if (!d3d9_shtex_init_copytex()) {
 		return false;
 	}
-	if (!capture_init_shtex(&data.shtex_info, window, cx, cy, data.cx,
-				data.cy, data.dxgi_format, false,
+	if (!capture_init_shtex(&data.shtex_info, window, data.cx, data.cy,
+				data.dxgi_format, false,
 				(uintptr_t)data.handle)) {
 		return false;
 	}
@@ -340,17 +336,6 @@
 		data.copy_surfaces[buffer]->UnlockRect();
 	}
 
-	hr = data.device->CreateRenderTarget(data.cx, data.cy, data.d3d9_format,
-					     D3DMULTISAMPLE_NONE, 0, false,
-					     &data.render_targets[buffer],
-					     nullptr);
-	if (FAILED(hr)) {
-		hlog_hr("d3d9_shmem_init_buffers: Failed to create render "
-			"target",
-			hr);
-		return false;
-	}
-
 	hr = data.device->CreateQuery(D3DQUERYTYPE_EVENT,
 				      &data.queries[buffer]);
 	if (FAILED(hr)) {
@@ -361,7 +346,7 @@
 	return true;
 }
 
-static bool d3d9_shmem_init(uint32_t cx, uint32_t cy, HWND window)
+static bool d3d9_shmem_init(HWND window)
 {
 	data.using_shtex = false;
 
@@ -370,8 +355,8 @@
 			return false;
 		}
 	}
-	if (!capture_init_shmem(&data.shmem_info, window, cx, cy, data.cx,
-				data.cy, data.pitch, data.dxgi_format, false)) {
+	if (!capture_init_shmem(&data.shmem_info, window, data.cx, data.cy,
+				data.pitch, data.dxgi_format, false)) {
 		return false;
 	}
 
@@ -403,8 +388,7 @@
 	return true;
 }
 
-static bool d3d9_init_format_backbuffer(uint32_t &cx, uint32_t &cy,
-					HWND &window)
+static bool d3d9_init_format_backbuffer(HWND &window)
 {
 	IDirect3DSurface9 *back_buffer = nullptr;
 	D3DPRESENT_PARAMETERS pp;
@@ -432,23 +416,15 @@
 
 	data.d3d9_format = desc.Format;
 	data.dxgi_format = d3d9_to_dxgi_format(desc.Format);
-	data.using_scale = global_hook_info->use_scale;
 	window = pp.hDeviceWindow;
-	cx = desc.Width;
-	cy = desc.Height;
 
-	if (data.using_scale) {
-		data.cx = global_hook_info->cx;
-		data.cy = global_hook_info->cy;
-	} else {
-		data.cx = desc.Width;
-		data.cy = desc.Height;
-	}
+	data.cx = desc.Width;
+	data.cy = desc.Height;
 
 	return true;
 }
 
-static bool d3d9_init_format_swapchain(uint32_t &cx, uint32_t &cy, HWND &window)
+static bool d3d9_init_format_swapchain(HWND &window)
 {
 	D3DPRESENT_PARAMETERS pp;
 
@@ -458,18 +434,10 @@
 
 	data.dxgi_format = d3d9_to_dxgi_format(pp.BackBufferFormat);
 	data.d3d9_format = pp.BackBufferFormat;
-	data.using_scale = global_hook_info->use_scale;
 	window = pp.hDeviceWindow;
-	cx = pp.BackBufferWidth;
-	cy = pp.BackBufferHeight;
 
-	if (data.using_scale) {
-		data.cx = global_hook_info->cx;
-		data.cy = global_hook_info->cy;
-	} else {
-		data.cx = pp.BackBufferWidth;
-		data.cy = pp.BackBufferHeight;
-	}
+	data.cx = pp.BackBufferWidth;
+	data.cy = pp.BackBufferHeight;
 
 	return true;
 }
@@ -481,8 +449,6 @@
 		global_hook_info->offsets.d3d9.d3d9_clsoff &&
 		global_hook_info->offsets.d3d9.is_d3d9ex_clsoff;
 	bool success;
-	uint32_t cx = 0;
-	uint32_t cy = 0;
 	HWND window = nullptr;
 	HRESULT hr;
 
@@ -500,17 +466,17 @@
 		data.patch = -1;
 	}
 
-	if (!d3d9_init_format_backbuffer(cx, cy, window)) {
-		if (!d3d9_init_format_swapchain(cx, cy, window)) {
+	if (!d3d9_init_format_backbuffer(window)) {
+		if (!d3d9_init_format_swapchain(window)) {
 			return;
 		}
 	}
 
 	if (global_hook_info->force_shmem ||
 	    (!d3d9ex && data.patch == -1 && !has_d3d9ex_bool_offset)) {
-		success = d3d9_shmem_init(cx, cy, window);
+		success = d3d9_shmem_init(window);
 	} else {
-		success = d3d9_shtex_init(cx, cy, window);
+		success = d3d9_shtex_init(window);
 	}
 
 	if (!success)
@@ -539,73 +505,54 @@
 
 static inline void d3d9_shtex_capture(IDirect3DSurface9 *backbuffer)
 {
-	D3DTEXTUREFILTERTYPE filter;
 	HRESULT hr;
 
-	filter = data.using_scale ? D3DTEXF_LINEAR : D3DTEXF_NONE;
-
 	hr = data.device->StretchRect(backbuffer, nullptr, data.d3d9_copytex,
-				      nullptr, filter);
+				      nullptr, D3DTEXF_NONE);
 	if (FAILED(hr))
 		hlog_hr("d3d9_shtex_capture: StretchRect failed", hr);
 }
 
-static inline void d3d9_shmem_capture_queue_copy()
+static void d3d9_shmem_capture_copy(int i)
 {
-	for (int i = 0; i < NUM_BUFFERS; i++) {
-		IDirect3DSurface9 *target = data.copy_surfaces[i];
-		D3DLOCKED_RECT rect;
-		HRESULT hr;
+	IDirect3DSurface9 *target = data.copy_surfaces[i];
+	D3DLOCKED_RECT rect;
+	HRESULT hr;
 
-		if (!data.issued_queries[i]) {
-			continue;
-		}
-		if (data.queries[i]->GetData(0, 0, 0) != S_OK) {
-			continue;
-		}
+	if (!data.issued_queries[i]) {
+		return;
+	}
+	if (data.queries[i]->GetData(0, 0, 0) != S_OK) {
+		return;
+	}
 
-		data.issued_queries[i] = false;
+	data.issued_queries[i] = false;
 
-		hr = target->LockRect(&rect, nullptr, D3DLOCK_READONLY);
-		if (SUCCEEDED(hr)) {
-			data.texture_mapped[i] = true;
-			shmem_copy_data(i, rect.pBits);
-		}
-		break;
+	hr = target->LockRect(&rect, nullptr, D3DLOCK_READONLY);
+	if (SUCCEEDED(hr)) {
+		data.texture_mapped[i] = true;
+		shmem_copy_data(i, rect.pBits);
 	}
 }
 
 static inline void d3d9_shmem_capture(IDirect3DSurface9 *backbuffer)
 {
-	D3DTEXTUREFILTERTYPE filter;
-	IDirect3DSurface9 *copy;
 	int next_tex;
 	HRESULT hr;
 
-	d3d9_shmem_capture_queue_copy();
-
-	next_tex = (data.cur_tex == NUM_BUFFERS - 1) ? 0 : data.cur_tex + 1;
-	filter = data.using_scale ? D3DTEXF_LINEAR : D3DTEXF_NONE;
-	copy = data.render_targets[data.cur_tex];
-
-	hr = data.device->StretchRect(backbuffer, nullptr, copy, nullptr,
-				      filter);
-
-	if (FAILED(hr)) {
-		hlog_hr("d3d9_shmem_capture: StretchRect failed", hr);
-		return;
-	}
+	next_tex = (data.cur_tex + 1) % NUM_BUFFERS;
+	d3d9_shmem_capture_copy(next_tex);
 
 	if (data.copy_wait < NUM_BUFFERS - 1) {
 		data.copy_wait++;
 	} else {
-		IDirect3DSurface9 *src = data.render_targets[next_tex];
-		IDirect3DSurface9 *dst = data.copy_surfaces[next_tex];
+		IDirect3DSurface9 *src = backbuffer;
+		IDirect3DSurface9 *dst = data.copy_surfaces[data.cur_tex];
 
-		if (shmem_texture_data_lock(next_tex)) {
+		if (shmem_texture_data_lock(data.cur_tex)) {
 			dst->UnlockRect();
-			data.texture_mapped[next_tex] = false;
-			shmem_texture_data_unlock(next_tex);
+			data.texture_mapped[data.cur_tex] = false;
+			shmem_texture_data_unlock(data.cur_tex);
 		}
 
 		hr = data.device->GetRenderTargetData(src, dst);
@@ -615,8 +562,8 @@
 				hr);
 		}
 
-		data.queries[next_tex]->Issue(D3DISSUE_END);
-		data.issued_queries[next_tex] = true;
+		data.queries[data.cur_tex]->Issue(D3DISSUE_END);
+		data.issued_queries[data.cur_tex] = true;
 	}
 
 	data.cur_tex = next_tex;

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/dxgi-capture.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/dxgi-capture.cpp Changed

@@ -3,7 +3,6 @@
 #include <dxgi1_2.h>
 #include <d3dcompiler.h>
 
-#include "d3d1x_shaders.hpp"
 #include "graphics-hook.h"
 #include "../funchook.h"
 
@@ -218,41 +217,9 @@
 	return hr;
 }
 
-static pD3DCompile get_compiler(void)
-{
-	pD3DCompile compile = nullptr;
-	char d3dcompiler[40] = {};
-	int ver = 49;
-
-	while (ver > 30) {
-		sprintf_s(d3dcompiler, 40, "D3DCompiler_%02d.dll", ver);
-
-		HMODULE module = LoadLibraryA(d3dcompiler);
-		if (module) {
-			compile = (pD3DCompile)GetProcAddress(module,
-							      "D3DCompile");
-			if (compile) {
-				break;
-			}
-		}
-
-		ver--;
-	}
-
-	return compile;
-}
-
-static uint8_t vertex_shader_data[1024];
-static uint8_t pixel_shader_data[1024];
-static size_t vertex_shader_size = 0;
-static size_t pixel_shader_size = 0;
-
 bool hook_dxgi(void)
 {
-	pD3DCompile compile;
-	ID3D10Blob *blob;
 	HMODULE dxgi_module = get_system_module("dxgi.dll");
-	HRESULT hr;
 	void *present_addr;
 	void *resize_addr;
 	void *present1_addr = nullptr;
@@ -261,42 +228,6 @@
 		return false;
 	}
 
-	compile = get_compiler();
-	if (!compile) {
-		hlog("hook_dxgi: failed to find d3d compiler library");
-		return true;
-	}
-
-	/* ---------------------- */
-
-	hr = compile(vertex_shader_string, sizeof(vertex_shader_string),
-		     "vertex_shader_string", nullptr, nullptr, "main", "vs_4_0",
-		     D3D10_SHADER_OPTIMIZATION_LEVEL1, 0, &blob, nullptr);
-	if (FAILED(hr)) {
-		hlog_hr("hook_dxgi: failed to compile vertex shader", hr);
-		return true;
-	}
-
-	vertex_shader_size = (size_t)blob->GetBufferSize();
-	memcpy(vertex_shader_data, blob->GetBufferPointer(),
-	       blob->GetBufferSize());
-	blob->Release();
-
-	/* ---------------------- */
-
-	hr = compile(pixel_shader_string, sizeof(pixel_shader_string),
-		     "pixel_shader_string", nullptr, nullptr, "main", "ps_4_0",
-		     D3D10_SHADER_OPTIMIZATION_LEVEL1, 0, &blob, nullptr);
-	if (FAILED(hr)) {
-		hlog_hr("hook_dxgi: failed to compile pixel shader", hr);
-		return true;
-	}
-
-	pixel_shader_size = (size_t)blob->GetBufferSize();
-	memcpy(pixel_shader_data, blob->GetBufferPointer(),
-	       blob->GetBufferSize());
-	blob->Release();
-
 	/* ---------------------- */
 
 	present_addr = get_offset_addr(dxgi_module,
@@ -323,15 +254,3 @@
 	hlog("Hooked DXGI");
 	return true;
 }
-
-uint8_t *get_d3d1x_vertex_shader(size_t *size)
-{
-	*size = vertex_shader_size;
-	return vertex_shader_data;
-}
-
-uint8_t *get_d3d1x_pixel_shader(size_t *size)
-{
-	*size = pixel_shader_size;
-	return pixel_shader_data;
-}

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c Changed

@@ -34,14 +34,11 @@
 
 struct gl_data {
 	HDC hdc;
-	uint32_t base_cx;
-	uint32_t base_cy;
 	uint32_t cx;
 	uint32_t cy;
 	DXGI_FORMAT format;
 	GLuint fbo;
 	bool using_shtex;
-	bool using_scale;
 	bool shmem_fallback;
 
 	union {
@@ -434,9 +431,8 @@
 	if (!gl_init_fbo()) {
 		return false;
 	}
-	if (!capture_init_shtex(&data.shtex_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.format,
-				true, (uintptr_t)data.handle)) {
+	if (!capture_init_shtex(&data.shtex_info, window, data.cx, data.cy,
+				data.format, true, (uintptr_t)data.handle)) {
 		return false;
 	}
 
@@ -516,9 +512,8 @@
 	if (!gl_init_fbo()) {
 		return false;
 	}
-	if (!capture_init_shmem(&data.shmem_info, window, data.base_cx,
-				data.base_cy, data.cx, data.cy, data.cx * 4,
-				data.format, true)) {
+	if (!capture_init_shmem(&data.shmem_info, window, data.cx, data.cy,
+				data.cx * 4, data.format, true)) {
 		return false;
 	}
 
@@ -538,29 +533,20 @@
 	RECT rc = {0};
 
 	if (darkest_dungeon_fix) {
-		data.base_cx = 1920;
-		data.base_cy = 1080;
+		data.cx = 1920;
+		data.cy = 1080;
 	} else {
 		GetClientRect(window, &rc);
-		data.base_cx = rc.right;
-		data.base_cy = rc.bottom;
+		data.cx = rc.right;
+		data.cy = rc.bottom;
 	}
 
 	data.hdc = hdc;
 	data.format = DXGI_FORMAT_B8G8R8A8_UNORM;
-	data.using_scale = global_hook_info->use_scale;
 	data.using_shtex = nv_capture_available &&
 			   !global_hook_info->force_shmem &&
 			   !data.shmem_fallback;
 
-	if (data.using_scale) {
-		data.cx = global_hook_info->cx;
-		data.cy = global_hook_info->cy;
-	} else {
-		data.cx = data.base_cx;
-		data.cy = data.base_cy;
-	}
-
 	if (data.using_shtex) {
 		success = gl_shtex_init(window);
 		if (!success)
@@ -606,8 +592,8 @@
 		return;
 	}
 
-	glBlitFramebuffer(0, 0, data.base_cx, data.base_cy, 0, 0, data.cx,
-			  data.cy, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+	glBlitFramebuffer(0, 0, data.cx, data.cy, 0, 0, data.cx, data.cy,
+			  GL_COLOR_BUFFER_BIT, GL_LINEAR);
 	gl_error("gl_copy_backbuffer", "failed to blit");
 }
 
@@ -638,27 +624,23 @@
 	IDXGISwapChain_Present(data.dxgi_swap, 0, 0);
 }
 
-static inline void gl_shmem_capture_queue_copy(void)
+static void gl_shmem_capture_copy(int i)
 {
-	for (int i = 0; i < NUM_BUFFERS; i++) {
-		if (data.texture_ready[i]) {
-			GLvoid *buffer;
+	if (data.texture_ready[i]) {
+		GLvoid *buffer;
 
-			data.texture_ready[i] = false;
+		data.texture_ready[i] = false;
 
-			glBindBuffer(GL_PIXEL_PACK_BUFFER, data.pbos[i]);
-			if (gl_error("gl_shmem_capture_queue_copy",
-				     "failed to bind pbo")) {
-				return;
-			}
+		glBindBuffer(GL_PIXEL_PACK_BUFFER, data.pbos[i]);
+		if (gl_error("gl_shmem_capture_queue_copy",
+			     "failed to bind pbo")) {
+			return;
+		}
 
-			buffer =
-				glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
-			if (buffer) {
-				data.texture_mapped[i] = true;
-				shmem_copy_data(i, buffer);
-			}
-			break;
+		buffer = glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
+		if (buffer) {
+			data.texture_mapped[i] = true;
+			shmem_copy_data(i, buffer);
 		}
 	}
 }
@@ -686,6 +668,7 @@
 	int next_tex;
 	GLint last_fbo;
 	GLint last_tex;
+	GLint last_pbo;
 
 	glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &last_fbo);
 	if (gl_error("gl_shmem_capture", "failed to get last fbo")) {
@@ -697,30 +680,36 @@
 		return;
 	}
 
-	gl_shmem_capture_queue_copy();
-
-	next_tex = (data.cur_tex == NUM_BUFFERS - 1) ? 0 : data.cur_tex + 1;
+	glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING, &last_pbo);
+	if (gl_error("gl_shmem_capture", "failed to get last pbo")) {
+		return;
+	}
 
-	gl_copy_backbuffer(data.textures[next_tex]);
+	next_tex = (data.cur_tex + 1) % NUM_BUFFERS;
+	gl_shmem_capture_copy(next_tex);
 
 	if (data.copy_wait < NUM_BUFFERS - 1) {
 		data.copy_wait++;
 	} else {
-		GLuint src = data.textures[next_tex];
-		GLuint dst = data.pbos[next_tex];
-
-		if (shmem_texture_data_lock(next_tex)) {
+		if (shmem_texture_data_lock(data.cur_tex)) {
+			glBindBuffer(GL_PIXEL_PACK_BUFFER,
+				     data.pbos[data.cur_tex]);
 			glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
-			data.texture_mapped[next_tex] = false;
-			shmem_texture_data_unlock(next_tex);
+			data.texture_mapped[data.cur_tex] = false;
+			shmem_texture_data_unlock(data.cur_tex);
 		}
 
-		gl_shmem_capture_stage(dst, src);
-		data.texture_ready[next_tex] = true;
+		gl_copy_backbuffer(data.textures[data.cur_tex]);
+		gl_shmem_capture_stage(data.pbos[data.cur_tex],
+				       data.textures[data.cur_tex]);
+		data.texture_ready[data.cur_tex] = true;
 	}
 
 	glBindTexture(GL_TEXTURE_2D, last_tex);
+	glBindBuffer(GL_PIXEL_PACK_BUFFER, last_pbo);
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, last_fbo);
+
+	data.cur_tex = next_tex;
 }
 
 static void gl_capture(HDC hdc)
@@ -757,7 +746,7 @@
 
 		/* reset capture if resized */
 		get_window_size(hdc, &new_cx, &new_cy);
-		if (new_cx != data.base_cx || new_cy != data.base_cy) {
+		if (new_cx != data.cx || new_cy != data.cy) {
 			if (new_cx != 0 && new_cy != 0)
 				gl_free();
 			return;

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.c Changed

@@ -69,7 +69,7 @@
 	sprintf(new_name, "%s%lu", PIPE_NAME, GetCurrentProcessId());
 
 	if (!ipc_pipe_client_open(&pipe, new_name)) {
-		DbgOut("Failed to open pipe\n");
+		DbgOut("[OBS] Failed to open pipe\n");
 		return false;
 	}
 
@@ -158,7 +158,10 @@
 				       MAX_PATH);
 	if (len > 0) {
 		process_name[len] = 0;
-		hlog("Hooked to process: %s", process_name);
+		hlog("graphics-hook.dll loaded against process: %s",
+		     process_name);
+	} else {
+		hlog("graphics-hook.dll loaded");
 	}
 
 	hlog("(half life scientist) everything..  seems to be in order");
@@ -328,7 +331,7 @@
 
 	if (!d3d9_hooked) {
 		if (!d3d9_hookable()) {
-			DbgOut("no D3D9 hook address found!\n");
+			DbgOut("[OBS] no D3D9 hook address found!\n");
 			d3d9_hooked = true;
 		} else {
 			d3d9_hooked = hook_d3d9();
@@ -340,7 +343,7 @@
 
 	if (!dxgi_hooked) {
 		if (!dxgi_hookable()) {
-			DbgOut("no DXGI hook address found!\n");
+			DbgOut("[OBS] no DXGI hook address found!\n");
 			dxgi_hooked = true;
 		} else {
 			dxgi_hooked = hook_dxgi();
@@ -403,7 +406,7 @@
 static DWORD WINAPI main_capture_thread(HANDLE thread_handle)
 {
 	if (!init_hook(thread_handle)) {
-		DbgOut("Failed to init hook\n");
+		DbgOut("[OBS] Failed to init hook\n");
 		free_hook();
 		return 0;
 	}
@@ -416,10 +419,11 @@
 {
 	char message[1024] = "";
 	int num = _vsprintf_p(message, 1024, format, args);
-	if (num) {
+	if (num > 0) {
 		if (!ipc_pipe_client_write(&pipe, message, (size_t)num + 1)) {
 			ipc_pipe_client_free(&pipe);
 		}
+		DbgOut("[OBS] ");
 		DbgOut(message);
 		DbgOut("\n");
 	}
@@ -531,9 +535,9 @@
 	return true;
 }
 
-bool capture_init_shtex(struct shtex_data **data, HWND window, uint32_t base_cx,
-			uint32_t base_cy, uint32_t cx, uint32_t cy,
-			uint32_t format, bool flip, uintptr_t handle)
+bool capture_init_shtex(struct shtex_data **data, HWND window, uint32_t cx,
+			uint32_t cy, uint32_t format, bool flip,
+			uintptr_t handle)
 {
 	if (!init_shared_info(sizeof(struct shtex_data), window)) {
 		hlog("capture_init_shtex: Failed to initialize memory");
@@ -553,8 +557,8 @@
 	global_hook_info->map_size = sizeof(struct shtex_data);
 	global_hook_info->cx = cx;
 	global_hook_info->cy = cy;
-	global_hook_info->base_cx = base_cx;
-	global_hook_info->base_cy = base_cy;
+	global_hook_info->UNUSED_base_cx = cx;
+	global_hook_info->UNUSED_base_cy = cy;
 
 	if (!SetEvent(signal_ready)) {
 		hlog("capture_init_shtex: Failed to signal ready: %d",
@@ -708,9 +712,8 @@
 #define ALIGN(bytes, align) (((bytes) + ((align)-1)) & ~((align)-1))
 #endif
 
-bool capture_init_shmem(struct shmem_data **data, HWND window, uint32_t base_cx,
-			uint32_t base_cy, uint32_t cx, uint32_t cy,
-			uint32_t pitch, uint32_t format, bool flip)
+bool capture_init_shmem(struct shmem_data **data, HWND window, uint32_t cx,
+			uint32_t cy, uint32_t pitch, uint32_t format, bool flip)
 {
 	uint32_t tex_size = cy * pitch;
 	uint32_t aligned_header = ALIGN(sizeof(struct shmem_data), 32);
@@ -749,8 +752,8 @@
 	global_hook_info->pitch = pitch;
 	global_hook_info->cx = cx;
 	global_hook_info->cy = cy;
-	global_hook_info->base_cx = base_cx;
-	global_hook_info->base_cy = base_cy;
+	global_hook_info->UNUSED_base_cx = cx;
+	global_hook_info->UNUSED_base_cy = cy;
 
 	if (!init_shmem_thread(pitch, cy)) {
 		return false;
@@ -837,7 +840,7 @@
 		dll_inst = hinst;
 
 		if (!init_dll()) {
-			DbgOut("Duplicate hook library");
+			DbgOut("[OBS] Duplicate hook library");
 			return false;
 		}
 
@@ -848,7 +851,7 @@
 					       SYNCHRONIZE, false, 0);
 
 		if (!success)
-			DbgOut("Failed to get current thread handle");
+			DbgOut("[OBS] Failed to get current thread handle");
 
 		if (!init_signals()) {
 			return false;

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.c Changed

@@ -7,13 +7,6 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_layer.h>
 
-#undef VK_LAYER_EXPORT
-#if defined(WIN32)
-#define VK_LAYER_EXPORT __declspec(dllexport)
-#else
-#define VK_LAYER_EXPORT
-#endif
-
 #include <vulkan/vulkan_win32.h>
 
 #define COBJMACROS
@@ -23,40 +16,36 @@
 #include "vulkan-capture.h"
 
 /* ======================================================================== */
-/* defs/statics                                                                  */
-
-/* shorten stuff because dear GOD is vulkan unclean. */
-#define VKAPI VKAPI_CALL
-#define VkFunc PFN_vkVoidFunction
-#define EXPORT VK_LAYER_EXPORT
-
-#define OBJ_MAX 16
+/* defs/statics                                                             */
 
 /* use the loader's dispatch table pointer as a key for internal data maps */
 #define GET_LDT(x) (*(void **)x)
 
-/* clang-format off */
-static const GUID dxgi_factory1_guid =
-{0x770aae78, 0xf26f, 0x4dba, {0xa8, 0x29, 0x25, 0x3c, 0x83, 0xd1, 0xb3, 0x87}};
-static const GUID dxgi_resource_guid =
-{0x035f3ab4, 0x482e, 0x4e50, {0xb4, 0x1f, 0x8a, 0x7f, 0x8b, 0xd8, 0x96, 0x0b}};
-/* clang-format on */
-
 static bool vulkan_seen = false;
-static SRWLOCK mutex = SRWLOCK_INIT; // Faster CRITICAL_SECTION
 
 /* ======================================================================== */
 /* hook data                                                                */
 
+struct vk_obj_node {
+	uint64_t obj;
+	struct vk_obj_node *next;
+};
+
+struct vk_obj_list {
+	struct vk_obj_node *root;
+	SRWLOCK mutex;
+};
+
 struct vk_swap_data {
-	VkSwapchainKHR sc;
+	struct vk_obj_node node;
+
 	VkExtent2D image_extent;
 	VkFormat format;
 	HWND hwnd;
 	VkImage export_image;
 	bool layout_initialized;
 	VkDeviceMemory export_mem;
-	VkImage swap_images[OBJ_MAX];
+	VkImage *swap_images;
 	uint32_t image_count;
 
 	HANDLE handle;
@@ -66,148 +55,349 @@
 };
 
 struct vk_queue_data {
-	VkQueue queue;
+	struct vk_obj_node node;
+
 	uint32_t fam_idx;
+	bool supports_transfer;
+	struct vk_frame_data *frames;
+	uint32_t frame_index;
+	uint32_t frame_count;
 };
 
-struct vk_cmd_pool_data {
+struct vk_frame_data {
 	VkCommandPool cmd_pool;
-	VkCommandBuffer cmd_buffers[OBJ_MAX];
-	VkFence fences[OBJ_MAX];
-	bool cmd_buffer_busy[OBJ_MAX];
-	uint32_t image_count;
+	VkCommandBuffer cmd_buffer;
+	VkFence fence;
+	bool cmd_buffer_busy;
+};
+
+struct vk_surf_data {
+	struct vk_obj_node node;
+
+	HWND hwnd;
+};
+
+struct vk_inst_data {
+	struct vk_obj_node node;
+
+	bool valid;
+
+	struct vk_inst_funcs funcs;
+	struct vk_obj_list surfaces;
 };
 
 struct vk_data {
+	struct vk_obj_node node;
+
+	VkDevice device;
+
 	bool valid;
 
 	struct vk_device_funcs funcs;
 	VkPhysicalDevice phy_device;
-	VkDevice device;
-	struct vk_swap_data swaps[OBJ_MAX];
+	struct vk_obj_list swaps;
 	struct vk_swap_data *cur_swap;
-	uint32_t swap_idx;
 
-	struct vk_queue_data queues[OBJ_MAX];
-	uint32_t queue_count;
+	struct vk_obj_list queues;
 
-	struct vk_cmd_pool_data cmd_pools[OBJ_MAX];
 	VkExternalMemoryProperties external_mem_props;
 
 	struct vk_inst_data *inst_data;
 
+	VkAllocationCallbacks ac_storage;
+	const VkAllocationCallbacks *ac;
+
 	ID3D11Device *d3d11_device;
 	ID3D11DeviceContext *d3d11_context;
 };
 
-static struct vk_swap_data *get_swap_data(struct vk_data *data,
-					  VkSwapchainKHR sc)
+/* ------------------------------------------------------------------------- */
+
+static void *vk_alloc(const VkAllocationCallbacks *ac, size_t size,
+		      size_t alignment, enum VkSystemAllocationScope scope)
+{
+	return ac ? ac->pfnAllocation(ac->pUserData, size, alignment, scope)
+		  : _aligned_malloc(size, alignment);
+}
+
+static void vk_free(const VkAllocationCallbacks *ac, void *memory)
 {
-	for (int i = 0; i < OBJ_MAX; i++) {
-		if (data->swaps[i].sc == sc) {
-			return &data->swaps[i];
+	if (ac)
+		ac->pfnFree(ac->pUserData, memory);
+	else
+		_aligned_free(memory);
+}
+
+static void add_obj_data(struct vk_obj_list *list, uint64_t obj, void *data)
+{
+	AcquireSRWLockExclusive(&list->mutex);
+
+	struct vk_obj_node *const node = data;
+	node->obj = obj;
+	node->next = list->root;
+	list->root = node;
+
+	ReleaseSRWLockExclusive(&list->mutex);
+}
+
+static struct vk_obj_node *get_obj_data(struct vk_obj_list *list, uint64_t obj)
+{
+	struct vk_obj_node *data = NULL;
+
+	AcquireSRWLockExclusive(&list->mutex);
+
+	struct vk_obj_node *node = list->root;
+	while (node) {
+		if (node->obj == obj) {
+			data = node;
+			break;
 		}
+
+		node = node->next;
 	}
 
-	debug("get_swap_data failed, swapchain not found");
-	return NULL;
+	ReleaseSRWLockExclusive(&list->mutex);
+
+	return data;
 }
 
-static struct vk_swap_data *get_new_swap_data(struct vk_data *data)
+static struct vk_obj_node *remove_obj_data(struct vk_obj_list *list,
+					   uint64_t obj)
 {
-	for (int i = 0; i < OBJ_MAX; i++) {
-		if (data->swaps[i].sc == VK_NULL_HANDLE) {
-			return &data->swaps[i];
+	struct vk_obj_node *data = NULL;
+
+	AcquireSRWLockExclusive(&list->mutex);
+
+	struct vk_obj_node *prev = NULL;
+	struct vk_obj_node *node = list->root;
+	while (node) {
+		if (node->obj == obj) {
+			data = node;
+			if (prev)
+				prev->next = node->next;
+			else
+				list->root = node->next;
+			break;
 		}
+
+		prev = node;
+		node = node->next;
 	}
 
-	debug("get_new_swap_data failed, no more free slot");
-	return NULL;
+	ReleaseSRWLockExclusive(&list->mutex);
+
+	return data;
+}
+
+static void init_obj_list(struct vk_obj_list *list)
+{
+	list->root = NULL;
+	InitializeSRWLock(&list->mutex);
+}
+
+static struct vk_obj_node *obj_walk_begin(struct vk_obj_list *list)
+{
+	AcquireSRWLockExclusive(&list->mutex);
+	return list->root;
+}
+
+static struct vk_obj_node *obj_walk_next(struct vk_obj_node *node)
+{
+	return node->next;
+}
+
+static void obj_walk_end(struct vk_obj_list *list)
+{
+	ReleaseSRWLockExclusive(&list->mutex);
 }
 
 /* ------------------------------------------------------------------------- */
 
-static inline size_t find_obj_idx(void *objs[], void *obj)
+static struct vk_obj_list devices;
+
+static struct vk_data *alloc_device_data(const VkAllocationCallbacks *ac)
 {
-	size_t idx = SIZE_MAX;
+	struct vk_data *data = vk_alloc(ac, sizeof(struct vk_data),
+					_Alignof(struct vk_data),
+					VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
+	return data;
+}
 
-	AcquireSRWLockExclusive(&mutex);
-	for (size_t i = 0; i < OBJ_MAX; i++) {
-		if (objs[i] == obj) {
-			idx = i;
-			break;
-		}
-	}
-	ReleaseSRWLockExclusive(&mutex);
+static void init_device_data(struct vk_data *data, VkDevice device)
+{
+	add_obj_data(&devices, (uint64_t)GET_LDT(device), data);
+	data->device = device;
+}
 
-	return idx;
+static struct vk_data *get_device_data(VkDevice device)
+{
+	return (struct vk_data *)get_obj_data(&devices,
+					      (uint64_t)GET_LDT(device));
 }
 
-static size_t get_obj_idx(void *objs[], void *obj)
+static struct vk_data *get_device_data_by_queue(VkQueue queue)
 {
-	size_t idx = SIZE_MAX;
+	return (struct vk_data *)get_obj_data(&devices,
+					      (uint64_t)GET_LDT(queue));
+}
 
-	AcquireSRWLockExclusive(&mutex);
-	for (size_t i = 0; i < OBJ_MAX; i++) {
-		if (objs[i] == obj) {
-			idx = i;
-			break;
-		}
-		if (!objs[i] && idx == SIZE_MAX) {
-			idx = i;
-		}
-	}
-	ReleaseSRWLockExclusive(&mutex);
-	return idx;
+static struct vk_data *remove_device_data(VkDevice device)
+{
+	return (struct vk_data *)remove_obj_data(&devices,
+						 (uint64_t)GET_LDT(device));
+}
+
+static void free_device_data(struct vk_data *data,
+			     const VkAllocationCallbacks *ac)
+{
+	vk_free(ac, data);
 }
 
 /* ------------------------------------------------------------------------- */
 
-static struct vk_data device_data[OBJ_MAX] = {0};
-static void *devices[OBJ_MAX] = {0};
+static struct vk_queue_data *add_queue_data(struct vk_data *data, VkQueue queue,
+					    uint32_t fam_idx,
+					    bool supports_transfer,
+					    const VkAllocationCallbacks *ac)
+{
+	struct vk_queue_data *const queue_data =
+		vk_alloc(ac, sizeof(struct vk_queue_data),
+			 _Alignof(struct vk_queue_data),
+			 VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
+	add_obj_data(&data->queues, (uint64_t)queue, queue_data);
+	queue_data->fam_idx = fam_idx;
+	queue_data->supports_transfer = supports_transfer;
+	queue_data->frames = NULL;
+	queue_data->frame_index = 0;
+	queue_data->frame_count = 0;
+	return queue_data;
+}
+
+static struct vk_queue_data *get_queue_data(struct vk_data *data, VkQueue queue)
+{
+	return (struct vk_queue_data *)get_obj_data(&data->queues,
+						    (uint64_t)queue);
+}
 
-static inline struct vk_data *get_device_data(void *dev)
+static VkQueue get_queue_key(const struct vk_queue_data *queue_data)
 {
-	size_t idx = get_obj_idx(devices, GET_LDT(dev));
-	if (idx == SIZE_MAX) {
-		debug("out of device slots");
-		return NULL;
+	return (VkQueue)(uintptr_t)queue_data->node.obj;
+}
+
+static void remove_free_queue_all(struct vk_data *data,
+				  const VkAllocationCallbacks *ac)
+{
+	struct vk_queue_data *queue_data =
+		(struct vk_queue_data *)data->queues.root;
+	while (data->queues.root) {
+		remove_obj_data(&data->queues, queue_data->node.obj);
+		vk_free(ac, queue_data);
+
+		queue_data = (struct vk_queue_data *)data->queues.root;
 	}
+}
+
+static struct vk_queue_data *queue_walk_begin(struct vk_data *data)
+{
+	return (struct vk_queue_data *)obj_walk_begin(&data->queues);
+}
+
+static struct vk_queue_data *queue_walk_next(struct vk_queue_data *queue_data)
+{
+	return (struct vk_queue_data *)obj_walk_next(
+		(struct vk_obj_node *)queue_data);
+}
+
+static void queue_walk_end(struct vk_data *data)
+{
+	obj_walk_end(&data->queues);
+}
+
+/* ------------------------------------------------------------------------- */
+
+static struct vk_swap_data *alloc_swap_data(const VkAllocationCallbacks *ac)
+{
+	struct vk_swap_data *const swap_data = vk_alloc(
+		ac, sizeof(struct vk_swap_data), _Alignof(struct vk_swap_data),
+		VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+	return swap_data;
+}
+
+static void init_swap_data(struct vk_swap_data *swap_data, struct vk_data *data,
+			   VkSwapchainKHR sc)
+{
+	add_obj_data(&data->swaps, (uint64_t)sc, swap_data);
+}
+
+static struct vk_swap_data *get_swap_data(struct vk_data *data,
+					  VkSwapchainKHR sc)
+{
+	return (struct vk_swap_data *)get_obj_data(&data->swaps, (uint64_t)sc);
+}
+
+static void remove_free_swap_data(struct vk_data *data, VkSwapchainKHR sc,
+				  const VkAllocationCallbacks *ac)
+{
+	struct vk_swap_data *const swap_data =
+		(struct vk_swap_data *)remove_obj_data(&data->swaps,
+						       (uint64_t)sc);
+	vk_free(ac, swap_data);
+}
 
-	return &device_data[idx];
+static struct vk_swap_data *swap_walk_begin(struct vk_data *data)
+{
+	return (struct vk_swap_data *)obj_walk_begin(&data->swaps);
+}
+
+static struct vk_swap_data *swap_walk_next(struct vk_swap_data *swap_data)
+{
+	return (struct vk_swap_data *)obj_walk_next(
+		(struct vk_obj_node *)swap_data);
+}
+
+static void swap_walk_end(struct vk_data *data)
+{
+	obj_walk_end(&data->swaps);
 }
 
-static void vk_shtex_clear_fence(struct vk_data *data,
-				 struct vk_cmd_pool_data *pool_data,
-				 uint32_t image_idx)
+/* ------------------------------------------------------------------------- */
+
+static void vk_shtex_clear_fence(const struct vk_data *data,
+				 struct vk_frame_data *frame_data)
 {
-	VkFence fence = pool_data->fences[image_idx];
-	if (pool_data->cmd_buffer_busy[image_idx]) {
+	const VkFence fence = frame_data->fence;
+	if (frame_data->cmd_buffer_busy) {
 		VkDevice device = data->device;
-		struct vk_device_funcs *funcs = &data->funcs;
+		const struct vk_device_funcs *funcs = &data->funcs;
 		funcs->WaitForFences(device, 1, &fence, VK_TRUE, ~0ull);
 		funcs->ResetFences(device, 1, &fence);
-		pool_data->cmd_buffer_busy[image_idx] = false;
+		frame_data->cmd_buffer_busy = false;
 	}
 }
 
 static void vk_shtex_wait_until_pool_idle(struct vk_data *data,
-					  struct vk_cmd_pool_data *pool_data)
+					  struct vk_queue_data *queue_data)
 {
-	for (uint32_t image_idx = 0; image_idx < pool_data->image_count;
-	     image_idx++) {
-		vk_shtex_clear_fence(data, pool_data, image_idx);
+	for (uint32_t frame_idx = 0; frame_idx < queue_data->frame_count;
+	     frame_idx++) {
+		struct vk_frame_data *frame_data =
+			&queue_data->frames[frame_idx];
+		if (frame_data->cmd_pool != VK_NULL_HANDLE)
+			vk_shtex_clear_fence(data, frame_data);
 	}
 }
 
 static void vk_shtex_wait_until_idle(struct vk_data *data)
 {
-	for (uint32_t fam_idx = 0; fam_idx < _countof(data->cmd_pools);
-	     fam_idx++) {
-		struct vk_cmd_pool_data *pool_data = &data->cmd_pools[fam_idx];
-		if (pool_data->cmd_pool != VK_NULL_HANDLE)
-			vk_shtex_wait_until_pool_idle(data, pool_data);
+	struct vk_queue_data *queue_data = queue_walk_begin(data);
+
+	while (queue_data) {
+		vk_shtex_wait_until_pool_idle(data, queue_data);
+
+		queue_data = queue_walk_next(queue_data);
 	}
+
+	queue_walk_end(data);
 }
 
 static void vk_shtex_free(struct vk_data *data)
@@ -216,19 +406,19 @@
 
 	vk_shtex_wait_until_idle(data);
 
-	for (int swap_idx = 0; swap_idx < OBJ_MAX; swap_idx++) {
-		struct vk_swap_data *swap = &data->swaps[swap_idx];
+	struct vk_swap_data *swap = swap_walk_begin(data);
 
+	while (swap) {
+		VkDevice device = data->device;
 		if (swap->export_image)
-			data->funcs.DestroyImage(data->device,
-						 swap->export_image, NULL);
+			data->funcs.DestroyImage(device, swap->export_image,
+						 data->ac);
 
 		if (swap->export_mem)
-			data->funcs.FreeMemory(data->device, swap->export_mem,
-					       NULL);
+			data->funcs.FreeMemory(device, swap->export_mem, NULL);
 
 		if (swap->d3d11_tex) {
-			ID3D11Resource_Release(swap->d3d11_tex);
+			ID3D11Texture2D_Release(swap->d3d11_tex);
 		}
 
 		swap->handle = INVALID_HANDLE_VALUE;
@@ -237,8 +427,12 @@
 		swap->export_image = VK_NULL_HANDLE;
 
 		swap->captured = false;
+
+		swap = swap_walk_next(swap);
 	}
 
+	swap_walk_end(data);
+
 	if (data->d3d11_context) {
 		ID3D11DeviceContext_Release(data->d3d11_context);
 		data->d3d11_context = NULL;
@@ -253,128 +447,87 @@
 	hlog("------------------ vulkan capture freed ------------------");
 }
 
-static void vk_remove_device(void *dev)
-{
-	size_t idx = find_obj_idx(devices, GET_LDT(dev));
-	if (idx == SIZE_MAX) {
-		return;
-	}
-
-	struct vk_data *data = &device_data[idx];
-
-	memset(data, 0, sizeof(*data));
-
-	AcquireSRWLockExclusive(&mutex);
-	devices[idx] = NULL;
-	ReleaseSRWLockExclusive(&mutex);
-}
-
 /* ------------------------------------------------------------------------- */
 
-struct vk_surf_data {
-	VkSurfaceKHR surf;
-	HWND hwnd;
-	struct vk_surf_data *next;
-};
-
-struct vk_inst_data {
-	bool valid;
-
-	struct vk_inst_funcs funcs;
-	struct vk_surf_data *surfaces;
-};
-
-static void insert_surf_data(struct vk_inst_data *data, VkSurfaceKHR surf,
-			     HWND hwnd)
+static void add_surf_data(struct vk_inst_data *idata, VkSurfaceKHR surf,
+			  HWND hwnd, const VkAllocationCallbacks *ac)
 {
-	struct vk_surf_data *surf_data = malloc(sizeof(struct vk_surf_data));
+	struct vk_surf_data *surf_data = vk_alloc(
+		ac, sizeof(struct vk_surf_data), _Alignof(struct vk_surf_data),
+		VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (surf_data) {
-		surf_data->surf = surf;
 		surf_data->hwnd = hwnd;
 
-		AcquireSRWLockExclusive(&mutex);
-		struct vk_surf_data *next = data->surfaces;
-		surf_data->next = next;
-		data->surfaces = surf_data;
-		ReleaseSRWLockExclusive(&mutex);
+		add_obj_data(&idata->surfaces, (uint64_t)surf, surf_data);
 	}
 }
 
-static HWND find_surf_hwnd(struct vk_inst_data *data, VkSurfaceKHR surf)
+static HWND find_surf_hwnd(struct vk_inst_data *idata, VkSurfaceKHR surf)
 {
-	HWND hwnd = NULL;
-
-	AcquireSRWLockExclusive(&mutex);
-	struct vk_surf_data *surf_data = data->surfaces;
-	while (surf_data) {
-		if (surf_data->surf == surf) {
-			hwnd = surf_data->hwnd;
-			break;
-		}
-		surf_data = surf_data->next;
-	}
-	ReleaseSRWLockExclusive(&mutex);
-
-	return hwnd;
+	struct vk_surf_data *surf_data = (struct vk_surf_data *)get_obj_data(
+		&idata->surfaces, (uint64_t)surf);
+	return surf_data->hwnd;
 }
 
-static void erase_surf_data(struct vk_inst_data *data, VkSurfaceKHR surf)
+static void remove_free_surf_data(struct vk_inst_data *idata, VkSurfaceKHR surf,
+				  const VkAllocationCallbacks *ac)
 {
-	AcquireSRWLockExclusive(&mutex);
-	struct vk_surf_data *current = data->surfaces;
-	if (current->surf == surf) {
-		data->surfaces = current->next;
-	} else {
-		struct vk_surf_data *previous;
-		do {
-			previous = current;
-			current = current->next;
-		} while (current && current->surf != surf);
-
-		if (current)
-			previous->next = current->next;
-	}
-	ReleaseSRWLockExclusive(&mutex);
-
-	free(current);
+	struct vk_surf_data *surf_data = (struct vk_surf_data *)remove_obj_data(
+		&idata->surfaces, (uint64_t)surf);
+	vk_free(ac, surf_data);
 }
 
 /* ------------------------------------------------------------------------- */
 
-static struct vk_inst_data inst_data[OBJ_MAX] = {0};
-static void *instances[OBJ_MAX] = {0};
+static struct vk_obj_list instances;
 
-static struct vk_inst_data *get_inst_data(void *inst)
+static struct vk_inst_data *alloc_inst_data(const VkAllocationCallbacks *ac)
 {
-	size_t idx = get_obj_idx(instances, GET_LDT(inst));
-	if (idx == SIZE_MAX) {
-		debug("out of instance slots");
-		return NULL;
-	}
+	struct vk_inst_data *idata = vk_alloc(
+		ac, sizeof(struct vk_inst_data), _Alignof(struct vk_inst_data),
+		VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
+	return idata;
+}
 
-	vulkan_seen = true;
-	return &inst_data[idx];
+static void init_inst_data(struct vk_inst_data *data, VkInstance inst)
+{
+	add_obj_data(&instances, (uint64_t)GET_LDT(inst), data);
 }
 
-static inline struct vk_inst_funcs *get_inst_funcs(void *inst)
+static struct vk_inst_data *get_inst_data(VkInstance inst)
 {
-	struct vk_inst_data *data = get_inst_data(inst);
-	return &data->funcs;
+	return (struct vk_inst_data *)get_obj_data(&instances,
+						   (uint64_t)GET_LDT(inst));
 }
 
-static void remove_instance(void *inst)
+static struct vk_inst_funcs *get_inst_funcs(VkInstance inst)
 {
-	size_t idx = find_obj_idx(instances, inst);
-	if (idx == SIZE_MAX) {
-		return;
-	}
+	struct vk_inst_data *idata = (struct vk_inst_data *)get_inst_data(inst);
+	return &idata->funcs;
+}
 
-	struct vk_inst_data *data = &inst_data[idx];
-	memset(data, 0, sizeof(*data));
+static struct vk_inst_data *
+get_inst_data_by_physical_device(VkPhysicalDevice physicalDevice)
+{
+	return (struct vk_inst_data *)get_obj_data(
+		&instances, (uint64_t)GET_LDT(physicalDevice));
+}
+
+static struct vk_inst_funcs *
+get_inst_funcs_by_physical_device(VkPhysicalDevice physicalDevice)
+{
+	struct vk_inst_data *idata =
+		(struct vk_inst_data *)get_inst_data_by_physical_device(
+			physicalDevice);
+	return &idata->funcs;
+}
 
-	AcquireSRWLockExclusive(&mutex);
-	instances[idx] = NULL;
-	ReleaseSRWLockExclusive(&mutex);
+static void remove_free_inst_data(VkInstance inst,
+				  const VkAllocationCallbacks *ac)
+{
+	struct vk_inst_data *idata = (struct vk_inst_data *)remove_obj_data(
+		&instances, (uint64_t)GET_LDT(inst));
+	vk_free(ac, idata);
 }
 
 /* ======================================================================== */
@@ -384,7 +537,7 @@
 {
 	D3D_FEATURE_LEVEL level_used;
 	IDXGIFactory1 *factory;
-	IDXGIAdapter *adapter;
+	IDXGIAdapter1 *adapter;
 	HRESULT hr;
 
 	HMODULE d3d11 = load_system_library("d3d11.dll");
@@ -415,14 +568,13 @@
 		return false;
 	}
 
-	hr = create_factory(&dxgi_factory1_guid, (void **)&factory);
+	hr = create_factory(&IID_IDXGIFactory1, &factory);
 	if (FAILED(hr)) {
 		flog_hr("failed to create factory", hr);
 		return false;
 	}
 
-	hr = IDXGIFactory1_EnumAdapters1(factory, 0,
-					 (IDXGIAdapter1 **)&adapter);
+	hr = IDXGIFactory1_EnumAdapters1(factory, 0, &adapter);
 	IDXGIFactory1_Release(factory);
 
 	if (FAILED(hr)) {
@@ -437,11 +589,12 @@
 		D3D_FEATURE_LEVEL_9_3,
 	};
 
-	hr = create(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, 0, feature_levels,
+	hr = create((IDXGIAdapter *)adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, 0,
+		    feature_levels,
 		    sizeof(feature_levels) / sizeof(D3D_FEATURE_LEVEL),
 		    D3D11_SDK_VERSION, &data->d3d11_device, &level_used,
 		    &data->d3d11_context);
-	IDXGIAdapter_Release(adapter);
+	IDXGIAdapter1_Release(adapter);
 
 	if (FAILED(hr)) {
 		flog_hr("failed to create device", hr);
@@ -457,16 +610,24 @@
 	IDXGIResource *dxgi_res;
 	HRESULT hr;
 
+	const UINT width = swap->image_extent.width;
+	const UINT height = swap->image_extent.height;
+
+	flog("OBS requesting %s texture format. capture dimensions: %ux%u",
+	     vk_format_to_str(swap->format), width, height);
+
+	const DXGI_FORMAT format = vk_format_to_dxgi(swap->format);
+	if (format == DXGI_FORMAT_UNKNOWN) {
+		flog("cannot convert to DXGI format");
+		return false;
+	}
+
 	D3D11_TEXTURE2D_DESC desc = {0};
-	desc.Width = swap->image_extent.width;
-	desc.Height = swap->image_extent.height;
+	desc.Width = width;
+	desc.Height = height;
 	desc.MipLevels = 1;
 	desc.ArraySize = 1;
-
-	flog("OBS requesting %s texture format.  capture dimensions: %dx%d",
-	     vk_format_to_str(swap->format), (int)desc.Width, (int)desc.Height);
-
-	desc.Format = vk_format_to_dxgi(swap->format);
+	desc.Format = format;
 	desc.SampleDesc.Count = 1;
 	desc.SampleDesc.Quality = 0;
 	desc.Usage = D3D11_USAGE_DEFAULT;
@@ -480,8 +641,8 @@
 		return false;
 	}
 
-	hr = ID3D11Device_QueryInterface(swap->d3d11_tex, &dxgi_resource_guid,
-					 (void **)&dxgi_res);
+	hr = ID3D11Texture2D_QueryInterface(swap->d3d11_tex, &IID_IDXGIResource,
+					    &dxgi_res);
 	if (FAILED(hr)) {
 		flog_hr("failed to get IDXGIResource", hr);
 		return false;
@@ -534,8 +695,10 @@
 	ici.pQueueFamilyIndices = 0;
 	ici.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 
+	VkDevice device = data->device;
+
 	VkResult res;
-	res = funcs->CreateImage(data->device, &ici, NULL, &swap->export_image);
+	res = funcs->CreateImage(device, &ici, data->ac, &swap->export_image);
 	if (VK_SUCCESS != res) {
 		flog("failed to CreateImage: %s", result_to_str(res));
 		swap->export_image = VK_NULL_HANDLE;
@@ -565,17 +728,18 @@
 		imri2.pNext = NULL;
 		imri2.image = swap->export_image;
 
-		funcs->GetImageMemoryRequirements2(data->device, &imri2, &mr2);
+		funcs->GetImageMemoryRequirements2(device, &imri2, &mr2);
 		mr = mr2.memoryRequirements;
 	} else {
-		funcs->GetImageMemoryRequirements(data->device,
-						  swap->export_image, &mr);
+		funcs->GetImageMemoryRequirements(device, swap->export_image,
+						  &mr);
 	}
 
 	/* -------------------------------------------------------- */
 	/* get memory type index                                    */
 
-	struct vk_inst_funcs *ifuncs = get_inst_funcs(data->phy_device);
+	struct vk_inst_funcs *ifuncs =
+		get_inst_funcs_by_physical_device(data->phy_device);
 
 	VkPhysicalDeviceMemoryProperties pdmp;
 	ifuncs->GetPhysicalDeviceMemoryProperties(data->phy_device, &pdmp);
@@ -593,7 +757,7 @@
 
 	if (mem_type_idx == pdmp.memoryTypeCount) {
 		flog("failed to get memory type index");
-		funcs->DestroyImage(data->device, swap->export_image, NULL);
+		funcs->DestroyImage(device, swap->export_image, data->ac);
 		swap->export_image = VK_NULL_HANDLE;
 		return false;
 	}
@@ -626,11 +790,10 @@
 		imw32hi.pNext = &mdai;
 	}
 
-	res = funcs->AllocateMemory(data->device, &mai, NULL,
-				    &swap->export_mem);
+	res = funcs->AllocateMemory(device, &mai, NULL, &swap->export_mem);
 	if (VK_SUCCESS != res) {
 		flog("failed to AllocateMemory: %s", result_to_str(res));
-		funcs->DestroyImage(data->device, swap->export_image, NULL);
+		funcs->DestroyImage(device, swap->export_image, data->ac);
 		swap->export_image = VK_NULL_HANDLE;
 		return false;
 	}
@@ -646,16 +809,16 @@
 		bimi.image = swap->export_image;
 		bimi.memory = swap->export_mem;
 		bimi.memoryOffset = 0;
-		res = funcs->BindImageMemory2(data->device, 1, &bimi);
+		res = funcs->BindImageMemory2(device, 1, &bimi);
 	} else {
-		res = funcs->BindImageMemory(data->device, swap->export_image,
+		res = funcs->BindImageMemory(device, swap->export_image,
 					     swap->export_mem, 0);
 	}
 	if (VK_SUCCESS != res) {
 		flog("%s failed: %s",
 		     use_bi2 ? "BindImageMemory2" : "BindImageMemory",
 		     result_to_str(res));
-		funcs->DestroyImage(data->device, swap->export_image, NULL);
+		funcs->DestroyImage(device, swap->export_image, data->ac);
 		swap->export_image = VK_NULL_HANDLE;
 		return false;
 	}
@@ -677,68 +840,73 @@
 
 	data->cur_swap = swap;
 
-	swap->captured = capture_init_shtex(
-		&swap->shtex_info, window, swap->image_extent.width,
-		swap->image_extent.height, swap->image_extent.width,
-		swap->image_extent.height, (uint32_t)swap->format, false,
-		(uintptr_t)swap->handle);
+	swap->captured = capture_init_shtex(&swap->shtex_info, window,
+					    swap->image_extent.width,
+					    swap->image_extent.height,
+					    (uint32_t)swap->format, false,
+					    (uintptr_t)swap->handle);
 
-	if (swap->captured) {
-		if (global_hook_info->force_shmem) {
-			flog("shared memory capture currently "
-			     "unsupported; ignoring");
-		}
+	if (!swap->captured)
+		return false;
 
-		hlog("vulkan shared texture capture successful");
-		return true;
+	if (global_hook_info->force_shmem) {
+		flog("shared memory capture currently "
+		     "unsupported; ignoring");
 	}
 
-	return false;
+	hlog("vulkan shared texture capture successful");
+	return true;
 }
 
-static void vk_shtex_create_cmd_pool_objects(struct vk_data *data,
-					     uint32_t fam_idx,
-					     uint32_t image_count)
+static void vk_shtex_create_frame_objects(struct vk_data *data,
+					  struct vk_queue_data *queue_data,
+					  uint32_t image_count)
 {
-	struct vk_cmd_pool_data *pool_data = &data->cmd_pools[fam_idx];
-
-	VkCommandPoolCreateInfo cpci;
-	cpci.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
-	cpci.pNext = NULL;
-	cpci.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
-	cpci.queueFamilyIndex = fam_idx;
-
-	VkResult res = data->funcs.CreateCommandPool(data->device, &cpci, NULL,
-						     &pool_data->cmd_pool);
-	debug_res("CreateCommandPool", res);
+	queue_data->frames =
+		vk_alloc(data->ac, image_count * sizeof(struct vk_frame_data),
+			 _Alignof(struct vk_frame_data),
+			 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+	memset(queue_data->frames, 0,
+	       image_count * sizeof(struct vk_frame_data));
+	queue_data->frame_index = 0;
+	queue_data->frame_count = image_count;
 
-	VkCommandBufferAllocateInfo cbai;
-	cbai.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
-	cbai.pNext = NULL;
-	cbai.commandPool = pool_data->cmd_pool;
-	cbai.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
-	cbai.commandBufferCount = image_count;
-
-	res = data->funcs.AllocateCommandBuffers(data->device, &cbai,
-						 pool_data->cmd_buffers);
-	debug_res("AllocateCommandBuffers", res);
+	VkDevice device = data->device;
 	for (uint32_t image_index = 0; image_index < image_count;
 	     image_index++) {
-		/* Dispatch table something or other. Well-designed API. */
-		VkCommandBuffer cmd_buffer =
-			pool_data->cmd_buffers[image_index];
-		*(void **)cmd_buffer = *(void **)(data->device);
+		struct vk_frame_data *frame_data =
+			&queue_data->frames[image_index];
+
+		VkCommandPoolCreateInfo cpci;
+		cpci.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
+		cpci.pNext = NULL;
+		cpci.flags = 0;
+		cpci.queueFamilyIndex = queue_data->fam_idx;
+
+		VkResult res = data->funcs.CreateCommandPool(
+			device, &cpci, data->ac, &frame_data->cmd_pool);
+		debug_res("CreateCommandPool", res);
+
+		VkCommandBufferAllocateInfo cbai;
+		cbai.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+		cbai.pNext = NULL;
+		cbai.commandPool = frame_data->cmd_pool;
+		cbai.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+		cbai.commandBufferCount = 1;
+
+		res = data->funcs.AllocateCommandBuffers(
+			device, &cbai, &frame_data->cmd_buffer);
+		debug_res("AllocateCommandBuffers", res);
+		GET_LDT(frame_data->cmd_buffer) = GET_LDT(device);
 
-		VkFence *fence = &pool_data->fences[image_index];
 		VkFenceCreateInfo fci = {0};
 		fci.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
 		fci.pNext = NULL;
 		fci.flags = 0;
-		res = data->funcs.CreateFence(data->device, &fci, NULL, fence);
+		res = data->funcs.CreateFence(device, &fci, data->ac,
+					      &frame_data->fence);
 		debug_res("CreateFence", res);
 	}
-
-	pool_data->image_count = image_count;
 }
 
 static void vk_shtex_destroy_fence(struct vk_data *data, bool *cmd_buffer_busy,
@@ -751,24 +919,31 @@
 		*cmd_buffer_busy = false;
 	}
 
-	data->funcs.DestroyFence(device, *fence, NULL);
+	data->funcs.DestroyFence(device, *fence, data->ac);
 	*fence = VK_NULL_HANDLE;
 }
 
-static void
-vk_shtex_destroy_cmd_pool_objects(struct vk_data *data,
-				  struct vk_cmd_pool_data *pool_data)
+static void vk_shtex_destroy_frame_objects(struct vk_data *data,
+					   struct vk_queue_data *queue_data)
 {
-	for (uint32_t image_idx = 0; image_idx < pool_data->image_count;
-	     image_idx++) {
-		bool *cmd_buffer_busy = &pool_data->cmd_buffer_busy[image_idx];
-		VkFence *fence = &pool_data->fences[image_idx];
+	VkDevice device = data->device;
+
+	for (uint32_t frame_idx = 0; frame_idx < queue_data->frame_count;
+	     frame_idx++) {
+		struct vk_frame_data *frame_data =
+			&queue_data->frames[frame_idx];
+		bool *cmd_buffer_busy = &frame_data->cmd_buffer_busy;
+		VkFence *fence = &frame_data->fence;
 		vk_shtex_destroy_fence(data, cmd_buffer_busy, fence);
+
+		data->funcs.DestroyCommandPool(device, frame_data->cmd_pool,
+					       data->ac);
+		frame_data->cmd_pool = VK_NULL_HANDLE;
 	}
 
-	data->funcs.DestroyCommandPool(data->device, pool_data->cmd_pool, NULL);
-	pool_data->cmd_pool = VK_NULL_HANDLE;
-	pool_data->image_count = 0;
+	vk_free(data->ac, queue_data->frames);
+	queue_data->frames = NULL;
+	queue_data->frame_count = 0;
 }
 
 static void vk_shtex_capture(struct vk_data *data,
@@ -794,27 +969,30 @@
 	const uint32_t image_index = info->pImageIndices[idx];
 	VkImage cur_backbuffer = swap->swap_images[image_index];
 
-	uint32_t fam_idx = 0;
-	for (uint32_t i = 0; i < data->queue_count; i++) {
-		if (data->queues[i].queue == queue)
-			fam_idx = data->queues[i].fam_idx;
-	}
+	struct vk_queue_data *queue_data = get_queue_data(data, queue);
+	uint32_t fam_idx = queue_data->fam_idx;
 
-	if (fam_idx >= _countof(data->cmd_pools))
-		return;
-
-	struct vk_cmd_pool_data *pool_data = &data->cmd_pools[fam_idx];
-	VkCommandPool *pool = &pool_data->cmd_pool;
 	const uint32_t image_count = swap->image_count;
-	if (pool_data->image_count < image_count) {
-		if (*pool != VK_NULL_HANDLE)
-			vk_shtex_destroy_cmd_pool_objects(data, pool_data);
-		vk_shtex_create_cmd_pool_objects(data, fam_idx, image_count);
+	if (queue_data->frame_count < image_count) {
+		if (queue_data->frame_count > 0)
+			vk_shtex_destroy_frame_objects(data, queue_data);
+		vk_shtex_create_frame_objects(data, queue_data, image_count);
 	}
 
-	vk_shtex_clear_fence(data, pool_data, image_index);
+	const uint32_t frame_index = queue_data->frame_index;
+	struct vk_frame_data *frame_data = &queue_data->frames[frame_index];
+	queue_data->frame_index = (frame_index + 1) % queue_data->frame_count;
+	vk_shtex_clear_fence(data, frame_data);
 
-	VkCommandBuffer cmd_buffer = pool_data->cmd_buffers[image_index];
+	VkDevice device = data->device;
+
+	res = funcs->ResetCommandPool(device, frame_data->cmd_pool, 0);
+
+#ifdef MORE_DEBUGGING
+	debug_res("ResetCommandPool", res);
+#endif
+
+	const VkCommandBuffer cmd_buffer = frame_data->cmd_buffer;
 	res = funcs->BeginCommandBuffer(cmd_buffer, &begin_info);
 
 #ifdef MORE_DEBUGGING
@@ -829,9 +1007,9 @@
 		imb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 		imb.pNext = NULL;
 		imb.srcAccessMask = 0;
-		imb.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+		imb.dstAccessMask = 0;
 		imb.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-		imb.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+		imb.newLayout = VK_IMAGE_LAYOUT_GENERAL;
 		imb.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
 		imb.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
 		imb.image = swap->export_image;
@@ -843,8 +1021,8 @@
 
 		funcs->CmdPipelineBarrier(cmd_buffer,
 					  VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
-					  VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0,
-					  NULL, 0, NULL, 1, &imb);
+					  VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0,
+					  0, NULL, 0, NULL, 1, &imb);
 
 		swap->layout_initialized = true;
 	}
@@ -872,9 +1050,9 @@
 
 	dst_mb->sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
 	dst_mb->pNext = NULL;
-	dst_mb->srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+	dst_mb->srcAccessMask = 0;
 	dst_mb->dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-	dst_mb->oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+	dst_mb->oldLayout = VK_IMAGE_LAYOUT_GENERAL;
 	dst_mb->newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
 	dst_mb->srcQueueFamilyIndex = VK_QUEUE_FAMILY_EXTERNAL;
 	dst_mb->dstQueueFamilyIndex = fam_idx;
@@ -886,8 +1064,7 @@
 	dst_mb->subresourceRange.layerCount = 1;
 
 	funcs->CmdPipelineBarrier(cmd_buffer,
-				  VK_PIPELINE_STAGE_TRANSFER_BIT |
-					  VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
+				  VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
 				  VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0,
 				  NULL, 2, mb);
 
@@ -928,11 +1105,15 @@
 	src_mb->oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
 	src_mb->newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
 
+	dst_mb->srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+	dst_mb->dstAccessMask = 0;
+	dst_mb->oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+	dst_mb->newLayout = VK_IMAGE_LAYOUT_GENERAL;
 	dst_mb->srcQueueFamilyIndex = fam_idx;
 	dst_mb->dstQueueFamilyIndex = VK_QUEUE_FAMILY_EXTERNAL;
 
 	funcs->CmdPipelineBarrier(cmd_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT,
-				  VK_PIPELINE_STAGE_TRANSFER_BIT |
+				  VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT |
 					  VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
 				  0, 0, NULL, 0, NULL, 2, mb);
 
@@ -951,7 +1132,7 @@
 	submit_info.signalSemaphoreCount = 0;
 	submit_info.pSignalSemaphores = NULL;
 
-	VkFence fence = pool_data->fences[image_index];
+	const VkFence fence = frame_data->fence;
 	res = funcs->QueueSubmit(queue, 1, &submit_info, fence);
 
 #ifdef MORE_DEBUGGING
@@ -959,7 +1140,7 @@
 #endif
 
 	if (res == VK_SUCCESS)
-		pool_data->cmd_buffer_busy[image_index] = true;
+		frame_data->cmd_buffer_busy = true;
 }
 
 static inline bool valid_rect(struct vk_swap_data *swap)
@@ -984,10 +1165,12 @@
 	for (; idx < info->swapchainCount; idx++) {
 		struct vk_swap_data *cur_swap =
 			get_swap_data(data, info->pSwapchains[idx]);
-		window = cur_swap->hwnd;
-		if (!!window) {
-			swap = cur_swap;
-			break;
+		if (cur_swap) {
+			window = cur_swap->hwnd;
+			if (window != NULL) {
+				swap = cur_swap;
+				break;
+			}
 		}
 	}
 
@@ -1015,15 +1198,17 @@
 	}
 }
 
-static VkResult VKAPI OBS_QueuePresentKHR(VkQueue queue,
-					  const VkPresentInfoKHR *info)
+static VkResult VKAPI_CALL OBS_QueuePresentKHR(VkQueue queue,
+					       const VkPresentInfoKHR *info)
 {
-	struct vk_data *data = get_device_data(queue);
-	struct vk_device_funcs *funcs = &data->funcs;
+	struct vk_data *const data = get_device_data_by_queue(queue);
+	struct vk_queue_data *const queue_data = get_queue_data(data, queue);
+	struct vk_device_funcs *const funcs = &data->funcs;
 
-	if (data->valid) {
+	if (data->valid && queue_data->supports_transfer) {
 		vk_capture(data, queue, info);
 	}
+
 	return funcs->QueuePresentKHR(queue, info);
 }
 
@@ -1036,12 +1221,11 @@
 	       lici->function == VK_LAYER_LINK_INFO;
 }
 
-static VkResult VKAPI OBS_CreateInstance(const VkInstanceCreateInfo *cinfo,
-					 const VkAllocationCallbacks *ac,
-					 VkInstance *p_inst)
+static VkResult VKAPI_CALL OBS_CreateInstance(const VkInstanceCreateInfo *cinfo,
+					      const VkAllocationCallbacks *ac,
+					      VkInstance *p_inst)
 {
 	VkInstanceCreateInfo info = *cinfo;
-	bool funcs_not_found = false;
 
 	/* -------------------------------------------------------- */
 	/* step through chain until we get to the link info         */
@@ -1085,49 +1269,75 @@
 	info.pApplicationInfo = &ai;
 
 	/* -------------------------------------------------------- */
+	/* allocate data node                                       */
+
+	struct vk_inst_data *idata = alloc_inst_data(ac);
+	if (!idata)
+		return VK_ERROR_OUT_OF_HOST_MEMORY;
+
+	/* -------------------------------------------------------- */
 	/* create instance                                          */
 
 	PFN_vkCreateInstance create = (void *)gpa(NULL, "vkCreateInstance");
 
 	VkResult res = create(&info, ac, p_inst);
+	bool valid = res == VK_SUCCESS;
+	if (!valid) {
+		/* try again with original arguments */
+		res = create(cinfo, ac, p_inst);
+		if (res != VK_SUCCESS) {
+			vk_free(ac, idata);
+			return res;
+		}
+	}
+
 	VkInstance inst = *p_inst;
+	init_inst_data(idata, inst);
 
 	/* -------------------------------------------------------- */
 	/* fetch the functions we need                              */
 
-	struct vk_inst_data *data = get_inst_data(inst);
-	struct vk_inst_funcs *funcs = &data->funcs;
-
-#define GETADDR(x)                                     \
-	do {                                           \
-		funcs->x = (void *)gpa(inst, "vk" #x); \
-		if (!funcs->x) {                       \
-			flog("could not get instance " \
-			     "address for %s",         \
-			     #x);                      \
-			funcs_not_found = true;        \
-		}                                      \
+	struct vk_inst_funcs *ifuncs = &idata->funcs;
+
+#define GETADDR(x)                                      \
+	do {                                            \
+		ifuncs->x = (void *)gpa(inst, "vk" #x); \
+		if (!ifuncs->x) {                       \
+			flog("could not get instance "  \
+			     "address for vk" #x);      \
+			funcs_found = false;            \
+		}                                       \
 	} while (false)
 
+	bool funcs_found = true;
 	GETADDR(GetInstanceProcAddr);
 	GETADDR(DestroyInstance);
 	GETADDR(CreateWin32SurfaceKHR);
 	GETADDR(DestroySurfaceKHR);
+	GETADDR(GetPhysicalDeviceQueueFamilyProperties);
 	GETADDR(GetPhysicalDeviceMemoryProperties);
 	GETADDR(GetPhysicalDeviceImageFormatProperties2);
+	GETADDR(EnumerateDeviceExtensionProperties);
 #undef GETADDR
 
-	data->valid = !funcs_not_found;
+	valid = valid && funcs_found;
+	idata->valid = valid;
+
+	if (valid)
+		init_obj_list(&idata->surfaces);
+
 	return res;
 }
 
-static VkResult VKAPI OBS_DestroyInstance(VkInstance instance,
-					  const VkAllocationCallbacks *ac)
+static void VKAPI_CALL OBS_DestroyInstance(VkInstance instance,
+					   const VkAllocationCallbacks *ac)
 {
-	struct vk_inst_funcs *funcs = get_inst_funcs(instance);
-	funcs->DestroyInstance(instance, ac);
-	remove_instance(instance);
-	return VK_SUCCESS;
+	struct vk_inst_funcs *ifuncs = get_inst_funcs(instance);
+	PFN_vkDestroyInstance destroy_instance = ifuncs->DestroyInstance;
+
+	remove_free_inst_data(instance, ac);
+
+	destroy_instance(instance, ac);
 }
 
 static bool
@@ -1180,12 +1390,13 @@
 	       lici->function == VK_LAYER_LINK_INFO;
 }
 
-static VkResult VKAPI OBS_CreateDevice(VkPhysicalDevice phy_device,
-				       const VkDeviceCreateInfo *info,
-				       const VkAllocationCallbacks *ac,
-				       VkDevice *p_device)
+static VkResult VKAPI_CALL OBS_CreateDevice(VkPhysicalDevice phy_device,
+					    const VkDeviceCreateInfo *info,
+					    const VkAllocationCallbacks *ac,
+					    VkDevice *p_device)
 {
-	struct vk_inst_data *idata = get_inst_data(phy_device);
+	struct vk_inst_data *idata =
+		get_inst_data_by_physical_device(phy_device);
 	struct vk_inst_funcs *ifuncs = &idata->funcs;
 	struct vk_data *data = NULL;
 
@@ -1216,6 +1427,15 @@
 	ldci->u.pLayerInfo = ldci->u.pLayerInfo->pNext;
 
 	/* -------------------------------------------------------- */
+	/* allocate data node                                       */
+
+	data = alloc_device_data(ac);
+	if (!data)
+		return VK_ERROR_OUT_OF_HOST_MEMORY;
+
+	init_obj_list(&data->queues);
+
+	/* -------------------------------------------------------- */
 	/* create device and initialize hook data                   */
 
 	PFN_vkCreateDevice createFunc =
@@ -1223,39 +1443,32 @@
 
 	ret = createFunc(phy_device, info, ac, p_device);
 	if (ret != VK_SUCCESS) {
-		goto fail;
+		vk_free(ac, data);
+		return ret;
 	}
 
 	VkDevice device = *p_device;
-
-	data = get_device_data(*p_device);
-	struct vk_device_funcs *dfuncs = &data->funcs;
+	init_device_data(data, device);
 
 	data->valid = false; /* set true below if it doesn't go to fail */
 	data->phy_device = phy_device;
-	data->device = device;
 
 	/* -------------------------------------------------------- */
 	/* fetch the functions we need                              */
 
-	bool funcs_not_found = false;
+	struct vk_device_funcs *dfuncs = &data->funcs;
+	bool funcs_found = true;
 
 #define GETADDR(x)                                         \
 	do {                                               \
 		dfuncs->x = (void *)gdpa(device, "vk" #x); \
 		if (!dfuncs->x) {                          \
 			flog("could not get device "       \
-			     "address for %s",             \
-			     #x);                          \
-			funcs_not_found = true;            \
+			     "address for vk" #x);         \
+			funcs_found = false;               \
 		}                                          \
 	} while (false)
 
-#define GETADDR_OPTIONAL(x)                                \
-	do {                                               \
-		dfuncs->x = (void *)gdpa(device, "vk" #x); \
-	} while (false)
-
 	GETADDR(GetDeviceProcAddr);
 	GETADDR(DestroyDevice);
 	GETADDR(CreateSwapchainKHR);
@@ -1270,6 +1483,7 @@
 	GETADDR(DestroyImage);
 	GETADDR(GetImageMemoryRequirements);
 	GETADDR(GetImageMemoryRequirements2);
+	GETADDR(ResetCommandPool);
 	GETADDR(BeginCommandBuffer);
 	GETADDR(EndCommandBuffer);
 	GETADDR(CmdCopyImage);
@@ -1283,10 +1497,9 @@
 	GETADDR(DestroyFence);
 	GETADDR(WaitForFences);
 	GETADDR(ResetFences);
-#undef GETADDR_OPTIONAL
 #undef GETADDR
 
-	if (funcs_not_found) {
+	if (!funcs_found) {
 		goto fail;
 	}
 
@@ -1295,6 +1508,50 @@
 		goto fail;
 	}
 
+	const char *required_device_extensions[] = {
+		VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME};
+
+	uint32_t device_extension_count = 0;
+	ret = ifuncs->EnumerateDeviceExtensionProperties(
+		phy_device, NULL, &device_extension_count, NULL);
+	if (ret != VK_SUCCESS)
+		goto fail;
+
+	VkExtensionProperties *device_extensions = _malloca(
+		sizeof(VkExtensionProperties) * device_extension_count);
+	ret = ifuncs->EnumerateDeviceExtensionProperties(
+		phy_device, NULL, &device_extension_count, device_extensions);
+	if (ret != VK_SUCCESS) {
+		_freea(device_extensions);
+		goto fail;
+	}
+
+	bool extensions_found = true;
+	for (uint32_t i = 0; i < _countof(required_device_extensions); i++) {
+		const char *const required_extension =
+			required_device_extensions[i];
+
+		bool found = false;
+		for (uint32_t j = 0; j < device_extension_count; j++) {
+			if (!strcmp(required_extension,
+				    device_extensions[j].extensionName)) {
+				found = true;
+				break;
+			}
+		}
+
+		if (!found) {
+			flog("missing device extension: %s",
+			     required_extension);
+			extensions_found = false;
+		}
+	}
+
+	_freea(device_extensions);
+
+	if (!extensions_found)
+		goto fail;
+
 	VkFormat format = VK_FORMAT_R8G8B8A8_UNORM;
 	VkImageUsageFlags usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
 				  VK_IMAGE_USAGE_TRANSFER_DST_BIT;
@@ -1306,147 +1563,195 @@
 	}
 
 	data->inst_data = idata;
+
+	data->ac = NULL;
+	if (ac) {
+		data->ac_storage = *ac;
+		data->ac = &data->ac_storage;
+	}
+
+	uint32_t queue_family_property_count = 0;
+	ifuncs->GetPhysicalDeviceQueueFamilyProperties(
+		phy_device, &queue_family_property_count, NULL);
+	VkQueueFamilyProperties *queue_family_properties = _malloca(
+		sizeof(VkQueueFamilyProperties) * queue_family_property_count);
+	ifuncs->GetPhysicalDeviceQueueFamilyProperties(
+		phy_device, &queue_family_property_count,
+		queue_family_properties);
+
+	for (uint32_t info_index = 0, info_count = info->queueCreateInfoCount;
+	     info_index < info_count; ++info_index) {
+		const VkDeviceQueueCreateInfo *queue_info =
+			&info->pQueueCreateInfos[info_index];
+		for (uint32_t queue_index = 0,
+			      queue_count = queue_info->queueCount;
+		     queue_index < queue_count; ++queue_index) {
+			const uint32_t family_index =
+				queue_info->queueFamilyIndex;
+			VkQueue queue;
+			data->funcs.GetDeviceQueue(device, family_index,
+						   queue_index, &queue);
+			const bool supports_transfer =
+				(queue_family_properties[family_index]
+					 .queueFlags &
+				 (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT |
+				  VK_QUEUE_TRANSFER_BIT)) != 0;
+			add_queue_data(data, queue, family_index,
+				       supports_transfer, ac);
+		}
+	}
+
+	_freea(queue_family_properties);
+
+	init_obj_list(&data->swaps);
+	data->cur_swap = NULL;
+	data->d3d11_device = NULL;
+	data->d3d11_context = NULL;
+
 	data->valid = true;
 
 fail:
 	return ret;
 }
 
-static void VKAPI OBS_DestroyDevice(VkDevice device,
-				    const VkAllocationCallbacks *ac)
+static void VKAPI_CALL OBS_DestroyDevice(VkDevice device,
+					 const VkAllocationCallbacks *ac)
 {
-	struct vk_data *data = get_device_data(device);
-	if (!data)
-		return;
+	struct vk_data *data = remove_device_data(device);
 
 	if (data->valid) {
-		for (uint32_t fam_idx = 0; fam_idx < _countof(data->cmd_pools);
-		     fam_idx++) {
-			struct vk_cmd_pool_data *pool_data =
-				&data->cmd_pools[fam_idx];
-			if (pool_data->cmd_pool != VK_NULL_HANDLE) {
-				vk_shtex_destroy_cmd_pool_objects(data,
-								  pool_data);
-			}
+		struct vk_queue_data *queue_data = queue_walk_begin(data);
+
+		while (queue_data) {
+			vk_shtex_destroy_frame_objects(data, queue_data);
+
+			queue_data = queue_walk_next(queue_data);
 		}
+
+		queue_walk_end(data);
+
+		remove_free_queue_all(data, ac);
 	}
 
-	data->queue_count = 0;
+	PFN_vkDestroyDevice destroy_device = data->funcs.DestroyDevice;
 
-	vk_remove_device(device);
-	data->funcs.DestroyDevice(device, ac);
+	vk_free(ac, data);
+
+	destroy_device(device, ac);
 }
 
-static VkResult VKAPI
+static VkResult VKAPI_CALL
 OBS_CreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *cinfo,
 		       const VkAllocationCallbacks *ac, VkSwapchainKHR *p_sc)
 {
 	struct vk_data *data = get_device_data(device);
+	struct vk_device_funcs *funcs = &data->funcs;
+	if (!data->valid)
+		return funcs->CreateSwapchainKHR(device, cinfo, ac, p_sc);
 
 	VkSwapchainCreateInfoKHR info = *cinfo;
-	if (data->valid)
-		info.imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
-
-	struct vk_device_funcs *funcs = &data->funcs;
+	info.imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
 	VkResult res = funcs->CreateSwapchainKHR(device, &info, ac, p_sc);
 	debug_res("CreateSwapchainKHR", res);
-	if ((res != VK_SUCCESS) || !data->valid)
-		return res;
+	if (res != VK_SUCCESS) {
+		/* try again with original imageUsage flags */
+		return funcs->CreateSwapchainKHR(device, cinfo, ac, p_sc);
+	}
 
 	VkSwapchainKHR sc = *p_sc;
-
 	uint32_t count = 0;
-	res = funcs->GetSwapchainImagesKHR(data->device, sc, &count, NULL);
+	res = funcs->GetSwapchainImagesKHR(device, sc, &count, NULL);
 	debug_res("GetSwapchainImagesKHR", res);
-
-	struct vk_swap_data *swap = get_new_swap_data(data);
-	if (count > 0) {
-		if (count > OBJ_MAX)
-			count = OBJ_MAX;
-
-		res = funcs->GetSwapchainImagesKHR(data->device, sc, &count,
-						   swap->swap_images);
-		debug_res("GetSwapchainImagesKHR", res);
+	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);
+			res = funcs->GetSwapchainImagesKHR(
+				device, sc, &count, swap_data->swap_images);
+			debug_res("GetSwapchainImagesKHR", res);
+
+			swap_data->image_extent = cinfo->imageExtent;
+			swap_data->format = cinfo->imageFormat;
+			swap_data->hwnd =
+				find_surf_hwnd(data->inst_data, cinfo->surface);
+			swap_data->export_image = VK_NULL_HANDLE;
+			swap_data->layout_initialized = false;
+			swap_data->export_mem = VK_NULL_HANDLE;
+			swap_data->image_count = count;
+			swap_data->handle = INVALID_HANDLE_VALUE;
+			swap_data->shtex_info = NULL;
+			swap_data->d3d11_tex = NULL;
+			swap_data->captured = false;
+		}
 	}
 
-	swap->sc = sc;
-	swap->image_extent = cinfo->imageExtent;
-	swap->format = cinfo->imageFormat;
-	swap->hwnd = find_surf_hwnd(data->inst_data, cinfo->surface);
-	swap->image_count = count;
-
 	return VK_SUCCESS;
 }
 
-static void VKAPI OBS_DestroySwapchainKHR(VkDevice device, VkSwapchainKHR sc,
-					  const VkAllocationCallbacks *ac)
+static void VKAPI_CALL OBS_DestroySwapchainKHR(VkDevice device,
+					       VkSwapchainKHR sc,
+					       const VkAllocationCallbacks *ac)
 {
 	struct vk_data *data = get_device_data(device);
 	struct vk_device_funcs *funcs = &data->funcs;
+	PFN_vkDestroySwapchainKHR destroy_swapchain =
+		funcs->DestroySwapchainKHR;
 
-	if (data->valid) {
+	if ((sc != VK_NULL_HANDLE) && data->valid) {
 		struct vk_swap_data *swap = get_swap_data(data, sc);
 		if (swap) {
 			if (data->cur_swap == swap) {
 				vk_shtex_free(data);
 			}
 
-			swap->sc = VK_NULL_HANDLE;
-			swap->hwnd = NULL;
-		}
-	}
-
-	funcs->DestroySwapchainKHR(device, sc, ac);
-}
-
-static void VKAPI OBS_GetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex,
-				     uint32_t queueIndex, VkQueue *pQueue)
-{
-	struct vk_data *data = get_device_data(device);
-	struct vk_device_funcs *funcs = &data->funcs;
+			vk_free(ac, swap->swap_images);
 
-	funcs->GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
-
-	for (uint32_t i = 0; i < data->queue_count; ++i) {
-		if (data->queues[i].queue == *pQueue)
-			return;
+			remove_free_swap_data(data, sc, ac);
+		}
 	}
 
-	if (data->queue_count < _countof(data->queues)) {
-		data->queues[data->queue_count].queue = *pQueue;
-		data->queues[data->queue_count].fam_idx = queueFamilyIndex;
-		++data->queue_count;
-	}
+	destroy_swapchain(device, sc, ac);
 }
 
-static VkResult VKAPI OBS_CreateWin32SurfaceKHR(
+static VkResult VKAPI_CALL OBS_CreateWin32SurfaceKHR(
 	VkInstance inst, const VkWin32SurfaceCreateInfoKHR *info,
 	const VkAllocationCallbacks *ac, VkSurfaceKHR *surf)
 {
-	struct vk_inst_data *data = get_inst_data(inst);
-	struct vk_inst_funcs *funcs = &data->funcs;
+	struct vk_inst_data *idata = get_inst_data(inst);
+	struct vk_inst_funcs *ifuncs = &idata->funcs;
 
-	VkResult res = funcs->CreateWin32SurfaceKHR(inst, info, ac, surf);
-	if (res == VK_SUCCESS)
-		insert_surf_data(data, *surf, info->hwnd);
+	VkResult res = ifuncs->CreateWin32SurfaceKHR(inst, info, ac, surf);
+	if ((res == VK_SUCCESS) && idata->valid)
+		add_surf_data(idata, *surf, info->hwnd, ac);
 	return res;
 }
 
-static void VKAPI OBS_DestroySurfaceKHR(VkInstance inst, VkSurfaceKHR surf,
-					const VkAllocationCallbacks *ac)
+static void VKAPI_CALL OBS_DestroySurfaceKHR(VkInstance inst, VkSurfaceKHR surf,
+					     const VkAllocationCallbacks *ac)
 {
-	struct vk_inst_data *data = get_inst_data(inst);
-	struct vk_inst_funcs *funcs = &data->funcs;
+	struct vk_inst_data *idata = get_inst_data(inst);
+	struct vk_inst_funcs *ifuncs = &idata->funcs;
+	PFN_vkDestroySurfaceKHR destroy_surface = ifuncs->DestroySurfaceKHR;
+
+	if ((surf != VK_NULL_HANDLE) && idata->valid)
+		remove_free_surf_data(idata, surf, ac);
 
-	erase_surf_data(data, surf);
-	funcs->DestroySurfaceKHR(inst, surf, ac);
+	destroy_surface(inst, surf, ac);
 }
 
 #define GETPROCADDR(func)              \
 	if (!strcmp(name, "vk" #func)) \
-		return (VkFunc)&OBS_##func;
+		return (PFN_vkVoidFunction)&OBS_##func;
+
+#define GETPROCADDR_IF_SUPPORTED(func) \
+	if (!strcmp(name, "vk" #func)) \
+		return funcs->func ? (PFN_vkVoidFunction)&OBS_##func : NULL;
 
-static VkFunc VKAPI OBS_GetDeviceProcAddr(VkDevice dev, const char *name)
+static PFN_vkVoidFunction VKAPI_CALL OBS_GetDeviceProcAddr(VkDevice dev,
+							   const char *name)
 {
 	struct vk_data *data = get_device_data(dev);
 	struct vk_device_funcs *funcs = &data->funcs;
@@ -1454,35 +1759,39 @@
 	debug_procaddr("vkGetDeviceProcAddr(%p, \"%s\")", dev, name);
 
 	GETPROCADDR(GetDeviceProcAddr);
-	GETPROCADDR(CreateDevice);
 	GETPROCADDR(DestroyDevice);
-	GETPROCADDR(CreateSwapchainKHR);
-	GETPROCADDR(DestroySwapchainKHR);
-	GETPROCADDR(QueuePresentKHR);
-	GETPROCADDR(GetDeviceQueue);
+	GETPROCADDR_IF_SUPPORTED(CreateSwapchainKHR);
+	GETPROCADDR_IF_SUPPORTED(DestroySwapchainKHR);
+	GETPROCADDR_IF_SUPPORTED(QueuePresentKHR);
 
 	if (funcs->GetDeviceProcAddr == NULL)
 		return NULL;
 	return funcs->GetDeviceProcAddr(dev, name);
 }
 
-static VkFunc VKAPI OBS_GetInstanceProcAddr(VkInstance inst, const char *name)
+static PFN_vkVoidFunction VKAPI_CALL OBS_GetInstanceProcAddr(VkInstance inst,
+							     const char *name)
 {
 	debug_procaddr("vkGetInstanceProcAddr(%p, \"%s\")", inst, name);
 
 	/* instance chain functions we intercept */
 	GETPROCADDR(GetInstanceProcAddr);
 	GETPROCADDR(CreateInstance);
+
+	if (inst == NULL)
+		return NULL;
+
+	struct vk_inst_funcs *funcs = get_inst_funcs(inst);
+
+	/* instance chain functions we intercept */
 	GETPROCADDR(DestroyInstance);
-	GETPROCADDR(CreateWin32SurfaceKHR);
-	GETPROCADDR(DestroySurfaceKHR);
+	GETPROCADDR_IF_SUPPORTED(CreateWin32SurfaceKHR);
+	GETPROCADDR_IF_SUPPORTED(DestroySurfaceKHR);
 
 	/* device chain functions we intercept */
 	GETPROCADDR(GetDeviceProcAddr);
 	GETPROCADDR(CreateDevice);
 	GETPROCADDR(DestroyDevice);
-
-	struct vk_inst_funcs *funcs = get_inst_funcs(inst);
 	if (funcs->GetInstanceProcAddr == NULL)
 		return NULL;
 	return funcs->GetInstanceProcAddr(inst, name);
@@ -1490,7 +1799,12 @@
 
 #undef GETPROCADDR
 
-EXPORT VkResult VKAPI OBS_Negotiate(VkNegotiateLayerInterface *nli)
+#ifndef _WIN64
+#pragma comment(linker, "/EXPORT:OBS_Negotiate=_OBS_Negotiate@4")
+#endif
+
+__declspec(dllexport) VkResult VKAPI_CALL
+	OBS_Negotiate(VkNegotiateLayerInterface *nli)
 {
 	if (nli->loaderLayerInterfaceVersion >= 2) {
 		nli->sType = LAYER_NEGOTIATE_INTERFACE_STRUCT;
@@ -1506,6 +1820,13 @@
 		nli->loaderLayerInterfaceVersion = cur_ver;
 	}
 
+	if (!vulkan_seen) {
+		init_obj_list(&instances);
+		init_obj_list(&devices);
+
+		vulkan_seen = true;
+	}
+
 	return VK_SUCCESS;
 }

obs-studio-25.0.8.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.h -> obs-studio-26.0.0.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.h Changed

@@ -7,8 +7,10 @@
 	DEF_FUNC(DestroyInstance);
 	DEF_FUNC(CreateWin32SurfaceKHR);
 	DEF_FUNC(DestroySurfaceKHR);
+	DEF_FUNC(GetPhysicalDeviceQueueFamilyProperties);
 	DEF_FUNC(GetPhysicalDeviceMemoryProperties);
 	DEF_FUNC(GetPhysicalDeviceImageFormatProperties2);
+	DEF_FUNC(EnumerateDeviceExtensionProperties);
 };
 
 struct vk_device_funcs {
@@ -26,6 +28,7 @@
 	DEF_FUNC(DestroyImage);
 	DEF_FUNC(GetImageMemoryRequirements);
 	DEF_FUNC(GetImageMemoryRequirements2);
+	DEF_FUNC(ResetCommandPool);
 	DEF_FUNC(BeginCommandBuffer);
 	DEF_FUNC(EndCommandBuffer);
 	DEF_FUNC(CmdCopyImage);
@@ -318,9 +321,6 @@
 		VAL(VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT);
 		//VAL(VK_ERROR_OUT_OF_POOL_MEMORY_KHR);
 		//VAL(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR);
-		//VAL(VK_RESULT_BEGIN_RANGE);
-		//VAL(VK_RESULT_END_RANGE);
-		VAL(VK_RESULT_RANGE_SIZE);
 		VAL(VK_RESULT_MAX_ENUM);
 #undef VAL
 
@@ -473,7 +473,6 @@
 	case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
 		break;
 	case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
-		dxgi_format = DXGI_FORMAT_R10G10B10A2_UNORM;
 		break;
 	case VK_FORMAT_A2R10G10B10_SNORM_PACK32:
 		break;
@@ -841,11 +840,6 @@
 	case VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG:
 		break;
 	}
-	if (dxgi_format == DXGI_FORMAT_UNKNOWN) {
-		flog("unknown swapchain format, "
-		     "defaulting to B8G8R8A8_UNORM");
-		dxgi_format = DXGI_FORMAT_B8G8R8A8_UNORM;
-	}
 	return dxgi_format;
 }

obs-studio-25.0.8.tar.xz/plugins/win-capture/inject-helper/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-capture/inject-helper/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/plugins/win-capture/window-capture.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/window-capture.c Changed

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <util/dstr.h>
+#include <util/threading.h>
 #include "dc-capture.h"
 #include "window-helpers.h"
 #include "../../libobs/util/platform.h"
@@ -31,6 +32,7 @@
 	struct winrt_capture *(*winrt_capture_init)(BOOL cursor, HWND window,
 						    BOOL client_area);
 	void (*winrt_capture_free)(struct winrt_capture *capture);
+	BOOL *(*winrt_capture_active)(const struct winrt_capture *capture);
 	void (*winrt_capture_show_cursor)(struct winrt_capture *capture,
 					  BOOL visible);
 	void (*winrt_capture_render)(struct winrt_capture *capture,
@@ -48,6 +50,8 @@
 struct window_capture {
 	obs_source_t *source;
 
+	pthread_mutex_t update_mutex;
+
 	char *title;
 	char *class;
 	char *executable;
@@ -121,8 +125,44 @@
 	return METHOD_BITBLT;
 }
 
+static const char *get_method_name(int method)
+{
+	const char *method_name = "";
+	switch (method) {
+	case METHOD_AUTO:
+		method_name = "Automatic";
+		break;
+	case METHOD_BITBLT:
+		method_name = "BitBlt";
+		break;
+	case METHOD_WGC:
+		method_name = "WGC";
+		break;
+	}
+
+	return method_name;
+}
+
+static void log_settings(struct window_capture *wc, obs_data_t *s)
+{
+	int method = (int)obs_data_get_int(s, "method");
+
+	if (wc->title != NULL) {
+		blog(LOG_INFO,
+		     "[window-capture: '%s'] update settings:\n"
+		     "\texecutable: %s\n"
+		     "\tmethod selected: %s\n"
+		     "\tmethod chosen: %s\n",
+		     obs_source_get_name(wc->source), wc->executable,
+		     get_method_name(method), get_method_name(wc->method));
+		blog(LOG_DEBUG, "\tclass:      %s", wc->class);
+	}
+}
+
 static void update_settings(struct window_capture *wc, obs_data_t *s)
 {
+	pthread_mutex_lock(&wc->update_mutex);
+
 	int method = (int)obs_data_get_int(s, "method");
 	const char *window = obs_data_get_string(s, "window");
 	int priority = (int)obs_data_get_int(s, "priority");
@@ -133,20 +173,14 @@
 
 	build_window_strings(window, &wc->class, &wc->title, &wc->executable);
 
-	if (wc->title != NULL) {
-		blog(LOG_INFO,
-		     "[window-capture: '%s'] update settings:\n"
-		     "\texecutable: %s",
-		     obs_source_get_name(wc->source), wc->executable);
-		blog(LOG_DEBUG, "\tclass:      %s", wc->class);
-	}
-
 	wc->method = choose_method(method, wc->wgc_supported, wc->class);
 	wc->priority = (enum window_priority)priority;
 	wc->cursor = obs_data_get_bool(s, "cursor");
 	wc->use_wildcards = obs_data_get_bool(s, "use_wildcards");
 	wc->compatibility = obs_data_get_bool(s, "compatibility");
 	wc->client_area = obs_data_get_bool(s, "client_area");
+
+	pthread_mutex_unlock(&wc->update_mutex);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -178,6 +212,7 @@
 	WINRT_IMPORT(winrt_capture_cursor_toggle_supported);
 	WINRT_IMPORT(winrt_capture_init);
 	WINRT_IMPORT(winrt_capture_free);
+	WINRT_IMPORT(winrt_capture_active);
 	WINRT_IMPORT(winrt_capture_show_cursor);
 	WINRT_IMPORT(winrt_capture_render);
 	WINRT_IMPORT(winrt_capture_width);
@@ -191,6 +226,8 @@
 	struct window_capture *wc = bzalloc(sizeof(struct window_capture));
 	wc->source = source;
 
+	pthread_mutex_init(&wc->update_mutex, NULL);
+
 	obs_enter_graphics();
 	const bool uses_d3d11 = gs_get_device_type() == GS_DEVICE_DIRECT3D_11;
 	obs_leave_graphics();
@@ -208,6 +245,7 @@
 	}
 
 	update_settings(wc, settings);
+	log_settings(wc, settings);
 	return wc;
 }
 
@@ -230,6 +268,8 @@
 	if (wc->winrt_module)
 		os_dlclose(wc->winrt_module);
 
+	pthread_mutex_destroy(&wc->update_mutex);
+
 	bfree(wc);
 }
 
@@ -242,6 +282,7 @@
 {
 	struct window_capture *wc = data;
 	update_settings(wc, settings);
+	log_settings(wc, settings);
 
 	/* forces a reset */
 	wc->window = NULL;
@@ -277,6 +318,8 @@
 static void update_settings_visibility(obs_properties_t *props,
 				       struct window_capture *wc)
 {
+	pthread_mutex_lock(&wc->update_mutex);
+
 	const enum window_capture_method method = wc->method;
 	const bool bitblt_options = method == METHOD_BITBLT;
 	const bool wgc_options = method == METHOD_WGC;
@@ -293,6 +336,8 @@
 
 	p = obs_properties_get(props, "client_area");
 	obs_property_set_visible(p, wgc_options);
+
+	pthread_mutex_unlock(&wc->update_mutex);
 }
 
 static bool wc_capture_method_changed(obs_properties_t *props,
@@ -419,6 +464,7 @@
 			return;
 		}
 
+		wc->previously_failed = false;
 		reset_capture = true;
 
 	} else if (IsIconic(wc->window)) {
@@ -501,10 +547,21 @@
 {
 	struct window_capture *wc = data;
 	gs_effect_t *const opaque = obs_get_base_effect(OBS_EFFECT_OPAQUE);
-	if (wc->method == METHOD_WGC)
-		wc->exports.winrt_capture_render(wc->capture_winrt, opaque);
-	else
+	if (wc->method == METHOD_WGC) {
+		if (wc->capture_winrt) {
+			if (wc->exports.winrt_capture_active(
+				    wc->capture_winrt)) {
+				wc->exports.winrt_capture_render(
+					wc->capture_winrt, opaque);
+			} else {
+				wc->exports.winrt_capture_free(
+					wc->capture_winrt);
+				wc->capture_winrt = NULL;
+			}
+		}
+	} else {
 		dc_capture_render(&wc->capture, opaque);
+	}
 
 	UNUSED_PARAMETER(effect);
 }

obs-studio-25.0.8.tar.xz/plugins/win-capture/window-helpers.c -> obs-studio-26.0.0.tar.xz/plugins/win-capture/window-helpers.c Changed

@@ -2,8 +2,9 @@
 #include <obs.h>
 #include <util/dstr.h>
 
-#include <windows.h>
+#include <dwmapi.h>
 #include <psapi.h>
+#include <windows.h>
 #include "window-helpers.h"
 #include "obfuscate.h"
 
@@ -126,24 +127,29 @@
 		dstr_from_wcs(class, temp);
 }
 
-/* not capturable or internal windows */
-static const char *internal_microsoft_exes[] = {
-	"startmenuexperiencehost",
-	"applicationframehost",
-	"peopleexperiencehost",
-	"shellexperiencehost",
-	"microsoft.notes",
+/* not capturable or internal windows, exact executable names */
+static const char *internal_microsoft_exes_exact[] = {
+	"startmenuexperiencehost.exe",
+	"applicationframehost.exe",
+	"peopleexperiencehost.exe",
+	"shellexperiencehost.exe",
+	"microsoft.notes.exe",
+	"systemsettings.exe",
+	"textinputhost.exe",
+	"searchapp.exe",
+	"video.ui.exe",
+	"searchui.exe",
+	"lockapp.exe",
+	"cortana.exe",
+	"gamebar.exe",
+	"tabtip.exe",
+	"time.exe",
+	NULL,
+};
+
+/* partial matches start from the beginning of the executable name */
+static const char *internal_microsoft_exes_partial[] = {
 	"windowsinternal",
-	"systemsettings",
-	"textinputhost",
-	"searchapp",
-	"video.ui",
-	"searchui",
-	"lockapp",
-	"cortana",
-	"gamebar",
-	"tabtip",
-	"time",
 	NULL,
 };
 
@@ -152,7 +158,13 @@
 	if (!exe)
 		return false;
 
-	for (const char **vals = internal_microsoft_exes; *vals; vals++) {
+	for (const char **vals = internal_microsoft_exes_exact; *vals; vals++) {
+		if (astrcmpi(exe, *vals) == 0)
+			return true;
+	}
+
+	for (const char **vals = internal_microsoft_exes_partial; *vals;
+	     vals++) {
 		if (astrcmpi_n(exe, *vals, strlen(*vals)) == 0)
 			return true;
 	}
@@ -351,7 +363,7 @@
 
 static int window_rating(HWND window, enum window_priority priority,
 			 const char *class, const char *title, const char *exe,
-			 bool uwp_window)
+			 bool generic_class)
 {
 	struct dstr cur_class = {0};
 	struct dstr cur_title = {0};
@@ -367,8 +379,8 @@
 	bool exe_matches = dstr_cmpi(&cur_exe, exe) == 0;
 	int title_val = abs(dstr_cmpi(&cur_title, title));
 
-	/* always match by name with UWP windows */
-	if (uwp_window) {
+	/* always match by name if class is generic */
+	if (generic_class) {
 		if (priority == WINDOW_PRIORITY_EXE && !exe_matches)
 			val = 0x7FFFFFFF;
 		else
@@ -393,6 +405,37 @@
 	return val;
 }
 
+static const char *generic_class_substrings[] = {
+	"Chrome",
+	NULL,
+};
+
+static const char *generic_classes[] = {
+	"Windows.UI.Core.CoreWindow",
+	NULL,
+};
+
+static bool is_generic_class(const char *current_class)
+{
+	const char **class = generic_class_substrings;
+	while (*class) {
+		if (astrstri(current_class, *class) != NULL) {
+			return true;
+		}
+		class ++;
+	}
+
+	class = generic_classes;
+	while (*class) {
+		if (astrcmpi(current_class, *class) == 0) {
+			return true;
+		}
+		class ++;
+	}
+
+	return false;
+}
+
 HWND find_window(enum window_search_mode mode, enum window_priority priority,
 		 const char *class, const char *title, const char *exe)
 {
@@ -406,11 +449,11 @@
 	if (!class)
 		return NULL;
 
-	bool uwp_window = strcmp(class, "Windows.UI.Core.CoreWindow") == 0;
+	bool generic_class = is_generic_class(class);
 
 	while (window) {
 		int rating = window_rating(window, priority, class, title, exe,
-					   uwp_window);
+					   generic_class);
 		if (rating < best_rating) {
 			best_rating = rating;
 			best_window = window;
@@ -430,7 +473,7 @@
 	const char *class;
 	const char *title;
 	const char *exe;
-	bool uwp_window;
+	bool generic_class;
 	HWND best_window;
 	int best_rating;
 };
@@ -442,9 +485,15 @@
 	if (!check_window_valid(window, data->mode))
 		return TRUE;
 
+	int cloaked;
+	if (SUCCEEDED(DwmGetWindowAttribute(window, DWMWA_CLOAKED, &cloaked,
+					    sizeof(cloaked))) &&
+	    cloaked)
+		return TRUE;
+
 	const int rating = window_rating(window, data->priority, data->class,
 					 data->title, data->exe,
-					 data->uwp_window);
+					 data->generic_class);
 	if (rating < data->best_rating) {
 		data->best_rating = rating;
 		data->best_window = window;
@@ -466,7 +515,7 @@
 	data.class = class;
 	data.title = title;
 	data.exe = exe;
-	data.uwp_window = strcmp(class, "Windows.UI.Core.CoreWindow") == 0;
+	data.generic_class = is_generic_class(class);
 	data.best_window = NULL;
 	data.best_rating = 0x7FFFFFFF;
 	EnumWindows(enum_windows_proc, (LPARAM)&data);

obs-studio-25.0.8.tar.xz/plugins/win-dshow/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/CMakeLists.txt Changed

@@ -13,7 +13,67 @@
 	ffmpeg-decode.h)
 
 set(MODULE_DESCRIPTION "OBS DirectShow module")
+
+set(VIRTUALCAM_GUID "" CACHE STRING "VirtualCam GUID")
+
+set(VIRTUALCAM_ENABLED FALSE)
+if(VIRTUALCAM_GUID STREQUAL "")
+	message(STATUS "VirtualCam GUID not set! VirtualCam disabled.")
+else()
+	set(INVALID_GUID TRUE)
+
+	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_ENABLED TRUE)
+				set(INVALID_GUID FALSE)
+			endif()
+		endif()
+	endif()
+endif()
+
+if(INVALID_GUID)
+	message(WARNING "Invalid VirtualCam GUID! VirtualCam disabled.")
+endif()
+
+if(VIRTUALCAM_ENABLED)
+	add_definitions(-DVIRTUALCAM_ENABLED)
+endif()
+
 configure_file(${CMAKE_SOURCE_DIR}/cmake/winrc/obs-module.rc.in win-dshow.rc)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-guid.h.in ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-guid.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 set(win-dshow_SOURCES
 	win-dshow.cpp
 	win-dshow-encoder.cpp
@@ -21,6 +81,16 @@
 	ffmpeg-decode.c
 	win-dshow.rc)
 
+if(VIRTUALCAM_ENABLED)
+	set(virtualcam-output_SOURCES
+		tiny-nv12-scale.c
+		shared-memory-queue.c
+		virtualcam.c)
+	set(virtualcam-output_HEADERS
+		tiny-nv12-scale.h
+		shared-memory-queue.h)
+endif()
+
 set(libdshowcapture_SOURCES
 	libdshowcapture/source/capture-filter.cpp
 	libdshowcapture/source/output-filter.cpp
@@ -54,6 +124,8 @@
 add_library(win-dshow MODULE
 	${win-dshow_SOURCES}
 	${win-dshow_HEADERS}
+	${virtualcam-output_SOURCES}
+	${virtualcam-output_HEADERS}
 	${libdshowcapture_SOURCES}
 	${libdshowcapture_HEADERS})
 target_link_libraries(win-dshow
@@ -61,6 +133,18 @@
 	strmiids
 	ksuser
 	wmcodecdspuuid
+	w32-pthreads
 	${FFMPEG_LIBRARIES})
+set_target_properties(win-dshow PROPERTIES FOLDER "plugins/win-dshow")
+
+source_group("libdshowcapture\\Source Files" FILES ${libdshowcapture_SOURCES})
+source_group("libdshowcapture\\Header Files" FILES ${libdshowcapture_HEADERS})
 
 install_obs_plugin_with_data(win-dshow data)
+
+if(VIRTUALCAM_ENABLED)
+	configure_file(virtualcam-install.bat.in "${CMAKE_CURRENT_BINARY_DIR}/data/virtualcam-install.bat")
+	configure_file(virtualcam-uninstall.bat.in "${CMAKE_CURRENT_BINARY_DIR}/data/virtualcam-uninstall.bat")
+	install_obs_data_from_abs_path(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/data" "obs-plugins/win-dshow")
+	add_subdirectory(virtualcam-module)
+endif()

obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/de-DE.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/en-GB.ini Added

@@ -0,0 +1,40 @@
+VideoCaptureDevice="Video Capture Device"
+Device="Device"
+ColorSpace="Colour Space"
+ColorSpace.Default="Default"
+ColorRange="Colour Range"
+ColorRange.Default="Default"
+ColorRange.Partial="Partial"
+ColorRange.Full="Full"
+ConfigureAudio="Configure Audio"
+ConfigureVideo="Configure Video"
+ConfigureCrossbar="Configure Crossbar"
+ResFPSType="Resolution/FPS Type"
+ResFPSType.Custom="Custom"
+ResFPSType.DevPreferred="Device Default"
+FPS.Matching="Match Output FPS"
+FPS.Highest="Highest FPS"
+Resolution="Resolution"
+VideoFormat="Video Format"
+VideoFormat.Any="Any"
+VideoFormat.Unknown="Unknown (%1)"
+AudioOutputMode="Audio Output Mode"
+AudioOutputMode.Capture="Capture audio only"
+AudioOutputMode.DirectSound="Output desktop audio (DirectSound)"
+AudioOutputMode.WaveOut="Output desktop audio (WaveOut)"
+UseCustomAudioDevice="Use custom audio device"
+AudioDevice="Audio Device"
+Buffering="Buffering"
+Buffering.ToolTip="When enabled, buffers video/audio data to ensure the smoothest and most\naccurate playback possible, but at the cost of increased latency. When using\nbuffering with a video capture card, it's recommended to set the card and the\nprogram to the same framerate for best results.\n\nWhen disabled, ensures lowest latency playback, but at the cost of frame\nplayback accuracy. This is ideal for face cameras, or when you want to use the\nprogram's preview window to play a console.\n\nAuto-detect (default) sets it to enabled if the device has delay, and disabled\nif it has no delay."
+Buffering.AutoDetect="Auto-Detect"
+Buffering.Enable="Enable"
+Buffering.Disable="Disable"
+Activate="Activate"
+Deactivate="Deactivate"
+FlipVertically="Flip Vertically"
+DeactivateWhenNotShowing="Deactivate when not showing"
+
+Bitrate="Bitrate"
+Encoder.C985="AVerMedia H.264 Encoder (c985)"
+Encoder.C353="AVerMedia H.264 Encoder"
+

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/es-ES.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/es-ES.ini Changed

@@ -24,7 +24,7 @@
 AudioOutputMode.WaveOut="Salida de audio de escritorio (WaveOut)"
 UseCustomAudioDevice="Utilizar dispositivo de audio personalizado"
 AudioDevice="Dispositivo de audio"
-Buffering="Almacenando en buffer"
+Buffering="Almacenar en búfer"
 Buffering.ToolTip="Cuando se activa, almacena datos de vídeo/audio para asegurar una reproducción\nlo más suave y precisa posible, pero a costa de un mayor tiempo de respuesta.\nCuando se usa el buffer con una tarjeta capturadora de vídeo, se recomienda establecer\nla tarjeta y el programa a la misma velocidad de fotogramas para un mejor resultado.\n\nCuando se desactiva, se garantiza la reproducción con el tiempo de respuesta más bajo, pero a costa\nde perder precisión en la reproducción de los fotogramas. Esto es ideal para el uso de webcams,\no cuando desea utilizar la ventana de vista previa de programa para jugar a una consola.\n\nAutodetectar (por defecto) se activa si el dispositivo tiene retardo y se desactiva\nsi no tiene ningún retardo."
 Buffering.AutoDetect="Autodetectar"
 Buffering.Enable="Habilitado"
@@ -32,7 +32,7 @@
 Activate="Activar"
 Deactivate="Desactivar"
 FlipVertically="Voltear verticalmente"
-DeactivateWhenNotShowing="Desactive cuando no se vea"
+DeactivateWhenNotShowing="Desactivar cuando no se muestre"
 
 Bitrate="Tasa de bits"
 Encoder.C985="Codificador AVerMedia H.264 (c985)"

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/id-ID.ini Added

@@ -0,0 +1,40 @@
+VideoCaptureDevice="Perangkat Penangkap Video"
+Device="Perangkat"
+ColorSpace="Ruang Warna"
+ColorSpace.Default="Default"
+ColorRange="Rentang Warna"
+ColorRange.Default="Default"
+ColorRange.Partial="Sebagian"
+ColorRange.Full="Penuh"
+ConfigureAudio="Konfigurasikan Audio"
+ConfigureVideo="Konfigurasikan Video"
+ConfigureCrossbar="Konfigurasikan Crossbar"
+ResFPSType="Jenis Resolusi/FPS"
+ResFPSType.Custom="Kustom"
+ResFPSType.DevPreferred="Default Perangkat"
+FPS.Matching="Cocok dengan FPS Output"
+FPS.Highest="FPS tertinggi"
+Resolution="Resolusi"
+VideoFormat="Format Video"
+VideoFormat.Any="Apa saja"
+VideoFormat.Unknown="Tidak diketahui (%1)"
+AudioOutputMode="Mode Output Audio"
+AudioOutputMode.Capture="Tangkap audio saja"
+AudioOutputMode.DirectSound="Output audio desktop (DirectSound)"
+AudioOutputMode.WaveOut="Output audio desktop (WaveOut)"
+UseCustomAudioDevice="Gunakan perangkat audio khusus"
+AudioDevice="Perangkat Audio"
+Buffering="Buffering"
+Buffering.ToolTip="Jika diaktifkan, membuffer data video/audio untuk memastikan playback\nyang paling halus dan seakurat mungkin, tetapi dengan latensi meningkat.\nSaat menggunakan buffering dengan kartu video capture, disarankan untuk\nmengatur kartu dan program ke framerate yang sama untuk hasil terbaik.\n\nJika dimatikan, memastikan latensi playback terendah, tetapi mempengaruhi\nakurasi playback frame. Ini sangat ideal untuk facecam, atau ketika Anda ingin\nmenggunakan jendela preview program untuk bermain konsol.\n\nDeteksi otomatis (default) mengaturnya untuk diaktifkan jika perangkat mengalami\ndelay, dan dimatikan jika tidak ada delay."
+Buffering.AutoDetect="Deteksi Otomatis"
+Buffering.Enable="Aktifkan"
+Buffering.Disable="Matikan"
+Activate="Aktifkan"
+Deactivate="Nonaktifkan"
+FlipVertically="Balik Vertikal"
+DeactivateWhenNotShowing="Nonaktifkan saat tidak tampil"
+
+Bitrate="Bitrate"
+Encoder.C985="Enkoder AVerMedia H.264 (c985)"
+Encoder.C353="Enkoder AVerMedia H.264"
+

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/pt-PT.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/pt-PT.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/ro-RO.ini Changed

@@ -7,24 +7,24 @@
 ColorRange.Partial="Parțială"
 ColorRange.Full="Completă"
 ConfigureAudio="Configurare audio"
-ConfigureVideo="Configurare video"
+ConfigureVideo="Configurează setările video"
 ConfigureCrossbar="Configurează bara transversală"
 ResFPSType="Tipul rezoluției/FPS"
 ResFPSType.Custom="Personalizat"
 ResFPSType.DevPreferred="Dispozitiv implicit"
-FPS.Matching="Potrivește FPS-ul de ieșire"
+FPS.Matching="Potrivește cu FPS-ul outputului"
 FPS.Highest="Cel mai mare FPS"
 Resolution="Rezoluție"
 VideoFormat="Format video"
 VideoFormat.Any="Oricare"
 VideoFormat.Unknown="Necunoscut (%1)"
-AudioOutputMode="Mod de ieșire audio"
+AudioOutputMode="Mod de output audio"
 AudioOutputMode.Capture="Capturează doar audio"
-AudioOutputMode.DirectSound="Ieșire audio desktop (DirectSound)"
-AudioOutputMode.WaveOut="Ieșire audio desktop (WaveOut)"
+AudioOutputMode.DirectSound="Output audio desktop (DirectSound)"
+AudioOutputMode.WaveOut="Output audio desktop (WaveOut)"
 UseCustomAudioDevice="Folosește dispozitiv audio personalizat"
 AudioDevice="Dispozitiv audio"
-Buffering="Zonă tampon"
+Buffering="Buffering"
 Buffering.AutoDetect="Detectează automat"
 Buffering.Enable="Activează"
 Buffering.Disable="Dezactivează"

obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/ta-IN.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/th-TH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/uk-UA.ini Changed

@@ -1,40 +1,40 @@
-VideoCaptureDevice="Відео пристрій"
+VideoCaptureDevice="Пристрій захоплення відео"
 Device="Пристрій"
 ColorSpace="Колірний простір"
-ColorSpace.Default="За замовчанням"
+ColorSpace.Default="За замовчуванням"
 ColorRange="Колірний діапазон"
-ColorRange.Default="За замовчанням"
+ColorRange.Default="За замовчуванням"
 ColorRange.Partial="Частковий"
 ColorRange.Full="Повний"
-ConfigureAudio="Настроювати Аудіо"
-ConfigureVideo="Настроювати Відео"
-ConfigureCrossbar="Конфігурація входів пристрою"
-ResFPSType="Роздільна здатність i кадр/сек"
-ResFPSType.Custom="Визначається користувачем"
-ResFPSType.DevPreferred="За виробником"
-FPS.Matching="Обрати схожу з виводом частоту кадрів"
+ConfigureAudio="Настроювання звуку"
+ConfigureVideo="Налаштування відео"
+ConfigureCrossbar="Налаштування входів пристрою"
+ResFPSType="Роздільна здатність/тип FPS"
+ResFPSType.Custom="Настроюване"
+ResFPSType.DevPreferred="Значення пристрою за замовчуванням"
+FPS.Matching="Підбирати під частоту кадрів виводу"
 FPS.Highest="Найвища частота кадрів"
 Resolution="Роздільна здатність"
 VideoFormat="Формат відео"
 VideoFormat.Any="Будь-який"
 VideoFormat.Unknown="Невідомо (%1)"
-AudioOutputMode="Режим виводу Аудіо"
-AudioOutputMode.Capture="Звук лише захоплювати"
-AudioOutputMode.DirectSound="Виводити як Системне аудіо (DirectSound)"
-AudioOutputMode.WaveOut="Виводити як Системне аудіо (WaveOut)"
-UseCustomAudioDevice="Інший пристрій для аудіо"
+AudioOutputMode="Режим виводу звуку"
+AudioOutputMode.Capture="Захоплювати лише звук"
+AudioOutputMode.DirectSound="Вивід системного аудіо (DirectSound)"
+AudioOutputMode.WaveOut="Вивід системного аудіо (WaveOut)"
+UseCustomAudioDevice="Використовувати спеціальний аудіопристрій"
 AudioDevice="Аудіопристрій"
 Buffering="Буферизація"
-Buffering.ToolTip="Коли Увімкнено, буферизує відео/аудіо данні задля плавного та точного\nвідтворення, яке тільки можливе, але за рахунок збільшення затримки.\nЯкщо буферизація використовується з картою захоплення, то для кращого\nрезультату рекомендується встановити однакову частоту кадрів\nдля програми і самого пристрою.\n\nЯкщо Вимкнено, данні програються з найменшою затримкою,\nале за рахунок плавності відтворення. Це зручно для фронтальних\nкамер, або у випадку використання вікна Перегляду програми\nдля гри у консольні ігри.\n\nАвтовизначення (за замовчанням) встановлює стан Увімкнено\nдля пристроїв з внутрішньою затримкою, і стан Вимкнено,\nякщо пристрій не має внутрішньої затримки."
+Buffering.ToolTip="При увімкненні буферизує дані відео/аудіо для забезпечення найплавнішого та \nнайточнішого відтворення, але коштом збільшення затримки. Якщо використовується \nбуферизація з картою захоплення – рекомендується встановити однакову частоту \nкадрів для програми та пристрою, для найкращого результату.\n\nПри вимкненні забезпечує найменшу затримку відтворення ціною плавності \nвідтворення. Це деально підходить для фронтальних камер, або у випадку \nвикористання вікна попереднього перегляду програми для гри на консолі.\n\nАвтовизначення (за замовчуванням) вмикає буферизацію для пристроїв \nякі мають затримку, і вимикає її, якщо пристрій не має затримки."
 Buffering.AutoDetect="Автовизначення"
-Buffering.Enable="Увімкнути"
-Buffering.Disable="Вимкнено"
+Buffering.Enable="Увімкнена"
+Buffering.Disable="Вимкнена"
 Activate="Активувати"
 Deactivate="Деактивувати"
 FlipVertically="Віддзеркалити по вертикалі"
 DeactivateWhenNotShowing="Деактивувати, коли не виводиться"
 
 Bitrate="Бітрейт"
-Encoder.C985="AVerMedia H.264 енкодер (c985)"
-Encoder.C353="AVerMedia H.264 енкодер"
+Encoder.C985="Кодувальник AVerMedia H.264 (c985)"
+Encoder.C353="Кодувальник AVerMedia H.264"

obs-studio-25.0.8.tar.xz/plugins/win-dshow/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/locale/zh-CN.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-dshow/data/placeholder.png Added

obs-studio-25.0.8.tar.xz/plugins/win-dshow/dshow-plugin.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/dshow-plugin.cpp Changed

@@ -1,4 +1,7 @@
 #include <obs-module.h>
+#include <strsafe.h>
+#include <strmif.h>
+#include "virtualcam-guid.h"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("win-dshow", "en-US")
@@ -10,9 +13,47 @@
 extern void RegisterDShowSource();
 extern void RegisterDShowEncoders();
 
+#ifdef VIRTUALCAM_ENABLED
+extern "C" struct obs_output_info virtualcam_info;
+
+static bool vcam_installed(bool b64)
+{
+	wchar_t cls_str[CHARS_IN_GUID];
+	wchar_t temp[MAX_PATH];
+	HKEY key = nullptr;
+
+	StringFromGUID2(CLSID_OBS_VirtualVideo, cls_str, CHARS_IN_GUID);
+	StringCbPrintf(temp, sizeof(temp), L"CLSID\\%s", cls_str);
+
+	DWORD flags = KEY_READ;
+	flags |= b64 ? KEY_WOW64_64KEY : KEY_WOW64_32KEY;
+
+	LSTATUS status = RegOpenKeyExW(HKEY_CLASSES_ROOT, temp, 0, flags, &key);
+	if (status != ERROR_SUCCESS) {
+		return false;
+	}
+
+	RegCloseKey(key);
+	return true;
+}
+#endif
+
 bool obs_module_load(void)
 {
 	RegisterDShowSource();
 	RegisterDShowEncoders();
+#ifdef VIRTUALCAM_ENABLED
+	obs_register_output(&virtualcam_info);
+
+	bool installed = vcam_installed(false);
+#else
+	bool installed = false;
+#endif
+
+	obs_data_t *obs_settings = obs_data_create();
+	obs_data_set_bool(obs_settings, "vcamEnabled", installed);
+	obs_apply_private_data(obs_settings);
+	obs_data_release(obs_settings);
+
 	return true;
 }

obs-studio-25.0.8.tar.xz/plugins/win-dshow/ffmpeg-decode.c -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/ffmpeg-decode.c Changed

@@ -270,6 +270,23 @@
 	return true;
 }
 
+static enum video_colorspace
+convert_color_space(enum AVColorSpace s, enum AVColorTransferCharacteristic trc)
+{
+	switch (s) {
+	case AVCOL_SPC_BT709:
+		return (trc == AVCOL_TRC_IEC61966_2_1) ? VIDEO_CS_SRGB
+						       : VIDEO_CS_709;
+	case AVCOL_SPC_FCC:
+	case AVCOL_SPC_BT470BG:
+	case AVCOL_SPC_SMPTE170M:
+	case AVCOL_SPC_SMPTE240M:
+		return VIDEO_CS_601;
+	default:
+		return VIDEO_CS_DEFAULT;
+	}
+}
+
 bool ffmpeg_decode_video(struct ffmpeg_decode *decode, uint8_t *data,
 			 size_t size, long long *ts,
 			 enum video_range_type range,
@@ -344,21 +361,22 @@
 				: VIDEO_RANGE_PARTIAL;
 	}
 
-	if (range != frame->range) {
-		const bool success = video_format_get_parameters(
-			VIDEO_CS_601, range, frame->color_matrix,
-			frame->color_range_min, frame->color_range_max);
-		if (!success) {
-			blog(LOG_ERROR,
-			     "Failed to get video format "
-			     "parameters for video format %u",
-			     VIDEO_CS_601);
-			return false;
-		}
-
-		frame->range = range;
+	const enum video_colorspace cs = convert_color_space(
+		decode->frame->colorspace, decode->frame->color_trc);
+
+	const bool success = video_format_get_parameters(
+		cs, range, frame->color_matrix, frame->color_range_min,
+		frame->color_range_max);
+	if (!success) {
+		blog(LOG_ERROR,
+		     "Failed to get video format "
+		     "parameters for video format %u",
+		     cs);
+		return false;
 	}
 
+	frame->range = range;
+
 	*ts = decode->frame->pkt_pts;
 
 	frame->width = decode->frame->width;

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/CoTaskMemPtr.hpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/CoTaskMemPtr.hpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/device.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/device.cpp Changed

@@ -414,6 +414,16 @@
 	return false;
 }
 
+static bool is24BitAudio(AM_MEDIA_TYPE *mt)
+{
+	if (mt->formattype == FORMAT_WaveFormatEx) {
+		WAVEFORMATEX *wfex = (WAVEFORMATEX *)mt->pbFormat;
+		return wfex->wBitsPerSample == 24;
+	}
+
+	return false;
+}
+
 bool HDevice::SetupAudioCapture(IBaseFilter *filter, AudioConfig &config)
 {
 	ComPtr<IPin> pin;
@@ -434,7 +444,16 @@
 		MediaTypePtr defaultMT;
 
 		if (pinConfig && SUCCEEDED(pinConfig->GetFormat(&defaultMT))) {
-			audioMediaType = defaultMT;
+			if (is24BitAudio(defaultMT)) {
+				WAVEFORMATEX *wfex =
+					(WAVEFORMATEX *)defaultMT->pbFormat;
+				config.sampleRate = wfex->nSamplesPerSec;
+				config.channels = wfex->nChannels;
+				config.format = AudioFormat::Wave16bit;
+				config.useDefaultConfig = false;
+			} else {
+				audioMediaType = defaultMT;
+			}
 		} else {
 			if (!SetupExceptionAudioCapture(pin)) {
 				Error(L"Could not get default format for "
@@ -442,7 +461,9 @@
 				return false;
 			}
 		}
-	} else {
+	}
+
+	if (!config.useDefaultConfig) {
 		if (!GetClosestAudioMediaType(filter, config, audioMediaType)) {
 			Error(L"Could not get closest audio media type");
 			return false;

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.cpp Changed

@@ -50,6 +50,139 @@
 
 namespace DShow {
 
+DWORD VFormatToFourCC(VideoFormat format)
+{
+	switch (format) {
+	/* raw formats */
+	case VideoFormat::ARGB:
+		return MAKEFOURCC('A', 'R', 'G', 'B');
+	case VideoFormat::XRGB:
+		return MAKEFOURCC('R', 'G', 'B', '4');
+
+	/* planar YUV formats */
+	case VideoFormat::I420:
+		return MAKEFOURCC('I', '4', '2', '0');
+	case VideoFormat::NV12:
+		return MAKEFOURCC('N', 'V', '1', '2');
+	case VideoFormat::YV12:
+		return MAKEFOURCC('Y', 'V', '1', '2');
+	case VideoFormat::Y800:
+		return MAKEFOURCC('Y', '8', '0', '0');
+
+	/* packed YUV formats */
+	case VideoFormat::YVYU:
+		return MAKEFOURCC('Y', 'V', 'Y', 'U');
+	case VideoFormat::YUY2:
+		return MAKEFOURCC('Y', 'U', 'Y', '2');
+	case VideoFormat::UYVY:
+		return MAKEFOURCC('U', 'Y', 'V', 'Y');
+	case VideoFormat::HDYC:
+		return MAKEFOURCC('H', 'D', 'Y', 'C');
+
+	/* encoded formats */
+	case VideoFormat::MJPEG:
+		return MAKEFOURCC('M', 'J', 'P', 'G');
+	case VideoFormat::H264:
+		return MAKEFOURCC('H', '2', '6', '4');
+
+	default:
+		return 0;
+	}
+}
+
+GUID VFormatToSubType(VideoFormat format)
+{
+	switch (format) {
+	/* raw formats */
+	case VideoFormat::ARGB:
+		return MEDIASUBTYPE_ARGB32;
+	case VideoFormat::XRGB:
+		return MEDIASUBTYPE_RGB32;
+
+	/* planar YUV formats */
+	case VideoFormat::I420:
+		return MEDIASUBTYPE_I420;
+	case VideoFormat::NV12:
+		return MEDIASUBTYPE_NV12;
+	case VideoFormat::YV12:
+		return MEDIASUBTYPE_YV12;
+	case VideoFormat::Y800:
+		return MEDIASUBTYPE_Y800;
+
+	/* packed YUV formats */
+	case VideoFormat::YVYU:
+		return MEDIASUBTYPE_YVYU;
+	case VideoFormat::YUY2:
+		return MEDIASUBTYPE_YUY2;
+	case VideoFormat::UYVY:
+		return MEDIASUBTYPE_UYVY;
+
+	/* encoded formats */
+	case VideoFormat::MJPEG:
+		return MEDIASUBTYPE_MJPG;
+	case VideoFormat::H264:
+		return MEDIASUBTYPE_H264;
+
+	default:
+		return GUID();
+	}
+}
+
+WORD VFormatBits(VideoFormat format)
+{
+	switch (format) {
+	/* raw formats */
+	case VideoFormat::ARGB:
+	case VideoFormat::XRGB:
+		return 32;
+
+	/* planar YUV formats */
+	case VideoFormat::I420:
+	case VideoFormat::NV12:
+	case VideoFormat::YV12:
+		return 12;
+	case VideoFormat::Y800:
+		return 8;
+
+	/* packed YUV formats */
+	case VideoFormat::YVYU:
+	case VideoFormat::YUY2:
+	case VideoFormat::UYVY:
+		return 16;
+
+	default:
+		return 0;
+	}
+}
+
+WORD VFormatPlanes(VideoFormat format)
+{
+	switch (format) {
+	/* raw formats */
+	case VideoFormat::ARGB:
+	case VideoFormat::XRGB:
+		return 1;
+
+	/* planar YUV formats */
+	case VideoFormat::I420:
+		return 3;
+	case VideoFormat::NV12:
+	case VideoFormat::YV12:
+		return 2;
+	case VideoFormat::Y800:
+		return 1;
+
+	/* packed YUV formats */
+	case VideoFormat::YVYU:
+	case VideoFormat::YUY2:
+	case VideoFormat::UYVY:
+		return 1;
+
+	default:
+		return 0;
+	}
+}
+
 static bool GetFourCCVFormat(DWORD fourCC, VideoFormat &format)
 {
 	switch (fourCC) {

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.hpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.hpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-media-type.hpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-media-type.hpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.cpp Changed

@@ -161,42 +161,6 @@
 	return true;
 }
 
-void HVideoEncoder::InitializeVideoFormat(MediaType &mt)
-{
-	long long frameTime;
-	DWORD size;
-	long long bitrate;
-
-	frameTime = config.fpsDenominator;
-	frameTime *= 10000000;
-	frameTime /= config.fpsNumerator;
-
-	size = config.cx * config.cy;
-	size += size / 2;
-
-	bitrate = size * config.fpsNumerator / config.fpsDenominator;
-
-	VIDEOINFOHEADER *vih = mt.AllocFormat<VIDEOINFOHEADER>();
-	vih->bmiHeader.biSize = sizeof(vih->bmiHeader);
-	vih->bmiHeader.biWidth = config.cx;
-	vih->bmiHeader.biHeight = config.cy;
-	vih->bmiHeader.biPlanes = 1;
-	vih->bmiHeader.biBitCount = 12;
-	vih->bmiHeader.biSizeImage = size;
-	vih->bmiHeader.biCompression = MAKEFOURCC('Y', 'V', '1', '2');
-	vih->rcSource.right = config.cx;
-	vih->rcSource.bottom = config.cy;
-	vih->rcTarget = vih->rcSource;
-	vih->dwBitRate = (DWORD)(bitrate * 8);
-	vih->AvgTimePerFrame = frameTime;
-
-	mt->majortype = MEDIATYPE_Video;
-	mt->subtype = MEDIASUBTYPE_YV12;
-	mt->formattype = FORMAT_VideoInfo;
-	mt->bFixedSizeSamples = true;
-	mt->lSampleSize = size;
-}
-
 bool HVideoEncoder::SetupEncoder(IBaseFilter *filter)
 {
 	ComPtr<IBaseFilter> deviceFilter;
@@ -244,18 +208,16 @@
 	captureInfo.expectedMajorType = mtEncoded->majortype;
 	captureInfo.expectedSubType = mtEncoded->subtype;
 
-	PinOutputInfo outputInfo;
-	outputInfo.expectedMajorType = mtRaw->majortype;
-	outputInfo.expectedSubType = mtRaw->subtype;
-	outputInfo.cx = config.cx;
-	outputInfo.cy = config.cy;
-
-	InitializeVideoFormat(outputInfo.mt);
+	long long frameTime;
+	frameTime = config.fpsDenominator;
+	frameTime *= 10000000;
+	frameTime /= config.fpsNumerator;
 
 	encoder = filter;
 	device = deviceFilter;
 	capture = new CaptureFilter(captureInfo);
-	output = new OutputFilter(outputInfo);
+	output = new OutputFilter(VideoFormat::YV12, config.cx, config.cy,
+				  frameTime);
 
 	graph->AddFilter(output, nullptr);
 	graph->AddFilter(device, L"Device Filter");

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.hpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.hpp Changed

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.cpp Changed

@@ -17,7 +17,9 @@
  *  USA
  */
 
+#include <strsafe.h>
 #include "output-filter.hpp"
+#include "dshow-formats.hpp"
 #include "log.hpp"
 
 namespace DShow {
@@ -28,13 +30,22 @@
 #define PrintFunc(x)
 #endif
 
+/* XXX: This is hardcoded for NV12/YV12/I420 */
+
 #define FILTER_NAME L"Output Filter"
 #define VIDEO_PIN_NAME L"Video Output"
 #define AUDIO_PIN_NAME L"Audio Output"
 
-OutputPin::OutputPin(OutputFilter *filter_, const PinOutputInfo &info)
-	: refCount(0), outputInfo(info), filter(filter_)
+OutputPin::OutputPin(OutputFilter *filter_, VideoFormat format, int cx, int cy,
+		     long long interval)
+	: refCount(0), filter(filter_)
 {
+	curCX = cx;
+	curCY = cy;
+	curInterval = interval;
+
+	AddVideoFormat(format, cx, cy, interval);
+	SetVideoFormat(format, cx, cy, interval);
 }
 
 OutputPin::~OutputPin() {}
@@ -50,6 +61,14 @@
 	} else if (riid == IID_IMemInputPin) {
 		AddRef();
 		*ppv = (IMemInputPin *)this;
+	} else if (riid == IID_IAMStreamConfig) {
+		AddRef();
+		*ppv = (IAMStreamConfig *)this;
+		return S_OK;
+	} else if (riid == IID_IKsPropertySet) {
+		AddRef();
+		*ppv = (IKsPropertySet *)this;
+		return S_OK;
 	} else {
 		*ppv = nullptr;
 		return E_NOINTERFACE;
@@ -65,12 +84,13 @@
 
 STDMETHODIMP_(ULONG) OutputPin::Release()
 {
-	if (!InterlockedDecrement(&refCount)) {
+	long newRefs = InterlockedDecrement(&refCount);
+	if (!newRefs) {
 		delete this;
 		return 0;
 	}
 
-	return (ULONG)refCount;
+	return (ULONG)newRefs;
 }
 
 // IPin methods
@@ -86,7 +106,7 @@
 	if (connectedPin)
 		return VFW_E_ALREADY_CONNECTED;
 
-	hr = pReceivePin->ReceiveConnection(this, outputInfo.mt);
+	hr = pReceivePin->ReceiveConnection(this, mt);
 	if (FAILED(hr)) {
 #if 0 /* debug code to test caps on fail */
 		ComPtr<IEnumMediaTypes> enumMT;
@@ -105,52 +125,10 @@
 		return E_FAIL;
 	}
 
-	ComQIPtr<IMemInputPin> memInput(pReceivePin);
-	if (!memInput)
-		return E_FAIL;
-
-	if (!!allocator) {
-		allocator->Decommit();
-	}
-
-	hr = memInput->GetAllocator(&allocator);
-	if (hr == VFW_E_NO_ALLOCATOR)
-		hr = CoCreateInstance(CLSID_MemoryAllocator, NULL,
-				      CLSCTX_INPROC_SERVER,
-				      __uuidof(IMemAllocator),
-				      (void **)&allocator);
-
-	if (FAILED(hr))
-		return E_FAIL;
-
-	int cx = outputInfo.cx;
-	int cy = outputInfo.cy;
-
-	bufSize = cx * cy + cx * cy / 2;
-
-	ALLOCATOR_PROPERTIES props;
-
-	hr = memInput->GetAllocatorRequirements(&props);
-	if (hr == E_NOTIMPL) {
-		props.cBuffers = 4;
-		props.cbBuffer = (long)bufSize;
-		props.cbAlign = 32;
-		props.cbPrefix = 0;
-
-	} else if (FAILED(hr)) {
+	if (!AllocateBuffers(pReceivePin, true)) {
 		return E_FAIL;
 	}
 
-	ALLOCATOR_PROPERTIES actual;
-	hr = allocator->SetProperties(&props, &actual);
-	if (FAILED(hr))
-		return E_FAIL;
-
-	if (FAILED(allocator->Commit()))
-		return E_FAIL;
-
-	memInput->NotifyAllocator(allocator, false);
-
 	connectedPin = pReceivePin;
 	DSHOW_UNUSED(pmt);
 	return S_OK;
@@ -175,6 +153,7 @@
 
 	if (!!allocator) {
 		allocator->Decommit();
+		allocator.Clear();
 	}
 
 	connectedPin = nullptr;
@@ -185,8 +164,10 @@
 {
 	PrintFunc(L"OutputPin::ConnectedTo");
 
-	if (!connectedPin)
+	if (!connectedPin) {
+		*pPin = nullptr;
 		return VFW_E_NOT_CONNECTED;
+	}
 
 	IPin *pin = connectedPin;
 	pin->AddRef();
@@ -201,7 +182,7 @@
 	if (!connectedPin)
 		return VFW_E_NOT_CONNECTED;
 
-	return CopyMediaType(pmt, outputInfo.mt);
+	return CopyMediaType(pmt, mt);
 }
 
 STDMETHODIMP OutputPin::QueryPinInfo(PIN_INFO *pInfo)
@@ -214,7 +195,7 @@
 		ptr->AddRef();
 	}
 
-	if (outputInfo.expectedMajorType == MEDIATYPE_Video)
+	if (mt->majortype == MEDIATYPE_Video)
 		memcpy(pInfo->achName, VIDEO_PIN_NAME, sizeof(VIDEO_PIN_NAME));
 	else
 		memcpy(pInfo->achName, AUDIO_PIN_NAME, sizeof(AUDIO_PIN_NAME));
@@ -240,11 +221,10 @@
 	return S_OK;
 }
 
-STDMETHODIMP OutputPin::QueryAccept(const AM_MEDIA_TYPE *pmt)
+STDMETHODIMP OutputPin::QueryAccept(const AM_MEDIA_TYPE *)
 {
 	PrintFunc(L"OutputPin::QueryAccept");
 
-	DSHOW_UNUSED(pmt);
 	return S_OK;
 }
 
@@ -291,63 +271,296 @@
 	return S_OK;
 }
 
-STDMETHODIMP OutputPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop,
-				   double dRate)
+STDMETHODIMP OutputPin::NewSegment(REFERENCE_TIME, REFERENCE_TIME, double)
 {
 	PrintFunc(L"OutputPin::NewSegment");
 
-	DSHOW_UNUSED(tStart);
-	DSHOW_UNUSED(tStop);
-	DSHOW_UNUSED(dRate);
 	return S_OK;
 }
 
-bool OutputPin::IsValidMediaType(const AM_MEDIA_TYPE *pmt) const
+STDMETHODIMP OutputPin::GetFormat(AM_MEDIA_TYPE **ppmt)
 {
-	if (pmt->pbFormat) {
-		if (pmt->subtype != outputInfo.expectedSubType ||
-		    pmt->majortype != outputInfo.expectedMajorType)
-			return false;
+	PrintFunc(L"OutputPin::GetFormat");
+
+	if (!ppmt) {
+		return E_POINTER;
+	}
+
+	*ppmt = mt.Duplicate();
+	return S_OK;
+}
+
+STDMETHODIMP OutputPin::GetNumberOfCapabilities(int *piCount, int *piSize)
+{
+	PrintFunc(L"OutputPin::GetNumberOfCapabilities");
+
+	if (!piCount || !piSize) {
+		return E_POINTER;
+	}
+
+	*piCount = (int)mtList.size();
+	*piSize = sizeof(VIDEO_STREAM_CONFIG_CAPS);
+	return S_OK;
+}
+
+STDMETHODIMP OutputPin::GetStreamCaps(int iIndex, AM_MEDIA_TYPE **ppmt,
+				      BYTE *pSCC)
+{
+	PrintFunc(L"OutputPin::GetStreamCaps");
+
+	int count = (int)mtList.size();
+
+	if (!ppmt || !pSCC) {
+		return E_POINTER;
+	}
+	if (iIndex > (count - 1)) {
+		return S_FALSE;
+	}
+	if (iIndex < 0) {
+		return E_INVALIDARG;
+	}
+
+	AM_MEDIA_TYPE *pmt = mtList[iIndex].Duplicate();
+	VIDEOINFOHEADER *vih = reinterpret_cast<decltype(vih)>(pmt->pbFormat);
+
+	VIDEO_STREAM_CONFIG_CAPS caps = {};
+	caps.guid = FORMAT_VideoInfo;
+	caps.MinFrameInterval = vih->AvgTimePerFrame;
+	caps.MaxFrameInterval = vih->AvgTimePerFrame;
+	caps.MinOutputSize.cx = vih->bmiHeader.biWidth;
+	caps.MinOutputSize.cy = vih->bmiHeader.biHeight;
+	caps.MaxOutputSize = caps.MinOutputSize;
+	caps.InputSize = caps.MinOutputSize;
+	caps.MinCroppingSize = caps.MinOutputSize;
+	caps.MaxCroppingSize = caps.MinOutputSize;
+	caps.CropGranularityX = vih->bmiHeader.biWidth;
+	caps.CropGranularityY = vih->bmiHeader.biHeight;
+	caps.MinBitsPerSecond = vih->dwBitRate;
+	caps.MaxBitsPerSecond = caps.MinBitsPerSecond;
+
+	*ppmt = pmt;
+
+	memcpy(pSCC, &caps, sizeof(caps));
+	return S_OK;
+}
+
+STDMETHODIMP OutputPin::SetFormat(AM_MEDIA_TYPE *pmt)
+{
+	PrintFunc(L"OutputPin::SetFormat");
+
+	mt = pmt;
+
+	GetMediaTypeVFormat(mt, curVFormat);
+
+	VIDEOINFOHEADER *vih = reinterpret_cast<decltype(vih)>(mt->pbFormat);
+	curCX = vih->bmiHeader.biWidth;
+	curCY = vih->bmiHeader.biHeight;
+	curInterval = vih->AvgTimePerFrame;
+
+	return S_OK;
+}
+
+STDMETHODIMP OutputPin::Set(REFGUID, DWORD, void *, DWORD, void *, DWORD)
+{
+	PrintFunc(L"OutputPin::Set");
+	return E_NOTIMPL;
+}
+
+STDMETHODIMP OutputPin::Get(REFGUID guidPropSet, DWORD dwPropID, void *, DWORD,
+			    void *pPropData, DWORD cbPropData,
+			    DWORD *pcbReturned)
+{
+	PrintFunc(L"OutputPin::Get");
+
+	if (guidPropSet != AMPROPSETID_Pin)
+		return E_PROP_SET_UNSUPPORTED;
+	if (dwPropID != AMPROPERTY_PIN_CATEGORY)
+		return E_PROP_ID_UNSUPPORTED;
+	if (pPropData == NULL && pcbReturned == NULL)
+		return E_POINTER;
+
+	if (pcbReturned)
+		*pcbReturned = sizeof(GUID);
+	if (pPropData == NULL)
+		return S_OK;
+	if (cbPropData < sizeof(GUID))
+		return E_UNEXPECTED;
+
+	*(GUID *)pPropData = PIN_CATEGORY_CAPTURE;
+	return S_OK;
+}
+
+STDMETHODIMP OutputPin::QuerySupported(REFGUID guidPropSet, DWORD dwPropID,
+				       DWORD *pTypeSupport)
+{
+	PrintFunc(L"OutputPin::QuerySupported");
+
+	if (guidPropSet != AMPROPSETID_Pin)
+		return E_PROP_SET_UNSUPPORTED;
+	if (dwPropID != AMPROPERTY_PIN_CATEGORY)
+		return E_PROP_ID_UNSUPPORTED;
+	if (pTypeSupport)
+		*pTypeSupport = KSPROPERTY_SUPPORT_GET;
+	return S_OK;
+}
+
+bool OutputPin::AllocateBuffers(IPin *target, bool connecting)
+{
+	HRESULT hr;
+
+	ComQIPtr<IMemInputPin> memInput(target);
+	if (!memInput)
+		return false;
 
-		if (outputInfo.expectedMajorType == MEDIATYPE_Video) {
-			const BITMAPINFOHEADER *bih = GetBitmapInfoHeader(*pmt);
-			if (!bih || bih->biHeight == 0 || bih->biWidth == 0)
-				return false;
+	if (!!allocator) {
+		allocator->Decommit();
+	}
+
+	hr = memInput->GetAllocator(&allocator);
+	if (hr == VFW_E_NO_ALLOCATOR)
+		hr = CoCreateInstance(CLSID_MemoryAllocator, NULL,
+				      CLSCTX_INPROC_SERVER,
+				      __uuidof(IMemAllocator),
+				      (void **)&allocator);
+
+	if (FAILED(hr))
+		return false;
+
+	VIDEOINFOHEADER *vih = reinterpret_cast<decltype(vih)>(mt->pbFormat);
+
+	int cx = vih->bmiHeader.biWidth;
+	int cy = vih->bmiHeader.biHeight;
+
+	/* TODO: Support formats, you know, other than video NV12/YV12 if
+	 * needed */
+	bufSize = cx * cy * 15 / 10;
+
+	ALLOCATOR_PROPERTIES props;
+
+	hr = memInput->GetAllocatorRequirements(&props);
+	if (hr == E_NOTIMPL) {
+		props.cBuffers = 4;
+		props.cbAlign = 32;
+		props.cbPrefix = 0;
+
+	} else if (FAILED(hr)) {
+		return false;
+	}
+
+	props.cbBuffer = (long)bufSize;
+
+	ALLOCATOR_PROPERTIES actual;
+	hr = allocator->SetProperties(&props, &actual);
+	if (FAILED(hr))
+		return false;
+
+	if (!connecting && FAILED(allocator->Commit())) {
+		return false;
+	}
+
+	memInput->NotifyAllocator(allocator, false);
+	return true;
+}
+
+static MediaType CreateMediaType(VideoFormat format, int cx, int cy,
+				 long long interval)
+{
+	MediaType mt;
+
+	WORD bits = VFormatBits(format);
+	DWORD size = cx * cy * bits / 8;
+	uint64_t rate =
+		(uint64_t)size * 10000000ULL / (uint64_t)interval * 8ULL;
+
+	VIDEOINFOHEADER *vih = mt.AllocFormat<VIDEOINFOHEADER>();
+	vih->bmiHeader.biSize = sizeof(vih->bmiHeader);
+	vih->bmiHeader.biWidth = cx;
+	vih->bmiHeader.biHeight = cy;
+	vih->bmiHeader.biPlanes = VFormatPlanes(format);
+	vih->bmiHeader.biBitCount = bits;
+	vih->bmiHeader.biSizeImage = size;
+	vih->bmiHeader.biCompression = VFormatToFourCC(format);
+	vih->rcSource.right = cx;
+	vih->rcSource.bottom = cy;
+	vih->rcTarget = vih->rcSource;
+	vih->dwBitRate = (DWORD)rate;
+	vih->AvgTimePerFrame = interval;
+
+	mt->majortype = MEDIATYPE_Video;
+	mt->subtype = VFormatToSubType(format);
+	mt->formattype = FORMAT_VideoInfo;
+	mt->bFixedSizeSamples = true;
+	mt->lSampleSize = size;
+
+	return mt;
+}
+
+void OutputPin::AddVideoFormat(VideoFormat format, int cx, int cy,
+			       long long interval)
+{
+	MediaType newMT = CreateMediaType(format, cx, cy, interval);
+	mtList.push_back(newMT);
+}
+
+bool OutputPin::SetVideoFormat(VideoFormat format, int cx, int cy,
+			       long long interval)
+{
+	mt = CreateMediaType(format, cx, cy, interval);
+
+	if (curCX != cx || curCY != cy || curInterval != interval ||
+	    curVFormat != format) {
+		curVFormat = format;
+		curCX = cx;
+		curCY = cy;
+		curInterval = interval;
+
+		if (!!connectedPin) {
+			setSampleMediaType = true;
+			return ReallocateBuffers();
 		}
 	}
 
 	return true;
 }
 
-void OutputPin::Send(unsigned char *data[DSHOW_MAX_PLANES],
-		     size_t linesize[DSHOW_MAX_PLANES],
-		     long long timestampStart, long long timestampEnd)
+bool OutputPin::LockSampleData(unsigned char **ptr)
 {
+	if (!connectedPin)
+		return false;
+
 	ComQIPtr<IMemInputPin> memInput(connectedPin);
-	REFERENCE_TIME startTime = timestampStart;
-	REFERENCE_TIME endTime = timestampEnd;
-	ComPtr<IMediaSample> sample;
 	HRESULT hr;
-	BYTE *ptr;
 
 	if (!memInput || !allocator)
-		return;
+		return false;
 
-	hr = allocator->GetBuffer(&sample, &startTime, &endTime, 0);
+	hr = allocator->GetBuffer(&sample, nullptr, nullptr, 0);
 	if (FAILED(hr))
-		return;
+		return false;
 
 	if (FAILED(sample->SetActualDataLength((long)bufSize)))
-		return;
+		return false;
 	if (FAILED(sample->SetDiscontinuity(false)))
-		return;
-	if (FAILED(sample->SetMediaTime(&startTime, &endTime)))
-		return;
+		return false;
 	if (FAILED(sample->SetPreroll(false)))
-		return;
-	if (FAILED(sample->SetTime(&startTime, &endTime)))
-		return;
-	if (FAILED(sample->GetPointer(&ptr)))
+		return false;
+	if (FAILED(sample->GetPointer(ptr)))
+		return false;
+
+	if (setSampleMediaType) {
+		sample->SetMediaType(mt);
+		setSampleMediaType = false;
+	}
+
+	return true;
+}
+
+void OutputPin::Send(unsigned char *data[DSHOW_MAX_PLANES],
+		     size_t linesize[DSHOW_MAX_PLANES],
+		     long long timestampStart, long long timestampEnd)
+{
+	BYTE *ptr;
+	if (!LockSampleData(&ptr))
 		return;
 
 	size_t total = 0;
@@ -359,10 +572,25 @@
 		total += linesize[i];
 	}
 
-	hr = memInput->Receive(sample);
-	if (FAILED(hr)) {
-		DebugHR(L"test", hr);
-	}
+	UnlockSampleData(timestampStart, timestampEnd);
+}
+
+void OutputPin::UnlockSampleData(long long timestampStart,
+				 long long timestampEnd)
+{
+	if (!connectedPin)
+		return;
+
+	ComQIPtr<IMemInputPin> memInput(connectedPin);
+	REFERENCE_TIME startTime = timestampStart;
+	REFERENCE_TIME endTime = timestampEnd;
+
+	sample->SetMediaTime(&startTime, &endTime);
+	sample->SetTime(&startTime, &endTime);
+
+	memInput->Receive(sample);
+
+	sample.Clear();
 }
 
 void OutputPin::Stop()
@@ -416,10 +644,11 @@
 	}
 };
 
-OutputFilter::OutputFilter(const PinOutputInfo &info)
+OutputFilter::OutputFilter(VideoFormat format, int cx, int cy,
+			   long long interval)
 	: refCount(0),
 	  state(State_Stopped),
-	  pin(new OutputPin(this, info)),
+	  pin(new OutputPin(this, format, cx, cy, interval)),
 	  misc(new SourceMiscFlags)
 {
 }
@@ -486,13 +715,16 @@
 
 STDMETHODIMP OutputFilter::SetSyncSource(IReferenceClock *pClock)
 {
-	DSHOW_UNUSED(pClock);
+	clock = pClock;
 	return S_OK;
 }
 
 STDMETHODIMP OutputFilter::GetSyncSource(IReferenceClock **pClock)
 {
-	*pClock = nullptr;
+	*pClock = clock.Get();
+	if (*pClock) {
+		(*pClock)->AddRef();
+	}
 	return NOERROR;
 }
 
@@ -512,6 +744,11 @@
 {
 	PrintFunc(L"OutputFilter::Pause");
 
+	OutputPin *pin = GetPin();
+	if (!!pin->allocator && state == State_Stopped) {
+		pin->allocator->Commit();
+	}
+
 	state = State_Paused;
 	return S_OK;
 }
@@ -548,7 +785,7 @@
 {
 	PrintFunc(L"OutputFilter::QueryFilterInfo");
 
-	memcpy(pInfo->achName, FILTER_NAME, sizeof(FILTER_NAME));
+	StringCbCopyW(pInfo->achName, sizeof(pInfo->achName), FilterName());
 
 	pInfo->pGraph = graph;
 	if (graph) {
@@ -572,6 +809,11 @@
 	return E_NOTIMPL;
 }
 
+const wchar_t *OutputFilter::FilterName() const
+{
+	return FILTER_NAME;
+}
+
 // ============================================================================
 
 OutputEnumPins::OutputEnumPins(OutputFilter *filter_, OutputEnumPins *pEnum)
@@ -688,12 +930,12 @@
 {
 	PrintFunc(L"OutputEnumMediaTypes::Next");
 
+	UINT total = (UINT)pin->mtList.size();
 	UINT nFetched = 0;
 
-	if (curMT == 0 && cMediaTypes > 0) {
-		*ppMediaTypes = pin->outputInfo.mt.Duplicate();
-		nFetched = 1;
-		curMT++;
+	for (ULONG i = 0; i < cMediaTypes && curMT < total; i++) {
+		*(ppMediaTypes++) = pin->mtList[curMT++].Duplicate();
+		nFetched++;
 	}
 
 	if (pcFetched)
@@ -706,7 +948,8 @@
 {
 	PrintFunc(L"OutputEnumMediaTypes::Skip");
 
-	return ((curMT += cMediaTypes) > 1) ? S_FALSE : S_OK;
+	UINT total = (UINT)pin->mtList.size();
+	return ((curMT += cMediaTypes) > total) ? S_FALSE : S_OK;
 }
 
 STDMETHODIMP OutputEnumMediaTypes::Reset()

obs-studio-25.0.8.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.hpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.hpp Changed

@@ -25,32 +25,37 @@
 
 namespace DShow {
 
-struct PinOutputInfo {
-	MediaType mt;
-	GUID expectedMajorType;
-	GUID expectedSubType;
-	int cx;
-	int cy;
-};
-
 class OutputFilter;
 
-class OutputPin : public IPin {
+class OutputPin : public IPin, public IAMStreamConfig, public IKsPropertySet {
 	friend class OutputEnumMediaTypes;
+	friend class OutputFilter;
 
 	volatile long refCount;
 
-	PinOutputInfo outputInfo;
+	std::vector<MediaType> mtList;
+
+	MediaType mt;
+	VideoFormat curVFormat;
+	long long curInterval;
+	int curCX;
+	int curCY;
+	bool setSampleMediaType = false;
+
 	ComPtr<IPin> connectedPin;
 	OutputFilter *filter;
 	volatile bool flushing = false;
 	ComPtr<IMemAllocator> allocator;
+	ComPtr<IMediaSample> sample;
 	size_t bufSize;
 
 	bool IsValidMediaType(const AM_MEDIA_TYPE *pmt) const;
 
+	bool AllocateBuffers(IPin *target, bool connecting = false);
+
 public:
-	OutputPin(OutputFilter *filter, const PinOutputInfo &info);
+	OutputPin(OutputFilter *filter, VideoFormat format, int cx, int cy,
+		  long long interval);
 	virtual ~OutputPin();
 
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
@@ -77,10 +82,50 @@
 	STDMETHODIMP NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop,
 				double dRate);
 
+	// IAMStreamConfig methods
+	STDMETHODIMP GetFormat(AM_MEDIA_TYPE **ppmt) override;
+	STDMETHODIMP GetNumberOfCapabilities(int *piCount,
+					     int *piSize) override;
+	STDMETHODIMP GetStreamCaps(int iIndex, AM_MEDIA_TYPE **ppmt,
+				   BYTE *pSCC) override;
+	STDMETHODIMP SetFormat(AM_MEDIA_TYPE *pmt) override;
+
+	// IKsPropertySet methods
+	STDMETHODIMP Set(REFGUID guidPropSet, DWORD dwID, void *pInstanceData,
+			 DWORD cbInstanceData, void *pPropData,
+			 DWORD cbPropData) override;
+
+	STDMETHODIMP Get(REFGUID guidPropSet, DWORD dwPropID,
+			 void *pInstanceData, DWORD cbInstanceData,
+			 void *pPropData, DWORD cbPropData,
+			 DWORD *pcbReturned) override;
+
+	STDMETHODIMP QuerySupported(REFGUID guidPropSet, DWORD dwPropID,
+				    DWORD *pTypeSupport) override;
+
+	// Other methods
+	inline bool ReallocateBuffers()
+	{
+		return !!connectedPin ? AllocateBuffers(connectedPin) : false;
+	}
+
+	inline VideoFormat GetVideoFormat() const { return curVFormat; }
+	inline int GetCX() const { return curCX; }
+	inline int GetCY() const { return curCY; }
+	inline long long GetInterval() const { return curInterval; }
+
+	void AddVideoFormat(VideoFormat format, int cx, int cy,
+			    long long interval);
+	bool SetVideoFormat(VideoFormat format, int cx, int cy,
+			    long long interval);
+
 	void Send(unsigned char *data[DSHOW_MAX_PLANES],
 		  size_t linesize[DSHOW_MAX_PLANES], long long timestampStart,
 		  long long timestampEnd);
 
+	bool LockSampleData(unsigned char **ptr);
+	void UnlockSampleData(long long timestampStart, long long timestampEnd);
+
 	void Stop();
 };
 
@@ -94,8 +139,11 @@
 
 	ComPtr<IAMFilterMiscFlags> misc;
 
+protected:
+	ComPtr<IReferenceClock> clock;
+
 public:
-	OutputFilter(const PinOutputInfo &info);
+	OutputFilter(VideoFormat format, int cx, int cy, long long interval);
 	virtual ~OutputFilter();
 
 	// IUnknown methods
@@ -121,14 +169,49 @@
 	STDMETHODIMP JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName);
 	STDMETHODIMP QueryVendorInfo(LPWSTR *pVendorInfo);
 
+	virtual const wchar_t *FilterName() const;
+
 	inline OutputPin *GetPin() const { return (OutputPin *)pin; }
 
+	inline bool ReallocateBuffers() { return pin->ReallocateBuffers(); }
+
+	inline VideoFormat GetVideoFormat() const
+	{
+		return pin->GetVideoFormat();
+	}
+
+	inline int GetCX() const { return pin->GetCX(); }
+	inline int GetCY() const { return pin->GetCY(); }
+	inline long long GetInterval() const { return pin->GetInterval(); }
+
+	inline void AddVideoFormat(VideoFormat format, int cx, int cy,
+				   long long interval)
+	{
+		pin->AddVideoFormat(format, cx, cy, interval);
+	}
+	inline bool SetVideoFormat(VideoFormat format, int cx, int cy,
+				   long long interval)
+	{
+		return pin->SetVideoFormat(format, cx, cy, interval);
+	}
+
 	inline void Send(unsigned char *data[DSHOW_MAX_PLANES],
 			 size_t linesize[DSHOW_MAX_PLANES],
 			 long long timestampStart, long long timestampEnd)
 	{
 		pin->Send(data, linesize, timestampStart, timestampEnd);
 	}
+
+	inline bool LockSampleData(unsigned char **ptr)
+	{
+		return pin->LockSampleData(ptr);
+	}
+
+	inline void UnlockSampleData(long long timestampStart,
+				     long long timestampEnd)
+	{
+		pin->UnlockSampleData(timestampStart, timestampEnd);
+	}
 };
 
 class OutputEnumPins : public IEnumPins {

obs-studio-26.0.0.tar.xz/plugins/win-dshow/shared-memory-queue.c Added

@@ -0,0 +1,209 @@
+#include <windows.h>
+#include "shared-memory-queue.h"
+#include "tiny-nv12-scale.h"
+
+#define VIDEO_NAME L"OBSVirtualCamVideo"
+
+enum queue_type {
+	SHARED_QUEUE_TYPE_VIDEO,
+};
+
+struct queue_header {
+	volatile uint32_t write_idx;
+	volatile uint32_t read_idx;
+	volatile uint32_t state;
+
+	uint32_t offsets[3];
+
+	uint32_t type;
+
+	uint32_t cx;
+	uint32_t cy;
+	uint64_t interval;
+
+	uint32_t reserved[8];
+};
+
+struct video_queue {
+	HANDLE handle;
+	bool ready_to_read;
+	struct queue_header *header;
+	uint64_t *ts[3];
+	uint8_t *frame[3];
+	long last_inc;
+	int dup_counter;
+	bool is_writer;
+};
+
+#define ALIGN_SIZE(size, align) size = (((size) + (align - 1)) & (~(align - 1)))
+#define FRAME_HEADER_SIZE 32
+
+video_queue_t *video_queue_create(uint32_t cx, uint32_t cy, uint64_t interval)
+{
+	struct video_queue vq = {0};
+	struct video_queue *pvq;
+	DWORD frame_size = cx * cy * 3 / 2;
+	uint32_t offset_frame[3];
+	DWORD size;
+
+	size = sizeof(struct queue_header);
+
+	ALIGN_SIZE(size, 32);
+
+	offset_frame[0] = size;
+	size += frame_size + FRAME_HEADER_SIZE;
+	ALIGN_SIZE(size, 32);
+
+	offset_frame[1] = size;
+	size += frame_size + FRAME_HEADER_SIZE;
+	ALIGN_SIZE(size, 32);
+
+	offset_frame[2] = size;
+	size += frame_size + FRAME_HEADER_SIZE;
+	ALIGN_SIZE(size, 32);
+
+	struct queue_header header = {0};
+
+	header.state = SHARED_QUEUE_STATE_STARTING;
+	header.cx = cx;
+	header.cy = cy;
+	header.interval = interval;
+	vq.is_writer = true;
+
+	for (size_t i = 0; i < 3; i++) {
+		uint32_t off = offset_frame[i];
+		header.offsets[i] = off;
+	}
+
+	/* fail if already in use */
+	vq.handle = OpenFileMappingW(FILE_MAP_READ, false, VIDEO_NAME);
+	if (vq.handle) {
+		CloseHandle(vq.handle);
+		return NULL;
+	}
+
+	vq.handle = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL,
+				       PAGE_READWRITE, 0, size, VIDEO_NAME);
+	if (!vq.handle) {
+		return NULL;
+	}
+
+	vq.header = (struct queue_header *)MapViewOfFile(
+		vq.handle, FILE_MAP_ALL_ACCESS, 0, 0, 0);
+	memcpy(vq.header, &header, sizeof(header));
+
+	for (size_t i = 0; i < 3; i++) {
+		uint32_t off = offset_frame[i];
+		vq.ts[i] = (uint64_t *)(((uint8_t *)vq.header) + off);
+		vq.frame[i] = ((uint8_t *)vq.header) + off + FRAME_HEADER_SIZE;
+	}
+	pvq = malloc(sizeof(vq));
+	memcpy(pvq, &vq, sizeof(vq));
+	return pvq;
+}
+
+video_queue_t *video_queue_open()
+{
+	struct video_queue vq = {0};
+
+	vq.handle = OpenFileMappingW(FILE_MAP_READ, false, VIDEO_NAME);
+	if (!vq.handle) {
+		return NULL;
+	}
+
+	vq.header = (struct queue_header *)MapViewOfFile(
+		vq.handle, FILE_MAP_READ, 0, 0, 0);
+
+	struct video_queue *pvq = malloc(sizeof(vq));
+	memcpy(pvq, &vq, sizeof(vq));
+	return pvq;
+}
+
+void video_queue_close(video_queue_t *vq)
+{
+	if (!vq) {
+		return;
+	}
+	if (vq->is_writer) {
+		vq->header->state = SHARED_QUEUE_STATE_STOPPING;
+	}
+
+	UnmapViewOfFile(vq->header);
+	CloseHandle(vq->handle);
+	free(vq);
+}
+
+void video_queue_get_info(video_queue_t *vq, uint32_t *cx, uint32_t *cy,
+			  uint64_t *interval)
+{
+	struct queue_header *qh = vq->header;
+	*cx = qh->cx;
+	*cy = qh->cy;
+	*interval = qh->interval;
+}
+
+#define get_idx(inc) ((unsigned long)inc % 3)
+
+void video_queue_write(video_queue_t *vq, uint8_t **data, uint32_t *linesize,
+		       uint64_t timestamp)
+{
+	struct queue_header *qh = vq->header;
+	long inc = ++qh->write_idx;
+
+	unsigned long idx = get_idx(inc);
+	size_t size = linesize[0] * qh->cy;
+
+	*vq->ts[idx] = timestamp;
+	memcpy(vq->frame[idx], data[0], size);
+	memcpy(vq->frame[idx] + size, data[1], size / 2);
+
+	qh->read_idx = inc;
+	qh->state = SHARED_QUEUE_STATE_READY;
+}
+
+enum queue_state video_queue_state(video_queue_t *vq)
+{
+	if (!vq) {
+		return SHARED_QUEUE_STATE_INVALID;
+	}
+
+	enum queue_state state = (enum queue_state)vq->header->state;
+	if (!vq->ready_to_read && state == SHARED_QUEUE_STATE_READY) {
+		for (size_t i = 0; i < 3; i++) {
+			size_t off = vq->header->offsets[i];
+			vq->ts[i] = (uint64_t *)(((uint8_t *)vq->header) + off);
+			vq->frame[i] = ((uint8_t *)vq->header) + off +
+				       FRAME_HEADER_SIZE;
+		}
+		vq->ready_to_read = true;
+	}
+
+	return state;
+}
+
+bool video_queue_read(video_queue_t *vq, nv12_scale_t *scale, void *dst,
+		      uint64_t *ts)
+{
+	struct queue_header *qh = vq->header;
+	long inc = qh->read_idx;
+
+	if (qh->state == SHARED_QUEUE_STATE_STOPPING) {
+		return false;
+	}
+
+	if (inc == vq->last_inc) {
+		if (++vq->dup_counter == 10) {
+			return false;
+		}
+	} else {
+		vq->dup_counter = 0;
+		vq->last_inc = inc;
+	}
+
+	unsigned long idx = get_idx(inc);
+
+	*ts = *vq->ts[idx];
+
+	nv12_do_scale(scale, dst, vq->frame[idx]);
+	return true;
+}

obs-studio-26.0.0.tar.xz/plugins/win-dshow/shared-memory-queue.h Added

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct video_queue;
+struct nv12_scale;
+typedef struct video_queue video_queue_t;
+typedef struct nv12_scale nv12_scale_t;
+
+enum queue_state {
+	SHARED_QUEUE_STATE_INVALID,
+	SHARED_QUEUE_STATE_STARTING,
+	SHARED_QUEUE_STATE_READY,
+	SHARED_QUEUE_STATE_STOPPING,
+};
+
+extern video_queue_t *video_queue_create(uint32_t cx, uint32_t cy,
+					 uint64_t interval);
+extern video_queue_t *video_queue_open();
+extern void video_queue_close(video_queue_t *vq);
+
+extern void video_queue_get_info(video_queue_t *vq, uint32_t *cx, uint32_t *cy,
+				 uint64_t *interval);
+extern void video_queue_write(video_queue_t *vq, uint8_t **data,
+			      uint32_t *linesize, uint64_t timestamp);
+extern enum queue_state video_queue_state(video_queue_t *vq);
+extern bool video_queue_read(video_queue_t *vq, nv12_scale_t *scale, void *dst,
+			     uint64_t *ts);
+
+#ifdef __cplusplus
+}
+#endif

obs-studio-26.0.0.tar.xz/plugins/win-dshow/tiny-nv12-scale.c Added

@@ -0,0 +1,134 @@
+#include <string.h>
+#include "tiny-nv12-scale.h"
+
+/* TODO: optimize this stuff later, or replace with something better.  it's
+ * kind of garbage.  although normally it shouldn't be called that often.  plus
+ * it's nearest neighbor so not really a huge deal.  at the very least it
+ * should be sse2 at some point. */
+
+void nv12_scale_init(nv12_scale_t *s, bool convert_to_i420, int dst_cx,
+		     int dst_cy, int src_cx, int src_cy)
+{
+	s->convert_to_i420 = convert_to_i420;
+
+	s->src_cx = src_cx;
+	s->src_cy = src_cy;
+
+	s->dst_cx = dst_cx;
+	s->dst_cy = dst_cy;
+}
+
+static void nv12_scale_nearest(nv12_scale_t *s, uint8_t *dst_start,
+			       const uint8_t *src)
+{
+	register uint8_t *dst = dst_start;
+	const int src_cx = s->src_cx;
+	const int src_cy = s->src_cy;
+	const int dst_cx = s->dst_cx;
+	const int dst_cy = s->dst_cy;
+
+	/* lum */
+	for (int y = 0; y < dst_cy; y++) {
+		const int src_line = y * src_cy / dst_cy * s->src_cx;
+
+		for (int x = 0; x < dst_cx; x++) {
+			const int src_x = x * src_cx / dst_cx;
+
+			*(dst++) = src[src_line + src_x];
+		}
+	}
+
+	src += src_cx * src_cy;
+
+	/* uv */
+	const int dst_cx_d2 = dst_cx / 2;
+	const int dst_cy_d2 = dst_cy / 2;
+
+	for (int y = 0; y < dst_cy_d2; y++) {
+		const int src_line = y * src_cy / dst_cy * src_cx;
+
+		for (int x = 0; x < dst_cx_d2; x++) {
+			const int src_x = x * src_cx / dst_cx * 2;
+			const int pos = src_line + src_x;
+
+			*(dst++) = src[pos];
+			*(dst++) = src[pos + 1];
+		}
+	}
+}
+
+static void nv12_scale_nearest_to_i420(nv12_scale_t *s, uint8_t *dst_start,
+				       const uint8_t *src)
+{
+	register uint8_t *dst = dst_start;
+	const int src_cx = s->src_cx;
+	const int src_cy = s->src_cy;
+	const int dst_cx = s->dst_cx;
+	const int dst_cy = s->dst_cy;
+	const int size = src_cx * src_cy;
+
+	/* lum */
+	for (int y = 0; y < dst_cy; y++) {
+		const int src_line = y * src_cy / dst_cy * s->src_cx;
+
+		for (int x = 0; x < dst_cx; x++) {
+			const int src_x = x * src_cx / dst_cx;
+
+			*(dst++) = src[src_line + src_x];
+		}
+	}
+
+	src += size;
+
+	/* uv */
+	const int dst_cx_d2 = dst_cx / 2;
+	const int dst_cy_d2 = dst_cy / 2;
+
+	register uint8_t *dst2 = dst + dst_cx * dst_cy / 4;
+
+	for (int y = 0; y < dst_cy_d2; y++) {
+		const int src_line = y * src_cy / dst_cy * src_cx;
+
+		for (int x = 0; x < dst_cx_d2; x++) {
+			const int src_x = x * src_cx / dst_cx * 2;
+			const int pos = src_line + src_x;
+
+			*(dst++) = src[pos];
+			*(dst2++) = src[pos + 1];
+		}
+	}
+}
+
+static void nv12_convert_to_i420(nv12_scale_t *s, uint8_t *dst_start,
+				 const uint8_t *src_start)
+{
+	const int size = s->src_cx * s->src_cy;
+	const int size_d4 = size / 4;
+
+	memcpy(dst_start, src_start, size);
+
+	register uint8_t *dst1 = dst_start + size;
+	register uint8_t *dst2 = dst1 + size_d4;
+	register uint8_t *dst_end = dst2 + size_d4;
+	register const uint8_t *src = src_start + size;
+
+	while (dst2 < dst_end) {
+		*(dst1++) = *(src++);
+		*(dst2++) = *(src++);
+	}
+}
+
+void nv12_do_scale(nv12_scale_t *s, uint8_t *dst, const uint8_t *src)
+{
+	if (s->src_cx == s->dst_cx && s->src_cy == s->dst_cy) {
+		if (s->convert_to_i420)
+			nv12_convert_to_i420(s, dst, src);
+		else
+			memcpy(dst, src, s->src_cx * s->src_cy * 3 / 2);
+	} else {
+		if (s->convert_to_i420)
+			nv12_scale_nearest_to_i420(s, dst, src);
+		else
+			nv12_scale_nearest(s, dst, src);
+	}
+}

obs-studio-26.0.0.tar.xz/plugins/win-dshow/tiny-nv12-scale.h Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-guid.h.in Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-install.bat.in Added

@@ -0,0 +1,79 @@
+@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
+	)
+
+:checkDLL
+	echo Checking for 32-bit Virtual Cam registration...
+	reg query "HKLM\SOFTWARE\Classes\WOW6432Node\CLSID\{@VIRTUALCAM_GUID@}" >nul 2>&1
+	if %errorLevel% == 0 (
+		echo 32-bit Virtual Cam found, skipping install...
+		echo.
+	) else (
+		echo 32-bit Virtual Cam not found, installing...
+		goto install32DLL
+	)
+
+:CheckDLLContinue
+	echo Checking for 64-bit Virtual Cam registration...
+	reg query "HKLM\SOFTWARE\Classes\CLSID\{@VIRTUALCAM_GUID@}" >nul 2>&1
+	if %errorLevel% == 0 (
+		echo 64-bit Virtual Cam found, skipping install...
+		echo.
+	) else (
+		echo 64-bit Virtual Cam not found, installing...
+		goto install64DLL
+	)
+	goto endSuccess
+
+:install32DLL
+	echo Installing 32-bit Virtual Cam...
+	if exist "%~dp0\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll" (
+		regsvr32.exe /i /s "%~dp0\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll"
+	) else (
+		regsvr32.exe /i /s obs-virtualcam-module32.dll
+	)
+	reg query "HKLM\SOFTWARE\Classes\WOW6432Node\CLSID\{@VIRTUALCAM_GUID@}" >nul 2>&1
+	if %errorLevel% == 0 (
+		echo 32-bit Virtual Cam successfully installed
+		echo.
+	) else (
+		echo 32-bit Virtual Cam installation failed
+		echo.
+		goto end
+	)
+	goto checkDLLContinue
+
+:install64DLL
+	echo Installing 64-bit Virtual Cam...
+	if exist "%~dp0\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll" (
+		regsvr32.exe /i /s "%~dp0\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll"
+	) else (
+		regsvr32.exe /i /s obs-virtualcam-module64.dll
+	)
+	reg query "HKLM\SOFTWARE\Classes\CLSID\{@VIRTUALCAM_GUID@}" >nul 2>&1
+	if %errorLevel% == 0 (
+		echo 64-bit Virtual Cam successfully installed
+		echo.
+		goto endSuccess
+	) else (
+		echo 64-bit Virtual Cam installation failed
+		echo.
+		goto end
+	)
+
+:endSuccess
+	echo Virtual Cam installed!
+	echo.
+
+:end
+	pause
+	exit

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/CMakeLists.txt Added

@@ -0,0 +1,84 @@
+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()
+
+configure_file(
+	"${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-module.def.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def")
+
+set(MODULE_DESCRIPTION "OBS Virtual Camera output module")
+configure_file(${CMAKE_SOURCE_DIR}/cmake/winrc/obs-module.rc.in virtualcam-module.rc)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
+
+set(libdshowcapture_SOURCES
+	../libdshowcapture/source/log.cpp
+	../libdshowcapture/source/dshow-base.cpp
+	../libdshowcapture/source/dshow-enum.cpp
+	../libdshowcapture/source/dshow-formats.cpp
+	../libdshowcapture/source/dshow-media-type.cpp
+	../libdshowcapture/source/output-filter.cpp
+	)
+
+set(libdshowcapture_HEADERS
+	../libdshowcapture/source/ComPtr.hpp
+	../libdshowcapture/source/CoTaskMemPtr.hpp
+	../libdshowcapture/source/log.hpp
+	../libdshowcapture/source/dshow-base.hpp
+	../libdshowcapture/source/dshow-enum.hpp
+	../libdshowcapture/source/dshow-formats.hpp
+	../libdshowcapture/source/dshow-media-type.hpp
+	../libdshowcapture/source/output-filter.hpp
+	../libdshowcapture/dshowcapture.hpp
+	)
+
+set(obs-virtualcam-module_SOURCES
+	"${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def"
+	sleepto.c
+	placeholder.cpp
+	virtualcam-module.cpp
+	virtualcam-filter.cpp
+	virtualcam-module.rc
+	../shared-memory-queue.c
+	../tiny-nv12-scale.c
+	)
+
+set(obs-virtualcam-module_HEADERS
+	sleepto.h
+	virtualcam-filter.hpp
+	../shared-memory-queue.h
+	../tiny-nv12-scale.h
+	)
+
+if(MSVC)
+	add_compile_options("$<IF:$<CONFIG:Debug>,/MTd,/MT>")
+endif()
+
+include_directories(${CMAKE_SOURCE_DIR}/libobs/util)
+
+source_group("libdshowcapture\\Source Files" FILES ${libdshowcapture_SOURCES})
+source_group("libdshowcapture\\Header Files" FILES ${libdshowcapture_HEADERS})
+
+set(CMAKE_MODULE_LINKER_FLAGS "${MAKE_MODULE_LINKER_FLAGS} /ignore:4104")
+
+add_library(obs-virtualcam-module MODULE
+	${libdshowcapture_SOURCES}
+	${libdshowcapture_HEADERS}
+	${obs-virtualcam-module_SOURCES}
+	${obs-virtualcam-module_HEADERS})
+target_link_libraries(obs-virtualcam-module
+	winmm
+	strmiids
+	gdiplus
+	)
+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}")
+install_obs_datatarget(obs-virtualcam-module "obs-plugins/win-dshow")

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/placeholder.cpp Added

@@ -0,0 +1,146 @@
+#include <windows.h>
+#include <strsafe.h>
+#include <gdiplus.h>
+#include <stdint.h>
+#include <vector>
+
+using namespace Gdiplus;
+
+extern HINSTANCE dll_inst;
+static std::vector<uint8_t> placeholder;
+
+/* XXX: optimize this later.  or don't, it's only called once. */
+
+static void convert_placeholder(const uint8_t *rgb_in, int width, int height)
+{
+	size_t size = width * height * 3;
+	size_t linesize = width * 3;
+
+	std::vector<uint8_t> yuv_out;
+	yuv_out.resize(size);
+
+	const uint8_t *in = rgb_in;
+	const uint8_t *end = in + size;
+	uint8_t *out = &yuv_out[0];
+
+	while (in < end) {
+		const int16_t b = *(in++);
+		const int16_t g = *(in++);
+		const int16_t r = *(in++);
+
+		*(out++) = (uint8_t)(((66 * r + 129 * g + 25 * b + 128) >> 8) +
+				     16);
+		*(out++) = (uint8_t)(((-38 * r - 74 * g + 112 * b + 128) >> 8) +
+				     128);
+		*(out++) = (uint8_t)(((112 * r - 94 * g - 18 * b + 128) >> 8) +
+				     128);
+	}
+
+	placeholder.resize(width * height * 3 / 2);
+
+	in = &yuv_out[0];
+	end = in + size;
+
+	out = &placeholder[0];
+	uint8_t *chroma = out + width * height;
+
+	while (in < end) {
+		const uint8_t *in2 = in + linesize;
+		const uint8_t *end2 = in2;
+		uint8_t *out2 = out + width;
+
+		while (in < end2) {
+			int16_t u;
+			int16_t v;
+
+			*(out++) = *(in++);
+			u = *(in++);
+			v = *(in++);
+
+			*(out++) = *(in++);
+			u += *(in++);
+			v += *(in++);
+
+			*(out2++) = *(in2++);
+			u += *(in2++);
+			v += *(in2++);
+
+			*(out2++) = *(in2++);
+			u += *(in2++);
+			v += *(in2++);
+
+			*(chroma++) = (uint8_t)(u / 4);
+			*(chroma++) = (uint8_t)(v / 4);
+		}
+
+		in = in2;
+		out = out2;
+	}
+}
+
+static bool load_placeholder_internal()
+{
+	Status s;
+
+	wchar_t file[MAX_PATH];
+	if (!GetModuleFileNameW(dll_inst, file, MAX_PATH)) {
+		return false;
+	}
+
+	wchar_t *slash = wcsrchr(file, '\\');
+	if (!slash) {
+		return false;
+	}
+
+	slash[1] = 0;
+
+	StringCbCat(file, sizeof(file), L"placeholder.png");
+
+	Bitmap bmp(file);
+	if (bmp.GetLastStatus() != Status::Ok) {
+		return false;
+	}
+
+	BitmapData bmd = {};
+	Rect r(0, 0, bmp.GetWidth(), bmp.GetHeight());
+
+	s = bmp.LockBits(&r, ImageLockModeRead, PixelFormat24bppRGB, &bmd);
+	if (s != Status::Ok) {
+		return false;
+	}
+
+	convert_placeholder((const uint8_t *)bmd.Scan0, bmp.GetWidth(),
+			    bmp.GetHeight());
+
+	bmp.UnlockBits(&bmd);
+	return true;
+}
+
+static bool load_placeholder()
+{
+	GdiplusStartupInput si;
+	ULONG_PTR token;
+	GdiplusStartup(&token, &si, nullptr);
+
+	bool success = load_placeholder_internal();
+
+	GdiplusShutdown(token);
+	return success;
+}
+
+const uint8_t *get_placeholder()
+{
+	static bool failed = false;
+	static bool initialized = false;
+
+	if (initialized) {
+		return placeholder.data();
+	} else if (failed) {
+		return nullptr;
+	}
+
+	initialized = load_placeholder();
+	failed = !initialized;
+
+	return initialized ? placeholder.data() : nullptr;
+}

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/sleepto.c Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/sleepto.h Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp Added

@@ -0,0 +1,241 @@
+#include "virtualcam-filter.hpp"
+#include "sleepto.h"
+
+#include <shlobj_core.h>
+#include <strsafe.h>
+#include <inttypes.h>
+
+using namespace DShow;
+
+extern const uint8_t *get_placeholder();
+
+/* ========================================================================= */
+
+VCamFilter::VCamFilter()
+	: OutputFilter(VideoFormat::NV12, DEFAULT_CX, DEFAULT_CY,
+		       DEFAULT_INTERVAL)
+{
+	thread_start = CreateEvent(nullptr, true, false, nullptr);
+	thread_stop = CreateEvent(nullptr, true, false, nullptr);
+
+	AddVideoFormat(VideoFormat::I420, DEFAULT_CX, DEFAULT_CY,
+		       DEFAULT_INTERVAL);
+
+	/* ---------------------------------------- */
+	/* load placeholder image                   */
+
+	placeholder = get_placeholder();
+
+	/* ---------------------------------------- */
+	/* detect if this filter is within obs      */
+
+	wchar_t file[MAX_PATH];
+	if (!GetModuleFileNameW(nullptr, file, MAX_PATH)) {
+		file[0] = 0;
+	}
+
+#ifdef _WIN64
+	const wchar_t *obs_process = L"obs64.exe";
+#else
+	const wchar_t *obs_process = L"obs32.exe";
+#endif
+
+	in_obs = !!wcsstr(file, obs_process);
+
+	/* ---------------------------------------- */
+	/* add last/current obs res/interval        */
+
+	uint32_t new_cx = cx;
+	uint32_t new_cy = cy;
+	uint64_t new_interval = interval;
+
+	vq = video_queue_open();
+	if (vq) {
+		if (video_queue_state(vq) == SHARED_QUEUE_STATE_READY) {
+			video_queue_get_info(vq, &new_cx, &new_cy,
+					     &new_interval);
+		}
+
+		/* don't keep it open until the filter actually starts */
+		video_queue_close(vq);
+		vq = nullptr;
+	} else {
+		wchar_t res_file[MAX_PATH];
+		SHGetFolderPathW(nullptr, CSIDL_APPDATA, nullptr,
+				 SHGFP_TYPE_CURRENT, res_file);
+		StringCbCat(res_file, sizeof(res_file),
+			    L"\\obs-virtualcam.txt");
+
+		HANDLE file = CreateFileW(res_file, GENERIC_READ, 0, nullptr,
+					  OPEN_EXISTING, 0, nullptr);
+		if (file) {
+			char res[128];
+			DWORD len = 0;
+
+			ReadFile(file, res, sizeof(res), &len, nullptr);
+			CloseHandle(file);
+
+			res[len] = 0;
+			int vals = sscanf(res,
+					  "%" PRIu32 "x%" PRIu32 "x%" PRIu64,
+					  &new_cx, &new_cy, &new_interval);
+			if (vals != 3) {
+				new_cx = cx;
+				new_cy = cy;
+				new_interval = interval;
+			}
+		}
+	}
+
+	if (new_cx != cx || new_cy != cy || new_interval != interval) {
+		AddVideoFormat(VideoFormat::NV12, new_cx, new_cy, new_interval);
+		AddVideoFormat(VideoFormat::I420, new_cx, new_cy, new_interval);
+		SetVideoFormat(VideoFormat::NV12, new_cx, new_cy, new_interval);
+		cx = new_cx;
+		cy = new_cy;
+		interval = new_interval;
+	}
+
+	nv12_scale_init(&scaler, false, cx, cy, cx, cy);
+
+	/* ---------------------------------------- */
+
+	th = std::thread([this] { Thread(); });
+
+	AddRef();
+}
+
+VCamFilter::~VCamFilter()
+{
+	SetEvent(thread_stop);
+	th.join();
+	video_queue_close(vq);
+}
+
+const wchar_t *VCamFilter::FilterName() const
+{
+	return L"VCamFilter";
+}
+
+STDMETHODIMP VCamFilter::Pause()
+{
+	HRESULT hr;
+
+	hr = OutputFilter::Pause();
+	if (FAILED(hr)) {
+		return hr;
+	}
+
+	SetEvent(thread_start);
+	return S_OK;
+}
+
+inline uint64_t VCamFilter::GetTime()
+{
+	if (!!clock) {
+		REFERENCE_TIME rt;
+		HRESULT hr = clock->GetTime(&rt);
+		if (SUCCEEDED(hr)) {
+			return (uint64_t)rt;
+		}
+	}
+
+	return gettime_100ns();
+}
+
+void VCamFilter::Thread()
+{
+	HANDLE h[2] = {thread_start, thread_stop};
+	DWORD ret = WaitForMultipleObjects(2, h, false, INFINITE);
+	if (ret != WAIT_OBJECT_0)
+		return;
+
+	uint64_t cur_time = gettime_100ns();
+	uint64_t filter_time = GetTime();
+
+	cx = GetCX();
+	cy = GetCY();
+	interval = GetInterval();
+
+	nv12_scale_init(&scaler, false, GetCX(), GetCY(), cx, cy);
+
+	while (!stopped()) {
+		Frame(filter_time);
+		sleepto_100ns(cur_time += interval);
+		filter_time += interval;
+	}
+}
+
+void VCamFilter::Frame(uint64_t ts)
+{
+	uint32_t new_cx = cx;
+	uint32_t new_cy = cy;
+	uint64_t new_interval = interval;
+
+	if (!vq) {
+		vq = video_queue_open();
+	}
+
+	enum queue_state state = video_queue_state(vq);
+	if (state != prev_state) {
+		if (state == SHARED_QUEUE_STATE_READY) {
+			video_queue_get_info(vq, &new_cx, &new_cy,
+					     &new_interval);
+		} else if (state == SHARED_QUEUE_STATE_STOPPING) {
+			video_queue_close(vq);
+			vq = nullptr;
+		}
+
+		prev_state = state;
+	}
+
+	if (state != SHARED_QUEUE_STATE_READY) {
+		new_cx = DEFAULT_CX;
+		new_cy = DEFAULT_CY;
+		new_interval = DEFAULT_INTERVAL;
+	}
+
+	if (new_cx != cx || new_cy != cy || new_interval != interval) {
+		if (in_obs) {
+			SetVideoFormat(GetVideoFormat(), new_cx, new_cy,
+				       new_interval);
+		}
+
+		nv12_scale_init(&scaler, false, GetCX(), GetCY(), new_cx,
+				new_cy);
+
+		cx = new_cx;
+		cy = new_cy;
+		interval = new_interval;
+	}
+
+	scaler.convert_to_i420 = GetVideoFormat() == VideoFormat::I420;
+
+	uint8_t *ptr;
+	if (LockSampleData(&ptr)) {
+		if (state == SHARED_QUEUE_STATE_READY)
+			ShowOBSFrame(ptr);
+		else
+			ShowDefaultFrame(ptr);
+
+		UnlockSampleData(ts, ts + interval);
+	}
+}
+
+void VCamFilter::ShowOBSFrame(uint8_t *ptr)
+{
+	uint64_t temp;
+	if (!video_queue_read(vq, &scaler, ptr, &temp)) {
+		video_queue_close(vq);
+		vq = nullptr;
+	}
+}
+
+void VCamFilter::ShowDefaultFrame(uint8_t *ptr)
+{
+	if (placeholder) {
+		nv12_do_scale(&scaler, ptr, placeholder);
+	} else {
+		memset(ptr, 127, GetCX() * GetCY() * 3 / 2);
+	}
+}

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-filter.hpp Added

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <windows.h>
+#include <cstdint>
+#include <thread>
+#include "../shared-memory-queue.h"
+#include "../tiny-nv12-scale.h"
+#include "../libdshowcapture/source/output-filter.hpp"
+#include "../../../libobs/util/windows/WinHandle.hpp"
+
+#define DEFAULT_CX 1920
+#define DEFAULT_CY 1080
+#define DEFAULT_INTERVAL 333333ULL
+
+class VCamFilter : public DShow::OutputFilter {
+	std::thread th;
+
+	video_queue_t *vq = nullptr;
+	int queue_mode = 0;
+	bool in_obs = false;
+	enum queue_state prev_state = SHARED_QUEUE_STATE_INVALID;
+	const uint8_t *placeholder;
+	uint32_t cx = DEFAULT_CX;
+	uint32_t cy = DEFAULT_CY;
+	uint64_t interval = DEFAULT_INTERVAL;
+	WinHandle thread_start;
+	WinHandle thread_stop;
+
+	nv12_scale_t scaler = {};
+
+	inline bool stopped() const
+	{
+		return WaitForSingleObject(thread_stop, 0) != WAIT_TIMEOUT;
+	}
+
+	inline uint64_t GetTime();
+
+	void Thread();
+	void Frame(uint64_t ts);
+	void ShowOBSFrame(uint8_t *ptr);
+	void ShowDefaultFrame(uint8_t *ptr);
+
+protected:
+	const wchar_t *FilterName() const override;
+
+public:
+	VCamFilter();
+	~VCamFilter() override;
+
+	STDMETHODIMP Pause() override;
+};

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-module.cpp Added

@@ -0,0 +1,298 @@
+#include "virtualcam-filter.hpp"
+#include "virtualcam-guid.h"
+
+/* ========================================================================= */
+
+static const REGPINTYPES AMSMediaTypesV = {&MEDIATYPE_Video,
+					   &MEDIASUBTYPE_NV12};
+
+static const REGFILTERPINS AMSPinVideo = {L"Output", false, true,
+					  false,     false, &CLSID_NULL,
+					  nullptr,   1,     &AMSMediaTypesV};
+
+HINSTANCE dll_inst = nullptr;
+static volatile long locks = 0;
+
+/* ========================================================================= */
+
+class VCamFactory : public IClassFactory {
+	volatile long refs = 1;
+	CLSID cls;
+
+public:
+	inline VCamFactory(CLSID cls_) : cls(cls_) {}
+
+	// IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, void **p_ptr);
+	STDMETHODIMP_(ULONG) AddRef();
+	STDMETHODIMP_(ULONG) Release();
+
+	// IClassFactory
+	STDMETHODIMP CreateInstance(LPUNKNOWN parent, REFIID riid,
+				    void **p_ptr);
+	STDMETHODIMP LockServer(BOOL lock);
+};
+
+STDMETHODIMP VCamFactory::QueryInterface(REFIID riid, void **p_ptr)
+{
+	if (!p_ptr) {
+		return E_POINTER;
+	}
+
+	if ((riid == IID_IUnknown) || (riid == IID_IClassFactory)) {
+		AddRef();
+		*p_ptr = (void *)this;
+		return S_OK;
+	} else {
+		*p_ptr = nullptr;
+		return E_NOINTERFACE;
+	}
+}
+
+STDMETHODIMP_(ULONG) VCamFactory::AddRef()
+{
+	return InterlockedIncrement(&refs);
+}
+
+STDMETHODIMP_(ULONG) VCamFactory::Release()
+{
+	long new_refs = InterlockedDecrement(&refs);
+	if (new_refs == 0) {
+		delete this;
+		return 0;
+	}
+
+	return (ULONG)new_refs;
+}
+
+STDMETHODIMP VCamFactory::CreateInstance(LPUNKNOWN parent, REFIID, void **p_ptr)
+{
+	if (!p_ptr) {
+		return E_POINTER;
+	}
+
+	*p_ptr = nullptr;
+
+	/* don't bother supporting the "parent" functionality */
+	if (parent) {
+		return E_NOINTERFACE;
+	}
+
+	if (IsEqualCLSID(cls, CLSID_OBS_VirtualVideo)) {
+		*p_ptr = (void *)new VCamFilter();
+		return S_OK;
+	}
+
+	return E_NOINTERFACE;
+}
+
+STDMETHODIMP VCamFactory::LockServer(BOOL lock)
+{
+	if (lock) {
+		InterlockedIncrement(&locks);
+	} else {
+		InterlockedDecrement(&locks);
+	}
+
+	return S_OK;
+}
+
+/* ========================================================================= */
+
+static inline DWORD string_size(const wchar_t *str)
+{
+	return (DWORD)(wcslen(str) + 1) * sizeof(wchar_t);
+}
+
+static bool RegServer(const CLSID &cls, const wchar_t *desc,
+		      const wchar_t *file, const wchar_t *model = L"Both",
+		      const wchar_t *type = L"InprocServer32")
+{
+	wchar_t cls_str[CHARS_IN_GUID];
+	wchar_t temp[MAX_PATH];
+	HKEY key = nullptr;
+	HKEY subkey = nullptr;
+	bool success = false;
+
+	StringFromGUID2(cls, cls_str, CHARS_IN_GUID);
+
+	StringCbPrintf(temp, sizeof(temp), L"CLSID\\%s", cls_str);
+
+	if (RegCreateKey(HKEY_CLASSES_ROOT, temp, &key) != ERROR_SUCCESS) {
+		goto fail;
+	}
+
+	RegSetValueW(key, nullptr, REG_SZ, desc, string_size(desc));
+
+	if (RegCreateKey(key, type, &subkey) != ERROR_SUCCESS) {
+		goto fail;
+	}
+
+	RegSetValueW(subkey, nullptr, REG_SZ, file, string_size(file));
+	RegSetValueExW(subkey, L"ThreadingModel", 0, REG_SZ,
+		       (const BYTE *)model, string_size(model));
+
+	success = true;
+
+fail:
+	if (key) {
+		RegCloseKey(key);
+	}
+	if (key) {
+		RegCloseKey(subkey);
+	}
+
+	return success;
+}
+
+static bool UnregServer(const CLSID &cls)
+{
+	wchar_t cls_str[CHARS_IN_GUID];
+	wchar_t temp[MAX_PATH];
+
+	StringFromGUID2(cls, cls_str, CHARS_IN_GUID);
+	StringCbPrintf(temp, sizeof(temp), L"CLSID\\%s", cls_str);
+
+	return RegDeleteTreeW(HKEY_CLASSES_ROOT, temp) == ERROR_SUCCESS;
+}
+
+static bool RegServers(bool reg)
+{
+	wchar_t file[MAX_PATH];
+
+	if (!GetModuleFileNameW(dll_inst, file, MAX_PATH)) {
+		return false;
+	}
+
+	if (reg) {
+		return RegServer(CLSID_OBS_VirtualVideo, L"OBS Virtual Camera",
+				 file);
+	} else {
+		return UnregServer(CLSID_OBS_VirtualVideo);
+	}
+}
+
+static bool RegFilters(bool reg)
+{
+	ComPtr<IFilterMapper2> fm;
+	HRESULT hr;
+
+	hr = CoCreateInstance(CLSID_FilterMapper2, nullptr,
+			      CLSCTX_INPROC_SERVER, IID_IFilterMapper2,
+			      (void **)&fm);
+	if (FAILED(hr)) {
+		return false;
+	}
+
+	if (reg) {
+		ComPtr<IMoniker> moniker;
+		REGFILTER2 rf2;
+		rf2.dwVersion = 1;
+		rf2.dwMerit = MERIT_DO_NOT_USE;
+		rf2.cPins = 1;
+		rf2.rgPins = &AMSPinVideo;
+
+		hr = fm->RegisterFilter(CLSID_OBS_VirtualVideo,
+					L"OBS Virtual Camera", &moniker,
+					&CLSID_VideoInputDeviceCategory,
+					nullptr, &rf2);
+		if (FAILED(hr)) {
+			return false;
+		}
+	} else {
+		hr = fm->UnregisterFilter(&CLSID_VideoInputDeviceCategory, 0,
+					  CLSID_OBS_VirtualVideo);
+		if (FAILED(hr)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+/* ========================================================================= */
+
+STDAPI DllRegisterServer()
+{
+	if (!RegServers(true)) {
+		RegServers(false);
+		return E_FAIL;
+	}
+
+	CoInitialize(0);
+
+	if (!RegFilters(true)) {
+		RegFilters(false);
+		RegServers(false);
+		CoUninitialize();
+		return E_FAIL;
+	}
+
+	CoUninitialize();
+	return S_OK;
+}
+
+STDAPI DllUnregisterServer()
+{
+	CoInitialize(0);
+	RegFilters(false);
+	RegServers(false);
+	CoUninitialize();
+	return S_OK;
+}
+
+STDAPI DllInstall(BOOL install, LPCWSTR)
+{
+	if (!install) {
+		return DllUnregisterServer();
+	} else {
+		return DllRegisterServer();
+	}
+}
+
+STDAPI DllCanUnloadNow()
+{
+	return InterlockedOr(&locks, 0) == 0 ? S_OK : S_FALSE;
+}
+
+STDAPI DllGetClassObject(REFCLSID cls, REFIID riid, void **p_ptr)
+{
+	if (!p_ptr) {
+		return E_POINTER;
+	}
+
+	*p_ptr = nullptr;
+
+	if (riid != IID_IClassFactory && riid != IID_IUnknown) {
+		return E_NOINTERFACE;
+	}
+	if (!IsEqualCLSID(cls, CLSID_OBS_VirtualVideo)) {
+		return E_INVALIDARG;
+	}
+
+	*p_ptr = (void *)new VCamFactory(cls);
+	return S_OK;
+}
+
+//#define ENABLE_LOGGING
+
+#ifdef ENABLE_LOGGING
+void logcallback(DShow::LogType, const wchar_t *msg, void *)
+{
+	OutputDebugStringW(msg);
+	OutputDebugStringW(L"\n");
+}
+#endif
+
+BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID)
+{
+	if (reason == DLL_PROCESS_ATTACH) {
+		DisableThreadLibraryCalls(inst);
+#ifdef ENABLE_LOGGING
+		DShow::SetLogCallback(logcallback, nullptr);
+#endif
+		dll_inst = inst;
+	}
+
+	return true;
+}

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-module.def.in Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam-uninstall.bat.in Added

obs-studio-26.0.0.tar.xz/plugins/win-dshow/virtualcam.c Added

@@ -0,0 +1,102 @@
+#include <obs-module.h>
+#include <util/platform.h>
+#include "shared-memory-queue.h"
+
+struct virtualcam_data {
+	obs_output_t *output;
+	video_queue_t *vq;
+};
+
+static const char *virtualcam_name(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+	return "Virtual Camera Output";
+}
+
+static void virtualcam_destroy(void *data)
+{
+	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
+	video_queue_close(vcam->vq);
+	bfree(data);
+}
+
+static void *virtualcam_create(obs_data_t *settings, obs_output_t *output)
+{
+	struct virtualcam_data *vcam =
+		(struct virtualcam_data *)bzalloc(sizeof(*vcam));
+	vcam->output = output;
+
+	UNUSED_PARAMETER(settings);
+	return vcam;
+}
+
+static bool virtualcam_start(void *data)
+{
+	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
+	uint32_t width = obs_output_get_width(vcam->output);
+	uint32_t height = obs_output_get_height(vcam->output);
+
+	struct obs_video_info ovi;
+	obs_get_video_info(&ovi);
+
+	uint64_t interval = ovi.fps_den * 10000000ULL / ovi.fps_num;
+
+	char res[64];
+	snprintf(res, sizeof(res), "%dx%dx%lld", (int)width, (int)height,
+		 (long long)interval);
+
+	char *res_file = os_get_config_path_ptr("obs-virtualcam.txt");
+	os_quick_write_utf8_file_safe(res_file, res, strlen(res), false, "tmp",
+				      NULL);
+	bfree(res_file);
+
+	vcam->vq = video_queue_create(width, height, interval);
+	if (!vcam->vq) {
+		blog(LOG_WARNING, "starting virtual-output failed");
+		return false;
+	}
+
+	struct video_scale_info vsi = {0};
+	vsi.format = VIDEO_FORMAT_NV12;
+	vsi.width = width;
+	vsi.height = height;
+	obs_output_set_video_conversion(vcam->output, &vsi);
+
+	blog(LOG_INFO, "Virtual output started");
+	obs_output_begin_data_capture(vcam->output, 0);
+	return true;
+}
+
+static void virtualcam_stop(void *data, uint64_t ts)
+{
+	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
+	obs_output_end_data_capture(vcam->output);
+	video_queue_close(vcam->vq);
+	vcam->vq = NULL;
+
+	blog(LOG_INFO, "Virtual output stopped");
+
+	UNUSED_PARAMETER(ts);
+}
+
+static void virtual_video(void *param, struct video_data *frame)
+{
+	struct virtualcam_data *vcam = (struct virtualcam_data *)param;
+
+	if (!vcam->vq)
+		return;
+
+	video_queue_write(vcam->vq, frame->data, frame->linesize,
+			  frame->timestamp);
+}
+
+struct obs_output_info virtualcam_info = {
+	.id = "virtualcam_output",
+	.flags = OBS_OUTPUT_VIDEO,
+	.get_name = virtualcam_name,
+	.create = virtualcam_create,
+	.destroy = virtualcam_destroy,
+	.start = virtualcam_start,
+	.stop = virtualcam_stop,
+	.raw_video = virtual_video,
+};

obs-studio-25.0.8.tar.xz/plugins/win-dshow/win-dshow.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-dshow/win-dshow.cpp Changed

@@ -1072,11 +1072,11 @@
 
 	if (astrcmpi(space, "709") == 0)
 		return VIDEO_CS_709;
-	else if (astrcmpi(space, "601") == 0)
+
+	if (astrcmpi(space, "601") == 0)
 		return VIDEO_CS_601;
-	else
-		return (videoConfig.format == VideoFormat::HDYC) ? VIDEO_CS_709
-								 : VIDEO_CS_601;
+
+	return VIDEO_CS_DEFAULT;
 }
 
 inline enum video_range_type
@@ -1145,12 +1145,22 @@
 	return TEXT_INPUT_NAME;
 }
 
+static void proc_activate(void *data, calldata_t *cd)
+{
+	bool activate = calldata_bool(cd, "active");
+	DShowInput *input = reinterpret_cast<DShowInput *>(data);
+	input->SetActive(activate);
+}
+
 static void *CreateDShowInput(obs_data_t *settings, obs_source_t *source)
 {
 	DShowInput *dshow = nullptr;
 
 	try {
 		dshow = new DShowInput(source, settings);
+		proc_handler_t *ph = obs_source_get_proc_handler(source);
+		proc_handler_add(ph, "void activate(bool active)",
+				 proc_activate, dshow);
 	} catch (const char *error) {
 		blog(LOG_ERROR, "Could not create device '%s': %s",
 		     obs_source_get_name(source), error);

obs-studio-25.0.8.tar.xz/plugins/win-mf/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-mf/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/ba-RU.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-mf/data/locale/de-DE.ini -> obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/de-DE.ini Changed

@@ -1,8 +1,8 @@
-MFAACEnc="Media‐Foundation‐AAC‐Kodierer"
+MFAACEnc="Media‐Foundation‐AAC‐Encoder"
 Bitrate="Bitrate"
 
-MF.H264.EncoderName="Media‐Foundation‐H264‐Kodierer"
-MF.H264.Encoder="Kodierername"
+MF.H264.EncoderName="Media‐Foundation‐H264‐Encoder"
+MF.H264.Encoder="Encodername"
 MF.H264.LowLatency="Niedrige Latenz (deaktiviert Frameneuanordnung)"
 MF.H264.BFrames="Konsekutive B‐Frameanzahl"
 MF.H264.CustomBufsize="Benutzerdefinierte Puffergröße verwenden"
@@ -23,8 +23,8 @@
 MF.H264.Profile="Profil"
 MF.H264.Advanced="Erweitert"
 
-MF.H264.EncoderSWMicrosoft="Microsoft‐Software‐H.264‐Kodierer"
-MF.H264.EncoderHWAMD="AMD‐Video‐Coding‐Engine‐H.264‐Kodierer (Media Foundation)"
-MF.H264.EncoderHWIntel="Intel‐Quick‐Sync‐H.264‐Kodierer (Media Foundation)"
-MF.H264.EncoderHWNVIDIA="NVIDIA‐NVENC‐H.264‐Kodierer (Media Foundation)"
+MF.H264.EncoderSWMicrosoft="Microsoft‐Software‐H.264‐Encoder"
+MF.H264.EncoderHWAMD="AMD‐Video‐Coding‐Engine‐H.264‐Encoder (Media Foundation)"
+MF.H264.EncoderHWIntel="Intel‐Quick‐Sync‐H.264‐Encoder (Media Foundation)"
+MF.H264.EncoderHWNVIDIA="NVIDIA‐NVENC‐H.264‐Encoder (Media Foundation)"

obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/en-GB.ini Added

@@ -0,0 +1,30 @@
+MFAACEnc="Media Foundation AAC Encoder"
+Bitrate="Bitrate"
+
+MF.H264.EncoderName="Media Foundation H264 Encoder"
+MF.H264.Encoder="Encoder Name"
+MF.H264.LowLatency="Low Latency (Disable frame re-ordering)"
+MF.H264.BFrames="Consecutive B-Frame count"
+MF.H264.CustomBufsize="Use Custom Buffer Size"
+MF.H264.BufferSize="Buffer Size"
+MF.H264.CustomMaxBitrate="Use Custom Max Bitrate"
+MF.H264.Bitrate="Bitrate"
+MF.H264.MaxBitrate="Max Bitrate"
+MF.H264.KeyframeIntervalSec="Keyframe Interval (seconds, 0=auto)"
+MF.H264.RateControl="Rate Control"
+MF.H264.CBR="CBR (Constant Bitrate)"
+MF.H264.VBR="VBR (Variable Bitrate)"
+MF.H264.CQP="CQP (Constant Quality)"
+MF.H264.MinQP="Minimum QP"
+MF.H264.MaxQP="Maximum QP"
+MF.H264.QPI="QP I-Frame"
+MF.H264.QPP="QP P-Frame"
+MF.H264.QPB="QP B-Frame"
+MF.H264.Profile="Profile"
+MF.H264.Advanced="Advanced"
+
+MF.H264.EncoderSWMicrosoft="Microsoft Software H.264 Encoder"
+MF.H264.EncoderHWAMD="AMD Video Coding Engine H.264 Encoder (Media Foundation)"
+MF.H264.EncoderHWIntel="Intel Quick Sync H.264 Encoder (Media Foundation)"
+MF.H264.EncoderHWNVIDIA="NVIDIA NVENC H.264 Encoder (Media Foundation)"
+

obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/id-ID.ini Added

@@ -0,0 +1,30 @@
+MFAACEnc="Enkoder AAC Media Foundation"
+Bitrate="Bitrate"
+
+MF.H264.EncoderName="Enkoder H264 Media Foundation"
+MF.H264.Encoder="Nama Enkoder"
+MF.H264.LowLatency="Latensi Rendah (Nonaktifkan penyusunan ulang frame)"
+MF.H264.BFrames="Hitungan B-Frame berturut-turut"
+MF.H264.CustomBufsize="Gunakan Ukuran Buffer Kustom"
+MF.H264.BufferSize="Ukuran Buffer"
+MF.H264.CustomMaxBitrate="Gunakan Kustom Bitrate Maksimum"
+MF.H264.Bitrate="Bitrate"
+MF.H264.MaxBitrate="Bitrate Maksimum"
+MF.H264.KeyframeIntervalSec="Interval Keyframe (detik, 0=otomatis)"
+MF.H264.RateControl="Kontrol Rate"
+MF.H264.CBR="CBR (Bitrate Konstan)"
+MF.H264.VBR="VBR (Bitrate Variabel)"
+MF.H264.CQP="CQP (Kualitas Konstan)"
+MF.H264.MinQP="QP Minimum"
+MF.H264.MaxQP="QP Maksimum"
+MF.H264.QPI="QP I-Frame"
+MF.H264.QPP="QP P-Frame"
+MF.H264.QPB="QP B-Frame"
+MF.H264.Profile="Profil"
+MF.H264.Advanced="Tingkat Lanjut"
+
+MF.H264.EncoderSWMicrosoft="Enkoder Microsoft Software H.264"
+MF.H264.EncoderHWAMD="Enkoder AMD Video Coding Engine H.264 (Media Foundation)"
+MF.H264.EncoderHWIntel="Enkoder Intel Quick Sync H.264 (Media Foundation)"
+MF.H264.EncoderHWNVIDIA="Enkoder NVIDIA NVENC H.264 (Media Foundation)"
+

obs-studio-25.0.8.tar.xz/plugins/win-mf/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-mf/data/locale/ta-IN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/ta-IN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-mf/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/win-mf/data/locale/uk-UA.ini Changed

@@ -1,17 +1,17 @@
-MFAACEnc="Media Foundation AAC енкодер"
+MFAACEnc="Кодувальник Media Foundation AAC"
 Bitrate="Бітрейт"
 
-MF.H264.EncoderName="Media Foundation H264 енкодер"
-MF.H264.Encoder="Назва енкодеру"
-MF.H264.LowLatency="З низькою затримкою (Вимкнути перегрупування кадрів)"
+MF.H264.EncoderName="Кодувальник Media Foundation H264"
+MF.H264.Encoder="Назва кодувальника"
+MF.H264.LowLatency="Низька затримка (вимикає перегрупування кадрів)"
 MF.H264.BFrames="Кількість послідовних B-кадрів"
-MF.H264.CustomBufsize="Розмір буфера за користувачем"
+MF.H264.CustomBufsize="Настроюваний розмір буфера"
 MF.H264.BufferSize="Розмір буфера"
-MF.H264.CustomMaxBitrate="Максимальний бітрейт за користувачем"
+MF.H264.CustomMaxBitrate="Використовувати настроюваний максимальний бітрейт"
 MF.H264.Bitrate="Бітрейт"
 MF.H264.MaxBitrate="Максимальний бітрейт"
 MF.H264.KeyframeIntervalSec="Інтервал ключових кадрів (секунд, 0 = авто)"
-MF.H264.RateControl="Керування потоком"
+MF.H264.RateControl="Керування бітрейтом"
 MF.H264.CBR="CBR (постійний бітрейт)"
 MF.H264.VBR="VBR (змінний бітрейт)"
 MF.H264.CQP="CQP (фіксована якість)"
@@ -23,8 +23,8 @@
 MF.H264.Profile="Профіль"
 MF.H264.Advanced="Розширені параметри"
 
-MF.H264.EncoderSWMicrosoft="Microsoft Software H.264 енкодер"
-MF.H264.EncoderHWAMD="AMD Video Coding Engine H.264 енкодер (Media Foundation)"
-MF.H264.EncoderHWIntel="Intel Quick Sync H.264 енкодер (Media Foundation)"
-MF.H264.EncoderHWNVIDIA="NVIDIA NVENC H.264 енкодер (Media Foundation)"
+MF.H264.EncoderSWMicrosoft="Кодувальник Microsoft Software H.264"
+MF.H264.EncoderHWAMD="Кодувальник AMD Video Coding Engine H.264 (Media Foundation)"
+MF.H264.EncoderHWIntel="Кодувальник Intel Quick Sync H.264 (Media Foundation)"
+MF.H264.EncoderHWNVIDIA="Кодувальник NVIDIA NVENC H.264 (Media Foundation)"

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/ba-RU.ini Added

obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/en-GB.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/he-IL.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/he-IL.ini Changed

obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/id-ID.ini Added

obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/lt-LT.ini Added

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/ro-RO.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/ro-RO.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/ru-RU.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/ru-RU.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/th-TH.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/th-TH.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/uk-UA.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/uk-UA.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/vi-VN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/vi-VN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/data/locale/zh-CN.ini -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/data/locale/zh-CN.ini Changed

obs-studio-25.0.8.tar.xz/plugins/win-wasapi/win-wasapi.cpp -> obs-studio-26.0.0.tar.xz/plugins/win-wasapi/win-wasapi.cpp Changed

obs-studio-25.0.8.tar.xz/test/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/test/CMakeLists.txt Changed

obs-studio-26.0.0.tar.xz/test/cmocka Added

obs-studio-26.0.0.tar.xz/test/cmocka/CMakeLists.txt Added

@@ -0,0 +1,39 @@
+project(obs-cmocka)
+
+# Fix libobs path
+macro(fixLink target_arg)
+	if(APPLE AND UNIX)
+		add_custom_command (TARGET ${target_arg}
+			POST_BUILD COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
+			"-change" "@rpath/libobs.0.dylib" "@executable_path/../../libobs/libobs.0.dylib"
+			"$<TARGET_FILE:${target_arg}>" VERBATIM)
+	endif()
+endmacro()
+
+set(CMAKE_MACOSX_RPATH TRUE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+list(APPEND CMAKE_INSTALL_RPATH "@loader_path/" "@executable_path/")
+
+find_package(CMocka CONFIG REQUIRED)
+include_directories(${CMOCKA_INCLUDE_DIR})
+include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
+
+# fix rpath on linux
+if (UNIX AND NOT APPLE)
+	set(CMAKE_INSTALL_RPATH "$ORIGIN";../../libobs)
+endif()
+
+# Serializer test
+add_executable(test_serializer test_serializer.c)
+target_link_libraries(test_serializer ${CMOCKA_LIBRARIES} libobs)
+
+add_test(test_serializer ${CMAKE_CURRENT_BINARY_DIR}/test_serializer)
+fixLink(test_serializer)
+
+
+# darray test
+add_executable(test_darray test_darray.c)
+target_link_libraries(test_darray ${CMOCKA_LIBRARIES} libobs)
+
+add_test(test_darray ${CMAKE_CURRENT_BINARY_DIR}/test_darray)
+fixLink(test_darray)

obs-studio-26.0.0.tar.xz/test/cmocka/test_darray.c Added

obs-studio-26.0.0.tar.xz/test/cmocka/test_serializer.c Added

obs-studio-25.0.8.tar.xz/test/osx/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/test/osx/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/test/osx/test.mm -> obs-studio-26.0.0.tar.xz/test/osx/test.mm Changed

obs-studio-25.0.8.tar.xz/test/test-input/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/test/test-input/CMakeLists.txt Changed

obs-studio-25.0.8.tar.xz/test/test-input/sync-pair-aud.c -> obs-studio-26.0.0.tar.xz/test/test-input/sync-pair-aud.c Changed

obs-studio-25.0.8.tar.xz/test/win/CMakeLists.txt -> obs-studio-26.0.0.tar.xz/test/win/CMakeLists.txt Changed

Overview

Request 5248 (accepted)

Request History