Packman Build Service PMBS

Changes of Revision 57

obs-studio.changes Changed

@@ -1,4 +1,320 @@
 -------------------------------------------------------------------
+Tue Aug 21 01:31:18 UTC 2018 - jimmy@boombatower.com
+
+- Update to version 22.0.1:
+  * obs-browser: Update translations
+  * libobs: Update version to 22.0.1
+  * obs-browser: Fix local files not being processed correctly
+  * libobs: Update to version 22.0.0
+  * UI: Fix path for File > Show Recordings
+  * obs-browser: Blacklist certain hwaccel adapter combos
+  * UI: Fix mixer context menu toggling layout on kde
+  * cmake: Add luajit 2.1 support to build
+  * obs-browser: Update version number to 2.1.0
+  * libobs: Revert version update to 22.0.0 (instead, do RC2)
+  * UI: Fix snapping of group sub-items
+  * CI: Use HTTPS for downloading macOS deps package
+  * libobs: Fix typo in function names
+  * UI: Remove warning when using separate QSV encoders
+  * Update translations from Crowdin
+  * Update translations from Crowdin
+  * updater: Prepare for transition to Fastly CDN
+  * libobs: Update version to 22.0.0
+  * UI: Hide Dock Icon on Mac OSX when minimizing to tray
+  * UI: Update Acri theme
+  * UI: Fix multiview hang
+  * Revert "UI: Use qss themeID for red labels in properties view"
+  * UI: Fix dark theme link color
+  * UI: Update Rachni theme
+  * obs-browser: Fix "shutdown when invisible" issue
+  * UI: Use qss themeID for red labels in properties view
+  * UI: Use theme for red message in audio settings
+  * UI: Allow centering/stretching for groups items
+  * UI: Fix group sub-item selection bug
+  * UI: Fix flip/rotate transform menu with group items
+  * libobs: Add function to force a sceneitem transform update
+  * UI: Fix bug grabbing handles of group sub-items
+  * rtmp-services: Add DTube
+  * UI: Set replay buffer button as checkable
+  * libobs: Fix applying group transform of flipped sources
+  * UI: Allow resetting transform of group sub-items
+  * rtmp-services: Do not check for valid URL if using "auto"
+  * libobs: Initialize hotkey pair ID variable properly
+  * UI: Allow the transform dialog for group sub-sources
+  * UI: If users renames a source, only revert on Esc
+  * obs-browser: Fix a number of bugs
+  * UI: Protect GUID generation in mutex
+  * UI: Make the information dialog a big wider
+  * UI: Add release candidate checking to info dialog
+  * cmake: Add release candidate versions/cmake variables
+  * libobs/media-io: Prevent overwriting of remux input
+  * libobs: Update version from latest tag
+  * obs-qsv11: Protect context variable in clear_data
+  * rtmp-services: Remove unnecessary null check
+  * libobs: Remove unnecessary null check
+  * UI: Add adv. settings checkbox for browser HW accel
+  * libobs: Add functions to get/set global private data
+  * libobs: Move function declarations to correct spot
+  * UI: Use NVIDIA laptop GPU hint
+  * CI: Update OSX Deps package
+  * win-capture: Avoid segfault when retrieve size
+  * cmake: Prevent policy CMP0072 warning
+  * Revert "libobs-d3d11: Initialize variable to zero"
+  * win-capture: Avoid tex size mismatch for cursor
+  * UI: Make OBS bitness more specific in title bar and log
+  * obs-qsv11: Initialize member variable
+  * CI: Fix building libvpx dep on osx
+  * rtmp-services: Ensure set URL exists within server list
+  * rtmp-services: Change Facebook stream URL to use RTMPS
+  * obs-outputs: Add support for and use mbedTLS for SSL
+  * libobs: When ungrouping groups, duplicate items
+  * libobs: Add internal function to dup. scene item data
+  * libobs: Add function to save hotkey pair data
+  * UI: Remove QNetworkReply from window-basic-main.hpp
+  * UI: Use obsproject.com URL for discord invite
+  * libobs-opengl: Fix segfault on access of invalid window
+  * libobs-opengl: Improve X error handler message
+  * obs-filters: Fix segfault in Compressor Filter
+  * UI: Add missing va_end() call
+  * CI: Update macOS dependencies in build script
+  * CI: Update Travis scripts to target OSX 10.11+
+  * CI: Update Travis Mac builds to Xcode 9.4 and macOS 10.13
+  * UI: Add ability to join discord server from help menu
+  * UI: Add Color Coding to Source Tree Widget
+  * win-mf: Add missing va_end() call
+  * obs-browser: Add hardware acceleration option (win32)
+  * UI: Add missing return statement
+  * UI: Uncheck record/replay buffer buttons if fail
+  * UI: Use QScopedPointer (not QPointer) where applicable
+  * UI: Hide preview for sources and filters where possible
+  * UI: Fix disabled items in Dark theme being too light
+  * libobs: Log libobs bitness in crash logs
+  * UI: Add confirmation dialog if there are no sources
+  * libobs-d3d11: Initialize variable to zero
+  * UI: Check pointer before the first dereference
+  * UI: Add intro startup page (windows)
+  * deps: Add json11 library for convenience
+  * UI: Only allow stream/record hotkeys if the UI buttons are enabled
+  * OSX: Add NSCamera and NSMicrophone UsageDescription for 10.14
+  * CI: Use Qt 5.11.1 on Travis for macOS
+  * CI: Use Qt 5.11.1 on AppVeyor for Windows
+  * frontend-tools: Add QAction explicitly for Qt 5.11 compatibility
+  * Fix typo in contributor guide
+  * UI: Fix start up crash with saved projectors
+  * rtmp-services: Add Piczel.TV server
+  * enc-amf:  Version 2.4.2
+  * libobs: Always try to update transform in current thread
+  * libobs: Only update scene item texture on frame tick
+  * libobs: Don't assign variables before if/return
+  * UI: Do not open properties dialog for groups
+  * obs-outputs: Update librtmp with upstream patches
+  * CI: Add AppVeyor webhook for Discord bot
+  * CI: Add travis webhook for Discord bot
+  * UI: Add signal for when theme has changed
+  * UI: Add ability to parse OBSStyle from qss
+  * libobs: Copy the device uid string for mac audio monitor
+  * libobs: Pass address of cf_uid rather than the contents of cf_uid
+  * libobs: Fix setting of audio monitor device on Mac
+  * libobs: Rework checking Mac audio device capabilities
+  * UI: Fix bug with advanced output service settings
+  * libobs: Add function to get encoder object's defaults
+  * obs-browser: Fix error and warning
+  * obs-browser: Update to latest version
+  * libobs: Defer update of scene item texture
+  * UI: Allow alt-cropping on bounding box scene items
+  * libobs/util: Don't use assert for darray_push_back_array
+  * obs-qsv:  Allow for multiple QSV encoders
+  * obs-output: Update ftl-sdk version
+  * CI: Update Sparkle default base_url
+  * rtmp-services: Update ingest list for Restream.io
+  * rtmp-services: Update ingest list for GamePlank
+  * UI: Fix signals for sub-items of groups
+  * UI: Add OBSBasic::SavingDisabled() function
+  * UI: Allow copying/pasting of groups
+  * libobs: Allow group duplication
+  * libobs: Change groups to actual public types
+  * libobs: Abstract resize_group to resize_scene_base
+  * libobs: Refactor creation of scenes
+  * libobs: Remove group_sceneitem from obs_scene struct
+  * libobs: Add obs_data_array_push_back_array
+  * Update INSTALL
+  * UI: Fix OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED
+  * rtmp-services: Add KakaoTV
+  * libobs: Update libcaption library
+  * rtmp-services: Adding Castr.io ingests to service list
+  * vlc-video: Load libvlccore.dylib on macOS
+  * CI: Fix CEF Path on Package Build
+  * libobs: Remove unnecessary const qualifier
+  * libobs: Remove unused variable
+  * libobs: Remove unused variable
+  * libobs: Fix equality check
+  * libobs: Add missing return type
+  * libobs: Remove unused variable
+  * libobs: Change int to size_t
+  * UI: Fix stream button checkable state
+  * UI: Update Acri theme for disabled buttons
+  * UI: Add frontend event for when OBS finishes loading
+  * Revert "obs-x264: Specify x264 color space for BT.601"
+  * UI: Fix cramped source tree sub-widgets on macOS
+  * UI: Fix bug where color property shows transparency
+  * UI: Fix display bug with color property
+  * libobs: prevent crash from unbounded copy and bfree
+  * UI: If group's name exist, start it from 2
+  * UI: Fix mixer dock widget minSize being too big
+  * obs-transitions: Fix potential stinger divide by 0
+  * libobs: add obs_source_frame_copy
+  * libobs: Fix compilation issue on case-sensitive filesystems
+  * libobs: Add check for cf_uid pointer free
+  * libobs: Fix Monitoring devices showing input devices
+  * obs-x264: Specify x264 color space for BT.601
+  * UI: Fix mem leak in VolControl
+  * librtmp: Fix memory leak
+  * UI: Fix mem leak with QCompleter
+  * UI: Fix mem leak with multiview projector menu
+  * UI: Fix mem leak with tray menu
+  * UI: Fix mem leak with volume meter
+  * UI: Compact ClearVolumeControls()
+  * UI: Update hotkey label on quick transition rename
+  * libobs: Update hotkey label on scene item rename
+  * libobs: Enable setting hotkey name and description
+  * UI: Add grouping
+  * UI: Fix missing newline at the end of a file
+  * UI: Refactor DrawCircleAtPos
+  * UI: Use vector value for nudge callback
+  * UI: Move frontend API initialization to constructor
+  * libobs: Add scene item grouping
+  * libobs: Add custom size support to scenes
+  * libobs: Do not signal reorder while scene mutex locked
+  * libobs: Defer and refactor scene item transform update
+  * libobs: Refactor item signaling (add func to signal parent)
+  * libobs: Do not draw item texture if source size 0
+  * libobs: Fix bug where cropped items would recalc transform
+  * libobs: Zero scene data instead of setting members manually
+  * libobs/callback: Add signal reference counting
+  * libobs: Refactor obs_scene_add to allow adding internally
+  * UI: Fix a few unused lambda closure captures
+  * libobs: Copy metadata for tracks/streams when remuxing
+  * obs-filters: Use double-precision where viable
+  * libobs: Avoid busy cursor when starting processes
+  * libobs: Allow custom core data paths
+  * libobs: Handle 'in', 'out', and 'inout' keywords in shader parsers
+  * obs-ffmpeg: Set average framerate in video stream
+  * Make alpha visible in property color
+  * Use selected color in color property label
+  * CI: Upgrade to VS2017 on Appveyor
+  * UI: Add new Multiview Layout for up to 24 scenes
+  * UI: Move more fixed values to multiview update
+  * UI: Adjust the multiview num sources by the layout
+  * UI: Calculate fixed values of the Multiview once
+  * UI: Move multiview setting checks from draw path
+  * UI: Add option to toggle multiview draw safe area
+  * UI: Update multiview safe areas
+  * UI: Add option to toggle multiview scene names
+  * UI: Add option to toggle multiview mouse switching
+  * UI: Move multiview settings to its own groupbox
+  * UI: Update multiview on scene list reorder
+  * UI: Update multiview on resolution change
+  * UI: Adjust multiview label size
+  * UI: Add proper source markers to multiview
+  * UI: Simplify multiview draw code
+  * UI: Change multiview non-studio selection color
+  * UI: Remove the outerbox markers in multiview
+  * UI: Make the multiview lines use the same color
+  * UI: Make the sources border color a little darker
+  * UI: Clean up Projector Creation
+  * UI: Clean up projector's render regions creation
+  * UI: Make multiview colors easier to manage
+  * UI: Clarify multiview layout names
+  * UI: Convert multiview layout string profiles to int
+  * UI: Use enum for multiview layout
+  * UI: Add Vertical Mixer option
+  * UI: Simplify Volume Control draw logic
+  * UI: Avoid copies in Volume Control
+  * UI: Clean up includes and code-style
+  * CI: Use QT 5.10.1 for AppVeyor builds
+  * Use obsproject.com for log file uploads
+  * UI: Fix OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED
+  * UI: Remove ENABLE_WIN_UPDATE cmake variable
+  * UI: Always enable auto-updater for windows
+  * UI: Fix memory leak when drag/dropping
+  * text-freetype2: Remove trailing whitespace
+  * text-freetype2: Add chat line count property
+  * libobs: Use xcb-xinput when available for events
+  * cmake: Add xcb-xinput support
+  * UI: Add opt. to enable/disable in-focus hotkey blocking
+  * win-capture: Fix cursor draw size with certain cursors
+  * win-dshow: Allow synchronous create/update
+  * UI: Block when calling obs_frontend_set_current_scene
+  * UI: Add obs_frontend_add_scene_collection API call
+  * UI: Use WaitConnection() when adding scenes
+  * UI: Add WaitConnection() helper func
+  * UI: Use "source_create" to add scenes to listbox
+  * libobs: Make callback optional for obs_load_sources
+  * libobs: Don't signal "source_create" for private sources
+  * win-capture: Update D3D9 signature for Win10 April 2018 Update
+  * libobs: Expose source save/load signal
+  * docs/sphinx: Fix typo in script sources section
+  * obs-browser: Use BGRA textures instead of RGBA
+  * UI: Don't defer load on non-macOS systems
+  * UI: Also defer first scene collection load
+  * libobs: Use unaligned store rather than aligned store
+  * libobs: Convert sse inline funcs to macros
+  * libobs: Add "static" to inline func
+  * libobs, UI: Add true peak measurements
+  * rtmp-services: Update ingest list for Restream.io
+  * UI: Fix no_space file naming for replays
+  * UI: Explicitly initialize the crash handler
+  * libobs: Separate crash handler from startup
+  * UI: Change remux dialog to be non-modal
+  * libobs: Add functions to get output capability flags
+  * win-capture: Avoid obs functions in init_hooks
+  * libobs: Add functions to get raw video output
+  * libobs: Deactivate unnecessary GPU ops when not encoding
+  * libobs: Log *nix window manager
+  * UI: Disable paste filters unless a source is selected
+  * CI: Add description to OSX deps build script
+  * .gitmodules: Update submodules to new obsproject org
+  * UI: Set OBS icon to projector and stats window
+  * libobs-d3d11: Do not allow Alt+Enter interception
+  * UI: Sort audio controls by source name
+  * libobs: Add function to get last main output texture
+  * libobs: Fix potential filter rendering race condition
+  * UI: Clean up delete Source/Scene shortcut
+  * UI: Don't close windows for "Always on Top" (win32)
+  * UI: Hold the clip flash for at least one second
+  * UI: Add Selected and Hidden Array Values
+  * UI: Move OpenSavedProjecters call to OBSBasic::Load()
+  * obs-ffmpeg: fill in more fields on audio frames
+  * libobs: Fix pasting filters crash when missing sources
+  * UI: Do not generate "already active" logs
+  * obs-browser: Update to browser source refactor
+  * CI: Reduce travis output verbosity
+  * UI: Defer startup OBSBasic::Load (macOS CEF workaround)
+  * UI: Change monitoring device on profile change
+  * UI: Add frontend API to defer saving
+  * rtmp-services: Update recommended parameters for Nood.tv
+  * obs-outputs/flv: Fix ECMA array size
+  * CI: change travis osx artifact repo name
+  * UI: Save windowed projectors on exit
+  * UI: Remove a second call to OpenSavedProjectors
+  * UI: Clean up OBSProjector creation
+  * UI: Update Projectors title on source name change
+  * UI: Clean up save and load projector code
+  * UI: Add helper functions to Projector
+  * UI: Add Scene to ProjectorType
+  * UI: Simplify Projector Init
+  * UI: Refactor Projector OBSRender source usage
+  * UI: Move ProjectorType enum to projector header
+  * UI: Make OpenSavedProjectors indentation clear
+  * UI: Fix the Multiview window not using translation
+  * UI: Check if source is valid earlier
+  * UI: Simplify the OpenProjector logic
+  * UI: Only load projectors if SaveProjectors is true
+  * frontend-tools: Include 'QAction' to fix build against Qt 5.11
+  * mac-vth264: Fix video info set logic
+  * mac-vth264: Set the fullrange variable before calling vt_h264_video_info
+
+-------------------------------------------------------------------
 Sat May 12 23:59:07 UTC 2018 - jimmy@boombatower.com
 
 - Update to version 21.1.2:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-21.1.2.tar.xz/cmake/Modules/FindSSL.cmake Deleted

@@ -1,77 +0,0 @@
-# Once done these will be defined:
-#
-#  SSL_FOUND
-#  SSL_INCLUDE_DIRS
-#  SSL_LIBRARIES
-#
-# For use in OBS: 
-#
-#  SSL_INCLUDE_DIR
-
-find_package(PkgConfig QUIET)
-if (PKG_CONFIG_FOUND)
-	pkg_check_modules(_CRYPTO QUIET libcrypto)
-	pkg_check_modules(_SSL QUIET libssl)
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(_lib_suffix 64)
-else()
-	set(_lib_suffix 32)
-endif()
-
-set(_SSL_BASE_HINTS
-		ENV sslPath${_lib_suffix}
-		ENV sslPath
-		ENV DepsPath${_lib_suffix}
-		ENV DepsPath
-		${sslPath${_lib_suffix}}
-		${sslPath}
-		${DepsPath${_lib_suffix}}
-		${DepsPath})
-
-set(_SSL_LIB_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)
-
-find_path(SSL_INCLUDE_DIR
-	NAMES openssl/ssl.h
-	HINTS
-		${_SSL_BASE_HINTS}
-		${_CRYPTO_INCLUDE_DIRS}
-		${_SSL_INCLUDE_DIRS}
-	PATHS
-		/usr/include /usr/local/include /opt/local/include /sw/include
-	PATH_SUFFIXES
-		include)
-
-find_library(_SSL_LIB
-	NAMES ${_SSL_LIBRARIES} ssleay32 ssl
-	HINTS
-		${_SSL_BASE_HINTS}
-		${_SSL_LIBRARY_DIRS}
-	PATHS
-		/usr/lib /usr/local/lib /opt/local/lib /sw/lib
-	PATH_SUFFIXES ${_SSL_LIB_SUFFIXES})
-
-find_library(_CRYPTO_LIB
-	NAMES ${_CRYPTO_LIBRARIES} libeay32 crypto
-	HINTS
-		${_SSL_BASE_HINTS}
-		${_CRYPTO_LIBRARY_DIRS}
-	PATHS
-		/usr/lib /usr/local/lib /opt/local/lib /sw/lib
-	PATH_SUFFIXES ${_SSL_LIB_SUFFIXES})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ssl DEFAULT_MSG _SSL_LIB _CRYPTO_LIB SSL_INCLUDE_DIR)
-mark_as_advanced(SSL_INCLUDE_DIR _SSL_LIB _CRYPTO_LIB)
-
-if(SSL_FOUND)
-	set(SSL_INCLUDE_DIRS ${SSL_INCLUDE_DIR})
-	set(SSL_LIBRARIES ${_SSL_LIB} ${_CRYPTO_LIB})
-endif()

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/avc.h Deleted

@@ -1,198 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#ifndef LIBCAPTION_AVC_H
-#define LIBCAPTION_AVC_H
-#include "cea708.h"
-#include "caption.h"
-#include <float.h>
-////////////////////////////////////////////////////////////////////////////////
-#define MAX_NALU_SIZE (4*1024*1024)
-typedef struct {
-    size_t size;
-    uint8_t data[MAX_NALU_SIZE];
-} avcnalu_t;
-
-void avcnalu_init (avcnalu_t* nalu);
-int avcnalu_parse_annexb (avcnalu_t* nalu, const uint8_t** data, size_t* size);
-static inline uint8_t  avcnalu_type (avcnalu_t* nalu) { return nalu->data[0] & 0x1F; }
-static inline uint8_t* avcnalu_data (avcnalu_t* nalu) { return &nalu->data[0]; }
-static inline size_t   avcnalu_size (avcnalu_t* nalu) { return nalu->size; }
-////////////////////////////////////////////////////////////////////////////////
-typedef struct _sei_message_t sei_message_t;
-
-typedef enum {
-    sei_type_buffering_period = 0,
-    sei_type_pic_timing = 1,
-    sei_type_pan_scan_rect = 2,
-    sei_type_filler_payload = 3,
-    sei_type_user_data_registered_itu_t_t35 = 4,
-    sei_type_user_data_unregistered = 5,
-    sei_type_recovery_point = 6,
-    sei_type_dec_ref_pic_marking_repetition = 7,
-    sei_type_spare_pic = 8,
-    sei_type_scene_info = 9,
-    sei_type_sub_seq_info = 10,
-    sei_type_sub_seq_layer_characteristics = 11,
-    sei_type_sub_seq_characteristics = 12,
-    sei_type_full_frame_freeze = 13,
-    sei_type_full_frame_freeze_release = 14,
-    sei_type_full_frame_snapshot = 15,
-    sei_type_progressive_refinement_segment_start = 16,
-    sei_type_progressive_refinement_segment_end = 17,
-    sei_type_motion_constrained_slice_group_set = 18,
-    sei_type_film_grain_characteristics = 19,
-    sei_type_deblocking_filter_display_preference = 20,
-    sei_type_stereo_video_info = 21,
-} sei_msgtype_t;
-////////////////////////////////////////////////////////////////////////////////
-// time in seconds
-typedef struct  {
-    double dts;
-    double cts;
-    sei_message_t* head;
-    sei_message_t* tail;
-} sei_t;
-
-/*! \brief
-    \param
-*/
-void sei_init (sei_t* sei);
-/*! \brief
-    \param
-*/
-void sei_free (sei_t* sei);
-/*! \brief
-    \param
-*/
-static inline double sei_dts (sei_t* sei) { return sei->dts; }
-static inline double sei_cts (sei_t* sei) { return sei->cts; }
-static inline double sei_pts (sei_t* sei) { return sei->dts + sei->cts; }
-/*! \brief
-    \param
-*/
-int sei_parse_nalu (sei_t* sei, const uint8_t* data, size_t size, double dts, double cts);
-/*! \brief
-    \param
-*/
-// TODO add dts,cts to nalu
-static inline int sei_parse_avcnalu (sei_t* sei, avcnalu_t* nalu, double dts, double cts) { return sei_parse_nalu (sei,avcnalu_data (nalu),avcnalu_size (nalu),dts,cts); }
-/*! \brief
-    \param
-*/
-static inline int sei_finish (sei_t* sei) { return sei_parse_nalu (sei,0,0,0.0,DBL_MAX); }
-/*! \brief
-    \param
-*/
-static inline sei_message_t* sei_message_head (sei_t* sei) { return sei->head; }
-/*! \brief
-    \param
-*/
-static inline sei_message_t* sei_message_tail (sei_t* sei) { return sei->tail; }
-/*! \brief
-    \param
-*/
-sei_message_t* sei_message_next (sei_message_t* msg);
-/*! \brief
-    \param
-*/
-sei_msgtype_t sei_message_type (sei_message_t* msg);
-/*! \brief
-    \param
-*/
-size_t sei_message_size (sei_message_t* msg);
-/*! \brief
-    \param
-*/
-uint8_t* sei_message_data (sei_message_t* msg);
-/*! \brief
-    \param
-*/
-sei_message_t* sei_message_new (sei_msgtype_t type, uint8_t* data, size_t size);
-/*! \brief
-    \param
-*/
-static inline sei_message_t* sei_message_copy (sei_message_t* msg)
-{
-    return sei_message_new (sei_message_type (msg), sei_message_data (msg), sei_message_size (msg));
-}
-/**
-Free message and all accoiated data. Messaged added to sei_t by using sei_append_message MUST NOT be freed
-These messages will be freed by calling sei_free()
-*/
-/*! \brief
-    \param
-*/
-void  sei_message_free (sei_message_t* msg);
-////////////////////////////////////////////////////////////////////////////////
-/*! \brief
-    \param
-*/
-static inline int sei_decode_cea708 (sei_message_t* msg, cea708_t* cea708)
-{
-    if (sei_type_user_data_registered_itu_t_t35 == sei_message_type (msg)) {
-        return cea708_parse (sei_message_data (msg), sei_message_size (msg), cea708);
-    } else {
-        return 0;
-    }
-}
-////////////////////////////////////////////////////////////////////////////////
-/*! \brief
-    \param
-*/
-size_t sei_render_size (sei_t* sei);
-/*! \brief
-    \param
-*/
-size_t sei_render (sei_t* sei, uint8_t* data);
-/*! \brief
-    \param
-*/
-void sei_dump (sei_t* sei);
-/*! \brief
-    \param
-*/
-void sei_dump_messages (sei_message_t* head);
-////////////////////////////////////////////////////////////////////////////////
-/*! \brief
-    \param
-*/
-int sei_from_caption_frame (sei_t* sei, caption_frame_t* frame);
-/*! \brief
-    \param
-*/
-libcaption_stauts_t sei_to_caption_frame (sei_t* sei, caption_frame_t* frame);
-/*! \brief
-    \param
-*/
-static inline int nalu_to_caption_frame (caption_frame_t* frame, const uint8_t* data, size_t size, double pts, double dts)
-{
-    sei_t sei;
-    sei_init (&sei);
-    sei_parse_nalu (&sei, data, size, pts, dts);
-    sei_to_caption_frame (&sei,frame);
-    sei_free (&sei);
-    return 1;
-}
-////////////////////////////////////////////////////////////////////////////////
-#endif

obs-studio-21.1.2.tar.xz/deps/libcaption/examples Deleted

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/add_captions.sh Deleted

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/captioner.c Deleted

@@ -1,117 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <linux/input.h>
-#include <string.h>
-#include <stdio.h>
-#include "caption.h"
-#include "flv.h"
-
-char charcode[] = {
-    0,   0, '1', '2', '3', '4', '5', '6',  '7', '8', '9',  '0', '-', '=',   0,   0,
-    'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I',  'O', 'P', '[',  ']','\n',   0, 'A', 'S',
-    'D', 'F', 'G', 'H', 'J', 'K', 'L', ';', '\'', '`',   0, '\\', 'Z', 'X', 'C', 'V',
-    'B', 'N', 'M', ',', '.', '/',   0, '*',    0, ' ',   0,    0,   0,   0,   0,   0,
-};
-
-int data_ready (int fd)
-{
-    fd_set set;
-    struct timeval timeout = {0,0};
-    FD_ZERO (&set);
-    FD_SET (fd,&set);
-    int cnt = select (fd+1, &set, 0, 0, &timeout);
-    FD_ZERO (&set);
-    return (0 < cnt);
-}
-
-#define MAX_CAP_LENGTH (SCREEN_ROWS*SCREEN_COLS)
-int main (int argc, char** argv)
-{
-    int fd;
-    ssize_t n;
-    flvtag_t tag;
-    struct input_event ev;
-    int has_audio, has_video;
-    const char* dev = argv[1];
-    char text[MAX_CAP_LENGTH+1];
-    memset (text,0,MAX_CAP_LENGTH+1);
-
-    FILE* flv = flv_open_read ("-");
-    FILE* out = flv_open_write ("-");
-    fd = open (dev, O_RDONLY);
-
-    if (fd == -1) {
-        fprintf (stderr, "Cannot open %s: %s.\n", dev, strerror (errno));
-        return EXIT_FAILURE;
-    }
-
-    if (!flv_read_header (flv,&has_audio,&has_video)) {
-        fprintf (stderr,"%s is not an flv file\n", argv[1]);
-        return EXIT_FAILURE;
-    }
-
-    if (!flv_write_header (out,has_audio,has_video)) {
-        return EXIT_FAILURE;
-    }
-
-    flvtag_init (&tag);
-
-    while (flv_read_tag (flv,&tag)) {
-        if (flvtag_avcpackettype_nalu == flvtag_avcpackettype (&tag)) {
-            if (data_ready (fd)) {
-                n = read (fd, &ev, sizeof ev);
-
-                if (n == (ssize_t)-1) {
-                    if (errno == EINTR) {
-                        continue;
-                    } else {
-                        break;
-                    }
-                } else if (n != sizeof ev) {
-                    errno = EIO;
-                    break;
-                }
-
-                int len = strlen (text);
-                char c = (EV_KEY == ev.type && 1 == ev.value && ev.code < 64) ? charcode[ev.code] : 0;
-
-                if (0 < len && '\n' == c) {
-                    fprintf (stderr,"='%s'\n", text);
-                    flvtag_addcaption (&tag, text);
-                    memset (text,0,MAX_CAP_LENGTH+1);
-                } else if (0 != c && len < MAX_CAP_LENGTH) {
-                    text[len] = c;
-                }
-            }
-        }
-
-        flv_write_tag (out,&tag);
-    }
-
-    return EXIT_SUCCESS;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/flv+scc.c Deleted

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

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/flv+srt.c Deleted

@@ -1,96 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "srt.h"
-#include "flv.h"
-#include "avc.h"
-// #include "sei.h"
-
-#define MAX_SRT_SIZE (10*1024*1024)
-#define MAX_READ_SIZE 4096
-
-srt_t* srt_from_file (const char* path)
-{
-    srt_t* head = 0;
-    size_t read, totl = 0;
-    FILE* file = fopen (path,"r");
-
-    if (file) {
-        char* srt_data = malloc (MAX_SRT_SIZE);
-        size_t srt_size = 0;
-        size_t size = MAX_SRT_SIZE;
-        char* data = srt_data;
-
-        while (0 < (read = fread (data,1,size,file))) {
-            totl += read; data += read; size -= read; srt_size += read;
-        }
-
-        head = srt_parse (srt_data,srt_size);
-        free (srt_data);
-    }
-
-    return head;
-}
-
-int main (int argc, char** argv)
-{
-    flvtag_t tag;
-    FILE* flv = flv_open_read (argv[1]);
-    FILE* out = flv_open_write (argv[3]);
-
-    int has_audio, has_video;
-    flvtag_init (&tag);
-
-    if (!flv_read_header (flv,&has_audio,&has_video)) {
-        fprintf (stderr,"%s is not an flv file\n", argv[1]);
-        return EXIT_FAILURE;
-    }
-
-    srt_t* head = srt_from_file (argv[2]);
-    srt_t* srt = head;
-
-    if (! head) {
-        fprintf (stderr,"%s is not an srt file\n", argv[2]);
-        return EXIT_FAILURE;
-    }
-
-    flv_write_header (out,has_audio,has_video);
-
-    while (flv_read_tag (flv,&tag)) {
-        // TODO handle B freame!
-        if (srt && flvtag_pts_seconds (&tag) >= srt->timestamp && flvtag_avcpackettype_nalu == flvtag_avcpackettype (&tag)) {
-            fprintf (stderr,"%f: %s\n", srt->timestamp, srt_data (srt));
-            flvtag_addcaption (&tag, srt_data (srt));
-            srt = srt->next;
-        }
-
-        flv_write_tag (out,&tag);
-        // Write tag out here
-    }
-
-    srt_free (head);
-    return EXIT_SUCCESS;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/flv.c Deleted

@@ -1,383 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include "flv.h"
-#include <stdlib.h>
-#include <string.h>
-
-void flvtag_init (flvtag_t* tag)
-{
-    memset (tag,0,sizeof (flvtag_t));
-}
-
-void flvtag_free (flvtag_t* tag)
-{
-    if (tag->data) {
-        free (tag->data);
-    }
-
-    flvtag_init (tag);
-}
-
-int flvtag_reserve (flvtag_t* tag, uint32_t size)
-{
-    size += FLV_TAG_HEADER_SIZE + FLV_TAG_FOOTER_SIZE;
-
-    if (size > tag->aloc) {
-        tag->data = realloc (tag->data,size);
-        tag->aloc = size;
-    }
-
-    return 1;
-}
-
-FILE* flv_open_read (const char* flv)
-{
-    if (0 == flv || 0 == strcmp ("-",flv)) {
-        return stdin;
-    }
-
-    return fopen (flv,"rb");
-}
-
-FILE* flv_open_write (const char* flv)
-{
-    if (0 == flv || 0 == strcmp ("-",flv)) {
-        return stdout;
-    }
-
-    return fopen (flv,"wb");
-}
-
-FILE* flv_close (FILE* flv)
-{
-    fclose (flv);
-    return 0;
-}
-
-int flv_read_header (FILE* flv, int* has_audio, int* has_video)
-{
-    uint8_t h[FLV_HEADER_SIZE];
-
-    if (FLV_HEADER_SIZE != fread (&h[0],1,FLV_HEADER_SIZE,flv)) {
-        return 0;
-    }
-
-    if ('F' != h[0] || 'L' != h[1] || 'V' != h[2]) {
-        return 0;
-    }
-
-    (*has_audio) = h[4]&0x04;
-    (*has_video) = h[4]&0x01;
-    return 1;
-}
-
-int flv_write_header (FILE* flv, int has_audio, int has_video)
-{
-    uint8_t h[FLV_HEADER_SIZE] = {'F', 'L', 'V', 1, (has_audio?0x04:0x00) | (has_video?0x01:0x00), 0, 0, 0, 9, 0, 0, 0, 0 };
-    return FLV_HEADER_SIZE == fwrite (&h[0],1,FLV_HEADER_SIZE,flv);
-}
-
-int flv_read_tag (FILE* flv, flvtag_t* tag)
-{
-    uint32_t size;
-    uint8_t h[FLV_TAG_HEADER_SIZE];
-
-    if (FLV_TAG_HEADER_SIZE != fread (&h[0],1,FLV_TAG_HEADER_SIZE,flv)) {
-        return 0;
-    }
-
-    size = ( (h[1]<<16) | (h[2]<<8) |h[3]);
-    flvtag_reserve (tag, size);
-    // copy header to buffer
-    memcpy (tag->data,&h[0],FLV_TAG_HEADER_SIZE);
-
-    if (size+FLV_TAG_FOOTER_SIZE != fread (&tag->data[FLV_TAG_HEADER_SIZE],1,size+FLV_TAG_FOOTER_SIZE,flv)) {
-        return 0;
-    }
-
-    return 1;
-}
-
-int flv_write_tag (FILE* flv, flvtag_t* tag)
-{
-    size_t size = flvtag_raw_size (tag);
-    return size == fwrite (flvtag_raw_data (tag),1,size,flv);
-}
-////////////////////////////////////////////////////////////////////////////////
-size_t flvtag_header_size (flvtag_t* tag)
-{
-    switch (flvtag_type (tag)) {
-    case flvtag_type_audio:
-        return FLV_TAG_HEADER_SIZE + (flvtag_soundformat_aac != flvtag_soundformat (tag) ? 1 : 2);
-
-    case flvtag_type_video:
-        // CommandFrame does not have a compositionTime
-        return FLV_TAG_HEADER_SIZE + (flvtag_codecid_avc != flvtag_codecid (tag) ? 1 : (flvtag_frametype_commandframe != flvtag_frametype (tag) ? 5 : 2));
-
-    default:
-        return FLV_TAG_HEADER_SIZE;
-    }
-}
-
-size_t flvtag_payload_size (flvtag_t* tag)
-{
-    return FLV_TAG_HEADER_SIZE + flvtag_size (tag) - flvtag_header_size (tag);
-}
-
-uint8_t* flvtag_payload_data (flvtag_t* tag)
-{
-    size_t payload_offset = flvtag_header_size (tag);
-    return &tag->data[payload_offset];
-}
-////////////////////////////////////////////////////////////////////////////////
-int flvtag_updatesize (flvtag_t* tag, uint32_t size)
-{
-    tag->data[1] = size>>16; // DataSize
-    tag->data[2] = size>>8; // DataSize
-    tag->data[3] = size>>0; // DataSize
-    size += 11;
-    tag->data[size+0] = size>>24; // PrevTagSize
-    tag->data[size+1] = size>>16; // PrevTagSize
-    tag->data[size+2] = size>>8; // PrevTagSize
-    tag->data[size+3] = size>>0; // PrevTagSize
-    return 1;
-}
-
-#define FLVTAG_PREALOC 2048
-int flvtag_initavc (flvtag_t* tag, uint32_t dts, int32_t cts, flvtag_frametype_t type)
-{
-    flvtag_init (tag);
-    flvtag_reserve (tag,5+FLVTAG_PREALOC);
-    tag->data[0] = flvtag_type_video;
-    tag->data[4] = dts>>16;
-    tag->data[5] = dts>>8;
-    tag->data[6] = dts>>0;
-    tag->data[7] = dts>>24;
-    tag->data[8] = 0; // StreamID
-    tag->data[9] = 0; // StreamID
-    tag->data[10] = 0; // StreamID
-    // VideoTagHeader
-    tag->data[11] = ( (type<<4) %0xF0) |0x07; // CodecId
-    tag->data[12] = 0x01; // AVC NALU
-    tag->data[13] = cts>>16;
-    tag->data[14] = cts>>8;
-    tag->data[15] = cts>>0;
-    flvtag_updatesize (tag,5);
-    return 1;
-}
-
-int flvtag_initamf (flvtag_t* tag, uint32_t dts)
-{
-    flvtag_init (tag);
-    flvtag_reserve (tag,FLVTAG_PREALOC);
-    tag->data[0] = flvtag_type_scriptdata;
-    tag->data[4] = dts>>16;
-    tag->data[5] = dts>>8;
-    tag->data[6] = dts>>0;
-    tag->data[7] = dts>>24;
-    tag->data[8] = 0; // StreamID
-    tag->data[9] = 0; // StreamID
-    tag->data[10] = 0; // StreamID
-    flvtag_updatesize (tag,0);
-    return 1;
-}
-
-// shamelessly taken from libtomcrypt, an public domain project
-static void base64_encode (const unsigned char* in,  unsigned long inlen, unsigned char* out, unsigned long* outlen)
-{
-    static const char* codes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    unsigned long i, len2, leven;
-    unsigned char* p;
-
-    /* valid output size ? */
-    len2 = 4 * ( (inlen + 2) / 3);
-
-    if (*outlen < len2 + 1) {
-        *outlen = len2 + 1;
-        fprintf (stderr,"\n\nHERE\n\n");
-        return;
-    }
-
-    p = out;
-    leven = 3* (inlen / 3);
-
-    for (i = 0; i < leven; i += 3) {
-        *p++ = codes[ (in[0] >> 2) & 0x3F];
-        *p++ = codes[ ( ( (in[0] & 3) << 4) + (in[1] >> 4)) & 0x3F];
-        *p++ = codes[ ( ( (in[1] & 0xf) << 2) + (in[2] >> 6)) & 0x3F];
-        *p++ = codes[in[2] & 0x3F];
-        in += 3;
-    }
-
-    if (i < inlen) {
-        unsigned a = in[0];
-        unsigned b = (i+1 < inlen) ? in[1] : 0;
-
-        *p++ = codes[ (a >> 2) & 0x3F];
-        *p++ = codes[ ( ( (a & 3) << 4) + (b >> 4)) & 0x3F];
-        *p++ = (i+1 < inlen) ? codes[ ( ( (b & 0xf) << 2)) & 0x3F] : '=';
-        *p++ = '=';
-    }
-
-    /* return ok */
-    *outlen = p - out;
-}
-
-const char onCaptionInfo708[] = { 0x02,0x00,0x0D, 'o','n','C','a','p','t','i','o','n','I','n','f','o',
-                                  0x08, 0x00, 0x00, 0x00, 0x02,
-                                  0x00, 0x04, 't','y','p','e',
-                                  0x02, 0x00, 0x03, '7','0','8',
-                                  0x00, 0x04, 'd','a','t','a',
-                                  0x02, 0x00,0x00
-                                };
-
-int flvtag_amfcaption_708 (flvtag_t* tag, uint32_t timestamp, sei_message_t* msg)
-{
-    flvtag_initamf (tag,timestamp);
-    unsigned long size = 1 + (4 * ( (sei_message_size (msg) + 2) / 3));
-    flvtag_reserve (tag, sizeof (onCaptionInfo708) + size + 3);
-    memcpy (flvtag_payload_data (tag),onCaptionInfo708,sizeof (onCaptionInfo708));
-    uint8_t* data = flvtag_payload_data (tag) + sizeof (onCaptionInfo708);
-    base64_encode (sei_message_data (msg), sei_message_size (msg), data, &size);
-
-    // Update the size of the base64 string
-    data[-2] = size >> 8;
-    data[-1] = size >> 0;
-    // write the last array element
-    data[size+0] = 0x00;
-    data[size+1] = 0x00;
-    data[size+2] = 0x09;
-    flvtag_updatesize (tag, sizeof (onCaptionInfo708) + size + 3);
-
-    return 1;
-}
-
-const char onCaptionInfoUTF8[] = { 0x02,0x00,0x0D, 'o','n','C','a','p','t','i','o','n','I','n','f','o',
-                                   0x08, 0x00, 0x00, 0x00, 0x02,
-                                   0x00, 0x04, 't','y','p','e',
-                                   0x02, 0x00, 0x04, 'U','T','F','8',
-                                   0x00, 0x04, 'd','a','t','a',
-                                   0x02, 0x00,0x00
-                                 };
-
-#define MAX_AMF_STRING 65636
-int flvtag_amfcaption_utf8 (flvtag_t* tag, uint32_t timestamp, const utf8_char_t* text)
-{
-    flvtag_initamf (tag,timestamp);
-    unsigned long size = strlen (text);
-
-    if (MAX_AMF_STRING < size) {
-        size = MAX_AMF_STRING;
-    }
-
-    flvtag_reserve (tag, sizeof (onCaptionInfoUTF8) + size + 3);
-    memcpy (flvtag_payload_data (tag),onCaptionInfoUTF8,sizeof (onCaptionInfoUTF8));
-    uint8_t* data = flvtag_payload_data (tag) + sizeof (onCaptionInfo708);
-    memcpy (data,text,size);
-    // Update the size of the string
-    data[-2] = size >> 8;
-    data[-1] = size >> 0;
-    // write the last array element
-    data[size+0] = 0x00;
-    data[size+1] = 0x00;
-    data[size+2] = 0x09;
-    flvtag_updatesize (tag, sizeof (onCaptionInfoUTF8) + size + 3);
-
-    return 1;
-}
-
-#define LENGTH_SIZE 4
-
-int flvtag_avcwritenal (flvtag_t* tag, uint8_t* data, size_t size)
-{
-    uint32_t flvsize = flvtag_size (tag);
-    flvtag_reserve (tag,flvsize+LENGTH_SIZE+size);
-    uint8_t* payload = tag->data + FLV_TAG_HEADER_SIZE + flvsize;
-    payload[0] = size>>24; // nalu size
-    payload[1] = size>>16;
-    payload[2] = size>>8;
-    payload[3] = size>>0;
-    memcpy (&payload[LENGTH_SIZE],data,size);
-    flvtag_updatesize (tag,flvsize+LENGTH_SIZE+size);
-
-    return 1;
-}
-
-int flvtag_addcaption (flvtag_t* tag, const utf8_char_t* text)
-{
-    if (flvtag_avcpackettype_nalu != flvtag_avcpackettype (tag)) {
-        return 0;
-    }
-
-    sei_t sei;
-    caption_frame_t frame;
-
-    sei_init (&sei);
-    caption_frame_init (&frame);
-    caption_frame_from_text (&frame, text);
-    sei_from_caption_frame (&sei, &frame);
-
-    uint8_t* sei_data = malloc (sei_render_size (&sei));
-    size_t sei_size = sei_render (&sei, sei_data);
-
-    // rewrite tag
-    flvtag_t new_tag;
-    flvtag_initavc (&new_tag, flvtag_dts (tag), flvtag_cts (tag), flvtag_frametype (tag));
-    uint8_t* data = flvtag_payload_data (tag);
-    ssize_t  size = flvtag_payload_size (tag);
-
-    while (0<size) {
-        uint8_t*  nalu_data = &data[LENGTH_SIZE];
-        uint8_t   nalu_type = nalu_data[0]&0x1F;
-        uint32_t  nalu_size = (data[0]<<24) | (data[1]<<16) | (data[2]<<8) | data[3];
-        data += LENGTH_SIZE + nalu_size;
-        size -= LENGTH_SIZE + nalu_size;
-
-        if (0 < sei_size && 7 != nalu_type && 8 != nalu_type && 9 != nalu_type ) {
-            // fprintf (stderr,"Wrote SEI %d '%d'\n\n", sei_size, sei_data[3]);
-            flvtag_avcwritenal (&new_tag,sei_data,sei_size);
-            sei_size = 0;
-        }
-
-        flvtag_avcwritenal (&new_tag,nalu_data,nalu_size);
-    }
-
-    // On the off chance we have an empty frame,
-    // We still wish to append the sei
-    if (0<sei_size) {
-        // fprintf (stderr,"Wrote SEI %d\n\n", sei_size);
-        flvtag_avcwritenal (&new_tag,sei_data,sei_size);
-        sei_size = 0;
-    }
-
-    if (sei_data) {
-        free (sei_data);
-    }
-
-    free (tag->data);
-    sei_free (&sei);
-    tag->data = new_tag.data;
-    tag->aloc = new_tag.aloc;
-    return 1;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/flv.h Deleted

@@ -1,142 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#ifndef LIBCAPTION_FLV_H
-#define LIBCAPTION_FLV_H
-
-#include <stdio.h>
-#include <stddef.h>
-#include <inttypes.h>
-#define FLV_HEADER_SIZE     13
-#define FLV_FOOTER_SIZE      4
-#define FLV_TAG_HEADER_SIZE 11
-#define FLV_TAG_FOOTER_SIZE  4
-////////////////////////////////////////////////////////////////////////////////
-#include "avc.h"
-////////////////////////////////////////////////////////////////////////////////
-typedef struct {
-    uint8_t* data;
-    size_t   aloc;
-} flvtag_t;
-
-void flvtag_init (flvtag_t* tag);
-void flvtag_free (flvtag_t* tag);
-void flvtag_swap (flvtag_t* tag1, flvtag_t* tag2);
-////////////////////////////////////////////////////////////////////////////////
-typedef enum {
-    flvtag_type_audio      = 0x08,
-    flvtag_type_video      = 0x09,
-    flvtag_type_scriptdata = 0x12,
-} flvtag_type_t;
-
-static inline flvtag_type_t flvtag_type (flvtag_t* tag) { return (flvtag_type_t) tag->data[0]&0x1F; }
-////////////////////////////////////////////////////////////////////////////////
-typedef enum {
-    flvtag_soundformat_unknown                            = -1,
-    flvtag_soundformat_linearpcmplatformendian            =  0,
-    flvtag_soundformat_adpcm                              =  1,
-    flvtag_soundformat_mp3                                =  2,
-    flvtag_soundformat_linearpcmlittleendian              =  3,
-    flvtag_soundformat_nellymoser_16khzmono               =  4,
-    flvtag_soundformat_nellymoser_8khzmono                =  5,
-    flvtag_soundformat_nellymoser                         =  6,
-    flvtag_soundformat_g711alawlogarithmicpcm             =  7,
-    flvtag_soundformat_g711mulawlogarithmicpcm            =  8,
-    flvtag_soundformat_reserved                           =  9,
-    flvtag_soundformat_aac                                = 10,
-    flvtag_soundformat_speex                              = 11,
-    flvtag_soundformat_mp3_8khz                           = 14,
-    flvtag_soundformat_devicespecificsound                = 15
-} flvtag_soundformat_t;
-
-static inline flvtag_soundformat_t flvtag_soundformat (flvtag_t* tag) { return (flvtag_type_audio!=flvtag_type (tag)) ?flvtag_soundformat_unknown: (flvtag_soundformat_t) (tag->data[0]>>4) &0x0F; }
-////////////////////////////////////////////////////////////////////////////////
-typedef enum {
-    flvtag_codecid_unknown                = -1,
-    flvtag_codecid_sorensonh263           =  2,
-    flvtag_codecid_screenvideo            =  3,
-    flvtag_codecid_on2vp6                 =  4,
-    flvtag_codecid_on2vp6withalphachannel =  5,
-    flvtag_codecid_screenvideoversion2    =  6,
-    flvtag_codecid_avc                    =  7
-} flvtag_codecid_t;
-
-static inline flvtag_codecid_t flvtag_codecid (flvtag_t* tag) { return (flvtag_type_video!=flvtag_type (tag)) ? (flvtag_codecid_unknown) : (tag->data[11]&0x0F); }
-////////////////////////////////////////////////////////////////////////////////
-typedef enum {
-    flvtag_frametype_unknown              = -1,
-    flvtag_frametype_keyframe             =  1,
-    flvtag_frametype_interframe           =  2,
-    flvtag_frametype_disposableinterframe =  3,
-    flvtag_frametype_generatedkeyframe    =  4,
-    flvtag_frametype_commandframe         =  5
-} flvtag_frametype_t;
-
-static inline flvtag_frametype_t flvtag_frametype (flvtag_t* tag) { return (flvtag_type_video!=flvtag_type (tag)) ?flvtag_frametype_keyframe: ( (tag->data[11]>>4) &0x0F); }
-////////////////////////////////////////////////////////////////////////////////
-typedef enum {
-    flvtag_avcpackettype_unknown        = -1,
-    flvtag_avcpackettype_sequenceheader =  0,
-    flvtag_avcpackettype_nalu           =  1,
-    flvtag_avcpackettype_endofsequence  =  2
-} flvtag_avcpackettype_t;
-
-static inline flvtag_avcpackettype_t flvtag_avcpackettype (flvtag_t* tag) { return (flvtag_codecid_avc!=flvtag_codecid (tag)) ?flvtag_avcpackettype_unknown:tag->data[12]; }
-////////////////////////////////////////////////////////////////////////////////
-static inline size_t   flvtag_size (flvtag_t* tag) { return (tag->data[1]<<16) | (tag->data[2]<<8) | tag->data[3]; }
-static inline uint32_t flvtag_timestamp (flvtag_t* tag) { return (tag->data[7]<<24) | (tag->data[4]<<16) | (tag->data[5]<<8) | tag->data[6]; }
-static inline uint32_t flvtag_dts (flvtag_t* tag) { return flvtag_timestamp (tag); }
-static inline uint32_t flvtag_cts (flvtag_t* tag) { return (flvtag_avcpackettype_nalu!=flvtag_avcpackettype (tag)) ?0: (tag->data[13]<<16) | (tag->data[14]<<8) |tag->data[15]; }
-static inline uint32_t flvtag_pts (flvtag_t* tag) { return flvtag_dts (tag)+flvtag_cts (tag); }
-static inline double flvtag_dts_seconds (flvtag_t* tag) { return flvtag_dts (tag) / 1000.0; }
-static inline double flvtag_cts_seconds (flvtag_t* tag) { return flvtag_cts (tag) / 1000.0; }
-static inline double flvtag_pts_seconds (flvtag_t* tag) { return flvtag_pts (tag) / 1000.0; }
-////////////////////////////////////////////////////////////////////////////////
-size_t flvtag_header_size (flvtag_t* tag);
-size_t flvtag_payload_size (flvtag_t* tag);
-uint8_t* flvtag_payload_data (flvtag_t* tag);
-////////////////////////////////////////////////////////////////////////////////
-FILE* flv_open_read (const char* flv);
-FILE* flv_open_write (const char* flv);
-FILE* flv_close (FILE* flv);
-////////////////////////////////////////////////////////////////////////////////
-static inline const uint8_t* flvtag_raw_data (flvtag_t* tag) { return tag->data; }
-static inline const size_t flvtag_raw_size (flvtag_t* tag) { return flvtag_size (tag)+FLV_TAG_HEADER_SIZE+FLV_TAG_FOOTER_SIZE; }
-////////////////////////////////////////////////////////////////////////////////
-int flv_read_tag (FILE* flv, flvtag_t* tag);
-int flv_write_tag (FILE* flv, flvtag_t* tag);
-int flv_read_header (FILE* flv, int* has_audio, int* has_video);
-int flv_write_header (FILE* flv, int has_audio, int has_video);
-////////////////////////////////////////////////////////////////////////////////
-// If the tage has more that on sei message, they will be combined into one
-sei_t* flv_read_sei (FILE* flv, flvtag_t* tag);
-////////////////////////////////////////////////////////////////////////////////
-int flvtag_initavc (flvtag_t* tag, uint32_t dts, int32_t cts, flvtag_frametype_t type);
-int flvtag_avcwritenal (flvtag_t* tag, uint8_t* data, size_t size);
-int flvtag_addcaption (flvtag_t* tag, const utf8_char_t* text);
-////////////////////////////////////////////////////////////////////////////////
-int flvtag_amfcaption_708 (flvtag_t* tag, uint32_t timestamp, sei_message_t* msg);
-////////////////////////////////////////////////////////////////////////////////
-// This method is expermental, and not currently available on Twitch
-int flvtag_amfcaption_utf8 (flvtag_t* tag, uint32_t timestamp, const utf8_char_t* text);
-#endif

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/flv2srt.c Deleted

@@ -1,92 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include "flv.h"
-#include "srt.h"
-#include "avc.h"
-
-#define LENGTH_SIZE 4
-int main (int argc, char** argv)
-{
-    const char* path = argv[1];
-
-    sei_t sei;
-    flvtag_t tag;
-    srt_t* srt = 0, *head = 0;
-    int i, has_audio, has_video;
-    caption_frame_t frame;
-
-    flvtag_init (&tag);
-    caption_frame_init (&frame);
-
-    FILE* flv = flv_open_read (path);
-
-    if (!flv_read_header (flv,&has_audio,&has_video)) {
-        fprintf (stderr,"'%s' Not an flv file\n", path);
-    } else {
-        fprintf (stderr,"Reading from '%s'\n", path);
-    }
-
-    while (flv_read_tag (flv,&tag)) {
-        if (flvtag_avcpackettype_nalu == flvtag_avcpackettype (&tag)) {
-            ssize_t  size = flvtag_payload_size (&tag);
-            uint8_t* data = flvtag_payload_data (&tag);
-
-            while (0<size) {
-                ssize_t  nalu_size = (data[0]<<24) | (data[1]<<16) | (data[2]<<8) | data[3];
-                uint8_t* nalu_data = &data[4];
-                uint8_t  nalu_type = nalu_data[0]&0x1F;
-                data += nalu_size + LENGTH_SIZE;
-                size -= nalu_size + LENGTH_SIZE;
-
-                if (6 == nalu_type) {
-                    sei_init (&sei);
-                    sei_parse_nalu (&sei, nalu_data, nalu_size, flvtag_dts (&tag), flvtag_cts (&tag));
-
-                    cea708_t cea708;
-                    sei_message_t* msg;
-                    cea708_init (&cea708);
-
-                    // for (msg = sei_message_head (&sei) ; msg ; msg = sei_message_next (msg)) {
-                    //     if (sei_type_user_data_registered_itu_t_t35 == sei_message_type (msg)) {
-                    //         cea708_parse (sei_message_data (msg), sei_message_size (msg), &cea708);
-                    //         cea708_dump (&cea708);
-                    //     }
-                    // }
-
-                    // sei_dump(&sei);
-                    sei_to_caption_frame (&sei,&frame);
-                    sei_free (&sei);
-
-                    // caption_frame_dump (&frame);
-                    srt = srt_from_caption_frame (&frame,srt,&head);
-                }
-            }
-        }
-    }
-
-    srt_dump (head);
-    srt_free (head);
-
-    return 1;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/party.c Deleted

@@ -1,122 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "flv.h"
-#include "avc.h"
-
-#define CAPTION_METHOD_SEI_708  0 // embedded 708
-#define CAPTION_METHOD_AMF_708  1 // onCaptionInfo type = 708
-#define CAPTION_METHOD_AMF_UTF8 2 // onCaptionInfo type = utf8
-#define CAPTION_METHOD CAPTION_METHOD_SEI_708
-
-void get_dudes (char* str)
-{
-    sprintf (str, " %s%s %s(-_-)%s %s(-_-)%s.%s(-_-)%s %s%s", EIA608_CHAR_EIGHTH_NOTE, EIA608_CHAR_EIGHTH_NOTE,
-             ! (rand() % 2) ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT,
-             ! (rand() % 2) ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT,
-             ! (rand() % 2) ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT,
-             ! (rand() % 2) ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT,
-             ! (rand() % 2) ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT,
-             ! (rand() % 2) ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT,
-             EIA608_CHAR_EIGHTH_NOTE, EIA608_CHAR_EIGHTH_NOTE);
-}
-
-void write_amfcaptions_708 (FILE* out, uint32_t timestamp, const char* text)
-{
-    sei_t sei;
-    flvtag_t tag;
-    sei_message_t* msg;
-    caption_frame_t frame;
-    sei_init (&sei);
-    flvtag_init (&tag);
-    caption_frame_init (&frame);
-    caption_frame_from_text (&frame, text);
-    sei_from_caption_frame (&sei, &frame);
-    // caption_frame_dump (&frame);
-
-    for (msg = sei_message_head (&sei); msg; msg=sei_message_next (msg),++timestamp) {
-        flvtag_amfcaption_708 (&tag,timestamp,msg);
-        flv_write_tag (out,&tag);
-    }
-
-    sei_free (&sei);
-    flvtag_free (&tag);
-}
-
-
-void write_amfcaptions_utf8 (FILE* out, uint32_t timestamp, const utf8_char_t* text)
-{
-    flvtag_t tag;
-    flvtag_init (&tag);
-    flvtag_amfcaption_utf8 (&tag,timestamp,text);
-    flv_write_tag (out,&tag);
-    flvtag_free (&tag);
-}
-
-int main (int argc, char** argv)
-{
-    flvtag_t tag;
-    uint32_t nextParty = 1000;
-    int has_audio, has_video;
-    FILE* flv = flv_open_read (argv[1]);
-    FILE* out = flv_open_write (argv[2]);
-    char partyDudes[64];
-
-    flvtag_init (&tag);
-
-    if (!flv_read_header (flv,&has_audio,&has_video)) {
-        fprintf (stderr,"%s is not an flv file\n", argv[1]);
-        return EXIT_FAILURE;
-    }
-
-    flv_write_header (out,has_audio,has_video);
-
-    while (flv_read_tag (flv,&tag)) {
-
-        if (flvtag_avcpackettype_nalu == flvtag_avcpackettype (&tag) && nextParty <= flvtag_timestamp (&tag)) {
-            get_dudes (partyDudes);
-
-            if (CAPTION_METHOD == CAPTION_METHOD_SEI_708) {
-                flvtag_addcaption (&tag, partyDudes);
-            } else if (CAPTION_METHOD == CAPTION_METHOD_AMF_708) {
-                write_amfcaptions_708 (out,nextParty,partyDudes);
-            } else if (CAPTION_METHOD == CAPTION_METHOD_AMF_708) {
-                write_amfcaptions_utf8 (out, nextParty, partyDudes);
-            } else {
-                fprintf (stderr,"Unknnow method\n");
-                return EXIT_FAILURE;
-
-            }
-
-            fprintf (stderr,"%d: %s\n",nextParty, partyDudes);
-            nextParty += 500; // party all the time
-        }
-
-        flv_write_tag (out,&tag);
-    }
-
-    return EXIT_SUCCESS;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/rollup.c Deleted

@@ -1,95 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "flv.h"
-#include "avc.h"
-#include "srt.h"
-#include "wonderland.h"
-
-#define SECONDS_PER_LINE 3.0
-srt_t* appennd_caption (const utf8_char_t* data, srt_t* prev, srt_t** head)
-{
-
-    int r, c, chan = 0;
-    ssize_t size = (ssize_t) strlen (data);
-    size_t char_count, char_length, line_length = 0, trimmed_length = 0;
-
-    for (r = 0 ; 0 < size && SCREEN_ROWS > r ; ++r) {
-        line_length = utf8_line_length (data);
-        trimmed_length = utf8_trimmed_length (data,line_length);
-        char_count = utf8_char_count (data,trimmed_length);
-
-        // If char_count is greater than one line can display, split it.
-        if (SCREEN_COLS < char_count) {
-            char_count = utf8_wrap_length (data,SCREEN_COLS);
-            line_length = utf8_string_length (data,char_count+1);
-        }
-
-        // fprintf (stderr,"%.*s\n", line_length, data);
-        prev = srt_new (data, line_length, prev ? prev->timestamp + SECONDS_PER_LINE : 0, prev, head);
-
-        data += line_length;
-        size -= (ssize_t) line_length;
-    }
-
-    return prev;
-}
-
-int main (int argc, char** argv)
-{
-    int i = 0;
-    flvtag_t tag;
-    srt_t* head = 0, *tail = 0;
-    int has_audio, has_video;
-    FILE* flv = flv_open_read (argv[1]);
-    FILE* out = flv_open_write (argv[2]);
-    flvtag_init (&tag);
-
-    for (i = 0 ; wonderland[i][0]; ++i) {
-        tail = appennd_caption (wonderland[i], tail, &head);
-    }
-
-
-    if (!flv_read_header (flv,&has_audio,&has_video)) {
-        fprintf (stderr,"%s is not an flv file\n", argv[1]);
-        return EXIT_FAILURE;
-    }
-
-    flv_write_header (out,has_audio,has_video);
-
-    while (flv_read_tag (flv,&tag)) {
-        if (head && flvtag_avcpackettype_nalu == flvtag_avcpackettype (&tag) && head->timestamp <= flvtag_pts_seconds (&tag)) {
-            fprintf (stderr,"%f %s\n", flvtag_pts_seconds (&tag), srt_data (head));
-            flvtag_addcaption (&tag, srt_data (head));
-            head = srt_free_head (head);
-        }
-
-
-        flv_write_tag (out,&tag);
-    }
-
-    return EXIT_SUCCESS;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/rtmpspit.c Deleted

@@ -1,165 +0,0 @@
-#include "flv.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/select.h>
-#include <librtmp/log.h>
-#include <librtmp/rtmp.h>
-
-
-int MyRTMP_Write (RTMP* r, const char* buf, int size)
-{
-    RTMPPacket* pkt = &r->m_write;
-    char* enc;
-    int s2 = size, ret, num;
-
-    pkt->m_nChannel = 0x04;   /* source channel */
-    pkt->m_nInfoField2 = r->m_stream_id;
-
-    while (s2) {
-        if (!pkt->m_nBytesRead) {
-            if (size < 11) {
-                /* FLV pkt too small */
-                return 0;
-            }
-
-            if (buf[0] == 'F' && buf[1] == 'L' && buf[2] == 'V') {
-                buf += 13;
-                s2 -= 13;
-            }
-
-            pkt->m_packetType = *buf++;
-            pkt->m_nBodySize = AMF_DecodeInt24 (buf);
-            buf += 3;
-            pkt->m_nTimeStamp = AMF_DecodeInt24 (buf);
-            buf += 3;
-            pkt->m_nTimeStamp |= *buf++ << 24;
-            buf += 3;
-            s2 -= 11;
-
-            if ( ( (pkt->m_packetType == RTMP_PACKET_TYPE_AUDIO
-                    || pkt->m_packetType == RTMP_PACKET_TYPE_VIDEO) &&
-                    !pkt->m_nTimeStamp) || pkt->m_packetType == RTMP_PACKET_TYPE_INFO) {
-                pkt->m_headerType = RTMP_PACKET_SIZE_LARGE;
-            } else {
-                pkt->m_headerType = RTMP_PACKET_SIZE_MEDIUM;
-            }
-
-            if (!RTMPPacket_Alloc (pkt, pkt->m_nBodySize)) {
-                RTMP_Log (RTMP_LOGDEBUG, "%s, failed to allocate packet", __FUNCTION__);
-                return FALSE;
-            }
-
-            enc = pkt->m_body;
-        } else {
-            enc = pkt->m_body + pkt->m_nBytesRead;
-        }
-
-        num = pkt->m_nBodySize - pkt->m_nBytesRead;
-
-        if (num > s2) {
-            num = s2;
-        }
-
-        memcpy (enc, buf, num);
-        pkt->m_nBytesRead += num;
-        s2 -= num;
-        buf += num;
-
-        if (pkt->m_nBytesRead == pkt->m_nBodySize) {
-            ret = RTMP_SendPacket (r, pkt, FALSE);
-            RTMPPacket_Free (pkt);
-            pkt->m_nBytesRead = 0;
-
-            if (!ret) {
-                return -1;
-            }
-
-            buf += 4;
-            s2 -= 4;
-
-            if (s2 < 0) {
-                break;
-            }
-        }
-    }
-
-    return size+s2;
-}
-
-int main (int argc, const char** argv)
-{
-    FILE* flv;
-    RTMP* rtmp;
-    RTMPPacket rtmpPacket;
-
-    flvtag_t tag;
-    int32_t timestamp = 0;
-    int has_audio, has_video;
-    char* url = 0;
-
-    if (2 >= argc) {
-        fprintf (stderr,"Usage %s [input] [url]\n",argv[0]);
-    }
-
-    url = (char*) argv[2];
-    flv = flv_open_read (argv[1]);
-
-    if (! flv) {
-        fprintf (stderr,"Could not open %s\n",argv[1]);
-        return EXIT_FAILURE;
-    }
-
-    if (! flv_read_header (flv, &has_audio, &has_video)) {
-        fprintf (stderr,"Not an flv file %s\n",argv[1]);
-        return EXIT_FAILURE;
-    }
-
-    flvtag_init (&tag);
-    rtmp = RTMP_Alloc();
-    RTMP_Init (rtmp);
-    fprintf (stderr,"Connecting to %s\n", url);
-    RTMP_SetupURL (rtmp, url);
-    RTMP_EnableWrite (rtmp);
-
-    RTMP_Connect (rtmp, NULL);
-    RTMP_ConnectStream (rtmp, 0);
-    memset (&rtmpPacket, 0, sizeof (RTMPPacket));
-
-    if (! RTMP_IsConnected (rtmp)) {
-        fprintf (stderr,"RTMP_IsConnected() Error\n");
-        return EXIT_FAILURE;
-    }
-
-    while (flv_read_tag (flv,&tag)) {
-        if (! RTMP_IsConnected (rtmp) || RTMP_IsTimedout (rtmp)) {
-            fprintf (stderr,"RTMP_IsConnected() Error\n");
-            return EXIT_FAILURE;
-        }
-
-        if (flvtag_timestamp (&tag) > timestamp) {
-            usleep (1000 * (flvtag_timestamp (&tag) - timestamp));
-            timestamp = flvtag_timestamp (&tag);
-        }
-
-        MyRTMP_Write (rtmp, (const char*) flvtag_raw_data (&tag),flvtag_raw_size (&tag));
-
-        // Handle RTMP ping and such
-        fd_set sockset; struct timeval timeout = {0,0};
-        FD_ZERO (&sockset); FD_SET (RTMP_Socket (rtmp), &sockset);
-        register int result = select (RTMP_Socket (rtmp) + 1, &sockset, NULL, NULL, &timeout);
-
-        if (result == 1 && FD_ISSET (RTMP_Socket (rtmp), &sockset)) {
-            RTMP_ReadPacket (rtmp, &rtmpPacket);
-
-            if (! RTMPPacket_IsReady (&rtmpPacket)) {
-                fprintf (stderr,"Received RTMP packet\n");
-                RTMP_ClientPacket (rtmp,&rtmpPacket);
-                RTMPPacket_Free (&rtmpPacket);
-            }
-        }
-    }
-
-    return EXIT_SUCCESS;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/scc2srt.c Deleted

@@ -1,96 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "srt.h"
-#include "scc.h"
-
-#define MAX_SCC_SIZE (10*1024*1024)
-#define MAX_READ_SIZE 4096
-#define MAX_CC 128
-
-size_t read_file (FILE* file, utf8_char_t* data, size_t size)
-{
-    size_t read, totl = 0;
-
-    while (0 < (read = fread (data,1,MAX_READ_SIZE<size?MAX_READ_SIZE:size,file))) {
-        totl += read; data += read; size -= read;
-    }
-
-    return totl;
-}
-
-srt_t* scc2srt (const char* data)
-{
-    double pts;
-    size_t line_size = 0;
-    int cc_idx, count, i;
-    srt_t* srt = 0, *head = 0;
-    caption_frame_t frame;
-    uint16_t cc_data[MAX_CC];
-
-    while (0 < (line_size = utf8_line_length (data))) {
-        caption_frame_init (&frame);
-        int cc_count = scc_to_608 (data, &pts, (uint16_t*) &cc_data, MAX_CC);
-        data += line_size;
-        data += utf8_line_length (data); // skip empty line
-
-        // fprintf (stderr,"%f, %d| %.*s\n", pts, cc_count, (int) line_size,data);
-
-        for (cc_idx = 0 ; cc_idx < cc_count ; ++cc_idx) {
-            // eia608_dump (cc_data[cc_idx]);
-            caption_frame_decode (&frame,cc_data[cc_idx],pts);
-        }
-
-        // utf8_char_t buff[CAPTION_FRAME_DUMP_BUF_SIZE];
-        // size_t size = caption_frame_dump (&frame, buff);
-        // fprintf (stderr,"%s\n", buff);
-        srt = srt_from_caption_frame (&frame,srt,&head);
-    }
-
-    return head;
-}
-
-int main (int argc, char** argv)
-{
-    char frame_buf[CAPTION_FRAME_DUMP_BUF_SIZE];
-
-    if (argc < 2) {
-        return 0;
-    }
-
-    FILE* file = fopen (argv[1],"r");
-
-    if (! file) {
-        return 0;
-    }
-
-    utf8_char_t* data = malloc (MAX_SCC_SIZE);
-    read_file (file,data,MAX_SCC_SIZE);
-    srt_t* srt = scc2srt (data);
-    srt_dump (srt);
-    srt_free (srt);
-    free (data);
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/srt2vtt.c Deleted

@@ -1,64 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "srt.h"
-
-#define MAX_SRT_SIZE (10*1024*1024)
-#define MAX_READ_SIZE 4096
-
-size_t read_file (FILE* file, utf8_char_t* data, size_t size)
-{
-    size_t read, totl = 0;
-
-    while (0 < (read = fread (data,1,MAX_READ_SIZE<size?MAX_READ_SIZE:size,file))) {
-        totl += read; data += read; size -= read;
-    }
-
-    return totl;
-}
-
-int main (int argc, char** argv)
-{
-    srt_t* srt;
-    caption_frame_t frame;
-    char frame_buf[CAPTION_FRAME_DUMP_BUF_SIZE];
-
-    if (argc < 2) {
-        return 0;
-    }
-
-    FILE* file = fopen (argv[1],"r");
-
-    if (! file) {
-        return 0;
-    }
-
-    utf8_char_t* data = malloc (MAX_SRT_SIZE);
-    size_t size = read_file (file,data,MAX_SRT_SIZE);
-    srt_t* head = srt_parse (data,size);
-    vtt_dump (head);
-    srt_free (head);
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/srtdump.c Deleted

@@ -1,71 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "srt.h"
-#include "avc.h"
-// #include "sei.h"
-
-#define MAX_SRT_SIZE (10*1024*1024)
-#define MAX_READ_SIZE 4096
-
-size_t read_file (FILE* file, utf8_char_t* data, size_t size)
-{
-    size_t read, totl = 0;
-
-    while (0 < (read = fread (data,1,MAX_READ_SIZE<size?MAX_READ_SIZE:size,file))) {
-        totl += read; data += read; size -= read;
-    }
-
-    return totl;
-}
-
-int main (int argc, char** argv)
-{
-    srt_t* srt;
-    caption_frame_t frame;
-
-    if (argc < 2) {
-        return 0;
-    }
-
-    FILE* file = fopen (argv[1],"r");
-
-    if (! file) {
-        return 0;
-    }
-
-    utf8_char_t* data = (utf8_char_t*) malloc (MAX_SRT_SIZE);
-    size_t size = read_file (file,data,MAX_SRT_SIZE);
-    srt_t* head = srt_parse (data,size);
-
-    for (srt = head ; srt ; srt = srt->next) {
-        caption_frame_init (&frame);
-        srt_to_caption_frame (srt,&frame);
-        caption_frame_dump (&frame);
-    }
-
-    srt_free (head);
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/ts.c Deleted

@@ -1,117 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include "ts.h"
-#include <string.h>
-
-void ts_init (ts_t* ts)
-{
-    memset (ts,0,sizeof (ts_t));
-}
-
-static int64_t ts_parse_pts (const uint8_t* data)
-{
-    // 0000 1110  1111 1111  1111 1110  1111 1111  1111 1110
-    uint64_t pts = 0;
-    pts |= (uint64_t) (data[0] & 0x0E) << 29;
-    pts |= (uint64_t) (data[1] & 0xFF) << 22;
-    pts |= (uint64_t) (data[2] & 0xFE) << 14;
-    pts |= (uint64_t) (data[3] & 0xFF) <<  7;
-    pts |= (uint64_t) (data[4] & 0xFE) >>  1;
-    return pts;
-}
-
-int ts_parse_packet (ts_t* ts, const uint8_t* data)
-{
-    size_t i = 0;
-    int pusi = !! (data[i + 1] & 0x40);  // Payload Unit Start Indicator
-    int16_t pid = ( (data[i + 1] & 0x1F) << 8) | data[i + 2];    // PID
-    int adaption_present = !! (data[i + 3] & 0x20);  // Adaptation field exist
-    int payload_present = !! (data[i + 3] & 0x10);  // Contains payload
-    i += 4;
-
-    ts->data = 0;
-    ts->size = 0;
-
-    if (adaption_present) {
-        uint8_t adaption_length = data[i + 0]; // adaption field length
-        i += 1 + adaption_length;
-    }
-
-    if (pid == 0) {
-        if (payload_present) {
-            // Skip the payload.
-            i += data[i] + 1;
-        }
-
-        ts->pmtpid = ( (data[i + 10] & 0x1F) << 8) | data[i + 11];
-    } else if (pid == ts->pmtpid) {
-        // PMT
-        if (payload_present) {
-            // Skip the payload.
-            i += data[i] + 1;
-        }
-
-        uint16_t section_length = ( (data[i + 1] & 0x0F) << 8) | data[i + 2];
-        int current = data[i + 5] & 0x01;
-        int16_t program_info_length = ( (data[i + 10] & 0x0F) << 8) | data[i + 11];
-        int16_t descriptor_loop_length = section_length - (9 + program_info_length + 4);   // 4 for the crc
-
-        i += 12 + program_info_length;
-
-        if (current) {
-            while (descriptor_loop_length >= 5) {
-                uint8_t stream_type    = data[i];
-                int16_t elementary_pid = ( (data[i + 1] & 0x1F) << 8) | data[i + 2];
-                int16_t esinfo_length  = ( (data[i + 3] & 0x0F) << 8) | data[i + 4];
-
-                if (0x1B == stream_type) {
-                    ts->avcpid = elementary_pid;
-                }
-
-                i += 5 + esinfo_length;
-                descriptor_loop_length -= 5 + esinfo_length;
-            }
-        }
-    } else if (payload_present && pid == ts->avcpid) {
-        if (pusi) {
-            // int data_alignment = !! (data[i + 6] & 0x04);
-            int has_pts = !! (data[i + 7] & 0x80);
-            int has_dts = !! (data[i + 7] & 0x40);
-            uint8_t header_length = data[i + 8];
-
-            if (has_pts) {
-                ts->pts = ts_parse_pts (&data[i + 9]);
-                ts->dts = has_dts ? ts_parse_pts (&data[i + 14]) : ts->pts;
-            }
-
-            i += 9 + header_length;
-        }
-
-        ts->data = &data[i];
-        ts->size = TS_PACKET_SIZE-i;
-        return LIBCAPTION_READY;
-    }
-
-    return LIBCAPTION_OK;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/ts.h Deleted

@@ -1,49 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#ifndef LIBCAPTION_TS_H
-#define LIBCAPTION_TS_H
-#include "caption.h"
-typedef struct {
-    int16_t pmtpid;
-    int16_t avcpid;
-    int64_t pts;
-    int64_t dts;
-    size_t  size;
-    const uint8_t* data;
-} ts_t;
-
-/*! \brief
-    \param
-
-    Expects 188 byte TS packet
-*/
-#define TS_PACKET_SIZE 188
-void ts_init (ts_t* ts);
-int ts_parse_packet (ts_t* ts, const uint8_t* data);
-// return timestamp in seconds
-static inline double ts_dts_seconds (ts_t* ts) { return ts->dts / 90000.0; }
-static inline double ts_pts_seconds (ts_t* ts) { return ts->pts / 90000.0; }
-static inline double ts_cts_seconds (ts_t* ts) { return (ts->dts - ts->pts) / 90000.0; }
-
-#endif

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/ts2srt.c Deleted

@@ -1,101 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include "ts.h"
-#include "srt.h"
-#include "avc.h"
-#include <stdio.h>
-
-int main (int argc, char** argv)
-{
-    const char* path = argv[1];
-
-    ts_t ts;
-    sei_t sei;
-    avcnalu_t nalu;
-    srt_t* srt = 0, *head = 0;
-    caption_frame_t frame;
-    uint8_t pkt[TS_PACKET_SIZE];
-    ts_init (&ts);
-    avcnalu_init (&nalu);
-    caption_frame_init (&frame);
-
-    FILE* file = fopen (path,"rb+");
-
-    while (TS_PACKET_SIZE == fread (&pkt[0],1,TS_PACKET_SIZE, file)) {
-        switch (ts_parse_packet (&ts,&pkt[0])) {
-        case LIBCAPTION_OK:
-            // fprintf (stderr,"read ts packet\n");
-            break;
-
-        case LIBCAPTION_READY: {
-            // fprintf (stderr,"read ts packet DATA\n");
-            while (ts.size) {
-                // fprintf (stderr,"ts.size %d (%02X%02X%02X%02X)\n",ts.size, ts.data[0], ts.data[1], ts.data[2], ts.data[3]);
-
-                switch (avcnalu_parse_annexb (&nalu, &ts.data, &ts.size)) {
-                case LIBCAPTION_OK:
-                    break;
-
-                case LIBCAPTION_ERROR:
-                    // fprintf (stderr,"LIBCAPTION_ERROR == avcnalu_parse_annexb()\n");
-                    avcnalu_init (&nalu);
-                    break;
-
-                case LIBCAPTION_READY: {
-
-                    if (6 == avcnalu_type (&nalu)) {
-                        // fprintf (stderr,"NALU %d (%d)\n", avcnalu_type (&nalu), avcnalu_size (&nalu));
-                        sei_init (&sei);
-                        sei_parse_avcnalu (&sei, &nalu, ts_dts_seconds (&ts), ts_cts_seconds (&ts));
-
-                        // sei_dump (&sei);
-
-                        if (LIBCAPTION_READY == sei_to_caption_frame (&sei,&frame)) {
-                            // caption_frame_dump (&frame);
-                            srt = srt_from_caption_frame (&frame,srt,&head);
-
-                            // srt_dump (srt);
-                        }
-
-                        sei_free (&sei);
-                    }
-
-                    avcnalu_init (&nalu);
-                } break;
-                }
-            }
-        } break;
-
-        case LIBCAPTION_ERROR:
-            // fprintf (stderr,"read ts packet ERROR\n");
-            break;
-        }
-
-    }
-
-    srt_dump (head);
-    srt_free (head);
-
-    return 1;
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/examples/wonderland.h Deleted

@@ -1,2794 +0,0 @@
-const char* wonderland[] = {
-    "Project Gutenberg’s Alice’s Adventures in Wonderland, by Lewis Carroll",
-    "This eBook is for the use of anyone anywhere at no cost and with",
-    "almost no restrictions whatsoever.  You may copy it, give it away or",
-    "re-use it under the terms of the Project Gutenberg License included",
-    "with this eBook or online at www.gutenberg.org",
-    "Title: Alice’s Adventures in Wonderland",
-    "Author: Lewis Carroll",
-    "Posting Date: June 25, 2008 [EBook #11]",
-    "Release Date: March, 1994",
-    "Last Updated: October 6, 2016",
-    "Language: English",
-    "Character set encoding: UTF-8",
-    "*** START OF THIS PROJECT GUTENBERG EBOOK ALICE’S ADVENTURES IN WONDERLAND ***",
-    "ALICE’S ADVENTURES IN WONDERLAND",
-    "Lewis Carroll",
-    "THE MILLENNIUM FULCRUM EDITION 3.0",
-    "CHAPTER I. Down the Rabbit-Hole",
-    "Alice was beginning to get very tired of sitting by her sister on the",
-    "bank, and of having nothing to do: once or twice she had peeped into the",
-    "book her sister was reading, but it had no pictures or conversations in",
-    "it, ‘and what is the use of a book,’ thought Alice ‘without pictures or",
-    "conversations?’",
-    "So she was considering in her own mind (as well as she could, for the",
-    "hot day made her feel very sleepy and stupid), whether the pleasure",
-    "of making a daisy-chain would be worth the trouble of getting up and",
-    "picking the daisies, when suddenly a White Rabbit with pink eyes ran",
-    "close by her.",
-    "There was nothing so VERY remarkable in that; nor did Alice think it so",
-    "VERY much out of the way to hear the Rabbit say to itself, ‘Oh dear!",
-    "Oh dear! I shall be late!’ (when she thought it over afterwards, it",
-    "occurred to her that she ought to have wondered at this, but at the time",
-    "it all seemed quite natural); but when the Rabbit actually TOOK A WATCH",
-    "OUT OF ITS WAISTCOAT-POCKET, and looked at it, and then hurried on,",
-    "Alice started to her feet, for it flashed across her mind that she had",
-    "never before seen a rabbit with either a waistcoat-pocket, or a watch",
-    "to take out of it, and burning with curiosity, she ran across the field",
-    "after it, and fortunately was just in time to see it pop down a large",
-    "rabbit-hole under the hedge.",
-    "In another moment down went Alice after it, never once considering how",
-    "in the world she was to get out again.",
-    "The rabbit-hole went straight on like a tunnel for some way, and then",
-    "dipped suddenly down, so suddenly that Alice had not a moment to think",
-    "about stopping herself before she found herself falling down a very deep",
-    "well.",
-    "Either the well was very deep, or she fell very slowly, for she had",
-    "plenty of time as she went down to look about her and to wonder what was",
-    "going to happen next. First, she tried to look down and make out what",
-    "she was coming to, but it was too dark to see anything; then she",
-    "looked at the sides of the well, and noticed that they were filled with",
-    "cupboards and book-shelves; here and there she saw maps and pictures",
-    "hung upon pegs. She took down a jar from one of the shelves as",
-    "she passed; it was labelled ‘ORANGE MARMALADE’, but to her great",
-    "disappointment it was empty: she did not like to drop the jar for fear",
-    "of killing somebody, so managed to put it into one of the cupboards as",
-    "she fell past it.",
-    "‘Well!’ thought Alice to herself, ‘after such a fall as this, I shall",
-    "think nothing of tumbling down stairs! How brave they’ll all think me at",
-    "home! Why, I wouldn’t say anything about it, even if I fell off the top",
-    "of the house!’ (Which was very likely true.)",
-    "Down, down, down. Would the fall NEVER come to an end! ‘I wonder how",
-    "many miles I’ve fallen by this time?’ she said aloud. ‘I must be getting",
-    "somewhere near the centre of the earth. Let me see: that would be four",
-    "thousand miles down, I think--’ (for, you see, Alice had learnt several",
-    "things of this sort in her lessons in the schoolroom, and though this",
-    "was not a VERY good opportunity for showing off her knowledge, as there",
-    "was no one to listen to her, still it was good practice to say it over)",
-    "‘--yes, that’s about the right distance--but then I wonder what Latitude",
-    "or Longitude I’ve got to?’ (Alice had no idea what Latitude was, or",
-    "Longitude either, but thought they were nice grand words to say.)",
-    "Presently she began again. ‘I wonder if I shall fall right THROUGH the",
-    "earth! How funny it’ll seem to come out among the people that walk with",
-    "their heads downward! The Antipathies, I think--’ (she was rather glad",
-    "there WAS no one listening, this time, as it didn’t sound at all the",
-    "right word) ‘--but I shall have to ask them what the name of the country",
-    "is, you know. Please, Ma’am, is this New Zealand or Australia?’ (and",
-    "she tried to curtsey as she spoke--fancy CURTSEYING as you’re falling",
-    "through the air! Do you think you could manage it?) ‘And what an",
-    "ignorant little girl she’ll think me for asking! No, it’ll never do to",
-    "ask: perhaps I shall see it written up somewhere.’",
-    "Down, down, down. There was nothing else to do, so Alice soon began",
-    "talking again. ‘Dinah’ll miss me very much to-night, I should think!’",
-    "(Dinah was the cat.) ‘I hope they’ll remember her saucer of milk at",
-    "tea-time. Dinah my dear! I wish you were down here with me! There are no",
-    "mice in the air, I’m afraid, but you might catch a bat, and that’s very",
-    "like a mouse, you know. But do cats eat bats, I wonder?’ And here Alice",
-    "began to get rather sleepy, and went on saying to herself, in a dreamy",
-    "sort of way, ‘Do cats eat bats? Do cats eat bats?’ and sometimes, ‘Do",
-    "bats eat cats?’ for, you see, as she couldn’t answer either question,",
-    "it didn’t much matter which way she put it. She felt that she was dozing",
-    "off, and had just begun to dream that she was walking hand in hand with",
-    "Dinah, and saying to her very earnestly, ‘Now, Dinah, tell me the truth:",
-    "did you ever eat a bat?’ when suddenly, thump! thump! down she came upon",
-    "a heap of sticks and dry leaves, and the fall was over.",
-    "Alice was not a bit hurt, and she jumped up on to her feet in a moment:",
-    "she looked up, but it was all dark overhead; before her was another",
-    "long passage, and the White Rabbit was still in sight, hurrying down it.",
-    "There was not a moment to be lost: away went Alice like the wind, and",
-    "was just in time to hear it say, as it turned a corner, ‘Oh my ears",
-    "and whiskers, how late it’s getting!’ She was close behind it when she",
-    "turned the corner, but the Rabbit was no longer to be seen: she found",
-    "herself in a long, low hall, which was lit up by a row of lamps hanging",
-    "from the roof.",
-    "There were doors all round the hall, but they were all locked; and when",
-    "Alice had been all the way down one side and up the other, trying every",
-    "door, she walked sadly down the middle, wondering how she was ever to",
-    "get out again.",
-    "Suddenly she came upon a little three-legged table, all made of solid",
-    "glass; there was nothing on it except a tiny golden key, and Alice’s",
-    "first thought was that it might belong to one of the doors of the hall;",
-    "but, alas! either the locks were too large, or the key was too small,",
-    "but at any rate it would not open any of them. However, on the second",
-    "time round, she came upon a low curtain she had not noticed before, and",
-    "behind it was a little door about fifteen inches high: she tried the",
-    "little golden key in the lock, and to her great delight it fitted!",
-    "Alice opened the door and found that it led into a small passage, not",
-    "much larger than a rat-hole: she knelt down and looked along the passage",
-    "into the loveliest garden you ever saw. How she longed to get out of",
-    "that dark hall, and wander about among those beds of bright flowers and",
-    "those cool fountains, but she could not even get her head through the",
-    "doorway; ‘and even if my head would go through,’ thought poor Alice, ‘it",
-    "would be of very little use without my shoulders. Oh, how I wish I could",
-    "shut up like a telescope! I think I could, if I only knew how to begin.’",
-    "For, you see, so many out-of-the-way things had happened lately,",
-    "that Alice had begun to think that very few things indeed were really",
-    "impossible.",
-    "There seemed to be no use in waiting by the little door, so she went",
-    "back to the table, half hoping she might find another key on it, or at",
-    "any rate a book of rules for shutting people up like telescopes: this",
-    "time she found a little bottle on it, [‘which certainly was not here",
-    "before,’ said Alice,) and round the neck of the bottle was a paper",
-    "label, with the words ‘DRINK ME’ beautifully printed on it in large",
-    "letters.",
-    "It was all very well to say ‘Drink me,’ but the wise little Alice was",
-    "not going to do THAT in a hurry. ‘No, I’ll look first,’ she said, ‘and",
-    "see whether it’s marked “poison” or not’; for she had read several nice",
-    "little histories about children who had got burnt, and eaten up by wild",
-    "beasts and other unpleasant things, all because they WOULD not remember",
-    "the simple rules their friends had taught them: such as, that a red-hot",
-    "poker will burn you if you hold it too long; and that if you cut your",
-    "finger VERY deeply with a knife, it usually bleeds; and she had never",
-    "forgotten that, if you drink much from a bottle marked ‘poison,’ it is",
-    "almost certain to disagree with you, sooner or later.",
-    "However, this bottle was NOT marked ‘poison,’ so Alice ventured to taste",
-    "it, and finding it very nice, (it had, in fact, a sort of mixed flavour",
-    "of cherry-tart, custard, pine-apple, roast turkey, toffee, and hot",
-    "buttered toast,) she very soon finished it off.",
-    "  *    *    *    *    *    *    *",
-    "    *    *    *    *    *    *",
-    "  *    *    *    *    *    *    *",
-    "‘What a curious feeling!’ said Alice; ‘I must be shutting up like a",
-    "telescope.’",
-    "And so it was indeed: she was now only ten inches high, and her face",
-    "brightened up at the thought that she was now the right size for going",
-    "through the little door into that lovely garden. First, however, she",
-    "waited for a few minutes to see if she was going to shrink any further:",
-    "she felt a little nervous about this; ‘for it might end, you know,’ said",
-    "Alice to herself, ‘in my going out altogether, like a candle. I wonder",
-    "what I should be like then?’ And she tried to fancy what the flame of a",
-    "candle is like after the candle is blown out, for she could not remember",
-    "ever having seen such a thing.",
-    "After a while, finding that nothing more happened, she decided on going",
-    "into the garden at once; but, alas for poor Alice! when she got to the",
-    "door, she found she had forgotten the little golden key, and when she",
-    "went back to the table for it, she found she could not possibly reach",
-    "it: she could see it quite plainly through the glass, and she tried her",
-    "best to climb up one of the legs of the table, but it was too slippery;",
-    "and when she had tired herself out with trying, the poor little thing",
-    "sat down and cried.",
-    "‘Come, there’s no use in crying like that!’ said Alice to herself,",
-    "rather sharply; ‘I advise you to leave off this minute!’ She generally",
-    "gave herself very good advice, (though she very seldom followed it),",
-    "and sometimes she scolded herself so severely as to bring tears into",
-    "her eyes; and once she remembered trying to box her own ears for having",
-    "cheated herself in a game of croquet she was playing against herself,",
-    "for this curious child was very fond of pretending to be two people.",
-    "‘But it’s no use now,’ thought poor Alice, ‘to pretend to be two people!",
-    "Why, there’s hardly enough of me left to make ONE respectable person!’",
-    "Soon her eye fell on a little glass box that was lying under the table:",
-    "she opened it, and found in it a very small cake, on which the words",
-    "‘EAT ME’ were beautifully marked in currants. ‘Well, I’ll eat it,’ said",
-    "Alice, ‘and if it makes me grow larger, I can reach the key; and if it",
-    "makes me grow smaller, I can creep under the door; so either way I’ll",
-    "get into the garden, and I don’t care which happens!’",
-    "She ate a little bit, and said anxiously to herself, ‘Which way? Which",
-    "way?’, holding her hand on the top of her head to feel which way it was",
-    "growing, and she was quite surprised to find that she remained the same",
-    "size: to be sure, this generally happens when one eats cake, but Alice",
-    "had got so much into the way of expecting nothing but out-of-the-way",
-    "things to happen, that it seemed quite dull and stupid for life to go on",
-    "in the common way.",
-    "So she set to work, and very soon finished off the cake.",
-    "  *    *    *    *    *    *    *",
-    "    *    *    *    *    *    *",
-    "  *    *    *    *    *    *    *",
-    "CHAPTER II. The Pool of Tears",
-    "‘Curiouser and curiouser!’ cried Alice (she was so much surprised, that",
-    "for the moment she quite forgot how to speak good English); ‘now I’m",
-    "opening out like the largest telescope that ever was! Good-bye, feet!’",
-    "(for when she looked down at her feet, they seemed to be almost out of",
-    "sight, they were getting so far off). ‘Oh, my poor little feet, I wonder",
-    "who will put on your shoes and stockings for you now, dears? I’m sure",
-    "_I_ shan’t be able! I shall be a great deal too far off to trouble",
-    "myself about you: you must manage the best way you can;--but I must be",
-    "kind to them,’ thought Alice, ‘or perhaps they won’t walk the way I want",
-    "to go! Let me see: I’ll give them a new pair of boots every Christmas.’",
-    "And she went on planning to herself how she would manage it. ‘They must",
-    "go by the carrier,’ she thought; ‘and how funny it’ll seem, sending",
-    "presents to one’s own feet! And how odd the directions will look!",
-    "     ALICE’S RIGHT FOOT, ESQ.",
-    "       HEARTHRUG,",
-    "         NEAR THE FENDER,",
-    "           (WITH ALICE’S LOVE).",
-    "Oh dear, what nonsense I’m talking!’",
-    "Just then her head struck against the roof of the hall: in fact she was",
-    "now more than nine feet high, and she at once took up the little golden",
-    "key and hurried off to the garden door.",
-    "Poor Alice! It was as much as she could do, lying down on one side, to",
-    "look through into the garden with one eye; but to get through was more",
-    "hopeless than ever: she sat down and began to cry again.",
-    "‘You ought to be ashamed of yourself,’ said Alice, ‘a great girl like",
-    "you,’ (she might well say this), ‘to go on crying in this way! Stop this",
-    "moment, I tell you!’ But she went on all the same, shedding gallons of",
-    "tears, until there was a large pool all round her, about four inches",
-    "deep and reaching half down the hall.",
-    "After a time she heard a little pattering of feet in the distance, and",
-    "she hastily dried her eyes to see what was coming. It was the White",
-    "Rabbit returning, splendidly dressed, with a pair of white kid gloves in",
-    "one hand and a large fan in the other: he came trotting along in a great",
-    "hurry, muttering to himself as he came, ‘Oh! the Duchess, the Duchess!",
-    "Oh! won’t she be savage if I’ve kept her waiting!’ Alice felt so",
-    "desperate that she was ready to ask help of any one; so, when the Rabbit",
-    "came near her, she began, in a low, timid voice, ‘If you please, sir--’",
-    "The Rabbit started violently, dropped the white kid gloves and the fan,",
-    "and skurried away into the darkness as hard as he could go.",
-    "Alice took up the fan and gloves, and, as the hall was very hot, she",
-    "kept fanning herself all the time she went on talking: ‘Dear, dear! How",
-    "queer everything is to-day! And yesterday things went on just as usual.",
-    "I wonder if I’ve been changed in the night? Let me think: was I the",
-    "same when I got up this morning? I almost think I can remember feeling a",
-    "little different. But if I’m not the same, the next question is, Who",
-    "in the world am I? Ah, THAT’S the great puzzle!’ And she began thinking",
-    "over all the children she knew that were of the same age as herself, to",
-    "see if she could have been changed for any of them.",
-    "‘I’m sure I’m not Ada,’ she said, ‘for her hair goes in such long",
-    "ringlets, and mine doesn’t go in ringlets at all; and I’m sure I can’t",
-    "be Mabel, for I know all sorts of things, and she, oh! she knows such a",
-    "very little! Besides, SHE’S she, and I’m I, and--oh dear, how puzzling",
-    "it all is! I’ll try if I know all the things I used to know. Let me",
-    "see: four times five is twelve, and four times six is thirteen, and",
-    "four times seven is--oh dear! I shall never get to twenty at that rate!",
-    "However, the Multiplication Table doesn’t signify: let’s try Geography.",
-    "London is the capital of Paris, and Paris is the capital of Rome, and",
-    "Rome--no, THAT’S all wrong, I’m certain! I must have been changed for",
-    "Mabel! I’ll try and say “How doth the little--“’ and she crossed her",
-    "hands on her lap as if she were saying lessons, and began to repeat it,",
-    "but her voice sounded hoarse and strange, and the words did not come the",
-    "same as they used to do:--",
-    "     ‘How doth the little crocodile",
-    "      Improve his shining tail,",
-    "     And pour the waters of the Nile",
-    "      On every golden scale!",
-    "     ‘How cheerfully he seems to grin,",
-    "      How neatly spread his claws,",
-    "     And welcome little fishes in",
-    "      With gently smiling jaws!’",
-    "‘I’m sure those are not the right words,’ said poor Alice, and her eyes",
-    "filled with tears again as she went on, ‘I must be Mabel after all, and",
-    "I shall have to go and live in that poky little house, and have next to",
-    "no toys to play with, and oh! ever so many lessons to learn! No, I’ve",
-    "made up my mind about it; if I’m Mabel, I’ll stay down here! It’ll be no",
-    "use their putting their heads down and saying “Come up again, dear!” I",
-    "shall only look up and say “Who am I then? Tell me that first, and then,",
-    "if I like being that person, I’ll come up: if not, I’ll stay down here",
-    "till I’m somebody else”--but, oh dear!’ cried Alice, with a sudden burst",
-    "of tears, ‘I do wish they WOULD put their heads down! I am so VERY tired",
-    "of being all alone here!’",
-    "As she said this she looked down at her hands, and was surprised to see",
-    "that she had put on one of the Rabbit’s little white kid gloves while",
-    "she was talking. ‘How CAN I have done that?’ she thought. ‘I must",
-    "be growing small again.’ She got up and went to the table to measure",
-    "herself by it, and found that, as nearly as she could guess, she was now",
-    "about two feet high, and was going on shrinking rapidly: she soon found",
-    "out that the cause of this was the fan she was holding, and she dropped",
-    "it hastily, just in time to avoid shrinking away altogether.",
-    "‘That WAS a narrow escape!’ said Alice, a good deal frightened at the",
-    "sudden change, but very glad to find herself still in existence; ‘and",
-    "now for the garden!’ and she ran with all speed back to the little door:",
-    "but, alas! the little door was shut again, and the little golden key was",
-    "lying on the glass table as before, ‘and things are worse than ever,’",
-    "thought the poor child, ‘for I never was so small as this before, never!",
-    "And I declare it’s too bad, that it is!’",
-    "As she said these words her foot slipped, and in another moment, splash!",
-    "she was up to her chin in salt water. Her first idea was that she",
-    "had somehow fallen into the sea, ‘and in that case I can go back by",
-    "railway,’ she said to herself. (Alice had been to the seaside once in",
-    "her life, and had come to the general conclusion, that wherever you go",
-    "to on the English coast you find a number of bathing machines in the",
-    "sea, some children digging in the sand with wooden spades, then a row",
-    "of lodging houses, and behind them a railway station.) However, she soon",
-    "made out that she was in the pool of tears which she had wept when she",
-    "was nine feet high.",
-    "‘I wish I hadn’t cried so much!’ said Alice, as she swam about, trying",
-    "to find her way out. ‘I shall be punished for it now, I suppose, by",
-    "being drowned in my own tears! That WILL be a queer thing, to be sure!",
-    "However, everything is queer to-day.’",
-    "Just then she heard something splashing about in the pool a little way",
-    "off, and she swam nearer to make out what it was: at first she thought",
-    "it must be a walrus or hippopotamus, but then she remembered how small",
-    "she was now, and she soon made out that it was only a mouse that had",
-    "slipped in like herself.",
-    "‘Would it be of any use, now,’ thought Alice, ‘to speak to this mouse?",
-    "Everything is so out-of-the-way down here, that I should think very",
-    "likely it can talk: at any rate, there’s no harm in trying.’ So she",
-    "began: ‘O Mouse, do you know the way out of this pool? I am very tired",
-    "of swimming about here, O Mouse!’ (Alice thought this must be the right",
-    "way of speaking to a mouse: she had never done such a thing before, but",
-    "she remembered having seen in her brother’s Latin Grammar, ‘A mouse--of",
-    "a mouse--to a mouse--a mouse--O mouse!’) The Mouse looked at her rather",
-    "inquisitively, and seemed to her to wink with one of its little eyes,",
-    "but it said nothing.",
-    "‘Perhaps it doesn’t understand English,’ thought Alice; ‘I daresay it’s",
-    "a French mouse, come over with William the Conqueror.’ (For, with all",
-    "her knowledge of history, Alice had no very clear notion how long ago",
-    "anything had happened.) So she began again: ‘Ou est ma chatte?’ which",
-    "was the first sentence in her French lesson-book. The Mouse gave a",
-    "sudden leap out of the water, and seemed to quiver all over with fright.",
-    "‘Oh, I beg your pardon!’ cried Alice hastily, afraid that she had hurt",
-    "the poor animal’s feelings. ‘I quite forgot you didn’t like cats.’",
-    "‘Not like cats!’ cried the Mouse, in a shrill, passionate voice. ‘Would",
-    "YOU like cats if you were me?’",
-    "‘Well, perhaps not,’ said Alice in a soothing tone: ‘don’t be angry",
-    "about it. And yet I wish I could show you our cat Dinah: I think you’d",
-    "take a fancy to cats if you could only see her. She is such a dear quiet",
-    "thing,’ Alice went on, half to herself, as she swam lazily about in the",
-    "pool, ‘and she sits purring so nicely by the fire, licking her paws and",
-    "washing her face--and she is such a nice soft thing to nurse--and she’s",
-    "such a capital one for catching mice--oh, I beg your pardon!’ cried",
-    "Alice again, for this time the Mouse was bristling all over, and she",
-    "felt certain it must be really offended. ‘We won’t talk about her any",
-    "more if you’d rather not.’",
-    "‘We indeed!’ cried the Mouse, who was trembling down to the end of his",
-    "tail. ‘As if I would talk on such a subject! Our family always HATED",
-    "cats: nasty, low, vulgar things! Don’t let me hear the name again!’",
-    "‘I won’t indeed!’ said Alice, in a great hurry to change the subject of",
-    "conversation. ‘Are you--are you fond--of--of dogs?’ The Mouse did not",
-    "answer, so Alice went on eagerly: ‘There is such a nice little dog near",
-    "our house I should like to show you! A little bright-eyed terrier, you",
-    "know, with oh, such long curly brown hair! And it’ll fetch things when",
-    "you throw them, and it’ll sit up and beg for its dinner, and all sorts",
-    "of things--I can’t remember half of them--and it belongs to a farmer,",
-    "you know, and he says it’s so useful, it’s worth a hundred pounds! He",
-    "says it kills all the rats and--oh dear!’ cried Alice in a sorrowful",
-    "tone, ‘I’m afraid I’ve offended it again!’ For the Mouse was swimming",
-    "away from her as hard as it could go, and making quite a commotion in",
-    "the pool as it went.",
-    "So she called softly after it, ‘Mouse dear! Do come back again, and we",
-    "won’t talk about cats or dogs either, if you don’t like them!’ When the",
-    "Mouse heard this, it turned round and swam slowly back to her: its",
-    "face was quite pale (with passion, Alice thought), and it said in a low",
-    "trembling voice, ‘Let us get to the shore, and then I’ll tell you my",
-    "history, and you’ll understand why it is I hate cats and dogs.’",
-    "It was high time to go, for the pool was getting quite crowded with the",
-    "birds and animals that had fallen into it: there were a Duck and a Dodo,",
-    "a Lory and an Eaglet, and several other curious creatures. Alice led the",
-    "way, and the whole party swam to the shore.",
-    "CHAPTER III. A Caucus-Race and a Long Tale",
-    "They were indeed a queer-looking party that assembled on the bank--the",
-    "birds with draggled feathers, the animals with their fur clinging close",
-    "to them, and all dripping wet, cross, and uncomfortable.",
-    "The first question of course was, how to get dry again: they had a",
-    "consultation about this, and after a few minutes it seemed quite natural",
-    "to Alice to find herself talking familiarly with them, as if she had",
-    "known them all her life. Indeed, she had quite a long argument with the",
-    "Lory, who at last turned sulky, and would only say, ‘I am older than",
-    "you, and must know better’; and this Alice would not allow without",
-    "knowing how old it was, and, as the Lory positively refused to tell its",
-    "age, there was no more to be said.",
-    "At last the Mouse, who seemed to be a person of authority among them,",
-    "called out, ‘Sit down, all of you, and listen to me! I’LL soon make you",
-    "dry enough!’ They all sat down at once, in a large ring, with the Mouse",
-    "in the middle. Alice kept her eyes anxiously fixed on it, for she felt",
-    "sure she would catch a bad cold if she did not get dry very soon.",
-    "‘Ahem!’ said the Mouse with an important air, ‘are you all ready? This",
-    "is the driest thing I know. Silence all round, if you please! “William",
-    "the Conqueror, whose cause was favoured by the pope, was soon submitted",
-    "to by the English, who wanted leaders, and had been of late much",
-    "accustomed to usurpation and conquest. Edwin and Morcar, the earls of",
-    "Mercia and Northumbria--“’",
-    "‘Ugh!’ said the Lory, with a shiver.",
-    "‘I beg your pardon!’ said the Mouse, frowning, but very politely: ‘Did",
-    "you speak?’",
-    "‘Not I!’ said the Lory hastily.",
-    "‘I thought you did,’ said the Mouse. ‘--I proceed. “Edwin and Morcar,",
-    "the earls of Mercia and Northumbria, declared for him: and even Stigand,",
-    "the patriotic archbishop of Canterbury, found it advisable--“’",
-    "‘Found WHAT?’ said the Duck.",
-    "‘Found IT,’ the Mouse replied rather crossly: ‘of course you know what",
-    "“it” means.’",
-    "‘I know what “it” means well enough, when I find a thing,’ said the",
-    "Duck: ‘it’s generally a frog or a worm. The question is, what did the",
-    "archbishop find?’",
-    "The Mouse did not notice this question, but hurriedly went on, ‘“--found",
-    "it advisable to go with Edgar Atheling to meet William and offer him the",
-    "crown. William’s conduct at first was moderate. But the insolence of his",
-    "Normans--” How are you getting on now, my dear?’ it continued, turning",
-    "to Alice as it spoke.",
-    "‘As wet as ever,’ said Alice in a melancholy tone: ‘it doesn’t seem to",
-    "dry me at all.’",
-    "‘In that case,’ said the Dodo solemnly, rising to its feet, ‘I move",
-    "that the meeting adjourn, for the immediate adoption of more energetic",
-    "remedies--’",
-    "‘Speak English!’ said the Eaglet. ‘I don’t know the meaning of half",
-    "those long words, and, what’s more, I don’t believe you do either!’ And",
-    "the Eaglet bent down its head to hide a smile: some of the other birds",
-    "tittered audibly.",
-    "‘What I was going to say,’ said the Dodo in an offended tone, ‘was, that",
-    "the best thing to get us dry would be a Caucus-race.’",
-    "‘What IS a Caucus-race?’ said Alice; not that she wanted much to know,",
-    "but the Dodo had paused as if it thought that SOMEBODY ought to speak,",
-    "and no one else seemed inclined to say anything.",
-    "‘Why,’ said the Dodo, ‘the best way to explain it is to do it.’ (And, as",
-    "you might like to try the thing yourself, some winter day, I will tell",
-    "you how the Dodo managed it.)",
-    "First it marked out a race-course, in a sort of circle, [‘the exact",
-    "shape doesn’t matter,’ it said,) and then all the party were placed",
-    "along the course, here and there. There was no ‘One, two, three, and",
-    "away,’ but they began running when they liked, and left off when they",
-    "liked, so that it was not easy to know when the race was over. However,",
-    "when they had been running half an hour or so, and were quite dry again,",
-    "the Dodo suddenly called out ‘The race is over!’ and they all crowded",
-    "round it, panting, and asking, ‘But who has won?’",
-    "This question the Dodo could not answer without a great deal of thought,",
-    "and it sat for a long time with one finger pressed upon its forehead",
-    "(the position in which you usually see Shakespeare, in the pictures",
-    "of him), while the rest waited in silence. At last the Dodo said,",
-    "‘EVERYBODY has won, and all must have prizes.’",
-    "‘But who is to give the prizes?’ quite a chorus of voices asked.",
-    "‘Why, SHE, of course,’ said the Dodo, pointing to Alice with one finger;",
-    "and the whole party at once crowded round her, calling out in a confused",
-    "way, ‘Prizes! Prizes!’",
-    "Alice had no idea what to do, and in despair she put her hand in her",
-    "pocket, and pulled out a box of comfits, (luckily the salt water had",
-    "not got into it), and handed them round as prizes. There was exactly one",
-    "a-piece all round.",
-    "‘But she must have a prize herself, you know,’ said the Mouse.",
-    "‘Of course,’ the Dodo replied very gravely. ‘What else have you got in",
-    "your pocket?’ he went on, turning to Alice.",
-    "‘Only a thimble,’ said Alice sadly.",
-    "‘Hand it over here,’ said the Dodo.",
-    "Then they all crowded round her once more, while the Dodo solemnly",
-    "presented the thimble, saying ‘We beg your acceptance of this elegant",
-    "thimble’; and, when it had finished this short speech, they all cheered.",
-    "Alice thought the whole thing very absurd, but they all looked so grave",
-    "that she did not dare to laugh; and, as she could not think of anything",
-    "to say, she simply bowed, and took the thimble, looking as solemn as she",
-    "could.",
-    "The next thing was to eat the comfits: this caused some noise and",
-    "confusion, as the large birds complained that they could not taste",
-    "theirs, and the small ones choked and had to be patted on the back.",
-    "However, it was over at last, and they sat down again in a ring, and",
-    "begged the Mouse to tell them something more.",
-    "‘You promised to tell me your history, you know,’ said Alice, ‘and why",
-    "it is you hate--C and D,’ she added in a whisper, half afraid that it",
-    "would be offended again.",
-    "‘Mine is a long and a sad tale!’ said the Mouse, turning to Alice, and",
-    "sighing.",
-    "‘It IS a long tail, certainly,’ said Alice, looking down with wonder at",
-    "the Mouse’s tail; ‘but why do you call it sad?’ And she kept on puzzling",
-    "about it while the Mouse was speaking, so that her idea of the tale was",
-    "something like this:--",
-    "         ‘Fury said to a",
-    "         mouse, That he",
-    "        met in the",
-    "       house,",
-    "     “Let us",
-    "      both go to",
-    "       law: I will",
-    "        prosecute",
-    "         YOU.--Come,",
-    "           I’ll take no",
-    "           denial; We",
-    "          must have a",
-    "        trial: For",
-    "      really this",
-    "     morning I’ve",
-    "    nothing",
-    "    to do.”",
-    "      Said the",
-    "      mouse to the",
-    "       cur, “Such",
-    "        a trial,",
-    "         dear Sir,",
-    "            With",
-    "          no jury",
-    "        or judge,",
-    "       would be",
-    "      wasting",
-    "      our",
-    "      breath.”",
-    "        “I’ll be",
-    "        judge, I’ll",
-    "         be jury,”",
-    "             Said",
-    "         cunning",
-    "          old Fury:",
-    "          “I’ll",
-    "          try the",
-    "            whole",
-    "            cause,",
-    "              and",
-    "           condemn",
-    "           you",
-    "          to",
-    "           death.”’",
-    "‘You are not attending!’ said the Mouse to Alice severely. ‘What are you",
-    "thinking of?’",
-    "‘I beg your pardon,’ said Alice very humbly: ‘you had got to the fifth",
-    "bend, I think?’",
-    "‘I had NOT!’ cried the Mouse, sharply and very angrily.",
-    "‘A knot!’ said Alice, always ready to make herself useful, and looking",
-    "anxiously about her. ‘Oh, do let me help to undo it!’",
-    "‘I shall do nothing of the sort,’ said the Mouse, getting up and walking",
-    "away. ‘You insult me by talking such nonsense!’",
-    "‘I didn’t mean it!’ pleaded poor Alice. ‘But you’re so easily offended,",
-    "you know!’",
-    "The Mouse only growled in reply.",
-    "‘Please come back and finish your story!’ Alice called after it; and the",
-    "others all joined in chorus, ‘Yes, please do!’ but the Mouse only shook",
-    "its head impatiently, and walked a little quicker.",
-    "‘What a pity it wouldn’t stay!’ sighed the Lory, as soon as it was quite",
-    "out of sight; and an old Crab took the opportunity of saying to her",
-    "daughter ‘Ah, my dear! Let this be a lesson to you never to lose",
-    "YOUR temper!’ ‘Hold your tongue, Ma!’ said the young Crab, a little",
-    "snappishly. ‘You’re enough to try the patience of an oyster!’",
-    "‘I wish I had our Dinah here, I know I do!’ said Alice aloud, addressing",
-    "nobody in particular. ‘She’d soon fetch it back!’",
-    "‘And who is Dinah, if I might venture to ask the question?’ said the",
-    "Lory.",
-    "Alice replied eagerly, for she was always ready to talk about her pet:",
-    "‘Dinah’s our cat. And she’s such a capital one for catching mice you",
-    "can’t think! And oh, I wish you could see her after the birds! Why,",
-    "she’ll eat a little bird as soon as look at it!’",
-    "This speech caused a remarkable sensation among the party. Some of the",
-    "birds hurried off at once: one old Magpie began wrapping itself up very",
-    "carefully, remarking, ‘I really must be getting home; the night-air",
-    "doesn’t suit my throat!’ and a Canary called out in a trembling voice to",
-    "its children, ‘Come away, my dears! It’s high time you were all in bed!’",
-    "On various pretexts they all moved off, and Alice was soon left alone.",
-    "‘I wish I hadn’t mentioned Dinah!’ she said to herself in a melancholy",
-    "tone. ‘Nobody seems to like her, down here, and I’m sure she’s the best",
-    "cat in the world! Oh, my dear Dinah! I wonder if I shall ever see you",
-    "any more!’ And here poor Alice began to cry again, for she felt very",
-    "lonely and low-spirited. In a little while, however, she again heard",
-    "a little pattering of footsteps in the distance, and she looked up",
-    "eagerly, half hoping that the Mouse had changed his mind, and was coming",
-    "back to finish his story.",
-    "CHAPTER IV. The Rabbit Sends in a Little Bill",
-    "It was the White Rabbit, trotting slowly back again, and looking",
-    "anxiously about as it went, as if it had lost something; and she heard",
-    "it muttering to itself ‘The Duchess! The Duchess! Oh my dear paws! Oh",
-    "my fur and whiskers! She’ll get me executed, as sure as ferrets are",
-    "ferrets! Where CAN I have dropped them, I wonder?’ Alice guessed in a",
-    "moment that it was looking for the fan and the pair of white kid gloves,",
-    "and she very good-naturedly began hunting about for them, but they were",
-    "nowhere to be seen--everything seemed to have changed since her swim in",
-    "the pool, and the great hall, with the glass table and the little door,",
-    "had vanished completely.",
-    "Very soon the Rabbit noticed Alice, as she went hunting about, and",
-    "called out to her in an angry tone, ‘Why, Mary Ann, what ARE you doing",
-    "out here? Run home this moment, and fetch me a pair of gloves and a fan!",
-    "Quick, now!’ And Alice was so much frightened that she ran off at once",
-    "in the direction it pointed to, without trying to explain the mistake it",
-    "had made.",
-    "‘He took me for his housemaid,’ she said to herself as she ran. ‘How",
-    "surprised he’ll be when he finds out who I am! But I’d better take him",
-    "his fan and gloves--that is, if I can find them.’ As she said this, she",
-    "came upon a neat little house, on the door of which was a bright brass",
-    "plate with the name ‘W. RABBIT’ engraved upon it. She went in without",
-    "knocking, and hurried upstairs, in great fear lest she should meet the",
-    "real Mary Ann, and be turned out of the house before she had found the",
-    "fan and gloves.",
-    "‘How queer it seems,’ Alice said to herself, ‘to be going messages for",
-    "a rabbit! I suppose Dinah’ll be sending me on messages next!’ And she",
-    "began fancying the sort of thing that would happen: ‘“Miss Alice! Come",
-    "here directly, and get ready for your walk!” “Coming in a minute,",
-    "nurse! But I’ve got to see that the mouse doesn’t get out.” Only I don’t",
-    "think,’ Alice went on, ‘that they’d let Dinah stop in the house if it",
-    "began ordering people about like that!’",
-    "By this time she had found her way into a tidy little room with a table",
-    "in the window, and on it (as she had hoped) a fan and two or three pairs",
-    "of tiny white kid gloves: she took up the fan and a pair of the gloves,",
-    "and was just going to leave the room, when her eye fell upon a little",
-    "bottle that stood near the looking-glass. There was no label this time",
-    "with the words ‘DRINK ME,’ but nevertheless she uncorked it and put it",
-    "to her lips. ‘I know SOMETHING interesting is sure to happen,’ she said",
-    "to herself, ‘whenever I eat or drink anything; so I’ll just see what",
-    "this bottle does. I do hope it’ll make me grow large again, for really",
-    "I’m quite tired of being such a tiny little thing!’",
-    "It did so indeed, and much sooner than she had expected: before she had",
-    "drunk half the bottle, she found her head pressing against the ceiling,",
-    "and had to stoop to save her neck from being broken. She hastily put",
-    "down the bottle, saying to herself ‘That’s quite enough--I hope I shan’t",
-    "grow any more--As it is, I can’t get out at the door--I do wish I hadn’t",
-    "drunk quite so much!’",
-    "Alas! it was too late to wish that! She went on growing, and growing,",
-    "and very soon had to kneel down on the floor: in another minute there",
-    "was not even room for this, and she tried the effect of lying down with",
-    "one elbow against the door, and the other arm curled round her head.",
-    "Still she went on growing, and, as a last resource, she put one arm out",
-    "of the window, and one foot up the chimney, and said to herself ‘Now I",
-    "can do no more, whatever happens. What WILL become of me?’",
-    "Luckily for Alice, the little magic bottle had now had its full effect,",
-    "and she grew no larger: still it was very uncomfortable, and, as there",
-    "seemed to be no sort of chance of her ever getting out of the room",
-    "again, no wonder she felt unhappy.",
-    "‘It was much pleasanter at home,’ thought poor Alice, ‘when one wasn’t",
-    "always growing larger and smaller, and being ordered about by mice and",
-    "rabbits. I almost wish I hadn’t gone down that rabbit-hole--and yet--and",
-    "yet--it’s rather curious, you know, this sort of life! I do wonder what",
-    "CAN have happened to me! When I used to read fairy-tales, I fancied that",
-    "kind of thing never happened, and now here I am in the middle of one!",
-    "There ought to be a book written about me, that there ought! And when I",
-    "grow up, I’ll write one--but I’m grown up now,’ she added in a sorrowful",
-    "tone; ‘at least there’s no room to grow up any more HERE.’",
-    "‘But then,’ thought Alice, ‘shall I NEVER get any older than I am",
-    "now? That’ll be a comfort, one way--never to be an old woman--but",
-    "then--always to have lessons to learn! Oh, I shouldn’t like THAT!’",
-    "‘Oh, you foolish Alice!’ she answered herself. ‘How can you learn",
-    "lessons in here? Why, there’s hardly room for YOU, and no room at all",
-    "for any lesson-books!’",
-    "And so she went on, taking first one side and then the other, and making",
-    "quite a conversation of it altogether; but after a few minutes she heard",
-    "a voice outside, and stopped to listen.",
-    "‘Mary Ann! Mary Ann!’ said the voice. ‘Fetch me my gloves this moment!’",
-    "Then came a little pattering of feet on the stairs. Alice knew it was",
-    "the Rabbit coming to look for her, and she trembled till she shook the",
-    "house, quite forgetting that she was now about a thousand times as large",
-    "as the Rabbit, and had no reason to be afraid of it.",
-    "Presently the Rabbit came up to the door, and tried to open it; but, as",
-    "the door opened inwards, and Alice’s elbow was pressed hard against it,",
-    "that attempt proved a failure. Alice heard it say to itself ‘Then I’ll",
-    "go round and get in at the window.’",
-    "‘THAT you won’t’ thought Alice, and, after waiting till she fancied",
-    "she heard the Rabbit just under the window, she suddenly spread out her",
-    "hand, and made a snatch in the air. She did not get hold of anything,",
-    "but she heard a little shriek and a fall, and a crash of broken glass,",
-    "from which she concluded that it was just possible it had fallen into a",
-    "cucumber-frame, or something of the sort.",
-    "Next came an angry voice--the Rabbit’s--‘Pat! Pat! Where are you?’ And",
-    "then a voice she had never heard before, ‘Sure then I’m here! Digging",
-    "for apples, yer honour!’",
-    "‘Digging for apples, indeed!’ said the Rabbit angrily. ‘Here! Come and",
-    "help me out of THIS!’ (Sounds of more broken glass.)",
-    "‘Now tell me, Pat, what’s that in the window?’",
-    "‘Sure, it’s an arm, yer honour!’ (He pronounced it ‘arrum.’)",
-    "‘An arm, you goose! Who ever saw one that size? Why, it fills the whole",
-    "window!’",
-    "‘Sure, it does, yer honour: but it’s an arm for all that.’",
-    "‘Well, it’s got no business there, at any rate: go and take it away!’",
-    "There was a long silence after this, and Alice could only hear whispers",
-    "now and then; such as, ‘Sure, I don’t like it, yer honour, at all, at",
-    "all!’ ‘Do as I tell you, you coward!’ and at last she spread out her",
-    "hand again, and made another snatch in the air. This time there were",
-    "TWO little shrieks, and more sounds of broken glass. ‘What a number of",
-    "cucumber-frames there must be!’ thought Alice. ‘I wonder what they’ll do",
-    "next! As for pulling me out of the window, I only wish they COULD! I’m",
-    "sure I don’t want to stay in here any longer!’",
-    "She waited for some time without hearing anything more: at last came a",
-    "rumbling of little cartwheels, and the sound of a good many voices",
-    "all talking together: she made out the words: ‘Where’s the other",
-    "ladder?--Why, I hadn’t to bring but one; Bill’s got the other--Bill!",
-    "fetch it here, lad!--Here, put ‘em up at this corner--No, tie ‘em",
-    "together first--they don’t reach half high enough yet--Oh! they’ll",
-    "do well enough; don’t be particular--Here, Bill! catch hold of this",
-    "rope--Will the roof bear?--Mind that loose slate--Oh, it’s coming",
-    "down! Heads below!’ (a loud crash)--‘Now, who did that?--It was Bill, I",
-    "fancy--Who’s to go down the chimney?--Nay, I shan’t! YOU do it!--That I",
-    "won’t, then!--Bill’s to go down--Here, Bill! the master says you’re to",
-    "go down the chimney!’",
-    "‘Oh! So Bill’s got to come down the chimney, has he?’ said Alice to",
-    "herself. ‘Shy, they seem to put everything upon Bill! I wouldn’t be in",
-    "Bill’s place for a good deal: this fireplace is narrow, to be sure; but",
-    "I THINK I can kick a little!’",
-    "She drew her foot as far down the chimney as she could, and waited",
-    "till she heard a little animal (she couldn’t guess of what sort it was)",
-    "scratching and scrambling about in the chimney close above her: then,",
-    "saying to herself ‘This is Bill,’ she gave one sharp kick, and waited to",
-    "see what would happen next.",
-    "The first thing she heard was a general chorus of ‘There goes Bill!’",
-    "then the Rabbit’s voice along--‘Catch him, you by the hedge!’ then",
-    "silence, and then another confusion of voices--‘Hold up his head--Brandy",
-    "now--Don’t choke him--How was it, old fellow? What happened to you? Tell",
-    "us all about it!’",
-    "Last came a little feeble, squeaking voice, [‘That’s Bill,’ thought",
-    "Alice,) ‘Well, I hardly know--No more, thank ye; I’m better now--but I’m",
-    "a deal too flustered to tell you--all I know is, something comes at me",
-    "like a Jack-in-the-box, and up I goes like a sky-rocket!’",
-    "‘So you did, old fellow!’ said the others.",
-    "‘We must burn the house down!’ said the Rabbit’s voice; and Alice called",
-    "out as loud as she could, ‘If you do. I’ll set Dinah at you!’",
-    "There was a dead silence instantly, and Alice thought to herself, ‘I",
-    "wonder what they WILL do next! If they had any sense, they’d take the",
-    "roof off.’ After a minute or two, they began moving about again, and",
-    "Alice heard the Rabbit say, ‘A barrowful will do, to begin with.’",
-    "‘A barrowful of WHAT?’ thought Alice; but she had not long to doubt,",
-    "for the next moment a shower of little pebbles came rattling in at the",
-    "window, and some of them hit her in the face. ‘I’ll put a stop to this,’",
-    "she said to herself, and shouted out, ‘You’d better not do that again!’",
-    "which produced another dead silence.",
-    "Alice noticed with some surprise that the pebbles were all turning into",
-    "little cakes as they lay on the floor, and a bright idea came into her",
-    "head. ‘If I eat one of these cakes,’ she thought, ‘it’s sure to make",
-    "SOME change in my size; and as it can’t possibly make me larger, it must",
-    "make me smaller, I suppose.’",
-    "So she swallowed one of the cakes, and was delighted to find that she",
-    "began shrinking directly. As soon as she was small enough to get through",
-    "the door, she ran out of the house, and found quite a crowd of little",
-    "animals and birds waiting outside. The poor little Lizard, Bill, was",
-    "in the middle, being held up by two guinea-pigs, who were giving it",
-    "something out of a bottle. They all made a rush at Alice the moment she",
-    "appeared; but she ran off as hard as she could, and soon found herself",
-    "safe in a thick wood.",
-    "‘The first thing I’ve got to do,’ said Alice to herself, as she wandered",
-    "about in the wood, ‘is to grow to my right size again; and the second",
-    "thing is to find my way into that lovely garden. I think that will be",
-    "the best plan.’",
-    "It sounded an excellent plan, no doubt, and very neatly and simply",
-    "arranged; the only difficulty was, that she had not the smallest idea",
-    "how to set about it; and while she was peering about anxiously among",
-    "the trees, a little sharp bark just over her head made her look up in a",
-    "great hurry.",
-    "An enormous puppy was looking down at her with large round eyes, and",
-    "feebly stretching out one paw, trying to touch her. ‘Poor little thing!’",
-    "said Alice, in a coaxing tone, and she tried hard to whistle to it; but",
-    "she was terribly frightened all the time at the thought that it might be",
-    "hungry, in which case it would be very likely to eat her up in spite of",
-    "all her coaxing.",
-    "Hardly knowing what she did, she picked up a little bit of stick, and",
-    "held it out to the puppy; whereupon the puppy jumped into the air off",
-    "all its feet at once, with a yelp of delight, and rushed at the stick,",
-    "and made believe to worry it; then Alice dodged behind a great thistle,",
-    "to keep herself from being run over; and the moment she appeared on the",
-    "other side, the puppy made another rush at the stick, and tumbled head",
-    "over heels in its hurry to get hold of it; then Alice, thinking it was",
-    "very like having a game of play with a cart-horse, and expecting every",
-    "moment to be trampled under its feet, ran round the thistle again; then",
-    "the puppy began a series of short charges at the stick, running a very",
-    "little way forwards each time and a long way back, and barking hoarsely",
-    "all the while, till at last it sat down a good way off, panting, with",
-    "its tongue hanging out of its mouth, and its great eyes half shut.",
-    "This seemed to Alice a good opportunity for making her escape; so she",
-    "set off at once, and ran till she was quite tired and out of breath, and",
-    "till the puppy’s bark sounded quite faint in the distance.",
-    "‘And yet what a dear little puppy it was!’ said Alice, as she leant",
-    "against a buttercup to rest herself, and fanned herself with one of the",
-    "leaves: ‘I should have liked teaching it tricks very much, if--if I’d",
-    "only been the right size to do it! Oh dear! I’d nearly forgotten that",
-    "I’ve got to grow up again! Let me see--how IS it to be managed? I",
-    "suppose I ought to eat or drink something or other; but the great",
-    "question is, what?’",
-    "The great question certainly was, what? Alice looked all round her at",
-    "the flowers and the blades of grass, but she did not see anything that",
-    "looked like the right thing to eat or drink under the circumstances.",
-    "There was a large mushroom growing near her, about the same height as",
-    "herself; and when she had looked under it, and on both sides of it, and",
-    "behind it, it occurred to her that she might as well look and see what",
-    "was on the top of it.",
-    "She stretched herself up on tiptoe, and peeped over the edge of the",
-    "mushroom, and her eyes immediately met those of a large caterpillar,",
-    "that was sitting on the top with its arms folded, quietly smoking a long",
-    "hookah, and taking not the smallest notice of her or of anything else.",
-    "CHAPTER V. Advice from a Caterpillar",
-    "The Caterpillar and Alice looked at each other for some time in silence:",
-    "at last the Caterpillar took the hookah out of its mouth, and addressed",
-    "her in a languid, sleepy voice.",
-    "‘Who are YOU?’ said the Caterpillar.",
-    "This was not an encouraging opening for a conversation. Alice replied,",
-    "rather shyly, ‘I--I hardly know, sir, just at present--at least I know",
-    "who I WAS when I got up this morning, but I think I must have been",
-    "changed several times since then.’",
-    "‘What do you mean by that?’ said the Caterpillar sternly. ‘Explain",
-    "yourself!’",
-    "‘I can’t explain MYSELF, I’m afraid, sir’ said Alice, ‘because I’m not",
-    "myself, you see.’",
-    "‘I don’t see,’ said the Caterpillar.",
-    "‘I’m afraid I can’t put it more clearly,’ Alice replied very politely,",
-    "‘for I can’t understand it myself to begin with; and being so many",
-    "different sizes in a day is very confusing.’",
-    "‘It isn’t,’ said the Caterpillar.",
-    "‘Well, perhaps you haven’t found it so yet,’ said Alice; ‘but when you",
-    "have to turn into a chrysalis--you will some day, you know--and then",
-    "after that into a butterfly, I should think you’ll feel it a little",
-    "queer, won’t you?’",
-    "‘Not a bit,’ said the Caterpillar.",
-    "‘Well, perhaps your feelings may be different,’ said Alice; ‘all I know",
-    "is, it would feel very queer to ME.’",
-    "‘You!’ said the Caterpillar contemptuously. ‘Who are YOU?’",
-    "Which brought them back again to the beginning of the conversation.",
-    "Alice felt a little irritated at the Caterpillar’s making such VERY",
-    "short remarks, and she drew herself up and said, very gravely, ‘I think,",
-    "you ought to tell me who YOU are, first.’",
-    "‘Why?’ said the Caterpillar.",
-    "Here was another puzzling question; and as Alice could not think of any",
-    "good reason, and as the Caterpillar seemed to be in a VERY unpleasant",
-    "state of mind, she turned away.",
-    "‘Come back!’ the Caterpillar called after her. ‘I’ve something important",
-    "to say!’",
-    "This sounded promising, certainly: Alice turned and came back again.",
-    "‘Keep your temper,’ said the Caterpillar.",
-    "‘Is that all?’ said Alice, swallowing down her anger as well as she",
-    "could.",
-    "‘No,’ said the Caterpillar.",
-    "Alice thought she might as well wait, as she had nothing else to do, and",
-    "perhaps after all it might tell her something worth hearing. For some",
-    "minutes it puffed away without speaking, but at last it unfolded its",
-    "arms, took the hookah out of its mouth again, and said, ‘So you think",
-    "you’re changed, do you?’",
-    "‘I’m afraid I am, sir,’ said Alice; ‘I can’t remember things as I",
-    "used--and I don’t keep the same size for ten minutes together!’",
-    "‘Can’t remember WHAT things?’ said the Caterpillar.",
-    "‘Well, I’ve tried to say “HOW DOTH THE LITTLE BUSY BEE,” but it all came",
-    "different!’ Alice replied in a very melancholy voice.",
-    "‘Repeat, “YOU ARE OLD, FATHER WILLIAM,”’ said the Caterpillar.",
-    "Alice folded her hands, and began:--",
-    "   ‘You are old, Father William,’ the young man said,",
-    "    ‘And your hair has become very white;",
-    "   And yet you incessantly stand on your head--",
-    "    Do you think, at your age, it is right?’",
-    "   ‘In my youth,’ Father William replied to his son,",
-    "    ‘I feared it might injure the brain;",
-    "   But, now that I’m perfectly sure I have none,",
-    "    Why, I do it again and again.’",
-    "   ‘You are old,’ said the youth, ‘as I mentioned before,",
-    "    And have grown most uncommonly fat;",
-    "   Yet you turned a back-somersault in at the door--",
-    "    Pray, what is the reason of that?’",
-    "   ‘In my youth,’ said the sage, as he shook his grey locks,",
-    "    ‘I kept all my limbs very supple",
-    "   By the use of this ointment--one shilling the box--",
-    "    Allow me to sell you a couple?’",
-    "   ‘You are old,’ said the youth, ‘and your jaws are too weak",
-    "    For anything tougher than suet;",
-    "   Yet you finished the goose, with the bones and the beak--",
-    "    Pray how did you manage to do it?’",
-    "   ‘In my youth,’ said his father, ‘I took to the law,",
-    "    And argued each case with my wife;",
-    "   And the muscular strength, which it gave to my jaw,",
-    "    Has lasted the rest of my life.’",
-    "   ‘You are old,’ said the youth, ‘one would hardly suppose",
-    "    That your eye was as steady as ever;",
-    "   Yet you balanced an eel on the end of your nose--",
-    "    What made you so awfully clever?’",
-    "   ‘I have answered three questions, and that is enough,’",
-    "    Said his father; ‘don’t give yourself airs!",
-    "   Do you think I can listen all day to such stuff?",
-    "    Be off, or I’ll kick you down stairs!’",
-    "‘That is not said right,’ said the Caterpillar.",
-    "‘Not QUITE right, I’m afraid,’ said Alice, timidly; ‘some of the words",
-    "have got altered.’",
-    "‘It is wrong from beginning to end,’ said the Caterpillar decidedly, and",
-    "there was silence for some minutes.",
-    "The Caterpillar was the first to speak.",
-    "‘What size do you want to be?’ it asked.",
-    "‘Oh, I’m not particular as to size,’ Alice hastily replied; ‘only one",
-    "doesn’t like changing so often, you know.’",
-    "‘I DON’T know,’ said the Caterpillar.",
-    "Alice said nothing: she had never been so much contradicted in her life",
-    "before, and she felt that she was losing her temper.",
-    "‘Are you content now?’ said the Caterpillar.",
-    "‘Well, I should like to be a LITTLE larger, sir, if you wouldn’t mind,’",
-    "said Alice: ‘three inches is such a wretched height to be.’",
-    "‘It is a very good height indeed!’ said the Caterpillar angrily, rearing",
-    "itself upright as it spoke (it was exactly three inches high).",
-    "‘But I’m not used to it!’ pleaded poor Alice in a piteous tone. And",
-    "she thought of herself, ‘I wish the creatures wouldn’t be so easily",
-    "offended!’",
-    "‘You’ll get used to it in time,’ said the Caterpillar; and it put the",
-    "hookah into its mouth and began smoking again.",
-    "This time Alice waited patiently until it chose to speak again. In",
-    "a minute or two the Caterpillar took the hookah out of its mouth",
-    "and yawned once or twice, and shook itself. Then it got down off the",
-    "mushroom, and crawled away in the grass, merely remarking as it went,",
-    "‘One side will make you grow taller, and the other side will make you",
-    "grow shorter.’",
-    "‘One side of WHAT? The other side of WHAT?’ thought Alice to herself.",
-    "‘Of the mushroom,’ said the Caterpillar, just as if she had asked it",
-    "aloud; and in another moment it was out of sight.",
-    "Alice remained looking thoughtfully at the mushroom for a minute, trying",
-    "to make out which were the two sides of it; and as it was perfectly",
-    "round, she found this a very difficult question. However, at last she",
-    "stretched her arms round it as far as they would go, and broke off a bit",
-    "of the edge with each hand.",
-    "‘And now which is which?’ she said to herself, and nibbled a little of",
-    "the right-hand bit to try the effect: the next moment she felt a violent",
-    "blow underneath her chin: it had struck her foot!",
-    "She was a good deal frightened by this very sudden change, but she felt",
-    "that there was no time to be lost, as she was shrinking rapidly; so she",
-    "set to work at once to eat some of the other bit. Her chin was pressed",
-    "so closely against her foot, that there was hardly room to open her",
-    "mouth; but she did it at last, and managed to swallow a morsel of the",
-    "lefthand bit.",
-    "  *    *    *    *    *    *    *",
-    "    *    *    *    *    *    *",
-    "  *    *    *    *    *    *    *",
-    "‘Come, my head’s free at last!’ said Alice in a tone of delight, which",
-    "changed into alarm in another moment, when she found that her shoulders",
-    "were nowhere to be found: all she could see, when she looked down, was",
-    "an immense length of neck, which seemed to rise like a stalk out of a",
-    "sea of green leaves that lay far below her.",
-    "‘What CAN all that green stuff be?’ said Alice. ‘And where HAVE my",
-    "shoulders got to? And oh, my poor hands, how is it I can’t see you?’",
-    "She was moving them about as she spoke, but no result seemed to follow,",
-    "except a little shaking among the distant green leaves.",
-    "As there seemed to be no chance of getting her hands up to her head, she",
-    "tried to get her head down to them, and was delighted to find that her",
-    "neck would bend about easily in any direction, like a serpent. She had",
-    "just succeeded in curving it down into a graceful zigzag, and was going",
-    "to dive in among the leaves, which she found to be nothing but the tops",
-    "of the trees under which she had been wandering, when a sharp hiss made",
-    "her draw back in a hurry: a large pigeon had flown into her face, and",
-    "was beating her violently with its wings.",
-    "‘Serpent!’ screamed the Pigeon.",
-    "‘I’m NOT a serpent!’ said Alice indignantly. ‘Let me alone!’",
-    "‘Serpent, I say again!’ repeated the Pigeon, but in a more subdued tone,",
-    "and added with a kind of sob, ‘I’ve tried every way, and nothing seems",
-    "to suit them!’",
-    "‘I haven’t the least idea what you’re talking about,’ said Alice.",
-    "‘I’ve tried the roots of trees, and I’ve tried banks, and I’ve tried",
-    "hedges,’ the Pigeon went on, without attending to her; ‘but those",
-    "serpents! There’s no pleasing them!’",
-    "Alice was more and more puzzled, but she thought there was no use in",
-    "saying anything more till the Pigeon had finished.",
-    "‘As if it wasn’t trouble enough hatching the eggs,’ said the Pigeon;",
-    "‘but I must be on the look-out for serpents night and day! Why, I",
-    "haven’t had a wink of sleep these three weeks!’",
-    "‘I’m very sorry you’ve been annoyed,’ said Alice, who was beginning to",
-    "see its meaning.",
-    "‘And just as I’d taken the highest tree in the wood,’ continued the",
-    "Pigeon, raising its voice to a shriek, ‘and just as I was thinking I",
-    "should be free of them at last, they must needs come wriggling down from",
-    "the sky! Ugh, Serpent!’",
-    "‘But I’m NOT a serpent, I tell you!’ said Alice. ‘I’m a--I’m a--’",
-    "‘Well! WHAT are you?’ said the Pigeon. ‘I can see you’re trying to",
-    "invent something!’",
-    "‘I--I’m a little girl,’ said Alice, rather doubtfully, as she remembered",
-    "the number of changes she had gone through that day.",
-    "‘A likely story indeed!’ said the Pigeon in a tone of the deepest",
-    "contempt. ‘I’ve seen a good many little girls in my time, but never ONE",
-    "with such a neck as that! No, no! You’re a serpent; and there’s no use",
-    "denying it. I suppose you’ll be telling me next that you never tasted an",
-    "egg!’",
-    "‘I HAVE tasted eggs, certainly,’ said Alice, who was a very truthful",
-    "child; ‘but little girls eat eggs quite as much as serpents do, you",
-    "know.’",
-    "‘I don’t believe it,’ said the Pigeon; ‘but if they do, why then they’re",
-    "a kind of serpent, that’s all I can say.’",
-    "This was such a new idea to Alice, that she was quite silent for a",
-    "minute or two, which gave the Pigeon the opportunity of adding, ‘You’re",
-    "looking for eggs, I know THAT well enough; and what does it matter to me",
-    "whether you’re a little girl or a serpent?’",
-    "‘It matters a good deal to ME,’ said Alice hastily; ‘but I’m not looking",
-    "for eggs, as it happens; and if I was, I shouldn’t want YOURS: I don’t",
-    "like them raw.’",
-    "‘Well, be off, then!’ said the Pigeon in a sulky tone, as it settled",
-    "down again into its nest. Alice crouched down among the trees as well as",
-    "she could, for her neck kept getting entangled among the branches, and",
-    "every now and then she had to stop and untwist it. After a while she",
-    "remembered that she still held the pieces of mushroom in her hands, and",
-    "she set to work very carefully, nibbling first at one and then at the",
-    "other, and growing sometimes taller and sometimes shorter, until she had",
-    "succeeded in bringing herself down to her usual height.",
-    "It was so long since she had been anything near the right size, that it",
-    "felt quite strange at first; but she got used to it in a few minutes,",
-    "and began talking to herself, as usual. ‘Come, there’s half my plan done",
-    "now! How puzzling all these changes are! I’m never sure what I’m going",
-    "to be, from one minute to another! However, I’ve got back to my right",
-    "size: the next thing is, to get into that beautiful garden--how IS that",
-    "to be done, I wonder?’ As she said this, she came suddenly upon an open",
-    "place, with a little house in it about four feet high. ‘Whoever lives",
-    "there,’ thought Alice, ‘it’ll never do to come upon them THIS size: why,",
-    "I should frighten them out of their wits!’ So she began nibbling at the",
-    "righthand bit again, and did not venture to go near the house till she",
-    "had brought herself down to nine inches high.",
-    "CHAPTER VI. Pig and Pepper",
-    "For a minute or two she stood looking at the house, and wondering what",
-    "to do next, when suddenly a footman in livery came running out of the",
-    "wood--(she considered him to be a footman because he was in livery:",
-    "otherwise, judging by his face only, she would have called him a",
-    "fish)--and rapped loudly at the door with his knuckles. It was opened",
-    "by another footman in livery, with a round face, and large eyes like a",
-    "frog; and both footmen, Alice noticed, had powdered hair that curled all",
-    "over their heads. She felt very curious to know what it was all about,",
-    "and crept a little way out of the wood to listen.",
-    "The Fish-Footman began by producing from under his arm a great letter,",
-    "nearly as large as himself, and this he handed over to the other,",
-    "saying, in a solemn tone, ‘For the Duchess. An invitation from the Queen",
-    "to play croquet.’ The Frog-Footman repeated, in the same solemn tone,",
-    "only changing the order of the words a little, ‘From the Queen. An",
-    "invitation for the Duchess to play croquet.’",
-    "Then they both bowed low, and their curls got entangled together.",
-    "Alice laughed so much at this, that she had to run back into the",
-    "wood for fear of their hearing her; and when she next peeped out the",
-    "Fish-Footman was gone, and the other was sitting on the ground near the",
-    "door, staring stupidly up into the sky.",
-    "Alice went timidly up to the door, and knocked.",
-    "‘There’s no sort of use in knocking,’ said the Footman, ‘and that for",
-    "two reasons. First, because I’m on the same side of the door as you",
-    "are; secondly, because they’re making such a noise inside, no one could",
-    "possibly hear you.’ And certainly there was a most extraordinary noise",
-    "going on within--a constant howling and sneezing, and every now and then",
-    "a great crash, as if a dish or kettle had been broken to pieces.",
-    "‘Please, then,’ said Alice, ‘how am I to get in?’",
-    "‘There might be some sense in your knocking,’ the Footman went on",
-    "without attending to her, ‘if we had the door between us. For instance,",
-    "if you were INSIDE, you might knock, and I could let you out, you know.’",
-    "He was looking up into the sky all the time he was speaking, and this",
-    "Alice thought decidedly uncivil. ‘But perhaps he can’t help it,’ she",
-    "said to herself; ‘his eyes are so VERY nearly at the top of his head.",
-    "But at any rate he might answer questions.--How am I to get in?’ she",
-    "repeated, aloud.",
-    "‘I shall sit here,’ the Footman remarked, ‘till tomorrow--’",
-    "At this moment the door of the house opened, and a large plate came",
-    "skimming out, straight at the Footman’s head: it just grazed his nose,",
-    "and broke to pieces against one of the trees behind him.",
-    "‘--or next day, maybe,’ the Footman continued in the same tone, exactly",
-    "as if nothing had happened.",
-    "‘How am I to get in?’ asked Alice again, in a louder tone.",
-    "‘ARE you to get in at all?’ said the Footman. ‘That’s the first",
-    "question, you know.’",
-    "It was, no doubt: only Alice did not like to be told so. ‘It’s really",
-    "dreadful,’ she muttered to herself, ‘the way all the creatures argue.",
-    "It’s enough to drive one crazy!’",
-    "The Footman seemed to think this a good opportunity for repeating his",
-    "remark, with variations. ‘I shall sit here,’ he said, ‘on and off, for",
-    "days and days.’",
-    "‘But what am I to do?’ said Alice.",
-    "‘Anything you like,’ said the Footman, and began whistling.",
-    "‘Oh, there’s no use in talking to him,’ said Alice desperately: ‘he’s",
-    "perfectly idiotic!’ And she opened the door and went in.",
-    "The door led right into a large kitchen, which was full of smoke from",
-    "one end to the other: the Duchess was sitting on a three-legged stool in",
-    "the middle, nursing a baby; the cook was leaning over the fire, stirring",
-    "a large cauldron which seemed to be full of soup.",
-    "‘There’s certainly too much pepper in that soup!’ Alice said to herself,",
-    "as well as she could for sneezing.",
-    "There was certainly too much of it in the air. Even the Duchess",
-    "sneezed occasionally; and as for the baby, it was sneezing and howling",
-    "alternately without a moment’s pause. The only things in the kitchen",
-    "that did not sneeze, were the cook, and a large cat which was sitting on",
-    "the hearth and grinning from ear to ear.",
-    "‘Please would you tell me,’ said Alice, a little timidly, for she was",
-    "not quite sure whether it was good manners for her to speak first, ‘why",
-    "your cat grins like that?’",
-    "‘It’s a Cheshire cat,’ said the Duchess, ‘and that’s why. Pig!’",
-    "She said the last word with such sudden violence that Alice quite",
-    "jumped; but she saw in another moment that it was addressed to the baby,",
-    "and not to her, so she took courage, and went on again:--",
-    "‘I didn’t know that Cheshire cats always grinned; in fact, I didn’t know",
-    "that cats COULD grin.’",
-    "‘They all can,’ said the Duchess; ‘and most of ‘em do.’",
-    "‘I don’t know of any that do,’ Alice said very politely, feeling quite",
-    "pleased to have got into a conversation.",
-    "‘You don’t know much,’ said the Duchess; ‘and that’s a fact.’",
-    "Alice did not at all like the tone of this remark, and thought it would",
-    "be as well to introduce some other subject of conversation. While she",
-    "was trying to fix on one, the cook took the cauldron of soup off the",
-    "fire, and at once set to work throwing everything within her reach at",
-    "the Duchess and the baby--the fire-irons came first; then followed a",
-    "shower of saucepans, plates, and dishes. The Duchess took no notice of",
-    "them even when they hit her; and the baby was howling so much already,",
-    "that it was quite impossible to say whether the blows hurt it or not.",
-    "‘Oh, PLEASE mind what you’re doing!’ cried Alice, jumping up and down in",
-    "an agony of terror. ‘Oh, there goes his PRECIOUS nose’; as an unusually",
-    "large saucepan flew close by it, and very nearly carried it off.",
-    "‘If everybody minded their own business,’ the Duchess said in a hoarse",
-    "growl, ‘the world would go round a deal faster than it does.’",
-    "‘Which would NOT be an advantage,’ said Alice, who felt very glad to get",
-    "an opportunity of showing off a little of her knowledge. ‘Just think of",
-    "what work it would make with the day and night! You see the earth takes",
-    "twenty-four hours to turn round on its axis--’",
-    "‘Talking of axes,’ said the Duchess, ‘chop off her head!’",
-    "Alice glanced rather anxiously at the cook, to see if she meant to take",
-    "the hint; but the cook was busily stirring the soup, and seemed not to",
-    "be listening, so she went on again: ‘Twenty-four hours, I THINK; or is",
-    "it twelve? I--’",
-    "‘Oh, don’t bother ME,’ said the Duchess; ‘I never could abide figures!’",
-    "And with that she began nursing her child again, singing a sort of",
-    "lullaby to it as she did so, and giving it a violent shake at the end of",
-    "every line:",
-    "   ‘Speak roughly to your little boy,",
-    "    And beat him when he sneezes:",
-    "   He only does it to annoy,",
-    "    Because he knows it teases.’",
-    "         CHORUS.",
-    " (In which the cook and the baby joined):--",
-    "       ‘Wow! wow! wow!’",
-    "While the Duchess sang the second verse of the song, she kept tossing",
-    "the baby violently up and down, and the poor little thing howled so,",
-    "that Alice could hardly hear the words:--",
-    "   ‘I speak severely to my boy,",
-    "    I beat him when he sneezes;",
-    "   For he can thoroughly enjoy",
-    "    The pepper when he pleases!’",
-    "         CHORUS.",
-    "       ‘Wow! wow! wow!’",
-    "‘Here! you may nurse it a bit, if you like!’ the Duchess said to Alice,",
-    "flinging the baby at her as she spoke. ‘I must go and get ready to play",
-    "croquet with the Queen,’ and she hurried out of the room. The cook threw",
-    "a frying-pan after her as she went out, but it just missed her.",
-    "Alice caught the baby with some difficulty, as it was a queer-shaped",
-    "little creature, and held out its arms and legs in all directions, ‘just",
-    "like a star-fish,’ thought Alice. The poor little thing was snorting",
-    "like a steam-engine when she caught it, and kept doubling itself up and",
-    "straightening itself out again, so that altogether, for the first minute",
-    "or two, it was as much as she could do to hold it.",
-    "As soon as she had made out the proper way of nursing it, (which was to",
-    "twist it up into a sort of knot, and then keep tight hold of its right",
-    "ear and left foot, so as to prevent its undoing itself,) she carried",
-    "it out into the open air. ‘IF I don’t take this child away with me,’",
-    "thought Alice, ‘they’re sure to kill it in a day or two: wouldn’t it be",
-    "murder to leave it behind?’ She said the last words out loud, and the",
-    "little thing grunted in reply (it had left off sneezing by this time).",
-    "‘Don’t grunt,’ said Alice; ‘that’s not at all a proper way of expressing",
-    "yourself.’",
-    "The baby grunted again, and Alice looked very anxiously into its face to",
-    "see what was the matter with it. There could be no doubt that it had",
-    "a VERY turn-up nose, much more like a snout than a real nose; also its",
-    "eyes were getting extremely small for a baby: altogether Alice did not",
-    "like the look of the thing at all. ‘But perhaps it was only sobbing,’",
-    "she thought, and looked into its eyes again, to see if there were any",
-    "tears.",
-    "No, there were no tears. ‘If you’re going to turn into a pig, my dear,’",
-    "said Alice, seriously, ‘I’ll have nothing more to do with you. Mind",
-    "now!’ The poor little thing sobbed again (or grunted, it was impossible",
-    "to say which), and they went on for some while in silence.",
-    "Alice was just beginning to think to herself, ‘Now, what am I to do with",
-    "this creature when I get it home?’ when it grunted again, so violently,",
-    "that she looked down into its face in some alarm. This time there could",
-    "be NO mistake about it: it was neither more nor less than a pig, and she",
-    "felt that it would be quite absurd for her to carry it further.",
-    "So she set the little creature down, and felt quite relieved to see",
-    "it trot away quietly into the wood. ‘If it had grown up,’ she said",
-    "to herself, ‘it would have made a dreadfully ugly child: but it makes",
-    "rather a handsome pig, I think.’ And she began thinking over other",
-    "children she knew, who might do very well as pigs, and was just saying",
-    "to herself, ‘if one only knew the right way to change them--’ when she",
-    "was a little startled by seeing the Cheshire Cat sitting on a bough of a",
-    "tree a few yards off.",
-    "The Cat only grinned when it saw Alice. It looked good-natured, she",
-    "thought: still it had VERY long claws and a great many teeth, so she",
-    "felt that it ought to be treated with respect.",
-    "‘Cheshire Puss,’ she began, rather timidly, as she did not at all know",
-    "whether it would like the name: however, it only grinned a little wider.",
-    "‘Come, it’s pleased so far,’ thought Alice, and she went on. ‘Would you",
-    "tell me, please, which way I ought to go from here?’",
-    "‘That depends a good deal on where you want to get to,’ said the Cat.",
-    "‘I don’t much care where--’ said Alice.",
-    "‘Then it doesn’t matter which way you go,’ said the Cat.",
-    "‘--so long as I get SOMEWHERE,’ Alice added as an explanation.",
-    "‘Oh, you’re sure to do that,’ said the Cat, ‘if you only walk long",
-    "enough.’",
-    "Alice felt that this could not be denied, so she tried another question.",
-    "‘What sort of people live about here?’",
-    "‘In THAT direction,’ the Cat said, waving its right paw round, ‘lives",
-    "a Hatter: and in THAT direction,’ waving the other paw, ‘lives a March",
-    "Hare. Visit either you like: they’re both mad.’",
-    "‘But I don’t want to go among mad people,’ Alice remarked.",
-    "‘Oh, you can’t help that,’ said the Cat: ‘we’re all mad here. I’m mad.",
-    "You’re mad.’",
-    "‘How do you know I’m mad?’ said Alice.",
-    "‘You must be,’ said the Cat, ‘or you wouldn’t have come here.’",
-    "Alice didn’t think that proved it at all; however, she went on ‘And how",
-    "do you know that you’re mad?’",
-    "‘To begin with,’ said the Cat, ‘a dog’s not mad. You grant that?’",
-    "‘I suppose so,’ said Alice.",
-    "‘Well, then,’ the Cat went on, ‘you see, a dog growls when it’s angry,",
-    "and wags its tail when it’s pleased. Now I growl when I’m pleased, and",
-    "wag my tail when I’m angry. Therefore I’m mad.’",
-    "‘I call it purring, not growling,’ said Alice.",
-    "‘Call it what you like,’ said the Cat. ‘Do you play croquet with the",
-    "Queen to-day?’",
-    "‘I should like it very much,’ said Alice, ‘but I haven’t been invited",
-    "yet.’",
-    "‘You’ll see me there,’ said the Cat, and vanished.",
-    "Alice was not much surprised at this, she was getting so used to queer",
-    "things happening. While she was looking at the place where it had been,",
-    "it suddenly appeared again.",
-    "‘By-the-bye, what became of the baby?’ said the Cat. ‘I’d nearly",
-    "forgotten to ask.’",
-    "‘It turned into a pig,’ Alice quietly said, just as if it had come back",
-    "in a natural way.",
-    "‘I thought it would,’ said the Cat, and vanished again.",
-    "Alice waited a little, half expecting to see it again, but it did not",
-    "appear, and after a minute or two she walked on in the direction in",
-    "which the March Hare was said to live. ‘I’ve seen hatters before,’ she",
-    "said to herself; ‘the March Hare will be much the most interesting, and",
-    "perhaps as this is May it won’t be raving mad--at least not so mad as",
-    "it was in March.’ As she said this, she looked up, and there was the Cat",
-    "again, sitting on a branch of a tree.",
-    "‘Did you say pig, or fig?’ said the Cat.",
-    "‘I said pig,’ replied Alice; ‘and I wish you wouldn’t keep appearing and",
-    "vanishing so suddenly: you make one quite giddy.’",
-    "‘All right,’ said the Cat; and this time it vanished quite slowly,",
-    "beginning with the end of the tail, and ending with the grin, which",
-    "remained some time after the rest of it had gone.",
-    "‘Well! I’ve often seen a cat without a grin,’ thought Alice; ‘but a grin",
-    "without a cat! It’s the most curious thing I ever saw in my life!’",
-    "She had not gone much farther before she came in sight of the house",
-    "of the March Hare: she thought it must be the right house, because the",
-    "chimneys were shaped like ears and the roof was thatched with fur. It",
-    "was so large a house, that she did not like to go nearer till she had",
-    "nibbled some more of the lefthand bit of mushroom, and raised herself to",
-    "about two feet high: even then she walked up towards it rather timidly,",
-    "saying to herself ‘Suppose it should be raving mad after all! I almost",
-    "wish I’d gone to see the Hatter instead!’",
-    "CHAPTER VII. A Mad Tea-Party",
-    "There was a table set out under a tree in front of the house, and the",
-    "March Hare and the Hatter were having tea at it: a Dormouse was sitting",
-    "between them, fast asleep, and the other two were using it as a",
-    "cushion, resting their elbows on it, and talking over its head. ‘Very",
-    "uncomfortable for the Dormouse,’ thought Alice; ‘only, as it’s asleep, I",
-    "suppose it doesn’t mind.’",
-    "The table was a large one, but the three were all crowded together at",
-    "one corner of it: ‘No room! No room!’ they cried out when they saw Alice",
-    "coming. ‘There’s PLENTY of room!’ said Alice indignantly, and she sat",
-    "down in a large arm-chair at one end of the table.",
-    "‘Have some wine,’ the March Hare said in an encouraging tone.",
-    "Alice looked all round the table, but there was nothing on it but tea.",
-    "‘I don’t see any wine,’ she remarked.",
-    "‘There isn’t any,’ said the March Hare.",
-    "‘Then it wasn’t very civil of you to offer it,’ said Alice angrily.",
-    "‘It wasn’t very civil of you to sit down without being invited,’ said",
-    "the March Hare.",
-    "‘I didn’t know it was YOUR table,’ said Alice; ‘it’s laid for a great",
-    "many more than three.’",
-    "‘Your hair wants cutting,’ said the Hatter. He had been looking at Alice",
-    "for some time with great curiosity, and this was his first speech.",
-    "‘You should learn not to make personal remarks,’ Alice said with some",
-    "severity; ‘it’s very rude.’",
-    "The Hatter opened his eyes very wide on hearing this; but all he SAID",
-    "was, ‘Why is a raven like a writing-desk?’",
-    "‘Come, we shall have some fun now!’ thought Alice. ‘I’m glad they’ve",
-    "begun asking riddles.--I believe I can guess that,’ she added aloud.",
-    "‘Do you mean that you think you can find out the answer to it?’ said the",
-    "March Hare.",
-    "‘Exactly so,’ said Alice.",
-    "‘Then you should say what you mean,’ the March Hare went on.",
-    "‘I do,’ Alice hastily replied; ‘at least--at least I mean what I",
-    "say--that’s the same thing, you know.’",
-    "‘Not the same thing a bit!’ said the Hatter. ‘You might just as well say",
-    "that “I see what I eat” is the same thing as “I eat what I see”!’",
-    "‘You might just as well say,’ added the March Hare, ‘that “I like what I",
-    "get” is the same thing as “I get what I like”!’",
-    "‘You might just as well say,’ added the Dormouse, who seemed to be",
-    "talking in his sleep, ‘that “I breathe when I sleep” is the same thing",
-    "as “I sleep when I breathe”!’",
-    "‘It IS the same thing with you,’ said the Hatter, and here the",
-    "conversation dropped, and the party sat silent for a minute, while Alice",
-    "thought over all she could remember about ravens and writing-desks,",
-    "which wasn’t much.",
-    "The Hatter was the first to break the silence. ‘What day of the month",
-    "is it?’ he said, turning to Alice: he had taken his watch out of his",
-    "pocket, and was looking at it uneasily, shaking it every now and then,",
-    "and holding it to his ear.",
-    "Alice considered a little, and then said ‘The fourth.’",
-    "‘Two days wrong!’ sighed the Hatter. ‘I told you butter wouldn’t suit",
-    "the works!’ he added looking angrily at the March Hare.",
-    "‘It was the BEST butter,’ the March Hare meekly replied.",
-    "‘Yes, but some crumbs must have got in as well,’ the Hatter grumbled:",
-    "‘you shouldn’t have put it in with the bread-knife.’",
-    "The March Hare took the watch and looked at it gloomily: then he dipped",
-    "it into his cup of tea, and looked at it again: but he could think of",
-    "nothing better to say than his first remark, ‘It was the BEST butter,",
-    "you know.’",
-    "Alice had been looking over his shoulder with some curiosity. ‘What a",
-    "funny watch!’ she remarked. ‘It tells the day of the month, and doesn’t",
-    "tell what o’clock it is!’",
-    "‘Why should it?’ muttered the Hatter. ‘Does YOUR watch tell you what",
-    "year it is?’",
-    "‘Of course not,’ Alice replied very readily: ‘but that’s because it",
-    "stays the same year for such a long time together.’",
-    "‘Which is just the case with MINE,’ said the Hatter.",
-    "Alice felt dreadfully puzzled. The Hatter’s remark seemed to have no",
-    "sort of meaning in it, and yet it was certainly English. ‘I don’t quite",
-    "understand you,’ she said, as politely as she could.",
-    "‘The Dormouse is asleep again,’ said the Hatter, and he poured a little",
-    "hot tea upon its nose.",
-    "The Dormouse shook its head impatiently, and said, without opening its",
-    "eyes, ‘Of course, of course; just what I was going to remark myself.’",
-    "‘Have you guessed the riddle yet?’ the Hatter said, turning to Alice",
-    "again.",
-    "‘No, I give it up,’ Alice replied: ‘what’s the answer?’",
-    "‘I haven’t the slightest idea,’ said the Hatter.",
-    "‘Nor I,’ said the March Hare.",
-    "Alice sighed wearily. ‘I think you might do something better with the",
-    "time,’ she said, ‘than waste it in asking riddles that have no answers.’",
-    "‘If you knew Time as well as I do,’ said the Hatter, ‘you wouldn’t talk",
-    "about wasting IT. It’s HIM.’",
-    "‘I don’t know what you mean,’ said Alice.",
-    "‘Of course you don’t!’ the Hatter said, tossing his head contemptuously.",
-    "‘I dare say you never even spoke to Time!’",
-    "‘Perhaps not,’ Alice cautiously replied: ‘but I know I have to beat time",
-    "when I learn music.’",
-    "‘Ah! that accounts for it,’ said the Hatter. ‘He won’t stand beating.",
-    "Now, if you only kept on good terms with him, he’d do almost anything",
-    "you liked with the clock. For instance, suppose it were nine o’clock in",
-    "the morning, just time to begin lessons: you’d only have to whisper a",
-    "hint to Time, and round goes the clock in a twinkling! Half-past one,",
-    "time for dinner!’",
-    "[‘I only wish it was,’ the March Hare said to itself in a whisper.)",
-    "‘That would be grand, certainly,’ said Alice thoughtfully: ‘but then--I",
-    "shouldn’t be hungry for it, you know.’",
-    "‘Not at first, perhaps,’ said the Hatter: ‘but you could keep it to",
-    "half-past one as long as you liked.’",
-    "‘Is that the way YOU manage?’ Alice asked.",
-    "The Hatter shook his head mournfully. ‘Not I!’ he replied. ‘We",
-    "quarrelled last March--just before HE went mad, you know--’ (pointing",
-    "with his tea spoon at the March Hare,) ‘--it was at the great concert",
-    "given by the Queen of Hearts, and I had to sing",
-    "     “Twinkle, twinkle, little bat!",
-    "     How I wonder what you’re at!”",
-    "You know the song, perhaps?’",
-    "‘I’ve heard something like it,’ said Alice.",
-    "‘It goes on, you know,’ the Hatter continued, ‘in this way:--",
-    "     “Up above the world you fly,",
-    "     Like a tea-tray in the sky.",
-    "         Twinkle, twinkle--“’",
-    "Here the Dormouse shook itself, and began singing in its sleep ‘Twinkle,",
-    "twinkle, twinkle, twinkle--’ and went on so long that they had to pinch",
-    "it to make it stop.",
-    "‘Well, I’d hardly finished the first verse,’ said the Hatter, ‘when the",
-    "Queen jumped up and bawled out, “He’s murdering the time! Off with his",
-    "head!”’",
-    "‘How dreadfully savage!’ exclaimed Alice.",
-    "‘And ever since that,’ the Hatter went on in a mournful tone, ‘he won’t",
-    "do a thing I ask! It’s always six o’clock now.’",
-    "A bright idea came into Alice’s head. ‘Is that the reason so many",
-    "tea-things are put out here?’ she asked.",
-    "‘Yes, that’s it,’ said the Hatter with a sigh: ‘it’s always tea-time,",
-    "and we’ve no time to wash the things between whiles.’",
-    "‘Then you keep moving round, I suppose?’ said Alice.",
-    "‘Exactly so,’ said the Hatter: ‘as the things get used up.’",
-    "‘But what happens when you come to the beginning again?’ Alice ventured",
-    "to ask.",
-    "‘Suppose we change the subject,’ the March Hare interrupted, yawning.",
-    "‘I’m getting tired of this. I vote the young lady tells us a story.’",
-    "‘I’m afraid I don’t know one,’ said Alice, rather alarmed at the",
-    "proposal.",
-    "‘Then the Dormouse shall!’ they both cried. ‘Wake up, Dormouse!’ And",
-    "they pinched it on both sides at once.",
-    "The Dormouse slowly opened his eyes. ‘I wasn’t asleep,’ he said in a",
-    "hoarse, feeble voice: ‘I heard every word you fellows were saying.’",
-    "‘Tell us a story!’ said the March Hare.",
-    "‘Yes, please do!’ pleaded Alice.",
-    "‘And be quick about it,’ added the Hatter, ‘or you’ll be asleep again",
-    "before it’s done.’",
-    "‘Once upon a time there were three little sisters,’ the Dormouse began",
-    "in a great hurry; ‘and their names were Elsie, Lacie, and Tillie; and",
-    "they lived at the bottom of a well--’",
-    "‘What did they live on?’ said Alice, who always took a great interest in",
-    "questions of eating and drinking.",
-    "‘They lived on treacle,’ said the Dormouse, after thinking a minute or",
-    "two.",
-    "‘They couldn’t have done that, you know,’ Alice gently remarked; ‘they’d",
-    "have been ill.’",
-    "‘So they were,’ said the Dormouse; ‘VERY ill.’",
-    "Alice tried to fancy to herself what such an extraordinary ways of",
-    "living would be like, but it puzzled her too much, so she went on: ‘But",
-    "why did they live at the bottom of a well?’",
-    "‘Take some more tea,’ the March Hare said to Alice, very earnestly.",
-    "‘I’ve had nothing yet,’ Alice replied in an offended tone, ‘so I can’t",
-    "take more.’",
-    "‘You mean you can’t take LESS,’ said the Hatter: ‘it’s very easy to take",
-    "MORE than nothing.’",
-    "‘Nobody asked YOUR opinion,’ said Alice.",
-    "‘Who’s making personal remarks now?’ the Hatter asked triumphantly.",
-    "Alice did not quite know what to say to this: so she helped herself",
-    "to some tea and bread-and-butter, and then turned to the Dormouse, and",
-    "repeated her question. ‘Why did they live at the bottom of a well?’",
-    "The Dormouse again took a minute or two to think about it, and then",
-    "said, ‘It was a treacle-well.’",
-    "‘There’s no such thing!’ Alice was beginning very angrily, but the",
-    "Hatter and the March Hare went ‘Sh! sh!’ and the Dormouse sulkily",
-    "remarked, ‘If you can’t be civil, you’d better finish the story for",
-    "yourself.’",
-    "‘No, please go on!’ Alice said very humbly; ‘I won’t interrupt again. I",
-    "dare say there may be ONE.’",
-    "‘One, indeed!’ said the Dormouse indignantly. However, he consented to",
-    "go on. ‘And so these three little sisters--they were learning to draw,",
-    "you know--’",
-    "‘What did they draw?’ said Alice, quite forgetting her promise.",
-    "‘Treacle,’ said the Dormouse, without considering at all this time.",
-    "‘I want a clean cup,’ interrupted the Hatter: ‘let’s all move one place",
-    "on.’",
-    "He moved on as he spoke, and the Dormouse followed him: the March Hare",
-    "moved into the Dormouse’s place, and Alice rather unwillingly took",
-    "the place of the March Hare. The Hatter was the only one who got any",
-    "advantage from the change: and Alice was a good deal worse off than",
-    "before, as the March Hare had just upset the milk-jug into his plate.",
-    "Alice did not wish to offend the Dormouse again, so she began very",
-    "cautiously: ‘But I don’t understand. Where did they draw the treacle",
-    "from?’",
-    "‘You can draw water out of a water-well,’ said the Hatter; ‘so I should",
-    "think you could draw treacle out of a treacle-well--eh, stupid?’",
-    "‘But they were IN the well,’ Alice said to the Dormouse, not choosing to",
-    "notice this last remark.",
-    "‘Of course they were’, said the Dormouse; ‘--well in.’",
-    "This answer so confused poor Alice, that she let the Dormouse go on for",
-    "some time without interrupting it.",
-    "‘They were learning to draw,’ the Dormouse went on, yawning and rubbing",
-    "its eyes, for it was getting very sleepy; ‘and they drew all manner of",
-    "things--everything that begins with an M--’",
-    "‘Why with an M?’ said Alice.",
-    "‘Why not?’ said the March Hare.",
-    "Alice was silent.",
-    "The Dormouse had closed its eyes by this time, and was going off into",
-    "a doze; but, on being pinched by the Hatter, it woke up again with",
-    "a little shriek, and went on: ‘--that begins with an M, such as",
-    "mouse-traps, and the moon, and memory, and muchness--you know you say",
-    "things are “much of a muchness”--did you ever see such a thing as a",
-    "drawing of a muchness?’",
-    "‘Really, now you ask me,’ said Alice, very much confused, ‘I don’t",
-    "think--’",
-    "‘Then you shouldn’t talk,’ said the Hatter.",
-    "This piece of rudeness was more than Alice could bear: she got up in",
-    "great disgust, and walked off; the Dormouse fell asleep instantly, and",
-    "neither of the others took the least notice of her going, though she",
-    "looked back once or twice, half hoping that they would call after her:",
-    "the last time she saw them, they were trying to put the Dormouse into",
-    "the teapot.",
-    "‘At any rate I’ll never go THERE again!’ said Alice as she picked her",
-    "way through the wood. ‘It’s the stupidest tea-party I ever was at in all",
-    "my life!’",
-    "Just as she said this, she noticed that one of the trees had a door",
-    "leading right into it. ‘That’s very curious!’ she thought. ‘But",
-    "everything’s curious today. I think I may as well go in at once.’ And in",
-    "she went.",
-    "Once more she found herself in the long hall, and close to the little",
-    "glass table. ‘Now, I’ll manage better this time,’ she said to herself,",
-    "and began by taking the little golden key, and unlocking the door that",
-    "led into the garden. Then she went to work nibbling at the mushroom (she",
-    "had kept a piece of it in her pocket) till she was about a foot high:",
-    "then she walked down the little passage: and THEN--she found herself at",
-    "last in the beautiful garden, among the bright flower-beds and the cool",
-    "fountains.",
-    "CHAPTER VIII. The Queen’s Croquet-Ground",
-    "A large rose-tree stood near the entrance of the garden: the roses",
-    "growing on it were white, but there were three gardeners at it, busily",
-    "painting them red. Alice thought this a very curious thing, and she went",
-    "nearer to watch them, and just as she came up to them she heard one of",
-    "them say, ‘Look out now, Five! Don’t go splashing paint over me like",
-    "that!’",
-    "‘I couldn’t help it,’ said Five, in a sulky tone; ‘Seven jogged my",
-    "elbow.’",
-    "On which Seven looked up and said, ‘That’s right, Five! Always lay the",
-    "blame on others!’",
-    "‘YOU’D better not talk!’ said Five. ‘I heard the Queen say only",
-    "yesterday you deserved to be beheaded!’",
-    "‘What for?’ said the one who had spoken first.",
-    "‘That’s none of YOUR business, Two!’ said Seven.",
-    "‘Yes, it IS his business!’ said Five, ‘and I’ll tell him--it was for",
-    "bringing the cook tulip-roots instead of onions.’",
-    "Seven flung down his brush, and had just begun ‘Well, of all the unjust",
-    "things--’ when his eye chanced to fall upon Alice, as she stood watching",
-    "them, and he checked himself suddenly: the others looked round also, and",
-    "all of them bowed low.",
-    "‘Would you tell me,’ said Alice, a little timidly, ‘why you are painting",
-    "those roses?’",
-    "Five and Seven said nothing, but looked at Two. Two began in a low",
-    "voice, ‘Why the fact is, you see, Miss, this here ought to have been a",
-    "RED rose-tree, and we put a white one in by mistake; and if the Queen",
-    "was to find it out, we should all have our heads cut off, you know.",
-    "So you see, Miss, we’re doing our best, afore she comes, to--’ At this",
-    "moment Five, who had been anxiously looking across the garden, called",
-    "out ‘The Queen! The Queen!’ and the three gardeners instantly threw",
-    "themselves flat upon their faces. There was a sound of many footsteps,",
-    "and Alice looked round, eager to see the Queen.",
-    "First came ten soldiers carrying clubs; these were all shaped like",
-    "the three gardeners, oblong and flat, with their hands and feet at the",
-    "corners: next the ten courtiers; these were ornamented all over with",
-    "diamonds, and walked two and two, as the soldiers did. After these came",
-    "the royal children; there were ten of them, and the little dears came",
-    "jumping merrily along hand in hand, in couples: they were all ornamented",
-    "with hearts. Next came the guests, mostly Kings and Queens, and among",
-    "them Alice recognised the White Rabbit: it was talking in a hurried",
-    "nervous manner, smiling at everything that was said, and went by without",
-    "noticing her. Then followed the Knave of Hearts, carrying the King’s",
-    "crown on a crimson velvet cushion; and, last of all this grand",
-    "procession, came THE KING AND QUEEN OF HEARTS.",
-    "Alice was rather doubtful whether she ought not to lie down on her face",
-    "like the three gardeners, but she could not remember ever having heard",
-    "of such a rule at processions; ‘and besides, what would be the use of",
-    "a procession,’ thought she, ‘if people had all to lie down upon their",
-    "faces, so that they couldn’t see it?’ So she stood still where she was,",
-    "and waited.",
-    "When the procession came opposite to Alice, they all stopped and looked",
-    "at her, and the Queen said severely ‘Who is this?’ She said it to the",
-    "Knave of Hearts, who only bowed and smiled in reply.",
-    "‘Idiot!’ said the Queen, tossing her head impatiently; and, turning to",
-    "Alice, she went on, ‘What’s your name, child?’",
-    "‘My name is Alice, so please your Majesty,’ said Alice very politely;",
-    "but she added, to herself, ‘Why, they’re only a pack of cards, after",
-    "all. I needn’t be afraid of them!’",
-    "‘And who are THESE?’ said the Queen, pointing to the three gardeners who",
-    "were lying round the rosetree; for, you see, as they were lying on their",
-    "faces, and the pattern on their backs was the same as the rest of the",
-    "pack, she could not tell whether they were gardeners, or soldiers, or",
-    "courtiers, or three of her own children.",
-    "‘How should I know?’ said Alice, surprised at her own courage. ‘It’s no",
-    "business of MINE.’",
-    "The Queen turned crimson with fury, and, after glaring at her for a",
-    "moment like a wild beast, screamed ‘Off with her head! Off--’",
-    "‘Nonsense!’ said Alice, very loudly and decidedly, and the Queen was",
-    "silent.",
-    "The King laid his hand upon her arm, and timidly said ‘Consider, my",
-    "dear: she is only a child!’",
-    "The Queen turned angrily away from him, and said to the Knave ‘Turn them",
-    "over!’",
-    "The Knave did so, very carefully, with one foot.",
-    "‘Get up!’ said the Queen, in a shrill, loud voice, and the three",
-    "gardeners instantly jumped up, and began bowing to the King, the Queen,",
-    "the royal children, and everybody else.",
-    "‘Leave off that!’ screamed the Queen. ‘You make me giddy.’ And then,",
-    "turning to the rose-tree, she went on, ‘What HAVE you been doing here?’",
-    "‘May it please your Majesty,’ said Two, in a very humble tone, going",
-    "down on one knee as he spoke, ‘we were trying--’",
-    "‘I see!’ said the Queen, who had meanwhile been examining the roses.",
-    "‘Off with their heads!’ and the procession moved on, three of the",
-    "soldiers remaining behind to execute the unfortunate gardeners, who ran",
-    "to Alice for protection.",
-    "‘You shan’t be beheaded!’ said Alice, and she put them into a large",
-    "flower-pot that stood near. The three soldiers wandered about for a",
-    "minute or two, looking for them, and then quietly marched off after the",
-    "others.",
-    "‘Are their heads off?’ shouted the Queen.",
-    "‘Their heads are gone, if it please your Majesty!’ the soldiers shouted",
-    "in reply.",
-    "‘That’s right!’ shouted the Queen. ‘Can you play croquet?’",
-    "The soldiers were silent, and looked at Alice, as the question was",
-    "evidently meant for her.",
-    "‘Yes!’ shouted Alice.",
-    "‘Come on, then!’ roared the Queen, and Alice joined the procession,",
-    "wondering very much what would happen next.",
-    "‘It’s--it’s a very fine day!’ said a timid voice at her side. She was",
-    "walking by the White Rabbit, who was peeping anxiously into her face.",
-    "‘Very,’ said Alice: ‘--where’s the Duchess?’",
-    "‘Hush! Hush!’ said the Rabbit in a low, hurried tone. He looked",
-    "anxiously over his shoulder as he spoke, and then raised himself upon",
-    "tiptoe, put his mouth close to her ear, and whispered ‘She’s under",
-    "sentence of execution.’",
-    "‘What for?’ said Alice.",
-    "‘Did you say “What a pity!”?’ the Rabbit asked.",
-    "‘No, I didn’t,’ said Alice: ‘I don’t think it’s at all a pity. I said",
-    "“What for?”’",
-    "‘She boxed the Queen’s ears--’ the Rabbit began. Alice gave a little",
-    "scream of laughter. ‘Oh, hush!’ the Rabbit whispered in a frightened",
-    "tone. ‘The Queen will hear you! You see, she came rather late, and the",
-    "Queen said--’",
-    "‘Get to your places!’ shouted the Queen in a voice of thunder, and",
-    "people began running about in all directions, tumbling up against each",
-    "other; however, they got settled down in a minute or two, and the game",
-    "began. Alice thought she had never seen such a curious croquet-ground in",
-    "her life; it was all ridges and furrows; the balls were live hedgehogs,",
-    "the mallets live flamingoes, and the soldiers had to double themselves",
-    "up and to stand on their hands and feet, to make the arches.",
-    "The chief difficulty Alice found at first was in managing her flamingo:",
-    "she succeeded in getting its body tucked away, comfortably enough, under",
-    "her arm, with its legs hanging down, but generally, just as she had got",
-    "its neck nicely straightened out, and was going to give the hedgehog a",
-    "blow with its head, it WOULD twist itself round and look up in her face,",
-    "with such a puzzled expression that she could not help bursting out",
-    "laughing: and when she had got its head down, and was going to begin",
-    "again, it was very provoking to find that the hedgehog had unrolled",
-    "itself, and was in the act of crawling away: besides all this, there was",
-    "generally a ridge or furrow in the way wherever she wanted to send the",
-    "hedgehog to, and, as the doubled-up soldiers were always getting up",
-    "and walking off to other parts of the ground, Alice soon came to the",
-    "conclusion that it was a very difficult game indeed.",
-    "The players all played at once without waiting for turns, quarrelling",
-    "all the while, and fighting for the hedgehogs; and in a very short",
-    "time the Queen was in a furious passion, and went stamping about, and",
-    "shouting ‘Off with his head!’ or ‘Off with her head!’ about once in a",
-    "minute.",
-    "Alice began to feel very uneasy: to be sure, she had not as yet had any",
-    "dispute with the Queen, but she knew that it might happen any minute,",
-    "‘and then,’ thought she, ‘what would become of me? They’re dreadfully",
-    "fond of beheading people here; the great wonder is, that there’s any one",
-    "left alive!’",
-    "She was looking about for some way of escape, and wondering whether she",
-    "could get away without being seen, when she noticed a curious appearance",
-    "in the air: it puzzled her very much at first, but, after watching it",
-    "a minute or two, she made it out to be a grin, and she said to herself",
-    "‘It’s the Cheshire Cat: now I shall have somebody to talk to.’",
-    "‘How are you getting on?’ said the Cat, as soon as there was mouth",
-    "enough for it to speak with.",
-    "Alice waited till the eyes appeared, and then nodded. ‘It’s no use",
-    "speaking to it,’ she thought, ‘till its ears have come, or at least one",
-    "of them.’ In another minute the whole head appeared, and then Alice put",
-    "down her flamingo, and began an account of the game, feeling very glad",
-    "she had someone to listen to her. The Cat seemed to think that there was",
-    "enough of it now in sight, and no more of it appeared.",
-    "‘I don’t think they play at all fairly,’ Alice began, in rather a",
-    "complaining tone, ‘and they all quarrel so dreadfully one can’t hear",
-    "oneself speak--and they don’t seem to have any rules in particular;",
-    "at least, if there are, nobody attends to them--and you’ve no idea how",
-    "confusing it is all the things being alive; for instance, there’s the",
-    "arch I’ve got to go through next walking about at the other end of the",
-    "ground--and I should have croqueted the Queen’s hedgehog just now, only",
-    "it ran away when it saw mine coming!’",
-    "‘How do you like the Queen?’ said the Cat in a low voice.",
-    "‘Not at all,’ said Alice: ‘she’s so extremely--’ Just then she noticed",
-    "that the Queen was close behind her, listening: so she went on,",
-    "‘--likely to win, that it’s hardly worth while finishing the game.’",
-    "The Queen smiled and passed on.",
-    "‘Who ARE you talking to?’ said the King, going up to Alice, and looking",
-    "at the Cat’s head with great curiosity.",
-    "‘It’s a friend of mine--a Cheshire Cat,’ said Alice: ‘allow me to",
-    "introduce it.’",
-    "‘I don’t like the look of it at all,’ said the King: ‘however, it may",
-    "kiss my hand if it likes.’",
-    "‘I’d rather not,’ the Cat remarked.",
-    "‘Don’t be impertinent,’ said the King, ‘and don’t look at me like that!’",
-    "He got behind Alice as he spoke.",
-    "‘A cat may look at a king,’ said Alice. ‘I’ve read that in some book,",
-    "but I don’t remember where.’",
-    "‘Well, it must be removed,’ said the King very decidedly, and he called",
-    "the Queen, who was passing at the moment, ‘My dear! I wish you would",
-    "have this cat removed!’",
-    "The Queen had only one way of settling all difficulties, great or small.",
-    "‘Off with his head!’ she said, without even looking round.",
-    "‘I’ll fetch the executioner myself,’ said the King eagerly, and he",
-    "hurried off.",
-    "Alice thought she might as well go back, and see how the game was going",
-    "on, as she heard the Queen’s voice in the distance, screaming with",
-    "passion. She had already heard her sentence three of the players to be",
-    "executed for having missed their turns, and she did not like the look",
-    "of things at all, as the game was in such confusion that she never knew",
-    "whether it was her turn or not. So she went in search of her hedgehog.",
-    "The hedgehog was engaged in a fight with another hedgehog, which seemed",
-    "to Alice an excellent opportunity for croqueting one of them with the",
-    "other: the only difficulty was, that her flamingo was gone across to the",
-    "other side of the garden, where Alice could see it trying in a helpless",
-    "sort of way to fly up into a tree.",
-    "By the time she had caught the flamingo and brought it back, the fight",
-    "was over, and both the hedgehogs were out of sight: ‘but it doesn’t",
-    "matter much,’ thought Alice, ‘as all the arches are gone from this side",
-    "of the ground.’ So she tucked it away under her arm, that it might not",
-    "escape again, and went back for a little more conversation with her",
-    "friend.",
-    "When she got back to the Cheshire Cat, she was surprised to find quite a",
-    "large crowd collected round it: there was a dispute going on between",
-    "the executioner, the King, and the Queen, who were all talking at once,",
-    "while all the rest were quite silent, and looked very uncomfortable.",
-    "The moment Alice appeared, she was appealed to by all three to settle",
-    "the question, and they repeated their arguments to her, though, as they",
-    "all spoke at once, she found it very hard indeed to make out exactly",
-    "what they said.",
-    "The executioner’s argument was, that you couldn’t cut off a head unless",
-    "there was a body to cut it off from: that he had never had to do such a",
-    "thing before, and he wasn’t going to begin at HIS time of life.",
-    "The King’s argument was, that anything that had a head could be",
-    "beheaded, and that you weren’t to talk nonsense.",
-    "The Queen’s argument was, that if something wasn’t done about it in less",
-    "than no time she’d have everybody executed, all round. (It was this last",
-    "remark that had made the whole party look so grave and anxious.)",
-    "Alice could think of nothing else to say but ‘It belongs to the Duchess:",
-    "you’d better ask HER about it.’",
-    "‘She’s in prison,’ the Queen said to the executioner: ‘fetch her here.’",
-    "And the executioner went off like an arrow.",
-    " The Cat’s head began fading away the moment he was gone, and,",
-    "by the time he had come back with the Duchess, it had entirely",
-    "disappeared; so the King and the executioner ran wildly up and down",
-    "looking for it, while the rest of the party went back to the game.",
-    "CHAPTER IX. The Mock Turtle’s Story",
-    "‘You can’t think how glad I am to see you again, you dear old thing!’",
-    "said the Duchess, as she tucked her arm affectionately into Alice’s, and",
-    "they walked off together.",
-    "Alice was very glad to find her in such a pleasant temper, and thought",
-    "to herself that perhaps it was only the pepper that had made her so",
-    "savage when they met in the kitchen.",
-    "‘When I’M a Duchess,’ she said to herself, (not in a very hopeful tone",
-    "though), ‘I won’t have any pepper in my kitchen AT ALL. Soup does very",
-    "well without--Maybe it’s always pepper that makes people hot-tempered,’",
-    "she went on, very much pleased at having found out a new kind of",
-    "rule, ‘and vinegar that makes them sour--and camomile that makes",
-    "them bitter--and--and barley-sugar and such things that make children",
-    "sweet-tempered. I only wish people knew that: then they wouldn’t be so",
-    "stingy about it, you know--’",
-    "She had quite forgotten the Duchess by this time, and was a little",
-    "startled when she heard her voice close to her ear. ‘You’re thinking",
-    "about something, my dear, and that makes you forget to talk. I can’t",
-    "tell you just now what the moral of that is, but I shall remember it in",
-    "a bit.’",
-    "‘Perhaps it hasn’t one,’ Alice ventured to remark.",
-    "‘Tut, tut, child!’ said the Duchess. ‘Everything’s got a moral, if only",
-    "you can find it.’ And she squeezed herself up closer to Alice’s side as",
-    "she spoke.",
-    "Alice did not much like keeping so close to her: first, because the",
-    "Duchess was VERY ugly; and secondly, because she was exactly the",
-    "right height to rest her chin upon Alice’s shoulder, and it was an",
-    "uncomfortably sharp chin. However, she did not like to be rude, so she",
-    "bore it as well as she could.",
-    "‘The game’s going on rather better now,’ she said, by way of keeping up",
-    "the conversation a little.",
-    "‘’Tis so,’ said the Duchess: ‘and the moral of that is--“Oh, ‘tis love,",
-    "‘tis love, that makes the world go round!”’",
-    "‘Somebody said,’ Alice whispered, ‘that it’s done by everybody minding",
-    "their own business!’",
-    "‘Ah, well! It means much the same thing,’ said the Duchess, digging her",
-    "sharp little chin into Alice’s shoulder as she added, ‘and the moral",
-    "of THAT is--“Take care of the sense, and the sounds will take care of",
-    "themselves.”’",
-    "‘How fond she is of finding morals in things!’ Alice thought to herself.",
-    "‘I dare say you’re wondering why I don’t put my arm round your waist,’",
-    "the Duchess said after a pause: ‘the reason is, that I’m doubtful about",
-    "the temper of your flamingo. Shall I try the experiment?’",
-    "‘HE might bite,’ Alice cautiously replied, not feeling at all anxious to",
-    "have the experiment tried.",
-    "‘Very true,’ said the Duchess: ‘flamingoes and mustard both bite. And",
-    "the moral of that is--“Birds of a feather flock together.”’",
-    "‘Only mustard isn’t a bird,’ Alice remarked.",
-    "‘Right, as usual,’ said the Duchess: ‘what a clear way you have of",
-    "putting things!’",
-    "‘It’s a mineral, I THINK,’ said Alice.",
-    "‘Of course it is,’ said the Duchess, who seemed ready to agree to",
-    "everything that Alice said; ‘there’s a large mustard-mine near here. And",
-    "the moral of that is--“The more there is of mine, the less there is of",
-    "yours.”’",
-    "‘Oh, I know!’ exclaimed Alice, who had not attended to this last remark,",
-    "‘it’s a vegetable. It doesn’t look like one, but it is.’",
-    "‘I quite agree with you,’ said the Duchess; ‘and the moral of that",
-    "is--“Be what you would seem to be”--or if you’d like it put more",
-    "simply--“Never imagine yourself not to be otherwise than what it might",
-    "appear to others that what you were or might have been was not otherwise",
-    "than what you had been would have appeared to them to be otherwise.”’",
-    "‘I think I should understand that better,’ Alice said very politely, ‘if",
-    "I had it written down: but I can’t quite follow it as you say it.’",
-    "‘That’s nothing to what I could say if I chose,’ the Duchess replied, in",
-    "a pleased tone.",
-    "‘Pray don’t trouble yourself to say it any longer than that,’ said",
-    "Alice.",
-    "‘Oh, don’t talk about trouble!’ said the Duchess. ‘I make you a present",
-    "of everything I’ve said as yet.’",
-    "‘A cheap sort of present!’ thought Alice. ‘I’m glad they don’t give",
-    "birthday presents like that!’ But she did not venture to say it out",
-    "loud.",
-    "‘Thinking again?’ the Duchess asked, with another dig of her sharp",
-    "little chin.",
-    "‘I’ve a right to think,’ said Alice sharply, for she was beginning to",
-    "feel a little worried.",
-    "‘Just about as much right,’ said the Duchess, ‘as pigs have to fly; and",
-    "the m--’",
-    "But here, to Alice’s great surprise, the Duchess’s voice died away, even",
-    "in the middle of her favourite word ‘moral,’ and the arm that was linked",
-    "into hers began to tremble. Alice looked up, and there stood the Queen",
-    "in front of them, with her arms folded, frowning like a thunderstorm.",
-    "‘A fine day, your Majesty!’ the Duchess began in a low, weak voice.",
-    "‘Now, I give you fair warning,’ shouted the Queen, stamping on the",
-    "ground as she spoke; ‘either you or your head must be off, and that in",
-    "about half no time! Take your choice!’",
-    "The Duchess took her choice, and was gone in a moment.",
-    "‘Let’s go on with the game,’ the Queen said to Alice; and Alice was",
-    "too much frightened to say a word, but slowly followed her back to the",
-    "croquet-ground.",
-    "The other guests had taken advantage of the Queen’s absence, and were",
-    "resting in the shade: however, the moment they saw her, they hurried",
-    "back to the game, the Queen merely remarking that a moment’s delay would",
-    "cost them their lives.",
-    "All the time they were playing the Queen never left off quarrelling with",
-    "the other players, and shouting ‘Off with his head!’ or ‘Off with her",
-    "head!’ Those whom she sentenced were taken into custody by the soldiers,",
-    "who of course had to leave off being arches to do this, so that by",
-    "the end of half an hour or so there were no arches left, and all the",
-    "players, except the King, the Queen, and Alice, were in custody and",
-    "under sentence of execution.",
-    "Then the Queen left off, quite out of breath, and said to Alice, ‘Have",
-    "you seen the Mock Turtle yet?’",
-    "‘No,’ said Alice. ‘I don’t even know what a Mock Turtle is.’",
-    "‘It’s the thing Mock Turtle Soup is made from,’ said the Queen.",
-    "‘I never saw one, or heard of one,’ said Alice.",
-    "‘Come on, then,’ said the Queen, ‘and he shall tell you his history,’",
-    "As they walked off together, Alice heard the King say in a low voice,",
-    "to the company generally, ‘You are all pardoned.’ ‘Come, THAT’S a good",
-    "thing!’ she said to herself, for she had felt quite unhappy at the",
-    "number of executions the Queen had ordered.",
-    "They very soon came upon a Gryphon, lying fast asleep in the sun.",
-    "(IF you don’t know what a Gryphon is, look at the picture.) ‘Up, lazy",
-    "thing!’ said the Queen, ‘and take this young lady to see the Mock",
-    "Turtle, and to hear his history. I must go back and see after some",
-    "executions I have ordered’; and she walked off, leaving Alice alone with",
-    "the Gryphon. Alice did not quite like the look of the creature, but on",
-    "the whole she thought it would be quite as safe to stay with it as to go",
-    "after that savage Queen: so she waited.",
-    "The Gryphon sat up and rubbed its eyes: then it watched the Queen till",
-    "she was out of sight: then it chuckled. ‘What fun!’ said the Gryphon,",
-    "half to itself, half to Alice.",
-    "‘What IS the fun?’ said Alice.",
-    "‘Why, SHE,’ said the Gryphon. ‘It’s all her fancy, that: they never",
-    "executes nobody, you know. Come on!’",
-    "‘Everybody says “come on!” here,’ thought Alice, as she went slowly",
-    "after it: ‘I never was so ordered about in all my life, never!’",
-    "They had not gone far before they saw the Mock Turtle in the distance,",
-    "sitting sad and lonely on a little ledge of rock, and, as they came",
-    "nearer, Alice could hear him sighing as if his heart would break. She",
-    "pitied him deeply. ‘What is his sorrow?’ she asked the Gryphon, and the",
-    "Gryphon answered, very nearly in the same words as before, ‘It’s all his",
-    "fancy, that: he hasn’t got no sorrow, you know. Come on!’",
-    "So they went up to the Mock Turtle, who looked at them with large eyes",
-    "full of tears, but said nothing.",
-    "‘This here young lady,’ said the Gryphon, ‘she wants for to know your",
-    "history, she do.’",
-    "‘I’ll tell it her,’ said the Mock Turtle in a deep, hollow tone: ‘sit",
-    "down, both of you, and don’t speak a word till I’ve finished.’",
-    "So they sat down, and nobody spoke for some minutes. Alice thought to",
-    "herself, ‘I don’t see how he can EVEN finish, if he doesn’t begin.’ But",
-    "she waited patiently.",
-    "‘Once,’ said the Mock Turtle at last, with a deep sigh, ‘I was a real",
-    "Turtle.’",
-    "These words were followed by a very long silence, broken only by an",
-    "occasional exclamation of ‘Hjckrrh!’ from the Gryphon, and the constant",
-    "heavy sobbing of the Mock Turtle. Alice was very nearly getting up and",
-    "saying, ‘Thank you, sir, for your interesting story,’ but she could",
-    "not help thinking there MUST be more to come, so she sat still and said",
-    "nothing.",
-    "‘When we were little,’ the Mock Turtle went on at last, more calmly,",
-    "though still sobbing a little now and then, ‘we went to school in the",
-    "sea. The master was an old Turtle--we used to call him Tortoise--’",
-    "‘Why did you call him Tortoise, if he wasn’t one?’ Alice asked.",
-    "‘We called him Tortoise because he taught us,’ said the Mock Turtle",
-    "angrily: ‘really you are very dull!’",
-    "‘You ought to be ashamed of yourself for asking such a simple question,’",
-    "added the Gryphon; and then they both sat silent and looked at poor",
-    "Alice, who felt ready to sink into the earth. At last the Gryphon said",
-    "to the Mock Turtle, ‘Drive on, old fellow! Don’t be all day about it!’",
-    "and he went on in these words:",
-    "‘Yes, we went to school in the sea, though you mayn’t believe it--’",
-    "‘I never said I didn’t!’ interrupted Alice.",
-    "‘You did,’ said the Mock Turtle.",
-    "‘Hold your tongue!’ added the Gryphon, before Alice could speak again.",
-    "The Mock Turtle went on.",
-    "‘We had the best of educations--in fact, we went to school every day--’",
-    "‘I’VE been to a day-school, too,’ said Alice; ‘you needn’t be so proud",
-    "as all that.’",
-    "‘With extras?’ asked the Mock Turtle a little anxiously.",
-    "‘Yes,’ said Alice, ‘we learned French and music.’",
-    "‘And washing?’ said the Mock Turtle.",
-    "‘Certainly not!’ said Alice indignantly.",
-    "‘Ah! then yours wasn’t a really good school,’ said the Mock Turtle in",
-    "a tone of great relief. ‘Now at OURS they had at the end of the bill,",
-    "“French, music, AND WASHING--extra.”’",
-    "‘You couldn’t have wanted it much,’ said Alice; ‘living at the bottom of",
-    "the sea.’",
-    "‘I couldn’t afford to learn it.’ said the Mock Turtle with a sigh. ‘I",
-    "only took the regular course.’",
-    "‘What was that?’ inquired Alice.",
-    "‘Reeling and Writhing, of course, to begin with,’ the Mock Turtle",
-    "replied; ‘and then the different branches of Arithmetic--Ambition,",
-    "Distraction, Uglification, and Derision.’",
-    "‘I never heard of “Uglification,”’ Alice ventured to say. ‘What is it?’",
-    "The Gryphon lifted up both its paws in surprise. ‘What! Never heard of",
-    "uglifying!’ it exclaimed. ‘You know what to beautify is, I suppose?’",
-    "‘Yes,’ said Alice doubtfully: ‘it means--to--make--anything--prettier.’",
-    "‘Well, then,’ the Gryphon went on, ‘if you don’t know what to uglify is,",
-    "you ARE a simpleton.’",
-    "Alice did not feel encouraged to ask any more questions about it, so she",
-    "turned to the Mock Turtle, and said ‘What else had you to learn?’",
-    "‘Well, there was Mystery,’ the Mock Turtle replied, counting off",
-    "the subjects on his flappers, ‘--Mystery, ancient and modern, with",
-    "Seaography: then Drawling--the Drawling-master was an old conger-eel,",
-    "that used to come once a week: HE taught us Drawling, Stretching, and",
-    "Fainting in Coils.’",
-    "‘What was THAT like?’ said Alice.",
-    "‘Well, I can’t show it you myself,’ the Mock Turtle said: ‘I’m too",
-    "stiff. And the Gryphon never learnt it.’",
-    "‘Hadn’t time,’ said the Gryphon: ‘I went to the Classics master, though.",
-    "He was an old crab, HE was.’",
-    "‘I never went to him,’ the Mock Turtle said with a sigh: ‘he taught",
-    "Laughing and Grief, they used to say.’",
-    "‘So he did, so he did,’ said the Gryphon, sighing in his turn; and both",
-    "creatures hid their faces in their paws.",
-    "‘And how many hours a day did you do lessons?’ said Alice, in a hurry to",
-    "change the subject.",
-    "‘Ten hours the first day,’ said the Mock Turtle: ‘nine the next, and so",
-    "on.’",
-    "‘What a curious plan!’ exclaimed Alice.",
-    "‘That’s the reason they’re called lessons,’ the Gryphon remarked:",
-    "‘because they lessen from day to day.’",
-    "This was quite a new idea to Alice, and she thought it over a little",
-    "before she made her next remark. ‘Then the eleventh day must have been a",
-    "holiday?’",
-    "‘Of course it was,’ said the Mock Turtle.",
-    "‘And how did you manage on the twelfth?’ Alice went on eagerly.",
-    "‘That’s enough about lessons,’ the Gryphon interrupted in a very decided",
-    "tone: ‘tell her something about the games now.’",
-    "CHAPTER X. The Lobster Quadrille",
-    "The Mock Turtle sighed deeply, and drew the back of one flapper across",
-    "his eyes. He looked at Alice, and tried to speak, but for a minute or",
-    "two sobs choked his voice. ‘Same as if he had a bone in his throat,’",
-    "said the Gryphon: and it set to work shaking him and punching him in",
-    "the back. At last the Mock Turtle recovered his voice, and, with tears",
-    "running down his cheeks, he went on again:--",
-    "‘You may not have lived much under the sea--’ [‘I haven’t,’ said",
-    "Alice)--‘and perhaps you were never even introduced to a lobster--’",
-    "(Alice began to say ‘I once tasted--’ but checked herself hastily, and",
-    "said ‘No, never’) ‘--so you can have no idea what a delightful thing a",
-    "Lobster Quadrille is!’",
-    "‘No, indeed,’ said Alice. ‘What sort of a dance is it?’",
-    "‘Why,’ said the Gryphon, ‘you first form into a line along the",
-    "sea-shore--’",
-    "‘Two lines!’ cried the Mock Turtle. ‘Seals, turtles, salmon, and so on;",
-    "then, when you’ve cleared all the jelly-fish out of the way--’",
-    "‘THAT generally takes some time,’ interrupted the Gryphon.",
-    "‘--you advance twice--’",
-    "‘Each with a lobster as a partner!’ cried the Gryphon.",
-    "‘Of course,’ the Mock Turtle said: ‘advance twice, set to partners--’",
-    "‘--change lobsters, and retire in same order,’ continued the Gryphon.",
-    "‘Then, you know,’ the Mock Turtle went on, ‘you throw the--’",
-    "‘The lobsters!’ shouted the Gryphon, with a bound into the air.",
-    "‘--as far out to sea as you can--’",
-    "‘Swim after them!’ screamed the Gryphon.",
-    "‘Turn a somersault in the sea!’ cried the Mock Turtle, capering wildly",
-    "about.",
-    "‘Change lobsters again!’ yelled the Gryphon at the top of its voice.",
-    "‘Back to land again, and that’s all the first figure,’ said the Mock",
-    "Turtle, suddenly dropping his voice; and the two creatures, who had been",
-    "jumping about like mad things all this time, sat down again very sadly",
-    "and quietly, and looked at Alice.",
-    "‘It must be a very pretty dance,’ said Alice timidly.",
-    "‘Would you like to see a little of it?’ said the Mock Turtle.",
-    "‘Very much indeed,’ said Alice.",
-    "‘Come, let’s try the first figure!’ said the Mock Turtle to the Gryphon.",
-    "‘We can do without lobsters, you know. Which shall sing?’",
-    "‘Oh, YOU sing,’ said the Gryphon. ‘I’ve forgotten the words.’",
-    "So they began solemnly dancing round and round Alice, every now and",
-    "then treading on her toes when they passed too close, and waving their",
-    "forepaws to mark the time, while the Mock Turtle sang this, very slowly",
-    "and sadly:--",
-    " ‘“Will you walk a little faster?” said a whiting to a snail.",
-    " “There’s a porpoise close behind us, and he’s treading on my tail.",
-    " See how eagerly the lobsters and the turtles all advance!",
-    " They are waiting on the shingle--will you come and join the dance?",
-    " Will you, won’t you, will you, won’t you, will you join the dance?",
-    " Will you, won’t you, will you, won’t you, won’t you join the dance?",
-    " “You can really have no notion how delightful it will be",
-    " When they take us up and throw us, with the lobsters, out to sea!”",
-    "  But the snail replied “Too far, too far!” and gave a look askance--",
-    " Said he thanked the whiting kindly, but he would not join the dance.",
-    " Would not, could not, would not, could not, would not join the dance.",
-    " Would not, could not, would not, could not, could not join the dance.",
-    " ‘“What matters it how far we go?” his scaly friend replied.",
-    " “There is another shore, you know, upon the other side.",
-    " The further off from England the nearer is to France--",
-    " Then turn not pale, beloved snail, but come and join the dance.",
-    " Will you, won’t you, will you, won’t you, will you join the dance?",
-    " Will you, won’t you, will you, won’t you, won’t you join the dance?”’",
-    "‘Thank you, it’s a very interesting dance to watch,’ said Alice, feeling",
-    "very glad that it was over at last: ‘and I do so like that curious song",
-    "about the whiting!’",
-    "‘Oh, as to the whiting,’ said the Mock Turtle, ‘they--you’ve seen them,",
-    "of course?’",
-    "‘Yes,’ said Alice, ‘I’ve often seen them at dinn--’ she checked herself",
-    "hastily.",
-    "‘I don’t know where Dinn may be,’ said the Mock Turtle, ‘but if you’ve",
-    "seen them so often, of course you know what they’re like.’",
-    "‘I believe so,’ Alice replied thoughtfully. ‘They have their tails in",
-    "their mouths--and they’re all over crumbs.’",
-    "‘You’re wrong about the crumbs,’ said the Mock Turtle: ‘crumbs would all",
-    "wash off in the sea. But they HAVE their tails in their mouths; and the",
-    "reason is--’ here the Mock Turtle yawned and shut his eyes.--‘Tell her",
-    "about the reason and all that,’ he said to the Gryphon.",
-    "‘The reason is,’ said the Gryphon, ‘that they WOULD go with the lobsters",
-    "to the dance. So they got thrown out to sea. So they had to fall a long",
-    "way. So they got their tails fast in their mouths. So they couldn’t get",
-    "them out again. That’s all.’",
-    "‘Thank you,’ said Alice, ‘it’s very interesting. I never knew so much",
-    "about a whiting before.’",
-    "‘I can tell you more than that, if you like,’ said the Gryphon. ‘Do you",
-    "know why it’s called a whiting?’",
-    "‘I never thought about it,’ said Alice. ‘Why?’",
-    "‘IT DOES THE BOOTS AND SHOES.’ the Gryphon replied very solemnly.",
-    "Alice was thoroughly puzzled. ‘Does the boots and shoes!’ she repeated",
-    "in a wondering tone.",
-    "‘Why, what are YOUR shoes done with?’ said the Gryphon. ‘I mean, what",
-    "makes them so shiny?’",
-    "Alice looked down at them, and considered a little before she gave her",
-    "answer. ‘They’re done with blacking, I believe.’",
-    "‘Boots and shoes under the sea,’ the Gryphon went on in a deep voice,",
-    "‘are done with a whiting. Now you know.’",
-    "‘And what are they made of?’ Alice asked in a tone of great curiosity.",
-    "‘Soles and eels, of course,’ the Gryphon replied rather impatiently:",
-    "‘any shrimp could have told you that.’",
-    "‘If I’d been the whiting,’ said Alice, whose thoughts were still running",
-    "on the song, ‘I’d have said to the porpoise, “Keep back, please: we",
-    "don’t want YOU with us!”’",
-    "‘They were obliged to have him with them,’ the Mock Turtle said: ‘no",
-    "wise fish would go anywhere without a porpoise.’",
-    "‘Wouldn’t it really?’ said Alice in a tone of great surprise.",
-    "‘Of course not,’ said the Mock Turtle: ‘why, if a fish came to ME, and",
-    "told me he was going a journey, I should say “With what porpoise?”’",
-    "‘Don’t you mean “purpose”?’ said Alice.",
-    "‘I mean what I say,’ the Mock Turtle replied in an offended tone. And",
-    "the Gryphon added ‘Come, let’s hear some of YOUR adventures.’",
-    "‘I could tell you my adventures--beginning from this morning,’ said",
-    "Alice a little timidly: ‘but it’s no use going back to yesterday,",
-    "because I was a different person then.’",
-    "‘Explain all that,’ said the Mock Turtle.",
-    "‘No, no! The adventures first,’ said the Gryphon in an impatient tone:",
-    "‘explanations take such a dreadful time.’",
-    "So Alice began telling them her adventures from the time when she first",
-    "saw the White Rabbit. She was a little nervous about it just at first,",
-    "the two creatures got so close to her, one on each side, and opened",
-    "their eyes and mouths so VERY wide, but she gained courage as she went",
-    "on. Her listeners were perfectly quiet till she got to the part about",
-    "her repeating ‘YOU ARE OLD, FATHER WILLIAM,’ to the Caterpillar, and the",
-    "words all coming different, and then the Mock Turtle drew a long breath,",
-    "and said ‘That’s very curious.’",
-    "‘It’s all about as curious as it can be,’ said the Gryphon.",
-    "‘It all came different!’ the Mock Turtle repeated thoughtfully. ‘I",
-    "should like to hear her try and repeat something now. Tell her to",
-    "begin.’ He looked at the Gryphon as if he thought it had some kind of",
-    "authority over Alice.",
-    "‘Stand up and repeat “‘TIS THE VOICE OF THE SLUGGARD,”’ said the",
-    "Gryphon.",
-    "‘How the creatures order one about, and make one repeat lessons!’",
-    "thought Alice; ‘I might as well be at school at once.’ However, she",
-    "got up, and began to repeat it, but her head was so full of the Lobster",
-    "Quadrille, that she hardly knew what she was saying, and the words came",
-    "very queer indeed:--",
-    "  ‘’Tis the voice of the Lobster; I heard him declare,",
-    "  “You have baked me too brown, I must sugar my hair.”",
-    "   As a duck with its eyelids, so he with his nose",
-    "  Trims his belt and his buttons, and turns out his toes.’",
-    "       [later editions continued as follows",
-    "  When the sands are all dry, he is gay as a lark,",
-    "  And will talk in contemptuous tones of the Shark,",
-    "  But, when the tide rises and sharks are around,",
-    "  His voice has a timid and tremulous sound.]",
-    "‘That’s different from what I used to say when I was a child,’ said the",
-    "Gryphon.",
-    "‘Well, I never heard it before,’ said the Mock Turtle; ‘but it sounds",
-    "uncommon nonsense.’",
-    "Alice said nothing; she had sat down with her face in her hands,",
-    "wondering if anything would EVER happen in a natural way again.",
-    "‘I should like to have it explained,’ said the Mock Turtle.",
-    "‘She can’t explain it,’ said the Gryphon hastily. ‘Go on with the next",
-    "verse.’",
-    "‘But about his toes?’ the Mock Turtle persisted. ‘How COULD he turn them",
-    "out with his nose, you know?’",
-    "‘It’s the first position in dancing.’ Alice said; but was dreadfully",
-    "puzzled by the whole thing, and longed to change the subject.",
-    "‘Go on with the next verse,’ the Gryphon repeated impatiently: ‘it",
-    "begins “I passed by his garden.”’",
-    "Alice did not dare to disobey, though she felt sure it would all come",
-    "wrong, and she went on in a trembling voice:--",
-    "  ‘I passed by his garden, and marked, with one eye,",
-    "  How the Owl and the Panther were sharing a pie--’",
-    "    [later editions continued as follows",
-    "  The Panther took pie-crust, and gravy, and meat,",
-    "  While the Owl had the dish as its share of the treat.",
-    "  When the pie was all finished, the Owl, as a boon,",
-    "  Was kindly permitted to pocket the spoon:",
-    "  While the Panther received knife and fork with a growl,",
-    "  And concluded the banquet--]",
-    "‘What IS the use of repeating all that stuff,’ the Mock Turtle",
-    "interrupted, ‘if you don’t explain it as you go on? It’s by far the most",
-    "confusing thing I ever heard!’",
-    "‘Yes, I think you’d better leave off,’ said the Gryphon: and Alice was",
-    "only too glad to do so.",
-    "‘Shall we try another figure of the Lobster Quadrille?’ the Gryphon went",
-    "on. ‘Or would you like the Mock Turtle to sing you a song?’",
-    "‘Oh, a song, please, if the Mock Turtle would be so kind,’ Alice",
-    "replied, so eagerly that the Gryphon said, in a rather offended tone,",
-    "‘Hm! No accounting for tastes! Sing her “Turtle Soup,” will you, old",
-    "fellow?’",
-    "The Mock Turtle sighed deeply, and began, in a voice sometimes choked",
-    "with sobs, to sing this:--",
-    "   ‘Beautiful Soup, so rich and green,",
-    "   Waiting in a hot tureen!",
-    "   Who for such dainties would not stoop?",
-    "   Soup of the evening, beautiful Soup!",
-    "   Soup of the evening, beautiful Soup!",
-    "     Beau--ootiful Soo--oop!",
-    "     Beau--ootiful Soo--oop!",
-    "   Soo--oop of the e--e--evening,",
-    "     Beautiful, beautiful Soup!",
-    "   ‘Beautiful Soup! Who cares for fish,",
-    "   Game, or any other dish?",
-    "   Who would not give all else for two",
-    "   Pennyworth only of beautiful Soup?",
-    "   Pennyworth only of beautiful Soup?",
-    "     Beau--ootiful Soo--oop!",
-    "     Beau--ootiful Soo--oop!",
-    "   Soo--oop of the e--e--evening,",
-    "     Beautiful, beauti--FUL SOUP!’",
-    "‘Chorus again!’ cried the Gryphon, and the Mock Turtle had just begun",
-    "to repeat it, when a cry of ‘The trial’s beginning!’ was heard in the",
-    "distance.",
-    "‘Come on!’ cried the Gryphon, and, taking Alice by the hand, it hurried",
-    "off, without waiting for the end of the song.",
-    "‘What trial is it?’ Alice panted as she ran; but the Gryphon only",
-    "answered ‘Come on!’ and ran the faster, while more and more faintly",
-    "came, carried on the breeze that followed them, the melancholy words:--",
-    "   ‘Soo--oop of the e--e--evening,",
-    "     Beautiful, beautiful Soup!’",
-    "CHAPTER XI. Who Stole the Tarts?",
-    "The King and Queen of Hearts were seated on their throne when they",
-    "arrived, with a great crowd assembled about them--all sorts of little",
-    "birds and beasts, as well as the whole pack of cards: the Knave was",
-    "standing before them, in chains, with a soldier on each side to guard",
-    "him; and near the King was the White Rabbit, with a trumpet in one hand,",
-    "and a scroll of parchment in the other. In the very middle of the court",
-    "was a table, with a large dish of tarts upon it: they looked so good,",
-    "that it made Alice quite hungry to look at them--‘I wish they’d get the",
-    "trial done,’ she thought, ‘and hand round the refreshments!’ But there",
-    "seemed to be no chance of this, so she began looking at everything about",
-    "her, to pass away the time.",
-    "Alice had never been in a court of justice before, but she had read",
-    "about them in books, and she was quite pleased to find that she knew",
-    "the name of nearly everything there. ‘That’s the judge,’ she said to",
-    "herself, ‘because of his great wig.’",
-    "The judge, by the way, was the King; and as he wore his crown over the",
-    "wig, (look at the frontispiece if you want to see how he did it,) he did",
-    "not look at all comfortable, and it was certainly not becoming.",
-    "‘And that’s the jury-box,’ thought Alice, ‘and those twelve creatures,’",
-    "(she was obliged to say ‘creatures,’ you see, because some of them were",
-    "animals, and some were birds,) ‘I suppose they are the jurors.’ She said",
-    "this last word two or three times over to herself, being rather proud of",
-    "it: for she thought, and rightly too, that very few little girls of her",
-    "age knew the meaning of it at all. However, ‘jury-men’ would have done",
-    "just as well.",
-    "The twelve jurors were all writing very busily on slates. ‘What are they",
-    "doing?’ Alice whispered to the Gryphon. ‘They can’t have anything to put",
-    "down yet, before the trial’s begun.’",
-    "‘They’re putting down their names,’ the Gryphon whispered in reply, ‘for",
-    "fear they should forget them before the end of the trial.’",
-    "‘Stupid things!’ Alice began in a loud, indignant voice, but she stopped",
-    "hastily, for the White Rabbit cried out, ‘Silence in the court!’ and the",
-    "King put on his spectacles and looked anxiously round, to make out who",
-    "was talking.",
-    "Alice could see, as well as if she were looking over their shoulders,",
-    "that all the jurors were writing down ‘stupid things!’ on their slates,",
-    "and she could even make out that one of them didn’t know how to spell",
-    "‘stupid,’ and that he had to ask his neighbour to tell him. ‘A nice",
-    "muddle their slates’ll be in before the trial’s over!’ thought Alice.",
-    "One of the jurors had a pencil that squeaked. This of course, Alice",
-    "could not stand, and she went round the court and got behind him, and",
-    "very soon found an opportunity of taking it away. She did it so quickly",
-    "that the poor little juror (it was Bill, the Lizard) could not make out",
-    "at all what had become of it; so, after hunting all about for it, he was",
-    "obliged to write with one finger for the rest of the day; and this was",
-    "of very little use, as it left no mark on the slate.",
-    "‘Herald, read the accusation!’ said the King.",
-    "On this the White Rabbit blew three blasts on the trumpet, and then",
-    "unrolled the parchment scroll, and read as follows:--",
-    "   ‘The Queen of Hearts, she made some tarts,",
-    "      All on a summer day:",
-    "    The Knave of Hearts, he stole those tarts,",
-    "      And took them quite away!’",
-    "‘Consider your verdict,’ the King said to the jury.",
-    "‘Not yet, not yet!’ the Rabbit hastily interrupted. ‘There’s a great",
-    "deal to come before that!’",
-    "‘Call the first witness,’ said the King; and the White Rabbit blew three",
-    "blasts on the trumpet, and called out, ‘First witness!’",
-    "The first witness was the Hatter. He came in with a teacup in one",
-    "hand and a piece of bread-and-butter in the other. ‘I beg pardon, your",
-    "Majesty,’ he began, ‘for bringing these in: but I hadn’t quite finished",
-    "my tea when I was sent for.’",
-    "‘You ought to have finished,’ said the King. ‘When did you begin?’",
-    "The Hatter looked at the March Hare, who had followed him into the",
-    "court, arm-in-arm with the Dormouse. ‘Fourteenth of March, I think it",
-    "was,’ he said.",
-    "‘Fifteenth,’ said the March Hare.",
-    "‘Sixteenth,’ added the Dormouse.",
-    "‘Write that down,’ the King said to the jury, and the jury eagerly",
-    "wrote down all three dates on their slates, and then added them up, and",
-    "reduced the answer to shillings and pence.",
-    "‘Take off your hat,’ the King said to the Hatter.",
-    "‘It isn’t mine,’ said the Hatter.",
-    "‘Stolen!’ the King exclaimed, turning to the jury, who instantly made a",
-    "memorandum of the fact.",
-    "‘I keep them to sell,’ the Hatter added as an explanation; ‘I’ve none of",
-    "my own. I’m a hatter.’",
-    "Here the Queen put on her spectacles, and began staring at the Hatter,",
-    "who turned pale and fidgeted.",
-    "‘Give your evidence,’ said the King; ‘and don’t be nervous, or I’ll have",
-    "you executed on the spot.’",
-    "This did not seem to encourage the witness at all: he kept shifting",
-    "from one foot to the other, looking uneasily at the Queen, and in",
-    "his confusion he bit a large piece out of his teacup instead of the",
-    "bread-and-butter.",
-    "Just at this moment Alice felt a very curious sensation, which puzzled",
-    "her a good deal until she made out what it was: she was beginning to",
-    "grow larger again, and she thought at first she would get up and leave",
-    "the court; but on second thoughts she decided to remain where she was as",
-    "long as there was room for her.",
-    "‘I wish you wouldn’t squeeze so.’ said the Dormouse, who was sitting",
-    "next to her. ‘I can hardly breathe.’",
-    "‘I can’t help it,’ said Alice very meekly: ‘I’m growing.’",
-    "‘You’ve no right to grow here,’ said the Dormouse.",
-    "‘Don’t talk nonsense,’ said Alice more boldly: ‘you know you’re growing",
-    "too.’",
-    "‘Yes, but I grow at a reasonable pace,’ said the Dormouse: ‘not in that",
-    "ridiculous fashion.’ And he got up very sulkily and crossed over to the",
-    "other side of the court.",
-    "All this time the Queen had never left off staring at the Hatter, and,",
-    "just as the Dormouse crossed the court, she said to one of the officers",
-    "of the court, ‘Bring me the list of the singers in the last concert!’ on",
-    "which the wretched Hatter trembled so, that he shook both his shoes off.",
-    "‘Give your evidence,’ the King repeated angrily, ‘or I’ll have you",
-    "executed, whether you’re nervous or not.’",
-    "‘I’m a poor man, your Majesty,’ the Hatter began, in a trembling voice,",
-    "‘--and I hadn’t begun my tea--not above a week or so--and what with the",
-    "bread-and-butter getting so thin--and the twinkling of the tea--’",
-    "‘The twinkling of the what?’ said the King.",
-    "‘It began with the tea,’ the Hatter replied.",
-    "‘Of course twinkling begins with a T!’ said the King sharply. ‘Do you",
-    "take me for a dunce? Go on!’",
-    "‘I’m a poor man,’ the Hatter went on, ‘and most things twinkled after",
-    "that--only the March Hare said--’",
-    "‘I didn’t!’ the March Hare interrupted in a great hurry.",
-    "‘You did!’ said the Hatter.",
-    "‘I deny it!’ said the March Hare.",
-    "‘He denies it,’ said the King: ‘leave out that part.’",
-    "‘Well, at any rate, the Dormouse said--’ the Hatter went on, looking",
-    "anxiously round to see if he would deny it too: but the Dormouse denied",
-    "nothing, being fast asleep.",
-    "‘After that,’ continued the Hatter, ‘I cut some more bread-and-butter--’",
-    "‘But what did the Dormouse say?’ one of the jury asked.",
-    "‘That I can’t remember,’ said the Hatter.",
-    "‘You MUST remember,’ remarked the King, ‘or I’ll have you executed.’",
-    "The miserable Hatter dropped his teacup and bread-and-butter, and went",
-    "down on one knee. ‘I’m a poor man, your Majesty,’ he began.",
-    "‘You’re a very poor speaker,’ said the King.",
-    "Here one of the guinea-pigs cheered, and was immediately suppressed by",
-    "the officers of the court. (As that is rather a hard word, I will just",
-    "explain to you how it was done. They had a large canvas bag, which tied",
-    "up at the mouth with strings: into this they slipped the guinea-pig,",
-    "head first, and then sat upon it.)",
-    "‘I’m glad I’ve seen that done,’ thought Alice. ‘I’ve so often read",
-    "in the newspapers, at the end of trials, “There was some attempts",
-    "at applause, which was immediately suppressed by the officers of the",
-    "court,” and I never understood what it meant till now.’",
-    "‘If that’s all you know about it, you may stand down,’ continued the",
-    "King.",
-    "‘I can’t go no lower,’ said the Hatter: ‘I’m on the floor, as it is.’",
-    "‘Then you may SIT down,’ the King replied.",
-    "Here the other guinea-pig cheered, and was suppressed.",
-    "‘Come, that finished the guinea-pigs!’ thought Alice. ‘Now we shall get",
-    "on better.’",
-    "‘I’d rather finish my tea,’ said the Hatter, with an anxious look at the",
-    "Queen, who was reading the list of singers.",
-    "‘You may go,’ said the King, and the Hatter hurriedly left the court,",
-    "without even waiting to put his shoes on.",
-    "‘--and just take his head off outside,’ the Queen added to one of the",
-    "officers: but the Hatter was out of sight before the officer could get",
-    "to the door.",
-    "‘Call the next witness!’ said the King.",
-    "The next witness was the Duchess’s cook. She carried the pepper-box in",
-    "her hand, and Alice guessed who it was, even before she got into the",
-    "court, by the way the people near the door began sneezing all at once.",
-    "‘Give your evidence,’ said the King.",
-    "‘Shan’t,’ said the cook.",
-    "The King looked anxiously at the White Rabbit, who said in a low voice,",
-    "‘Your Majesty must cross-examine THIS witness.’",
-    "‘Well, if I must, I must,’ the King said, with a melancholy air, and,",
-    "after folding his arms and frowning at the cook till his eyes were",
-    "nearly out of sight, he said in a deep voice, ‘What are tarts made of?’",
-    "‘Pepper, mostly,’ said the cook.",
-    "‘Treacle,’ said a sleepy voice behind her.",
-    "‘Collar that Dormouse,’ the Queen shrieked out. ‘Behead that Dormouse!",
-    "Turn that Dormouse out of court! Suppress him! Pinch him! Off with his",
-    "whiskers!’",
-    "For some minutes the whole court was in confusion, getting the Dormouse",
-    "turned out, and, by the time they had settled down again, the cook had",
-    "disappeared.",
-    "‘Never mind!’ said the King, with an air of great relief. ‘Call the next",
-    "witness.’ And he added in an undertone to the Queen, ‘Really, my dear,",
-    "YOU must cross-examine the next witness. It quite makes my forehead",
-    "ache!’",
-    "Alice watched the White Rabbit as he fumbled over the list, feeling very",
-    "curious to see what the next witness would be like, ‘--for they haven’t",
-    "got much evidence YET,’ she said to herself. Imagine her surprise, when",
-    "the White Rabbit read out, at the top of his shrill little voice, the",
-    "name ‘Alice!’",
-    "CHAPTER XII. Alice’s Evidence",
-    "‘Here!’ cried Alice, quite forgetting in the flurry of the moment how",
-    "large she had grown in the last few minutes, and she jumped up in such",
-    "a hurry that she tipped over the jury-box with the edge of her skirt,",
-    "upsetting all the jurymen on to the heads of the crowd below, and there",
-    "they lay sprawling about, reminding her very much of a globe of goldfish",
-    "she had accidentally upset the week before.",
-    "‘Oh, I BEG your pardon!’ she exclaimed in a tone of great dismay, and",
-    "began picking them up again as quickly as she could, for the accident of",
-    "the goldfish kept running in her head, and she had a vague sort of idea",
-    "that they must be collected at once and put back into the jury-box, or",
-    "they would die.",
-    "‘The trial cannot proceed,’ said the King in a very grave voice, ‘until",
-    "all the jurymen are back in their proper places--ALL,’ he repeated with",
-    "great emphasis, looking hard at Alice as he said do.",
-    "Alice looked at the jury-box, and saw that, in her haste, she had put",
-    "the Lizard in head downwards, and the poor little thing was waving its",
-    "tail about in a melancholy way, being quite unable to move. She soon got",
-    "it out again, and put it right; ‘not that it signifies much,’ she said",
-    "to herself; ‘I should think it would be QUITE as much use in the trial",
-    "one way up as the other.’",
-    "As soon as the jury had a little recovered from the shock of being",
-    "upset, and their slates and pencils had been found and handed back to",
-    "them, they set to work very diligently to write out a history of the",
-    "accident, all except the Lizard, who seemed too much overcome to do",
-    "anything but sit with its mouth open, gazing up into the roof of the",
-    "court.",
-    "‘What do you know about this business?’ the King said to Alice.",
-    "‘Nothing,’ said Alice.",
-    "‘Nothing WHATEVER?’ persisted the King.",
-    "‘Nothing whatever,’ said Alice.",
-    "‘That’s very important,’ the King said, turning to the jury. They were",
-    "just beginning to write this down on their slates, when the White Rabbit",
-    "interrupted: ‘UNimportant, your Majesty means, of course,’ he said in a",
-    "very respectful tone, but frowning and making faces at him as he spoke.",
-    "‘UNimportant, of course, I meant,’ the King hastily said, and went on",
-    "to himself in an undertone,",
-    "‘important--unimportant--unimportant--important--’ as if he were trying",
-    "which word sounded best.",
-    "Some of the jury wrote it down ‘important,’ and some ‘unimportant.’",
-    "Alice could see this, as she was near enough to look over their slates;",
-    "‘but it doesn’t matter a bit,’ she thought to herself.",
-    "At this moment the King, who had been for some time busily writing in",
-    "his note-book, cackled out ‘Silence!’ and read out from his book, ‘Rule",
-    "Forty-two. ALL PERSONS MORE THAN A MILE HIGH TO LEAVE THE COURT.’",
-    "Everybody looked at Alice.",
-    "‘I’M not a mile high,’ said Alice.",
-    "‘You are,’ said the King.",
-    "‘Nearly two miles high,’ added the Queen.",
-    "‘Well, I shan’t go, at any rate,’ said Alice: ‘besides, that’s not a",
-    "regular rule: you invented it just now.’",
-    "‘It’s the oldest rule in the book,’ said the King.",
-    "‘Then it ought to be Number One,’ said Alice.",
-    "The King turned pale, and shut his note-book hastily. ‘Consider your",
-    "verdict,’ he said to the jury, in a low, trembling voice.",
-    "‘There’s more evidence to come yet, please your Majesty,’ said the White",
-    "Rabbit, jumping up in a great hurry; ‘this paper has just been picked",
-    "up.’",
-    "‘What’s in it?’ said the Queen.",
-    "‘I haven’t opened it yet,’ said the White Rabbit, ‘but it seems to be a",
-    "letter, written by the prisoner to--to somebody.’",
-    "‘It must have been that,’ said the King, ‘unless it was written to",
-    "nobody, which isn’t usual, you know.’",
-    "‘Who is it directed to?’ said one of the jurymen.",
-    "‘It isn’t directed at all,’ said the White Rabbit; ‘in fact, there’s",
-    "nothing written on the OUTSIDE.’ He unfolded the paper as he spoke, and",
-    "added ‘It isn’t a letter, after all: it’s a set of verses.’",
-    "‘Are they in the prisoner’s handwriting?’ asked another of the jurymen.",
-    "‘No, they’re not,’ said the White Rabbit, ‘and that’s the queerest thing",
-    "about it.’ (The jury all looked puzzled.)",
-    "‘He must have imitated somebody else’s hand,’ said the King. (The jury",
-    "all brightened up again.)",
-    "‘Please your Majesty,’ said the Knave, ‘I didn’t write it, and they",
-    "can’t prove I did: there’s no name signed at the end.’",
-    "‘If you didn’t sign it,’ said the King, ‘that only makes the matter",
-    "worse. You MUST have meant some mischief, or else you’d have signed your",
-    "name like an honest man.’",
-    "There was a general clapping of hands at this: it was the first really",
-    "clever thing the King had said that day.",
-    "‘That PROVES his guilt,’ said the Queen.",
-    "‘It proves nothing of the sort!’ said Alice. ‘Why, you don’t even know",
-    "what they’re about!’",
-    "‘Read them,’ said the King.",
-    "The White Rabbit put on his spectacles. ‘Where shall I begin, please",
-    "your Majesty?’ he asked.",
-    "‘Begin at the beginning,’ the King said gravely, ‘and go on till you",
-    "come to the end: then stop.’",
-    "These were the verses the White Rabbit read:--",
-    "   ‘They told me you had been to her,",
-    "    And mentioned me to him:",
-    "   She gave me a good character,",
-    "    But said I could not swim.",
-    "   He sent them word I had not gone",
-    "    (We know it to be true):",
-    "   If she should push the matter on,",
-    "    What would become of you?",
-    "   I gave her one, they gave him two,",
-    "    You gave us three or more;",
-    "   They all returned from him to you,",
-    "    Though they were mine before.",
-    "   If I or she should chance to be",
-    "    Involved in this affair,",
-    "   He trusts to you to set them free,",
-    "    Exactly as we were.",
-    "   My notion was that you had been",
-    "    (Before she had this fit)",
-    "   An obstacle that came between",
-    "    Him, and ourselves, and it.",
-    "   Don’t let him know she liked them best,",
-    "    For this must ever be",
-    "   A secret, kept from all the rest,",
-    "    Between yourself and me.’",
-    "‘That’s the most important piece of evidence we’ve heard yet,’ said the",
-    "King, rubbing his hands; ‘so now let the jury--’",
-    "‘If any one of them can explain it,’ said Alice, (she had grown so large",
-    "in the last few minutes that she wasn’t a bit afraid of interrupting",
-    "him,) ‘I’ll give him sixpence. _I_ don’t believe there’s an atom of",
-    "meaning in it.’",
-    "The jury all wrote down on their slates, ‘SHE doesn’t believe there’s an",
-    "atom of meaning in it,’ but none of them attempted to explain the paper.",
-    "‘If there’s no meaning in it,’ said the King, ‘that saves a world of",
-    "trouble, you know, as we needn’t try to find any. And yet I don’t know,’",
-    "he went on, spreading out the verses on his knee, and looking at them",
-    "with one eye; ‘I seem to see some meaning in them, after all. “--SAID",
-    "I COULD NOT SWIM--” you can’t swim, can you?’ he added, turning to the",
-    "Knave.",
-    "The Knave shook his head sadly. ‘Do I look like it?’ he said. (Which he",
-    "certainly did NOT, being made entirely of cardboard.)",
-    "‘All right, so far,’ said the King, and he went on muttering over",
-    "the verses to himself: ‘“WE KNOW IT TO BE TRUE--” that’s the jury, of",
-    "course--“I GAVE HER ONE, THEY GAVE HIM TWO--” why, that must be what he",
-    "did with the tarts, you know--’",
-    "‘But, it goes on “THEY ALL RETURNED FROM HIM TO YOU,”’ said Alice.",
-    "‘Why, there they are!’ said the King triumphantly, pointing to the tarts",
-    "on the table. ‘Nothing can be clearer than THAT. Then again--“BEFORE SHE",
-    "HAD THIS FIT--” you never had fits, my dear, I think?’ he said to the",
-    "Queen.",
-    "‘Never!’ said the Queen furiously, throwing an inkstand at the Lizard",
-    "as she spoke. (The unfortunate little Bill had left off writing on his",
-    "slate with one finger, as he found it made no mark; but he now hastily",
-    "began again, using the ink, that was trickling down his face, as long as",
-    "it lasted.)",
-    "‘Then the words don’t FIT you,’ said the King, looking round the court",
-    "with a smile. There was a dead silence.",
-    "‘It’s a pun!’ the King added in an offended tone, and everybody laughed,",
-    "‘Let the jury consider their verdict,’ the King said, for about the",
-    "twentieth time that day.",
-    "‘No, no!’ said the Queen. ‘Sentence first--verdict afterwards.’",
-    "‘Stuff and nonsense!’ said Alice loudly. ‘The idea of having the",
-    "sentence first!’",
-    "‘Hold your tongue!’ said the Queen, turning purple.",
-    "‘I won’t!’ said Alice.",
-    "‘Off with her head!’ the Queen shouted at the top of her voice. Nobody",
-    "moved.",
-    "‘Who cares for you?’ said Alice, (she had grown to her full size by this",
-    "time.) ‘You’re nothing but a pack of cards!’",
-    "At this the whole pack rose up into the air, and came flying down upon",
-    "her: she gave a little scream, half of fright and half of anger, and",
-    "tried to beat them off, and found herself lying on the bank, with her",
-    "head in the lap of her sister, who was gently brushing away some dead",
-    "leaves that had fluttered down from the trees upon her face.",
-    "‘Wake up, Alice dear!’ said her sister; ‘Why, what a long sleep you’ve",
-    "had!’",
-    "‘Oh, I’ve had such a curious dream!’ said Alice, and she told her",
-    "sister, as well as she could remember them, all these strange Adventures",
-    "of hers that you have just been reading about; and when she had",
-    "finished, her sister kissed her, and said, ‘It WAS a curious dream,",
-    "dear, certainly: but now run in to your tea; it’s getting late.’ So",
-    "Alice got up and ran off, thinking while she ran, as well she might,",
-    "what a wonderful dream it had been.",
-    "But her sister sat still just as she left her, leaning her head on her",
-    "hand, watching the setting sun, and thinking of little Alice and all her",
-    "wonderful Adventures, till she too began dreaming after a fashion, and",
-    "this was her dream:--",
-    "First, she dreamed of little Alice herself, and once again the tiny",
-    "hands were clasped upon her knee, and the bright eager eyes were looking",
-    "up into hers--she could hear the very tones of her voice, and see that",
-    "queer little toss of her head to keep back the wandering hair that",
-    "WOULD always get into her eyes--and still as she listened, or seemed to",
-    "listen, the whole place around her became alive with the strange creatures",
-    "of her little sister’s dream.",
-    "The long grass rustled at her feet as the White Rabbit hurried by--the",
-    "frightened Mouse splashed his way through the neighbouring pool--she",
-    "could hear the rattle of the teacups as the March Hare and his friends",
-    "shared their never-ending meal, and the shrill voice of the Queen",
-    "ordering off her unfortunate guests to execution--once more the pig-baby",
-    "was sneezing on the Duchess’s knee, while plates and dishes crashed",
-    "around it--once more the shriek of the Gryphon, the squeaking of the",
-    "Lizard’s slate-pencil, and the choking of the suppressed guinea-pigs,",
-    "filled the air, mixed up with the distant sobs of the miserable Mock",
-    "Turtle.",
-    "So she sat on, with closed eyes, and half believed herself in",
-    "Wonderland, though she knew she had but to open them again, and all",
-    "would change to dull reality--the grass would be only rustling in the",
-    "wind, and the pool rippling to the waving of the reeds--the rattling",
-    "teacups would change to tinkling sheep-bells, and the Queen’s shrill",
-    "cries to the voice of the shepherd boy--and the sneeze of the baby, the",
-    "shriek of the Gryphon, and all the other queer noises, would change (she",
-    "knew) to the confused clamour of the busy farm-yard--while the lowing",
-    "of the cattle in the distance would take the place of the Mock Turtle’s",
-    "heavy sobs.",
-    "Lastly, she pictured to herself how this same little sister of hers",
-    "would, in the after-time, be herself a grown woman; and how she would",
-    "keep, through all her riper years, the simple and loving heart of her",
-    "childhood: and how she would gather about her other little children, and",
-    "make THEIR eyes bright and eager with many a strange tale, perhaps even",
-    "with the dream of Wonderland of long ago: and how she would feel with",
-    "all their simple sorrows, and find a pleasure in all their simple joys,",
-    "remembering her own child-life, and the happy summer days.",
-    "              THE END",
-    "End of Project Gutenberg’s Alice’s Adventures in Wonderland, by Lewis Carroll",
-    "*** END OF THIS PROJECT GUTENBERG EBOOK ALICE’S ADVENTURES IN WONDERLAND ***",
-    "***** This file should be named 11-0.txt or 11-0.zip *****",
-    "This and all associated files of various formats will be found in:",
-    "        http://www.gutenberg.org/1/11/",
-    "Updated editions will replace the previous one--the old editions",
-    "will be renamed.",
-    "Creating the works from public domain print editions means that no",
-    "one owns a United States copyright in these works, so the Foundation",
-    "(and you!) can copy and distribute it in the United States without",
-    "permission and without paying copyright royalties.  Special rules,",
-    "set forth in the General Terms of Use part of this license, apply to",
-    "copying and distributing Project Gutenberg-tm electronic works to",
-    "protect the PROJECT GUTENBERG-tm concept and trademark.  Project",
-    "Gutenberg is a registered trademark, and may not be used if you",
-    "charge for the eBooks, unless you receive specific permission.  If you",
-    "do not charge anything for copies of this eBook, complying with the",
-    "rules is very easy.  You may use this eBook for nearly any purpose",
-    "such as creation of derivative works, reports, performances and",
-    "research.  They may be modified and printed and given away--you may do",
-    "practically ANYTHING with public domain eBooks.  Redistribution is",
-    "subject to the trademark license, especially commercial",
-    "redistribution.",
-    "*** START: FULL LICENSE ***",
-    "THE FULL PROJECT GUTENBERG LICENSE",
-    "PLEASE READ THIS BEFORE YOU DISTRIBUTE OR USE THIS WORK",
-    "To protect the Project Gutenberg-tm mission of promoting the free",
-    "distribution of electronic works, by using or distributing this work",
-    "(or any other work associated in any way with the phrase “Project",
-    "Gutenberg”), you agree to comply with all the terms of the Full Project",
-    "Gutenberg-tm License (available with this file or online at",
-    "http://gutenberg.org/license).",
-    "Section 1.  General Terms of Use and Redistributing Project Gutenberg-tm",
-    "electronic works",
-    "1.A.  By reading or using any part of this Project Gutenberg-tm",
-    "electronic work, you indicate that you have read, understand, agree to",
-    "and accept all the terms of this license and intellectual property",
-    "(trademark/copyright) agreement.  If you do not agree to abide by all",
-    "the terms of this agreement, you must cease using and return or destroy",
-    "all copies of Project Gutenberg-tm electronic works in your possession.",
-    "If you paid a fee for obtaining a copy of or access to a Project",
-    "Gutenberg-tm electronic work and you do not agree to be bound by the",
-    "terms of this agreement, you may obtain a refund from the person or",
-    "entity to whom you paid the fee as set forth in paragraph 1.E.8.",
-    "1.B.  “Project Gutenberg” is a registered trademark.  It may only be",
-    "used on or associated in any way with an electronic work by people who",
-    "agree to be bound by the terms of this agreement.  There are a few",
-    "things that you can do with most Project Gutenberg-tm electronic works",
-    "even without complying with the full terms of this agreement.  See",
-    "paragraph 1.C below.  There are a lot of things you can do with Project",
-    "Gutenberg-tm electronic works if you follow the terms of this agreement",
-    "and help preserve free future access to Project Gutenberg-tm electronic",
-    "works.  See paragraph 1.E below.",
-    "1.C.  The Project Gutenberg Literary Archive Foundation (“the Foundation”",
-    " or PGLAF), owns a compilation copyright in the collection of Project",
-    "Gutenberg-tm electronic works.  Nearly all the individual works in the",
-    "collection are in the public domain in the United States.  If an",
-    "individual work is in the public domain in the United States and you are",
-    "located in the United States, we do not claim a right to prevent you from",
-    "copying, distributing, performing, displaying or creating derivative",
-    "works based on the work as long as all references to Project Gutenberg",
-    "are removed.  Of course, we hope that you will support the Project",
-    "Gutenberg-tm mission of promoting free access to electronic works by",
-    "freely sharing Project Gutenberg-tm works in compliance with the terms of",
-    "this agreement for keeping the Project Gutenberg-tm name associated with",
-    "the work.  You can easily comply with the terms of this agreement by",
-    "keeping this work in the same format with its attached full Project",
-    "Gutenberg-tm License when you share it without charge with others.",
-    "1.D.  The copyright laws of the place where you are located also govern",
-    "what you can do with this work.  Copyright laws in most countries are in",
-    "a constant state of change.  If you are outside the United States, check",
-    "the laws of your country in addition to the terms of this agreement",
-    "before downloading, copying, displaying, performing, distributing or",
-    "creating derivative works based on this work or any other Project",
-    "Gutenberg-tm work.  The Foundation makes no representations concerning",
-    "the copyright status of any work in any country outside the United",
-    "States.",
-    "1.E.  Unless you have removed all references to Project Gutenberg:",
-    "1.E.1.  The following sentence, with active links to, or other immediate",
-    "access to, the full Project Gutenberg-tm License must appear prominently",
-    "whenever any copy of a Project Gutenberg-tm work (any work on which the",
-    "phrase “Project Gutenberg” appears, or with which the phrase “Project",
-    "Gutenberg” is associated) is accessed, displayed, performed, viewed,",
-    "copied or distributed:",
-    "This eBook is for the use of anyone anywhere at no cost and with",
-    "almost no restrictions whatsoever.  You may copy it, give it away or",
-    "re-use it under the terms of the Project Gutenberg License included",
-    "with this eBook or online at www.gutenberg.org",
-    "1.E.2.  If an individual Project Gutenberg-tm electronic work is derived",
-    "from the public domain (does not contain a notice indicating that it is",
-    "posted with permission of the copyright holder), the work can be copied",
-    "and distributed to anyone in the United States without paying any fees",
-    "or charges.  If you are redistributing or providing access to a work",
-    "with the phrase “Project Gutenberg” associated with or appearing on the",
-    "work, you must comply either with the requirements of paragraphs 1.E.1",
-    "through 1.E.7 or obtain permission for the use of the work and the",
-    "Project Gutenberg-tm trademark as set forth in paragraphs 1.E.8 or",
-    "1.E.9.",
-    "1.E.3.  If an individual Project Gutenberg-tm electronic work is posted",
-    "with the permission of the copyright holder, your use and distribution",
-    "must comply with both paragraphs 1.E.1 through 1.E.7 and any additional",
-    "terms imposed by the copyright holder.  Additional terms will be linked",
-    "to the Project Gutenberg-tm License for all works posted with the",
-    "permission of the copyright holder found at the beginning of this work.",
-    "1.E.4.  Do not unlink or detach or remove the full Project Gutenberg-tm",
-    "License terms from this work, or any files containing a part of this",
-    "work or any other work associated with Project Gutenberg-tm.",
-    "1.E.5.  Do not copy, display, perform, distribute or redistribute this",
-    "electronic work, or any part of this electronic work, without",
-    "prominently displaying the sentence set forth in paragraph 1.E.1 with",
-    "active links or immediate access to the full terms of the Project",
-    "Gutenberg-tm License.",
-    "1.E.6.  You may convert to and distribute this work in any binary,",
-    "compressed, marked up, nonproprietary or proprietary form, including any",
-    "word processing or hypertext form.  However, if you provide access to or",
-    "distribute copies of a Project Gutenberg-tm work in a format other than",
-    "“Plain Vanilla ASCII” or other format used in the official version",
-    "posted on the official Project Gutenberg-tm web site (www.gutenberg.org),",
-    "you must, at no additional cost, fee or expense to the user, provide a",
-    "copy, a means of exporting a copy, or a means of obtaining a copy upon",
-    "request, of the work in its original “Plain Vanilla ASCII” or other",
-    "form.  Any alternate format must include the full Project Gutenberg-tm",
-    "License as specified in paragraph 1.E.1.",
-    "1.E.7.  Do not charge a fee for access to, viewing, displaying,",
-    "performing, copying or distributing any Project Gutenberg-tm works",
-    "unless you comply with paragraph 1.E.8 or 1.E.9.",
-    "1.E.8.  You may charge a reasonable fee for copies of or providing",
-    "access to or distributing Project Gutenberg-tm electronic works provided",
-    "that",
-    "- You pay a royalty fee of 20% of the gross profits you derive from",
-    "     the use of Project Gutenberg-tm works calculated using the method",
-    "     you already use to calculate your applicable taxes.  The fee is",
-    "     owed to the owner of the Project Gutenberg-tm trademark, but he",
-    "     has agreed to donate royalties under this paragraph to the",
-    "     Project Gutenberg Literary Archive Foundation.  Royalty payments",
-    "     must be paid within 60 days following each date on which you",
-    "     prepare (or are legally required to prepare) your periodic tax",
-    "     returns.  Royalty payments should be clearly marked as such and",
-    "     sent to the Project Gutenberg Literary Archive Foundation at the",
-    "     address specified in Section 4, “Information about donations to",
-    "     the Project Gutenberg Literary Archive Foundation.”",
-    "- You provide a full refund of any money paid by a user who notifies",
-    "     you in writing (or by e-mail) within 30 days of receipt that s/he",
-    "     does not agree to the terms of the full Project Gutenberg-tm",
-    "     License.  You must require such a user to return or",
-    "     destroy all copies of the works possessed in a physical medium",
-    "     and discontinue all use of and all access to other copies of",
-    "     Project Gutenberg-tm works.",
-    "- You provide, in accordance with paragraph 1.F.3, a full refund of any",
-    "     money paid for a work or a replacement copy, if a defect in the",
-    "     electronic work is discovered and reported to you within 90 days",
-    "     of receipt of the work.",
-    "- You comply with all other terms of this agreement for free",
-    "     distribution of Project Gutenberg-tm works.",
-    "1.E.9.  If you wish to charge a fee or distribute a Project Gutenberg-tm",
-    "electronic work or group of works on different terms than are set",
-    "forth in this agreement, you must obtain permission in writing from",
-    "both the Project Gutenberg Literary Archive Foundation and Michael",
-    "Hart, the owner of the Project Gutenberg-tm trademark.  Contact the",
-    "Foundation as set forth in Section 3 below.",
-    "1.F.",
-    "1.F.1.  Project Gutenberg volunteers and employees expend considerable",
-    "effort to identify, do copyright research on, transcribe and proofread",
-    "public domain works in creating the Project Gutenberg-tm",
-    "collection.  Despite these efforts, Project Gutenberg-tm electronic",
-    "works, and the medium on which they may be stored, may contain",
-    "“Defects,” such as, but not limited to, incomplete, inaccurate or",
-    "corrupt data, transcription errors, a copyright or other intellectual",
-    "property infringement, a defective or damaged disk or other medium, a",
-    "computer virus, or computer codes that damage or cannot be read by",
-    "your equipment.",
-    "1.F.2.  LIMITED WARRANTY, DISCLAIMER OF DAMAGES - Except for the “Right",
-    "of Replacement or Refund” described in paragraph 1.F.3, the Project",
-    "Gutenberg Literary Archive Foundation, the owner of the Project",
-    "Gutenberg-tm trademark, and any other party distributing a Project",
-    "Gutenberg-tm electronic work under this agreement, disclaim all",
-    "liability to you for damages, costs and expenses, including legal",
-    "fees.  YOU AGREE THAT YOU HAVE NO REMEDIES FOR NEGLIGENCE, STRICT",
-    "LIABILITY, BREACH OF WARRANTY OR BREACH OF CONTRACT EXCEPT THOSE",
-    "PROVIDED IN PARAGRAPH F3.  YOU AGREE THAT THE FOUNDATION, THE",
-    "TRADEMARK OWNER, AND ANY DISTRIBUTOR UNDER THIS AGREEMENT WILL NOT BE",
-    "LIABLE TO YOU FOR ACTUAL, DIRECT, INDIRECT, CONSEQUENTIAL, PUNITIVE OR",
-    "INCIDENTAL DAMAGES EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH",
-    "DAMAGE.",
-    "1.F.3.  LIMITED RIGHT OF REPLACEMENT OR REFUND - If you discover a",
-    "defect in this electronic work within 90 days of receiving it, you can",
-    "receive a refund of the money (if any) you paid for it by sending a",
-    "written explanation to the person you received the work from.  If you",
-    "received the work on a physical medium, you must return the medium with",
-    "your written explanation.  The person or entity that provided you with",
-    "the defective work may elect to provide a replacement copy in lieu of a",
-    "refund.  If you received the work electronically, the person or entity",
-    "providing it to you may choose to give you a second opportunity to",
-    "receive the work electronically in lieu of a refund.  If the second copy",
-    "is also defective, you may demand a refund in writing without further",
-    "opportunities to fix the problem.",
-    "1.F.4.  Except for the limited right of replacement or refund set forth",
-    "in paragraph 1.F.3, this work is provided to you ‘AS-IS’ WITH NO OTHER",
-    "WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO",
-    "WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR ANY PURPOSE.",
-    "1.F.5.  Some states do not allow disclaimers of certain implied",
-    "warranties or the exclusion or limitation of certain types of damages.",
-    "If any disclaimer or limitation set forth in this agreement violates the",
-    "law of the state applicable to this agreement, the agreement shall be",
-    "interpreted to make the maximum disclaimer or limitation permitted by",
-    "the applicable state law.  The invalidity or unenforceability of any",
-    "provision of this agreement shall not void the remaining provisions.",
-    "1.F.6.  INDEMNITY - You agree to indemnify and hold the Foundation, the",
-    "trademark owner, any agent or employee of the Foundation, anyone",
-    "providing copies of Project Gutenberg-tm electronic works in accordance",
-    "with this agreement, and any volunteers associated with the production,",
-    "promotion and distribution of Project Gutenberg-tm electronic works,",
-    "harmless from all liability, costs and expenses, including legal fees,",
-    "that arise directly or indirectly from any of the following which you do",
-    "or cause to occur: (a) distribution of this or any Project Gutenberg-tm",
-    "work, (b) alteration, modification, or additions or deletions to any",
-    "Project Gutenberg-tm work, and (c) any Defect you cause.",
-    "Section  2.  Information about the Mission of Project Gutenberg-tm",
-    "Project Gutenberg-tm is synonymous with the free distribution of",
-    "electronic works in formats readable by the widest variety of computers",
-    "including obsolete, old, middle-aged and new computers.  It exists",
-    "because of the efforts of hundreds of volunteers and donations from",
-    "people in all walks of life.",
-    "Volunteers and financial support to provide volunteers with the",
-    "assistance they need, is critical to reaching Project Gutenberg-tm’s",
-    "goals and ensuring that the Project Gutenberg-tm collection will",
-    "remain freely available for generations to come.  In 2001, the Project",
-    "Gutenberg Literary Archive Foundation was created to provide a secure",
-    "and permanent future for Project Gutenberg-tm and future generations.",
-    "To learn more about the Project Gutenberg Literary Archive Foundation",
-    "and how your efforts and donations can help, see Sections 3 and 4",
-    "and the Foundation web page at http://www.pglaf.org.",
-    "Section 3.  Information about the Project Gutenberg Literary Archive",
-    "Foundation",
-    "The Project Gutenberg Literary Archive Foundation is a non profit",
-    "501(c)(3) educational corporation organized under the laws of the",
-    "state of Mississippi and granted tax exempt status by the Internal",
-    "Revenue Service.  The Foundation’s EIN or federal tax identification",
-    "number is 64-6221541.  Its 501(c)(3) letter is posted at",
-    "http://pglaf.org/fundraising.  Contributions to the Project Gutenberg",
-    "Literary Archive Foundation are tax deductible to the full extent",
-    "permitted by U.S. federal laws and your state’s laws.",
-    "The Foundation’s principal office is located at 4557 Melan Dr. S.",
-    "Fairbanks, AK, 99712., but its volunteers and employees are scattered",
-    "throughout numerous locations.  Its business office is located at",
-    "809 North 1500 West, Salt Lake City, UT 84116, (801) 596-1887, email",
-    "business@pglaf.org.  Email contact links and up to date contact",
-    "information can be found at the Foundation’s web site and official",
-    "page at http://pglaf.org",
-    "For additional contact information:",
-    "     Dr. Gregory B. Newby",
-    "     Chief Executive and Director",
-    "     gbnewby@pglaf.org",
-    "Section 4.  Information about Donations to the Project Gutenberg",
-    "Literary Archive Foundation",
-    "Project Gutenberg-tm depends upon and cannot survive without wide",
-    "spread public support and donations to carry out its mission of",
-    "increasing the number of public domain and licensed works that can be",
-    "freely distributed in machine readable form accessible by the widest",
-    "array of equipment including outdated equipment.  Many small donations",
-    "($1 to $5,000) are particularly important to maintaining tax exempt",
-    "status with the IRS.",
-    "The Foundation is committed to complying with the laws regulating",
-    "charities and charitable donations in all 50 states of the United",
-    "States.  Compliance requirements are not uniform and it takes a",
-    "considerable effort, much paperwork and many fees to meet and keep up",
-    "with these requirements.  We do not solicit donations in locations",
-    "where we have not received written confirmation of compliance.  To",
-    "SEND DONATIONS or determine the status of compliance for any",
-    "particular state visit http://pglaf.org",
-    "While we cannot and do not solicit contributions from states where we",
-    "have not met the solicitation requirements, we know of no prohibition",
-    "against accepting unsolicited donations from donors in such states who",
-    "approach us with offers to donate.",
-    "International donations are gratefully accepted, but we cannot make",
-    "any statements concerning tax treatment of donations received from",
-    "outside the United States.  U.S. laws alone swamp our small staff.",
-    "Please check the Project Gutenberg Web pages for current donation",
-    "methods and addresses.  Donations are accepted in a number of other",
-    "ways including checks, online payments and credit card donations.",
-    "To donate, please visit: http://pglaf.org/donate",
-    "Section 5.  General Information About Project Gutenberg-tm electronic",
-    "works.",
-    "Professor Michael S. Hart is the originator of the Project Gutenberg-tm",
-    "concept of a library of electronic works that could be freely shared",
-    "with anyone.  For thirty years, he produced and distributed Project",
-    "Gutenberg-tm eBooks with only a loose network of volunteer support.",
-    "Project Gutenberg-tm eBooks are often created from several printed",
-    "editions, all of which are confirmed as Public Domain in the U.S.",
-    "unless a copyright notice is included.  Thus, we do not necessarily",
-    "keep eBooks in compliance with any particular paper edition.",
-    "Most people start at our Web site which has the main PG search facility:",
-    "     http://www.gutenberg.org",
-    "This Web site includes information about Project Gutenberg-tm,",
-    "including how to make donations to the Project Gutenberg Literary",
-    "Archive Foundation, how to help produce our new eBooks, and how to",
-    "subscribe to our email newsletter to hear about new eBooks.",
-    ""
-};

obs-studio-21.1.2.tar.xz/deps/libcaption/src/avc.c Deleted

@@ -1,595 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-
-#include "avc.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-////////////////////////////////////////////////////////////////////////////////
-// AVC RBSP Methods
-//  TODO move the to a avcutils file
-static size_t _find_emulation_prevention_byte (const uint8_t* data, size_t size)
-{
-    size_t offset = 2;
-
-    while (offset < size) {
-        if (0 == data[offset]) {
-            // 0 0 X 3 //; we know X is zero
-            offset += 1;
-        } else if (3 != data[offset]) {
-            // 0 0 X 0 0 3; we know X is not 0 and not 3
-            offset += 3;
-        } else if (0 != data[offset-1]) {
-            // 0 X 0 0 3
-            offset += 2;
-        } else if (0 != data[offset-2]) {
-            // X 0 0 3
-            offset += 1;
-        } else {
-            // 0 0 3
-            return offset;
-        }
-    }
-
-    return size;
-}
-
-static size_t _copy_to_rbsp (uint8_t* destData, size_t destSize, const uint8_t* sorcData, size_t sorcSize)
-{
-    size_t toCopy, totlSize = 0;
-
-    for (;;) {
-        if (destSize >= sorcSize) {
-            return 0;
-        }
-
-        // The following line IS correct! We want to look in sorcData up to destSize bytes
-        // We know destSize is smaller than sorcSize because of the previous line
-        toCopy = _find_emulation_prevention_byte (sorcData,destSize);
-        memcpy (destData, sorcData, toCopy);
-        totlSize += toCopy;
-        destData += toCopy;
-        destSize -= toCopy;
-
-        if (0 == destSize) {
-            return totlSize;
-        }
-
-        // skip the emulation prevention byte
-        totlSize += 1;
-        sorcData += toCopy + 1;
-        sorcSize -= toCopy + 1;
-    }
-
-    return 0;
-}
-////////////////////////////////////////////////////////////////////////////////
-static inline size_t _find_emulated (uint8_t* data, size_t size)
-{
-    size_t offset = 2;
-
-    while (offset < size) {
-        if (3 < data[offset]) {
-            // 0 0 X; we know X is not 0, 1, 2 or 3
-            offset += 3;
-        } else if (0 != data[offset-1]) {
-            // 0 X 0 0 1
-            offset += 2;
-        } else if (0 != data[offset-2]) {
-            // X 0 0 1
-            offset += 1;
-        } else {
-            // 0 0 0, 0 0 1
-            return offset;
-        }
-    }
-
-    return size;
-}
-
-size_t _copy_from_rbsp (uint8_t* data, uint8_t* payloadData, size_t payloadSize)
-{
-    size_t total = 0;
-
-    while (payloadSize) {
-        size_t bytes = _find_emulated (payloadData,payloadSize);
-
-        if (bytes > payloadSize) {
-            return 0;
-        }
-
-        memcpy (data, payloadData, bytes);
-
-        if (bytes == payloadSize) {
-            return total + bytes;
-        }
-
-        data[bytes] = 3; // insert emulation prevention byte
-        data += bytes + 1; total += bytes + 1;
-        payloadData += bytes; payloadSize -= bytes;
-    }
-
-    return total;
-}
-////////////////////////////////////////////////////////////////////////////////
-struct _sei_message_t {
-    size_t size;
-    sei_msgtype_t type;
-    struct _sei_message_t* next;
-};
-
-sei_message_t* sei_message_next (sei_message_t* msg) { return ( (struct _sei_message_t*) msg)->next; }
-sei_msgtype_t  sei_message_type (sei_message_t* msg) { return ( (struct _sei_message_t*) msg)->type; }
-size_t         sei_message_size (sei_message_t* msg) { return ( (struct _sei_message_t*) msg)->size; }
-uint8_t*       sei_message_data (sei_message_t* msg) { return ( (uint8_t*) msg) + sizeof (struct _sei_message_t); }
-void           sei_message_free (sei_message_t* msg) { if (msg) { free (msg); } }
-
-sei_message_t* sei_message_new (sei_msgtype_t type, uint8_t* data, size_t size)
-{
-    struct _sei_message_t* msg = (struct _sei_message_t*) malloc (sizeof (struct _sei_message_t) + size);
-    msg->next = 0; msg->type = type; msg->size = size;
-
-    if (data) {
-        memcpy (sei_message_data (msg), data, size);
-    } else {
-        memset (sei_message_data (msg), 0, size);
-    }
-
-    return (sei_message_t*) msg;
-}
-////////////////////////////////////////////////////////////////////////////////
-void sei_init (sei_t* sei)
-{
-    sei->dts = -1;
-    sei->cts = -1;
-    sei->head = 0;
-    sei->tail = 0;
-}
-
-void sei_message_append (sei_t* sei, sei_message_t* msg)
-{
-    if (0 == sei->head) {
-        sei->head = msg;
-        sei->tail = msg;
-    } else {
-        sei->tail->next = msg;
-        sei->tail = msg;
-    }
-}
-
-void sei_free (sei_t* sei)
-{
-    sei_message_t* tail;
-
-    while (sei->head) {
-        tail = sei->head->next;
-        free (sei->head);
-        sei->head = tail;
-    }
-
-    sei_init (sei);
-}
-
-void sei_dump (sei_t* sei)
-{
-    fprintf (stderr,"SEI %p\n", sei);
-    sei_dump_messages (sei->head);
-}
-
-void sei_dump_messages (sei_message_t* head)
-{
-    cea708_t cea708;
-    sei_message_t* msg;
-    cea708_init (&cea708);
-
-    for (msg = head ; msg ; msg = sei_message_next (msg)) {
-        uint8_t* data = sei_message_data (msg);
-        size_t size =  sei_message_size (msg);
-        fprintf (stderr,"-- Message %p\n-- Message Type: %d\n-- Message Size: %d\n", data, sei_message_type (msg), (int) size);
-
-        while (size) {
-            fprintf (stderr,"%02X ", *data);
-            ++data; --size;
-        }
-
-        fprintf (stderr,"\n");
-
-        if (sei_type_user_data_registered_itu_t_t35 == sei_message_type (msg)) {
-            cea708_parse (sei_message_data (msg), sei_message_size (msg), &cea708);
-            cea708_dump (&cea708);
-        }
-
-
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-size_t sei_render_size (sei_t* sei)
-{
-    size_t size = 2; // nalu_type + stop bit
-    sei_message_t* msg;
-
-    for (msg = sei_message_head (sei) ; msg ; msg = sei_message_next (msg)) {
-        size += 1 + (msg->type / 255);
-        size += 1 + (msg->size / 255);
-        size += 1 + (msg->size * 4/3);
-    }
-
-    return size;
-}
-
-// we can safely assume sei_render_size() bytes have been allocated for data
-size_t sei_render (sei_t* sei, uint8_t* data)
-{
-    size_t escaped_size, size = 2; // nalu_type + stop bit
-    sei_message_t* msg;
-    (*data) = 6; ++data;
-
-    for (msg = sei_message_head (sei) ; msg ; msg = sei_message_next (msg)) {
-        int payloadType      = sei_message_type (msg);
-        int payloadSize      = (int) sei_message_size (msg);
-        uint8_t* payloadData = sei_message_data (msg);
-
-        while (255 <= payloadType) {
-            (*data) = 255;
-            ++data; ++size;
-            payloadType -= 255;
-        }
-
-        (*data) = payloadType;
-        ++data; ++size;
-
-        while (255 <= payloadSize) {
-            (*data) = 255;
-            ++data; ++size;
-            payloadSize -= 255;
-        }
-
-        (*data) = payloadSize;
-        ++data; ++size;
-
-        if (0 >= (escaped_size = _copy_from_rbsp (data,payloadData,payloadSize))) {
-            return 0;
-        }
-
-        data += escaped_size;
-        size += escaped_size;
-    }
-
-    // write stop bit and return
-    (*data) = 0x80;
-    return size;
-}
-
-uint8_t* sei_render_alloc (sei_t* sei, size_t* size)
-{
-    size_t aloc = sei_render_size (sei);
-    uint8_t* data = malloc (aloc);
-    (*size) = sei_render (sei, data);
-    return data;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int sei_parse_nalu (sei_t* sei, const uint8_t* data, size_t size, double dts, double cts)
-{
-    assert (0<=cts); // cant present before decode
-    sei->dts = dts;
-    sei->cts = cts;
-    int ret = 0;
-
-    if (0 == data || 0 == size) {
-        return 0;
-    }
-
-    uint8_t nal_unit_type = (*data) & 0x1F;
-    ++data; --size;
-
-    if (6 != nal_unit_type) {
-        return 0;
-    }
-
-    // SEI may contain more than one payload
-    while (1<size) {
-        int payloadType = 0;
-        int payloadSize = 0;
-
-        while (0 < size && 255 == (*data)) {
-            payloadType += 255;
-            ++data; --size;
-        }
-
-        if (0 == size) {
-            goto error;
-        }
-
-        payloadType += (*data);
-        ++data; --size;
-
-        while (0 < size && 255 == (*data)) {
-            payloadSize += 255;
-            ++data; --size;
-        }
-
-        if (0 == size) {
-            goto error;
-        }
-
-        payloadSize += (*data);
-        ++data; --size;
-
-        if (payloadSize) {
-            sei_message_t* msg = sei_message_new ( (sei_msgtype_t) payloadType, 0, payloadSize);
-            uint8_t* payloadData = sei_message_data (msg);
-            size_t bytes = _copy_to_rbsp (payloadData, payloadSize, data, size);
-            sei_message_append (sei, msg);
-
-            if ( (int) bytes < payloadSize) {
-                goto error;
-            }
-
-            data += bytes; size -= bytes;
-            ++ret;
-        }
-    }
-
-    // There should be one trailing byte, 0x80. But really, we can just ignore that fact.
-    return ret;
-error:
-    sei_init (sei);
-    return 0;
-}
-////////////////////////////////////////////////////////////////////////////////
-libcaption_stauts_t sei_to_caption_frame (sei_t* sei, caption_frame_t* frame)
-{
-    cea708_t cea708;
-    sei_message_t* msg;
-    libcaption_stauts_t status = LIBCAPTION_OK;
-
-    cea708_init (&cea708);
-
-    for (msg = sei_message_head (sei) ; msg ; msg = sei_message_next (msg)) {
-        if (sei_type_user_data_registered_itu_t_t35 == sei_message_type (msg)) {
-            cea708_parse (sei_message_data (msg), sei_message_size (msg), &cea708);
-            status = libcaption_status_update (status, cea708_to_caption_frame (frame, &cea708, sei_pts (sei)));
-        }
-    }
-
-    if (LIBCAPTION_READY == status) {
-        frame->timestamp = sei->dts + sei->cts;
-        frame->duration = 0;
-    }
-
-    return status;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-#define DEFAULT_CHANNEL 0
-
-void sei_append_708 (sei_t* sei, cea708_t* cea708)
-{
-    sei_message_t* msg = sei_message_new (sei_type_user_data_registered_itu_t_t35, 0, CEA608_MAX_SIZE);
-    msg->size = cea708_render (cea708, sei_message_data (msg), sei_message_size (msg));
-    sei_message_append (sei,msg);
-    // cea708_dump (cea708);
-    cea708_init (cea708); // will confgure using HLS compatiable defaults
-}
-
-// This should be moved to 708.c
-// This works for popon, but bad for paint on and roll up
-// Please understand this function before you try to use it, setting null values have different effects than you may assume
-void sei_encode_eia608 (sei_t* sei, cea708_t* cea708, uint16_t cc_data)
-{
-    // This one is full, flush and init a new one
-    // shoudl this be 32? I cant remember
-    if (31 == cea708->user_data.cc_count) {
-        sei_append_708 (sei,cea708);
-    }
-
-    if (0 == cea708->user_data.cc_count) { // This is a new 708 header, but a continuation of a 608 stream
-        cea708_add_cc_data (cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command (eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
-    }
-
-    if (0 == cc_data) { // Finished
-        sei_encode_eia608 (sei,cea708,eia608_control_command (eia608_control_end_of_caption, DEFAULT_CHANNEL));
-        sei_append_708 (sei,cea708);
-        return;
-    }
-
-    cea708_add_cc_data (cea708, 1, cc_type_ntsc_cc_field_1, cc_data);
-}
-////////////////////////////////////////////////////////////////////////////////
-// TODO use alternate charcters instead of always using space before extended charcters
-// TODO rewrite this function with better logic
-int sei_from_caption_frame (sei_t* sei, caption_frame_t* frame)
-{
-    int r,c;
-    cea708_t cea708;
-    const char* data;
-    uint16_t prev_cc_data;
-
-    cea708_init (&cea708); // set up a new popon frame
-    cea708_add_cc_data (&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command (eia608_control_erase_non_displayed_memory, DEFAULT_CHANNEL));
-    cea708_add_cc_data (&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command (eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
-
-    for (r=0; r<SCREEN_ROWS; ++r) {
-        // Calculate preamble
-        for (c=0; c<SCREEN_COLS && 0 == *caption_frame_read_char (frame,r,c,0,0) ; ++c) {}
-
-        // This row is blank
-        if (SCREEN_COLS == c) {
-            continue;
-        }
-
-        // Write preamble
-        sei_encode_eia608 (sei, &cea708, eia608_row_column_pramble (r,c,DEFAULT_CHANNEL,0));
-        int tab = c % 4;
-
-        if (tab) {
-            sei_encode_eia608 (sei, &cea708, eia608_tab (tab,DEFAULT_CHANNEL));
-        }
-
-        // Write the row
-        for (prev_cc_data = 0, data = caption_frame_read_char (frame,r,c,0,0) ;
-                (*data) && c < SCREEN_COLS ; ++c, data = caption_frame_read_char (frame,r,c,0,0)) {
-            uint16_t cc_data = eia608_from_utf8_1 (data,DEFAULT_CHANNEL);
-
-            if (!cc_data) {
-                // We do't want to write bad data, so just ignore it.
-            } else if (eia608_is_basicna (prev_cc_data)) {
-                if (eia608_is_basicna (cc_data)) {
-                    // previous and current chars are both basicna, combine them into current
-                    sei_encode_eia608 (sei, &cea708, eia608_from_basicna (prev_cc_data,cc_data));
-                } else if (eia608_is_westeu (cc_data)) {
-                    // extended charcters overwrite the previous charcter, so insert a dummy char thren write the extended char
-                    sei_encode_eia608 (sei, &cea708, eia608_from_basicna (prev_cc_data,eia608_from_utf8_1 (EIA608_CHAR_SPACE,DEFAULT_CHANNEL)));
-                    sei_encode_eia608 (sei, &cea708, cc_data);
-                } else {
-                    // previous was basic na, but current isnt; write previous and current
-                    sei_encode_eia608 (sei, &cea708, prev_cc_data);
-                    sei_encode_eia608 (sei, &cea708, cc_data);
-                }
-
-                prev_cc_data = 0; // previous is handled, we can forget it now
-            } else if (eia608_is_westeu (cc_data)) {
-                // extended chars overwrite the previous chars, so insert a dummy char
-                sei_encode_eia608 (sei, &cea708, eia608_from_utf8_1 (EIA608_CHAR_SPACE,DEFAULT_CHANNEL));
-                sei_encode_eia608 (sei, &cea708, cc_data);
-            } else if (eia608_is_basicna (cc_data)) {
-                prev_cc_data = cc_data;
-            } else {
-                sei_encode_eia608 (sei, &cea708, cc_data);
-            }
-
-            if (eia608_is_specialna (cc_data)) {
-                // specialna are treated as controll charcters. Duplicated controll charcters are discarded
-                // So we for a resume after a specialna as a noop to break repetition detection
-                // TODO only do this if the same charcter is repeated
-                sei_encode_eia608 (sei, &cea708, eia608_control_command (eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
-            }
-        }
-
-        if (0 != prev_cc_data) {
-            sei_encode_eia608 (sei, &cea708, prev_cc_data);
-        }
-    }
-
-    sei_encode_eia608 (sei, &cea708, 0); // flush
-    sei->dts = frame->timestamp; // assumes in order frames
-    // sei_dump (sei);
-    return 1;
-}
-////////////////////////////////////////////////////////////////////////////////
-static int avc_is_start_code (const uint8_t* data, int size, int* len)
-{
-    if (3 > size) {
-        return -1;
-    }
-
-    if (1 < data[2]) {
-        return 3;
-    }
-
-    if (0 != data[1]) {
-        return 2;
-    }
-
-    if (0 == data[0]) {
-        if (1 == data[2]) {
-            *len = 3;
-            return 0;
-        }
-
-        if (4 <= size && 1 == data[3]) {
-            *len = 4;
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-
-static int avc_find_start_code (const uint8_t* data, int size, int* len)
-{
-    int pos = 0;
-
-    for (;;) {
-        // is pos pointing to a start code?
-        int isc = avc_is_start_code (data + pos, size - pos, len);
-
-        if (0 < isc) {
-            pos += isc;
-        } else if (0 > isc) {
-            // No start code found
-            return isc;
-        } else {
-            // Start code found at pos
-            return pos;
-        }
-    }
-}
-
-
-static int avc_find_start_code_increnental (const uint8_t* data, int size, int prev_size, int* len)
-{
-    int offset = (3 <= prev_size) ? (prev_size - 3) : 0;
-    int pos = avc_find_start_code (data + offset, size - offset, len);
-
-    if (0 <= pos) {
-        return pos + offset;
-    }
-
-    return pos;
-}
-
-void avcnalu_init (avcnalu_t* nalu)
-{
-    memset (nalu,0,sizeof (avcnalu_t));
-}
-
-int avcnalu_parse_annexb (avcnalu_t* nalu, const uint8_t** data, size_t* size)
-{
-    int scpos, sclen;
-    int new_size = (int) (nalu->size + (*size));
-
-    if (new_size > MAX_NALU_SIZE) {
-        (*size) = nalu->size = 0;
-        return LIBCAPTION_ERROR;
-    }
-
-    memcpy (&nalu->data[nalu->size], (*data), (*size));
-    scpos = avc_find_start_code_increnental (&nalu->data[0], new_size, (int) nalu->size, &sclen);
-
-    if (0<=scpos) {
-        (*data) += (scpos - nalu->size) + sclen;
-        (*size) -= (scpos - nalu->size) + sclen;
-        nalu->size = scpos;
-        return 0 < nalu->size ? LIBCAPTION_READY : LIBCAPTION_OK;
-    } else {
-        (*size) = 0;
-        nalu->size = new_size;
-        return LIBCAPTION_OK;
-    }
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/src/eia608.c.re2c Deleted

@@ -1,421 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-#include "eia608.h"
-#include <string.h>
-#include <stdio.h>
-
-////////////////////////////////////////////////////////////////////////////////
-int eia608_row_map[] = {10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6, 7, 8, 9};
-int eia608_reverse_row_map[] = {2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 0, 6, 7, 8, 9, 1};
-
-const char* eia608_mode_map[] = {
-    "clear",
-    "loading",
-    "popOn",
-    "paintOn",
-    "rollUp",
-};
-
-const char* eia608_style_map[] = {
-    "white",
-    "green",
-    "blue",
-    "cyan",
-    "red",
-    "yellow",
-    "magenta",
-    "italics",
-};
-
-static inline uint16_t eia608_row_pramble (int row, int chan, int x, int underline)
-{
-    row = eia608_reverse_row_map[row&0x0F];
-    return eia608_parity (0x1040 | (chan?0x0800:0x0000) | ( (row<<7) &0x0700) | ( (row<<5) &0x0020)) | ( (x<<1) &0x001E) | (underline?0x0001:0x0000);
-}
-
-uint16_t eia608_row_column_pramble (int row, int col, int chan, int underline) { return eia608_row_pramble (row,chan,0x10| (col/4),underline); }
-uint16_t eia608_row_style_pramble (int row, eia608_style_t style, int chan, int underline) { return eia608_row_pramble (row,chan,style,underline); }
-
-int eia608_parse_preamble (uint16_t cc_data, int* row, int* col, eia608_style_t* style, int* chan, int* underline)
-{
-    (*row) = eia608_row_map[ ( (0x0700 & cc_data) >> 7) | ( (0x0020 & cc_data) >> 5)];
-    (*chan) = !! (0x0800 & cc_data);
-    (*underline) = 0x0001 & cc_data;
-
-    if (0x0010 & cc_data) {
-        (*style) = eia608_style_white;
-        (*col) = 4* ( (0x000E & cc_data) >> 1);
-    } else {
-        (*style) = (0x000E & cc_data) >> 1;
-        (*col) = 0;
-    }
-
-    return 1;
-}
-
-int eia608_parse_midrowchange (uint16_t cc_data, int* chan, eia608_style_t* style, int* underline)
-{
-    (*chan) = !! (0x0800 & cc_data);
-
-    if (0x1120 == (0x7770 & cc_data)) {
-        (*style) = (0x000E & cc_data) >> 1;
-        (*underline) = 0x0001 & cc_data;
-    }
-
-    return 1;
-}
-////////////////////////////////////////////////////////////////////////////////
-// control command
-eia608_control_t eia608_parse_control (uint16_t cc_data, int* cc)
-{
-    if (0x0200&cc_data) {
-        (*cc) = (cc_data&0x0800?0x01:0x00);
-        return (eia608_control_t) (0x177F & cc_data);
-    } else {
-        (*cc) = (cc_data&0x0800?0x01:0x00) | (cc_data&0x0100?0x02:0x00);
-        return (eia608_control_t) (0x167F & cc_data);
-    }
-}
-
-uint16_t eia608_control_command (eia608_control_t cmd, int cc)
-{
-    uint16_t c = (cc&0x01) ?0x0800:0x0000;
-    uint16_t f = (cc&0x02) ?0x0100:0x0000;
-
-    if (eia608_tab_offset_0 == (eia608_control_t) (cmd&0xFFC0)) {
-        return (eia608_control_t) eia608_parity (cmd|c);
-    } else {
-        return (eia608_control_t) eia608_parity (cmd|c|f);
-    }
-}
-////////////////////////////////////////////////////////////////////////////////
-// text
-static const char* utf8_from_index (int idx) { return (0<=idx && EIA608_CHAR_COUNT>idx) ? eia608_char_map[idx] : ""; }
-static int eia608_to_index (uint16_t cc_data, int* chan, int* c1, int* c2)
-{
-    (*c1) = (*c2) = -1; (*chan) = 0;
-    cc_data &= 0x7F7F; // strip off parity bits
-
-    // Handle Basic NA BEFORE we strip the channel bit
-    if (eia608_is_basicna (cc_data)) {
-        // we got first char, yes. But what about second char?
-        (*c1) = (cc_data>>8) - 0x20;
-        cc_data &= 0x00FF;
-
-        if (0x0020<=cc_data && 0x0080>cc_data) {
-            (*c2) = cc_data - 0x20;
-            return 2;
-        }
-
-        return 1;
-    }
-
-    // Check then strip second channel toggle
-    (*chan) = cc_data & 0x0800;
-    cc_data = cc_data & 0xF7FF;
-
-    if (eia608_is_specialna (cc_data)) {
-        // Special North American character
-        (*c1) = cc_data - 0x1130 + 0x60;
-        return 1;
-    }
-
-    if (0x1220<=cc_data && 0x1240>cc_data) {
-        // Extended Western European character set, Spanish/Miscellaneous/French
-        (*c1) = cc_data - 0x1220 + 0x70;
-        return 1;
-    }
-
-    if (0x1320<=cc_data && 0x1340>cc_data) {
-        // Extended Western European character set, Portuguese/German/Danish
-        (*c1) = cc_data - 0x1320 + 0x90;
-        return 1;
-    }
-
-    return 0;
-}
-
-
-int eia608_to_utf8 (uint16_t c, int* chan, char* str1,  char* str2)
-{
-    int c1, c2;
-    int size = (int) eia608_to_index (c,chan,&c1,&c2);
-    strncpy (str1, utf8_from_index (c1),5);
-    strncpy (str2, utf8_from_index (c2),5);
-    return size;
-}
-
-uint16_t eia608_from_basicna (uint16_t bna1, uint16_t bna2)
-{
-    if (! eia608_is_basicna (bna1) || ! eia608_is_basicna (bna2)) {
-        return 0;
-    }
-
-    return eia608_parity ( ( (0xFF00&bna1) >>0) | ( (0xFF00&bna2) >>8));
-}
-
-// prototype for re2c generated function
-uint16_t _eia608_from_utf8 (const utf8_char_t* s);
-uint16_t eia608_from_utf8_1 (const utf8_char_t* c, int chan)
-{
-    uint16_t cc_data = _eia608_from_utf8 (c);
-
-    if (0 == cc_data) {
-        return cc_data;
-    }
-
-    if (chan && ! eia608_is_basicna (cc_data)) {
-        cc_data |= 0x0800;
-    }
-
-    return eia608_parity (cc_data);
-}
-
-uint16_t eia608_from_utf8_2 (const utf8_char_t* c1, const utf8_char_t* c2)
-{
-    uint16_t cc1 = _eia608_from_utf8 (c1);
-    uint16_t cc2 = _eia608_from_utf8 (c2);
-    return eia608_from_basicna (cc1,cc2);
-}
-////////////////////////////////////////////////////////////////////////////////
-void eia608_dump (uint16_t cc_data)
-{
-    eia608_style_t style;
-    const char* text = 0;
-    char char1[5], char2[5];
-    char1[0] = char2[0] = 0;
-    int row, col, chan, underline;
-
-    if (!eia608_parity_varify (cc_data)) {
-        text = "parity failed";
-    } else if (0 == eia608_parity_strip (cc_data)) {
-        text = "pad";
-    } else if (eia608_is_basicna (cc_data)) {
-        text = "basicna";
-        eia608_to_utf8 (cc_data,&chan,&char1[0],&char2[0]);
-    } else if (eia608_is_specialna (cc_data)) {
-        text = "specialna";
-        eia608_to_utf8 (cc_data,&chan,&char1[0],&char2[0]);
-    } else if (eia608_is_westeu (cc_data)) {
-        text = "westeu";
-        eia608_to_utf8 (cc_data,&chan,&char1[0],&char2[0]);
-    } else if (eia608_is_xds (cc_data)) {
-        text = "xds";
-    } else if (eia608_is_midrowchange (cc_data)) {
-        text = "midrowchange";
-    } else if (eia608_is_norpak (cc_data)) {
-        text = "norpak";
-    } else if (eia608_is_preamble (cc_data)) {
-        text = "preamble";
-        eia608_parse_preamble (cc_data, &row, &col, &style, &chan, &underline);
-        fprintf (stderr,"preamble %d %d %d %d %d\n", row, col, style, chan, underline);
-
-    } else if (eia608_is_control (cc_data)) {
-        switch (eia608_parse_control (cc_data,&chan)) {
-
-        default: text = "unknown_control"; break;
-
-        case eia608_tab_offset_0: text = "eia608_tab_offset_0"; break;
-
-        case eia608_tab_offset_1: text = "eia608_tab_offset_1"; break;
-
-        case eia608_tab_offset_2:text = "eia608_tab_offset_2"; break;
-
-        case eia608_tab_offset_3: text = "eia608_tab_offset_3"; break;
-
-        case eia608_control_resume_caption_loading: text = "eia608_control_resume_caption_loading"; break;
-
-        case eia608_control_backspace: text = "eia608_control_backspace"; break;
-
-        case eia608_control_alarm_off: text = "eia608_control_alarm_off"; break;
-
-        case eia608_control_alarm_on: text = "eia608_control_alarm_on"; break;
-
-        case eia608_control_delete_to_end_of_row: text = "eia608_control_delete_to_end_of_row"; break;
-
-        case eia608_control_roll_up_2: text = "eia608_control_roll_up_2"; break;
-
-        case eia608_control_roll_up_3: text = "eia608_control_roll_up_3"; break;
-
-        case eia608_control_roll_up_4: text = "eia608_control_roll_up_4"; break;
-
-        case eia608_control_resume_direct_captioning: text = "eia608_control_resume_direct_captioning"; break;
-
-        case eia608_control_text_restart: text = "eia608_control_text_restart"; break;
-
-        case eia608_control_text_resume_text_display: text = "eia608_control_text_resume_text_display"; break;
-
-        case eia608_control_erase_display_memory: text = "eia608_control_erase_display_memory"; break;
-
-        case eia608_control_carriage_return: text = "eia608_control_carriage_return"; break;
-
-        case eia608_control_erase_non_displayed_memory:text = "eia608_control_erase_non_displayed_memory"; break;
-
-        case eia608_control_end_of_caption: text = "eia608_control_end_of_caption"; break;
-        }
-    } else {
-        text = "unhandled";
-    }
-
-    fprintf (stderr,"cc %04X (%04X) '%s' '%s' (%s)\n", cc_data, eia608_parity_strip (cc_data), char1, char2, text);
-}
-////////////////////////////////////////////////////////////////////////////////
-// below this line is re2c
-uint16_t _eia608_from_utf8 (const utf8_char_t* s)
-{
-    const unsigned char* YYMARKER; // needed by default rule
-    const unsigned char* YYCURSOR = (const unsigned char*) s;
-
-    if (0==s) { return 0x0000;}
-
-    /*!re2c
-    re2c:yyfill:enable = 0;
-    re2c:indent:string = "    ";
-    re2c:define:YYCTYPE = "unsigned char";
-
-    /*Ascii Exceptions*/
-    "\x00" { /*NULL*/ return 0x0000; }
-    "\x27" { /*APOSTROPHE -> RIGHT_SINGLE_QUOTATION_MARK*/ return 0x1229; }
-    "\x2A" { /*ASTERISK*/ return 0x1228; }
-    "\x5C" { /*REVERSE_SOLIDUS*/ return 0x132B; }
-    "\x5E" { /*CIRCUMFLEX_ACCENT*/ return 0x132C; }
-    "\x5F" { /*LOW_LINE*/ return 0x132D; }
-    /*Lets Map this to a LEFT_SINGLE_QUOTATION_MARK, just so we have a cc_data for every printable ASCII value*/
-    "\x60" { /*GRAVE_ACCENT, No equivalent return 0x0000; return 1;*/ /*LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
-    "\x7B" { /*LEFT_CURLY_BRACKET*/ return 0x1329; }
-    "\x7C" { /*VERTICAL_LINE*/ return 0x132E; }
-    "\x7D" { /*RIGHT_CURLY_BRACKET*/ return 0x132A; }
-    "\x7E" { /*TILDE*/ return 0x132F; }
-    /*There is a controll equivilant. Havnt decided if we want to habcle that here, or not*/
-    "\x7F" { /*DEL/BACKSPACE. Need to set bits 9 and 12! return 0x1421;*/ return 0x0000; }
-
-    /* Rules are processed top to bottom. So All single byte chars MUST be above this line!*/
-    [\x20-\x7F] { /*ASCII range*/ return (s[0]<<8) &0xFF00; } /* Should we use yych instead of s[0]?*/
-
-    /*This is the second half of the ascii exceptions*/
-    "\xC3\xA1" { /*LATIN_SMALL_LETTER_A_WITH_ACUTE*/ return 0x2A00; }
-    "\xC3\xA9" { /*LATIN_SMALL_LETTER_E_WITH_ACUTE*/ return 0x5C00; }
-    "\xC3\xAD" { /*LATIN_SMALL_LETTER_I_WITH_ACUTE*/ return 0x5E00; }
-    "\xC3\xB3" { /*LATIN_SMALL_LETTER_O_WITH_ACUTE*/ return 0x5F00; }
-    "\xC3\xBA" { /*LATIN_SMALL_LETTER_U_WITH_ACUTE*/ return 0x6000; }
-    "\xC3\xA7" { /*LATIN_SMALL_LETTER_C_WITH_CEDILLA*/ return 0x7B00; }
-    "\xC3\xB7" { /*DIVISION_SIGN*/ return 0x7C00; }
-    "\xC3\x91" { /*LATIN_CAPITAL_LETTER_N_WITH_TILDE*/ return 0x7D00; }
-    "\xC3\xB1" { /*LATIN_SMALL_LETTER_N_WITH_TILDE*/ return 0x7E00; }
-    "\xE2\x96\x88" { /*FULL_BLOCK*/ return 0x7F00; }
-
-    /*Special North American character set*/
-    "\xC2\xAE" { /*REGISTERED_SIGN*/ return 0x1130; }
-    "\xC2\xB0" { /*DEGREE_SIGN*/ return 0x1131; }
-    "\xC2\xBD" { /*VULGAR_FRACTION_ONE_HALF*/ return 0x1132; }
-    "\xC2\xBF" { /*INVERTED_QUESTION_MARK*/ return 0x1133; }
-    "\xE2\x84\xA2" { /*TRADE_MARK_SIGN*/ return 0x1134; }
-    "\xC2\xA2" { /*CENT_SIGN*/ return 0x1135; }
-    "\xC2\xA3" { /*POUND_SIGN*/ return 0x1136; }
-    "\xE2\x99\xAA" { /*EIGHTH_NOTE*/ return 0x1137; }
-    "\xC3\xA0" { /*LATIN_SMALL_LETTER_A_WITH_GRAVE*/ return 0x1138; }
-    "\xC2\xA0" { /*NO_BREAK_SPACE*/ return 0x1139; }
-    "\xC3\xA8" { /*LATIN_SMALL_LETTER_E_WITH_GRAVE*/ return 0x113A; }
-    "\xC3\xA2" { /*LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x113B; }
-    "\xC3\xAA" { /*LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x113C; }
-    "\xC3\xAE" { /*LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x113D; }
-    "\xC3\xB4" { /*LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x113E; }
-    "\xC3\xBB" { /*LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x113F; }
-
-    /*Extended Spanish/Miscellaneous*/
-    "\xC3\x81" { /*LATIN_CAPITAL_LETTER_A_WITH_ACUTE*/ return 0x1220; }
-    "\xC3\x89" { /*LATIN_CAPITAL_LETTER_E_WITH_ACUTE*/ return 0x1221; }
-    "\xC3\x93" { /*LATIN_CAPITAL_LETTER_O_WITH_ACUTE*/ return 0x1222; }
-    "\xC3\x9A" { /*LATIN_CAPITAL_LETTER_U_WITH_ACUTE*/ return 0x1223; }
-    "\xC3\x9C" { /*LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS*/ return 0x1224; }
-    "\xC3\xBC" { /*LATIN_SMALL_LETTER_U_WITH_DIAERESIS*/ return 0x1225; }
-    "\xE2\x80\x98" { /*LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
-    "\xC2\xA1" { /*INVERTED_EXCLAMATION_MARK*/ return 0x1227; }
-    /*ASTERISK handled in ASCII mapping*/
-    "\xE2\x80\x99" { /*RIGHT_SINGLE_QUOTATION_MARK -> APOSTROPHE*/ return 0x2700; }
-    "\xE2\x80\x94" { /*EM_DASH*/ return 0x122A; }
-    "\xC2\xA9" { /*COPYRIGHT_SIGN*/ return 0x122B; }
-    "\xE2\x84\xA0" { /*SERVICE_MARK*/ return 0x122C; }
-    "\xE2\x80\xA2" { /*BULLET*/ return 0x122D; }
-    "\xE2\x80\x9C" { /*LEFT_DOUBLE_QUOTATION_MARK*/ return 0x122E; }
-    "\xE2\x80\x9D" { /*RIGHT_DOUBLE_QUOTATION_MARK*/ return 0x122F; }
-
-    /*Extended French*/
-    "\xC3\x80" { /*LATIN_CAPITAL_LETTER_A_WITH_GRAVE*/ return 0x1230; }
-    "\xC3\x82" { /*LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x1231; }
-    "\xC3\x87" { /*LATIN_CAPITAL_LETTER_C_WITH_CEDILLA*/ return 0x1232; }
-    "\xC3\x88" { /*LATIN_CAPITAL_LETTER_E_WITH_GRAVE*/ return 0x1233; }
-    "\xC3\x8A" { /*LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x1234; }
-    "\xC3\x8B" { /*LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS*/ return 0x1235; }
-    "\xC3\xAB" { /*LATIN_SMALL_LETTER_E_WITH_DIAERESIS*/ return 0x1236; }
-    "\xC3\x8E" { /*LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x1237; }
-    "\xC3\x8F" { /*LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS*/ return 0x1238; }
-    "\xC3\xAF" { /*LATIN_SMALL_LETTER_I_WITH_DIAERESIS*/ return 0x1239; }
-    "\xC3\x94" { /*LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x123A; }
-    "\xC3\x99" { /*LATIN_CAPITAL_LETTER_U_WITH_GRAVE*/ return 0x123B; }
-    "\xC3\xB9" { /*LATIN_SMALL_LETTER_U_WITH_GRAVE*/ return 0x123C; }
-    "\xC3\x9B" { /*LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x123D; }
-    "\xC2\xAB" { /*LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123E; }
-    "\xC2\xBB" { /*RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123F; }
-
-    /*Portuguese*/
-    "\xC3\x83" { /*LATIN_CAPITAL_LETTER_A_WITH_TILDE*/ return 0x1320; }
-    "\xC3\xA3" { /*LATIN_SMALL_LETTER_A_WITH_TILDE*/ return 0x1321; }
-    "\xC3\x8D" { /*LATIN_CAPITAL_LETTER_I_WITH_ACUTE*/ return 0x1322; }
-    "\xC3\x8C" { /*LATIN_CAPITAL_LETTER_I_WITH_GRAVE*/ return 0x1323; }
-    "\xC3\xAC" { /*LATIN_SMALL_LETTER_I_WITH_GRAVE*/ return 0x1324; }
-    "\xC3\x92" { /*LATIN_CAPITAL_LETTER_O_WITH_GRAVE*/ return 0x1325; }
-    "\xC3\xB2" { /*LATIN_SMALL_LETTER_O_WITH_GRAVE*/ return 0x1326; }
-    "\xC3\x95" { /*LATIN_CAPITAL_LETTER_O_WITH_TILDE*/ return 0x1327; }
-    "\xC3\xB5" { /*LATIN_SMALL_LETTER_O_WITH_TILDE*/ return 0x1328; }
-    /*LEFT_CURLY_BRACKET handled in ASCII mapping*/
-    /*RIGHT_CURLY_BRACKET handled in ASCII mapping*/
-    /*REVERSE_SOLIDUS handled in ASCII mapping*/
-    /*CIRCUMFLEX_ACCENT handled in ASCII mapping*/
-    /*LOW_LINE handled in ASCII mapping*/
-    /*VERTICAL_LINE handled in ASCII mapping*/
-    /*TILDE handled in ASCII mapping*/
-
-    /*German/Danish*/
-    "\xC3\x84" { /*LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS*/ return 0x1330; }
-    "\xC3\xA4" { /*LATIN_SMALL_LETTER_A_WITH_DIAERESIS*/ return 0x1331; }
-    "\xC3\x96" { /*LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS*/ return 0x1332; }
-    "\xC3\xB6" { /*LATIN_SMALL_LETTER_O_WITH_DIAERESIS*/ return 0x1333; }
-    "\xC3\x9F" { /*LATIN_SMALL_LETTER_SHARP_S*/ return 0x1334; }
-    "\xC2\xA5" { /*YEN_SIGN*/ return 0x1335; }
-    "\xC2\xA4" { /*CURRENCY_SIGN*/ return 0x1336; }
-    "\xC2\xA6" { /*BROKEN_BAR*/ return 0x1337; }
-    "\xC3\x85" { /*LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE*/ return 0x1338; }
-    "\xC3\xA5" { /*LATIN_SMALL_LETTER_A_WITH_RING_ABOVE*/ return 0x1339; }
-    "\xC3\x98" { /*LATIN_CAPITAL_LETTER_O_WITH_STROKE*/ return 0x133A; }
-    "\xC3\xB8" { /*LATIN_SMALL_LETTER_O_WITH_STROKE*/ return 0x133B; }
-    "\xE2\x94\x8C" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT*/ return 0x133C; }
-    "\xE2\x94\x90" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT*/ return 0x133D; }
-    "\xE2\x94\x94" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT*/ return 0x133E; }
-    "\xE2\x94\x98" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT*/ return 0x133F; }
-
-    /*Default rule*/
-    [^] { /*DEFAULT_RULE*/ return 0x0000; }
-    */
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/unit_tests Deleted

obs-studio-21.1.2.tar.xz/deps/libcaption/unit_tests/eia608_test.c Deleted

@@ -1,280 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-
-#include "eia608.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-// all possible utf8 valies, including invalid ones
-void encode_utf8ish (int32_t in, char out[7])
-{
-    if (0 > in) {
-        out[0] = 0;
-        return;
-    }
-
-    // 0xxxxxxx, 7 bits
-    if (0x80 > in) {
-        out[0] = in;
-        out[1] = 0;
-        return;
-    }
-
-    // 110xxxxx   10xxxxxx, 11 bits
-    if (0x800 > in) {
-        out[0] = 0xC0 | ( (in >> (6*1)) & 0x1F);
-        out[1] = 0x80 | ( (in >> (6*0)) & 0x3F);
-        out[2] = 0;
-        return;
-    }
-
-    // 1110xxxx   10xxxxxx    10xxxxxx, 16 bits
-    if (0x10000 > in) {
-        out[0] = 0xE0 | ( (in >> (6*2)) & 0x0F);
-        out[1] = 0x80 | ( (in >> (6*1)) & 0x3F);
-        out[2] = 0x80 | ( (in >> (6*0)) & 0x3F);
-        out[3] = 0;
-        return;
-    }
-
-    // 11110xxx   10xxxxxx    10xxxxxx    10xxxxxx, 21 bits
-    if (0x200000 > in) {
-        out[0] = 0xF0 | ( (in >> (6*3)) & 0x07);
-        out[1] = 0x80 | ( (in >> (6*2)) & 0x3F);
-        out[2] = 0x80 | ( (in >> (6*1)) & 0x3F);
-        out[3] = 0x80 | ( (in >> (6*0)) & 0x3F);
-        out[4] = 0;
-        return;
-    }
-
-    // 111110xx   10xxxxxx    10xxxxxx    10xxxxxx    10xxxxxx, 26 bits
-    if (0x4000000 > in) {
-        out[0] = 0xF8 | ( (in >> (6*4)) & 0x03);
-        out[1] = 0x80 | ( (in >> (6*3)) & 0x3F);
-        out[2] = 0x80 | ( (in >> (6*2)) & 0x3F);
-        out[3] = 0x80 | ( (in >> (6*1)) & 0x3F);
-        out[4] = 0x80 | ( (in >> (6*0)) & 0x3F);
-        out[5] = 0;
-        return;
-    }
-
-    // 1111110x   10xxxxxx    10xxxxxx    10xxxxxx    10xxxxxx    10xxxxxx, 31 bits
-    if (0x80000000 > in) {
-        out[0] = 0xFC | ( (in >> (6*5)) & 0x01);
-        out[1] = 0x80 | ( (in >> (6*4)) & 0x3F);
-        out[2] = 0x80 | ( (in >> (6*3)) & 0x3F);
-        out[3] = 0x80 | ( (in >> (6*2)) & 0x3F);
-        out[4] = 0x80 | ( (in >> (6*1)) & 0x3F);
-        out[5] = 0x80 | ( (in >> (6*0)) & 0x3F);
-        out[6] = 0;
-        return;
-    }
-}
-
-void test_all_utf8()
-{
-    char s[7]; size_t size, count = 0; uint16_t code1, code2;
-
-    for (int i = 0 ; i < 0x80000000 ; ++i) {
-        encode_utf8ish (i, &s[0]);
-        code1 = eia608_from_utf8 ( (const char*) &s[0], 0, &size);
-
-        // code2 = eia608_from_utf8 ( (const char*) &s[0], 1, &size);
-        if (code1) {
-            ++count;
-            printf ("%d: string: '%s' code: %04X\n",count, &s[0],code1);
-        }
-    }
-
-    // Count must be 177
-    // 176 charcters, pile we have two mapping for left quote mark
-}
-
-#define BIN "%d%d%d%d%d%d%d%d %d%d%d%d%d%d%d%d"
-#define BIND(D) ((D)>>15)&0x01, ((D)>>14)&0x01,((D)>>13)&0x01,((D)>>12)&0x01,((D)>>11)&0x01,((D)>>10)&0x01,((D)>>9)&0x01,((D)>>8)&0x01,((D)>>7)&0x01,((D)>>6)&0x01,((D)>>5)&0x01,((D)>>4)&0x01,((D)>>3)&0x01,((D)>>2)&0x01,((D)>>1)&0x01,((D)>>0)&0x01
-
-
-void print_bin (int n)
-{
-    int mask = 0x80;
-
-    for (int mask = 0x80 ; mask ; mask >>= 1) {
-        printf ("%s", n & mask ? "1" : "0");
-    }
-
-    printf ("\n");
-}
-
-void void_test_all_possible_code_words()
-{
-    for (int i = 0 ; i <= 0x3FFF ; ++i) {
-        int16_t code = eia608_parity ( ( (i<<1) &0x7F00) | (i&0x7F));
-
-        int count =eia608_cc_data_is_extended_data_service (code)+
-                   eia608_cc_data_is_basic_north_american_character (code) +
-                   eia608_cc_data_is_special_north_american_character (code) +
-                   eia608_cc_data_is_extended_western_european_character (code) +
-                   eia608_cc_data_is_nonwestern_norpak_character (code) +
-                   eia608_cc_data_is_row_preamble (code) +
-                   eia608_cc_data_is_control_command (code);
-
-        if (1 < count) {
-            printf ("code 0x%04X matched >1\n",code&0x7F7F);
-        }
-
-        // if (0 == count) {
-        //     printf ("code 0x%04X not matched %d\n",eia608_strip_parity_bits (code), i);
-        // }
-    }
-}
-
-void print_charmap()
-{
-    for (int i = 0 ; i < EIA608_CHAR_COUNT ; ++i) {
-        printf ("%s", eia608_char_map[i]);
-    }
-
-    printf ("\n");
-}
-
-void dance()
-{
-    for (int i = 0 ; i < 100 ; ++i) {
-        const char* l = 0 == rand() % 2 ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT;
-        const char* r = 0 == rand() % 2 ? EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT : EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT;
-        printf ("%s %s%s%s%s%s%s%s %s ", EIA608_CHAR_EIGHTH_NOTE, l, EIA608_CHAR_LEFT_PARENTHESIS, EIA608_CHAR_EM_DASH, EIA608_CHAR_LOW_LINE, EIA608_CHAR_EM_DASH,
-                EIA608_CHAR_RIGHT_PARENTHESIS, r, EIA608_CHAR_EIGHTH_NOTE);
-    }
-
-}
-
-
-int main (int argc, const char** arg)
-{
-    // print_charmap();
-    // // return 0;
-    // srand (time (0));
-    // // test_all_utf8();
-    // // void_test_all_possible_code_words();
-    // // return 0;
-    // // print_charmap();
-    // dance();
-    // return 0;
-    for (int i = 0 ; i <= 0x3FFF ; ++i) {
-        uint16_t code1 = eia608_parity ( ( (i<<1) &0x7F00) | (i&0x7F));
-
-        switch (eia608_cc_data_type (code1)) {
-        default:
-        case EIA608_CC_DATA_UNKNOWN:
-            // printf ("Unknown code %04X\n",code);
-            break;
-
-        case EIA608_CC_DATA_CONTROL_COMMAND: {
-            int cc;
-            eia608_control_t cmd = eia608_parse_control (code1, &cc);
-            uint16_t code2 = eia608_control_command (cmd,cc);
-
-            if (code1 != code2) {
-                printf (BIN " != " BIN " (0x%04x != 0x%04x) cc: %d\n", BIND (code1), BIND (code2),code1,code2,cc);
-            }
-        } break;
-
-
-        case EIA608_CC_DATA_BASIC_NORTH_AMERICAN_CHARACTER: {
-            char char1[5], char2[5]; int chan; size_t size;
-
-            if (eia608_to_utf8 (code1, &chan, &char1[0], &char2[0])) {
-                uint16_t code2 = eia608_from_utf8_2 (&char1[0], &char2[0]);
-
-                // if the second char is invalid, mask it off, we will accept the first
-                if (0x80 < (code1 &0x007F) || 0x20 > (code1 &0x007F)) {
-                    code1 = (code1&0xFF00) |0x0080;
-                }
-
-                if (code1 == code2) {
-                    // printf ("%s " BIN " == " BIN " (0x%04x == 0x%04x)\n", &char1[0], BIND (code1), BIND (code2),code1,code2);
-                } else {
-                    printf ("%s %s " BIN " != " BIN " (0x%04x != 0x%04x)\n", &char1[0], &char2[0], BIND (code1), BIND (code2),code1,code2);
-                }
-            }
-
-        } break;
-
-        case EIA608_CC_DATA_SPECIAL_NORTH_AMERICAN_CHARACTER:
-        case EIA608_CC_DATA_EXTENDED_WESTERN_EUROPEAN_CHARACTER: {
-            char char1[5], char2[5]; int chan; size_t size;
-
-            if (eia608_to_utf8 (code1, &chan, &char1[0], &char2[0])) {
-                uint16_t code2 = eia608_from_utf8 (&char1[0], chan, &size);
-
-                if (code1 == code2) {
-                    // printf ("%s " BIN " == " BIN " (0x%04x == 0x%04x)\n", &char1[0], BIND (code1), BIND (code2),code1,code2);
-                } else {
-                    printf ("%s " BIN " != " BIN " (0x%04x != 0x%04x)\n", &char1[0], BIND (code1), BIND (code2),code1,code2);
-                }
-            }
-        } break;
-
-            // #define EIA608_CODE_ROW_PREAMBLE                        4
-            // #define EIA608_CODE_EXTENDED_DATA_SERVICE               5
-            // #define EIA608_CODE_CONTROL_COMMAND                     6
-        }
-    }
-
-    return 0;
-}
-
-
-
-
-//     for (uint16_t i  = 0 ; i < 0x4000; ++i) {
-//         int chan;
-//         char str[7];
-//         uint16_t code = ( (i<<1) &0x7F00) | (i & 0x007F);
-//
-//         if (eia608_to_utf8 (code,&chan,str)) {
-//             printf ("code: 0x%04X  str: '%s'\n", code,str);
-//         }
-//     }
-//
-//     // for(int i = 0 ; i < cie608_char_count ; ++i)
-//     // {
-//     //     cie608_char_map[i]
-//     //
-//     // }
-//
-//
-//     for (int i = 0 ; i < 128 ; ++i) {
-//         // print_bin( B7( i ) );
-//         // print_bin( eia608_parity_table[i] );
-//         printf ("%d  %d %d\n", i, 0x7F & eia608_parity_table[i], eia608_parity_table[i]);
-//         // if ( i != eia608_parity_table[i] )
-//         // {
-//         //   printf( "ERROR\n" );
-//         //
-//         // }
-//     }
-//
-// }

obs-studio-21.1.2.tar.xz/deps/libcaption/unit_tests/test_sei.c Deleted

@@ -1,148 +0,0 @@
-/**********************************************************************************************/
-/* The MIT License                                                                            */
-/*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
-/*                                                                                            */
-/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
-/* of this software and associated documentation files (the "Software"), to deal              */
-/* in the Software without restriction, including without limitation the rights               */
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
-/* copies of the Software, and to permit persons to whom the Software is                      */
-/* furnished to do so, subject to the following conditions:                                   */
-/*                                                                                            */
-/* The above copyright notice and this permission notice shall be included in                 */
-/* all copies or substantial portions of the Software.                                        */
-/*                                                                                            */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
-/* THE SOFTWARE.                                                                              */
-/**********************************************************************************************/
-
-#include "avcsei.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-uint8_t sei1[] = { 0x06, 0x04, 0x68, 0xB5, 0x00, 0x31, 0x47, 0x41, 0x39, 0x34, 0x03, 0xDF, 0xFF, 0xFC, 0xEC, 0xE5,
-                   0xFC, 0xAE, 0x80, 0xFC, 0x94, 0x52, 0xFC, 0x97, 0xA1, 0xFC, 0x2A, 0x20, 0xFC, 0xDC, 0x20, 0xFC,
-                   0x5E, 0x20, 0xFC, 0xDF, 0x20, 0xFC, 0xE0, 0x20, 0xFC, 0x91, 0x38, 0xFC, 0x20, 0x80, 0xFC, 0x91,
-                   0xBA, 0xFC, 0x20, 0xE9, 0xFC, 0x13, 0xA4, 0xFC, 0x20, 0xEF, 0xFC, 0x13, 0x26, 0xFC, 0x20, 0x75,
-                   0xFC, 0x92, 0xBC, 0xFC, 0x94, 0xF2, 0xFC, 0x97, 0xA1, 0xFC, 0x61, 0x80, 0xFC, 0x13, 0x31, 0xFC,
-                   0x20, 0xE5, 0xFC, 0x92, 0xB6, 0xFC, 0x20, 0xE9, 0xFC, 0x92, 0xB9, 0xFC, 0x20, 0xEF, 0xFC, 0x13,
-                   0xB3, 0xFC, 0x20, 0x75, 0xFC, 0x92, 0x25, 0xFC, 0x20, 0x80, 0xFF, 0x80,
-                 };
-
-uint8_t sei2[] = { 0x06, 0x04, 0x35, 0xB5, 0x00, 0x31, 0x47, 0x41, 0x39, 0x34, 0x03, 0xCE, 0xFF, 0xFC, 0x94, 0x26,
-                   0xFC, 0x94, 0xAD, 0xFC, 0x94, 0xF2, 0xFC, 0x43, 0xC1, 0xFC, 0xD0, 0x54, 0xFC, 0x49, 0x4F, 0xFC,
-                   0xCE, 0x20, 0xFC, 0x4C, 0x49, 0xFC, 0xCE, 0x45, 0xFC, 0xD3, 0x20, 0xFC, 0x52, 0x4F, 0xFC, 0x4C,
-                   0x4C, 0xFC, 0x20, 0xD5, 0xFC, 0xD0, 0x80, 0xFF, 0x80,
-                 };
-
-
-uint8_t sei3[] = { 0x06,
-                   0x04, 0x68, 0xB5, 0x00, 0x31, 0x47, 0x41, 0x39, 0x34, 0x03, 0xDF, 0xFF, 0xFC, 0xEC, 0xE5, 0xFC,
-                   0xAE, 0x80, 0xFC, 0x94, 0x52, 0xFC, 0x97, 0xA1, 0x00, 0x00, 0x03, 0x00, 0xFC, 0xDC, 0x20, 0xFC,
-                   0x5E, 0x20, 0xFC, 0xDF, 0x20, 0xFC, 0xE0, 0x20, 0xFC, 0x91, 0x38, 0xFC, 0x20, 0x80, 0xFC, 0x91,
-                   0xBA, 0xFC, 0x20, 0xE9, 0xFC, 0x13, 0xA4, 0xFC, 0x20, 0xEF, 0xFC, 0x13, 0x26, 0xFC, 0x20, 0x75,
-                   0xFC, 0x92, 0xBC, 0xFC, 0x94, 0xF2, 0xFC, 0x97, 0xA1, 0xFC, 0x61, 0x80, 0xFC, 0x13, 0x31, 0xFC,
-                   0x20, 0xE5, 0xFC, 0x92, 0xB6, 0xFC, 0x20, 0xE9, 0xFC, 0x92, 0xB9, 0xFC, 0x20, 0xEF, 0xFC, 0x13,
-                   0xB3, 0xFC, 0x20, 0x75, 0xFC, 0x92, 0x25, 0xFC, 0x20, 0x80, 0xFF,
-
-                   0x04, 0x68, 0xB5, 0x00, 0x31, 0x47, 0x41, 0x39, 0x34, 0x03, 0xDF, 0xFF, 0xFC, 0xEC, 0xE5,
-                   0xFC, 0xAE, 0x80, 0xFC, 0x94, 0x52, 0xFC, 0x97, 0xA1, 0x00, 0x00, 0x03, 0x00, 0xFC, 0xDC, 0x20,
-                   0xFC, 0x5E, 0x20, 0xFC, 0xDF, 0x20, 0xFC, 0xE0, 0x20, 0xFC, 0x91, 0x38, 0xFC, 0x20, 0x80, 0xFC,
-                   0x91, 0xBA, 0xFC, 0x20, 0xE9, 0xFC, 0x13, 0xA4, 0xFC, 0x20, 0xEF, 0xFC, 0x13, 0x26, 0xFC, 0x20,
-                   0x75, 0xFC, 0x92, 0xBC, 0xFC, 0x94, 0xF2, 0xFC, 0x97, 0xA1, 0xFC, 0x61, 0x80, 0xFC, 0x13, 0x31,
-                   0xFC, 0x20, 0xE5, 0xFC, 0x92, 0xB6, 0xFC, 0x20, 0xE9, 0xFC, 0x92, 0xB9, 0xFC, 0x20, 0xEF, 0xFC,
-                   0x13, 0xB3, 0xFC, 0x20, 0x75, 0xFC, 0x92, 0x25, 0xFC, 0x20, 0x80, 0xFF,
-                   0x80,
-                 };
-
-
-// TODO make SEI with multiple messages
-// TODO make SEI with emupation prevention
-
-
-uint8_t* read_file (const char* file, size_t* size)
-{
-    FILE* f = fopen (file, "rb");
-
-    if (! f) {
-        return 0;
-    }
-
-    fseek (f,0,SEEK_END);
-    (*size) = ftell (f);
-    fseek (f,0,SEEK_SET);
-    uint8_t* data = (uint8_t*) malloc (*size);
-
-    for (int i = 0 ; i < (*size) ;) {
-        i += fread (&data[i], 1, *size, f);
-    }
-
-    fclose (f);
-    return data;
-}
-
-int test_emulation_byte()
-{
-    avcsei_t sei;
-    avcsei_init (&sei);
-    avcsei_parse (&sei,sei3,sizeof (sei3));
-    avcsei_dump (&sei);
-    avcsei_free (&sei);
-}
-
-
-int main (int argc, const char** argv)
-{
-    // test_emulation_byte();
-    // return 0;
-
-    size_t size;
-    avcsei_t sei;
-    cea708_t cea708;
-    eia608_screen_t screen;
-    char screen_buf[EIA608_SCREEN_DUMP_BUF_SIZE];
-    char json_buf[EIA608_SCREEN_JSON_BUF_SIZE];
-
-    // uint8_t* data =
-    for (int i = 1 ; i < argc ; ++i) {
-        avcsei_init (&sei);
-        eia608_screen_init (&screen);
-        uint8_t* data = read_file (argv[i],&size);
-        avcsei_parse (&sei,data,size);
-        free (data);
-
-        // avcsei_parse (&sei,sei1,sizeof (sei1));
-
-        for (avcsei_message_t* msg = avcsei_message_head (&sei) ; msg ; msg = avcsei_message_next (msg)) {
-            if (sei_type_user_data_registered_itu_t_t35 == avcsei_message_type (msg)) {
-                // avcsei_dump (&sei);
-                avcsei_decode_cea708 (msg,&cea708);
-                int count = cea708_cc_count (&cea708.user_data);
-
-                for (int i = 0 ; i < count ; ++i) {
-                    cea708_cc_type_t type; int valid;
-                    uint16_t cc_data = cea708_cc_data (&cea708.user_data, i, &valid, &type);
-
-                    if (valid && (cc_type_ntsc_cc_field_1 == type || cc_type_ntsc_cc_field_2 == type)) {
-                        eia608_screen_decode (&screen,cc_data);
-                    }
-                }
-
-                // eia608_screen_dump (&screen, &screen_buf[0]);
-                // printf ("screen:\n%s\n",&screen_buf[0]);
-
-                eia608_screen_json (&screen, &json_buf[0]);
-                printf ("json:\n%s\n",&json_buf[0]);
-
-            }
-        }
-
-        avcsei_free (&sei);
-    }
-}

obs-studio-21.1.2.tar.xz/deps/libcaption/unit_tests/tos.scc Deleted

@@ -1,154 +0,0 @@
-Scenarist_SCC V1.0
-
-00:00:22:10	9420 94f2 97a2 d9ef 75a7 f2e5 2061 20ea e5f2 6b2c 2054 68ef 6dae 942c 8080 8080 942f
-
-00:00:23:28	9420 947c 97a2 4cef ef6b 2043 e5ec e961 2c20 f7e5 2068 6176 e520 f4ef 20e6 efec ecef f720 ef75 f220 7061 7373 e9ef 6e73 3b80 942c 8080 8080 942f
-
-00:00:25:16	9420 9440 aeae ae79 ef75 2068 6176 e520 79ef 75f2 20f2 ef62 eff4 e9e3 732c 2061 6e64 2049 94fe 9723 ea75 73f4 20f7 616e f420 f4ef 2062 e520 61f7 e573 ef6d e520 e96e 2073 7061 e3e5 ae80 942c 8080 8080 942f
-
-00:00:29:09	9420 9440 97a1 5768 7920 64ef 6ea7 f420 79ef 7520 ea75 73f4 2061 646d e9f4 20f4 6861 f480 94fe 97a2 79ef 75a7 f2e5 20e6 f2e5 616b e564 20ef 75f4 2062 7920 6d79 20f2 ef62 eff4 2068 616e 64bf 942c 8080 8080 942f
-
-00:00:33:19	9420 94e0 49a7 6d20 6eef f420 e6f2 e561 6be5 6420 ef75 f420 6279 ad20 e9f4 a773 aeae ae80 942c 8080 8080 942f
-
-00:00:36:10	9420 94f2 9723 aeae ae61 ecf2 e967 68f4 a120 46e9 6ee5 a180 942c 8080 8080 942f
-
-00:00:36:29	9420 945e 9723 49a7 6d20 e6f2 e561 6be5 6420 ef75 f4a1 2049 2068 6176 e520 6ee9 6768 f46d 61f2 e573 94f2 f468 61f4 2049 a76d 2062 e5e9 6e67 20e3 6861 73e5 64ae aeae 942c 8080 8080 942f
-
-00:00:39:27	9420 947c 97a2 aeae ae62 7920 f468 e573 e520 67e9 616e f420 f2ef 62ef f4e9 e320 e3ec 61f7 7320 efe6 2064 e561 f468 aeae ae80 942c 8080 8080 942f
-
-00:00:40:29	9420 9452 97a2 a246 ef75 f2f4 7920 79e5 61f2 7320 ec61 f4e5 f2a2 94e0 97a2 5768 61f4 e576 e5f2 2c20 5468 ef6d ae20 57e5 a7f2 e520 64ef 6ee5 ae80 942c 8080 8080 942f
-
-00:00:49:02	9420 94fe 9723 52ef 62ef f4a7 7320 6de5 6def f279 2073 796e e3e5 6420 616e 6420 ecef e36b e564 a180 942c 8080 8080 942f
-
-00:01:00:08	9420 94f2 97a1 5468 e973 20e9 7320 70f2 e5f4 f479 20e6 f2e5 616b 79ae 942c 8080 8080 942f
-
-00:01:56:03	9420 94e0 97a2 d368 ef75 ec64 6ea7 f420 79ef 7520 62e5 2064 eff7 6e20 f468 e5f2 e5bf 942c 8080 8080 942f
-
-00:02:09:29	9420 94fe 97a2 4920 68e5 61f2 6420 79ef 7520 6775 7973 20f4 61ec 6be9 6e67 20ec 6173 f420 6ee9 6768 f4ae 942c 8080 8080 942f
-
-00:02:15:02	9420 94e0 97a2 49f4 a773 206e eff4 206d 7920 e661 75ec f42c 2079 ef75 206b 6eef f7ae 942c 8080 8080 942f
-
-00:03:10:08	9420 94f4 97a1 c1f2 e520 79ef 7520 f2e5 6164 79bf 942c 8080 8080 942f
-
-00:03:11:24	9420 947c 9723 4fe6 20e3 ef75 f273 e520 79ef 75a7 f2e5 20f2 e561 6479 2c20 79ef 75a7 f2e5 2061 20f2 efe3 6b73 f461 f2ae 942c 8080 8080 942f
-
-00:03:16:02	9420 94e0 9723 c8ef f7a7 7320 e9f4 20ec efef 6be9 6e67 2c20 c261 f2ec e579 bf80 942c 8080 8080 942f
-
-00:03:17:27	9420 94fe 97a2 57e5 2073 68ef 75ec 6420 6861 76e5 2061 62ef 75f4 20f4 e56e 206d e96e 75f4 e573 aeae ae80 942c 8080 8080 942f
-
-00:03:20:19	9420 94f2 97a2 57e5 ecec 20f4 6861 f4a7 7320 70e5 f2e6 e5e3 f4ae 942c 8080 8080 942f
-
-00:03:22:05	9420 9440 57e5 a7f2 e520 ef6e 20e9 6e20 ef6e e5a1 20c1 ecec 2073 7973 f4e5 6d73 2067 efa1 94f4 97a1 d9e5 6168 2079 ef75 2c20 67ef a180 942c 8080 8080 942f
-
-00:03:26:29	9420 94e0 97a1 c7ef a120 cdef 76e5 2079 ef75 f220 6173 73e5 73a1 20c7 ef20 67ef 2067 efa1 942c 8080 8080 942f
-
-00:03:32:03	9420 94f2 4920 ecef 76e5 20e9 f4a1 2043 ef6d e520 ef6e 2c20 67ef a180 942c 8080 8080 942f
-
-00:03:42:08	9420 94f4 97a2 5468 61f4 a773 206e e9e3 e5ae 942c 8080 8080 942f
-
-00:03:43:18	9420 94f2 ceef f468 e96e 6720 f4ef 20f7 eff2 f279 2061 62ef 75f4 ae80 942c 8080 8080 942f
-
-00:03:45:11	9420 9476 97a1 5468 ef6d ae80 942c 8080 8080 942f
-
-00:03:50:07	9420 94f4 97a1 5468 e5f2 e520 7368 e520 e973 ae80 942c 8080 8080 942f
-
-00:03:52:27	9420 9476 97a2 ceef f7ae 942c 8080 8080 942f
-
-00:03:54:06	9420 94f4 97a1 d9ef 7520 ecef 76e5 2068 e5f2 ae80 942c 8080 8080 942f
-
-00:03:56:03	9420 94f2 97a2 d368 e520 e973 2079 ef75 f220 7061 7373 e9ef 6ea1 942c 8080 8080 942f
-
-00:03:59:04	9420 94f2 9723 c2e5 20f4 e56e 64e5 f220 f4ef 2068 e5f2 ae80 942c 8080 8080 942f
-
-00:04:00:15	9420 94e0 9723 c2e5 2068 ef6e e573 f4a1 2045 68ad 2062 e520 f4e5 6e64 e5f2 ae80 942c 8080 8080 942f
-
-00:04:04:02	9420 94f2 52e5 6de9 6e64 2068 e5f2 20f7 6861 f420 ecef 76e5 20e9 73ae 942c 8080 8080 942f
-
-00:04:51:05	9420 94f4 aeae ae61 6e64 2c20 61e3 f4e9 ef6e a180 942c 8080 8080 942f
-
-00:04:55:12	9420 94e0 97a1 cde5 6def f279 20ef 76e5 f2f7 f2e9 f4e5 20e9 6e20 70f2 ef67 f2e5 7373 a180 942c 8080 8080 942f
-
-00:04:58:02	9420 94f2 97a2 d9ef 75a7 f2e5 2061 20ea e5f2 6b2c 2054 68ef 6da1 942c 8080 8080 942f
-
-00:05:01:17	9420 94f2 9723 4f68 70ad 20d3 eff2 f279 a120 d3ef f2f2 79ae 942c 8080 8080 942f
-
-00:05:15:05	9420 94f4 97a2 4cef ef6b 2043 e5ec e961 ae80 942c 8080 8080 942f
-
-00:05:16:26	9420 94e0 57e5 2068 6176 e520 f4ef 20e6 efec ecef f720 ef75 f220 7061 7373 e9ef 6e73 ae80 942c 8080 8080 942f
-
-00:05:19:28	9420 94e0 9723 d9ef 7520 6861 76e5 2079 ef75 f220 f2ef 62ef f4e9 e373 aeae ae80 942c 8080 8080 942f
-
-00:05:23:20	9420 947c 9723 aeae ae61 6e64 2049 20ea 7573 f420 f761 6ef4 20f4 ef20 62e5 2061 f7e5 73ef 6de5 20e9 6e20 7370 61e3 e5ae 942c 8080 8080 942f
-
-00:05:37:21	9420 94fe 4f6b 6179 2c20 f468 e579 a7f2 e520 e3ef 6de9 6e67 ae20 54f7 ef20 6de9 6e75 f4e5 7320 ece5 e6f4 a180 942c 8080 8080 942f
-
-00:05:42:01	9420 94f2 9723 d370 e5e5 6420 e9f4 2075 702c 2054 68ef 6da1 942c 8080 8080 942f
-
-00:05:44:04	9420 94f4 97a2 d6e9 7661 e3e9 7373 e96d efa1 942c 8080 8080 942f
-
-00:05:45:05	9420 945e 97a2 5768 7920 64ef 6ea7 f420 79ef 7520 ea75 73f4 2061 646d e9f4 20f4 6861 f420 79ef 75a7 f2e5 94e0 97a1 e6f2 e561 6be5 6420 ef75 f420 6279 206d 7920 f2ef 62ef f420 6861 6e64 bf80 942c 8080 8080 942f
-
-00:05:54:26	9420 94e0 97a2 4ce9 73f4 e56e 2043 e5ec e961 2c20 4920 f761 7320 79ef 756e 67ae aeae 942c 8080 8080 942f
-
-00:05:58:18	9420 94f4 97a1 aeae ae61 6e64 2061 2064 e9e3 6bae 942c 8080 8080 942f
-
-00:05:59:18	9420 9452 c275 f420 f468 61f4 a773 206e ef20 f2e5 6173 ef6e 20f4 ef80 94f2 9723 64e5 73f4 f2ef 7920 f468 e520 f7ef f2ec 64ae 942c 8080 8080 942f
-
-00:06:04:00	9420 94f2 97a2 5768 7920 64ef e573 2068 e520 64ef 20f4 68e9 73bf 942c 8080 8080 942f
-
-00:06:05:12	9420 94e0 9723 57e5 2061 ecf2 e561 6479 20f4 f2e9 e564 20f4 6861 f420 ef6e e5a1 942c 8080 8080 942f
-
-00:06:10:21	9420 9476 97a1 c162 eff2 f4a1 942c 8080 8080 942f
-
-00:06:12:07	9420 9476 97a2 4375 f4a1 942c 8080 8080 942f
-
-00:06:13:06	9420 9476 5768 ef61 6161 a180 942c 8080 8080 942f
-
-00:06:18:06	9420 9476 5768 ef61 6161 a180 942c 8080 8080 942f
-
-00:06:20:06	9420 9476 ceef efef efef a180 942c 8080 8080 942f
-
-00:06:21:29	9420 94f2 97a2 d9ef 7520 62f2 ef6b e520 6d79 2068 e561 f2f4 ae80 942c 8080 8080 942f
-
-00:06:25:06	9420 9476 4920 6b6e eff7 ae80 942c 8080 8080 942f
-
-00:06:25:28	9420 94f2 d9ef 7520 e6ef f267 eff4 206d e520 ef6e 20e5 61f2 f468 ae80 942c 8080 8080 942f
-
-00:06:28:06	9420 9476 4920 6b6e eff7 ae80 942c 8080 8080 942f
-
-00:06:29:13	9420 94f2 4920 7368 ef75 ec64 20ea 7573 f420 e3f2 7573 6820 79ef 75ae 942c 8080 8080 942f
-
-00:06:35:07	9420 9476 97a2 49a7 6dad 942c 8080 8080 942f
-
-00:06:46:03	9420 94f4 9723 49a7 6d20 73ef f2f2 79ae 942c 8080 8080 942f
-
-00:06:49:02	9420 94f4 97a2 c7ef ef64 2061 64ad ece9 62ae 942c 8080 8080 942f
-
-00:06:58:01	9420 94f4 97a1 ceef f420 6d79 20e6 6175 ecf4 a180 942c 8080 8080 942f
-
-00:07:01:03	9420 94f4 9723 5468 e973 20f4 e96d e5ae 942c 8080 8080 942f
-
-00:07:07:01	9420 94f4 97a1 5175 e9e5 f420 ef6e 2073 e5f4 a180 942c 8080 8080 942f
-
-00:07:08:29	9420 94f2 9723 57e5 a7f2 e520 ef75 f420 efe6 20f4 e96d e5a1 942c 8080 8080 942f
-
-00:08:12:03	9420 9476 43ef 6de5 20ef 6ea1 942c 8080 8080 942f
-
-00:08:20:29	9420 94f4 97a2 52c1 c1c1 c1c1 c1c1 c1c8 a180 942c 8080 8080 942f
-
-00:08:22:24	9420 94f2 97a1 cde5 6def f279 20ef 76e5 f2f7 f2e9 f4e5 2c20 b9b0 25ae 942c 8080 8080 942f
-
-00:08:24:22	9420 94e0 9723 4361 70f4 61e9 6ea1 2057 e520 6861 76e5 20f4 ef20 6162 eff2 f4a1 942c 8080 8080 942f
-
-00:08:36:20	9420 94e0 97a1 5468 e520 f7ef f2ec 64a7 7320 e368 616e 67e5 642c 2043 e5ec e961 aeae ae80 942c 8080 8080 942f
-
-00:08:52:24	9420 94f2 97a2 aeae ae6d 6179 62e5 20f7 e520 e361 6e20 f4ef efae 942c 8080 8080 942f
-
-00:08:56:21	9420 94e0 9723 cde5 6def f279 20ef 76e5 f2f7 f2e9 f4e5 20e3 ef6d 70ec e5f4 e5a1 942c 8080 8080 942f
-
-00:09:17:29	9420 94f4 9723 d9ef 7520 6b6e eff7 ae80 942c 8080 8080 942f
-
-00:09:20:13	9420 947c 9723 5468 e5f2 e5a7 7320 6120 ece5 7373 ef6e 20f4 ef20 62e5 20ec e561 f26e e564 20e6 f2ef 6d20 f468 e973 ae80 942c 8080 8080 942f
-
-00:09:24:24	9420 94f2 97a2 43ef 75ec 64a7 6120 67ef 6ee5 20f7 eff2 73e5 ae80 942c 8080 8080 942f
-

obs-studio-21.1.2.tar.xz/plugins/enc-amf/#Resources/Installer.in.iss Deleted

@@ -1,114 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "AMD Encoder for OBS Studio"
-#define MyAppVersion "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"
-#define MyAppPublisher "Xaymars Technology Workshop"
-#define MyAppURL "http://www.xaymar.com/portfolio/plugin-amd-vce-plugin-for-obs-studio/"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{FD6676CE-0580-4B34-9DB4-4879A0BEB31D}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={code:GetDirName}
-DefaultGroupName={#MyAppName}
-AllowNoIcons=yes
-LicenseFile=..\LICENSE
-OutputDir=.\Output
-OutputBaseFilename=AMD-Encoder-for-OBS-Studio.{#MyAppVersion}
-Compression=lzma
-SolidCompression=yes
-VersionInfoVersion={#MyAppVersion}
-VersionInfoCompany={#MyAppPublisher}
-VersionInfoDescription={#MyAppName} Setup
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Files]
-Source: "..\#Build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-
-[Code]
-function GetDirName(Value: string): string;
-var
-  InstallPath: string;
-begin
-  // initialize default path, which will be returned when the following registry
-  // key queries fail due to missing keys or for some different reason
-  Result := '{pf}\obs-studio';
-  // query the first registry value; if this succeeds, return the obtained value
-  if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
-    Result := InstallPath
-end;
-
-/////////////////////////////////////////////////////////////////////
-function GetUninstallString(): String;
-var
-  sUnInstPath: String;
-  sUnInstallString: String;
-begin
-  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
-  sUnInstallString := '';
-  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
-    RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
-  Result := sUnInstallString;
-end;
-
-
-/////////////////////////////////////////////////////////////////////
-function IsUpgrade(): Boolean;
-begin
-  Result := (GetUninstallString() <> '');
-end;
-
-
-/////////////////////////////////////////////////////////////////////
-function UnInstallOldVersion(): Integer;
-var
-  sUnInstallString: String;
-  iResultCode: Integer;
-begin
-// Return Values:
-// 1 - uninstall string is empty
-// 2 - error executing the UnInstallString
-// 3 - successfully executed the UnInstallString
-
-  // default return value
-  Result := 0;
-
-  // get the uninstall string of the old app
-  sUnInstallString := GetUninstallString();
-  if sUnInstallString <> '' then begin
-    sUnInstallString := RemoveQuotes(sUnInstallString);
-    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
-      Result := 3
-    else
-      Result := 2;
-  end else
-    Result := 1;
-end;
-
-/////////////////////////////////////////////////////////////////////
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
-  if (CurStep=ssInstall) then
-  begin
-    if (IsUpgrade()) then
-    begin
-      UnInstallOldVersion();
-    end;
-  end;
-end;
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/#Resources/package.in.bat Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/amf-capabilities.h Deleted

@@ -1,75 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <stdint.h>
-#include <inttypes.h>
-#include <vector>
-#include <list>
-#include <map>
-#include <tuple>
-
-// Plugin
-#include "plugin.h"
-#include "amf.h"
-#include "amf-encoder.h"
-#include "amf-encoder-h264.h"
-#include "amf-encoder-h265.h"
-#include "api-base.h"
-
-// AMF
-#include "components\ComponentCaps.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-
-namespace Plugin {
-	namespace AMD {
-		class CapabilityManager {
-			#pragma region Singleton
-			public:
-			static void Initialize();
-			static CapabilityManager* Instance();
-			static void Finalize();
-
-			private: // Private Initializer & Finalizer
-			CapabilityManager();
-			~CapabilityManager();
-
-			public: // Remove all Copy operators
-			CapabilityManager(CapabilityManager const&) = delete;
-			void operator=(CapabilityManager const&) = delete;
-			#pragma endregion Singleton
-
-			bool IsCodecSupported(AMD::Codec codec);
-			bool IsCodecSupportedByAPI(AMD::Codec codec, API::Type api);
-			bool IsCodecSupportedByAPIAdapter(AMD::Codec codec, API::Type api, API::Adapter adapter);
-
-			private:
-			std::map<
-				std::tuple<API::Type, API::Adapter, AMD::Codec>,
-				bool> m_CapabilityMap;
-
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/amf-encoder-h264.h Deleted

@@ -1,193 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "plugin.h"
-#include "amf-encoder.h"
-#include "components/VideoEncoderVCE.h"
-
-namespace Plugin {
-	namespace AMD {
-		namespace H264 {
-			enum class SliceMode : uint8_t {
-				Row = 1, // Horizontal?
-				Column = 2, // Vertical?
-			};
-		}
-
-		class EncoderH264 : public Encoder {
-			public:
-			EncoderH264(
-				std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter = API::Adapter::Adapter(),
-				bool useOpenCLSubmission = false, bool useOpenCLConversion = false,
-				ColorFormat colorFormat = ColorFormat::NV12, ColorSpace colorSpace = ColorSpace::BT709, bool fullRangeColor = false,
-				bool useAsyncQueue = false, size_t asyncQueueSize = 0);
-			virtual ~EncoderH264();
-
-			// Properties - Initialization
-			virtual std::vector<Usage> CapsUsage() override;
-			virtual void SetUsage(Usage v) override;
-			virtual Usage GetUsage() override;
-
-			// Properties - Static
-			virtual std::vector<QualityPreset> CapsQualityPreset() override;
-			virtual void SetQualityPreset(QualityPreset v) override;
-			virtual QualityPreset GetQualityPreset() override;
-
-			virtual std::vector<Profile> CapsProfile() override;
-			virtual void SetProfile(Profile v) override;
-			virtual Profile GetProfile() override;
-
-			virtual std::vector<ProfileLevel> CapsProfileLevel() override;
-			virtual void SetProfileLevel(ProfileLevel v) override;
-			virtual ProfileLevel GetProfileLevel() override;
-
-			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() override;
-			virtual void SetMaximumReferenceFrames(uint64_t v) override;
-			virtual uint64_t GetMaximumReferenceFrames() override;
-
-			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() override;
-			virtual void SetResolution(std::pair<uint32_t, uint32_t> v) override;
-			virtual std::pair<uint32_t, uint32_t> GetResolution() override;
-
-			virtual void SetAspectRatio(std::pair<uint32_t, uint32_t> v) override;
-			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() override;
-
-			virtual void SetFrameRate(std::pair<uint32_t, uint32_t> v) override;
-			virtual std::pair<uint32_t, uint32_t> GetFrameRate() override;
-
-			virtual std::vector<CodingType> CapsCodingType() override;
-			virtual void SetCodingType(CodingType v) override;
-			virtual CodingType GetCodingType() override;
-
-			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() override;
-			virtual void SetMaximumLongTermReferenceFrames(uint32_t v) override;
-			virtual uint32_t GetMaximumLongTermReferenceFrames() override;
-
-			// Properties - Dynamic
-			virtual std::vector<RateControlMethod> CapsRateControlMethod() override;
-			virtual void SetRateControlMethod(RateControlMethod v) override;
-			virtual RateControlMethod GetRateControlMethod() override;
-
-			virtual std::vector<PrePassMode> CapsPrePassMode() override;
-			virtual void SetPrePassMode(PrePassMode v) override;
-			virtual PrePassMode GetPrePassMode() override;
-
-			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) override;
-			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() override;
-
-			virtual void SetFrameSkippingEnabled(bool v) override;
-			virtual bool IsFrameSkippingEnabled() override;
-
-			virtual void SetEnforceHRDEnabled(bool v) override;
-			virtual bool IsEnforceHRDEnabled() override;
-
-			virtual void SetFillerDataEnabled(bool v) override;
-			virtual bool IsFillerDataEnabled() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsQPMinimum();
-			void SetQPMinimum(uint8_t v);
-			uint8_t GetQPMinimum();
-
-			virtual std::pair<uint8_t, uint8_t> CapsQPMaximum();
-			void SetQPMaximum(uint8_t v);
-			uint8_t GetQPMaximum();
-
-			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() override;
-			virtual void SetTargetBitrate(uint64_t v) override;
-			virtual uint64_t GetTargetBitrate() override;
-
-			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() override;
-			virtual void SetPeakBitrate(uint64_t v) override;
-			virtual uint64_t GetPeakBitrate() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsIFrameQP();
-			virtual void SetIFrameQP(uint8_t v) override;
-			virtual uint8_t GetIFrameQP() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsPFrameQP();
-			virtual void SetPFrameQP(uint8_t v) override;
-			virtual uint8_t GetPFrameQP() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsBFrameQP();
-			virtual void SetBFrameQP(uint8_t v);
-			virtual uint8_t GetBFrameQP();
-
-			virtual void SetMaximumAccessUnitSize(uint32_t v) override;
-			virtual uint32_t GetMaximumAccessUnitSize() override;
-
-			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() override;
-			virtual void SetVBVBufferSize(uint64_t v) override;
-			virtual uint64_t GetVBVBufferSize() override;
-
-			virtual void SetVBVBufferInitialFullness(double v) override;
-			virtual float GetInitialVBVBufferFullness() override;
-
-			// Properties - Picture Control
-			virtual void SetIDRPeriod(uint32_t v) override;
-			virtual uint32_t GetIDRPeriod() override;
-
-			void SetHeaderInsertionSpacing(uint32_t v);
-			uint32_t GetHeaderInsertionSpacing();
-
-			virtual void SetGOPAlignmentEnabled(bool v) override;
-			virtual bool IsGOPAlignmentEnabled() override;
-
-			virtual void SetDeblockingFilterEnabled(bool v) override;
-			virtual bool IsDeblockingFilterEnabled() override;
-
-			virtual uint8_t CapsBFramePattern();
-			virtual void SetBFramePattern(uint8_t v);
-			virtual uint8_t GetBFramePattern();
-
-			virtual void SetBFrameDeltaQP(int8_t v);
-			virtual int8_t GetBFrameDeltaQP();
-
-			virtual void SetBFrameReferenceEnabled(bool v);
-			virtual bool IsBFrameReferenceEnabled();
-
-			virtual void SetBFrameReferenceDeltaQP(int8_t v);
-			virtual int8_t GetBFrameReferenceDeltaQP();
-
-			// Properties - Motion Estimation
-			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) override;
-			virtual bool IsMotionEstimationQuarterPixelEnabled() override;
-
-			virtual void SetMotionEstimationHalfPixelEnabled(bool v) override;
-			virtual bool IsMotionEstimationHalfPixelEnabled() override;
-
-			// Properties - Intra-Refresh
-			std::pair<uint32_t, uint32_t> CapsIntraRefreshNumMBsPerSlot();
-			void SetIntraRefreshNumMBsPerSlot(uint32_t v);
-			uint32_t GetIntraRefreshNumMBsPerSlot();
-
-			void SetIntraRefreshNumOfStripes(uint32_t v);
-			uint32_t GetIntraRefreshNumOfStripes();
-			
-			// Internal
-			virtual void LogProperties() override;
-			protected:
-			virtual void PacketPriorityAndKeyframe(amf::AMFDataPtr& d, struct encoder_packet* p) override;
-			virtual AMF_RESULT GetExtraDataInternal(amf::AMFVariant* p) override;
-			virtual std::string HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index) override;
-
-			AMF_VIDEO_ENCODER_PICTURE_TYPE_ENUM m_FrameSkipType = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/amf-encoder-h265.h Deleted

@@ -1,216 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "plugin.h"
-#include "amf-encoder.h"
-#include "components/VideoEncoderHEVC.h"
-
-namespace Plugin {
-	namespace AMD {
-		namespace H265 {
-			enum class Tier : uint8_t {
-				Main,
-				High,
-			};
-			enum class GOPType : uint8_t {
-				Fixed,		// Fixed Interval GOP
-				Variable,	// Variable Interval GOP
-			};
-			enum class HeaderInsertionMode : uint8_t {
-				None = 0,
-				AlignedToGOP = 1,
-				AlignedToIDR = 2,
-			};
-		}
-
-		class EncoderH265 : public Encoder {
-			public:
-			EncoderH265(
-				std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter = API::Adapter::Adapter(),
-				bool useOpenCLSubmission = false, bool useOpenCLConversion = false,
-				ColorFormat colorFormat = ColorFormat::NV12, ColorSpace colorSpace = ColorSpace::BT709, bool fullRangeColor = false,
-				bool useAsyncQueue = false, size_t asyncQueueSize = 0);
-			virtual ~EncoderH265();
-
-			// Initialization
-			virtual std::vector<Usage> CapsUsage() override;
-			virtual void SetUsage(Usage v) override;
-			virtual Usage GetUsage() override;
-
-			// Static
-			virtual std::vector<QualityPreset> CapsQualityPreset() override;
-			virtual void SetQualityPreset(QualityPreset v) override;
-			virtual QualityPreset GetQualityPreset() override;
-
-			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() override;
-			virtual void SetResolution(std::pair<uint32_t, uint32_t> v) override;
-			virtual std::pair<uint32_t, uint32_t> GetResolution() override;
-
-			virtual void SetAspectRatio(std::pair<uint32_t, uint32_t> v) override;
-			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() override;
-
-			virtual void SetFrameRate(std::pair<uint32_t, uint32_t> v) override;
-			virtual std::pair<uint32_t, uint32_t> GetFrameRate() override;
-
-			virtual std::vector<Profile> CapsProfile() override;
-			virtual void SetProfile(Profile v) override;
-			virtual Profile GetProfile() override;
-
-			virtual std::vector<ProfileLevel> CapsProfileLevel() override;
-			virtual void SetProfileLevel(ProfileLevel v) override;
-			virtual ProfileLevel GetProfileLevel() override;
-
-			std::vector<H265::Tier> CapsTier();
-			void SetTier(H265::Tier v);
-			H265::Tier GetTier();
-
-			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() override;
-			virtual void SetMaximumReferenceFrames(uint64_t v) override;
-			virtual uint64_t GetMaximumReferenceFrames() override;
-
-			virtual std::vector<CodingType> CapsCodingType() override;
-			virtual void SetCodingType(CodingType v) override;
-			virtual CodingType GetCodingType() override;
-
-			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() override;
-			virtual void SetMaximumLongTermReferenceFrames(uint32_t v) override;
-			virtual uint32_t GetMaximumLongTermReferenceFrames() override;
-
-			/// Rate Control
-			virtual std::vector<RateControlMethod> CapsRateControlMethod() override;
-			virtual void SetRateControlMethod(RateControlMethod v) override;
-			virtual RateControlMethod GetRateControlMethod() override;
-
-			virtual std::vector<PrePassMode> CapsPrePassMode() override;
-			virtual void SetPrePassMode(PrePassMode v) override;
-			virtual PrePassMode GetPrePassMode() override;
-
-			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) override;
-			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() override;
-
-			/// VBV Buffer
-			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() override;
-			virtual void SetVBVBufferSize(uint64_t v) override;
-			virtual uint64_t GetVBVBufferSize() override;
-
-			virtual void SetVBVBufferInitialFullness(double v) override;
-			virtual float GetInitialVBVBufferFullness() override;
-
-			/// Picture Control
-			std::vector<H265::GOPType> CapsGOPType();
-			void SetGOPType(H265::GOPType v);
-			H265::GOPType GetGOPType();
-
-			void SetGOPSize(uint32_t v);
-			uint32_t GetGOPSize();
-
-			void SetGOPSizeMin(uint32_t v);
-			uint32_t GetGOPSizeMin();
-
-			void SetGOPSizeMax(uint32_t v);
-			uint32_t GetGOPSizeMax();
-
-			virtual void SetGOPAlignmentEnabled(bool v) override;
-			virtual bool IsGOPAlignmentEnabled() override;
-
-			virtual void SetIDRPeriod(uint32_t v) override; // Distance in GOPs
-			virtual uint32_t GetIDRPeriod() override;
-
-			void SetHeaderInsertionMode(H265::HeaderInsertionMode v);
-			H265::HeaderInsertionMode GetHeaderInsertionMode();
-
-			virtual void SetDeblockingFilterEnabled(bool v) override;
-			virtual bool IsDeblockingFilterEnabled() override;
-
-			/// Motion Estimation
-			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) override;
-			virtual bool IsMotionEstimationQuarterPixelEnabled() override;
-
-			virtual void SetMotionEstimationHalfPixelEnabled(bool v) override;
-			virtual bool IsMotionEstimationHalfPixelEnabled() override;
-
-			// Dynamic
-			virtual void SetFrameSkippingEnabled(bool v) override;
-			virtual bool IsFrameSkippingEnabled() override;
-
-			virtual void SetEnforceHRDEnabled(bool v) override;
-			virtual bool IsEnforceHRDEnabled() override;
-
-			virtual void SetFillerDataEnabled(bool v) override;
-			virtual bool IsFillerDataEnabled() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsIFrameQPMinimum();
-			void SetIFrameQPMinimum(uint8_t v);
-			uint8_t GetIFrameQPMinimum();
-
-			virtual std::pair<uint8_t, uint8_t> CapsIFrameQPMaximum();
-			void SetIFrameQPMaximum(uint8_t v);
-			uint8_t GetIFrameQPMaximum();
-
-			virtual std::pair<uint8_t, uint8_t> CapsPFrameQPMinimum();
-			void SetPFrameQPMinimum(uint8_t v);
-			uint8_t GetPFrameQPMinimum();
-
-			virtual std::pair<uint8_t, uint8_t> CapsPFrameQPMaximum();
-			void SetPFrameQPMaximum(uint8_t v);
-			uint8_t GetPFrameQPMaximum();
-
-			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() override;
-			virtual void SetTargetBitrate(uint64_t v) override;
-			virtual uint64_t GetTargetBitrate() override;
-
-			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() override;
-			virtual void SetPeakBitrate(uint64_t v) override;
-			virtual uint64_t GetPeakBitrate() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsIFrameQP() override;
-			virtual void SetIFrameQP(uint8_t v) override;
-			virtual uint8_t GetIFrameQP() override;
-
-			virtual std::pair<uint8_t, uint8_t> CapsPFrameQP() override;
-			virtual void SetPFrameQP(uint8_t v) override;
-			virtual uint8_t GetPFrameQP() override;
-
-			virtual void SetMaximumAccessUnitSize(uint32_t v) override;
-			virtual uint32_t GetMaximumAccessUnitSize() override;
-			
-			std::pair<uint32_t, uint32_t> CapsInputQueueSize();
-			void SetInputQueueSize(uint32_t v);
-			uint32_t GetInputQueueSize();
-
-			// Internal
-			virtual void LogProperties() override;
-			protected:
-			virtual void PacketPriorityAndKeyframe(amf::AMFDataPtr& d, struct encoder_packet* p) override;
-			virtual AMF_RESULT GetExtraDataInternal(amf::AMFVariant* p) override;
-			virtual std::string HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index) override;
-
-			AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_ENUM m_FrameSkipType = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE;
-
-
-
-			//Remaining Properties
-			// PerformanceCounter (Interface, but which one?)
-			// HevcMaxNumOfTemporalLayers/HevcNumOfTemporalLayers/HevcTemporalLayerSelect - Only supports QP_I/P?
-			// BPicturesPattern (replaced by merge mode?)
-			// HevcMaxMBPerSec (PCI-E bandwidth, min/max)
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/amf-encoder.h Deleted

@@ -1,465 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include <vector>
-#include <queue>
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <chrono>
-#include "plugin.h"
-#include "amf.h"
-#include "api-base.h"
-#include "components/Component.h"
-
-#define AMF_TIMESTAMP_ALLOCATE	L"TS_Allocate"
-#define AMF_TIME_ALLOCATE		L"T_Allocate"
-#define AMF_TIMESTAMP_STORE		L"TS_Store"
-#define AMF_TIME_STORE			L"T_Store"
-#define AMF_TIMESTAMP_CONVERT	L"TS_Convert"
-#define AMF_TIME_CONVERT		L"T_Convert"
-#define AMF_TIMESTAMP_SUBMIT	L"TS_Submit"
-#define AMF_TIMESTAMP_QUERY		L"TS_Query"
-#define AMF_TIME_MAIN			L"T_Main" // Time between Submit and Query
-
-#define AMF_PRESENT_TIMESTAMP	L"PTS"
-
-#ifdef _DEBUG
-#define AMFTRACECALL { \
-	std::mbstate_t state = std::mbstate_t(); \
-	auto trace = AMF::Instance()->GetTrace(); \
-	const char* file = __FILE__; \
-	const char* fname = __FUNCTION_NAME__; \
-	std::vector<wchar_t> buf(std::mbsrtowcs(NULL, &file, 0, &state) + 1); \
-	std::mbsrtowcs(buf.data(), &file, buf.size(), &state); \
-	std::vector<wchar_t> buf2(std::mbsrtowcs(NULL, &fname, 0, &state) + 1); \
-	std::mbsrtowcs(buf2.data(), &fname, buf2.size(), &state); \
-	trace->TraceW(buf.data(), __LINE__, AMF_TRACE_DEBUG, L"Trace", 1, L"Function: %s", buf2.data()); \
-	PLOG_DEBUG("<Trace> " __FUNCTION_NAME__); \
-};
-#else
-#define AMFTRACECALL ;
-#endif
-
-namespace Plugin {
-	namespace AMD {
-		// Initialization Parameters
-		enum class Codec : uint8_t {
-			AVC,
-			SVC,
-			HEVC,
-		};
-		enum class ColorFormat : uint8_t {
-			/*	Support Table
-			 *	Open Broadcaster	AMD AMF
-			 *	-- 4:2:0 Formats --
-			 *	VIDEO_FORMAT_I420	AMF_SURFACE_YUV420P
-			 *	VIDEO_FORMAT_NV12	AMF_SURFACE_NV12
-			 *						AMF_SURFACE_YV12
-			 *	-- 4:2:2 Formats --
-			 *	VIDEO_FORMAT_YVYV
-			 *	VIDEO_FORMAT_YUY2	AMF_SURFACE_YUY2
-			 *	VIDEO_FORMAT_UYVY
-			 *
-			 *	-- 4:4:4 Formats --
-			 *	VIDEO_FORMAT_I444
-			 *
-			 *	-- Packed Uncompressed Formats --
-			 *	VIDEO_FORMAT_RGBA	AMF_SURFACE_RGBA
-			 *	VIDEO_FORMAT_BGRA	AMF_SURFACE_BGRA
-			 *						AMF_SURFACE_ARGB
-			 *	VIDEO_FORMAT_BGRX
-			 *
-			 *	-- Single/Dual Channel Formats --
-			 *	VIDEO_FORMAT_Y800	AMF_SURFACE_GRAY8
-			 *						AMF_SURFACE_U8V8
-			 *
-			 *	-- HDR Color Formats --
-			 *						AMF_SURFACE_P010
-			 *						AMF_SURFACE_RGBA_F16
-			 */
-
-			I420,
-			NV12,
-			YUY2,
-			BGRA,
-			RGBA,
-			GRAY,
-		};
-		enum class ColorSpace : uint8_t {
-			BT601,
-			BT709,
-			BT2020,
-		};
-
-		// Properties
-		enum class Usage : uint8_t {
-			Transcoding,
-			UltraLowLatency,
-			LowLatency,
-			Webcam
-		};
-		enum class QualityPreset : uint8_t {
-			Speed,
-			Balanced,
-			Quality,
-		};
-		enum class Profile : uint16_t {
-			ConstrainedBaseline = 256,
-			Baseline = 66,
-			Main = 77,
-			ConstrainedHigh = 257,
-			High = 100,
-		};
-		enum class ProfileLevel : uint8_t {
-			Automatic,
-			L10 = 10,
-			L11,
-			L12,
-			L13,
-			L20 = 20,
-			L21,
-			L22,
-			L30 = 30,
-			L31,
-			L32,
-			L40 = 40,
-			L41,
-			L42,
-			L50 = 50,
-			L51,
-			L52,
-			L60 = 60,
-			L61,
-			L62,
-		};
-		enum class CodingType : uint8_t {
-			Automatic,
-			CALVC,
-			CABAC,
-		};
-		enum class RateControlMethod : uint8_t {
-			ConstantQP,
-			LatencyConstrainedVariableBitrate,
-			PeakConstrainedVariableBitrate,
-			ConstantBitrate,
-		};
-		enum class PrePassMode : uint8_t {
-			Disabled,
-			Enabled,
-			EnabledAtHalfScale,
-			EnabledAtQuarterScale,
-		};
-		enum class SliceControlMode : uint8_t {
-			Unknown0,
-			Unknown1,
-			Unknown2,
-			Unknown3,
-		};
-
-		class Encoder {
-			protected:
-			Encoder(Codec codec,
-				std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
-				bool useOpenCLSubmission, bool useOpenCLConversion,
-				ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
-				bool multiThreaded, size_t queueSize);
-			public:
-			virtual ~Encoder();
-
-			public:
-
-			#pragma region Initialization
-			uint64_t GetUniqueId();
-
-			//void SetCodec(Codec v);
-			Codec GetCodec();
-
-			//void SetVideoAPI(std::shared_ptr<API::IAPI> v);
-			std::shared_ptr<API::IAPI> GetVideoAPI();
-
-			//void SetVideoAdapter(API::Adapter v);
-			API::Adapter GetVideoAdapter();
-
-			//void SetOpenCLEnabled(bool v);
-			bool IsOpenCLEnabled();
-
-			//void SetColorFormat(ColorFormat v);
-			ColorFormat GetColorFormat();
-
-			//void SetColorSpace(ColorSpace v);
-			ColorSpace GetColorSpace();
-
-			//void SetFullRangeColor(bool v);
-			bool IsFullRangeColor();
-
-			//void SetAsynchronousQueueEnabled(bool v);
-			bool IsMultiThreaded();
-
-			//void SetAsynchronousQueueSize(size_t v);
-			size_t GetQueueSize();
-
-			void SetDebug(bool v);
-			bool IsDebug();
-
-			//bool Initialize();
-			#pragma endregion Initialization
-
-			#pragma region Settings
-			virtual std::vector<Usage> CapsUsage() = 0;
-			virtual void SetUsage(Usage v) = 0;
-			virtual Usage GetUsage() = 0;
-
-			virtual std::vector<QualityPreset> CapsQualityPreset() = 0;
-			virtual void SetQualityPreset(QualityPreset v) = 0;
-			virtual QualityPreset GetQualityPreset() = 0;
-
-			#pragma region Frame
-			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() = 0;
-			virtual void SetResolution(std::pair<uint32_t, uint32_t> v) = 0;
-			virtual std::pair<uint32_t, uint32_t> GetResolution() = 0;
-
-			virtual void SetAspectRatio(std::pair<uint32_t, uint32_t> v) = 0;
-			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() = 0;
-
-			virtual void SetFrameRate(std::pair<uint32_t, uint32_t> v) = 0;
-			virtual std::pair<uint32_t, uint32_t> GetFrameRate() = 0;
-			#pragma endregion Frame
-
-			#pragma region Profile
-			virtual std::vector<Profile> CapsProfile() = 0;
-			virtual void SetProfile(Profile v) = 0;
-			virtual Profile GetProfile() = 0;
-
-			virtual std::vector<ProfileLevel> CapsProfileLevel() = 0;
-			virtual void SetProfileLevel(ProfileLevel v) = 0;
-			virtual ProfileLevel GetProfileLevel() = 0;
-			#pragma endregion Profile
-
-			virtual std::vector<CodingType> CapsCodingType() = 0;
-			virtual void SetCodingType(CodingType v) = 0;
-			virtual CodingType GetCodingType() = 0;
-
-			#pragma region Reference Frames
-			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() = 0;
-			virtual void SetMaximumReferenceFrames(uint64_t v) = 0;
-			virtual uint64_t GetMaximumReferenceFrames() = 0;
-
-			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() = 0;
-			virtual void SetMaximumLongTermReferenceFrames(uint32_t v) = 0;
-			virtual uint32_t GetMaximumLongTermReferenceFrames() = 0;
-			#pragma endregion Reference Frames
-
-			virtual std::vector<RateControlMethod> CapsRateControlMethod() = 0;
-			virtual void SetRateControlMethod(RateControlMethod v) = 0;
-			virtual RateControlMethod GetRateControlMethod() = 0;
-
-			virtual std::vector<PrePassMode> CapsPrePassMode() = 0;
-			virtual void SetPrePassMode(PrePassMode v) = 0;
-			virtual PrePassMode GetPrePassMode() = 0;
-
-			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) = 0;
-			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() = 0;
-
-			virtual void SetFrameSkippingEnabled(bool v) = 0;
-			virtual bool IsFrameSkippingEnabled() = 0;
-
-			virtual void SetFrameSkippingPeriod(uint32_t v);
-			virtual uint32_t GetFrameSkippingPeriod();
-
-			/// false skips every nth frame, true keeps every nth frame.
-			virtual void SetFrameSkippingBehaviour(bool v);
-			virtual bool GetFrameSkippingBehaviour();
-
-			/// Enforce Hypothethical Reference Decoder Restrictions
-			virtual void SetEnforceHRDEnabled(bool v) = 0;
-			virtual bool IsEnforceHRDEnabled() = 0;
-
-			virtual void SetFillerDataEnabled(bool v) = 0;
-			virtual bool IsFillerDataEnabled() = 0;
-
-			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() = 0;
-			virtual void SetTargetBitrate(uint64_t v) = 0;
-			virtual uint64_t GetTargetBitrate() = 0;
-
-			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() = 0;
-			virtual void SetPeakBitrate(uint64_t v) = 0;
-			virtual uint64_t GetPeakBitrate() = 0;
-
-			virtual std::pair<uint8_t, uint8_t> CapsIFrameQP() = 0;
-			virtual void SetIFrameQP(uint8_t v) = 0;
-			virtual uint8_t GetIFrameQP() = 0;
-
-			virtual std::pair<uint8_t, uint8_t> CapsPFrameQP() = 0;
-			virtual void SetPFrameQP(uint8_t v) = 0;
-			virtual uint8_t GetPFrameQP() = 0;
-
-			virtual void SetMaximumAccessUnitSize(uint32_t v) = 0;
-			virtual uint32_t GetMaximumAccessUnitSize() = 0;
-
-			#pragma region Video Buffering Verifier
-			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() = 0;
-			virtual void SetVBVBufferSize(uint64_t v) = 0;
-			void SetVBVBufferStrictness(double_t v);
-			virtual uint64_t GetVBVBufferSize() = 0;
-
-			virtual void SetVBVBufferInitialFullness(double v) = 0;
-			virtual float GetInitialVBVBufferFullness() = 0;
-			#pragma endregion Video Buffering Verifier
-
-			#pragma region Picture Control
-			virtual void SetIDRPeriod(uint32_t v) = 0;
-			virtual uint32_t GetIDRPeriod() = 0;
-
-			virtual void SetIFramePeriod(uint32_t v);
-			virtual uint32_t GetIFramePeriod();
-
-			virtual void SetPFramePeriod(uint32_t v);
-			virtual uint32_t GetPFramePeriod();
-
-			virtual void SetBFramePeriod(uint32_t v);
-			virtual uint32_t GetBFramePeriod();
-
-			virtual void SetGOPAlignmentEnabled(bool v) = 0;
-			virtual bool IsGOPAlignmentEnabled() = 0;
-
-			virtual void SetDeblockingFilterEnabled(bool v) = 0;
-			virtual bool IsDeblockingFilterEnabled() = 0;
-			#pragma endregion Picture Control
-
-			#pragma region Motion Estimation
-			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) = 0;
-			virtual bool IsMotionEstimationQuarterPixelEnabled() = 0;
-
-			virtual void SetMotionEstimationHalfPixelEnabled(bool v) = 0;
-			virtual bool IsMotionEstimationHalfPixelEnabled() = 0;
-			#pragma endregion Motion Estimation
-			#pragma endregion Settings
-
-			#pragma region Control
-			void Start();
-			void Restart();
-			void Stop();
-
-			bool IsStarted();
-			virtual void LogProperties() = 0;
-
-			bool Encode(struct encoder_frame* f, struct encoder_packet* p, bool* b);
-			void GetVideoInfo(struct video_scale_info* info);
-			bool GetExtraData(uint8_t** extra_data, size_t* size);
-			#pragma endregion Control
-
-			protected:
-			void UpdateFrameRateValues();
-
-			private:
-			virtual void PacketPriorityAndKeyframe(amf::AMFDataPtr& d, struct encoder_packet* p) = 0;
-			virtual AMF_RESULT GetExtraDataInternal(amf::AMFVariant* p) = 0;
-			virtual std::string HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index) = 0;
-
-			bool EncodeAllocate(OUT amf::AMFSurfacePtr& surface);
-			bool EncodeStore(OUT amf::AMFSurfacePtr& surface, IN struct encoder_frame* frame);
-			bool EncodeConvert(IN amf::AMFSurfacePtr& surface, OUT amf::AMFDataPtr& data);
-			bool EncodeMain(IN amf::AMFDataPtr& data, OUT amf::AMFDataPtr& packet);
-			bool EncodeLoad(IN amf::AMFDataPtr& data, OUT struct encoder_packet* packet, OUT bool* received_packet);
-
-			static int32_t AsyncSendMain(Encoder* obj);
-			int32_t AsyncSendLocalMain();
-			static int32_t AsyncRetrieveMain(Encoder* obj);
-			int32_t AsyncRetrieveLocalMain();
-
-			protected:
-			// AMF Internals
-			Plugin::AMD::AMF* m_AMF;
-			amf::AMFFactory* m_AMFFactory;
-			amf::AMFContextPtr m_AMFContext;
-			amf::AMFComputePtr m_AMFCompute;
-			amf::AMFComponentPtr m_AMFEncoder;
-			amf::AMFComponentPtr m_AMFConverter;
-			amf::AMF_MEMORY_TYPE m_AMFMemoryType;
-			amf::AMF_SURFACE_FORMAT m_AMFSurfaceFormat;
-
-			// API Related
-			std::shared_ptr<API::IAPI> m_API;
-			API::Adapter m_APIAdapter;
-			std::shared_ptr<API::Instance> m_APIDevice;
-
-			// Buffers
-			std::vector<uint8_t> m_PacketDataBuffer;
-			std::vector<uint8_t> m_ExtraDataBuffer;
-
-			// Flags
-			bool m_Initialized;
-			bool m_Started;
-			bool m_OpenCL;
-			bool m_OpenCLSubmission; // Submit Frames using OpenCL
-			bool m_OpenCLConversion; // Convert Frames using OpenCL instead of DirectCompute
-			bool m_Debug;
-
-			// Properties
-			uint64_t m_UniqueId;
-			Codec m_Codec;
-			ColorFormat m_ColorFormat;
-			ColorSpace m_ColorSpace;
-			bool m_FullColorRange;
-			size_t m_QueueSize;
-
-			/// Resolution + Rate
-			std::pair<uint32_t, uint32_t> m_Resolution;
-			std::pair<uint32_t, uint32_t> m_FrameRate;
-			double_t m_FrameRateFraction;
-
-			/// Timings
-			double_t m_TimestampStep;
-			uint64_t m_TimestampStepRounded;
-			uint64_t m_TimestampOffset;
-			std::chrono::nanoseconds m_SubmitQueryWaitTimer;
-			uint64_t m_SubmitQueryAttempts;
-			uint64_t m_InitialFrameLatency;
-
-			/// Status
-			uint64_t m_SubmittedFrameCount;
-			bool m_InitialFramesSent;
-			bool m_InitialPacketRetrieved;
-
-			/// Periods
-			uint32_t m_PeriodIDR;
-			uint32_t m_PeriodIFrame;
-			uint32_t m_PeriodPFrame;
-			uint32_t m_PeriodBFrame;
-			uint32_t m_FrameSkipPeriod;
-			bool m_FrameSkipKeepOnlyNth; // false = drop every xth frame, true = drop all but every xth frame
-
-			/// Multi-Threading
-			bool m_MultiThreading;
-			struct EncoderThreadingData {
-				// Thread
-				std::thread worker;
-				bool shutdown;
-				// Semaphore
-				size_t wakeupcount;
-				std::condition_variable condvar;
-				std::mutex mutex;
-				// Data
-				amf::AMFDataPtr data;
-			} *m_AsyncSend, *m_AsyncRetrieve;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/amf.h Deleted

@@ -1,90 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <memory>
-#include <windows.h>
-
-// Plugin
-#include "plugin.h"
-
-// AMD AMF SDK
-#pragma warning( push )
-#pragma warning( disable: 4458 )
-#include "core\Factory.h"
-#include "components\Component.h"
-#include "components\ComponentCaps.h"
-#include "components\VideoEncoderVCE.h"
-#pragma warning( pop )
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-
-namespace Plugin {
-	namespace AMD {
-		class AMF {
-			#pragma region Singleton
-			public:
-			static void Initialize();
-			static AMF* Instance();
-			static void Finalize();
-
-			private: // Private Initializer & Finalizer
-			AMF();
-			~AMF();
-
-			public: // Remove all Copy operators
-			AMF(AMF const&) = delete;
-			void operator=(AMF const&) = delete;
-			#pragma endregion Singleton
-
-			public:
-			amf::AMFFactory* GetFactory();
-			amf::AMFTrace* GetTrace();
-			amf::AMFDebug* GetDebug();
-
-			void EnableDebugTrace(bool enable);
-
-			uint64_t GetPluginVersion();
-			uint64_t GetRuntimeVersion();
-
-			private:
-			uint32_t m_TimerPeriod; /// High-Precision Timer Accuracy (nanoseconds)
-
-			/// AMF Values
-			HMODULE m_AMFModule;
-			uint64_t m_AMFVersion_Plugin;
-			uint64_t m_AMFVersion_Runtime;
-
-			/// AMF Functions
-			AMFQueryVersion_Fn AMFQueryVersion;
-			AMFInit_Fn AMFInit;
-
-			/// AMF Objects
-			amf::AMFFactory* m_AMFFactory;
-			amf::AMFTrace* m_AMFTrace;
-			amf::AMFDebug* m_AMFDebug;
-			amf::AMFTraceWriter* m_TraceWriter;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/api-base.h Deleted

@@ -1,105 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "plugin.h"
-#include <vector>
-#include <map>
-#include <string.h>
-#include <memory>
-
-namespace Plugin {
-	namespace API {
-		/**
-		 *
-		 */
-		enum class Type : uint8_t {
-			Host,
-			Direct3D9,
-			Direct3D11,
-			OpenGL,
-		};
-
-		// An Adapter on an API
-		struct Adapter {
-			int32_t idLow, idHigh;
-			std::string Name;
-
-			Adapter()
-				: idLow(0), idHigh(0), Name("Invalid Device") {}
-			Adapter(int32_t p_idLow, int32_t p_idHigh, std::string p_Name)
-				: idLow(p_idLow), idHigh(p_idHigh), Name(p_Name) {}
-			Adapter(Adapter const& o) {
-				idLow = o.idLow;
-				idHigh = o.idHigh;
-				Name = o.Name;
-			}
-			void operator=(Adapter const& o) {
-				idLow = o.idLow;
-				idHigh = o.idHigh;
-				Name = o.Name;
-			}
-
-			friend bool operator<(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
-			friend bool operator>(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
-			friend bool operator<=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
-			friend bool operator>=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
-
-			friend bool operator==(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
-			friend bool operator!=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
-		};
-
-		// Instance of an API Adapter
-		struct Instance {
-			public:
-			Instance();
-			virtual ~Instance();
-
-			virtual Adapter GetAdapter() = 0;
-			virtual void* GetContext() = 0;
-		};
-
-		// API Interface
-		class IAPI {
-			public:
-			IAPI();
-			virtual ~IAPI();
-
-			virtual std::string GetName() = 0;
-			virtual Type GetType() = 0;
-
-			virtual std::vector<Adapter> EnumerateAdapters() = 0;
-			Adapter GetAdapterById(int32_t idLow, int32_t idHigh);
-			Adapter GetAdapterByName(std::string name);
-
-			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) = 0;
-		};
-
-		// Static API Stuff
-		void InitializeAPIs();
-		void FinalizeAPIs();
-		size_t CountAPIs();
-		std::string GetAPIName(size_t index);
-		std::shared_ptr<IAPI> GetAPI(size_t index);
-		std::shared_ptr<IAPI> GetAPI(std::string name);
-		std::shared_ptr<IAPI> GetAPI(Type type);
-		std::vector<std::shared_ptr<IAPI>> EnumerateAPIs();
-		std::vector<std::string> EnumerateAPINames();
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/api-d3d11.h Deleted

@@ -1,67 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "api-base.h"
-#include <vector>
-#include <map>
-#include <mutex>
-#include <dxgi.h>
-#include <d3d11.h>
-#include <atlutil.h>
-
-namespace Plugin {
-	namespace API {
-		class Direct3D11 : public IAPI {
-			friend class Direct3D11Instance;
-			public:
-
-			Direct3D11();
-			~Direct3D11();
-
-			virtual std::string GetName() override;
-			virtual Type GetType() override;
-			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
-
-			protected:
-			ATL::CComPtr<IDXGIFactory1> m_DXGIFactory;
-			//std::mutex m_InstanceMapMutex;
-			//std::map<std::pair<int32_t, int32_t>, std::shared_ptr<Instance>> m_InstanceMap;
-
-			private:
-			std::vector<Adapter> m_AdapterList;
-		};
-
-		class Direct3D11Instance : public Instance {
-			public:
-			Direct3D11Instance(Direct3D11* api, Adapter adapter);
-			~Direct3D11Instance();
-
-			virtual Adapter GetAdapter() override;
-			virtual void* GetContext() override;
-
-			private:
-			Direct3D11* m_API;
-			Adapter m_Adapter;
-			ID3D11DeviceContext* m_DeviceContext;
-			ID3D11Device* m_Device;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/api-d3d9.h Deleted

@@ -1,66 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "api-base.h"
-#include <d3d9.h>
-#include <atlutil.h>
-
-#ifdef _DEBUG
-#define D3D_DEBUG_INFO
-#endif
-#pragma comment(lib, "d3d9.lib")
-
-namespace Plugin {
-	namespace API {
-		class Direct3D9 : public IAPI {
-			friend class Direct3D9Instance;
-			public:
-
-			Direct3D9();
-			~Direct3D9();
-
-			virtual std::string GetName() override;
-			virtual Type GetType() override;
-			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
-
-			protected:
-			IDirect3D9Ex* m_Direct3D9Ex;
-			//std::map<std::pair<int32_t, int32_t>, std::shared_ptr<Instance>> m_InstanceMap;
-
-			private:
-			std::vector<Adapter> m_Adapters;
-		};
-
-		class Direct3D9Instance : public Instance {
-			public:
-			Direct3D9Instance(Direct3D9* api, Adapter adapter);
-			~Direct3D9Instance();
-
-			virtual Adapter GetAdapter() override;
-			virtual void* GetContext() override;
-
-			private:
-			Direct3D9* m_API;
-			Adapter m_Adapter;
-			IDirect3DDevice9Ex* m_Device;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/api-host.h Deleted

@@ -1,39 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "api-base.h"
-
-namespace Plugin {
-	namespace API {
-		class Host : public IAPI {
-			public:
-			virtual std::string GetName() override;
-			virtual Type GetType() override;
-			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
-		};
-
-		class HostInstance : public Instance {
-			public:
-			virtual Adapter GetAdapter() override;
-			virtual void* GetContext() override;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/api-opengl.h Deleted

@@ -1,53 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "api-base.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <gl/GL.h>
-
-namespace Plugin {
-	namespace API {
-		class OpenGL : public IAPI {
-			public:
-			OpenGL();
-			~OpenGL();
-
-			virtual std::string GetName() override;
-			virtual Type GetType() override;
-			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
-		};
-
-		class OpenGLInstance : public Instance {
-			public:
-			OpenGLInstance();
-			~OpenGLInstance();
-
-			virtual Adapter GetAdapter() override;
-			virtual void* GetContext() override;
-
-			private:
-			Adapter adapter;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/enc-h264.h Deleted

@@ -1,63 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "amf-encoder-h264.h"
-#include "plugin.h"
-
-namespace Plugin {
-	namespace Interface {
-		class H264Interface {
-			public:
-			static void encoder_register();
-			static const char* get_name(void* type_data);
-			static void get_defaults(obs_data_t *settings);
-			static obs_properties_t* get_properties(void* data);
-
-			static bool properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
-
-			static void* create(obs_data_t* settings, obs_encoder_t* encoder);
-			static void destroy(void* data);
-			static bool update(void *data, obs_data_t *settings);
-			static bool encode(void *data, struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet);
-			static void get_video_info(void *data, struct video_scale_info *info);
-			static bool get_extra_data(void *data, uint8_t** extra_data, size_t* size);
-
-			//////////////////////////////////////////////////////////////////////////
-			// Module Code
-			//////////////////////////////////////////////////////////////////////////
-			public:
-
-			H264Interface(obs_data_t* settings, obs_encoder_t* encoder);
-			~H264Interface();
-
-			bool update(obs_data_t* settings);
-			bool encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet);
-			void get_video_info(struct video_scale_info* info);
-			bool get_extra_data(uint8_t** extra_data, size_t* size);
-
-			//////////////////////////////////////////////////////////////////////////
-			// Storage
-			//////////////////////////////////////////////////////////////////////////
-			private:
-			std::unique_ptr<Plugin::AMD::EncoderH264> m_VideoEncoder;
-			obs_encoder_t* m_Encoder;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/enc-h265.h Deleted

@@ -1,63 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "amf-encoder-h265.h"
-#include "plugin.h"
-
-namespace Plugin {
-	namespace Interface {
-		class H265Interface {
-			public:
-			static void encoder_register();
-			static const char* get_name(void* type_data);
-			static void get_defaults(obs_data_t *data);
-			static obs_properties_t* get_properties(void* ptr);
-
-			static bool properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
-
-			static void* create(obs_data_t* settings, obs_encoder_t* encoder);
-			static void destroy(void* ptr);
-			static bool update(void *ptr, obs_data_t *data);
-			static bool encode(void *ptr, struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet);
-			static void get_video_info(void *ptr, struct video_scale_info *info);
-			static bool get_extra_data(void *ptr, uint8_t** extra_data, size_t* size);
-
-			//////////////////////////////////////////////////////////////////////////
-			// Module Code
-			//////////////////////////////////////////////////////////////////////////
-			public:
-
-			H265Interface(obs_data_t* data, obs_encoder_t* encoder);
-			~H265Interface();
-
-			bool update(obs_data_t* data);
-			bool encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet);
-			void get_video_info(struct video_scale_info* info);
-			bool get_extra_data(uint8_t** extra_data, size_t* size);
-
-			//////////////////////////////////////////////////////////////////////////
-			// Storage
-			//////////////////////////////////////////////////////////////////////////
-			private:
-			std::unique_ptr<Plugin::AMD::EncoderH265> m_VideoEncoder;
-			obs_encoder_t* m_Encoder;
-		};
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/plugin.h Deleted

@@ -1,101 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include <inttypes.h>
-
-#define NOMINMAX
-#define NOINOUT
-
-#pragma warning (push)
-#pragma warning (disable: 4201)
-#include "libobs/obs-module.h"
-#include "libobs/util/platform.h"
-#pragma warning (pop)
-
- // Plugin
-#define PLUGIN_NAME				"AMD Advanced Media Framework"
-#include "Version.h"
-
-#define PLOG(level, ...)		blog(level, "[AMF] " __VA_ARGS__);
-#define PLOG_ERROR(...)			PLOG(LOG_ERROR,   __VA_ARGS__)
-#define PLOG_WARNING(...)		PLOG(LOG_WARNING, __VA_ARGS__)
-#define PLOG_INFO(...)			PLOG(LOG_INFO,    __VA_ARGS__)
-#define PLOG_DEBUG(...)			PLOG(LOG_DEBUG,   __VA_ARGS__)
-
-// Utility
-#define vstr(s) dstr(s)
-#define dstr(s) #s
-
-#define clamp(val,low,high) (val > high ? high : (val < low ? low : val))
-#ifdef max
-#undef max
-#endif
-#define max(val,high) (val > high ? val : high)
-#ifdef min
-#undef min
-#endif
-#define min(val,low ) (val < low  ? val  : low)
-
-#ifdef IN
-#undef IN
-#endif
-#define IN
-#ifdef OUT
-#undef OUT
-#endif
-#define OUT
-
-#ifdef _WIN64
-#define BIT_STR "64"
-#else
-#define BIT_STR "32"
-#endif
-
-#define QUICK_FORMAT_MESSAGE(var, ...) std::string var = ""; { \
-		std::vector<char> QUICK_FORMAT_MESSAGE_buf(1024); \
-		snprintf(QUICK_FORMAT_MESSAGE_buf.data(), QUICK_FORMAT_MESSAGE_buf.size(), __VA_ARGS__); \
-		var = std::string(QUICK_FORMAT_MESSAGE_buf.data()); \
-	}
-
-#ifndef __FUNCTION_NAME__
-#if defined(_WIN32) || defined(_WIN64)   //WINDOWS
-#define __FUNCTION_NAME__   __FUNCTION__
-#else          //*NIX
-#define __FUNCTION_NAME__   __func__
-#endif
-#endif
-
-enum class Presets : int8_t {
-	None = -1,
-	ResetToDefaults = 0,
-	Recording,
-	HighQuality,
-	Indistinguishable,
-	Lossless,
-	Twitch,
-	YouTube,
-};
-
-enum class ViewMode : uint8_t {
-	Basic,
-	Advanced,
-	Expert,
-	Master
-};

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/strings.h Deleted

@@ -1,162 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "plugin.h"
-#include "utility.h"
-
-#define P_TRANSLATE(x)				Utility::obs_module_text_multi(x)
-#define P_DESC(x)				x ".Description"
-
-// Shared
-#define P_VERSION				"Version"
-#define P_UTIL_DEFAULT				"Utility.Default"
-#define P_UTIL_AUTOMATIC			"Utility.Automatic"
-#define P_UTIL_MANUAL				"Utility.Manual"
-#define P_UTIL_SWITCH_DISABLED			"Utility.Switch.Disabled"
-#define P_UTIL_SWITCH_ENABLED			"Utility.Switch.Enabled"
-
-// Presets
-#define P_PRESET				"Preset"
-#define P_PRESET_RESETTODEFAULTS		"Preset.ResetToDefaults"
-#define P_PRESET_RECORDING			"Preset.Recording"
-#define P_PRESET_HIGHQUALITY			"Preset.HighQuality"
-#define P_PRESET_INDISTINGUISHABLE		"Preset.Indistinguishable"
-#define P_PRESET_LOSSLESS			"Preset.Lossless"
-#define P_PRESET_TWITCH				"Preset.Twitch"
-#define P_PRESET_YOUTUBE			"Preset.YouTube"
-
-// Static
-//#define P_USAGE				"Usage"
-//#define P_USAGE_TRANSCODING			"Usage.Transcoding"
-//#define P_USAGE_ULTRALOWLATENCY		"Usage.UltraLowLatency"
-//#define P_USAGE_LOWLATENCY			"Usage.LowLatency"
-//#define P_USAGE_WEBCAM			"Usage.Webcam"
-#define P_QUALITYPRESET				"QualityPreset"
-#define P_QUALITYPRESET_SPEED			"QualityPreset.Speed"
-#define P_QUALITYPRESET_BALANCED		"QualityPreset.Balanced"
-#define P_QUALITYPRESET_QUALITY			"QualityPreset.Quality"
-#define P_PROFILE				"Profile"
-#define P_PROFILELEVEL				"ProfileLevel"
-#define P_TIER					"Tier"
-#define P_ASPECTRATIO				"AspectRatio"
-#define P_CODINGTYPE				"CodingType"
-#define P_CODINGTYPE_CABAC			"CodingType.CABAC"
-#define P_CODINGTYPE_CAVLC			"CodingType.CAVLC"
-#define P_MAXIMUMREFERENCEFRAMES		"MaximumReferenceFrames"
-
-// Rate Control
-#define P_RATECONTROLMETHOD			"RateControlMethod"
-#define P_RATECONTROLMETHOD_CQP			"RateControlMethod.CQP"
-#define P_RATECONTROLMETHOD_CBR			"RateControlMethod.CBR"
-#define P_RATECONTROLMETHOD_VBR			"RateControlMethod.VBR"
-#define P_RATECONTROLMETHOD_VBRLAT		"RateControlMethod.VBRLAT"
-#define P_PREPASSMODE				"PrePassMode"
-#define P_PREPASSMODE_QUARTER			"PrePassMode.Quarter"
-#define P_PREPASSMODE_HALF			"PrePassMode.Half"
-#define P_PREPASSMODE_FULL			"PrePassMode.Full"
-#define P_BITRATE_TARGET			"Bitrate.Target"
-#define P_BITRATE_PEAK				"Bitrate.Peak"
-#define P_QP_MINIMUM				"QP.Minimum" // H264
-#define P_QP_MAXIMUM				"QP.Maximum" // H264
-#define P_QP_IFRAME				"QP.IFrame"
-#define P_QP_IFRAME_MINIMUM			"QP.IFrame.Minimum" // H265
-#define P_QP_IFRAME_MAXIMUM			"QP.IFrame.Maximum" // H265
-#define P_QP_PFRAME				"QP.PFrame"
-#define P_QP_PFRAME_MINIMUM			"QP.PFrame.Minimum" // H265
-#define P_QP_PFRAME_MAXIMUM			"QP.PFrame.Maximum" // H265
-#define P_QP_BFRAME				"QP.BFrame" // H264
-#define P_FILLERDATA				"FillerData"
-#define P_FRAMESKIPPING				"FrameSkipping"
-#define P_FRAMESKIPPING_PERIOD			"FrameSkipping.Period"
-#define P_FRAMESKIPPING_BEHAVIOUR		"FrameSkipping.Behaviour"
-#define P_FRAMESKIPPING_SKIPNTH			"FrameSkipping.SkipNth"
-#define P_FRAMESKIPPING_KEEPNTH			"FrameSkipping.KeepNth"
-#define P_VBAQ					"VBAQ"
-#define P_ENFORCEHRD				"EnforceHRD"
-
-// VBV Buffer
-#define P_VBVBUFFER				"VBVBuffer"
-#define P_VBVBUFFER_SIZE			"VBVBuffer.Size"
-#define P_VBVBUFFER_STRICTNESS			"VBVBuffer.Strictness"
-#define P_VBVBUFFER_INITIALFULLNESS		"VBVBuffer.InitialFullness"
-
-// Picture Control
-#define P_INTERVAL_KEYFRAME			"Interval.Keyframe"
-#define P_PERIOD_IDR_H264			"Period.IDR.H264" // H264
-#define P_PERIOD_IDR_H265			"Period.IDR.H265" // H265
-#define P_INTERVAL_IFRAME			"Interval.IFrame"
-#define P_PERIOD_IFRAME				"Period.IFrame"
-#define P_INTERVAL_PFRAME			"Interval.PFrame"
-#define P_PERIOD_PFRAME				"Period.PFrame"
-#define P_INTERVAL_BFRAME			"Interval.BFrame"
-#define P_PERIOD_BFRAME				"Period.BFrame"
-#define P_GOP_TYPE				"GOP.Type" // H265
-#define P_GOP_TYPE_FIXED			"GOP.Type.Fixed" // H265
-#define P_GOP_TYPE_VARIABLE			"GOP.Type.Variable" // H265
-#define P_GOP_SIZE				"GOP.Size" // H265
-#define P_GOP_SIZE_MINIMUM			"GOP.Size.Minimum" // H265
-#define P_GOP_SIZE_MAXIMUM			"GOP.Size.Maximum" // H265
-#define P_GOP_ALIGNMENT				"GOP.Alignment"	// Both?
-#define P_BFRAME_PATTERN			"BFrame.Pattern" // H264
-#define P_BFRAME_DELTAQP			"BFrame.DeltaQP" // H264
-#define P_BFRAME_REFERENCE			"BFrame.Reference" // H264
-#define P_BFRAME_REFERENCEDELTAQP		"BFrame.ReferenceDeltaQP" // H264
-#define P_DEBLOCKINGFILTER			"DeblockingFilter"
-#define P_MOTIONESTIMATION			"MotionEstimation"
-#define P_MOTIONESTIMATION_QUARTER		"MotionEstimation.Quarter"
-#define P_MOTIONESTIMATION_HALF			"MotionEstimation.Half"
-#define P_MOTIONESTIMATION_FULL			"MotionEstimation.Full"
-
-// System
-#define P_VIDEO_API				"Video.API"
-#define P_VIDEO_ADAPTER				"Video.Adapter"
-#define P_OPENCL_TRANSFER			"OpenCL.Transfer"
-#define P_OPENCL_CONVERSION			"OpenCL.Conversion"
-#define P_MULTITHREADING			"MultiThreading"
-#define P_QUEUESIZE				"QueueSize"
-#define P_DEBUG					"Debug"
-
-#define P_VIEW					"View"
-#define P_VIEW_BASIC				"View.Basic"
-#define P_VIEW_ADVANCED				"View.Advanced"
-#define P_VIEW_EXPERT				"View.Expert"
-#define P_VIEW_MASTER				"View.Master"
-
-/// Other - Missing Functionality
-//#define AMF_H264_MAXIMUMLTRFRAMES							TEXT_AMF_H264("MaximumLTRFrames")
-//#define AMF_H264_MAXIMUMLTRFRAMES_DESCRIPTION				TEXT_AMF_H264("MaximumLTRFrames.Description")
-//#define AMF_H264_MAXIMUMACCESSUNITSIZE						TEXT_AMF_H264("MaximumAccessUnitSize")
-//#define AMF_H264_MAXIMUMACCESSUNITSIZE_DESCRIPTION			TEXT_AMF_H264("MaximumAccessUnitSize.Description")
-//#define AMF_H264_HEADER_INSERTION_SPACING					TEXT_AMF_H264("HeaderInsertionSpacing")
-//#define AMF_H264_HEADER_INSERTION_SPACING_DESCRIPTION		TEXT_AMF_H264("HeaderInsertionSpacing.Description")
-//#define AMF_H264_SLICESPERFRAME								TEXT_AMF_H264("SlicesPerFrame")
-//#define AMF_H264_SLICESPERFRAME_DESCRIPTION					TEXT_AMF_H264("SlicesPerFrame.Description")
-//#define AMF_H264_SLICEMODE									TEXT_AMF_H264("SliceMode")
-//#define AMF_H264_SLICEMODE_DESCRIPTION						TEXT_AMF_H264("SliceMode.Description")
-//#define AMF_H264_MAXIMUMSLICESIZE							TEXT_AMF_H264("MaximumSliceSize")
-//#define AMF_H264_MAXIMUMSLICESIZE_DESCRIPTION				TEXT_AMF_H264("MaximumSliceSize.Description")
-//#define AMF_H264_SLICECONTROLMODE							TEXT_AMF_H264("SliceControlMode")
-//#define AMF_H264_SLICECONTROLMODE_DESCRIPTION				TEXT_AMF_H264("SliceControlMode.Description")
-//#define AMF_H264_SLICECONTROLSIZE							TEXT_AMF_H264("SliceControlSize")
-//#define AMF_H264_SLICECONTROLSIZE_DESCRIPTION				TEXT_AMF_H264("SliceControlSize.Description")
-//#define AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES				TEXT_AMF_H264("IntraRefresh.NumberOfStripes")
-//#define AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES_DESCRIPTION	TEXT_AMF_H264("IntraRefresh.NumberOfStripes.Description")
-//#define AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT			TEXT_AMF_H264("IntraRefresh.MacroblocksPerSlot")
-//#define AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT_DESCRIPTION	TEXT_AMF_H264("IntraRefresh.MacroblocksPerSlot.Description")

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Include/utility.h Deleted

@@ -1,114 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-
-#pragma once
-#include "amf.h"
-#include "amf-encoder.h"
-#include "components/VideoConverter.h"
-#include "amf-encoder-h264.h"
-#include "components/VideoEncoderVCE.h"
-#include "amf-encoder-h265.h"
-#include "components/VideoEncoderHEVC.h"
-
-namespace Utility {
-	uint64_t GetUniqueIdentifier();
-	const char *obs_module_text_multi(const char *val, uint8_t depth = (uint8_t)1);
-
-	// Codec
-	const char* CodecToString(Plugin::AMD::Codec v);
-	const wchar_t* CodecToAMF(Plugin::AMD::Codec v);
-
-	// Color Format
-	const char* ColorFormatToString(Plugin::AMD::ColorFormat v);
-	amf::AMF_SURFACE_FORMAT ColorFormatToAMF(Plugin::AMD::ColorFormat v);
-
-	// Color Space
-	const char* ColorSpaceToString(Plugin::AMD::ColorSpace v);
-	AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM ColorSpaceToAMFConverter(Plugin::AMD::ColorSpace v);
-
-	// Usage
-	const char* UsageToString(Plugin::AMD::Usage v);
-	AMF_VIDEO_ENCODER_USAGE_ENUM UsageToAMFH264(Plugin::AMD::Usage v);
-	Plugin::AMD::Usage UsageFromAMFH264(AMF_VIDEO_ENCODER_USAGE_ENUM v);
-	AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM UsageToAMFH265(Plugin::AMD::Usage v);
-	Plugin::AMD::Usage UsageFromAMFH265(AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM v);
-
-	// Quality Preset
-	const char* QualityPresetToString(Plugin::AMD::QualityPreset v);
-	AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM QualityPresetToAMFH264(Plugin::AMD::QualityPreset v);
-	Plugin::AMD::QualityPreset QualityPresetFromAMFH264(AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM v);
-	AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM QualityPresetToAMFH265(Plugin::AMD::QualityPreset v);
-	Plugin::AMD::QualityPreset QualityPresetFromAMFH265(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM v);
-
-	// Profile
-	const char* ProfileToString(Plugin::AMD::Profile v);
-	AMF_VIDEO_ENCODER_PROFILE_ENUM ProfileToAMFH264(Plugin::AMD::Profile v);
-	Plugin::AMD::Profile ProfileFromAMFH264(AMF_VIDEO_ENCODER_PROFILE_ENUM v);
-	AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM ProfileToAMFH265(Plugin::AMD::Profile v);
-	Plugin::AMD::Profile ProfileFromAMFH265(AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM v);
-
-	// Tier
-	const char* TierToString(Plugin::AMD::H265::Tier v);
-	AMF_VIDEO_ENCODER_HEVC_TIER_ENUM TierToAMFH265(Plugin::AMD::H265::Tier v);
-	Plugin::AMD::H265::Tier TierFromAMFH265(AMF_VIDEO_ENCODER_HEVC_TIER_ENUM v);
-
-	// Coding Type
-	const char* CodingTypeToString(Plugin::AMD::CodingType v);
-	AMF_VIDEO_ENCODER_CODING_ENUM CodingTypeToAMFH264(Plugin::AMD::CodingType v);
-	Plugin::AMD::CodingType CodingTypeFromAMFH264(AMF_VIDEO_ENCODER_CODING_ENUM v);
-	int64_t CodingTypeToAMFH265(Plugin::AMD::CodingType v);
-	Plugin::AMD::CodingType CodingTypeFromAMFH265(int64_t v);
-
-	// Rate Control Method
-	const char* RateControlMethodToString(Plugin::AMD::RateControlMethod v);
-	AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM RateControlMethodToAMFH264(Plugin::AMD::RateControlMethod v);
-	Plugin::AMD::RateControlMethod RateControlMethodFromAMFH264(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM v);
-	AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM RateControlMethodToAMFH265(Plugin::AMD::RateControlMethod v);
-	Plugin::AMD::RateControlMethod RateControlMethodFromAMFH265(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM v);
-
-	// Pre-Pass Method
-	const char* PrePassModeToString(Plugin::AMD::PrePassMode v);
-	AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM PrePassModeToAMFH264(Plugin::AMD::PrePassMode v);
-	Plugin::AMD::PrePassMode PrePassModeFromAMFH264(AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM v);
-
-	// GOP Type
-	const char* GOPTypeToString(Plugin::AMD::H265::GOPType v);
-	Plugin::AMD::H265::GOPType GOPTypeFromAMFH265(int64_t v);
-	int64_t GOPTypeToAMFH265(Plugin::AMD::H265::GOPType v);
-
-	// Slicing
-	const char* SliceModeToString(Plugin::AMD::H264::SliceMode v);
-	const char* SliceControlModeToString(Plugin::AMD::SliceControlMode v);
-
-	Plugin::AMD::ProfileLevel H264ProfileLevel(std::pair<uint32_t, uint32_t> resolution, std::pair<uint32_t, uint32_t> frameRate);
-	Plugin::AMD::ProfileLevel H265ProfileLevel(std::pair<uint32_t, uint32_t> resolution, std::pair<uint32_t, uint32_t> frameRate);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Threading Specific
-	//////////////////////////////////////////////////////////////////////////
-
-	#if (defined _WIN32) || (defined _WIN64)
-	void SetThreadName(uint32_t dwThreadID, const char* threadName);
-	void SetThreadName(const char* threadName);
-	void SetThreadName(std::thread* pthread, const char* threadName);
-	#else
-	void SetThreadName(std::thread* pthread, const char* threadName);
-	void SetThreadName(const char* threadName);
-	#endif
-}
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Resources Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Resources/locale Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Resources/locale/cs-CZ.ini Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Resources/locale/sv-SE.ini Deleted

@@ -1,179 +0,0 @@
-Utility.Default="Standard"
-Utility.Automatic="Automatisk"
-Utility.Manual="Manuell"
-Utility.Switch.Disabled="Inaktiverad"
-Utility.Switch.Enabled="Aktiverad"
-Preset="Förinställning"
-Preset.ResetToDefaults="Återställ till standardvärden"
-Preset.Recording="Spelar in"
-Preset.HighQuality="Hög kvalitet"
-Preset.Indistinguishable="Oskiljbar"
-Preset.Lossless="Förlustfritt"
-Preset.Twitch="Twitch"
-Preset.YouTube="YouTube"
-Usage="Användning"
-Usage.Description="Vilken användning AMF borde vara inställd på:\n- '\@Usage.Transcoding\@' är för allmän omkodning (rekommenderas),\n- '\@Usage.UltraLowLatency\@' är för omkodning med riktigt låg latens,\n- '\@Usage.LowLatency\@' liknar ovanstående men med lite högre latens.\nStrömning stöder endast '\@Usage.Transcoding\@', alla andra värden kan användas för inspelning."
-Usage.Transcoding="Omkodning"
-Usage.UltraLowLatency="Ultralåg latens"
-Usage.LowLatency="Låg latens"
-Usage.Webcam="Webbkamera"
-QualityPreset="Kvalitetsförinställning"
-QualityPreset.Description="Vilken kvalitetsmall AMF bör försöka att uppnå:\n- '\@QualityPreset.Speed\@' är den snabbaste men har den sämsta kvaliteten,\n- '\@QualityPreset.Balanced\@' är en balanserad mix av båda,\n- '\@QualityPreset.Quality\@' ger den bästa kvaliteten för en angiven bithastighet."
-QualityPreset.Speed="Hastighet"
-QualityPreset.Balanced="Balanserad"
-QualityPreset.Quality="Kvalitet"
-Profile="Profil"
-Profile.Description="Vilken profil att använda för kodning, sorteras från mest utbrett stöd till högsta kvalitet."
-ProfileLevel="Profilnivå"
-ProfileLevel.Description="Vilken profilnivå att använda för kodning, det är bäst att lämna detta på \@Utility.Automatic\@"
-Tier="Nivå"
-Tier.Description="Vilken nivå att koda på. 'Hög' siktar på hög bithastighet/bandbredd använder medan 'Huvud' siktar på mainstreammedia."
-AspectRatio="Aspektförhållande"
-AspectRatio.Description="Vilket bildförhållande som bör skrivas till utmatningsfilen."
-CodingType="Kodningstyp"
-CodingType.Description="Vilken typ av kodning som ska användas:\n* '\@Utility.Automatic\@' låter AMF bestämma (rekommenderas).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) är snabbare, men större.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) är långsammare, men mindre."
-MaximumReferenceFrames="Maximalt antal referensbildrutor"
-MaximumReferenceFrames.Description="Hur många bildrutor kodaren kan referera som mest under kodning, påverkar kodningskvalitet avsevärt."
-RateControlMethod="Hastighetskontrollmetod"
-RateControlMethod.Description="Vilken hastighetskontrollmetod som ska användas:\n- '\@RateControlMethod.CQP\@' tilldelar fasta QP-värden för I-/P-/B-bildrutor,\n- '\@RateControlMethod.CBR\@' stannar vid angiven målbithastighet (med hjälp av Fyllningsdata) (rekommenderas för strömning),\n- '\@RateControlMethod.VBR\@' stannar under angiven bithastighetsgräns,\n- '\@RateControlMethod.VBRLAT\@' stannar nära målbithastigheten om grafikprocessorns latens och läsning tillåter det, annars kommer högre bithastighet användas (rekommenderas för inspelning)."
-RateControlMethod.CQP="Konstant QP (CQP)"
-RateControlMethod.CBR="Konstant bithastighet (CBR)"
-RateControlMethod.VBR="Varierande bithastighet (begränsat maxvärde) (VBR_LAT)"
-RateControlMethod.VBRLAT="Varierande bithastighet (begränsad latens) (VBR_LAT)"
-PrePassMode="Förpassläge"
-PrePassMode.Description="Förpass är en sekundär fördelning av bithastighet som gör det möjligt att fördela bithastigheten inom en sekvens, men resultatet kan variera för varje grafikkort."
-PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (kvarts storlek)"
-PrePassMode.Half="\@Utility.Switch.Enabled\@ (halv storlek)"
-PrePassMode.Full="\@Utility.Switch.Enabled\@ (full storlek)"
-Bitrate.Target="Målbithastighet"
-Bitrate.Target.Description="Bithastighet att försöka uppnå i den övergripande sekvensen."
-Bitrate.Peak="Maximal bithastighet"
-Bitrate.Peak.Description="Bithastighet att maximalt försöka uppnå i den övergripande sekvensen."
-QP.IFrame="QP för I-bildrutor"
-QP.IFrame.Description="Konstant QP-värde att använda för I-bildrutor."
-QP.PFrame="QP för P-bildrutor"
-QP.PFrame.Description="Konstant QP-värde att använda för P-bildrutor."
-QP.BFrame="QP för B-bildrutor"
-QP.BFrame.Description="Konstant QP-värde att använda för B-bildrutor."
-QP.Minimum="Minimal QP"
-QP.Minimum.Description="Lägsta QP-värde att använda i en bildruta."
-QP.IFrame.Minimum="Minimalt QP för I-bildrutor"
-QP.IFrame.Minimum.Description="Lägsta QP-värde att använda i en I-bildruta."
-QP.PFrame.Minimum="Minimalt QP för P-bildrutor"
-QP.PFrame.Minimum.Description="Lägsta QP-värde att använda i en P-bildruta."
-QP.Maximum="Maximal QP"
-QP.Maximum.Description="Högsta QP-värde att använda i en bildruta."
-QP.IFrame.Maximum="Maximalt QP för I-bildrutor"
-QP.IFrame.Maximum.Description="Högsta QP-värde att använda i en I-bildruta."
-QP.PFrame.Maximum="Maximalt QP för P-bildrutor"
-QP.PFrame.Maximum.Description="Högsta QP-värde att använda i en P-bildruta."
-FillerData="Fyllningsdata"
-FillerData.Description="Fyllningsdata låter kodaren behålla minst \@Bitrate.Target\@ genom att fylla upp det återstående utrymmet i en sekvens med tom information."
-FrameSkipping="Hoppa över bildrutor"
-FrameSkipping.Description="Hoppa över bildrutor låter kodaren släppa bildrutor för att möta kraven för \@Bitrate.Target\@.\nNär kodaren släpper en bildruta infogar den istället en NAL som upprepar senaste bildrutan i strömmen.\nKan hjälpa när kraven för \@Bitrate.Target\@ är riktigt låga."
-FrameSkipping.Period="Period för att hoppa över bildrutor"
-FrameSkipping.Period.Description="Intervall (i bildrutor) mellan överhoppade bildrutor. Detta kan användas för att simulera en lägre bildfrekvens än vad OBS är inställd på medan en giltig ström upprätthålls."
-FrameSkipping.Behaviour="Beteende för att hoppa över bildrutor"
-FrameSkipping.Behaviour.Description="Definiera hur överhoppade bildrutor beter sig."
-FrameSkipping.SkipNth="Hoppar över varje N:de bildruta"
-FrameSkipping.KeepNth="Behåller endast varje N:de bildruta"
-VBAQ="VBAQ"
-VBAQ.Description="Aktiverar användning av \"Variance Based Adaptive Quantization\" (VBAQ) som baseras på bildpunktsvariation för att fördela bithastigheten bättre.\nDet bygger på idén att människans syn är mindre känslig för artefakter i områden med hög textur och kommer därför driva bithastigheten mot mjukare ytor.\nNär detta aktiveras kan det leda till förbättringar i subjektiv kvalitet för en del innehåll."
-EnforceHRD="Tvinga HRD"
-EnforceHRD.Description="Tvingar användning av en hypotetisk referensavkodare som används för att verifiera att utmatningens bitström är korrekt."
-VBVBuffer="VBV-buffert"
-VBVBuffer.Description="Vilken metod som ska användas för att bestämma VBV-buffertens storlek:\n- '\@Utlity.Automatic\@' beräknar storleken med hjälp av en strikt begränsning,\n- '\@Utlity.Manual\@' låter användaren kontrollera storleken.\nVBV-buffertern (Video Buffering Verifier) används av vissa Rate Control Methods för att hålla den övergripande bithastigheten inom de angivna begränsningarna."
-VBVBuffer.Strictness="Noggrannhet för VBV-buffert"
-VBVBuffer.Strictness.Description="Bestämmer noggrannheten för VBV-bufferten, där 100% är så noggrann som möjligt och 0% är gränslös."
-VBVBuffer.Size="VBV-buffertstorlek"
-VBVBuffer.Size.Description="Storleken för VBV-bufferten som används för bithastighetskontroll i en sekvens."
-VBVBuffer.InitialFullness="VBV-buffertens ursprungliga fyllnad"
-VBVBuffer.InitialFullness.Description="Hur full VBV-bufferten är från början (i %), kommer endast påverka den inledande kodningssekvensen."
-Interval.Keyframe="Intervall för keyframes"
-Interval.Keyframe.Description="Intervall (i sekunder) mellan keyframes."
-Period.IDR.H264="IDR-period (i bildrutor)"
-Period.IDR.H264.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i bildrutor."
-Period.IDR.H265="IDR-period (i GOP)"
-Period.IDR.H265.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i GOP."
-Interval.IFrame="Intervall för I-bildrutor"
-Interval.IFrame.Description="Intervall (i sekunder) mellan I-bildrutor. I-bildrutor överstrider P-bildrutor och B-bildrutor."
-Period.IFrame="Period för I-bildrutor (i bildrutor)"
-Period.IFrame.Description="Avstånd (i bildrutor) mellan I-bildrutor. I-bildrutor överstrider P-bildrutor och B-bildrutor."
-Interval.PFrame="Intervall för P-bildrutor"
-Interval.PFrame.Description="Intervall (i sekunder) mellan P-bildrutor. P-bildrutor överstrider B-bildrutor."
-Period.PFrame="Period för P-bildrutor (i bildrutor)"
-Period.PFrame.Description="Avstånd (i bildrutor) mellan P-Frames. P-Frame överstrider B-Frames."
-Interval.BFrame="Intervall för B-bildrutor"
-Interval.BFrame.Description="Intervall (i sekunder) mellan B-bildrutor."
-Period.BFrame="Period för B-bildrutor (i bildrutor)"
-Period.BFrame.Description="Avstånd (i bildrutor) mellan B-bildrutor."
-GOP.Type="GOP-typ"
-GOP.Type.Description="Vilken typ av GOP bör användas:\n- '\@GOP.Type.Fixed\@' kommer alltid använda fasta avstånd mellan varje GOP.\n- '\@GOP.Type.Variable\@' tillåter GOP i olika storlekar, beroende på vad som behövs.\n'\@GOP.Type.Fixed\@' är hur H264-implementeringen fungerar och är bäst för lokal nätverksströmning, medan '\@GOP.Type.Variable\@' är bäst för korta inspelningar i hög kvalitet."
-GOP.Type.Fixed="Konstant"
-GOP.Type.Variable="Variabel"
-GOP.Size="GOP-storlek"
-GOP.Size.Description="Storleken för en GOP (Group Of Pictures) i bildrutor."
-GOP.Size.Minimum="Minimal GOP-storlek"
-GOP.Size.Minimum.Description="Minimal storlek för en GOP (Group Of Pictures) i bildrutor."
-GOP.Size.Maximum="Maximal GOP-storlek"
-GOP.Size.Maximum.Description="Maximal storlek för en GOP (Group Of Pictures) i bildrutor."
-GOP.Alignment="GOP-justering"
-GOP.Alignment.Description="Experimentell. Bieffekterna är okända. Använd på egen risk."
-BFrame.Pattern="Mönster för B-bildrutor"
-BFrame.Pattern.Description="Antalet B-bildrutor att använda under kodning.\nStöds av andra och tredje generationens VCE-kort. Påverkar kodningsprestandan negativt."
-BFrame.DeltaQP="Delta QP för B-bildrutor"
-BFrame.DeltaQP.Description="Delta QP-värde till den sista I- eller P-bildrutan för icke-referensbara B-bildrutor."
-BFrame.Reference="Referens för B-bildrutor"
-BFrame.Reference.Description="Låt en B-bildruta också använda B-bildrutor som referens, i stället för bara P- och I-bildrutor."
-BFrame.ReferenceDeltaQP="Delta QP för referens för B-bildrutor"
-BFrame.ReferenceDeltaQP.Description="Delta QP-värde till den sista I- eller P-bildrutan för referensbara B-bildrutor."
-DeblockingFilter="Avblockningsfilter"
-DeblockingFilter.Description="Låter kodaren tillämpa ett avblockeringsfilter."
-MotionEstimation="Rörelseuppskattning"
-MotionEstimation.Description="Rörelseuppskattning låter kodaren reducera nödvändig bithastighet genom att uppskatta var en bildpunkt förflyttas."
-MotionEstimation.Quarter="Fjärdedels bildpunkt"
-MotionEstimation.Half="Halv bildpunkt"
-MotionEstimation.Full="Fjärdedels och halv bildpunkt"
-Video.API="Video-API"
-Video.API.Description="Vilket API bör användas av backend?"
-Video.Adapter="Grafikkort"
-Video.Adapter.Description="På vilken adapter bör vi försöka koda på?"
-OpenCL.Transfer="OpenCL-överföring"
-OpenCL.Transfer.Description="Överför bildrutan till grafikprocessorn med OpenCL istället för mappat minnet. Överföring via OpenCL är mindre oregelbunden än överföring via mappat minne när grafikprocessorn används."
-OpenCL.Conversion="OpenCL-konvertering"
-OpenCL.Conversion.Description="Konvertera bildrutan i grafikprocessorn med OpenCL istället för DirectCompute."
-MultiThreading="Flertrådning"
-MultiThreading.Description="Använd fler än en tråd för att hantera sändningar av bildrutor och hämtning av paket. Detta kan hjälpa långsammare processorer, men använder mer övergripande systemresurser. Den kommer att påverka prestandan negativt på långsammare processorer."
-QueueSize="Köstorlek"
-QueueSize.Description="Kölägg så många bildrutor för kodaren innan försök att hämta paket göra. Ett högre värde leder till mer latens medan ett lägre värde kan orsaka överlastad kodning. Det rekommenderas inte att ändra detta från standardvärdet."
-View="Visningsläge"
-View.Description="Vilka egenskaper bör visas?\nOm '\@View.Master\@' används kommer du inte få någon hjälp."
-View.Basic="Grundläggande"
-View.Advanced="Avancerat"
-View.Expert="Expert"
-View.Master="Mästare"
-Debug="Felsök"
-Debug.Description="Aktivera ytterligare felsökningsmeddelanden. Kräver att du kör Open Broadcaster Software Studio med kommandoraden \"--verbose --log_unfiltered\" (utan citationstecken)."
-AMF.H264.MaximumLTRFrames="Maximalt antal LTR-bildrutor"
-AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) är en funktion som låter kodaren flagga vissa bildrutor i en sekvens som referensbar för en lång tid.\nLTR-bildrutor kan inte användas med B-bildrutor och kodaren kommer att inaktivera B-bildrutor om de används."
-AMF.H264.MaximumAccessUnitSize="Maximal storlek på åtkomstenhet"
-AMF.H264.MaximumAccessUnitSize.Description="Största storleken på en åtkomstenhet för en NAL."
-AMF.H264.HeaderInsertionSpacing="Avstånd för headerinmatning"
-AMF.H264.HeaderInsertionSpacing.Description="Hur många bildrutor som borde vara mellan NAL-headers."
-AMF.H264.WaitForTask="Väntar på arbetsuppgifter"
-AMF.H264.WaitForTask.Description="Okänd, experimentell"
-AMF.H264.SlicesPerFrame="Segment per bildruta"
-AMF.H264.SlicesPerFrame.Description="Hur många I-bildrutesegment bör lagras i varje bildruta?\nEtt värde på noll låter kodaren bestämma dynamiskt.\nIntra-uppdaterande kodning används för snabbare uppspelning och sökning."
-AMF.H264.SliceMode="Slice-läge"
-AMF.H264.SliceMode.Description="Okänd, experimentell"
-AMF.H264.MaximumSliceSize="Maximal segmentstorlek"
-AMF.H264.MaximumSliceSize.Description="Okänd, experimentell"
-AMF.H264.SliceControlMode="Segmentkontrolläge"
-AMF.H264.SliceControlMode.Description="Okänd, experimentell"
-AMF.H264.SliceControlSize="Segmentkontrollstorlek"
-AMF.H264.SliceControlSize.Description="Okänd, experimentell"
-AMF.H264.IntraRefresh.NumberOfStripes="Intra-uppdatera antal linjer"
-AMF.H264.IntraRefresh.NumberOfStripes.Description="Okänd, experimentell"
-AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-uppdatera makroblock per plats"
-AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Hur många Macroblock bör lagras i varje plats?\nEtt värde på 0 inaktiverar denna funktion.\nIntra-uppdaterande kodning används för snabbare uppspelning och sökning."
-

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Resources/locale/zh-CN.ini Deleted

@@ -1,179 +0,0 @@
-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"
-Usage="使用"
-Usage.Description="AMF 应调整为什么用法:\n-'\@Usage.Transcoding\@' 是通用转码(推荐),\n- '\@Usage.UltraLowLatency\@' 用于真正低延迟编码,\n-'\@Usage.LowLatency\@' 类似于上面稍高的延迟.\n 推流仅支持 '\@Usage.Transcoding\@', 所有其他值可以用于录制."
-Usage.Transcoding="转码"
-Usage.UltraLowLatency="超低延迟"
-Usage.LowLatency="低延迟"
-Usage.Webcam="网络摄像头"
-QualityPreset="质量预设"
-QualityPreset.Description="质量预设 AMF 应尝试向目标:\n-'\@QualityPreset.Speed\@' 是最快但最差的质量,\n-'\@QualityPreset.Balanced\@' 是平衡两者的混合,\n-'\@QualityPreset.Quality\@' 给出了最好的质量为给定的比特率."
-QualityPreset.Speed="速度"
-QualityPreset.Balanced="平衡"
-QualityPreset.Quality="质量"
-Profile="配置文件"
-Profile.Description="什么配置文件进行编码. 从最佳支持(顶部) 到最好的质量(底部) 排序."
-ProfileLevel="配置等级"
-ProfileLevel.Description="要使用哪些配置文件级别. 最好设置在 \@Utility.Automatic\@."
-Tier="层"
-Tier.Description="要在编码在哪一层. '高' 目标高的比特率/带宽使用, 而 '主' 针对主流媒体."
-AspectRatio="长宽比"
-AspectRatio.Description="哪个长宽比应写入输出文件."
-CodingType="编码类型"
-CodingType.Description="使用哪种编码类型:\n* '\@Utility.Automatic\@' 让 AMF 决定(推荐).\n* 'CALVC'(上下文自适应可变长度编码) 速度更快但是更大.\n* 'CABAC'(上下文自适应二进制算术编码)速度更慢, 但是更小."
-MaximumReferenceFrames="最大参考帧"
-MaximumReferenceFrames.Description="在大多数编码时多少帧编码器可能会引用, 对编码质量有直接影响."
-RateControlMethod="速率控制方法"
-RateControlMethod.Description="应该使用什么比率控制方法:\n- '\@RateControlMethod.CQP\@' 赋值固定的 I/P/B 帧 QP(量化参数) 值,\n- '\@RateControlMethod.CBR\@' 保持在一个给定的目标比特率(使用过滤数据)(推荐用于推流),\n- '\@RateControlMethod.VBR\@' 保持在给定的峰值比特率以下,\n- '\@RateControlMethod.VBRLAT\@' 保持接近目标比特率如果 GPU 延迟和负载, 否则将会使用更高的比特率(推荐用于录制)."
-RateControlMethod.CQP="恒定 QP (CQP)"
-RateControlMethod.CBR="固定比特率 (CBR)"
-RateControlMethod.VBR="变比特率 (峰值约束) (VBR)"
-RateControlMethod.VBRLAT="变比特率 (延迟约束) (VBR_LAT)"
-PrePassMode="前通模式"
-PrePassMode.Description="前通是次选的比特率发行通过, 允许更好发行在一个序列内的比特率, 然而效果可能会随着不同的卡而不同."
-PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (四分之一大小)"
-PrePassMode.Half="\@Utility.Switch.Enabled\@ (半尺寸)"
-PrePassMode.Full="\@Utility.Switch.Enabled\@ (全尺寸)"
-Bitrate.Target="目标比特率"
-Bitrate.Target.Description="尝试在整个序列中获取的比特率."
-Bitrate.Peak="峰值比特率"
-Bitrate.Peak.Description="尝试在整个序列中最大获取的比特率."
-QP.IFrame="I 帧 QP"
-QP.IFrame.Description="用于 I 帧的固定的 QP 值."
-QP.PFrame="P 帧 QP"
-QP.PFrame.Description="用于 P 帧的固定 QP 值."
-QP.BFrame="B 帧 QP"
-QP.BFrame.Description="用于 B 帧的固定的 QP 值."
-QP.Minimum="最低 QP"
-QP.Minimum.Description="在一个 I 帧中使用的最低 QP 值."
-QP.IFrame.Minimum="最小 I-帧 QP"
-QP.IFrame.Minimum.Description="在一个 I 帧中使用的最低 QP 值."
-QP.PFrame.Minimum="最小 I-帧 QP"
-QP.PFrame.Minimum.Description="在一个 P 帧中使用的最低 QP 值."
-QP.Maximum="最高 QP"
-QP.Maximum.Description="在一个帧中使用的最高 QP 值."
-QP.IFrame.Maximum="最大 I-帧 QP"
-QP.IFrame.Maximum.Description="在一个 I 帧中使用的最高 QP 值."
-QP.PFrame.Maximum="最大的 P 帧 QP"
-QP.PFrame.Maximum.Description="在一个 P 帧中使用的最高 QP 值."
-FillerData="填充数据"
-FillerData.Description="启用填充数据允许编码器至少保持 \@Bitrate.Target\@, 通过填满空信息序列中的剩余空间."
-FrameSkipping="跳过的帧"
-FrameSkipping.Description="跳过的帧允许编码器下丢帧, 以满足\@Bitrate.Target\@ 要求.\n当编码器丢帧时, 它反而插入一个重复最后一帧的 NAL 到流中.\n可以帮助非常低的\@Bitrate.Target\@."
-FrameSkipping.Period="跳过帧周期"
-FrameSkipping.Period.Description="跳过帧之间的间隔(以帧). 这个用来仿真比 OBS 设置的低的帧率同时仍然有一个合法的流."
-FrameSkipping.Behaviour="跳帧行为"
-FrameSkipping.Behaviour.Description="定义跳帧的处理方式."
-FrameSkipping.SkipNth="跳过每第 N 帧"
-FrameSkipping.KeepNth="保持每第 N 帧"
-VBAQ="VBAQ"
-VBAQ.Description="启用'基于方差的自适应量化'(VBAQ), 基于像素的方差来更好地区分比特率.\n他基于原理人类的视觉系统是对高纹理的物体不敏感, 因而将推动比特率来实现更平滑的界面.\n启用这个可能会导致某些内容的主观质量的改善."
-EnforceHRD="强制 HRD"
-EnforceHRD.Description="强制使用假设的参考解码器, 用于验证输出码流是否正确."
-VBVBuffer="VBV 缓存"
-VBVBuffer.Description="应使用什么方法来确定 VBV 缓冲区大小:\n-'\@Utlity.Automatic\@' 计算使用严格约束的大小,\n- '\@Utlity.Manual\@' 允许用户控制大小.\nVBV缓存 (视频缓冲程序验证程序) 用于某些率控制方法来保持整体的比特率在给定的约束内."
-VBVBuffer.Strictness="VBV 缓存规范性"
-VBVBuffer.Strictness.Description="决定 VBV 缓存的严格性, 100% 表示尽可能严格, 0% 表示无限制."
-VBVBuffer.Size="VBV 缓存大小"
-VBVBuffer.Size.Description="用于在一个序列中的控制比特率的 VBV 缓存的大小."
-VBVBuffer.InitialFullness="VBV 缓冲区初始满"
-VBVBuffer.InitialFullness.Description="VBV 缓存最初应该多满(百分比), 将只会影响最初的序列的编码."
-Interval.Keyframe="关键帧间隔"
-Interval.Keyframe.Description="关键帧之间间隔(以秒为单位)."
-Period.IDR.H264="IDR 周期 (以帧)"
-Period.IDR.H264.Description="定义瞬时解码刷新 (IDR) 的距离以帧为单位."
-Period.IDR.H265="IDR 周期 (以 GOP 为单位)"
-Period.IDR.H265.Description="定义瞬时解码刷新 (IDR) 的距离以 GOP 为单位."
-Interval.IFrame="关键帧间隔"
-Interval.IFrame.Description="I 帧间隔 (以秒为单位). I 帧覆盖 P 帧和 B 帧."
-Period.IFrame="关键帧周期 (以帧)"
-Period.IFrame.Description="I 帧间隔 (以帧为单位). I 帧覆盖 P 帧和 B 帧."
-Interval.PFrame="P 帧间隔"
-Interval.PFrame.Description="P 帧间隔 (以秒为单位). P 帧覆盖 B 帧."
-Period.PFrame="P 帧周期 (以帧为单位)"
-Period.PFrame.Description="P 帧之间距离 (以帧为单位). P 帧覆盖 B 帧."
-Interval.BFrame="B 帧间隔"
-Interval.BFrame.Description="B 帧之间间隔(以秒为单位)."
-Period.BFrame="B 帧间隔(以帧)"
-Period.BFrame.Description="B 帧直接的距离(以帧)."
-GOP.Type="GOP 类型"
-GOP.Type.Description="应使用哪种类型的 GOP:\n-'\@GOP.Type.Fixed\@' 将始终使用固定的每个 GOP 之间的距离之.\n-'\@GOP.Type.Variable\@' 允许 GOPs 为不同值, 取决于什么是需要的.\n'\@GOP.Type.Fixed\@' 是 H264 实现如何工作和最好的本地网络推流, 而 '\@GOP.Type.Variable\@' 是最适合低大小高品质的录像."
-GOP.Type.Fixed="固定的"
-GOP.Type.Variable="可变的"
-GOP.Size="GOP 大小"
-GOP.Size.Description="帧中最大的 GOP (Group Of Pictures) 大小"
-GOP.Size.Minimum="GOP 大小最小值"
-GOP.Size.Minimum.Description="帧中最小的 GOP (Group Of Pictures) 大小"
-GOP.Size.Maximum="GOP 大小最大值"
-GOP.Size.Maximum.Description="帧中最大的 GOP (Group Of Pictures) 大小"
-GOP.Alignment="GOP 对齐"
-GOP.Alignment.Description="实验, 效果是未知. 使用风险由自己负责."
-BFrame.Pattern="B 帧模式"
-BFrame.Pattern.Description="在编码时使用多少 B 帧.\n2 代和 3 代 VCE 卡支持. 对编码性能有负面影响."
-BFrame.DeltaQP="B 帧差值 QP"
-BFrame.DeltaQP.Description="对于非参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
-BFrame.Reference="B 帧参考"
-BFrame.Reference.Description="允许 B 帧也使用 B 帧作为参考, 而不是只是 P 和 I 帧."
-BFrame.ReferenceDeltaQP="B 帧参考差值 QP"
-BFrame.ReferenceDeltaQP.Description="对于参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
-DeblockingFilter="去块滤波"
-DeblockingFilter.Description="允许解码器申请去块滤波器."
-MotionEstimation="移动侦测"
-MotionEstimation.Description="运动侦测允许编码器通过预测一个像素去了哪里来降低需要的比特率."
-MotionEstimation.Quarter="四分之一像素"
-MotionEstimation.Half="半像素"
-MotionEstimation.Full="四分之一 & 半像素"
-Video.API="视频的 API"
-Video.API.Description="后端应使用什么 API?"
-Video.Adapter="视频适配器"
-Video.Adapter.Description="我们应该尝试在什么适配器上编码?"
-OpenCL.Transfer="OpenCL 转移"
-OpenCL.Transfer.Description="使用 OpenCL 来传输帧而不是映射内存. 当 GPU 被使用时, 通过 OpenCL 转移相比通过映射内存传输更少分散."
-OpenCL.Conversion="OpenCL 转换"
-OpenCL.Conversion.Description="使用 OpenCL 转换在 GPU 上的帧而不是 DirectCompute."
-MultiThreading="多线程"
-MultiThreading.Description="使用多个线程来处理提交帧和检索数据包. 这有助于在较慢的 CPU 上, 但将为整体的系统资源使用. 它将对更快的 CPU 的性能产生负面影响."
-QueueSize="队列大小"
-QueueSize.Description="在尝试检索数据包之前, 为编码器查询这些多个帧. 较高的值引入更多的延迟, 同时较低的值可能会导致超载编码. 不推荐更改此默认值."
-View="查看模式"
-View.Description="应显示哪些属性?\n使用 '\@View.Master\@' 会使你丧失获得技术支持的资格."
-View.Basic="基本"
-View.Advanced="高级"
-View.Expert="专家"
-View.Master="主"
-Debug="调试"
-Debug.Description="启用额外的调试消息. 需要你用 '--verbose --log_unfiltered'(删掉') 命令行运行打开OBS。"
-AMF.H264.MaximumLTRFrames="最大的 LTR 帧"
-AMF.H264.MaximumLTRFrames.Description="长期参考帧(LTR) 是一个特性允许编码器来标记在一个序列的一些帧作为参考帧一段时间.\nLTR 帧不能和 B 帧一起使用并且如果使用 LTR 帧, 编码器会禁用 B 帧."
-AMF.H264.MaximumAccessUnitSize="最大访问单元大小"
-AMF.H264.MaximumAccessUnitSize.Description="一个 NAL 的访问单元的最大大小. 值 0 允许编码器挑选最好的一个."
-AMF.H264.HeaderInsertionSpacing="头部插入空白"
-AMF.H264.HeaderInsertionSpacing.Description="NAL 头之间应该多少帧. 不推荐改为非零(自动) 值."
-AMF.H264.WaitForTask="等待任务"
-AMF.H264.WaitForTask.Description="未知, 实验"
-AMF.H264.SlicesPerFrame="每帧的切片数"
-AMF.H264.SlicesPerFrame.Description="每个帧应该和多少 I 帧切片一起存储?\n0 值让编码器运行时决定.\n内部刷新编码用于更快的回放和定位."
-AMF.H264.SliceMode="切片模式"
-AMF.H264.SliceMode.Description="未知, 实验"
-AMF.H264.MaximumSliceSize="最大切片大小"
-AMF.H264.MaximumSliceSize.Description="未知, 实验"
-AMF.H264.SliceControlMode="切片控制模式"
-AMF.H264.SliceControlMode.Description="未知, 实验"
-AMF.H264.SliceControlSize="切片控制大小"
-AMF.H264.SliceControlSize.Description="未知, 实验"
-AMF.H264.IntraRefresh.NumberOfStripes="帧内刷新的条纹的数目"
-AMF.H264.IntraRefresh.NumberOfStripes.Description="未知, 实验"
-AMF.H264.IntraRefresh.MacroblocksPerSlot="每个插槽的帧内刷新宏"
-AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="每个槽应该和多少宏块一起存储?\n0 值让编码器在运行时决定.\n帧内刷新编码用于更快的回放和定位."
-

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/amf-capabilities.cpp Deleted

@@ -1,104 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "amf-capabilities.h"
-#include "utility.h"
-
-using namespace Plugin;
-using namespace Plugin::AMD;
-
-#pragma region Singleton
-static CapabilityManager* __instance;
-static std::mutex __instance_mutex;
-void Plugin::AMD::CapabilityManager::Initialize() {
-	const std::lock_guard<std::mutex> lock(__instance_mutex);
-	if (!__instance)
-		__instance = new CapabilityManager();
-}
-
-CapabilityManager* Plugin::AMD::CapabilityManager::Instance() {
-	const std::lock_guard<std::mutex> lock(__instance_mutex);
-	return __instance;
-}
-
-void Plugin::AMD::CapabilityManager::Finalize() {
-	const std::lock_guard<std::mutex> lock(__instance_mutex);
-	if (__instance)
-		delete __instance;
-	__instance = nullptr;
-}
-#pragma endregion Singleton
-
-Plugin::AMD::CapabilityManager::CapabilityManager() {
-	// Potential fix for unintended crashes by AMD including asserts in release builds.
-	AMD::AMF::Instance()->EnableDebugTrace(false);
-
-	// Key order: API, Adapter, Codec
-	for (auto api : API::EnumerateAPIs()) {
-		for (auto adapter : api->EnumerateAdapters()) {
-			for (auto codec : { Codec::AVC/*, Codec::SVC*/, Codec::HEVC }) {
-				bool isSupported = false;
-				try {
-					std::unique_ptr<AMD::Encoder> enc;
-
-					if (codec == Codec::AVC || codec == Codec::SVC) {
-						enc = std::make_unique<AMD::EncoderH264>(api, adapter);
-					}
-					if (codec == Codec::HEVC) {
-						enc = std::make_unique<AMD::EncoderH265>(api, adapter);
-					}
-					if (enc != nullptr)
-						isSupported = true;
-				} catch (const std::exception& e) {
-					PLOG_WARNING("%s", e.what());
-				}
-
-				PLOG_DEBUG("[Capability Manager] Testing %s Adapter '%s' with codec %s: %s.",
-					api->GetName().c_str(), adapter.Name.c_str(), Utility::CodecToString(codec),
-					isSupported ? "Supported" : "Not Supported");
-
-				std::tuple<API::Type, API::Adapter, AMD::Codec> key = std::make_tuple(api->GetType(), adapter, codec);
-				m_CapabilityMap[key] = isSupported;
-			}
-		}
-	}
-}
-
-Plugin::AMD::CapabilityManager::~CapabilityManager() {}
-
-bool Plugin::AMD::CapabilityManager::IsCodecSupported(AMD::Codec codec) {
-	for (auto api : API::EnumerateAPIs()) {
-		if (IsCodecSupportedByAPI(codec, api->GetType()))
-			return true;
-	}
-	return false;
-}
-
-bool Plugin::AMD::CapabilityManager::IsCodecSupportedByAPI(AMD::Codec codec, API::Type type) {
-	auto api = API::GetAPI(type);
-	for (auto adapter : api->EnumerateAdapters()) {
-		if (IsCodecSupportedByAPIAdapter(codec, type, adapter) == true)
-			return true;
-	}
-	return false;
-}
-
-bool Plugin::AMD::CapabilityManager::IsCodecSupportedByAPIAdapter(AMD::Codec codec, API::Type api, API::Adapter adapter) {
-	return m_CapabilityMap[std::make_tuple(api, adapter, codec)];
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/amf-encoder-h264.cpp Deleted

@@ -1,1665 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "amf-encoder-h264.h"
-#include "utility.h"
-#include <inttypes.h>
-
-#define QUICK_THROW_ERROR(format, ...) {\
-	QUICK_FORMAT_MESSAGE(errMsg, __FUNCTION_NAME__ format, \
-		m_UniqueId,  ##__VA_ARGS__, \
-		m_AMF->GetTrace()->GetResultText(res), res); \
-	throw std::exception(errMsg.c_str()); \
-}
-
-#define PREFIX "[H264]<Id: %lld> "
-
-using namespace Plugin;
-using namespace Plugin::AMD;
-using namespace Utility;
-
-Plugin::AMD::EncoderH264::EncoderH264(
-	std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
-	bool useOpenCLSubmission, bool useOpenCLConversion,
-	ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
-	bool useAsyncQueue, size_t asyncQueueSize)
-	: Encoder(Codec::AVC,
-		videoAPI, videoAdapter,
-		useOpenCLSubmission, useOpenCLConversion,
-		colorFormat, colorSpace, fullRangeColor,
-		useAsyncQueue, asyncQueueSize) {
-	AMFTRACECALL;
-	this->SetUsage(Usage::Transcoding);
-
-	if (m_AMF->GetRuntimeVersion() < AMF_MAKE_FULL_VERSION(1, 4, 0, 0)) {
-		// Support for 1.3.x drivers.
-		AMF_RESULT res = res = m_AMFEncoder->SetProperty(L"NominalRange", m_FullColorRange);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				PREFIX "Failed to set encoder color range, error %ls (code %d)",
-				m_UniqueId,
-				m_AMF->GetTrace()->GetResultText(res), res);
-		}
-	} else {
-		AMF_RESULT res = res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, m_FullColorRange);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				PREFIX "Failed to set encoder color range, error %ls (code %d)",
-				m_UniqueId,
-				m_AMF->GetTrace()->GetResultText(res), res);
-		}
-	}
-}
-
-Plugin::AMD::EncoderH264::~EncoderH264() {
-	AMFTRACECALL;
-}
-
-// Properties - Initialization
-std::vector<Usage> Plugin::AMD::EncoderH264::CapsUsage() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_USAGE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<Usage> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::UsageFromAMFH264((AMF_VIDEO_ENCODER_USAGE_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetUsage(Usage v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_USAGE, Utility::UsageToAMFH264(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::UsageToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::Usage Plugin::AMD::EncoderH264::GetUsage() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_USAGE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::UsageFromAMFH264((AMF_VIDEO_ENCODER_USAGE_ENUM)e);
-}
-
-// Properties - Static
-std::vector<QualityPreset> Plugin::AMD::EncoderH264::CapsQualityPreset() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QUALITY_PRESET, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<QualityPreset> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::QualityPresetFromAMFH264((AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetQualityPreset(QualityPreset v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET,
-		Utility::QualityPresetToAMFH264(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::QualityPresetToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::QualityPreset Plugin::AMD::EncoderH264::GetQualityPreset() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::QualityPresetFromAMFH264((AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM)e);
-}
-
-std::vector<Profile> Plugin::AMD::EncoderH264::CapsProfile() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PROFILE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<Profile> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::ProfileFromAMFH264((AMF_VIDEO_ENCODER_PROFILE_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetProfile(Profile v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE,
-		Utility::ProfileToAMFH264(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::ProfileToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::Profile Plugin::AMD::EncoderH264::GetProfile() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PROFILE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::ProfileFromAMFH264((AMF_VIDEO_ENCODER_PROFILE_ENUM)e);
-}
-
-std::vector<ProfileLevel> Plugin::AMD::EncoderH264::CapsProfileLevel() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PROFILE_LEVEL, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<ProfileLevel> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back((ProfileLevel)enm->value);
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetProfileLevel(ProfileLevel v) {
-	AMFTRACECALL;;
-
-	if (v == ProfileLevel::Automatic)
-		v = Utility::H264ProfileLevel(m_Resolution, m_FrameRate);
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL,
-		(int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, (int64_t)v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::ProfileLevel Plugin::AMD::EncoderH264::GetProfileLevel() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (ProfileLevel)e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsMaximumReferenceFrames() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MAX_NUM_REFRAMES, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetMaximumReferenceFrames(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_NUM_REFRAMES, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH264::GetMaximumReferenceFrames() {
-	AMFTRACECALL;
-
-	uint64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_NUM_REFRAMES, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, __FUNCTION_NAME__ PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> Plugin::AMD::EncoderH264::CapsResolution() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_FRAMESIZE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(
-		std::make_pair(var->minValue.sizeValue.width, var->maxValue.sizeValue.width),
-		std::make_pair(var->minValue.sizeValue.height, var->maxValue.sizeValue.height)
-	);
-}
-
-void Plugin::AMD::EncoderH264::SetResolution(std::pair<uint32_t, uint32_t> v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, ::AMFConstructSize(v.first, v.second));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ldx%ld, error %ls (code %d)",
-			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_Resolution.first = v.first;
-	m_Resolution.second = v.second;
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::GetResolution() {
-	AMFTRACECALL;
-
-	AMFSize e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_Resolution.first = e.width;
-	m_Resolution.second = e.height;
-	return std::make_pair(e.width, e.height);
-}
-
-void Plugin::AMD::EncoderH264::SetAspectRatio(std::pair<uint32_t, uint32_t> v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ASPECT_RATIO, ::AMFConstructRatio(v.first, v.second));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld:%ld, error %ls (code %d)",
-			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::GetAspectRatio() {
-	AMFTRACECALL;
-
-	AMFRatio e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ASPECT_RATIO, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return std::make_pair(e.num, e.den);
-}
-
-void Plugin::AMD::EncoderH264::SetFrameRate(std::pair<uint32_t, uint32_t> v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMERATE, ::AMFConstructRate(v.first, v.second));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld/%ld, error %ls (code %d)",
-			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_FrameRate = std::make_pair(v.first, v.second);
-	UpdateFrameRateValues();
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::GetFrameRate() {
-	AMFTRACECALL;
-
-	AMFRate e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Unable to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_FrameRate = std::make_pair(e.num, e.den);
-	UpdateFrameRateValues();
-	return m_FrameRate;
-}
-
-std::vector<CodingType> Plugin::AMD::EncoderH264::CapsCodingType() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_CABAC_ENABLE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<CodingType> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::CodingTypeFromAMFH264((AMF_VIDEO_ENCODER_CODING_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetCodingType(CodingType v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, Utility::CodingTypeToAMFH264(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::CodingTypeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::CodingType Plugin::AMD::EncoderH264::GetCodingType() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Unable to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::CodingTypeFromAMFH264((AMF_VIDEO_ENCODER_CODING_ENUM)e);
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::CapsMaximumLongTermReferenceFrames() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetMaximumLongTermReferenceFrames(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH264::GetMaximumLongTermReferenceFrames() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-// Properties - Dynamic
-std::vector<RateControlMethod> Plugin::AMD::EncoderH264::CapsRateControlMethod() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<RateControlMethod> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::RateControlMethodFromAMFH264((AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetRateControlMethod(RateControlMethod v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, Utility::RateControlMethodToAMFH264(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::RateControlMethodToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::RateControlMethod Plugin::AMD::EncoderH264::GetRateControlMethod() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::RateControlMethodFromAMFH264((AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM)e);
-}
-
-std::vector<PrePassMode> Plugin::AMD::EncoderH264::CapsPrePassMode() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<PrePassMode> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::PrePassModeFromAMFH264((AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH264::SetPrePassMode(PrePassMode v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE, Utility::PrePassModeToAMFH264(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::PrePassModeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::PrePassMode Plugin::AMD::EncoderH264::GetPrePassMode() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Unable to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::PrePassModeFromAMFH264((AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)e);
-}
-
-void Plugin::AMD::EncoderH264::SetVarianceBasedAdaptiveQuantizationEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENABLE_VBAQ, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsVarianceBasedAdaptiveQuantizationEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENABLE_VBAQ, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetFrameSkippingEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsFrameSkippingEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetEnforceHRDEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsEnforceHRDEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetFillerDataEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsFillerDataEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsQPMinimum() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MIN_QP, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetQPMinimum(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MIN_QP, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH264::GetQPMinimum() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MIN_QP, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsQPMaximum() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MAX_QP, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetQPMaximum(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_QP, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH264::GetQPMaximum() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_QP, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsTargetBitrate() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_TARGET_BITRATE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetTargetBitrate(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH264::GetTargetBitrate() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsPeakBitrate() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PEAK_BITRATE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetPeakBitrate(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH264::GetPeakBitrate() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsIFrameQP() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QP_I, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetIFrameQP(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_I, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH264::GetIFrameQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_I, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsPFrameQP() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QP_P, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetPFrameQP(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_P, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH264::GetPFrameQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_P, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsBFrameQP() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QP_B, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetBFrameQP(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_B, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH264::GetBFrameQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_B, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-void Plugin::AMD::EncoderH264::SetMaximumAccessUnitSize(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH264::GetMaximumAccessUnitSize() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsVBVBufferSize() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetVBVBufferSize(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH264::GetVBVBufferSize() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetVBVBufferInitialFullness(double v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_INITIAL_VBV_BUFFER_FULLNESS, (int64_t)(v * 64));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lf (%d), error %ls (code %d)",
-			m_UniqueId, v, (uint8_t)(v * 64), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-float Plugin::AMD::EncoderH264::GetInitialVBVBufferFullness() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INITIAL_VBV_BUFFER_FULLNESS, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (e / 64.0f);
-}
-
-// Properties - Picture Control
-void Plugin::AMD::EncoderH264::SetIDRPeriod(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, (int64_t)clamp(v, 1, 1000000));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_PeriodIDR = v;
-}
-
-uint32_t Plugin::AMD::EncoderH264::GetIDRPeriod() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_PeriodIDR = (uint32_t)e;
-	return m_PeriodIDR;
-}
-
-void Plugin::AMD::EncoderH264::SetHeaderInsertionSpacing(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEADER_INSERTION_SPACING, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH264::GetHeaderInsertionSpacing() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEADER_INSERTION_SPACING, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-void Plugin::AMD::EncoderH264::SetGOPAlignmentEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"EnableGOPAlignment", v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsGOPAlignmentEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"EnableGOPAlignment", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetDeblockingFilterEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsDeblockingFilterEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-uint8_t Plugin::AMD::EncoderH264::CapsBFramePattern() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return (uint8_t)var->maxValue.int64Value;
-}
-
-void Plugin::AMD::EncoderH264::SetBFramePattern(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_TimestampOffset = v;
-}
-
-uint8_t Plugin::AMD::EncoderH264::GetBFramePattern() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-void Plugin::AMD::EncoderH264::SetBFrameDeltaQP(int8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_B, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-int8_t Plugin::AMD::EncoderH264::GetBFrameDeltaQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (int8_t)e;
-}
-
-void Plugin::AMD::EncoderH264::SetBFrameReferenceEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsBFrameReferenceEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetBFrameReferenceDeltaQP(int8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-int8_t Plugin::AMD::EncoderH264::GetBFrameReferenceDeltaQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (int8_t)e;
-}
-
-// Properties - Motion Estimation
-void Plugin::AMD::EncoderH264::SetMotionEstimationQuarterPixelEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MOTION_HALF_PIXEL, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsMotionEstimationQuarterPixelEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MOTION_HALF_PIXEL, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH264::SetMotionEstimationHalfPixelEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MOTION_QUARTERPIXEL, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH264::IsMotionEstimationHalfPixelEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MOTION_QUARTERPIXEL, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-// Properties - Intra-Refresh
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::CapsIntraRefreshNumMBsPerSlot() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH264::SetIntraRefreshNumMBsPerSlot(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH264::GetIntraRefreshNumMBsPerSlot() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-void Plugin::AMD::EncoderH264::SetIntraRefreshNumOfStripes(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"IntraRefreshNumOfStripes", (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH264::GetIntraRefreshNumOfStripes() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"IntraRefreshNumOfStripes", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-// Internal
-void Plugin::AMD::EncoderH264::PacketPriorityAndKeyframe(amf::AMFDataPtr& pData, struct encoder_packet* packet) {
-	AMFTRACECALL;
-	uint64_t pktType;
-	pData->GetProperty(AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE, &pktType);
-	switch ((AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_ENUM)pktType) {
-		case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_IDR:
-			packet->keyframe = true;
-		case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_I:
-			packet->priority = 3;
-			break;
-		case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_P:
-			packet->priority = 2;
-			break;
-		case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_B:
-			packet->priority = 0;
-			break;
-	}
-}
-
-AMF_RESULT Plugin::AMD::EncoderH264::GetExtraDataInternal(amf::AMFVariant* p) {
-	AMFTRACECALL;
-	return m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_EXTRADATA, p);
-}
-
-std::string Plugin::AMD::EncoderH264::HandleTypeOverride(amf::AMFSurfacePtr & d, uint64_t index) {
-	AMF_VIDEO_ENCODER_PICTURE_TYPE_ENUM type = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
-
-	if ((m_PeriodBFrame > 0) && ((index % m_PeriodBFrame) == 0)) {
-		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_B;
-	}
-	if ((m_PeriodPFrame > 0) && ((index % m_PeriodPFrame) == 0)) {
-		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_P;
-	}
-	if ((m_PeriodIFrame > 0) && ((index % m_PeriodIFrame) == 0)) {
-		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_I;
-	}
-	if ((type != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE) && (m_PeriodIDR > 0) && ((index % m_PeriodIDR) == 0)) {
-		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR;
-	}
-	if (m_FrameSkipPeriod > 0) {
-		bool shouldSkip = m_FrameSkipKeepOnlyNth
-			? (index % m_FrameSkipPeriod) != 0
-			: (index % m_FrameSkipPeriod) == 0;
-
-		if (shouldSkip) {
-			if ((m_FrameSkipType <= AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP) || (type < m_FrameSkipType))
-				m_FrameSkipType = type;
-			type = AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP;
-		} else if (m_FrameSkipType != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE) {
-			type = m_FrameSkipType; // Hopefully fixes the crash.
-			m_FrameSkipType = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
-		}
-	}
-	if (type != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE)
-		d->SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, type);
-
-	switch (type) {
-		case AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE:
-			return "Automatic";
-			break;
-		case AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP:
-			return "Skip";
-			break;
-		case AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR:
-			return "IDR";
-			break;
-		case AMF_VIDEO_ENCODER_PICTURE_TYPE_I:
-			return "I";
-			break;
-		case AMF_VIDEO_ENCODER_PICTURE_TYPE_P:
-			return "P";
-			break;
-		case AMF_VIDEO_ENCODER_PICTURE_TYPE_B:
-			return "B";
-			break;
-	}
-	return "Unknown";
-}
-
-void Plugin::AMD::EncoderH264::LogProperties() {
-	AMFTRACECALL;
-
-	PLOG_INFO(PREFIX "Encoder Parameters:",
-		m_UniqueId);
-	#pragma region Backend
-	PLOG_INFO(PREFIX "  Backend:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Video API: %s",
-		m_UniqueId,
-		m_API->GetName().c_str());
-	PLOG_INFO(PREFIX "    Video Adapter: %s",
-		m_UniqueId,
-		m_APIAdapter.Name.c_str());
-	PLOG_INFO(PREFIX "    OpenCL: %s",
-		m_UniqueId,
-		m_OpenCL ? "Supported" : "Not Supported");
-	PLOG_INFO(PREFIX "      Transfer: %s",
-		m_UniqueId,
-		m_OpenCLSubmission ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "      Conversion: %s",
-		m_UniqueId,
-		m_OpenCLConversion ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Multi-Threading: %s",
-		m_UniqueId,
-		m_MultiThreading ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Queue Size: %" PRIu32,
-		m_UniqueId,
-		(uint32_t)GetQueueSize());
-	#pragma endregion Backend
-	#pragma region Frame
-	PLOG_INFO(PREFIX "  Frame:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Format: %s %s %s",
-		m_UniqueId,
-		Utility::ColorFormatToString(m_ColorFormat),
-		Utility::ColorSpaceToString(m_ColorSpace),
-		m_FullColorRange ? "Full" : "Partial");
-	PLOG_INFO(PREFIX "    Resolution: %" PRIu32 "x%" PRIu32,
-		m_UniqueId,
-		m_Resolution.first,
-		m_Resolution.second);
-	PLOG_INFO(PREFIX "    Frame Rate: %" PRIu32 "/%" PRIu32,
-		m_UniqueId,
-		m_FrameRate.first,
-		m_FrameRate.second);
-	auto aspectRatio = GetAspectRatio();
-	PLOG_INFO(PREFIX "    Aspect Ratio: %" PRIu32 ":%" PRIu32,
-		m_UniqueId,
-		aspectRatio.first,
-		aspectRatio.second);
-	#pragma endregion Frame
-	#pragma region Static
-	PLOG_INFO(PREFIX "  Static:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Usage: %s",
-		m_UniqueId,
-		Utility::UsageToString(GetUsage()));
-	PLOG_INFO(PREFIX "    Quality Preset: %s",
-		m_UniqueId,
-		Utility::QualityPresetToString(GetQualityPreset()));
-	auto profileLevel = static_cast<uint16_t>(GetProfileLevel());
-	PLOG_INFO(PREFIX "    Profile: %s %" PRIu16 ".%" PRIu16,
-		m_UniqueId,
-		Utility::ProfileToString(GetProfile()),
-		profileLevel / 10,
-		profileLevel % 10);
-	PLOG_INFO(PREFIX "    Coding Type: %s",
-		m_UniqueId,
-		Utility::CodingTypeToString(GetCodingType()));
-	PLOG_INFO(PREFIX "    Max. Reference Frames: %" PRIu16,
-		m_UniqueId,
-		(uint16_t)GetMaximumReferenceFrames());
-	PLOG_INFO(PREFIX "    Max. Long-Term Reference Frames: %" PRIu16,
-		m_UniqueId,
-		(uint16_t)GetMaximumLongTermReferenceFrames());
-	#pragma endregion Static
-	#pragma region Rate Control
-	PLOG_INFO(PREFIX "  Rate Control:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Method: %s",
-		m_UniqueId,
-		Utility::RateControlMethodToString(GetRateControlMethod()));
-	PLOG_INFO(PREFIX "    Pre-Pass Mode: %s",
-		m_UniqueId,
-		Utility::PrePassModeToString(GetPrePassMode()));
-	#pragma region QP
-	PLOG_INFO(PREFIX "    QP:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Range: %" PRIu8 " - %" PRIu8,
-		m_UniqueId,
-		GetQPMinimum(),
-		GetQPMaximum());
-	PLOG_INFO(PREFIX "      I-Frame: %" PRIu8,
-		m_UniqueId,
-		GetIFrameQP());
-	PLOG_INFO(PREFIX "      P-Frame: %" PRIu8,
-		m_UniqueId,
-		GetPFrameQP());
-	try {
-		PLOG_INFO(PREFIX "      B-Frame: %" PRIu8,
-			m_UniqueId,
-			GetBFrameQP());
-	} catch (...) {
-		PLOG_INFO(PREFIX "      B-Frame: N/A",
-			m_UniqueId);
-	}
-	#pragma endregion QP
-	#pragma region Bitrate
-	PLOG_INFO(PREFIX "    Bitrate:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Target: %" PRIu64 " bit/s",
-		m_UniqueId,
-		GetTargetBitrate());
-	PLOG_INFO(PREFIX "      Peak: %" PRIu64 " bit/s",
-		m_UniqueId,
-		GetPeakBitrate());
-	#pragma endregion Bitrate
-	#pragma region Flags
-	PLOG_INFO(PREFIX "    Flags:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Filler Data: %s",
-		m_UniqueId,
-		IsFillerDataEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "      Frame Skipping: %s",
-		m_UniqueId,
-		IsFrameSkippingEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "        Period: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetFrameSkippingPeriod());
-	PLOG_INFO(PREFIX "        Behaviour: %s",
-		m_UniqueId,
-		GetFrameSkippingBehaviour() ? "Keep every Nth frame" : "Skip every Nth frame");
-	PLOG_INFO(PREFIX "      Variance Based Adaptive Quantization: %s",
-		m_UniqueId,
-		IsVarianceBasedAdaptiveQuantizationEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "      Enforce Hypothetical Reference Decoder: %s",
-		m_UniqueId,
-		IsEnforceHRDEnabled() ? "Enabled" : "Disabled");
-	#pragma endregion Flags
-	#pragma region Video Buffering Verifier
-	PLOG_INFO(PREFIX "    Video Buffering Verfier:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Buffer Size: %" PRIu64 " bits",
-		m_UniqueId,
-		GetVBVBufferSize());
-	PLOG_INFO(PREFIX "      Initial Fullness: %" PRIu64 " %%",
-		m_UniqueId,
-		(uint64_t)round(GetInitialVBVBufferFullness() * 100.0));
-	#pragma endregion Video Buffering Verifier
-	PLOG_INFO(PREFIX "    Max. Access Unit Size: %" PRIu32,
-		m_UniqueId,
-		GetMaximumAccessUnitSize());
-	#pragma endregion Rate Control
-
-	#pragma region Picture Control
-	PLOG_INFO(PREFIX "  Picture Control:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Period:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      IDR: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetIDRPeriod());
-	PLOG_INFO(PREFIX "      I: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetIFramePeriod());
-	PLOG_INFO(PREFIX "      P: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetPFramePeriod());
-	PLOG_INFO(PREFIX "      B: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetBFramePeriod());
-	PLOG_INFO(PREFIX "    Header Insertion Spacing: %" PRIu32,
-		m_UniqueId,
-		GetHeaderInsertionSpacing());
-	PLOG_INFO(PREFIX "    GOP Alignment: %s",
-		m_UniqueId,
-		IsGOPAlignmentEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Deblocking Filter: %s",
-		m_UniqueId,
-		IsDeblockingFilterEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Motion Estimation: %s%s",
-		m_UniqueId,
-		IsMotionEstimationQuarterPixelEnabled() ? (IsMotionEstimationHalfPixelEnabled() ? "Quarter, " : "Quarter") : "",
-		IsMotionEstimationHalfPixelEnabled() ? "Half" : "");
-	PLOG_INFO(PREFIX "    B-Frames:",
-		m_UniqueId);
-	try {
-		PLOG_INFO(PREFIX "      Pattern: %" PRIu8,
-			m_UniqueId,
-			GetBFramePattern());
-	} catch (...) {
-		PLOG_INFO(PREFIX "      Pattern: N/A",
-			m_UniqueId);
-	}
-	try {
-		PLOG_INFO(PREFIX "      Delta QP: %" PRIi8,
-			m_UniqueId,
-			GetBFrameDeltaQP());
-	} catch (...) {
-		PLOG_INFO(PREFIX "      Delta QP: N/A",
-			m_UniqueId);
-	}
-	try {
-		PLOG_INFO(PREFIX "      Reference: %s",
-			m_UniqueId,
-			IsBFrameReferenceEnabled() ? "Enabled" : "Disabled");
-	} catch (...) {
-		PLOG_INFO(PREFIX "      Reference: N/A",
-			m_UniqueId);
-	}
-	try {
-		PLOG_INFO(PREFIX "      Reference Delta QP: %" PRIi8,
-			m_UniqueId,
-			GetBFrameReferenceDeltaQP());
-	} catch (...) {
-		PLOG_INFO(PREFIX "      Reference Delta QP: N/A",
-			m_UniqueId);
-	}
-	#pragma endregion Picture Control
-
-	#pragma region Intra-Refresh
-	PLOG_INFO(PREFIX "  Intra-Refresh:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Number of Macroblocks Per Slot: %" PRIu32,
-		m_UniqueId,
-		GetIntraRefreshNumMBsPerSlot());
-	PLOG_INFO(PREFIX "    Number of Stripes: %" PRIu32,
-		m_UniqueId,
-		GetIntraRefreshNumOfStripes());
-	#pragma endregion Intra-Refresh
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/amf-encoder-h265.cpp Deleted

@@ -1,1685 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "amf-encoder-h265.h"
-#include "utility.h"
-#include <inttypes.h>
-
-#define QUICK_THROW_ERROR(format, ...) {\
-	QUICK_FORMAT_MESSAGE(errMsg, __FUNCTION_NAME__ format, \
-		m_UniqueId,  ##__VA_ARGS__, \
-		m_AMF->GetTrace()->GetResultText(res), res); \
-	throw std::exception(errMsg.c_str()); \
-}
-#define PREFIX "[H265]<Id: %lld> "
-
-using namespace Plugin;
-using namespace Plugin::AMD;
-using namespace Utility;
-
-Plugin::AMD::EncoderH265::EncoderH265(
-	std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
-	bool useOpenCLSubmission, bool useOpenCLConversion,
-	ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
-	bool useAsyncQueue, size_t asyncQueueSize)
-	: Encoder(Codec::HEVC,
-		videoAPI, videoAdapter,
-		useOpenCLSubmission, useOpenCLConversion,
-		colorFormat, colorSpace, fullRangeColor,
-		useAsyncQueue, asyncQueueSize) {
-	AMFTRACECALL;
-	this->SetUsage(Usage::Transcoding);
-
-	AMF_RESULT res = res = m_AMFEncoder->SetProperty(L"NominalRange", m_FullColorRange);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			PREFIX "Failed to set encoder color range, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-	}
-}
-
-
-Plugin::AMD::EncoderH265::~EncoderH265() {
-	AMFTRACECALL;
-}
-
-// Initialization
-std::vector<Usage> Plugin::AMD::EncoderH265::CapsUsage() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_USAGE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<Usage> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::UsageFromAMFH265((AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetUsage(Usage v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_USAGE, Utility::UsageToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::UsageToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::Usage Plugin::AMD::EncoderH265::GetUsage() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_USAGE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::UsageFromAMFH265((AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM)e);
-}
-
-// Static
-std::vector<QualityPreset> Plugin::AMD::EncoderH265::CapsQualityPreset() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<QualityPreset> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::QualityPresetFromAMFH265((AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetQualityPreset(QualityPreset v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, Utility::QualityPresetToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::QualityPresetToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::QualityPreset Plugin::AMD::EncoderH265::GetQualityPreset() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::QualityPresetFromAMFH265((AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM)e);
-}
-
-std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> Plugin::AMD::EncoderH265::CapsResolution() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(
-		std::make_pair(var->minValue.sizeValue.width, var->maxValue.sizeValue.width),
-		std::make_pair(var->minValue.sizeValue.height, var->maxValue.sizeValue.height)
-	);
-}
-
-void Plugin::AMD::EncoderH265::SetResolution(std::pair<uint32_t, uint32_t> v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, ::AMFConstructSize(v.first, v.second));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ldx%ld, error %ls (code %d)",
-			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_Resolution.first = v.first;
-	m_Resolution.second = v.second;
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetResolution() {
-	AMFTRACECALL;
-
-	AMFSize e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_Resolution.first = e.width;
-	m_Resolution.second = e.height;
-	return std::make_pair(e.width, e.height);
-}
-
-void Plugin::AMD::EncoderH265::SetAspectRatio(std::pair<uint32_t, uint32_t> v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ::AMFConstructRatio(v.first, v.second));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld:%ld, error %ls (code %d)",
-			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetAspectRatio() {
-	AMFTRACECALL;
-
-	AMFRatio e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return std::make_pair(e.num, e.den);
-}
-
-void Plugin::AMD::EncoderH265::SetFrameRate(std::pair<uint32_t, uint32_t> v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, ::AMFConstructRate(v.first, v.second));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld/%ld, error %ls (code %d)",
-			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_FrameRate = std::make_pair(v.first, v.second);
-	UpdateFrameRateValues();
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetFrameRate() {
-	AMFTRACECALL;
-
-	AMFRate e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_FrameRate = std::make_pair(e.num, e.den);
-	UpdateFrameRateValues();
-	return m_FrameRate;
-}
-
-std::vector<Profile> Plugin::AMD::EncoderH265::CapsProfile() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_PROFILE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<Profile> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::ProfileFromAMFH265((AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetProfile(Profile v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE, Utility::ProfileToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::ProfileToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::Profile Plugin::AMD::EncoderH265::GetProfile() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::ProfileFromAMFH265((AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM)e);
-}
-
-std::vector<ProfileLevel> Plugin::AMD::EncoderH265::CapsProfileLevel() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<ProfileLevel> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back((ProfileLevel)(enm->value / 3));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetProfileLevel(ProfileLevel v) {
-	AMFTRACECALL;;
-
-	if (v == ProfileLevel::Automatic)
-		v = Utility::H265ProfileLevel(m_Resolution, m_FrameRate);
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, ((int64_t)v) * 3);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, (int64_t)v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::ProfileLevel Plugin::AMD::EncoderH265::GetProfileLevel() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (ProfileLevel)(e / 3);
-}
-
-std::vector<H265::Tier> Plugin::AMD::EncoderH265::CapsTier() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_TIER, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<H265::Tier> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::TierFromAMFH265((AMF_VIDEO_ENCODER_HEVC_TIER_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetTier(H265::Tier v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_TIER, Utility::TierToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::TierToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::H265::Tier Plugin::AMD::EncoderH265::GetTier() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TIER, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (H265::Tier)e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsMaximumReferenceFrames() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetMaximumReferenceFrames(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH265::GetMaximumReferenceFrames() {
-	AMFTRACECALL;
-
-	uint64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, __FUNCTION_NAME__ "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::vector<CodingType> Plugin::AMD::EncoderH265::CapsCodingType() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_CABAC_ENABLE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<CodingType> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::CodingTypeFromAMFH265((AMF_VIDEO_ENCODER_CODING_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetCodingType(CodingType v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, Utility::CodingTypeToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::CodingTypeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::CodingType Plugin::AMD::EncoderH265::GetCodingType() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::CodingTypeFromAMFH265((AMF_VIDEO_ENCODER_CODING_ENUM)e);
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::CapsMaximumLongTermReferenceFrames() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_LTR_FRAMES, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetMaximumLongTermReferenceFrames(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_LTR_FRAMES, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetMaximumLongTermReferenceFrames() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_LTR_FRAMES, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-/// Rate Control
-std::vector<RateControlMethod> Plugin::AMD::EncoderH265::CapsRateControlMethod() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<RateControlMethod> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::RateControlMethodFromAMFH265((AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM)enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetRateControlMethod(RateControlMethod v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, Utility::RateControlMethodToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, Utility::RateControlMethodToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::RateControlMethod Plugin::AMD::EncoderH265::GetRateControlMethod() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::RateControlMethodFromAMFH265((AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM)e);
-}
-
-std::vector<PrePassMode> Plugin::AMD::EncoderH265::CapsPrePassMode() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_PREANALYSIS_ENABLE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	if (var->type == amf::AMF_VARIANT_BOOL) {
-		return std::vector<PrePassMode>({ PrePassMode::Disabled, PrePassMode::Enabled });
-	} else {
-		std::vector<PrePassMode> ret;
-		for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-			PLOG_ERROR("Unknown Pre-Pass Mode: %ls %lld", enm->name, enm->value);
-			//ret.push_back(Utility::PrePassModeFromAMFH265((AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)enm->value));
-		}
-		return ret;
-	}
-}
-
-void Plugin::AMD::EncoderH265::SetPrePassMode(PrePassMode v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_PREANALYSIS_ENABLE, v != PrePassMode::Disabled);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, (v != PrePassMode::Disabled) ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::PrePassMode Plugin::AMD::EncoderH265::GetPrePassMode() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_PREANALYSIS_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	if (e) {
-		return PrePassMode::Enabled;
-	} else {
-		return PrePassMode::Disabled;
-	}
-}
-
-void Plugin::AMD::EncoderH265::SetVarianceBasedAdaptiveQuantizationEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ENABLE_VBAQ, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsVarianceBasedAdaptiveQuantizationEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_ENABLE_VBAQ, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-/// VBV Buffer
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsVBVBufferSize() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetVBVBufferSize(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH265::GetVBVBufferSize() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH265::SetVBVBufferInitialFullness(double v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_INITIAL_VBV_BUFFER_FULLNESS, (int64_t)(v * 64));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lf (%d), error %ls (code %d)",
-			m_UniqueId, v, (uint8_t)(v * 64), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-float Plugin::AMD::EncoderH265::GetInitialVBVBufferFullness() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_INITIAL_VBV_BUFFER_FULLNESS, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (e / 64.0f);
-}
-
-/// Picture Control
-std::vector<H265::GOPType> Plugin::AMD::EncoderH265::CapsGOPType() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(L"GOPType", &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	std::vector<H265::GOPType> ret;
-	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
-		ret.push_back(Utility::GOPTypeFromAMFH265(enm->value));
-	}
-	return ret;
-}
-
-void Plugin::AMD::EncoderH265::SetGOPType(H265::GOPType v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPType", Utility::GOPTypeToAMFH265(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
-			m_UniqueId, Utility::GOPTypeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::H265::GOPType Plugin::AMD::EncoderH265::GetGOPType() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPType", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return Utility::GOPTypeFromAMFH265(e);
-}
-
-void Plugin::AMD::EncoderH265::SetGOPSize(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetGOPSize() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-void Plugin::AMD::EncoderH265::SetGOPSizeMin(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSizeMin", (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetGOPSizeMin() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSizeMin", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-void Plugin::AMD::EncoderH265::SetGOPSizeMax(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSizeMax", (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetGOPSizeMax() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSizeMax", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-void Plugin::AMD::EncoderH265::SetGOPAlignmentEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"EnableGOPAlignment", v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsGOPAlignmentEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"EnableGOPAlignment", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH265::SetIDRPeriod(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_PeriodIDR = v;
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetIDRPeriod() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	m_PeriodIDR = (uint32_t)e;
-	return (uint32_t)e;
-}
-
-void Plugin::AMD::EncoderH265::SetHeaderInsertionMode(H265::HeaderInsertionMode v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE, static_cast<AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE_ENUM>(v));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-Plugin::AMD::H265::HeaderInsertionMode Plugin::AMD::EncoderH265::GetHeaderInsertionMode() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return static_cast<H265::HeaderInsertionMode>(e);
-}
-
-void Plugin::AMD::EncoderH265::SetDeblockingFilterEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_DE_BLOCKING_FILTER_DISABLE, !v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsDeblockingFilterEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"HevcDeBlockingFilter", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-/// Motion Estimation
-void Plugin::AMD::EncoderH265::SetMotionEstimationQuarterPixelEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_QUARTERPIXEL, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsMotionEstimationQuarterPixelEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_QUARTERPIXEL, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH265::SetMotionEstimationHalfPixelEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_HALF_PIXEL, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsMotionEstimationHalfPixelEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_HALF_PIXEL, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-// Dynamic
-void Plugin::AMD::EncoderH265::SetFrameSkippingEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_SKIP_FRAME_ENABLE, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsFrameSkippingEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_SKIP_FRAME_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH265::SetEnforceHRDEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ENFORCE_HRD, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsEnforceHRDEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_ENFORCE_HRD, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-void Plugin::AMD::EncoderH265::SetFillerDataEnabled(bool v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FILLER_DATA_ENABLE, v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
-			m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-bool Plugin::AMD::EncoderH265::IsFillerDataEnabled() {
-	AMFTRACECALL;
-
-	bool e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FILLER_DATA_ENABLE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsIFrameQPMinimum() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MIN_QP_I, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetIFrameQPMinimum(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_I, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH265::GetIFrameQPMinimum() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_I, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsIFrameQPMaximum() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_QP_I, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetIFrameQPMaximum(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_I, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH265::GetIFrameQPMaximum() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_I, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsPFrameQPMinimum() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MIN_QP_P, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetPFrameQPMinimum(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_P, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH265::GetPFrameQPMinimum() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_P, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsPFrameQPMaximum() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_QP_P, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetPFrameQPMaximum(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_P, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH265::GetPFrameQPMaximum() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_P, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsTargetBitrate() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetTargetBitrate(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH265::GetTargetBitrate() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsPeakBitrate() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetPeakBitrate(uint64_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint64_t Plugin::AMD::EncoderH265::GetPeakBitrate() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsIFrameQP() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QP_I, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetIFrameQP(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QP_I, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH265::GetIFrameQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QP_I, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsPFrameQP() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QP_P, &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetPFrameQP(uint8_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QP_P, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint8_t Plugin::AMD::EncoderH265::GetPFrameQP() {
-	AMFTRACECALL;
-
-	int64_t e;
-
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QP_P, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint8_t)e;
-}
-
-void Plugin::AMD::EncoderH265::SetMaximumAccessUnitSize(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_AU_SIZE, (int64_t)v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetMaximumAccessUnitSize() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_AU_SIZE, &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::CapsInputQueueSize() {
-	AMFTRACECALL;
-
-	const amf::AMFPropertyInfo* var;
-	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(L"HevcInputQueueSize", &var);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
-}
-
-void Plugin::AMD::EncoderH265::SetInputQueueSize(uint32_t v) {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"HevcInputQueueSize", v);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %ld, error %ls (code %d)",
-			m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-uint32_t Plugin::AMD::EncoderH265::GetInputQueueSize() {
-	AMFTRACECALL;
-
-	int64_t e;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"HevcInputQueueSize", &e);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	return (uint32_t)e;
-}
-
-// Internal
-void Plugin::AMD::EncoderH265::PacketPriorityAndKeyframe(amf::AMFDataPtr& pData, struct encoder_packet* packet) {
-	AMFTRACECALL;
-
-	uint64_t pktType;
-	pData->GetProperty(AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE, &pktType);
-	switch ((AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_ENUM)pktType) {
-		case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_I:
-			packet->keyframe = true;
-			packet->priority = 1;
-			break;
-		case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_P:
-			packet->priority = 0;
-			break;
-	}
-}
-
-AMF_RESULT Plugin::AMD::EncoderH265::GetExtraDataInternal(amf::AMFVariant* p) {
-	AMFTRACECALL;
-
-	return m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_EXTRADATA, p);
-}
-
-std::string Plugin::AMD::EncoderH265::HandleTypeOverride(amf::AMFSurfacePtr & d, uint64_t index) {
-	AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_ENUM type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE;
-
-	if ((m_PeriodPFrame > 0) && ((index % m_PeriodPFrame) == 0)) {
-		type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P;
-	}
-	if ((m_PeriodIFrame > 0) && ((index % m_PeriodIFrame) == 0)) {
-		type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I;
-	}
-	uint64_t realIPeriod = m_PeriodIDR * GetGOPSize();
-	if ((type != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE) && (realIPeriod > 0) && ((index % realIPeriod) == 0)) {
-		type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR;
-	}
-	if (m_FrameSkipPeriod > 0) {
-		bool shouldSkip = m_FrameSkipKeepOnlyNth
-			? (index % m_FrameSkipPeriod) != 0
-			: (index % m_FrameSkipPeriod) == 0;
-
-		if (shouldSkip) {
-			if ((m_FrameSkipType <= AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP) || (type < m_FrameSkipType))
-				m_FrameSkipType = type;
-			type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP;
-		} else if (m_FrameSkipType != AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE) {
-			type = m_FrameSkipType; // Hopefully fixes the crash.
-			m_FrameSkipType = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE;
-		}
-	}
-	if (type != AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE)
-		d->SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, type);
-
-	switch (type) {
-		case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE:
-			return "Automatic";
-			break;
-		case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP:
-			return "Skip";
-			break;
-		case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR:
-			return "IDR";
-			break;
-		case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I:
-			return "I";
-			break;
-		case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P:
-			return "P";
-			break;
-			//case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_B:
-			//	return "B";
-			//	break;
-	}
-	return "Unknown";
-}
-
-void Plugin::AMD::EncoderH265::LogProperties() {
-	AMFTRACECALL;
-
-	PLOG_INFO(PREFIX "Encoder Parameters:",
-		m_UniqueId);
-	#pragma region Backend
-	PLOG_INFO(PREFIX "  Backend:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Video API: %s",
-		m_UniqueId,
-		m_API->GetName().c_str());
-	PLOG_INFO(PREFIX "    Video Adapter: %s",
-		m_UniqueId,
-		m_APIAdapter.Name.c_str());
-	PLOG_INFO(PREFIX "    OpenCL: %s",
-		m_UniqueId,
-		m_OpenCL ? "Supported" : "Not Supported");
-	PLOG_INFO(PREFIX "      Transfer: %s",
-		m_UniqueId,
-		m_OpenCLSubmission ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "      Conversion: %s",
-		m_UniqueId,
-		m_OpenCLConversion ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Multi-Threading: %s",
-		m_UniqueId,
-		m_MultiThreading ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Queue Size: %" PRIu32,
-		m_UniqueId,
-		(uint32_t)GetQueueSize());
-	#pragma endregion Backend
-	#pragma region Frame
-	PLOG_INFO(PREFIX "  Frame:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Format: %s %s %s",
-		m_UniqueId,
-		Utility::ColorFormatToString(m_ColorFormat),
-		Utility::ColorSpaceToString(m_ColorSpace),
-		m_FullColorRange ? "Full" : "Partial");
-	PLOG_INFO(PREFIX "    Resolution: %" PRIu32 "x%" PRIu32,
-		m_UniqueId,
-		m_Resolution.first,
-		m_Resolution.second);
-	PLOG_INFO(PREFIX "    Frame Rate: %" PRIu32 "/%" PRIu32,
-		m_UniqueId,
-		m_FrameRate.first,
-		m_FrameRate.second);
-	auto aspectRatio = GetAspectRatio();
-	PLOG_INFO(PREFIX "    Aspect Ratio: %" PRIu32 ":%" PRIu32,
-		m_UniqueId,
-		aspectRatio.first,
-		aspectRatio.second);
-	#pragma endregion Frame
-	#pragma region Static
-	PLOG_INFO(PREFIX "  Static:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Usage: %s",
-		m_UniqueId,
-		Utility::UsageToString(GetUsage()));
-	PLOG_INFO(PREFIX "    Quality Preset: %s",
-		m_UniqueId,
-		Utility::QualityPresetToString(GetQualityPreset()));
-	auto profileLevel = static_cast<uint16_t>(GetProfileLevel());
-	PLOG_INFO(PREFIX "    Profile: %s %" PRIu16 ".%" PRIu16,
-		m_UniqueId,
-		Utility::ProfileToString(GetProfile()),
-		profileLevel / 10,
-		profileLevel % 10);
-	PLOG_INFO(PREFIX "    Tier: %s",
-		m_UniqueId,
-		Utility::TierToString(GetTier()));
-	PLOG_INFO(PREFIX "    Coding Type: %s",
-		m_UniqueId,
-		Utility::CodingTypeToString(GetCodingType()));
-	PLOG_INFO(PREFIX "    Max. Reference Frames: %" PRIu16,
-		m_UniqueId,
-		(uint16_t)GetMaximumReferenceFrames());
-	PLOG_INFO(PREFIX "    Max. Long-Term Reference Frames: %" PRIu16,
-		m_UniqueId,
-		(uint16_t)GetMaximumLongTermReferenceFrames());
-	#pragma endregion Static
-	#pragma region Rate Control
-	PLOG_INFO(PREFIX "  Rate Control:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Method: %s",
-		m_UniqueId,
-		Utility::RateControlMethodToString(GetRateControlMethod()));
-	PLOG_INFO(PREFIX "    Pre-Pass Mode: %s",
-		m_UniqueId,
-		Utility::PrePassModeToString(GetPrePassMode()));
-	#pragma region QP
-	PLOG_INFO(PREFIX "    QP:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Ranges:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "        I-Frame: %" PRIu8 " - %" PRIu8,
-		m_UniqueId,
-		GetIFrameQPMinimum(),
-		GetIFrameQPMaximum());
-	PLOG_INFO(PREFIX "        P-Frame: %" PRIu8 " - %" PRIu8,
-		m_UniqueId,
-		GetPFrameQPMinimum(),
-		GetPFrameQPMaximum());
-	PLOG_INFO(PREFIX "      Fixed:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "        I-Frame: %" PRIu8,
-		m_UniqueId,
-		GetIFrameQP());
-	PLOG_INFO(PREFIX "        P-Frame: %" PRIu8,
-		m_UniqueId,
-		GetPFrameQP());
-	#pragma endregion QP
-	#pragma region Bitrate
-	PLOG_INFO(PREFIX "    Bitrate:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Target: %" PRIu64 " bit/s",
-		m_UniqueId,
-		GetTargetBitrate());
-	PLOG_INFO(PREFIX "      Peak: %" PRIu64 " bit/s",
-		m_UniqueId,
-		GetPeakBitrate());
-	#pragma endregion Bitrate
-	#pragma region Flags
-	PLOG_INFO(PREFIX "    Flags:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Filler Data: %s",
-		m_UniqueId,
-		IsFillerDataEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "      Frame Skipping: %s",
-		m_UniqueId,
-		IsFrameSkippingEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "        Period: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetFrameSkippingPeriod());
-	PLOG_INFO(PREFIX "        Behaviour: %s",
-		m_UniqueId,
-		GetFrameSkippingBehaviour() ? "Keep every Nth frame" : "Skip every Nth frame");
-	PLOG_INFO(PREFIX "      Variance Based Adaptive Quantization: %s",
-		m_UniqueId,
-		IsVarianceBasedAdaptiveQuantizationEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "      Enforce Hypothetical Reference Decoder: %s",
-		m_UniqueId,
-		IsEnforceHRDEnabled() ? "Enabled" : "Disabled");
-	#pragma endregion Flags
-	#pragma region Video Buffering Verifier
-	PLOG_INFO(PREFIX "    Video Buffering Verfier:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Buffer Size: %" PRIu64 " bits",
-		m_UniqueId,
-		GetVBVBufferSize());
-	PLOG_INFO(PREFIX "      Initial Fullness: %" PRIu64 " %%",
-		m_UniqueId,
-		(uint64_t)round(GetInitialVBVBufferFullness() * 100.0));
-	#pragma endregion Video Buffering Verifier
-	PLOG_INFO(PREFIX "    Max. Access Unit Size: %" PRIu32,
-		m_UniqueId,
-		GetMaximumAccessUnitSize());
-	#pragma endregion Rate Control
-
-	#pragma region Picture Control
-	PLOG_INFO(PREFIX "  Picture Control:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Period:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      IDR: %" PRIu32 " GOPs",
-		m_UniqueId,
-		GetIDRPeriod());
-	PLOG_INFO(PREFIX "      I: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetIFramePeriod());
-	PLOG_INFO(PREFIX "      P: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetPFramePeriod());
-	PLOG_INFO(PREFIX "      B: %" PRIu32 " Frames",
-		m_UniqueId,
-		GetBFramePeriod());
-	PLOG_INFO(PREFIX "    GOP:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "      Type: %s",
-		m_UniqueId,
-		Utility::GOPTypeToString(GetGOPType()));
-	PLOG_INFO(PREFIX "      Size: %" PRIu32,
-		m_UniqueId,
-		GetGOPSize());
-	PLOG_INFO(PREFIX "      Size Range: %" PRIu32 " - %" PRIu32,
-		m_UniqueId,
-		GetGOPSizeMin(),
-		GetGOPSizeMax());
-	PLOG_INFO(PREFIX "      Alignment: %s",
-		m_UniqueId,
-		IsGOPAlignmentEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Deblocking Filter: %s",
-		m_UniqueId,
-		IsDeblockingFilterEnabled() ? "Enabled" : "Disabled");
-	PLOG_INFO(PREFIX "    Motion Estimation: %s%s",
-		m_UniqueId,
-		IsMotionEstimationQuarterPixelEnabled() ? (IsMotionEstimationHalfPixelEnabled() ? "Quarter, " : "Quarter") : "",
-		IsMotionEstimationHalfPixelEnabled() ? "Half" : "");
-	#pragma endregion Picture Control
-	
-	#pragma region Experimental
-	PLOG_INFO(PREFIX "  Experimental:",
-		m_UniqueId);
-	PLOG_INFO(PREFIX "    Input Queue: %" PRIu32,
-		m_UniqueId,
-		GetInputQueueSize());
-	#pragma endregion Experimental
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/amf-encoder.cpp Deleted

@@ -1,1161 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "amf-encoder.h"
-#include "utility.h"
-#include "components/VideoConverter.h"
-#include "components/VideoEncoderVCE.h"
-#include "components/VideoEncoderHEVC.h"
-#include <thread>
-#include "libobs/util/threading.h"
-
-using namespace Plugin;
-using namespace Plugin::AMD;
-
-Plugin::AMD::Encoder::Encoder(Codec codec,
-	std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
-	bool useOpenCLSubmission, bool useOpenCLConversion,
-	ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
-	bool multiThreading, size_t queueSize) {
-	m_UniqueId = Utility::GetUniqueIdentifier();
-
-	#pragma region Null Values
-	/// AMF Internals
-	m_AMF = nullptr;
-	m_AMFFactory = nullptr;
-	m_AMFContext = nullptr;
-	m_AMFEncoder = nullptr;
-	m_AMFConverter = nullptr;
-	m_AMFMemoryType = amf::AMF_MEMORY_UNKNOWN;
-	m_AMFSurfaceFormat = Utility::ColorFormatToAMF(colorFormat);
-
-	/// API Related
-	m_API = nullptr;
-	m_APIDevice = nullptr;
-	m_OpenCLSubmission = false;
-
-	/// Properties
-	m_QueueSize = queueSize;
-
-	/// Resolution + Rate
-	m_Resolution = std::make_pair<uint32_t, uint32_t>(0, 0);
-	m_FrameRate = std::make_pair<uint32_t, uint32_t>(0, 0);
-	m_FrameRateFraction = 0;
-
-	/// Flags
-	m_Initialized = true;
-	m_Started = false;
-	m_OpenCL = false;
-	m_Debug = false;
-
-	/// Timings
-	m_TimestampStep = 0;
-	m_TimestampStepRounded = 0;
-	m_TimestampOffset = 0;
-	m_SubmitQueryWaitTimer = std::chrono::milliseconds(1);
-	m_SubmitQueryAttempts = 16;
-	m_InitialFrameLatency = 0;
-
-	/// Status
-	m_SubmittedFrameCount = 0;
-	m_InitialFramesSent = false;
-	m_InitialPacketRetrieved = false;
-
-	/// Periods
-	m_PeriodIDR = 0;
-	m_PeriodIFrame = 0;
-	m_PeriodPFrame = 0;
-	m_PeriodBFrame = 0;
-	m_FrameSkipPeriod = 0;
-	m_FrameSkipKeepOnlyNth = false;
-
-	/// Multi-Threading
-	m_MultiThreading = multiThreading;
-	m_AsyncRetrieve = nullptr;
-	m_AsyncSend = nullptr;
-	#pragma endregion Null Values
-
-	// Setup
-	m_Codec = codec;
-	m_ColorFormat = colorFormat;
-	m_ColorSpace = colorSpace;
-	m_FullColorRange = fullRangeColor;
-	m_OpenCLSubmission = useOpenCLSubmission;
-	m_OpenCLConversion = useOpenCLConversion;
-
-	// Initialize selected API on Video Adapter
-	m_API = videoAPI;
-	m_APIAdapter = videoAdapter;
-	m_APIDevice = m_API->CreateInstance(m_APIAdapter);
-
-	// Initialize Advanced Media Framework
-	m_AMF = AMF::Instance();
-	m_AMF->EnableDebugTrace(m_Debug);
-	m_AMFFactory = m_AMF->GetFactory();
-
-	// Create Context for Conversion and Encoding
-	AMF_RESULT res = m_AMFFactory->CreateContext(&m_AMFContext);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Creating a AMF Context failed, error %ls (code %d).",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	/// Initialize Context using selected API
-	switch (m_API->GetType()) {
-		case API::Type::Direct3D11:
-		case API::Type::Direct3D9:
-			break;
-		default:
-			m_API = API::GetAPI(0);
-			switch (m_API->GetType()) {
-				case API::Type::Direct3D9:
-					m_APIAdapter = m_API->EnumerateAdapters()[0];
-					m_APIDevice = m_API->CreateInstance(m_APIAdapter);
-					break;
-				case API::Type::Direct3D11:
-					m_APIAdapter = m_API->EnumerateAdapters()[0];
-					m_APIDevice = m_API->CreateInstance(m_APIAdapter);
-					break;
-			}
-	}
-	switch (m_API->GetType()) {
-		case API::Type::Direct3D9:
-			m_AMFMemoryType = amf::AMF_MEMORY_DX9;
-			res = m_AMFContext->InitDX9(m_APIDevice->GetContext());
-			break;
-		case API::Type::Direct3D11:
-			m_AMFMemoryType = amf::AMF_MEMORY_DX11;
-			res = m_AMFContext->InitDX11(m_APIDevice->GetContext());
-			break;
-	}
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Initializing %s API with Adapter '%s' failed, error %ls (code %d).",
-			m_UniqueId,
-			m_API->GetName().c_str(), m_APIAdapter.Name.c_str(),
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	// Initialize OpenCL (if possible)
-	if (m_OpenCLSubmission || m_OpenCLConversion) {
-		res = m_AMFContext->InitOpenCL();
-		if (res == AMF_OK) {
-			m_OpenCL = true;
-
-			res = m_AMFContext->GetCompute(amf::AMF_MEMORY_OPENCL, &m_AMFCompute);
-			if (res != AMF_OK) {
-				m_OpenCLSubmission = false;
-				m_OpenCLConversion = false;
-
-				QUICK_FORMAT_MESSAGE(errMsg,
-					"<Id: %lld> Retrieving Compute object failed, error %ls (code %d)",
-					m_UniqueId,
-					m_AMF->GetTrace()->GetResultText(res), res);
-				PLOG_WARNING("%s", errMsg.data());
-			}
-		} else {
-			m_OpenCL = false;
-			m_OpenCLSubmission = false;
-			m_OpenCLConversion = false;
-
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> Initialising OpenCL failed, error %ls (code %d)",
-				m_UniqueId,
-				m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.data());
-		}
-	}
-
-	// Create Converter
-	res = m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoConverter, &m_AMFConverter);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Creating frame converter component failed, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, amf::AMF_MEMORY_UNKNOWN);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Unable to set converter memory type, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, amf::AMF_SURFACE_NV12);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Unable to set converter output format, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, Utility::ColorSpaceToAMFConverter(m_ColorSpace));
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Unable to set convertor color profile, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	// Create Encoder
-	res = m_AMFFactory->CreateComponent(m_AMFContext, Utility::CodecToAMF(codec), &m_AMFEncoder);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Unable to create %s encoder, error %ls (code %d)",
-			m_UniqueId,
-			Utility::CodecToString(codec),
-			m_AMF->GetTrace()->GetResultText(res),
-			res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	// Show complete initialization in log.
-	QUICK_FORMAT_MESSAGE(notice,
-		"<Id: %lld> Initialized.",
-		m_UniqueId);
-	PLOG_DEBUG("%s", notice.data());
-}
-
-Plugin::AMD::Encoder::~Encoder() {
-	// Destroy AMF Encoder
-	if (m_AMFEncoder) {
-		m_AMFEncoder->Terminate();
-		m_AMFEncoder = nullptr;
-	}
-
-	// Destroy AMF Converter
-	if (m_AMFConverter) {
-		m_AMFConverter->Terminate();
-		m_AMFConverter = nullptr;
-	}
-
-	// Destroy AMF Context
-	if (m_AMFContext) {
-		m_AMFContext->Terminate();
-		m_AMFContext = nullptr;
-	}
-
-	// Destroy API
-	if (m_API) {
-		m_APIDevice = nullptr;
-		m_API = nullptr;
-	}
-
-	m_AMF = nullptr;
-
-	// Show complete initialization in log.
-	QUICK_FORMAT_MESSAGE(notice,
-		"<Id: %lld> Finalized.",
-		m_UniqueId);
-	PLOG_DEBUG("%s", notice.c_str());
-}
-
-uint64_t Plugin::AMD::Encoder::GetUniqueId() {
-	return m_UniqueId;
-}
-
-Plugin::AMD::Codec Plugin::AMD::Encoder::GetCodec() {
-	return m_Codec;
-}
-
-std::shared_ptr<API::IAPI> Plugin::AMD::Encoder::GetVideoAPI() {
-	return m_API;
-}
-
-Plugin::API::Adapter Plugin::AMD::Encoder::GetVideoAdapter() {
-	return m_APIAdapter;
-}
-
-bool Plugin::AMD::Encoder::IsOpenCLEnabled() {
-	return m_OpenCLSubmission;
-}
-
-Plugin::AMD::ColorFormat Plugin::AMD::Encoder::GetColorFormat() {
-	return m_ColorFormat;
-}
-
-Plugin::AMD::ColorSpace Plugin::AMD::Encoder::GetColorSpace() {
-	return m_ColorSpace;
-}
-
-bool Plugin::AMD::Encoder::IsFullRangeColor() {
-	return m_FullColorRange;
-}
-
-bool Plugin::AMD::Encoder::IsMultiThreaded() {
-	return m_MultiThreading;
-}
-
-size_t Plugin::AMD::Encoder::GetQueueSize() {
-	return m_QueueSize;
-}
-
-void Plugin::AMD::Encoder::SetDebug(bool v) {
-	m_Debug = v;
-	m_AMF->EnableDebugTrace(m_Debug);
-}
-
-bool Plugin::AMD::Encoder::IsDebug() {
-	return m_Debug;
-}
-
-void Plugin::AMD::Encoder::UpdateFrameRateValues() {
-	// 1			Second
-	// 1000			Millisecond
-	// 1000000		Microsecond
-	// 10000000		amf_pts
-	// 1000000000	Nanosecond
-	m_FrameRateFraction = ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first);
-	m_TimestampStep = AMF_SECOND * m_FrameRateFraction;
-	m_TimestampStepRounded = (uint64_t)round(m_TimestampStep);
-	m_SubmitQueryWaitTimer = std::chrono::milliseconds(1);// std::chrono::nanoseconds((uint64_t)round(m_TimestampStep / m_SubmitQueryAttempts));
-}
-
-void Plugin::AMD::Encoder::SetVBVBufferStrictness(double_t v) {
-	AMFTRACECALL;
-
-	auto bitrateCaps = CapsVBVBufferSize();
-	uint64_t looseBitrate = bitrateCaps.second,
-		targetBitrate = 0,
-		strictBitrate = bitrateCaps.first;
-
-	Usage usage = GetUsage();
-	if (usage == Usage::UltraLowLatency) {
-		targetBitrate = clamp(GetTargetBitrate(), bitrateCaps.first, bitrateCaps.second);
-	} else {
-		switch (this->GetRateControlMethod()) {
-			case RateControlMethod::ConstantBitrate:
-				targetBitrate = clamp(GetTargetBitrate(), bitrateCaps.first, bitrateCaps.second);
-				break;
-			case RateControlMethod::LatencyConstrainedVariableBitrate:
-			case RateControlMethod::PeakConstrainedVariableBitrate:
-				targetBitrate = max(this->GetTargetBitrate(), this->GetPeakBitrate());
-				break;
-			case RateControlMethod::ConstantQP:
-				targetBitrate = bitrateCaps.second / 2;
-				break;
-		}
-	}
-	strictBitrate = clamp(static_cast<uint64_t>(
-		round(targetBitrate * ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first))
-		), bitrateCaps.first, targetBitrate);
-
-	// Three-Point Linear Lerp
-	// 0% = looseBitrate, 50% = targetBitrate, 100% = strictBitrate
-	v = clamp(v, 0.0, 1.0);
-	double_t aFadeVal = clamp(v * 2.0, 0.0, 1.0); // 0 - 0.5
-	double_t bFadeVal = clamp(v * 2.0 - 1.0, 0.0, 0.0); // 0.5 - 1.0
-
-	double_t aFade = (looseBitrate * (1.0 - aFadeVal)) + (targetBitrate * aFadeVal);
-	double_t bFade = (aFade * (1.0 - bFadeVal)) + (strictBitrate * bFadeVal);
-
-	uint64_t vbvBufferSize = static_cast<uint64_t>(round(bFade));
-	this->SetVBVBufferSize(vbvBufferSize);
-}
-
-void Plugin::AMD::Encoder::SetIFramePeriod(uint32_t v) {
-	m_PeriodIFrame = v;
-}
-
-uint32_t Plugin::AMD::Encoder::GetIFramePeriod() {
-	return m_PeriodIFrame;
-}
-
-void Plugin::AMD::Encoder::SetPFramePeriod(uint32_t v) {
-	m_PeriodPFrame = v;
-}
-
-uint32_t Plugin::AMD::Encoder::GetPFramePeriod() {
-	return m_PeriodPFrame;
-}
-
-void Plugin::AMD::Encoder::SetBFramePeriod(uint32_t v) {
-	m_PeriodBFrame = v;
-}
-
-uint32_t Plugin::AMD::Encoder::GetBFramePeriod() {
-	return m_PeriodBFrame;
-}
-
-void Plugin::AMD::Encoder::SetFrameSkippingPeriod(uint32_t v) {
-	m_FrameSkipPeriod = v;
-}
-
-uint32_t Plugin::AMD::Encoder::GetFrameSkippingPeriod() {
-	return m_FrameSkipPeriod;
-}
-
-void Plugin::AMD::Encoder::SetFrameSkippingBehaviour(bool v) {
-	m_FrameSkipKeepOnlyNth = v;
-}
-
-bool Plugin::AMD::Encoder::GetFrameSkippingBehaviour() {
-	return m_FrameSkipKeepOnlyNth;
-}
-
-void Plugin::AMD::Encoder::Start() {
-	AMFTRACECALL;
-
-	AMF_RESULT res;
-
-	res = m_AMFConverter->Init(Utility::ColorFormatToAMF(m_ColorFormat), m_Resolution.first, m_Resolution.second);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Unable to initalize converter, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res),
-			res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	res = m_AMFEncoder->Init(amf::AMF_SURFACE_NV12, m_Resolution.first, m_Resolution.second);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Failed to initialize encoder, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-
-	// Threading
-	if (m_MultiThreading) {
-		m_AsyncSend = new EncoderThreadingData;
-		m_AsyncSend->shutdown = false;
-		m_AsyncSend->wakeupcount = 0;// 2 ^ 32;
-		m_AsyncSend->data = nullptr;
-		m_AsyncSend->worker = std::thread(AsyncSendMain, this);
-		m_AsyncRetrieve = new EncoderThreadingData;
-		m_AsyncRetrieve->shutdown = false;
-		m_AsyncRetrieve->wakeupcount = 0;
-		m_AsyncRetrieve->data = nullptr;
-		m_AsyncRetrieve->worker = std::thread(AsyncRetrieveMain, this);
-	}
-
-	m_Started = true;
-}
-
-void Plugin::AMD::Encoder::Restart() {
-	AMFTRACECALL;
-
-	AMF_RESULT res = m_AMFEncoder->ReInit(m_Resolution.first, m_Resolution.second);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Could not re-initialize encoder, error %ls (code %d)",
-			m_UniqueId,
-			m_AMF->GetTrace()->GetResultText(res), res);
-		throw std::exception(errMsg.c_str());
-	}
-}
-
-void Plugin::AMD::Encoder::Stop() {
-	AMFTRACECALL;
-
-	if (!m_Started)
-		throw std::logic_error("Can't stop an encoder that isn't running!");
-
-	m_AMFConverter->Drain();
-	m_AMFConverter->Flush();
-	m_AMFEncoder->Drain();
-	m_AMFEncoder->Flush();
-
-	// Threading
-	if (m_MultiThreading) {
-		{
-			std::unique_lock<std::mutex> lock(m_AsyncRetrieve->mutex);
-			m_AsyncRetrieve->shutdown = true;
-			m_AsyncRetrieve->wakeupcount = 2 ^ 32;
-			m_AsyncRetrieve->condvar.notify_all();
-			m_AsyncRetrieve->data = nullptr;
-		}
-		m_AsyncRetrieve->worker.join();
-		delete m_AsyncRetrieve;
-		{
-			std::unique_lock<std::mutex> lock(m_AsyncSend->mutex);
-			m_AsyncSend->shutdown = true;
-			m_AsyncSend->wakeupcount = 2 ^ 32;
-			m_AsyncSend->condvar.notify_all();
-			m_AsyncSend->data = nullptr;
-		}
-		m_AsyncSend->worker.join();
-		delete m_AsyncSend;
-	}
-
-	m_Started = false;
-}
-
-bool Plugin::AMD::Encoder::IsStarted() {
-	AMFTRACECALL;
-
-	return m_Started;
-}
-
-bool Plugin::AMD::Encoder::Encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet) {
-	AMFTRACECALL;
-
-	if (!m_Started)
-		return false;
-
-	amf::AMFSurfacePtr surface = nullptr;
-	amf::AMFDataPtr surface_data = nullptr;
-	amf::AMFDataPtr packet_data = nullptr;
-
-	// Encoding Steps
-	if (!EncodeAllocate(surface))
-		return false;
-	if (!EncodeStore(surface, frame))
-		return false;
-	if (!EncodeConvert(surface, surface_data))
-		return false;
-	if (!EncodeMain(surface_data, packet_data))
-		return false;
-	if (!EncodeLoad(packet_data, packet, received_packet))
-		return false;
-
-	return true;
-}
-
-void Plugin::AMD::Encoder::GetVideoInfo(struct video_scale_info* info) {
-	AMFTRACECALL;
-
-	if (!m_AMFContext || !m_AMFEncoder)
-		throw std::exception("<" __FUNCTION_NAME__ "> Called while not initialized.");
-
-	switch (m_ColorFormat) {
-		// 4:2:0 Formats
-		case ColorFormat::NV12:
-			info->format = VIDEO_FORMAT_NV12;
-			break;
-		case ColorFormat::I420:
-			info->format = VIDEO_FORMAT_I420;
-			break;
-			// 4:2:2 Formats
-		case ColorFormat::YUY2:
-			info->format = VIDEO_FORMAT_YUY2;
-			break;
-			// Uncompressed
-		case ColorFormat::RGBA:
-			info->format = VIDEO_FORMAT_RGBA;
-			break;
-		case ColorFormat::BGRA:
-			info->format = VIDEO_FORMAT_BGRA;
-			break;
-			// Other
-		case ColorFormat::GRAY:
-			info->format = VIDEO_FORMAT_Y800;
-			break;
-	}
-
-	if (m_FullColorRange) { // Only use Full range if actually enabled.
-		info->range = VIDEO_RANGE_FULL;
-	} else {
-		info->range = VIDEO_RANGE_PARTIAL;
-	}
-}
-
-bool Plugin::AMD::Encoder::GetExtraData(uint8_t** extra_data, size_t* size) {
-	AMFTRACECALL;
-
-	if (!m_AMFContext || !m_AMFEncoder)
-		throw std::exception("<" __FUNCTION_NAME__ "> Called while not initialized.");
-
-	amf::AMFVariant var;
-	AMF_RESULT res = GetExtraDataInternal(&var);
-	if (res == AMF_OK && var.type == amf::AMF_VARIANT_INTERFACE) {
-		amf::AMFBufferPtr buf(var.pInterface);
-
-		*size = buf->GetSize();
-		m_ExtraDataBuffer.resize(*size);
-		std::memcpy(m_ExtraDataBuffer.data(), buf->GetNative(), *size);
-		*extra_data = m_ExtraDataBuffer.data();
-
-		return true;
-	}
-	return false;
-}
-
-bool Plugin::AMD::Encoder::EncodeAllocate(OUT amf::AMFSurfacePtr& surface) {
-	AMFTRACECALL;
-
-	AMF_RESULT res;
-	auto clk_start = std::chrono::high_resolution_clock::now();
-
-	// Allocate
-	if (m_OpenCLSubmission) {
-		res = m_AMFContext->AllocSurface(m_AMFMemoryType, m_AMFSurfaceFormat,
-			m_Resolution.first, m_Resolution.second, &surface);
-	} else {
-		// Required when not using OpenCL, can't directly write to GPU memory with memcpy.
-		res = m_AMFContext->AllocSurface(amf::AMF_MEMORY_HOST, m_AMFSurfaceFormat,
-			m_Resolution.first, m_Resolution.second, &surface);
-	}
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Unable to allocate Surface, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		PLOG_ERROR("%s", errMsg.data());
-		return false;
-	}
-
-	// Performance Tracking
-	auto clk_end = std::chrono::high_resolution_clock::now();
-	uint64_t pf_timestamp = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
-	uint64_t pf_time = std::chrono::nanoseconds(clk_end - clk_start).count();
-
-	surface->SetProperty(AMF_TIMESTAMP_ALLOCATE, pf_timestamp);
-	surface->SetProperty(AMF_TIME_ALLOCATE, pf_time);
-
-	return true;
-}
-
-bool Plugin::AMD::Encoder::EncodeStore(OUT amf::AMFSurfacePtr& surface, IN struct encoder_frame* frame) {
-	AMFTRACECALL;
-
-	AMF_RESULT res;
-	amf::AMFComputeSyncPointPtr pSyncPoint;
-	auto clk_start = std::chrono::high_resolution_clock::now();
-
-	if (m_OpenCLSubmission) {
-		m_AMFCompute->PutSyncPoint(&pSyncPoint);
-		res = surface->Convert(amf::AMF_MEMORY_OPENCL);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> [Store] Conversion of Surface to OpenCL failed, error %ls (code %d)",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.data());
-			return false;
-		}
-	}
-
-	size_t planeCount = surface->GetPlanesCount();
-	for (uint8_t i = 0; i < planeCount; i++) {
-		amf::AMFPlanePtr plane = surface->GetPlaneAt(i);
-		int32_t width = plane->GetWidth();
-		int32_t height = plane->GetHeight();
-		int32_t hpitch = plane->GetHPitch();
-
-		if (m_OpenCLSubmission) {
-			static const amf_size l_origin[] = { 0, 0, 0 };
-			const amf_size l_size[] = { (amf_size)width, (amf_size)height, 1 };
-			res = m_AMFCompute->CopyPlaneFromHost(frame->data[i], l_origin, l_size, frame->linesize[i], surface->GetPlaneAt(i), false);
-			if (res != AMF_OK) {
-				QUICK_FORMAT_MESSAGE(errMsg,
-					"<Id: %lld> [Store] Unable to copy plane %d with OpenCL, error %ls (code %d)",
-					m_UniqueId, i, m_AMF->GetTrace()->GetResultText(res), res);
-				PLOG_WARNING("%s", errMsg.data());
-				return false;
-			}
-		} else {
-			void* plane_nat = plane->GetNative();
-			for (int32_t py = 0; py < height; py++) {
-				int32_t plane_off = py * hpitch;
-				int32_t frame_off = py * frame->linesize[i];
-				std::memcpy(
-					static_cast<void*>(static_cast<uint8_t*>(plane_nat) + plane_off),
-					static_cast<void*>(frame->data[i] + frame_off), frame->linesize[i]);
-			}
-		}
-	}
-
-	if (m_OpenCLSubmission) {
-		res = m_AMFCompute->FinishQueue();
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> [Store] Failed to finish OpenCL queue, error %ls (code %d)",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.data());
-			return false;
-		}
-		pSyncPoint->Wait();
-	}
-	res = surface->Convert(m_AMFMemoryType);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> [Store] Conversion of Surface failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		PLOG_WARNING("%s", errMsg.data());
-		return false;
-	}
-
-	// Data Stuff
-	int64_t tsLast = (int64_t)round((frame->pts - 1) * m_TimestampStep);
-	int64_t tsNow = (int64_t)round(frame->pts * m_TimestampStep);
-
-	/// Decode Timestamp
-	surface->SetPts(tsNow);
-	/// Presentation Timestamp
-	surface->SetProperty(AMF_PRESENT_TIMESTAMP, frame->pts);
-	/// Duration
-	surface->SetDuration(tsNow - tsLast);
-	/// Type override
-	std::string printableType = HandleTypeOverride(surface, frame->pts);
-
-	// Performance Tracking
-	auto clk_end = std::chrono::high_resolution_clock::now();
-	uint64_t pf_timestamp = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
-	uint64_t pf_time = std::chrono::nanoseconds(clk_end - clk_start).count();
-	surface->SetProperty(AMF_TIMESTAMP_STORE, pf_timestamp);
-	surface->SetProperty(AMF_TIME_STORE, pf_time);
-
-	if (m_Debug) {
-		PLOG_DEBUG("<Id: %lld> EncodeStore: PTS(%8lld) DTS(%8lld) TS(%16lld) Duration(%16lld) Type(%s)",
-			m_UniqueId,
-			frame->pts,
-			frame->pts,
-			surface->GetPts(),
-			surface->GetDuration(),
-			printableType.c_str());
-	}
-
-	return true;
-}
-
-bool Plugin::AMD::Encoder::EncodeConvert(IN amf::AMFSurfacePtr& surface, OUT amf::AMFDataPtr& data) {
-	AMFTRACECALL;
-
-	AMF_RESULT res;
-	auto clk_start = std::chrono::high_resolution_clock::now();
-
-	if (m_OpenCLConversion) {
-		res = surface->Convert(amf::AMF_MEMORY_OPENCL);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> [Convert] Conversion of Surface to OpenCL failed, error %ls (code %d)",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.data());
-			return false;
-		}
-	}
-	res = m_AMFConverter->SubmitInput(surface);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> [Convert] Submit to converter failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		PLOG_WARNING("%s", errMsg.data());
-		return false;
-	}
-	res = m_AMFConverter->QueryOutput(&data);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> [Convert] Querying output from converter failed, error %ls (code %d)",
-			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-		PLOG_WARNING("%s", errMsg.data());
-		return false;
-	}
-	if (m_OpenCLConversion) {
-		res = surface->Convert(m_AMFMemoryType);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> [Convert] Conversion of Surface failed, error %ls (code %d)",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.data());
-			return false;
-		}
-	}
-
-	// Performance Tracking
-	auto clk_end = std::chrono::high_resolution_clock::now();
-	uint64_t pf_timestamp = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
-	uint64_t pf_time = std::chrono::nanoseconds(clk_end - clk_start).count();
-	surface->SetProperty(AMF_TIMESTAMP_CONVERT, pf_timestamp);
-	surface->SetProperty(AMF_TIME_CONVERT, pf_time);
-
-	return true;
-}
-
-bool Plugin::AMD::Encoder::EncodeMain(IN amf::AMFDataPtr& data, OUT amf::AMFDataPtr& packet) {
-	AMFTRACECALL;
-
-	bool frameSubmitted = false,
-		packetRetrieved = false;
-
-	bool keepLooping = true;
-	for (uint64_t attempt = 1; keepLooping; attempt++) {
-		// Lets just change the stupid huge bitwise and/or into proper ifs.
-		// Since this is rather small and can be kept in L1 we should not see
-		// any differences in performance.
-		if (m_InitialFramesSent) {
-			if (m_InitialPacketRetrieved) {
-				if (attempt <= m_SubmitQueryAttempts) {
-					keepLooping = (!frameSubmitted || !packetRetrieved);
-				} else {
-					keepLooping = false;
-				}
-			} else {
-				keepLooping = !frameSubmitted || !packetRetrieved;
-			}
-		} else {
-			keepLooping = !frameSubmitted;
-		}
-
-		// Submit
-		if (!frameSubmitted) {
-			if (m_MultiThreading) { // Asynchronous
-				std::unique_lock<std::mutex> slock(m_AsyncSend->mutex);
-				if (m_AsyncSend->data == nullptr) {
-					m_AsyncSend->data = data;
-					m_AsyncSend->condvar.notify_all();
-					frameSubmitted = true;
-				} else {
-					m_AsyncSend->condvar.notify_all();
-				}
-			} else {
-				// Performance Tracking
-				auto clk = std::chrono::high_resolution_clock::now();
-				uint64_t pf_ts = std::chrono::nanoseconds(clk.time_since_epoch()).count();
-				data->SetProperty(AMF_TIMESTAMP_SUBMIT, pf_ts);
-
-				AMF_RESULT res = m_AMFEncoder->SubmitInput(data);
-				if (m_Debug) {
-					QUICK_FORMAT_MESSAGE(errMsg,
-						"<Id: %lld> [Main/Submit] SubmitInput returned %ls (code %d).",
-						m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-					PLOG_WARNING("%s", errMsg.c_str());
-				}
-
-				if (res == AMF_OK) {
-					frameSubmitted = true;
-					m_SubmittedFrameCount++;
-				} else if (res == AMF_INPUT_FULL) {
-					if (m_InitialFramesSent == false) {
-						QUICK_FORMAT_MESSAGE(errMsg,
-							"<Id: %lld> Queue Size is too large, starting to query for packets...",
-							m_UniqueId);
-						PLOG_ERROR("%s", errMsg.data());
-						m_InitialFramesSent = true;
-					}
-				} else {
-					QUICK_FORMAT_MESSAGE(errMsg,
-						"<Id: %lld> [Main] Submitting Surface failed, error %ls (code %d)",
-						m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-					PLOG_ERROR("%s", errMsg.data());
-					return false;
-				}
-			}
-		}
-
-		// Retrieve
-		if (m_InitialFramesSent && !packetRetrieved) {
-			if (m_MultiThreading) {
-				std::unique_lock<std::mutex> rlock(m_AsyncRetrieve->mutex);
-				if (m_AsyncRetrieve->data != nullptr) {
-					packet = m_AsyncRetrieve->data;
-					m_AsyncRetrieve->data = nullptr;
-					packetRetrieved = true;
-					m_InitialPacketRetrieved = true;
-				} else {
-					m_AsyncRetrieve->condvar.notify_all();
-					if (m_AsyncRetrieve->wakeupcount == 0)
-						m_AsyncRetrieve->wakeupcount = 1;
-				}
-			} else {
-				AMF_RESULT res = m_AMFEncoder->QueryOutput(&packet);
-				if (m_Debug) {
-					QUICK_FORMAT_MESSAGE(errMsg,
-						"<Id: %lld> [Main/Query] QueryOutput returned %ls (code %d).",
-						m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-					PLOG_WARNING("%s", errMsg.c_str());
-				}
-
-				if (res == AMF_OK) {
-					m_InitialPacketRetrieved = true;
-					packetRetrieved = true;
-
-					// Performance Tracking
-					auto clk = std::chrono::high_resolution_clock::now();
-					uint64_t pf_query = std::chrono::nanoseconds(clk.time_since_epoch()).count(),
-						pf_submit, pf_main;
-					packet->GetProperty(AMF_TIMESTAMP_SUBMIT, &pf_submit);
-					packet->SetProperty(AMF_TIMESTAMP_QUERY, pf_query);
-					pf_main = (pf_query - pf_submit);
-					packet->SetProperty(AMF_TIME_MAIN, pf_main);
-				} else if (res == AMF_NEED_MORE_INPUT) {
-					// Returned with B-Frames, means that we need more frames.
-					if (!m_InitialPacketRetrieved)
-						packetRetrieved = true;
-				} else if (res != AMF_REPEAT) {
-					QUICK_FORMAT_MESSAGE(errMsg,
-						"<Id: %lld> [Main] Retrieving Packet failed, error %ls (code %d)",
-						m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-					PLOG_ERROR("%s", errMsg.data());
-					return false;
-				}
-			}
-		}
-
-		if (!packetRetrieved || !frameSubmitted)
-			std::this_thread::sleep_for(m_SubmitQueryWaitTimer);
-	}
-	if (!frameSubmitted) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Input Queue is full, encoder is overloaded!",
-			m_UniqueId);
-		PLOG_WARNING("%s", errMsg.data());
-	}
-	if (!m_InitialPacketRetrieved) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> Waiting for initial frame...",
-			m_UniqueId);
-		PLOG_DEBUG("%s", errMsg.data());
-	}
-	if (m_InitialPacketRetrieved && !packetRetrieved) {
-		QUICK_FORMAT_MESSAGE(errMsg,
-			"<Id: %lld> No output Packet, encoder is overloaded!",
-			m_UniqueId);
-		PLOG_WARNING("%s", errMsg.data());
-	}
-	if (m_SubmittedFrameCount >= (m_TimestampOffset + m_QueueSize))
-		m_InitialFramesSent = true;
-	return true;
-}
-
-bool Plugin::AMD::Encoder::EncodeLoad(IN amf::AMFDataPtr& data, OUT struct encoder_packet* packet, OUT bool* received_packet) {
-	AMFTRACECALL;
-
-	if (data == nullptr)
-		return true;
-
-	amf::AMFBufferPtr pBuffer = amf::AMFBufferPtr(data);
-	auto clk_start = std::chrono::high_resolution_clock::now();
-
-	// Timestamps
-	packet->type = OBS_ENCODER_VIDEO;
-	/// Present Timestamp
-	data->GetProperty(AMF_PRESENT_TIMESTAMP, &packet->pts);
-	/// Decode Timestamp
-	packet->dts = (int64_t)round((double_t)data->GetPts() / m_TimestampStep) - m_TimestampOffset;
-	/// Data
-	PacketPriorityAndKeyframe(data, packet);
-	packet->size = pBuffer->GetSize();
-	if (m_PacketDataBuffer.size() < packet->size) {
-		size_t newBufferSize = (size_t)exp2(ceil(log2(packet->size)));
-		//AMF_LOG_DEBUG("Packet Buffer was resized to %d byte from %d byte.", newBufferSize, m_PacketDataBuffer.size());
-		m_PacketDataBuffer.resize(newBufferSize);
-	}
-	packet->data = m_PacketDataBuffer.data();
-	std::memcpy(packet->data, pBuffer->GetNative(), packet->size);
-
-	// Performance Tracking
-	auto clk_end = std::chrono::high_resolution_clock::now();
-	uint64_t pf_allocate_ts, pf_allocate_t,
-		pf_store_ts, pf_store_t,
-		pf_convert_ts, pf_convert_t,
-		pf_submit_ts, pf_query_ts, pf_main_t,
-		pf_load_ts, pf_load_t;
-
-	data->GetProperty(AMF_TIMESTAMP_ALLOCATE, &pf_allocate_ts);
-	data->GetProperty(AMF_TIME_ALLOCATE, &pf_allocate_t);
-	data->GetProperty(AMF_TIMESTAMP_STORE, &pf_store_ts);
-	data->GetProperty(AMF_TIME_STORE, &pf_store_t);
-	data->GetProperty(AMF_TIMESTAMP_CONVERT, &pf_convert_ts);
-	data->GetProperty(AMF_TIME_CONVERT, &pf_convert_t);
-	data->GetProperty(AMF_TIMESTAMP_SUBMIT, &pf_submit_ts);
-	data->GetProperty(AMF_TIMESTAMP_QUERY, &pf_query_ts);
-	data->GetProperty(AMF_TIME_MAIN, &pf_main_t);
-	pf_load_ts = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
-	pf_load_t = std::chrono::nanoseconds(clk_end - clk_start).count();
-
-	if (m_Debug) {
-		std::string printableType = "Unknown";
-		if (m_Codec == Codec::AVC || m_Codec == Codec::SVC) {
-			uint64_t type = AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_IDR;
-			data->GetProperty(AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE, &type);
-			switch ((AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_ENUM)type) {
-				case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_IDR:
-					printableType = "IDR";
-					break;
-				case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_I:
-					printableType = "I";
-					break;
-				case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_P:
-					printableType = "P";
-					break;
-				case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_B:
-					printableType = "B";
-					break;
-			}
-		}
-		if (m_Codec == Codec::HEVC) {
-			uint64_t type = AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_IDR;
-			data->GetProperty(AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE, &type);
-			switch ((AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_ENUM)type) {
-				case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_IDR:
-					printableType = "IDR";
-					break;
-				case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_I:
-					printableType = "I";
-					break;
-				case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_P:
-					printableType = "P";
-					break;
-			}
-		}
-
-		PLOG_DEBUG(
-			"<Id: %" PRIu64 "> EncodeLoad: PTS(%8" PRIu64 ") DTS(%8" PRIu64 ") TS(%16" PRIu64 ") Duration(%16" PRIu64 ") Size(%16" PRIuPTR ") Type(%s)",
-			m_UniqueId,
-			packet->pts,
-			packet->dts,
-			data->GetPts(),
-			data->GetDuration(),
-			packet->size,
-			printableType.c_str());
-		PLOG_DEBUG("<Id: %" PRIu64 ">    Timings: Allocate(%8" PRIu64 " ns) Store(%8" PRIu64 " ns) Convert(%8" PRIu64 " ns) Main(%8" PRIu64 " ns) Load(%8" PRIu64 " ns)",
-			m_UniqueId,
-			pf_allocate_t,
-			pf_store_t,
-			pf_convert_t,
-			pf_main_t,
-			pf_load_t);
-	}
-	if (m_InitialFrameLatency == 0) {
-		m_InitialFrameLatency = pf_main_t;
-		PLOG_INFO("<Id: %" PRIu64 "> Initial Frame Latency is %" PRIu64 " nanoseconds.",
-			m_UniqueId,
-			m_InitialFrameLatency);
-	}
-
-	*received_packet = true;
-
-	return true;
-}
-
-int32_t Plugin::AMD::Encoder::AsyncSendMain(Encoder* obj) {
-	os_set_thread_name("AMF Asynchronous Queue Sender");
-	return obj->AsyncSendLocalMain();
-}
-
-int32_t Plugin::AMD::Encoder::AsyncSendLocalMain() {
-	EncoderThreadingData* own = m_AsyncSend;
-
-	std::unique_lock<std::mutex> lock(own->mutex);
-	while (!own->shutdown) {
-		own->condvar.wait(lock, [&own] {
-			return own->shutdown || (own->data != nullptr);
-		});
-
-		if (own->data == nullptr)
-			continue;
-
-		{
-			// Performance Tracking
-			auto clk = std::chrono::high_resolution_clock::now();
-			uint64_t pf_ts = std::chrono::nanoseconds(clk.time_since_epoch()).count();
-			own->data->SetProperty(AMF_TIMESTAMP_SUBMIT, pf_ts);
-		}
-
-		AMF_RESULT res = m_AMFEncoder->SubmitInput(own->data);
-		if (m_Debug) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> [Main/Submit] SubmitInput returned %ls (code %d).",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.c_str());
-		}
-
-		if (res == AMF_OK) {
-			own->data = nullptr;
-			m_SubmittedFrameCount++;
-		} else if (res == AMF_INPUT_FULL) {
-			if (m_InitialFramesSent == false) {
-				QUICK_FORMAT_MESSAGE(errMsg,
-					"<Id: %lld> Queue Size is too large, starting to query for packets...",
-					m_UniqueId);
-				PLOG_ERROR("%s", errMsg.data());
-				m_InitialFramesSent = true;
-			}
-		} else {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> Submitting Surface failed, error %ls (code %d)",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_ERROR("%s", errMsg.data());
-			return -1;
-		}
-
-		std::this_thread::sleep_for(m_SubmitQueryWaitTimer);
-	}
-	return 0;
-}
-
-int32_t Plugin::AMD::Encoder::AsyncRetrieveMain(Encoder* obj) {
-	os_set_thread_name("AMF Asynchronous Queue Retriever");
-	return obj->AsyncRetrieveLocalMain();
-}
-
-int32_t Plugin::AMD::Encoder::AsyncRetrieveLocalMain() {
-	EncoderThreadingData* own = m_AsyncRetrieve;
-
-	std::unique_lock<std::mutex> lock(own->mutex);
-	while (!own->shutdown) {
-		own->condvar.wait(lock, [&own] {
-			return own->shutdown || (own->wakeupcount > 0);
-		});
-
-		if (own->wakeupcount == 0)
-			continue;
-
-		if (own->data != nullptr)
-			continue;
-
-		amf::AMFDataPtr packet;
-		AMF_RESULT res = m_AMFEncoder->QueryOutput(&packet);
-		if (m_Debug) {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> [Main/Query] QueryOutput returned %ls (code %d).",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_WARNING("%s", errMsg.c_str());
-		}
-
-		if (res == AMF_OK) {
-			own->data = packet;
-			own->wakeupcount--;
-
-			// Performance Tracking
-			{
-				auto clk = std::chrono::high_resolution_clock::now();
-				uint64_t pf_query = std::chrono::nanoseconds(clk.time_since_epoch()).count(),
-					pf_submit, pf_main;
-				packet->GetProperty(AMF_TIMESTAMP_SUBMIT, &pf_submit);
-				packet->SetProperty(AMF_TIMESTAMP_QUERY, pf_query);
-				pf_main = (pf_query - pf_submit);
-				packet->SetProperty(AMF_TIME_MAIN, pf_main);
-			}
-		} else if (res == AMF_REPEAT) {
-			m_AsyncRetrieve->condvar.notify_all();
-		} else if (res == AMF_NEED_MORE_INPUT) {
-			{
-				std::unique_lock<std::mutex> slock(m_AsyncSend->mutex);
-				if (m_AsyncSend->data != nullptr)
-					m_AsyncSend->condvar.notify_all();
-			}
-		} else {
-			QUICK_FORMAT_MESSAGE(errMsg,
-				"<Id: %lld> Retrieving Packet failed, error %ls (code %d)",
-				m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
-			PLOG_ERROR("%s", errMsg.data());
-			return -1;
-		}
-
-		std::this_thread::sleep_for(m_SubmitQueryWaitTimer);
-	}
-	return 0;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/amf.cpp Deleted

@@ -1,326 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <mutex>
-
-#include "amf.h"
-#include "windows.h"
-
-// AMD AMF SDK
-#include "components\Component.h"
-#include "components\ComponentCaps.h"
-#include "components\VideoEncoderVCE.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-using namespace Plugin::AMD;
-
-class CustomWriter : public amf::AMFTraceWriter {
-	public:
-
-	virtual void __cdecl Write(const wchar_t* scope, const wchar_t* message) override {
-		const wchar_t* realmsg = &(message[(33 + wcslen(scope) + 2)]); // Skip Time & Scope
-		size_t msgLen = wcslen(realmsg) - (sizeof(wchar_t));
-
-		blog(LOG_DEBUG, "[AMF Runtime] [%.*ls][%ls] %.*ls",
-			12, &(message[11]),
-			scope,
-			msgLen, realmsg);
-	}
-
-	virtual void __cdecl Flush() override {}
-};
-
-#pragma region Singleton
-static AMF* __instance;
-static std::mutex __instance_mutex;
-void Plugin::AMD::AMF::Initialize() {
-	const std::lock_guard<std::mutex> lock(__instance_mutex);
-	if (!__instance)
-		__instance = new AMF();
-}
-
-AMF* Plugin::AMD::AMF::Instance() {
-	const std::lock_guard<std::mutex> lock(__instance_mutex);
-	return __instance;
-}
-
-void Plugin::AMD::AMF::Finalize() {
-	const std::lock_guard<std::mutex> lock(__instance_mutex);
-	if (__instance)
-		delete __instance;
-	__instance = nullptr;
-}
-#pragma endregion Singleton
-
-const wchar_t* loggername = L"OBSWriter";
-
-Plugin::AMD::AMF::AMF() {
-	AMF_RESULT res = AMF_OK;
-
-	#pragma region Null Class Members
-	m_TimerPeriod = 0;
-	m_AMFVersion_Plugin = AMF_FULL_VERSION;
-	m_AMFVersion_Runtime = 0;
-	m_AMFModule = 0;
-
-	m_AMFFactory = nullptr;
-	m_AMFTrace = nullptr;
-	m_AMFDebug = nullptr;
-	AMFQueryVersion = nullptr;
-	AMFInit = nullptr;
-	m_TraceWriter = nullptr;
-	m_TimerPeriod = 0;
-	#pragma endregion Null Class Members
-
-	#ifdef _WIN32
-	std::vector<char> verbuf;
-	void* pProductVersion = nullptr;
-	uint32_t lProductVersionSize = 0;
-	#endif
-
-	// Initialize AMF Library
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
-
-	// Load AMF Runtime Library
-	m_AMFModule = LoadLibraryW(AMF_DLL_NAME);
-	if (!m_AMFModule) {
-		QUICK_FORMAT_MESSAGE(msg, "Unable to load '%ls', error code %ld.",
-			AMF_DLL_NAME,
-			GetLastError());
-		throw std::exception(msg.data());
-	} else {
-		PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded '%ls'.", AMF_DLL_NAME);
-	}
-
-	// Windows: Get Product Version for Driver Matching
-	#ifdef _WIN32
-	{
-		verbuf.resize(GetFileVersionInfoSizeW(AMF_DLL_NAME, nullptr) * 2);
-		GetFileVersionInfoW(AMF_DLL_NAME, 0, (DWORD)verbuf.size(), verbuf.data());
-
-		void* pBlock = verbuf.data();
-
-		// Read the list of languages and code pages.
-		struct LANGANDCODEPAGE {
-			WORD wLanguage;
-			WORD wCodePage;
-		} *lpTranslate;
-		UINT cbTranslate = sizeof(LANGANDCODEPAGE);
-
-		VerQueryValueA(pBlock, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &cbTranslate);
-
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), buf.size(), "%s%04x%04x%s",
-			"\\StringFileInfo\\",
-			lpTranslate[0].wLanguage,
-			lpTranslate[0].wCodePage,
-			"\\ProductVersion");
-
-		// Retrieve file description for language and code page "i".
-		VerQueryValueA(pBlock, buf.data(), &pProductVersion, &lProductVersionSize);
-	}
-	#endif _WIN32
-
-	// Query Runtime Version
-	AMFQueryVersion = (AMFQueryVersion_Fn)GetProcAddress(m_AMFModule, AMF_QUERY_VERSION_FUNCTION_NAME);
-	if (!AMFQueryVersion) {
-		QUICK_FORMAT_MESSAGE(msg, "Incompatible AMF Runtime (could not find '%s'), error code %ld.",
-			AMF_QUERY_VERSION_FUNCTION_NAME,
-			GetLastError());
-		throw std::exception(msg.data());
-	} else {
-		res = AMFQueryVersion(&m_AMFVersion_Runtime);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(msg, "Querying Version failed, error code %ld.",
-				res);
-			throw std::exception(msg.data());
-		}
-	}
-
-	/// Blacklist Drivers with older SDK.
-	if (m_AMFVersion_Runtime < AMF_MAKE_FULL_VERSION(1,4,6,0)) {
-		PLOG_WARNING("The AMF Runtime is very old and unsupported, consider updating your drivers.");
-	}
-
-	/// Initialize AMF
-	AMFInit = (AMFInit_Fn)GetProcAddress(m_AMFModule, AMF_INIT_FUNCTION_NAME);
-	if (!AMFInit) {
-		QUICK_FORMAT_MESSAGE(msg, "Incompatible AMF Runtime (could not find '%s'), error code %ld.",
-			AMF_QUERY_VERSION_FUNCTION_NAME,
-			GetLastError());
-		throw std::exception(msg.data());
-	} else {
-		res = AMFInit(m_AMFVersion_Runtime, &m_AMFFactory);
-		if (res != AMF_OK) {
-			QUICK_FORMAT_MESSAGE(msg, "Initializing AMF Library failed, error code %ld.",
-				res);
-			throw std::exception(msg.data());
-		}
-	}
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> AMF Library initialized.");
-
-	/// Retrieve Trace Object.
-	res = m_AMFFactory->GetTrace(&m_AMFTrace);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(msg, "Retrieving AMF Trace class failed, error code %ld.",
-			res);
-		throw std::exception(msg.data());
-	}
-
-	/// Retrieve Debug Object.
-	res = m_AMFFactory->GetDebug(&m_AMFDebug);
-	if (res != AMF_OK) {
-		QUICK_FORMAT_MESSAGE(msg, "Retrieving AMF Debug class failed, error code %ld.",
-			res);
-		throw std::exception(msg.data());
-	}
-
-	/// Register Trace Writer and disable Debug Tracing.
-	#ifndef _WIN64
-		// Older drivers crash due to using the wrong calling standard.
-	if (m_AMFVersion_Runtime >= AMF_MAKE_FULL_VERSION(1, 4, 4, 0)) {
-		#endif
-		m_TraceWriter = new CustomWriter();
-		m_AMFTrace->RegisterWriter(loggername, m_TraceWriter, true);
-		#ifndef _WIN64
-	}
-	#endif
-	this->EnableDebugTrace(false);
-
-	// Log success
-	PLOG_INFO("Version %d.%d.%d loaded (Compiled: %d.%d.%d.%d, Runtime: %d.%d.%d.%d, Library: %.*s).",
-		PLUGIN_VERSION_MAJOR,
-		PLUGIN_VERSION_MINOR,
-		PLUGIN_VERSION_PATCH,
-		(uint16_t)((m_AMFVersion_Plugin >> 48ull) & 0xFFFF),
-		(uint16_t)((m_AMFVersion_Plugin >> 32ull) & 0xFFFF),
-		(uint16_t)((m_AMFVersion_Plugin >> 16ull) & 0xFFFF),
-		(uint16_t)((m_AMFVersion_Plugin & 0xFFFF)),
-		(uint16_t)((m_AMFVersion_Runtime >> 48ull) & 0xFFFF),
-		(uint16_t)((m_AMFVersion_Runtime >> 32ull) & 0xFFFF),
-		(uint16_t)((m_AMFVersion_Runtime >> 16ull) & 0xFFFF),
-		(uint16_t)((m_AMFVersion_Runtime & 0xFFFF)),
-		lProductVersionSize, pProductVersion
-	);
-
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initialized.");
-}
-
-Plugin::AMD::AMF::~AMF() {
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing.");
-	if (m_AMFModule) {
-		if (m_TraceWriter) {
-			if (m_AMFTrace)
-				m_AMFTrace->UnregisterWriter(loggername);
-			delete m_TraceWriter;
-			m_TraceWriter = nullptr;
-		}
-
-		FreeLibrary(m_AMFModule);
-	}
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalized.");
-
-	#pragma region Null Class Members
-	m_TimerPeriod = 0;
-	m_AMFVersion_Plugin = 0;
-	m_AMFVersion_Runtime = 0;
-	m_AMFModule = 0;
-
-	m_AMFFactory = nullptr;
-	m_AMFTrace = nullptr;
-	m_AMFDebug = nullptr;
-	AMFQueryVersion = nullptr;
-	AMFInit = nullptr;
-	#pragma endregion Null Class Members
-}
-
-amf::AMFFactory* Plugin::AMD::AMF::GetFactory() {
-	return m_AMFFactory;
-}
-
-amf::AMFTrace* Plugin::AMD::AMF::GetTrace() {
-	return m_AMFTrace;
-}
-
-amf::AMFDebug* Plugin::AMD::AMF::GetDebug() {
-	return m_AMFDebug;
-}
-
-void Plugin::AMD::AMF::EnableDebugTrace(bool enable) {
-	if (!m_AMFTrace)
-		throw std::exception("<" __FUNCTION_NAME__ "> called without a AMFTrace object!");
-	if (!m_AMFDebug)
-		throw std::exception("<" __FUNCTION_NAME__ "> called without a AMFDebug object!");
-
-	#ifndef _WIN64
-	// Older drivers crash due to using the wrong calling standard.
-	if (m_AMFVersion_Runtime < AMF_MAKE_FULL_VERSION(1, 4, 4, 0)) {
-		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, false);
-		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_NOLOG);
-		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_FILE, false);
-		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_FILE, AMF_TRACE_NOLOG);
-		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, false);
-		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_NOLOG);
-		m_AMFDebug->AssertsEnable(false);
-		m_AMFDebug->EnablePerformanceMonitor(false);
-		m_AMFTrace->TraceEnableAsync(false);
-		m_AMFTrace->SetGlobalLevel(AMF_TRACE_NOLOG);
-		return;
-	}
-	#endif
-
-	// Console
-	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, false);
-	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_NOLOG);
-
-	// File
-	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_FILE, false);
-	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_FILE, AMF_TRACE_NOLOG);
-	m_AMFTrace->SetPath(L"C:\\AMFTrace.log");
-
-	// Debug Output
-	#ifdef _DEBUG
-	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, true);
-	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_TEST);
-	#else
-	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, false);
-	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_NOLOG);
-#endif
-
-	m_AMFDebug->AssertsEnable(enable);
-	m_AMFDebug->EnablePerformanceMonitor(enable);
-	//m_AMFTrace->TraceEnableAsync(true);
-	uint32_t loglevel = enable ? AMF_TRACE_TEST : AMF_TRACE_WARNING;
-	m_AMFTrace->SetGlobalLevel(loglevel);
-	m_AMFTrace->SetWriterLevel(L"OBSWriter", loglevel);
-}
-
-uint64_t Plugin::AMD::AMF::GetPluginVersion() {
-	return m_AMFVersion_Plugin;
-}
-
-uint64_t Plugin::AMD::AMF::GetRuntimeVersion() {
-	return m_AMFVersion_Runtime;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/api-base.cpp Deleted

@@ -1,176 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "api-base.h"
-#include "api-d3d9.h"
-#include "api-d3d11.h"
-#include "api-host.h"
-#include "api-opengl.h"
-
-#if defined(_WIN32) || defined(_WIN64)
-#include <windows.h>
-#include <VersionHelpers.h>
-#endif
-
-using namespace Plugin::API;
-
-
-// An Adapter on an API
-bool Plugin::API::operator<(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
-	if (left == right)
-		return left.Name < right.Name;
-	else
-		return (((uint64_t)left.idLow + ((uint64_t)left.idHigh << 32)) < ((uint64_t)right.idLow + ((uint64_t)right.idHigh << 32)));
-}
-
-bool Plugin::API::operator>(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
-	return right < left;
-}
-
-bool Plugin::API::operator<=(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
-	return !(right < left);
-}
-
-bool Plugin::API::operator>=(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
-	return !(left < right);
-}
-
-bool Plugin::API::operator==(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
-	return ((left.idLow == right.idLow) && (right.idHigh == right.idHigh));
-}
-
-bool Plugin::API::operator!=(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
-	return !(left == right);
-}
-
-// Instance of an API Adapter
-Plugin::API::Instance::Instance() {}
-
-Plugin::API::Instance::~Instance() {}
-
-// API Interface
-Plugin::API::IAPI::IAPI() {}
-
-Plugin::API::IAPI::~IAPI() {}
-
-Plugin::API::Adapter Plugin::API::IAPI::GetAdapterById(int32_t idLow, int32_t idHigh) {
-	for (auto adapter : EnumerateAdapters()) {
-		if ((adapter.idLow == idLow) && (adapter.idHigh == idHigh))
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
-}
-
-Plugin::API::Adapter Plugin::API::IAPI::GetAdapterByName(std::string name) {
-	for (auto adapter : EnumerateAdapters()) {
-		if (adapter.Name == name)
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
-}
-
-// Static API Stuff
-static std::vector<std::shared_ptr<IAPI>> s_APIInstances;
-void Plugin::API::InitializeAPIs() {
-	// DirectX 11
-	#ifdef _WIN32
-	if (IsWindows8OrGreater()) {
-		s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Direct3D11>());
-	}
-	#endif
-
-	// DirectX 9
-	#ifdef _WIN32
-	if (IsWindowsXPOrGreater()) {
-		s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Direct3D9>());
-	}
-	#endif
-
-	// Mikhail says these are for compatibility only, not actually backends.
-	//// OpenGL
-	//{
-	//	s_APIInstances.insert(s_APIInstances.end(), std::make_shared<OpenGL>());
-	//}
-
-	//// Host
-	//{
-	//	s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Host>());
-	//}
-}
-
-void Plugin::API::FinalizeAPIs() {
-	s_APIInstances.clear();
-}
-
-size_t Plugin::API::CountAPIs() {
-	return s_APIInstances.size();
-}
-
-std::string Plugin::API::GetAPIName(size_t index) {
-	auto indAPI = s_APIInstances.begin();
-	indAPI + index; // Advanced by x elements.
-
-	if (indAPI == s_APIInstances.end())
-		throw std::exception("Invalid API Index");
-
-	return indAPI->get()->GetName();
-}
-
-std::shared_ptr<IAPI> Plugin::API::GetAPI(size_t index) {
-	auto indAPI = s_APIInstances.begin();
-	indAPI + index; // Advanced by x elements.
-
-	if (indAPI == s_APIInstances.end())
-		throw std::exception("Invalid API Index");
-
-	return *indAPI;
-}
-
-std::shared_ptr<IAPI> Plugin::API::GetAPI(std::string name) {
-	for (auto api : s_APIInstances) {
-		if (name == api->GetName()) {
-			return api;
-		}
-	}
-	// If none was found, return the first one.
-	return *s_APIInstances.begin();
-}
-
-std::shared_ptr<IAPI> Plugin::API::GetAPI(Type type) {
-	for (auto api : s_APIInstances) {
-		if (type == api->GetType()) {
-			return api;
-		}
-	}
-	// If none was found, return the first one.
-	return *s_APIInstances.begin();
-}
-
-std::vector<std::shared_ptr<IAPI>> Plugin::API::EnumerateAPIs() {
-	return std::vector<std::shared_ptr<IAPI>>(s_APIInstances);
-}
-
-std::vector<std::string> Plugin::API::EnumerateAPINames() {
-	std::vector<std::string> names;
-	for (auto api : s_APIInstances) {
-		names.push_back(api->GetName());
-	}
-	return names;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/api-d3d11.cpp Deleted

@@ -1,285 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "api-d3d11.h"
-#include <sstream>
-#include <stdlib.h>
-#include <mutex>
-
-using namespace Plugin::API;
-
-class SingletonDXGI {
-	public:
-
-#pragma region Singleton
-	static std::shared_ptr<SingletonDXGI> GetInstance() {
-		static std::shared_ptr<SingletonDXGI> __instance = std::make_shared<SingletonDXGI>();
-		static std::mutex __mutex;
-
-		const std::lock_guard<std::mutex> lock(__mutex);
-		return __instance;
-	}
-#pragma endregion Singleton
-
-	SingletonDXGI() {
-		hModule = LoadLibrary(TEXT("dxgi.dll"));
-		if (hModule == 0)
-			throw std::exception("Unable to load 'dxgi.dll'.");
-
-	}
-	~SingletonDXGI() {
-		if (hModule)
-			FreeLibrary(hModule);
-	}
-
-	HRESULT CreateDXGIFactory(REFIID riid, _Out_ void **ppFactory) {
-		if (hModule == 0)
-			return S_FALSE;
-
-		typedef HRESULT(__stdcall *t_CreateDXGIFactory)(REFIID, void**);
-		t_CreateDXGIFactory pCreateDXGIFactory = (t_CreateDXGIFactory)GetProcAddress(hModule, "CreateDXGIFactory");
-
-		if (pCreateDXGIFactory) {
-			return pCreateDXGIFactory(riid, ppFactory);
-		}
-		return S_FALSE;
-	}
-	HRESULT CreateDXGIFactory1(REFIID riid, _Out_ void **ppFactory) {
-		if (hModule == 0)
-			return S_FALSE;
-
-		typedef HRESULT(__stdcall *t_CreateDXGIFactory1)(REFIID, void**);
-		t_CreateDXGIFactory1 pCreateDXGIFactory1 = (t_CreateDXGIFactory1)GetProcAddress(hModule, "CreateDXGIFactory1");
-
-		if (pCreateDXGIFactory1) {
-			return pCreateDXGIFactory1(riid, ppFactory);
-		}
-		return S_FALSE;
-	}
-
-	private:
-	HMODULE hModule;
-};
-
-class SingletonD3D11 {
-	public:
-
-#pragma region Singleton
-	static std::shared_ptr<SingletonD3D11> GetInstance() {
-		static std::shared_ptr<SingletonD3D11> __instance = std::make_shared<SingletonD3D11>();
-		static std::mutex __mutex;
-
-		const std::lock_guard<std::mutex> lock(__mutex);
-		return __instance;
-	}
-#pragma endregion Singleton
-
-	SingletonD3D11() {
-		hModule = LoadLibrary(TEXT("d3d11.dll"));
-		if (hModule == 0)
-			throw std::exception("Unable to load 'd3d11.dll'.");
-
-	}
-	~SingletonD3D11() {
-		if (hModule)
-			FreeLibrary(hModule);
-	}
-
-	HRESULT WINAPI D3D11CreateDevice(
-		_In_opt_ IDXGIAdapter* pAdapter,
-		D3D_DRIVER_TYPE DriverType,
-		HMODULE Software,
-		UINT Flags,
-		_In_reads_opt_(FeatureLevels) CONST D3D_FEATURE_LEVEL* pFeatureLevels,
-		UINT FeatureLevels,
-		UINT SDKVersion,
-		_Out_opt_ ID3D11Device** ppDevice,
-		_Out_opt_ D3D_FEATURE_LEVEL* pFeatureLevel,
-		_Out_opt_ ID3D11DeviceContext** ppImmediateContext) {
-
-		if (hModule == 0)
-			return S_FALSE;
-
-		typedef HRESULT(__stdcall *t_D3D11CreateDevice)(_In_opt_ IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT,
-			CONST D3D_FEATURE_LEVEL*, UINT, UINT, _Out_opt_ ID3D11Device**,
-			_Out_opt_ D3D_FEATURE_LEVEL*, _Out_opt_ ID3D11DeviceContext**);
-		t_D3D11CreateDevice pD3D11CreateDevice = (t_D3D11CreateDevice)GetProcAddress(hModule, "D3D11CreateDevice");
-
-		if (pD3D11CreateDevice) {
-			return pD3D11CreateDevice(pAdapter, DriverType, Software, Flags, pFeatureLevels, FeatureLevels,
-				SDKVersion, ppDevice, pFeatureLevel, ppImmediateContext);
-		}
-		return S_FALSE;
-	}
-
-	private:
-	HMODULE hModule;
-};
-
-Plugin::API::Direct3D11::Direct3D11() {
-	auto dxgiInst = SingletonDXGI::GetInstance();
-	HRESULT hr = dxgiInst->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&m_DXGIFactory);
-	if (FAILED(hr))
-		throw std::exception("<" __FUNCTION_NAME__ "> Unable to create DXGI, error code %X.", hr);
-
-	// Enumerate Adapters
-	IDXGIAdapter1* dxgiAdapter = nullptr;
-	for (size_t adapterIndex = 0;
-		!FAILED(m_DXGIFactory->EnumAdapters1((UINT)adapterIndex, &dxgiAdapter));
-		adapterIndex++) {
-		DXGI_ADAPTER_DESC1 desc = DXGI_ADAPTER_DESC1();
-		dxgiAdapter->GetDesc1(&desc);
-
-		if (desc.VendorId != 0x1002 /* AMD */)
-			continue;
-
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), buf.size(), "%ls (VEN_%04x/DEV_%04x/SUB_%04x/REV_%04x)",
-			desc.Description,
-			desc.VendorId,
-			desc.DeviceId,
-			desc.SubSysId,
-			desc.Revision);
-
-		m_AdapterList.emplace_back(
-			desc.AdapterLuid.LowPart,
-			desc.AdapterLuid.HighPart,
-			std::string(buf.data())
-		);
-	}
-}
-
-Plugin::API::Direct3D11::~Direct3D11() {}
-
-std::string Plugin::API::Direct3D11::GetName() {
-	return std::string("Direct3D 11");
-}
-
-std::vector<Adapter> Plugin::API::Direct3D11::EnumerateAdapters() {
-	// We shouldn't expect HW to change during Runtime, at least not in a normal System.
-	return m_AdapterList;
-}
-
-std::shared_ptr<Instance> Plugin::API::Direct3D11::CreateInstance(Adapter adapter) {
-	//std::lock_guard<std::mutex> lock(m_InstanceMapMutex);
-	//std::pair<int32_t, int32_t> key = std::make_pair(adapter.idLow, adapter.idHigh);
-	//auto inst = m_InstanceMap.find(key);
-	//if (inst != m_InstanceMap.end())
-	//	return inst->second;
-
-	auto inst2 = std::make_shared<Direct3D11Instance>(this, adapter);
-	//m_InstanceMap.insert_or_assign(key, inst2);
-	return inst2;
-}
-
-Plugin::API::Type Plugin::API::Direct3D11::GetType() {
-	return Type::Direct3D11;
-}
-
-Plugin::API::Direct3D11Instance::Direct3D11Instance(Direct3D11* api, Adapter adapter) {
-	m_API = api;
-	m_Adapter = adapter;
-	m_Device = nullptr;
-	m_DeviceContext = nullptr;
-
-	LUID adapterLUID;
-	adapterLUID.LowPart = adapter.idLow;
-	adapterLUID.HighPart = adapter.idHigh;
-
-	HRESULT hr = E_FAIL;
-	IDXGIAdapter* dxgiAdapter;
-	for (size_t adapterIndex = 0;
-		!FAILED(api->m_DXGIFactory->EnumAdapters((UINT)adapterIndex, &dxgiAdapter));
-		adapterIndex++) {
-		DXGI_ADAPTER_DESC desc = DXGI_ADAPTER_DESC();
-		dxgiAdapter->GetDesc(&desc);
-
-		if (desc.VendorId != 0x1002 /* AMD */)
-			continue;
-
-		if ((desc.AdapterLuid.HighPart == adapterLUID.HighPart)
-			&& (desc.AdapterLuid.LowPart == adapterLUID.LowPart)) {
-			hr = NOERROR;
-			break;
-		} else {
-			hr = E_INVALIDARG;
-		}
-	}
-	if (FAILED(hr))
-		throw std::invalid_argument("adapter");
-
-	// Create D3D Stuff
-	auto d3dInst = SingletonD3D11::GetInstance();
-	D3D_FEATURE_LEVEL featureLevels[] = {
-		D3D_FEATURE_LEVEL_11_1,
-		D3D_FEATURE_LEVEL_11_0
-	};
-	for (size_t featureLevel = 0; featureLevel < _countof(featureLevels); featureLevel++) {
-		for (size_t enabledFlags = 0; enabledFlags < 3; enabledFlags++) {
-			uint32_t flags = 0;
-
-			switch (enabledFlags) {
-				case 0:
-					flags |= D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
-				case 1:
-					flags |= D3D11_CREATE_DEVICE_BGRA_SUPPORT;
-				case 2:
-					break;
-			}
-
-			hr = d3dInst->D3D11CreateDevice(
-				dxgiAdapter,
-				dxgiAdapter == NULL ? D3D_DRIVER_TYPE_HARDWARE : D3D_DRIVER_TYPE_UNKNOWN,
-				NULL,
-				flags,
-				featureLevels + featureLevel, UINT(_countof(featureLevels) - featureLevel),
-				D3D11_SDK_VERSION,
-				&m_Device,
-				NULL,
-				&m_DeviceContext);
-			if (SUCCEEDED(hr)) {
-				break;
-			} else {
-				PLOG_DEBUG("<" __FUNCTION_NAME__ "> Unable to create D3D11 device, error code %X (mode %lld, level %lld).", hr, enabledFlags, featureLevel);
-			}
-		}
-	}
-	if (FAILED(hr)) {
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), buf.size(), "<" __FUNCTION_NAME__ "> Unable to create D3D11 device, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
-}
-
-Plugin::API::Direct3D11Instance::~Direct3D11Instance() {
-	if (m_Device)
-		m_Device->Release();
-
-	//std::lock_guard<std::mutex> lock(m_API->m_InstanceMapMutex);
-	//std::pair<int32_t, int32_t> key = std::make_pair(m_Adapter.idLow, m_Adapter.idHigh);
-	//m_API->m_InstanceMap.erase(key);
-}
-
-Plugin::API::Adapter Plugin::API::Direct3D11Instance::GetAdapter() {
-	return m_Adapter;
-}
-
-void* Plugin::API::Direct3D11Instance::GetContext() {
-	return m_Device;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/api-d3d9.cpp Deleted

@@ -1,206 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "api-d3d9.h"
-#include <mutex>
-#include <list>
-
-using namespace Plugin::API;
-
-Plugin::API::Direct3D9::Direct3D9() {
-	HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &m_Direct3D9Ex);
-	if (FAILED(hr))
-		throw std::exception("<" __FUNCTION_NAME__ "> Failed to create D3D9Ex, error code %X.", hr);
-
-	std::list<LUID> enumeratedLUIDs;
-	D3DADAPTER_IDENTIFIER9 adapterIdentifier;
-	for (size_t adapterIndex = 0;
-		!FAILED(m_Direct3D9Ex->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier));
-		adapterIndex++) {
-
-		if (adapterIdentifier.VendorId != 0x1002 /* AMD */)
-			continue;
-
-		LUID adapterLUID;
-		if (FAILED(m_Direct3D9Ex->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
-			continue;
-
-		bool enumerated = false;
-		for (LUID enumeratedLUID : enumeratedLUIDs) {
-			if ((enumeratedLUID.LowPart == adapterLUID.LowPart)
-				&& (enumeratedLUID.HighPart == adapterLUID.HighPart)) {
-				enumerated = true;
-				break;
-			}
-		}
-		if (enumerated)
-			continue;
-		else
-			enumeratedLUIDs.push_back(adapterLUID);
-
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), buf.size(), "%s [%s] (VEN_%04x/DEV_%04x/SUB_%04x/REV_%04x)",
-			adapterIdentifier.Description,
-			adapterIdentifier.DeviceName,
-
-			adapterIdentifier.VendorId,
-			adapterIdentifier.DeviceId,
-			adapterIdentifier.SubSysId,
-			adapterIdentifier.Revision);
-
-		m_Adapters.emplace_back(
-			Adapter(adapterLUID.LowPart, adapterLUID.HighPart,
-				std::string(buf.data())));
-	}
-}
-
-Plugin::API::Direct3D9::~Direct3D9() {
-	//m_InstanceMap.clear(); // Need to destroy IDirect3D9Device9Ex before IDirect3D9Ex.
-	m_Direct3D9Ex->Release();
-}
-
-std::string Plugin::API::Direct3D9::GetName() {
-	return std::string("Direct3D 9");
-}
-
-Plugin::API::Type Plugin::API::Direct3D9::GetType() {
-	return Type::Direct3D9;
-}
-
-std::vector<Adapter> Plugin::API::Direct3D9::EnumerateAdapters() {
-	return m_Adapters;
-}
-
-std::shared_ptr<Instance> Plugin::API::Direct3D9::CreateInstance(Adapter adapter) {
-	//std::pair<int32_t, int32_t> key = std::make_pair(adapter.idLow, adapter.idHigh);
-	//auto inst = m_InstanceMap.find(key);
-	//if (inst != m_InstanceMap.end())
-	//	return inst->second;
-
-	auto inst2 = std::make_shared<Direct3D9Instance>(this, adapter);
-	//m_InstanceMap.insert_or_assign(key, inst2);
-	return inst2;
-}
-
-Plugin::API::Direct3D9Instance::Direct3D9Instance(Direct3D9* api, Adapter adapter) {
-	this->m_API = api;
-	this->m_Adapter = adapter;
-
-	size_t adapterNum = (size_t)-1;
-	D3DADAPTER_IDENTIFIER9 adapterIdentifier;
-	for (size_t adapterIndex = 0;
-		!FAILED(api->m_Direct3D9Ex->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier));
-		adapterIndex++) {
-
-		if (adapterIdentifier.VendorId != 0x1002 /* AMD */)
-			continue;
-
-		LUID adapterLUID;
-		if (FAILED(api->m_Direct3D9Ex->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
-			continue;
-
-		if ((static_cast<int32_t>(adapterLUID.LowPart) == adapter.idLow)
-			&& (static_cast<int32_t>(adapterLUID.HighPart) == adapter.idHigh)) {
-			adapterNum = adapterIndex;
-			break;
-		}
-	}
-	if (adapterNum == -1)
-		throw std::invalid_argument("adapter");
-
-	D3DPRESENT_PARAMETERS presentParameters;
-	std::memset(&presentParameters, 0, sizeof(D3DPRESENT_PARAMETERS));
-	presentParameters.BackBufferWidth = 0;
-	presentParameters.BackBufferHeight = 0;
-	presentParameters.BackBufferFormat = D3DFMT_UNKNOWN;
-	presentParameters.Windowed = TRUE;
-	presentParameters.SwapEffect = D3DSWAPEFFECT_COPY;
-	presentParameters.hDeviceWindow = GetDesktopWindow();
-	presentParameters.Flags = D3DPRESENTFLAG_VIDEO;
-	presentParameters.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
-
-	D3DCAPS9    ddCaps;
-	std::memset(&ddCaps, 0, sizeof(ddCaps));
-	HRESULT hr = api->m_Direct3D9Ex->GetDeviceCaps((UINT)adapterNum, D3DDEVTYPE_HAL, &ddCaps);
-	if (FAILED(hr)) {
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), buf.size(), "<" __FUNCTION_NAME__ "> Unable to query capabilities for D3D9 adapter, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
-
-	DWORD       vp = 0;
-	if (ddCaps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) {
-		vp = D3DCREATE_HARDWARE_VERTEXPROCESSING;
-	} else {
-		vp = D3DCREATE_SOFTWARE_VERTEXPROCESSING;
-	}
-
-	hr = api->m_Direct3D9Ex->CreateDeviceEx(
-		(UINT)adapterNum,
-		D3DDEVTYPE_HAL,
-		presentParameters.hDeviceWindow,
-		vp | D3DCREATE_NOWINDOWCHANGES | D3DCREATE_MULTITHREADED,
-		&presentParameters,
-		NULL,
-		&m_Device
-	);
-	if (FAILED(hr)) {
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), buf.size(), "<" __FUNCTION_NAME__ "> Unable to create D3D9 device, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
-}
-
-Plugin::API::Direct3D9Instance::~Direct3D9Instance() {
-	//std::pair<int32_t, int32_t> key = std::make_pair(m_Adapter.idLow, m_Adapter.idHigh);
-	//m_API->m_InstanceMap.erase(key);
-
-	//m_Device->Release(); // Can't release/free on AMD hardware?
-}
-
-Plugin::API::Adapter Plugin::API::Direct3D9Instance::GetAdapter() {
-	/*if (pInstance == nullptr)
-		throw std::invalid_argument("instance");
-
-	Direct3D9Instance* instance = static_cast<Direct3D9Instance*>(pInstance);
-	if (instance == nullptr)
-		throw std::invalid_argument("instance");
-
-	D3DDEVICE_CREATION_PARAMETERS par;
-	HRESULT hr = instance->device->GetCreationParameters(&par);
-	if (FAILED(hr)) {
-		std::vector<char> buf(1024);
-		snprintf(buf.data(), "<" __FUNCTION_NAME__ "> Unable to get adapter from D3D9 device, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
-
-	auto adapters = Direct3D9::EnumerateAdapters();
-	if (par.AdapterOrdinal > adapters.size())
-		return *adapters.begin();
-
-	auto adapter = adapters.begin();
-	for (size_t n = 0; n < par.AdapterOrdinal; n++)
-		adapter++;
-	return *adapter;*/
-	return m_Adapter;
-}
-
-void* Plugin::API::Direct3D9Instance::GetContext() {
-	return m_Device;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/api-host.cpp Deleted

@@ -1,48 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "api-host.h"
-
-using namespace Plugin::API;
-
-std::string Plugin::API::Host::GetName() {
-	return "Host";
-}
-
-Plugin::API::Type Plugin::API::Host::GetType() {
-	return Type::Host;
-}
-
-std::vector<Adapter> Plugin::API::Host::EnumerateAdapters() {
-	std::vector<Adapter> list;
-	list.push_back(Adapter(0, 0, "Default"));
-	return list;
-}
-
-std::shared_ptr<Instance> Plugin::API::Host::CreateInstance(Adapter adapter) {
-	return std::make_unique<HostInstance>();
-}
-
-Plugin::API::Adapter Plugin::API::HostInstance::GetAdapter() {
-	return Adapter(0, 0, "Default");
-}
-
-void* Plugin::API::HostInstance::GetContext() {
-	return nullptr;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/api-opengl.cpp Deleted

@@ -1,68 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "api-opengl.h"
-#include <vector>
-
-using namespace Plugin::API;
-
-Plugin::API::OpenGL::OpenGL() {
-	// ToDo: Adapter enumeration needs to go by Display/Desktop.
-	// - Nvidia is the only one that has GPU Affinity extension.
-	// - Intel perhaps too since they used Nvidia technology. (Until recently at least)
-}
-
-Plugin::API::OpenGL::~OpenGL() {
-
-}
-
-std::string Plugin::API::OpenGL::GetName() {
-	return std::string("OpenGL");
-}
-
-Plugin::API::Type Plugin::API::OpenGL::GetType() {
-	return Type::OpenGL;
-}
-
-std::vector<Adapter> Plugin::API::OpenGL::EnumerateAdapters() {
-	std::vector<Adapter> adapters;
-	adapters.push_back(Adapter(0, 0, "Default"));
-	return adapters;
-}
-
-std::shared_ptr<Instance> Plugin::API::OpenGL::CreateInstance(Adapter adapter) {
-	// ToDo: Actually create a hidden window and OpenGL context. Not that it is going to be useful.
-	return std::make_unique<OpenGLInstance>();
-}
-
-Plugin::API::OpenGLInstance::OpenGLInstance() {
-
-}
-
-Plugin::API::OpenGLInstance::~OpenGLInstance() {
-
-}
-
-Plugin::API::Adapter Plugin::API::OpenGLInstance::GetAdapter() {
-	return Adapter(0, 0, "Default");
-}
-
-void* Plugin::API::OpenGLInstance::GetContext() {
-	return nullptr;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/enc-h264.cpp Deleted

@@ -1,1560 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
- //////////////////////////////////////////////////////////////////////////
- // New UI Design
- //////////////////////////////////////////////////////////////////////////
- // All: Preset
- // ----------- Static Section
- // Mas: Usage
- // All: Quality Preset
- // Adv: Profile
- // Adv: Profile Level
- // Mas: Aspect Ratio
- // Exp: Coding Type
- // Exp: Maximum Reference Frames
- // ----------- Rate Control Section
- // All: Rate Control Method
- // Adv: Pre-Pass Encoding (if supported)
- // All, CBR&VBR: Target Bitrate
- // All, VBR: Peak Bitrate
- // All, CQP: QP I/P/B
- // Adv, CBR&VBR: Min/Max QP
- // CBR: Filler Data
- // Adv: Frame Skipping
- // Exp: VBAQ
- // Exp: Enforce HRD
- // ----------- VBV Buffer
- // Adv: VBV Buffer Size
- // Exp: VBV Buffer Initial Fullness
- // ----------- Picture Control
- // All: Keyframe Interval (Float)
- // Mas: IDR Period (Overrides Keyframe Interval if non-zero)
- // Adv: B-Frames (if supported)
- // Adv: B-Frame Delta QP (if supported, not CQP)
- // Adv: B-Frame Reference (if supported and B-Frames enabled)
- // Adv: B-Frame Reference Delta QP (if supported, not CQP)
- // Exp: Deblocking Filter
- // Exp: Motion Estimation (Dropdown)
- // ----------- Intra-Refresh
- // ToDo: Master Mode only?
- // ----------- System
- // Adv: API
- // Adv: Adapter
- // Exp: OpenCL
- // All: View
-
-#include "enc-h264.h"
-#include "amf-encoder-h264.h"
-#include "amf-capabilities.h"
-#include "strings.h"
-#include "utility.h"
-
-#define PREFIX "[H264/AVC]"
-
-using namespace Plugin;
-using namespace Plugin::AMD;
-using namespace Plugin::Interface;
-using namespace Utility;
-
-void Plugin::Interface::H264Interface::encoder_register() {
-	// Test if we actually have AVC support.
-	if (!AMD::CapabilityManager::Instance()->IsCodecSupported(Codec::AVC)) {
-		PLOG_WARNING(PREFIX " Not supported by any GPU, disabling...");
-		return;
-	}
-
-	// Create structure
-	static std::unique_ptr<obs_encoder_info> encoder_info = std::make_unique<obs_encoder_info>();
-	std::memset(encoder_info.get(), 0, sizeof(obs_encoder_info));
-
-	// Initialize Structure
-	encoder_info->type = obs_encoder_type::OBS_ENCODER_VIDEO;
-	static const char* encoder_name = "amd_amf_h264";
-	encoder_info->id = encoder_name;
-	static const char* encoder_codec = "h264";
-	encoder_info->codec = encoder_codec;
-
-	// Functions
-	encoder_info->get_name = &get_name;
-	encoder_info->get_defaults = &get_defaults;
-	encoder_info->get_properties = &get_properties;
-	encoder_info->create = &create;
-	encoder_info->destroy = &destroy;
-	encoder_info->encode = &encode;
-	encoder_info->update = &update;
-	encoder_info->get_video_info = &get_video_info;
-	encoder_info->get_extra_data = &get_extra_data;
-
-	obs_register_encoder(encoder_info.get());
-	PLOG_DEBUG(PREFIX " Registered.");
-}
-
-const char* Plugin::Interface::H264Interface::get_name(void*) {
-	static const char* name = "H264/AVC Encoder (" PLUGIN_NAME ")";
-	return name;
-}
-
-void* Plugin::Interface::H264Interface::create(obs_data_t* settings, obs_encoder_t* encoder) {
-	try {
-		return new Plugin::Interface::H264Interface(settings, encoder);
-	} catch (std::exception e) {
-		PLOG_ERROR("%s", e.what());
-	}
-	return nullptr;
-}
-
-void Plugin::Interface::H264Interface::destroy(void* data) {
-	if (data)
-		delete static_cast<Plugin::Interface::H264Interface*>(data);
-}
-
-bool Plugin::Interface::H264Interface::encode(void *data, struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet) {
-	try {
-		if (data)
-			return static_cast<Plugin::Interface::H264Interface*>(data)->encode(frame, packet, received_packet);
-	} catch (std::exception e) {
-		PLOG_ERROR("%s", e.what());
-	}
-	return false;
-}
-
-void Plugin::Interface::H264Interface::get_defaults(obs_data_t *data) {
-#pragma region OBS - Enforce Streaming Service Restrictions
-	obs_data_set_default_int(data, "keyint_sec", 0);
-	obs_data_set_default_string(data, "rate_control", "");
-	obs_data_set_default_string(data, "profile", "");
-	obs_data_set_default_string(data, "preset", "");
-#pragma endregion OBS - Enforce Streaming Service Restrictions
-
-	// Preset
-	obs_data_set_default_int(data, P_PRESET, static_cast<int64_t>(Presets::None));
-
-	// Static Properties
-	//obs_data_set_default_int(data, P_USAGE, static_cast<int64_t>(Usage::Transcoding));
-	obs_data_set_default_int(data, P_QUALITYPRESET, static_cast<int64_t>(QualityPreset::Balanced));
-	obs_data_set_default_int(data, P_PROFILE, static_cast<int64_t>(Profile::High));
-	obs_data_set_default_int(data, P_PROFILELEVEL, static_cast<int64_t>(ProfileLevel::Automatic));
-	//obs_data_set_default_frames_per_second(data, P_ASPECTRATIO, media_frames_per_second{ 1, 1 }, "");
-	obs_data_set_default_int(data, P_CODINGTYPE, static_cast<int64_t>(CodingType::Automatic));
-	obs_data_set_default_int(data, P_MAXIMUMREFERENCEFRAMES, 4);
-
-	// Rate Control Properties
-	obs_data_set_default_int(data, ("last" P_RATECONTROLMETHOD), -1);
-	obs_data_set_default_int(data, P_RATECONTROLMETHOD, static_cast<int64_t>(RateControlMethod::ConstantBitrate));
-	obs_data_set_default_int(data, P_PREPASSMODE, static_cast<int64_t>(PrePassMode::Disabled));
-	obs_data_set_default_int(data, "bitrate", 3500);
-	obs_data_set_default_int(data, P_BITRATE_PEAK, 9000);
-	obs_data_set_default_int(data, P_QP_IFRAME, 22);
-	obs_data_set_default_int(data, P_QP_PFRAME, 22);
-	obs_data_set_default_int(data, P_QP_BFRAME, 22);
-	obs_data_set_default_int(data, P_QP_MINIMUM, 18);
-	obs_data_set_default_int(data, P_QP_MAXIMUM, 51);
-	obs_data_set_default_int(data, P_FILLERDATA, 1);
-	obs_data_set_default_int(data, P_FRAMESKIPPING, 0);
-	obs_data_set_default_int(data, P_FRAMESKIPPING_PERIOD, 0);
-	obs_data_set_default_int(data, P_FRAMESKIPPING_BEHAVIOUR, 0);
-	obs_data_set_default_int(data, P_VBAQ, 0);
-	obs_data_set_default_int(data, P_ENFORCEHRD, 1);
-
-	// VBV Buffer
-	obs_data_set_default_int(data, ("last" P_VBVBUFFER), -1);
-	obs_data_set_default_int(data, P_VBVBUFFER, 0);
-	obs_data_set_default_int(data, P_VBVBUFFER_SIZE, 3500);
-	obs_data_set_default_double(data, P_VBVBUFFER_STRICTNESS, 50);
-	obs_data_set_default_double(data, P_VBVBUFFER_INITIALFULLNESS, 100);
-
-	// Picture Control
-	obs_data_set_default_double(data, P_INTERVAL_KEYFRAME, 2.0);
-	obs_data_set_default_int(data, P_PERIOD_IDR_H264, 0);
-	obs_data_set_default_double(data, P_INTERVAL_IFRAME, 0.0);
-	obs_data_set_default_int(data, P_PERIOD_IFRAME, 0);
-	obs_data_set_default_double(data, P_INTERVAL_PFRAME, 0.0);
-	obs_data_set_default_int(data, P_PERIOD_PFRAME, 0);
-	obs_data_set_default_double(data, P_INTERVAL_BFRAME, 0.0);
-	obs_data_set_default_int(data, P_PERIOD_BFRAME, 0);
-	obs_data_set_default_int(data, ("last" P_BFRAME_PATTERN), -1);
-	obs_data_set_default_int(data, P_BFRAME_PATTERN, 0);
-	obs_data_set_default_int(data, ("last" P_BFRAME_REFERENCE), -1);
-	obs_data_set_default_int(data, P_BFRAME_REFERENCE, 0);
-	obs_data_set_default_int(data, P_BFRAME_REFERENCEDELTAQP, 2);
-	obs_data_set_default_int(data, P_BFRAME_DELTAQP, 4);
-	obs_data_set_default_int(data, P_DEBLOCKINGFILTER, 1);
-	obs_data_set_default_int(data, P_MOTIONESTIMATION, 3);
-
-	// System Properties
-	obs_data_set_default_string(data, ("last" P_VIDEO_API), "");
-	obs_data_set_default_string(data, P_VIDEO_API, "");
-	obs_data_set_default_int(data, ("last" P_VIDEO_ADAPTER), 0);
-	obs_data_set_default_int(data, P_VIDEO_ADAPTER, 0);
-	obs_data_set_default_int(data, P_OPENCL_TRANSFER, 0);
-	obs_data_set_default_int(data, P_OPENCL_CONVERSION, 0);
-	obs_data_set_default_int(data, P_MULTITHREADING, 0);
-	obs_data_set_default_int(data, P_QUEUESIZE, 8);
-	obs_data_set_default_int(data, ("last" P_VIEW), -1);
-	obs_data_set_default_int(data, P_VIEW, static_cast<int64_t>(ViewMode::Basic));
-	obs_data_set_default_bool(data, P_DEBUG, false);
-	obs_data_set_default_int(data, P_VERSION, PLUGIN_VERSION_FULL);
-}
-
-static void fill_api_list(obs_property_t* p) {
-	obs_property_list_clear(p);
-	auto cm = CapabilityManager::Instance();
-
-	for (auto api : Plugin::API::EnumerateAPIs()) {
-		if (cm->IsCodecSupportedByAPI(Codec::AVC, api->GetType()))
-			obs_property_list_add_string(p, api->GetName().c_str(), api->GetName().c_str());
-	}
-}
-
-static void fill_device_list(obs_property_t* p, const char* apiname) {
-	obs_property_list_clear(p);
-
-	auto cm = CapabilityManager::Instance();
-	auto api = Plugin::API::GetAPI(std::string(apiname));
-	for (auto adapter : api->EnumerateAdapters()) {
-		union {
-			int32_t id[2];
-			int64_t v;
-		} adapterid = { adapter.idLow, adapter.idHigh };
-		if (cm->IsCodecSupportedByAPIAdapter(Codec::AVC, api->GetType(), adapter))
-			obs_property_list_add_int(p, adapter.Name.c_str(), adapterid.v);
-	}
-}
-
-obs_properties_t* Plugin::Interface::H264Interface::get_properties(void* data) {
-	obs_properties* props = obs_properties_create();
-	obs_property_t* p;
-
-#pragma region Preset
-	p = obs_properties_add_list(props, P_PRESET, P_TRANSLATE(P_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_modified_callback(p, properties_modified);
-	obs_property_list_add_int(p, "", -1);
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_RESETTODEFAULTS), static_cast<int32_t>(Presets::ResetToDefaults));
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_RECORDING), static_cast<int32_t>(Presets::Recording));
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_HIGHQUALITY), static_cast<int32_t>(Presets::HighQuality));
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_INDISTINGUISHABLE), static_cast<int32_t>(Presets::Indistinguishable));
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_LOSSLESS), static_cast<int32_t>(Presets::Lossless));
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_TWITCH), static_cast<int32_t>(Presets::Twitch));
-	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_YOUTUBE), static_cast<int32_t>(Presets::YouTube));
-#pragma endregion Preset
-
-	// Static Properties
-#pragma region Quality Preset
-	p = obs_properties_add_list(props, P_QUALITYPRESET, P_TRANSLATE(P_QUALITYPRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUALITYPRESET)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_SPEED), static_cast<int32_t>(QualityPreset::Speed));
-	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_BALANCED), static_cast<int32_t>(QualityPreset::Balanced));
-	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_QUALITY), static_cast<int32_t>(QualityPreset::Quality));
-#pragma endregion Quality Preset
-
-#pragma region Profile, Levels
-	p = obs_properties_add_list(props, P_PROFILE, P_TRANSLATE(P_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILE)));
-	obs_property_list_add_int(p, "Constrained Baseline", static_cast<int32_t>(Profile::ConstrainedBaseline));
-	obs_property_list_add_int(p, "Baseline", static_cast<int32_t>(Profile::Baseline));
-	obs_property_list_add_int(p, "Main", static_cast<int32_t>(Profile::Main));
-	obs_property_list_add_int(p, "Constrained High", static_cast<int32_t>(Profile::ConstrainedHigh));
-	obs_property_list_add_int(p, "High", static_cast<int32_t>(Profile::High));
-
-	p = obs_properties_add_list(props, P_PROFILELEVEL, P_TRANSLATE(P_PROFILELEVEL), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILELEVEL)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(ProfileLevel::Automatic));
-	obs_property_list_add_int(p, "1.0", static_cast<int32_t>(ProfileLevel::L10));
-	obs_property_list_add_int(p, "1.1", static_cast<int32_t>(ProfileLevel::L11));
-	obs_property_list_add_int(p, "1.2", static_cast<int32_t>(ProfileLevel::L12));
-	obs_property_list_add_int(p, "1.3", static_cast<int32_t>(ProfileLevel::L13));
-	obs_property_list_add_int(p, "2.0", static_cast<int32_t>(ProfileLevel::L20));
-	obs_property_list_add_int(p, "2.1", static_cast<int32_t>(ProfileLevel::L21));
-	obs_property_list_add_int(p, "2.2", static_cast<int32_t>(ProfileLevel::L22));
-	obs_property_list_add_int(p, "3.0", static_cast<int32_t>(ProfileLevel::L30));
-	obs_property_list_add_int(p, "3.1", static_cast<int32_t>(ProfileLevel::L31));
-	obs_property_list_add_int(p, "3.2", static_cast<int32_t>(ProfileLevel::L32));
-	obs_property_list_add_int(p, "4.0", static_cast<int32_t>(ProfileLevel::L40));
-	obs_property_list_add_int(p, "4.1", static_cast<int32_t>(ProfileLevel::L41));
-	obs_property_list_add_int(p, "4.2", static_cast<int32_t>(ProfileLevel::L42));
-	obs_property_list_add_int(p, "5.0", static_cast<int32_t>(ProfileLevel::L50));
-	obs_property_list_add_int(p, "5.1", static_cast<int32_t>(ProfileLevel::L51));
-	obs_property_list_add_int(p, "5.2", static_cast<int32_t>(ProfileLevel::L52));
-#pragma endregion Profile, Levels
-
-#pragma region Coding Type
-	p = obs_properties_add_list(props, P_CODINGTYPE, P_TRANSLATE(P_CODINGTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_CODINGTYPE)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(CodingType::Automatic));
-	obs_property_list_add_int(p, "CABAC", static_cast<int32_t>(CodingType::CABAC));
-	obs_property_list_add_int(p, "CALVC", static_cast<int32_t>(CodingType::CALVC));
-#pragma endregion Coding Type
-
-#pragma region Maximum Reference Frames
-	p = obs_properties_add_int_slider(props, P_MAXIMUMREFERENCEFRAMES, P_TRANSLATE(P_MAXIMUMREFERENCEFRAMES),
-		1, 16, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MAXIMUMREFERENCEFRAMES)));
-#pragma endregion Maximum Reference Frames
-
-	// Rate Control
-#pragma region Rate Control Method
-	p = obs_properties_add_list(props, P_RATECONTROLMETHOD, P_TRANSLATE(P_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_RATECONTROLMETHOD)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CQP), static_cast<int32_t>(RateControlMethod::ConstantQP));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CBR), static_cast<int32_t>(RateControlMethod::ConstantBitrate));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBR), static_cast<int32_t>(RateControlMethod::PeakConstrainedVariableBitrate));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBRLAT), static_cast<int32_t>(RateControlMethod::LatencyConstrainedVariableBitrate));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion Rate Control Method
-
-#pragma region Pre-Pass
-	p = obs_properties_add_list(props, P_PREPASSMODE, P_TRANSLATE(P_PREPASSMODE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PREPASSMODE)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), static_cast<int32_t>(PrePassMode::Disabled));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), static_cast<int32_t>(PrePassMode::Enabled));
-#pragma endregion Pre-Pass
-
-#pragma region Parameters
-	/// Bitrate Constraints
-	p = obs_properties_add_int(props, "bitrate", P_TRANSLATE(P_BITRATE_TARGET), 0, 1, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_TARGET)));
-	p = obs_properties_add_int(props, P_BITRATE_PEAK, P_TRANSLATE(P_BITRATE_PEAK), 0, 1, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_PEAK)));
-
-	/// Minimum QP, Maximum QP
-	p = obs_properties_add_int_slider(props, P_QP_MINIMUM, P_TRANSLATE(P_QP_MINIMUM), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_MINIMUM)));
-	p = obs_properties_add_int_slider(props, P_QP_MAXIMUM, P_TRANSLATE(P_QP_MAXIMUM), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_MAXIMUM)));
-
-	/// Method: Constant QP
-	p = obs_properties_add_int_slider(props, P_QP_IFRAME, P_TRANSLATE(P_QP_IFRAME), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME)));
-	p = obs_properties_add_int_slider(props, P_QP_PFRAME, P_TRANSLATE(P_QP_PFRAME), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME)));
-	p = obs_properties_add_int_slider(props, P_QP_BFRAME, P_TRANSLATE(P_QP_BFRAME), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_BFRAME)));
-#pragma endregion Parameters
-
-#pragma region Filler Data
-	p = obs_properties_add_list(props, P_FILLERDATA, P_TRANSLATE(P_FILLERDATA), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FILLERDATA)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion Filler Data
-
-#pragma region Frame Skipping
-	p = obs_properties_add_list(props, P_FRAMESKIPPING, P_TRANSLATE(P_FRAMESKIPPING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-	p = obs_properties_add_int(props, P_FRAMESKIPPING_PERIOD, P_TRANSLATE(P_FRAMESKIPPING_PERIOD), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_PERIOD)));
-	p = obs_properties_add_list(props, P_FRAMESKIPPING_BEHAVIOUR, P_TRANSLATE(P_FRAMESKIPPING_BEHAVIOUR), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_BEHAVIOUR)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_SKIPNTH), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_KEEPNTH), 1);
-#pragma endregion Frame Skipping
-
-#pragma region VBAQ
-	p = obs_properties_add_list(props, P_VBAQ, P_TRANSLATE(P_VBAQ), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBAQ)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion VBAQ
-
-#pragma region Enforce Hyptothetical Reference Decoder Restrictions
-	p = obs_properties_add_list(props, P_ENFORCEHRD, P_TRANSLATE(P_ENFORCEHRD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_ENFORCEHRD)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion Enforce Hyptothetical Reference Decoder Restrictions
-
-	// VBV Buffer
-#pragma region VBV Buffer Mode
-	p = obs_properties_add_list(props, P_VBVBUFFER, P_TRANSLATE(P_VBVBUFFER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_MANUAL), 1);
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion VBV Buffer Mode
-
-#pragma region VBV Buffer Strictness
-	p = obs_properties_add_float_slider(props, P_VBVBUFFER_STRICTNESS, P_TRANSLATE(P_VBVBUFFER_STRICTNESS), 0.0, 100.0, 0.1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_STRICTNESS)));
-#pragma endregion VBV Buffer Strictness
-
-#pragma region VBV Buffer Size
-	p = obs_properties_add_int_slider(props, P_VBVBUFFER_SIZE, P_TRANSLATE(P_VBVBUFFER_SIZE), 1, 1000000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_SIZE)));
-#pragma endregion VBV Buffer Size
-
-#pragma region VBV Buffer Initial Fullness
-	p = obs_properties_add_float_slider(props, P_VBVBUFFER_INITIALFULLNESS, P_TRANSLATE(P_VBVBUFFER_INITIALFULLNESS), 0.0, 100.0, 100.0 / 64.0);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_INITIALFULLNESS)));
-#pragma endregion VBV Buffer Initial Fullness
-
-	// Picture Control
-#pragma region Interval and Periods
-/// Keyframe, IDR
-	p = obs_properties_add_float(props, P_INTERVAL_KEYFRAME, P_TRANSLATE(P_INTERVAL_KEYFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_KEYFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_IDR_H264, P_TRANSLATE(P_PERIOD_IDR_H264), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IDR_H264)));
-	/// I-Frame
-	p = obs_properties_add_float(props, P_INTERVAL_IFRAME, P_TRANSLATE(P_INTERVAL_IFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_IFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_IFRAME, P_TRANSLATE(P_PERIOD_IFRAME), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IFRAME)));
-	/// P-Frame
-	p = obs_properties_add_float(props, P_INTERVAL_PFRAME, P_TRANSLATE(P_INTERVAL_PFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_PFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_PFRAME, P_TRANSLATE(P_PERIOD_PFRAME), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_PFRAME)));
-	/// B-Frame
-	p = obs_properties_add_float(props, P_INTERVAL_BFRAME, P_TRANSLATE(P_INTERVAL_BFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_BFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_BFRAME, P_TRANSLATE(P_PERIOD_BFRAME), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_BFRAME)));
-#pragma endregion Interval and Periods
-
-#pragma region B-Frames Pattern
-	p = obs_properties_add_int_slider(props, P_BFRAME_PATTERN, P_TRANSLATE(P_BFRAME_PATTERN), 0, 3, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_PATTERN)));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion B-Frames Pattern
-
-#pragma region B-Frames Reference
-	p = obs_properties_add_list(props, P_BFRAME_REFERENCE, P_TRANSLATE(P_BFRAME_REFERENCE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_REFERENCE)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion B-Frames Reference
-
-#pragma region B-Frames Delta QP
-	p = obs_properties_add_int_slider(props, P_BFRAME_REFERENCEDELTAQP, P_TRANSLATE(P_BFRAME_REFERENCEDELTAQP), -10, 10, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_REFERENCEDELTAQP)));
-
-	p = obs_properties_add_int_slider(props, P_BFRAME_DELTAQP, P_TRANSLATE(P_BFRAME_DELTAQP), -10, 10, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_DELTAQP)));
-#pragma endregion B-Frames Delta QP
-
-#pragma region Deblocking Filter
-	p = obs_properties_add_list(props, P_DEBLOCKINGFILTER, P_TRANSLATE(P_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBLOCKINGFILTER)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion Deblocking Filter
-
-#pragma region Motion Estimation
-	p = obs_properties_add_list(props, P_MOTIONESTIMATION, P_TRANSLATE(P_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MOTIONESTIMATION)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_HALF), 1);
-	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_QUARTER), 2);
-	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_FULL), 3);
-#pragma endregion Motion Estimation
-
-	// System
-#pragma region Video APIs
-	p = obs_properties_add_list(props, P_VIDEO_API, P_TRANSLATE(P_VIDEO_API), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_API)));
-	obs_property_set_modified_callback(p, properties_modified);
-	fill_api_list(p);
-#pragma endregion Video APIs
-
-#pragma region Video Adapters
-	p = obs_properties_add_list(props, P_VIDEO_ADAPTER, P_TRANSLATE(P_VIDEO_ADAPTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_ADAPTER)));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion Video Adapters
-
-#pragma region OpenCL
-	p = obs_properties_add_list(props, P_OPENCL_TRANSFER, P_TRANSLATE(P_OPENCL_TRANSFER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_TRANSFER)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-
-	p = obs_properties_add_list(props, P_OPENCL_CONVERSION, P_TRANSLATE(P_OPENCL_CONVERSION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_CONVERSION)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion OpenCL
-
-#pragma region Asynchronous Queue
-	p = obs_properties_add_list(props, P_MULTITHREADING, P_TRANSLATE(P_MULTITHREADING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MULTITHREADING)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-
-	p = obs_properties_add_int_slider(props, P_QUEUESIZE, P_TRANSLATE(P_QUEUESIZE), 1, 32, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUEUESIZE)));
-#pragma endregion Asynchronous Queue
-
-#pragma region View Mode
-	p = obs_properties_add_list(props, P_VIEW, P_TRANSLATE(P_VIEW), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIEW)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_BASIC), static_cast<int32_t>(ViewMode::Basic));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_ADVANCED), static_cast<int32_t>(ViewMode::Advanced));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_EXPERT), static_cast<int32_t>(ViewMode::Expert));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_MASTER), static_cast<int32_t>(ViewMode::Master));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion View Mode
-
-	/// Debug
-	p = obs_properties_add_bool(props, P_DEBUG, P_TRANSLATE(P_DEBUG));
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBUG)));
-
-	// Disable non-dynamic properties if we have an encoder.
-	obs_properties_set_param(props, data, nullptr);
-
-	return props;
-}
-
-static void obs_data_transfer_settings(obs_data_t * data) {
-#define TRANSFER_STRING(xold, xnew) obs_data_set_string(data, xnew, obs_data_get_string(data, xold))
-#define TRANSFER_FLOAT(xold, xnew) obs_data_set_double(data, xnew, obs_data_get_double(data, xold))
-#define TRANSFER_INT(xold, xnew) obs_data_set_int(data, xnew, obs_data_get_int(data, xold))
-#define TRANSFER_BOOL(xold, xnew) obs_data_set_bool(data, xnew, obs_data_get_bool(data, xold))
-
-	uint64_t version = obs_data_get_int(data, P_VERSION);
-	switch (version) {
-		case (((uint64_t)(1 & 0xFFFF) << 48ull) | ((uint64_t)(4 & 0xFFFF) << 32ull) | ((uint64_t)(3 & 0xFFFF) << 16ull) | ((uint64_t)(5) & 0xFFFF)):
-			obs_data_set_double(data, "AMF.H264.VBVBuffer.Strictness", obs_data_get_double(data, "AMF.H264.VBVBuffer.Strictness") + 50.0);
-		case (((uint64_t)(1 & 0xFFFF) << 48ull) | ((uint64_t)(4 & 0xFFFF) << 32ull) | ((uint64_t)(3 & 0xFFFF) << 16ull) | ((uint64_t)(8) & 0xFFFF)):
-			TRANSFER_INT("AMF.H264.Preset", P_PRESET);
-
-			// Static
-			//TRANSFER_INT("AMF.H264.Usage", P_USAGE);
-			TRANSFER_INT("AMF.H264.QualityPreset", P_QUALITYPRESET);
-			TRANSFER_INT("AMF.H264.Profile", P_PROFILE);
-			TRANSFER_INT("AMF.H264.ProfileLevel", P_PROFILELEVEL);
-			TRANSFER_INT("AMF.H264.AspectRatio", P_ASPECTRATIO);
-			TRANSFER_INT("AMF.H264.CodingType", P_CODINGTYPE);
-			TRANSFER_INT("AMF.H264.MaximumReferenceFrames", P_MAXIMUMREFERENCEFRAMES);
-
-			// Rate Control
-			TRANSFER_INT("AMF.H264.RateControlMethod", P_RATECONTROLMETHOD);
-			TRANSFER_INT("AMF.H264.PreAnalysisPass", P_PREPASSMODE);
-			TRANSFER_INT("AMF.H264.Bitrate.Target", P_BITRATE_TARGET);
-			TRANSFER_INT("AMF.H264.Bitrate.Peak", P_BITRATE_PEAK);
-			TRANSFER_INT("AMF.H264.QP.IFrame", P_QP_IFRAME);
-			TRANSFER_INT("AMF.H264.QP.PFrame", P_QP_PFRAME);
-			TRANSFER_INT("AMF.H264.QP.BFrame", P_QP_BFRAME);
-			TRANSFER_INT("AMF.H264.QP.Minimum", P_QP_MINIMUM);
-			TRANSFER_INT("AMF.H264.QP.Maximum", P_QP_MAXIMUM);
-			TRANSFER_INT("AMF.H264.FillerData", P_FILLERDATA);
-			TRANSFER_INT("AMF.H264.FrameSkipping", P_FRAMESKIPPING);
-			TRANSFER_INT("AMF.H264.VBAQ", P_VBAQ);
-			TRANSFER_INT("AMF.H264.EnforceHRD", P_ENFORCEHRD);
-
-			// VBV Buffer
-			TRANSFER_INT("AMF.H264.VBVBuffer", P_VBVBUFFER);
-			TRANSFER_FLOAT("AMF.H264.VBVBuffer.Strictness", P_VBVBUFFER_STRICTNESS);
-			TRANSFER_INT("AMF.H264.VBVBuffer.Size", P_VBVBUFFER_SIZE);
-			TRANSFER_FLOAT("AMF.H264.VBVBuffer.Fullness", P_VBVBUFFER_INITIALFULLNESS);
-
-			// Picture Control
-			TRANSFER_FLOAT("AMF.H264.KeyframeInterval", P_INTERVAL_KEYFRAME);
-			TRANSFER_INT("AMF.H264.IDRPeriod", P_PERIOD_IDR_H264);
-			/// GOP Type
-			/// GOP Size
-			/// GOP Alignment
-			TRANSFER_INT("AMF.H264.BFrame.Pattern", P_BFRAME_PATTERN);
-			TRANSFER_INT("AMF.H264.BFrame.DeltaQP", P_BFRAME_DELTAQP);
-			TRANSFER_INT("AMF.H264.BFrame.Reference", P_BFRAME_REFERENCE);
-			TRANSFER_INT("AMF.H264.BFrame.DeltaQP", P_BFRAME_REFERENCEDELTAQP);
-			TRANSFER_INT("AMF.H264.DeblockingFilter", P_DEBLOCKINGFILTER);
-			TRANSFER_INT("AMF.H264.MotionEstimation", P_MOTIONESTIMATION);
-
-			// System
-			TRANSFER_STRING("AMF.H264.VideoAPI", P_VIDEO_API);
-			TRANSFER_INT("AMF.H264.VideoAdapter", P_VIDEO_ADAPTER);
-			TRANSFER_INT("AMF.H264.OpenCL", P_OPENCL_TRANSFER);
-			TRANSFER_INT("AMF.H264.OpenCL", P_OPENCL_CONVERSION);
-			TRANSFER_INT("AMF.H264.View", P_VIEW);
-			TRANSFER_INT("AMF.H264.Debug", P_DEBUG);
-		case (((uint64_t)(2 & 0xFFFF) << 48ull) | ((uint64_t)(0 & 0xFFFF) << 32ull) | ((uint64_t)(0) & 0xFFFFFFFF)):
-			TRANSFER_FLOAT("KeyframeInterval", P_INTERVAL_KEYFRAME);
-			TRANSFER_INT("H264.IDRPeriod", P_PERIOD_IDR_H264);
-			TRANSFER_INT("H265.IDRPeriod", P_PERIOD_IDR_H265);
-		case (((uint64_t)(2 & 0xFFFF) << 48ull) | ((uint64_t)(3 & 0xFFFF) << 32ull) | ((uint64_t)(0) & 0xFFFFFFFF)):
-			TRANSFER_INT(P_BITRATE_TARGET, "bitrate");
-	}
-	obs_data_set_int(data, P_VERSION, PLUGIN_VERSION_FULL);
-}
-
-bool Plugin::Interface::H264Interface::properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
-	bool result = false;
-	obs_property_t* p;
-
-	// Transfer settings from older Plugin versions to newer ones.
-	obs_data_transfer_settings(data);
-
-#pragma region Video API & Adapter
-	// Video API
-	const char
-		*videoAPI_last = obs_data_get_string(data, ("last" P_VIDEO_API)),
-		*videoAPI_cur = obs_data_get_string(data, P_VIDEO_API);
-	if (strlen(videoAPI_cur) == 0) {
-		p = obs_properties_get(props, P_VIDEO_API);
-		obs_data_set_string(data, P_VIDEO_API, obs_property_list_item_string(p, 0));
-		videoAPI_cur = obs_data_get_string(data, P_VIDEO_API);
-
-		result = true;
-	}
-	/// If a different API was selected, rebuild the device list.
-	if (strcmp(videoAPI_last, videoAPI_cur) != 0) {
-		obs_data_set_string(data, ("last" P_VIDEO_API), videoAPI_cur);
-		fill_device_list(obs_properties_get(props, P_VIDEO_ADAPTER), videoAPI_cur);
-		result = true;
-
-		// Reset Video Adapter to first in list.
-		obs_data_set_int(data, P_VIDEO_ADAPTER,
-			obs_property_list_item_int(obs_properties_get(props, P_VIDEO_ADAPTER), 0));
-	}
-
-	// Video Adapter
-	int64_t
-		videoAdapter_last = obs_data_get_int(data, ("last" P_VIDEO_ADAPTER)),
-		videoAdapter_cur = obs_data_get_int(data, P_VIDEO_ADAPTER);
-	if (videoAdapter_last != videoAdapter_cur) {
-		obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), videoAdapter_cur);
-		result = true;
-
-		auto api = Plugin::API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
-		union {
-			int64_t v;
-			uint32_t id[2];
-		} adapterid = { videoAdapter_cur };
-		auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
-		try {
-			auto enc = EncoderH264(api, adapter);
-
-		#define TEMP_LIMIT_DROPDOWN(func, enm, prop) { \
-				auto tmp_p = obs_properties_get(props, prop); \
-				auto tmp_l = enc.func(); \
-				enm tmp_s = static_cast<enm>(obs_data_get_int(data, obs_property_name(tmp_p))); \
-				for (size_t idx = 0; idx < obs_property_list_item_count(tmp_p); idx++) { \
-					bool enabled = false; \
-					enm tmp_v = static_cast<enm>(obs_property_list_item_int(tmp_p, idx)); \
-					for (auto tmp_k : tmp_l) { \
-						if (tmp_k == tmp_v) { \
-							enabled = true; \
-							break; \
-						} \
-					} \
-					obs_property_list_item_disable(tmp_p, idx, !enabled); \
-					if ((enabled == false) && (tmp_s == tmp_v)) \
-						obs_data_unset_user_value(data, obs_property_name(tmp_p)); \
-				} \
-			}
-		#define TEMP_LIMIT_SLIDER(func, prop) { \
-				auto tmp_p = obs_properties_get(props, prop); \
-				auto tmp_l = enc.func(); \
-				obs_property_int_set_limits(tmp_p, (int)tmp_l.first, (int)tmp_l.second, 1); \
-			}
-		#define TEMP_LIMIT_SLIDER_BITRATE(func, prop) { \
-				auto tmp_p = obs_properties_get(props, prop); \
-				auto tmp_l = enc.func(); \
-				obs_property_int_set_limits(tmp_p, (int)tmp_l.first / 1000, (int)tmp_l.second / 1000, 1); \
-			}
-
-			//TEMP_LIMIT_DROPDOWN(CapsUsage, AMD::Usage, P_USAGE);
-			TEMP_LIMIT_DROPDOWN(CapsQualityPreset, AMD::QualityPreset, P_QUALITYPRESET);
-			TEMP_LIMIT_DROPDOWN(CapsProfile, AMD::Profile, P_PROFILE);
-			TEMP_LIMIT_DROPDOWN(CapsProfileLevel, AMD::ProfileLevel, P_PROFILELEVEL);
-			{
-				auto tmp_p = obs_properties_get(props, P_PROFILELEVEL);
-				obs_property_list_item_disable(tmp_p, 0, false);
-			}
-			TEMP_LIMIT_DROPDOWN(CapsCodingType, AMD::CodingType, P_CODINGTYPE);
-			TEMP_LIMIT_SLIDER(CapsMaximumReferenceFrames, P_MAXIMUMREFERENCEFRAMES);
-			TEMP_LIMIT_DROPDOWN(CapsRateControlMethod, AMD::RateControlMethod, P_RATECONTROLMETHOD);
-			TEMP_LIMIT_DROPDOWN(CapsPrePassMode, AMD::PrePassMode, P_PREPASSMODE);
-			TEMP_LIMIT_SLIDER_BITRATE(CapsTargetBitrate, "bitrate");
-			TEMP_LIMIT_SLIDER_BITRATE(CapsPeakBitrate, P_BITRATE_PEAK);
-			TEMP_LIMIT_SLIDER_BITRATE(CapsVBVBufferSize, P_VBVBUFFER_SIZE);
-			{
-				auto bframep = obs_properties_get(props, P_BFRAME_PATTERN);
-				auto bframecaps = enc.CapsBFramePattern();
-				obs_property_int_set_limits(bframep, 0, (int)bframecaps, 1);
-				if (obs_data_get_int(data, obs_property_name(bframep)) > bframecaps) {
-					obs_data_set_int(data, obs_property_name(bframep), bframecaps);
-				}
-			}
-		} catch (const std::exception& e) {
-			PLOG_ERROR("Exception occured while updating capabilities: %s",
-				e.what());
-		}
-	}
-#pragma endregion Video API & Adapter
-
-#pragma region Presets
-	Presets lastPreset = static_cast<Presets>(obs_data_get_int(data, ("last" P_PRESET))),
-		preset = static_cast<Presets>(obs_data_get_int(data, P_PRESET));
-	if (lastPreset != preset) { // Reset State
-		obs_property_t* pn = obs_properties_first(props);
-		do {
-			obs_property_set_enabled(pn, true);
-		} while (obs_property_next(&pn));
-
-		result = true;
-	}
-	if (preset != Presets::None)
-		result = true;
-
-	switch (preset) {
-		case Presets::ResetToDefaults:
-		#pragma region Default
-		{
-			obs_property_t* pn = obs_properties_first(props);
-			do {
-				const char* name = obs_property_name(pn);
-
-				// Do not reset Video Adapter or API.
-				if ((strcmp(name, P_VIDEO_API) == 0) || (strcmp(name, P_VIDEO_ADAPTER) == 0))
-					continue;
-
-				switch (obs_property_get_type(pn)) {
-					case obs_property_type::OBS_PROPERTY_BOOL:
-						obs_data_set_bool(data, name, obs_data_get_default_bool(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_FLOAT:
-						obs_data_set_double(data, name, obs_data_get_default_double(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_INT:
-						obs_data_set_int(data, name, obs_data_get_default_int(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_TEXT:
-						obs_data_set_string(data, name, obs_data_get_default_string(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_LIST:
-						switch (obs_property_list_format(pn)) {
-							case obs_combo_format::OBS_COMBO_FORMAT_INT:
-								obs_data_set_int(data, name, obs_data_get_default_int(data, name));
-								break;
-							case obs_combo_format::OBS_COMBO_FORMAT_FLOAT:
-								obs_data_set_double(data, name, obs_data_get_default_double(data, name));
-								break;
-							case obs_combo_format::OBS_COMBO_FORMAT_STRING:
-								obs_data_set_string(data, name, obs_data_get_default_string(data, name));
-								break;
-						}
-						break;
-				}
-				obs_property_set_enabled(pn, true);
-			} while (obs_property_next(&pn));
-		}
-		break;
-	#pragma endregion Default
-		case Presets::Recording:
-		#pragma region Recording
-			// Static Properties
-			//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
-			//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
-			obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
-			obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
-
-			// Rate Control Properties
-			obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::LatencyConstrainedVariableBitrate));
-			obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
-			if (obs_data_get_int(data, "bitrate") < 10000)
-				obs_data_set_int(data, "bitrate", 10000);
-			obs_data_unset_user_value(data, P_QP_MINIMUM);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_MINIMUM), false);
-			obs_data_unset_user_value(data, P_QP_MAXIMUM);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_MAXIMUM), false);
-			obs_data_set_int(data, P_FILLERDATA, 0);
-			obs_property_set_enabled(obs_properties_get(props, P_FILLERDATA), false);
-
-			// Frame Control Properties
-			if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
-				obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-
-			// Miscellaneous Properties
-			obs_data_set_int(data, P_MOTIONESTIMATION, 3);
-			obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
-			break;
-		#pragma endregion Recording
-		case Presets::HighQuality:
-		#pragma region High Quality
-			// Static Properties
-			//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
-			//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
-			obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
-			obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
-
-			// Rate Control Properties
-			obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantQP));
-			obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
-			obs_data_set_int(data, P_QP_IFRAME, 18);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_IFRAME), false);
-			obs_data_set_int(data, P_QP_PFRAME, 18);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_PFRAME), false);
-			obs_data_set_int(data, P_QP_BFRAME, 18);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_BFRAME), false);
-
-			// Frame Control Properties
-			if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
-				obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-
-			// Miscellaneous Properties
-			obs_data_set_int(data, P_MOTIONESTIMATION, 3);
-			obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
-			break;
-		#pragma endregion High Quality
-		case Presets::Indistinguishable:
-		#pragma region Indistinguishable
-			// Static Properties
-			//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
-			//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
-			obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
-			obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
-
-			// Rate Control Properties
-			obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantQP));
-			obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
-			obs_data_set_int(data, P_QP_IFRAME, 15);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_IFRAME), false);
-			obs_data_set_int(data, P_QP_PFRAME, 15);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_PFRAME), false);
-			obs_data_set_int(data, P_QP_BFRAME, 15);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_BFRAME), false);
-
-			// Frame Control Properties
-			if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
-				obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-
-			// Miscellaneous Properties
-			obs_data_set_int(data, P_MOTIONESTIMATION, 3);
-			obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
-			break;
-		#pragma endregion Indistinguishable
-		case Presets::Lossless:
-		#pragma region Lossless
-			// Static Properties
-			//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
-			//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
-			obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
-			obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
-
-			// Rate Control Properties
-			obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantQP));
-			obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
-			obs_data_set_int(data, P_QP_IFRAME, 0);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_IFRAME), false);
-			obs_data_set_int(data, P_QP_PFRAME, 0);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_PFRAME), false);
-
-			// Frame Control Properties
-			if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
-				obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-			//obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-			//obs_property_set_enabled(obs_properties_get(props, P_INTERVAL_KEYFRAME), true);
-			obs_data_set_int(data, P_BFRAME_PATTERN, 0);
-			obs_property_set_enabled(obs_properties_get(props, P_BFRAME_PATTERN), false);
-
-			// Miscellaneous Properties
-			obs_data_set_int(data, P_MOTIONESTIMATION, 3);
-			obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
-			break;
-		#pragma endregion Lossless
-		case Presets::Twitch:
-		#pragma region Twitch
-			// Static Properties
-			//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
-			//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
-			obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::Main));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
-			obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
-
-			// Rate Control Properties
-			obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantBitrate));
-			obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
-			if (obs_data_get_int(data, "bitrate") < 500)
-				obs_data_set_int(data, "bitrate", 500);
-			obs_data_unset_user_value(data, P_QP_MINIMUM);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_MINIMUM), false);
-			obs_data_unset_user_value(data, P_QP_MAXIMUM);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_MAXIMUM), false);
-			obs_data_set_int(data, P_FILLERDATA, 1);
-			obs_property_set_enabled(obs_properties_get(props, P_FILLERDATA), false);
-
-			// Frame Control Properties
-			obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-			obs_property_set_enabled(obs_properties_get(props, P_INTERVAL_KEYFRAME), false);
-
-			// Miscellaneous Properties
-			obs_data_set_int(data, P_MOTIONESTIMATION, 3);
-			obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
-			break;
-		#pragma endregion Twitch
-		case Presets::YouTube:
-		#pragma region YouTube
-			// Static Properties
-			//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
-			//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
-			obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::Main));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
-			obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
-			obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
-
-			// Rate Control Properties
-			obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantBitrate));
-			obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
-			if (obs_data_get_int(data, "bitrate") < 500)
-				obs_data_set_int(data, "bitrate", 500);
-			obs_data_unset_user_value(data, P_QP_MINIMUM);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_MINIMUM), false);
-			obs_data_unset_user_value(data, P_QP_MAXIMUM);
-			obs_property_set_enabled(obs_properties_get(props, P_QP_MAXIMUM), false);
-			obs_data_set_int(data, P_FILLERDATA, 1);
-			obs_property_set_enabled(obs_properties_get(props, P_FILLERDATA), false);
-
-			// Frame Control Properties
-			obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
-			obs_property_set_enabled(obs_properties_get(props, P_INTERVAL_KEYFRAME), false);
-
-			// Miscellaneous Properties
-			obs_data_set_int(data, P_MOTIONESTIMATION, 3);
-			obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
-			break;
-		#pragma endregion YouTube
-	}
-#pragma endregion Presets
-
-#pragma region View Mode
-	ViewMode lastView = static_cast<ViewMode>(obs_data_get_int(data, ("last" P_VIEW))),
-		curView = static_cast<ViewMode>(obs_data_get_int(data, P_VIEW));
-	if (lastView != curView) {
-		obs_data_set_int(data, ("last" P_VIEW), static_cast<int32_t>(curView));
-		result = true;
-	}
-
-	std::vector<std::pair<const char*, ViewMode>> viewstuff = {
-		std::make_pair(P_PRESET, ViewMode::Basic),
-		// ----------- Static Section
-		//std::make_pair(P_USAGE, ViewMode::Master),
-		std::make_pair(P_QUALITYPRESET, ViewMode::Basic),
-		std::make_pair(P_PROFILE, ViewMode::Advanced),
-		std::make_pair(P_PROFILELEVEL, ViewMode::Advanced),
-		std::make_pair(P_ASPECTRATIO, ViewMode::Master),
-		std::make_pair(P_CODINGTYPE, ViewMode::Expert),
-		std::make_pair(P_MAXIMUMREFERENCEFRAMES, ViewMode::Expert),
-		// ----------- Rate Control Section
-		std::make_pair(P_RATECONTROLMETHOD, ViewMode::Basic),
-		//std::make_pair(P_PREPASSMODE, ViewMode::Basic),
-		//std::make_pair(P_BITRATE_TARGET, ViewMode::Basic),
-		//std::make_pair(P_BITRATE_PEAK, ViewMode::Basic),
-		//std::make_pair(P_QP_IFRAME, ViewMode::Basic),
-		//std::make_pair(P_QP_PFRAME, ViewMode::Basic),
-		//std::make_pair(P_QP_BFRAME, ViewMode::Basic),
-		//std::make_pair(P_QP_MINIMUM, ViewMode::Advanced),
-		//std::make_pair(P_QP_MAXIMUM, ViewMode::Advanced),
-		//std::make_pair(P_FILLERDATA, ViewMode::Basic),
-		std::make_pair(P_FRAMESKIPPING, ViewMode::Advanced),
-		std::make_pair(P_FRAMESKIPPING_PERIOD, ViewMode::Master),
-		std::make_pair(P_FRAMESKIPPING_BEHAVIOUR, ViewMode::Master),
-		//std::make_pair(P_VBAQ, ViewMode::Expert),
-		std::make_pair(P_ENFORCEHRD, ViewMode::Expert),
-		// ----------- VBV Buffer
-		std::make_pair(P_VBVBUFFER, ViewMode::Advanced),
-		//std::make_pair(P_VBVBUFFER_STRICTNESS, ViewMode::Advanced),
-		//std::make_pair(P_VBVBUFFER_SIZE, ViewMode::Advanced),
-		std::make_pair(P_VBVBUFFER_INITIALFULLNESS, ViewMode::Expert),
-		// ----------- Picture Control
-		std::make_pair(P_INTERVAL_KEYFRAME, ViewMode::Basic),
-		std::make_pair(P_PERIOD_IDR_H264, ViewMode::Master),
-		std::make_pair(P_INTERVAL_IFRAME, ViewMode::Master),
-		std::make_pair(P_PERIOD_IFRAME, ViewMode::Master),
-		std::make_pair(P_INTERVAL_PFRAME, ViewMode::Master),
-		std::make_pair(P_PERIOD_PFRAME, ViewMode::Master),
-		//std::make_pair(P_INTERVAL_BFRAME, ViewMode::Master),
-		//std::make_pair(P_PERIOD_BFRAME, ViewMode::Master),
-		std::make_pair(P_BFRAME_PATTERN, ViewMode::Advanced),
-		std::make_pair(P_BFRAME_DELTAQP, ViewMode::Advanced),
-		std::make_pair(P_BFRAME_REFERENCE, ViewMode::Advanced),
-		std::make_pair(P_BFRAME_REFERENCEDELTAQP, ViewMode::Advanced),
-		std::make_pair(P_DEBLOCKINGFILTER, ViewMode::Expert),
-		std::make_pair(P_MOTIONESTIMATION, ViewMode::Expert),
-		// ----------- Intra-Refresh
-		//std::make_pair("", ViewMode::Master),
-		// ----------- System
-		std::make_pair(P_VIDEO_API, ViewMode::Advanced),
-		std::make_pair(P_VIDEO_ADAPTER, ViewMode::Advanced),
-		std::make_pair(P_OPENCL_TRANSFER, ViewMode::Advanced),
-		std::make_pair(P_OPENCL_CONVERSION, ViewMode::Advanced),
-		std::make_pair(P_MULTITHREADING, ViewMode::Expert),
-		std::make_pair(P_QUEUESIZE, ViewMode::Expert),
-		std::make_pair(P_VIEW, ViewMode::Basic),
-		std::make_pair(P_DEBUG, ViewMode::Basic),
-	};
-	for (std::pair<const char*, ViewMode> kv : viewstuff) {
-		bool vis = curView >= kv.second;
-		auto visp = obs_properties_get(props, kv.first);
-		if (visp != nullptr) {
-			obs_property_set_visible(visp, vis);
-			if (!vis)
-				obs_data_unset_user_value(data, kv.first);
-		}
-	}
-
-	// Special Logic
-#pragma region B-Frames
-	auto bframeProperty = obs_properties_get(props, P_BFRAME_PATTERN);
-	bool bframeSupported = obs_property_int_max(bframeProperty) > 0;
-	bool bframeVisible = (curView >= ViewMode::Advanced) && bframeSupported;
-
-	/// Pattern
-	obs_property_set_visible(bframeProperty, (curView >= ViewMode::Advanced) && bframeSupported);
-	if (!bframeVisible)
-		obs_data_unset_user_value(data, P_BFRAME_PATTERN);
-	bool lastUsingBFrames = obs_data_get_int(data, ("last" P_BFRAME_PATTERN)) != 0,
-		usingBFrames = obs_data_get_int(data, P_BFRAME_PATTERN) != 0;
-	if (usingBFrames != lastUsingBFrames) {
-		obs_data_set_int(data, ("last" P_BFRAME_PATTERN), obs_data_get_int(data, P_BFRAME_PATTERN));
-		result = true;
-	}
-
-	/// Reference
-	bool bframeReferenceVisible = (curView >= ViewMode::Advanced) && bframeSupported && usingBFrames;
-	obs_property_set_visible(obs_properties_get(props, P_BFRAME_REFERENCE), bframeReferenceVisible);
-	if (!bframeReferenceVisible)
-		obs_data_unset_user_value(data, P_BFRAME_REFERENCE);
-	bool lastUsingBFrameReference = obs_data_get_int(data, ("last" P_BFRAME_REFERENCE)) != 0,
-		usingBFrameReference = obs_data_get_int(data, P_BFRAME_REFERENCE) == 1;
-	if (usingBFrameReference != lastUsingBFrameReference) {
-		obs_data_set_int(data, ("last" P_BFRAME_REFERENCE), obs_data_get_int(data, P_BFRAME_REFERENCE));
-		result = true;
-	}
-
-	/// QP Delta
-	obs_property_set_visible(obs_properties_get(props, P_BFRAME_DELTAQP), bframeVisible && usingBFrames);
-	if (!bframeVisible || !usingBFrames)
-		obs_data_unset_user_value(data, P_BFRAME_DELTAQP);
-	obs_property_set_visible(obs_properties_get(props, P_BFRAME_REFERENCEDELTAQP), bframeVisible && usingBFrames && usingBFrameReference);
-	if (!bframeVisible || !usingBFrames || !usingBFrameReference)
-		obs_data_unset_user_value(data, P_BFRAME_REFERENCEDELTAQP);
-#pragma endregion B-Frames
-
-#pragma region Rate Control
-	bool vis_rcm_bitrate_target = false,
-		vis_rcm_bitrate_peak = false,
-		vis_rcm_qp = false,
-		vis_rcm_qp_b = false,
-		vis_rcm_fillerdata = false;
-
-	RateControlMethod lastRCM = static_cast<RateControlMethod>(obs_data_get_int(data, ("last" P_RATECONTROLMETHOD))),
-		curRCM = static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD));
-	if (lastRCM != curRCM) {
-		obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), static_cast<int32_t>(curRCM));
-		result = true;
-	}
-	switch (curRCM) {
-		case RateControlMethod::ConstantQP:
-			vis_rcm_qp = true;
-			vis_rcm_qp_b = bframeSupported && usingBFrames;
-			break;
-		case RateControlMethod::ConstantBitrate:
-			vis_rcm_bitrate_target = true;
-			vis_rcm_fillerdata = true;
-			break;
-		case RateControlMethod::PeakConstrainedVariableBitrate:
-			vis_rcm_bitrate_target = true;
-			vis_rcm_bitrate_peak = true;
-			break;
-		case RateControlMethod::LatencyConstrainedVariableBitrate:
-			vis_rcm_bitrate_target = true;
-			vis_rcm_bitrate_peak = true;
-			break;
-	}
-
-	/// Bitrate
-	obs_property_set_visible(obs_properties_get(props, "bitrate"), vis_rcm_bitrate_target);
-	if (!vis_rcm_bitrate_target)
-		obs_data_unset_user_value(data, "bitrate");
-	obs_property_set_visible(obs_properties_get(props, P_BITRATE_PEAK), vis_rcm_bitrate_peak);
-	if (!vis_rcm_bitrate_peak)
-		obs_data_unset_user_value(data, P_BITRATE_PEAK);
-
-	/// QP
-	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME), vis_rcm_qp);
-	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME), vis_rcm_qp);
-	if (!vis_rcm_qp) {
-		obs_data_unset_user_value(data, P_QP_IFRAME);
-		obs_data_unset_user_value(data, P_QP_PFRAME);
-	}
-	obs_property_set_visible(obs_properties_get(props, P_QP_BFRAME), vis_rcm_qp_b);
-	if (!vis_rcm_qp_b)
-		obs_data_unset_user_value(data, P_QP_BFRAME);
-
-	/// QP Min/Max
-	obs_property_set_visible(obs_properties_get(props, P_QP_MINIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
-	obs_property_set_visible(obs_properties_get(props, P_QP_MAXIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
-	if (!(curView >= ViewMode::Advanced) || vis_rcm_qp) {
-		obs_data_unset_user_value(data, P_QP_MINIMUM);
-		obs_data_unset_user_value(data, P_QP_MAXIMUM);
-	}
-
-	/// Pre-Pass
-	obs_property_set_visible(obs_properties_get(props, P_PREPASSMODE), (curView >= ViewMode::Basic) && !vis_rcm_qp);
-	if (!(curView >= ViewMode::Basic) || vis_rcm_qp)
-		obs_data_unset_user_value(data, P_PREPASSMODE);
-
-	/// VBAQ
-	obs_property_set_visible(obs_properties_get(props, P_VBAQ), (curView >= ViewMode::Expert) && !vis_rcm_qp);
-	if (!(curView >= ViewMode::Expert) || vis_rcm_qp)
-		obs_data_unset_user_value(data, P_VBAQ);
-
-	/// Filler Data (CBR only at the moment)
-	obs_property_set_visible(obs_properties_get(props, P_FILLERDATA), vis_rcm_fillerdata);
-	if (!vis_rcm_fillerdata)
-		obs_data_unset_user_value(data, P_FILLERDATA);
-#pragma endregion Rate Control
-
-#pragma region VBV Buffer
-	uint32_t vbvBufferMode = static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER));
-	bool vbvBufferVisible = (curView >= ViewMode::Advanced);
-
-	uint32_t lastVBVBufferMode = static_cast<uint32_t>(obs_data_get_int(data, ("last" P_VBVBUFFER)));
-	if (lastVBVBufferMode != vbvBufferMode) {
-		obs_data_set_int(data, ("last" P_VBVBUFFER), vbvBufferMode);
-		result = true;
-	}
-
-	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_STRICTNESS), vbvBufferVisible && (vbvBufferMode == 0));
-	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_SIZE), vbvBufferVisible && (vbvBufferMode == 1));
-	if (!vbvBufferVisible || vbvBufferMode == 0)
-		obs_data_unset_user_value(data, P_VBVBUFFER_SIZE);
-	if (!vbvBufferVisible || vbvBufferMode == 1)
-		obs_data_unset_user_value(data, P_VBVBUFFER_STRICTNESS);
-#pragma endregion VBV Buffer
-
-#pragma region B-Frame Interval
-	bool bframeIntervalVisible = bframeSupported && (curView >= ViewMode::Master);
-	obs_property_set_visible(obs_properties_get(props, P_PERIOD_BFRAME), bframeIntervalVisible);
-	obs_property_set_visible(obs_properties_get(props, P_INTERVAL_BFRAME), bframeIntervalVisible);
-	if (!bframeIntervalVisible) {
-		obs_data_unset_user_value(data, P_PERIOD_BFRAME);
-		obs_data_unset_user_value(data, P_INTERVAL_BFRAME);
-	}
-#pragma endregion B-Frame Interval
-#pragma endregion View Mode
-
-	// Permanently disable static properties while encoding.
-	void* enc = obs_properties_get_param(props);
-	if (enc) {
-		std::vector<const char*> hiddenProperties = {
-			// Static
-			///P_USAGE,
-			P_QUALITYPRESET,
-			P_PROFILE,
-			P_PROFILELEVEL,
-			P_CODINGTYPE,
-			P_MAXIMUMREFERENCEFRAMES,
-
-			P_BFRAME_PATTERN,
-			P_BFRAME_REFERENCE,
-
-			// Dynamic
-			/// Rate Control
-			//P_RATECONTROLMETHOD,
-			//P_PREPASSMODE,
-			//P_FRAMESKIPPING,
-			//P_FRAMESKIPPING_PERIOD,
-			//P_FRAMESKIPPING_BEHAVIOUR,
-			//P_DEBLOCKINGFILTER,
-
-			//P_VBVBUFFER,
-			//P_VBVBUFFER_STRICTNESS,
-			//P_VBVBUFFER_SIZE,
-			//P_VBVBUFFER_INITIALFULLNESS,
-			//P_VBAQ,
-
-			//// Picture Control
-			//P_INTERVAL_KEYFRAME,
-			//P_PERIOD_IDR_H264,
-			//P_INTERVAL_IFRAME,
-			//P_PERIOD_IFRAME,
-			//P_INTERVAL_PFRAME,
-			//P_PERIOD_PFRAME,
-			//P_INTERVAL_BFRAME,
-			//P_PERIOD_BFRAME,
-
-			//P_BFRAME_PATTERN,
-			//P_BFRAME_REFERENCE,
-
-			// System
-			P_VIDEO_API,
-			P_VIDEO_ADAPTER,
-			P_OPENCL_TRANSFER,
-			P_OPENCL_CONVERSION,
-			P_MULTITHREADING,
-			P_QUEUESIZE,
-			P_DEBUG,
-		};
-		for (const char* pr : hiddenProperties) {
-			obs_property_set_enabled(obs_properties_get(props, pr), false);
-		}
-	}
-
-	return result;
-}
-
-bool Plugin::Interface::H264Interface::update(void *data, obs_data_t *settings) {
-	if (data)
-		return static_cast<Plugin::Interface::H264Interface*>(data)->update(settings);
-	return false;
-}
-
-void Plugin::Interface::H264Interface::get_video_info(void *data, struct video_scale_info *info) {
-	if (data)
-		return static_cast<Plugin::Interface::H264Interface*>(data)->get_video_info(info);
-}
-
-bool Plugin::Interface::H264Interface::get_extra_data(void *data, uint8_t** extra_data, size_t* size) {
-	if (data)
-		return static_cast<Plugin::Interface::H264Interface*>(data)->get_extra_data(extra_data, size);
-	return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Module Code
-//////////////////////////////////////////////////////////////////////////
-Plugin::Interface::H264Interface::H264Interface(obs_data_t* data, obs_encoder_t* encoder) {
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
-
-	m_Encoder = encoder;
-
-	// OBS Settings
-	uint32_t obsWidth = obs_encoder_get_width(encoder);
-	uint32_t obsHeight = obs_encoder_get_height(encoder);
-	video_t *obsVideoInfo = obs_encoder_video(encoder);
-	const struct video_output_info *voi = video_output_get_info(obsVideoInfo);
-	uint32_t obsFPSnum = voi->fps_num;
-	uint32_t obsFPSden = voi->fps_den;
-
-	//////////////////////////////////////////////////////////////////////////
-	/// Initialize Encoder
-	bool debug = obs_data_get_bool(data, P_DEBUG);
-	Plugin::AMD::AMF::Instance()->EnableDebugTrace(debug);
-
-	ColorFormat colorFormat = ColorFormat::NV12;
-	switch (voi->format) {
-		case VIDEO_FORMAT_NV12:
-			colorFormat = ColorFormat::NV12;
-			break;
-		case VIDEO_FORMAT_I420:
-			colorFormat = ColorFormat::I420;
-			break;
-		case VIDEO_FORMAT_YUY2:
-			colorFormat = ColorFormat::YUY2;
-			break;
-		case VIDEO_FORMAT_RGBA:
-			colorFormat = ColorFormat::RGBA;
-			break;
-		case VIDEO_FORMAT_BGRA:
-			colorFormat = ColorFormat::BGRA;
-			break;
-		case VIDEO_FORMAT_Y800:
-			colorFormat = ColorFormat::GRAY;
-			break;
-	}
-	ColorSpace colorSpace = ColorSpace::BT601;
-	switch (voi->colorspace) {
-		case VIDEO_CS_DEFAULT:
-		case VIDEO_CS_601:
-			colorSpace = ColorSpace::BT601;
-			break;
-		case VIDEO_CS_709:
-			colorSpace = ColorSpace::BT709;
-			break;
-	}
-
-	auto api = API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
-	union {
-		int64_t v;
-		uint32_t id[2];
-	} adapterid = { obs_data_get_int(data, P_VIDEO_ADAPTER) };
-	auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
-
-	m_VideoEncoder = std::make_unique<EncoderH264>(api, adapter,
-		!!obs_data_get_int(data, P_OPENCL_TRANSFER), !!obs_data_get_int(data, P_OPENCL_CONVERSION),
-		colorFormat, colorSpace, voi->range == VIDEO_RANGE_FULL,
-		!!obs_data_get_int(data, P_MULTITHREADING), (size_t)obs_data_get_int(data, P_QUEUESIZE));
-
-	/// Static Properties
-	m_VideoEncoder->SetQualityPreset(static_cast<QualityPreset>(obs_data_get_int(data, P_QUALITYPRESET)));
-
-	/// Frame
-	m_VideoEncoder->SetResolution(std::make_pair(obsWidth, obsHeight));
-	m_VideoEncoder->SetFrameRate(std::make_pair(obsFPSnum, obsFPSden));
-
-	/// Profile & Level
-	m_VideoEncoder->SetProfile(static_cast<Profile>(obs_data_get_int(data, P_PROFILE)));
-	m_VideoEncoder->SetProfileLevel(static_cast<ProfileLevel>(obs_data_get_int(data, P_PROFILELEVEL)));
-
-	try {
-		m_VideoEncoder->SetCodingType(static_cast<CodingType>(obs_data_get_int(data, P_CODINGTYPE)));
-	} catch (...) {
-	}
-	try {
-		m_VideoEncoder->SetMaximumReferenceFrames(obs_data_get_int(data, P_MAXIMUMREFERENCEFRAMES));
-	} catch (...) {
-	}
-
-	// OBS - Enforce Streaming Service Restrictions
-#pragma region OBS - Enforce Streaming Service Restrictions
-	{
-		// Profile
-		const char* p_str = obs_data_get_string(data, "profile");
-		if (strcmp(p_str, "") != 0) {
-			if (strcmp(p_str, "constrained_baseline") == 0) {
-				m_VideoEncoder->SetProfile(Profile::ConstrainedBaseline);
-			} else if (strcmp(p_str, "baseline") == 0) {
-				m_VideoEncoder->SetProfile(Profile::Baseline);
-			} else if (strcmp(p_str, "main") == 0) {
-				m_VideoEncoder->SetProfile(Profile::Main);
-			} else if (strcmp(p_str, "constrained_high") == 0) {
-				m_VideoEncoder->SetProfile(Profile::ConstrainedHigh);
-			} else if (strcmp(p_str, "high") == 0) {
-				m_VideoEncoder->SetProfile(Profile::High);
-			}
-			obs_data_unset_user_value(data, "profile");
-		}
-
-		// Preset
-		const char* preset = obs_data_get_string(data, "preset");
-		if (strcmp(preset, "") != 0) {
-			if (strcmp(preset, "speed") == 0) {
-				m_VideoEncoder->SetQualityPreset(QualityPreset::Speed);
-			} else if (strcmp(preset, "balanced") == 0) {
-				m_VideoEncoder->SetQualityPreset(QualityPreset::Balanced);
-			} else if (strcmp(preset, "quality") == 0) {
-				m_VideoEncoder->SetQualityPreset(QualityPreset::Quality);
-			}
-			obs_data_set_int(data, P_QUALITYPRESET, (int32_t)m_VideoEncoder->GetQualityPreset());
-			obs_data_unset_user_value(data, "preset");
-		}
-	}
-#pragma endregion OBS - Enforce Streaming Service Restrictions
-
-	// Dynamic Properties (Can be changed during Encoding)
-	this->update(data);
-
-	// Initialize (locks static properties)
-	try {
-		m_VideoEncoder->Start();
-	} catch (...) {
-		throw;
-	}
-
-	// Dynamic Properties (Can be changed during Encoding)
-	this->update(data);
-
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
-}
-
-Plugin::Interface::H264Interface::~H264Interface() {
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing...");
-	if (m_VideoEncoder) {
-		m_VideoEncoder->Stop();
-		m_VideoEncoder = nullptr;
-	}
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
-}
-
-bool Plugin::Interface::H264Interface::update(obs_data_t* data) {
-	const video_t *obsVideoInfo = obs_encoder_video(m_Encoder);
-	const struct video_output_info *voi = video_output_get_info(obsVideoInfo);
-	uint32_t obsFPSnum = voi->fps_num;
-	uint32_t obsFPSden = voi->fps_den;
-
-	// Rate Control
-	RateControlMethod rcm = static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD));
-	m_VideoEncoder->SetRateControlMethod(rcm);
-	if (rcm == RateControlMethod::ConstantQP) {
-		m_VideoEncoder->SetQPMinimum(0);
-		m_VideoEncoder->SetQPMaximum(51);
-		m_VideoEncoder->SetIFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME)));
-		m_VideoEncoder->SetPFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME)));
-		if (m_VideoEncoder->CapsBFramePattern() > 0) {
-			try {
-				m_VideoEncoder->SetBFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_BFRAME)));
-			} catch (...) {
-			}
-		}
-		try {
-			m_VideoEncoder->SetPrePassMode(PrePassMode::Disabled);
-			m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled(false);
-		} catch (...) {
-		}
-	} else {
-		m_VideoEncoder->SetQPMinimum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_MINIMUM)));
-		m_VideoEncoder->SetQPMaximum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_MAXIMUM)));
-		m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
-		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, P_BITRATE_PEAK) * 1000));
-		try {
-			m_VideoEncoder->SetPrePassMode(static_cast<PrePassMode>(obs_data_get_int(data, P_PREPASSMODE)));
-			m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled(!!obs_data_get_int(data, P_VBAQ));
-		} catch (...) {
-		}
-	}
-	if (rcm == RateControlMethod::ConstantBitrate) {
-		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
-		m_VideoEncoder->SetFillerDataEnabled(!!obs_data_get_int(data, P_FILLERDATA));
-	} else {
-		m_VideoEncoder->SetFillerDataEnabled(false);
-	}
-	m_VideoEncoder->SetFrameSkippingEnabled(!!obs_data_get_int(data, P_FRAMESKIPPING));
-	m_VideoEncoder->SetEnforceHRDEnabled(!!obs_data_get_int(data, P_ENFORCEHRD));
-	m_VideoEncoder->SetVBVBufferInitialFullness((float)obs_data_get_double(data, P_VBVBUFFER_INITIALFULLNESS) / 100.0f);
-	if (obs_data_get_int(data, P_VBVBUFFER) == 0) {
-		m_VideoEncoder->SetVBVBufferStrictness(obs_data_get_double(data, P_VBVBUFFER_STRICTNESS) / 100.0);
-	} else {
-		m_VideoEncoder->SetVBVBufferSize(static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER_SIZE) * 1000));
-	}
-
-	// Picture Control
-	double_t framerate = (double_t)obsFPSnum / (double_t)obsFPSden;
-	/// Keyframe Interval/Period
-	{
-		uint32_t idrperiod = static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IDR_H264));
-		if (idrperiod == 0) {
-			double_t keyinterv = obs_data_get_double(data, P_INTERVAL_KEYFRAME);
-			idrperiod = static_cast<uint32_t>(ceil((keyinterv * framerate)));
-		}
-		m_VideoEncoder->SetIDRPeriod(idrperiod);
-	}
-	/// I/P/Skip Frame Interval/Period
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_IFRAME) * framerate);
-		period = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IFRAME)));
-		m_VideoEncoder->SetIFramePeriod(period);
-	}
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_PFRAME) * framerate);
-		period = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_PFRAME)));
-		m_VideoEncoder->SetPFramePeriod(period);
-	}
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_BFRAME) * framerate);
-		period = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_BFRAME)));
-		m_VideoEncoder->SetBFramePeriod(period);
-	}
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_int(data, P_FRAMESKIPPING_PERIOD));
-		m_VideoEncoder->SetFrameSkippingPeriod(period);
-		m_VideoEncoder->SetFrameSkippingBehaviour(!!obs_data_get_int(data, P_FRAMESKIPPING_BEHAVIOUR));
-	}
-	m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, P_DEBLOCKINGFILTER));
-
-#pragma region B-Frames
-	if (m_VideoEncoder->CapsBFramePattern() > 0) {
-		try {
-			m_VideoEncoder->SetBFramePattern(static_cast<uint8_t>(obs_data_get_int(data, P_BFRAME_PATTERN)));
-			if (obs_data_get_int(data, P_BFRAME_PATTERN) != 0)
-				m_VideoEncoder->SetBFrameDeltaQP(static_cast<int8_t>(obs_data_get_int(data, P_BFRAME_DELTAQP)));
-			m_VideoEncoder->SetBFrameReferenceEnabled(!!obs_data_get_int(data, P_BFRAME_REFERENCE));
-			if (!!obs_data_get_int(data, P_BFRAME_REFERENCE))
-				m_VideoEncoder->SetBFrameReferenceDeltaQP(static_cast<int8_t>(obs_data_get_int(data, P_BFRAME_REFERENCEDELTAQP)));
-		} catch (...) {
-		}
-	}
-#pragma endregion B-Frames
-
-	// Motion Estimation
-	m_VideoEncoder->SetMotionEstimationHalfPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 1));
-	m_VideoEncoder->SetMotionEstimationQuarterPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 2));
-
-#pragma region OBS Enforce Streaming Service Settings
-	{
-		// Rate Control Method
-		const char* t_str = obs_data_get_string(data, "rate_control");
-		if (strcmp(t_str, "") != 0) {
-			if (strcmp(t_str, "CBR") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantBitrate);
-				m_VideoEncoder->SetFillerDataEnabled(true);
-			} else if (strcmp(t_str, "VBR") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::PeakConstrainedVariableBitrate);
-			} else if (strcmp(t_str, "VBR_LAT") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::LatencyConstrainedVariableBitrate);
-			} else if (strcmp(t_str, "CQP") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantQP);
-			}
-
-			obs_data_set_int(data, P_RATECONTROLMETHOD, (int32_t)m_VideoEncoder->GetRateControlMethod());
-			obs_data_unset_user_value(data, "rate_control");
-		}
-
-		// IDR-Period (Keyframes)
-		uint32_t fpsNum = m_VideoEncoder->GetFrameRate().first;
-		uint32_t fpsDen = m_VideoEncoder->GetFrameRate().second;
-		if (obs_data_get_int(data, "keyint_sec") > 0) {
-			m_VideoEncoder->SetIDRPeriod(static_cast<uint32_t>(obs_data_get_int(data, "keyint_sec") * (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
-
-			obs_data_set_double(data, P_INTERVAL_KEYFRAME, static_cast<double_t>(obs_data_get_int(data, "keyint_sec")));
-			obs_data_set_int(data, P_PERIOD_IDR_H264, static_cast<uint32_t>(obs_data_get_int(data, "keyint_sec") *  (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
-			obs_data_unset_user_value(data, "keyint_sec");
-		}
-	}
-#pragma endregion OBS Enforce Streaming Service Settings
-
-	m_VideoEncoder->SetDebug(obs_data_get_bool(data, P_DEBUG));
-
-	if (m_VideoEncoder->IsStarted()) {
-		m_VideoEncoder->LogProperties();
-		if (static_cast<ViewMode>(obs_data_get_int(data, P_VIEW)) >= ViewMode::Master)
-			PLOG_ERROR("View Mode 'Master' is active, avoid giving anything but basic support. Error is most likely caused by user settings themselves.");
-	}
-
-	return true;
-}
-
-bool Plugin::Interface::H264Interface::encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
-	if (!frame || !packet || !received_packet)
-		return false;
-
-	bool retVal = false;
-
-	try {
-		retVal = m_VideoEncoder->Encode(frame, packet, received_packet);
-	} catch (std::exception e) {
-		PLOG_ERROR("Exception during encoding: %s", e.what());
-	} catch (...) {
-		PLOG_ERROR("Unknown exception during encoding.");
-	}
-
-	return retVal;
-}
-
-void Plugin::Interface::H264Interface::get_video_info(struct video_scale_info* info) {
-	m_VideoEncoder->GetVideoInfo(info);
-}
-
-bool Plugin::Interface::H264Interface::get_extra_data(uint8_t** extra_data, size_t* size) {
-	return m_VideoEncoder->GetExtraData(extra_data, size);
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/enc-h265.cpp Deleted

@@ -1,1160 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-//////////////////////////////////////////////////////////////////////////
-// New UI Design
-//////////////////////////////////////////////////////////////////////////
-// All: Preset
-// ----------- Static Section
-// Mas: Usage
-// All: Quality Preset
-// Adv: Profile
-// Adv: Profile Level
-// Adv: Tier
-// Mas: Aspect Ratio
-// Exp: Coding Type
-// Exp: Maximum Reference Frames
-// ----------- Rate Control Section
-// All: Rate Control Method
-// Adv: Pre-Pass Encoding (if supported)
-// All, CBR&VBR: Target Bitrate
-// All, VBR: Peak Bitrate
-// All, CQP: QP I/P
-// Adv, CBR&VBR: Min/Max I/P-Frame QP
-// CBR: Filler Data
-// Adv: Frame Skipping
-// Exp: VBAQ
-// Exp: Enforce HRD
-// ----------- VBV Buffer
-// Adv: VBV Buffer Size
-// Exp: VBV Buffer Initial Fullness
-// ----------- Picture Control
-// All: Keyframe Interval (Float, uses GOP Size Fixed/Min/Max)
-// Mas: IDR Period (in GOPs)
-// Exp: GOP Type
-// Exp: GOP Size
-// Exp: GOP Size Min/Max
-// Exp: Deblocking Filter
-// Exp: Motion Estimation (Dropdown)
-// ----------- Intra-Refresh
-// ToDo: Master Mode only?
-// ----------- System
-// Adv: API
-// Adv: Adapter
-// Exp: OpenCL
-// All: View
-
-#include "enc-h265.h"
-#include "amf-capabilities.h"
-#include "amf-encoder.h"
-#include "amf-encoder-h265.h"
-#include "strings.h"
-#include "utility.h"
-
-#define PREFIX "[H265/HEVC]"
-
-using namespace Plugin::AMD;
-
-void Plugin::Interface::H265Interface::encoder_register() {
-	// Test if we actually have AVC support.
-	if (!AMD::CapabilityManager::Instance()->IsCodecSupported(Codec::HEVC)) {
-		PLOG_WARNING(PREFIX " Not supported by any GPU, disabling...");
-		return;
-	}
-
-	// Create structure
-	static std::unique_ptr<obs_encoder_info> encoder_info = std::make_unique<obs_encoder_info>();
-	std::memset(encoder_info.get(), 0, sizeof(obs_encoder_info));
-
-	// Initialize Structure
-	encoder_info->type = obs_encoder_type::OBS_ENCODER_VIDEO;
-	static const char* encoder_name = "amd_amf_h265";
-	encoder_info->id = encoder_name;
-	static const char* encoder_codec = "hevc";
-	encoder_info->codec = encoder_codec;
-
-	// Functions
-	encoder_info->get_name = &get_name;
-	encoder_info->get_defaults = &get_defaults;
-	encoder_info->get_properties = &get_properties;
-	encoder_info->create = &create;
-	encoder_info->destroy = &destroy;
-	encoder_info->encode = &encode;
-	encoder_info->update = &update;
-	encoder_info->get_video_info = &get_video_info;
-	encoder_info->get_extra_data = &get_extra_data;
-
-	obs_register_encoder(encoder_info.get());
-	PLOG_DEBUG(PREFIX " Registered.");
-}
-
-const char* Plugin::Interface::H265Interface::get_name(void*) {
-	static const char* name = "H265/HEVC Encoder (" PLUGIN_NAME ")";
-	return name;
-}
-
-void Plugin::Interface::H265Interface::get_defaults(obs_data_t *data) {
-#pragma region OBS - Enforce Streaming Service Restrictions
-	obs_data_set_default_int(data, "bitrate", 0);
-	obs_data_set_default_int(data, "keyint_sec", 0);
-	obs_data_set_default_string(data, "rate_control", "");
-	obs_data_set_default_string(data, "profile", "");
-	obs_data_set_default_string(data, "preset", "");
-#pragma endregion OBS - Enforce Streaming Service Restrictions
-
-	// Static
-	//obs_data_set_default_int(data, P_USAGE, static_cast<int64_t>(Usage::Transcoding));
-	obs_data_set_default_int(data, P_QUALITYPRESET, static_cast<int64_t>(QualityPreset::Balanced));
-	obs_data_set_default_int(data, P_PROFILE, static_cast<int64_t>(Profile::Main));
-	obs_data_set_default_int(data, P_PROFILELEVEL, static_cast<int64_t>(ProfileLevel::Automatic));
-	obs_data_set_default_int(data, P_TIER, static_cast<int64_t>(H265::Tier::Main));
-	//obs_data_set_default_frames_per_second(data, P_ASPECTRATIO, media_frames_per_second{ 1, 1 }, "");
-	obs_data_set_default_int(data, P_CODINGTYPE, static_cast<int64_t>(CodingType::Automatic));
-	obs_data_set_default_int(data, P_MAXIMUMREFERENCEFRAMES, 1);
-
-	// Rate Control
-	obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), -1);
-	obs_data_set_default_int(data, ("last" P_RATECONTROLMETHOD), -1);
-	obs_data_set_default_int(data, P_RATECONTROLMETHOD, static_cast<int64_t>(RateControlMethod::ConstantBitrate));
-	obs_data_set_default_int(data, P_PREPASSMODE, static_cast<int64_t>(PrePassMode::Disabled));
-	obs_data_set_default_int(data, "bitrate", 3500);
-	obs_data_set_default_int(data, P_BITRATE_PEAK, 9000);
-	obs_data_set_default_int(data, P_QP_IFRAME, 22);
-	obs_data_set_default_int(data, P_QP_PFRAME, 22);
-	obs_data_set_default_int(data, P_QP_BFRAME, 22);
-	obs_data_set_default_int(data, P_QP_IFRAME_MINIMUM, 18);
-	obs_data_set_default_int(data, P_QP_IFRAME_MAXIMUM, 51);
-	obs_data_set_default_int(data, P_QP_PFRAME_MINIMUM, 18);
-	obs_data_set_default_int(data, P_QP_PFRAME_MAXIMUM, 51);
-	obs_data_set_default_int(data, P_FILLERDATA, 1);
-	obs_data_set_default_int(data, P_FRAMESKIPPING, 0);
-	obs_data_set_default_int(data, P_VBAQ, 0);
-	obs_data_set_default_int(data, P_ENFORCEHRD, 1);
-
-	// VBV Buffer
-	obs_data_set_int(data, ("last" P_VBVBUFFER), -1);
-	obs_data_set_default_int(data, ("last" P_VBVBUFFER), -1);
-	obs_data_set_default_int(data, P_VBVBUFFER, 0);
-	obs_data_set_default_int(data, P_VBVBUFFER_SIZE, 3500);
-	obs_data_set_default_double(data, P_VBVBUFFER_STRICTNESS, 50);
-	obs_data_set_default_double(data, P_VBVBUFFER_INITIALFULLNESS, 100);
-
-	// Picture Control
-	obs_data_set_default_double(data, P_INTERVAL_KEYFRAME, 2.0);
-	obs_data_set_default_int(data, P_PERIOD_IDR_H265, 0);
-	obs_data_set_default_double(data, P_INTERVAL_IFRAME, 0.0);
-	obs_data_set_default_int(data, P_PERIOD_IFRAME, 0);
-	obs_data_set_default_double(data, P_INTERVAL_PFRAME, 0.0);
-	obs_data_set_default_int(data, P_PERIOD_PFRAME, 0);
-	obs_data_set_default_int(data, P_FRAMESKIPPING_PERIOD, 0);
-	obs_data_set_default_int(data, P_FRAMESKIPPING_BEHAVIOUR, 0);
-	obs_data_set_default_int(data, P_GOP_TYPE, static_cast<int64_t>(H265::GOPType::Fixed));
-	obs_data_set_default_int(data, P_GOP_SIZE, 60);
-	obs_data_set_default_int(data, P_GOP_SIZE_MINIMUM, 1);
-	obs_data_set_default_int(data, P_GOP_SIZE_MAXIMUM, 16);
-	obs_data_set_default_int(data, P_DEBLOCKINGFILTER, 0);
-	obs_data_set_default_int(data, P_MOTIONESTIMATION, 3);
-
-	// System Properties
-	obs_data_set_string(data, ("last" P_VIDEO_API), "");
-	obs_data_set_default_string(data, ("last" P_VIDEO_API), "");
-	obs_data_set_default_string(data, P_VIDEO_API, "");
-	obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), 0);
-	obs_data_set_default_int(data, ("last" P_VIDEO_ADAPTER), 0);
-	obs_data_set_default_int(data, P_VIDEO_ADAPTER, 0);
-	obs_data_set_default_int(data, P_OPENCL_TRANSFER, 0);
-	obs_data_set_default_int(data, P_OPENCL_CONVERSION, 0);
-	obs_data_set_default_int(data, P_MULTITHREADING, 0);
-	obs_data_set_default_int(data, P_QUEUESIZE, 8);
-	obs_data_set_int(data, ("last" P_VIEW), -1);
-	obs_data_set_default_int(data, ("last" P_VIEW), -1);
-	obs_data_set_default_int(data, P_VIEW, static_cast<int64_t>(ViewMode::Basic));
-	obs_data_set_default_bool(data, P_DEBUG, false);
-	obs_data_set_default_int(data, P_VERSION, PLUGIN_VERSION_FULL);
-}
-
-static void fill_api_list(obs_property_t* p) {
-	obs_property_list_clear(p);
-	auto cm = CapabilityManager::Instance();
-
-	for (auto api : Plugin::API::EnumerateAPIs()) {
-		if (cm->IsCodecSupportedByAPI(Codec::HEVC, api->GetType()))
-			obs_property_list_add_string(p, api->GetName().c_str(), api->GetName().c_str());
-	}
-}
-
-static void fill_device_list(obs_property_t* p, const char* apiname) {
-	obs_property_list_clear(p);
-
-	auto cm = CapabilityManager::Instance();
-	auto api = Plugin::API::GetAPI(std::string(apiname));
-	for (auto adapter : api->EnumerateAdapters()) {
-		union {
-			int32_t id[2];
-			int64_t v;
-		} adapterid = { adapter.idLow, adapter.idHigh };
-		if (cm->IsCodecSupportedByAPIAdapter(Codec::HEVC, api->GetType(), adapter))
-			obs_property_list_add_int(p, adapter.Name.c_str(), adapterid.v);
-	}
-}
-
-obs_properties_t* Plugin::Interface::H265Interface::get_properties(void* data) {
-	obs_properties* props = obs_properties_create();
-	obs_property_t* p;
-
-	// Static Properties
-#pragma region Quality Preset
-	p = obs_properties_add_list(props, P_QUALITYPRESET, P_TRANSLATE(P_QUALITYPRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUALITYPRESET)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_SPEED), static_cast<int32_t>(QualityPreset::Speed));
-	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_BALANCED), static_cast<int32_t>(QualityPreset::Balanced));
-	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_QUALITY), static_cast<int32_t>(QualityPreset::Quality));
-#pragma endregion Quality Preset
-
-#pragma region Profile, Levels
-	p = obs_properties_add_list(props, P_PROFILE, P_TRANSLATE(P_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILE)));
-	obs_property_list_add_int(p, "Main", static_cast<int32_t>(Profile::Main));
-
-	p = obs_properties_add_list(props, P_PROFILELEVEL, P_TRANSLATE(P_PROFILELEVEL), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILELEVEL)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(ProfileLevel::Automatic));
-	obs_property_list_add_int(p, "1.0", static_cast<int32_t>(ProfileLevel::L10));
-	obs_property_list_add_int(p, "2.0", static_cast<int32_t>(ProfileLevel::L20));
-	obs_property_list_add_int(p, "2.1", static_cast<int32_t>(ProfileLevel::L21));
-	obs_property_list_add_int(p, "3.0", static_cast<int32_t>(ProfileLevel::L30));
-	obs_property_list_add_int(p, "3.1", static_cast<int32_t>(ProfileLevel::L31));
-	obs_property_list_add_int(p, "4.0", static_cast<int32_t>(ProfileLevel::L40));
-	obs_property_list_add_int(p, "4.1", static_cast<int32_t>(ProfileLevel::L41));
-	obs_property_list_add_int(p, "5.0", static_cast<int32_t>(ProfileLevel::L50));
-	obs_property_list_add_int(p, "5.1", static_cast<int32_t>(ProfileLevel::L51));
-	obs_property_list_add_int(p, "5.2", static_cast<int32_t>(ProfileLevel::L52));
-	obs_property_list_add_int(p, "6.0", static_cast<int32_t>(ProfileLevel::L60));
-	obs_property_list_add_int(p, "6.1", static_cast<int32_t>(ProfileLevel::L61));
-	obs_property_list_add_int(p, "6.2", static_cast<int32_t>(ProfileLevel::L62));
-#pragma endregion Profile, Levels
-
-#pragma region Tier
-	p = obs_properties_add_list(props, P_TIER, P_TRANSLATE(P_TIER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_TIER)));
-	obs_property_list_add_int(p, "Main", static_cast<int32_t>(H265::Tier::Main));
-	obs_property_list_add_int(p, "High", static_cast<int32_t>(H265::Tier::High));
-#pragma endregion Tier
-
-#pragma region Coding Type
-	p = obs_properties_add_list(props, P_CODINGTYPE, P_TRANSLATE(P_CODINGTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_CODINGTYPE)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(CodingType::Automatic));
-	obs_property_list_add_int(p, "CABAC", static_cast<int32_t>(CodingType::CABAC));
-#pragma endregion Coding Type
-
-#pragma region Maximum Reference Frames
-	p = obs_properties_add_int_slider(props, P_MAXIMUMREFERENCEFRAMES, P_TRANSLATE(P_MAXIMUMREFERENCEFRAMES),
-		1, 16, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MAXIMUMREFERENCEFRAMES)));
-#pragma endregion Maximum Reference Frames
-
-	// Rate Control
-#pragma region Rate Control Method
-	p = obs_properties_add_list(props, P_RATECONTROLMETHOD, P_TRANSLATE(P_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_RATECONTROLMETHOD)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CQP), static_cast<int32_t>(RateControlMethod::ConstantQP));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CBR), static_cast<int32_t>(RateControlMethod::ConstantBitrate));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBR), static_cast<int32_t>(RateControlMethod::PeakConstrainedVariableBitrate));
-	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBRLAT), static_cast<int32_t>(RateControlMethod::LatencyConstrainedVariableBitrate));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion Rate Control Method
-
-#pragma region Pre-Pass
-	p = obs_properties_add_list(props, P_PREPASSMODE, P_TRANSLATE(P_PREPASSMODE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PREPASSMODE)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), static_cast<int32_t>(PrePassMode::Disabled));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), static_cast<int32_t>(PrePassMode::Enabled));
-#pragma endregion Pre-Pass
-
-#pragma region Parameters
-	/// Bitrate Constraints
-	p = obs_properties_add_int(props, "bitrate", P_TRANSLATE(P_BITRATE_TARGET), 0, 1, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_TARGET)));
-	p = obs_properties_add_int(props, P_BITRATE_PEAK, P_TRANSLATE(P_BITRATE_PEAK), 0, 1, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_PEAK)));
-
-	/// Method: Constant QP
-	p = obs_properties_add_int_slider(props, P_QP_IFRAME, P_TRANSLATE(P_QP_IFRAME), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME)));
-	p = obs_properties_add_int_slider(props, P_QP_PFRAME, P_TRANSLATE(P_QP_PFRAME), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME)));
-
-	/// Minimum QP, Maximum QP
-	p = obs_properties_add_int_slider(props, P_QP_IFRAME_MINIMUM, P_TRANSLATE(P_QP_IFRAME_MINIMUM), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME_MINIMUM)));
-	p = obs_properties_add_int_slider(props, P_QP_IFRAME_MAXIMUM, P_TRANSLATE(P_QP_IFRAME_MAXIMUM), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME_MAXIMUM)));
-	p = obs_properties_add_int_slider(props, P_QP_PFRAME_MINIMUM, P_TRANSLATE(P_QP_PFRAME_MINIMUM), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME_MINIMUM)));
-	p = obs_properties_add_int_slider(props, P_QP_PFRAME_MAXIMUM, P_TRANSLATE(P_QP_PFRAME_MAXIMUM), 0, 51, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME_MAXIMUM)));
-#pragma endregion Parameters
-
-#pragma region Filler Data
-	p = obs_properties_add_list(props, P_FILLERDATA, P_TRANSLATE(P_FILLERDATA), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FILLERDATA)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion Filler Data
-
-#pragma region Frame Skipping
-	p = obs_properties_add_list(props, P_FRAMESKIPPING, P_TRANSLATE(P_FRAMESKIPPING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-	p = obs_properties_add_int(props, P_FRAMESKIPPING_PERIOD, P_TRANSLATE(P_FRAMESKIPPING_PERIOD), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_PERIOD)));
-	p = obs_properties_add_list(props, P_FRAMESKIPPING_BEHAVIOUR, P_TRANSLATE(P_FRAMESKIPPING_BEHAVIOUR), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_BEHAVIOUR)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_SKIPNTH), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_KEEPNTH), 1);
-#pragma endregion Frame Skipping
-
-#pragma region VBAQ
-	p = obs_properties_add_list(props, P_VBAQ, P_TRANSLATE(P_VBAQ), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBAQ)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion VBAQ
-
-#pragma region Enforce Hypothetical Reference Decoder Restrictions
-	p = obs_properties_add_list(props, P_ENFORCEHRD, P_TRANSLATE(P_ENFORCEHRD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_ENFORCEHRD)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion Enforce Hyptothetical Reference Decoder Restrictions
-
-	// VBV Buffer
-#pragma region VBV Buffer Mode
-	p = obs_properties_add_list(props, P_VBVBUFFER, P_TRANSLATE(P_VBVBUFFER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_MANUAL), 1);
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion VBV Buffer Mode
-
-#pragma region VBV Buffer Strictness
-	p = obs_properties_add_float_slider(props, P_VBVBUFFER_STRICTNESS, P_TRANSLATE(P_VBVBUFFER_STRICTNESS), 0.0, 100.0, 0.1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_STRICTNESS)));
-#pragma endregion VBV Buffer Strictness
-
-#pragma region VBV Buffer Size
-	p = obs_properties_add_int_slider(props, P_VBVBUFFER_SIZE, P_TRANSLATE(P_VBVBUFFER_SIZE), 1, 1000000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_SIZE)));
-#pragma endregion VBV Buffer Size
-
-#pragma region VBV Buffer Initial Fullness
-	p = obs_properties_add_float_slider(props, P_VBVBUFFER_INITIALFULLNESS, P_TRANSLATE(P_VBVBUFFER_INITIALFULLNESS), 0.0, 100.0, 100.0 / 64.0);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_INITIALFULLNESS)));
-#pragma endregion VBV Buffer Initial Fullness
-
-	// Picture Control
-#pragma region Interval and Periods
-/// Keyframe, IDR
-	p = obs_properties_add_float(props, P_INTERVAL_KEYFRAME, P_TRANSLATE(P_INTERVAL_KEYFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_KEYFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_IDR_H265, P_TRANSLATE(P_PERIOD_IDR_H265), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IDR_H265)));
-	/// I-Frame
-	p = obs_properties_add_float(props, P_INTERVAL_IFRAME, P_TRANSLATE(P_INTERVAL_IFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_IFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_IFRAME, P_TRANSLATE(P_PERIOD_IFRAME), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IFRAME)));
-	/// P-Frame
-	p = obs_properties_add_float(props, P_INTERVAL_PFRAME, P_TRANSLATE(P_INTERVAL_PFRAME), 0, 100, 0.001);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_PFRAME)));
-	p = obs_properties_add_int(props, P_PERIOD_PFRAME, P_TRANSLATE(P_PERIOD_PFRAME), 0, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_PFRAME)));
-#pragma endregion Interval and Periods
-
-#pragma region GOP Type
-	p = obs_properties_add_list(props, P_GOP_TYPE, P_TRANSLATE(P_GOP_TYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_TYPE)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_GOP_TYPE_FIXED), static_cast<int64_t>(H265::GOPType::Fixed));
-	obs_property_list_add_int(p, P_TRANSLATE(P_GOP_TYPE_VARIABLE), static_cast<int64_t>(H265::GOPType::Variable));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion GOP Type
-
-#pragma region GOP Size
-	p = obs_properties_add_int(props, P_GOP_SIZE, P_TRANSLATE(P_GOP_SIZE), 1, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_SIZE)));
-
-	p = obs_properties_add_int(props, P_GOP_SIZE_MINIMUM, P_TRANSLATE(P_GOP_SIZE_MINIMUM), 1, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_SIZE_MINIMUM)));
-
-	p = obs_properties_add_int(props, P_GOP_SIZE_MAXIMUM, P_TRANSLATE(P_GOP_SIZE_MAXIMUM), 1, 1000, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_SIZE_MAXIMUM)));
-#pragma endregion GOP Size
-
-	/// GOP Alignment?
-
-#pragma region Deblocking Filter
-	p = obs_properties_add_list(props, P_DEBLOCKINGFILTER, P_TRANSLATE(P_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBLOCKINGFILTER)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion Deblocking Filter
-
-#pragma region Motion Estimation
-	p = obs_properties_add_list(props, P_MOTIONESTIMATION, P_TRANSLATE(P_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MOTIONESTIMATION)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_HALF), 1);
-	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_QUARTER), 2);
-	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_FULL), 3);
-#pragma endregion Motion Estimation
-
-	// System
-#pragma region Video APIs
-	p = obs_properties_add_list(props, P_VIDEO_API, P_TRANSLATE(P_VIDEO_API), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_API)));
-	obs_property_set_modified_callback(p, properties_modified);
-	fill_api_list(p);
-#pragma endregion Video APIs
-
-#pragma region Video Adapters
-	p = obs_properties_add_list(props, P_VIDEO_ADAPTER, P_TRANSLATE(P_VIDEO_ADAPTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_ADAPTER)));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion Video Adapters
-
-#pragma region OpenCL
-	p = obs_properties_add_list(props, P_OPENCL_TRANSFER, P_TRANSLATE(P_OPENCL_TRANSFER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_TRANSFER)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-
-	p = obs_properties_add_list(props, P_OPENCL_CONVERSION, P_TRANSLATE(P_OPENCL_CONVERSION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_CONVERSION)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-#pragma endregion OpenCL
-
-#pragma region Asynchronous Queue
-	p = obs_properties_add_list(props, P_MULTITHREADING, P_TRANSLATE(P_MULTITHREADING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MULTITHREADING)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
-	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
-
-	p = obs_properties_add_int_slider(props, P_QUEUESIZE, P_TRANSLATE(P_QUEUESIZE), 1, 32, 1);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUEUESIZE)));
-#pragma endregion Asynchronous Queue
-
-#pragma region View Mode
-	p = obs_properties_add_list(props, P_VIEW, P_TRANSLATE(P_VIEW), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIEW)));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_BASIC), static_cast<int32_t>(ViewMode::Basic));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_ADVANCED), static_cast<int32_t>(ViewMode::Advanced));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_EXPERT), static_cast<int32_t>(ViewMode::Expert));
-	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_MASTER), static_cast<int32_t>(ViewMode::Master));
-	obs_property_set_modified_callback(p, properties_modified);
-#pragma endregion View Mode
-
-	/// Debug
-	p = obs_properties_add_bool(props, P_DEBUG, P_TRANSLATE(P_DEBUG));
-	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBUG)));
-
-	// Disable non-dynamic properties if we have an encoder.
-	obs_properties_set_param(props, data, nullptr);
-
-	return props;
-}
-
-static void obs_data_transfer_settings(obs_data_t * data) {
-#define TRANSFER_STRING(xold, xnew) obs_data_set_string(data, xnew, obs_data_get_string(data, xold))
-#define TRANSFER_FLOAT(xold, xnew) obs_data_set_double(data, xnew, obs_data_get_double(data, xold))
-#define TRANSFER_INT(xold, xnew) obs_data_set_int(data, xnew, obs_data_get_int(data, xold))
-#define TRANSFER_BOOL(xold, xnew) obs_data_set_bool(data, xnew, obs_data_get_bool(data, xold))
-
-	uint64_t version = obs_data_get_int(data, P_VERSION);
-	switch (version) {
-		case (((uint64_t)(2 & 0xFFFF) << 48ull) | ((uint64_t)(3 & 0xFFFF) << 32ull) | ((uint64_t)(0) & 0xFFFFFFFF)):
-			TRANSFER_INT(P_BITRATE_TARGET, "bitrate");
-			break;
-		case PLUGIN_VERSION_FULL:
-			obs_data_set_int(data, P_VERSION, PLUGIN_VERSION_FULL);
-			break;
-	}
-}
-
-bool Plugin::Interface::H265Interface::properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
-	bool result = false;
-	obs_property_t* p;
-
-	// Transfer settings from older Plugin versions to newer ones.
-	obs_data_transfer_settings(data);
-
-#pragma region Video API & Adapter
-	// Video API
-	const char
-		*videoAPI_last = obs_data_get_string(data, ("last" P_VIDEO_API)),
-		*videoAPI_cur = obs_data_get_string(data, P_VIDEO_API);
-	if (strlen(videoAPI_cur) == 0) {
-		p = obs_properties_get(props, P_VIDEO_API);
-		obs_data_set_string(data, P_VIDEO_API, obs_property_list_item_string(p, 0));
-		videoAPI_cur = obs_data_get_string(data, P_VIDEO_API);
-
-		result = true;
-	}
-	/// If a different API was selected, rebuild the device list.
-	if (strcmp(videoAPI_last, videoAPI_cur) != 0) {
-		obs_data_set_string(data, ("last" P_VIDEO_API), videoAPI_cur);
-		fill_device_list(obs_properties_get(props, P_VIDEO_ADAPTER), videoAPI_cur);
-		result = true;
-
-		// Reset Video Adapter to first in list.
-		obs_data_set_int(data, P_VIDEO_ADAPTER,
-			obs_property_list_item_int(obs_properties_get(props, P_VIDEO_ADAPTER), 0));
-	}
-
-	// Video Adapter
-	int64_t
-		videoAdapter_last = obs_data_get_int(data, ("last" P_VIDEO_ADAPTER)),
-		videoAdapter_cur = obs_data_get_int(data, P_VIDEO_ADAPTER);
-	if (videoAdapter_last != videoAdapter_cur) {
-		obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), videoAdapter_cur);
-		result = true;
-
-		auto api = Plugin::API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
-		union {
-			int64_t v;
-			uint32_t id[2];
-		} adapterid = { videoAdapter_cur };
-		auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
-		try {
-			auto enc = EncoderH265(api, adapter);
-
-		#define TEMP_LIMIT_DROPDOWN(func, enm, prop) { \
-				auto tmp_p = obs_properties_get(props, prop); \
-				auto tmp_l = enc.func(); \
-				enm tmp_s = static_cast<enm>(obs_data_get_int(data, obs_property_name(tmp_p))); \
-				for (size_t idx = 0; idx < obs_property_list_item_count(tmp_p); idx++) { \
-					bool enabled = false; \
-					enm tmp_v = static_cast<enm>(obs_property_list_item_int(tmp_p, idx)); \
-					for (auto tmp_k : tmp_l) { \
-						if (tmp_k == tmp_v) { \
-							enabled = true; \
-							break; \
-						} \
-					} \
-					obs_property_list_item_disable(tmp_p, idx, !enabled); \
-					if ((enabled == false) && (tmp_s == tmp_v)) \
-						obs_data_unset_user_value(data, obs_property_name(tmp_p)); \
-				} \
-			}
-		#define TEMP_LIMIT_SLIDER(func, prop) { \
-				auto tmp_p = obs_properties_get(props, prop); \
-				auto tmp_l = enc.func(); \
-				obs_property_int_set_limits(tmp_p, (int)tmp_l.first, (int)tmp_l.second, 1); \
-			}
-		#define TEMP_LIMIT_SLIDER_BITRATE(func, prop) { \
-				auto tmp_p = obs_properties_get(props, prop); \
-				auto tmp_l = enc.func(); \
-				obs_property_int_set_limits(tmp_p, (int)tmp_l.first / 1000, (int)tmp_l.second / 1000, 1); \
-			}
-
-			//TEMP_LIMIT_DROPDOWN(CapsUsage, AMD::Usage, P_USAGE);
-			TEMP_LIMIT_DROPDOWN(CapsQualityPreset, AMD::QualityPreset, P_QUALITYPRESET);
-			TEMP_LIMIT_DROPDOWN(CapsProfile, AMD::Profile, P_PROFILE);
-			TEMP_LIMIT_DROPDOWN(CapsProfileLevel, AMD::ProfileLevel, P_PROFILELEVEL);
-			{
-				auto tmp_p = obs_properties_get(props, P_PROFILELEVEL);
-				obs_property_list_item_disable(tmp_p, 0, false);
-			}
-			TEMP_LIMIT_DROPDOWN(CapsTier, AMD::H265::Tier, P_TIER);
-			// Aspect Ratio - No limits, only affects players/transcoders
-			TEMP_LIMIT_DROPDOWN(CapsCodingType, AMD::CodingType, P_CODINGTYPE);
-			TEMP_LIMIT_SLIDER(CapsMaximumReferenceFrames, P_MAXIMUMREFERENCEFRAMES);
-			TEMP_LIMIT_DROPDOWN(CapsRateControlMethod, AMD::RateControlMethod, P_RATECONTROLMETHOD);
-			TEMP_LIMIT_DROPDOWN(CapsPrePassMode, AMD::PrePassMode, P_PREPASSMODE);
-			TEMP_LIMIT_SLIDER_BITRATE(CapsTargetBitrate, "bitrate");
-			TEMP_LIMIT_SLIDER_BITRATE(CapsPeakBitrate, P_BITRATE_PEAK);
-			TEMP_LIMIT_SLIDER_BITRATE(CapsVBVBufferSize, P_VBVBUFFER_SIZE);
-		} catch (const std::exception& e) {
-			PLOG_ERROR("Exception occured while updating capabilities: %s",
-				e.what());
-		}
-	}
-#pragma endregion Video API & Adapter
-
-#pragma region View Mode
-	ViewMode lastView = static_cast<ViewMode>(obs_data_get_int(data, ("last" P_VIEW))),
-		curView = static_cast<ViewMode>(obs_data_get_int(data, P_VIEW));
-	if (lastView != curView) {
-		obs_data_set_int(data, ("last" P_VIEW), static_cast<int32_t>(curView));
-		result = true;
-	}
-
-	std::vector<std::pair<const char*, ViewMode>> viewstuff = {
-		//std::make_pair(P_PRESET, ViewMode::Basic),
-		// ----------- Static Section
-		//std::make_pair(P_USAGE, ViewMode::Master),
-		std::make_pair(P_QUALITYPRESET, ViewMode::Basic),
-		std::make_pair(P_PROFILE, ViewMode::Advanced),
-		std::make_pair(P_PROFILELEVEL, ViewMode::Advanced),
-		std::make_pair(P_TIER, ViewMode::Advanced),
-		std::make_pair(P_ASPECTRATIO, ViewMode::Master),
-		std::make_pair(P_CODINGTYPE, ViewMode::Expert),
-		std::make_pair(P_MAXIMUMREFERENCEFRAMES, ViewMode::Expert),
-		// ----------- Rate Control Section
-		std::make_pair(P_RATECONTROLMETHOD, ViewMode::Basic),
-		//std::make_pair(P_PREPASSMODE, ViewMode::Basic),
-		//std::make_pair(P_BITRATE_TARGET, ViewMode::Basic),
-		//std::make_pair(P_BITRATE_PEAK, ViewMode::Basic),
-		//std::make_pair(P_QP_IFRAME, ViewMode::Basic),
-		//std::make_pair(P_QP_PFRAME, ViewMode::Basic),
-		//std::make_pair(P_QP_BFRAME, ViewMode::Basic),
-		//std::make_pair(P_QP_MINIMUM, ViewMode::Advanced),
-		//std::make_pair(P_QP_MAXIMUM, ViewMode::Advanced),
-		//std::make_pair(P_FILLERDATA, ViewMode::Basic),
-		std::make_pair(P_FRAMESKIPPING, ViewMode::Advanced),
-		std::make_pair(P_FRAMESKIPPING_PERIOD, ViewMode::Master),
-		std::make_pair(P_FRAMESKIPPING_BEHAVIOUR, ViewMode::Master),
-		//std::make_pair(P_VBAQ, ViewMode::Expert),
-		std::make_pair(P_ENFORCEHRD, ViewMode::Expert),
-		// ----------- VBV Buffer
-		std::make_pair(P_VBVBUFFER, ViewMode::Advanced),
-		//std::make_pair(P_VBVBUFFER_STRICTNESS, ViewMode::Advanced),
-		//std::make_pair(P_VBVBUFFER_SIZE, ViewMode::Advanced),
-		std::make_pair(P_VBVBUFFER_INITIALFULLNESS, ViewMode::Expert),
-		// ----------- Picture Control
-		std::make_pair(P_INTERVAL_KEYFRAME, ViewMode::Basic),
-		std::make_pair(P_PERIOD_IDR_H265, ViewMode::Master),
-		std::make_pair(P_INTERVAL_IFRAME, ViewMode::Master),
-		std::make_pair(P_PERIOD_IFRAME, ViewMode::Master),
-		std::make_pair(P_INTERVAL_PFRAME, ViewMode::Master),
-		std::make_pair(P_PERIOD_PFRAME, ViewMode::Master),
-		std::make_pair(P_GOP_TYPE, ViewMode::Expert),
-		//std::make_pair(P_GOP_SIZE, ViewMode::Expert),
-		//std::make_pair(P_GOP_SIZE_MINIMUM, ViewMode::Expert),
-		//std::make_pair(P_GOP_SIZE_MAXIMUM, ViewMode::Expert),
-		std::make_pair(P_DEBLOCKINGFILTER, ViewMode::Expert),
-		std::make_pair(P_MOTIONESTIMATION, ViewMode::Expert),
-		// ----------- Intra-Refresh
-		//std::make_pair("", ViewMode::Master),
-		// ----------- System
-		std::make_pair(P_VIDEO_API, ViewMode::Advanced),
-		std::make_pair(P_VIDEO_ADAPTER, ViewMode::Advanced),
-		std::make_pair(P_OPENCL_TRANSFER, ViewMode::Advanced),
-		std::make_pair(P_OPENCL_CONVERSION, ViewMode::Advanced),
-		std::make_pair(P_MULTITHREADING, ViewMode::Expert),
-		std::make_pair(P_QUEUESIZE, ViewMode::Expert),
-		std::make_pair(P_VIEW, ViewMode::Basic),
-		std::make_pair(P_DEBUG, ViewMode::Basic),
-	};
-	for (std::pair<const char*, ViewMode> kv : viewstuff) {
-		bool vis = curView >= kv.second;
-		obs_property_set_visible(obs_properties_get(props, kv.first), vis);
-		if (!vis)
-			obs_data_unset_user_value(data, kv.first);
-	}
-
-#pragma region Rate Control
-	bool vis_rcm_bitrate_target = false,
-		vis_rcm_bitrate_peak = false,
-		vis_rcm_qp = false,
-		vis_rcm_fillerdata = false;
-
-	RateControlMethod lastRCM = static_cast<RateControlMethod>(obs_data_get_int(data, ("last" P_RATECONTROLMETHOD))),
-		curRCM = static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD));
-	if (lastRCM != curRCM) {
-		obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), static_cast<int32_t>(curRCM));
-		result = true;
-	}
-	switch (curRCM) {
-		case RateControlMethod::ConstantQP:
-			vis_rcm_qp = true;
-			break;
-		case RateControlMethod::ConstantBitrate:
-			vis_rcm_bitrate_target = true;
-			vis_rcm_fillerdata = true;
-			break;
-		case RateControlMethod::PeakConstrainedVariableBitrate:
-			vis_rcm_bitrate_target = true;
-			vis_rcm_bitrate_peak = true;
-			break;
-		case RateControlMethod::LatencyConstrainedVariableBitrate:
-			vis_rcm_bitrate_target = true;
-			vis_rcm_bitrate_peak = true;
-			break;
-	}
-
-	/// Bitrate
-	obs_property_set_visible(obs_properties_get(props, "bitrate"), vis_rcm_bitrate_target);
-	if (!vis_rcm_bitrate_target)
-		obs_data_unset_user_value(data, "bitrate");
-	obs_property_set_visible(obs_properties_get(props, P_BITRATE_PEAK), vis_rcm_bitrate_peak);
-	if (!vis_rcm_bitrate_peak)
-		obs_data_unset_user_value(data, P_BITRATE_PEAK);
-
-	/// QP
-	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME), vis_rcm_qp);
-	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME), vis_rcm_qp);
-	if (!vis_rcm_qp) {
-		obs_data_unset_user_value(data, P_QP_IFRAME);
-		obs_data_unset_user_value(data, P_QP_PFRAME);
-	}
-
-	/// QP Min/Max
-	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME_MINIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
-	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME_MAXIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
-	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME_MINIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
-	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME_MAXIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
-	if (!(curView >= ViewMode::Advanced) || vis_rcm_qp) {
-		obs_data_unset_user_value(data, P_QP_IFRAME_MINIMUM);
-		obs_data_unset_user_value(data, P_QP_IFRAME_MAXIMUM);
-		obs_data_unset_user_value(data, P_QP_PFRAME_MINIMUM);
-		obs_data_unset_user_value(data, P_QP_PFRAME_MAXIMUM);
-	}
-
-	/// Filler Data (CBR only at the moment)
-	obs_property_set_visible(obs_properties_get(props, P_FILLERDATA), vis_rcm_fillerdata);
-	if (!vis_rcm_fillerdata)
-		obs_data_unset_user_value(data, P_FILLERDATA);
-
-	/// Pre-Pass
-	obs_property_set_visible(obs_properties_get(props, P_PREPASSMODE), (curView >= ViewMode::Basic) && !vis_rcm_qp);
-	if (!(curView >= ViewMode::Basic) || vis_rcm_qp) {
-		obs_data_unset_user_value(data, P_PREPASSMODE);
-	}
-
-	/// VBAQ
-	obs_property_set_visible(obs_properties_get(props, P_VBAQ), (curView >= ViewMode::Expert) && !vis_rcm_qp);
-	if (!(curView >= ViewMode::Expert) || vis_rcm_qp) {
-		obs_data_unset_user_value(data, P_VBAQ);
-	}
-#pragma endregion Rate Control
-
-#pragma region VBV Buffer
-	uint32_t vbvBufferMode = static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER));
-	bool vbvBufferVisible = (curView >= ViewMode::Advanced);
-
-	uint32_t lastVBVBufferMode = static_cast<uint32_t>(obs_data_get_int(data, ("last" P_VBVBUFFER)));
-	if (lastVBVBufferMode != vbvBufferMode) {
-		obs_data_set_int(data, ("last" P_VBVBUFFER), vbvBufferMode);
-		result = true;
-	}
-
-	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_STRICTNESS), vbvBufferVisible && (vbvBufferMode == 0));
-	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_SIZE), vbvBufferVisible && (vbvBufferMode == 1));
-	if (!vbvBufferVisible || vbvBufferMode == 0)
-		obs_data_unset_user_value(data, P_VBVBUFFER_SIZE);
-	if (!vbvBufferVisible || vbvBufferMode == 1)
-		obs_data_unset_user_value(data, P_VBVBUFFER_STRICTNESS);
-#pragma endregion VBV Buffer
-
-#pragma region GOP
-	bool gopvisible = (curView >= ViewMode::Expert);
-	bool goptype_fixed = (static_cast<H265::GOPType>(obs_data_get_int(data, P_GOP_TYPE)) == H265::GOPType::Fixed);
-	obs_property_set_visible(obs_properties_get(props, P_GOP_SIZE), goptype_fixed && gopvisible);
-	obs_property_set_visible(obs_properties_get(props, P_GOP_SIZE_MINIMUM), !goptype_fixed && gopvisible);
-	obs_property_set_visible(obs_properties_get(props, P_GOP_SIZE_MAXIMUM), !goptype_fixed && gopvisible);
-	if (!goptype_fixed) {
-		obs_data_unset_user_value(data, P_GOP_SIZE);
-	} else if (goptype_fixed) {
-		obs_data_unset_user_value(data, P_GOP_SIZE_MINIMUM);
-		obs_data_unset_user_value(data, P_GOP_SIZE_MAXIMUM);
-	}
-#pragma endregion GOP
-#pragma endregion View Mode
-
-	// Permanently disable static properties while encoding.
-	void* enc = obs_properties_get_param(props);
-	if (enc) {
-		std::vector<const char*> hiddenProperties = {
-			// Static
-			///P_USAGE,
-			P_QUALITYPRESET,
-			P_PROFILE,
-			P_PROFILELEVEL,
-			P_TIER,
-			P_CODINGTYPE,
-			P_MAXIMUMREFERENCEFRAMES,
-
-			/// Rate Control
-			P_RATECONTROLMETHOD,
-			P_VBVBUFFER,
-			P_VBVBUFFER_STRICTNESS,
-			P_VBVBUFFER_SIZE,
-			P_VBVBUFFER_INITIALFULLNESS,
-			P_PREPASSMODE,
-			P_VBAQ,
-
-			/// Picture Control
-			P_GOP_SIZE,
-			P_GOP_SIZE_MAXIMUM,
-			P_GOP_SIZE_MINIMUM,
-			P_GOP_TYPE,
-			P_INTERVAL_KEYFRAME,
-			P_PERIOD_IDR_H265,
-			P_DEBLOCKINGFILTER,
-			P_MOTIONESTIMATION,
-
-			// System
-			P_VIDEO_API,
-			P_VIDEO_ADAPTER,
-			P_OPENCL_TRANSFER,
-			P_OPENCL_CONVERSION,
-			P_MULTITHREADING,
-			P_QUEUESIZE,
-			P_DEBUG,
-		};
-		for (const char* pr : hiddenProperties) {
-			obs_property_set_enabled(obs_properties_get(props, pr), false);
-		}
-	}
-
-	return true;
-}
-
-void* Plugin::Interface::H265Interface::create(obs_data_t* data, obs_encoder_t* encoder) {
-	try {
-		return new H265Interface(data, encoder);
-	} catch (std::exception e) {
-		PLOG_ERROR("%s", e.what());
-	}
-	return nullptr;
-}
-
-Plugin::Interface::H265Interface::H265Interface(obs_data_t* data, obs_encoder_t* encoder) {
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
-
-	m_Encoder = encoder;
-
-	// OBS Settings
-	uint32_t obsWidth = obs_encoder_get_width(encoder);
-	uint32_t obsHeight = obs_encoder_get_height(encoder);
-	video_t *obsVideoInfo = obs_encoder_video(encoder);
-	const struct video_output_info *voi = video_output_get_info(obsVideoInfo);
-	uint32_t obsFPSnum = voi->fps_num;
-	uint32_t obsFPSden = voi->fps_den;
-
-	//////////////////////////////////////////////////////////////////////////
-	/// Initialize Encoder
-	bool debug = obs_data_get_bool(data, P_DEBUG);
-	Plugin::AMD::AMF::Instance()->EnableDebugTrace(debug);
-
-	ColorFormat colorFormat = ColorFormat::NV12;
-	switch (voi->format) {
-		case VIDEO_FORMAT_NV12:
-			colorFormat = ColorFormat::NV12;
-			break;
-		case VIDEO_FORMAT_I420:
-			colorFormat = ColorFormat::I420;
-			break;
-		case VIDEO_FORMAT_YUY2:
-			colorFormat = ColorFormat::YUY2;
-			break;
-		case VIDEO_FORMAT_RGBA:
-			colorFormat = ColorFormat::RGBA;
-			break;
-		case VIDEO_FORMAT_BGRA:
-			colorFormat = ColorFormat::BGRA;
-			break;
-		case VIDEO_FORMAT_Y800:
-			colorFormat = ColorFormat::GRAY;
-			break;
-	}
-	ColorSpace colorSpace = ColorSpace::BT601;
-	switch (voi->colorspace) {
-		case VIDEO_CS_DEFAULT:
-		case VIDEO_CS_601:
-			colorSpace = ColorSpace::BT601;
-			break;
-		case VIDEO_CS_709:
-			colorSpace = ColorSpace::BT709;
-			break;
-	}
-
-	auto api = API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
-	union {
-		int64_t v;
-		uint32_t id[2];
-	} adapterid = { obs_data_get_int(data, P_VIDEO_ADAPTER) };
-	auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
-
-	m_VideoEncoder = std::make_unique<EncoderH265>(api, adapter,
-		!!obs_data_get_int(data, P_OPENCL_TRANSFER), !!obs_data_get_int(data, P_OPENCL_CONVERSION),
-		colorFormat, colorSpace, voi->range == VIDEO_RANGE_FULL,
-		!!obs_data_get_int(data, P_MULTITHREADING), (size_t)obs_data_get_int(data, P_QUEUESIZE));
-
-	/// Static Properties
-	//m_VideoEncoder->SetUsage(Usage::Transcoding);
-	m_VideoEncoder->SetQualityPreset(static_cast<QualityPreset>(obs_data_get_int(data, P_QUALITYPRESET)));
-
-	/// Frame
-	m_VideoEncoder->SetResolution(std::make_pair(obsWidth, obsHeight));
-	m_VideoEncoder->SetFrameRate(std::make_pair(obsFPSnum, obsFPSden));
-	///- Aspect Ratio
-
-	/// Profile & Level
-	m_VideoEncoder->SetProfile(static_cast<Profile>(obs_data_get_int(data, P_PROFILE)));
-	m_VideoEncoder->SetProfileLevel(static_cast<ProfileLevel>(obs_data_get_int(data, P_PROFILELEVEL)));
-	m_VideoEncoder->SetTier(static_cast<H265::Tier>(obs_data_get_int(data, P_TIER)));
-
-	try {
-		m_VideoEncoder->SetCodingType(static_cast<CodingType>(obs_data_get_int(data, P_CODINGTYPE)));
-	} catch (...) {
-	}
-	try {
-		m_VideoEncoder->SetMaximumReferenceFrames(obs_data_get_int(data, P_MAXIMUMREFERENCEFRAMES));
-	} catch (...) {
-	}
-
-	// Rate Control
-	m_VideoEncoder->SetRateControlMethod(static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD)));
-	if (obs_data_get_int(data, P_VBVBUFFER) == 0) {
-		m_VideoEncoder->SetVBVBufferStrictness(obs_data_get_double(data, P_VBVBUFFER_STRICTNESS) / 100.0);
-	} else {
-		m_VideoEncoder->SetVBVBufferSize(static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER_SIZE) * 1000));
-	}
-	m_VideoEncoder->SetVBVBufferInitialFullness(obs_data_get_double(data, P_VBVBUFFER_INITIALFULLNESS) / 100.0f);
-	if (m_VideoEncoder->GetRateControlMethod() != RateControlMethod::ConstantQP) {
-		m_VideoEncoder->SetPrePassMode(static_cast<PrePassMode>(obs_data_get_int(data, P_PREPASSMODE)));
-		m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled((!!obs_data_get_int(data, P_VBAQ)));
-	} else {
-		m_VideoEncoder->SetPrePassMode(PrePassMode::Disabled);
-		m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled(false);
-	}
-
-	// Picture Control
-	uint32_t gopSize = static_cast<uint32_t>(clamp(floor(obsFPSnum / (double_t)obsFPSden), 1, 1000));
-	H265::GOPType gopType = static_cast<H265::GOPType>(obs_data_get_int(data, P_GOP_TYPE));
-	m_VideoEncoder->SetGOPType(gopType);
-	if (static_cast<ViewMode>(obs_data_get_int(data, P_VIEW)) >= ViewMode::Expert) {
-		switch (gopType) {
-			case H265::GOPType::Fixed:
-				gopSize = (uint32_t)obs_data_get_int(data, P_GOP_SIZE);
-				break;
-			case H265::GOPType::Variable:
-				gopSize = (uint32_t)(obs_data_get_int(data, P_GOP_SIZE_MINIMUM) + obs_data_get_int(data, P_GOP_SIZE_MAXIMUM)) / 2;
-				m_VideoEncoder->SetGOPSizeMin((uint32_t)obs_data_get_int(data, P_GOP_SIZE_MINIMUM));
-				m_VideoEncoder->SetGOPSizeMax((uint32_t)obs_data_get_int(data, P_GOP_SIZE_MAXIMUM));
-				break;
-		}
-	}
-	m_VideoEncoder->SetGOPSize(gopSize);
-	/// Keyframe Interval/Period
-	double_t framerate = (double_t)obsFPSnum / (double_t)obsFPSden;
-	{
-		uint32_t idrperiod = static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IDR_H265));
-		if (idrperiod == 0) {
-			double_t keyinterv = obs_data_get_double(data, P_INTERVAL_KEYFRAME);
-			idrperiod = static_cast<uint32_t>(ceil((keyinterv * framerate) / gopSize));
-		}
-		m_VideoEncoder->SetIDRPeriod(clamp(idrperiod, 1, 1000));
-	}
-	m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, P_DEBLOCKINGFILTER));
-	m_VideoEncoder->SetMotionEstimationHalfPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 1));
-	m_VideoEncoder->SetMotionEstimationQuarterPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 2));
-
-	// OBS - Enforce Streaming Service Restrictions
-#pragma region OBS - Enforce Streaming Service Restrictions
-	{
-		// Profile
-		const char* p_str = obs_data_get_string(data, "profile");
-		if (strcmp(p_str, "") != 0) {
-			if (strcmp(p_str, "main")) {
-				m_VideoEncoder->SetProfile(Profile::Main);
-			}
-			obs_data_unset_user_value(data, "profile");
-		}
-
-		// Preset
-		const char* preset = obs_data_get_string(data, "preset");
-		if (strcmp(preset, "") != 0) {
-			if (strcmp(preset, "speed") == 0) {
-				m_VideoEncoder->SetQualityPreset(QualityPreset::Speed);
-			} else if (strcmp(preset, "balanced") == 0) {
-				m_VideoEncoder->SetQualityPreset(QualityPreset::Balanced);
-			} else if (strcmp(preset, "quality") == 0) {
-				m_VideoEncoder->SetQualityPreset(QualityPreset::Quality);
-			}
-			obs_data_set_int(data, P_QUALITYPRESET, (int32_t)m_VideoEncoder->GetQualityPreset());
-			obs_data_unset_user_value(data, "preset");
-		}
-
-		// Rate Control Method
-		const char* t_str = obs_data_get_string(data, "rate_control");
-		if (strcmp(t_str, "") != 0) {
-			if (strcmp(t_str, "CBR") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantBitrate);
-				m_VideoEncoder->SetFillerDataEnabled(true);
-			} else if (strcmp(t_str, "VBR") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::PeakConstrainedVariableBitrate);
-			} else if (strcmp(t_str, "VBR_LAT") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::LatencyConstrainedVariableBitrate);
-			} else if (strcmp(t_str, "CQP") == 0) {
-				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantQP);
-			}
-
-			obs_data_set_int(data, P_RATECONTROLMETHOD, (int32_t)m_VideoEncoder->GetRateControlMethod());
-			obs_data_unset_user_value(data, "rate_control");
-		}
-	}
-#pragma endregion OBS - Enforce Streaming Service Restrictions
-
-	// Dynamic Properties (Can be changed during Encoding)
-	this->update(data);
-
-	// Initialize (locks static properties)
-	try {
-		m_VideoEncoder->Start();
-	} catch (...) {
-		throw;
-	}
-
-	// Dynamic Properties (Can be changed during Encoding)
-	this->update(data);
-
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
-}
-
-void Plugin::Interface::H265Interface::destroy(void* ptr) {
-	if (ptr)
-		delete static_cast<H265Interface*>(ptr);
-}
-
-Plugin::Interface::H265Interface::~H265Interface() {
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing...");
-	if (m_VideoEncoder) {
-		m_VideoEncoder->Stop();
-		m_VideoEncoder = nullptr;
-	}
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
-}
-
-bool Plugin::Interface::H265Interface::update(void *ptr, obs_data_t *settings) {
-	if (ptr)
-		return static_cast<H265Interface*>(ptr)->update(settings);
-	return false;
-}
-
-bool Plugin::Interface::H265Interface::update(obs_data_t* data) {
-	const video_t *obsVideoInfo = obs_encoder_video(m_Encoder);
-	const struct video_output_info *voi = video_output_get_info(obsVideoInfo);
-	uint32_t obsFPSnum = voi->fps_num;
-	uint32_t obsFPSden = voi->fps_den;
-
-	// Rate Control
-	RateControlMethod rcm = m_VideoEncoder->GetRateControlMethod();
-	if (rcm == RateControlMethod::ConstantQP) {
-		m_VideoEncoder->SetIFrameQPMinimum(m_VideoEncoder->CapsIFrameQPMinimum().first);
-		m_VideoEncoder->SetIFrameQPMaximum(m_VideoEncoder->CapsIFrameQPMaximum().second);
-		m_VideoEncoder->SetPFrameQPMinimum(m_VideoEncoder->CapsPFrameQPMinimum().first);
-		m_VideoEncoder->SetPFrameQPMaximum(m_VideoEncoder->CapsPFrameQPMaximum().second);
-		m_VideoEncoder->SetIFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME)));
-		m_VideoEncoder->SetPFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME)));
-		m_VideoEncoder->SetFillerDataEnabled(false);
-	} else {
-		m_VideoEncoder->SetIFrameQPMinimum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME_MINIMUM)));
-		m_VideoEncoder->SetIFrameQPMaximum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME_MAXIMUM)));
-		m_VideoEncoder->SetPFrameQPMinimum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME_MINIMUM)));
-		m_VideoEncoder->SetPFrameQPMaximum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME_MAXIMUM)));
-		m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
-		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, P_BITRATE_PEAK) * 1000));
-	}
-	if (rcm == RateControlMethod::ConstantBitrate) {
-		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
-		m_VideoEncoder->SetFillerDataEnabled(!!obs_data_get_int(data, P_FILLERDATA));
-	} else {
-		m_VideoEncoder->SetFillerDataEnabled(false);
-	}
-	m_VideoEncoder->SetFrameSkippingEnabled(!!obs_data_get_int(data, P_FRAMESKIPPING));
-	m_VideoEncoder->SetEnforceHRDEnabled(!!obs_data_get_int(data, P_ENFORCEHRD));
-
-	// Picture Control
-	double_t framerate = (double_t)obsFPSnum / (double_t)obsFPSden;
-	/// I/P/Skip Frame Interval/Period
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_IFRAME) * framerate);
-		period = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IFRAME)));
-		m_VideoEncoder->SetIFramePeriod(period);
-	}
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_PFRAME) * framerate);
-		period = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_PFRAME)));
-		m_VideoEncoder->SetPFramePeriod(period);
-	}
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_BFRAME) * framerate);
-		period = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_BFRAME)));
-		m_VideoEncoder->SetBFramePeriod(period);
-	}
-	{
-		uint32_t period = static_cast<uint32_t>(obs_data_get_int(data, P_FRAMESKIPPING_PERIOD));
-		m_VideoEncoder->SetFrameSkippingPeriod(period);
-		m_VideoEncoder->SetFrameSkippingBehaviour(!!obs_data_get_int(data, P_FRAMESKIPPING_BEHAVIOUR));
-	}
-
-	m_VideoEncoder->SetDebug(obs_data_get_bool(data, P_DEBUG));
-
-	if (m_VideoEncoder->IsStarted()) {
-		m_VideoEncoder->LogProperties();
-		if (static_cast<ViewMode>(obs_data_get_int(data, P_VIEW)) >= ViewMode::Master)
-			PLOG_ERROR("View Mode 'Master' is active, avoid giving anything but basic support. Error is most likely caused by user settings themselves.");
-	}
-
-	return true;
-}
-
-bool Plugin::Interface::H265Interface::encode(void *ptr, struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
-	if (ptr)
-		return static_cast<H265Interface*>(ptr)->encode(frame, packet, received_packet);
-	return false;
-}
-
-bool Plugin::Interface::H265Interface::encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
-	if (!frame || !packet || !received_packet)
-		return false;
-
-	try {
-		return m_VideoEncoder->Encode(frame, packet, received_packet);
-	} catch (std::exception e) {
-		PLOG_ERROR("Exception during encoding: %s", e.what());
-	} catch (...) {
-		PLOG_ERROR("Unknown exception during encoding.");
-	}
-	return false;
-}
-
-void Plugin::Interface::H265Interface::get_video_info(void *ptr, struct video_scale_info *info) {
-	if (ptr)
-		static_cast<H265Interface*>(ptr)->get_video_info(info);
-}
-
-void Plugin::Interface::H265Interface::get_video_info(struct video_scale_info* info) {
-	m_VideoEncoder->GetVideoInfo(info);
-}
-
-bool Plugin::Interface::H265Interface::get_extra_data(void *ptr, uint8_t** extra_data, size_t* size) {
-	if (ptr)
-		return static_cast<H265Interface*>(ptr)->get_extra_data(extra_data, size);
-	return false;
-}
-
-bool Plugin::Interface::H265Interface::get_extra_data(uint8_t** extra_data, size_t* size) {
-	return m_VideoEncoder->GetExtraData(extra_data, size);
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/plugin.cpp Deleted

@@ -1,386 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-#include "plugin.h"
-#include "api-base.h"
-#include "amf.h"
-#include "amf-capabilities.h"
-#include "enc-h264.h"
-#include "enc-h265.h"
-#include <sstream>
-#include <libobs/util/pipe.h>
-#include <libobs/util/platform.h>
-#include <libobs/util/util.hpp>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-using namespace Plugin;
-using namespace Plugin::AMD;
-
-#if defined(WIN32)
-BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID) {
-	return TRUE;
-}
-
-static inline bool create_process(const char *cmd_line, HANDLE stdin_handle,
-	HANDLE stdout_handle, HANDLE *process) {
-	PROCESS_INFORMATION pi = { 0 };
-	wchar_t *cmd_line_w = NULL;
-	STARTUPINFOW si = { 0 };
-	bool success = false;
-
-	si.cb = sizeof(si);
-	si.dwFlags = STARTF_USESTDHANDLES;
-	si.hStdInput = stdin_handle;
-	si.hStdOutput = stdout_handle;
-
-	os_utf8_to_wcs_ptr(cmd_line, 0, &cmd_line_w);
-	if (cmd_line_w) {
-		success = !!CreateProcessW(NULL, cmd_line_w, NULL, NULL, true,
-			CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
-
-		if (success) {
-			*process = pi.hProcess;
-			CloseHandle(pi.hThread);
-		}
-
-		bfree(cmd_line_w);
-	}
-
-	return success;
-}
-
-static bool create_pipe(HANDLE *input, HANDLE *output) {
-	SECURITY_ATTRIBUTES sa = { 0 };
-
-	sa.nLength = sizeof(sa);
-	sa.bInheritHandle = true;
-
-	if (!CreatePipe(input, output, &sa, 0)) {
-		return false;
-	}
-
-	return true;
-}
-#endif
-
-OBS_DECLARE_MODULE();
-OBS_MODULE_AUTHOR("Michael Fabian Dirks");
-OBS_MODULE_USE_DEFAULT_LOCALE("enc-amf", "en-US");
-
-#ifdef _DEBUG
-#include "components/VideoEncoderVCE.h"
-#include "components/VideoEncoderHEVC.h"
-#include "components/VideoConverter.h"
-
-static std::string fastPrintVariant(const char* text, amf::AMFVariantStruct variant) {
-	std::vector<char> buf(1024);
-	switch (variant.type) {
-		case amf::AMF_VARIANT_EMPTY:
-			snprintf(buf.data(), buf.size(), "%s%s", text, "Empty");
-			break;
-		case amf::AMF_VARIANT_BOOL:
-			snprintf(buf.data(), buf.size(), "%s%s", text, variant.boolValue ? "true" : "false");
-			break;
-		case amf::AMF_VARIANT_INT64:
-			snprintf(buf.data(), buf.size(), "%s%lld", text, variant.int64Value);
-			break;
-		case amf::AMF_VARIANT_DOUBLE:
-			snprintf(buf.data(), buf.size(), "%s%f", text, variant.doubleValue);
-			break;
-		case amf::AMF_VARIANT_RECT:
-			snprintf(buf.data(), buf.size(), "%s[%ld,%ld,%ld,%ld]", text,
-				variant.rectValue.top, variant.rectValue.left,
-				variant.rectValue.bottom, variant.rectValue.right);
-			break;
-		case amf::AMF_VARIANT_SIZE:
-			snprintf(buf.data(), buf.size(), "%s%ldx%ld", text,
-				variant.sizeValue.width, variant.sizeValue.height);
-			break;
-		case amf::AMF_VARIANT_POINT:
-			snprintf(buf.data(), buf.size(), "%s[%ld,%ld]", text,
-				variant.pointValue.x, variant.pointValue.y);
-			break;
-		case amf::AMF_VARIANT_RATE:
-			snprintf(buf.data(), buf.size(), "%s%ld/%ld", text,
-				variant.rateValue.num, variant.rateValue.den);
-			break;
-		case amf::AMF_VARIANT_RATIO:
-			snprintf(buf.data(), buf.size(), "%s%ld:%ld", text,
-				variant.ratioValue.num, variant.ratioValue.den);
-			break;
-		case amf::AMF_VARIANT_COLOR:
-			snprintf(buf.data(), buf.size(), "%s(%d,%d,%d,%d)", text,
-				variant.colorValue.r,
-				variant.colorValue.g,
-				variant.colorValue.b,
-				variant.colorValue.a);
-			break;
-		case amf::AMF_VARIANT_STRING:
-			snprintf(buf.data(), buf.size(), "%s'%s'", text,
-				variant.stringValue);
-			break;
-		case amf::AMF_VARIANT_WSTRING:
-			snprintf(buf.data(), buf.size(), "%s'%ls'", text,
-				variant.wstringValue);
-			break;
-	}
-	return std::string(buf.data());
-};
-
-static void printDebugInfo(amf::AMFComponentPtr m_AMFEncoder) {
-	amf::AMFPropertyInfo* pInfo;
-	size_t propCount = m_AMFEncoder->GetPropertyCount();
-	//PLOG_INFO("-- Internal AMF Encoder Properties --");
-	for (size_t propIndex = 0; propIndex < propCount; propIndex++) {
-		static const char* typeToString[] = {
-			"Empty",
-			"Boolean",
-			"Int64",
-			"Double",
-			"Rect",
-			"Size",
-			"Point",
-			"Rate",
-			"Ratio",
-			"Color",
-			"String",
-			"WString",
-			"Interface"
-		};
-
-		AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(propIndex, (const amf::AMFPropertyInfo**) &pInfo);
-		if (res != AMF_OK)
-			continue;
-
-		amf::AMFVariantStruct curStruct = amf::AMFVariantStruct();
-		m_AMFEncoder->GetProperty(pInfo->name, &curStruct);
-
-		auto vcur = fastPrintVariant("Current: ", curStruct);
-		auto vdef = fastPrintVariant("Default: ", pInfo->defaultValue);
-		auto vmin = fastPrintVariant("Minimum: ", pInfo->minValue);
-		auto vmax = fastPrintVariant("Maximum: ", pInfo->maxValue);
-		std::stringstream venum;
-		if (pInfo->pEnumDescription) {
-			const amf::AMFEnumDescriptionEntry* pEnumEntry = pInfo->pEnumDescription;
-			while (pEnumEntry->name != nullptr) {
-				QUICK_FORMAT_MESSAGE(tmp, "%ls[%ld]", pEnumEntry->name, pEnumEntry->value);
-				venum << tmp.c_str() << "; ";
-				pEnumEntry++;
-			}
-		}
-
-		PLOG_INFO("%ls(Description: %ls, Type: %s, Index %d, Content Type: %d, Access: %s%s%s, Values: {%s, %s, %s, %s%s%s})",
-			pInfo->name,
-			pInfo->desc,
-			typeToString[pInfo->type],
-			propIndex,
-			pInfo->contentType,
-			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_READ) ? "R" : "",
-			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE) ? "W" : "",
-			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE_RUNTIME) ? "X" : "",
-			vcur.c_str(), vdef.c_str(), vmin.c_str(), vmax.c_str(),
-			(venum.str().length() > 0) ? ", Enum: " : "", venum.str().c_str()
-		);
-	}
-}
-#endif
-
-MODULE_EXPORT bool obs_module_load(void) {
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loading...");
-
-#ifdef _WIN32
-	// Out-of-process AMF Test
-	{
-		unsigned long returnCode = 0xFFFFFFFF;
-		HANDLE hProcess, hIn, hOut;
-		BPtr<char> path = obs_module_file("enc-amf-test" BIT_STR ".exe");
-
-		if (!create_pipe(&hIn, &hOut)) {
-			PLOG_ERROR("Failed to create pipes for AMF test.");
-			return false;
-		}
-		if (!SetHandleInformation(hIn, HANDLE_FLAG_INHERIT, false)
-			|| !SetHandleInformation(hOut, HANDLE_FLAG_INHERIT, false)) {
-			CloseHandle(hIn);
-			CloseHandle(hOut);
-			PLOG_ERROR("Failed to modify pipes for AMF test.");
-			return false;
-		};
-		if (!create_process(path, hIn, hOut, &hProcess)) {
-			CloseHandle(hIn);
-			CloseHandle(hOut);
-			PLOG_ERROR("Failed to start AMF test subprocess.");
-			return false;
-		}
-
-		std::vector<char> buf(1024);
-		DWORD bufread = 0;
-		while (ReadFile(hOut, buf.data(), 1024, &bufread, NULL)) {
-			PLOG_ERROR("%s", buf.data());
-		}
-
-		if (WaitForSingleObject(hProcess, 2000) == WAIT_OBJECT_0)
-			GetExitCodeProcess(hProcess, &returnCode);
-
-		CloseHandle(hProcess);
-		CloseHandle(hIn);
-		CloseHandle(hOut);
-
-		switch (returnCode) {
-			case STATUS_ACCESS_VIOLATION:
-			case STATUS_ARRAY_BOUNDS_EXCEEDED:
-			case STATUS_BREAKPOINT:
-			case STATUS_DATATYPE_MISALIGNMENT:
-			case STATUS_FLOAT_DENORMAL_OPERAND:
-			case STATUS_FLOAT_DIVIDE_BY_ZERO:
-			case STATUS_FLOAT_INEXACT_RESULT:
-			case STATUS_FLOAT_INVALID_OPERATION:
-			case STATUS_FLOAT_OVERFLOW:
-			case STATUS_FLOAT_STACK_CHECK:
-			case STATUS_FLOAT_UNDERFLOW:
-			case STATUS_GUARD_PAGE_VIOLATION:
-			case STATUS_ILLEGAL_INSTRUCTION:
-			case STATUS_IN_PAGE_ERROR:
-			case STATUS_INTEGER_DIVIDE_BY_ZERO:
-			case STATUS_INTEGER_OVERFLOW:
-			case STATUS_INVALID_DISPOSITION:
-			case STATUS_INVALID_HANDLE:
-			case STATUS_NONCONTINUABLE_EXCEPTION:
-			case STATUS_PRIVILEGED_INSTRUCTION:
-			case STATUS_SINGLE_STEP:
-			case STATUS_STACK_OVERFLOW:
-			case STATUS_UNWIND_CONSOLIDATE:
-			default:
-				PLOG_ERROR("A critical error occured during AMF Testing.");
-				return false;
-			case 2:
-			case 1:
-				PLOG_ERROR("AMF Test failed due to one or more errors.");
-				return false;
-			case 0:
-				break;
-		}
-	}
-#endif
-
-	// AMF
-	try {
-		Plugin::AMD::AMF::Initialize();
-	} catch (const std::exception& e) {
-		PLOG_ERROR("Encountered Exception during AMF initialization: %s", e.what());
-		return false;
-	} catch (...) {
-		PLOG_ERROR("Unexpected Exception during AMF initialization.");
-		return false;
-	}
-
-	// Initialize Graphics APIs
-	Plugin::API::InitializeAPIs();
-
-	// AMF Capabilities
-	try {
-		Plugin::AMD::CapabilityManager::Initialize();
-	} catch (const std::exception& e) {
-		PLOG_ERROR("Encountered Exception during Capability Manager initialization: %s", e.what());
-		return false;
-	} catch (...) {
-		PLOG_ERROR("Unexpected Exception during Capability Manager initialization.");
-		return false;
-	}
-
-	// Register Encoders
-	Plugin::Interface::H264Interface::encoder_register();
-	Plugin::Interface::H265Interface::encoder_register();
-
-#ifdef _DEBUG
-	{
-		PLOG_INFO("Dumping Parameter Information...");
-		const wchar_t* encoders[] = {
-			AMFVideoEncoderVCE_AVC,
-			AMFVideoEncoder_HEVC
-		};
-		auto m_AMF = AMF::Instance();
-		auto m_AMFFactory = m_AMF->GetFactory();
-		amf::AMFTrace* m_AMFTrace;
-		m_AMFFactory->GetTrace(&m_AMFTrace);
-		amf::AMFDebug* m_AMFDebug;
-		m_AMFFactory->GetDebug(&m_AMFDebug);
-		m_AMFDebug->AssertsEnable(true);
-		m_AMFDebug->EnablePerformanceMonitor(true);
-		m_AMFTrace->SetGlobalLevel(AMF_TRACE_TEST);
-		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_TEST);
-		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_FILE, AMF_TRACE_TEST);
-		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_TEST);
-		m_AMFTrace->SetPath(L"AMFTrace.log");
-		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_FILE, true);
-		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, true);
-		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, true);
-		m_AMFTrace->TraceEnableAsync(true);
-		amf::AMFContextPtr m_AMFContext;
-		if (m_AMFFactory->CreateContext(&m_AMFContext) == AMF_OK) {
-			for (auto enc : encoders) {
-				m_AMFContext->InitDX11(nullptr);
-				amf::AMFComponentPtr m_AMFComponent;
-				if (m_AMFFactory->CreateComponent(m_AMFContext, enc, &m_AMFComponent) == AMF_OK) {
-					PLOG_INFO("-- %ls --", enc);
-					printDebugInfo(m_AMFComponent);
-					m_AMFComponent->Terminate();
-				}
-			}
-			amf::AMFComponentPtr m_AMFComponent, m_AMFComponent2;
-			if (m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoConverter, &m_AMFComponent) == AMF_OK) {
-				m_AMFComponent->Init(amf::AMF_SURFACE_NV12, 1280, 720);
-				if (m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoEncoderVCE_AVC, &m_AMFComponent2) == AMF_OK) {
-					PLOG_INFO("-- %s --", "Converter");
-					m_AMFComponent->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, AMF_VIDEO_CONVERTER_COLOR_PROFILE_JPEG);
-					printDebugInfo(m_AMFComponent);
-					m_AMFComponent2->Terminate();
-				}
-				m_AMFComponent->Terminate();
-			}
-			m_AMFContext->Terminate();
-		}
-
-	}
-#endif
-
-	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded.");
-	return true;
-}
-
-/** Optional: Called when the module is unloaded.  */
-MODULE_EXPORT void obs_module_unload(void) {
-	Plugin::AMD::CapabilityManager::Finalize();
-	Plugin::API::FinalizeAPIs();
-	Plugin::AMD::AMF::Finalize();
-}
-
-/** Optional: Returns the full name of the module */
-MODULE_EXPORT const char* obs_module_name() {
-	return "AMD Media Framework Plugin";
-}
-
-/** Optional: Returns a description of the module */
-MODULE_EXPORT const char* obs_module_description() {
-	return "AMD Media Framework Plugin";
-}
-

obs-studio-21.1.2.tar.xz/plugins/enc-amf/Source/utility.cpp Deleted

@@ -1,743 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#pragma once
-
-// Plugin
-#include "utility.h"
-#include "amf.h"
-#include "amf-encoder.h"
-#include "components/VideoConverter.h"
-#include "amf-encoder-h264.h"
-#include "components/VideoEncoderVCE.h"
-#include "amf-encoder-h265.h"
-#include "components/VideoEncoderHEVC.h"
-
-#include <map>
-#include <sstream>
-
-using namespace Plugin::AMD;
-
-uint64_t Utility::GetUniqueIdentifier() {
-	static std::mutex __mutex;
-	static uint64_t __curId;
-
-	const std::lock_guard<std::mutex> lock(__mutex);
-	return ++__curId;
-}
-
-static std::map<std::string, std::string> translatedMap;
-const char* Utility::obs_module_text_multi(const char *key, uint8_t depth) {
-	// Check if it already was translated.
-	if (!translatedMap.count(std::string(key))) { // If not, translate it now.
-		const char* out = obs_module_text(key);
-
-		// Allow for nested translations using \@...\@ sequences.
-		if (depth > 0) {
-			// I'm pretty sure this can be optimized a ton if necessary.
-
-			size_t seqStart = 0,
-				seqEnd = 0;
-			bool haveSequence = false;
-
-			std::stringstream fout;
-
-			// Walk the given string.
-			std::string walkable = std::string(out);
-
-			for (size_t pos = 0; pos <= walkable.length(); pos++) {
-				std::string walked = walkable.substr(pos, 2);
-
-				if (walked == "\\@") { // Sequence Start/End
-					if (haveSequence) {
-						seqEnd = pos;
-
-						std::string sequence = walkable.substr(seqStart, seqEnd - seqStart);
-						fout << obs_module_text_multi(sequence.c_str(), depth--);
-					} else {
-						seqStart = pos + 2;
-					}
-					haveSequence = !haveSequence;
-					pos = pos + 1;
-				} else if (!haveSequence) {
-					fout << walked.substr(0, 1); // Append the left character.
-				}
-			}
-
-			std::pair<std::string, std::string> kv = std::pair<std::string, std::string>(std::string(key), fout.str());
-			translatedMap.insert(kv);
-		} else {
-			return out;
-		}
-	}
-
-	auto value = translatedMap.find(std::string(key));
-	return value->second.c_str();
-}
-
-
-// Codec
-const char* Utility::CodecToString(Plugin::AMD::Codec v) {
-	switch (v) {
-		case Codec::AVC:
-			return "H264/AVC";
-		case Codec::SVC:
-			return "H264/SVC";
-		case Codec::HEVC:
-			return "H265/HEVC";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-const wchar_t* Utility::CodecToAMF(Plugin::AMD::Codec v) {
-	switch (v) {
-		case Codec::AVC:
-			return AMFVideoEncoderVCE_AVC;
-		case Codec::SVC:
-			return AMFVideoEncoderVCE_SVC;
-		case Codec::HEVC:
-			return AMFVideoEncoder_HEVC;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Color Format
-const char* Utility::ColorFormatToString(Plugin::AMD::ColorFormat v) {
-	switch (v) {
-		case ColorFormat::I420:
-			return "YUV 4:2:0";
-		case ColorFormat::NV12:
-			return "NV12";
-		case ColorFormat::YUY2:
-			return "YUY2";
-		case ColorFormat::BGRA:
-			return "BGRA";
-		case ColorFormat::RGBA:
-			return "RGBA";
-		case ColorFormat::GRAY:
-			return "GRAY";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-amf::AMF_SURFACE_FORMAT Utility::ColorFormatToAMF(Plugin::AMD::ColorFormat v) {
-	switch (v) {
-		case ColorFormat::I420:
-			return amf::AMF_SURFACE_YUV420P;
-		case ColorFormat::NV12:
-			return amf::AMF_SURFACE_NV12;
-		case ColorFormat::YUY2:
-			return amf::AMF_SURFACE_YUY2;
-		case ColorFormat::BGRA:
-			return amf::AMF_SURFACE_BGRA;
-		case ColorFormat::RGBA:
-			return amf::AMF_SURFACE_RGBA;
-		case ColorFormat::GRAY:
-			return amf::AMF_SURFACE_GRAY8;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Color Space
-const char* Utility::ColorSpaceToString(Plugin::AMD::ColorSpace v) {
-	switch (v) {
-		case ColorSpace::BT601:
-			return "601";
-		case ColorSpace::BT709:
-			return "709";
-		case ColorSpace::BT2020:
-			return "2020";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM Utility::ColorSpaceToAMFConverter(Plugin::AMD::ColorSpace v) {
-	switch (v) {
-		case ColorSpace::BT601:
-			return AMF_VIDEO_CONVERTER_COLOR_PROFILE_601;
-		case ColorSpace::BT709:
-			return AMF_VIDEO_CONVERTER_COLOR_PROFILE_709;
-		case ColorSpace::BT2020:
-			return AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Usage
-const char* Utility::UsageToString(Plugin::AMD::Usage v) {
-	switch (v) {
-		case Usage::Transcoding:
-			return "Transcoding";
-		case Usage::UltraLowLatency:
-			return "Ultra Low Latency";
-		case Usage::LowLatency:
-			return "Low Latency";
-		case Usage::Webcam:
-			return "Webcam";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_USAGE_ENUM Utility::UsageToAMFH264(Plugin::AMD::Usage v) {
-	switch (v) {
-		case Usage::Transcoding:
-			return AMF_VIDEO_ENCODER_USAGE_TRANSCONDING;
-		case Usage::UltraLowLatency:
-			return AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY;
-		case Usage::LowLatency:
-			return AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY;
-		case Usage::Webcam:
-			return AMF_VIDEO_ENCODER_USAGE_WEBCAM;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::Usage Utility::UsageFromAMFH264(AMF_VIDEO_ENCODER_USAGE_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_USAGE_TRANSCONDING:
-			return Plugin::AMD::Usage::Transcoding;
-		case AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY:
-			return Plugin::AMD::Usage::UltraLowLatency;
-		case AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY:
-			return Plugin::AMD::Usage::LowLatency;
-		case AMF_VIDEO_ENCODER_USAGE_WEBCAM:
-			return Plugin::AMD::Usage::Webcam;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM Utility::UsageToAMFH265(Plugin::AMD::Usage v) {
-	switch (v) {
-		case Usage::Transcoding:
-			return AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCONDING;
-		case Usage::UltraLowLatency:
-			return AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY;
-		case Usage::LowLatency:
-			return AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY;
-		case Usage::Webcam:
-			return AMF_VIDEO_ENCODER_HEVC_USAGE_WEBCAM;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::Usage Utility::UsageFromAMFH265(AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCONDING:
-			return Usage::Transcoding;
-		case AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY:
-			return Usage::UltraLowLatency;
-		case AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY:
-			return Usage::LowLatency;
-		case AMF_VIDEO_ENCODER_HEVC_USAGE_WEBCAM:
-			return Usage::Webcam;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Quality Preset
-const char* Utility::QualityPresetToString(Plugin::AMD::QualityPreset v) {
-	switch (v) {
-		case QualityPreset::Speed:
-			return "Speed";
-		case QualityPreset::Balanced:
-			return "Balanced";
-		case QualityPreset::Quality:
-			return "Quality";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM Utility::QualityPresetToAMFH264(Plugin::AMD::QualityPreset v) {
-	switch (v) {
-		case QualityPreset::Speed:
-			return AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED;
-		case QualityPreset::Balanced:
-			return AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED;
-		case QualityPreset::Quality:
-			return AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::QualityPreset Utility::QualityPresetFromAMFH264(AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED:
-			return QualityPreset::Speed;
-		case AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED:
-			return QualityPreset::Balanced;
-		case AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY:
-			return QualityPreset::Quality;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM Utility::QualityPresetToAMFH265(Plugin::AMD::QualityPreset v) {
-	switch (v) {
-		case QualityPreset::Speed:
-			return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED;
-		case QualityPreset::Balanced:
-			return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_BALANCED;
-		case QualityPreset::Quality:
-			return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_QUALITY;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::QualityPreset Utility::QualityPresetFromAMFH265(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED:
-			return QualityPreset::Speed;
-		case AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_BALANCED:
-			return QualityPreset::Balanced;
-		case AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_QUALITY:
-			return QualityPreset::Quality;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Profile
-const char* Utility::ProfileToString(Plugin::AMD::Profile v) {
-	switch (v) {
-		case Profile::ConstrainedBaseline:
-			return "Constrained Baseline";
-		case Profile::Baseline:
-			return "Baseline";
-		case Profile::Main:
-			return "Main";
-		case Profile::ConstrainedHigh:
-			return "Constrained High";
-		case Profile::High:
-			return "High";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_PROFILE_ENUM Utility::ProfileToAMFH264(Plugin::AMD::Profile v) {
-	switch (v) {
-		case Profile::ConstrainedBaseline:
-			return (AMF_VIDEO_ENCODER_PROFILE_ENUM)256;
-		case Profile::Baseline:
-			return AMF_VIDEO_ENCODER_PROFILE_BASELINE;
-		case Profile::Main:
-			return AMF_VIDEO_ENCODER_PROFILE_MAIN;
-		case Profile::ConstrainedHigh:
-			return (AMF_VIDEO_ENCODER_PROFILE_ENUM)257;
-		case Profile::High:
-			return AMF_VIDEO_ENCODER_PROFILE_HIGH;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::Profile Utility::ProfileFromAMFH264(AMF_VIDEO_ENCODER_PROFILE_ENUM v) {
-#pragma warning( disable: 4063 ) // Developer Note: I know better, Compiler.
-	switch (v) {
-		case (AMF_VIDEO_ENCODER_PROFILE_ENUM)256:
-			return Profile::ConstrainedBaseline;
-		case AMF_VIDEO_ENCODER_PROFILE_BASELINE:
-			return Profile::Baseline;
-		case AMF_VIDEO_ENCODER_PROFILE_MAIN:
-			return Profile::Main;
-		case (AMF_VIDEO_ENCODER_PROFILE_ENUM)257:
-			return Profile::ConstrainedHigh;
-		case AMF_VIDEO_ENCODER_PROFILE_HIGH:
-			return Profile::High;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM Utility::ProfileToAMFH265(Plugin::AMD::Profile v) {
-	switch (v) {
-		case Profile::Main:
-			return AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::Profile Utility::ProfileFromAMFH265(AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN:
-			return Profile::Main;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Tier
-const char* Utility::TierToString(Plugin::AMD::H265::Tier v) {
-	switch (v) {
-		case H265::Tier::Main:
-			return "Main";
-		case H265::Tier::High:
-			return "High";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_HEVC_TIER_ENUM Utility::TierToAMFH265(Plugin::AMD::H265::Tier v) {
-	switch (v) {
-		case H265::Tier::Main:
-			return AMF_VIDEO_ENCODER_HEVC_TIER_MAIN;
-		case H265::Tier::High:
-			return AMF_VIDEO_ENCODER_HEVC_TIER_HIGH;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::H265::Tier Utility::TierFromAMFH265(AMF_VIDEO_ENCODER_HEVC_TIER_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_HEVC_TIER_MAIN:
-			return H265::Tier::Main;
-		case AMF_VIDEO_ENCODER_HEVC_TIER_HIGH:
-			return H265::Tier::High;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Coding Type
-const char* Utility::CodingTypeToString(Plugin::AMD::CodingType v) {
-	switch (v) {
-		case CodingType::Automatic:
-			return "Automatic";
-		case CodingType::CALVC:
-			return "CALVC";
-		case CodingType::CABAC:
-			return "CABAC";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_CODING_ENUM Utility::CodingTypeToAMFH264(Plugin::AMD::CodingType v) {
-	switch (v) {
-		case CodingType::Automatic:
-			return AMF_VIDEO_ENCODER_UNDEFINED;
-		case CodingType::CALVC:
-			return AMF_VIDEO_ENCODER_CALV;
-		case CodingType::CABAC:
-			return AMF_VIDEO_ENCODER_CABAC;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::CodingType Utility::CodingTypeFromAMFH264(AMF_VIDEO_ENCODER_CODING_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_UNDEFINED:
-			return CodingType::Automatic;
-		case AMF_VIDEO_ENCODER_CALV:
-			return CodingType::CALVC;
-		case AMF_VIDEO_ENCODER_CABAC:
-			return CodingType::CABAC;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-int64_t Utility::CodingTypeToAMFH265(Plugin::AMD::CodingType v) {
-	switch (v) {
-		case CodingType::Automatic:
-			return 0;
-		case CodingType::CABAC:
-			return 1;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::CodingType Utility::CodingTypeFromAMFH265(int64_t v) {
-	switch (v) {
-		case 0:
-			return CodingType::Automatic;
-		case 1:
-			return CodingType::CABAC;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Rate Control Method
-const char* Utility::RateControlMethodToString(Plugin::AMD::RateControlMethod v) {
-	switch (v) {
-		case RateControlMethod::ConstantQP:
-			return "Constant Quantization Parameter";
-		case RateControlMethod::ConstantBitrate:
-			return "Constant Bitrate";
-		case RateControlMethod::PeakConstrainedVariableBitrate:
-			return "Peak Constrained Variable Bitrate";
-		case RateControlMethod::LatencyConstrainedVariableBitrate:
-			return "Latency Constrained Variable Bitrate";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM Utility::RateControlMethodToAMFH264(Plugin::AMD::RateControlMethod v) {
-	switch (v) {
-		case RateControlMethod::ConstantQP:
-			return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP;
-		case RateControlMethod::ConstantBitrate:
-			return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR;
-		case RateControlMethod::PeakConstrainedVariableBitrate:
-			return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR;
-		case RateControlMethod::LatencyConstrainedVariableBitrate:
-			return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::RateControlMethod Utility::RateControlMethodFromAMFH264(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP:
-			return RateControlMethod::ConstantQP;
-		case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR:
-			return RateControlMethod::ConstantBitrate;
-		case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR:
-			return RateControlMethod::PeakConstrainedVariableBitrate;
-		case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR:
-			return RateControlMethod::LatencyConstrainedVariableBitrate;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM Utility::RateControlMethodToAMFH265(Plugin::AMD::RateControlMethod v) {
-	switch (v) {
-		case RateControlMethod::ConstantQP:
-			return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP;
-		case RateControlMethod::ConstantBitrate:
-			return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR;
-		case RateControlMethod::PeakConstrainedVariableBitrate:
-			return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR;
-		case RateControlMethod::LatencyConstrainedVariableBitrate:
-			return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::RateControlMethod Utility::RateControlMethodFromAMFH265(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP:
-			return RateControlMethod::ConstantQP;
-		case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR:
-			return RateControlMethod::ConstantBitrate;
-		case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR:
-			return RateControlMethod::PeakConstrainedVariableBitrate;
-		case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR:
-			return RateControlMethod::LatencyConstrainedVariableBitrate;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Pre-Pass Method
-const char* Utility::PrePassModeToString(Plugin::AMD::PrePassMode v) {
-	switch (v) {
-		case PrePassMode::Disabled:
-			return "Disabled";
-		case PrePassMode::Enabled:
-			return "Enabled";
-		case PrePassMode::EnabledAtHalfScale:
-			return "Enabled (Half Scale)";
-		case PrePassMode::EnabledAtQuarterScale:
-			return "Enabled (Quarter Scale)";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM Utility::PrePassModeToAMFH264(Plugin::AMD::PrePassMode v) {
-	switch (v) {
-		case PrePassMode::Disabled:
-			return AMF_VIDEO_ENCODER_PREENCODE_DISABLED;
-		case PrePassMode::Enabled:
-			return AMF_VIDEO_ENCODER_PREENCODE_ENABLED;
-		case PrePassMode::EnabledAtHalfScale:
-			return (AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)2;
-		case PrePassMode::EnabledAtQuarterScale:
-			return (AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)3;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::PrePassMode Utility::PrePassModeFromAMFH264(AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM v) {
-	switch (v) {
-		case AMF_VIDEO_ENCODER_PREENCODE_DISABLED:
-			return PrePassMode::Disabled;
-		case AMF_VIDEO_ENCODER_PREENCODE_ENABLED:
-			return PrePassMode::Enabled;
-		case 2:
-			return PrePassMode::EnabledAtHalfScale;
-		case 3:
-			return PrePassMode::EnabledAtQuarterScale;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// GOP Type
-const char* Utility::GOPTypeToString(Plugin::AMD::H265::GOPType v) {
-	switch (v) {
-		case H265::GOPType::Fixed:
-			return "Fixed";
-		case H265::GOPType::Variable:
-			return "Variable";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-Plugin::AMD::H265::GOPType Utility::GOPTypeFromAMFH265(int64_t v) {
-	switch (v) {
-		case 0:
-			return H265::GOPType::Fixed;
-		case 1:
-			return H265::GOPType::Variable;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-int64_t Utility::GOPTypeToAMFH265(Plugin::AMD::H265::GOPType v) {
-	switch (v) {
-		case H265::GOPType::Fixed:
-			return 0;
-		case H265::GOPType::Variable:
-			return 1;
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-// Slicing
-const char* Utility::SliceModeToString(Plugin::AMD::H264::SliceMode v) {
-	switch (v) {
-		case H264::SliceMode::Row:
-			return "Row";
-		case H264::SliceMode::Column:
-			return "Column";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-const char* Utility::SliceControlModeToString(Plugin::AMD::SliceControlMode v) {
-	switch (v) {
-		case SliceControlMode::Unknown0:
-			return "Unknown 0";
-		case SliceControlMode::Unknown1:
-			return "Unknown 1";
-		case SliceControlMode::Unknown2:
-			return "Unknown 2";
-		case SliceControlMode::Unknown3:
-			return "Unknown 3";
-	}
-	throw std::runtime_error("Invalid Parameter");
-}
-
-Plugin::AMD::ProfileLevel Utility::H264ProfileLevel(
-	std::pair<uint32_t, uint32_t> resolution,
-	std::pair<uint32_t, uint32_t> frameRate) {
-	typedef std::pair<uint32_t, uint32_t> levelRestriction;
-	typedef std::pair<ProfileLevel, levelRestriction> level;
-
-	static const level profileLevelLimit[] = { // [Level, [Samples, Samples_Per_Sec]]
-		level(ProfileLevel::L10, levelRestriction(25344, 380160)),
-		level(ProfileLevel::L11, levelRestriction(101376, 768000)),
-		level(ProfileLevel::L12, levelRestriction(101376, 1536000)),
-		level(ProfileLevel::L13, levelRestriction(101376, 3041280)),
-		level(ProfileLevel::L20, levelRestriction(101376, 3041280)),
-		level(ProfileLevel::L21, levelRestriction(202752, 5068800)),
-		level(ProfileLevel::L22, levelRestriction(414720, 5184000)),
-		level(ProfileLevel::L30, levelRestriction(414720, 10368000)),
-		level(ProfileLevel::L31, levelRestriction(921600, 27648000)),
-		level(ProfileLevel::L32, levelRestriction(1310720, 55296000)),
-		//level(H264ProfileLevel::40, levelRestriction(2097152, 62914560)), // Technically identical to 4.1, but backwards compatible.
-		level(ProfileLevel::L41, levelRestriction(2097152, 62914560)),
-		level(ProfileLevel::L42, levelRestriction(2228224, 133693440)),
-		level(ProfileLevel::L50, levelRestriction(5652480, 150994944)),
-		level(ProfileLevel::L51, levelRestriction(9437184, 251658240)),
-		level(ProfileLevel::L52, levelRestriction(9437184, 530841600)),
-		level((ProfileLevel)-1, levelRestriction(0, 0))
-	};
-
-	uint32_t samples = resolution.first * resolution.second;
-	uint32_t samples_sec = (uint32_t)ceil((double_t)samples * ((double_t)frameRate.first / (double_t)frameRate.second));
-
-	level curLevel = profileLevelLimit[0];
-	for (uint32_t index = 0; (int32_t)curLevel.first != -1; index++) {
-		curLevel = profileLevelLimit[index];
-
-		if (samples > curLevel.second.first)
-			continue;
-
-		if (samples_sec > curLevel.second.second)
-			continue;
-
-		return curLevel.first;
-	}
-	return ProfileLevel::L52;
-}
-Plugin::AMD::ProfileLevel Utility::H265ProfileLevel(
-	std::pair<uint32_t, uint32_t> resolution,
-	std::pair<uint32_t, uint32_t> frameRate) {
-	typedef std::pair<uint32_t, uint32_t> levelRestriction; // Total, Main/Sec, High/Sec
-	typedef std::pair<ProfileLevel, levelRestriction> level;
-
-	static const level profileLevelLimit[] = { // [Level, [Samples, Samples_Per_Sec]]
-		level(ProfileLevel::L10, levelRestriction(36864,     552960)),
-		level(ProfileLevel::L20, levelRestriction(122880,    3686400)),
-		level(ProfileLevel::L21, levelRestriction(245760,    7372800)),
-		level(ProfileLevel::L30, levelRestriction(552960,   16588800)),
-		level(ProfileLevel::L31, levelRestriction(983040,   33177600)),
-		level(ProfileLevel::L40, levelRestriction(2228224,   66846720)),
-		level(ProfileLevel::L41, levelRestriction(2228224,  133693440)),
-		level(ProfileLevel::L50, levelRestriction(8912896,  267386880)),
-		level(ProfileLevel::L51, levelRestriction(8912896,  534773760)),
-		level(ProfileLevel::L52, levelRestriction(8912896, 1069547520)),
-		level(ProfileLevel::L60, levelRestriction(35651584, 1069547520)),
-		level(ProfileLevel::L61, levelRestriction(35651584, 2139095040)),
-		level(ProfileLevel::L62, levelRestriction(35651584, 4278190080)),
-		level((ProfileLevel)-1, levelRestriction(0, 0))
-	};
-
-	uint32_t samples = resolution.first * resolution.second;
-	uint32_t samples_sec = (uint32_t)ceil((double_t)samples * ((double_t)frameRate.first / (double_t)frameRate.second));
-
-	level curLevel = profileLevelLimit[0];
-	for (uint32_t index = 0; (int32_t)curLevel.first != -1; index++) {
-		curLevel = profileLevelLimit[index];
-
-		if (samples > curLevel.second.first)
-			continue;
-
-		if (samples_sec > curLevel.second.second)
-			continue;
-
-		return curLevel.first;
-	}
-	return ProfileLevel::L62;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Threading Specific
-//////////////////////////////////////////////////////////////////////////
-
-#if (defined _WIN32) || (defined _WIN64) // Windows
-#include <windows.h>
-
-const DWORD MS_VC_EXCEPTION = 0x406D1388;
-
-#pragma pack(push,8)
-typedef struct tagTHREADNAME_INFO {
-	DWORD dwType; // Must be 0x1000.
-	LPCSTR szName; // Pointer to name (in user addr space).
-	DWORD dwThreadID; // Thread ID (-1=caller thread).
-	DWORD dwFlags; // Reserved for future use, must be zero.
-} THREADNAME_INFO;
-#pragma pack(pop)
-
-void Utility::SetThreadName(uint32_t dwThreadID, const char* threadName) {
-
-	// DWORD dwThreadID = ::GetThreadId( static_cast<HANDLE>( t.native_handle() ) );
-
-	THREADNAME_INFO info;
-	info.dwType = 0x1000;
-	info.szName = threadName;
-	info.dwThreadID = dwThreadID;
-	info.dwFlags = 0;
-
-	__try {
-		RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info);
-	} __except (EXCEPTION_EXECUTE_HANDLER) {}
-}
-void Utility::SetThreadName(const char* threadName) {
-	Utility::SetThreadName(GetCurrentThreadId(), threadName);
-}
-void Utility::SetThreadName(std::thread* pthread, const char* threadName) {
-	DWORD threadId = ::GetThreadId(static_cast<HANDLE>(pthread->native_handle()));
-	Utility::SetThreadName(threadId, threadName);
-}
-
-#else // Linux, Mac
-#include <sys/prctl.h>
-
-void Utility::SetThreadName(std::thread* pthread, const char* threadName) {
-	auto handle = pthread->native_handle();
-	pthread_setname_np(handle, threadName);
-}
-void Utility::SetThreadName(const char* threadName) {
-	prctl(PR_SET_NAME, threadName, 0, 0, 0);
-}
-
-#endif

obs-studio-21.1.2.tar.xz/plugins/enc-amf/amf-test/libobs Deleted

obs-studio-21.1.2.tar.xz/plugins/enc-amf/amf-test/libobs/obs-module.c Deleted

@@ -1,33 +0,0 @@
-/*
- * A Plugin that integrates the AMD AMF encoder into OBS Studio
- * Copyright (C) 2016 - 2017 Michael Fabian Dirks
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-const char *obs_module_text(const char *name) {
-	return name;
-}
-
-void blog(int level, char* formatting, ...) {
-	level;
-	formatting;
-	return;
-}
-
-void os_set_thread_name(const char *name) {
-	name;
-	return;
-}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/amf-test/libobs/obs-module.h Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/BSUtils.cmake Deleted

@@ -1,52 +0,0 @@
-# Fix XCode includes to ignore warnings on system includes
-function(target_include_directories_system _target)
-  if(XCODE)
-    foreach(_arg ${ARGN})
-      if("${_arg}" STREQUAL "PRIVATE" OR "${_arg}" STREQUAL "PUBLIC" OR "${_arg}" STREQUAL "INTERFACE")
-        set(_scope ${_arg})
-      else()
-        target_compile_options(${_target} ${_scope} -isystem${_arg})
-      endif()
-    endforeach()
-  else()
-    target_include_directories(${_target} SYSTEM ${_scope} ${ARGN})
-  endif()
-endfunction()
-
-
-# Install bundles into obs plugin directory
-macro(install_obs_plugin_bundle target target-bundle-name)
-	if(APPLE)
-		set(_bit_suffix "")
-	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_bit_suffix "64bit/")
-	else()
-		set(_bit_suffix "32bit/")
-	endif()
-
-	set_target_properties(${target} PROPERTIES
-		PREFIX "")
-
-	install(TARGETS ${target}
-		BUNDLE DESTINATION "${OBS_PLUGIN_DESTINATION}")
-
-	add_custom_command(TARGET ${target} POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy_directory
-			"$<TARGET_FILE_DIR:${target}>/../../../${target-bundle-name}"
-			"${OBS_OUTPUT_DIR}/$<CONFIGURATION>/obs-plugins/${_bit_suffix}/${target-bundle-name}"
-		VERBATIM)
-
-	if(DEFINED ENV{obsInstallerTempDir})
-		add_custom_command(TARGET ${target} POST_BUILD
-			COMMAND "${CMAKE_COMMAND}" -E copy_directory
-				"$<TARGET_FILE_DIR:${target}>/../../../${target-bundle-name}"
-				"$ENV{obsInstallerTempDir}/${OBS_PLUGIN_DESTINATION}/${target-bundle-name}"
-			VERBATIM)
-	endif()
-
-endmacro()
-
-macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
-    set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY}
-        ${XCODE_VALUE})
-endmacro (set_xcode_property)

obs-studio-21.1.2.tar.xz/plugins/obs-browser/LICENSE Deleted

@@ -1,339 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year}  {fullname}
-
-    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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-bootstrap/main.cpp Deleted

@@ -1,34 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <include/cef_app.h>
-
-#include "browser-app.hpp"
-
-#ifdef _WIN32
-int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
-	LPSTR lpCmdLine, int nCmdShow)
-{
-	CefMainArgs mainArgs(NULL);
-#else
-int main(int argc, char *argv[])
-{
-	CefMainArgs mainArgs(argc, argv);
-#endif
-	CefRefPtr<BrowserApp> mainApp(new BrowserApp());
-	return CefExecuteProcess(mainArgs, mainApp.get(), NULL);                   
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-handle.h Deleted

@@ -1,62 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
- 
-#include <memory>
-#include <vector>
-
-#include <include/cef_browser.h>
-
-#include "cef-isolation.h"
-#include "browser-texture.hpp"
-
-class BrowserTexture;
-class BrowserHandle;
-
-typedef std::shared_ptr<BrowserHandle> SharedBrowserHandle;
-
-typedef int BrowserSurfaceHandle;
-
-class BrowserHandle {
-public:
-	BrowserHandle(int width, int height,
-			id<CEFIsolationService> cefIsolationService);
-
-public:
-	bool RenderToAvailableTexture(int width, int height, const void *data);
-public:
-	int GetWidth() const;
-	int GetHeight() const;
-
-	void Shutdown();
-
-	void SetBrowser(CefRefPtr<CefBrowser> browser);
-	CefRefPtr<CefBrowser> GetBrowser();
-
-private:
-	CefRefPtr<CefBrowser> browser;
-
-	const int width;
-	const int height;
-
-	// This should be abstracted away so that both OSX and other platforms
-	// can use this class
-	id<CEFIsolationService> cefIsolationService;
-
-	std::unique_ptr<BrowserTexture> browserTexture;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-handle.mm Deleted

@@ -1,91 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-texture.hpp"
-#include "browser-handle.h"
-
-BrowserHandle::BrowserHandle(int width, int height,
-		id<CEFIsolationService> cefIsolationService)
-: width(width), height(height),	cefIsolationService(cefIsolationService)
-{}
-
-void BrowserHandle::SetBrowser(CefRefPtr<CefBrowser> browser)
-{
-	this->browser = browser;
-}
-
-CefRefPtr<CefBrowser> BrowserHandle::GetBrowser()
-{
-	return browser;
-}
-
-void BrowserHandle::Shutdown()
-{
-	if (browser == nullptr) {
-		return;
-	}
-
-	browser->GetHost()->CloseBrowser(true);
-}
-
-int BrowserHandle::GetWidth() const
-{
-	return width;
-}
-
-int BrowserHandle::GetHeight() const
-{
-	return height;
-}
-
-bool BrowserHandle::RenderToAvailableTexture(int width, int height,
-		const void *data)
-{
-	if (browser == nullptr) {
-		return false;
-	}
-
-	bool needsOnDraw = false;
-	if (browserTexture == nullptr) {
-		int surfaceHandle = 0;
-		if ([cefIsolationService createSurface: browser->GetIdentifier()
-				width: width height: height
-				surfaceHandle: &surfaceHandle])
-		{
-			std::unique_ptr<BrowserTexture> newTexture(
-					new BrowserTexture(width, height,
-						surfaceHandle));
-
-			browserTexture = std::move(newTexture);
-
-			needsOnDraw = true;
-		}
-	}
-
-	if (browserTexture != nullptr) {
-		browserTexture->Upload(data);
-
-		if (needsOnDraw) {
-			[cefIsolationService onDraw: browser->GetIdentifier()
-					width: width height:height
-					surfaceHandle:
-						browserTexture->GetHandle()];
-		}
-	}
-
-	return true;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-obs-bridge-mac.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-obs-bridge-mac.mm Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-render-handler.hpp Deleted

@@ -1,45 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <include/cef_render_handler.h>
-
-class BrowserHandle;
-
-class BrowserRenderHandler : public CefRenderHandler
-{
-public:
-
-	BrowserRenderHandler(std::shared_ptr<BrowserHandle> &browserHandle);
-
-public: /* CefRenderHandler overrides */
-
-	virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
-			OVERRIDE;
-
-	virtual void OnPaint(CefRefPtr<CefBrowser> browser,
-			PaintElementType type, const RectList &dirtyRects,
-			const void *buffer, int width, int height) OVERRIDE;
-
-private:
-	std::shared_ptr<BrowserHandle> browserHandle;
-
-public:
-	IMPLEMENT_REFCOUNTING(BrowserRenderHandler);
-	
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-render-handler.mm Deleted

@@ -1,51 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-
-#import "cef-logging.h"
-
-#include "browser-render-handler.hpp"
-#include "browser-handle.h"
-
-BrowserRenderHandler::BrowserRenderHandler(
-		std::shared_ptr<BrowserHandle> &browserHandle)
-: browserHandle(browserHandle)
-{
-}
-
-bool BrowserRenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,
-		CefRect &rect)
-{
-	(void)(browser);
-
-	rect.Set(0, 0, browserHandle->GetWidth(), browserHandle->GetHeight());
-	return true;
-}
-
-
-
-void BrowserRenderHandler::OnPaint(
-		CefRefPtr<CefBrowser> browser, PaintElementType type,
-		const RectList &dirtyRects, const void *data, int width,
-		int height)
-{
-	(void)(browser);
-	(void)(type);
-	(void)(dirtyRects);
-
-	browserHandle->RenderToAvailableTexture(width, height, data);
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-texture-mac.h Deleted

@@ -1,37 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include "browser-texture.hpp"
-
-class BrowserTexture::Impl {
-public:
-	Impl(int width, int height, BrowserSurfaceHandle surfaceHandle);
-	~Impl();
-
-	int GetWidth() const;
-	int GetHeight() const;
-	BrowserSurfaceHandle GetHandle() const;
-	bool Upload(const void *data);
-	
-private:
-	const int width;
-	const int height;
-	const BrowserSurfaceHandle surfaceHandle;
-	IOSurfaceRef ioSurfaceRef;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/browser-texture-mac.mm Deleted

@@ -1,94 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-#import <OpenGL/OpenGL.h>
-#import <OpenGL/glu.h>
-#import <AppKit/AppKit.h>
-
-#include "cef-logging.h"
-
-#include "browser-texture-mac.h"
-
-BrowserTexture::BrowserTexture(const int width, const int height,
-		const BrowserSurfaceHandle surfaceHandle)
-: pimpl(new Impl(width, height, surfaceHandle))
-{}
-
-BrowserTexture::~BrowserTexture()
-{}
-
-int BrowserTexture::GetWidth() const
-{
-	return pimpl->GetWidth();
-}
-
-int BrowserTexture::GetHeight() const
-{
-	return pimpl->GetHeight();
-}
-
-BrowserSurfaceHandle BrowserTexture::GetHandle() const
-{
-	return pimpl->GetHandle();
-}
-
-bool BrowserTexture::Upload(const void *data)
-{
-	return pimpl->Upload(data);
-}
-
-BrowserTexture::Impl::Impl(int width, int height,
-		BrowserSurfaceHandle surfaceHandle)
-: width(width), height(height), surfaceHandle(surfaceHandle)
-{
-	ioSurfaceRef = IOSurfaceLookup(surfaceHandle);
-	IOSurfaceIncrementUseCount(ioSurfaceRef);
-}
-
-BrowserTexture::Impl::~Impl()
-{
-	IOSurfaceDecrementUseCount(ioSurfaceRef);
-	CFRelease(ioSurfaceRef);
-}
-
-int BrowserTexture::Impl::GetWidth() const
-{
-	return width;
-}
-
-int BrowserTexture::Impl::GetHeight() const
-{
-	return height;
-}
-
-BrowserSurfaceHandle BrowserTexture::Impl::GetHandle() const
-{
-	return surfaceHandle;
-}
-
-bool BrowserTexture::Impl::Upload(const void *data)
-{
-	if (ioSurfaceRef) {
-		IOSurfaceLock(ioSurfaceRef, 0, nullptr);
-		void *surfaceData = IOSurfaceGetBaseAddress(ioSurfaceRef);
-		memcpy(surfaceData, data, width * height * 4);
-		IOSurfaceUnlock(ioSurfaceRef, 0, nullptr);
-		return true;
-	}
-	return false;
-
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/cef-isolated-client.h Deleted

@@ -1,29 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <map>
-
-#import "cef-isolation.h"
-#include "browser-handle.h"
-
-@interface CEFIsolatedClient : NSObject <CEFIsolatedClient> {
-	id<CEFIsolationService> _server;
-	std::map<int, std::shared_ptr<BrowserHandle> > map;
-}
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/cef-isolated-client.mm Deleted

@@ -1,380 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import <Foundation/Foundation.h>
-
-#include <include/cef_app.h>
-#include <include/cef_browser.h>
-#include <include/cef_version.h>
-
-// shared apple
-#import "cef-isolation.h"
-#import "cef-logging.h"
-#import "browser-bridges.h"
-
-// shared
-#include "browser-task.hpp"
-#include "browser-client.hpp"
-
-#include "browser-handle.h"
-#include "browser-render-handler.hpp"
-#include "obs-browser/browser-load-handler.hpp"
-
-#import "cef-isolated-client.h"
-
-#import "browser-obs-bridge-mac.hpp"
-
-@implementation CEFIsolatedClient
-
-- (id)init
-{
-	if (self = [super init]) {
-		_server = nil;
-	}
-	return self;
-}
-
-- (oneway void)registerServer:(id<CEFIsolationService>)server
-{
-	CEFLogDebug(@"Registered server");
-	_server = server;
-}
-
-void sync_on_cef_ui(dispatch_block_t block)
-{
-	if ([NSThread isMainThread]) {
-		block();
-	} else {
-		dispatch_sync(dispatch_get_main_queue(), block);
-	}
-}
-
-- (void)update:(CefRefPtr<CefBrowser>)browser
-{
-	browser->GetHost()->WasResized();
-}
-
-- (int)createBrowser:(BrowserSettingsBridge *)browserSettings
-{
-	__block CefRefPtr<CefBrowser> browser;
-
-	__block std::shared_ptr<BrowserHandle> browserHandle(
-		new BrowserHandle(browserSettings.width,
-			browserSettings.height, _server));
-
-	BrowserOBSBridge *browserOBSBridge = new BrowserOBSBridgeMac(_server);
-
-	sync_on_cef_ui(^{
-
-		CefRefPtr<BrowserRenderHandler> browserRenderHandler =
-				new BrowserRenderHandler(browserHandle);
-				
-		CefRefPtr<BrowserLoadHandler> loadHandler =
-				new BrowserLoadHandler(std::string([browserSettings.css UTF8String]));
-
-		CefRefPtr<BrowserClient> browserClient =
-				new BrowserClient(browserRenderHandler.get(),loadHandler, browserOBSBridge);
-
-		CefWindowInfo windowInfo;
-		windowInfo.view = nullptr;
-		windowInfo.parent_view = nullptr;
-#if CHROME_VERSION_BUILD < 3071
-		windowInfo.transparent_painting_enabled = true;
-#endif
-		windowInfo.width = browserSettings.width;
-		windowInfo.height = browserSettings.height;
-		windowInfo.windowless_rendering_enabled = true;
-
-		
-		CefBrowserSettings cefBrowserSettings;
-		cefBrowserSettings.windowless_frame_rate = browserSettings.fps;
-
-		//TODO Switch to using async browser creation
-		// Less chance of freezes here taking the whole
-		// process down
-		browser = CefBrowserHost::CreateBrowserSync(windowInfo,
-				browserClient.get(),
-				[browserSettings.url UTF8String],
-				cefBrowserSettings, nil);
-	});
-
-	if (browser != nil) {
-		browserHandle->SetBrowser(browser.get());
-		map[browser->GetIdentifier()] = browserHandle;
-		return browser->GetIdentifier();
-	} else {
-		return 0;
-	}
-}
-
-- (oneway void)tickBrowser: (const int)browserIdentifier {
-	(void)browserIdentifier;
-	// Not implemented
-}
-
-typedef void(^event_block_t)(std::shared_ptr<BrowserHandle>);
-
-- (void)sendEvent:(const int)browserIdentifier
-	event:(event_block_t)event
-{
-	if (map.count(browserIdentifier) == 1) {
-		SharedBrowserHandle browserHandle =
-			map[browserIdentifier];
-		sync_on_cef_ui(^{
-			event(browserHandle);
-		});
-	}
-}
-
-- (void)sendEventToAllBrowsers:(event_block_t)event
-{
-    for (auto& x: map) {
-		SharedBrowserHandle browserHandle = x.second;
-		sync_on_cef_ui(^{
-			event(browserHandle);
-		});
-	}
-}
-
-- (void)sendMouseClick:(const int)browserIdentifier
-	event:(ObsMouseEventBridge *)event type:(const int)type
-	mouseUp:(BOOL)mouseUp clickCount:(const int)clickCount
-{
-	[self sendEvent:browserIdentifier
-		event:^(SharedBrowserHandle browserHandle)
-	{
-		CefMouseEvent mouseEvent;
-		mouseEvent.x = event.x;
-		mouseEvent.y = event.y;
-		mouseEvent.modifiers = event.modifiers;
-		CefRefPtr<CefBrowserHost> host =
-				browserHandle->GetBrowser()->GetHost();
-
-		CefBrowserHost::MouseButtonType buttonType =
-				(CefBrowserHost::MouseButtonType)type;
-
-		host->SendMouseClickEvent(mouseEvent, buttonType,
-				mouseUp, clickCount);
-	}];
-}
-
-
-- (oneway void)sendMouseMove:(const int)browserIdentifier
-	event:(ObsMouseEventBridge *)event mouseLeave:(BOOL)mouseLeave
-{
-	[self sendEvent:browserIdentifier
-		event:^(SharedBrowserHandle browserHandle)
-	{
-		CefMouseEvent mouseEvent;
-		mouseEvent.x = event.x;
-		mouseEvent.y = event.y;
-		mouseEvent.modifiers = event.modifiers;
-
-		CefRefPtr<CefBrowserHost> host =
-				browserHandle->GetBrowser()->GetHost();
-		host->SendMouseMoveEvent(mouseEvent, mouseLeave);
-	}];
-}
-
-- (void)sendMouseWheel:(const int)browserIdentifier
-	event:(ObsMouseEventBridge *)event xDelta:(int)xDelta
-	yDelta:(int)yDelta
-{
-	[self sendEvent:browserIdentifier
-		event:^(SharedBrowserHandle browserHandle)
-	 {
-		CefMouseEvent mouseEvent;
-		mouseEvent.x = event.x;
-		mouseEvent.y = event.y;
-		mouseEvent.modifiers = event.modifiers;
-
-		CefRefPtr<CefBrowserHost> host =
-				browserHandle->GetBrowser()->GetHost();
-		host->SendMouseWheelEvent(mouseEvent, xDelta, yDelta);
-	}];
-}
-
-- (oneway void)sendFocus:(const int)browserIdentifier focus:(BOOL)focus
-{
-	[self sendEvent:browserIdentifier
-		event:^(SharedBrowserHandle browserHandle)
-	{
-		CefRefPtr<CefBrowserHost> host =
-				browserHandle->GetBrowser()->GetHost();
-		host->SendFocusEvent(focus);
-		[[host->GetWindowHandle() window]
-				makeFirstResponder: host->GetWindowHandle()];
-	}];
-}
-
-enum AppleVirtualKey {
-	kVK_Return     = 0x24,
-	kVK_Command    = 0x37,
-	kVK_Shift      = 0x38,
-	kVK_Option     = 0x3A,
-	kVK_Control    = 0x3B,
-};
-
-void getUnmodifiedCharacter(ObsKeyEventBridge *event, UniChar &character)
-{
-	@autoreleasepool {
-		CGEventRef cgEvent = CGEventCreateKeyboardEvent(NULL,
-			event.nativeVirtualKey, false);
-
-		NSEvent *e = [NSEvent eventWithCGEvent: cgEvent];
-		NSString *s = [e charactersIgnoringModifiers];
-		if (s && s.length)
-			character = [s characterAtIndex: 0];
-
-		CFRelease(cgEvent);
-	}
-}
-
-- (void)sendKeyClick:(const int)browserIdentifier
-	       event:(bycopy ObsKeyEventBridge *)event keyUp:(BOOL)keyUp
-{
-	[self sendEvent:browserIdentifier
-		  event:^(SharedBrowserHandle browserHandle)
-	{
-		CefRefPtr<CefBrowserHost> host =
-			 browserHandle->GetBrowser()->GetHost();
-
-
-
-		NSEvent *nsEvent =
-			 [NSEvent keyEventWithType: keyUp ? NSKeyUp : NSKeyDown
-					  location: NSMakePoint(0,0)
-				     modifierFlags: [event nativeModifiers]
-					 timestamp: 0
-				      windowNumber: 0
-					   context: nil
-					characters: [event text]
-		       charactersIgnoringModifiers: nil
-					 isARepeat: false
-					   keyCode: event.nativeVirtualKey];
-
-
-		CefKeyEvent keyEvent;
-		keyEvent.modifiers = [event modifiers];
-
-		keyEvent.native_key_code = event.nativeVirtualKey;
-
-		if (event.text.length) {
-			keyEvent.character =
-			[event.text characterAtIndex: 0];
-
-			getUnmodifiedCharacter(event,
-					keyEvent.unmodified_character);
-		}
-
-
-		if (keyUp) {
-			keyEvent.type = KEYEVENT_KEYUP;
-			host->SendKeyEvent(keyEvent);
-		} else {
-			// Somehow return is not handled correctly
-			if ([event nativeVirtualKey] == kVK_Return) {
-				keyEvent.type = KEYEVENT_CHAR;
-				host->SendKeyEvent(keyEvent);
-				return;
-			}
-
-			host->SendKeyEvent(keyEvent);
-		}
-	 }];
-}
-
-- (void)executeVisiblityJSCallback:(const int)browserIdentifier visible:(BOOL)visible
-{
-	[self sendEvent:browserIdentifier
-		  event:^(SharedBrowserHandle browserHandle)
-	{
-		CefRefPtr<CefBrowser> browser = browserHandle->GetBrowser();
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("Visibility");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetBool(0, visible);
-		browser->SendProcessMessage(PID_RENDERER, msg);
-	}];
-}
-
-- (void)executeActiveJSCallback:(const int)browserIdentifier active:(BOOL)active
-{
-	[self sendEvent:browserIdentifier
-			event:^(SharedBrowserHandle browserHandle)
-	{
-		CefRefPtr<CefBrowser> browser = browserHandle->GetBrowser();
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("Active");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetBool(0, active);
-		browser->SendProcessMessage(PID_RENDERER, msg);
-	}];
-}
-
-- (void)executeSceneChangeJSCallback:(const char *)name
-{
-	[self sendEventToAllBrowsers:^(SharedBrowserHandle browserHandle)
-	{
-		CefRefPtr<CefBrowser> browser = browserHandle->GetBrowser();
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("SceneChange");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetString(0, name);
-		browser->SendProcessMessage(PID_RENDERER, msg);
-	}];
-}
-
-- (void)refreshPageNoCache:(const int)browserIdentifier
-{
-    [self sendEvent:browserIdentifier
-              event:^(SharedBrowserHandle browserHandle)
-     {
-         CefRefPtr<CefBrowser> browser = browserHandle->GetBrowser();
-         
-         browser->ReloadIgnoreCache();
-     }];
-}
-
--(void)dispatchJSEvent:(const char *)eventName data:(const char *)jsonString
-{
-	[self sendEventToAllBrowsers:^(SharedBrowserHandle browserHandle)
-	{
-		CefRefPtr<CefBrowser> browser = browserHandle->GetBrowser();
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("DispatchJSEvent");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetString(0, eventName);
-		args->SetString(1, jsonString);
-
-		browser->SendProcessMessage(PID_RENDERER, msg);
-	}];
-}
-
-- (void)destroyBrowser:(const int)browserIdentifier {
-	if (map.count(browserIdentifier) == 1) {
-		std::shared_ptr<BrowserHandle> browserHandle =
-				map[browserIdentifier];
-		sync_on_cef_ui(^{
-			browserHandle->Shutdown();
-		});
-		map.erase(browserIdentifier);
-	}
-}
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/main.mm Deleted

@@ -1,123 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-#include <sys/event.h>
-
-#include <include/cef_app.h>
-#include <include/cef_browser.h>
-
-#import "cef-logging.h"
-#import "cef-isolation.h"
-
-#import "cef-isolated-client.h"
-#include "browser-app.hpp"
-#include "browser-scheme.hpp"
-
-#include "objc/runtime.h"
-
-#import "service-connection-delegate.h"
-
-void processTerminatedEvent(CFFileDescriptorRef fdref,
-		CFOptionFlags callBackTypes, void* info)
-{
-	(void)callBackTypes;
-	(void)info;
-
-	CFFileDescriptorInvalidate(fdref);
-	CFRelease(fdref);
-	CEFLogError(@"Parent process died, exiting isolated CEF process.");
-	exit(EXIT_SUCCESS);
-}
-
-
-void hookParentDeath()
-{
-	int fd = kqueue();
-	struct kevent kev;
-	EV_SET(&kev, getppid(), EVFILT_PROC, EV_ADD|EV_ENABLE, NOTE_EXIT,
-		       0, NULL);
-	kevent(fd, &kev, 1, NULL, 0, NULL);
-	CFFileDescriptorRef fdref = CFFileDescriptorCreate(kCFAllocatorDefault,
-			fd, true, processTerminatedEvent, NULL);
-	CFFileDescriptorEnableCallBacks(fdref, kCFFileDescriptorReadCallBack);
-	CFRunLoopSourceRef source =
-			CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault,
-			fdref, 0);
-	CFRunLoopAddSource(CFRunLoopGetMain(), source, kCFRunLoopDefaultMode);
-	CFRelease(source);
-}
-
-int main (int argc, const char * argv[])
-{
-
-	hookParentDeath();
-
-	@autoreleasepool {
-		if (argc != 2) {
-			CEFLogError(@"Invalid arguments send to client");
-			return -1;
-		}
-
-		NSString *uniqueClientName =
-				[NSString stringWithUTF8String: argv[1]];
-
-		CEFLogDebug(@"Process created with argument: %@",
-				uniqueClientName);
-
-
-		CefMainArgs mainArgs;
-		CefSettings settings;
-		
-		settings.log_severity = LOGSEVERITY_DEFAULT;
-		settings.windowless_rendering_enabled = true;
-
-		CefRefPtr<BrowserApp> app(new BrowserApp());
-
-		CEFLogDebug(@"Initializing CEF Runtime");
-		if (CefInitialize(mainArgs, settings, app, nullptr) != 1) {
-			CEFLogError(@"Could not initialize CEF Runtime");
-		}
-
-		ServiceConnectionDelegate *delegate =
-				[[[ServiceConnectionDelegate alloc]
-					 initWithUniqueName: uniqueClientName]
-				 autorelease];
-
-
-		// Eventually move this to NSThread alloc/init so we can
-		// attach lifetime observers before it starts
-		[NSThread detachNewThreadSelector:
-				@selector(createConnectionThread)
-				toTarget: delegate withObject: nil];
-
-		CefRefPtr<BrowserSchemeHandlerFactory> factory =
-				CefRefPtr<BrowserSchemeHandlerFactory>(
-					new BrowserSchemeHandlerFactory());
-
-		CefRegisterSchemeHandlerFactory("http", "absolute", factory);
-
-		CefRunMessageLoop();
-
-		CefShutdown();
-
-		[delegate shutdown];
-	}
-
-	return 0;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/service-connection-delegate.h Deleted

@@ -1,37 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-class CEFisolationService;
-
-@interface ServiceConnectionDelegate : NSObject
-{
-	id<CEFIsolationService> _cefIsolationService;
-	NSString *uniqueClientName;
-	NSConditionLock *lock;
-	BOOL shutdown;
-	NSThread *connectionThread;
-}
-
-@property (readonly) id<CEFIsolationService> cefIsolationService;
-
-- (ServiceConnectionDelegate *)initWithUniqueName: (NSString *)name;
-- (void)createConnectionThread;
-- (void)shutdown;
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/service-connection-delegate.mm Deleted

@@ -1,124 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-#import "cef-logging.h"
-
-#import "cef-isolation.h"
-#import "cef-isolated-client.h"
-#import "service-connection-delegate.h"
-
-
-
-@implementation ServiceConnectionDelegate
-
-#define T_START 0
-#define T_FINISHED 1
-
-@synthesize cefIsolationService = _cefIsolationService;
-
-
-- (ServiceConnectionDelegate *)initWithUniqueName: (NSString *)name
-{
-	self = [super init];
-	if (self) {
-		lock = [[[NSConditionLock alloc] initWithCondition: T_START]
-				autorelease];
-		uniqueClientName = name;
-	}
-	return self;
-}
-
-- (void)createConnectionThread
-{
-	[[NSThread currentThread] setName: @"CEF Service IO Thread"];
-
-	@autoreleasepool {
-
-		CEFLogDebug(@"Connecting to host process");
-
-		[lock lockWhenCondition: T_START];
-
-		NSRunLoop *threadRunLoop = [NSRunLoop currentRunLoop];
-		connectionThread = [NSThread currentThread];
-
-		NSConnection *connection =
-		[[[NSConnection alloc] init] autorelease];
-
-
-		CEFIsolatedClient *cefIsolatedClient =
-		[[[CEFIsolatedClient alloc] init] autorelease];
-
-		while(nil == _cefIsolationService)
-		{
-			// This connection should be moved to its own thread
-			// so that calls from OBS are not delayed by
-			// CEF tasks in the message loop.
-			NSConnection *connection = [NSConnection
-					connectionWithRegisteredName:
-						uniqueClientName
-					host: nil];
-
-			[connection setRootObject: cefIsolatedClient];
-			CEFLogDebug(@"Checking for host process connection...");
-			_cefIsolationService = (id)[connection rootProxy];
-			[[NSRunLoop currentRunLoop] runUntilDate:[NSDate
-					dateWithTimeIntervalSinceNow:.1]];
-		}
-
-		CEFLogDebug(@"Connected to host process and fetched proxy service");
-		CEFLogDebug(@"Attempting to register client with service");
-		[_cefIsolationService registerClient: cefIsolatedClient];
-
-		[connection addRunLoop: threadRunLoop];
-
-		BOOL threadAlive = YES;
-		while (threadAlive) {
-			@autoreleasepool {
-				[threadRunLoop runMode:NSDefaultRunLoopMode
-						beforeDate:
-						[NSDate distantFuture]];
-				threadAlive = !shutdown;
-			}
-		}
-
-		// invalidate connection and proxy objects
-		[connection invalidate];
-	}
-
-	connectionThread = nil;
-
-	[lock unlockWithCondition: T_FINISHED];
-}
-
-// internally only called by shutdown as a means to wake up runloop
-- (void)shutdownThread
-{
-	shutdown = YES;
-}
-
-- (void)shutdown
-{
-	[self performSelector:@selector(shutdownThread)
-			onThread:connectionThread withObject:nil
-			waitUntilDone:NO];
-
-	// wait for thread to finish
-	[lock lockWhenCondition: T_FINISHED];
-	[lock unlockWithCondition: T_START];
-}
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/cef-isolation/service-connection.delegate.mm Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/fmt Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/fmt/format.cc Deleted

@@ -1,935 +0,0 @@
-/*
- Formatting library for C++
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. 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.
- */
-
-#include "format.h"
-
-#include <string.h>
-
-#include <cctype>
-#include <cerrno>
-#include <climits>
-#include <cmath>
-#include <cstdarg>
-#include <cstddef>  // for std::ptrdiff_t
-
-#if defined(_WIN32) && defined(__MINGW32__)
-# include <cstring>
-#endif
-
-#if FMT_USE_WINDOWS_H
-# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
-#  include <windows.h>
-# else
-#  define NOMINMAX
-#  include <windows.h>
-#  undef NOMINMAX
-# endif
-#endif
-
-using fmt::internal::Arg;
-
-#if FMT_EXCEPTIONS
-# define FMT_TRY try
-# define FMT_CATCH(x) catch (x)
-#else
-# define FMT_TRY if (true)
-# define FMT_CATCH(x) if (false)
-#endif
-
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable: 4127)  // conditional expression is constant
-# pragma warning(disable: 4702)  // unreachable code
-// Disable deprecation warning for strerror. The latter is not called but
-// MSVC fails to detect it.
-# pragma warning(disable: 4996)
-#endif
-
-// Dummy implementations of strerror_r and strerror_s called if corresponding
-// system functions are not available.
-static inline fmt::internal::Null<> strerror_r(int, char *, ...) {
-  return fmt::internal::Null<>();
-}
-static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...) {
-  return fmt::internal::Null<>();
-}
-
-namespace fmt {
-namespace {
-
-#ifndef _MSC_VER
-# define FMT_SNPRINTF snprintf
-#else  // _MSC_VER
-inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
-  va_end(args);
-  return result;
-}
-# define FMT_SNPRINTF fmt_snprintf
-#endif  // _MSC_VER
-
-#if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
-# define FMT_SWPRINTF snwprintf
-#else
-# define FMT_SWPRINTF swprintf
-#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
-
-// Checks if a value fits in int - used to avoid warnings about comparing
-// signed and unsigned integers.
-template <bool IsSigned>
-struct IntChecker {
-  template <typename T>
-  static bool fits_in_int(T value) {
-    unsigned max = INT_MAX;
-    return value <= max;
-  }
-  static bool fits_in_int(bool) { return true; }
-};
-
-template <>
-struct IntChecker<true> {
-  template <typename T>
-  static bool fits_in_int(T value) {
-    return value >= INT_MIN && value <= INT_MAX;
-  }
-  static bool fits_in_int(int) { return true; }
-};
-
-const char RESET_COLOR[] = "\x1b[0m";
-
-typedef void (*FormatFunc)(Writer &, int, StringRef);
-
-// Portable thread-safe version of strerror.
-// Sets buffer to point to a string describing the error code.
-// This can be either a pointer to a string stored in buffer,
-// or a pointer to some static immutable string.
-// Returns one of the following values:
-//   0      - success
-//   ERANGE - buffer is not large enough to store the error message
-//   other  - failure
-// Buffer should be at least of size 1.
-int safe_strerror(
-    int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT {
-  FMT_ASSERT(buffer != 0 && buffer_size != 0, "invalid buffer");
-
-  class StrError {
-   private:
-    int error_code_;
-    char *&buffer_;
-    std::size_t buffer_size_;
-
-    // A noop assignment operator to avoid bogus warnings.
-    void operator=(const StrError &) {}
-
-    // Handle the result of XSI-compliant version of strerror_r.
-    int handle(int result) {
-      // glibc versions before 2.13 return result in errno.
-      return result == -1 ? errno : result;
-    }
-
-    // Handle the result of GNU-specific version of strerror_r.
-    int handle(char *message) {
-      // If the buffer is full then the message is probably truncated.
-      if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
-        return ERANGE;
-      buffer_ = message;
-      return 0;
-    }
-
-    // Handle the case when strerror_r is not available.
-    int handle(internal::Null<>) {
-      return fallback(strerror_s(buffer_, buffer_size_, error_code_));
-    }
-
-    // Fallback to strerror_s when strerror_r is not available.
-    int fallback(int result) {
-      // If the buffer is full then the message is probably truncated.
-      return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
-            ERANGE : result;
-    }
-
-    // Fallback to strerror if strerror_r and strerror_s are not available.
-    int fallback(internal::Null<>) {
-      errno = 0;
-      buffer_ = strerror(error_code_);
-      return errno;
-    }
-
-   public:
-    StrError(int err_code, char *&buf, std::size_t buf_size)
-      : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {}
-
-    int run() {
-      strerror_r(0, 0, "");  // Suppress a warning about unused strerror_r.
-      return handle(strerror_r(error_code_, buffer_, buffer_size_));
-    }
-  };
-  return StrError(error_code, buffer, buffer_size).run();
-}
-
-void format_error_code(Writer &out, int error_code,
-                       StringRef message) FMT_NOEXCEPT {
-  // Report error code making sure that the output fits into
-  // INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
-  // bad_alloc.
-  out.clear();
-  static const char SEP[] = ": ";
-  static const char ERROR_STR[] = "error ";
-  // Subtract 2 to account for terminating null characters in SEP and ERROR_STR.
-  std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
-  typedef internal::IntTraits<int>::MainType MainType;
-  MainType abs_value = static_cast<MainType>(error_code);
-  if (internal::is_negative(error_code)) {
-    abs_value = 0 - abs_value;
-    ++error_code_size;
-  }
-  error_code_size += internal::count_digits(abs_value);
-  if (message.size() <= internal::INLINE_BUFFER_SIZE - error_code_size)
-    out << message << SEP;
-  out << ERROR_STR << error_code;
-  assert(out.size() <= internal::INLINE_BUFFER_SIZE);
-}
-
-void report_error(FormatFunc func, int error_code,
-                  StringRef message) FMT_NOEXCEPT {
-  MemoryWriter full_message;
-  func(full_message, error_code, message);
-  // Use Writer::data instead of Writer::c_str to avoid potential memory
-  // allocation.
-  std::fwrite(full_message.data(), full_message.size(), 1, stderr);
-  std::fputc('\n', stderr);
-}
-
-// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
-class IsZeroInt : public ArgVisitor<IsZeroInt, bool> {
- public:
-  template <typename T>
-  bool visit_any_int(T value) { return value == 0; }
-};
-
-// Checks if an argument is a valid printf width specifier and sets
-// left alignment if it is negative.
-class WidthHandler : public ArgVisitor<WidthHandler, unsigned> {
- private:
-  FormatSpec &spec_;
-
-  FMT_DISALLOW_COPY_AND_ASSIGN(WidthHandler);
-
- public:
-  explicit WidthHandler(FormatSpec &spec) : spec_(spec) {}
-
-  void report_unhandled_arg() {
-    FMT_THROW(FormatError("width is not integer"));
-  }
-
-  template <typename T>
-  unsigned visit_any_int(T value) {
-    typedef typename internal::IntTraits<T>::MainType UnsignedType;
-    UnsignedType width = static_cast<UnsignedType>(value);
-    if (internal::is_negative(value)) {
-      spec_.align_ = ALIGN_LEFT;
-      width = 0 - width;
-    }
-    if (width > INT_MAX)
-      FMT_THROW(FormatError("number is too big"));
-    return static_cast<unsigned>(width);
-  }
-};
-
-class PrecisionHandler : public ArgVisitor<PrecisionHandler, int> {
- public:
-  void report_unhandled_arg() {
-    FMT_THROW(FormatError("precision is not integer"));
-  }
-
-  template <typename T>
-  int visit_any_int(T value) {
-    if (!IntChecker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
-      FMT_THROW(FormatError("number is too big"));
-    return static_cast<int>(value);
-  }
-};
-
-template <typename T, typename U>
-struct is_same {
-  enum { value = 0 };
-};
-
-template <typename T>
-struct is_same<T, T> {
-  enum { value = 1 };
-};
-
-// An argument visitor that converts an integer argument to T for printf,
-// if T is an integral type. If T is void, the argument is converted to
-// corresponding signed or unsigned type depending on the type specifier:
-// 'd' and 'i' - signed, other - unsigned)
-template <typename T = void>
-class ArgConverter : public ArgVisitor<ArgConverter<T>, void> {
- private:
-  internal::Arg &arg_;
-  wchar_t type_;
-
-  FMT_DISALLOW_COPY_AND_ASSIGN(ArgConverter);
-
- public:
-  ArgConverter(internal::Arg &arg, wchar_t type)
-    : arg_(arg), type_(type) {}
-
-  void visit_bool(bool value) {
-    if (type_ != 's')
-      visit_any_int(value);
-  }
-
-  template <typename U>
-  void visit_any_int(U value) {
-    bool is_signed = type_ == 'd' || type_ == 'i';
-    using internal::Arg;
-    typedef typename internal::Conditional<
-        is_same<T, void>::value, U, T>::type TargetType;
-    if (sizeof(TargetType) <= sizeof(int)) {
-      // Extra casts are used to silence warnings.
-      if (is_signed) {
-        arg_.type = Arg::INT;
-        arg_.int_value = static_cast<int>(static_cast<TargetType>(value));
-      } else {
-        arg_.type = Arg::UINT;
-        typedef typename internal::MakeUnsigned<TargetType>::Type Unsigned;
-        arg_.uint_value = static_cast<unsigned>(static_cast<Unsigned>(value));
-      }
-    } else {
-      if (is_signed) {
-        arg_.type = Arg::LONG_LONG;
-        // glibc's printf doesn't sign extend arguments of smaller types:
-        //   std::printf("%lld", -42);  // prints "4294967254"
-        // but we don't have to do the same because it's a UB.
-        arg_.long_long_value = static_cast<LongLong>(value);
-      } else {
-        arg_.type = Arg::ULONG_LONG;
-        arg_.ulong_long_value =
-            static_cast<typename internal::MakeUnsigned<U>::Type>(value);
-      }
-    }
-  }
-};
-
-// Converts an integer argument to char for printf.
-class CharConverter : public ArgVisitor<CharConverter, void> {
- private:
-  internal::Arg &arg_;
-
-  FMT_DISALLOW_COPY_AND_ASSIGN(CharConverter);
-
- public:
-  explicit CharConverter(internal::Arg &arg) : arg_(arg) {}
-
-  template <typename T>
-  void visit_any_int(T value) {
-    arg_.type = internal::Arg::CHAR;
-    arg_.int_value = static_cast<char>(value);
-  }
-};
-}  // namespace
-
-namespace internal {
-
-template <typename Char>
-class PrintfArgFormatter :
-    public ArgFormatterBase<PrintfArgFormatter<Char>, Char> {
-
-  void write_null_pointer() {
-    this->spec().type_ = 0;
-    this->write("(nil)");
-  }
-
-  typedef ArgFormatterBase<PrintfArgFormatter<Char>, Char> Base;
-
- public:
-  PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
-  : ArgFormatterBase<PrintfArgFormatter<Char>, Char>(w, s) {}
-
-  void visit_bool(bool value) {
-    FormatSpec &fmt_spec = this->spec();
-    if (fmt_spec.type_ != 's')
-      return this->visit_any_int(value);
-    fmt_spec.type_ = 0;
-    this->write(value);
-  }
-
-  void visit_char(int value) {
-    const FormatSpec &fmt_spec = this->spec();
-    BasicWriter<Char> &w = this->writer();
-    if (fmt_spec.type_ && fmt_spec.type_ != 'c')
-      w.write_int(value, fmt_spec);
-    typedef typename BasicWriter<Char>::CharPtr CharPtr;
-    CharPtr out = CharPtr();
-    if (fmt_spec.width_ > 1) {
-      Char fill = ' ';
-      out = w.grow_buffer(fmt_spec.width_);
-      if (fmt_spec.align_ != ALIGN_LEFT) {
-        std::fill_n(out, fmt_spec.width_ - 1, fill);
-        out += fmt_spec.width_ - 1;
-      } else {
-        std::fill_n(out + 1, fmt_spec.width_ - 1, fill);
-      }
-    } else {
-      out = w.grow_buffer(1);
-    }
-    *out = static_cast<Char>(value);
-  }
-
-  void visit_cstring(const char *value) {
-    if (value)
-      Base::visit_cstring(value);
-    else if (this->spec().type_ == 'p')
-      write_null_pointer();
-    else
-      this->write("(null)");
-  }
-
-  void visit_pointer(const void *value) {
-    if (value)
-      return Base::visit_pointer(value);
-    this->spec().type_ = 0;
-    write_null_pointer();
-  }
-
-  void visit_custom(Arg::CustomValue c) {
-    BasicFormatter<Char> formatter(ArgList(), this->writer());
-    const Char format_str[] = {'}', 0};
-    const Char *format = format_str;
-    c.format(&formatter, c.value, &format);
-  }
-};
-}  // namespace internal
-}  // namespace fmt
-
-FMT_FUNC void fmt::SystemError::init(
-    int err_code, CStringRef format_str, ArgList args) {
-  error_code_ = err_code;
-  MemoryWriter w;
-  internal::format_system_error(w, err_code, format(format_str, args));
-  std::runtime_error &base = *this;
-  base = std::runtime_error(w.str());
-}
-
-template <typename T>
-int fmt::internal::CharTraits<char>::format_float(
-    char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, T value) {
-  if (width == 0) {
-    return precision < 0 ?
-        FMT_SNPRINTF(buffer, size, format, value) :
-        FMT_SNPRINTF(buffer, size, format, precision, value);
-  }
-  return precision < 0 ?
-      FMT_SNPRINTF(buffer, size, format, width, value) :
-      FMT_SNPRINTF(buffer, size, format, width, precision, value);
-}
-
-template <typename T>
-int fmt::internal::CharTraits<wchar_t>::format_float(
-    wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, T value) {
-  if (width == 0) {
-    return precision < 0 ?
-        FMT_SWPRINTF(buffer, size, format, value) :
-        FMT_SWPRINTF(buffer, size, format, precision, value);
-  }
-  return precision < 0 ?
-      FMT_SWPRINTF(buffer, size, format, width, value) :
-      FMT_SWPRINTF(buffer, size, format, width, precision, value);
-}
-
-template <typename T>
-const char fmt::internal::BasicData<T>::DIGITS[] =
-    "0001020304050607080910111213141516171819"
-    "2021222324252627282930313233343536373839"
-    "4041424344454647484950515253545556575859"
-    "6061626364656667686970717273747576777879"
-    "8081828384858687888990919293949596979899";
-
-#define FMT_POWERS_OF_10(factor) \
-  factor * 10, \
-  factor * 100, \
-  factor * 1000, \
-  factor * 10000, \
-  factor * 100000, \
-  factor * 1000000, \
-  factor * 10000000, \
-  factor * 100000000, \
-  factor * 1000000000
-
-template <typename T>
-const uint32_t fmt::internal::BasicData<T>::POWERS_OF_10_32[] = {
-  0, FMT_POWERS_OF_10(1)
-};
-
-template <typename T>
-const uint64_t fmt::internal::BasicData<T>::POWERS_OF_10_64[] = {
-  0,
-  FMT_POWERS_OF_10(1),
-  FMT_POWERS_OF_10(fmt::ULongLong(1000000000)),
-  // Multiply several constants instead of using a single long long constant
-  // to avoid warnings about C++98 not supporting long long.
-  fmt::ULongLong(1000000000) * fmt::ULongLong(1000000000) * 10
-};
-
-FMT_FUNC void fmt::internal::report_unknown_type(char code, const char *type) {
-  (void)type;
-  if (std::isprint(static_cast<unsigned char>(code))) {
-    FMT_THROW(fmt::FormatError(
-        fmt::format("unknown format code '{}' for {}", code, type)));
-  }
-  FMT_THROW(fmt::FormatError(
-      fmt::format("unknown format code '\\x{:02x}' for {}",
-        static_cast<unsigned>(code), type)));
-}
-
-#if FMT_USE_WINDOWS_H
-
-FMT_FUNC fmt::internal::UTF8ToUTF16::UTF8ToUTF16(fmt::StringRef s) {
-  static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
-  if (s.size() > INT_MAX)
-    FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG));
-  int s_size = static_cast<int>(s.size());
-  int length = MultiByteToWideChar(
-      CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, 0, 0);
-  if (length == 0)
-    FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
-  buffer_.resize(length + 1);
-  length = MultiByteToWideChar(
-    CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
-  if (length == 0)
-    FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
-  buffer_[length] = 0;
-}
-
-FMT_FUNC fmt::internal::UTF16ToUTF8::UTF16ToUTF8(fmt::WStringRef s) {
-  if (int error_code = convert(s)) {
-    FMT_THROW(WindowsError(error_code,
-        "cannot convert string from UTF-16 to UTF-8"));
-  }
-}
-
-FMT_FUNC int fmt::internal::UTF16ToUTF8::convert(fmt::WStringRef s) {
-  if (s.size() > INT_MAX)
-    return ERROR_INVALID_PARAMETER;
-  int s_size = static_cast<int>(s.size());
-  int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, 0, 0, 0, 0);
-  if (length == 0)
-    return GetLastError();
-  buffer_.resize(length + 1);
-  length = WideCharToMultiByte(
-    CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, 0, 0);
-  if (length == 0)
-    return GetLastError();
-  buffer_[length] = 0;
-  return 0;
-}
-
-FMT_FUNC void fmt::WindowsError::init(
-    int err_code, CStringRef format_str, ArgList args) {
-  error_code_ = err_code;
-  MemoryWriter w;
-  internal::format_windows_error(w, err_code, format(format_str, args));
-  std::runtime_error &base = *this;
-  base = std::runtime_error(w.str());
-}
-
-FMT_FUNC void fmt::internal::format_windows_error(
-    fmt::Writer &out, int error_code,
-    fmt::StringRef message) FMT_NOEXCEPT {
-  FMT_TRY {
-    MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
-    buffer.resize(INLINE_BUFFER_SIZE);
-    for (;;) {
-      wchar_t *system_message = &buffer[0];
-      int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                                  0, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                                  system_message, static_cast<uint32_t>(buffer.size()), 0);
-      if (result != 0) {
-        UTF16ToUTF8 utf8_message;
-        if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
-          out << message << ": " << utf8_message;
-          return;
-        }
-        break;
-      }
-      if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-        break;  // Can't get error message, report error code instead.
-      buffer.resize(buffer.size() * 2);
-    }
-  } FMT_CATCH(...) {}
-  fmt::format_error_code(out, error_code, message);  // 'fmt::' is for bcc32.
-}
-
-#endif  // FMT_USE_WINDOWS_H
-
-FMT_FUNC void fmt::internal::format_system_error(
-    fmt::Writer &out, int error_code,
-    fmt::StringRef message) FMT_NOEXCEPT {
-  FMT_TRY {
-    MemoryBuffer<char, INLINE_BUFFER_SIZE> buffer;
-    buffer.resize(INLINE_BUFFER_SIZE);
-    for (;;) {
-      char *system_message = &buffer[0];
-      int result = safe_strerror(error_code, system_message, buffer.size());
-      if (result == 0) {
-        out << message << ": " << system_message;
-        return;
-      }
-      if (result != ERANGE)
-        break;  // Can't get error message, report error code instead.
-      buffer.resize(buffer.size() * 2);
-    }
-  } FMT_CATCH(...) {}
-  fmt::format_error_code(out, error_code, message);  // 'fmt::' is for bcc32.
-}
-
-template <typename Char>
-void fmt::internal::ArgMap<Char>::init(const ArgList &args) {
-  if (!map_.empty())
-    return;
-  typedef internal::NamedArg<Char> NamedArg;
-  const NamedArg *named_arg = 0;
-  bool use_values =
-      args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
-  if (use_values) {
-    for (unsigned i = 0;/*nothing*/; ++i) {
-      internal::Arg::Type arg_type = args.type(i);
-      switch (arg_type) {
-      case internal::Arg::NONE:
-        return;
-      case internal::Arg::NAMED_ARG:
-        named_arg = static_cast<const NamedArg*>(args.values_[i].pointer);
-        map_.push_back(Pair(named_arg->name, *named_arg));
-        break;
-      default:
-        /*nothing*/;
-      }
-    }
-    return;
-  }
-  for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
-    internal::Arg::Type arg_type = args.type(i);
-    if (arg_type == internal::Arg::NAMED_ARG) {
-      named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
-      map_.push_back(Pair(named_arg->name, *named_arg));
-    }
-  }
-  for (unsigned i = ArgList::MAX_PACKED_ARGS;/*nothing*/; ++i) {
-    switch (args.args_[i].type) {
-    case internal::Arg::NONE:
-      return;
-    case internal::Arg::NAMED_ARG:
-      named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
-      map_.push_back(Pair(named_arg->name, *named_arg));
-      break;
-    default:
-      /*nothing*/;
-    }
-  }
-}
-
-template <typename Char>
-void fmt::internal::FixedBuffer<Char>::grow(std::size_t) {
-  FMT_THROW(std::runtime_error("buffer overflow"));
-}
-
-FMT_FUNC Arg fmt::internal::FormatterBase::do_get_arg(
-    unsigned arg_index, const char *&error) {
-  Arg arg = args_[arg_index];
-  switch (arg.type) {
-  case Arg::NONE:
-    error = "argument index out of range";
-    break;
-  case Arg::NAMED_ARG:
-    arg = *static_cast<const internal::Arg*>(arg.pointer);
-    break;
-  default:
-    /*nothing*/;
-  }
-  return arg;
-}
-
-template <typename Char>
-void fmt::internal::PrintfFormatter<Char>::parse_flags(
-    FormatSpec &spec, const Char *&s) {
-  for (;;) {
-    switch (*s++) {
-      case '-':
-        spec.align_ = ALIGN_LEFT;
-        break;
-      case '+':
-        spec.flags_ |= SIGN_FLAG | PLUS_FLAG;
-        break;
-      case '0':
-        spec.fill_ = '0';
-        break;
-      case ' ':
-        spec.flags_ |= SIGN_FLAG;
-        break;
-      case '#':
-        spec.flags_ |= HASH_FLAG;
-        break;
-      default:
-        --s;
-        return;
-    }
-  }
-}
-
-template <typename Char>
-Arg fmt::internal::PrintfFormatter<Char>::get_arg(
-    const Char *s, unsigned arg_index) {
-  (void)s;
-  const char *error = 0;
-  Arg arg = arg_index == UINT_MAX ?
-    next_arg(error) : FormatterBase::get_arg(arg_index - 1, error);
-  if (error)
-    FMT_THROW(FormatError(!*s ? "invalid format string" : error));
-  return arg;
-}
-
-template <typename Char>
-unsigned fmt::internal::PrintfFormatter<Char>::parse_header(
-  const Char *&s, FormatSpec &spec) {
-  unsigned arg_index = UINT_MAX;
-  Char c = *s;
-  if (c >= '0' && c <= '9') {
-    // Parse an argument index (if followed by '$') or a width possibly
-    // preceded with '0' flag(s).
-    unsigned value = parse_nonnegative_int(s);
-    if (*s == '$') {  // value is an argument index
-      ++s;
-      arg_index = value;
-    } else {
-      if (c == '0')
-        spec.fill_ = '0';
-      if (value != 0) {
-        // Nonzero value means that we parsed width and don't need to
-        // parse it or flags again, so return now.
-        spec.width_ = value;
-        return arg_index;
-      }
-    }
-  }
-  parse_flags(spec, s);
-  // Parse width.
-  if (*s >= '0' && *s <= '9') {
-    spec.width_ = parse_nonnegative_int(s);
-  } else if (*s == '*') {
-    ++s;
-    spec.width_ = WidthHandler(spec).visit(get_arg(s));
-  }
-  return arg_index;
-}
-
-template <typename Char>
-void fmt::internal::PrintfFormatter<Char>::format(
-    BasicWriter<Char> &writer, BasicCStringRef<Char> format_str) {
-  const Char *start = format_str.c_str();
-  const Char *s = start;
-  while (*s) {
-    Char c = *s++;
-    if (c != '%') continue;
-    if (*s == c) {
-      write(writer, start, s);
-      start = ++s;
-      continue;
-    }
-    write(writer, start, s - 1);
-
-    FormatSpec spec;
-    spec.align_ = ALIGN_RIGHT;
-
-    // Parse argument index, flags and width.
-    unsigned arg_index = parse_header(s, spec);
-
-    // Parse precision.
-    if (*s == '.') {
-      ++s;
-      if ('0' <= *s && *s <= '9') {
-        spec.precision_ = static_cast<int>(parse_nonnegative_int(s));
-      } else if (*s == '*') {
-        ++s;
-        spec.precision_ = PrecisionHandler().visit(get_arg(s));
-      }
-    }
-
-    Arg arg = get_arg(s, arg_index);
-    if (spec.flag(HASH_FLAG) && IsZeroInt().visit(arg))
-      spec.flags_ &= ~to_unsigned<int>(HASH_FLAG);
-    if (spec.fill_ == '0') {
-      if (arg.type <= Arg::LAST_NUMERIC_TYPE)
-        spec.align_ = ALIGN_NUMERIC;
-      else
-        spec.fill_ = ' ';  // Ignore '0' flag for non-numeric types.
-    }
-
-    // Parse length and convert the argument to the required type.
-    switch (*s++) {
-    case 'h':
-      if (*s == 'h')
-        ArgConverter<signed char>(arg, *++s).visit(arg);
-      else
-        ArgConverter<short>(arg, *s).visit(arg);
-      break;
-    case 'l':
-      if (*s == 'l')
-        ArgConverter<fmt::LongLong>(arg, *++s).visit(arg);
-      else
-        ArgConverter<long>(arg, *s).visit(arg);
-      break;
-    case 'j':
-      ArgConverter<intmax_t>(arg, *s).visit(arg);
-      break;
-    case 'z':
-      ArgConverter<std::size_t>(arg, *s).visit(arg);
-      break;
-    case 't':
-      ArgConverter<std::ptrdiff_t>(arg, *s).visit(arg);
-      break;
-    case 'L':
-      // printf produces garbage when 'L' is omitted for long double, no
-      // need to do the same.
-      break;
-    default:
-      --s;
-      ArgConverter<void>(arg, *s).visit(arg);
-    }
-
-    // Parse type.
-    if (!*s)
-      FMT_THROW(FormatError("invalid format string"));
-    spec.type_ = static_cast<char>(*s++);
-    if (arg.type <= Arg::LAST_INTEGER_TYPE) {
-      // Normalize type.
-      switch (spec.type_) {
-      case 'i': case 'u':
-        spec.type_ = 'd';
-        break;
-      case 'c':
-        // TODO: handle wchar_t
-        CharConverter(arg).visit(arg);
-        break;
-      }
-    }
-
-    start = s;
-
-    // Format argument.
-    internal::PrintfArgFormatter<Char>(writer, spec).visit(arg);
-  }
-  write(writer, start, s);
-}
-
-FMT_FUNC void fmt::report_system_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT {
-  // 'fmt::' is for bcc32.
-  fmt::report_error(internal::format_system_error, error_code, message);
-}
-
-#if FMT_USE_WINDOWS_H
-FMT_FUNC void fmt::report_windows_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT {
-  // 'fmt::' is for bcc32.
-  fmt::report_error(internal::format_windows_error, error_code, message);
-}
-#endif
-
-FMT_FUNC void fmt::print(std::FILE *f, CStringRef format_str, ArgList args) {
-  MemoryWriter w;
-  w.write(format_str, args);
-  std::fwrite(w.data(), 1, w.size(), f);
-}
-
-FMT_FUNC void fmt::print(CStringRef format_str, ArgList args) {
-  print(stdout, format_str, args);
-}
-
-FMT_FUNC void fmt::print_colored(Color c, CStringRef format, ArgList args) {
-  char escape[] = "\x1b[30m";
-  escape[3] = static_cast<char>('0' + c);
-  std::fputs(escape, stdout);
-  print(format, args);
-  std::fputs(RESET_COLOR, stdout);
-}
-
-FMT_FUNC int fmt::fprintf(std::FILE *f, CStringRef format, ArgList args) {
-  MemoryWriter w;
-  printf(w, format, args);
-  std::size_t size = w.size();
-  return std::fwrite(w.data(), 1, size, f) < size ? -1 : static_cast<int>(size);
-}
-
-#ifndef FMT_HEADER_ONLY
-
-template struct fmt::internal::BasicData<void>;
-
-// Explicit instantiations for char.
-
-template void fmt::internal::FixedBuffer<char>::grow(std::size_t);
-
-template void fmt::internal::ArgMap<char>::init(const fmt::ArgList &args);
-
-template void fmt::internal::PrintfFormatter<char>::format(
-  BasicWriter<char> &writer, CStringRef format);
-
-template int fmt::internal::CharTraits<char>::format_float(
-    char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, double value);
-
-template int fmt::internal::CharTraits<char>::format_float(
-    char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, long double value);
-
-// Explicit instantiations for wchar_t.
-
-template void fmt::internal::FixedBuffer<wchar_t>::grow(std::size_t);
-
-template void fmt::internal::ArgMap<wchar_t>::init(const fmt::ArgList &args);
-
-template void fmt::internal::PrintfFormatter<wchar_t>::format(
-    BasicWriter<wchar_t> &writer, WCStringRef format);
-
-template int fmt::internal::CharTraits<wchar_t>::format_float(
-    wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, double value);
-
-template int fmt::internal::CharTraits<wchar_t>::format_float(
-    wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, long double value);
-
-#endif  // FMT_HEADER_ONLY
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif

obs-studio-21.1.2.tar.xz/plugins/obs-browser/fmt/format.h Deleted

@@ -1,3832 +0,0 @@
-/*
- Formatting library for C++
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. 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 FMT_FORMAT_H_
-#define FMT_FORMAT_H_
-
-#include <cassert>
-#include <clocale>
-#include <cmath>
-#include <cstdio>
-#include <cstring>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <vector>
-#include <utility>
-
-#ifdef _SECURE_SCL
-# define FMT_SECURE_SCL _SECURE_SCL
-#else
-# define FMT_SECURE_SCL 0
-#endif
-
-#if FMT_SECURE_SCL
-# include <iterator>
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1500
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-typedef __int64          intmax_t;
-#else
-#include <stdint.h>
-#endif
-
-#if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
-# ifdef FMT_EXPORT
-#  define FMT_API __declspec(dllexport)
-# elif defined(FMT_SHARED)
-#  define FMT_API __declspec(dllimport)
-# endif
-#endif
-#ifndef FMT_API
-# define FMT_API
-#endif
-
-#ifdef __GNUC__
-# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-# define FMT_GCC_EXTENSION __extension__
-# if FMT_GCC_VERSION >= 406
-#  pragma GCC diagnostic push
-// Disable the warning about "long long" which is sometimes reported even
-// when using __extension__.
-#  pragma GCC diagnostic ignored "-Wlong-long"
-// Disable the warning about declaration shadowing because it affects too
-// many valid cases.
-#  pragma GCC diagnostic ignored "-Wshadow"
-// Disable the warning about implicit conversions that may change the sign of
-// an integer; silencing it otherwise would require many explicit casts.
-#  pragma GCC diagnostic ignored "-Wsign-conversion"
-# endif
-# if __cplusplus >= 201103L || defined __GXX_EXPERIMENTAL_CXX0X__
-#  define FMT_HAS_GXX_CXX11 1
-# endif
-#else
-# define FMT_GCC_EXTENSION
-#endif
-
-#if defined(__INTEL_COMPILER)
-# define FMT_ICC_VERSION __INTEL_COMPILER
-#elif defined(__ICL)
-# define FMT_ICC_VERSION __ICL
-#endif
-
-#if defined(__clang__) && !defined(FMT_ICC_VERSION)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdocumentation"
-#endif
-
-#ifdef __GNUC_LIBSTD__
-# define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__)
-#endif
-
-#ifdef __has_feature
-# define FMT_HAS_FEATURE(x) __has_feature(x)
-#else
-# define FMT_HAS_FEATURE(x) 0
-#endif
-
-#ifdef __has_builtin
-# define FMT_HAS_BUILTIN(x) __has_builtin(x)
-#else
-# define FMT_HAS_BUILTIN(x) 0
-#endif
-
-#ifdef __has_cpp_attribute
-# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-# define FMT_HAS_CPP_ATTRIBUTE(x) 0
-#endif
-
-#ifndef FMT_USE_VARIADIC_TEMPLATES
-// Variadic templates are available in GCC since version 4.4
-// (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++
-// since version 2013.
-# define FMT_USE_VARIADIC_TEMPLATES \
-   (FMT_HAS_FEATURE(cxx_variadic_templates) || \
-       (FMT_GCC_VERSION >= 404 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1800)
-#endif
-
-#ifndef FMT_USE_RVALUE_REFERENCES
-// Don't use rvalue references when compiling with clang and an old libstdc++
-// as the latter doesn't provide std::move.
-# if defined(FMT_GNUC_LIBSTD_VERSION) && FMT_GNUC_LIBSTD_VERSION <= 402
-#  define FMT_USE_RVALUE_REFERENCES 0
-# else
-#  define FMT_USE_RVALUE_REFERENCES \
-    (FMT_HAS_FEATURE(cxx_rvalue_references) || \
-        (FMT_GCC_VERSION >= 403 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1600)
-# endif
-#endif
-
-#if FMT_USE_RVALUE_REFERENCES
-# include <utility>  // for std::move
-#endif
-
-// Check if exceptions are disabled.
-#if defined(__GNUC__) && !defined(__EXCEPTIONS)
-# define FMT_EXCEPTIONS 0
-#endif
-#if defined(_MSC_VER) && !_HAS_EXCEPTIONS
-# define FMT_EXCEPTIONS 0
-#endif
-#ifndef FMT_EXCEPTIONS
-# define FMT_EXCEPTIONS 1
-#endif
-
-#ifndef FMT_THROW
-# if FMT_EXCEPTIONS
-#  define FMT_THROW(x) throw x
-# else
-#  define FMT_THROW(x) assert(false)
-# endif
-#endif
-
-// Define FMT_USE_NOEXCEPT to make fmt use noexcept (C++11 feature).
-#ifndef FMT_USE_NOEXCEPT
-# define FMT_USE_NOEXCEPT 0
-#endif
-
-#ifndef FMT_NOEXCEPT
-# if FMT_EXCEPTIONS
-#  if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
-    (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \
-    _MSC_VER >= 1900
-#   define FMT_NOEXCEPT noexcept
-#  else
-#   define FMT_NOEXCEPT throw()
-#  endif
-# else
-#  define FMT_NOEXCEPT
-# endif
-#endif
-
-// A macro to disallow the copy constructor and operator= functions
-// This should be used in the private: declarations for a class
-#ifndef FMT_USE_DELETED_FUNCTIONS
-# define FMT_USE_DELETED_FUNCTIONS 0
-#endif
-
-#if FMT_USE_DELETED_FUNCTIONS || FMT_HAS_FEATURE(cxx_deleted_functions) || \
-  (FMT_GCC_VERSION >= 404 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1800
-# define FMT_DELETED_OR_UNDEFINED  = delete
-# define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&) = delete; \
-    TypeName& operator=(const TypeName&) = delete
-#else
-# define FMT_DELETED_OR_UNDEFINED
-# define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&); \
-    TypeName& operator=(const TypeName&)
-#endif
-
-#ifndef FMT_USE_USER_DEFINED_LITERALS
-// All compilers which support UDLs also support variadic templates. This
-// makes the fmt::literals implementation easier. However, an explicit check
-// for variadic templates is added here just in case.
-// For Intel's compiler both it and the system gcc/msc must support UDLs.
-# define FMT_USE_USER_DEFINED_LITERALS \
-   FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES && \
-   (FMT_HAS_FEATURE(cxx_user_literals) || \
-       (FMT_GCC_VERSION >= 407 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1900) && \
-   (!defined(FMT_ICC_VERSION) || FMT_ICC_VERSION >= 1500)
-#endif
-
-#ifndef FMT_ASSERT
-# define FMT_ASSERT(condition, message) assert((condition) && message)
-#endif
-
-
-#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz)
-# define FMT_BUILTIN_CLZ(n) __builtin_clz(n)
-#endif
-
-#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll)
-# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
-#endif
-
-// Some compilers masquerade as both MSVC and GCC-likes or 
-// otherwise support __builtin_clz and __builtin_clzll, so
-// only define FMT_BUILTIN_CLZ using the MSVC intrinsics
-// if the clz and clzll builtins are not available.
-#if defined(_MSC_VER) && !defined(FMT_BUILTIN_CLZLL)
-# include <intrin.h>  // _BitScanReverse, _BitScanReverse64
-
-namespace fmt {
-namespace internal {
-# pragma intrinsic(_BitScanReverse)
-inline uint32_t clz(uint32_t x) {
-  unsigned long r = 0;
-  _BitScanReverse(&r, x);
-
-  assert(x != 0);
-  // Static analysis complains about using uninitialized data
-  // "r", but the only way that can happen is if "x" is 0, 
-  // which the callers guarantee to not happen.
-# pragma warning(suppress: 6102)
-  return 31 - r;
-}
-# define FMT_BUILTIN_CLZ(n) fmt::internal::clz(n)
-
-# ifdef _WIN64
-#  pragma intrinsic(_BitScanReverse64)
-# endif
-
-inline uint32_t clzll(uint64_t x) {
-  unsigned long r = 0;
-# ifdef _WIN64
-  _BitScanReverse64(&r, x);
-# else
-  // Scan the high 32 bits.
-  if (_BitScanReverse(&r, static_cast<uint32_t>(x >> 32)))
-    return 63 - (r + 32);
-
-  // Scan the low 32 bits.
-  _BitScanReverse(&r, static_cast<uint32_t>(x));
-# endif
-
-  assert(x != 0);
-  // Static analysis complains about using uninitialized data
-  // "r", but the only way that can happen is if "x" is 0, 
-  // which the callers guarantee to not happen.
-# pragma warning(suppress: 6102)
-  return 63 - r;
-}
-# define FMT_BUILTIN_CLZLL(n) fmt::internal::clzll(n)
-}
-}
-#endif
-
-namespace fmt {
-namespace internal {
-struct DummyInt {
-  int data[2];
-  operator int() const { return 0; }
-};
-typedef std::numeric_limits<fmt::internal::DummyInt> FPUtil;
-
-// Dummy implementations of system functions such as signbit and ecvt called
-// if the latter are not available.
-inline DummyInt signbit(...) { return DummyInt(); }
-inline DummyInt _ecvt_s(...) { return DummyInt(); }
-inline DummyInt isinf(...) { return DummyInt(); }
-inline DummyInt _finite(...) { return DummyInt(); }
-inline DummyInt isnan(...) { return DummyInt(); }
-inline DummyInt _isnan(...) { return DummyInt(); }
-
-// A helper function to suppress bogus "conditional expression is constant"
-// warnings.
-template <typename T>
-inline T check(T value) { return value; }
-}
-}  // namespace fmt
-
-namespace std {
-// Standard permits specialization of std::numeric_limits. This specialization
-// is used to resolve ambiguity between isinf and std::isinf in glibc:
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891
-// and the same for isnan and signbit.
-template <>
-class numeric_limits<fmt::internal::DummyInt> :
-    public std::numeric_limits<int> {
- public:
-  // Portable version of isinf.
-  template <typename T>
-  static bool isinfinity(T x) {
-    using namespace fmt::internal;
-    // The resolution "priority" is:
-    // isinf macro > std::isinf > ::isinf > fmt::internal::isinf
-    if (check(sizeof(isinf(x)) == sizeof(bool) ||
-              sizeof(isinf(x)) == sizeof(int))) {
-      return isinf(x) != 0;
-    }
-    return !_finite(static_cast<double>(x));
-  }
-
-  // Portable version of isnan.
-  template <typename T>
-  static bool isnotanumber(T x) {
-    using namespace fmt::internal;
-    if (check(sizeof(isnan(x)) == sizeof(bool) ||
-              sizeof(isnan(x)) == sizeof(int))) {
-      return isnan(x) != 0;
-    }
-    return _isnan(static_cast<double>(x)) != 0;
-  }
-
-  // Portable version of signbit.
-  static bool isnegative(double x) {
-    using namespace fmt::internal;
-    if (check(sizeof(signbit(x)) == sizeof(int)))
-      return signbit(x) != 0;
-    if (x < 0) return true;
-    if (!isnotanumber(x)) return false;
-    int dec = 0, sign = 0;
-    char buffer[2];  // The buffer size must be >= 2 or _ecvt_s will fail.
-    _ecvt_s(buffer, sizeof(buffer), x, 0, &dec, &sign);
-    return sign != 0;
-  }
-};
-}  // namespace std
-
-namespace fmt {
-
-// Fix the warning about long long on older versions of GCC
-// that don't support the diagnostic pragma.
-FMT_GCC_EXTENSION typedef long long LongLong;
-FMT_GCC_EXTENSION typedef unsigned long long ULongLong;
-
-#if FMT_USE_RVALUE_REFERENCES
-using std::move;
-#endif
-
-template <typename Char>
-class BasicWriter;
-
-typedef BasicWriter<char> Writer;
-typedef BasicWriter<wchar_t> WWriter;
-
-template <typename Char>
-class ArgFormatter;
-
-template <typename CharType,
-          typename ArgFormatter = fmt::ArgFormatter<CharType> >
-class BasicFormatter;
-
-/**
-  \rst
-  A string reference. It can be constructed from a C string or ``std::string``.
-
-  You can use one of the following typedefs for common character types:
-
-  +------------+-------------------------+
-  | Type       | Definition              |
-  +============+=========================+
-  | StringRef  | BasicStringRef<char>    |
-  +------------+-------------------------+
-  | WStringRef | BasicStringRef<wchar_t> |
-  +------------+-------------------------+
-
-  This class is most useful as a parameter type to allow passing
-  different types of strings to a function, for example::
-
-    template <typename... Args>
-    std::string format(StringRef format_str, const Args & ... args);
-
-    format("{}", 42);
-    format(std::string("{}"), 42);
-  \endrst
- */
-template <typename Char>
-class BasicStringRef {
- private:
-  const Char *data_;
-  std::size_t size_;
-
- public:
-  /** Constructs a string reference object from a C string and a size. */
-  BasicStringRef(const Char *s, std::size_t size) : data_(s), size_(size) {}
-
-  /**
-    \rst
-    Constructs a string reference object from a C string computing
-    the size with ``std::char_traits<Char>::length``.
-    \endrst
-   */
-  BasicStringRef(const Char *s)
-    : data_(s), size_(std::char_traits<Char>::length(s)) {}
-
-  /**
-    \rst
-    Constructs a string reference from an ``std::string`` object.
-    \endrst
-   */
-  BasicStringRef(const std::basic_string<Char> &s)
-  : data_(s.c_str()), size_(s.size()) {}
-
-  /**
-    \rst
-    Converts a string reference to an ``std::string`` object.
-    \endrst
-   */
-  std::basic_string<Char> to_string() const {
-    return std::basic_string<Char>(data_, size_);
-  }
-
-  /** Returns a pointer to the string data. */
-  const Char *data() const { return data_; }
-
-  /** Returns the string size. */
-  std::size_t size() const { return size_; }
-
-  // Lexicographically compare this string reference to other.
-  int compare(BasicStringRef other) const {
-    std::size_t size = size_ < other.size_ ? size_ : other.size_;
-    int result = std::char_traits<Char>::compare(data_, other.data_, size);
-    if (result == 0)
-      result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1);
-    return result;
-  }
-
-  friend bool operator==(BasicStringRef lhs, BasicStringRef rhs) {
-    return lhs.compare(rhs) == 0;
-  }
-  friend bool operator!=(BasicStringRef lhs, BasicStringRef rhs) {
-    return lhs.compare(rhs) != 0;
-  }
-  friend bool operator<(BasicStringRef lhs, BasicStringRef rhs) {
-    return lhs.compare(rhs) < 0;
-  }
-  friend bool operator<=(BasicStringRef lhs, BasicStringRef rhs) {
-    return lhs.compare(rhs) <= 0;
-  }
-  friend bool operator>(BasicStringRef lhs, BasicStringRef rhs) {
-    return lhs.compare(rhs) > 0;
-  }
-  friend bool operator>=(BasicStringRef lhs, BasicStringRef rhs) {
-    return lhs.compare(rhs) >= 0;
-  }
-};
-
-typedef BasicStringRef<char> StringRef;
-typedef BasicStringRef<wchar_t> WStringRef;
-
-/**
-  \rst
-  A reference to a null terminated string. It can be constructed from a C
-  string or ``std::string``.
-
-  You can use one of the following typedefs for common character types:
-
-  +-------------+--------------------------+
-  | Type        | Definition               |
-  +=============+==========================+
-  | CStringRef  | BasicCStringRef<char>    |
-  +-------------+--------------------------+
-  | WCStringRef | BasicCStringRef<wchar_t> |
-  +-------------+--------------------------+
-
-  This class is most useful as a parameter type to allow passing
-  different types of strings to a function, for example::
-
-    template <typename... Args>
-    std::string format(CStringRef format_str, const Args & ... args);
-
-    format("{}", 42);
-    format(std::string("{}"), 42);
-  \endrst
- */
-template <typename Char>
-class BasicCStringRef {
- private:
-  const Char *data_;
-
- public:
-  /** Constructs a string reference object from a C string. */
-  BasicCStringRef(const Char *s) : data_(s) {}
-
-  /**
-    \rst
-    Constructs a string reference from an ``std::string`` object.
-    \endrst
-   */
-  BasicCStringRef(const std::basic_string<Char> &s) : data_(s.c_str()) {}
-
-  /** Returns the pointer to a C string. */
-  const Char *c_str() const { return data_; }
-};
-
-typedef BasicCStringRef<char> CStringRef;
-typedef BasicCStringRef<wchar_t> WCStringRef;
-
-/**
-  A formatting error such as invalid format string.
-*/
-class FormatError : public std::runtime_error {
- public:
-  explicit FormatError(CStringRef message)
-  : std::runtime_error(message.c_str()) {}
-};
-
-namespace internal {
-
-// MakeUnsigned<T>::Type gives an unsigned type corresponding to integer type T.
-template <typename T>
-struct MakeUnsigned { typedef T Type; };
-
-#define FMT_SPECIALIZE_MAKE_UNSIGNED(T, U) \
-  template <> \
-  struct MakeUnsigned<T> { typedef U Type; }
-
-FMT_SPECIALIZE_MAKE_UNSIGNED(char, unsigned char);
-FMT_SPECIALIZE_MAKE_UNSIGNED(signed char, unsigned char);
-FMT_SPECIALIZE_MAKE_UNSIGNED(short, unsigned short);
-FMT_SPECIALIZE_MAKE_UNSIGNED(int, unsigned);
-FMT_SPECIALIZE_MAKE_UNSIGNED(long, unsigned long);
-FMT_SPECIALIZE_MAKE_UNSIGNED(LongLong, ULongLong);
-
-// Casts nonnegative integer to unsigned.
-template <typename Int>
-inline typename MakeUnsigned<Int>::Type to_unsigned(Int value) {
-  FMT_ASSERT(value >= 0, "negative value");
-  return static_cast<typename MakeUnsigned<Int>::Type>(value);
-}
-
-// The number of characters to store in the MemoryBuffer object itself
-// to avoid dynamic memory allocation.
-enum { INLINE_BUFFER_SIZE = 500 };
-
-#if FMT_SECURE_SCL
-// Use checked iterator to avoid warnings on MSVC.
-template <typename T>
-inline stdext::checked_array_iterator<T*> make_ptr(T *ptr, std::size_t size) {
-  return stdext::checked_array_iterator<T*>(ptr, size);
-}
-#else
-template <typename T>
-inline T *make_ptr(T *ptr, std::size_t) { return ptr; }
-#endif
-}  // namespace internal
-
-/**
-  \rst
-  A buffer supporting a subset of ``std::vector``'s operations.
-  \endrst
- */
-template <typename T>
-class Buffer {
- private:
-  FMT_DISALLOW_COPY_AND_ASSIGN(Buffer);
-
- protected:
-  T *ptr_;
-  std::size_t size_;
-  std::size_t capacity_;
-
-  Buffer(T *ptr = 0, std::size_t capacity = 0)
-    : ptr_(ptr), size_(0), capacity_(capacity) {}
-
-  /**
-    \rst
-    Increases the buffer capacity to hold at least *size* elements updating
-    ``ptr_`` and ``capacity_``.
-    \endrst
-   */
-  virtual void grow(std::size_t size) = 0;
-
- public:
-  virtual ~Buffer() {}
-
-  /** Returns the size of this buffer. */
-  std::size_t size() const { return size_; }
-
-  /** Returns the capacity of this buffer. */
-  std::size_t capacity() const { return capacity_; }
-
-  /**
-    Resizes the buffer. If T is a POD type new elements may not be initialized.
-   */
-  void resize(std::size_t new_size) {
-    if (new_size > capacity_)
-      grow(new_size);
-    size_ = new_size;
-  }
-
-  /**
-    \rst
-    Reserves space to store at least *capacity* elements.
-    \endrst
-   */
-  void reserve(std::size_t capacity) {
-    if (capacity > capacity_)
-      grow(capacity);
-  }
-
-  void clear() FMT_NOEXCEPT { size_ = 0; }
-
-  void push_back(const T &value) {
-    if (size_ == capacity_)
-      grow(size_ + 1);
-    ptr_[size_++] = value;
-  }
-
-  /** Appends data to the end of the buffer. */
-  template <typename U>
-  void append(const U *begin, const U *end);
-
-  T &operator[](std::size_t index) { return ptr_[index]; }
-  const T &operator[](std::size_t index) const { return ptr_[index]; }
-};
-
-template <typename T>
-template <typename U>
-void Buffer<T>::append(const U *begin, const U *end) {
-  std::size_t new_size = size_ + internal::to_unsigned(end - begin);
-  if (new_size > capacity_)
-    grow(new_size);
-  std::uninitialized_copy(begin, end,
-                          internal::make_ptr(ptr_, capacity_) + size_);
-  size_ = new_size;
-}
-
-namespace internal {
-
-// A memory buffer for trivially copyable/constructible types with the first SIZE
-// elements stored in the object itself.
-template <typename T, std::size_t SIZE, typename Allocator = std::allocator<T> >
-class MemoryBuffer : private Allocator, public Buffer<T> {
- private:
-  T data_[SIZE];
-
-  // Deallocate memory allocated by the buffer.
-  void deallocate() {
-    if (this->ptr_ != data_) Allocator::deallocate(this->ptr_, this->capacity_);
-  }
-
- protected:
-  void grow(std::size_t size);
-
- public:
-  explicit MemoryBuffer(const Allocator &alloc = Allocator())
-      : Allocator(alloc), Buffer<T>(data_, SIZE) {}
-  ~MemoryBuffer() { deallocate(); }
-
-#if FMT_USE_RVALUE_REFERENCES
- private:
-  // Move data from other to this buffer.
-  void move(MemoryBuffer &other) {
-    Allocator &this_alloc = *this, &other_alloc = other;
-    this_alloc = std::move(other_alloc);
-    this->size_ = other.size_;
-    this->capacity_ = other.capacity_;
-    if (other.ptr_ == other.data_) {
-      this->ptr_ = data_;
-      std::uninitialized_copy(other.data_, other.data_ + this->size_,
-                              make_ptr(data_, this->capacity_));
-    } else {
-      this->ptr_ = other.ptr_;
-      // Set pointer to the inline array so that delete is not called
-      // when deallocating.
-      other.ptr_ = other.data_;
-    }
-  }
-
- public:
-  MemoryBuffer(MemoryBuffer &&other) {
-    move(other);
-  }
-
-  MemoryBuffer &operator=(MemoryBuffer &&other) {
-    assert(this != &other);
-    deallocate();
-    move(other);
-    return *this;
-  }
-#endif
-
-  // Returns a copy of the allocator associated with this buffer.
-  Allocator get_allocator() const { return *this; }
-};
-
-template <typename T, std::size_t SIZE, typename Allocator>
-void MemoryBuffer<T, SIZE, Allocator>::grow(std::size_t size) {
-  std::size_t new_capacity = this->capacity_ + this->capacity_ / 2;
-  if (size > new_capacity)
-      new_capacity = size;
-  T *new_ptr = this->allocate(new_capacity);
-  // The following code doesn't throw, so the raw pointer above doesn't leak.
-  std::uninitialized_copy(this->ptr_, this->ptr_ + this->size_,
-                          make_ptr(new_ptr, new_capacity));
-  std::size_t old_capacity = this->capacity_;
-  T *old_ptr = this->ptr_;
-  this->capacity_ = new_capacity;
-  this->ptr_ = new_ptr;
-  // deallocate may throw (at least in principle), but it doesn't matter since
-  // the buffer already uses the new storage and will deallocate it in case
-  // of exception.
-  if (old_ptr != data_)
-    Allocator::deallocate(old_ptr, old_capacity);
-}
-
-// A fixed-size buffer.
-template <typename Char>
-class FixedBuffer : public fmt::Buffer<Char> {
- public:
-  FixedBuffer(Char *array, std::size_t size) : fmt::Buffer<Char>(array, size) {}
-
- protected:
-  FMT_API void grow(std::size_t size);
-};
-
-template <typename Char>
-class BasicCharTraits {
- public:
-#if FMT_SECURE_SCL
-  typedef stdext::checked_array_iterator<Char*> CharPtr;
-#else
-  typedef Char *CharPtr;
-#endif
-  static Char cast(int value) { return static_cast<Char>(value); }
-};
-
-template <typename Char>
-class CharTraits;
-
-template <>
-class CharTraits<char> : public BasicCharTraits<char> {
- private:
-  // Conversion from wchar_t to char is not allowed.
-  static char convert(wchar_t);
-
- public:
-  static char convert(char value) { return value; }
-
-  // Formats a floating-point number.
-  template <typename T>
-  FMT_API static int format_float(char *buffer, std::size_t size,
-      const char *format, unsigned width, int precision, T value);
-};
-
-template <>
-class CharTraits<wchar_t> : public BasicCharTraits<wchar_t> {
- public:
-  static wchar_t convert(char value) { return value; }
-  static wchar_t convert(wchar_t value) { return value; }
-
-  template <typename T>
-  FMT_API static int format_float(wchar_t *buffer, std::size_t size,
-      const wchar_t *format, unsigned width, int precision, T value);
-};
-
-// Checks if a number is negative - used to avoid warnings.
-template <bool IsSigned>
-struct SignChecker {
-  template <typename T>
-  static bool is_negative(T value) { return value < 0; }
-};
-
-template <>
-struct SignChecker<false> {
-  template <typename T>
-  static bool is_negative(T) { return false; }
-};
-
-// Returns true if value is negative, false otherwise.
-// Same as (value < 0) but doesn't produce warnings if T is an unsigned type.
-template <typename T>
-inline bool is_negative(T value) {
-  return SignChecker<std::numeric_limits<T>::is_signed>::is_negative(value);
-}
-
-// Selects uint32_t if FitsIn32Bits is true, uint64_t otherwise.
-template <bool FitsIn32Bits>
-struct TypeSelector { typedef uint32_t Type; };
-
-template <>
-struct TypeSelector<false> { typedef uint64_t Type; };
-
-template <typename T>
-struct IntTraits {
-  // Smallest of uint32_t and uint64_t that is large enough to represent
-  // all values of T.
-  typedef typename
-    TypeSelector<std::numeric_limits<T>::digits <= 32>::Type MainType;
-};
-
-FMT_API void report_unknown_type(char code, const char *type);
-
-// Static data is placed in this class template to allow header-only
-// configuration.
-template <typename T = void>
-struct FMT_API BasicData {
-  static const uint32_t POWERS_OF_10_32[];
-  static const uint64_t POWERS_OF_10_64[];
-  static const char DIGITS[];
-};
-
-typedef BasicData<> Data;
-
-#ifdef FMT_BUILTIN_CLZLL
-// Returns the number of decimal digits in n. Leading zeros are not counted
-// except for n == 0 in which case count_digits returns 1.
-inline unsigned count_digits(uint64_t n) {
-  // Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10
-  // and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits.
-  int t = (64 - FMT_BUILTIN_CLZLL(n | 1)) * 1233 >> 12;
-  return to_unsigned(t) - (n < Data::POWERS_OF_10_64[t]) + 1;
-}
-#else
-// Fallback version of count_digits used when __builtin_clz is not available.
-inline unsigned count_digits(uint64_t n) {
-  unsigned count = 1;
-  for (;;) {
-    // Integer division is slow so do it for a group of four digits instead
-    // of for every digit. The idea comes from the talk by Alexandrescu
-    // "Three Optimization Tips for C++". See speed-test for a comparison.
-    if (n < 10) return count;
-    if (n < 100) return count + 1;
-    if (n < 1000) return count + 2;
-    if (n < 10000) return count + 3;
-    n /= 10000u;
-    count += 4;
-  }
-}
-#endif
-
-#ifdef FMT_BUILTIN_CLZ
-// Optional version of count_digits for better performance on 32-bit platforms.
-inline unsigned count_digits(uint32_t n) {
-  int t = (32 - FMT_BUILTIN_CLZ(n | 1)) * 1233 >> 12;
-  return to_unsigned(t) - (n < Data::POWERS_OF_10_32[t]) + 1;
-}
-#endif
-
-// A functor that doesn't add a thousands separator.
-struct NoThousandsSep {
-  template <typename Char>
-  void operator()(Char *) {}
-};
-
-// A functor that adds a thousands separator.
-class ThousandsSep {
- private:
-  fmt::StringRef sep_;
-
-  // Index of a decimal digit with the least significant digit having index 0.
-  unsigned digit_index_;
-
- public:
-  explicit ThousandsSep(fmt::StringRef sep) : sep_(sep), digit_index_(0) {}
-
-  template <typename Char>
-  void operator()(Char *&buffer) {
-    if (++digit_index_ % 3 != 0)
-      return;
-    buffer -= sep_.size();
-    std::uninitialized_copy(sep_.data(), sep_.data() + sep_.size(),
-                            internal::make_ptr(buffer, sep_.size()));
-  }
-};
-
-// Formats a decimal unsigned integer value writing into buffer.
-// thousands_sep is a functor that is called after writing each char to
-// add a thousands separator if necessary.
-template <typename UInt, typename Char, typename ThousandsSep>
-inline void format_decimal(Char *buffer, UInt value, unsigned num_digits,
-                           ThousandsSep thousands_sep) {
-  buffer += num_digits;
-  while (value >= 100) {
-    // Integer division is slow so do it for a group of two digits instead
-    // of for every digit. The idea comes from the talk by Alexandrescu
-    // "Three Optimization Tips for C++". See speed-test for a comparison.
-    unsigned index = static_cast<unsigned>((value % 100) * 2);
-    value /= 100;
-    *--buffer = Data::DIGITS[index + 1];
-    thousands_sep(buffer);
-    *--buffer = Data::DIGITS[index];
-    thousands_sep(buffer);
-  }
-  if (value < 10) {
-    *--buffer = static_cast<char>('0' + value);
-    return;
-  }
-  unsigned index = static_cast<unsigned>(value * 2);
-  *--buffer = Data::DIGITS[index + 1];
-  *--buffer = Data::DIGITS[index];
-}
-
-template <typename UInt, typename Char>
-inline void format_decimal(Char *buffer, UInt value, unsigned num_digits) {
-  return format_decimal(buffer, value, num_digits, NoThousandsSep());
-}
-
-#ifndef _WIN32
-# define FMT_USE_WINDOWS_H 0
-#elif !defined(FMT_USE_WINDOWS_H)
-# define FMT_USE_WINDOWS_H 1
-#endif
-
-// Define FMT_USE_WINDOWS_H to 0 to disable use of windows.h.
-// All the functionality that relies on it will be disabled too.
-#if FMT_USE_WINDOWS_H
-// A converter from UTF-8 to UTF-16.
-// It is only provided for Windows since other systems support UTF-8 natively.
-class UTF8ToUTF16 {
- private:
-  MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer_;
-
- public:
-  FMT_API explicit UTF8ToUTF16(StringRef s);
-  operator WStringRef() const { return WStringRef(&buffer_[0], size()); }
-  size_t size() const { return buffer_.size() - 1; }
-  const wchar_t *c_str() const { return &buffer_[0]; }
-  std::wstring str() const { return std::wstring(&buffer_[0], size()); }
-};
-
-// A converter from UTF-16 to UTF-8.
-// It is only provided for Windows since other systems support UTF-8 natively.
-class UTF16ToUTF8 {
- private:
-  MemoryBuffer<char, INLINE_BUFFER_SIZE> buffer_;
-
- public:
-  UTF16ToUTF8() {}
-  FMT_API explicit UTF16ToUTF8(WStringRef s);
-  operator StringRef() const { return StringRef(&buffer_[0], size()); }
-  size_t size() const { return buffer_.size() - 1; }
-  const char *c_str() const { return &buffer_[0]; }
-  std::string str() const { return std::string(&buffer_[0], size()); }
-
-  // Performs conversion returning a system error code instead of
-  // throwing exception on conversion error. This method may still throw
-  // in case of memory allocation error.
-  FMT_API int convert(WStringRef s);
-};
-
-FMT_API void format_windows_error(fmt::Writer &out, int error_code,
-                                  fmt::StringRef message) FMT_NOEXCEPT;
-#endif
-
-FMT_API void format_system_error(fmt::Writer &out, int error_code,
-                                 fmt::StringRef message) FMT_NOEXCEPT;
-
-// A formatting argument value.
-struct Value {
-  template <typename Char>
-  struct StringValue {
-    const Char *value;
-    std::size_t size;
-  };
-
-  typedef void (*FormatFunc)(
-      void *formatter, const void *arg, void *format_str_ptr);
-
-  struct CustomValue {
-    const void *value;
-    FormatFunc format;
-  };
-
-  union {
-    int int_value;
-    unsigned uint_value;
-    LongLong long_long_value;
-    ULongLong ulong_long_value;
-    double double_value;
-    long double long_double_value;
-    const void *pointer;
-    StringValue<char> string;
-    StringValue<signed char> sstring;
-    StringValue<unsigned char> ustring;
-    StringValue<wchar_t> wstring;
-    CustomValue custom;
-  };
-
-  enum Type {
-    NONE, NAMED_ARG,
-    // Integer types should go first,
-    INT, UINT, LONG_LONG, ULONG_LONG, BOOL, CHAR, LAST_INTEGER_TYPE = CHAR,
-    // followed by floating-point types.
-    DOUBLE, LONG_DOUBLE, LAST_NUMERIC_TYPE = LONG_DOUBLE,
-    CSTRING, STRING, WSTRING, POINTER, CUSTOM
-  };
-};
-
-// A formatting argument. It is a trivially copyable/constructible type to
-// allow storage in internal::MemoryBuffer.
-struct Arg : Value {
-  Type type;
-};
-
-template <typename Char>
-struct NamedArg;
-
-template <typename T = void>
-struct Null {};
-
-// A helper class template to enable or disable overloads taking wide
-// characters and strings in MakeValue.
-template <typename T, typename Char>
-struct WCharHelper {
-  typedef Null<T> Supported;
-  typedef T Unsupported;
-};
-
-template <typename T>
-struct WCharHelper<T, wchar_t> {
-  typedef T Supported;
-  typedef Null<T> Unsupported;
-};
-
-typedef char Yes[1];
-typedef char No[2];
-
-template <typename T>
-T &get();
-
-// These are non-members to workaround an overload resolution bug in bcc32.
-Yes &convert(fmt::ULongLong);
-No &convert(...);
-
-template<typename T, bool ENABLE_CONVERSION>
-struct ConvertToIntImpl {
-  enum { value = ENABLE_CONVERSION };
-};
-
-template<typename T, bool ENABLE_CONVERSION>
-struct ConvertToIntImpl2 {
-  enum { value = false };
-};
-
-template<typename T>
-struct ConvertToIntImpl2<T, true> {
-  enum {
-    // Don't convert numeric types.
-    value = ConvertToIntImpl<T, !std::numeric_limits<T>::is_specialized>::value
-  };
-};
-
-template<typename T>
-struct ConvertToInt {
-  enum { enable_conversion = sizeof(convert(get<T>())) == sizeof(Yes) };
-  enum { value = ConvertToIntImpl2<T, enable_conversion>::value };
-};
-
-#define FMT_DISABLE_CONVERSION_TO_INT(Type) \
-  template <> \
-  struct ConvertToInt<Type> {  enum { value = 0 }; }
-
-// Silence warnings about convering float to int.
-FMT_DISABLE_CONVERSION_TO_INT(float);
-FMT_DISABLE_CONVERSION_TO_INT(double);
-FMT_DISABLE_CONVERSION_TO_INT(long double);
-
-template<bool B, class T = void>
-struct EnableIf {};
-
-template<class T>
-struct EnableIf<true, T> { typedef T type; };
-
-template<bool B, class T, class F>
-struct Conditional { typedef T type; };
-
-template<class T, class F>
-struct Conditional<false, T, F> { typedef F type; };
-
-// For bcc32 which doesn't understand ! in template arguments.
-template<bool>
-struct Not { enum { value = 0 }; };
-
-template<>
-struct Not<false> { enum { value = 1 }; };
-
-// Makes an Arg object from any type.
-template <typename Formatter>
-class MakeValue : public Arg {
- public:
-  typedef typename Formatter::Char Char;
-
- private:
-  // The following two methods are private to disallow formatting of
-  // arbitrary pointers. If you want to output a pointer cast it to
-  // "void *" or "const void *". In particular, this forbids formatting
-  // of "[const] volatile char *" which is printed as bool by iostreams.
-  // Do not implement!
-  template <typename T>
-  MakeValue(const T *value);
-  template <typename T>
-  MakeValue(T *value);
-
-  // The following methods are private to disallow formatting of wide
-  // characters and strings into narrow strings as in
-  //   fmt::format("{}", L"test");
-  // To fix this, use a wide format string: fmt::format(L"{}", L"test").
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-  MakeValue(typename WCharHelper<wchar_t, Char>::Unsupported);
-#endif
-  MakeValue(typename WCharHelper<wchar_t *, Char>::Unsupported);
-  MakeValue(typename WCharHelper<const wchar_t *, Char>::Unsupported);
-  MakeValue(typename WCharHelper<const std::wstring &, Char>::Unsupported);
-  MakeValue(typename WCharHelper<WStringRef, Char>::Unsupported);
-
-  void set_string(StringRef str) {
-    string.value = str.data();
-    string.size = str.size();
-  }
-
-  void set_string(WStringRef str) {
-    wstring.value = str.data();
-    wstring.size = str.size();
-  }
-
-  // Formats an argument of a custom type, such as a user-defined class.
-  template <typename T>
-  static void format_custom_arg(
-      void *formatter, const void *arg, void *format_str_ptr) {
-    format(*static_cast<Formatter*>(formatter),
-           *static_cast<const Char**>(format_str_ptr),
-           *static_cast<const T*>(arg));
-  }
-
- public:
-  MakeValue() {}
-
-#define FMT_MAKE_VALUE_(Type, field, TYPE, rhs) \
-  MakeValue(Type value) { field = rhs; } \
-  static uint64_t type(Type) { return Arg::TYPE; }
-
-#define FMT_MAKE_VALUE(Type, field, TYPE) \
-  FMT_MAKE_VALUE_(Type, field, TYPE, value)
-
-  FMT_MAKE_VALUE(bool, int_value, BOOL)
-  FMT_MAKE_VALUE(short, int_value, INT)
-  FMT_MAKE_VALUE(unsigned short, uint_value, UINT)
-  FMT_MAKE_VALUE(int, int_value, INT)
-  FMT_MAKE_VALUE(unsigned, uint_value, UINT)
-
-  MakeValue(long value) {
-    // To minimize the number of types we need to deal with, long is
-    // translated either to int or to long long depending on its size.
-    if (check(sizeof(long) == sizeof(int)))
-      int_value = static_cast<int>(value);
-    else
-      long_long_value = value;
-  }
-  static uint64_t type(long) {
-    return sizeof(long) == sizeof(int) ? Arg::INT : Arg::LONG_LONG;
-  }
-
-  MakeValue(unsigned long value) {
-    if (check(sizeof(unsigned long) == sizeof(unsigned)))
-      uint_value = static_cast<unsigned>(value);
-    else
-      ulong_long_value = value;
-  }
-  static uint64_t type(unsigned long) {
-    return sizeof(unsigned long) == sizeof(unsigned) ?
-          Arg::UINT : Arg::ULONG_LONG;
-  }
-
-  FMT_MAKE_VALUE(LongLong, long_long_value, LONG_LONG)
-  FMT_MAKE_VALUE(ULongLong, ulong_long_value, ULONG_LONG)
-  FMT_MAKE_VALUE(float, double_value, DOUBLE)
-  FMT_MAKE_VALUE(double, double_value, DOUBLE)
-  FMT_MAKE_VALUE(long double, long_double_value, LONG_DOUBLE)
-  FMT_MAKE_VALUE(signed char, int_value, INT)
-  FMT_MAKE_VALUE(unsigned char, uint_value, UINT)
-  FMT_MAKE_VALUE(char, int_value, CHAR)
-
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-  MakeValue(typename WCharHelper<wchar_t, Char>::Supported value) {
-    int_value = value;
-  }
-  static uint64_t type(wchar_t) { return Arg::CHAR; }
-#endif
-
-#define FMT_MAKE_STR_VALUE(Type, TYPE) \
-  MakeValue(Type value) { set_string(value); } \
-  static uint64_t type(Type) { return Arg::TYPE; }
-
-  FMT_MAKE_VALUE(char *, string.value, CSTRING)
-  FMT_MAKE_VALUE(const char *, string.value, CSTRING)
-  FMT_MAKE_VALUE(const signed char *, sstring.value, CSTRING)
-  FMT_MAKE_VALUE(const unsigned char *, ustring.value, CSTRING)
-  FMT_MAKE_STR_VALUE(const std::string &, STRING)
-  FMT_MAKE_STR_VALUE(StringRef, STRING)
-  FMT_MAKE_VALUE_(CStringRef, string.value, CSTRING, value.c_str())
-
-#define FMT_MAKE_WSTR_VALUE(Type, TYPE) \
-  MakeValue(typename WCharHelper<Type, Char>::Supported value) { \
-    set_string(value); \
-  } \
-  static uint64_t type(Type) { return Arg::TYPE; }
-
-  FMT_MAKE_WSTR_VALUE(wchar_t *, WSTRING)
-  FMT_MAKE_WSTR_VALUE(const wchar_t *, WSTRING)
-  FMT_MAKE_WSTR_VALUE(const std::wstring &, WSTRING)
-  FMT_MAKE_WSTR_VALUE(WStringRef, WSTRING)
-
-  FMT_MAKE_VALUE(void *, pointer, POINTER)
-  FMT_MAKE_VALUE(const void *, pointer, POINTER)
-
-  template <typename T>
-  MakeValue(const T &value,
-            typename EnableIf<Not<
-              ConvertToInt<T>::value>::value, int>::type = 0) {
-    custom.value = &value;
-    custom.format = &format_custom_arg<T>;
-  }
-
-  template <typename T>
-  MakeValue(const T &value,
-            typename EnableIf<ConvertToInt<T>::value, int>::type = 0) {
-    int_value = value;
-  }
-
-  template <typename T>
-  static uint64_t type(const T &) {
-    return ConvertToInt<T>::value ? Arg::INT : Arg::CUSTOM;
-  }
-
-  // Additional template param `Char_` is needed here because make_type always
-  // uses char.
-  template <typename Char_>
-  MakeValue(const NamedArg<Char_> &value) { pointer = &value; }
-
-  template <typename Char_>
-  static uint64_t type(const NamedArg<Char_> &) { return Arg::NAMED_ARG; }
-};
-
-template <typename Formatter>
-class MakeArg : public Arg {
-public:
-  MakeArg() {
-    type = Arg::NONE;
-  }
-  
-  template <typename T>
-  MakeArg(const T &value)
-  : Arg(MakeValue<Formatter>(value)) {
-    type = static_cast<Arg::Type>(MakeValue<Formatter>::type(value));
-  }
-};
-
-template <typename Char>
-struct NamedArg : Arg {
-  BasicStringRef<Char> name;
-
-  template <typename T>
-  NamedArg(BasicStringRef<Char> argname, const T &value)
-  : Arg(MakeArg< BasicFormatter<Char> >(value)), name(argname) {}
-};
-
-class RuntimeError : public std::runtime_error {
- protected:
-  RuntimeError() : std::runtime_error("") {}
-};
-
-template <typename Char>
-class PrintfArgFormatter;
-
-template <typename Char>
-class ArgMap;
-}  // namespace internal
-
-/** An argument list. */
-class ArgList {
- private:
-  // To reduce compiled code size per formatting function call, types of first
-  // MAX_PACKED_ARGS arguments are passed in the types_ field.
-  uint64_t types_;
-  union {
-    // If the number of arguments is less than MAX_PACKED_ARGS, the argument
-    // values are stored in values_, otherwise they are stored in args_.
-    // This is done to reduce compiled code size as storing larger objects
-    // may require more code (at least on x86-64) even if the same amount of
-    // data is actually copied to stack. It saves ~10% on the bloat test.
-    const internal::Value *values_;
-    const internal::Arg *args_;
-  };
-
-  internal::Arg::Type type(unsigned index) const {
-    unsigned shift = index * 4;
-    uint64_t mask = 0xf;
-    return static_cast<internal::Arg::Type>(
-          (types_ & (mask << shift)) >> shift);
-  }
-
-  template <typename Char>
-  friend class internal::ArgMap;
-
- public:
-  // Maximum number of arguments with packed types.
-  enum { MAX_PACKED_ARGS = 16 };
-
-  ArgList() : types_(0) {}
-
-  ArgList(ULongLong types, const internal::Value *values)
-  : types_(types), values_(values) {}
-  ArgList(ULongLong types, const internal::Arg *args)
-  : types_(types), args_(args) {}
-
-  /** Returns the argument at specified index. */
-  internal::Arg operator[](unsigned index) const {
-    using internal::Arg;
-    Arg arg;
-    bool use_values = type(MAX_PACKED_ARGS - 1) == Arg::NONE;
-    if (index < MAX_PACKED_ARGS) {
-      Arg::Type arg_type = type(index);
-      internal::Value &val = arg;
-      if (arg_type != Arg::NONE)
-        val = use_values ? values_[index] : args_[index];
-      arg.type = arg_type;
-      return arg;
-    }
-    if (use_values) {
-      // The index is greater than the number of arguments that can be stored
-      // in values, so return a "none" argument.
-      arg.type = Arg::NONE;
-      return arg;
-    }
-    for (unsigned i = MAX_PACKED_ARGS; i <= index; ++i) {
-      if (args_[i].type == Arg::NONE)
-        return args_[i];
-    }
-    return args_[index];
-  }
-};
-
-#define FMT_DISPATCH(call) static_cast<Impl*>(this)->call
-
-/**
-  \rst
-  An argument visitor based on the `curiously recurring template pattern
-  <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
-
-  To use `~fmt::ArgVisitor` define a subclass that implements some or all of the
-  visit methods with the same signatures as the methods in `~fmt::ArgVisitor`,
-  for example, `~fmt::ArgVisitor::visit_int()`.
-  Pass the subclass as the *Impl* template parameter. Then calling
-  `~fmt::ArgVisitor::visit` for some argument will dispatch to a visit method
-  specific to the argument type. For example, if the argument type is
-  ``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
-  will be called. If the subclass doesn't contain a method with this signature,
-  then a corresponding method of `~fmt::ArgVisitor` will be called.
-
-  **Example**::
-
-    class MyArgVisitor : public fmt::ArgVisitor<MyArgVisitor, void> {
-     public:
-      void visit_int(int value) { fmt::print("{}", value); }
-      void visit_double(double value) { fmt::print("{}", value ); }
-    };
-  \endrst
- */
-template <typename Impl, typename Result>
-class ArgVisitor {
- private:
-  typedef internal::Arg Arg;
-
- public:
-  void report_unhandled_arg() {}
-
-  Result visit_unhandled_arg() {
-    FMT_DISPATCH(report_unhandled_arg());
-    return Result();
-  }
-
-  /** Visits an ``int`` argument. **/
-  Result visit_int(int value) {
-    return FMT_DISPATCH(visit_any_int(value));
-  }
-
-  /** Visits a ``long long`` argument. **/
-  Result visit_long_long(LongLong value) {
-    return FMT_DISPATCH(visit_any_int(value));
-  }
-
-  /** Visits an ``unsigned`` argument. **/
-  Result visit_uint(unsigned value) {
-    return FMT_DISPATCH(visit_any_int(value));
-  }
-
-  /** Visits an ``unsigned long long`` argument. **/
-  Result visit_ulong_long(ULongLong value) {
-    return FMT_DISPATCH(visit_any_int(value));
-  }
-
-  /** Visits a ``bool`` argument. **/
-  Result visit_bool(bool value) {
-    return FMT_DISPATCH(visit_any_int(value));
-  }
-
-  /** Visits a ``char`` or ``wchar_t`` argument. **/
-  Result visit_char(int value) {
-    return FMT_DISPATCH(visit_any_int(value));
-  }
-
-  /** Visits an argument of any integral type. **/
-  template <typename T>
-  Result visit_any_int(T) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /** Visits a ``double`` argument. **/
-  Result visit_double(double value) {
-    return FMT_DISPATCH(visit_any_double(value));
-  }
-
-  /** Visits a ``long double`` argument. **/
-  Result visit_long_double(long double value) {
-    return FMT_DISPATCH(visit_any_double(value));
-  }
-
-  /** Visits a ``double`` or ``long double`` argument. **/
-  template <typename T>
-  Result visit_any_double(T) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /** Visits a null-terminated C string (``const char *``) argument. **/
-  Result visit_cstring(const char *) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /** Visits a string argument. **/
-  Result visit_string(Arg::StringValue<char>) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /** Visits a wide string argument. **/
-  Result visit_wstring(Arg::StringValue<wchar_t>) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /** Visits a pointer argument. **/
-  Result visit_pointer(const void *) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /** Visits an argument of a custom (user-defined) type. **/
-  Result visit_custom(Arg::CustomValue) {
-    return FMT_DISPATCH(visit_unhandled_arg());
-  }
-
-  /**
-    \rst
-    Visits an argument dispatching to the appropriate visit method based on
-    the argument type. For example, if the argument type is ``double`` then
-    the `~fmt::ArgVisitor::visit_double()` method of the *Impl* class will be
-    called.
-    \endrst
-   */
-  Result visit(const Arg &arg) {
-    switch (arg.type) {
-    default:
-      FMT_ASSERT(false, "invalid argument type");
-      return Result();
-    case Arg::INT:
-      return FMT_DISPATCH(visit_int(arg.int_value));
-    case Arg::UINT:
-      return FMT_DISPATCH(visit_uint(arg.uint_value));
-    case Arg::LONG_LONG:
-      return FMT_DISPATCH(visit_long_long(arg.long_long_value));
-    case Arg::ULONG_LONG:
-      return FMT_DISPATCH(visit_ulong_long(arg.ulong_long_value));
-    case Arg::BOOL:
-      return FMT_DISPATCH(visit_bool(arg.int_value != 0));
-    case Arg::CHAR:
-      return FMT_DISPATCH(visit_char(arg.int_value));
-    case Arg::DOUBLE:
-      return FMT_DISPATCH(visit_double(arg.double_value));
-    case Arg::LONG_DOUBLE:
-      return FMT_DISPATCH(visit_long_double(arg.long_double_value));
-    case Arg::CSTRING:
-      return FMT_DISPATCH(visit_cstring(arg.string.value));
-    case Arg::STRING:
-      return FMT_DISPATCH(visit_string(arg.string));
-    case Arg::WSTRING:
-      return FMT_DISPATCH(visit_wstring(arg.wstring));
-    case Arg::POINTER:
-      return FMT_DISPATCH(visit_pointer(arg.pointer));
-    case Arg::CUSTOM:
-      return FMT_DISPATCH(visit_custom(arg.custom));
-    }
-  }
-};
-
-enum Alignment {
-  ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC
-};
-
-// Flags.
-enum {
-  SIGN_FLAG = 1, PLUS_FLAG = 2, MINUS_FLAG = 4, HASH_FLAG = 8,
-  CHAR_FLAG = 0x10  // Argument has char type - used in error reporting.
-};
-
-// An empty format specifier.
-struct EmptySpec {};
-
-// A type specifier.
-template <char TYPE>
-struct TypeSpec : EmptySpec {
-  Alignment align() const { return ALIGN_DEFAULT; }
-  unsigned width() const { return 0; }
-  int precision() const { return -1; }
-  bool flag(unsigned) const { return false; }
-  char type() const { return TYPE; }
-  char fill() const { return ' '; }
-};
-
-// A width specifier.
-struct WidthSpec {
-  unsigned width_;
-  // Fill is always wchar_t and cast to char if necessary to avoid having
-  // two specialization of WidthSpec and its subclasses.
-  wchar_t fill_;
-
-  WidthSpec(unsigned width, wchar_t fill) : width_(width), fill_(fill) {}
-
-  unsigned width() const { return width_; }
-  wchar_t fill() const { return fill_; }
-};
-
-// An alignment specifier.
-struct AlignSpec : WidthSpec {
-  Alignment align_;
-
-  AlignSpec(unsigned width, wchar_t fill, Alignment align = ALIGN_DEFAULT)
-  : WidthSpec(width, fill), align_(align) {}
-
-  Alignment align() const { return align_; }
-
-  int precision() const { return -1; }
-};
-
-// An alignment and type specifier.
-template <char TYPE>
-struct AlignTypeSpec : AlignSpec {
-  AlignTypeSpec(unsigned width, wchar_t fill) : AlignSpec(width, fill) {}
-
-  bool flag(unsigned) const { return false; }
-  char type() const { return TYPE; }
-};
-
-// A full format specifier.
-struct FormatSpec : AlignSpec {
-  unsigned flags_;
-  int precision_;
-  char type_;
-
-  FormatSpec(
-    unsigned width = 0, char type = 0, wchar_t fill = ' ')
-  : AlignSpec(width, fill), flags_(0), precision_(-1), type_(type) {}
-
-  bool flag(unsigned f) const { return (flags_ & f) != 0; }
-  int precision() const { return precision_; }
-  char type() const { return type_; }
-};
-
-// An integer format specifier.
-template <typename T, typename SpecT = TypeSpec<0>, typename Char = char>
-class IntFormatSpec : public SpecT {
- private:
-  T value_;
-
- public:
-  IntFormatSpec(T val, const SpecT &spec = SpecT())
-  : SpecT(spec), value_(val) {}
-
-  T value() const { return value_; }
-};
-
-// A string format specifier.
-template <typename Char>
-class StrFormatSpec : public AlignSpec {
- private:
-  const Char *str_;
-
- public:
-  template <typename FillChar>
-  StrFormatSpec(const Char *str, unsigned width, FillChar fill)
-  : AlignSpec(width, fill), str_(str) {
-    internal::CharTraits<Char>::convert(FillChar());
-  }
-
-  const Char *str() const { return str_; }
-};
-
-/**
-  Returns an integer format specifier to format the value in base 2.
- */
-IntFormatSpec<int, TypeSpec<'b'> > bin(int value);
-
-/**
-  Returns an integer format specifier to format the value in base 8.
- */
-IntFormatSpec<int, TypeSpec<'o'> > oct(int value);
-
-/**
-  Returns an integer format specifier to format the value in base 16 using
-  lower-case letters for the digits above 9.
- */
-IntFormatSpec<int, TypeSpec<'x'> > hex(int value);
-
-/**
-  Returns an integer formatter format specifier to format in base 16 using
-  upper-case letters for the digits above 9.
- */
-IntFormatSpec<int, TypeSpec<'X'> > hexu(int value);
-
-/**
-  \rst
-  Returns an integer format specifier to pad the formatted argument with the
-  fill character to the specified width using the default (right) numeric
-  alignment.
-
-  **Example**::
-
-    MemoryWriter out;
-    out << pad(hex(0xcafe), 8, '0');
-    // out.str() == "0000cafe"
-
-  \endrst
- */
-template <char TYPE_CODE, typename Char>
-IntFormatSpec<int, AlignTypeSpec<TYPE_CODE>, Char> pad(
-    int value, unsigned width, Char fill = ' ');
-
-#define FMT_DEFINE_INT_FORMATTERS(TYPE) \
-inline IntFormatSpec<TYPE, TypeSpec<'b'> > bin(TYPE value) { \
-  return IntFormatSpec<TYPE, TypeSpec<'b'> >(value, TypeSpec<'b'>()); \
-} \
- \
-inline IntFormatSpec<TYPE, TypeSpec<'o'> > oct(TYPE value) { \
-  return IntFormatSpec<TYPE, TypeSpec<'o'> >(value, TypeSpec<'o'>()); \
-} \
- \
-inline IntFormatSpec<TYPE, TypeSpec<'x'> > hex(TYPE value) { \
-  return IntFormatSpec<TYPE, TypeSpec<'x'> >(value, TypeSpec<'x'>()); \
-} \
- \
-inline IntFormatSpec<TYPE, TypeSpec<'X'> > hexu(TYPE value) { \
-  return IntFormatSpec<TYPE, TypeSpec<'X'> >(value, TypeSpec<'X'>()); \
-} \
- \
-template <char TYPE_CODE> \
-inline IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE> > pad( \
-    IntFormatSpec<TYPE, TypeSpec<TYPE_CODE> > f, unsigned width) { \
-  return IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE> >( \
-      f.value(), AlignTypeSpec<TYPE_CODE>(width, ' ')); \
-} \
- \
-/* For compatibility with older compilers we provide two overloads for pad, */ \
-/* one that takes a fill character and one that doesn't. In the future this */ \
-/* can be replaced with one overload making the template argument Char      */ \
-/* default to char (C++11). */ \
-template <char TYPE_CODE, typename Char> \
-inline IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE>, Char> pad( \
-    IntFormatSpec<TYPE, TypeSpec<TYPE_CODE>, Char> f, \
-    unsigned width, Char fill) { \
-  return IntFormatSpec<TYPE, AlignTypeSpec<TYPE_CODE>, Char>( \
-      f.value(), AlignTypeSpec<TYPE_CODE>(width, fill)); \
-} \
- \
-inline IntFormatSpec<TYPE, AlignTypeSpec<0> > pad( \
-    TYPE value, unsigned width) { \
-  return IntFormatSpec<TYPE, AlignTypeSpec<0> >( \
-      value, AlignTypeSpec<0>(width, ' ')); \
-} \
- \
-template <typename Char> \
-inline IntFormatSpec<TYPE, AlignTypeSpec<0>, Char> pad( \
-   TYPE value, unsigned width, Char fill) { \
- return IntFormatSpec<TYPE, AlignTypeSpec<0>, Char>( \
-     value, AlignTypeSpec<0>(width, fill)); \
-}
-
-FMT_DEFINE_INT_FORMATTERS(int)
-FMT_DEFINE_INT_FORMATTERS(long)
-FMT_DEFINE_INT_FORMATTERS(unsigned)
-FMT_DEFINE_INT_FORMATTERS(unsigned long)
-FMT_DEFINE_INT_FORMATTERS(LongLong)
-FMT_DEFINE_INT_FORMATTERS(ULongLong)
-
-/**
-  \rst
-  Returns a string formatter that pads the formatted argument with the fill
-  character to the specified width using the default (left) string alignment.
-
-  **Example**::
-
-    std::string s = str(MemoryWriter() << pad("abc", 8));
-    // s == "abc     "
-
-  \endrst
- */
-template <typename Char>
-inline StrFormatSpec<Char> pad(
-    const Char *str, unsigned width, Char fill = ' ') {
-  return StrFormatSpec<Char>(str, width, fill);
-}
-
-inline StrFormatSpec<wchar_t> pad(
-    const wchar_t *str, unsigned width, char fill = ' ') {
-  return StrFormatSpec<wchar_t>(str, width, fill);
-}
-
-namespace internal {
-
-template <typename Char>
-class ArgMap {
- private:
-  typedef std::vector<
-    std::pair<fmt::BasicStringRef<Char>, internal::Arg> > MapType;
-  typedef typename MapType::value_type Pair;
-
-  MapType map_;
-
- public:
-  FMT_API void init(const ArgList &args);
-
-  const internal::Arg* find(const fmt::BasicStringRef<Char> &name) const {
-    // The list is unsorted, so just return the first matching name.
-    for (typename MapType::const_iterator it = map_.begin(), end = map_.end();
-         it != end; ++it) {
-      if (it->first == name)
-        return &it->second;
-    }
-    return 0;
-  }
-};
-
-template <typename Impl, typename Char>
-class ArgFormatterBase : public ArgVisitor<Impl, void> {
- private:
-  BasicWriter<Char> &writer_;
-  FormatSpec &spec_;
-
-  FMT_DISALLOW_COPY_AND_ASSIGN(ArgFormatterBase);
-
-  void write_pointer(const void *p) {
-    spec_.flags_ = HASH_FLAG;
-    spec_.type_ = 'x';
-    writer_.write_int(reinterpret_cast<uintptr_t>(p), spec_);
-  }
-
- protected:
-  BasicWriter<Char> &writer() { return writer_; }
-  FormatSpec &spec() { return spec_; }
-
-  void write(bool value) {
-    const char *str_value = value ? "true" : "false";
-    Arg::StringValue<char> str = { str_value, std::strlen(str_value) };
-    writer_.write_str(str, spec_);
-  }
-
-  void write(const char *value) {
-    Arg::StringValue<char> str = {value, value != 0 ? std::strlen(value) : 0};
-    writer_.write_str(str, spec_);
-  }
-
- public:
-  ArgFormatterBase(BasicWriter<Char> &w, FormatSpec &s)
-  : writer_(w), spec_(s) {}
-
-  template <typename T>
-  void visit_any_int(T value) { writer_.write_int(value, spec_); }
-
-  template <typename T>
-  void visit_any_double(T value) { writer_.write_double(value, spec_); }
-
-  void visit_bool(bool value) {
-    if (spec_.type_)
-      return visit_any_int(value);
-    write(value);
-  }
-
-  void visit_char(int value) {
-    if (spec_.type_ && spec_.type_ != 'c') {
-      spec_.flags_ |= CHAR_FLAG;
-      writer_.write_int(value, spec_);
-      return;
-    }
-    if (spec_.align_ == ALIGN_NUMERIC || spec_.flags_ != 0)
-      FMT_THROW(FormatError("invalid format specifier for char"));
-    typedef typename BasicWriter<Char>::CharPtr CharPtr;
-    Char fill = internal::CharTraits<Char>::cast(spec_.fill());
-    CharPtr out = CharPtr();
-    const unsigned CHAR_WIDTH = 1;
-    if (spec_.width_ > CHAR_WIDTH) {
-      out = writer_.grow_buffer(spec_.width_);
-      if (spec_.align_ == ALIGN_RIGHT) {
-        std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, fill);
-        out += spec_.width_ - CHAR_WIDTH;
-      } else if (spec_.align_ == ALIGN_CENTER) {
-        out = writer_.fill_padding(out, spec_.width_,
-                                   internal::check(CHAR_WIDTH), fill);
-      } else {
-        std::uninitialized_fill_n(out + CHAR_WIDTH,
-                                  spec_.width_ - CHAR_WIDTH, fill);
-      }
-    } else {
-      out = writer_.grow_buffer(CHAR_WIDTH);
-    }
-    *out = internal::CharTraits<Char>::cast(value);
-  }
-
-  void visit_cstring(const char *value) {
-    if (spec_.type_ == 'p')
-      return write_pointer(value);
-    write(value);
-  }
-
-  void visit_string(Arg::StringValue<char> value) {
-    writer_.write_str(value, spec_);
-  }
-
-  using ArgVisitor<Impl, void>::visit_wstring;
-
-  void visit_wstring(Arg::StringValue<Char> value) {
-    writer_.write_str(value, spec_);
-  }
-
-  void visit_pointer(const void *value) {
-    if (spec_.type_ && spec_.type_ != 'p')
-      report_unknown_type(spec_.type_, "pointer");
-    write_pointer(value);
-  }
-};
-
-class FormatterBase {
- private:
-  ArgList args_;
-  int next_arg_index_;
-
-  // Returns the argument with specified index.
-  FMT_API Arg do_get_arg(unsigned arg_index, const char *&error);
-
- protected:
-  const ArgList &args() const { return args_; }
-
-  explicit FormatterBase(const ArgList &args) {
-    args_ = args;
-    next_arg_index_ = 0;
-  }
-
-  // Returns the next argument.
-  Arg next_arg(const char *&error) {
-    if (next_arg_index_ >= 0)
-      return do_get_arg(internal::to_unsigned(next_arg_index_++), error);
-    error = "cannot switch from manual to automatic argument indexing";
-    return Arg();
-  }
-
-  // Checks if manual indexing is used and returns the argument with
-  // specified index.
-  Arg get_arg(unsigned arg_index, const char *&error) {
-    return check_no_auto_index(error) ? do_get_arg(arg_index, error) : Arg();
-  }
-
-  bool check_no_auto_index(const char *&error) {
-    if (next_arg_index_ > 0) {
-      error = "cannot switch from automatic to manual argument indexing";
-      return false;
-    }
-    next_arg_index_ = -1;
-    return true;
-  }
-
-  template <typename Char>
-  void write(BasicWriter<Char> &w, const Char *start, const Char *end) {
-    if (start != end)
-      w << BasicStringRef<Char>(start, internal::to_unsigned(end - start));
-  }
-};
-
-// A printf formatter.
-template <typename Char>
-class PrintfFormatter : private FormatterBase {
- private:
-  void parse_flags(FormatSpec &spec, const Char *&s);
-
-  // Returns the argument with specified index or, if arg_index is equal
-  // to the maximum unsigned value, the next argument.
-  Arg get_arg(const Char *s,
-      unsigned arg_index = (std::numeric_limits<unsigned>::max)());
-
-  // Parses argument index, flags and width and returns the argument index.
-  unsigned parse_header(const Char *&s, FormatSpec &spec);
-
- public:
-  explicit PrintfFormatter(const ArgList &args) : FormatterBase(args) {}
-  FMT_API void format(BasicWriter<Char> &writer,
-                      BasicCStringRef<Char> format_str);
-};
-}  // namespace internal
-
-/**
-  \rst
-  An argument formatter based on the `curiously recurring template pattern
-  <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
-
-  To use `~fmt::BasicArgFormatter` define a subclass that implements some or
-  all of the visit methods with the same signatures as the methods in
-  `~fmt::ArgVisitor`, for example, `~fmt::ArgVisitor::visit_int()`.
-  Pass the subclass as the *Impl* template parameter. When a formatting
-  function processes an argument, it will dispatch to a visit method
-  specific to the argument type. For example, if the argument type is
-  ``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
-  will be called. If the subclass doesn't contain a method with this signature,
-  then a corresponding method of `~fmt::BasicArgFormatter` or its superclass
-  will be called.
-  \endrst
- */
-template <typename Impl, typename Char>
-class BasicArgFormatter : public internal::ArgFormatterBase<Impl, Char> {
- private:
-  BasicFormatter<Char, Impl> &formatter_;
-  const Char *format_;
-
- public:
-  /**
-    \rst
-    Constructs an argument formatter object.
-    *formatter* is a reference to the main formatter object, *spec* contains
-    format specifier information for standard argument types, and *fmt* points
-    to the part of the format string being parsed for custom argument types.
-    \endrst
-   */
-  BasicArgFormatter(BasicFormatter<Char, Impl> &formatter,
-                    FormatSpec &spec, const Char *fmt)
-  : internal::ArgFormatterBase<Impl, Char>(formatter.writer(), spec),
-    formatter_(formatter), format_(fmt) {}
-
-  /** Formats argument of a custom (user-defined) type. */
-  void visit_custom(internal::Arg::CustomValue c) {
-    c.format(&formatter_, c.value, &format_);
-  }
-};
-
-/** The default argument formatter. */
-template <typename Char>
-class ArgFormatter : public BasicArgFormatter<ArgFormatter<Char>, Char> {
- public:
-  /** Constructs an argument formatter object. */
-  ArgFormatter(BasicFormatter<Char> &formatter,
-               FormatSpec &spec, const Char *fmt)
-  : BasicArgFormatter<ArgFormatter<Char>, Char>(formatter, spec, fmt) {}
-};
-
-/** This template formats data and writes the output to a writer. */
-template <typename CharType, typename ArgFormatter>
-class BasicFormatter : private internal::FormatterBase {
- public:
-  /** The character type for the output. */
-  typedef CharType Char;
-
- private:
-  BasicWriter<Char> &writer_;
-  internal::ArgMap<Char> map_;
-
-  FMT_DISALLOW_COPY_AND_ASSIGN(BasicFormatter);
-
-  using internal::FormatterBase::get_arg;
-
-  // Checks if manual indexing is used and returns the argument with
-  // specified name.
-  internal::Arg get_arg(BasicStringRef<Char> arg_name, const char *&error);
-
-  // Parses argument index and returns corresponding argument.
-  internal::Arg parse_arg_index(const Char *&s);
-
-  // Parses argument name and returns corresponding argument.
-  internal::Arg parse_arg_name(const Char *&s);
-
- public:
-  /**
-   \rst
-   Constructs a ``BasicFormatter`` object. References to the arguments and
-   the writer are stored in the formatter object so make sure they have
-   appropriate lifetimes.
-   \endrst
-   */
-  BasicFormatter(const ArgList &args, BasicWriter<Char> &w)
-    : internal::FormatterBase(args), writer_(w) {}
-
-  /** Returns a reference to the writer associated with this formatter. */
-  BasicWriter<Char> &writer() { return writer_; }
-
-  /** Formats stored arguments and writes the output to the writer. */
-  void format(BasicCStringRef<Char> format_str);
-
-  // Formats a single argument and advances format_str, a format string pointer.
-  const Char *format(const Char *&format_str, const internal::Arg &arg);
-};
-
-// Generates a comma-separated list with results of applying f to
-// numbers 0..n-1.
-# define FMT_GEN(n, f) FMT_GEN##n(f)
-# define FMT_GEN1(f)  f(0)
-# define FMT_GEN2(f)  FMT_GEN1(f),  f(1)
-# define FMT_GEN3(f)  FMT_GEN2(f),  f(2)
-# define FMT_GEN4(f)  FMT_GEN3(f),  f(3)
-# define FMT_GEN5(f)  FMT_GEN4(f),  f(4)
-# define FMT_GEN6(f)  FMT_GEN5(f),  f(5)
-# define FMT_GEN7(f)  FMT_GEN6(f),  f(6)
-# define FMT_GEN8(f)  FMT_GEN7(f),  f(7)
-# define FMT_GEN9(f)  FMT_GEN8(f),  f(8)
-# define FMT_GEN10(f) FMT_GEN9(f),  f(9)
-# define FMT_GEN11(f) FMT_GEN10(f), f(10)
-# define FMT_GEN12(f) FMT_GEN11(f), f(11)
-# define FMT_GEN13(f) FMT_GEN12(f), f(12)
-# define FMT_GEN14(f) FMT_GEN13(f), f(13)
-# define FMT_GEN15(f) FMT_GEN14(f), f(14)
-
-namespace internal {
-inline uint64_t make_type() { return 0; }
-
-template <typename T>
-inline uint64_t make_type(const T &arg) {
-  return MakeValue< BasicFormatter<char> >::type(arg);
-}
-
-template <unsigned N, bool/*IsPacked*/= (N < ArgList::MAX_PACKED_ARGS)>
-struct ArgArray;
-
-template <unsigned N>
-struct ArgArray<N, true/*IsPacked*/> {
-  typedef Value Type[N > 0 ? N : 1];
-  
-  template <typename Formatter, typename T>
-  static Value make(const T &value) {
-#ifdef __clang__
-    Value result = MakeValue<Formatter>(value);
-    // Workaround a bug in Apple LLVM version 4.2 (clang-425.0.28) of clang:
-    // https://github.com/fmtlib/fmt/issues/276
-    (void)result.custom.format;
-    return result;
-#else
-    return MakeValue<Formatter>(value);
-#endif
-  }
-};
-
-template <unsigned N>
-struct ArgArray<N, false/*IsPacked*/> {
-  typedef Arg Type[N + 1]; // +1 for the list end Arg::NONE
-
-  template <typename Formatter, typename T>
-  static Arg make(const T &value) { return MakeArg<Formatter>(value); }
-};
-
-#if FMT_USE_VARIADIC_TEMPLATES
-template <typename Arg, typename... Args>
-inline uint64_t make_type(const Arg &first, const Args & ... tail) {
-  return make_type(first) | (make_type(tail...) << 4);
-}
-
-#else
-
-struct ArgType {
-  uint64_t type;
-
-  ArgType() : type(0) {}
-
-  template <typename T>
-  ArgType(const T &arg) : type(make_type(arg)) {}
-};
-
-# define FMT_ARG_TYPE_DEFAULT(n) ArgType t##n = ArgType()
-
-inline uint64_t make_type(FMT_GEN15(FMT_ARG_TYPE_DEFAULT)) {
-  return t0.type | (t1.type << 4) | (t2.type << 8) | (t3.type << 12) |
-      (t4.type << 16) | (t5.type << 20) | (t6.type << 24) | (t7.type << 28) |
-      (t8.type << 32) | (t9.type << 36) | (t10.type << 40) | (t11.type << 44) |
-      (t12.type << 48) | (t13.type << 52) | (t14.type << 56);
-}
-#endif
-}  // namespace internal
-
-# define FMT_MAKE_TEMPLATE_ARG(n) typename T##n
-# define FMT_MAKE_ARG_TYPE(n) T##n
-# define FMT_MAKE_ARG(n) const T##n &v##n
-# define FMT_ASSIGN_char(n) \
-  arr[n] = fmt::internal::MakeValue< fmt::BasicFormatter<char> >(v##n)
-# define FMT_ASSIGN_wchar_t(n) \
-  arr[n] = fmt::internal::MakeValue< fmt::BasicFormatter<wchar_t> >(v##n)
-
-#if FMT_USE_VARIADIC_TEMPLATES
-// Defines a variadic function returning void.
-# define FMT_VARIADIC_VOID(func, arg_type) \
-  template <typename... Args> \
-  void func(arg_type arg0, const Args & ... args) { \
-    typedef fmt::internal::ArgArray<sizeof...(Args)> ArgArray; \
-    typename ArgArray::Type array{ \
-      ArgArray::template make<fmt::BasicFormatter<Char> >(args)...}; \
-    func(arg0, fmt::ArgList(fmt::internal::make_type(args...), array)); \
-  }
-
-// Defines a variadic constructor.
-# define FMT_VARIADIC_CTOR(ctor, func, arg0_type, arg1_type) \
-  template <typename... Args> \
-  ctor(arg0_type arg0, arg1_type arg1, const Args & ... args) { \
-    typedef fmt::internal::ArgArray<sizeof...(Args)> ArgArray; \
-    typename ArgArray::Type array{ \
-      ArgArray::template make<fmt::BasicFormatter<Char> >(args)...}; \
-    func(arg0, arg1, fmt::ArgList(fmt::internal::make_type(args...), array)); \
-  }
-
-#else
-
-# define FMT_MAKE_REF(n) \
-  fmt::internal::MakeValue< fmt::BasicFormatter<Char> >(v##n)
-# define FMT_MAKE_REF2(n) v##n
-
-// Defines a wrapper for a function taking one argument of type arg_type
-// and n additional arguments of arbitrary types.
-# define FMT_WRAP1(func, arg_type, n) \
-  template <FMT_GEN(n, FMT_MAKE_TEMPLATE_ARG)> \
-  inline void func(arg_type arg1, FMT_GEN(n, FMT_MAKE_ARG)) { \
-    const fmt::internal::ArgArray<n>::Type array = {FMT_GEN(n, FMT_MAKE_REF)}; \
-    func(arg1, fmt::ArgList( \
-      fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), array)); \
-  }
-
-// Emulates a variadic function returning void on a pre-C++11 compiler.
-# define FMT_VARIADIC_VOID(func, arg_type) \
-  inline void func(arg_type arg) { func(arg, fmt::ArgList()); } \
-  FMT_WRAP1(func, arg_type, 1) FMT_WRAP1(func, arg_type, 2) \
-  FMT_WRAP1(func, arg_type, 3) FMT_WRAP1(func, arg_type, 4) \
-  FMT_WRAP1(func, arg_type, 5) FMT_WRAP1(func, arg_type, 6) \
-  FMT_WRAP1(func, arg_type, 7) FMT_WRAP1(func, arg_type, 8) \
-  FMT_WRAP1(func, arg_type, 9) FMT_WRAP1(func, arg_type, 10)
-
-# define FMT_CTOR(ctor, func, arg0_type, arg1_type, n) \
-  template <FMT_GEN(n, FMT_MAKE_TEMPLATE_ARG)> \
-  ctor(arg0_type arg0, arg1_type arg1, FMT_GEN(n, FMT_MAKE_ARG)) { \
-    const fmt::internal::ArgArray<n>::Type array = {FMT_GEN(n, FMT_MAKE_REF)}; \
-    func(arg0, arg1, fmt::ArgList( \
-      fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), array)); \
-  }
-
-// Emulates a variadic constructor on a pre-C++11 compiler.
-# define FMT_VARIADIC_CTOR(ctor, func, arg0_type, arg1_type) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 1) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 2) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 3) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 4) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 5) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 6) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 7) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 8) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 9) \
-  FMT_CTOR(ctor, func, arg0_type, arg1_type, 10)
-#endif
-
-// Generates a comma-separated list with results of applying f to pairs
-// (argument, index).
-#define FMT_FOR_EACH1(f, x0) f(x0, 0)
-#define FMT_FOR_EACH2(f, x0, x1) \
-  FMT_FOR_EACH1(f, x0), f(x1, 1)
-#define FMT_FOR_EACH3(f, x0, x1, x2) \
-  FMT_FOR_EACH2(f, x0 ,x1), f(x2, 2)
-#define FMT_FOR_EACH4(f, x0, x1, x2, x3) \
-  FMT_FOR_EACH3(f, x0, x1, x2), f(x3, 3)
-#define FMT_FOR_EACH5(f, x0, x1, x2, x3, x4) \
-  FMT_FOR_EACH4(f, x0, x1, x2, x3), f(x4, 4)
-#define FMT_FOR_EACH6(f, x0, x1, x2, x3, x4, x5) \
-  FMT_FOR_EACH5(f, x0, x1, x2, x3, x4), f(x5, 5)
-#define FMT_FOR_EACH7(f, x0, x1, x2, x3, x4, x5, x6) \
-  FMT_FOR_EACH6(f, x0, x1, x2, x3, x4, x5), f(x6, 6)
-#define FMT_FOR_EACH8(f, x0, x1, x2, x3, x4, x5, x6, x7) \
-  FMT_FOR_EACH7(f, x0, x1, x2, x3, x4, x5, x6), f(x7, 7)
-#define FMT_FOR_EACH9(f, x0, x1, x2, x3, x4, x5, x6, x7, x8) \
-  FMT_FOR_EACH8(f, x0, x1, x2, x3, x4, x5, x6, x7), f(x8, 8)
-#define FMT_FOR_EACH10(f, x0, x1, x2, x3, x4, x5, x6, x7, x8, x9) \
-  FMT_FOR_EACH9(f, x0, x1, x2, x3, x4, x5, x6, x7, x8), f(x9, 9)
-
-/**
- An error returned by an operating system or a language runtime,
- for example a file opening error.
-*/
-class SystemError : public internal::RuntimeError {
- private:
-  void init(int err_code, CStringRef format_str, ArgList args);
-
- protected:
-  int error_code_;
-
-  typedef char Char;  // For FMT_VARIADIC_CTOR.
-
-  SystemError() {}
-
- public:
-  /**
-   \rst
-   Constructs a :class:`fmt::SystemError` object with the description
-   of the form
-
-   .. parsed-literal::
-     *<message>*: *<system-message>*
-
-   where *<message>* is the formatted message and *<system-message>* is
-   the system message corresponding to the error code.
-   *error_code* is a system error code as given by ``errno``.
-   If *error_code* is not a valid error code such as -1, the system message
-   may look like "Unknown error -1" and is platform-dependent.
-
-   **Example**::
-
-     // This throws a SystemError with the description
-     //   cannot open file 'madeup': No such file or directory
-     // or similar (system message may vary).
-     const char *filename = "madeup";
-     std::FILE *file = std::fopen(filename, "r");
-     if (!file)
-       throw fmt::SystemError(errno, "cannot open file '{}'", filename);
-   \endrst
-  */
-  SystemError(int error_code, CStringRef message) {
-    init(error_code, message, ArgList());
-  }
-  FMT_VARIADIC_CTOR(SystemError, init, int, CStringRef)
-
-  int error_code() const { return error_code_; }
-};
-
-/**
-  \rst
-  This template provides operations for formatting and writing data into
-  a character stream. The output is stored in a buffer provided by a subclass
-  such as :class:`fmt::BasicMemoryWriter`.
-
-  You can use one of the following typedefs for common character types:
-
-  +---------+----------------------+
-  | Type    | Definition           |
-  +=========+======================+
-  | Writer  | BasicWriter<char>    |
-  +---------+----------------------+
-  | WWriter | BasicWriter<wchar_t> |
-  +---------+----------------------+
-
-  \endrst
- */
-template <typename Char>
-class BasicWriter {
- private:
-  // Output buffer.
-  Buffer<Char> &buffer_;
-
-  FMT_DISALLOW_COPY_AND_ASSIGN(BasicWriter);
-
-  typedef typename internal::CharTraits<Char>::CharPtr CharPtr;
-
-#if FMT_SECURE_SCL
-  // Returns pointer value.
-  static Char *get(CharPtr p) { return p.base(); }
-#else
-  static Char *get(Char *p) { return p; }
-#endif
-
-  // Fills the padding around the content and returns the pointer to the
-  // content area.
-  static CharPtr fill_padding(CharPtr buffer,
-      unsigned total_size, std::size_t content_size, wchar_t fill);
-
-  // Grows the buffer by n characters and returns a pointer to the newly
-  // allocated area.
-  CharPtr grow_buffer(std::size_t n) {
-    std::size_t size = buffer_.size();
-    buffer_.resize(size + n);
-    return internal::make_ptr(&buffer_[size], n);
-  }
-
-  // Writes an unsigned decimal integer.
-  template <typename UInt>
-  Char *write_unsigned_decimal(UInt value, unsigned prefix_size = 0) {
-    unsigned num_digits = internal::count_digits(value);
-    Char *ptr = get(grow_buffer(prefix_size + num_digits));
-    internal::format_decimal(ptr + prefix_size, value, num_digits);
-    return ptr;
-  }
-
-  // Writes a decimal integer.
-  template <typename Int>
-  void write_decimal(Int value) {
-    typedef typename internal::IntTraits<Int>::MainType MainType;
-    MainType abs_value = static_cast<MainType>(value);
-    if (internal::is_negative(value)) {
-      abs_value = 0 - abs_value;
-      *write_unsigned_decimal(abs_value, 1) = '-';
-    } else {
-      write_unsigned_decimal(abs_value, 0);
-    }
-  }
-
-  // Prepare a buffer for integer formatting.
-  CharPtr prepare_int_buffer(unsigned num_digits,
-      const EmptySpec &, const char *prefix, unsigned prefix_size) {
-    unsigned size = prefix_size + num_digits;
-    CharPtr p = grow_buffer(size);
-    std::uninitialized_copy(prefix, prefix + prefix_size, p);
-    return p + size - 1;
-  }
-
-  template <typename Spec>
-  CharPtr prepare_int_buffer(unsigned num_digits,
-    const Spec &spec, const char *prefix, unsigned prefix_size);
-
-  // Formats an integer.
-  template <typename T, typename Spec>
-  void write_int(T value, Spec spec);
-
-  // Formats a floating-point number (double or long double).
-  template <typename T>
-  void write_double(T value, const FormatSpec &spec);
-
-  // Writes a formatted string.
-  template <typename StrChar>
-  CharPtr write_str(const StrChar *s, std::size_t size, const AlignSpec &spec);
-
-  template <typename StrChar>
-  void write_str(const internal::Arg::StringValue<StrChar> &str,
-                 const FormatSpec &spec);
-
-  // This following methods are private to disallow writing wide characters
-  // and strings to a char stream. If you want to print a wide string as a
-  // pointer as std::ostream does, cast it to const void*.
-  // Do not implement!
-  void operator<<(typename internal::WCharHelper<wchar_t, Char>::Unsupported);
-  void operator<<(
-      typename internal::WCharHelper<const wchar_t *, Char>::Unsupported);
-
-  // Appends floating-point length specifier to the format string.
-  // The second argument is only used for overload resolution.
-  void append_float_length(Char *&format_ptr, long double) {
-    *format_ptr++ = 'L';
-  }
-
-  template<typename T>
-  void append_float_length(Char *&, T) {}
-
-  template <typename Impl, typename Char_>
-  friend class internal::ArgFormatterBase;
-
-  friend class internal::PrintfArgFormatter<Char>;
-
- protected:
-  /**
-    Constructs a ``BasicWriter`` object.
-   */
-  explicit BasicWriter(Buffer<Char> &b) : buffer_(b) {}
-
- public:
-  /**
-    \rst
-    Destroys a ``BasicWriter`` object.
-    \endrst
-   */
-  virtual ~BasicWriter() {}
-
-  /**
-    Returns the total number of characters written.
-   */
-  std::size_t size() const { return buffer_.size(); }
-
-  /**
-    Returns a pointer to the output buffer content. No terminating null
-    character is appended.
-   */
-  const Char *data() const FMT_NOEXCEPT { return &buffer_[0]; }
-
-  /**
-    Returns a pointer to the output buffer content with terminating null
-    character appended.
-   */
-  const Char *c_str() const {
-    std::size_t size = buffer_.size();
-    buffer_.reserve(size + 1);
-    buffer_[size] = '\0';
-    return &buffer_[0];
-  }
-
-  /**
-    \rst
-    Returns the content of the output buffer as an `std::string`.
-    \endrst
-   */
-  std::basic_string<Char> str() const {
-    return std::basic_string<Char>(&buffer_[0], buffer_.size());
-  }
-
-  /**
-    \rst
-    Writes formatted data.
-
-    *args* is an argument list representing arbitrary arguments.
-
-    **Example**::
-
-       MemoryWriter out;
-       out.write("Current point:\n");
-       out.write("({:+f}, {:+f})", -3.14, 3.14);
-
-    This will write the following output to the ``out`` object:
-
-    .. code-block:: none
-
-       Current point:
-       (-3.140000, +3.140000)
-
-    The output can be accessed using :func:`data()`, :func:`c_str` or
-    :func:`str` methods.
-
-    See also :ref:`syntax`.
-    \endrst
-   */
-  void write(BasicCStringRef<Char> format, ArgList args) {
-    BasicFormatter<Char>(args, *this).format(format);
-  }
-  FMT_VARIADIC_VOID(write, BasicCStringRef<Char>)
-
-  BasicWriter &operator<<(int value) {
-    write_decimal(value);
-    return *this;
-  }
-  BasicWriter &operator<<(unsigned value) {
-    return *this << IntFormatSpec<unsigned>(value);
-  }
-  BasicWriter &operator<<(long value) {
-    write_decimal(value);
-    return *this;
-  }
-  BasicWriter &operator<<(unsigned long value) {
-    return *this << IntFormatSpec<unsigned long>(value);
-  }
-  BasicWriter &operator<<(LongLong value) {
-    write_decimal(value);
-    return *this;
-  }
-
-  /**
-    \rst
-    Formats *value* and writes it to the stream.
-    \endrst
-   */
-  BasicWriter &operator<<(ULongLong value) {
-    return *this << IntFormatSpec<ULongLong>(value);
-  }
-
-  BasicWriter &operator<<(double value) {
-    write_double(value, FormatSpec());
-    return *this;
-  }
-
-  /**
-    \rst
-    Formats *value* using the general format for floating-point numbers
-    (``'g'``) and writes it to the stream.
-    \endrst
-   */
-  BasicWriter &operator<<(long double value) {
-    write_double(value, FormatSpec());
-    return *this;
-  }
-
-  /**
-    Writes a character to the stream.
-   */
-  BasicWriter &operator<<(char value) {
-    buffer_.push_back(value);
-    return *this;
-  }
-
-  BasicWriter &operator<<(
-      typename internal::WCharHelper<wchar_t, Char>::Supported value) {
-    buffer_.push_back(value);
-    return *this;
-  }
-
-  /**
-    \rst
-    Writes *value* to the stream.
-    \endrst
-   */
-  BasicWriter &operator<<(fmt::BasicStringRef<Char> value) {
-    const Char *str = value.data();
-    buffer_.append(str, str + value.size());
-    return *this;
-  }
-
-  BasicWriter &operator<<(
-      typename internal::WCharHelper<StringRef, Char>::Supported value) {
-    const char *str = value.data();
-    buffer_.append(str, str + value.size());
-    return *this;
-  }
-
-  template <typename T, typename Spec, typename FillChar>
-  BasicWriter &operator<<(IntFormatSpec<T, Spec, FillChar> spec) {
-    internal::CharTraits<Char>::convert(FillChar());
-    write_int(spec.value(), spec);
-    return *this;
-  }
-
-  template <typename StrChar>
-  BasicWriter &operator<<(const StrFormatSpec<StrChar> &spec) {
-    const StrChar *s = spec.str();
-    write_str(s, std::char_traits<Char>::length(s), spec);
-    return *this;
-  }
-
-  void clear() FMT_NOEXCEPT { buffer_.clear(); }
-
-  Buffer<Char> &buffer() FMT_NOEXCEPT { return buffer_; }
-};
-
-template <typename Char>
-template <typename StrChar>
-typename BasicWriter<Char>::CharPtr BasicWriter<Char>::write_str(
-      const StrChar *s, std::size_t size, const AlignSpec &spec) {
-  CharPtr out = CharPtr();
-  if (spec.width() > size) {
-    out = grow_buffer(spec.width());
-    Char fill = internal::CharTraits<Char>::cast(spec.fill());
-    if (spec.align() == ALIGN_RIGHT) {
-      std::uninitialized_fill_n(out, spec.width() - size, fill);
-      out += spec.width() - size;
-    } else if (spec.align() == ALIGN_CENTER) {
-      out = fill_padding(out, spec.width(), size, fill);
-    } else {
-      std::uninitialized_fill_n(out + size, spec.width() - size, fill);
-    }
-  } else {
-    out = grow_buffer(size);
-  }
-  std::uninitialized_copy(s, s + size, out);
-  return out;
-}
-
-template <typename Char>
-template <typename StrChar>
-void BasicWriter<Char>::write_str(
-    const internal::Arg::StringValue<StrChar> &s, const FormatSpec &spec) {
-  // Check if StrChar is convertible to Char.
-  internal::CharTraits<Char>::convert(StrChar());
-  if (spec.type_ && spec.type_ != 's')
-    internal::report_unknown_type(spec.type_, "string");
-  const StrChar *str_value = s.value;
-  std::size_t str_size = s.size;
-  if (str_size == 0) {
-    if (!str_value) {
-      FMT_THROW(FormatError("string pointer is null"));
-      return;
-    }
-  }
-  std::size_t precision = static_cast<std::size_t>(spec.precision_);
-  if (spec.precision_ >= 0 && precision < str_size)
-    str_size = precision;
-  write_str(str_value, str_size, spec);
-}
-
-template <typename Char>
-typename BasicWriter<Char>::CharPtr
-  BasicWriter<Char>::fill_padding(
-    CharPtr buffer, unsigned total_size,
-    std::size_t content_size, wchar_t fill) {
-  std::size_t padding = total_size - content_size;
-  std::size_t left_padding = padding / 2;
-  Char fill_char = internal::CharTraits<Char>::cast(fill);
-  std::uninitialized_fill_n(buffer, left_padding, fill_char);
-  buffer += left_padding;
-  CharPtr content = buffer;
-  std::uninitialized_fill_n(buffer + content_size,
-                            padding - left_padding, fill_char);
-  return content;
-}
-
-template <typename Char>
-template <typename Spec>
-typename BasicWriter<Char>::CharPtr
-  BasicWriter<Char>::prepare_int_buffer(
-    unsigned num_digits, const Spec &spec,
-    const char *prefix, unsigned prefix_size) {
-  unsigned width = spec.width();
-  Alignment align = spec.align();
-  Char fill = internal::CharTraits<Char>::cast(spec.fill());
-  if (spec.precision() > static_cast<int>(num_digits)) {
-    // Octal prefix '0' is counted as a digit, so ignore it if precision
-    // is specified.
-    if (prefix_size > 0 && prefix[prefix_size - 1] == '0')
-      --prefix_size;
-    unsigned number_size =
-        prefix_size + internal::to_unsigned(spec.precision());
-    AlignSpec subspec(number_size, '0', ALIGN_NUMERIC);
-    if (number_size >= width)
-      return prepare_int_buffer(num_digits, subspec, prefix, prefix_size);
-    buffer_.reserve(width);
-    unsigned fill_size = width - number_size;
-    if (align != ALIGN_LEFT) {
-      CharPtr p = grow_buffer(fill_size);
-      std::uninitialized_fill(p, p + fill_size, fill);
-    }
-    CharPtr result = prepare_int_buffer(
-        num_digits, subspec, prefix, prefix_size);
-    if (align == ALIGN_LEFT) {
-      CharPtr p = grow_buffer(fill_size);
-      std::uninitialized_fill(p, p + fill_size, fill);
-    }
-    return result;
-  }
-  unsigned size = prefix_size + num_digits;
-  if (width <= size) {
-    CharPtr p = grow_buffer(size);
-    std::uninitialized_copy(prefix, prefix + prefix_size, p);
-    return p + size - 1;
-  }
-  CharPtr p = grow_buffer(width);
-  CharPtr end = p + width;
-  if (align == ALIGN_LEFT) {
-    std::uninitialized_copy(prefix, prefix + prefix_size, p);
-    p += size;
-    std::uninitialized_fill(p, end, fill);
-  } else if (align == ALIGN_CENTER) {
-    p = fill_padding(p, width, size, fill);
-    std::uninitialized_copy(prefix, prefix + prefix_size, p);
-    p += size;
-  } else {
-    if (align == ALIGN_NUMERIC) {
-      if (prefix_size != 0) {
-        p = std::uninitialized_copy(prefix, prefix + prefix_size, p);
-        size -= prefix_size;
-      }
-    } else {
-      std::uninitialized_copy(prefix, prefix + prefix_size, end - size);
-    }
-    std::uninitialized_fill(p, end - size, fill);
-    p = end;
-  }
-  return p - 1;
-}
-
-template <typename Char>
-template <typename T, typename Spec>
-void BasicWriter<Char>::write_int(T value, Spec spec) {
-  unsigned prefix_size = 0;
-  typedef typename internal::IntTraits<T>::MainType UnsignedType;
-  UnsignedType abs_value = static_cast<UnsignedType>(value);
-  char prefix[4] = "";
-  if (internal::is_negative(value)) {
-    prefix[0] = '-';
-    ++prefix_size;
-    abs_value = 0 - abs_value;
-  } else if (spec.flag(SIGN_FLAG)) {
-    prefix[0] = spec.flag(PLUS_FLAG) ? '+' : ' ';
-    ++prefix_size;
-  }
-  switch (spec.type()) {
-  case 0: case 'd': {
-    unsigned num_digits = internal::count_digits(abs_value);
-    CharPtr p = prepare_int_buffer(num_digits, spec, prefix, prefix_size) + 1;
-    internal::format_decimal(get(p), abs_value, 0);
-    break;
-  }
-  case 'x': case 'X': {
-    UnsignedType n = abs_value;
-    if (spec.flag(HASH_FLAG)) {
-      prefix[prefix_size++] = '0';
-      prefix[prefix_size++] = spec.type();
-    }
-    unsigned num_digits = 0;
-    do {
-      ++num_digits;
-    } while ((n >>= 4) != 0);
-    Char *p = get(prepare_int_buffer(
-      num_digits, spec, prefix, prefix_size));
-    n = abs_value;
-    const char *digits = spec.type() == 'x' ?
-        "0123456789abcdef" : "0123456789ABCDEF";
-    do {
-      *p-- = digits[n & 0xf];
-    } while ((n >>= 4) != 0);
-    break;
-  }
-  case 'b': case 'B': {
-    UnsignedType n = abs_value;
-    if (spec.flag(HASH_FLAG)) {
-      prefix[prefix_size++] = '0';
-      prefix[prefix_size++] = spec.type();
-    }
-    unsigned num_digits = 0;
-    do {
-      ++num_digits;
-    } while ((n >>= 1) != 0);
-    Char *p = get(prepare_int_buffer(num_digits, spec, prefix, prefix_size));
-    n = abs_value;
-    do {
-      *p-- = static_cast<Char>('0' + (n & 1));
-    } while ((n >>= 1) != 0);
-    break;
-  }
-  case 'o': {
-    UnsignedType n = abs_value;
-    if (spec.flag(HASH_FLAG))
-      prefix[prefix_size++] = '0';
-    unsigned num_digits = 0;
-    do {
-      ++num_digits;
-    } while ((n >>= 3) != 0);
-    Char *p = get(prepare_int_buffer(num_digits, spec, prefix, prefix_size));
-    n = abs_value;
-    do {
-      *p-- = static_cast<Char>('0' + (n & 7));
-    } while ((n >>= 3) != 0);
-    break;
-  }
-  case 'n': {
-    unsigned num_digits = internal::count_digits(abs_value);
-    fmt::StringRef sep = std::localeconv()->thousands_sep;
-    unsigned size = static_cast<unsigned>(
-          num_digits + sep.size() * (num_digits - 1) / 3);
-    CharPtr p = prepare_int_buffer(size, spec, prefix, prefix_size) + 1;
-    internal::format_decimal(get(p), abs_value, 0, internal::ThousandsSep(sep));
-    break;
-  }
-  default:
-    internal::report_unknown_type(
-      spec.type(), spec.flag(CHAR_FLAG) ? "char" : "integer");
-    break;
-  }
-}
-
-template <typename Char>
-template <typename T>
-void BasicWriter<Char>::write_double(T value, const FormatSpec &spec) {
-  // Check type.
-  char type = spec.type();
-  bool upper = false;
-  switch (type) {
-  case 0:
-    type = 'g';
-    break;
-  case 'e': case 'f': case 'g': case 'a':
-    break;
-  case 'F':
-#ifdef _MSC_VER
-    // MSVC's printf doesn't support 'F'.
-    type = 'f';
-#endif
-    // Fall through.
-  case 'E': case 'G': case 'A':
-    upper = true;
-    break;
-  default:
-    internal::report_unknown_type(type, "double");
-    break;
-  }
-
-  char sign = 0;
-  // Use isnegative instead of value < 0 because the latter is always
-  // false for NaN.
-  if (internal::FPUtil::isnegative(static_cast<double>(value))) {
-    sign = '-';
-    value = -value;
-  } else if (spec.flag(SIGN_FLAG)) {
-    sign = spec.flag(PLUS_FLAG) ? '+' : ' ';
-  }
-
-  if (internal::FPUtil::isnotanumber(value)) {
-    // Format NaN ourselves because sprintf's output is not consistent
-    // across platforms.
-    std::size_t nan_size = 4;
-    const char *nan = upper ? " NAN" : " nan";
-    if (!sign) {
-      --nan_size;
-      ++nan;
-    }
-    CharPtr out = write_str(nan, nan_size, spec);
-    if (sign)
-      *out = sign;
-    return;
-  }
-
-  if (internal::FPUtil::isinfinity(value)) {
-    // Format infinity ourselves because sprintf's output is not consistent
-    // across platforms.
-    std::size_t inf_size = 4;
-    const char *inf = upper ? " INF" : " inf";
-    if (!sign) {
-      --inf_size;
-      ++inf;
-    }
-    CharPtr out = write_str(inf, inf_size, spec);
-    if (sign)
-      *out = sign;
-    return;
-  }
-
-  std::size_t offset = buffer_.size();
-  unsigned width = spec.width();
-  if (sign) {
-    buffer_.reserve(buffer_.size() + (width > 1u ? width : 1u));
-    if (width > 0)
-      --width;
-    ++offset;
-  }
-
-  // Build format string.
-  enum { MAX_FORMAT_SIZE = 10}; // longest format: %#-*.*Lg
-  Char format[MAX_FORMAT_SIZE];
-  Char *format_ptr = format;
-  *format_ptr++ = '%';
-  unsigned width_for_sprintf = width;
-  if (spec.flag(HASH_FLAG))
-    *format_ptr++ = '#';
-  if (spec.align() == ALIGN_CENTER) {
-    width_for_sprintf = 0;
-  } else {
-    if (spec.align() == ALIGN_LEFT)
-      *format_ptr++ = '-';
-    if (width != 0)
-      *format_ptr++ = '*';
-  }
-  if (spec.precision() >= 0) {
-    *format_ptr++ = '.';
-    *format_ptr++ = '*';
-  }
-
-  append_float_length(format_ptr, value);
-  *format_ptr++ = type;
-  *format_ptr = '\0';
-
-  // Format using snprintf.
-  Char fill = internal::CharTraits<Char>::cast(spec.fill());
-  unsigned n = 0;
-  Char *start = 0;
-  for (;;) {
-    std::size_t buffer_size = buffer_.capacity() - offset;
-#ifdef _MSC_VER
-    // MSVC's vsnprintf_s doesn't work with zero size, so reserve
-    // space for at least one extra character to make the size non-zero.
-    // Note that the buffer's capacity will increase by more than 1.
-    if (buffer_size == 0) {
-      buffer_.reserve(offset + 1);
-      buffer_size = buffer_.capacity() - offset;
-    }
-#endif
-    start = &buffer_[offset];
-    int result = internal::CharTraits<Char>::format_float(
-        start, buffer_size, format, width_for_sprintf, spec.precision(), value);
-    if (result >= 0) {
-      n = internal::to_unsigned(result);
-      if (offset + n < buffer_.capacity())
-        break;  // The buffer is large enough - continue with formatting.
-      buffer_.reserve(offset + n + 1);
-    } else {
-      // If result is negative we ask to increase the capacity by at least 1,
-      // but as std::vector, the buffer grows exponentially.
-      buffer_.reserve(buffer_.capacity() + 1);
-    }
-  }
-  if (sign) {
-    if ((spec.align() != ALIGN_RIGHT && spec.align() != ALIGN_DEFAULT) ||
-        *start != ' ') {
-      *(start - 1) = sign;
-      sign = 0;
-    } else {
-      *(start - 1) = fill;
-    }
-    ++n;
-  }
-  if (spec.align() == ALIGN_CENTER && spec.width() > n) {
-    width = spec.width();
-    CharPtr p = grow_buffer(width);
-    std::memmove(get(p) + (width - n) / 2, get(p), n * sizeof(Char));
-    fill_padding(p, spec.width(), n, fill);
-    return;
-  }
-  if (spec.fill() != ' ' || sign) {
-    while (*start == ' ')
-      *start++ = fill;
-    if (sign)
-      *(start - 1) = sign;
-  }
-  grow_buffer(n);
-}
-
-/**
-  \rst
-  This class template provides operations for formatting and writing data
-  into a character stream. The output is stored in a memory buffer that grows
-  dynamically.
-
-  You can use one of the following typedefs for common character types
-  and the standard allocator:
-
-  +---------------+-----------------------------------------------------+
-  | Type          | Definition                                          |
-  +===============+=====================================================+
-  | MemoryWriter  | BasicMemoryWriter<char, std::allocator<char>>       |
-  +---------------+-----------------------------------------------------+
-  | WMemoryWriter | BasicMemoryWriter<wchar_t, std::allocator<wchar_t>> |
-  +---------------+-----------------------------------------------------+
-
-  **Example**::
-
-     MemoryWriter out;
-     out << "The answer is " << 42 << "\n";
-     out.write("({:+f}, {:+f})", -3.14, 3.14);
-
-  This will write the following output to the ``out`` object:
-
-  .. code-block:: none
-
-     The answer is 42
-     (-3.140000, +3.140000)
-
-  The output can be converted to an ``std::string`` with ``out.str()`` or
-  accessed as a C string with ``out.c_str()``.
-  \endrst
- */
-template <typename Char, typename Allocator = std::allocator<Char> >
-class BasicMemoryWriter : public BasicWriter<Char> {
- private:
-  internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE, Allocator> buffer_;
-
- public:
-  explicit BasicMemoryWriter(const Allocator& alloc = Allocator())
-    : BasicWriter<Char>(buffer_), buffer_(alloc) {}
-
-#if FMT_USE_RVALUE_REFERENCES
-  /**
-    \rst
-    Constructs a :class:`fmt::BasicMemoryWriter` object moving the content
-    of the other object to it.
-    \endrst
-   */
-  BasicMemoryWriter(BasicMemoryWriter &&other)
-    : BasicWriter<Char>(buffer_), buffer_(std::move(other.buffer_)) {
-  }
-
-  /**
-    \rst
-    Moves the content of the other ``BasicMemoryWriter`` object to this one.
-    \endrst
-   */
-  BasicMemoryWriter &operator=(BasicMemoryWriter &&other) {
-    buffer_ = std::move(other.buffer_);
-    return *this;
-  }
-#endif
-};
-
-typedef BasicMemoryWriter<char> MemoryWriter;
-typedef BasicMemoryWriter<wchar_t> WMemoryWriter;
-
-/**
-  \rst
-  This class template provides operations for formatting and writing data
-  into a fixed-size array. For writing into a dynamically growing buffer
-  use :class:`fmt::BasicMemoryWriter`.
-
-  Any write method will throw ``std::runtime_error`` if the output doesn't fit
-  into the array.
-
-  You can use one of the following typedefs for common character types:
-
-  +--------------+---------------------------+
-  | Type         | Definition                |
-  +==============+===========================+
-  | ArrayWriter  | BasicArrayWriter<char>    |
-  +--------------+---------------------------+
-  | WArrayWriter | BasicArrayWriter<wchar_t> |
-  +--------------+---------------------------+
-  \endrst
- */
-template <typename Char>
-class BasicArrayWriter : public BasicWriter<Char> {
- private:
-  internal::FixedBuffer<Char> buffer_;
-
- public:
-  /**
-   \rst
-   Constructs a :class:`fmt::BasicArrayWriter` object for *array* of the
-   given size.
-   \endrst
-   */
-  BasicArrayWriter(Char *array, std::size_t size)
-    : BasicWriter<Char>(buffer_), buffer_(array, size) {}
-
-  /**
-   \rst
-   Constructs a :class:`fmt::BasicArrayWriter` object for *array* of the
-   size known at compile time.
-   \endrst
-   */
-  template <std::size_t SIZE>
-  explicit BasicArrayWriter(Char (&array)[SIZE])
-    : BasicWriter<Char>(buffer_), buffer_(array, SIZE) {}
-};
-
-typedef BasicArrayWriter<char> ArrayWriter;
-typedef BasicArrayWriter<wchar_t> WArrayWriter;
-
-// Reports a system error without throwing an exception.
-// Can be used to report errors from destructors.
-FMT_API void report_system_error(int error_code,
-                                 StringRef message) FMT_NOEXCEPT;
-
-#if FMT_USE_WINDOWS_H
-
-/** A Windows error. */
-class WindowsError : public SystemError {
- private:
-  FMT_API void init(int error_code, CStringRef format_str, ArgList args);
-
- public:
-  /**
-   \rst
-   Constructs a :class:`fmt::WindowsError` object with the description
-   of the form
-
-   .. parsed-literal::
-     *<message>*: *<system-message>*
-
-   where *<message>* is the formatted message and *<system-message>* is the
-   system message corresponding to the error code.
-   *error_code* is a Windows error code as given by ``GetLastError``.
-   If *error_code* is not a valid error code such as -1, the system message
-   will look like "error -1".
-
-   **Example**::
-
-     // This throws a WindowsError with the description
-     //   cannot open file 'madeup': The system cannot find the file specified.
-     // or similar (system message may vary).
-     const char *filename = "madeup";
-     LPOFSTRUCT of = LPOFSTRUCT();
-     HFILE file = OpenFile(filename, &of, OF_READ);
-     if (file == HFILE_ERROR) {
-       throw fmt::WindowsError(GetLastError(),
-                               "cannot open file '{}'", filename);
-     }
-   \endrst
-  */
-  WindowsError(int error_code, CStringRef message) {
-    init(error_code, message, ArgList());
-  }
-  FMT_VARIADIC_CTOR(WindowsError, init, int, CStringRef)
-};
-
-// Reports a Windows error without throwing an exception.
-// Can be used to report errors from destructors.
-FMT_API void report_windows_error(int error_code,
-                                  StringRef message) FMT_NOEXCEPT;
-
-#endif
-
-enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };
-
-/**
-  Formats a string and prints it to stdout using ANSI escape sequences
-  to specify color (experimental).
-  Example:
-    print_colored(fmt::RED, "Elapsed time: {0:.2f} seconds", 1.23);
- */
-FMT_API void print_colored(Color c, CStringRef format, ArgList args);
-
-/**
-  \rst
-  Formats arguments and returns the result as a string.
-
-  **Example**::
-
-    std::string message = format("The answer is {}", 42);
-  \endrst
-*/
-inline std::string format(CStringRef format_str, ArgList args) {
-  MemoryWriter w;
-  w.write(format_str, args);
-  return w.str();
-}
-
-inline std::wstring format(WCStringRef format_str, ArgList args) {
-  WMemoryWriter w;
-  w.write(format_str, args);
-  return w.str();
-}
-
-/**
-  \rst
-  Prints formatted data to the file *f*.
-
-  **Example**::
-
-    print(stderr, "Don't {}!", "panic");
-  \endrst
- */
-FMT_API void print(std::FILE *f, CStringRef format_str, ArgList args);
-
-/**
-  \rst
-  Prints formatted data to ``stdout``.
-
-  **Example**::
-
-    print("Elapsed time: {0:.2f} seconds", 1.23);
-  \endrst
- */
-FMT_API void print(CStringRef format_str, ArgList args);
-
-template <typename Char>
-void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args) {
-  internal::PrintfFormatter<Char>(args).format(w, format);
-}
-
-/**
-  \rst
-  Formats arguments and returns the result as a string.
-
-  **Example**::
-
-    std::string message = fmt::sprintf("The answer is %d", 42);
-  \endrst
-*/
-inline std::string sprintf(CStringRef format, ArgList args) {
-  MemoryWriter w;
-  printf(w, format, args);
-  return w.str();
-}
-
-inline std::wstring sprintf(WCStringRef format, ArgList args) {
-  WMemoryWriter w;
-  printf(w, format, args);
-  return w.str();
-}
-
-/**
-  \rst
-  Prints formatted data to the file *f*.
-
-  **Example**::
-
-    fmt::fprintf(stderr, "Don't %s!", "panic");
-  \endrst
- */
-FMT_API int fprintf(std::FILE *f, CStringRef format, ArgList args);
-
-/**
-  \rst
-  Prints formatted data to ``stdout``.
-
-  **Example**::
-
-    fmt::printf("Elapsed time: %.2f seconds", 1.23);
-  \endrst
- */
-inline int printf(CStringRef format, ArgList args) {
-  return fprintf(stdout, format, args);
-}
-
-/**
-  Fast integer formatter.
- */
-class FormatInt {
- private:
-  // Buffer should be large enough to hold all digits (digits10 + 1),
-  // a sign and a null character.
-  enum {BUFFER_SIZE = std::numeric_limits<ULongLong>::digits10 + 3};
-  mutable char buffer_[BUFFER_SIZE];
-  char *str_;
-
-  // Formats value in reverse and returns the number of digits.
-  char *format_decimal(ULongLong value) {
-    char *buffer_end = buffer_ + BUFFER_SIZE - 1;
-    while (value >= 100) {
-      // Integer division is slow so do it for a group of two digits instead
-      // of for every digit. The idea comes from the talk by Alexandrescu
-      // "Three Optimization Tips for C++". See speed-test for a comparison.
-      unsigned index = static_cast<unsigned>((value % 100) * 2);
-      value /= 100;
-      *--buffer_end = internal::Data::DIGITS[index + 1];
-      *--buffer_end = internal::Data::DIGITS[index];
-    }
-    if (value < 10) {
-      *--buffer_end = static_cast<char>('0' + value);
-      return buffer_end;
-    }
-    unsigned index = static_cast<unsigned>(value * 2);
-    *--buffer_end = internal::Data::DIGITS[index + 1];
-    *--buffer_end = internal::Data::DIGITS[index];
-    return buffer_end;
-  }
-
-  void FormatSigned(LongLong value) {
-    ULongLong abs_value = static_cast<ULongLong>(value);
-    bool negative = value < 0;
-    if (negative)
-      abs_value = 0 - abs_value;
-    str_ = format_decimal(abs_value);
-    if (negative)
-      *--str_ = '-';
-  }
-
- public:
-  explicit FormatInt(int value) { FormatSigned(value); }
-  explicit FormatInt(long value) { FormatSigned(value); }
-  explicit FormatInt(LongLong value) { FormatSigned(value); }
-  explicit FormatInt(unsigned value) : str_(format_decimal(value)) {}
-  explicit FormatInt(unsigned long value) : str_(format_decimal(value)) {}
-  explicit FormatInt(ULongLong value) : str_(format_decimal(value)) {}
-
-  /** Returns the number of characters written to the output buffer. */
-  std::size_t size() const {
-    return internal::to_unsigned(buffer_ - str_ + BUFFER_SIZE - 1);
-  }
-
-  /**
-    Returns a pointer to the output buffer content. No terminating null
-    character is appended.
-   */
-  const char *data() const { return str_; }
-
-  /**
-    Returns a pointer to the output buffer content with terminating null
-    character appended.
-   */
-  const char *c_str() const {
-    buffer_[BUFFER_SIZE - 1] = '\0';
-    return str_;
-  }
-
-  /**
-    \rst
-    Returns the content of the output buffer as an ``std::string``.
-    \endrst
-   */
-  std::string str() const { return std::string(str_, size()); }
-};
-
-// Formats a decimal integer value writing into buffer and returns
-// a pointer to the end of the formatted string. This function doesn't
-// write a terminating null character.
-template <typename T>
-inline void format_decimal(char *&buffer, T value) {
-  typedef typename internal::IntTraits<T>::MainType MainType;
-  MainType abs_value = static_cast<MainType>(value);
-  if (internal::is_negative(value)) {
-    *buffer++ = '-';
-    abs_value = 0 - abs_value;
-  }
-  if (abs_value < 100) {
-    if (abs_value < 10) {
-      *buffer++ = static_cast<char>('0' + abs_value);
-      return;
-    }
-    unsigned index = static_cast<unsigned>(abs_value * 2);
-    *buffer++ = internal::Data::DIGITS[index];
-    *buffer++ = internal::Data::DIGITS[index + 1];
-    return;
-  }
-  unsigned num_digits = internal::count_digits(abs_value);
-  internal::format_decimal(buffer, abs_value, num_digits);
-  buffer += num_digits;
-}
-
-/**
-  \rst
-  Returns a named argument for formatting functions.
-
-  **Example**::
-
-    print("Elapsed time: {s:.2f} seconds", arg("s", 1.23));
-
-  \endrst
- */
-template <typename T>
-inline internal::NamedArg<char> arg(StringRef name, const T &arg) {
-  return internal::NamedArg<char>(name, arg);
-}
-
-template <typename T>
-inline internal::NamedArg<wchar_t> arg(WStringRef name, const T &arg) {
-  return internal::NamedArg<wchar_t>(name, arg);
-}
-
-// The following two functions are deleted intentionally to disable
-// nested named arguments as in ``format("{}", arg("a", arg("b", 42)))``.
-template <typename Char>
-void arg(StringRef, const internal::NamedArg<Char>&) FMT_DELETED_OR_UNDEFINED;
-template <typename Char>
-void arg(WStringRef, const internal::NamedArg<Char>&) FMT_DELETED_OR_UNDEFINED;
-}
-
-#if FMT_GCC_VERSION
-// Use the system_header pragma to suppress warnings about variadic macros
-// because suppressing -Wvariadic-macros with the diagnostic pragma doesn't
-// work. It is used at the end because we want to suppress as little warnings
-// as possible.
-# pragma GCC system_header
-#endif
-
-// This is used to work around VC++ bugs in handling variadic macros.
-#define FMT_EXPAND(args) args
-
-// Returns the number of arguments.
-// Based on https://groups.google.com/forum/#!topic/comp.std.c/d-6Mj5Lko_s.
-#define FMT_NARG(...) FMT_NARG_(__VA_ARGS__, FMT_RSEQ_N())
-#define FMT_NARG_(...) FMT_EXPAND(FMT_ARG_N(__VA_ARGS__))
-#define FMT_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
-#define FMT_RSEQ_N() 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-
-#define FMT_CONCAT(a, b) a##b
-#define FMT_FOR_EACH_(N, f, ...) \
-  FMT_EXPAND(FMT_CONCAT(FMT_FOR_EACH, N)(f, __VA_ARGS__))
-#define FMT_FOR_EACH(f, ...) \
-  FMT_EXPAND(FMT_FOR_EACH_(FMT_NARG(__VA_ARGS__), f, __VA_ARGS__))
-
-#define FMT_ADD_ARG_NAME(type, index) type arg##index
-#define FMT_GET_ARG_NAME(type, index) arg##index
-
-#if FMT_USE_VARIADIC_TEMPLATES
-# define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \
-  template <typename... Args> \
-  ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__), \
-      const Args & ... args) { \
-    typedef fmt::internal::ArgArray<sizeof...(Args)> ArgArray; \
-    typename ArgArray::Type array{ \
-      ArgArray::template make<fmt::BasicFormatter<Char> >(args)...}; \
-    call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), \
-      fmt::ArgList(fmt::internal::make_type(args...), array)); \
-  }
-#else
-// Defines a wrapper for a function taking __VA_ARGS__ arguments
-// and n additional arguments of arbitrary types.
-# define FMT_WRAP(Char, ReturnType, func, call, n, ...) \
-  template <FMT_GEN(n, FMT_MAKE_TEMPLATE_ARG)> \
-  inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__), \
-      FMT_GEN(n, FMT_MAKE_ARG)) { \
-    fmt::internal::ArgArray<n>::Type arr; \
-    FMT_GEN(n, FMT_ASSIGN_##Char); \
-    call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList( \
-      fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), arr)); \
-  }
-
-# define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \
-  inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__)) { \
-    call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList()); \
-  } \
-  FMT_WRAP(Char, ReturnType, func, call, 1, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 2, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 3, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 4, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 5, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 6, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 7, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 8, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 9, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 10, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 11, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 12, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 13, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 14, __VA_ARGS__) \
-  FMT_WRAP(Char, ReturnType, func, call, 15, __VA_ARGS__)
-#endif  // FMT_USE_VARIADIC_TEMPLATES
-
-/**
-  \rst
-  Defines a variadic function with the specified return type, function name
-  and argument types passed as variable arguments to this macro.
-
-  **Example**::
-
-    void print_error(const char *file, int line, const char *format,
-                     fmt::ArgList args) {
-      fmt::print("{}: {}: ", file, line);
-      fmt::print(format, args);
-    }
-    FMT_VARIADIC(void, print_error, const char *, int, const char *)
-
-  ``FMT_VARIADIC`` is used for compatibility with legacy C++ compilers that
-  don't implement variadic templates. You don't have to use this macro if
-  you don't need legacy compiler support and can use variadic templates
-  directly::
-
-    template <typename... Args>
-    void print_error(const char *file, int line, const char *format,
-                     const Args & ... args) {
-      fmt::print("{}: {}: ", file, line);
-      fmt::print(format, args...);
-    }
-  \endrst
- */
-#define FMT_VARIADIC(ReturnType, func, ...) \
-  FMT_VARIADIC_(char, ReturnType, func, return func, __VA_ARGS__)
-
-#define FMT_VARIADIC_W(ReturnType, func, ...) \
-  FMT_VARIADIC_(wchar_t, ReturnType, func, return func, __VA_ARGS__)
-
-#define FMT_CAPTURE_ARG_(id, index) ::fmt::arg(#id, id)
-
-#define FMT_CAPTURE_ARG_W_(id, index) ::fmt::arg(L###id, id)
-
-/**
-  \rst
-  Convenient macro to capture the arguments' names and values into several
-  ``fmt::arg(name, value)``.
-
-  **Example**::
-
-    int x = 1, y = 2;
-    print("point: ({x}, {y})", FMT_CAPTURE(x, y));
-    // same as:
-    // print("point: ({x}, {y})", arg("x", x), arg("y", y));
-
-  \endrst
- */
-#define FMT_CAPTURE(...) FMT_FOR_EACH(FMT_CAPTURE_ARG_, __VA_ARGS__)
-
-#define FMT_CAPTURE_W(...) FMT_FOR_EACH(FMT_CAPTURE_ARG_W_, __VA_ARGS__)
-
-namespace fmt {
-FMT_VARIADIC(std::string, format, CStringRef)
-FMT_VARIADIC_W(std::wstring, format, WCStringRef)
-FMT_VARIADIC(void, print, CStringRef)
-FMT_VARIADIC(void, print, std::FILE *, CStringRef)
-
-FMT_VARIADIC(void, print_colored, Color, CStringRef)
-FMT_VARIADIC(std::string, sprintf, CStringRef)
-FMT_VARIADIC_W(std::wstring, sprintf, WCStringRef)
-FMT_VARIADIC(int, printf, CStringRef)
-FMT_VARIADIC(int, fprintf, std::FILE *, CStringRef)
-
-namespace internal {
-template <typename Char>
-inline bool is_name_start(Char c) {
-  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c;
-}
-
-// Parses an unsigned integer advancing s to the end of the parsed input.
-// This function assumes that the first character of s is a digit.
-template <typename Char>
-unsigned parse_nonnegative_int(const Char *&s) {
-  assert('0' <= *s && *s <= '9');
-  unsigned value = 0;
-  do {
-    unsigned new_value = value * 10 + (*s++ - '0');
-    // Check if value wrapped around.
-    if (new_value < value) {
-      value = (std::numeric_limits<unsigned>::max)();
-      break;
-    }
-    value = new_value;
-  } while ('0' <= *s && *s <= '9');
-  // Convert to unsigned to prevent a warning.
-  unsigned max_int = (std::numeric_limits<int>::max)();
-  if (value > max_int)
-    FMT_THROW(FormatError("number is too big"));
-  return value;
-}
-
-inline void require_numeric_argument(const Arg &arg, char spec) {
-  if (arg.type > Arg::LAST_NUMERIC_TYPE) {
-    std::string message =
-        fmt::format("format specifier '{}' requires numeric argument", spec);
-    FMT_THROW(fmt::FormatError(message));
-  }
-}
-
-template <typename Char>
-void check_sign(const Char *&s, const Arg &arg) {
-  char sign = static_cast<char>(*s);
-  require_numeric_argument(arg, sign);
-  if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) {
-    FMT_THROW(FormatError(fmt::format(
-      "format specifier '{}' requires signed argument", sign)));
-  }
-  ++s;
-}
-}  // namespace internal
-
-template <typename Char, typename AF>
-inline internal::Arg BasicFormatter<Char, AF>::get_arg(
-    BasicStringRef<Char> arg_name, const char *&error) {
-  if (check_no_auto_index(error)) {
-    map_.init(args());
-    const internal::Arg *arg = map_.find(arg_name);
-    if (arg)
-      return *arg;
-    error = "argument not found";
-  }
-  return internal::Arg();
-}
-
-template <typename Char, typename AF>
-inline internal::Arg BasicFormatter<Char, AF>::parse_arg_index(const Char *&s) {
-  const char *error = 0;
-  internal::Arg arg = *s < '0' || *s > '9' ?
-        next_arg(error) : get_arg(internal::parse_nonnegative_int(s), error);
-  if (error) {
-    FMT_THROW(FormatError(
-                *s != '}' && *s != ':' ? "invalid format string" : error));
-  }
-  return arg;
-}
-
-template <typename Char, typename AF>
-inline internal::Arg BasicFormatter<Char, AF>::parse_arg_name(const Char *&s) {
-  assert(internal::is_name_start(*s));
-  const Char *start = s;
-  Char c;
-  do {
-    c = *++s;
-  } while (internal::is_name_start(c) || ('0' <= c && c <= '9'));
-  const char *error = 0;
-  internal::Arg arg = get_arg(BasicStringRef<Char>(start, s - start), error);
-  if (error)
-    FMT_THROW(FormatError(error));
-  return arg;
-}
-
-template <typename Char, typename ArgFormatter>
-const Char *BasicFormatter<Char, ArgFormatter>::format(
-    const Char *&format_str, const internal::Arg &arg) {
-  using internal::Arg;
-  const Char *s = format_str;
-  FormatSpec spec;
-  if (*s == ':') {
-    if (arg.type == Arg::CUSTOM) {
-      arg.custom.format(this, arg.custom.value, &s);
-      return s;
-    }
-    ++s;
-    // Parse fill and alignment.
-    if (Char c = *s) {
-      const Char *p = s + 1;
-      spec.align_ = ALIGN_DEFAULT;
-      do {
-        switch (*p) {
-          case '<':
-            spec.align_ = ALIGN_LEFT;
-            break;
-          case '>':
-            spec.align_ = ALIGN_RIGHT;
-            break;
-          case '=':
-            spec.align_ = ALIGN_NUMERIC;
-            break;
-          case '^':
-            spec.align_ = ALIGN_CENTER;
-            break;
-        }
-        if (spec.align_ != ALIGN_DEFAULT) {
-          if (p != s) {
-            if (c == '}') break;
-            if (c == '{')
-              FMT_THROW(FormatError("invalid fill character '{'"));
-            s += 2;
-            spec.fill_ = c;
-          } else ++s;
-          if (spec.align_ == ALIGN_NUMERIC)
-            require_numeric_argument(arg, '=');
-          break;
-        }
-      } while (--p >= s);
-    }
-
-    // Parse sign.
-    switch (*s) {
-      case '+':
-        check_sign(s, arg);
-        spec.flags_ |= SIGN_FLAG | PLUS_FLAG;
-        break;
-      case '-':
-        check_sign(s, arg);
-        spec.flags_ |= MINUS_FLAG;
-        break;
-      case ' ':
-        check_sign(s, arg);
-        spec.flags_ |= SIGN_FLAG;
-        break;
-    }
-
-    if (*s == '#') {
-      require_numeric_argument(arg, '#');
-      spec.flags_ |= HASH_FLAG;
-      ++s;
-    }
-
-    // Parse zero flag.
-    if (*s == '0') {
-      require_numeric_argument(arg, '0');
-      spec.align_ = ALIGN_NUMERIC;
-      spec.fill_ = '0';
-      ++s;
-    }
-
-    // Parse width.
-    if ('0' <= *s && *s <= '9') {
-      spec.width_ = internal::parse_nonnegative_int(s);
-    } else if (*s == '{') {
-      ++s;
-      Arg width_arg = internal::is_name_start(*s) ?
-            parse_arg_name(s) : parse_arg_index(s);
-      if (*s++ != '}')
-        FMT_THROW(FormatError("invalid format string"));
-      ULongLong value = 0;
-      switch (width_arg.type) {
-      case Arg::INT:
-        if (width_arg.int_value < 0)
-          FMT_THROW(FormatError("negative width"));
-        value = width_arg.int_value;
-        break;
-      case Arg::UINT:
-        value = width_arg.uint_value;
-        break;
-      case Arg::LONG_LONG:
-        if (width_arg.long_long_value < 0)
-          FMT_THROW(FormatError("negative width"));
-        value = width_arg.long_long_value;
-        break;
-      case Arg::ULONG_LONG:
-        value = width_arg.ulong_long_value;
-        break;
-      default:
-        FMT_THROW(FormatError("width is not integer"));
-      }
-      if (value > (std::numeric_limits<int>::max)())
-        FMT_THROW(FormatError("number is too big"));
-      spec.width_ = static_cast<int>(value);
-    }
-
-    // Parse precision.
-    if (*s == '.') {
-      ++s;
-      spec.precision_ = 0;
-      if ('0' <= *s && *s <= '9') {
-        spec.precision_ = internal::parse_nonnegative_int(s);
-      } else if (*s == '{') {
-        ++s;
-        Arg precision_arg = internal::is_name_start(*s) ?
-              parse_arg_name(s) : parse_arg_index(s);
-        if (*s++ != '}')
-          FMT_THROW(FormatError("invalid format string"));
-        ULongLong value = 0;
-        switch (precision_arg.type) {
-          case Arg::INT:
-            if (precision_arg.int_value < 0)
-              FMT_THROW(FormatError("negative precision"));
-            value = precision_arg.int_value;
-            break;
-          case Arg::UINT:
-            value = precision_arg.uint_value;
-            break;
-          case Arg::LONG_LONG:
-            if (precision_arg.long_long_value < 0)
-              FMT_THROW(FormatError("negative precision"));
-            value = precision_arg.long_long_value;
-            break;
-          case Arg::ULONG_LONG:
-            value = precision_arg.ulong_long_value;
-            break;
-          default:
-            FMT_THROW(FormatError("precision is not integer"));
-        }
-        if (value > (std::numeric_limits<int>::max)())
-          FMT_THROW(FormatError("number is too big"));
-        spec.precision_ = static_cast<int>(value);
-      } else {
-        FMT_THROW(FormatError("missing precision specifier"));
-      }
-      if (arg.type <= Arg::LAST_INTEGER_TYPE || arg.type == Arg::POINTER) {
-        FMT_THROW(FormatError(
-            fmt::format("precision not allowed in {} format specifier",
-            arg.type == Arg::POINTER ? "pointer" : "integer")));
-      }
-    }
-
-    // Parse type.
-    if (*s != '}' && *s)
-      spec.type_ = static_cast<char>(*s++);
-  }
-
-  if (*s++ != '}')
-    FMT_THROW(FormatError("missing '}' in format string"));
-
-  // Format argument.
-  ArgFormatter(*this, spec, s - 1).visit(arg);
-  return s;
-}
-
-template <typename Char, typename AF>
-void BasicFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
-  const Char *s = format_str.c_str();
-  const Char *start = s;
-  while (*s) {
-    Char c = *s++;
-    if (c != '{' && c != '}') continue;
-    if (*s == c) {
-      write(writer_, start, s);
-      start = ++s;
-      continue;
-    }
-    if (c == '}')
-      FMT_THROW(FormatError("unmatched '}' in format string"));
-    write(writer_, start, s - 1);
-    internal::Arg arg = internal::is_name_start(*s) ?
-          parse_arg_name(s) : parse_arg_index(s);
-    start = s = format(s, arg);
-  }
-  write(writer_, start, s);
-}
-}  // namespace fmt
-
-#if FMT_USE_USER_DEFINED_LITERALS
-namespace fmt {
-namespace internal {
-
-template <typename Char>
-struct UdlFormat {
-  const Char *str;
-
-  template <typename... Args>
-  auto operator()(Args && ... args) const
-                  -> decltype(format(str, std::forward<Args>(args)...)) {
-    return format(str, std::forward<Args>(args)...);
-  }
-};
-
-template <typename Char>
-struct UdlArg {
-  const Char *str;
-
-  template <typename T>
-  NamedArg<Char> operator=(T &&value) const {
-    return {str, std::forward<T>(value)};
-  }
-};
-
-} // namespace internal
-
-inline namespace literals {
-
-/**
-  \rst
-  C++11 literal equivalent of :func:`fmt::format`.
-
-  **Example**::
-
-    using namespace fmt::literals;
-    std::string message = "The answer is {}"_format(42);
-  \endrst
- */
-inline internal::UdlFormat<char>
-operator"" _format(const char *s, std::size_t) { return {s}; }
-inline internal::UdlFormat<wchar_t>
-operator"" _format(const wchar_t *s, std::size_t) { return {s}; }
-
-/**
-  \rst
-  C++11 literal equivalent of :func:`fmt::arg`.
-
-  **Example**::
-
-    using namespace fmt::literals;
-    print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
-  \endrst
- */
-inline internal::UdlArg<char>
-operator"" _a(const char *s, std::size_t) { return {s}; }
-inline internal::UdlArg<wchar_t>
-operator"" _a(const wchar_t *s, std::size_t) { return {s}; }
-
-} // inline namespace literals
-} // namespace fmt
-#endif // FMT_USE_USER_DEFINED_LITERALS
-
-// Restore warnings.
-#if FMT_GCC_VERSION >= 406
-# pragma GCC diagnostic pop
-#endif
-
-#if defined(__clang__) && !defined(FMT_ICC_VERSION)
-# pragma clang diagnostic pop
-#endif
-
-#ifdef FMT_HEADER_ONLY
-# define FMT_FUNC inline
-# include "format.cc"
-#else
-# define FMT_FUNC
-#endif
-
-#endif  // FMT_FORMAT_H_

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/Info.plist Deleted

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AMIsApplet</key>
-	<true/>
-	<key>AMStayOpen</key>
-	<false/>
-	<key>BuildMachineOSBuild</key>
-	<string>13A563a</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>*</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Automator workflow file</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>****</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>Application Stub</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.automator.Uninstall</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Uninstall</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array/>
-	<key>CFBundleVersion</key>
-	<string>381</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>5A11344p</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>13A563a</string>
-	<key>DTSDKName</key>
-	<string></string>
-	<key>DTXcode</key>
-	<string>0500</string>
-	<key>DTXcodeBuild</key>
-	<string>5A11344p</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5</string>
-	<key>LSMinimumSystemVersionByArchitecture</key>
-	<dict>
-		<key>x86_64</key>
-		<string>10.6</string>
-	</dict>
-	<key>LSUIElement</key>
-	<true/>
-	<key>NSAppleScriptEnabled</key>
-	<string>YES</string>
-	<key>NSMainNibFile</key>
-	<string>ApplicationStub</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSServices</key>
-	<array/>
-	<key>UTExportedTypeDeclarations</key>
-	<array/>
-	<key>UTImportedTypeDeclarations</key>
-	<array/>
-</dict>
-</plist>

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/MacOS Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/MacOS/Application Stub Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/Resources Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/Resources/English.lproj Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/Resources/English.lproj/ApplicationStub.nib Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/Uninstall.app/Contents/document.wflow Deleted

@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AMApplicationBuild</key>
-	<string>381</string>
-	<key>AMApplicationVersion</key>
-	<string>2.4</string>
-	<key>AMDocumentVersion</key>
-	<string>2</string>
-	<key>actions</key>
-	<array>
-		<dict>
-			<key>action</key>
-			<dict>
-				<key>AMAccepts</key>
-				<dict>
-					<key>Container</key>
-					<string>List</string>
-					<key>Optional</key>
-					<true/>
-					<key>Types</key>
-					<array/>
-				</dict>
-				<key>AMActionVersion</key>
-				<string>1.0.2</string>
-				<key>AMApplication</key>
-				<array>
-					<string>Automator</string>
-				</array>
-				<key>AMParameterProperties</key>
-				<dict>
-					<key>affirmativeTitle</key>
-					<dict/>
-					<key>displayWarning</key>
-					<dict/>
-					<key>explanationText</key>
-					<dict/>
-					<key>negativeTitle</key>
-					<dict/>
-					<key>questionText</key>
-					<dict>
-						<key>tokenizedValue</key>
-						<array>
-							<string>Uninstall OBS Browser Plugin</string>
-						</array>
-					</dict>
-				</dict>
-				<key>AMProvides</key>
-				<dict>
-					<key>Container</key>
-					<string>List</string>
-					<key>Types</key>
-					<array/>
-				</dict>
-				<key>ActionBundlePath</key>
-				<string>/System/Library/Automator/Ask for Confirmation.action</string>
-				<key>ActionName</key>
-				<string>Ask for Confirmation</string>
-				<key>ActionParameters</key>
-				<dict>
-					<key>affirmativeTitle</key>
-					<string>Uninstall</string>
-					<key>displayWarning</key>
-					<false/>
-					<key>explanationText</key>
-					<string>Are you sure you want to uninstall the OBS Browser Plugin?
-
-Uninstaller actions:
-  * Forget the package (pkgutil —forget)
-  * Delete ~/Library/Application Support/obs-studio/plugins/obs-browser</string>
-					<key>negativeTitle</key>
-					<string>Cancel</string>
-					<key>questionText</key>
-					<string>Uninstall OBS Browser Plugin</string>
-				</dict>
-				<key>BundleIdentifier</key>
-				<string>com.apple.Automator.Ask for Confirmation</string>
-				<key>CFBundleVersion</key>
-				<string>1.0.2</string>
-				<key>CanShowSelectedItemsWhenRun</key>
-				<true/>
-				<key>CanShowWhenRun</key>
-				<false/>
-				<key>Category</key>
-				<array>
-					<string>AMCategoryUtilities</string>
-				</array>
-				<key>Class Name</key>
-				<string>AMAskForConfirmationAction</string>
-				<key>InputUUID</key>
-				<string>46AEAE3D-C928-4E77-B42A-D340E65FFF80</string>
-				<key>Keywords</key>
-				<array>
-					<string>Message</string>
-					<string>Ask</string>
-					<string>Display</string>
-					<string>Prompt</string>
-					<string>Show</string>
-				</array>
-				<key>OutputUUID</key>
-				<string>DEB7B685-0E4F-46FD-B76F-F3D38B30BF70</string>
-				<key>UUID</key>
-				<string>A0D2FA32-458D-4B9B-A6AE-B4128CFD3871</string>
-				<key>UnlocalizedApplications</key>
-				<array>
-					<string>Automator</string>
-				</array>
-				<key>arguments</key>
-				<dict>
-					<key>0</key>
-					<dict>
-						<key>default value</key>
-						<string></string>
-						<key>name</key>
-						<string>questionText</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>0</string>
-					</dict>
-					<key>1</key>
-					<dict>
-						<key>default value</key>
-						<false/>
-						<key>name</key>
-						<string>displayWarning</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>1</string>
-					</dict>
-					<key>2</key>
-					<dict>
-						<key>default value</key>
-						<string></string>
-						<key>name</key>
-						<string>explanationText</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>2</string>
-					</dict>
-					<key>3</key>
-					<dict>
-						<key>default value</key>
-						<string>OK</string>
-						<key>name</key>
-						<string>affirmativeTitle</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>3</string>
-					</dict>
-					<key>4</key>
-					<dict>
-						<key>default value</key>
-						<string>Cancel</string>
-						<key>name</key>
-						<string>negativeTitle</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>4</string>
-					</dict>
-				</dict>
-				<key>isViewVisible</key>
-				<true/>
-				<key>location</key>
-				<string>1089.500000:1090.000000</string>
-				<key>nibPath</key>
-				<string>/System/Library/Automator/Ask for Confirmation.action/Contents/Resources/English.lproj/main.nib</string>
-			</dict>
-			<key>isViewVisible</key>
-			<true/>
-		</dict>
-		<dict>
-			<key>action</key>
-			<dict>
-				<key>AMAccepts</key>
-				<dict>
-					<key>Container</key>
-					<string>List</string>
-					<key>Optional</key>
-					<true/>
-					<key>Types</key>
-					<array>
-						<string>com.apple.applescript.object</string>
-					</array>
-				</dict>
-				<key>AMActionVersion</key>
-				<string>1.0.2</string>
-				<key>AMApplication</key>
-				<array>
-					<string>Automator</string>
-				</array>
-				<key>AMParameterProperties</key>
-				<dict>
-					<key>source</key>
-					<dict/>
-				</dict>
-				<key>AMProvides</key>
-				<dict>
-					<key>Container</key>
-					<string>List</string>
-					<key>Types</key>
-					<array>
-						<string>com.apple.applescript.object</string>
-					</array>
-				</dict>
-				<key>ActionBundlePath</key>
-				<string>/System/Library/Automator/Run AppleScript.action</string>
-				<key>ActionName</key>
-				<string>Run AppleScript</string>
-				<key>ActionParameters</key>
-				<dict>
-					<key>source</key>
-					<string>on run {input, parameters}
	
	try
		do shell script "pkgutil --volume ~ --forget org.catchexception.obs-browser"
	end try
	
	do shell script "rm -rf ~/Library/Application\\ Support/obs-studio/plugins/obs-browser"
	
	return input
end run</string>
-				</dict>
-				<key>BundleIdentifier</key>
-				<string>com.apple.Automator.RunScript</string>
-				<key>CFBundleVersion</key>
-				<string>1.0.2</string>
-				<key>CanShowSelectedItemsWhenRun</key>
-				<false/>
-				<key>CanShowWhenRun</key>
-				<true/>
-				<key>Category</key>
-				<array>
-					<string>AMCategoryUtilities</string>
-				</array>
-				<key>Class Name</key>
-				<string>RunScriptAction</string>
-				<key>InputUUID</key>
-				<string>B123E45E-5466-4D99-8AF9-B086A96E35C0</string>
-				<key>Keywords</key>
-				<array>
-					<string>Run</string>
-				</array>
-				<key>OutputUUID</key>
-				<string>105179FE-5E58-4944-BE3F-8AABE3836901</string>
-				<key>UUID</key>
-				<string>7E2BCAA2-DCAD-46EE-A210-64C2E3A4D5E2</string>
-				<key>UnlocalizedApplications</key>
-				<array>
-					<string>Automator</string>
-				</array>
-				<key>arguments</key>
-				<dict>
-					<key>0</key>
-					<dict>
-						<key>default value</key>
-						<string>on run {input, parameters}
-	
-	(* Your script goes here *)
-	
-	return input
-end run</string>
-						<key>name</key>
-						<string>source</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>0</string>
-					</dict>
-				</dict>
-				<key>conversionLabel</key>
-				<integer>0</integer>
-				<key>isViewVisible</key>
-				<true/>
-				<key>location</key>
-				<string>1089.500000:893.000000</string>
-				<key>nibPath</key>
-				<string>/System/Library/Automator/Run AppleScript.action/Contents/Resources/English.lproj/main.nib</string>
-			</dict>
-			<key>isViewVisible</key>
-			<true/>
-		</dict>
-		<dict>
-			<key>action</key>
-			<dict>
-				<key>AMAccepts</key>
-				<dict>
-					<key>Container</key>
-					<string>List</string>
-					<key>Optional</key>
-					<true/>
-					<key>Types</key>
-					<array/>
-				</dict>
-				<key>AMActionVersion</key>
-				<string>1.0</string>
-				<key>AMApplication</key>
-				<array>
-					<string>Automator</string>
-				</array>
-				<key>AMParameterProperties</key>
-				<dict>
-					<key>message</key>
-					<dict/>
-					<key>subtitle</key>
-					<dict/>
-					<key>title</key>
-					<dict>
-						<key>tokenizedValue</key>
-						<array>
-							<string>OBS Browser Plugin uninstalled</string>
-						</array>
-					</dict>
-				</dict>
-				<key>AMProvides</key>
-				<dict>
-					<key>Container</key>
-					<string>List</string>
-					<key>Types</key>
-					<array/>
-				</dict>
-				<key>ActionBundlePath</key>
-				<string>/System/Library/Automator/Display Notification.action</string>
-				<key>ActionName</key>
-				<string>Display Notification</string>
-				<key>ActionParameters</key>
-				<dict>
-					<key>message</key>
-					<string></string>
-					<key>subtitle</key>
-					<string></string>
-					<key>title</key>
-					<string>OBS Browser Plugin uninstalled</string>
-				</dict>
-				<key>BundleIdentifier</key>
-				<string>com.apple.Automator.Display-Notification</string>
-				<key>CFBundleVersion</key>
-				<string>1.0</string>
-				<key>CanShowSelectedItemsWhenRun</key>
-				<true/>
-				<key>CanShowWhenRun</key>
-				<false/>
-				<key>Category</key>
-				<array>
-					<string>AMCategoryUtilities</string>
-				</array>
-				<key>Class Name</key>
-				<string>AMDisplayNotificationAction</string>
-				<key>InputUUID</key>
-				<string>29F40CE4-DED9-471B-B4FF-AE6BDC630CA1</string>
-				<key>Keywords</key>
-				<array/>
-				<key>OutputUUID</key>
-				<string>668D0124-39EF-484A-8D74-53D03E0232C3</string>
-				<key>UUID</key>
-				<string>BC24E59E-4A42-4744-B54C-C9A87BE0FE88</string>
-				<key>UnlocalizedApplications</key>
-				<array>
-					<string>Automator</string>
-				</array>
-				<key>arguments</key>
-				<dict>
-					<key>0</key>
-					<dict>
-						<key>default value</key>
-						<string></string>
-						<key>name</key>
-						<string>subtitle</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>0</string>
-					</dict>
-					<key>1</key>
-					<dict>
-						<key>default value</key>
-						<string></string>
-						<key>name</key>
-						<string>title</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>1</string>
-					</dict>
-					<key>2</key>
-					<dict>
-						<key>default value</key>
-						<string></string>
-						<key>name</key>
-						<string>message</string>
-						<key>required</key>
-						<string>0</string>
-						<key>type</key>
-						<string>0</string>
-						<key>uuid</key>
-						<string>2</string>
-					</dict>
-				</dict>
-				<key>conversionLabel</key>
-				<integer>0</integer>
-				<key>isViewVisible</key>
-				<true/>
-				<key>location</key>
-				<string>1089.500000:400.000000</string>
-				<key>nibPath</key>
-				<string>/System/Library/Automator/Display Notification.action/Contents/Resources/Base.lproj/main.nib</string>
-			</dict>
-			<key>isViewVisible</key>
-			<true/>
-		</dict>
-	</array>
-	<key>connectors</key>
-	<dict>
-		<key>D2D1EE49-E4B4-4DBE-AFD9-33B67803833D</key>
-		<dict>
-			<key>from</key>
-			<string>7E2BCAA2-DCAD-46EE-A210-64C2E3A4D5E2 - 7E2BCAA2-DCAD-46EE-A210-64C2E3A4D5E2</string>
-			<key>to</key>
-			<string>BC24E59E-4A42-4744-B54C-C9A87BE0FE88 - BC24E59E-4A42-4744-B54C-C9A87BE0FE88</string>
-		</dict>
-		<key>FA88613E-9255-459F-89AA-F040F20641B0</key>
-		<dict>
-			<key>from</key>
-			<string>A0D2FA32-458D-4B9B-A6AE-B4128CFD3871 - A0D2FA32-458D-4B9B-A6AE-B4128CFD3871</string>
-			<key>to</key>
-			<string>7E2BCAA2-DCAD-46EE-A210-64C2E3A4D5E2 - 7E2BCAA2-DCAD-46EE-A210-64C2E3A4D5E2</string>
-		</dict>
-	</dict>
-	<key>workflowMetaData</key>
-	<dict>
-		<key>workflowTypeIdentifier</key>
-		<string>com.apple.Automator.application</string>
-	</dict>
-</dict>
-</plist>

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/gpl.txt Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/logo.png Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/obs-browser-install.pkgproj Deleted

@@ -1,989 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PACKAGES</key>
-	<array>
-		<dict>
-			<key>PACKAGE_FILES</key>
-			<dict>
-				<key>DEFAULT_INSTALL_LOCATION</key>
-				<string>/</string>
-				<key>HIERARCHY</key>
-				<dict>
-					<key>CHILDREN</key>
-					<array>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Utilities</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>80</integer>
-							<key>PATH</key>
-							<string>Applications</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>509</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array>
-										<dict>
-											<key>CHILDREN</key>
-											<array>
-												<dict>
-													<key>CHILDREN</key>
-													<array>
-														<dict>
-															<key>CHILDREN</key>
-															<array>
-																<dict>
-																	<key>CHILDREN</key>
-																	<array>
-																		<dict>
-																			<key>CHILDREN</key>
-																			<array/>
-																			<key>GID</key>
-																			<integer>80</integer>
-																			<key>PATH</key>
-																			<string>../../../../build/plugins/obs-browser/CEF.app</string>
-																			<key>PATH_TYPE</key>
-																			<integer>3</integer>
-																			<key>PERMISSIONS</key>
-																			<integer>493</integer>
-																			<key>TYPE</key>
-																			<integer>3</integer>
-																			<key>UID</key>
-																			<integer>0</integer>
-																		</dict>
-																		<dict>
-																			<key>CHILDREN</key>
-																			<array/>
-																			<key>GID</key>
-																			<integer>80</integer>
-																			<key>PATH</key>
-																			<string>../../../../build/plugins/obs-browser/obs-browser.so</string>
-																			<key>PATH_TYPE</key>
-																			<integer>3</integer>
-																			<key>PERMISSIONS</key>
-																			<integer>493</integer>
-																			<key>TYPE</key>
-																			<integer>3</integer>
-																			<key>UID</key>
-																			<integer>0</integer>
-																		</dict>
-																	</array>
-																	<key>GID</key>
-																	<integer>80</integer>
-																	<key>PATH</key>
-																	<string>bin</string>
-																	<key>PATH_TYPE</key>
-																	<integer>0</integer>
-																	<key>PERMISSIONS</key>
-																	<integer>493</integer>
-																	<key>TYPE</key>
-																	<integer>2</integer>
-																	<key>UID</key>
-																	<integer>0</integer>
-																</dict>
-															</array>
-															<key>GID</key>
-															<integer>80</integer>
-															<key>PATH</key>
-															<string>obs-browser</string>
-															<key>PATH_TYPE</key>
-															<integer>0</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>2</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-													</array>
-													<key>GID</key>
-													<integer>80</integer>
-													<key>PATH</key>
-													<string>plugins</string>
-													<key>PATH_TYPE</key>
-													<integer>0</integer>
-													<key>PERMISSIONS</key>
-													<integer>493</integer>
-													<key>TYPE</key>
-													<integer>2</integer>
-													<key>UID</key>
-													<integer>0</integer>
-												</dict>
-											</array>
-											<key>GID</key>
-											<integer>80</integer>
-											<key>PATH</key>
-											<string>obs-studio</string>
-											<key>PATH_TYPE</key>
-											<integer>0</integer>
-											<key>PERMISSIONS</key>
-											<integer>493</integer>
-											<key>TYPE</key>
-											<integer>2</integer>
-											<key>UID</key>
-											<integer>0</integer>
-										</dict>
-									</array>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Application Support</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Documentation</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Filesystems</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Frameworks</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Input Methods</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Internet Plug-Ins</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>LaunchAgents</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>LaunchDaemons</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>PreferencePanes</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Preferences</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Printers</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>PrivilegedHelperTools</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>QuickLook</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>QuickTime</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Screen Savers</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Scripts</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Services</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Widgets</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>0</integer>
-							<key>PATH</key>
-							<string>Library</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array>
-										<dict>
-											<key>CHILDREN</key>
-											<array/>
-											<key>GID</key>
-											<integer>0</integer>
-											<key>PATH</key>
-											<string>Extensions</string>
-											<key>PATH_TYPE</key>
-											<integer>0</integer>
-											<key>PERMISSIONS</key>
-											<integer>493</integer>
-											<key>TYPE</key>
-											<integer>1</integer>
-											<key>UID</key>
-											<integer>0</integer>
-										</dict>
-									</array>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Library</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>0</integer>
-							<key>PATH</key>
-							<string>System</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Shared</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>1023</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>80</integer>
-							<key>PATH</key>
-							<string>Users</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>GID</key>
-					<integer>0</integer>
-					<key>PATH</key>
-					<string>/</string>
-					<key>PATH_TYPE</key>
-					<integer>0</integer>
-					<key>PERMISSIONS</key>
-					<integer>493</integer>
-					<key>TYPE</key>
-					<integer>1</integer>
-					<key>UID</key>
-					<integer>0</integer>
-				</dict>
-				<key>PAYLOAD_TYPE</key>
-				<integer>0</integer>
-				<key>VERSION</key>
-				<integer>2</integer>
-			</dict>
-			<key>PACKAGE_SCRIPTS</key>
-			<dict>
-				<key>RESOURCES</key>
-				<array/>
-			</dict>
-			<key>PACKAGE_SETTINGS</key>
-			<dict>
-				<key>AUTHENTICATION</key>
-				<false/>
-				<key>CONCLUSION_ACTION</key>
-				<integer>0</integer>
-				<key>IDENTIFIER</key>
-				<string>org.catchexception.obs-browser</string>
-				<key>NAME</key>
-				<string>obs-browser-install</string>
-				<key>OVERWRITE_PERMISSIONS</key>
-				<false/>
-				<key>VERSION</key>
-				<string>1.0</string>
-			</dict>
-			<key>UUID</key>
-			<string>903F543B-DCA1-48CE-8C60-5A24889DED85</string>
-		</dict>
-	</array>
-	<key>PROJECT</key>
-	<dict>
-		<key>PROJECT_COMMENTS</key>
-		<dict>
-			<key>NOTES</key>
-			<data>
-			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
-			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
-			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
-			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
-			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
-			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
-			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
-			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
-			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuNzYiPgo8c3R5bGUg
-			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
-			Pgo8L2JvZHk+CjwvaHRtbD4K
-			</data>
-		</dict>
-		<key>PROJECT_PRESENTATION</key>
-		<dict>
-			<key>BACKGROUND</key>
-			<dict>
-				<key>ALIGNMENT</key>
-				<integer>7</integer>
-				<key>BACKGROUND_PATH</key>
-				<dict>
-					<key>PATH</key>
-					<string>logo.png</string>
-					<key>PATH_TYPE</key>
-					<integer>1</integer>
-				</dict>
-				<key>CUSTOM</key>
-				<integer>1</integer>
-				<key>SCALING</key>
-				<integer>0</integer>
-			</dict>
-			<key>INSTALLATION TYPE</key>
-			<dict>
-				<key>HIERARCHIES</key>
-				<dict>
-					<key>INSTALLER</key>
-					<dict>
-						<key>LIST</key>
-						<array>
-							<dict>
-								<key>DESCRIPTION</key>
-								<array/>
-								<key>OPTIONS</key>
-								<dict>
-									<key>HIDDEN</key>
-									<false/>
-									<key>STATE</key>
-									<integer>1</integer>
-								</dict>
-								<key>PACKAGE_UUID</key>
-								<string>903F543B-DCA1-48CE-8C60-5A24889DED85</string>
-								<key>REQUIREMENTS</key>
-								<array/>
-								<key>TITLE</key>
-								<array>
-									<dict>
-										<key>LANGUAGE</key>
-										<string>English</string>
-										<key>VALUE</key>
-										<string>OBS Studio Browser Plugin</string>
-									</dict>
-								</array>
-								<key>TOOLTIP</key>
-								<array/>
-								<key>TYPE</key>
-								<integer>0</integer>
-								<key>UUID</key>
-								<string>32074DAC-F666-424B-9B94-20F750104525</string>
-							</dict>
-						</array>
-						<key>REMOVED</key>
-						<dict/>
-					</dict>
-				</dict>
-				<key>INSTALLATION TYPE</key>
-				<integer>0</integer>
-				<key>MODE</key>
-				<integer>1</integer>
-			</dict>
-			<key>INSTALLATION_STEPS</key>
-			<array>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewIntroductionController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Introduction</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewReadMeController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>ReadMe</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewLicenseController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>License</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewDestinationSelectController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>TargetSelect</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewInstallationTypeController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>PackageSelection</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewInstallationController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Install</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewSummaryController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Summary</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-			</array>
-			<key>INTRODUCTION</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-			<key>LICENSE</key>
-			<dict>
-				<key>KEYWORDS</key>
-				<dict/>
-				<key>LOCALIZATIONS</key>
-				<array>
-					<dict>
-						<key>LANGUAGE</key>
-						<string>English</string>
-						<key>VALUE</key>
-						<dict>
-							<key>PATH</key>
-							<string>gpl.txt</string>
-							<key>PATH_TYPE</key>
-							<integer>1</integer>
-						</dict>
-					</dict>
-				</array>
-				<key>MODE</key>
-				<integer>0</integer>
-				<key>TEMPLATE</key>
-				<string>APSL License</string>
-			</dict>
-			<key>README</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array>
-					<dict>
-						<key>LANGUAGE</key>
-						<string>English</string>
-						<key>VALUE</key>
-						<dict>
-							<key>PATH</key>
-							<string>readme.rtf</string>
-							<key>PATH_TYPE</key>
-							<integer>1</integer>
-						</dict>
-					</dict>
-				</array>
-			</dict>
-			<key>TITLE</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array>
-					<dict>
-						<key>LANGUAGE</key>
-						<string>English</string>
-						<key>VALUE</key>
-						<string>OBS Studio Browser Plugin</string>
-					</dict>
-				</array>
-			</dict>
-		</dict>
-		<key>PROJECT_REQUIREMENTS</key>
-		<dict>
-			<key>LIST</key>
-			<array/>
-			<key>POSTINSTALL_PATH</key>
-			<dict/>
-			<key>PREINSTALL_PATH</key>
-			<dict/>
-			<key>RESOURCES</key>
-			<array/>
-			<key>ROOT_VOLUME_ONLY</key>
-			<true/>
-		</dict>
-		<key>PROJECT_SETTINGS</key>
-		<dict>
-			<key>ADVANCED_OPTIONS</key>
-			<dict>
-				<key>installer-script.domains:enable_currentUserHome</key>
-				<true/>
-			</dict>
-			<key>BUILD_FORMAT</key>
-			<integer>0</integer>
-			<key>BUILD_PATH</key>
-			<dict>
-				<key>PATH</key>
-				<string>build</string>
-				<key>PATH_TYPE</key>
-				<integer>3</integer>
-			</dict>
-			<key>EXCLUDED_FILES</key>
-			<array>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.DS_Store</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove .DS_Store files</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove ".DS_Store" files created by the Finder.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.pbdevelopment</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove .pbdevelopment files</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>CVS</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.cvsignore</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.cvspass</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.svn</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.git</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.gitignore</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove SCM metadata</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>classes.nib</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>designable.db</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>info.nib</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Optimize nib files</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>Resources Disabled</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove Resources Disabled folders</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove "Resources Disabled" folders.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>SEPARATOR</key>
-					<true/>
-				</dict>
-			</array>
-			<key>NAME</key>
-			<string>obs-browser-install</string>
-		</dict>
-	</dict>
-	<key>TYPE</key>
-	<integer>0</integer>
-	<key>VERSION</key>
-	<integer>2</integer>
-</dict>
-</plist>

obs-studio-21.1.2.tar.xz/plugins/obs-browser/install/osx/readme.rtf Deleted

@@ -1,20 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
-\margl1440\margr1440\vieww10800\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
-
-\f0\b\fs24 \cf0 OBS Studio Browser Source Plugin\
-\
-
-\b0 This plugin allows you to add a browser element to your scene.\
-\
-Features include:\
-\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural
-\ls1\ilvl0\cf0 {\listtext	\'95	}<video> tag support\
-{\listtext	\'95	}<audio> tag support\
-{\listtext	\'95	}Accelerated webgl\
-{\listtext	\'95	}Flash\
-}
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/args.hpp Deleted

@@ -1,167 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_ARGS_HPP_INCLUDED
-#define NOWIDE_ARGS_HPP_INCLUDED
-
-#include <nowide/config.hpp>
-#include <nowide/stackstring.hpp>
-#include <vector>
-#ifdef NOWIDE_WINDOWS
-#include <nowide/windows.hpp>
-#endif
-
-
-namespace nowide {
-    #if !defined(NOWIDE_WINDOWS) && !defined(NOWIDE_DOXYGEN)
-    class args {
-    public:
-        args(int &,char **&) {}
-        args(int &,char **&,char **&){}
-        ~args() {}
-    };
-
-    #else
-
-    ///
-    /// \brief args is a class that fixes standard main() function arguments and changes them to UTF-8 under 
-    /// Microsoft Windows.
-    ///
-    /// The class uses \c GetCommandLineW(), \c CommandLineToArgvW() and \c GetEnvironmentStringsW()
-    /// in order to obtain the information. It does not relates to actual values of argc,argv and env
-    /// under Windows.
-    ///
-    /// It restores the original values in its destructor
-    ///
-    /// \note the class owns the memory of the newly allocated strings
-    ///
-    class args {
-    public:
-        
-        ///
-        /// Fix command line agruments 
-        ///
-        args(int &argc,char **&argv) :
-            old_argc_(argc),
-            old_argv_(argv),
-            old_env_(0),
-            old_argc_ptr_(&argc),
-            old_argv_ptr_(&argv),
-            old_env_ptr_(0)
-        {
-            fix_args(argc,argv);
-        }
-        ///
-        /// Fix command line agruments and environment
-        ///
-        args(int &argc,char **&argv,char **&en) :
-            old_argc_(argc),
-            old_argv_(argv),
-            old_env_(en),
-            old_argc_ptr_(&argc),
-            old_argv_ptr_(&argv),
-            old_env_ptr_(&en)
-        {
-            fix_args(argc,argv);
-            fix_env(en);
-        }
-        ///
-        /// Restore original argc,argv,env values, if changed
-        ///
-        ~args()
-        {
-            if(old_argc_ptr_)
-                *old_argc_ptr_ = old_argc_;
-            if(old_argv_ptr_)
-                *old_argv_ptr_ = old_argv_;
-            if(old_env_ptr_) 
-                *old_env_ptr_ = old_env_;
-        }
-    private:    
-        void fix_args(int &argc,char **&argv)
-        {
-                int wargc;
-                wchar_t **wargv = CommandLineToArgvW(GetCommandLineW(),&wargc);
-            if(!wargv) {
-                argc = 0;
-                static char *dummy = 0;
-                argv = &dummy;
-                return;
-            }
-            try{ 
-                args_.resize(wargc+1,0);
-                arg_values_.resize(wargc);
-                for(int i=0;i<wargc;i++) {
-                    if(!arg_values_[i].convert(wargv[i])) {
-                        wargc = i;
-                        break;
-                    }
-                    args_[i] = arg_values_[i].c_str();
-                }
-                argc = wargc;
-                argv = &args_[0];
-            }
-            catch(...) {
-                LocalFree(wargv);
-                throw;
-            }
-            LocalFree(wargv);
-        }
-        void fix_env(char **&en)
-        {
-            static char *dummy = 0;
-            en = &dummy;
-            wchar_t *wstrings = GetEnvironmentStringsW();
-            if(!wstrings)
-                return;
-            try {
-                wchar_t *wstrings_end = 0;
-                int count = 0;
-                for(wstrings_end = wstrings;*wstrings_end;wstrings_end+=wcslen(wstrings_end)+1)
-                        count++;
-                if(env_.convert(wstrings,wstrings_end)) {
-                    envp_.resize(count+1,0);
-                    char *p=env_.c_str();
-                    int pos = 0;
-                    for(int i=0;i<count;i++) {
-                        if(*p!='=')
-                            envp_[pos++] = p;
-                        p+=strlen(p)+1;
-                    }
-                    en = &envp_[0];
-                }
-            }
-            catch(...) {
-                FreeEnvironmentStringsW(wstrings);
-                throw;
-            }
-            FreeEnvironmentStringsW(wstrings);
-
-        }
-
-        std::vector<char *> args_;
-        std::vector<short_stackstring> arg_values_;
-        stackstring env_;
-        std::vector<char *> envp_;
-
-        int old_argc_;
-        char **old_argv_;
-        char **old_env_;
-
-        int  *old_argc_ptr_;
-        char ***old_argv_ptr_;
-        char ***old_env_ptr_;
-    };
-
-    #endif
-
-} // nowide
-
-#endif
-
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/cenv.hpp Deleted

@@ -1,126 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_CENV_H_INCLUDED
-#define NOWIDE_CENV_H_INCLUDED
-
-#include <string>
-#include <stdexcept>
-#include <stdlib.h>
-#include <nowide/config.hpp>
-#include <nowide/stackstring.hpp>
-#include <vector>
-
-#ifdef NOWIDE_WINDOWS
-#include <nowide/windows.hpp>
-#endif
-
-
-namespace nowide {
-    #if !defined(NOWIDE_WINDOWS) && !defined(NOWIDE_DOXYGEN)
-    using ::getenv;
-    using ::setenv;
-    using ::unsetenv;
-    using ::putenv;
-    #else
-    ///
-    /// \brief UTF-8 aware getenv. Returns 0 if the variable is not set.
-    ///
-    /// This function is not thread safe or reenterable as defined by the standard library
-    ///
-    inline char *getenv(char const *key)
-    {
-        static stackstring value;
-        
-        wshort_stackstring name;
-        if(!name.convert(key))
-            return 0;
-
-        static const size_t buf_size = 64;
-        wchar_t buf[buf_size];
-        std::vector<wchar_t> tmp;
-        wchar_t *ptr = buf;
-        size_t n = GetEnvironmentVariableW(name.c_str(),buf,buf_size);
-        if(n == 0 && GetLastError() == 203) // ERROR_ENVVAR_NOT_FOUND
-            return 0;
-        if(n >= buf_size) {
-            tmp.resize(n+1,L'\0');
-            n = GetEnvironmentVariableW(name.c_str(),&tmp[0],static_cast<unsigned>(tmp.size() - 1));
-            // The size may have changed
-            if(n >= tmp.size() - 1)
-                return 0;
-            ptr = &tmp[0];
-        }
-        if(!value.convert(ptr))
-            return 0;
-        return value.c_str();
-    }
-    ///
-    /// \brief  UTF-8 aware setenv, \a key - the variable name, \a value is a new UTF-8 value,
-    /// 
-    /// if override is not 0, that the old value is always overridded, otherwise,
-    /// if the variable exists it remains unchanged
-    ///
-    inline int setenv(char const *key,char const *value,int override)
-    {
-        wshort_stackstring name;
-        if(!name.convert(key))
-            return -1;
-        if(!override) {
-            wchar_t unused[2];
-            if(!(GetEnvironmentVariableW(name.c_str(),unused,2)==0 && GetLastError() == 203)) // ERROR_ENVVAR_NOT_FOUND
-                return 0;
-        }
-        wstackstring wval;
-        if(!wval.convert(value))
-            return -1;
-        if(SetEnvironmentVariableW(name.c_str(),wval.c_str()))
-            return 0;
-        return -1;
-    }
-    ///
-    /// \brief Remove enviroment variable \a key
-    ///
-    inline int unsetenv(char const *key)
-    {
-        wshort_stackstring name;
-        if(!name.convert(key))
-            return -1;
-        if(SetEnvironmentVariableW(name.c_str(),0))
-            return 0;
-        return -1;
-    }
-    ///
-    /// \brief UTF-8 aware putenv implementation, expects string in format KEY=VALUE
-    ///
-    inline int putenv(char *string)
-    {
-        char const *key = string;
-        char const *key_end = string;
-        while(*key_end!='=' && key_end!='\0')
-            key_end++;
-        if(*key_end == '\0')
-            return -1;
-        wshort_stackstring wkey;
-        if(!wkey.convert(key,key_end))
-            return -1;
-        
-        wstackstring wvalue;
-        if(!wvalue.convert(key_end+1))
-            return -1;
-
-        if(SetEnvironmentVariableW(wkey.c_str(),wvalue.c_str()))
-            return 0;
-        return -1;
-    }
-    #endif
-} // nowide
-
-
-#endif
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/config.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/convert.hpp Deleted

@@ -1,154 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_CONVERT_H_INCLUDED
-#define NOWIDE_CONVERT_H_INCLUDED
-
-#include <string>
-#include <nowide/encoding_utf.hpp>
-
-
-namespace nowide {
-    ///
-    /// \brief Template function that converts a buffer of UTF sequence in range [source_begin,source_end)
-    /// to the output \a buffer of size \a buffer_size.
-    ///
-    /// In case of success a NUL terminated string returned (buffer), otherwise 0 is returned.
-    ///
-    /// If there is not enough room in the buffer or the source sequence contains invalid UTF
-    /// 0 is returned, and the contend of the buffer is undefined.
-    ///
-    template<typename CharOut,typename CharIn>
-    CharOut *basic_convert(CharOut *buffer,size_t buffer_size,CharIn const *source_begin,CharIn const *source_end)
-    {
-        CharOut *rv = buffer;
-        if(buffer_size == 0)
-            return 0;
-        buffer_size --;
-        while(source_begin!=source_end) {
-            using namespace nowide::utf;
-            code_point c = utf_traits<CharIn>::template decode<CharIn const *>(source_begin,source_end);
-            if(c==illegal || c==incomplete) {
-                rv = 0;
-                break;
-            }
-            size_t width = utf_traits<CharOut>::width(c);
-            if(buffer_size < width) {
-                rv=0;
-                break;
-            }
-            buffer = utf_traits<CharOut>::template encode<CharOut *>(c,buffer);
-            buffer_size -= width;
-        }
-        *buffer++ = 0;
-        return rv;
-    }
-
-    /// \cond INTERNAL
-    namespace details {
-        //
-        // wcslen defined only in C99... So we will not use it
-        //
-        template<typename Char>
-        Char const *basic_strend(Char const *s)
-        {
-            while(*s)
-                s++;
-            return s;
-        }
-    }
-    /// \endcond
-
-    ///
-    /// Convert NUL terminated UTF source string to NUL terminated \a output string of size at
-    /// most output_size (including NUL)
-    /// 
-    /// In case of surcess output is returned, if the input sequence is illegal,
-    /// or there is not enough room NULL is returned 
-    ///
-    inline char *narrow(char *output,size_t output_size,wchar_t const *source)
-    {
-        return basic_convert(output,output_size,source,details::basic_strend(source));
-    }
-    ///
-    /// Convert UTF text in range [begin,end) to NUL terminated \a output string of size at
-    /// most output_size (including NUL)
-    /// 
-    /// In case of surcess output is returned, if the input sequence is illegal,
-    /// or there is not enough room NULL is returned 
-    ///
-    inline char *narrow(char *output,size_t output_size,wchar_t const *begin,wchar_t const *end)
-    {
-        return basic_convert(output,output_size,begin,end);
-    }
-    ///
-    /// Convert NUL terminated UTF source string to NUL terminated \a output string of size at
-    /// most output_size (including NUL)
-    /// 
-    /// In case of surcess output is returned, if the input sequence is illegal,
-    /// or there is not enough room NULL is returned 
-    ///
-    inline wchar_t *widen(wchar_t *output,size_t output_size,char const *source)
-    {
-        return basic_convert(output,output_size,source,details::basic_strend(source));
-    }
-    ///
-    /// Convert UTF text in range [begin,end) to NUL terminated \a output string of size at
-    /// most output_size (including NUL)
-    /// 
-    /// In case of surcess output is returned, if the input sequence is illegal,
-    /// or there is not enough room NULL is returned 
-    ///
-    inline wchar_t *widen(wchar_t *output,size_t output_size,char const *begin,char const *end)
-    {
-        return basic_convert(output,output_size,begin,end);
-    }
-
-
-    ///
-    /// Convert between Wide - UTF-16/32 string and UTF-8 string.
-    ///
-    /// nowide::conv::conversion_error is thrown in a case of a error
-    ///
-    inline std::string narrow(wchar_t const *s)
-    {
-        return nowide::conv::utf_to_utf<char>(s);
-    }
-    ///
-    /// Convert between UTF-8 and UTF-16 string, implemented only on Windows platform
-    ///
-    /// nowide::conv::conversion_error is thrown in a case of a error
-    ///
-    inline std::wstring widen(char const *s)
-    {
-        return nowide::conv::utf_to_utf<wchar_t>(s);
-    }
-    ///
-    /// Convert between Wide - UTF-16/32 string and UTF-8 string
-    ///
-    /// nowide::conv::conversion_error is thrown in a case of a error
-    ///
-    inline std::string narrow(std::wstring const &s) 
-    {
-        return nowide::conv::utf_to_utf<char>(s);
-    }
-    ///
-    /// Convert between UTF-8 and UTF-16 string, implemented only on Windows platform
-    ///
-    /// nowide::conv::conversion_error is thrown in a case of a error
-    ///
-    inline std::wstring widen(std::string const &s) 
-    {
-        return nowide::conv::utf_to_utf<wchar_t>(s);
-    }
-
-} // nowide
-
-
-#endif
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/cstdio.hpp Deleted

@@ -1,101 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_CSTDIO_H_INCLUDED
-#define NOWIDE_CSTDIO_H_INCLUDED
-
-#include <cstdio>
-#include <stdio.h>
-#include <nowide/config.hpp>
-#include <nowide/convert.hpp>
-#include <nowide/stackstring.hpp>
-#include <errno.h>
-
-#ifdef NOWIDE_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
-
-
-
-namespace nowide {
-#if !defined(NOWIDE_WINDOWS) && !defined(NOWIDE_DOXYGEN)
-    using std::fopen;
-    using std::freopen;
-    using std::remove;
-    using std::rename;
-#else
-
-///
-/// \brief Same as freopen but file_name and mode are UTF-8 strings
-///
-/// In invalid UTF-8 given, NULL is returned and errno is set to EINVAL
-///
-inline FILE *freopen(char const *file_name,char const *mode,FILE *stream)
-{
-    wstackstring wname;
-    wshort_stackstring wmode;
-    if(!wname.convert(file_name) || !wmode.convert(mode)) {
-        errno = EINVAL;
-        return 0;
-    }
-    return _wfreopen(wname.c_str(),wmode.c_str(),stream);
-}
-///
-/// \brief Same as fopen but file_name and mode are UTF-8 strings
-///
-/// In invalid UTF-8 given, NULL is returned and errno is set to EINVAL
-///
-inline FILE *fopen(char const *file_name,char const *mode)
-{
-    wstackstring wname;
-    wshort_stackstring wmode;
-    if(!wname.convert(file_name) || !wmode.convert(mode)) {
-        errno = EINVAL;
-        return 0;
-    }
-    return _wfopen(wname.c_str(),wmode.c_str());
-}
-///
-/// \brief Same as rename but old_name and new_name are UTF-8 strings
-///
-/// In invalid UTF-8 given, -1 is returned and errno is set to EINVAL
-///
-inline int rename(char const *old_name,char const *new_name)
-{
-    wstackstring wold,wnew;
-    if(!wold.convert(old_name) || !wnew.convert(new_name)) {
-        errno = EINVAL;
-        return -1;
-    }
-    return _wrename(wold.c_str(),wnew.c_str());
-}
-///
-/// \brief Same as rename but name is UTF-8 string
-///
-/// In invalid UTF-8 given, -1 is returned and errno is set to EINVAL
-///
-inline int remove(char const *name)
-{
-    wstackstring wname;
-    if(!wname.convert(name)) {
-        errno = EINVAL;
-        return -1;
-    }
-    return _wremove(wname.c_str());
-}
-#endif
-} // nowide
-
-
-#ifdef NOWIDE_MSVC
-#pragma warning(pop)
-#endif
-
-#endif
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/cstdlib.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/encoding_errors.hpp Deleted

@@ -1,57 +0,0 @@
-//
-//  Copyright (c) 2009-2011 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_ENCODING_ERRORS_HPP_INCLUDED
-#define NOWIDE_ENCODING_ERRORS_HPP_INCLUDED
-
-#include <nowide/config.hpp>
-#ifdef NOWIDE_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4275 4251 4231 4660)
-#endif
-#include <stdexcept>
-
-
-
-namespace nowide {
-    namespace conv {
-        ///
-        /// \addtogroup codepage 
-        ///
-        /// @{
-
-        ///
-        /// \brief The excepton that is thrown in case of conversion error
-        ///
-        class conversion_error : public std::runtime_error {
-        public:
-            conversion_error() : std::runtime_error("Conversion failed") {}
-        };
-
-        ///
-        /// enum that defines conversion policy
-        ///
-        typedef enum {
-            skip            = 0,    ///< Skip illegal/unconvertable characters
-            stop            = 1,    ///< Stop conversion and throw conversion_error
-            default_method  = skip  ///< Default method - skip
-        } method_type;
-
-
-        /// @}
-
-    } // conv
-
-} // nowide
-
-#ifdef NOWIDE_MSVC
-#pragma warning(pop)
-#endif
-
-#endif
-
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/encoding_utf.hpp Deleted

@@ -1,83 +0,0 @@
-//
-//  Copyright (c) 2009-2011 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_ENCODING_UTF_HPP_INCLUDED
-#define NOWIDE_ENCODING_UTF_HPP_INCLUDED
-
-#include <nowide/utf.hpp>
-#include <nowide/encoding_errors.hpp>
-#include <string>
-#include <iterator>
-#ifdef NOWIDE_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4275 4251 4231 4660)
-#endif
-
-
-namespace nowide{
-    namespace conv {
-        ///
-        /// Convert a Unicode text in range [begin,end) to other Unicode encoding
-        ///
-        template<typename CharOut,typename CharIn>
-        std::basic_string<CharOut>
-        utf_to_utf(CharIn const *begin,CharIn const *end,method_type how = default_method)
-        {
-            std::basic_string<CharOut> result;
-            result.reserve(end-begin);
-            typedef std::back_insert_iterator<std::basic_string<CharOut> > inserter_type;
-            inserter_type inserter(result);
-            utf::code_point c;
-            while(begin!=end) {
-                c=utf::utf_traits<CharIn>::template decode<CharIn const *>(begin,end);
-                if(c==utf::illegal || c==utf::incomplete) {
-                    if(how==stop)
-                        throw conversion_error();
-                }
-                else {
-                    utf::utf_traits<CharOut>::template encode<inserter_type>(c,inserter);
-                }
-            }
-            return result;
-        }
-
-        ///
-        /// Convert a Unicode NUL terminated string \a str other Unicode encoding
-        ///
-        template<typename CharOut,typename CharIn>
-        std::basic_string<CharOut>
-        utf_to_utf(CharIn const *str,method_type how = default_method)
-        {
-            CharIn const *end = str;
-            while(*end)
-                end++;
-            return utf_to_utf<CharOut,CharIn>(str,end,how);
-        }
-
-
-        ///
-        /// Convert a Unicode string \a str other Unicode encoding
-        ///
-        template<typename CharOut,typename CharIn>
-        std::basic_string<CharOut>
-        utf_to_utf(std::basic_string<CharIn> const &str,method_type how = default_method)
-        {
-            return utf_to_utf<CharOut,CharIn>(str.c_str(),str.c_str()+str.size(),how);
-        }
-
-
-
-} // conv
-} // nowide
-
-#ifdef NOWIDE_MSVC
-#pragma warning(pop)
-#endif
-
-#endif
-
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/filebuf.hpp Deleted

@@ -1,408 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_FILEBUF_HPP
-#define NOWIDE_FILEBUF_HPP
-
-#include <iosfwd>
-#include <nowide/config.hpp>
-#include <nowide/stackstring.hpp>
-#include <fstream>
-#include <streambuf>
-#include <stdio.h>
-
-#ifdef NOWIDE_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4996 4244)
-#endif
-
-
-
-namespace nowide {
-#if !defined(NOWIDE_WINDOWS) && !defined(NOWIDE_FSTREAM_TESTS) && !defined(NOWIDE_DOXYGEN)
-    using std::basic_filebuf;
-    using std::filebuf;
-#else // Windows
-    
-    ///
-    /// \brief This forward declaration defined the basic_filebuf type.
-    ///
-    /// it is implemented and specialized for CharType = char, it behaves
-    /// implements std::filebuf over standard C I/O
-    ///
-    template<typename CharType,typename Traits = std::char_traits<CharType> >
-    class basic_filebuf;
-    
-    ///
-    /// \brief This is implementation of std::filebuf
-    ///
-    /// it is implemented and specialized for CharType = char, it behaves
-    /// implements std::filebuf over standard C I/O
-    ///
-    template<>
-    class basic_filebuf<char> : public std::basic_streambuf<char> {
-    public:
-        ///
-        /// Creates new filebuf
-        ///
-        basic_filebuf() : 
-            buffer_size_(4),
-            buffer_(0),
-            file_(0),
-            own_(true),
-            mode_(std::ios::in | std::ios::out)
-        {
-            setg(0,0,0);
-            setp(0,0);
-        }
-        
-        virtual ~basic_filebuf()
-        {
-            if(file_) {
-                ::fclose(file_);
-                file_ = 0;
-            }
-            if(own_ && buffer_)
-                delete [] buffer_;
-        }
-        
-        ///
-        /// Same as std::filebuf::open but s is UTF-8 string
-        ///
-        basic_filebuf *open(std::string const &s,std::ios_base::openmode mode)
-        {
-            return open(s.c_str(),mode);
-        }
-        ///
-        /// Same as std::filebuf::open but s is UTF-8 string
-        ///
-        basic_filebuf *open(char const *s,std::ios_base::openmode mode)
-        {
-            if(file_) {
-                sync();
-                ::fclose(file_);
-                file_ = 0;
-            }
-            wchar_t const *smode = get_mode(mode);
-            if(!smode)
-                return 0;
-            wstackstring name;
-            if(!name.convert(s)) 
-                return 0;
-            #ifdef NOWIDE_FSTREAM_TESTS
-            FILE *f = ::fopen(s,nowide::convert(smode).c_str());
-            #else
-            FILE *f = ::_wfopen(name.c_str(),smode);
-            #endif
-            if(!f)
-                return 0;
-            file_ = f;
-            return this;
-        }
-        ///
-        /// Same as std::filebuf::close()
-        ///
-        basic_filebuf *close()
-        {
-            bool res = sync() == 0;
-            if(file_) {
-                if(::fclose(file_)!=0)
-                    res = false;
-                file_ = 0;
-            }
-            return res ? this : 0;
-        }
-        ///
-        /// Same as std::filebuf::is_open()
-        ///
-        bool is_open() const
-        {
-            return file_ != 0;
-        }
-
-    private:
-        void make_buffer()
-        {
-            if(buffer_)
-                return;
-            if(buffer_size_ > 0) {
-                buffer_ = new char [buffer_size_];
-                own_ = true;
-            }
-        }
-    protected:
-        
-        virtual std::streambuf *setbuf(char *s,std::streamsize n)
-        {
-            if(!buffer_ && n>=0) {
-                buffer_ = s;
-                buffer_size_ = n;
-                own_ = false;
-            }
-            return this;
-        }
-        
-#ifdef NOWIDE_DEBUG_FILEBUF
-
-        void print_buf(char *b,char *p,char *e)
-        {
-            std::cerr << "-- Is Null: " << (b==0) << std::endl;; 
-            if(b==0)
-                return;
-            if(e != 0)
-                std::cerr << "-- Total: " << e - b <<" offset from start " << p - b << std::endl;
-            else
-                std::cerr << "-- Total: " << p - b << std::endl;
-                
-            std::cerr << "-- [";
-            for(char *ptr = b;ptr<p;ptr++)
-                std::cerr << *ptr;
-            if(e!=0) {
-                std::cerr << "|";
-                for(char *ptr = p;ptr<e;ptr++)
-                    std::cerr << *ptr;
-            }
-            std::cerr << "]" << std::endl;
-           
-        }
-        
-        void print_state()
-        {
-            std::cerr << "- Output:" << std::endl;
-            print_buf(pbase(),pptr(),0);
-            std::cerr << "- Input:" << std::endl;
-            print_buf(eback(),gptr(),egptr());
-            std::cerr << "- fpos: " << (file_ ? ftell(file_) : -1L) << std::endl;
-        }
-        
-        struct print_guard
-        {
-            print_guard(basic_filebuf *p,char const *func)
-            {
-                self = p;
-                f=func;
-                std::cerr << "In: " << f << std::endl;
-                self->print_state();
-            }
-            ~print_guard()
-            {
-                std::cerr << "Out: " << f << std::endl;
-                self->print_state();
-            }
-            basic_filebuf *self;
-            char const *f;
-        };
-#else
-#endif        
-        
-        int overflow(int c)
-        {
-#ifdef NOWIDE_DEBUG_FILEBUF
-            print_guard g(this,__FUNCTION__);
-#endif            
-            if(!file_)
-                return EOF;
-            
-            if(fixg() < 0)
-                return EOF;
-
-            size_t n = pptr() - pbase();
-            if(n > 0) {
-                if(::fwrite(pbase(),1,n,file_) < n)
-                    return -1;
-                fflush(file_);
-            }
-
-            if(buffer_size_ > 0) {
-                make_buffer();
-                setp(buffer_,buffer_+buffer_size_);
-                if(c!=EOF)
-                    sputc(c);
-            }
-            else if(c!=EOF) {
-                if(::fputc(c,file_)==EOF)
-                    return EOF;
-                fflush(file_);
-            }
-            return 0;
-        }
-        
-        
-        int sync()
-        {
-            return overflow(EOF);
-        }
-
-        int underflow()
-        {
-#ifdef NOWIDE_DEBUG_FILEBUF
-            print_guard g(this,__FUNCTION__);
-#endif            
-            if(!file_)
-                return EOF;
-            if(fixp() < 0)
-                return EOF;
-            if(buffer_size_ == 0) {
-                int c = ::fgetc(file_);
-                if(c==EOF) {
-                    return EOF;
-                }
-                last_char_ = c;
-                setg(&last_char_,&last_char_,&last_char_ + 1);
-                return c;
-            }
-            make_buffer();
-            size_t n = ::fread(buffer_,1,buffer_size_,file_);
-            setg(buffer_,buffer_,buffer_+n);
-            if(n == 0)
-                return EOF;
-            return std::char_traits<char>::to_int_type(*gptr());
-        }
-
-        int pbackfail(int)
-        {
-            return pubseekoff(-1,std::ios::cur);
-        }
-
-        std::streampos seekoff(std::streamoff off,
-                            std::ios_base::seekdir seekdir,
-                            std::ios_base::openmode /*m*/)
-        {
-#ifdef NOWIDE_DEBUG_FILEBUF
-            print_guard g(this,__FUNCTION__);
-#endif            
-            if(!file_)
-                return EOF;
-            if(fixp() < 0 || fixg() < 0)
-                return EOF;
-            if(seekdir == std::ios_base::cur) {
-                if( ::fseek(file_,off,SEEK_CUR) < 0)
-                    return EOF;
-            }
-            else if(seekdir == std::ios_base::beg) {
-                if( ::fseek(file_,off,SEEK_SET) < 0)
-                    return EOF;
-            }
-            else if(seekdir == std::ios_base::end) {
-                if( ::fseek(file_,off,SEEK_END) < 0)
-                    return EOF;
-            }
-            else
-                return -1;
-            return ftell(file_);
-        }
-        std::streampos seekpos(std::streampos off,std::ios_base::openmode m)
-        {
-            return seekoff(std::streamoff(off),std::ios_base::beg,m);
-        }
-    private:
-        int fixg()
-        {
-            if(gptr()!=egptr()) {
-                std::streamsize off = gptr() - egptr();
-                setg(0,0,0);
-                if(fseek(file_,off,SEEK_CUR) != 0)
-                    return -1;
-            }
-            setg(0,0,0);
-            return 0;
-        }
-        
-        int fixp()
-        {
-            if(pptr()!=0) {
-                int r = sync();
-                setp(0,0);
-                return r;
-            }
-            return 0;
-        }
-
-        void reset(FILE *f = 0)
-        {
-            sync();
-            if(file_) {
-                fclose(file_);
-                file_ = 0;
-            }
-            file_ = f;
-        }
-        
-        
-        static wchar_t const *get_mode(std::ios_base::openmode mode)
-        {
-            //
-            // done according to n2914 table 106 27.9.1.4
-            //
-
-            // note can't use switch case as overload operator can't be used
-            // in constant expression
-            if(mode == (std::ios_base::out))
-                return L"w";
-            if(mode == (std::ios_base::out | std::ios_base::app))
-                return L"a";
-            if(mode == (std::ios_base::app))
-                return L"a";
-            if(mode == (std::ios_base::out | std::ios_base::trunc))
-                return L"w";
-            if(mode == (std::ios_base::in))
-                return L"r";
-            if(mode == (std::ios_base::in | std::ios_base::out))
-                return L"r+";
-            if(mode == (std::ios_base::in | std::ios_base::out | std::ios_base::trunc))
-                return L"w+";
-            if(mode == (std::ios_base::in | std::ios_base::out | std::ios_base::app))
-                return L"a+";
-            if(mode == (std::ios_base::in | std::ios_base::app))
-                return L"a+";
-            if(mode == (std::ios_base::binary | std::ios_base::out))
-                return L"wb";
-            if(mode == (std::ios_base::binary | std::ios_base::out | std::ios_base::app))
-                return L"ab";
-            if(mode == (std::ios_base::binary | std::ios_base::app))
-                return L"ab";
-            if(mode == (std::ios_base::binary | std::ios_base::out | std::ios_base::trunc))
-                return L"wb";
-            if(mode == (std::ios_base::binary | std::ios_base::in))
-                return L"rb";
-            if(mode == (std::ios_base::binary | std::ios_base::in | std::ios_base::out))
-                return L"r+b";
-            if(mode == (std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::trunc))
-                return L"w+b";
-            if(mode == (std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::app))
-                return L"a+b";
-            if(mode == (std::ios_base::binary | std::ios_base::in | std::ios_base::app))
-                return L"a+b";
-            return 0;    
-        }
-        
-        size_t buffer_size_;
-        char *buffer_;
-        FILE *file_;
-        bool own_;
-        char last_char_;
-        std::ios::openmode mode_;
-    };
-    
-    ///
-    /// \brief Convinience typedef
-    ///
-    typedef basic_filebuf<char> filebuf;
-    
-    #endif // windows
-    
-} // nowide
-
-
-#ifdef NOWIDE_MSVC
-#  pragma warning(pop)
-#endif
-
-
-#endif
-
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/fstream.hpp Deleted

@@ -1,248 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_FSTREAM_INCLUDED_HPP
-#define NOWIDE_FSTREAM_INCLUDED_HPP
-
-#include <iosfwd>
-#include <nowide/config.hpp>
-#include <nowide/convert.hpp>
-#include <nowide/scoped_ptr.hpp>
-#include <fstream>
-#include <memory>
-#include <nowide/filebuf.hpp>
-
-
-///
-/// \brief This namespace includes implementation of the standard library functios
-/// such that they accept UTF-8 strings on Windows. On other platforms it is just an alias
-/// of std namespace (i.e. not on Windows)
-///
-namespace nowide {
-#if !defined(NOWIDE_WINDOWS)  && !defined(NOWIDE_FSTREAM_TESTS) && !defined(NOWIDE_DOXYGEN)
-
-    using std::basic_ifstream;
-    using std::basic_ofstream;
-    using std::basic_fstream;
-    using std::ifstream;
-    using std::ofstream;
-    using std::fstream;
-
-#else
-    ///
-    /// \brief Same as std::basic_ifstream<char> but accepts UTF-8 strings under Windows
-    ///
-    template<typename CharType,typename Traits = std::char_traits<CharType> >
-    class basic_ifstream : public std::basic_istream<CharType,Traits>
-    {
-    public:
-        typedef basic_filebuf<CharType,Traits> internal_buffer_type;
-        typedef std::basic_istream<CharType,Traits> internal_stream_type;
-
-        basic_ifstream() : 
-            internal_stream_type(0)
-        {
-            buf_.reset(new internal_buffer_type());
-            std::ios::rdbuf(buf_.get());
-        }
-        
-        explicit basic_ifstream(char const *file_name,std::ios_base::openmode mode = std::ios_base::in) : 
-            internal_stream_type(0) 
-        {
-            buf_.reset(new internal_buffer_type());
-            std::ios::rdbuf(buf_.get());
-            open(file_name,mode);
-        }
-        
-        void open(char const *file_name,std::ios_base::openmode mode = std::ios_base::in)
-        {
-            if(!buf_->open(file_name,mode | std::ios_base::in)) {
-                this->setstate(std::ios_base::failbit);
-            }
-            else {
-                this->clear();
-            }
-        }
-        bool is_open()
-        {
-            return buf_->is_open();
-        }
-        bool is_open() const
-        {
-            return buf_->is_open();
-        }
-        void close()
-        {
-            if(!buf_->close())
-                this->setstate(std::ios_base::failbit);
-            else
-                this->clear();
-        }
-
-        internal_buffer_type *rdbuf() const
-        {
-            return buf_.get();
-        }
-        ~basic_ifstream()
-        {
-            buf_->close();
-        }
-            
-    private:
-        nowide::scoped_ptr<internal_buffer_type> buf_;
-    };
-
-    ///
-    /// \brief Same as std::basic_ofstream<char> but accepts UTF-8 strings under Windows
-    ///
-
-    template<typename CharType,typename Traits = std::char_traits<CharType> >
-    class basic_ofstream : public std::basic_ostream<CharType,Traits>
-    {
-    public:
-        typedef basic_filebuf<CharType,Traits> internal_buffer_type;
-        typedef std::basic_ostream<CharType,Traits> internal_stream_type;
-
-        basic_ofstream() : 
-            internal_stream_type(0)
-        {
-            buf_.reset(new internal_buffer_type());
-            std::ios::rdbuf(buf_.get());
-        }
-        explicit basic_ofstream(char const *file_name,std::ios_base::openmode mode = std::ios_base::out) :
-            internal_stream_type(0)
-        {
-            buf_.reset(new internal_buffer_type());
-            std::ios::rdbuf(buf_.get());
-            open(file_name,mode);
-        }
-        void open(char const *file_name,std::ios_base::openmode mode = std::ios_base::out)
-        {
-            if(!buf_->open(file_name,mode | std::ios_base::out)) {
-                this->setstate(std::ios_base::failbit);
-            }
-            else {
-                this->clear();
-            }
-        }
-        bool is_open()
-        {
-            return buf_->is_open();
-        }
-        bool is_open() const
-        {
-            return buf_->is_open();
-        }
-        void close()
-        {
-            if(!buf_->close())
-                this->setstate(std::ios_base::failbit);
-            else
-                this->clear();
-        }
-
-        internal_buffer_type *rdbuf() const
-        {
-            return buf_.get();
-        }
-        ~basic_ofstream()
-        {
-            buf_->close();
-        }
-            
-    private:
-        nowide::scoped_ptr<internal_buffer_type> buf_;
-    };
-
-    ///
-    /// \brief Same as std::basic_fstream<char> but accepts UTF-8 strings under Windows
-    ///
-
-    template<typename CharType,typename Traits = std::char_traits<CharType> >
-    class basic_fstream : public std::basic_iostream<CharType,Traits>
-    {
-    public:
-        typedef basic_filebuf<CharType,Traits> internal_buffer_type;
-        typedef std::basic_iostream<CharType,Traits> internal_stream_type;
-
-        basic_fstream() : 
-            internal_stream_type(0)
-        {
-            buf_.reset(new internal_buffer_type());
-            std::ios::rdbuf(buf_.get());
-        }
-        explicit basic_fstream(char const *file_name,std::ios_base::openmode mode = std::ios_base::out | std::ios_base::in) :
-            internal_stream_type(0)
-        {
-            buf_.reset(new internal_buffer_type());
-            std::ios::rdbuf(buf_.get());
-            open(file_name,mode);
-        }
-        void open(char const *file_name,std::ios_base::openmode mode = std::ios_base::out | std::ios_base::out)
-        {
-            if(!buf_->open(file_name,mode)) {
-                this->setstate(std::ios_base::failbit);
-            }
-            else {
-                this->clear();
-            }
-        }
-        bool is_open()
-        {
-            return buf_->is_open();
-        }
-        bool is_open() const
-        {
-            return buf_->is_open();
-        }
-        void close()
-        {
-            if(!buf_->close())
-                this->setstate(std::ios_base::failbit);
-            else
-                this->clear();
-        }
-
-        internal_buffer_type *rdbuf() const
-        {
-            return buf_.get();
-        }
-        ~basic_fstream()
-        {
-            buf_->close();
-        }
-            
-    private:
-        nowide::scoped_ptr<internal_buffer_type> buf_;
-    };
-
-
-    ///
-    /// \brief Same as std::filebuf but accepts UTF-8 strings under Windows
-    ///
-    typedef basic_filebuf<char> filebuf;
-    ///
-    /// Same as std::ifstream but accepts UTF-8 strings under Windows
-    ///
-    typedef basic_ifstream<char> ifstream;
-    ///
-    /// Same as std::ofstream but accepts UTF-8 strings under Windows
-    ///
-    typedef basic_ofstream<char> ofstream;
-    ///
-    /// Same as std::fstream but accepts UTF-8 strings under Windows
-    ///
-    typedef basic_fstream<char> fstream;
-
-#endif
-} // nowide
-
-
-
-
-#endif
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/iostream.hpp Deleted

@@ -1,99 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_IOSTREAM_HPP_INCLUDED
-#define NOWIDE_IOSTREAM_HPP_INCLUDED
-
-#include <nowide/config.hpp>
-#include <nowide/scoped_ptr.hpp>
-#include <iostream>
-#include <ostream>
-#include <istream>
-
-#ifdef NOWIDE_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4251)
-#endif
-
-
-
-namespace nowide {
-    #if !defined(NOWIDE_WINDOWS) && !defined(NOWIDE_DOXYGEN)
-    using std::cout;
-    using std::cerr;
-    using std::cin;
-    using std::clog;
-    #else
-    
-    /// \cond INTERNAL 
-    namespace details {
-        class console_output_buffer;
-        class console_input_buffer;
-        
-        class NOWIDE_DECL winconsole_ostream : public std::ostream {
-            winconsole_ostream(winconsole_ostream const &);
-            void operator=(winconsole_ostream const &);
-        public:
-            winconsole_ostream(int fd);
-            ~winconsole_ostream();
-        private:
-            nowide::scoped_ptr<console_output_buffer> d;
-        };
-
-        class NOWIDE_DECL winconsole_istream : public std::istream {
-            winconsole_istream(winconsole_istream const &);
-            void operator=(winconsole_istream const &);
-        public:
-            
-            winconsole_istream();
-            ~winconsole_istream();
-        private:
-            struct data;
-            nowide::scoped_ptr<console_input_buffer> d;
-        };
-    } // details 
-    
-    /// \endcond
-
-    ///
-    /// \brief Same as std::cin, but uses UTF-8
-    ///
-    /// Note, the stream is not synchronized with stdio and not affected by std::ios::sync_with_stdio
-    /// 
-    extern NOWIDE_DECL details::winconsole_istream cin;
-    ///
-    /// \brief Same as std::cout, but uses UTF-8
-    ///
-    /// Note, the stream is not synchronized with stdio and not affected by std::ios::sync_with_stdio
-    /// 
-    extern NOWIDE_DECL details::winconsole_ostream cout;
-    ///
-    /// \brief Same as std::cerr, but uses UTF-8
-    ///
-    /// Note, the stream is not synchronized with stdio and not affected by std::ios::sync_with_stdio
-    /// 
-    extern NOWIDE_DECL details::winconsole_ostream cerr;
-    ///
-    /// \brief Same as std::clog, but uses UTF-8
-    ///
-    /// Note, the stream is not synchronized with stdio and not affected by std::ios::sync_with_stdio
-    /// 
-    extern NOWIDE_DECL details::winconsole_ostream clog;
-
-    #endif
-
-} // nowide
-
-
-#ifdef NOWIDE_MSVC
-#  pragma warning(pop)
-#endif
-
-
-#endif
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/scoped_ptr.hpp Deleted

@@ -1,92 +0,0 @@
-#ifndef NOWIDE_SCOPED_PTR_HPP
-#define NOWIDE_SCOPED_PTR_HPP
-
-//  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-//  Copyright (c) 2001, 2002 Peter Dimov, 
-//  Copyright (C) 2012 Artyom Beilis
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-//  http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
-//
-
-#include <assert.h>
-
-namespace nowide
-{
-
-//  scoped_ptr mimics a built-in pointer except that it guarantees deletion
-//  of the object pointed to, either on destruction of the scoped_ptr or via
-//  an explicit reset(). scoped_ptr is a simple solution for simple needs;
-//  use shared_ptr or std::auto_ptr if your needs are more complex.
-
-template<class T> class scoped_ptr // noncopyable
-{
-private:
-
-    T * px;
-
-    scoped_ptr(scoped_ptr const &);
-    scoped_ptr & operator=(scoped_ptr const &);
-
-    typedef scoped_ptr<T> this_type;
-
-    void operator==( scoped_ptr const& ) const;
-    void operator!=( scoped_ptr const& ) const;
-
-public:
-
-    typedef T element_type;
-
-    explicit scoped_ptr( T * p = 0 ): px( p ) // never throws
-    {
-    }
-
-    ~scoped_ptr() // never throws
-    {
-        delete px;
-    }
-
-    void reset(T * p = 0) // never throws
-    {
-        assert( p == 0 || p != px ); // catch self-reset errors
-        this_type(p).swap(*this);
-    }
-
-    T & operator*() const // never throws
-    {
-        assert( px != 0 );
-        return *px;
-    }
-
-    T * operator->() const // never throws
-    {
-        assert( px != 0 );
-        return px;
-    }
-
-    T * get() const // never throws
-    {
-        return px;
-    }
-
-    operator bool() const
-    {
-        return px!=0;
-    }
-
-    void swap(scoped_ptr & b) // never throws
-    {
-        T * tmp = b.px;
-        b.px = px;
-        px = tmp;
-    }
-};
-
-
-} // namespace nowide
-
-#endif
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/stackstring.hpp Deleted

@@ -1,154 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_DETAILS_WIDESTR_H_INCLUDED
-#define NOWIDE_DETAILS_WIDESTR_H_INCLUDED
-#include <nowide/convert.hpp>
-#include <string.h>
-#include <algorithm>
-
-
-namespace nowide {
-
-///
-/// \brief A class that allows to create a temporary wide or narrow UTF strings from
-/// wide or narrow UTF source.
-///
-/// It uses on stack buffer of the string is short enough
-/// and allocated a buffer on the heap if the size of the buffer is too small
-///    
-template<typename CharOut=wchar_t,typename CharIn = char,size_t BufferSize = 256>
-class basic_stackstring {
-public:
-   
-    static const size_t buffer_size = BufferSize; 
-    typedef CharOut output_char;
-    typedef CharIn input_char;
-
-    basic_stackstring(basic_stackstring const &other) : 
-    mem_buffer_(0)
-    {
-        clear();
-        if(other.mem_buffer_) {
-            size_t len = 0;
-            while(other.mem_buffer_[len])
-                len ++;
-            mem_buffer_ = new output_char[len + 1];
-            memcpy(mem_buffer_,other.mem_buffer_,sizeof(output_char) * (len+1));
-        }
-        else {
-            memcpy(buffer_,other.buffer_,buffer_size * sizeof(output_char));
-        }
-    }
-    
-    void swap(basic_stackstring &other)
-    {
-        std::swap(mem_buffer_,other.mem_buffer_);
-        for(size_t i=0;i<buffer_size;i++)
-            std::swap(buffer_[i],other.buffer_[i]);
-    }
-    basic_stackstring &operator=(basic_stackstring const &other)
-    {
-        if(this != &other) {
-            basic_stackstring tmp(other);
-            swap(tmp);            
-        }
-        return *this;
-    }
-
-    basic_stackstring() : mem_buffer_(0)
-    {
-    }
-    bool convert(input_char const *input)
-    {
-        return convert(input,details::basic_strend(input));
-    }
-    bool convert(input_char const *begin,input_char const *end)
-    {
-        clear();
-
-        size_t space = get_space(sizeof(input_char),sizeof(output_char),end - begin) + 1;
-        if(space <= buffer_size) {
-            if(basic_convert(buffer_,buffer_size,begin,end))
-                return true;
-            clear();
-            return false;
-        }
-        else {
-            mem_buffer_ = new output_char[space];
-            if(!basic_convert(mem_buffer_,space,begin,end)) {
-                clear();
-                return false;
-            }
-            return true;
-        }
-
-    }
-    output_char *c_str()
-    {
-        if(mem_buffer_)
-            return mem_buffer_;
-        return buffer_;
-    }
-    output_char const *c_str() const
-    {
-        if(mem_buffer_)
-            return mem_buffer_;
-        return buffer_;
-    }
-    void clear()
-    {
-        if(mem_buffer_) {
-            delete [] mem_buffer_;
-            mem_buffer_=0;
-        }
-        buffer_[0] = 0;
-    }
-    ~basic_stackstring()
-    {
-        clear();
-    }
-private:
-    static size_t get_space(size_t insize,size_t outsize,size_t in)
-    {
-        if(insize <= outsize)
-            return in;
-        else if(insize == 2 && outsize == 1) 
-            return 3 * in;
-        else if(insize == 4 && outsize == 1) 
-            return 4 * in;
-        else  // if(insize == 4 && outsize == 2) 
-            return 2 * in;
-    }
-    output_char buffer_[buffer_size];
-    output_char *mem_buffer_;
-};  //basic_stackstring
-
-///
-/// Convinience typedef
-///
-typedef basic_stackstring<wchar_t,char,256> wstackstring;
-///
-/// Convinience typedef
-///
-typedef basic_stackstring<char,wchar_t,256> stackstring;
-///
-/// Convinience typedef
-///
-typedef basic_stackstring<wchar_t,char,16> wshort_stackstring;
-///
-/// Convinience typedef
-///
-typedef basic_stackstring<char,wchar_t,16> short_stackstring;
-
-
-} // nowide
-
-
-#endif
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/system.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/utf.hpp Deleted

@@ -1,468 +0,0 @@
-//
-//  Copyright (c) 2009-2011 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_UTF_HPP_INCLUDED
-#define NOWIDE_UTF_HPP_INCLUDED
-
-#include <nowide/config.hpp>
-
-#ifndef NOWIDE_MSVC
-namespace nowide  {
-namespace utf {
-    typedef unsigned uint32_t;
-    typedef unsigned short uint16_t;
-    typedef unsigned char uint8_t;
-}
-}
-#else
-#include <stdint.h>
-#endif
-
-namespace nowide {
-///
-/// \brief Namespace that holds basic operations on UTF encoded sequences 
-///
-/// All functions defined in this namespace do not require linking with Boost.Locale library
-///
-namespace utf {
-    /// \cond INTERNAL
-    #ifdef __GNUC__
-    #   define NOWIDE_LIKELY(x)   __builtin_expect((x),1)
-    #   define NOWIDE_UNLIKELY(x) __builtin_expect((x),0)
-    #else
-    #   define NOWIDE_LIKELY(x)   (x)
-    #   define NOWIDE_UNLIKELY(x) (x)
-    #endif
-    /// \endcond
-
-    ///
-    /// \brief The integral type type that can hold a Unicode code point
-    ///
-    typedef uint32_t code_point;
-
-    ///
-    /// \brief Special constant that defines illegal code point
-    ///
-    static const code_point illegal = 0xFFFFFFFFu;
-
-    ///
-    /// \brief Special constant that defines incomplete code point
-    ///
-    static const code_point incomplete = 0xFFFFFFFEu;
-
-    ///
-    /// \brief the function checks if \a v is a valid code point
-    ///
-    inline bool is_valid_codepoint(code_point v)
-    {
-        if(v>0x10FFFF)
-            return false;
-        if(0xD800 <=v && v<= 0xDFFF) // surragates
-            return false;
-        return true;
-    }
-
-    #ifdef NOWIDE_DOXYGEN
-    ///
-    /// \brief UTF Traits class - functions to convert UTF sequences to and from Unicode code points
-    ///
-    template<typename CharType,int size=sizeof(CharType)>
-    struct utf_traits {
-        ///
-        /// The type of the character
-        ///
-        typedef CharType char_type;
-        ///
-        /// Read one code point from the range [p,e) and return it.
-        ///
-        /// - If the sequence that was read is incomplete sequence returns \ref incomplete,
-        /// - If illegal sequence detected returns \ref illegal
-        ///
-        /// Requirements
-        ///
-        /// - Iterator is valid input iterator
-        ///
-        /// Postconditions
-        ///
-        /// - p points to the last consumed character
-        /// 
-        template<typename Iterator>
-        static code_point decode(Iterator &p,Iterator e);
-
-        ///
-        /// Maximal width of valid sequence in the code units:
-        ///
-        /// - UTF-8  - 4
-        /// - UTF-16 - 2
-        /// - UTF-32 - 1
-        ///
-        static const int max_width;
-        ///
-        /// The width of specific code point in the code units.
-        ///
-        /// Requirement: value is a valid Unicode code point
-        /// Returns value in range [1..max_width]
-        ///
-        static int width(code_point value);
-
-        ///
-        /// Get the size of the trail part of variable length encoded sequence.
-        ///
-        /// Returns -1 if C is not valid lead character
-        /// 
-        static int trail_length(char_type c);
-        ///
-        /// Returns true if c is trail code unit, always false for UTF-32
-        ///
-        static bool is_trail(char_type c);
-        ///
-        /// Returns true if c is lead code unit, always true of UTF-32
-        ///
-        static bool is_lead(char_type c);
-
-        ///
-        /// Convert valid Unicode code point \a value to the UTF sequence.
-        ///
-        /// Requirements: 
-        ///
-        /// - \a value is valid code point
-        /// - \a out is an output iterator should be able to accept at least width(value) units
-        /// 
-        /// Returns the iterator past the last written code unit.
-        ///
-        template<typename Iterator>
-        static Iterator encode(code_point value,Iterator out);
-        ///
-        /// Decodes valid UTF sequence that is pointed by p into code point.
-        ///
-        /// If the sequence is invalid or points to end the behavior is undefined
-        ///
-        template<typename Iterator>
-        static code_point decode_valid(Iterator &p);
-    };
-    
-    #else
-
-    template<typename CharType,int size=sizeof(CharType)>
-    struct utf_traits;
-
-    template<typename CharType>
-    struct utf_traits<CharType,1> {
-
-        typedef CharType char_type;
-        
-        static int trail_length(char_type ci) 
-        {
-            unsigned char c = ci;
-            if(c < 128)
-                return 0;
-            if(NOWIDE_UNLIKELY(c < 194))
-                return -1;
-            if(c < 224)
-                return 1;
-            if(c < 240)
-                return 2;
-            if(NOWIDE_LIKELY(c <=244))
-                return 3;
-            return -1;
-        }
-        
-        static const int max_width = 4;
-
-        static int width(code_point value)
-        {
-            if(value <=0x7F) {
-                return 1;
-            }
-            else if(value <=0x7FF) {
-                return 2;
-            }
-            else if(NOWIDE_LIKELY(value <=0xFFFF)) {
-                return 3;
-            }
-            else {
-                return 4;
-            }
-        }
-
-        static bool is_trail(char_type ci)
-        {
-            unsigned char c=ci;
-            return (c & 0xC0)==0x80;
-        }
-
-        static bool is_lead(char_type ci)
-        {
-            return !is_trail(ci);
-        }
-        
-        template<typename Iterator>
-        static code_point decode(Iterator &p,Iterator e)
-        {
-            if(NOWIDE_UNLIKELY(p==e))
-                return incomplete;
-
-            unsigned char lead = *p++;
-
-            // First byte is fully validated here
-            int trail_size = trail_length(lead);
-
-            if(NOWIDE_UNLIKELY(trail_size < 0))
-                return illegal;
-
-            //
-            // Ok as only ASCII may be of size = 0
-            // also optimize for ASCII text
-            //
-            if(trail_size == 0)
-                return lead;
-            
-            code_point c = lead & ((1<<(6-trail_size))-1);
-
-            // Read the rest
-            unsigned char tmp;
-            switch(trail_size) {
-            case 3:
-                if(NOWIDE_UNLIKELY(p==e))
-                    return incomplete;
-                tmp = *p++;
-                if (!is_trail(tmp))
-                    return illegal;
-                c = (c << 6) | ( tmp & 0x3F);
-            case 2:
-                if(NOWIDE_UNLIKELY(p==e))
-                    return incomplete;
-                tmp = *p++;
-                if (!is_trail(tmp))
-                    return illegal;
-                c = (c << 6) | ( tmp & 0x3F);
-            case 1:
-                if(NOWIDE_UNLIKELY(p==e))
-                    return incomplete;
-                tmp = *p++;
-                if (!is_trail(tmp))
-                    return illegal;
-                c = (c << 6) | ( tmp & 0x3F);
-            }
-
-            // Check code point validity: no surrogates and
-            // valid range
-            if(NOWIDE_UNLIKELY(!is_valid_codepoint(c)))
-                return illegal;
-
-            // make sure it is the most compact representation
-            if(NOWIDE_UNLIKELY(width(c)!=trail_size + 1))
-                return illegal;
-
-            return c;
-
-        }
-        
-        template<typename Iterator>
-        static code_point decode_valid(Iterator &p)
-        {
-            unsigned char lead = *p++;
-            if(lead < 192)
-                return lead;
-
-            int trail_size;
-
-            if(lead < 224)
-                trail_size = 1;
-            else if(NOWIDE_LIKELY(lead < 240)) // non-BMP rare
-                trail_size = 2;
-            else
-                trail_size = 3;
-            
-            code_point c = lead & ((1<<(6-trail_size))-1);
-
-            switch(trail_size) {
-            case 3:
-                c = (c << 6) | ( static_cast<unsigned char>(*p++) & 0x3F);
-            case 2:
-                c = (c << 6) | ( static_cast<unsigned char>(*p++) & 0x3F);
-            case 1:
-                c = (c << 6) | ( static_cast<unsigned char>(*p++) & 0x3F);
-            }
-
-            return c;
-        }
-
-
-
-        template<typename Iterator>
-        static Iterator encode(code_point value,Iterator out)
-        {
-            if(value <= 0x7F) {
-                *out++ = static_cast<char_type>(value);
-            }
-            else if(value <= 0x7FF) {
-                *out++ = static_cast<char_type>((value >> 6) | 0xC0);
-                *out++ = static_cast<char_type>((value & 0x3F) | 0x80);
-            }
-            else if(NOWIDE_LIKELY(value <= 0xFFFF)) {
-                *out++ = static_cast<char_type>((value >> 12) | 0xE0);
-                *out++ = static_cast<char_type>(((value >> 6) & 0x3F) | 0x80);
-                *out++ = static_cast<char_type>((value & 0x3F) | 0x80);
-            }
-            else {
-                *out++ = static_cast<char_type>((value >> 18) | 0xF0);
-                *out++ = static_cast<char_type>(((value >> 12) & 0x3F) | 0x80);
-                *out++ = static_cast<char_type>(((value >> 6) & 0x3F) | 0x80);
-                *out++ = static_cast<char_type>((value & 0x3F) | 0x80);
-            }
-            return out;
-        }
-    }; // utf8
-
-    template<typename CharType>
-    struct utf_traits<CharType,2> {
-        typedef CharType char_type;
-
-        // See RFC 2781
-        static bool is_first_surrogate(uint16_t x)
-        {
-            return 0xD800 <=x && x<= 0xDBFF;
-        }
-        static bool is_second_surrogate(uint16_t x)
-        {
-            return 0xDC00 <=x && x<= 0xDFFF;
-        }
-        static code_point combine_surrogate(uint16_t w1,uint16_t w2)
-        {
-            return ((code_point(w1 & 0x3FF) << 10) | (w2 & 0x3FF)) + 0x10000;
-        }
-        static int trail_length(char_type c)
-        {
-            if(is_first_surrogate(c))
-                return 1;
-            if(is_second_surrogate(c))
-                return -1;
-            return 0;
-        }
-        ///
-        /// Returns true if c is trail code unit, always false for UTF-32
-        ///
-        static bool is_trail(char_type c)
-        {
-            return is_second_surrogate(c);
-        }
-        ///
-        /// Returns true if c is lead code unit, always true of UTF-32
-        ///
-        static bool is_lead(char_type c)
-        {
-            return !is_second_surrogate(c);
-        }
-
-        template<typename It>
-        static code_point decode(It &current,It last)
-        {
-            if(NOWIDE_UNLIKELY(current == last))
-                return incomplete;
-            uint16_t w1=*current++;
-            if(NOWIDE_LIKELY(w1 < 0xD800 || 0xDFFF < w1)) {
-                return w1;
-            }
-            if(w1 > 0xDBFF)
-                return illegal;
-            if(current==last)
-                return incomplete;
-            uint16_t w2=*current++;
-            if(w2 < 0xDC00 || 0xDFFF < w2)
-                return illegal;
-            return combine_surrogate(w1,w2);
-        }
-        template<typename It>
-        static code_point decode_valid(It &current)
-        {
-            uint16_t w1=*current++;
-            if(NOWIDE_LIKELY(w1 < 0xD800 || 0xDFFF < w1)) {
-                return w1;
-            }
-            uint16_t w2=*current++;
-            return combine_surrogate(w1,w2);
-        }
-
-        static const int max_width = 2;
-        static int width(code_point u)
-        {
-            return u>=0x10000 ? 2 : 1;
-        }
-        template<typename It>
-        static It encode(code_point u,It out)
-        {
-            if(NOWIDE_LIKELY(u<=0xFFFF)) {
-                *out++ = static_cast<char_type>(u);
-            }
-            else {
-                u -= 0x10000;
-                *out++ = static_cast<char_type>(0xD800 | (u>>10));
-                *out++ = static_cast<char_type>(0xDC00 | (u & 0x3FF));
-            }
-            return out;
-        }
-    }; // utf16;
-
-        
-    template<typename CharType>
-    struct utf_traits<CharType,4> {
-        typedef CharType char_type;
-        static int trail_length(char_type c)
-        {
-            if(is_valid_codepoint(c))
-                return 0;
-            return -1;
-        }
-        static bool is_trail(char_type /*c*/)
-        {
-            return false;
-        }
-        static bool is_lead(char_type /*c*/)
-        {
-            return true;
-        }
-
-        template<typename It>
-        static code_point decode_valid(It &current)
-        {
-            return *current++;
-        }
-
-        template<typename It>
-        static code_point decode(It &current,It last)
-        {
-            if(NOWIDE_UNLIKELY(current == last))
-                return nowide::utf::incomplete;
-            code_point c=*current++;
-            if(NOWIDE_UNLIKELY(!is_valid_codepoint(c)))
-                return nowide::utf::illegal;
-            return c;
-        }
-        static const int max_width = 1;
-        static int width(code_point /*u*/)
-        {
-            return 1;
-        }
-        template<typename It>
-        static It encode(code_point u,It out)
-        {
-            *out++ = static_cast<char_type>(u);
-            return out;
-        }
-
-    }; // utf32
-
-    #endif
-
-} // utf
-} // nowide
-
-
-#endif
-
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/nowide/windows.hpp Deleted

@@ -1,39 +0,0 @@
-//
-//  Copyright (c) 2012 Artyom Beilis (Tonkikh)
-//
-//  Distributed under the Boost Software License, Version 1.0. (See
-//  accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef NOWIDE_WINDOWS_HPP_INCLUDED
-#define NOWIDE_WINDOWS_HPP_INCLUDED
-
-#include <stddef.h>
-
-#ifdef NOWIDE_USE_WINDOWS_H
-#include <windows.h>
-#else
-
-//
-// These are function prototypes... Allow to to include windows.h
-//
-extern "C" {
-
-__declspec(dllimport) wchar_t*        __stdcall GetEnvironmentStringsW(void);
-__declspec(dllimport) int             __stdcall FreeEnvironmentStringsW(wchar_t *);
-__declspec(dllimport) wchar_t*        __stdcall GetCommandLineW(void);
-__declspec(dllimport) wchar_t**       __stdcall CommandLineToArgvW(wchar_t const *,int *);
-__declspec(dllimport) unsigned long   __stdcall GetLastError();
-__declspec(dllimport) void*           __stdcall LocalFree(void *);
-__declspec(dllimport) int             __stdcall SetEnvironmentVariableW(wchar_t const *,wchar_t const *);
-__declspec(dllimport) unsigned long   __stdcall GetEnvironmentVariableW(wchar_t const *,wchar_t *,unsigned long);
-
-}
-
-#endif 
-
-
-
-#endif
-///
-// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser-facade Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser-facade/main.c Deleted

@@ -1,79 +0,0 @@
-/******************************************************************************
-Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <util/platform.h>
-
-OBS_DECLARE_MODULE()
-OBS_MODULE_USE_DEFAULT_LOCALE("obs-browser", "en-US")
-
-static void *obs_so;
-static bool (*obs_actual_load)(void);
-static void (*obs_actual_unload)(void);
-static void (*obs_actual_module_set_pointer)(obs_module_t *module);
-
-bool
-obs_module_load(void)
-{
-	obs_so = NULL;
-	
-	bool success;
-	char *obs_browser_path = obs_module_file("obs-browser");
-	if (obs_browser_path) {
-		obs_so = os_dlopen(obs_browser_path);
-		if (obs_so) {
-			obs_actual_load = os_dlsym(obs_so, "obs_module_load");
-			obs_actual_unload = os_dlsym(obs_so, 
-				"obs_module_unload");
-			obs_actual_module_set_pointer = os_dlsym(obs_so,
-				"obs_actual_module_so");
-
-			if (obs_actual_load && obs_actual_unload 
-				&& obs_actual_module_set_pointer) 
-			{
-				obs_actual_module_set_pointer(
-					obs_module_pointer);
-				if (obs_actual_load()) {
-					goto success;
-				}
-			}
-
-		}
-	}
-
-error:
-	success = false;
-	if (obs_so)
-		os_dlclose(obs_so);
-success:
-	if (obs_browser_path)
-		bfree(obs_browser_path);
-	return success;
-}
-
-void
-
-obs_module_unload()
-{
-	if (obs_so) {
-		obs_actual_unload();
-		os_dlclose(obs_so);
-		obs_so = NULL;
-	}
-
-
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.h Deleted

@@ -1,65 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-
-class CEFIsolationServiceManager;
-
-struct BrowserSettings;
-
-class BrowserManager::Impl {
-public:
-	Impl();
-public:
-	void Startup();
-	void Shutdown();
-	void Restart();
-	
-	int CreateBrowser(const BrowserSettings &browserSettings,
-			const std::shared_ptr<BrowserListener>
-				&browserListener);
-	void DestroyBrowser(int browserIdentifier);
-
-	void TickBrowser(int browserIdentifier);
-
-	void SendMouseClick(int browserIdentifier,
-			const struct obs_mouse_event *event, int32_t type,
-			bool mouseUp, uint32_t clickCount);
-	void SendMouseMove(int browserIdentifier,
-			const struct obs_mouse_event *event, bool mouseLeave);
-	void SendMouseWheel(int browserIdentifier,
-			const struct obs_mouse_event *event, int xDelta,
-			int yDelta);
-	void SendFocus(int browserIdentifier, bool focus);
-	void SendKeyClick(const int browserIdentifier,
-			const struct obs_key_event *event, bool keyUp);
-	
-	void ExecuteVisiblityJSCallback(int browserIdentifier, bool visible);
-
-	void ExecuteActiveJSCallback(int browserIdentifier, bool active);
-
-	void ExecuteSceneChangeJSCallback(const char *name);
-    
-    void RefreshPageNoCache(int browserIdentifier);
-
-	void DispatchJSEvent(const char *eventName, const char *jsonData);
-
-private:
-	std::unique_ptr<CEFIsolationServiceManager> cefIsolationServiceManager;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.mm Deleted

@@ -1,231 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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>
-
-#import "cef-isolation-service-manager.h"
-#include "browser-manager.hpp"
-#include "browser-settings.hpp"
-#include "browser-manager-mac.h"
-
-BrowserManager::BrowserManager()
-: pimpl(new Impl())
-{
-}
-
-BrowserManager::~BrowserManager()
-{
-}
-
-void BrowserManager::Startup()
-{
-	pimpl->Startup();
-}
-
-void BrowserManager::Shutdown()
-{
-	pimpl->Shutdown();
-}
-
-void BrowserManager::Restart()
-{
-	pimpl->Restart();
-}
-
-void BrowserManager::TickBrowser(int browserIdentifier)
-{
-	pimpl->TickBrowser(browserIdentifier);
-}
-
-void BrowserManager::SendMouseClick(int browserIdentifier,
-		const struct obs_mouse_event *event, int32_t type, bool mouseUp,
-		uint32_t clickCount)
-{
-	pimpl->SendMouseClick(browserIdentifier, event, type, mouseUp,
-		clickCount);
-}
-
-void BrowserManager::SendMouseMove(int browserIdentifier,
-		const struct obs_mouse_event *event, bool mouseLeave)
-{
-	pimpl->SendMouseMove(browserIdentifier, event, mouseLeave);
-}
-
-void BrowserManager::SendMouseWheel(int browserIdentifier,
-		const struct obs_mouse_event *event, int xDelta, int yDelta)
-{
-	pimpl->SendMouseWheel(browserIdentifier, event, xDelta, yDelta);
-}
-void BrowserManager::SendFocus(int browserIdentifier, bool focus)
-{
-	pimpl->SendFocus(browserIdentifier, focus);
-}
-
-void BrowserManager::SendKeyClick(int browserIdentifier,
-		const struct obs_key_event *event, bool keyUp)
-{
-	pimpl->SendKeyClick(browserIdentifier, event, keyUp);
-}
-
-void BrowserManager::ExecuteVisiblityJSCallback(int browserIdentifier, bool visible)
-{
-	pimpl->ExecuteVisiblityJSCallback(browserIdentifier, visible);
-}
-
-void BrowserManager::ExecuteActiveJSCallback(int browserIdentifier, bool active)
-{
-	pimpl->ExecuteActiveJSCallback(browserIdentifier, active);
-}
-
-void BrowserManager::ExecuteSceneChangeJSCallback(const char *name)
-{
-	pimpl->ExecuteSceneChangeJSCallback(name);
-}
-
-void BrowserManager::RefreshPageNoCache(int browserIdentifier)
-{
-    pimpl->RefreshPageNoCache(browserIdentifier);
-}
-
-void BrowserManager::DispatchJSEvent(const char *name, const char *jsonData)
-{
-	pimpl->DispatchJSEvent(name, jsonData);
-}
-
-int BrowserManager::CreateBrowser(const BrowserSettings &browserSettings,
-		const std::shared_ptr<BrowserListener> &browserListener)
-{
-	return pimpl->CreateBrowser(browserSettings, browserListener);
-}
-
-void BrowserManager::DestroyBrowser(int browserIdentifier)
-{
-	pimpl->DestroyBrowser(browserIdentifier);
-}
-
-BrowserManager::Impl::Impl()
-: cefIsolationServiceManager(new CEFIsolationServiceManager())
-{
-}
-
-void BrowserManager::Impl::Startup() {
-	cefIsolationServiceManager->Startup();
-}
-
-void BrowserManager::Impl::Shutdown() {
-	cefIsolationServiceManager->Shutdown();
-}
-
-int BrowserManager::Impl::CreateBrowser(const BrowserSettings &browserSettings,
-		const std::shared_ptr<BrowserListener> &browserListener)
-{
-	return cefIsolationServiceManager->CreateBrowser(
-		browserSettings, browserListener);
-}
-
-void BrowserManager::Impl::DestroyBrowser(int browserIdentifier)
-{
-	cefIsolationServiceManager->DestroyBrowser(browserIdentifier);
-}
-
-void BrowserManager::Impl::Restart()
-{
-	cefIsolationServiceManager->Restart();
-}
-
-void BrowserManager::Impl::TickBrowser(int browserIdentifier)
-{
-	cefIsolationServiceManager->TickBrowser(browserIdentifier);
-}
-
-void BrowserManager::Impl::SendMouseClick(int browserIdentifier,
-		const struct obs_mouse_event *event, int32_t type, bool mouseUp,
-		uint32_t clickCount)
-{
-	cefIsolationServiceManager->SendMouseClick(browserIdentifier,
-		event, type, mouseUp, clickCount);
-}
-
-void BrowserManager::Impl::SendMouseMove(int browserIdentifier,
-		const struct obs_mouse_event *event, bool mouseLeave)
-{
-	cefIsolationServiceManager->SendMouseMove(browserIdentifier,
-		event, mouseLeave);
-}
-
-void BrowserManager::Impl::SendMouseWheel(int browserIdentifier,
-		const struct obs_mouse_event *event, int xDelta, int yDelta)
-{
-	cefIsolationServiceManager->SendMouseWheel(browserIdentifier,
-		event, xDelta, yDelta);
-}
-
-void BrowserManager::Impl::SendFocus(int browserIdentifier, bool focus)
-{
-	cefIsolationServiceManager->SendFocus(browserIdentifier, focus);
-}
-
-void BrowserManager::Impl::SendKeyClick(int browserIdentifier,
-		const struct obs_key_event *event, bool keyUp)
-{
-	cefIsolationServiceManager->SendKeyClick(browserIdentifier, event,
-		keyUp);
-}
-
-void BrowserManager::Impl::ExecuteVisiblityJSCallback(int browserIdentifier, bool visible)
-{
-	cefIsolationServiceManager->ExecuteVisiblityJSCallback(browserIdentifier, visible);
-}
-
-void BrowserManager::Impl::ExecuteActiveJSCallback(int browserIdentifier, bool active)
-{
-	cefIsolationServiceManager->ExecuteActiveJSCallback(browserIdentifier, active);
-}
-
-void BrowserManager::Impl::ExecuteSceneChangeJSCallback(const char *name)
-{
-	cefIsolationServiceManager->ExecuteSceneChangeJSCallback(name);
-}
-
-void BrowserManager::Impl::RefreshPageNoCache(int browserIdentifier)
-{
-    cefIsolationServiceManager->RefreshPageNoCache(browserIdentifier);
-}
-
-void BrowserManager::Impl::DispatchJSEvent(const char *eventName, const char *jsonData)
-{
-	cefIsolationServiceManager->DispatchJSEvent(eventName, jsonData);
-}
-
-static BrowserManager *instance;
-
-BrowserManager *BrowserManager::Instance()
-{
-	if (instance == nullptr) {
-		instance = new BrowserManager();
-	}
-	return instance;
-}
-
-void BrowserManager::DestroyInstance()
-{
-	if (instance != nullptr) {
-		delete instance;
-	}
-	instance = nullptr;
-
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-source-listener-mac.h Deleted

@@ -1,47 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-#include <map>
-#include "browser-listener.hpp"
-#include "browser-types.h"
-
-class Impl;
-
-class BrowserSource::Impl::Listener : public BrowserListener
-{
-public:
-	Listener(BrowserSource::Impl * const browserSource)
-	: browserSource(browserSource)
-	{}
-
-	~Listener()
-	{}
-
-	void OnDraw(const BrowserSurfaceHandle surfaceHandle,
-			int width, int height);
-	bool CreateSurface(int width, int height,
-			BrowserSurfaceHandle *surfaceHandle);
-	void DestroySurface(BrowserSurfaceHandle surfaceHandle);
-	void Invalidated();
-
-private:
-	BrowserSource::Impl *browserSource;
-	std::map<int, std::shared_ptr<TextureRef>> textureMap;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-source-listener-mac.mm Deleted

@@ -1,143 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-#import <Foundation/Foundation.h>
-
-#import "cef-logging.h"
-#include "browser-source.hpp"
-#include "browser-source-mac.h"
-#include "browser-types.h"
-#include "browser-source-listener-mac.h"
-#include "texture-ref.hpp"
-
-void BrowserSource::Impl::Listener::OnDraw(BrowserSurfaceHandle surfaceHandle,
-		int width, int height)
-{
-	UNUSED_PARAMETER(width);
-	UNUSED_PARAMETER(height);
-
-	if (textureMap.count(surfaceHandle) > 0) {
-
-		obs_enter_graphics();
-		browserSource->GetParent()->LockTexture();
-		if (gs_texture_rebind_iosurface(
-			textureMap[surfaceHandle]->GetTexture(),
-			textureMap[surfaceHandle]->GetSurfaceRef()))
-		{
-			browserSource->SetActiveTexture(
-				textureMap[surfaceHandle].get());
-		} else {
-			browserSource->SetActiveTexture(nullptr);
-		}
-		browserSource->GetParent()->UnlockTexture();
-		obs_leave_graphics();
-
-	} else {
-		CEFLogError(@"Asked to draw unknown surface with handle"
-			"%d", surfaceHandle);
-	}
-}
-
-bool BrowserSource::Impl::Listener::CreateSurface(int width,
-		int height, BrowserSurfaceHandle *surfaceHandle)
-{
-	unsigned pixelFormat = 'BGRA';
-	unsigned bytesPerElement = 4;
-
-	unsigned long bytesPerRow = width * bytesPerElement;
-
-	if (!bytesPerRow) {
-		return 0;
-	}
-
-	unsigned long allocSize = height * bytesPerRow;
-
-	if (!allocSize) {
-		return 0;
-	}
-
-	CFDictionaryRef dictionaryRef =
-			(CFDictionaryRef)
-			[NSDictionary dictionaryWithObjectsAndKeys:
-				[NSNumber numberWithInt: width],
-				(id)kIOSurfaceWidth,
-				[NSNumber numberWithInt: height],
-				(id)kIOSurfaceHeight,
-				[NSNumber numberWithInt:bytesPerElement],
-				(id)kIOSurfaceBytesPerElement,
-				[NSNumber numberWithBool:YES],
-				(id)kIOSurfaceIsGlobal,
-				[NSNumber numberWithInt: pixelFormat],
-				(id)kIOSurfacePixelFormat,
-				[NSNumber numberWithLong: bytesPerRow],
-				(id)kIOSurfaceBytesPerRow,
-				[NSNumber numberWithLong: allocSize],
-				(id)kIOSurfaceAllocSize,
-				nil];
-
-	IOSurfaceRef ioSurfaceRef = IOSurfaceCreate(dictionaryRef);
-
-	if (ioSurfaceRef == nullptr) {
-		return false;
-	}
-
-	obs_enter_graphics();
-	gs_texture_t *ioSurfaceTex =
-		gs_texture_create_from_iosurface(ioSurfaceRef);
-
-	obs_leave_graphics();
-
-	if (ioSurfaceTex == nullptr) {
-		CFRelease(ioSurfaceRef);
-		return false;
-	}
-
-	int ioSurfaceHandle = IOSurfaceGetID(ioSurfaceRef);
-
-	textureMap[ioSurfaceHandle].reset(
-			new TextureRef(ioSurfaceRef, ioSurfaceTex));
-
-	*surfaceHandle = ioSurfaceHandle;
-
-	return true;
-}
-
-void BrowserSource::Impl::Listener::DestroySurface(
-		BrowserSurfaceHandle surfaceHandle)
-{
-	if (textureMap.count(surfaceHandle) == 1) {
-		obs_enter_graphics();
-		browserSource->GetParent()->LockTexture();
-		textureMap.erase(surfaceHandle);
-		browserSource->activeTexture = nullptr;
-		browserSource->GetParent()->UnlockTexture();
-		obs_leave_graphics();
-	}
-}
-
-void BrowserSource::Impl::Listener::Invalidated()
-{
-	obs_enter_graphics();
-	browserSource->GetParent()->LockTexture();
-	textureMap.clear();
-	browserSource->activeTexture = nullptr;
-	browserSource->GetParent()->browserIdentifier = 0;
-	browserSource->GetParent()->UnlockTexture();
-	obs_leave_graphics();
-
-	browserSource->GetParent()->UpdateBrowser();
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-source-mac.h Deleted

@@ -1,44 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <obs-module.h>
-#include "browser-source.hpp"
-
-class TextureRef;
-
-class BrowserSource::Impl {
-public:
-	Impl(BrowserSource *parent);
-	~Impl();
-public:
-	BrowserSource *GetParent() { return parent; }
-	void RenderCurrentTexture(gs_effect_t *effect);
-	std::shared_ptr<BrowserListener> CreateListener();
-	void SetActiveTexture(TextureRef *texture);
-	void InvalidateActiveTexture();
-
-private:
-	class Listener;
-	BrowserSource *parent;
-	TextureRef *activeTexture;
-	gs_effect_t *drawEffect;
-	gs_samplerstate_t *sampler;
-	gs_vertbuffer_t *vertexBuffer;
-
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-source-mac.mm Deleted

@@ -1,145 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <Foundation/Foundation.h>
-#include <memory>
-#include <map>
-
-#import "cef-logging.h"
-
-#include "browser-source.hpp"
-#include "browser-listener.hpp"
-#include "browser-manager.hpp"
-
-#include "browser-source-mac.h"
-#include "browser-source-listener-mac.h"
-
-#include "texture-ref.hpp"
-
-extern "C" {
-#include "graphics-helpers.h"
-}
-
-BrowserSource::BrowserSource(obs_data_t *settings, obs_source_t *source)
-:  pimpl(new Impl(this)), source(source)
-{
-	UpdateSettings(settings);
-}
-
-
-BrowserSource::~BrowserSource()
-{
-	if (browserIdentifier != 0) {
-		BrowserManager::Instance()->DestroyBrowser(browserIdentifier);
-	}
-}
-
-BrowserSource::Impl::Impl(BrowserSource *parent)
-: parent(parent), activeTexture(nullptr)
-{
-	obs_enter_graphics();
-
-	drawEffect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
-
-	struct gs_sampler_info info = {
-		.filter = GS_FILTER_LINEAR,
-		.address_u = GS_ADDRESS_CLAMP,
-		.address_v = GS_ADDRESS_CLAMP,
-		.address_w = GS_ADDRESS_CLAMP,
-		.max_anisotropy = 1,
-	};
-	sampler = gs_samplerstate_create(&info);
-	vertexBuffer = create_vertex_buffer();
-
-	obs_leave_graphics();
-}
-
-BrowserSource::Impl::~Impl()
-{
-	obs_enter_graphics();
-	if (vertexBuffer != nullptr) {
-		gs_vertexbuffer_destroy(vertexBuffer);
-		vertexBuffer = nullptr;
-	}
-	if (sampler != nullptr) {
-		gs_samplerstate_destroy(sampler);
-		sampler = nullptr;
-	}
-	obs_leave_graphics();
-}
-
-std::shared_ptr<BrowserListener> BrowserSource::CreateListener()
-{
-	return pimpl->CreateListener();
-}
-
-void BrowserSource::RenderActiveTexture(gs_effect_t *effect)
-{
-	pimpl->RenderCurrentTexture(effect);
-}
-
-void BrowserSource::InvalidateActiveTexture()
-{
-	pimpl->InvalidateActiveTexture();
-}
-
-void BrowserSource::Impl::RenderCurrentTexture(gs_effect_t *effect)
-{
-	UNUSED_PARAMETER(effect);
-
-	GetParent()->LockTexture();
-
-	build_sprite_rect(gs_vertexbuffer_get_data(vertexBuffer),
-			0, 0, parent->GetWidth(), parent->GetHeight());
-
-	if (activeTexture != nullptr) {
-		gs_vertexbuffer_flush(vertexBuffer);
-		gs_load_vertexbuffer(vertexBuffer);
-		gs_load_indexbuffer(NULL);
-		gs_load_samplerstate(sampler, 0);
-
-		gs_technique_t *tech = gs_effect_get_technique(drawEffect,
-				"Draw");
-		gs_effect_set_texture(gs_effect_get_param_by_name(
-					drawEffect, "image"),
-				activeTexture->GetTexture());
-
-		gs_technique_begin(tech);
-		gs_technique_begin_pass(tech, 0);
-		gs_draw(GS_TRISTRIP, 0, 4);
-
-		gs_technique_end_pass(tech);
-		gs_technique_end(tech);
-	}
-	
-	GetParent()->UnlockTexture();
-}
-void BrowserSource::Impl::SetActiveTexture(TextureRef *texture)
-{
-	activeTexture = texture;
-}
-
-void BrowserSource::Impl::InvalidateActiveTexture()
-{
-	activeTexture = nullptr;
-}
-
-std::shared_ptr<BrowserListener> BrowserSource::Impl::CreateListener()
-{
-	return std::shared_ptr<BrowserListener>(
-			new BrowserSource::Impl::Listener(this));
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service-manager.h Deleted

@@ -1,84 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <Foundation/Foundation.h>
-#include <string>
-#include <jansson.h>
-
-@class CEFIsolationService;
-@class ClientConnectionDelegate;
-
-class BrowserListener;
-struct BrowserSettings;
-
-class CEFIsolationServiceManager {
-
-public:
-	CEFIsolationServiceManager();
-	~CEFIsolationServiceManager();
-
-public:
-	void Startup();
-	void Shutdown();
-	void Restart();
-	
-	int CreateBrowser(const BrowserSettings &browserSettings,
-			const std::shared_ptr<BrowserListener>
-			&browserListener);
-	void DestroyBrowser(int browserIdentifier);
-
-	void TickBrowser(int browserIdentifier);
-
-	void SendMouseClick(int browserIdentifier,
-			const struct obs_mouse_event *event, int32_t type,
-			bool mouseUp, uint32_t clickCount);
-	void SendMouseMove(int browserIdentifier,
-			const struct obs_mouse_event *event, bool mouseLeave);
-	void SendMouseWheel(int browserIdentifier,
-			const struct obs_mouse_event *event, int xDelta,
-			int yDelta);
-	void SendFocus(int browserIdentifier, bool focus);
-	void SendKeyClick(int browserIdentifier,
-			const struct obs_key_event *event, bool key_up);
-
-	void ExecuteVisiblityJSCallback(int browserIdentifier, bool visible);
-
-	void ExecuteActiveJSCallback(int browserIdentifier, bool active);
-
-	void ExecuteSceneChangeJSCallback(const char *name);
-    
-    void RefreshPageNoCache(int browserIdentifier);
-
-	void DispatchJSEvent(const char *eventName, const char *jsonData);
-
-public:
-	NSString *GetUniqueClientName() { return _uniqueClientName; }
-
-	CEFIsolationService *GetCefIsolationService()
-	{
-		return _cefIsolationService;
-	}
-
-private:
-	ClientConnectionDelegate *delegate;
-	NSString *_uniqueClientName;
-	CEFIsolationService *_cefIsolationService;
-	NSObject *cefIsolationServiceLock;
-
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service-manager.mm Deleted

@@ -1,288 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <string>
-#import <Foundation/Foundation.h>
-
-// shared
-#include "browser-listener.hpp"
-#include "browser-settings.hpp"
-#include "browser-manager.hpp"
-
-// shared apple
-#import "cef-logging.h"
-#import "cef-isolation.h"
-#import "browser-bridges.h"
-
-#import "cef-isolation-service.h"
-#import "client-connection-delegate.h"
-
-#include "cef-isolation-service-manager.h"
-
-
-
-NSString *CreateUUID()
-{
-	CFUUIDRef uuid = CFUUIDCreate(NULL);
-	CFStringRef str = CFUUIDCreateString(NULL, uuid);
-	CFRelease(uuid);
-	return (NSString *)CFBridgingRelease(str);
-}
-
-CEFIsolationServiceManager::CEFIsolationServiceManager()
-{
-	cefIsolationServiceLock = [[NSObject alloc] init];
-}
-
-CEFIsolationServiceManager::~CEFIsolationServiceManager()
-{
-	[cefIsolationServiceLock release];
-}
-
-void CEFIsolationServiceManager::Startup()
-{
-
-	_uniqueClientName = CreateUUID();
-	_cefIsolationService = [[CEFIsolationService alloc] init];
-	delegate = [[ClientConnectionDelegate alloc]
-			initWithManager: this];
-
-	// Eventually move this to NSThread alloc/init so we can
-	// attach lifetime observers before it starts
-	[NSThread detachNewThreadSelector: @selector(createConnectionThread)
-			toTarget: delegate withObject: nil];
-}
-
-void CEFIsolationServiceManager::Shutdown()
-{
-	[delegate shutdown];
-	_cefIsolationService = nil;
-	_uniqueClientName = nil;
-	delegate = nil;
-}
-
-void CEFIsolationServiceManager::Restart()
-{
-	[delegate restart];
-}
-
-int CEFIsolationServiceManager::CreateBrowser(
-		const BrowserSettings &browserSettings,
-		const std::shared_ptr<BrowserListener> &browserListener)
-{
-	id<CEFIsolatedClient> cefIsolatedClient = nil;
-	int browserIdentifier = 0;
-
-	@synchronized(cefIsolationServiceLock) {
-		if ([_cefIsolationService client] != nil) {
-			cefIsolatedClient = [_cefIsolationService client];
-		}
-	}
-	@try {
-		@autoreleasepool {
-			BrowserSettingsBridge *browserSettingsBridge =
-					[[BrowserSettingsBridge
-						fromBrowserSettings:
-						browserSettings] autorelease];
-
-			browserIdentifier = [cefIsolatedClient createBrowser:
-					browserSettingsBridge];
-		}
-		if (browserIdentifier != 0) {
-			[_cefIsolationService addListener: browserListener
-					browserIdentifier: browserIdentifier];
-		}
-
-	}
-	@catch (NSException *exception) {}
-	@finally {
-		return browserIdentifier;
-	}
-}
-
-void CEFIsolationServiceManager::DestroyBrowser(int browserIdentifier)
-{
-	id<CEFIsolatedClient> cefIsolatedClient = nil;
-
-	// Do we really need to synchronize on this?
-	@synchronized(cefIsolationServiceLock) {
-		if ([_cefIsolationService client] != nil) {
-			cefIsolatedClient = [_cefIsolationService client];
-		}
-	}
-	@try {
-		[cefIsolatedClient destroyBrowser: browserIdentifier];
-
-	}
-	@catch (NSException *exception) {}
-	@finally {
-		[_cefIsolationService removeListener: browserIdentifier];
-	}
-}
-
-void CEFIsolationServiceManager::TickBrowser(int browserIdentifier)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-
-	@try {
-		[cefIsolatedClient tickBrowser: browserIdentifier];
-	}
-	@catch (NSException *exception) {}
-}
-
-
-void CEFIsolationServiceManager::SendMouseClick(int browserIdentifier,
-		const struct obs_mouse_event *event, int32_t type, bool mouseUp,
-		uint32_t clickCount)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		@autoreleasepool {
-			ObsMouseEventBridge *obsMouseEventBridge =
-					[[ObsMouseEventBridge fromObsMouseEvent:
-						event]
-					autorelease];
-
-			[cefIsolatedClient sendMouseClick:browserIdentifier
-					event:obsMouseEventBridge type:type
-					mouseUp:mouseUp clickCount:clickCount];
-		}
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::SendMouseMove(int browserIdentifier,
-		const struct obs_mouse_event *event, bool mouseLeave)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		@autoreleasepool {
-			ObsMouseEventBridge *obsMouseEventBridge =
-					[[ObsMouseEventBridge fromObsMouseEvent:
-						event]
-					autorelease];
-
-			[cefIsolatedClient sendMouseMove:browserIdentifier
-					event:obsMouseEventBridge
-					mouseLeave:mouseLeave];
-		}
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::SendMouseWheel(int browserIdentifier,
-		const struct obs_mouse_event *event, int xDelta, int yDelta)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		@autoreleasepool {
-			ObsMouseEventBridge *obsMouseEventBridge =
-					[[ObsMouseEventBridge fromObsMouseEvent:
-						event]
-					autorelease];
-
-			[cefIsolatedClient sendMouseWheel:browserIdentifier
-				event:obsMouseEventBridge xDelta:xDelta
-				yDelta:yDelta];
-		}
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::SendFocus(int browserIdentifier, bool focus)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		[cefIsolatedClient sendFocus:browserIdentifier
-				focus:focus];
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::SendKeyClick(int browserIdentifier,
-		const struct obs_key_event *event, bool keyUp)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		@autoreleasepool {
-			ObsKeyEventBridge *obsKeyEventBridge =
-					[[ObsKeyEventBridge fromObsKeyEvent:
-						event]
-					autorelease];
-
-			[cefIsolatedClient sendKeyClick:browserIdentifier
-					event:obsKeyEventBridge keyUp:keyUp];
-		}
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::ExecuteVisiblityJSCallback(int browserIdentifier, bool visible)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		[cefIsolatedClient executeVisiblityJSCallback:browserIdentifier visible:visible];
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::ExecuteActiveJSCallback(int browserIdentifier, bool active)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-	[_cefIsolationService client];
-	@try {
-		[cefIsolatedClient executeActiveJSCallback:browserIdentifier active:active];
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::ExecuteSceneChangeJSCallback(const char *name)
-{
-    id<CEFIsolatedClient> cefIsolatedClient =
-    [_cefIsolationService client];
-    @try {
-        [cefIsolatedClient executeSceneChangeJSCallback:name];
-    }
-    @catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::RefreshPageNoCache(int browserIdentifier)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		[cefIsolatedClient refreshPageNoCache:browserIdentifier];
-	}
-	@catch (NSException *exception) {}
-}
-
-void CEFIsolationServiceManager::DispatchJSEvent(const char *eventName, const char *jsonData)
-{
-	id<CEFIsolatedClient> cefIsolatedClient =
-		[_cefIsolationService client];
-	@try {
-		[cefIsolatedClient dispatchJSEvent:eventName data:jsonData];
-	}
-	@catch (NSException *exception) {}
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service.h Deleted

@@ -1,31 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-#include "cef-isolation.h"
-
-class BrowserListener;
-
-@interface CEFIsolationService : NSObject <CEFIsolationService>
-@property (readonly) id<CEFIsolatedClient> client;
-
-- (void)addListener: (const std::shared_ptr<BrowserListener> &)browserListener
-		browserIdentifier: (int)browserIdentifier;
-- (void)removeListener: (int)browserIdentifier;
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service.mm Deleted

@@ -1,146 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <map>
-
-#include <obs-module.h>
-#include <util/platform.h>
-#import "cef-isolation.h"
-#import "cef-logging.h"
-
-#import "cef-isolation-service.h"
-
-#include "browser-listener.hpp"
-
-#include <obs-frontend-api.h>
-#include "util.hpp"
-
-@implementation CEFIsolationService
-{
-	std::map<int, std::shared_ptr<BrowserListener> > listenerMap;
-	NSObject *listenerLock;
-
-}
-
-- (id)init
-{
-	self = [super init];
-	if (self) {
-		listenerLock = [[NSObject alloc] init];
-	}
-
-	return self;
-}
-
-- (void)addListener:(const std::shared_ptr<BrowserListener> &)browserListener
-		browserIdentifier: (int)browserIdentifier
-{
-	listenerMap[browserIdentifier] = browserListener;
-}
-
-- (void)removeListener:(int)browserIdentifier
-{
-	listenerMap.erase(browserIdentifier);
-}
-
-/* Protocol methods */
-
-- (oneway void)registerClient:(id<CEFIsolatedClient>)client
-{
-	@try {
-		CEFLogDebug(@"Registered client");
-		_client = client;
-		CEFLogDebug(@"Attempting to register server with client");
-		[_client registerServer: self];
-	}
-	@catch (NSException *exception) {
-		[self invalidateClient:client withException:exception];
-	}	
-}
-
-- (BOOL)createSurface:(int)browserIdentifier width:(int)width height:(int)height
-		surfaceHandle:(BrowserSurfaceHandle *)surfaceHandle
-{
-	@synchronized(listenerLock) {
-		if (listenerMap.count(browserIdentifier) == 1) {
-			BrowserListener *listener =
-					listenerMap[browserIdentifier].get();
-			return listener->CreateSurface(width, height,
-					surfaceHandle);
-		}
-	}
-	return false;
-}
-- (void)destroySurface:(int)browserIdentifier
-		surfaceHandle:(BrowserSurfaceHandle)surfaceHandle
-{
-	@synchronized(listenerLock) {
-		if (listenerMap.count(browserIdentifier) == 1) {
-			BrowserListener *listener =
-					listenerMap[browserIdentifier].get();
-			listener->DestroySurface(surfaceHandle);
-		}
-	}
-}
-
-- (void)onDraw:(int)browserIdentifier width:(int)width height:(int)height
-		surfaceHandle:(BrowserSurfaceHandle)surfaceHandle
-{
-	@synchronized(listenerLock) {
-		if (listenerMap.count(browserIdentifier) == 1) {
-			BrowserListener *listener =
-					listenerMap[browserIdentifier].get();
-			listener->OnDraw(surfaceHandle, width, height);
-		}
-	}
-}
-
-- (const char*)getCurrentSceneJSONData
-{
-	obs_source_t *source = obs_frontend_get_current_scene();
-
-	const char* jsonString = obsSourceToJSON(source);
-
-	obs_source_release(source);
-
-	return jsonString;
-}
-
-- (const char*)getStatus
-{
-	const char* jsonString = obsStatusToJSON();
-	return jsonString;
-}
-
-- (void)invalidateClient:(id)client withException:(NSException *)exception
-{
-	UNUSED_PARAMETER(client);
-	if (exception) CEFLogError(@"Client Exception: %@", exception);
-	_client = nil;
-
-	@synchronized(listenerLock) {
-		for(auto i = listenerMap.begin();
-		    i != listenerMap.end();
-		    i++)
-		{
-			(*i).second->Invalidated();
-		}
-		listenerMap.clear();
-	}
-}
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/client-connection-delegate.h Deleted

@@ -1,32 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-class CEFIsolationServiceManager;
-
-@interface ClientConnectionDelegate : NSObject
-
-@property (readonly) CEFIsolationServiceManager *manager;
-
-- (ClientConnectionDelegate *)initWithManager:
-		(CEFIsolationServiceManager *)manager;
-- (void)createConnectionThread;
-- (void)restart;
-- (void)shutdown;
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/client-connection-delegate.mm Deleted

@@ -1,185 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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/>.
- ******************************************************************************/
-
-#import "cef-logging.h"
-
-#import "cef-isolation.h"
-#import "cef-isolation-service.h"
-#import "cef-isolation-service-manager.h"
-#import "client-connection-delegate.h"
-#include "browser-manager.hpp"
-
-@implementation ClientConnectionDelegate
-{
-	NSConditionLock *lock;
-	BOOL shutdown;
-	BOOL newConnection;
-	NSThread *connectionThread;
-	NSTask *clientProcess;
-}
-
-
-#define T_START 0
-#define T_FINISHED 1
-
-
-- (ClientConnectionDelegate *)initWithManager:
-		(CEFIsolationServiceManager *)manager
-{
-	self = [super init];
-	if (self) {
-		lock = [[[NSConditionLock alloc] initWithCondition: T_START]
-				autorelease];
-		_manager = manager;
-	}
-	return self;
-}
-
-- (void)connectionDidDie:(NSNotification *)aNotification
-{
-	(void)aNotification;
-
-	if (!shutdown && !newConnection) {
-		CEFLogError(@"Lost connection to isolated client process");
-		[self restart];
-	}
-}
-
-- (NSConnection *)createConnectionWithRunLoop:(NSRunLoop *)runLoop
-{
-	CEFLogDebug(@"Creating service %@", _manager->GetUniqueClientName());
-
-	NSString *launchPath = [NSString stringWithUTF8String:
-			BrowserManager::Instance()->GetModulePath()];
-
-	launchPath = [launchPath stringByDeletingLastPathComponent];
-	launchPath = [launchPath stringByAppendingPathComponent:
-			@"/CEF.app/Contents/MacOS/CEF"];
-
-	CEFLogDebug(@"Launching child process %@", launchPath);
-	if (clientProcess != nil && clientProcess.isRunning) {
-		CEFLogDebug(@"Existing process %d found; terminating",
-				clientProcess.processIdentifier);
-		[clientProcess terminate];
-	}
-
-	clientProcess = [[[NSTask alloc] init] autorelease];
-	[clientProcess setArguments: @[ _manager->GetUniqueClientName() ]];
-	[clientProcess setLaunchPath: launchPath];
-
-	[clientProcess launch];
-	
-	NSConnection *connection = [[[NSConnection alloc] init] autorelease];
-
-	[connection registerName: _manager->GetUniqueClientName()];
-	[connection setRootObject: _manager->GetCefIsolationService()];
-	[connection addRunLoop: runLoop];
-
-
-
-	return connection;
-
-}
-
-- (void)createConnectionThread
-{
-	[[NSThread currentThread] setName: @"CEF Isolation IO Thread"];
-
-	@autoreleasepool {
-
-		CEFLogDebug(@"Creating connection");
-
-		[lock lockWhenCondition: T_START];
-
-		NSRunLoop *threadRunLoop = [NSRunLoop currentRunLoop];
-		connectionThread = [NSThread currentThread];
-
-		[[NSNotificationCenter defaultCenter] addObserver:self
-				selector:@selector(connectionDidDie:)
-				name:NSConnectionDidDieNotification
-				object:nil];
-
-		NSConnection *connection = nullptr;
-		shutdown = NO;
-		newConnection = YES;
-		while (!shutdown) {
-			if (newConnection) {
-				if (connection != nil) {
-					// it should already be invalidated
-					connection = nil;
-				}
-				[_manager->GetCefIsolationService()
-						invalidateClient: nil
-						withException: nil];
-				connection = [self createConnectionWithRunLoop:
-						threadRunLoop];
-				newConnection = NO;
-			}
-			@autoreleasepool {
-				[threadRunLoop runMode:NSDefaultRunLoopMode
-						beforeDate:
-							[NSDate distantFuture]];
-			}
-		}
-
-		[[NSNotificationCenter defaultCenter] removeObserver:self
-				name:NSConnectionDidDieNotification
-				object:nil];
-
-		[connection invalidate];
-		connection = nil;
-		if (clientProcess != nullptr) {
-			[clientProcess terminate];
-			clientProcess = nil;
-		}
-
-	}
-
-	connectionThread = nil;
-
-	[lock unlockWithCondition: T_FINISHED];
-}
-
-- (void)restartConnection
-{
-	newConnection = YES;
-}
-
-- (void)shutdownThread
-{
-	shutdown = YES;
-}
-
-- (void)restart
-{
-	[self performSelector:@selector(restartConnection)
-			onThread:connectionThread withObject:nil
-			waitUntilDone:NO];
-}
-
-- (void)shutdown
-{
-	[self performSelector:@selector(shutdownThread)
-			onThread:connectionThread withObject:nil
-			waitUntilDone:NO];
-
-	// wait for thread to finish
-	[lock lockWhenCondition: T_FINISHED];
-	[lock unlockWithCondition: T_START];
-}
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/graphics-helpers.c Deleted

@@ -1,70 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "graphics-helpers.h"
-
-gs_vertbuffer_t *create_vertex_buffer()
-{
-	struct gs_vb_data *vb_data = gs_vbdata_create();
-
-	vb_data->num = 4;
-	vb_data->points = (struct vec3 *)bzalloc(sizeof(struct vec3) * 4);
-	if (!vb_data->points) {
-		gs_vbdata_destroy(vb_data);
-		return NULL;
-	}
-
-	vb_data->num_tex = 1;
-	vb_data->tvarray = (struct gs_tvertarray *)
-	bzalloc(sizeof(struct gs_tvertarray));
-
-	if (!vb_data->tvarray) {
-		gs_vbdata_destroy(vb_data);
-		return NULL;
-	}
-
-	vb_data->tvarray[0].width = 2;
-	vb_data->tvarray[0].array = bzalloc(sizeof(struct vec2) * 4);
-
-	if (!vb_data->tvarray[0].array) {
-		gs_vbdata_destroy(vb_data);
-		return NULL;
-	}
-
-	return gs_vertexbuffer_create(vb_data, GS_DYNAMIC);
-}
-
-void build_sprite(struct gs_vb_data *data, float fcx, float fcy,
-		float start_u, float end_u, float start_v, float end_v)
-{
-	struct vec2 *tvarray = (struct vec2 *)data->tvarray[0].array;
-
-	vec3_set(data->points+1,  fcx, 0.0f, 0.0f);
-	vec3_set(data->points+2, 0.0f,  fcy, 0.0f);
-	vec3_set(data->points+3,  fcx,  fcy, 0.0f);
-	vec2_set(tvarray,   start_u, start_v);
-	vec2_set(tvarray+1, end_u,   start_v);
-	vec2_set(tvarray+2, start_u, end_v);
-	vec2_set(tvarray+3, end_u,   end_v);
-}
-
-void build_sprite_rect(struct gs_vb_data *data, float origin_x, float origin_y,
-		float end_x, float end_y)
-{
-	build_sprite(data, fabs(end_x - origin_x), fabs(end_y - origin_y),
-			origin_x, end_x, origin_y, end_y);
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/graphics-helpers.h Deleted

@@ -1,30 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <obs-module.h>
-
-gs_vertbuffer_t *create_vertex_buffer();
-
-void build_sprite(struct gs_vb_data *data,
-		float fcx, float fcy, float start_u, float end_u, float start_v,
-		float end_v);
-
-void build_sprite_rect(
-		struct gs_vb_data *data, float origin_x, float origin_y,
-		float end_x, float end_y);

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/apple/texture-ref.hpp Deleted

@@ -1,47 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <obs-module.h>
-#import <Foundation/Foundation.h>
-#import <IOSurface/IOSurfaceAPI.h>
-
-class TextureRef {
-public:
-	TextureRef(IOSurfaceRef ioSurfaceRef, gs_texture_t *texture)
-	: ioSurfaceRef(ioSurfaceRef), texture(texture)
-	{
-		IOSurfaceIncrementUseCount(ioSurfaceRef);
-	}
-
-	~TextureRef() {
-		obs_enter_graphics();
-		gs_texture_destroy(texture);
-		obs_leave_graphics();
-		IOSurfaceDecrementUseCount(ioSurfaceRef);
-		CFRelease(ioSurfaceRef);
-	}
-
-public:
-	gs_texture_t *GetTexture() const { return texture; }
-	IOSurfaceRef GetSurfaceRef() const { return ioSurfaceRef; }
-
-private:
-	IOSurfaceRef ioSurfaceRef;
-	gs_texture_t *texture;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-load-handler.cpp Deleted

@@ -1,48 +0,0 @@
-/******************************************************************************
-Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-load-handler.hpp"
-#include "browser-listener.hpp"
-#include "base64.hpp"
-
-BrowserLoadHandler::BrowserLoadHandler(const std::string css)
-	: css(css)
-{
-}
-
-BrowserLoadHandler::~BrowserLoadHandler()
-{
-	
-}
-
-void BrowserLoadHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode)
-{
-	if (frame->IsMain())
-	{
-		std::string base64EncodedCSS = base64_encode(reinterpret_cast<const unsigned char*>(css.c_str()),css.length());
-		std::string href = "data:text/css;charset=utf-8;base64," + base64EncodedCSS;
-
-		std::string script = "";
-		script += "var link = document.createElement('link');";
-		script += "link.setAttribute('rel', 'stylesheet');";
-		script += "link.setAttribute('type', 'text/css');";
-		script += "link.setAttribute('href', '" + href + "');";
-		script += "document.getElementsByTagName('head')[0].appendChild(link);";
-		
-		frame->ExecuteJavaScript(script, href, 0);
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-load-handler.hpp Deleted

@@ -1,44 +0,0 @@
-/******************************************************************************
-Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-#pragma once
-
-#include <vector>
-
-#include <include/cef_load_handler.h>
-
-class BrowserListener;
-
-class BrowserLoadHandler : public CefLoadHandler
-{
-public:
-
-	BrowserLoadHandler(const std::string css);
-
-	~BrowserLoadHandler();
-
-public: /* CefLoadHandler overrides */
-
-	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) OVERRIDE;
-
-private:
-	const std::string css;
-
-private:
-	IMPLEMENT_REFCOUNTING(BrowserLoadHandler);
-
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.cpp Deleted

@@ -1,607 +0,0 @@
-#include <util/platform.h>
-#include <include/cef_version.h>
-
-#include "browser-manager-base.hpp"
-#include "browser-task.hpp"
-#include "browser-app.hpp"
-#include "browser-settings.hpp"
-#include "browser-scheme.hpp"
-#include "browser-client.hpp"
-#include "browser-render-handler.hpp"
-#include "browser-load-handler.hpp"
-#include "browser-obs-bridge-base.hpp"
-#include "browser-listener.hpp"
-
-BrowserManager::BrowserManager()
-: pimpl(new BrowserManager::Impl())
-{}
-
-BrowserManager::~BrowserManager()
-{}
-
-void BrowserManager::Startup()
-{
-	pimpl->Startup();
-}
-
-void BrowserManager::Shutdown()
-{
-	pimpl->Shutdown();
-}
-
-int BrowserManager::CreateBrowser(
-	const BrowserSettings &browserSettings,
-	const std::shared_ptr<BrowserListener> &browserListener)
-{
-	return pimpl->CreateBrowser(browserSettings, browserListener);
-}
-
-CefBrowserHost* BrowserManager::GetBrowserHost(int browserIdentifier)
-{
-	return pimpl->GetBrowserHost(browserIdentifier);
-}
-
-CefBrowser* BrowserManager::GetBrowser(int browserIdentifier)
-{
-	return pimpl->GetBrowser(browserIdentifier);
-}
-
-void BrowserManager::LoadURL(int browserIdentifier, CefString& url)
-{
-	return pimpl->LoadURL(browserIdentifier, url);
-}
-
-bool BrowserManager::IsValidBrowserIdentifier(int browserIdentifier)
-{
-	return pimpl->IsValidBrowserIdentifier(browserIdentifier);
-}
-
-void BrowserManager::DestroyBrowser(int browserIdentifier)
-{
-	pimpl->DestroyBrowser(browserIdentifier);
-}
-
-void BrowserManager::TickBrowser(int browserIdentifier)
-{	
-	pimpl->TickBrowser(browserIdentifier);
-}
-
-void BrowserManager::SendMouseClick(int browserIdentifier,
-		const struct obs_mouse_event *event, int32_t type,
-		bool mouse_up, uint32_t click_count)
-{
-	pimpl->SendMouseClick(browserIdentifier, event, type, mouse_up, 
-			click_count);
-}
-
-void BrowserManager::SendMouseMove(int browserIdentifier,
-		const struct obs_mouse_event *event, bool mouseLeave)
-{
-	pimpl->SendMouseMove(browserIdentifier, event, mouseLeave);
-}
-
-void BrowserManager::SendMouseWheel(int browserIdentifier,
-		const struct obs_mouse_event *event, int xDelta,
-		int yDelta)
-{
-	pimpl->SendMouseWheel(browserIdentifier, event, xDelta, yDelta);
-}
-
-void BrowserManager::SendFocus(int browserIdentifier, bool focus)
-{
-	pimpl->SendFocus(browserIdentifier, focus);
-}
-
-void BrowserManager::SendKeyClick(int browserIdentifier,
-		const struct obs_key_event *event, bool keyUp)
-{
-	pimpl->SendKeyClick(browserIdentifier, event, keyUp);
-}
-
-void BrowserManager::ExecuteVisiblityJSCallback(int browserIdentifier, bool visible)
-{
-	pimpl->ExecuteVisiblityJSCallback(browserIdentifier, visible);
-}
-
-void BrowserManager::ExecuteActiveJSCallback(int browserIdentifier, bool active)
-{
-	pimpl->ExecuteActiveJSCallback(browserIdentifier, active);
-}
-
-void BrowserManager::ExecuteSceneChangeJSCallback(const char *name)
-{
-	pimpl->ExecuteSceneChangeJSCallback(name);
-}
-
-void BrowserManager::RefreshPageNoCache(int browserIdentifier)
-{
-	pimpl->RefreshPageNoCache(browserIdentifier);
-}
-
-/**
-	Sends JSON Data about an OBS event to be executed as a DOM event.
-	The jsonString is already encoded so that we can pass it across the process boundary that cef-isolation creates.
-
-	@param eventName the name of the DOM event that we will fire
-	@param jsonString A json encoded string that will be accessable from the detail field of the event object
-	@return
-*/
-void BrowserManager::DispatchJSEvent(const char *eventName, const char *jsonString)
-{
-	pimpl->DispatchJSEvent(eventName, jsonString);
-}
-
-BrowserManager::Impl::Impl()
-{
-	os_event_init(&dispatchEvent, OS_EVENT_TYPE_AUTO);
-	os_event_init(&startupEvent, OS_EVENT_TYPE_MANUAL);
-	pthread_mutex_init(&dispatchLock, nullptr);
-}
-
-BrowserManager::Impl::~Impl()
-{
-	pthread_mutex_destroy(&dispatchLock);
-	os_event_destroy(startupEvent);
-	os_event_destroy(dispatchEvent);
-}
-
-int BrowserManager::Impl::CreateBrowser(
-		const BrowserSettings &browserSettings,
-		const std::shared_ptr<BrowserListener> &browserListener)
-{
-	int browserIdentifier = -1;
-	os_event_t *createdEvent;
-	os_event_init(&createdEvent, OS_EVENT_TYPE_AUTO);
-
-	os_event_wait(startupEvent);
-
-	BrowserOBSBridge *browserOBSBridge = new BrowserOBSBridgeBase();
-
-	CefPostTask(TID_UI, BrowserTask::newTask(
-			[&] 
-	{
-		CefRefPtr<BrowserRenderHandler> renderHandler(
-				new BrowserRenderHandler(browserSettings.width, 
-				browserSettings.height, browserListener));
-
-		CefRefPtr<BrowserLoadHandler> loadHandler(
-				new BrowserLoadHandler(browserSettings.css));
-
-		CefRefPtr<BrowserClient> browserClient(
-				new BrowserClient(renderHandler, loadHandler, browserOBSBridge));
-
-		CefWindowInfo windowInfo;
-#if CHROME_VERSION_BUILD < 3071
-		windowInfo.transparent_painting_enabled = true;
-#endif
-		windowInfo.width = browserSettings.width;
-		windowInfo.height = browserSettings.height;
-		windowInfo.windowless_rendering_enabled = true;
-
-		CefBrowserSettings cefBrowserSettings;
-		cefBrowserSettings.windowless_frame_rate = browserSettings.fps;
-
-		CefRefPtr<CefBrowser> browser =
-				CefBrowserHost::CreateBrowserSync(windowInfo, 
-				browserClient, browserSettings.url, 
-				cefBrowserSettings, nullptr);
-
-		if (browser != nullptr) {
-			browserIdentifier = browser->GetIdentifier();
-			browserListener->SetBrowserIdentifier(browserIdentifier);
-			browserMap[browserIdentifier] = browser;
-		}
-		os_event_signal(createdEvent);
-	}));
-
-	os_event_wait(createdEvent);
-	os_event_destroy(createdEvent);
-	return browserIdentifier;
-}
-
-CefBrowserHost* BrowserManager::Impl::GetBrowserHost(int browserIdentifier)
-{
-	CefBrowserHost* result = NULL;
-
-	os_event_t* complete_event;
-	os_event_init(&complete_event, OS_EVENT_TYPE_AUTO);
-
-	CefPostTask(TID_UI, BrowserTask::newTask(
-		[&]
-	{
-		result = browserMap[browserIdentifier]->GetHost();
-
-		os_event_signal(complete_event);
-	}));
-
-	os_event_wait(complete_event);
-	os_event_destroy(complete_event);
-
-	return result;
-}
-
-CefBrowser* BrowserManager::Impl::GetBrowser(int browserIdentifier)
-{
-	CefBrowser* result = NULL;
-
-	os_event_t* complete_event;
-	os_event_init(&complete_event, OS_EVENT_TYPE_AUTO);
-
-	CefPostTask(TID_UI, BrowserTask::newTask(
-		[&]
-	{
-		result = browserMap[browserIdentifier];
-
-		os_event_signal(complete_event);
-	}));
-
-	os_event_wait(complete_event);
-	os_event_destroy(complete_event);
-
-	return result;
-}
-
-void BrowserManager::Impl::LoadURL(int browserIdentifier, CefString& url)
-{
-	os_event_t* complete_event;
-	os_event_init(&complete_event, OS_EVENT_TYPE_AUTO);
-
-	CefPostTask(TID_UI, BrowserTask::newTask(
-		[&]
-	{
-		browserMap[browserIdentifier]->GetMainFrame()->LoadURL(url);
-
-		os_event_signal(complete_event);
-	}));
-
-	os_event_wait(complete_event);
-	os_event_destroy(complete_event);
-}
-
-bool BrowserManager::Impl::IsValidBrowserIdentifier(int browserIdentifier)
-{
-	return browserIdentifier >= 0 && browserMap.count(browserIdentifier) > 0;
-}
-
-void 
-BrowserManager::Impl::DestroyBrowser(int browserIdentifier)
-{
-	if (browserMap.count(browserIdentifier) > 0) {
-		CefRefPtr<CefBrowser> browser = browserMap[browserIdentifier];
-		browserMap.erase(browserIdentifier);
-		os_event_t *closeEvent;
-		os_event_init(&closeEvent, OS_EVENT_TYPE_AUTO);
-		CefPostTask(TID_UI, BrowserTask::newTask([&, browser] 
-		{
-			// This stops rendering
-			// http://magpcss.org/ceforum/viewtopic.php?f=6&t=12079
-			// https://bitbucket.org/chromiumembedded/cef/issues/1363/washidden-api-got-broken-on-branch-2062)
-			browser->GetHost()->WasHidden(true);
-
-			browser->GetHost()->CloseBrowser(true);
-			os_event_signal(closeEvent);
-		}));
-		os_event_wait(closeEvent);
-		os_event_destroy(closeEvent);
-		browserMap.erase(browserIdentifier);
-	}
-}
-
-void 
-BrowserManager::Impl::TickBrowser(int browserIdentifier)
-{}
-
-void BrowserManager::Impl::ExecuteOnBrowser(int browserIdentifier, 
-		std::function<void(CefRefPtr<CefBrowser>)> f, 
-		bool async)
-{
-	if (browserMap.count(browserIdentifier) > 0) {
-		CefRefPtr<CefBrowser> browser = browserMap[browserIdentifier];
-		if (async) {
-			CefPostTask(TID_UI, BrowserTask::newTask([&] {
-				f(browser);
-			}));
-		} else {
-			os_event_t *finishedEvent;
-			os_event_init(&finishedEvent, OS_EVENT_TYPE_AUTO);
-			CefPostTask(TID_UI, BrowserTask::newTask([&] {
-				f(browser);
-				os_event_signal(finishedEvent);
-			}));
-			os_event_wait(finishedEvent);
-			os_event_destroy(finishedEvent);
-		}
-	}
-}
-
-void BrowserManager::Impl::ExecuteOnAllBrowsers(
-	std::function<void(CefRefPtr<CefBrowser>)> f, 
-			bool async)
-{
-	for (auto& x: browserMap) {
-		CefRefPtr<CefBrowser> browser = x.second;
-		if (async) {
-			CefPostTask(TID_UI, BrowserTask::newTask([&] {
-				f(browser);
-			}));
-		} else {
-			os_event_t *finishedEvent;
-			os_event_init(&finishedEvent, OS_EVENT_TYPE_AUTO);
-			CefPostTask(TID_UI, BrowserTask::newTask([&] {
-				f(browser);
-				os_event_signal(finishedEvent);
-			}));
-			os_event_wait(finishedEvent);
-			os_event_destroy(finishedEvent);
-		}
-	}
-}
-
-void BrowserManager::Impl::SendMouseClick(int browserIdentifier,
-	const struct obs_mouse_event *event, int32_t type,
-	bool mouse_up, uint32_t click_count)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b) 
-	{
-		CefMouseEvent e;
-		e.modifiers = event->modifiers;
-		e.x = event->x;
-		e.y = event->y;
-		CefBrowserHost::MouseButtonType buttonType =
-			(CefBrowserHost::MouseButtonType)type;
-		b->GetHost()->SendMouseClickEvent(e, buttonType, mouse_up, 
-			click_count);
-	});
-}
-
-void BrowserManager::Impl::SendMouseMove(int browserIdentifier,
-	const struct obs_mouse_event *event, bool mouseLeave)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-		CefMouseEvent e;
-		e.modifiers = event->modifiers;
-		e.x = event->x;
-		e.y = event->y;
-		b->GetHost()->SendMouseMoveEvent(e, mouseLeave);
-	});
-}
-
-void BrowserManager::Impl::SendMouseWheel(int browserIdentifier,
-	const struct obs_mouse_event *event, int xDelta,
-	int yDelta)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-		CefMouseEvent e;
-		e.modifiers = event->modifiers;
-		e.x = event->x;
-		e.y = event->y;
-		b->GetHost()->SendMouseWheelEvent(e, xDelta, yDelta);
-	});
-}
-
-void BrowserManager::Impl::SendFocus(int browserIdentifier, bool focus)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-		b->GetHost()->SendFocusEvent(focus);
-	});
-}
-
-void BrowserManager::Impl::SendKeyClick(int browserIdentifier,
-	const struct obs_key_event *event, bool keyUp)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-
-		CefKeyEvent e;
-		e.windows_key_code = event->native_vkey;
-		e.native_key_code = 0;
-
-		e.type = keyUp ? KEYEVENT_KEYUP : KEYEVENT_RAWKEYDOWN;
-		
-		if (event->text) {
-			char16 *characters;
-			os_utf8_to_wcs_ptr(event->text, 0, &characters);
-			if (characters) {
-				e.character = characters[0];
-				bfree(characters);
-			}
-		}
-		
-		//e.native_key_code = event->native_vkey;
-		e.modifiers = event->modifiers;
-		
-		b->GetHost()->SendKeyEvent(e);
-		if (event->text && !keyUp) {
-			e.type = KEYEVENT_CHAR;
-			// Figure out why this works
-			e.windows_key_code = e.character;
-			e.character = 0;
-			b->GetHost()->SendKeyEvent(e);
-		}
-
-	});
-}
-
-void BrowserManager::Impl::ExecuteVisiblityJSCallback(int browserIdentifier, bool visible)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("Visibility");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetBool(0, visible);
-		b->SendProcessMessage(PID_RENDERER, msg);
-	});
-}
-
-void BrowserManager::Impl::ExecuteActiveJSCallback(int browserIdentifier, bool active)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("Active");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetBool(0, active);
-		b->SendProcessMessage(PID_RENDERER, msg);
-	});
-}
-
-void BrowserManager::Impl::ExecuteSceneChangeJSCallback(const char *name)
-{
-	ExecuteOnAllBrowsers([&](CefRefPtr<CefBrowser> b)
-	{
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("SceneChange");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetString(0, name);
-		b->SendProcessMessage(PID_RENDERER, msg);
-	});
-}
-
-void BrowserManager::Impl::RefreshPageNoCache(int browserIdentifier)
-{
-	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
-	{
-		b->ReloadIgnoreCache();
-	});
-}
-
-void BrowserManager::Impl::DispatchJSEvent(const char *eventName, const char *jsonString)
-{
-	ExecuteOnAllBrowsers([&](CefRefPtr<CefBrowser> b)
-	{
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("DispatchJSEvent");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetString(0, eventName);
-		args->SetString(1, jsonString);
-		b->SendProcessMessage(PID_RENDERER, msg);
-	});
-}
-
-void
-BrowserManager::Impl::Startup() 
-{
-	pthread_mutex_lock(&dispatchLock);
-	int ret = pthread_create(&managerThread, nullptr,
-		browserManagerEntry, this);
-	
-	if (ret != 0) {
-		blog(LOG_ERROR,
-			"BrowserManager: failed to create browser "
-			"manager thread.");
-		threadAlive = false;
-	}
-	else {
-		threadAlive = true;
-	}
-	pthread_mutex_unlock(&dispatchLock);
-		
-	return;
-}
-
-void BrowserManager::Impl::Shutdown() 
-{
-	os_event_t *shutdown_event;
-	os_event_init(&shutdown_event, OS_EVENT_TYPE_AUTO);
-
-	// post the task
-	CefPostTask(TID_UI, BrowserTask::newTask([] {
-		CefQuitMessageLoop();
-	}));
-
-	// this event will then get processed and shut down the dispatcher loop
-	PushEvent([this, shutdown_event] {
-		threadAlive = false;
-		os_event_signal(shutdown_event);
-	});
-
-	os_event_wait(shutdown_event);
-	os_event_destroy(shutdown_event);
-	return;
-}
-
-void *BrowserManager::Impl::browserManagerEntry(void* threadArgument)
-{
-	BrowserManager::Impl *browserManager =
-			static_cast<BrowserManager::Impl *>(threadArgument);
-	browserManager->BrowserManagerEntry();
-	return nullptr;
-}
-
-void BrowserManager::Impl::PushEvent(std::function<void()> event)
-{
-	pthread_mutex_lock(&dispatchLock);
-	queue.push_back(event);
-	pthread_mutex_unlock(&dispatchLock);
-	os_event_signal(dispatchEvent);
-}
-
-std::string getBootstrap()
-{
-	std::string modulePath(BrowserManager::Instance()->GetModulePath());
-	std::string parentPath(modulePath.substr(0,
-			modulePath.find_last_of('/') + 1));
-#ifdef _WIN32	
-	return parentPath + "/cef-bootstrap.exe";
-#else
-	return parentPath + "/cef-bootstrap";
-#endif
-}
-
-void BrowserManager::Impl::BrowserManagerEntry()
-{
-	std::string bootstrapPath = getBootstrap();
-	bool thread_exit = false;
-	PushEvent([this] {
-		CefMainArgs mainArgs;
-		CefSettings settings;
-		settings.log_severity = LOGSEVERITY_VERBOSE;
-		settings.windowless_rendering_enabled = true;
-		settings.no_sandbox = true;
-		CefString(&settings.cache_path).FromASCII(obs_module_config_path(""));
-		CefString(&settings.browser_subprocess_path) = getBootstrap();
-		CefRefPtr<BrowserApp> app(new BrowserApp());
-		CefExecuteProcess(mainArgs, app, nullptr);
-		CefInitialize(mainArgs, settings, app, nullptr);
-		CefRegisterSchemeHandlerFactory("http", "absolute", new BrowserSchemeHandlerFactory());
-		os_event_signal(startupEvent);
-		CefRunMessageLoop();
-		CefShutdown();
-	});
-
-	while (true) {
-		
-		if (os_event_timedwait(dispatchEvent, 10) != ETIMEDOUT) {
-			pthread_mutex_lock(&dispatchLock);
-			while (!queue.empty()) {
-				auto event = queue[0];
-				event();
-				queue.erase(queue.begin());
-			}
-			thread_exit = !threadAlive;
-			pthread_mutex_unlock(&dispatchLock);
-			if (thread_exit) {
-				return;
-			}
-		}
-	}
-}
-
-static BrowserManager *instance;
-
-BrowserManager *BrowserManager::Instance()
-{
-	if (instance == nullptr) {
-		instance = new BrowserManager();
-	}
-	return instance;
-}
-
-void BrowserManager::DestroyInstance()
-{
-	if (instance != nullptr) {
-		delete instance;
-	}
-	instance = nullptr;
-
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.hpp Deleted

@@ -1,90 +0,0 @@
-#pragma once
-
-#include <obs-module.h>
-
-#include <include/cef_app.h>
-#include <include/cef_task.h>
-
-#include <vector>
-#include <functional>
-#include <util/threading.h>
-
-#include "browser-manager.hpp"
-
-class BrowserManager::Impl
-{
-
-public:
-	Impl();
-	~Impl();
-
-private:
-
-	static void *browserManagerEntry(void* threadArguments);
-	void BrowserManagerEntry();
-
-
-public:
-
-	void Startup();
-	void Shutdown();
-	
-	int CreateBrowser(
-		const BrowserSettings &browserSettings,
-		const std::shared_ptr<BrowserListener> &browserListener);
-
-	CefBrowserHost* GetBrowserHost(int browserIdentifier);
-	CefBrowser* GetBrowser(int browserIdentifier);
-	void LoadURL(int browserIdentifier, CefString& url);
-
-	bool IsValidBrowserIdentifier(int browserIdentifier);
-	void DestroyBrowser(int browserIdentifier);
-	void TickBrowser(int browserIdentifier);
-
-	void SendMouseClick(int browserIdentifier,
-		const struct obs_mouse_event *event, int32_t type,
-		bool mouse_up, uint32_t click_count);
-	void SendMouseMove(int browserIdentifier,
-		const struct obs_mouse_event *event, bool mouseLeave);
-	void SendMouseWheel(int browserIdentifier,
-		const struct obs_mouse_event *event, int xDelta,
-		int yDelta);
-	void SendFocus(int browserIdentifier, bool focus);
-	void SendKeyClick(int browserIdentifier,
-		const struct obs_key_event *event, bool keyUp);
-
-	void AddListener(const int browserIdentifier,
-		std::shared_ptr<BrowserListener> browserListener);
-	void RemoveListener(const int browserIdentifier);
-
-	void PushEvent(std::function<void()> event);
-
-	void ExecuteVisiblityJSCallback(int browserIdentifier, bool visible);
-
-	void ExecuteActiveJSCallback(int browserIdentifier, bool active);
-
-	void ExecuteSceneChangeJSCallback(const char *name);
-
-	void RefreshPageNoCache(int browserIdentifier);
-	
-	void DispatchJSEvent(const char *eventName, const char *jsonString);
-
-private: 
-	void ExecuteOnBrowser(int browserIdentifier, 
-			std::function<void(CefRefPtr<CefBrowser>)> f, 
-			bool async = false);
-
-	void ExecuteOnAllBrowsers(std::function<void(CefRefPtr<CefBrowser>)> f, 
-			bool async = false);
-
-private:
-	bool threadAlive;
-	os_event_t *dispatchEvent;
-	os_event_t *startupEvent;
-	pthread_t managerThread;
-	pthread_mutex_t dispatchLock;
-
-	std::map<int, std::shared_ptr<BrowserListener>> listenerMap;
-	std::map<int, CefRefPtr<CefBrowser> > browserMap;
-	std::vector<std::function<void()>> queue;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-obs-bridge-base.cpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-obs-bridge-base.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-render-handler.cpp Deleted

@@ -1,153 +0,0 @@
-/******************************************************************************
-Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-render-handler.hpp"
-#include "browser-listener.hpp"
-
-BrowserRenderHandler::BrowserRenderHandler(int width, int height,
-		const std::shared_ptr<BrowserListener> &browserListener)
-: width(width), height(height), browserListener(browserListener),
-	currentSurfaceHandle(0)
-{
-}
-
-BrowserRenderHandler::~BrowserRenderHandler()
-{
-	for (auto i = surfaceHandles.begin(); i < surfaceHandles.end(); i++)
-	{
-		browserListener->DestroySurface(*i);
-	}
-
-	surfaceHandles.clear();
-}
-
-void BrowserRenderHandler::OnPopupSize(CefRefPtr<CefBrowser> browser,
-	const CefRect& rect)
-{
-	if (rect.width <= 0 || rect.height <= 0)
-		return;
-
-	originalPopupRect = rect;
-	popupRect = GetPopupRectInWebView(originalPopupRect);
-}
-
-void BrowserRenderHandler::OnPopupShow(CefRefPtr<CefBrowser> browser,
-	bool show)
-{
-	if (!show)
-	{
-		ClearPopupRects();
-		browserListener->DestroyPopupSurface();
-	}
-}
-
-void BrowserRenderHandler::ClearPopupRects() {
-	popupRect.Set(0, 0, 0, 0);
-	originalPopupRect.Set(0, 0, 0, 0);
-}
-
-bool
-BrowserRenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
-{
-	(void)browser;
-
-	rect.Set(0, 0, width, height);
-	return true;
-}
-
-CefRect BrowserRenderHandler::GetPopupRectInWebView(const CefRect& originalRect)
-{
-	CefRect rc(originalRect);
-	// if x or y are negative, move them to 0.
-	if (rc.x < 0)
-		rc.x = 0;
-	if (rc.y < 0)
-		rc.y = 0;
-	// if popup goes outside the view, try to reposition origin
-	if (rc.x + rc.width > width)
-		rc.x = width - rc.width;
-	if (rc.y + rc.height > height)
-		rc.y = height - rc.height;
-	// if x or y became negative, move them to 0 again.
-	if (rc.x < 0)
-	{
-		rc.x = 0;
-		rc.width = width;
-	}
-	if (rc.y < 0)
-	{
-		rc.y = 0;
-		rc.height = height;
-	}
-	return rc;
-}
-
-void BrowserRenderHandler::OnPaint(CefRefPtr<CefBrowser> browser, 
-		PaintElementType type, const RectList &dirtyRects,
-		const void *data, int width, int height)
-{
-	(void)browser;
-
-	if (type == PET_VIEW)
-	{
-		viewWidth = width;
-		viewHeight = height;
-		if (surfaceHandles.size() < 1) {
-			BrowserSurfaceHandle newSurfaceHandle = 0;
-			browserListener->CreateSurface(width, height,
-				&newSurfaceHandle);
-
-			if (newSurfaceHandle != nullptr) {
-				surfaceHandles.push_back(newSurfaceHandle);
-			}
-		}
-
-		obs_enter_graphics();
-		gs_texture_set_image(surfaceHandles[currentSurfaceHandle],
-			(const uint8_t*)data, width * 4, false);
-		obs_leave_graphics();
-	}
-	else if (type == PET_POPUP && popupRect.width > 0 &&
-		popupRect.height > 0)
-	{
-		int x = popupRect.x;
-		int y = popupRect.y;
-		int w = width;
-		int h = height;
-
-		if (x < 0)
-			x = 0;
-
-		if (y < 0)
-			y = 0;
-
-		if (x + w > viewWidth)
-			w -= x + w - viewWidth;
-		if (y + h > viewHeight)
-			h -= y + h - viewHeight;
-		
-		obs_enter_graphics();
-		BrowserSurfaceHandle newTexture = 0;
-		browserListener->CreatePopupSurface(width, height, x, y, &newTexture);
-		gs_texture_set_image(newTexture,
-			(const uint8_t*)data, w * 4, false);
-		obs_leave_graphics();
-	}
-	
-
-	browserListener->OnDraw(surfaceHandles[currentSurfaceHandle], viewWidth, viewHeight);
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-render-handler.hpp Deleted

@@ -1,76 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <vector>
-
-#include <include/cef_render_handler.h>
-
-#include <obs-module.h>
-
-class BrowserListener;
-
-class BrowserRenderHandler : public CefRenderHandler
-{
-public:
-
-	BrowserRenderHandler(const int width, const int height,
-		const std::shared_ptr<BrowserListener> &browserListener);
-
-	~BrowserRenderHandler();
-
-public: /* CefRenderHandler overrides */
-
-	virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
-		OVERRIDE;
-
-	CefRect GetPopupRectInWebView(const CefRect& originalRect);
-
-	virtual void OnPaint(CefRefPtr<CefBrowser> browser,
-		PaintElementType type, const RectList &dirtyRects,
-		const void *buffer, int width, int height) OVERRIDE;
-
-	const CefRect& popupRect_() const { return popupRect; }
-	const CefRect& originalPopupRect_() const { return originalPopupRect; }
-
-	// Forwarded from CefRenderHandler callbacks.
-	void OnPopupShow(CefRefPtr<CefBrowser> browser,
-		bool show);
-	// |rect| must be in pixel coordinates.
-	void OnPopupSize(CefRefPtr<CefBrowser> browser,
-		const CefRect& rect);
-	void ClearPopupRects();
-
-	int GetViewWidth() const { return viewWidth; }
-	int GetViewHeight() const { return viewHeight; }
-
-private:
-	const int width;
-	const int height;
-	const std::shared_ptr<BrowserListener> browserListener;
-	std::vector<struct gs_texture *> surfaceHandles;
-	int currentSurfaceHandle = 0;
-	int viewWidth;
-	int viewHeight;
-	CefRect popupRect;
-	CefRect originalPopupRect;
-
-private:
-	IMPLEMENT_REFCOUNTING(BrowserRenderHandler);
-	
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-source-base.cpp Deleted

@@ -1,85 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <memory>
-#include <map>
-
-#include "browser-source.hpp"
-#include "browser-listener.hpp"
-#include "browser-manager.hpp"
-
-#include "browser-source-base.hpp"
-#include "browser-source-listener-base.hpp"
-
-BrowserSource::BrowserSource(obs_data_t *settings, obs_source_t *source)
-: pimpl(new Impl(this)), source(source), browserIdentifier(0)
-{
-	UpdateSettings(settings);
-}
-
-
-BrowserSource::~BrowserSource()
-{
-	if (browserIdentifier != 0) {
-		BrowserManager::Instance()->DestroyBrowser(browserIdentifier);
-	}
-}
-
-std::shared_ptr<BrowserListener> BrowserSource::CreateListener()
-{
-	return pimpl->CreateListener();
-}
-
-void BrowserSource::RenderActiveTexture(gs_effect_t *effect)
-{
-	pimpl->RenderCurrentTexture(effect);
-}
-
-void BrowserSource::InvalidateActiveTexture()
-{
-	pimpl->InvalidateActiveTexture();
-}
-
-BrowserSource::Impl::Impl(BrowserSource *parent)
-: parent(parent), activeTexture(nullptr)
-{}
-
-BrowserSource::Impl::~Impl()
-{}
-
-void BrowserSource::Impl::RenderCurrentTexture(gs_effect_t *effect)
-{
-	GetParent()->LockTexture();
-
-	if (activeTexture != nullptr) {
-		while (gs_effect_loop(obs_get_base_effect(OBS_EFFECT_PREMULTIPLIED_ALPHA), "Draw"))
-			obs_source_draw(activeTexture, 0, 0, 0, 0, false);
-	}
-	
-	GetParent()->UnlockTexture();
-}
-
-void BrowserSource::Impl::InvalidateActiveTexture()
-{
-	activeTexture = nullptr;
-}
-
-std::shared_ptr<BrowserListener> BrowserSource::Impl::CreateListener()
-{
-	return std::shared_ptr<BrowserListener>(
-			new BrowserSource::Impl::Listener(this));
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-source-base.hpp Deleted

@@ -1,42 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <obs-module.h>
-#include "browser-source.hpp"
-
-class TextureRef;
-
-class BrowserSource::Impl {
-public:
-	Impl(BrowserSource *parent);
-	~Impl();
-public:
-	BrowserSource *GetParent() { return parent; }
-	void RenderCurrentTexture(gs_effect_t *effect);
-	void InvalidateActiveTexture();
-	std::shared_ptr<BrowserListener> CreateListener();
-	void SetActiveTexture(gs_texture_t *texture)
-		{ activeTexture = texture; }
-
-private:
-	class Listener;
-	BrowserSource *parent;
-	gs_texture_t *activeTexture;
-
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-source-listener-base.cpp Deleted

@@ -1,114 +0,0 @@
-/******************************************************************************
-Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-source.hpp"
-#include "browser-source-base.hpp"
-#include "browser-types.h"
-#include "browser-source-listener-base.hpp"
-#include "browser-manager-base.hpp"
-
-void BrowserSource::Impl::Listener::OnDraw( BrowserSurfaceHandle surfaceHandle,
-		int width, int height)
-{
-	UNUSED_PARAMETER(width);
-	UNUSED_PARAMETER(height);
-
-	// Check if our browser has not been destroyed yet.
-	//
-	// Due to the asynchronous nature of CEF, we can get an OnDraw call after
-	// BrowserManager::Instance()->DestroyBrowser() call has been made.
-	//
-	if (!BrowserManager::Instance()->IsValidBrowserIdentifier(GetBrowserIdentifier()))
-		return;
-
-	if (textureSet.count(surfaceHandle) > 0) {
-		obs_enter_graphics();
-		if (browserSource)
-		{
-			if (browserSource->GetParent())
-			{
-				if (browserSource->GetParent()->TryLockTexture()) {
-					if (popupSurface != nullptr)
-						gs_copy_texture_region(surfaceHandle, popupX, popupY, popupSurface, 0, 0, gs_texture_get_width(popupSurface), gs_texture_get_height(popupSurface));
-					browserSource->SetActiveTexture(surfaceHandle);
-					browserSource->GetParent()->UnlockTexture();
-				}
-			}
-		}
-		obs_leave_graphics();
-	}
-	else {
-		blog(LOG_ERROR, "Asked to draw unknown surface with handle"
-			"%d", surfaceHandle);
-	}
-}
-
-bool BrowserSource::Impl::Listener::CreateSurface(int width, int height, 
-		BrowserSurfaceHandle *surfaceHandle)
-{
-	//TODO: We can't lock graphics on CEF thread
-	// as there may be a synchronous call
-	obs_enter_graphics();
-
-	gs_texture_t *newTexture =  gs_texture_create(width, height, GS_BGRA, 1, 
-			nullptr, GS_DYNAMIC);
-	
-	obs_leave_graphics();
-
-	textureSet.insert(newTexture);
-
-	*surfaceHandle = newTexture;
-
-	return true;
-}
-
-bool BrowserSource::Impl::Listener::CreatePopupSurface(int width, int height,
-	int x, int y, BrowserSurfaceHandle *popupSurfaceHandle)
-{
-	obs_enter_graphics();
-
-	gs_texture_t *newTexture = gs_texture_create(width, height, GS_BGRA, 1,
-		nullptr, GS_DYNAMIC);
-
-	obs_leave_graphics();
-
-	*popupSurfaceHandle = newTexture;
-	popupSurface = newTexture;
-	popupX = x;
-	popupY = y;
-
-	return true;
-}
-
-void BrowserSource::Impl::Listener::DestroyPopupSurface()
-{
-	obs_enter_graphics();
-	popupSurface = nullptr;
-	obs_leave_graphics();
-}
-
-void BrowserSource::Impl::Listener::DestroySurface(
-		BrowserSurfaceHandle surfaceHandle)
-{
-	if (textureSet.count(surfaceHandle) == 1) {
-		obs_enter_graphics();
-		textureSet.erase(surfaceHandle);
-		gs_texture_destroy(surfaceHandle);
-		browserSource->activeTexture = nullptr;
-		obs_leave_graphics();
-	}
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/browser-source-listener-base.hpp Deleted

@@ -1,63 +0,0 @@
-/******************************************************************************
-Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-#pragma once
-
-#include <memory>
-#include <set>
-#include "browser-listener.hpp"
-#include "browser-types.h"
-
-class Impl;
-
-class BrowserSource::Impl::Listener : public BrowserListener
-{
-public:
-	Listener(BrowserSource::Impl *browserSource)
-		: browserSource(browserSource)
-	{}
-
-	~Listener()
-	{}
-
-	void OnDraw(
-		BrowserSurfaceHandle surfaceHandle,
-		int width,
-		int height);
-
-	bool CreateSurface(
-		int width,
-		int height,
-		BrowserSurfaceHandle *surfaceHandle);
-
-	void DestroySurface(BrowserSurfaceHandle surfaceHandle);
-
-	bool CreatePopupSurface(
-		int width,
-		int height,
-		int x,
-		int y,
-		BrowserSurfaceHandle *surfaceHandle);
-
-	void DestroyPopupSurface();
-
-private:
-	BrowserSource::Impl *browserSource;
-	gs_texture_t *popupSurface = nullptr;
-	std::set<BrowserSurfaceHandle> textureSet;
-	int popupX, popupY;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/main-source.cpp Deleted

@@ -1,325 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <util/dstr.h>
-
-#include "browser-source.hpp"
-#include "browser-manager.hpp"
-
-static void browser_source_get_defaults(obs_data_t *settings)
-{
-	obs_data_set_default_string(settings, "url",
-			"http://www.obsproject.com");
-	obs_data_set_default_int(settings, "width", 800);
-	obs_data_set_default_int(settings, "height", 600);
-	obs_data_set_default_int(settings, "fps", 30);
-	obs_data_set_default_bool(settings, "shutdown", false);
-	obs_data_set_default_bool(settings, "restart_when_active", false);
-	obs_data_set_default_string(settings, "css", "body { background-color: rgba(0, 0, 0, 0); margin: 0px auto; overflow: hidden; }");
-}
-
-static bool restart_button_clicked(obs_properties_t *props,
-		obs_property_t *property, void *data)
-{
-	UNUSED_PARAMETER(props);
-	UNUSED_PARAMETER(property);
-	UNUSED_PARAMETER(data);
-
-	BrowserManager::Instance()->Restart();
-	return true;
-}
-
-static bool refreshnocache_button_clicked(obs_properties_t *props,
-	obs_property_t *property, void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	BrowserManager::Instance()->RefreshPageNoCache(bs->GetBrowserIdentifier());
-	
-	return true;
-}
-
-static bool is_local_file_modified(obs_properties_t *props,
-		obs_property_t *prop, obs_data_t *settings)
-{
-	UNUSED_PARAMETER(prop);
-
-	bool enabled = obs_data_get_bool(settings, "is_local_file");
-	obs_property_t *url = obs_properties_get(props, "url");
-	obs_property_t *local_file = obs_properties_get(props, "local_file");
-	obs_property_set_visible(url, !enabled);
-	obs_property_set_visible(local_file, enabled);
-
-	return true;
-}
-
-static obs_properties_t *browser_source_get_properties(void *data)
-{
-	obs_properties_t *props = obs_properties_create();
-	struct dstr path = { 0 };
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	obs_properties_set_flags(props, OBS_PROPERTIES_DEFER_UPDATE);
-	// use this when obs allows non-readonly paths
-	obs_property_t *prop = obs_properties_add_bool(props, "is_local_file",
-			obs_module_text("LocalFile"));
-
-	if (bs && bs->GetUrl() != "")
-	{
-		const char *slash;
-
-		dstr_copy(&path, bs->GetUrl().c_str());
-		dstr_replace(&path, "\\", "/");
-		slash = strrchr(path.array, '/');
-		if (slash)
-			dstr_resize(&path, slash - path.array + 1);
-	}
-
-
-	obs_property_set_modified_callback(prop, is_local_file_modified);
-	obs_properties_add_path(props, "local_file",
-			obs_module_text("Local file"), OBS_PATH_FILE, "*.*",
-			path.array);
-	obs_properties_add_text(props, "url",
-			obs_module_text("URL"), OBS_TEXT_DEFAULT);
-
-	obs_properties_add_int(props, "width",
-			obs_module_text("Width"), 1, 4096, 1);
-	obs_properties_add_int(props, "height",
-			obs_module_text("Height"), 1, 4096, 1);
-	obs_properties_add_int(props, "fps",
-			obs_module_text("FPS"), 1, 60, 1);
-	obs_properties_add_text(props, "css",
-		obs_module_text("CSS"), OBS_TEXT_MULTILINE);
-	obs_properties_add_bool(props, "shutdown",
-		obs_module_text("ShutdownSourceNotVisible"));
-	obs_properties_add_bool(props, "restart_when_active",
-		obs_module_text("RefreshBrowserActive"));
-
-	obs_properties_add_button(props, "refreshnocache",
-		obs_module_text("RefreshNoCache"), refreshnocache_button_clicked);
-
-#ifdef __APPLE__
-	// osx is the only process-isolated cef impl
-	obs_properties_add_button(props, "restart",
-			obs_module_text("Restart CEF"), restart_button_clicked);
-#endif
-	return props;
-}
-
-static void browser_source_update(void *data, obs_data_t *settings)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	bs->UpdateSettings(settings);
-}
-
-static uint32_t browser_source_get_width(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	return bs->GetWidth();
-}
-
-static uint32_t browser_source_get_height(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	return bs->GetHeight();
-}
-
-
-static const char *browser_source_get_name(void *)
-{
-	return obs_module_text("BrowserSource");
-}
-
-static void browser_source_activate(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	obs_data_t *settings = obs_source_get_settings(bs->GetSource());
-	bool restart = obs_data_get_bool(settings, "restart_when_active");
-
-	if (restart)
-		BrowserManager::Instance()->RefreshPageNoCache(bs->GetBrowserIdentifier());
-
-	bs->ExecuteActiveJSCallback(true);
-}
-
-static void browser_source_deactivate(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	bs->ExecuteActiveJSCallback(false);
-}
-
-// Called when the source is visible
-static void browser_source_show(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	if ( bs->GetShutdown() ) {
-		bs->UpdateBrowser();
-	}
-	else {
-		bs->ExecuteVisiblityJSCallback(true);
-	}
-
-	// Start animation
-	BrowserManager::Instance()->GetBrowser(bs->GetBrowserIdentifier())->GetHost()->WasHidden(false);
-
-#ifdef APPLE
-	BrowserManager::Instance()->GetBrowser(bs->GetBrowserIdentifier())->GetHost()->SetWindowVisibility(true);
-#endif
-
-	// Repaint the view
-	BrowserManager::Instance()->GetBrowser(bs->GetBrowserIdentifier())->GetHost()->Invalidate(PET_VIEW);
-}
-
-// Called when the source is no longer visible
-static void browser_source_hide(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	// Stop animation
-	BrowserManager::Instance()->GetBrowser(bs->GetBrowserIdentifier())->GetHost()->WasHidden(true);
-
-#ifdef APPLE
-	BrowserManager::Instance()->GetBrowser(bs->GetBrowserIdentifier())->GetHost()->SetWindowVisibility(false);
-#endif
-
-	if (bs->GetShutdown()) {
-		BrowserManager::Instance()->DestroyBrowser(bs->GetBrowserIdentifier());
-	}
-	else {
-		bs->ExecuteVisiblityJSCallback(false);
-	}
-}
-
-static void *browser_source_create(obs_data_t *settings, obs_source_t *source)
-{
-	BrowserSource *browserSource = new BrowserSource(settings, source);
-
-	if (browserSource->GetShutdown() && !obs_source_showing(source))
-	{
-		BrowserManager::Instance()->DestroyBrowser(browserSource->GetBrowserIdentifier());
-	}
-	else
-	{
-		if (!obs_source_showing(source))
-		{
-			// Stop animation
-			BrowserManager::Instance()->GetBrowser(browserSource->GetBrowserIdentifier())->GetHost()->WasHidden(true);
-		}
-	}
-
-	return browserSource;
-}
-
-static void browser_source_destroy(void *data)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	delete bs;
-	bs = nullptr;
-}
-
-
-static void browser_source_render(void *data, gs_effect_t *effect)
-{
-	UNUSED_PARAMETER(effect);
-
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-
-	if (bs->GetBrowserIdentifier() == 0) {
-		bs->UpdateBrowser();
-		return;
-	}
-
-	bs->RenderActiveTexture(effect);
-}
-
-static void browser_source_mouse_click(void *data,
-		const struct obs_mouse_event *event, int32_t type,
-		bool mouse_up, uint32_t click_count)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	bs->SendMouseClick(event, type, mouse_up, click_count);
-
-	blog(LOG_DEBUG,
-		"mouse_click x:%d y:%d mouse_up:'%s' count:'%d'", event->x, 
-		event->y, mouse_up ? "true" : "false", click_count);
-}
-
-static void browser_source_mouse_move(void *data,
-		const struct obs_mouse_event *event, bool mouse_leave)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	bs->SendMouseMove(event, mouse_leave);
-}
-
-static void browser_source_mouse_wheel(void *data,
-		const struct obs_mouse_event *event, int x_delta, int y_delta)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	bs->SendMouseWheel(event, x_delta, y_delta);
-}
-
-static void browser_source_focus(void *data, bool focus)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	bs->SendFocus(focus);
-}
-
-static void browser_source_key_click(void *data,
-		const struct obs_key_event *event, bool key_up)
-{
-	BrowserSource *bs = static_cast<BrowserSource *>(data);
-	bs->SendKeyClick(event, key_up);
-}
-
-struct obs_source_info
-create_browser_source_info() 
-{
-	struct obs_source_info browser_source_info = { 0 };
-
-	browser_source_info.id = "browser_source";
-	browser_source_info.type = OBS_SOURCE_TYPE_INPUT;
-	browser_source_info.output_flags = OBS_SOURCE_VIDEO |
-			OBS_SOURCE_INTERACTION | OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_CUSTOM_DRAW;
-	// interaction
-	browser_source_info.mouse_click = browser_source_mouse_click;
-	browser_source_info.mouse_move = browser_source_mouse_move;
-	browser_source_info.mouse_wheel = browser_source_mouse_wheel;
-	browser_source_info.focus = browser_source_focus;
-	browser_source_info.key_click = browser_source_key_click;
-
-	browser_source_info.get_name = browser_source_get_name;
-	browser_source_info.create = browser_source_create;
-	browser_source_info.destroy = browser_source_destroy;
-	browser_source_info.update = browser_source_update;
-	browser_source_info.get_width = browser_source_get_width;
-	browser_source_info.get_height = browser_source_get_height;
-	browser_source_info.get_properties = browser_source_get_properties;
-	browser_source_info.get_defaults = browser_source_get_defaults;
-	browser_source_info.video_render = browser_source_render;
-	browser_source_info.show = browser_source_show;
-	browser_source_info.hide = browser_source_hide;
-	browser_source_info.activate = browser_source_activate;
-	browser_source_info.deactivate = browser_source_deactivate;
-
-
-	return browser_source_info;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/obs-browser/main.cpp Deleted

@@ -1,114 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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-frontend-api.h>
-
-#include "browser-version.h"
-#include "browser-manager.hpp"
-#include "util.hpp"
-
-OBS_DECLARE_MODULE()
-OBS_MODULE_USE_DEFAULT_LOCALE("obs-browser", "en-US")
-
-extern struct obs_source_info create_browser_source_info();
-struct obs_source_info browser_source_info;
-
-// Handle events from the frontend
-static void handle_obs_frontend_event(enum obs_frontend_event event, void *)
-{
-	switch(event)
-	{
-	case OBS_FRONTEND_EVENT_STREAMING_STARTING:
-		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStarting", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_STREAMING_STARTED:
-		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStarted", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
-		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStopping", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
-		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStopped", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_RECORDING_STARTING:
-		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStarting", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_RECORDING_STARTED:
-		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStarted", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_RECORDING_STOPPING:
-		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStopping", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_RECORDING_STOPPED:
-		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStopped", nullptr);
-		break;
-	case OBS_FRONTEND_EVENT_SCENE_CHANGED:
-		{
-			obs_source_t *source = obs_frontend_get_current_scene();
-
-			const char* jsonString = obsSourceToJSON(source);
-
-			BrowserManager::Instance()->DispatchJSEvent("obsSceneChanged", jsonString);
-
-			obs_source_release(source);
-			break;
-		}
-	case OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_TRANSITION_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_TRANSITION_STOPPED:
-		break;
-	case OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_PROFILE_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED:
-		break;
-	case OBS_FRONTEND_EVENT_EXIT:
-		BrowserManager::Instance()->DispatchJSEvent("obsExit", nullptr);
-		break;
-	}
-}
-
-bool obs_module_load(void)
-{
-	blog(LOG_INFO, "[browser_source: 'Version: %s']", OBS_BROWSER_VERSION);
-
-	browser_source_info = create_browser_source_info();
-
-	BrowserManager::Instance()->SetModulePath(
-			obs_get_module_binary_path(obs_current_module()));
-
-	BrowserManager::Instance()->Startup();
-	obs_register_source(&browser_source_info);
-	obs_frontend_add_event_callback(handle_obs_frontend_event, nullptr);
-
-	return true;
-}
-
-void obs_module_unload()
-{
-	BrowserManager::Instance()->Shutdown();
-	BrowserManager::Instance()->SetModulePath(nullptr);
-	BrowserManager::DestroyInstance();
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared-apple Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared-apple/browser-bridges.h Deleted

@@ -1,58 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#import <Foundation/Foundation.h>
-
-struct BrowserSettings;
-struct obs_mouse_event;
-struct obs_key_event;
-
-@interface BrowserSettingsBridge : NSObject
-
-@property (readonly)NSString *url;
-@property (readonly)unsigned int width;
-@property (readonly)unsigned int height;
-@property (readonly)unsigned int fps;
-@property (readonly)NSString *css;
-
-+ (id)fromBrowserSettings: (const BrowserSettings &)browserSettings;
-
-@end
-
-@interface ObsMouseEventBridge : NSObject
-
-@property (readonly)unsigned int modifiers;
-@property (readonly)int x;
-@property (readonly)int y;
-
-+ (id)fromObsMouseEvent: (const obs_mouse_event *)event;
-
-@end
-
-@interface ObsKeyEventBridge : NSObject
-
-@property (readonly)unsigned int modifiers;
-@property (readonly)NSString *text;
-@property (readonly)unsigned int nativeModifiers;
-@property (readonly)unsigned int nativeScanCode;
-@property (readonly)unsigned int nativeVirtualKey;
-
-+ (id)fromObsKeyEvent: (const obs_key_event *)event;
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared-apple/browser-bridges.mm Deleted

@@ -1,86 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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>
-#import "browser-bridges.h"
-#include "browser-settings.hpp"
-
-@implementation BrowserSettingsBridge
-
-- (id)initWithBrowserSettings:(const BrowserSettings &)browserSettings
-{
-	if (self = [super init]) {
-		_url = [NSString stringWithUTF8String:
-				browserSettings.url.c_str()];
-		_width = browserSettings.width;
-		_height = browserSettings.height;
-		_fps = browserSettings.fps;
-		_css = [NSString stringWithUTF8String:
-				browserSettings.css.c_str()];
-	}
-	return self;
-}
-
-+ (id)fromBrowserSettings:(const BrowserSettings &)browserSettings
-{
-	return [[BrowserSettingsBridge alloc]
-		initWithBrowserSettings: browserSettings];
-}
-@end
-
-@implementation ObsMouseEventBridge
-
-- (id)initWithObsMouseEvent:(const struct obs_mouse_event *)event
-{
-	if (self = [super init]) {
-		_x = event->x;
-		_y = event->y;
-		_modifiers = event->modifiers;
-	}
-
-	return self;
-}
-
-+ (id)fromObsMouseEvent:(const obs_mouse_event *)event
-{
-	return [[ObsMouseEventBridge alloc] initWithObsMouseEvent:event];
-}
-
-@end
-
-@implementation ObsKeyEventBridge
-
-- (id)initWithObsKeyEvent:(const struct obs_key_event *)event
-{
-	if (self = [super init]) {
-		_modifiers = event->modifiers;
-		NSString *__text = [NSString stringWithUTF8String: event->text];
-		_text = [__text copy];
-		_nativeModifiers = event->native_modifiers;
-		_nativeScanCode = event->native_scancode;
-		_nativeVirtualKey = event->native_vkey;
-	}
-
-	return self;
-}
-
-+ (id)fromObsKeyEvent:(const obs_key_event *)event
-{
-	return [[ObsKeyEventBridge alloc] initWithObsKeyEvent:event];
-}
-
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared-apple/cef-isolation.h Deleted

@@ -1,66 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#import <Foundation/Foundation.h>
-#include <jansson.h>
-
-#include "browser-types.h"
-
-@protocol CEFIsolatedClient;
-@class BrowserSettingsBridge;
-@class ObsMouseEventBridge;
-@class ObsKeyEventBridge;
-
-@protocol CEFIsolationService
-- (oneway void)registerClient:(id<CEFIsolatedClient>)client;
-- (BOOL)createSurface:(int)browserIdentifier width:(int)width height:(int)height
-		surfaceHandle:(BrowserSurfaceHandle *)surfaceHandle;
-- (void)destroySurface:(int)browserIdentifier
-		surfaceHandle:(BrowserSurfaceHandle)surfaceHandle;
-- (void)onDraw:(int)browserIdentifier width:(int)width
-		height:(int)height
-		surfaceHandle:(BrowserSurfaceHandle)surfaceHandle;
-- (void)invalidateClient:(id)client withException:(NSException *)exception;
-- (const char*)getCurrentSceneJSONData;
-- (const char*)getStatus;
-@end
-
-@protocol CEFIsolatedClient
-- (oneway void)registerServer:(id<CEFIsolationService>)server;
-- (int)createBrowser:(BrowserSettingsBridge *)browserSettings;
-- (void)destroyBrowser:(int)browserIdentifier;
-- (oneway void)tickBrowser:(int)browserIdentifier;
-- (void)sendMouseClick:(int) browserIdentifier
-		event:(ObsMouseEventBridge *)event type:(int)type
-		mouseUp:(BOOL)mouseUp clickCount:(int)clickCount;
-- (oneway void)sendMouseMove:(int)browserIdentifier
-		event:(ObsMouseEventBridge *)event mouseLeave:(BOOL)mouseLeave;
-- (void)sendMouseWheel:(int)browserIdentifier event:(ObsMouseEventBridge *)event
-		xDelta:(int)xDelta yDelta:(int)yDelta;
-- (oneway void)sendFocus:(int)browserIdentifier focus:(BOOL)focus;
-- (void)sendKeyClick:(int) browserIdentifier
-		event:(bycopy ObsKeyEventBridge *)event keyUp:(BOOL)keyUp;
-- (void)refreshPageNoCache:(const int)browserIdentifier;
-- (void)executeVisiblityJSCallback:(const int)browserIdentifier
-		visible:(BOOL)visible;
-- (void)executeActiveJSCallback:(const int)browserIdentifier
-		active:(BOOL)active;
-- (void)executeSceneChangeJSCallback:(const char *)name;
-- (void)dispatchJSEvent:(const char *)eventName data:(const char*) jsonString;
-@end

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared-apple/cef-logging.h Deleted

@@ -1,26 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#ifdef NDEBUG
-#define CEFLogDebug(...)
-#else
-#define CEFLogDebug(...) NSLog(__VA_ARGS__)
-#endif
-
-#define CEFLogError(...) NSLog(__VA_ARGS__)

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/base64.cpp Deleted

@@ -1,123 +0,0 @@
-/*
-base64.cpp and base64.h
-
-Copyright (C) 2004-2008 René Nyffenegger
-
-This source code is provided 'as-is', without any express or implied
-warranty. In no event will the author be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this source code must not be misrepresented; you must not
-claim that you wrote the original source code. If you use this source code
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original source code.
-
-3. This notice may not be removed or altered from any source distribution.
-
-René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-
-*/
-
-#include "base64.hpp"
-#include <iostream>
-
-static const std::string base64_chars =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-"abcdefghijklmnopqrstuvwxyz"
-"0123456789+/";
-
-
-static inline bool is_base64(unsigned char c) {
-	return (isalnum(c) || (c == '+') || (c == '/'));
-}
-
-std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
-	std::string ret;
-	int i = 0;
-	int j = 0;
-	unsigned char char_array_3[3];
-	unsigned char char_array_4[4];
-
-	while (in_len--) {
-		char_array_3[i++] = *(bytes_to_encode++);
-		if (i == 3) {
-			char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-			char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-			char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-			char_array_4[3] = char_array_3[2] & 0x3f;
-
-			for (i = 0; (i <4); i++)
-				ret += base64_chars[char_array_4[i]];
-			i = 0;
-		}
-	}
-
-	if (i)
-	{
-		for (j = i; j < 3; j++)
-			char_array_3[j] = '\0';
-
-		char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-		char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-		char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-		char_array_4[3] = char_array_3[2] & 0x3f;
-
-		for (j = 0; (j < i + 1); j++)
-			ret += base64_chars[char_array_4[j]];
-
-		while ((i++ < 3))
-			ret += '=';
-
-	}
-
-	return ret;
-
-}
-
-std::string base64_decode(std::string const& encoded_string) {
-	int in_len = encoded_string.size();
-	int i = 0;
-	int j = 0;
-	int in_ = 0;
-	unsigned char char_array_4[4], char_array_3[3];
-	std::string ret;
-
-	while (in_len-- && (encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
-		char_array_4[i++] = encoded_string[in_]; in_++;
-		if (i == 4) {
-			for (i = 0; i <4; i++)
-				char_array_4[i] = base64_chars.find(char_array_4[i]);
-
-			char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-			char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-			char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-			for (i = 0; (i < 3); i++)
-				ret += char_array_3[i];
-			i = 0;
-		}
-	}
-
-	if (i) {
-		for (j = i; j <4; j++)
-			char_array_4[j] = 0;
-
-		for (j = 0; j <4; j++)
-			char_array_4[j] = base64_chars.find(char_array_4[j]);
-
-		char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-		char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-		char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-		for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
-	}
-
-	return ret;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/base64.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-app.cpp Deleted

@@ -1,250 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-app.hpp"
-
-#include <iostream>
-#include <string>
-#include <jansson.h>
-#include <include/cef_version.h>
-
-#include "fmt/format.h"
-#include "include/cef_browser.h"
-#include "include/cef_command_line.h"
-#include "include/wrapper/cef_helpers.h"
-#include "browser-version.h"
-
-BrowserApp::BrowserApp(){
-}
-
-CefRefPtr<CefRenderProcessHandler> BrowserApp::GetRenderProcessHandler()
-{
-	return this;
-}
-
-void BrowserApp::OnRegisterCustomSchemes(
-		CefRawPtr<CefSchemeRegistrar> registrar)
-{
-#if CHROME_VERSION_BUILD >= 3029
-	registrar->AddCustomScheme("http", true, false, false, false, true, false);
-#else
-	registrar->AddCustomScheme("http", true, false, false, false, true);
-#endif
-}
-
-void BrowserApp::OnBeforeCommandLineProcessing(
-	const CefString& process_type,
-	CefRefPtr<CefCommandLine> command_line)
-{
-	bool enableGPU = command_line->HasSwitch("enable-gpu");
-
-	CefString type = command_line->GetSwitchValue("type");
-
-	if (!enableGPU && type.empty())
-	{
-		command_line->AppendSwitch("disable-gpu");
-		command_line->AppendSwitch("disable-gpu-compositing");
-	}
-	command_line->AppendSwitch("enable-begin-frame-scheduling");
-
-	command_line->AppendSwitch("enable-system-flash");
-}
-
-void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
-		CefRefPtr<CefFrame> frame,
-		CefRefPtr<CefV8Context> context)
-{
-	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-
-	CefRefPtr<CefV8Value> obsStudioObj = CefV8Value::CreateObject(0, 0);
-	globalObj->SetValue("obsstudio", obsStudioObj, V8_PROPERTY_ATTRIBUTE_NONE);
-
-	CefRefPtr<CefV8Value> pluginVersion = CefV8Value::CreateString(OBS_BROWSER_VERSION);
-	obsStudioObj->SetValue("pluginVersion", pluginVersion, V8_PROPERTY_ATTRIBUTE_NONE);
-
-	CefRefPtr<CefV8Value> func = CefV8Value::CreateFunction("getCurrentScene", this);
-  	obsStudioObj->SetValue("getCurrentScene", func, V8_PROPERTY_ATTRIBUTE_NONE);
-
-	CefRefPtr<CefV8Value> getStatus = CefV8Value::CreateFunction("getStatus", this);
-	obsStudioObj->SetValue("getStatus", getStatus, V8_PROPERTY_ATTRIBUTE_NONE);
-}
-
-void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
-		const char *functionName,
-		CefV8ValueList arguments)
-{
-	CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
-
-	context->Enter();
-	
-	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-
-	CefRefPtr<CefV8Value> obsStudioObj = globalObj->GetValue("obsstudio");
-
-	CefRefPtr<CefV8Value> jsFunction = obsStudioObj->GetValue(functionName);
-	if (jsFunction && jsFunction->IsFunction()) {
-		jsFunction->ExecuteFunction(NULL, arguments);
-	}
-
-	context->Exit();
-}
-
-bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
-		CefProcessId source_process,
-		CefRefPtr<CefProcessMessage> message)
-{
-	DCHECK(source_process == PID_BROWSER);
-
-	CefRefPtr<CefListValue> args = message->GetArgumentList();
-
-	if (message->GetName() == "Visibility") {
-		CefV8ValueList arguments;
-		arguments.push_back(CefV8Value::CreateBool(args->GetBool(0)));
-
-		ExecuteJSFunction(browser, "onVisibilityChange", arguments);
-		return true;
-	}
-	else if (message->GetName() == "Active") {
-		CefV8ValueList arguments;
-		arguments.push_back(CefV8Value::CreateBool(args->GetBool(0)));
-
-		ExecuteJSFunction(browser, "onActiveChange", arguments);
-		return true;
-	}
-	else if (message->GetName() == "DispatchJSEvent") {       
-		CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
-
-		context->Enter();
-
-		CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-
-		// Build up a new json object to store the CustomEvent data in.
-		json_t *json = json_object();
-        
-		if (args->GetSize() > 1) {
-			json_error_t error;
-
-			json_object_set_new(json, "detail", json_loads(args->GetString(1).ToString().c_str(), 0, &error));
-		}
-
-		char *jsonString = json_dumps(json, 0);
-
-		std::string script = fmt::format(
-			"new CustomEvent('{}', {});", 
-			args->GetString(0).ToString(),
-			jsonString);
-
-		free(jsonString);
-
-		CefRefPtr<CefV8Value> returnValue;
-		CefRefPtr<CefV8Exception> exception;
-
-		// Create the CustomEvent object
-		// We have to use eval to invoke the new operator
-		context->Eval(script, browser->GetMainFrame()->GetURL(), 0, returnValue, exception);
-
-		CefV8ValueList arguments;
-		arguments.push_back(returnValue);
-
-		CefRefPtr<CefV8Value> dispatchEvent = globalObj->GetValue("dispatchEvent");
-		dispatchEvent->ExecuteFunction(NULL, arguments);
-
-		context->Exit();
-
-		return true;
-	}
-	else if (message->GetName() == "executeCallback")
-	{
-		CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
-		CefRefPtr<CefV8Value> retval;
-		CefRefPtr<CefV8Exception> exception;
-        
-		context->Enter();
-
-		CefRefPtr<CefListValue> arguments = message->GetArgumentList();
-		int callbackID = arguments->GetInt(0);
-		CefString jsonString = arguments->GetString(1);
-
-		std::string script = fmt::format(
-			"JSON.parse('{}');",
-			arguments->GetString(1).ToString(),
-			jsonString.ToString().c_str());
-
-		CefRefPtr<CefV8Value> callback = callbackMap[callbackID];
-		CefV8ValueList args;
-
-		context->Eval(script, browser->GetMainFrame()->GetURL(), 0, retval, exception);
-
-		args.push_back(retval);
-
-		callback->ExecuteFunction(NULL, args);
-        
-		context->Exit();
-
-		callbackMap.erase(callbackID);
-
-		
-		return true;
-	}
-
-	return false;
-}
-
-// CefV8Handler::Execute
-bool BrowserApp::Execute(const CefString& name,
-		CefRefPtr<CefV8Value> object,
-		const CefV8ValueList& arguments,
-		CefRefPtr<CefV8Value>& retval,
-		CefString& exception)
-{
-	if (name == "getCurrentScene")
-	{
-		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
-			callbackId++;
-			callbackMap[callbackId] = arguments[0];
-		}
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("getCurrentScene");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetInt(0, callbackId);
-
-		CefRefPtr<CefBrowser> browser = 
-                CefV8Context::GetCurrentContext()->GetBrowser();
-		browser->SendProcessMessage(PID_BROWSER, msg);
-
-		return true;
-	}
-	else if (name == "getStatus")
-	{
-		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
-			callbackId++;
-			callbackMap[callbackId] = arguments[0];
-		}
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("getStatus");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetInt(0, callbackId);
-
-		CefRefPtr<CefBrowser> browser = CefV8Context::GetCurrentContext()->GetBrowser();
-		browser->SendProcessMessage(PID_BROWSER, msg);
-
-		return true;
-	}
-
-	// Function does not exist.
-	return false;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-app.hpp Deleted

@@ -1,65 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include "include/cef_app.h"
-#include <include/cef_render_process_handler.h>
-
-class BrowserApp : public CefApp,
-				   public CefRenderProcessHandler,
-				   public CefV8Handler
-{
-
-public:
-	BrowserApp();
-
-public:
-	virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() OVERRIDE;
-	virtual void OnRegisterCustomSchemes(
-			CefRawPtr<CefSchemeRegistrar> registrar) OVERRIDE;
-	virtual void OnBeforeCommandLineProcessing(
-		const CefString& process_type,
-		CefRefPtr<CefCommandLine> command_line) OVERRIDE;
-
-	virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
-		CefRefPtr<CefFrame> frame,
-		CefRefPtr<CefV8Context> context) OVERRIDE;
-
-	virtual bool OnProcessMessageReceived(
-		CefRefPtr<CefBrowser> browser,
-		CefProcessId source_process,
-		CefRefPtr<CefProcessMessage> message) OVERRIDE;
-
-public: /* CefV8Handler */
-	virtual bool Execute(const CefString& name,
-			CefRefPtr<CefV8Value> object,
-			const CefV8ValueList& arguments,
-			CefRefPtr<CefV8Value>& retval,
-			CefString& exception) OVERRIDE;
-
-private:
-	virtual void ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
-		const char *functionName,
-		CefV8ValueList arguments);
-
-	typedef std::map<int, CefRefPtr<CefV8Value>> CallbackMap;
-	int callbackId;
-	CallbackMap callbackMap;
-
-	IMPLEMENT_REFCOUNTING(BrowserApp);
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-client.cpp Deleted

@@ -1,124 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 <include/cef_render_handler.h>
-
-#include "browser-client.hpp"
-#include "browser-obs-bridge.hpp"
-
-BrowserClient::BrowserClient(CefRenderHandler *renderHandler,
-	CefLoadHandler *loadHandler, BrowserOBSBridge *browserOBSBridge)
-	: renderHandler(renderHandler), loadHandler(loadHandler), browserOBSBridge(browserOBSBridge)
-{
-}
-
-CefRefPtr<CefRenderHandler> BrowserClient::GetRenderHandler()
-{
-	return renderHandler;
-}
-
-CefRefPtr<CefLoadHandler> BrowserClient::GetLoadHandler()
-{
-	return loadHandler;
-}
-
-CefRefPtr<CefLifeSpanHandler> BrowserClient::GetLifeSpanHandler()
-{
-	return this;
-}
-
-CefRefPtr<CefContextMenuHandler> BrowserClient::GetContextMenuHandler()
-{
-	return this;
-}
-
-bool BrowserClient::OnBeforePopup(CefRefPtr<CefBrowser> browser,
-	CefRefPtr<CefFrame> frame, const CefString& target_url,
-	const CefString& target_frame_name,
-	WindowOpenDisposition target_disposition,
-	bool user_gesture,
-	const CefPopupFeatures& popupFeatures,
-	CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client,
-	CefBrowserSettings& settings,
-	bool* no_javascript_access)
-{
-	(void)browser;
-	(void)frame;
-	(void)target_url;
-	(void)target_frame_name;
-	(void)target_disposition;
-	(void)user_gesture;
-	(void)popupFeatures;
-	(void)windowInfo;
-	(void)client;
-	(void)settings;
-	(void)no_javascript_access;
-
-	// block popups
-	return true;
-}
-
-void BrowserClient::OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
-	CefRefPtr<CefFrame> frame, CefRefPtr<CefContextMenuParams> params,
-	CefRefPtr<CefMenuModel> model)
-{
-	(void)browser;
-	(void)frame;
-	(void)params;
-
-	// remove all context menu contributions
-	model->Clear();
-}
-
-bool BrowserClient::OnProcessMessageReceived(
-	CefRefPtr<CefBrowser> browser,
-	CefProcessId source_process,
-	CefRefPtr<CefProcessMessage> message)
-{
-	const std::string& message_name = message->GetName();
-	if (message_name == "getCurrentScene") {
-
-		int callbackID = message->GetArgumentList()->GetInt(0);
-
-		const char* jsonString = browserOBSBridge->GetCurrentSceneJSONData();
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("executeCallback");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetInt(0, callbackID);
-		args->SetString(1, jsonString);
-
-		browser->SendProcessMessage(PID_RENDERER, msg);
-
-		return true;
-	}
-	else if (message_name == "getStatus") {
-
-		int callbackID = message->GetArgumentList()->GetInt(0);
-
-		CefString jsonString = browserOBSBridge->GetStatus();
-
-		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("executeCallback");
-		CefRefPtr<CefListValue> args = msg->GetArgumentList();
-		args->SetInt(0, callbackID);
-		args->SetString(1, jsonString);
-
-		browser->SendProcessMessage(PID_RENDERER, msg);
-
-		return true;
-	}
-	return false;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-client.hpp Deleted

@@ -1,69 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <include/cef_client.h>
-#include "browser-obs-bridge.hpp"
-
-class BrowserSource;
-class BrowserRenderHandler;
-class BrowserLoadHandler;
-
-class BrowserClient : public CefClient, public CefLifeSpanHandler,
-		public CefContextMenuHandler
-{
-public:
-	BrowserClient(CefRenderHandler *renderHandler,
-		CefLoadHandler *loadHandler,
-		BrowserOBSBridge *browserOBSBridge);
-
-public: /* CefClient overrides */
-	virtual CefRefPtr<CefRenderHandler> GetRenderHandler() OVERRIDE;
-	virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE;
-	virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler()
-			OVERRIDE;
-	virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE;
-	virtual bool OnProcessMessageReceived(
-			CefRefPtr<CefBrowser> browser,
-			CefProcessId source_process,
-			CefRefPtr<CefProcessMessage> message) OVERRIDE;
-
-public: /* CefLifeSpanHandler overrides */
-	virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
-			CefRefPtr<CefFrame> frame, const CefString& target_url,
-			const CefString& target_frame_name,
-			WindowOpenDisposition target_disposition,
-			bool user_gesture,
-			const CefPopupFeatures& popupFeatures,
-			CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client,
-			CefBrowserSettings& settings,
-			bool* no_javascript_access) OVERRIDE;
-public: /* CefContextMenuHandler overrides */
-	virtual void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
-			CefRefPtr<CefFrame> frame,
-			CefRefPtr<CefContextMenuParams> params,
-			CefRefPtr<CefMenuModel> model);
-
-private:
-	CefRefPtr<CefRenderHandler> renderHandler;
-	CefRefPtr<CefLoadHandler> loadHandler;
-	BrowserOBSBridge *browserOBSBridge;
-
-public:
-	IMPLEMENT_REFCOUNTING(BrowserClient);
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-listener.hpp Deleted

@@ -1,98 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include "browser-types.h"
-
-class BrowserListenerBase
-{
-public:
-	virtual ~BrowserListenerBase() {}
-
-	virtual void OnDraw(BrowserSurfaceHandle surfaceHandle, int width,
-			int height) = 0;
-	virtual bool CreateSurface(int width, int height,
-			BrowserSurfaceHandle *surfaceHandle) = 0;
-	virtual void DestroySurface(BrowserSurfaceHandle surfaceHandle) = 0;
-	virtual void Invalidated() = 0;
-};
-
-class BrowserListener : public BrowserListenerBase
-{
-public:
-	virtual ~BrowserListener() {}
-
-	virtual void OnDraw(BrowserSurfaceHandle surfaceHandle, int width,
-			int height) override
-	{
-		(void)surfaceHandle;
-		(void)width;
-		(void)height;
-	}
-
-	virtual bool CreateSurface(int width, int height,
-			BrowserSurfaceHandle *surfaceHandle) override
-	{
-		(void)width;
-		(void)height;
-		(void)surfaceHandle;
-
-		return false;
-	}
-
-	virtual bool CreatePopupSurface(
-		int width,
-		int height,
-		int x,
-		int y,
-		BrowserSurfaceHandle *surfaceHandle) 
-	{
-		(void)width;
-		(void)height;
-		(void)x;
-		(void)y;
-		(void)surfaceHandle;
-
-		return false;
-	}
-
-	virtual void DestroyPopupSurface() 
-	{
-	}
-
-	virtual void DestroySurface(BrowserSurfaceHandle surfaceHandle) override
-	{
-		(void)surfaceHandle;
-	}
-
-	virtual void Invalidated() override {}
-
-private:
-	int m_browserIdentifier = -1;
-
-public:
-	void SetBrowserIdentifier(const int browserIdentifier)
-	{
-		m_browserIdentifier = browserIdentifier;
-	}
-
-	const int GetBrowserIdentifier()
-	{
-		return m_browserIdentifier;
-	}
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-manager.hpp Deleted

@@ -1,85 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-#include <jansson.h>
-#include <include/cef_base.h>
-#include <include/cef_client.h>
-
-class BrowserListener;
-struct BrowserSettings;
-
-class BrowserManager {
-
-public:
-
-	static BrowserManager *Instance();
-	static void DestroyInstance();
-	
-public:
-	BrowserManager();
-	~BrowserManager();
-
-	void Startup();
-	void Shutdown();
-	void Restart();
-
-	int CreateBrowser(const BrowserSettings &browserSettings,
-			const std::shared_ptr<BrowserListener>
-				&browserListener);
-
-	CefBrowserHost* GetBrowserHost(int browserIdentifier);
-	CefBrowser* GetBrowser(int browserIdentifier);
-	void LoadURL(int browserIdentifier, CefString& url);
-
-	bool IsValidBrowserIdentifier(int browserIdentifier);
-
-	void DestroyBrowser(int browserIdentifier);
-
-	void TickBrowser(int browserIdentifier);
-	void SendMouseClick(int browserIdentifier,
-			const struct obs_mouse_event *event, int32_t type,
-			bool mouse_up, uint32_t click_count);
-	void SendMouseMove(int browserIdentifier,
-			const struct obs_mouse_event *event, bool mouseLeave);
-	void SendMouseWheel(int browserIdentifier,
-			const struct obs_mouse_event *event, int xDelta,
-			int yDelta);
-	void SendFocus(int browserIdentifier, bool focus);
-	void SendKeyClick(int browserIdentifier,
-			const struct obs_key_event *event, bool keyUp);
-
-	void SetModulePath(const char *path) { this->path = path; }
-	const char *GetModulePath() { return path; }
-
-	void ExecuteVisiblityJSCallback(int browserIdentifier, bool visible);
-
-	void ExecuteActiveJSCallback(int browserIdentifier, bool active);
-	
-	void ExecuteSceneChangeJSCallback(const char *name);
-
-	void RefreshPageNoCache(int browserIdentifier);
-
-	void DispatchJSEvent(const char *eventName, const char *jsonString);
-
-private:
-	class Impl;
-	std::unique_ptr<Impl> pimpl;
-	const char *path;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-obs-bridge.hpp Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-scheme.cpp Deleted

@@ -1,119 +0,0 @@
-#include <cctype>
-#include <algorithm>
-#include <include/cef_parser.h>
-#include <nowide/convert.hpp>
-
-#include "browser-scheme.hpp"
-
-BrowserSchemeHandlerFactory::BrowserSchemeHandlerFactory()
-{}
-
-CefRefPtr<CefResourceHandler> BrowserSchemeHandlerFactory::Create(
-		CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
-		const CefString& scheme_name, CefRefPtr<CefRequest> request)
-{
-	(void)frame;
-	(void)scheme_name;
-
-	if (!browser || !request)
-		return nullptr;
-
-	return CefRefPtr<BrowserSchemeHandler>(new BrowserSchemeHandler());
-}
-
-BrowserSchemeHandler::BrowserSchemeHandler()
-: isComplete(false), length(0), remaining(0)
-{
-}
-
-// First method called
-bool BrowserSchemeHandler::ProcessRequest(CefRefPtr<CefRequest> request,
-		CefRefPtr<CefCallback> callback)
-{
-	CefURLParts parts;
-	CefParseURL(request->GetURL(), parts);
-
-	std::string path = CefString(&parts.path);
-
-	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_SPACES);
-	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
-
-#ifdef WIN32
-	//blog(LOG_INFO, "%s", path.erase(0,1));
-	inputStream.open(nowide::widen(path.erase(0,1)), std::ifstream::binary);
-#else
-	inputStream.open(path, std::ifstream::binary);
-#endif
-
-	// Set fileName for use in GetResponseHeaders
-	fileName = path;
-
-	if (!inputStream.is_open()) {
-		callback->Cancel();
-		return false;
-	}
-
-	inputStream.seekg(0, std::ifstream::end);
-	length = remaining = inputStream.tellg();
-	inputStream.seekg(0, std::ifstream::beg);
-	callback->Continue();
-	return true;
-}
-
-void BrowserSchemeHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,
-		int64& response_length, CefString& redirectUrl)
-{
-	if (!response) {
-		response_length = -1;
-		redirectUrl = "";
-		return;
-	}
-
-	std::string fileExtension = fileName.substr(
-		fileName.find_last_of(".") + 1);
-	
-	if (fileExtension.compare("woff2") == 0) {
-		fileExtension = "woff";
-	}
-	
-	std::transform(fileExtension.begin(), fileExtension.end(),
-			fileExtension.begin(), ::tolower);
-
-	response->SetStatus(200);
-	response->SetMimeType(CefGetMimeType(fileExtension));
-	response->SetStatusText("OK");
-	response_length = length;
-	redirectUrl = "";
-}
-
-bool BrowserSchemeHandler::ReadResponse(void* data_out, int bytes_to_read,
-		int& bytes_read, CefRefPtr<CefCallback> callback)
-{
-	(void)callback;
-
-	if (!data_out || !inputStream.is_open()) {
-		bytes_read = 0;
-		inputStream.close();
-		return false;
-	}
-
-	if (isComplete) {
-		bytes_read = 0;
-		return false;
-	}
-
-	inputStream.read((char *)data_out, bytes_to_read);
-	remaining -= bytes_read = inputStream.gcount();
-	if (remaining == 0) {
-		isComplete = true;
-		inputStream.close();
-	}
-
-	return true;
-}
-
-void BrowserSchemeHandler::Cancel()
-{
-	if (inputStream.is_open())
-		inputStream.close();
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-scheme.hpp Deleted

@@ -1,62 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <map>
-#include <fstream>
-
-#include <include/cef_scheme.h>
-
-class BrowserSchemeHandlerFactory : public CefSchemeHandlerFactory {
-
-public:
-	BrowserSchemeHandlerFactory();
-
-public: // CefSchemeHandlerFactory overrides
-	virtual CefRefPtr<CefResourceHandler> Create(
-			CefRefPtr<CefBrowser> browser,
-			CefRefPtr<CefFrame> frame, const CefString& scheme_name,
-			CefRefPtr<CefRequest> request);
-
-public:
-	IMPLEMENT_REFCOUNTING(BrowserSchemeHandlerFactory);
-
-};
-
-class BrowserSchemeHandler : public CefResourceHandler {
-public:
-	BrowserSchemeHandler();
-	virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
-			CefRefPtr<CefCallback> callback);
-	virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
-			int64& response_length, CefString& redirectUrl);
-	virtual bool ReadResponse(void* data_out, int bytes_to_read,
-			int& bytes_read, CefRefPtr<CefCallback> callback);
-	virtual void Cancel();
-
-
-private:
-	std::string fileName;
-	std::ifstream inputStream;
-	bool isComplete;
-	int64 length;
-	int64 remaining;
-
-public:
-	IMPLEMENT_REFCOUNTING(BrowserSchemeHandler);
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-settings.hpp Deleted

@@ -1,28 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
- 
-#include <string>
-
-struct BrowserSettings {
-	std::string url;
-	std::string css;
-	unsigned int width;
-	unsigned int height;
-	unsigned int fps;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-source.cpp Deleted

@@ -1,101 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-source.hpp"
-#include "browser-manager.hpp"
-#include "browser-listener.hpp"
-#include "browser-settings.hpp"
-
-void BrowserSource::UpdateSettings(obs_data_t *settings)
-{
-	isLocalFile = obs_data_get_bool(settings, "is_local_file");
-	url = obs_data_get_string(settings, isLocalFile ? "local_file" : "url");
-	css = obs_data_get_string(settings, "css");
-	width = (uint32_t)obs_data_get_int(settings, "width");
-	height = (uint32_t)obs_data_get_int(settings, "height");
-	fps = (uint32_t)obs_data_get_int(settings, "fps");
-	shutdown = obs_data_get_bool(settings, "shutdown");
-
-	UpdateBrowser();
-}
-
-void BrowserSource::UpdateBrowser()
-{
-	if (browserIdentifier != 0) {
-		LockTexture();
-		BrowserManager::Instance()->DestroyBrowser(browserIdentifier);
-		InvalidateActiveTexture();
-		browserIdentifier = 0;
-		UnlockTexture();
-	}
-
-	std::shared_ptr<BrowserListener> browserListener(CreateListener());
-
-	BrowserSettings browserSettings;
-
-	browserSettings.url = isLocalFile? "http://absolute/"+ url : url,
-	browserSettings.width = width;
-	browserSettings.height = height;
-	browserSettings.fps = fps;
-	browserSettings.css = css;
-
-	browserIdentifier = BrowserManager::Instance()->CreateBrowser(
-			browserSettings, browserListener);
-}
-
-void BrowserSource::SendMouseClick(const struct obs_mouse_event *event,
-		int32_t type, bool mouseUp, uint32_t clickCount)
-{
-
-	BrowserManager::Instance()->SendMouseClick(browserIdentifier,
-			event, type, mouseUp, clickCount);
-}
-
-void BrowserSource::SendMouseMove(const struct obs_mouse_event *event,
-		bool mouseLeave)
-{
-	BrowserManager::Instance()->SendMouseMove(browserIdentifier,
-			event, mouseLeave);
-}
-
-void BrowserSource::SendMouseWheel(const struct obs_mouse_event *event,
-		int xDelta, int yDelta)
-{
-	BrowserManager::Instance()->SendMouseWheel(browserIdentifier,
-			event, xDelta, yDelta);
-}
-
-void BrowserSource::SendFocus(bool focus)
-{
-	BrowserManager::Instance()->SendFocus(browserIdentifier, focus);
-}
-
-void BrowserSource::SendKeyClick(const struct obs_key_event *event, bool keyUp)
-{
-	BrowserManager::Instance()->SendKeyClick(browserIdentifier, event,
-			keyUp);
-}
-
-void BrowserSource::ExecuteVisiblityJSCallback(bool visible)
-{
-	BrowserManager::Instance()->ExecuteVisiblityJSCallback(browserIdentifier, visible);
-}
-
-void BrowserSource::ExecuteActiveJSCallback(bool active)
-{
-	BrowserManager::Instance()->ExecuteActiveJSCallback(browserIdentifier, active);
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-source.hpp Deleted

@@ -1,91 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-
-#include <stdint.h>
-#include <string>
-
-#include <mutex>
-
-#include <obs-module.h>
-#include <util/platform.h>
-#include <obs-output.h>
-
-class TextureRef;
-class BrowserListener;
-
-class BrowserSource {
-
-public:
-	BrowserSource(obs_data_t *settings, obs_source_t *source);
-	~BrowserSource();
-
-public:
-	void UpdateSettings(obs_data_t *settings);
-	void UpdateBrowser();
-
-public:
-	inline const std::string& GetUrl() const { return url; }
-	inline const std::string& GetCss() const { return css; }
-	inline uint32_t GetWidth() const { return width; }
-	inline uint32_t GetHeight() const { return height; }
-	inline obs_source_t *GetSource() const { return source; }
-	inline const bool GetShutdown() const { return shutdown; }
-
-	inline int GetBrowserIdentifier() const { return browserIdentifier; }
-
-	inline void LockTexture() { textureLock.lock(); }
-	inline bool TryLockTexture() { return textureLock.try_lock(); }
-	inline void UnlockTexture() { textureLock.unlock(); }
-
-	void RenderActiveTexture(gs_effect_t *effect);
-	void InvalidateActiveTexture();
-
-	void SendMouseClick(const struct obs_mouse_event *event,
-			int32_t type, bool mouseUp, uint32_t clickCount);
-	void SendMouseMove(const struct obs_mouse_event *event,
-			bool mouseLeave);
-	void SendMouseWheel(const struct obs_mouse_event *event,
-			int xDelta, int yDelta);
-	void SendFocus(bool focus);
-	void SendKeyClick(const struct obs_key_event *event, bool keyUp);
-	std::shared_ptr<BrowserListener> CreateListener();
-
-	void ExecuteVisiblityJSCallback(bool visible);
-	void ExecuteActiveJSCallback(bool active);
-
-private:
-	class Impl;
-	std::unique_ptr<Impl> pimpl;
-
-	obs_source_t *source;
-	bool isLocalFile;
-	std::string url;
-	std::string css;
-	uint32_t width;
-	uint32_t height;
-	uint32_t fps;
-	bool shutdown;
-	bool restart_when_active;
-
-	int browserIdentifier;
-
-	std::mutex textureLock;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-task.cpp Deleted

@@ -1,28 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.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 "browser-task.hpp"
-
-CefRefPtr<BrowserTask> BrowserTask::newTask(std::function<void()> task)
-{
-	return CefRefPtr<BrowserTask>(new BrowserTask(task));
-}
-
-void BrowserTask::Execute()
-{
-	task();
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-task.hpp Deleted

@@ -1,38 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
- 
-#include <functional>
-
-#include "include/cef_task.h"
-
-class BrowserTask : public CefTask
-{
-public:
-	static CefRefPtr<BrowserTask> newTask(std::function<void()> task);
-
-public: /* CefTask overrides */
-	void Execute() OVERRIDE;
-
-private:
-	BrowserTask(std::function<void()> task) : task(task) {}
-private:
-	std::function<void()> task;
-private:
-	IMPLEMENT_REFCOUNTING(BrowserTask);
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-texture-reference.hpp Deleted

@@ -1,39 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-
-#include "browser-types.hpp"
-
-class BrowserTexture {
-public:
-	BrowserTexture(const int width, const int height,
-		const BrowserSurfaceHandle surfaceHandle);
-
-	~BrowserTexture();
-
-	int GetWidth() const;
-	int GetHeight() const;
-	BrowserSurfaceHandle GetHandle() const;
-	bool Upload(const void *data);
-
-private:
-	class Impl;
-	std::unique_ptr<Impl> pimpl;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-texture.hpp Deleted

@@ -1,39 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#include <memory>
-
-typedef int BrowserSurfaceHandle;
-
-class BrowserTexture {
-public:
-	BrowserTexture(const int width, const int height,
-			const BrowserSurfaceHandle surfaceHandle);
-
-	~BrowserTexture();
-
-	int GetWidth() const;
-	int GetHeight() const;
-	BrowserSurfaceHandle GetHandle() const;
-	bool Upload(const void *data);
-
-private:
-	class Impl;
-	std::unique_ptr<Impl> pimpl;
-};

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-types.h Deleted

@@ -1,28 +0,0 @@
-/******************************************************************************
- Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-#pragma once
-
-#ifndef __APPLE__
-#include <obs-module.h>
-#endif
-
-#ifdef __APPLE__
-typedef int BrowserSurfaceHandle;
-#else
-typedef struct gs_texture *BrowserSurfaceHandle;
-#endif

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/browser-version.h Deleted

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/util.cpp Deleted

@@ -1,38 +0,0 @@
-#include "util.hpp"
-
-/**
-	Takes an OBS source and generates a JSON encoded string representing information about the source.
-	
-	@param source is the OBS source that we want to turn into json data
-	@return json encoded string
-*/
-const char* obsSourceToJSON(obs_source_t *source)
-{
-	const char *name = obs_source_get_name(source);
-
-	json_t *obj = json_object();
-	json_object_set_new(obj, "name", json_string(name));
-	json_object_set_new(obj, "width", json_integer(obs_source_get_width(source)));
-	json_object_set_new(obj, "height", json_integer(obs_source_get_height(source)));
-	const char *jsonString = json_dumps(obj, 0);
-	free(obj);
-
-	return jsonString;
-}
-
-/**
-	Gets the OBS status and generates a JSON encoded string representing the status (recording, streaming etc.).
-
-	@return json encoded string
-*/
-const char* obsStatusToJSON()
-{
-	json_t *obj = json_object();
-	json_object_set_new(obj, "recording", json_boolean(obs_frontend_recording_active()));
-	json_object_set_new(obj, "streaming", json_boolean(obs_frontend_streaming_active()));
-	json_object_set_new(obj, "replaybuffer", json_boolean(obs_frontend_replay_buffer_active()));
-	const char *jsonString = json_dumps(obj, 0);
-	free(obj);
-
-	return jsonString;
-}

obs-studio-21.1.2.tar.xz/plugins/obs-browser/shared/util.hpp Deleted

obs-studio-21.1.2.tar.xz/.gitmodules -> obs-studio-22.0.1.tar.xz/.gitmodules Changed

obs-studio-21.1.2.tar.xz/.travis.yml -> obs-studio-22.0.1.tar.xz/.travis.yml Changed

obs-studio-21.1.2.tar.xz/CI/before-deploy-osx.sh -> obs-studio-22.0.1.tar.xz/CI/before-deploy-osx.sh Changed

@@ -14,11 +14,6 @@
 
 cd ./build
 
-# Move the CEF plugin out before running build_app so that it doesn't get packaged twice
-hr "Moving CEF out to preserve linking"
-mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./
-mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./
-
 # Move obslua
 hr "Moving OBS LUA"
 mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/
@@ -35,12 +30,20 @@
   STABLE=true
 fi
 
-sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --base-url "https://obsproject.com/osx_update" --stable=$STABLE
+sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --stable=$STABLE
 
-# Move the CEF plugin back to where it belongs
-hr "Moving CEF back"
-mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/
-mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/
+# Copy Chromium embedded framework to app Frameworks directory
+hr "Copying Chromium Embedded Framework.framework"
+sudo mkdir -p OBS.app/Contents/Frameworks
+sudo cp -r ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks/
+sudo install_name_tool -change \
+	@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	OBS.app/Contents/Resources/obs-plugins/obs-browser.so
+sudo install_name_tool -change \
+	@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	OBS.app/Contents/Resources/obs-plugins/cef-bootstrap
 
 # Package app
 hr "Generating .pkg"

obs-studio-21.1.2.tar.xz/CI/before-script-osx.sh -> obs-studio-22.0.1.tar.xz/CI/before-script-osx.sh Changed

obs-studio-21.1.2.tar.xz/CI/install-dependencies-osx.sh -> obs-studio-22.0.1.tar.xz/CI/install-dependencies-osx.sh Changed

@@ -1,3 +1,9 @@
+hr() {
+  echo "───────────────────────────────────────────────────"
+  echo $1
+  echo "───────────────────────────────────────────────────"
+}
+
 # Exit if something fails
 set -e
 
@@ -11,40 +17,45 @@
 
 # Install Packages app so we can build a package later
 # http://s.sudre.free.fr/Software/Packages/about.html
-wget --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
+hr "Downloading Packages app"
+wget --quiet --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
 sudo installer -pkg ./Packages.pkg -target /
 
 brew update
 
 #Base OBS Deps and ccache
-brew install qt5 jack speexdsp ccache swig
+brew install qt@5.11 jack speexdsp ccache swig mbedtls
 
 export PATH=/usr/local/opt/ccache/libexec:$PATH
 ccache -s || echo "CCache is not available."
 
 # Fetch and untar prebuilt OBS deps that are compatible with older versions of OSX
-wget --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz
-tar -xf ./osx-deps.tar.gz -C /tmp
+hr "Downloading OBS deps"
+wget --quiet --retry-connrefused --waitretry=1 https://obs-nightly.s3.amazonaws.com/osx-deps-2018-08-09.tar.gz
+tar -xf ./osx-deps-2018-08-09.tar.gz -C /tmp
 
 # Fetch vlc codebase
-wget --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip
+hr "Downloading VLC repo"
+wget --quiet --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip
 unzip -q ./vlc-master.zip
 
 # Get sparkle
-wget --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.16.0/Sparkle-1.16.0.tar.bz2
+hr "Downloading Sparkle framework"
+wget --quiet --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.20.0/Sparkle-1.20.0.tar.bz2
 mkdir ./sparkle
 tar -xf ./sparkle.tar.bz2 -C ./sparkle
 sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
 
 # CEF Stuff
-wget --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
+hr "Downloading CEF"
+wget --quiet --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
 # remove a broken test
 sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
 mkdir build
 cd ./build
-cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
+cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 ..
 make -j4
 mkdir libcef_dll
 cd ../../

obs-studio-21.1.2.tar.xz/CI/install/osx/CMakeLists.pkgproj -> obs-studio-22.0.1.tar.xz/CI/install/osx/CMakeLists.pkgproj Changed

obs-studio-21.1.2.tar.xz/CI/install/osx/build_app.py -> obs-studio-22.0.1.tar.xz/CI/install/osx/build_app.py Changed

@@ -45,7 +45,7 @@
 parser.add_argument('-n', '--build-number', dest='build_number', default='0')
 parser.add_argument('-k', '--public-key', dest='public_key', default='OBSPublicDSAKey.pem')
 parser.add_argument('-f', '--sparkle-framework', dest='sparkle', default=None)
-parser.add_argument('-b', '--base-url', dest='base_url', default='https://builds.catchexception.org/obs-studio')
+parser.add_argument('-b', '--base-url', dest='base_url', default='https://obsproject.com/osx_update')
 parser.add_argument('-u', '--user', dest='user', default='jp9000')
 parser.add_argument('-c', '--channel', dest='channel', default='master')
 add_boolean_argument(parser, 'stable', default=False)
@@ -82,6 +82,16 @@
 	print("Checking " + i)
 	for root, dirs, files in walk(build_path+"/"+i):
 		for file_ in files:
+			if ".ini" in file_:
+				continue
+			if ".png" in file_:
+				continue
+			if ".effect" in file_:
+				continue
+			if ".py" in file_:
+				continue
+			if ".json" in file_:
+				continue
 			path = root + "/" + file_
 			try:
 				out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,

obs-studio-21.1.2.tar.xz/CI/install/osx/post-install.sh -> obs-studio-22.0.1.tar.xz/CI/install/osx/post-install.sh Changed

obs-studio-21.1.2.tar.xz/CI/util/build-package-deps-osx.sh -> obs-studio-22.0.1.tar.xz/CI/util/build-package-deps-osx.sh Changed

@@ -1,5 +1,13 @@
 #!/usr/bin/env bash
 
+set -e
+
+# This script builds a tar file that contains a bunch of deps that OBS needs for
+# advanced functionality on OSX. Currently this tar file is pulled down off of s3
+# and used in the CI build process on travis.
+# Mostly this sets build flags to compile with older SDKS and make sure that 
+# the libs are portable.
+
 exists()
 {
   command -v "$1" >/dev/null 2>&1
@@ -35,15 +43,15 @@
 mkdir $DEPS_DEST/lib
 
 # OSX COMPAT
-export MACOSX_DEPLOYMENT_TARGET=10.9
+export MACOSX_DEPLOYMENT_TARGET=10.11
 
 # If you need an olders SDK and Xcode won't give it to you
 # https://github.com/phracker/MacOSX-SDKs
 
 # libopus
-curl -L -O http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz
-tar -xf opus-1.1.3.tar.gz
-cd ./opus-1.1.3
+curl -L -O https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.2.1.tar.gz
+tar -xf opus-1.2.1.tar.gz
+cd ./opus-1.2.1
 mkdir build
 cd ./build
 ../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
@@ -53,9 +61,9 @@
 cd $WORK_DIR
 
 # libogg
-curl -L -O http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
-tar -xf libogg-1.3.2.tar.gz
-cd ./libogg-1.3.2
+curl -L -O https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz
+tar -xf libogg-1.3.3.tar.gz
+cd ./libogg-1.3.3
 mkdir build
 cd ./build
 ../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
@@ -65,9 +73,9 @@
 cd $WORK_DIR
 
 # libvorbis
-curl -L -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
-tar -xf libvorbis-1.3.5.tar.gz
-cd ./libvorbis-1.3.5
+curl -L -O https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz
+tar -xf libvorbis-1.3.6.tar.gz
+cd ./libvorbis-1.3.6
 mkdir build
 cd ./build
 ../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
@@ -77,12 +85,13 @@
 cd $WORK_DIR
 
 # libvpx
-curl -L -O http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.0.tar.bz2
-tar -xf libvpx-1.6.0.tar.bz2
-cd ./libvpx-1.6.0
-mkdir build
+curl -L -O https://chromium.googlesource.com/webm/libvpx/+archive/v1.7.0.tar.gz
+mkdir -p ./libvpx-v1.7.0
+tar -xf v1.7.0.tar.gz -C $PWD/libvpx-v1.7.0
+cd ./libvpx-v1.7.0
+mkdir -p build
 cd ./build
-../configure --disable-shared --libdir="/tmp/obsdeps/bin"
+../configure --disable-shared --prefix="/tmp/obsdeps" --libdir="/tmp/obsdeps/lib"
 make -j 12
 make install
 
@@ -94,10 +103,10 @@
 git checkout origin/stable
 mkdir build
 cd ./build
-../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-static --prefix="/tmp/obsdeps"
+../configure --extra-ldflags="-mmacosx-version-min=10.11" --enable-static --prefix="/tmp/obsdeps"
 make -j 12
 make install
-../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --libdir="/tmp/obsdeps/bin" --prefix="/tmp/obsdeps"
+../configure --extra-ldflags="-mmacosx-version-min=10.11" --enable-shared --libdir="/tmp/obsdeps/bin" --prefix="/tmp/obsdeps"
 make -j 12
 ln -f -s libx264.*.dylib libx264.dylib
 find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
@@ -107,9 +116,9 @@
 cd $WORK_DIR
 
 # janson
-curl -L -O http://www.digip.org/jansson/releases/jansson-2.9.tar.gz
-tar -xf jansson-2.9.tar.gz
-cd jansson-2.9
+curl -L -O http://www.digip.org/jansson/releases/jansson-2.11.tar.gz
+tar -xf jansson-2.11.tar.gz
+cd jansson-2.11
 mkdir build
 cd ./build
 ../configure --libdir="/tmp/obsdeps/bin" --enable-shared --disable-static
@@ -124,12 +133,12 @@
 export CFLAGS="-I/tmp/obsdeps/include"
 
 # FFMPEG
-curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n3.2.2.zip
-unzip ./n3.2.2.zip
-cd ./FFmpeg-n3.2.2
+curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n4.0.2.zip
+unzip ./n4.0.2.zip
+cd ./FFmpeg-n4.0.2
 mkdir build
 cd ./build
-../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-outdev=sdl
+../configure --pkg-config-flags="--static" --extra-ldflags="-mmacosx-version-min=10.11" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-outdev=sdl
 make -j 12
 find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
 rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/
@@ -149,4 +158,4 @@
 
 tar -czf osx-deps.tar.gz obsdeps
 
-cp ./osx-deps.tar.gz $CURDIR
\ No newline at end of file
+cp ./osx-deps.tar.gz $CURDIR

obs-studio-21.1.2.tar.xz/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/CMakeLists.txt Changed

@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 2.8.12)
 
+if (UNIX AND POLICY CMP0072)
+	# In case of both legacy and glvnd OpenGL libraries found. Prefer GLVND
+	cmake_policy(SET CMP0072 NEW)
+endif()
+
 project(obs-studio)
 
 option(BUILD_CAPTIONS "Build captions" FALSE)
@@ -27,6 +32,23 @@
 include(ObsCpack)
 include(GNUInstallDirs)
 
+# Must be a string in the format of "x.x.x-rcx"
+if(DEFINED RELEASE_CANDIDATE)
+	set(OBS_VERSION "${RELEASE_CANDIDATE}")
+	string(REPLACE "-rc" "." RC_SPLIT ${RELEASE_CANDIDATE})
+	string(REPLACE "." ";" RC_SPLIT ${RC_SPLIT})
+	message(WARNING "******************************************************************************\nRelease candidate deteced, OBS_VERSION is now: ${OBS_VERSION}\n******************************************************************************")
+	list(GET RC_SPLIT 0 OBS_RELEASE_CANDIDATE_MAJOR)
+	list(GET RC_SPLIT 1 OBS_RELEASE_CANDIDATE_MINOR)
+	list(GET RC_SPLIT 2 OBS_RELEASE_CANDIDATE_PATCH)
+	list(GET RC_SPLIT 3 OBS_RELEASE_CANDIDATE)
+else()
+	set(OBS_RELEASE_CANDIDATE_MAJOR 0)
+	set(OBS_RELEASE_CANDIDATE_MINOR 0)
+	set(OBS_RELEASE_CANDIDATE_PATCH 0)
+	set(OBS_RELEASE_CANDIDATE 0)
+endif()
+
 if(MSVC AND NOT EXISTS "${CMAKE_BINARY_DIR}/ALL_BUILD.vcxproj.user")
 	file(GENERATE
 		OUTPUT "${CMAKE_BINARY_DIR}/ALL_BUILD.vcxproj.user"

obs-studio-21.1.2.tar.xz/CONTRIBUTING.rst -> obs-studio-22.0.1.tar.xz/CONTRIBUTING.rst Changed

obs-studio-21.1.2.tar.xz/INSTALL -> obs-studio-22.0.1.tar.xz/INSTALL Changed

obs-studio-21.1.2.tar.xz/UI/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/UI/CMakeLists.txt Changed

@@ -13,7 +13,7 @@
 
 project(obs)
 
-set(ENABLE_WIN_UPDATER FALSE CACHE BOOL "Enable the windows updater")
+set(DISABLE_UPDATE_MODULE TRUE CACHE BOOL "Disables building the update module")
 
 if(DEFINED QTDIR${_lib_suffix})
 	list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
@@ -55,6 +55,8 @@
 include_directories(SYSTEM "obs-frontend-api")
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/deps/libff")
+include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/deps/json11")
+include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/plugins/obs-browser/panel")
 
 find_package(Libcurl REQUIRED)
 include_directories(${LIBCURL_INCLUDE_DIRS})
@@ -78,10 +80,6 @@
 		crypt32
 		blake2
 		${OBS_JANSSON_IMPORT})
-
-	if(ENABLE_WIN_UPDATER)
-		add_definitions(-DENABLE_WIN_UPDATER)
-	endif()
 elseif(APPLE)
 	set(obs_PLATFORM_SOURCES
 		platform-osx.mm)
@@ -131,6 +129,7 @@
 set(obs_SOURCES
 	${obs_PLATFORM_SOURCES}
 	${obs_libffutil_SOURCES}
+	../deps/json11/json11.cpp
 	obs-app.cpp
 	api-interface.cpp
 	window-basic-main.cpp
@@ -156,6 +155,7 @@
 	window-log-reply.cpp
 	window-projector.cpp
 	window-remux.cpp
+	source-tree.cpp
 	properties-view.cpp
 	focus-list.cpp
 	menu-button.cpp
@@ -165,6 +165,7 @@
 	item-widget-helpers.cpp
 	visibility-checkbox.cpp
 	locked-checkbox.cpp
+	horizontal-scroll-area.cpp
 	vertical-scroll-area.cpp
 	visibility-item-widget.cpp
 	slider-absoluteset-style.cpp
@@ -180,6 +181,7 @@
 set(obs_HEADERS
 	${obs_PLATFORM_HEADERS}
 	${obs_libffutil_HEADERS}
+	../deps/json11/json11.hpp
 	obs-app.hpp
 	platform.hpp
 	window-main.hpp
@@ -201,6 +203,7 @@
 	window-log-reply.hpp
 	window-projector.hpp
 	window-remux.hpp
+	source-tree.hpp
 	properties-view.hpp
 	properties-view.moc.hpp
 	display-helpers.hpp
@@ -213,6 +216,8 @@
 	item-widget-helpers.hpp
 	visibility-checkbox.hpp
 	locked-checkbox.hpp
+	horizontal-scroll-area.hpp
+	expand-checkbox.hpp
 	vertical-scroll-area.hpp
 	visibility-item-widget.hpp
 	slider-absoluteset-style.hpp
@@ -231,6 +236,7 @@
 	forms/AutoConfigVideoPage.ui
 	forms/AutoConfigStreamPage.ui
 	forms/AutoConfigTestPage.ui
+	forms/ColorSelect.ui
 	forms/OBSLicenseAgreement.ui
 	forms/OBSLogReply.ui
 	forms/OBSBasic.ui

obs-studio-21.1.2.tar.xz/UI/adv-audio-control.cpp -> obs-studio-22.0.1.tar.xz/UI/adv-audio-control.cpp Changed

@@ -13,7 +13,7 @@
 #define NSEC_PER_MSEC 1000000
 #endif
 
-OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *layout, obs_source_t *source_)
+OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_)
 	: source(source_)
 {
 	QHBoxLayout *hlayout;
@@ -155,20 +155,7 @@
 	QWidget::connect(mixer6, SIGNAL(clicked(bool)),
 			this, SLOT(mixer6Changed(bool)));
 
-	int lastRow = layout->rowCount();
-
-	idx = 0;
-	layout->addWidget(nameLabel, lastRow, idx++);
-	layout->addWidget(volume, lastRow, idx++);
-	layout->addWidget(forceMonoContainer, lastRow, idx++);
-	layout->addWidget(panningContainer, lastRow, idx++);
-	layout->addWidget(syncOffset, lastRow, idx++);
-#if defined(_WIN32) || defined(__APPLE__) || HAVE_PULSEAUDIO
-	layout->addWidget(monitoringType, lastRow, idx++);
-#endif
-	layout->addWidget(mixerContainer, lastRow, idx++);
-	layout->layout()->setAlignment(mixerContainer,
-			Qt::AlignHCenter | Qt::AlignVCenter);
+	setObjectName(sourceName);
 }
 
 OBSAdvAudioCtrl::~OBSAdvAudioCtrl()
@@ -184,6 +171,24 @@
 	mixerContainer->deleteLater();
 }
 
+void OBSAdvAudioCtrl::ShowAudioControl(QGridLayout *layout)
+{
+	int lastRow = layout->rowCount();
+	int idx = 0;
+
+	layout->addWidget(nameLabel, lastRow, idx++);
+	layout->addWidget(volume, lastRow, idx++);
+	layout->addWidget(forceMonoContainer, lastRow, idx++);
+	layout->addWidget(panningContainer, lastRow, idx++);
+	layout->addWidget(syncOffset, lastRow, idx++);
+#if defined(_WIN32) || defined(__APPLE__) || HAVE_PULSEAUDIO
+	layout->addWidget(monitoringType, lastRow, idx++);
+#endif
+	layout->addWidget(mixerContainer, lastRow, idx++);
+	layout->layout()->setAlignment(mixerContainer,
+		Qt::AlignHCenter | Qt::AlignVCenter);
+}
+
 /* ------------------------------------------------------------------------- */
 /* OBS source callbacks */

obs-studio-21.1.2.tar.xz/UI/adv-audio-control.hpp -> obs-studio-22.0.1.tar.xz/UI/adv-audio-control.hpp Changed

obs-studio-21.1.2.tar.xz/UI/api-interface.cpp -> obs-studio-22.0.1.tar.xz/UI/api-interface.cpp Changed

@@ -93,9 +93,11 @@
 	{
 		if (main->IsPreviewProgramMode()) {
 			QMetaObject::invokeMethod(main, "TransitionToScene",
+					WaitConnection(),
 					Q_ARG(OBSSource, OBSSource(scene)));
 		} else {
 			QMetaObject::invokeMethod(main, "SetCurrentScene",
+					WaitConnection(),
 					Q_ARG(OBSSource, OBSSource(scene)),
 					Q_ARG(bool, false));
 		}
@@ -167,6 +169,19 @@
 		}
 	}
 
+	bool obs_frontend_add_scene_collection(
+			const char *name) override
+	{
+		bool success = false;
+		QMetaObject::invokeMethod(main,
+				"AddSceneCollection",
+				WaitConnection(),
+				Q_RETURN_ARG(bool, success),
+				Q_ARG(bool, true),
+				Q_ARG(QString, QT_UTF8(name)));
+		return success;
+	}
+
 	void obs_frontend_get_profiles(
 			std::vector<std::string> &strings) override
 	{
@@ -329,6 +344,16 @@
 		main->SaveProject();
 	}
 
+	void obs_frontend_defer_save_begin(void) override
+	{
+		QMetaObject::invokeMethod(main, "DeferSaveBegin");
+	}
+
+	void obs_frontend_defer_save_end(void) override
+	{
+		QMetaObject::invokeMethod(main, "DeferSaveEnd");
+	}
+
 	void obs_frontend_add_save_callback(obs_frontend_save_cb callback,
 			void *private_data) override
 	{

obs-studio-21.1.2.tar.xz/UI/data/locale.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/af-ZA.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/af-ZA.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/ar-SA.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ar-SA.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/bg-BG.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/bg-BG.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/bn-BD.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/bn-BD.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/ca-ES.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ca-ES.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Vista prèvia"
 StudioMode.Program="Programa"
 ShowInMultiview="Mostra en vista múltiple"
+VerticalLayout="Disposició vertical"
+Group="Grup"
 
 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í."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Atura l'enregistrament"
 Basic.Main.StoppingStreaming="Aturant la transmissió..."
 Basic.Main.ForceStopStreaming="Atura l'enregistrament (descarta el retard)"
+Basic.Main.Group="Grup %1"
+Basic.Main.GroupItems="Agrupa els elements seleccionats"
+Basic.Main.Ungroup="Desagrupa"
 
 Basic.MainMenu.File="&Fitxer"
 Basic.MainMenu.File.Export="&Exporta"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Ajuda"
 Basic.MainMenu.Help.HelpPortal="Portal d'ajuda"
 Basic.MainMenu.Help.Website="Visa el lloc &web"
+Basic.MainMenu.Help.Discord="Uniu-vos a un servidor &Discord"
 Basic.MainMenu.Help.Logs="Fitxers de &registre"
 Basic.MainMenu.Help.Logs.ShowLogs="&Mostra els arxius de registre"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Carregar arxiu de registre actual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carregar darrer fitxer de registre"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Visualitza el registre actual"
 Basic.MainMenu.Help.CheckForUpdates="Comprova si hi ha cap actualització"
+Basic.MainMenu.Help.CrashLogs="Info&rme de fallada"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Mo&stra els informes de fallada"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Penja el darrer informe de fa&llada"
 
 Basic.Settings.ProgramRestart="El programa ha de ser re-iniciat per tal que aquesta configuració tingui efecte."
 Basic.Settings.ConfirmTitle="Confirma els canvis"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Desa els projectors en sortir"
 Basic.Settings.General.SwitchOnDoubleClick="Transició a l'escena en fer doble clic"
 Basic.Settings.General.StudioPortraitLayout="Habilita la disposició horitzontal/vertical"
+Basic.Settings.General.Multiview="Vista múltiple"
+Basic.Settings.General.Multiview.MouseSwitch="Feu clic per canviar entre escenes"
+Basic.Settings.General.Multiview.DrawSourceNames="Mostra el nom de l'escena"
+Basic.Settings.General.Multiview.DrawSafeAreas="Dibuixa les zones segures (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Disposició de vista múltiple"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horitzontal, amunt"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horitzontal, abaix"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, esquerra"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, dreta"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horitzontal, part superior (8 escenes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horitzontal, part inferior (8 escenes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, esquerra (8 escenes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, dreta (8 escenes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horitzontal, part superior (24 escenes)"
 
 Basic.Settings.Stream="Directe"
 Basic.Settings.Stream.StreamType="Tipus de directe"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Ràpida"
 Basic.Settings.Audio.MeterDecayRate.Medium="Mitja (PPM de tipus I)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lenta (PPM de tipus II)"
+Basic.Settings.Audio.PeakMeterType="Tipus de mesurador de pics"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Pic de mostra"
+Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (ús elevat de la CPU)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="ATENCIÓ: El so envoltant està habilitat."
 Basic.Settings.Audio.MultichannelWarning="Si esteu retransmetent, verifiqueu que el servei triat suporta el so envoltant, tant a la reproducció d'entrada com de sortida. El Twitch, 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?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Enllaçar amb"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Activa el nou codi de xarxa"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Mode de baixa latència"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Inhabilita les tecles de drecera quan la finestra principal estigui en primer pla"
 
 Basic.AdvAudio="&Propietats avançades d'àudio"
 Basic.AdvAudio.Name="Nom"
@@ -749,3 +767,12 @@
 FinalScene.Title="Supressió de l'escena"
 FinalScene.Text="Cal que hi hagi almenys una escena."
 
+NoSources.Title="Cap font"
+NoSources.Text="Sembla que encara no heu afegit cap font de vídeo, de manera que només es mostrarà una pantalla en blanc. Esteu segur que voleu fer això?"
+NoSources.Text.AddSource="Podeu afegir fonts fent clic a la icona «+» sota el quadre Fonts de la finestra principal en qualsevol moment."
+
+ChangeBG="Estableix el color"
+CustomColor="Color personalitzat"
+
+BrowserSource.EnableHardwareAcceleration="Habilita l'acceleració per maquinari al navegador"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/cs-CZ.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/cs-CZ.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Náhled"
 StudioMode.Program="Program"
 ShowInMultiview="Zobrazit v Multiview"
+VerticalLayout="Vertikální rozložení"
+Group="Skupina"
 
 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."
@@ -404,7 +406,10 @@
 Basic.Main.StoppingReplayBuffer="Zastavuji záznam do paměti..."
 Basic.Main.StopStreaming="Zastavit vysílání"
 Basic.Main.StoppingStreaming="Zastavuji vysílání..."
-Basic.Main.ForceStopStreaming="Zastavit vysání (bez zpoždění)"
+Basic.Main.ForceStopStreaming="Zastavit vysílání (bez zpoždění)"
+Basic.Main.Group="Skupina %1"
+Basic.Main.GroupItems="Seskupit vybrané"
+Basic.Main.Ungroup="Rozdělit skupinu"
 
 Basic.MainMenu.File="Soubor (&F)"
 Basic.MainMenu.File.Export="&Exportovat"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="Pomoc (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portál pomoci"
 Basic.MainMenu.Help.Website="Navštívit &web"
+Basic.MainMenu.Help.Discord="Připojit se na &Discord server"
 Basic.MainMenu.Help.Logs="Soubory záznamu (&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="Zobrazit soubory záznamu (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Nahrát aktuální soubor záznamu (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Nahrát poslední soubor záznamu (&L)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Zobrazit aktuální záznam (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Zkontrolovat aktualizace"
+Basic.MainMenu.Help.CrashLogs="Hlášení o pádech (&R)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Zobrazit hlášení o pádech (&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Nahrát pos&lední hlášení"
 
 Basic.Settings.ProgramRestart="Pro projevení nastavení je potřeba restartovat aplikaci."
 Basic.Settings.ConfirmTitle="Potvrzení změn"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Ukládat projektory při ukončení"
 Basic.Settings.General.SwitchOnDoubleClick="Přejít na scénu po dvojitém kliknutí"
 Basic.Settings.General.StudioPortraitLayout="Povolit rozložení na výšku (portrét)"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Kliknutí pro přechod mezi scénami"
+Basic.Settings.General.Multiview.DrawSourceNames="Zobrazovat názvy scén"
+Basic.Settings.General.Multiview.DrawSafeAreas="Vyznačovat viditelné oblasti (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Rozložení Multiview"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontálně, nahoře"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontálně, dole"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikálně, vlevo"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikálně, vpravo"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontálně, nahoře (8 scén)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontálně, dole (8 scén)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikálně, vlevo (8 scén)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikálně, vpravo (8 scén)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontálně, nahoře (24 scén)"
 
 Basic.Settings.Stream="Vysílání"
 Basic.Settings.Stream.StreamType="Typ vysílání"
@@ -631,9 +645,13 @@
 Basic.Settings.Audio="Zvuk"
 Basic.Settings.Audio.SampleRate="Vzorkovací frekvence"
 Basic.Settings.Audio.Channels="Kanály"
+Basic.Settings.Audio.MeterDecayRate="Rychlost útlumu snímače zvuku"
 Basic.Settings.Audio.MeterDecayRate.Fast="Rychle"
 Basic.Settings.Audio.MeterDecayRate.Medium="Střední (typ I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Pomalu (typ II PPM)"
+Basic.Settings.Audio.PeakMeterType="Typ měřiče špičky"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Špička vzorky"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Pravá špička (Vyšší využití CPU)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="VAROVÁNÍ: Prostorový zvuk je zapnut."
 Basic.Settings.Audio.MultichannelWarning="Předtím než začnete vysílat si zkontrolujte, zda vaše vysílací služba podporuje příjem a přehrávání prostorového zvuku. Twitch, 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.Title="Povolit prostorový zvuk?"
@@ -674,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Svázat s adresou"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Použít nový síťový kód"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Režim nízké odezvy"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Zakázat klávesové zkratky, když je hlavní okno aktivní"
 
 Basic.AdvAudio="Rozšířené vlastnosti zvuku"
 Basic.AdvAudio.Name="Název"
@@ -748,3 +767,12 @@
 FinalScene.Title="Odstranění scény"
 FinalScene.Text="Musí existovat alespoň jedna scéna, proto tuto není možno odstranit."
 
+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ě."
+
+ChangeBG="Nastavit barvu"
+CustomColor="Vlastní barva"
+
+BrowserSource.EnableHardwareAcceleration="Zapnout hardwarovou akceleraci pro zdroj prohlížeče"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/da-DK.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/da-DK.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Forhåndsvisning"
 StudioMode.Program="Program"
 ShowInMultiview="Vis i Multi View"
+VerticalLayout="Lodret layout"
+Group="Gruppér"
 
 AlreadyRunning.Title="OBS kører allerede"
 AlreadyRunning.Text="OBS kører allerede!  Medmindre dette er tilsigtet, så bedes du lukke enhver eksisterende OBS-proces, inden du forsøger at køre en ny.  Hvis du har OBS indstillet til at minimeres sig til systembakken, så tjek venligst om den stadig kører dér."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Stop streaming"
 Basic.Main.StoppingStreaming="Stopper stream..."
 Basic.Main.ForceStopStreaming="Stop streaming (ignorer forsinkelse)"
+Basic.Main.Group="Gruppe %1"
+Basic.Main.GroupItems="Gruppér valgte elementer"
+Basic.Main.Ungroup="Ikke-grupperet"
 
 Basic.MainMenu.File="&Fil"
 Basic.MainMenu.File.Export="&Eksport"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Hjælp"
 Basic.MainMenu.Help.HelpPortal="Hjælp og &Portal"
 Basic.MainMenu.Help.Website="Besøg &websted"
+Basic.MainMenu.Help.Discord="Join &Discord serveren"
 Basic.MainMenu.Help.Logs="&Logfiler"
 Basic.MainMenu.Help.Logs.ShowLogs="Vis log-filer (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload Aktuelle logfil (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Upload Sidste logfil (&L)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vis aktuel logfil"
 Basic.MainMenu.Help.CheckForUpdates="Tjek for opdateringer"
+Basic.MainMenu.Help.CrashLogs="Nedbrudsrapporter"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Vis nedbrudsrapporter"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Up&load seneste nedbrudsrapport"
 
 Basic.Settings.ProgramRestart="Programmet skal genstartes, før disse indstillinger træder i kraft."
 Basic.Settings.ConfirmTitle="Bekræfte ændringer"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Gem projektorer ved afslutning"
 Basic.Settings.General.SwitchOnDoubleClick="Overgang til scenen ved dobbeltklik"
 Basic.Settings.General.StudioPortraitLayout="Aktivere stående/liggende layout"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Klik for at skifte mellem scener"
+Basic.Settings.General.Multiview.DrawSourceNames="Vis scenenavne"
+Basic.Settings.General.Multiview.DrawSafeAreas="Tegn sikre områder (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Multivisningslayout"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horisontal, Top"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horisontal, Bund"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikal, Venstre"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikal, Højre"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vandret, øverst (8 scener)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vandret, nederst (8 scener)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Lodret, venstre (8 scener)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Lodret, højre (8 scener)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Vandret, øverst (24 scener)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Streamtype"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Hurtig"
 Basic.Settings.Audio.MeterDecayRate.Medium="Medium (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Langsom (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Peak Meter-type"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Intervalspidsvæ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. streamer, om din streaming-tjeneste understøtter både Surround Sound-input og -afspilning. Twitch, 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.Title="Aktivér Surround Sound-lyd?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Bind til IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktivér ny netværkskode"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Lav forsinkelsestilstand"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Deaktivér genvejstaster, når hovedvinduet er i fokus"
 
 Basic.AdvAudio="Avancerede lydegenskaber"
 Basic.AdvAudio.Name="Navn"
@@ -749,3 +767,12 @@
 FinalScene.Title="Slet scene"
 FinalScene.Text="Der kræves mindst én scene."
 
+NoSources.Title="Ingen kilder"
+NoSources.Text="Det ser ud til, at du ikke har tilføjet nogen videokilder endnu, så dit output bliver en blank/tom skærm. Sikker på, at du vil gøre dette?"
+NoSources.Text.AddSource="Du kan til enhver tid tilføje kilder ved at klikke på +-ikonet under feltet Kilder i hovedvinduet."
+
+ChangeBG="Sæt farve"
+CustomColor="Brugerdefineret farve"
+
+BrowserSource.EnableHardwareAcceleration="Aktivér Browser Source-hardwareacceleration"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/de-DE.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/de-DE.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Vorschau"
 StudioMode.Program="Programm"
 ShowInMultiview="In Multiview anzeigen"
+VerticalLayout="Vertikales Layout"
+Group="Gruppe"
 
 AlreadyRunning.Title="OBS wird bereits ausgeführt"
 AlreadyRunning.Text="OBS wird bereits ausgeführt! Bitte beenden Sie alle vorhandenen OBS Instanzen bevor Sie eine neue Instanz starten, es sei denn, Sie tun dies absichtlich. Wenn Sie OBS so eingestellt haben das es sich zum Infobereich minimiert, überprüfen Sie bitte, ob es dort läuft."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Streaming stoppen"
 Basic.Main.StoppingStreaming="Stoppe Stream..."
 Basic.Main.ForceStopStreaming="Streaming stoppen (Verzögerung verwerfen)"
+Basic.Main.Group="Gruppe %1"
+Basic.Main.GroupItems="Ausgewählte Elemente gruppieren"
+Basic.Main.Ungroup="Gruppierung aufheben"
 
 Basic.MainMenu.File="Datei (&F)"
 Basic.MainMenu.File.Export="&Exportieren"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Hilfe"
 Basic.MainMenu.Help.HelpPortal="Hilfe&portal"
 Basic.MainMenu.Help.Website="&Webseite besuchen"
+Basic.MainMenu.Help.Discord="Tritt unserem &Discordserver bei"
 Basic.MainMenu.Help.Logs="&Logdateien"
 Basic.MainMenu.Help.Logs.ShowLogs="Logdateien anzeigen (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload aktuelle Logdatei (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Upload &letzte Logdatei"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Aktuelles Protokoll anzeigen (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Auf Updates prüfen"
+Basic.MainMenu.Help.CrashLogs="Abstu&rzberichte"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Ab&sturzberichte anzeigen"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Upload &letzten Absturzbericht"
 
 Basic.Settings.ProgramRestart="Das Programm muss neu gestartet werden, damit die Änderungen wirksam werden."
 Basic.Settings.ConfirmTitle="Änderungen bestätigen"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Projektoren beim Beenden speichern"
 Basic.Settings.General.SwitchOnDoubleClick="Übergang zur Szene beim Doppelklicken"
 Basic.Settings.General.StudioPortraitLayout="Porträt/vertikales Layout aktivieren"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Klicken, um zwischen den Szenen umzuschalten"
+Basic.Settings.General.Multiview.DrawSourceNames="Szenennamen anzeigen"
+Basic.Settings.General.Multiview.DrawSafeAreas="Zeige sichere Bereiche (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Multiview Layout"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, oben"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, unten"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikal, links"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikal, rechts"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, oben (8 Szenen)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, unten (8 Szenen)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikal, links (8 Szenen)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikal, rechts (8 Szenen)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, oben (24 Szenen)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Stream Typ"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Schnell"
 Basic.Settings.Audio.MeterDecayRate.Medium="Mittel (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Langsam (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Peakmeter Typ"
+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 Streaming, ob Ihr Streaming-Dienst sowohl die Einspeisung von Surround-Sound als auch die Surround-Sound-Wiedergabe unterstützt. Twitch, 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-Plugin-Unterstützung nicht garantiert ist."
 Basic.Settings.Audio.MultichannelWarning.Title="Surround-Sound-Audio aktivieren?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Interface"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Neuen Netzwerkcode aktivieren"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Niedriger Latenzmodus"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Hotkeys deaktivieren, wenn das Hauptfenster im Fokus ist"
 
 Basic.AdvAudio="Erweiterte Audioeigenschaften"
 Basic.AdvAudio.Name="Name"
@@ -749,3 +767,12 @@
 FinalScene.Title="Szene löschen"
 FinalScene.Text="Es muss mindestens eine Szene vorhanden sein."
 
+NoSources.Title="Keine Quellen"
+NoSources.Text="Offenbar haben Sie noch keine Videoquellen hinzugefügt, so dass Sie nur einen leeren Bildschirm ausgeben werden. Sind Sie sicher, dass Sie das wollen?"
+NoSources.Text.AddSource="Sie können zu jeder Zeit Quellen hinzufügen, indem Sie auf das + Symbol unter dem Quellenfeld im Hauptfenster klicken."
+
+ChangeBG="Farbe auswählen"
+CustomColor="Benutzerdefinierte Farbe"
+
+BrowserSource.EnableHardwareAcceleration="Browser Hardwarebeschleunigung aktivieren"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/el-GR.ini Changed

@@ -28,12 +28,16 @@
 Mono="Μονοφωνικό"
 Stereo="Στερεοφωνικό"
 DroppedFrames="Διακεκομμένα καρέ %1 (%2%)"
+StudioProgramProjector="Προβολέας Πλήρους Οθόνης (Πηγή)"
 PreviewProjector="Προβολέας Πλήρους Οθόνης (Προεπισκόπηση)"
 SceneProjector="Προβολέας Πλήρους Οθόνης (Σκηνή)"
 SourceProjector="Προβολέας Πλήρους Οθόνης (Πηγή)"
+StudioProgramWindow="Παραθύρου προβολής (πρόγραμμα)"
 PreviewWindow="Σε παράθυρο στον Προβολέα (Προεπισκόπηση)"
 SceneWindow="Σε παράθυρο στον Προβολέα (Σκηνή)"
 SourceWindow="Σε παράθυρο στον Προβολέα (Πηγή)"
+MultiviewProjector="MultiView (πλήρης οθόνη)"
+MultiviewWindowed="MultiView (παραθύρου)"
 Clear="Καθαρισμός"
 Revert="Επαναφορά"
 Show="Εμφάνιση"
@@ -69,6 +73,11 @@
 Back="Προηγούμενο"
 Defaults="Προεπιλογές"
 HideMixer="Απόκρυψη στον Μίκτη"
+TransitionOverride="Παράκαμψη της μετάβασης"
+None="Καμία"
+StudioMode.Preview="Προεπισκόπηση"
+StudioMode.Program="Πρόγραμμα"
+ShowInMultiview="Εμφάνιση σε Multiview"
 
 AlreadyRunning.Title="Το OBS εκτελείται ήδη"
 AlreadyRunning.Text="Το OBS εκτελείται ήδη! Εκτός αν θέλατε να το κάνετε αυτό, παρακαλούμε τερματίστε τις τρέχουσες διεργασίες OBS πριν προσπαθήσετε να εκκινήσετε μια καινούρια. Εάν έχετε ρυθμίσει το OBS να ελαχιστοποιείται στην γραμμή εργαλείων, παρακαλούμε να ελένξετε αν τρέχει ήδη εκεί."
@@ -221,6 +230,7 @@
 Output.RecordError.Title="Σφάλμα εγγραφής"
 Output.RecordError.Msg="Παρουσιάστηκε ένα αδιευκρίνιστο σφάλμα κατά την εγγραφή."
 Output.ReplayBuffer.NoHotkey.Title="Δεν έχει επιλεχθεί hotkey!"
+Output.ReplayBuffer.NoHotkey.Msg="Καμμία αποθήκευση συντόμευσης για επανάληψη buffer.  Παρακαλώ ορίστε την συντόμευση για  «Αποθήκευση» καί χρήση για την αποθήκευση επανάληψης ηχογραφήσεων."
 
 Output.BadPath.Title="Λάθος Διαδρομή Αρχείου"
 Output.BadPath.Text="Η προκαθορισμένη διαδρομή αρχείου δεν ειναι έγκυρη. Παρακαλώ ελέγξτε τις ρυθμίσεις σας για να επιβεβαιώσετε ότι έχει οριστεί μια έγκυρη διαδρομή αρχείου."
@@ -302,6 +312,8 @@
 
 RenameProfile.Title="Μετονομασία Προφίλ"
 
+Basic.Main.MixerRename.Title="Μετονομασία της πηγής ήχου"
+Basic.Main.MixerRename.Text="Παρακαλώ εισάγετε το όνομα της πηγής ήχου"
 
 
 Basic.Main.PreviewDisabled="Η προεπισκόπηση είναι απενεργοποιημένη"
@@ -457,6 +469,7 @@
 Basic.MainMenu.Tools="&Εργαλεία"
 
 Basic.MainMenu.Help="Βοήθεια(&H)"
+Basic.MainMenu.Help.HelpPortal="Πύλη βοήθειας"
 Basic.MainMenu.Help.Website="Μετάβαση στην &Ιστοσελίδα"
 Basic.MainMenu.Help.Logs="Αρχεία(&) Καταγραφής"
 Basic.MainMenu.Help.Logs.ShowLogs="Εμφάνιση(&S) Αρχείων Καταγραφής"
@@ -476,6 +489,25 @@
 Basic.Settings.General.OpenStatsOnStartup="Άνοιγμα παραθύρου στατιστικών κατά την εκκίνηση"
 Basic.Settings.General.WarnBeforeStartingStream="Εμφάνιση παραθύρου επιβεβαίωσης κατά την εκκίνηση των streams"
 Basic.Settings.General.WarnBeforeStoppingStream="Εμφάνιση παραθύρου επιβεβαίωσης κατά τη διακοπή των streams"
+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="Αυτόματη εκκίνηση replay buffer κατά τη ροή"
+Basic.Settings.General.KeepReplayBufferStreamStops="Διατήρηση επανάληψης buffer όταν σταματά η ροή"
+Basic.Settings.General.SysTray="System Tray"
+Basic.Settings.General.SysTrayWhenStarted="Ελαχιστοποίηση στο System Tray κατά την εκκίνηση"
+Basic.Settings.General.SystemTrayHideMinimize="Συνεχής ελαχιστοποίηση στο System Tray αντί στην γραμμή εργασιών"
+Basic.Settings.General.SaveProjectors="Αποθήκευση προβολής στην έξοδο"
+Basic.Settings.General.SwitchOnDoubleClick="Μετάβαση στην σκηνή με διπλό κλικ"
+Basic.Settings.General.StudioPortraitLayout="Ενεργοποίηση πορτρέτου/κατακόρυφης διάταξης"
+Basic.Settings.General.MultiviewLayout="MultiView διάταξη"
 
 Basic.Settings.Stream="Μετάδοση"
 Basic.Settings.Stream.StreamType="Τύπος Μετάδοσης"
@@ -485,24 +517,37 @@
 Basic.Settings.Output.Encoder="Κωδικοποιητής"
 Basic.Settings.Output.SelectDirectory="Επιλέξτε κατάλογο καταγραφής"
 Basic.Settings.Output.SelectFile="Επιλέξτε αρχείο καταγραφής"
+Basic.Settings.Output.EnforceBitrate="Επιβολή ροής υπηρεσία bitrate ορίων"
 Basic.Settings.Output.Mode="Λειτουργία Εξόδου"
 Basic.Settings.Output.Mode.Simple="Απλό"
 Basic.Settings.Output.Mode.Adv="Σύνθετες επιλογές"
 Basic.Settings.Output.Mode.FFmpeg="Έξοδος FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Ενεργοποίηση επανάληψης Buffer"
 Basic.Settings.Output.ReplayBuffer.SecondsMax="Μέγιστος Χρόνος Επανάληψης (Δευτερόλεπτα)"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Μέγιστη Μνήμη (Megabytes)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Εκτιμώμενη χρήση μνήμης: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Δεν είναι δυνατή η εκτίμηση της χρήσης μνήμης. Ορίστε μέγιστο όριο μνήμης."
+Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Σημείωση: Βεβαιωθείτε ότι ορίσατε μία συντόμευση για το buffer στην ενότητα συντομέυσεων)"
+Basic.Settings.Output.ReplayBuffer.Prefix="Πρόθεμα ονόματος αρχείου Buffer Replay"
 Basic.Settings.Output.ReplayBuffer.Suffix="Επίθεμα"
 Basic.Settings.Output.Simple.SavePath="Διαδρομή Καταγραφής"
 Basic.Settings.Output.Simple.RecordingQuality="Ποιότητα Εγγραφής"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Ίδιο με την ροή"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Υψηλής Ποιότητας, Μεσαίου Μεγέθους Αρχείο"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Δυσδιάκριτης Ποιότητας, Μεγάλου Μεγέθους Αρχείο"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Ποιότητας Χωρίς Απώλειες, Εξαιρετικά Μεγάλου Μεγέθους Αρχείο"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Προειδοποίηση: Το streaming βίντεο bitrate θα οριστεί %1, που είναι το ανώτερο όριο για την τρέχουσα υπηρεσία συνεχούς ροής.  Εάν είστε βέβαιοι ότι θέλετε να πάτε πάνω από %1, Ενεργοποίηση επιλογών προηγμένο κωδικοποιητή και uncheck «Επιβολή streaming υπηρεσία bitrate όρια»."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Προειδοποίηση: Η ροή ήχου bitrate θα οριστεί %1, που είναι το ανώτερο όριο για την τρέχουσα υπηρεσία συνεχούς ροής.  Εάν είστε βέβαιοι ότι θέλετε να πάτε πάνω από %1, Ενεργοποίηση επιλογών προηγμένο κωδικοποιητή και uncheck «Επιβολή streaming υπηρεσία bitrate όρια»."
+Basic.Settings.Output.Simple.Warn.Encoder="Προσοχή: Η εγγραφή με έναν κωδικοποιητή λογισμικού σε διαφορετική ποιότητα από την ροή θα απαιτήσει πρόσθετη χρήση της CPU, αν μπορείτε να πραγματοποιήσετε την ροή και την εγγραφή την ίδια στιγμή."
+Basic.Settings.Output.Simple.Warn.Lossless="Προειδοποίηση: Η μη απωλεστική ποιότητα δημιουργεί τρομερά μεγάλο μέγεθος των αρχείων!  Η ποιότητα χωρίς απώλειες ποιότητας θα καταλάβει 7 gigabyte χώρο στον σκληρό δίσκο ανά λεπτό, σε υψηλές αναλύσεις και framerates.  Χωρίς απώλειες δεν συνιστάται για μεγάλες ηχογραφήσεις, εκτός αν έχετε πολύ χώρο στον σκληρό δίσκο."
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="Είστε σίγουρος ότι θέλετε να το χρησιμοποιήσετε χωρίς απώλειες ποιότητας;"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Χωρίς απώλειες ποιότητας προειδοποίηση!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Προειδοποίηση: Δεν μπορείτε να χρησιμοποιήσετε πολλαπλούς ξεχωριστούς QSV κωδικοποιητές κατά την ροή και την εγγραφή την ίδια στιγμή. Αν θέλετε κάνετε stream και να καταγράψετε ταυτόχρονα, παρακαλείστε να αλλάξετε είτε την εγγραφή η την ροή τού κωδικοποιητή."
 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 χαμηλή χρήση CPU preset, αυξάνει το μέγεθος τού αρχείου)"
 Basic.Settings.Output.VideoBitrate="Ρυθμός Bit του Βίντεο"
 Basic.Settings.Output.AudioBitrate="Ρυθμός Bit του Ήχου"
 Basic.Settings.Output.Reconnect="Αυτόματη Επανασύνδεση"
@@ -522,12 +567,15 @@
 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="Τύπος"
 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"
@@ -553,9 +601,12 @@
 
 FilenameFormatting.completer="%AAXX-%MM-%ΗΗ %ωω-%λλ-%δδ\n%ΧΧ-%ΜΜ-%ΗΗ %ωω-%λλ-%δδ\n%Χ-%μ-%η %Ω-%Λ-%Δ\n%χ-%μ-%η %Ω-%Λ-%Δ\n%α %Χ-%μ-%η %Ω-%Λ-%Δ\n%Α %Χ-%μ-%η %Ω-%Λ-%Δ\n%Χ-%μ-%η %Ω-%Λ-%Δ\n%Χ-%Μ-%η %Ω-%Λ-%Δ\n%Χ-%μ-%η %Ω-%Λ-%Δ-%p\n%Χ-%μ-%μ %Ω-%Λ-%Δ-%ζ\n%Χ-%μ-%η %Ω-%Λ-%Δ-%Ζ"
 
+FilenameFormatting.TT="%CCYY έτους, τέσσερις digits\n%YY έτος, τα δύο τελευταία ψηφία (00-99) \n%MM μήνα ως ένα δεκαδικό αριθμό (01-12) \n%DD ημέρα του μήνα, μηδέν επένδυση (01-31)\n%hh ώρα στο 24h μορφή (00-23) \n%mm λεπτό (00-59) \n%ss δεύτερος (00-61) \n%%		μια%a		sign\n % συντετμημένη καθημερινές name\n%A		πλήρη ημέρα της εβδομάδας name\n%b		συντετμημένη μήνα name\n%B		πλήρη μήνα name\n%d		ημέρα του μήνα, μηδέν-γεμισμένος (01-31) \n%H		ώρα στο 24h μορφή (00-23) \n%I		ώρα σε μορφή 12h (01-12)\n%m μήνας ως δεκαδικός αριθμός (01-12)\n%M λεπτά (00-59) \n%p		π. μ. ή μ. μ. designation\n%S		δεύτερο (00-61) \n%y		έτος, τελευταία δύο ψηφία (00-99)\n%Y Year\n%z		ISO 8601 μετατόπιση από UTC ή timezone\n όνομα ή όνομα ζώνης ώρας%Z		abbreviation\n ή abbreviation\n"
 
 Basic.Settings.Video="Βίντεο"
 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="Καρέ ανά δευτερόλεπτο (FPS):"
@@ -576,23 +627,48 @@
 Basic.Settings.Audio="Ήχος"
 Basic.Settings.Audio.SampleRate="Ρυθμός Δειγματοληψίας"
 Basic.Settings.Audio.Channels="Κανάλια"
+Basic.Settings.Audio.MeterDecayRate="Συντελεστής απόσβεσης ήχου μέτρησης"
+Basic.Settings.Audio.MeterDecayRate.Fast="Γρήγορος"
+Basic.Settings.Audio.MeterDecayRate.Medium="Μεσαίος (τύπος Ι PPM)"
+Basic.Settings.Audio.MeterDecayRate.Slow="Αργός (Τύπος ΙΙ PPM)"
+Basic.Settings.Audio.MultiChannelWarning.Enabled="Προειδοποίηση: Ο ήχος Surround είναι ενεργοποιημένος."
+Basic.Settings.Audio.MultichannelWarning="Κατά το  streaming, ελέγξτε αν η υπηρεσία  streaming υποστηρίζει ήχο surround δύο ηχείων και ήχο surround αναπαραγωγής. Το Twitch, το Facebook 360 Live, το μίξερ 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.DesktopDevice="Συσκευή Ήχου Επιφάνειας"
 Basic.Settings.Audio.DesktopDevice2="Συσκευή Ήχου Επιφάνειας 2"
 Basic.Settings.Audio.AuxDevice="Μικρόφωνο/Αuxillary Συσκευή Ήχου"
 Basic.Settings.Audio.AuxDevice2="Μικρόφωνο/Αuxillary Συσκευή Ήχου 2"
 Basic.Settings.Audio.AuxDevice3="Μικρόφωνο/Αuxillary Συσκευή Ήχου 3"
+Basic.Settings.Audio.EnablePushToMute="Ενεργοποίηση της ώθησης-γιά-σίγαση"
+Basic.Settings.Audio.PushToMuteDelay="Καθυστέρηση ώθησης-γιά-σίγαση"
+Basic.Settings.Audio.EnablePushToTalk="Ενεργοποίηση Push-to-talk"
+Basic.Settings.Audio.PushToTalkDelay="Push-to-talk καθυστέρηση"
+Basic.Settings.Audio.UnknownAudioDevice="[Η συσκευή δεν είναι συνδεδεμένη η δεν είναι διαθέσιμη]"
 
 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 προορίζονται κυρίως για καταγραφή, και δεν συνιστώνται κατά τη μετάδοση. Ενδέχεται να υπάρξει αυξημένη χρήση της CPU λόγω μετατροπής μορφής χρώματος."
 Basic.Settings.Advanced.Audio.BufferingTime="Χρόνος buffering ήχου"
 Basic.Settings.Advanced.Video.ColorFormat="Μορφή Χρώματος"
+Basic.Settings.Advanced.Video.ColorSpace="Χώρος χρωμάτων YUV"
+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="Απενεργοποίηση σίγασης ήχου"
+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="Λειτουργία χαμηλής καθυστέρησης"
 
@@ -602,9 +678,14 @@
 Basic.AdvAudio.Mono="Αποκωδικοποίηση σε Mono"
 Basic.AdvAudio.Panning="Πανοραμικό"
 Basic.AdvAudio.SyncOffset="Μετατόπιση Συγχρονισμού (ms)"
+Basic.AdvAudio.Monitoring="Ηχητική παρακολούθηση"
+Basic.AdvAudio.Monitoring.None="Monitor Off"
+Basic.AdvAudio.Monitoring.MonitorOnly="Μόνο η οθόνη (σίγαση εξόδου)"
+Basic.AdvAudio.Monitoring.Both="Παρακολούθηση και έξοδος"
 Basic.AdvAudio.AudioTracks="Κομμάτια"
 
 Basic.Settings.Hotkeys="Πλήκτρα συντόμευσης"
+Basic.Settings.Hotkeys.Pair="Συνδυασμοί πλήκτρων που μοιράζεται με το «%1» που ενεργούν ως εναλλαγή"
 
 Basic.Hotkeys.SelectScene="Μετάβαση σε σκηνή"
 
@@ -644,12 +725,26 @@
 Hotkeys.AppleKeypadMultiply="* (Keypad)"
 Hotkeys.AppleKeypadDivide="/ (Keypad)"
 Hotkeys.AppleKeypadAdd="+ (Keypad)"
+Hotkeys.AppleKeypadSubtract="- (Αριθμητικό πληκτρολόγιο)"
+Hotkeys.AppleKeypadDecimal=". (Πληκτρολόγιο)"
+Hotkeys.AppleKeypadEqual="= (Αριθμητικό πληκτρολόγιο)"
+Hotkeys.MouseButton="%1 ποντίκι"
 
 Mute="Σίγαση"
 Unmute="Κατάργηση σίγασης"
+Push-to-mute="Ώθηση-για-σίγαση"
+Push-to-talk="Πίεση και ομιλία"
 
 SceneItemShow="Εμφάνιση '%1'"
 SceneItemHide="Απόκρυψη '%1'"
 
+OutputWarnings.NoTracksSelected="Πρέπει να επιλέξετε τουλάχιστον ένα κομμάτι"
+OutputWarnings.MultiTrackRecording="Προειδοποίηση: Ορισμένες μορφές (όπως FLV) δεν υποστηρίζουν πολλαπλά κομμάτια ανά εγγραφή"
+OutputWarnings.MP4Recording="Προειδοποίηση: Οι ηχογραφήσεις που έχουν αποθηκευτεί σε MP4 θα είναι αδιόρθωτες, αν το αρχείο δεν είναι δυνατόν να ολοκληρωθεί (π.χ. λόγω BSODs, απώλεια ισχύος, κλπ.). Αν θέλετε να καταγράψετε πολλαπλά κομμάτια ήχου χρησιμοποιήστε το MKV και remux καταγραφής για mp4, αφού τελειώσει (αρχείο-> Remux ηχογραφήσεις)"
+
+FinalScene.Title="Διαγραφή σκηνής"
+FinalScene.Text="Πρέπει να υπάρχει τουλάχιστον μία σκηνή."
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/en-US.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/en-US.ini Changed

@@ -83,6 +83,8 @@
 StudioMode.Preview="Preview"
 StudioMode.Program="Program"
 ShowInMultiview="Show in Multiview"
+VerticalLayout="Vertical Layout"
+Group="Group"
 
 # warning if program already open
 AlreadyRunning.Title="OBS is already running"
@@ -457,6 +459,9 @@
 Basic.Main.StopStreaming="Stop Streaming"
 Basic.Main.StoppingStreaming="Stopping Stream..."
 Basic.Main.ForceStopStreaming="Stop Streaming (discard delay)"
+Basic.Main.Group="Group %1"
+Basic.Main.GroupItems="Group Selected Items"
+Basic.Main.Ungroup="Ungroup"
 
 # basic mode file menu
 Basic.MainMenu.File="&File"
@@ -529,6 +534,7 @@
 Basic.MainMenu.Help="&Help"
 Basic.MainMenu.Help.HelpPortal="Help &Portal"
 Basic.MainMenu.Help.Website="Visit &Website"
+Basic.MainMenu.Help.Discord="Join &Discord Server"
 Basic.MainMenu.Help.Logs="&Log Files"
 Basic.MainMenu.Help.Logs.ShowLogs="&Show Log Files"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload &Current Log File"
@@ -570,11 +576,16 @@
 Basic.Settings.General.SaveProjectors="Save projectors on exit"
 Basic.Settings.General.SwitchOnDoubleClick="Transition to scene when double-clicked"
 Basic.Settings.General.StudioPortraitLayout="Enable portrait/vertical layout"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Click to switch between scenes"
+Basic.Settings.General.Multiview.DrawSourceNames="Show scene names"
+Basic.Settings.General.Multiview.DrawSafeAreas="Draw safe areas (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Multiview Layout"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, Top"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, Bottom"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, Left"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, Right"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, Top (8 Scenes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, Bottom (8 Scenes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, Left (8 Scenes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, Right (8 Scenes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, Top (24 Scenes)"
 
 # basic mode 'stream' settings
 Basic.Settings.Stream="Stream"
@@ -611,7 +622,6 @@
 Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes!  Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates.  Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"
-Basic.Settings.Output.Simple.Warn.MultipleQSV="Warning: You cannot use multiple separate QSV encoders when streaming and recording at the same time.  If you want to stream and record at the same time, please change either the recording encoder or the stream encoder."
 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)"
@@ -707,6 +717,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Fast"
 Basic.Settings.Audio.MeterDecayRate.Medium="Medium (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Slow (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Peak Meter Type"
+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.  Twitch, 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.Title="Enable surround sound audio?"
@@ -748,6 +761,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Bind to IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Enable new networking code"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Low latency mode"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Disable hotkeys when main window is in focus"
 
 # advanced audio properties
 Basic.AdvAudio="Advanced Audio Properties"
@@ -831,3 +845,15 @@
 # deleting final scene
 FinalScene.Title="Delete Scene"
 FinalScene.Text="There needs to be at least one scene."
+
+# no sources
+NoSources.Title="No Sources"
+NoSources.Text="It looks like you haven't added any video sources yet, so you will only be outputting a blank screen. Are you sure you want to do this?"
+NoSources.Text.AddSource="You can add sources by clicking the + icon under the Sources box in the main window at any time."
+
+# Scene item color selection
+ChangeBG="Set Color"
+CustomColor="Custom Color"
+
+# Global settings for the browser source
+BrowserSource.EnableHardwareAcceleration="Enable Browser Source Hardware Acceleration"

obs-studio-21.1.2.tar.xz/UI/data/locale/es-ES.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/es-ES.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Vista previa"
 StudioMode.Program="Programa"
 ShowInMultiview="Mostrar en vista múltiple"
+VerticalLayout="Interfaz Vertical"
+Group="Grupo"
 
 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 minimize a la barra de tareas, prueba a ver si sigue ejecutándose ahí."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Detener Transmisión"
 Basic.Main.StoppingStreaming="Deteniendo la trasmisión..."
 Basic.Main.ForceStopStreaming="Parar Transmisión (descartar retardo)"
+Basic.Main.Group="Grupo %1"
+Basic.Main.GroupItems="Agrupar los elementos seleccionados"
+Basic.Main.Ungroup="Desagrupar"
 
 Basic.MainMenu.File="&Archivo"
 Basic.MainMenu.File.Export="&Exportar"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Ayuda"
 Basic.MainMenu.Help.HelpPortal="Ayuda (&P)"
 Basic.MainMenu.Help.Website="Visitar Sitio &Web"
+Basic.MainMenu.Help.Discord="Unirse a un servidor &Discord"
 Basic.MainMenu.Help.Logs="&Archivos de registro"
 Basic.MainMenu.Help.Logs.ShowLogs="Mostrar archivo&s de registro"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Carga &de archivo de registro actual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carga del &último archivo de registro"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ver registro actual"
 Basic.MainMenu.Help.CheckForUpdates="Comprobar Actualizaciones"
+Basic.MainMenu.Help.CrashLogs="Informes de &error"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Mostrar informes de error"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Subir el &último informe de error"
 
 Basic.Settings.ProgramRestart="El programa debe reiniciarse para que esta configuración surta efecto."
 Basic.Settings.ConfirmTitle="Confirmar cambios"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Guardar los proyectores al salir"
 Basic.Settings.General.SwitchOnDoubleClick="Transición a la escena cuando se hace doble clic"
 Basic.Settings.General.StudioPortraitLayout="Habilitar la disposición horizontal/vertical"
+Basic.Settings.General.Multiview="Vista Múltiple"
+Basic.Settings.General.Multiview.MouseSwitch="Click para cambiar entre escenas"
+Basic.Settings.General.Multiview.DrawSourceNames="Mostrar nombres de las escenas"
+Basic.Settings.General.Multiview.DrawSafeAreas="Dibujar áreas seguras (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Prueba de multivisión"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, parte superior"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, parte inferior"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, izquierda"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, derecha"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, superior (8 Escenas)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, inferior (8 Escenas)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, izquierda (8 Escenas)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, derecha (8 Escenas)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, superior (24 Escenas)"
 
 Basic.Settings.Stream="Emision"
 Basic.Settings.Stream.StreamType="Tipo de Emision"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Rápida"
 Basic.Settings.Audio.MeterDecayRate.Medium="Media (PPM de tipo I)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lenta (PPM de tipo II)"
+Basic.Settings.Audio.PeakMeterType="Tipo de medidor de pico"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Pico de muestra"
+Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (mayor uso de CPU)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="ADVERTENCIA: el audio de sonido envolvente está habilitado."
 Basic.Settings.Audio.MultichannelWarning="Si se está transmitiendo, compruebe si su servicio de transmisión admite la ingesta de sonido envolvente y la reproducción de sonido envolvente. Twitch, 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.Title="¿Habilitar el audio de sonido envolvente?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Enlazar con IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Habilitar el nuevo código de red"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Modo de baja latencia"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Deshabilitar teclas de acceso rápido cuando la ventana principal se encuentre activa"
 
 Basic.AdvAudio="Propiedades de Audio avanzadas"
 Basic.AdvAudio.Name="Nombre"
@@ -749,3 +767,12 @@
 FinalScene.Title="Eliminar escena"
 FinalScene.Text="Debe haber al menos una escena."
 
+NoSources.Title="Sin recursos"
+NoSources.Text="Parece que no has añadido ningún recurso de vídeo aún, así que estarás emitiendo una pantalla en blanco. ¿Estás seguro de que quieres hacer esto?"
+NoSources.Text.AddSource="Puedes añadir recursos haciendo click en el icono de \"+\" debajo del menú Recursos en la ventana principal en cualquier momento."
+
+ChangeBG="Establecer color"
+CustomColor="Color personalizado"
+
+BrowserSource.EnableHardwareAcceleration="Habilitar Aceleración de Hardware de Recurso en el Navegador"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/et-EE.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/et-EE.ini Changed

@@ -31,6 +31,7 @@
 PreviewProjector="Projektor täisekraanil (eelvaade)"
 SceneProjector="Projektor täisekraanil (stseen)"
 SourceProjector="Projektor täisekraanil (allikas)"
+MultiviewProjector="Mitmikvaade (täisekraanil)"
 Clear="Eemalda"
 Revert="Tühista"
 Show="Näita"
@@ -59,20 +60,30 @@
 Copy="Kopeeri"
 Paste="Kleebi"
 PasteReference="Kleebi (Viide)"
+PasteDuplicate="Kleebi (Koopia)"
 Next="Edasi"
 Back="Tagasi"
+StudioMode.Preview="Eelvaade"
 
 AlreadyRunning.Title="OBS juba töötab"
 
 
+BandwidthTest.Region.US="Ameerika Ühendriigid"
+BandwidthTest.Region.EU="Euroopa"
+BandwidthTest.Region.Asia="Aasia"
+BandwidthTest.Region.Other="Muu"
 
 
+Basic.AutoConfig.ApplySettings="Rakenda muutused"
 Basic.AutoConfig.StreamPage.Service="Teenus"
 Basic.AutoConfig.StreamPage.Server="Server"
+Basic.AutoConfig.StreamPage.StreamKey="Voogedastuse võti"
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"
 
+Basic.Stats="Statistika"
 Basic.Stats.CPUUsage="CPU kasutus"
 Basic.Stats.Status.Inactive="Inaktiivne"
+Basic.Stats.Bitrate="Bitikiirus"
 
 Updater.Title="Uus värskendus saadaval"
 Updater.Text="Uus värskendus on saadaval:"
@@ -465,3 +476,6 @@
 
 
 
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/eu-ES.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/eu-ES.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Aurreikusi"
 StudioMode.Program="Programa"
 ShowInMultiview="Erakutsi ikuspegi anitzean"
+VerticalLayout="Diseinu bertikala"
+Group="Taldea"
 
 AlreadyRunning.Title="OBS dagoeneko martxan dago"
 AlreadyRunning.Text="OBS dagoeneko martxan dago! Bestelakorik nahi ez baduzu Itxi irekita dagoen saioa beste saio bat ireki baino lehen. Ezarri baduzu OBS agertzea minimizatua sistemaren erretiluan begiratu eta oraindik exekutatzen ari den bertan."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Gelditu transmisioa"
 Basic.Main.StoppingStreaming="Transmisioa gelditzen..."
 Basic.Main.ForceStopStreaming="Gelditu transmisioa (baztertu atzerapena)"
+Basic.Main.Group="%1 taldea"
+Basic.Main.GroupItems="Batu hautatutako elementuak"
+Basic.Main.Ungroup="Banatu"
 
 Basic.MainMenu.File="&Fitxategia"
 Basic.MainMenu.File.Export="&Esportatu"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Laguntza"
 Basic.MainMenu.Help.HelpPortal="Laguntza ataria"
 Basic.MainMenu.Help.Website="Ikusi &webgunea"
+Basic.MainMenu.Help.Discord="Bat egin Discord zerbitzariarekin"
 Basic.MainMenu.Help.Logs="&Egunkari-fitxategiak"
 Basic.MainMenu.Help.Logs.ShowLogs="&Erakutsi egunkari-fitxategiak"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Kargatu &uneko egunkari-fitxategiak"
 Basic.MainMenu.Help.Logs.UploadLastLog="Kargatu &azken egunkari-fitxategia"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ikusi uneko egunkari-fitxategia"
 Basic.MainMenu.Help.CheckForUpdates="Begiratu eguneraketak"
+Basic.MainMenu.Help.CrashLogs="Matxuren jakinarazpenak"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Erakutsi matxuren jakinarazpenak"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Kargatu azken matxura jakinarazpena"
 
 Basic.Settings.ProgramRestart="Programa berrabiarazi egin behar da ezarpen hauek eragina izateko."
 Basic.Settings.ConfirmTitle="Baieztatu aldaketak"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Gorde proiekzioak irtetean"
 Basic.Settings.General.SwitchOnDoubleClick="Aldatu eszena klik bikoitza egitean"
 Basic.Settings.General.StudioPortraitLayout="Gaitu diseinu horizontala/bertikala"
+Basic.Settings.General.Multiview="Ikuspegi anitza"
+Basic.Settings.General.Multiview.MouseSwitch="Klikatu eszena batetik bestera pasatzeko"
+Basic.Settings.General.Multiview.DrawSourceNames="Erakutsi eszenen izenak"
+Basic.Settings.General.Multiview.DrawSafeAreas="Markatu area seguruak (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Ikuspegi anitzeko diseinua"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontala, goian"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontala, behean"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Bertikala, ezkerrean"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Bertikala, eskuinean"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontala, goian (8 eszena)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontala, behean (8 eszena)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Bertikala, ezkerrean (8 eszena)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Bertikala, eskuinean (8 eszena)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontala, goian (24 eszena)"
 
 Basic.Settings.Stream="Transmisioa"
 Basic.Settings.Stream.StreamType="Transmisio-mota"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Azkarra"
 Basic.Settings.Audio.MeterDecayRate.Medium="Tartekoa (I motako PPMa)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Geldoa (II motako PPMa)"
+Basic.Settings.Audio.PeakMeterType="Gailurren neurgailu mota"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Lagin-gailurra"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Benetako gailurra (CPUaren erabilera handiagoa)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="Kontu: soinu inguratzailea aktibatuta dago."
 Basic.Settings.Audio.MultichannelWarning="Transmititzen ari bazara, begiratu ea zure transmisio zerbitzuak onartzen duen soinu inguratzailea  sarrerako soinuan zein irteerakoan.  Twitch, 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?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="IP bidez lotu"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Gaitu sare kode berria"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Latentzia txikiko modua"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Desgaitu laster-teklak leiho nagusia fokuan dagoenean"
 
 Basic.AdvAudio="Audio propietate aurreratuak"
 Basic.AdvAudio.Name="Izena"
@@ -749,3 +767,12 @@
 FinalScene.Title="Ezabatu eszena"
 FinalScene.Text="Gutxienez eszena bat egon behar du."
 
+NoSources.Title="Iturbururik ez dago"
+NoSources.Text="Badirudi ez duzula gehitu bideo iturbururik oraindik, beraz emaitza pantaila huts bat izango da. Ziur zaude hau egin nahi duzula?"
+NoSources.Text.AddSource="Gehitzen ahal duzu iturburuak Iturburuak kutxako azpiko aldeko + ikonoa klikatuz edozein unetan."
+
+ChangeBG="Ezarri kolorea"
+CustomColor="Kolore pertsonalizatua"
+
+BrowserSource.EnableHardwareAcceleration="Gaitu nabigatzailearen iturburuko hardware azelerazioa"
+

obs-studio-22.0.1.tar.xz/UI/data/locale/fa-IR.ini Added

@@ -0,0 +1,148 @@
+
+
+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="غیرفعال کردن OSX V-Sync"
+ResetOSXVSyncOnExit="تنظیم مجدد OSX V-Sync هنگام خروج"
+HighResourceUsage="کد گذاری بیش از حد ! توجه کنید که تنظیمات ویدئویی را تغییر بدهید یا از یک پریست کد گذاری سریع تر استفاده کنید ."
+
+
+
+
+
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="استفاده از فعلی (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="صفحه نمایش %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="استفاده از فعلی (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="یا ۶۰ یا ۳۰ ، اما ۶۰ را ترجیح می دهم"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="یا ۶۰ یا ۳۰ ، اما وضوح بالا را ترجیح می دهم"
+Basic.AutoConfig.VideoPage.CanvasExplanation="نکته : اندازه محیط (پایه) لزوما همان اندازه ای نیست که با آن پخش زنده یا ضبط می کنید . اندازه واقعی پخش زنده/ضبط شما ممکن است  برای کاهش استفاده از منابع و یا میزان درخواست بیت بر ثانیه (بیت ریت) کمتر باشد ."
+Basic.AutoConfig.StreamPage="اطلاعات پخش زنده"
+Basic.AutoConfig.StreamPage.SubTitle="لطفا اطلاعات پخش زنده خود را وارد کنید"
+Basic.AutoConfig.StreamPage.Service="سرویس"
+Basic.AutoConfig.StreamPage.Service.ShowAll="نمایش همه..."
+Basic.AutoConfig.StreamPage.Server="سرور"
+Basic.AutoConfig.StreamPage.StreamKey="کلید پخش زنده"
+Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(لینک)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="برآورد میزان بیت بر ثانیه (بیت ریت) با تست پهنای باند (ممکن است چند دقیقه طول بکشد)"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="کد گذاری سخت افزاری را ترجیح می دهم"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/fi-FI.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/fi-FI.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Esikatselu"
 StudioMode.Program="Ohjelma"
 ShowInMultiview="Näytä moninäkymässä"
+VerticalLayout="Pystynäkymä"
+Group="Ryhmitä"
 
 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ä."
@@ -405,6 +407,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.Group="Ryhmitä %1"
+Basic.Main.GroupItems="Ryhmitä valitut lähteet"
+Basic.Main.Ungroup="Poista ryhmästä"
 
 Basic.MainMenu.File="&Tiedosto"
 Basic.MainMenu.File.Export="&Vie"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Apua"
 Basic.MainMenu.Help.HelpPortal="&Apukeskus"
 Basic.MainMenu.Help.Website="Käy &verkkosivulla"
+Basic.MainMenu.Help.Discord="Liity &Discord-palvelimelle"
 Basic.MainMenu.Help.Logs="&Lokitiedostot"
 Basic.MainMenu.Help.Logs.ShowLogs="&Näytä lokitiedostot"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Lähetä n&ykyinen lokitiedosto"
 Basic.MainMenu.Help.Logs.UploadLastLog="Lähetä edellinen lokitiedosto"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Näytä ny&kyinen loki"
 Basic.MainMenu.Help.CheckForUpdates="Tarkista päivitykset"
+Basic.MainMenu.Help.CrashLogs="&Kaatumisraportit"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Näytä kaatumisraportit"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Lähetä kaatumisraportti"
 
 Basic.Settings.ProgramRestart="Ohjelma on käynnistettävä uudelleen, jotta asetukset tulevat voimaan."
 Basic.Settings.ConfirmTitle="Vahvista muutokset"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Tallenna peilaus poistuessa"
 Basic.Settings.General.SwitchOnDoubleClick="Siirtymä skeneen tuplaklikattaessa"
 Basic.Settings.General.StudioPortraitLayout="Ota pystyasettelu käyttöön"
+Basic.Settings.General.Multiview="Moninäkymä"
+Basic.Settings.General.Multiview.MouseSwitch="Klikkaa vaihtaaksesi skenejen välillä"
+Basic.Settings.General.Multiview.DrawSourceNames="Näytä skenejen nimet"
+Basic.Settings.General.Multiview.DrawSafeAreas="Piirrä turva-alueet (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Moninäkymän asettelu"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vaaka, ylhäällä"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vaaka, alhaalla"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Pysty, vasemmalla"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Pysty, oikealla"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vaakasuunta, ylhäällä (8 skeneä)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vaakasuunta, alhaalla (8 skeneä)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Pystysuunta, vasemmalla (8 skeneä)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Pystysuunta, oikealla (8 skeneä)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Vaakasuunta, ylhäällä (24 skeneä)"
 
 Basic.Settings.Stream="Lähetys"
 Basic.Settings.Stream.StreamType="Lähetystyyppi"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Nopea"
 Basic.Settings.Audio.MeterDecayRate.Medium="Keskinopea (Tyyppi I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Hidas (Tyyppi II PPM)"
+Basic.Settings.Audio.PeakMeterType="Huippuarvo-mittarin tyyppi"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Huippuarvon näyte"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Todellinen huippuarvo (Korkeampi CPU:n käyttö)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="VAROITUS: Monikanavaääni on käytössä."
 Basic.Settings.Audio.MultichannelWarning="Varmista lähettäessä että palvelu tukee sekä monikanavaäänen lähettämistä, että toistamista.  Twitch, 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.Title="Käytä monikanava-ääntä?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Liitä IP:seen"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Käytä uutta verkkokoodia"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Alhaisen latenssin tila"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Poista pikanäppäimet käytöstä, kun pääikkuna on aktiivisena"
 
 Basic.AdvAudio="Äänen lisäominaisuudet"
 Basic.AdvAudio.Name="Nimi"
@@ -749,3 +767,12 @@
 FinalScene.Title="Poista skene"
 FinalScene.Text="Ainakin yksi skene pitää olla olemassa."
 
+NoSources.Title="Ei lähteitä"
+NoSources.Text="Näyttää siltä ettet ole vielä lisännyt yhtään kuvalähdettä, joten kuva on musta. Haluatko varmasti tehdä näin?"
+NoSources.Text.AddSource="Voit lisätä lähteitä klikkaamalla \"+\"-kuvaketta \"Lähteet\"-alueen alapuolella."
+
+ChangeBG="Aseta väri"
+CustomColor="Mukautettu väri"
+
+BrowserSource.EnableHardwareAcceleration="Käytä laitteistokiihdytystä \"Selain\"-lähteessä"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/fil-PH.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/fil-PH.ini Changed

@@ -76,6 +76,8 @@
 StudioMode.Preview="Balikan"
 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."
@@ -402,6 +404,9 @@
 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.Group="Grupo %1"
+Basic.Main.GroupItems="I-grupo ang napiling mga aytem"
+Basic.Main.Ungroup="Alisin sa Grupo"
 
 Basic.MainMenu.File="&Talaksan"
 Basic.MainMenu.File.Export="&I-export"
@@ -468,6 +473,7 @@
 Basic.MainMenu.Help="&Tulong"
 Basic.MainMenu.Help.HelpPortal="Tulong &lagusan"
 Basic.MainMenu.Help.Website="Pagbisita &website"
+Basic.MainMenu.Help.Discord="Sumali sa &Discord Server"
 Basic.MainMenu.Help.Logs="Mag-&log ng mga File"
 Basic.MainMenu.Help.Logs.ShowLogs="&ipakita ang Pag-log ng mga File"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Mag-upload &Kasalukuyang Mag-log ng File"
@@ -505,10 +511,6 @@
 Basic.Settings.General.SwitchOnDoubleClick="Paglipat sa eksena kahit makadalawang-pindot"
 Basic.Settings.General.StudioPortraitLayout="Paganahin ang larawan/vertical layout"
 Basic.Settings.General.MultiviewLayout="Multiview Layout"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Pahalang, Itaas"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Pahalang, Pababa"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, Sa kaliwa"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, sa kanan"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Mga uri ng Stream"
@@ -746,3 +748,6 @@
 FinalScene.Title="Tanggaling ang Eksena"
 FinalScene.Text="Doon kailangan ng kahit isang eksena."
 
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/fr-FR.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/fr-FR.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Aperçu"
 StudioMode.Program="Programme"
 ShowInMultiview="Montrer en Multivues"
+VerticalLayout="Disposition Verticale"
+Group="Groupe"
 
 AlreadyRunning.Title="OBS est déjà en cours d'exécution"
 AlreadyRunning.Text="OBS est déjà en cours d'exécution, merci de bien fermer toute autre instances existantes d'OBS avant d'en exécuter une nouvelle. Vérifiez dans votre barre d'état s'il n'est pas réduit et en cours d’exécution."
@@ -92,7 +94,7 @@
 BandwidthTest.Region.Asia="Asie"
 BandwidthTest.Region.Other="Autre"
 
-Basic.FirstStartup.RunWizard="Exécutez l'Assistant de configuration  ? Vous pouvez configurer manuellement vos paramètre en cliquant sur le bouton des Paramètres situer dans la fenêtre principale."
+Basic.FirstStartup.RunWizard="Exécuter l'Assistant de configuration ? Vous pouvez configurer manuellement vos paramètres en cliquant sur le bouton des Paramètres situé dans la fenêtre principale."
 Basic.FirstStartup.RunWizard.BetaWarning="(Remarque : l’Assistant de configuration automatique est actuellement en version bêta)"
 Basic.FirstStartup.RunWizard.NoClicked="Si vous changez d’avis, vous pouvez réexécuter l’Assistant de configuration automatique n’importe quel moment dans le menu outils."
 
@@ -405,6 +407,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.Group="Groupe %1"
+Basic.Main.GroupItems="Grouper les éléments sélectionnés"
+Basic.Main.Ungroup="Dissocier"
 
 Basic.MainMenu.File="&Fichier"
 Basic.MainMenu.File.Export="&Exporter"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Aide"
 Basic.MainMenu.Help.HelpPortal="&Portail d'aide"
 Basic.MainMenu.Help.Website="Consulter le site &Web"
+Basic.MainMenu.Help.Discord="Rejoindre le serveur &Discord"
 Basic.MainMenu.Help.Logs="&Fichiers journaux"
 Basic.MainMenu.Help.Logs.ShowLogs="Afficher les &fichiers de log"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Mettre en ligne le fichier journal &actuel"
 Basic.MainMenu.Help.Logs.UploadLastLog="Mettre en ligne le &dernier fichier journal"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Voir le journal actuel"
 Basic.MainMenu.Help.CheckForUpdates="Rechercher des mises à jour"
+Basic.MainMenu.Help.CrashLogs="Rapports d'e&rreurs"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Montrer les rapport&s d'erreur"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Envoyer &le Dernier Rapport d'Erreur"
 
 Basic.Settings.ProgramRestart="Le programme doit être redémarré pour que les paramètres prennent effet."
 Basic.Settings.ConfirmTitle="Valider les modifications"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Enregistrer les projecteurs en quittant"
 Basic.Settings.General.SwitchOnDoubleClick="Effectuer la transition vers la scène en cas de double clic"
 Basic.Settings.General.StudioPortraitLayout="Activer la mise en page portrait/verticale"
+Basic.Settings.General.Multiview="Multivues"
+Basic.Settings.General.Multiview.MouseSwitch="Cliquez pour changer de scène"
+Basic.Settings.General.Multiview.DrawSourceNames="Montrer les noms des scènes"
+Basic.Settings.General.Multiview.DrawSafeAreas="Afficher les zones sûres (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Disposition de la multivue"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, haut"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, bas"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, gauche"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, droit"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, Haut (8 Scènes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, Bas (8 Scènes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, Gauche (8 Scènes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, Droite (8 Scènes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, Haut (24 Scènes)"
 
 Basic.Settings.Stream="Flux"
 Basic.Settings.Stream.StreamType="Type de diffusion"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Rapide"
 Basic.Settings.Audio.MeterDecayRate.Medium="Moyenne (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lente (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Type de crête-mètre"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Pic d'échantillon"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Crête vraie (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. Twitch, 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 du plugin VST n'est pas garanti."
 Basic.Settings.Audio.MultichannelWarning.Title="Activer le son multicanal ?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Lier à :"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Activer le nouveau code réseau"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Mode faible latence"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Désactiver les raccourcis clavier lorsque la fenêtre principale est au premier plan"
 
 Basic.AdvAudio="Propriétés audio avancées"
 Basic.AdvAudio.Name="Nom"
@@ -749,3 +767,12 @@
 FinalScene.Title="Supprimer la scène"
 FinalScene.Text="Il doit y avoir au moins une scène."
 
+NoSources.Title="Aucune source"
+NoSources.Text="Il semble que vous n'ayez pas ajouté de source vidéo pour le moment, vous aurez donc un écran noir. Êtes-vous sûr de vouloir continuer ?"
+NoSources.Text.AddSource="Vous pouvez à tout moment ajouter des sources en cliquant sur l'icone + sous le bloc Sources de la fenêtre principale."
+
+ChangeBG="Définir la couleur"
+CustomColor="Couleur personnalisée"
+
+BrowserSource.EnableHardwareAcceleration="Activer l’accélération matériel de la source navigateur"
+

obs-studio-22.0.1.tar.xz/UI/data/locale/gd-GB.ini Added

@@ -0,0 +1,770 @@
+
+Language="Gàidhlig"
+Region="Alba"
+
+OK="Ceart ma-thà"
+Apply="Cuir an sàs"
+Cancel="Sguir dheth"
+Close="Dùin"
+Save="Sàbhail"
+Discard="Tilg air falbh"
+Disable="Cuir à comas"
+Yes="Tha"
+No="Chan eil"
+Add="Cuir ris"
+Remove="Thoir air falbh"
+Rename="Thoir ainm ùr air"
+Interact="Eadar-ghnìomhach"
+Filters="Criathragan"
+Properties="Roghainnean"
+MoveUp="Gluais suas"
+MoveDown="Gluais sìos"
+Settings="Roghainnean"
+Display="Uidheam-taisbeanaidh"
+Name="Ainm"
+Exit="Fàg an-seo"
+Mixer="Measgadair"
+Browse="Rùraich"
+Mono="Mono"
+Stereo="Stereo"
+DroppedFrames="Frèamaichean a thuit: %1 (%2%)"
+StudioProgramProjector="Proiseactar làn-sgrìn (prògram)"
+PreviewProjector="Proiseactar làn-sgrìn (ro-shealladh)"
+SceneProjector="Proiseactar làn-sgrìn (sealladh)"
+SourceProjector="Proiseactar làn-sgrìn (tùs)"
+StudioProgramWindow="Proiseactar uinneagaichte (prògram)"
+PreviewWindow="Proiseactar uinneagaichte (ro-shealladh)"
+SceneWindow="Proiseactar uinneagaichte (sealladh)"
+SourceWindow="Proiseactar uinneagaichte (tùs)"
+MultiviewProjector="Ioma-shealladh (làn-sgrìn)"
+MultiviewWindowed="Ioma-shealladh (uinneagaichte)"
+Clear="Falamhaich"
+Revert="Till"
+Show="Seall"
+Hide="Falaich"
+UnhideAll="Seall na h-uile"
+Untitled="Gun tiotal"
+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"
+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"
+Left="Clì"
+Right="Deas"
+Top="Barr"
+Bottom="Bonn"
+Reset="Ath-shuidhich"
+Hours="Uair"
+Minutes="Mionaid"
+Seconds="Diog"
+Deprecated="Cha mholar seo tuilleadh"
+Import="Ion-phortaich"
+Export="Às-phortaich"
+Copy="Dèan lethbhreac"
+Paste="Cuir ann"
+PasteReference="Cuir ann (iomradh)"
+PasteDuplicate="Cuir ann (dùblachadh)"
+RemuxRecordings="Iompaich clàraidhean"
+Next="Air adhart"
+Back="Air ais"
+Defaults="Bun-roghainnean"
+HideMixer="Falaich sa mheasgadair"
+TransitionOverride="Tar-àithneadh an tar-mhùthaidh"
+None="Chan eil gin"
+StudioMode.Preview="Ro-shealladh"
+StudioMode.Program="Prògram"
+ShowInMultiview="Seall san ioma-shealladh"
+VerticalLayout="Co-dhealbhachd inghearach"
+Group="Buidhnich"
+
+AlreadyRunning.Title="Tha OBS ’ga ruith mar-thà"
+AlreadyRunning.Text="Tha OBS ’ga ruith mar-thà! Mur ann gun robh thu airson seo a dhèanamh, dùin sìos gach ionstans de dh’OBS mus fheuch thu ri ionstans eile dheth a ruith. Ma shuidhich thu OBS ach an dèid fhìor-lùghdachadh gu treidhe an t-siostaim thoir sùil a bheil e ’ga ruith an-siud fhathast."
+AlreadyRunning.LaunchAnyway="Cuir gu dol e co-dhiù"
+
+Copy.Filters="Dèan lethbhreac dhe na criathragan"
+Paste.Filters="Cuir ann criathragan"
+
+BandwidthTest.Region="Roinn-dùthcha"
+BandwidthTest.Region.US="Na Stàitean Aonaichte"
+BandwidthTest.Region.EU="An Roinn-Eòrpa"
+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.BetaWarning="(An aire: Tha draoidh an fhèin-rèiteachaidh ’na thionndadh beta fhathast)"
+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.Beta="Draoidh an fhèin-rèiteachaidh (beta)"
+Basic.AutoConfig.ApplySettings="Cuir na roghainnean an sàs"
+Basic.AutoConfig.StartPage="Fiosrachadh a’ chleachdaidh"
+Basic.AutoConfig.StartPage.SubTitle="Sònraich na h-adhbharan air an cleachd thu am prògram"
+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)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="An dà chuid 60 no 30 ach b’ fhearr leam 60"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="An dà chuid 60 no 30 ach b’ fhearr leam dùmhlachd-bhreacaidh àrd"
+Basic.AutoConfig.VideoPage.CanvasExplanation="An aire: Cha bhi dùmhlachd-bhreacaidh bhunasach (a’ chanabhais) co-ionnan ris an dùmhlachd-bhreacaidh a thèid a chlàradh no a shruthadh an-còmhnaidh. Dh’fhaoidte gun dèid an dùbhlachd-bhreacaidh air sruthadh no clàradh ìsleachadh o dhùmhlachd-bhreacaidh a’ chanabhais airson freagairt ri feumalachdan cleachdaidh no reat bhiotaichean."
+Basic.AutoConfig.StreamPage="Fiosrachadh an t-sruthaidh"
+Basic.AutoConfig.StreamPage.SubTitle="Cuid a-steach fiosrachadh an t-sruthaidh agad"
+Basic.AutoConfig.StreamPage.Service="Seirbheis"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Seall na h-uile…"
+Basic.AutoConfig.StreamPage.Server="Frithealaiche"
+Basic.AutoConfig.StreamPage.StreamKey="Iuchair an t-sruthaidh"
+Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Ceangal)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Dèan tuairmse air reat bhiotaichean le deuchainn air an leud-bhanna (dh’fhaoidte gun doir seo mionaid no dhà)"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="B’ fhearr leam còdachadh bathair-chruthaidh"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Le còdachadh bathair-chruaidh, cha dèid ach glè bheag dhen CPU a chleachdadh ach dh’fhaoidte gum bi feum air reat bhiotaichean nas àirde airson ann aon ìre a chàileachd fhaighinn."
+Basic.AutoConfig.StreamPage.StreamWarning.Title="Rabhadh sruthaidh"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Tha an deuchainn air an leud-bhanna gu bhith dàta video tuaireamach gun fhuaim a shruthadh dhan t-seanail agad. Ma ghabhas seo a dhèanamh, mholamaid gun cuir thu dheth sàbhaladh sruthaidh video agus gun dèan thu an sruth agad prìobhaideach gus am bi an deuchainn deiseil. A bheil thu airson leantainn air adhart?"
+Basic.AutoConfig.TestPage="Na toraidhean deireannach"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Tha am prògram a’ ruith deuchainnean airson tuairmse a dhèanamh air na roghainnean as fhearr"
+Basic.AutoConfig.TestPage.SubTitle.Complete="Tha an deuchainn deiseil"
+Basic.AutoConfig.TestPage.TestingBandwidth="A’ cur an leud-bhanna fo dheuchainn, dh’fhaoidte gun doir seo mionaid no dhà…"
+Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="A’ ceangal ri: %1…"
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Cha deach leinn ceangal a dhèanamh ri frithealaiche sam bith, thoir sùil air a’ cheangal agad dhan eadar-lìon is feuch ris a-rithist an uairsin."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="A’ cur an leud-bhanna fo dheuchainn airson: %1"
+Basic.AutoConfig.TestPage.TestingStreamEncoder="A’ cur inneal-còdachaidh an t-sruthaidh fo dheuchainn, dh’fhaoidte gun doir seo mionaid no dhà…"
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="A’ cur inneal-còdachaidh a’ chlàraidh fo dheuchainn, dh’fhaoidte gun doir seo mionaid no dhà…"
+Basic.AutoConfig.TestPage.TestingRes="A’ cur nan dùmhlachdan-breacaidh fo dheuchainn, dh’fhaoidte gun doir seo mionaid no dhà…"
+Basic.AutoConfig.TestPage.TestingRes.Fail="Cha deach leinn an t-inneal-còdachaidh a chur gu dol"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="A’ feuchainn %1x%2 %3 FPS…"
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Inneal-còdachaidh an t-sruthaidh"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="Inneal-còdachaidh a’ chlàraidh"
+Basic.AutoConfig.TestPage.Result.Header="Rinn am prògram tuairmse gur e seo na roghainnean as fhearr dhut:"
+Basic.AutoConfig.TestPage.Result.Footer="Airson na roghainnean seo a chleachdadh, briog air “Cuir na roghainnean an sàs”. Airson an draoidh a rèiteachadh às ùr is fheuchainn is a-rithist, briog air “Air ais”. Airson na roghainnean a rèiteachadh a làimh, briog air “Sguir dheth” is fosgail na “Roghainnean”."
+
+Basic.Stats="Stadastaireachd"
+Basic.Stats.CPUUsage="Cleachdadh a’ CPU"
+Basic.Stats.HDDSpaceAvailable="Àite ri fhaighinn air a’ chlàr-chruaidh"
+Basic.Stats.MemoryUsage="Cleachdadh a’ chuimhne"
+Basic.Stats.AverageTimeToRender="Ùine cuibheasach air reandaradh frèama"
+Basic.Stats.SkippedFrames="Na frèamaichean air an leigeil seachad ri linn dàil còdachaidh"
+Basic.Stats.MissedFrames="Na frèamaichean a chaidh a dhìth ri linn dàil còdachaidh"
+Basic.Stats.Output.Stream="Sruthadh"
+Basic.Stats.Output.Recording="Clàradh"
+Basic.Stats.Status="Staid"
+Basic.Stats.Status.Recording="Clàradh"
+Basic.Stats.Status.Live="BEÒ"
+Basic.Stats.Status.Reconnecting="’Ga ath-cheangal"
+Basic.Stats.Status.Inactive="Neo-ghnìomhach"
+Basic.Stats.DroppedFrames="Frèamaichean a thuit: (lìonra)"
+Basic.Stats.MegabytesSent="Às-chur dàta iomlan"
+Basic.Stats.Bitrate="Reat bhiotaichean"
+
+Updater.Title="Tha ùrachadh ri fhaighinn"
+Updater.Text="Tha ùrachadh ri fhaighinn:"
+Updater.UpdateNow="Ùraich an-dràsta"
+Updater.RemindMeLater="Cuir nam chuimhne uaireigin eile"
+Updater.Skip="Leig seachad an tionndadh"
+Updater.Running.Title="Tha am prògram gnìomhach"
+Updater.Running.Text="Tha às-chur gnìomhach ann, cuir stad air gach às-chur mus fheuch thu ris an ùrachadh"
+Updater.NoUpdatesAvailable.Title="Chan eil ùrachadh ri fhaighinn"
+Updater.NoUpdatesAvailable.Text="Chan eil ùrachadh ri fhaighinn an-dràsta"
+Updater.FailedToLaunch="Cha deach leinn an t-inneal-ùrachaidh a chur gu dol"
+Updater.GameCaptureActive.Title="Tha glacadh geama gnìomhach"
+Updater.GameCaptureActive.Text="Tha leabharlann glacaidh geama ’ga chleachdadh. Dùin gad geama no prògram a tha ’ga ghlacadh (no ath-thòisich Windows) is feuch ris a-rithist."
+
+QuickTransitions.SwapScenes="Dèan iomlaid air seallaidhean an ro-sheallaidh ’s an às-chuir às dèid an tar-mhùthaidh"
+QuickTransitions.SwapScenesTT="Nì seo iomlaid air seallaidhean an ro-sheallaidh ’s an às-chuir às dèidh an tar-mhùthaidh (ma tha sealladh tùsail an às-chuir ann fhathast).\nCha neo-dhèan seo atharrachadh sam bith a chaidh a dhèanamh air sealladh tùsail an às-chuir."
+QuickTransitions.DuplicateScene="Dùblaich an t-sealladh"
+QuickTransitions.DuplicateSceneTT="Nuair a nì thu deasachadh air an aon shealladh, leigidh seo leat cruth-atharrachadh no faicsinneachd nan tùsan a dheasachadh gun atharrachadh air an às-chur.\nAirson roghainnean nan tùsan atharrachadh gun a bhith ag atharrachadh an às-chuir, cuir an comas “Dùblaich na tùsan”.\nNuair a dh’atharraicheas tu an luach seo, thèid sealladh an às-chuir làithrich atharrachadh (ma tha e ann fhathast)."
+QuickTransitions.EditProperties="Dùblaich na tùsan"
+QuickTransitions.EditPropertiesTT="Nuair a nì thu deasachadh air an aon shealladh, leigidh seo leat roghainnean nan tùsan atharrachadh gun atharrachadh air an às-chur.\nCha ghabh seo a chleachdadh ach ma tha “Dùblaich an t-sealladh” an comas.\nTha tùsan ann (can tùsan glacaidh no meadhain) nach cuir taic ri seo agus cha ghabh an deasachadh fa leth.\nNuair a dh’atharraicheas tu an luach seo, thèid sealladh an às-chuir làithrich ath-shuidheachadh (ma tha e ann fhathast).\n\nRabhadh: On a thèid na tùsan a dhùblachadh, bi feum air barrachd ghoireasan siostaim no video."
+QuickTransitions.HotkeyName="Tar-mhùthadh luath: %1"
+
+Basic.AddTransition="Cuir ris tar-mhùthadh a ghabhas rèiteachadh"
+Basic.RemoveTransition="Thoir air falbh tar-mhùthadh a ghabhas rèiteachadh"
+Basic.TransitionProperties="Roghainnean an tar-mhùthaidh"
+Basic.SceneTransitions="Tar-mhùthaidhean an t-seallaidh"
+Basic.TransitionDuration="Faide"
+Basic.TogglePreviewProgramMode="Modh stiùideo"
+
+TransitionNameDlg.Text="Cuir a-steach ainm an tar-mhùthaidh"
+TransitionNameDlg.Title="Ainm an tar-mhùthaidh"
+
+TitleBar.Profile="Pròifil"
+TitleBar.Scenes="Seallaidhean"
+
+NameExists.Title="Tha an t-ainm ann mu thràth"
+NameExists.Text="Tha an t-ainm seo ’ga chleachdadh mu thràth."
+
+NoNameEntered.Title="Cuir a-steach ainm dligheach"
+NoNameEntered.Text="Chan urrainn dhut ainm falamh a chleachdadh."
+
+ConfirmStart.Title="A bheil thu airson tòiseachadh air sruthadh?"
+ConfirmStart.Text="A bheil thu cinnteach gu bheil thu airson tòiseachadh air an t-sruthadh?"
+
+ConfirmStop.Title="A bheil thu airson stad a chur air an t-sruthadh?"
+ConfirmStop.Text="A bheil thu cinnteach gu bheil thu airson stad a chur air an t-sruthadh?"
+
+ConfirmExit.Title="A bheil thu airson OBS fhàgail?"
+ConfirmExit.Text="Tha OBS gnìomhach an-dràsta. Thèid gach sruthadh no clàradh a chur gu crìch. A bheil thu cinnteach gu bheil thu airson fhàgail?"
+
+ConfirmRemove.Title="Dearbh an toirt air falbh"
+ConfirmRemove.Text="A bheil thu cinnteach gu bheil thu airson “$1” a thoirt air falbh?"
+ConfirmRemove.TextMultiple="A bheil thu cinnteach gu bheil thu airson %1 nithean a thoirt air falbh?"
+
+Output.StartStreamFailed="Cha deach leinn tòiseachadh air an t-sruthadh"
+Output.StartRecordingFailed="Cha deach leinn tòiseachadh air a’ chlàradh"
+Output.StartReplayFailed="Cha deach leinn tòiseachadh air bufair na h-ath-chluiche"
+Output.StartFailedGeneric="Cha deach leinn tòiseachadh air an às-chur. Thoir sùil air an loga airson barrachd fiosrachaidh.\n\nAn aire: Ma tha thu a’ cleachdadh inneal-còdachaidh NVENC no AMD, dèan cinneach gu bheil na draibhearan video agad cho ùr ’s a ghabhas."
+
+Output.ConnectFail.Title="Cha deach leinn ceangal a dhèanamh"
+Output.ConnectFail.BadPath="Tha slighe no URL a’ cheangail mì-dhligheach. Thoir sùil air na roghainnean agad feuch a bheil iad mar bu chòir."
+Output.ConnectFail.ConnectFailed="Dh’fhàillig an ceangal ris an fhrithealaiche"
+Output.ConnectFail.InvalidStream="Bha b’ urrainn dhuinn an t-seanail no an iuchair sruthaidh a shònraich thu inntrigeadh, dearbhaidh an iuchair sruthaidh agad. Ma tha i ceart, dh’fhaoidte gu bheil duilgheadas ann le ceangal ris an fhrithealaiche."
+Output.ConnectFail.Error="Thachair mearachd ris nach robh dùil nuair a dh’fheuch sinn ri ceangal ris an fhrithealaiche. Tha barrachd fiosrachaidh ann am faidhle an loga."
+Output.ConnectFail.Disconnected="Chaidh an ceangal dhan fhrithealaiche a bhriseadh."
+
+Output.RecordFail.Title="Cha deach leinn tòiseachadh air a’ chlàradh"
+Output.RecordFail.Unsupported="Cha chuirear taic ri fòrmat an às-chuir no cha chuir e taic ri corr is aon traca fuaime. Thoir sùil air na roghainnean agad is feuch ris a-rithist."
+Output.RecordNoSpace.Title="Chan eil àite gu leòr air an diosga"
+Output.RecordNoSpace.Msg="Chan eil àite gu leòr air an diosga airson leantainn air adhart leis a’ chlàradh."
+Output.RecordError.Title="Mearachd clàraidh"
+Output.RecordError.Msg="Thachair mearachd nach deach a shònrachadh 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."
+
+LogReturnDialog="Chaidh an loga a luchdadh suas"
+LogReturnDialog.CopyURL="Dèan lethbhreac dhen URL"
+LogReturnDialog.ErrorUploadingLog="Mearachd le luchdadh suas an loga"
+
+LicenseAgreement="Aonta ceadachais"
+LicenseAgreement.PleaseReview="Thoir sùil air teirmichean a’ cheadachais mus cleachd thu OBS. Le cleachdadh a’ phrògraim seo, aidichidh tu gun do leugh thu is gun aontaich thu ri teirmichean ceadachas <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a>. Sgrolaich sìos airson an corr dhen aonta fhaicinn."
+LicenseAgreement.ClickIAgreeToContinue="Ma ghabhas tu ri teirmichean an aonta, briog air “Gabhaidh mi ris” airson leantainn air adhart. Feumaidh tu gabhail ris an aonta airson OBS a chleachdadh."
+LicenseAgreement.IAgree="Gabhaidh mi ris"
+LicenseAgreement.Exit="Fàg an-seo"
+
+Remux.SourceFile="Clàradh OBS"
+Remux.TargetFile="Faidhle amais"
+Remux.Remux="Iompaich"
+Remux.OBSRecording="Clàradh OBS"
+Remux.FinishedTitle="Tha an t-iompachadh deiseil"
+Remux.Finished="Chaidh an clàradh iompachadh"
+Remux.FinishedError="Chaidh an clàradh iompachadh ach ’s ma dh’fhaoidte nach eil am faidhle coileanta"
+Remux.SelectRecording="Tagh clàradh OBS…"
+Remux.SelectTarget="Tagh faidhle amais…"
+Remux.FileExistsTitle="Tha am faidhle amais ann"
+Remux.FileExists="Tha am faidhle amais ann mu thràth, a bheil thu airson seo a chur ’na àite?"
+Remux.ExitUnfinishedTitle="’Ga iompachadh"
+Remux.ExitUnfinished="Chan eil an t-iompachadh deiseil agus dh’fhaoidte nach gabh am faidhle amais a cleachdadh ma chuireas tu stad air an-dràsta.\nA bheil thu cinnteach gu bheil thu airson stad a chur air an iompachadh?"
+
+UpdateAvailable="Tha ùrachadh ri fhaighinn"
+UpdateAvailable.Text="Tha tionndadh %1.%2.%3 ri fhaighinn a-nis. <a href='%4'>Briog an-seo gus a luchdadh a-nuas</a>"
+
+Basic.DesktopDevice1="Fuaim an deasg"
+Basic.DesktopDevice2="Fuaim an deasg 2"
+Basic.AuxDevice1="Micreofon/Taic"
+Basic.AuxDevice2="Micreofon/Taic 2"
+Basic.AuxDevice3="Micreofon/Taic 3"
+Basic.AuxDevice4="Micreofon/Taic 4"
+
+Basic.Scene="Sealladh"
+Basic.DisplayCapture="Glacadh an uidheim-taisbeanaidh"
+
+Basic.Main.PreviewConextMenu.Enable="Cuir an ro-shealladh an comas"
+
+ScaleFiltering="Criathradh sgèilidh"
+ScaleFiltering.Point="Puing"
+ScaleFiltering.Bilinear="Dà-loidhneach"
+ScaleFiltering.Bicubic="Dà-chiùbach"
+ScaleFiltering.Lanczos="Lanczos"
+
+Deinterlacing="Dì-fhilleadh"
+Deinterlacing.Discard="Tilg air falbh"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Co-mheasgachadh"
+Deinterlacing.Blend2x="Co-mheasgachadh 2x"
+Deinterlacing.Linear="Loidhneach"
+Deinterlacing.Linear2x="Loidhneach 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="An raon air a’ bharr an toiseach"
+Deinterlacing.BottomFieldFirst="An raon aig a’ bhonn an toiseach"
+
+VolControl.SliderUnmuted="Sleamhnachan àirde airson “%1”: %2"
+VolControl.SliderMuted="Sleamhnachan àirde airson “%1”: %2 (mùchte an-dràsta)"
+VolControl.Mute="Mùch “%1”"
+VolControl.Properties="Roghainnean airson “%1”"
+
+Basic.Main.AddSceneDlg.Title="Cuir sealladh ris"
+Basic.Main.AddSceneDlg.Text="Cuir a-steach ainm an t-seallaidh"
+
+Basic.Main.DefaultSceneName.Text="Sealladh %1"
+
+Basic.Main.AddSceneCollection.Title="Cuir cruinneachadh sheallaidhean ris"
+Basic.Main.AddSceneCollection.Text="Cuir a-steach ainm a’ chruinneachaidh sheallaidhean"
+
+Basic.Main.RenameSceneCollection.Title="Thoir ainm ùr air a’ chruinneachadh sheallaidhean"
+
+AddProfile.Title="Cuir pròifil ris"
+AddProfile.Text="Cuir a-steach ainm na pròifil"
+
+RenameProfile.Title="Thoir ainm ùr air a’ phròifil"
+
+Basic.Main.MixerRename.Title="Thoir ainm ùr air an tùs fuaime"
+Basic.Main.MixerRename.Text="Cuir a-steach ainm an tùis fuaime"
+
+
+Basic.Main.PreviewDisabled="Tha an ro-shealladh às comas an-dràsta"
+
+Basic.SourceSelect="Cruthaich/Tagh tùs"
+Basic.SourceSelect.CreateNew="Cruthaich tùs ùr"
+Basic.SourceSelect.AddExisting="Cuir ris tùs a tha ann"
+Basic.SourceSelect.AddVisible="Seall an tùs"
+
+Basic.PropertiesWindow="Roghainnean airson “%1”"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (taghadh fèin-obrachail: %2)"
+Basic.PropertiesWindow.SelectColor="Tagh dath"
+Basic.PropertiesWindow.SelectFont="Tagh cruth-clò"
+Basic.PropertiesWindow.ConfirmTitle="Chaidh na roghainnean atharrachadh"
+Basic.PropertiesWindow.Confirm="Tha atharraichean gun sàbhaladh ann. A bheil thu airson an cumail?"
+Basic.PropertiesWindow.NoProperties="Chan eil roghainn ann"
+Basic.PropertiesWindow.AddFiles="Cuir faidhlichean ris"
+Basic.PropertiesWindow.AddDir="Cuir pasgan ris"
+Basic.PropertiesWindow.AddURL="Cuir slighe/URL ris"
+Basic.PropertiesWindow.AddEditableListDir="Cuir pasgan ri “%1”"
+Basic.PropertiesWindow.AddEditableListFiles="Cuir faidhlichean ri “%1”"
+Basic.PropertiesWindow.AddEditableListEntry="Cuir innteart ri “%1”"
+Basic.PropertiesWindow.EditEditableListEntry="Deasaich innteart o “%1”"
+
+Basic.PropertiesView.FPS.Simple="Luachan FPS simplidh"
+Basic.PropertiesView.FPS.Rational="Luachan FPS reusanta"
+Basic.PropertiesView.FPS.ValidFPSRanges="Rainsean FPS dligheach:"
+
+Basic.InteractionWindow="Conaltradh le “%1”"
+
+Basic.StatusBar.Reconnecting="Gun cheangal, ’ga ath-cheangal an ceann %2 diog(an) (oidhirp %1)"
+Basic.StatusBar.AttemptingReconnect="A’ feuchainn ri ath-cheangal… (oidhirp %1)"
+Basic.StatusBar.ReconnectSuccessful="Chaidh ath-cheangal"
+Basic.StatusBar.Delay="Dàil (%1d)"
+Basic.StatusBar.DelayStartingIn="Dàil (a’ tòiseachadh an ceann %1d)"
+Basic.StatusBar.DelayStoppingIn="Dàil (a’ stad an ceann %1d)"
+Basic.StatusBar.DelayStartingStoppingIn="Dàil (a’ stad an ceann %1d, a’ tòiseachadh an ceann %1d)"
+
+Basic.Filters="Criathragan"
+Basic.Filters.AsyncFilters="Criathragan fuaime/video"
+Basic.Filters.AudioFilters="Criathragan fuaime"
+Basic.Filters.EffectFilters="Criathragan èifeachd"
+Basic.Filters.Title="Crathragan airson “%1”"
+Basic.Filters.AddFilter.Title="Ainm na criathraige"
+Basic.Filters.AddFilter.Text="Cuir a-steach ainm na criathraige"
+
+Basic.TransformWindow="Tar-mhùthadh air nì an t-seallaidh"
+Basic.TransformWindow.Position="Ionad"
+Basic.TransformWindow.Rotation="Cuairteachadh"
+Basic.TransformWindow.Size="Meud"
+Basic.TransformWindow.Alignment="Co-thaobhadh ionaid"
+Basic.TransformWindow.BoundsType="Seòrsa a’ bhogsa-iadhaidh"
+Basic.TransformWindow.BoundsAlignment="Co-thaobhadh sa bhogsa-iadhaidh"
+Basic.TransformWindow.Bounds="Meud a’ bhogsa-iadhaidh"
+Basic.TransformWindow.Crop="Bearr"
+
+Basic.TransformWindow.Alignment.TopLeft="Taobh clì aig a’ bharr"
+Basic.TransformWindow.Alignment.TopCenter="Sa mheadhan aig a’ bharr"
+Basic.TransformWindow.Alignment.TopRight="Taobh deas aig a’ bharr"
+Basic.TransformWindow.Alignment.CenterLeft="Sa mheadhan air an taobh chlì"
+Basic.TransformWindow.Alignment.Center="Sa mheadhan"
+Basic.TransformWindow.Alignment.CenterRight="Sa mheadhan air an taobh deas"
+Basic.TransformWindow.Alignment.BottomLeft="Taobh clì aig a’ bhonn"
+Basic.TransformWindow.Alignment.BottomCenter="Sa mheadhan aig a’ bhonn"
+Basic.TransformWindow.Alignment.BottomRight="Taobh deas aig a’ bhonn"
+
+Basic.TransformWindow.BoundsType.None="Gun iadhadh"
+Basic.TransformWindow.BoundsType.MaxOnly="Am meud as motha a-mhàin"
+Basic.TransformWindow.BoundsType.ScaleInner="Sgèilich ri iadhadh a-staigh"
+Basic.TransformWindow.BoundsType.ScaleOuter="Sgèilich ri iadhadh a-muigh"
+Basic.TransformWindow.BoundsType.ScaleToWidth="Sgèilich ri leud an iadhaidh"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Sgèilich ri àirde an iadhaidh"
+Basic.TransformWindow.BoundsType.Stretch="Sìn gun iadhadh"
+
+Basic.Main.AddSourceHelp.Title="Chan urrainn dhuinn an tùs a chur ris"
+Basic.Main.AddSourceHelp.Text="Feumaidh do shealladh a bhith agad mus cuir thu tùs ris."
+
+Basic.Main.Scenes="Seallaidhean"
+Basic.Main.Sources="Tùsan"
+Basic.Main.Controls="Uidheaman-smachd"
+Basic.Main.Connecting="’Ga cheangal…"
+Basic.Main.StartRecording="Tòisich air clàradh"
+Basic.Main.StartReplayBuffer="Tòisich air bufair ath-chluiche"
+Basic.Main.StartStreaming="Tòisich air sruthadh"
+Basic.Main.StopRecording="Cuir stad air a’ chlàradh"
+Basic.Main.StoppingRecording="A’ cur stad air a’ chlàradh…"
+Basic.Main.StopReplayBuffer="Cuir stad air bufair na h-ath-chluiche"
+Basic.Main.StoppingReplayBuffer="A’ cur stad air bufair na h-ath-chluiche…"
+Basic.Main.StopStreaming="Cuir stad air an t-sruthadh"
+Basic.Main.StoppingStreaming="A’ cur stad air an t-sruthadh…"
+Basic.Main.ForceStopStreaming="Cuir stad air an t-sruthadh (leig seachad an dàil)"
+Basic.Main.Group="Buidheann %1"
+Basic.Main.GroupItems="Buidhnich na thagh thu"
+Basic.Main.Ungroup="Sgaoil am buidheann"
+
+Basic.MainMenu.File="&Faidhle"
+Basic.MainMenu.File.Export="Às-phor&taich"
+Basic.MainMenu.File.Import="&Ion-phortaich"
+Basic.MainMenu.File.ShowRecordings="Seall na &clàraidhean"
+Basic.MainMenu.File.Remux="Io&mpaich na clàraidhean"
+Basic.MainMenu.File.Settings="&Roghainnean"
+Basic.MainMenu.File.ShowSettingsFolder="Seall pasgan nan roghainnean"
+Basic.MainMenu.File.ShowProfileFolder="Seall pasgan na pròifil"
+Basic.MainMenu.AlwaysOnTop="&Air uachdar an-còmhnaidh"
+Basic.MainMenu.File.Exit="&Fàg an-seo"
+
+Basic.MainMenu.Edit="D&easaich"
+Basic.MainMenu.Edit.Undo="&Neo-dhèan"
+Basic.MainMenu.Edit.Redo="Ath-&dhèan"
+Basic.MainMenu.Edit.UndoAction="&Neo-dhèan $1"
+Basic.MainMenu.Edit.RedoAction="Ath-&dhèan $1"
+Basic.MainMenu.Edit.LockPreview="G&lais an ro-shealladh"
+Basic.MainMenu.Edit.Scale="&Sgèileadh an ro-sheallaidh"
+Basic.MainMenu.Edit.Scale.Window="Sgèilich ris an uinneag"
+Basic.MainMenu.Edit.Scale.Canvas="Canabhas (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="Às-chur (%1x%2)"
+Basic.MainMenu.Edit.Transform="&Tar-mhùth"
+Basic.MainMenu.Edit.Transform.EditTransform="D&easaich an tar-mhùthadh…"
+Basic.MainMenu.Edit.Transform.CopyTransform="Dèan lethbhreac dhen tar-mhùthadh"
+Basic.MainMenu.Edit.Transform.PasteTransform="Cuir ann tar-mhùthadh"
+Basic.MainMenu.Edit.Transform.ResetTransform="Ath-&shuidhich an tar-mhùthadh"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Cuairtich gu deiseil le 90 ceum"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Cuairtich gu tuathail le 90 ceum"
+Basic.MainMenu.Edit.Transform.Rotate180="Cuairtich le 180 ceum"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="T&hoir flip air a’ chòmhnard"
+Basic.MainMenu.Edit.Transform.FlipVertical="&Thoir flip gu h-inghearach"
+Basic.MainMenu.Edit.Transform.FitToScreen="Co-&fhreagair ri meud na sgrìn"
+Basic.MainMenu.Edit.Transform.StretchToScreen="&Sìn gu meud na sgrìn"
+Basic.MainMenu.Edit.Transform.CenterToScreen="Cuir air &meadhan na sgrìn"
+Basic.MainMenu.Edit.Order="Òrdu&gh"
+Basic.MainMenu.Edit.Order.MoveUp="Gluais s&uas"
+Basic.MainMenu.Edit.Order.MoveDown="Gluais &sìos"
+Basic.MainMenu.Edit.Order.MoveToTop="Gluais gun bh&arr"
+Basic.MainMenu.Edit.Order.MoveToBottom="Gluais gun &bhonn"
+Basic.MainMenu.Edit.AdvAudio="Roghainnean &adhartach na fuaime"
+
+Basic.MainMenu.View="&Seall"
+Basic.MainMenu.View.Toolbars="&Bàraichean-inneal"
+Basic.MainMenu.View.Docks="Docaichean"
+Basic.MainMenu.View.Docks.ResetUI="Ath-shuidhich an eadar-aghaidh"
+Basic.MainMenu.View.Docks.LockUI="Glais an eadar-aghaidh"
+Basic.MainMenu.View.Toolbars.Listboxes="Bogsaichean-&liosta"
+Basic.MainMenu.View.SceneTransitions="Tar-&mhùthaidhean an t-seallaidh"
+Basic.MainMenu.View.StatusBar="Bàr-s&taide"
+Basic.MainMenu.View.Fullscreen.Interface="Eadar-aghaidh làn-sgrìn"
+
+Basic.MainMenu.SceneCollection="Cruinneachadh &sheallaidhean"
+Basic.MainMenu.Profile="&Pròifil"
+Basic.MainMenu.Profile.Import="Ion-phortaich pròifil"
+Basic.MainMenu.Profile.Export="Às-phortaich a’ phròifil"
+Basic.MainMenu.SceneCollection.Import="Ion-phortaich cruinneachadh sheallaidhean"
+Basic.MainMenu.SceneCollection.Export="Às-phortaich cruinneachadh sheallaidhean"
+Basic.MainMenu.Profile.Exists="Tha a’ phròifil ann mu thràth"
+Basic.MainMenu.SceneCollection.Exists="Tha an cruinneachadh sheallaidhean ann mu thràth"
+
+Basic.MainMenu.Tools="Innea&lan"
+
+Basic.MainMenu.Help="Cob&hair"
+Basic.MainMenu.Help.HelpPortal="&Portal na cobharach"
+Basic.MainMenu.Help.Website="&Tadhail air an làrach-lìn"
+Basic.MainMenu.Help.Logs="Faidhlichean an &loga"
+Basic.MainMenu.Help.Logs.ShowLogs="&Seall faidhlichean an loga"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Luchdai&ch suas faidhle an loga làithrich"
+Basic.MainMenu.Help.Logs.UploadLastLog="&Luchdaich suas faidhle an loga mu dheireadh"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Seall an loga làithreach"
+Basic.MainMenu.Help.CheckForUpdates="Thoir sùil airson ùrachaidhean"
+Basic.MainMenu.Help.CrashLogs="Aithis&gean tuislidh"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Seall na h-aithisgean tuislidh"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Luchdaich suas an aithisg tuislidh mu dheireadh"
+
+Basic.Settings.ProgramRestart="Feumaidh tu am prògram ath-thòiseachadh gus na roghainnean seo a chur an sàs."
+Basic.Settings.ConfirmTitle="Dearbh na h-atharraichean"
+Basic.Settings.Confirm="Tha atharraichean gun sàbhaladh agad. A bheil thu airson an sàbhaladh?"
+
+Basic.Settings.General="Coitcheann"
+Basic.Settings.General.Theme="Ùrlar"
+Basic.Settings.General.Language="Cànan"
+Basic.Settings.General.EnableAutoUpdates="Thoir sùil airson ùrachaidhean gu fèin-obrachail aig an toiseach"
+Basic.Settings.General.OpenStatsOnStartup="Fosglaidh seo còmhradh na stadastaireachd aig an toiseach"
+Basic.Settings.General.WarnBeforeStartingStream="Seall còmhradh dearbhaidh mus dèid sruthadh a thòiseachadh"
+Basic.Settings.General.WarnBeforeStoppingStream="Seall còmhradh dearbhaidh mus dèid stad a chur air sruthadh"
+Basic.Settings.General.Projectors="Proiseactaran"
+Basic.Settings.General.HideProjectorCursor="Falaich an cùrsair os cionn proiseactaran"
+Basic.Settings.General.ProjectorAlwaysOnTop="Cuir na proiseactaran air uachdar an-còmhnaidh"
+Basic.Settings.General.Snapping="Greimeachadh co-thaobhadh nan tùsan"
+Basic.Settings.General.ScreenSnapping="Greimich na tùsan ri oir na sgrìn"
+Basic.Settings.General.CenterSnapping="Greimich na tùsan ris a’ mheadhan"
+Basic.Settings.General.SourceSnapping="Greimich na tùsan ri tùsan eile"
+Basic.Settings.General.SnapDistance="Mothalachd a’ ghreimeachaidh"
+Basic.Settings.General.RecordWhenStreaming="Clàraich gu fèil-obrachail nuair a thèid rud a shruthadh"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Cum an clàradh nuair a thèid stad a chur air an t-sruthadh"
+Basic.Settings.General.ReplayBufferWhileStreaming="Tòisich bufair na h-ath-chluiche gu fèin-obrachail nuair a bhios rud ’ga shruthadh"
+Basic.Settings.General.KeepReplayBufferStreamStops="Cum bufair na h-ath-chluiche gnìomhach nuair a thèid stad a chur air sruthadh"
+Basic.Settings.General.SysTray="Treidhe an t-siostaim"
+Basic.Settings.General.SysTrayWhenStarted="Fìor-lùghdaich gu treidhe an t-siostaim aig an toiseach"
+Basic.Settings.General.SystemTrayHideMinimize="Fìor-lùghdaich gu treidhe an t-siostaim seach bàr nan saothair an-còmhnaidh"
+Basic.Settings.General.SaveProjectors="Sàbhail na proiseactaran nuair a thèid fàgail an-seo"
+Basic.Settings.General.SwitchOnDoubleClick="Tar-mhùth gu sealladh le briogadh dùbailte"
+Basic.Settings.General.StudioPortraitLayout="Cuir an comas co-dhealbhachd portraid/inghearach"
+Basic.Settings.General.Multiview="Ioma-shealladh"
+Basic.Settings.General.Multiview.MouseSwitch="Briog airson leum a ghearradh eadar seallaidhean"
+Basic.Settings.General.Multiview.DrawSourceNames="Seall ainmean nan seallaidhean"
+Basic.Settings.General.Multiview.DrawSafeAreas="Tarraing raointean sàbhailte (EBU R 95)"
+Basic.Settings.General.MultiviewLayout="Co-dhealbhachd an ioma-sheallaidh"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Còmhnard, barr (8 seallaidhean)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Còmhnard, bonn (8 seallaidhean)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Inghearach, clì (8 seallaidhean)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Inghearach, deas (8 seallaidhean)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Còmhnard, barr (24 sealladh)"
+
+Basic.Settings.Stream="Sruthadh"
+Basic.Settings.Stream.StreamType="Seòrsa an t-sruthaidh"
+
+Basic.Settings.Output="Às-chur"
+Basic.Settings.Output.Format="Fòrmat a’ chlàraidh"
+Basic.Settings.Output.Encoder="Inneal-còdachaidh"
+Basic.Settings.Output.SelectDirectory="Tagh pasgan a’ chlàraidh"
+Basic.Settings.Output.SelectFile="Tagh faidhle clàraidh"
+Basic.Settings.Output.EnforceBitrate="Èignich cuingeachaidhean reat bhiotaichean aig an t-seirbheis sruthaidh"
+Basic.Settings.Output.Mode="Modh an às-chuir"
+Basic.Settings.Output.Mode.Simple="Simplidh"
+Basic.Settings.Output.Mode.Adv="Adhartach"
+Basic.Settings.Output.Mode.FFmpeg="Às-chur FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Cuir an comas bufair ath-chluiche"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Ùine as motha nan ath-chluichean (diog)"
+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"
+Basic.Settings.Output.Simple.RecordingQuality="Càileachd a’ chlàraidh"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Co-ionnann ri tè an t-sruthaidh"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Càileachd àrd, faidhle meadhanach mòr"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Cha ghabh diofar aithneachadh, faidhle mòr"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Càileachd gun chall, faidhle uabhasach mòr"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Rabhadh: Thèid reat bhiotaichean video an t-sruthaidh a shuidheachadh air %1, seo a’ chrìoch as àirde aig an t-seirbheis sruthaidh làithreach. Ma tha thu cinnteach bu bheil thu airson corr is %1 a chleachdadh, cuir an comas roghainnean adhartach an inneil-chòdachaidh agus thoir a’ chromag far “Èignich cuingeachaidhean reat bhiotaichean aig an t-seirbheis sruthaidh”."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Rabhadh: Thèid reat bhiotaichean fuaime an t-sruthaidh a shuidheachadh air %1, seo a’ chrìoch as àirde aig an t-seirbheis sruthaidh làithreach. Ma tha thu cinnteach bu bheil thu airson corr is %1 a chleachdadh, cuir an comas roghainnean adhartach an inneil-chòdachaidh agus thoir a’ chromag far “Èignich cuingeachaidhean reat bhiotaichean aig an t-seirbheis sruthaidh”."
+Basic.Settings.Output.Simple.Warn.Encoder="Rabhadh: Ma nì thu clàradh le inneal-còdachaidh bathair-bhog air nach eil an aon chàileachd ’s a th’ air an t-sruthadh, bi feum air barrachd cleachdadh a’ CPU nuair a bhios tu a’ sruthadh ’s a’ clàradh aig an aon àm."
+Basic.Settings.Output.Simple.Warn.Lossless="Rabhadh: Cruthaichidh càileachd gun chall faidhlichean uabhasach mòr! Faodaidh càileachd gun chall corr is 7 giga-baidht a dh’àite a chleachdadh air an diosg gach mionaid ma tha an dùmhlachd-bhreacaidh agus an reat fhrèamaichean àrd. Cha mholamaid càileachd gun chall airson clàraidhean fada ach ma tha torr àite agad air an diosg."
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="A bheil thu cinnteach gu bheil thu airson càileachd gun chall a chleachdadh?"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Rabhadh a thaobh càileachd gun chall!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Rabhadh: Chan urrainn dhut iomadh inneal-còdachaidh QSV fa leth a chleachdadh nuair a bhios tu a’ sruthadh ’s a clàradh aig an aon àm. Nam bu toigh leat sruthadh is clàradh aig an aon àm, feuch an atharraich thu inneal-còdachaidh a’ chlàraidh no an t-sruthaidh."
+Basic.Settings.Output.Simple.Encoder.Software="Bathar-bog (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Bathar-cruaidh (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Bathar-cruaidh (AMD)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Bathar-cruaidh (NVENC)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Bathar-bog (ro-shuidheachadh air x264 le cleachdadh a’ CPU ìosal, meudaichidh seo na faidhlichean)"
+Basic.Settings.Output.VideoBitrate="Reat bhiotaichean a’ video"
+Basic.Settings.Output.AudioBitrate="Reat bhiotaichean na fuaime"
+Basic.Settings.Output.Reconnect="Ath-cheangail gu fèin-obrachail"
+Basic.Settings.Output.RetryDelay="Dàil na feuchainn a-rithist (diog)"
+Basic.Settings.Output.MaxRetries="Oidhirpean as motha"
+Basic.Settings.Output.Advanced="Cuir an comas roghainnean adhartach an inneil-chòdachaidh"
+Basic.Settings.Output.EncoderPreset="Ro-shuidheachadh an inneil-chòdachaidh (nas àirde = nas lugha dhen CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Roghainnean gnàthaichte an inneil-chòdachaidh"
+Basic.Settings.Output.CustomMuxerSettings="Roghainnean gnàthaichte an iompaicheir"
+Basic.Settings.Output.NoSpaceFileName="Gin ainm faidhle gun spàs"
+
+Basic.Settings.Output.Adv.Rescale="Ath-sgèilich an t-às-chur"
+Basic.Settings.Output.Adv.AudioTrack="Traca fuaime"
+Basic.Settings.Output.Adv.Streaming="Sruthadh"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Èignich na roghainnean inneil-chòdachaidh aig an t-seirbheis sruthaidh"
+Basic.Settings.Output.Adv.Audio.Track1="Traca 1"
+Basic.Settings.Output.Adv.Audio.Track2="Traca 2"
+Basic.Settings.Output.Adv.Audio.Track3="Traca 3"
+Basic.Settings.Output.Adv.Audio.Track4="Traca 4"
+Basic.Settings.Output.Adv.Audio.Track5="Traca 5"
+Basic.Settings.Output.Adv.Audio.Track6="Traca 6"
+
+Basic.Settings.Output.Adv.Recording="Clàradh"
+Basic.Settings.Output.Adv.Recording.Type="Seòrsa"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Stannardach"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Às-chur gnàthaichte (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Cleachd inneal-còdachaidh sruthaidh)"
+Basic.Settings.Output.Adv.Recording.Filename="Fòrmatadh nan ainmean faidhle"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Sgrìobh thairis air faidhle ma tha e ann"
+Basic.Settings.Output.Adv.FFmpeg.Type="Seòrsa às-chur FFmpeg"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Às-chuir gu URL"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Às-chuir gu faidhle"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Fòrmatan clàraidh cumanta"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Na h-uile faidhle"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Slighe faidhle no URL"
+Basic.Settings.Output.Adv.FFmpeg.Format="Fòrmat an t-soithich"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Fuaim"
+Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Am fòrmat tùsail"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Tuairisgeul air fòrmat an t-soithich"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Chaidh codec fuaime/video a thuairmeas o shlighe an fhaidhle no URL"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="An t-inneal-còdachaidh tùsail"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Cuir an t-inneal-còdachaidh à comas"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Inneal-còdachaidh video"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Roghainnean an inneil-chòdachaidh video (ma tha gin ann)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Inneal-còdachaidh fuaime"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Roghainnean an inneil-chòdachaidh fuaime (ma tha gin ann)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Roghainnean an iompaicheir (ma tha gin ann)"
+Basic.Settings.Output.Adv.FFmpeg.GOPSize="Eadaramh nam frèamaichean-iuchrach (frèam)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Seall na h-uile codec (fiù an fheadhainn nach eil co-chòrdail ma dh’fhaoidte)"
+
+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	Am bliadhna, ceithir àireamhan\n%YY		Am bliadhna, an dà àireamh mu dheireadh (00-99)\n%MM		Am mìos ’na àireamh dheicheach (01-12)\n%DD		Latha a’ mhìosa, le pada neoni (01-31)\n%hh		An uair san fhòrmat 24u (00-23)\n%mm		Am mionaid (00-59)\n%ss		An diog (00-61)\n%%		Samhla %\n%a		Gearr-ainm air latha na seachdaine\n%A		Ainm slàn air latha na seachdaine\n%b		Gearr-ainm a’ mhìosa\n%B		Ainm slàn a’ mhìosa\n%d		Latha a’ mhìosa le pada neoni (01-31)\n%H		An uair san fhòrmat 24u (00-23)\n%I		An uair san fhòrmat 12u (01-12)\n%m		Am mìos ’na àireamh dheicheach (01-12)\n%M		A’ mhionaid (00-59)\n%p		Sònrachadh m no f\n%S		An diog (00-61)\n%y		am bliadhna, an dà àireamh mu dheireadh (00-99)\n%Y		Am bliadhna\n%z		Frìth-àireamh ISO 8601 o UTC no\n		ainm no giorrachadh na roinn-tìde\n%Z		Ainm no giorrachadh na roinn-tìde\n"
+
+Basic.Settings.Video="Video"
+Basic.Settings.Video.Adapter="Adaptar video"
+Basic.Settings.Video.BaseResolution="Dùmhlachd-bhreacaidh bhunasach (a’ chanabhais)"
+Basic.Settings.Video.ScaledResolution="Dùmhlachd-bhreacaidh (sgèilichte) an às-chuir"
+Basic.Settings.Video.DownscaleFilter="Criathrag sgèileachaidh"
+Basic.Settings.Video.DisableAeroWindows="Cuir à comas Aero (Windows a-mhàin)"
+Basic.Settings.Video.FPS="FPS"
+Basic.Settings.Video.FPSCommon="Luachan FPS cumanta"
+Basic.Settings.Video.FPSInteger="Luach FPS slàn"
+Basic.Settings.Video.FPSFraction="Luachan FPS bloigheach"
+Basic.Settings.Video.Numerator="Àireamhaiche"
+Basic.Settings.Video.Denominator="Seòrsaiche"
+Basic.Settings.Video.Renderer="Inneal-reandaraidh"
+Basic.Settings.Video.InvalidResolution="Chan eil luach na dùmhlachd-breacaidh dligheach. Feumaidh e a bhith ’na [leud]x[àirde] (can 1920x1080)"
+Basic.Settings.Video.CurrentlyActive="Tha às-chur video gnìomhach an-dràsta. cuir dheth gach às-chur airson roghainnean a’ video atharrachadh."
+Basic.Settings.Video.DisableAero="Cuir à comas Aero"
+
+Basic.Settings.Video.DownscaleFilter.Bilinear="Dà-loidhneach (as luaithe ach sgleò air le sgèilachadh)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Dà-chiùbach (sgèileachadh geuraichte, 16 sampallan)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (sgèileachadh geuraichte, 32 sampall)"
+
+Basic.Settings.Audio="Fuaim"
+Basic.Settings.Audio.SampleRate="Reat shampallan"
+Basic.Settings.Audio.Channels="Seanailean"
+Basic.Settings.Audio.MeterDecayRate="Reat crìonaidh a’ mheidheadair-fhuaime"
+Basic.Settings.Audio.MeterDecayRate.Fast="Luath"
+Basic.Settings.Audio.MeterDecayRate.Medium="Meadhanach (PPM seòrsa I)"
+Basic.Settings.Audio.MeterDecayRate.Slow="Slaodach (PPM seòrsa II)"
+Basic.Settings.Audio.PeakMeterType="Seòrsa a’ mheidheadair-bharran"
+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 Twitch, 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.DesktopDevice="Uidheam fuaime an deasg"
+Basic.Settings.Audio.DesktopDevice2="Uidheam fuaime an deasg 2"
+Basic.Settings.Audio.AuxDevice="Uidheam fuaime micreofoin/taice"
+Basic.Settings.Audio.AuxDevice2="Uidheam fuaime micreofoin/taice 2"
+Basic.Settings.Audio.AuxDevice3="Uidheam fuaime micreofoin/taice 3"
+Basic.Settings.Audio.EnablePushToMute="Cuir an comas brùth-airson-mùchadh"
+Basic.Settings.Audio.PushToMuteDelay="Dàil air brùth-airson-mùchadh"
+Basic.Settings.Audio.EnablePushToTalk="Cuir an comas brùth-airson-bruidhinn"
+Basic.Settings.Audio.PushToTalkDelay="Dàil air brùth-airson-bruidhinn"
+Basic.Settings.Audio.UnknownAudioDevice="[Chan eil uidheam ceangailte no ri fhaighinn]"
+
+Basic.Settings.Advanced="Adhartach"
+Basic.Settings.Advanced.General.ProcessPriority="Prìomhachas a’ phròiseis"
+Basic.Settings.Advanced.General.ProcessPriority.High="Àrd"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Nas àirde na àbhaisteach"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Àbhaisteach"
+Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Nas ìsle na àbhaisteach"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="’Na tàmh"
+Basic.Settings.Advanced.FormatWarning="Rabhadh: Chaidh fòrmatan datha seach NV12 a dhealbhachadh a chum clàraidh agus cha molamaid airson sruthadh iad.  Cleachdaidh an sruthadh barrachd dhen CPU ri linn iompachadh air fòrmat nan dathan."
+Basic.Settings.Advanced.Audio.BufferingTime="Ùine bufair na fuaime"
+Basic.Settings.Advanced.Video.ColorFormat="Fòrmat nan dathan"
+Basic.Settings.Advanced.Video.ColorSpace="Spàs dhathan YUV"
+Basic.Settings.Advanced.Video.ColorRange="Rainse dhathan YUV"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Leth-phàirteach"
+Basic.Settings.Advanced.Video.ColorRange.Full="Làn"
+Basic.Settings.Advanced.Audio.MonitoringDevice="Uidheam sgrùdadh fuaime"
+Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Tùsail"
+Basic.Settings.Advanced.Audio.DisableAudioDucking="Cuir à comas tumadh fuaime Windows"
+Basic.Settings.Advanced.StreamDelay="Dàil an t-sruthaidh"
+Basic.Settings.Advanced.StreamDelay.Duration="Faide (diog)"
+Basic.Settings.Advanced.StreamDelay.Preserve="Glèidh puing a’ ghearraidh (meudaich an dàil) nuair a nithear ath-cheangal"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Tuairmse air cleachdadh na cuimhne: %1 MB"
+Basic.Settings.Advanced.Network="Lìonra"
+Basic.Settings.Advanced.Network.BindToIP="Nasg ri IP"
+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Cuir an comas an còd lìonraidh ùr"
+Basic.Settings.Advanced.Network.EnableLowLatencyMode="Modh foillidheachd ìosail"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Cuir à comas na grad-iuchraichean nuair a bhios am fòcas air a’ phrìomh-uinneag"
+
+Basic.AdvAudio="Roghainnean adhartach na fuaime"
+Basic.AdvAudio.Name="Ainm"
+Basic.AdvAudio.Volume="Àirde (%)"
+Basic.AdvAudio.Mono="Measgaich sìos gu mono"
+Basic.AdvAudio.Panning="Panachadh"
+Basic.AdvAudio.SyncOffset="Frìth-àireamh an t-sioncronachaidh (ms)"
+Basic.AdvAudio.Monitoring="Sgrùdadh fuaime"
+Basic.AdvAudio.Monitoring.None="Gun sgrùdadh"
+Basic.AdvAudio.Monitoring.MonitorOnly="Sgrùdadh a-mhàin (mùch an t-às-chur)"
+Basic.AdvAudio.Monitoring.Both="Sgrùdadh is às-chur"
+Basic.AdvAudio.AudioTracks="Tracaichean"
+
+Basic.Settings.Hotkeys="Grad-iuchraichean"
+Basic.Settings.Hotkeys.Pair="Nì na co-iuchraichean a tha ’gan co-roinneadh le “%1” toglachadh"
+
+Basic.Hotkeys.SelectScene="Gearr leum dhan t-sealladh"
+
+Basic.SystemTray.Show="Seall"
+Basic.SystemTray.Hide="Falaich"
+
+Basic.SystemTray.Message.Reconnecting="Gun cheangal. ’Ga ath-cheangal…"
+
+Hotkeys.Insert="Cuir a-steach"
+Hotkeys.Delete="Sguab às"
+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="Gu clì"
+Hotkeys.Right="Gu deas"
+Hotkeys.Up="Suas"
+Hotkeys.Down="Sìos"
+Hotkeys.Windows="Windows"
+Hotkeys.Super="Super"
+Hotkeys.Menu="Menu"
+Hotkeys.Space="Space"
+Hotkeys.NumpadNum="%1 air pada nan àireamh"
+Hotkeys.NumpadMultiply="Iomadachadh air pada nan àireamh"
+Hotkeys.NumpadDivide="Roinneadh air pada nan àireamh"
+Hotkeys.NumpadAdd="Cur ris air pada nan àireamh"
+Hotkeys.NumpadSubtract="Toir air falbh air pada nan àireamh"
+Hotkeys.NumpadDecimal="Puing air pada nan àireamh"
+Hotkeys.AppleKeypadNum="%1 (pada nan àireamh)"
+Hotkeys.AppleKeypadMultiply="* (pada nan àireamh)"
+Hotkeys.AppleKeypadDivide="/ (pada nan àireamh)"
+Hotkeys.AppleKeypadAdd="+ (pada nan àireamh)"
+Hotkeys.AppleKeypadSubtract="- (pada nan àireamh)"
+Hotkeys.AppleKeypadDecimal=". (pada nan àireamh)"
+Hotkeys.AppleKeypadEqual="= (pada nan àireamh)"
+Hotkeys.MouseButton="%1 na luchaige"
+
+Mute="Mùch"
+Unmute="Dì-mhùch"
+Push-to-mute="Brùth-airson-mùchadh"
+Push-to-talk="Brùth-airson-bruidhinn"
+
+SceneItemShow="Seall “%1”"
+SceneItemHide="Falaich “%1”"
+
+OutputWarnings.NoTracksSelected="Feumaidh tu traca no dhà a thaghadh"
+OutputWarnings.MultiTrackRecording="Rabhadh: Tha fòrmatan ann (can FLV) nach cuir taic ri iomadh traca sa chlàradh"
+OutputWarnings.MP4Recording="Rabhadh: Cha ghabh clàraidhean a thèid a shàbhaladh gu MP4 aiseag mura gabh am faidhle a thoirt gu crìch (can ri linn tuisleachaidh, call cumhachd is msaa.). Nam bu toigh leat iomadh traca fuaime a chlàradh, mholamaid gun cleachd thu MKV agus gun iompaich thu an clàradh gu mp4 nuair a bhios e deiseil (Faidhle->Iompaich clàraidhean)"
+
+FinalScene.Title="Sguab às an sealladh"
+FinalScene.Text="Feumaidh do shealladh a bhith ann."
+
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/gl-ES.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/gl-ES.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/he-IL.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/he-IL.ini Changed

obs-studio-22.0.1.tar.xz/UI/data/locale/hi-IN.ini Added

obs-studio-21.1.2.tar.xz/UI/data/locale/hr-HR.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/hr-HR.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/hu-HU.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/hu-HU.ini Changed

@@ -14,7 +14,7 @@
 Add="Hozzáadás"
 Remove="Eltávolítás"
 Rename="Átnevezés"
-Interact="Kölcsönhatás"
+Interact="Ráhatás"
 Filters="Szűrők"
 Properties="Tulajdonságok"
 MoveUp="Mozgatás Fel"
@@ -78,6 +78,8 @@
 StudioMode.Preview="Előnézet"
 StudioMode.Program="Program"
 ShowInMultiview="Mutatás Multiviewban"
+VerticalLayout="Függőleges elrendezés"
+Group="Csoport"
 
 AlreadyRunning.Title="Az OBS már fut"
 AlreadyRunning.Text="Az OBS már fut! Ha nem teljesen biztos benne mit tesz, akkor állítsa le az összes már futó OBS programot. Ha a programot úgy állította be, hogy rendszertálcára minimalizálódjon, akkor ellenőrizze, hogy ott megtalálható e."
@@ -405,6 +407,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.Group="Csoport %1"
+Basic.Main.GroupItems="Kijelölt elemek csoportosítása"
+Basic.Main.Ungroup="Csoport megszüntetése"
 
 Basic.MainMenu.File="&Fájl"
 Basic.MainMenu.File.Export="&Exportálás"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Segítség"
 Basic.MainMenu.Help.HelpPortal="Segítség &Portál"
 Basic.MainMenu.Help.Website="Weboldal megtekintése"
+Basic.MainMenu.Help.Discord="Csatlakozás &Discord szerverre"
 Basic.MainMenu.Help.Logs="&Naplófájlok"
 Basic.MainMenu.Help.Logs.ShowLogs="&Naplófájlok megjelenítése"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Aktuális Naplófájl feltöltése"
 Basic.MainMenu.Help.Logs.UploadLastLog="&Utolsó Naplófájl feltöltése"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Jelenlegi Naplófájl megtekintése"
 Basic.MainMenu.Help.CheckForUpdates="Frissítések ellenőrzése"
+Basic.MainMenu.Help.CrashLogs="Hibajelentések (&R)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Hibajelentések megjelenítése (&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Utolsó Hibajelentés feltöltése (&L)"
 
 Basic.Settings.ProgramRestart="A beállítások érvénybe lépéséhez a program újraindítása szükséges."
 Basic.Settings.ConfirmTitle="Változtatások megerősítése"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Projektorok mentése kilépéskor"
 Basic.Settings.General.SwitchOnDoubleClick="Átmenet a jelenetre dupla kattintás esetén"
 Basic.Settings.General.StudioPortraitLayout="Portré/függőleges elrendezés engedélyezése"
+Basic.Settings.General.Multiview="MultiView"
+Basic.Settings.General.Multiview.MouseSwitch="Kattintás a jelenetek közötti váltáshoz"
+Basic.Settings.General.Multiview.DrawSourceNames="Jelenetek neveinek megjelenítése"
+Basic.Settings.General.Multiview.DrawSafeAreas="Biztonságos területek kirajzolása (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="MultiView elrendezés"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vízszintes, Felső"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vízszintes, Alsó"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Függőleges, Bal"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Függőleges, Jobb"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vízszintes, felső (8 jelenet)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vízszintes, alsó (8 jelenet)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Függőleges, bal (8 jelenet)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Függőleges, jobb (8 jelenet)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Vízszintes, felső (24 jelenet)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Stream típusa"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Gyors"
 Basic.Settings.Audio.MeterDecayRate.Medium="Medium (Típus | PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lassú (Típus II PPM)"
+Basic.Settings.Audio.PeakMeterType="Csúcsmérték Típus"
+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. Twitch, 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.Title="Engedélyezi a surround hangzást?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="IP-hez rendelés"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Új hálózatkezelő kód engedélyezése"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Alacsony késleltetésű mód"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Gyorsbillentyűk letiltása, ha a fő ablak fókuszban van"
 
 Basic.AdvAudio="Speciális hangtulajdonságok"
 Basic.AdvAudio.Name="Név"
@@ -749,3 +767,12 @@
 FinalScene.Title="Jelenet törlése"
 FinalScene.Text="Legalább egy jelenetnek lennie kell."
 
+NoSources.Title="Nincsenek Források"
+NoSources.Text="Úgy fest, hogy nem adott hozzá valamilyen videoforrást, úgyhogy fekete képet fog adni. Biztos benne, hogy ezt kívánja tenni?"
+NoSources.Text.AddSource="Hozzáadhat forrásokat bármikor a + ikonra kattintva a Források doboz alatt a fő ablakban."
+
+ChangeBG="Szín megadása"
+CustomColor="Egyedi szín"
+
+BrowserSource.EnableHardwareAcceleration="Böngészőforrás hardveres támogatásának engedélyezése"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/it-IT.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/it-IT.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Anteprima"
 StudioMode.Program="Programma"
 ShowInMultiview="Mostra in Vista-Multipla"
+VerticalLayout="Layout verticale"
+Group="Gruppo"
 
 AlreadyRunning.Title="OBS è già in esecuzione"
 AlreadyRunning.Text="OBS è già in esecuzione!  A meno che non si intendeva effettuare questa operazione, chiudere tutte le istanze esistenti di OBS prima di provare a eseguirne una nuova.  Se avete OBS impostato per minimizzarsi nell'area di notifica, si prega di controllare per vedere se è ancora in esecuzione."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Ferma trasmissione"
 Basic.Main.StoppingStreaming="Arresto trasmissione..."
 Basic.Main.ForceStopStreaming="Ferma trasmissione (annulla ritardo)"
+Basic.Main.Group="Gruppo %1"
+Basic.Main.GroupItems="Elementi selezionati"
+Basic.Main.Ungroup="Separa"
 
 Basic.MainMenu.File="&File"
 Basic.MainMenu.File.Export="&Esporta"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Aiuto"
 Basic.MainMenu.Help.HelpPortal="Portale Aiuto"
 Basic.MainMenu.Help.Website="Visita il sito"
+Basic.MainMenu.Help.Discord="Join & Discord Server"
 Basic.MainMenu.Help.Logs="File di &log"
 Basic.MainMenu.Help.Logs.ShowLogs="&Visualizza i file di Log"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Carica file di log &corrente"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carica u&ltimo file di log"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vedi attuale file di log"
 Basic.MainMenu.Help.CheckForUpdates="Controlla aggiornamenti"
+Basic.MainMenu.Help.CrashLogs="Segnalazione c&rash "
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Vi&sualizza Segnalazione crash"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Carica l'u&ltimo Crash Report"
 
 Basic.Settings.ProgramRestart="Il programma deve essere riavviato perché questi cambiamenti abbiano effetto."
 Basic.Settings.ConfirmTitle="Conferma cambiamenti"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Salva i proiettori all'uscita"
 Basic.Settings.General.SwitchOnDoubleClick="Transizione alla scena al doppio-click"
 Basic.Settings.General.StudioPortraitLayout="Attiva il layout Orizzontale/Verticale"
+Basic.Settings.General.Multiview="Visualizzazione Multipla"
+Basic.Settings.General.Multiview.MouseSwitch="Clicca per passare da una scena all'altra"
+Basic.Settings.General.Multiview.DrawSourceNames="Visualizza il nome della scena"
+Basic.Settings.General.Multiview.DrawSafeAreas="Evidenziare aree sicure (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Layout a viste multiple"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Orizzontale, Alto"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Orizzontale, Basso"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Orizzontale, Sinistra"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Orizzontale, Destra"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Orizzontale, In alto (8 scene)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Orizzontale, In basso (8 scene)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Verticale, A sinistra (8 scene)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Verticale, A destra (8 scene)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Orizzontale, In alto (24 scene)"
 
 Basic.Settings.Stream="Trasmissione"
 Basic.Settings.Stream.StreamType="Tipo di stream"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Veloce"
 Basic.Settings.Audio.MeterDecayRate.Medium="Medio (Tipo 1 PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lento (Tipo 2 PPM)"
+Basic.Settings.Audio.PeakMeterType="Modalità Peak Meter"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Sample Peak"
+Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (alto utilizzo della CPU)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="ATTENZIONE: L'audio Surround è attivo."
 Basic.Settings.Audio.MultichannelWarning="Per lo streaming, accertati che il servizio di streaming supporti sia integrazione che riproduzione di suono surround. Twitch, Facebook 360 Live, Mixer RTMP e Smashcast sono esempi di servizi in cui il suono surround è completamente supportato. Anche se sia Facebook Live che YouTube Live implementano il suono surround, Facebook Live lo converte in stereo, mentre YouTube Live ne riproduce solo due canali.\n\nI filtri di OBS Studio sono compatibili con il suono surround, anche se il supporto per il plugin VST non è garantito."
 Basic.Settings.Audio.MultichannelWarning.Title="Abilitare l'audio surround?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Associa a IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Attiva il nuovo codice di rete"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Modalità a bassa latenza"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Disabilitare i tasti di scelta rapida quando la finestra principale è a fuoco"
 
 Basic.AdvAudio="Proprietà audio avanzate"
 Basic.AdvAudio.Name="Nome"
@@ -749,3 +767,7 @@
 FinalScene.Title="Elimina scena"
 FinalScene.Text="Deve esserci almeno una scena."
 
+NoSources.Title="Nessuna sorgente"
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/ja-JP.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ja-JP.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="プレビュー"
 StudioMode.Program="番組"
 ShowInMultiview="マルチビューで表示"
+VerticalLayout="垂直レイアウト"
+Group="グループ化"
 
 AlreadyRunning.Title="OBSは既に実行中です"
 AlreadyRunning.Text="OBSは既に実行されています!  この操作を行うつもりがない限り、新しいインスタンスを実行する前に既存のOBSインスタンスを終了してください。OBSがシステムトレイに最小化されるように設定されている場合は、まだ実行中であるかどうかを確認してください。"
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="配信終了"
 Basic.Main.StoppingStreaming="配信停止処理中..."
 Basic.Main.ForceStopStreaming="配信停止 (遅延破棄)"
+Basic.Main.Group="グループ化 %1"
+Basic.Main.GroupItems="選択したアイテムのグループ化"
+Basic.Main.Ungroup="グループ化の解除"
 
 Basic.MainMenu.File="ファイル(&F)"
 Basic.MainMenu.File.Export="エクスポート(&E)"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="ヘルプ(&H)"
 Basic.MainMenu.Help.HelpPortal="ヘルプポータル(&P)"
 Basic.MainMenu.Help.Website="ウェブサイト(&W)"
+Basic.MainMenu.Help.Discord="Discordサーバーに参加(&D)"
 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="クラッシュレポート(&R)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="クラッシュレポートを表示(&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="最新のクラッシュレポートをアップロード(&L)"
 
 Basic.Settings.ProgramRestart="これらの設定を有効にするためにはプログラムの再起動が必要です。"
 Basic.Settings.ConfirmTitle="変更確認"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="終了時にプロジェクターを保存する"
 Basic.Settings.General.SwitchOnDoubleClick="ダブルクリックしたときにシーンに遷移"
 Basic.Settings.General.StudioPortraitLayout="縦長/垂直レイアウトを有効にする"
+Basic.Settings.General.Multiview="マルチビュー"
+Basic.Settings.General.Multiview.MouseSwitch="クリックするとシーンを切り替える"
+Basic.Settings.General.Multiview.DrawSourceNames="シーン名を表示"
+Basic.Settings.General.Multiview.DrawSafeAreas="安全領域を描画 (EBU R95)"
 Basic.Settings.General.MultiviewLayout="マルチビューレイアウト"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="水平, 上"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="水平, 下"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="垂直, 左"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="垂直, 右"
+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="配信種別"
@@ -635,6 +649,9 @@
 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="配信する場合、配信サービスがサラウンド音声の取り込みと再生の両方をサポートしているかどうかを確認してください。Twitch、Facebook 360 Live、Mixer RTMP、Smashcastは、サラウンド音声が完全にサポートされている例です。しかしFacebook LiveとYouTube Liveはどちらもサラウンド取り込みを受信しますが、Facebook Liveはステレオにダウンミックスし、YouTube Liveは2チャンネルのみしか再生できません。\n\nVSTプラグインのサポートは保証されていませんが、OBS音声フィルタはサラウンド音声と互換性があります。"
 Basic.Settings.Audio.MultichannelWarning.Title="サラウンド音声を有効にしますか？"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="IP選択"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="新しいネットワークコードを有効にする"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="低遅延モード"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="メインウィンドウにフォーカスがあるときはホットキーを無効にする"
 
 Basic.AdvAudio="オーディオの詳細プロパティ"
 Basic.AdvAudio.Name="名称"
@@ -749,3 +767,12 @@
 FinalScene.Title="シーンを削除する"
 FinalScene.Text="1つ以上のシーンが必要です。"
 
+NoSources.Title="ソース無し"
+NoSources.Text="映像ソースをまだ追加していないようなので、空白の画面だけが出力されます。よろしいですか？"
+NoSources.Text.AddSource="メインウィンドウのソースボックスの下にある + アイコンをクリックすると、いつでもソースを追加することができます。"
+
+ChangeBG="色の設定"
+CustomColor="カスタム色"
+
+BrowserSource.EnableHardwareAcceleration="ブラウザソースのハードウェアアクセラレーションを有効にする"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/ka-GE.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ka-GE.ini Changed

@@ -2,7 +2,7 @@
 Language="ქართული"
 Region="საქართველო"
 
-OK="კაი"
+OK="კარგი"
 Apply="მიღება"
 Cancel="გაუქმება"
 Close="დახურვა"
@@ -28,6 +28,16 @@
 Mono="მონო"
 Stereo="სტერეო"
 DroppedFrames="კადრების ვარდნა %1 (%2%)"
+StudioProgramProjector="სრულეკრანიანი ჩვენება (შედეგი)"
+PreviewProjector="სრულეკრანიანი ჩვენება (შეთვალიერება)"
+SceneProjector="სრულეკრანიანი ჩვენება (სცენა)"
+SourceProjector="სრულეკრანიანი ჩვენება (წყარო)"
+StudioProgramWindow="ფანჯარაში ჩვენება (შედეგი)"
+PreviewWindow="ფანჯარაში ჩვენება (შეთვალიერება)"
+SceneWindow="ფანჯარაში ჩვენება (სცენა)"
+SourceWindow="ფანჯარაში ჩვენება (წყარო)"
+MultiviewProjector="მრავალხედიანი (სრულ ეკრანზე)"
+MultiviewWindowed="მრავალხედიანი (ფანჯარაში)"
 Clear="გასუფთავება"
 Revert="დაბრუნება"
 Show="ჩვენება"
@@ -56,123 +66,713 @@
 Export="გატანა"
 Copy="დაკოპირება"
 Paste="ჩასმა"
+PasteReference="ჩასმა (ბმული)"
+PasteDuplicate="ჩასმა (ასლი)"
+RemuxRecordings="ჩანაწერების გარდაქმნა"
 Next="შემდეგ"
 Back="უკან"
 Defaults="ნაგულისხმევი"
+HideMixer="ხმის მიქშერში დამალვა"
+TransitionOverride="გადასვლა გადაფარვით"
+None="არცერთი"
+StudioMode.Preview="შეთვალიერება"
+StudioMode.Program="შედეგი"
+ShowInMultiview="მრავალხედიანი ჩვენება"
+VerticalLayout="შვეული განლაგება"
+Group="დაჯგუფება"
 
 AlreadyRunning.Title="OBS უკვე გაშვებულია"
 AlreadyRunning.Text="OBS უკვე გაშვებულია! გთხოვთ, ჯერ დახუროთ OBS-ის ყველა გაშვებული პროცესი, სანამ ახლის გაშვებას შეეცდებით. თუ მითითებული გაქვთ, რომ დახურვის ნაცვლად, OBS სისტემურ არეში უნდა ჩაიკეცოს, გთხოვთ მანდაც გადაამოწმოთ, დარჩენილი ხომ არაა."
 AlreadyRunning.LaunchAnyway="მაინც გაშვება"
 
 Copy.Filters="ფილტრების დაკოპირება"
-
-
-
-
+Paste.Filters="ფილტრების ჩასმა"
+
+BandwidthTest.Region="რეგიონი"
+BandwidthTest.Region.US="შეერთებული შტატები"
+BandwidthTest.Region.EU="ევროპა"
+BandwidthTest.Region.Asia="აზია"
+BandwidthTest.Region.Other="სხვა"
+
+Basic.FirstStartup.RunWizard="გსურთ, გაეშვას თვითგამართვის მეგზური? ამასთან, შეგიძლიათ პარამეტრების ხელით გამართვა მთავარ ფანჯარაში, პარამეტრების ღილაკზე დაწკაპებით."
+Basic.FirstStartup.RunWizard.BetaWarning="(შენიშვნა: თვითგამართვის მეგზური ჯერჯერობით საცდელია)"
+Basic.FirstStartup.RunWizard.NoClicked="თუ გადაიფიქრებთ, თვითგამართვის გაშვება შეგეძლებათ ნებისმიერ დროს, ხელსაწყოების მენიუდან."
+
+Basic.AutoConfig="თვითგამართვის მეგზური"
+Basic.AutoConfig.Beta="თვითგამართვის მეგზური (Beta)"
+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.VideoPage.BaseResolution.Display="ეკრანი %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="მიმდინარეს გამოყენება (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 ან 30, თუმცა უმჯობესია 60, როცა შესაძლებელია"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 ან 30, თუმცა უმჯობესია მაღალი გარჩევადობით"
+Basic.AutoConfig.VideoPage.CanvasExplanation="შენიშვნა: ეკრანის ფონის (ძირითადი) გაფართოება არაა აუცილებელი გაშვებული ნაკადის ან გადაღებული ვიდეოს გაფართოებას ემთხვეოდეს. ცალკეული ნაკადის/ვიდეოს ზომები შეიძლება შემცირდეს, რესურსების მოხმარების ან ბიტური სიხშირის შესამცირებლად."
+Basic.AutoConfig.StreamPage="ნაკადის მონაცემები"
+Basic.AutoConfig.StreamPage.SubTitle="გთხოვთ მიუთითოთ ნაკადის მონაცემები"
+Basic.AutoConfig.StreamPage.Service="მომსახურება"
+Basic.AutoConfig.StreamPage.Service.ShowAll="ყველას ჩვენება..."
+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.TestPage="საბოლოო შედეგები"
+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="ნაკადის დამშიფრავის შემოწმება, შესაძლოა ერთ წუთამდე გასტანოს..."
+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.Stats="სტატისტიკა"
+Basic.Stats.CPUUsage="CPU დატვირთვა"
+Basic.Stats.HDDSpaceAvailable="ხელმისაწვდომი ადგილი დისკზე"
+Basic.Stats.MemoryUsage="მეხსიერების დატვირთვა"
+Basic.Stats.AverageTimeToRender="კადრის დამუშავების საშუალო დრო"
+Basic.Stats.SkippedFrames="დაშიფვრის დაყოვნების გამო გამოტოვებული კადრები"
+Basic.Stats.MissedFrames="დამუშავების დაყოვნების გამო გამოტოვებული კადრები"
+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.DroppedFrames="გამოტოვებული კადრები (ქსელი)"
+Basic.Stats.MegabytesSent="საერთო მოცულობა"
+Basic.Stats.Bitrate="ბიტური სიხშირე"
 
+Updater.Title="ხელმისაწვდომია განახლება"
+Updater.Text="ხელმისაწვდომია განახლება:"
 Updater.UpdateNow="განაახლე ახლა"
-
-
+Updater.RemindMeLater="მოგვიანებით შეხსენება"
+Updater.Skip="ვერსიის გამოტოვება"
+Updater.Running.Title="პროგრამა ამჟამად გაშვებულია"
+Updater.Running.Text="გაშვებულია გამომავალი სიგნალები, გთხოვთ, ჯერ გამორთოთ ყველა მოქმედი გამომავალი სიგნალი, სანამ განახლებას შეეცდებით"
+Updater.NoUpdatesAvailable.Title="განახლებები არაა ხელმისაწვდომი"
+Updater.NoUpdatesAvailable.Text="ამჟამად, განახლებები არაა ხელმისაწვდომი"
+Updater.FailedToLaunch="განახლების გაშვება ვერ მოხერხდა"
+Updater.GameCaptureActive.Title="მიმდინარეობს თამაშის ჩაწერა"
+Updater.GameCaptureActive.Text="ამჟამად გაშვებულია თამაშის ჩამწერი ბიბლიოთეკა. გთხოვთ, შეწყვიტოთ ყველა თამაშის/პროგრამის ჩაწერა (ან თავიდან ჩართოთ windows) და სცადოთ ხელახლა."
+
+QuickTransitions.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="სტუდიური რეჟიმი"
 
+TransitionNameDlg.Text="გთხოვთ, მიუთითოთ გადასვლის სახელი"
+TransitionNameDlg.Title="გადასვლის სახელი"
 
+TitleBar.Profile="პროფილი"
+TitleBar.Scenes="სცენები"
 
+NameExists.Title="სახელი უკვე არსებობს"
+NameExists.Text="სახელი უკვე გამოყენებულია."
 
+NoNameEntered.Title="გთხოვთ, შეიყვანოთ მართებული სახელი"
+NoNameEntered.Text="ცარიელი სახელი დაუშვებელია."
 
+ConfirmStart.Title="გაეშვას ნაკადი?"
+ConfirmStart.Text="ნამდვილად გსურთ პირდაპირი ეთერის გაშვება?"
 
+ConfirmStop.Title="შეწყდეს ნაკადი?"
+ConfirmStop.Text="ნამდვილად გსურთ პირდაპირი ეთერის შეწყვეტა?"
 
 ConfirmExit.Title="OBS-დან გასვლა?"
-
-
-
-
-
-
+ConfirmExit.Text="OBS ამჟამად მოქმედია.  ყველა გაშვებული ნაკადი/ჩაწერა შეწყდება.  ნამდვილად გსურთ გამოსვლა?"
+
+ConfirmRemove.Title="წაშლის დადასტურება"
+ConfirmRemove.Text="ნამდვილად გსურთ, წაიშალოს '$1'?"
+ConfirmRemove.TextMultiple="ნამდვილად გსურთ, წაიშალოს %1 მათგანი?"
+
+Output.StartStreamFailed="ნაკადის გაშვება ვერ მოხერხდა"
+Output.StartRecordingFailed="ჩაწერის დაწყება ვერ მოხერხდა"
+Output.StartReplayFailed="გადახვევის ჩართვა ვერ მოხერხდა"
+Output.StartFailedGeneric="სიგნალის გაშვება ვერ მოხერხდა.  გთხოვთ, შეამოწმეთ აღრიცხვის ფაილი, დამატებითი ინფორმაციისთვის.\n\nშენიშვნა: თუ იყენებთ NVENC ან AMD დამშიფრავებს, დარწმუნდით რომ თქვენი ვიდეოდაფის პროგრამა განახლებულია."
+
+Output.ConnectFail.Title="დაკავშირება ვერ მოხერხდა"
+Output.ConnectFail.BadPath="არამართებული მისამართი ან დასაკავშირებელი URL ბმული.  გთხოვთ, გადაამოწმოთ თქვენი პარამეტრების სისწორე."
+Output.ConnectFail.ConnectFailed="სერვერთან დაკავშირება ვერ მოხერხდა"
+Output.ConnectFail.InvalidStream="ვერ ხერხდება მითითებულ არხთან ან ნაკადის გასაღებთან დაკავშირება, გთხოვთ, გადაამოწმოთ თქვენი ნაკადის გასაღები.  თუ სწორია, მაშინ შესაძლოა ხარვეზი იყოს სერვერთან დაკავშირებისას."
+Output.ConnectFail.Error="მოულოდნელი შეცდომა წარმოიქმნა სერვერთან დაკავშირებისას.  დამატებითი ინფორმაციისთვის იხილეთ აღრიცხვის ფაილი."
+Output.ConnectFail.Disconnected="სერვერთან კავშირი გაწყვეტილია."
+
+Output.RecordFail.Title="ჩაწერის დაწყება ვერ მოხერხდა"
+Output.RecordFail.Unsupported="ამ სახის გამომავალი სიგნალი ან არაა მხარდაჭერილი, ან არ იძლევა ერთზე მეტი ხმოვანი ფაილის გამოყენების საშუალებას.  გთხოვთ, გადაამოწმოთ თქვენი პარამეტრები და სცადოთ ხელახლა."
+Output.RecordNoSpace.Title="არასაკმარისი ადგილი დისკზე"
+Output.RecordNoSpace.Msg="დისკზე აღარაა საკმარისი ადგილი ჩაწერის გასაგრძელებლად."
+Output.RecordError.Title="შეცდომა ჩაწერისას"
+Output.RecordError.Msg="ჩაწერის დროს დაუდგენელი სახის შეცდომა წარმოიშვა."
+Output.ReplayBuffer.NoHotkey.Title="სწრაფი ღილაკი არაა მითითებული!"
+Output.ReplayBuffer.NoHotkey.Msg="სწრაფი ღილაკი არაა მითითებული გადახვევისთვის.  გთხოვთ, მიუთითოთ „შენახვის“ ღილაკი, გადასახვევი მასალის შესანახად."
+
+Output.BadPath.Title="ფაილის არამართებული მისამართი"
+Output.BadPath.Text="ფაილის მითითებული მდებარეობა არასწორია.  გთხოვთ, გადაამოწმოთ თქვენი პარამეტრების სისწორე."
+
+LogReturnDialog="ჩანაწერი წარმატებით აიტვირთა"
 LogReturnDialog.CopyURL="ბმულის კოპირება"
+LogReturnDialog.ErrorUploadingLog="შეცდომა აღრიცხვის ფაილის ატვირთვისას"
 
+LicenseAgreement="სალიცენზიო შეთანხმება"
+LicenseAgreement.PleaseReview="გთხოვთ, გაეცნოთ ლიცენზიის დადგენილებებს OBS-ით სარგებლობამდე.  ამ პროგრამის გამოყენებით თქვენ ადასტურებთ, რომ წაიკითხეთ და ეთანხმებით <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public v2.0 ლიცენზიის</a> პირობებს. გთხოვთ, გადაადგილოთ გვერდი ქვემოთ, ხელშეკრულების სრულად სანახავად."
+LicenseAgreement.ClickIAgreeToContinue="თუ თანახმა ხართ, მიიღოთ ხელშეკრულების პირობები, დააწკაპეთ ღილაკს „ვეთანხმები“.  OBS-ით სარგებლობისთვის, აუცილებელია წინამდებარე პირობების მიღება."
+LicenseAgreement.IAgree="ვეთანხმები"
 LicenseAgreement.Exit="გასვლა"
 
-
-
+Remux.SourceFile="OBS ჩაწერა"
+Remux.TargetFile="საბოლოო ფაილი"
+Remux.Remux="ხელახლა მულტიპლექსირება"
+Remux.OBSRecording="OBS ჩაწერა"
+Remux.FinishedTitle="გარდაქმნა დასრულებულია"
+Remux.Finished="ჩანაწერის გარდაქმნა დასრულდა"
+Remux.FinishedError="ჩანაწერის გარდაქმნა დასრულდა, თუმცა ფაილი, შესაძლოა არასრული იყოს"
+Remux.SelectRecording="ფაილის არჩევა OBS ჩანაწერისთვის…"
+Remux.SelectTarget="საბოლოო ფაილის არჩევა …"
+Remux.FileExistsTitle="საბოლოო ფაილი უკვე არჩეულია"
+Remux.FileExists="საბოლოო ფაილი უკვე არჩეულია, გსურთ მისი შეცვლა?"
+Remux.ExitUnfinishedTitle="მიმდინარეობს გარდაქმნა"
+Remux.ExitUnfinished="გარდაქმნა ჯერ არ დასრულებულა, ახლავე შეწყვეტის შედეგად, დასამუშავებელი საბოლოო ფაილი გამოუსადეგარი გახდება.\nნამდვილად გსურთ გარდაქმნის შეწყვეტა?"
+
+UpdateAvailable="განახლება ხელმისაწვდომია"
+UpdateAvailable.Text="ხელმისაწვდომია ვერსია %1.%2.%3. <a href='%4'>დააწკაპეთ ჩამოსატვირთად</a>"
+
+Basic.DesktopDevice1="Desktop Audio"
+Basic.DesktopDevice2="Desktop Audio 2"
+Basic.AuxDevice1="Mic/Aux"
 Basic.AuxDevice2="Mic/Aux 2"
 Basic.AuxDevice3="Mic/Aux 3"
 Basic.AuxDevice4="Mic/Aux 4"
 
+Basic.Scene="სცენა"
+Basic.DisplayCapture="ეკრანის გადაღება"
 
+Basic.Main.PreviewConextMenu.Enable="შეთვალიერების შესაძლებლობა"
 
+ScaleFiltering="მასშტაბირების ფილტრი"
+ScaleFiltering.Point="წერტილოვანი"
+ScaleFiltering.Bilinear="ორხაზოვანი"
+ScaleFiltering.Bicubic="ბიკუბური"
+ScaleFiltering.Lanczos="Lanczos"
 
+Deinterlacing="Deinterlacing"
+Deinterlacing.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="ქვედა ველიდან"
+
+VolControl.SliderUnmuted="ხმის სამართავი '%1': %2"
+VolControl.SliderMuted="ხმის სამართავი '%1': %2 (ამჟამად დადუმებული)"
+VolControl.Mute="'%1' დადუმება"
+VolControl.Properties="'%1' პარამეტრები"
+
+Basic.Main.AddSceneDlg.Title="სცენის დამატება"
+Basic.Main.AddSceneDlg.Text="გთხოვთ, მიუთითოთ სცენის დასახელება"
+
+Basic.Main.DefaultSceneName.Text="სცენა %1"
+
+Basic.Main.AddSceneCollection.Title="სცენის კრებულის დამატება"
+Basic.Main.AddSceneCollection.Text="გთხოვთ, მიუთითოთ სცენის კრებულის დასახელება"
+
+Basic.Main.RenameSceneCollection.Title="სცენის კრებულის გადარქმევა"
+
+AddProfile.Title="პროფილის დამატება"
+AddProfile.Text="გთხოვთ, მიუთითოთ პროფილის დასახელება"
+
+RenameProfile.Title="პროფილის გადარქმევა"
+
+Basic.Main.MixerRename.Title="ხმის წყაროს გადარქმევა"
+Basic.Main.MixerRename.Text="გთხოვთ, მიუთითოთ ხმის წყაროს დასახელება"
+
+
+Basic.Main.PreviewDisabled="შეთვალიერება მიუწვდომელია"
+
+Basic.SourceSelect="წყაროს შექმნა/მითითება"
+Basic.SourceSelect.CreateNew="ახლის შექმნა"
+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.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="ჩვეულებრივი 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.AudioFilters="ხმოვანი ფილტრები"
+Basic.Filters.EffectFilters="დასამუშავებელი ფილტრები"
+Basic.Filters.Title="'%1' ფილტრები"
+Basic.Filters.AddFilter.Title="ფილტრის დასახელება"
+Basic.Filters.AddFilter.Text="გთხოვთ, მიუთითოთ ფილტრის დასახელება"
+
+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.TopLeft="მარცხნივ ზემოთ"
+Basic.TransformWindow.Alignment.TopCenter="შუაში ზემოთ"
+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.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.Stretch="გაწელვა საზღვრებამდე"
+
+Basic.Main.AddSourceHelp.Title="წყარო ვერ დაემატება"
+Basic.Main.AddSourceHelp.Text="საჭიროა, სულ მცირე 1 სცენა წყაროს დასამატებლად."
+
+Basic.Main.Scenes="სცენები"
+Basic.Main.Sources="წყაროები"
+Basic.Main.Controls="სამართავი"
+Basic.Main.Connecting="უკავშირდება..."
+Basic.Main.StartRecording="ჩაწერის დაწყება"
+Basic.Main.StartReplayBuffer="გადახვევის ჩართვა"
+Basic.Main.StartStreaming="ნაკადის გაშვება"
+Basic.Main.StopRecording="ნაკადის შეწყვეტა"
+Basic.Main.StoppingRecording="ჩაწერის შეწყვეტა..."
+Basic.Main.StopReplayBuffer="გადახვევის გამორთვა"
+Basic.Main.StoppingReplayBuffer="გადახვევა გამოირთვება..."
+Basic.Main.StopStreaming="ნაკადის შეწყვეტა"
+Basic.Main.StoppingStreaming="ნაკადი წყდება..."
+Basic.Main.ForceStopStreaming="ნაკადი წყდება (დაყოვნება უქმდება)"
+Basic.Main.Group="ჯგუფი %1"
+Basic.Main.GroupItems="შერჩეულების დაჯგუფება"
+Basic.Main.Ungroup="განჯგუფება"
+
+Basic.MainMenu.File="&ფაილი"
+Basic.MainMenu.File.Export="&გატანა"
+Basic.MainMenu.File.Import="&შემოტანა"
+Basic.MainMenu.File.ShowRecordings="&ჩანაწერების ჩვენება"
+Basic.MainMenu.File.Remux="ჩანაწერების ხელახლა მულტი&პლექსირება"
+Basic.MainMenu.File.Settings="&პარამეტრები"
+Basic.MainMenu.File.ShowSettingsFolder="პარამეტრების საქაღალდის ჩვენება"
+Basic.MainMenu.File.ShowProfileFolder="პროფილის საქაღალდის ჩვენება"
+Basic.MainMenu.AlwaysOnTop="&ყოველთვის წინა პლანზე"
+Basic.MainMenu.File.Exit="&გამოსვლა"
+
+Basic.MainMenu.Edit="&ჩასწორება"
+Basic.MainMenu.Edit.Undo="&დაბრუნება"
+Basic.MainMenu.Edit.Redo="&კვლავ შესრულება"
+Basic.MainMenu.Edit.UndoAction="&დაბრუნება $1"
+Basic.MainMenu.Edit.RedoAction="&კვლავ შესრულება $1"
+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="&გარდაქმნა"
+Basic.MainMenu.Edit.Transform.EditTransform="გარდაქმნის &ჩასწორება..."
+Basic.MainMenu.Edit.Transform.CopyTransform="გარდაქმნის დაკოპირება"
+Basic.MainMenu.Edit.Transform.PasteTransform="გარდაქმნის ჩასმა"
+Basic.MainMenu.Edit.Transform.ResetTransform="&გარდაქმნის გაუქმება"
+Basic.MainMenu.Edit.Transform.Rotate90CW="მობრუნება 90 გრადუსით საათის ისრის მიმართ."
+Basic.MainMenu.Edit.Transform.Rotate90CCW="მობრუნება 90 გრადუსით საათის ისრის საწ. მიმართ."
+Basic.MainMenu.Edit.Transform.Rotate180="მობრუნება 180 გრადუსით"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="&თარაზულად შეტრიალება"
+Basic.MainMenu.Edit.Transform.FlipVertical="&შვეულად შეტრიალება"
+Basic.MainMenu.Edit.Transform.FitToScreen="ეკრანის ზომაზე &მორგება"
+Basic.MainMenu.Edit.Transform.StretchToScreen="ეკრანის ზომაზე &გაწელვა"
+Basic.MainMenu.Edit.Transform.CenterToScreen="ეკრანის &შუაში განთავსება"
+Basic.MainMenu.Edit.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="&სიები"
+Basic.MainMenu.View.SceneTransitions="ს&ცენებს შორის გადასვლები"
+Basic.MainMenu.View.StatusBar="&მდგომარეობის ზოლი"
+Basic.MainMenu.View.Fullscreen.Interface="სრულეკრანიანი"
+
+Basic.MainMenu.SceneCollection="&სცენის კრებული"
+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.Tools="&ხელსაწყოები"
+
+Basic.MainMenu.Help="&დახმარება"
+Basic.MainMenu.Help.HelpPortal="დახმარების &გვერდი"
+Basic.MainMenu.Help.Website="ეწვიეთ &ვებსაიტს"
+Basic.MainMenu.Help.Discord="&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="ავარიული დახურვების &მოხსენებები"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="ავარიული დახურვების მოხსენებების &ჩვენება"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&ბოლო მოხსენების ატვირთვა"
+
+Basic.Settings.ProgramRestart="ამ ცვლილებების ასახვისთვის, საჭიროა პროგრამის ხელახლა გაშვება."
+Basic.Settings.ConfirmTitle="ცვლილებების დადასტურება"
+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.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.SwitchOnDoubleClick="სცენაზე გადასვლა ორჯერ დაწკაპებისას"
+Basic.Settings.General.StudioPortraitLayout="შვეული განლაგების ჩართვა"
+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.Output="გამომავალი სიგნალი"
+Basic.Settings.Output.Format="ჩაწერის ფორმატი"
+Basic.Settings.Output.Encoder="დამშიფრავი"
+Basic.Settings.Output.SelectDirectory="საქაღალდის არჩევა ჩანაწერისთვის"
+Basic.Settings.Output.SelectFile="ფაილის არჩევა ჩანაწერისთვის"
+Basic.Settings.Output.EnforceBitrate="ნაკადის გაშვების მომსახურების ბიტური სიხშირის ზღვრების დადგენა"
+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="(შენიშვნა: დარწმუნდით, რომ გადახვევისთვის სწრაფი ღილაკები დაყენებულია შესაბამის განყოფილებაში)"
+Basic.Settings.Output.ReplayBuffer.Prefix="გადასახვევი მასალის შესანახი ფაილის თავსართი"
+Basic.Settings.Output.ReplayBuffer.Suffix="ბოლოსართი"
+Basic.Settings.Output.Simple.SavePath="ჩანაწერის მდებარეობა"
+Basic.Settings.Output.Simple.RecordingQuality="ჩაწერის ხარისხი"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="გაშვებული ნაკადის შესაბამისი"
+Basic.Settings.Output.Simple.RecordingQuality.Small="მაღალი ხარისხი, საშუალო ზომის ფაილი"
+Basic.Settings.Output.Simple.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.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.MultipleQSV="გაფრთხილება: ერთდროულად რამდენიმე სხვადასხვა QSV დამშიფრავის გამოყენება ნაკადის გაშვებისას და ჩაწერისას, შეუძლებელია. თუ გსურთ ნაკადის გაშვება და ჩაწერა ერთდროულად, გთხოვთ შეცვალოთ ან ჩაწერის დამშიფრავი, ან ნაკადის დამშიფრავი."
+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="დაშიფვრის მზა პარამეტრები (მაღალი = ნაკლები CPU-დატვირთვა)"
+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"
+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="ტიპი"
 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.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="ხმის დამშიფრავის პარამეტრები (თუ არის)"
+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"
+
+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%%		A % ნიშანი\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"
+
+Basic.Settings.Video="ვიდეო"
+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="FPS"
+Basic.Settings.Video.FPSCommon="საერთო FPS-მნიშვნელობები"
+Basic.Settings.Video.FPSInteger="მთელრიცხვიანი FPS-მნიშვნელობები"
+Basic.Settings.Video.FPSFraction="წილადიანი FPS-მნიშვნელობები"
+Basic.Settings.Video.Numerator="მრიცხველი"
 Basic.Settings.Video.Denominator="მნიშვნელი"
+Basic.Settings.Video.Renderer="დამმუშავებელი"
+Basic.Settings.Video.InvalidResolution="გაფართოების არასწორი მნიშვნელობა.  უნდა იყოს [width]x[height] (მაგ. 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="Lanczos (მკვეთრი მასშტაბირება, 32 შერჩევა)"
 
+Basic.Settings.Audio="ხმა"
+Basic.Settings.Audio.SampleRate="სიხშირე"
 Basic.Settings.Audio.Channels="არხები"
-
-
+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="ზუსტი (პროცესორის მაღალი მოხმარებით)"
+Basic.Settings.Audio.MultiChannelWarning.Enabled="ყურადღება: ჩართულია მოცულობითი ხმა."
+Basic.Settings.Audio.MultichannelWarning="ნაკადის გაშვებისას, გადაამოწმეთ მომსახურების მომწოდებელთან, არის თუ არა მხარდაჭერილი ორივე, მოცულობითი ხმოვანი სიგნალის მიღებაც და მოსმენაც.  მაგალითად Twitch, Facebook 360 Live, Mixer RTMP, Smashcast შემთხვევებში, მოცულობითი ხმოვანი სიგნალი, სრულადაა მხარდაჭერილი.  მიუხედავად იმისა, რომ Facebook Live და YouTube Live, ორივე იღებს მოცულობით ხმოვან სიგნალს, Facebook Live გარდაქმნის მას სტერეო-სიგნალად, ხოლო YouTube Live უშვებს მხოლოდ ორი არხით.\n\nOBS-ის ხმოვანი ფილტრები თავსებადია მოცულობით ხმოვან სიგნალთან, მაგრამ VST მოდულის მხარდაჭერა, შესაძლოა არ იყოს უზრუნველყოფილი."
+Basic.Settings.Audio.MultichannelWarning.Title="ჩაირთოს მოცულობითი ხმოვანი სიგნალი?"
+Basic.Settings.Audio.MultichannelWarning.Confirm="ნამდვილად გსურთ, ჩართოთ მოცულობითი ხმოვანი სიგნალი?"
+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.EnablePushToMute="დაჭერით დადუმების ჩართვა"
+Basic.Settings.Audio.PushToMuteDelay="დაჭერით დადუმების დაყოვნება"
+Basic.Settings.Audio.EnablePushToTalk="დაჭერით საუბრის ჩართვა"
+Basic.Settings.Audio.PushToTalkDelay="დაჭერით საუბრის დაყოვნება"
+Basic.Settings.Audio.UnknownAudioDevice="[მოწყობილობა არაა დაკავშირებული ან მიუწვდომელია]"
+
+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.Video.ColorFormat="ფერთა ფორმატი"
+Basic.Settings.Advanced.Video.ColorSpace="YUV ფერთა სისტემა"
+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="დაყოვნების შემცირება"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="სწრაფი ღილაკების გათიშვა, მთავარ ფანჯარაზე გადასვლისას"
+
+Basic.AdvAudio="ხმის გაფართოებული პარამეტრები"
 Basic.AdvAudio.Name="სახელი"
-
-
-
-
-
+Basic.AdvAudio.Volume="ხმის სიმაღლე (%)"
+Basic.AdvAudio.Mono="ერთ არხში გაერთიანება"
+Basic.AdvAudio.Panning="წონასწორობა"
+Basic.AdvAudio.SyncOffset="სინქრონიზაციის გასწორება (მწ)"
+Basic.AdvAudio.Monitoring="ხმის მოსმენა"
+Basic.AdvAudio.Monitoring.None="მოსმენის გარეშე"
+Basic.AdvAudio.Monitoring.MonitorOnly="მხოლოდ მოსმენა (უხმო გამომავალი სიგნალით)"
+Basic.AdvAudio.Monitoring.Both="მოსმენა და გამოტანა"
+Basic.AdvAudio.AudioTracks="ბილიკები"
+
+Basic.Settings.Hotkeys="სწრაფი ღილაკები"
+Basic.Settings.Hotkeys.Pair="'%1' - ღილაკების ერთობლიობა იმუშავებს გადამრთველის სახით"
+
+Basic.Hotkeys.SelectScene="სცენაზე გადასვლა"
+
+Basic.SystemTray.Show="ჩვენება"
+Basic.SystemTray.Hide="დამალვა"
+
+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.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
 Hotkeys.CapsLock="Caps Lock"
 Hotkeys.Backspace="Backspace"
+Hotkeys.Tab="Tab"
+Hotkeys.Print="Print"
 Hotkeys.Pause="პაუზა"
+Hotkeys.Left="მარცხენა ისარი"
+Hotkeys.Right="მარჯვენა ისარი"
+Hotkeys.Up="ზედა ისარი"
+Hotkeys.Down="ქვედა ისარი"
+Hotkeys.Windows="Windows"
 Hotkeys.Super="Super"
 Hotkeys.Menu="მენიუ"
 Hotkeys.Space="Space"
 Hotkeys.NumpadNum="Numpad %1"
-
-
-
-
+Hotkeys.NumpadMultiply="გამრავლება ციფრების დაფაზე"
+Hotkeys.NumpadDivide="გაყოფა ციფრების დაფაზე"
+Hotkeys.NumpadAdd="მიმატება ციფრების დაფაზე"
+Hotkeys.NumpadSubtract="გამოკლება ციფრების დაფაზე"
+Hotkeys.NumpadDecimal="ათწილადის ნიშანი ციფრების დაფაზე"
+Hotkeys.AppleKeypadNum="%1 (კლავიატურაზე)"
+Hotkeys.AppleKeypadMultiply="* (კლავიატურაზე)"
+Hotkeys.AppleKeypadDivide="/ (კლავიატურაზე)"
+Hotkeys.AppleKeypadAdd="+ (კლავიატურაზე)"
+Hotkeys.AppleKeypadSubtract="- (კლავიატურაზე)"
+Hotkeys.AppleKeypadDecimal=". (კლავიატურაზე)"
+Hotkeys.AppleKeypadEqual="= (კლავიატურაზე)"
+Hotkeys.MouseButton="თაგვი %1"
+
+Mute="დადუმება"
+Unmute="ხმის ჩართვა"
+Push-to-mute="დაჭერისას დადუმება"
+Push-to-talk="დაჭერისას საუბარი"
+
+SceneItemShow="'%1'-ის გამოჩენა"
+SceneItemHide="'%1'-ის დამალვა"
+
+OutputWarnings.NoTracksSelected="უნდა მიუთითოთ ერთი ხმოვანი ბილიკი მაინც"
+OutputWarnings.MultiTrackRecording="გაფრთხილება: ცალკეული სახის ფაილებში (როგორიცაა FLV), არაა მხარდაჭერილი რამდენიმე ბილიკი, თითოეული ჩაწერისას"
+OutputWarnings.MP4Recording="გაფრთხილება: MP4 სახით შენახული ჩანაწერები ვეღარ აღდგება, მუშაობის შეწყვეტის შემთხვევაში (მაგ. ლურჯი ეკრანის ამოგდებისას, ძაბვის ვარდნისას და ა.შ.). თუ გსურთ რამდენიმე ხმოვანი ფაილის ჩაწერა, სასურველია ამისთვის გამოიყენოთ MKV და დასრულების შემდეგ გარდაქმნათ MP4-ად. (ფაილი->ჩანაწერების გარდაქმნა)"
+
+FinalScene.Title="სცენის წაშლა"
+FinalScene.Text="საჭიროებს, სულ მცირე ერთ სცენას."
+
+NoSources.Title="წყაროები არაა"
+NoSources.Text="როგორც ჩანს, თქვენ ჯერ არ დაგიმატებიათ ვიდეოს არცერთი წყარო, შედეგად მიიღებთ ცარიელ ეკრანს. ნამდვილად გსურთ, განაგრძოთ?"
+NoSources.Text.AddSource="წყაროს დამატება შეგიძლიათ ნებისმიერ დროს + ნიშანზე დაწკაპებით, მთავარი ფანჯრის წყაროების არეში."
+
+ChangeBG="ფერის დაყენება"
+CustomColor="ფერის მითითება"
+
+BrowserSource.EnableHardwareAcceleration="ბრაუზერის აპარატურული აჩქარების ჩართვა"

obs-studio-21.1.2.tar.xz/UI/data/locale/ko-KR.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ko-KR.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="미리보기"
 StudioMode.Program="프로그램"
 ShowInMultiview="다중화면으로 표시"
+VerticalLayout="수직으로 배치"
+Group="하나로 묶기"
 
 AlreadyRunning.Title="OBS가 이미 실행 중입니다"
 AlreadyRunning.Text="OBS가 이미 실행 중입니다! 의도한 것이 아니라면 새로운 OBS를 실행하기 전에 이미 동작 중인 프로그램을 종료하십시오. OBS가 시스템 트레이에 최소화되어 있는지도 확인하십시오."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="방송 중단"
 Basic.Main.StoppingStreaming="방송을 중지합니다..."
 Basic.Main.ForceStopStreaming="방송 중지 (지연된 분량도 마무리없이 즉시 송출 중단)"
+Basic.Main.Group="묶음: %1"
+Basic.Main.GroupItems="선택한 항목 묶기"
+Basic.Main.Ungroup="묶음 해체"
 
 Basic.MainMenu.File="파일(&F)"
 Basic.MainMenu.File.Export="내보내기(&E)"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="도움말(&H)"
 Basic.MainMenu.Help.HelpPortal="도움말 및 포털"
 Basic.MainMenu.Help.Website="웹사이트 방문(&W)"
+Basic.MainMenu.Help.Discord="공식 디스코드 참여(&D)"
 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="오류 보고(&R)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="오류 보고서 보기(&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="마지막 오류 보고서 전송하기(&L)"
 
 Basic.Settings.ProgramRestart="설정을 적용하려면 프로그램을 다시 시작해야 합니다."
 Basic.Settings.ConfirmTitle="변경사항 확인"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="종료 시 프로젝터 저장"
 Basic.Settings.General.SwitchOnDoubleClick="더블클릭 시 장면으로 전환"
 Basic.Settings.General.StudioPortraitLayout="프로젝터를 수직으로 배열"
+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="수평, 위"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="수평, 아래"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="수직, 왼쪽"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="수직, 오른쪽"
+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="방송 형식"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="빠름"
 Basic.Settings.Audio.MeterDecayRate.Medium="중간 (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="느림 (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="피크 미터 형식"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="샘플 피크"
+Basic.Settings.Audio.PeakMeterType.TruePeak="트루 피크 (더 높은 CPU 자원 요구)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="경고: 서라운드 음향이 켜져 있습니다."
 Basic.Settings.Audio.MultichannelWarning="방송 중이라면 서비스에서 서라운드 음향에 대한 입력 및 재생을 지원하는지 확인하세요. 트위치, 페이스북 360 라이브, Mixer RTMP, Smashcast 는 해당 기능을 사용할 수 있습니다. 페이스북 Live와 유튜브 Live 서비스는 입력은 할 수 있지만 스테레오로 전환하며 유튜브 Live는 오로지 2채널로만 재생합니다.\n\nOBS 오디오 필터는 서라운드 음향을 지원하지만 VST 플러그인 지원은 보장하지 않습니다."
 Basic.Settings.Audio.MultichannelWarning.Title="서라운드 음향을 활성화할까요?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="IP에 고정"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="새로운 네트워크 코드 활성화"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="짧은 지연시간 방식 사용"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="주요 창을 초점으로 둘 때 단축키를 비활성화"
 
 Basic.AdvAudio="오디오 고급 설정"
 Basic.AdvAudio.Name="이름"
@@ -749,3 +767,12 @@
 FinalScene.Title="장면 삭제"
 FinalScene.Text="적어도 하나의 장면은 존재해야 합니다."
 
+NoSources.Title="소스 없음"
+NoSources.Text="어떠한 영상 소스도 추가하지 않아서 빈 화면만 송출할 것입니다. 그래도 계속하시겠습니까?"
+NoSources.Text.AddSource="주 화면 소스 목록에 있는 + 아이콘을 누르면 소스를 추가할 수 있습니다."
+
+ChangeBG="색상 지정"
+CustomColor="사용자 색상"
+
+BrowserSource.EnableHardwareAcceleration="브라우저 소스에 하드웨어 가속 활성화"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/lt-LT.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/lt-LT.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/ms-MY.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ms-MY.ini Changed

@@ -52,11 +52,34 @@
 Hours="Jam"
 Minutes="Minit"
 Seconds="Saat"
+Import="Import"
+Export="Eksport"
+Copy="Salin"
+Paste="Tampal"
+PasteReference="Tampal (rujukan)"
+PasteDuplicate="Tampal (dua salinan)"
+Next="Seterusnya"
+Back="Kembali"
 
 
 
+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"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Gunakan semasa (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Paparan %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Gunakan semasa (%1)"
+Basic.AutoConfig.StreamPage="Maklumat aliran"
+Basic.AutoConfig.StreamPage.SubTitle="Sila taip maklumat aliran anda"
+Basic.AutoConfig.StreamPage.Service="Perkhidmatan-perkhidmatan"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Tunjuk semua..."
+Basic.AutoConfig.StreamPage.Server="Server"
+Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Link)"
 
 
 
@@ -428,3 +451,6 @@
 
 
 
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/nb-NO.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/nb-NO.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Forhåndsvisning"
 StudioMode.Program="Program"
 ShowInMultiview="Vis i Multiview"
+VerticalLayout="Loddrett oppsett"
+Group="Gruppe"
 
 AlreadyRunning.Title="OBS kjører allerede"
 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."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Stopp Strømming"
 Basic.Main.StoppingStreaming="Stanser strøm…"
 Basic.Main.ForceStopStreaming="Stopp strømming (forkast forsinkelse)"
+Basic.Main.Group="Gruppe %1"
+Basic.Main.GroupItems="Gruppér merkede gjenstander"
+Basic.Main.Ungroup="Adskill"
 
 Basic.MainMenu.File="&Fil"
 Basic.MainMenu.File.Export="&Eksportér"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Hjelp"
 Basic.MainMenu.Help.HelpPortal="&Portal for hjelp"
 Basic.MainMenu.Help.Website="Besøk &nettstedet"
+Basic.MainMenu.Help.Discord="Bli med i &Discord-serveren"
 Basic.MainMenu.Help.Logs="&Loggfiler"
 Basic.MainMenu.Help.Logs.ShowLogs="Vis &loggfiler"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Last opp &nåværende loggfil"
 Basic.MainMenu.Help.Logs.UploadLastLog="Last opp &siste loggfil"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vis gjeldende logg"
 Basic.MainMenu.Help.CheckForUpdates="Se etter oppdateringer"
+Basic.MainMenu.Help.CrashLogs="Krasjrapporter"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Vi&s krasjrapporter"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Last opp den &nyeste krasjrapporten"
 
 Basic.Settings.ProgramRestart="Programmet må startes på nytt for at disse innstillingene skal tre i kraft."
 Basic.Settings.ConfirmTitle="Bekreft endringer"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Lagre projektorer ved avslutning"
 Basic.Settings.General.SwitchOnDoubleClick="Dobbeltklikking vil gå til scenen"
 Basic.Settings.General.StudioPortraitLayout="Aktiver portrett/loddrett vindu"
+Basic.Settings.General.Multiview="Flervisning"
+Basic.Settings.General.Multiview.MouseSwitch="Klikk for å bytte mellom scener"
+Basic.Settings.General.Multiview.DrawSourceNames="Vis scenenes navn"
+Basic.Settings.General.Multiview.DrawSafeAreas="Tegn trygge områder (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Flervisningsplassering"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vannrett, øverst"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vannrett, nederst"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Loddrett, venstre"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Loddrett, høyre"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Vannrett, topp (8 scener)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Vannrett, bunn (8 scener)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Loddrett, venstre (8 scener)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Loddrett, høyre (8 scener)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Vannrett, topp (24 scener)"
 
 Basic.Settings.Stream="Strøm"
 Basic.Settings.Stream.StreamType="Strømmetype"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Raskt"
 Basic.Settings.Audio.MeterDecayRate.Medium="Middels (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Tregt (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Toppunktmålertype"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Samplingstoppunkt"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Ekte toppunkt (Høyere CPU-bruk)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="Advarsel: Surroundlyd er aktivert."
 Basic.Settings.Audio.MultichannelWarning="Hvis du strømmer, sjekk om strømmetjenesten din støtter både surround-lydinnføring og surround-lydavspilling. Twitch, 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?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Bind til IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktiver den nye nettverkskoden"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Lavlatens-modus"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Deaktiver hurtigtaster når hovedvinduet er i fokus"
 
 Basic.AdvAudio="Avanserte lydinnstillinger"
 Basic.AdvAudio.Name="Navn"
@@ -749,3 +767,11 @@
 FinalScene.Title="Slett scene"
 FinalScene.Text="Det må være minst én scene."
 
+NoSources.Title="Ingen kilder"
+NoSources.Text="Det ser ut som du ikke har lagt til noen videokilder ennå, så du vil kun sende en blank skjerm. Er du sikker på at du vil gjøre dette?"
+NoSources.Text.AddSource="Du kan legge til kilder ved å klikke på +-ikonet under Kilder-boksen i hovedvinduet til enhver tid."
+
+ChangeBG="Velg farge"
+CustomColor="Egendefinert farge"
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/nl-NL.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/nl-NL.ini Changed

@@ -42,7 +42,7 @@
 Revert="Herstellen"
 Show="Weergeven"
 Hide="Verbergen"
-UnhideAll="Verberge alle"
+UnhideAll="Allemaal zichtbaar maken"
 Untitled="Naamloos"
 New="Nieuw"
 Duplicate="Dupliceren"
@@ -78,6 +78,8 @@
 StudioMode.Preview="Preview"
 StudioMode.Program="Programma"
 ShowInMultiview="Weergeven in Multiview"
+VerticalLayout="Verticale Lay-out"
+Group="Groep"
 
 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 staat."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Stream Stoppen"
 Basic.Main.StoppingStreaming="Stream Stoppen..."
 Basic.Main.ForceStopStreaming="Stop Stream (vertraging negeren)"
+Basic.Main.Group="Groep %1"
+Basic.Main.GroupItems="Groepeer geselecteerde items"
+Basic.Main.Ungroup="Degroeperen"
 
 Basic.MainMenu.File="&Bestand"
 Basic.MainMenu.File.Export="&Exporteren"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Help"
 Basic.MainMenu.Help.HelpPortal="Help-&portal"
 Basic.MainMenu.Help.Website="&Website Bezoeken"
+Basic.MainMenu.Help.Discord="Wordt lid van &Discord server"
 Basic.MainMenu.Help.Logs="&Logbestanden"
 Basic.MainMenu.Help.Logs.ShowLogs="Logbe&standen Weergeven"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload &Huidige Logbestand"
 Basic.MainMenu.Help.Logs.UploadLastLog="Upload &Laatste Logbestand"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Toon Huidige Logbestand (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Controleer Op Updates"
+Basic.MainMenu.Help.CrashLogs="Fouten&rapport"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Toon crashrapporten (&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Upload &laatste crash rapport"
 
 Basic.Settings.ProgramRestart="Het programma moet opnieuw worden opgestart om deze instellingen te activeren."
 Basic.Settings.ConfirmTitle="Wijzigingen Bevestigen"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Projectors opslaan bij afsluiten"
 Basic.Settings.General.SwitchOnDoubleClick="Ga over naar scène bij dubbelklik"
 Basic.Settings.General.StudioPortraitLayout="Portret/verticale layout inschakelen"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Klik hier om tussen scènes te wisselen"
+Basic.Settings.General.Multiview.DrawSourceNames="Toon namen van scènes"
+Basic.Settings.General.Multiview.DrawSafeAreas="Veilige gebieden (EBU R 95) tekenen"
 Basic.Settings.General.MultiviewLayout="Multiview-indeling"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontaal, Boven"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontaal, Onder"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Verticaal, Links"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Verticaal, Rechts"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontaal, boven (8 scènes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontaal, onder (8 scènes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Verticaal, links (8 scènes)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Verticaal, rechts (8 scènes)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontaal, boven (24 scènes)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Stream Type"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Snel"
 Basic.Settings.Audio.MeterDecayRate.Medium="Gemiddeld (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Traag (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Piek Meter Type"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Sample piek"
+Basic.Settings.Audio.PeakMeterType.TruePeak="True piek (hogere CPU-gebruik)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="Waarschuwing: Surround sound audio is ingeschakeld."
 Basic.Settings.Audio.MultichannelWarning="Als je streamt, controleer dan of je streaming service zowel surround sound ingest als surround sound afspelen ondersteunt. Twitch, 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.Title="Surround sound audio inschakelen?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Bind aan IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Schakel nieuwe netwerkcode in"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Lage latency modus"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Hotkeys uitschakelen wanneer hoofdvenster in focus is"
 
 Basic.AdvAudio="Geavanceerde Audioinstellingen"
 Basic.AdvAudio.Name="Naam"
@@ -749,3 +767,12 @@
 FinalScene.Title="Verwijder scène"
 FinalScene.Text="Er moet tenminste één scène zijn."
 
+NoSources.Title="Geen bronnen"
+NoSources.Text="Er zijn nog geen video bronnen toegevoegd, er zal dus een leeg scherm weergegeven worden. Weet je zeker dat je dit wilt doen?"
+NoSources.Text.AddSource="Bronnen kunnen toegevoegd worden door op het + icoon onder het vak \"Bronnen\" in het hoofdvenster te klikken."
+
+ChangeBG="Kleur instellen"
+CustomColor="Aangepaste kleur"
+
+BrowserSource.EnableHardwareAcceleration="Browser bron hardwareversnelling inschakelen"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/nn-NO.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/nn-NO.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/pl-PL.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/pl-PL.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Podgląd"
 StudioMode.Program="Program"
 ShowInMultiview="Pokaż w Multiview"
+VerticalLayout="Układ pionowy"
+Group="Grupa"
 
 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."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Zatrzymaj stream"
 Basic.Main.StoppingStreaming="Zatrzymywanie streamowania..."
 Basic.Main.ForceStopStreaming="Zatrzymaj stream (anuluj opóźnienie)"
+Basic.Main.Group="Grupa %1"
+Basic.Main.GroupItems="Grupuj wybrane elementy"
+Basic.Main.Ungroup="Rozgrupuj"
 
 Basic.MainMenu.File="&Plik"
 Basic.MainMenu.File.Export="&Eksport"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="P&omoc"
 Basic.MainMenu.Help.HelpPortal="&Portal pomocy"
 Basic.MainMenu.Help.Website="Od&wiedź naszą stronę"
+Basic.MainMenu.Help.Discord="Dołącz do serwera &Discord"
 Basic.MainMenu.Help.Logs="P&liki dziennika"
 Basic.MainMenu.Help.Logs.ShowLogs="Pokaż pliki dziennika (&s)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Wyślij &aktualny plik dziennika"
 Basic.MainMenu.Help.Logs.UploadLastLog="Wyślij o&statni plik dziennika"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Podgląd akty&wnego pliku dziennika"
 Basic.MainMenu.Help.CheckForUpdates="Sprawdź dostępność aktualizacji"
+Basic.MainMenu.Help.CrashLogs="&Raporty o awariach"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Pokaż raporty o awariach (&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Wyślij ostatni raport o awariach (&L)"
 
 Basic.Settings.ProgramRestart="Aby te ustawienia zaczęły obowiązywać, należy ponownie uruchomić program."
 Basic.Settings.ConfirmTitle="Potwierdź zmiany"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Zapisz konfigurację podglądów na pełnym ekranie przy zamknięciu aplikacji"
 Basic.Settings.General.SwitchOnDoubleClick="Przejdź do sceny po dwukrotnym kliknięciu"
 Basic.Settings.General.StudioPortraitLayout="Włącz układ pionowy"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Kliknij, aby przełączać się między scenami"
+Basic.Settings.General.Multiview.DrawSourceNames="Pokaż nazwy scen"
+Basic.Settings.General.Multiview.DrawSafeAreas="Rysowanie bezpiecznych obszarów (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Podgląd wielokrotny"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Poziomo, Góra"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Poziomo, Dół"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Pionowo, Lewo"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Pionowo, Prawo"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Poziomo, Góra (8 scen)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Poziomo, Dół (8 scen)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Pionowo, Lewo (8 scen)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Pionowo, Prawo (8 scen)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Poziomo, Góra (24 sceny)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Typ streamu"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Szybko"
 Basic.Settings.Audio.MeterDecayRate.Medium="Średnio (PPM typu I)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Wolno (PPM typu II)"
+Basic.Settings.Audio.PeakMeterType="Typ szczytowego poziomu paska audio"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Poziom szczytowy próbkowany"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Rzeczywisty szczytowy poziom (większe użycie procesora)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="Uwaga: Dźwięk przestrzenny jest włączony."
 Basic.Settings.Audio.MultichannelWarning="W przypadku streamowania sprawdź, czy docelowa usługa obsługuje wielokanałowe wejście oraz odtwarzanie dźwięku surround. Twitch, 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.Title="Włączyć dźwięk przestrzenny?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Przypisane IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktywuj nowy kod sieciowy"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Tryb niskich opóźnień"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Wyłącz skróty klawiszowe, gdy główne okno programu jest aktywne na pierwszym planie"
 
 Basic.AdvAudio="Zaawansowane ustawienia dźwięku"
 Basic.AdvAudio.Name="Nazwa"
@@ -749,3 +767,12 @@
 FinalScene.Title="Usuń scenę"
 FinalScene.Text="Musi być co najmniej jedna scena."
 
+NoSources.Title="Brak źródeł"
+NoSources.Text="Wygląda na to, że nie dodano żadnych źródeł video. Na wyjściu otrzymasz tylko czarny ekran. Czy na pewno chcesz to zrobić?"
+NoSources.Text.AddSource="Źródła dodać można w każdym momencie klikając przycisk + w okienku Źródła głównego ekranu aplikacji."
+
+ChangeBG="Ustaw kolor"
+CustomColor="Kolor niestandardowy"
+
+BrowserSource.EnableHardwareAcceleration="Włącz akcelerację sprzętową w pluginie przeglądarki"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/pt-BR.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/pt-BR.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Prévia"
 StudioMode.Program="Programa"
 ShowInMultiview="Mostrar no Multiview"
+VerticalLayout="Layout Vertical"
+Group="Grupo"
 
 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."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Parar Transmissão"
 Basic.Main.StoppingStreaming="Parando Transmissão..."
 Basic.Main.ForceStopStreaming="Pare de transmitir (descartar atraso)"
+Basic.Main.Group="Grupo %1"
+Basic.Main.GroupItems="Agrupar Itens Selecionados"
+Basic.Main.Ungroup="Desagrupar"
 
 Basic.MainMenu.File="&Arquivo"
 Basic.MainMenu.File.Export="&Exportar"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Ajuda"
 Basic.MainMenu.Help.HelpPortal="&Portal de Ajuda"
 Basic.MainMenu.Help.Website="Visitar &website"
+Basic.MainMenu.Help.Discord="Juntar-se ao Servidor do &Discord"
 Basic.MainMenu.Help.Logs="&Arquivos de Log"
 Basic.MainMenu.Help.Logs.ShowLogs="&Mostrar Arquivos de Log"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Enviar &Arquivo de Log Atual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Enviar &Ultimo Arquivo de Log"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Exibir Log atual"
 Basic.MainMenu.Help.CheckForUpdates="Verificar se há atualizações"
+Basic.MainMenu.Help.CrashLogs="&Relatórios de erros"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Exibir relatórios de erro&s"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Enviar ú&ltimo relatório de erros"
 
 Basic.Settings.ProgramRestart="O Programa precisar ser reiniciado para que estas configurações surtam efeito."
 Basic.Settings.ConfirmTitle="Confirmar Alterações"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Salvar projetores ao sair"
 Basic.Settings.General.SwitchOnDoubleClick="Mudar para a cena quando clicar duas vezes"
 Basic.Settings.General.StudioPortraitLayout="Ativar o layout Paisagem/Retrato"
+Basic.Settings.General.Multiview="Multiview"
+Basic.Settings.General.Multiview.MouseSwitch="Clique para alternar entre cenas"
+Basic.Settings.General.Multiview.DrawSourceNames="Mostrar nome das cenas"
+Basic.Settings.General.Multiview.DrawSafeAreas="Mostrar áreas de segurança (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Layout do Multiview"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, Acima"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, Abaixo"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, à Esquerda"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, à Direita"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, Acima (8 Cenas)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, Abaixo (8 Cenas)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, à Esquerda (8 Cenas)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertical, à Direita (8 Cenas)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, Acima (24 Cenas)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Tipo de Stream"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Rápida"
 Basic.Settings.Audio.MeterDecayRate.Medium="Média (PPM Tipo I)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Devagar (PPM Tipo II)"
+Basic.Settings.Audio.PeakMeterType="Tipo do medidor de pico"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Exemplo de pico"
+Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Uso elevado de CPU)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="AVISO: Áudio Surround está habilitado."
 Basic.Settings.Audio.MultichannelWarning="Antes de transmitir, verifique se o seu serviço de transmissão suporta tanto receber como reproduzir som surround. Twitch, 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.Title="Ativar o som surround?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Transmitir pelo IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Habilitar o novo código de rede"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Modo de baixa latência"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Desativar teclas de atalho quando a janela principal estiver em foco"
 
 Basic.AdvAudio="Propriedades de áudio avançadas"
 Basic.AdvAudio.Name="Nome"
@@ -749,3 +767,12 @@
 FinalScene.Title="Excluir cena"
 FinalScene.Text="É preciso haver pelo menos uma cena."
 
+NoSources.Title="Sem Fontes"
+NoSources.Text="Parece que você ainda não adicionou nenhuma fonte de vídeo, portanto, você só exibirá uma tela em branco. Você tem certeza de que quer fazer isso?"
+NoSources.Text.AddSource="Você pode adicionar fontes clicando no ícone + sob a caixa de Fontes na janela principal, a qualquer momento."
+
+ChangeBG="Definir Cor"
+CustomColor="Cor Personalizada"
+
+BrowserSource.EnableHardwareAcceleration="Habilitar a aceleração por Hardware do Navegador"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/pt-PT.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/pt-PT.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/ro-RO.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ro-RO.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/ru-RU.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ru-RU.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Предпросмотр"
 StudioMode.Program="Программа"
 ShowInMultiview="Отображать в Мульти-обзоре"
+VerticalLayout="Вертикальное расположение"
+Group="Группа"
 
 AlreadyRunning.Title="OBS уже запущен"
 AlreadyRunning.Text="OBS уже запущен! Пожалуйста, закройте все запущенные экземпляры OBS перед попыткой запустить новые (только если вы не хотели именно этого). Если вы настроили OBS на сворачивание в системный трей, пожалуйста, проверьте, возможно он до сих пор запущен."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Остановить трансляцию"
 Basic.Main.StoppingStreaming="Остановка вещания..."
 Basic.Main.ForceStopStreaming="Остановить трансляцию (сбросить задержку)"
+Basic.Main.Group="Группа %1"
+Basic.Main.GroupItems="Сгруппировать выбранные элементы"
+Basic.Main.Ungroup="Разгруппировать"
 
 Basic.MainMenu.File="&Файл"
 Basic.MainMenu.File.Export="&Экспорт"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Справка"
 Basic.MainMenu.Help.HelpPortal="&Портал помощи"
 Basic.MainMenu.Help.Website="Посетить &веб-сайт"
+Basic.MainMenu.Help.Discord="Зайти на сервер &Discord"
 Basic.MainMenu.Help.Logs="&Log файлы"
 Basic.MainMenu.Help.Logs.ShowLogs="&Показать лог-файлы"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Загрузить &текущий Log файл"
 Basic.MainMenu.Help.Logs.UploadLastLog="Загрузить &последний Log файл"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Просмотреть текущий журнал"
 Basic.MainMenu.Help.CheckForUpdates="Проверить наличие обновлений"
+Basic.MainMenu.Help.CrashLogs="&Отчёты об ошибках"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Показать отчёты об ошибках"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Загрузить последний отчёт об ошибке"
 
 Basic.Settings.ProgramRestart="Для изменения этих параметров требуется перезапустить программу."
 Basic.Settings.ConfirmTitle="Подтверждить Изменения"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Сохранять проекторы при выходе"
 Basic.Settings.General.SwitchOnDoubleClick="Переход к сцене при двойном щелчке"
 Basic.Settings.General.StudioPortraitLayout="Включить портретное/вертикальное расположение"
+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="Горизонтально, вверху"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Горизонтально, внизу"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Вертикально, слева"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Вертикально, справа"
+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="Тип вещания"
@@ -635,6 +649,9 @@
 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="При запуске стрима проверьте, поддерживает ли ваш сервис потокового вещания объемный звук (как запись, так и воспроизведение). Twitch, Facebook 360 Live, Mixer RTMP, Smashcast — примеры сервисов, полностью поддерживающих объемное звучание. Несмотря на то, что Facebook Live и Youtube Live принимают объёмный звук, Facebook Live микширует его в стерео, а Youtube Live воспроизводит только два канала.\n\nЗвуковые фильтры OBS совместимы с объемным звучанием, хотя поддержка плагинов VST не гарантируется."
 Basic.Settings.Audio.MultichannelWarning.Title="Включить объемный звук?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Привязать к IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Включить новый сетевой код"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Режим низкой задержки"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Отключить горячие клавиши, если главное окно находится в фокусе"
 
 Basic.AdvAudio="Расширенные свойства аудио"
 Basic.AdvAudio.Name="Название"
@@ -749,3 +767,12 @@
 FinalScene.Title="Удалить сцену"
 FinalScene.Text="Здесь должна быть по крайней мере одна сцена."
 
+NoSources.Title="Нет источников"
+NoSources.Text="Похоже, вы еще не добавили ни одного источника. Вы будете выводить только пустой экран. Вы уверены, что хотите этого?"
+NoSources.Text.AddSource="Вы можете добавить источники, нажав иконку + под окном Источники в главном окне в любое время."
+
+ChangeBG="Установить цвет"
+CustomColor="Пользовательский цвет"
+
+BrowserSource.EnableHardwareAcceleration="Включить аппаратное ускорение Браузера"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/sk-SK.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/sk-SK.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Náhľad"
 StudioMode.Program="Program"
 ShowInMultiview="Zobraziť v Multiview"
+VerticalLayout="Vertikálne rozloženie"
+Group="Skupina"
 
 AlreadyRunning.Title="OBS je už spustený"
 AlreadyRunning.Text="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ží."
@@ -112,28 +114,41 @@
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 alebo 30, ale radšej vysoké rozlíšenie"
 Basic.AutoConfig.VideoPage.CanvasExplanation="Poznámka: rozlíšenie (základné) plátna nie je nevyhnutne rovnaké ako rozlíšenie v ktorom budete streamovať alebo nahrávať. Skutočné streamovacie/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.Service="Služba"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Zobraziť všetky..."
 Basic.AutoConfig.StreamPage.Server="Server"
 Basic.AutoConfig.StreamPage.StreamKey="Streamovací kľúč"
 Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Odkaz)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Odhadnúť bitrate pomocou testu rýchlosti pripojenia (môže to trvať pár minút)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferovať hardvérové enkódovanie"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardwarové enkódovanie eliminuje väčšinu využitia CPU, ale na dosiahnutie rovnakej kvality videa môže vyžadovať väčší bitrate."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Upozornenie o streame"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Test rýchlosti pripojenia vysiela obraz bez zvuku s náhodnými dátami. Odporúčame dočasne zakázať záznam vysielaní a nastaviť živý prenos ako súkromný, kým sa celý test nedokončí. Pokračovať?"
 Basic.AutoConfig.TestPage="Konečné výsledky"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Program práve vykonáva sériu testov pre odhad optimálneho nastavenia"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Testovanie dokončené"
+Basic.AutoConfig.TestPage.TestingBandwidth="Prebieha testovanie rýchlosti pripojenia. Toto môže chvíľku trvať..."
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Pripájanie k: %1..."
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Nepodarilo sa pripojiť k žiadnemu serveru. Skontrolujte vaše internetové pripojenie a skúste to znovu."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Testovanie rýchlosti pripojenia pre: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="Testovanie streamovacieho enkodéra, toto môže trvať minútu..."
 Basic.AutoConfig.TestPage.TestingRecordingEncoder="Testovanie nahrávacieho enkodéra, toto môže trvať minútu..."
 Basic.AutoConfig.TestPage.TestingRes="Testovanie rozlíšení, toto môže trvať niekoľko minút..."
 Basic.AutoConfig.TestPage.TestingRes.Fail="Nepodarilo sa spustiť enkodér"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="Testovanie %1x%2 %3 FPS..."
-Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streamovací Enkodér"
-Basic.AutoConfig.TestPage.Result.RecordingEncoder="Nahrávací Enkodér"
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Kodér vysielania"
+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.Stats="Štatistiky"
 Basic.Stats.CPUUsage="Využitie CPU"
 Basic.Stats.HDDSpaceAvailable="Dostupné miesto na HDD"
 Basic.Stats.MemoryUsage="Využitie pamäte"
+Basic.Stats.AverageTimeToRender="Priemerný čas vykreslenia snímku"
+Basic.Stats.SkippedFrames="Preskočené snímky kvôli chybe kódovania"
+Basic.Stats.MissedFrames="Nevyužité snímky kvôli chybe vykresľovania"
 Basic.Stats.Output.Stream="Stream"
 Basic.Stats.Output.Recording="Nahrávanie"
 Basic.Stats.Status="Stav"
@@ -151,15 +166,23 @@
 Updater.RemindMeLater="Pripomenúť neskôr"
 Updater.Skip="Preskočiť verziu"
 Updater.Running.Title="Program momentálne aktívny"
+Updater.Running.Text="Niektoré výstupy sú stále aktívne. Zastavte ich pred ďalším pokusom o aktualizáciu"
 Updater.NoUpdatesAvailable.Title="Neboli nájdené žiadne aktualizácie"
 Updater.NoUpdatesAvailable.Text="Nie sú momentálne k dispozícii žiadne aktualizácie"
 Updater.FailedToLaunch="Nepodarilo sa spustiť aktualizátor"
 Updater.GameCaptureActive.Title="Zachytenie hry aktívne"
+Updater.GameCaptureActive.Text="Knižnica pre záznam hier je stále aktívna. Ukončite, prosím, všetky snímané hry/programy (alebo reštartujte Windows) a skúste to znovu."
 
+QuickTransitions.SwapScenes="Prehodiť scény po prechode"
+QuickTransitions.SwapScenesTT="Prehodí scény pre náhľad a výstup po prechode (ak pôvodná scéna výstupu stále existuje).\nToto nevráti žiadne zmeny vykonané v pôvodnej scéne pre výstup."
 QuickTransitions.DuplicateScene="Duplikovať scénu"
+QuickTransitions.DuplicateSceneTT="Pri úprave rovnakej scény umožňuje úpravu pozície/viditeľnosti zdrojov bez úpravy výstupu.\nPre úpravu vlastností zdrojov bez úpravy výstupu povoľte možnosť \"Duplikovať zdroje\".\nZmena tejto hodnoty spôsobí vyresetovanie súčasnej scény výstupu (ak stále existuje)."
 QuickTransitions.EditProperties="Duplikovať zdroje"
+QuickTransitions.EditPropertiesTT="Pri úprave rovnakej scény umožňuje nastavenie zdrojov bez úpravy výstupu.\nTáto funkcia môže byť použitá, len ak je zapnutá možnosť \"Duplikovať scénu\".\nNiektoré zdroje (napr. zdroje záznamu či mediálne zdroje) túto funkciu nepodporujú a nemôžu byť upravované samostatne.\nPo zmene tejto hodnoty bude súčasná scéna výstupu vyresetovaná (ak stále existuje).\n\nVarovanie: Z dôvodu duplikácie zdrojov môže táto funkcia vyžadovať viac systémových prostriedkov."
 QuickTransitions.HotkeyName="Rýchly prechod: %1"
 
+Basic.AddTransition="Pridať nastaviteľný prechod"
+Basic.RemoveTransition="Odstrániť nastaviteľný prechod"
 Basic.TransitionProperties="Vlastnosti prechodu"
 Basic.SceneTransitions="Prechody medzi scénami"
 Basic.TransitionDuration="Trvanie"
@@ -193,56 +216,85 @@
 Output.StartStreamFailed="Nepodarilo sa spustiť streamovanie"
 Output.StartRecordingFailed="Nepodarilo sa spustiť nahrávanie"
 Output.StartReplayFailed="Nepodarilo sa spustiť medzipamäť znovunahrávania"
+Output.StartFailedGeneric="Nastala chyba pri spúšťaní nahrávania. Podrobnosti nájdete v textovom logu.\n\nPoznámka: Ak používate NVENC alebo AMD enkodér, uistite sa, že používate najnovšiu verziu grafického ovládača."
 
 Output.ConnectFail.Title="Spojenie sa nepodarilo"
 Output.ConnectFail.BadPath="Neplatná cesta alebo URL. Prosím, skontrolujte, či sú vaše nastavenia správne."
 Output.ConnectFail.ConnectFailed="Spojenie so serverom sa nepodarilo"
+Output.ConnectFail.InvalidStream="K nastavenému kanálu alebo kľúču sa nedá pristupovať. Skontrolujte, prosím, či je váš vysielací kľúč správny. Ak áno, mohol nastať problém s pripojením k serveru."
+Output.ConnectFail.Error="Pri pokuse o pripojenie k serveru nastala neočakávaná chyba.  Ďalšie informácie nájdete v textovom logu."
 Output.ConnectFail.Disconnected="Odpojený od servera."
 
 Output.RecordFail.Title="Nepodarilo sa spustiť nahrávanie"
+Output.RecordFail.Unsupported="Výstupný formát nie je podporovaný alebo nepodporuje viac ako jednu zvukovú stopu. Skontrolujte nastavenia a skúste to znovu."
 Output.RecordNoSpace.Title="Nedostatok miesta na disku"
+Output.RecordNoSpace.Msg="Pre pokračovanie nahrávania nie je dostatok miesta na disku."
 Output.RecordError.Title="Chyba nahrávania"
+Output.RecordError.Msg="Pri nahrávaní došlo k nešpecifikovanej chybe."
 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. 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.CopyURL="Kopírovať URL"
 LogReturnDialog.ErrorUploadingLog="Chyba pri nahrávaní súboru denníka chýb"
 
 LicenseAgreement="Licenčná zmluva"
+LicenseAgreement.PleaseReview="Pred použitím OBS si, prosím, prečítajte licenčné podmienky. Používaním tohto programu potvrdzujete, že ste si prečítali a súhlasíte s podmienkami <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a>. Pre zobrazenie zvyšku licencie prejdite nižšie."
+LicenseAgreement.ClickIAgreeToContinue="Ak súhlasíte s podmienkami licencie, kliknite na Súhlasím.  Pred začatím používania OBS musíte súhlasiť s ujednaním."
 LicenseAgreement.IAgree="Súhlasím"
 LicenseAgreement.Exit="Ukončiť"
 
 Remux.SourceFile="OBS nahrávka"
 Remux.TargetFile="Cieľový súbor"
+Remux.Remux="Previesť"
 Remux.OBSRecording="OBS nahrávanie"
+Remux.FinishedTitle="Prevod dokončený"
+Remux.Finished="Nahrávka prevedená"
+Remux.FinishedError="Nahrávka prevedená, ale súbor nemusí byť kompletný"
 Remux.SelectRecording="Vybrať OBS nahrávku …"
 Remux.SelectTarget="Vyberte cieľový súbor …"
 Remux.FileExistsTitle="Cieľový súbor existuje"
 Remux.FileExists="Cieľový súbor už existuje, chcete ho nahradiť?"
+Remux.ExitUnfinishedTitle="Prebieha prevod"
+Remux.ExitUnfinished="Prevod nie je dokončený. Zastavenie môže spôsobiť poškodenie výstupného súboru.\nNaozaj chcete prevod prerušiť?"
 
 UpdateAvailable="Je dostupná aktualizácia"
 UpdateAvailable.Text="Verzia %1.%2.%3 je dostupná. <a href='%4'>Kliknite sem na jej stiahnutie</a>"
 
+Basic.DesktopDevice1="Zvuk plochy"
+Basic.DesktopDevice2="Zvuk plochy 2"
 Basic.AuxDevice1="Mik/Aux"
 Basic.AuxDevice2="Mik/Aux 2"
+Basic.AuxDevice3="Mikrofon / AUX 3"
+Basic.AuxDevice4="Mikrofon / AUX 4"
 
 Basic.Scene="Scéna"
 Basic.DisplayCapture="Zachytávanie monitora"
 
 Basic.Main.PreviewConextMenu.Enable="Zapnúť náhľad"
 
+ScaleFiltering="Filter škálovania"
 ScaleFiltering.Point="Bodové"
 ScaleFiltering.Bilinear="Bilineárne"
 ScaleFiltering.Bicubic="Bikubické"
 ScaleFiltering.Lanczos="Lanczos"
 
 Deinterlacing="Odstránenie prekladania"
+Deinterlacing.Discard="Zahodenie"
 Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Prechod"
+Deinterlacing.Blend2x="Prechod 2x"
+Deinterlacing.Linear="Lineárny"
+Deinterlacing.Linear2x="Lineárny 2x"
 Deinterlacing.Yadif="Yadif"
 Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Najprv vrchný riadok"
+Deinterlacing.BottomFieldFirst="Najprv spodný riadok"
 
+VolControl.SliderUnmuted="Posuvník hlasitosti pre '%1': %2"
 VolControl.SliderMuted="Ovládanie hlasitosti pre '%1': %2 (momentálne umlčané)"
 VolControl.Mute="Umlčať '%1'"
 VolControl.Properties="Vlastnosti pre '%1'"
@@ -252,12 +304,18 @@
 
 Basic.Main.DefaultSceneName.Text="Scéna %1"
 
+Basic.Main.AddSceneCollection.Title="Pridať sadu scén"
+Basic.Main.AddSceneCollection.Text="Prosím, zadajte názov sady scén"
 
+Basic.Main.RenameSceneCollection.Title="Premenovať sadu scén"
 
 AddProfile.Title="Pridanie profilu"
+AddProfile.Text="Prosím, zadajte názov profilu"
 
 RenameProfile.Title="Premenovať profil"
 
+Basic.Main.MixerRename.Title="Premenovať zdroj zvuku"
+Basic.Main.MixerRename.Text="Prosím, zadajte názov zdroja zvuku"
 
 
 Basic.Main.PreviewDisabled="Náhľad je momentálne vypnutý"
@@ -265,6 +323,7 @@
 Basic.SourceSelect="Vytvoriť/Vybrať zdroj"
 Basic.SourceSelect.CreateNew="Vytvoriť nový"
 Basic.SourceSelect.AddExisting="Pridať existujúci"
+Basic.SourceSelect.AddVisible="Zviditeľniť zdroj"
 
 Basic.PropertiesWindow="Vlastnosti pre '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (Automatický výber: %2)"
@@ -279,8 +338,11 @@
 Basic.PropertiesWindow.AddEditableListDir="Pridať adresár do '%1'"
 Basic.PropertiesWindow.AddEditableListFiles="Pridať súbory do '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Pridať položku do '%1'"
+Basic.PropertiesWindow.EditEditableListEntry="Upraviť položku z '%1'"
 
 Basic.PropertiesView.FPS.Simple="Jednoduché hodnoty FPS"
+Basic.PropertiesView.FPS.Rational="Rozumné hodnoty FPS"
+Basic.PropertiesView.FPS.ValidFPSRanges="Platné rozsahy FPS:"
 
 Basic.InteractionWindow="V interakcii s '%1'"
 
@@ -295,6 +357,7 @@
 Basic.Filters="Filtre"
 Basic.Filters.AsyncFilters="Audio/Video filtre"
 Basic.Filters.AudioFilters="Audio filtre"
+Basic.Filters.EffectFilters="Filtre efektov"
 Basic.Filters.Title="Filtre pre '%1'"
 Basic.Filters.AddFilter.Title="Názov filtra"
 Basic.Filters.AddFilter.Text="Prosím, zadajte názov filtra"
@@ -335,16 +398,24 @@
 Basic.Main.Controls="Ovládacie prvky"
 Basic.Main.Connecting="Pripájanie..."
 Basic.Main.StartRecording="Spustiť nahrávanie"
+Basic.Main.StartReplayBuffer="Spustiť Replay Buffer"
 Basic.Main.StartStreaming="Spustiť stream"
 Basic.Main.StopRecording="Ukončiť nahrávanie"
 Basic.Main.StoppingRecording="Zastavenie nahrávania..."
+Basic.Main.StopReplayBuffer="Zastaviť Replay Buffer"
+Basic.Main.StoppingReplayBuffer="Zastavujem Replay Buffer..."
 Basic.Main.StopStreaming="Ukončiť stream"
 Basic.Main.StoppingStreaming="Zastavenie streamu..."
+Basic.Main.ForceStopStreaming="Zastaviť vysielanie (bez oneskorenia)"
+Basic.Main.Group="Skupina %1"
+Basic.Main.GroupItems="Zoskupiť vybrané položky"
+Basic.Main.Ungroup="Rozdeliť skupinu"
 
 Basic.MainMenu.File="Súbor (&F)"
 Basic.MainMenu.File.Export="&Exportovať"
 Basic.MainMenu.File.Import="&Importovať"
 Basic.MainMenu.File.ShowRecordings="Zobraziť nah&rávky"
+Basic.MainMenu.File.Remux="Previesť &nahrávky"
 Basic.MainMenu.File.Settings="Na&stavenia"
 Basic.MainMenu.File.ShowSettingsFolder="Zobraziť priečinok nastavení"
 Basic.MainMenu.File.ShowProfileFolder="Zobraziť priečinok profilu"
@@ -357,6 +428,8 @@
 Basic.MainMenu.Edit.UndoAction="Vrátiť $1 (&U)"
 Basic.MainMenu.Edit.RedoAction="Opakovať $1 (&R)"
 Basic.MainMenu.Edit.LockPreview="&Zámknúť náhľad"
+Basic.MainMenu.Edit.Scale="%Rozmer náhľadu"
+Basic.MainMenu.Edit.Scale.Window="Vtesnať do okna"
 Basic.MainMenu.Edit.Scale.Canvas="Plátno (%1x%2)"
 Basic.MainMenu.Edit.Scale.Output="Výstup (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Transformácia"
@@ -377,24 +450,42 @@
 Basic.MainMenu.Edit.Order.MoveDown="Posunúť nižšie (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Premies&tniť navrch"
 Basic.MainMenu.Edit.Order.MoveToBottom="Premiestniť naspodok (&B)"
+Basic.MainMenu.Edit.AdvAudio="Rozšírené vl&astnosti zvuku"
 
+Basic.MainMenu.View="Zobraziť (&V)"
 Basic.MainMenu.View.Toolbars="&Panely s nástrojmi"
 Basic.MainMenu.View.Docks="Doky"
 Basic.MainMenu.View.Docks.ResetUI="Resetovať UI"
 Basic.MainMenu.View.Docks.LockUI="Zamknúť UI"
+Basic.MainMenu.View.Toolbars.Listboxes="Zoznamy (&L)"
+Basic.MainMenu.View.SceneTransitions="Pre&chody scén"
+Basic.MainMenu.View.StatusBar="&Stavový riadok"
+Basic.MainMenu.View.Fullscreen.Interface="Na celú obrazovku"
 
+Basic.MainMenu.SceneCollection="&Sada scén"
 Basic.MainMenu.Profile="&Profil"
 Basic.MainMenu.Profile.Import="Importovať profil"
 Basic.MainMenu.Profile.Export="Exportovať profil"
+Basic.MainMenu.SceneCollection.Import="Importovať sadu scén"
+Basic.MainMenu.SceneCollection.Export="Exportovať sadu scén"
 Basic.MainMenu.Profile.Exists="Tento profil už existuje"
+Basic.MainMenu.SceneCollection.Exists="Táto sada scén už existuje"
 
 Basic.MainMenu.Tools="Nás&troje"
 
 Basic.MainMenu.Help="Pomoc (&H)"
+Basic.MainMenu.Help.HelpPortal="&Portál pomoci"
 Basic.MainMenu.Help.Website="Navštíviť &webové stránky"
+Basic.MainMenu.Help.Discord="Pripojiť sa na &Discord server"
 Basic.MainMenu.Help.Logs="&Log súbory"
 Basic.MainMenu.Help.Logs.ShowLogs="Zobraziť log &súbory"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Nahrať súčasný súbor záznamu (&C)"
+Basic.MainMenu.Help.Logs.UploadLastLog="Nahrať posledný súbor záznamu (&L)"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="Zobraziť aktuálny záznam (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Skontrolovať aktualizácie"
+Basic.MainMenu.Help.CrashLogs="&Hlásenia o zlyhaní"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Zobraziť správy o zlyhaniach"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Nahrať poslednú správu"
 
 Basic.Settings.ProgramRestart="Tieto nastavenia sa prejavia až po reštarte programu."
 Basic.Settings.ConfirmTitle="Potvrdenie zmien"
@@ -403,11 +494,23 @@
 Basic.Settings.General="Všeobecné"
 Basic.Settings.General.Theme="Vzhľad"
 Basic.Settings.General.Language="Jazyk"
+Basic.Settings.General.EnableAutoUpdates="Automaticky kontrolovať aktualizácie pri štarte"
 Basic.Settings.General.Projectors="Projektory"
+Basic.Settings.General.HideProjectorCursor="Skryť kurzor pred náhľadmi"
+Basic.Settings.General.ProjectorAlwaysOnTop="Náhľady vždy navrchu"
+Basic.Settings.General.Snapping="Prichytávanie zdrojov"
+Basic.Settings.General.ScreenSnapping="Prichytávať zdroje k okraju obrazovky"
+Basic.Settings.General.CenterSnapping="Prichytávať zdroje ku stredu vodorovnej a zvislej osi"
+Basic.Settings.General.SourceSnapping="Prichytávať zdroje k iným zdrojom"
+Basic.Settings.General.SnapDistance="Prichytávať citlivosť"
+Basic.Settings.General.RecordWhenStreaming="Automaticky nahrávať pri vysielaní"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Nahrávať aj po ukončení vysielania"
 Basic.Settings.General.SysTray="Systémová lišta"
 Basic.Settings.General.SysTrayWhenStarted="Minimalizovať do systémovej lišty pri spustení"
 Basic.Settings.General.SystemTrayHideMinimize="Vždy minimalizovať do systémovej lišty namiesto panela úloh"
 Basic.Settings.General.SaveProjectors="Uložiť projektory pri skončení"
+Basic.Settings.General.Multiview.DrawSourceNames="Zobraziť názvy scén"
+Basic.Settings.General.Multiview.DrawSafeAreas="Vykresliť bezpečné zóny (EBU R 95)"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Typ streamu"
@@ -422,32 +525,48 @@
 Basic.Settings.Output.Mode.Simple="Jednoduchý"
 Basic.Settings.Output.Mode.Adv="Rozšírené"
 Basic.Settings.Output.Mode.FFmpeg="Výstup FFmpeg"
+Basic.Settings.Output.ReplayBuffer.Estimate="Odhadované využitie pamäte: %1 MB"
 Basic.Settings.Output.ReplayBuffer.Suffix="Prípona"
+Basic.Settings.Output.Simple.SavePath="Nahrávacia cesta"
 Basic.Settings.Output.Simple.RecordingQuality="Kvalita nahrávania"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Rovnaká ako pre stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Vysoká kvalita, stredná veľkosť súboru"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Bezstratová kvalita, ohromne veľké súbory"
-Basic.Settings.Output.Simple.Encoder.Software="Softvér (x264)"
-Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardvér (QSV)"
-Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardvér (AMD)"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Upozornenie: Dátový tok vysielaného obrazu bude nastavený na %1, čo je horná hranica pre súčasnú vysielaciu službu. Ak ste si istý, že chcete vysielať nad %1, v rozšírených nastaveniach enkodéra zakážte \"Vynútiť limit dátového toku vysielacou službou\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Upozornenie: Dátový tok vysielaného zvuku bude nastavený na %1, čo je horná hranica pre súčasnú vysielaciu službu. Ak ste si istý, že chcete vysielať nad %1, v rozšírených nastaveniach enkodéra zakážte \"Vynútiť limit dátového toku vysielacou službou\"."
+Basic.Settings.Output.Simple.Warn.Encoder="Upozornenie: Nahrávanie softvérovým enkodérom s rozdielnou kvalitou než vysielanie spôsobí zvýšenú záťaž CPU pri nahrávaní a vysielaní zároveň."
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Upozornenie: Nemôžete použiť viacero QSV kodérov pri vysielaní a nahrávaní zároveň. Ak chcete vysielať a nahrávať zároveň, zmeňte, prosím, kodér vysielania alebo kodér nahrávania."
+Basic.Settings.Output.Simple.Encoder.Software="Softvérový (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardvérový (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardvérový (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardvér (NVENC)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softvér (x264 prednastavené nízke zaťaženie CPU, zvyšuje veľkosť súboru)"
+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.RetryDelay="Čas medzi pokusmi (sekundy)"
 Basic.Settings.Output.MaxRetries="Maximálny počet pokusov"
 Basic.Settings.Output.Advanced="Povoliť pokročilé nastavenia enkodéra"
+Basic.Settings.Output.EncoderPreset="Predvoľba enkodéra (vyššie = menej CPU)"
+Basic.Settings.Output.CustomEncoderSettings="Vlastné nastavenie enkodéra"
 
+Basic.Settings.Output.Adv.Rescale="Škálovať výstup"
+Basic.Settings.Output.Adv.AudioTrack="Zvuková stopa"
+Basic.Settings.Output.Adv.Streaming="Vysielanie"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Vynútiť nastavenia kodéra vysielacou službou"
 Basic.Settings.Output.Adv.Audio.Track1="Stopa 1"
 Basic.Settings.Output.Adv.Audio.Track2="Stopa 2"
 Basic.Settings.Output.Adv.Audio.Track3="Stopa 3"
 Basic.Settings.Output.Adv.Audio.Track4="Stopa 4"
+Basic.Settings.Output.Adv.Audio.Track5="Stopa 5"
+Basic.Settings.Output.Adv.Audio.Track6="Stopa 6"
 
 Basic.Settings.Output.Adv.Recording="Nahrávanie"
 Basic.Settings.Output.Adv.Recording.Type="Typ"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Štandardný"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Vlastný výstup (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Použiť kóder vysielania)"
+Basic.Settings.Output.Adv.Recording.Filename="Formát názvu súboru"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Prepísať, ak súbor existuje"
 Basic.Settings.Output.Adv.FFmpeg.Type="Typ výstupu FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Výstup na URL"
@@ -455,18 +574,30 @@
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Bežné formáty nahrávania"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Všetky súbory"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Cesta k súboru alebo URL"
+Basic.Settings.Output.Adv.FFmpeg.Format="Formát kontajneru"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Zvuk"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Predvolený formát"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Popis formátu"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Kodér zvuku/obrazu uhádnutý z cesty súboru alebo URL adresy"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Predvolený enkodér"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Vypnúť enkodér"
-Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video Enkodér"
-Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Enkodér"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Kodér obrazu"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Nastavenie kodéra obrazu (ak existuje)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Kodér zvuku"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Nastavenie kodéra zvuku (ak existuje)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Nastavenie zmiešavača (ak existuje)"
+Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval kľúčových snímkov (snímky)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Zobraziť všetky kodeky (aj potenciálne nekompatibilné)"
 
 
+FilenameFormatting.TT="%CCYY	Rok, 4 číslice\n%YY		Rok, posledné dve cifry (00-99)\n%MM		Mesiac, čí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 %\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 desiatkové čí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 cifry (00-99)\n%Y		Rok\n%z		ISO 8601 časový posun od UTC\n%Z		Názov alebo skratka časového pásma\n"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adaptér"
+Basic.Settings.Video.BaseResolution="Základné rozlíšenie (plátno)"
+Basic.Settings.Video.ScaledResolution="Výstupné (škálované) rozlíšenie"
+Basic.Settings.Video.DownscaleFilter="Zmenšovací filter"
 Basic.Settings.Video.DisableAeroWindows="Vypnúť Aero (len Windows)"
 Basic.Settings.Video.FPS="FPS"
 Basic.Settings.Video.FPSCommon="Bežné hodnoty FPS"
@@ -478,31 +609,60 @@
 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í, 32 vzoriek)"
 
 Basic.Settings.Audio="Zvuk"
 Basic.Settings.Audio.SampleRate="Vzorkovacia frekvencia"
 Basic.Settings.Audio.Channels="Kanály"
-
+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.MultichannelWarning.Title="Povoliť priestorový zvuk?"
+Basic.Settings.Audio.MultichannelWarning.Confirm="Naozaj si želáte povoliť priestorový zvuk?"
+Basic.Settings.Audio.EnablePushToMute="Povoliť push-to-mute"
+Basic.Settings.Audio.PushToMuteDelay="Oneskorenie push-to-mute"
+Basic.Settings.Audio.EnablePushToTalk="Povoliť push-to-talk"
+Basic.Settings.Audio.PushToTalkDelay="Oneskorenie push-to-talk"
+Basic.Settings.Audio.UnknownAudioDevice="[Zariadenie nie je pripojené alebo dostupné]"
+
+Basic.Settings.Advanced="Pokročilé"
+Basic.Settings.Advanced.General.ProcessPriority="Priorita procesu"
 Basic.Settings.Advanced.General.ProcessPriority.High="Vysoká"
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Zvýšená"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Normálna"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Znížená"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Nízka"
+Basic.Settings.Advanced.FormatWarning="Upozornenie: Formáty farieb iné ako NV12 sú primárne určené na nahrávanie a nie sú odporúčane pre vysielanie. Použitie iných formátov môže spôsobiť zvýšené využitie CPU pri vysielaní kvôli prevodu medzi formátmi."
+Basic.Settings.Advanced.Audio.BufferingTime="Čas medzipamäte zvuku"
+Basic.Settings.Advanced.Video.ColorFormat="Formát farieb"
 Basic.Settings.Advanced.Video.ColorSpace="Farebný priestor YUV"
 Basic.Settings.Advanced.Video.ColorRange="Rozsah farieb YUV"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Čiastočný"
 Basic.Settings.Advanced.Video.ColorRange.Full="Úplný"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Predvolené"
+Basic.Settings.Advanced.StreamDelay="Oneskorenie vysielania"
+Basic.Settings.Advanced.StreamDelay.Duration="Trvanie (sekundy)"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Odhadované využitie pamäte: %1 MB"
+Basic.Settings.Advanced.Network="Sieť"
 Basic.Settings.Advanced.Network.BindToIP="Zviazať s IP adresou"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Použiť nový sieťový kód"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Režim nízkej odozvy"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Zakázať klávesové skratky, keď je hlavné okno aktívne"
 
+Basic.AdvAudio="Pokročilé nastavenia zvuku"
 Basic.AdvAudio.Name="Názov"
 Basic.AdvAudio.Volume="Hlasitosť (%)"
 Basic.AdvAudio.Mono="Previesť na Mono"
+Basic.AdvAudio.AudioTracks="Stopy"
 
 Basic.Settings.Hotkeys="Klávesové skratky"
+Basic.Settings.Hotkeys.Pair="Klávesové skratky pre \"%1\" slúžia ako prepínače"
 
+Basic.Hotkeys.SelectScene="Prepnúť na scénu"
 
 Basic.SystemTray.Show="Ukázať"
 Basic.SystemTray.Hide="Skryť"
@@ -531,9 +691,28 @@
 Hotkeys.Menu="Menu"
 Hotkeys.Space="Medzerník"
 Hotkeys.NumpadNum="Numerická klávesa %1"
+Hotkeys.AppleKeypadNum="%1 (num. klávesnica)"
+Hotkeys.AppleKeypadMultiply="* (num. klávesnica)"
+Hotkeys.AppleKeypadDivide="/ (num. klávesnica)"
+Hotkeys.AppleKeypadAdd="+ (num. klávesnica)"
+Hotkeys.AppleKeypadSubtract="- (num. klávesnica)"
+Hotkeys.AppleKeypadDecimal=". (num. klávesnica)"
+Hotkeys.AppleKeypadEqual="= (num. klávesnica)"
+Hotkeys.MouseButton="Tlačidlo myši %1"
 
+Mute="Stlmiť"
+Unmute="Zrušiť stlmenie"
 
 
 
 FinalScene.Title="Odstrániť scénu"
+FinalScene.Text="Musí existovať aspoň jedna scéna."
+
+NoSources.Title="Žiadne zdroje"
+NoSources.Text="Nepridali ste žiadne zdroje obrazu, takže výstup bude prázdny. Naozaj chcete pokračovať?"
+NoSources.Text.AddSource="Zdroje môžete kedykoľvek pridať kliknutím na ikonu + v zozname zdrojov v hlavnom okne."
+
+ChangeBG="Nastaviť farbu"
+CustomColor="Vlastná farba"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/sl-SI.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/sl-SI.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/sq-AL.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/sq-AL.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/sr-CS.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/sr-CS.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/sr-SP.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/sr-SP.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/sv-SE.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/sv-SE.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Förhandsvisning"
 StudioMode.Program="Program"
 ShowInMultiview="Visa i multivy"
+VerticalLayout="Vertikal layout"
+Group="Grupp"
 
 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."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Sluta strömma"
 Basic.Main.StoppingStreaming="Stoppar ström..."
 Basic.Main.ForceStopStreaming="Sluta strömma (ignorera fördröjning)"
+Basic.Main.Group="Grupp %1"
+Basic.Main.GroupItems="Gruppmarkerade föremål"
+Basic.Main.Ungroup="Avgruppera"
 
 Basic.MainMenu.File="&Arkiv"
 Basic.MainMenu.File.Export="&Exportera"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Hjälp"
 Basic.MainMenu.Help.HelpPortal="Hjälp&portal"
 Basic.MainMenu.Help.Website="Besök &webbplats"
+Basic.MainMenu.Help.Discord="Anslut till &Discord-servern"
 Basic.MainMenu.Help.Logs="&Loggfiler"
 Basic.MainMenu.Help.Logs.ShowLogs="&Visa loggfiler"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Ladda upp &aktuell loggfil"
 Basic.MainMenu.Help.Logs.UploadLastLog="Ladda upp &senaste loggfil"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Visa Aktuell Logg"
 Basic.MainMenu.Help.CheckForUpdates="Sök efter uppdateringar"
+Basic.MainMenu.Help.CrashLogs="Krasch&rapporter"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="&Visa kraschrapporter"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Ladda upp &senaste kraschrapport"
 
 Basic.Settings.ProgramRestart="Du måste starta om programmet för att ändringarna ska träda i kraft."
 Basic.Settings.ConfirmTitle="Bekräfta ändringar"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Spara projektorer vid avslut"
 Basic.Settings.General.SwitchOnDoubleClick="Övergång till scen vid dubbelklick"
 Basic.Settings.General.StudioPortraitLayout="Aktivera porträtt-/vertikalt utseende"
+Basic.Settings.General.Multiview="Multivy"
+Basic.Settings.General.Multiview.MouseSwitch="Klicka för att byta mellan scener"
+Basic.Settings.General.Multiview.DrawSourceNames="Visa scennamn"
+Basic.Settings.General.Multiview.DrawSafeAreas="Rita ut säkra områden (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Utseende för multivy"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horisontal, överkant"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horisontal, nederkant"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikal, vänster"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikal, höger"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horisontal, överkant (8 scener)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horisontal, nederkant (8 scener)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertikal, vänsterkant (8 scener)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikal, högerkant (8 scener)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horisontal, överkant (24 scener)"
 
 Basic.Settings.Stream="Ström"
 Basic.Settings.Stream.StreamType="Strömtyp"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Snabb"
 Basic.Settings.Audio.MeterDecayRate.Medium="Medium (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Långsam (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="Typ av maxpunktsmätare"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Samplingsmaxpunkt"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Sann maxpunkt (högre CPU-användning)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="VARNING: Surroundljud är aktiverat."
 Basic.Settings.Audio.MultichannelWarning="Om du strömmar, se till att kolla om din strömtjänst stöder både inmatning och uppspelning av surroundljud. Twitch, 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.Title="Aktivera surroundljud?"
@@ -661,7 +678,7 @@
 Basic.Settings.Advanced.Audio.BufferingTime="Ljudbuffringstid"
 Basic.Settings.Advanced.Video.ColorFormat="Färgformat"
 Basic.Settings.Advanced.Video.ColorSpace="YUV-färgrymd"
-Basic.Settings.Advanced.Video.ColorRange="YUV färgområde"
+Basic.Settings.Advanced.Video.ColorRange="YUV-färgområde"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Partiell"
 Basic.Settings.Advanced.Video.ColorRange.Full="Full"
 Basic.Settings.Advanced.Audio.MonitoringDevice="Ljuduppspelningsenhet"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Bind till IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktivera ny nätverkskod"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Låg latens-läge"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Inaktivera kortkommandon när fokus ligger i huvudfönstret"
 
 Basic.AdvAudio="Avancerade ljudinställningar"
 Basic.AdvAudio.Name="Namn"
@@ -749,3 +767,12 @@
 FinalScene.Title="Radera scen"
 FinalScene.Text="Det måste finnas minst en scen."
 
+NoSources.Title="Inga källor"
+NoSources.Text="Det verkar som om du inte har lagt till några videokällor än, så du kommer endast att visa en tom skärm. Är du säker på att du vill göra detta?"
+NoSources.Text.AddSource="Du kan lägga till källor genom att klicka på plusikonen under rutan \"källor\" i huvudfönstret när som helst."
+
+ChangeBG="Ändra färg"
+CustomColor="Anpassad färg"
+
+BrowserSource.EnableHardwareAcceleration="Aktiverar webbläsarkällans hårdvaruaccelerering"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/ta-IN.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/ta-IN.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/th-TH.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/th-TH.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/tl-PH.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/tl-PH.ini Changed

obs-studio-21.1.2.tar.xz/UI/data/locale/tr-TR.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/tr-TR.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="Önizleme"
 StudioMode.Program="Program"
 ShowInMultiview="Çoklu Ekranda Göster"
+VerticalLayout="Dikey Düzen"
+Group="Grup"
 
 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."
@@ -209,7 +211,7 @@
 
 ConfirmRemove.Title="Kaldırmayı Onayla"
 ConfirmRemove.Text="'$1''i kaldırmak istediğinizden emin misiniz?"
-ConfirmRemove.TextMultiple="%1 öğeyi kaldırmak istediğinizden emin misiniz?"
+ConfirmRemove.TextMultiple="%1 ögeyi kaldırmak istediğinizden emin misiniz?"
 
 Output.StartStreamFailed="Yayın başlatılamadı"
 Output.StartRecordingFailed="Kayıt başlatılamadı"
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Yayını Durdur"
 Basic.Main.StoppingStreaming="Canlı Yayın Durduruluyor..."
 Basic.Main.ForceStopStreaming="Yayını Durdur (gecikmeyi yoksay)"
+Basic.Main.Group="Grup %1"
+Basic.Main.GroupItems="Seçilen Ögeleri Grupla"
+Basic.Main.Ungroup="Grubu Çöz"
 
 Basic.MainMenu.File="&Dosya"
 Basic.MainMenu.File.Export="Dışa Aktar"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Yardım"
 Basic.MainMenu.Help.HelpPortal="Yardım &Portalı"
 Basic.MainMenu.Help.Website="&Siteyi Ziyaret Et"
+Basic.MainMenu.Help.Discord="&Discord Sunucusuna Katıl"
 Basic.MainMenu.Help.Logs="&Günlük Dosyaları"
 Basic.MainMenu.Help.Logs.ShowLogs="&Günlük Dosyalarını Göster"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Mevcut Günlük Dosyasını Karşıya Yükle"
 Basic.MainMenu.Help.Logs.UploadLastLog="&Son Günlük Dosyasını Karşıya Yükle"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Şimdiki Günlüğü Göster"
 Basic.MainMenu.Help.CheckForUpdates="Güncellemeleri Denetle"
+Basic.MainMenu.Help.CrashLogs="Çökme &Raporları"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="Çökme Raporlarını &Göster"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Son Çökme Raporunu Yükle"
 
 Basic.Settings.ProgramRestart="Programın, bu ayarların etkinleşmesi için yeniden başlatılması gerekir."
 Basic.Settings.ConfirmTitle="Değişiklikleri Onayla"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Çıkışta projektörleri kaydet"
 Basic.Settings.General.SwitchOnDoubleClick="Çift tıklamada sahneye geçiş yap"
 Basic.Settings.General.StudioPortraitLayout="Dikey düzeni etkinleştir"
+Basic.Settings.General.Multiview="Çoklu görüntü"
+Basic.Settings.General.Multiview.MouseSwitch="Sahneler arası geçiş için tıkla"
+Basic.Settings.General.Multiview.DrawSourceNames="Sahne adlarını göster"
+Basic.Settings.General.Multiview.DrawSafeAreas="Güvenli alanları (EBU R 95) çiz"
 Basic.Settings.General.MultiviewLayout="Çoklu Görüntü Düzeni"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Yatay, Üst"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Yatay, Alt"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Dikey, Sol"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Dikey, Sağ"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Yatay, Üst (8 Sahne)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Yatay, Alt (8 Sahne)"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="Dikey, Sol (8 Sahne)"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="Dikey, Sağ (8 Sahne)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Yatay, Üst (24 Sahne)"
 
 Basic.Settings.Stream="Yayın"
 Basic.Settings.Stream.StreamType="Yayın Türü"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Hızlı"
 Basic.Settings.Audio.MeterDecayRate.Medium="Orta (Tür I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Yavaş (Tür II PPM)"
+Basic.Settings.Audio.PeakMeterType="Tepe Ölçer Türü"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="Örnek Tepe"
+Basic.Settings.Audio.PeakMeterType.TruePeak="Gerçek Tepe (Daha yüksek CPU kullanımı)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="Uyarı: Surround ses etkin."
 Basic.Settings.Audio.MultichannelWarning="Yayın yapılıyorsa, yayın hizmetinizin hem surround ses alınımını hem de surround ses geri oynatımını desteklediğinden emin olun. Twitch, 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.Title="Surround ses etkinleştirilsin mi?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="IP Bağla"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Yeni ağ kodunu etkinleştir"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Düşük gecike modu"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Ana pencere odaktayken kısayol tuşlarını devre dışı bırak"
 
 Basic.AdvAudio="Gelişmiş Ses Özellikleri"
 Basic.AdvAudio.Name="İsim"
@@ -749,3 +767,12 @@
 FinalScene.Title="Sahneyi Sil"
 FinalScene.Text="En az bir sahne olması gerekiyor."
 
+NoSources.Title="Kaynak Yok"
+NoSources.Text="Henüz hiç video kaynağı eklemediniz gibi görünüyor, bu yüzden sadece boş bir ekran çıktısı alacaksınız. Bunu yapmak istediğinize emin misiniz?"
+NoSources.Text.AddSource="Ana pencerede Kaynaklar kutusundaki + simgesine tıklayarak istediğiniz zaman kaynak ekleyebilirsiniz."
+
+ChangeBG="Renk Ayarla"
+CustomColor="Özel Renk"
+
+BrowserSource.EnableHardwareAcceleration="Tarayıcı Kaynak Donanım Hızlandırmasını Etkinleştir"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/uk-UA.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/uk-UA.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="вікно Перегляду"
 StudioMode.Program="Програма наживо"
 ShowInMultiview="Показувати у Мульти-перегляді"
+VerticalLayout="Вертикальне компонування"
+Group="Група"
 
 AlreadyRunning.Title="OBS вже виконується"
 AlreadyRunning.Text="OBS вже запущено! Тільки якщо ви дійсно не намагаєтесь цього зробити, будь ласка позакривайте всі відкриті OBS перед тим як запускати нову копію. Якщо OBS налаштовано згортатися в трей, перевірте чи не виконується він там й досі."
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="Закінчити трансляцію"
 Basic.Main.StoppingStreaming="Припинення трансляції..."
 Basic.Main.ForceStopStreaming="Закінчити трансляцію (миттєво)"
+Basic.Main.Group="Група %1"
+Basic.Main.GroupItems="Згрупувати вибрані елементи"
+Basic.Main.Ungroup="Розгрупувати"
 
 Basic.MainMenu.File="&Файл"
 Basic.MainMenu.File.Export="&Експорт"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="&Довідка"
 Basic.MainMenu.Help.HelpPortal="&Портал з допомоги"
 Basic.MainMenu.Help.Website="Відвідати &сайт"
+Basic.MainMenu.Help.Discord="Приє&днатися до серверу 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="Звіти про &збої"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="П&оказати звіти про збої"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="Заванта&жити на сервер останній звіт про збій"
 
 Basic.Settings.ProgramRestart="Програма потребує перезапуску, щоб нові налаштування набрали сили."
 Basic.Settings.ConfirmTitle="Підтвердження змін"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="Зберегти налаштування режиму Проектор при виході"
 Basic.Settings.General.SwitchOnDoubleClick="Відео-перехід до сцени за подвійним клацанням"
 Basic.Settings.General.StudioPortraitLayout="Увімкнути портретне/вертикальне компонування"
+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="Горизонтально, зверху"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Горизонтально, внизу"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Вертикально, ліворуч"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Вертикально, праворуч"
+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="Тип Трансляції"
@@ -635,6 +649,9 @@
 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="Якщо робите трансляції, перевірте чи підтримує ваш сервіс трансляцій об'ємний звук на вході та виході.  Twitch, Facebook 360 Live, Mixer RTMP, Smashcast - це приклади сервісів де об'ємний звук цілком підтримується. Навпаки, Facebook Live і YouTube Live обидва підтримують вхідний об'ємний звук, але Facebook Live мікшує його до стерео, а YouTube Live відтворює лише два канали.\n\nАудіо фільтри самої OBS сумісні з об'ємним звуком, хоча підтримку VST плагінами не гарантовано."
 Basic.Settings.Audio.MultichannelWarning.Title="Увімкнути об'ємний звук для виводу аудіо?"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="Прив'язати до адаптера (IP)"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Увімкнути новий мережевий код"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Режим з низькою затримкою"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Відключати гарячі клавіші, коли головне вікно знаходиться у фокусі"
 
 Basic.AdvAudio="Розширені Налаштування Аудіо"
 Basic.AdvAudio.Name="Назва"
@@ -749,3 +767,12 @@
 FinalScene.Title="Видалення сцени"
 FinalScene.Text="Повинна бути принаймні одна сцена."
 
+NoSources.Title="Немає Джерел"
+NoSources.Text="Схоже, що ви не ще додали будь-якого відео Джерела. Таким чином на виводі буде лише порожній екран. Ви справді бажаєте це зробити?"
+NoSources.Text.AddSource="Ви можете будь-коли додати Джерела, натиснувши на значок (+) під панеллю Джерела в головному вікні."
+
+ChangeBG="Позначити кольором"
+CustomColor="Особливий колір"
+
+BrowserSource.EnableHardwareAcceleration="Задіяти апаратне прискорення для джерела 'Браузер'"
+

obs-studio-22.0.1.tar.xz/UI/data/locale/ur-PK.ini Added

@@ -0,0 +1,136 @@
+
+Language="انگلش"
+Region="متحدہ ریاستوں"
+
+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="Multiview (پورے اسکرین)"
+MultiviewWindowed="Multi view (دریچہ شدہ)"
+Clear="واضح"
+Revert="واپس"
+Show="دکھائیں"
+Hide="چھپائیں"
+UnhideAll="سب کو چھوڑ دو"
+Untitled="غیر خطاب یافتہ"
+New="نیا"
+Duplicate="دونا کرنا"
+Enable="قابل کریں"
+DisableOSXVSync="OSX V-Sync کو غیر فعال کریں"
+ResetOSXVSyncOnExit="باہر نکلیں پرOSX V-Sync ری سیٹ کریں"
+HighResourceUsage="انکوڈنگ زیادہ اوورلوڈ! ویڈیو ترتیبات کو تبدیل کرنے یا تیزی سے انکوڈنگ کے پیش سیٹ کا استعمال کرتے ہوئے غور کریں."
+Transition="منتقلی"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/vi-VN.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/vi-VN.ini Changed

@@ -66,8 +66,10 @@
 Next="Tiếp tục"
 Back="Quay lại"
 Defaults="Mặc định"
+None="Không có"
 StudioMode.Preview="Xem trước"
 StudioMode.Program="Chương trình"
+Group="Nhóm"
 
 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."
@@ -292,6 +294,8 @@
 
 RenameProfile.Title="Đổi tên cấu hình"
 
+Basic.Main.MixerRename.Title="Đổi tên nguồn âm thanh"
+Basic.Main.MixerRename.Text="Hãy nhập tên nguồn âm thanh"
 
 
 Basic.Main.PreviewDisabled="Xem trước hiện đang vô hiệu hoá"
@@ -383,6 +387,7 @@
 Basic.Main.StopStreaming="Ngừng Stream"
 Basic.Main.StoppingStreaming="Đang dừng stream..."
 Basic.Main.ForceStopStreaming="Ngừng Stream (huỷ chậm trễ)"
+Basic.Main.Group="Nhóm %1"
 
 Basic.MainMenu.File="&Tập tin"
 Basic.MainMenu.File.Export="&Xuất"
@@ -472,10 +477,6 @@
 Basic.Settings.General.SystemTrayHideMinimize="Luôn luôn thu nhỏ về khay hệ thống thay vì thanh tác vụ"
 Basic.Settings.General.StudioPortraitLayout="Bật bố cục theo chiều ngang/dọc"
 Basic.Settings.General.MultiviewLayout="Giao diện nhiều lớp"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Ngang, Trên"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Ngang, Dưới"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="Dọc, Trái"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="Dọc, Phải"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Kiểu Stream"
@@ -697,3 +698,8 @@
 FinalScene.Title="Xóa cảnh"
 FinalScene.Text="Cần có ít nhất một cảnh."
 
+
+ChangeBG="Thiết lập màu sắc"
+CustomColor="Tùy chỉnh màu sắc"
+
+

obs-studio-21.1.2.tar.xz/UI/data/locale/zh-CN.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/zh-CN.ini Changed

@@ -28,11 +28,11 @@
 Mono="单声道"
 Stereo="立体声"
 DroppedFrames="丢帧 %1 (%2%)"
-StudioProgramProjector="全屏投影仪(程序)"
+StudioProgramProjector="全屏投影仪(输出)"
 PreviewProjector="全屏投影仪(预览)"
 SceneProjector="全屏投影仪 (现场)"
 SourceProjector="全屏投影仪(源)"
-StudioProgramWindow="窗口式投影仪 (程序)"
+StudioProgramWindow="窗口式投影仪 (输出)"
 PreviewWindow="窗口化投影仪 (预览)"
 SceneWindow="窗口化投影仪 (场景)"
 SourceWindow="窗口化投影仪 (源)"
@@ -49,7 +49,7 @@
 Enable="启用"
 DisableOSXVSync="禁用 OSX V-Sync"
 ResetOSXVSyncOnExit="退出时重置 OSX V-Sync"
-HighResourceUsage="编码过载! 考虑下调低视频设置或使用更快的编码预设."
+HighResourceUsage="编码过载! 请考虑降低视频设置或使用更快的编码预设"
 Transition="过渡动画"
 QuickTransitions="快速过渡动画"
 Left="左"
@@ -61,7 +61,7 @@
 Minutes="分钟"
 Seconds="秒"
 Deprecated="不推荐使用"
-ReplayBuffer="重拨缓存"
+ReplayBuffer="回放缓存"
 Import="导入"
 Export="导出"
 Copy="复制"
@@ -76,15 +76,17 @@
 TransitionOverride="过渡覆盖模式"
 None="无"
 StudioMode.Preview="预览"
-StudioMode.Program="程序"
+StudioMode.Program="输出"
 ShowInMultiview="多屏中显示"
+VerticalLayout="垂直布局"
+Group="分组"
 
 AlreadyRunning.Title="OBS 已在运行"
 AlreadyRunning.Text="OBS 已经在运行! 除非你想要这样做, 请在你运行一个新的 OBS 前, 关闭任何已经在运行的 OBS. 如果你有一个 OBS 设置最小化到系统托盘, 请检查他是否仍在运行."
-AlreadyRunning.LaunchAnyway="无论如何启动"
+AlreadyRunning.LaunchAnyway="始终启动"
 
-Copy.Filters="复制筛选器"
-Paste.Filters="粘贴筛选器"
+Copy.Filters="复制滤镜"
+Paste.Filters="粘贴滤镜"
 
 BandwidthTest.Region="区域"
 BandwidthTest.Region.US="美国"
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="停止推流"
 Basic.Main.StoppingStreaming="停止推流..."
 Basic.Main.ForceStopStreaming="停止流 (放弃延迟)"
+Basic.Main.Group="分组 %1"
+Basic.Main.GroupItems="对所选项目进行分组"
+Basic.Main.Ungroup="取消分组"
 
 Basic.MainMenu.File="文件(&F)"
 Basic.MainMenu.File.Export="导出(&E)"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="帮助 (&H)"
 Basic.MainMenu.Help.HelpPortal="帮助门户"
 Basic.MainMenu.Help.Website="访问OBS主页 (&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="检查升级(&C)"
+Basic.MainMenu.Help.CrashLogs="错误报告(&R)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="查看错误报告(&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="上传上一次错误报告(&L)"
 
 Basic.Settings.ProgramRestart="要使这些设置生效，必须重新启动该程序。"
 Basic.Settings.ConfirmTitle="确认更改"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="退出时保存投影仪"
 Basic.Settings.General.SwitchOnDoubleClick="双击时切换到场景"
 Basic.Settings.General.StudioPortraitLayout="启用纵向布局"
+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="水平、顶部"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="水平、底部"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="垂直, 左侧"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="垂直, 右侧"
+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="流类型"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="快速"
 Basic.Settings.Audio.MeterDecayRate.Medium="中速(峰值电平表I型)"
 Basic.Settings.Audio.MeterDecayRate.Slow="慢速(峰值电平表II型)"
+Basic.Settings.Audio.PeakMeterType="峰值计类型"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="采样峰值"
+Basic.Settings.Audio.PeakMeterType.TruePeak="真峰值 (更高的的 CPU 使用率)"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="警告: 已启用环绕声音频。"
 Basic.Settings.Audio.MultichannelWarning="如果串流, 请检查串流服务是否支持环绕立体声接收和环绕立体声播放。 Twitch, Facebook 360 Live, Mixer RTMP, Smashcast 是充分支持环绕立体声的例子。 虽然 Facebook Live 和 Youtube Live 都支持环绕立体声接收, 但是Facebook Live 降低混合至立体声, 而 Youtube Live 则只播放两个声道。\n\nOBS 音频过滤器与环绕立体声兼容, 但 VST 插件支持无法保证。"
 Basic.Settings.Audio.MultichannelWarning.Title="是否启用环绕立体声？"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="绑定 IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="启用新的网络代码"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="低延迟模式"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="当主窗口获得焦点时禁用热键"
 
 Basic.AdvAudio="高级音频属性"
 Basic.AdvAudio.Name="名称"
@@ -682,10 +700,10 @@
 Basic.AdvAudio.Mono="下降混合为单声道"
 Basic.AdvAudio.Panning="平移"
 Basic.AdvAudio.SyncOffset="同步偏移 (毫秒)"
-Basic.AdvAudio.Monitoring="音频监测"
+Basic.AdvAudio.Monitoring="音频监听"
 Basic.AdvAudio.Monitoring.None="关闭监视"
 Basic.AdvAudio.Monitoring.MonitorOnly="仅显示器(静音输出)"
-Basic.AdvAudio.Monitoring.Both="监视器和输出"
+Basic.AdvAudio.Monitoring.Both="监听并输出"
 Basic.AdvAudio.AudioTracks="轨道"
 
 Basic.Settings.Hotkeys="热键"
@@ -749,3 +767,12 @@
 FinalScene.Title="删除场景"
 FinalScene.Text="至少要有一个场景."
 
+NoSources.Title="无来源"
+NoSources.Text="看起来您未添加任何视频源，所以我们将只会输出黑色萤幕。确实要这样做吗？"
+NoSources.Text.AddSource="您可以通过单击主窗口中“来源”框下的“+”图标以添加来源。"
+
+ChangeBG="设置颜色"
+CustomColor="自定义颜色"
+
+BrowserSource.EnableHardwareAcceleration="启用浏览器源硬件加速"
+

obs-studio-21.1.2.tar.xz/UI/data/locale/zh-TW.ini -> obs-studio-22.0.1.tar.xz/UI/data/locale/zh-TW.ini Changed

@@ -78,6 +78,8 @@
 StudioMode.Preview="預覽"
 StudioMode.Program="程式"
 ShowInMultiview="在多視圖中顯示"
+VerticalLayout="垂直排版"
+Group="群組"
 
 AlreadyRunning.Title="OBS 已在執行中"
 AlreadyRunning.Text="OBS 已在執行中！除非這是您的意圖，請在執行新的 OBS 前關閉現存的 OBS 。如果有設定 OBS 最小化到系統工具列，請確認是否仍在該處執行。"
@@ -405,6 +407,9 @@
 Basic.Main.StopStreaming="停止串流"
 Basic.Main.StoppingStreaming="停止串流..."
 Basic.Main.ForceStopStreaming="停止實況（丟棄延遲）"
+Basic.Main.Group="群組 %1"
+Basic.Main.GroupItems="群組選取的項目"
+Basic.Main.Ungroup="取消群組"
 
 Basic.MainMenu.File="檔案 (&F)"
 Basic.MainMenu.File.Export="匯出 (&E)"
@@ -471,12 +476,16 @@
 Basic.MainMenu.Help="說明 (&H)"
 Basic.MainMenu.Help.HelpPortal="幫助和門戶"
 Basic.MainMenu.Help.Website="前往 OBS 網站 (&W)"
+Basic.MainMenu.Help.Discord="加入 &Discord 伺服器"
 Basic.MainMenu.Help.Logs="Log 檔案 (&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="顯示 Log (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="上傳目前 Log 檔 (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="上傳上次的 Log 檔 (&L)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="顯示當前紀錄檔 (&V)"
 Basic.MainMenu.Help.CheckForUpdates="檢查更新"
+Basic.MainMenu.Help.CrashLogs="錯誤報告"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="顯示當機回報(&S)"
+Basic.MainMenu.Help.CrashLogs.UploadLastLog="上傳最新的錯誤回報(&L)"
 
 Basic.Settings.ProgramRestart="為了套用新設定，請關閉後重啟。"
 Basic.Settings.ConfirmTitle="確認修改"
@@ -507,11 +516,16 @@
 Basic.Settings.General.SaveProjectors="退出時保存投影設定"
 Basic.Settings.General.SwitchOnDoubleClick="按兩下時切換到場景"
 Basic.Settings.General.StudioPortraitLayout="啟用縱向/垂直佈局"
+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="水平, 上"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="水平, 下"
-Basic.Settings.General.MultiviewLayout.Vertical.Left="垂直, 左"
-Basic.Settings.General.MultiviewLayout.Vertical.Right="垂直, 右"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="橫排、頂部（八個場景）"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="橫排、底部（八個場景）"
+Basic.Settings.General.MultiviewLayout.Vertical.Left="直行、靠左（八個場景）"
+Basic.Settings.General.MultiviewLayout.Vertical.Right="直行、靠右（八個場景）"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="橫排、頂部（24 個場景）"
 
 Basic.Settings.Stream="串流"
 Basic.Settings.Stream.StreamType="串流類型"
@@ -635,6 +649,9 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="快速"
 Basic.Settings.Audio.MeterDecayRate.Medium="中 (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="慢 (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="峰值表類型"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="範例峰值"
+Basic.Settings.Audio.PeakMeterType.TruePeak="真實峰值（較高的 CPU 用量）"
 Basic.Settings.Audio.MultiChannelWarning.Enabled="警告: 已啟用環繞聲音訊。"
 Basic.Settings.Audio.MultichannelWarning="如果是流媒體，請檢查您的流媒體服務是否同時支持環繞聲攝取和環繞聲播放。 Twitch，Facebook 360 Live，Mixer RTMP，Smashcast都是完全支持環繞聲的例子。 儘管Facebook Live和YouTube Live都接受環繞聲攝取，但是Facebook Live會混音為立體聲，而YouTube Live只播放兩個聲道。\n\n 儘管不支持VST插件，但OBS音頻濾波器與環繞聲兼容。"
 Basic.Settings.Audio.MultichannelWarning.Title="是否啟用環繞聲音訊？"
@@ -675,6 +692,7 @@
 Basic.Settings.Advanced.Network.BindToIP="綁定到 IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="啟用新的網路程式碼"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="低延遲模式"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="當主視窗處於焦點，則停用熱鍵"
 
 Basic.AdvAudio="進階音訊屬性"
 Basic.AdvAudio.Name="名稱"
@@ -749,3 +767,11 @@
 FinalScene.Title="刪除場景"
 FinalScene.Text="至少要有一個場景。"
 
+NoSources.Title="沒有來源"
+NoSources.Text="看起來您尚未增加任何視訊來源，所以我們只會輸出黑畫面。確定？"
+NoSources.Text.AddSource="您可以透過點一下主視窗「來源」框底下的 + 按鈕，隨時增加來源。"
+
+ChangeBG="設定顏色"
+CustomColor="自訂顏色"
+
+

obs-studio-21.1.2.tar.xz/UI/data/themes/Acri.qss -> obs-studio-22.0.1.tar.xz/UI/data/themes/Acri.qss Changed

@@ -1,3 +1,37 @@
+/* OBSTheme, main QApplication palette and QML values */
+OBSTheme {
+    window: #181819;
+    windowText: rgb(225,224,225);
+    base: rgb(18,18,21);
+    alternateBase: rgb(0,0,0);
+    text: rgb(225,224,225);
+    button: #162458;
+    buttonText: rgb(225,224,225);
+    brightText: #484848;
+
+    light: #162458;
+    mid: #181819;
+    dark: rgb(18,18,21);
+    shadow: rgb(0,0,0);
+
+    highlight: #252458;
+    highlightText: #FFFFFF;
+
+    link: #605ee6;
+    linkVisited: #605ee6;
+}
+
+OBSTheme::disabled {
+    text: #484848;
+    buttonText: #484848;
+    brightText: #484848;
+}
+
+OBSTheme::inactive {
+    highlight: rgb(48,47,48);
+    highlightText: rgb(255, 255, 255);
+}
+
 /* General style, we override only what is needed. */
 QWidget {
 	background-color: #181819;
@@ -9,6 +43,7 @@
 	font-family: "Open Sans", "Tahoma", "Arial", sans-serif;
 	font-size: 12px;
 	padding: 4px;
+	overflow: auto;
 }
 
 #menubar {
@@ -45,6 +80,14 @@
 	color: #484848;
 }
 
+* [themeID="error"] {
+	color: #d91740;
+}
+
+* [themeID="warning"] {
+	color: #d9af17;
+}
+
 /* Dropdown menus, Scenes box, Sources box */
 QAbstractItemView {
 	background-color: #181819;
@@ -94,7 +137,8 @@
 }
 
 /* Listbox item */
-QListWidget::item {
+QListWidget::item,
+SourceTree::item {
 	padding: 4px 2px;
 	margin-bottom: 2px;
 	margin-top: 0px;
@@ -110,11 +154,6 @@
 	 border-radius: none;
 }
 
-SourceListWidget::item {
-	margin-bottom: 1px;
-	padding: -4px 2px;
-}
-
 /* Dock stuff */
 QDockWidget {
 	background: transparent;
@@ -157,6 +196,23 @@
 	border-bottom: 2px solid #2f2f2f;
 }
 
+SourceTree {
+	border: none;
+	border-bottom: 1px solid #2f2f2f;
+}
+
+SourceTree QLabel {
+	padding: 2px 0px;
+	margin: -2px 4px -2px;
+}
+
+SourceTree QLineEdit {
+	background-color: #0c101e;
+	padding: 2px;
+	margin: -2px 6px -2px 3px;
+	font-size: 12px;
+}
+
 #scenesFrame,
 #sourcesFrame {
 	margin-left: -7px;
@@ -179,13 +235,15 @@
 }
 
 /* Listbox item selected, unfocused */
-QListWidget::item:hover {
+QListWidget::item:hover,
+SourceTree::item:hover {
 	background-color: #212121;
 	border: 1px solid #333336;
 }
 
 /* Listbox item selected */
-QListWidget::item:selected {
+QListWidget::item:selected,
+SourceTree::item:selected {
 	background-color: #131a30;
 	border: 1px solid #252a45;
 }
@@ -453,10 +511,12 @@
 
 QPushButton::flat {
 	background-color: rgb(24,24,25);
+	border: none;
 }
 
 QPushButton:checked {
-	background-color: #202b52;
+	background-color: #581624;
+	border-color: #84162d;
 }
 
 QPushButton:hover {
@@ -468,6 +528,16 @@
 	background-color: #161f41;
 }
 
+QPushButton:disabled {
+	border: 1px solid #232426;
+	background-color: #1a1a1b;
+}
+
+QPushButton::flat:hover,
+QPushButton::flat:disabled {
+	border: none;
+}
+
 /* Progress Bar */
 
 QProgressBar {
@@ -505,16 +575,20 @@
 }
 
 QSlider::handle:horizontal:pressed {
-	background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
+	background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
 		stop: 0 rgb(240,239,240),
 		stop: 0.25 rgb(200,199,200),
 		stop: 1 rgb(162,161,162));
 }
 
+QSlider::sub-page:horizontal {
+	background-color: #2a3a75;
+}
+
 QSlider::sub-page:horizontal:disabled {
-	background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
-		stop: 0 rgb(31,30,31),
-		stop: 0.75 rgb(50, 49, 50));
+	background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
+		stop: 0 rgb(26,25,26),
+		stop: 0.75 rgb(10, 10, 10));
 	border-radius: 2px;
 }
 
@@ -533,23 +607,27 @@
 		stop: 0.25 rgb(200,199,200),
 		stop: 1 rgb(162,161,162));
 	border: 1px solid rgb(24,24,25);
-	border-radius: 4px;
+	border-radius: 3px;
 	width: 10px;
 	height: 18px;
-	margin: -3px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
+	margin: 0 -3px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
 }
 
 QSlider::handle:vertical:pressed {
-	background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+	background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
 		stop: 0 rgb(240,239,240),
 		stop: 0.25 rgb(200,199,200),
 		stop: 1 rgb(162,161,162));
 }
 
-QSlider::sub-page:vertical:disabled {
+QSlider::add-page:vertical {
+	background-color: #2a3a75;
+}
+
+QSlider::add-page:vertical:disabled {
 	background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
-		stop: 0 rgb(31,30,31),
-		stop: 0.75 rgb(50, 49, 50));
+		stop: 0 rgb(26,25,26),
+		stop: 0.75 rgb(10, 10, 10));
 	border-radius: 2px;
 }
 
@@ -557,15 +635,10 @@
 	background-color: rgb(200,199,200);
 }
 
-QSlider::sub-page {
-	background-color: #2a3a75;
-}
-
 QSlider::handle:disabled {
 	background-color: rgb(15,15,16);
 }
 
-
 /* Volume Control */
 
 /* Old Meters */
@@ -724,6 +797,30 @@
 }
 
 
+/* Group Collapse Checkbox */
+
+SourceTreeSubItemCheckBox {
+    background: transparent;
+    outline: none;
+    padding: 0px;
+}
+
+SourceTreeSubItemCheckBox::indicator {
+    width: 12px;
+    height: 12px;
+}
+
+SourceTreeSubItemCheckBox::indicator:checked,
+SourceTreeSubItemCheckBox::indicator:checked:hover {
+    image: url(./Dark/expand.png);
+}
+
+SourceTreeSubItemCheckBox::indicator:unchecked,
+SourceTreeSubItemCheckBox::indicator:unchecked:hover {
+    image: url(./Dark/collapse.png);
+}
+
+
 /* Label warning/error */
 
 QLabel#warningLabel {
@@ -750,21 +847,10 @@
 	background: #101010;
 }
 
-#OBSBasicSourceSelect #sourceList {
-	border-bottom: 2px solid #333336;
-}
-
 FocusList::item {
 	padding: 0px 2px;
 }
 
-#transitionsContainer QPushButton,
-#mixerDock QPushButton,
-#effectWidget QPushButton,
-#asyncWidget QPushButton {
-	border: none;
-}
-
 #fpsTypes {
 	padding: 0px;
 }

obs-studio-21.1.2.tar.xz/UI/data/themes/Dark.qss -> obs-studio-22.0.1.tar.xz/UI/data/themes/Dark.qss Changed

@@ -28,6 +28,44 @@
 /* rgb(42,130,218); /* blue */
 
 
+/* Custom theme information.  This will set the application's QPalette, as
+ * well as pass to QML via the OBSTheme object.
+ * Can also use OBSTheme::disabled, OBSTheme::active, and OBSTheme::inactive.
+ * Using it without will set all three (making 'active' a bit redundant) */
+OBSTheme {
+    window: rgb(58,57,58); /* dark */
+    windowText: rgb(225,224,225); /* veryLight */
+    base: rgb(31,30,31); /* veryDark */
+    alternateBase: rgb(11,10,11); /* veryVeryDark */
+    text: rgb(225,224,225); /* veryLight */
+    button: rgb(88,87,88); /* kindaDark */
+    buttonText: rgb(225,224,225); /* veryLight */
+    brightText: rgb(200,199,200); /* lighter */
+
+    light: rgb(88,87,88); /* kindaDark */
+    mid: rgb(58,57,58); /* dark */
+    dark: rgb(31,30,31); /* veryDark */
+    shadow: rgb(11,10,11); /* veryVeryDark */
+
+    highlight: rgb(42,130,218); /* blue */
+    highlightText: rgb(0,0,0);
+
+    link: rgb(114, 162, 255); /* OBS blue */
+    linkVisited: rgb(114, 162, 255); /* OBS blue */
+}
+
+OBSTheme::disabled {
+    text: rgb(122,121,122); /* light */
+    buttonText: rgb(122,121,122); /* light */
+    brightText: rgb(122,121,122); /* light */
+}
+
+OBSTheme::inactive {
+    highlight: rgb(48,47,48);
+    highlightText: rgb(255, 255, 255);
+}
+
+
 /* General style, we override only what is needed. */
 QWidget {
     background-color: rgb(58,57,58); /* dark */
@@ -423,9 +461,9 @@
 /* Sliders */
 
 QSlider::groove:horizontal {
-    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 rgb(31,30,31), /* veryDark */
-        stop: 0.75 rgb(50, 49, 50));
+    background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
+        stop: 0 rgb(50, 49, 50), /* dark */
+        stop: 0.75 rgb(88,87,88)); /* kindaDark */
     height: 4px;
     border: none;
     border-radius: 2px;
@@ -450,32 +488,37 @@
         stop: 1 rgb(162,161,162)); /* light */
 }
 
+QSlider::sub-page:horizontal {
+    background-color: rgb(42,130,218); /* blue */
+    border-radius: 2px;
+}
+
 QSlider::sub-page:horizontal:disabled {
-    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+    background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
         stop: 0 rgb(31,30,31), /* veryDark */
-        stop: 0.75 rgb(50, 49, 50));
+        stop: 0.75 rgb(50, 49, 50)); /* dark */
     border-radius: 2px;
 }
 
 QSlider::groove:vertical {
-    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
-        stop: 0 rgb(31,30,31), /* veryDark */
-        stop: 0.75 rgb(50, 49, 50));
+    background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+        stop: 0 rgb(50, 49, 50), /* dark */
+        stop: 0.75 rgb(88,87,88)); /* kindaDark */
     width: 4px;
     border: none;
     border-radius: 2px;
 }
 
 QSlider::handle:vertical {
-    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
         stop: 0 rgb(240,239,240), /* lighter */
         stop: 0.25 rgb(200,199,200),
         stop: 1 rgb(162,161,162)); /* light */
     border: 1px solid rgb(58,57,58); /* dark */
-    border-radius: 4px;
+    border-radius: 3px;
     width: 10px;
     height: 18px;
-    margin: -3px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
+    margin: 0 -3px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
 }
 
 QSlider::handle:vertical:pressed {
@@ -485,10 +528,15 @@
         stop: 1 rgb(162,161,162)); /* light */
 }
 
-QSlider::sub-page:vertical:disabled {
-    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+QSlider::add-page:vertical {
+    background-color: rgb(42,130,218); /* blue */
+    border-radius: 2px;
+}
+
+QSlider::add-page:vertical:disabled {
+    background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
         stop: 0 rgb(31,30,31), /* veryDark */
-        stop: 0.75 rgb(50, 49, 50));
+        stop: 0.75 rgb(50, 49, 50)); /* dark */
     border-radius: 2px;
 }
 
@@ -496,16 +544,10 @@
     background-color: rgb(200,199,200); /* veryLight */
 }
 
-QSlider::sub-page {
-    background-color: rgb(42,130,218); /* blue */
-    border-radius: 2px;
-}
-
 QSlider::handle:disabled {
     background-color: rgb(122,121,122); /* light */
 }
 
-
 /* Volume Control */
 
 VolumeMeter {
@@ -547,6 +589,27 @@
 }
 
 
+/* Group Collapse Checkbox */
+
+SourceTreeSubItemCheckBox {
+    background: transparent;
+    outline: none;
+}
+
+SourceTreeSubItemCheckBox::indicator {
+    width: 10px;
+    height: 10px;
+}
+
+SourceTreeSubItemCheckBox::indicator:checked {
+    image: url(./Dark/expand.png);
+}
+
+SourceTreeSubItemCheckBox::indicator:unchecked {
+    image: url(./Dark/collapse.png);
+}
+
+
 /* Label warning/error */
 
 QLabel#warningLabel {

obs-studio-22.0.1.tar.xz/UI/data/themes/Dark/collapse.png Added

obs-studio-22.0.1.tar.xz/UI/data/themes/Dark/expand.png Added

obs-studio-21.1.2.tar.xz/UI/data/themes/Default.qss -> obs-studio-22.0.1.tar.xz/UI/data/themes/Default.qss Changed

obs-studio-21.1.2.tar.xz/UI/data/themes/Rachni.qss -> obs-studio-22.0.1.tar.xz/UI/data/themes/Rachni.qss Changed

@@ -40,6 +40,76 @@
 /***************************************************************************/
 
 
+/************************/
+/* ---- Main Theme ---- */
+/************************/
+
+OBSTheme {
+	window: rgb(49, 54, 59); /* Blue-gray */
+	windowText: rgb(239, 240, 241); /* White */
+	base: rgb(0, 139, 163); /* Dark Cyan (Primary Dark) */
+	alternateBase: rgb(186, 45, 101); /* Dark Pink (Secondary Dark) */
+	text: rgb(239, 240, 241); /* White */
+	button: rgb(0, 188, 212); /* Cyan (Primary) */
+	buttonText: rgb(239, 240, 241); /* White */
+	brightText: rgb(255, 148, 194); /* Light Pink (Secondary Light) */
+
+	light: rgb(162, 161, 162); /* Lighter Gray */
+	mid: rgb(118, 121, 124); /* Light Grey */
+	dark: rgb(84, 87, 91); /* Gray */
+	shadow: rgb(35, 38, 41); /* Dark Gray */
+
+	highlight: rgb(98, 238, 255); /* Light Cyan (Primary Light) */
+	highlightText: rgb(0,0,0);
+
+	link: rgb(98, 238, 255); /* Light Cyan (Primary Light) */
+	linkVisited: rgb(98, 238, 255); /* Light Cyan (Primary Light) */
+}
+
+OBSTheme::disabled {
+	text: rgb(118, 121, 124); /* Light Gray */
+	buttonText: rgb(118, 121, 124); /* Light Gray */
+	brightText: rgb(118, 121, 124); /* Light Gray */
+}
+
+OBSTheme::inactive {
+	highlight: rgb(0, 188, 212); /* Cyan (Primary) */
+	highlightText: rgb(239, 240, 241); /* White */
+}
+
+
+/************************/
+/* ---- SourceTree ---- */
+/************************/
+
+SourceTree::item:selected:!active {
+	color: rgb(239, 240, 241); /* White */
+	background-color: rgba(255, 148, 194, 0.25); /* Light Pink (Secondary Light) */
+	border: none;
+}
+
+SourceTree::item:selected {
+	background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */
+	border: none;
+}
+
+SourceTree::item:hover,
+SourceTree::item:disabled:hover,
+SourceTree::item:hover:!active {
+	background-color: rgb(0, 188, 212); /* Cyan (Primary) */
+	color: rgb(239, 240, 241); /* White */
+	border: none;
+}
+
+SourceTree QLineEdit {
+	padding-top: 0;
+	padding-bottom: 0;
+	padding-right: 0;
+	padding-left: 2px;
+	border: none;
+	border-radius: none;
+}
+
 /*************************/
 /* --- General style --- */
 /*************************/
@@ -535,16 +605,6 @@
 	color: rgb(239, 240, 241); /* White */
 }
 
-QListWidget QLineEdit {
-	padding-top: 0;
-	padding-bottom: 0;
-	padding-right: 0;
-	padding-left: 2px;
-	border: none;
-	border-radius: none;
-}
-
-
 /**********************/
 /* --- Checkboxes --- */
 /**********************/
@@ -701,6 +761,30 @@
 	image: url(./Dark/unmute.png);
 }
 
+/****************************/
+/* --- Group Checkboxes --- */
+/****************************/
+
+SourceTreeSubItemCheckBox {
+	background: transparent;
+	outline: none;
+}
+
+SourceTreeSubItemCheckBox::indicator {
+	width: 10px;
+	height: 10px;
+}
+
+SourceTreeSubItemCheckBox::indicator:checked,
+SourceTreeSubItemCheckBox::indicator:checked:hover {
+	image: url(./Dark/expand.png);
+}
+
+SourceTreeSubItemCheckBox::indicator:unchecked,
+SourceTreeSubItemCheckBox::indicator:unchecked:hover {
+	image: url(./Dark/collapse.png);
+}
+
 /*************************/
 /* --- Progress bars --- */
 /*************************/
@@ -775,10 +859,10 @@
 }
 
 QPushButton::menu-indicator {
-    image: url(./Rachni/down_arrow.png);
-    subcontrol-position: right;
-    subcontrol-origin: padding;
-    width: 25px;
+	image: url(./Rachni/down_arrow.png);
+	subcontrol-position: right;
+	subcontrol-origin: padding;
+	width: 25px;
 }
 
 /******************************/
@@ -1022,22 +1106,62 @@
 	stop: 1 rgb(162, 161, 162));
 }
 
+QSlider::sub-page:horizontal {
+	background-color: rgb(0, 188, 212); /* Cyan (Primary) */
+	border-radius: 2px;
+}
+
 QSlider::sub-page:horizontal:disabled {
 	background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
 	stop: 0 rgb(35, 38, 41), /* Dark Gray */
+	stop: 0.75 rgb(35, 38, 41)); /* Dark Gray */
+	border-radius: 2px;
+}
+
+QSlider::groove:vertical {
+	background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+	stop: 0 rgb(35, 38, 41), /* Dark Gray */
 	stop: 0.75 rgb(50, 49, 50));
+	width: 4px;
+	border: none;
 	border-radius: 2px;
 }
 
-QSlider::handle:hover {
-	background-color: rgb(200, 199, 200);
+QSlider::handle:vertical {
+	background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+	stop: 0 rgb(240, 239, 240),
+	stop: 0.25 rgb(200, 199, 200),
+	stop: 1 rgb(162, 161, 162));
+	border: 1px solid rgb(58, 57, 58);
+	border-radius: 3px;
+	width: 10px;
+	height: 18px;
+	margin: 0 -3px;
 }
 
-QSlider::sub-page {
+QSlider::handle:vertical:pressed {
+	background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+	stop: 0 rgb(240, 239, 240),
+	stop: 0.25 rgb(200, 199, 200),
+	stop: 1 rgb(162, 161, 162));
+}
+
+QSlider::add-page:vertical {
 	background-color: rgb(0, 188, 212); /* Cyan (Primary) */
 	border-radius: 2px;
 }
 
+QSlider::add-page:vertical:disabled {
+	background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+	stop: 0 rgb(35, 38, 41), /* Dark Gray */
+	stop: 0.75 rgb(35, 38, 41)); /* Dark Gray */
+	border-radius: 2px;
+}
+
+QSlider::handle:hover {
+	background-color: rgb(200, 199, 200);
+}
+
 QSlider::handle:disabled {
 	background-color: rgb(122, 121, 122);
 }
@@ -1069,6 +1193,14 @@
 
 
 /* Misc style tweaks for dark themes */
+* [themeID="error"] {
+	color: rgb(255, 89, 76); /* Red Error */
+}
+
+* [themeID="warning"] {
+	color: rgb(255, 148, 194); /* Light Pink (Secondary Light) */
+}
+
 QStatusBar::item {
 	border: none;
 }

obs-studio-22.0.1.tar.xz/UI/expand-checkbox.hpp Added

obs-studio-22.0.1.tar.xz/UI/forms/ColorSelect.ui Added

@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ColorSelect</class>
+ <widget class="QWidget" name="ColorSelect">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>98</width>
+    <height>61</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QPushButton {
+	border: 1px solid black;
+}</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QPushButton" name="preset1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>1</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="preset2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="preset3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>3</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QPushButton" name="preset4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>4</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QPushButton" name="preset5">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>5</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="preset6">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>6</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QPushButton" name="preset7">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset" stdset="0">
+        <string>7</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QPushButton" name="preset8">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="preset8" stdset="0">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="obs.qrc"/>
+ </resources>
+ <connections/>
+</ui>

obs-studio-21.1.2.tar.xz/UI/forms/OBSBasic.ui -> obs-studio-22.0.1.tar.xz/UI/forms/OBSBasic.ui Changed

@@ -146,6 +146,7 @@
     </widget>
     <addaction name="actionHelpPortal"/>
     <addaction name="actionWebsite"/>
+    <addaction name="actionDiscord"/>
     <addaction name="separator"/>
     <addaction name="menuLogFiles"/>
     <addaction name="menuCrashLogs"/>
@@ -518,7 +519,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="SourceListWidget" name="sources">
+         <widget class="SourceTree" name="sources">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -615,63 +616,112 @@
       <number>4</number>
      </property>
      <item>
-      <widget class="VScrollArea" name="mixerScrollArea">
-       <property name="minimumSize">
-        <size>
-         <width>220</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="contextMenuPolicy">
-        <enum>Qt::CustomContextMenu</enum>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
-       </property>
-       <property name="verticalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOn</enum>
-       </property>
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="widgetResizable">
-        <bool>true</bool>
-       </property>
-       <widget class="QWidget" name="volumeWidgets">
-        <property name="geometry">
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>230</width>
-          <height>16</height>
-         </rect>
+      <widget class="QStackedWidget" name="stackedMixerArea">
+       <widget class="VScrollArea" name="hMixerScrollArea">
+        <property name="contextMenuPolicy">
+         <enum>Qt::CustomContextMenu</enum>
         </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_18">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOn</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <widget class="QWidget" name="hVolumeWidgets">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>230</width>
+           <height>16</height>
+          </rect>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+         <layout class="QVBoxLayout" name="hVolControlLayout">
+          <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>
+       </widget>
+       <widget class="HScrollArea" name="vMixerScrollArea">
+        <property name="contextMenuPolicy">
+         <enum>Qt::CustomContextMenu</enum>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOn</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <widget class="QWidget" name="vVolumeWidgets">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>16</width>
+           <height>230</height>
+          </rect>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-        </layout>
+         <layout class="QHBoxLayout" name="vVolControlLayout">
+          <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>
        </widget>
       </widget>
      </item>
@@ -1601,6 +1651,11 @@
     <string>Basic.MainMenu.Help.CrashLogs.UploadLastLog</string>
    </property>
   </action>
+  <action name="actionDiscord">
+   <property name="text">
+    <string>Basic.MainMenu.Help.Discord</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -1615,15 +1670,21 @@
    <header>window-basic-status-bar.hpp</header>
   </customwidget>
   <customwidget>
+   <class>HScrollArea</class>
+   <extends>QScrollArea</extends>
+   <header>horizontal-scroll-area.hpp</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
    <class>VScrollArea</class>
    <extends>QScrollArea</extends>
    <header>vertical-scroll-area.hpp</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>SourceListWidget</class>
-   <extends>QListWidget</extends>
-   <header>source-list-widget.hpp</header>
+   <class>SourceTree</class>
+   <extends>QListView</extends>
+   <header>source-tree.hpp</header>
   </customwidget>
  </customwidgets>
  <resources>

obs-studio-21.1.2.tar.xz/UI/forms/OBSBasicFilters.ui -> obs-studio-22.0.1.tar.xz/UI/forms/OBSBasicFilters.ui Changed

obs-studio-21.1.2.tar.xz/UI/forms/OBSBasicSettings.ui -> obs-studio-22.0.1.tar.xz/UI/forms/OBSBasicSettings.ui Changed

@@ -146,7 +146,7 @@
               <x>0</x>
               <y>0</y>
               <width>801</width>
-              <height>741</height>
+              <height>836</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -582,10 +582,74 @@
                      </property>
                     </widget>
                    </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="groupBoxMultiview">
+                  <property name="title">
+                   <string>Basic.Settings.General.Multiview</string>
+                  </property>
+                  <layout class="QFormLayout" name="formLayoutMultiview">
+                   <property name="fieldGrowthPolicy">
+                    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+                   </property>
+                   <property name="labelAlignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
+                   <item row="0" column="0">
+                    <spacer name="horizontalSpacerMultiview">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeType">
+                      <enum>QSizePolicy::Fixed</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>5</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item row="0" column="1">
+                    <widget class="QCheckBox" name="multiviewMouseSwitch">
+                     <property name="text">
+                      <string>Basic.Settings.General.Multiview.MouseSwitch</string>
+                     </property>
+                     <property name="checked">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1">
+                    <widget class="QCheckBox" name="multiviewDrawNames">
+                     <property name="text">
+                      <string>Basic.Settings.General.Multiview.DrawSourceNames</string>
+                     </property>
+                     <property name="checked">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
                    <item row="2" column="1">
+                    <widget class="QCheckBox" name="multiviewDrawAreas">
+                     <property name="text">
+                      <string>Basic.Settings.General.Multiview.DrawSafeAreas</string>
+                     </property>
+                     <property name="checked">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="1">
                     <widget class="QComboBox" name="multiviewLayout"/>
                    </item>
-                   <item row="2" column="0">
+                   <item row="3" column="0">
                     <widget class="QLabel" name="label_64">
                      <property name="text">
                       <string>Basic.Settings.General.MultiviewLayout</string>
@@ -3362,7 +3426,66 @@
            </property>
           </widget>
          </item>
-         <item row="8" column="0" colspan="2">
+         <item row="7" column="0">
+          <widget class="QLabel" name="label_65">
+           <property name="text">
+            <string>Basic.Settings.Audio.MeterDecayRate</string>
+           </property>
+           <property name="buddy">
+            <cstring>meterDecayRate</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
+          <widget class="QComboBox" name="meterDecayRate">
+           <property name="currentText">
+            <string>Basic.Settings.Audio.MeterDecayRate.Fast</string>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Basic.Settings.Audio.MeterDecayRate.Fast</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Basic.Settings.Audio.MeterDecayRate.Medium</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Basic.Settings.Audio.MeterDecayRate.Slow</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <widget class="QLabel" name="label_66">
+           <property name="text">
+            <string>Basic.Settings.Audio.PeakMeterType</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QComboBox" name="peakMeterType">
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Basic.Settings.Audio.PeakMeterType.SamplePeak</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Basic.Settings.Audio.PeakMeterType.TruePeak</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="9" column="0" colspan="2">
           <widget class="QScrollArea" name="audioSourceScrollArea">
            <property name="widgetResizable">
             <bool>true</bool>
@@ -3379,20 +3502,20 @@
            </widget>
           </widget>
          </item>
-         <item row="9" column="1">
+         <item row="10" column="1">
           <widget class="QLabel" name="audioMsg">
-           <property name="styleSheet">
-            <string notr="true">color: rgb(255, 0, 4);</string>
-           </property>
            <property name="text">
             <string notr="true"/>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
+           <property name="themeID" stdset="0">
+            <string>error</string>
+           </property>
           </widget>
          </item>
-         <item row="10" column="1">
+         <item row="11" column="1">
           <widget class="QLabel" name="audioMsg_2">
            <property name="text">
             <string notr="true"/>
@@ -3405,40 +3528,18 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="0">
-          <widget class="QLabel" name="label_65">
-           <property name="text">
-            <string>Basic.Settings.Audio.MeterDecayRate</string>
-           </property>
-           <property name="buddy">
-            <cstring>meterDecayRate</cstring>
+         <item row="12" column="1">
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
            </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QComboBox" name="meterDecayRate">
-           <property name="currentText">
-            <string>Basic.Settings.Audio.MeterDecayRate.Fast</string>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
            </property>
-           <item>
-            <property name="text">
-             <string>Basic.Settings.Audio.MeterDecayRate.Fast</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Basic.Settings.Audio.MeterDecayRate.Medium</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Basic.Settings.Audio.MeterDecayRate.Slow</string>
-            </property>
-           </item>
-          </widget>
+          </spacer>
          </item>
         </layout>
        </widget>
@@ -3744,8 +3845,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>98</width>
-           <height>28</height>
+           <width>818</width>
+           <height>697</height>
           </rect>
          </property>
          <layout class="QFormLayout" name="hotkeyLayout">
@@ -3762,7 +3863,7 @@
         </widget>
        </widget>
        <widget class="QWidget" name="advancedPage">
-        <layout class="QHBoxLayout" name="horizontalLayout_11">
+        <layout class="QVBoxLayout" name="verticalLayout_16">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -3791,11 +3892,11 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>593</width>
-              <height>761</height>
+              <width>803</width>
+              <height>807</height>
              </rect>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_16">
+            <layout class="QVBoxLayout" name="verticalLayout_23">
              <property name="leftMargin">
               <number>0</number>
              </property>
@@ -3808,9 +3909,9 @@
              <property name="bottomMargin">
               <number>9</number>
              </property>
-             <item alignment="Qt::AlignTop">
+             <item>
               <widget class="QWidget" name="widget_11" native="true">
-               <layout class="QVBoxLayout" name="verticalLayout_17">
+               <layout class="QVBoxLayout" name="verticalLayout_24">
                 <item>
                  <widget class="QGroupBox" name="advancedGeneralGroupBox">
                   <property name="title">
@@ -3820,6 +3921,12 @@
                    <property name="fieldGrowthPolicy">
                     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
                    </property>
+                   <property name="labelAlignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="processPriorityLabel">
                      <property name="text">
@@ -3833,6 +3940,19 @@
                    <item row="0" column="1">
                     <widget class="QComboBox" name="processPriority"/>
                    </item>
+                   <item row="1" column="0">
+                    <spacer name="horizontalSpacer_13">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -3848,6 +3968,9 @@
                    <property name="labelAlignment">
                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                    </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="rendererLabel">
                      <property name="text">
@@ -4020,6 +4143,19 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="4" column="0">
+                    <spacer name="horizontalSpacer_12">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -4032,6 +4168,12 @@
                    <property name="fieldGrowthPolicy">
                     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
                    </property>
+                   <property name="labelAlignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="monitoringDeviceLabel">
                      <property name="text">
@@ -4052,6 +4194,19 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="1" column="0">
+                    <spacer name="horizontalSpacer_11">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -4067,6 +4222,9 @@
                    <property name="labelAlignment">
                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                    </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="label_7">
                      <property name="text">
@@ -4129,6 +4287,19 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="1" column="0">
+                    <spacer name="horizontalSpacer_10">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -4141,6 +4312,9 @@
                    <property name="fieldGrowthPolicy">
                     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
                    </property>
+                   <property name="labelAlignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
                    <property name="topMargin">
                     <number>2</number>
                    </property>
@@ -4230,6 +4404,19 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="2" column="0">
+                    <spacer name="horizontalSpacer_9">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -4242,6 +4429,12 @@
                    <property name="fieldGrowthPolicy">
                     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
                    </property>
+                   <property name="labelAlignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
                    <item row="0" column="1">
                     <widget class="QCheckBox" name="reconnectEnable">
                      <property name="text">
@@ -4311,6 +4504,19 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="0" column="0">
+                    <spacer name="horizontalSpacer_8">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -4323,9 +4529,12 @@
                    <property name="fieldGrowthPolicy">
                     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
                    </property>
-                   <item row="0" column="1">
-                    <widget class="QComboBox" name="bindToIP"/>
-                   </item>
+                   <property name="labelAlignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
                    <item row="0" column="0">
                     <widget class="QLabel" name="label_27">
                      <property name="text">
@@ -4336,6 +4545,9 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="0" column="1">
+                    <widget class="QComboBox" name="bindToIP"/>
+                   </item>
                    <item row="1" column="1">
                     <widget class="QCheckBox" name="enableNewSocketLoop">
                      <property name="text">
@@ -4353,33 +4565,84 @@
                      </property>
                     </widget>
                    </item>
+                   <item row="1" column="0">
+                    <spacer name="horizontalSpacer_7">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
                   </layout>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QLabel" name="advancedMsg">
-                  <property name="styleSheet">
-                   <string notr="true">color: rgb(255, 0, 4);</string>
-                  </property>
-                  <property name="text">
-                   <string notr="true"/>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>true</bool>
+                 <widget class="QGroupBox" name="sourcesGroup">
+                  <property name="title">
+                   <string>Basic.Main.Sources</string>
                   </property>
+                  <layout class="QFormLayout" name="formLayout_34">
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
+                   <item row="0" column="0">
+                    <spacer name="horizontalSpacer_15">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item row="0" column="1">
+                    <widget class="QCheckBox" name="browserHWAccel">
+                     <property name="text">
+                      <string>BrowserSource.EnableHardwareAcceleration</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
                  </widget>
                 </item>
                 <item>
-                 <widget class="QLabel" name="advancedMsg2">
-                  <property name="styleSheet">
-                   <string notr="true">color: rgb(255, 0, 4);</string>
-                  </property>
-                  <property name="text">
-                   <string notr="true"/>
-                  </property>
-                  <property name="wordWrap">
-                   <bool>true</bool>
+                 <widget class="QGroupBox" name="groupBox_17">
+                  <property name="title">
+                   <string>Basic.Settings.Hotkeys</string>
                   </property>
+                  <layout class="QFormLayout" name="formLayout_33">
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
+                   <item row="0" column="1">
+                    <widget class="QCheckBox" name="disableFocusHotkeys">
+                     <property name="text">
+                      <string>Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="0">
+                    <spacer name="horizontalSpacer_14">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>170</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
                  </widget>
                 </item>
                </layout>
@@ -4389,6 +4652,48 @@
            </widget>
           </widget>
          </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_17">
+           <property name="leftMargin">
+            <number>10</number>
+           </property>
+           <property name="topMargin">
+            <number>10</number>
+           </property>
+           <property name="rightMargin">
+            <number>10</number>
+           </property>
+           <property name="bottomMargin">
+            <number>10</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="advancedMsg">
+             <property name="styleSheet">
+              <string notr="true">color: rgb(255, 0, 4);</string>
+             </property>
+             <property name="text">
+              <string notr="true"/>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="advancedMsg2">
+             <property name="styleSheet">
+              <string notr="true">color: rgb(255, 0, 4);</string>
+             </property>
+             <property name="text">
+              <string notr="true"/>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
         </layout>
        </widget>
       </widget>

obs-studio-22.0.1.tar.xz/UI/forms/images/collapse.png Added

obs-studio-22.0.1.tar.xz/UI/forms/images/expand.png Added

obs-studio-21.1.2.tar.xz/UI/forms/obs.qrc -> obs-studio-22.0.1.tar.xz/UI/forms/obs.qrc Changed

obs-studio-21.1.2.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt Changed

obs-studio-21.1.2.tar.xz/UI/frontend-plugins/frontend-tools/captions.cpp -> obs-studio-22.0.1.tar.xz/UI/frontend-plugins/frontend-tools/captions.cpp Changed

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

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

@@ -0,0 +1,42 @@
+SceneSwitcher="Suidsear fèin-obrachail nan sealladh"
+SceneSwitcher.OnNoMatch="Mura freagair uinneag"
+SceneSwitcher.OnNoMatch.DontSwitch="Na dèan suids"
+SceneSwitcher.OnNoMatch.SwitchTo="Dèan suids gu:"
+SceneSwitcher.CheckInterval="Thoir sùil air tiotal na h-uinneige gnìomhaich gach:"
+SceneSwitcher.ActiveOrNotActive="Tha suidsear nan sealladh:"
+InvalidRegex.Title="Chan eil an t-eas-preisean riaghailteach dligheach"
+InvalidRegex.Text="Chan eil an t-eas-preisean riaghailteach a chuir thu a-steach dligheach."
+Active="Gnìomhach"
+Inactive="Neo-ghnìomhach"
+Start="Tòisich"
+Stop="Cuir stad air"
+
+Captions="Fo-thiotalan (deuchainneil)"
+Captions.AudioSource="Tùs fuaime"
+Captions.CurrentSystemLanguage="Cànan làithreach an t-siostaim (%1)"
+Captions.Provider="Solaraiche"
+Captions.Error.GenericFail="Cha deach leinn na fo-thiotalan a thòiseachadh"
+
+OutputTimer="Tìmear an às-chuir"
+OutputTimer.Stream="Cuir stad air an t-sruthadh às dèidh:"
+OutputTimer.Record="Cuir stad air a’ chlàradh às dèidh:"
+OutputTimer.Stream.StoppingIn="Thèid an sruthadh a chur ’na stad às dèidh:"
+OutputTimer.Record.StoppingIn="Thèid an clàradh a chur ’na stad às dèidh:"
+OutputTimer.Stream.EnableEverytime="Cuir tìmear an t-sruthaidh an comas gach turas"
+OutputTimer.Record.EnableEverytime="Cuir tìmear a’ chlàraidh an comas gach turas"
+
+Scripts="Sgriobtaichean"
+LoadedScripts="Sgriobtaichean luchdaichte"
+AddScripts="Cuir sgriobtaichean ris"
+RemoveScripts="Thoir sgriobtaichean air falbh"
+ReloadScripts="Ath-luchdaich na sgriobtaichean"
+PythonSettings="Roghainnean Python"
+PythonSettings.PythonInstallPath32bit="Slighe stàlaidh Python (32 biod)"
+PythonSettings.PythonInstallPath64bit="Slighe stàlaidh Python (64 biod)"
+PythonSettings.BrowsePythonPath="Rùraich airson slighe stàlaidh Python"
+ScriptLogWindow="Loga nan sgriobt"
+Description="Tuairisgeul"
+
+FileFilter.ScriptFiles="Faidhlichean sgriobt"
+FileFilter.AllFiles="Na h-uile faidhle"
+

obs-studio-21.1.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ms-MY.ini -> obs-studio-22.0.1.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ms-MY.ini Changed

obs-studio-21.1.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/vi-VN.ini -> obs-studio-22.0.1.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/vi-VN.ini Changed

@@ -4,6 +4,8 @@
 SceneSwitcher.OnNoMatch.SwitchTo="Chuyển sang:"
 SceneSwitcher.CheckInterval="Kiểm tra tiêu đề cửa sổ mỗi:"
 SceneSwitcher.ActiveOrNotActive="Chuyển cảnh đang:"
+InvalidRegex.Title="Cụm từ thông dụng không hợp lệ"
+InvalidRegex.Text="Cụm từ thông dụng mà bạn đã nhập không hợp lệ."
 Active="Đang hoạt động"
 Inactive="Không hoạt động"
 Start="Bắt đầu"
@@ -15,12 +17,24 @@
 Captions.Provider="Nhà cung cấp"
 Captions.Error.GenericFail="Thất bại trong việc bắt đầu phụ đề"
 
+OutputTimer="Hẹn giờ đầu ra"
 OutputTimer.Stream="Dừng stream sau:"
 OutputTimer.Record="Dừng ghi video sau:"
 OutputTimer.Stream.StoppingIn="Stream sẽ dừng trong:"
 OutputTimer.Record.StoppingIn="Quay video sẽ dừng trong:"
+OutputTimer.Stream.EnableEverytime="Bật hẹn giờ phát trực tuyến mỗi lần"
+OutputTimer.Record.EnableEverytime="Bật hẹn giờ phát mỗi lần"
 
+Scripts="Kịch bản"
+LoadedScripts="Kịch bản đã nạp"
 AddScripts="Thêm script"
+RemoveScripts="Gỡ bỏ kịch bản"
+ReloadScripts="Nạp lại kịch bản"
+PythonSettings="Thiết lập Python"
+PythonSettings.PythonInstallPath32bit="Đường dẫn cài đặt Python (32bit)"
+PythonSettings.PythonInstallPath64bit="Đường dẫn cài đặt Python (64bit)"
+PythonSettings.BrowsePythonPath="Duyệt đường dẫn Python"
+ScriptLogWindow="Bản ghi kịch bản"
 Description="Mô tả"
 
 FileFilter.ScriptFiles="Tập tin script"

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

obs-studio-21.1.2.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp -> obs-studio-22.0.1.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp Changed

obs-studio-22.0.1.tar.xz/UI/horizontal-scroll-area.cpp Added

obs-studio-22.0.1.tar.xz/UI/horizontal-scroll-area.hpp Added

obs-studio-21.1.2.tar.xz/UI/item-widget-helpers.hpp -> obs-studio-22.0.1.tar.xz/UI/item-widget-helpers.hpp Changed

obs-studio-21.1.2.tar.xz/UI/obs-app.cpp -> obs-studio-22.0.1.tar.xz/UI/obs-app.cpp Changed

@@ -24,9 +24,10 @@
 #include <sstream>
 #include <mutex>
 #include <util/bmem.h>
-#include <util/dstr.h>
+#include <util/dstr.hpp>
 #include <util/platform.h>
 #include <util/profiler.hpp>
+#include <util/cf-parser.h>
 #include <obs-config.h>
 #include <obs.hpp>
 
@@ -77,8 +78,9 @@
 string opt_starting_profile;
 string opt_starting_scene;
 
-// AMD PowerXpress High Performance Flags
+// GPU hint exports for AMD/NVIDIA laptops
 #ifdef _MSC_VER
+extern "C" __declspec(dllexport) DWORD NvOptimusEnablement = 1;
 extern "C" __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 #endif
 
@@ -345,6 +347,7 @@
 	}
 #else
 	def_log_handler(log_level, msg, args2, nullptr);
+	va_end(args2);
 #endif
 
 	if (log_level <= LOG_INFO || log_verbose) {
@@ -366,6 +369,7 @@
 	config_set_default_string(globalConfig, "General", "Language",
 			DEFAULT_LANG);
 	config_set_default_uint(globalConfig, "General", "MaxLogs", 10);
+	config_set_default_int(globalConfig, "General", "InfoIncrement", -1);
 	config_set_default_string(globalConfig, "General", "ProcessPriority",
 			"Normal");
 	config_set_default_bool(globalConfig, "General", "EnableAutoUpdates",
@@ -418,9 +422,22 @@
 				"CurrentTheme", "Dark");
 	}
 
+	config_set_default_bool(globalConfig, "BasicWindow",
+			"VerticalVolControl", false);
+
+	config_set_default_bool(globalConfig, "BasicWindow",
+			"MultiviewMouseSwitch", true);
+
+	config_set_default_bool(globalConfig, "BasicWindow",
+			"MultiviewDrawNames", true);
+
+	config_set_default_bool(globalConfig, "BasicWindow",
+			"MultiviewDrawAreas", true);
+
 #ifdef _WIN32
 	config_set_default_bool(globalConfig, "Audio", "DisableAudioDucking",
 			true);
+	config_set_default_bool(globalConfig, "General", "BrowserHWAccel", true);
 #endif
 
 #ifdef __APPLE__
@@ -588,6 +605,42 @@
 	return outputPath;
 }
 
+bool OBSApp::UpdatePre22MultiviewLayout(const char *layout)
+{
+	if (!layout)
+		return false;
+
+	if (astrcmpi(layout, "horizontaltop") == 0) {
+		config_set_int(globalConfig, "BasicWindow", "MultiviewLayout",
+			static_cast<int>(
+				MultiviewLayout::HORIZONTAL_TOP_8_SCENES));
+		return true;
+	}
+
+	if (astrcmpi(layout, "horizontalbottom") == 0) {
+		config_set_int(globalConfig, "BasicWindow", "MultiviewLayout",
+			static_cast<int>(
+				MultiviewLayout::HORIZONTAL_BOTTOM_8_SCENES));
+		return true;
+	}
+
+	if (astrcmpi(layout, "verticalleft") == 0) {
+		config_set_int(globalConfig, "BasicWindow", "MultiviewLayout",
+			static_cast<int>(
+				MultiviewLayout::VERTICAL_LEFT_8_SCENES));
+		return true;
+	}
+
+	if (astrcmpi(layout, "verticalright") == 0) {
+		config_set_int(globalConfig, "BasicWindow", "MultiviewLayout",
+			static_cast<int>(
+				MultiviewLayout::VERTICAL_RIGHT_8_SCENES));
+		return true;
+	}
+
+	return false;
+}
+
 bool OBSApp::InitGlobalConfig()
 {
 	char path[512];
@@ -653,6 +706,13 @@
 		changed = true;
 	}
 
+	if (config_has_user_value(globalConfig, "BasicWindow",
+			"MultiviewLayout")) {
+		const char *layout = config_get_string(globalConfig,
+				"BasicWindow", "MultiviewLayout");
+		changed |= UpdatePre22MultiviewLayout(layout);
+	}
+
 	if (changed)
 		config_save_safe(globalConfig, "tmp", nullptr);
 
@@ -727,6 +787,192 @@
 	return true;
 }
 
+void OBSApp::AddExtraThemeColor(QPalette &pal, int group,
+		const char *name, uint32_t color)
+{
+	std::function<void(QPalette::ColorGroup)> func;
+
+#define DEF_PALETTE_ASSIGN(name) \
+	do { \
+		func = [&] (QPalette::ColorGroup group) \
+		{ \
+			pal.setColor(group, QPalette::name, \
+					QColor::fromRgb(color)); \
+		}; \
+	} while (false)
+
+	if (astrcmpi(name, "alternateBase") == 0) {
+		DEF_PALETTE_ASSIGN(AlternateBase);
+	} else if (astrcmpi(name, "base") == 0) {
+		DEF_PALETTE_ASSIGN(Base);
+	} else if (astrcmpi(name, "brightText") == 0) {
+		DEF_PALETTE_ASSIGN(BrightText);
+	} else if (astrcmpi(name, "button") == 0) {
+		DEF_PALETTE_ASSIGN(Button);
+	} else if (astrcmpi(name, "buttonText") == 0) {
+		DEF_PALETTE_ASSIGN(ButtonText);
+	} else if (astrcmpi(name, "brightText") == 0) {
+		DEF_PALETTE_ASSIGN(BrightText);
+	} else if (astrcmpi(name, "dark") == 0) {
+		DEF_PALETTE_ASSIGN(Dark);
+	} else if (astrcmpi(name, "highlight") == 0) {
+		DEF_PALETTE_ASSIGN(Highlight);
+	} else if (astrcmpi(name, "highlightedText") == 0) {
+		DEF_PALETTE_ASSIGN(HighlightedText);
+	} else if (astrcmpi(name, "light") == 0) {
+		DEF_PALETTE_ASSIGN(Light);
+	} else if (astrcmpi(name, "link") == 0) {
+		DEF_PALETTE_ASSIGN(Link);
+	} else if (astrcmpi(name, "linkVisited") == 0) {
+		DEF_PALETTE_ASSIGN(LinkVisited);
+	} else if (astrcmpi(name, "mid") == 0) {
+		DEF_PALETTE_ASSIGN(Mid);
+	} else if (astrcmpi(name, "midlight") == 0) {
+		DEF_PALETTE_ASSIGN(Midlight);
+	} else if (astrcmpi(name, "shadow") == 0) {
+		DEF_PALETTE_ASSIGN(Shadow);
+	} else if (astrcmpi(name, "text") == 0 ||
+	           astrcmpi(name, "foreground") == 0) {
+		DEF_PALETTE_ASSIGN(Text);
+	} else if (astrcmpi(name, "toolTipBase") == 0) {
+		DEF_PALETTE_ASSIGN(ToolTipBase);
+	} else if (astrcmpi(name, "toolTipText") == 0) {
+		DEF_PALETTE_ASSIGN(ToolTipText);
+	} else if (astrcmpi(name, "windowText") == 0) {
+		DEF_PALETTE_ASSIGN(WindowText);
+	} else if (astrcmpi(name, "window") == 0 ||
+	           astrcmpi(name, "background") == 0) {
+		DEF_PALETTE_ASSIGN(Window);
+	} else {
+		return;
+	}
+
+#undef DEF_PALETTE_ASSIGN
+
+	switch (group) {
+	case QPalette::Disabled:
+	case QPalette::Active:
+	case QPalette::Inactive:
+		func((QPalette::ColorGroup)group);
+		break;
+	default:
+		func((QPalette::ColorGroup)QPalette::Disabled);
+		func((QPalette::ColorGroup)QPalette::Active);
+		func((QPalette::ColorGroup)QPalette::Inactive);
+	}
+}
+
+struct CFParser {
+	cf_parser cfp = {};
+	inline ~CFParser() {cf_parser_free(&cfp);}
+	inline operator cf_parser*() {return &cfp;}
+	inline cf_parser *operator->() {return &cfp;}
+};
+
+void OBSApp::ParseExtraThemeData(const char *path)
+{
+	BPtr<char> data = os_quick_read_utf8_file(path);
+	QPalette pal = palette();
+	CFParser cfp;
+	int ret;
+
+	cf_parser_parse(cfp, data, path);
+
+	while (cf_go_to_token(cfp, "OBSTheme", nullptr)) {
+		if (!cf_next_token(cfp)) return;
+
+		int group = -1;
+
+		if (cf_token_is(cfp, ":")) {
+			ret = cf_next_token_should_be(cfp, ":", nullptr,
+					nullptr);
+			if (ret != PARSE_SUCCESS) continue;
+
+			if (!cf_next_token(cfp)) return;
+
+			if (cf_token_is(cfp, "disabled")) {
+				group = QPalette::Disabled;
+			} else if (cf_token_is(cfp, "active")) {
+				group = QPalette::Active;
+			} else if (cf_token_is(cfp, "inactive")) {
+				group = QPalette::Inactive;
+			} else {
+				continue;
+			}
+
+			if (!cf_next_token(cfp)) return;
+		}
+
+		if (!cf_token_is(cfp, "{")) continue;
+
+		for (;;) {
+			if (!cf_next_token(cfp)) return;
+
+			ret = cf_token_is_type(cfp, CFTOKEN_NAME, "name",
+					nullptr);
+			if (ret != PARSE_SUCCESS)
+				break;
+
+			DStr name;
+			dstr_copy_strref(name, &cfp->cur_token->str);
+
+			ret = cf_next_token_should_be(cfp, ":", ";",
+					nullptr);
+			if (ret != PARSE_SUCCESS) continue;
+
+			if (!cf_next_token(cfp)) return;
+
+			const char *array;
+			uint32_t color = 0;
+
+			if (cf_token_is(cfp, "#")) {
+				array = cfp->cur_token->str.array;
+				color = strtol(array + 1, nullptr, 16);
+
+			} else if (cf_token_is(cfp, "rgb")) {
+				ret = cf_next_token_should_be(cfp, "(", ";",
+						nullptr);
+				if (ret != PARSE_SUCCESS) continue;
+				if (!cf_next_token(cfp)) return;
+
+				array = cfp->cur_token->str.array;
+				color |= strtol(array, nullptr, 10) << 16;
+
+				ret = cf_next_token_should_be(cfp, ",", ";",
+						nullptr);
+				if (ret != PARSE_SUCCESS) continue;
+				if (!cf_next_token(cfp)) return;
+
+				array = cfp->cur_token->str.array;
+				color |= strtol(array, nullptr, 10) << 8;
+
+				ret = cf_next_token_should_be(cfp, ",", ";",
+						nullptr);
+				if (ret != PARSE_SUCCESS) continue;
+				if (!cf_next_token(cfp)) return;
+
+				array = cfp->cur_token->str.array;
+				color |= strtol(array, nullptr, 10);
+
+			} else if (cf_token_is(cfp, "white")) {
+				color = 0xFFFFFF;
+
+			} else if (cf_token_is(cfp, "black")) {
+				color = 0;
+			}
+
+			if (!cf_go_to_token(cfp, ";", nullptr)) return;
+
+			AddExtraThemeColor(pal, group, name->array, color);
+		}
+
+		ret = cf_token_should_be(cfp, "}", "}", nullptr);
+		if (ret != PARSE_SUCCESS) continue;
+	}
+
+	setPalette(pal);
+}
+
 bool OBSApp::SetTheme(std::string name, std::string path)
 {
 	theme = name;
@@ -748,12 +994,18 @@
 	}
 
 	QString mpath = QString("file:///") + path.c_str();
+	setPalette(defaultPalette);
 	setStyleSheet(mpath);
+	ParseExtraThemeData(path.c_str());
+
+	emit StyleChanged();
 	return true;
 }
 
 bool OBSApp::InitTheme()
 {
+	defaultPalette = palette();
+
 	const char *themeName = config_get_string(globalConfig, "General",
 			"CurrentTheme");
 	if (!themeName) {
@@ -916,6 +1168,9 @@
 		EnableOSXVSync(false);
 #endif
 
+	enableHotkeysInFocus = !config_get_bool(globalConfig, "General",
+			"DisableHotkeysInFocus");
+
 	move_basic_to_profiles();
 	move_basic_to_scene_collections();
 
@@ -942,6 +1197,18 @@
 	return obs_startup(locale, path, store);
 }
 
+inline void OBSApp::ResetHotkeyState(bool inFocus)
+{
+	obs_hotkey_enable_background_press(
+			inFocus || enableHotkeysInFocus);
+}
+
+void OBSApp::EnableInFocusHotkeys(bool enable)
+{
+	enableHotkeysInFocus = enable;
+	ResetHotkeyState(applicationState() != Qt::ApplicationActive);
+}
+
 bool OBSApp::OBSInit()
 {
 	ProfileScope("OBSApp::OBSInit");
@@ -960,6 +1227,19 @@
 		if (!StartupOBS(locale.c_str(), GetProfilerNameStore()))
 			return false;
 
+#ifdef _WIN32
+		bool browserHWAccel = config_get_bool(globalConfig, "General",
+				"BrowserHWAccel");
+
+		obs_data_t *settings = obs_data_create();
+		obs_data_set_bool(settings, "BrowserHWAccel", browserHWAccel);
+		obs_apply_private_data(settings);
+		obs_data_release(settings);
+
+		blog(LOG_INFO, "Browser Hardware Acceleration: %s",
+				browserHWAccel ? "true" : "false");
+#endif
+
 		blog(LOG_INFO, "Portable mode: %s",
 				portable_mode ? "true" : "false");
 
@@ -973,13 +1253,12 @@
 		mainWindow->OBSInit();
 
 		connect(this, &QGuiApplication::applicationStateChanged,
-				[](Qt::ApplicationState state)
+				[this](Qt::ApplicationState state)
 				{
-					obs_hotkey_enable_background_press(
+					ResetHotkeyState(
 						state != Qt::ApplicationActive);
 				});
-		obs_hotkey_enable_background_press(
-				applicationState() != Qt::ApplicationActive);
+		ResetHotkeyState(applicationState() != Qt::ApplicationActive);
 		return true;
 	} else {
 		return false;
@@ -1002,7 +1281,9 @@
 
 #ifdef _WIN32
 	if (sizeof(void*) == 8)
-		ver << "64bit, ";
+		ver << "64-bit, ";
+	else
+		ver << "32-bit, ";
 
 	ver << "windows)";
 #elif __APPLE__
@@ -1366,33 +1647,32 @@
 
 	OBSApp program(argc, argv, profilerNameStore.get());
 	try {
-		program.AppInit();
+		bool created_log = false;
 
-		OBSTranslator translator;
-
-		create_log_file(logFile);
+		program.AppInit();
 		delete_oldest_file(false, "obs-studio/profiler_data");
 
+		OBSTranslator translator;
 		program.installTranslator(&translator);
 
 #ifdef _WIN32
 		/* --------------------------------------- */
 		/* check and warn if already running       */
 
+		bool cancel_launch = false;
 		bool already_running = false;
 		RunOnceMutex rom = GetRunOnceMutex(already_running);
 
-		if (already_running && !multi) {
-			blog(LOG_WARNING, "\n================================");
-			blog(LOG_WARNING, "Warning: OBS is already running!");
-			blog(LOG_WARNING, "================================\n");
+		if (!already_running) {
+			goto run;
+		}
 
+		if (!multi) {
 			QMessageBox::StandardButtons buttons(
 					QMessageBox::Yes | QMessageBox::Cancel);
 			QMessageBox mb(QMessageBox::Question,
 					QTStr("AlreadyRunning.Title"),
-					QTStr("AlreadyRunning.Text"),
-					buttons,
+					QTStr("AlreadyRunning.Text"), buttons,
 					nullptr);
 			mb.setButtonText(QMessageBox::Yes,
 					QTStr("AlreadyRunning.LaunchAnyway"));
@@ -1401,23 +1681,37 @@
 
 			QMessageBox::StandardButton button;
 			button = (QMessageBox::StandardButton)mb.exec();
-			if (button == QMessageBox::Cancel) {
-				blog(LOG_INFO, "User shut down the program "
-						"because OBS was already "
-						"running");
-				return 0;
-			}
+			cancel_launch = button == QMessageBox::Cancel;
+		}
 
-			blog(LOG_WARNING, "User is now running a secondary "
-					"instance of OBS!");
+		if (cancel_launch)
+			return 0;
 
-		} else if (already_running && multi) {
+		if (!created_log) {
+			create_log_file(logFile);
+			created_log = true;
+		}
+
+		if (multi) {
 			blog(LOG_INFO, "User enabled --multi flag and is now "
 					"running multiple instances of OBS.");
+		} else {
+			blog(LOG_WARNING, "================================");
+			blog(LOG_WARNING, "Warning: OBS is already running!");
+			blog(LOG_WARNING, "================================");
+			blog(LOG_WARNING, "User is now running multiple "
+					"instances of OBS!");
 		}
 
 		/* --------------------------------------- */
+run:
 #endif
+
+		if (!created_log) {
+			create_log_file(logFile);
+			created_log = true;
+		}
+
 		if (argc > 1) {
 			stringstream stor;
 			stor << argv[1];
@@ -1887,6 +2181,7 @@
 #endif
 
 #ifdef _WIN32
+	obs_init_win32_crash_handler();
 	SetErrorMode(SEM_FAILCRITICALERRORS);
 	load_debug_privilege();
 	base_set_crash_handler(main_crash_handler, nullptr);

obs-studio-21.1.2.tar.xz/UI/obs-app.hpp -> obs-studio-22.0.1.tar.xz/UI/obs-app.hpp Changed

@@ -73,13 +73,26 @@
 	os_inhibit_t                   *sleepInhibitor = nullptr;
 	int                            sleepInhibitRefs = 0;
 
+	bool                           enableHotkeysInFocus = true;
+
+
 	std::deque<obs_frontend_translate_ui_cb> translatorHooks;
 
+	bool UpdatePre22MultiviewLayout(const char *layout);
+
 	bool InitGlobalConfig();
 	bool InitGlobalConfigDefaults();
 	bool InitLocale();
 	bool InitTheme();
 
+	inline void ResetHotkeyState(bool inFocus);
+
+	QPalette defaultPalette;
+
+	void ParseExtraThemeData(const char *path);
+	void AddExtraThemeColor(QPalette &pal, int group,
+			const char *name, uint32_t color);
+
 public:
 	OBSApp(int &argc, char **argv, profiler_name_store_t *store);
 	~OBSApp();
@@ -87,6 +100,8 @@
 	void AppInit();
 	bool OBSInit();
 
+	void EnableInFocusHotkeys(bool enable);
+
 	inline QMainWindow *GetMainWindow() const {return mainWindow.data();}
 
 	inline config_t *GlobalConfig() const {return globalConfig;}
@@ -150,6 +165,9 @@
 	{
 		translatorHooks.pop_front();
 	}
+
+signals:
+	void StyleChanged();
 };
 
 int GetConfigPath(char *path, size_t size, const char *name);

obs-studio-21.1.2.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp -> obs-studio-22.0.1.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp Changed

obs-studio-21.1.2.tar.xz/UI/obs-frontend-api/obs-frontend-api.h -> obs-studio-22.0.1.tar.xz/UI/obs-frontend-api/obs-frontend-api.h Changed

@@ -42,7 +42,8 @@
 	OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED,
 	OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED,
 
-	OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP
+	OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP,
+	OBS_FRONTEND_EVENT_FINISHED_LOADING
 };
 
 /* ------------------------------------------------------------------------- */
@@ -95,6 +96,7 @@
 EXPORT char **obs_frontend_get_scene_collections(void);
 EXPORT char *obs_frontend_get_current_scene_collection(void);
 EXPORT void obs_frontend_set_current_scene_collection(const char *collection);
+EXPORT bool obs_frontend_add_scene_collection(const char *name);
 
 EXPORT char **obs_frontend_get_profiles(void);
 EXPORT char *obs_frontend_get_current_profile(void);
@@ -150,6 +152,8 @@
 EXPORT bool obs_frontend_replay_buffer_active(void);
 
 EXPORT void obs_frontend_save(void);
+EXPORT void obs_frontend_defer_save_begin(void);
+EXPORT void obs_frontend_defer_save_end(void);
 
 EXPORT obs_output_t *obs_frontend_get_streaming_output(void);
 EXPORT obs_output_t *obs_frontend_get_recording_output(void);

obs-studio-21.1.2.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp -> obs-studio-22.0.1.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp Changed

obs-studio-21.1.2.tar.xz/UI/platform-osx.mm -> obs-studio-22.0.1.tar.xz/UI/platform-osx.mm Changed

obs-studio-21.1.2.tar.xz/UI/platform.hpp -> obs-studio-22.0.1.tar.xz/UI/platform.hpp Changed

obs-studio-21.1.2.tar.xz/UI/properties-view.cpp -> obs-studio-22.0.1.tar.xz/UI/properties-view.cpp Changed

@@ -576,6 +576,10 @@
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *item = obs_data_array_item(array, i);
 		list->addItem(QT_UTF8(obs_data_get_string(item, "value")));
+		list->setItemSelected(list->item((int)i),
+				obs_data_get_bool(item, "selected"));
+		list->setItemHidden(list->item((int)i),
+				obs_data_get_bool(item, "hidden"));
 		obs_data_release(item);
 	}
 
@@ -634,9 +638,16 @@
 	button->setText(QTStr("Basic.PropertiesWindow.SelectColor"));
 	button->setToolTip(QT_UTF8(obs_property_long_description(prop)));
 
+	color.setAlpha(255);
+
+	QPalette palette = QPalette(color);
 	colorLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
 	colorLabel->setText(color.name(QColor::HexArgb));
-	colorLabel->setPalette(QPalette(color));
+	colorLabel->setPalette(palette);
+	colorLabel->setStyleSheet(
+		QString("background-color :%1; color: %2;")
+			.arg(palette.color(QPalette::Window).name(QColor::HexArgb))
+			.arg(palette.color(QPalette::WindowText).name(QColor::HexArgb)));
 	colorLabel->setAutoFillBackground(true);
 	colorLabel->setAlignment(Qt::AlignCenter);
 	colorLabel->setToolTip(QT_UTF8(obs_property_long_description(prop)));
@@ -1626,13 +1637,19 @@
 #endif
 
 	color = QColorDialog::getColor(color, view, QT_UTF8(desc), options);
+	color.setAlpha(255);
 
 	if (!color.isValid())
 		return false;
 
 	QLabel *label = static_cast<QLabel*>(widget);
 	label->setText(color.name(QColor::HexArgb));
-	label->setPalette(QPalette(color));
+	QPalette palette = QPalette(color);
+	label->setPalette(palette);
+	label->setStyleSheet(
+		QString("background-color :%1; color: %2;")
+			.arg(palette.color(QPalette::Window).name(QColor::HexArgb))
+			.arg(palette.color(QPalette::WindowText).name(QColor::HexArgb)));
 
 	obs_data_set_int(view->settings, setting, color_to_int(color));
 
@@ -1690,7 +1707,10 @@
 		obs_data_t *arrayItem = obs_data_create();
 		obs_data_set_string(arrayItem, "value",
 				QT_TO_UTF8(item->text()));
-
+		obs_data_set_bool(arrayItem, "selected",
+			item->isSelected());
+		obs_data_set_bool(arrayItem, "hidden",
+			item->isHidden());
 		obs_data_array_push_back(array, arrayItem);
 		obs_data_release(arrayItem);
 	}

obs-studio-21.1.2.tar.xz/UI/qt-wrappers.hpp -> obs-studio-22.0.1.tar.xz/UI/qt-wrappers.hpp Changed

obs-studio-21.1.2.tar.xz/UI/slider-absoluteset-style.hpp -> obs-studio-22.0.1.tar.xz/UI/slider-absoluteset-style.hpp Changed

obs-studio-22.0.1.tar.xz/UI/source-tree.cpp Added

@@ -0,0 +1,1386 @@
+#include "window-basic-main.hpp"
+#include "obs-app.hpp"
+#include "source-tree.hpp"
+#include "qt-wrappers.hpp"
+#include "visibility-checkbox.hpp"
+#include "locked-checkbox.hpp"
+#include "expand-checkbox.hpp"
+
+#include <obs-frontend-api.h>
+#include <obs.h>
+
+#include <string>
+
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpacerItem>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QMouseEvent>
+
+#include <QStylePainter>
+#include <QStyleOptionFocusRect>
+
+static inline OBSScene GetCurrentScene()
+{
+	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
+	return main->GetCurrentScene();
+}
+
+/* ========================================================================= */
+
+SourceTreeItem::SourceTreeItem(SourceTree *tree_, OBSSceneItem sceneitem_)
+	: tree         (tree_),
+	  sceneitem    (sceneitem_)
+{
+	setAttribute(Qt::WA_TranslucentBackground);
+
+	obs_source_t *source = obs_sceneitem_get_source(sceneitem);
+	const char *name = obs_source_get_name(source);
+
+	obs_data_t *privData = obs_sceneitem_get_private_settings(sceneitem);
+	int preset = obs_data_get_int(privData, "color-preset");
+
+	if (preset == 1) {
+		const char *color = obs_data_get_string(privData, "color");
+		std::string col = "background: ";
+		col += color;
+		setStyleSheet(col.c_str());
+	} else if (preset > 1) {
+		setStyleSheet("");
+		setProperty("bgColor", preset - 1);
+	} else {
+		setStyleSheet("background: none");
+	}
+
+	obs_data_release(privData);
+
+	vis = new VisibilityCheckBox();
+	vis->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+	vis->setMaximumSize(16, 16);
+	vis->setChecked(obs_sceneitem_visible(sceneitem));
+
+	lock = new LockedCheckBox();
+	lock->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+	lock->setMaximumSize(16, 16);
+	lock->setChecked(obs_sceneitem_locked(sceneitem));
+
+	label = new QLabel(QT_UTF8(name));
+	label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+	label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+	label->setAttribute(Qt::WA_TranslucentBackground);
+
+#ifdef __APPLE__
+	vis->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+	lock->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+#endif
+
+	boxLayout = new QHBoxLayout();
+	boxLayout->setContentsMargins(1, 1, 2, 1);
+	boxLayout->setSpacing(1);
+	boxLayout->addWidget(label);
+	boxLayout->addWidget(vis);
+	boxLayout->addWidget(lock);
+
+	Update(false);
+
+	setLayout(boxLayout);
+
+	/* --------------------------------------------------------- */
+
+	auto setItemVisible = [this] (bool checked)
+	{
+		SignalBlocker sourcesSignalBlocker(this);
+		obs_sceneitem_set_visible(sceneitem, checked);
+	};
+
+	auto setItemLocked = [this] (bool checked)
+	{
+		SignalBlocker sourcesSignalBlocker(this);
+		obs_sceneitem_set_locked(sceneitem, checked);
+	};
+
+	connect(vis, &QAbstractButton::clicked, setItemVisible);
+	connect(lock, &QAbstractButton::clicked, setItemLocked);
+}
+
+void SourceTreeItem::paintEvent(QPaintEvent *event)
+{
+	QStyleOption opt;
+	opt.init(this);
+	QPainter p(this);
+	style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+
+	QWidget::paintEvent(event);
+}
+
+void SourceTreeItem::DisconnectSignals()
+{
+	sceneRemoveSignal.Disconnect();
+	itemRemoveSignal.Disconnect();
+	deselectSignal.Disconnect();
+	visibleSignal.Disconnect();
+	renameSignal.Disconnect();
+	removeSignal.Disconnect();
+}
+
+void SourceTreeItem::ReconnectSignals()
+{
+	if (!sceneitem)
+		return;
+
+	DisconnectSignals();
+
+	/* --------------------------------------------------------- */
+
+	auto removeItem = [] (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_->tree,
+					"Remove",
+					Q_ARG(OBSSceneItem, curItem));
+			curItem = nullptr;
+		}
+		if (!curItem) {
+			this_->DisconnectSignals();
+			this_->sceneitem = nullptr;
+		}
+	};
+
+	auto itemVisible = [] (void *data, calldata_t *cd)
+	{
+		SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem*>(data);
+		obs_sceneitem_t *curItem =
+			(obs_sceneitem_t*)calldata_ptr(cd, "item");
+		bool visible = calldata_bool(cd, "visible");
+
+		if (curItem == this_->sceneitem)
+			QMetaObject::invokeMethod(this_, "VisibilityChanged",
+					Q_ARG(bool, visible));
+	};
+
+	auto itemDeselect = [] (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_, "Deselect");
+	};
+
+	auto reorderGroup = [] (void *data, calldata_t*)
+	{
+		SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem*>(data);
+		QMetaObject::invokeMethod(this_->tree, "ReorderItems");
+	};
+
+	obs_scene_t *scene = obs_sceneitem_get_scene(sceneitem);
+	obs_source_t *sceneSource = obs_scene_get_source(scene);
+	signal_handler_t *signal = obs_source_get_signal_handler(sceneSource);
+
+	sceneRemoveSignal.Connect(signal, "remove", removeItem, this);
+	itemRemoveSignal.Connect(signal, "item_remove", removeItem, this);
+	visibleSignal.Connect(signal, "item_visible", itemVisible, this);
+
+	if (obs_sceneitem_is_group(sceneitem)) {
+		obs_source_t *source = obs_sceneitem_get_source(sceneitem);
+		signal = obs_source_get_signal_handler(source);
+
+		groupReorderSignal.Connect(signal, "reorder", reorderGroup,
+				this);
+	}
+
+	if (scene != GetCurrentScene())
+		deselectSignal.Connect(signal, "item_deselect", itemDeselect,
+				this);
+
+	/* --------------------------------------------------------- */
+
+	auto renamed = [] (void *data, calldata_t *cd)
+	{
+		SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem*>(data);
+		const char *name = calldata_string(cd, "new_name");
+
+		QMetaObject::invokeMethod(this_, "Renamed",
+				Q_ARG(QString, QT_UTF8(name)));
+	};
+
+	auto removeSource = [] (void *data, calldata_t *)
+	{
+		SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem*>(data);
+		this_->DisconnectSignals();
+		this_->sceneitem = nullptr;
+	};
+
+	obs_source_t *source = obs_sceneitem_get_source(sceneitem);
+	signal = obs_source_get_signal_handler(source);
+	renameSignal.Connect(signal, "rename", renamed, this);
+	removeSignal.Connect(signal, "remove", removeSource, this);
+}
+
+void SourceTreeItem::mouseDoubleClickEvent(QMouseEvent *event)
+{
+	QWidget::mouseDoubleClickEvent(event);
+
+	if (expand) {
+		expand->setChecked(!expand->isChecked());
+	} else {
+		obs_source_t *source = obs_sceneitem_get_source(sceneitem);
+		OBSBasic *main =
+			reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
+		if (source) {
+			main->CreatePropertiesWindow(source);
+		}
+	}
+}
+
+void SourceTreeItem::EnterEditMode()
+{
+	setFocusPolicy(Qt::StrongFocus);
+	boxLayout->removeWidget(label);
+	editor = new QLineEdit(label->text());
+	editor->installEventFilter(this);
+	boxLayout->insertWidget(1, editor);
+	setFocusProxy(editor);
+}
+
+void SourceTreeItem::ExitEditMode(bool save)
+{
+	if (!editor)
+		return;
+
+	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
+	OBSScene scene = main->GetCurrentScene();
+
+	std::string newName = QT_TO_UTF8(editor->text());
+
+	setFocusProxy(nullptr);
+	boxLayout->removeWidget(editor);
+	delete editor;
+	editor = nullptr;
+	setFocusPolicy(Qt::NoFocus);
+	boxLayout->insertWidget(1, label);
+
+	/* ----------------------------------------- */
+	/* check for empty string                    */
+
+	if (!save)
+		return;
+
+	if (newName.empty()) {
+		OBSMessageBox::information(main,
+			QTStr("NoNameEntered.Title"),
+			QTStr("NoNameEntered.Text"));
+		return;
+	}
+
+	/* ----------------------------------------- */
+	/* Check for same name                       */
+
+	obs_source_t *source = obs_sceneitem_get_source(sceneitem);
+	if (newName == obs_source_get_name(source))
+		return;
+
+	/* ----------------------------------------- */
+	/* check for existing source                 */
+
+	obs_source_t *existingSource =
+		obs_get_source_by_name(newName.c_str());
+	obs_source_release(existingSource);
+	bool exists = !!existingSource;
+
+	if (exists) {
+		OBSMessageBox::information(main,
+			QTStr("NameExists.Title"),
+			QTStr("NameExists.Text"));
+		return;
+	}
+
+	/* ----------------------------------------- */
+	/* rename                                    */
+
+	SignalBlocker sourcesSignalBlocker(this);
+	obs_source_set_name(source, newName.c_str());
+	label->setText(QT_UTF8(newName.c_str()));
+}
+
+bool SourceTreeItem::eventFilter(QObject *object, QEvent *event)
+{
+	if (editor != object)
+		return false;
+
+	if (event->type() == QEvent::KeyPress) {
+		QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+
+		switch (keyEvent->key()) {
+		case Qt::Key_Escape:
+			QMetaObject::invokeMethod(this, "ExitEditMode",
+					Qt::QueuedConnection,
+					Q_ARG(bool, false));
+			return true;
+		case Qt::Key_Tab:
+		case Qt::Key_Backtab:
+		case Qt::Key_Enter:
+		case Qt::Key_Return:
+			QMetaObject::invokeMethod(this, "ExitEditMode",
+					Qt::QueuedConnection,
+					Q_ARG(bool, true));
+			return true;
+		}
+	} else if (event->type() == QEvent::FocusOut) {
+		QMetaObject::invokeMethod(this, "ExitEditMode",
+				Qt::QueuedConnection,
+				Q_ARG(bool, true));
+		return true;
+	}
+
+	return false;
+}
+
+void SourceTreeItem::VisibilityChanged(bool visible)
+{
+	vis->setChecked(visible);
+}
+
+void SourceTreeItem::Renamed(const QString &name)
+{
+	label->setText(name);
+}
+
+void SourceTreeItem::Update(bool force)
+{
+	OBSScene scene = GetCurrentScene();
+	obs_scene_t *itemScene = obs_sceneitem_get_scene(sceneitem);
+
+	Type newType;
+
+	/* ------------------------------------------------- */
+	/* if it's a group item, insert group checkbox       */
+
+	if (obs_sceneitem_is_group(sceneitem)) {
+		newType = Type::Group;
+
+	/* ------------------------------------------------- */
+	/* if it's a group sub-item                          */
+
+	} else if (itemScene != scene) {
+		newType = Type::SubItem;
+
+	/* ------------------------------------------------- */
+	/* if it's a regular item                            */
+
+	} else {
+		newType = Type::Item;
+	}
+
+	/* ------------------------------------------------- */
+
+	if (!force && newType == type) {
+		return;
+	}
+
+	/* ------------------------------------------------- */
+
+	ReconnectSignals();
+
+	if (spacer) {
+		boxLayout->removeItem(spacer);
+		delete spacer;
+		spacer = nullptr;
+	}
+
+	if (type == Type::Group) {
+		boxLayout->removeWidget(expand);
+		expand->deleteLater();
+		expand = nullptr;
+	}
+
+	type = newType;
+
+	if (type == Type::SubItem) {
+		spacer = new QSpacerItem(16, 1);
+		boxLayout->insertItem(0, spacer);
+
+	} else if (type == Type::Group) {
+		expand = new SourceTreeSubItemCheckBox();
+		expand->setSizePolicy(
+				QSizePolicy::Maximum,
+				QSizePolicy::Maximum);
+		expand->setMaximumSize(10, 16);
+		expand->setMinimumSize(10, 0);
+#ifdef __APPLE__
+		expand->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+#endif
+		boxLayout->insertWidget(0, expand);
+
+		obs_data_t *data = obs_sceneitem_get_private_settings(sceneitem);
+		expand->blockSignals(true);
+		expand->setChecked(obs_data_get_bool(data, "collapsed"));
+		expand->blockSignals(false);
+		obs_data_release(data);
+
+		connect(expand, &QPushButton::toggled,
+				this, &SourceTreeItem::ExpandClicked);
+
+	} else {
+		spacer = new QSpacerItem(3, 1);
+		boxLayout->insertItem(0, spacer);
+	}
+}
+
+void SourceTreeItem::ExpandClicked(bool checked)
+{
+	OBSData data = obs_sceneitem_get_private_settings(sceneitem);
+	obs_data_release(data);
+
+	obs_data_set_bool(data, "collapsed", checked);
+
+	if (!checked)
+		tree->GetStm()->ExpandGroup(sceneitem);
+	else
+		tree->GetStm()->CollapseGroup(sceneitem);
+}
+
+void SourceTreeItem::Deselect()
+{
+	tree->SelectItem(sceneitem, false);
+}
+
+/* ========================================================================= */
+
+void SourceTreeModel::OBSFrontendEvent(enum obs_frontend_event event, void *ptr)
+{
+	SourceTreeModel *stm = reinterpret_cast<SourceTreeModel *>(ptr);
+
+	switch ((int)event) {
+	case OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED:
+		stm->SceneChanged();
+		break;
+	case OBS_FRONTEND_EVENT_EXIT:
+	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP:
+		stm->Clear();
+		break;
+	}
+}
+
+void SourceTreeModel::Clear()
+{
+	beginResetModel();
+	items.clear();
+	endResetModel();
+
+	hasGroups = false;
+}
+
+static bool enumItem(obs_scene_t*, obs_sceneitem_t *item, void *ptr)
+{
+	QVector<OBSSceneItem> &items =
+		*reinterpret_cast<QVector<OBSSceneItem>*>(ptr);
+
+	if (obs_sceneitem_is_group(item)) {
+		obs_data_t *data = obs_sceneitem_get_private_settings(item);
+
+		bool collapse = obs_data_get_bool(data, "collapsed");
+		if (!collapse) {
+			obs_scene_t *scene =
+				obs_sceneitem_group_get_scene(item);
+
+			obs_scene_enum_items(scene, enumItem, &items);
+		}
+
+		obs_data_release(data);
+	}
+
+	items.insert(0, item);
+	return true;
+}
+
+void SourceTreeModel::SceneChanged()
+{
+	OBSScene scene = GetCurrentScene();
+
+	beginResetModel();
+	items.clear();
+	obs_scene_enum_items(scene, enumItem, &items);
+	endResetModel();
+
+	UpdateGroupState(false);
+	st->ResetWidgets();
+
+	for (int i = 0; i < items.count(); i++) {
+		bool select = obs_sceneitem_selected(items[i]);
+		QModelIndex index = createIndex(i, 0);
+
+		st->selectionModel()->select(index, select
+				? QItemSelectionModel::Select
+				: QItemSelectionModel::Deselect);
+	}
+}
+
+/* moves a scene item index (blame linux distros for using older Qt builds) */
+static inline void MoveItem(QVector<OBSSceneItem> &items, int oldIdx, int newIdx)
+{
+	OBSSceneItem item = items[oldIdx];
+	items.remove(oldIdx);
+	items.insert(newIdx, item);
+}
+
+/* reorders list optimally with model reorder funcs */
+void SourceTreeModel::ReorderItems()
+{
+	OBSScene scene = GetCurrentScene();
+
+	QVector<OBSSceneItem> newitems;
+	obs_scene_enum_items(scene, enumItem, &newitems);
+
+	/* if item list has changed size, do full reset */
+	if (newitems.count() != items.count()) {
+		SceneChanged();
+		return;
+	}
+
+	for (;;) {
+		int idx1Old = 0;
+		int idx1New = 0;
+		int count;
+		int i;
+
+		/* find first starting changed item index */
+		for (i = 0; i < newitems.count(); i++) {
+			obs_sceneitem_t *oldItem = items[i];
+			obs_sceneitem_t *newItem = newitems[i];
+			if (oldItem != newItem) {
+				idx1Old = i;
+				break;
+			}
+		}
+
+		/* if everything is the same, break */
+		if (i == newitems.count()) {
+			break;
+		}
+
+		/* find new starting index */
+		for (i = idx1Old + 1; i < newitems.count(); i++) {
+			obs_sceneitem_t *oldItem = items[idx1Old];
+			obs_sceneitem_t *newItem = newitems[i];
+
+			if (oldItem == newItem) {
+				idx1New = i;
+				break;
+			}
+		}
+
+		/* if item could not be found, do full reset */
+		if (i == newitems.count()) {
+			SceneChanged();
+			return;
+		}
+
+		/* get move count */
+		for (count = 1; (idx1New + count) < newitems.count(); count++) {
+			int oldIdx = idx1Old + count;
+			int newIdx = idx1New + count;
+
+			obs_sceneitem_t *oldItem = items[oldIdx];
+			obs_sceneitem_t *newItem = newitems[newIdx];
+
+			if (oldItem != newItem) {
+				break;
+			}
+		}
+
+		/* move items */
+		beginMoveRows(QModelIndex(), idx1Old, idx1Old + count - 1,
+		              QModelIndex(), idx1New + count);
+		for (i = 0; i < count; i++) {
+			int to = idx1New + count;
+			if (to > idx1Old)
+				to--;
+			MoveItem(items, idx1Old, to);
+		}
+		endMoveRows();
+	}
+}
+
+void SourceTreeModel::Add(obs_sceneitem_t *item)
+{
+	if (obs_sceneitem_is_group(item)) {
+		SceneChanged();
+	} else {
+		beginInsertRows(QModelIndex(), 0, 0);
+		items.insert(0, item);
+		endInsertRows();
+
+		st->UpdateWidget(createIndex(0, 0, nullptr), item);
+	}
+}
+
+void SourceTreeModel::Remove(obs_sceneitem_t *item)
+{
+	int idx = -1;
+	for (int i = 0; i < items.count(); i++) {
+		if (items[i] == item) {
+			idx = i;
+			break;
+		}
+	}
+
+	if (idx == -1)
+		return;
+
+	int startIdx = idx;
+	int endIdx = idx;
+
+	bool is_group = obs_sceneitem_is_group(item);
+	if (is_group) {
+		obs_scene_t *scene = obs_sceneitem_group_get_scene(item);
+
+		for (int i = endIdx + 1; i < items.count(); i++) {
+			obs_sceneitem_t *subitem = items[i];
+			obs_scene_t *subscene =
+				obs_sceneitem_get_scene(subitem);
+
+			if (subscene == scene)
+				endIdx = i;
+			else
+				break;
+		}
+	}
+
+	beginRemoveRows(QModelIndex(), startIdx, endIdx);
+	items.remove(idx, endIdx - startIdx + 1);
+	endRemoveRows();
+
+	if (is_group)
+		UpdateGroupState(true);
+}
+
+OBSSceneItem SourceTreeModel::Get(int idx)
+{
+	if (idx == -1 || idx >= items.count())
+		return OBSSceneItem();
+	return items[idx];
+}
+
+SourceTreeModel::SourceTreeModel(SourceTree *st_)
+	: QAbstractListModel (st_),
+	  st                 (st_)
+{
+	obs_frontend_add_event_callback(OBSFrontendEvent, this);
+}
+
+SourceTreeModel::~SourceTreeModel()
+{
+	obs_frontend_remove_event_callback(OBSFrontendEvent, this);
+}
+
+int SourceTreeModel::rowCount(const QModelIndex &parent) const
+{
+	return parent.isValid() ? 0 : items.count();
+}
+
+QVariant SourceTreeModel::data(const QModelIndex &, int) const
+{
+	return QVariant();
+}
+
+Qt::ItemFlags SourceTreeModel::flags(const QModelIndex &index) const
+{
+	if (!index.isValid())
+		return QAbstractListModel::flags(index) | Qt::ItemIsDropEnabled;
+
+	obs_sceneitem_t *item = items[index.row()];
+	bool is_group = obs_sceneitem_is_group(item);
+
+	return QAbstractListModel::flags(index) |
+	       Qt::ItemIsEditable |
+	       Qt::ItemIsDragEnabled |
+	       (is_group ? Qt::ItemIsDropEnabled : Qt::NoItemFlags);
+}
+
+Qt::DropActions SourceTreeModel::supportedDropActions() const
+{
+	return QAbstractItemModel::supportedDropActions() | Qt::MoveAction;
+}
+
+QString SourceTreeModel::GetNewGroupName()
+{
+	OBSScene scene = GetCurrentScene();
+	QString name = QTStr("Group");
+
+	int i = 2;
+	for (;;) {
+		obs_source_t *group = obs_get_source_by_name(QT_TO_UTF8(name));
+		obs_source_release(group);
+		if (!group)
+			break;
+		name = QTStr("Basic.Main.Group").arg(QString::number(i++));
+	}
+
+	return name;
+}
+
+void SourceTreeModel::AddGroup()
+{
+	QString name = GetNewGroupName();
+	obs_sceneitem_t *group = obs_scene_add_group(GetCurrentScene(),
+			QT_TO_UTF8(name));
+	if (!group)
+		return;
+
+	beginInsertRows(QModelIndex(), 0, 0);
+	items.insert(0, group);
+	endInsertRows();
+
+	st->UpdateWidget(createIndex(0, 0, nullptr), group);
+	UpdateGroupState(true);
+
+	QMetaObject::invokeMethod(st, "Edit", Qt::QueuedConnection,
+			Q_ARG(int, 0));
+}
+
+void SourceTreeModel::GroupSelectedItems(QModelIndexList &indices)
+{
+	if (indices.count() == 0)
+		return;
+
+	OBSScene scene = GetCurrentScene();
+	QString name = GetNewGroupName();
+
+	QVector<obs_sceneitem_t *> item_order;
+
+	for (int i = indices.count() - 1; i >= 0; i--) {
+		obs_sceneitem_t *item = items[indices[i].row()];
+		item_order << item;
+	}
+
+	obs_sceneitem_t *item = obs_scene_insert_group(
+			scene, QT_TO_UTF8(name),
+			item_order.data(), item_order.size());
+	if (!item) {
+		return;
+	}
+
+	for (obs_sceneitem_t *item : item_order)
+		obs_sceneitem_select(item, false);
+
+	int newIdx = indices[0].row();
+
+	beginInsertRows(QModelIndex(), newIdx, newIdx);
+	items.insert(newIdx, item);
+	endInsertRows();
+
+	for (int i = 0; i < indices.size(); i++) {
+		int fromIdx = indices[i].row() + 1;
+		int toIdx = newIdx + i + 1;
+		if (fromIdx != toIdx) {
+			beginMoveRows(QModelIndex(), fromIdx, fromIdx,
+			              QModelIndex(), toIdx);
+			MoveItem(items, fromIdx, toIdx);
+			endMoveRows();
+		}
+	}
+
+	hasGroups = true;
+	st->UpdateWidgets(true);
+
+	obs_sceneitem_select(item, true);
+
+	QMetaObject::invokeMethod(st, "Edit", Qt::QueuedConnection,
+			Q_ARG(int, newIdx));
+}
+
+void SourceTreeModel::UngroupSelectedGroups(QModelIndexList &indices)
+{
+	if (indices.count() == 0)
+		return;
+
+	for (int i = indices.count() - 1; i >= 0; i--) {
+		obs_sceneitem_t *item = items[indices[i].row()];
+		obs_sceneitem_group_ungroup(item);
+	}
+
+	SceneChanged();
+}
+
+void SourceTreeModel::ExpandGroup(obs_sceneitem_t *item)
+{
+	int itemIdx = items.indexOf(item);
+	if (itemIdx == -1)
+		return;
+
+	itemIdx++;
+
+	obs_scene_t *scene = obs_sceneitem_group_get_scene(item);
+
+	QVector<OBSSceneItem> subItems;
+	obs_scene_enum_items(scene, enumItem, &subItems);
+
+	if (!subItems.size())
+		return;
+
+	beginInsertRows(QModelIndex(), itemIdx, itemIdx + subItems.size() - 1);
+	for (int i = 0; i < subItems.size(); i++)
+		items.insert(i + itemIdx, subItems[i]);
+	endInsertRows();
+
+	st->UpdateWidgets();
+}
+
+void SourceTreeModel::CollapseGroup(obs_sceneitem_t *item)
+{
+	int startIdx = -1;
+	int endIdx = -1;
+
+	obs_scene_t *scene = obs_sceneitem_group_get_scene(item);
+
+	for (int i = 0; i < items.size(); i++) {
+		obs_scene_t *itemScene = obs_sceneitem_get_scene(items[i]);
+
+		if (itemScene == scene) {
+			if (startIdx == -1)
+				startIdx = i;
+			endIdx = i;
+		}
+	}
+
+	if (startIdx == -1)
+		return;
+
+	beginRemoveRows(QModelIndex(), startIdx, endIdx);
+	items.remove(startIdx, endIdx - startIdx + 1);
+	endRemoveRows();
+}
+
+void SourceTreeModel::UpdateGroupState(bool update)
+{
+	bool nowHasGroups = false;
+	for (auto &item : items) {
+		if (obs_sceneitem_is_group(item)) {
+			nowHasGroups = true;
+			break;
+		}
+	}
+
+	if (nowHasGroups != hasGroups) {
+		hasGroups = nowHasGroups;
+		if (update) {
+			st->UpdateWidgets(true);
+		}
+	}
+}
+
+/* ========================================================================= */
+
+SourceTree::SourceTree(QWidget *parent_) : QListView(parent_)
+{
+	SourceTreeModel *stm_ = new SourceTreeModel(this);
+	setModel(stm_);
+	setStyleSheet(QString(
+		"*[bgColor=\"1\"]{background-color:rgba(255,68,68,33%);}" \
+		"*[bgColor=\"2\"]{background-color:rgba(255,255,68,33%);}" \
+		"*[bgColor=\"3\"]{background-color:rgba(68,255,68,33%);}" \
+		"*[bgColor=\"4\"]{background-color:rgba(68,255,255,33%);}" \
+		"*[bgColor=\"5\"]{background-color:rgba(68,68,255,33%);}" \
+		"*[bgColor=\"6\"]{background-color:rgba(255,68,255,33%);}" \
+		"*[bgColor=\"7\"]{background-color:rgba(68,68,68,33%);}" \
+		"*[bgColor=\"8\"]{background-color:rgba(255,255,255,33%);}"));
+}
+
+void SourceTree::ResetWidgets()
+{
+	OBSScene scene = GetCurrentScene();
+
+	SourceTreeModel *stm = GetStm();
+	stm->UpdateGroupState(false);
+
+	for (int i = 0; i < stm->items.count(); i++) {
+		QModelIndex index = stm->createIndex(i, 0, nullptr);
+		setIndexWidget(index, new SourceTreeItem(this, stm->items[i]));
+	}
+}
+
+void SourceTree::UpdateWidget(const QModelIndex &idx, obs_sceneitem_t *item)
+{
+	setIndexWidget(idx, new SourceTreeItem(this, item));
+}
+
+void SourceTree::UpdateWidgets(bool force)
+{
+	SourceTreeModel *stm = GetStm();
+
+	for (int i = 0; i < stm->items.size(); i++) {
+		obs_sceneitem_t *item = stm->items[i];
+		SourceTreeItem *widget = GetItemWidget(i);
+
+		if (!widget) {
+			UpdateWidget(stm->createIndex(i, 0), item);
+		} else {
+			widget->Update(force);
+		}
+	}
+}
+
+void SourceTree::SelectItem(obs_sceneitem_t *sceneitem, bool select)
+{
+	SourceTreeModel *stm = GetStm();
+	int i = 0;
+
+	for (; i < stm->items.count(); i++) {
+		if (stm->items[i] == sceneitem)
+			break;
+	}
+
+	if (i == stm->items.count())
+		return;
+
+	QModelIndex index = stm->createIndex(i, 0);
+	if (index.isValid())
+		selectionModel()->select(index, select
+				? QItemSelectionModel::Select
+				: QItemSelectionModel::Deselect);
+}
+
+Q_DECLARE_METATYPE(OBSSceneItem);
+
+void SourceTree::mouseDoubleClickEvent(QMouseEvent *event)
+{
+	if (event->button() == Qt::LeftButton)
+		QListView::mouseDoubleClickEvent(event);
+}
+
+void SourceTree::dropEvent(QDropEvent *event)
+{
+	if (event->source() != this) {
+		QListView::dropEvent(event);
+		return;
+	}
+
+	OBSScene scene = GetCurrentScene();
+	SourceTreeModel *stm = GetStm();
+	auto &items = stm->items;
+	QModelIndexList indices = selectedIndexes();
+
+	DropIndicatorPosition indicator = dropIndicatorPosition();
+	int row = indexAt(event->pos()).row();
+	bool emptyDrop = row == -1;
+
+	if (emptyDrop) {
+		if (!items.size()) {
+			QListView::dropEvent(event);
+			return;
+		}
+
+		row = items.size() - 1;
+		indicator = QAbstractItemView::BelowItem;
+	}
+
+	/* --------------------------------------- */
+	/* store destination group if moving to a  */
+	/* group                                   */
+
+	obs_sceneitem_t *dropItem = items[row]; /* item being dropped on */
+	bool itemIsGroup = obs_sceneitem_is_group(dropItem);
+
+	obs_sceneitem_t *dropGroup = itemIsGroup
+		? dropItem
+		: obs_sceneitem_get_group(scene, dropItem);
+
+	/* not a group if moving above the group */
+	if (indicator == QAbstractItemView::AboveItem && itemIsGroup)
+		dropGroup = nullptr;
+	if (emptyDrop)
+		dropGroup = nullptr;
+
+	/* --------------------------------------- */
+	/* remember to remove list items if        */
+	/* dropping on collapsed group             */
+
+	bool dropOnCollapsed = false;
+	if (dropGroup) {
+		obs_data_t *data = obs_sceneitem_get_private_settings(dropGroup);
+		dropOnCollapsed = obs_data_get_bool(data, "collapsed");
+		obs_data_release(data);
+	}
+
+	if (indicator == QAbstractItemView::BelowItem ||
+	    indicator == QAbstractItemView::OnItem)
+		row++;
+
+	if (row < 0 || row > stm->items.count()) {
+		QListView::dropEvent(event);
+		return;
+	}
+
+	/* --------------------------------------- */
+	/* determine if any base group is selected */
+
+	bool hasGroups = false;
+	for (int i = 0; i < indices.size(); i++) {
+		obs_sceneitem_t *item = items[indices[i].row()];
+		if (obs_sceneitem_is_group(item)) {
+			hasGroups = true;
+			break;
+		}
+	}
+
+	/* --------------------------------------- */
+	/* if dropping a group, detect if it's     */
+	/* below another group                     */
+
+	obs_sceneitem_t *itemBelow = row == stm->items.count()
+		? nullptr
+		: stm->items[row];
+	if (hasGroups) {
+		if (!itemBelow ||
+		    obs_sceneitem_get_group(scene, itemBelow) != dropGroup) {
+			indicator = QAbstractItemView::BelowItem;
+			dropGroup = nullptr;
+			dropOnCollapsed = false;
+		}
+	}
+
+	/* --------------------------------------- */
+	/* if dropping groups on other groups,     */
+	/* disregard as invalid drag/drop          */
+
+	if (dropGroup && hasGroups) {
+		QListView::dropEvent(event);
+		return;
+	}
+
+	/* --------------------------------------- */
+	/* if selection includes base group items, */
+	/* include all group sub-items and treat   */
+	/* them all as one                         */
+
+	if (hasGroups) {
+		/* remove sub-items if selected */
+		for (int i = indices.size() - 1; i >= 0; i--) {
+			obs_sceneitem_t *item = items[indices[i].row()];
+			obs_scene_t *itemScene = obs_sceneitem_get_scene(item);
+
+			if (itemScene != scene) {
+				indices.removeAt(i);
+			}
+		}
+
+		/* add all sub-items of selected groups */
+		for (int i = indices.size() - 1; i >= 0; i--) {
+			obs_sceneitem_t *item = items[indices[i].row()];
+
+			if (obs_sceneitem_is_group(item)) {
+				for (int j = items.size() - 1; j >= 0; j--) {
+					obs_sceneitem_t *subitem = items[j];
+					obs_sceneitem_t *subitemGroup =
+						obs_sceneitem_get_group(scene,
+								subitem);
+
+					if (subitemGroup == item) {
+						QModelIndex idx =
+							stm->createIndex(j, 0);
+						indices.insert(i + 1, idx);
+					}
+				}
+			}
+		}
+	}
+
+	/* --------------------------------------- */
+	/* build persistent indices                */
+
+	QList<QPersistentModelIndex> persistentIndices;
+	persistentIndices.reserve(indices.count());
+	for (QModelIndex &index : indices)
+		persistentIndices.append(index);
+	std::sort(persistentIndices.begin(), persistentIndices.end());
+
+	/* --------------------------------------- */
+	/* move all items to destination index     */
+
+	int r = row;
+	for (auto &persistentIdx : persistentIndices) {
+		int from = persistentIdx.row();
+		int to = r;
+		int itemTo = to;
+
+		if (itemTo > from)
+			itemTo--;
+
+		if (itemTo != from) {
+			stm->beginMoveRows(QModelIndex(), from, from,
+			                   QModelIndex(), to);
+			MoveItem(items, from, itemTo);
+			stm->endMoveRows();
+		}
+
+		r = persistentIdx.row() + 1;
+	}
+
+	std::sort(persistentIndices.begin(), persistentIndices.end());
+	int firstIdx = persistentIndices.front().row();
+	int lastIdx = persistentIndices.back().row();
+
+	/* --------------------------------------- */
+	/* reorder scene items in back-end         */
+
+	QVector<struct obs_sceneitem_order_info> orderList;
+	obs_sceneitem_t *lastGroup = nullptr;
+	int insertCollapsedIdx = 0;
+
+	auto insertCollapsed = [&] (obs_sceneitem_t *item)
+	{
+		struct obs_sceneitem_order_info info;
+		info.group = lastGroup;
+		info.item = item;
+
+		orderList.insert(insertCollapsedIdx++, info);
+	};
+
+	using insertCollapsed_t = decltype(insertCollapsed);
+
+	auto preInsertCollapsed = [] (obs_scene_t *, obs_sceneitem_t *item,
+			void *param)
+	{
+		(*reinterpret_cast<insertCollapsed_t *>(param))(item);
+		return true;
+	};
+
+	auto insertLastGroup = [&] ()
+	{
+		obs_data_t *data = obs_sceneitem_get_private_settings(lastGroup);
+		bool collapsed = obs_data_get_bool(data, "collapsed");
+		obs_data_release(data);
+
+		if (collapsed) {
+			insertCollapsedIdx = 0;
+			obs_sceneitem_group_enum_items(
+					lastGroup,
+					preInsertCollapsed,
+					&insertCollapsed);
+		}
+
+		struct obs_sceneitem_order_info info;
+		info.group = nullptr;
+		info.item = lastGroup;
+		orderList.insert(0, info);
+	};
+
+	auto updateScene = [&] ()
+	{
+		struct obs_sceneitem_order_info info;
+
+		for (int i = 0; i < items.size(); i++) {
+			obs_sceneitem_t *item = items[i];
+			obs_sceneitem_t *group;
+
+			if (obs_sceneitem_is_group(item)) {
+				if (lastGroup) {
+					insertLastGroup();
+				}
+				lastGroup = item;
+				continue;
+			}
+
+			if (!hasGroups && i >= firstIdx && i <= lastIdx)
+				group = dropGroup;
+			else
+				group = obs_sceneitem_get_group(scene, item);
+
+			if (lastGroup && lastGroup != group) {
+				insertLastGroup();
+			}
+
+			lastGroup = group;
+
+			info.group = group;
+			info.item = item;
+			orderList.insert(0, info);
+		}
+
+		if (lastGroup) {
+			insertLastGroup();
+		}
+
+		obs_scene_reorder_items2(scene,
+				orderList.data(), orderList.size());
+	};
+
+	using updateScene_t = decltype(updateScene);
+
+	auto preUpdateScene = [] (void *data, obs_scene_t *)
+	{
+		(*reinterpret_cast<updateScene_t *>(data))();
+	};
+
+	ignoreReorder = true;
+	obs_scene_atomic_update(scene, preUpdateScene, &updateScene);
+	ignoreReorder = false;
+
+	/* --------------------------------------- */
+	/* remove items if dropped in to collapsed */
+	/* group                                   */
+
+	if (dropOnCollapsed) {
+		stm->beginRemoveRows(QModelIndex(), firstIdx, lastIdx);
+		items.remove(firstIdx, lastIdx - firstIdx + 1);
+		stm->endRemoveRows();
+	}
+
+	/* --------------------------------------- */
+	/* update widgets and accept event         */
+
+	UpdateWidgets(true);
+
+	event->accept();
+	event->setDropAction(Qt::CopyAction);
+
+	QListView::dropEvent(event);
+}
+
+void SourceTree::selectionChanged(
+		const QItemSelection &selected,
+		const QItemSelection &deselected)
+{
+	{
+		SignalBlocker sourcesSignalBlocker(this);
+		SourceTreeModel *stm = GetStm();
+
+		QModelIndexList selectedIdxs = selected.indexes();
+		QModelIndexList deselectedIdxs = deselected.indexes();
+
+		for (int i = 0; i < selectedIdxs.count(); i++) {
+			int idx = selectedIdxs[i].row();
+			obs_sceneitem_select(stm->items[idx], true);
+		}
+
+		for (int i = 0; i < deselectedIdxs.count(); i++) {
+			int idx = deselectedIdxs[i].row();
+			obs_sceneitem_select(stm->items[idx], false);
+		}
+	}
+	QListView::selectionChanged(selected, deselected);
+}
+
+void SourceTree::Edit(int row)
+{
+	SourceTreeModel *stm = GetStm();
+	if (row < 0 || row >= stm->items.count())
+		return;
+
+	QWidget *widget = indexWidget(stm->createIndex(row, 0));
+	SourceTreeItem *itemWidget = reinterpret_cast<SourceTreeItem *>(widget);
+	itemWidget->EnterEditMode();
+	edit(stm->createIndex(row, 0));
+}
+
+bool SourceTree::MultipleBaseSelected() const
+{
+	SourceTreeModel *stm = GetStm();
+	QModelIndexList selectedIndices = selectedIndexes();
+
+	OBSScene scene = GetCurrentScene();
+
+	if (selectedIndices.size() < 1) {
+		return false;
+	}
+
+	for (auto &idx : selectedIndices) {
+		obs_sceneitem_t *item = stm->items[idx.row()];
+		if (obs_sceneitem_is_group(item)) {
+			return false;
+		}
+
+		obs_scene *itemScene = obs_sceneitem_get_scene(item);
+		if (itemScene != scene) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool SourceTree::GroupsSelected() const
+{
+	SourceTreeModel *stm = GetStm();
+	QModelIndexList selectedIndices = selectedIndexes();
+
+	OBSScene scene = GetCurrentScene();
+
+	if (selectedIndices.size() < 1) {
+		return false;
+	}
+
+	for (auto &idx : selectedIndices) {
+		obs_sceneitem_t *item = stm->items[idx.row()];
+		if (!obs_sceneitem_is_group(item)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool SourceTree::GroupedItemsSelected() const
+{
+	SourceTreeModel *stm = GetStm();
+	QModelIndexList selectedIndices = selectedIndexes();
+	OBSScene scene = GetCurrentScene();
+
+	if (!selectedIndices.size()) {
+		return false;
+	}
+
+	for (auto &idx : selectedIndices) {
+		obs_sceneitem_t *item = stm->items[idx.row()];
+		obs_scene *itemScene = obs_sceneitem_get_scene(item);
+
+		if (itemScene != scene) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void SourceTree::Remove(OBSSceneItem item)
+{
+	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
+	GetStm()->Remove(item);
+	main->SaveProject();
+
+	if (!main->SavingDisabled()) {
+		obs_scene_t *scene = obs_sceneitem_get_scene(item);
+		obs_source_t *sceneSource = obs_scene_get_source(scene);
+		obs_source_t *itemSource = obs_sceneitem_get_source(item);
+		blog(LOG_INFO, "User Removed source '%s' (%s) from scene '%s'",
+				obs_source_get_name(itemSource),
+				obs_source_get_id(itemSource),
+				obs_source_get_name(sceneSource));
+	}
+}
+
+void SourceTree::GroupSelectedItems()
+{
+	QModelIndexList indices = selectedIndexes();
+	std::sort(indices.begin(), indices.end());
+	GetStm()->GroupSelectedItems(indices);
+}
+
+void SourceTree::UngroupSelectedGroups()
+{
+	QModelIndexList indices = selectedIndexes();
+	GetStm()->UngroupSelectedGroups(indices);
+}
+
+void SourceTree::AddGroup()
+{
+	GetStm()->AddGroup();
+}

obs-studio-22.0.1.tar.xz/UI/source-tree.hpp Added

@@ -0,0 +1,177 @@
+#pragma once
+
+#include <QList>
+#include <QVector>
+#include <QPointer>
+#include <QListView>
+#include <QCheckBox>
+#include <QAbstractListModel>
+
+class QLabel;
+class QCheckBox;
+class QLineEdit;
+class SourceTree;
+class QSpacerItem;
+class QHBoxLayout;
+class LockedCheckBox;
+class VisibilityCheckBox;
+class VisibilityItemWidget;
+
+class SourceTreeSubItemCheckBox : public QCheckBox {
+	Q_OBJECT
+};
+
+class SourceTreeItem : public QWidget {
+	Q_OBJECT
+
+	friend class SourceTree;
+	friend class SourceTreeModel;
+
+	void mouseDoubleClickEvent(QMouseEvent *event) override;
+
+	virtual bool eventFilter(QObject *object, QEvent *event) override;
+
+	void Update(bool force);
+
+	enum class Type {
+		Unknown,
+		Item,
+		Group,
+		SubItem,
+	};
+
+	void DisconnectSignals();
+	void ReconnectSignals();
+
+	Type type = Type::Unknown;
+
+public:
+	explicit SourceTreeItem(SourceTree *tree, OBSSceneItem sceneitem);
+
+private:
+	QSpacerItem *spacer = nullptr;
+	QCheckBox *expand = nullptr;
+	VisibilityCheckBox *vis = nullptr;
+	LockedCheckBox *lock = nullptr;
+	QHBoxLayout *boxLayout = nullptr;
+	QLabel *label = nullptr;
+
+	QLineEdit *editor = nullptr;
+
+	SourceTree *tree;
+	OBSSceneItem sceneitem;
+	OBSSignal sceneRemoveSignal;
+	OBSSignal itemRemoveSignal;
+	OBSSignal groupReorderSignal;
+	OBSSignal deselectSignal;
+	OBSSignal visibleSignal;
+	OBSSignal renameSignal;
+	OBSSignal removeSignal;
+
+	virtual void paintEvent(QPaintEvent* event) override;
+
+private slots:
+	void EnterEditMode();
+	void ExitEditMode(bool save);
+
+	void VisibilityChanged(bool visible);
+	void Renamed(const QString &name);
+
+	void ExpandClicked(bool checked);
+
+	void Deselect();
+};
+
+class SourceTreeModel : public QAbstractListModel {
+	Q_OBJECT
+
+	friend class SourceTree;
+	friend class SourceTreeItem;
+
+	SourceTree *st;
+	QVector<OBSSceneItem> items;
+	bool hasGroups = false;
+
+	static void OBSFrontendEvent(enum obs_frontend_event event, void *ptr);
+	void Clear();
+	void SceneChanged();
+	void ReorderItems();
+
+	void Add(obs_sceneitem_t *item);
+	void Remove(obs_sceneitem_t *item);
+	OBSSceneItem Get(int idx);
+	QString GetNewGroupName();
+	void AddGroup();
+
+	void GroupSelectedItems(QModelIndexList &indices);
+	void UngroupSelectedGroups(QModelIndexList &indices);
+
+	void ExpandGroup(obs_sceneitem_t *item);
+	void CollapseGroup(obs_sceneitem_t *item);
+
+	void UpdateGroupState(bool update);
+
+public:
+	explicit SourceTreeModel(SourceTree *st);
+	~SourceTreeModel();
+
+	virtual int rowCount(const QModelIndex &parent) const override;
+	virtual QVariant data(const QModelIndex &index, int role) const override;
+
+	virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
+	virtual Qt::DropActions supportedDropActions() const override;
+};
+
+class SourceTree : public QListView {
+	Q_OBJECT
+
+	bool ignoreReorder = false;
+
+	friend class SourceTreeModel;
+	friend class SourceTreeItem;
+
+	void ResetWidgets();
+	void UpdateWidget(const QModelIndex &idx, obs_sceneitem_t *item);
+	void UpdateWidgets(bool force = false);
+
+	inline SourceTreeModel *GetStm() const
+	{
+		return reinterpret_cast<SourceTreeModel *>(model());
+	}
+
+public:
+	inline SourceTreeItem *GetItemWidget(int idx)
+	{
+		QWidget *widget = indexWidget(GetStm()->createIndex(idx, 0));
+		return reinterpret_cast<SourceTreeItem *>(widget);
+	}
+
+	explicit SourceTree(QWidget *parent = nullptr);
+
+	inline bool IgnoreReorder() const {return ignoreReorder;}
+	inline void Clear() {GetStm()->Clear();}
+
+	inline void Add(obs_sceneitem_t *item) {GetStm()->Add(item);}
+	inline OBSSceneItem Get(int idx) {return GetStm()->Get(idx);}
+	inline QString GetNewGroupName() {return GetStm()->GetNewGroupName();}
+
+	void SelectItem(obs_sceneitem_t *sceneitem, bool select);
+
+	bool MultipleBaseSelected() const;
+	bool GroupsSelected() const;
+	bool GroupedItemsSelected() const;
+
+public slots:
+	inline void ReorderItems() {GetStm()->ReorderItems();}
+	void Remove(OBSSceneItem item);
+	void GroupSelectedItems();
+	void UngroupSelectedGroups();
+	void AddGroup();
+	void Edit(int idx);
+
+protected:
+	virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
+	virtual void dropEvent(QDropEvent *event) override;
+
+	virtual void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override;
+};

obs-studio-21.1.2.tar.xz/UI/volume-control.cpp -> obs-studio-22.0.1.tar.xz/UI/volume-control.cpp Changed

@@ -3,24 +3,17 @@
 #include "obs-app.hpp"
 #include "mute-checkbox.hpp"
 #include "slider-absoluteset-style.hpp"
-#include <obs-audio-controls.h>
-#include <util/platform.h>
-#include <util/threading.h>
 #include <QFontDatabase>
 #include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QPushButton>
-#include <QVariant>
 #include <QSlider>
 #include <QLabel>
 #include <QPainter>
-#include <QTimer>
-#include <string>
-#include <math.h>
+#include <QStyleFactory>
 
 using namespace std;
 
-#define CLAMP(x, min, max) ((x) < min ? min : ((x) > max ? max : (x)))
+#define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x) > (max) ? (max) : (x)))
 
 QWeakPointer<VolumeMeterTimer> VolumeMeter::updateTimer;
 
@@ -33,9 +26,9 @@
 }
 
 void VolControl::OBSVolumeLevel(void *data,
-	const float magnitude[MAX_AUDIO_CHANNELS],
-	const float peak[MAX_AUDIO_CHANNELS],
-	const float inputPeak[MAX_AUDIO_CHANNELS])
+		const float magnitude[MAX_AUDIO_CHANNELS],
+		const float peak[MAX_AUDIO_CHANNELS],
+		const float inputPeak[MAX_AUDIO_CHANNELS])
 {
 	VolControl *volControl = static_cast<VolControl*>(data);
 
@@ -114,55 +107,24 @@
 	volMeter->setPeakDecayRate(q);
 }
 
-VolControl::VolControl(OBSSource source_, bool showConfig)
-	: source        (source_),
-	  levelTotal    (0.0f),
-	  levelCount    (0.0f),
-	  obs_fader     (obs_fader_create(OBS_FADER_CUBIC)),
-	  obs_volmeter  (obs_volmeter_create(OBS_FADER_LOG))
+void VolControl::setPeakMeterType(enum obs_peak_meter_type peakMeterType)
 {
-	QHBoxLayout *volLayout  = new QHBoxLayout();
-	QVBoxLayout *mainLayout = new QVBoxLayout();
-	QHBoxLayout *textLayout = new QHBoxLayout();
-	QHBoxLayout *botLayout  = new QHBoxLayout();
+	volMeter->setPeakMeterType(peakMeterType);
+}
 
+VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
+		: source      (std::move(source_)),
+		levelTotal    (0.0f),
+		levelCount    (0.0f),
+		obs_fader     (obs_fader_create(OBS_FADER_CUBIC)),
+		obs_volmeter  (obs_volmeter_create(OBS_FADER_LOG)),
+		vertical      (vertical)
+{
 	nameLabel = new QLabel();
 	volLabel  = new QLabel();
-	volMeter  = new VolumeMeter(0, obs_volmeter);
 	mute      = new MuteCheckBox();
-	slider    = new QSlider(Qt::Horizontal);
-
-	QFont font = nameLabel->font();
-	font.setPointSize(font.pointSize()-1);
-
 	QString sourceName = obs_source_get_name(source);
-
-	nameLabel->setText(sourceName);
-	nameLabel->setFont(font);
-	volLabel->setFont(font);
-	slider->setMinimum(0);
-	slider->setMaximum(100);
-
-//	slider->setMaximumHeight(13);
-
-	textLayout->setContentsMargins(0, 0, 0, 0);
-	textLayout->addWidget(nameLabel);
-	textLayout->addWidget(volLabel);
-	textLayout->setAlignment(nameLabel, Qt::AlignLeft);
-	textLayout->setAlignment(volLabel,  Qt::AlignRight);
-
-	bool muted = obs_source_muted(source);
-	mute->setChecked(muted);
-	mute->setAccessibleName(
-			QTStr("VolControl.Mute").arg(sourceName));
-
-	volLayout->addWidget(slider);
-	volLayout->addWidget(mute);
-	volLayout->setSpacing(5);
-
-	botLayout->setContentsMargins(0, 0, 0, 0);
-	botLayout->setSpacing(0);
-	botLayout->addLayout(volLayout);
+	setObjectName(sourceName);
 
 	if (showConfig) {
 		config = new QPushButton(this);
@@ -178,18 +140,99 @@
 
 		connect(config, &QAbstractButton::clicked,
 				this, &VolControl::EmitConfigClicked);
-
-		botLayout->addWidget(config);
 	}
 
+	QVBoxLayout *mainLayout = new QVBoxLayout;
 	mainLayout->setContentsMargins(4, 4, 4, 4);
 	mainLayout->setSpacing(2);
-	mainLayout->addItem(textLayout);
-	mainLayout->addWidget(volMeter);
-	mainLayout->addItem(botLayout);
+
+	if (vertical) {
+		QHBoxLayout *nameLayout = new QHBoxLayout;
+		QHBoxLayout *controlLayout = new QHBoxLayout;
+		QHBoxLayout *volLayout = new QHBoxLayout;
+		QHBoxLayout *meterLayout  = new QHBoxLayout;
+
+		volMeter  = new VolumeMeter(nullptr, obs_volmeter, true);
+		slider    = new QSlider(Qt::Vertical);
+
+		nameLayout->setAlignment(Qt::AlignCenter);
+		meterLayout->setAlignment(Qt::AlignCenter);
+		controlLayout->setAlignment(Qt::AlignCenter);
+		volLayout->setAlignment(Qt::AlignCenter);
+
+		nameLayout->setContentsMargins(0, 0, 0, 0);
+		nameLayout->setSpacing(0);
+		nameLayout->addWidget(nameLabel);
+
+		controlLayout->setContentsMargins(0, 0, 0, 0);
+		controlLayout->setSpacing(0);
+
+		if (showConfig)
+			controlLayout->addWidget(config);
+
+		controlLayout->addItem(new QSpacerItem(3, 0));
+		// Add Headphone (audio monitoring) widget here
+		controlLayout->addWidget(mute);
+
+		meterLayout->setContentsMargins(0, 0, 0, 0);
+		meterLayout->setSpacing(0);
+		meterLayout->addWidget(volMeter);
+		meterLayout->addWidget(slider);
+
+		volLayout->setContentsMargins(0, 0, 0, 0);
+		volLayout->setSpacing(0);
+		volLayout->addWidget(volLabel);
+
+		mainLayout->addItem(nameLayout);
+		mainLayout->addItem(volLayout);
+		mainLayout->addItem(meterLayout);
+		mainLayout->addItem(controlLayout);
+
+		setMaximumWidth(110);
+	} else {
+		QHBoxLayout *volLayout  = new QHBoxLayout;
+		QHBoxLayout *textLayout = new QHBoxLayout;
+		QHBoxLayout *botLayout  = new QHBoxLayout;
+
+		volMeter  = new VolumeMeter(nullptr, obs_volmeter, false);
+		slider    = new QSlider(Qt::Horizontal);
+
+		textLayout->setContentsMargins(0, 0, 0, 0);
+		textLayout->addWidget(nameLabel);
+		textLayout->addWidget(volLabel);
+		textLayout->setAlignment(nameLabel, Qt::AlignLeft);
+		textLayout->setAlignment(volLabel,  Qt::AlignRight);
+
+		volLayout->addWidget(slider);
+		volLayout->addWidget(mute);
+		volLayout->setSpacing(5);
+
+		botLayout->setContentsMargins(0, 0, 0, 0);
+		botLayout->setSpacing(0);
+		botLayout->addLayout(volLayout);
+
+		if (showConfig)
+			botLayout->addWidget(config);
+
+		mainLayout->addItem(textLayout);
+		mainLayout->addWidget(volMeter);
+		mainLayout->addItem(botLayout);
+	}
 
 	setLayout(mainLayout);
 
+	QFont font = nameLabel->font();
+	font.setPointSize(font.pointSize()-1);
+
+	nameLabel->setText(sourceName);
+	nameLabel->setFont(font);
+	volLabel->setFont(font);
+	slider->setMinimum(0);
+	slider->setMaximum(100);
+
+	bool muted = obs_source_muted(source);
+	mute->setChecked(muted);
+	mute->setAccessibleName(QTStr("VolControl.Mute").arg(sourceName));
 	obs_fader_add_callback(obs_fader, OBSVolumeChanged, this);
 	obs_volmeter_add_callback(obs_volmeter, OBSVolumeLevel, this);
 
@@ -204,7 +247,17 @@
 	obs_fader_attach_source(obs_fader, source);
 	obs_volmeter_attach_source(obs_volmeter, source);
 
-	slider->setStyle(new SliderAbsoluteSetStyle(slider->style()));
+	QString styleName = slider->style()->objectName();
+	QStyle *style;
+	style = QStyleFactory::create(styleName);
+	if (!style) {
+		style = new SliderAbsoluteSetStyle();
+	} else {
+		style = new SliderAbsoluteSetStyle(style);
+	}
+
+	style->setParent(slider);
+	slider->setStyle(style);
 
 	/* Call volume changed once to init the slider position and label */
 	VolumeChanged();
@@ -229,7 +282,7 @@
 
 void VolumeMeter::setBackgroundNominalColor(QColor c)
 {
-	backgroundNominalColor = c;
+	backgroundNominalColor = std::move(c);
 }
 
 QColor VolumeMeter::getBackgroundWarningColor() const
@@ -239,7 +292,7 @@
 
 void VolumeMeter::setBackgroundWarningColor(QColor c)
 {
-	backgroundWarningColor = c;
+	backgroundWarningColor = std::move(c);
 }
 
 QColor VolumeMeter::getBackgroundErrorColor() const
@@ -249,7 +302,7 @@
 
 void VolumeMeter::setBackgroundErrorColor(QColor c)
 {
-	backgroundErrorColor = c;
+	backgroundErrorColor = std::move(c);
 }
 
 QColor VolumeMeter::getForegroundNominalColor() const
@@ -259,7 +312,7 @@
 
 void VolumeMeter::setForegroundNominalColor(QColor c)
 {
-	foregroundNominalColor = c;
+	foregroundNominalColor = std::move(c);
 }
 
 QColor VolumeMeter::getForegroundWarningColor() const
@@ -269,7 +322,7 @@
 
 void VolumeMeter::setForegroundWarningColor(QColor c)
 {
-	foregroundWarningColor = c;
+	foregroundWarningColor = std::move(c);
 }
 
 QColor VolumeMeter::getForegroundErrorColor() const
@@ -279,7 +332,7 @@
 
 void VolumeMeter::setForegroundErrorColor(QColor c)
 {
-	foregroundErrorColor = c;
+	foregroundErrorColor = std::move(c);
 }
 
 QColor VolumeMeter::getClipColor() const
@@ -289,7 +342,7 @@
 
 void VolumeMeter::setClipColor(QColor c)
 {
-	clipColor = c;
+	clipColor = std::move(c);
 }
 
 QColor VolumeMeter::getMagnitudeColor() const
@@ -299,7 +352,7 @@
 
 void VolumeMeter::setMagnitudeColor(QColor c)
 {
-	magnitudeColor = c;
+	magnitudeColor = std::move(c);
 }
 
 QColor VolumeMeter::getMajorTickColor() const
@@ -309,7 +362,7 @@
 
 void VolumeMeter::setMajorTickColor(QColor c)
 {
-	majorTickColor = c;
+	majorTickColor = std::move(c);
 }
 
 QColor VolumeMeter::getMinorTickColor() const
@@ -319,7 +372,7 @@
 
 void VolumeMeter::setMinorTickColor(QColor c)
 {
-	minorTickColor = c;
+	minorTickColor = std::move(c);
 }
 
 qreal VolumeMeter::getMinimumLevel() const
@@ -412,8 +465,43 @@
 	inputPeakHoldDuration = v;
 }
 
-VolumeMeter::VolumeMeter(QWidget *parent, obs_volmeter_t *obs_volmeter)
-			: QWidget(parent), obs_volmeter(obs_volmeter)
+void VolumeMeter::setPeakMeterType(enum obs_peak_meter_type peakMeterType)
+{
+	obs_volmeter_set_peak_meter_type(obs_volmeter, peakMeterType);
+	switch (peakMeterType) {
+	case TRUE_PEAK_METER:
+		// For true-peak meters EBU has defined the Permitted Maximum,
+		// taking into account the accuracy of the meter and further
+		// processing required by lossy audio compression.
+		//
+		// The alignment level was not specified, but I've adjusted
+		// it compared to a sample-peak meter. Incidently Youtube
+		// uses this new Alignment Level as the maximum integrated
+		// loudness of a video.
+		//
+		//  * Permitted Maximum Level (PML) = -2.0 dBTP
+		//  * Alignment Level (AL) = -13 dBTP
+		setErrorLevel(-2.0);
+		setWarningLevel(-13.0);
+		break;
+
+	case SAMPLE_PEAK_METER:
+	default:
+		// For a sample Peak Meter EBU has the following level
+		// definitions, taking into account inaccuracies of this meter:
+		//
+		//  * Permitted Maximum Level (PML) = -9.0 dBFS
+		//  * Alignment Level (AL) = -20.0 dBFS
+		setErrorLevel(-9.0);
+		setWarningLevel(-20.0);
+		break;
+	}
+}
+
+VolumeMeter::VolumeMeter(QWidget *parent, obs_volmeter_t *obs_volmeter,
+		bool vertical)
+		: QWidget(parent), obs_volmeter(obs_volmeter),
+		vertical(vertical)
 {
 	// Use a font that can be rendered small.
 	tickFont = QFont("Arial");
@@ -454,12 +542,12 @@
 VolumeMeter::~VolumeMeter()
 {
 	updateTimerRef->RemoveVolControl(this);
+	delete tickPaintCache;
 }
 
-void VolumeMeter::setLevels(
-	const float magnitude[MAX_AUDIO_CHANNELS],
-	const float peak[MAX_AUDIO_CHANNELS],
-	const float inputPeak[MAX_AUDIO_CHANNELS])
+void VolumeMeter::setLevels(const float magnitude[MAX_AUDIO_CHANNELS],
+		const float peak[MAX_AUDIO_CHANNELS],
+		const float inputPeak[MAX_AUDIO_CHANNELS])
 {
 	uint64_t ts = os_gettime_ns();
 	QMutexLocker locker(&dataMutex);
@@ -502,9 +590,12 @@
 	if (displayNrAudioChannels != currentNrAudioChannels) {
 		displayNrAudioChannels = currentNrAudioChannels;
 
-		// Make room for 3 pixels high meter, with one pixel between
-		// each. Then 9 pixels below it for ticks and numbers.
-		setMinimumSize(130, displayNrAudioChannels * 4 + 8);
+		// Make room for 3 pixels meter, with one pixel between each.
+		// Then 9/13 pixels for ticks and numbers.
+		if (vertical)
+			setMinimumSize(displayNrAudioChannels * 4 + 14, 130);
+		else
+			setMinimumSize(130, displayNrAudioChannels * 4 + 8);
 
 		resetLevels();
 	}
@@ -512,7 +603,7 @@
 
 inline bool VolumeMeter::detectIdle(uint64_t ts)
 {
-	float timeSinceLastUpdate = (ts - currentLastUpdateTime) * 0.000000001;
+	double timeSinceLastUpdate = (ts - currentLastUpdateTime) * 0.000000001;
 	if (timeSinceLastUpdate > 0.5) {
 		resetLevels();
 		return true;
@@ -522,7 +613,7 @@
 }
 
 inline void VolumeMeter::calculateBallisticsForChannel(int channelNr,
-	uint64_t ts, qreal timeSinceLastRedraw)
+		uint64_t ts, qreal timeSinceLastRedraw)
 {
 	if (currentPeak[channelNr] >= displayPeak[channelNr] ||
 		isnan(displayPeak[channelNr])) {
@@ -532,7 +623,7 @@
 		// Decay of peak is 40 dB / 1.7 seconds for Fast Profile
 		// 20 dB / 1.7 seconds for Medium Profile (Type I PPM)
 		// 24 dB / 2.8 seconds for Slow Profile (Type II PPM)
-		qreal decay = peakDecayRate * timeSinceLastRedraw;
+		float decay = float(peakDecayRate * timeSinceLastRedraw);
 		displayPeak[channelNr] = CLAMP(displayPeak[channelNr] - decay,
 			currentPeak[channelNr], 0);
 	}
@@ -576,53 +667,52 @@
 	if (!isfinite(displayMagnitude[channelNr])) {
 		// The statements in the else-leg do not work with
 		// NaN and infinite displayMagnitude.
-		displayMagnitude[channelNr] =
-			currentMagnitude[channelNr];
+		displayMagnitude[channelNr] = currentMagnitude[channelNr];
 	} else {
 		// A VU meter will integrate to the new value to 99% in 300 ms.
 		// The calculation here is very simplified and is more accurate
 		// with higher frame-rate.
-		qreal attack = (currentMagnitude[channelNr] -
+		float attack = float((currentMagnitude[channelNr] -
 			displayMagnitude[channelNr]) *
 				(timeSinceLastRedraw /
-			magnitudeIntegrationTime) * 0.99;
-		displayMagnitude[channelNr] = CLAMP(
-			displayMagnitude[channelNr] + attack,
-			minimumLevel, 0);
+			magnitudeIntegrationTime) * 0.99);
+		displayMagnitude[channelNr] = CLAMP(displayMagnitude[channelNr]
+				+ attack, (float)minimumLevel, 0);
 	}
 }
 
 inline void VolumeMeter::calculateBallistics(uint64_t ts,
-	qreal timeSinceLastRedraw)
+		qreal timeSinceLastRedraw)
 {
 	QMutexLocker locker(&dataMutex);
 
-	for (int channelNr = 0; channelNr < MAX_AUDIO_CHANNELS; channelNr++) {
+	for (int channelNr = 0; channelNr < MAX_AUDIO_CHANNELS; channelNr++)
 		calculateBallisticsForChannel(channelNr, ts,
-			timeSinceLastRedraw);
-	}
+				timeSinceLastRedraw);
 }
 
-void VolumeMeter::paintInputMeter(QPainter &painter, int x, int y,
-	int width, int height, float peakHold)
+void VolumeMeter::paintInputMeter(QPainter &painter, int x, int y, int width,
+		int height, float peakHold)
 {
 	QMutexLocker locker(&dataMutex);
+	QColor color;
 
-	if (peakHold < minimumInputLevel) {
-		painter.fillRect(x, y, width, height, backgroundNominalColor);
-	} else if (peakHold < warningLevel) {
-		painter.fillRect(x, y, width, height, foregroundNominalColor);
-	} else if (peakHold < errorLevel) {
-		painter.fillRect(x, y, width, height, foregroundWarningColor);
-	} else if (peakHold <= clipLevel) {
-		painter.fillRect(x, y, width, height, foregroundErrorColor);
-	} else {
-		painter.fillRect(x, y, width, height, clipColor);
-	}
+	if (peakHold < minimumInputLevel)
+		color = backgroundNominalColor;
+	else if (peakHold < warningLevel)
+		color = foregroundNominalColor;
+	else if (peakHold < errorLevel)
+		color = foregroundWarningColor;
+	else if (peakHold <= clipLevel)
+		color = foregroundErrorColor;
+	else
+		color = clipColor;
+
+	painter.fillRect(x, y, width, height, color);
 }
 
-void VolumeMeter::paintTicks(QPainter &painter, int x, int y,
-	int width, int height)
+void VolumeMeter::paintHTicks(QPainter &painter, int x, int y, int width,
+		int height)
 {
 	qreal scale = width / minimumLevel;
 
@@ -631,184 +721,257 @@
 
 	// Draw major tick lines and numeric indicators.
 	for (int i = 0; i >= minimumLevel; i-= 5) {
-		int position = x + width - (i * scale) - 1;
+		int position = int(x + width - (i * scale) - 1);
 		QString str = QString::number(i);
 
-		if (i == 0 || i == -5)  {
+		if (i == 0 || i == -5)
 			painter.drawText(position - 3, height, str);
-		} else {
+		else
 			painter.drawText(position - 5, height, str);
-		}
 		painter.drawLine(position, y, position, y + 2);
 	}
 
 	// Draw minor tick lines.
 	painter.setPen(minorTickColor);
 	for (int i = 0; i >= minimumLevel; i--) {
-		int position = x + width - (i * scale) - 1;
-
-		if (i % 5 != 0) {
+		int position = int(x + width - (i * scale) - 1);
+		if (i % 5 != 0)
 			painter.drawLine(position, y, position, y + 1);
-		}
 	}
 }
 
-void VolumeMeter::paintMeter(QPainter &painter, int x, int y,
-	int width, int height, float magnitude, float peak, float peakHold)
+void VolumeMeter::paintVTicks(QPainter &painter, int x, int y, int height)
+{
+	qreal scale = height / minimumLevel;
+
+	painter.setFont(tickFont);
+	painter.setPen(majorTickColor);
+
+	// Draw major tick lines and numeric indicators.
+	for (int i = 0; i >= minimumLevel; i-= 5) {
+		int position = y + int((i * scale) - 1);
+		QString str = QString::number(i);
+
+		if (i == 0)
+			painter.drawText(x + 5, position + 4, str);
+		else if (i == -60)
+			painter.drawText(x + 4, position, str);
+		else
+			painter.drawText(x + 4, position + 2, str);
+		painter.drawLine(x, position, x + 2, position);
+	}
+
+	// Draw minor tick lines.
+	painter.setPen(minorTickColor);
+	for (int i = 0; i >= minimumLevel; i--) {
+		int position = y + int((i * scale) - 1);
+		if (i % 5 != 0)
+			painter.drawLine(x, position, x + 1, position);
+	}
+}
+
+#define CLIP_FLASH_DURATION_MS 1000
+
+void VolumeMeter::ClipEnding()
+{
+	clipping = false;
+}
+
+void VolumeMeter::paintHMeter(QPainter &painter, int x, int y, int width,
+		int height, float magnitude, float peak, float peakHold)
 {
 	qreal scale = width / minimumLevel;
 
 	QMutexLocker locker(&dataMutex);
 	int minimumPosition     = x + 0;
 	int maximumPosition     = x + width;
-	int magnitudePosition   = x + width - (magnitude * scale);
-	int peakPosition        = x + width - (peak * scale);
-	int peakHoldPosition    = x + width - (peakHold * scale);
-	int warningPosition     = x + width - (warningLevel * scale);
-	int errorPosition       = x + width - (errorLevel * scale);
+	int magnitudePosition   = int(x + width - (magnitude * scale));
+	int peakPosition        = int(x + width - (peak * scale));
+	int peakHoldPosition    = int(x + width - (peakHold * scale));
+	int warningPosition     = int(x + width - (warningLevel * scale));
+	int errorPosition       = int(x + width - (errorLevel * scale));
 
 	int nominalLength       = warningPosition - minimumPosition;
 	int warningLength       = errorPosition - warningPosition;
 	int errorLength         = maximumPosition - errorPosition;
 	locker.unlock();
 
-	if (peakPosition < minimumPosition) {
-		painter.fillRect(
-			minimumPosition, y,
-			nominalLength, height,
-			backgroundNominalColor);
-		painter.fillRect(
-			warningPosition, y,
-			warningLength, height,
-			backgroundWarningColor);
-		painter.fillRect(
-			errorPosition, y,
-			errorLength, height,
-			backgroundErrorColor);
+	if (clipping) {
+		peakPosition = maximumPosition;
+	}
 
+	if (peakPosition < minimumPosition) {
+		painter.fillRect(minimumPosition, y, nominalLength, height,
+				backgroundNominalColor);
+		painter.fillRect(warningPosition, y, warningLength, height,
+				backgroundWarningColor);
+		painter.fillRect(errorPosition, y, errorLength, height,
+				backgroundErrorColor);
 	} else if (peakPosition < warningPosition) {
-		painter.fillRect(
-			minimumPosition, y,
-			peakPosition - minimumPosition, height,
-			foregroundNominalColor);
-		painter.fillRect(
-			peakPosition, y,
-			warningPosition - peakPosition, height,
-			backgroundNominalColor);
-		painter.fillRect(
-			warningPosition, y,
-			warningLength, height,
-			backgroundWarningColor);
-		painter.fillRect(errorPosition, y,
-			errorLength, height,
-			backgroundErrorColor);
-
+		painter.fillRect(minimumPosition, y, peakPosition -
+				minimumPosition, height,
+				foregroundNominalColor);
+		painter.fillRect(peakPosition, y, warningPosition -
+				peakPosition, height, backgroundNominalColor);
+		painter.fillRect(warningPosition, y, warningLength, height,
+				backgroundWarningColor);
+		painter.fillRect(errorPosition, y, errorLength, height,
+				backgroundErrorColor);
 	} else if (peakPosition < errorPosition) {
-		painter.fillRect(
-			minimumPosition, y,
-			nominalLength, height,
-			foregroundNominalColor);
-		painter.fillRect(
-			warningPosition, y,
-			peakPosition - warningPosition, height,
-			foregroundWarningColor);
-		painter.fillRect(
-			peakPosition, y,
-			errorPosition - peakPosition, height,
-			backgroundWarningColor);
-		painter.fillRect(
-			errorPosition, y,
-			errorLength, height,
-			backgroundErrorColor);
-
+		painter.fillRect(minimumPosition, y, nominalLength, height,
+				foregroundNominalColor);
+		painter.fillRect(warningPosition, y,
+				peakPosition - warningPosition, height,
+				foregroundWarningColor);
+		painter.fillRect(peakPosition, y, errorPosition -
+				peakPosition, height, backgroundWarningColor);
+		painter.fillRect(errorPosition, y, errorLength, height,
+				backgroundErrorColor);
 	} else if (peakPosition < maximumPosition) {
-		painter.fillRect(
-			minimumPosition, y,
-			nominalLength, height,
-			foregroundNominalColor);
-		painter.fillRect(
-			warningPosition, y,
-			warningLength, height,
-			foregroundWarningColor);
-		painter.fillRect(
-			errorPosition, y,
-			peakPosition - errorPosition, height,
-			foregroundErrorColor);
-		painter.fillRect(
-			peakPosition, y,
-			maximumPosition - peakPosition, height,
-			backgroundErrorColor);
-
+		painter.fillRect(minimumPosition, y, nominalLength, height,
+				foregroundNominalColor);
+		painter.fillRect(warningPosition, y, warningLength, height,
+				foregroundWarningColor);
+		painter.fillRect(errorPosition, y, peakPosition - errorPosition,
+				height, foregroundErrorColor);
+		painter.fillRect(peakPosition, y,
+				maximumPosition - peakPosition, height,
+				backgroundErrorColor);
 	} else {
-		qreal end = errorLength + warningLength + nominalLength;
-		painter.fillRect(
-			minimumPosition, y,
-			end, height,
-			QBrush(foregroundErrorColor));
-	}
+		if (!clipping) {
+			QTimer::singleShot(CLIP_FLASH_DURATION_MS, this,
+					SLOT(ClipEnding()));
+			clipping = true;
+		}
 
-	if (peakHoldPosition - 3 < minimumPosition) {
-		// Peak-hold below minimum, no drawing.
+		int end = errorLength + warningLength + nominalLength;
+		painter.fillRect(minimumPosition, y, end, height,
+				QBrush(foregroundErrorColor));
+	}
 
-	} else if (peakHoldPosition < warningPosition) {
-		painter.fillRect(
-			peakHoldPosition - 3,  y,
-			3, height,
-			foregroundNominalColor);
+	if (peakHoldPosition - 3 < minimumPosition)
+		;// Peak-hold below minimum, no drawing.
+	else if (peakHoldPosition < warningPosition)
+		painter.fillRect(peakHoldPosition - 3, y, 3, height,
+				foregroundNominalColor);
+	else if (peakHoldPosition < errorPosition)
+		painter.fillRect(peakHoldPosition - 3, y, 3, height,
+				foregroundWarningColor);
+	else
+		painter.fillRect(peakHoldPosition - 3, y, 3, height,
+				foregroundErrorColor);
 
-	} else if (peakHoldPosition < errorPosition) {
-		painter.fillRect(
-			peakHoldPosition - 3, y,
-			3, height,
-			foregroundWarningColor);
+	if (magnitudePosition - 3 >= minimumPosition)
+		painter.fillRect(magnitudePosition - 3, y, 3, height,
+				magnitudeColor);
+}
 
-	} else {
-		painter.fillRect(
-			peakHoldPosition - 3, y,
-			3, height,
-			foregroundErrorColor);
-	}
+void VolumeMeter::paintVMeter(QPainter &painter, int x, int y, int width,
+		int height, float magnitude, float peak, float peakHold)
+{
+	qreal scale = height / minimumLevel;
 
-	if (magnitudePosition - 3 < minimumPosition) {
-		// Magnitude below minimum, no drawing.
+	QMutexLocker locker(&dataMutex);
+	int minimumPosition     = y + 0;
+	int maximumPosition     = y + height;
+	int magnitudePosition   = int(y + height - (magnitude * scale));
+	int peakPosition        = int(y + height - (peak * scale));
+	int peakHoldPosition    = int(y + height - (peakHold * scale));
+	int warningPosition     = int(y + height - (warningLevel * scale));
+	int errorPosition       = int(y + height - (errorLevel * scale));
 
-	} else if (magnitudePosition < warningPosition) {
-		painter.fillRect(
-			magnitudePosition - 3, y,
-			3, height,
-			magnitudeColor);
+	int nominalLength       = warningPosition - minimumPosition;
+	int warningLength       = errorPosition - warningPosition;
+	int errorLength         = maximumPosition - errorPosition;
+	locker.unlock();
 
-	} else if (magnitudePosition < errorPosition) {
-		painter.fillRect(
-			magnitudePosition - 3, y,
-			3, height,
-			magnitudeColor);
+	if (clipping) {
+		peakPosition = maximumPosition;
+	}
 
+	if (peakPosition < minimumPosition) {
+		painter.fillRect(x, minimumPosition, width, nominalLength,
+				backgroundNominalColor);
+		painter.fillRect(x, warningPosition, width, warningLength,
+				backgroundWarningColor);
+		painter.fillRect(x, errorPosition, width, errorLength,
+				backgroundErrorColor);
+	} else if (peakPosition < warningPosition) {
+		painter.fillRect(x, minimumPosition, width, peakPosition -
+				minimumPosition, foregroundNominalColor);
+		painter.fillRect(x, peakPosition, width, warningPosition -
+				peakPosition, backgroundNominalColor);
+		painter.fillRect(x, warningPosition, width, warningLength,
+				backgroundWarningColor);
+		painter.fillRect(x, errorPosition, width, errorLength,
+				backgroundErrorColor);
+	} else if (peakPosition < errorPosition) {
+		painter.fillRect(x,minimumPosition, width, nominalLength,
+				foregroundNominalColor);
+		painter.fillRect(x, warningPosition, width, peakPosition -
+				warningPosition, foregroundWarningColor);
+		painter.fillRect(x, peakPosition, width, errorPosition -
+				peakPosition, backgroundWarningColor);
+		painter.fillRect(x, errorPosition, width, errorLength,
+				backgroundErrorColor);
+	} else if (peakPosition < maximumPosition) {
+		painter.fillRect(x, minimumPosition, width, nominalLength,
+				foregroundNominalColor);
+		painter.fillRect(x, warningPosition, width, warningLength,
+				foregroundWarningColor);
+		painter.fillRect(x, errorPosition, width, peakPosition -
+				errorPosition, foregroundErrorColor);
+		painter.fillRect(x, peakPosition, width, maximumPosition -
+				peakPosition, backgroundErrorColor);
 	} else {
-		painter.fillRect(
-			magnitudePosition - 3, y,
-			3, height,
-			magnitudeColor);
+		if (!clipping) {
+			QTimer::singleShot(CLIP_FLASH_DURATION_MS, this,
+					SLOT(ClipEnding()));
+			clipping = true;
+		}
+
+		int end = errorLength + warningLength + nominalLength;
+		painter.fillRect(x, minimumPosition, width, end,
+				QBrush(foregroundErrorColor));
 	}
+
+	if (peakHoldPosition - 3 < minimumPosition)
+		;// Peak-hold below minimum, no drawing.
+	else if (peakHoldPosition < warningPosition)
+		painter.fillRect(x, peakHoldPosition - 3, width, 3,
+				foregroundNominalColor);
+	else if (peakHoldPosition < errorPosition)
+		painter.fillRect(x, peakHoldPosition - 3, width, 3,
+				foregroundWarningColor);
+	else
+		painter.fillRect(x, peakHoldPosition - 3, width, 3,
+				foregroundErrorColor);
+
+	if (magnitudePosition - 3 >= minimumPosition)
+		painter.fillRect(x, magnitudePosition - 3, width, 3,
+				magnitudeColor);
 }
 
 void VolumeMeter::paintEvent(QPaintEvent *event)
 {
-	UNUSED_PARAMETER(event);
-
 	uint64_t ts = os_gettime_ns();
 	qreal timeSinceLastRedraw = (ts - lastRedrawTime) * 0.000000001;
 
-	int width  = size().width();
-	int height = size().height();
+	const QRect rect = event->region().boundingRect();
+	int width  = rect.width();
+	int height = rect.height();
 
 	handleChannelCofigurationChange();
 	calculateBallistics(ts, timeSinceLastRedraw);
 	bool idle = detectIdle(ts);
 
 	// Draw the ticks in a off-screen buffer when the widget changes size.
-	QSize tickPaintCacheSize = QSize(width, 9);
-	if (tickPaintCache == NULL ||
+	QSize tickPaintCacheSize;
+	if (vertical)
+		tickPaintCacheSize = QSize(14, height);
+	else
+		tickPaintCacheSize = QSize(width, 9);
+	if (tickPaintCache == nullptr ||
 		tickPaintCache->size() != tickPaintCacheSize) {
 		delete tickPaintCache;
 		tickPaintCache = new QPixmap(tickPaintCacheSize);
@@ -817,30 +980,56 @@
 		tickPaintCache->fill(clearColor);
 
 		QPainter tickPainter(tickPaintCache);
-		paintTicks(tickPainter, 6, 0, tickPaintCacheSize.width() - 6,
-			tickPaintCacheSize.height());
+		if (vertical) {
+			tickPainter.translate(0, height);
+			tickPainter.scale(1, -1);
+			paintVTicks(tickPainter, 0, 11,
+					tickPaintCacheSize.height() - 11);
+		} else {
+			paintHTicks(tickPainter, 6, 0,
+					tickPaintCacheSize.width() - 6,
+					tickPaintCacheSize.height());
+		}
 		tickPainter.end();
 	}
 
 	// Actual painting of the widget starts here.
 	QPainter painter(this);
-	painter.drawPixmap(0, height - 9, *tickPaintCache);
+	if (vertical) {
+		// Invert the Y axis to ease the math
+		painter.translate(0, height);
+		painter.scale(1, -1);
+		painter.drawPixmap(displayNrAudioChannels * 4 - 1, 7,
+				*tickPaintCache);
+	} else {
+		painter.drawPixmap(0, height - 9, *tickPaintCache);
+	}
 
 	for (int channelNr = 0; channelNr < displayNrAudioChannels;
 		channelNr++) {
-		paintMeter(painter,
-			5, channelNr * 4, width - 5, 3,
-			displayMagnitude[channelNr], displayPeak[channelNr],
-			displayPeakHold[channelNr]);
-
-		if (!idle) {
-			// By not drawing the input meter boxes the user can
-			// see that the audio stream has been stopped, without
-			// having too much visual impact.
-			paintInputMeter(painter,
-				0, channelNr * 4, 3, 3,
-				displayInputPeakHold[channelNr]);
-		}
+		if (vertical)
+			paintVMeter(painter, channelNr * 4, 8, 3, height - 10,
+					displayMagnitude[channelNr],
+					displayPeak[channelNr],
+					displayPeakHold[channelNr]);
+		else
+			paintHMeter(painter, 5, channelNr * 4, width - 5, 3,
+					displayMagnitude[channelNr],
+					displayPeak[channelNr],
+					displayPeakHold[channelNr]);
+
+		if (idle)
+			continue;
+
+		// By not drawing the input meter boxes the user can
+		// see that the audio stream has been stopped, without
+		// having too much visual impact.
+		if (vertical)
+			paintInputMeter(painter, channelNr * 4, 3, 3, 3,
+					displayInputPeakHold[channelNr]);
+		else
+			paintInputMeter(painter, 0, channelNr * 4, 3, 3,
+					displayInputPeakHold[channelNr]);
 	}
 
 	lastRedrawTime = ts;

obs-studio-21.1.2.tar.xz/UI/volume-control.hpp -> obs-studio-22.0.1.tar.xz/UI/volume-control.hpp Changed

@@ -2,6 +2,7 @@
 
 #include <obs.hpp>
 #include <QWidget>
+#include <QPaintEvent>
 #include <QSharedPointer>
 #include <QTimer>
 #include <QMutex>
@@ -79,6 +80,9 @@
 		READ getInputPeakHoldDuration
 		WRITE setInputPeakHoldDuration DESIGNABLE true)
 
+private slots:
+	void ClipEnding();
+
 private:
 	obs_volmeter_t *obs_volmeter;
 	static QWeakPointer<VolumeMeterTimer> updateTimer;
@@ -92,12 +96,15 @@
 	inline void calculateBallisticsForChannel(int channelNr,
 		uint64_t ts, qreal timeSinceLastRedraw);
 
-	void paintInputMeter(QPainter &painter, int x, int y,
-		int width, int height, float peakHold);
-	void paintMeter(QPainter &painter, int x, int y,
-		int width, int height,
-		float magnitude, float peak, float peakHold);
-	void paintTicks(QPainter &painter, int x, int y, int width, int height);
+	void paintInputMeter(QPainter &painter, int x, int y, int width,
+			int height, float peakHold);
+	void paintHMeter(QPainter &painter, int x, int y, int width, int height,
+			float magnitude, float peak, float peakHold);
+	void paintHTicks(QPainter &painter, int x, int y, int width,
+			int height);
+	void paintVMeter(QPainter &painter, int x, int y, int width, int height,
+			float magnitude, float peak, float peakHold);
+	void paintVTicks(QPainter &painter, int x, int y, int height);
 
 	QMutex dataMutex;
 
@@ -106,7 +113,7 @@
 	float currentPeak[MAX_AUDIO_CHANNELS];
 	float currentInputPeak[MAX_AUDIO_CHANNELS];
 
-	QPixmap *tickPaintCache = NULL;
+	QPixmap *tickPaintCache = nullptr;
 	int displayNrAudioChannels = 0;
 	float displayMagnitude[MAX_AUDIO_CHANNELS];
 	float displayPeak[MAX_AUDIO_CHANNELS];
@@ -137,10 +144,13 @@
 	qreal inputPeakHoldDuration;
 
 	uint64_t lastRedrawTime = 0;
+	bool clipping = false;
+	bool vertical;
 
 public:
-	explicit VolumeMeter(QWidget *parent = 0,
-		obs_volmeter_t *obs_volmeter = 0);
+	explicit VolumeMeter(QWidget *parent = nullptr,
+			obs_volmeter_t *obs_volmeter = nullptr,
+			bool vertical = false);
 	~VolumeMeter();
 
 	void setLevels(
@@ -186,9 +196,10 @@
 	void setPeakHoldDuration(qreal v);
 	qreal getInputPeakHoldDuration() const;
 	void setInputPeakHoldDuration(qreal v);
+	void setPeakMeterType(enum obs_peak_meter_type peakMeterType);
 
 protected:
-	void paintEvent(QPaintEvent *event);
+	void paintEvent(QPaintEvent *event) override;
 };
 
 class VolumeMeterTimer : public QTimer {
@@ -201,7 +212,7 @@
 	void RemoveVolControl(VolumeMeter *meter);
 
 protected:
-	virtual void timerEvent(QTimerEvent *event) override;
+	void timerEvent(QTimerEvent *event) override;
 	QList<VolumeMeter*> volumeMeters;
 };
 
@@ -224,6 +235,7 @@
 	float           levelCount;
 	obs_fader_t     *obs_fader;
 	obs_volmeter_t  *obs_volmeter;
+	bool            vertical;
 
 	static void OBSVolumeChanged(void *param, float db);
 	static void OBSVolumeLevel(void *data,
@@ -246,7 +258,8 @@
 	void ConfigClicked();
 
 public:
-	VolControl(OBSSource source, bool showConfig = false);
+	explicit VolControl(OBSSource source, bool showConfig = false,
+			bool vertical = false);
 	~VolControl();
 
 	inline obs_source_t *GetSource() const {return source;}
@@ -255,4 +268,5 @@
 	void SetName(const QString &newName);
 
 	void SetMeterDecayRate(qreal q);
+	void setPeakMeterType(enum obs_peak_meter_type peakMeterType);
 };

obs-studio-21.1.2.tar.xz/UI/win-update/updater/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/UI/win-update/updater/CMakeLists.txt Changed

obs-studio-21.1.2.tar.xz/UI/win-update/updater/updater.cpp -> obs-studio-22.0.1.tar.xz/UI/win-update/updater/updater.cpp Changed

@@ -324,6 +324,8 @@
 		memcpy(hash, from.hash, sizeof(hash));
 		memcpy(downloadhash, from.downloadhash, sizeof(downloadhash));
 		memcpy(my_hash, from.my_hash, sizeof(my_hash));
+
+		return *this;
 	}
 };
 
@@ -356,11 +358,11 @@
 	WinHttpSetOption(hSession, WINHTTP_OPTION_SECURE_PROTOCOLS,
 		(LPVOID)&tlsProtocols, sizeof(tlsProtocols));
 
-	HttpHandle hConnect = WinHttpConnect(hSession, L"obsproject.com",
+	HttpHandle hConnect = WinHttpConnect(hSession, L"cdn-fastly.obsproject.com",
 			INTERNET_DEFAULT_HTTPS_PORT, 0);
 	if (!hConnect) {
 		downloadThreadFailure = true;
-		Status(L"Update failed: Couldn't connect to obsproject.com");
+		Status(L"Update failed: Couldn't connect to cdn-fastly.obsproject.com");
 		return false;
 	}
 
@@ -612,7 +614,7 @@
 #define UTF8ToWideBuf(wide, utf8) UTF8ToWide(wide, _countof(wide), utf8)
 #define WideToUTF8Buf(utf8, wide) WideToUTF8(utf8, _countof(utf8), wide)
 
-#define UPDATE_URL L"https://obsproject.com/update_studio"
+#define UPDATE_URL L"https://cdn-fastly.obsproject.com/update_studio"
 
 static bool AddPackageUpdateFiles(json_t *root, size_t idx,
 		const wchar_t *tempPath)
@@ -748,7 +750,7 @@
 	wchar_t sourceURL[1024];
 	wchar_t patchHashStr[BLAKE2_HASH_STR_LENGTH];
 
-	if (strncmp(source, "https://obsproject.com/", 23) != 0)
+	if (strncmp(source, "https://cdn-fastly.obsproject.com/", 34) != 0)
 		return;
 
 	string patchPackageName = name;
@@ -957,10 +959,10 @@
 	WinHttpSetOption(hSession, WINHTTP_OPTION_SECURE_PROTOCOLS,
 		(LPVOID)&tlsProtocols, sizeof(tlsProtocols));
 
-	HttpHandle hConnect = WinHttpConnect(hSession, L"obsproject.com",
+	HttpHandle hConnect = WinHttpConnect(hSession, L"cdn-fastly.obsproject.com",
 			INTERNET_DEFAULT_HTTPS_PORT, 0);
 	if (!hConnect) {
-		Status(L"Update failed: Couldn't connect to obsproject.com");
+		Status(L"Update failed: Couldn't connect to cdn-fastly.obsproject.com");
 		return false;
 	}
 
@@ -981,7 +983,7 @@
 		: L"vc2017redist_x64.exe";
 
 	wstring sourceURL;
-	sourceURL += L"https://obsproject.com/downloads/";
+	sourceURL += L"https://cdn-fastly.obsproject.com/downloads/";
 	sourceURL += file;
 
 	wstring destPath;

obs-studio-21.1.2.tar.xz/UI/win-update/win-update.cpp -> obs-studio-22.0.1.tar.xz/UI/win-update/win-update.cpp Changed

@@ -27,11 +27,15 @@
 #define WIN_MANIFEST_URL "https://obsproject.com/update_studio/manifest.json"
 #endif
 
+#ifndef WIN_WHATSNEW_URL
+#define WIN_WHATSNEW_URL "https://obsproject.com/update_studio/whatsnew.json"
+#endif
+
 #ifndef WIN_UPDATER_URL
 #define WIN_UPDATER_URL "https://obsproject.com/update_studio/updater.exe"
 #endif
 
-static HCRYPTPROV provider = 0;
+static __declspec(thread) HCRYPTPROV provider = 0;
 
 #pragma pack(push, r1, 1)
 
@@ -478,6 +482,32 @@
 	HashToString(junk, &guid[0]);
 }
 
+string GetProgramGUID()
+{
+	static mutex m;
+	lock_guard<mutex> lock(m);
+
+	/* NOTE: this is an arbitrary random number that we use to count the
+	 * number of unique OBS installations and is not associated with any
+	 * kind of identifiable information */
+	const char *pguid = config_get_string(GetGlobalConfig(),
+			"General", "InstallGUID");
+	string guid;
+	if (pguid)
+		guid = pguid;
+
+	if (guid.empty()) {
+		GenerateGUID(guid);
+
+		if (!guid.empty())
+			config_set_string(GetGlobalConfig(),
+					"General", "InstallGUID",
+					guid.c_str());
+	}
+
+	return guid;
+}
+
 void AutoUpdateThread::infoMsg(const QString &title, const QString &text)
 {
 	OBSMessageBox::information(App()->GetMainWindow(), title, text);
@@ -605,24 +635,7 @@
 	/* ----------------------------------- *
 	 * get current install GUID            */
 
-	/* NOTE: this is an arbitrary random number that we use to count the
-	 * number of unique OBS installations and is not associated with any
-	 * kind of identifiable information */
-	const char *pguid = config_get_string(GetGlobalConfig(),
-			"General", "InstallGUID");
-	string guid;
-	if (pguid)
-		guid = pguid;
-
-	if (guid.empty()) {
-		GenerateGUID(guid);
-
-		if (!guid.empty())
-			config_set_string(GetGlobalConfig(),
-					"General", "InstallGUID",
-					guid.c_str());
-	}
-
+	string guid = GetProgramGUID();
 	if (!guid.empty()) {
 		string header = "X-OBS2-GUID: ";
 		header += guid;
@@ -780,3 +793,101 @@
 } catch (string text) {
 	blog(LOG_WARNING, "%s: %s", __FUNCTION__, text.c_str());
 }
+
+/* ------------------------------------------------------------------------ */
+
+void WhatsNewInfoThread::run()
+try {
+	long           responseCode;
+	vector<string> extraHeaders;
+	string         text;
+	string         error;
+	string         signature;
+	CryptProvider  localProvider;
+	BYTE           whatsnewHash[BLAKE2_HASH_LENGTH];
+	bool           success;
+
+	BPtr<char> whatsnewPath = GetConfigPathPtr(
+			"obs-studio\\updates\\whatsnew.json");
+
+	/* ----------------------------------- *
+	 * create signature provider           */
+
+	if (!CryptAcquireContext(&localProvider,
+	                         nullptr,
+	                         MS_ENH_RSA_AES_PROV,
+	                         PROV_RSA_AES,
+	                         CRYPT_VERIFYCONTEXT))
+		throw strprintf("CryptAcquireContext failed: %lu",
+				GetLastError());
+
+	provider = localProvider;
+
+	/* ----------------------------------- *
+	 * avoid downloading json again        */
+
+	if (CalculateFileHash(whatsnewPath, whatsnewHash)) {
+		char hashString[BLAKE2_HASH_STR_LENGTH];
+		HashToString(whatsnewHash, hashString);
+
+		string header = "If-None-Match: ";
+		header += hashString;
+		extraHeaders.push_back(move(header));
+	}
+
+	/* ----------------------------------- *
+	 * get current install GUID            */
+
+	string guid = GetProgramGUID();
+
+	if (!guid.empty()) {
+		string header = "X-OBS2-GUID: ";
+		header += guid;
+		extraHeaders.push_back(move(header));
+	}
+
+	/* ----------------------------------- *
+	 * get json from server                */
+
+	success = GetRemoteFile(WIN_WHATSNEW_URL, text, error, &responseCode,
+			nullptr, nullptr, extraHeaders, &signature);
+
+	if (!success || (responseCode != 200 && responseCode != 304)) {
+		if (responseCode == 404)
+			return;
+
+		throw strprintf("Failed to fetch whatsnew file: %s",
+				error.c_str());
+	}
+
+	/* ----------------------------------- *
+	 * verify file signature               */
+
+	if (responseCode == 200) {
+		success = CheckDataSignature(text, "whatsnew",
+				signature.data(), signature.size());
+		if (!success)
+			throw string("Invalid whatsnew signature");
+	}
+
+	/* ----------------------------------- *
+	 * write or load json                  */
+
+	if (responseCode == 200) {
+		if (!QuickWriteFile(whatsnewPath, text.data(), text.size()))
+			throw strprintf("Could not write file '%s'",
+					whatsnewPath.Get());
+	} else {
+		if (!QuickReadFile(whatsnewPath, text))
+			throw strprintf("Could not read file '%s'",
+					whatsnewPath.Get());
+	}
+
+	/* ----------------------------------- *
+	 * success                             */
+
+	emit Result(QString::fromUtf8(text.c_str()));
+
+} catch (string text) {
+	blog(LOG_WARNING, "%s: %s", __FUNCTION__, text.c_str());
+}

obs-studio-21.1.2.tar.xz/UI/win-update/win-update.hpp -> obs-studio-22.0.1.tar.xz/UI/win-update/win-update.hpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-adv-audio.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-adv-audio.cpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-filters.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-filters.cpp Changed

@@ -56,7 +56,8 @@
 	                                OBSBasicFilters::SourceRemoved, this),
 	  renameSourceSignal           (obs_source_get_signal_handler(source),
 	                                "rename",
-	                                OBSBasicFilters::SourceRenamed, this)
+	                                OBSBasicFilters::SourceRenamed, this),
+	  noPreviewMargin               (13)
 {
 	main = reinterpret_cast<OBSBasic*>(parent);
 
@@ -97,10 +98,10 @@
 	connect(ui->buttonBox->button(QDialogButtonBox::Reset),
 		SIGNAL(clicked()), this, SLOT(ResetFilters()));
 
-	uint32_t flags = obs_source_get_output_flags(source);
-	bool audio     = (flags & OBS_SOURCE_AUDIO) != 0;
-	bool audioOnly = (flags & OBS_SOURCE_VIDEO) == 0;
-	bool async     = (flags & OBS_SOURCE_ASYNC) != 0;
+	uint32_t caps = obs_source_get_output_flags(source);
+	bool audio     = (caps & OBS_SOURCE_AUDIO) != 0;
+	bool audioOnly = (caps & OBS_SOURCE_VIDEO) == 0;
+	bool async     = (caps & OBS_SOURCE_ASYNC) != 0;
 
 	if (!async && !audio) {
 		ui->asyncWidget->setVisible(false);
@@ -121,13 +122,19 @@
 	};
 
 	enum obs_source_type type = obs_source_get_type(source);
-	uint32_t caps = obs_source_get_output_flags(source);
 	bool drawable_type = type == OBS_SOURCE_TYPE_INPUT ||
 		type == OBS_SOURCE_TYPE_SCENE;
 
-	if (drawable_type && (caps & OBS_SOURCE_VIDEO) != 0)
-		connect(ui->preview, &OBSQTDisplay::DisplayCreated,
-				addDrawCallback);
+	if ((caps & OBS_SOURCE_VIDEO) != 0) {
+		ui->rightLayout->setContentsMargins(0, 0, 0, 0);
+		ui->preview->show();
+		if (drawable_type)
+			connect(ui->preview, &OBSQTDisplay::DisplayCreated,
+					addDrawCallback);
+	} else {
+		ui->rightLayout->setContentsMargins(0, noPreviewMargin, 0, 0);
+		ui->preview->hide();
+	}
 }
 
 OBSBasicFilters::~OBSBasicFilters()
@@ -179,6 +186,15 @@
 			OBSBasicFilters::UpdateProperties,
 			this);
 
+	uint32_t caps = obs_source_get_output_flags(filter);
+	if ((caps & OBS_SOURCE_VIDEO)) {
+		ui->rightLayout->setContentsMargins(0, 0, 0, 0);
+		ui->preview->show();
+	} else {
+		ui->rightLayout->setContentsMargins(0, noPreviewMargin, 0, 0);
+		ui->preview->hide();
+	}
+
 	obs_data_release(settings);
 
 	view->setMaximumHeight(250);
@@ -569,7 +585,7 @@
 
 void OBSBasicFilters::on_addAsyncFilter_clicked()
 {
-	QPointer<QMenu> popup = CreateAddFilterPopupMenu(true);
+	QScopedPointer<QMenu> popup(CreateAddFilterPopupMenu(true));
 	if (popup)
 		popup->exec(QCursor::pos());
 }
@@ -611,7 +627,7 @@
 
 void OBSBasicFilters::on_addEffectFilter_clicked()
 {
-	QPointer<QMenu> popup = CreateAddFilterPopupMenu(false);
+	QScopedPointer<QMenu> popup(CreateAddFilterPopupMenu(false));
 	if (popup)
 		popup->exec(QCursor::pos());
 }

obs-studio-21.1.2.tar.xz/UI/window-basic-filters.hpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-filters.hpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-main-dropfiles.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-main-dropfiles.cpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-main-outputs.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-main-outputs.cpp Changed

@@ -895,6 +895,7 @@
 		obs_data_set_string(settings, "directory", path);
 		obs_data_set_string(settings, "format", f.c_str());
 		obs_data_set_string(settings, "extension", format);
+		obs_data_set_bool(settings, "allow_spaces", !noSpace);
 		obs_data_set_int(settings, "max_time_sec", rbTime);
 		obs_data_set_int(settings, "max_size_mb",
 				usingRecordingPreset ? rbSize : 0);
@@ -1032,19 +1033,32 @@
 static OBSData GetDataFromJsonFile(const char *jsonFile)
 {
 	char fullPath[512];
+	obs_data_t *data = nullptr;
 
 	int ret = GetProfilePath(fullPath, sizeof(fullPath), jsonFile);
 	if (ret > 0) {
 		BPtr<char> jsonData = os_quick_read_utf8_file(fullPath);
 		if (!!jsonData) {
-			obs_data_t *data = obs_data_create_from_json(jsonData);
-			OBSData dataRet(data);
-			obs_data_release(data);
-			return dataRet;
+			data = obs_data_create_from_json(jsonData);
 		}
 	}
 
-	return nullptr;
+	if (!data)
+		data = obs_data_create();
+	OBSData dataRet(data);
+	obs_data_release(data);
+	return dataRet;
+}
+
+static void ApplyEncoderDefaults(OBSData &settings,
+		const obs_encoder_t *encoder)
+{
+	OBSData dataRet = obs_encoder_get_defaults(encoder);
+	obs_data_release(dataRet);
+
+	if (!!settings)
+		obs_data_apply(dataRet, settings);
+	settings = std::move(dataRet);
 }
 
 AdvancedOutput::AdvancedOutput(OBSBasic *main_) : BasicOutputHandler(main_)
@@ -1157,6 +1171,7 @@
 			"ApplyServiceSettings");
 
 	OBSData settings = GetDataFromJsonFile("streamEncoder.json");
+	ApplyEncoderDefaults(settings, h264Streaming);
 
 	if (applyServiceSettings)
 		obs_service_apply_encoder_settings(main->GetService(),
@@ -1717,6 +1732,7 @@
 		obs_data_set_string(settings, "directory", path);
 		obs_data_set_string(settings, "format", f.c_str());
 		obs_data_set_string(settings, "extension", recFormat);
+		obs_data_set_bool(settings, "allow_spaces", !noSpace);
 		obs_data_set_int(settings, "max_time_sec", rbTime);
 		obs_data_set_int(settings, "max_size_mb",
 				usesBitrate ? 0 : rbSize);

obs-studio-21.1.2.tar.xz/UI/window-basic-main-profiles.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-main-profiles.cpp Changed

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

obs-studio-21.1.2.tar.xz/UI/window-basic-main-transitions.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-main-transitions.cpp Changed

@@ -26,6 +26,8 @@
 #include "menu-button.hpp"
 #include "qt-wrappers.hpp"
 
+#include "obs-hotkey.h"
+
 using namespace std;
 
 Q_DECLARE_METATYPE(OBSScene);
@@ -98,6 +100,18 @@
 			(void*)(uintptr_t)qt->id);
 }
 
+void QuickTransition::SourceRenamed(void *param, calldata_t *data)
+{
+	QuickTransition *qt = reinterpret_cast<QuickTransition*>(param);
+
+	QString hotkeyName = QTStr("QuickTransitions.HotkeyName")
+		.arg(MakeQuickTransitionText(qt));
+
+	obs_hotkey_set_description(qt->hotkey, QT_TO_UTF8(hotkeyName));
+
+	UNUSED_PARAMETER(data);
+}
+
 void OBSBasic::TriggerQuickTransition(int id)
 {
 	QuickTransition *qt = GetQuickTransition(id);
@@ -545,6 +559,10 @@
 		int idx = ui->transitions->findData(variant);
 		if (idx != -1) {
 			ui->transitions->setItemText(idx, QT_UTF8(name.c_str()));
+
+			if (api)
+				api->on_event(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
+
 			ClearQuickTransitionWidgets();
 			RefreshQuickTransitions();
 		}
@@ -639,12 +657,11 @@
 				ui->scenes->blockSignals(true);
 				ui->scenes->setCurrentItem(item);
 				ui->scenes->blockSignals(false);
+				if (api)
+					api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
 				break;
 			}
 		}
-
-		if (api && IsPreviewProgramMode())
-			api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
 	}
 
 	UpdateSceneSelection(scene);
@@ -733,7 +750,7 @@
 	programOptions->setLayout(layout);
 
 	auto onAdd = [this] () {
-		QPointer<QMenu> menu = CreateTransitionMenu(this, nullptr);
+		QScopedPointer<QMenu> menu(CreateTransitionMenu(this, nullptr));
 		menu->exec(QCursor::pos());
 	};

obs-studio-21.1.2.tar.xz/UI/window-basic-main.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-main.cpp Changed

@@ -27,6 +27,9 @@
 #include <QDesktopWidget>
 #include <QRect>
 #include <QScreen>
+#include <QColorDialog>
+#include <QWidgetAction>
+#include <QSizePolicy>
 
 #include <util/dstr.h>
 #include <util/util.hpp>
@@ -54,12 +57,14 @@
 #include "display-helpers.hpp"
 #include "volume-control.hpp"
 #include "remote-text.hpp"
+#include "source-tree.hpp"
 
-#if defined(_WIN32) && defined(ENABLE_WIN_UPDATER)
+#ifdef _WIN32
 #include "win-update/win-update.hpp"
 #endif
 
 #include "ui_OBSBasic.h"
+#include "ui_ColorSelect.h"
 
 #include <fstream>
 #include <sstream>
@@ -67,8 +72,19 @@
 #include <QScreen>
 #include <QWindow>
 
+#ifdef _WIN32
+#include <browser-panel.hpp>
+#endif
+
+#include <json11.hpp>
+
+using namespace json11;
 using namespace std;
 
+#ifdef _WIN32
+static CREATE_BROWSER_WIDGET_PROC create_browser_widget = nullptr;
+#endif
+
 namespace {
 
 template <typename OBSRef>
@@ -129,7 +145,27 @@
 #endif
 }
 
-static QList<QKeySequence> DeleteKeys;
+extern obs_frontend_callbacks *InitializeAPIInterface(OBSBasic *main);
+
+static int CountVideoSources()
+{
+	int count = 0;
+
+	auto countSources = [] (void *param, obs_source_t *source)
+	{
+		if (!source)
+			return true;
+
+		uint32_t flags = obs_source_get_output_flags(source);
+		if ((flags & OBS_SOURCE_VIDEO) != 0)
+			(*reinterpret_cast<int*>(param))++;
+
+		return true;
+	};
+
+	obs_enum_sources(countSources, &count);
+	return count;
+}
 
 OBSBasic::OBSBasic(QWidget *parent)
 	: OBSMainWindow  (parent),
@@ -137,13 +173,10 @@
 {
 	setAttribute(Qt::WA_NativeWindow);
 
-	projectorArray.resize(10, "");
-	previewProjectorArray.resize(10, 0);
-	multiviewProjectorArray.resize(10, 0);
-	studioProgramProjectorArray.resize(10, 0);
-
 	setAcceptDrops(true);
 
+	api = InitializeAPIInterface(this);
+
 	ui->setupUi(this);
 	ui->previewDisabledLabel->setVisible(false);
 
@@ -151,8 +184,6 @@
 
 	copyActionsDynamicProperties();
 
-	ui->sources->setItemDelegate(new VisibilityItemDelegate(ui->sources));
-
 	char styleSheetPath[512];
 	int ret = GetProfilePath(styleSheetPath, sizeof(styleSheetPath),
 			"stylesheet.qss");
@@ -204,28 +235,15 @@
 			SLOT(SceneNameEdited(QWidget*,
 					QAbstractItemDelegate::EndEditHint)));
 
-	connect(ui->sources->itemDelegate(),
-			SIGNAL(closeEditor(QWidget*,
-					QAbstractItemDelegate::EndEditHint)),
-			this,
-			SLOT(SceneItemNameEdited(QWidget*,
-					QAbstractItemDelegate::EndEditHint)));
-
 	cpuUsageInfo = os_cpu_usage_info_start();
 	cpuUsageTimer = new QTimer(this);
-	connect(cpuUsageTimer, SIGNAL(timeout()),
+	connect(cpuUsageTimer.data(), SIGNAL(timeout()),
 			ui->statusbar, SLOT(UpdateCPUUsage()));
 	cpuUsageTimer->start(3000);
 
-	DeleteKeys =
-#ifdef __APPLE__
-		QList<QKeySequence>{{Qt::Key_Backspace}} <<
-#endif
-		QKeySequence::keyBindings(QKeySequence::Delete);
-
 #ifdef __APPLE__
-	ui->actionRemoveSource->setShortcuts(DeleteKeys);
-	ui->actionRemoveScene->setShortcuts(DeleteKeys);
+	ui->actionRemoveSource->setShortcuts({Qt::Key_Backspace});
+	ui->actionRemoveScene->setShortcuts({Qt::Key_Backspace});
 
 	ui->action_Settings->setMenuRole(QAction::PreferencesRole);
 	ui->actionE_xit->setMenuRole(QAction::QuitRole);
@@ -245,7 +263,7 @@
 	addNudge(Qt::Key_Left, SLOT(NudgeLeft()));
 	addNudge(Qt::Key_Right, SLOT(NudgeRight()));
 
-	auto assignDockToggle = [this](QDockWidget *dock, QAction *action)
+	auto assignDockToggle = [] (QDockWidget *dock, QAction *action)
 	{
 		auto handleWindowToggle = [action] (bool vis)
 		{
@@ -319,10 +337,7 @@
 		obs_data_array_t *quickTransitionData, int transitionDuration,
 		obs_data_array_t *transitions,
 		OBSScene &scene, OBSSource &curProgramScene,
-		obs_data_array_t *savedProjectorList,
-		obs_data_array_t *savedPreviewProjectorList,
-		obs_data_array_t *savedStudioProgramProjectorList,
-		obs_data_array_t *savedMultiviewProjectorList)
+		obs_data_array_t *savedProjectorList)
 {
 	obs_data_t *saveData = obs_data_create();
 
@@ -335,8 +350,14 @@
 	SaveAudioDevice(AUX_AUDIO_2,     4, saveData, audioSources);
 	SaveAudioDevice(AUX_AUDIO_3,     5, saveData, audioSources);
 
+	/* -------------------------------- */
+	/* save non-group sources           */
+
 	auto FilterAudioSources = [&](obs_source_t *source)
 	{
+		if (obs_source_is_group(source))
+			return false;
+
 		return find(begin(audioSources), end(audioSources), source) ==
 				end(audioSources);
 	};
@@ -348,6 +369,18 @@
 		return (*static_cast<FilterAudioSources_t*>(data))(source);
 	}, static_cast<void*>(&FilterAudioSources));
 
+	/* -------------------------------- */
+	/* save group sources separately    */
+
+	/* saving separately ensures they won't be loaded in older versions */
+	obs_data_array_t *groupsArray = obs_save_sources_filtered(
+			[](void*, obs_source_t *source)
+	{
+		return obs_source_is_group(source);
+	}, nullptr);
+
+	/* -------------------------------- */
+
 	obs_source_t *transition = obs_get_output_source(0);
 	obs_source_t *currentScene = obs_scene_get_source(scene);
 	const char   *sceneName   = obs_source_get_name(currentScene);
@@ -361,16 +394,12 @@
 	obs_data_set_array(saveData, "scene_order", sceneOrder);
 	obs_data_set_string(saveData, "name", sceneCollection);
 	obs_data_set_array(saveData, "sources", sourcesArray);
+	obs_data_set_array(saveData, "groups", groupsArray);
 	obs_data_set_array(saveData, "quick_transitions", quickTransitionData);
 	obs_data_set_array(saveData, "transitions", transitions);
 	obs_data_set_array(saveData, "saved_projectors", savedProjectorList);
-	obs_data_set_array(saveData, "saved_preview_projectors",
-			savedPreviewProjectorList);
-	obs_data_set_array(saveData, "saved_studio_preview_projectors",
-			savedStudioProgramProjectorList);
-	obs_data_set_array(saveData, "saved_multiview_projectors",
-			savedMultiviewProjectorList);
 	obs_data_array_release(sourcesArray);
+	obs_data_array_release(groupsArray);
 
 	obs_data_set_string(saveData, "current_transition",
 			obs_source_get_name(transition));
@@ -410,14 +439,33 @@
 	}
 }
 
-void OBSBasic::ClearVolumeControls()
+void OBSBasic::UpdateVolumeControlsPeakMeterType()
 {
-	VolControl *control;
+	uint32_t peakMeterTypeIdx = config_get_uint(basicConfig, "Audio",
+			"PeakMeterType");
+
+	enum obs_peak_meter_type peakMeterType;
+	switch (peakMeterTypeIdx) {
+	case 0:
+		peakMeterType = SAMPLE_PEAK_METER;
+		break;
+	case 1:
+		peakMeterType = TRUE_PEAK_METER;
+		break;
+	default:
+		peakMeterType = SAMPLE_PEAK_METER;
+		break;
+	}
 
 	for (size_t i = 0; i < volumes.size(); i++) {
-		control = volumes[i];
-		delete control;
+		volumes[i]->setPeakMeterType(peakMeterType);
 	}
+}
+
+void OBSBasic::ClearVolumeControls()
+{
+	for (VolControl *vol : volumes)
+		delete vol;
 
 	volumes.clear();
 }
@@ -439,62 +487,41 @@
 
 obs_data_array_t *OBSBasic::SaveProjectors()
 {
-	obs_data_array_t *saveProjector = obs_data_array_create();
-
-	for (size_t i = 0; i < projectorArray.size(); i++) {
-		obs_data_t *data = obs_data_create();
-		obs_data_set_string(data, "saved_projectors",
-			projectorArray.at(i).c_str());
-		obs_data_array_push_back(saveProjector, data);
-		obs_data_release(data);
-	}
-
-	return saveProjector;
-}
-
-obs_data_array_t *OBSBasic::SavePreviewProjectors()
-{
-	obs_data_array_t *saveProjector = obs_data_array_create();
-
-	for (size_t i = 0; i < previewProjectorArray.size(); i++) {
-		obs_data_t *data = obs_data_create();
-		obs_data_set_int(data, "saved_preview_projectors",
-			previewProjectorArray.at(i));
-		obs_data_array_push_back(saveProjector, data);
-		obs_data_release(data);
-	}
+	obs_data_array_t *savedProjectors = obs_data_array_create();
 
-	return saveProjector;
-}
-
-obs_data_array_t *OBSBasic::SaveStudioProgramProjectors()
-{
-	obs_data_array_t *saveProjector = obs_data_array_create();
+	auto saveProjector = [savedProjectors](OBSProjector *projector) {
+		if (!projector)
+			return;
 
-	for (size_t i = 0; i < studioProgramProjectorArray.size(); i++) {
 		obs_data_t *data = obs_data_create();
-		obs_data_set_int(data, "saved_studio_preview_projectors",
-			studioProgramProjectorArray.at(i));
-		obs_data_array_push_back(saveProjector, data);
+		ProjectorType type = projector->GetProjectorType();
+		switch (type) {
+		case ProjectorType::Scene:
+		case ProjectorType::Source: {
+			obs_source_t *source = projector->GetSource();
+			const char *name = obs_source_get_name(source);
+			obs_data_set_string(data, "name", name);
+			break;
+		}
+		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());
+		obs_data_array_push_back(savedProjectors, data);
 		obs_data_release(data);
-	}
-
-	return saveProjector;
-}
+	};
 
-obs_data_array_t *OBSBasic::SaveMultiviewProjectors()
-{
-	obs_data_array_t *saveProjector = obs_data_array_create();
+	for (QPointer<QWidget> &proj : projectors)
+		saveProjector(static_cast<OBSProjector *>(proj.data()));
 
-	for (size_t i = 0; i < multiviewProjectorArray.size(); i++) {
-		obs_data_t *data = obs_data_create();
-		obs_data_set_int(data, "saved_multiview_projectors",
-			multiviewProjectorArray.at(i));
-		obs_data_array_push_back(saveProjector, data);
-		obs_data_release(data);
-	}
+	for (QPointer<QWidget> &proj : windowProjectors)
+		saveProjector(static_cast<OBSProjector *>(proj.data()));
 
-	return saveProjector;
+	return savedProjectors;
 }
 
 void OBSBasic::Save(const char *file)
@@ -508,17 +535,9 @@
 	obs_data_array_t *transitions = SaveTransitions();
 	obs_data_array_t *quickTrData = SaveQuickTransitions();
 	obs_data_array_t *savedProjectorList = SaveProjectors();
-	obs_data_array_t *savedPreviewProjectorList = SavePreviewProjectors();
-	obs_data_array_t *savedStudioProgramProjectorList =
-			SaveStudioProgramProjectors();
-	obs_data_array_t *savedMultiviewProjectorList =
-			SaveMultiviewProjectors();
 	obs_data_t *saveData = GenerateSaveData(sceneOrder, quickTrData,
 			ui->transitionDuration->value(), transitions,
-			scene, curProgramScene, savedProjectorList,
-			savedPreviewProjectorList,
-			savedStudioProgramProjectorList,
-			savedMultiviewProjectorList);
+			scene, curProgramScene, savedProjectorList);
 
 	obs_data_set_bool(saveData, "preview_locked", ui->preview->Locked());
 	obs_data_set_bool(saveData, "scaling_enabled",
@@ -545,9 +564,19 @@
 	obs_data_array_release(quickTrData);
 	obs_data_array_release(transitions);
 	obs_data_array_release(savedProjectorList);
-	obs_data_array_release(savedPreviewProjectorList);
-	obs_data_array_release(savedStudioProgramProjectorList);
-	obs_data_array_release(savedMultiviewProjectorList);
+}
+
+void OBSBasic::DeferSaveBegin()
+{
+	os_atomic_inc_long(&disableSaving);
+}
+
+void OBSBasic::DeferSaveEnd()
+{
+	long result = os_atomic_dec_long(&disableSaving);
+	if (result == 0) {
+		SaveProject();
+	}
 }
 
 static void LoadAudioDevice(const char *name, int channel, obs_data_t *parent)
@@ -611,7 +640,6 @@
 	if (firstStart)
 		CreateFirstRunSources();
 
-	AddScene(obs_scene_get_source(scene));
 	SetCurrentScene(scene, true);
 	obs_scene_release(scene);
 
@@ -653,47 +681,15 @@
 
 	for (size_t i = 0; i < num; i++) {
 		obs_data_t *data = obs_data_array_item(array, i);
-		projectorArray.at(i) = obs_data_get_string(data,
-				"saved_projectors");
-
-		obs_data_release(data);
-	}
-}
-
-void OBSBasic::LoadSavedPreviewProjectors(obs_data_array_t *array)
-{
-	size_t num = obs_data_array_count(array);
-
-	for (size_t i = 0; i < num; i++) {
-		obs_data_t *data = obs_data_array_item(array, i);
-		previewProjectorArray.at(i) = obs_data_get_int(data,
-				"saved_preview_projectors");
-
-		obs_data_release(data);
-	}
-}
-
-void OBSBasic::LoadSavedStudioProgramProjectors(obs_data_array_t *array)
-{
-	size_t num = obs_data_array_count(array);
-
-	for (size_t i = 0; i < num; i++) {
-		obs_data_t *data = obs_data_array_item(array, i);
-		studioProgramProjectorArray.at(i) = obs_data_get_int(data,
-				"saved_studio_preview_projectors");
-
-		obs_data_release(data);
-	}
-}
 
-void OBSBasic::LoadSavedMultiviewProjectors(obs_data_array_t *array)
-{
-	size_t num = obs_data_array_count(array);
-
-	for (size_t i = 0; i < num; i++) {
-		obs_data_t *data = obs_data_array_item(array, i);
-		multiviewProjectorArray.at(i) = obs_data_get_int(data,
-				"saved_multiview_projectors");
+		SavedProjectorInfo *info = new SavedProjectorInfo();
+		info->monitor = obs_data_get_int(data, "monitor");
+		info->type = static_cast<ProjectorType>(obs_data_get_int(data,
+				"type"));
+		info->geometry = std::string(
+				obs_data_get_string(data, "geometry"));
+		info->name = std::string(obs_data_get_string(data, "name"));
+		savedProjectorsArray.emplace_back(info);
 
 		obs_data_release(data);
 	}
@@ -778,6 +774,7 @@
 
 	obs_data_array_t *sceneOrder = obs_data_get_array(data, "scene_order");
 	obs_data_array_t *sources    = obs_data_get_array(data, "sources");
+	obs_data_array_t *groups     = obs_data_get_array(data, "groups");
 	obs_data_array_t *transitions= obs_data_get_array(data, "transitions");
 	const char       *sceneName = obs_data_get_string(data,
 			"current_scene");
@@ -818,7 +815,14 @@
 	LoadAudioDevice(AUX_AUDIO_2,     4, data);
 	LoadAudioDevice(AUX_AUDIO_3,     5, data);
 
-	obs_load_sources(sources, OBSBasic::SourceLoaded, this);
+	if (!sources) {
+		sources = groups;
+		groups = nullptr;
+	} else {
+		obs_data_array_push_back_array(sources, groups);
+	}
+
+	obs_load_sources(sources, nullptr, nullptr);
 
 	if (transitions)
 		LoadTransitions(transitions);
@@ -834,47 +838,6 @@
 	ui->transitionDuration->setValue(newDuration);
 	SetTransition(curTransition);
 
-	/* ------------------- */
-
-	obs_data_array_t *savedProjectors = obs_data_get_array(data,
-			"saved_projectors");
-
-	if (savedProjectors)
-		LoadSavedProjectors(savedProjectors);
-
-	obs_data_array_release(savedProjectors);
-
-	/* ------------------- */
-
-	obs_data_array_t *savedPreviewProjectors = obs_data_get_array(data,
-			"saved_preview_projectors");
-
-	if (savedPreviewProjectors)
-		LoadSavedPreviewProjectors(savedPreviewProjectors);
-
-	obs_data_array_release(savedPreviewProjectors);
-
-	/* ------------------- */
-
-	obs_data_array_t *savedStudioProgramProjectors = obs_data_get_array(data,
-			"saved_studio_preview_projectors");
-
-	if (savedStudioProgramProjectors)
-		LoadSavedStudioProgramProjectors(savedStudioProgramProjectors);
-
-	obs_data_array_release(savedStudioProgramProjectors);
-
-	/* ------------------- */
-
-	obs_data_array_t *savedMultiviewProjectors = obs_data_get_array(data,
-			"saved_multiview_projectors");
-
-	if (savedMultiviewProjectors)
-		LoadSavedMultiviewProjectors(savedMultiviewProjectors);
-
-	obs_data_array_release(savedMultiviewProjectors);
-
-
 retryScene:
 	curScene = obs_get_source_by_name(sceneName);
 	curProgramScene = obs_get_source_by_name(programSceneName);
@@ -903,8 +866,29 @@
 	obs_source_release(curProgramScene);
 
 	obs_data_array_release(sources);
+	obs_data_array_release(groups);
 	obs_data_array_release(sceneOrder);
 
+	/* ------------------- */
+
+	bool projectorSave = config_get_bool(GetGlobalConfig(), "BasicWindow",
+			"SaveProjectors");
+
+	if (projectorSave) {
+		obs_data_array_t *savedProjectors = obs_data_get_array(data,
+				"saved_projectors");
+
+		if (savedProjectors) {
+			LoadSavedProjectors(savedProjectors);
+			OpenSavedProjectors();
+			activateWindow();
+		}
+
+		obs_data_array_release(savedProjectors);
+	}
+
+	/* ------------------- */
+
 	std::string file_base = strrchr(file, '/') + 1;
 	file_base.erase(file_base.size() - 5, 5);
 
@@ -972,8 +956,10 @@
 
 	disableSaving--;
 
-	if (api)
+	if (api) {
 		api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
+		api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
+	}
 }
 
 #define SERVICE_PATH "service.json"
@@ -1247,6 +1233,7 @@
 			"Stereo");
 	config_set_default_double(basicConfig, "Audio", "MeterDecayRate",
 			VOLUME_METER_DECAY_FAST);
+	config_set_default_uint  (basicConfig, "Audio", "PeakMeterType", 0);
 
 	return true;
 }
@@ -1296,6 +1283,8 @@
 	ProfileScope("OBSBasic::InitOBSCallbacks");
 
 	signalHandlers.reserve(signalHandlers.size() + 6);
+	signalHandlers.emplace_back(obs_get_signal_handler(), "source_create",
+			OBSBasic::SourceCreated, this);
 	signalHandlers.emplace_back(obs_get_signal_handler(), "source_remove",
 			OBSBasic::SourceRemoved, this);
 	signalHandlers.emplace_back(obs_get_signal_handler(), "source_activate",
@@ -1377,6 +1366,7 @@
 			replayBufferButton = new QPushButton(
 					QTStr("Basic.Main.StartReplayBuffer"),
 					this);
+			replayBufferButton->setCheckable(true);
 			connect(replayBufferButton.data(),
 					&QPushButton::clicked,
 					this,
@@ -1402,8 +1392,6 @@
 #define SHUTDOWN_SEPARATOR \
 	"==== Shutting down =================================================="
 
-extern obs_frontend_callbacks *InitializeAPIInterface(OBSBasic *main);
-
 #define UNSUPPORTED_ERROR \
 	"Failed to initialize video:\n\nRequired graphics API functionality " \
 	"not found.  Your GPU may not be supported."
@@ -1469,8 +1457,6 @@
 	InitOBSCallbacks();
 	InitHotkeys();
 
-	api = InitializeAPIInterface(this);
-
 	AddExtraModulePaths();
 	blog(LOG_INFO, "---------------------------------");
 	obs_load_all_modules();
@@ -1479,6 +1465,10 @@
 	blog(LOG_INFO, "---------------------------------");
 	obs_post_load_modules();
 
+#ifdef _WIN32
+	create_browser_widget = obs_browser_init_panel();
+#endif
+
 	CheckForSimpleModeX264Fallback();
 
 	blog(LOG_INFO, STARTUP_SEPARATOR);
@@ -1520,12 +1510,14 @@
 	SET_VISIBILITY("ShowStatusBar", toggleStatusBar);
 #undef SET_VISIBILITY
 
+#ifndef __APPLE__
 	{
 		ProfileScope("OBSBasic::Load");
 		disableSaving--;
 		Load(savePath);
 		disableSaving++;
 	}
+#endif
 
 	TimedCheckForUpdates();
 	loaded = true;
@@ -1547,7 +1539,9 @@
 	}
 #endif
 
+#ifndef __APPLE__
 	RefreshSceneCollections();
+#endif
 	RefreshProfiles();
 	disableSaving--;
 
@@ -1600,9 +1594,9 @@
 	ui->lockUI->setChecked(docksLocked);
 	ui->lockUI->blockSignals(false);
 
+#ifndef __APPLE__
 	SystemTray(true);
-
-	OpenSavedProjectors();
+#endif
 
 	if (windowState().testFlag(Qt::WindowFullScreen))
 		fullscreenInterface = true;
@@ -1637,6 +1631,9 @@
 		}
 	}
 
+	ToggleMixerLayout(config_get_bool(App()->GlobalConfig(), "BasicWindow",
+			"VerticalVolControl"));
+
 	if (config_get_bool(basicConfig, "General", "OpenStatsOnStartup"))
 		on_stats_triggered();
 
@@ -1664,6 +1661,174 @@
 	ui->menuCrashLogs = nullptr;
 	ui->actionCheckForUpdates = nullptr;
 #endif
+
+#ifdef __APPLE__
+	/* This is an incredibly unpleasant hack for macOS to isolate CEF
+	 * initialization until after all tasks related to Qt startup and main
+	 * window initialization have completed.  There is a macOS-specific bug
+	 * within either CEF and/or Qt that can cause a crash if both Qt and
+	 * CEF are loading at the same time.
+	 *
+	 * CEF will typically load fine after about two iterations from this
+	 * point, and all Qt tasks are typically fully completed after about
+	 * four or five iterations, but to be "ultra" safe, an arbitrarily
+	 * large number such as 10 is used.  This hack is extremely unpleasant,
+	 * but is worth doing instead of being forced to isolate the entire
+	 * browser plugin in to a separate process as before.
+	 *
+	 * Again, this hack is specific to macOS only.  Fortunately, on other
+	 * operating systems, such issues do not occur. */
+	QMetaObject::invokeMethod(this, "DeferredLoad",
+			Qt::QueuedConnection,
+			Q_ARG(QString, QT_UTF8(savePath)),
+			Q_ARG(int, 10));
+#else
+	OnFirstLoad();
+#endif
+}
+
+void OBSBasic::OnFirstLoad()
+{
+	if (api)
+		api->on_event(OBS_FRONTEND_EVENT_FINISHED_LOADING);
+
+#ifdef _WIN32
+	/* Attempt to load init screen if available */
+	if (create_browser_widget) {
+		WhatsNewInfoThread *wnit = new WhatsNewInfoThread();
+		if (wnit) {
+			connect(wnit, &WhatsNewInfoThread::Result,
+					this, &OBSBasic::ReceivedIntroJson);
+		}
+		if (wnit) {
+			introCheckThread.reset(wnit);
+			introCheckThread->start();
+		}
+	}
+#endif
+}
+
+void OBSBasic::DeferredLoad(const QString &file, int requeueCount)
+{
+	if (--requeueCount > 0) {
+		QMetaObject::invokeMethod(this, "DeferredLoad",
+				Qt::QueuedConnection,
+				Q_ARG(QString, file),
+				Q_ARG(int, requeueCount));
+		return;
+	}
+
+	Load(QT_TO_UTF8(file));
+	RefreshSceneCollections();
+	OnFirstLoad();
+
+	/* Minimizng to tray on initial startup does not work on mac
+	 * unless it is done in the deferred load */
+	SystemTray(true);
+}
+
+/* shows a "what's new" page on startup of new versions using CEF */
+void OBSBasic::ReceivedIntroJson(const QString &text)
+{
+#ifdef _WIN32
+	std::string err;
+	Json json = Json::parse(QT_TO_UTF8(text), err);
+	if (!err.empty())
+		return;
+
+	std::string info_url;
+	int info_increment = -1;
+
+	/* check to see if there's an info page for this version */
+	const Json::array &items = json.array_items();
+	for (const Json &item : items) {
+		const std::string &version = item["version"].string_value();
+		const std::string &url = item["url"].string_value();
+		int increment = item["increment"].int_value();
+		int rc = item["RC"].int_value();
+
+		int major = 0;
+		int minor = 0;
+
+		sscanf(version.c_str(), "%d.%d", &major, &minor);
+#if OBS_RELEASE_CANDIDATE > 0
+		if (major == OBS_RELEASE_CANDIDATE_MAJOR &&
+		    minor == OBS_RELEASE_CANDIDATE_MINOR &&
+		    rc == OBS_RELEASE_CANDIDATE) {
+#else
+		if (major == LIBOBS_API_MAJOR_VER &&
+		    minor == LIBOBS_API_MINOR_VER &&
+		    rc == 0) {
+#endif
+			info_url = url;
+			info_increment = increment;
+		}
+	}
+
+	/* this version was not found, or no info for this version */
+	if (info_increment == -1) {
+		return;
+	}
+
+#if OBS_RELEASE_CANDIDATE > 0
+	uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
+			"LastRCVersion");
+#else
+	uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
+			"LastVersion");
+#endif
+
+	int current_version_increment = -1;
+
+#if OBS_RELEASE_CANDIDATE > 0
+	if (lastVersion < OBS_RELEASE_CANDIDATE_VER) {
+#else
+	if (lastVersion < LIBOBS_API_VER) {
+#endif
+		config_set_int(App()->GlobalConfig(), "General",
+				"InfoIncrement", -1);
+	} else {
+		current_version_increment = config_get_int(
+				App()->GlobalConfig(), "General",
+				"InfoIncrement");
+	}
+
+	if (info_increment <= current_version_increment) {
+		return;
+	}
+
+	config_set_int(App()->GlobalConfig(), "General",
+			"InfoIncrement", info_increment);
+
+	QDialog dlg(this);
+	dlg.setWindowTitle("What's New");
+	dlg.resize(700, 600);
+
+	QCefWidget *cefWidget = create_browser_widget(nullptr, info_url);
+	if (!cefWidget) {
+		return;
+	}
+
+	connect(cefWidget, SIGNAL(titleChanged(const QString &)),
+			&dlg, SLOT(setWindowTitle(const QString &)));
+
+	QPushButton *close = new QPushButton(QTStr("Close"));
+	connect(close, &QAbstractButton::clicked,
+			&dlg, &QDialog::accept);
+
+	QHBoxLayout *bottomLayout = new QHBoxLayout();
+	bottomLayout->addStretch();
+	bottomLayout->addWidget(close);
+	bottomLayout->addStretch();
+
+	QVBoxLayout *topLayout = new QVBoxLayout(&dlg);
+	topLayout->addWidget(cefWidget);
+	topLayout->addLayout(bottomLayout);
+
+	dlg.exec();
+#else
+	UNUSED_PARAMETER(text);
+#endif
 }
 
 void OBSBasic::UpdateMultiviewProjectorMenu()
@@ -1786,7 +1951,7 @@
 	[](void *data, obs_hotkey_pair_id, obs_hotkey_t*, bool pressed) \
 	{ \
 		OBSBasic &basic = *static_cast<OBSBasic*>(data); \
-		if (pred && pressed) { \
+		if ((pred) && pressed) { \
 			blog(LOG_INFO, log_action " due to hotkey"); \
 			method(); \
 			return true; \
@@ -1799,9 +1964,11 @@
 			Str("Basic.Main.StartStreaming"),
 			"OBSBasic.StopStreaming",
 			Str("Basic.Main.StopStreaming"),
-			MAKE_CALLBACK(!basic.outputHandler->StreamingActive(),
+			MAKE_CALLBACK(!basic.outputHandler->StreamingActive() &&
+				basic.ui->streamButton->isEnabled(),
 				basic.StartStreaming, "Starting stream"),
-			MAKE_CALLBACK(basic.outputHandler->StreamingActive(),
+			MAKE_CALLBACK(basic.outputHandler->StreamingActive() &&
+				basic.ui->streamButton->isEnabled(),
 				basic.StopStreaming, "Stopping stream"),
 			this, this);
 	LoadHotkeyPair(streamingHotkeys,
@@ -1827,9 +1994,11 @@
 			Str("Basic.Main.StartRecording"),
 			"OBSBasic.StopRecording",
 			Str("Basic.Main.StopRecording"),
-			MAKE_CALLBACK(!basic.outputHandler->RecordingActive(),
+			MAKE_CALLBACK(!basic.outputHandler->RecordingActive() &&
+				!basic.ui->recordButton->isChecked(),
 				basic.StartRecording, "Starting recording"),
-			MAKE_CALLBACK(basic.outputHandler->RecordingActive(),
+			MAKE_CALLBACK(basic.outputHandler->RecordingActive() &&
+				basic.ui->recordButton->isChecked(),
 				basic.StopRecording, "Stopping recording"),
 			this, this);
 	LoadHotkeyPair(recordingHotkeys,
@@ -1894,6 +2063,8 @@
 	if (updateCheckThread && updateCheckThread->isRunning())
 		updateCheckThread->wait();
 
+	delete multiviewProjectorMenu;
+	delete trayMenu;
 	delete programOptions;
 	delete program;
 
@@ -1950,6 +2121,10 @@
 
 	config_set_int(App()->GlobalConfig(), "General", "LastVersion",
 			LIBOBS_API_VER);
+#if OBS_RELEASE_CANDIDATE > 0
+	config_set_int(App()->GlobalConfig(), "General", "LastRCVersion",
+			OBS_RELEASE_CANDIDATE_VER);
+#endif
 
 	bool alwaysOnTop = IsAlwaysOnTop(this);
 
@@ -2049,7 +2224,7 @@
 
 OBSSceneItem OBSBasic::GetCurrentSceneItem()
 {
-	return GetSceneItem(GetTopSelectedSourceItem());
+	return ui->sources->Get(GetTopSelectedSourceItem());
 }
 
 void OBSBasic::UpdatePreviewScalingMenu()
@@ -2072,32 +2247,6 @@
 			scalingAmount == float(ovi.output_width) / float(ovi.base_width));
 }
 
-void OBSBasic::UpdateSources(OBSScene scene)
-{
-	ClearListItems(ui->sources);
-
-	obs_scene_enum_items(scene,
-			[] (obs_scene_t *scene, obs_sceneitem_t *item, void *p)
-			{
-				OBSBasic *window = static_cast<OBSBasic*>(p);
-				window->InsertSceneItem(item);
-
-				UNUSED_PARAMETER(scene);
-				return true;
-			}, this);
-}
-
-void OBSBasic::InsertSceneItem(obs_sceneitem_t *item)
-{
-	QListWidgetItem *listItem = new QListWidgetItem();
-	SetOBSRef(listItem, OBSSceneItem(item));
-
-	ui->sources->insertItem(0, listItem);
-	ui->sources->setCurrentRow(0, QItemSelectionModel::ClearAndSelect);
-
-	SetupVisibilityItem(ui->sources, listItem, item);
-}
-
 void OBSBasic::CreateInteractionWindow(obs_source_t *source)
 {
 	if (interaction)
@@ -2161,8 +2310,6 @@
 	container.handlers.assign({
 		std::make_shared<OBSSignal>(handler, "item_add",
 					OBSBasic::SceneItemAdded, this),
-		std::make_shared<OBSSignal>(handler, "item_remove",
-					OBSBasic::SceneItemRemoved, this),
 		std::make_shared<OBSSignal>(handler, "item_select",
 					OBSBasic::SceneItemSelected, this),
 		std::make_shared<OBSSignal>(handler, "item_deselect",
@@ -2224,7 +2371,7 @@
 
 	if (sel != nullptr) {
 		if (sel == ui->scenes->currentItem())
-			ClearListItems(ui->sources);
+			ui->sources->Clear();
 		delete sel;
 	}
 
@@ -2246,7 +2393,7 @@
 	obs_scene_t  *scene  = obs_sceneitem_get_scene(item);
 
 	if (GetCurrentScene() == scene)
-		InsertSceneItem(item);
+		ui->sources->Add(item);
 
 	SaveProject();
 
@@ -2260,30 +2407,6 @@
 	}
 }
 
-void OBSBasic::RemoveSceneItem(OBSSceneItem item)
-{
-	for (int i = 0; i < ui->sources->count(); i++) {
-		QListWidgetItem *listItem = ui->sources->item(i);
-
-		if (GetOBSRef<OBSSceneItem>(listItem) == item) {
-			DeleteListItem(ui->sources, listItem);
-			break;
-		}
-	}
-
-	SaveProject();
-
-	if (!disableSaving) {
-		obs_scene_t *scene = obs_sceneitem_get_scene(item);
-		obs_source_t *sceneSource = obs_scene_get_source(scene);
-		obs_source_t *itemSource = obs_sceneitem_get_source(item);
-		blog(LOG_INFO, "User Removed source '%s' (%s) from scene '%s'",
-				obs_source_get_name(itemSource),
-				obs_source_get_id(itemSource),
-				obs_source_get_name(sceneSource));
-	}
-}
-
 void OBSBasic::UpdateSceneSelection(OBSSource source)
 {
 	if (source) {
@@ -2301,7 +2424,10 @@
 			ui->scenes->setCurrentItem(items.first());
 			sceneChanging = false;
 
-			UpdateSources(scene);
+			OBSScene curScene =
+				GetOBSRef<OBSScene>(ui->scenes->currentItem());
+			if (api && scene != curScene)
+				api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
 		}
 	}
 }
@@ -2326,13 +2452,7 @@
 			volumes[i]->SetName(newName);
 	}
 
-	std::string newText = newName.toUtf8().constData();
-	std::string prevText = prevName.toUtf8().constData();
-
-	for (size_t j = 0; j < projectorArray.size(); j++) {
-		if (projectorArray.at(j) == prevText)
-			projectorArray.at(j) = newText;
-	}
+	OBSProjector::RenameProjector(prevName, newName);
 
 	SaveProject();
 
@@ -2348,19 +2468,7 @@
 	if (scene != GetCurrentScene() || ignoreSelectionUpdate)
 		return;
 
-	for (int i = 0; i < ui->sources->count(); i++) {
-		QListWidgetItem *witem = ui->sources->item(i);
-		QVariant data =
-			witem->data(static_cast<int>(QtDataRole::OBSRef));
-		if (!data.canConvert<OBSSceneItem>())
-			continue;
-
-		if (item != data.value<OBSSceneItem>())
-			continue;
-
-		witem->setSelected(select);
-		break;
-	}
+	ui->sources->SelectItem(item, select);
 }
 
 static inline bool SourceMixerHidden(obs_source_t *source)
@@ -2501,6 +2609,11 @@
 	QAction propertiesAction(QTStr("Properties"), this);
 	QAction advPropAction(QTStr("Basic.MainMenu.Edit.AdvAudio"), this);
 
+	QAction toggleControlLayoutAction(QTStr("VerticalLayout"), this);
+	toggleControlLayoutAction.setCheckable(true);
+	toggleControlLayoutAction.setChecked(config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "VerticalVolControl"));
+
 	/* ------------------- */
 
 	connect(&hideAction, &QAction::triggered,
@@ -2525,6 +2638,12 @@
 
 	/* ------------------- */
 
+	connect(&toggleControlLayoutAction, &QAction::changed, this,
+			&OBSBasic::ToggleVolControlLayout,
+			Qt::DirectConnection);
+
+	/* ------------------- */
+
 	hideAction.setProperty("volControl",
 			QVariant::fromValue<VolControl*>(vol));
 	mixerRenameAction.setProperty("volControl",
@@ -2537,23 +2656,40 @@
 
 	/* ------------------- */
 
-	QMenu popup(this);
+	QMenu popup;
 	popup.addAction(&unhideAllAction);
 	popup.addAction(&hideAction);
 	popup.addAction(&mixerRenameAction);
 	popup.addSeparator();
+	popup.addAction(&toggleControlLayoutAction);
+	popup.addSeparator();
 	popup.addAction(&filtersAction);
 	popup.addAction(&propertiesAction);
 	popup.addAction(&advPropAction);
 	popup.exec(QCursor::pos());
 }
 
-void OBSBasic::on_mixerScrollArea_customContextMenuRequested()
+void OBSBasic::on_hMixerScrollArea_customContextMenuRequested()
+{
+	StackedMixerAreaContextMenuRequested();
+}
+
+void OBSBasic::on_vMixerScrollArea_customContextMenuRequested()
+{
+	StackedMixerAreaContextMenuRequested();
+}
+
+void OBSBasic::StackedMixerAreaContextMenuRequested()
 {
 	QAction unhideAllAction(QTStr("UnhideAll"), this);
 
 	QAction advPropAction(QTStr("Basic.MainMenu.Edit.AdvAudio"), this);
 
+	QAction toggleControlLayoutAction(QTStr("VerticalLayout"), this);
+	toggleControlLayoutAction.setCheckable(true);
+	toggleControlLayoutAction.setChecked(config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "VerticalVolControl"));
+
 	/* ------------------- */
 
 	connect(&unhideAllAction, &QAction::triggered,
@@ -2566,23 +2702,83 @@
 
 	/* ------------------- */
 
-	QMenu popup(this);
+	connect(&toggleControlLayoutAction, &QAction::changed, this,
+			&OBSBasic::ToggleVolControlLayout,
+			Qt::DirectConnection);
+
+	/* ------------------- */
+
+	QMenu popup;
 	popup.addAction(&unhideAllAction);
 	popup.addSeparator();
+	popup.addAction(&toggleControlLayoutAction);
+	popup.addSeparator();
 	popup.addAction(&advPropAction);
 	popup.exec(QCursor::pos());
 }
 
+void OBSBasic::ToggleMixerLayout(bool vertical)
+{
+	if (vertical) {
+		ui->stackedMixerArea->setMinimumSize(180, 220);
+		ui->stackedMixerArea->setCurrentIndex(1);
+	} else {
+		ui->stackedMixerArea->setMinimumSize(220, 0);
+		ui->stackedMixerArea->setCurrentIndex(0);
+	}
+}
+
+void OBSBasic::ToggleVolControlLayout()
+{
+	bool vertical = !config_get_bool(GetGlobalConfig(), "BasicWindow",
+			"VerticalVolControl");
+	config_set_bool(GetGlobalConfig(), "BasicWindow", "VerticalVolControl",
+			vertical);
+	ToggleMixerLayout(vertical);
+
+	// We need to store it so we can delete current and then add
+	// at the right order
+	vector<OBSSource> sources;
+	for (size_t i = 0; i != volumes.size(); i++)
+		sources.emplace_back(volumes[i]->GetSource());
+
+	ClearVolumeControls();
+
+	for (const auto &source : sources)
+		ActivateAudioSource(source);
+}
+
 void OBSBasic::ActivateAudioSource(OBSSource source)
 {
 	if (SourceMixerHidden(source))
 		return;
 
-	VolControl *vol = new VolControl(source, true);
+	bool vertical = config_get_bool(GetGlobalConfig(), "BasicWindow",
+			"VerticalVolControl");
+	VolControl *vol = new VolControl(source, true, vertical);
 
 	double meterDecayRate = config_get_double(basicConfig, "Audio",
 			"MeterDecayRate");
 	vol->SetMeterDecayRate(meterDecayRate);
+
+	uint32_t peakMeterTypeIdx = config_get_uint(basicConfig, "Audio",
+			"PeakMeterType");
+
+	enum obs_peak_meter_type peakMeterType;
+	switch (peakMeterTypeIdx) {
+	case 0:
+		peakMeterType = SAMPLE_PEAK_METER;
+		break;
+	case 1:
+		peakMeterType = TRUE_PEAK_METER;
+		break;
+	default:
+		peakMeterType = SAMPLE_PEAK_METER;
+		break;
+	}
+
+	vol->setPeakMeterType(peakMeterType);
+
 	vol->setContextMenuPolicy(Qt::CustomContextMenu);
 
 	connect(vol, &QWidget::customContextMenuRequested,
@@ -2590,8 +2786,14 @@
 	connect(vol, &VolControl::ConfigClicked,
 			this, &OBSBasic::VolControlContextMenu);
 
-	volumes.push_back(vol);
-	ui->volumeWidgets->layout()->addWidget(vol);
+	InsertQObjectByName(volumes, vol);
+
+	for (auto volume : volumes) {
+		if (vertical)
+			ui->vVolControlLayout->addWidget(volume);
+		else
+			ui->hVolControlLayout->addWidget(volume);
+	}
 }
 
 void OBSBasic::DeactivateAudioSource(OBSSource source)
@@ -2607,7 +2809,8 @@
 
 bool OBSBasic::QueryRemoveSource(obs_source_t *source)
 {
-	if (obs_source_get_type(source) == OBS_SOURCE_TYPE_SCENE) {
+	if (obs_source_get_type(source) == OBS_SOURCE_TYPE_SCENE &&
+	    !obs_source_is_group(source)) {
 		int count = ui->scenes->count();
 
 		if (count == 1) {
@@ -2651,7 +2854,7 @@
 #ifdef UPDATE_SPARKLE
 	init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General",
 				"UpdateToUndeployed"));
-#elif ENABLE_WIN_UPDATER
+#elif _WIN32
 	long long lastUpdate = config_get_int(App()->GlobalConfig(), "General",
 			"LastUpdateCheck");
 	uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
@@ -2675,13 +2878,13 @@
 {
 #ifdef UPDATE_SPARKLE
 	trigger_sparkle_update();
-#elif ENABLE_WIN_UPDATER
+#elif _WIN32
 	ui->actionCheckForUpdates->setEnabled(false);
 
 	if (updateCheckThread && updateCheckThread->isRunning())
 		return;
 
-	updateCheckThread = new AutoUpdateThread(manualUpdate);
+	updateCheckThread.reset(new AutoUpdateThread(manualUpdate));
 	updateCheckThread->start();
 #endif
 
@@ -2742,7 +2945,6 @@
 		obs_scene_t *scene = obs_scene_duplicate(curScene,
 				name.c_str(), OBS_SCENE_DUP_REFS);
 		source = obs_scene_get_source(scene);
-		AddScene(source);
 		SetCurrentScene(source, true);
 		obs_scene_release(scene);
 
@@ -2774,62 +2976,12 @@
 	}
 }
 
-struct ReorderInfo {
-	int idx = 0;
-	OBSBasic *window;
-
-	inline ReorderInfo(OBSBasic *window_) : window(window_) {}
-};
-
-void OBSBasic::ReorderSceneItem(obs_sceneitem_t *item, size_t idx)
-{
-	int count = ui->sources->count();
-	int idx_inv = count - (int)idx - 1;
-
-	for (int i = 0; i < count; i++) {
-		QListWidgetItem *listItem = ui->sources->item(i);
-		OBSSceneItem sceneItem = GetOBSRef<OBSSceneItem>(listItem);
-
-		if (sceneItem == item) {
-			if ((int)idx_inv != i) {
-				bool sel = (ui->sources->currentRow() == i);
-
-				listItem = TakeListItem(ui->sources, i);
-				if (listItem)  {
-					ui->sources->insertItem(idx_inv,
-							listItem);
-					SetupVisibilityItem(ui->sources,
-							listItem, item);
-
-					if (sel)
-						ui->sources->setCurrentRow(
-								idx_inv);
-				}
-			}
-
-			break;
-		}
-	}
-}
-
 void OBSBasic::ReorderSources(OBSScene scene)
 {
-	ReorderInfo info(this);
-
 	if (scene != GetCurrentScene() || ui->sources->IgnoreReorder())
 		return;
 
-	obs_scene_enum_items(scene,
-			[] (obs_scene_t*, obs_sceneitem_t *item, void *p)
-			{
-				ReorderInfo *info =
-					reinterpret_cast<ReorderInfo*>(p);
-
-				info->window->ReorderSceneItem(item,
-					info->idx++);
-				return true;
-			}, &info);
-
+	ui->sources->ReorderItems();
 	SaveProject();
 }
 
@@ -2855,16 +3007,6 @@
 			Q_ARG(OBSSceneItem, OBSSceneItem(item)));
 }
 
-void OBSBasic::SceneItemRemoved(void *data, calldata_t *params)
-{
-	OBSBasic *window = static_cast<OBSBasic*>(data);
-
-	obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
-
-	QMetaObject::invokeMethod(window, "RemoveSceneItem",
-			Q_ARG(OBSSceneItem, OBSSceneItem(item)));
-}
-
 void OBSBasic::SceneItemSelected(void *data, calldata_t *params)
 {
 	OBSBasic *window = static_cast<OBSBasic*>(data);
@@ -2890,13 +3032,13 @@
 
 }
 
-void OBSBasic::SourceLoaded(void *data, obs_source_t *source)
+void OBSBasic::SourceCreated(void *data, calldata_t *params)
 {
-	OBSBasic *window = static_cast<OBSBasic*>(data);
+	obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
 
 	if (obs_scene_from_source(source) != NULL)
-		QMetaObject::invokeMethod(window,
-				"AddScene",
+		QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
+				"AddScene", WaitConnection(),
 				Q_ARG(OBSSource, OBSSource(source)));
 }
 
@@ -3195,8 +3337,10 @@
 			ResizeProgram(ovi.base_width, ovi.base_height);
 	}
 
-	if (ret == OBS_VIDEO_SUCCESS)
+	if (ret == OBS_VIDEO_SUCCESS) {
 		OBSBasicStats::InitializeValues();
+		OBSProjector::UpdateMultiviewProjectors();
+	}
 
 	return ret;
 }
@@ -3318,6 +3462,7 @@
 	}
 
 	if (!stats.isNull()) stats->close(); //call close to save Stats geometry
+	if (!remux.isNull()) remux->close();
 }
 
 void OBSBasic::EnumDialogs()
@@ -3351,7 +3496,7 @@
 
 	ClearVolumeControls();
 	ClearListItems(ui->scenes);
-	ClearListItems(ui->sources);
+	ui->sources->Clear();
 	ClearQuickTransitions();
 	ui->transitions->clear();
 
@@ -3413,6 +3558,8 @@
 
 	blog(LOG_INFO, SHUTDOWN_SEPARATOR);
 
+	if (introCheckThread)
+		introCheckThread->wait();
 	if (updateCheckThread)
 		updateCheckThread->wait();
 	if (logUploadThread)
@@ -3449,20 +3596,33 @@
 void OBSBasic::on_actionShow_Recordings_triggered()
 {
 	const char *mode = config_get_string(basicConfig, "Output", "Mode");
+	const char *type = config_get_string(basicConfig, "AdvOut", "RecType");
+	const char *adv_path = strcmp(type, "Standard") ?
+			config_get_string(basicConfig, "AdvOut", "FFFilePath") :
+			config_get_string(basicConfig, "AdvOut", "RecFilePath");
 	const char *path = strcmp(mode, "Advanced") ?
-		config_get_string(basicConfig, "SimpleOutput", "FilePath") :
-		config_get_string(basicConfig, "AdvOut", "RecFilePath");
+			config_get_string(basicConfig, "SimpleOutput", "FilePath") :
+			adv_path;
 	QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 }
 
 void OBSBasic::on_actionRemux_triggered()
 {
+	if (!remux.isNull()) {
+		remux->show();
+		remux->raise();
+		return;
+	}
+
 	const char *mode = config_get_string(basicConfig, "Output", "Mode");
 	const char *path = strcmp(mode, "Advanced") ?
 		config_get_string(basicConfig, "SimpleOutput", "FilePath") :
 		config_get_string(basicConfig, "AdvOut", "RecFilePath");
-	OBSRemux remux(path, this);
-	remux.exec();
+
+	OBSRemux *remuxDlg;
+	remuxDlg = new OBSRemux(path, this);
+	remuxDlg->show();
+	remux = remuxDlg;
 }
 
 void OBSBasic::on_action_Settings_triggered()
@@ -3514,6 +3674,9 @@
 
 	SetCurrentScene(source);
 
+	if (api)
+		api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
+
 	UNUSED_PARAMETER(prev);
 }
 
@@ -3564,8 +3727,7 @@
 		popup.addAction(QTStr("Rename"),
 				this, SLOT(EditSceneName()));
 		popup.addAction(QTStr("Remove"),
-				this, SLOT(RemoveSelectedScene()),
-				DeleteKeys.front());
+				this, SLOT(RemoveSelectedScene()));
 		popup.addSeparator();
 
 		order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"),
@@ -3616,7 +3778,7 @@
 		multiviewAction->setCheckable(true);
 		multiviewAction->setChecked(show);
 
-		auto showInMultiview = [this] (OBSData data)
+		auto showInMultiview = [] (OBSData data)
 		{
 			bool show = obs_data_get_bool(data,
 					"show_in_multiview");
@@ -3673,7 +3835,6 @@
 
 		obs_scene_t *scene = obs_scene_create(name.c_str());
 		source = obs_scene_get_source(scene);
-		AddScene(source);
 		SetCurrentScene(source);
 		obs_scene_release(scene);
 	}
@@ -3706,6 +3867,8 @@
 	item->setSelected(true);
 
 	sceneChanging = false;
+
+	OBSProjector::UpdateMultiviewProjectors();
 }
 
 void OBSBasic::on_actionSceneUp_triggered()
@@ -3729,44 +3892,10 @@
 			ui->scenes->count() - 1);
 }
 
-void OBSBasic::on_sources_itemSelectionChanged()
-{
-	SignalBlocker sourcesSignalBlocker(ui->sources);
-
-	auto updateItemSelection = [&]()
-	{
-		ignoreSelectionUpdate = true;
-		for (int i = 0; i < ui->sources->count(); i++)
-		{
-			QListWidgetItem *wItem = ui->sources->item(i);
-			OBSSceneItem item = GetOBSRef<OBSSceneItem>(wItem);
-
-			obs_sceneitem_select(item, wItem->isSelected());
-		}
-		ignoreSelectionUpdate = false;
-	};
-	using updateItemSelection_t = decltype(updateItemSelection);
-
-	obs_scene_atomic_update(GetCurrentScene(),
-			[](void *data, obs_scene_t *)
-	{
-		(*static_cast<updateItemSelection_t*>(data))();
-	}, static_cast<void*>(&updateItemSelection));
-}
-
 void OBSBasic::EditSceneItemName()
 {
-	QListWidgetItem *item = GetTopSelectedSourceItem();
-	Qt::ItemFlags flags   = item->flags();
-	OBSSceneItem sceneItem= GetOBSRef<OBSSceneItem>(item);
-	obs_source_t *source  = obs_sceneitem_get_source(sceneItem);
-	const char *name      = obs_source_get_name(source);
-
-	item->setText(QT_UTF8(name));
-	item->setFlags(flags | Qt::ItemIsEditable);
-	ui->sources->removeItemWidget(item);
-	ui->sources->editItem(item);
-	item->setFlags(flags);
+	int idx = GetTopSelectedSourceItem();
+	ui->sources->Edit(idx);
 }
 
 void OBSBasic::SetDeinterlacingMode()
@@ -3866,7 +3995,64 @@
 	return menu;
 }
 
-void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
+QMenu *OBSBasic::AddBackgroundColorMenu(obs_sceneitem_t *item)
+{
+	QMenu *menu = new QMenu(QTStr("ChangeBG"));
+	QAction *action;
+
+	menu->setStyleSheet(QString(
+		"*[bgColor=\"1\"]{background-color:rgba(255,68,68,33%);}" \
+		"*[bgColor=\"2\"]{background-color:rgba(255,255,68,33%);}" \
+		"*[bgColor=\"3\"]{background-color:rgba(68,255,68,33%);}" \
+		"*[bgColor=\"4\"]{background-color:rgba(68,255,255,33%);}" \
+		"*[bgColor=\"5\"]{background-color:rgba(68,68,255,33%);}" \
+		"*[bgColor=\"6\"]{background-color:rgba(255,68,255,33%);}" \
+		"*[bgColor=\"7\"]{background-color:rgba(68,68,68,33%);}" \
+		"*[bgColor=\"8\"]{background-color:rgba(255,255,255,33%);}"));
+
+	obs_data_t *privData = obs_sceneitem_get_private_settings(item);
+	obs_data_release(privData);
+
+	obs_data_set_default_int(privData, "color-preset", 0);
+	int preset = obs_data_get_int(privData, "color-preset");
+
+	action = menu->addAction(QTStr("Clear"), this,
+		+ SLOT(ColorChange()));
+	action->setCheckable(true);
+	action->setProperty("bgColor", 0);
+	action->setChecked(preset == 0);
+
+	action = menu->addAction(QTStr("CustomColor"), this,
+		+ SLOT(ColorChange()));
+	action->setCheckable(true);
+	action->setProperty("bgColor", 1);
+	action->setChecked(preset == 1);
+
+	menu->addSeparator();
+
+	QWidgetAction *widgetAction = new QWidgetAction(menu);
+	ColorSelect *select = new ColorSelect(menu);
+	widgetAction->setDefaultWidget(select);
+
+	for (int i = 1; i < 9; i++) {
+		stringstream button;
+		button << "preset" << i;
+		QPushButton *colorButton = select->findChild<QPushButton *>(
+				button.str().c_str());
+		if (preset == i + 1)
+			colorButton->setStyleSheet("border: 2px solid black");
+
+		colorButton->setProperty("bgColor", i);
+		select->connect(colorButton, SIGNAL(released()), this,
+				SLOT(ColorChange()));
+	}
+
+	menu->addAction(widgetAction);
+
+	return menu;
+}
+
+void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
 {
 	QMenu popup(this);
 	QPointer<QMenu> previewProjector;
@@ -3907,6 +4093,17 @@
 	ui->actionCopyFilters->setEnabled(false);
 	ui->actionCopySource->setEnabled(false);
 
+	if (ui->sources->MultipleBaseSelected()) {
+		popup.addSeparator();
+		popup.addAction(QTStr("Basic.Main.GroupItems"),
+				ui->sources, SLOT(GroupSelectedItems()));
+
+	} else if (ui->sources->GroupsSelected()) {
+		popup.addSeparator();
+		popup.addAction(QTStr("Basic.Main.Ungroup"),
+				ui->sources, SLOT(UngroupSelectedGroups()));
+	}
+
 	popup.addSeparator();
 	popup.addAction(ui->actionCopySource);
 	popup.addAction(ui->actionPasteRef);
@@ -3918,11 +4115,11 @@
 	popup.addAction(ui->actionPasteFilters);
 	popup.addSeparator();
 
-	if (item) {
+	if (idx != -1) {
 		if (addSourceMenu)
 			popup.addSeparator();
 
-		OBSSceneItem sceneItem = GetSceneItem(item);
+		OBSSceneItem sceneItem = ui->sources->Get(idx);
 		obs_source_t *source = obs_sceneitem_get_source(sceneItem);
 		uint32_t flags = obs_source_get_output_flags(source);
 		bool isAsyncVideo = (flags & OBS_SOURCE_ASYNC_VIDEO) ==
@@ -3931,11 +4128,11 @@
 			OBS_SOURCE_AUDIO;
 		QAction *action;
 
+		popup.addMenu(AddBackgroundColorMenu(sceneItem));
 		popup.addAction(QTStr("Rename"), this,
 				SLOT(EditSceneItemName()));
 		popup.addAction(QTStr("Remove"), this,
-				SLOT(on_actionRemoveSource_triggered()),
-				DeleteKeys.front());
+				SLOT(on_actionRemoveSource_triggered()));
 		popup.addSeparator();
 		popup.addMenu(ui->orderMenu);
 		popup.addMenu(ui->transformMenu);
@@ -3985,6 +4182,8 @@
 
 		ui->actionCopyFilters->setEnabled(true);
 		ui->actionCopySource->setEnabled(true);
+	} else {
+		ui->actionPasteFilters->setEnabled(false);
 	}
 
 	popup.exec(QCursor::pos());
@@ -3992,20 +4191,10 @@
 
 void OBSBasic::on_sources_customContextMenuRequested(const QPoint &pos)
 {
-	if (ui->scenes->count())
-		CreateSourcePopupMenu(ui->sources->itemAt(pos), false);
-}
-
-void OBSBasic::on_sources_itemDoubleClicked(QListWidgetItem *witem)
-{
-	if (!witem)
-		return;
-
-	OBSSceneItem item = GetSceneItem(witem);
-	OBSSource source = obs_sceneitem_get_source(item);
-
-	if (source)
-		CreatePropertiesWindow(source);
+	if (ui->scenes->count()) {
+		QModelIndex idx = ui->sources->indexAt(pos);
+		CreateSourcePopupMenu(idx.row(), false);
+	}
 }
 
 void OBSBasic::on_scenes_itemDoubleClicked(QListWidgetItem *witem)
@@ -4031,7 +4220,7 @@
 	if (id && *id) {
 		OBSBasicSourceSelect sourceSelect(this, id);
 		sourceSelect.exec();
-		if (sourceSelect.newSource)
+		if (sourceSelect.newSource && strcmp(id, "group") != 0)
 			CreatePropertiesWindow(sourceSelect.newSource);
 	}
 }
@@ -4089,6 +4278,13 @@
 
 	addSource(popup, "scene", Str("Basic.Scene"));
 
+	popup->addSeparator();
+	QAction *addGroup = new QAction(QTStr("Group"), this);
+	addGroup->setData(QT_UTF8("group"));
+	connect(addGroup, SIGNAL(triggered(bool)),
+			this, SLOT(AddSourceFromAction()));
+	popup->addAction(addGroup);
+
 	if (!foundDeprecated) {
 		delete deprecated;
 		deprecated = nullptr;
@@ -4099,6 +4295,7 @@
 		popup = nullptr;
 
 	} else if (foundDeprecated) {
+		popup->addSeparator();
 		popup->addMenu(deprecated);
 	}
 
@@ -4124,7 +4321,7 @@
 		return;
 	}
 
-	QPointer<QMenu> popup = CreateAddSourcePopupMenu();
+	QScopedPointer<QMenu> popup(CreateAddSourcePopupMenu());
 	if (popup)
 		popup->exec(pos);
 }
@@ -4134,20 +4331,24 @@
 	AddSourcePopupMenu(QCursor::pos());
 }
 
+static bool remove_items(obs_scene_t *, obs_sceneitem_t *item, void *param)
+{
+	vector<OBSSceneItem> &items =
+		*reinterpret_cast<vector<OBSSceneItem>*>(param);
+
+	if (obs_sceneitem_selected(item)) {
+		items.emplace_back(item);
+	} else if (obs_sceneitem_is_group(item)) {
+		obs_sceneitem_group_enum_items(item, remove_items, &items);
+	}
+	return true;
+};
+
 void OBSBasic::on_actionRemoveSource_triggered()
 {
 	vector<OBSSceneItem> items;
 
-	auto func = [] (obs_scene_t *, obs_sceneitem_t *item, void *param)
-	{
-		vector<OBSSceneItem> &items =
-			*reinterpret_cast<vector<OBSSceneItem>*>(param);
-		if (obs_sceneitem_selected(item))
-			items.emplace_back(item);
-		return true;
-	};
-
-	obs_scene_enum_items(GetCurrentScene(), func, &items);
+	obs_scene_enum_items(GetCurrentScene(), remove_items, &items);
 
 	if (!items.size())
 		return;
@@ -4274,14 +4475,13 @@
 
 	if (logUploadThread) {
 		logUploadThread->wait();
-		delete logUploadThread;
 	}
 
 	RemoteTextThread *thread = new RemoteTextThread(
-			"https://hastebin.com/documents",
+			"https://obsproject.com/logs/upload",
 			"text/plain", ss.str().c_str());
 
-	logUploadThread = thread;
+	logUploadThread.reset(thread);
 	connect(thread, &RemoteTextThread::Result,
 			this, &OBSBasic::logUploadFinished);
 	logUploadThread->start();
@@ -4355,8 +4555,7 @@
 	}
 
 	obs_data_t *returnData = obs_data_create_from_json(QT_TO_UTF8(text));
-	string resURL = "https://hastebin.com/";
-	resURL += obs_data_get_string(returnData, "key");
+	string resURL = obs_data_get_string(returnData, "url");
 	QString logURL = resURL.c_str();
 	obs_data_release(returnData);
 
@@ -4413,26 +4612,6 @@
 	UNUSED_PARAMETER(endHint);
 }
 
-void OBSBasic::SceneItemNameEdited(QWidget *editor,
-		QAbstractItemDelegate::EndEditHint endHint)
-{
-	OBSSceneItem item  = GetCurrentSceneItem();
-	QLineEdit    *edit = qobject_cast<QLineEdit*>(editor);
-	string       text  = QT_TO_UTF8(edit->text().trimmed());
-
-	if (!item)
-		return;
-
-	obs_source_t *source = obs_sceneitem_get_source(item);
-	RenameListItem(this, ui->sources, source, text);
-
-	QListWidgetItem *listItem = ui->sources->currentItem();
-	listItem->setText(QString());
-	SetupVisibilityItem(ui->sources, listItem, item);
-
-	UNUSED_PARAMETER(endHint);
-}
-
 void OBSBasic::OpenFilters()
 {
 	OBSSceneItem item = GetCurrentSceneItem();
@@ -4770,7 +4949,9 @@
 		api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTING);
 
 	SaveProject();
-	outputHandler->StartRecording();
+
+	if (!outputHandler->StartRecording())
+		ui->recordButton->setChecked(false);
 }
 
 void OBSBasic::RecordStopping()
@@ -4870,6 +5051,11 @@
 	if (disableOutputsRef)
 		return;
 
+	if (!NoSourcesConfirmation()) {
+		replayBufferButton->setChecked(false);
+		return;
+	}
+
 	obs_output_t *output = outputHandler->replayBuffer;
 	obs_data_t *hotkeys = obs_hotkeys_save_output(output);
 	obs_data_array_t *bindings = obs_data_get_array(hotkeys,
@@ -4889,7 +5075,8 @@
 		api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING);
 
 	SaveProject();
-	outputHandler->StartReplayBuffer();
+	if (!outputHandler->StartReplayBuffer())
+		replayBufferButton->setChecked(false);
 }
 
 void OBSBasic::ReplayBufferStopping()
@@ -4999,6 +5186,28 @@
 	OnDeactivate();
 }
 
+bool OBSBasic::NoSourcesConfirmation()
+{
+	if (CountVideoSources() == 0 && isVisible()) {
+		QString msg;
+		msg = QTStr("NoSources.Text");
+		msg += "\n\n";
+		msg += QTStr("NoSources.Text.AddSource");
+
+		QMessageBox messageBox(QMessageBox::Question,
+				QTStr("NoSources.title"),
+				msg,
+				QMessageBox::Yes | QMessageBox::No,
+				this);
+		messageBox.setDefaultButton(QMessageBox::No);
+
+		if (QMessageBox::No == messageBox.exec())
+			return false;
+	}
+
+	return true;
+}
+
 void OBSBasic::on_streamButton_clicked()
 {
 	if (outputHandler->StreamingActive()) {
@@ -5011,12 +5220,19 @@
 						QTStr("ConfirmStop.Title"),
 						QTStr("ConfirmStop.Text"));
 
-			if (button == QMessageBox::No)
+			if (button == QMessageBox::No) {
+				ui->streamButton->setChecked(true);
 				return;
+			}
 		}
 
 		StopStreaming();
 	} else {
+		if (!NoSourcesConfirmation()) {
+			ui->streamButton->setChecked(false);
+			return;
+		}
+
 		bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
 				"WarnBeforeStartingStream");
 
@@ -5026,8 +5242,10 @@
 						QTStr("ConfirmStart.Title"),
 						QTStr("ConfirmStart.Text"));
 
-			if (button == QMessageBox::No)
+			if (button == QMessageBox::No) {
+				ui->streamButton->setChecked(false);
 				return;
+			}
 		}
 
 		StartStreaming();
@@ -5036,10 +5254,16 @@
 
 void OBSBasic::on_recordButton_clicked()
 {
-	if (outputHandler->RecordingActive())
+	if (outputHandler->RecordingActive()) {
 		StopRecording();
-	else
+	} else {
+		if (!NoSourcesConfirmation()) {
+			ui->recordButton->setChecked(false);
+			return;
+		}
+
 		StartRecording();
+	}
 }
 
 void OBSBasic::on_settingsButton_clicked()
@@ -5059,6 +5283,12 @@
 	QDesktopServices::openUrl(url);
 }
 
+void OBSBasic::on_actionDiscord_triggered()
+{
+	QUrl url = QUrl("https://obsproject.com/discord", QUrl::TolerantMode);
+	QDesktopServices::openUrl(url);
+}
+
 void OBSBasic::on_actionShowSettingsFolder_triggered()
 {
 	char path[512];
@@ -5079,13 +5309,11 @@
 	QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 }
 
-QListWidgetItem *OBSBasic::GetTopSelectedSourceItem()
+int OBSBasic::GetTopSelectedSourceItem()
 {
-	QList<QListWidgetItem*> selectedItems = ui->sources->selectedItems();
-	QListWidgetItem *topItem = nullptr;
-	if (selectedItems.size() != 0)
-		topItem = selectedItems[0];
-	return topItem;
+	QModelIndexList selectedItems =
+		ui->sources->selectionModel()->selectedIndexes();
+	return selectedItems.count() ? selectedItems[0].row() : -1;
 }
 
 void OBSBasic::on_preview_customContextMenuRequested(const QPoint &pos)
@@ -5145,12 +5373,14 @@
 
 void OBSBasic::on_actionAlwaysOnTop_triggered()
 {
-	CloseDialogs();
-
+#ifndef _WIN32
 	/* Make sure all dialogs are safely and successfully closed before
 	 * switching the always on top mode due to the fact that windows all
 	 * have to be recreated, so queue the actual toggle to happen after
 	 * all events related to closing the dialogs have finished */
+	CloseDialogs();
+#endif
+
 	QMetaObject::invokeMethod(this, "ToggleAlwaysOnTop",
 			Qt::QueuedConnection);
 }
@@ -5290,36 +5520,38 @@
 	obs_scene_enum_items(GetCurrentScene(), func, nullptr);
 }
 
-void OBSBasic::on_actionResetTransform_triggered()
+static bool reset_tr(obs_scene_t *scene, obs_sceneitem_t *item, void *param)
 {
-	auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
-	{
-		if (!obs_sceneitem_selected(item))
-			return true;
+	if (obs_sceneitem_is_group(item))
+		obs_sceneitem_group_enum_items(item, reset_tr, nullptr);
+	if (!obs_sceneitem_selected(item))
+		return true;
 
-		obs_sceneitem_defer_update_begin(item);
+	obs_sceneitem_defer_update_begin(item);
 
-		obs_transform_info info;
-		vec2_set(&info.pos, 0.0f, 0.0f);
-		vec2_set(&info.scale, 1.0f, 1.0f);
-		info.rot = 0.0f;
-		info.alignment = OBS_ALIGN_TOP | OBS_ALIGN_LEFT;
-		info.bounds_type = OBS_BOUNDS_NONE;
-		info.bounds_alignment = OBS_ALIGN_CENTER;
-		vec2_set(&info.bounds, 0.0f, 0.0f);
-		obs_sceneitem_set_info(item, &info);
+	obs_transform_info info;
+	vec2_set(&info.pos, 0.0f, 0.0f);
+	vec2_set(&info.scale, 1.0f, 1.0f);
+	info.rot = 0.0f;
+	info.alignment = OBS_ALIGN_TOP | OBS_ALIGN_LEFT;
+	info.bounds_type = OBS_BOUNDS_NONE;
+	info.bounds_alignment = OBS_ALIGN_CENTER;
+	vec2_set(&info.bounds, 0.0f, 0.0f);
+	obs_sceneitem_set_info(item, &info);
 
-		obs_sceneitem_crop crop = {};
-		obs_sceneitem_set_crop(item, &crop);
+	obs_sceneitem_crop crop = {};
+	obs_sceneitem_set_crop(item, &crop);
 
-		obs_sceneitem_defer_update_end(item);
+	obs_sceneitem_defer_update_end(item);
 
-		UNUSED_PARAMETER(scene);
-		UNUSED_PARAMETER(param);
-		return true;
-	};
+	UNUSED_PARAMETER(scene);
+	UNUSED_PARAMETER(param);
+	return true;
+}
 
-	obs_scene_enum_items(GetCurrentScene(), func, nullptr);
+void OBSBasic::on_actionResetTransform_triggered()
+{
+	obs_scene_enum_items(GetCurrentScene(), reset_tr, nullptr);
 }
 
 static void GetItemBox(obs_sceneitem_t *item, vec3 &tl, vec3 &br)
@@ -5367,6 +5599,9 @@
 static bool RotateSelectedSources(obs_scene_t *scene, obs_sceneitem_t *item,
 		void *param)
 {
+	if (obs_sceneitem_is_group(item))
+		obs_sceneitem_group_enum_items(item, RotateSelectedSources,
+				param);
 	if (!obs_sceneitem_selected(item))
 		return true;
 
@@ -5379,10 +5614,11 @@
 	else if (rot <= -360.0f) rot += 360.0f;
 	obs_sceneitem_set_rot(item, rot);
 
+	obs_sceneitem_force_update_transform(item);
+
 	SetItemTL(item, tl);
 
 	UNUSED_PARAMETER(scene);
-	UNUSED_PARAMETER(param);
 	return true;
 };
 
@@ -5409,6 +5645,9 @@
 {
 	vec2 &mul = *reinterpret_cast<vec2*>(param);
 
+	if (obs_sceneitem_is_group(item))
+		obs_sceneitem_group_enum_items(item, MultiplySelectedItemScale,
+				param);
 	if (!obs_sceneitem_selected(item))
 		return true;
 
@@ -5419,6 +5658,8 @@
 	vec2_mul(&scale, &scale, &mul);
 	obs_sceneitem_set_scale(item, &scale);
 
+	obs_sceneitem_force_update_transform(item);
+
 	SetItemTL(item, tl);
 
 	UNUSED_PARAMETER(scene);
@@ -5446,6 +5687,9 @@
 {
 	obs_bounds_type boundsType = *reinterpret_cast<obs_bounds_type*>(param);
 
+	if (obs_sceneitem_is_group(item))
+		obs_sceneitem_group_enum_items(item, CenterAlignSelectedItems,
+				param);
 	if (!obs_sceneitem_selected(item))
 		return true;
 
@@ -5483,39 +5727,38 @@
 			&boundsType);
 }
 
-void OBSBasic::on_actionCenterToScreen_triggered()
+static bool center_to_scene(obs_scene_t *, obs_sceneitem_t *item, void *)
 {
-	auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
-	{
-		vec3 tl, br, itemCenter, screenCenter, offset;
-		obs_video_info ovi;
-
-		if (!obs_sceneitem_selected(item))
-			return true;
+	vec3 tl, br, itemCenter, screenCenter, offset;
+	obs_video_info ovi;
 
-		obs_get_video_info(&ovi);
+	if (obs_sceneitem_is_group(item))
+		obs_sceneitem_group_enum_items(item, center_to_scene, nullptr);
+	if (!obs_sceneitem_selected(item))
+		return true;
 
-		vec3_set(&screenCenter, float(ovi.base_width),
-				float(ovi.base_height), 0.0f);
-		vec3_mulf(&screenCenter, &screenCenter, 0.5f);
+	obs_get_video_info(&ovi);
 
-		GetItemBox(item, tl, br);
+	vec3_set(&screenCenter, float(ovi.base_width),
+			float(ovi.base_height), 0.0f);
+	vec3_mulf(&screenCenter, &screenCenter, 0.5f);
 
-		vec3_sub(&itemCenter, &br, &tl);
-		vec3_mulf(&itemCenter, &itemCenter, 0.5f);
-		vec3_add(&itemCenter, &itemCenter, &tl);
+	GetItemBox(item, tl, br);
 
-		vec3_sub(&offset, &screenCenter, &itemCenter);
-		vec3_add(&tl, &tl, &offset);
+	vec3_sub(&itemCenter, &br, &tl);
+	vec3_mulf(&itemCenter, &itemCenter, 0.5f);
+	vec3_add(&itemCenter, &itemCenter, &tl);
 
-		SetItemTL(item, tl);
+	vec3_sub(&offset, &screenCenter, &itemCenter);
+	vec3_add(&tl, &tl, &offset);
 
-		UNUSED_PARAMETER(scene);
-		UNUSED_PARAMETER(param);
-		return true;
-	};
+	SetItemTL(item, tl);
+	return true;
+};
 
-	obs_scene_enum_items(GetCurrentScene(), func, nullptr);
+void OBSBasic::on_actionCenterToScreen_triggered()
+{
+	obs_scene_enum_items(GetCurrentScene(), center_to_scene, nullptr);
 }
 
 void OBSBasic::EnablePreviewDisplay(bool enable)
@@ -5531,44 +5774,56 @@
 	EnablePreviewDisplay(previewEnabled);
 }
 
-void OBSBasic::Nudge(int dist, MoveDir dir)
+static bool nudge_callback(obs_scene_t*, obs_sceneitem_t *item, void *param)
 {
-	if (ui->preview->Locked())
-		return;
+	if (obs_sceneitem_locked(item))
+		return true;
 
-	struct MoveInfo {
-		float dist;
-		MoveDir dir;
-	} info = {(float)dist, dir};
+	struct vec2 &offset = *reinterpret_cast<struct vec2*>(param);
+	struct vec2 pos;
 
-	auto func = [] (obs_scene_t*, obs_sceneitem_t *item, void *param)
-	{
-		if (obs_sceneitem_locked(item))
-			return true;
+	if (!obs_sceneitem_selected(item)) {
+		if (obs_sceneitem_is_group(item)) {
+			struct vec3 offset3;
+			vec3_set(&offset3, offset.x, offset.y, 0.0f);
+
+			struct matrix4 matrix;
+			obs_sceneitem_get_draw_transform(item, &matrix);
+			vec4_set(&matrix.t, 0.0f, 0.0f, 0.0f, 1.0f);
+			matrix4_inv(&matrix, &matrix);
+			vec3_transform(&offset3, &offset3, &matrix);
+
+			struct vec2 new_offset;
+			vec2_set(&new_offset, offset3.x, offset3.y);
+			obs_sceneitem_group_enum_items(item, nudge_callback,
+					&new_offset);
+		}
 
-		MoveInfo *info = reinterpret_cast<MoveInfo*>(param);
-		struct vec2 dir;
-		struct vec2 pos;
+		return true;
+	}
 
-		vec2_set(&dir, 0.0f, 0.0f);
+	obs_sceneitem_get_pos(item, &pos);
+	vec2_add(&pos, &pos, &offset);
+	obs_sceneitem_set_pos(item, &pos);
+	return true;
+}
 
-		if (!obs_sceneitem_selected(item))
-			return true;
+void OBSBasic::Nudge(int dist, MoveDir dir)
+{
+	if (ui->preview->Locked())
+		return;
 
-		switch (info->dir) {
-		case MoveDir::Up:    dir.y = -info->dist; break;
-		case MoveDir::Down:  dir.y =  info->dist; break;
-		case MoveDir::Left:  dir.x = -info->dist; break;
-		case MoveDir::Right: dir.x =  info->dist; break;
-		}
+	struct vec2 offset;
+	vec2_set(&offset, 0.0f, 0.0f);
 
-		obs_sceneitem_get_pos(item, &pos);
-		vec2_add(&pos, &pos, &dir);
-		obs_sceneitem_set_pos(item, &pos);
-		return true;
-	};
+	switch (dir) {
+	case MoveDir::Up:    offset.y = (float)-dist; break;
+	case MoveDir::Down:  offset.y = (float) dist; break;
+	case MoveDir::Left:  offset.x = (float)-dist; break;
+	case MoveDir::Right: offset.x = (float) dist; break;
+	}
 
-	obs_scene_enum_items(GetCurrentScene(), func, &info);
+	obs_scene_enum_items(GetCurrentScene(), nudge_callback, &offset);
 }
 
 void OBSBasic::NudgeUp()       {Nudge(1,  MoveDir::Up);}
@@ -5576,40 +5831,17 @@
 void OBSBasic::NudgeLeft()     {Nudge(1,  MoveDir::Left);}
 void OBSBasic::NudgeRight()    {Nudge(1,  MoveDir::Right);}
 
-void OBSBasic::OpenProjector(obs_source_t *source, int monitor, bool window,
+OBSProjector *OBSBasic::OpenProjector(obs_source_t *source, int monitor,
 		QString title, ProjectorType type)
 {
 	/* seriously?  10 monitors? */
 	if (monitor > 9 || monitor > QGuiApplication::screens().size() - 1)
-		return;
-
-	if (!window) {
-		delete projectors[monitor];
-		projectors[monitor].clear();
-		RemoveSavedProjectors(monitor);
-	}
-
-	OBSProjector *projector = new OBSProjector(nullptr, source, !!window);
-	const char *name = obs_source_get_name(source);
-
-	if (!window) {
-		if (type == ProjectorType::StudioProgram) {
-			studioProgramProjectorArray.at((size_t)monitor) = 1;
-		} else if (type == ProjectorType::Preview) {
-			previewProjectorArray.at((size_t)monitor) = 1;
-		} else if (type == ProjectorType::Multiview) {
-			multiviewProjectorArray.at((size_t)monitor) = 1;
-		} else {
-			projectorArray.at((size_t)monitor) = name;
-		}
-	}
+		return nullptr;
 
-	if (!window) {
-		projector->Init(monitor, false, nullptr, type);
-		projectors[monitor] = projector;
-	} else {
-		projector->Init(monitor, true, title, type);
+	OBSProjector *projector = new OBSProjector(nullptr, source, monitor,
+			title, type);
 
+	if (monitor < 0) {
 		for (auto &projPtr : windowProjectors) {
 			if (!projPtr) {
 				projPtr = projector;
@@ -5619,20 +5851,26 @@
 
 		if (projector)
 			windowProjectors.push_back(projector);
+	} else {
+		delete projectors[monitor];
+		projectors[monitor].clear();
+
+		projectors[monitor] = projector;
 	}
+
+	return projector;
 }
 
 void OBSBasic::OpenStudioProgramProjector()
 {
 	int monitor = sender()->property("monitor").toInt();
-	OpenProjector(nullptr, monitor, false, nullptr,
-			ProjectorType::StudioProgram);
+	OpenProjector(nullptr, monitor, nullptr, ProjectorType::StudioProgram);
 }
 
 void OBSBasic::OpenPreviewProjector()
 {
 	int monitor = sender()->property("monitor").toInt();
-	OpenProjector(nullptr, monitor, false, nullptr, ProjectorType::Preview);
+	OpenProjector(nullptr, monitor, nullptr, ProjectorType::Preview);
 }
 
 void OBSBasic::OpenSourceProjector()
@@ -5642,14 +5880,14 @@
 	if (!item)
 		return;
 
-	OpenProjector(obs_sceneitem_get_source(item), monitor, false);
+	OpenProjector(obs_sceneitem_get_source(item), monitor, nullptr,
+			ProjectorType::Source);
 }
 
 void OBSBasic::OpenMultiviewProjector()
 {
 	int monitor = sender()->property("monitor").toInt();
-	OpenProjector(nullptr, monitor, false, nullptr,
-			ProjectorType::Multiview);
+	OpenProjector(nullptr, monitor, nullptr, ProjectorType::Multiview);
 }
 
 void OBSBasic::OpenSceneProjector()
@@ -5659,114 +5897,112 @@
 	if (!scene)
 		return;
 
-	OpenProjector(obs_scene_get_source(scene), monitor, false);
+	OpenProjector(obs_scene_get_source(scene), monitor, nullptr,
+			ProjectorType::Scene);
 }
 
 void OBSBasic::OpenStudioProgramWindow()
 {
-	int monitor = sender()->property("monitor").toInt();
-	QString title = QTStr("StudioProgramWindow");
-	OpenProjector(nullptr, monitor, true, title,
+	OpenProjector(nullptr, -1, QTStr("StudioProgramWindow"),
 			ProjectorType::StudioProgram);
 }
 
 void OBSBasic::OpenPreviewWindow()
 {
-	int monitor = sender()->property("monitor").toInt();
-	QString title = QTStr("PreviewWindow");
-	OpenProjector(nullptr, monitor, true, nullptr, ProjectorType::Preview);
+	OpenProjector(nullptr, -1, QTStr("PreviewWindow"),
+			ProjectorType::Preview);
 }
 
 void OBSBasic::OpenSourceWindow()
 {
-	int monitor = sender()->property("monitor").toInt();
 	OBSSceneItem item = GetCurrentSceneItem();
-	OBSSource source = obs_sceneitem_get_source(item);
-	QString text = QString::fromUtf8(obs_source_get_name(source));
-
-	QString title = QTStr("SourceWindow") + " - " + text;
-
 	if (!item)
 		return;
 
-	OpenProjector(obs_sceneitem_get_source(item), monitor, true, title);
+	OBSSource source = obs_sceneitem_get_source(item);
+	QString title = QString::fromUtf8(obs_source_get_name(source));
+
+	OpenProjector(obs_sceneitem_get_source(item), -1, title,
+			ProjectorType::Source);
 }
 
 void OBSBasic::OpenMultiviewWindow()
 {
-	int monitor = sender()->property("monitor").toInt();
-	OpenProjector(nullptr, monitor, true, "Multiview",
+	OpenProjector(nullptr, -1, QTStr("MultiviewWindowed"),
 			ProjectorType::Multiview);
 }
 
 void OBSBasic::OpenSceneWindow()
 {
-	int monitor = sender()->property("monitor").toInt();
 	OBSScene scene = GetCurrentScene();
-	OBSSource source = obs_scene_get_source(scene);
-	QString text = QString::fromUtf8(obs_source_get_name(source));
-
-	QString title = QTStr("SceneWindow") + " - " + text;
-
 	if (!scene)
 		return;
 
-	OpenProjector(obs_scene_get_source(scene), monitor, true, title);
+	OBSSource source = obs_scene_get_source(scene);
+	QString title = QString::fromUtf8(obs_source_get_name(source));
+
+	OpenProjector(obs_scene_get_source(scene), -1, title,
+			ProjectorType::Scene);
 }
 
 void OBSBasic::OpenSavedProjectors()
 {
-	bool projectorSave = config_get_bool(GetGlobalConfig(),
-			"BasicWindow", "SaveProjectors");
+	for (SavedProjectorInfo *info : savedProjectorsArray) {
+		OBSProjector *projector = nullptr;
+		switch (info->type) {
+		case ProjectorType::Source:
+		case ProjectorType::Scene: {
+			OBSSource source = obs_get_source_by_name(
+					info->name.c_str());
+			if (!source)
+				continue;
+
+			QString title = nullptr;
+			if (info->monitor < 0)
+				title = QString::fromUtf8(
+						obs_source_get_name(source));
 
-	if (projectorSave) {
-		for (size_t i = 0; i < projectorArray.size(); i++) {
-			if (projectorArray.at(i).empty() == false) {
-				OBSSource source = obs_get_source_by_name(
-					projectorArray.at(i).c_str());
-
-				if (!source) {
-					RemoveSavedProjectors((int)i);
-					obs_source_release(source);
-					continue;
-				}
+			projector = OpenProjector(source, info->monitor, title,
+					info->type);
 
-				OpenProjector(source, (int)i, false);
-				obs_source_release(source);
-			}
+			obs_source_release(source);
+			break;
 		}
-
-		for (size_t i = 0; i < studioProgramProjectorArray.size(); i++) {
-			if (studioProgramProjectorArray.at(i) == 1) {
-				OpenProjector(nullptr, (int)i, false, nullptr,
-						ProjectorType::StudioProgram);
-			}
+		case ProjectorType::Preview: {
+			projector = OpenProjector(nullptr, info->monitor,
+					QTStr("PreviewWindow"),
+					ProjectorType::Preview);
+			break;
+		}
+		case ProjectorType::StudioProgram: {
+			projector = OpenProjector(nullptr, info->monitor,
+					QTStr("StudioProgramWindow"),
+					ProjectorType::StudioProgram);
+			break;
+		}
+		case ProjectorType::Multiview: {
+			projector = OpenProjector(nullptr, info->monitor,
+					QTStr("MultiviewWindowed"),
+					ProjectorType::Multiview);
+			break;
 		}
-
-		for (size_t i = 0; i < previewProjectorArray.size(); i++) {
-			if (previewProjectorArray.at(i) == 1) {
-				OpenProjector(nullptr, (int)i, false, nullptr,
-						ProjectorType::Preview);
-			}
 		}
 
-		for (size_t i = 0; i < multiviewProjectorArray.size(); i++) {
-			if (multiviewProjectorArray.at(i) == 1) {
-				OpenProjector(nullptr, (int)i, false, nullptr,
-						ProjectorType::Multiview);
+		if (projector && !info->geometry.empty()) {
+			QByteArray byteArray = QByteArray::fromBase64(
+					QByteArray(info->geometry.c_str()));
+			projector->restoreGeometry(byteArray);
+
+			if (!WindowPositionValid(projector->normalGeometry())) {
+				QRect rect = App()->desktop()->geometry();
+				projector->setGeometry(QStyle::alignedRect(
+						Qt::LeftToRight,
+						Qt::AlignCenter, size(), rect));
 			}
 		}
 	}
 }
 
-void OBSBasic::RemoveSavedProjectors(int monitor)
-{
-	studioProgramProjectorArray.at((size_t)monitor) = 0;
-	multiviewProjectorArray.at((size_t)monitor) = 0;
-	previewProjectorArray.at((size_t)monitor) = 0;
-	projectorArray.at((size_t)monitor) = "";
-}
-
 void OBSBasic::on_actionFullscreenInterface_triggered()
 {
 	if (!fullscreenInterface)
@@ -5978,6 +6214,10 @@
 
 		setVisible(false);
 
+#ifdef __APPLE__
+		EnableOSXDockIcon(false);
+#endif
+
 	} else if (showing && !isVisible()) {
 		if (showHide)
 			showHide->setText(QTStr("Basic.SystemTray.Hide"));
@@ -5988,6 +6228,14 @@
 
 		setVisible(true);
 
+#ifdef __APPLE__
+		EnableOSXDockIcon(true);
+#endif
+
+		/* raise and activate window to ensure it is on top */
+		raise();
+		activateWindow();
+
 		/* show all child dialogs that was visible earlier */
 		if (!visDialogs.isEmpty()) {
 			for (int i = 0; i < visDialogs.size(); ++i) {
@@ -6022,25 +6270,26 @@
 
 void OBSBasic::SystemTrayInit()
 {
-	trayIcon = new QSystemTrayIcon(QIcon(":/res/images/obs.png"),
-			this);
+	trayIcon.reset(new QSystemTrayIcon(QIcon(":/res/images/obs.png"),
+			this));
 	trayIcon->setToolTip("OBS Studio");
 
 	showHide = new QAction(QTStr("Basic.SystemTray.Show"),
-			trayIcon);
+			trayIcon.data());
 	sysTrayStream = new QAction(QTStr("Basic.Main.StartStreaming"),
-			trayIcon);
+			trayIcon.data());
 	sysTrayRecord = new QAction(QTStr("Basic.Main.StartRecording"),
-			trayIcon);
+			trayIcon.data());
 	sysTrayReplayBuffer = new QAction(QTStr("Basic.Main.StartReplayBuffer"),
-			trayIcon);
+			trayIcon.data());
 	exit = new QAction(QTStr("Exit"),
-			trayIcon);
+			trayIcon.data());
 
 	if (outputHandler && !outputHandler->replayBuffer)
 		sysTrayReplayBuffer->setEnabled(false);
 
-	connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+	connect(trayIcon.data(),
+			SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
 			this,
 			SLOT(IconActivated(QSystemTrayIcon::ActivationReason)));
 	connect(showHide, SIGNAL(triggered()),
@@ -6114,6 +6363,9 @@
 			QTimer::singleShot(50, this, SLOT(hide()));
 			EnablePreviewDisplay(false);
 			setVisible(false);
+#ifdef __APPLE__
+			EnableOSXDockIcon(false);
+#endif
 			opt_minimize_tray = false;
 		}
 	} else if (sysTrayEnabled) {
@@ -6138,13 +6390,12 @@
 
 void OBSBasic::on_actionCopySource_triggered()
 {
-	on_actionCopyTransform_triggered();
-
 	OBSSceneItem item = GetCurrentSceneItem();
-
 	if (!item)
 		return;
 
+	on_actionCopyTransform_triggered();
+
 	OBSSource source = obs_sceneitem_get_source(item);
 
 	copyString = obs_source_get_name(source);
@@ -6161,6 +6412,11 @@
 
 void OBSBasic::on_actionPasteRef_triggered()
 {
+	/* do not allow duplicate refs of the same group in the same scene */
+	OBSScene scene = GetCurrentScene();
+	if (!!obs_scene_get_group(scene, copyString))
+		return;
+
 	OBSBasicSourceSelect::SourcePaste(copyString, copyVisible, false);
 	on_actionPasteTransform_triggered();
 }
@@ -6199,6 +6455,180 @@
 	obs_source_copy_filters(dstSource, source);
 }
 
+static void ConfirmColor(SourceTree *sources, const QColor &color,
+		QModelIndexList selectedItems)
+{
+	for (int x = 0; x < selectedItems.count(); x++) {
+		SourceTreeItem *treeItem = sources
+			->GetItemWidget(selectedItems[x].row());
+		treeItem->setStyleSheet("background: "
+			+ color.name(QColor::HexArgb));
+		treeItem->style()->unpolish(treeItem);
+		treeItem->style()->polish(treeItem);
+
+		OBSSceneItem sceneItem = sources->Get(
+			selectedItems[x].row());
+		obs_data_t *privData =
+			obs_sceneitem_get_private_settings(sceneItem);
+		obs_data_set_int(privData, "color-preset", 1);
+		obs_data_set_string(privData, "color",
+			QT_TO_UTF8(color.name(
+				QColor::HexArgb)));
+		obs_data_release(privData);
+	}
+}
+
+void OBSBasic::ColorChange()
+{
+	QModelIndexList selectedItems =
+		ui->sources->selectionModel()->selectedIndexes();
+	QAction *action = qobject_cast<QAction*>(sender());
+	QPushButton *colorButton = qobject_cast<QPushButton*>(sender());
+
+	if (selectedItems.count() == 0)
+		return;
+
+	if (colorButton) {
+		int preset = colorButton->property("bgColor").value<int>();
+
+		for (int x = 0; x < selectedItems.count(); x++) {
+			SourceTreeItem *treeItem = ui->sources
+					->GetItemWidget(selectedItems[x].row());
+			treeItem->setStyleSheet("");
+			treeItem->setProperty("bgColor", preset);
+			treeItem->style()->unpolish(treeItem);
+			treeItem->style()->polish(treeItem);
+
+			OBSSceneItem sceneItem = ui->sources->Get(
+					selectedItems[x].row());
+			obs_data_t *privData =
+				obs_sceneitem_get_private_settings(sceneItem);
+			obs_data_set_int(privData, "color-preset", preset + 1);
+			obs_data_set_string(privData, "color", "");
+			obs_data_release(privData);
+		}
+
+		for (int i = 1; i < 9; i++) {
+			stringstream button;
+			button << "preset" << i;
+			QPushButton *cButton = colorButton->parentWidget()
+				->findChild<QPushButton *>(button.str().c_str());
+			cButton->setStyleSheet("border: 1px solid black");
+		}
+
+		colorButton->setStyleSheet("border: 2px solid black");
+	} else if (action) {
+		int preset = action->property("bgColor").value<int>();
+
+		if (preset == 1) {
+			OBSSceneItem curSceneItem = GetCurrentSceneItem();
+			SourceTreeItem *curTreeItem =
+				GetItemWidgetFromSceneItem(curSceneItem);
+			obs_data_t *curPrivData =
+				obs_sceneitem_get_private_settings(curSceneItem);
+
+			int oldPreset = obs_data_get_int(
+				curPrivData, "color-preset");
+			const QString oldSheet = curTreeItem->styleSheet();
+
+			auto liveChangeColor = [=](const QColor &color) {
+				if (color.isValid()) {
+					curTreeItem->setStyleSheet(
+						"background: "
+						+ color.name(QColor::HexArgb));
+				}
+			};
+
+			auto changedColor = [=](const QColor &color) {
+				if (color.isValid()) {
+					ConfirmColor(ui->sources, color,
+						selectedItems);
+				}
+			};
+
+			auto rejected = [=]() {
+				if (oldPreset == 1) {
+					curTreeItem->setStyleSheet(oldSheet);
+					curTreeItem->setProperty("bgColor", 0);
+				} else if (oldPreset == 0) {
+					curTreeItem->setStyleSheet(
+						"background: none");
+					curTreeItem->setProperty("bgColor", 0);
+				} else {
+					curTreeItem->setStyleSheet("");
+					curTreeItem->setProperty("bgColor",
+						oldPreset - 1);
+				}
+
+				curTreeItem->style()->unpolish(curTreeItem);
+				curTreeItem->style()->polish(curTreeItem);
+			};
+
+			QColorDialog::ColorDialogOptions options =
+				QColorDialog::ShowAlphaChannel;
+
+			const char *oldColor = obs_data_get_string(curPrivData,
+					"color");
+			const char *customColor = *oldColor != 0 ? oldColor
+				: "#55FF0000";
+#ifdef __APPLE__
+			options |= QColorDialog::DontUseNativeDialog;
+#endif
+
+			QColorDialog *colorDialog = new QColorDialog(this);
+			colorDialog->setOptions(options);
+			colorDialog->setCurrentColor(
+					QColor(customColor));
+			connect(colorDialog, &QColorDialog::currentColorChanged,
+					liveChangeColor);
+			connect(colorDialog, &QColorDialog::colorSelected,
+					changedColor);
+			connect(colorDialog, &QColorDialog::rejected,
+					rejected);
+			colorDialog->open();
+
+			obs_data_release(curPrivData);
+		} else {
+			for (int x = 0; x < selectedItems.count(); x++) {
+				SourceTreeItem *treeItem = ui->sources
+					->GetItemWidget(selectedItems[x].row());
+				treeItem->setStyleSheet("background: none");
+				treeItem->setProperty("bgColor", preset);
+				treeItem->style()->unpolish(treeItem);
+				treeItem->style()->polish(treeItem);
+
+				OBSSceneItem sceneItem = ui->sources->Get(
+					selectedItems[x].row());
+				obs_data_t *privData =
+					obs_sceneitem_get_private_settings(
+						sceneItem);
+				obs_data_set_int(privData, "color-preset",
+					preset);
+				obs_data_set_string(privData, "color", "");
+				obs_data_release(privData);
+			}
+		}
+	}
+}
+
+SourceTreeItem *OBSBasic::GetItemWidgetFromSceneItem(
+		obs_sceneitem_t *sceneItem)
+{
+	int i = 0;
+	SourceTreeItem *treeItem = ui->sources->GetItemWidget(i);
+	OBSSceneItem item = ui->sources->Get(i);
+	int64_t id = obs_sceneitem_get_id(sceneItem);
+	while (treeItem && obs_sceneitem_get_id(item) != id) {
+		i++;
+		treeItem = ui->sources->GetItemWidget(i);
+		item = ui->sources->Get(i);
+	}
+	if(treeItem)
+		return treeItem;
+
+	return nullptr;
+}
+
 void OBSBasic::on_autoConfigure_triggered()
 {
 	AutoConfig test(this);
@@ -6220,3 +6650,10 @@
 	statsDlg->show();
 	stats = statsDlg;
 }
+
+ColorSelect::ColorSelect(QWidget *parent)
+	: QWidget(parent),
+	  ui(new Ui::ColorSelect)
+{
+	ui->setupUi(this);
+}

obs-studio-21.1.2.tar.xz/UI/window-basic-main.hpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-main.hpp Changed

@@ -29,6 +29,7 @@
 #include "window-basic-transform.hpp"
 #include "window-basic-adv-audio.hpp"
 #include "window-basic-filters.hpp"
+#include "window-projector.hpp"
 
 #include <obs-frontend-internal.hpp>
 
@@ -41,10 +42,10 @@
 class QMessageBox;
 class QListWidgetItem;
 class VolControl;
-class QNetworkReply;
 class OBSBasicStats;
 
 #include "ui_OBSBasic.h"
+#include "ui_ColorSelect.h"
 
 #define DESKTOP_AUDIO_1 Str("DesktopAudioDevice1")
 #define DESKTOP_AUDIO_2 Str("DesktopAudioDevice2")
@@ -67,11 +68,11 @@
 	OBSSignals,
 };
 
-enum class ProjectorType {
-	Source,
-	Preview,
-	StudioProgram,
-	Multiview
+struct SavedProjectorInfo {
+	ProjectorType type;
+	int monitor;
+	std::string geometry;
+	std::string name;
 };
 
 struct QuickTransition {
@@ -83,10 +84,17 @@
 
 	inline QuickTransition() {}
 	inline QuickTransition(OBSSource source_, int duration_, int id_)
-		: source   (source_),
-		  duration (duration_),
-		  id       (id_)
+		: source        (source_),
+		  duration      (duration_),
+		  id            (id_),
+		  renamedSignal (std::make_shared<OBSSignal>(
+					obs_source_get_signal_handler(source),
+					"rename", SourceRenamed, this))
 	{}
+
+private:
+	static void SourceRenamed(void *param, calldata_t *data);
+	std::shared_ptr<OBSSignal> renamedSignal;
 };
 
 class OBSBasic : public OBSMainWindow {
@@ -120,11 +128,6 @@
 
 	std::vector<OBSSignal> signalHandlers;
 
-	std::vector<std::string> projectorArray;
-	std::vector<int> studioProgramProjectorArray;
-	std::vector<int> multiviewProjectorArray;
-	std::vector<int> previewProjectorArray;
-
 	bool loaded = false;
 	long disableSaving = 1;
 	bool projectChanged = false;
@@ -135,8 +138,9 @@
 	const char *copyFiltersString;
 	bool copyVisible = true;
 
-	QPointer<QThread> updateCheckThread;
-	QPointer<QThread> logUploadThread;
+	QScopedPointer<QThread> updateCheckThread;
+	QScopedPointer<QThread> introCheckThread;
+	QScopedPointer<QThread> logUploadThread;
 
 	QPointer<OBSBasicInteraction> interaction;
 	QPointer<OBSBasicProperties> properties;
@@ -169,16 +173,18 @@
 
 	ConfigFile    basicConfig;
 
+	std::vector<SavedProjectorInfo*> savedProjectorsArray;
 	QPointer<QWidget> projectors[10];
 	QList<QPointer<QWidget>> windowProjectors;
 
 	QPointer<QWidget> stats;
+	QPointer<QWidget> remux;
 
 	QPointer<QMenu> startStreamMenu;
 
 	QPointer<QPushButton> replayBufferButton;
 
-	QPointer<QSystemTrayIcon> trayIcon;
+	QScopedPointer<QSystemTrayIcon> trayIcon;
 	QPointer<QAction>         sysTrayStream;
 	QPointer<QAction>         sysTrayRecord;
 	QPointer<QAction>         sysTrayReplayBuffer;
@@ -197,6 +203,7 @@
 	void          CreateDefaultScene(bool firstStart);
 
 	void          UpdateVolumeControlsDecayRate();
+	void          UpdateVolumeControlsPeakMeterType();
 	void          ClearVolumeControls();
 
 	void          UploadLog(const char *subdir, const char *file);
@@ -217,6 +224,8 @@
 
 	void          InitPrimitives();
 
+	void 	      OnFirstLoad();
+
 	OBSSceneItem  GetSceneItem(QListWidgetItem *item);
 	OBSSceneItem  GetCurrentSceneItem();
 
@@ -233,9 +242,6 @@
 
 	void UpdatePreviewScalingMenu();
 
-	void UpdateSources(OBSScene scene);
-	void InsertSceneItem(obs_sceneitem_t *item);
-
 	void LoadSceneListOrder(obs_data_array_t *array);
 	obs_data_array_t *SaveSceneListOrder();
 	void ChangeSceneIndex(bool relative, int idx, int invalidIdx);
@@ -244,23 +250,20 @@
 	void TempStreamOutput(const char *url, const char *key,
 			int vBitrate, int aBitrate);
 
-	void CreateInteractionWindow(obs_source_t *source);
-	void CreatePropertiesWindow(obs_source_t *source);
-	void CreateFiltersWindow(obs_source_t *source);
-
 	void CloseDialogs();
 	void ClearSceneData();
 
 	void Nudge(int dist, MoveDir dir);
-	void OpenProjector(obs_source_t *source, int monitor, bool window,
-			QString title = nullptr,
-			ProjectorType type = ProjectorType::Source);
+
+	OBSProjector *OpenProjector(obs_source_t *source, int monitor,
+			QString title, ProjectorType type);
 
 	void GetAudioSourceFilters();
 	void GetAudioSourceProperties();
 	void VolControlContextMenu();
+	void ToggleVolControlLayout();
+	void ToggleMixerLayout(bool vertical);
 
-	void AddSceneCollection(bool create_new);
 	void RefreshSceneCollections();
 	void ChangeSceneCollection();
 	void LogScenes();
@@ -276,7 +279,7 @@
 
 	void SaveProjectNow();
 
-	QListWidgetItem *GetTopSelectedSourceItem();
+	int GetTopSelectedSourceItem();
 
 	obs_hotkey_pair_id streamingHotkeys, recordingHotkeys,
 	                   replayBufHotkeys;
@@ -367,19 +370,14 @@
 	obs_data_array_t *SaveProjectors();
 	void LoadSavedProjectors(obs_data_array_t *savedProjectors);
 
-	obs_data_array_t *SavePreviewProjectors();
-	void LoadSavedPreviewProjectors(
-		obs_data_array_t *savedPreviewProjectors);
+	void ReceivedIntroJson(const QString &text);
 
-	obs_data_array_t *SaveStudioProgramProjectors();
-	void LoadSavedStudioProgramProjectors(
-		obs_data_array_t *savedStudioProgramProjectors);
-
-	obs_data_array_t *SaveMultiviewProjectors();
-	void LoadSavedMultiviewProjectors(
-		obs_data_array_t *savedMultiviewProjectors);
+	bool NoSourcesConfirmation();
 
 public slots:
+	void DeferSaveBegin();
+	void DeferSaveEnd();
+
 	void StartStreaming();
 	void StopStreaming();
 	void ForceStopStreaming();
@@ -417,9 +415,12 @@
 	void SetCurrentScene(OBSSource scene, bool force = false,
 			bool direct = false);
 
+	bool AddSceneCollection(
+			bool create_new,
+			const QString &name = QString());
+
 private slots:
 	void AddSceneItem(OBSSceneItem item);
-	void RemoveSceneItem(OBSSceneItem item);
 	void AddScene(OBSSource source);
 	void RemoveScene(OBSSource source);
 	void RenameSources(OBSSource source, QString newName, QString prevName);
@@ -462,7 +463,8 @@
 
 	void MixerRenameSource();
 
-	void on_mixerScrollArea_customContextMenuRequested();
+	void on_vMixerScrollArea_customContextMenuRequested();
+	void on_hMixerScrollArea_customContextMenuRequested();
 
 	void on_actionCopySource_triggered();
 	void on_actionPasteRef_triggered();
@@ -471,14 +473,17 @@
 	void on_actionCopyFilters_triggered();
 	void on_actionPasteFilters_triggered();
 
+	void ColorChange();
+
+	SourceTreeItem *GetItemWidgetFromSceneItem(obs_sceneitem_t *sceneItem);
+
 private:
 	/* OBS Callbacks */
 	static void SceneReordered(void *data, calldata_t *params);
 	static void SceneItemAdded(void *data, calldata_t *params);
-	static void SceneItemRemoved(void *data, calldata_t *params);
 	static void SceneItemSelected(void *data, calldata_t *params);
 	static void SceneItemDeselected(void *data, calldata_t *params);
-	static void SourceLoaded(void *data, obs_source_t *source);
+	static void SourceCreated(void *data, calldata_t *params);
 	static void SourceRemoved(void *data, calldata_t *params);
 	static void SourceActivated(void *data, calldata_t *params);
 	static void SourceDeactivated(void *data, calldata_t *params);
@@ -537,6 +542,11 @@
 		cy = previewCY;
 	}
 
+	inline bool SavingDisabled() const
+	{
+		return disableSaving;
+	}
+
 	inline double GetCPUUsage() const
 	{
 		return os_cpu_usage_info_query(cpuUsageInfo);
@@ -555,11 +565,10 @@
 		}
 	}
 
-	void ReorderSceneItem(obs_sceneitem_t *item, size_t idx);
-
 	QMenu *AddDeinterlacingMenu(obs_source_t *source);
 	QMenu *AddScaleFilteringMenu(obs_sceneitem_t *item);
-	void CreateSourcePopupMenu(QListWidgetItem *item, bool preview);
+	QMenu *AddBackgroundColorMenu(obs_sceneitem_t *item);
+	void CreateSourcePopupMenu(int idx, bool preview);
 
 	void UpdateTitleBar();
 	void UpdateSceneSelection(OBSSource source);
@@ -568,7 +577,10 @@
 	void SystemTray(bool firstStarted);
 
 	void OpenSavedProjectors();
-	void RemoveSavedProjectors(int monitor);
+
+	void CreateInteractionWindow(obs_source_t *source);
+	void CreatePropertiesWindow(obs_source_t *source);
+	void CreateFiltersWindow(obs_source_t *source);
 
 protected:
 	virtual void closeEvent(QCloseEvent *event) override;
@@ -611,9 +623,7 @@
 	void on_actionRemoveScene_triggered();
 	void on_actionSceneUp_triggered();
 	void on_actionSceneDown_triggered();
-	void on_sources_itemSelectionChanged();
 	void on_sources_customContextMenuRequested(const QPoint &pos);
-	void on_sources_itemDoubleClicked(QListWidgetItem *item);
 	void on_scenes_itemDoubleClicked(QListWidgetItem *item);
 	void on_actionAddSource_triggered();
 	void on_actionRemoveSource_triggered();
@@ -640,6 +650,7 @@
 
 	void on_actionHelpPortal_triggered();
 	void on_actionWebsite_triggered();
+	void on_actionDiscord_triggered();
 
 	void on_preview_customContextMenuRequested(const QPoint &pos);
 	void on_program_customContextMenuRequested(const QPoint &pos);
@@ -695,8 +706,6 @@
 
 	void SceneNameEdited(QWidget *editor,
 			QAbstractItemDelegate::EndEditHint endHint);
-	void SceneItemNameEdited(QWidget *editor,
-			QAbstractItemDelegate::EndEditHint endHint);
 
 	void OpenSceneFilters();
 	void OpenFilters();
@@ -721,6 +730,10 @@
 	void OpenMultiviewWindow();
 	void OpenSceneWindow();
 
+	void DeferredLoad(const QString &file, int requeueCount);
+
+	void StackedMixerAreaContextMenuRequested();
+
 public slots:
 	void on_actionResetTransform_triggered();
 
@@ -738,3 +751,12 @@
 private:
 	std::unique_ptr<Ui::OBSBasic> ui;
 };
+
+class ColorSelect : public QWidget {
+
+public:
+	explicit ColorSelect(QWidget *parent = 0);
+
+private:
+	std::unique_ptr<Ui::ColorSelect> ui;
+};

obs-studio-21.1.2.tar.xz/UI/window-basic-preview.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-preview.cpp Changed

@@ -39,6 +39,8 @@
 	OBSSceneItem item;
 	bool         selectBelow;
 
+	obs_sceneitem_t *group = nullptr;
+
 	SceneFindData(const SceneFindData &) = delete;
 	SceneFindData(SceneFindData &&) = delete;
 	SceneFindData& operator=(const SceneFindData &) = delete;
@@ -111,16 +113,6 @@
 	return result;
 }
 
-static vec3 GetTransformedPosScaled(float x, float y, const matrix4 &mat,
-		float scale)
-{
-	vec3 result;
-	vec3_set(&result, x, y, 0.0f);
-	vec3_transform(&result, &result, &mat);
-	vec3_mulf(&result, &result, scale);
-	return result;
-}
-
 static inline vec2 GetOBSScreenSize()
 {
 	obs_video_info ovi;
@@ -214,11 +206,26 @@
 
 	if (!SceneItemHasVideo(item))
 		return true;
+	if (obs_sceneitem_is_group(item)) {
+		data->group = item;
+		obs_sceneitem_group_enum_items(item, CheckItemSelected, param);
+		data->group = nullptr;
+
+		if (data->item) {
+			return false;
+		}
+	}
 
 	vec3_set(&pos3, data->pos.x, data->pos.y, 0.0f);
 
 	obs_sceneitem_get_box_transform(item, &transform);
 
+	if (data->group) {
+		matrix4 parent_transform;
+		obs_sceneitem_get_draw_transform(data->group, &parent_transform);
+		matrix4_mul(&transform, &transform, &parent_transform);
+	}
+
 	matrix4_inv(&transform, &transform);
 	vec3_transform(&transformedPos, &pos3, &transform);
 
@@ -248,8 +255,9 @@
 }
 
 struct HandleFindData {
-	const vec2   &pos;
-	const float  scale;
+	const vec2    &pos;
+	const float   radius;
+	matrix4       parent_xform;
 
 	OBSSceneItem item;
 	ItemHandle   handle = ItemHandle::None;
@@ -259,38 +267,60 @@
 	HandleFindData& operator=(const HandleFindData &) = delete;
 	HandleFindData& operator=(HandleFindData &&) = delete;
 
-	inline HandleFindData(const vec2 &pos_, float scale_)
-		: pos   (pos_),
-		  scale (scale_)
-	{}
+	inline HandleFindData(const vec2 &pos_, float scale)
+		: pos    (pos_),
+		  radius (HANDLE_SEL_RADIUS / scale)
+	{
+		matrix4_identity(&parent_xform);
+	}
+
+	inline HandleFindData(const HandleFindData &hfd,
+			obs_sceneitem_t *parent)
+		: pos    (hfd.pos),
+		  radius (hfd.radius),
+		  item   (hfd.item),
+		  handle (hfd.handle)
+	{
+		obs_sceneitem_get_draw_transform(parent, &parent_xform);
+	}
 };
 
 static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item,
 		void *param)
 {
-	if (!obs_sceneitem_selected(item))
+	HandleFindData &data = *reinterpret_cast<HandleFindData*>(param);
+
+	if (!obs_sceneitem_selected(item)) {
+		if (obs_sceneitem_is_group(item)) {
+			HandleFindData newData(data, item);
+			obs_sceneitem_group_enum_items(item, FindHandleAtPos,
+					&newData);
+			data.item = newData.item;
+			data.handle = newData.handle;
+		}
+
 		return true;
+	}
 
-	HandleFindData *data = reinterpret_cast<HandleFindData*>(param);
 	matrix4        transform;
 	vec3           pos3;
-	float          closestHandle = HANDLE_SEL_RADIUS;
+	float          closestHandle = data.radius;
 
-	vec3_set(&pos3, data->pos.x, data->pos.y, 0.0f);
+	vec3_set(&pos3, data.pos.x, data.pos.y, 0.0f);
 
 	obs_sceneitem_get_box_transform(item, &transform);
 
 	auto TestHandle = [&] (float x, float y, ItemHandle handle)
 	{
-		vec3 handlePos = GetTransformedPosScaled(x, y, transform,
-				data->scale);
+		vec3 handlePos = GetTransformedPos(x, y, transform);
+		vec3_transform(&handlePos, &handlePos, &data.parent_xform);
 
 		float dist = vec3_dist(&handlePos, &pos3);
-		if (dist < HANDLE_SEL_RADIUS) {
+		if (dist < data.radius) {
 			if (dist < closestHandle) {
 				closestHandle = dist;
-				data->handle  = handle;
-				data->item    = item;
+				data.handle   = handle;
+				data.item     = item;
 			}
 		}
 	};
@@ -339,7 +369,10 @@
 	if (!scene)
 		return;
 
-	HandleFindData data(pos, main->previewScale / main->devicePixelRatio());
+	float scale = main->previewScale / main->devicePixelRatio();
+	vec2 scaled_pos = pos;
+	vec2_divf(&scaled_pos, &scaled_pos, scale);
+	HandleFindData data(scaled_pos, scale);
 	obs_scene_enum_items(scene, FindHandleAtPos, &data);
 
 	stretchItem     = std::move(data.item);
@@ -377,6 +410,15 @@
 				startCrop.left - startCrop.right);
 		cropSize.y = float(obs_source_get_height(source) -
 				startCrop.top - startCrop.bottom);
+
+		stretchGroup = obs_sceneitem_get_group(scene, stretchItem);
+		if (stretchGroup) {
+			obs_sceneitem_get_draw_transform(stretchGroup,
+					&invGroupTransform);
+			matrix4_inv(&invGroupTransform,
+					&invGroupTransform);
+			obs_sceneitem_defer_group_resize_begin(stretchGroup);
+		}
 	}
 }
 
@@ -482,6 +524,9 @@
 {
 	obs_sceneitem_t *selectedItem =
 		reinterpret_cast<obs_sceneitem_t*>(param);
+	if (obs_sceneitem_is_group(item))
+		obs_sceneitem_group_enum_items(item, select_one, param);
+
 	obs_sceneitem_select(item, (selectedItem == item));
 
 	UNUSED_PARAMETER(scene);
@@ -534,10 +579,15 @@
 		if (!mouseMoved)
 			ProcessClick(pos);
 
-		stretchItem = nullptr;
-		mouseDown   = false;
-		mouseMoved  = false;
-		cropping    = false;
+		if (stretchGroup) {
+			obs_sceneitem_defer_group_resize_end(stretchGroup);
+		}
+
+		stretchItem  = nullptr;
+		stretchGroup = nullptr;
+		mouseDown    = false;
+		mouseMoved   = false;
+		cropping     = false;
 	}
 }
 
@@ -550,30 +600,52 @@
 		void *param)
 {
 	SelectedItemBounds *data = reinterpret_cast<SelectedItemBounds*>(param);
+	vec3 t[4];
 
+	auto add_bounds = [data, &t] ()
+	{
+		for (const vec3 &v : t) {
+			if (data->first) {
+				vec3_copy(&data->tl, &v);
+				vec3_copy(&data->br, &v);
+				data->first = false;
+			} else {
+				vec3_min(&data->tl, &data->tl, &v);
+				vec3_max(&data->br, &data->br, &v);
+			}
+		}
+	};
+
+	if (obs_sceneitem_is_group(item)) {
+		SelectedItemBounds sib;
+		obs_sceneitem_group_enum_items(item, AddItemBounds, &sib);
+
+		if (!sib.first) {
+			matrix4 xform;
+			obs_sceneitem_get_draw_transform(item, &xform);
+
+			vec3_set(&t[0], sib.tl.x, sib.tl.y, 0.0f);
+			vec3_set(&t[1], sib.tl.x, sib.br.y, 0.0f);
+			vec3_set(&t[2], sib.br.x, sib.tl.y, 0.0f);
+			vec3_set(&t[3], sib.br.x, sib.br.y, 0.0f);
+			vec3_transform(&t[0], &t[0], &xform);
+			vec3_transform(&t[1], &t[1], &xform);
+			vec3_transform(&t[2], &t[2], &xform);
+			vec3_transform(&t[3], &t[3], &xform);
+			add_bounds();
+		}
+	}
 	if (!obs_sceneitem_selected(item))
 		return true;
 
 	matrix4 boxTransform;
 	obs_sceneitem_get_box_transform(item, &boxTransform);
 
-	vec3 t[4] = {
-		GetTransformedPos(0.0f, 0.0f, boxTransform),
-		GetTransformedPos(1.0f, 0.0f, boxTransform),
-		GetTransformedPos(0.0f, 1.0f, boxTransform),
-		GetTransformedPos(1.0f, 1.0f, boxTransform)
-	};
-
-	for (const vec3 &v : t) {
-		if (data->first) {
-			vec3_copy(&data->tl, &v);
-			vec3_copy(&data->br, &v);
-			data->first = false;
-		} else {
-			vec3_min(&data->tl, &data->tl, &v);
-			vec3_max(&data->br, &data->br, &v);
-		}
-	}
+	t[0] = GetTransformedPos(0.0f, 0.0f, boxTransform);
+	t[1] = GetTransformedPos(1.0f, 0.0f, boxTransform);
+	t[2] = GetTransformedPos(0.0f, 1.0f, boxTransform);
+	t[3] = GetTransformedPos(1.0f, 1.0f, boxTransform);
+	add_bounds();
 
 	UNUSED_PARAMETER(scene);
 	return true;
@@ -692,9 +764,22 @@
 	if (obs_sceneitem_locked(item))
 		return true;
 
+	bool selected = obs_sceneitem_selected(item);
 	vec2 *offset = reinterpret_cast<vec2*>(param);
 
-	if (obs_sceneitem_selected(item)) {
+	if (obs_sceneitem_is_group(item) && !selected) {
+		matrix4 transform;
+		vec3 new_offset;
+		vec3_set(&new_offset, offset->x, offset->y, 0.0f);
+
+		obs_sceneitem_get_draw_transform(item, &transform);
+		vec4_set(&transform.t, 0.0f, 0.0f, 0.0f, 1.0f);
+		matrix4_inv(&transform, &transform);
+		vec3_transform(&new_offset, &new_offset, &transform);
+		obs_sceneitem_group_enum_items(item, move_items, &new_offset);
+	}
+
+	if (selected) {
 		vec2 pos;
 		obs_sceneitem_get_pos(item, &pos);
 		vec2_add(&pos, &pos, offset);
@@ -856,9 +941,6 @@
 	uint32_t align = obs_sceneitem_get_alignment(stretchItem);
 	vec3 tl, br, pos3;
 
-	if (boundsType != OBS_BOUNDS_NONE) /* TODO */
-		return;
-
 	vec3_zero(&tl);
 	vec3_set(&br, stretchItemSize.x, stretchItemSize.y, 0.0f);
 
@@ -963,7 +1045,8 @@
 
 	obs_sceneitem_defer_update_begin(stretchItem);
 	obs_sceneitem_set_crop(stretchItem, &crop);
-	obs_sceneitem_set_pos(stretchItem, (vec2*)&newPos);
+	if (boundsType == OBS_BOUNDS_NONE)
+		obs_sceneitem_set_pos(stretchItem, (vec2*)&newPos);
 	obs_sceneitem_defer_update_end(stretchItem);
 }
 
@@ -1063,6 +1146,20 @@
 		pos.y = std::round(pos.y);
 
 		if (stretchHandle != ItemHandle::None) {
+			OBSBasic *main = reinterpret_cast<OBSBasic*>(
+					App()->GetMainWindow());
+			OBSScene scene = main->GetCurrentScene();
+			obs_sceneitem_t *group = obs_sceneitem_get_group(
+					scene, stretchItem);
+			if (group) {
+				vec3 group_pos;
+				vec3_set(&group_pos, pos.x, pos.y, 0.0f);
+				vec3_transform(&group_pos, &group_pos,
+						&invGroupTransform);
+				pos.x = group_pos.x;
+				pos.y = group_pos.y;
+			}
+
 			if (cropping)
 				CropItem(pos);
 			else
@@ -1076,15 +1173,17 @@
 	}
 }
 
-static void DrawCircleAtPos(float x, float y, matrix4 &matrix,
-		float previewScale)
+static void DrawCircleAtPos(float x, float y)
 {
 	struct vec3 pos;
 	vec3_set(&pos, x, y, 0.0f);
+
+	struct matrix4 matrix;
+	gs_matrix_get(&matrix);
 	vec3_transform(&pos, &pos, &matrix);
-	vec3_mulf(&pos, &pos, previewScale);
 
 	gs_matrix_push();
+	gs_matrix_identity();
 	gs_matrix_translate(&pos);
 	gs_matrix_scale3f(HANDLE_RADIUS, HANDLE_RADIUS, 1.0f);
 	gs_draw(GS_LINESTRIP, 0, 0);
@@ -1108,6 +1207,16 @@
 	if (!SceneItemHasVideo(item))
 		return true;
 
+	if (obs_sceneitem_is_group(item)) {
+		matrix4 mat;
+		obs_sceneitem_get_draw_transform(item, &mat);
+
+		gs_matrix_push();
+		gs_matrix_mul(&mat);
+		obs_sceneitem_group_enum_items(item, DrawSelectedItem, param);
+		gs_matrix_pop();
+	}
+
 	if (!obs_sceneitem_selected(item))
 		return true;
 
@@ -1142,19 +1251,18 @@
 
 	gs_load_vertexbuffer(main->circle);
 
-	DrawCircleAtPos(0.0f, 0.0f, boxTransform, main->previewScale);
-	DrawCircleAtPos(0.0f, 1.0f, boxTransform, main->previewScale);
-	DrawCircleAtPos(1.0f, 0.0f, boxTransform, main->previewScale);
-	DrawCircleAtPos(1.0f, 1.0f, boxTransform, main->previewScale);
-	DrawCircleAtPos(0.5f, 0.0f, boxTransform, main->previewScale);
-	DrawCircleAtPos(0.0f, 0.5f, boxTransform, main->previewScale);
-	DrawCircleAtPos(0.5f, 1.0f, boxTransform, main->previewScale);
-	DrawCircleAtPos(1.0f, 0.5f, boxTransform, main->previewScale);
-
 	gs_matrix_push();
-	gs_matrix_scale3f(main->previewScale, main->previewScale, 1.0f);
 	gs_matrix_mul(&boxTransform);
 
+	DrawCircleAtPos(0.0f, 0.0f);
+	DrawCircleAtPos(0.0f, 1.0f);
+	DrawCircleAtPos(1.0f, 0.0f);
+	DrawCircleAtPos(1.0f, 1.0f);
+	DrawCircleAtPos(0.5f, 0.0f);
+	DrawCircleAtPos(0.0f, 0.5f);
+	DrawCircleAtPos(0.5f, 1.0f);
+	DrawCircleAtPos(1.0f, 0.5f);
+
 	obs_sceneitem_crop crop;
 	obs_sceneitem_get_crop(item, &crop);
 
@@ -1208,8 +1316,12 @@
 
 	OBSScene scene = main->GetCurrentScene();
 
-	if (scene)
+	if (scene) {
+		gs_matrix_push();
+		gs_matrix_scale3f(main->previewScale, main->previewScale, 1.0f);
 		obs_scene_enum_items(scene, DrawSelectedItem, this);
+		gs_matrix_pop();
+	}
 
 	gs_load_vertexbuffer(nullptr);
 
@@ -1232,4 +1344,4 @@
 	scrollingOffset.x *= newScalingAmountVal / scalingAmount;
 	scrollingOffset.y *= newScalingAmountVal / scalingAmount;
 	scalingAmount = newScalingAmountVal;
-}
\ No newline at end of file
+}

obs-studio-21.1.2.tar.xz/UI/window-basic-preview.hpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-preview.hpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-properties.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-properties.cpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-settings.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-settings.cpp Changed

@@ -318,6 +318,9 @@
 	HookWidget(ui->snapDistance,         DSCROLL_CHANGED,GENERAL_CHANGED);
 	HookWidget(ui->doubleClickSwitch,    CHECK_CHANGED,  GENERAL_CHANGED);
 	HookWidget(ui->studioPortraitLayout, CHECK_CHANGED,  GENERAL_CHANGED);
+	HookWidget(ui->multiviewMouseSwitch, CHECK_CHANGED,  GENERAL_CHANGED);
+	HookWidget(ui->multiviewDrawNames,   CHECK_CHANGED,  GENERAL_CHANGED);
+	HookWidget(ui->multiviewDrawAreas,   CHECK_CHANGED,  GENERAL_CHANGED);
 	HookWidget(ui->multiviewLayout,      COMBO_CHANGED,  GENERAL_CHANGED);
 	HookWidget(ui->outputMode,           COMBO_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->streamType,           COMBO_CHANGED,  STREAM1_CHANGED);
@@ -401,6 +404,7 @@
 	HookWidget(ui->channelSetup,         COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->sampleRate,           COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->meterDecayRate,       COMBO_CHANGED,  AUDIO_CHANGED);
+	HookWidget(ui->peakMeterType,        COMBO_CHANGED,  AUDIO_CHANGED);
 	HookWidget(ui->desktopAudioDevice1,  COMBO_CHANGED,  AUDIO_CHANGED);
 	HookWidget(ui->desktopAudioDevice2,  COMBO_CHANGED,  AUDIO_CHANGED);
 	HookWidget(ui->auxAudioDevice1,      COMBO_CHANGED,  AUDIO_CHANGED);
@@ -426,6 +430,7 @@
 #endif
 #ifdef _WIN32
 	HookWidget(ui->disableAudioDucking,  CHECK_CHANGED,  ADV_CHANGED);
+	HookWidget(ui->browserHWAccel,       CHECK_CHANGED,  ADV_RESTART);
 #endif
 	HookWidget(ui->filenameFormatting,   EDIT_CHANGED,   ADV_CHANGED);
 	HookWidget(ui->overwriteIfExists,    CHECK_CHANGED,  ADV_CHANGED);
@@ -441,6 +446,7 @@
 	HookWidget(ui->bindToIP,             COMBO_CHANGED,  ADV_CHANGED);
 	HookWidget(ui->enableNewSocketLoop,  CHECK_CHANGED,  ADV_CHANGED);
 	HookWidget(ui->enableLowLatencyMode, CHECK_CHANGED,  ADV_CHANGED);
+	HookWidget(ui->disableFocusHotkeys,  CHECK_CHANGED,  ADV_CHANGED);
 
 #if !defined(_WIN32) && !defined(__APPLE__)
 	delete ui->enableAutoUpdates;
@@ -495,6 +501,8 @@
 	delete ui->advancedGeneralGroupBox;
 	delete ui->enableNewSocketLoop;
 	delete ui->enableLowLatencyMode;
+	delete ui->browserHWAccel;
+	delete ui->sourcesGroup;
 #if defined(__APPLE__) || HAVE_PULSEAUDIO
 	delete ui->disableAudioDucking;
 #endif
@@ -507,6 +515,8 @@
 	ui->advancedGeneralGroupBox = nullptr;
 	ui->enableNewSocketLoop = nullptr;
 	ui->enableLowLatencyMode = nullptr;
+	ui->browserHWAccel = nullptr;
+	ui->sourcesGroup = nullptr;
 #if defined(__APPLE__) || HAVE_PULSEAUDIO
 	ui->disableAudioDucking = nullptr;
 #endif
@@ -701,11 +711,17 @@
 	SimpleRecordingQualityChanged();
 
 	UpdateAutomaticReplayBufferCheckboxes();
+
+	App()->EnableInFocusHotkeys(false);
 }
 
 OBSBasicSettings::~OBSBasicSettings()
 {
+	bool disableHotkeysInFocus = config_get_bool(App()->GlobalConfig(),
+			"General", "DisableHotkeysInFocus");
+	delete ui->filenameFormatting->completer();
 	main->EnableOutputs(true);
+	App()->EnableInFocusHotkeys(!disableHotkeysInFocus);
 }
 
 void OBSBasicSettings::SaveCombo(QComboBox *widget, const char *section,
@@ -1092,30 +1108,37 @@
 			"BasicWindow", "StudioPortraitLayout");
 	ui->studioPortraitLayout->setChecked(studioPortraitLayout);
 
+	bool multiviewMouseSwitch = config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "MultiviewMouseSwitch");
+	ui->multiviewMouseSwitch->setChecked(multiviewMouseSwitch);
+
+	bool multiviewDrawNames = config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "MultiviewDrawNames");
+	ui->multiviewDrawNames->setChecked(multiviewDrawNames);
+
+	bool multiviewDrawAreas = config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "MultiviewDrawAreas");
+	ui->multiviewDrawAreas->setChecked(multiviewDrawAreas);
+
 	ui->multiviewLayout->addItem(QTStr(
 			"Basic.Settings.General.MultiviewLayout.Horizontal.Top"),
-			QT_UTF8("horizontaltop"));
+			static_cast<int>(MultiviewLayout::HORIZONTAL_TOP_8_SCENES));
 	ui->multiviewLayout->addItem(QTStr(
 			"Basic.Settings.General.MultiviewLayout.Horizontal.Bottom"),
-			QT_UTF8("horizontalbottom"));
+			static_cast<int>(MultiviewLayout::HORIZONTAL_BOTTOM_8_SCENES));
 	ui->multiviewLayout->addItem(QTStr(
 			"Basic.Settings.General.MultiviewLayout.Vertical.Left"),
-			QT_UTF8("verticalleft"));
+			static_cast<int>(MultiviewLayout::VERTICAL_LEFT_8_SCENES));
 	ui->multiviewLayout->addItem(QTStr(
 			"Basic.Settings.General.MultiviewLayout.Vertical.Right"),
-			QT_UTF8("verticalright"));
-
-	const char *multiviewLayoutText = config_get_string(GetGlobalConfig(),
-			"BasicWindow", "MultiviewLayout");
+			static_cast<int>(MultiviewLayout::VERTICAL_RIGHT_8_SCENES));
+	ui->multiviewLayout->addItem(QTStr(
+			"Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top"),
+			static_cast<int>(MultiviewLayout::HORIZONTAL_TOP_24_SCENES));
 
-	if (astrcmpi(multiviewLayoutText, "horizontalbottom") == 0)
-		ui->multiviewLayout->setCurrentIndex(1);
-	else if (astrcmpi(multiviewLayoutText, "verticalleft") == 0)
-		ui->multiviewLayout->setCurrentIndex(2);
-	else if (astrcmpi(multiviewLayoutText, "verticalright") == 0)
-		ui->multiviewLayout->setCurrentIndex(3);
-	else
-		ui->multiviewLayout->setCurrentIndex(0);
+	ui->multiviewLayout->setCurrentIndex(
+			config_get_int(GetGlobalConfig(), "BasicWindow",
+					"MultiviewLayout"));
 
 	loading = false;
 }
@@ -2124,6 +2147,8 @@
 			"ChannelSetup");
 	double meterDecayRate = config_get_double(main->Config(), "Audio",
 			"MeterDecayRate");
+	uint32_t peakMeterTypeIdx = config_get_uint(main->Config(), "Audio",
+			"PeakMeterType");
 
 	loading = true;
 
@@ -2159,6 +2184,8 @@
 	else
 		ui->meterDecayRate->setCurrentIndex(0);
 
+	ui->peakMeterType->setCurrentIndex(peakMeterTypeIdx);
+
 	LoadAudioDevices();
 	LoadAudioSources();
 
@@ -2273,8 +2300,16 @@
 
 	ui->enableNewSocketLoop->setChecked(enableNewSocketLoop);
 	ui->enableLowLatencyMode->setChecked(enableLowLatencyMode);
+
+	bool browserHWAccel = config_get_bool(App()->GlobalConfig(),
+			"General", "BrowserHWAccel");
+	ui->browserHWAccel->setChecked(browserHWAccel);
 #endif
 
+	bool disableFocusHotkeys = config_get_bool(App()->GlobalConfig(),
+			"General", "DisableHotkeysInFocus");
+	ui->disableFocusHotkeys->setChecked(disableFocusHotkeys);
+
 	loading = false;
 }
 
@@ -2696,13 +2731,37 @@
 		main->ResetUI();
 	}
 
+	bool multiviewChanged = false;
+	if (WidgetChanged(ui->multiviewMouseSwitch)) {
+		config_set_bool(GetGlobalConfig(), "BasicWindow",
+				"MultiviewMouseSwitch",
+				ui->multiviewMouseSwitch->isChecked());
+		multiviewChanged = true;
+	}
+
+	if (WidgetChanged(ui->multiviewDrawNames)) {
+		config_set_bool(GetGlobalConfig(), "BasicWindow",
+				"MultiviewDrawNames",
+				ui->multiviewDrawNames->isChecked());
+		multiviewChanged = true;
+	}
+
+	if (WidgetChanged(ui->multiviewDrawAreas)) {
+		config_set_bool(GetGlobalConfig(), "BasicWindow",
+				"MultiviewDrawAreas",
+				ui->multiviewDrawAreas->isChecked());
+		multiviewChanged = true;
+	}
+
 	if (WidgetChanged(ui->multiviewLayout)) {
-		config_set_string(GetGlobalConfig(), "BasicWindow",
+		config_set_int(GetGlobalConfig(), "BasicWindow",
 				"MultiviewLayout",
-				QT_TO_UTF8(GetComboData(ui->multiviewLayout)));
+				ui->multiviewLayout->currentData().toInt());
+		multiviewChanged = true;
+	}
 
+	if (multiviewChanged)
 		OBSProjector::UpdateMultiviewProjectors();
-	}
 }
 
 void OBSBasicSettings::SaveStream1Settings()
@@ -2782,8 +2841,16 @@
 
 	SaveCheckBox(ui->enableNewSocketLoop, "Output", "NewSocketLoopEnable");
 	SaveCheckBox(ui->enableLowLatencyMode, "Output", "LowLatencyEnable");
+
+	bool browserHWAccel = ui->browserHWAccel->isChecked();
+	config_set_bool(App()->GlobalConfig(), "General",
+			"BrowserHWAccel", browserHWAccel);
 #endif
 
+	bool disableFocusHotkeys = ui->disableFocusHotkeys->isChecked();
+	config_set_bool(App()->GlobalConfig(), "General",
+			"DisableHotkeysInFocus", disableFocusHotkeys);
+
 #ifdef __APPLE__
 	if (WidgetChanged(ui->disableOSXVSync)) {
 		bool disable = ui->disableOSXVSync->isChecked();
@@ -3113,6 +3180,14 @@
 		main->UpdateVolumeControlsDecayRate();
 	}
 
+	if (WidgetChanged(ui->peakMeterType)) {
+		uint32_t peakMeterTypeIdx = ui->peakMeterType->currentIndex();
+		config_set_uint(main->Config(), "Audio", "PeakMeterType",
+				peakMeterTypeIdx);
+
+		main->UpdateVolumeControlsPeakMeterType();
+	}
+
 	for (auto &audioSource : audioSources) {
 		auto source  = OBSGetStrongRef(get<0>(audioSource));
 		if (!source)
@@ -4123,6 +4198,9 @@
 	int vbitrate = (int)obs_data_get_int(settings, "bitrate");
 	const char *rateControl = obs_data_get_string(settings, "rate_control");
 
+	if (!rateControl)
+		rateControl = "";
+
 	bool lossless = strcmp(rateControl, "lossless") == 0 ||
 			ui->advOutRecType->currentIndex() == 1;
 	bool replayBufferEnabled = ui->advReplayBuf->isChecked();
@@ -4148,9 +4226,6 @@
 	if (memMB < 1)
 		memMB = 1;
 
-	if (!rateControl)
-		rateControl = "";
-
 	bool varRateControl = (astrcmpi(rateControl, "CBR") == 0 ||
 	                       astrcmpi(rateControl, "VBR") == 0 ||
 	                       astrcmpi(rateControl, "ABR") == 0);
@@ -4244,12 +4319,6 @@
 				warning += "\n\n";
 			warning += SIMPLE_OUTPUT_WARNING("Encoder");
 		}
-
-		if (streamEnc == enc && enc == SIMPLE_ENCODER_QSV) {
-			if (!warning.isEmpty())
-				warning += "\n\n";
-			warning += SIMPLE_OUTPUT_WARNING("MultipleQSV");
-		}
 	}
 
 	if (ui->simpleOutRecFormat->currentText().compare("mp4") == 0) {

obs-studio-21.1.2.tar.xz/UI/window-basic-source-select.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-source-select.cpp Changed

@@ -38,6 +38,25 @@
 	return true;
 }
 
+bool OBSBasicSourceSelect::EnumGroups(void *data, obs_source_t *source)
+{
+	OBSBasicSourceSelect *window = static_cast<OBSBasicSourceSelect*>(data);
+	const char *name = obs_source_get_name(source);
+	const char *id   = obs_source_get_id(source);
+
+	if (strcmp(id, window->id) == 0) {
+		OBSBasic *main = reinterpret_cast<OBSBasic*>(
+				App()->GetMainWindow());
+		OBSScene scene = main->GetCurrentScene();
+
+		obs_sceneitem_t *existing = obs_scene_get_group(scene, name);
+		if (!existing)
+			window->ui->sourceList->addItem(QT_UTF8(name));
+	}
+
+	return true;
+}
+
 void OBSBasicSourceSelect::OBSSourceAdded(void *data, calldata_t *calldata)
 {
 	OBSBasicSourceSelect *window = static_cast<OBSBasicSourceSelect*>(data);
@@ -277,6 +296,8 @@
 			const char *name = obs_source_get_name(sceneSource);
 			ui->sourceList->addItem(QT_UTF8(name));
 		}
+	} else if (strcmp(id_, "group") == 0) {
+		obs_enum_sources(EnumGroups, this);
 	} else {
 		obs_enum_sources(EnumSources, this);
 	}

obs-studio-21.1.2.tar.xz/UI/window-basic-source-select.hpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-source-select.hpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-stats.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-stats.cpp Changed

obs-studio-21.1.2.tar.xz/UI/window-basic-transform.cpp -> obs-studio-22.0.1.tar.xz/UI/window-basic-transform.cpp Changed

@@ -4,23 +4,28 @@
 
 Q_DECLARE_METATYPE(OBSSceneItem);
 
-static OBSSceneItem FindASelectedItem(OBSScene scene)
+static bool find_sel(obs_scene_t *, obs_sceneitem_t *item, void *param)
 {
-	auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
-	{
-		OBSSceneItem &dst = *reinterpret_cast<OBSSceneItem*>(param);
+	OBSSceneItem &dst = *reinterpret_cast<OBSSceneItem*>(param);
 
-		if (obs_sceneitem_selected(item)) {
-			dst = item;
+	if (obs_sceneitem_selected(item)) {
+		dst = item;
+		return false;
+	}
+	if (obs_sceneitem_is_group(item)) {
+		obs_sceneitem_group_enum_items(item, find_sel, param);
+		if (!!dst) {
 			return false;
 		}
+	}
 
-		UNUSED_PARAMETER(scene);
-		return true;
-	};
+	return true;
+};
 
+static OBSSceneItem FindASelectedItem(OBSScene scene)
+{
 	OBSSceneItem item;
-	obs_scene_enum_items(scene, func, &item);
+	obs_scene_enum_items(scene, find_sel, &item);
 	return item;
 }
 
@@ -63,9 +68,10 @@
 
 	installEventFilter(CreateShortcutFilter());
 
-	OBSScene curScene = main->GetCurrentScene();
-	SetScene(curScene);
-	SetItem(FindASelectedItem(curScene));
+	OBSSceneItem item = FindASelectedItem(main->GetCurrentScene());
+	OBSScene scene = obs_sceneitem_get_scene(item);
+	SetScene(scene);
+	SetItem(item);
 
 	channelChangedSignal.Connect(obs_get_signal_handler(), "channel_change",
 			OBSChannelChanged, this);

obs-studio-21.1.2.tar.xz/UI/window-projector.cpp -> obs-studio-22.0.1.tar.xz/UI/window-projector.cpp Changed

@@ -3,30 +3,51 @@
 #include <QMouseEvent>
 #include <QMenu>
 #include <QScreen>
-#include "window-projector.hpp"
+#include "obs-app.hpp"
+#include "window-basic-main.hpp"
 #include "display-helpers.hpp"
 #include "qt-wrappers.hpp"
 #include "platform.hpp"
 
-#define HORIZONTAL_TOP    0
-#define HORIZONTAL_BOTTOM 1
-#define VERTICAL_LEFT     2
-#define VERTICAL_RIGHT    3
-
+static QList<OBSProjector *> windowedProjectors;
 static QList<OBSProjector *> multiviewProjectors;
-static bool updatingMultiview = false;
-static int multiviewLayout = HORIZONTAL_TOP;
+static bool updatingMultiview = false, drawLabel, drawSafeArea, mouseSwitching,
+		transitionOnDoubleClick;
+static MultiviewLayout multiviewLayout;
+static size_t maxSrcs, numSrcs;
 
-OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, bool window)
+OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
+		QString title, ProjectorType type_)
 	: OBSQTDisplay                 (widget,
 	                                Qt::Window),
 	  source                       (source_),
 	  removedSignal                (obs_source_get_signal_handler(source),
 	                                "remove", OBSSourceRemoved, this)
 {
-	if (!window) {
+	projectorTitle = std::move(title);
+	savedMonitor   = monitor;
+	isWindow       = savedMonitor < 0;
+	type           = type_;
+
+	if (isWindow) {
+		setWindowIcon(QIcon(":/res/images/obs.png"));
+
+		UpdateProjectorTitle(projectorTitle);
+		windowedProjectors.push_back(this);
+
+		resize(480, 270);
+	} else {
 		setWindowFlags(Qt::FramelessWindowHint |
 				Qt::X11BypassWindowManagerHint);
+
+		QScreen *screen = QGuiApplication::screens()[savedMonitor];
+		setGeometry(screen->geometry());
+
+		QAction *action = new QAction(this);
+		action->setShortcut(Qt::Key_Escape);
+		addAction(action);
+		connect(action, SIGNAL(triggered()), this,
+				SLOT(EscapeTriggered()));
 	}
 
 	setAttribute(Qt::WA_DeleteOnClose, true);
@@ -47,16 +68,89 @@
 
 	connect(this, &OBSQTDisplay::DisplayCreated, addDrawCallback);
 
+	bool alwaysOnTop = config_get_bool(GetGlobalConfig(), "BasicWindow",
+			"ProjectorAlwaysOnTop");
+	if (alwaysOnTop && !isWindow)
+		SetAlwaysOnTop(this, true);
+
 	bool hideCursor = config_get_bool(GetGlobalConfig(),
 			"BasicWindow", "HideProjectorCursor");
-	if (hideCursor && !window) {
+	if (hideCursor && !isWindow) {
 		QPixmap empty(16, 16);
 		empty.fill(Qt::transparent);
 		setCursor(QCursor(empty));
 	}
 
+	if (type == ProjectorType::Multiview) {
+		obs_enter_graphics();
+
+		// All essential action should be placed inside this area
+		gs_render_start(true);
+		gs_vertex2f(actionSafePercentage, actionSafePercentage);
+		gs_vertex2f(actionSafePercentage, 1 - actionSafePercentage);
+		gs_vertex2f(1 - actionSafePercentage, 1 - actionSafePercentage);
+		gs_vertex2f(1 - actionSafePercentage, actionSafePercentage);
+		gs_vertex2f(actionSafePercentage, actionSafePercentage);
+		actionSafeMargin = gs_render_save();
+
+		// All graphics should be placed inside this area
+		gs_render_start(true);
+		gs_vertex2f(graphicsSafePercentage, graphicsSafePercentage);
+		gs_vertex2f(graphicsSafePercentage, 1 - graphicsSafePercentage);
+		gs_vertex2f(1 - graphicsSafePercentage,
+				1 - graphicsSafePercentage);
+		gs_vertex2f(1 - graphicsSafePercentage, graphicsSafePercentage);
+		gs_vertex2f(graphicsSafePercentage, graphicsSafePercentage);
+		graphicsSafeMargin = gs_render_save();
+
+		// 4:3 safe area for widescreen
+		gs_render_start(true);
+		gs_vertex2f(fourByThreeSafePercentage, graphicsSafePercentage);
+		gs_vertex2f(1 - fourByThreeSafePercentage,
+				graphicsSafePercentage);
+		gs_vertex2f(1 - fourByThreeSafePercentage, 1 -
+				graphicsSafePercentage);
+		gs_vertex2f(fourByThreeSafePercentage,
+				1 - graphicsSafePercentage);
+		gs_vertex2f(fourByThreeSafePercentage, graphicsSafePercentage);
+		fourByThreeSafeMargin = gs_render_save();
+
+		gs_render_start(true);
+		gs_vertex2f(0.0f, 0.5f);
+		gs_vertex2f(lineLength, 0.5f);
+		leftLine = gs_render_save();
+
+		gs_render_start(true);
+		gs_vertex2f(0.5f, 0.0f);
+		gs_vertex2f(0.5f, lineLength);
+		topLine = gs_render_save();
+
+		gs_render_start(true);
+		gs_vertex2f(1.0f, 0.5f);
+		gs_vertex2f(1 - lineLength, 0.5f);
+		rightLine = gs_render_save();
+		obs_leave_graphics();
+
+		solid = obs_get_base_effect(OBS_EFFECT_SOLID);
+		color = gs_effect_get_param_by_name(solid, "color");
+
+		UpdateMultiview();
+
+		multiviewProjectors.push_back(this);
+	}
+
 	App()->IncrementSleepInhibition();
-	resize(480, 270);
+
+	if (source)
+		obs_source_inc_showing(source);
+
+	ready = true;
+
+	show();
+
+	// We need it here to allow keyboard input in X11 to listen to Escape
+	if (!isWindow)
+		activateWindow();
 }
 
 OBSProjector::~OBSProjector()
@@ -76,10 +170,9 @@
 		}
 
 		obs_enter_graphics();
-		gs_vertexbuffer_destroy(outerBox);
-		gs_vertexbuffer_destroy(innerBox);
-		gs_vertexbuffer_destroy(leftVLine);
-		gs_vertexbuffer_destroy(rightVLine);
+		gs_vertexbuffer_destroy(actionSafeMargin);
+		gs_vertexbuffer_destroy(graphicsSafeMargin);
+		gs_vertexbuffer_destroy(fourByThreeSafeMargin);
 		gs_vertexbuffer_destroy(leftLine);
 		gs_vertexbuffer_destroy(topLine);
 		gs_vertexbuffer_destroy(rightLine);
@@ -89,6 +182,9 @@
 	if (type == ProjectorType::Multiview)
 		multiviewProjectors.removeAll(this);
 
+	if (isWindow)
+		windowedProjectors.removeAll(this);
+
 	App()->DecrementSleepInhibition();
 }
 
@@ -132,92 +228,6 @@
 	return txtSource;
 }
 
-void OBSProjector::Init(int monitor, bool window, QString title,
-		ProjectorType type_)
-{
-	QScreen *screen = QGuiApplication::screens()[monitor];
-
-	if (!window)
-		setGeometry(screen->geometry());
-
-	bool alwaysOnTop = config_get_bool(GetGlobalConfig(),
-			"BasicWindow", "ProjectorAlwaysOnTop");
-	if (alwaysOnTop && !window)
-		SetAlwaysOnTop(this, true);
-
-	if (window)
-		setWindowTitle(title);
-
-	show();
-
-	if (source)
-		obs_source_inc_showing(source);
-
-	if (!window) {
-		QAction *action = new QAction(this);
-		action->setShortcut(Qt::Key_Escape);
-		addAction(action);
-		connect(action, SIGNAL(triggered()), this,
-				SLOT(EscapeTriggered()));
-		activateWindow();
-	}
-
-	savedMonitor = monitor;
-	isWindow     = window;
-	type         = type_;
-
-	if (type == ProjectorType::Multiview) {
-		obs_enter_graphics();
-		gs_render_start(true);
-		gs_vertex2f(0.001f, 0.001f);
-		gs_vertex2f(0.001f, 0.997f);
-		gs_vertex2f(0.997f, 0.997f);
-		gs_vertex2f(0.997f, 0.001f);
-		gs_vertex2f(0.001f, 0.001f);
-		outerBox = gs_render_save();
-
-		gs_render_start(true);
-		gs_vertex2f(0.04f, 0.04f);
-		gs_vertex2f(0.04f, 0.96f);
-		gs_vertex2f(0.96f, 0.96f);
-		gs_vertex2f(0.96f, 0.04f);
-		gs_vertex2f(0.04f, 0.04f);
-		innerBox = gs_render_save();
-
-		gs_render_start(true);
-		gs_vertex2f(0.15f, 0.04f);
-		gs_vertex2f(0.15f, 0.96f);
-		leftVLine = gs_render_save();
-
-		gs_render_start(true);
-		gs_vertex2f(0.85f, 0.04f);
-		gs_vertex2f(0.85f, 0.96f);
-		rightVLine = gs_render_save();
-
-		gs_render_start(true);
-		gs_vertex2f(0.0f, 0.5f);
-		gs_vertex2f(0.075f, 0.5f);
-		leftLine = gs_render_save();
-
-		gs_render_start(true);
-		gs_vertex2f(0.5f, 0.0f);
-		gs_vertex2f(0.5f, 0.09f);
-		topLine = gs_render_save();
-
-		gs_render_start(true);
-		gs_vertex2f(0.925f, 0.5f);
-		gs_vertex2f(1.0f, 0.5f);
-		rightLine = gs_render_save();
-		obs_leave_graphics();
-
-		UpdateMultiview();
-
-		multiviewProjectors.push_back(this);
-	}
-
-	ready = true;
-}
-
 static inline void renderVB(gs_effect_t *effect, gs_vertbuffer_t *vb,
 		int cx, int cy)
 {
@@ -243,10 +253,36 @@
 static inline uint32_t labelOffset(obs_source_t *label, uint32_t cx)
 {
 	uint32_t w = obs_source_get_width(label);
-	w = uint32_t(float(w) * 0.5f);
+
+	int n; // Number of scenes per row
+	switch (multiviewLayout) {
+	case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
+		n = 6;
+		break;
+	default:
+		n = 4;
+		break;
+	}
+
+	w = uint32_t(w * ((1.0f) / n));
 	return (cx / 2) - w;
 }
 
+static inline void startRegion(int vX, int vY, int vCX, int vCY, float oL,
+		float oR, float oT, float oB)
+{
+	gs_projection_push();
+	gs_viewport_push();
+	gs_set_viewport(vX, vY, vCX, vCY);
+	gs_ortho(oL, oR, oT, oB, -100.0f, 100.0f);
+}
+
+static inline void endRegion()
+{
+	gs_viewport_pop();
+	gs_projection_pop();
+}
+
 void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
 {
 	OBSProjector *window = (OBSProjector *)data;
@@ -257,327 +293,342 @@
 	OBSBasic     *main   = (OBSBasic *)obs_frontend_get_main_window();
 	uint32_t     targetCX, targetCY;
 	int          x, y;
-	float        fX, fY, halfCX, halfCY, sourceX, sourceY, labelX, labelY,
-		     quarterCX, quarterCY, scale, targetCXF, targetCYF,
-		     hiCX, hiCY, qiX, qiY, qiCX, qiCY, hiScaleX, hiScaleY,
-		     qiScaleX, qiScaleY;
-	uint32_t     offset;
+	float        scale;
 
-	gs_effect_t  *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
-	gs_eparam_t  *color = gs_effect_get_param_by_name(solid, "color");
-
-	struct obs_video_info ovi;
-	obs_get_video_info(&ovi);
-	targetCX = ovi.base_width;
-	targetCY = ovi.base_height;
+	targetCX = (uint32_t)window->fw;
+	targetCY = (uint32_t)window->fh;
 
 	GetScaleAndCenterPos(targetCX, targetCY, cx, cy, x, y, scale);
 
-	targetCXF = float(targetCX);
-	targetCYF = float(targetCY);
-	fX        = float(x);
-	fY        = float(y);
-
-	halfCX    = (targetCXF + 1) / 2;
-	halfCY    = (targetCYF + 1) / 2;
-	hiCX      = (halfCX - 4.0);
-	hiCY      = (halfCY - 4.0);
-	hiScaleX  = hiCX / targetCXF;
-	hiScaleY  = hiCY / targetCYF;
-
-	quarterCX = (halfCX + 1) / 2;
-	quarterCY = (halfCY + 1) / 2;
-	qiCX      = (quarterCX - 8.0);
-	qiCY      = (quarterCY - 8.0);
-	qiScaleX  = qiCX / targetCXF;
-	qiScaleY  = qiCY / targetCYF;
-
 	OBSSource previewSrc = main->GetCurrentSceneSource();
 	OBSSource programSrc = main->GetProgramSource();
-
 	bool studioMode = main->IsPreviewProgramMode();
 
-	auto drawBox = [solid, color] (float cx, float cy,
+	auto renderVB = [&](gs_vertbuffer_t *vb, int cx, int cy,
 			uint32_t colorVal)
 	{
-		gs_effect_set_color(color, colorVal);
-		while (gs_effect_loop(solid, "Solid"))
+		if (!vb)
+			return;
+
+		matrix4 transform;
+		matrix4_identity(&transform);
+		transform.x.x = cx;
+		transform.y.y = cy;
+
+		gs_load_vertexbuffer(vb);
+
+		gs_matrix_push();
+		gs_matrix_mul(&transform);
+
+		gs_effect_set_color(window->color, colorVal);
+		while (gs_effect_loop(window->solid, "Solid"))
+			gs_draw(GS_LINESTRIP, 0, 0);
+
+		gs_matrix_pop();
+	};
+
+	auto drawBox = [&](float cx, float cy, uint32_t colorVal)
+	{
+		gs_effect_set_color(window->color, colorVal);
+		while (gs_effect_loop(window->solid, "Solid"))
 			gs_draw_sprite(nullptr, 0, (uint32_t)cx, (uint32_t)cy);
 	};
 
-	auto setRegion = [fX, fY, scale] (float x, float y, float cx, float cy)
+	auto setRegion = [&](float bx, float by, float cx,
+			float cy)
 	{
-		float vX  = int(fX + x * scale);
-		float vY  = int(fY + y * scale);
+		float vX  = int(x + bx * scale);
+		float vY  = int(y + by * scale);
 		float vCX = int(cx * scale);
 		float vCY = int(cy * scale);
 
-		float oL = x;
-		float oT = y;
-		float oR = (x + cx);
-		float oB = (y + cy);
-
-		gs_projection_push();
-		gs_viewport_push();
-		gs_set_viewport(vX, vY, vCX, vCY);
-		gs_ortho(oL, oR, oT, oB, -100.0f, 100.0f);
-	};
+		float oL = bx;
+		float oT = by;
+		float oR = (bx + cx);
+		float oB = (by + cy);
 
-	auto resetRegion = [] ()
-	{
-		gs_viewport_pop();
-		gs_projection_pop();
+		startRegion(vX, vY, vCX, vCY, oL, oR, oT, oB);
 	};
 
 	auto calcBaseSource = [&](size_t i)
 	{
 		switch (multiviewLayout) {
-		case VERTICAL_LEFT:
-			sourceX = halfCX;
-			sourceY = (i / 2 ) * quarterCY;
+		case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
+			window->sourceX = (i % 6) * window->scenesCX;
+			window->sourceY = window->pvwprgCY +
+					(i / 6) * window->scenesCY;
+			break;
+		case MultiviewLayout::VERTICAL_LEFT_8_SCENES:
+			window->sourceX = window->pvwprgCX;
+			window->sourceY = (i / 2 ) * window->scenesCY;
 			if (i % 2 != 0)
-				sourceX = halfCX + quarterCX;
+				window->sourceX += window->scenesCX;
 			break;
-		case VERTICAL_RIGHT:
-			sourceX = 0;
-			sourceY = (i / 2 ) * quarterCY;
+		case MultiviewLayout::VERTICAL_RIGHT_8_SCENES:
+			window->sourceX = 0;
+			window->sourceY = (i / 2 ) * window->scenesCY;
 			if (i % 2 != 0)
-				sourceX = quarterCX;
+				window->sourceX = window->scenesCX;
 			break;
-		case HORIZONTAL_BOTTOM:
+		case MultiviewLayout::HORIZONTAL_BOTTOM_8_SCENES:
 			if (i < 4) {
-				sourceX = (float(i) * quarterCX);
-				sourceY = 0;
+				window->sourceX = (float(i) * window->scenesCX);
+				window->sourceY = 0;
 			} else {
-				sourceX = (float(i - 4) * quarterCX);
-				sourceY = quarterCY;
+				window->sourceX = (float(i - 4) *
+						window->scenesCX);
+				window->sourceY = window->scenesCY;
 			}
 			break;
-		default: //HORIZONTAL_TOP:
+		default: // MultiviewLayout::HORIZONTAL_TOP_8_SCENES:
 			if (i < 4) {
-				sourceX = (float(i) * quarterCX);
-				sourceY = halfCY;
+				window->sourceX = (float(i) * window->scenesCX);
+				window->sourceY = window->pvwprgCY;
 			} else {
-				sourceX = (float(i - 4) * quarterCX);
-				sourceY = halfCY + quarterCY;
+				window->sourceX = (float(i - 4) *
+						window->scenesCX);
+				window->sourceY = window->pvwprgCY +
+						window->scenesCY;
 			}
 		}
+		window->siX = window->sourceX + window->thickness;
+		window->siY = window->sourceY + window->thickness;
 	};
 
 	auto calcPreviewProgram = [&](bool program)
 	{
 		switch (multiviewLayout) {
-		case VERTICAL_LEFT:
-			sourceX = 2.0f;
-			sourceY = halfCY + 2.0f;
-			labelX = offset;
-			labelY = halfCY * 1.8f;
+		case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
+			window->sourceX = window->thickness +
+					window->pvwprgCX / 2;
+			window->sourceY = window->thickness;
+			window->labelX = window->offset + window->pvwprgCX / 2;
+			window->labelY = window->pvwprgCY * 0.85f;
+			if (program) {
+				window->sourceX += window->pvwprgCX;
+				window->labelX += window->pvwprgCX;
+			}
+			break;
+		case MultiviewLayout::VERTICAL_LEFT_8_SCENES:
+			window->sourceX = window->thickness;
+			window->sourceY = window->pvwprgCY + window->thickness;
+			window->labelX = window->offset;
+			window->labelY = window->pvwprgCY * 1.85f;
 			if (program) {
-				sourceY = 2.0f;
-				labelY = halfCY * 0.8f;
+				window->sourceY = window->thickness;
+				window->labelY = window->pvwprgCY * 0.85f;
 			}
 			break;
-		case VERTICAL_RIGHT:
-			sourceX = halfCX + 2.0f;
-			sourceY = halfCY + 2.0f;
-			labelX = halfCX + offset;
-			labelY = halfCY * 1.8f;
+		case MultiviewLayout::VERTICAL_RIGHT_8_SCENES:
+			window->sourceX = window->pvwprgCX + window->thickness;
+			window->sourceY = window->pvwprgCY + window->thickness;
+			window->labelX = window->pvwprgCX + window->offset;
+			window->labelY = window->pvwprgCY * 1.85f;
 			if (program) {
-				sourceY = 2.0f;
-				labelY = halfCY * 0.8f;
+				window->sourceY = window->thickness;
+				window->labelY = window->pvwprgCY * 0.85f;
 			}
 			break;
-		case HORIZONTAL_BOTTOM:
-			sourceX = 2.0f;
-			sourceY = halfCY + 2.0f;
-			labelX = offset;
-			labelY = halfCY * 1.8f;
+		case MultiviewLayout::HORIZONTAL_BOTTOM_8_SCENES:
+			window->sourceX = window->thickness;
+			window->sourceY = window->pvwprgCY + window->thickness;
+			window->labelX = window->offset;
+			window->labelY = window->pvwprgCY * 1.85f;
 			if (program) {
-				sourceX = halfCX + 2.0f;
-				labelX = halfCX + offset;
+				window->sourceX += window->pvwprgCX;
+				window->labelX += window->pvwprgCX;
 			}
 			break;
-		default: //HORIZONTAL_TOP:
-			sourceX = 2.0f;
-			sourceY = 2.0f;
-			labelX = offset;
-			labelY = halfCY * 0.8f;
+		default: // MultiviewLayout::HORIZONTAL_TOP_8_SCENES:
+			window->sourceX = window->thickness;
+			window->sourceY = window->thickness;
+			window->labelX = window->offset;
+			window->labelY = window->pvwprgCY * 0.85f;
 			if (program) {
-				sourceX = halfCX + 2.0f;
-				labelX = halfCX + offset;
+				window->sourceX += window->pvwprgCX;
+				window->labelX += window->pvwprgCX;
 			}
 		}
 	};
 
-	/* ----------------------------- */
-	/* draw sources                  */
+	auto paintAreaWithColor = [&](float tx, float ty, float cx, float cy,
+			uint32_t color)
+	{
+		gs_matrix_push();
+		gs_matrix_translate3f(tx, ty, 0.0f);
+		drawBox(cx, cy, color);
+		gs_matrix_pop();
+	};
 
-	gs_projection_push();
-	gs_viewport_push();
-	gs_set_viewport(x, y, targetCX * scale, targetCY * scale);
-	gs_ortho(0.0f, targetCXF, 0.0f, targetCYF, -100.0f, 100.0f);
+	// Define the whole usable region for the multiview
+	startRegion(x, y, targetCX * scale, targetCY * scale, 0.0f, window->fw,
+			0.0f, window->fh);
 
-	for (size_t i = 0; i < 8; i++) {
-		OBSSource src = OBSGetStrongRef(window->multiviewScenes[i]);
-		obs_source *label = window->multiviewLabels[i + 2];
+	// Change the background color to highlight all sources
+	drawBox(window->fw, window->fh, outerColor);
 
-		if (!src)
-			continue;
-		if (!label)
-			continue;
+	/* ----------------------------- */
+	/* draw sources                  */
 
+	for (size_t i = 0; i < maxSrcs; i++) {
+		// Handle all the offsets
 		calcBaseSource(i);
 
-		qiX = sourceX + 4.0f;
-		qiY = sourceY + 4.0f;
-
-		/* ----------- */
+		if (i >= numSrcs) {
+			// Just paint the background and continue
+			paintAreaWithColor(window->sourceX, window->sourceY,
+					window->scenesCX, window->scenesCY,
+					outerColor);
+			paintAreaWithColor(window->siX, window->siY,
+					window->siCX, window->siCY,
+					backgroundColor);
+			continue;
+		}
 
-		if (src == previewSrc || src == programSrc) {
-			uint32_t colorVal = src == programSrc
-				? 0xFFFF0000
-				: 0xFF00FF00;
+		OBSSource src = OBSGetStrongRef(window->multiviewScenes[i]);
 
-			gs_matrix_push();
-			gs_matrix_translate3f(sourceX, sourceY, 0.0f);
-			drawBox(quarterCX, quarterCY, colorVal);
-			gs_matrix_pop();
+		// We have a source. Now chose the proper highlight color
+		uint32_t colorVal = outerColor;
+		if (src == programSrc)
+			colorVal = programColor;
+		else if (src == previewSrc)
+			colorVal = studioMode ? previewColor : programColor;
 
-			gs_matrix_push();
-			gs_matrix_translate3f(qiX, qiY, 0.0f);
-			drawBox(qiCX, qiCY, 0xFF000000);
-			gs_matrix_pop();
-		}
+		// Paint the background
+		paintAreaWithColor(window->sourceX, window->sourceY,
+				window->scenesCX, window->scenesCY, colorVal);
+		paintAreaWithColor(window->siX, window->siY, window->siCX,
+				window->siCY, backgroundColor);
 
 		/* ----------- */
 
+		// Render the source
 		gs_matrix_push();
-		gs_matrix_translate3f(qiX, qiY, 0.0f);
-		gs_matrix_scale3f(qiScaleX, qiScaleY, 1.0f);
-
-		setRegion(qiX, qiY, qiCX, qiCY);
+		gs_matrix_translate3f(window->siX, window->siY, 0.0f);
+		gs_matrix_scale3f(window->siScaleX, window->siScaleY, 1.0f);
+		setRegion(window->siX, window->siY, window->siCX, window->siCY);
 		obs_source_video_render(src);
-		resetRegion();
-
-		gs_effect_set_color(color, 0xFFFFFFFF);
-		renderVB(solid, window->outerBox, targetCX, targetCY);
-
+		endRegion();
 		gs_matrix_pop();
 
 		/* ----------- */
 
-		offset = labelOffset(label, quarterCX);
-		cx = obs_source_get_width(label);
-		cy = obs_source_get_height(label);
+		// Render the label
+		if (!drawLabel)
+			continue;
 
-		gs_matrix_push();
-		gs_matrix_translate3f(sourceX + offset,
-				(quarterCY * 0.8f) + sourceY, 0.0f);
+		obs_source *label = window->multiviewLabels[i + 2];
+		if (!label)
+			continue;
 
-		drawBox(cx, cy + int(quarterCX * 0.015f), 0xD91F1F1F);
-		obs_source_video_render(label);
+		window->offset = labelOffset(label, window->scenesCX);
 
+		gs_matrix_push();
+		gs_matrix_translate3f(window->sourceX + window->offset,
+				(window->scenesCY * 0.85f) + window->sourceY,
+				0.0f);
+		gs_matrix_scale3f(window->ppiScaleX, window->ppiScaleY, 1.0f);
+		drawBox(obs_source_get_width(label),
+				obs_source_get_height(label) +
+				int(window->sourceY * 0.015f), labelColor);
+		obs_source_video_render(label);
 		gs_matrix_pop();
 	}
 
-	gs_effect_set_color(color, 0xFFFFFFFF);
-
 	/* ----------------------------- */
 	/* draw preview                  */
 
 	obs_source_t *previewLabel = window->multiviewLabels[0];
-	offset = labelOffset(previewLabel, halfCX);
+	window->offset = labelOffset(previewLabel, window->pvwprgCX);
 	calcPreviewProgram(false);
 
-	gs_matrix_push();
-	gs_matrix_translate3f(sourceX, sourceY, 0.0f);
-	gs_matrix_scale3f(hiScaleX, hiScaleY, 1.0f);
-
-	setRegion(sourceX, sourceY, hiCX, hiCY);
+	// Paint the background
+	paintAreaWithColor(window->sourceX, window->sourceY, window->ppiCX,
+			window->ppiCY, backgroundColor);
 
-	if (studioMode) {
+	// Scale and Draw the preview
+	gs_matrix_push();
+	gs_matrix_translate3f(window->sourceX, window->sourceY, 0.0f);
+	gs_matrix_scale3f(window->ppiScaleX, window->ppiScaleY, 1.0f);
+	setRegion(window->sourceX, window->sourceY, window->ppiCX,
+			window->ppiCY);
+	if (studioMode)
 		obs_source_video_render(previewSrc);
-	} else {
+	else
 		obs_render_main_texture();
+	if (drawSafeArea) {
+		renderVB(window->actionSafeMargin, targetCX, targetCY,
+				outerColor);
+		renderVB(window->graphicsSafeMargin, targetCX, targetCY,
+				outerColor);
+		renderVB(window->fourByThreeSafeMargin, targetCX, targetCY,
+				outerColor);
+		renderVB(window->leftLine, targetCX, targetCY, outerColor);
+		renderVB(window->topLine, targetCX, targetCY, outerColor);
+		renderVB(window->rightLine, targetCX, targetCY, outerColor);
 	}
-
-	resetRegion();
-
-	gs_matrix_pop();
-
-	/* ----------- */
-
-	gs_matrix_push();
-	gs_matrix_translate3f(sourceX, sourceY, 0.0f);
-	gs_matrix_scale3f(hiScaleX, hiScaleY, 1.0f);
-
-	renderVB(solid, window->outerBox, targetCX, targetCY);
-	renderVB(solid, window->innerBox, targetCX, targetCY);
-	renderVB(solid, window->leftVLine, targetCX, targetCY);
-	renderVB(solid, window->rightVLine, targetCX, targetCY);
-	renderVB(solid, window->leftLine, targetCX, targetCY);
-	renderVB(solid, window->topLine, targetCX, targetCY);
-	renderVB(solid, window->rightLine, targetCX, targetCY);
-
+	endRegion();
 	gs_matrix_pop();
 
 	/* ----------- */
 
-	cx = obs_source_get_width(previewLabel);
-	cy = obs_source_get_height(previewLabel);
-
-	gs_matrix_push();
-	gs_matrix_translate3f(labelX, labelY, 0.0f);
-
-	drawBox(cx, cy + int(halfCX * 0.015f), 0xD91F1F1F);
-	obs_source_video_render(previewLabel);
-
-	gs_matrix_pop();
+	// Draw the Label
+	if (drawLabel) {
+		gs_matrix_push();
+		gs_matrix_translate3f(window->labelX, window->labelY, 0.0f);
+		gs_matrix_scale3f(window->ppiScaleX, window->ppiScaleY, 1.0f);
+		drawBox(obs_source_get_width(previewLabel),
+				obs_source_get_height(previewLabel) +
+				int(window->pvwprgCX * 0.015f), labelColor);
+		obs_source_video_render(previewLabel);
+		gs_matrix_pop();
+	}
 
 	/* ----------------------------- */
 	/* draw program                  */
 
 	obs_source_t *programLabel = window->multiviewLabels[1];
-	offset = labelOffset(programLabel, halfCX);
+	window->offset = labelOffset(programLabel, window->pvwprgCX);
 	calcPreviewProgram(true);
 
+	// Scale and Draw the program
 	gs_matrix_push();
-	gs_matrix_translate3f(sourceX, sourceY, 0.0f);
-	gs_matrix_scale3f(hiScaleX, hiScaleY, 1.0f);
-
-	setRegion(sourceX, sourceY, hiCX, hiCY);
+	gs_matrix_translate3f(window->sourceX, window->sourceY, 0.0f);
+	gs_matrix_scale3f(window->ppiScaleX, window->ppiScaleY, 1.0f);
+	setRegion(window->sourceX, window->sourceY, window->ppiCX,
+			window->ppiCY);
 	obs_render_main_texture();
-	resetRegion();
-
+	endRegion();
 	gs_matrix_pop();
 
 	/* ----------- */
 
-	gs_matrix_push();
-	gs_matrix_translate3f(sourceX, sourceY, 0.0f);
-	gs_matrix_scale3f(hiScaleX, hiScaleY, 1.0f);
-
-	renderVB(solid, window->outerBox, targetCX, targetCY);
-
-	gs_matrix_pop();
-
-	/* ----------- */
-
-	cx = obs_source_get_width(programLabel);
-	cy = obs_source_get_height(programLabel);
-
-	gs_matrix_push();
-	gs_matrix_translate3f(labelX, labelY, 0.0f);
-
-	drawBox(cx, cy + int(halfCX * 0.015f), 0xD91F1F1F);
-	obs_source_video_render(programLabel);
-
-	gs_matrix_pop();
+	// Draw the Label
+	if (drawLabel) {
+		gs_matrix_push();
+		gs_matrix_translate3f(window->labelX, window->labelY, 0.0f);
+		gs_matrix_scale3f(window->ppiScaleX, window->ppiScaleY, 1.0f);
+		drawBox(obs_source_get_width(programLabel),
+				obs_source_get_height(programLabel) +
+				int(window->pvwprgCX * 0.015f), labelColor);
+		obs_source_video_render(programLabel);
+		gs_matrix_pop();
+	}
 
-	/* ----------------------------- */
+	// Region for future usage with aditional info.
+	if (multiviewLayout == MultiviewLayout::HORIZONTAL_TOP_24_SCENES) {
+		// Just paint the background for now
+		paintAreaWithColor(window->thickness, window->thickness,
+				window->siCX, window->siCY * 2 +
+				window->thicknessx2, backgroundColor);
+		paintAreaWithColor(window->thickness + 2.5 * (
+				window->thicknessx2 + window->ppiCX),
+				window->thickness, window->siCX,
+				window->siCY * 2 + window->thicknessx2,
+				backgroundColor);
+	}
 
-	gs_viewport_pop();
-	gs_projection_pop();
+	endRegion();
 }
 
 void OBSProjector::OBSRender(void *data, uint32_t cx, uint32_t cy)
@@ -588,6 +639,7 @@
 		return;
 
 	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
+	OBSSource source = window->source;
 
 	uint32_t targetCX;
 	uint32_t targetCY;
@@ -595,9 +647,9 @@
 	int      newCX, newCY;
 	float    scale;
 
-	if (window->source) {
-		targetCX = std::max(obs_source_get_width(window->source), 1u);
-		targetCY = std::max(obs_source_get_height(window->source), 1u);
+	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);
@@ -610,32 +662,26 @@
 	newCX = int(scale * float(targetCX));
 	newCY = int(scale * float(targetCY));
 
-	gs_viewport_push();
-	gs_projection_push();
-	gs_ortho(0.0f, float(targetCX), 0.0f, float(targetCY), -100.0f, 100.0f);
-	gs_set_viewport(x, y, newCX, newCY);
-
-	OBSSource source = window->source;
+	startRegion(x, y, newCX, newCY, 0.0f, float(targetCX), 0.0f,
+			float(targetCY));
 
 	if (window->type == ProjectorType::Preview &&
 	    main->IsPreviewProgramMode()) {
 		OBSSource curSource = main->GetCurrentSceneSource();
 
-		if (window->source != curSource) {
-			obs_source_dec_showing(window->source);
+		if (source != curSource) {
+			obs_source_dec_showing(source);
 			obs_source_inc_showing(curSource);
 			source = curSource;
 		}
 	}
 
-	if (source) {
+	if (source)
 		obs_source_video_render(source);
-	} else {
+	else
 		obs_render_main_texture();
-	}
 
-	gs_projection_pop();
-	gs_viewport_pop();
+	endRegion();
 }
 
 void OBSProjector::OBSSourceRemoved(void *data, calldata_t *params)
@@ -647,12 +693,8 @@
 	UNUSED_PARAMETER(params);
 }
 
-static int getSourceByPosition(int x, int y)
+static int getSourceByPosition(int x, int y, float ratio)
 {
-	struct obs_video_info ovi;
-	obs_get_video_info(&ovi);
-	float ratio = float(ovi.base_width) / float(ovi.base_height);
-
 	QWidget *rec  = QApplication::activeWindow();
 	int     cx    = rec->width();
 	int     cy    = rec->height();
@@ -660,22 +702,39 @@
 	int     minY  = 0;
 	int     maxX  = cx;
 	int     maxY  = cy;
-	int     halfX = cx / 2;
-	int     halfY = cy / 2;
 	int     pos   = -1;
 
 	switch (multiviewLayout) {
-	case VERTICAL_LEFT:
+	case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
 		if (float(cx) / float(cy) > ratio) {
 			int validX = cy * ratio;
-			maxX = halfX + (validX / 2);
+			minX = (cx / 2) - (validX / 2);
+			maxX = (cx / 2) + (validX / 2);
+			minY = cy / 3;
 		} else {
 			int validY = cx / ratio;
-			minY = halfY - (validY / 2);
-			maxY = halfY + (validY / 2);
+			maxY = (cy / 2) + (validY / 2);
+			minY = (cy / 2) - (validY / 6);
 		}
 
-		minX = halfX;
+		if (x < minX || x > maxX || y < minY || y > maxY)
+			break;
+
+		pos = (x - minX) / ((maxX - minX) / 6);
+		pos += ((y - minY) / ((maxY - minY) / 4)) * 6;
+
+		break;
+	case MultiviewLayout::VERTICAL_LEFT_8_SCENES:
+		if (float(cx) / float(cy) > ratio) {
+			int validX = cy * ratio;
+			maxX = (cx / 2) + (validX / 2);
+		} else {
+			int validY = cx / ratio;
+			minY = (cy / 2) - (validY / 2);
+			maxY = (cy / 2) + (validY / 2);
+		}
+
+		minX = cx / 2;
 
 		if (x < minX || x > maxX || y < minY || y > maxY)
 			break;
@@ -684,17 +743,17 @@
 		if (x > minX + ((maxX - minX) / 2))
 			pos++;
 		break;
-	case VERTICAL_RIGHT:
+	case MultiviewLayout::VERTICAL_RIGHT_8_SCENES:
 		if (float(cx) / float(cy) > ratio) {
 			int validX = cy * ratio;
-			minX = halfX - (validX / 2);
+			minX = (cx / 2) - (validX / 2);
 		} else {
 			int validY = cx / ratio;
-			minY = halfY - (validY / 2);
-			maxY = halfY + (validY / 2);
+			minY = (cy / 2) - (validY / 2);
+			maxY = (cy / 2) + (validY / 2);
 		}
 
-		maxX = halfX;
+		maxX = (cx / 2);
 
 		if (x < minX || x > maxX || y < minY || y > maxY)
 			break;
@@ -703,17 +762,17 @@
 		if (x > minX + ((maxX - minX) / 2))
 			pos++;
 		break;
-	case HORIZONTAL_BOTTOM:
+	case MultiviewLayout::HORIZONTAL_BOTTOM_8_SCENES:
 		if (float(cx) / float(cy) > ratio) {
 			int validX = cy * ratio;
-			minX = halfX - (validX / 2);
-			maxX = halfX + (validX / 2);
+			minX = (cx / 2) - (validX / 2);
+			maxX = (cx / 2) + (validX / 2);
 		} else {
 			int validY = cx / ratio;
-			minY = halfY - (validY / 2);
+			minY = (cy / 2) - (validY / 2);
 		}
 
-		maxY = halfY;
+		maxY = (cy / 2);
 
 		if (x < minX || x > maxX || y < minY || y > maxY)
 			break;
@@ -722,17 +781,17 @@
 		if (y > minY + ((maxY - minY) / 2))
 			pos += 4;
 		break;
-	default: // HORIZONTAL_TOP
+	default: // MultiviewLayout::HORIZONTAL_TOP_8_SCENES
 		if (float(cx) / float(cy) > ratio) {
 			int validX = cy * ratio;
-			minX = halfX - (validX / 2);
-			maxX = halfX + (validX / 2);
+			minX = (cx / 2) - (validX / 2);
+			maxX = (cx / 2) + (validX / 2);
 		} else {
 			int validY = cx / ratio;
-			maxY = halfY + (validY / 2);
+			maxY = (cy / 2) + (validY / 2);
 		}
 
-		minY = halfY;
+		minY = (cy / 2);
 
 		if (x < minX || x > maxX || y < minY || y > maxY)
 			break;
@@ -749,8 +808,10 @@
 {
 	OBSQTDisplay::mouseDoubleClickEvent(event);
 
-	if (!config_get_bool(GetGlobalConfig(), "BasicWindow",
-			"TransitionOnDoubleClick"))
+	if (!mouseSwitching)
+		return;
+
+	if (!transitionOnDoubleClick)
 		return;
 
 	OBSBasic *main = (OBSBasic*)obs_frontend_get_main_window();
@@ -758,8 +819,8 @@
 		return;
 
 	if (event->button() == Qt::LeftButton) {
-		int pos = getSourceByPosition(event->x(), event->y());
-		if (pos < 0)
+		int pos = getSourceByPosition(event->x(), event->y(), ratio);
+		if (pos < 0 || pos >= (int)numSrcs)
 			return;
 		OBSSource src = OBSGetStrongRef(multiviewScenes[pos]);
 		if (!src)
@@ -780,9 +841,12 @@
 		popup.exec(QCursor::pos());
 	}
 
+	if (!mouseSwitching)
+		return;
+
 	if (event->button() == Qt::LeftButton) {
-		int pos = getSourceByPosition(event->x(), event->y());
-		if (pos < 0)
+		int pos = getSourceByPosition(event->x(), event->y(), ratio);
+		if (pos < 0 || pos >= (int)numSrcs)
 			return;
 		OBSSource src = OBSGetStrongRef(multiviewScenes[pos]);
 		if (!src)
@@ -796,36 +860,76 @@
 
 void OBSProjector::EscapeTriggered()
 {
-	if (!isWindow) {
-		OBSBasic *main = (OBSBasic*)obs_frontend_get_main_window();
-		main->RemoveSavedProjectors(savedMonitor);
-	}
-
 	deleteLater();
 }
 
 void OBSProjector::UpdateMultiview()
 {
-	for (OBSWeakSource &val : multiviewScenes)
-		val = nullptr;
-	for (OBSSource &val : multiviewLabels)
-		val = nullptr;
+	multiviewScenes.clear();
+	multiviewLabels.clear();
 
 	struct obs_video_info ovi;
 	obs_get_video_info(&ovi);
 
-	uint32_t h = ovi.base_height;
+	uint32_t w  = ovi.base_width;
+	uint32_t h  = ovi.base_height;
+	fw        = float(w);
+	fh        = float(h);
+	ratio     = fw / fh;
 
 	struct obs_frontend_source_list scenes = {};
 	obs_frontend_get_scenes(&scenes);
 
-	int curIdx = 0;
+	multiviewLabels.emplace_back(CreateLabel(Str("StudioMode.Preview"),
+			h / 2));
+	multiviewLabels.emplace_back(CreateLabel(Str("StudioMode.Program"),
+			h / 2));
+
+	multiviewLayout = static_cast<MultiviewLayout>(config_get_int(
+			GetGlobalConfig(), "BasicWindow", "MultiviewLayout"));
+
+	drawLabel = config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "MultiviewDrawNames");
+
+	drawSafeArea = config_get_bool(GetGlobalConfig(), "BasicWindow",
+			"MultiviewDrawAreas");
+
+	mouseSwitching = config_get_bool(GetGlobalConfig(), "BasicWindow",
+			"MultiviewMouseSwitch");
 
-	multiviewLabels[0] = CreateLabel(Str("StudioMode.Preview"), h / 2);
-	multiviewLabels[1] = CreateLabel(Str("StudioMode.Program"), h / 2);
+	transitionOnDoubleClick = config_get_bool(GetGlobalConfig(),
+			"BasicWindow", "TransitionOnDoubleClick");
 
-	for (size_t i = 0; i < scenes.sources.num && curIdx < 8; i++) {
-		obs_source_t *src = scenes.sources.array[i];
+	switch(multiviewLayout) {
+	case MultiviewLayout::HORIZONTAL_TOP_24_SCENES:
+		pvwprgCX   = fw / 3;
+		pvwprgCY   = fh / 3;
+
+		maxSrcs = 24;
+		break;
+	default:
+		pvwprgCX   = fw / 2;
+		pvwprgCY   = fh / 2;
+
+		maxSrcs = 8;
+	}
+
+	ppiCX     = pvwprgCX - thicknessx2;
+	ppiCY     = pvwprgCY - thicknessx2;
+	ppiScaleX = (pvwprgCX - thicknessx2) / fw;
+	ppiScaleY = (pvwprgCY - thicknessx2) / fh;
+
+	scenesCX = pvwprgCX / 2;
+	scenesCY = pvwprgCY / 2;
+	siCX      = scenesCX - thicknessx2;
+	siCY      = scenesCY - thicknessx2;
+	siScaleX  = (scenesCX - thicknessx2) / fw;
+	siScaleY  = (scenesCY - thicknessx2) / fh;
+
+	numSrcs = 0;
+	size_t i = 0;
+	while (i < scenes.sources.num && numSrcs < maxSrcs) {
+		obs_source_t *src = scenes.sources.array[i++];
 		OBSData data = obs_source_get_private_settings(src);
 		obs_data_release(data);
 
@@ -833,32 +937,53 @@
 		if (!obs_data_get_bool(data, "show_in_multiview"))
 			continue;
 
-		multiviewScenes[curIdx] = OBSGetWeakRef(src);
+		// We have a displayable source.
+		numSrcs++;
+
+		multiviewScenes.emplace_back(OBSGetWeakRef(src));
 		obs_source_inc_showing(src);
 
-		std::string name;
-		name += std::to_string(curIdx + 1);
-		name += " - ";
-		name += obs_source_get_name(src);
+		std::string name = std::to_string(numSrcs) + " - " +
+				obs_source_get_name(src);
+		multiviewLabels.emplace_back(CreateLabel(name.c_str(), h / 3));
+	}
 
-		multiviewLabels[curIdx + 2] = CreateLabel(name.c_str(), h / 3);
+	obs_frontend_source_list_free(&scenes);
+}
 
-		curIdx++;
+void OBSProjector::UpdateProjectorTitle(QString name)
+{
+	projectorTitle = name;
+
+	QString title = nullptr;
+	switch (type) {
+	case ProjectorType::Scene:
+		title = QTStr("SceneWindow") + " - " + name;
+		break;
+	case ProjectorType::Source:
+		title = QTStr("SourceWindow") + " - " + name;
+		break;
+	default:
+		title = name;
+		break;
 	}
 
-	obs_frontend_source_list_free(&scenes);
+	setWindowTitle(title);
+}
 
-	const char *multiviewLayoutText = config_get_string(GetGlobalConfig(),
-			"BasicWindow", "MultiviewLayout");
+OBSSource OBSProjector::GetSource()
+{
+	return source;
+}
 
-	if (astrcmpi(multiviewLayoutText, "horizontalbottom") == 0)
-		multiviewLayout = HORIZONTAL_BOTTOM;
-	else if (astrcmpi(multiviewLayoutText, "verticalleft") == 0)
-		multiviewLayout = VERTICAL_LEFT;
-	else if (astrcmpi(multiviewLayoutText, "verticalright") == 0)
-		multiviewLayout = VERTICAL_RIGHT;
-	else
-		multiviewLayout = HORIZONTAL_TOP;
+ProjectorType OBSProjector::GetProjectorType()
+{
+	return type;
+}
+
+int OBSProjector::GetMonitor()
+{
+	return savedMonitor;
 }
 
 void OBSProjector::UpdateMultiviewProjectors()
@@ -874,3 +999,10 @@
 	updatingMultiview = false;
 	obs_leave_graphics();
 }
+
+void OBSProjector::RenameProjector(QString oldName, QString newName)
+{
+	for (auto &projector : windowedProjectors)
+		if (projector->projectorTitle == oldName)
+			projector->UpdateProjectorTitle(newName);
+}

obs-studio-21.1.2.tar.xz/UI/window-projector.hpp -> obs-studio-22.0.1.tar.xz/UI/window-projector.hpp Changed

@@ -2,10 +2,25 @@
 
 #include <obs.hpp>
 #include "qt-display.hpp"
-#include "window-basic-main.hpp"
+
+enum class ProjectorType {
+	Source,
+	Scene,
+	Preview,
+	StudioProgram,
+	Multiview
+};
 
 class QMouseEvent;
 
+enum class MultiviewLayout : uint8_t {
+	HORIZONTAL_TOP_8_SCENES = 0,
+	HORIZONTAL_BOTTOM_8_SCENES = 1,
+	VERTICAL_LEFT_8_SCENES = 2,
+	VERTICAL_RIGHT_8_SCENES = 3,
+	HORIZONTAL_TOP_24_SCENES = 4
+};
+
 class OBSProjector : public OBSQTDisplay {
 	Q_OBJECT
 
@@ -20,31 +35,55 @@
 	void mousePressEvent(QMouseEvent *event) override;
 	void mouseDoubleClickEvent(QMouseEvent *event) override;
 
-	int savedMonitor = 0;
-	bool isWindow = false;
+	int savedMonitor;
+	bool isWindow;
+	QString projectorTitle;
 	ProjectorType type = ProjectorType::Source;
-	OBSWeakSource multiviewScenes[8];
-	OBSSource     multiviewLabels[10];
-	gs_vertbuffer_t *outerBox = nullptr;
-	gs_vertbuffer_t *innerBox = nullptr;
-	gs_vertbuffer_t *leftVLine = nullptr;
-	gs_vertbuffer_t *rightVLine = nullptr;
-	gs_vertbuffer_t *leftLine = nullptr;
-	gs_vertbuffer_t *topLine = nullptr;
-	gs_vertbuffer_t *rightLine = nullptr;
+	std::vector<OBSWeakSource> multiviewScenes;
+	std::vector<OBSSource> multiviewLabels;
+	gs_vertbuffer_t *actionSafeMargin      = nullptr;
+	gs_vertbuffer_t *graphicsSafeMargin    = nullptr;
+	gs_vertbuffer_t *fourByThreeSafeMargin = nullptr;
+	gs_vertbuffer_t *leftLine              = nullptr;
+	gs_vertbuffer_t *topLine               = nullptr;
+	gs_vertbuffer_t *rightLine             = nullptr;
+	gs_effect_t *solid = nullptr;
+	gs_eparam_t *color = nullptr;
+	// Multiview position helpers
+	float thickness = 4;
+	float offset, thicknessx2 = thickness * 2, pvwprgCX,
+		pvwprgCY, sourceX, sourceY, labelX, labelY, scenesCX, scenesCY,
+		ppiCX, ppiCY, siX, siY, siCX, siCY, ppiScaleX, ppiScaleY,
+		siScaleX, siScaleY, fw, fh, ratio;
+
+	float lineLength                = 0.1f;
+	// Rec. ITU-R BT.1848-1 / EBU R 95
+	float actionSafePercentage      = 0.035f; // 3.5%
+	float graphicsSafePercentage    = 0.05f; // 5.0%
+	float fourByThreeSafePercentage = 0.1625f; // 16.25%
 	bool ready = false;
 
+	// argb colors
+	static const uint32_t outerColor      = 0xFFD0D0D0;
+	static const uint32_t labelColor      = 0xD91F1F1F;
+	static const uint32_t backgroundColor = 0xFF000000;
+	static const uint32_t previewColor    = 0xFF00D000;
+	static const uint32_t programColor    = 0xFFD00000;
+
 	void UpdateMultiview();
+	void UpdateProjectorTitle(QString name);
 
 private slots:
 	void EscapeTriggered();
 
 public:
-	OBSProjector(QWidget *parent, obs_source_t *source, bool window);
+	OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
+			QString title, ProjectorType type_);
 	~OBSProjector();
 
-	void Init(int monitor, bool window, QString title,
-			ProjectorType type = ProjectorType::Source);
-
+	OBSSource GetSource();
+	ProjectorType GetProjectorType();
+	int GetMonitor();
 	static void UpdateMultiviewProjectors();
+	static void RenameProjector(QString oldName, QString newName);
 };

obs-studio-21.1.2.tar.xz/appveyor.yml -> obs-studio-22.0.1.tar.xz/appveyor.yml Changed

@@ -1,28 +1,24 @@
+image: Visual Studio 2017
 environment:
   CURL_VERSION: 7.56.1
 
 install:
   - git submodule update --init --recursive
-  - if exist dependencies2015.zip (curl -kLO https://obsproject.com/downloads/dependencies2015.zip -f --retry 5 -z dependencies2015.zip) else (curl -kLO https://obsproject.com/downloads/dependencies2015.zip -f --retry 5 -C -)
+  - if exist dependencies2017.zip (curl -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -z dependencies2017.zip) else (curl -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -)
   - if exist vlc.zip (curl -kLO https://obsproject.com/downloads/vlc.zip -f --retry 5 -z vlc.zip) else (curl -kLO https://obsproject.com/downloads/vlc.zip -f --retry 5 -C -)
-  - 7z x dependencies2015.zip -odependencies2015
+  - 7z x dependencies2017.zip -odependencies2017
   - 7z x vlc.zip -ovlc
-  - set DepsPath32=%CD%\dependencies2015\win32
-  - set DepsPath64=%CD%\dependencies2015\win64
+  - set DepsPath32=%CD%\dependencies2017\win32
+  - set DepsPath64=%CD%\dependencies2017\win64
   - set VLCPath=%CD%\vlc
-  - set QTDIR32=C:\Qt\5.7\msvc2015
-  - set QTDIR64=C:\Qt\5.7\msvc2015_64
+  - set QTDIR32=C:\Qt\5.11.1\msvc2015
+  - set QTDIR64=C:\Qt\5.11.1\msvc2017_64
   - set build_config=RelWithDebInfo
-  - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\um\d3d11on12*" "C:\Program Files (x86)\Windows Kits\8.1\Include\um"
-  - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\um\d3d12*" "C:\Program Files (x86)\Windows Kits\8.1\Include\um"
-  - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\shared\dxgi*" "C:\Program Files (x86)\Windows Kits\8.1\Include\shared"
-  - mkdir build
-  - mkdir build32
-  - mkdir build64
+  - mkdir build build32 build64
   - cd ./build32
-  - cmake -G "Visual Studio 14 2015" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
+  - cmake -G "Visual Studio 15 2017" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
   - cd ../build64
-  - cmake -G "Visual Studio 14 2015 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
+  - cmake -G "Visual Studio 15 2017 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
 
 build_script:
   - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build32\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -37,5 +33,13 @@
 test: off
 
 cache:
-  - dependencies2015.zip
+  - dependencies2017.zip
   - vlc.zip
+
+notifications:
+  - provider: Webhook
+    url:
+      secure: k1kpaz4CB5Rg5a3MTb4XKnd76fJ+9ozz5RACVnNjdgmAjA1OSssZ6LZ3g0NGfzc/
+    headers:
+      Authorization:
+        secure: A0PBwpHtsYzBOuye1EeS0fl562T0NZEInwZp0ZVER1wLQSeE6gzWGrRo2a0E7hii

obs-studio-21.1.2.tar.xz/cmake/Modules/FindLuajit.cmake -> obs-studio-22.0.1.tar.xz/cmake/Modules/FindLuajit.cmake Changed

obs-studio-22.0.1.tar.xz/cmake/Modules/FindMbedTLS.cmake Added

@@ -0,0 +1,143 @@
+# Once done these will be defined:
+#
+#  LIBMBEDTLS_FOUND
+#  LIBMBEDTLS_INCLUDE_DIRS
+#  LIBMBEDTLS_LIBRARIES
+#
+# For use in OBS:
+#
+#  MBEDTLS_INCLUDE_DIR
+
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(_MBEDTLS QUIET mbedtls)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(_lib_suffix 64)
+else()
+	set(_lib_suffix 32)
+endif()
+
+# If we're on MacOS or Linux, please try to statically-link mbedtls.
+if(STATIC_MBEDTLS AND (APPLE OR UNIX))
+	set(_MBEDTLS_LIBRARIES libmbedtls.a)
+	set(_MBEDCRYPTO_LIBRARIES libmbedcrypto.a)
+	set(_MBEDX509_LIBRARIES libmbedx509.a)
+endif()
+
+find_path(MBEDTLS_INCLUDE_DIR
+	NAMES mbedtls/ssl.h
+	HINTS
+		ENV mbedtlsPath${_lib_suffix}
+		ENV mbedtlsPath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${mbedtlsPath${_lib_suffix}}
+		${mbedtlsPath}
+		${DepsPath${_lib_suffix}}
+		${DepsPath}
+		${_MBEDTLS_INCLUDE_DIRS}
+	PATHS
+		/usr/include /usr/local/include /opt/local/include /sw/include
+	PATH_SUFFIXES
+		include)
+
+find_library(MBEDTLS_LIB
+	NAMES ${_MBEDTLS_LIBRARIES} mbedtls libmbedtls
+	HINTS
+		ENV mbedtlsPath${_lib_suffix}
+		ENV mbedtlsPath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${mbedtlsPath${_lib_suffix}}
+		${mbedtlsPath}
+		${DepsPath${_lib_suffix}}
+		${DepsPath}
+		${_MBEDTLS_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)
+
+find_library(MBEDCRYPTO_LIB
+	NAMES ${_MBEDCRYPTO_LIBRARIES} mbedcrypto libmbedcrypto
+	HINTS
+		ENV mbedcryptoPath${_lib_suffix}
+		ENV mbedcryptoPath
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${mbedcryptoPath${_lib_suffix}}
+		${mbedcryptoPath}
+		${DepsPath${_lib_suffix}}
+		${DepsPath}
+		${_MBEDCRYPTO_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)
+
+find_library(MBEDX509_LIB
+	NAMES ${_MBEDX509_LIBRARIES} mbedx509 libmbedx509
+	HINTS
+		ENV mbedx509Path${_lib_suffix}
+		ENV mbedx509Path
+		ENV DepsPath${_lib_suffix}
+		ENV DepsPath
+		${mbedx509Path${_lib_suffix}}
+		${mbedx509Path}
+		${DepsPath${_lib_suffix}}
+		${DepsPath}
+		${_MBEDX509_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)
+
+# Sometimes mbedtls is split between three libs, and sometimes it isn't.
+# If it isn't, let's check if the symbols we need are all in MBEDTLS_LIB.
+if(MBEDTLS_LIB AND NOT MBEDCRYPTO_LIB AND NOT MBEDX509_LIB)
+	set(CMAKE_REQUIRED_LIBRARIES ${MBEDTLS_LIB})
+	set(CMAKE_REQUIRED_INCLUDES ${MBEDTLS_INCLUDE_DIR})
+	check_symbol_exists(mbedtls_x509_crt_init "mbedtls/x509_crt.h" MBEDTLS_INCLUDES_X509)
+	check_symbol_exists(mbedtls_sha256_init "mbedtls/sha256.h" MBEDTLS_INCLUDES_CRYPTO)
+	unset(CMAKE_REQUIRED_INCLUDES)
+	unset(CMAKE_REQUIRED_LIBRARIES)
+endif()
+
+# 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})
+
+# 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})
+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)

obs-studio-21.1.2.tar.xz/cmake/Modules/FindXCB.cmake -> obs-studio-22.0.1.tar.xz/cmake/Modules/FindXCB.cmake Changed

@@ -21,6 +21,7 @@
 #   XCB_GLX_FOUND        XCB_GLX_INCLUDE_DIR        XCB_GLX_LIBRARY
 #   XCB_SHM_FOUND        XCB_SHM_INCLUDE_DIR        XCB_SHM_LIBRARY
 #   XCB_XV_FOUND         XCB_XV_INCLUDE_DIR         XCB_XV_LIBRARY
+#   XCB_XINPUT_FOUND     XCB_XINPUT_INCLUDE_DIR     XCB_XINPUT_LIBRARY
 #   XCB_SYNC_FOUND       XCB_SYNC_INCLUDE_DIR       XCB_SYNC_LIBRARY
 #   XCB_XTEST_FOUND      XCB_XTEST_INCLUDE_DIR      XCB_XTEST_LIBRARY
 #   XCB_ICCCM_FOUND      XCB_ICCCM_INCLUDE_DIR      XCB_ICCCM_LIBRARY
@@ -54,6 +55,7 @@
                     XFIXES
                     XTEST
                     XV
+                    XINPUT
                     XINERAMA)
 
 unset(unknownComponents)
@@ -112,6 +114,8 @@
             list(APPEND pkgConfigModules "xcb-xtest")
         elseif("${comp}" STREQUAL "XV")
             list(APPEND pkgConfigModules "xcb-xv")
+        elseif("${comp}" STREQUAL "XINPUT")
+            list(APPEND pkgConfigModules "xcb-xinput")
         elseif("${comp}" STREQUAL "XINERAMA")
             list(APPEND pkgConfigModules "xcb-xinerama")
         endif()
@@ -190,6 +194,9 @@
     elseif("${_comp}" STREQUAL "XV")
         set(_header "xcb/xv.h")
         set(_lib "xcb-xv")
+    elseif("${_comp}" STREQUAL "XINPUT")
+        set(_header "xcb/xinput.h")
+        set(_lib "xcb-xinput")
     elseif("${_comp}" STREQUAL "XINERAMA")
         set(_header "xcb/xinerama.h")
         set(_lib "xcb-xinerama")

obs-studio-21.1.2.tar.xz/cmake/osxbundle/Info.plist -> obs-studio-22.0.1.tar.xz/cmake/osxbundle/Info.plist Changed

obs-studio-22.0.1.tar.xz/deps/json11 Added

obs-studio-22.0.1.tar.xz/deps/json11/LICENSE.txt Added

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

obs-studio-22.0.1.tar.xz/deps/json11/json11.cpp Added

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

obs-studio-22.0.1.tar.xz/deps/json11/json11.hpp Added

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

obs-studio-21.1.2.tar.xz/deps/libcaption/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/deps/libcaption/CMakeLists.txt Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/LICENSE.txt -> obs-studio-22.0.1.tar.xz/deps/libcaption/LICENSE.txt Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/README.md -> obs-studio-22.0.1.tar.xz/deps/libcaption/README.md Changed

@@ -1,10 +1,10 @@
 # version
-v0.6
+v0.8
 Matthew Szatmary m3u8@twitch.tv / matt@szatmary.org
 
 # libcaption
 
-libcaption is a small library written in C to aid in the creating and parsing of closed caption data for use in the twitch player, open sourced to use within community developed broadcast tools. To maintain consistency across platforms libcaption aims to implement a subset of EIA608, CEA708 as supported by the Apple iOS platform.
+libcaption is a library written in C to aid in the creating and parsing of closed caption data, open sourced under the MIT license to use within community developed broadcast tools. To maintain consistency across platforms libcaption aims to implement a subset of EIA608, CEA708 as supported by the Apple iOS platform.
 
 608 support is currently limited to encoding and decoding the necessary control and preamble codes as well as support for the Basic North American, Special North American and Extended Western European character sets.
 
@@ -23,10 +23,10 @@
 |BNA|P|Q|R|S|T|U|V|W|X|Y|Z|[|é|]|í|ó|
 |BNA|ú|a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|
 |BNA|p|q|r|s|t|u|v|w|x|y|z|ç|÷|Ñ|ñ|█|
-|SNA|®|°|½|¿|™|¢|£|♪|à| |è|â|ê|î|ô|û|
+|SNA|®|°|½|¿|™|¢|£|♪|à|&nbsp;|è|â|ê|î|ô|û|
 |WES|Á|É|Ó|Ú|Ü|ü|‘|¡|*|'|—|©|℠|•|“|”|
 |WEF|À|Â|Ç|È|Ê|Ë|ë|Î|Ï|ï|Ô|Ù|ù|Û|«|»|
-|WEP|Ã|ã|Í|Ì|ì|Ò|ò|Õ|õ|{|}|\\|^|_|\||~|
+|WEP|Ã|ã|Í|Ì|ì|Ò|ò|Õ|õ|{|}|&#92;|^|_|&#124;|~|
 |WEG|Ä|ä|Ö|ö|ß|¥|¤|¦|Å|å|Ø|ø|┌|┐|└|┘|
 
 * BNA = Basic North American character set
@@ -36,64 +36,16 @@
 * WEP = Extended Western European character set : Portuguese
 * WEG = Extended Western European character set : German/Danish
 
-
-------
-eia608_screen_t is the default internal representation. `screens` can be
-converted to and from SEI messages 608/708 buffers and SRT files
-
-## JSON format
-A JSON rendered format is provided for convenience of integration. The JSON
-format is as follows:
-
-```
-{
-    "format":  "eia608",
-    "mode":    "pop-on",
-    "roll-up": 0,
-    "data": [
-        { "row":0, "col":0, "char":"A", "style":"white" },
-        { "row":0, "col":1, "char":"B", "style":"white" },
-        // ...
-    ]
-}
-```
-
-### `format`
-The only current valid value is `"eia608"`. This field exists for
-future expansion.  Any values other than `"eia608"`, and the object should be
-ignored for now.
-
-### `mode`
-Defines the method by which screen contents are adjusted in response to
-new data, such as content in excess of the normal grid size.
-
-Possible modes are:
-
-`"clear"`: Generated when a screen is initialized, but not entered a "loading"
-state. `"clear"` mode  occurs frequently when the display is to be erased.
-
-`"pop-on"`: Normally used for pre recorded content where. A pop-on screen should
-completely replace all previous screen contents.
-
-`"paint-on"`: Normally used for live content. In this mode, new characters
-appear one or two at a time. The `data` array does include the complete state of
-the screen. In practice, it may not be different that `"pop-on"`.
-
-An internal "loading" mode also exists.
-
-### `roll-up`
-Normally used for live content such as news broadcasts. Text is moved up the
-screen as new rows appear. The number of rows to be displayed is also encoded in
-the JSON  key `"roll-up"` where value is an integer of `0`, `1`, `2`, `3`, or `4`.
-Like `"paint-on"`, the `data` array does include the complete state of the screen.
-
-### `data`
-Contains a object for every character to be displayed. The screen is a grid of
-15 rows and 32 columns. The position of the character is available in the `row`
-and `col` fields. The character itself is in the `char` field. The full
-character set is available in the document, but any valid UTF-8 should be
-supported for future. The style field will contain one of the following values:
-
-`"white"`, `"green"`, `"blue"`, `"cyan"`, `"red"`, `"yellow"`, `"magenta"`, `"italics"`
-
-Characters with the `"italics"` style should be displayed in white.
+## Limitations
+Current B-frame support for caption creation is minimal. libcaption ensures no re-ordering of captions is required
+on playback.
+
+## Build Directions
+# Mac Os/Linux
+Install build dependencies (git, cmake, a compiler such as xcode, gcc or clang and optionally re2c and ffmpeg)
+* run `cmake . && make`
+* or to compile without re2c `cmake -DENABLE_RE2C=OFF . && make`
+* finally `sudo make install` to install
+# Windows
+I have never tested libcaption in windows. It is written in pure C with no dependencies,
+so there is no reason it would not work.

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/caption.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/caption.h Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/cea708.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/cea708.h Changed

obs-studio-22.0.1.tar.xz/deps/libcaption/caption/dvtcc.h Added

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/eia608.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/eia608.h Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/eia608_charmap.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/eia608_charmap.h Changed

@@ -1,7 +1,7 @@
 /**********************************************************************************************/
 /* The MIT License                                                                            */
 /*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
 /*                                                                                            */
 /* Permission is hereby granted, free of charge, to any person obtaining a copy               */
 /* of this software and associated documentation files (the "Software"), to deal              */
@@ -23,208 +23,214 @@
 /**********************************************************************************************/
 #ifndef LIBCAPTION_EIA608_CHARMAP_H
 #define LIBCAPTION_EIA608_CHARMAP_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define EIA608_CHAR_COUNT 176
 extern const char* eia608_char_map[EIA608_CHAR_COUNT];
 
 // Helper char
-#define EIA608_CHAR_NULL                                       ""
+#define EIA608_CHAR_NULL ""
 // Basic North American character set
-#define EIA608_CHAR_SPACE                                      "\x20"
-#define EIA608_CHAR_EXCLAMATION_MARK                           "\x21"
-#define EIA608_CHAR_QUOTATION_MARK                             "\x22"
-#define EIA608_CHAR_NUMBER_SIGN                                "\x23"
-#define EIA608_CHAR_DOLLAR_SIGN                                "\x24"
-#define EIA608_CHAR_PERCENT_SIGN                               "\x25"
-#define EIA608_CHAR_AMPERSAND                                  "\x26"
-#define EIA608_CHAR_LEFT_SINGLE_QUOTATION_MARK                 "\xE2\x80\x98"
-#define EIA608_CHAR_LEFT_PARENTHESIS                           "\x28"
-#define EIA608_CHAR_RIGHT_PARENTHESIS                          "\x29"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_ACUTE            "\xC3\xA1"
-#define EIA608_CHAR_PLUS_SIGN                                  "\x2B"
-#define EIA608_CHAR_COMMA                                      "\x2C"
-#define EIA608_CHAR_HYPHEN_MINUS                               "\x2D"
-#define EIA608_CHAR_FULL_STOP                                  "\x2E"
-#define EIA608_CHAR_SOLIDUS                                    "\x2F"
+#define EIA608_CHAR_SPACE "\x20"
+#define EIA608_CHAR_EXCLAMATION_MARK "\x21"
+#define EIA608_CHAR_QUOTATION_MARK "\x22"
+#define EIA608_CHAR_NUMBER_SIGN "\x23"
+#define EIA608_CHAR_DOLLAR_SIGN "\x24"
+#define EIA608_CHAR_PERCENT_SIGN "\x25"
+#define EIA608_CHAR_AMPERSAND "\x26"
+#define EIA608_CHAR_LEFT_SINGLE_QUOTATION_MARK "\xE2\x80\x98"
+#define EIA608_CHAR_LEFT_PARENTHESIS "\x28"
+#define EIA608_CHAR_RIGHT_PARENTHESIS "\x29"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_ACUTE "\xC3\xA1"
+#define EIA608_CHAR_PLUS_SIGN "\x2B"
+#define EIA608_CHAR_COMMA "\x2C"
+#define EIA608_CHAR_HYPHEN_MINUS "\x2D"
+#define EIA608_CHAR_FULL_STOP "\x2E"
+#define EIA608_CHAR_SOLIDUS "\x2F"
 
 // Basic North American character set
-#define EIA608_CHAR_DIGIT_ZERO                                 "\x30"
-#define EIA608_CHAR_DIGIT_ONE                                  "\x31"
-#define EIA608_CHAR_DIGIT_TWO                                  "\x32"
-#define EIA608_CHAR_DIGIT_THREE                                "\x33"
-#define EIA608_CHAR_DIGIT_FOUR                                 "\x34"
-#define EIA608_CHAR_DIGIT_FIVE                                 "\x35"
-#define EIA608_CHAR_DIGIT_SIX                                  "\x36"
-#define EIA608_CHAR_DIGIT_SEVEN                                "\x37"
-#define EIA608_CHAR_DIGIT_EIGHT                                "\x38"
-#define EIA608_CHAR_DIGIT_NINE                                 "\x39"
-#define EIA608_CHAR_COLON                                      "\x3A"
-#define EIA608_CHAR_SEMICOLON                                  "\x3B"
-#define EIA608_CHAR_LESS_THAN_SIGN                             "\x3C"
-#define EIA608_CHAR_EQUALS_SIGN                                "\x3D"
-#define EIA608_CHAR_GREATER_THAN_SIGN                          "\x3E"
-#define EIA608_CHAR_QUESTION_MARK                              "\x3F"
+#define EIA608_CHAR_DIGIT_ZERO "\x30"
+#define EIA608_CHAR_DIGIT_ONE "\x31"
+#define EIA608_CHAR_DIGIT_TWO "\x32"
+#define EIA608_CHAR_DIGIT_THREE "\x33"
+#define EIA608_CHAR_DIGIT_FOUR "\x34"
+#define EIA608_CHAR_DIGIT_FIVE "\x35"
+#define EIA608_CHAR_DIGIT_SIX "\x36"
+#define EIA608_CHAR_DIGIT_SEVEN "\x37"
+#define EIA608_CHAR_DIGIT_EIGHT "\x38"
+#define EIA608_CHAR_DIGIT_NINE "\x39"
+#define EIA608_CHAR_COLON "\x3A"
+#define EIA608_CHAR_SEMICOLON "\x3B"
+#define EIA608_CHAR_LESS_THAN_SIGN "\x3C"
+#define EIA608_CHAR_EQUALS_SIGN "\x3D"
+#define EIA608_CHAR_GREATER_THAN_SIGN "\x3E"
+#define EIA608_CHAR_QUESTION_MARK "\x3F"
 
 // Basic North American character set
-#define EIA608_CHAR_COMMERCIAL_AT                              "\x40"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A                     "\x41"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_B                     "\x42"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_C                     "\x43"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_D                     "\x44"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E                     "\x45"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_F                     "\x46"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_G                     "\x47"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_H                     "\x48"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I                     "\x49"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_J                     "\x4A"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_K                     "\x4B"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_L                     "\x4C"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_M                     "\x4D"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_N                     "\x4E"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O                     "\x4F"
+#define EIA608_CHAR_COMMERCIAL_AT "\x40"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A "\x41"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_B "\x42"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_C "\x43"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_D "\x44"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E "\x45"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_F "\x46"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_G "\x47"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_H "\x48"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I "\x49"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_J "\x4A"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_K "\x4B"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_L "\x4C"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_M "\x4D"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_N "\x4E"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O "\x4F"
 
 // Basic North American character set
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_P                     "\x50"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Q                     "\x51"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_R                     "\x52"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_S                     "\x53"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_T                     "\x54"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U                     "\x55"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_V                     "\x56"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_W                     "\x57"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_X                     "\x58"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Y                     "\x59"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Z                     "\x5A"
-#define EIA608_CHAR_LEFT_SQUARE_BRACKET                        "\x5B"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_ACUTE            "\xC3\xA9"
-#define EIA608_CHAR_RIGHT_SQUARE_BRACKET                       "\x5D"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_ACUTE            "\xC3\xAD"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_ACUTE            "\xC3\xB3"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_P "\x50"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Q "\x51"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_R "\x52"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_S "\x53"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_T "\x54"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U "\x55"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_V "\x56"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_W "\x57"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_X "\x58"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Y "\x59"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Z "\x5A"
+#define EIA608_CHAR_LEFT_SQUARE_BRACKET "\x5B"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_ACUTE "\xC3\xA9"
+#define EIA608_CHAR_RIGHT_SQUARE_BRACKET "\x5D"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_ACUTE "\xC3\xAD"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_ACUTE "\xC3\xB3"
 
 // Basic North American character set
-#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_ACUTE            "\xC3\xBA"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A                       "\x61"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_B                       "\x62"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_C                       "\x63"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_D                       "\x64"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_E                       "\x65"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_F                       "\x66"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_G                       "\x67"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_H                       "\x68"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_I                       "\x69"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_J                       "\x6A"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_K                       "\x6B"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_L                       "\x6C"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_M                       "\x6D"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_N                       "\x6E"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O                       "\x6F"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_ACUTE "\xC3\xBA"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A "\x61"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_B "\x62"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_C "\x63"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_D "\x64"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E "\x65"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_F "\x66"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_G "\x67"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_H "\x68"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I "\x69"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_J "\x6A"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_K "\x6B"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_L "\x6C"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_M "\x6D"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_N "\x6E"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O "\x6F"
 
 // Basic North American character set
-#define EIA608_CHAR_LATIN_SMALL_LETTER_P                       "\x70"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_Q                       "\x71"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_R                       "\x72"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_S                       "\x73"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_T                       "\x74"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_U                       "\x75"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_V                       "\x76"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_W                       "\x77"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_X                       "\x78"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_Y                       "\x79"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_Z                       "\x7A"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_C_WITH_CEDILLA          "\xC3\xA7"
-#define EIA608_CHAR_DIVISION_SIGN                              "\xC3\xB7"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_N_WITH_TILDE          "\xC3\x91"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_N_WITH_TILDE            "\xC3\xB1"
-#define EIA608_CHAR_FULL_BLOCK                                 "\xE2\x96\x88"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_P "\x70"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_Q "\x71"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_R "\x72"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_S "\x73"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_T "\x74"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U "\x75"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_V "\x76"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_W "\x77"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_X "\x78"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_Y "\x79"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_Z "\x7A"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_C_WITH_CEDILLA "\xC3\xA7"
+#define EIA608_CHAR_DIVISION_SIGN "\xC3\xB7"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_N_WITH_TILDE "\xC3\x91"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_N_WITH_TILDE "\xC3\xB1"
+#define EIA608_CHAR_FULL_BLOCK "\xE2\x96\x88"
 
 // Special North American character set[edit]
-#define EIA608_CHAR_REGISTERED_SIGN                            "\xC2\xAE"
-#define EIA608_CHAR_DEGREE_SIGN                                "\xC2\xB0"
-#define EIA608_CHAR_VULGAR_FRACTION_ONE_HALF                   "\xC2\xBD"
-#define EIA608_CHAR_INVERTED_QUESTION_MARK                     "\xC2\xBF"
-#define EIA608_CHAR_TRADE_MARK_SIGN                            "\xE2\x84\xA2"
-#define EIA608_CHAR_CENT_SIGN                                  "\xC2\xA2"
-#define EIA608_CHAR_POUND_SIGN                                 "\xC2\xA3"
-#define EIA608_CHAR_EIGHTH_NOTE                                "\xE2\x99\xAA"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_GRAVE            "\xC3\xA0"
-#define EIA608_CHAR_NO_BREAK_SPACE                             "\xC2\xA0"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_GRAVE            "\xC3\xA8"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX       "\xC3\xA2"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX       "\xC3\xAA"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX       "\xC3\xAE"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX       "\xC3\xB4"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX       "\xC3\xBB"
+#define EIA608_CHAR_REGISTERED_SIGN "\xC2\xAE"
+#define EIA608_CHAR_DEGREE_SIGN "\xC2\xB0"
+#define EIA608_CHAR_VULGAR_FRACTION_ONE_HALF "\xC2\xBD"
+#define EIA608_CHAR_INVERTED_QUESTION_MARK "\xC2\xBF"
+#define EIA608_CHAR_TRADE_MARK_SIGN "\xE2\x84\xA2"
+#define EIA608_CHAR_CENT_SIGN "\xC2\xA2"
+#define EIA608_CHAR_POUND_SIGN "\xC2\xA3"
+#define EIA608_CHAR_EIGHTH_NOTE "\xE2\x99\xAA"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_GRAVE "\xC3\xA0"
+#define EIA608_CHAR_NO_BREAK_SPACE "\xC2\xA0"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_GRAVE "\xC3\xA8"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX "\xC3\xA2"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX "\xC3\xAA"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX "\xC3\xAE"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX "\xC3\xB4"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX "\xC3\xBB"
 
 // Extended Western European character set : Extended Spanish/Miscellaneous
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_ACUTE          "\xC3\x81"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_ACUTE          "\xC3\x89"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_ACUTE          "\xC3\x93"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_ACUTE          "\xC3\x9A"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS      "\xC3\x9C"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_DIAERESIS        "\xC3\xBC"
-#define EIA608_CHAR_RIGHT_SINGLE_QUOTATION_MARK                "\xE2\x80\x99"
-#define EIA608_CHAR_INVERTED_EXCLAMATION_MARK                  "\xC2\xA1"
-#define EIA608_CHAR_ASTERISK                                   "\x2A"
-#define EIA608_CHAR_APOSTROPHE                                 "\x27"
-#define EIA608_CHAR_EM_DASH                                    "\xE2\x80\x94"
-#define EIA608_CHAR_COPYRIGHT_SIGN                             "\xC2\xA9"
-#define EIA608_CHAR_SERVICE_MARK                               "\xE2\x84\xA0"
-#define EIA608_CHAR_BULLET                                     "\xE2\x80\xA2"
-#define EIA608_CHAR_LEFT_DOUBLE_QUOTATION_MARK                 "\xE2\x80\x9C"
-#define EIA608_CHAR_RIGHT_DOUBLE_QUOTATION_MARK                "\xE2\x80\x9D"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_ACUTE "\xC3\x81"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_ACUTE "\xC3\x89"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_ACUTE "\xC3\x93"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_ACUTE "\xC3\x9A"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS "\xC3\x9C"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_DIAERESIS "\xC3\xBC"
+#define EIA608_CHAR_RIGHT_SINGLE_QUOTATION_MARK "\xE2\x80\x99"
+#define EIA608_CHAR_INVERTED_EXCLAMATION_MARK "\xC2\xA1"
+#define EIA608_CHAR_ASTERISK "\x2A"
+#define EIA608_CHAR_APOSTROPHE "\x27"
+#define EIA608_CHAR_EM_DASH "\xE2\x80\x94"
+#define EIA608_CHAR_COPYRIGHT_SIGN "\xC2\xA9"
+#define EIA608_CHAR_SERVICE_MARK "\xE2\x84\xA0"
+#define EIA608_CHAR_BULLET "\xE2\x80\xA2"
+#define EIA608_CHAR_LEFT_DOUBLE_QUOTATION_MARK "\xE2\x80\x9C"
+#define EIA608_CHAR_RIGHT_DOUBLE_QUOTATION_MARK "\xE2\x80\x9D"
 
 // Extended Western European character set : Extended French
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_GRAVE          "\xC3\x80"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX     "\xC3\x82"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_C_WITH_CEDILLA        "\xC3\x87"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_GRAVE          "\xC3\x88"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX     "\xC3\x8A"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS      "\xC3\x8B"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_DIAERESIS        "\xC3\xAB"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX     "\xC3\x8E"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS      "\xC3\x8F"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_DIAERESIS        "\xC3\xAF"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX     "\xC3\x94"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_GRAVE          "\xC3\x99"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_GRAVE            "\xC3\xB9"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX     "\xC3\x9B"
-#define EIA608_CHAR_LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK  "\xC2\xAB"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_GRAVE "\xC3\x80"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX "\xC3\x82"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_C_WITH_CEDILLA "\xC3\x87"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_GRAVE "\xC3\x88"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX "\xC3\x8A"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS "\xC3\x8B"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_DIAERESIS "\xC3\xAB"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX "\xC3\x8E"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS "\xC3\x8F"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_DIAERESIS "\xC3\xAF"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX "\xC3\x94"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_GRAVE "\xC3\x99"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_GRAVE "\xC3\xB9"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX "\xC3\x9B"
+#define EIA608_CHAR_LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK "\xC2\xAB"
 #define EIA608_CHAR_RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK "\xC2\xBB"
 
 // Extended Western European character set : Portuguese
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_TILDE          "\xC3\x83"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_TILDE            "\xC3\xA3"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_ACUTE          "\xC3\x8D"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_GRAVE          "\xC3\x8C"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_GRAVE            "\xC3\xAC"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_GRAVE          "\xC3\x92"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_GRAVE            "\xC3\xB2"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_TILDE          "\xC3\x95"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_TILDE            "\xC3\xB5"
-#define EIA608_CHAR_LEFT_CURLY_BRACKET                         "\x7B"
-#define EIA608_CHAR_RIGHT_CURLY_BRACKET                        "\x7D"
-#define EIA608_CHAR_REVERSE_SOLIDUS                            "\x5C"
-#define EIA608_CHAR_CIRCUMFLEX_ACCENT                          "\x5E"
-#define EIA608_CHAR_LOW_LINE                                   "\x5F"
-#define EIA608_CHAR_VERTICAL_LINE                              "\x7C"
-#define EIA608_CHAR_TILDE                                      "\x7E"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_TILDE "\xC3\x83"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_TILDE "\xC3\xA3"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_ACUTE "\xC3\x8D"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_GRAVE "\xC3\x8C"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_GRAVE "\xC3\xAC"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_GRAVE "\xC3\x92"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_GRAVE "\xC3\xB2"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_TILDE "\xC3\x95"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_TILDE "\xC3\xB5"
+#define EIA608_CHAR_LEFT_CURLY_BRACKET "\x7B"
+#define EIA608_CHAR_RIGHT_CURLY_BRACKET "\x7D"
+#define EIA608_CHAR_REVERSE_SOLIDUS "\x5C"
+#define EIA608_CHAR_CIRCUMFLEX_ACCENT "\x5E"
+#define EIA608_CHAR_LOW_LINE "\x5F"
+#define EIA608_CHAR_VERTICAL_LINE "\x7C"
+#define EIA608_CHAR_TILDE "\x7E"
 
 // Extended Western European character set : German/Danish
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS      "\xC3\x84"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_DIAERESIS        "\xC3\xA4"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS      "\xC3\x96"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_DIAERESIS        "\xC3\xB6"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_SHARP_S                 "\xC3\x9F"
-#define EIA608_CHAR_YEN_SIGN                                   "\xC2\xA5"
-#define EIA608_CHAR_CURRENCY_SIGN                              "\xC2\xA4"
-#define EIA608_CHAR_BROKEN_BAR                                 "\xC2\xA6"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE     "\xC3\x85"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_RING_ABOVE       "\xC3\xA5"
-#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_STROKE         "\xC3\x98"
-#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_STROKE           "\xC3\xB8"
-#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT          "\xE2\x94\x8C" // top left
-#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT           "\xE2\x94\x90" // top right
-#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT            "\xE2\x94\x94" // lower left
-#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT             "\xE2\x94\x98" // bottom right
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS "\xC3\x84"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_DIAERESIS "\xC3\xA4"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS "\xC3\x96"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_DIAERESIS "\xC3\xB6"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_SHARP_S "\xC3\x9F"
+#define EIA608_CHAR_YEN_SIGN "\xC2\xA5"
+#define EIA608_CHAR_CURRENCY_SIGN "\xC2\xA4"
+#define EIA608_CHAR_BROKEN_BAR "\xC2\xA6"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE "\xC3\x85"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_RING_ABOVE "\xC3\xA5"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_STROKE "\xC3\x98"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_STROKE "\xC3\xB8"
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT "\xE2\x94\x8C" // top left
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT "\xE2\x94\x90" // top right
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT "\xE2\x94\x94" // lower left
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT "\xE2\x94\x98" // bottom right
 
+#ifdef __cplusplus
+}
+#endif
 #endif

obs-studio-22.0.1.tar.xz/deps/libcaption/caption/mpeg.h Added

@@ -0,0 +1,212 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_MPEG_H
+#define LIBCAPTION_MPEG_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "caption.h"
+#include "cea708.h"
+#include "scc.h"
+#include <float.h>
+#include <stddef.h>
+////////////////////////////////////////////////////////////////////////////////
+#define STREAM_TYPE_H262 0x02
+#define STREAM_TYPE_H264 0x1B
+#define STREAM_TYPE_H265 0x24
+#define H262_SEI_PACKET 0xB2
+#define H264_SEI_PACKET 0x06
+#define H265_SEI_PACKET 0x27 // There is also 0x28
+#define MAX_NALU_SIZE (6 * 1024 * 1024)
+#define MAX_REFRENCE_FRAMES 64
+typedef struct {
+    size_t size;
+    uint8_t data[MAX_NALU_SIZE + 1];
+    double dts, cts;
+    libcaption_stauts_t status;
+    // Priority queue for out of order frame processing
+    // Should probablly be a linked list
+    size_t front;
+    size_t latent;
+    cea708_t cea708[MAX_REFRENCE_FRAMES];
+} mpeg_bitstream_t;
+
+void mpeg_bitstream_init(mpeg_bitstream_t* packet);
+////////////////////////////////////////////////////////////////////////////////
+// TODO make convenience functions for flv/mp4
+/*! \brief
+    \param
+*/
+size_t mpeg_bitstream_parse(mpeg_bitstream_t* packet, caption_frame_t* frame, const uint8_t* data, size_t size, unsigned stream_type, double dts, double cts);
+/*! \brief
+    \param
+*/
+static inline libcaption_stauts_t mpeg_bitstream_status(mpeg_bitstream_t* packet) { return packet->status; }
+/*! \brief
+        Flushes latent packets caused by out or order frames.
+        Returns number of latent frames remaining, 0 when complete;
+    \param
+*/
+size_t mpeg_bitstream_flush(mpeg_bitstream_t* packet, caption_frame_t* frame);
+////////////////////////////////////////////////////////////////////////////////
+typedef enum {
+    sei_type_buffering_period = 0,
+    sei_type_pic_timing = 1,
+    sei_type_pan_scan_rect = 2,
+    sei_type_filler_payload = 3,
+    sei_type_user_data_registered_itu_t_t35 = 4,
+    sei_type_user_data_unregistered = 5,
+    sei_type_recovery_point = 6,
+    sei_type_dec_ref_pic_marking_repetition = 7,
+    sei_type_spare_pic = 8,
+    sei_type_scene_info = 9,
+    sei_type_sub_seq_info = 10,
+    sei_type_sub_seq_layer_characteristics = 11,
+    sei_type_sub_seq_characteristics = 12,
+    sei_type_full_frame_freeze = 13,
+    sei_type_full_frame_freeze_release = 14,
+    sei_type_full_frame_snapshot = 15,
+    sei_type_progressive_refinement_segment_start = 16,
+    sei_type_progressive_refinement_segment_end = 17,
+    sei_type_motion_constrained_slice_group_set = 18,
+    sei_type_film_grain_characteristics = 19,
+    sei_type_deblocking_filter_display_preference = 20,
+    sei_type_stereo_video_info = 21,
+} sei_msgtype_t;
+////////////////////////////////////////////////////////////////////////////////
+typedef struct _sei_message_t {
+    size_t size;
+    sei_msgtype_t type;
+    struct _sei_message_t* next;
+} sei_message_t;
+
+typedef struct {
+    double timestamp;
+    sei_message_t* head;
+    sei_message_t* tail;
+} sei_t;
+
+/*! \brief
+    \param
+*/
+void sei_init(sei_t* sei, double timestamp);
+/*! \brief
+    \param
+*/
+void sei_free(sei_t* sei);
+/*! \brief
+    \param
+*/
+void sei_cat(sei_t* to, sei_t* from, int itu_t_t35);
+/*! \brief
+    \param
+*/
+void sei_message_append(sei_t* sei, sei_message_t* msg);
+/*! \brief
+    \param
+*/
+libcaption_stauts_t sei_parse(sei_t* sei, const uint8_t* data, size_t size, double timestamp);
+/*! \brief
+    \param
+*/
+static inline sei_message_t* sei_message_head(sei_t* sei) { return sei->head; }
+/*! \brief
+    \param
+*/
+static inline sei_message_t* sei_message_tail(sei_t* sei) { return sei->tail; }
+/*! \brief
+    \param
+*/
+sei_message_t* sei_message_next(sei_message_t* msg);
+/*! \brief
+    \param
+*/
+sei_msgtype_t sei_message_type(sei_message_t* msg);
+/*! \brief
+    \param
+*/
+size_t sei_message_size(sei_message_t* msg);
+/*! \brief
+    \param
+*/
+uint8_t* sei_message_data(sei_message_t* msg);
+/*! \brief
+    \param
+*/
+sei_message_t* sei_message_new(sei_msgtype_t type, uint8_t* data, size_t size);
+/*! \brief
+    \param
+*/
+static inline sei_message_t* sei_message_copy(sei_message_t* msg)
+{
+    return sei_message_new(sei_message_type(msg), sei_message_data(msg), sei_message_size(msg));
+}
+/**
+Free message and all accoiated data. Messaged added to sei_t by using sei_append_message MUST NOT be freed
+These messages will be freed by calling sei_free()
+*/
+/*! \brief
+    \param
+*/
+void sei_message_free(sei_message_t* msg);
+////////////////////////////////////////////////////////////////////////////////
+/*! \brief
+    \param
+*/
+size_t sei_render_size(sei_t* sei);
+/*! \brief
+    \param
+*/
+size_t sei_render(sei_t* sei, uint8_t* data);
+/*! \brief
+    \param
+*/
+void sei_dump(sei_t* sei);
+/*! \brief
+    \param
+*/
+void sei_dump_messages(sei_message_t* head, double timestamp);
+////////////////////////////////////////////////////////////////////////////////
+/*! \brief
+    \param
+*/
+libcaption_stauts_t sei_from_scc(sei_t* sei, const scc_t* scc);
+/*! \brief
+    \param
+*/
+libcaption_stauts_t sei_from_caption_frame(sei_t* sei, caption_frame_t* frame);
+/*! \brief
+    \param
+*/
+libcaption_stauts_t sei_from_caption_clear(sei_t* sei);
+/*! \brief
+    \param
+*/
+libcaption_stauts_t sei_to_caption_frame(sei_t* sei, caption_frame_t* frame);
+////////////////////////////////////////////////////////////////////////////////
+#ifdef __cplusplus
+}
+#endif
+#endif

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/scc.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/scc.h Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/srt.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/srt.h Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/utf8.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/utf8.h Changed

obs-studio-22.0.1.tar.xz/deps/libcaption/caption/vtt.h Added

@@ -0,0 +1,145 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_VTT_H
+#define LIBCAPTION_VTT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "caption.h"
+#include "eia608.h"
+
+enum VTT_BLOCK_TYPE {
+    VTT_REGION = 0,
+    VTT_STYLE = 1,
+    VTT_NOTE = 2,
+    VTT_CUE = 3
+};
+
+// CUE represents a block of caption text
+typedef struct _vtt_block_t {
+    struct _vtt_block_t* next;
+    enum VTT_BLOCK_TYPE type;
+    // CUE-Only
+    double timestamp;
+    double duration; // -1.0 for no duration
+    char* cue_settings;
+    char* cue_id;
+    // Standard block data
+    size_t text_size;
+    char* block_text;
+} vtt_block_t;
+
+// VTT files are a collection of REGION, STYLE and CUE blocks.
+// XXX: Comments (NOTE blocks) are ignored
+typedef struct _vtt_t {
+    vtt_block_t* region_head;
+    vtt_block_t* region_tail;
+    vtt_block_t* style_head;
+    vtt_block_t* style_tail;
+    vtt_block_t* cue_head;
+    vtt_block_t* cue_tail;
+} vtt_t;
+
+/*! \brief
+    \param
+*/
+vtt_t* vtt_new();
+/*! \brief
+    \param
+*/
+void vtt_free(vtt_t* vtt);
+
+/*! \brief
+    \param
+*/
+vtt_block_t* vtt_block_new(vtt_t* vtt, const utf8_char_t* data, size_t size, enum VTT_BLOCK_TYPE type);
+
+/*! \brief
+    \param
+*/
+void vtt_cue_free_head(vtt_t* vtt);
+
+/*! \brief
+    \param
+*/
+void vtt_style_free_head(vtt_t* vtt);
+
+/*! \brief
+    \param
+*/
+void vtt_region_free_head(vtt_t* vtt);
+
+// returns a vtt_t, containing linked lists of blocks. must be freed when done
+/*! \brief
+    \param
+*/
+vtt_t* vtt_parse(const utf8_char_t* data, size_t size);
+
+/*! \brief
+    \param
+*/
+vtt_t* _vtt_parse(const utf8_char_t* data, size_t size, int srt_mode);
+
+/*! \brief
+    \param
+*/
+static inline vtt_block_t* vtt_cue_next(vtt_block_t* block) { return block->next; }
+
+/*! \brief
+    \param
+*/
+static inline utf8_char_t* vtt_block_data(vtt_block_t* block) { return (utf8_char_t*)(block) + sizeof(vtt_block_t); }
+
+/*! \brief
+    \param
+*/
+static inline void vtt_crack_time(double tt, int* hh, int* mm, int* ss, int* ms)
+{
+    (*ms) = (int)((int64_t)(tt * 1000) % 1000);
+    (*ss) = (int)((int64_t)(tt) % 60);
+    (*mm) = (int)((int64_t)(tt / (60)) % 60);
+    (*hh) = (int)((int64_t)(tt / (60 * 60)));
+}
+
+// This only converts the current CUE, it does not walk the list
+/*! \brief
+    \param
+*/
+int vtt_cue_to_caption_frame(vtt_block_t* cue, caption_frame_t* frame);
+
+// returns the new cue
+/*! \brief
+    \param
+*/
+vtt_block_t* vtt_cue_from_caption_frame(caption_frame_t* frame, vtt_t* vtt);
+/*! \brief
+    \param
+*/
+void vtt_dump(vtt_t* vtt);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

obs-studio-21.1.2.tar.xz/deps/libcaption/caption/xds.h -> obs-studio-22.0.1.tar.xz/deps/libcaption/caption/xds.h Changed

@@ -1,32 +1,48 @@
 /**********************************************************************************************/
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/* The MIT License                                                                            */
 /*                                                                                            */
-/* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file  */
-/* except in compliance with the License. A copy of the License is located at                 */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
 /*                                                                                            */
-/*     http://aws.amazon.com/apache2.0/                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
 /*                                                                                            */
-/* or in the "license" file accompanying this file. This file is distributed on an "AS IS"    */
-/* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the    */
-/* License for the specific language governing permissions and limitations under the License. */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
 /**********************************************************************************************/
-
 #ifndef LIBCAPTION_XDS_H
 #define LIBCAPTION_XDS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include <stddef.h>
 #include <inttypes.h>
+#include <stddef.h>
 
 typedef struct {
     int state;
-    uint8_t class;
+    uint8_t class_code;
     uint8_t type;
     uint32_t size;
     uint8_t content[32];
     uint8_t checksum;
 } xds_t;
 
-void xds_init (xds_t* xds);
-int xds_decode (xds_t* xds, uint16_t cc);
+void xds_init(xds_t* xds);
+int xds_decode(xds_t* xds, uint16_t cc);
 
+#ifdef __cplusplus
+}
+#endif
 #endif

obs-studio-21.1.2.tar.xz/deps/libcaption/src/caption.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/caption.c Changed

@@ -1,7 +1,7 @@
 /**********************************************************************************************/
 /* The MIT License                                                                            */
 /*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
 /*                                                                                            */
 /* Permission is hereby granted, free of charge, to any person obtaining a copy               */
 /* of this software and associated documentation files (the "Software"), to deal              */
@@ -21,78 +21,53 @@
 /* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
 /* THE SOFTWARE.                                                                              */
 /**********************************************************************************************/
+#include "caption.h"
+#include "eia608.h"
 #include "utf8.h"
 #include "xds.h"
-#include "eia608.h"
-#include "caption.h"
 #include <stdio.h>
 #include <string.h>
 ////////////////////////////////////////////////////////////////////////////////
-void caption_frame_buffer_clear (caption_frame_buffer_t* buff)
+void caption_frame_buffer_clear(caption_frame_buffer_t* buff)
 {
-    memset (buff,0,sizeof (caption_frame_buffer_t));
+    memset(buff, 0, sizeof(caption_frame_buffer_t));
 }
 
-void caption_frame_state_clear (caption_frame_t* frame)
+void caption_frame_state_clear(caption_frame_t* frame)
 {
+    frame->write = 0;
     frame->timestamp = -1;
-    frame->duration = 0;
-    frame->state = (caption_frame_state_t) {0,0,0,0,0,0,0}; // clear global state
+    frame->state = (caption_frame_state_t){ 0, 0, 0, SCREEN_ROWS - 1, 0, 0 }; // clear global state
 }
 
-void caption_frame_init (caption_frame_t* frame)
+void caption_frame_init(caption_frame_t* frame)
 {
-    caption_frame_state_clear (frame);
-    xds_init (&frame->xds);
-    caption_frame_buffer_clear (&frame->back);
-    caption_frame_buffer_clear (&frame->front);
+    xds_init(&frame->xds);
+    caption_frame_state_clear(frame);
+    caption_frame_buffer_clear(&frame->back);
+    caption_frame_buffer_clear(&frame->front);
 }
 ////////////////////////////////////////////////////////////////////////////////
-#define CAPTION_CLEAR     0
-#define CAPTION_POP_ON    2
-#define CAPTION_PAINT_ON  3
-#define CAPTION_ROLL_UP   4
-////////////////////////////////////////////////////////////////////////////////
 // Helpers
-static caption_frame_cell_t* frame_buffer_cell (caption_frame_buffer_t* buff, int row, int col)
-{
-    return &buff->cell[row][col];
-}
-
-static caption_frame_buffer_t* frame_write_buffer (caption_frame_t* frame)
+static caption_frame_cell_t* frame_buffer_cell(caption_frame_buffer_t* buff, int row, int col)
 {
-    if (CAPTION_POP_ON == frame->state.mod) {
-        return &frame->back;
-    } else if (CAPTION_PAINT_ON == frame->state.mod || CAPTION_ROLL_UP == frame->state.mod) {
-        return &frame->front;
-    } else {
+    if (!buff || 0 > row || SCREEN_ROWS <= row || 0 > col || SCREEN_COLS <= col) {
         return 0;
     }
-}
-
-static caption_frame_cell_t* frame_cell (caption_frame_t* frame, int row, int col)
-{
-    return frame_buffer_cell (&frame->front,row,col);
-}
 
-static caption_frame_cell_t* frame_cell_get (caption_frame_t* frame)
-{
-    return frame_cell (frame, frame->state.row, frame->state.col);
+    return &buff->cell[row][col];
 }
 
-////////////////////////////////////////////////////////////////////////////////
-uint16_t _eia608_from_utf8 (const char* s); // function is in eia608.c.re2c
-int caption_frame_write_char (caption_frame_t* frame, int row, int col, eia608_style_t style, int underline, const char* c)
+uint16_t _eia608_from_utf8(const char* s); // function is in eia608.c.re2c
+int caption_frame_write_char(caption_frame_t* frame, int row, int col, eia608_style_t style, int underline, const char* c)
 {
-    caption_frame_buffer_t* buff = frame_write_buffer (frame);
-
-    if (!buff || ! _eia608_from_utf8 (c)) {
+    if (!frame->write || !_eia608_from_utf8(c)) {
         return 0;
     }
 
-    caption_frame_cell_t* cell = frame_buffer_cell (buff,row,col);
+    caption_frame_cell_t* cell = frame_buffer_cell(frame->write, row, col);
 
-    if (utf8_char_copy (&cell->data[0],c)) {
+    if (cell && utf8_char_copy(&cell->data[0], c)) {
         cell->uln = underline;
         cell->sty = style;
         return 1;
@@ -101,9 +76,10 @@
     return 0;
 }
 
-const utf8_char_t* caption_frame_read_char (caption_frame_t* frame, int row, int col, eia608_style_t* style, int* underline)
+const utf8_char_t* caption_frame_read_char(caption_frame_t* frame, int row, int col, eia608_style_t* style, int* underline)
 {
-    caption_frame_cell_t* cell = frame_cell (frame, row, col);
+    // always read from front
+    caption_frame_cell_t* cell = frame_buffer_cell(&frame->front, row, col);
 
     if (!cell) {
         if (style) {
@@ -130,57 +106,54 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Parsing
-libcaption_stauts_t caption_frame_carriage_return (caption_frame_t* frame)
+libcaption_stauts_t caption_frame_carriage_return(caption_frame_t* frame)
 {
-    caption_frame_buffer_t* buff = frame_write_buffer (frame);
-
-    if (!buff) {
-        return LIBCAPTION_OK;
+    if (0 > frame->state.row || SCREEN_ROWS <= frame->state.row) {
+        return LIBCAPTION_ERROR;
     }
 
-    int r = frame->state.row - (frame->state.rup-1);
+    int r = frame->state.row - (frame->state.rup - 1);
 
-    if (0  >= r || CAPTION_ROLL_UP != frame->state.mod) {
+    if (0 >= r || !caption_frame_rollup(frame)) {
         return LIBCAPTION_OK;
     }
 
     for (; r < SCREEN_ROWS; ++r) {
-        uint8_t* dst = (uint8_t*) frame_buffer_cell (buff,r-1,0);
-        uint8_t* src = (uint8_t*) frame_buffer_cell (buff,r-0,0);
-        memcpy (dst,src,sizeof (caption_frame_cell_t) * SCREEN_COLS);
+        uint8_t* dst = (uint8_t*)frame_buffer_cell(frame->write, r - 1, 0);
+        uint8_t* src = (uint8_t*)frame_buffer_cell(frame->write, r - 0, 0);
+        memcpy(dst, src, sizeof(caption_frame_cell_t) * SCREEN_COLS);
     }
 
-    memset (frame_buffer_cell (buff,SCREEN_ROWS-1,0), 0,sizeof (caption_frame_cell_t) * SCREEN_COLS);
+    frame->state.col = 0;
+    caption_frame_cell_t* cell = frame_buffer_cell(frame->write, SCREEN_ROWS - 1, 0);
+    memset(cell, 0, sizeof(caption_frame_cell_t) * SCREEN_COLS);
     return LIBCAPTION_OK;
 }
 ////////////////////////////////////////////////////////////////////////////////
-libcaption_stauts_t eia608_write_char (caption_frame_t* frame, char* c)
+libcaption_stauts_t eia608_write_char(caption_frame_t* frame, char* c)
 {
-    if (0 == c || 0 == c[0] ||
-            SCREEN_ROWS <= frame->state.row || 0 > frame->state.row ||
-            SCREEN_COLS <= frame->state.col || 0 > frame->state.col) {
+    if (0 == c || 0 == c[0] || SCREEN_ROWS <= frame->state.row || 0 > frame->state.row || SCREEN_COLS <= frame->state.col || 0 > frame->state.col) {
         // NO-OP
-    } else if (caption_frame_write_char (frame,frame->state.row,frame->state.col,frame->state.sty,frame->state.uln, c)) {
+    } else if (caption_frame_write_char(frame, frame->state.row, frame->state.col, frame->state.sty, frame->state.uln, c)) {
         frame->state.col += 1;
     }
 
     return LIBCAPTION_OK;
 }
 
-libcaption_stauts_t caption_frame_end (caption_frame_t* frame)
+libcaption_stauts_t caption_frame_end(caption_frame_t* frame)
 {
-    memcpy (&frame->front,&frame->back,sizeof (caption_frame_buffer_t));
-    caption_frame_state_clear (frame);
-    caption_frame_buffer_clear (&frame->back);
+    memcpy(&frame->front, &frame->back, sizeof(caption_frame_buffer_t));
+    caption_frame_buffer_clear(&frame->back); // This is required
     return LIBCAPTION_READY;
 }
 
-libcaption_stauts_t caption_frame_decode_preamble (caption_frame_t* frame, uint16_t cc_data)
+libcaption_stauts_t caption_frame_decode_preamble(caption_frame_t* frame, uint16_t cc_data)
 {
     eia608_style_t sty;
     int row, col, chn, uln;
 
-    if (eia608_parse_preamble (cc_data, &row, &col, &sty, &chn, &uln)) {
+    if (eia608_parse_preamble(cc_data, &row, &col, &sty, &chn, &uln)) {
         frame->state.row = row;
         frame->state.col = col;
         frame->state.sty = sty;
@@ -190,12 +163,12 @@
     return LIBCAPTION_OK;
 }
 
-libcaption_stauts_t caption_frame_decode_midrowchange (caption_frame_t* frame, uint16_t cc_data)
+libcaption_stauts_t caption_frame_decode_midrowchange(caption_frame_t* frame, uint16_t cc_data)
 {
     eia608_style_t sty;
     int chn, unl;
 
-    if (eia608_parse_midrowchange (cc_data,&chn,&sty,&unl)) {
+    if (eia608_parse_midrowchange(cc_data, &chn, &sty, &unl)) {
         frame->state.sty = sty;
         frame->state.uln = unl;
     }
@@ -203,75 +176,83 @@
     return LIBCAPTION_OK;
 }
 
-libcaption_stauts_t caption_frame_backspace (caption_frame_t* frame)
+libcaption_stauts_t caption_frame_backspace(caption_frame_t* frame)
 {
     // do not reverse wrap (tw 28:20)
     frame->state.col = (0 < frame->state.col) ? (frame->state.col - 1) : 0;
-    caption_frame_write_char (frame,frame->state.row,frame->state.col,eia608_style_white,0,EIA608_CHAR_NULL);
+    caption_frame_write_char(frame, frame->state.row, frame->state.col, eia608_style_white, 0, EIA608_CHAR_NULL);
     return LIBCAPTION_READY;
 }
 
-libcaption_stauts_t caption_frame_decode_control (caption_frame_t* frame, uint16_t cc_data)
+libcaption_stauts_t caption_frame_delete_to_end_of_row(caption_frame_t* frame)
+{
+    int c;
+    if (frame->write) {
+        for (c = frame->state.col; c < SCREEN_COLS; ++c) {
+            caption_frame_write_char(frame, frame->state.row, c, eia608_style_white, 0, EIA608_CHAR_NULL);
+        }
+    }
+
+    // TODO test this and replace loop
+    //  uint8_t* dst = (uint8_t*)frame_buffer_cell(frame->write, frame->state.row, frame->state.col);
+    //  memset(dst,0,sizeof(caption_frame_cell_t) * (SCREEN_COLS - frame->state.col - 1))
+
+    return LIBCAPTION_READY;
+}
+
+libcaption_stauts_t caption_frame_decode_control(caption_frame_t* frame, uint16_t cc_data)
 {
     int cc;
-    eia608_control_t cmd = eia608_parse_control (cc_data,&cc);
+    eia608_control_t cmd = eia608_parse_control(cc_data, &cc);
 
     switch (cmd) {
     // PAINT ON
     case eia608_control_resume_direct_captioning:
         frame->state.rup = 0;
-        frame->state.mod = CAPTION_PAINT_ON;
+        frame->write = &frame->front;
         return LIBCAPTION_OK;
 
     case eia608_control_erase_display_memory:
-        caption_frame_buffer_clear (&frame->front);
-        return LIBCAPTION_OK;
+        caption_frame_buffer_clear(&frame->front);
+        return LIBCAPTION_READY;
 
     // ROLL-UP
     case eia608_control_roll_up_2:
         frame->state.rup = 1;
-        frame->state.mod = CAPTION_ROLL_UP;
+        frame->write = &frame->front;
         return LIBCAPTION_OK;
 
     case eia608_control_roll_up_3:
         frame->state.rup = 2;
-        frame->state.mod = CAPTION_ROLL_UP;
+        frame->write = &frame->front;
         return LIBCAPTION_OK;
 
     case eia608_control_roll_up_4:
         frame->state.rup = 3;
-        frame->state.mod = CAPTION_ROLL_UP;
+        frame->write = &frame->front;
         return LIBCAPTION_OK;
 
     case eia608_control_carriage_return:
-        return caption_frame_carriage_return (frame);
+        return caption_frame_carriage_return(frame);
 
     // Corrections (Is this only valid as part of paint on?)
     case eia608_control_backspace:
-        return caption_frame_backspace (frame);
-
-    case eia608_control_delete_to_end_of_row: {
-        int c;
-
-        for (c = frame->state.col ; c < SCREEN_COLS ; ++c) {
-            caption_frame_write_char (frame,frame->state.row,c,eia608_style_white,0,EIA608_CHAR_NULL);
-        }
-    }
-
-    return LIBCAPTION_READY;
+        return caption_frame_backspace(frame);
+    case eia608_control_delete_to_end_of_row:
+        return caption_frame_delete_to_end_of_row(frame);
 
     // POP ON
     case eia608_control_resume_caption_loading:
         frame->state.rup = 0;
-        frame->state.mod = CAPTION_POP_ON;
+        frame->write = &frame->back;
         return LIBCAPTION_OK;
 
     case eia608_control_erase_non_displayed_memory:
-        caption_frame_buffer_clear (&frame->back);
+        caption_frame_buffer_clear(&frame->back);
         return LIBCAPTION_OK;
 
     case eia608_control_end_of_caption:
-        return caption_frame_end (frame);
+        return caption_frame_end(frame);
 
     // cursor positioning
     case eia608_tab_offset_0:
@@ -291,201 +272,188 @@
     }
 }
 
-libcaption_stauts_t caption_frame_decode_text (caption_frame_t* frame, uint16_t cc_data)
+libcaption_stauts_t caption_frame_decode_text(caption_frame_t* frame, uint16_t cc_data)
 {
     int chan;
     char char1[5], char2[5];
-    size_t chars = eia608_to_utf8 (cc_data, &chan, &char1[0], &char2[0]);
+    size_t chars = eia608_to_utf8(cc_data, &chan, &char1[0], &char2[0]);
 
-    if (eia608_is_westeu (cc_data)) {
+    if (eia608_is_westeu(cc_data)) {
         // Extended charcters replace the previous charcter for back compatibility
-        caption_frame_backspace (frame);
+        caption_frame_backspace(frame);
     }
 
     if (0 < chars) {
-        eia608_write_char (frame,char1);
+        eia608_write_char(frame, char1);
     }
 
     if (1 < chars) {
-        eia608_write_char (frame,char2);
+        eia608_write_char(frame, char2);
     }
 
     return LIBCAPTION_OK;
 }
 
-libcaption_stauts_t caption_frame_decode (caption_frame_t* frame, uint16_t cc_data, double timestamp)
+libcaption_stauts_t caption_frame_decode(caption_frame_t* frame, uint16_t cc_data, double timestamp)
 {
-    libcaption_stauts_t status = LIBCAPTION_OK;
-
-    if (!eia608_parity_varify (cc_data)) {
-        return LIBCAPTION_ERROR;
+    if (!eia608_parity_varify(cc_data)) {
+        frame->status = LIBCAPTION_ERROR;
+        return frame->status;
     }
 
-    if (eia608_is_padding (cc_data)) {
-        return LIBCAPTION_OK;
+    if (eia608_is_padding(cc_data)) {
+        frame->status = LIBCAPTION_OK;
+        return frame->status;
     }
 
-    // skip duplicate controll commands. We also skip duplicate specialna to match the behaviour of iOS/vlc
-    if ( (eia608_is_specialna (cc_data) || eia608_is_control (cc_data)) && cc_data == frame->state.cc_data) {
-        return LIBCAPTION_OK;
+    if (0 > frame->timestamp || LIBCAPTION_READY == frame->status) {
+        frame->timestamp = timestamp;
     }
 
-    if (0 > frame->timestamp && 0 < timestamp) {
-        frame->timestamp = timestamp;
+    // skip duplicate controll commands. We also skip duplicate specialna to match the behaviour of iOS/vlc
+    if ((eia608_is_specialna(cc_data) || eia608_is_control(cc_data)) && cc_data == frame->state.cc_data) {
+        frame->status = LIBCAPTION_OK;
+        return frame->status;
     }
 
     frame->state.cc_data = cc_data;
 
     if (frame->xds.state) {
-        status = xds_decode (&frame->xds,cc_data);
-    } else if (eia608_is_xds (cc_data)) {
-        status = xds_decode (&frame->xds,cc_data);
-    } else if (eia608_is_control (cc_data)) {
-        status = caption_frame_decode_control (frame,cc_data);
-    } else if (eia608_is_basicna (cc_data) ||
-               eia608_is_specialna (cc_data) ||
-               eia608_is_westeu (cc_data)) {
+        frame->status = xds_decode(&frame->xds, cc_data);
+    } else if (eia608_is_xds(cc_data)) {
+        frame->status = xds_decode(&frame->xds, cc_data);
+    } else if (eia608_is_control(cc_data)) {
+        frame->status = caption_frame_decode_control(frame, cc_data);
+    } else if (eia608_is_basicna(cc_data) || eia608_is_specialna(cc_data) || eia608_is_westeu(cc_data)) {
 
         // Don't decode text if we dont know what mode we are in.
-        if (CAPTION_CLEAR == frame->state.mod) {
-            return LIBCAPTION_OK;
+        if (!frame->write) {
+            frame->status = LIBCAPTION_OK;
+            return frame->status;
         }
 
-        status = caption_frame_decode_text (frame,cc_data);
+        frame->status = caption_frame_decode_text(frame, cc_data);
 
         // If we are in paint on mode, display immiditally
-        if (1 == status && (CAPTION_PAINT_ON == frame->state.mod || CAPTION_ROLL_UP == frame->state.mod)) {
-            status = LIBCAPTION_READY;
+        if (LIBCAPTION_OK == frame->status && caption_frame_painton(frame)) {
+            frame->status = LIBCAPTION_READY;
         }
-    } else if (eia608_is_preamble (cc_data)) {
-        status = caption_frame_decode_preamble (frame,cc_data);
-    } else if (eia608_is_midrowchange (cc_data)) {
-        status = caption_frame_decode_midrowchange (frame,cc_data);
+    } else if (eia608_is_preamble(cc_data)) {
+        frame->status = caption_frame_decode_preamble(frame, cc_data);
+    } else if (eia608_is_midrowchange(cc_data)) {
+        frame->status = caption_frame_decode_midrowchange(frame, cc_data);
     }
 
-    return status;
+    return frame->status;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int caption_frame_from_text (caption_frame_t* frame, const utf8_char_t* data)
+int caption_frame_from_text(caption_frame_t* frame, const utf8_char_t* data)
 {
-    int r, c, chan = 0;
-    ssize_t size = (ssize_t) strlen (data);
-    size_t char_count, char_length, line_length = 0, trimmed_length = 0;
-    caption_frame_init (frame);
-    frame->state.mod = CAPTION_POP_ON;
-
-    for (r = 0 ; 0 < size && SCREEN_ROWS > r ; ++r) {
-        const utf8_char_t* cap_data = data;
-        line_length = utf8_line_length (cap_data);
-        trimmed_length = utf8_trimmed_length (cap_data,line_length);
-        char_count = utf8_char_count (cap_data,trimmed_length);
-
-        // If char_count is greater than one line can display, split it.
-        if (SCREEN_COLS < char_count) {
-            char_count = utf8_wrap_length (cap_data,SCREEN_COLS);
-            line_length = utf8_string_length (cap_data,char_count+1);
+    ssize_t size = (ssize_t)strlen(data);
+    caption_frame_init(frame);
+    frame->write = &frame->back;
+
+    for (size_t r = 0; (*data) && size && r < SCREEN_ROWS;) {
+        // skip whitespace at start of line
+        while (size && utf8_char_whitespace(data)) {
+            size_t s = utf8_char_length(data);
+            data += s, size -= (ssize_t)s;
         }
 
-        // Write the line
-        for (c = 0 ; c < (int) char_count ; ++c) {
-            caption_frame_write_char (frame,r,c,eia608_style_white,0,&cap_data[0]);
-            char_length = utf8_char_length (cap_data);
-            cap_data += char_length;
+        // get charcter count for wrap (or orest of line)
+        utf8_size_t char_count = utf8_wrap_length(data, SCREEN_COLS);
+        // write to caption frame
+        for (size_t c = 0; c < char_count; ++c) {
+            size_t char_length = utf8_char_length(data);
+            caption_frame_write_char(frame, (int)r, (int)c, eia608_style_white, 0, data);
+            data += char_length, size -= (ssize_t)char_length;
         }
 
-        data += line_length;
-        size -= (ssize_t) line_length;
+        r += char_count ? 1 : 0; // Update row num only if not blank
     }
 
-    caption_frame_end (frame);
+    caption_frame_end(frame);
     return 0;
 }
 ////////////////////////////////////////////////////////////////////////////////
-void caption_frame_to_text (caption_frame_t* frame, utf8_char_t* data)
+size_t caption_frame_to_text(caption_frame_t* frame, utf8_char_t* data)
 {
-    int r, c, x, s, uln;
+    int r, c, uln, crlf = 0, count = 0;
+    size_t s, size = 0;
     eia608_style_t sty;
-
-    data[0] = 0;
-
-    for (r = 0 ; r < SCREEN_ROWS ; ++r) {
-        for (c = 0, x = 0 ; c < SCREEN_COLS ; ++c) {
-            const char* chr  = caption_frame_read_char (frame, r, c, &sty, &uln);
-
-            if (0 < (s = (int) utf8_char_copy (data,chr))) {
-                ++x; data += s;
+    (*data) = '\0';
+
+    for (r = 0; r < SCREEN_ROWS; ++r) {
+        crlf += count, count = 0;
+        for (c = 0; c < SCREEN_COLS; ++c) {
+            const utf8_char_t* chr = caption_frame_read_char(frame, r, c, &sty, &uln);
+            // dont start a new line until we encounter at least one printable character
+            if (0 < utf8_char_length(chr) && (0 < count || !utf8_char_whitespace(chr))) {
+                if (0 < crlf) {
+                    memcpy(data, "\r\n\0", 3);
+                    data += 2, size += 2, crlf = 0;
+                }
+
+                s = utf8_char_copy(data, chr);
+                data += s, size += s, ++count;
             }
         }
-
-        if (x) {
-            strcpy ( (char*) data,"\r\n");
-            data += 2;
-        }
     }
+
+    return size;
 }
 ////////////////////////////////////////////////////////////////////////////////
-size_t caption_frame_dump_buffer (caption_frame_t* frame, utf8_char_t* buf)
+size_t caption_frame_dump_buffer(caption_frame_t* frame, utf8_char_t* buf)
 {
     int r, c;
     size_t bytes, total = 0;
-    bytes = sprintf (buf, "   row: %d\tcol: %d\n   mode: %s\troll-up: %d\n",
-                     frame->state.row, frame->state.col,
-                     eia608_mode_map[frame->state.mod],frame->state.rup?1+frame->state.rup:0);
-    total += bytes; buf += bytes;
-    bytes = sprintf (buf, "   00000000001111111111222222222233\n   01234567890123456789012345678901\n  %s--------------------------------%s\n",
-                     EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT, EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT);
-    total += bytes; buf += bytes;
-
-    for (r = 0 ; r < SCREEN_ROWS ; ++r) {
-        bytes = sprintf (buf, "%02d%s", r, EIA608_CHAR_VERTICAL_LINE);
-        total += bytes; buf += bytes;
-
-        for (c = 0 ; c < SCREEN_COLS ; ++c) {
-            caption_frame_cell_t* cell = frame_cell (frame,r,c);
-            bytes = utf8_char_copy (buf, (0==cell->data[0]) ?EIA608_CHAR_SPACE:&cell->data[0]);
-            total += bytes; buf += bytes;
+    bytes = sprintf(buf, "   timestamp: %f\n   row: %02d    col: %02d    roll-up: %d\n",
+        frame->timestamp, frame->state.row, frame->state.col, caption_frame_rollup(frame));
+    total += bytes, buf += bytes;
+    bytes = sprintf(buf, "   00000000001111111111222222222233\t   00000000001111111111222222222233\n"
+                         "   01234567890123456789012345678901\t   01234567890123456789012345678901\n"
+                         "  %s--------------------------------%s\t  %s--------------------------------%s\n",
+        EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT, EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT,
+        EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT, EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT);
+    total += bytes;
+    buf += bytes;
+
+    for (r = 0; r < SCREEN_ROWS; ++r) {
+        bytes = sprintf(buf, "%02d%s", r, EIA608_CHAR_VERTICAL_LINE);
+        total += bytes, buf += bytes;
+
+        // front buffer
+        for (c = 0; c < SCREEN_COLS; ++c) {
+            caption_frame_cell_t* cell = frame_buffer_cell(&frame->front, r, c);
+            bytes = utf8_char_copy(buf, (!cell || 0 == cell->data[0]) ? EIA608_CHAR_SPACE : &cell->data[0]);
+            total += bytes, buf += bytes;
+        }
+
+        bytes = sprintf(buf, "%s\t%02d%s", EIA608_CHAR_VERTICAL_LINE, r, EIA608_CHAR_VERTICAL_LINE);
+        total += bytes, buf += bytes;
+
+        // back buffer
+        for (c = 0; c < SCREEN_COLS; ++c) {
+            caption_frame_cell_t* cell = frame_buffer_cell(&frame->back, r, c);
+            bytes = utf8_char_copy(buf, (!cell || 0 == cell->data[0]) ? EIA608_CHAR_SPACE : &cell->data[0]);
+            total += bytes, buf += bytes;
         }
 
-        bytes = sprintf (buf, "%s\n", EIA608_CHAR_VERTICAL_LINE);
-        total += bytes; buf += bytes;
+        bytes = sprintf(buf, "%s\n", EIA608_CHAR_VERTICAL_LINE);
+        total += bytes, buf += bytes;
     }
 
-    bytes = sprintf (buf, "  %s--------------------------------%s\n",
-                     EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT, EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT);
-    total += bytes; buf += bytes;
+    bytes = sprintf(buf, "  %s--------------------------------%s\t  %s--------------------------------%s\n",
+        EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT, EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT,
+        EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT, EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT);
+    total += bytes, buf += bytes;
     return total;
 }
 
-void caption_frame_dump (caption_frame_t* frame)
+void caption_frame_dump(caption_frame_t* frame)
 {
     utf8_char_t buff[CAPTION_FRAME_DUMP_BUF_SIZE];
-    size_t size = caption_frame_dump_buffer (frame, buff);
-    fprintf (stderr,"%s\n", buff);
-}
-
-size_t caption_frame_json (caption_frame_t* frame, utf8_char_t* buf)
-{
-    size_t bytes, total = 0;
-    int r,c,count = 0;
-    bytes = sprintf (buf, "{\"format\":\"eia608\",\"mode\":\"%s\",\"rollUp\":%d,\"data\":[",
-                     eia608_mode_map[frame->state.mod],frame->state.rup?1+frame->state.rup:0);
-    total += bytes; buf += bytes;
-
-    for (r = 0 ; r < SCREEN_ROWS ; ++r) {
-        for (c = 0 ; c < SCREEN_COLS ; ++c) {
-            caption_frame_cell_t* cell = frame_cell (frame,r,c);
-
-            if (0 != cell->data[0]) {
-                const char* data = ('"' == cell->data[0]) ?"\\\"": (const char*) &cell->data[0]; //escape quote
-                bytes = sprintf (buf, "%s\n{\"row\":%d,\"col\":%d,\"char\":\"%s\",\"style\":\"%s\"}",
-                                 (0<count?",":""),r,c,data,eia608_style_map[cell->sty]);
-                total += bytes; buf += bytes; ++count;
-            }
-        }
-    }
-
-    bytes = sprintf (buf, "\n]}\n");
-    total += bytes; buf += bytes;
-    return total;
+    caption_frame_dump_buffer(frame, buff);
+    fprintf(stderr, "%s\n", buff);
 }

obs-studio-21.1.2.tar.xz/deps/libcaption/src/cea708.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/cea708.c Changed

obs-studio-22.0.1.tar.xz/deps/libcaption/src/dvtcc.c Added

obs-studio-21.1.2.tar.xz/deps/libcaption/src/eia608.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/eia608.c Changed

@@ -1,8 +1,7 @@
-/* Generated by re2c 0.15.3 on Tue Nov 22 15:42:35 2016 */
 /**********************************************************************************************/
 /* The MIT License                                                                            */
 /*                                                                                            */
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
 /*                                                                                            */
 /* Permission is hereby granted, free of charge, to any person obtaining a copy               */
 /* of this software and associated documentation files (the "Software"), to deal              */
@@ -23,20 +22,12 @@
 /* THE SOFTWARE.                                                                              */
 /**********************************************************************************************/
 #include "eia608.h"
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-int eia608_row_map[] = {10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6, 7, 8, 9};
-int eia608_reverse_row_map[] = {2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 0, 6, 7, 8, 9, 1};
-
-const char* eia608_mode_map[] = {
-    "clear",
-    "loading",
-    "popOn",
-    "paintOn",
-    "rollUp",
-};
+int eia608_row_map[] = { 10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6, 7, 8, 9 };
+int eia608_reverse_row_map[] = { 2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 0, 6, 7, 8, 9, 1 };
 
 const char* eia608_style_map[] = {
     "white",
@@ -49,24 +40,25 @@
     "italics",
 };
 
-static inline uint16_t eia608_row_pramble (int row, int chan, int x, int underline)
+static inline uint16_t eia608_row_pramble(int row, int chan, int x, int underline)
 {
-    row = eia608_reverse_row_map[row&0x0F];
-    return eia608_parity (0x1040 | (chan?0x0800:0x0000) | ( (row<<7) &0x0700) | ( (row<<5) &0x0020)) | ( (x<<1) &0x001E) | (underline?0x0001:0x0000);
+    row = eia608_reverse_row_map[row & 0x0F];
+    return eia608_parity(0x1040 | (chan ? 0x0800 : 0x0000) | ((row << 7) & 0x0700) | ((row << 5) & 0x0020)) | ((x << 1) & 0x001E) | (underline ? 0x0001 : 0x0000);
 }
 
-uint16_t eia608_row_column_pramble (int row, int col, int chan, int underline) { return eia608_row_pramble (row,chan,0x10| (col/4),underline); }
-uint16_t eia608_row_style_pramble (int row, eia608_style_t style, int chan, int underline) { return eia608_row_pramble (row,chan,style,underline); }
+uint16_t eia608_row_column_pramble(int row, int col, int chan, int underline) { return eia608_row_pramble(row, chan, 0x10 | (col / 4), underline); }
+uint16_t eia608_row_style_pramble(int row, int chan, eia608_style_t style, int underline) { return eia608_row_pramble(row, chan, style, underline); }
+uint16_t eia608_midrow_change(int chan, eia608_style_t style, int underline) { return eia608_parity(0x1120 | ((chan << 11) & 0x0800) | ((style << 1) & 0x000E) | (underline & 0x0001)); }
 
-int eia608_parse_preamble (uint16_t cc_data, int* row, int* col, eia608_style_t* style, int* chan, int* underline)
+int eia608_parse_preamble(uint16_t cc_data, int* row, int* col, eia608_style_t* style, int* chan, int* underline)
 {
-    (*row) = eia608_row_map[ ( (0x0700 & cc_data) >> 7) | ( (0x0020 & cc_data) >> 5)];
-    (*chan) = !! (0x0800 & cc_data);
+    (*row) = eia608_row_map[((0x0700 & cc_data) >> 7) | ((0x0020 & cc_data) >> 5)];
+    (*chan) = !!(0x0800 & cc_data);
     (*underline) = 0x0001 & cc_data;
 
     if (0x0010 & cc_data) {
         (*style) = eia608_style_white;
-        (*col) = 4* ( (0x000E & cc_data) >> 1);
+        (*col) = 4 * ((0x000E & cc_data) >> 1);
     } else {
         (*style) = (0x000E & cc_data) >> 1;
         (*col) = 0;
@@ -75,9 +67,9 @@
     return 1;
 }
 
-int eia608_parse_midrowchange (uint16_t cc_data, int* chan, eia608_style_t* style, int* underline)
+int eia608_parse_midrowchange(uint16_t cc_data, int* chan, eia608_style_t* style, int* underline)
 {
-    (*chan) = !! (0x0800 & cc_data);
+    (*chan) = !!(0x0800 & cc_data);
 
     if (0x1120 == (0x7770 & cc_data)) {
         (*style) = (0x000E & cc_data) >> 1;
@@ -88,43 +80,44 @@
 }
 ////////////////////////////////////////////////////////////////////////////////
 // control command
-eia608_control_t eia608_parse_control (uint16_t cc_data, int* cc)
+eia608_control_t eia608_parse_control(uint16_t cc_data, int* cc)
 {
-    if (0x0200&cc_data) {
-        (*cc) = (cc_data&0x0800?0x01:0x00);
-        return (eia608_control_t) (0x177F & cc_data);
+    if (0x0200 & cc_data) {
+        (*cc) = (cc_data & 0x0800 ? 0x01 : 0x00);
+        return (eia608_control_t)(0x177F & cc_data);
     } else {
-        (*cc) = (cc_data&0x0800?0x01:0x00) | (cc_data&0x0100?0x02:0x00);
-        return (eia608_control_t) (0x167F & cc_data);
+        (*cc) = (cc_data & 0x0800 ? 0x01 : 0x00) | (cc_data & 0x0100 ? 0x02 : 0x00);
+        return (eia608_control_t)(0x167F & cc_data);
     }
 }
 
-uint16_t eia608_control_command (eia608_control_t cmd, int cc)
+uint16_t eia608_control_command(eia608_control_t cmd, int cc)
 {
-    uint16_t c = (cc&0x01) ?0x0800:0x0000;
-    uint16_t f = (cc&0x02) ?0x0100:0x0000;
+    uint16_t c = (cc & 0x01) ? 0x0800 : 0x0000;
+    uint16_t f = (cc & 0x02) ? 0x0100 : 0x0000;
 
-    if (eia608_tab_offset_0 == (eia608_control_t) (cmd&0xFFC0)) {
-        return (eia608_control_t) eia608_parity (cmd|c);
+    if (eia608_tab_offset_0 == (eia608_control_t)(cmd & 0xFFC0)) {
+        return (eia608_control_t)eia608_parity(cmd | c);
     } else {
-        return (eia608_control_t) eia608_parity (cmd|c|f);
+        return (eia608_control_t)eia608_parity(cmd | c | f);
     }
 }
 ////////////////////////////////////////////////////////////////////////////////
 // text
-static const char* utf8_from_index (int idx) { return (0<=idx && EIA608_CHAR_COUNT>idx) ? eia608_char_map[idx] : ""; }
-static int eia608_to_index (uint16_t cc_data, int* chan, int* c1, int* c2)
+static const char* utf8_from_index(int idx) { return (0 <= idx && EIA608_CHAR_COUNT > idx) ? eia608_char_map[idx] : ""; }
+static int eia608_to_index(uint16_t cc_data, int* chan, int* c1, int* c2)
 {
-    (*c1) = (*c2) = -1; (*chan) = 0;
+    (*c1) = (*c2) = -1;
+    (*chan) = 0;
     cc_data &= 0x7F7F; // strip off parity bits
 
     // Handle Basic NA BEFORE we strip the channel bit
-    if (eia608_is_basicna (cc_data)) {
+    if (eia608_is_basicna(cc_data)) {
         // we got first char, yes. But what about second char?
-        (*c1) = (cc_data>>8) - 0x20;
+        (*c1) = (cc_data >> 8) - 0x20;
         cc_data &= 0x00FF;
 
-        if (0x0020<=cc_data && 0x0080>cc_data) {
+        if (0x0020 <= cc_data && 0x0080 > cc_data) {
             (*c2) = cc_data - 0x20;
             return 2;
         }
@@ -136,19 +129,19 @@
     (*chan) = cc_data & 0x0800;
     cc_data = cc_data & 0xF7FF;
 
-    if (eia608_is_specialna (cc_data)) {
+    if (eia608_is_specialna(cc_data)) {
         // Special North American character
         (*c1) = cc_data - 0x1130 + 0x60;
         return 1;
     }
 
-    if (0x1220<=cc_data && 0x1240>cc_data) {
+    if (0x1220 <= cc_data && 0x1240 > cc_data) {
         // Extended Western European character set, Spanish/Miscellaneous/French
         (*c1) = cc_data - 0x1220 + 0x70;
         return 1;
     }
 
-    if (0x1320<=cc_data && 0x1340>cc_data) {
+    if (0x1320 <= cc_data && 0x1340 > cc_data) {
         // Extended Western European character set, Portuguese/German/Danish
         (*c1) = cc_data - 0x1320 + 0x90;
         return 1;
@@ -157,50 +150,49 @@
     return 0;
 }
 
-
-int eia608_to_utf8 (uint16_t c, int* chan, char* str1,  char* str2)
+int eia608_to_utf8(uint16_t c, int* chan, char* str1, char* str2)
 {
     int c1, c2;
-    size_t size = eia608_to_index (c,chan,&c1,&c2);
-    strncpy (str1, utf8_from_index (c1),5);
-    strncpy (str2, utf8_from_index (c2),5);
-    return (int)size;
+    int size = (int)eia608_to_index(c, chan, &c1, &c2);
+    utf8_char_copy(str1, utf8_from_index(c1));
+    utf8_char_copy(str2, utf8_from_index(c2));
+    return size;
 }
 
-uint16_t eia608_from_basicna (uint16_t bna1, uint16_t bna2)
+uint16_t eia608_from_basicna(uint16_t bna1, uint16_t bna2)
 {
-    if (! eia608_is_basicna (bna1) || ! eia608_is_basicna (bna2)) {
+    if (!eia608_is_basicna(bna1) || !eia608_is_basicna(bna2)) {
         return 0;
     }
 
-    return eia608_parity ( ( (0xFF00&bna1) >>0) | ( (0xFF00&bna2) >>8));
+    return eia608_parity((0xFF00 & bna1) | ((0xFF00 & bna2) >> 8));
 }
 
 // prototype for re2c generated function
-uint16_t _eia608_from_utf8 (const utf8_char_t* s);
-uint16_t eia608_from_utf8_1 (const utf8_char_t* c, int chan)
+uint16_t _eia608_from_utf8(const utf8_char_t* s);
+uint16_t eia608_from_utf8_1(const utf8_char_t* c, int chan)
 {
-    uint16_t cc_data = _eia608_from_utf8 (c);
+    uint16_t cc_data = _eia608_from_utf8(c);
 
     if (0 == cc_data) {
         return cc_data;
     }
 
-    if (chan && ! eia608_is_basicna (cc_data)) {
+    if (chan && !eia608_is_basicna(cc_data)) {
         cc_data |= 0x0800;
     }
 
-    return eia608_parity (cc_data);
+    return eia608_parity(cc_data);
 }
 
-uint16_t eia608_from_utf8_2 (const utf8_char_t* c1, const utf8_char_t* c2)
+uint16_t eia608_from_utf8_2(const utf8_char_t* c1, const utf8_char_t* c2)
 {
-    uint16_t cc1 = _eia608_from_utf8 (c1);
-    uint16_t cc2 = _eia608_from_utf8 (c2);
-    return eia608_from_basicna (cc1,cc2);
+    uint16_t cc1 = _eia608_from_utf8(c1);
+    uint16_t cc2 = _eia608_from_utf8(c2);
+    return eia608_from_basicna(cc1, cc2);
 }
 ////////////////////////////////////////////////////////////////////////////////
-void eia608_dump (uint16_t cc_data)
+void eia608_dump(uint16_t cc_data)
 {
     eia608_style_t style;
     const char* text = 0;
@@ -208,547 +200,116 @@
     char1[0] = char2[0] = 0;
     int row, col, chan, underline;
 
-    if (!eia608_parity_varify (cc_data)) {
+    if (!eia608_parity_varify(cc_data)) {
         text = "parity failed";
-    } else if (0 == eia608_parity_strip (cc_data)) {
+    } else if (0 == eia608_parity_strip(cc_data)) {
         text = "pad";
-    } else if (eia608_is_basicna (cc_data)) {
+    } else if (eia608_is_basicna(cc_data)) {
         text = "basicna";
-        eia608_to_utf8 (cc_data,&chan,&char1[0],&char2[0]);
-    } else if (eia608_is_specialna (cc_data)) {
+        eia608_to_utf8(cc_data, &chan, &char1[0], &char2[0]);
+    } else if (eia608_is_specialna(cc_data)) {
         text = "specialna";
-        eia608_to_utf8 (cc_data,&chan,&char1[0],&char2[0]);
-    } else if (eia608_is_westeu (cc_data)) {
+        eia608_to_utf8(cc_data, &chan, &char1[0], &char2[0]);
+    } else if (eia608_is_westeu(cc_data)) {
         text = "westeu";
-        eia608_to_utf8 (cc_data,&chan,&char1[0],&char2[0]);
-    } else if (eia608_is_xds (cc_data)) {
+        eia608_to_utf8(cc_data, &chan, &char1[0], &char2[0]);
+    } else if (eia608_is_xds(cc_data)) {
         text = "xds";
-    } else if (eia608_is_midrowchange (cc_data)) {
+    } else if (eia608_is_midrowchange(cc_data)) {
         text = "midrowchange";
-    } else if (eia608_is_norpak (cc_data)) {
+    } else if (eia608_is_norpak(cc_data)) {
         text = "norpak";
-    } else if (eia608_is_preamble (cc_data)) {
+    } else if (eia608_is_preamble(cc_data)) {
         text = "preamble";
-        eia608_parse_preamble (cc_data, &row, &col, &style, &chan, &underline);
-        fprintf (stderr,"preamble %d %d %d %d %d\n", row, col, style, chan, underline);
+        eia608_parse_preamble(cc_data, &row, &col, &style, &chan, &underline);
+        fprintf(stderr, "preamble %d %d %d %d %d\n", row, col, style, chan, underline);
 
-    } else if (eia608_is_control (cc_data)) {
-        switch (eia608_parse_control (cc_data,&chan)) {
+    } else if (eia608_is_control(cc_data)) {
+        switch (eia608_parse_control(cc_data, &chan)) {
 
-        default: text = "unknown_control"; break;
+        default:
+            text = "unknown_control";
+            break;
 
-        case eia608_tab_offset_0: text = "eia608_tab_offset_0"; break;
+        case eia608_tab_offset_0:
+            text = "eia608_tab_offset_0";
+            break;
 
-        case eia608_tab_offset_1: text = "eia608_tab_offset_1"; break;
+        case eia608_tab_offset_1:
+            text = "eia608_tab_offset_1";
+            break;
 
-        case eia608_tab_offset_2:text = "eia608_tab_offset_2"; break;
+        case eia608_tab_offset_2:
+            text = "eia608_tab_offset_2";
+            break;
 
-        case eia608_tab_offset_3: text = "eia608_tab_offset_3"; break;
+        case eia608_tab_offset_3:
+            text = "eia608_tab_offset_3";
+            break;
 
-        case eia608_control_resume_caption_loading: text = "eia608_control_resume_caption_loading"; break;
+        case eia608_control_resume_caption_loading:
+            text = "eia608_control_resume_caption_loading";
+            break;
 
-        case eia608_control_backspace: text = "eia608_control_backspace"; break;
+        case eia608_control_backspace:
+            text = "eia608_control_backspace";
+            break;
 
-        case eia608_control_alarm_off: text = "eia608_control_alarm_off"; break;
+        case eia608_control_alarm_off:
+            text = "eia608_control_alarm_off";
+            break;
 
-        case eia608_control_alarm_on: text = "eia608_control_alarm_on"; break;
+        case eia608_control_alarm_on:
+            text = "eia608_control_alarm_on";
+            break;
 
-        case eia608_control_delete_to_end_of_row: text = "eia608_control_delete_to_end_of_row"; break;
+        case eia608_control_delete_to_end_of_row:
+            text = "eia608_control_delete_to_end_of_row";
+            break;
 
-        case eia608_control_roll_up_2: text = "eia608_control_roll_up_2"; break;
+        case eia608_control_roll_up_2:
+            text = "eia608_control_roll_up_2";
+            break;
 
-        case eia608_control_roll_up_3: text = "eia608_control_roll_up_3"; break;
+        case eia608_control_roll_up_3:
+            text = "eia608_control_roll_up_3";
+            break;
 
-        case eia608_control_roll_up_4: text = "eia608_control_roll_up_4"; break;
+        case eia608_control_roll_up_4:
+            text = "eia608_control_roll_up_4";
+            break;
 
-        case eia608_control_resume_direct_captioning: text = "eia608_control_resume_direct_captioning"; break;
+        case eia608_control_resume_direct_captioning:
+            text = "eia608_control_resume_direct_captioning";
+            break;
 
-        case eia608_control_text_restart: text = "eia608_control_text_restart"; break;
+        case eia608_control_text_restart:
+            text = "eia608_control_text_restart";
+            break;
 
-        case eia608_control_text_resume_text_display: text = "eia608_control_text_resume_text_display"; break;
+        case eia608_control_text_resume_text_display:
+            text = "eia608_control_text_resume_text_display";
+            break;
 
-        case eia608_control_erase_display_memory: text = "eia608_control_erase_display_memory"; break;
+        case eia608_control_erase_display_memory:
+            text = "eia608_control_erase_display_memory";
+            break;
 
-        case eia608_control_carriage_return: text = "eia608_control_carriage_return"; break;
+        case eia608_control_carriage_return:
+            text = "eia608_control_carriage_return";
+            break;
 
-        case eia608_control_erase_non_displayed_memory:text = "eia608_control_erase_non_displayed_memory"; break;
+        case eia608_control_erase_non_displayed_memory:
+            text = "eia608_control_erase_non_displayed_memory";
+            break;
 
-        case eia608_control_end_of_caption: text = "eia608_control_end_of_caption"; break;
+        case eia608_control_end_of_caption:
+            text = "eia608_control_end_of_caption";
+            break;
         }
     } else {
         text = "unhandled";
     }
 
-    fprintf (stderr,"cc %04X (%04X) '%s' '%s' (%s)\n", cc_data, eia608_parity_strip (cc_data), char1, char2, text);
-}
-////////////////////////////////////////////////////////////////////////////////
-// below this line is re2c
-uint16_t _eia608_from_utf8 (const utf8_char_t* s)
-{
-    const unsigned char* YYMARKER; // needed by default rule
-    const unsigned char* YYCURSOR = (const unsigned char*) s;
-
-    if (0==s) { return 0x0000;}
-
-    
-{
-    unsigned char yych;
-    yych = *YYCURSOR;
-    if (yych <= '`') {
-        if (yych <= '*') {
-            if (yych <= '&') {
-                if (yych <= 0x00) goto yy2;
-                if (yych <= 0x1F) goto yy32;
-                goto yy26;
-            } else {
-                if (yych <= '\'') goto yy4;
-                if (yych <= ')') goto yy26;
-                goto yy6;
-            }
-        } else {
-            if (yych <= ']') {
-                if (yych == '\\') goto yy8;
-                goto yy26;
-            } else {
-                if (yych <= '^') goto yy10;
-                if (yych <= '_') goto yy12;
-                goto yy14;
-            }
-        }
-    } else {
-        if (yych <= 0x7F) {
-            if (yych <= '|') {
-                if (yych <= 'z') goto yy26;
-                if (yych <= '{') goto yy16;
-                goto yy18;
-            } else {
-                if (yych <= '}') goto yy20;
-                if (yych <= '~') goto yy22;
-                goto yy24;
-            }
-        } else {
-            if (yych <= 0xC3) {
-                if (yych <= 0xC1) goto yy32;
-                if (yych <= 0xC2) goto yy31;
-                goto yy28;
-            } else {
-                if (yych == 0xE2) goto yy30;
-                goto yy32;
-            }
-        }
-    }
-yy2:
-    ++YYCURSOR;
-    { /*NULL*/ return 0x0000; }
-yy4:
-    ++YYCURSOR;
-    { /*APOSTROPHE -> RIGHT_SINGLE_QUOTATION_MARK*/ return 0x1229; }
-yy6:
-    ++YYCURSOR;
-    { /*ASTERISK*/ return 0x1228; }
-yy8:
-    ++YYCURSOR;
-    { /*REVERSE_SOLIDUS*/ return 0x132B; }
-yy10:
-    ++YYCURSOR;
-    { /*CIRCUMFLEX_ACCENT*/ return 0x132C; }
-yy12:
-    ++YYCURSOR;
-    { /*LOW_LINE*/ return 0x132D; }
-yy14:
-    ++YYCURSOR;
-    { /*GRAVE_ACCENT, No equivalent return 0x0000; return 1;*/ /*LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
-yy16:
-    ++YYCURSOR;
-    { /*LEFT_CURLY_BRACKET*/ return 0x1329; }
-yy18:
-    ++YYCURSOR;
-    { /*VERTICAL_LINE*/ return 0x132E; }
-yy20:
-    ++YYCURSOR;
-    { /*RIGHT_CURLY_BRACKET*/ return 0x132A; }
-yy22:
-    ++YYCURSOR;
-    { /*TILDE*/ return 0x132F; }
-yy24:
-    ++YYCURSOR;
-    { /*DEL/BACKSPACE. Need to set bits 9 and 12! return 0x1421;*/ return 0x0000; }
-yy26:
-    ++YYCURSOR;
-    { /*ASCII range*/ return (s[0]<<8) &0xFF00; }
-yy28:
-    ++YYCURSOR;
-    switch ((yych = *YYCURSOR)) {
-    case 0x80:    goto yy157;
-    case 0x81:    goto yy169;
-    case 0x82:    goto yy155;
-    case 0x83:    goto yy129;
-    case 0x84:    goto yy111;
-    case 0x85:    goto yy101;
-    case 0x87:    goto yy153;
-    case 0x88:    goto yy151;
-    case 0x89:    goto yy167;
-    case 0x8A:    goto yy149;
-    case 0x8B:    goto yy147;
-    case 0x8C:    goto yy123;
-    case 0x8D:    goto yy125;
-    case 0x8E:    goto yy143;
-    case 0x8F:    goto yy141;
-    case 0x91:    goto yy187;
-    case 0x92:    goto yy119;
-    case 0x93:    goto yy165;
-    case 0x94:    goto yy137;
-    case 0x95:    goto yy115;
-    case 0x96:    goto yy107;
-    case 0x98:    goto yy97;
-    case 0x99:    goto yy135;
-    case 0x9A:    goto yy163;
-    case 0x9B:    goto yy131;
-    case 0x9C:    goto yy161;
-    case 0x9F:    goto yy103;
-    case 0xA0:    goto yy183;
-    case 0xA1:    goto yy201;
-    case 0xA2:    goto yy179;
-    case 0xA3:    goto yy127;
-    case 0xA4:    goto yy109;
-    case 0xA5:    goto yy99;
-    case 0xA7:    goto yy191;
-    case 0xA8:    goto yy181;
-    case 0xA9:    goto yy199;
-    case 0xAA:    goto yy177;
-    case 0xAB:    goto yy145;
-    case 0xAC:    goto yy121;
-    case 0xAD:    goto yy197;
-    case 0xAE:    goto yy175;
-    case 0xAF:    goto yy139;
-    case 0xB1:    goto yy185;
-    case 0xB2:    goto yy117;
-    case 0xB3:    goto yy195;
-    case 0xB4:    goto yy173;
-    case 0xB5:    goto yy113;
-    case 0xB6:    goto yy105;
-    case 0xB7:    goto yy189;
-    case 0xB8:    goto yy95;
-    case 0xB9:    goto yy133;
-    case 0xBA:    goto yy193;
-    case 0xBB:    goto yy171;
-    case 0xBC:    goto yy159;
-    default:    goto yy29;
-    }
-yy29:
-    { /*DEFAULT_RULE*/ return 0x0000; }
-yy30:
-    yych = *(YYMARKER = ++YYCURSOR);
-    switch (yych) {
-    case 0x80:    goto yy63;
-    case 0x84:    goto yy64;
-    case 0x94:    goto yy61;
-    case 0x96:    goto yy66;
-    case 0x99:    goto yy65;
-    default:    goto yy29;
-    }
-yy31:
-    yych = *++YYCURSOR;
-    switch (yych) {
-    case 0xA0:    goto yy47;
-    case 0xA1:    goto yy45;
-    case 0xA2:    goto yy51;
-    case 0xA3:    goto yy49;
-    case 0xA4:    goto yy35;
-    case 0xA5:    goto yy37;
-    case 0xA6:    goto yy33;
-    case 0xA9:    goto yy43;
-    case 0xAB:    goto yy41;
-    case 0xAE:    goto yy59;
-    case 0xB0:    goto yy57;
-    case 0xBB:    goto yy39;
-    case 0xBD:    goto yy55;
-    case 0xBF:    goto yy53;
-    default:    goto yy29;
-    }
-yy32:
-    yych = *++YYCURSOR;
-    goto yy29;
-yy33:
-    ++YYCURSOR;
-    { /*BROKEN_BAR*/ return 0x1337; }
-yy35:
-    ++YYCURSOR;
-    { /*CURRENCY_SIGN*/ return 0x1336; }
-yy37:
-    ++YYCURSOR;
-    { /*YEN_SIGN*/ return 0x1335; }
-yy39:
-    ++YYCURSOR;
-    { /*RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123F; }
-yy41:
-    ++YYCURSOR;
-    { /*LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123E; }
-yy43:
-    ++YYCURSOR;
-    { /*COPYRIGHT_SIGN*/ return 0x122B; }
-yy45:
-    ++YYCURSOR;
-    { /*INVERTED_EXCLAMATION_MARK*/ return 0x1227; }
-yy47:
-    ++YYCURSOR;
-    { /*NO_BREAK_SPACE*/ return 0x1139; }
-yy49:
-    ++YYCURSOR;
-    { /*POUND_SIGN*/ return 0x1136; }
-yy51:
-    ++YYCURSOR;
-    { /*CENT_SIGN*/ return 0x1135; }
-yy53:
-    ++YYCURSOR;
-    { /*INVERTED_QUESTION_MARK*/ return 0x1133; }
-yy55:
-    ++YYCURSOR;
-    { /*VULGAR_FRACTION_ONE_HALF*/ return 0x1132; }
-yy57:
-    ++YYCURSOR;
-    { /*DEGREE_SIGN*/ return 0x1131; }
-yy59:
-    ++YYCURSOR;
-    { /*REGISTERED_SIGN*/ return 0x1130; }
-yy61:
-    yych = *++YYCURSOR;
-    switch (yych) {
-    case 0x8C:    goto yy87;
-    case 0x90:    goto yy89;
-    case 0x94:    goto yy91;
-    case 0x98:    goto yy93;
-    default:    goto yy62;
-    }
-yy62:
-    YYCURSOR = YYMARKER;
-    goto yy29;
-yy63:
-    yych = *++YYCURSOR;
-    switch (yych) {
-    case 0x94:    goto yy79;
-    case 0x98:    goto yy75;
-    case 0x99:    goto yy77;
-    case 0x9C:    goto yy83;
-    case 0x9D:    goto yy85;
-    case 0xA2:    goto yy81;
-    default:    goto yy62;
-    }
-yy64:
-    yych = *++YYCURSOR;
-    if (yych == 0xA0) goto yy73;
-    if (yych == 0xA2) goto yy71;
-    goto yy62;
-yy65:
-    yych = *++YYCURSOR;
-    if (yych == 0xAA) goto yy69;
-    goto yy62;
-yy66:
-    yych = *++YYCURSOR;
-    if (yych != 0x88) goto yy62;
-    ++YYCURSOR;
-    { /*FULL_BLOCK*/ return 0x7F00; }
-yy69:
-    ++YYCURSOR;
-    { /*EIGHTH_NOTE*/ return 0x1137; }
-yy71:
-    ++YYCURSOR;
-    { /*TRADE_MARK_SIGN*/ return 0x1134; }
-yy73:
-    ++YYCURSOR;
-    { /*SERVICE_MARK*/ return 0x122C; }
-yy75:
-    ++YYCURSOR;
-    { /*LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
-yy77:
-    ++YYCURSOR;
-    { /*RIGHT_SINGLE_QUOTATION_MARK -> APOSTROPHE*/ return 0x2700; }
-yy79:
-    ++YYCURSOR;
-    { /*EM_DASH*/ return 0x122A; }
-yy81:
-    ++YYCURSOR;
-    { /*BULLET*/ return 0x122D; }
-yy83:
-    ++YYCURSOR;
-    { /*LEFT_DOUBLE_QUOTATION_MARK*/ return 0x122E; }
-yy85:
-    ++YYCURSOR;
-    { /*RIGHT_DOUBLE_QUOTATION_MARK*/ return 0x122F; }
-yy87:
-    ++YYCURSOR;
-    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT*/ return 0x133C; }
-yy89:
-    ++YYCURSOR;
-    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT*/ return 0x133D; }
-yy91:
-    ++YYCURSOR;
-    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT*/ return 0x133E; }
-yy93:
-    ++YYCURSOR;
-    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT*/ return 0x133F; }
-yy95:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_O_WITH_STROKE*/ return 0x133B; }
-yy97:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_O_WITH_STROKE*/ return 0x133A; }
-yy99:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_A_WITH_RING_ABOVE*/ return 0x1339; }
-yy101:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE*/ return 0x1338; }
-yy103:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_SHARP_S*/ return 0x1334; }
-yy105:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_O_WITH_DIAERESIS*/ return 0x1333; }
-yy107:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS*/ return 0x1332; }
-yy109:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_A_WITH_DIAERESIS*/ return 0x1331; }
-yy111:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS*/ return 0x1330; }
-yy113:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_O_WITH_TILDE*/ return 0x1328; }
-yy115:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_O_WITH_TILDE*/ return 0x1327; }
-yy117:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_O_WITH_GRAVE*/ return 0x1326; }
-yy119:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_O_WITH_GRAVE*/ return 0x1325; }
-yy121:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_I_WITH_GRAVE*/ return 0x1324; }
-yy123:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_I_WITH_GRAVE*/ return 0x1323; }
-yy125:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_I_WITH_ACUTE*/ return 0x1322; }
-yy127:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_A_WITH_TILDE*/ return 0x1321; }
-yy129:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_A_WITH_TILDE*/ return 0x1320; }
-yy131:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x123D; }
-yy133:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_U_WITH_GRAVE*/ return 0x123C; }
-yy135:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_U_WITH_GRAVE*/ return 0x123B; }
-yy137:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x123A; }
-yy139:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_I_WITH_DIAERESIS*/ return 0x1239; }
-yy141:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS*/ return 0x1238; }
-yy143:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x1237; }
-yy145:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_E_WITH_DIAERESIS*/ return 0x1236; }
-yy147:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS*/ return 0x1235; }
-yy149:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x1234; }
-yy151:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_E_WITH_GRAVE*/ return 0x1233; }
-yy153:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_C_WITH_CEDILLA*/ return 0x1232; }
-yy155:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x1231; }
-yy157:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_A_WITH_GRAVE*/ return 0x1230; }
-yy159:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_U_WITH_DIAERESIS*/ return 0x1225; }
-yy161:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS*/ return 0x1224; }
-yy163:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_U_WITH_ACUTE*/ return 0x1223; }
-yy165:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_O_WITH_ACUTE*/ return 0x1222; }
-yy167:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_E_WITH_ACUTE*/ return 0x1221; }
-yy169:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_A_WITH_ACUTE*/ return 0x1220; }
-yy171:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x113F; }
-yy173:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x113E; }
-yy175:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x113D; }
-yy177:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x113C; }
-yy179:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x113B; }
-yy181:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_E_WITH_GRAVE*/ return 0x113A; }
-yy183:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_A_WITH_GRAVE*/ return 0x1138; }
-yy185:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_N_WITH_TILDE*/ return 0x7E00; }
-yy187:
-    ++YYCURSOR;
-    { /*LATIN_CAPITAL_LETTER_N_WITH_TILDE*/ return 0x7D00; }
-yy189:
-    ++YYCURSOR;
-    { /*DIVISION_SIGN*/ return 0x7C00; }
-yy191:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_C_WITH_CEDILLA*/ return 0x7B00; }
-yy193:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_U_WITH_ACUTE*/ return 0x6000; }
-yy195:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_O_WITH_ACUTE*/ return 0x5F00; }
-yy197:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_I_WITH_ACUTE*/ return 0x5E00; }
-yy199:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_E_WITH_ACUTE*/ return 0x5C00; }
-yy201:
-    ++YYCURSOR;
-    { /*LATIN_SMALL_LETTER_A_WITH_ACUTE*/ return 0x2A00; }
-}
-
+    fprintf(stderr, "cc %04X (%04X) '%s' '%s' (%s)\n", cc_data, eia608_parity_strip(cc_data), char1, char2, text);
 }

obs-studio-21.1.2.tar.xz/deps/libcaption/src/eia608_charmap.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/eia608_charmap.c Changed

obs-studio-22.0.1.tar.xz/deps/libcaption/src/eia608_from_utf8.c Added

@@ -0,0 +1,498 @@
+/* Generated by re2c 1.0.3 on Tue Jun 19 17:18:11 2018 */
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "utf8.h"
+#include <ctype.h>
+#include <stdint.h>
+
+uint16_t _eia608_from_utf8 (const utf8_char_t* s)
+{
+    const unsigned char* YYMARKER = 0;
+    const unsigned char* YYCURSOR = (const unsigned char*) s;
+
+    if (0==s) { return 0x0000;}
+
+    
+{
+    unsigned char yych;
+    yych = *YYCURSOR;
+    if (yych <= '`') {
+        if (yych <= '*') {
+            if (yych <= '&') {
+                if (yych <= 0x00) goto yy2;
+                if (yych <= 0x1F) goto yy4;
+                goto yy6;
+            } else {
+                if (yych <= '\'') goto yy8;
+                if (yych <= ')') goto yy6;
+                goto yy10;
+            }
+        } else {
+            if (yych <= ']') {
+                if (yych == '\\') goto yy12;
+                goto yy6;
+            } else {
+                if (yych <= '^') goto yy14;
+                if (yych <= '_') goto yy16;
+                goto yy18;
+            }
+        }
+    } else {
+        if (yych <= 0x7F) {
+            if (yych <= '|') {
+                if (yych <= 'z') goto yy6;
+                if (yych <= '{') goto yy20;
+                goto yy22;
+            } else {
+                if (yych <= '}') goto yy24;
+                if (yych <= '~') goto yy26;
+                goto yy28;
+            }
+        } else {
+            if (yych <= 0xC3) {
+                if (yych <= 0xC1) goto yy4;
+                if (yych <= 0xC2) goto yy30;
+                goto yy31;
+            } else {
+                if (yych == 0xE2) goto yy32;
+                goto yy4;
+            }
+        }
+    }
+yy2:
+    ++YYCURSOR;
+    { /*NULL*/ return 0x0000; }
+yy4:
+    ++YYCURSOR;
+yy5:
+    { /*DEFAULT_RULE*/ return 0x0000; }
+yy6:
+    ++YYCURSOR;
+    { /*ASCII range*/ return (s[0]<<8) &0xFF00; }
+yy8:
+    ++YYCURSOR;
+    { /*APOSTROPHE -> RIGHT_SINGLE_QUOTATION_MARK*/ return 0x1229; }
+yy10:
+    ++YYCURSOR;
+    { /*ASTERISK*/ return 0x1228; }
+yy12:
+    ++YYCURSOR;
+    { /*REVERSE_SOLIDUS*/ return 0x132B; }
+yy14:
+    ++YYCURSOR;
+    { /*CIRCUMFLEX_ACCENT*/ return 0x132C; }
+yy16:
+    ++YYCURSOR;
+    { /*LOW_LINE*/ return 0x132D; }
+yy18:
+    ++YYCURSOR;
+    { /*GRAVE_ACCENT -> LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
+yy20:
+    ++YYCURSOR;
+    { /*LEFT_CURLY_BRACKET*/ return 0x1329; }
+yy22:
+    ++YYCURSOR;
+    { /*VERTICAL_LINE*/ return 0x132E; }
+yy24:
+    ++YYCURSOR;
+    { /*RIGHT_CURLY_BRACKET*/ return 0x132A; }
+yy26:
+    ++YYCURSOR;
+    { /*TILDE*/ return 0x132F; }
+yy28:
+    ++YYCURSOR;
+    { /*DEL/BACKSPACE. Need to set bits 9 and 12! return 0x1421;*/ return 0x0000; }
+yy30:
+    yych = *++YYCURSOR;
+    switch (yych) {
+    case 0xA0:    goto yy33;
+    case 0xA1:    goto yy35;
+    case 0xA2:    goto yy37;
+    case 0xA3:    goto yy39;
+    case 0xA4:    goto yy41;
+    case 0xA5:    goto yy43;
+    case 0xA6:    goto yy45;
+    case 0xA9:    goto yy47;
+    case 0xAB:    goto yy49;
+    case 0xAE:    goto yy51;
+    case 0xB0:    goto yy53;
+    case 0xBB:    goto yy55;
+    case 0xBD:    goto yy57;
+    case 0xBF:    goto yy59;
+    default:    goto yy5;
+    }
+yy31:
+    yych = *++YYCURSOR;
+    switch (yych) {
+    case 0x80:    goto yy61;
+    case 0x81:    goto yy63;
+    case 0x82:    goto yy65;
+    case 0x83:    goto yy67;
+    case 0x84:    goto yy69;
+    case 0x85:    goto yy71;
+    case 0x87:    goto yy73;
+    case 0x88:    goto yy75;
+    case 0x89:    goto yy77;
+    case 0x8A:    goto yy79;
+    case 0x8B:    goto yy81;
+    case 0x8C:    goto yy83;
+    case 0x8D:    goto yy85;
+    case 0x8E:    goto yy87;
+    case 0x8F:    goto yy89;
+    case 0x91:    goto yy91;
+    case 0x92:    goto yy93;
+    case 0x93:    goto yy95;
+    case 0x94:    goto yy97;
+    case 0x95:    goto yy99;
+    case 0x96:    goto yy101;
+    case 0x98:    goto yy103;
+    case 0x99:    goto yy105;
+    case 0x9A:    goto yy107;
+    case 0x9B:    goto yy109;
+    case 0x9C:    goto yy111;
+    case 0x9F:    goto yy113;
+    case 0xA0:    goto yy115;
+    case 0xA1:    goto yy117;
+    case 0xA2:    goto yy119;
+    case 0xA3:    goto yy121;
+    case 0xA4:    goto yy123;
+    case 0xA5:    goto yy125;
+    case 0xA7:    goto yy127;
+    case 0xA8:    goto yy129;
+    case 0xA9:    goto yy131;
+    case 0xAA:    goto yy133;
+    case 0xAB:    goto yy135;
+    case 0xAC:    goto yy137;
+    case 0xAD:    goto yy139;
+    case 0xAE:    goto yy141;
+    case 0xAF:    goto yy143;
+    case 0xB1:    goto yy145;
+    case 0xB2:    goto yy147;
+    case 0xB3:    goto yy149;
+    case 0xB4:    goto yy151;
+    case 0xB5:    goto yy153;
+    case 0xB6:    goto yy155;
+    case 0xB7:    goto yy157;
+    case 0xB8:    goto yy159;
+    case 0xB9:    goto yy161;
+    case 0xBA:    goto yy163;
+    case 0xBB:    goto yy165;
+    case 0xBC:    goto yy167;
+    default:    goto yy5;
+    }
+yy32:
+    yych = *(YYMARKER = ++YYCURSOR);
+    switch (yych) {
+    case 0x80:    goto yy169;
+    case 0x84:    goto yy171;
+    case 0x94:    goto yy172;
+    case 0x96:    goto yy173;
+    case 0x99:    goto yy174;
+    default:    goto yy5;
+    }
+yy33:
+    ++YYCURSOR;
+    { /*NO_BREAK_SPACE*/ return 0x1139; }
+yy35:
+    ++YYCURSOR;
+    { /*INVERTED_EXCLAMATION_MARK*/ return 0x1227; }
+yy37:
+    ++YYCURSOR;
+    { /*CENT_SIGN*/ return 0x1135; }
+yy39:
+    ++YYCURSOR;
+    { /*POUND_SIGN*/ return 0x1136; }
+yy41:
+    ++YYCURSOR;
+    { /*CURRENCY_SIGN*/ return 0x1336; }
+yy43:
+    ++YYCURSOR;
+    { /*YEN_SIGN*/ return 0x1335; }
+yy45:
+    ++YYCURSOR;
+    { /*BROKEN_BAR*/ return 0x1337; }
+yy47:
+    ++YYCURSOR;
+    { /*COPYRIGHT_SIGN*/ return 0x122B; }
+yy49:
+    ++YYCURSOR;
+    { /*LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123E; }
+yy51:
+    ++YYCURSOR;
+    { /*REGISTERED_SIGN*/ return 0x1130; }
+yy53:
+    ++YYCURSOR;
+    { /*DEGREE_SIGN*/ return 0x1131; }
+yy55:
+    ++YYCURSOR;
+    { /*RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123F; }
+yy57:
+    ++YYCURSOR;
+    { /*VULGAR_FRACTION_ONE_HALF*/ return 0x1132; }
+yy59:
+    ++YYCURSOR;
+    { /*INVERTED_QUESTION_MARK*/ return 0x1133; }
+yy61:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_A_WITH_GRAVE*/ return 0x1230; }
+yy63:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_A_WITH_ACUTE*/ return 0x1220; }
+yy65:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x1231; }
+yy67:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_A_WITH_TILDE*/ return 0x1320; }
+yy69:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS*/ return 0x1330; }
+yy71:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE*/ return 0x1338; }
+yy73:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_C_WITH_CEDILLA*/ return 0x1232; }
+yy75:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_E_WITH_GRAVE*/ return 0x1233; }
+yy77:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_E_WITH_ACUTE*/ return 0x1221; }
+yy79:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x1234; }
+yy81:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS*/ return 0x1235; }
+yy83:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_I_WITH_GRAVE*/ return 0x1323; }
+yy85:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_I_WITH_ACUTE*/ return 0x1322; }
+yy87:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x1237; }
+yy89:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS*/ return 0x1238; }
+yy91:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_N_WITH_TILDE*/ return 0x7D00; }
+yy93:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_O_WITH_GRAVE*/ return 0x1325; }
+yy95:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_O_WITH_ACUTE*/ return 0x1222; }
+yy97:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x123A; }
+yy99:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_O_WITH_TILDE*/ return 0x1327; }
+yy101:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS*/ return 0x1332; }
+yy103:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_O_WITH_STROKE*/ return 0x133A; }
+yy105:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_U_WITH_GRAVE*/ return 0x123B; }
+yy107:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_U_WITH_ACUTE*/ return 0x1223; }
+yy109:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x123D; }
+yy111:
+    ++YYCURSOR;
+    { /*LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS*/ return 0x1224; }
+yy113:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_SHARP_S*/ return 0x1334; }
+yy115:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_A_WITH_GRAVE*/ return 0x1138; }
+yy117:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_A_WITH_ACUTE*/ return 0x2A00; }
+yy119:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x113B; }
+yy121:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_A_WITH_TILDE*/ return 0x1321; }
+yy123:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_A_WITH_DIAERESIS*/ return 0x1331; }
+yy125:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_A_WITH_RING_ABOVE*/ return 0x1339; }
+yy127:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_C_WITH_CEDILLA*/ return 0x7B00; }
+yy129:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_E_WITH_GRAVE*/ return 0x113A; }
+yy131:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_E_WITH_ACUTE*/ return 0x5C00; }
+yy133:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x113C; }
+yy135:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_E_WITH_DIAERESIS*/ return 0x1236; }
+yy137:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_I_WITH_GRAVE*/ return 0x1324; }
+yy139:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_I_WITH_ACUTE*/ return 0x5E00; }
+yy141:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x113D; }
+yy143:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_I_WITH_DIAERESIS*/ return 0x1239; }
+yy145:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_N_WITH_TILDE*/ return 0x7E00; }
+yy147:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_O_WITH_GRAVE*/ return 0x1326; }
+yy149:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_O_WITH_ACUTE*/ return 0x5F00; }
+yy151:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x113E; }
+yy153:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_O_WITH_TILDE*/ return 0x1328; }
+yy155:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_O_WITH_DIAERESIS*/ return 0x1333; }
+yy157:
+    ++YYCURSOR;
+    { /*DIVISION_SIGN*/ return 0x7C00; }
+yy159:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_O_WITH_STROKE*/ return 0x133B; }
+yy161:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_U_WITH_GRAVE*/ return 0x123C; }
+yy163:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_U_WITH_ACUTE*/ return 0x6000; }
+yy165:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x113F; }
+yy167:
+    ++YYCURSOR;
+    { /*LATIN_SMALL_LETTER_U_WITH_DIAERESIS*/ return 0x1225; }
+yy169:
+    yych = *++YYCURSOR;
+    switch (yych) {
+    case 0x94:    goto yy175;
+    case 0x98:    goto yy177;
+    case 0x99:    goto yy179;
+    case 0x9C:    goto yy181;
+    case 0x9D:    goto yy183;
+    case 0xA2:    goto yy185;
+    default:    goto yy170;
+    }
+yy170:
+    YYCURSOR = YYMARKER;
+    goto yy5;
+yy171:
+    yych = *++YYCURSOR;
+    if (yych == 0xA0) goto yy187;
+    if (yych == 0xA2) goto yy189;
+    goto yy170;
+yy172:
+    yych = *++YYCURSOR;
+    switch (yych) {
+    case 0x8C:    goto yy191;
+    case 0x90:    goto yy193;
+    case 0x94:    goto yy195;
+    case 0x98:    goto yy197;
+    default:    goto yy170;
+    }
+yy173:
+    yych = *++YYCURSOR;
+    if (yych == 0x88) goto yy199;
+    goto yy170;
+yy174:
+    yych = *++YYCURSOR;
+    if (yych == 0xAA) goto yy201;
+    goto yy170;
+yy175:
+    ++YYCURSOR;
+    { /*EM_DASH*/ return 0x122A; }
+yy177:
+    ++YYCURSOR;
+    { /*LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
+yy179:
+    ++YYCURSOR;
+    { /*RIGHT_SINGLE_QUOTATION_MARK -> APOSTROPHE*/ return 0x2700; }
+yy181:
+    ++YYCURSOR;
+    { /*LEFT_DOUBLE_QUOTATION_MARK*/ return 0x122E; }
+yy183:
+    ++YYCURSOR;
+    { /*RIGHT_DOUBLE_QUOTATION_MARK*/ return 0x122F; }
+yy185:
+    ++YYCURSOR;
+    { /*BULLET*/ return 0x122D; }
+yy187:
+    ++YYCURSOR;
+    { /*SERVICE_MARK*/ return 0x122C; }
+yy189:
+    ++YYCURSOR;
+    { /*TRADE_MARK_SIGN*/ return 0x1134; }
+yy191:
+    ++YYCURSOR;
+    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT*/ return 0x133C; }
+yy193:
+    ++YYCURSOR;
+    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT*/ return 0x133D; }
+yy195:
+    ++YYCURSOR;
+    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT*/ return 0x133E; }
+yy197:
+    ++YYCURSOR;
+    { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT*/ return 0x133F; }
+yy199:
+    ++YYCURSOR;
+    { /*FULL_BLOCK*/ return 0x7F00; }
+yy201:
+    ++YYCURSOR;
+    { /*EIGHTH_NOTE*/ return 0x1137; }
+}
+
+}

obs-studio-22.0.1.tar.xz/deps/libcaption/src/eia608_from_utf8.re2c Added

@@ -0,0 +1,164 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "utf8.h"
+#include <ctype.h>
+#include <stdint.h>
+
+uint16_t _eia608_from_utf8 (const utf8_char_t* s)
+{
+    const unsigned char* YYMARKER = 0;
+    const unsigned char* YYCURSOR = (const unsigned char*) s;
+
+    if (0==s) { return 0x0000;}
+
+    /*!re2c
+    re2c:yyfill:enable = 0;
+    re2c:indent:string = "    ";
+    re2c:define:YYCTYPE = "unsigned char";
+
+    /*Ascii Exceptions*/
+    "\x00" { /*NULL*/ return 0x0000; }
+    "\x27" { /*APOSTROPHE -> RIGHT_SINGLE_QUOTATION_MARK*/ return 0x1229; }
+    "\x2A" { /*ASTERISK*/ return 0x1228; }
+    "\x5C" { /*REVERSE_SOLIDUS*/ return 0x132B; }
+    "\x5E" { /*CIRCUMFLEX_ACCENT*/ return 0x132C; }
+    "\x5F" { /*LOW_LINE*/ return 0x132D; }
+    /*Map GRAVE_ACCENT to a LEFT_SINGLE_QUOTATION_MARK so we have a cc_data for every printable ASCII value*/
+    "\x60" { /*GRAVE_ACCENT -> LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
+    "\x7B" { /*LEFT_CURLY_BRACKET*/ return 0x1329; }
+    "\x7C" { /*VERTICAL_LINE*/ return 0x132E; }
+    "\x7D" { /*RIGHT_CURLY_BRACKET*/ return 0x132A; }
+    "\x7E" { /*TILDE*/ return 0x132F; }
+    /*There is a control equivalent. Haven't decided if we want to handle that here or not*/
+    "\x7F" { /*DEL/BACKSPACE. Need to set bits 9 and 12! return 0x1421;*/ return 0x0000; }
+
+    /* Rules are processed top to bottom. So All single byte chars MUST be above this line!*/
+    [\x20-\x7F] { /*ASCII range*/ return (s[0]<<8) &0xFF00; } /* Should we use yych instead of s[0]?*/
+
+    /*This is the second half of the ascii exceptions*/
+    "\xC3\xA1" { /*LATIN_SMALL_LETTER_A_WITH_ACUTE*/ return 0x2A00; }
+    "\xC3\xA9" { /*LATIN_SMALL_LETTER_E_WITH_ACUTE*/ return 0x5C00; }
+    "\xC3\xAD" { /*LATIN_SMALL_LETTER_I_WITH_ACUTE*/ return 0x5E00; }
+    "\xC3\xB3" { /*LATIN_SMALL_LETTER_O_WITH_ACUTE*/ return 0x5F00; }
+    "\xC3\xBA" { /*LATIN_SMALL_LETTER_U_WITH_ACUTE*/ return 0x6000; }
+    "\xC3\xA7" { /*LATIN_SMALL_LETTER_C_WITH_CEDILLA*/ return 0x7B00; }
+    "\xC3\xB7" { /*DIVISION_SIGN*/ return 0x7C00; }
+    "\xC3\x91" { /*LATIN_CAPITAL_LETTER_N_WITH_TILDE*/ return 0x7D00; }
+    "\xC3\xB1" { /*LATIN_SMALL_LETTER_N_WITH_TILDE*/ return 0x7E00; }
+    "\xE2\x96\x88" { /*FULL_BLOCK*/ return 0x7F00; }
+
+    /*Special North American character set*/
+    "\xC2\xAE" { /*REGISTERED_SIGN*/ return 0x1130; }
+    "\xC2\xB0" { /*DEGREE_SIGN*/ return 0x1131; }
+    "\xC2\xBD" { /*VULGAR_FRACTION_ONE_HALF*/ return 0x1132; }
+    "\xC2\xBF" { /*INVERTED_QUESTION_MARK*/ return 0x1133; }
+    "\xE2\x84\xA2" { /*TRADE_MARK_SIGN*/ return 0x1134; }
+    "\xC2\xA2" { /*CENT_SIGN*/ return 0x1135; }
+    "\xC2\xA3" { /*POUND_SIGN*/ return 0x1136; }
+    "\xE2\x99\xAA" { /*EIGHTH_NOTE*/ return 0x1137; }
+    "\xC3\xA0" { /*LATIN_SMALL_LETTER_A_WITH_GRAVE*/ return 0x1138; }
+    "\xC2\xA0" { /*NO_BREAK_SPACE*/ return 0x1139; }
+    "\xC3\xA8" { /*LATIN_SMALL_LETTER_E_WITH_GRAVE*/ return 0x113A; }
+    "\xC3\xA2" { /*LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x113B; }
+    "\xC3\xAA" { /*LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x113C; }
+    "\xC3\xAE" { /*LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x113D; }
+    "\xC3\xB4" { /*LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x113E; }
+    "\xC3\xBB" { /*LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x113F; }
+
+    /*Extended Spanish/Miscellaneous*/
+    "\xC3\x81" { /*LATIN_CAPITAL_LETTER_A_WITH_ACUTE*/ return 0x1220; }
+    "\xC3\x89" { /*LATIN_CAPITAL_LETTER_E_WITH_ACUTE*/ return 0x1221; }
+    "\xC3\x93" { /*LATIN_CAPITAL_LETTER_O_WITH_ACUTE*/ return 0x1222; }
+    "\xC3\x9A" { /*LATIN_CAPITAL_LETTER_U_WITH_ACUTE*/ return 0x1223; }
+    "\xC3\x9C" { /*LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS*/ return 0x1224; }
+    "\xC3\xBC" { /*LATIN_SMALL_LETTER_U_WITH_DIAERESIS*/ return 0x1225; }
+    "\xE2\x80\x98" { /*LEFT_SINGLE_QUOTATION_MARK*/ return 0x1226; }
+    "\xC2\xA1" { /*INVERTED_EXCLAMATION_MARK*/ return 0x1227; }
+    /*ASTERISK handled in ASCII mapping*/
+    "\xE2\x80\x99" { /*RIGHT_SINGLE_QUOTATION_MARK -> APOSTROPHE*/ return 0x2700; }
+    "\xE2\x80\x94" { /*EM_DASH*/ return 0x122A; }
+    "\xC2\xA9" { /*COPYRIGHT_SIGN*/ return 0x122B; }
+    "\xE2\x84\xA0" { /*SERVICE_MARK*/ return 0x122C; }
+    "\xE2\x80\xA2" { /*BULLET*/ return 0x122D; }
+    "\xE2\x80\x9C" { /*LEFT_DOUBLE_QUOTATION_MARK*/ return 0x122E; }
+    "\xE2\x80\x9D" { /*RIGHT_DOUBLE_QUOTATION_MARK*/ return 0x122F; }
+
+    /*Extended French*/
+    "\xC3\x80" { /*LATIN_CAPITAL_LETTER_A_WITH_GRAVE*/ return 0x1230; }
+    "\xC3\x82" { /*LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX*/ return 0x1231; }
+    "\xC3\x87" { /*LATIN_CAPITAL_LETTER_C_WITH_CEDILLA*/ return 0x1232; }
+    "\xC3\x88" { /*LATIN_CAPITAL_LETTER_E_WITH_GRAVE*/ return 0x1233; }
+    "\xC3\x8A" { /*LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX*/ return 0x1234; }
+    "\xC3\x8B" { /*LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS*/ return 0x1235; }
+    "\xC3\xAB" { /*LATIN_SMALL_LETTER_E_WITH_DIAERESIS*/ return 0x1236; }
+    "\xC3\x8E" { /*LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX*/ return 0x1237; }
+    "\xC3\x8F" { /*LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS*/ return 0x1238; }
+    "\xC3\xAF" { /*LATIN_SMALL_LETTER_I_WITH_DIAERESIS*/ return 0x1239; }
+    "\xC3\x94" { /*LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX*/ return 0x123A; }
+    "\xC3\x99" { /*LATIN_CAPITAL_LETTER_U_WITH_GRAVE*/ return 0x123B; }
+    "\xC3\xB9" { /*LATIN_SMALL_LETTER_U_WITH_GRAVE*/ return 0x123C; }
+    "\xC3\x9B" { /*LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX*/ return 0x123D; }
+    "\xC2\xAB" { /*LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123E; }
+    "\xC2\xBB" { /*RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK*/ return 0x123F; }
+
+    /*Portuguese*/
+    "\xC3\x83" { /*LATIN_CAPITAL_LETTER_A_WITH_TILDE*/ return 0x1320; }
+    "\xC3\xA3" { /*LATIN_SMALL_LETTER_A_WITH_TILDE*/ return 0x1321; }
+    "\xC3\x8D" { /*LATIN_CAPITAL_LETTER_I_WITH_ACUTE*/ return 0x1322; }
+    "\xC3\x8C" { /*LATIN_CAPITAL_LETTER_I_WITH_GRAVE*/ return 0x1323; }
+    "\xC3\xAC" { /*LATIN_SMALL_LETTER_I_WITH_GRAVE*/ return 0x1324; }
+    "\xC3\x92" { /*LATIN_CAPITAL_LETTER_O_WITH_GRAVE*/ return 0x1325; }
+    "\xC3\xB2" { /*LATIN_SMALL_LETTER_O_WITH_GRAVE*/ return 0x1326; }
+    "\xC3\x95" { /*LATIN_CAPITAL_LETTER_O_WITH_TILDE*/ return 0x1327; }
+    "\xC3\xB5" { /*LATIN_SMALL_LETTER_O_WITH_TILDE*/ return 0x1328; }
+    /*LEFT_CURLY_BRACKET handled in ASCII mapping*/
+    /*RIGHT_CURLY_BRACKET handled in ASCII mapping*/
+    /*REVERSE_SOLIDUS handled in ASCII mapping*/
+    /*CIRCUMFLEX_ACCENT handled in ASCII mapping*/
+    /*LOW_LINE handled in ASCII mapping*/
+    /*VERTICAL_LINE handled in ASCII mapping*/
+    /*TILDE handled in ASCII mapping*/
+
+    /*German/Danish*/
+    "\xC3\x84" { /*LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS*/ return 0x1330; }
+    "\xC3\xA4" { /*LATIN_SMALL_LETTER_A_WITH_DIAERESIS*/ return 0x1331; }
+    "\xC3\x96" { /*LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS*/ return 0x1332; }
+    "\xC3\xB6" { /*LATIN_SMALL_LETTER_O_WITH_DIAERESIS*/ return 0x1333; }
+    "\xC3\x9F" { /*LATIN_SMALL_LETTER_SHARP_S*/ return 0x1334; }
+    "\xC2\xA5" { /*YEN_SIGN*/ return 0x1335; }
+    "\xC2\xA4" { /*CURRENCY_SIGN*/ return 0x1336; }
+    "\xC2\xA6" { /*BROKEN_BAR*/ return 0x1337; }
+    "\xC3\x85" { /*LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE*/ return 0x1338; }
+    "\xC3\xA5" { /*LATIN_SMALL_LETTER_A_WITH_RING_ABOVE*/ return 0x1339; }
+    "\xC3\x98" { /*LATIN_CAPITAL_LETTER_O_WITH_STROKE*/ return 0x133A; }
+    "\xC3\xB8" { /*LATIN_SMALL_LETTER_O_WITH_STROKE*/ return 0x133B; }
+    "\xE2\x94\x8C" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT*/ return 0x133C; }
+    "\xE2\x94\x90" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT*/ return 0x133D; }
+    "\xE2\x94\x94" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT*/ return 0x133E; }
+    "\xE2\x94\x98" { /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT*/ return 0x133F; }
+
+    /*Default rule*/
+    * { /*DEFAULT_RULE*/ return 0x0000; }
+    */
+}

obs-studio-22.0.1.tar.xz/deps/libcaption/src/mpeg.c Added

@@ -0,0 +1,746 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+
+#include "mpeg.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+////////////////////////////////////////////////////////////////////////////////
+// AVC RBSP Methods
+//  TODO move the to a avcutils file
+static size_t _find_emulation_prevention_byte(const uint8_t* data, size_t size)
+{
+    size_t offset = 2;
+
+    while (offset < size) {
+        if (0 == data[offset]) {
+            // 0 0 X 3 //; we know X is zero
+            offset += 1;
+        } else if (3 != data[offset]) {
+            // 0 0 X 0 0 3; we know X is not 0 and not 3
+            offset += 3;
+        } else if (0 != data[offset - 1]) {
+            // 0 X 0 0 3
+            offset += 2;
+        } else if (0 != data[offset - 2]) {
+            // X 0 0 3
+            offset += 1;
+        } else {
+            // 0 0 3
+            return offset;
+        }
+    }
+
+    return size;
+}
+
+static size_t _copy_to_rbsp(uint8_t* destData, size_t destSize, const uint8_t* sorcData, size_t sorcSize)
+{
+    size_t toCopy, totlSize = 0;
+
+    for (;;) {
+        if (destSize >= sorcSize) {
+            return 0;
+        }
+
+        // The following line IS correct! We want to look in sorcData up to destSize bytes
+        // We know destSize is smaller than sorcSize because of the previous line
+        toCopy = _find_emulation_prevention_byte(sorcData, destSize);
+        memcpy(destData, sorcData, toCopy);
+        totlSize += toCopy;
+        destData += toCopy;
+        destSize -= toCopy;
+
+        if (0 == destSize) {
+            return totlSize;
+        }
+
+        // skip the emulation prevention byte
+        totlSize += 1;
+        sorcData += toCopy + 1;
+        sorcSize -= toCopy + 1;
+    }
+
+    return 0;
+}
+////////////////////////////////////////////////////////////////////////////////
+static inline size_t _find_emulated(uint8_t* data, size_t size)
+{
+    size_t offset = 2;
+
+    while (offset < size) {
+        if (3 < data[offset]) {
+            // 0 0 X; we know X is not 0, 1, 2 or 3
+            offset += 3;
+        } else if (0 != data[offset - 1]) {
+            // 0 X 0 0 1
+            offset += 2;
+        } else if (0 != data[offset - 2]) {
+            // X 0 0 1
+            offset += 1;
+        } else {
+            // 0 0 0, 0 0 1
+            return offset;
+        }
+    }
+
+    return size;
+}
+
+size_t _copy_from_rbsp(uint8_t* data, uint8_t* payloadData, size_t payloadSize)
+{
+    size_t total = 0;
+
+    while (payloadSize) {
+        size_t bytes = _find_emulated(payloadData, payloadSize);
+
+        if (bytes > payloadSize) {
+            return 0;
+        }
+
+        memcpy(data, payloadData, bytes);
+
+        if (bytes == payloadSize) {
+            return total + bytes;
+        }
+
+        data[bytes] = 3; // insert emulation prevention byte
+        data += bytes + 1;
+        total += bytes + 1;
+        payloadData += bytes;
+        payloadSize -= bytes;
+    }
+
+    return total;
+}
+////////////////////////////////////////////////////////////////////////////////
+sei_message_t* sei_message_next(sei_message_t* msg) { return ((struct _sei_message_t*)msg)->next; }
+sei_msgtype_t sei_message_type(sei_message_t* msg) { return ((struct _sei_message_t*)msg)->type; }
+size_t sei_message_size(sei_message_t* msg) { return ((struct _sei_message_t*)msg)->size; }
+uint8_t* sei_message_data(sei_message_t* msg) { return ((uint8_t*)msg) + sizeof(struct _sei_message_t); }
+void sei_message_free(sei_message_t* msg)
+{
+    if (msg) {
+        free(msg);
+    }
+}
+
+sei_message_t* sei_message_new(sei_msgtype_t type, uint8_t* data, size_t size)
+{
+    struct _sei_message_t* msg = (struct _sei_message_t*)malloc(sizeof(struct _sei_message_t) + size);
+    msg->next = 0;
+    msg->type = type;
+    msg->size = size;
+
+    if (data) {
+        memcpy(sei_message_data(msg), data, size);
+    } else {
+        memset(sei_message_data(msg), 0, size);
+    }
+
+    return (sei_message_t*)msg;
+}
+////////////////////////////////////////////////////////////////////////////////
+void sei_init(sei_t* sei, double timestamp)
+{
+    sei->head = 0;
+    sei->tail = 0;
+    sei->timestamp = timestamp;
+}
+
+void sei_message_append(sei_t* sei, sei_message_t* msg)
+{
+    if (0 == sei->head) {
+        sei->head = msg;
+        sei->tail = msg;
+    } else {
+        sei->tail->next = msg;
+        sei->tail = msg;
+    }
+}
+
+void sei_cat(sei_t* to, sei_t* from, int itu_t_t35)
+{
+    if (!to || !from) {
+        return;
+    }
+
+    sei_message_t* msg = NULL;
+    for (msg = sei_message_head(from); msg; msg = sei_message_next(msg)) {
+        if (itu_t_t35 || sei_type_user_data_registered_itu_t_t35 != msg->type) {
+            sei_message_append(to, sei_message_copy(msg));
+        }
+    }
+}
+
+void sei_free(sei_t* sei)
+{
+    sei_message_t* tail;
+
+    while (sei->head) {
+        tail = sei->head->next;
+        free(sei->head);
+        sei->head = tail;
+    }
+
+    sei_init(sei, 0);
+}
+
+void sei_dump(sei_t* sei)
+{
+    fprintf(stderr, "SEI %p\n", sei);
+    sei_dump_messages(sei->head, sei->timestamp);
+}
+
+void sei_dump_messages(sei_message_t* head, double timestamp)
+{
+    cea708_t cea708;
+    sei_message_t* msg;
+    cea708_init(&cea708, timestamp);
+
+    for (msg = head; msg; msg = sei_message_next(msg)) {
+        uint8_t* data = sei_message_data(msg);
+        size_t size = sei_message_size(msg);
+        fprintf(stderr, "-- Message %p\n-- Message Type: %d\n-- Message Size: %d\n", data, sei_message_type(msg), (int)size);
+
+        while (size) {
+            fprintf(stderr, "%02X ", *data);
+            ++data;
+            --size;
+        }
+
+        fprintf(stderr, "\n");
+
+        if (sei_type_user_data_registered_itu_t_t35 == sei_message_type(msg)) {
+            if (LIBCAPTION_OK != cea708_parse_h262(sei_message_data(msg), sei_message_size(msg), &cea708)) {
+                fprintf(stderr, "cea708_parse error\n");
+            } else {
+                cea708_dump(&cea708);
+            }
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+size_t sei_render_size(sei_t* sei)
+{
+    if (!sei || !sei->head) {
+        return 0;
+    }
+
+    size_t size = 2; // nalu_type + stop bit
+    sei_message_t* msg;
+    for (msg = sei_message_head(sei); msg; msg = sei_message_next(msg)) {
+        size += 1 + (msg->type / 255);
+        size += 1 + (msg->size / 255);
+        size += 1 + (msg->size * 4 / 3);
+    }
+
+    return size;
+}
+
+// we can safely assume sei_render_size() bytes have been allocated for data
+size_t sei_render(sei_t* sei, uint8_t* data)
+{
+    if (!sei || !sei->head) {
+        return 0;
+    }
+
+    size_t escaped_size, size = 2; // nalu_type + stop bit
+    sei_message_t* msg;
+    (*data) = 6;
+    ++data;
+
+    for (msg = sei_message_head(sei); msg; msg = sei_message_next(msg)) {
+        int payloadType = sei_message_type(msg);
+        int payloadSize = (int)sei_message_size(msg);
+        uint8_t* payloadData = sei_message_data(msg);
+
+        while (255 <= payloadType) {
+            (*data) = 255;
+            ++data;
+            ++size;
+            payloadType -= 255;
+        }
+
+        (*data) = payloadType;
+        ++data;
+        ++size;
+
+        while (255 <= payloadSize) {
+            (*data) = 255;
+            ++data;
+            ++size;
+            payloadSize -= 255;
+        }
+
+        (*data) = payloadSize;
+        ++data;
+        ++size;
+
+        if (0 >= (escaped_size = _copy_from_rbsp(data, payloadData, payloadSize))) {
+            return 0;
+        }
+
+        data += escaped_size;
+        size += escaped_size;
+    }
+
+    // write stop bit and return
+    (*data) = 0x80;
+    return size;
+}
+
+uint8_t* sei_render_alloc(sei_t* sei, size_t* size)
+{
+    size_t aloc = sei_render_size(sei);
+    uint8_t* data = malloc(aloc);
+    (*size) = sei_render(sei, data);
+    return data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+libcaption_stauts_t sei_parse(sei_t* sei, const uint8_t* data, size_t size, double timestamp)
+{
+    sei_init(sei, timestamp);
+    int ret = 0;
+
+    // SEI may contain more than one payload
+    while (1 < size) {
+        size_t payloadType = 0;
+        size_t payloadSize = 0;
+
+        while (0 < size && 255 == (*data)) {
+            payloadType += 255;
+            ++data, --size;
+        }
+
+        if (0 == size) {
+            return LIBCAPTION_ERROR;
+        }
+
+        payloadType += (*data);
+        ++data, --size;
+
+        while (0 < size && 255 == (*data)) {
+            payloadSize += 255;
+            ++data, --size;
+        }
+
+        if (0 == size) {
+            return LIBCAPTION_ERROR;
+        }
+
+        payloadSize += (*data);
+        ++data, --size;
+
+        if (payloadSize) {
+            sei_message_t* msg = sei_message_new((sei_msgtype_t)payloadType, 0, payloadSize);
+            uint8_t* payloadData = sei_message_data(msg);
+            size_t bytes = _copy_to_rbsp(payloadData, payloadSize, data, size);
+            sei_message_append(sei, msg);
+
+            if (bytes < payloadSize) {
+                return LIBCAPTION_ERROR;
+            }
+
+            data += bytes;
+            size -= bytes;
+            ++ret;
+        }
+    }
+
+    // There should be one trailing byte, 0x80. But really, we can just ignore that fact.
+    return LIBCAPTION_OK;
+}
+////////////////////////////////////////////////////////////////////////////////
+libcaption_stauts_t sei_to_caption_frame(sei_t* sei, caption_frame_t* frame)
+{
+    cea708_t cea708;
+    sei_message_t* msg;
+    libcaption_stauts_t status = LIBCAPTION_OK;
+
+    cea708_init(&cea708, frame->timestamp);
+
+    for (msg = sei_message_head(sei); msg; msg = sei_message_next(msg)) {
+        if (sei_type_user_data_registered_itu_t_t35 == sei_message_type(msg)) {
+            cea708_parse_h264(sei_message_data(msg), sei_message_size(msg), &cea708);
+            status = libcaption_status_update(status, cea708_to_caption_frame(frame, &cea708));
+        }
+    }
+
+    if (LIBCAPTION_READY == status) {
+        frame->timestamp = sei->timestamp;
+    }
+
+    return status;
+}
+////////////////////////////////////////////////////////////////////////////////
+#define DEFAULT_CHANNEL 0
+
+void sei_append_708(sei_t* sei, cea708_t* cea708)
+{
+    sei_message_t* msg = sei_message_new(sei_type_user_data_registered_itu_t_t35, 0, CEA608_MAX_SIZE);
+    msg->size = cea708_render(cea708, sei_message_data(msg), sei_message_size(msg));
+    sei_message_append(sei, msg);
+    cea708_init(cea708, sei->timestamp); // will confgure using HLS compatiable defaults
+}
+
+// This should be moved to 708.c
+// This works for popon, but bad for paint on and roll up
+// Please understand this function before you try to use it, setting null values have different effects than you may assume
+void sei_encode_eia608(sei_t* sei, cea708_t* cea708, uint16_t cc_data)
+{
+    // This one is full, flush and init a new one
+    // shoudl this be 32? I cant remember
+    if (31 == cea708->user_data.cc_count) {
+        sei_append_708(sei, cea708);
+    }
+
+    if (0 == cea708->user_data.cc_count) { // This is a new 708 header, but a continuation of a 608 stream
+        cea708_add_cc_data(cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
+        cea708_add_cc_data(cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
+    }
+
+    if (0 == cc_data) { // Finished
+        sei_encode_eia608(sei, cea708, eia608_control_command(eia608_control_end_of_caption, DEFAULT_CHANNEL));
+        sei_encode_eia608(sei, cea708, eia608_control_command(eia608_control_end_of_caption, DEFAULT_CHANNEL));
+        sei_append_708(sei, cea708);
+        return;
+    }
+
+    cea708_add_cc_data(cea708, 1, cc_type_ntsc_cc_field_1, cc_data);
+}
+////////////////////////////////////////////////////////////////////////////////
+// TODO move this out of sei
+libcaption_stauts_t sei_from_caption_frame(sei_t* sei, caption_frame_t* frame)
+{
+    int r, c;
+    int unl, prev_unl;
+    cea708_t cea708;
+    const char* data;
+    uint16_t prev_cc_data;
+    eia608_style_t styl, prev_styl;
+
+    sei_init(sei, frame->timestamp);
+    cea708_init(&cea708, frame->timestamp); // set up a new popon frame
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_erase_non_displayed_memory, DEFAULT_CHANNEL));
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
+
+    for (r = 0; r < SCREEN_ROWS; ++r) {
+        prev_unl = 0, prev_styl = eia608_style_white;
+        // Calculate preamble
+        for (c = 0; c < SCREEN_COLS && 0 == *caption_frame_read_char(frame, r, c, &styl, &unl); ++c) {
+        }
+
+        // This row is blank
+        if (SCREEN_COLS == c) {
+            continue;
+        }
+
+        // Write preamble
+        if (0 < c || (0 == unl && eia608_style_white == styl)) {
+            int tab = c % 4;
+            sei_encode_eia608(sei, &cea708, eia608_row_column_pramble(r, c, DEFAULT_CHANNEL, 0));
+            if (tab) {
+                sei_encode_eia608(sei, &cea708, eia608_tab(tab, DEFAULT_CHANNEL));
+            }
+        } else {
+            sei_encode_eia608(sei, &cea708, eia608_row_style_pramble(r, DEFAULT_CHANNEL, styl, unl));
+            prev_unl = unl, prev_styl = styl;
+        }
+
+        // Write the row
+        for (prev_cc_data = 0, data = caption_frame_read_char(frame, r, c, 0, 0);
+             (*data) && c < SCREEN_COLS; ++c, data = caption_frame_read_char(frame, r, c, &styl, &unl)) {
+            uint16_t cc_data = eia608_from_utf8_1(data, DEFAULT_CHANNEL);
+
+            if (unl != prev_unl || styl != prev_styl) {
+                sei_encode_eia608(sei, &cea708, eia608_midrow_change(DEFAULT_CHANNEL, styl, unl));
+                prev_unl = unl, prev_styl = styl;
+            }
+
+            if (!cc_data) {
+                // We do't want to write bad data, so just ignore it.
+            } else if (eia608_is_basicna(prev_cc_data)) {
+                if (eia608_is_basicna(cc_data)) {
+                    // previous and current chars are both basicna, combine them into current
+                    sei_encode_eia608(sei, &cea708, eia608_from_basicna(prev_cc_data, cc_data));
+                } else if (eia608_is_westeu(cc_data)) {
+                    // extended charcters overwrite the previous charcter, so insert a dummy char thren write the extended char
+                    sei_encode_eia608(sei, &cea708, eia608_from_basicna(prev_cc_data, eia608_from_utf8_1(EIA608_CHAR_SPACE, DEFAULT_CHANNEL)));
+                    sei_encode_eia608(sei, &cea708, cc_data);
+                } else {
+                    // previous was basic na, but current isnt; write previous and current
+                    sei_encode_eia608(sei, &cea708, prev_cc_data);
+                    sei_encode_eia608(sei, &cea708, cc_data);
+                }
+
+                prev_cc_data = 0; // previous is handled, we can forget it now
+            } else if (eia608_is_westeu(cc_data)) {
+                // extended chars overwrite the previous chars, so insert a dummy char
+                // TODO create a map of alternamt chars for eia608_is_westeu instead of using space
+                sei_encode_eia608(sei, &cea708, eia608_from_utf8_1(EIA608_CHAR_SPACE, DEFAULT_CHANNEL));
+                sei_encode_eia608(sei, &cea708, cc_data);
+            } else if (eia608_is_basicna(cc_data)) {
+                prev_cc_data = cc_data;
+            } else {
+                sei_encode_eia608(sei, &cea708, cc_data);
+            }
+
+            if (eia608_is_specialna(cc_data)) {
+                // specialna are treated as control charcters. Duplicated control charcters are discarded
+                // So we write a resume after a specialna as a noop to break repetition detection
+                // TODO only do this if the same charcter is repeated
+                sei_encode_eia608(sei, &cea708, eia608_control_command(eia608_control_resume_caption_loading, DEFAULT_CHANNEL));
+            }
+        }
+
+        if (0 != prev_cc_data) {
+            sei_encode_eia608(sei, &cea708, prev_cc_data);
+        }
+    }
+
+    sei_encode_eia608(sei, &cea708, 0); // flush
+    sei->timestamp = frame->timestamp; // assumes in order frames
+    // sei_dump (sei);
+    return LIBCAPTION_OK;
+}
+
+libcaption_stauts_t sei_from_scc(sei_t* sei, const scc_t* scc)
+{
+    unsigned int i;
+    cea708_t cea708;
+    cea708_init(&cea708, sei->timestamp); // set up a new popon frame
+
+    for (i = 0; i < scc->cc_size; ++i) {
+        if (31 == cea708.user_data.cc_count) {
+            sei_append_708(sei, &cea708);
+        }
+
+        cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, scc->cc_data[i]);
+    }
+
+    if (0 != cea708.user_data.cc_count) {
+        sei_append_708(sei, &cea708);
+    }
+
+    return LIBCAPTION_OK;
+}
+
+libcaption_stauts_t sei_from_caption_clear(sei_t* sei)
+{
+    cea708_t cea708;
+    cea708_init(&cea708, sei->timestamp); // set up a new popon frame
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_end_of_caption, DEFAULT_CHANNEL));
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_end_of_caption, DEFAULT_CHANNEL));
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_erase_non_displayed_memory, DEFAULT_CHANNEL));
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_erase_non_displayed_memory, DEFAULT_CHANNEL));
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_erase_display_memory, DEFAULT_CHANNEL));
+    cea708_add_cc_data(&cea708, 1, cc_type_ntsc_cc_field_1, eia608_control_command(eia608_control_erase_display_memory, DEFAULT_CHANNEL));
+    sei_append_708(sei, &cea708);
+    return LIBCAPTION_OK;
+}
+////////////////////////////////////////////////////////////////////////////////
+// bitstream
+void mpeg_bitstream_init(mpeg_bitstream_t* packet)
+{
+    packet->dts = 0;
+    packet->cts = 0;
+    packet->size = 0;
+    packet->front = 0;
+    packet->latent = 0;
+    packet->status = LIBCAPTION_OK;
+}
+
+uint8_t mpeg_bitstream_packet_type(mpeg_bitstream_t* packet, unsigned stream_type)
+{
+    if (4 > packet->size) {
+        return 0;
+    }
+    switch (stream_type) {
+    case STREAM_TYPE_H262:
+        return packet->data[3];
+    case STREAM_TYPE_H264:
+        return packet->data[3] & 0x1F;
+    case STREAM_TYPE_H265:
+        return (packet->data[3] >> 1) & 0x3F;
+    default:
+        return 0;
+    }
+}
+
+// TODO optomize
+// static size_t find_start_code_increnental(const uint8_t* data, size_t size, size_t prev_size)
+// {
+//     // prev_size MUST be at least 4
+//     assert(3 < prev_size);
+//     uint32_t start_code = 0xffffffff;
+//     for (size_t i = prev_size - 3; i < size; ++i) {
+//         start_code = (start_code << 8) | data[i];
+//         if (0x00000100 == (start_code & 0xffffff00)) {
+//             return i - 3;
+//         }
+//     }
+//     return 0;
+// }
+
+static size_t find_start_code(const uint8_t* data, size_t size)
+{
+    uint32_t start_code = 0xffffffff;
+    for (size_t i = 1; i < size; ++i) {
+        start_code = (start_code << 8) | data[i];
+        if (0x00000100 == (start_code & 0xffffff00)) {
+            return i - 3;
+        }
+    }
+    return 0;
+}
+
+// WILL wrap around if larger than MAX_REFRENCE_FRAMES for memory saftey
+cea708_t* _mpeg_bitstream_cea708_at(mpeg_bitstream_t* packet, size_t pos) { return &packet->cea708[(packet->front + pos) % MAX_REFRENCE_FRAMES]; }
+cea708_t* _mpeg_bitstream_cea708_front(mpeg_bitstream_t* packet) { return _mpeg_bitstream_cea708_at(packet, 0); }
+cea708_t* _mpeg_bitstream_cea708_back(mpeg_bitstream_t* packet) { return _mpeg_bitstream_cea708_at(packet, packet->latent - 1); }
+cea708_t* _mpeg_bitstream_cea708_emplace_back(mpeg_bitstream_t* packet, double timestamp)
+{
+    ++packet->latent;
+    cea708_t* cea708 = _mpeg_bitstream_cea708_back(packet);
+    cea708_init(cea708, timestamp);
+    return cea708;
+}
+
+void _mpeg_bitstream_cea708_sort(mpeg_bitstream_t* packet)
+{
+    // TODO better sort? (for small nearly sorted lists bubble is difficult to beat)
+    // This must be stable, decending sort
+again:
+    for (size_t i = 1; i < packet->latent; ++i) {
+        cea708_t c;
+        cea708_t* a = _mpeg_bitstream_cea708_at(packet, i - 1);
+        cea708_t* b = _mpeg_bitstream_cea708_at(packet, i);
+        if (a->timestamp > b->timestamp) {
+            memcpy(&c, a, sizeof(cea708_t));
+            memcpy(a, b, sizeof(cea708_t));
+            memcpy(b, &c, sizeof(cea708_t));
+            goto again;
+        }
+    }
+}
+
+// Removes items from front
+size_t mpeg_bitstream_flush(mpeg_bitstream_t* packet, caption_frame_t* frame)
+{
+    if (packet->latent) {
+        cea708_t* cea708 = _mpeg_bitstream_cea708_front(packet);
+        packet->status = libcaption_status_update(LIBCAPTION_OK, cea708_to_caption_frame(frame, cea708));
+        packet->front = (packet->front + 1) % MAX_REFRENCE_FRAMES;
+        --packet->latent;
+    }
+
+    return packet->latent;
+}
+
+void _mpeg_bitstream_cea708_sort_flush(mpeg_bitstream_t* packet, caption_frame_t* frame, double dts)
+{
+    _mpeg_bitstream_cea708_sort(packet);
+    // Loop will terminate on LIBCAPTION_READY
+    while (packet->latent && packet->status == LIBCAPTION_OK && _mpeg_bitstream_cea708_front(packet)->timestamp < dts) {
+        mpeg_bitstream_flush(packet, frame);
+    }
+}
+
+size_t mpeg_bitstream_parse(mpeg_bitstream_t* packet, caption_frame_t* frame, const uint8_t* data, size_t size, unsigned stream_type, double dts, double cts)
+{
+    if (MAX_NALU_SIZE <= packet->size) {
+        packet->status = LIBCAPTION_ERROR;
+        // fprintf(stderr, "LIBCAPTION_ERROR\n");
+        return 0;
+    }
+
+    // consume upto MAX_NALU_SIZE bytes
+    if (MAX_NALU_SIZE <= packet->size + size) {
+        size = MAX_NALU_SIZE - packet->size;
+    }
+
+    sei_t sei;
+    size_t header_size, scpos;
+    packet->status = LIBCAPTION_OK;
+    memcpy(&packet->data[packet->size], data, size);
+    packet->size += size;
+
+    while (packet->status == LIBCAPTION_OK && 0 < (scpos = find_start_code(&packet->data[0], packet->size))) {
+        switch (mpeg_bitstream_packet_type(packet, stream_type)) {
+        default:
+            break;
+        case H262_SEI_PACKET:
+            header_size = 4;
+            if (STREAM_TYPE_H262 == stream_type && scpos > header_size) {
+                cea708_t* cea708 = _mpeg_bitstream_cea708_emplace_back(packet, dts + cts);
+                packet->status = libcaption_status_update(packet->status, cea708_parse_h262(&packet->data[header_size], scpos - header_size, cea708));
+                _mpeg_bitstream_cea708_sort_flush(packet, frame, dts);
+            }
+            break;
+        case H264_SEI_PACKET:
+        case H265_SEI_PACKET:
+            header_size = STREAM_TYPE_H264 == stream_type ? 4 : STREAM_TYPE_H265 == stream_type ? 5 : 0;
+            if (header_size && scpos > header_size) {
+                packet->status = libcaption_status_update(packet->status, sei_parse(&sei, &packet->data[header_size], scpos - header_size, dts + cts));
+                for (sei_message_t* msg = sei_message_head(&sei); msg; msg = sei_message_next(msg)) {
+                    if (sei_type_user_data_registered_itu_t_t35 == sei_message_type(msg)) {
+                        cea708_t* cea708 = _mpeg_bitstream_cea708_emplace_back(packet, dts + cts);
+                        packet->status = libcaption_status_update(packet->status, cea708_parse_h264(sei_message_data(msg), sei_message_size(msg), cea708));
+                        _mpeg_bitstream_cea708_sort_flush(packet, frame, dts);
+                    }
+                }
+            }
+            break;
+        }
+
+        packet->size -= scpos;
+        memmove(&packet->data[0], &packet->data[scpos], packet->size);
+    }
+
+    return size;
+}
+////////////////////////////////////////////////////////////////////////////////
+// // h262
+// libcaption_stauts_t h262_user_data_to_caption_frame(caption_frame_t* frame, mpeg_bitstream_t* packet, double dts, double cts)
+// {
+//     cea708_t cea708;
+//     libcaption_stauts_t status = LIBCAPTION_OK;
+
+//     cea708_init(&cea708);
+//     size_t size = mpeg_bitstream_size(packet, STREAM_TYPE_H262);
+//     const uint8_t* data = mpeg_bitstream_data(packet, STREAM_TYPE_H262);
+//     status = cea708_parse_h262(data, size, &cea708);
+//     // cea708_dump(&cea708);
+//     status = libcaption_status_update(status, cea708_to_caption_frame(frame, &cea708, dts + cts));
+
+//     if (LIBCAPTION_READY == status) {
+//         frame->timestamp = dts + cts;
+//     }
+
+//     return status;
+// }

obs-studio-21.1.2.tar.xz/deps/libcaption/src/scc.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/scc.c Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/src/srt.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/srt.c Changed

obs-studio-21.1.2.tar.xz/deps/libcaption/src/utf8.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/utf8.c Changed

obs-studio-22.0.1.tar.xz/deps/libcaption/src/vtt.c Added

@@ -0,0 +1,357 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "vtt.h"
+#include "utf8.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+vtt_block_t* vtt_block_free_head(vtt_block_t* head);
+
+vtt_t* vtt_new()
+{
+    vtt_t* vtt = malloc(sizeof(vtt_t));
+    memset(vtt, 0, sizeof(vtt_t));
+    return vtt;
+}
+
+void vtt_free(vtt_t* vtt)
+{
+    while (vtt->region_head != NULL) {
+        vtt->region_head = vtt_block_free_head(vtt->region_head);
+    }
+    while (vtt->style_head != NULL) {
+        vtt->style_head = vtt_block_free_head(vtt->style_head);
+    }
+    while (vtt->cue_head != NULL) {
+        vtt->cue_head = vtt_block_free_head(vtt->cue_head);
+    }
+    free(vtt);
+}
+
+vtt_block_t* vtt_block_new(vtt_t* vtt, const utf8_char_t* data, size_t size, enum VTT_BLOCK_TYPE type)
+{
+    vtt_block_t* block = malloc(sizeof(vtt_block_t) + size + 1);
+    block->next = NULL;
+    block->type = type;
+    block->timestamp = 0.0;
+    block->duration = 0.0;
+    block->cue_settings = NULL;
+    block->cue_id = NULL;
+    block->text_size = size;
+
+    switch (type) {
+    case VTT_REGION:
+        if (vtt->region_head == NULL) {
+            vtt->region_head = block;
+        } else {
+            vtt->region_tail->next = block;
+        }
+        vtt->region_tail = block;
+        break;
+    case VTT_STYLE:
+        if (vtt->style_head == NULL) {
+            vtt->style_head = block;
+        } else {
+            vtt->style_tail->next = block;
+        }
+        vtt->style_tail = block;
+        break;
+    case VTT_CUE:
+        if (vtt->cue_head == NULL) {
+            vtt->cue_head = block;
+        } else {
+            vtt->cue_tail->next = block;
+        }
+        vtt->cue_tail = block;
+        break;
+    case VTT_NOTE:
+        break;
+    }
+
+    utf8_char_t* dest = (utf8_char_t*)vtt_block_data(block);
+    if (data) {
+        memcpy(dest, data, size);
+    } else {
+        memset(dest, 0, size);
+    }
+
+    dest[size] = '\0';
+    return block;
+}
+
+vtt_block_t* vtt_block_free_head(vtt_block_t* head)
+{
+    vtt_block_t* next = head->next;
+    if (head->cue_id != NULL) {
+        free(head->cue_id);
+    }
+    if (head->cue_settings != NULL) {
+        free(head->cue_settings);
+    }
+    free(head);
+    return next;
+}
+
+void vtt_cue_free_head(vtt_t* vtt)
+{
+    vtt->cue_head = vtt_block_free_head(vtt->cue_head);
+    if (vtt->cue_head == NULL) {
+        vtt->cue_tail = NULL;
+    }
+}
+
+void vtt_style_free_head(vtt_t* vtt)
+{
+    vtt->style_head = vtt_block_free_head(vtt->style_head);
+    if (vtt->style_head == NULL) {
+        vtt->style_tail = NULL;
+    }
+}
+
+void vtt_region_free_head(vtt_t* vtt)
+{
+    vtt->region_head = vtt_block_free_head(vtt->region_head);
+    if (vtt->region_head == NULL) {
+        vtt->region_tail = NULL;
+    }
+}
+
+#define VTTTIME2SECONDS(HH, MM, SS, MS) ((HH * 3600.0) + (MM * 60.0) + SS + (MS / 1000.0))
+double parse_timestamp(const utf8_char_t* line)
+{
+    int hh, mm, ss, ms;
+    if (sscanf(line, "%d:%2d:%2d%*1[,.]%3d", &hh, &mm, &ss, &ms) == 4) {
+        return VTTTIME2SECONDS(hh, mm, ss, ms);
+    }
+    if (sscanf(line, "%2d:%2d%*1[,.]%3d", &mm, &ss, &ms) == 3) {
+        return VTTTIME2SECONDS(0.0, mm, ss, ms);
+    }
+    return -1.0;
+}
+
+void parse_timestamps(const utf8_char_t* line, double* start_pts, double* end_pts, char** cue_settings)
+{
+    char start_str[32];
+    char end_str[32];
+    char cue_str[1024];
+
+    int matches = sscanf(line, " %31s --> %31s%1023[^\n\r]", start_str, end_str, cue_str);
+    *start_pts = -1;
+    *cue_settings = NULL;
+
+    printf("Matches: %d\n", matches);
+
+    if (matches >= 1) {
+        *start_pts = parse_timestamp(start_str);
+        printf("Start pts: %f\n", *start_pts);
+    }
+    if (matches >= 2) {
+        *end_pts = parse_timestamp(end_str);
+    }
+    if ((matches == 3) && (strlen(cue_str) > 0)) {
+        int cue_size = strlen(cue_str);
+        *cue_settings = malloc(cue_size + 1);
+        strncpy(*cue_settings, cue_str, cue_size);
+        (*cue_settings)[cue_size] = '\0';
+    }
+}
+
+vtt_t* vtt_parse(const utf8_char_t* data, size_t size)
+{
+    return _vtt_parse(data, size, 0);
+}
+
+vtt_t* _vtt_parse(const utf8_char_t* data, size_t size, int srt_mode)
+{
+    vtt_t* vtt = NULL;
+    double str_pts = 0, end_pts = 0;
+    size_t line_length = 0, trimmed_length = 0;
+    char* cue_settings;
+    enum VTT_BLOCK_TYPE block_type;
+    size_t cue_id_length = 0;
+    const utf8_char_t* cue_id = NULL;
+
+    if (!data || !size || size < 6) {
+        return NULL;
+    }
+
+    // TODO: Support UTF-8 BOM?
+    if (!srt_mode && strncmp(data, "WEBVTT", 6) != 0) {
+        // WebVTT files must start with WEBVTT
+        fprintf(stderr, "Invalid webvtt header: %.*s\n", 6, data);
+        return NULL;
+    }
+
+    data += 6;
+    size -= 6;
+
+    vtt = vtt_new();
+
+    for (;;) {
+        line_length = 0;
+
+        do {
+            data += line_length;
+            size -= line_length;
+            line_length = utf8_line_length(data); // Line length
+            trimmed_length = utf8_trimmed_length(data, line_length);
+            // Skip empty lines
+        } while (0 < line_length && 0 == trimmed_length);
+
+        // line length only zero at EOF
+        if (0 == line_length) {
+            break;
+        }
+
+        if (strnstr(data, "REGION", line_length) != NULL) {
+            block_type = VTT_REGION;
+        } else if (strnstr(data, "STYLE", line_length) != NULL) {
+            block_type = VTT_STYLE;
+        } else if (strnstr(data, "NOTE", line_length) != NULL) {
+            block_type = VTT_NOTE;
+        } else if (strnstr(data, "-->", line_length) != NULL) {
+            block_type = VTT_CUE;
+            parse_timestamps(data, &str_pts, &end_pts, &cue_settings);
+            if (str_pts == -1) {
+                // Failed to parse timestamps
+                fprintf(stderr, "Bad timestamp: %.*s\n", (int)line_length, data);
+                return NULL;
+            }
+        } else {
+            if (cue_id != NULL) {
+                // Invalid text found
+                fprintf(stderr, "ERR: Unrecognized block\n");
+                return NULL;
+            }
+
+            cue_id = data;
+            cue_id_length = line_length;
+
+            data += line_length;
+            size -= line_length;
+            continue;
+        }
+
+        data += line_length;
+        size -= line_length;
+
+        // Caption text starts here
+        const utf8_char_t* text = data;
+        size_t text_size = 0;
+
+        line_length = 0;
+
+        do {
+            text_size += line_length;
+            line_length = utf8_line_length(data);
+            trimmed_length = utf8_trimmed_length(data, line_length);
+            // printf ("cap (%d): '%.*s'\n", line_length, (int) trimmed_length, data);
+            data += line_length;
+            size -= line_length;
+        } while (trimmed_length);
+
+        // should we trim here?
+
+        vtt_block_t* block = vtt_block_new(vtt, text, text_size, block_type);
+
+        if (block_type == VTT_CUE) {
+            block->timestamp = str_pts;
+            block->duration = end_pts - str_pts;
+            block->cue_settings = cue_settings;
+            if (cue_id != NULL) {
+                block->cue_id = malloc(cue_id_length + 1);
+                memcpy(block->cue_id, cue_id, cue_id_length);
+                block->cue_id[cue_id_length] = '\0';
+            }
+        }
+
+        cue_id = NULL;
+    }
+
+    return vtt;
+}
+
+int vtt_cue_to_caption_frame(vtt_block_t* cue, caption_frame_t* frame)
+{
+    const char* data = vtt_block_data(cue);
+    return caption_frame_from_text(frame, data);
+}
+
+vtt_block_t* vtt_cue_from_caption_frame(caption_frame_t* frame, vtt_t* vtt)
+{
+    if (vtt->cue_tail && 0 >= vtt->cue_tail->duration) {
+        vtt->cue_tail->duration = frame->timestamp - vtt->cue_tail->timestamp;
+    }
+
+    // CRLF per row, plus an extra at the end
+    vtt_block_t* cue = vtt_block_new(vtt, NULL, 2 + CAPTION_FRAME_TEXT_BYTES, VTT_CUE);
+    utf8_char_t* data = vtt_block_data(cue);
+
+    caption_frame_to_text(frame, data);
+    cue->timestamp = frame->timestamp;
+    // vtt requires an extra new line
+    strcat((char*)data, "\r\n");
+    return cue;
+}
+
+static void _dump(vtt_t* vtt)
+{
+    vtt_block_t* block;
+    printf("WEBVTT\r\n\r\n");
+
+    block = vtt->region_head;
+    while (block != NULL) {
+        printf("REGION\r\n%s\r\n", vtt_block_data(block));
+        block = block->next;
+    }
+
+    block = vtt->style_head;
+    while (block != NULL) {
+        printf("STYLE\r\n%s\r\n", vtt_block_data(block));
+        block = block->next;
+    }
+
+    block = vtt->cue_head;
+    while (block != NULL) {
+        int hh1, hh2, mm1, mm2, ss1, ss2, ms1, ms2;
+        vtt_crack_time(block->timestamp, &hh1, &mm1, &ss1, &ms1);
+        vtt_crack_time(block->timestamp + block->duration, &hh2, &mm2, &ss2, &ms2);
+
+        if (block->cue_id != NULL) {
+            printf("%s\n", block->cue_id);
+        }
+
+        printf("%02d:%02d:%02d.%03d --> %02d:%02d:%02d.%03d",
+            hh1, mm1, ss1, ms1, hh2, mm2, ss2, ms2);
+
+        if (block->cue_settings != NULL) {
+            printf(" %s", block->cue_settings);
+        }
+
+        printf("\r\n%s\r\n", vtt_block_data(block));
+    }
+}
+
+void vtt_dump(vtt_t* head) { _dump(head); }

obs-studio-21.1.2.tar.xz/deps/libcaption/src/xds.c -> obs-studio-22.0.1.tar.xz/deps/libcaption/src/xds.c Changed

@@ -1,46 +1,57 @@
 /**********************************************************************************************/
-/* Copyright 2016-2016 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/* The MIT License                                                                            */
 /*                                                                                            */
-/* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file  */
-/* except in compliance with the License. A copy of the License is located at                 */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
 /*                                                                                            */
-/*     http://aws.amazon.com/apache2.0/                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
 /*                                                                                            */
-/* or in the "license" file accompanying this file. This file is distributed on an "AS IS"    */
-/* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the    */
-/* License for the specific language governing permissions and limitations under the License. */
+/* 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.                                                                              */
 /**********************************************************************************************/
 // http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/CC_XDS.HTML#PR
 #include "xds.h"
 #include "caption.h"
 #include <string.h>
 
-void xds_init (xds_t* xds)
+void xds_init(xds_t* xds)
 {
-    memset (xds,0,sizeof (xds_t));
+    memset(xds, 0, sizeof(xds_t));
 }
 
-int xds_decode (xds_t* xds, uint16_t cc)
+int xds_decode(xds_t* xds, uint16_t cc)
 {
     switch (xds->state) {
     default:
     case 0:
-        xds_init (xds);
-        xds->class = (cc&0x0F00) >>8;
-        xds->type = (cc&0x000F);
+        xds_init(xds);
+        xds->class_code = (cc & 0x0F00) >> 8;
+        xds->type = (cc & 0x000F);
         xds->state = 1;
         return LIBCAPTION_OK;
 
     case 1:
-        if (0x8F00 == (cc&0xFF00)) {
-            xds->checksum = (cc&0x007F);
+        if (0x8F00 == (cc & 0xFF00)) {
+            xds->checksum = (cc & 0x007F);
             xds->state = 0;
             return LIBCAPTION_READY;
         }
 
         if (xds->size < 32) {
-            xds->content[xds->size+0] = (cc&0x7F00) >>8;
-            xds->content[xds->size+1] = (cc&0x007F);
+            xds->content[xds->size + 0] = (cc & 0x7F00) >> 8;
+            xds->content[xds->size + 1] = (cc & 0x007F);
             xds->size += 2;
             return LIBCAPTION_OK;
         }

obs-studio-21.1.2.tar.xz/docs/sphinx/reference-core.rst -> obs-studio-22.0.1.tar.xz/docs/sphinx/reference-core.rst Changed

obs-studio-21.1.2.tar.xz/docs/sphinx/reference-encoders.rst -> obs-studio-22.0.1.tar.xz/docs/sphinx/reference-encoders.rst Changed

obs-studio-21.1.2.tar.xz/docs/sphinx/reference-libobs-callback.rst -> obs-studio-22.0.1.tar.xz/docs/sphinx/reference-libobs-callback.rst Changed

obs-studio-21.1.2.tar.xz/docs/sphinx/reference-outputs.rst -> obs-studio-22.0.1.tar.xz/docs/sphinx/reference-outputs.rst Changed

obs-studio-21.1.2.tar.xz/docs/sphinx/reference-scenes.rst -> obs-studio-22.0.1.tar.xz/docs/sphinx/reference-scenes.rst Changed

@@ -101,6 +101,23 @@
    Bottom crop value.
 
 
+Scene Item Order Info Structure (*obs_sceneitem_order_info)
+----------------------------------------------
+
+.. type:: struct obs_sceneitem_order_info
+
+   Scene item order info structure.
+
+.. member:: obs_sceneitem_t *obs_sceneitem_order_info.group
+
+   Specifies the group this scene item belongs to, or *NULL* if none.
+
+.. member:: obs_sceneitem_t *obs_sceneitem_order_info.item
+
+   Specifies the scene item.
+
+
+
 .. _scene_signal_reference:
 
 Scene Signals
@@ -223,6 +240,12 @@
 
 ---------------------
 
+.. function:: bool obs_scene_reorder_items2(obs_scene_t *scene, struct obs_sceneitem_order_info *item_order, size_t item_order_size)
+
+   Reorders items within a scene with groups and group sub-items.
+
+---------------------
+
 
 .. _scene_item_reference:
 
@@ -412,3 +435,119 @@
    :return: An incremented reference to the private settings of the
             scene item.  Allows the front-end to set custom information
             which is saved with the scene item
+
+---------------------
+
+
+.. _scene_item_group_reference:
+
+Scene Item Group Functions
+--------------------------
+
+.. function:: obs_sceneitem_t *obs_scene_add_group(obs_scene_t *scene, const char *name)
+
+   Adds a group with the specified name.
+
+   :param scene: Scene to add the group to
+   :param name:  Name of the group
+   :return:      The new group's scene item
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene, const char *name, obs_sceneitem_t **items, size_t count)
+
+   Creates a group out of the specified scene items.  The group will be
+   inserted at the top scene item.
+
+   :param scene: Scene to add the group to
+   :param name:  Name of the group
+   :param items: Array of scene items to put in a group
+   :param count: Number of scene items in the array
+   :return:      The new group's scene item
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_scene_get_group(obs_scene_t *scene, const char *name)
+
+   Finds a group within a scene by its name.
+
+   :param scene: Scene to find the group within
+   :param name:  The name of the group to find
+   :return:      The group scene item, or *NULL* if not found
+
+---------------------
+
+.. function:: bool obs_sceneitem_is_group(obs_sceneitem_t *item)
+
+   :param item: Scene item
+   :return:     *true* if scene item is a group, *false* otherwise
+
+---------------------
+
+.. function:: obs_scene_t *obs_sceneitem_group_get_scene(const obs_sceneitem_t *group)
+
+   :param group: Group scene item
+   :return:      Scene of the group, or *NULL* if not a group
+
+---------------------
+
+.. function:: void obs_sceneitem_group_ungroup(obs_sceneitem_t *group)
+
+   Ungroups the specified group.  Scene items within the group will be
+   placed where the group was.
+
+---------------------
+
+.. function:: void obs_sceneitem_group_add_item(obs_sceneitem_t *group, obs_sceneitem_t *item)
+
+   Adds a scene item to a group.
+
+---------------------
+
+.. function:: void obs_sceneitem_group_remove_item(obs_sceneitem_t *item)
+
+   Rmoves a scene item from a group.  The item will be placed before the
+   group in the main scene.
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_sceneitem_get_group(obs_sceneitem_t *item)
+
+   Returns the parent group of a scene item.
+
+   :param item: Scene item to get the group of
+   :return:     The parent group of the scene item, or *NULL* if not in
+                a group
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_sceneitem_group_from_scene(obs_scene_t *scene)
+
+   :return: The group associated with the scene, or *NULL* if the
+            specified scene is not a group.
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_sceneitem_group_from_source(obs_source_t *source)
+
+   :return: The group associated with the scene's source, or *NULL* if
+            the specified source is not a group.
+
+---------------------
+
+.. function:: void obs_sceneitem_group_enum_items(obs_sceneitem_t *group, bool (*callback)(obs_scene_t*, obs_sceneitem_t*, void*), void *param)
+
+   Enumerates scene items within a group.
+
+---------------------
+
+.. function:: void obs_sceneitem_defer_group_resize_begin(obs_sceneitem_t *item)
+.. function:: void obs_sceneitem_defer_group_resize_end(obs_sceneitem_t *item)
+
+   Allows the ability to call any one of the transform functions on
+   scene items within a group without updating the internal matrices of
+   the group until obs_sceneitem_defer_group_resize_end has been called.
+
+   This is necessary if the user is resizing items while they are within
+   a group, as the group's transform will automatically update its
+   transform every frame otherwise.

obs-studio-21.1.2.tar.xz/docs/sphinx/scripting.rst -> obs-studio-22.0.1.tar.xz/docs/sphinx/scripting.rst Changed

obs-studio-21.1.2.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-22.0.1.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

obs-studio-21.1.2.tar.xz/libobs-opengl/gl-shaderparser.c -> obs-studio-22.0.1.tar.xz/libobs-opengl/gl-shaderparser.c Changed

obs-studio-21.1.2.tar.xz/libobs-opengl/gl-x11.c -> obs-studio-22.0.1.tar.xz/libobs-opengl/gl-x11.c Changed

obs-studio-21.1.2.tar.xz/libobs/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/libobs/CMakeLists.txt Changed

@@ -13,6 +13,13 @@
 
 if(UNIX)
 	if (NOT APPLE)
+		find_package(X11_XCB REQUIRED)
+		find_package(XCB OPTIONAL_COMPONENTS XINPUT)
+		if (XCB_XINPUT_FOUND)
+			set(USE_XINPUT "1")
+		else()
+			set(USE_XINPUT "0")
+		endif()
 		find_package(PulseAudio)
 		if (NOT "${PULSEAUDIO_LIBRARY}" STREQUAL "")
 			message(STATUS "Found PulseAudio - Audio Monitor enabled")
@@ -22,14 +29,13 @@
 		endif()
 	else()
 		set(HAVE_PULSEAUDIO "0")
+		set(USE_XINPUT "0")
 	endif()
 	find_package(DBus QUIET)
-	if (NOT APPLE)
-		find_package(X11_XCB REQUIRED)
-	endif()
 else()
 	set(HAVE_DBUS "0")
 	set(HAVE_PULSEAUDIO "0")
+	set(USE_XINPUT "0")
 endif()
 
 find_package(ImageMagick QUIET COMPONENTS MagickCore)
@@ -199,6 +205,16 @@
 		${libobs_PLATFORM_DEPS}
 		${X11_XCB_LIBRARIES})
 
+	if(USE_XINPUT)
+		include_directories(
+			${XCB_XINPUT_INCLUDE_DIR})
+		add_definitions(
+			${XCB_DEFINITIONS})
+		set(libobs_PLATFORM_DEPS
+			${XCB_XINPUT_LIBRARY}
+			${libobs_PLATFORM_DEPS})
+	endif()
+
 	if(HAVE_PULSEAUDIO)
 		set(libobs_PLATFORM_DEPS
 			${libobs_PLATFORM_DEPS}

obs-studio-21.1.2.tar.xz/libobs/audio-monitoring/osx/coreaudio-enum-devices.c -> obs-studio-22.0.1.tar.xz/libobs/audio-monitoring/osx/coreaudio-enum-devices.c Changed

obs-studio-21.1.2.tar.xz/libobs/audio-monitoring/osx/coreaudio-output.c -> obs-studio-22.0.1.tar.xz/libobs/audio-monitoring/osx/coreaudio-output.c Changed

obs-studio-21.1.2.tar.xz/libobs/callback/signal.c -> obs-studio-22.0.1.tar.xz/libobs/callback/signal.c Changed

@@ -24,6 +24,7 @@
 	signal_callback_t callback;
 	void              *data;
 	bool              remove;
+	bool              keep_ref;
 };
 
 struct signal_info {
@@ -96,6 +97,7 @@
 struct signal_handler {
 	struct signal_info *first;
 	pthread_mutex_t    mutex;
+	volatile long      refs;
 
 	DARRAY(struct global_callback_info) global_callbacks;
 	pthread_mutex_t                     global_callbacks_mutex;
@@ -126,6 +128,7 @@
 {
 	struct signal_handler *handler = bzalloc(sizeof(struct signal_handler));
 	handler->first = NULL;
+	handler->refs = 1;
 
 	pthread_mutexattr_t attr;
 	if (pthread_mutexattr_init(&attr) != 0)
@@ -149,20 +152,25 @@
 	return handler;
 }
 
-void signal_handler_destroy(signal_handler_t *handler)
+static void signal_handler_actually_destroy(signal_handler_t *handler)
 {
-	if (handler) {
-		struct signal_info *sig = handler->first;
-		while (sig != NULL) {
-			struct signal_info *next = sig->next;
-			signal_info_destroy(sig);
-			sig = next;
-		}
+	struct signal_info *sig = handler->first;
+	while (sig != NULL) {
+		struct signal_info *next = sig->next;
+		signal_info_destroy(sig);
+		sig = next;
+	}
 
-		da_free(handler->global_callbacks);
-		pthread_mutex_destroy(&handler->global_callbacks_mutex);
-		pthread_mutex_destroy(&handler->mutex);
-		bfree(handler);
+	da_free(handler->global_callbacks);
+	pthread_mutex_destroy(&handler->global_callbacks_mutex);
+	pthread_mutex_destroy(&handler->mutex);
+	bfree(handler);
+}
+
+void signal_handler_destroy(signal_handler_t *handler)
+{
+	if (handler && os_atomic_dec_long(&handler->refs) == 0) {
+		signal_handler_actually_destroy(handler);
 	}
 }
 
@@ -197,11 +205,12 @@
 	return success;
 }
 
-void signal_handler_connect(signal_handler_t *handler, const char *signal,
-		signal_callback_t callback, void *data)
+static void signal_handler_connect_internal(signal_handler_t *handler,
+		const char *signal, signal_callback_t callback, void *data,
+		bool keep_ref)
 {
 	struct signal_info *sig, *last;
-	struct signal_callback cb_data = {callback, data, false};
+	struct signal_callback cb_data = {callback, data, false, keep_ref};
 	size_t idx;
 
 	if (!handler)
@@ -221,13 +230,28 @@
 
 	pthread_mutex_lock(&sig->mutex);
 
+	if (keep_ref)
+		os_atomic_inc_long(&handler->refs);
+
 	idx = signal_get_callback_idx(sig, callback, data);
-	if (idx == DARRAY_INVALID)
+	if (keep_ref || idx == DARRAY_INVALID)
 		da_push_back(sig->callbacks, &cb_data);
 
 	pthread_mutex_unlock(&sig->mutex);
 }
 
+void signal_handler_connect(signal_handler_t *handler, const char *signal,
+		signal_callback_t callback, void *data)
+{
+	signal_handler_connect_internal(handler, signal, callback, data, false);
+}
+
+void signal_handler_connect_ref(signal_handler_t *handler, const char *signal,
+		signal_callback_t callback, void *data)
+{
+	signal_handler_connect_internal(handler, signal, callback, data, true);
+}
+
 static inline struct signal_info *getsignal_locked(signal_handler_t *handler,
 		const char *name)
 {
@@ -247,6 +271,7 @@
 		signal_callback_t callback, void *data)
 {
 	struct signal_info *sig = getsignal_locked(handler, signal);
+	bool keep_ref = false;
 	size_t idx;
 
 	if (!sig)
@@ -256,13 +281,19 @@
 
 	idx = signal_get_callback_idx(sig, callback, data);
 	if (idx != DARRAY_INVALID) {
-		if (sig->signalling)
+		if (sig->signalling) {
 			sig->callbacks.array[idx].remove = true;
-		else
+		} else {
+			keep_ref = sig->callbacks.array[idx].keep_ref;
 			da_erase(sig->callbacks, idx);
+		}
 	}
 
 	pthread_mutex_unlock(&sig->mutex);
+
+	if (keep_ref && os_atomic_dec_long(&handler->refs) == 0) {
+		signal_handler_actually_destroy(handler);
+	}
 }
 
 static THREAD_LOCAL struct signal_callback *current_signal_cb = NULL;
@@ -280,6 +311,7 @@
 		calldata_t *params)
 {
 	struct signal_info *sig = getsignal_locked(handler, signal);
+	long remove_refs = 0;
 
 	if (!sig)
 		return;
@@ -298,8 +330,12 @@
 
 	for (size_t i = sig->callbacks.num; i > 0; i--) {
 		struct signal_callback *cb = sig->callbacks.array+i-1;
-		if (cb->remove)
+		if (cb->remove) {
+			if (cb->keep_ref)
+				remove_refs++;
+
 			da_erase(sig->callbacks, i-1);
+		}
 	}
 
 	sig->signalling = false;
@@ -331,6 +367,12 @@
 	}
 
 	pthread_mutex_unlock(&handler->global_callbacks_mutex);
+
+	if (remove_refs) {
+		os_atomic_set_long(&handler->refs,
+				os_atomic_load_long(&handler->refs) -
+				remove_refs);
+	}
 }
 
 void signal_handler_connect_global(signal_handler_t *handler,

obs-studio-21.1.2.tar.xz/libobs/callback/signal.h -> obs-studio-22.0.1.tar.xz/libobs/callback/signal.h Changed

obs-studio-21.1.2.tar.xz/libobs/graphics/effect-parser.c -> obs-studio-22.0.1.tar.xz/libobs/graphics/effect-parser.c Changed

@@ -491,13 +491,40 @@
 		struct ep_func *func, struct ep_var *var)
 {
 	int code;
+	bool var_type_keyword = false;
 
 	if (!cf_next_valid_token(&ep->cfp))
 		return PARSE_EOF;
 
-	code = ep_check_for_keyword(ep, "uniform", &var->uniform);
+	code = ep_check_for_keyword(ep, "in", &var_type_keyword);
 	if (code == PARSE_EOF)
 		return PARSE_EOF;
+	else if (var_type_keyword)
+		var->var_type = EP_VAR_IN;
+
+	if (!var_type_keyword) {
+		code = ep_check_for_keyword(ep, "inout", &var_type_keyword);
+		if (code == PARSE_EOF)
+			return PARSE_EOF;
+		else if (var_type_keyword)
+			var->var_type = EP_VAR_INOUT;
+	}
+
+	if (!var_type_keyword) {
+		code = ep_check_for_keyword(ep, "out", &var_type_keyword);
+		if (code == PARSE_EOF)
+			return PARSE_EOF;
+		else if (var_type_keyword)
+			var->var_type = EP_VAR_OUT;
+	}
+
+	if (!var_type_keyword) {
+		code = ep_check_for_keyword(ep, "uniform", &var_type_keyword);
+		if (code == PARSE_EOF)
+			return PARSE_EOF;
+		else if (var_type_keyword)
+			var->var_type = EP_VAR_UNIFORM;
+	}
 
 	code = cf_get_name(&ep->cfp, &var->type, "type", ")");
 	if (code != PARSE_SUCCESS)
@@ -1083,8 +1110,14 @@
 
 static inline void ep_write_var(struct dstr *shader, struct ep_var *var)
 {
-	if (var->uniform)
+	if (var->var_type == EP_VAR_INOUT)
+		dstr_cat(shader, "inout ");
+	else if (var->var_type == EP_VAR_OUT)
+		dstr_cat(shader, "out ");
+	else if (var->var_type == EP_VAR_UNIFORM)
 		dstr_cat(shader, "uniform ");
+	// The "in" input modifier is implied by default, so leave it blank
+	// in that case.
 
 	dstr_cat(shader, var->type);
 	dstr_cat(shader, " ");

obs-studio-21.1.2.tar.xz/libobs/graphics/effect-parser.h -> obs-studio-22.0.1.tar.xz/libobs/graphics/effect-parser.h Changed

obs-studio-21.1.2.tar.xz/libobs/graphics/shader-parser.c -> obs-studio-22.0.1.tar.xz/libobs/graphics/shader-parser.c Changed

@@ -334,16 +334,40 @@
 		struct shader_var *var)
 {
 	int code;
-	bool is_uniform = false;
+	bool var_type_keyword = false;
 
 	if (!cf_next_valid_token(&sp->cfp))
 		return PARSE_EOF;
 
-	code = sp_check_for_keyword(sp, "uniform", &is_uniform);
+	code = sp_check_for_keyword(sp, "in", &var_type_keyword);
 	if (code == PARSE_EOF)
 		return PARSE_EOF;
+	else if (var_type_keyword)
+		var->var_type = SHADER_VAR_IN;
 
-	var->var_type = is_uniform ? SHADER_VAR_UNIFORM : SHADER_VAR_NONE;
+	if (!var_type_keyword) {
+		code = sp_check_for_keyword(sp, "inout", &var_type_keyword);
+		if (code == PARSE_EOF)
+			return PARSE_EOF;
+		else if (var_type_keyword)
+			var->var_type = SHADER_VAR_INOUT;
+	}
+
+	if (!var_type_keyword) {
+		code = sp_check_for_keyword(sp, "out", &var_type_keyword);
+		if (code == PARSE_EOF)
+			return PARSE_EOF;
+		else if (var_type_keyword)
+			var->var_type = SHADER_VAR_OUT;
+	}
+
+	if (!var_type_keyword) {
+		code = sp_check_for_keyword(sp, "uniform", &var_type_keyword);
+		if (code == PARSE_EOF)
+			return PARSE_EOF;
+		else if (var_type_keyword)
+			var->var_type = SHADER_VAR_UNIFORM;
+	}
 
 	code = cf_get_name(&sp->cfp, &var->type, "type", ")");
 	if (code != PARSE_SUCCESS)

obs-studio-21.1.2.tar.xz/libobs/graphics/shader-parser.h -> obs-studio-22.0.1.tar.xz/libobs/graphics/shader-parser.h Changed

obs-studio-21.1.2.tar.xz/libobs/media-io/media-remux.c -> obs-studio-22.0.1.tar.xz/libobs/media-io/media-remux.c Changed

obs-studio-21.1.2.tar.xz/libobs/obs-audio-controls.c -> obs-studio-22.0.1.tar.xz/libobs/obs-audio-controls.c Changed

@@ -16,6 +16,7 @@
 */
 
 #include <math.h>
+#include <xmmintrin.h>
 
 #include "util/threading.h"
 #include "util/bmem.h"
@@ -62,18 +63,20 @@
 };
 
 struct obs_volmeter {
-	pthread_mutex_t        mutex;
-	obs_source_t           *source;
-	enum obs_fader_type    type;
-	float                  cur_db;
+	pthread_mutex_t             mutex;
+	obs_source_t                *source;
+	enum obs_fader_type         type;
+	float                       cur_db;
 
-	pthread_mutex_t        callback_mutex;
-	DARRAY(struct meter_cb)callbacks;
+	pthread_mutex_t             callback_mutex;
+	DARRAY(struct meter_cb)     callbacks;
 
-	unsigned int           update_ms;
+	enum obs_peak_meter_type    peak_meter_type;
+	unsigned int                update_ms;
+	float			    prev_samples[MAX_AUDIO_CHANNELS][4];
 
-	float                  vol_magnitude[MAX_AUDIO_CHANNELS];
-	float                  vol_peak[MAX_AUDIO_CHANNELS];
+	float                       magnitude[MAX_AUDIO_CHANNELS];
+	float                       peak[MAX_AUDIO_CHANNELS];
 };
 
 static float cubic_def_to_db(const float def)
@@ -256,48 +259,257 @@
 	obs_volmeter_detach_source(volmeter);
 }
 
-static void volmeter_process_audio_data(obs_volmeter_t *volmeter,
-		const struct audio_data *data)
+static int get_nr_channels_from_audio_data(const struct audio_data *data)
+{
+	int nr_channels = 0;
+	for (int i = 0; i < MAX_AV_PLANES; i++) {
+		if (data->data[i])
+			nr_channels++;
+	}
+	return CLAMP(nr_channels, 0, MAX_AUDIO_CHANNELS);
+}
+
+/* msb(h, g, f, e) lsb(d, c, b, a)   -->  msb(h, h, g, f) lsb(e, d, c, b)
+ */
+#define SHIFT_RIGHT_2PS(msb, lsb) {\
+	__m128 tmp = _mm_shuffle_ps(lsb, msb, _MM_SHUFFLE(0, 0, 3, 3));\
+	lsb = _mm_shuffle_ps(lsb, tmp, _MM_SHUFFLE(2, 1, 2, 1));\
+	msb = _mm_shuffle_ps(msb, msb, _MM_SHUFFLE(3, 3, 2, 1));\
+}
+
+/* x(d, c, b, a) --> (|d|, |c|, |b|, |a|)
+ */
+#define abs_ps(v) \
+	_mm_andnot_ps(_mm_set1_ps(-0.f), v)
+
+/* Take cross product of a vector with a matrix resulting in vector.
+ */
+#define VECTOR_MATRIX_CROSS_PS(out, v, m0, m1, m2, m3) \
+{\
+	out = _mm_mul_ps(v, m0);\
+	__m128 mul1 = _mm_mul_ps(v, m1);\
+	__m128 mul2 = _mm_mul_ps(v, m2);\
+	__m128 mul3 = _mm_mul_ps(v, m3);\
+\
+	_MM_TRANSPOSE4_PS(out, mul1, mul2, mul3);\
+\
+	out = _mm_add_ps(out, mul1);\
+	out = _mm_add_ps(out, mul2);\
+	out = _mm_add_ps(out, mul3);\
+}
+
+/* x4(d, c, b, a)  -->  max(a, b, c, d)
+ */
+#define hmax_ps(r, x4) \
+	do { \
+		float x4_mem[4]; \
+		_mm_storeu_ps(x4_mem, x4); \
+		r = x4_mem[0]; \
+		r = fmaxf(r, x4_mem[1]); \
+		r = fmaxf(r, x4_mem[2]); \
+		r = fmaxf(r, x4_mem[3]); \
+	} while (false)
+
+/* Calculate the true peak over a set of samples.
+ * The algorithm implements 5x oversampling by using Whittaker–Shannon
+ * interpolation over four samples.
+ *
+ * The four samples have location t=-1.5, -0.5, +0.5, +1.5
+ * The oversamples are taken at locations t=-0.3, -0.1, +0.1, +0.3
+ *
+ * @param previous_samples  Last 4 samples from the previous iteration.
+ * @param samples           The samples to find the peak in.
+ * @param nr_samples        Number of sets of 4 samples.
+ * @returns 5 times oversampled true-peak from the set of samples.
+ */
+static float get_true_peak(__m128 previous_samples, const float *samples,
+	size_t nr_samples)
+{
+	/* These are normalized-sinc parameters for interpolating over sample
+	 * points which are located at x-coords: -1.5, -0.5, +0.5, +1.5.
+	 * And oversample points at x-coords: -0.3, -0.1, 0.1, 0.3. */
+	const __m128 m3 = _mm_set_ps(-0.155915f, 0.935489f, 0.233872f, -0.103943f);
+	const __m128 m1 = _mm_set_ps(-0.216236f, 0.756827f, 0.504551f, -0.189207f);
+	const __m128 p1 = _mm_set_ps(-0.189207f, 0.504551f, 0.756827f, -0.216236f);
+	const __m128 p3 = _mm_set_ps(-0.103943f, 0.233872f, 0.935489f, -0.155915f);
+
+	__m128 work = previous_samples;
+	__m128 peak = previous_samples;
+	for (size_t i = 0; (i + 3) < nr_samples; i += 4) {
+		__m128 new_work = _mm_load_ps(&samples[i]);
+		__m128 intrp_samples;
+
+		/* Include the actual sample values in the peak. */
+		__m128 abs_new_work = abs_ps(new_work);
+		peak = _mm_max_ps(peak, abs_new_work);
+
+		/* Shift in the next point. */
+		SHIFT_RIGHT_2PS(new_work, work);
+		VECTOR_MATRIX_CROSS_PS(intrp_samples, work, m3, m1, p1, p3);
+		peak = _mm_max_ps(peak, abs_ps(intrp_samples));
+
+		SHIFT_RIGHT_2PS(new_work, work);
+		VECTOR_MATRIX_CROSS_PS(intrp_samples, work, m3, m1, p1, p3);
+		peak = _mm_max_ps(peak, abs_ps(intrp_samples));
+
+		SHIFT_RIGHT_2PS(new_work, work);
+		VECTOR_MATRIX_CROSS_PS(intrp_samples, work, m3, m1, p1, p3);
+		peak = _mm_max_ps(peak, abs_ps(intrp_samples));
+
+		SHIFT_RIGHT_2PS(new_work, work);
+		VECTOR_MATRIX_CROSS_PS(intrp_samples, work, m3, m1, p1, p3);
+		peak = _mm_max_ps(peak, abs_ps(intrp_samples));
+	}
+
+	float r;
+	hmax_ps(r, peak);
+	return r;
+}
+
+/* points contain the first four samples to calculate the sinc interpolation
+ * over. They will have come from a previous iteration.
+ */
+static float get_sample_peak(__m128 previous_samples, const float *samples,
+	size_t nr_samples)
+{
+	__m128 peak = previous_samples;
+	for (size_t i = 0; (i + 3) < nr_samples; i += 4) {
+		__m128 new_work = _mm_load_ps(&samples[i]);
+		peak = _mm_max_ps(peak, abs_ps(new_work));
+	}
+
+	float r;
+	hmax_ps(r, peak);
+	return r;
+}
+
+static void volmeter_process_peak_last_samples(obs_volmeter_t *volmeter,
+		int channel_nr, float *samples, size_t nr_samples)
+{
+	/* Take the last 4 samples that need to be used for the next peak
+	 * calculation. If there are less than 4 samples in total the new
+	 * samples shift out the old samples. */
+
+	switch (nr_samples) {
+	case 0:
+		break;
+	case 1:
+		volmeter->prev_samples[channel_nr][0] =
+				volmeter->prev_samples[channel_nr][1];
+		volmeter->prev_samples[channel_nr][1] =
+				volmeter->prev_samples[channel_nr][2];
+		volmeter->prev_samples[channel_nr][2] =
+				volmeter->prev_samples[channel_nr][3];
+		volmeter->prev_samples[channel_nr][3] = samples[nr_samples-1];
+		break;
+	case 2:
+		volmeter->prev_samples[channel_nr][0] =
+				volmeter->prev_samples[channel_nr][2];
+		volmeter->prev_samples[channel_nr][1] =
+				volmeter->prev_samples[channel_nr][3];
+		volmeter->prev_samples[channel_nr][2] = samples[nr_samples-2];
+		volmeter->prev_samples[channel_nr][3] = samples[nr_samples-1];
+		break;
+	case 3:
+		volmeter->prev_samples[channel_nr][0] =
+				volmeter->prev_samples[channel_nr][3];
+		volmeter->prev_samples[channel_nr][1] = samples[nr_samples-3];
+		volmeter->prev_samples[channel_nr][2] = samples[nr_samples-2];
+		volmeter->prev_samples[channel_nr][3] = samples[nr_samples-1];
+		break;
+	default:
+		volmeter->prev_samples[channel_nr][0] = samples[nr_samples-4];
+		volmeter->prev_samples[channel_nr][1] = samples[nr_samples-3];
+		volmeter->prev_samples[channel_nr][2] = samples[nr_samples-2];
+		volmeter->prev_samples[channel_nr][3] = samples[nr_samples-1];
+	}
+}
+
+static void volmeter_process_peak(obs_volmeter_t *volmeter,
+		const struct audio_data *data, int nr_channels)
 {
 	int nr_samples = data->frames;
 	int channel_nr = 0;
-
-	for (size_t plane_nr = 0; plane_nr < MAX_AV_PLANES; plane_nr++) {
+	for (int plane_nr = 0; channel_nr < nr_channels; plane_nr++) {
 		float *samples = (float *)data->data[plane_nr];
 		if (!samples) {
-			// This plane does not contain data.
 			continue;
 		}
+		if (((uintptr_t)samples & 0xf) > 0) {
+			printf("Audio plane %i is not aligned %p skipping "
+					"peak volume measurement.\n",
+					plane_nr, samples);
+			volmeter->peak[channel_nr] = 1.0;
+			channel_nr++;
+			continue;
+		}
+
+		/* volmeter->prev_samples may not be aligned to 16 bytes;
+		 * use unaligned load. */
+		__m128 previous_samples = _mm_loadu_ps(
+				volmeter->prev_samples[channel_nr]);
+
+		float peak;
+		switch (volmeter->peak_meter_type) {
+		case TRUE_PEAK_METER:
+			peak = get_true_peak(previous_samples, samples,
+					nr_samples);
+			break;
+
+		case SAMPLE_PEAK_METER:
+		default:
+			peak = get_sample_peak(previous_samples, samples,
+					nr_samples);
+			break;
 
-		// For each plane calculate:
-		// * peak = the maximum-absolute of the sample values.
-		// * magnitude = root-mean-square of the sample values.
-		//      A VU meter needs to integrate over 300ms, but this will
-		//	be handled by the ballistics of the meter itself,
-		//	reality. Which makes this calculation independent of
-		//	sample rate or update rate.
-		float peak = 0.0;
-		float sum_of_squares = 0.0;
-		for (int sample_nr = 0; sample_nr < nr_samples; sample_nr++) {
-			float sample = samples[sample_nr];
-
-			peak = fmaxf(peak, fabsf(sample));
-			sum_of_squares += (sample * sample);
 		}
 
-		volmeter->vol_magnitude[channel_nr] = sqrtf(sum_of_squares /
+		volmeter_process_peak_last_samples(volmeter, channel_nr, samples,
 			nr_samples);
-		volmeter->vol_peak[channel_nr] = peak;
+
+		volmeter->peak[channel_nr] = peak;
+
 		channel_nr++;
 	}
 
-	// Clear audio channels that are not in use.
+	/* Clear the peak of the channels that have not been handled. */
 	for (; channel_nr < MAX_AUDIO_CHANNELS; channel_nr++) {
-		volmeter->vol_magnitude[channel_nr] = 0.0;
-		volmeter->vol_peak[channel_nr] = 0.0;
+		volmeter->peak[channel_nr] = 0.0;
 	}
 }
 
+static void volmeter_process_magnitude(obs_volmeter_t *volmeter,
+	const struct audio_data *data, int nr_channels)
+{
+	size_t nr_samples = data->frames;
+
+	int channel_nr = 0;
+	for (int plane_nr = 0; channel_nr < nr_channels; plane_nr++) {
+		float *samples = (float *)data->data[plane_nr];
+		if (!samples) {
+			continue;
+		}
+
+		float sum = 0.0;
+		for (size_t i = 0; i < nr_samples; i++) {
+			float sample = samples[i];
+			sum += sample * sample;
+		}
+		volmeter->magnitude[channel_nr] = sqrtf(sum / nr_samples);
+
+		channel_nr++;
+	}
+}
+
+static void volmeter_process_audio_data(obs_volmeter_t *volmeter,
+		const struct audio_data *data)
+{
+	int nr_channels = get_nr_channels_from_audio_data(data);
+
+	volmeter_process_peak(volmeter, data, nr_channels);
+	volmeter_process_magnitude(volmeter, data, nr_channels);
+}
+
 static void volmeter_source_data_received(void *vptr, obs_source_t *source,
 		const struct audio_data *data, bool muted)
 {
@@ -317,16 +529,16 @@
 	for (int channel_nr = 0; channel_nr < MAX_AUDIO_CHANNELS;
 		channel_nr++) {
 		magnitude[channel_nr] = mul_to_db(
-			volmeter->vol_magnitude[channel_nr] * mul);
+			volmeter->magnitude[channel_nr] * mul);
 		peak[channel_nr] = mul_to_db(
-			volmeter->vol_peak[channel_nr] * mul);
+			volmeter->peak[channel_nr] * mul);
+
+		/* The input-peak is NOT adjusted with volume, so that the user
+		 * can check the input-gain. */
 		input_peak[channel_nr] = mul_to_db(
-			volmeter->vol_peak[channel_nr]);
+			volmeter->peak[channel_nr]);
 	}
 
-	// The input-peak is NOT adjusted with volume, so that the user
-	// can check the input-gain.
-
 	pthread_mutex_unlock(&volmeter->mutex);
 
 	signal_levels_updated(volmeter, magnitude, peak, input_peak);
@@ -641,6 +853,14 @@
 			volmeter_source_data_received, volmeter);
 }
 
+void obs_volmeter_set_peak_meter_type(obs_volmeter_t *volmeter,
+		enum obs_peak_meter_type peak_meter_type)
+{
+	pthread_mutex_lock(&volmeter->mutex);
+	volmeter->peak_meter_type = peak_meter_type;
+	pthread_mutex_unlock(&volmeter->mutex);
+}
+
 void obs_volmeter_set_update_interval(obs_volmeter_t *volmeter,
 		const unsigned int ms)
 {

obs-studio-21.1.2.tar.xz/libobs/obs-audio-controls.h -> obs-studio-22.0.1.tar.xz/libobs/obs-audio-controls.h Changed

@@ -69,6 +69,27 @@
 };
 
 /**
+ * @brief Peak meter types
+ */
+enum obs_peak_meter_type {
+	/**
+	 * @brief A simple peak meter measuring the maximum of all samples.
+	 *
+	 * This was a very common type of peak meter used for audio, but
+	 * is not very accurate with regards to further audio processing.
+	 */
+	SAMPLE_PEAK_METER,
+
+	/**
+	 * @brief An accurate peak meter measure the maximum of inter-samples.
+	 *
+	 * This meter is more computational intensive due to 4x oversampling
+	 * to determine the true peak to an accuracy of +/- 0.5 dB.
+	 */
+	TRUE_PEAK_METER
+};
+
+/**
  * @brief Create a fader
  * @param type the type of the fader
  * @return pointer to the fader object
@@ -201,6 +222,14 @@
 EXPORT void obs_volmeter_detach_source(obs_volmeter_t *volmeter);
 
 /**
+ * @brief Set the peak meter type for the volume meter
+ * @param volmeter pointer to the volume meter object
+ * @param peak_meter_type set if true-peak needs to be measured.
+ */
+EXPORT void obs_volmeter_set_peak_meter_type(obs_volmeter_t *volmeter,
+		enum obs_peak_meter_type peak_meter_type);
+
+/**
  * @brief Set the update interval for the volume meter
  * @param volmeter pointer to the volume meter object
  * @param ms update interval in ms

obs-studio-21.1.2.tar.xz/libobs/obs-config.h -> obs-studio-22.0.1.tar.xz/libobs/obs-config.h Changed

obs-studio-21.1.2.tar.xz/libobs/obs-data.c -> obs-studio-22.0.1.tar.xz/libobs/obs-data.c Changed

obs-studio-21.1.2.tar.xz/libobs/obs-data.h -> obs-studio-22.0.1.tar.xz/libobs/obs-data.h Changed

obs-studio-21.1.2.tar.xz/libobs/obs-encoder.c -> obs-studio-22.0.1.tar.xz/libobs/obs-encoder.c Changed

obs-studio-21.1.2.tar.xz/libobs/obs-hotkey.c -> obs-studio-22.0.1.tar.xz/libobs/obs-hotkey.c Changed

@@ -79,6 +79,62 @@
 	return binding->hotkey;
 }
 
+static inline bool find_id(obs_hotkey_id id, size_t *idx);
+void obs_hotkey_set_name(obs_hotkey_id id, const char *name)
+{
+	size_t idx;
+
+	if (!find_id(id, &idx))
+		return;
+
+	obs_hotkey_t *hotkey = &obs->hotkeys.hotkeys.array[idx];
+	bfree(hotkey->name);
+	hotkey->name = bstrdup(name);
+}
+
+void obs_hotkey_set_description(obs_hotkey_id id, const char *desc)
+{
+	size_t idx;
+
+	if (!find_id(id, &idx))
+		return;
+
+	obs_hotkey_t *hotkey = &obs->hotkeys.hotkeys.array[idx];
+	bfree(hotkey->description);
+	hotkey->description = bstrdup(desc);
+}
+
+static inline bool find_pair_id(obs_hotkey_pair_id id, size_t *idx);
+void obs_hotkey_pair_set_names(obs_hotkey_pair_id id,
+		const char *name0, const char *name1)
+{
+	size_t idx;
+	obs_hotkey_pair_t pair;
+
+	if (!find_pair_id(id, &idx))
+		return;
+
+	pair = obs->hotkeys.hotkey_pairs.array[idx];
+
+	obs_hotkey_set_name(pair.id[0], name0);
+	obs_hotkey_set_name(pair.id[1], name1);
+}
+
+void obs_hotkey_pair_set_descriptions(obs_hotkey_pair_id id,
+		const char *desc0, const char *desc1)
+{
+	size_t idx;
+	obs_hotkey_pair_t pair;
+
+	if (!find_pair_id(id, &idx))
+		return;
+
+	pair = obs->hotkeys.hotkey_pairs.array[idx];
+
+	obs_hotkey_set_description(pair.id[0], desc0);
+	obs_hotkey_set_description(pair.id[1], desc1);
+}
+
 static void hotkey_signal(const char *signal, obs_hotkey_t *hotkey)
 {
 	calldata_t data;
@@ -804,6 +860,30 @@
 	return result;
 }
 
+void obs_hotkey_pair_save(obs_hotkey_pair_id id,
+		obs_data_array_t **p_data0,
+		obs_data_array_t **p_data1)
+{
+	if ((!p_data0 && !p_data1) || !lock())
+		return;
+
+	size_t idx;
+	if (!find_pair_id(id, &idx))
+		goto unlock;
+
+	obs_hotkey_pair_t *pair = &obs->hotkeys.hotkey_pairs.array[idx];
+
+	if (p_data0 && find_id(pair->id[0], &idx)) {
+		*p_data0 = save_hotkey(&obs->hotkeys.hotkeys.array[idx]);
+	}
+	if (p_data1 && find_id(pair->id[1], &idx)) {
+		*p_data1 = save_hotkey(&obs->hotkeys.hotkeys.array[idx]);
+	}
+
+unlock:
+	unlock();
+}
+
 static inline bool enum_save_hotkey(void *data,
 		size_t idx, obs_hotkey_t *hotkey)
 {

obs-studio-21.1.2.tar.xz/libobs/obs-hotkey.h -> obs-studio-22.0.1.tar.xz/libobs/obs-hotkey.h Changed

@@ -32,6 +32,8 @@
 const size_t OBS_INVALID_HOTKEY_PAIR_ID = (size_t)-1;
 #endif
 
+#define XINPUT_MOUSE_LEN 33
+
 enum obs_key {
 #define OBS_HOTKEY(x) x,
 #include "obs-hotkeys.h"
@@ -58,6 +60,8 @@
 };
 typedef enum obs_hotkey_registerer_type obs_hotkey_registerer_t;
 
+/* getter functions */
+
 EXPORT obs_hotkey_id obs_hotkey_get_id(const obs_hotkey_t *key);
 EXPORT const char *obs_hotkey_get_name(const obs_hotkey_t *key);
 EXPORT const char *obs_hotkey_get_description(const obs_hotkey_t *key);
@@ -74,6 +78,15 @@
 EXPORT obs_hotkey_t *obs_hotkey_binding_get_hotkey(
 		obs_hotkey_binding_t *binding);
 
+/* setter functions */
+
+EXPORT void obs_hotkey_set_name(obs_hotkey_id id, const char *name);
+EXPORT void obs_hotkey_set_description(obs_hotkey_id id, const char *desc);
+EXPORT void obs_hotkey_pair_set_names(obs_hotkey_pair_id id,
+		const char *name0, const char *name1);
+EXPORT void obs_hotkey_pair_set_descriptions(obs_hotkey_pair_id id,
+		const char *desc0, const char *desc1);
+
 #ifndef SWIG
 struct obs_hotkeys_translations {
 	const char *insert;
@@ -223,6 +236,10 @@
 
 EXPORT obs_data_array_t *obs_hotkey_save(obs_hotkey_id id);
 
+EXPORT void obs_hotkey_pair_save(obs_hotkey_pair_id id,
+		obs_data_array_t **p_data0,
+		obs_data_array_t **p_data1);
+
 EXPORT obs_data_t *obs_hotkeys_save_encoder(obs_encoder_t *encoder);
 
 EXPORT obs_data_t *obs_hotkeys_save_output(obs_output_t *output);

obs-studio-21.1.2.tar.xz/libobs/obs-internal.h -> obs-studio-22.0.1.tar.xz/libobs/obs-internal.h Changed

@@ -248,6 +248,7 @@
 	gs_samplerstate_t               *point_sampler;
 	gs_stagesurf_t                  *mapped_surface;
 	int                             cur_texture;
+	long                            raw_active;
 
 	uint64_t                        video_time;
 	uint64_t                        video_avg_frame_time_ns;
@@ -330,6 +331,8 @@
 
 	long long                       unnamed_index;
 
+	obs_data_t                      *private_data;
+
 	volatile bool                   valid;
 };
 
@@ -408,6 +411,13 @@
 		uint64_t start_ts_in, uint64_t end_ts_in, uint64_t *out_ts,
 		uint32_t mixers, struct audio_output_data *mixes);
 
+extern void start_raw_video(video_t *video,
+		const struct video_scale_info *conversion,
+		void (*callback)(void *param, struct video_data *frame),
+		void *param);
+extern void stop_raw_video(video_t *video,
+		void (*callback)(void *param, struct video_data *frame),
+		void *param);
 
 /* ------------------------------------------------------------------------- */
 /* obs shared context data */
@@ -696,9 +706,6 @@
 		obs_data_t *settings, const char *name,
 		obs_data_t *hotkey_data, bool private);
 
-extern void obs_source_save(obs_source_t *source);
-extern void obs_source_load(obs_source_t *source);
-
 extern bool obs_transition_init(obs_source_t *transition);
 extern void obs_transition_free(obs_source_t *transition);
 extern void obs_transition_tick(obs_source_t *transition);

obs-studio-21.1.2.tar.xz/libobs/obs-module.c -> obs-studio-22.0.1.tar.xz/libobs/obs-module.c Changed

@@ -725,13 +725,13 @@
 	HANDLE_ERROR(size, obs_service_info, info);
 }
 
-void obs_regsiter_modal_ui_s(const struct obs_modal_ui *info, size_t size)
+void obs_register_modal_ui_s(const struct obs_modal_ui *info, size_t size)
 {
 #define CHECK_REQUIRED_VAL_(info, val, func) \
 	CHECK_REQUIRED_VAL(struct obs_modal_ui, info, val, func)
-	CHECK_REQUIRED_VAL_(info, task,   obs_regsiter_modal_ui);
-	CHECK_REQUIRED_VAL_(info, target, obs_regsiter_modal_ui);
-	CHECK_REQUIRED_VAL_(info, exec,   obs_regsiter_modal_ui);
+	CHECK_REQUIRED_VAL_(info, task,   obs_register_modal_ui);
+	CHECK_REQUIRED_VAL_(info, target, obs_register_modal_ui);
+	CHECK_REQUIRED_VAL_(info, exec,   obs_register_modal_ui);
 #undef CHECK_REQUIRED_VAL_
 
 	REGISTER_OBS_DEF(size, obs_modal_ui, obs->modal_ui_callbacks, info);
@@ -741,13 +741,13 @@
 	HANDLE_ERROR(size, obs_modal_ui, info);
 }
 
-void obs_regsiter_modeless_ui_s(const struct obs_modeless_ui *info, size_t size)
+void obs_register_modeless_ui_s(const struct obs_modeless_ui *info, size_t size)
 {
 #define CHECK_REQUIRED_VAL_(info, val, func) \
 	CHECK_REQUIRED_VAL(struct obs_modeless_ui, info, val, func)
-	CHECK_REQUIRED_VAL_(info, task,   obs_regsiter_modeless_ui);
-	CHECK_REQUIRED_VAL_(info, target, obs_regsiter_modeless_ui);
-	CHECK_REQUIRED_VAL_(info, create, obs_regsiter_modeless_ui);
+	CHECK_REQUIRED_VAL_(info, task,   obs_register_modeless_ui);
+	CHECK_REQUIRED_VAL_(info, target, obs_register_modeless_ui);
+	CHECK_REQUIRED_VAL_(info, create, obs_register_modeless_ui);
 #undef CHECK_REQUIRED_VAL_
 
 	REGISTER_OBS_DEF(size, obs_modeless_ui, obs->modeless_ui_callbacks,

obs-studio-21.1.2.tar.xz/libobs/obs-nix.c -> obs-studio-22.0.1.tar.xz/libobs/obs-nix.c Changed

@@ -16,6 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
+#include "obs-internal.h"
 #if defined(__FreeBSD__)
 #define _GNU_SOURCE
 #endif
@@ -28,13 +29,13 @@
 #include <sys/sysinfo.h>
 #include <sys/utsname.h>
 #include <xcb/xcb.h>
+#if USE_XINPUT
+#include <xcb/xinput.h>
+#endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib-xcb.h>
-#include <X11/keysym.h>
 #include <inttypes.h>
-#include "util/dstr.h"
-#include "obs-internal.h"
 
 const char *get_module_extension(void)
 {
@@ -236,6 +237,34 @@
 	blog(LOG_INFO, "Kernel Version: %s %s", info.sysname, info.release);
 }
 
+static void log_x_info(void)
+{
+	Display *dpy = XOpenDisplay(NULL);
+	if (!dpy) {
+		blog(LOG_INFO, "Unable to open X display");
+		return;
+	}
+
+	int        protocol_version  = ProtocolVersion(dpy);
+	int        protocol_revision = ProtocolRevision(dpy);
+	int        vendor_release    = VendorRelease(dpy);
+	const char *vendor_name      = ServerVendor(dpy);
+
+	if (strstr(vendor_name, "X.Org")) {
+		blog(LOG_INFO, "Window System: X%d.%d, Vendor: %s, Version: %d"
+				".%d.%d", protocol_version, protocol_revision,
+				vendor_name, vendor_release / 10000000,
+				(vendor_release / 100000) % 100,
+				(vendor_release / 1000) % 100);
+	} else {
+		blog(LOG_INFO, "Window System: X%d.%d - vendor string: %s - "
+				"vendor release: %d", protocol_version,
+				protocol_revision, vendor_name, vendor_release);
+	}
+
+	XCloseDisplay(dpy);
+}
+
 #if defined(__linux__)
 static void log_distribution_info(void)
 {
@@ -292,6 +321,7 @@
 #if defined(__linux__)
 	log_distribution_info();
 #endif
+	log_x_info();
 }
 
 /* So here's how linux works with key mapping:
@@ -327,6 +357,12 @@
 	xcb_keysym_t *keysyms;
 	int num_keysyms;
 	int syms_per_code;
+
+#if USE_XINPUT
+	bool pressed[XINPUT_MOUSE_LEN];
+	bool update[XINPUT_MOUSE_LEN];
+	bool button_pressed[XINPUT_MOUSE_LEN];
+#endif
 };
 
 #define MOUSE_1 (1<<16)
@@ -707,6 +743,54 @@
 	return error != NULL || reply == NULL;
 }
 
+static xcb_screen_t *default_screen(obs_hotkeys_platform_t *context,
+		xcb_connection_t *connection)
+{
+	int def_screen_idx = XDefaultScreen(context->display);
+	xcb_screen_iterator_t iter;
+
+	iter = xcb_setup_roots_iterator(xcb_get_setup(connection));
+	while (iter.rem) {
+		if (def_screen_idx-- == 0)
+			return iter.data;
+
+		xcb_screen_next(&iter);
+	}
+
+	return NULL;
+}
+
+static inline xcb_window_t root_window(obs_hotkeys_platform_t *context,
+		xcb_connection_t *connection)
+{
+	xcb_screen_t *screen = default_screen(context, connection);
+	if (screen)
+		return screen->root;
+	return 0;
+}
+
+#if USE_XINPUT
+static inline void registerMouseEvents(struct obs_core_hotkeys *hotkeys)
+{
+	obs_hotkeys_platform_t *context    = hotkeys->platform_context;
+	xcb_connection_t       *connection = XGetXCBConnection(
+			context->display);
+	xcb_window_t           window      = root_window(context, connection);
+
+	struct {
+		xcb_input_event_mask_t    head;
+		xcb_input_xi_event_mask_t mask;
+	} mask;
+	mask.head.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+	mask.head.mask_len = sizeof(mask.mask) / sizeof(uint32_t);
+	mask.mask          = XCB_INPUT_XI_EVENT_MASK_RAW_BUTTON_PRESS |
+			XCB_INPUT_XI_EVENT_MASK_RAW_BUTTON_RELEASE;
+
+	xcb_input_xi_select_events(connection, window, 1, &mask.head);
+	xcb_flush(connection);
+}
+#endif
+
 bool obs_hotkeys_platform_init(struct obs_core_hotkeys *hotkeys)
 {
 	Display *display = XOpenDisplay(NULL);
@@ -716,6 +800,9 @@
 	hotkeys->platform_context = bzalloc(sizeof(obs_hotkeys_platform_t));
 	hotkeys->platform_context->display = display;
 
+#if USE_XINPUT
+	registerMouseEvents(hotkeys);
+#endif
 	fill_base_keysyms(hotkeys);
 	fill_keycodes(hotkeys);
 	return true;
@@ -735,41 +822,147 @@
 	hotkeys->platform_context = NULL;
 }
 
-static xcb_screen_t *default_screen(obs_hotkeys_platform_t *context,
-		xcb_connection_t *connection)
+static bool mouse_button_pressed(xcb_connection_t *connection,
+		obs_hotkeys_platform_t *context, obs_key_t key)
 {
-	int def_screen_idx = XDefaultScreen(context->display);
-	xcb_screen_iterator_t iter;
+	bool ret = false;
 
-	iter = xcb_setup_roots_iterator(xcb_get_setup(connection));
-	while (iter.rem) {
-		if (def_screen_idx-- == 0) {
-			return iter.data;
-			break;
+#if USE_XINPUT
+	memset(context->pressed, 0, XINPUT_MOUSE_LEN);
+	memset(context->update, 0, XINPUT_MOUSE_LEN);
+
+	xcb_generic_event_t *ev;
+	while ((ev = xcb_poll_for_event(connection))) {
+		if ((ev->response_type & ~80) == XCB_GE_GENERIC) {
+			switch (((xcb_ge_event_t *) ev)->event_type) {
+			case XCB_INPUT_RAW_BUTTON_PRESS: {
+				xcb_input_raw_button_press_event_t *mot;
+				mot = (xcb_input_raw_button_press_event_t *) ev;
+				if (mot->detail < XINPUT_MOUSE_LEN) {
+					context->pressed[mot->detail-1] = true;
+					context->update[mot->detail-1]  = true;
+				} else {
+					blog(LOG_WARNING, "Unsupported button");
+				}
+				break;
+			}
+			case XCB_INPUT_RAW_BUTTON_RELEASE: {
+				xcb_input_raw_button_release_event_t *mot;
+				mot = (xcb_input_raw_button_release_event_t *) ev;
+				if (mot->detail < XINPUT_MOUSE_LEN)
+					context->update[mot->detail-1]  = true;
+				else
+					blog(LOG_WARNING, "Unsupported button");
+				break;
+			}
+			default:
+				break;
+			}
 		}
-
-		xcb_screen_next(&iter);
+		free(ev);
 	}
 
-	return NULL;
-}
-
-static inline xcb_window_t root_window(obs_hotkeys_platform_t *context,
-		xcb_connection_t *connection)
-{
-	xcb_screen_t *screen = default_screen(context, connection);
-	if (screen)
-		return screen->root;
-	return 0;
-}
+	// Mouse 2 for OBS is Right Click and Mouse 3 is Wheel Click.
+	// Mouse Wheel axis clicks (xinput mot->detail 4 5 6 7) are ignored.
+	switch (key) {
+	case OBS_KEY_MOUSE1:
+		ret = context->pressed[0] || context->button_pressed[0];
+		break;
+	case OBS_KEY_MOUSE2:
+		ret = context->pressed[2] || context->button_pressed[2];
+		break;
+	case OBS_KEY_MOUSE3:
+		ret = context->pressed[1] || context->button_pressed[1];
+		break;
+	case OBS_KEY_MOUSE4:
+		ret = context->pressed[7] || context->button_pressed[7];
+		break;
+	case OBS_KEY_MOUSE5:
+		ret = context->pressed[8] || context->button_pressed[8];
+		break;
+	case OBS_KEY_MOUSE6:
+		ret = context->pressed[9] || context->button_pressed[9];
+		break;
+	case OBS_KEY_MOUSE7:
+		ret = context->pressed[10] || context->button_pressed[10];
+		break;
+	case OBS_KEY_MOUSE8:
+		ret = context->pressed[11] || context->button_pressed[11];
+		break;
+	case OBS_KEY_MOUSE9:
+		ret = context->pressed[12] || context->button_pressed[12];
+		break;
+	case OBS_KEY_MOUSE10:
+		ret = context->pressed[13] || context->button_pressed[13];
+		break;
+	case OBS_KEY_MOUSE11:
+		ret = context->pressed[14] || context->button_pressed[14];
+		break;
+	case OBS_KEY_MOUSE12:
+		ret = context->pressed[15] || context->button_pressed[15];
+		break;
+	case OBS_KEY_MOUSE13:
+		ret = context->pressed[16] || context->button_pressed[16];
+		break;
+	case OBS_KEY_MOUSE14:
+		ret = context->pressed[17] || context->button_pressed[17];
+		break;
+	case OBS_KEY_MOUSE15:
+		ret = context->pressed[18] || context->button_pressed[18];
+		break;
+	case OBS_KEY_MOUSE16:
+		ret = context->pressed[19] || context->button_pressed[19];
+		break;
+	case OBS_KEY_MOUSE17:
+		ret = context->pressed[20] || context->button_pressed[20];
+		break;
+	case OBS_KEY_MOUSE18:
+		ret = context->pressed[21] || context->button_pressed[21];
+		break;
+	case OBS_KEY_MOUSE19:
+		ret = context->pressed[22] || context->button_pressed[22];
+		break;
+	case OBS_KEY_MOUSE20:
+		ret = context->pressed[23] || context->button_pressed[23];
+		break;
+	case OBS_KEY_MOUSE21:
+		ret = context->pressed[24] || context->button_pressed[24];
+		break;
+	case OBS_KEY_MOUSE22:
+		ret = context->pressed[25] || context->button_pressed[25];
+		break;
+	case OBS_KEY_MOUSE23:
+		ret = context->pressed[26] || context->button_pressed[26];
+		break;
+	case OBS_KEY_MOUSE24:
+		ret = context->pressed[27] || context->button_pressed[27];
+		break;
+	case OBS_KEY_MOUSE25:
+		ret = context->pressed[28] || context->button_pressed[28];
+		break;
+	case OBS_KEY_MOUSE26:
+		ret = context->pressed[29] || context->button_pressed[29];
+		break;
+	case OBS_KEY_MOUSE27:
+		ret = context->pressed[30] || context->button_pressed[30];
+		break;
+	case OBS_KEY_MOUSE28:
+		ret = context->pressed[31] || context->button_pressed[31];
+		break;
+	case OBS_KEY_MOUSE29:
+		ret = context->pressed[32] || context->button_pressed[32];
+		break;
+	default:
+		break;
+	}
 
-static bool mouse_button_pressed(xcb_connection_t *connection,
-		obs_hotkeys_platform_t *context, obs_key_t key)
-{
+	for (int i = 0; i != XINPUT_MOUSE_LEN; i++)
+		if (context->update[i])
+			context->button_pressed[i] = context->pressed[i];
+#else
 	xcb_generic_error_t *error = NULL;
 	xcb_query_pointer_cookie_t qpc;
 	xcb_query_pointer_reply_t *reply;
-	bool ret = false;
 
 	qpc = xcb_query_pointer(connection, root_window(context, connection));
 	reply = xcb_query_pointer_reply(connection, qpc, &error);
@@ -789,6 +982,7 @@
 
 	free(reply);
 	free(error);
+#endif
 	return ret;
 }

obs-studio-21.1.2.tar.xz/libobs/obs-output.c -> obs-studio-22.0.1.tar.xz/libobs/obs-output.c Changed

@@ -22,7 +22,7 @@
 
 #if BUILD_CAPTIONS
 #include <caption/caption.h>
-#include <caption/avc.h>
+#include <caption/mpeg.h>
 #endif
 
 static inline bool active(const struct obs_output *output)
@@ -419,6 +419,18 @@
 		(active(output) || reconnecting(output)) : false;
 }
 
+uint32_t obs_output_get_flags(const obs_output_t *output)
+{
+	return obs_output_valid(output, "obs_output_get_flags") ?
+		output->info.flags : 0;
+}
+
+uint32_t obs_get_output_flags(const char *id)
+{
+	const struct obs_output_info *info = find_output(id);
+	return info ? info->flags : 0;
+}
+
 static inline obs_data_t *get_defaults(const struct obs_output_info *info)
 {
 	obs_data_t *settings = obs_data_create();
@@ -977,7 +989,7 @@
 	if (out->priority > 1)
 		return false;
 
-	sei_init(&sei);
+	sei_init(&sei, 0.0);
 
 	da_init(out_data);
 	da_push_back_array(out_data, &ref, sizeof(ref));
@@ -1541,7 +1553,7 @@
 					encoded_callback, output);
 	} else {
 		if (has_video)
-			video_output_connect(output->video,
+			start_raw_video(output->video,
 					get_video_conversion(output),
 					default_raw_video_callback, output);
 		if (has_audio)
@@ -1797,7 +1809,7 @@
 			stop_audio_encoders(output, encoded_callback);
 	} else {
 		if (has_video)
-			video_output_disconnect(output->video,
+			stop_raw_video(output->video,
 					default_raw_video_callback, output);
 		if (has_audio)
 			audio_output_disconnect(output->audio,
@@ -2082,34 +2094,14 @@
 
 	// split text into 32 character strings
 	int size = (int)strlen(text);
-	int r;
-	size_t char_count;
-	size_t line_length = 0;
-	size_t trimmed_length = 0;
-
 	blog(LOG_DEBUG, "Caption text: %s", text);
 
 	pthread_mutex_lock(&output->caption_mutex);
 
-	for (r = 0 ; 0 < size && CAPTION_LINE_CHARS > r; ++r) {
-		line_length = utf8_line_length(text);
-		trimmed_length = utf8_trimmed_length(text, line_length);
-		char_count = utf8_char_count(text, trimmed_length);
-
-		if (SCREEN_COLS < char_count) {
-			char_count = utf8_wrap_length(text, CAPTION_LINE_CHARS);
-			line_length = utf8_string_length(text, char_count + 1);
-		}
-
-		output->caption_tail = caption_text_new(
-				text,
-				line_length,
-				output->caption_tail,
-				&output->caption_head);
-
-		text += line_length;
-		size -= (int)line_length;
-	}
+	output->caption_tail = caption_text_new(
+			text, size,
+			output->caption_tail,
+			&output->caption_head);
 
 	pthread_mutex_unlock(&output->caption_mutex);
 }

obs-studio-21.1.2.tar.xz/libobs/obs-scene.c -> obs-studio-22.0.1.tar.xz/libobs/obs-scene.c Changed

@@ -20,6 +20,21 @@
 #include "graphics/math-defs.h"
 #include "obs-scene.h"
 
+const struct obs_source_info group_info;
+
+static void resize_group(obs_sceneitem_t *group);
+static void resize_scene(obs_scene_t *scene);
+static void signal_parent(obs_scene_t *parent, const char *name,
+		calldata_t *params);
+static void get_ungrouped_transform(obs_sceneitem_t *group,
+		struct vec2 *pos,
+		struct vec2 *scale,
+		float *rot);
+static inline bool crop_enabled(const struct obs_sceneitem_crop *crop);
+static inline bool item_texture_enabled(const struct obs_scene_item *item);
+static void init_hotkeys(obs_scene_t *scene, obs_sceneitem_t *item,
+		const char *name);
+
 /* NOTE: For proper mutex lock order (preventing mutual cross-locks), never
  * lock the graphics mutex inside either of the scene mutexes.
  *
@@ -48,11 +63,9 @@
 	uint8_t stack[128];
 
 	calldata_init_fixed(&params, stack, sizeof(stack));
-	calldata_set_ptr(&params, "scene", item->parent);
 	calldata_set_ptr(&params, "item", item);
 
-	signal_handler_signal(item->parent->source->context.signals,
-			"item_remove", &params);
+	signal_parent(item->parent, "item_remove", &params);
 }
 
 static const char *scene_getname(void *unused)
@@ -61,18 +74,28 @@
 	return "Scene";
 }
 
+static const char *group_getname(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+	return "Group";
+}
+
 static void *scene_create(obs_data_t *settings, struct obs_source *source)
 {
 	pthread_mutexattr_t attr;
-	struct obs_scene *scene = bmalloc(sizeof(struct obs_scene));
-	scene->source     = source;
-	scene->first_item = NULL;
+	struct obs_scene *scene = bzalloc(sizeof(struct obs_scene));
+	scene->source = source;
+
+	if (source->info.id == group_info.id) {
+		scene->is_group = true;
+		scene->custom_size = true;
+		scene->cx = 0;
+		scene->cy = 0;
+	}
 
 	signal_handler_add_array(obs_source_get_signal_handler(source),
 			obs_scene_signals);
 
-	scene->id_counter = 0;
-
 	if (pthread_mutexattr_init(&attr) != 0)
 		goto fail;
 	if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0)
@@ -311,21 +334,29 @@
 	return (crop_cy > height) ? 2 : (height - crop_cy);
 }
 
-static void update_item_transform(struct obs_scene_item *item)
+static void update_item_transform(struct obs_scene_item *item, bool update_tex)
 {
-	uint32_t        width         = obs_source_get_width(item->source);
-	uint32_t        height        = obs_source_get_height(item->source);
-	uint32_t        cx            = calc_cx(item, width);
-	uint32_t        cy            = calc_cy(item, height);
+	uint32_t        width;
+	uint32_t        height;
+	uint32_t        cx;
+	uint32_t        cy;
 	struct vec2     base_origin;
 	struct vec2     origin;
-	struct vec2     scale         = item->scale;
+	struct vec2     scale;
 	struct calldata params;
 	uint8_t         stack[128];
 
 	if (os_atomic_load_long(&item->defer_update) > 0)
 		return;
 
+	width             = obs_source_get_width(item->source);
+	height            = obs_source_get_height(item->source);
+	cx                = calc_cx(item, width);
+	cy                = calc_cy(item, height);
+	scale             = item->scale;
+	item->last_width  = width;
+	item->last_height = height;
+
 	width = cx;
 	height = cy;
 
@@ -378,14 +409,26 @@
 
 	/* ----------------------- */
 
-	item->last_width  = width;
-	item->last_height = height;
-
 	calldata_init_fixed(&params, stack, sizeof(stack));
-	calldata_set_ptr(&params, "scene", item->parent);
 	calldata_set_ptr(&params, "item", item);
-	signal_handler_signal(item->parent->source->context.signals,
-			"item_transform", &params);
+	signal_parent(item->parent, "item_transform", &params);
+
+	if (!update_tex)
+		return;
+
+	if (item->item_render && !item_texture_enabled(item)) {
+		obs_enter_graphics();
+		gs_texrender_destroy(item->item_render);
+		item->item_render = NULL;
+		obs_leave_graphics();
+
+	} else if (!item->item_render && item_texture_enabled(item)) {
+		obs_enter_graphics();
+		item->item_render = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
+		obs_leave_graphics();
+	}
+
+	os_atomic_set_bool(&item->update_transform, false);
 }
 
 static inline bool source_size_changed(struct obs_scene_item *item)
@@ -414,7 +457,7 @@
 static inline bool item_texture_enabled(const struct obs_scene_item *item)
 {
 	return crop_enabled(&item->crop) || scale_filter_enabled(item) ||
-		item_is_scene(item);
+		(item_is_scene(item) && !item->is_group);
 }
 
 static void render_item_texture(struct obs_scene_item *item)
@@ -467,6 +510,10 @@
 	if (item->item_render) {
 		uint32_t width  = obs_source_get_width(item->source);
 		uint32_t height = obs_source_get_height(item->source);
+
+		if (!width || !height)
+			return;
+
 		uint32_t cx = calc_cx(item, width);
 		uint32_t cy = calc_cy(item, height);
 
@@ -521,6 +568,49 @@
 	UNUSED_PARAMETER(seconds);
 }
 
+/* assumes video lock */
+static void update_transforms_and_prune_sources(obs_scene_t *scene,
+		struct darray *remove_items, obs_sceneitem_t *group_sceneitem)
+{
+	struct obs_scene_item *item = scene->first_item;
+	bool rebuild_group = group_sceneitem &&
+		os_atomic_load_bool(&group_sceneitem->update_group_resize);
+
+	while (item) {
+		if (obs_source_removed(item->source)) {
+			struct obs_scene_item *del_item = item;
+			item = item->next;
+
+			remove_without_release(del_item);
+			darray_push_back(sizeof(struct obs_scene_item*),
+					remove_items, &del_item);
+			rebuild_group = true;
+			continue;
+		}
+
+		if (item->is_group) {
+			obs_scene_t *group_scene = item->source->context.data;
+
+			video_lock(group_scene);
+			update_transforms_and_prune_sources(group_scene,
+					remove_items, item);
+			video_unlock(group_scene);
+		}
+
+		if (os_atomic_load_bool(&item->update_transform) ||
+		    source_size_changed(item)) {
+
+			update_item_transform(item, true);
+			rebuild_group = true;
+		}
+
+		item = item->next;
+	}
+
+	if (rebuild_group && group_sceneitem)
+		resize_group(group_sceneitem);
+}
+
 static void scene_video_render(void *data, gs_effect_t *effect)
 {
 	DARRAY(struct obs_scene_item*) remove_items;
@@ -530,24 +620,17 @@
 	da_init(remove_items);
 
 	video_lock(scene);
-	item = scene->first_item;
+
+	if (!scene->is_group) {
+		update_transforms_and_prune_sources(scene, &remove_items.da,
+				NULL);
+	}
 
 	gs_blend_state_push();
 	gs_reset_blend_state();
 
+	item = scene->first_item;
 	while (item) {
-		if (obs_source_removed(item->source)) {
-			struct obs_scene_item *del_item = item;
-			item = item->next;
-
-			remove_without_release(del_item);
-			da_push_back(remove_items, &del_item);
-			continue;
-		}
-
-		if (source_size_changed(item))
-			update_item_transform(item);
-
 		if (item->user_visible)
 			render_item(item);
 
@@ -586,18 +669,24 @@
 	pthread_mutex_unlock(&item->actions_mutex);
 }
 
+static void scene_load(void *data, obs_data_t *settings);
+
 static void scene_load_item(struct obs_scene *scene, obs_data_t *item_data)
 {
 	const char            *name = obs_data_get_string(item_data, "name");
-	obs_source_t          *source = obs_get_source_by_name(name);
+	obs_source_t          *source;
 	const char            *scale_filter_str;
 	struct obs_scene_item *item;
 	bool visible;
 	bool lock;
 
+	if (obs_data_get_bool(item_data, "group_item_backup"))
+		return;
+
+	source = obs_get_source_by_name(name);
 	if (!source) {
-		blog(LOG_WARNING, "[scene_load_item] Source %s not found!",
-				name);
+		blog(LOG_WARNING, "[scene_load_item] Source %s not "
+				"found!", name);
 		return;
 	}
 
@@ -611,6 +700,8 @@
 		return;
 	}
 
+	item->is_group = source->info.id == group_info.id;
+
 	obs_data_set_default_int(item_data, "align",
 			OBS_ALIGN_TOP | OBS_ALIGN_LEFT);
 
@@ -673,7 +764,7 @@
 
 	obs_source_release(source);
 
-	update_item_transform(item);
+	update_item_transform(item, false);
 }
 
 static void scene_load(void *data, obs_data_t *settings)
@@ -697,22 +788,38 @@
 	if (obs_data_has_user_value(settings, "id_counter"))
 		scene->id_counter = obs_data_get_int(settings, "id_counter");
 
+	if (obs_data_get_bool(settings, "custom_size")) {
+		scene->cx = (uint32_t)obs_data_get_int(settings, "cx");
+		scene->cy = (uint32_t)obs_data_get_int(settings, "cy");
+		scene->custom_size = true;
+	}
+
 	obs_data_array_release(items);
 }
 
+static void scene_save(void *data, obs_data_t *settings);
+
 static void scene_save_item(obs_data_array_t *array,
-		struct obs_scene_item *item)
+		struct obs_scene_item *item,
+		struct obs_scene_item *backup_group)
 {
 	obs_data_t *item_data = obs_data_create();
 	const char *name     = obs_source_get_name(item->source);
 	const char *scale_filter;
+	struct vec2 pos = item->pos;
+	struct vec2 scale = item->scale;
+	float rot = item->rot;
+
+	if (backup_group) {
+		get_ungrouped_transform(backup_group, &pos, &scale, &rot);
+	}
 
 	obs_data_set_string(item_data, "name",         name);
 	obs_data_set_bool  (item_data, "visible",      item->user_visible);
 	obs_data_set_bool  (item_data, "locked",       item->locked);
-	obs_data_set_double(item_data, "rot",          item->rot);
-	obs_data_set_vec2 (item_data, "pos",          &item->pos);
-	obs_data_set_vec2 (item_data, "scale",        &item->scale);
+	obs_data_set_double(item_data, "rot",          rot);
+	obs_data_set_vec2  (item_data, "pos",          &pos);
+	obs_data_set_vec2  (item_data, "scale",        &scale);
 	obs_data_set_int   (item_data, "align",        (int)item->align);
 	obs_data_set_int   (item_data, "bounds_type",  (int)item->bounds_type);
 	obs_data_set_int   (item_data, "bounds_align", (int)item->bounds_align);
@@ -722,6 +829,25 @@
 	obs_data_set_int  (item_data, "crop_right",   (int)item->crop.right);
 	obs_data_set_int  (item_data, "crop_bottom",  (int)item->crop.bottom);
 	obs_data_set_int  (item_data, "id",           item->id);
+	obs_data_set_bool (item_data, "group_item_backup", !!backup_group);
+
+	if (item->is_group) {
+		obs_scene_t *group_scene = item->source->context.data;
+		obs_sceneitem_t *group_item;
+
+		/* save group items as part of main scene, but ignored.
+		 * causes an automatic ungroup if scene collection file
+		 * is loaded in previous versions. */
+		full_lock(group_scene);
+
+		group_item = group_scene->first_item;
+		while (group_item) {
+			scene_save_item(array, group_item, item);
+			group_item = group_item->next;
+		}
+
+		full_unlock(group_scene);
+	}
 
 	if (item->scale_filter == OBS_SCALE_POINT)
 		scale_filter = "point";
@@ -753,11 +879,16 @@
 
 	item = scene->first_item;
 	while (item) {
-		scene_save_item(array, item);
+		scene_save_item(array, item, NULL);
 		item = item->next;
 	}
 
 	obs_data_set_int(settings, "id_counter", scene->id_counter);
+	obs_data_set_bool(settings, "custom_size", scene->custom_size);
+	if (scene->custom_size) {
+		obs_data_set_int(settings, "cx", scene->cx);
+		obs_data_set_int(settings, "cy", scene->cy);
+	}
 
 	full_unlock(scene);
 
@@ -767,14 +898,14 @@
 
 static uint32_t scene_getwidth(void *data)
 {
-	UNUSED_PARAMETER(data);
-	return obs->video.base_width;
+	obs_scene_t *scene = data;
+	return scene->custom_size ? scene->cx : obs->video.base_width;
 }
 
 static uint32_t scene_getheight(void *data)
 {
-	UNUSED_PARAMETER(data);
-	return obs->video.base_height;
+	obs_scene_t *scene = data;
+	return scene->custom_size ? scene->cy : obs->video.base_height;
 }
 
 static void apply_scene_item_audio_actions(struct obs_scene_item *item,
@@ -1008,20 +1139,51 @@
 	.enum_all_sources = scene_enum_all_sources
 };
 
-obs_scene_t *obs_scene_create(const char *name)
+const struct obs_source_info group_info =
+{
+	.id            = "group",
+	.type          = OBS_SOURCE_TYPE_SCENE,
+	.output_flags  = OBS_SOURCE_VIDEO |
+	                 OBS_SOURCE_CUSTOM_DRAW |
+	                 OBS_SOURCE_COMPOSITE,
+	.get_name      = group_getname,
+	.create        = scene_create,
+	.destroy       = scene_destroy,
+	.video_tick    = scene_video_tick,
+	.video_render  = scene_video_render,
+	.audio_render  = scene_audio_render,
+	.get_width     = scene_getwidth,
+	.get_height    = scene_getheight,
+	.load          = scene_load,
+	.save          = scene_save,
+	.enum_active_sources = scene_enum_active_sources,
+	.enum_all_sources = scene_enum_all_sources
+};
+
+static inline obs_scene_t *create_id(const char *id, const char *name)
 {
-	struct obs_source *source = obs_source_create("scene", name, NULL,
+	struct obs_source *source = obs_source_create(id, name, NULL,
 			NULL);
 	return source->context.data;
 }
 
-obs_scene_t *obs_scene_create_private(const char *name)
+static inline obs_scene_t *create_private_id(const char *id, const char *name)
 {
-	struct obs_source *source = obs_source_create_private("scene", name,
+	struct obs_source *source = obs_source_create_private(id, name,
 			NULL);
 	return source->context.data;
 }
 
+obs_scene_t *obs_scene_create(const char *name)
+{
+	return create_id("scene", name);
+}
+
+obs_scene_t *obs_scene_create_private(const char *name)
+{
+	return create_private_id("scene", name);
+}
+
 static obs_source_t *get_child_at_idx(obs_scene_t *scene, size_t idx)
 {
 	struct obs_scene_item *item = scene->first_item;
@@ -1062,6 +1224,59 @@
 	return source;
 }
 
+static inline void duplicate_item_data(struct obs_scene_item *dst,
+		struct obs_scene_item *src, bool defer_texture_update,
+		bool duplicate_hotkeys, bool duplicate_private_data)
+{
+	struct obs_scene *dst_scene = dst->parent;
+
+	if (!src->user_visible)
+		set_visibility(dst, false);
+
+	dst->selected = src->selected;
+	dst->pos = src->pos;
+	dst->rot = src->rot;
+	dst->scale = src->scale;
+	dst->align = src->align;
+	dst->last_width = src->last_width;
+	dst->last_height = src->last_height;
+	dst->output_scale = src->output_scale;
+	dst->scale_filter = src->scale_filter;
+	dst->box_transform = src->box_transform;
+	dst->draw_transform = src->draw_transform;
+	dst->bounds_type = src->bounds_type;
+	dst->bounds_align = src->bounds_align;
+	dst->bounds = src->bounds;
+
+	if (duplicate_hotkeys && !dst_scene->source->context.private) {
+		obs_data_array_t *data0 = NULL;
+		obs_data_array_t *data1 = NULL;
+
+		obs_hotkey_pair_save(src->toggle_visibility, &data0, &data1);
+		obs_hotkey_pair_load(dst->toggle_visibility, data0, data1);
+
+		obs_data_array_release(data0);
+		obs_data_array_release(data1);
+	}
+
+	obs_sceneitem_set_crop(dst, &src->crop);
+
+	if (defer_texture_update) {
+		os_atomic_set_bool(&dst->update_transform, true);
+	} else {
+		if (!dst->item_render && item_texture_enabled(dst)) {
+			obs_enter_graphics();
+			dst->item_render = gs_texrender_create(
+					GS_RGBA, GS_ZS_NONE);
+			obs_leave_graphics();
+		}
+	}
+
+	if (duplicate_private_data) {
+		obs_data_apply(dst->private_settings, src->private_settings);
+	}
+}
+
 obs_scene_t *obs_scene_duplicate(obs_scene_t *scene, const char *name,
 		enum obs_scene_duplicate_type type)
 {
@@ -1092,14 +1307,19 @@
 
 	/* --------------------------------- */
 
-	new_scene = make_private ?
-		obs_scene_create_private(name) : obs_scene_create(name);
+	new_scene = make_private
+		? create_private_id(scene->source->info.id, name)
+		: create_id(scene->source->info.id, name);
 
 	obs_source_copy_filters(new_scene->source, scene->source);
 
 	obs_data_apply(new_scene->source->private_settings,
 			scene->source->private_settings);
 
+	/* never duplicate sub-items for groups */
+	if (scene->is_group)
+		make_unique = false;
+
 	for (size_t i = 0; i < items.num; i++) {
 		item = items.array[i];
 		source = make_unique ?
@@ -1115,36 +1335,8 @@
 				continue;
 			}
 
-			if (!item->user_visible)
-				set_visibility(new_item, false);
-
-			new_item->selected = item->selected;
-			new_item->pos = item->pos;
-			new_item->rot = item->rot;
-			new_item->scale = item->scale;
-			new_item->align = item->align;
-			new_item->last_width = item->last_width;
-			new_item->last_height = item->last_height;
-			new_item->output_scale = item->output_scale;
-			new_item->scale_filter = item->scale_filter;
-			new_item->box_transform = item->box_transform;
-			new_item->draw_transform = item->draw_transform;
-			new_item->bounds_type = item->bounds_type;
-			new_item->bounds_align = item->bounds_align;
-			new_item->bounds = item->bounds;
-
-			new_item->toggle_visibility =
-					OBS_INVALID_HOTKEY_PAIR_ID;
-
-			obs_sceneitem_set_crop(new_item, &item->crop);
-
-			if (!new_item->item_render &&
-			    item_texture_enabled(new_item)) {
-				obs_enter_graphics();
-				new_item->item_render = gs_texrender_create(
-						GS_RGBA, GS_ZS_NONE);
-				obs_leave_graphics();
-			}
+			duplicate_item_data(new_item, item, false, false,
+					false);
 
 			obs_source_release(source);
 		}
@@ -1153,6 +1345,9 @@
 	for (size_t i = 0; i < items.num; i++)
 		obs_sceneitem_release(items.array[i]);
 
+	if (new_scene->is_group)
+		resize_scene(new_scene);
+
 	da_free(items);
 	return new_scene;
 }
@@ -1182,6 +1377,14 @@
 	return source->context.data;
 }
 
+obs_scene_t *obs_group_from_source(const obs_source_t *source)
+{
+	if (!source || source->info.id != group_info.id)
+		return NULL;
+
+	return source->context.data;
+}
+
 obs_sceneitem_t *obs_scene_find_source(obs_scene_t *scene, const char *name)
 {
 	struct obs_scene_item *item;
@@ -1332,18 +1535,55 @@
 	dstr_free(&hide_desc);
 }
 
+static void sceneitem_rename_hotkey(const obs_sceneitem_t *scene_item,
+		const char *new_name)
+{
+	struct dstr show = { 0 };
+	struct dstr hide = { 0 };
+	struct dstr show_desc = { 0 };
+	struct dstr hide_desc = { 0 };
+
+	dstr_copy(&show, "libobs.show_scene_item.%1");
+	dstr_replace(&show, "%1", new_name);
+	dstr_copy(&hide, "libobs.hide_scene_item.%1");
+	dstr_replace(&hide, "%1", new_name);
+
+	obs_hotkey_pair_set_names(scene_item->toggle_visibility,
+			show.array, hide.array);
+
+	dstr_copy(&show_desc, obs->hotkeys.sceneitem_show);
+	dstr_replace(&show_desc, "%1", new_name);
+	dstr_copy(&hide_desc, obs->hotkeys.sceneitem_hide);
+	dstr_replace(&hide_desc, "%1", new_name);
+
+	obs_hotkey_pair_set_descriptions(scene_item->toggle_visibility,
+			show_desc.array, hide_desc.array);
+
+	dstr_free(&show);
+	dstr_free(&hide);
+	dstr_free(&show_desc);
+	dstr_free(&hide_desc);
+}
+
+static void sceneitem_renamed(void *param, calldata_t *data)
+{
+	obs_sceneitem_t *scene_item = param;
+	const char *name = calldata_string(data, "new_name");
+
+	sceneitem_rename_hotkey(scene_item, name);
+}
+
 static inline bool source_has_audio(obs_source_t *source)
 {
 	return (source->info.output_flags &
 		(OBS_SOURCE_AUDIO | OBS_SOURCE_COMPOSITE)) != 0;
 }
 
-obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source)
+static obs_sceneitem_t *obs_scene_add_internal(obs_scene_t *scene,
+		obs_source_t *source, obs_sceneitem_t *insert_after)
 {
 	struct obs_scene_item *last;
 	struct obs_scene_item *item;
-	struct calldata params;
-	uint8_t stack[128];
 	pthread_mutex_t mutex;
 
 	struct item_action action = {
@@ -1380,7 +1620,9 @@
 	item->actions_mutex = mutex;
 	item->user_visible = true;
 	item->locked = false;
+	item->is_group = source->info.id == group_info.id;
 	item->private_settings = obs_data_create();
+	item->toggle_visibility = OBS_INVALID_HOTKEY_PAIR_ID;
 	os_atomic_set_long(&item->active_refs, 1);
 	vec2_set(&item->scale, 1.0f, 1.0f);
 	matrix4_identity(&item->draw_transform);
@@ -1403,15 +1645,23 @@
 
 	full_lock(scene);
 
-	last = scene->first_item;
-	if (!last) {
-		scene->first_item = item;
+	if (insert_after) {
+		obs_sceneitem_t *next = insert_after->next;
+		if (next) next->prev = item;
+		item->next = insert_after->next;
+		item->prev = insert_after;
+		insert_after->next = item;
 	} else {
-		while (last->next)
-			last = last->next;
+		last = scene->first_item;
+		if (!last) {
+			scene->first_item = item;
+		} else {
+			while (last->next)
+				last = last->next;
 
-		last->next = item;
-		item->prev = last;
+			last->next = item;
+			item->prev = last;
+		}
 	}
 
 	full_unlock(scene);
@@ -1419,12 +1669,23 @@
 	if (!scene->source->context.private)
 		init_hotkeys(scene, item, obs_source_get_name(source));
 
+	signal_handler_connect(obs_source_get_signal_handler(source), "rename",
+			sceneitem_renamed, item);
+
+	return item;
+}
+
+obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source)
+{
+	obs_sceneitem_t *item = obs_scene_add_internal(scene, source, NULL);
+	struct calldata params;
+	uint8_t stack[128];
+
 	calldata_init_fixed(&params, stack, sizeof(stack));
 	calldata_set_ptr(&params, "scene", scene);
 	calldata_set_ptr(&params, "item", item);
 	signal_handler_signal(scene->source->context.signals, "item_add",
 			&params);
-
 	return item;
 }
 
@@ -1439,6 +1700,9 @@
 		obs_data_release(item->private_settings);
 		obs_hotkey_pair_unregister(item->toggle_visibility);
 		pthread_mutex_destroy(&item->actions_mutex);
+		signal_handler_disconnect(
+				obs_source_get_signal_handler(item->source),
+				"rename", sceneitem_renamed, item);
 		if (item->source)
 			obs_source_release(item->source);
 		da_free(item->audio_actions);
@@ -1503,6 +1767,13 @@
 	return item ? item->source : NULL;
 }
 
+static void signal_parent(obs_scene_t *parent, const char *command,
+		calldata_t *params)
+{
+	calldata_set_ptr(params, "scene", parent);
+	signal_handler_signal(parent->source->context.signals, command, params);
+}
+
 void obs_sceneitem_select(obs_sceneitem_t *item, bool select)
 {
 	struct calldata params;
@@ -1515,10 +1786,9 @@
 	item->selected = select;
 
 	calldata_init_fixed(&params, stack, sizeof(stack));
-	calldata_set_ptr(&params, "scene", item->parent);
 	calldata_set_ptr(&params, "item",  item);
-	signal_handler_signal(item->parent->source->context.signals,
-			command, &params);
+
+	signal_parent(item->parent, command, &params);
 }
 
 bool obs_sceneitem_selected(const obs_sceneitem_t *item)
@@ -1526,11 +1796,19 @@
 	return item ? item->selected : false;
 }
 
+#define do_update_transform(item) \
+	do { \
+		if (!item->parent || item->parent->is_group) \
+			os_atomic_set_bool(&item->update_transform, true); \
+		else \
+			update_item_transform(item, false); \
+	} while (false)
+
 void obs_sceneitem_set_pos(obs_sceneitem_t *item, const struct vec2 *pos)
 {
 	if (item) {
 		vec2_copy(&item->pos, pos);
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1538,7 +1816,7 @@
 {
 	if (item) {
 		item->rot = rot;
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1546,7 +1824,7 @@
 {
 	if (item) {
 		vec2_copy(&item->scale, scale);
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1554,7 +1832,7 @@
 {
 	if (item) {
 		item->align = alignment;
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1567,10 +1845,7 @@
 	command = "reorder";
 
 	calldata_init_fixed(&params, stack, sizeof(stack));
-	calldata_set_ptr(&params, "scene", item->parent);
-
-	signal_handler_signal(item->parent->source->context.signals,
-			command, &params);
+	signal_parent(item->parent, command, &params);
 }
 
 void obs_sceneitem_set_order(obs_sceneitem_t *item,
@@ -1610,9 +1885,9 @@
 		attach_sceneitem(scene, item, NULL);
 	}
 
-	signal_reorder(item);
-
 	full_unlock(scene);
+
+	signal_reorder(item);
 	obs_scene_release(scene);
 }
 
@@ -1642,9 +1917,9 @@
 		attach_sceneitem(scene, item, next);
 	}
 
-	signal_reorder(item);
-
 	full_unlock(scene);
+
+	signal_reorder(item);
 	obs_scene_release(scene);
 }
 
@@ -1653,7 +1928,7 @@
 {
 	if (item) {
 		item->bounds_type = type;
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1662,7 +1937,7 @@
 {
 	if (item) {
 		item->bounds_align = alignment;
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1670,7 +1945,7 @@
 {
 	if (item) {
 		item->bounds = *bounds;
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1737,7 +2012,7 @@
 		item->bounds_type  = info->bounds_type;
 		item->bounds_align = info->bounds_alignment;
 		item->bounds       = info->bounds;
-		update_item_transform(item);
+		do_update_transform(item);
 	}
 }
 
@@ -1791,12 +2066,10 @@
 	item->user_visible = visible;
 
 	calldata_init_fixed(&cd, stack, sizeof(stack));
-	calldata_set_ptr(&cd, "scene", item->parent);
 	calldata_set_ptr(&cd, "item", item);
 	calldata_set_bool(&cd, "visible", visible);
 
-	signal_handler_signal(item->parent->source->context.signals,
-			"item_visible", &cd);
+	signal_parent(item->parent, "item_visible", &cd);
 
 	if (source_has_audio(item->source)) {
 		pthread_mutex_lock(&item->actions_mutex);
@@ -1888,9 +2161,9 @@
 		prev = item_order[i];
 	}
 
-	signal_reorder(scene->first_item);
-
 	full_unlock(scene);
+
+	signal_reorder(scene->first_item);
 	obs_scene_release(scene);
 	return true;
 }
@@ -1920,8 +2193,6 @@
 void obs_sceneitem_set_crop(obs_sceneitem_t *item,
 		const struct obs_sceneitem_crop *crop)
 {
-	bool item_tex_now_enabled;
-
 	if (!obs_ptr_valid(item, "obs_sceneitem_set_crop"))
 		return;
 	if (!obs_ptr_valid(crop, "obs_sceneitem_set_crop"))
@@ -1929,28 +2200,14 @@
 	if (crop_equal(crop, &item->crop))
 		return;
 
-	item_tex_now_enabled = crop_enabled(crop) ||
-		scale_filter_enabled(item) || item_is_scene(item);
-
-	obs_enter_graphics();
-
-	if (!item_tex_now_enabled) {
-		gs_texrender_destroy(item->item_render);
-		item->item_render = NULL;
-
-	} else if (!item->item_render) {
-		item->item_render = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
-	}
-
 	memcpy(&item->crop, crop, sizeof(*crop));
 
 	if (item->crop.left < 0) item->crop.left = 0;
 	if (item->crop.right < 0) item->crop.right = 0;
 	if (item->crop.top < 0) item->crop.top = 0;
 	if (item->crop.bottom < 0) item->crop.bottom = 0;
-	obs_leave_graphics();
 
-	update_item_transform(item);
+	os_atomic_set_bool(&item->update_transform, true);
 }
 
 void obs_sceneitem_get_crop(const obs_sceneitem_t *item,
@@ -1972,19 +2229,7 @@
 
 	item->scale_filter = filter;
 
-	obs_enter_graphics();
-
-	if (!item_texture_enabled(item)) {
-		gs_texrender_destroy(item->item_render);
-		item->item_render = NULL;
-
-	} else if (!item->item_render) {
-		item->item_render = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
-	}
-
-	obs_leave_graphics();
-
-	update_item_transform(item);
+	os_atomic_set_bool(&item->update_transform, true);
 }
 
 enum obs_scale_type obs_sceneitem_get_scale_filter(
@@ -2008,7 +2253,24 @@
 		return;
 
 	if (os_atomic_dec_long(&item->defer_update) == 0)
-		update_item_transform(item);
+		do_update_transform(item);
+}
+
+void obs_sceneitem_defer_group_resize_begin(obs_sceneitem_t *item)
+{
+	if (!obs_ptr_valid(item, "obs_sceneitem_defer_group_resize_begin"))
+		return;
+
+	os_atomic_inc_long(&item->defer_group_resize);
+}
+
+void obs_sceneitem_defer_group_resize_end(obs_sceneitem_t *item)
+{
+	if (!obs_ptr_valid(item, "obs_sceneitem_defer_group_resize_end"))
+		return;
+
+	if (os_atomic_dec_long(&item->defer_group_resize) == 0)
+		os_atomic_set_bool(&item->update_group_resize, true);
 }
 
 int64_t obs_sceneitem_get_id(const obs_sceneitem_t *item)
@@ -2027,3 +2289,608 @@
 	obs_data_addref(item->private_settings);
 	return item->private_settings;
 }
+
+static inline void transform_val(struct vec2 *v2, struct matrix4 *transform)
+{
+	struct vec3 v;
+	vec3_set(&v, v2->x, v2->y, 0.0f);
+	vec3_transform(&v, &v, transform);
+	v2->x = v.x;
+	v2->y = v.y;
+}
+
+static void get_ungrouped_transform(obs_sceneitem_t *group,
+		struct vec2 *pos,
+		struct vec2 *scale,
+		float *rot)
+{
+	struct matrix4 transform;
+	struct matrix4 mat;
+	struct vec4 x_base;
+
+	vec4_set(&x_base, 1.0f, 0.0f, 0.0f, 0.0f);
+
+	matrix4_copy(&transform, &group->draw_transform);
+
+	transform_val(pos, &transform);
+	vec4_set(&transform.t, 0.0f, 0.0f, 0.0f, 1.0f);
+
+	vec4_set(&mat.x, scale->x, 0.0f, 0.0f, 0.0f);
+	vec4_set(&mat.y, 0.0f, scale->y, 0.0f, 0.0f);
+	vec4_set(&mat.z, 0.0f, 0.0f, 1.0f, 0.0f);
+	vec4_set(&mat.t, 0.0f, 0.0f, 0.0f, 1.0f);
+	matrix4_mul(&mat, &mat, &transform);
+
+	scale->x = vec4_len(&mat.x) * (scale->x > 0.0f ? 1.0f : -1.0f);
+	scale->y = vec4_len(&mat.y) * (scale->y > 0.0f ? 1.0f : -1.0f);
+	*rot += group->rot;
+}
+
+static void remove_group_transform(obs_sceneitem_t *group,
+		obs_sceneitem_t *item)
+{
+	obs_scene_t *parent = item->parent;
+	if (!parent || !group)
+		return;
+
+	get_ungrouped_transform(group, &item->pos, &item->scale, &item->rot);
+
+	update_item_transform(item, false);
+}
+
+static void apply_group_transform(obs_sceneitem_t *item, obs_sceneitem_t *group)
+{
+	struct matrix4 transform;
+	struct matrix4 mat;
+	struct vec4 x_base;
+
+	vec4_set(&x_base, 1.0f, 0.0f, 0.0f, 0.0f);
+
+	matrix4_inv(&transform, &group->draw_transform);
+
+	transform_val(&item->pos, &transform);
+	vec4_set(&transform.t, 0.0f, 0.0f, 0.0f, 1.0f);
+
+	vec4_set(&mat.x, item->scale.x, 0.0f, 0.0f, 0.0f);
+	vec4_set(&mat.y, 0.0f, item->scale.y, 0.0f, 0.0f);
+	vec4_set(&mat.z, 0.0f, 0.0f, 1.0f, 0.0f);
+	vec4_set(&mat.t, 0.0f, 0.0f, 0.0f, 1.0f);
+	matrix4_mul(&mat, &mat, &transform);
+
+	item->scale.x = vec4_len(&mat.x) * (item->scale.x > 0.0f ? 1.0f : -1.0f);
+	item->scale.y = vec4_len(&mat.y) * (item->scale.y > 0.0f ? 1.0f : -1.0f);
+	item->rot -= group->rot;
+
+	update_item_transform(item, false);
+}
+
+static bool resize_scene_base(obs_scene_t *scene,
+		struct vec2 *minv,
+		struct vec2 *maxv,
+		struct vec2 *scale)
+{
+	vec2_set(minv, M_INFINITE, M_INFINITE);
+	vec2_set(maxv, -M_INFINITE, -M_INFINITE);
+
+	obs_sceneitem_t *item = scene->first_item;
+	if (!item) {
+		scene->cx = 0;
+		scene->cy = 0;
+		return false;
+	}
+
+	while (item) {
+#define get_min_max(x_val, y_val) \
+		do { \
+			struct vec3 v; \
+			vec3_set(&v, x_val, y_val, 0.0f); \
+			vec3_transform(&v, &v, &item->box_transform); \
+			if (v.x < minv->x) minv->x = v.x; \
+			if (v.y < minv->y) minv->y = v.y; \
+			if (v.x > maxv->x) maxv->x = v.x; \
+			if (v.y > maxv->y) maxv->y = v.y; \
+		} while (false)
+
+		get_min_max(0.0f, 0.0f);
+		get_min_max(1.0f, 0.0f);
+		get_min_max(0.0f, 1.0f);
+		get_min_max(1.0f, 1.0f);
+#undef get_min_max
+
+		item = item->next;
+	}
+
+	item = scene->first_item;
+	while (item) {
+		vec2_sub(&item->pos, &item->pos, minv);
+		update_item_transform(item, false);
+		item = item->next;
+	}
+
+	vec2_sub(scale, maxv, minv);
+	scene->cx = (uint32_t)ceilf(scale->x);
+	scene->cy = (uint32_t)ceilf(scale->y);
+	return true;
+}
+
+static void resize_scene(obs_scene_t *scene)
+{
+	struct vec2 minv;
+	struct vec2 maxv;
+	struct vec2 scale;
+	resize_scene_base(scene, &minv, &maxv, &scale);
+}
+
+/* assumes group scene and parent scene is locked */
+static void resize_group(obs_sceneitem_t *group)
+{
+	obs_scene_t *scene = group->source->context.data;
+	struct vec2 minv;
+	struct vec2 maxv;
+	struct vec2 scale;
+
+	if (os_atomic_load_long(&group->defer_group_resize) > 0)
+		return;
+
+	if (!resize_scene_base(scene, &minv, &maxv, &scale))
+		return;
+
+	if (group->bounds_type == OBS_BOUNDS_NONE) {
+		struct vec2 new_pos;
+
+		if ((group->align & OBS_ALIGN_LEFT) != 0)
+			new_pos.x = minv.x;
+		else if ((group->align & OBS_ALIGN_RIGHT) != 0)
+			new_pos.x = maxv.x;
+		else
+			new_pos.x = (maxv.x - minv.x) * 0.5f + minv.x;
+
+		if ((group->align & OBS_ALIGN_TOP) != 0)
+			new_pos.y = minv.y;
+		else if ((group->align & OBS_ALIGN_BOTTOM) != 0)
+			new_pos.y = maxv.y;
+		else
+			new_pos.y = (maxv.y - minv.y) * 0.5f + minv.y;
+
+		transform_val(&new_pos, &group->draw_transform);
+		vec2_copy(&group->pos, &new_pos);
+	}
+
+	os_atomic_set_bool(&group->update_group_resize, false);
+
+	update_item_transform(group, false);
+}
+
+obs_sceneitem_t *obs_scene_add_group(obs_scene_t *scene, const char *name)
+{
+	return obs_scene_insert_group(scene, name, NULL, 0);
+}
+
+obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene,
+		const char *name, obs_sceneitem_t **items, size_t count)
+{
+	if (!scene)
+		return NULL;
+
+	/* don't allow groups or sub-items of other groups */
+	for (size_t i = count; i > 0; i--) {
+		obs_sceneitem_t *item = items[i - 1];
+		if (item->parent != scene || item->is_group)
+			return NULL;
+	}
+
+	obs_scene_t *sub_scene = create_id("group", name);
+	obs_sceneitem_t *last_item = items ? items[count - 1] : NULL;
+
+	obs_sceneitem_t *item = obs_scene_add_internal(
+			scene, sub_scene->source, last_item);
+
+	obs_scene_release(sub_scene);
+
+	if (!items || !count)
+		return item;
+
+	/* ------------------------- */
+
+	full_lock(scene);
+	full_lock(sub_scene);
+	sub_scene->first_item = items[0];
+
+	for (size_t i = count; i > 0; i--) {
+		size_t idx = i - 1;
+		remove_group_transform(item, items[idx]);
+		detach_sceneitem(items[idx]);
+	}
+	for (size_t i = 0; i < count; i++) {
+		size_t idx = i;
+		if (idx != (count - 1)) {
+			size_t next_idx = idx + 1;
+			items[idx]->next = items[next_idx];
+			items[next_idx]->prev = items[idx];
+		} else {
+			items[idx]->next = NULL;
+		}
+		items[idx]->parent = sub_scene;
+		apply_group_transform(items[idx], item);
+	}
+	items[0]->prev = NULL;
+	resize_group(item);
+	full_unlock(sub_scene);
+	full_unlock(scene);
+
+	/* ------------------------- */
+
+	return item;
+}
+
+obs_sceneitem_t *obs_scene_get_group(obs_scene_t *scene, const char *name)
+{
+	if (!scene || !name || !*name) {
+		return NULL;
+	}
+
+	obs_sceneitem_t *group = NULL;
+	obs_sceneitem_t *item;
+
+	full_lock(scene);
+
+	item = scene->first_item;
+	while (item) {
+		if (item->is_group && item->source->context.name) {
+			if (strcmp(item->source->context.name, name) == 0) {
+				group = item;
+				break;
+			}
+		}
+
+		item = item->next;
+	}
+
+	full_unlock(scene);
+
+	return group;
+}
+
+bool obs_sceneitem_is_group(obs_sceneitem_t *item)
+{
+	return item && item->is_group;
+}
+
+obs_scene_t *obs_sceneitem_group_get_scene(const obs_sceneitem_t *item)
+{
+	return (item && item->is_group) ? item->source->context.data : NULL;
+}
+
+void obs_sceneitem_group_ungroup(obs_sceneitem_t *item)
+{
+	if (!item || !item->is_group)
+		return;
+
+	obs_scene_t *scene = item->parent;
+	obs_scene_t *subscene = item->source->context.data;
+	obs_sceneitem_t *insert_after = item;
+	obs_sceneitem_t *first;
+	obs_sceneitem_t *last;
+
+	full_lock(scene);
+
+	/* ------------------------- */
+
+	full_lock(subscene);
+	first = subscene->first_item;
+	last = first;
+	while (last) {
+		obs_sceneitem_t *dst;
+
+		remove_group_transform(item, last);
+		dst = obs_scene_add_internal(scene, last->source, insert_after);
+		duplicate_item_data(dst, last, true, true, true);
+		apply_group_transform(last, item);
+
+		if (!last->next)
+			break;
+
+		insert_after = dst;
+		last = last->next;
+	}
+	full_unlock(subscene);
+
+	/* ------------------------- */
+
+	detach_sceneitem(item);
+	full_unlock(scene);
+
+	obs_sceneitem_release(item);
+}
+
+void obs_sceneitem_group_add_item(obs_sceneitem_t *group, obs_sceneitem_t *item)
+{
+	if (!group || !group->is_group || !item)
+		return;
+
+	obs_scene_t *scene = group->parent;
+	obs_scene_t *groupscene = group->source->context.data;
+	obs_sceneitem_t *last;
+
+	if (item->parent != scene)
+		return;
+
+	/* ------------------------- */
+
+	full_lock(scene);
+	remove_group_transform(group, item);
+	detach_sceneitem(item);
+
+	/* ------------------------- */
+
+	full_lock(groupscene);
+	last = groupscene->first_item;
+	if (last) {
+		for (;;) {
+			if (!last->next)
+				break;
+			last = last->next;
+		}
+		last->next = item;
+		item->prev = last;
+	} else {
+		groupscene->first_item = item;
+	}
+	item->parent = groupscene;
+	item->next = NULL;
+	apply_group_transform(item, group);
+	resize_group(group);
+	full_unlock(groupscene);
+
+	/* ------------------------- */
+
+	full_unlock(scene);
+}
+
+void obs_sceneitem_group_remove_item(obs_sceneitem_t *group,
+		obs_sceneitem_t *item)
+{
+	if (!item || !group || !group->is_group)
+		return;
+
+	obs_scene_t *groupscene = item->parent;
+	obs_scene_t *scene = group->parent;
+
+	/* ------------------------- */
+
+	full_lock(scene);
+	full_lock(groupscene);
+	remove_group_transform(group, item);
+	detach_sceneitem(item);
+
+	/* ------------------------- */
+
+	if (group->prev) {
+		group->prev->next = item;
+		item->prev = group->prev;
+	} else {
+		scene->first_item = item;
+		item->prev = NULL;
+	}
+	group->prev = item;
+	item->next = group;
+	item->parent = scene;
+
+	/* ------------------------- */
+
+	resize_group(group);
+	full_unlock(groupscene);
+	full_unlock(scene);
+}
+
+static void build_current_order_info(obs_scene_t *scene,
+		struct obs_sceneitem_order_info **items_out,
+		size_t *size_out)
+{
+	DARRAY(struct obs_sceneitem_order_info) items;
+	da_init(items);
+
+	obs_sceneitem_t *item = scene->first_item;
+	while (item) {
+		da_push_back(items, &item);
+
+		if (item->is_group) {
+			obs_scene_t *sub_scene = item->source->context.data;
+
+			full_lock(sub_scene);
+
+			obs_sceneitem_t *sub_item = sub_scene->first_item;
+
+			while (sub_item) {
+				da_push_back(items, &item);
+
+				sub_item = sub_item->next;
+			}
+
+			full_unlock(sub_scene);
+		}
+
+		item = item->next;
+	}
+
+	*items_out = items.array;
+	*size_out = items.num;
+}
+
+static bool sceneitems_match2(obs_scene_t *scene,
+		struct obs_sceneitem_order_info *items, size_t size)
+{
+	struct obs_sceneitem_order_info *cur_items;
+	size_t cur_size;
+
+	build_current_order_info(scene, &cur_items, &cur_size);
+	if (cur_size != size) {
+		bfree(cur_items);
+		return false;
+	}
+
+	for (size_t i = 0; i < size; i++) {
+		struct obs_sceneitem_order_info *new = &items[i];
+		struct obs_sceneitem_order_info *old = &cur_items[i];
+
+		if (new->group != old->group || new->item != old->item) {
+			bfree(cur_items);
+			return false;
+		}
+	}
+
+	bfree(cur_items);
+	return true;
+}
+
+static obs_sceneitem_t *get_sceneitem_parent_group(obs_scene_t *scene,
+		obs_sceneitem_t *group_subitem)
+{
+	if (group_subitem->is_group)
+		return NULL;
+
+	obs_sceneitem_t *item = scene->first_item;
+	while (item) {
+		if (item->is_group &&
+		    item->source->context.data == group_subitem->parent)
+			return item;
+		item = item->next;
+	}
+
+	return NULL;
+}
+
+bool obs_scene_reorder_items2(obs_scene_t *scene,
+		struct obs_sceneitem_order_info *item_order,
+		size_t item_order_size)
+{
+	if (!scene || !item_order_size || !item_order)
+		return false;
+
+	obs_scene_addref(scene);
+	full_lock(scene);
+
+	if (sceneitems_match2(scene, item_order, item_order_size)) {
+		full_unlock(scene);
+		obs_scene_release(scene);
+		return false;
+	}
+
+	for (size_t i = 0; i < item_order_size; i++) {
+		struct obs_sceneitem_order_info *info = &item_order[i];
+		if (!info->item->is_group) {
+			obs_sceneitem_t *group =
+				get_sceneitem_parent_group(scene, info->item);
+			remove_group_transform(group, info->item);
+		}
+	}
+
+	scene->first_item = item_order[0].item;
+
+	obs_sceneitem_t *prev = NULL;
+	for (size_t i = 0; i < item_order_size; i++) {
+		struct obs_sceneitem_order_info *info = &item_order[i];
+		obs_sceneitem_t *item = info->item;
+
+		if (info->item->is_group) {
+			obs_sceneitem_t *sub_prev = NULL;
+			obs_scene_t *sub_scene =
+				info->item->source->context.data;
+
+			sub_scene->first_item = NULL;
+
+			obs_scene_addref(sub_scene);
+			full_lock(sub_scene);
+
+			for (i++; i < item_order_size; i++) {
+				struct obs_sceneitem_order_info *sub_info =
+					&item_order[i];
+				obs_sceneitem_t *sub_item = sub_info->item;
+
+				if (sub_info->group != info->item) {
+					i--;
+					break;
+				}
+
+				if (!sub_scene->first_item)
+					sub_scene->first_item = sub_item;
+
+				sub_item->prev = sub_prev;
+				sub_item->next = NULL;
+				sub_item->parent = sub_scene;
+
+				if (sub_prev)
+					sub_prev->next = sub_item;
+
+				apply_group_transform(sub_info->item,
+						sub_info->group);
+
+				sub_prev = sub_item;
+			}
+
+			resize_group(info->item);
+			full_unlock(sub_scene);
+			obs_scene_release(sub_scene);
+		}
+
+		item->prev = prev;
+		item->next = NULL;
+		item->parent = scene;
+
+		if (prev)
+			prev->next = item;
+
+		prev = item;
+	}
+
+	full_unlock(scene);
+
+	signal_reorder(scene->first_item);
+	obs_scene_release(scene);
+	return true;
+}
+
+obs_sceneitem_t *obs_sceneitem_get_group(obs_scene_t *scene,
+		obs_sceneitem_t *group_subitem)
+{
+	if (!scene || !group_subitem || group_subitem->is_group)
+		return NULL;
+
+	full_lock(scene);
+	obs_sceneitem_t *group = get_sceneitem_parent_group(scene,
+			group_subitem);
+	full_unlock(scene);
+
+	return group;
+}
+
+bool obs_source_is_group(const obs_source_t *source)
+{
+	return source && source->info.id == group_info.id;
+}
+
+bool obs_scene_is_group(const obs_scene_t *scene)
+{
+	return scene ? scene->is_group : false;
+}
+
+void obs_sceneitem_group_enum_items(obs_sceneitem_t *group,
+		bool (*callback)(obs_scene_t*, obs_sceneitem_t*, void*),
+		void *param)
+{
+	if (!group || !group->is_group)
+		return;
+
+	obs_scene_t *scene = group->source->context.data;
+	if (scene)
+		obs_scene_enum_items(scene, callback, param);
+}
+
+void obs_sceneitem_force_update_transform(obs_sceneitem_t *item)
+{
+	if (!item)
+		return;
+
+	if (os_atomic_set_bool(&item->update_transform, false))
+		update_item_transform(item, false);
+}

obs-studio-21.1.2.tar.xz/libobs/obs-scene.h -> obs-studio-22.0.1.tar.xz/libobs/obs-scene.h Changed

obs-studio-21.1.2.tar.xz/libobs/obs-source.c -> obs-studio-22.0.1.tar.xz/libobs/obs-source.c Changed

@@ -347,10 +347,14 @@
 
 	blog(LOG_DEBUG, "%ssource '%s' (%s) created",
 			private ? "private " : "", name, id);
-	obs_source_dosignal(source, "source_create", NULL);
 
 	source->flags = source->default_flags;
 	source->enabled = true;
+
+	if (!private) {
+		obs_source_dosignal(source, "source_create", NULL);
+	}
+
 	return source;
 
 fail:
@@ -427,9 +431,16 @@
 
 void obs_source_copy_filters(obs_source_t *dst, obs_source_t *src)
 {
+	if (!obs_source_valid(dst, "obs_source_copy_filters"))
+		return;
+	if (!obs_source_valid(src, "obs_source_copy_filters"))
+		return;
+
 	duplicate_filters(dst, src, dst->context.private);
 }
 
+extern obs_scene_t *obs_group_from_source(const obs_source_t *source);
+
 obs_source_t *obs_source_duplicate(obs_source_t *source,
 		const char *new_name, bool create_private)
 {
@@ -446,6 +457,11 @@
 
 	if (source->info.type == OBS_SOURCE_TYPE_SCENE) {
 		obs_scene_t *scene = obs_scene_from_source(source);
+		if (!scene)
+			scene = obs_group_from_source(source);
+		if (!scene)
+			return NULL;
+
 		obs_scene_t *new_scene = obs_scene_duplicate(scene, new_name,
 				create_private ? OBS_SCENE_DUP_PRIVATE_COPY :
 					OBS_SCENE_DUP_COPY);
@@ -1720,9 +1736,18 @@
 
 static inline void obs_source_render_filters(obs_source_t *source)
 {
+	obs_source_t *first_filter;
+
+	pthread_mutex_lock(&source->filter_mutex);
+	first_filter = source->filters.array[0];
+	obs_source_addref(first_filter);
+	pthread_mutex_unlock(&source->filter_mutex);
+
 	source->rendering_filter = true;
-	obs_source_video_render(source->filters.array[0]);
+	obs_source_video_render(first_filter);
 	source->rendering_filter = false;
+
+	obs_source_release(first_filter);
 }
 
 void obs_source_default_render(obs_source_t *source)
@@ -2270,6 +2295,12 @@
 	}
 }
 
+void obs_source_frame_copy(struct obs_source_frame *dst,
+		const struct obs_source_frame *src)
+{
+	copy_frame_data(dst, src);
+}
+
 static inline bool async_texture_changed(struct obs_source *source,
 		const struct obs_source_frame *frame)
 {

obs-studio-21.1.2.tar.xz/libobs/obs-video.c -> obs-studio-22.0.1.tar.xz/libobs/obs-video.c Changed

@@ -334,8 +334,8 @@
 	profile_end(stage_output_texture_name);
 }
 
-static inline void render_video(struct obs_core_video *video, int cur_texture,
-		int prev_texture)
+static inline void render_video(struct obs_core_video *video, bool raw_active,
+		int cur_texture, int prev_texture)
 {
 	gs_begin_scene();
 
@@ -343,11 +343,14 @@
 	gs_set_cull_mode(GS_NEITHER);
 
 	render_main_texture(video, cur_texture);
-	render_output_texture(video, cur_texture, prev_texture);
-	if (video->gpu_conversion)
-		render_convert_texture(video, cur_texture, prev_texture);
 
-	stage_output_texture(video, cur_texture, prev_texture);
+	if (raw_active) {
+		render_output_texture(video, cur_texture, prev_texture);
+		if (video->gpu_conversion)
+			render_convert_texture(video, cur_texture, prev_texture);
+
+		stage_output_texture(video, cur_texture, prev_texture);
+	}
 
 	gs_set_render_target(NULL, NULL);
 	gs_enable_blending(true);
@@ -522,7 +525,7 @@
 	}
 }
 
-static inline void video_sleep(struct obs_core_video *video,
+static inline void video_sleep(struct obs_core_video *video, bool active,
 		uint64_t *p_time, uint64_t interval_ns)
 {
 	struct obs_vframe_info vframe_info;
@@ -543,8 +546,9 @@
 
 	vframe_info.timestamp = cur_time;
 	vframe_info.count = count;
-	circlebuf_push_back(&video->vframe_info_buffer, &vframe_info,
-			sizeof(vframe_info));
+	if (active)
+		circlebuf_push_back(&video->vframe_info_buffer, &vframe_info,
+				sizeof(vframe_info));
 }
 
 static const char *output_frame_gs_context_name = "gs_context(video->graphics)";
@@ -552,7 +556,7 @@
 static const char *output_frame_download_frame_name = "download_frame";
 static const char *output_frame_gs_flush_name = "gs_flush";
 static const char *output_frame_output_video_data_name = "output_video_data";
-static inline void output_frame(void)
+static inline void output_frame(bool raw_active)
 {
 	struct obs_core_video *video = &obs->video;
 	int cur_texture  = video->cur_texture;
@@ -566,12 +570,14 @@
 	gs_enter_context(video->graphics);
 
 	profile_start(output_frame_render_video_name);
-	render_video(video, cur_texture, prev_texture);
+	render_video(video, raw_active, cur_texture, prev_texture);
 	profile_end(output_frame_render_video_name);
 
-	profile_start(output_frame_download_frame_name);
-	frame_ready = download_frame(video, prev_texture, &frame);
-	profile_end(output_frame_download_frame_name);
+	if (raw_active) {
+		profile_start(output_frame_download_frame_name);
+		frame_ready = download_frame(video, prev_texture, &frame);
+		profile_end(output_frame_download_frame_name);
+	}
 
 	profile_start(output_frame_gs_flush_name);
 	gs_flush();
@@ -580,7 +586,7 @@
 	gs_leave_context();
 	profile_end(output_frame_gs_context_name);
 
-	if (frame_ready) {
+	if (raw_active && frame_ready) {
 		struct obs_vframe_info vframe_info;
 		circlebuf_pop_front(&video->vframe_info_buffer, &vframe_info,
 				sizeof(vframe_info));
@@ -597,6 +603,17 @@
 
 #define NBSP "\xC2\xA0"
 
+static void clear_frame_data(void)
+{
+	struct obs_core_video *video = &obs->video;
+	memset(video->textures_rendered, 0, sizeof(video->textures_rendered));
+	memset(video->textures_output, 0, sizeof(video->textures_output));
+	memset(video->textures_copied, 0, sizeof(video->textures_copied));
+	memset(video->textures_converted, 0, sizeof(video->textures_converted));
+	circlebuf_free(&video->vframe_info_buffer);
+	video->cur_texture = 0;
+}
+
 static const char *tick_sources_name = "tick_sources";
 static const char *render_displays_name = "render_displays";
 static const char *output_frame_name = "output_frame";
@@ -607,6 +624,7 @@
 	uint64_t frame_time_total_ns = 0;
 	uint64_t fps_total_ns = 0;
 	uint32_t fps_total_frames = 0;
+	bool raw_was_active = false;
 
 	obs->video.video_time = os_gettime_ns();
 
@@ -622,6 +640,11 @@
 	while (!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;
+
+		if (!raw_was_active && raw_active)
+			clear_frame_data();
+		raw_was_active = raw_active;
 
 		profile_start(video_thread_name);
 
@@ -630,7 +653,7 @@
 		profile_end(tick_sources_name);
 
 		profile_start(output_frame_name);
-		output_frame();
+		output_frame(raw_active);
 		profile_end(output_frame_name);
 
 		profile_start(render_displays_name);
@@ -643,7 +666,8 @@
 
 		profile_reenable_thread();
 
-		video_sleep(&obs->video, &obs->video.video_time, interval);
+		video_sleep(&obs->video, raw_active, &obs->video.video_time,
+				interval);
 
 		frame_time_total_ns += frame_time_ns;
 		fps_total_ns += (obs->video.video_time - last_time);

obs-studio-21.1.2.tar.xz/libobs/obs-win-crash-handler.c -> obs-studio-22.0.1.tar.xz/libobs/obs-win-crash-handler.c Changed

obs-studio-21.1.2.tar.xz/libobs/obs-windows.c -> obs-studio-22.0.1.tar.xz/libobs/obs-windows.c Changed

obs-studio-21.1.2.tar.xz/libobs/obs.c -> obs-studio-22.0.1.tar.xz/libobs/obs.c Changed

@@ -218,7 +218,7 @@
 gs_effect_t *obs_load_effect(gs_effect_t **effect, const char *file)
 {
 	if (!*effect) {
-		char *filename = find_libobs_data_file(file);
+		char *filename = obs_find_data_file(file);
 		*effect = gs_effect_create_from_file(filename, NULL);
 		bfree(filename);
 	}
@@ -250,49 +250,49 @@
 
 	gs_enter_context(video->graphics);
 
-	char *filename = find_libobs_data_file("default.effect");
+	char *filename = obs_find_data_file("default.effect");
 	video->default_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
 	if (gs_get_device_type() == GS_DEVICE_OPENGL) {
-		filename = find_libobs_data_file("default_rect.effect");
+		filename = obs_find_data_file("default_rect.effect");
 		video->default_rect_effect = gs_effect_create_from_file(
 				filename, NULL);
 		bfree(filename);
 	}
 
-	filename = find_libobs_data_file("opaque.effect");
+	filename = obs_find_data_file("opaque.effect");
 	video->opaque_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
-	filename = find_libobs_data_file("solid.effect");
+	filename = obs_find_data_file("solid.effect");
 	video->solid_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
-	filename = find_libobs_data_file("format_conversion.effect");
+	filename = obs_find_data_file("format_conversion.effect");
 	video->conversion_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
-	filename = find_libobs_data_file("bicubic_scale.effect");
+	filename = obs_find_data_file("bicubic_scale.effect");
 	video->bicubic_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
-	filename = find_libobs_data_file("lanczos_scale.effect");
+	filename = obs_find_data_file("lanczos_scale.effect");
 	video->lanczos_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
-	filename = find_libobs_data_file("bilinear_lowres_scale.effect");
+	filename = obs_find_data_file("bilinear_lowres_scale.effect");
 	video->bilinear_lowres_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
 
-	filename = find_libobs_data_file("premultiplied_alpha.effect");
+	filename = obs_find_data_file("premultiplied_alpha.effect");
 	video->premultiplied_alpha_effect = gs_effect_create_from_file(filename,
 			NULL);
 	bfree(filename);
@@ -565,6 +565,7 @@
 	if (!obs_view_init(&data->main_view))
 		goto fail;
 
+	data->private_data = obs_data_create();
 	data->valid = true;
 
 fail:
@@ -620,6 +621,7 @@
 	pthread_mutex_destroy(&data->draw_callbacks_mutex);
 	da_free(data->draw_callbacks);
 	da_free(data->tick_callbacks);
+	obs_data_release(data->private_data);
 }
 
 static const char *obs_signals[] = {
@@ -741,6 +743,7 @@
 }
 
 extern const struct obs_source_info scene_info;
+extern const struct obs_source_info group_info;
 
 extern void log_system_info(void);
 
@@ -771,16 +774,60 @@
 		obs->module_config_path = bstrdup(module_config_path);
 	obs->locale = bstrdup(locale);
 	obs_register_source(&scene_info);
+	obs_register_source(&group_info);
 	add_default_module_paths();
 	return true;
 }
 
 #ifdef _WIN32
-extern void initialize_crash_handler(void);
 extern void initialize_com(void);
 extern void uninitialize_com(void);
 #endif
 
+/* Separate from actual context initialization
+ * since this can be set before startup and persist
+ * after shutdown. */
+static DARRAY(struct dstr) core_module_paths = {0};
+
+char *obs_find_data_file(const char *file)
+{
+	struct dstr path = {0};
+
+	char *result = find_libobs_data_file(file);
+	if (result)
+		return result;
+
+	for (size_t i = 0; i < core_module_paths.num; ++i) {
+		if (check_path(file, core_module_paths.array[i].array, &path))
+			return path.array;
+	}
+
+	dstr_free(&path);
+	return NULL;
+}
+
+void obs_add_data_path(const char *path)
+{
+	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)
+{
+	for (size_t i = 0; i < core_module_paths.num; ++i) {
+		int result = dstr_cmp(&core_module_paths.array[i], path);
+
+		if (result == 0) {
+			dstr_free(&core_module_paths.array[i]);
+			da_erase(core_module_paths, i);
+			return true;
+		}
+	}
+
+	return false;
+}
+
 static const char *obs_startup_name = "obs_startup";
 bool obs_startup(const char *locale, const char *module_config_path,
 		profiler_name_store_t *store)
@@ -795,7 +842,6 @@
 	}
 
 #ifdef _WIN32
-	initialize_crash_handler();
 	initialize_com();
 #endif
 
@@ -1262,10 +1308,14 @@
 		obs_source_t *next_source =
 			(obs_source_t*)source->context.next;
 
-		if ((source->info.type == OBS_SOURCE_TYPE_INPUT) != 0 &&
-		    !source->context.private &&
-		    !enum_proc(param, source))
+		if (source->info.id == group_info.id &&
+		    !enum_proc(param, source)) {
 			break;
+		} else if (source->info.type == OBS_SOURCE_TYPE_INPUT &&
+		           !source->context.private &&
+		           !enum_proc(param, source)) {
+			break;
+		}
 
 		source = next_source;
 	}
@@ -1468,6 +1518,23 @@
 		gs_draw_sprite(tex, 0, 0, 0);
 }
 
+gs_texture_t *obs_get_main_texture(void)
+{
+	struct obs_core_video *video = &obs->video;
+	int last_tex;
+
+	if (!obs) return NULL;
+
+	last_tex = video->cur_texture == 0
+		? NUM_TEXTURES - 1
+		: video->cur_texture - 1;
+
+	if (!video->textures_rendered[last_tex])
+		return NULL;
+
+	return video->render_textures[last_tex];
+}
+
 void obs_set_master_volume(float volume)
 {
 	struct calldata data = {0};
@@ -1627,7 +1694,8 @@
 			if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
 				obs_transition_load(source, source_data);
 			obs_source_load(source);
-			cb(private_data, source);
+			if (cb)
+				cb(private_data, source);
 		}
 		obs_data_release(source_data);
 	}
@@ -1950,7 +2018,7 @@
 	if (!obs || !name || !id || !*name || !*id)
 		return false;
 
-#if defined(_WIN32) || HAVE_PULSEAUDIO
+#if defined(_WIN32) || HAVE_PULSEAUDIO || defined(__APPLE__)
 	pthread_mutex_lock(&obs->audio.monitoring_mutex);
 
 	if (strcmp(id, obs->audio.monitoring_device_id) == 0) {
@@ -2054,3 +2122,70 @@
 {
 	return obs ? obs->video.lagged_frames : 0;
 }
+
+void start_raw_video(video_t *v, const struct video_scale_info *conversion,
+		void (*callback)(void *param, struct video_data *frame),
+		void *param)
+{
+	struct obs_core_video *video = &obs->video;
+	os_atomic_inc_long(&video->raw_active);
+	video_output_connect(v, conversion, callback, param);
+}
+
+void stop_raw_video(video_t *v,
+		void (*callback)(void *param, struct video_data *frame),
+		void *param)
+{
+	struct obs_core_video *video = &obs->video;
+	os_atomic_dec_long(&video->raw_active);
+	video_output_disconnect(v, callback, param);
+}
+
+void obs_add_raw_video_callback(
+		const struct video_scale_info *conversion,
+		void (*callback)(void *param, struct video_data *frame),
+		void *param)
+{
+	struct obs_core_video *video = &obs->video;
+	if (!obs)
+		return;
+	start_raw_video(video->video, conversion, callback, param);
+}
+
+void obs_remove_raw_video_callback(
+		void (*callback)(void *param, struct video_data *frame),
+		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)
+		return;
+
+	obs_data_apply(obs->data.private_data, settings);
+}
+
+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);
+}
+
+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;
+}

obs-studio-21.1.2.tar.xz/libobs/obs.h -> obs-studio-22.0.1.tar.xz/libobs/obs.h Changed

@@ -243,6 +243,32 @@
 /* OBS context */
 
 /**
+ * Find a core libobs data file
+ * @param path name of the base file
+ * @return A string containing the full path to the file.
+ *          Use bfree after use.
+ */
+EXPORT char *obs_find_data_file(const char *file);
+
+/**
+ * Add a path to search libobs data files in.
+ * @param path Full path to directory to look in.
+ *             The string is copied.
+ */
+EXPORT void obs_add_data_path(const char *path);
+
+/**
+ * Remove a path from libobs core data paths.
+ * @param path The path to compare to currently set paths.
+ *             It does not need to be the same pointer, but
+ *             the path string must match an entry fully.
+ * @return Whether or not the path was successfully removed.
+ *         If false, the path could not be found.
+ */
+EXPORT bool obs_remove_data_path(const char *path);
+
+
+/**
  * Initializes OBS
  *
  * @param  locale              The locale to use for modules
@@ -276,6 +302,12 @@
 /** @return the current locale */
 EXPORT const char *obs_get_locale(void);
 
+/** Initialize the Windows-specific crash handler */
+
+#ifdef _WIN32
+EXPORT void obs_init_win32_crash_handler(void);
+#endif
+
 /**
  * Returns the profiler name store (see util/profiler.h) used by OBS, which is
  * either a name store passed to obs_startup, an internal name store, or NULL
@@ -564,6 +596,10 @@
 /** Renders the last main output texture */
 EXPORT void obs_render_main_texture(void);
 
+/** Returns the last main output texture.  This can return NULL if the texture
+ * is unavailable. */
+EXPORT gs_texture_t *obs_get_main_texture(void);
+
 /** Sets the master user volume */
 EXPORT void obs_set_master_volume(float volume);
 
@@ -576,6 +612,12 @@
 /** Loads a source from settings data */
 EXPORT obs_source_t *obs_load_source(obs_data_t *data);
 
+/** Send a save signal to sources */
+EXPORT void obs_source_save(obs_source_t *source);
+
+/** Send a load signal to sources */
+EXPORT void obs_source_load(obs_source_t *source);
+
 typedef void (*obs_load_source_cb)(void *private_data, obs_source_t *source);
 
 /** Loads sources from a data array */
@@ -624,6 +666,26 @@
 		void (*draw)(void *param, uint32_t cx, uint32_t cy),
 		void *param);
 
+EXPORT void obs_add_raw_video_callback(
+		const struct video_scale_info *conversion,
+		void (*callback)(void *param, struct video_data *frame),
+		void *param);
+EXPORT void obs_remove_raw_video_callback(
+		void (*callback)(void *param, struct video_data *frame),
+		void *param);
+
+EXPORT uint64_t obs_get_video_frame_time(void);
+
+EXPORT double obs_get_active_fps(void);
+EXPORT uint64_t obs_get_average_frame_time_ns(void);
+
+EXPORT uint32_t obs_get_total_frames(void);
+EXPORT uint32_t obs_get_lagged_frames(void);
+
+EXPORT void obs_apply_private_data(obs_data_t *settings);
+EXPORT void obs_set_private_data(obs_data_t *settings);
+EXPORT obs_data_t *obs_get_private_data(void);
+
 
 /* ------------------------------------------------------------------------- */
 /* View context */
@@ -650,14 +712,6 @@
 /** Renders the sources of this view context */
 EXPORT void obs_view_render(obs_view_t *view);
 
-EXPORT uint64_t obs_get_video_frame_time(void);
-
-EXPORT double obs_get_active_fps(void);
-EXPORT uint64_t obs_get_average_frame_time_ns(void);
-
-EXPORT uint32_t obs_get_total_frames(void);
-EXPORT uint32_t obs_get_lagged_frames(void);
-
 
 /* ------------------------------------------------------------------------- */
 /* Display context */
@@ -1275,6 +1329,15 @@
 EXPORT bool obs_scene_reorder_items(obs_scene_t *scene,
 		obs_sceneitem_t * const *item_order, size_t item_order_size);
 
+struct obs_sceneitem_order_info {
+	obs_sceneitem_t *group;
+	obs_sceneitem_t *item;
+};
+
+EXPORT bool obs_scene_reorder_items2(obs_scene_t *scene,
+		struct obs_sceneitem_order_info *item_order,
+		size_t item_order_size);
+
 /** Adds/creates a new scene item for a source */
 EXPORT obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source);
 
@@ -1364,6 +1427,8 @@
 EXPORT enum obs_scale_type obs_sceneitem_get_scale_filter(
 		obs_sceneitem_t *item);
 
+EXPORT void obs_sceneitem_force_update_transform(obs_sceneitem_t *item);
+
 EXPORT void obs_sceneitem_defer_update_begin(obs_sceneitem_t *item);
 EXPORT void obs_sceneitem_defer_update_end(obs_sceneitem_t *item);
 
@@ -1371,6 +1436,39 @@
  * automatically.  Returns an incremented reference. */
 EXPORT obs_data_t *obs_sceneitem_get_private_settings(obs_sceneitem_t *item);
 
+EXPORT obs_sceneitem_t *obs_scene_add_group(obs_scene_t *scene,
+		const char *name);
+EXPORT obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene,
+		const char *name, obs_sceneitem_t **items, size_t count);
+
+EXPORT obs_sceneitem_t *obs_scene_get_group(obs_scene_t *scene,
+		const char *name);
+
+EXPORT bool obs_sceneitem_is_group(obs_sceneitem_t *item);
+
+EXPORT obs_scene_t *obs_sceneitem_group_get_scene(
+		const obs_sceneitem_t *group);
+
+EXPORT void obs_sceneitem_group_ungroup(obs_sceneitem_t *group);
+
+EXPORT void obs_sceneitem_group_add_item(obs_sceneitem_t *group,
+		obs_sceneitem_t *item);
+EXPORT void obs_sceneitem_group_remove_item(obs_sceneitem_t *group,
+		obs_sceneitem_t *item);
+
+EXPORT obs_sceneitem_t *obs_sceneitem_get_group(obs_scene_t *scene,
+		obs_sceneitem_t *item);
+
+EXPORT bool obs_source_is_group(const obs_source_t *source);
+EXPORT bool obs_scene_is_group(const obs_scene_t *scene);
+
+EXPORT void obs_sceneitem_group_enum_items(obs_sceneitem_t *group,
+		bool (*callback)(obs_scene_t*, obs_sceneitem_t*, void*),
+		void *param);
+
+EXPORT void obs_sceneitem_defer_group_resize_begin(obs_sceneitem_t *item);
+EXPORT void obs_sceneitem_defer_group_resize_end(obs_sceneitem_t *item);
+
 
 /* ------------------------------------------------------------------------- */
 /* Outputs */
@@ -1440,6 +1538,12 @@
 /** Returns whether the output is active */
 EXPORT bool obs_output_active(const obs_output_t *output);
 
+/** Returns output capability flags */
+EXPORT uint32_t obs_output_get_flags(const obs_output_t *output);
+
+/** Returns output capability flags */
+EXPORT uint32_t obs_get_output_flags(const char *id);
+
 /** Gets the default settings for an output type */
 EXPORT obs_data_t *obs_output_defaults(const char *id);
 
@@ -1717,6 +1821,7 @@
 
 /** Gets the default settings for an encoder type */
 EXPORT obs_data_t *obs_encoder_defaults(const char *id);
+EXPORT obs_data_t *obs_encoder_get_defaults(const obs_encoder_t *encoder);
 
 /** Returns the property list, if any.  Free with obs_properties_destroy */
 EXPORT obs_properties_t *obs_get_encoder_properties(const char *id);
@@ -1895,6 +2000,8 @@
 	}
 }
 
+EXPORT void obs_source_frame_copy(struct obs_source_frame *dst,
+		const struct obs_source_frame *src);
 
 #ifdef __cplusplus
 }

obs-studio-21.1.2.tar.xz/libobs/obs.hpp -> obs-studio-22.0.1.tar.xz/libobs/obs.hpp Changed

obs-studio-21.1.2.tar.xz/libobs/obsconfig.h.in -> obs-studio-22.0.1.tar.xz/libobs/obsconfig.h.in Changed

@@ -18,6 +18,24 @@
 #define BUILD_CAPTIONS @BUILD_CAPTIONS@
 #define HAVE_DBUS @HAVE_DBUS@
 #define HAVE_PULSEAUDIO @HAVE_PULSEAUDIO@
+#define USE_XINPUT @USE_XINPUT@
 #define LIBOBS_IMAGEMAGICK_DIR_STYLE_6L 6
 #define LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE 7
 #define LIBOBS_IMAGEMAGICK_DIR_STYLE @LIBOBS_IMAGEMAGICK_DIR_STYLE@
+
+/* NOTE: Release candidate version numbers internally are always the previous
+ * main release number!  For example, if the current public release is 21.0 and
+ * the build is 22.0 release candidate 1, internally the build number (defined
+ * by LIBOBS_API_VER/etc) will always be 21.0, despite the OBS_VERSION string
+ * saying "22.0 RC1".
+ *
+ * If the release candidate version number is 0.0.0 and the RC number is 0,
+ * that means it's not a release candidate build. */
+#define OBS_RELEASE_CANDIDATE_MAJOR @OBS_RELEASE_CANDIDATE_MAJOR@
+#define OBS_RELEASE_CANDIDATE_MINOR @OBS_RELEASE_CANDIDATE_MINOR@
+#define OBS_RELEASE_CANDIDATE_PATCH @OBS_RELEASE_CANDIDATE_PATCH@
+#define OBS_RELEASE_CANDIDATE_VER \
+	MAKE_SEMANTIC_VERSION(OBS_RELEASE_CANDIDATE_MAJOR, \
+	                      OBS_RELEASE_CANDIDATE_MINOR, \
+	                      OBS_RELEASE_CANDIDATE_PATCH)
+#define OBS_RELEASE_CANDIDATE @OBS_RELEASE_CANDIDATE@

obs-studio-21.1.2.tar.xz/libobs/util/cf-lexer.c -> obs-studio-22.0.1.tar.xz/libobs/util/cf-lexer.c Changed

obs-studio-21.1.2.tar.xz/libobs/util/darray.h -> obs-studio-22.0.1.tar.xz/libobs/util/darray.h Changed

obs-studio-21.1.2.tar.xz/libobs/util/pipe-windows.c -> obs-studio-22.0.1.tar.xz/libobs/util/pipe-windows.c Changed

obs-studio-22.0.1.tar.xz/plugins/coreaudio-encoder/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/decklink/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/decklink/data/locale/el-GR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/decklink/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/decklink/data/locale/vi-VN.ini -> obs-studio-22.0.1.tar.xz/plugins/decklink/data/locale/vi-VN.ini Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/#Resources/PATCH_NOTES.md -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/#Resources/PATCH_NOTES.md Changed

@@ -1,27 +1,19 @@
-# 2.3.3 - Changes to the Blacklist, Out-of-Process AMF Capability testing and more (Hotfix 1)
-The Blacklist introduced with 2.3.0 unfortunately had the side effect that all Windows 8 users were no longer able to use the plugin and had to downgrade. With this version, the blacklist is instead now a warning written into the log file. This is all thanks to @jp9000's work on moving the initial AMF Capability test into a different process, stopping broken drivers from crashing OBS Studio.
+# 2.4.2 - Stability Improvements
+A new version, but it's merely a few stability improvements. A crash on missing D3D11 or D3D9 has been fixed, capability testing always writes supported GPUs to the log file and the H264 and H265 encoder now follow the specification of the codec and set Profile, Level and Tier before Resolution and Frame Rate - which might actually improve support for higher resolution and frame rate capture.
 
-Not only that, but a bunch of previously unidentified issues were fixed. H264 VBR should no longer limit the Peak Bitrate to the Target Bitrate, H265 encoding shouldn't get stuck anymore, some older Drivers may now work again with the plugin and Direct 3D 11.1 is now used if it is available.
-
-Hotfix: Configuration Version should now match the plugin version again.
+Hotfix 1: Additional stability improvements by fixing a crash with a very old driver.
+Hotfix 2: Fix a bug introduced in 2.4.0.
 
 ## Changelog
-### 2.3.3 (Hotfix)
-* Fixed H264 Plugin not properly adjusting config version number.
-* Reduced subprocess 'amf-test' size, which is used to check for AMF compatibility.
-
-### 2.3.2
-* Fixed a bunch of startup crashed by moving AMF Capability tests to another process, thanks @jp9000 for doing a lot of the work to make this happen.
-* Fixed the H265 encoder not stopping which was caused by 'Keyframe Interval' and 'GOP Size' being stuck at 0 internally.
-* Replaced the blacklist with a warning message to allow Windows 8 users to use current versions.
-* Fixed a crash with older Drivers which do not have Pre-Pass or VBAQ.
-* Fixed 'Target Bitrate' being set as 'Peak Bitrate' in VBR rate control mode.
-* Fixed Direct3D 11.1 not being used even if available, resulting in minimally lower performance.
+### 2.4.2 (Hotfix 2)
+* Fix Profile Level being stuck at 1.0 in both H264 and H265.
 
-### 2.3.1
-* Skipped 2.3.0 as it was not included with obs-studio.
-* Improved support for the "New Networking Code" and "Replay Buffer" features by renaming 'Bitrate.Target' to 'bitrate'.
+### 2.4.1 (Hotfix 1)
+* Refactored CMake build configuration for CI support, allowing for people to test [bleeding-edge builds](https://ci.appveyor.com/project/Xaymar/obs-studio-amf-encoder-plugin).
+* Fixed a crash caused by very old drivers that predate H265 support.
 
-### 2.3.0
-* Added a blacklist for drivers exposing an AMF Runtime older than 1.4.6.0.
-* Removed all hidden properties no longer exposed by the newest AMF Runtime.
+### 2.4.0
+* Updated AMF SDK to 1.4.7.0.
+* Fixed a crash in api::base if Direct3D 9 or Direct3D 11 was not found.
+* Changed how the capability testing reports supported devices to the log file.
+* Fixed the order that codec properties are applied. (Thanks to Qiang Wen, see commit c292f6de41f22a0521300e8ce0b74bbe5e4d0edf)

obs-studio-22.0.1.tar.xz/plugins/enc-amf/.clang-format Added

@@ -0,0 +1,99 @@
+# Basic Formatting
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+ColumnLimit: 120
+ 
+# Language
+Language: Cpp
+Standard: Cpp11
+ 
+# Indentation
+AccessModifierOffset: 0
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+IndentCaseLabels: false
+#IndentPPDirectives: true
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+NamespaceIndentation: All
+ 
+# Includes
+#IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^<'
+    Priority: 1
+  - Regex: '^"'
+    Priority: 2
+SortIncludes: true
+ 
+# Alignment
+AlignAfterOpenBracket: true
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: true
+DerivePointerAlignment: false
+PointerAlignment: Left
+ 
+# Wrapping and Breaking
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+#  AfterExternBlock: false
+  AfterFunction: true
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+#BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: true
+ 
+# Spaces
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+#SpaceBeforeCpp11BracedList: false
+#SpaceBeforeCtorInitializerColon: true
+#SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+#SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+ 
+# Other
+CommentPragmas: '^(!FIXME!|!TODO!|ToDo:)'
+CompactNamespaces: false
+DisableFormat: false
+FixNamespaceComments: true
+#ForEachMacros: ''
+KeepEmptyLinesAtTheStartOfBlocks: false
+ReflowComments: false
+SortUsingDeclarations: true

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/README.md -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/README.md Changed

@@ -2,10 +2,7 @@
 
 AMF is a light-weight, portable multimedia framework that abstracts away most of the platform and API-specific details and allows for easy implementation of multimedia applications using a variety of technologies, such as DirectX 11, OpenGL, and OpenCL and facilitates an efficient interop between them.
 
-These features are a part of the initial 1.3 version of AMF.  
-* Version 1.4 of the AMF SDK includes support for the H.265 encoder(HEVC) and bug fixes.  
-* Version 1.4.4 has support for FFmpeg 3.3.1.
-* Version 1.4.6 has support for game dvr
+These features are a part of the initial 1.3 version of AMF.  Version 1.4 of the AMF SDK includes support for the H.265 encoder(HEVC) and bug fixes.  Version 1.4.4 has support for FFmpeg 3.3.1.  Version 1.4.6 has support for game dvr.  Version 1.4.7 has support for 360 video stitch.
 
 <div>
   <a href="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/releases/latest/"><img src="http://gpuopen-librariesandsdks.github.io/media/latest-release-button.svg" alt="Latest release" title="Latest release"></a>
@@ -14,7 +11,8 @@
 ### Prerequisites
 * Windows&reg; 7 (SP1 with the [Platform Update](https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687.aspx)), Windows&reg; 8.1, or Windows&reg; 10
 * Visual Studio&reg; 2013, Visual Studio&reg; 2015 or Visual Studio&reg; 2017
-* Version 1.4.6: AMD Radeon Software Crimson Edition 17.7.2 (17.50.02) or newer
+* Version 1.4.7: AMD Radeon Software Adrenalin Edition 18.3.4 (17.50.33) or newer
+* Version 1.4.6: AMD Radeon Software Crimson Edition 17.12.1 (17.50.02) or newer
 * Version 1.4.4: AMD Radeon Software Crimson Edition 17.7.2 (17.30.1041) or newer
 * Version 1.4: AMD Radeon Software Crimson Edition 17.1.1 (16.50.2611) or newer
 * Version 1.3: AMD Radeon Software Crimson Edition 16.7.3 (16.30.2311) or newer

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/Thirdparty/file_to_header Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/Thirdparty/file_to_header/file_to_header.exe Added

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/doc/Readme.txt -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/doc/Readme.txt Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/AMFFactory.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/AMFFactory.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/AMFSTL.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/AMFSTL.cpp Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/AMFSTL.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/AMFSTL.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/ByteArray.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/ByteArray.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/CurrentTime.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/CurrentTime.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/CurrentTimeImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/CurrentTimeImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/DataStream.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/DataStream.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/DataStreamFile.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/DataStreamFile.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/DataStreamMemory.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/DataStreamMemory.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/IOCapsImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/IOCapsImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/InterfaceImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/InterfaceImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/ObservableImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/ObservableImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/PropertyStorageExImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/PropertyStorageExImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/PropertyStorageImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/PropertyStorageImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/Thread.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/Thread.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/common/TraceAdapter.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/common/TraceAdapter.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/Ambisonic2SRenderer.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/Ambisonic2SRenderer.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/AudioCapture.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/AudioCapture.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/Component.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/Component.h Changed

@@ -36,8 +36,8 @@
  * @brief AMFComponent interface declaration
  ***************************************************************************************************
  */
-#ifndef __AMFComponent_h__
-#define __AMFComponent_h__
+#ifndef AMF_Component_h
+#define AMF_Component_h
 #pragma once
 
 #include "../core/Data.h"
@@ -383,11 +383,58 @@
     {
         const AMFComponentExVtbl *pVtbl;
     };
+#endif // #if defined(__cplusplus)
 
 
-#endif // #if defined(__cplusplus)
 #if defined(__cplusplus)
 } // namespace
 #endif
 
-#endif //#ifndef __AMFComponent_h__
+typedef enum AMF_STREAM_TYPE_ENUM
+{
+    AMF_STREAM_UNKNOWN              = 0,
+    AMF_STREAM_VIDEO                = 1,
+    AMF_STREAM_AUDIO                = 2,
+    AMF_STREAM_DATA                 = 3,
+} AMF_STREAM_TYPE_ENUM;
+
+typedef enum AMF_STREAM_CODEC_ID_ENUM     // matched codecs from VideoDecoxcderUVD.h
+{
+    AMF_STREAM_CODEC_ID_UNKNOWN     = 0,
+    AMF_STREAM_CODEC_ID_MPEG2       = 1,  // AMFVideoDecoderUVD_MPEG2      
+    AMF_STREAM_CODEC_ID_MPEG4       = 2,  // AMFVideoDecoderUVD_MPEG4      
+    AMF_STREAM_CODEC_ID_WMV3        = 3,  // AMFVideoDecoderUVD_WMV3       
+    AMF_STREAM_CODEC_ID_VC1         = 4,  // AMFVideoDecoderUVD_VC1        
+    AMF_STREAM_CODEC_ID_H264_AVC    = 5,  // AMFVideoDecoderUVD_H264_AVC   
+    AMF_STREAM_CODEC_ID_H264_MVC    = 6,  // AMFVideoDecoderUVD_H264_MVC   
+    AMF_STREAM_CODEC_ID_H264_SVC    = 7,  // AMFVideoDecoderUVD_H264_SVC   
+    AMF_STREAM_CODEC_ID_MJPEG       = 8,  // AMFVideoDecoderUVD_MJPEG      
+    AMF_STREAM_CODEC_ID_H265_HEVC   = 9,  // AMFVideoDecoderHW_H265_HEVC   
+    AMF_STREAM_CODEC_ID_H265_MAIN10 = 10, // AMFVideoDecoderHW_H265_MAIN10 
+} AMF_STREAM_CODEC_ID_ENUM;
+
+// common stream properties
+#define AMF_STREAM_TYPE                     L"StreamType"           // amf_int64( AMF_STREAM_TYPE_ENUM )
+#define AMF_STREAM_ENABLED                  L"Enabled"              // bool( default = false )
+#define AMF_STREAM_CODEC_ID                 L"CodecID"              // amf_int64(Video: AMF_STREAM_CODEC_ID_ENUM, Audio: AVCodecID) (default = 0 - uncompressed)
+#define AMF_STREAM_BIT_RATE                 L"BitRate"              // amf_int64 (default = codec->bit_rate)
+#define AMF_STREAM_EXTRA_DATA               L"ExtraData"            // interface to AMFBuffer - as is from FFMPEG
+
+// video stream properties
+#define AMF_STREAM_VIDEO_MEMORY_TYPE        L"VideoMemoryType"      // amf_int64(AMF_MEMORY_TYPE); default = AMF_MEMORY_DX11
+#define AMF_STREAM_VIDEO_FORMAT             L"VideoFormat"          // amf_int64(AMF_SURFACE_FORMAT); default = AMF_SURFACE_NV12 (used if AMF_STREAM_CODEC_ID == 0)
+#define AMF_STREAM_VIDEO_FRAME_RATE         L"VideoFrameRate"       // AMFRate; default = (30,1) - video frame rate
+#define AMF_STREAM_VIDEO_FRAME_SIZE         L"VideoFrameSize"       // AMFSize; default = (1920,1080) - video frame rate
+#define AMF_STREAM_VIDEO_SURFACE_POOL       L"VideoSurfacePool"     // amf_int64; default = 5, number of allocated output surfaces
+//TODO support interlaced frames
+
+// audio stream properties
+#define AMF_STREAM_AUDIO_FORMAT             L"AudioFormat"          // amf_int64(AMF_AUDIO_FORMAT); default = AMFAF_S16
+#define AMF_STREAM_AUDIO_SAMPLE_RATE        L"AudioSampleRate"      // amf_int64; default = 48000
+#define AMF_STREAM_AUDIO_CHANNELS           L"AudioChannels"        // amf_int64; default = 2
+#define AMF_STREAM_AUDIO_CHANNEL_LAYOUT     L"AudioChannelLayout"   // amf_int64 (default = codec->channel_layout)
+#define AMF_STREAM_AUDIO_BLOCK_ALIGN        L"AudioBlockAlign"      // amf_int64 (default = codec->block_align)
+#define AMF_STREAM_AUDIO_FRAME_SIZE         L"AudioFrameSize"       // amf_int64 (default = codec->frame_size)
+
+
+#endif //#ifndef AMF_Component_h

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/ComponentCaps.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/ComponentCaps.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/DisplayCapture.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/DisplayCapture.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGAudioConverter.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGAudioConverter.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGAudioDecoder.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGAudioDecoder.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGAudioEncoder.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGAudioEncoder.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGComponents.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGComponents.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGFileDemuxer.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGFileDemuxer.h Changed

@@ -33,21 +33,13 @@
 //-------------------------------------------------------------------------------------------------
 // DemuxerFFMPEG  interface declaration
 //-------------------------------------------------------------------------------------------------
-#ifndef __AMFFileDemuxerFFMPEG_h__
-#define __AMFFileDemuxerFFMPEG_h__
+#ifndef AMF_FileDemuxerFFMPEG_h
+#define AMF_FileDemuxerFFMPEG_h
 
 #pragma once
 
 #define FFMPEG_DEMUXER L"DemuxerFFMPEG"
 
-enum FFMPEG_DEMUXER_STREAM_TYPE_ENUM
-{
-    DEMUXER_UNKNOWN =   -1,
-    DEMUXER_VIDEO =     0,
-    DEMUXER_AUDIO =     1,
-    DEMUXER_DATA =      2,
-};
-
 
 // component properties
 #define FFMPEG_DEMUXER_PATH                     L"Path"                     // string - the file to open
@@ -60,29 +52,14 @@
 #define FFMPEG_DEMUXER_INDIVIDUAL_STREAM_MODE   L"StreamMode"               // bool (default = true)
 #define FFMPEG_DEMUXER_LISTEN                   L"Listen"                   // bool (default = false)
 
-//common stream properties
-#define FFMPEG_DEMUXER_STREAM_TYPE              L"StreamType"               // amf_int64( FFMPEG_DEMUXER_STREAM_TYPE_ENUM )
-#define FFMPEG_DEMUXER_STREAM_ENABLED           L"Enabled"                  // bool( default = false )
-#define FFMPEG_DEMUXER_CODEC_ID                 L"CodecID"                  // amf_int64 (default = AV_CODEC_ID_NONE) - FFMPEG codec ID
-#define FFMPEG_DEMUXER_BIT_RATE                 L"BitRate"                  // amf_int64 (default = codec->bit_rate)
-#define FFMPEG_DEMUXER_EXTRA_DATA               L"ExtraData"                // interface to AMFBuffer - as is from FFMPEG
+// for common, video and audio properties see Component.h
+
 
 // video stream properties
-#define FFMPEG_DEMUXER_VIDEO_DECODER_ID         L"DecoderID"                // string (default - name of the codec ID - see VideoDecoderUVD.h)
-#define FFMPEG_DEMUXER_VIDEO_FRAME_RATE         L"FrameRate"                // AMFRate; default - from file 
-#define FFMPEG_DEMUXER_VIDEO_FRAMESIZE          L"FrameSize"                // AMFSize; default = 0,0; Frame size
-#define FFMPEG_DEMUXER_VIDEO_SURFACE_FORMAT     L"SurfaceFormat"            // amf_int64( AMF_OUTPUT_FORMATS_ENUM )
 #define FFMPEG_DEMUXER_VIDEO_PIXEL_ASPECT_RATIO L"PixelAspectRatio"         // double (default = calculated)
 
-// audio stream properties
-#define FFMPEG_DEMUXER_AUDIO_SAMPLE_RATE        L"SampleRate"               // amf_int64 (default = codec->sample_rate)
-#define FFMPEG_DEMUXER_AUDIO_CHANNELS           L"Channels"                 // amf_int64 (default = codec->channels)
-#define FFMPEG_DEMUXER_AUDIO_SAMPLE_FORMAT      L"SampleFormat"             // amf_int64( AMF_AUDIO_FORMAT )
-#define FFMPEG_DEMUXER_AUDIO_CHANNEL_LAYOUT     L"ChannelLayout"            // amf_int64 (default = codec->channel_layout)
-#define FFMPEG_DEMUXER_AUDIO_BLOCK_ALIGN        L"BlockAlign"               // amf_int64 (default = codec->block_align)
-#define FFMPEG_DEMUXER_AUDIO_FRAME_SIZE         L"FrameSize"                // amf_int64 (default = codec->frame_size)
 
 // buffer properties
-#define FFMPEG_DEMUXER_BUFFER_TYPE              L"BufferType"               // amf_int64 ( FFMPEG_DEMUXER_STREAM_TYPE_ENUM )
+#define FFMPEG_DEMUXER_BUFFER_TYPE              L"BufferType"               // amf_int64 ( AMF_STREAM_TYPE_ENUM )
 #define FFMPEG_DEMUXER_BUFFER_STREAM_INDEX      L"BufferStreamIndexType"    // amf_int64 ( stream index )
-#endif //#ifndef __AMFFileDemuxerFFMPEG_h__
+#endif //#ifndef AMF_FileDemuxerFFMPEG_h

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGFileMuxer.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/FFMPEGFileMuxer.h Changed

@@ -33,21 +33,13 @@
 //-------------------------------------------------------------------------------------------------
 // MuxerFFMPEG  interface declaration
 //-------------------------------------------------------------------------------------------------
-#ifndef __AMFFileMuxerFFMPEG_h__
-#define __AMFFileMuxerFFMPEG_h__
+#ifndef AMF_FileMuxerFFMPEG_h
+#define AMF_FileMuxerFFMPEG_h
 
 #pragma once
 
 #define FFMPEG_MUXER L"MuxerFFMPEG"
 
-enum FFMPEG_MUXER_STREAM_TYPE_ENUM
-{
-    MUXER_UNKNOWN =   -1,
-    MUXER_VIDEO =     0,
-    MUXER_AUDIO =     1,
-    MUXER_DATA =      2,
-};
-
 
 // component properties
 #define FFMPEG_MUXER_PATH                     L"Path"                     // string - the file to open
@@ -56,25 +48,5 @@
 #define FFMPEG_MUXER_ENABLE_VIDEO             L"EnableVideo"              // bool (default = true)
 #define FFMPEG_MUXER_ENABLE_AUDIO             L"EnableAudio"              // bool (default = false)
 
-//common stream properties
-#define FFMPEG_MUXER_STREAM_TYPE              L"StreamType"               // amf_int64( FFMPEG_MUXER_STREAM_TYPE_ENUM )
-#define FFMPEG_MUXER_STREAM_ENABLED           L"Enabled"                  // bool( default = false )
-#define FFMPEG_MUXER_CODEC_ID                 L"CodecID"                  // amf_int64 (default = AV_CODEC_ID_NONE) - FFMPEG codec ID
-#define FFMPEG_MUXER_BIT_RATE                 L"BitRate"                  // amf_int64 (default = codec->bit_rate)
-#define FFMPEG_MUXER_EXTRA_DATA               L"ExtraData"                // interface to AMFBuffer
-
-// video stream properties
-#define FFMPEG_MUXER_VIDEO_FRAME_RATE         L"FrameRate"                // AMFRate;
-#define FFMPEG_MUXER_VIDEO_FRAMESIZE          L"FrameSize"                // AMFSize; default = 0,0; Frame size
-
-// audio stream properties
-#define FFMPEG_MUXER_AUDIO_SAMPLE_RATE        L"SampleRate"               // amf_int64 (default = codec->sample_rate)
-#define FFMPEG_MUXER_AUDIO_CHANNELS           L"Channels"                 // amf_int64 (default = codec->channels)
-#define FFMPEG_MUXER_AUDIO_SAMPLE_FORMAT      L"SampleFormat"             // amf_int64( AMF_AUDIO_FORMAT )
-#define FFMPEG_MUXER_AUDIO_CHANNEL_LAYOUT     L"ChannelLayout"            // amf_int64 (default = codec->channel_layout)
-#define FFMPEG_MUXER_AUDIO_BLOCK_ALIGN        L"BlockAlign"               // amf_int64 (default = codec->block_align)
-#define FFMPEG_MUXER_AUDIO_FRAME_SIZE         L"FrameSize"                // amf_int64 (default = codec->frame_size)
-
-
 
-#endif //#ifndef __AMFFileMuxerFFMPEG_h__
+#endif //#ifndef AMF_FileMuxerFFMPEG_h

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/MediaSource.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/MediaSource.h Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoCapture.h Added

@@ -0,0 +1,52 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+//
+// 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.
+//
+
+//-------------------------------------------------------------------------------------------------
+// ZCamLive  interface declaration
+//-------------------------------------------------------------------------------------------------
+#ifndef AMF_VideoCapture_h
+#define AMF_VideoCapture_h
+
+#pragma once
+
+#define VIDEOCAP_DEVICE_COUNT           L"VideoCapDeviceCount"    // amf_int64, (default=2), number of video capture devices
+#define VIDEOCAP_DEVICE_NAME            L"VideoCapDeviceName"     // WString, (default=""), name of the video capture device
+#define VIDEOCAP_DEVICE_ACTIVE          L"VideoCapDeviceActive"   // WString, (default=""), name of the selected video capture device
+
+#define VIDEOCAP_CODEC                   L"CodecID"               // WString (default = "AMFVideoDecoderUVD_H264_AVC"), UVD codec ID
+#define VIDEOCAP_FRAMESIZE               L"FrameSize"             // AMFSize, (default=AMFConstructSize(1920, 1080)), frame size in pixels
+
+extern "C"
+{
+    AMF_RESULT AMF_CDECL_CALL AMFCreateComponentVideoCapture(amf::AMFContext* pContext, amf::AMFComponentEx** ppComponent);
+}
+#endif // AMF_VideoCapture_h
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoConverter.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoConverter.h Changed

@@ -33,8 +33,8 @@
 //-------------------------------------------------------------------------------------------------
 // AMFFVideoConverter interface declaration
 //-------------------------------------------------------------------------------------------------
-#ifndef __AMFVideoConverter_h__
-#define __AMFVideoConverter_h__
+#ifndef AMF_VideoConverter_h
+#define AMF_VideoConverter_h
 #pragma once
 
 #include "Component.h"
@@ -59,29 +59,30 @@
 };
 
 
-#define AMF_VIDEO_CONVERTER_OUTPUT_FORMAT       L"OutputFormat"             // Values : AMF_SURFACE_NV12 or AMF_SURFACE_BGRA or AMF_SURFACE_YUV420P
-#define AMF_VIDEO_CONVERTER_MEMORY_TYPE         L"MemoryType"               // Values : AMF_MEMORY_DX11 or AMF_MEMORY_DX9 or AMF_MEMORY_UNKNOWN (get from input type)
-#define AMF_VIDEO_CONVERTER_COMPUTE_DEVICE      L"ComputeDevice"            // Values : AMF_MEMORY_COMPUTE_FOR_DX9 enumeration
+#define AMF_VIDEO_CONVERTER_OUTPUT_FORMAT               L"OutputFormat"         // Values : AMF_SURFACE_NV12 or AMF_SURFACE_BGRA or AMF_SURFACE_YUV420P
+#define AMF_VIDEO_CONVERTER_MEMORY_TYPE                 L"MemoryType"           // Values : AMF_MEMORY_DX11 or AMF_MEMORY_DX9 or AMF_MEMORY_UNKNOWN (get from input type)
+#define AMF_VIDEO_CONVERTER_COMPUTE_DEVICE              L"ComputeDevice"        // Values : AMF_MEMORY_COMPUTE_FOR_DX9 enumeration
 
-#define AMF_VIDEO_CONVERTER_OUTPUT_SIZE         L"OutputSize"               // AMFSize  (default=0,0) width in pixels. default means no scaling
-#define AMF_VIDEO_CONVERTER_OUTPUT_RECT         L"OutputRect"               // AMFRect  (default=0, 0, 0, 0) rectangle in pixels. default means no rect
+#define AMF_VIDEO_CONVERTER_OUTPUT_SIZE                 L"OutputSize"           // AMFSize  (default=0,0) width in pixels. default means no scaling
+#define AMF_VIDEO_CONVERTER_OUTPUT_RECT                 L"OutputRect"           // AMFRect  (default=0, 0, 0, 0) rectangle in pixels. default means no rect
 
-#define AMF_VIDEO_CONVERTER_KEEP_ASPECT_RATIO   L"KeepAspectRatio"          // bool (default=false) Keep aspect ratio if scaling. 
-#define AMF_VIDEO_CONVERTER_FILL                L"Fill"                     // bool (default=false) fill area out of ROI. 
-#define AMF_VIDEO_CONVERTER_FILL_COLOR          L"FillColor"                // AMFColor 
+#define AMF_VIDEO_CONVERTER_KEEP_ASPECT_RATIO           L"KeepAspectRatio"      // bool (default=false) Keep aspect ratio if scaling. 
+#define AMF_VIDEO_CONVERTER_FILL                        L"Fill"                 // bool (default=false) fill area out of ROI. 
+#define AMF_VIDEO_CONVERTER_FILL_COLOR                  L"FillColor"            // AMFColor 
 
 
-#define AMF_VIDEO_CONVERTER_SCALE               L"ScaleType"
+#define AMF_VIDEO_CONVERTER_SCALE                       L"ScaleType"            // amf_int64(AMF_VIDEO_CONVERTER_SCALE_ENUM); default = AMF_VIDEO_CONVERTER_SCALE_BILINEAR
 
-#define AMF_VIDEO_CONVERTER_GAMMA_MODE          L"GammaMode"
-#define AMF_VIDEO_CONVERTER_GAMMA_VALUE         L"GammaValue"
-#define AMF_VIDEO_CONVERTER_PQ_NORM_FACTOR      L"PqNormFactor"
+#define AMF_VIDEO_CONVERTER_FORCE_OUTPUT_SURFACE_SIZE L"ForceOutputSurfaceSize" // bool (default=false) Force output size from output surface 
 
-#define AMF_VIDEO_CONVERTER_FORCE_OUTPUT_SURFACE_SIZE   L"ForceOutputSurfaceSize"   // bool (default=false) Force output size from output surface 
 
+#define AMF_VIDEO_CONVERTER_COLOR_PROFILE               L"ColorProfile"         // amf_int64(AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM); default = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN - mean AUTO
 
-#define AMF_VIDEO_CONVERTER_COLOR_PROFILE       L"ColorProfile"
+#define AMF_VIDEO_CONVERTER_LINEAR_RGB                  L"LinearRGB"             // bool (default=false) Convert to/from linear RGB instead of sRGB using AMF_VIDEO_DECODER_COLOR_TRANSFER_CHARACTERISTIC or by default AMF_VIDEO_CONVERTER_TRANSFER_CHARACTERISTIC
+#define AMF_VIDEO_CONVERTER_TRANSFER_CHARACTERISTIC     L"ColorTransferChar"     // amf_int64(AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM); default = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED, ISO/IEC 23001-8_2013 § 7.2 See VideoDecoderUVD.h for enum 
+#define AMF_VIDEO_CONVERTER_DISPLAY_HDR_METADATA        L"DisplayHDRMetadata"   // AMFBuffer containing AMFHDRMetadata; default NULL
+#define AMF_VIDEO_CONVERTER_USE_DECODER_HDR_METADATA    L"UseDecoderHDRMetadata" // bool (default=true) uses decoder metadata AMF_VIDEO_DECODER_HDR_METADATA in color conversion
 
-#define AMF_VIDEO_CONVERTER_LINEAR_RGB            L"LinearRGB"                // bool (default=false) Convert to/from linear RGB instead of sRGB
 
-#endif //#ifndef __AMFVideoConverter_h__
+
+#endif //#ifndef AMF_VideoConverter_h

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoDecoderUVD.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoDecoderUVD.h Changed

@@ -33,8 +33,8 @@
 //-------------------------------------------------------------------------------------------------
 //  VideoDecoderUVD interface declaration
 //-------------------------------------------------------------------------------------------------
-#ifndef __VideoDecoderHW_UVD_h__
-#define __VideoDecoderHW_UVD_h__
+#ifndef AMF_VideoDecoderUVD_h
+#define AMF_VideoDecoderUVD_h
 #pragma once
 
 #include "Component.h"
@@ -86,7 +86,7 @@
 
 
 // metadata information: can be set on output surface
-enum AMF_COLOR_PRIMARIES_ENUM
+enum AMF_COLOR_PRIMARIES_ENUM // as in color_primaries AVC and HEVC
 {
     AMF_COLOR_PRIMARIES_UNDEFINED                       = 0,
     AMF_COLOR_PRIMARIES_BT709                           = 1,
@@ -103,7 +103,7 @@
     AMF_COLOR_PRIMARIES_SMPTE432                        = 12,
     AMF_COLOR_PRIMARIES_JEDEC_P22                       = 22,
 };
-enum AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM
+enum AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM // as in transfer_characteristic AVC and HEVC
 {
     AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED         = 0,
     AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709             = 1,
@@ -119,9 +119,9 @@
     AMF_COLOR_TRANSFER_CHARACTERISTIC_IEC61966_2_4      = 11,
     AMF_COLOR_TRANSFER_CHARACTERISTIC_BT1361_ECG        = 12,
     AMF_COLOR_TRANSFER_CHARACTERISTIC_IEC61966_2_1      = 13,
-    AMF_COLOR_TRANSFER_CHARACTERISTIC_BT2020_10         = 14, 
+    AMF_COLOR_TRANSFER_CHARACTERISTIC_BT2020_10         = 14, //BT709 curve
     AMF_COLOR_TRANSFER_CHARACTERISTIC_BT2020_12         = 15,
-    AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084         = 16,
+    AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084         = 16, //PQ curve
     AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE428          = 17,
     AMF_COLOR_TRANSFER_CHARACTERISTIC_ARIB_STD_B67      = 18,
 };
@@ -140,8 +140,8 @@
 
 
 // In addition to component AMF_VIDEO_DECODER_FULL_RANGE_COLOR will be also set on surface 
-#define AMF_VIDEO_DECODER_COLOR_TRANSFER_CHARACTERISTIC L"ColorTransferChar"    // amf_int64(AMF_COLOR_PRIMARIES_ENUM); default = AMF_COLOR_PRIMARIES_UNDEFINED, ISO/IEC 23001-8_2013 § 7.1
-#define AMF_VIDEO_DECODER_COLOR_PRIMARIES               L"ColorPrimaries"       // amf_int64(AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM); default = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED, ISO/IEC 23001-8_2013 § 7.2
+#define AMF_VIDEO_DECODER_COLOR_TRANSFER_CHARACTERISTIC L"ColorTransferChar"    // amf_int64(AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM); default = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED, ISO/IEC 23001-8_2013 § 7.2
+#define AMF_VIDEO_DECODER_COLOR_PRIMARIES               L"ColorPrimaries"       // amf_int64(AMF_COLOR_PRIMARIES_ENUM); default = AMF_COLOR_PRIMARIES_UNDEFINED, ISO/IEC 23001-8_2013 § 7.1
 #define AMF_VIDEO_DECODER_HDR_METADATA                  L"HdrMetadata"          // AMFBuffer containing AMFHDRMetadata; default NULL
 
-#endif //#ifndef __VideoDecoderHW_UVD_h__
+#endif //#ifndef AMF_VideoDecoderUVD_h

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoEncoderHEVC.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoEncoderHEVC.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoEncoderVCE.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoEncoderVCE.h Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/VideoStitch.h Added

@@ -0,0 +1,124 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+//
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+/**
+ ***************************************************************************************************
+ * @file  VideoStitch.h
+ * @brief AMFVideoStitch interface declaration
+ ***************************************************************************************************
+ */
+#ifndef AMF_VideoStitch_h
+#define AMF_VideoStitch_h
+#pragma once
+
+#include "public/include/components/Component.h"
+
+#define AMFVideoStitch       L"AMFVideoStitch"                  //Component name
+
+// static properties 
+#define AMF_VIDEO_STITCH_OUTPUT_FORMAT       L"OutputFormat"    // Values, AMF_SURFACE_BGRA or AMF_SURFACE_RGBA
+#define AMF_VIDEO_STITCH_MEMORY_TYPE         L"MemoryType"      // Values, only AMF_MEMORY_DX11 is supported for now.
+#define AMF_VIDEO_STITCH_OUTPUT_SIZE         L"OutputSize"      // AMFSize, (width, height) in pixels. default= (0,0), will be the same size as input.
+#define AMF_VIDEO_STITCH_INPUTCOUNT          L"InputCount"      // amf_uint64, number of camera inputs.
+
+// individual camera direction and location
+#define AMF_VIDEO_CAMERA_ANGLE_PITCH        L"CameraPitch"      // double, in radians, default = 0, camera pitch orientation 
+#define AMF_VIDEO_CAMERA_ANGLE_YAW          L"CameraYaw"        // double, in radians, default = 0, camera yaw orientation 
+#define AMF_VIDEO_CAMERA_ANGLE_ROLL         L"CameraRoll"       // double, in radians, default = 0, camera roll orientation 
+
+#define AMF_VIDEO_CAMERA_OFFSET_X           L"CameraOffsetX"    // double, in pixels, default = 0, X offset of camera center of the lens from the center of the rig.
+#define AMF_VIDEO_CAMERA_OFFSET_Y           L"CameraOffsetY"    // double, in pixels, default = 0, Y offset of camera center of the lens from the center of the rig.
+#define AMF_VIDEO_CAMERA_OFFSET_Z           L"CameraOffsetZ"    // double, in pixels, default = 0, Z offset of camera center of the lens from the center of the rig.
+#define AMF_VIDEO_CAMERA_HFOV               L"CameraHFOV"       // double, in radians, default = PI, - horizontal field of view
+#define AMF_VIDEO_CAMERA_SCALE              L"CameraScale"      // double, default = 1, scale coeff
+
+// lens correction parameters
+#define AMF_VIDEO_STITCH_LENS_CORR_K1       L"LensK1"           // double, default = 0.
+#define AMF_VIDEO_STITCH_LENS_CORR_K2       L"LensK2"           // double, default = 0.
+#define AMF_VIDEO_STITCH_LENS_CORR_K3       L"LensK3"           // double, default = 0.
+#define AMF_VIDEO_STITCH_LENS_CORR_OFFX     L"LensOffX"         // double, default = 0.
+#define AMF_VIDEO_STITCH_LENS_CORR_OFFY     L"LensOffY"         // double, default = 0.
+#define AMF_VIDEO_STITCH_CROP               L"Crop"             //AMFRect, in pixels default = (0,0,0,0).
+
+#define AMF_VIDEO_STITCH_LENS_MODE          L"LensMode"         // Values, AMF_VIDEO_STITCH_LENS_CORR_MODE_ENUM, (default = AMF_VIDEO_STITCH_LENS_CORR_MODE_RADIAL)
+
+#define AMF_VIDEO_STITCH_OUTPUT_MODE        L"OutputMode"       // AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM (default=AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW) 
+#define AMF_VIDEO_STITCH_COMBINED_SOURCE    L"CombinedSource"   // bool, (default=false) video sources are combined in one stream
+
+#define AMF_VIDEO_STITCH_COMPUTE_DEVICE     L"ComputeDevice"    // amf_int64(AMF_MEMORY_TYPE) Values, AMF_MEMORY_DX11, AMF_MEMORY_COMPUTE_FOR_DX11, AMF_MEMORY_OPENCL
+
+//for debug
+#define AMF_VIDEO_STITCH_WIRE_RENDER        L"Wire"             // bool (default=false) reder wireframe
+
+//view angle 
+#define AMF_VIDEO_STITCH_VIEW_ROTATE_X      L"AngleX"           // double, in radians, default = 0 - delta from current position / automatilcally reset to 0 inside SetProperty() call
+#define AMF_VIDEO_STITCH_VIEW_ROTATE_Y      L"AngleY"           // double, in radians, default = 0 - delta from current position / automatilcally reset to 0 inside SetProperty() call
+#define AMF_VIDEO_STITCH_VIEW_ROTATE_Z      L"AngleZ"           // double, in radians, default = 0 - delta from current position / automatilcally reset to 0 inside SetProperty() call
+
+#define AMF_VIDEO_STITCH_COLOR_BALANCE      L"ColorBalance"     // bool (default=true) enables color balance
+
+//lens mode
+enum AMF_VIDEO_STITCH_LENS_ENUM
+{
+    AMF_VIDEO_STITCH_LENS_RECTILINEAR        = 0,   //rect linear lens
+    AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME  = 1,   //fisheye full frame
+    AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR   = 2,   //fisheye, circular
+};
+
+//Output Mode
+enum AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM
+{
+    AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW          = 0,    //preview mode
+    AMF_VIDEO_STITCH_OUTPUT_MODE_EQUIRECTANGULAR  = 1,    //equirectangular mode
+    AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP          = 2,    //cubemap mode
+    AMF_VIDEO_STITCH_OUTPUT_MODE_LAST = AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP,
+};
+
+//audio mode
+enum AMF_VIDEO_STITCH_AUDIO_MODE_ENUM
+{
+    AMF_VIDEO_STITCH_AUDIO_MODE_NONE        = 0,    //no audio
+    AMF_VIDEO_STITCH_AUDIO_MODE_VIDEO       = 1,    //using audio from video stream
+    AMF_VIDEO_STITCH_AUDIO_MODE_FILE        = 2,    //using audio from file
+    AMF_VIDEO_STITCH_AUDIO_MODE_CAPTURE     = 3,    //using audio from capture device
+    AMF_VIDEO_STITCH_AUDIO_MODE_INVALID = -1,       //invalid
+};
+
+
+#if defined(_M_AMD64)
+    #define STITCH_DLL_NAME    L"amf-stitch-64.dll"
+#else
+    #define STITCH_DLL_NAME    L"amf-stitch-32.dll"
+#endif
+
+#endif //#ifndef AMF_VideoStitch_h

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/components/ZCamLiveStream.h Added

@@ -0,0 +1,83 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+//
+// 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.
+//
+
+//-------------------------------------------------------------------------------------------------
+// ZCamLive  interface declaration
+//-------------------------------------------------------------------------------------------------
+#ifndef AMF_ZCamLiveStream_h
+#define AMF_ZCamLiveStream_h
+
+#pragma once
+#define ZCAMLIVE_STREAMCOUNT             L"StreamCount"          // amf_int64 (default = 4),  number of streams
+#define ZCAMLIVE_VIDEO_FRAMESIZE         L"FrameSize"            // AMFSize   (default = AMFConstructSize(2704, 1520)), frame size
+#define ZCAMLIVE_VIDEO_FRAMERATE         L"FrameRate"            // AMFRate   (default = 30.0), video frame rate
+#define ZCAMLIVE_VIDEO_BIT_RATE          L"BitRate"              // amf_int64 (default = 3000000), video bitrate
+#define ZCAMLIVE_STREAM_ACTIVE_CAMERA    L"ActiveCamera"         // amf_int64 (default = -1, all the cameras), the index of the camera to capture
+#define ZCAMLIVE_STREAM_FRAMECOUNT       L"FrameCount"           // amf_int64 (default = 0), number of frames captured
+#define ZCAMLIVE_CODEC_ID                L"CodecID"              // WString (default = "AMFVideoDecoderUVD_H264_AVC"), UVD codec ID
+#define ZCAMLIVE_VIDEO_MODE              L"VideoMode"            // Enum (default = 0, 2K7P30), ZCam mode
+#define ZCAMLIVE_AUDIO_MODE              L"AudioMode"            // Enum (default = 0, Silent) - Audio mode
+#define ZCAMLIVE_LOWLATENCY              L"LowLatency"           // amf_int64 (default = 1, LowLatency), low latency flag
+#define ZCAMLIVE_IP_0                    L"ZCamIP_00"               // WString, IP address of the #1 stream, default "10.98.32.1"
+#define ZCAMLIVE_IP_1                    L"ZCamIP_01"             // WString, IP address of the #2 stream, default "10.98.32.2"
+#define ZCAMLIVE_IP_2                    L"ZCamIP_02"             // WString, IP address of the #3 stream, default "10.98.32.3"
+#define ZCAMLIVE_IP_3                    L"ZCamIP_03"             // WString, IP address of the #4 stream, default "10.98.32.4"
+
+//Camera live capture Mode
+enum CAMLIVE_MODE_ENUM
+{
+    CAMLIVE_MODE_ZCAM_1080P24 = 0,  //1920x1080, 24FPS
+    CAMLIVE_MODE_ZCAM_1080P30,      //1920x1080, 30FPS
+    CAMLIVE_MODE_ZCAM_1080P60,      //1920x1080, 60FPS
+    CAMLIVE_MODE_ZCAM_2K7P24,       //2704x1520, 24FPS
+    CAMLIVE_MODE_ZCAM_2K7P30,       //2704x1520, 24FPS
+    CAMLIVE_MODE_ZCAM_2K7P60,       //2704x1520, 24FPS
+    CAMLIVE_MODE_ZCAM_2544P24,      //3392x2544, 24FPS
+    CAMLIVE_MODE_ZCAM_2544P30,      //3392x2544, 24FPS
+    CAMLIVE_MODE_ZCAM_2544P60,      //3392x2544, 24FPS
+    CAMLIVE_MODE_THETAS,            //Ricoh TheataS
+    CAMLIVE_MODE_THETAV,            //Ricoh TheataV
+    CAMLIVE_MODE_INVALID = -1,
+};
+ 
+enum CAM_AUDIO_MODE_ENUM
+{
+    CAM_AUDIO_MODE_NONE = 0,   //None
+    CAM_AUDIO_MODE_SILENT,     //Silent audio
+    CAM_AUDIO_MODE_CAMERA      //Capture from camera, not supported yet
+};
+
+extern "C"
+{
+    AMF_RESULT AMF_CDECL_CALL AMFCreateComponentZCamLiveStream(amf::AMFContext* pContext, amf::AMFComponentEx** ppComponent);
+}
+#endif // AMF_ZCamLiveStream_h
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/AudioBuffer.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/AudioBuffer.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Buffer.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Buffer.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Compute.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Compute.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/ComputeFactory.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/ComputeFactory.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Context.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Context.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Data.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Data.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Debug.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Debug.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Dump.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Dump.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Factory.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Factory.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Interface.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Interface.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Plane.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Plane.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Platform.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Platform.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/PropertyStorage.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/PropertyStorage.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/PropertyStorageEx.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/PropertyStorageEx.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Result.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Result.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Surface.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Surface.h Changed

@@ -30,8 +30,8 @@
 // THE SOFTWARE.
 //
 
-#ifndef __AMFSurface_h__
-#define __AMFSurface_h__
+#ifndef AMF_Surface_h
+#define AMF_Surface_h
 #pragma once
 
 #include "Data.h"
@@ -60,11 +60,16 @@
         AMF_SURFACE_YUY2,               ///< 9 - YUY2: Byte 0=8-bit Y'0; Byte 1=8-bit Cb; Byte 2=8-bit Y'1; Byte 3=8-bit Cr
         AMF_SURFACE_P010,               ///< 10- planar Y width x height + packed UV width/2 x height/2 - 10 bit per component (16 allocated, upper 10 bits are used)
         AMF_SURFACE_RGBA_F16,           ///< 11 - packed - 16 bit per component float
+        AMF_SURFACE_UYVY,               ///< 12 - the similar to YUY2 but Y and UV swapped: Byte 0=8-bit Cb; Byte 1=8-bit Y'0; Byte 2=8-bit Cr Byte 3=8-bit Y'1; (used the same DX/CL/Vulkan storage as YUY2)
 
         AMF_SURFACE_FIRST = AMF_SURFACE_NV12,
         AMF_SURFACE_LAST = AMF_SURFACE_RGBA_F16
     } AMF_SURFACE_FORMAT;
 
+#if defined(_WIN32)
+    AMF_WEAK GUID  AMFFormatGUID = { 0x8cd592d0, 0x8063, 0x4af8, 0xa7, 0xd0, 0x32, 0x5b, 0xc5, 0xf7, 0x48, 0xab}; // UINT(AMF_SURFACE_FORMAT), default - AMF_SURFACE_UNKNOWN; to be set on ID3D11Texture2D objects when used natively (i.e. force UYVY on DXGI_FORMAT_YUY2 texture)
+#endif
+
     //----------------------------------------------------------------------------------------------
     // frame type
     //----------------------------------------------------------------------------------------------
@@ -229,4 +234,4 @@
 #if defined(_MSC_VER)
     #pragma warning( pop )
 #endif
-#endif //#ifndef __AMFSurface_h__
+#endif //#ifndef AMF_Surface_h

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Trace.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Trace.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Variant.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Variant.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Version.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/include/core/Version.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2013/ComponentsFFMPEG/ComponentsFFMPEG.vcxproj -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2013/ComponentsFFMPEG/ComponentsFFMPEG.vcxproj Changed

@@ -67,7 +67,7 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+	<Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,6 +85,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>amf-component-ffmpeg$(PlatformArchitecture)</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2013x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2013x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -92,7 +94,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -100,10 +102,10 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
+      <Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copying FFMPEG...</Message>
@@ -115,7 +117,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -123,10 +125,10 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
+      <Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copying FFMPEG...</Message>
@@ -140,7 +142,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
@@ -150,10 +152,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
+      <Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copying FFMPEG...</Message>
@@ -167,7 +169,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
@@ -177,10 +179,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
+      <Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copying FFMPEG...</Message>

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2013/VideoStitch Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2013/VideoStitch/VideoStitch.vcxproj Added

@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0D493826-E26D-42EB-88C7-86D20BBF3929}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>componentstitch</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\Component.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\ComponentCaps.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\AudioBuffer.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Buffer.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Compute.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Context.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Data.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Debug.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Factory.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Guid.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Interface.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Plane.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Platform.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorage.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorageEx.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Result.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Surface.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Trace.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Variant.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Version.h" />
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\HistogramImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\StitchEngineBase.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\StitchEngineBase.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\Programs\Histogram.cl">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FullPath).h</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUT.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUTCenter.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildShifts.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Color.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Histogram.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\NV12toRGB.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2013/VideoStitch/VideoStitch.vcxproj.filters Added

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="DirectX11">
+      <UniqueIdentifier>{914aef31-687e-4326-ac11-f692ae62780b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Programs">
+      <UniqueIdentifier>{db865ec8-a7cd-4541-ad00-c9eed3e32fd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ProgramsDX11">
+      <UniqueIdentifier>{0462a168-f71d-4a47-b430-2e93fc5b307d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{b5e90977-faad-4d54-946c-630411bc8400}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\components">
+      <UniqueIdentifier>{c5574088-c5c4-459d-857b-e2510889f548}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\core">
+      <UniqueIdentifier>{0901df4b-c20c-477a-9c2b-ad11265e5f32}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{02f1f550-82ac-4ae6-889b-fe2fddbaf79a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\include\core\Buffer.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Context.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Data.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Debug.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Guid.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Interface.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Plane.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Platform.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorage.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorageEx.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Result.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Surface.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Variant.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Version.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.h">
+      <Filter>DirectX11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\AudioBuffer.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Compute.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Factory.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Trace.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoStitch\HistogramImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\StitchEngineBase.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\Component.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\components\ComponentCaps.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp">
+      <Filter>DirectX11</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\StitchEngineBase.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">
+      <Filter>DirectX11</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\Programs\Histogram.cl">
+      <Filter>Programs</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUT.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUTCenter.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildShifts.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Color.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Histogram.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\NV12toRGB.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/AmfStitchMediaCommon Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/AmfStitchMediaCommon.sln Added

@@ -0,0 +1,58 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AmfStitchMediaCommon", "AmfStitchMediaCommon\AmfStitchMediaCommon.vcxproj", "{5339C464-0EAF-4E56-957F-1FA286C59852}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComponentsFFMPEG", "..\..\..\public\proj\vs2015\ComponentsFFMPEG\ComponentsFFMPEG.vcxproj", "{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoStitch", "..\..\..\public\proj\vs2015\VideoStitch\VideoStitch.vcxproj", "{0D493826-E26D-42EB-88C7-86D20BBF3929}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AmfMediaCommon", "..\..\..\public\proj\vs2015\AmfMediaCommon\AmfMediaCommon.vcxproj", "{BE74F945-D4A5-4840-8C55-919030E8DC47}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Debug|x64.ActiveCfg = Debug|x64
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Debug|x64.Build.0 = Debug|x64
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Debug|x86.ActiveCfg = Debug|Win32
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Debug|x86.Build.0 = Debug|Win32
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Release|x64.ActiveCfg = Release|x64
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Release|x64.Build.0 = Release|x64
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Release|x86.ActiveCfg = Release|Win32
+		{5339C464-0EAF-4E56-957F-1FA286C59852}.Release|x86.Build.0 = Release|Win32
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Debug|x64.ActiveCfg = Debug|x64
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Debug|x64.Build.0 = Debug|x64
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Debug|x86.ActiveCfg = Debug|Win32
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Debug|x86.Build.0 = Debug|Win32
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Release|x64.ActiveCfg = Release|x64
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Release|x64.Build.0 = Release|x64
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Release|x86.ActiveCfg = Release|Win32
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}.Release|x86.Build.0 = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.ActiveCfg = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.Build.0 = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x86.ActiveCfg = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x86.Build.0 = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.ActiveCfg = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.Build.0 = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x86.ActiveCfg = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x86.Build.0 = Release|Win32
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Debug|x64.ActiveCfg = Debug|x64
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Debug|x64.Build.0 = Debug|x64
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Debug|x86.ActiveCfg = Debug|Win32
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Debug|x86.Build.0 = Debug|Win32
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Release|x64.ActiveCfg = Release|x64
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Release|x64.Build.0 = Release|x64
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Release|x86.ActiveCfg = Release|Win32
+		{BE74F945-D4A5-4840-8C55-919030E8DC47}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/AmfStitchMediaCommon/AmfStitchMediaCommon.vcxproj Added

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\Common\StitchPipelineBase.cpp" />
+    <ClCompile Include="..\..\..\..\public\src\components\VideoCapture\MFSource.cpp" />
+    <ClCompile Include="..\..\..\..\public\src\components\VideoCapture\VideoCaptureImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\src\components\ZCamLiveStream\DataStreamZCam.cpp" />
+    <ClCompile Include="..\..\..\..\public\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\ByteArray.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStream.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\InterfaceImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\Common\StitchPipelineBase.h" />
+    <ClInclude Include="..\..\..\..\public\src\components\VideoCapture\MFSource.h" />
+    <ClInclude Include="..\..\..\..\public\src\components\VideoCapture\VideoCaptureImpl.h" />
+    <ClInclude Include="..\..\..\..\public\src\components\ZCamLiveStream\DataStreamZCam.h" />
+    <ClInclude Include="..\..\..\..\public\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5339C464-0EAF-4E56-957F-1FA286C59852}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>AmfStitchMediaCommon</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../../..;$(ProjectDir)../../../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../../..;$(ProjectDir)../../../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../../..;$(ProjectDir)../../../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../../..;$(ProjectDir)../../../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/AmfStitchMediaCommon/AmfStitchMediaCommon.vcxproj.filters Added

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>public\common\Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\stitch\samples\Common\StitchPipelineBase.cpp">
+      <Filter>stitch\samples\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\stitch\src\components\ZCamLiveStream\DataStreamZCam.cpp">
+      <Filter>stitch\src\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\stitch\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp">
+      <Filter>stitch\src\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\stitch\src\components\VideoCapture\MFSource.cpp" />
+    <ClCompile Include="..\..\..\..\stitch\src\components\VideoCapture\VideoCaptureImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\ByteArray.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStream.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\InterfaceImpl.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\stitch\samples\Common\StitchPipelineBase.h">
+      <Filter>stitch\samples\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\stitch\src\components\ZCamLiveStream\DataStreamZCam.h">
+      <Filter>stitch\src\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\stitch\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h">
+      <Filter>stitch\src\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\stitch\src\components\VideoCapture\MFSource.h" />
+    <ClInclude Include="..\..\..\..\stitch\src\components\VideoCapture\VideoCaptureImpl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="public">
+      <UniqueIdentifier>{ac6a9179-74a6-4f96-97bf-91a8e64f288a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\common">
+      <UniqueIdentifier>{bb2209db-36a4-4e22-ab3f-489b89497803}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="stitch">
+      <UniqueIdentifier>{de2c31a3-7ba7-4c5c-8f3b-75335011ab12}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\common\Windows">
+      <UniqueIdentifier>{018ba6e3-2d93-4eba-88aa-7e1d25d25124}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="stitch\src">
+      <UniqueIdentifier>{a98857da-bc9d-4472-80e4-bea09d35572c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="stitch\samples">
+      <UniqueIdentifier>{640254db-c4aa-4dc1-85af-5826487d573a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="stitch\samples\Common">
+      <UniqueIdentifier>{95e3d969-d260-4e45-890f-fbc47220944a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="stitch\src\components">
+      <UniqueIdentifier>{f5103d1f-7e5d-4297-868c-49e1a51c9d2d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="stitch\src\components\ZCamLiveStream">
+      <UniqueIdentifier>{70c34198-15db-45f2-be0c-75dd4f61ad30}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/VideoStitch Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/VideoStitch/VideoStitch.vcxproj Added

@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0D493826-E26D-42EB-88C7-86D20BBF3929}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>componentstitch</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\..\bin\vs2015x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2015x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\Component.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\ComponentCaps.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\AudioBuffer.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Buffer.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Compute.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Context.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Data.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Debug.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Factory.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Guid.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Interface.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Plane.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Platform.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorage.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorageEx.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Result.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Surface.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Trace.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Variant.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Version.h" />
+    <ClInclude Include="..\..\..\..\stitch\include\components\VideoStitch.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\HistogramImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\StitchEngineBase.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\StitchEngineBase.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\Programs\Histogram.cl">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FullPath).h</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUT.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUTCenter.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildShifts.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Color.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Histogram.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\NV12toRGB.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2015/VideoStitch/VideoStitch.vcxproj.filters Added

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="DirectX11">
+      <UniqueIdentifier>{914aef31-687e-4326-ac11-f692ae62780b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Programs">
+      <UniqueIdentifier>{db865ec8-a7cd-4541-ad00-c9eed3e32fd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ProgramsDX11">
+      <UniqueIdentifier>{0462a168-f71d-4a47-b430-2e93fc5b307d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{b5e90977-faad-4d54-946c-630411bc8400}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\components">
+      <UniqueIdentifier>{c5574088-c5c4-459d-857b-e2510889f548}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\core">
+      <UniqueIdentifier>{0901df4b-c20c-477a-9c2b-ad11265e5f32}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{02f1f550-82ac-4ae6-889b-fe2fddbaf79a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\include\core\Buffer.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Context.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Data.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Debug.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Guid.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Interface.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Plane.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Platform.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorage.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorageEx.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Result.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Surface.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Variant.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Version.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.h">
+      <Filter>DirectX11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\AudioBuffer.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Compute.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Factory.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Trace.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\stitch\include\components\VideoStitch.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoStitch\HistogramImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\StitchEngineBase.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\Component.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\components\ComponentCaps.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp">
+      <Filter>DirectX11</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\StitchEngineBase.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">
+      <Filter>DirectX11</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\Programs\Histogram.cl">
+      <Filter>Programs</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUT.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUTCenter.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildShifts.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Color.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Histogram.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\NV12toRGB.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2017/VideoStitch Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2017/VideoStitch/VideoStitch.vcxproj Added

@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0D493826-E26D-42EB-88C7-86D20BBF3929}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>componentstitch</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>amf-stitch-$(PlatformArchitecture)</TargetName>
+    <OutDir>$(SolutionDir)..\..\..\..\bin\vs2017x$(PlatformArchitecture)$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\..\..\bin\obj\vs2017x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>AMF_COMPONENT_VSTITCH_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPONENTSTITCH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)../../../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <OpenMPSupport>true</OpenMPSupport>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\Component.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\ComponentCaps.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\AudioBuffer.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Buffer.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Compute.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Context.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Data.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Debug.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Factory.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Guid.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Interface.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Plane.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Platform.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorage.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorageEx.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Result.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Surface.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Trace.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Variant.h" />
+    <ClInclude Include="..\..\..\..\public\include\core\Version.h" />
+    <ClInclude Include="..\..\..\..\stitch\include\components\VideoStitch.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\HistogramImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\StitchEngineBase.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\StitchEngineBase.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\Programs\Histogram.cl">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(FullPath)" %(Filename)</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FullPath).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FullPath).h</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_ps.bin" /E PS  "%(FullPath)"
+fxc.exe /T ps_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_psc.bin" /E PS_Cube  "%(FullPath)"
+fxc.exe /T vs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_vs.bin" /E VS  "%(FullPath)"
+fxc.exe /T gs_4_0 /Fo "%(RootDir)\%(Directory)\%(Filename)_gs.bin" /E GS  "%(FullPath)"
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_ps.bin" %(Filename)_ps
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_psc.bin" %(Filename)_psc
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_vs.bin" %(Filename)_vs
+"$(ProjectDir)../../../../../Thirdparty/file_to_header/file_to_header.exe" "%(RootDir)\%(Directory)\%(Filename)_gs.bin" %(Filename)_gs</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)\%(Directory)\%(Filename)_ps.bin.h;%(RootDir)\%(Directory)\%(Filename)_vs.bin.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building binary resource header for %(Filename)%(Extension)...</Message>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUT.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUTCenter.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildShifts.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Color.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Histogram.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\NV12toRGB.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)</VariableName>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)</VariableName>
+      <VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename)</VariableName>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename)_$(PlatformArchitecture).h</HeaderFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compute</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntermediateOutputPath)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/proj/vs2017/VideoStitch/VideoStitch.vcxproj.filters Added

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="DirectX11">
+      <UniqueIdentifier>{914aef31-687e-4326-ac11-f692ae62780b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Programs">
+      <UniqueIdentifier>{db865ec8-a7cd-4541-ad00-c9eed3e32fd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ProgramsDX11">
+      <UniqueIdentifier>{0462a168-f71d-4a47-b430-2e93fc5b307d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{b5e90977-faad-4d54-946c-630411bc8400}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\components">
+      <UniqueIdentifier>{c5574088-c5c4-459d-857b-e2510889f548}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\core">
+      <UniqueIdentifier>{0901df4b-c20c-477a-9c2b-ad11265e5f32}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{02f1f550-82ac-4ae6-889b-fe2fddbaf79a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\include\core\Buffer.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Context.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Data.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Debug.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Guid.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Interface.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Plane.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Platform.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorage.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\PropertyStorageEx.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Result.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Surface.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Variant.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Version.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.h">
+      <Filter>DirectX11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\AudioBuffer.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Compute.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Factory.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\core\Trace.h">
+      <Filter>include\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\ObservableImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageExImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\PropertyStorageImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\IOCapsImpl.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\stitch\include\components\VideoStitch.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoStitch\HistogramImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\StitchEngineBase.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.h" />
+    <ClInclude Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.h" />
+    <ClInclude Include="..\..\..\..\public\include\components\Component.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\include\components\ComponentCaps.h">
+      <Filter>include\components</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\components\VideoStitch\DirectX11\StitchEngineDX11.cpp">
+      <Filter>DirectX11</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\IOCapsImpl.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoStitch\HistogramImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\StitchEngineBase.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchCapsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoStitch\VideoStitchImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\DirectX11\StitchD3D11.hlsl">
+      <Filter>DirectX11</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\src\components\VideoStitch\Programs\Histogram.cl">
+      <Filter>Programs</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUT.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildLUTCenter.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\BuildShifts.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Color.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\Histogram.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+    <FxCompile Include="..\..\..\src\components\VideoStitch\ProgramsDX11\NV12toRGB.hlsl">
+      <Filter>ProgramsDX11</Filter>
+    </FxCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/props/SDK32-10.0.10586.0.props -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/props/SDK32-10.0.10586.0.props Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/props/SDK32-10.props Added

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/props/SDK64-10.0.10586.0.props -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/props/SDK64-10.0.10586.0.props Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/props/SDK64-10.props Added

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10586.0\winrt;$(WindowsSDK_IncludePath);$(VC_IncludePath);</IncludePath>
+    <LibraryPath>$(ProgramFiles)\Windows Kits\10\Lib\10.0.15063.0\um\x64;$(ProgramFiles)\Windows Kits\10\Lib\10.0.15063.0\ucrt\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
+    <ExecutablePath>$(ProgramFiles)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+    <UseNativeEnvironment>true</UseNativeEnvironment>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/DVR.rc -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/DVR.rc Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/DVR_VS2015.vcxproj -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/DVR_VS2015.vcxproj Changed

@@ -55,19 +55,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -203,4 +203,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/DVR_VS2017.vcxproj -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/DVR_VS2017.vcxproj Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/resource.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/DVR/resource.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/PlaybackHW/PlaybackHW.ico -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/PlaybackHW/PlaybackHW.ico Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/PlaybackHW/PlaybackHW_VS2013.vcxproj -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/PlaybackHW/PlaybackHW_VS2013.vcxproj Changed

@@ -57,18 +57,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\props\SDK32-10.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\props\SDK64-10.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\props\SDK32-10.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+    <Import Project="..\..\..\props\SDK64-10.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/PlaybackHW/small.ico -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/PlaybackHW/small.ico Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/LoomConverter.cl Added

@@ -0,0 +1,83 @@
+/******************************************************************************
+*
+*  Trade secret of Advanced Micro Devices, Inc.
+*  Copyright 2014, Advanced Micro Devices, Inc., (unpublished)
+*
+*  All rights reserved.  This notice is intended as a precaution against
+*  inadvertent publication and does not imply publication or any waiver
+*  of confidentiality.  The year included in the foregoing notice is the
+*  year of creation of the work.
+*
+******************************************************************************/
+/**
+*******************************************************************************
+* @file   LoomConverter.cl
+* @brief  Convert between RGBA and RGB
+*
+*******************************************************************************
+*/
+
+#pragma OPENCL EXTENSION cl_amd_media_ops : enable
+
+#ifndef WORK_GROUP_SIZE_X
+#define WORK_GROUP_SIZE_X 8
+#endif
+
+#ifndef WORK_GROUP_SIZE_Y
+#define WORK_GROUP_SIZE_Y 8
+#endif
+//-------------------------------------------------------------------------------------------------
+constant sampler_t sampler = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE | CLK_FILTER_NEAREST;
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+__kernel
+//__attribute__((reqd_work_group_size(WORK_GROUP_SIZE_X, WORK_GROUP_SIZE_Y, 1)))
+void BGRAtoRGB(
+    __read_only image2d_t imageIn,
+    __global    uchar*   pImageOut, 
+    int width,
+    int height,
+    int pitch,
+    int offset
+    )
+{
+    int2 pos = (int2)(get_global_id(0), get_global_id(1));
+ //   return;
+    if ((pos.x < width) && (pos.y < height))
+    {
+        uint4 rgba = read_imageui(imageIn, sampler, pos);
+        uint posDst = offset + pos.y * pitch + 3 * pos.x;
+        *(pImageOut + posDst++) = rgba.s2 & 0x000000ff;
+        *(pImageOut + posDst++) = rgba.s1 & 0x000000ff;
+        *(pImageOut + posDst++) = rgba.s0 & 0x000000ff;
+    }
+//    write_imageui(pDst, (int2)(position.x, position.y), bytes);
+}
+
+//-------------------------------------------------------------------------------------------------
+__kernel
+//__attribute__((reqd_work_group_size(WORK_GROUP_SIZE_X, WORK_GROUP_SIZE_Y, 1)))
+void RGBtoBGRA(
+__write_only image2d_t imageOut,
+__global    uchar*   pImageIn,
+int width,
+int height,
+int pitch,
+int offset
+)
+{
+    int2 pos = (int2)(get_global_id(0), get_global_id(1));
+    //   return;
+    if ((pos.x < width) && (pos.y < height))
+    {
+        uint4 rgba;
+        uint posSrc = offset + pos.y * pitch + 3 * pos.x;
+        rgba.s3 = 255;
+        rgba.s2 = *(pImageIn + posSrc++);
+        rgba.s1 = *(pImageIn + posSrc++);
+        rgba.s0 = *(pImageIn + posSrc++);
+
+        write_imageui(imageOut, pos, rgba);
+    }
+}
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/PTGuiProjects Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/PTGuiProjects/Gopro_1440p.pts Added

@@ -0,0 +1,1047 @@
+# ptGui project file
+
+#-encoding utf8
+#-pathseparator \
+#-fileversion 49
+#-previewwidth 1126
+#-previewheight 563
+#-vfov 180
+#-resolution 300
+#-fixaspect 1
+#-outputfile 
+#-ccdcrop 1
+#-hasbeenoptimized 1
+#-hvcpmode 1
+#-jpegparameters 100 0
+#-tiffparameters 8bit packbits alpha_assoc
+#-psdparameters 16bit packbits layered
+#-qtvrparameters 1200 800 1 1000 100 0 0 -180 180 0 -90 90 90 10 120 1
+#-honorexiforientation 1
+#-exrparameters noalpha
+#-hdroutputhdrblended
+#-hdroutputtonemapped
+#-hdrfileformat hdr
+#-hdrmethod fuse
+#-hdrpsdparameters float none layered
+#-tonemapv2settings PTGTM 1 0.5 20 20 0 0 2 1 0.15 0
+#-fusesettings 0.5 0 0.2 0 0
+#-cameracurve 3.441228 -0.551975 0.294423 -0.095632 0.072139
+#-vignettingparams 
+#-wbexposure 0 0 0
+#-pmoptexposuremode keep
+#-pmoptvignettingmode disabled
+#-pmoptwbmode enabled
+#-pmoptflaremode disabled
+#-pmoptcameracurvemode auto
+#-exposurecorrection 1
+#-tonemapldrpanorama 0
+#-blendweight 100 100 100 100 100 100
+#-optviewpoint 000000
+#-useexif0
+#-batchbuilder_useexif 0
+#-stitcher ptgui
+#-blender ptgui
+#-blenderfeather 0
+#-optimizer ptgui
+#-interpolator bicubic_sharp
+#-autocpdone
+#-templateapplied
+#-imgrotate400140
+#-cpinactive
+#-imginactive
+#-linktoprevious
+#-previewinactive
+#-outputcrop 0 1 0 1
+#-location default
+#-viewingdirection default
+#-alignsettings_generatecp 0
+#-alignsettings_optimize 1
+#-alignsettings_optimizeprealign 1
+#-alignsettings_straighten 0
+#-alignsettings_fit 0
+#-alignsettings_chooseprojection 0
+#-alignsettings_setoptimumsize 0
+#-alignsettings_limitsize 500
+#-alignsettings_optimizeexposure 1
+#-hdrsettings_defaultlinkmode nolink
+#-hdrsettings_donotask 0
+#-batchsettings_align 0
+#-batchsettings_stitch 1
+#-batchsettings_stitchonlyifcontrolpoints 0
+#-defaultprojectfilenamemode sourceimagefolder
+#-defaultprojectfilename_custom " Panorama"
+#-defaultprojectfoldermode sourcefolder
+#-defaultprojectfolder_custom ""
+#-defaultpanoramafilenamemode asproject
+#-defaultpanoramafilename_custom ""
+#-defaultpanoramafoldermode projectfolder
+#-defaultpanoramafolder_custom ""
+#-userelativesourceimagepaths 1
+#-optimizeraskreinitialize 0
+#-applytemplate_lens 1
+#-applytemplate_imageparams 1
+#-applytemplate_crop 1
+#-applytemplate_mask 1
+#-applytemplate_panoramasettings 1
+#-applytemplate_projectsettings 1
+#-applytemplate_optimizer 1
+#-globalcrop 0 0 0 0 0 0 0 0.5
+#-theoreticalhfov -1
+#-rect_compression_x 0
+#-rect_compression_y 0
+#-cylindrical_compression_y 0
+#-transverse_cylindrical_compression_x 0
+#-vedutismo_compression_x 1
+#-transverse_vedutismo_compression_y 1
+#-stereographic_compression 1
+#-rectifisheye_compression 1
+# Panorama settings:
+p w5400 h2700 f2 v360 u0 n"JPEG g0 q100"
+m g0 i0
+
+# input images:
+#-dummyimage
+# The following line contains a 'dummy image' containing some global parameters for the project
+o w1 h1 y0 r0 p0 v125.7890665363031 a0.01365572690539658 b0.05409788250480643 c-0.06870098096901682 f3 d-13.52641867956837 e-7.982593344172054 g0 t0
+#-imgfile 1920 1440 "cam_1_018.MP4-0.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13014148050000000
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0.0844805237449434 -0.1048296607025321 0 0.05530361803922333
+#-sourcemask iVBORw0KGgoAAAANSUhEUgAAB4AAAAWgAgMAAADC/7ZKAAAACVBMVEUAAAD/AAAA/wD0g79+AAAE00lEQVR4nO3bUWobMRSG0eTBS9B+Zgl96Ox/K2lTKCGSbqGWEfo5ZwWCD9259thvbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwH97v+959Bl6o/Qr8Y/cheJnfF9gVDvb4DOwKx/rse//cfQxe5M+ENqNjPe6/dh+FV/gS2HM4Ubtd4Whf+rrCie5vdp+Htd6/B3aLs3SBXeEsjy6wKxylD+w7rSh9YDM6yiDwtftMLDQI7CGcROBwg8C2rCQChxsEtkYnETjcKPC1+1CsI3A4gcP1b5MEjiJwOoHDDQL7rjJJEzibtw3hBA43WKMFjiJwOL+rDCdwOIHDCRxO4HD95ySBowicrgvsZ5VZusB+dZelD2xGR+kDm9FR+sB+0xFlENiMTjIIbM1KMgp87T4U64wCW7OCjAKb0UGGga1ZOYaBzegcbVj42n0sVhkHNqNjjP5Bas0KMgl87T4Xi4z+QWrNSjIObEbHmAS2ZqUYr9FmdIzJlmXNSjHZsszoGJPA1qwUk4ewGZ1i9hC2ZqUwo8PNZrQ1K8RsjzajU1iz0pnR4czocJPAZnSKWWAzOsQssI/CIaaBr90nY4lpYGtWhmZGZ5sHtmZFmL1QMqNDzANbsyLMXjeY0SGKwNasCEXga/fZWKDNA1uzEhRblhmdoApszQpQbVlmdIIisDUrQRXYjA7QqsK7D8fzqi3LjA5QBrZmna9ao83oBGVga9b5mhmdrQxszTpfuWWZ0eertyxr1vH+EfjafT6eVQc2o4/XysD26OPVgT2Ej1ev0QIfz5aVTuBwdWBr9PGawNnqLcvnpOMJHK5eowU+n8DhBA7XBM5Wb1m7T8fTyi3LDT7fosAfP0Ru84uLV+UAAAAASUVORK5CYII=
+o f3 y-25.32197737039556 r47.19113514165304 p-32.17310927622447 v=0 a=0 b=0 c=0 d3.591264849576744 e-13.56578176605456 g=0 t=0
+#-imgfile 1920 1440 "cam_2_018.MP4-0.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13014148050000000
+#-viewpoint 0 0 0 0 0
+#-exposureparams -0.07647864617749806 0.1169990653889151 0 -0.1914510952874877
+o f3 y156.0310960874106 r-46.58286855522243 p32.76188002392536 v=0 a=0 b=0 c=0 d-11.52324769526575 e-12.64557754521498 g=0 t=0
+#-imgfile 1920 1440 "cam_3_018.MP4-0.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13014148050000000
+#-viewpoint 0 0 0 0 0
+#-exposureparams -0.06926905141847752 0.03241732018126774 0 0.4113118856532494
+o f3 y-82.26258996619184 r-45.36967083838923 p35.94142080854263 v=0 a=0 b=0 c=0 d-0.03367126509644355 e7.365087345289354 g=0 t=0
+#-imgfile 1920 1440 "cam_4_018.MP4-0.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13014148050000000
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0.02832935099181594 -0.0175808851214248 0 -0.1768185885019737
+#-sourcemask iVBORw0KGgoAAAANSUhEUgAAB4AAAAWgAgMAAADC/7ZKAAAACVBMVEUAAAD/AAAA/wD0g79+AAAE00lEQVR4nO3a24kcQQwF0J2PDaHzqRD84ck/lTU2i+chNRhXI7icE4Hgsrql7fn4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4tzX9ARc6i7haLf7L9NDcJ3fAf+cnoLLfN7/WNODcI3vgH9MD8I1vgO2pRPd7n9Nz8IFjoeA1/QwbPf4B6yEA30+BmxH53nK146Oc3sO2I5O87yhHUpxXgJWwmkOAWd7ydcrK81rwF5ZWW6vAdvRWd4DXtMjsdPrI9qhFOY9YDs6ioDDCTicgMMJOJyAwwk4nIDDFQGv6ZnYSMDhioB9T0oi4HDvX5N8bYhSBOwZHUXA4YqA1/RMbHR4ZWUrAvbKSlLcSXZ0kipgOzpIdSfZ0UGqgB1KSaqA1/RQ7FMFrISDFHeSEk5SBayEg1R3khIOUgZsR+co7yQ7Okcd8Joei23KgB1KOcqAlXCOQwlnqwNe02OxS3knKeEcdcB2dIz6TrKjYzQB29Ex6oAdSjHqgJVwjEMJZ2sCVsIpmjtJCadoAlbCKZo7yY5O0QVsR6doArajU3QBr+nB2ONQwtm6gJVwiO5OUsIh2oDX9GRs0d1JdnSINmA7OkQb8JqejC3agB1KGQ4lnK0NWAlnaO8kJZyhD1gJR+jvJDs6wknAa3o2dugDtqMj9AE7lCIcSjjbScBrejY26O8kJRzhJGAlHOEk4enR2MKODtf/CdvRGezocEcb8JoejR18UQrXf3BQwhmUcLg+4DU9Gjv0ryw7OoJ/ZqWzo8P1O9qhFMF/K8P5bWU6JRyuD1gJR+hfWUo4Qh+wHR3BT+/C+elduJM7yaGU4CzgNT0c/+8sYCUc4CxgJRzgLOB/KOEviZQtoylWmOwAAAAASUVORK5CYII=
+o f3 y93.92792373603118 r47.94421961738823 p-35.9698854588361 v=0 a=0 b=0 c=0 d-16.05270444217654 e9.146605833509426 g=0 t=0
+#-imgfile 1920 1440 "cam_5_018.MP4-0.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13014148052000000
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0.07262068252728066 -0.09834163110917642 0 0
+#-sourcemask iVBORw0KGgoAAAANSUhEUgAAB4AAAAWgAgMAAADC/7ZKAAAACVBMVEUAAAD/AAAA/wD0g79+AAAFh0lEQVR4nO3c3W3cMBCFUfthS1A/LCEPUf+tJHFs58ciaUASiLk+p4IBPpA7Wsv79AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQz7Z6AG61fV89AXd63r+tHoE7bQJn2/e2egRu9BA427bvq0fgTrvA2QTO9ixwtp8fwR6Tgv06wI5wsMdLYEc41kvf3ZfRqX7f0O7oWI/XwG31INzjLbAP4VCbwNle+9qyUgmc7W2JtkaHEjjc4z1wWz0KdxA4nMDhBA73V2BrVqI/gX2bFemfwB6W8vwf2CkO8yGwM5zlY2BHOMrHwI5wlIPAbfVMXOggsDs6yUFgfxlOchDYh3ASgcMdBW6rh+I6Aoc7CmyNDiJwuKPAnpOCCBxO4HAChxM4nMDhjgL7rjKIExxO4HAChxM4nMDhBA7nr0nhBA7njY5wPoPD+aoy3GFgH8I5DgM7wjmOA7fVY3GV48DWrBjHgd3RMZ6PA1uzUnQCu6NTdAJbs1L0AjvCIXqBrVkpeoGtWSF6gd3RIXqBrVkhuoEd4QzdwNasDP3A1qwI/cDu6Aj9wNasCIPA7ugEg8DWrASjwI5wgFFga1aAUWBrVoBhYHd0fcPA1qz6xoHb6vE4axzYmlXe5ghnmwS2ZlXXefP93er5OGkWuK0ekHO6r1W+smZVNwnsCFc3C2zNKm6bFV49IOfMtix3dHWzwNas4tzR4WYPStas6hzhr6IXuK0ejGv0AluzQnTv6tWDcY3uI7E1K0P/O4/Vk3GJ/gNTWz0al+gGtmZl6AZ2R2fYuoGtWRH6W5Y7OsLga+m2ejYuMAjsCEfoB7ZmRehvWdasCIPA7ugEoxe02urhOG/0doc7OsDw9Z3Vw3GBUWBHOMBgy7JmJRgFtmYFGP6fgzu6vvFL0qun47RxYEe4vmFga1Z927BwWz0eZ40Du6PLm/y78OrxOGvyv4Zt9XycNAlszSpvHNgRLm8bB7ZmVTcJbM2qzm8bhvPbhuGmv8nSVk/IObPA1qzitlnh1QNyzjRwWz0hp0x/vNKaVdt0y3JH1zYPbM2qbRrYEa5tmwZuq0fkjHlga1Zp0zXaHV3bfMuyZpX2icDu6NLmga1ZpW2OcLZPBB6uWT8AL8131IIq2pMAAAAASUVORK5CYII=
+o f3 y-142.4583980206322 r42.89855635505785 p-33.62540056084126 v=0 a=0 b=0 c=0 d-6.958031957923045 e-25.69724402868203 g=0 t=0
+#-imgfile 1920 1440 "cam_6_018.MP4-0.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13014148050000000
+#-viewpoint 0 0 0 0 0
+#-exposureparams -0.03968285966806438 0.07133579136295032 0 -0.09834581990301146
+o f3 y40.65298007287754 r-41.35967679573889 p33.96042089994123 v=0 a=0 b=0 c=0 d-3.425571884963808 e5.132217996530787 g=0 t=0
+
+# Control points:
+c n6 N4 x1419 y1375 X383 Y270 t0
+# Control Point No 0: 2.597124434941409
+c n6 N4 x1445 y1093 X121 Y131 t0
+# Control Point No 1: 1.904584520307698
+c n6 N4 x1355 y1213 X203 Y276 t0
+# Control Point No 2: 1.414674907162225
+c n6 N4 x1259 y1118 X61 Y353 t0
+# Control Point No 3: 1.793291604033052
+c n6 N4 x1489 y1302 X348 Y180 t0
+# Control Point No 4: 1.189314745353153
+c n6 N4 x1367 y1179 X173 Y252 t0
+# Control Point No 5: 0.6610103418951605
+c n6 N4 x1015 y1222 X131 Y650 t0
+# Control Point No 6: 1.879788385505645
+c n6 N4 x1567 y1209 X304 Y67 t0
+# Control Point No 7: 1.379034406920957
+c n6 N4 x1339 y1145 X124 Y269 t0
+# Control Point No 8: 1.884644216853128
+c n6 N4 x639 y1283 X248 Y1050 t0
+# Control Point No 9: 0.7980848085394474
+c n6 N4 x773 y1314 X245 Y906 t0
+# Control Point No 10: 2.371312980235795
+c n6 N4 x477 y1316 X337 Y1197 t0
+# Control Point No 11: 2.225020094021995
+c n6 N4 x1218 y1365 X310 Y455 t0
+# Control Point No 12: 3.576663325989044
+c n6 N4 x484 y1401 X407 Y1161 t0
+# Control Point No 13: 5.829261279413559
+c n6 N4 x1196 y1294 X236 Y462 t0
+# Control Point No 14: 2.634495434751324
+c n6 N4 x1316 y1115 X80 Y285 t0
+# Control Point No 15: 1.745155243358183
+c n6 N4 x1126 y1236 X160 Y528 t0
+# Control Point No 16: 1.749392920187642
+c n6 N4 x1450 y1006 X31 Y82 t0
+# Control Point No 17: 5.068438012731262
+c n6 N4 x1249 y1381 X333 Y428 t0
+# Control Point No 18: 3.65928449548843
+c n6 N4 x1313 y1208 X181 Y319 t0
+# Control Point No 19: 1.41967273256999
+c n6 N4 x955 y1214 X122 Y716 t0
+# Control Point No 20: 2.698460896332241
+c n6 N4 x1267 y1154 X105 Y353 t0
+# Control Point No 21: 2.195808105913508
+c n6 N4 x500 y1048 X66 Y1288 t0
+# Control Point No 22: 10.59530638535633
+c n6 N4 x1207 y1335 X278 Y460 t0
+# Control Point No 23: 3.441326633031215
+c n6 N4 x1296 y1090 X44 Y299 t0
+# Control Point No 24: 2.053142482240336
+c n6 N4 x475 y1283 X309 Y1211 t0
+# Control Point No 25: 0.7972411084703198
+c n6 N4 x1154 y1310 X242 Y509 t0
+# Control Point No 26: 3.177616671477441
+c n6 N4 x1425 y1247 X267 Y218 t0
+# Control Point No 27: 0.9189900432527453
+c n6 N4 x557 y1201 X196 Y1161 t0
+# Control Point No 28: 3.023612109397828
+c n6 N4 x682 y1307 X260 Y999 t0
+# Control Point No 29: 2.514849179736139
+c n6 N4 x849 y1409 X329 Y817 t0
+# Control Point No 30: 4.719821684490709
+c n6 N4 x777 y1333 X264 Y899 t0
+# Control Point No 31: 2.265343251569888
+c n6 N4 x536 y1172 X177 Y1193 t0
+# Control Point No 32: 5.071858478122776
+c n6 N4 x452 y1106 X153 Y1312 t0
+# Control Point No 33: 8.005805844406712
+c n6 N4 x681 y1268 X220 Y1011 t0
+# Control Point No 34: 0.236586848311078
+c n6 N4 x860 y1391 X310 Y809 t0
+# Control Point No 35: 3.924711992189154
+c n6 N4 x548 y1111 X107 Y1205 t0
+# Control Point No 36: 6.17584997943817
+c n6 N4 x774 y1271 X202 Y912 t0
+# Control Point No 37: 0.8282678383678724
+c n6 N4 x930 y1368 X283 Y740 t0
+# Control Point No 38: 4.406649427964056
+c n6 N4 x616 y1245 X217 Y1084 t0
+# Control Point No 39: 0.9185354718751801
+c n6 N4 x859 y1417 X334 Y808 t0
+# Control Point No 40: 5.122858266355562
+c n6 N4 x1319 y1239 X208 Y323 t0
+# Control Point No 41: 8.576231500695478
+c n6 N4 x635 y1258 X224 Y1061 t0
+# Control Point No 42: 0.6735689798077256
+c n6 N4 x819 y1319 X243 Y858 t0
+# Control Point No 43: 2.377337777282166
+c n6 N4 x475 y1246 X275 Y1225 t0
+# Control Point No 44: 1.438921812617003
+c n6 N4 x572 y1191 X179 Y1148 t0
+# Control Point No 45: 2.478681673058327
+c n6 N4 x756 y1280 X215 Y929 t0
+# Control Point No 46: 1.404790600374971
+c n6 N4 x587 y1212 X195 Y1125 t0
+# Control Point No 47: 2.383153395150413
+c n6 N4 x1129 y1142 X52 Y510 t0
+# Control Point No 48: 3.49596693730488
+c n6 N4 x899 y1377 X294 Y771 t0
+# Control Point No 49: 3.671863140907643
+c n6 N4 x1346 y1296 X275 Y313 t0
+# Control Point No 50: 8.815957049248606
+c n6 N4 x659 y1195 X149 Y1054 t0
+# Control Point No 51: 1.264834491493251
+c n6 N4 x597 y1266 X245 Y1097 t0
+# Control Point No 52: 1.210624761018474
+c n6 N4 x956 y1407 X320 Y714 t0
+# Control Point No 53: 5.278166540297069
+c n6 N4 x1039 y1191 X98 Y620 t0
+# Control Point No 54: 2.488731943140317
+c n5 N2 x237 y594 X1059 Y1326 t0
+# Control Point No 55: 2.923454870276532
+c n5 N2 x94 y1300 X466 Y1068 t0
+# Control Point No 56: 5.825380359997784
+c n5 N2 x199 y547 X1097 Y1284 t0
+# Control Point No 57: 0.988183578719628
+c n5 N2 x231 y631 X1021 Y1322 t0
+# Control Point No 58: 0.7348849944387617
+c n5 N2 x361 y291 X1374 Y1379 t0
+# Control Point No 59: 5.677249914956476
+c n5 N2 x109 y465 X1159 Y1193 t0
+# Control Point No 60: 2.718446361629782
+c n5 N2 x454 y89 X1607 Y1364 t0
+# Control Point No 61: 0.9400882106510939
+c n5 N2 x218 y621 X1029 Y1309 t0
+# Control Point No 62: 0.963079877868658
+c n5 N2 x386 y311 X1365 Y1407 t0
+# Control Point No 63: 1.051447464760591
+c n5 N2 x144 y480 X1152 Y1224 t0
+# Control Point No 64: 0.8349205640923182
+c n5 N2 x129 y426 X1197 Y1201 t0
+# Control Point No 65: 1.316396098315962
+c n5 N2 x48 y1230 X532 Y1058 t0
+# Control Point No 66: 7.308347677923885
+c n5 N2 x395 y222 X1455 Y1378 t0
+# Control Point No 67: 0.4045352145073275
+c n5 N2 x132 y859 X813 Y1221 t0
+# Control Point No 68: 0.8532267766994411
+c n5 N2 x442 y171 X1524 Y1398 t0
+# Control Point No 69: 0.4299882283765465
+c n5 N2 x201 y814 X847 Y1288 t0
+# Control Point No 70: 1.491038958659642
+c n5 N2 x252 y327 X1311 Y1284 t0
+# Control Point No 71: 0.7623140623207972
+c n5 N2 x365 y190 X1473 Y1335 t0
+# Control Point No 72: 0.6681611837546305
+c n5 N2 x173 y865 X803 Y1256 t0
+# Control Point No 73: 1.800267020510364
+c n5 N2 x137 y886 X789 Y1221 t0
+# Control Point No 74: 1.716452217354815
+c n5 N2 x326 y925 X724 Y1397 t0
+# Control Point No 75: 3.551397295600606
+c n5 N2 x161 y886 X785 Y1243 t0
+# Control Point No 76: 1.269676197966696
+c n5 N2 x85 y1035 X672 Y1147 t0
+# Control Point No 77: 3.263517689299784
+c n5 N2 x212 y480 X1162 Y1286 t0
+# Control Point No 78: 1.272834046541203
+c n5 N2 x197 y930 X740 Y1267 t0
+# Control Point No 79: 2.417410205962072
+c n5 N2 x325 y586 X1070 Y1411 t0
+# Control Point No 80: 1.782232307828514
+c n5 N2 x253 y1031 X637 Y1298 t0
+# Control Point No 81: 1.251464571343308
+c n5 N2 x67 y236 X1338 Y1101 t0
+# Control Point No 82: 1.977890597990195
+c n5 N2 x180 y981 X699 Y1242 t0
+# Control Point No 83: 1.670761205289884
+c n5 N2 x207 y939 X731 Y1275 t0
+# Control Point No 84: 1.602437844050491
+c n5 N2 x302 y559 X1097 Y1385 t0
+# Control Point No 85: 0.7511243173215829
+c n5 N2 x224 y879 X784 Y1301 t0
+# Control Point No 86: 1.891998078037055
+c n5 N2 x261 y747 X907 Y1351 t0
+# Control Point No 87: 1.368184928147765
+c n5 N2 x246 y775 X885 Y1338 t0
+# Control Point No 88: 4.28741974114288
+c n5 N2 x216 y1064 X617 Y1254 t0
+# Control Point No 89: 0.2477351709883582
+c n5 N2 x319 y675 X979 Y1411 t0
+# Control Point No 90: 1.179290824208044
+c n3 N1 x355 y1198 X302 Y1356 t0
+# Control Point No 91: 3.350882378823379
+c n3 N1 x860 y1357 X287 Y806 t0
+# Control Point No 92: 1.519310792664742
+c n3 N1 x1463 y1236 X282 Y173 t0
+# Control Point No 93: 6.935118909684952
+c n3 N1 x420 y1102 X177 Y1341 t0
+# Control Point No 94: 10.16061112855471
+c n3 N1 x994 y1157 X62 Y667 t0
+# Control Point No 95: 2.63102831757181
+c n3 N1 x876 y1391 X320 Y787 t0
+# Control Point No 96: 2.061895083232804
+c n3 N1 x827 y1335 X265 Y843 t0
+# Control Point No 97: 1.940541257820128
+c n3 N1 x916 y1216 X132 Y757 t0
+# Control Point No 98: 2.790114961528737
+c n3 N1 x595 y1280 X266 Y1092 t0
+# Control Point No 99: 1.622926100908224
+c n3 N1 x818 y1410 X343 Y843 t0
+# Control Point No 100: 0.5331960148838854
+c n3 N1 x696 y1312 X270 Y980 t0
+# Control Point No 101: 1.76106357235636
+c n3 N1 x390 y1079 X172 Y1386 t0
+# Control Point No 102: 9.909109472729435
+c n3 N1 x1567 y1265 X363 Y89 t0
+# Control Point No 103: 7.170726978945833
+c n3 N1 x818 y1390 X324 Y845 t0
+# Control Point No 104: 0.9427756032798194
+c n3 N1 x1551 y1267 X356 Y104 t0
+# Control Point No 105: 6.837750157539992
+c n3 N1 x1010 y1145 X48 Y648 t0
+# Control Point No 106: 3.122064881465071
+c n3 N1 x1618 y1295 X416 Y60 t0
+# Control Point No 107: 7.814814927666544
+c n3 N1 x543 y1260 X266 Y1149 t0
+# Control Point No 108: 0.3603113728830976
+c n3 N1 x692 y1375 X331 Y970 t0
+# Control Point No 109: 1.314465720141111
+c n3 N1 x571 y1173 X171 Y1149 t0
+# Control Point No 110: 6.456473109444088
+c n3 N1 x723 y1236 X182 Y969 t0
+# Control Point No 111: 1.584954390816555
+c n3 N1 x1447 y1189 X228 Y167 t0
+# Control Point No 112: 5.138577853814327
+c n3 N1 x731 y1313 X263 Y944 t0
+# Control Point No 113: 2.054486513764401
+c n3 N1 x735 y1329 X278 Y937 t0
+# Control Point No 114: 1.620750767309923
+c n3 N1 x604 y1329 X312 Y1066 t0
+# Control Point No 115: 1.534306692961236
+c n3 N1 x1030 y1230 X146 Y629 t0
+# Control Point No 116: 3.088488591249964
+c n3 N1 x763 y1173 X100 Y938 t0
+# Control Point No 117: 3.529706338416938
+c n3 N1 x978 y1252 X169 Y687 t0
+# Control Point No 118: 2.07615054135233
+c n3 N1 x680 y1398 X355 Y976 t0
+# Control Point No 119: 2.62927193841691
+c n3 N1 x642 y1357 X328 Y1022 t0
+# Control Point No 120: 1.542975581166859
+c n3 N1 x783 y1289 X224 Y895 t0
+# Control Point No 121: 1.971291403492378
+c n3 N1 x733 y1355 X302 Y935 t0
+# Control Point No 122: 1.008158693074621
+c n3 N1 x1302 y1128 X97 Y300 t0
+# Control Point No 123: 4.403040135337884
+c n3 N1 x923 y1285 X209 Y746 t0
+# Control Point No 124: 3.157688519276653
+c n5 N3 x790 y51 X261 Y519 t0
+# Control Point No 125: 2.686130800136382
+c n5 N3 x651 y109 X235 Y366 t0
+# Control Point No 126: 1.687611231042486
+c n5 N3 x1058 y96 X203 Y800 t0
+# Control Point No 127: 3.929008344609341
+c n5 N3 x492 y148 X258 Y193 t0
+# Control Point No 128: 0.7349583884602795
+c n5 N3 x775 y30 X285 Y508 t0
+# Control Point No 129: 2.723848498261898
+c n5 N3 x619 y132 X221 Y327 t0
+# Control Point No 130: 0.7518258394524092
+c n5 N3 x588 y123 X242 Y297 t0
+# Control Point No 131: 1.025867545963284
+c n5 N3 x409 y238 X214 Y68 t0
+# Control Point No 132: 0.9049139337810038
+c n5 N3 x688 y114 X207 Y401 t0
+# Control Point No 133: 10.11564119399097
+c n5 N3 x605 y197 X152 Y289 t0
+# Control Point No 134: 5.531226971486698
+c n5 N3 x831 y67 X237 Y560 t0
+# Control Point No 135: 1.322783617827518
+c n5 N3 x847 y86 X216 Y574 t0
+# Control Point No 136: 2.273934065099787
+c n5 N3 x397 y202 X256 Y75 t0
+# Control Point No 137: 0.6617427726049301
+c n5 N3 x550 y76 X303 Y275 t0
+# Control Point No 138: 1.089019775106882
+c n5 N3 x1059 y58 X243 Y797 t0
+# Control Point No 139: 3.69778325557007
+c n5 N3 x986 y80 X216 Y722 t0
+# Control Point No 140: 3.401772189154492
+c n5 N3 x989 y99 X195 Y724 t0
+# Control Point No 141: 2.477753280630014
+c n5 N3 x954 y148 X140 Y689 t0
+# Control Point No 142: 2.525380683722377
+c n5 N3 x1071 y37 X267 Y807 t0
+# Control Point No 143: 5.128399074391632
+c n5 N3 x1227 y74 X255 Y971 t0
+# Control Point No 144: 3.953110288853823
+c n5 N3 x968 y58 X240 Y702 t0
+# Control Point No 145: 4.473786352026353
+c n5 N3 x1201 y36 X286 Y937 t0
+# Control Point No 146: 3.052727093529407
+c n5 N3 x581 y52 X315 Y312 t0
+# Control Point No 147: 1.840167025126257
+c n5 N3 x752 y218 X84 Y445 t0
+# Control Point No 148: 4.908996319352725
+c n5 N3 x1094 y49 X256 Y831 t0
+# Control Point No 149: 3.825322088527143
+c n5 N3 x629 y168 X173 Y326 t0
+# Control Point No 150: 6.170316520529484
+c n5 N3 x1188 y77 X242 Y932 t0
+# Control Point No 151: 2.984572634719248
+c n5 N3 x996 y164 X121 Y735 t0
+# Control Point No 152: 1.341000812223997
+c n5 N3 x1074 y20 X284 Y808 t0
+# Control Point No 153: 4.819846930401313
+c n5 N3 x1206 y92 X231 Y953 t0
+# Control Point No 154: 3.173398587897837
+c n5 N3 x790 y190 X108 Y494 t0
+# Control Point No 155: 4.482710078378065
+c n6 N3 x757 y209 X1833 Y935 t0
+# Control Point No 156: 5.184510366314452
+c n6 N3 x608 y215 X1796 Y1103 t0
+# Control Point No 157: 2.376073046940604
+c n6 N3 x621 y294 X1893 Y1114 t0
+# Control Point No 158: 2.682700089112321
+c n6 N3 x561 y289 X1856 Y1185 t0
+# Control Point No 159: 4.069888468532685
+c n6 N3 x594 y196 X1768 Y1112 t0
+# Control Point No 160: 4.316288386758953
+c n6 N3 x647 y203 X1797 Y1055 t0
+# Control Point No 161: 1.876835344599173
+c n6 N3 x914 y212 X1863 Y749 t0
+# Control Point No 162: 4.387193347877949
+c n6 N3 x383 y177 X1674 Y1326 t0
+# Control Point No 163: 28.83333326359231
+c n6 N3 x714 y79 X1684 Y953 t0
+# Control Point No 164: 4.93272873644552
+c n6 N3 x703 y164 X1772 Y983 t0
+# Control Point No 165: 2.490369704578001
+c n6 N3 x725 y141 X1752 Y955 t0
+# Control Point No 166: 3.703197809073705
+c n6 N3 x508 y90 X1624 Y1161 t0
+# Control Point No 167: 8.304087345188092
+c n6 N3 x615 y52 X1629 Y1045 t0
+# Control Point No 168: 5.967361060397772
+c n6 N3 x810 y164 X1796 Y865 t0
+# Control Point No 169: 2.861189681831492
+c n6 N3 x392 y87 X1567 Y1265 t0
+# Control Point No 170: 9.579687208147451
+c n6 N3 x778 y160 X1786 Y900 t0
+# Control Point No 171: 2.417320633903619
+c n6 N3 x606 y150 X1724 Y1084 t0
+# Control Point No 172: 4.985216177606247
+c n6 N3 x531 y183 X1728 Y1173 t0
+# Control Point No 173: 4.494732312563859
+c n6 N3 x572 y112 X1672 Y1106 t0
+# Control Point No 174: 6.314570760646278
+c n6 N3 x642 y77 X1662 Y1025 t0
+# Control Point No 175: 5.399916063473593
+c n6 N3 x467 y87 X1604 Y1197 t0
+# Control Point No 176: 7.557504115554937
+c n1 N6 x1219 y144 X172 Y952 t0
+# Control Point No 177: 9.696183115911373
+c n1 N6 x882 y79 X196 Y589 t0
+# Control Point No 178: 11.85172777447828
+c n1 N6 x1097 y108 X180 Y816 t0
+# Control Point No 179: 2.319421611745943
+c n1 N6 x695 y271 X28 Y346 t0
+# Control Point No 180: 6.745956629658769
+c n1 N6 x861 y68 X210 Y568 t0
+# Control Point No 181: 11.71612182128998
+c n1 N6 x1122 y101 X197 Y837 t0
+# Control Point No 182: 10.22164462120742
+c n1 N6 x362 y88 X393 Y87 t0
+# Control Point No 183: 16.35359077257123
+c n1 N4 x1789 y1308 X1490 Y1164 t0
+# Control Point No 184: 2.346622587744824
+c n1 N4 x1877 y1300 X1453 Y1101 t0
+# Control Point No 185: 2.150284344502183
+c n1 N4 x1808 y87 X451 Y1130 t0
+# Control Point No 186: 14.11460409370643
+c n1 N4 x1552 y1278 X1565 Y1377 t0
+# Control Point No 187: 3.908636541209631
+c n1 N4 x1721 y558 X832 Y1351 t0
+# Control Point No 188: 1.7661005374277
+c n1 N4 x1668 y679 X948 Y1414 t0
+# Control Point No 189: 1.953896678740469
+c n1 N4 x1768 y620 X894 Y1315 t0
+# Control Point No 190: 1.55552944243749
+c n1 N4 x1734 y638 X910 Y1348 t0
+# Control Point No 191: 0.9258253684237152
+c n1 N4 x1804 y1189 X1392 Y1201 t0
+# Control Point No 192: 3.652762699392893
+c n1 N4 x1677 y626 X896 Y1401 t0
+# Control Point No 193: 1.231836625228084
+c n1 N4 x1850 y889 X1132 Y1234 t0
+# Control Point No 194: 1.466037269661875
+c n1 N4 x1699 y666 X935 Y1383 t0
+# Control Point No 195: 1.128174198628357
+c n1 N4 x1623 y1289 X1542 Y1309 t0
+# Control Point No 196: 3.636200128571712
+c n5 N4 x650 y1218 X1768 Y358 t0
+# Control Point No 197: 17.37833928528205
+c n5 N4 x641 y1201 X1783 Y343 t0
+# Control Point No 198: 17.78767862854842
+c n5 N4 x1275 y1178 X1838 Y1070 t0
+# Control Point No 199: 5.595873465094493
+c n5 N4 x1536 y1381 X1537 Y1258 t0
+# Control Point No 200: 4.252495810937676
+c n3 N2 x508 y132 X1657 Y1177 t0
+# Control Point No 201: 1.130204899477615
+c n3 N2 x535 y144 X1681 Y1156 t0
+# Control Point No 202: 0.7818065391418998
+c n3 N2 x561 y54 X1606 Y1100 t0
+# Control Point No 203: 1.318823429529032
+c n3 N2 x437 y318 X1804 Y1337 t0
+# Control Point No 204: 1.480256568358206
+c n3 N2 x212 y69 X1444 Y1401 t0
+# Control Point No 205: 1.717706030060188
+c n3 N2 x322 y171 X1593 Y1368 t0
+# Control Point No 206: 0.9725830216500396
+c n3 N2 x468 y274 X1778 Y1281 t0
+# Control Point No 207: 0.7981134606616834
+c n3 N2 x597 y312 X1888 Y1154 t0
+# Control Point No 208: 2.004252992551078
+c n6 N2 x1577 y1375 X309 Y179 t0
+# Control Point No 209: 0.3844536154421517
+c n6 N2 x1604 y1007 X647 Y37 t0
+# Control Point No 210: 2.017240672431507
+c n6 N2 x1595 y1068 X586 Y49 t0
+# Control Point No 211: 1.582672373518547
+c n6 N2 x1575 y1162 X492 Y67 t0
+# Control Point No 212: 1.114270948982159
+c n6 N2 x1676 y1295 X419 Y215 t0
+# Control Point No 213: 1.21196845952428
+c n6 N2 x1567 y1209 X444 Y82 t0
+# Control Point No 214: 2.094280470219559
+c n5 N1 x1611 y344 X625 Y1373 t0
+# Control Point No 215: 2.741393453620328
+c n5 N1 x1872 y420 X747 Y1164 t0
+# Control Point No 216: 8.151808898118343
+c n5 N1 x1676 y506 X794 Y1357 t0
+# Control Point No 217: 1.581035181879878
+c n5 N1 x1665 y481 X768 Y1361 t0
+# Control Point No 218: 2.280728262848411
+c n5 N1 x1735 y892 X1162 Y1311 t0
+# Control Point No 219: 3.931256184408911
+c n5 N1 x1657 y1112 X1383 Y1330 t0
+# Control Point No 220: 4.767830015086176
+c n5 N1 x1698 y1102 X1362 Y1296 t0
+# Control Point No 221: 4.465040779794194
+c n5 N1 x1529 y1211 X1524 Y1409 t0
+# Control Point No 222: 5.756363471084506
+c n1 N3 x134 y713 X954 Y1220 t0
+# Control Point No 223: 1.183773599768766
+c n1 N3 x204 y569 X1088 Y1275 t0
+# Control Point No 224: 2.643162110031751
+c n1 N3 x160 y1299 X458 Y1108 t0
+# Control Point No 225: 7.454095868603718
+c n1 N3 x64 y1026 X696 Y1120 t0
+# Control Point No 226: 4.497078088946195
+c n4 N1 x895 y1379 X1701 Y625 t0
+# Control Point No 227: 1.657641993759952
+c n4 N1 x953 y1354 X1731 Y684 t0
+# Control Point No 228: 2.223732415115097
+c n1 N4 x1774 y222 X547 Y1212 t0
+# Control Point No 229: 8.489023191782417
+c n1 N4 x1577 y121 X391 Y1330 t0
+# Control Point No 230: 8.355327820789823
+c n1 N4 x1531 y107 X354 Y1362 t0
+# Control Point No 231: 9.164967260336324
+c n1 N4 x1548 y36 X304 Y1304 t0
+# Control Point No 232: 11.36239790610368
+c n4 N1 x1406 y1272 X1723 Y1175 t0
+# Control Point No 233: 2.955879242027375
+c n4 N1 x1264 y1380 X1668 Y1000 t0
+# Control Point No 234: 5.329096418192807
+c n4 N1 x1378 y1273 X1735 Y1147 t0
+# Control Point No 235: 3.848248483201399
+c n4 N1 x1406 y1145 X1856 Y1227 t0
+# Control Point No 236: 2.95298678893966
+c n4 N1 x1527 y1248 X1687 Y1305 t0
+# Control Point No 237: 3.592061974405678
+c n4 N1 x1353 y1195 X1827 Y1148 t0
+# Control Point No 238: 3.2746189518012
+c n4 N1 x1263 y1259 X1791 Y1029 t0
+# Control Point No 239: 3.229934510981945
+c n4 N1 x1409 y1223 X1772 Y1198 t0
+# Control Point No 240: 3.32662984922662
+c n4 N1 x1232 y1384 X1670 Y968 t0
+# Control Point No 241: 3.088732455348769
+c n4 N1 x1513 y1214 X1727 Y1307 t0
+# Control Point No 242: 3.394695087796049
+c n4 N1 x1499 y1096 X1854 Y1353 t0
+# Control Point No 243: 3.407738761237398
+c n4 N1 x1261 y1324 X1723 Y1011 t0
+# Control Point No 244: 3.025190811043249
+c n4 N1 x1352 y1163 X1863 Y1159 t0
+# Control Point No 245: 3.505584640366206
+c n4 N1 x1156 y1386 X1683 Y892 t0
+# Control Point No 246: 2.394776498215575
+c n4 N1 x1127 y1296 X1782 Y874 t0
+# Control Point No 247: 2.096088601316897
+c n4 N1 x1251 y1215 X1842 Y1028 t0
+# Control Point No 248: 1.809569383448492
+c n4 N1 x1053 y1288 X1800 Y794 t0
+# Control Point No 249: 2.306494089673085
+c n4 N1 x1199 y1191 X1885 Y975 t0
+# Control Point No 250: 2.061012623096194
+c n4 N1 x1058 y1343 X1740 Y795 t0
+# Control Point No 251: 2.411807064948619
+c n4 N1 x1094 y1396 X1681 Y828 t0
+# Control Point No 252: 1.91647201395401
+c n5 N1 x1737 y1169 X1409 Y1239 t0
+# Control Point No 253: 4.105423822699741
+c n5 N1 x1586 y1268 X1552 Y1329 t0
+# Control Point No 254: 5.982629953583487
+c n5 N1 x1530 y1223 X1535 Y1402 t0
+# Control Point No 255: 5.594340702081841
+c n5 N1 x1697 y1207 X1455 Y1258 t0
+# Control Point No 256: 3.858169665168979
+c n5 N1 x1888 y983 X1218 Y1162 t0
+# Control Point No 257: 3.805272891127414
+c n5 N1 x1715 y1124 X1377 Y1273 t0
+# Control Point No 258: 3.724992542057759
+c n5 N1 x1620 y1105 X1389 Y1366 t0
+# Control Point No 259: 4.338187607235696
+c n5 N1 x1813 y611 X902 Y1246 t0
+# Control Point No 260: 5.854058782155016
+c n5 N1 x1756 y504 X802 Y1282 t0
+# Control Point No 261: 4.446010820909055
+c n5 N1 x1686 y975 X1249 Y1342 t0
+# Control Point No 262: 4.42486240522573
+c n1 N5 x268 y1324 X1474 Y13 t0
+# Control Point No 263: 7.546611798549087
+c n1 N5 x318 y1419 X1430 Y99 t0
+# Control Point No 264: 6.644328190454798
+c n1 N5 x771 y1157 X1888 Y448 t0
+# Control Point No 265: 11.07915311197911
+c n1 N5 x799 y1251 X1789 Y496 t0
+# Control Point No 266: 6.064609010653421
+c n1 N5 x1173 y1369 X1674 Y894 t0
+# Control Point No 267: 4.319078746322128
+c n6 N1 x47 y188 X571 Y312 t0
+# Control Point No 268: 6.290014210573751
+c n6 N1 x91 y277 X628 Y247 t0
+# Control Point No 269: 2.853909968981214
+c n6 N1 x285 y189 X493 Y114 t0
+# Control Point No 270: 3.050042000836683
+c n6 N1 x212 y169 X512 Y169 t0
+# Control Point No 271: 16.54646887787005
+c n6 N1 x280 y132 X439 Y151 t0
+# Control Point No 272: 12.47253542834159
+c n6 N1 x334 y54 X357 Y136 t0
+# Control Point No 273: 5.434428002291411
+c n6 N1 x325 y181 X474 Y80 t0
+# Control Point No 274: 3.347446298004809
+c n6 N1 x136 y584 X886 Y145 t0
+# Control Point No 275: 3.658148481257896
+c n6 N1 x238 y406 X701 Y77 t0
+# Control Point No 276: 6.893375255219898
+c n6 N1 x288 y88 X409 Y158 t0
+# Control Point No 277: 1.356484792069054
+c n6 N1 x37 y767 X1046 Y225 t0
+# Control Point No 278: 5.074870912810189
+c n6 N1 x99 y893 X1157 Y191 t0
+# Control Point No 279: 2.146031591242525
+c n6 N1 x198 y688 X979 Y83 t0
+# Control Point No 280: 3.142397454698636
+c n6 N1 x135 y723 X1009 Y155 t0
+# Control Point No 281: 13.13376094960284
+c n6 N1 x199 y79 X428 Y228 t0
+# Control Point No 282: 12.90093763396157
+c n6 N1 x84 y86 X480 Y307 t0
+# Control Point No 283: 11.30526742497464
+c n6 N1 x54 y388 X722 Y222 t0
+# Control Point No 284: 24.11614284010114
+c n6 N1 x217 y1005 X1275 Y116 t0
+# Control Point No 285: 9.688267196446155
+c n6 N1 x102 y1233 X1435 Y280 t0
+# Control Point No 286: 1.577354382755058
+c n1 N6 x1533 y103 X330 Y1251 t0
+# Control Point No 287: 8.406317770573065
+c n1 N6 x1361 y75 X287 Y1080 t0
+# Control Point No 288: 11.97474095018234
+c n1 N6 x1442 y34 X354 Y1142 t0
+# Control Point No 289: 11.04382465133604
+c n1 N6 x1403 y55 X320 Y1112 t0
+# Control Point No 290: 11.03547523065165
+c n1 N6 x1619 y144 X334 Y1345 t0
+# Control Point No 291: 2.8437141056201
+c n1 N6 x1671 y52 X446 Y1341 t0
+# Control Point No 292: 10.70059526203549
+c n6 N1 x60 y799 X1073 Y210 t0
+# Control Point No 293: 2.368268100967526
+c n6 N1 x196 y809 X1090 Y92 t0
+# Control Point No 294: 1.414806692734613
+c n6 N1 x129 y776 X1056 Y146 t0
+# Control Point No 295: 3.703469570140413
+c n6 N1 x133 y902 X1173 Y168 t0
+# Control Point No 296: 8.64146606206077
+c n2 N3 x1811 y1274 X485 Y297 t0
+# Control Point No 297: 1.422887321414718
+c n2 N3 x1729 y1143 X561 Y180 t0
+# Control Point No 298: 1.342465404338664
+c n2 N3 x1652 y1095 X580 Y97 t0
+# Control Point No 299: 1.105773739377468
+c n2 N3 x1652 y1299 X405 Y182 t0
+# Control Point No 300: 0.8478198124753547
+c n2 N3 x1754 y1336 X417 Y281 t0
+# Control Point No 301: 2.001036639365723
+c n2 N3 x1704 y1318 X412 Y233 t0
+# Control Point No 302: 0.609728914850872
+c n2 N3 x1823 y1212 X536 Y281 t0
+# Control Point No 303: 0.3220215527226246
+c n2 N3 x1737 y1206 X512 Y210 t0
+# Control Point No 304: 1.130064457142807
+c n2 N3 x1537 y1369 X292 Y127 t0
+# Control Point No 305: 1.41319038722147
+c n2 N3 x1582 y1371 X313 Y164 t0
+# Control Point No 306: 0.1582156837306285
+c n2 N3 x1657 y1334 X378 Y204 t0
+# Control Point No 307: 0.5437683930562179
+c n2 N3 x1848 y1399 X407 Y375 t0
+# Control Point No 308: 4.72926820446481
+c n2 N3 x1686 y1184 X513 Y159 t0
+# Control Point No 309: 0.7146207366749362
+c n2 N3 x1620 y1253 X429 Y133 t0
+# Control Point No 310: 0.4310623348551623
+c n2 N4 x343 y119 X387 Y136 t0
+# Control Point No 311: 2.160012103729623
+c n2 N4 x412 y99 X337 Y86 t0
+# Control Point No 312: 0.3736561687569776
+c n2 N4 x480 y79 X283 Y38 t0
+# Control Point No 313: 0.9360926212238452
+c n2 N4 x434 y139 X363 Y43 t0
+# Control Point No 314: 1.052074964454433
+c n2 N4 x442 y87 X310 Y66 t0
+# Control Point No 315: 0.697119070854566
+c n5 N2 x287 y389 X1262 Y1336 t0
+# Control Point No 316: 1.514184322998158
+c n5 N2 x196 y167 X1430 Y1179 t0
+# Control Point No 317: 1.311649279783175
+c n5 N2 x187 y284 X1331 Y1214 t0
+# Control Point No 318: 1.480892683585366
+c n5 N2 x262 y415 X1231 Y1319 t0
+# Control Point No 319: 1.265119181571043
+c n5 N2 x203 y385 X1247 Y1257 t0
+# Control Point No 320: 1.398838497880895
+c n5 N2 x308 y134 X1500 Y1258 t0
+# Control Point No 321: 0.5510293227968846
+c n5 N2 x75 y225 X1349 Y1104 t0
+# Control Point No 322: 2.398744936743141
+c n5 N2 x139 y417 X1206 Y1207 t0
+# Control Point No 323: 0.4657090704241552
+c n5 N2 x255 y238 X1391 Y1256 t0
+# Control Point No 324: 0.5575027768448622
+c n5 N2 x125 y469 X1159 Y1206 t0
+# Control Point No 325: 1.343833343927526
+c n5 N2 x101 y360 X1247 Y1162 t0
+# Control Point No 326: 0.9010742581865905
+c n5 N2 x60 y764 X901 Y1166 t0
+# Control Point No 327: 1.646438959347943
+c n5 N2 x240 y126 X1480 Y1198 t0
+# Control Point No 328: 1.3158412680674
+c n5 N2 x60 y699 X957 Y1169 t0
+# Control Point No 329: 1.648226762215502
+c n5 N2 x220 y43 X1537 Y1143 t0
+# Control Point No 330: 0.6305015276638372
+c n5 N2 x237 y222 X1399 Y1235 t0
+# Control Point No 331: 1.246427513722063
+c n5 N2 x96 y177 X1391 Y1104 t0
+# Control Point No 332: 1.979053511072018
+c n5 N2 x73 y122 X1424 Y1065 t0
+# Control Point No 333: 0.3603879000062558
+c n5 N2 x185 y80 X1496 Y1134 t0
+# Control Point No 334: 1.87687362805626
+c n5 N2 x111 y76 X1470 Y1076 t0
+# Control Point No 335: 1.318900779861423
+c n6 N2 x1525 y1191 X444 Y35 t0
+# Control Point No 336: 0.84572131216566
+c n6 N2 x1505 y1264 X367 Y54 t0
+# Control Point No 337: 1.018989472661844
+c n6 N2 x1639 y1278 X417 Y177 t0
+# Control Point No 338: 0.977402060601275
+c n6 N2 x1718 y1285 X443 Y244 t0
+# Control Point No 339: 1.358581893426245
+c n6 N2 x1619 y1361 X342 Y204 t0
+# Control Point No 340: 0.799204247322707
+c n6 N2 x1593 y1332 X352 Y166 t0
+# Control Point No 341: 1.818668445682369
+c n6 N2 x1613 y1247 X432 Y139 t0
+# Control Point No 342: 2.120512759006751
+c n6 N2 x1562 y1247 X409 Y96 t0
+# Control Point No 343: 1.097369420649402
+c n6 N2 x1591 y1105 X550 Y59 t0
+# Control Point No 344: 1.257167396772383
+c n6 N2 x1580 y1174 X481 Y77 t0
+# Control Point No 345: 2.389946740989799
+c n6 N2 x1604 y1045 X610 Y49 t0
+# Control Point No 346: 2.422881087545803
+c n2 N6 x421 y192 X1656 Y1281 t0
+# Control Point No 347: 1.80961460322187
+c n2 N6 x276 y35 X1441 Y1327 t0
+# Control Point No 348: 0.9335568251949041
+c n2 N6 x348 y220 X1639 Y1364 t0
+# Control Point No 349: 2.032144720180327
+c n2 N6 x336 y118 X1542 Y1320 t0
+# Control Point No 350: 1.061462467350821
+c n2 N6 x295 y89 X1494 Y1340 t0
+# Control Point No 351: 0.4304082142896827
+c n3 N5 x108 y593 X877 Y175 t0
+# Control Point No 352: 6.914599089000223
+c n3 N5 x73 y703 X972 Y202 t0
+# Control Point No 353: 5.185699174593474
+c n3 N5 x176 y709 X975 Y115 t0
+# Control Point No 354: 1.041393790273828
+c n3 N5 x48 y914 X1144 Y239 t0
+# Control Point No 355: 4.897891426196744
+c n3 N5 x38 y77 X479 Y365 t0
+# Control Point No 356: 3.141224787318898
+c n3 N5 x139 y764 X1022 Y150 t0
+# Control Point No 357: 1.654396426336864
+c n3 N5 x173 y740 X1003 Y119 t0
+# Control Point No 358: 1.424812032003016
+c n3 N5 x113 y324 X643 Y218 t0
+# Control Point No 359: 5.877815760833576
+c n3 N5 x174 y298 X606 Y175 t0
+# Control Point No 360: 5.787548158132039
+c n3 N5 x245 y242 X539 Y140 t0
+# Control Point No 361: 0.8991425845947938
+c n3 N5 x114 y143 X501 Y284 t0
+# Control Point No 362: 2.151980094093823
+c n3 N5 x388 y61 X325 Y101 t0
+# Control Point No 363: 0.7295752750039343
+c n3 N5 x322 y77 X369 Y148 t0
+# Control Point No 364: 1.174124887416327
+c n3 N5 x449 y51 X284 Y55 t0
+# Control Point No 365: 1.467204819276986
+c n3 N5 x308 y45 X350 Y176 t0
+# Control Point No 366: 1.014162955306164
+c n3 N5 x163 y87 X442 Y269 t0
+# Control Point No 367: 1.81820899776148
+c n3 N5 x238 y62 X394 Y222 t0
+# Control Point No 368: 0.7337607725864853
+c n3 N5 x294 y233 X515 Y101 t0
+# Control Point No 369: 1.211835253886608
+c n3 N5 x298 y379 X649 Y48 t0
+# Control Point No 370: 3.027847458368162
+c n3 N5 x379 y205 X458 Y35 t0
+# Control Point No 371: 0.8814471984716388
+c n3 N5 x257 y979 X1236 Y73 t0
+# Control Point No 372: 2.433663702940207
+c n3 N5 x397 y1185 X1473 Y11 t0
+# Control Point No 373: 5.485137406623396
+c n3 N5 x297 y1179 X1431 Y101 t0
+# Control Point No 374: 3.356987928833823
+c n3 N5 x100 y1354 X1499 Y326 t0
+# Control Point No 375: 8.305547847087079
+c n3 N5 x81 y1007 X1225 Y228 t0
+# Control Point No 376: 6.168358113170031
+c n3 N6 x1709 y1069 X614 Y132 t0
+# Control Point No 377: 3.811419968833489
+c n3 N6 x1783 y872 X801 Y153 t0
+# Control Point No 378: 3.114586770680406
+c n3 N6 x1649 y1030 X635 Y67 t0
+# Control Point No 379: 6.492709748808722
+c n3 N6 x1710 y913 X755 Y94 t0
+# Control Point No 380: 3.40252782764365
+c n3 N6 x1741 y998 X685 Y141 t0
+# Control Point No 381: 3.727890322510932
+c n3 N6 x1531 y1312 X329 Y55 t0
+# Control Point No 382: 21.95558408372113
+c n3 N6 x1659 y1109 X565 Y101 t0
+# Control Point No 383: 5.652963349129862
+c n3 N6 x1574 y1396 X281 Y136 t0
+# Control Point No 384: 27.10805369704778
+c n3 N6 x1674 y960 X705 Y71 t0
+# Control Point No 385: 4.658320896381138
+c n3 N6 x1620 y1054 X604 Y47 t0
+# Control Point No 386: 6.673330494542595
+c n3 N6 x1726 y1129 X567 Y167 t0
+# Control Point No 387: 4.368819720792041
+c n3 N6 x1731 y839 X825 Y103 t0
+# Control Point No 388: 4.86772226069693
+c n3 N6 x1812 y777 X887 Y170 t0
+# Control Point No 389: 4.585917194281201
+c n3 N6 x1657 y887 X771 Y40 t0
+# Control Point No 390: 5.301413055320983
+c n3 N6 x1804 y1013 X684 Y198 t0
+# Control Point No 391: 1.504055061483511
+c n3 N6 x1791 y811 X856 Y154 t0
+# Control Point No 392: 4.096475599622089
+c n3 N6 x1689 y843 X816 Y62 t0
+# Control Point No 393: 4.333278825102454
+c n3 N6 x1838 y729 X930 Y190 t0
+# Control Point No 394: 4.387674006098415
+c n5 N4 x1530 y1225 X1679 Y1319 t0
+# Control Point No 395: 5.572648964552567
+c n5 N4 x813 y1203 X1835 Y535 t0
+# Control Point No 396: 13.95634735295968
+c n5 N4 x1413 y1232 X1729 Y1200 t0
+# Control Point No 397: 4.534803632659626
+c n6 N4 x606 y1152 X124 Y1125 t0
+# Control Point No 398: 3.074860766192344
+c n6 N4 x501 y1174 X195 Y1229 t0
+# Control Point No 399: 4.835522093942968
+c n6 N4 x524 y1115 X122 Y1231 t0
+# Control Point No 400: 5.684110876335563
+c n6 N4 x434 y1086 X144 Y1341 t0
+# Control Point No 401: 9.514398147679595
+c n6 N4 x563 y1185 X177 Y1160 t0
+# Control Point No 402: 3.135740341986485
+c n6 N4 x486 y1124 X152 Y1267 t0
+# Control Point No 403: 6.443036246411108
+c n6 N4 x540 y1117 X117 Y1211 t0
+# Control Point No 404: 5.749870902817802
+c n6 N4 x403 y1053 X130 Y1392 t0
+# Control Point No 405: 10.96538592738763
+c n4 N6 x303 y1304 X397 Y1235 t0
+# Control Point No 406: 1.501418746809888
+c n4 N6 x395 y1332 X330 Y1301 t0
+# Control Point No 407: 2.743018417199289
+c n4 N6 x353 y1360 X328 Y1249 t0
+# Control Point No 408: 1.63881360382189
+c n4 N6 x88 y885 X810 Y1173 t0
+# Control Point No 409: 2.110908727113992
+c n4 N6 x121 y833 X852 Y1208 t0
+# Control Point No 410: 2.055124507782085
+c n4 N6 x64 y797 X887 Y1161 t0
+# Control Point No 411: 1.708531189889992
+c n4 N6 x153 y1020 X688 Y1207 t0
+# Control Point No 412: 1.836304246277449
+c n4 N6 x244 y992 X692 Y1294 t0
+# Control Point No 413: 2.037697570090869
+c n4 N6 x244 y131 X1490 Y1190 t0
+# Control Point No 414: 0.7029152114224874
+c n4 N6 x273 y86 X1538 Y1193 t0
+# Control Point No 415: 0.9351123624434947
+c n4 N6 x296 y184 X1465 Y1258 t0
+# Control Point No 416: 0.7333919323428545
+c n4 N6 x328 y133 X1522 Y1261 t0
+# Control Point No 417: 1.143410352283368
+c n4 N6 x352 y235 X1441 Y1330 t0
+# Control Point No 418: 1.632669860869488
+c n4 N6 x217 y34 X1554 Y1124 t0
+# Control Point No 419: 1.281461706108517
+c n4 N6 x418 y29 X1655 Y1281 t0
+# Control Point No 420: 3.959673001516407
+c n4 N6 x383 y188 X1497 Y1337 t0
+# Control Point No 421: 2.18874833925231
+c n4 N6 x185 y82 X1505 Y1121 t0
+# Control Point No 422: 1.787126390393371
+c n4 N6 x176 y215 X1398 Y1168 t0
+# Control Point No 423: 0.7853050393549138
+c n4 N6 x432 y196 X1511 Y1391 t0
+# Control Point No 424: 5.849579677119246
+c n4 N6 x280 y205 X1441 Y1253 t0
+# Control Point No 425: 0.7902320859917217
+c n4 N6 x122 y168 X1417 Y1109 t0
+# Control Point No 426: 1.809062336025325
+c n4 N6 x473 y82 X1638 Y1362 t0
+# Control Point No 427: 4.261438019362102
+c n4 N6 x76 y123 X1437 Y1055 t0
+# Control Point No 428: 2.233784918986872
+c n4 N6 x224 y156 X1461 Y1185 t0
+# Control Point No 429: 1.183146992643313
+c n4 N6 x170 y106 X1481 Y1120 t0
+# Control Point No 430: 1.672881881210008
+c n4 N6 x100 y83 X1472 Y1058 t0
+# Control Point No 431: 2.606176585638212
+c n4 N6 x200 y236 X1388 Y1197 t0
+# Control Point No 432: 1.333216159236241
+c n4 N6 x393 y143 X1543 Y1324 t0
+# Control Point No 433: 2.967889565455136
+c n1 N1 x509 y10 X1203 Y754 t1
+# Control Point No 434: -1
+c n2 N2 x1443 y1402 X1567 Y1045 t1
+# Control Point No 435: -1
+c n3 N3 x851 y476 X320 Y844 t1
+# Control Point No 436: -1
+c n6 N4 x713 y1239 X182 Y983 t0
+# Control Point No 437: 1.144530264693463
+c n6 N4 x684 y1201 X149 Y1026 t0
+# Control Point No 438: 2.375410649772052
+c n5 N2 x99 y1090 X625 Y1143 t0
+# Control Point No 439: 4.775260241120112
+c n5 N2 x296 y1287 X398 Y1240 t0
+# Control Point No 440: 2.639471983102197
+c n5 N2 x321 y1059 X593 Y1356 t0
+# Control Point No 441: 3.904882687666619
+c n5 N2 x311 y1125 X535 Y1324 t0
+# Control Point No 442: 4.356847152352985
+c n5 N2 x409 y238 X1445 Y1399 t0
+# Control Point No 443: 0.4994756854142712
+c n5 N2 x291 y1314 X378 Y1223 t0
+# Control Point No 444: 2.779324774636535
+c n5 N3 x318 y144 X355 Y33 t0
+# Control Point No 445: 0.9023438752204593
+c n5 N3 x1174 y215 X84 Y944 t0
+# Control Point No 446: 4.311690653809683
+c n1 N6 x655 y100 X203 Y350 t0
+# Control Point No 447: 32.45237220868976
+c n1 N6 x558 y52 X289 Y267 t0
+# Control Point No 448: 28.81083803876711
+c n1 N6 x764 y32 X264 Y474 t0
+# Control Point No 449: 10.57280316830995
+c n1 N6 x668 y168 X131 Y343 t0
+# Control Point No 450: 29.12453340796198
+c n1 N6 x1033 y213 X44 Y753 t0
+# Control Point No 451: 11.33749242646202
+
+# optimizer:
+v v d1 e1 y1 r1 p1 d2 e2 y2 r2 p2 d3 e3 y3 r3 p3 d4 e4 y4 r4 p4 d5 e5 y5 r5 p5 d6 e6 r6

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/PTGuiProjects/RicohThetaS_1080.pts Added

@@ -0,0 +1,162 @@
+# ptGui project file
+
+#-encoding utf8
+#-pathseparator \
+#-fileversion 49
+#-previewwidth 1920
+#-previewheight 960
+#-vfov 180
+#-resolution 300
+#-fixaspect 1
+#-outputfile 
+#-ccdcrop 1
+#-hasbeenoptimized 1
+#-hvcpmode 1
+#-jpegparameters 95 0
+#-tiffparameters 8bit packbits alpha_assoc
+#-psdparameters 8bit packbits layered
+#-qtvrparameters 800 600 1 1000 70 0 0 -180 180 0 -90 90 90 10 120 1
+#-honorexiforientation 1
+#-exrparameters noalpha
+#-hdroutputhdrblended
+#-hdroutputtonemapped
+#-hdrfileformat hdr
+#-hdrmethod fuse
+#-hdrpsdparameters float none layered
+#-tonemapv2settings PTGTM 1 0.5 20 20 0 0 2 1 0.15 0
+#-fusesettings 0.5 0 0.2 0 0
+#-cameracurve 3.441228 -0.551975 0.294423 -0.095632 0.072139
+#-vignettingparams 
+#-wbexposure 0 0 0
+#-pmoptexposuremode auto
+#-pmoptvignettingmode enabled
+#-pmoptwbmode disabled
+#-pmoptflaremode disabled
+#-pmoptcameracurvemode auto
+#-exposurecorrection 0
+#-tonemapldrpanorama 0
+#-blendweight 100 100
+#-optviewpoint 00
+#-useexif0
+#-batchbuilder_useexif 0
+#-stitcher ptgui
+#-blender ptgui
+#-blenderfeather -0.6
+#-optimizer ptgui
+#-interpolator default
+#-autocpdone
+#-simpleoptimizer
+#-imgrotate44
+#-cpinactive
+#-imginactive
+#-linktoprevious
+#-previewinactive
+#-outputcrop 0 1 0 1
+#-location default
+#-viewingdirection default
+#-alignsettings_generatecp 1
+#-alignsettings_optimize 1
+#-alignsettings_optimizeprealign 1
+#-alignsettings_straighten 1
+#-alignsettings_fit 1
+#-alignsettings_chooseprojection 1
+#-alignsettings_setoptimumsize 1
+#-alignsettings_limitsize 500
+#-alignsettings_optimizeexposure 0
+#-hdrsettings_defaultlinkmode nolink
+#-hdrsettings_donotask 0
+#-batchsettings_align 0
+#-batchsettings_stitch 1
+#-batchsettings_stitchonlyifcontrolpoints 1
+#-defaultprojectfilenamemode firstsourceimage
+#-defaultprojectfilename_custom " Panorama"
+#-defaultprojectfoldermode sourcefolder
+#-defaultprojectfolder_custom ""
+#-defaultpanoramafilenamemode asproject
+#-defaultpanoramafilename_custom ""
+#-defaultpanoramafoldermode projectfolder
+#-defaultpanoramafolder_custom ""
+#-userelativesourceimagepaths 1
+#-optimizeraskreinitialize 1
+#-applytemplate_lens 1
+#-applytemplate_imageparams 1
+#-applytemplate_crop 1
+#-applytemplate_mask 1
+#-applytemplate_panoramasettings 1
+#-applytemplate_projectsettings 1
+#-applytemplate_optimizer 1
+#-globalcrop 1 -0.21875 0.01822916666666667 0.78125 0.5807291666666666 0 0 0.5
+#-theoreticalhfov -1
+#-rect_compression_x 0
+#-rect_compression_y 0
+#-cylindrical_compression_y 0
+#-transverse_cylindrical_compression_x 0
+#-vedutismo_compression_x 1
+#-transverse_vedutismo_compression_y 1
+#-stereographic_compression 1
+#-rectifisheye_compression 1
+# Panorama settings:
+p w1492 h746 f2 v360 u0 n"JPEG g0 q95"
+m g0 i0
+
+# input images:
+#-dummyimage
+# The following line contains a 'dummy image' containing some global parameters for the project
+o w1 h1 y0 r0 p0 v231.6100543763937 a-0.6657980213195243 b0.2516573112933457 c0.5185795253079601 f2 d-0.2910228734448704 e0.9982250922122882 g0 t0
+#-imgfile 1920 1080 "R0010047.BMP"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13152733467194941
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+#-imgcrop 1 0 0 0.5 0.5625 -0.25 -0.03125 0.25
+o f2 y-167.0094640824823 r107.2679464110023 p12.36413212282914 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C0,960,0,960
+#-imgfile 1920 1080 "R0010047_C.BMP"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13152733467194941
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+#-imgcrop 1 0.5 0 1 0.5807291666666666 0.25 -0.03125 0.25
+o f2 y14.01682143747579 r-107.5294681223729 p-12.56879732784371 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C960,1920,0,960
+
+# Control points:
+c n1 N2 x329 y887 X1577 Y865 t0
+# Control Point No 0: 5.708116231803761
+c n1 N2 x243 y835 X1669 Y827 t0
+# Control Point No 1: 5.554480199228536
+c n1 N2 x183 y796 X1721 Y785 t0
+# Control Point No 2: 3.000789030140251
+c n1 N2 x152 y769 X1758 Y756 t0
+# Control Point No 3: 11.1103612051886
+c n1 N2 x657 y890 X1286 Y843 t0
+# Control Point No 4: 4.129244544970878
+c n1 N2 x606 y117 X1289 Y49 t0
+# Control Point No 5: 1.149007455893179
+c n1 N2 x349 y67 X1565 Y80 t0
+# Control Point No 6: 1.060699414485669
+c n1 N2 x267 y106 X1648 Y116 t0
+# Control Point No 7: 2.832528100148319
+c n1 N2 x622 y72 X1300 Y83 t0
+# Control Point No 8: 2.706232616352479
+c n1 N2 x551 y53 X1369 Y66 t0
+# Control Point No 9: 2.440224281440732
+c n1 N2 x576 y59 X1345 Y72 t0
+# Control Point No 10: 0.8427733073948057
+c n1 N2 x412 y59 X1506 Y59 t0
+# Control Point No 11: 1.150370590331467
+c n1 N2 x250 y102 X1649 Y132 t0
+# Control Point No 12: 2.094434706525588
+c n1 N2 x496 y59 X1422 Y49 t0
+# Control Point No 13: 1.463412116041749
+c n1 N2 x386 y50 X1527 Y80 t0
+# Control Point No 14: 0.9584420212136958
+c n1 N2 x207 y156 X1714 Y152 t0
+# Control Point No 15: 1.317285151501021
+c n1 N2 x429 y877 X1495 Y921 t0
+# Control Point No 16: 1.119683060316364
+c n1 N2 x536 y919 X1387 Y878 t0
+# Control Point No 17: 0.7895454716856033
+c n1 N2 x593 y75 X1326 Y67 t0
+# Control Point No 18: 3.108603471866061
+c n1 N2 x269 y94 X1636 Y121 t0
+# Control Point No 19: 1.890518758501507
+
+# optimizer:
+v v a b c d e y2 r2 p2

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/PTGuiProjects/RicohThetaS_720.pts Added

@@ -0,0 +1,162 @@
+# ptGui project file
+
+#-encoding utf8
+#-pathseparator \
+#-fileversion 49
+#-previewwidth 1920
+#-previewheight 960
+#-vfov 180
+#-resolution 300
+#-fixaspect 1
+#-outputfile 
+#-ccdcrop 1
+#-hasbeenoptimized 1
+#-hvcpmode 1
+#-jpegparameters 95 0
+#-tiffparameters 8bit packbits alpha_assoc
+#-psdparameters 8bit packbits layered
+#-qtvrparameters 800 600 1 1000 70 0 0 -180 180 0 -90 90 90 10 120 1
+#-honorexiforientation 1
+#-exrparameters noalpha
+#-hdroutputhdrblended
+#-hdroutputtonemapped
+#-hdrfileformat hdr
+#-hdrmethod fuse
+#-hdrpsdparameters float none layered
+#-tonemapv2settings PTGTM 1 0.5 20 20 0 0 2 1 0.15 0
+#-fusesettings 0.5 0 0.2 0 0
+#-cameracurve 3.441228 -0.551975 0.294423 -0.095632 0.072139
+#-vignettingparams 
+#-wbexposure 0 0 0
+#-pmoptexposuremode auto
+#-pmoptvignettingmode enabled
+#-pmoptwbmode disabled
+#-pmoptflaremode disabled
+#-pmoptcameracurvemode auto
+#-exposurecorrection 0
+#-tonemapldrpanorama 0
+#-blendweight 100 100
+#-optviewpoint 00
+#-useexif0
+#-batchbuilder_useexif 0
+#-stitcher ptgui
+#-blender ptgui
+#-blenderfeather -0.6
+#-optimizer ptgui
+#-interpolator default
+#-autocpdone
+#-simpleoptimizer
+#-imgrotate44
+#-cpinactive
+#-imginactive
+#-linktoprevious
+#-previewinactive
+#-outputcrop 0 1 0 1
+#-location default
+#-viewingdirection default
+#-alignsettings_generatecp 1
+#-alignsettings_optimize 1
+#-alignsettings_optimizeprealign 1
+#-alignsettings_straighten 1
+#-alignsettings_fit 1
+#-alignsettings_chooseprojection 1
+#-alignsettings_setoptimumsize 1
+#-alignsettings_limitsize 500
+#-alignsettings_optimizeexposure 0
+#-hdrsettings_defaultlinkmode nolink
+#-hdrsettings_donotask 0
+#-batchsettings_align 0
+#-batchsettings_stitch 1
+#-batchsettings_stitchonlyifcontrolpoints 1
+#-defaultprojectfilenamemode firstsourceimage
+#-defaultprojectfilename_custom " Panorama"
+#-defaultprojectfoldermode sourcefolder
+#-defaultprojectfolder_custom ""
+#-defaultpanoramafilenamemode asproject
+#-defaultpanoramafilename_custom ""
+#-defaultpanoramafoldermode projectfolder
+#-defaultpanoramafolder_custom ""
+#-userelativesourceimagepaths 1
+#-optimizeraskreinitialize 1
+#-applytemplate_lens 1
+#-applytemplate_imageparams 1
+#-applytemplate_crop 1
+#-applytemplate_mask 1
+#-applytemplate_panoramasettings 1
+#-applytemplate_projectsettings 1
+#-applytemplate_optimizer 1
+#-globalcrop 1 -0.21875 0.01822916666666667 0.78125 0.5807291666666666 0 0 0.5
+#-theoreticalhfov -1
+#-rect_compression_x 0
+#-rect_compression_y 0
+#-cylindrical_compression_y 0
+#-transverse_cylindrical_compression_x 0
+#-vedutismo_compression_x 1
+#-transverse_vedutismo_compression_y 1
+#-stereographic_compression 1
+#-rectifisheye_compression 1
+# Panorama settings:
+p w1492 h746 f2 v360 u0 n"JPEG g0 q95"
+m g0 i0
+
+# input images:
+#-dummyimage
+# The following line contains a 'dummy image' containing some global parameters for the project
+o w1 h1 y0 r0 p0 v231.6100543763937 a-0.6657980213195243 b0.2516573112933457 c0.5185795253079601 f2 d-0.2910228734448704 e0.9982250922122882 g0 t0
+#-imgfile 1920 1080 "R0010047.BMP"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13152733467194941
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+#-imgcrop 1 0 0 0.5 0.5625 -0.25 -0.03125 0.25
+o f2 y-167.0094640824823 r107.2679464110023 p12.36413212282914 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C0,640,0,640
+#-imgfile 1920 1080 "R0010047_C.BMP"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13152733467194941
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+#-imgcrop 1 0.5 0 1 0.5807291666666666 0.25 -0.03125 0.25
+o f2 y14.01682143747579 r-107.5294681223729 p-12.56879732784371 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C640,1280,0,640
+
+# Control points:
+c n1 N2 x329 y887 X1577 Y865 t0
+# Control Point No 0: 5.708116231803761
+c n1 N2 x243 y835 X1669 Y827 t0
+# Control Point No 1: 5.554480199228536
+c n1 N2 x183 y796 X1721 Y785 t0
+# Control Point No 2: 3.000789030140251
+c n1 N2 x152 y769 X1758 Y756 t0
+# Control Point No 3: 11.1103612051886
+c n1 N2 x657 y890 X1286 Y843 t0
+# Control Point No 4: 4.129244544970878
+c n1 N2 x606 y117 X1289 Y49 t0
+# Control Point No 5: 1.149007455893179
+c n1 N2 x349 y67 X1565 Y80 t0
+# Control Point No 6: 1.060699414485669
+c n1 N2 x267 y106 X1648 Y116 t0
+# Control Point No 7: 2.832528100148319
+c n1 N2 x622 y72 X1300 Y83 t0
+# Control Point No 8: 2.706232616352479
+c n1 N2 x551 y53 X1369 Y66 t0
+# Control Point No 9: 2.440224281440732
+c n1 N2 x576 y59 X1345 Y72 t0
+# Control Point No 10: 0.8427733073948057
+c n1 N2 x412 y59 X1506 Y59 t0
+# Control Point No 11: 1.150370590331467
+c n1 N2 x250 y102 X1649 Y132 t0
+# Control Point No 12: 2.094434706525588
+c n1 N2 x496 y59 X1422 Y49 t0
+# Control Point No 13: 1.463412116041749
+c n1 N2 x386 y50 X1527 Y80 t0
+# Control Point No 14: 0.9584420212136958
+c n1 N2 x207 y156 X1714 Y152 t0
+# Control Point No 15: 1.317285151501021
+c n1 N2 x429 y877 X1495 Y921 t0
+# Control Point No 16: 1.119683060316364
+c n1 N2 x536 y919 X1387 Y878 t0
+# Control Point No 17: 0.7895454716856033
+c n1 N2 x593 y75 X1326 Y67 t0
+# Control Point No 18: 3.108603471866061
+c n1 N2 x269 y94 X1636 Y121 t0
+# Control Point No 19: 1.890518758501507
+
+# optimizer:
+v v a b c d e y2 r2 p2

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/PTGuiProjects/RicohThetaV_4k.pts Added

@@ -0,0 +1,152 @@
+# ptGui project file
+
+#-encoding utf8
+#-pathseparator \
+#-fileversion 49
+#-previewwidth 3840
+#-previewheight 1920
+#-vfov 180
+#-resolution 300
+#-fixaspect 1
+#-outputfile 
+#-ccdcrop 1
+#-hasbeenoptimized 0
+#-hvcpmode 1
+#-jpegparameters 95 0
+#-tiffparameters 8bit packbits alpha_assoc
+#-psdparameters 8bit packbits layered
+#-qtvrparameters 800 600 1 1000 70 0 0 -180 180 0 -90 90 90 10 120 1
+#-honorexiforientation 1
+#-exrparameters noalpha
+#-hdroutputhdrblended
+#-hdroutputtonemapped
+#-hdrfileformat hdr
+#-hdrmethod fuse
+#-hdrpsdparameters float none layered
+#-tonemapv2settings PTGTM 1 0.5 20 20 0 0 2 1 0.15 0
+#-fusesettings 0.5 0 0.2 0 0
+#-cameracurve 3.441228 -0.551975 0.294423 -0.095632 0.072139
+#-vignettingparams 
+#-wbexposure 0 0 0
+#-pmoptexposuremode auto
+#-pmoptvignettingmode enabled
+#-pmoptwbmode disabled
+#-pmoptflaremode disabled
+#-pmoptcameracurvemode auto
+#-exposurecorrection 0
+#-tonemapldrpanorama 0
+#-blendweight 100 100
+#-optviewpoint 00
+#-useexif0
+#-batchbuilder_useexif 0
+#-stitcher ptgui
+#-blender ptgui
+#-blenderfeather -0.6
+#-optimizer ptgui
+#-interpolator default
+#-autocpdone
+#-simpleoptimizer
+#-imgrotate44
+#-cpinactive
+#-imginactive
+#-linktoprevious
+#-previewinactive
+#-outputcrop 0 1 0 1
+#-location default
+#-viewingdirection default
+#-alignsettings_generatecp 1
+#-alignsettings_optimize 1
+#-alignsettings_optimizeprealign 1
+#-alignsettings_straighten 1
+#-alignsettings_fit 1
+#-alignsettings_chooseprojection 1
+#-alignsettings_setoptimumsize 1
+#-alignsettings_limitsize 500
+#-alignsettings_optimizeexposure 0
+#-hdrsettings_defaultlinkmode nolink
+#-hdrsettings_donotask 0
+#-batchsettings_align 0
+#-batchsettings_stitch 1
+#-batchsettings_stitchonlyifcontrolpoints 1
+#-defaultprojectfilenamemode firstsourceimage
+#-defaultprojectfilename_custom " Panorama"
+#-defaultprojectfoldermode sourcefolder
+#-defaultprojectfolder_custom ""
+#-defaultpanoramafilenamemode asproject
+#-defaultpanoramafilename_custom ""
+#-defaultpanoramafoldermode projectfolder
+#-defaultpanoramafolder_custom ""
+#-userelativesourceimagepaths 1
+#-optimizeraskreinitialize 1
+#-applytemplate_lens 1
+#-applytemplate_imageparams 1
+#-applytemplate_crop 1
+#-applytemplate_mask 1
+#-applytemplate_panoramasettings 1
+#-applytemplate_projectsettings 1
+#-applytemplate_optimizer 1
+#-globalcrop 0 0 0 0 0 -0.25 0 0.25
+#-theoreticalhfov -1
+#-rect_compression_x 0
+#-rect_compression_y 0
+#-cylindrical_compression_y 0
+#-transverse_cylindrical_compression_x 0
+#-vedutismo_compression_x 1
+#-transverse_vedutismo_compression_y 1
+#-stereographic_compression 1
+#-rectifisheye_compression 1
+# Panorama settings:
+p w3584 h1792 f2 v360 u0 n"JPEG g0 q95"
+m g0 i0
+
+# input images:
+#-dummyimage
+# The following line contains a 'dummy image' containing some global parameters for the project
+o w1 h1 y0 r0 p0 v192.6638042449528 a-1.018691326065929 b0.7629918875524311 c1.255686505752206 f2 d2.172495128197531 e-0.9003851709633292 g0 t0
+#-imgfile 3840 1920 "..\..\temp\100RICOH\R0010016 - Copy.BMP"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13154479047350852
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+#-imgcrop 0 0 0 0 0 -0.2572916666666666 -0.0005208333333333333 0.25
+o f2 y177.6704960440042 r89.26834850327607 p-17.00846784085561 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C-28,1892,-2,1918
+#-imgfile 3840 1920 "..\..\temp\100RICOH\R0010016.BMP"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13154479047350852
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+#-imgcrop 0 0 0 0 0 0.2541666666666667 0.005208333333333333 0.25
+o f2 y-0.4655900249024857 r-88.00098442362793 p21.65707743718534 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C1936,3856,20,1940
+
+# Control points:
+c n1 N2 x478 y220 X3380 Y185 t0
+# Control Point No 0: 0.9594726023454667
+c n1 N2 x817 y1890 X3011 Y1811 t0
+# Control Point No 1: 6.977361550009725
+c n1 N2 x809 y1814 X3043 Y1881 t0
+# Control Point No 2: 2.172894434545476
+c n1 N2 x741 y1799 X3117 Y1862 t0
+# Control Point No 3: 5.813021933298105
+c n1 N2 x736 y1754 X3142 Y1886 t0
+# Control Point No 4: 6.00402913280467
+c n1 N2 x804 y1846 X3038 Y1854 t0
+# Control Point No 5: 3.360113780454715
+c n1 N2 x867 y1870 X2971 Y1848 t0
+# Control Point No 6: 3.224820945802795
+c n1 N2 x1583 y1622 X2265 Y1616 t0
+# Control Point No 7: 15.88005544652937
+c n1 N2 x976 y1855 X2865 Y1873 t0
+# Control Point No 8: 0.6407465331813795
+c n1 N2 x989 y1829 X2850 Y1894 t0
+# Control Point No 9: 3.549633484793239
+c n1 N2 x995 y1886 X2848 Y1840 t0
+# Control Point No 10: 4.388595254937433
+c n2 N2 x3382 y185 X475 Y221 t1
+# Control Point No 11: -1
+c n2 N2 x3070 y137 X736 Y38 t1
+# Control Point No 12: -1
+c n2 N2 x3058 y1862 X790 Y1844 t1
+# Control Point No 13: -1
+c n1 N2 x754 y132 X3102 Y39 t0
+# Control Point No 14: -1
+
+# optimizer:
+v v a b c d e y2 r2 p2

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/PTGuiProjects/ZCam_1080p.pts Added

@@ -0,0 +1,233 @@
+# ptGui project file
+
+#-encoding utf8
+#-pathseparator \
+#-fileversion 49
+#-previewwidth 2000
+#-previewheight 1000
+#-vfov 180
+#-resolution 300
+#-fixaspect 1
+#-outputfile 
+#-ccdcrop 1
+#-hasbeenoptimized 1
+#-hvcpmode 1
+#-jpegparameters 95 0
+#-tiffparameters 8bit packbits alpha_assoc
+#-psdparameters 8bit packbits layered
+#-qtvrparameters 800 600 1 1000 70 0 0 -180 180 0 -90 90 90 10 120 1
+#-honorexiforientation 1
+#-exrparameters noalpha
+#-hdroutputhdrblended
+#-hdroutputtonemapped
+#-hdrfileformat hdr
+#-hdrmethod fuse
+#-hdrpsdparameters float none layered
+#-tonemapv2settings PTGTM 1 0.5 20 20 0 0 2 1 0.15 0
+#-fusesettings 0.5 0 0.2 0 0
+#-cameracurve 3.441228 -0.551975 0.294423 -0.095632 0.072139
+#-vignettingparams 
+#-wbexposure 0 0 0
+#-pmoptexposuremode auto
+#-pmoptvignettingmode enabled
+#-pmoptwbmode disabled
+#-pmoptflaremode disabled
+#-pmoptcameracurvemode auto
+#-exposurecorrection 0
+#-tonemapldrpanorama 0
+#-blendweight 100 100 100 100
+#-optviewpoint 0000
+#-useexif1
+#-batchbuilder_useexif 0
+#-stitcher ptgui
+#-blender ptgui
+#-blenderfeather -0.6
+#-optimizer ptgui
+#-interpolator default
+#-autocpdone
+#-imgrotate4444
+#-cpinactive
+#-imginactive
+#-linktoprevious
+#-previewinactive
+#-outputcrop 0 1 0 1
+#-location default
+#-viewingdirection default
+#-alignsettings_generatecp 1
+#-alignsettings_optimize 1
+#-alignsettings_optimizeprealign 1
+#-alignsettings_straighten 1
+#-alignsettings_fit 1
+#-alignsettings_chooseprojection 1
+#-alignsettings_setoptimumsize 1
+#-alignsettings_limitsize 500
+#-alignsettings_optimizeexposure 0
+#-hdrsettings_defaultlinkmode nolink
+#-hdrsettings_donotask 0
+#-batchsettings_align 0
+#-batchsettings_stitch 1
+#-batchsettings_stitchonlyifcontrolpoints 1
+#-defaultprojectfilenamemode firstsourceimage
+#-defaultprojectfilename_custom " Panorama"
+#-defaultprojectfoldermode sourcefolder
+#-defaultprojectfolder_custom ""
+#-defaultpanoramafilenamemode asproject
+#-defaultpanoramafilename_custom ""
+#-defaultpanoramafoldermode projectfolder
+#-defaultpanoramafolder_custom ""
+#-userelativesourceimagepaths 1
+#-optimizeraskreinitialize 1
+#-applytemplate_lens 1
+#-applytemplate_imageparams 1
+#-applytemplate_crop 1
+#-applytemplate_mask 1
+#-applytemplate_panoramasettings 1
+#-applytemplate_projectsettings 1
+#-applytemplate_optimizer 1
+#-globalcrop 0 0 0 0 0 0 0 0.5
+#-theoreticalhfov -1
+#-rect_compression_x 0
+#-rect_compression_y 0
+#-cylindrical_compression_y 0
+#-transverse_cylindrical_compression_x 0
+#-vedutismo_compression_x 1
+#-transverse_vedutismo_compression_y 1
+#-stereographic_compression 1
+#-rectifisheye_compression 1
+# Panorama settings:
+p w2896 h1448 f2 v360 u0 n"JPEG g0 q95"
+m g0 i0
+
+# input images:
+#-dummyimage
+# The following line contains a 'dummy image' containing some global parameters for the project
+o w1 h1 y0 r0 p0 v240.2129736240018 a0.307385205488188 b-0.5908824795355683 c0.3081824109336159 f2 d-42.61940499622291 e-14.47458580644251 g0 t0
+#-imgfile 1920 1080 "ZCAM0748_0000_201706091149.MOV.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13144873420579482
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+o f2 y135.5213450733344 r-90.191728036218 p1.944682994440001 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C0,1920,-420,1500
+#-imgfile 1920 1080 "ZCAM0748_0001_201706091149.MOV.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13144873424718242
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+o f2 y44.2195117957059 r-93.82402523294746 p-0.08496197800272398 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C0,1920,-420,1500
+#-imgfile 1920 1080 "ZCAM0748_0002_201706091149.MOV.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13144873430911494
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+o f2 y-43.90526798195234 r-89.92930510970453 p-5.462014694886392 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C0,1920,-420,1500
+#-imgfile 1920 1080 "ZCAM0748_0003_201706091149.MOV.jpg"
+#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T * 13144873436488954
+#-viewpoint 0 0 0 0 0
+#-exposureparams 0 0 0 0
+o f2 y-135.7512664501676 r-86.49253630766768 p0.3920106122710934 v=0 a=0 b=0 c=0 d=0 e=0 g=0 t=0 C0,1920,-420,1500
+
+# Control points:
+c n2 N3 x931 y160 X943 Y880 t0
+# Control Point No 0: 1.373216042547868
+c n2 N3 x945 y122 X955 Y841 t0
+# Control Point No 1: 1.47997887307264
+c n2 N3 x932 y85 X942 Y805 t0
+# Control Point No 2: 0.9638462511821631
+c n2 N3 x1080 y206 X1097 Y901 t0
+# Control Point No 3: 0.6755176348306491
+c n2 N3 x828 y163 X839 Y877 t0
+# Control Point No 4: 1.29666014666563
+c n2 N3 x975 y291 X994 Y1006 t0
+# Control Point No 5: 0.9892307975333736
+c n2 N3 x1000 y192 X1014 Y907 t0
+# Control Point No 6: 0.6973948278680614
+c n2 N3 x1011 y94 X1016 Y807 t0
+# Control Point No 7: 0.5126603214798148
+c n2 N3 x849 y201 X857 Y919 t0
+# Control Point No 8: 2.010709177511433
+c n2 N3 x780 y185 X789 Y887 t0
+# Control Point No 9: 0.5460352051757599
+c n2 N3 x1008 y257 X1028 Y969 t0
+# Control Point No 10: 0.5845821883210348
+c n2 N3 x865 y111 X880 Y829 t0
+# Control Point No 11: 0.2016882741795021
+c n2 N3 x731 y158 X746 Y846 t0
+# Control Point No 12: 1.905147972741776
+c n2 N3 x999 y153 X1009 Y866 t0
+# Control Point No 13: 2.255198065319966
+c n1 N2 x1176 y344 X1209 Y1012 t0
+# Control Point No 14: 0.9676756309680031
+c n1 N2 x857 y91 X850 Y832 t0
+# Control Point No 15: 0.174865732685401
+c n1 N2 x946 y105 X933 Y849 t0
+# Control Point No 16: 2.732574307366169
+c n1 N2 x1032 y204 X1024 Y941 t0
+# Control Point No 17: 0.6307836733049774
+c n1 N2 x1128 y197 X1121 Y905 t0
+# Control Point No 18: 1.255829878458424
+c n1 N2 x1080 y96 X1057 Y823 t0
+# Control Point No 19: 1.000116503143115
+c n1 N2 x993 y22 X973 Y764 t0
+# Control Point No 20: 1.137627570193786
+c n1 N2 x793 y152 X782 Y882 t0
+# Control Point No 21: 2.380698400067073
+c n1 N2 x1175 y94 X1139 Y782 t0
+# Control Point No 22: 2.959353143211943
+c n1 N2 x1028 y292 X1030 Y1025 t0
+# Control Point No 23: 0.3211028557775108
+c n3 N4 x1166 y140 X1143 Y837 t0
+# Control Point No 24: 0.8643508576422672
+c n3 N4 x1163 y178 X1150 Y875 t0
+# Control Point No 25: 0.461722738141247
+c n3 N4 x1212 y239 X1213 Y904 t0
+# Control Point No 26: 0.3775816821847499
+c n3 N4 x906 y197 X890 Y951 t0
+# Control Point No 27: 3.298476187715086
+c n3 N4 x1092 y139 X1074 Y865 t0
+# Control Point No 28: 0.8881319440302566
+c n3 N4 x1053 y110 X1032 Y848 t0
+# Control Point No 29: 1.590614480272159
+c n3 N4 x1063 y185 X1053 Y919 t0
+# Control Point No 30: 0.2007531547237734
+c n3 N4 x1026 y182 X1016 Y925 t0
+# Control Point No 31: 0.9588465890438945
+c n3 N4 x988 y211 X977 Y958 t0
+# Control Point No 32: 1.1731791256165
+c n3 N4 x963 y118 X949 Y867 t0
+# Control Point No 33: 1.944833428962038
+c n3 N4 x953 y191 X939 Y941 t0
+# Control Point No 34: 1.43437542446856
+c n3 N4 x1161 y371 X1202 Y1049 t0
+# Control Point No 35: 1.241836593617805
+c n3 N4 x1269 y90 X1214 Y734 t0
+# Control Point No 36: 0.1183516136287677
+c n3 N4 x1251 y278 X1265 Y913 t0
+# Control Point No 37: 1.920928373778279
+c n1 N4 x844 y1051 X850 Y336 t0
+# Control Point No 38: 0.6697117888558906
+c n1 N4 x844 y1016 X846 Y300 t0
+# Control Point No 39: 1.218137108354461
+c n1 N4 x980 y943 X968 Y220 t0
+# Control Point No 40: 1.45743502370108
+c n1 N4 x946 y1005 X935 Y282 t0
+# Control Point No 41: 0.6945632625338123
+c n1 N4 x967 y914 X955 Y190 t0
+# Control Point No 42: 0.7877625100367484
+c n1 N4 x1065 y779 X1069 Y73 t0
+# Control Point No 43: 1.736711969038432
+c n1 N4 x777 y938 X778 Y235 t0
+# Control Point No 44: 1.212510886351761
+c n1 N4 x983 y858 X974 Y130 t0
+# Control Point No 45: 4.822308977715117
+c n1 N4 x908 y822 X895 Y99 t0
+# Control Point No 46: 1.827822431500981
+c n1 N4 x862 y959 X857 Y239 t0
+# Control Point No 47: 1.022604930273739
+c n1 N4 x799 y772 X770 Y69 t0
+# Control Point No 48: 1.742592561993301
+c n1 N4 x830 y844 X814 Y129 t0
+# Control Point No 49: 0.4827749051270448
+c n1 N4 x1015 y775 X1014 Y58 t0
+# Control Point No 50: 1.00904321996995
+c n1 N4 x720 y902 X717 Y218 t0
+# Control Point No 51: 0.8450313059692187
+
+# optimizer:
+v v a b c d e y2 r2 p2 y3 r3 p3 y4 r4 p4

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Profiling.cpp Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch.cpp Added

@@ -0,0 +1,922 @@
+// Stitch.cpp : Defines the entry point for the application.
+//
+
+#include "stdafx.h"
+#include "Stitch.h"
+#include <objbase.h>
+#include <Commdlg.h>
+#include <Windowsx.h>
+#include <CommCtrl.h>
+
+#include "public/include/components/VideoStitch.h"
+
+#include "public/include/core/Debug.h"
+
+#include "StitchPreviewPipeline.h"
+#include "public/samples/CPPSamples/common/CmdLineParser.h"
+#include "public/samples/CPPSamples/common/CmdLogger.h"
+#include "public/samples/CPPSamples/common/PlaybackPipeline.h"
+#include "public/include/components/ZCamLiveStream.h"
+
+#define MAX_LOADSTRING 100
+
+static AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+
+void EnableAMFProfiling(bool bEnable);
+
+// Global Variables:
+HINSTANCE hInst;                                // current instance
+TCHAR szTitle[MAX_LOADSTRING];                    // The title bar text
+TCHAR szWindowClass[MAX_LOADSTRING];            // the main window class name
+
+class Playback
+{
+public:
+    virtual ~Playback(){}
+    virtual void                Play() = 0;
+    virtual void                Pause() = 0;
+    virtual void                Step() = 0;
+    virtual void                Stop() = 0;
+    virtual void                Terminate() = 0;
+    virtual bool                IsPlaying() = 0;
+    virtual void                ReorderClientWindows() = 0;
+    virtual void                UpdateCaption() = 0;
+    virtual void                CheckForRestart() = 0;
+    virtual bool                ParseCmdLineParameters() = 0;
+    static amf_size m_iWindowCount;
+    static amf_int32 m_iWindowsInRow;
+
+};
+amf_size Playback::m_iWindowCount = 4;
+amf_int32 Playback::m_iWindowsInRow = 2;
+
+
+class SingleWindowPlayback : public Playback
+{
+public:
+    SingleWindowPlayback() : m_hClientWindow(NULL){}
+    virtual ~SingleWindowPlayback(){}
+    virtual void                Play();
+    virtual void                Pause();
+    virtual void                Step();
+    virtual void                Stop();
+    virtual void                Terminate();
+    virtual bool                IsPlaying();
+    virtual void                ReorderClientWindows();
+    virtual void                UpdateCaption();
+    virtual void                CheckForRestart();
+    virtual bool                ParseCmdLineParameters();
+
+    StitchPreviewPipeline        m_Pipeline;
+protected:
+    HWND                        m_hClientWindow;
+};
+
+static SingleWindowPlayback *g_pPipeline;
+
+std::vector<std::wstring>           InputFileList;
+std::wstring                        PTGuiProject;
+static HWND hWnd = NULL;
+static  UINT_PTR uiTimerID = 0;
+
+static  amf::AMF_MEMORY_TYPE memoryType = amf::AMF_MEMORY_DX11;
+static  bool bLoop = true;
+static  bool bStop = false;
+static  bool bForce60FPS = true;
+static bool bLowLatency = false;
+static bool bFullSpeed = false;
+static amf_int64 iZCamMode = CAMLIVE_MODE_INVALID;
+
+// Forward declarations of functions included in this code module:
+ATOM                MyRegisterClass();
+BOOL                InitInstance(int);
+HWND                CreateClientWindow(HWND hWndParent);
+LRESULT CALLBACK    WndProc(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK    ClientWndProc(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK    About(HWND, UINT, WPARAM, LPARAM);
+void                FileOpen();
+void                FileOpenPTGuiProject();
+void                UpdateMenuItems(HMENU hMenu);
+void                HandleKeyboard(WPARAM wParam);
+
+static INT_PTR CALLBACK ProgressDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+    class OptimizationThread : public amf::AMFThread, public amf::AMFComponentOptimizationCallback
+    {
+        bool m_started;
+        amf_uint m_percent;
+    public:
+        OptimizationThread()
+            :m_started(true), m_percent(0)
+        {
+        }
+        ~OptimizationThread()
+        {
+        }
+        bool started() {return m_started;}
+        amf_uint percent() {return m_percent;}
+
+    protected:
+        virtual AMF_RESULT AMF_STD_CALL OnComponentOptimizationProgress(amf_uint percent)
+        {
+            m_percent = percent;
+            return AMF_OK;
+        }
+
+        virtual void Run()
+        {
+            RequestStop();
+            amf::AMFContextPtr pContext;
+            g_AMFFactory.GetFactory()->CreateContext(&pContext);
+            pContext->InitDX11(NULL);
+//            pContext->InitOpenCL(NULL);
+            amf::AMFComponentPtr pComponent;
+            g_AMFFactory.GetFactory()->CreateComponent(pContext, AMFVideoConverter, &pComponent);
+            pComponent->Optimize(this);
+            g_AMFFactory.LoadExternalComponent(pContext, STITCH_DLL_NAME, "AMFCreateComponentInt", NULL, &pComponent);
+            pComponent->Optimize(this);
+            pComponent.Release();
+            g_AMFFactory.UnLoadExternalComponent(STITCH_DLL_NAME);
+            m_started = false;
+        }
+    };
+    static OptimizationThread s_optimizationThread;
+
+    switch(Message)
+    {
+    case WM_COMMAND:
+        switch(LOWORD(wParam))
+        {
+        case IDCANCEL:
+            EndDialog(hwnd, IDCANCEL);
+            break;
+        }
+        break;
+    case WM_INITDIALOG:
+        {
+            HWND hProgress = GetDlgItem(hwnd, IDC_PROGRESS_BAR);
+            SendMessage(hProgress, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
+            s_optimizationThread.Start();
+            SetTimer(hwnd, 100, 1, NULL);
+        }
+        return TRUE;
+    case WM_TIMER:
+        if(s_optimizationThread.started())
+        {
+            HWND hProgress = GetDlgItem(hwnd, IDC_PROGRESS_BAR);
+            SendMessage(hProgress, PBM_SETPOS, DWORD(s_optimizationThread.percent()), 0);
+        }
+        else
+        {
+            s_optimizationThread.WaitForStop();
+            KillTimer(hwnd, 100);
+            EndDialog(hwnd, IDOK);
+        }
+
+    default:
+        return FALSE;
+    }
+    return TRUE;
+}
+
+int APIENTRY _tWinMain(HINSTANCE hInstance,
+                     HINSTANCE hPrevInstance,
+                     LPTSTR    lpCmdLine,
+                     int       nCmdShow)
+{
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(lpCmdLine);
+
+    hInst = hInstance;
+    ::CoInitializeEx(NULL,COINIT_MULTITHREADED);
+
+    AMF_RESULT res = AMF_OK;
+
+    // initialize AMF
+    res = g_AMFFactory.Init();
+    CHECK_AMF_ERROR_RETURN(res, L"AMF Factory Failed to initialize");
+
+    g_AMFFactory.GetDebug()->AssertsEnable(true);
+
+//    EnableAMFProfiling(true);
+
+    MSG msg;
+    HACCEL hAccelTable;
+
+    // Initialize global strings
+    LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
+    LoadString(hInstance, IDC_STITCH, szWindowClass, MAX_LOADSTRING);
+    MyRegisterClass();
+
+    g_pPipeline = new SingleWindowPlayback();
+
+    // Perform application initialization:
+    if (!InitInstance (nCmdShow))
+    {
+        CoUninitialize();
+        g_AMFFactory.Terminate();
+        return FALSE;
+    }
+
+    PostMessage(hWnd, WM_USER+1000, 0, 0);
+    //------------------------------------------------------------------------------------------------------------
+
+    g_pPipeline->ParseCmdLineParameters();
+/*
+        if(g_pPipeline.Init(hWnd, hClientWnd) == AMF_OK)
+        {
+            g_pPipeline.Play();
+            UpdateMenuItems(::GetMenu(hWnd));
+        }
+*/
+    //------------------------------------------------------------------------------------------------------------
+
+
+    hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_STITCH));
+
+    // Main message loop:
+    while (GetMessage(&msg, NULL, 0, 0))
+    {
+//        if(g_PropertyEditor.IsDialogMessage(&msg))
+//        {
+//            continue;
+//        }
+
+        if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+    }
+    CoUninitialize();
+
+    delete g_pPipeline;
+
+    g_AMFFactory.Terminate();
+    return (int)msg.wParam;
+}
+
+
+
+//
+//  FUNCTION: MyRegisterClass()
+//
+//  PURPOSE: Registers the window class.
+//
+//  COMMENTS:
+//
+//    This function and its usage are only necessary if you want this code
+//    to be compatible with Win32 systems prior to the 'RegisterClassEx'
+//    function that was added to Windows 95. It is important to call this function
+//    so that the application will get 'well formed' small icons associated
+//    with it.
+//
+ATOM MyRegisterClass()
+{
+    WNDCLASSEX wcex;
+
+    wcex.cbSize = sizeof(WNDCLASSEX);
+
+    wcex.style            = CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc    = WndProc;
+    wcex.cbClsExtra        = 0;
+    wcex.cbWndExtra        = 0;
+    wcex.hInstance        = hInst;
+    wcex.hIcon            = LoadIcon(hInst, MAKEINTRESOURCE(IDI_STITCH));
+    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground    = (HBRUSH)(COLOR_WINDOW+1);
+    wcex.lpszMenuName    = MAKEINTRESOURCE(IDC_STITCH);
+    wcex.lpszClassName    = szWindowClass;
+    wcex.hIconSm        = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SMALL));
+
+    return RegisterClassEx(&wcex);
+}
+
+
+
+//
+//   FUNCTION: InitInstance(HINSTANCE, int)
+//
+//   PURPOSE: Saves instance handle and creates main window
+//
+//   COMMENTS:
+//
+//        In this function, we save the instance handle in a global variable and
+//        create and display the main program window.
+//
+BOOL InitInstance(int nCmdShow)
+{
+    hWnd = NULL;
+
+    hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW  ,
+        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInst, NULL);
+
+    if (!hWnd)
+    {
+        return FALSE;
+    }
+
+    uiTimerID = ::SetTimer(hWnd, 10000, 1000, NULL);
+
+    ShowWindow(hWnd, SW_SHOWMAXIMIZED);
+    UpdateWindow(hWnd);
+    UpdateMenuItems(::GetMenu(hWnd));
+
+    return TRUE;
+}
+HWND CreateClientWindow(HWND hWndParent)
+{
+    WNDCLASSEX wcex;
+
+    static wchar_t *ChildClassName = L"Client";
+    wcex.cbSize = sizeof(WNDCLASSEX);
+
+    wcex.style            = CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc    = ClientWndProc;
+    wcex.cbClsExtra        = 0;
+    wcex.cbWndExtra        = 0;
+    wcex.hInstance        = hInst;
+    wcex.hIcon            = 0;
+    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground    = (HBRUSH)(COLOR_WINDOW+1);
+    wcex.lpszMenuName    = 0;
+    wcex.lpszClassName    = ChildClassName;
+    wcex.hIconSm        = NULL;
+
+    ATOM reg = RegisterClassEx(&wcex);
+
+
+    HWND hClientWnd = CreateWindowEx( 0, ChildClassName, NULL, WS_CHILD | WS_VISIBLE,
+        0, 0, 100, 100, 
+        hWndParent, (HMENU) (int) (1) , hInst, NULL);
+    return hClientWnd;
+}
+void UpdateMenuItems(HMENU hMenu)
+{
+/*
+    amf::AMF_MEMORY_TYPE    presenterType = amf::AMF_MEMORY_DX9;
+    {
+        amf_int64 engineInt = amf::AMF_MEMORY_UNKNOWN;
+        if(s_Pipeline.GetParam(StitchPipeline::PARAM_NAME_PRESENTER, engineInt) == AMF_OK)
+        {
+            if(amf::AMF_MEMORY_UNKNOWN != engineInt)
+            {
+                presenterType = (amf::AMF_MEMORY_TYPE)engineInt;
+            }
+        }
+        else
+        {
+            s_Pipeline.SetParam(StitchPipeline::PARAM_NAME_PRESENTER, presenterType);
+        }
+    }
+*/
+    CheckMenuItem(hMenu,ID_OPTIONS_RENDERER_DX11,      MF_BYCOMMAND| ( memoryType == amf::AMF_MEMORY_DX11 ? MF_CHECKED : MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_OPTIONS_COMPUTE_FOR_DX11,      MF_BYCOMMAND| ( memoryType == amf::AMF_MEMORY_COMPUTE_FOR_DX11 ? MF_CHECKED : MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_OPTIONS_RENDERER_OPENCL,      MF_BYCOMMAND| ( memoryType == amf::AMF_MEMORY_OPENCL ? MF_CHECKED : MF_UNCHECKED));
+
+    CheckMenuItem(hMenu,ID_OPTIONS_LOOP,    MF_BYCOMMAND| ( bLoop ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_OPTIONS_FORCE60FPS,    MF_BYCOMMAND| ( bForce60FPS ? MF_CHECKED: MF_UNCHECKED));
+
+    CheckMenuItem(hMenu,ID_OPTIONS_FULLSPEED,    MF_BYCOMMAND| ( bFullSpeed ? MF_CHECKED: MF_UNCHECKED));
+
+    CheckMenuItem(hMenu,ID_OPTIONS_LOW_LATENCY,    MF_BYCOMMAND| ( bLowLatency ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu, ID_FILE_ZCAMLIVE, MF_BYCOMMAND | (iZCamMode == CAMLIVE_MODE_ZCAM_1080P30 ? MF_CHECKED : MF_UNCHECKED));
+    CheckMenuItem(hMenu, ID_FILE_ZCAMLIVE_2K7, MF_BYCOMMAND | (iZCamMode == CAMLIVE_MODE_ZCAM_2K7P30 ? MF_CHECKED : MF_UNCHECKED));
+    
+    CheckMenuItem(hMenu, ID_FILE_RICOH_THETA_S, MF_BYCOMMAND | (iZCamMode == CAMLIVE_MODE_THETAS ? MF_CHECKED : MF_UNCHECKED));
+    CheckMenuItem(hMenu, ID_FILE_RICOH_THETA_V, MF_BYCOMMAND | (iZCamMode == CAMLIVE_MODE_THETAV ? MF_CHECKED : MF_UNCHECKED));
+
+    amf_int32 index = g_pPipeline->m_Pipeline.GetSubresourceIndex();
+    CheckMenuItem(hMenu,ID_SUBRESOURCE_INDEX0,    MF_BYCOMMAND| ( index == 0 ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_SUBRESOURCE_INDEX1,    MF_BYCOMMAND| ( index == 1 ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_SUBRESOURCE_INDEX2,    MF_BYCOMMAND| ( index == 2 ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_SUBRESOURCE_INDEX3,    MF_BYCOMMAND| ( index == 3 ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_SUBRESOURCE_INDEX4,    MF_BYCOMMAND| ( index == 4 ? MF_CHECKED: MF_UNCHECKED));
+    CheckMenuItem(hMenu,ID_SUBRESOURCE_INDEX5,    MF_BYCOMMAND| ( index == 5 ? MF_CHECKED: MF_UNCHECKED));
+
+}
+
+//
+//  FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)
+//
+//  PURPOSE:  Processes messages for the main window.
+//
+//  WM_COMMAND    - process the application menu
+//  WM_PAINT    - Paint the main window
+//  WM_DESTROY    - post a quit message and return
+//
+//
+
+static POINT s_MousePos;
+static bool     s_MouseDown = false;
+
+LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    int wmId, wmEvent;
+    PAINTSTRUCT ps;
+    HDC hdc;
+
+    switch (message)
+    {
+    case WM_USER+1000:
+        if(DialogBox( hInst, MAKEINTRESOURCE(IDD_PROGRESS_DLG),  hWnd,  (DLGPROC) ProgressDlgProc ) != IDOK)
+        {
+            PostQuitMessage(0);
+        }
+        break;
+    case WM_COMMAND:
+        wmId    = LOWORD(wParam);
+        wmEvent = HIWORD(wParam);
+        // Parse the menu selections:
+        switch (wmId)
+        {
+        case IDM_ABOUT:
+            DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About);
+            break;
+        case IDM_EXIT:
+            DestroyWindow(hWnd);
+            break;
+        case ID_FILE_OPEN:
+            FileOpen();
+            break;
+        case ID_FILE_CLEARFILELIST:
+            InputFileList.clear();
+            break;
+        case ID_FILE_OPENPTGUIPROJECT:
+            FileOpenPTGuiProject();
+            break;
+        case ID_PLAYBACK_PLAY:
+            g_pPipeline->Play();
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_PLAYBACK_PAUSE:
+            g_pPipeline->Pause();
+            break;
+        case ID_PLAYBACK_STEP:
+            g_pPipeline->Step();
+            break;
+        case ID_PLAYBACK_STOP:
+            g_pPipeline->Stop();
+            break;
+
+        case ID_OPTIONS_RENDERER_DX11:
+            memoryType = amf::AMF_MEMORY_DX11;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_COMPUTE_FOR_DX11:
+            memoryType = amf::AMF_MEMORY_COMPUTE_FOR_DX11;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_RENDERER_OPENCL:
+            memoryType = amf::AMF_MEMORY_OPENCL;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_LOOP:
+            bLoop = !bLoop;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_FORCE60FPS:
+            bForce60FPS = !bForce60FPS;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_FULLSPEED:
+            bFullSpeed = !bFullSpeed;
+            g_pPipeline->m_Pipeline.SetFullSpeed(bFullSpeed);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_LOW_LATENCY:
+            bLowLatency = !bLowLatency;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_FILE_ZCAMLIVE:
+            iZCamMode = (iZCamMode == CAMLIVE_MODE_ZCAM_1080P30) ? CAMLIVE_MODE_INVALID : CAMLIVE_MODE_ZCAM_1080P30;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_FILE_ZCAMLIVE_2K7:
+            iZCamMode = (iZCamMode == CAMLIVE_MODE_ZCAM_2K7P30) ? CAMLIVE_MODE_INVALID : CAMLIVE_MODE_ZCAM_2K7P30;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_FILE_RICOH_THETA_S:
+            iZCamMode = (iZCamMode == CAMLIVE_MODE_THETAS) ? CAMLIVE_MODE_INVALID : CAMLIVE_MODE_THETAS;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_FILE_RICOH_THETA_V:
+            iZCamMode = (iZCamMode == CAMLIVE_MODE_THETAV) ? CAMLIVE_MODE_INVALID : CAMLIVE_MODE_THETAV;
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_OPTIONS_DUMP_TEMPLATE:
+            g_pPipeline->m_Pipeline.Dump();
+            break;
+        case ID_SUBRESOURCE_INDEX0:
+            g_pPipeline->m_Pipeline.SetSubresourceIndex(0);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_SUBRESOURCE_INDEX1:
+            g_pPipeline->m_Pipeline.SetSubresourceIndex(1);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_SUBRESOURCE_INDEX2:
+            g_pPipeline->m_Pipeline.SetSubresourceIndex(2);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_SUBRESOURCE_INDEX3:
+            g_pPipeline->m_Pipeline.SetSubresourceIndex(3);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_SUBRESOURCE_INDEX4:
+            g_pPipeline->m_Pipeline.SetSubresourceIndex(4);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        case ID_SUBRESOURCE_INDEX5:
+            g_pPipeline->m_Pipeline.SetSubresourceIndex(5);
+            UpdateMenuItems(::GetMenu(hWnd));
+            break;
+        default:
+            return DefWindowProc(hWnd, message, wParam, lParam);
+        }
+        break;
+    case WM_PAINT:
+        hdc = BeginPaint(hWnd, &ps);
+        // TODO: Add any drawing code here...
+        EndPaint(hWnd, &ps);
+        break;
+    case WM_CREATE:
+        break;
+    case WM_DESTROY:
+        g_pPipeline->Terminate();
+        PostQuitMessage(0);
+        break;
+    case WM_SIZE:
+        g_pPipeline->ReorderClientWindows();
+        break;
+    case WM_TIMER:
+        g_pPipeline->UpdateCaption();
+        g_pPipeline->CheckForRestart();
+        break;
+    case WM_KEYDOWN: // to get arrows
+//    case WM_CHAR: // to get []{}
+        HandleKeyboard(wParam);
+        break;
+
+    default:
+        return DefWindowProc(hWnd, message, wParam, lParam);
+    }
+    return 0;
+}
+
+LRESULT CALLBACK ClientWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    switch (message)
+    {
+    case WM_LBUTTONDOWN:
+        s_MousePos.x = GET_X_LPARAM(lParam); 
+        s_MousePos.y = GET_Y_LPARAM(lParam);    
+        s_MouseDown = true;
+        break;
+    case WM_MOUSEMOVE:
+        if(wParam & MK_LBUTTON)
+        {
+            if(s_MouseDown)
+            { 
+                POINT newPos = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
+                g_pPipeline->m_Pipeline.MouseShift(s_MousePos.x, s_MousePos.y, newPos.x, newPos.y);
+                s_MousePos = newPos; 
+            }
+        }
+        else
+        {
+            s_MouseDown = false;
+        }
+        break;
+    case WM_LBUTTONUP:
+        s_MouseDown = false;
+        break;
+    case WM_KEYDOWN: // to get arrows
+//    case WM_CHAR: // to get []{}
+        HandleKeyboard(wParam);
+        break;
+    default:
+        return DefWindowProc(hWnd, message, wParam, lParam);
+    }
+    return 0;
+}
+
+void FileOpen() 
+{
+    OPENFILENAME ofn;       // common dialog box structure
+    WCHAR szFile[260];       // buffer for file name
+     
+    // Initialize OPENFILENAME
+    ZeroMemory(&ofn, sizeof(ofn));
+    ofn.lStructSize = sizeof(ofn);
+    ofn.hwndOwner = hWnd;
+    ofn.lpstrFile = szFile;
+    ofn.lpstrFile[0] = '\0';
+    ofn.nMaxFile = _countof(szFile);
+//    ofn.lpstrFilter = L"Videos\0*.WMV;*.WMA;*.AVI;*.ASF;*.FLV;*.BFI;*.CAF;*.GXF;*.IFF;*.RL2;*.MP4;*.3GP;*.QTFF;*.MKV;*.MK3D;*.MKA;*.MKS;*.MPG;*.MPEG;*.PS;*.TS;*.MXF;*.OGV;*.OGA;*.OGX;*.OGG;*.SPX;*.FLV;*.F4V;*.F4P;*.F4A;*.F4B;*.JSV;*.h264;*.264;*.vc1;*.mov;*.mvc;*.m1v;*.m2v;*.m2ts;*.vpk;*.yuv;*.rgb;*.nv12;*.h265;*.265\0All\0*.*\0";
+    ofn.lpstrFilter = L"Video streams\0*.mp4;*.mkv;*.flv;*.mov;*.h264;*.264;*.h265;*.265;*.hevc;\0All\0*.*\0";
+//    ofn.lpstrFilter = L"Video streams\0*.h264;*.264;*.h265;*.265;*.hevc;\0All\0*.*\0";
+    ofn.nFilterIndex = 1;
+    ofn.lpstrFileTitle = NULL;
+    ofn.nMaxFileTitle = 0;
+    ofn.lpstrInitialDir = NULL;
+    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_ALLOWMULTISELECT | OFN_EXPLORER;
+
+    if (GetOpenFileName(&ofn)==TRUE)
+    {
+        if(ofn.nFileExtension != 0 )
+        {
+            InputFileList.push_back(ofn.lpstrFile);
+        }
+        else
+        {
+            std::wstring path(ofn.lpstrFile);
+            path += L"\\";
+
+            LPWSTR p = ofn.lpstrFile;
+            size_t size = wcslen(p);
+            p += size+1;
+
+            while(true)
+            {
+                size = wcslen(p);
+                if(size == 0 )
+                {
+                    break;
+                }
+                std::wstring full_name = path + p;
+                p += size + 1;
+                InputFileList.push_back(full_name);
+            }
+        }
+
+//        InputFileList.push_back(ofn.lpstrFile);
+/*
+        s_Pipeline.SetParam(StitchPipeline::PARAM_NAME_INPUT, ofn.lpstrFile);
+        s_Pipeline.Stop();
+        if(s_Pipeline.Init(hWnd, hClientWnd) == AMF_OK)
+        {
+            s_Pipeline.Play();
+            UpdateMenuItems(::GetMenu(hWnd));
+        }
+*/
+        iZCamMode = CAMLIVE_MODE_INVALID;
+        UpdateMenuItems(::GetMenu(hWnd));
+    }
+}
+
+void                FileOpenPTGuiProject()
+{
+    OPENFILENAME ofn;       // common dialog box structure
+    WCHAR szFile[260];       // buffer for file name
+     
+    // Initialize OPENFILENAME
+    ZeroMemory(&ofn, sizeof(ofn));
+    ofn.lStructSize = sizeof(ofn);
+    ofn.hwndOwner = hWnd;
+    ofn.lpstrFile = szFile;
+    ofn.lpstrFile[0] = '\0';
+    ofn.nMaxFile = _countof(szFile);
+//    ofn.lpstrFilter = L"PanoKolor\0*.pano;\0PTGui\0*.pts;\0All\0*.*\0";
+    ofn.lpstrFilter = L"PTGui\0*.pts;\0PanoKolor\0*.pano;\0All\0*.*\0";
+    ofn.nFilterIndex = 1;
+    ofn.lpstrFileTitle = NULL;
+    ofn.nMaxFileTitle = 0;
+    ofn.lpstrInitialDir = NULL;
+    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_EXPLORER;
+
+    if (GetOpenFileName(&ofn)==TRUE)
+    {
+        if(ofn.nFileExtension != 0 )
+        {
+            PTGuiProject = ofn.lpstrFile;
+        }
+    }
+
+    if (PTGuiProject.length() > 0)
+    {
+        std::wstring::size_type pos = PTGuiProject.find_last_of(L".");
+        std::wstring ext = PTGuiProject.substr(pos + 1);
+        std::wstring result;
+        std::transform(ext.begin(), ext.end(), std::back_inserter(result), toupper);
+        if (result == L"PTS")
+        {
+            g_pPipeline->m_Pipeline.InitCamera(PTGuiProject);
+        }
+    }
+}
+
+// Message handler for about box.
+INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    UNREFERENCED_PARAMETER(lParam);
+    switch (message)
+    {
+    case WM_INITDIALOG:
+        return (INT_PTR)TRUE;
+
+    case WM_COMMAND:
+        if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
+        {
+            EndDialog(hDlg, LOWORD(wParam));
+            return (INT_PTR)TRUE;
+        }
+        break;
+    }
+    return (INT_PTR)FALSE;
+}
+
+
+bool                SingleWindowPlayback::ParseCmdLineParameters()
+{
+    return parseCmdLineParameters(&m_Pipeline);
+}
+
+void                SingleWindowPlayback::Play()
+{
+    if (InputFileList.size() == 0 && (iZCamMode == CAMLIVE_MODE_INVALID))
+    {
+        return;
+    }
+    bStop = false;
+    if(m_hClientWindow == NULL)
+    {
+        m_hClientWindow = CreateClientWindow(hWnd);
+    }
+    ReorderClientWindows();
+    std::wstring filename = L"";
+    if (iZCamMode == CAMLIVE_MODE_INVALID)
+    {
+        filename = InputFileList.front();
+    }
+
+    if(m_Pipeline.GetState() == PipelineStateEof || m_Pipeline.GetState() == PipelineStateNotReady)
+    {
+        m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_FRAMERATE, bForce60FPS ? 60. : 0.);
+        m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_PRESENTER, memoryType);
+        m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_INPUT, filename.c_str());
+        m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_LOWLATENCY, bLowLatency);
+        m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_ZCAMLIVE_MODE, iZCamMode);
+        
+
+        m_Pipeline.Stop();
+        m_Pipeline.Init(m_hClientWindow, InputFileList, PTGuiProject, outputMode);
+    }
+    m_Pipeline.Play();
+    m_Pipeline.SetFullSpeed(bFullSpeed);
+}
+void                SingleWindowPlayback::Pause()
+{
+    m_Pipeline.Pause();
+}
+void                SingleWindowPlayback::Step()
+{
+    m_Pipeline.Step();
+}
+void                SingleWindowPlayback::Stop()
+{
+    bStop = true;
+    m_Pipeline.Stop();
+}
+void                SingleWindowPlayback::Terminate()
+{
+    m_Pipeline.Terminate();
+}
+bool                SingleWindowPlayback::IsPlaying()
+{
+    bool bRet = true;
+    if(m_Pipeline.GetState() == PipelineStateEof || m_Pipeline.GetState() == PipelineStateNotReady)
+    {
+        bRet = false;
+    }
+    return bRet; 
+}
+void                SingleWindowPlayback::ReorderClientWindows()
+{
+    if(hWnd != NULL && m_hClientWindow!=NULL)
+    {
+        RECT client;
+        ::GetClientRect(hWnd, &client);
+        ::MoveWindow(m_hClientWindow, client.left, client.top, client.right - client.left, client.bottom - client.top, TRUE);
+    }
+}
+void                SingleWindowPlayback::UpdateCaption()
+{
+    wchar_t text[1000];
+    double FPS = m_Pipeline.GetFPS();
+    swprintf(text,L"%s | FPS( %.1f)",szTitle, FPS);
+    ::SetWindowText(hWnd, text);
+}
+void                SingleWindowPlayback::CheckForRestart()
+{
+    if(bLoop && !bStop)
+    {
+        if(m_Pipeline.GetState() == PipelineStateEof || m_Pipeline.GetState() == PipelineStateNotReady)
+        {
+            m_Pipeline.Restart();
+            /*
+            m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_FRAMERATE, bForce60FPS ? 60. : 0.);
+            m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_PRESENTER, memoryType);
+            m_Pipeline.SetParam(StitchPipeline::PARAM_NAME_LOWLATENCY, bLowLatency);
+            m_Pipeline.Init(m_hClientWindow, InputFileList);
+            m_Pipeline.Play();
+            */
+        }
+    }
+}
+
+void              HandleKeyboard(WPARAM wParam)
+{
+    bool shiftDown = (GetKeyState ( VK_SHIFT )  & (1<<16)) != 0;
+    switch(wParam)
+    {
+    case VK_UP:
+        g_pPipeline->m_Pipeline.ChangeOffsetY(true, shiftDown);
+        break;
+    case VK_DOWN:
+        g_pPipeline->m_Pipeline.ChangeOffsetY(false, shiftDown);
+        break;
+    case VK_LEFT:
+        g_pPipeline->m_Pipeline.ChangeOffsetX(false, shiftDown);
+        break;
+    case VK_RIGHT:
+        g_pPipeline->m_Pipeline.ChangeOffsetX(true, shiftDown);
+        break;
+    case VK_END:
+        g_pPipeline->m_Pipeline.ChangeK2(false, shiftDown);
+        break;
+    case VK_HOME:
+        g_pPipeline->m_Pipeline.ChangeK2(true, shiftDown);
+        break;
+    case VK_PRIOR:
+        g_pPipeline->m_Pipeline.ChangeK1(true, shiftDown);
+        break;
+    case VK_NEXT:
+        g_pPipeline->m_Pipeline.ChangeK1(false, shiftDown);
+        break;
+    case VK_INSERT:
+        g_pPipeline->m_Pipeline.ChangeK3(true, shiftDown);
+        break;
+    case VK_DELETE:
+        g_pPipeline->m_Pipeline.ChangeK3(false, shiftDown);
+        break;
+    case L'A':
+    case L'a':
+        g_pPipeline->m_Pipeline.ChangeZoom(true, shiftDown);
+        break;
+    case L'Z':
+    case L'z':
+        g_pPipeline->m_Pipeline.ChangeZoom(false, shiftDown);
+        break;
+    case L'0':
+    case L'1':
+    case L'2':
+    case L'3':
+    case L'4':
+    case L'5':
+    case L'6':
+        g_pPipeline->m_Pipeline.SetChannel((int)(wParam - L'0'));
+        break;
+    case L'w':
+    case L'W':
+        g_pPipeline->m_Pipeline.ToggleWire();
+        break;
+    case L'b':
+    case L'B':
+        g_pPipeline->m_Pipeline.ToggleColorBalance();
+        break;
+    case L'i':
+    case L'I':
+        g_pPipeline->m_Pipeline.ChangeCameraPitch(true, shiftDown);
+        break;
+    case L'm':
+    case L'M':
+        g_pPipeline->m_Pipeline.ChangeCameraPitch(false, shiftDown);
+        break;
+    case L'l':
+    case L'L':
+        g_pPipeline->m_Pipeline.ChangeCameraYaw(true, shiftDown);
+        break;
+    case L'j':
+    case L'J':
+        g_pPipeline->m_Pipeline.ChangeCameraYaw(false, shiftDown);
+        break;
+    case L'o':
+    case L'O':
+        g_pPipeline->m_Pipeline.ChangeCameraRoll(false, shiftDown);
+        break;
+    case L'p':
+    case L'P':
+        g_pPipeline->m_Pipeline.ChangeCameraRoll(true, shiftDown);
+        break;
+    case L'q':
+    case L'Q':
+        g_pPipeline->m_Pipeline.ToggleOutputMode();
+        break;
+    case L'e':
+        break;
+    }
+}
+
+
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch.h Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch.ico Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch.rc Added

@@ -0,0 +1,196 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#ifndef APSTUDIO_INVOKED
+#include "targetver.h"
+#endif
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_STITCH              ICON                    "Stitch.ico"
+IDI_SMALL               ICON                    "small.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDC_STITCH MENU
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "Add File... \tO",             ID_FILE_OPEN
+        MENUITEM "Clear File List",             ID_FILE_CLEARFILELIST
+        MENUITEM "Open Project...",             ID_FILE_OPENPTGUIPROJECT
+        MENUITEM SEPARATOR
+        MENUITEM "ZCam Live (1080P)",           ID_FILE_ZCAMLIVE
+        MENUITEM "ZCam Live (2.7K)",            ID_FILE_ZCAMLIVE_2K7
+        MENUITEM "ZCam Live (2544P)",           ID_FILE_ZCAMLIVE_2544P
+        MENUITEM SEPARATOR
+        MENUITEM "Ricoh Theta S Live",          ID_FILE_RICOH_THETA_S
+        MENUITEM "Ricoh Theta V Live",          ID_FILE_RICOH_THETA_V
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit",                       IDM_EXIT
+    END
+    POPUP "&Options"
+    BEGIN
+        MENUITEM "Renderer DirectCompute",      ID_OPTIONS_RENDERER_DX11
+        MENUITEM "Renderer Compute For DX11",   ID_OPTIONS_COMPUTE_FOR_DX11
+        MENUITEM "Renderer OpenCL",             ID_OPTIONS_RENDERER_OPENCL
+        MENUITEM SEPARATOR
+        MENUITEM "Loop",                        ID_OPTIONS_LOOP, CHECKED
+        MENUITEM "Force 60 FPS",                ID_OPTIONS_FORCE60FPS, CHECKED
+        MENUITEM "Full Speed",                  ID_OPTIONS_FULLSPEED
+        MENUITEM "Low Latency",                 ID_OPTIONS_LOW_LATENCY
+        MENUITEM SEPARATOR
+    END
+    MENUITEM "Play",                        ID_PLAYBACK_PLAY
+    MENUITEM "Pause",                       ID_PLAYBACK_PAUSE
+    MENUITEM "Step",                        ID_PLAYBACK_STEP
+    MENUITEM "Stop",                        ID_PLAYBACK_STOP
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About ...",                  IDM_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDC_STITCH ACCELERATORS
+BEGIN
+    "?",            IDM_ABOUT,              ASCII,  ALT
+    "/",            IDM_ABOUT,              ASCII,  ALT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_PROGRESS_DLG DIALOGEX 0, 0, 199, 86
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Playback"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",WS_BORDER,12,38,173,14
+    LTEXT           "Optimization Components...",IDC_STATIC,12,21,90,8
+    GROUPBOX        "Optimization Media SDK for your hardware",IDC_STATIC,4,4,189,57
+    DEFPUSHBUTTON   "&Cancel",IDCANCEL,143,66,50,14
+END
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About Stitch"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,14,14,21,20
+    LTEXT           "Stitch, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX
+    LTEXT           "Copyright (C) 2015",IDC_STATIC,42,26,114,8
+    DEFPUSHBUTTON   "OK",IDOK,113,41,50,14,WS_GROUP
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_ABOUTBOX, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 163
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 55
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#ifndef APSTUDIO_INVOKED\r\n"
+    "#include ""targetver.h""\r\n"
+    "#endif\r\n"
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_APP_TITLE           "Stitch"
+    IDC_STITCH              "STITCH"
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/StitchLoomSL.cpp Added

@@ -0,0 +1,355 @@
+#include "StitchLoomSL.h"
+using namespace amf;
+
+#include "runtime/include/core/ProgramsCompute.h"
+#include "public/common/TraceAdapter.h"
+#include "LoomConverter.cl.h"
+
+#define AMF_FACILITY L"LoomConverter"
+
+StitchLoomSL::StitchLoomSL(amf::AMFContext* pContext, AMFSize sizeCamera, AMFSize sizeSrc, AMFSize sizeDst, std::wstring PTGuiProject, std::wstring workFolder) :
+m_pContext(pContext),
+m_sizeCamera(sizeCamera),
+m_sizeSrc(sizeSrc),
+m_sizeDst(sizeDst),
+m_PTGuiProject(PTGuiProject),
+m_workFolder(workFolder),
+m_contextLoom(0),
+m_readyLoomSL(false),
+m_countFrame(0),
+m_eof(false),
+m_enableDump(false)
+{
+    m_countStream = m_sizeCamera.width * m_sizeCamera.height;
+}
+
+StitchLoomSL::~StitchLoomSL()
+{
+}
+
+AMF_RESULT StitchLoomSL::Drain()
+{
+    m_eof = true;
+    return AMF_OK;
+}
+AMF_RESULT StitchLoomSL::Flush()
+{
+    m_eof = false;
+    return AMF_OK;
+}
+
+AMF_RESULT StitchLoomSL::SubmitInputInt(amf::AMFData* pData, amf_int32 slot)
+{
+    AMF_RESULT res = AMF_OK;
+    AMFSurfacePtr       pSurfaceIn(pData);
+    Init();
+
+    if (pSurfaceIn)
+    {
+        if (m_inputs[slot])
+        {
+            return AMF_INPUT_FULL; // this channel already processed for this output - resubmit later
+        }
+
+        wchar_t fileName[_MAX_PATH];
+        _swprintf(fileName, L"src_%04lld_%02d.bmp", m_countFrame, slot);
+        SaveToBmp(pSurfaceIn, fileName);
+
+        m_inputs[slot] = pData;
+    }
+
+    return res;
+}
+
+AMF_RESULT StitchLoomSL::QueryOutput(amf::AMFData** ppData)
+{
+    AMF_RESULT res = AMF_OK;
+    if (m_eof)
+    {
+        return AMF_EOF;
+    }
+
+    if (m_inputs.size() == 0)   return AMF_REPEAT;
+
+    for (amf_size ch = 0; ch < m_inputs.size(); ch++)
+    {
+        if (m_inputs[ch]== NULL)
+        {
+            return AMF_REPEAT; // need more input
+        }
+    }
+
+    Compose(&m_dstLoomSL);
+
+    if (m_readyLoomSL && m_dstLoomSL)
+    {
+        if (m_dstLoomSL != NULL)
+        {
+            (*ppData) = m_dstLoomSL.Detach();
+        }
+    }
+
+
+    return res;
+}
+
+AMF_RESULT StitchLoomSL::Compose(AMFSurface **ppSurfaceOut)
+{
+    AMF_RESULT res = AMF_OK;
+    AllocateResource();
+    InitLoomSL();
+
+    //combine images
+    amf_size offset = 0;
+    for (amf_int32 ch = 0; ch < (amf_int32)m_inputs.size(); ch++)
+    {
+        AMFSurfacePtr  pSurf(m_inputs[ch]);
+        if (pSurf)
+        {
+            res = pSurf->Convert(amf::AMF_MEMORY_OPENCL);    //workaround the pitch issue
+            res = LoomConvert(m_srcLoomSLBuff, pSurf, amf::AMF_SURFACE_BGRA, offset);
+            offset += m_sizeSrc.width * m_sizeSrc.height * 3;
+            m_inputs[ch] = NULL;
+        }
+    }
+    wchar_t fileName[_MAX_PATH];
+    _swprintf(fileName, L"src_loom_%04lld.bmp", m_countFrame);
+    SaveToBmp(m_srcLoomSLBuff, fileName, m_sizeSrcLoom);
+
+    m_countFrame++;
+
+    cl_mem pSrc = (cl_mem)m_srcLoomSLBuff->GetNative();
+    vx_status status = ::lsSetCameraBuffer(m_contextLoom, &pSrc);
+
+    cl_mem pDst = (cl_mem)m_dstLoomSLBuff->GetNative();
+    status = ::lsSetOutputBuffer(m_contextLoom, &pDst);
+
+    ::lsScheduleFrame(m_contextLoom);
+    ::lsWaitForCompletion(m_contextLoom);
+
+    _swprintf(fileName, L"dst_loom_%04lld.bmp", m_countFrame);
+    SaveToBmp(m_dstLoomSLBuff, fileName, m_sizeDstLoom);
+
+    res = LoomConvert(m_dstLoomSLBuff, m_dstLoomSL, amf::AMF_SURFACE_RGBA);
+    return res;
+}
+
+AMF_RESULT StitchLoomSL::Init()
+{
+    AMF_RESULT res = AMF_OK;
+    m_sizeSrcLoom.width = m_sizeSrc.width * m_sizeCamera.height;
+    m_sizeSrcLoom.height = m_sizeSrc.height * m_sizeCamera.width;
+    AMF_ASSERT(m_sizeDst.width == (m_sizeDst.height * 2), L"equirectangle output aspect ratio must be 2:1!");
+
+    m_sizeDstLoom.height = m_sizeDst.height;
+    m_sizeDstLoom.width = 2 * m_sizeDstLoom.height;
+
+    if (!m_Compute)
+    {
+        m_pContext->GetCompute(amf::AMF_MEMORY_OPENCL, &m_Compute);
+        m_inputs.resize(m_countStream);
+    }
+
+   return res;
+}
+
+AMF_RESULT StitchLoomSL::AllocateResource()
+{
+    AMF_RESULT res = AMF_OK;
+
+    if (!m_srcLoomSLBuff)
+    {
+        res = m_pContext->AllocBuffer(amf::AMF_MEMORY_OPENCL, m_sizeSrcLoom.width * m_sizeSrcLoom.height * 3, &m_srcLoomSLBuff);
+    }
+
+    if (!m_dstLoomSL)
+    {
+        res = m_pContext->AllocSurface(amf::AMF_MEMORY_OPENCL, amf::AMF_SURFACE_BGRA, m_sizeDstLoom.width, m_sizeDstLoom.height, &m_dstLoomSL);
+    }
+
+    if (!m_dstLoomSLBuff)
+    {
+        res = m_pContext->AllocBuffer(amf::AMF_MEMORY_OPENCL, m_sizeDstLoom.width * m_sizeDstLoom.height * 3, &m_dstLoomSLBuff);
+    }
+return res;
+}
+
+AMF_RESULT StitchLoomSL::InitLoomSL()
+{
+    if (m_readyLoomSL) return AMF_OK;
+
+    AMF_RESULT res = AMF_OK;
+
+    if (!m_contextLoom)
+    {
+        m_contextLoom = ::lsCreateContext();
+
+    }
+
+    m_fmtSrcLoom = VX_DF_IMAGE_RGB;
+    m_fmtDstLoom = VX_DF_IMAGE_RGB;
+    vx_status status = ::lsSetCameraConfig(m_contextLoom, m_sizeCamera.width, m_sizeCamera.height, m_fmtSrcLoom, m_sizeSrcLoom.width, m_sizeSrcLoom.height);
+
+    if (!status)
+    {
+        status = ::lsSetOutputConfig(m_contextLoom, m_fmtDstLoom, m_sizeDstLoom.width, m_sizeDstLoom.height);
+    }
+
+    if (!status)
+    {
+        status = ::lsSetOpenCLContext(m_contextLoom, (cl_context)m_Compute->GetNativeContext());
+    }
+
+    if (!status)
+    {
+        char mbstr[_MAX_PATH];
+        std::wcstombs(mbstr, m_PTGuiProject.c_str(), _MAX_PATH);
+        status = ::lsImportConfiguration(m_contextLoom, "pts", mbstr);
+    }
+
+    if (!status)
+    {
+        status = ::lsInitialize(m_contextLoom);
+    }
+    res = status ? AMF_FAIL : AMF_OK;
+
+    if (AMF_OK == res)  m_readyLoomSL = true;
+    return res;
+}
+
+AMF_RESULT StitchLoomSL::SaveToBmp(amf::AMFSurface* pSurfIn, std::wstring fileName)
+{
+    if (!m_enableDump)    return AMF_OK;
+
+    AMF_RESULT res = AMF_OK;
+    amf::AMFDataPtr pDataHost;
+    res = pSurfIn->Duplicate(amf::AMF_MEMORY_HOST, &pDataHost);
+    amf::AMFSurfacePtr pSurf(pDataHost);
+
+    AMFPlane* plane = pSurf->GetPlaneAt(0);
+    amf_int32 width = plane->GetWidth();
+    amf_int32 height = plane->GetHeight();
+    amf_int32 pitch = plane->GetHPitch();
+    amf_uint8* pData = (amf_uint8*)plane->GetNative();
+    res = SaveToBmp(pData, fileName, width, height, 4, pitch);
+
+    return AMF_OK;
+}
+
+AMF_RESULT StitchLoomSL::SaveToBmp(amf::AMFBuffer* pBuffIn, std::wstring fileName, AMFSize sizeImage)
+{
+    if (!m_enableDump)    return AMF_OK;
+
+    AMF_RESULT res = AMF_OK;
+    amf::AMF_MEMORY_TYPE memType = pBuffIn->GetMemoryType();
+    pBuffIn->Convert(amf::AMF_MEMORY_HOST);
+    amf_uint8* pData = (amf_uint8*)pBuffIn->GetNative();
+    amf_int32 width = sizeImage.width;
+    amf_int32 height = sizeImage.height;
+    amf_int32 pitch = width * 3;
+
+    res = SaveToBmp(pData, fileName, width, height, 3, pitch);
+
+    pBuffIn->Convert(memType);
+
+    return AMF_OK;
+}
+
+AMF_RESULT StitchLoomSL::SaveToBmp(amf_uint8* pData, std::wstring fileName, amf_int32 width, amf_int32 height, amf_int32 channels, amf_int32 pitch)
+{
+    AMF_RESULT res = AMF_OK;
+
+    if (!pData)  return AMF_FAIL;
+
+    std::wstring fileNameFull(fileName);
+
+    if (m_workFolder.length() > 0)
+    {
+        fileNameFull = m_workFolder + fileNameFull;
+    }
+
+    FILE*  fp = _wfopen(fileNameFull.c_str(), L"wb");
+
+    if (fp)
+    {
+        amf_uint32 sizeImage = channels * width * height;
+
+        BITMAPFILEHEADER bmHeader = { 0 };
+        BITMAPINFOHEADER bmInfo = { 0 };
+        bmHeader.bfType = MAKEWORD('B', 'M');
+        bmHeader.bfSize = sizeImage + sizeof(bmHeader) + sizeof(bmInfo);
+        bmHeader.bfOffBits = sizeof(bmHeader) + sizeof(bmInfo);
+
+        bmInfo.biSize = sizeof(bmInfo);
+        bmInfo.biWidth = width;
+        bmInfo.biHeight = -height;
+        bmInfo.biBitCount = (channels==4) ? 32 : 24;
+        bmInfo.biSizeImage = sizeImage;
+        bmInfo.biPlanes = 1;
+
+        fwrite(&bmHeader, 1, sizeof(bmHeader), fp);
+        fwrite(&bmInfo, 1, sizeof(bmInfo), fp);
+
+        amf_uint32 lenLine = channels * width;
+        for (amf_int32 y = 0; y < height; y++, pData += pitch)
+        {
+            fwrite(pData, 1, lenLine, fp);
+        }
+
+        fclose(fp);
+    }
+
+    return AMF_OK;
+}
+
+#include "public\common\AMFFactory.h"
+extern AMFFactoryHelper g_AMFFactory;
+
+AMF_RESULT StitchLoomSL::LoomConvert(amf::AMFBuffer* pBuff, amf::AMFSurface* pSurf, amf::AMF_SURFACE_FORMAT fmtSrc, amf_size offsetBuf)
+{
+    AMF_RESULT res = AMF_OK;
+
+    if (!m_pKernelLoomBGRAtoRGB)
+    {
+        AMFPrograms *pPrograms = NULL;
+        g_AMFFactory.GetFactory()->GetPrograms(&pPrograms);
+        pPrograms->RegisterKernelSource(&m_kernelIDLoomBGRAtoRGB, L"BGRAtoRGB", "BGRAtoRGB", LoomConverterCount, LoomConverter, 0);
+        res = m_Compute->GetKernel(m_kernelIDLoomBGRAtoRGB, &m_pKernelLoomBGRAtoRGB);
+    }
+
+    if (!m_pKernelLoomRGBtoBGRA)
+    {
+        AMFPrograms *pPrograms = NULL;
+        g_AMFFactory.GetFactory()->GetPrograms(&pPrograms);
+        pPrograms->RegisterKernelSource(&m_kernelIDLoomRGBtoBGRA, L"RGBtoBGRA", "RGBtoBGRA", LoomConverterCount, LoomConverter, 0);
+        res = m_Compute->GetKernel(m_kernelIDLoomRGBtoBGRA, &m_pKernelLoomRGBtoBGRA);
+    }
+    amf::AMF_SURFACE_FORMAT fmt = pSurf->GetFormat();
+    
+    amf::AMFComputeKernelPtr pKernel = (fmtSrc == amf::AMF_SURFACE_BGRA) ? m_pKernelLoomBGRAtoRGB : m_pKernelLoomRGBtoBGRA;
+    AMFPlanePtr plane = pSurf->GetPlaneAt(0);
+    amf_size index = 0;
+    amf_int32 width = plane->GetWidth();
+    amf_int32 height = plane->GetHeight();
+    amf_int32 pitch = plane->GetHPitch();
+
+    res = pKernel->SetArgPlane(index++, plane, AMF_ARGUMENT_ACCESS_READ);
+    res = pKernel->SetArgBuffer(index++, pBuff, AMF_ARGUMENT_ACCESS_WRITE);
+    res = pKernel->SetArgInt32(index++, width);
+    res = pKernel->SetArgInt32(index++, height);
+    res = pKernel->SetArgInt32(index++, width * 3);
+    res = pKernel->SetArgInt32(index++, (amf_int32)offsetBuf);
+
+    amf_size offset[3] = { 0, 0, 0};
+    amf_size size[3] = {256, 512, 1};
+    amf_size localSize[3] = {8, 8, 1};
+
+    size[0] = localSize[0] * ((width + localSize[0] - 1) / localSize[0]);
+   size[1] = localSize[1] * ((height + localSize[1] - 1) / localSize[1]);
+
+   res = pKernel->Enqueue(2, offset, size, localSize);
+    m_Compute->FlushQueue();
+
+    return res;
+}
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/StitchLoomSL.h Added

@@ -0,0 +1,61 @@
+#pragma once
+#include <vector>
+
+#include "public/include/core/Context.h"
+#include "public/include/components/Component.h"
+#include "public/include/components/VideoConverter.h"
+#include "live_stitch_api.h"
+
+class StitchLoomSL
+{
+public:
+    StitchLoomSL(amf::AMFContext* pContext, AMFSize sizeCamera, AMFSize sizeSrc, AMFSize sizeDst, 
+        std::wstring PTGuiProject, std::wstring workFolder);
+    virtual ~StitchLoomSL();
+    AMF_RESULT SubmitInputInt(amf::AMFData* pData, amf_int32 slot);
+    AMF_RESULT QueryOutput(amf::AMFData** ppData);
+    AMF_RESULT Init();
+    AMF_RESULT Drain();
+    AMF_RESULT Flush();
+
+protected:
+    AMF_RESULT AllocateResource();
+    AMF_RESULT InitLoomSL();
+    AMF_RESULT Compose(amf::AMFSurface **ppSurfaceOut);
+    AMF_RESULT SaveToBmp(amf::AMFSurface* pSurf, std::wstring fileName);
+    AMF_RESULT SaveToBmp(amf::AMFBuffer* pBuffIn, std::wstring, AMFSize sizeImage);
+    AMF_RESULT LoomConvert(amf::AMFBuffer* pBuffIn, amf::AMFSurface* pSurfOut, amf::AMF_SURFACE_FORMAT fmtSrc, amf_size offset=0);
+    AMF_RESULT SaveToBmp(amf_uint8* pData, std::wstring fileName, amf_int32 width, amf_int32 height, amf_int32 channels, amf_int32 pitch);
+
+protected:
+    amf::AMFContext*     m_pContext;
+    amf::AMFComputePtr   m_Compute;
+
+    std::vector<amf::AMFDataPtr> m_inputs;
+
+    ls_context         m_contextLoom;
+    amf::AMFSurfacePtr m_dstLoomSL;
+    amf::AMFBufferPtr m_srcLoomSLBuff;
+    amf::AMFBufferPtr m_dstLoomSLBuff;
+
+    AMFSize m_sizeSrc;
+    AMFSize m_sizeDst;
+    AMFSize m_sizeCamera;
+    AMFSize m_sizeSrcLoom;
+    AMFSize m_sizeDstLoom;
+    vx_df_image m_fmtSrcLoom;
+    vx_df_image m_fmtDstLoom;
+    amf_uint32 m_countStream;
+    std::wstring m_PTGuiProject;
+    amf_bool  m_readyLoomSL;
+    amf_int64 m_countFrame;
+
+    bool                m_eof;
+
+    amf::AMF_KERNEL_ID      m_kernelIDLoomBGRAtoRGB;
+    amf::AMF_KERNEL_ID      m_kernelIDLoomRGBtoBGRA;
+    amf::AMFComputeKernelPtr m_pKernelLoomBGRAtoRGB;
+    amf::AMFComputeKernelPtr m_pKernelLoomRGBtoBGRA;
+    bool                m_enableDump;
+    std::wstring       m_workFolder;
+};

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/StitchPreviewPipeline.cpp Added

@@ -0,0 +1,133 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include "StitchPreviewPipeline.h"
+#include "public/samples/CPPSamples/common/BackBufferPresenter.h"
+#define _USE_MATH_DEFINES
+#include "math.h"
+#include "public/samples/CPPSamples/common/AudioPresenterWin.h"
+
+StitchPreviewPipeline::StitchPreviewPipeline()
+    : m_hwnd(NULL)
+{
+}
+
+AMF_RESULT
+StitchPreviewPipeline::Init(
+    HWND hwnd,
+    const std::vector<std::wstring>& filenames,
+    const std::wstring& ptguifilename,
+    AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode
+)
+{
+    m_hwnd = hwnd;
+    return StitchPipeline::Init(filenames, ptguifilename, outputMode);
+}
+
+AMF_RESULT
+StitchPreviewPipeline::InitContext(amf::AMF_MEMORY_TYPE type)
+{
+    g_AMFFactory.GetFactory()->CreateContext(&m_pContext);
+
+    switch (type)
+    {
+    case amf::AMF_MEMORY_DX9:
+        {
+            const AMF_RESULT res = m_pContext->InitDX9(NULL);
+            CHECK_AMF_ERROR_RETURN(res, "Init DX9");
+            m_bVideoPresenterDirectConnect = true;
+            return AMF_OK;
+        }
+
+    case amf::AMF_MEMORY_DX11:
+        {
+            const AMF_RESULT res = m_pContext->InitDX11(NULL);
+            CHECK_AMF_ERROR_RETURN(res, "Init DX11");
+            m_bVideoPresenterDirectConnect = true;
+            return AMF_OK;
+        }
+
+    case amf::AMF_MEMORY_OPENGL:
+        {
+            AMF_RESULT res = m_pContext->InitDX9(NULL);
+            CHECK_AMF_ERROR_RETURN(res, "Init DX9");
+            res = m_pContext->InitOpenGL(NULL, m_hwnd, NULL);
+            CHECK_AMF_ERROR_RETURN(res, "Init OpenGL");
+            m_bVideoPresenterDirectConnect = false;
+            return AMF_OK;
+        }
+
+    default:
+        return AMF_NOT_SUPPORTED;
+    }
+}
+
+AMF_RESULT
+StitchPreviewPipeline::CreateVideoPresenter(amf::AMF_MEMORY_TYPE type, amf_int32 /*compositedWidth*/, amf_int32 /*compositedHeight*/)
+{
+    BackBufferPresenterPtr pBackBufferPresenter;
+    AMF_RESULT res = BackBufferPresenter::Create(pBackBufferPresenter, type, m_hwnd, m_pContext);
+    m_pVideoPresenter = pBackBufferPresenter;
+    return res;
+}
+void StitchPreviewPipeline::MouseShift(int x1,int y1, int x2, int y2)
+{
+    if(m_pStitch == NULL)
+    {
+        return;
+    }
+    double deltaY = ((x2 - x1) * M_PI / 180.0) / 10.0;
+    double deltaX = ((y2 - y1) * M_PI / 180.0) / 10.0;
+
+    if(deltaX != 0)
+    {
+        m_pStitch->SetProperty(AMF_VIDEO_STITCH_VIEW_ROTATE_X, deltaX);
+    }
+    if(deltaY != 0)
+    {
+        m_pStitch->SetProperty(AMF_VIDEO_STITCH_VIEW_ROTATE_Y, deltaY);
+    }
+    if(m_pVideoPresenter->GetMode() ==  VideoPresenter::ModePaused)
+    {
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+    }
+}
+
+AMF_RESULT StitchPreviewPipeline::CreateAudioPresenter()
+{
+#if defined(_WIN32)
+//    m_pAudioPresenter = std::make_shared<AudioPresenterWin>();
+    return AMF_OK;
+#else
+    return AMF_NOT_IMPLEMENTED;
+#endif
+}
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/StitchPreviewPipeline.h Added

@@ -0,0 +1,64 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once
+
+#include "public/samples/CPPSamples/common/StitchPipeline.h"
+
+class StitchPreviewPipeline : public StitchPipeline
+{
+public:
+    StitchPreviewPipeline();
+
+    AMF_RESULT Init(
+        HWND hwnd,
+        const std::vector<std::wstring>& filenames,
+        const std::wstring& ptguifilename,
+        AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode
+    );
+
+    AMF_RESULT Init(
+        const std::vector<std::wstring>& filenames,
+        const std::wstring& ptguifilename,
+        AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode
+    ) = delete;
+
+    void MouseShift(int x1, int y1, int x2, int y2);
+
+protected:
+    AMF_RESULT InitContext(amf::AMF_MEMORY_TYPE type) override;
+    AMF_RESULT CreateVideoPresenter(amf::AMF_MEMORY_TYPE type, amf_int32 compositedWidth, amf_int32 compositedHeight) override;
+    AMF_RESULT CreateAudioPresenter();
+
+    HWND m_hwnd;
+};
+
+typedef std::shared_ptr<StitchPreviewPipeline> StitchPreviewPipelinePtr;

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch_VS2013.vcxproj Added

@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E5BBA617-660A-492E-8AB8-550ED638DDEF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Stitch</RootNamespace>
+    <ProjectName>Stitch</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\SDK32-10.0.10586.0.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\SDK64-10.0.10586.0.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\SDK32-10.0.10586.0.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\SDK64-10.0.10586.0.props" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="Stitch.ico" />
+    <None Include="small.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ByteArray.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsAVC.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsHEVC.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\PipelineElement.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.h" />
+    <ClInclude Include="..\..\..\include\components\VideoCapture.h" />
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h" />
+    <ClInclude Include="..\..\..\include\components\ZCamLiveStream.h" />
+    <ClInclude Include="..\..\..\src\components\VideoCapture\MFSource.h" />
+    <ClInclude Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.h" />
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.h" />
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h" />
+    <ClInclude Include="..\common\StitchPipeline.h" />
+    <ClInclude Include="..\common\StitchPipelineBase.h" />
+    <ClInclude Include="Stitch.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="StitchPreviewPipeline.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsAVC.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsHEVC.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoCapture\MFSource.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.cpp" />
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp" />
+    <ClCompile Include="..\common\StitchPipeline.cpp" />
+    <ClCompile Include="..\common\StitchPipelineBase.cpp" />
+    <ClCompile Include="Stitch.cpp" />
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="StitchPreviewPipeline.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Stitch.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch_VS2013.vcxproj.filters Added

@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\StitchPipeline.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="Stitch.cpp" />
+    <ClCompile Include="StitchPreviewPipeline.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsAVC.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsHEVC.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoCapture\MFSource.cpp">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.cpp">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.cpp">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\StitchPipelineBase.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\StitchPipeline.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="Stitch.h" />
+    <ClInclude Include="StitchPreviewPipeline.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ByteArray.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsAVC.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\EncoderParamsHEVC.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\PipelineElement.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoCapture.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\ZCamLiveStream.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoCapture\MFSource.h">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.h">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.h">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\StitchPipelineBase.h">
+      <Filter>common</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="small.ico" />
+    <None Include="Stitch.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="public">
+      <UniqueIdentifier>{2299fe67-4163-463c-bc37-35037a539a07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\common">
+      <UniqueIdentifier>{10f84691-f9a5-4cb9-b7ed-adf7954eb4a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{d98e77c8-1e48-4122-b6ef-f6e5113b7a0d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components">
+      <UniqueIdentifier>{4667c354-e1d3-40c5-b2d0-a3a85ca622fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\include">
+      <UniqueIdentifier>{ac813e2d-c67d-4056-84ba-079d8db4f610}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\ZCamLiveStream">
+      <UniqueIdentifier>{b24feacc-f509-4695-abbb-0684e0862e48}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\VideoCapture">
+      <UniqueIdentifier>{76139613-4604-4d76-b8ef-49ad0759994b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Stitch.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch_VS2015.vcxproj Added

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Stitch</RootNamespace>
+    <ProjectName>Stitch</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2015.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="Stitch.ico" />
+    <None Include="small.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ByteArray.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\PipelineElement.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.h" />
+    <ClInclude Include="..\..\..\include\components\VideoCapture.h" />
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h" />
+    <ClInclude Include="..\..\..\include\components\ZCamLiveStream.h" />
+    <ClInclude Include="..\..\..\src\components\VideoCapture\MFSource.h" />
+    <ClInclude Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.h" />
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.h" />
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h" />
+    <ClInclude Include="..\common\EncoderParamsAVC.h" />
+    <ClInclude Include="..\common\EncoderParamsHEVC.h" />
+    <ClInclude Include="..\common\StitchPipeline.h" />
+    <ClInclude Include="..\common\StitchPipelineBase.h" />
+    <ClInclude Include="Stitch.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="StitchPreviewPipeline.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.cpp" />
+    <ClCompile Include="..\..\..\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoCapture\MFSource.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.cpp" />
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp" />
+    <ClCompile Include="..\common\EncoderParamsAVC.cpp" />
+    <ClCompile Include="..\common\EncoderParamsHEVC.cpp" />
+    <ClCompile Include="..\common\StitchPipeline.cpp" />
+    <ClCompile Include="..\common\StitchPipelineBase.cpp" />
+    <ClCompile Include="Stitch.cpp" />
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="StitchPreviewPipeline.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Stitch.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch_VS2015.vcxproj.filters Added

@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\StitchPipeline.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="Stitch.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\EncoderParamsAVC.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\EncoderParamsHEVC.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\StitchPipelineBase.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoCapture\MFSource.cpp">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.cpp">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.cpp">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="StitchPreviewPipeline.cpp" />
+    <ClCompile Include="..\..\..\common\PropertyStorageExImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\StitchPipeline.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="Stitch.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ByteArray.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\PipelineElement.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\EncoderParamsAVC.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\EncoderParamsHEVC.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\StitchPipelineBase.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoCapture.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\ZCamLiveStream.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoCapture\MFSource.h">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.h">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.h">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="StitchPreviewPipeline.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="small.ico" />
+    <None Include="Stitch.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="public">
+      <UniqueIdentifier>{2299fe67-4163-463c-bc37-35037a539a07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\common">
+      <UniqueIdentifier>{10f84691-f9a5-4cb9-b7ed-adf7954eb4a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{d98e77c8-1e48-4122-b6ef-f6e5113b7a0d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components">
+      <UniqueIdentifier>{4667c354-e1d3-40c5-b2d0-a3a85ca622fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\include">
+      <UniqueIdentifier>{ac813e2d-c67d-4056-84ba-079d8db4f610}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\ZCamLiveStream">
+      <UniqueIdentifier>{b24feacc-f509-4695-abbb-0684e0862e48}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\VideoCapture">
+      <UniqueIdentifier>{76139613-4604-4d76-b8ef-49ad0759994b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Stitch.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch_VS2017.vcxproj Added

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Stitch</RootNamespace>
+    <ProjectName>Stitch</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\public\props\AMF_VS2017.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../;;$(SolutionDir)../../../Thirdparty/tinyxml/include</AdditionalIncludeDirectories>
+      <ExceptionHandling>Async</ExceptionHandling>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;DXGI.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="Stitch.ico" />
+    <None Include="small.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h" />
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h" />
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h" />
+    <ClInclude Include="..\..\..\..\public\common\Thread.h" />
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ByteArray.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\PipelineElement.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.h" />
+    <ClInclude Include="..\..\..\include\components\VideoCapture.h" />
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h" />
+    <ClInclude Include="..\..\..\include\components\ZCamLiveStream.h" />
+    <ClInclude Include="..\..\..\src\components\VideoCapture\MFSource.h" />
+    <ClInclude Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.h" />
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.h" />
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h" />
+    <ClInclude Include="..\common\EncoderParamsAVC.h" />
+    <ClInclude Include="..\common\EncoderParamsHEVC.h" />
+    <ClInclude Include="..\common\StitchPipeline.h" />
+    <ClInclude Include="..\common\StitchPipelineBase.h" />
+    <ClInclude Include="Stitch.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="StitchPreviewPipeline.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp" />
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.cpp" />
+    <ClCompile Include="..\..\..\common\PropertyStorageExImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoCapture\MFSource.cpp" />
+    <ClCompile Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.cpp" />
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.cpp" />
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp" />
+    <ClCompile Include="..\common\EncoderParamsAVC.cpp" />
+    <ClCompile Include="..\common\EncoderParamsHEVC.cpp" />
+    <ClCompile Include="..\common\StitchPipeline.cpp" />
+    <ClCompile Include="..\common\StitchPipelineBase.cpp" />
+    <ClCompile Include="Stitch.cpp" />
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="StitchPreviewPipeline.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Stitch.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/Stitch_VS2017.vcxproj.filters Added

@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\public\common\AMFFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Thread.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\Windows\ThreadWindows.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFactory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamFile.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\DataStreamMemory.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\AMFSTL.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\common\TraceAdapter.cpp">
+      <Filter>public\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\StitchPipeline.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="Stitch.cpp" />
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\EncoderParamsAVC.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\EncoderParamsHEVC.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\StitchPipelineBase.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoCapture\MFSource.cpp">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.cpp">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.cpp">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.cpp">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClCompile>
+    <ClCompile Include="StitchPreviewPipeline.cpp" />
+    <ClCompile Include="..\..\..\common\PropertyStorageExImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\public\common\AMFFactory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\Thread.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamFile.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\DataStreamMemory.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\AMFSTL.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\common\TraceAdapter.h">
+      <Filter>public\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\StitchPipeline.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="Stitch.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BackBufferPresenter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParser.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH264.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\BitStreamParserH265.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ByteArray.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLineParser.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\CmdLogger.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\ParametersStorage.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\Pipeline.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\PipelineElement.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenter.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX9.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterDX11.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\samples\CPPSamples\common\VideoPresenterOpenGL.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\EncoderParamsAVC.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\EncoderParamsHEVC.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\StitchPipelineBase.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoCapture.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\VideoStitch.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\components\ZCamLiveStream.h">
+      <Filter>public\components\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoCapture\MFSource.h">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\VideoCapture\VideoCaptureImpl.h">
+      <Filter>public\components\VideoCapture</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\DataStreamZCam.h">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\components\ZCamLiveStream\ZCamLiveStreamImpl.h">
+      <Filter>public\components\ZCamLiveStream</Filter>
+    </ClInclude>
+    <ClInclude Include="StitchPreviewPipeline.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="small.ico" />
+    <None Include="Stitch.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="public">
+      <UniqueIdentifier>{2299fe67-4163-463c-bc37-35037a539a07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\common">
+      <UniqueIdentifier>{10f84691-f9a5-4cb9-b7ed-adf7954eb4a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{d98e77c8-1e48-4122-b6ef-f6e5113b7a0d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components">
+      <UniqueIdentifier>{4667c354-e1d3-40c5-b2d0-a3a85ca622fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\include">
+      <UniqueIdentifier>{ac813e2d-c67d-4056-84ba-079d8db4f610}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\ZCamLiveStream">
+      <UniqueIdentifier>{b24feacc-f509-4695-abbb-0684e0862e48}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="public\components\VideoCapture">
+      <UniqueIdentifier>{76139613-4604-4d76-b8ef-49ad0759994b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Stitch.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/resource.h Added

@@ -0,0 +1,65 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Stitch.rc
+//
+#define IDC_MYICON                      2
+#define IDD_STITCH_DIALOG               102
+#define IDS_APP_TITLE                   103
+#define IDD_ABOUTBOX                    103
+#define IDM_ABOUT                       104
+#define IDM_EXIT                        105
+#define IDI_STITCH                      107
+#define IDI_SMALL                       108
+#define IDC_STITCH                      109
+#define IDR_MAINFRAME                   128
+#define IDD_PROGRESS_DLG                131
+#define IDC_PROGRESS_BAR                1000
+#define IDC_BUTTON3                     1004
+#define ID_FILE_OPEN                    32771
+#define ID_OPTIONS_PRESENTER_DX11       32780
+#define ID_OPTIONS_PRESENTER_DX9        32781
+#define ID_OPTIONS_PRESENTER_OPENGL     32782
+#define ID_PLAYBACK_PLAY                32785
+#define ID_PLAYBACK_PAUSE               32786
+#define ID_PLAYBACK_STEP                32788
+#define ID_PLAYBACK_STOP                32789
+#define ID_OPTIONS_LOOP                 32790
+#define ID_OPTIONS_FORCE60FPS           32791
+#define ID_FILE_CLEARFILELIST           32792
+#define ID_OPTIONS_LOW_LATENCY          32798
+#define ID_OPTIONS_EDITPROPERTIES       32799
+#define ID_OPTIONS_DUMP_TEMPLATE        32800
+#define ID_FILE_OPENPTGUIPROJECT        32801
+#define ID_FILE_ZCAMLIVE                32802
+#define ID_FILE_ZCAMLIVE_1080P          32803
+#define ID_FILE_ZCAMLIVE_2K7            32804
+#define ID_OPTIONS_RENDERER_DX11        32805
+#define ID_OPTIONS_COMPUTE_FOR_DX11     32806
+#define ID_OPTIONS_RENDERER_OPNECL      32807
+#define ID_OPTIONS_RENDERER_OPENCL      32808
+#define ID_OPTIONS_FULLSPEED            32809
+#define ID_OPTIONS_SUBRESOURCE          32810
+#define ID_SUBRESOURCE_INDEX0           32811
+#define ID_SUBRESOURCE_INDEX1           32812
+#define ID_SUBRESOURCE_INDEX2           32813
+#define ID_SUBRESOURCE_INDEX3           32814
+#define ID_SUBRESOURCE_INDEX4           32815
+#define ID_SUBRESOURCE_INDEX5           32816
+#define ID_FILE_ZCAMLIVE_2544P          32817
+#define ID_FILE_RICOH                   32818
+#define ID_FILE_RICOH_THETA_S           32819
+#define ID_FILE_RICOHTHETASLIVE         32820
+#define ID_FILE_RICOH_THETA_V           32821
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        133
+#define _APS_NEXT_COMMAND_VALUE         32822
+#define _APS_NEXT_CONTROL_VALUE         1006
+#define _APS_NEXT_SYMED_VALUE           110
+#endif
+#endif

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/small.ico Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/stdafx.cpp Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/stdafx.h Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/Stitch/targetver.h Added

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/DisplayDvrPipeline.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/DisplayDvrPipeline.cpp Changed

@@ -498,56 +498,54 @@
 		res = m_pMuxer->GetInput(input, &pInput);
 		CHECK_AMF_ERROR_RETURN(res, L"m_pMuxer->GetInput() failed");
 
-		amf_int64 eStreamType = MUXER_UNKNOWN;
-		pInput->GetProperty(FFMPEG_MUXER_STREAM_TYPE, &eStreamType);
+		amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+		pInput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
 
-		if (eStreamType == MUXER_VIDEO)
+		if (eStreamType == AMF_STREAM_VIDEO)
 		{
 			outVideoStreamMuxerIndex = input;
 
-			pInput->SetProperty(FFMPEG_MUXER_STREAM_ENABLED, true);
+			pInput->SetProperty(AMF_STREAM_ENABLED, true);
 			amf_int32 bitrate = 0;
 			if (m_szEncoderID == AMFVideoEncoderVCE_AVC || m_szEncoderID == AMFVideoEncoderVCE_SVC)
 			{
-#define AV_CODEC_ID_H264 28 // works with current FFmpeg only
-				pInput->SetProperty(FFMPEG_MUXER_CODEC_ID, AV_CODEC_ID_H264); // default
+				pInput->SetProperty(AMF_STREAM_CODEC_ID, AMF_STREAM_CODEC_ID_H264_AVC); // default
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &bitrate);
-				pInput->SetProperty(FFMPEG_MUXER_BIT_RATE, bitrate);
+				pInput->SetProperty(AMF_STREAM_BIT_RATE, bitrate);
 				amf::AMFInterfacePtr pExtraData;
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_EXTRADATA, &pExtraData);
-				pInput->SetProperty(FFMPEG_MUXER_EXTRA_DATA, pExtraData);
+				pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
 
 				AMFSize frameSize;
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, &frameSize);
-				pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAMESIZE, frameSize);
+				pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, frameSize);
 
 				AMFRate frameRate;
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &frameRate);
-				pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAME_RATE, frameRate);
+				pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_RATE, frameRate);
 			}
 			else
 			{
-#define AV_CODEC_ID_H265 174 // works with current FFmpeg only
-				pInput->SetProperty(FFMPEG_MUXER_CODEC_ID, AV_CODEC_ID_H265);
+				pInput->SetProperty(AMF_STREAM_CODEC_ID, AMF_STREAM_CODEC_ID_H265_HEVC);
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &bitrate);
-				pInput->SetProperty(FFMPEG_MUXER_BIT_RATE, bitrate);
+				pInput->SetProperty(AMF_STREAM_BIT_RATE, bitrate);
 				amf::AMFInterfacePtr pExtraData;
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_EXTRADATA, &pExtraData);
-				pInput->SetProperty(FFMPEG_MUXER_EXTRA_DATA, pExtraData);
+				pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
 
 				AMFSize frameSize;
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &frameSize);
-				pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAMESIZE, frameSize);
+				pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, frameSize);
 
 				AMFRate frameRate;
 				m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, &frameRate);
-				pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAME_RATE, frameRate);
+				pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_RATE, frameRate);
 			}
 		}
-		else if (eStreamType == MUXER_AUDIO)
+		else if (eStreamType == AMF_STREAM_AUDIO)
 		{
 			outAudioStreamMuxerIndex = input;
-			pInput->SetProperty(FFMPEG_MUXER_STREAM_ENABLED, true);
+			pInput->SetProperty(AMF_STREAM_ENABLED, true);
 
 			amf_int64 codecID = 0;
 			amf_int64 streamBitRate = 0;
@@ -569,16 +567,16 @@
 
 			amf::AMFInterfacePtr pExtraData;
 			m_pAudioEncoder->GetProperty(AUDIO_ENCODER_OUT_AUDIO_EXTRA_DATA, &pExtraData);
-			pInput->SetProperty(FFMPEG_MUXER_EXTRA_DATA, pExtraData);
-
-			pInput->SetProperty(FFMPEG_MUXER_CODEC_ID, codecID);
-			pInput->SetProperty(FFMPEG_MUXER_BIT_RATE, streamBitRate);
-			pInput->SetProperty(FFMPEG_MUXER_AUDIO_SAMPLE_RATE, streamSampleRate);
-			pInput->SetProperty(FFMPEG_MUXER_AUDIO_CHANNELS, streamChannels);
-			pInput->SetProperty(FFMPEG_MUXER_AUDIO_SAMPLE_FORMAT, streamFormat);
-			pInput->SetProperty(FFMPEG_MUXER_AUDIO_CHANNEL_LAYOUT, streamLayout);
-			pInput->SetProperty(FFMPEG_MUXER_AUDIO_BLOCK_ALIGN, streamBlockAlign);
-			pInput->SetProperty(FFMPEG_MUXER_AUDIO_FRAME_SIZE, streamFrameSize);
+			pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
+
+			pInput->SetProperty(AMF_STREAM_CODEC_ID, codecID);
+			pInput->SetProperty(AMF_STREAM_BIT_RATE, streamBitRate);
+			pInput->SetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, streamSampleRate);
+			pInput->SetProperty(AMF_STREAM_AUDIO_CHANNELS, streamChannels);
+			pInput->SetProperty(AMF_STREAM_AUDIO_FORMAT, streamFormat);
+			pInput->SetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, streamLayout);
+			pInput->SetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, streamBlockAlign);
+			pInput->SetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, streamFrameSize);
 		}
 	}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/ParametersStorage.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/ParametersStorage.cpp Changed

@@ -35,6 +35,7 @@
 
 #include "ParametersStorage.h"
 #include "CmdLogger.h"
+#include "public/include/components/VideoDecoderUVD.h"
 #include "public/include/components/VideoEncoderVCE.h"
 #include "public/include/components/VideoEncoderHEVC.h"
 #include "public/include/components/VideoConverter.h"
@@ -429,3 +430,22 @@
     valueOut = paramValue.c_str();
     return AMF_OK;
 }
+
+wchar_t *StreamCodecIDtoDecoderID(AMF_STREAM_CODEC_ID_ENUM eCodec)
+{
+    switch(eCodec)
+    {
+    case AMF_STREAM_CODEC_ID_UNKNOWN: return L"";
+    case AMF_STREAM_CODEC_ID_MPEG2: return AMFVideoDecoderUVD_MPEG2;
+    case AMF_STREAM_CODEC_ID_MPEG4: return AMFVideoDecoderUVD_MPEG4;      
+    case AMF_STREAM_CODEC_ID_WMV3: return AMFVideoDecoderUVD_WMV3;       
+    case AMF_STREAM_CODEC_ID_VC1: return AMFVideoDecoderUVD_VC1;        
+    case AMF_STREAM_CODEC_ID_H264_AVC: return AMFVideoDecoderUVD_H264_AVC;
+    case AMF_STREAM_CODEC_ID_H264_MVC: return AMFVideoDecoderUVD_H264_MVC;  
+    case AMF_STREAM_CODEC_ID_H264_SVC: return AMFVideoDecoderUVD_H264_SVC;  
+    case AMF_STREAM_CODEC_ID_MJPEG: return AMFVideoDecoderUVD_MJPEG;
+    case AMF_STREAM_CODEC_ID_H265_HEVC: return AMFVideoDecoderHW_H265_HEVC;
+    case AMF_STREAM_CODEC_ID_H265_MAIN10: return AMFVideoDecoderHW_H265_MAIN10;
+    }
+    return L"";
+}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/ParametersStorage.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/ParametersStorage.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/PlaybackPipeline.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/PlaybackPipeline.cpp Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/PlaybackPipelineBase.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/PlaybackPipelineBase.cpp Changed

@@ -302,17 +302,17 @@
             res = m_pDemuxerVideo->GetOutput(output, &pOutput);
             CHECK_AMF_ERROR_RETURN(res, L"m_pDemuxerVideo->GetOutput() failed");
 
-            amf_int64 eStreamType = DEMUXER_UNKNOWN;
-            pOutput->GetProperty(FFMPEG_DEMUXER_STREAM_TYPE, &eStreamType);
+            amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+            pOutput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
 
 
-            if(iVideoStreamIndex < 0 && eStreamType == DEMUXER_VIDEO)
+            if(iVideoStreamIndex < 0 && eStreamType == AMF_STREAM_VIDEO)
             {
                 iVideoStreamIndex = output;
                 pVideoOutput = pOutput;
             }
 
-            if(iAudioStreamIndex < 0 && eStreamType == DEMUXER_AUDIO)
+            if(iAudioStreamIndex < 0 && eStreamType == AMF_STREAM_AUDIO)
             {
                 iAudioStreamIndex = output;
                 pAudioOutput = pOutput;
@@ -337,17 +337,17 @@
                 res = m_pDemuxerAudio->GetOutput(output, &pOutput);
                 CHECK_AMF_ERROR_RETURN(res, L"m_pDemuxerAudio->GetOutput() failed");
 
-                amf_int64 eStreamType = DEMUXER_UNKNOWN;
-                pOutput->GetProperty(FFMPEG_DEMUXER_STREAM_TYPE, &eStreamType);
+                amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+                pOutput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
 
 
-                if(iVideoStreamIndex < 0 && eStreamType == DEMUXER_VIDEO)
+                if(iVideoStreamIndex < 0 && eStreamType == AMF_STREAM_VIDEO)
                 {
                     iVideoStreamIndex = output;
                     pVideoOutput = pOutput;
                 }
 
-                if(iAudioStreamIndex < 0 && eStreamType == DEMUXER_AUDIO)
+                if(iAudioStreamIndex < 0 && eStreamType == AMF_STREAM_AUDIO)
                 {
                     iAudioStreamIndex = output;
                     pAudioOutput = pOutput;
@@ -694,17 +694,17 @@
     amf_int64 streamFrameSize = 0;
     amf::AMFInterfacePtr pExtradata;
 
-    pOutput->GetProperty(FFMPEG_DEMUXER_CODEC_ID, &codecID);
+    pOutput->GetProperty(AMF_STREAM_CODEC_ID, &codecID);
 
-    pOutput->GetProperty(FFMPEG_DEMUXER_BIT_RATE, &streamBitRate);
-    pOutput->GetProperty(FFMPEG_DEMUXER_EXTRA_DATA, &pExtradata);
+    pOutput->GetProperty(AMF_STREAM_BIT_RATE, &streamBitRate);
+    pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &pExtradata);
 
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_SAMPLE_RATE, &streamSampleRate);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_CHANNELS, &streamChannels);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_SAMPLE_FORMAT, &streamFormat);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_CHANNEL_LAYOUT, &streamLayout);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_BLOCK_ALIGN, &streamBlockAlign);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_FRAME_SIZE, &streamFrameSize);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, &streamSampleRate);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNELS, &streamChannels);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_FORMAT, &streamFormat);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, &streamLayout);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, &streamBlockAlign);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, &streamFrameSize);
 
     res = g_AMFFactory.LoadExternalComponent(m_pContext, FFMPEG_DLL_NAME, "AMFCreateComponentInt", FFMPEG_AUDIO_DECODER, &m_pAudioDecoder);
     CHECK_AMF_ERROR_RETURN(res, L"LoadExternalComponent(" << FFMPEG_AUDIO_DECODER << L") failed");
@@ -766,7 +766,7 @@
     res = m_pAudioConverter->Init(amf::AMF_SURFACE_UNKNOWN, 0, 0);
     CHECK_AMF_ERROR_RETURN(res, L"m_pAudioConverter->Init() failed");
 
-    pOutput->SetProperty(FFMPEG_DEMUXER_STREAM_ENABLED, true);
+    pOutput->SetProperty(AMF_STREAM_ENABLED, true);
 
    return AMF_OK;
 }
@@ -804,26 +804,24 @@
     else if(pOutput != NULL)
     { 
         amf::AMFInterfacePtr pInterface;
-        pOutput->GetProperty(FFMPEG_DEMUXER_EXTRA_DATA, &pInterface);
+        pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &pInterface);
         pExtraData = amf::AMFBufferPtr(pInterface);
 
         AMFSize frameSize;
-        pOutput->GetProperty(FFMPEG_DEMUXER_VIDEO_FRAMESIZE, &frameSize);
+        pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, &frameSize);
         m_iVideoWidth = frameSize.width;
         m_iVideoHeight = frameSize.height;
         
-        amf::AMFVariant var;
-        res= pOutput->GetProperty(FFMPEG_DEMUXER_VIDEO_DECODER_ID, &var);
-        if(res == AMF_OK)  // video stream setup
-        {
-            pVideoDecoderID = var.ToWString().c_str();
-        }
-        pOutput->SetProperty(FFMPEG_DEMUXER_STREAM_ENABLED, true);
+        amf_int64 codecID;
+        res= pOutput->GetProperty(AMF_STREAM_CODEC_ID, &codecID);
+        pVideoDecoderID = StreamCodecIDtoDecoderID(AMF_STREAM_CODEC_ID_ENUM(codecID));
+        
+        pOutput->SetProperty(AMF_STREAM_ENABLED, true);
 
-		pOutput->GetProperty(FFMPEG_DEMUXER_BIT_RATE, &bitRate);
+		pOutput->GetProperty(AMF_STREAM_BIT_RATE, &bitRate);
 
 		AMFRate frameRate = {};
-		pOutput->GetProperty(FFMPEG_DEMUXER_VIDEO_FRAME_RATE, &frameRate);
+		pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_RATE, &frameRate);
 
 		dFps = frameRate.den == 0 ? 0.0 : (static_cast<double>(frameRate.num) / static_cast<double>(frameRate.den));
     }
@@ -841,6 +839,11 @@
     res = CreateVideoPresenter(presenterEngine, bitRate, dFps);
     CHECK_AMF_ERROR_RETURN(res, L"CreatePresenter() failed");
 
+    if(m_eDecoderFormat == amf::AMF_SURFACE_P010) //HDR support
+    {
+        m_pVideoPresenter->SetInputFormat(amf::AMF_SURFACE_RGBA_F16);
+    }
+
     res = m_pVideoPresenter->Init(m_iVideoWidth, m_iVideoHeight);
     CHECK_AMF_ERROR_RETURN(res, L"m_pVideoPresenter->Init(" << m_iVideoWidth << m_iVideoHeight << ") failed");

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/StitchPipeline.cpp Added

@@ -0,0 +1,199 @@
+#include "StitchPipeline.h"
+
+#include "public/common/TraceAdapter.h"
+#define AMF_DISABLE_PLAYBACK_EXPORTS
+#include "public/include/components/FFMPEGComponents.h"
+#include "public/include/components/FFMPEGFileDemuxer.h"
+#include <fstream>
+#include "public/include/components/ZCamLiveStream.h"
+
+#define _USE_MATH_DEFINES
+#include "math.h"
+#include <DirectXMath.h>
+using namespace DirectX;
+
+#pragma warning(disable:4355)
+
+#define AMF_FACILITY L"StitchPipeline"
+
+// hard- coded parameters to try
+static double   dForceFPS = 60.;
+#if defined( _M_AMD64)
+static int      iDefaultStreamCount = 6;
+#else 
+static int      iDefaultStreamCount = 6;
+#endif
+
+// test parameters
+static amf::AMF_SURFACE_FORMAT eComposerInputDefault = amf::AMF_SURFACE_NV12; // best performance with decoder output
+static amf::AMF_SURFACE_FORMAT eComposerOutputDefault = amf::AMF_SURFACE_BGRA; // use if most composer input is RGBA
+
+
+typedef std::shared_ptr<Splitter> SplitterPtr;
+double ReadOneValueDouble(std::string &text, std::string::size_type  &pos);
+void ReadOneImage(std::string &text, StitchTemplate &t);
+int ReadOneValueInt(std::string &text, std::string::size_type  &pos);
+
+StitchPipeline::StitchPipeline() :
+m_outputMode(AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM::AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW)
+{
+}
+
+StitchPipeline::~StitchPipeline()
+{
+    Terminate();
+    g_AMFFactory.Terminate();
+}
+
+AMF_RESULT StitchPipeline::Init(
+    const std::vector<std::wstring>& filenames,
+    const std::wstring& ptguifilename,
+    AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode
+)
+{
+    m_outputMode = outputMode;
+    AMF_RESULT res = InitMedia(filenames, true);
+    CHECK_AMF_ERROR_RETURN(res, L"InitMedia() failed!\n");
+    res = InitCamera(ptguifilename, false);
+    CHECK_AMF_ERROR_RETURN(res, L"InitCamera() failed!\n");
+    res = StitchPipelineBase::Init();
+    CHECK_AMF_ERROR_RETURN(res, L"StitchPipelineBase::Init() failed!\n");
+    return res;
+}
+
+//-------------------------------------------------------------------------------------------------
+void StitchPipeline::ToggleWire()
+{
+    if(m_pStitch == NULL)
+    {
+        return;
+    }
+    bool value = false;
+    m_pStitch->GetProperty(AMF_VIDEO_STITCH_WIRE_RENDER, &value);
+    value = !value;
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_WIRE_RENDER, value);
+    if(m_pVideoPresenter->GetMode() ==  VideoPresenter::ModePaused)
+    {
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+    }
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipeline::ToggleColorBalance()
+{
+    if(m_pStitch == NULL)
+    {
+        return;
+    }
+    bool value = false;
+    m_pStitch->GetProperty(AMF_VIDEO_STITCH_COLOR_BALANCE, &value);
+    value = !value;
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_COLOR_BALANCE, value);
+    if(m_pVideoPresenter->GetMode() ==  VideoPresenter::ModePaused)
+    {
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+    }
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipeline::ToggleOutputMode()
+{
+    if(m_pStitch == NULL)
+    {
+        return;
+    }
+    amf_int64 value = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+    m_pStitch->GetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, &value);
+    value = value == AMF_VIDEO_STITCH_OUTPUT_MODE_LAST ? 0 : value + 1;
+
+
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, value);
+    if(m_pVideoPresenter != NULL)
+    {
+        if(value == AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP)
+        {
+            m_pVideoPresenter ->SetProcessor(NULL);
+        }
+        else
+        {
+            m_pVideoPresenter ->SetProcessor(m_pStitch);
+        }
+
+        ((BackBufferPresenter*)m_pVideoPresenter.get())->SetRenderToBackBuffer(value != AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP);
+    }
+    
+    if(m_pVideoPresenter->GetMode() ==  VideoPresenter::ModePaused)
+    {
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+    }
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT StitchPipeline::InitStitcher(amf::AMF_SURFACE_FORMAT &stitchInputFmt)
+{
+    stitchInputFmt = amf::AMF_SURFACE_NV12;
+    //---------------------------------------------------------------------------------------------
+    amf_int32 streamCount = (amf_int32)m_Cameras.size();
+    GetParam(StitchPipelineBase::PARAM_NAME_STREAM_COUNT, streamCount);
+    amf_int32 compositedWidth = 3840;
+    amf_int32 compositedHeight = 1920;
+    GetParam(StitchPipelineBase::PARAM_NAME_COMPOSITED_WIDTH, compositedWidth);
+    GetParam(StitchPipelineBase::PARAM_NAME_COMPOSITED_HEIGHT, compositedHeight);
+
+    amf_int32 computeEngine = amf::AMF_MEMORY_COMPUTE_FOR_DX11;
+    GetParam(StitchPipelineBase::PARAM_NAME_PRESENTER, computeEngine);
+
+    //---------------------------------------------------------------------------------------------
+    // Init Video Stitch
+    amf::AMFComponentPtr pStitch;
+    AMF_RESULT res = g_AMFFactory.LoadExternalComponent(m_pContext, STITCH_DLL_NAME, "AMFCreateComponentInt", NULL, &pStitch);
+    CHECK_AMF_ERROR_RETURN(res, L"AMFCreateComponent(" << AMFVideoStitch << L") failed");
+    m_pStitch = amf::AMFComponentExPtr(pStitch);
+
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_COMPUTE_DEVICE, computeEngine);
+    
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_MEMORY_TYPE, m_pVideoPresenter->GetMemoryType());
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_INPUTCOUNT, amf_int64(streamCount));
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_OUTPUT_SIZE, AMFConstructSize(compositedWidth, compositedHeight));
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_OUTPUT_FORMAT, StitchPipelineBase::m_eComposerOutputDefault);
+
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, m_outputMode);
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, 1);
+    return res;
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipeline::SetFullSpeed(bool bFullSpeed)
+{
+    if(m_pVideoPresenter != NULL)
+    {
+        if(!bFullSpeed)
+        {
+            m_pVideoPresenter->Reset();
+        }
+        m_pVideoPresenter->DoActualWait(!bFullSpeed);
+    }
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipeline::SetSubresourceIndex(amf_int32 index)
+{
+    if(m_pVideoPresenter != NULL)
+    {
+        m_pVideoPresenter->SetSubresourceIndex(index);
+    }
+}
+//-------------------------------------------------------------------------------------------------
+amf_int32 StitchPipeline::GetSubresourceIndex()
+{
+    if(m_pVideoPresenter != NULL)
+    {
+        return m_pVideoPresenter->GetSubresourceIndex();
+    }
+    return 0;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/StitchPipeline.h Added

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "public/include/core/Context.h"
+#include "public/include/components/Component.h"
+#include "public/include/components/VideoDecoderUVD.h"
+#include "public/include/components/VideoConverter.h"
+#include "public/samples/CPPSamples/common/BitStreamParser.h"
+#include "public/samples/CPPSamples/common/VideoPresenter.h"
+#include "public/samples/CPPSamples/common/ParametersStorage.h"
+#include "public/samples/CPPSamples/common/Pipeline.h"
+#include "public/samples/CPPSamples/common/StitchPipelineBase.h"
+
+
+class StitchPipeline : public StitchPipelineBase
+{
+public:
+    StitchPipeline();
+    virtual ~StitchPipeline();
+public:
+
+    AMF_RESULT Init(const std::vector<std::wstring>& filenames, const std::wstring& ptguifilename,
+        AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode);
+
+    void ToggleWire();
+    void ToggleColorBalance();
+    void ToggleOutputMode();
+    void SetFullSpeed(bool bFullSpeed);
+    void SetSubresourceIndex(amf_int32 index);
+    amf_int32 GetSubresourceIndex();
+
+    amf::AMFContext* GetContext() {return m_pContext;}
+
+protected:
+    AMF_RESULT InitStitcher(amf::AMF_SURFACE_FORMAT &stitchInputFmt);
+    HWND m_hwnd;
+private:
+    AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM m_outputMode;
+};
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/StitchPipelineBase.cpp Added

@@ -0,0 +1,2360 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include "StitchPipelineBase.h"
+
+#include "public/common/TraceAdapter.h"
+#define AMF_DISABLE_PLAYBACK_EXPORTS
+#include "public/include/components/FFMPEGComponents.h"
+#include "public/include/components/FFMPEGFileDemuxer.h"
+#include "public/include/components/FFMPEGAudioDecoder.h"
+#include "public/include/components/FFMPEGAudioEncoder.h"
+#include "public/include/components/FFMPEGAudioConverter.h"
+#include <fstream>
+#define _USE_MATH_DEFINES
+#include "math.h"
+#include <DirectXMath.h>
+#define DEBUG_D3D11_LEAKS 0
+#if DEBUG_D3D11_LEAKS
+#include <atlbase.h>
+#include <d3d11.h>
+#include <D3D11SDKLayers.h>
+#endif
+
+#include "public/include/core/Dump.h"
+#include "public/include/components/FFMPEGFileMuxer.h"
+#include "public/include/components/ZCamLiveStream.h"
+#include "public/samples/CPPSamples/common/EncoderParamsAVC.h"
+#include "public/samples/CPPSamples/common/EncoderParamsHEVC.h"
+
+#include "public/include/components/VideoCapture.h"
+
+
+using namespace DirectX;
+#pragma warning(disable:4355)
+
+#define AMF_FACILITY L"StitchPipelineBase"
+
+
+// hard- coded parameters to try
+static double   dForceFPS = 60.;
+#if defined( _M_AMD64)
+static int      iDefaultStreamCount = 6;
+#else 
+static int      iDefaultStreamCount = 6;
+#endif
+// test parameters
+static amf::AMF_SURFACE_FORMAT eComposerInputDefault = amf::AMF_SURFACE_NV12; // best performance with decoder output
+amf::AMF_SURFACE_FORMAT StitchPipelineBase::m_eComposerOutputDefault = amf::AMF_SURFACE_RGBA; // use if most composer input is RGBA
+//amf::AMF_SURFACE_FORMAT StitchPipelineBase::m_eComposerOutputDefault = amf::AMF_SURFACE_RGBA_F16; // use if most composer input is RGBA
+
+// class serializes decoder submission to ge all frames from all streams in right order 
+class StitchPipelineBase::DecoderSubmissionSync
+{
+protected:
+    std::vector<bool>       m_bStreamState;
+    amf::AMFCriticalSection m_sectData;
+    bool                    m_bDecoderLocked;
+    bool                    m_bLowLatency;
+public:
+    DecoderSubmissionSync(amf_int32 streamCount, bool bLowLatency) : m_bDecoderLocked(false), m_bLowLatency(bLowLatency)
+    {
+        m_bStreamState.resize(streamCount, false);
+    }
+    virtual ~DecoderSubmissionSync()
+    {
+    }
+    void ReInit()
+    {
+        amf::AMFLock lock(&m_sectData);
+        for(std::vector<bool>::iterator it = m_bStreamState.begin(); it != m_bStreamState.end(); it++)
+        {
+            *it = false;
+            m_bDecoderLocked = false;
+        }
+    }
+    bool   Lock(amf_int32 index)
+    {
+        if(!m_bLowLatency)
+        {
+            return true;
+        }
+        amf::AMFLock lock(&m_sectData);
+        if(!m_bStreamState[index] && !m_bDecoderLocked)
+        {
+            m_bDecoderLocked = true;
+            m_bStreamState[index] = true;
+            return true;
+        }
+        return false;
+    }
+    bool   Reset(amf_int32 index)
+    {
+        if(!m_bLowLatency)
+        {
+            return true;
+        }
+        amf::AMFLock lock(&m_sectData);
+        m_bStreamState[index] = false;
+        m_bDecoderLocked = false;
+        return true;
+    }
+    bool   Unlock()
+    {
+        if(!m_bLowLatency)
+        {
+            return true;
+        }
+        amf::AMFLock lock(&m_sectData);
+        if(!m_bDecoderLocked)
+        {
+            return false;
+        }
+        m_bDecoderLocked = false;
+        for(size_t i = 0; i < m_bStreamState.size(); i++)
+        {
+            if(!m_bStreamState[i])
+            {
+                return true; // wait till all streams submit one frame
+            }
+        }
+
+        for(size_t i = 0; i < m_bStreamState.size(); i++)
+        {
+            m_bStreamState[i] = false;
+        }
+        return true;
+    }
+
+};
+
+class StitchPipelineBase::PipelineElementAMFDecoder : public AMFComponentElement
+{
+public:
+    PipelineElementAMFDecoder(amf::AMFComponent *pComponent, amf_int32 index, DecoderSubmissionSync *pDecoderSync, StitchPipelineBase *pPipeline) :
+        AMFComponentElement(pComponent),
+        m_pDecoderSync(pDecoderSync),
+        m_iIndex(index),
+        m_pPipeline(pPipeline),
+        m_bEof(false)
+    {
+    }
+    virtual ~PipelineElementAMFDecoder(){}
+
+    virtual AMF_RESULT OnEof()
+    {
+        m_bEof = true;
+        return AMFComponentElement::OnEof();
+    }
+    virtual void Restart(){m_bEof = false;}
+
+
+    AMF_RESULT SubmitInput(amf::AMFData* pData) 
+    {
+        AMF_RESULT res = AMF_OK;
+        if(pData == NULL || m_bEof) // EOF
+        {
+            res = m_pComponent->Drain();
+        }
+        else
+        {
+            if(!m_pDecoderSync->Lock(m_iIndex))
+            {
+                return AMF_INPUT_FULL;
+            }
+
+            res = m_pComponent->SubmitInput(pData);
+            if(res == AMF_OK)
+            {
+                m_pDecoderSync->Unlock();
+            }
+            else
+            {
+                m_pDecoderSync->Reset(m_iIndex);
+            }
+            if(res == AMF_DECODER_NO_FREE_SURFACES)
+            {
+                return AMF_INPUT_FULL;
+            }
+        }
+        return res; 
+    }
+    virtual AMF_RESULT QueryOutput(amf::AMFData** ppData)
+    {
+        AMF_RESULT res = AMFComponentElement::QueryOutput(ppData);
+        if(res == AMF_EOF)
+        {
+            m_pPipeline->EofDecoders();
+        }
+        return res;
+    }
+
+protected:
+    StitchPipelineBase *        m_pPipeline;
+    DecoderSubmissionSync*  m_pDecoderSync;
+    amf_int32               m_iIndex;
+    bool                    m_bEof;
+};
+
+
+StitchElement::StitchElement(amf::AMFComponent *pComponent, amf_int32 inputCount, AMFSize outputSize) :
+        m_pComponent(pComponent),
+        m_iInputCount(inputCount),
+        m_OutputSize(outputSize),
+        m_bPause(false)
+    {
+        m_lastInputs.resize(inputCount);
+        m_countFrame = 0;
+    }
+
+AMF_RESULT StitchElement::SubmitInput(amf::AMFData* pData, amf_int32 slot)
+{ 
+    amf::AMFLock lock(&m_cs);
+    if(m_bPause)
+    {
+        return AMF_INPUT_FULL;
+    }
+
+    if (pData)
+    {
+        amf_pts timestamp = amf_high_precision_clock();
+        pData->SetProperty(L"StitchStart", timestamp);
+    }
+    return SubmitInputInt(pData, slot);
+}
+
+AMF_RESULT StitchElement::OnEof()
+{ 
+    Drain(0); 
+    return AMF_EOF;
+}
+
+AMF_RESULT StitchElement::SubmitInputInt(amf::AMFData* pData, amf_int32 slot)
+{ 
+    amf::AMFLock lock(&m_cs);
+
+    AMF_RESULT res = AMF_OK;
+
+    amf::AMFSurfacePtr pSurface(pData);
+    if(pSurface != NULL)
+    {
+        amf::AMFInputPtr input;
+        m_pComponent->GetInput(slot, &input);
+        res = input->SubmitInput(pData);
+
+        if(res == AMF_OK)
+        {
+            m_lastInputs[slot].data = pData;
+        }
+
+    }
+    else
+    {
+        res = m_pComponent->Drain();
+    }
+    return res;
+}
+AMF_RESULT StitchElement::QueryOutput(amf::AMFData** ppData)
+{
+    AMF_RESULT res = AMF_OK;
+    amf::AMFDataPtr data;
+    res = m_pComponent->QueryOutput(&data);
+
+    if ((res != AMF_REPEAT) && (res != AMF_EOF))
+    {
+        m_countFrame++;
+    }
+
+    if(res == AMF_REPEAT)
+    {
+        res = AMF_OK;
+    }
+    if(res == AMF_EOF && data == NULL)
+    {
+    }
+    if(data != NULL)
+    {
+        amf_pts timestamp = amf_high_precision_clock();
+        data->SetProperty(L"StitchEnd", timestamp);
+        *ppData = data.Detach();
+    }
+
+    return res;
+}
+AMF_RESULT StitchElement::Drain(amf_int32 inputSlot)
+{ 
+    amf::AMFLock lock(&m_cs);
+    for(std::vector<Data>::iterator it = m_lastInputs.begin(); it != m_lastInputs.end(); it++)
+    {
+        it->data = NULL;
+    }
+    return m_pComponent->Drain(); 
+}
+AMF_RESULT StitchElement::Resubmit()
+{
+    AMF_RESULT res = AMF_OK;
+    amf::AMFLock lock(&m_cs);
+    res = m_pComponent->Flush();
+
+    for(amf_int32 i = 0; i <  m_iInputCount; i++)
+    {
+        amf::AMFDataPtr     data = m_lastInputs[i].data; // need to store this pointer to avoid release during overwrite 
+        res = SubmitInputInt(data, i);
+        if(res != AMF_OK)
+        {
+            int a = 1;
+        }
+    }
+    return AMF_OK;
+}
+AMF_RESULT StitchElement::Pause()
+{
+    amf::AMFLock lock(&m_cs);
+    m_bPause = true;
+    return AMF_OK;
+}
+AMF_RESULT StitchElement::Resume()
+{
+    amf::AMFLock lock(&m_cs);
+    m_bPause = false;
+    return AMF_OK;
+}
+
+typedef std::shared_ptr<Splitter> SplitterPtr;
+
+const wchar_t* StitchPipelineBase::PARAM_NAME_INPUT      = L"INPUT";
+const wchar_t* StitchPipelineBase::PARAM_NAME_PRESENTER  = L"PRESENTER";
+const wchar_t* StitchPipelineBase::PARAM_NAME_STREAM_COUNT      = L"StreamCount";
+const wchar_t* StitchPipelineBase::PARAM_NAME_COMPOSITED_WIDTH = L"Width";
+const wchar_t* StitchPipelineBase::PARAM_NAME_COMPOSITED_HEIGHT = L"Height";
+const wchar_t* StitchPipelineBase::PARAM_NAME_LOWLATENCY = L"LowLatency";
+const wchar_t* StitchPipelineBase::PARAM_NAME_FRAMERATE = L"FRAMERATE";
+const wchar_t* StitchPipelineBase::PARAM_NAME_STITCH_ENGINE = L"StitchEngine";
+const wchar_t* StitchPipelineBase::PARAM_NAME_ZCAMLIVE_MODE = L"ZCamLiveMode";
+const wchar_t* StitchPipelineBase::PARAM_NAME_OUTPUT_FILE = L"OutputFile";
+const wchar_t* StitchPipelineBase::PARAM_NAME_PTS_FILE = L"PtsFile";
+const wchar_t* StitchPipelineBase::PARAM_NAME_STREAMING = L"Streaming";
+const wchar_t* StitchPipelineBase::PARAM_NAME_LOOP = L"Loop";
+const wchar_t* StitchPipelineBase::PARAM_NAME_ENCODER_CODEC = L"CODEC";
+const wchar_t* StitchPipelineBase::PARAM_NAME_ENCODE = L"Encode";
+const wchar_t* StitchPipelineBase::PARAM_NAME_ENCODE_PREVIEW = L"EncodePreview";
+const wchar_t* StitchPipelineBase::PARAM_NAME_STREAMING_URL = L"StreamingUrl";
+const wchar_t* StitchPipelineBase::PARAM_NAME_STREAMING_KEY = L"StreamingKey";
+const wchar_t* StitchPipelineBase::PARAM_NAME_AUDIO_CH = L"AudioCh";
+const wchar_t* StitchPipelineBase::PARAM_NAME_AUDIO_MODE = L"AudioMode";
+const wchar_t* StitchPipelineBase::PARAM_NAME_AUDIO_FILE = L"AudioFile";
+const wchar_t* StitchPipelineBase::PARAM_NAME_ZCAMLIVE_IP = L"ZCamIP";
+
+StitchPipelineBase::StitchPipelineBase() :
+    m_iCurrentChannel(8),
+    m_pStitchElement(NULL),
+    m_bVideoPresenterDirectConnect(true),
+	m_nFfmpegRefCount(0),
+    m_mediaInitilized(false),
+    m_cameraInitilized(false),
+    m_ConnectThread(this)
+{
+    g_AMFFactory.Init();
+    m_sizeInput = { 0 };
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_INPUT, ParamCommon, L"Input file name", NULL);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_PRESENTER, ParamCommon, L"Specifies presenter engine type (DX9, DX11, OPENGL)", ParamConverterVideoPresenter);
+
+    wchar_t text[1000];
+    swprintf(text,L"INT (1-100) default - %d, number of input streams", iDefaultStreamCount);
+    
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_STREAM_COUNT, ParamCommon, text, ParamConverterInt64);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_COMPOSITED_WIDTH, ParamCommon, L"Composited Frame width (integer, default = 3840)", ParamConverterInt64);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_COMPOSITED_HEIGHT, ParamCommon, L"Composited Frame height (integer, default = 1920)", ParamConverterInt64);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_LOWLATENCY, ParamCommon, L"Low latency (bool, default = false)", ParamConverterBoolean);
+
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_STITCH_ENGINE, ParamCommon, L"Stitch Engine (integer, default = 1 (Loom)", ParamConverterBoolean);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_ZCAMLIVE_MODE, ParamCommon, L"ZCam live Mode(integer, default = 1)", ParamConverterInt64);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_OUTPUT_FILE, ParamCommon, L"output file name", NULL);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_STREAMING, ParamCommon, L"Streaming(bool, default = false)", ParamConverterBoolean);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_STREAMING_URL, ParamCommon, L"Streaming URL", NULL);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_STREAMING_KEY, ParamCommon, L"Streaming key", NULL);
+
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_LOOP, ParamCommon, L"Loop(bool, default = true)", ParamConverterBoolean);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_ENCODER_CODEC, ParamCommon, L"Codec name (AVC or H264, HEVC or H265)", ParamConverterCodec);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_ENCODE, ParamCommon, L"Encode(bool, default = false)", ParamConverterBoolean);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_ENCODE_PREVIEW, ParamCommon, L"Preview Encode(bool, default = true)", ParamConverterBoolean);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_AUDIO_CH, ParamCommon, L"Audio Channel (integer, default = 0)", ParamConverterInt64);
+
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_AUDIO_MODE, ParamCommon, L"Audio Mode(integer, default = 0)", ParamConverterInt64);
+    SetParamDescription(StitchPipelineBase::PARAM_NAME_AUDIO_FILE, ParamCommon, L"audio file name", NULL);
+
+    std::wstring cameraIPName = std::wstring(PARAM_NAME_ZCAMLIVE_IP) + std::wstring(L"_00");
+    int cameraIPNameLen = (int)cameraIPName.length() - 1;
+    SetParamDescription(cameraIPName.c_str(), ParamCommon, L"CameraIP 00", NULL);
+    cameraIPName[cameraIPNameLen] += 1;
+    SetParamDescription(cameraIPName.c_str(), ParamCommon, L"CameraIP 01", NULL);
+    cameraIPName[cameraIPNameLen] += 1;
+    SetParamDescription(cameraIPName.c_str(), ParamCommon, L"CameraIP 02", NULL);
+    cameraIPName[cameraIPNameLen] += 1;
+    SetParamDescription(cameraIPName.c_str(), ParamCommon, L"CameraIP 03", NULL);
+
+    SetParam(StitchPipelineBase::PARAM_NAME_STREAMING_URL, L"");
+    SetParam(StitchPipelineBase::PARAM_NAME_STREAMING_KEY, L"");
+
+    SetParam(StitchPipelineBase::PARAM_NAME_LOOP, true);
+    SetParam(StitchPipelineBase::PARAM_NAME_STITCH_ENGINE, false);
+
+    RegisterEncoderParamsAVC(&m_EncoderParamsAVC);
+    RegisterEncoderParamsHEVC(&m_EncoderParamsHEVC);
+
+#if defined(METRO_APP)
+    SetParam(StitchPipelineBase::PARAM_NAME_PRESENTER, amf::AMF_MEMORY_DX11);
+#else
+    SetParam(StitchPipelineBase::PARAM_NAME_PRESENTER, amf::AMF_MEMORY_DX11);
+#endif
+    SetParam(StitchPipelineBase::PARAM_NAME_ENCODE, false);
+    SetParam(StitchPipelineBase::PARAM_NAME_ENCODE_PREVIEW, true);
+
+    // Encoder default
+    //
+
+    amf_int64 bitrate = 30000000;
+    AMFRate frameRate = AMFConstructRate(30, 1);
+    amf_int64 gop = 30;
+
+    //SetParam(PARAM_NAME_ENCODER_CODEC, AMFVideoEncoderVCE_AVC);
+
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_USAGE, AMF_VIDEO_ENCODER_USAGE_TRANSCONDING);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_QUALITY_PRESET, AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_TARGET_BITRATE, bitrate);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_PEAK_BITRATE, bitrate * 3 /2);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_FRAMERATE, frameRate);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_IDR_PERIOD, gop);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_PROFILE, AMF_VIDEO_ENCODER_PROFILE_MAIN);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_PROFILE_LEVEL , 51);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_B_PIC_PATTERN, 0);
+    m_EncoderParamsAVC.SetParam(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR);
+
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_USAGE, AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCONDING);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, bitrate);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, bitrate * 3 / 2);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, frameRate);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, gop);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR , gop);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_PROFILE, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_TIER, AMF_VIDEO_ENCODER_HEVC_TIER_MAIN);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, AMF_LEVEL_5_1);
+    m_EncoderParamsHEVC.SetParam(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR);
+
+    m_Cameras.clear();
+}
+
+StitchPipelineBase::~StitchPipelineBase()
+{
+    Terminate();
+	
+	for (; m_nFfmpegRefCount > 0; --m_nFfmpegRefCount)
+    {
+        g_AMFFactory.UnLoadExternalComponent(FFMPEG_DLL_NAME);
+    }
+	
+    g_AMFFactory.Terminate();
+}
+
+AMF_RESULT StitchPipelineBase::Terminate()
+{
+    Stop();
+	m_pContext = NULL;
+	return AMF_OK;
+}
+
+double StitchPipelineBase::GetProgressSize()
+{
+    double ret = 100.;
+    for(std::vector<StitchStream>::iterator it = m_Streams.begin(); it != m_Streams.end(); it++)
+    {
+        amf_int64 size = 0;
+        it->m_pStream->GetSize(&size);
+        double retStr = (double)size;
+        if(retStr < ret)
+        {
+            ret = retStr;
+        }
+    }
+    return ret;
+}
+
+double StitchPipelineBase::GetProgressPosition()
+{
+    double ret = 0;
+    for(std::vector<StitchStream>::iterator it = m_Streams.begin(); it != m_Streams.end(); it++)
+    {
+        amf_int64 pos = 0;
+        it->m_pStream->GetPosition(&pos);
+        double retStr = (double)pos;
+        if(retStr > ret)
+        {
+            ret = retStr;
+        }
+    }
+    return ret;
+}
+
+AMF_RESULT StitchPipelineBase::InitMedia(const std::vector<std::wstring> &filenames, bool forceInitilize)
+{
+    if (m_mediaInitilized && !forceInitilize)
+    {
+        return AMF_OK;
+    }
+
+    AMF_RESULT res = AMF_OK;
+    amf::AMFContextPtr pContext;
+    g_AMFFactory.GetFactory()->CreateContext(&pContext);
+    
+    amf_int32 streamCount = (amf_int32)filenames.size();
+    GetParam(PARAM_NAME_STREAM_COUNT, streamCount);
+
+    m_Media.resize(streamCount);
+    for (amf_int32 ch = 0; ch < streamCount; ch++)
+    {
+        StitchStream stream;
+
+        std::wstring filename;
+
+        if (filenames.size() == 0)
+        {
+            ;//            filename = inputPath;
+        }
+        else if (ch >= (amf_int32)filenames.size())
+        {
+            //???repeat last one?
+            filename = filenames.back();
+        }
+        else
+        {
+            filename = filenames[ch];
+        }
+
+        ParamAudioCodec paramAudioCodec;
+        res = stream.GetMediaInfo(pContext, filename.c_str(), m_Media[ch], paramAudioCodec);
+    }
+    pContext->Terminate();
+    pContext.Release();
+    m_mediaInitilized = true;
+    return res;
+}
+
+std::vector<MediaInfo>*  StitchPipelineBase::UpdateMediaInfo(const wchar_t *pName, amf_int32 ch)
+{
+    //        MediaInfo mediaInfo;
+    StitchStream stream;
+    ParamAudioCodec paramAudioCodec;
+
+    if (!m_pContext)
+    {
+        AMF_RESULT res = InitContext(amf::AMF_MEMORY_DX11);
+    }
+
+    stream.GetMediaInfo(m_pContext, pName, m_Media[ch], paramAudioCodec);
+    return  &m_Media;
+}
+
+AMF_RESULT StitchPipelineBase::InitCamera(const std::wstring &filenamesPTGui, bool forceInitilize)
+{
+    if (!m_cameraInitilized || forceInitilize)
+    {
+        ParsePTGuiProject(filenamesPTGui);
+        m_cameraInitilized = true;
+    }
+
+    return AMF_OK;
+}
+
+AMF_RESULT StitchPipelineBase::Init()
+{
+    AMF_RESULT res = AMF_OK;
+
+    amf::AMF_MEMORY_TYPE presenterEngine = amf::AMF_MEMORY_DX11;
+    res = InitContext(presenterEngine);
+    AMF_RETURN_IF_FAILED(res, L"Create AMF context");
+
+    amf_int64 modeZCam = CAMLIVE_MODE_INVALID;
+    GetParam(PARAM_NAME_ZCAMLIVE_MODE, modeZCam);
+    bool isZCamLive = modeZCam != CAMLIVE_MODE_INVALID;
+
+
+    //---------------------------------------------------------------------------------------------
+    // Init Presenter
+    amf_int32 compositedWidth = 3840;
+    amf_int32 compositedHeight = 1920;
+    GetParam(PARAM_NAME_COMPOSITED_WIDTH, compositedWidth);
+    GetParam(PARAM_NAME_COMPOSITED_HEIGHT, compositedHeight);
+
+    res = CreateVideoPresenter(presenterEngine, compositedWidth, compositedHeight);
+    AMF_RETURN_IF_FAILED(res, L"Failed to create a video presenter");
+    amf::AMF_SURFACE_FORMAT eComposerOutput = m_eComposerOutputDefault;
+    m_pVideoPresenter->SetInputFormat(eComposerOutput);
+    m_pVideoPresenter->Init(compositedWidth, compositedHeight);
+
+    if(isZCamLive)
+    {
+        return StartConnect();
+    }
+    return InitInternal();
+}
+AMF_RESULT StitchPipelineBase::InitInternal()
+
+{
+    amf::AMF_MEMORY_TYPE presenterEngine = amf::AMF_MEMORY_DX11;
+
+    amf_int64 modeZCam = CAMLIVE_MODE_INVALID;
+    GetParam(PARAM_NAME_ZCAMLIVE_MODE, modeZCam);
+    bool isZCamLive = modeZCam != CAMLIVE_MODE_INVALID;
+    bool isCombinedSource = (modeZCam == CAMLIVE_MODE_THETAS) || ((m_Cameras.size() == 2 && m_Media.size()==1));
+    bool isStitchedSource = (modeZCam == CAMLIVE_MODE_THETAV) || (!isCombinedSource && !isZCamLive && (m_Media.size() == 1));
+
+    GetParam(PARAM_NAME_ZCAMLIVE_MODE, modeZCam);
+
+    AMF_RETURN_IF_FALSE(isZCamLive || (m_Cameras.size() || m_Media.size()), AMF_UNEXPECTED, L"No input!");
+    AMF_RETURN_IF_FALSE(isStitchedSource || isCombinedSource || isZCamLive || (m_Cameras.size() == m_Media.size()), AMF_UNEXPECTED, L"Number of media does not match number of camera!");
+
+
+    AMF_RESULT res = AMF_OK;
+    //---------------------------------------------------------------------------------------------
+    // Read Options
+
+    amf_int32 streamCount = (amf_int32)m_Cameras.size();
+    if (!isZCamLive)
+    {
+        GetParam(PARAM_NAME_STREAM_COUNT, streamCount);
+    }
+
+    if (isCombinedSource || streamCount == 1)
+    {
+        isCombinedSource = true;
+        streamCount = 2;
+    }
+
+    bool isStreamingEnabled = false;
+    GetParam(PARAM_NAME_STREAMING, isStreamingEnabled);
+    std::wstring rtmpUrl = L"";
+    if (isStreamingEnabled)
+    {
+        std::wstring url = L"";
+        std::wstring key = L"";
+        GetParamWString(PARAM_NAME_STREAMING_URL, url);
+        GetParamWString(PARAM_NAME_STREAMING_KEY, key);
+        rtmpUrl = url + L"/" + key;
+        isStreamingEnabled = (url.length() > 0) ? true : false;
+    }
+    //---------------------------------------------------------------------------------------------
+    // Init context and devices
+    bool bUseDirectOutput = false;
+   
+    amf::AMF_SURFACE_FORMAT eComposerInput = eComposerInputDefault;
+
+    // use this to try OpenCL
+//    res = m_pContext->InitOpenCL(NULL);
+//    bUseDirectOutput = false;
+    //
+    amf_int32 compositedWidth = 3840;
+    amf_int32 compositedHeight = 1920;
+    GetParam(PARAM_NAME_COMPOSITED_WIDTH, compositedWidth);
+    GetParam(PARAM_NAME_COMPOSITED_HEIGHT, compositedHeight);
+    bool bLowLatency = true;
+    GetParam(PARAM_NAME_LOWLATENCY, bLowLatency);
+    
+    bool bEncode = false;
+    GetParam(StitchPipelineBase::PARAM_NAME_ENCODE, bEncode);
+    //encoding
+    std::wstring fileName;
+    GetParamWString(PARAM_NAME_OUTPUT_FILE, fileName);
+    bEncode = (bEncode && (fileName.length() > 0)) || isStreamingEnabled;
+
+    bool bPreview = true;
+    GetParam(StitchPipelineBase::PARAM_NAME_ENCODE_PREVIEW, bPreview);
+    if(!bEncode)
+    {
+        bPreview = true;
+    }
+
+    amf_int32 modeAudio = AMF_VIDEO_STITCH_AUDIO_MODE_ENUM::AMF_VIDEO_STITCH_AUDIO_MODE_NONE;
+    GetParam(PARAM_NAME_AUDIO_MODE, modeAudio);
+    bool enableAudio = AMF_VIDEO_STITCH_AUDIO_MODE_ENUM::AMF_VIDEO_STITCH_AUDIO_MODE_NONE != modeAudio;
+    //---------------------------------------------------------------------------------------------
+    //ZCam live
+    std::wstring pVideoDecoderID;
+    AMFSize frameSize = { 0 };
+
+    if (isZCamLive)
+    {
+        AMF_RETURN_IF_FALSE(m_pSourceZCam != NULL && m_bIsConnected, AMF_UNEXPECTED, L"Not connected");
+
+        m_pSourceZCam->GetProperty(ZCAMLIVE_VIDEO_FRAMESIZE, &frameSize);
+
+        amf::AMFVariant var;
+        res = m_pSourceZCam->GetProperty(ZCAMLIVE_CODEC_ID, &var);
+        if (res == AMF_OK)  // video stream setup
+        {
+            pVideoDecoderID = var.ToWString().c_str();
+        }
+
+        if (bLowLatency)
+        {
+            m_pVideoPresenter->DoActualWait(false);
+        }
+
+        m_pSourceZCam->GetProperty(ZCAMLIVE_STREAMCOUNT, &streamCount);
+        bLowLatency = true;
+    }
+    //---------------------------------------------------------------------------------------------
+    // Init Video Stitch
+    amf::AMF_SURFACE_FORMAT stitchInputFmt = amf::AMF_SURFACE_BGRA;
+    res = InitStitcher(stitchInputFmt);
+    m_pStitch->SetProperty(AMF_VIDEO_STITCH_COMBINED_SOURCE, isCombinedSource);
+    if (!isStitchedSource)
+    {
+        for (amf_int32 ch = 0; ch < streamCount; ch++)
+        {
+            amf::AMFInputPtr camera;
+            m_pStitch->GetInput(ch, &camera);
+            m_Cameras[ch].ApplyToCamera(camera);
+        }
+    }
+
+    AMF_RETURN_IF_FALSE(isStitchedSource || (m_Cameras.size() == streamCount), AMF_OUT_OF_RANGE, L"stream number does not match project setting!");
+
+    if (isCombinedSource || isStitchedSource)
+    {
+        streamCount = 1;
+    }
+
+    m_pStitchElement = new StitchElement(m_pStitch, streamCount, AMFConstructSize(compositedWidth, compositedHeight));
+    PipelineElementPtr compositorElement = PipelineElementPtr(m_pStitchElement);
+
+    //---------------------------------------------------------------------------------------------
+    m_pDecoderSubmissionSync.reset(new DecoderSubmissionSync(streamCount, false));
+    int inputWidth = 0;
+    int inputHeight = 0;
+
+    m_Converters.clear();
+
+    PipelineElementPtr pPipelineElementDemuxerAudio;
+    
+    amf_int32 audioChannel = enableAudio ? 0 : -1; //passthrough audio index for encoding only for now
+    GetParam(StitchPipelineBase::PARAM_NAME_AUDIO_CH, audioChannel);
+    audioChannel = (audioChannel >= streamCount) ? 0 : audioChannel;
+    amf_int32 streamAudioPinIndex = -1;
+    amf_int32 iAudioPinIndex = enableAudio ? -1 : 0; // if outside the loop only first audio will be activated
+    PipelineElementPtr pPipelineElementDemuxer;
+
+    for (amf_int32 ch = 0; ch < streamCount; ch++)
+    {
+        StitchStream stream;
+
+        amf_int32 iVideoPinIndex = -1;
+        amf::AMFBufferPtr pExtraData;
+
+        if (isZCamLive)
+        {
+            stream.m_pSource = m_pSourceZCam;
+            iVideoPinIndex = ch;
+        }
+        else
+        {
+            std::wstring filename = m_Media[ch].fileName;
+            iAudioPinIndex = (audioChannel == ch) ? -1 : 0; //only enable the channel that matches
+            res = stream.InitDemuxer(m_pContext, filename.c_str(), pVideoDecoderID, frameSize, 
+                0, 0, 
+                iVideoPinIndex, iAudioPinIndex, &m_paramsAudio, false, pExtraData);
+            AMF_RETURN_IF_FAILED(res, L"stream.InitDemuxer() failed");
+        }
+
+        res = stream.InitDecoder(m_pContext, pVideoDecoderID, frameSize, eComposerInput, bLowLatency, pExtraData);
+        AMF_RETURN_IF_FAILED(res, L"stream.InitDecoder() failed");
+
+        PipelineElementPtr pPipelineElementDemuxer;
+        if (stream.m_pParser != NULL)
+        {
+            pPipelineElementDemuxer = stream.m_pParser;
+        }
+        else
+        {
+            pPipelineElementDemuxer = PipelineElementPtr(new AMFComponentExElement(stream.m_pSource));
+        }
+
+        if (ch == 0)
+        {
+            AMFSize size;
+            stream.m_pDecoder->GetProperty(AMF_VIDEO_DECODER_CURRENT_SIZE, &size);
+            m_sizeInput = size;
+            inputWidth = size.width;
+            inputHeight = size.height;
+        }
+
+        if (audioChannel == ch)
+        {
+            m_pSourceAudio = stream.m_pSource;
+        }
+
+        res = Connect(pPipelineElementDemuxer, 0, NULL, 0, 3);
+
+        stream.m_pDecoderElement = PipelineElementPtr(new PipelineElementAMFDecoder(stream.m_pDecoder, ch, m_pDecoderSubmissionSync.get(), this));
+        res = Connect(stream.m_pDecoderElement, 0, pPipelineElementDemuxer, iVideoPinIndex, 2);
+
+        if (isStitchedSource)
+        {
+            amf::AMF_SURFACE_FORMAT surfaceFormat = amf::AMF_SURFACE_RGBA;
+            m_pStitch->GetProperty(AMF_VIDEO_STITCH_OUTPUT_FORMAT, (amf_int32*)&surfaceFormat);
+
+            amf::AMFComponentPtr pConverter;
+            res = g_AMFFactory.GetFactory()->CreateComponent(m_pContext, AMFVideoConverter, &pConverter);
+            AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent %s failed", AMFVideoConverter);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_KEEP_ASPECT_RATIO, true);
+//            pConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, amf::AMF_MEMORY_OPENCL);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, amf::AMF_MEMORY_DX11);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, surfaceFormat);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, AMF_VIDEO_CONVERTER_COLOR_PROFILE_709);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_SIZE, AMFConstructSize(compositedWidth, compositedHeight));
+
+            res = pConverter->Init(amf::AMF_SURFACE_NV12, inputWidth, inputHeight);
+
+            PipelineElementPtr converter(new AMFComponentElement(pConverter));
+
+            res = Connect(converter, 0, stream.m_pDecoderElement, 0, bLowLatency ? 2 : 2, CT_ThreadQueue);
+            m_Converters.push_back(pConverter);
+
+            compositorElement = converter;
+        }
+        else if (stitchInputFmt == amf::AMF_SURFACE_BGRA)
+        {
+            amf::AMFComponentPtr pConverter;
+            res = g_AMFFactory.GetFactory()->CreateComponent(m_pContext, AMFVideoConverter, &pConverter);
+            AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent %s failed", AMFVideoConverter);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_KEEP_ASPECT_RATIO, true);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, amf::AMF_MEMORY_OPENCL);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, amf::AMF_SURFACE_BGRA);
+            pConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, AMF_VIDEO_CONVERTER_COLOR_PROFILE_709);
+
+            res = pConverter->Init(amf::AMF_SURFACE_NV12, inputWidth, inputHeight);
+
+            PipelineElementPtr converter(new AMFComponentElement(pConverter));
+
+            res = Connect(converter, 0, stream.m_pDecoderElement, 0, bLowLatency ? 2 : 2 , CT_ThreadQueue);
+            res = Connect(compositorElement, ch, converter, 0, 2);
+            m_Converters.push_back(pConverter);
+        }
+        else
+        {
+            res = Connect(compositorElement, ch, stream.m_pDecoderElement, 0, bLowLatency ? 2 : 2, CT_ThreadQueue);
+        }
+
+        m_Streams.push_back(stream);
+    }
+
+    m_pStitch->Init(stitchInputFmt, inputWidth, inputHeight);
+
+    if (enableAudio)
+    {
+        InitAudio(bEncode);
+    }
+
+    if (bEncode)
+    {
+        AMF_RESULT res = InitVideoEncoder();
+        AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent() failed to create a SW/HW Encoder");
+        PipelineElementPtr converter(new AMFComponentElement(m_pConverterEncode));
+        PipelineElementPtr encoder(new AMFComponentElement(m_pEncoder));
+
+        if(bPreview)
+        {
+            //splitter
+            m_pSplitter = SplitterPtr(new Splitter(true, 2));
+            //encoder
+            Connect(m_pSplitter, 0, compositorElement, 0, 2);
+            Connect(m_pVideoPresenter, 0, m_pSplitter, 0, 2);
+            Connect(converter,         0, m_pSplitter, 1, 2);
+
+            //splitter for audio
+            if (enableAudio)
+            {
+                m_pSplitterAudio = SplitterPtr(new Splitter(true, 2));
+            }
+        }
+        else
+        {
+            Connect(converter,         0, compositorElement, 0, 2, CT_Direct);
+        }
+        res = Connect(encoder, 0, converter, 0, 1, CT_Direct);
+        //muxer
+        amf::AMFComponentPtr  pMuxer;
+        res = g_AMFFactory.LoadExternalComponent(m_pContext, FFMPEG_DLL_NAME, "AMFCreateComponentInt", FFMPEG_MUXER, &pMuxer);
+        AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent( %s) failed", FFMPEG_MUXER);
+		++m_nFfmpegRefCount;
+        m_pMuxer = amf::AMFComponentExPtr(pMuxer);
+
+        if (isStreamingEnabled)
+        {
+            m_pMuxer->SetProperty(FFMPEG_MUXER_URL, rtmpUrl.c_str());
+        }
+        else
+        {
+            m_pMuxer->SetProperty(FFMPEG_MUXER_PATH, fileName.c_str());
+        }
+
+        m_pMuxer->SetProperty(FFMPEG_MUXER_ENABLE_VIDEO, true);
+
+        //audio
+        amf_int32 outVideoStreamIndex(0);
+        amf_int32 outAudioStreamIndex(0);
+        if (enableAudio)
+        {
+            m_pMuxer->SetProperty(FFMPEG_MUXER_ENABLE_AUDIO, true);
+        }
+
+        amf_int32 inputs = m_pMuxer->GetInputCount();
+        for (amf_int32 input = 0; input < inputs; input++)
+        {
+            amf::AMFInputPtr pInput;
+            res = m_pMuxer->GetInput(input, &pInput);
+            AMF_RETURN_IF_FAILED(res, L"m_pMuxer->GetInput() failed");
+
+            amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+            pInput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
+
+            if (eStreamType == AMF_STREAM_VIDEO)
+            {
+                outVideoStreamIndex = input;
+                pInput->SetProperty(AMF_STREAM_ENABLED, true);
+
+                res = SetVideoMuxerParams(pInput);
+                AMF_RETURN_IF_FAILED(res, L"SetVideoMuxerParams failed");
+            }
+            else if (((audioChannel >= 0) || isZCamLive) && (eStreamType == AMF_STREAM_AUDIO) && enableAudio)
+            {
+                outAudioStreamIndex = input;
+                InitAudioMuxer(pInput);
+            }
+        }
+        res = m_pMuxer->Init(amf::AMF_SURFACE_UNKNOWN, 0, 0);
+        AMF_RETURN_IF_FAILED(res, L"m_pMuxer->Init() failed");
+
+        PipelineElementPtr muxer(new AMFComponentExElement(m_pMuxer));
+        Connect(muxer, outVideoStreamIndex, encoder, 0, 10, CT_ThreadQueue);
+
+        if (enableAudio)
+        {
+            InitAudioPipeline(muxer);
+        }
+    }
+    else
+    {
+        if (m_pVideoPresenter->SupportAllocator() && m_pContext->GetOpenCLContext() == NULL && isStitchedSource)
+        {
+            amf::AMFComponentPtr pConverter = m_Converters[0];
+            m_pVideoPresenter->SetProcessor(pConverter);
+        }
+        else if (m_pVideoPresenter->SupportAllocator() && m_pContext->GetOpenCLContext() == NULL && !isStitchedSource)
+        {
+            m_pVideoPresenter->SetProcessor(m_pStitch);
+        }
+
+        if (m_bVideoPresenterDirectConnect)
+        {
+            Connect(m_pVideoPresenter, 0, compositorElement, 0, 1, CT_ThreadPoll);
+        }
+        else
+        {
+            Connect(m_pVideoPresenter, 0, compositorElement, 0, 4);
+        }
+
+        if (enableAudio)
+        {
+            InitAudioPipeline();
+        }
+    }
+    m_bIsConnected = true;
+    return AMF_OK;
+}
+
+AMF_RESULT StitchPipelineBase::Play()
+{
+    if(!m_bIsConnected)
+    {
+        return AMF_WRONG_STATE;
+    }
+    switch(GetState())
+    {
+    case PipelineStateRunning:
+        m_pStitchElement->Resume();
+        return m_pVideoPresenter->Resume();
+    case PipelineStateReady:
+        return Start();
+    case PipelineStateNotReady:
+    case PipelineStateEof:
+    default:
+        break;
+    }
+    return AMF_WRONG_STATE;
+}
+
+AMF_RESULT StitchPipelineBase::Pause()
+{
+    switch(GetState())
+    {
+    case PipelineStateRunning:
+        m_pStitchElement->Pause();
+        return m_pVideoPresenter->Pause();
+    case PipelineStateReady:
+    case PipelineStateNotReady:
+    case PipelineStateEof:
+    default:
+        break;
+    }
+    return AMF_WRONG_STATE;
+}
+
+AMF_RESULT StitchPipelineBase::Step()
+{
+    if(m_pVideoPresenter != NULL && m_pVideoPresenter->GetMode() ==  VideoPresenter::ModePaused)
+    {
+        m_pStitchElement->Resume();
+        m_pVideoPresenter->Step();
+    }
+    return AMF_OK;
+}
+
+AMF_RESULT StitchPipelineBase::Stop()
+{
+    m_ConnectThread.RequestStop();
+    m_ConnectThread.WaitForStop();
+
+    Pipeline::Stop();
+
+    
+    for(std::vector<StitchStream>::iterator it = m_Streams.begin(); it != m_Streams.end(); it++)
+    {
+        it->Terminate();
+    }
+    m_Streams.clear();
+
+
+    if(m_pStitch!= NULL)
+    {
+        m_pStitchElement = NULL;
+        m_pStitch->Terminate();
+        m_pStitch.Release();
+    }
+
+    if(m_pVideoPresenter != NULL)
+    {
+        m_pVideoPresenter->Terminate();
+        m_pVideoPresenter = NULL;
+    }
+
+    if (m_pMuxer != NULL)
+    {
+        m_pMuxer->Terminate();
+        m_pMuxer.Release();
+    }
+
+    if (m_pEncoder != NULL)
+    {
+        m_pEncoder->Terminate();
+        m_pEncoder.Release();
+    }
+
+    if (m_pConverterEncode != NULL)
+    {
+        m_pConverterEncode->Terminate();
+        m_pConverterEncode.Release();
+    }
+
+    if (m_pAudioCap != NULL)
+    {
+        m_pAudioCap->Terminate();
+        m_pAudioCap.Release();
+    }
+
+    if (m_pSourceAudio != NULL)
+    {
+        m_pSourceAudio->Terminate();
+        m_pSourceAudio.Release();
+    }
+
+    if (m_pAudioDecoder != NULL)
+    {
+        m_pAudioDecoder->Terminate();
+        m_pAudioDecoder.Release();
+    }
+
+    if (m_pAudioConverter != NULL)
+    {
+        m_pAudioConverter->Terminate();
+        m_pAudioConverter.Release();
+    }
+
+    if (m_pAudioConverterEncode != NULL)
+    {
+        m_pAudioConverterEncode->Terminate();
+        m_pAudioConverterEncode.Release();
+    }
+
+    if (m_pAudioEncoder != NULL)
+    {
+        m_pAudioEncoder->Terminate();
+        m_pAudioEncoder.Release();
+    }
+
+    m_pAudioPresenter = NULL;
+    m_pSplitterAudio = NULL;
+
+    m_Converters.clear();
+
+    m_pSplitter = NULL;
+
+    if(m_pSourceZCam != NULL)
+    {
+        m_pSourceZCam->Terminate();
+        m_pSourceZCam.Release();
+    }
+
+    if (m_pContext != NULL)
+    {
+#if DEBUG_D3D11_LEAKS        
+        ATL::CComQIPtr<ID3D11Debug>  pDebug((ID3D11Device*)m_pContext->GetDX11Device());
+#endif
+        m_pContext->Terminate();
+        m_pContext.Release();
+#if DEBUG_D3D11_LEAKS        
+        if(pDebug != NULL)
+        {
+            pDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL);
+        }
+#endif
+    }
+
+    g_AMFFactory.UnLoadExternalComponent(STITCH_DLL_NAME);
+    return AMF_OK;
+}
+
+AMF_RESULT StitchStream::Terminate()
+{
+    m_pParser = NULL;
+    if(m_pDecoder != NULL)
+    {
+        m_pDecoder->Terminate();
+        m_pDecoder.Release();
+    }
+    if(m_pSource != NULL)
+    {
+        m_pSource->Terminate();
+        m_pSource.Release();
+    }
+
+    return AMF_OK;
+}
+
+AMF_RESULT StitchStream::InitDemuxer(
+    amf::AMFContext *pContext,
+    const wchar_t *filename,
+    std::wstring& pVideoDecoderID,
+    AMFSize& frameSize,
+    amf_int64  startTime,          // Starting encoder at timestamp startTime (secs)
+    amf_int64  endTime,            // Stopping encoder at timestamp endTime (secs)
+    amf_int32& iVideoStreamIndex,
+    amf_int32& iAudioStreamIndex,
+    ParamAudioCodec* pParamsAudio,
+    bool infoOnly,
+    amf::AMFBufferPtr& pExtraData)
+{
+    AMF_RESULT res = AMF_OK;
+    //---------------------------------------------------------------------------------------------
+    // Init Video Stream Parser
+
+    BitStreamType streamType = GetStreamType(filename);
+
+    amf_int64 startFrameNum = 0;
+    amf_int64 selectedFrameCount = 0;
+
+    if (streamType != BitStreamUnknown)
+    {
+        amf::AMFDataStream::OpenDataStream(filename, amf::AMFSO_READ, amf::AMFFS_SHARE_READ, &m_pStream);
+        AMF_RETURN_IF_FALSE(m_pStream != NULL, AMF_FILE_NOT_OPEN, L"Open File");
+        m_pParser = BitStreamParser::Create(m_pStream, streamType, pContext);
+        AMF_RETURN_IF_FALSE(m_pParser != NULL, AMF_FILE_NOT_OPEN, L"BitStreamParser::Create");
+
+        m_pParser->SetFrameRate(dForceFPS); // Force 60 FPS on elementary stream to test performance
+        iVideoStreamIndex = 0;
+
+        const unsigned char* extraData = m_pParser->GetExtraData();
+        size_t extraDataSize = m_pParser->GetExtraDataSize();
+        if (extraData && extraDataSize)
+        {
+            pContext->AllocBuffer(amf::AMF_MEMORY_HOST, extraDataSize, &pExtraData);
+            memcpy(pExtraData->GetNative(), extraData, extraDataSize);
+        }
+        frameSize.width = m_pParser->GetPictureWidth();
+        frameSize.height = m_pParser->GetPictureHeight();
+        pVideoDecoderID = m_pParser->GetCodecComponent();
+    }
+    else
+    {
+        amf::AMFComponentPtr  pDemuxer;
+        res = g_AMFFactory.LoadExternalComponent(pContext, FFMPEG_DLL_NAME, "AMFCreateComponentInt", FFMPEG_DEMUXER, &pDemuxer);
+        AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent  ( %s) failed", FFMPEG_DEMUXER);
+		++m_nFfmpegRefCount;
+        m_pSource = amf::AMFComponentExPtr(pDemuxer);
+
+        m_pSource->SetProperty(FFMPEG_DEMUXER_PATH, filename);
+
+        //TODO
+        // HARDCODED FOR NOW, LATER ON SHOULD QUERY FRAMERATE
+        AMFRate frameRate = { 30, 1 };
+        startFrameNum = startTime * frameRate.num / frameRate.den;
+        amf_int64 endFrameCount = endTime * frameRate.num / frameRate.den;
+        selectedFrameCount = endFrameCount - startFrameNum;
+        AMF_RETURN_IF_FALSE(selectedFrameCount >= 0, AMF_EOF, L"EndTime should be later than StartTime");
+
+        // Seek portion of video frames per component
+        if (startFrameNum > 0 && selectedFrameCount > 0)
+        {
+            m_pSource->SetProperty(FFMPEG_DEMUXER_START_FRAME, startFrameNum);
+            m_pSource->SetProperty(FFMPEG_DEMUXER_FRAME_COUNT, selectedFrameCount);
+        }
+
+        res = m_pSource->Init(amf::AMF_SURFACE_UNKNOWN, 0, 0);
+        AMF_RETURN_IF_FAILED(res, L"m_pSource->Init() failed");
+
+        amf_int64 frameCount = 0;
+        m_pSource->GetProperty(FFMPEG_DEMUXER_FRAME_COUNT, &frameCount);
+        m_pSource->GetProperty(FFMPEG_DEMUXER_DURATION, &m_duration);
+        
+        amf_int32 outputs = m_pSource->GetOutputCount();
+        for (amf_int32 output = 0; output < outputs; output++)
+        {
+            amf::AMFOutputPtr pOutput;
+            res = m_pSource->GetOutput(output, &pOutput);
+            AMF_RETURN_IF_FAILED(res, L"m_pSource->GetOutput() failed");
+
+            amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+            pOutput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
+
+
+            if (eStreamType == AMF_STREAM_AUDIO)
+            {
+                if (iAudioStreamIndex < 0)
+                {
+                    iAudioStreamIndex = output;
+                    if (pParamsAudio)
+                    {
+                        pOutput->GetProperty(AMF_STREAM_CODEC_ID, &pParamsAudio->codecID);
+                        pOutput->GetProperty(AMF_STREAM_BIT_RATE, &pParamsAudio->streamBitRate);
+                        pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &pParamsAudio->pExtradata);
+                        pOutput->GetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, &pParamsAudio->streamSampleRate);
+                        pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNELS, &pParamsAudio->streamChannels);
+                        pOutput->GetProperty(AMF_STREAM_AUDIO_FORMAT, &pParamsAudio->streamFormat);
+                        pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, &pParamsAudio->streamLayout);
+                        pOutput->GetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, &pParamsAudio->streamBlockAlign);
+                        pOutput->GetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, &pParamsAudio->streamFrameSize);
+                    }
+                    pOutput->SetProperty(AMF_STREAM_ENABLED, true);
+                }
+            }
+            else if (iVideoStreamIndex < 0 && eStreamType == AMF_STREAM_VIDEO)
+            {
+                iVideoStreamIndex = output;
+                amf::AMFInterfacePtr pInterface;
+                pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &pInterface);
+                pExtraData = amf::AMFBufferPtr(pInterface);
+
+                pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, &frameSize);
+                frameSize.width = frameSize.width;
+                frameSize.height = frameSize.height;
+                m_sizeInput = frameSize;
+
+                amf_int64 codecID;
+                res= pOutput->GetProperty(AMF_STREAM_CODEC_ID, &codecID);
+                pVideoDecoderID = StreamCodecIDtoDecoderID(AMF_STREAM_CODEC_ID_ENUM(codecID));
+                pOutput->SetProperty(AMF_STREAM_ENABLED, true);
+                pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_RATE, &m_framerate);
+            }
+        }
+
+    }
+    AMF_RETURN_IF_FALSE(iVideoStreamIndex != -1, AMF_FAIL, L"Video stream not found");
+    AMF_RETURN_IF_FALSE(pVideoDecoderID.length() != 0, AMF_FAIL, L"Video codec not found");
+    return res;
+}
+
+AMF_RESULT StitchStream::InitDecoder(
+    amf::AMFContext *pContext,
+    std::wstring pVideoDecoderID,
+    AMFSize frameSize,
+    amf::AMF_SURFACE_FORMAT eComposerInput,
+    bool bLowLatency,
+    amf::AMFBufferPtr pExtraData)
+{
+    AMF_RESULT res = AMF_OK;
+    ;
+    //---------------------------------------------------------------------------------------------
+    // Init Video Decoder
+    // decode options to be played with
+    res = g_AMFFactory.GetFactory()->CreateComponent(pContext, pVideoDecoderID.c_str(), &m_pDecoder);
+
+    AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent( %s) failed", pVideoDecoderID);
+
+    if (bLowLatency)
+    {
+        res = m_pDecoder->SetProperty(AMF_VIDEO_DECODER_REORDER_MODE, AMF_VIDEO_DECODER_MODE_LOW_LATENCY);
+        res = m_pDecoder->SetProperty(AMF_VIDEO_DECODER_SURFACE_POOL_SIZE, amf_int64(4));
+    }
+    else
+    {
+        res = m_pDecoder->SetProperty(AMF_VIDEO_DECODER_REORDER_MODE, AMF_VIDEO_DECODER_MODE_REGULAR);
+    }
+    res = m_pDecoder->SetProperty(AMF_TIMESTAMP_MODE, amf_int64(AMF_TS_DECODE)); // our sample H264 parser provides decode order timestamps- change depend on demuxer
+    res = m_pDecoder->SetProperty(AMF_VIDEO_DECODER_EXTRADATA, amf::AMFVariant(pExtraData));
+    res = m_pDecoder->Init(eComposerInput, frameSize.width, frameSize.height);
+    return res;
+}
+
+AMF_RESULT StitchStream::GetMediaInfo(amf::AMFContext *pContext,
+    const wchar_t *filename,
+    MediaInfo& mediaInfo,
+    ParamAudioCodec &paramsAudio)
+{
+    AMF_RESULT res = AMF_OK;
+    //---------------------------------------------------------------------------------------------
+    // Init Video Stream Parser
+
+    BitStreamType streamType = GetStreamType(filename);
+
+    std::wstring pVideoDecoderID;
+    mediaInfo.fileName = filename;
+
+    if (streamType != BitStreamUnknown)
+    {
+        amf::AMFDataStream::OpenDataStream(filename, amf::AMFSO_READ, amf::AMFFS_SHARE_READ, &m_pStream);
+        AMF_RETURN_IF_FALSE(m_pStream != NULL, AMF_FILE_NOT_OPEN, L"Open File");
+        m_pParser = BitStreamParser::Create(m_pStream, streamType, pContext);
+        AMF_RETURN_IF_FALSE(m_pParser != NULL, AMF_FILE_NOT_OPEN, L"BitStreamParser::Create");
+        mediaInfo.framerate.den = 100;
+        mediaInfo.framerate.num  = amf_int32(m_pParser->GetFrameRate()*100.0);
+        mediaInfo.sizeInput.width = m_pParser->GetPictureWidth();
+        mediaInfo.sizeInput.height = m_pParser->GetPictureHeight();
+        mediaInfo.codecID = m_pParser->GetCodecComponent();
+        mediaInfo.duration = 0;
+    }
+    else
+    {
+        amf::AMFComponentPtr  pDemuxer;
+        res = g_AMFFactory.LoadExternalComponent(pContext, FFMPEG_DLL_NAME, "AMFCreateComponentInt", FFMPEG_DEMUXER, &pDemuxer);
+        AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent( %s ) failed", FFMPEG_DEMUXER);
+		++m_nFfmpegRefCount;
+
+        pDemuxer->SetProperty(FFMPEG_DEMUXER_PATH, filename);
+        res = pDemuxer->Init(amf::AMF_SURFACE_UNKNOWN, 0, 0);
+        AMF_RETURN_IF_FAILED(res, L"m_pSource->Init() failed");
+
+//        pDemuxer->GetProperty(FFMPEG_DEMUXER_FRAME_COUNT, &mediaInfo.frameCount);
+        pDemuxer->GetProperty(FFMPEG_DEMUXER_DURATION, &mediaInfo.duration);
+
+        amf::AMFComponentExPtr  pDemuxerEx = amf::AMFComponentExPtr(pDemuxer);
+        amf_int32 outputs = pDemuxerEx->GetOutputCount();
+        for (amf_int32 output = 0; output < outputs; output++)
+        {
+            amf::AMFOutputPtr pOutput;
+            res = pDemuxerEx->GetOutput(output, &pOutput);
+            AMF_RETURN_IF_FAILED(res, L"m_pSource->GetOutput() failed");
+
+            amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+            pOutput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
+
+
+            if (eStreamType == AMF_STREAM_AUDIO)
+            {
+                pOutput->GetProperty(AMF_STREAM_CODEC_ID, &paramsAudio.codecID);
+                pOutput->GetProperty(AMF_STREAM_BIT_RATE, &paramsAudio.streamBitRate);
+                pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &paramsAudio.pExtradata);
+                pOutput->GetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, &paramsAudio.streamSampleRate);
+                pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNELS, &paramsAudio.streamChannels);
+                pOutput->GetProperty(AMF_STREAM_AUDIO_FORMAT, &paramsAudio.streamFormat);
+                pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, &paramsAudio.streamLayout);
+                pOutput->GetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, &paramsAudio.streamBlockAlign);
+                pOutput->GetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, &paramsAudio.streamFrameSize);
+            }
+            else if (eStreamType == AMF_STREAM_VIDEO)
+            {
+                pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, &mediaInfo.sizeInput);
+
+                amf_int64 codecID;
+                res= pOutput->GetProperty(AMF_STREAM_CODEC_ID, &codecID);
+                pVideoDecoderID = StreamCodecIDtoDecoderID(AMF_STREAM_CODEC_ID_ENUM(codecID));
+                pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_RATE, &mediaInfo.framerate);
+            }
+        }
+
+        pDemuxer->Terminate();
+        pDemuxer.Release();
+    }
+    return res;
+}
+    double              StitchPipelineBase::GetFPS()
+{
+    if(m_pVideoPresenter != NULL)
+    {
+        return m_pVideoPresenter->GetFPS();
+    }
+    return 0;
+}
+
+amf_int64           StitchPipelineBase::GetFramesDropped()
+{
+    if(m_pVideoPresenter != NULL)
+    {
+        return m_pVideoPresenter->GetFramesDropped();
+    }
+    return 0;
+}
+
+void StitchPipelineBase::ChangeParameter(const wchar_t *pName, bool bPlus, double step)
+{
+    if(m_pStitch == NULL)
+    {
+        return;
+    }
+
+    if(m_iCurrentChannel >= (int)m_Streams.size())
+    {
+        for(int i = 0; i < (int)m_Streams.size(); i++)
+        {
+            ChangeParameterChannel(i, pName, bPlus, step);
+        }
+    }
+    else
+    {
+        ChangeParameterChannel(m_iCurrentChannel, pName, bPlus, step);
+    }
+}
+void StitchPipelineBase::ChangeParameterChannel(int channel, const wchar_t *pName, bool bPlus, double step)
+{
+    amf::AMFInputPtr input;
+    m_pStitch->GetInput(channel, &input);
+    if(input == NULL)
+    {
+        return;
+    }
+    double value = 0;
+    input->GetProperty(pName, &value);
+    if(bPlus)
+    {
+        value += step;
+    }
+    else
+    {
+        value -= step;
+    }
+    input->SetProperty(pName, value);
+    if(m_pVideoPresenter->GetMode() ==  VideoPresenter::ModePaused)
+    {
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+        m_pStitchElement->Resubmit();
+        m_pVideoPresenter->Step();
+    }
+}
+
+void StitchPipelineBase::ChangeK1(bool bPlus, bool bAccel)
+{
+    ChangeParameter(AMF_VIDEO_STITCH_LENS_CORR_K1, bPlus, (bAccel ? 10.0 :  1.0) / 1000.0);
+}
+void StitchPipelineBase::ChangeK2(bool bPlus, bool bAccel)
+{
+    ChangeParameter(AMF_VIDEO_STITCH_LENS_CORR_K2, bPlus, (bAccel ? 10.0 :  1.0) / 1000.0);
+}
+void StitchPipelineBase::ChangeK3(bool bPlus, bool bAccel)
+{
+    ChangeParameter(AMF_VIDEO_STITCH_LENS_CORR_K3, bPlus, (bAccel ? 10.0 :  1.0) / 1000.0);
+}
+void StitchPipelineBase::ChangeZoom(bool bPlus, bool bAccel)
+{
+    int channel = m_iCurrentChannel;
+    if(channel >= (int)m_Streams.size())
+    {
+        channel = 0;
+    }
+    ChangeParameter(AMF_VIDEO_CAMERA_SCALE, bPlus, (bAccel ? 0.01 : 0.001));
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::ChangeOffsetX(bool bPlus, bool bAccel)
+{
+    int channel = m_iCurrentChannel;
+    if(channel >= (int)m_Streams.size())
+    {
+        channel = 0;
+    }
+
+    ChangeParameter(AMF_VIDEO_CAMERA_OFFSET_X, bPlus, (bAccel ? 10.0 :  1.0) );// in pixels
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::ChangeOffsetY(bool bPlus, bool bAccel)
+{
+    int channel = m_iCurrentChannel;
+    if(channel >= (int)m_Streams.size())
+    {
+        channel = 0;
+    }
+    ChangeParameter(AMF_VIDEO_CAMERA_OFFSET_Y, bPlus, (bAccel ? 10.0 :  1.0) ); // in pixels
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::ChangeCameraPitch(bool bPlus, bool bAccel)
+{
+    ChangeParameter(AMF_VIDEO_CAMERA_ANGLE_PITCH, bPlus, (bAccel ? 10.0 :  1.0)  /180. * XM_PI / 4.0);
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::ChangeCameraYaw(bool bPlus, bool bAccel)
+{
+    ChangeParameter(AMF_VIDEO_CAMERA_ANGLE_YAW, bPlus, (bAccel ? 10.0 :  1.0)  /180. * XM_PI / 4.0);
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::ChangeCameraRoll(bool bPlus, bool bAccel)
+{
+    ChangeParameter(AMF_VIDEO_CAMERA_ANGLE_ROLL, bPlus, (bAccel ? 10.0 :  1.0) /180. * XM_PI / 4.0);
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::SetChannel(int channel)
+{
+    m_iCurrentChannel = channel;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT StitchTemplate::ApplyToCamera(amf::AMFPropertyStorage *camera)
+{
+    AMF_RESULT res = AMF_OK;
+
+    res = camera->SetProperty(AMF_VIDEO_STITCH_LENS_MODE, lensMode);
+
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_OFFSET_X, offsetX);
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_OFFSET_Y, offsetY);
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_OFFSET_Z, offsetZ);
+
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_SCALE, scale);
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_HFOV, hfov);
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_ANGLE_PITCH, pitch);
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_ANGLE_YAW, yaw);
+    res = camera->SetProperty(AMF_VIDEO_CAMERA_ANGLE_ROLL, roll);  
+
+    res = camera->SetProperty(AMF_VIDEO_STITCH_LENS_CORR_K1, lensK1); 
+    res = camera->SetProperty(AMF_VIDEO_STITCH_LENS_CORR_K2, lensK2);
+    res = camera->SetProperty(AMF_VIDEO_STITCH_LENS_CORR_K3, lensK3);
+    res = camera->SetProperty(AMF_VIDEO_STITCH_LENS_CORR_OFFX, lensOffX);
+    res = camera->SetProperty(AMF_VIDEO_STITCH_LENS_CORR_OFFY, lensOffY);
+
+    res = camera->SetProperty(AMF_VIDEO_STITCH_CROP, crop);
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+void StitchTemplate::Clear()
+{
+    pitch = 0.;   // in radians
+    yaw = 0.;     // in radians
+    roll = 0.;    // in radians
+
+    offsetX = 0.; // in pixels
+    offsetY = 0.; // in pixels
+    offsetZ=0.; // in pixels
+    hfov=0;    // M_PI / 2.0
+    scale=0;   // 1.0
+
+    lensK1=0.;
+    lensK2=0.;
+    lensK3=0.;
+    lensOffX=0.;
+    lensOffY=0.;
+
+    overlayFile[0]=0;
+    overlaySize = AMFConstructSize(0, 0);
+
+    lensMode = AMF_VIDEO_STITCH_LENS_RECTILINEAR;
+
+    crop = AMFConstructRect(0, 0, 0, 0);
+}
+static wchar_t * Properties[] =
+{
+    AMF_VIDEO_CAMERA_ANGLE_PITCH,
+    AMF_VIDEO_CAMERA_ANGLE_YAW,
+    AMF_VIDEO_CAMERA_ANGLE_ROLL,
+
+    AMF_VIDEO_CAMERA_OFFSET_X,
+    AMF_VIDEO_CAMERA_OFFSET_Y,
+    AMF_VIDEO_CAMERA_OFFSET_Z,
+    AMF_VIDEO_CAMERA_HFOV,
+
+
+    AMF_VIDEO_STITCH_LENS_CORR_K1,
+    AMF_VIDEO_STITCH_LENS_CORR_K2,
+    AMF_VIDEO_STITCH_LENS_CORR_K3,
+
+    AMF_VIDEO_STITCH_LENS_MODE,
+    AMF_VIDEO_STITCH_CROP,
+
+};
+AMF_RESULT StitchPipelineBase::Dump()
+{
+    amf::AMFDataStreamPtr    pDataStream;
+    amf::AMFDataStream::OpenDataStream(L"template.txt", amf::AMFSO_WRITE, amf::AMFFS_SHARE_READ, &pDataStream);
+
+    char buf[1000];
+    int pos;
+
+    pos = sprintf(buf, "static StitchTemplate m_Cameras = \n");
+    pDataStream->Write(buf, pos, NULL);
+    pos = sprintf(buf, "{\n");
+    pDataStream->Write(buf, pos, NULL);
+
+    for(int channel = 0; channel < (int)m_Streams.size(); channel++)
+    {
+        amf::AMFInputPtr input;
+        m_pStitch->GetInput(channel, &input);
+        if(input == NULL)
+        {
+            return AMF_OK;
+        }
+
+        pos = sprintf(buf, "{ // channel = %d\n", channel);
+        pDataStream->Write(buf, pos, NULL);
+
+        for(int i = 0; i< _countof(Properties); i++)
+        {
+
+            if(std::wstring(AMF_VIDEO_STITCH_LENS_MODE) == std::wstring(Properties[i]))
+            { 
+                amf_int64 value = 0;
+                input->GetProperty(Properties[i], &value);
+                switch(value)
+                {
+                case     AMF_VIDEO_STITCH_LENS_RECTILINEAR:
+                    pos = sprintf(buf, "%s, // %S\n", "AMF_VIDEO_STITCH_LENS_RECTILINEAR", Properties[i]);
+                    break;
+                case     AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME:
+                    pos = sprintf(buf, "%s, // %S\n", "AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME", Properties[i]);
+                    break;
+                case AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR:
+                    pos = sprintf(buf, "%s, // %S\n", "AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR", Properties[i]);
+                    break;
+                }
+            }
+            else if (std::wstring(AMF_VIDEO_STITCH_CROP) == std::wstring(Properties[i]))
+            {
+                AMFRect crop;
+                input->GetProperty(Properties[i], &crop);
+                pos = sprintf(buf, "{%df, %df, %df, %df} // %S\n", (int)crop.left, (int)crop.top, (int)crop.right, (int)crop.bottom, Properties[i]);
+            }
+            else
+            { 
+                double value = 0;
+                input->GetProperty(Properties[i], &value);
+                pos = sprintf(buf, "%.6f, // %S\n", value, Properties[i]);
+            }
+            pDataStream->Write(buf, pos, NULL);
+        }
+        pos = sprintf(buf, "},\n");
+        pDataStream->Write(buf, pos, NULL);
+
+        pos = sprintf(buf, "\n\n");
+        pDataStream->Write(buf, pos, NULL);
+    }
+    pos = sprintf(buf, "};\n");
+    pDataStream->Write(buf, pos, NULL);
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT StitchPipelineBase::Restart()
+{
+     amf::AMFLock lock(&m_cs);
+
+     bool bLoop = true;
+     GetParam(StitchPipelineBase::PARAM_NAME_LOOP, bLoop);
+     if(!bLoop)
+     {
+         return AMF_OK;
+     }
+
+    if (m_Streams.size() > 0)
+    {
+        amf::AMFContext::AMFDX11Locker lock(m_pContext);
+
+        for (std::vector<StitchStream>::iterator it = m_Streams.begin(); it != m_Streams.end(); it++)
+        {
+            if (it->m_pParser != NULL)
+            {
+                it->m_pParser->ReInit();
+            }
+            else
+            {
+                it->m_pSource->ReInit(0, 0);
+            }
+
+            it->m_pDecoder->Flush();
+            ((PipelineElementAMFDecoder*)it->m_pDecoderElement.get())->Restart();
+        }
+
+        for (amf_int32 idx = 0; idx < (int)m_Converters.size(); idx++)
+        {
+            if (m_Converters[idx] != NULL)
+            {
+                m_Converters[idx]->ReInit(m_sizeInput.width, m_sizeInput.height);
+            }
+        }
+
+        m_pStitch->Flush();
+        m_pDecoderSubmissionSync->ReInit();
+        m_pVideoPresenter->Reset();
+        if(m_pSplitter!= NULL)
+        {
+            m_pSplitter->Flush();
+        }
+        amf_int32 compositedWidth = 3840;
+        amf_int32 compositedHeight = 1920;
+        GetParam(PARAM_NAME_COMPOSITED_WIDTH, compositedWidth);
+        GetParam(PARAM_NAME_COMPOSITED_HEIGHT, compositedHeight);
+
+        if(m_pEncoder != NULL)
+        {
+            m_pEncoder->Flush();
+        }
+        if(m_pConverterEncode != NULL)
+        {
+            m_pConverterEncode->ReInit(compositedWidth, compositedHeight);
+        }
+        Pipeline::Restart();
+    }
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::EofDecoders()
+{
+    amf::AMFLock lock(&m_cs);
+    for(std::vector<StitchStream>::iterator it = m_Streams.begin(); it != m_Streams.end(); it++)
+    {
+        it->m_pDecoderElement->OnEof();
+    }
+    m_pStitch->Drain();
+}
+
+//-------------------------------------------------------------------------------------------------
+int ReadOneValueAndAttributeInt(std::string &text, std::string::size_type  &pos, char &attribute)
+{
+    int value = 0;
+    while(pos < text.length())
+    {
+        if(text[pos] == ' ')
+        {
+            pos++;
+            continue;
+        }
+        attribute = text[pos];
+        pos++;
+        if(pos >= text.length())
+        {
+            break;
+        }
+        int tmp = 0;
+        sscanf(&text[pos], "%d", &tmp);
+        value = (amf_int32)tmp;
+        while(pos < text.length())
+        {
+            if(text[pos] == ' ')
+            {
+                break;
+            }
+            pos++;
+        }
+        break;
+    }
+    return value;
+}
+//-------------------------------------------------------------------------------------------------
+int ReadOneValueInt(std::string &text, std::string::size_type  &pos)
+{
+    int value = 0;
+    while(pos < text.length())
+    {
+        if (text[pos] == ' ' || text[pos] == ',')
+        {
+            pos++;
+            continue;
+        }
+        int tmp = 0;
+        sscanf(&text[pos], "%d", &tmp);
+        value = tmp;
+        while(pos < text.length())
+        {
+            if (text[pos] == ' ' || text[pos] == ',')
+            {
+                break;
+            }
+            pos++;
+        }
+        break;
+    }
+    return value;
+}
+
+char ReadOneAttribute(std::string &text, std::string::size_type  &pos)
+{
+    char attribute = 0;
+    while (pos < text.length())
+    {
+        if (text[pos] == ' ' || text[pos] == ',')
+        {
+            pos++;
+            continue;
+        }
+        attribute = text[pos];
+        pos++;
+        break;
+    }
+    return attribute;
+}
+
+double ReadOneValueAndAttributeDouble(std::string &text, std::string::size_type  &pos, char &attribute)
+{
+    double value = 0;
+    while(pos < text.length())
+    {
+        if (text[pos] == ' ' || text[pos] == ',')
+        {
+            pos++;
+            continue;
+        }
+        attribute = text[pos];
+        pos++;
+        if(pos >= text.length())
+        {
+            break;
+        }
+        double tmp = 0;
+        sscanf(&text[pos], "%lf", &tmp);
+        value = tmp;
+        while(pos < text.length())
+        {
+            if (text[pos] == ' ' || text[pos] == ',')
+            {
+                break;
+            }
+            pos++;
+        }
+        break;
+    }
+    return value;
+}
+double ReadOneValueDouble(std::string &text, std::string::size_type  &pos)
+{
+    double value = 0;
+    while(pos < text.length())
+    {
+        if(text[pos] == ' ')
+        {
+            pos++;
+            continue;
+        }
+        double tmp = 0;
+        sscanf(&text[pos], "%lf", &tmp);
+        value = tmp;
+        while(pos < text.length())
+        {
+            if(text[pos] == ' ')
+            {
+                break;
+            }
+            pos++;
+        }
+        break;
+    }
+    return value;
+}
+//-------------------------------------------------------------------------------------------------
+void ReadOneImage(std::string &text, StitchTemplate &t)
+{
+    int lensType = 0;
+    bool bFOV = false;
+    std::string::size_type  pos = 1; // skip first '0'
+    while (pos < text.length())
+    {
+        if (text[pos] == ' ')
+        {
+            pos++;
+            continue;
+        }
+        // from here: http://wiki.panotools.org/PTStitcher
+        char attribute = ReadOneAttribute(text, pos);
+
+        double valueDbl = 0;
+        double valueInt = 0;
+
+        switch (attribute)
+        {
+        case 'f':
+            lensType = ReadOneValueInt(text, pos);
+            //MM TODO integer: use projection format:
+            // 0 - rectilinear (normal lenses) 
+            // 1 - Panoramic (Scanning cameras like Noblex)   
+            // 2 - Circular fisheye
+            // 3 - full-frame fisheye
+            // 4 - PSphere, equirectangular
+            break;
+        case 'y':
+            valueDbl = ReadOneValueDouble(text, pos);
+            t.yaw = valueDbl * M_PI / 180.;
+            break;
+        case 'r':
+            valueDbl = ReadOneValueDouble(text, pos);
+            t.roll = valueDbl * M_PI / 180.;
+            break;
+        case 'p':
+            valueDbl = ReadOneValueDouble(text, pos);
+            t.pitch = valueDbl * M_PI / 180.;
+            break;
+        case 'a':
+            valueDbl = ReadOneValueDouble(text, pos);
+            if (valueDbl != 0)
+            {
+                t.lensK1 = valueDbl;
+            }
+            break;
+        case 'b':
+            valueDbl = ReadOneValueDouble(text, pos);
+            if (valueDbl != 0)
+            {
+                t.lensK2 = valueDbl;
+            }
+            break;
+        case 'c':
+            valueDbl = ReadOneValueDouble(text, pos);
+            if (valueDbl != 0)
+            {
+                t.lensK3 = valueDbl;
+            }
+            break;
+        case 'd':
+            valueDbl = ReadOneValueDouble(text, pos);
+            if (valueDbl != 0)
+            {
+                t.lensOffX = valueDbl;
+                t.offsetX = 0;
+            }
+            break;
+        case 'e':
+            valueDbl = ReadOneValueDouble(text, pos);
+            if (valueDbl != 0)
+            {
+                t.lensOffY = valueDbl;
+                t.offsetY = 0;
+            }
+            break;
+        case 'v':
+            valueDbl = ReadOneValueDouble(text, pos);
+            if (valueDbl != 0)
+            {
+                t.hfov = valueDbl * M_PI / 180.;
+                bFOV = true;
+                t.offsetZ = 0;
+            }
+            break;
+        case 'C':
+            t.crop.left = ReadOneValueInt(text, pos);
+            t.crop.right = ReadOneValueInt(text, pos);
+            t.crop.top = ReadOneValueInt(text, pos);
+            t.crop.bottom = ReadOneValueInt(text, pos);
+            break;
+        }
+    }
+    t.scale = 1.0;
+    if (bFOV)
+    {
+        switch (lensType)
+        {
+        case 0: //  rectilinear (normal lenses) 
+            t.lensMode = AMF_VIDEO_STITCH_LENS_RECTILINEAR;
+            break;
+        case 2: // Circular fisheye
+            t.lensMode = AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR;
+            break;
+        case 3: // full-frame fisheye
+            t.lensMode = AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME;
+            break;
+        }
+        //MM TODO support more
+    }
+}
+//-------------------------------------------------------------------------------------------------
+void StitchPipelineBase::ParsePTGuiProject(const std::wstring &ptguifilename)
+{
+    if(ptguifilename.length() == 0)
+    {
+        return;
+    }
+    AMF_RESULT res = AMF_OK;
+
+    //support upto 32 cameras    
+    m_Cameras.resize(32);
+
+    std::fstream stm;
+    stm.open(ptguifilename, std::fstream::in );
+    if(!stm.is_open())
+    {
+        AMFTraceWarning(AMF_FACILITY, L"Cannot open file %s", ptguifilename.c_str());
+        return;
+    }
+    // start parsing
+    while(true)
+    {
+        std::string line;
+        if(!std::getline(stm, line))
+        {
+            break; //EOF
+        }
+
+        if(line == "# input images:")
+        {
+            bool bDummyImage = false;
+            int index = 0;
+            m_Cameras[index].Clear();
+            while (true)
+            { 
+                if(!std::getline(stm, line))
+                {
+                    break; //EOF
+                }
+                if(line.length() == 0)
+                {
+                     break; // end of control points
+                }
+                if(line == "#-dummyimage")
+                {
+                    bDummyImage = true;
+                    continue;
+                }
+                if(line[0] == 'o' && line[0] != 'O')
+                {
+                    if(bDummyImage)
+                    {
+                        bDummyImage = false;
+                        ReadOneImage(line, m_Cameras[0]);
+                        for (int i = 1; i < (int)m_Cameras.size(); i++)
+                        {
+                            memcpy(&m_Cameras[i], &m_Cameras[0], sizeof(m_Cameras[0]));
+                        }
+                        continue;
+                    }
+                    ReadOneImage(line, m_Cameras[index]);
+                    index++;
+                    if (index >= (int)m_Cameras.size())
+                    {
+                        break;
+                    }
+                }
+            }        
+            m_Cameras.resize(index);
+        }
+    }
+}
+
+AMF_RESULT StitchPipelineBase::InitVideoEncoder()
+{
+    AMF_RESULT res = AMF_FAIL;
+
+    std::wstring codec = AMFVideoEncoderVCE_AVC;
+    GetParamWString(StitchPipelineBase::PARAM_NAME_ENCODER_CODEC, codec);
+
+    ParametersStorage            *encoderParams = NULL;
+    if(codec == AMFVideoEncoderVCE_AVC)
+    {
+        encoderParams = &m_EncoderParamsAVC;
+    }
+    else if(codec == AMFVideoEncoder_HEVC)
+    {
+        encoderParams = &m_EncoderParamsHEVC;
+    }
+    else
+    {
+        AMF_RETURN_IF_FAILED(AMF_INVALID_ARG, L"Wrong Encoder ID");
+    }
+
+    amf::AMF_SURFACE_FORMAT encoderInputFormat = amf::AMF_SURFACE_UNKNOWN;
+    {
+        res = g_AMFFactory.GetFactory()->CreateComponent(m_pContext, codec.c_str(), &m_pEncoder);
+        AMF_RETURN_IF_FAILED(res, L"g_AMFFactory.GetFactory()->CreateComponent(%s ) failed", codec);
+
+        encoderInputFormat = amf::AMF_SURFACE_NV12;
+    }
+    
+    amf_int32 compositedWidth = 3840;
+    amf_int32 compositedHeight = 1920;
+    GetParam(PARAM_NAME_COMPOSITED_WIDTH, compositedWidth);
+    GetParam(PARAM_NAME_COMPOSITED_HEIGHT, compositedHeight);
+
+    //BGRA to NV12 / YUV420P
+    res = g_AMFFactory.GetFactory()->CreateComponent(m_pContext, AMFVideoConverter, &m_pConverterEncode);
+    AMF_RETURN_IF_FAILED(res, L"AMFCreateComponent( %s) failed", AMFVideoConverter);
+    m_pConverterEncode->SetProperty(AMF_VIDEO_CONVERTER_KEEP_ASPECT_RATIO, true);
+    m_pConverterEncode->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, (encoderInputFormat == amf::AMF_SURFACE_YUV420P) ? amf::AMF_MEMORY_OPENCL : amf::AMF_MEMORY_DX11);
+    m_pConverterEncode->SetProperty(AMF_VIDEO_CONVERTER_COMPUTE_DEVICE, (encoderInputFormat == amf::AMF_SURFACE_YUV420P) ? amf::AMF_MEMORY_OPENCL : amf::AMF_MEMORY_COMPUTE_FOR_DX11);
+    m_pConverterEncode->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, encoderInputFormat);
+
+    //    m_pConverterEncode->Init(amf::AMF_SURFACE_BGRA, compositedWidth, compositedHeight);
+    m_pConverterEncode->Init(m_eComposerOutputDefault, compositedWidth, compositedHeight);
+
+
+    // Usage is preset that will set many parameters
+    PushParamsToPropertyStorage(encoderParams, ParamEncoderUsage, m_pEncoder);
+    // override some usage parameters
+    PushParamsToPropertyStorage(encoderParams, ParamEncoderStatic, m_pEncoder);
+    
+    res = m_pEncoder->Init(encoderInputFormat, compositedWidth, compositedHeight);
+    AMF_RETURN_IF_FAILED(res, L"m_pEncoder->Init() failed");
+
+    PushParamsToPropertyStorage(encoderParams, ParamEncoderDynamic, m_pEncoder);
+
+    return res;
+
+}
+
+AMF_RESULT StitchPipelineBase::SetVideoMuxerParams(amf::AMFInput* const pInput)
+{
+    amf_int32 bitrate = 0;
+    AMFSize frameSize = {0,0};
+    AMFRate frameRate = {0,0};
+    amf::AMFInterfacePtr pExtraData;
+
+    std::wstring codec = AMFVideoEncoderVCE_AVC;
+    GetParamWString(StitchPipelineBase::PARAM_NAME_ENCODER_CODEC, codec);
+
+    ParametersStorage            *encoderParamsAVC = NULL;
+    if(codec == AMFVideoEncoderVCE_AVC)
+    {
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &bitrate);
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_EXTRADATA, &pExtraData);
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, &frameSize);
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &frameRate);
+
+    }
+    else if(codec == AMFVideoEncoder_HEVC)
+    {
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &bitrate);
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_EXTRADATA, &pExtraData);
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &frameSize);
+        m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, &frameRate);
+    }
+    else
+    {
+        return AMF_FAIL;
+    }
+
+    pInput->SetProperty(AMF_STREAM_BIT_RATE, bitrate);
+    pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
+    pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, frameSize);
+    pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_RATE, frameRate);
+
+    return AMF_OK;
+}
+
+AMF_RESULT StitchPipelineBase::GetProperty(int channel, wchar_t* paramName, double& value)
+{
+    AMF_RESULT ret = AMF_OK;
+    if (channel >= (int)m_Streams.size())
+    {
+        return AMF_FAIL;
+    }
+
+    if (m_pStitch)
+    {
+        amf::AMFInputPtr input;
+        m_pStitch->GetInput(channel, &input);
+        ret = input->GetProperty(paramName, &value);
+    }
+
+    return ret;
+}
+AMF_RESULT StitchPipelineBase::SetProperty(int channel, wchar_t* paramName, double value)
+{
+    if (channel >= (int)m_Streams.size())
+    {
+        return AMF_FAIL;
+    }
+
+    AMF_RESULT ret = AMF_OK;
+
+    if (m_pStitch)
+    {
+        amf::AMFInputPtr input;
+        m_pStitch->GetInput(channel, &input);
+        ret = input->SetProperty(paramName, value);
+    }
+
+    return ret;
+}
+AMF_RESULT       StitchPipelineBase::StartConnect()
+{
+    m_ConnectThread.Start();
+    return AMF_OK;
+}
+AMF_RESULT       StitchPipelineBase::OnConnect()
+{
+    AMF_RESULT res = InitZCam();
+
+    if (res == AMF_OK)
+    {
+        AMFSize frameSize = { 0 };
+        m_pSourceZCam->GetProperty(ZCAMLIVE_VIDEO_FRAMESIZE, &frameSize);
+        res = m_pSourceZCam->Init(amf::AMF_SURFACE_FORMAT::AMF_SURFACE_NV12, frameSize.width, frameSize.height);
+        //    AMF_RETURN_IF_FAILED(res, L"AMFZCamLiveStreamImpl Init() failed\n");
+    }
+
+    if(res == AMF_OK)
+    {
+        m_bIsConnected = true;
+        res = InitInternal();
+        if(res == AMF_OK)
+        {
+            Play();
+        }
+    }
+    else
+    {
+        m_pSourceZCam->Terminate();
+    }
+    return res;
+}
+
+AMF_RESULT  StitchPipelineBase::InitZCam()
+{
+    AMF_RESULT res = AMF_OK;
+    amf_int64 modeZCam = CAMLIVE_MODE_INVALID;
+    GetParam(PARAM_NAME_ZCAMLIVE_MODE, modeZCam);
+
+    if (m_pSourceZCam == NULL)
+    {
+        if ((CAMLIVE_MODE_THETAS == modeZCam) || (CAMLIVE_MODE_THETAV == modeZCam))
+        {
+            res = AMFCreateComponentVideoCapture(m_pContext, &m_pSourceZCam);
+        }
+        else
+        {
+            res = AMFCreateComponentZCamLiveStream(m_pContext, &m_pSourceZCam);
+        }
+
+        AMF_RETURN_IF_FALSE(m_pSourceZCam != NULL, AMF_OUT_OF_MEMORY, L"AMFZCamLiveStreamImpl new failed!\n");
+    }
+
+    if (m_pSourceZCam)
+    {
+        bool isStreamingEnabled = false;
+        GetParam(PARAM_NAME_STREAMING, isStreamingEnabled);
+        m_pSourceZCam->SetProperty(ZCAMLIVE_VIDEO_MODE, modeZCam);
+        m_pSourceZCam->SetProperty(ZCAMLIVE_AUDIO_MODE, isStreamingEnabled ? CAM_AUDIO_MODE_SILENT : CAM_AUDIO_MODE_NONE);
+        bool bLowLatency = true;
+        //        GetParam(PARAM_NAME_LOWLATENCY, bLowLatency);
+        m_pSourceZCam->SetProperty(ZCAMLIVE_LOWLATENCY, isStreamingEnabled ? 1 : 0); //streaming to youtube needs evenly spaced timestamp 
+
+        if (CAMLIVE_MODE_THETAS == modeZCam)
+        {
+            m_pSourceZCam->SetProperty(VIDEOCAP_DEVICE_ACTIVE, L"RICOH THETA S");
+        }
+        else if (CAMLIVE_MODE_THETAV == modeZCam)
+        {
+            m_pSourceZCam->SetProperty(VIDEOCAP_DEVICE_ACTIVE, L"RICOH THETA V");
+        }
+
+        //set Camera IPs for router mode
+        int streamCount = 4;
+        m_pSourceZCam->GetProperty(ZCAMLIVE_STREAMCOUNT, &streamCount);
+
+        amf::AMFVariant var;
+        std::wstring cameraIPName = std::wstring(PARAM_NAME_ZCAMLIVE_IP) + std::wstring(L"_00");
+        int cameraIPNameLen = (int)cameraIPName.length() - 1;
+        for (amf_int32 ch = 0; ch < streamCount; ch++)
+        {
+            if (GetParam(cameraIPName.c_str(), var) == AMF_OK)
+            {
+                m_pSourceZCam->SetProperty(cameraIPName.c_str(), var.ToWString().c_str());
+            }
+            cameraIPName[cameraIPNameLen] += 1;
+        }
+
+    }
+    return res;
+}
+
+std::vector<MediaInfo>* StitchPipelineBase::GetMediaInfo()
+{
+    amf_int64 modeZCam = CAMLIVE_MODE_INVALID;
+    GetParam(PARAM_NAME_ZCAMLIVE_MODE, modeZCam);
+    bool isZCamLive = modeZCam != CAMLIVE_MODE_INVALID;
+    if (!isZCamLive)
+    {
+        return &m_Media;
+    }
+
+    AMF_RESULT res = InitZCam();
+    if (res == AMF_OK)
+    {
+        MediaInfo mediaInfo = { 0 };
+        mediaInfo.fileName = L"10.98.32.1";
+        m_pSourceZCam->GetProperty(ZCAMLIVE_VIDEO_FRAMESIZE, &mediaInfo.sizeInput);
+        amf_double fps = 0.;
+        m_pSourceZCam->GetProperty(ZCAMLIVE_VIDEO_FRAMERATE, &fps);
+        mediaInfo.framerate.den = 1;
+        mediaInfo.framerate.num = amf_int32(fps);
+        amf::AMFVariant var;
+        res = m_pSourceZCam->GetProperty(ZCAMLIVE_CODEC_ID, &var);
+        if (res == AMF_OK)  // video stream setup
+        {
+            mediaInfo.codecID = var.ToWString().c_str();
+        }
+        
+        amf_int32 streamCount = (amf_int32)m_Cameras.size();
+        m_pSourceZCam->GetProperty(ZCAMLIVE_STREAMCOUNT, &streamCount);
+        m_Media.clear();
+        for (amf_int32 idx = 0; idx < streamCount; idx++)
+        {
+            m_Media.push_back(mediaInfo);
+            mediaInfo.fileName[mediaInfo.fileName.length() - 1] = mediaInfo.fileName[mediaInfo.fileName.length() - 1] + 1;
+        }
+    }
+
+    return &m_Media;
+};
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/StitchPipelineBase.h Added

@@ -0,0 +1,331 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once
+
+#include "public/include/core/Context.h"
+#include "public/include/components/Component.h"
+#include "public/include/components/VideoDecoderUVD.h"
+#include "public/include/components/VideoConverter.h"
+#include "public/include/components/VideoEncoderVCE.h"
+#include "public/include/components/VideoEncoderHEVC.h"
+#include "public/samples/CPPSamples/common/BitStreamParser.h"
+#include "public/samples/CPPSamples/common/BackBufferPresenter.h"
+#include "public/samples/CPPSamples/common/ParametersStorage.h"
+#include "public/samples/CPPSamples/common/Pipeline.h"
+#include "public/common/Thread.h"
+#include "public/include/components/VideoStitch.h"
+#include "public/samples/CPPSamples/common/AudioPresenter.h"
+class ParamAudioCodec
+{
+public:
+    amf_int64 codecID = 0;
+    amf_int64 streamBitRate = 0;
+    amf_int64 streamSampleRate = 0;
+    amf_int64 streamChannels = 0;
+    amf_int64 streamFormat = 0;
+    amf_int64 streamLayout = 0;
+    amf_int64 streamBlockAlign = 0;
+    amf_int64 streamFrameSize = 0;
+    amf::AMFInterfacePtr pExtradata;
+};
+
+class MediaInfo
+{
+public:
+    amf_int64 duration;
+    AMFRate framerate;
+    AMFSize   sizeInput;
+    std::wstring codecID;
+    std::wstring fileName;
+};
+
+class StitchStream
+{
+public:
+    amf::AMFDataStreamPtr                       m_pStream;
+    BitStreamParserPtr                          m_pParser;
+    amf::AMFComponentExPtr                      m_pSource;
+    amf::AMFComponentPtr                        m_pDecoder;
+    PipelineElementPtr                          m_pDecoderElement;
+    amf_uint32                                  m_nFfmpegRefCount = 0;
+
+    AMF_RESULT InitDemuxer(amf::AMFContext *pContext, const wchar_t *filename,
+        std::wstring& pVideoDecoderID, AMFSize& frameSize, 
+        amf_int64  startTime,          // Starting encoder at timestamp startTime (secs)
+        amf_int64  endTime,            // Stopping encoder at timestamp endTime (secs)
+        amf_int32& iVideoStreamIndex, amf_int32& iAudioStreamIndex,
+        ParamAudioCodec* pParamsAudio, bool infoOnly, amf::AMFBufferPtr& pExtraData);
+    AMF_RESULT InitDecoder(amf::AMFContext *pContext, std::wstring pVideoDecoderID,
+        AMFSize frameSize, amf::AMF_SURFACE_FORMAT eComposerInput, bool bLowLatency, amf::AMFBufferPtr pExtraData);
+    AMF_RESULT GetMediaInfo(amf::AMFContext *pContext, const wchar_t *filename, MediaInfo& mediaInfo, ParamAudioCodec &paramsAudio);
+    AMF_RESULT Terminate();
+    amf_int64 m_duration;
+    AMFRate m_framerate;
+    AMFSize   m_sizeInput;
+    std::wstring m_codecID;
+    std::wstring m_fileName;
+};
+
+class StitchTemplate
+{
+public:
+    double pitch;   // in radians
+    double yaw;     // in radians
+    double roll;    // in radians
+
+    double offsetX; // in pixels
+    double offsetY; // in pixels
+    double offsetZ; // in pixels
+    double hfov;    // M_PI / 2.0
+    double scale;   // 1.0
+
+    double lensK1;
+    double lensK2;
+    double lensK3;
+    double lensOffX;
+    double lensOffY;
+
+    wchar_t overlayFile[_MAX_PATH];
+    AMFSize overlaySize;
+    AMFRect crop;
+    AMF_VIDEO_STITCH_LENS_ENUM lensMode;
+
+public:
+    AMF_RESULT ApplyToCamera(amf::AMFPropertyStorage *camera);
+    void Clear();
+};
+
+class StitchElement : public PipelineElement
+{
+protected:
+    struct Data
+    {
+        amf::AMFDataPtr     data;
+    };
+public:
+    StitchElement(amf::AMFComponent *pComponent, amf_int32 inputCount, AMFSize outputSize);
+    virtual ~StitchElement(){};
+    virtual amf_int32 GetInputSlotCount() const { return m_iInputCount; }
+    virtual amf_int32 GetOutputSlotCount() const { return 1; }
+    virtual AMF_RESULT SubmitInput(amf::AMFData* pData, amf_int32 slot);
+    amf_int32 GetFrameCount(){ return m_countFrame; };
+
+    virtual AMF_RESULT OnEof();
+    virtual AMF_RESULT SubmitInputInt(amf::AMFData* pData, amf_int32 slot);
+    AMF_RESULT QueryOutput(amf::AMFData** ppData);
+    virtual AMF_RESULT Drain(amf_int32 inputSlot);
+    AMF_RESULT Resubmit();
+    AMF_RESULT Pause();
+    AMF_RESULT Resume();
+protected:
+    amf::AMFComponentExPtr      m_pComponent;
+    amf_int32                   m_iInputCount;
+    amf::AMFCriticalSection     m_cs;
+    AMFSize                     m_OutputSize;
+    std::vector<Data>           m_lastInputs;
+    bool                        m_bPause;
+    amf_int32                   m_countFrame;
+};
+
+class StitchPipelineBase : public Pipeline, public ParametersStorage
+{
+    class  DecoderSubmissionSync;
+    class PipelineElementAMFDecoder;
+public:
+    static const wchar_t* PARAM_NAME_INPUT;
+    static const wchar_t* PARAM_NAME_PRESENTER;
+    static const wchar_t* PARAM_NAME_FRAMERATE;
+    static const wchar_t* PARAM_NAME_STREAM_COUNT;
+    static const wchar_t* PARAM_NAME_COMPOSITED_WIDTH;
+    static const wchar_t* PARAM_NAME_COMPOSITED_HEIGHT;
+    static const wchar_t* PARAM_NAME_LOWLATENCY;
+    static const wchar_t* PARAM_NAME_STITCH_ENGINE;
+    static const wchar_t* PARAM_NAME_ZCAMLIVE_MODE;
+    static const wchar_t* PARAM_NAME_PTS_FILE;
+    static const wchar_t* PARAM_NAME_OUTPUT_FILE;
+    static const wchar_t* PARAM_NAME_LOOP;
+    static const wchar_t* PARAM_NAME_ENCODER_CODEC;
+    static const wchar_t* PARAM_NAME_ENCODE;
+    static const wchar_t* PARAM_NAME_ENCODE_PREVIEW;
+    static const wchar_t* PARAM_NAME_STREAMING;
+    static const wchar_t* PARAM_NAME_STREAMING_URL;
+    static const wchar_t* PARAM_NAME_STREAMING_KEY;
+    static const wchar_t* PARAM_NAME_AUDIO_CH;
+    static const wchar_t* PARAM_NAME_AUDIO_MODE;
+    static const wchar_t* PARAM_NAME_AUDIO_FILE;
+    static const wchar_t* PARAM_NAME_ZCAMLIVE_IP;
+
+
+    StitchPipelineBase();
+    virtual ~StitchPipelineBase();
+
+    // from Pipeline
+    virtual AMF_RESULT  Stop();
+    virtual AMF_RESULT  Restart();
+    virtual double      GetFPS();
+
+    // StitchPipelineBase
+    virtual AMF_RESULT  InitMedia(const std::vector<std::wstring> &filenames, bool forceInitilize = false);
+    virtual AMF_RESULT  InitCamera(const std::wstring &filenamesPTGui, bool forceInitilize=false);
+    virtual AMF_RESULT  Init();
+
+    virtual AMF_RESULT  Play();
+    virtual AMF_RESULT  Pause();
+    virtual AMF_RESULT  Step();
+
+    virtual AMF_RESULT	Terminate();
+
+    double              GetProgressSize();
+    double              GetProgressPosition();
+    amf_int64           GetFramesDropped();
+
+    void                SetChannel(int channel);
+    void                ChangeK1(bool bPlus, bool bAccel);
+    void                ChangeK2(bool bPlus, bool bAccel);
+    void                ChangeK3(bool bPlus, bool bAccel);
+    void                ChangeZoom(bool bPlus, bool bAccel);
+    void                ChangeOffsetX(bool bPlus, bool bAccel);
+    void                ChangeOffsetY(bool bPlus, bool bAccel);
+
+
+    void                ChangeCameraPitch(bool bPlus, bool bAccel);
+    void                ChangeCameraYaw(bool bPlus, bool bAccel);
+    void                ChangeCameraRoll(bool bPlus, bool bAccel);
+    AMF_RESULT          GetProperty(int channel, wchar_t* paramName, double& value);
+    AMF_RESULT          SetProperty(int channel, wchar_t* paramName, double value);
+
+    amf::AMFContext*    GetContext() {return m_pContext;}
+
+    AMF_RESULT          Dump();
+    std::vector<StitchTemplate>*    GetCameras(){ return &m_Cameras; };
+    std::vector<MediaInfo>*         GetMediaInfo();
+    AMFSize                         GetInputSize(){ return m_sizeInput; };
+    ParametersStorage&              GetEncoderParamsAVC() {return m_EncoderParamsAVC;}
+    ParametersStorage&              GetEncoderParamsHEVC() {return m_EncoderParamsHEVC;}
+    ParametersStorage&              GetEncoderParamsFFMPEG() { return m_EncoderParamsFFMPEG; }
+
+    std::vector<MediaInfo>*         UpdateMediaInfo(const wchar_t *pName, amf_int32 ch);
+    
+protected:
+    virtual AMF_RESULT  InitInternal();
+
+    virtual AMF_RESULT  InitContext(amf::AMF_MEMORY_TYPE type) = 0;
+    virtual AMF_RESULT  InitStitcher(amf::AMF_SURFACE_FORMAT &stitchInputFmt) = 0;
+    virtual AMF_RESULT  CreateVideoPresenter(amf::AMF_MEMORY_TYPE type, amf_int32 compositedWidth, amf_int32 compositedHeight) = 0;
+    virtual AMF_RESULT  InitVideoEncoder();
+
+    AMF_RESULT StartConnect();
+    AMF_RESULT OnConnect();
+    void       ParsePTGuiProject(const std::wstring &ptguifilename);
+
+    AMF_RESULT InitEncoderSW(const unsigned int codec_id, AMFSize frameSize);
+
+    void       EofDecoders();
+    void       ChangeParameter(const wchar_t *pName, bool bPlus, double step);
+    void       ChangeParameterChannel(int channel, const wchar_t *pName, bool bPlus, double step);
+    AMF_RESULT SetVideoMuxerParams(amf::AMFInput* const input);
+    AMF_RESULT InitZCam();
+
+    amf::AMFContextPtr                          m_pContext;
+    VideoPresenterPtr                           m_pVideoPresenter;
+    amf::AMFComponentExPtr                      m_pStitch;
+    StitchElement*                              m_pStitchElement;
+    std::vector<MediaInfo>                      m_Media;
+    std::vector<StitchTemplate>                 m_Cameras;
+    bool                                        m_bVideoPresenterDirectConnect;
+	amf_uint32                                  m_nFfmpegRefCount;
+	
+    int                                         m_iCurrentChannel;   //current video channel for adjustment
+    std::vector<StitchStream>                   m_Streams;
+    amf::AMFComponentPtr                        m_pConverterEncode;
+    std::shared_ptr<DecoderSubmissionSync>      m_pDecoderSubmissionSync;
+    std::vector<amf::AMFComponentPtr>           m_Converters;
+    amf::AMFComponentExPtr                      m_pMuxer;
+    amf::AMFComponentExPtr                      m_pSourceZCam;
+
+    amf::AMFComponentPtr                        m_pEncoder;
+    ParametersStorage                           m_EncoderParamsAVC;
+    ParametersStorage                           m_EncoderParamsHEVC;
+    ParametersStorage                           m_EncoderParamsFFMPEG;
+    SplitterPtr                                 m_pSplitter;
+    amf_int32                                   m_stateCameras;   //0:not ready, 1: ready, 2:updated
+    
+    ParamAudioCodec                             m_paramsAudio;
+    AMFSize                                     m_sizeInput;
+    bool                                        m_mediaInitilized;
+    bool                                        m_cameraInitilized;
+
+    //audio
+    amf::AMFComponentExPtr  m_pAudioCap;
+    amf::AMFComponentExPtr  m_pSourceAudio;
+    amf::AMFComponentPtr    m_pAudioDecoder;
+    amf::AMFComponentPtr    m_pAudioConverter;
+    amf::AMFComponentPtr    m_pAudioConverterEncode;
+    amf::AMFComponentPtr    m_pAudioEncoder;
+    AudioPresenterPtr       m_pAudioPresenter;
+    amf::AMFComponentPtr    m_pAmbisonicRender;
+    SplitterPtr             m_pSplitterAudio;
+    amf_int32               m_streamAudioPinIndex;
+    ParamAudioCodec         m_paramsAudioOutput;
+    virtual AMF_RESULT  InitAudio(bool enableEncode) { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioSource() { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioDecoder() { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioAmbisonicRender() { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioEncoder() { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioMuxer(amf::AMFInputPtr pInput) { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioPipeline(PipelineElementPtr pMuxer = NULL)  { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  InitAudioPresenter() { return AMF_NOT_IMPLEMENTED; };
+    virtual AMF_RESULT  CreateAudioPresenter() { return AMF_NOT_IMPLEMENTED; };
+
+
+    class ConnectThread : public amf::AMFThread
+    {
+        StitchPipelineBase* m_pHost;
+    public:
+        ConnectThread(StitchPipelineBase* pHost) : m_pHost(pHost){}
+        virtual void Run()
+        {
+            while(!StopRequested())
+            {
+                AMF_RESULT res = m_pHost->OnConnect();
+                if(res == AMF_OK)
+                {
+                    break;
+                }
+                amf_sleep(10);
+            }
+        }
+    };
+    ConnectThread                           m_ConnectThread;
+    bool                                    m_bIsConnected;
+    static amf::AMF_SURFACE_FORMAT          m_eComposerOutputDefault;
+};
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/TranscodePipeline.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/TranscodePipeline.cpp Changed

@@ -350,17 +350,17 @@
             res = m_pDemuxer->GetOutput(output, &pOutput);
             CHECK_AMF_ERROR_RETURN(res, L"m_pDemuxer->GetOutput() failed");
 
-            amf_int64 eStreamType = DEMUXER_UNKNOWN;
-            pOutput->GetProperty(FFMPEG_DEMUXER_STREAM_TYPE, &eStreamType);
+            amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+            pOutput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
 
 
-            if(iVideoStreamIndex < 0 && eStreamType == DEMUXER_VIDEO)
+            if(iVideoStreamIndex < 0 && eStreamType == AMF_STREAM_VIDEO)
             {
                 iVideoStreamIndex = output;
                 pVideoOutput = pOutput;
             }
 
-            if(iAudioStreamIndex < 0 && eStreamType == DEMUXER_AUDIO)
+            if(iAudioStreamIndex < 0 && eStreamType == AMF_STREAM_AUDIO)
             {
                 iAudioStreamIndex = output;
                 pAudioOutput = pOutput;
@@ -430,57 +430,55 @@
             res = m_pMuxer->GetInput(input, &pInput);
             CHECK_AMF_ERROR_RETURN(res, L"m_pMuxer->GetInput() failed");
 
-            amf_int64 eStreamType = MUXER_UNKNOWN;
-            pInput->GetProperty(FFMPEG_MUXER_STREAM_TYPE, &eStreamType);
+            amf_int64 eStreamType = AMF_STREAM_UNKNOWN;
+            pInput->GetProperty(AMF_STREAM_TYPE, &eStreamType);
 
 
-            if(eStreamType == MUXER_VIDEO)
+            if(eStreamType == AMF_STREAM_VIDEO)
             {
                 outVideoStreamIndex = input;
 
-                pInput->SetProperty(FFMPEG_MUXER_STREAM_ENABLED, true);
+                pInput->SetProperty(AMF_STREAM_ENABLED, true);
                 amf_int32 bitrate = 0;
                 if(m_EncoderID == AMFVideoEncoderVCE_AVC || m_EncoderID == AMFVideoEncoderVCE_SVC)
                 { 
-#define AV_CODEC_ID_H264 28 // works with current FFmpeg only
-                    pInput->SetProperty(FFMPEG_MUXER_CODEC_ID, AV_CODEC_ID_H264); // default
+                    pInput->SetProperty(AMF_STREAM_CODEC_ID, AMF_STREAM_CODEC_ID_H264_AVC); // default
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &bitrate);
-                    pInput->SetProperty(FFMPEG_MUXER_BIT_RATE, bitrate);
+                    pInput->SetProperty(AMF_STREAM_BIT_RATE, bitrate);
                     amf::AMFInterfacePtr pExtraData;
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_EXTRADATA, &pExtraData);
-                    pInput->SetProperty(FFMPEG_MUXER_EXTRA_DATA, pExtraData);
+                    pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
 
                     AMFSize frameSize;
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, &frameSize);
-                    pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAMESIZE, frameSize);
+                    pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, frameSize);
 
                     AMFRate frameRate;
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &frameRate);
-                    pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAME_RATE, frameRate);
+                    pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_RATE, frameRate);
                 }
                 else
                 {
-#define AV_CODEC_ID_H265 174 // works with current FFmpeg only
-                    pInput->SetProperty(FFMPEG_MUXER_CODEC_ID, AV_CODEC_ID_H265);
+                    pInput->SetProperty(AMF_STREAM_CODEC_ID, AMF_STREAM_CODEC_ID_H265_HEVC);
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &bitrate);
-                    pInput->SetProperty(FFMPEG_MUXER_BIT_RATE, bitrate);
+                    pInput->SetProperty(AMF_STREAM_BIT_RATE, bitrate);
                     amf::AMFInterfacePtr pExtraData;
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_EXTRADATA, &pExtraData);
-                    pInput->SetProperty(FFMPEG_MUXER_EXTRA_DATA, pExtraData);
+                    pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
 
                     AMFSize frameSize;
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &frameSize);
-                    pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAMESIZE, frameSize);
+                    pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, frameSize);
 
                     AMFRate frameRate;
                     m_pEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, &frameRate);
-                    pInput->SetProperty(FFMPEG_MUXER_VIDEO_FRAME_RATE, frameRate);
+                    pInput->SetProperty(AMF_STREAM_VIDEO_FRAME_RATE, frameRate);
                 }
             }
-            else if(eStreamType == MUXER_AUDIO)
+            else if(eStreamType == AMF_STREAM_AUDIO)
             {
                 outAudioStreamIndex = input;
-                pInput->SetProperty(FFMPEG_MUXER_STREAM_ENABLED, true);
+                pInput->SetProperty(AMF_STREAM_ENABLED, true);
 
 
                 amf_int64 codecID = 0;
@@ -504,16 +502,16 @@
 
                 amf::AMFInterfacePtr pExtraData;
                 m_pAudioEncoder->GetProperty(AUDIO_ENCODER_OUT_AUDIO_EXTRA_DATA, &pExtraData);
-                pInput->SetProperty(FFMPEG_MUXER_EXTRA_DATA, pExtraData);
-
-                pInput->SetProperty(FFMPEG_MUXER_CODEC_ID, codecID);
-                pInput->SetProperty(FFMPEG_MUXER_BIT_RATE, streamBitRate);
-                pInput->SetProperty(FFMPEG_MUXER_AUDIO_SAMPLE_RATE, streamSampleRate);
-                pInput->SetProperty(FFMPEG_MUXER_AUDIO_CHANNELS, streamChannels);
-                pInput->SetProperty(FFMPEG_MUXER_AUDIO_SAMPLE_FORMAT, streamFormat);
-                pInput->SetProperty(FFMPEG_MUXER_AUDIO_CHANNEL_LAYOUT, streamLayout);
-                pInput->SetProperty(FFMPEG_MUXER_AUDIO_BLOCK_ALIGN, streamBlockAlign);
-                pInput->SetProperty(FFMPEG_MUXER_AUDIO_FRAME_SIZE, streamFrameSize);
+                pInput->SetProperty(AMF_STREAM_EXTRA_DATA, pExtraData);
+
+                pInput->SetProperty(AMF_STREAM_CODEC_ID, codecID);
+                pInput->SetProperty(AMF_STREAM_BIT_RATE, streamBitRate);
+                pInput->SetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, streamSampleRate);
+                pInput->SetProperty(AMF_STREAM_AUDIO_CHANNELS, streamChannels);
+                pInput->SetProperty(AMF_STREAM_AUDIO_FORMAT, streamFormat);
+                pInput->SetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, streamLayout);
+                pInput->SetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, streamBlockAlign);
+                pInput->SetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, streamFrameSize);
             }
         }
         res = m_pMuxer->Init(amf::AMF_SURFACE_UNKNOWN, 0, 0);
@@ -621,17 +619,17 @@
     amf_int64 streamFrameSize = 0;
     amf::AMFInterfacePtr pExtradata;
 
-    pOutput->GetProperty(FFMPEG_DEMUXER_CODEC_ID, &codecID);
+    pOutput->GetProperty(AMF_STREAM_CODEC_ID, &codecID);
 
-    pOutput->GetProperty(FFMPEG_DEMUXER_BIT_RATE, &streamBitRate);
-    pOutput->GetProperty(FFMPEG_DEMUXER_EXTRA_DATA, &pExtradata);
+    pOutput->GetProperty(AMF_STREAM_BIT_RATE, &streamBitRate);
+    pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &pExtradata);
 
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_SAMPLE_RATE, &streamSampleRate);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_CHANNELS, &streamChannels);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_SAMPLE_FORMAT, &streamFormat);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_CHANNEL_LAYOUT, &streamLayout);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_BLOCK_ALIGN, &streamBlockAlign);
-    pOutput->GetProperty(FFMPEG_DEMUXER_AUDIO_FRAME_SIZE, &streamFrameSize);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, &streamSampleRate);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNELS, &streamChannels);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_FORMAT, &streamFormat);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, &streamLayout);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, &streamBlockAlign);
+    pOutput->GetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, &streamFrameSize);
 
     res = g_AMFFactory.LoadExternalComponent(m_pContext, FFMPEG_DLL_NAME, "AMFCreateComponentInt", FFMPEG_AUDIO_DECODER, &m_pAudioDecoder);
     CHECK_AMF_ERROR_RETURN(res, L"LoadExternalComponent(" << FFMPEG_AUDIO_DECODER << L") failed");
@@ -692,7 +690,7 @@
     res = m_pAudioConverter->Init(amf::AMF_SURFACE_UNKNOWN, 0, 0);
     CHECK_AMF_ERROR_RETURN(res, L"m_pAudioConverter->Init() failed");
 
-    pOutput->SetProperty(FFMPEG_DEMUXER_STREAM_ENABLED, true);
+    pOutput->SetProperty(AMF_STREAM_ENABLED, true);
 
    return AMF_OK;
 }
@@ -770,22 +768,20 @@
     else if(pOutput != NULL)
     { 
         amf::AMFInterfacePtr pInterface;
-        pOutput->GetProperty(FFMPEG_DEMUXER_EXTRA_DATA, &pInterface);
+        pOutput->GetProperty(AMF_STREAM_EXTRA_DATA, &pInterface);
         pExtraData = amf::AMFBufferPtr(pInterface);
 
         AMFSize frameSize;
-        pOutput->GetProperty(FFMPEG_DEMUXER_VIDEO_FRAMESIZE, &frameSize);
+        pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, &frameSize);
         videoWidth = frameSize.width;
         videoHeight = frameSize.height;
         
-        amf::AMFVariant var;
-        res= pOutput->GetProperty(FFMPEG_DEMUXER_VIDEO_DECODER_ID, &var);
-        if(res == AMF_OK)  // video stream setup
-        {
-            pVideoDecoderID = var.ToWString().c_str();
-        }
-        pOutput->SetProperty(FFMPEG_DEMUXER_STREAM_ENABLED, true);
-         pOutput->GetProperty(FFMPEG_DEMUXER_VIDEO_FRAME_RATE, &frameRate);
+        amf_int64 codecID;
+        res= pOutput->GetProperty(AMF_STREAM_CODEC_ID, &codecID);
+        pVideoDecoderID = StreamCodecIDtoDecoderID(AMF_STREAM_CODEC_ID_ENUM(codecID));
+
+        pOutput->SetProperty(AMF_STREAM_ENABLED, true);
+         pOutput->GetProperty(AMF_STREAM_VIDEO_FRAME_RATE, &frameRate);
 
     }
     //---------------------------------------------------------------------------------------------
@@ -851,10 +847,6 @@
     // Usage is preset that will set many parameters
     PushParamsToPropertyStorage(pParams, ParamEncoderUsage, m_pEncoder); 
     // override some usage parameters
-    PushParamsToPropertyStorage(pParams, ParamEncoderStatic, m_pEncoder);
-
-//    m_pEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, ::AMFConstructSize(scaleWidth, scaleHeight));
-
     if(frameRate.den != 0 && frameRate.num != 0)
     { 
         if(m_EncoderID == AMFVideoEncoderVCE_AVC || m_EncoderID == AMFVideoEncoderVCE_SVC)
@@ -867,6 +859,11 @@
         }
     }
 
+    PushParamsToPropertyStorage(pParams, ParamEncoderStatic, m_pEncoder);
+
+//    m_pEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, ::AMFConstructSize(scaleWidth, scaleHeight));
+
+
     res = m_pEncoder->Init(amf::AMF_SURFACE_NV12, scaleWidth, scaleHeight);
     CHECK_AMF_ERROR_RETURN(res, L"m_pEncoder->Init() failed");

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenter.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenter.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenterDX11.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenterDX11.cpp Changed

@@ -30,8 +30,11 @@
 // THE SOFTWARE.
 //
 #include "VideoPresenterDX11.h"
+
 #include <d3dcompiler.h>
 #include "public/common/TraceAdapter.h"
+#include "public/include/components/VideoDecoderUVD.h"
+#include "public/include/components/VideoConverter.h"
 
 #pragma comment(lib, "d3dcompiler.lib")
 
@@ -111,9 +114,11 @@
     m_uiAvailableBackBuffer(0),
     m_uiBackBufferCount(4),
     m_bResizeSwapChain(false),
+    m_bFirstFrame(true),
 //    m_eInputFormat(amf::AMF_SURFACE_BGRA)
     m_eInputFormat(amf::AMF_SURFACE_RGBA)
 //     m_eInputFormat(amf::AMF_SURFACE_RGBA_F16)
+
 {
     memset(&m_sourceVertexRect, 0, sizeof(m_sourceVertexRect));
 }
@@ -141,6 +146,9 @@
     {
         err;
     }
+
+    ApplyCSC(pSurface);
+
 #if 0
     amf_pts timestamp;
     pSurface->GetProperty(L"Stitch", &timestamp);
@@ -465,6 +473,7 @@
     }
     err = CompileShaders();
     PrepareStates();
+    m_bFirstFrame = true;
 
     return err;
 }
@@ -609,6 +618,7 @@
         hr = spIDXGIFactory->CreateSwapChain( m_pDevice, &sd, &m_pSwapChain );
         //ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"CreatePresentationSwapChain() - CreateSwapChain() failed");
     }
+
     ResizeSwapChain();
     return err;
 }
@@ -1028,3 +1038,135 @@
     m_uiAvailableBackBuffer = 0;
     return BackBufferPresenter::Flush();
 }
+
+// to enble this code switch to Windows 10 SDK for Windows 10 RS2 (10.0.15063.0) or later.
+#if defined(NTDDI_WIN10_RS2)
+#include <DXGI1_6.h>
+#endif
+
+#define USE_COLOR_TWITCH_IN_DISPLAY 0
+
+void        VideoPresenterDX11::UpdateProcessor()
+{
+    VideoPresenter::UpdateProcessor();
+#if defined(NTDDI_WIN10_RS2)
+    if(m_pProcessor != NULL && m_pDevice != NULL)
+    {
+#if USE_COLOR_TWITCH_IN_DISPLAY
+        ATL::CComQIPtr<IDXGISwapChain3> pSwapChain3(m_pSwapChain);
+        if(pSwapChain3 != NULL)
+        {
+            UINT supported[20];
+            for(int i = 0; i < 20; i++)
+            {
+                pSwapChain3->CheckColorSpaceSupport((DXGI_COLOR_SPACE_TYPE)i, &supported[i]);
+            }
+            if(GetInputFormat() == amf::AMF_SURFACE_RGBA_F16 && 
+                (supported[DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709] & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT))
+            {
+
+                DXGI_COLOR_SPACE_TYPE colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709;
+                {
+
+
+                    pSwapChain3->SetColorSpace1(colorSpace);
+                    m_pProcessor->SetProperty(AMF_VIDEO_CONVERTER_USE_DECODER_HDR_METADATA, false);
+                }
+            }
+        }
+#endif
+        // check and set color space and HDR support
+
+        CComQIPtr<IDXGIDevice> spDXGIDevice=m_pDevice;
+
+        CComPtr<IDXGIAdapter> spDXGIAdapter;
+        HRESULT hr = spDXGIDevice->GetParent(__uuidof(IDXGIAdapter), (void **)&spDXGIAdapter);
+
+        UINT adapterIndex = 0;
+        for(;;adapterIndex++)
+        { 
+            ATL::CComPtr<IDXGIOutput> spDXGIOutput;
+            spDXGIAdapter->EnumOutputs(adapterIndex, &spDXGIOutput);
+            if(spDXGIOutput == NULL)
+            {
+                break;
+            }
+            ATL::CComQIPtr<IDXGIOutput6> spDXGIOutput6(spDXGIOutput);
+            if(spDXGIOutput6 != NULL)
+            {
+                DXGI_OUTPUT_DESC1 desc = {};
+                spDXGIOutput6->GetDesc1(&desc);
+                if(desc.MaxLuminance != 0 && desc.BitsPerColor > 8)
+//                if(desc.MaxLuminance != 0)
+                {
+                    amf::AMFBufferPtr pBuffer;
+                    m_pContext->AllocBuffer(amf::AMF_MEMORY_HOST, sizeof(AMFHDRMetadata), &pBuffer);
+                    AMFHDRMetadata* pHDRData = (AMFHDRMetadata*)pBuffer->GetNative();
+
+                    pHDRData->redPrimary[0] = amf_uint16(desc.RedPrimary[0] * 50000.f);
+                    pHDRData->redPrimary[1] = amf_uint16(desc.RedPrimary[1] * 50000.f);
+
+                    pHDRData->greenPrimary[0] = amf_uint16(desc.GreenPrimary[0] * 50000.f);
+                    pHDRData->greenPrimary[1] = amf_uint16(desc.GreenPrimary[1] * 50000.f);
+
+                    pHDRData->bluePrimary[0] = amf_uint16(desc.BluePrimary[0] * 50000.f);
+                    pHDRData->bluePrimary[1] = amf_uint16(desc.BluePrimary[1] * 50000.f);
+
+                    pHDRData->whitePoint[0] = amf_uint16(desc.WhitePoint[0] * 50000.f);
+                    pHDRData->whitePoint[1] = amf_uint16(desc.WhitePoint[1] * 50000.f);
+
+                    pHDRData->maxMasteringLuminance = amf_uint32(desc.MaxLuminance * 10000.f);
+                    pHDRData->minMasteringLuminance = amf_uint32(desc.MinLuminance * 10000.f);
+                    pHDRData->maxContentLightLevel = 0;
+                    pHDRData->maxFrameAverageLightLevel = amf_uint32(desc.MaxFullFrameLuminance* 10000.f);
+
+                    m_pProcessor->SetProperty(AMF_VIDEO_CONVERTER_DISPLAY_HDR_METADATA,pBuffer);
+                }
+            }
+        }
+    }
+#endif
+}
+AMF_RESULT VideoPresenterDX11::ApplyCSC(amf::AMFSurface* pSurface)
+{
+#if defined(NTDDI_WIN10_RS2)
+#ifdef USE_COLOR_TWITCH_IN_DISPLAY
+    if(m_bFirstFrame)
+    {
+        amf::AMFVariant varBuf;
+        if(pSurface->GetProperty(AMF_VIDEO_DECODER_HDR_METADATA, &varBuf) == AMF_OK)
+        {
+            amf::AMFBufferPtr pBuffer(varBuf.pInterface);
+            if(pBuffer != NULL)
+            {
+                AMFHDRMetadata* pHDRData = (AMFHDRMetadata*)pBuffer->GetNative();
+                // check and set color space
+                ATL::CComQIPtr<IDXGISwapChain4> pSwapChain4(m_pSwapChain);
+                if(pSwapChain4 != NULL)
+                {
+
+                    DXGI_HDR_METADATA_HDR10 metadata = {};
+                    metadata.WhitePoint[0] = pHDRData->whitePoint[0];
+                    metadata.WhitePoint[1] = pHDRData->whitePoint[1];
+                    metadata.RedPrimary[0] = pHDRData->redPrimary[0];
+                    metadata.RedPrimary[1] = pHDRData->redPrimary[1];
+                    metadata.GreenPrimary[0] = pHDRData->greenPrimary[0];
+                    metadata.GreenPrimary[1] = pHDRData->greenPrimary[1];
+                    metadata.BluePrimary[0] = pHDRData->bluePrimary[0];
+                    metadata.BluePrimary[1] = pHDRData->bluePrimary[1];
+                    metadata.MaxMasteringLuminance = pHDRData->maxMasteringLuminance;
+                    metadata.MinMasteringLuminance = pHDRData->minMasteringLuminance;
+                    metadata.MaxContentLightLevel = pHDRData->maxContentLightLevel;
+                    metadata.MaxFrameAverageLightLevel = pHDRData->maxFrameAverageLightLevel;
+
+                    HRESULT hr = pSwapChain4->SetHDRMetaData(DXGI_HDR_METADATA_TYPE_HDR10, sizeof(metadata), &metadata);
+                    int a = 1;
+                }
+                m_bFirstFrame = false;
+            }
+        }
+    }
+#endif
+#endif
+    return AMF_OK;
+}

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenterDX11.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenterDX11.h Changed

@@ -70,6 +70,7 @@
     virtual AMF_RESULT              SetInputFormat(amf::AMF_SURFACE_FORMAT format);
     virtual DXGI_FORMAT             GetDXGIFormat() const;
     virtual AMF_RESULT              Flush();
+//    virtual bool                SupportAllocator() const { return false; } //MM to test only
 
     virtual AMF_RESULT Init(amf_int32 width, amf_int32 height);
     virtual AMF_RESULT Terminate();
@@ -79,6 +80,9 @@
             amf_int32 width, amf_int32 height, amf_int32 hPitch, amf_int32 vPitch, amf::AMFSurface** ppSurface);
     // amf::AMFSurfaceObserver interface
     virtual void AMF_STD_CALL OnSurfaceDataRelease(amf::AMFSurface* pSurface);
+protected:
+    virtual void        UpdateProcessor();
+
 
 private:
     AMF_RESULT BitBlt(amf::AMF_FRAME_TYPE eFrameType, ID3D11Texture2D* pSrcSurface, AMFRect* pSrcRect, ID3D11Texture2D* pDstSurface, AMFRect* pDstRect);
@@ -94,6 +98,9 @@
 
     AMF_RESULT CreatePresentationSwapChain();
 
+    AMF_RESULT ApplyCSC(amf::AMFSurface* pSurface);
+
+
     amf::AMF_SURFACE_FORMAT             m_eInputFormat;
     CComPtr<ID3D11Device>               m_pDevice;
     CComQIPtr<IDXGISwapChain>           m_pSwapChain;
@@ -134,4 +141,6 @@
     AMFRect                     m_sourceVertexRect;
 
     bool                            m_bResizeSwapChain;
+
+    bool                        m_bFirstFrame; 
 };
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenterDX9.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples/common/VideoPresenterDX9.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples_vs2013.sln -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples_vs2013.sln Changed

@@ -31,6 +31,17 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleEncoderC", "SamplesC\SimpleEncoderC\SimpleEncoderC.vcxproj", "{74118461-A742-490F-BB54-86EB2509921C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DVR", "CPPSamples\DVR\DVR_VS2013.vcxproj", "{7E7270B4-B894-4BA2-9E89-621276C6BF28}"
+	ProjectSection(ProjectDependencies) = postProject
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD} = {16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoStitch", "..\proj\vs2013\VideoStitch\VideoStitch.vcxproj", "{0D493826-E26D-42EB-88C7-86D20BBF3929}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stitch", "CPPSamples\Stitch\Stitch_VS2013.vcxproj", "{E5BBA617-660A-492E-8AB8-550ED638DDEF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0D493826-E26D-42EB-88C7-86D20BBF3929} = {0D493826-E26D-42EB-88C7-86D20BBF3929}
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD} = {16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -128,6 +139,22 @@
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|Win32.Build.0 = Release|Win32
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|x64.ActiveCfg = Release|x64
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|x64.Build.0 = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|Win32.Build.0 = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.ActiveCfg = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.Build.0 = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|Win32.ActiveCfg = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|Win32.Build.0 = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.ActiveCfg = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.Build.0 = Release|x64
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Debug|Win32.Build.0 = Debug|Win32
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Debug|x64.ActiveCfg = Debug|x64
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Debug|x64.Build.0 = Debug|x64
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Release|Win32.ActiveCfg = Release|Win32
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Release|Win32.Build.0 = Release|Win32
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Release|x64.ActiveCfg = Release|x64
+		{E5BBA617-660A-492E-8AB8-550ED638DDEF}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples_vs2015.sln -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples_vs2015.sln Changed

@@ -31,6 +31,17 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleEncoderC", "SamplesC\SimpleEncoderC\SimpleEncoderC_VS2015.vcxproj", "{74118461-A742-490F-BB54-86EB2509921C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DVR", "CPPSamples\DVR\DVR_VS2015.vcxproj", "{7E7270B4-B894-4BA2-9E89-621276C6BF28}"
+	ProjectSection(ProjectDependencies) = postProject
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD} = {16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoStitch", "..\proj\vs2015\VideoStitch\VideoStitch.vcxproj", "{0D493826-E26D-42EB-88C7-86D20BBF3929}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stitch", "CPPSamples\Stitch\Stitch_VS2015.vcxproj", "{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0D493826-E26D-42EB-88C7-86D20BBF3929} = {0D493826-E26D-42EB-88C7-86D20BBF3929}
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD} = {16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -128,6 +139,22 @@
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|Win32.Build.0 = Release|Win32
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|x64.ActiveCfg = Release|x64
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|x64.Build.0 = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|Win32.Build.0 = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.ActiveCfg = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.Build.0 = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|Win32.ActiveCfg = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|Win32.Build.0 = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.ActiveCfg = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.Build.0 = Release|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|Win32.Build.0 = Debug|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|x64.ActiveCfg = Debug|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|x64.Build.0 = Debug|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|Win32.ActiveCfg = Release|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|Win32.Build.0 = Release|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|x64.ActiveCfg = Release|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples_vs2017.sln -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/CPPSamples_vs2017.sln Changed

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CapabilityManager", "CPPSamples\CapabilityManager\CapabilityManager_VS2017.vcxproj", "{6C3B9FF8-624F-4D7F-89E1-2B4AFFAAA873}"
 EndProject
@@ -24,6 +24,17 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComponentsFFMPEG", "..\proj\vs2017\ComponentsFFMPEG\ComponentsFFMPEG.vcxproj", "{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DVR", "CPPSamples\DVR\DVR_VS2017.vcxproj", "{7E7270B4-B894-4BA2-9E89-621276C6BF28}"
+	ProjectSection(ProjectDependencies) = postProject
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD} = {16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoStitch", "..\proj\vs2017\VideoStitch\VideoStitch.vcxproj", "{0D493826-E26D-42EB-88C7-86D20BBF3929}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stitch", "CPPSamples\Stitch\Stitch_VS2017.vcxproj", "{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0D493826-E26D-42EB-88C7-86D20BBF3929} = {0D493826-E26D-42EB-88C7-86D20BBF3929}
+		{16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD} = {16D5EA62-0CAB-4DFD-AD0F-7813FA89B6FD}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -121,6 +132,22 @@
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|Win32.Build.0 = Release|Win32
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|x64.ActiveCfg = Release|x64
 		{7E7270B4-B894-4BA2-9E89-621276C6BF28}.Release|x64.Build.0 = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|Win32.Build.0 = Debug|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.ActiveCfg = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Debug|x64.Build.0 = Debug|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|Win32.ActiveCfg = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|Win32.Build.0 = Release|Win32
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.ActiveCfg = Release|x64
+		{0D493826-E26D-42EB-88C7-86D20BBF3929}.Release|x64.Build.0 = Release|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|Win32.Build.0 = Debug|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|x64.ActiveCfg = Debug|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Debug|x64.Build.0 = Debug|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|Win32.ActiveCfg = Release|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|Win32.Build.0 = Release|Win32
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|x64.ActiveCfg = Release|x64
+		{EFE185AE-CE9B-4CCB-8A30-FA4B63A40B3D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/samples/SamplesC/common/TraceAdapterC.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/samples/SamplesC/common/TraceAdapterC.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/AudioCapture/AudioCaptureImpl.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/AudioCapture/AudioCaptureImpl.cpp Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/AudioCapture/AudioCaptureImpl.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/AudioCapture/AudioCaptureImpl.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/AudioCapture/WASAPISource.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/AudioCapture/WASAPISource.cpp Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/AudioEncoderFFMPEGImpl.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/AudioEncoderFFMPEGImpl.cpp Changed

@@ -168,6 +168,30 @@
     m_inSampleFormat = (AMF_AUDIO_FORMAT)format;
     m_pCodecContext->sample_fmt = GetFFMPEGAudioFormat(m_inSampleFormat);
 
+    // verify format in codec
+    if(codec->sample_fmts != NULL)
+    { 
+        bool bFound = false;
+        for(int i = 0; ; i++)
+        {
+            if(codec->sample_fmts[i] == -1)
+            {
+                break;
+            }
+            if(codec->sample_fmts[i] == m_pCodecContext->sample_fmt)
+            {
+                bFound = true;
+                break;
+            }
+        }
+        if(!bFound)
+        {
+            m_pCodecContext->sample_fmt = codec->sample_fmts[0];
+            m_inSampleFormat = GetAMFAudioFormat(m_pCodecContext->sample_fmt);
+            SetProperty(AUDIO_ENCODER_IN_AUDIO_SAMPLE_FORMAT, m_inSampleFormat);
+        }
+    }
+
     // set all default parameters
     //m_pCodecContext->strict_std_compliance = FF_COMPLIANCE_STRICT;
     m_pCodecContext->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
@@ -478,7 +502,7 @@
         else
         {
             amf_pts amfDuration = av_rescale_q(avPacket.duration, m_pCodecContext->time_base , AMF_TIME_BASE_Q);
-            samples = amfDuration * m_pCodecContext->sample_rate / AMF_SECOND;
+            samples = int(amfDuration * m_pCodecContext->sample_rate / AMF_SECOND);
         }
     }
     if (ret == 0)

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/FileDemuxerFFMPEGImpl.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/FileDemuxerFFMPEGImpl.cpp Changed

@@ -43,27 +43,23 @@
 
 
 #define AMF_FACILITY L"AMFFileDemuxerFFMPEGImpl"
-#define ENABLE_H265
 
 using namespace amf;
 
-#define AMF_CODEC_H265MAIN10      1005
 
 
 static const AMFEnumDescriptionEntry VIDEO_CODEC_IDS_ENUM[] =
 {
-    { AV_CODEC_ID_NONE, L"UNKNOWN" },
-    { AV_CODEC_ID_MPEG2VIDEO, AMFVideoDecoderUVD_MPEG2 },
-    { AV_CODEC_ID_MPEG4, AMFVideoDecoderUVD_MPEG4 },
-    { AV_CODEC_ID_WMV3, AMFVideoDecoderUVD_WMV3 },
-    { AV_CODEC_ID_VC1, AMFVideoDecoderUVD_VC1 },
-    { AV_CODEC_ID_H264, AMFVideoDecoderUVD_H264_AVC },
-    { AV_CODEC_H264MVC, AMFVideoDecoderUVD_H264_MVC },
-    { AV_CODEC_ID_MJPEG, AMFVideoDecoderUVD_MJPEG },
-#if defined(ENABLE_H265)
-    { AV_CODEC_ID_HEVC, AMFVideoDecoderHW_H265_HEVC },
-    { AMF_CODEC_H265MAIN10, AMFVideoDecoderHW_H265_MAIN10},
-#endif
+    { AMF_STREAM_CODEC_ID_UNKNOWN, L"UNKNOWN" },
+    { AMF_STREAM_CODEC_ID_MPEG2, AMFVideoDecoderUVD_MPEG2 },
+    { AMF_STREAM_CODEC_ID_MPEG4, AMFVideoDecoderUVD_MPEG4 },
+    { AMF_STREAM_CODEC_ID_WMV3, AMFVideoDecoderUVD_WMV3 },
+    { AMF_STREAM_CODEC_ID_VC1, AMFVideoDecoderUVD_VC1 },
+    { AMF_STREAM_CODEC_ID_H264_AVC, AMFVideoDecoderUVD_H264_AVC },
+    { AMF_STREAM_CODEC_ID_H264_MVC, AMFVideoDecoderUVD_H264_MVC },
+    { AMF_STREAM_CODEC_ID_MJPEG, AMFVideoDecoderUVD_MJPEG },
+    { AMF_STREAM_CODEC_ID_H265_HEVC, AMFVideoDecoderHW_H265_HEVC },
+    { AMF_STREAM_CODEC_ID_H265_MAIN10, AMFVideoDecoderHW_H265_MAIN10},
     { 0, 0 }
 };
 
@@ -97,13 +93,13 @@
     { AMFAF_UNKNOWN, 0 }  // This is end of description mark
 };
 
-const AMFEnumDescriptionEntry FFMPEG_DEMUXER_STREAM_TYPE_ENUM_DESCRIPTION[] =
+const AMFEnumDescriptionEntry AMF_STREAM_TYPE_ENUM_DESCRIPTION[] =
 {
-    {DEMUXER_UNKNOWN,   L"Unknown"},
-    {DEMUXER_VIDEO,     L"Video"},
-    {DEMUXER_AUDIO,     L"Audio"},
-    {DEMUXER_DATA,      L"Data"},
-    { DEMUXER_UNKNOWN   , 0 }  // This is end of description mark
+    {AMF_STREAM_UNKNOWN,   L"Unknown"},
+    {AMF_STREAM_VIDEO,     L"Video"},
+    {AMF_STREAM_AUDIO,     L"Audio"},
+    {AMF_STREAM_DATA,      L"Data"},
+    { AMF_STREAM_UNKNOWN   , 0 }  // This is end of description mark
 };
 
 struct FormatMap
@@ -256,10 +252,10 @@
 void        AMF_STD_CALL  AMFFileDemuxerFFMPEGImpl::AMFOutputDemuxerImpl::OnPropertyChanged(const wchar_t* pName)
 {
     const amf_wstring  name(pName);
-    if (name == FFMPEG_DEMUXER_STREAM_ENABLED)
+    if (name == AMF_STREAM_ENABLED)
     {
         AMFLock lock(&m_pHost->m_sync);
-        AMFPropertyStorage::GetProperty(FFMPEG_DEMUXER_STREAM_ENABLED, &m_bEnabled);
+        AMFPropertyStorage::GetProperty(AMF_STREAM_ENABLED, &m_bEnabled);
     }
 }
 //-------------------------------------------------------------------------------------------------
@@ -288,9 +284,7 @@
         case AV_CODEC_ID_VC1 :
         case AV_CODEC_ID_H264 :
         case AV_CODEC_ID_MJPEG :
-#if defined(ENABLE_H265)
         case AV_CODEC_ID_HEVC :
-#endif
             codecID = ist->codec->codec_id;
             break;
 
@@ -343,35 +337,24 @@
     AMFSize frame = AMFConstructSize(ist->codec->width, ist->codec->height);
 
     AMFPrimitivePropertyInfoMapBegin
-        AMFPropertyInfoEnum(FFMPEG_DEMUXER_STREAM_TYPE, L"Stream Type", DEMUXER_VIDEO, FFMPEG_DEMUXER_STREAM_TYPE_ENUM_DESCRIPTION, false),
-        AMFPropertyInfoBool(FFMPEG_DEMUXER_STREAM_ENABLED, L"Enabled", false, true),
-        AMFPropertyInfoWString(FFMPEG_DEMUXER_VIDEO_DECODER_ID, L"AMF Decoder Component ID", NULL, false),
-        AMFPropertyInfoEnum(FFMPEG_DEMUXER_CODEC_ID, L"Codec ID", codecID, VIDEO_CODEC_IDS_ENUM, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_BIT_RATE, L"Bit Rate", 0, 0, INT_MAX, false),
-        AMFPropertyInfoInterface(FFMPEG_DEMUXER_EXTRA_DATA, L"Extra Data", NULL, false),
-        AMFPropertyInfoRate(FFMPEG_DEMUXER_VIDEO_FRAME_RATE, L"Frame Rate", ist->r_frame_rate.num, ist->r_frame_rate.den, false),
-        AMFPropertyInfoSize(FFMPEG_DEMUXER_VIDEO_FRAMESIZE, L"Frame Size", frame, AMFConstructSize(0, 0), AMFConstructSize(INT_MAX, INT_MAX), false),
-        AMFPropertyInfoEnum(FFMPEG_DEMUXER_VIDEO_SURFACE_FORMAT, L"Surface Format", surfaceFormat, AMF_OUTPUT_FORMATS_ENUM, false),
+        AMFPropertyInfoEnum(AMF_STREAM_TYPE, L"Stream Type", AMF_STREAM_VIDEO, AMF_STREAM_TYPE_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoBool(AMF_STREAM_ENABLED, L"Enabled", false, true),
+        AMFPropertyInfoEnum(AMF_STREAM_CODEC_ID, L"Codec ID", codecID, VIDEO_CODEC_IDS_ENUM, false),
+        AMFPropertyInfoInt64(AMF_STREAM_BIT_RATE, L"Bit Rate", 0, 0, INT_MAX, false),
+        AMFPropertyInfoInterface(AMF_STREAM_EXTRA_DATA, L"Extra Data", NULL, false),
+        AMFPropertyInfoRate(AMF_STREAM_VIDEO_FRAME_RATE, L"Frame Rate", ist->r_frame_rate.num, ist->r_frame_rate.den, false),
+        AMFPropertyInfoSize(AMF_STREAM_VIDEO_FRAME_SIZE, L"Frame Size", frame, AMFConstructSize(0, 0), AMFConstructSize(INT_MAX, INT_MAX), false),
+        AMFPropertyInfoEnum(AMF_STREAM_VIDEO_FORMAT, L"Surface Format", surfaceFormat, AMF_OUTPUT_FORMATS_ENUM, false),
         AMFPropertyInfoDouble(FFMPEG_DEMUXER_VIDEO_PIXEL_ASPECT_RATIO, L"Pixel Aspect Ratio", pixelAspectRatio, 0, DBL_MAX, false),
     AMFPrimitivePropertyInfoMapEnd
 
-    SetProperty(FFMPEG_DEMUXER_CODEC_ID, codecID);
-    SetProperty(FFMPEG_DEMUXER_BIT_RATE, ist->codec->bit_rate);
-    SetProperty(FFMPEG_DEMUXER_VIDEO_FRAME_RATE, AMFConstructRate(ist->r_frame_rate.num, ist->r_frame_rate.den));
-    SetProperty(FFMPEG_DEMUXER_VIDEO_FRAMESIZE, frame);
-    SetProperty(FFMPEG_DEMUXER_VIDEO_SURFACE_FORMAT, surfaceFormat);
+    SetProperty(AMF_STREAM_CODEC_ID, GetAMFVideoFormat(AVCodecID(codecID)));
+    SetProperty(AMF_STREAM_BIT_RATE, ist->codec->bit_rate);
+    SetProperty(AMF_STREAM_VIDEO_FRAME_RATE, AMFConstructRate(ist->r_frame_rate.num, ist->r_frame_rate.den));
+    SetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, frame);
+    SetProperty(AMF_STREAM_VIDEO_FORMAT, surfaceFormat);
     SetProperty(FFMPEG_DEMUXER_VIDEO_PIXEL_ASPECT_RATIO, pixelAspectRatio);
-
-    for(amf_size i = 0; i < _countof(VIDEO_CODEC_IDS_ENUM); i++)
-    {
-        if(VIDEO_CODEC_IDS_ENUM[i].value == codecID)
-        {
-            AMFPropertyStorage::SetProperty(FFMPEG_DEMUXER_VIDEO_DECODER_ID, VIDEO_CODEC_IDS_ENUM[i].name);
-            break;
-        }
-    }
-
-    AMFPropertyStorage::SetProperty(FFMPEG_DEMUXER_EXTRA_DATA, spBuffer);
+    AMFPropertyStorage::SetProperty(AMF_STREAM_EXTRA_DATA, spBuffer);
 }
 
 
@@ -404,31 +387,36 @@
     // figure out the surface format conversion
     AMF_AUDIO_FORMAT  audioFormat = GetAMFAudioFormat(ist->codec->sample_fmt);
 
+    if(ist->codec->channels == 0) // ffmpeg return 0 for some AAC files 
+    {
+        ist->codec->channels = 2;
+    }
+
 
     AMFPrimitivePropertyInfoMapBegin
-        AMFPropertyInfoEnum(FFMPEG_DEMUXER_STREAM_TYPE, L"Stream Type", DEMUXER_AUDIO, FFMPEG_DEMUXER_STREAM_TYPE_ENUM_DESCRIPTION, false),
-        AMFPropertyInfoBool(FFMPEG_DEMUXER_STREAM_ENABLED, L"Enabled", false, true),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_CODEC_ID, L"Codec ID", ist->codec->codec_id, AV_CODEC_ID_NONE, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_BIT_RATE, L"Bit Rate", ist->codec->bit_rate, 0, INT_MAX, false),
-        AMFPropertyInfoInterface(FFMPEG_DEMUXER_EXTRA_DATA, L"Extra Data", NULL, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_AUDIO_SAMPLE_RATE, L"Sample Rate", ist->codec->sample_rate, 0, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_AUDIO_CHANNELS, L"Channels", ist->codec->channels, 0, 100, false),
-        AMFPropertyInfoEnum(FFMPEG_DEMUXER_AUDIO_SAMPLE_FORMAT, L"Sample Format", audioFormat, AMF_SAMPLE_FORMAT_ENUM_DESCRIPTION, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_AUDIO_CHANNEL_LAYOUT, L"Channel Layout", ist->codec->channel_layout, 0, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_AUDIO_BLOCK_ALIGN, L"Block Align", ist->codec->block_align, 0, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_DEMUXER_AUDIO_FRAME_SIZE, L"Frame Size", ist->codec->frame_size, 0, INT_MAX, false),
+        AMFPropertyInfoEnum(AMF_STREAM_TYPE, L"Stream Type", AMF_STREAM_AUDIO, AMF_STREAM_TYPE_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoBool(AMF_STREAM_ENABLED, L"Enabled", false, true),
+        AMFPropertyInfoInt64(AMF_STREAM_CODEC_ID, L"Codec ID", ist->codec->codec_id, AV_CODEC_ID_NONE, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_BIT_RATE, L"Bit Rate", ist->codec->bit_rate, 0, INT_MAX, false),
+        AMFPropertyInfoInterface(AMF_STREAM_EXTRA_DATA, L"Extra Data", NULL, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_SAMPLE_RATE, L"Sample Rate", ist->codec->sample_rate, 0, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_CHANNELS, L"Channels", ist->codec->channels, 0, 100, false),
+        AMFPropertyInfoEnum(AMF_STREAM_AUDIO_FORMAT, L"Sample Format", audioFormat, AMF_SAMPLE_FORMAT_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, L"Channel Layout", ist->codec->channel_layout, 0, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_BLOCK_ALIGN, L"Block Align", ist->codec->block_align, 0, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_FRAME_SIZE, L"Frame Size", ist->codec->frame_size, 0, INT_MAX, false),
     AMFPrimitivePropertyInfoMapEnd
 
-    SetProperty(FFMPEG_DEMUXER_CODEC_ID, ist->codec->codec_id);
-    SetProperty(FFMPEG_DEMUXER_BIT_RATE, ist->codec->bit_rate);
-    SetProperty(FFMPEG_DEMUXER_AUDIO_SAMPLE_RATE, ist->codec->sample_rate);
-    SetProperty(FFMPEG_DEMUXER_AUDIO_CHANNELS, ist->codec->channels);
-    SetProperty(FFMPEG_DEMUXER_AUDIO_SAMPLE_FORMAT, audioFormat);
-    SetProperty(FFMPEG_DEMUXER_AUDIO_CHANNEL_LAYOUT, ist->codec->channel_layout);
-    SetProperty(FFMPEG_DEMUXER_AUDIO_BLOCK_ALIGN, ist->codec->block_align);
-    SetProperty(FFMPEG_DEMUXER_AUDIO_FRAME_SIZE, ist->codec->frame_size);
+    SetProperty(AMF_STREAM_CODEC_ID, ist->codec->codec_id);
+    SetProperty(AMF_STREAM_BIT_RATE, ist->codec->bit_rate);
+    SetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, ist->codec->sample_rate);
+    SetProperty(AMF_STREAM_AUDIO_CHANNELS, ist->codec->channels);
+    SetProperty(AMF_STREAM_AUDIO_FORMAT, audioFormat);
+    SetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, ist->codec->channel_layout);
+    SetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, ist->codec->block_align);
+    SetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, ist->codec->frame_size);
 
-    AMFPropertyStorage::SetProperty(FFMPEG_DEMUXER_EXTRA_DATA, spBuffer);
+    AMFPropertyStorage::SetProperty(AMF_STREAM_EXTRA_DATA, spBuffer);
 }
 
 
@@ -969,7 +957,7 @@
             {
                 if((*it)->m_iIndex == i)
                 {
-                    newOutput->SetProperty(FFMPEG_DEMUXER_STREAM_ENABLED, (*it)->m_bEnabled);
+                    newOutput->SetProperty(AMF_STREAM_ENABLED, (*it)->m_bEnabled);
                     break;
                 }
             }
@@ -1179,7 +1167,20 @@
         // as what we were looking for, it's time to exit
         if ((packetStreamIndex != streamIndex && streamIndex != -1) && saveSkipped)
         {
-            m_OutputStreams[packetStreamIndex]->CachePacket(pTempPacket);
+            bool bFound = false;
+            for(size_t idx = 0; idx < m_OutputStreams.size(); idx++)
+            {
+                if(m_OutputStreams[idx]->m_iIndex == packetStreamIndex)\
+                {
+                    m_OutputStreams[idx]->CachePacket(pTempPacket);
+                    bFound = true;
+                    break;
+                }
+            }
+            if(!bFound)
+            {
+                ClearPacket(pTempPacket);
+            }
         }
         else
         {
@@ -1303,14 +1304,14 @@
     // update buffer duration, based on the type if info stored
     if (ist->codec->codec_type == AVMEDIA_TYPE_VIDEO)
     {
-        pBuffer->SetProperty(FFMPEG_DEMUXER_BUFFER_TYPE, AMFVariant(DEMUXER_VIDEO));
+        pBuffer->SetProperty(FFMPEG_DEMUXER_BUFFER_TYPE, AMFVariant(AMF_STREAM_VIDEO));
         UpdateBufferVideoDuration(pBuffer, pPacket, ist);
 //        AMFTraceWarning(AMF_FACILITY, L"Video PTS=%5.2f", (double)pBuffer->GetPts() / 10000);
 
     }
     else if (ist->codec->codec_type == AVMEDIA_TYPE_AUDIO)
     {
-        pBuffer->SetProperty(FFMPEG_DEMUXER_BUFFER_TYPE, AMFVariant(DEMUXER_AUDIO));
+        pBuffer->SetProperty(FFMPEG_DEMUXER_BUFFER_TYPE, AMFVariant(AMF_STREAM_AUDIO));
         UpdateBufferAudioDuration(pBuffer, pPacket, ist);
 //        AMFTraceWarning(AMF_FACILITY, L"Audio PTS=%5.2f", (double)pBuffer->GetPts() / 10000);
     }

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/FileMuxerFFMPEGImpl.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/FileMuxerFFMPEGImpl.cpp Changed

@@ -58,24 +58,22 @@
 
 #define AMF_FACILITY            L"AMFFileMuxerFFMPEGImpl"
 #define MY_AV_NOPTS_VALUE       ((int64_t)0x8000000000000000LL)
-#define ENABLE_H265
 
 using namespace amf;
 
 
-const AMFEnumDescriptionEntry VIDEO_CODEC_IDS_ENUM[] =
+static const AMFEnumDescriptionEntry VIDEO_CODEC_IDS_ENUM[] =
 {
-    { AV_CODEC_ID_NONE, L"UNKNOWN" },
-    { AV_CODEC_ID_MPEG2VIDEO, AMFVideoDecoderUVD_MPEG2 },
-    { AV_CODEC_ID_MPEG4, AMFVideoDecoderUVD_MPEG4 },
-    { AV_CODEC_ID_WMV3, AMFVideoDecoderUVD_WMV3 },
-    { AV_CODEC_ID_VC1, AMFVideoDecoderUVD_VC1 },
-    { AV_CODEC_ID_H264, AMFVideoDecoderUVD_H264_AVC },
-    { AV_CODEC_H264MVC, AMFVideoDecoderUVD_H264_MVC },
-    { AV_CODEC_ID_MJPEG, AMFVideoDecoderUVD_MJPEG },
-#if defined(ENABLE_H265)
-    { AV_CODEC_ID_HEVC, AMFVideoDecoderHW_H265_HEVC },
-#endif
+    { AMF_STREAM_CODEC_ID_UNKNOWN, L"UNKNOWN" },
+    { AMF_STREAM_CODEC_ID_MPEG2, AMFVideoDecoderUVD_MPEG2 },
+    { AMF_STREAM_CODEC_ID_MPEG4, AMFVideoDecoderUVD_MPEG4 },
+    { AMF_STREAM_CODEC_ID_WMV3, AMFVideoDecoderUVD_WMV3 },
+    { AMF_STREAM_CODEC_ID_VC1, AMFVideoDecoderUVD_VC1 },
+    { AMF_STREAM_CODEC_ID_H264_AVC, AMFVideoDecoderUVD_H264_AVC },
+    { AMF_STREAM_CODEC_ID_H264_MVC, AMFVideoDecoderUVD_H264_MVC },
+    { AMF_STREAM_CODEC_ID_MJPEG, AMFVideoDecoderUVD_MJPEG },
+    { AMF_STREAM_CODEC_ID_H265_HEVC, AMFVideoDecoderHW_H265_HEVC },
+    { AMF_STREAM_CODEC_ID_H265_MAIN10, AMFVideoDecoderHW_H265_MAIN10},
     { 0, 0 }
 };
 
@@ -111,11 +109,11 @@
 
 const AMFEnumDescriptionEntry FFMPEG_MUXER_STREAM_TYPE_ENUM_DESCRIPTION[] =
 {
-    {MUXER_UNKNOWN,   L"Unknown"},
-    {MUXER_VIDEO,     L"Video"},
-    {MUXER_AUDIO,     L"Audio"},
-    {MUXER_DATA,      L"Data"},
-    { MUXER_UNKNOWN   , 0 }  // This is end of description mark
+    {AMF_STREAM_UNKNOWN,   L"Unknown"},
+    {AMF_STREAM_VIDEO,     L"Video"},
+    {AMF_STREAM_AUDIO,     L"Audio"},
+    {AMF_STREAM_DATA,      L"Data"},
+    { AMF_STREAM_UNKNOWN   , 0 }  // This is end of description mark
 };
 
 struct FormatMap
@@ -205,10 +203,10 @@
 void AMF_STD_CALL  AMFFileMuxerFFMPEGImpl::AMFInputMuxerImpl::OnPropertyChanged(const wchar_t* pName)
 {
     const amf_wstring  name(pName);
-    if (name == FFMPEG_MUXER_STREAM_ENABLED)
+    if (name == AMF_STREAM_ENABLED)
     {
         AMFLock lock(&m_pHost->m_sync);
-        AMFPropertyStorage::GetProperty(FFMPEG_MUXER_STREAM_ENABLED, &m_bEnabled);
+        AMFPropertyStorage::GetProperty(AMF_STREAM_ENABLED, &m_bEnabled);
         return;
     }
 }
@@ -217,13 +215,13 @@
     : AMFFileMuxerFFMPEGImpl::AMFInputMuxerImpl(pHost)
 {
     AMFPrimitivePropertyInfoMapBegin
-        AMFPropertyInfoEnum(FFMPEG_MUXER_STREAM_TYPE, L"Stream Type", MUXER_VIDEO, FFMPEG_MUXER_STREAM_TYPE_ENUM_DESCRIPTION, false),
-        AMFPropertyInfoBool(FFMPEG_MUXER_STREAM_ENABLED, L"Enabled", true, false),
-        AMFPropertyInfoEnum(FFMPEG_MUXER_CODEC_ID, L"Codec ID", AV_CODEC_ID_H264, VIDEO_CODEC_IDS_ENUM, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_BIT_RATE, L"Bit Rate", 100000, 1, INT_MAX, false),
-        AMFPropertyInfoInterface(FFMPEG_MUXER_EXTRA_DATA, L"Extra Data", NULL, false),
-        AMFPropertyInfoRate(FFMPEG_MUXER_VIDEO_FRAME_RATE, L"Frame Rate", 30, 1, false),
-        AMFPropertyInfoSize(FFMPEG_MUXER_VIDEO_FRAMESIZE, L"Frame Size", AMFConstructSize(1920,1080), AMFConstructSize(1,1), AMFConstructSize(100000,100000), false),
+        AMFPropertyInfoEnum(AMF_STREAM_TYPE, L"Stream Type", AMF_STREAM_VIDEO, FFMPEG_MUXER_STREAM_TYPE_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoBool(AMF_STREAM_ENABLED, L"Enabled", true, false),
+        AMFPropertyInfoEnum(AMF_STREAM_CODEC_ID, L"Codec ID", AMF_STREAM_CODEC_ID_H264_AVC, VIDEO_CODEC_IDS_ENUM, false),
+        AMFPropertyInfoInt64(AMF_STREAM_BIT_RATE, L"Bit Rate", 100000, 1, INT_MAX, false),
+        AMFPropertyInfoInterface(AMF_STREAM_EXTRA_DATA, L"Extra Data", NULL, false),
+        AMFPropertyInfoRate(AMF_STREAM_VIDEO_FRAME_RATE, L"Frame Rate", 30, 1, false),
+        AMFPropertyInfoSize(AMF_STREAM_VIDEO_FRAME_SIZE, L"Frame Size", AMFConstructSize(1920,1080), AMFConstructSize(1,1), AMFConstructSize(100000,100000), false),
     AMFPrimitivePropertyInfoMapEnd
 }
 //-------------------------------------------------------------------------------------------------
@@ -255,18 +253,18 @@
     : AMFFileMuxerFFMPEGImpl::AMFInputMuxerImpl(pHost)
 {
     AMFPrimitivePropertyInfoMapBegin
-        AMFPropertyInfoEnum(FFMPEG_MUXER_STREAM_TYPE, L"Stream Type", MUXER_AUDIO, FFMPEG_MUXER_STREAM_TYPE_ENUM_DESCRIPTION, false),
-        AMFPropertyInfoBool(FFMPEG_MUXER_STREAM_ENABLED, L"Enabled", true, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_CODEC_ID, L"Codec ID", AV_CODEC_ID_NONE, AV_CODEC_ID_NONE, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_BIT_RATE, L"Bit Rate", 100000, 1, INT_MAX, false),
-        AMFPropertyInfoInterface(FFMPEG_MUXER_EXTRA_DATA, L"Extra Data", NULL, false),
-
-        AMFPropertyInfoInt64(FFMPEG_MUXER_AUDIO_SAMPLE_RATE, L"Sample Rate", 44100, 0, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_AUDIO_CHANNELS, L"Channels", 2, 1, INT_MAX, false),
-        AMFPropertyInfoEnum(FFMPEG_MUXER_AUDIO_SAMPLE_FORMAT, L"Sample Format", AMFAF_UNKNOWN, AMF_SAMPLE_FORMAT_ENUM_DESCRIPTION, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_AUDIO_CHANNEL_LAYOUT, L"Channel Layout", 3, 0, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_AUDIO_BLOCK_ALIGN, L"Block Align", 0, 0, INT_MAX, false),
-        AMFPropertyInfoInt64(FFMPEG_MUXER_AUDIO_FRAME_SIZE, L"Frame Size", 0, 0, INT_MAX, false),
+        AMFPropertyInfoEnum(AMF_STREAM_TYPE, L"Stream Type", AMF_STREAM_AUDIO, FFMPEG_MUXER_STREAM_TYPE_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoBool(AMF_STREAM_ENABLED, L"Enabled", true, false),
+        AMFPropertyInfoInt64(AMF_STREAM_CODEC_ID, L"Codec ID", AV_CODEC_ID_NONE, AV_CODEC_ID_NONE, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_BIT_RATE, L"Bit Rate", 100000, 1, INT_MAX, false),
+        AMFPropertyInfoInterface(AMF_STREAM_EXTRA_DATA, L"Extra Data", NULL, false),
+
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_SAMPLE_RATE, L"Sample Rate", 44100, 0, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_CHANNELS, L"Channels", 2, 1, INT_MAX, false),
+        AMFPropertyInfoEnum(AMF_STREAM_AUDIO_FORMAT, L"Sample Format", AMFAF_UNKNOWN, AMF_SAMPLE_FORMAT_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, L"Channel Layout", 3, 0, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_BLOCK_ALIGN, L"Block Align", 0, 0, INT_MAX, false),
+        AMFPropertyInfoInt64(AMF_STREAM_AUDIO_FRAME_SIZE, L"Frame Size", 0, 0, INT_MAX, false),
     AMFPrimitivePropertyInfoMapEnd
 
 }
@@ -389,7 +387,7 @@
     const amf_wstring  name(pName);
     if(name == FFMPEG_MUXER_ENABLE_VIDEO || name == FFMPEG_MUXER_ENABLE_AUDIO)
     {
-        FFMPEG_MUXER_STREAM_TYPE_ENUM eType = name == FFMPEG_MUXER_ENABLE_AUDIO ? MUXER_AUDIO : MUXER_VIDEO;
+        AMF_STREAM_TYPE_ENUM eType = name == FFMPEG_MUXER_ENABLE_AUDIO ? AMF_STREAM_AUDIO : AMF_STREAM_VIDEO;
 
         bool enableStream = false;
         GetProperty(name.c_str(), &enableStream);
@@ -398,7 +396,7 @@
         for(amf_vector<AMFInputMuxerImplPtr>::iterator it = m_InputStreams.begin(); it != m_InputStreams.end(); it++)
         {
             amf_int64 type;
-            (*it)->GetProperty(FFMPEG_MUXER_STREAM_TYPE, &type);
+            (*it)->GetProperty(AMF_STREAM_TYPE, &type);
             if(type == eType)
             {
                 bFound = true;
@@ -411,7 +409,7 @@
         }
         if(!bFound && enableStream)
         {
-            if(eType == MUXER_VIDEO)
+            if(eType == AMF_STREAM_VIDEO)
             {
                 m_InputStreams.push_back(new AMFVideoInputMuxerImpl(this));
             }
@@ -473,15 +471,15 @@
               
 
         AMFInputMuxerImplPtr  spInput    = m_InputStreams[ind];
-        amf_int64             streamType = MUXER_UNKNOWN;
-        AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_STREAM_TYPE, &streamType));
+        amf_int64             streamType = AMF_STREAM_UNKNOWN;
+        AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_TYPE, &streamType));
 
         switch (streamType)
         {
-        case MUXER_VIDEO:   ist->id=AVMEDIA_TYPE_VIDEO; break;
-        case MUXER_AUDIO:   ist->id=AVMEDIA_TYPE_AUDIO; break;
-        case MUXER_DATA:    ist->id=AVMEDIA_TYPE_DATA; break;
-        case MUXER_UNKNOWN: 
+        case AMF_STREAM_VIDEO:   ist->id=AVMEDIA_TYPE_VIDEO; break;
+        case AMF_STREAM_AUDIO:   ist->id=AVMEDIA_TYPE_AUDIO; break;
+        case AMF_STREAM_DATA:    ist->id=AVMEDIA_TYPE_DATA; break;
+        case AMF_STREAM_UNKNOWN: 
         default:            ist->id=AVMEDIA_TYPE_UNKNOWN; break;
         }
 
@@ -490,15 +488,19 @@
 
         //Codec ID is FFMPEG's
         amf_int64  codecID = AV_CODEC_ID_NONE;
-        AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_CODEC_ID, &codecID));
+        AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_CODEC_ID, &codecID));
+        if(streamType == AMF_STREAM_VIDEO)
+        {
+            codecID = GetFFMPEGVideoFormat(AMF_STREAM_CODEC_ID_ENUM(codecID));
+        }
         ist->codec->codec_id = (AVCodecID) codecID;
         ist->codecpar->codec_id = (AVCodecID) codecID;
 
-        AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_BIT_RATE, &ist->codec->bit_rate));
+        AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_BIT_RATE, &ist->codec->bit_rate));
         ist->codecpar->bit_rate = ist->codec->bit_rate;
 
         AMFVariant val;
-        AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_EXTRA_DATA, &val));
+        AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_EXTRA_DATA, &val));
         if (!val.Empty() && val.pInterface)
         {
             // NOTE: the buffer ptr. shouldn't disappear as the 
@@ -515,10 +517,10 @@
         ist->internal->avctx = avcodec_alloc_context3(NULL);
 
 
-        if (streamType==MUXER_VIDEO)
+        if (streamType==AMF_STREAM_VIDEO)
         {
             AMFRate  frameRate;
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_VIDEO_FRAME_RATE, &frameRate));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_VIDEO_FRAME_RATE, &frameRate));
 
             // default pts settings is MPEG like 
             avpriv_set_pts_info(ist, 33, 1, 90000);
@@ -530,7 +532,7 @@
 
 
             AMFSize frame;
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_VIDEO_FRAMESIZE, &frame));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_VIDEO_FRAME_SIZE, &frame));
 
             ist->codec->width = frame.width;
             ist->codec->height = frame.height;
@@ -544,23 +546,23 @@
             ist->codecpar->format = AV_PIX_FMT_YUV420P; // always
 
         }
-        else if (streamType==MUXER_AUDIO)
+        else if (streamType==AMF_STREAM_AUDIO)
         {
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_AUDIO_SAMPLE_RATE, &ist->codec->sample_rate));
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_AUDIO_CHANNELS, &ist->codec->channels));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_AUDIO_SAMPLE_RATE, &ist->codec->sample_rate));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_AUDIO_CHANNELS, &ist->codec->channels));
             ist->codecpar->sample_rate = ist->codec->sample_rate;
             ist->codecpar->channels = ist->codec->channels;
 
 
             amf_int64  sampleFormat = AMFAF_UNKNOWN;
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_AUDIO_SAMPLE_FORMAT, &sampleFormat));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_AUDIO_FORMAT, &sampleFormat));
 
             ist->codec->sample_fmt=GetFFMPEGAudioFormat((AMF_AUDIO_FORMAT) sampleFormat);
             ist->codecpar->format = ist->codec->sample_fmt;
 
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_AUDIO_CHANNEL_LAYOUT, &ist->codec->channel_layout));
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_AUDIO_BLOCK_ALIGN, &ist->codec->block_align));
-            AMF_RETURN_IF_FAILED(spInput->GetProperty(FFMPEG_MUXER_AUDIO_FRAME_SIZE, &ist->codec->frame_size));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_AUDIO_CHANNEL_LAYOUT, &ist->codec->channel_layout));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_AUDIO_BLOCK_ALIGN, &ist->codec->block_align));
+            AMF_RETURN_IF_FAILED(spInput->GetProperty(AMF_STREAM_AUDIO_FRAME_SIZE, &ist->codec->frame_size));
 
             ist->codecpar->channel_layout = ist->codec->channel_layout;
             ist->codecpar->block_align = ist->codec->block_align;

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/UtilsFFMPEG.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/UtilsFFMPEG.cpp Changed

@@ -43,7 +43,6 @@
 
 // there is no definition in FFMPEG for H264MVC so create an ID
 // based on the last element in their enumeration
-const amf_int  AV_CODEC_H264MVC = AV_CODEC_ID_WRAPPED_AVFRAME + 0x300000;
 AVRational AMF_TIME_BASE_Q    = { 1, AMF_SECOND };
 AVRational FFMPEG_TIME_BASE_Q = { 1, AV_TIME_BASE };
 
@@ -404,3 +403,45 @@
     }
     return sample_size;
 }
+
+//-------------------------------------------------------------------------------------------------
+AMF_STREAM_CODEC_ID_ENUM  AMF_STD_CALL   amf::GetAMFVideoFormat(AVCodecID inFormat)
+{
+    switch(inFormat)
+    {
+    case AV_CODEC_ID_NONE: return AMF_STREAM_CODEC_ID_UNKNOWN;
+    case AV_CODEC_ID_MPEG2VIDEO: return AMF_STREAM_CODEC_ID_MPEG2;
+    case AV_CODEC_ID_MPEG4: return AMF_STREAM_CODEC_ID_MPEG4;
+    case AV_CODEC_ID_WMV3: return AMF_STREAM_CODEC_ID_WMV3;
+    case AV_CODEC_ID_VC1: return AMF_STREAM_CODEC_ID_VC1;
+    case AV_CODEC_ID_H264: return AMF_STREAM_CODEC_ID_H264_AVC;
+    case AV_CODEC_H264MVC: return AMF_STREAM_CODEC_ID_H264_MVC;
+    //case AMF_STREAM_CODEC_ID_H264_SVC    = 7,  // AMFVideoDecoderUVD_H264_SVC   
+    case AV_CODEC_ID_MJPEG: return AMF_STREAM_CODEC_ID_MJPEG;
+    case AV_CODEC_ID_HEVC: return AMF_STREAM_CODEC_ID_H265_HEVC;
+    case AMF_CODEC_H265MAIN10: return AMF_STREAM_CODEC_ID_H265_MAIN10;
+
+    }
+    return AMF_STREAM_CODEC_ID_UNKNOWN;
+}
+//-------------------------------------------------------------------------------------------------
+AVCodecID    AMF_STD_CALL   amf::GetFFMPEGVideoFormat(AMF_STREAM_CODEC_ID_ENUM inFormat)
+{
+    switch(inFormat)
+    {
+    case AMF_STREAM_CODEC_ID_UNKNOWN: return AV_CODEC_ID_NONE;
+    case AMF_STREAM_CODEC_ID_MPEG2: return AV_CODEC_ID_MPEG2VIDEO;
+    case AMF_STREAM_CODEC_ID_MPEG4: return AV_CODEC_ID_MPEG4;
+    case AMF_STREAM_CODEC_ID_WMV3: return AV_CODEC_ID_WMV3;
+    case AMF_STREAM_CODEC_ID_VC1: return AV_CODEC_ID_VC1;
+    case AMF_STREAM_CODEC_ID_H264_AVC: return AV_CODEC_ID_H264;
+    case AMF_STREAM_CODEC_ID_H264_MVC: return (AVCodecID)AV_CODEC_H264MVC;
+    //case AMF_STREAM_CODEC_ID_H264_SVC    = 7,  // AMFVideoDecoderUVD_H264_SVC   
+    case AMF_STREAM_CODEC_ID_MJPEG: return AV_CODEC_ID_MJPEG;
+    case AMF_STREAM_CODEC_ID_H265_HEVC: return AV_CODEC_ID_HEVC;
+    case AMF_STREAM_CODEC_ID_H265_MAIN10: return (AVCodecID)AMF_CODEC_H265MAIN10;
+
+    }
+    return AV_CODEC_ID_NONE;
+}
+//-------------------------------------------------------------------------------------------------

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/UtilsFFMPEG.h -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ComponentsFFMPEG/UtilsFFMPEG.h Changed

obs-studio-21.1.2.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/DisplayCapture/DDAPISource.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/DisplayCapture/DDAPISource.cpp Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoCapture Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoCapture/MFSource.cpp Added

@@ -0,0 +1,382 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <propsys.h>
+#include "MFSource.h"
+#include "public/common/TraceAdapter.h"
+
+#pragma comment(lib, "mf.lib")
+#pragma comment(lib, "mfplat.lib")
+#pragma comment(lib, "mfuuid.lib")
+#pragma comment(lib, "mfreadwrite.lib")
+
+#pragma warning(disable: 4996)
+using namespace amf;
+
+#define REFTIMES_PER_SEC  10000000
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFMFSourceImpl::CaptureOnePacket(char** ppData, UINT& lenData)
+{
+    m_pSample.Release();
+    m_pMediaBuf.Release();
+    HRESULT hr = S_OK;
+    while (1)
+    {
+        DWORD streamIndex, flags;
+        LONGLONG llTimeStamp;
+        hr = m_pReader->ReadSample(MF_SOURCE_READER_ANY_STREAM, 0, &streamIndex, &flags, &llTimeStamp, &m_pSample);
+        ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"ReadSample() failed");
+
+        if (!m_pSample)
+        {
+            Sleep(1);
+            continue;
+        }
+
+        hr = m_pSample->GetBufferByIndex(0, &m_pMediaBuf);
+        ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"GetBufferByIndex() failed");
+
+        if (m_pMediaBuf)
+        {
+            m_pMediaBuf->GetCurrentLength((DWORD*)&lenData);
+            m_pMediaBuf->Lock((BYTE**)ppData, 0, 0);
+        }
+        break;
+    }
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFMFSourceImpl::CaptureOnePacketDone()
+{
+    if (m_pMediaBuf)
+    {
+        m_pMediaBuf->Unlock();
+    }
+    m_pMediaBuf.Release();
+    m_pSample.Release();
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMFMFSourceImpl::AMFMFSourceImpl() :
+m_pMediaSource(NULL),
+m_pReader(NULL),
+m_pSample(NULL),
+m_pMediaBuf(NULL),
+m_width(1920),
+m_height(1080)
+{
+}
+//-------------------------------------------------------------------------------------------------
+AMFMFSourceImpl::~AMFMFSourceImpl()
+{
+    Close();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFMFSourceImpl::Close()
+{
+    AMF_RESULT err = AMF_OK;
+    m_deviceList.clear();
+    m_pMediaSource.Release();
+    m_pReader.Release();
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFMFSourceImpl::Init(std::wstring& deviceNameActive)
+{
+    if (deviceNameActive.length() <= 0)
+    {
+        return CreateDeviceList();
+    }
+
+    if (m_deviceList.size() <= 0)
+    {
+        CreateDeviceList();
+    }
+
+    CComPtr<IMFAttributes> pAttributes;
+    HRESULT hr = MFCreateAttributes(&pAttributes, 1);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"MFCreateAttributes() failed");
+
+    hr = pAttributes->SetGUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"SetGUID() failed");
+
+    IMFActivate** ppActivateSources;
+    UINT32 count = 0;
+    hr = MFEnumDeviceSources(pAttributes, &ppActivateSources, &count);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"MFEnumDeviceSources() failed");
+
+    CComPtr<IMFActivate> pActivateSource;
+
+    for (UINT32 i = 0; SUCCEEDED(hr) && (i < count); i++)
+    {
+        LPWSTR pName = 0;
+        hr = ppActivateSources[i]->GetAllocatedString(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, &pName, 0);
+        AMF_ASSERT(SUCCEEDED(hr), L"GetAllocatedString() failed");
+
+        if (deviceNameActive == pName)
+        {
+            hr = ppActivateSources[i]->ActivateObject(IID_IMFMediaSource, (void**)&pActivateSource);
+            AMF_ASSERT(SUCCEEDED(hr), L"ActivateObject() failed");
+        }
+        CoTaskMemFree(pName);
+        ppActivateSources[i]->Release();
+    }
+    CoTaskMemFree(ppActivateSources);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"ActivateObject failed");
+
+    CComPtr<IMFCollection> pCollection;
+    hr = MFCreateCollection(&pCollection);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"MFCreateCollection() failed");
+
+    hr = pCollection->AddElement((IUnknown*)pActivateSource);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"AddElement() failed");
+
+    hr = MFCreateAggregateSource(pCollection, &m_pMediaSource);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"MFCreateAggregateSource() failed");
+
+    hr = SelectSource(m_pMediaSource);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"SelectSource() failed");
+ 
+    pAttributes.Release();
+    pActivateSource.Release();
+    pCollection.Release();
+
+    hr = MFCreateSourceReaderFromMediaSource(m_pMediaSource, NULL, &m_pReader);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"SelectSource() failed");
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFMFSourceImpl::CreateDeviceList()
+{
+    HRESULT hr = S_OK;
+    CComPtr<IMFAttributes> pAttributes;
+    hr = MFCreateAttributes(&pAttributes, 1);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"MFCreateAttributes() failed");
+
+    hr = pAttributes->SetGUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"SetGUID() failed");
+
+    IMFActivate** ppActivateSources;
+    UINT32 count = 0;
+    hr = MFEnumDeviceSources(pAttributes, &ppActivateSources, &count);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"MFEnumDeviceSources() failed");
+
+    // List names
+    for (UINT32 i = 0; i < count; i++)
+    {
+        LPWSTR pName = 0;
+        hr = ppActivateSources[i]->GetAllocatedString(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, &pName, 0);
+
+        if (!SUCCEEDED(hr))
+        {
+            AMFTraceError(L"AMFMFSourceImpl", L"GetAllocatedString() failed!");
+            break;
+        }
+
+        std::wstring name = pName;
+        std::string nameNew(name.begin(), name.end());
+        m_deviceList.push_back(nameNew);
+        CoTaskMemFree(pName);
+    }
+
+    if (ppActivateSources)
+    {
+        // Release array elements
+        for (UINT32 i = 0; i < count; i++)
+        {
+            ppActivateSources[i]->Release();
+            ppActivateSources[i] = NULL;
+        }
+    }
+
+    CoTaskMemFree(ppActivateSources);
+    ppActivateSources = NULL;
+    m_selected = 0;
+    pAttributes.Release();
+    return SUCCEEDED(hr) ? AMF_OK : AMF_FAIL;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFMFSourceImpl::SelectSource(CComPtr<IMFMediaSource> pMediaSource)
+{
+    CComPtr<IMFPresentationDescriptor> pPresentationDesc;
+    HRESULT hr = pMediaSource->CreatePresentationDescriptor(&pPresentationDesc);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"CreatePresentationDescriptor() failed");
+
+    UINT32 widthMax = 0;
+    UINT32 heightMax = 0;
+    UINT32 selection = 0;
+
+    DWORD streamCount = 0;
+    pPresentationDesc->GetStreamDescriptorCount(&streamCount);
+    CComPtr<IMFStreamDescriptor> pStreamDesc(NULL);
+
+    for (UINT32 i = 0; i < streamCount && SUCCEEDED(hr); i++)
+    {
+        BOOL selected(FALSE);
+        hr = pPresentationDesc->GetStreamDescriptorByIndex(i, &selected, &pStreamDesc);
+
+        if (!SUCCEEDED(hr))
+        {
+            AMFTraceError(L"AMFMFSourceImpl", L"GetStreamDescriptorByIndex() failed!");
+            break;
+        }
+
+        if (!selected)
+        {
+            continue;
+        }
+
+        CComPtr<IMFMediaTypeHandler> pHandler(NULL);
+        hr = pStreamDesc->GetMediaTypeHandler(&pHandler);
+
+        if (!SUCCEEDED(hr))
+        {
+            AMFTraceError(L"AMFMFSourceImpl", L"GetMediaTypeHandler() failed!");
+            break;
+        }
+
+        DWORD types = 0;
+        hr = pHandler->GetMediaTypeCount(&types);
+        if (!SUCCEEDED(hr))
+        {
+            AMFTraceError(L"AMFMFSourceImpl", L"GetMediaTypeCount() failed!");
+            break;
+        }
+
+        float  frameRate = 0.0;
+
+        //find the best resolution
+        for (DWORD j = 0; j < types && SUCCEEDED(hr); j++)
+        {
+            CComPtr<IMFMediaType> pMediaType(NULL);
+            hr = pHandler->GetMediaTypeByIndex(j, &pMediaType);
+            if (!SUCCEEDED(hr))
+            {
+                AMFTraceError(L"AMFMFSourceImpl", L"GetMediaTypeByIndex() failed");
+                break;
+            }
+
+            MFVIDEOFORMAT*  pMFVF(NULL);
+            UINT32          cbSize(0);
+            hr = MFCreateMFVideoFormatFromMFMediaType(pMediaType, &pMFVF, &cbSize);
+
+            if (!SUCCEEDED(hr))
+            {
+                pMediaType.Release();
+                AMFTraceError(L"AMFMFSourceImpl", L"MFCreateMFVideoFormatFromMFMediaType() failed");
+                break;
+            }
+
+            GUID guidMajor = GUID_NULL;
+            hr = pMediaType->GetGUID(MF_MT_MAJOR_TYPE, &guidMajor);
+            if (!SUCCEEDED(hr))
+            {
+                pMediaType.Release();
+                AMFTraceError(L"AMFMFSourceImpl", L"GetGUID() failed");
+                break;
+            }
+
+            GUID guidSubType = GUID_NULL;
+            hr = pMediaType->GetGUID(MF_MT_SUBTYPE, &guidSubType);
+            if (!SUCCEEDED(hr))
+            {
+                pMediaType.Release();
+                AMFTraceError(L"AMFMFSourceImpl", L"GetGUID() failed");
+                break;
+            }
+
+            UINT32 width = 0;
+            UINT32 height = 0;
+            MFGetAttributeSize(pMediaType, MF_MT_FRAME_SIZE, &width, &height);
+
+            UINT32 numerator = 0;
+            UINT32 denominator = 0;
+            MFGetAttributeRatio(pMediaType, MF_MT_FRAME_RATE, &numerator, &denominator);
+            if (guidMajor != MFMediaType_Video)
+            {
+                ;
+            }
+            else if (guidSubType == MFVideoFormat_NV12)//skip raw for now
+            {
+                ;
+            }
+            else if (width*height > widthMax*heightMax)
+            {
+                widthMax = width;
+                heightMax = height;
+                frameRate = float(numerator) / float(denominator);
+                selection = j;
+                m_guidSubType = guidSubType;
+                memcpy(&m_videoFormat, pMFVF, cbSize);
+            }
+            else if (width*height == widthMax*heightMax)
+            {
+                float frameRate2 = float(numerator) / float(denominator);
+                if (frameRate < frameRate2)
+                {
+                    frameRate = frameRate2;
+                    selection = j;
+                    m_guidSubType = guidSubType;
+                    memcpy(&m_videoFormat, pMFVF, cbSize);
+                }
+            }
+            pMediaType.Release();
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            CComPtr<IMFMediaType> pMediaType(NULL);
+            pHandler->GetMediaTypeByIndex(selection, &pMediaType);
+            pHandler->SetCurrentMediaType(pMediaType);
+            MFGetAttributeSize(pMediaType, MF_MT_FRAME_SIZE, &m_width, &m_height);
+
+            UINT32 numerator = 0;
+            UINT32 denominator = 0;
+            MFGetAttributeRatio(pMediaType, MF_MT_FRAME_RATE, &numerator, &denominator);
+            frameRate = float(numerator) / float(denominator);
+            m_duration = (amf_pts)(AMF_SECOND / frameRate);
+
+            pMediaType.Release();
+        }
+
+        pHandler.Release();
+        pStreamDesc.Release();
+    }
+
+    pPresentationDesc.Release();
+    return SUCCEEDED(hr) ? AMF_OK : AMF_FAIL;
+}
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoCapture/MFSource.h Added

@@ -0,0 +1,90 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#pragma once
+
+#include <atlcomcli.h>
+
+#include <windows.h>
+#include <windowsx.h>
+#include <mfapi.h>
+#include <mfidl.h>
+#include <mferror.h>
+#include <mfcaptureengine.h>
+#include <shlwapi.h>
+#include <strsafe.h>
+#include <commctrl.h>
+#include <vector>
+#include <mmdeviceapi.h>
+#include <Mfreadwrite.h>
+
+#include "public/include/core/Data.h"
+
+namespace amf
+{
+    class AMFMFSourceImpl
+    {
+    public:
+        AMFMFSourceImpl();
+        virtual ~AMFMFSourceImpl();
+
+        AMF_RESULT Close();
+        AMF_RESULT  Init(std::wstring& deviceNameActive);
+        amf_uint32  GetFrameWidth(){ return m_width; };
+        amf_uint32  GetFrameHeight(){ return m_height; };
+        GUID        GetCodec(){ return m_guidSubType; };
+        amf_pts     GetFrameDuration(){ return m_duration; };
+        amf_uint32  GetDeviceCount() { return (amf_uint32)m_deviceList.size(); };
+        std::string GetDeviceName(amf_uint32 index)
+                   {return (index >= m_deviceList.size()) ? std::string("") : m_deviceList[index];};
+        AMF_RESULT  CaptureOnePacket(char** ppData, UINT& numSamples);
+        AMF_RESULT  CaptureOnePacketDone();
+
+    protected:
+        AMF_RESULT CreateDeviceList();
+        AMF_RESULT    SelectSource(CComPtr<IMFMediaSource> pMediaSource);
+
+        CComPtr<IMFMediaSource>  m_pMediaSource;
+        CComPtr<IMFSourceReader> m_pReader;
+        CComPtr<IMFSample>       m_pSample;
+        CComPtr<IMFMediaBuffer>  m_pMediaBuf;
+
+        std::vector<std::string>  m_deviceList;
+        MFVIDEOFORMAT             m_videoFormat;
+        GUID                      m_guidSubType;
+        amf_uint32                m_width;
+        amf_uint32                m_height;
+        amf_pts                   m_duration;
+        amf_uint32                m_selected;
+    };
+    typedef AMFInterfacePtr_T<AMFMFSourceImpl>    AMFMFSourceImplPtr;
+} //namespace amf

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoCapture/VideoCaptureImpl.cpp Added

@@ -0,0 +1,322 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+//
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include <stdio.h>
+#include <fstream>
+#include <iosfwd>
+#include "VideoCaptureImpl.h"
+
+#include "public/include/core/Context.h"
+#include "public/include/core/Trace.h"
+#include "public/common/TraceAdapter.h"
+#include "public/common/AMFFactory.h"
+#include "public/common/DataStream.h"
+
+#include "public/include/components/VideoCapture.h"
+
+#define AMF_FACILITY L"AMFVideoCaptureImpl"
+
+using namespace amf;
+
+extern "C"
+{
+    AMF_RESULT AMFCreateComponentVideoCapture(amf::AMFContext* pContext, amf::AMFComponentEx** ppComponent)
+    {
+        *ppComponent = new amf::AMFInterfaceMultiImpl< amf::AMFVideoCaptureImpl, amf::AMFComponentEx, amf::AMFContext*>(pContext);
+        (*ppComponent)->Acquire();
+        return AMF_OK;
+    }
+}
+
+//-------------------------------------------------------------------------------------------------
+AMFVideoCaptureImpl::AMFOutputVideoCaptureImpl::AMFOutputVideoCaptureImpl(AMFVideoCaptureImpl* pHost) :
+    m_pHost(pHost),
+    m_frameCount(0),
+    m_iQueueSize(30)
+{
+    m_VideoDataQueue.SetQueueSize(m_iQueueSize);
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoCaptureImpl::AMFOutputVideoCaptureImpl::~AMFOutputVideoCaptureImpl()
+{
+}
+//-------------------------------------------------------------------------------------------------
+// NOTE: this call will return one compressed frame for each QueryOutput call
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::AMFOutputVideoCaptureImpl::QueryOutput(AMFData** ppData)
+{
+    AMF_RETURN_IF_FALSE(m_pHost != NULL, AMF_UNEXPECTED, L"QueryOutput() - Host not Initialized");
+    AMF_RESULT  err = AMF_REPEAT;
+    AMFDataPtr  pFrame;
+    amf_ulong   ulID = 0;
+
+    if (m_VideoDataQueue.Get(ulID, pFrame, 0))
+    {
+        *ppData = pFrame.Detach();
+        err = AMF_OK;
+    }
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT  AMFVideoCaptureImpl::AMFOutputVideoCaptureImpl::SubmitFrame(AMFData* pData)
+{
+    AMF_RETURN_IF_FALSE(m_pHost != NULL, AMF_UNEXPECTED, L"QueryOutput() - Host not Initialized");
+    AMF_RESULT  err = AMF_INPUT_FULL;
+
+    if (m_VideoDataQueue.Add(0, pData, 0, 0))
+    {
+        err = AMF_OK;
+    }
+
+    return err;
+}
+
+// AMFVideoCaptureImpl
+//-------------------------------------------------------------------------------------------------
+AMFVideoCaptureImpl::AMFVideoCaptureImpl(AMFContext* pContext) :
+    m_pContext(pContext),
+    m_frameCount(0),
+    m_bTerminated(true),
+    m_videoPollingThread(this),
+    m_lenData(0)
+{
+    AMFPrimitivePropertyInfoMapBegin
+        AMFPropertyInfoInt64(VIDEOCAP_DEVICE_COUNT, VIDEOCAP_DEVICE_COUNT, 2, 0, 8, false),
+        AMFPropertyInfoWString(VIDEOCAP_DEVICE_NAME, VIDEOCAP_DEVICE_NAME, L"", false),
+        AMFPropertyInfoWString(VIDEOCAP_DEVICE_ACTIVE, VIDEOCAP_DEVICE_ACTIVE, L"", false),
+
+        AMFPropertyInfoWString(VIDEOCAP_CODEC, VIDEOCAP_CODEC, L"", false),
+        AMFPropertyInfoSize(VIDEOCAP_FRAMESIZE, VIDEOCAP_FRAMESIZE, AMFConstructSize(1920, 1080), AMFConstructSize(720, 480), AMFConstructSize(7680, 7680), false),
+        AMFPrimitivePropertyInfoMapEnd
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoCaptureImpl::~AMFVideoCaptureImpl()
+{
+    Terminate();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::Init(AMF_SURFACE_FORMAT /*format*/, amf_int32 /*width*/, amf_int32 /*height*/)
+{
+    AMFLock lock(&m_sync);
+    AMF_RESULT res = AMF_OK;
+    if (!m_bTerminated)
+    {
+        Terminate();
+    }
+    std::wstring deviceNameActive;
+    GetPropertyWString(VIDEOCAP_DEVICE_ACTIVE, &deviceNameActive);
+
+    //create output 
+    m_OutputStream = new AMFOutputVideoCaptureImpl(this);
+    if (!m_OutputStream)
+    {
+        res = AMF_OUT_OF_MEMORY;
+    }
+
+    //init device
+    if (AMF_OK == res)
+    {
+        res = m_videoSource.Init(deviceNameActive);
+
+        if (res != AMF_OK)
+        {
+            AMFTraceError(L"Videostitch", L"AMFVideoCaptureImpl, AMFMFSourceImpl::Init() failed!");
+        }
+
+        SetProperty(VIDEOCAP_FRAMESIZE, AMFConstructSize(m_videoSource.GetFrameWidth(), m_videoSource.GetFrameHeight()));
+        GUID guidSubType = m_videoSource.GetCodec();
+
+        if (MFVideoFormat_H264 == guidSubType)
+        {
+            SetProperty(VIDEOCAP_CODEC, L"AMFVideoDecoderUVD_H264_AVC");
+        }
+        else if (MFVideoFormat_HEVC == guidSubType)
+        {
+            SetProperty(VIDEOCAP_CODEC, L"AMFVideoEncoder_HEVC");
+        }
+        else if (MFVideoFormat_MJPG == guidSubType)//mjpeg
+        {
+            SetProperty(VIDEOCAP_CODEC, L"AMFVideoDecoderUVD_MJPEG");
+        }
+        else if (MFVideoFormat_NV12 == guidSubType)//nv12 raw
+        {
+            SetProperty(VIDEOCAP_CODEC, L"AMFVideoDecoderUVD_H264_AVC");
+        }
+    }
+
+    if (AMF_OK == res)
+    {
+        if (deviceNameActive.length() <= 0) //query device list
+        {
+            UINT deviceCount = m_videoSource.GetDeviceCount();
+            std::string nameList("");
+            for (UINT idx = 0; idx < deviceCount; idx++)
+            {
+                std::string deviceName = m_videoSource.GetDeviceName(idx);
+                nameList += (idx == 0) ? deviceName : "\t" + deviceName;
+            }
+            SetProperty(VIDEOCAP_DEVICE_NAME, nameList.c_str());
+            SetProperty(VIDEOCAP_DEVICE_COUNT, deviceCount);
+        }
+        else
+        {
+            m_videoPollingThread.Start();
+        }
+    }
+
+    m_bTerminated = false;
+    return res;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::ReInit(amf_int32 width, amf_int32 height)
+{
+    Terminate();
+    return Init(AMF_SURFACE_UNKNOWN, width, height);
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::Terminate()
+{
+    m_videoPollingThread.RequestStop();
+    m_videoPollingThread.WaitForStop();
+
+    AMFLock lock(&m_sync);
+
+    m_OutputStream = NULL;
+    m_frameCount = 0;
+    m_videoSource.Close();
+    m_bTerminated = true;
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::Drain()
+{
+    AMFLock lock(&m_sync);
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::Flush()
+{
+    AMFLock lock(&m_sync);
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFVideoCaptureImpl::GetOutput(amf_int32 index, AMFOutput** ppOutput)
+{
+    AMF_RETURN_IF_FALSE(ppOutput != NULL, AMF_INVALID_ARG, L"ppOutput = NULL");
+
+    *ppOutput = m_OutputStream;
+    (*ppOutput)->Acquire();
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+void AMF_STD_CALL  AMFVideoCaptureImpl::OnPropertyChanged(const wchar_t* pName)
+{
+    AMFLock lock(&m_sync);
+    amf_wstring name(pName);
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFVideoCaptureImpl::PollStream()
+{  
+    AMF_RESULT res = AMF_OK; // error checking can be added later
+    char* pData(NULL);
+    UINT lenData(0);
+
+    amf_pts timestampCapStart = amf_high_precision_clock();
+    int err = m_videoSource.CaptureOnePacket(&pData, lenData);
+    amf_pts timestampCapEnd = amf_high_precision_clock();
+
+
+    if ((err != AMF_OK) || (lenData <= 0))
+    {
+        AMFTraceWarning(L"Videostitch", L"Video Data len- lenData <= 0!!");
+        res = AMF_FAIL;
+    }
+    else
+    {
+        AMFBufferPtr pVideoBuffer;
+        err = m_pContext->AllocBuffer(AMF_MEMORY_HOST, lenData, &pVideoBuffer);
+
+        if (AMF_OK == err && pVideoBuffer)
+        {
+            amf_pts duration = m_videoSource.GetFrameDuration();
+            amf_pts timestamp = amf_high_precision_clock();
+            pVideoBuffer->SetPts(timestamp);
+            pVideoBuffer->SetDuration(duration);
+
+            if (pData)
+            {
+                void* pDst = pVideoBuffer->GetNative();
+                memcpy(pDst, pData, lenData);
+            }
+
+            AMF_RESULT err = AMF_INPUT_FULL;
+            while (!m_videoPollingThread.StopRequested())
+            {
+                err = m_OutputStream->SubmitFrame(pVideoBuffer);
+                if (AMF_INPUT_FULL != err)
+                {
+                    break;
+                }
+                amf_sleep(1); // milliseconds
+            }
+        }
+    }
+    m_videoSource.CaptureOnePacketDone();
+    m_frameCount++;
+    return res;
+}
+//-------------------------------------------------------------------------------------------------
+void AMFVideoCaptureImpl::VideoCapturePollingThread::Run()
+{
+    AMF_RESULT res = AMF_OK; // error checking can be added later
+    while (AMF_OK == res)
+    {
+        res = m_pHost->PollStream();
+        if (res == AMF_EOF)
+        {
+            break; // Drain complete
+        }
+        if (StopRequested())
+        {
+            break;
+        }
+    }
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoCaptureImpl::VideoCapturePollingThread::VideoCapturePollingThread(AMFVideoCaptureImpl *pHost) :
+m_pHost(pHost)
+{
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoCaptureImpl::VideoCapturePollingThread::~VideoCapturePollingThread()
+{
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoCapture/VideoCaptureImpl.h Added

@@ -0,0 +1,153 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+//
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once
+
+#include "public/include/core/Context.h"
+#include "public/include/components/Component.h"
+#include "public/common/PropertyStorageExImpl.h"
+#include "public/include/components/VideoCapture.h"
+#include "public/src/components/VideoCapture/MFSource.h"
+
+namespace amf
+{
+    //-------------------------------------------------------------------------------------------------
+
+    class AMFVideoCaptureImpl :
+        public AMFInterfaceBase,
+        public AMFPropertyStorageExImpl<AMFComponentEx>
+    {
+
+
+    //-------------------------------------------------------------------------------------------------
+    typedef AMFInterfaceImpl < AMFPropertyStorageExImpl <AMFOutput> > baseclassOutputProperty;
+
+    class AMFOutputVideoCaptureImpl :
+        public baseclassOutputProperty
+    {
+        friend class AMFVideoCaptureImpl;
+
+    public:
+        AMF_BEGIN_INTERFACE_MAP
+            AMF_INTERFACE_ENTRY(AMFOutput)
+            AMF_INTERFACE_CHAIN_ENTRY(AMFPropertyStorageExImpl <AMFOutput>)
+            AMF_INTERFACE_CHAIN_ENTRY(baseclassOutputProperty)
+        AMF_END_INTERFACE_MAP
+
+        AMFOutputVideoCaptureImpl(AMFVideoCaptureImpl* pHost);
+        virtual ~AMFOutputVideoCaptureImpl();
+
+        // AMFOutput interface
+        virtual AMF_RESULT AMF_STD_CALL  QueryOutput(AMFData** ppData);
+    protected:
+        AMF_RESULT              SubmitFrame(AMFData* pData);
+
+        amf_int32                m_iQueueSize;  //queue size
+        AMFVideoCaptureImpl*     m_pHost;       //host
+        amf_int64                m_frameCount;  //frame count
+        AMFQueue<AMFDataPtr>     m_VideoDataQueue; //video frame queue
+    };
+    typedef AMFInterfacePtr_T<AMFOutputVideoCaptureImpl>    AMFOutputVideoCaptureImplPtr;
+    //-------------------------------------------------------------------------------------------------
+    protected:
+        class VideoCapturePollingThread : public amf::AMFThread
+        {
+        protected:
+            AMFVideoCaptureImpl*         m_pHost;   //host
+        public:
+            VideoCapturePollingThread(AMFVideoCaptureImpl* pHost);
+            ~VideoCapturePollingThread();
+            virtual void Run();
+        };
+
+    public:
+        // interface access
+        AMF_BEGIN_INTERFACE_MAP
+            AMF_INTERFACE_MULTI_ENTRY(AMFComponent)
+            AMF_INTERFACE_MULTI_ENTRY(AMFComponentEx)
+            AMF_INTERFACE_CHAIN_ENTRY(AMFPropertyStorageExImpl<AMFComponentEx>)
+        AMF_END_INTERFACE_MAP
+
+
+        AMFVideoCaptureImpl(AMFContext* pContext);
+        virtual ~AMFVideoCaptureImpl();
+
+        // AMFComponent interface
+        virtual AMF_RESULT  AMF_STD_CALL  Init(AMF_SURFACE_FORMAT format, amf_int32 width, amf_int32 height);
+        virtual AMF_RESULT  AMF_STD_CALL  ReInit(amf_int32 width, amf_int32 height);
+        virtual AMF_RESULT  AMF_STD_CALL  Terminate();
+        virtual AMF_RESULT  AMF_STD_CALL  Drain();
+        virtual AMF_RESULT  AMF_STD_CALL  Flush();
+
+        virtual AMF_RESULT  AMF_STD_CALL  SubmitInput(AMFData* pData)                               { return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  QueryOutput(AMFData** ppData)                             { return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  SetOutputDataAllocatorCB(AMFDataAllocatorCB* callback)    { return AMF_OK; };
+        virtual AMF_RESULT  AMF_STD_CALL  GetCaps(AMFCaps** ppCaps)                                 { return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  Optimize(AMFComponentOptimizationCallback* pCallback)     { return AMF_OK;  };
+        virtual AMFContext* AMF_STD_CALL  GetContext()                                              { return m_pContext; };
+
+        // AMFComponentEx interface
+        virtual amf_int32   AMF_STD_CALL  GetInputCount()                                           {  return 0;  };
+        virtual amf_int32   AMF_STD_CALL  GetOutputCount()                                          {  return 1;  };
+
+        virtual AMF_RESULT  AMF_STD_CALL  GetInput(amf_int32 index, AMFInput** ppInput)             {  return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  GetOutput(amf_int32 index, AMFOutput** ppOutput);
+
+        // AMFPropertyStorageObserver interface
+        virtual void        AMF_STD_CALL  OnPropertyChanged(const wchar_t* pName);
+
+    protected:
+        AMF_RESULT PollStream();
+        int SaveToFile(char* pData, int len);
+        std::ofstream m_fileVideo;
+        amf_int32 m_lenData;
+        int WaveHeader(const WAVEFORMATEX *pWaveFormat, amf_int32 lenData, BYTE** ppData, amf_int32& sizeHeader);
+        int AmbisonicFormatConvert(const void* pSrc, void* pDst, amf_int32 numSamples, const WAVEFORMATEX *pWaveFormat);
+
+    protected:
+        static const AMFSize   VideoFrameSizeList[];
+        static const amf_int32 VideoFrameRateList[];
+
+    private:
+        AMFContextPtr               m_pContext;              //context
+        mutable AMFCriticalSection  m_sync;                   //sync
+        AMFOutputVideoCaptureImplPtr m_OutputStream;          //output object
+        VideoCapturePollingThread    m_videoPollingThread;    //thread to pull frames from camera
+        AMFMFSourceImpl              m_videoSource;           //MF source object
+        bool                         m_bTerminated;           //flag to mark the termination
+        amf_int64                    m_frameCount;            //number of frames handled
+
+        AMFVideoCaptureImpl(const AMFVideoCaptureImpl&);
+        AMFVideoCaptureImpl& operator=(const AMFVideoCaptureImpl&);
+    };
+    typedef AMFInterfacePtr_T<AMFVideoCaptureImpl>    AMFVideoCaptureImplPtr;
+}
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/DirectX11 Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/DirectX11/StitchD3D11.hlsl Added

@@ -0,0 +1,130 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// 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.
+//
+//--------------------------------------------------------------------------------------
+// Constant Buffer Variables                                                            
+//--------------------------------------------------------------------------------------
+cbuffer ConstantBuffer
+{                                                                                       
+    matrix WorldViewProjection;                                                         
+}                        
+cbuffer CubemapConstantBuffer
+{                                                                                       
+    matrix CubemapWorldViewProjection[6];                                                         
+}                        
+//--------------------------------------------------------------------------------------
+Texture2D txDiffuse : register( t0 );                                                   
+SamplerState samplerState : register( s0 );                                             
+//--------------------------------------------------------------------------------------
+struct VS_INPUT                                                                         
+{                                                                                       
+    float4 Pos : POSITION;                                                              
+    float3 Tex : TEXCOORD0;                                                             
+};                                              
+//--------------------------------------------------------------------------------------
+struct VS_OUTPUT
+{                                                                                       
+    float4 Pos : SV_POSITION;                                                              
+    float3 Tex : TEXCOORD0;                                                             
+};                                              
+//--------------------------------------------------------------------------------------
+
+struct GS_OUTPUT                                                                       
+{                                                                                       
+    float4  Pos     : SV_POSITION;                                                              
+    float3  Tex     : TEXCOORD0;                                                             
+    uint    RTIndex : SV_RenderTargetArrayIndex;
+};                                              
+
+//--------------------------------------------------------------------------------------
+struct PS_OUTPUT
+{                                                                                       
+    float4 color : SV_TARGET;
+                                                          
+};                                         
+
+//--------------------------------------------------------------------------------------
+// Vertex Shader                                                                        
+//--------------------------------------------------------------------------------------
+VS_OUTPUT VS( VS_INPUT input )                                                           
+{                                                                                       
+    VS_OUTPUT output = (VS_OUTPUT)0;                                                      
+    output.Pos = mul( input.Pos, WorldViewProjection );                                 
+    output.Tex = input.Tex;                                                             
+                                                                                        
+    return output;                                                                      
+}                                                                                       
+//--------------------------------------------------------------------------------------
+// Pixel Shader passing texture color                                                   
+//--------------------------------------------------------------------------------------
+PS_OUTPUT PS( VS_OUTPUT input)
+{                                                                                       
+    float2 pos = float2(input.Tex.x, input.Tex.y);
+    PS_OUTPUT output = (PS_OUTPUT) 0;	
+    output.color = txDiffuse.Sample( samplerState, pos );                       
+    output.color.w = input.Tex.z;                                                         
+    return output;                                                                     
+}                                                                                       
+//--------------------------------------------------------------------------------------
+// Pixel Shader passing texture color                                                   
+//--------------------------------------------------------------------------------------
+PS_OUTPUT PS_Cube( GS_OUTPUT input)
+{                                                                                       
+    float2 pos = float2(input.Tex.x, input.Tex.y);
+    PS_OUTPUT output = (PS_OUTPUT) 0;	
+    output.color = txDiffuse.Sample( samplerState, pos );                       
+    output.color.w = input.Tex.z;                                                         
+    return output;                                                                     
+}                                                                                       
+
+//--------------------------------------------------------------------------------------
+// Geometry Shader passing texture color                                                   
+//--------------------------------------------------------------------------------------
+
+[maxvertexcount(18)] 
+void GS( triangle VS_OUTPUT input[3], inout TriangleStream<GS_OUTPUT> CubeMapStream ) 
+{ 
+    // For each face of the cube, create a new triangle [unroll]
+    for( int f = 0; f < 6; ++f ) 
+    { 
+        GS_OUTPUT output = (GS_OUTPUT) 0; // Assign triangle to the render target corresponding to this cube face 
+        output.RTIndex = f; 
+        // For each vertex of the triangle, compute screen space position and pass distance [unroll] 
+        for( int v = 0; v < 3; ++v )
+        { 
+            output.Pos= mul( input[v].Pos, CubemapWorldViewProjection[f] ); 
+            output.Tex = input[v].Tex;                                                             
+            CubeMapStream.Append( output ); 
+        } 
+        // New triangle 
+        CubeMapStream.RestartStrip(); 
+    } 
+} 
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/DirectX11/StitchEngineDX11.cpp Added

@@ -0,0 +1,1569 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include "StitchEngineDX11.h"
+#include "StitchD3D11_ps.bin.h"
+#include "StitchD3D11_psc.bin.h"
+#include "StitchD3D11_vs.bin.h"
+#include "StitchD3D11_gs.bin.h"
+
+#include "public\common\TraceAdapter.h"
+
+#include <DirectXMath.h>
+#include <math.h>
+#include <omp.h> 
+
+using namespace DirectX;
+using namespace amf;
+using namespace DirectX;
+
+#pragma comment(lib, "d3dcompiler.lib")
+
+#define AMF_FACILITY L"StitchEngineDX11"
+
+#define ALPHA_BLEND_ENABLED 1
+#define HIST_SIZE   256
+
+inline static amf_uint32 AlignValue(amf_uint32 value, amf_uint32 alignment)
+{
+    return ((value + (alignment - 1)) & ~(alignment - 1));
+}
+
+struct WorldCB
+{
+    XMMATRIX mView;
+};
+
+extern XMVECTOR MakeSphere(XMVECTOR src, float centerX,float centerY,float centerZ, float newRadius);
+
+StitchEngineDX11::StitchEngineDX11(AMFContext* pContext) : 
+StitchEngineBase(pContext),
+    m_bWireRender(false),
+    m_eOutputMode(AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW)
+{
+}
+//-------------------------------------------------------------------------------------------------
+StitchEngineDX11::~StitchEngineDX11()
+{
+    Terminate();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::Init(AMF_SURFACE_FORMAT formatInput, amf_int32 widthInput, amf_int32 heightInput, AMF_SURFACE_FORMAT formatOutput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, AMFPropertyStorage **ppStorageInputs)
+{
+    static bool bOMPInit = false;
+    if(!bOMPInit)
+    {
+        bOMPInit = true;
+        omp_set_num_threads(10);  
+    }
+    int nThreads = omp_get_num_threads();
+
+    AMF_RESULT res = AMF_OK;
+    HRESULT hr = S_OK;
+
+    AMF_RETURN_IF_FALSE(formatInput == AMF_SURFACE_NV12, AMF_INVALID_FORMAT, L"Invalid input format. Expected AMF_SURFACE_BGRA");
+    AMF_RETURN_IF_FALSE(formatOutput == AMF_SURFACE_BGRA || formatOutput == AMF_SURFACE_RGBA || formatOutput == AMF_SURFACE_RGBA_F16, AMF_INVALID_FORMAT, L"Invalid output format. Expected AMF_SURFACE_BGRA");
+
+    m_pd3dDevice = (ID3D11Device*)m_pContext->GetDX11Device();
+    AMF_RETURN_IF_FALSE(m_pd3dDevice != NULL, AMF_NOT_INITIALIZED);
+
+    m_pd3dDevice->GetImmediateContext(&m_pd3dDeviceContext);
+
+    DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
+
+    //---------------------------------------------------------------------------------------------
+    // Create the vertex shader
+    //---------------------------------------------------------------------------------------------
+
+    hr = m_pd3dDevice->CreateVertexShader(StitchD3D11_vs, sizeof(StitchD3D11_vs), NULL, &m_pVertexShader);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateVertexShader() failed");
+
+    hr = m_pd3dDevice->CreateGeometryShader(StitchD3D11_gs, sizeof(StitchD3D11_gs), NULL, &m_pGeometryShader);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateVertexShader() failed");
+
+    //---------------------------------------------------------------------------------------------
+    // Create the input layout
+    //---------------------------------------------------------------------------------------------
+    D3D11_INPUT_ELEMENT_DESC layout[] =
+    {
+        { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+        { "TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+    };
+
+    hr = m_pd3dDevice->CreateInputLayout(layout, _countof(layout), StitchD3D11_vs, sizeof(StitchD3D11_vs), &m_pVertexLayout);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateInputLayout() failed");
+
+    //---------------------------------------------------------------------------------------------
+    // Create pixel shader
+    //---------------------------------------------------------------------------------------------
+    hr = m_pd3dDevice->CreatePixelShader(StitchD3D11_ps, sizeof(StitchD3D11_ps), NULL, &m_pPixelShader);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreatePixelShader(PS) failed");
+
+    hr = m_pd3dDevice->CreatePixelShader(StitchD3D11_psc, sizeof(StitchD3D11_psc), NULL, &m_pPixelShaderCube);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreatePixelShader(PS) failed");
+
+    // Create the sample state
+    D3D11_SAMPLER_DESC sampDesc = {};
+    sampDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+
+    sampDesc.AddressW = sampDesc.AddressV = sampDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
+
+    sampDesc.BorderColor[0] = 1.0f;
+    sampDesc.BorderColor[1] = 0.0f;
+    sampDesc.BorderColor[2] = 0.0f;
+    sampDesc.BorderColor[3] = 0.0f;
+
+    sampDesc.ComparisonFunc = D3D11_COMPARISON_NEVER;
+    sampDesc.MinLOD = 0;
+    sampDesc.MaxLOD = D3D11_FLOAT32_MAX;
+    hr = m_pd3dDevice->CreateSamplerState( &sampDesc, &m_pSamplerLinear );
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"InitializeRenderData() - CreateSamplerState() failed");
+
+    D3D11_DEPTH_STENCIL_DESC depthDisabledStencilDesc={};
+    depthDisabledStencilDesc.DepthEnable = FALSE;
+    depthDisabledStencilDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
+    depthDisabledStencilDesc.DepthFunc = D3D11_COMPARISON_LESS;
+    depthDisabledStencilDesc.StencilEnable = FALSE;
+    depthDisabledStencilDesc.StencilReadMask = 0xFF;
+    depthDisabledStencilDesc.StencilWriteMask = 0xFF;
+    depthDisabledStencilDesc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP;
+    depthDisabledStencilDesc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_INCR;
+    depthDisabledStencilDesc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP;
+    depthDisabledStencilDesc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
+    depthDisabledStencilDesc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP;
+    depthDisabledStencilDesc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_DECR;
+    depthDisabledStencilDesc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP;
+    depthDisabledStencilDesc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
+
+    hr = m_pd3dDevice->CreateDepthStencilState(&depthDisabledStencilDesc, &m_pDepthStencilState);
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"InitializeRenderData() - CreateDepthStencilState() failed");
+
+// Create the rasterizer state which will determine how and what polygons will be drawn.
+    D3D11_RASTERIZER_DESC rasterDesc = {};
+    rasterDesc.AntialiasedLineEnable = TRUE;
+    rasterDesc.CullMode = D3D11_CULL_NONE;
+    rasterDesc.DepthBias = 0;
+    rasterDesc.DepthBiasClamp = 0.0f;
+    rasterDesc.DepthClipEnable = TRUE;
+    rasterDesc.FillMode = D3D11_FILL_SOLID;
+    rasterDesc.FrontCounterClockwise = FALSE;
+    rasterDesc.MultisampleEnable = FALSE;
+    rasterDesc.ScissorEnable = FALSE;
+    rasterDesc.SlopeScaledDepthBias = 0.0f;
+
+    // Create the rasterizer state from the description we just filled out.
+    hr = m_pd3dDevice->CreateRasterizerState(&rasterDesc, &m_pRasterizerState);
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"InitializeRenderData() - CreateRasterizerState() failed");
+
+    rasterDesc.FillMode = D3D11_FILL_WIREFRAME;
+    hr = m_pd3dDevice->CreateRasterizerState(&rasterDesc, &m_pRasterizerStateWire);
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"InitializeRenderData() - CreateRasterizerState() failed");
+    
+
+    D3D11_BLEND_DESC blendDesc = {};
+#if ALPHA_BLEND_ENABLED
+    blendDesc.RenderTarget[0].BlendEnable = TRUE;
+#else
+    blendDesc.RenderTarget[0].BlendEnable = FALSE;
+#endif
+    blendDesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
+    blendDesc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
+    blendDesc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
+    blendDesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
+    blendDesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
+    blendDesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_DEST_ALPHA;
+    blendDesc.RenderTarget[0].RenderTargetWriteMask = 0x0F;
+
+    hr = m_pd3dDevice->CreateBlendState( &blendDesc, &m_pBlendState);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateBlendState failed %x", hr);
+
+    D3D11_BUFFER_DESC bd = {};
+    bd.Usage = D3D11_USAGE_DEFAULT;
+    bd.CPUAccessFlags = 0;
+
+    D3D11_SUBRESOURCE_DATA InitData={};
+    amf_int32 inputCount=0;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_INPUTCOUNT, &inputCount);
+
+    m_StreamList.resize(inputCount);
+
+    XMMATRIX orientation = XMMatrixIdentity();
+    memcpy(m_CameraOrienation.m_WorldViewProjection, &orientation, sizeof(m_CameraOrienation.m_WorldViewProjection));
+
+    Transform trnasform;
+    Transform cubemap[6];
+    res = GetTransform(widthInput, heightInput, widthOutput, heightOutput, pStorage, m_CameraOrienation, trnasform, cubemap);
+
+    amf_int64 mode = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, &mode);
+    m_eOutputMode = (AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM)mode;
+
+    bd.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+    bd.Usage = D3D11_USAGE_DYNAMIC;
+    bd.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    bd.ByteWidth = sizeof(WorldCB);
+    bd.StructureByteStride = 0;
+    InitData.pSysMem = &trnasform;
+
+    hr = m_pd3dDevice->CreateBuffer( &bd, &InitData, &m_pWorldCB );
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"InitializeRenderData() - CreateBuffer() failed");
+
+    bd.ByteWidth = sizeof(WorldCB) * 6;
+    bd.StructureByteStride = 0;
+    InitData.pSysMem = cubemap;
+
+    hr = m_pd3dDevice->CreateBuffer( &bd, &InitData, &m_pCubemapWorldCB );
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"InitializeRenderData() - CreateBuffer() failed");
+
+    m_ControlPoints.clear();
+
+    for(int i = 0; i < inputCount; i++)
+    {
+        res = PrepareMesh(widthInput, heightInput, widthOutput, heightOutput, ppStorageInputs[i], pStorage, i, m_StreamList[i].m_Vertices, m_StreamList[i].m_VerticesRowSize,
+            m_StreamList[i].m_BorderRect, m_StreamList[i].m_TexRect, m_StreamList[i].m_Sides, m_StreamList[i].m_Corners, m_StreamList[i].m_Plane, m_StreamList[i].m_PlaneCenter, &m_StreamList[i].m_pBorderMap);
+    }
+    res = ApplyControlPoints();
+
+    res = UpdateRibs(widthInput, heightInput, ppStorageInputs[0]);
+    res = UpdateTransparency(ppStorageInputs[0]);
+    res = BuildMapForHistogram(widthInput, heightInput);
+
+    for(int i = 0; i < inputCount; i++)
+    {
+        res = ApplyMode(widthOutput, heightOutput, m_StreamList[i].m_Vertices, m_StreamList[i].m_VerticesRowSize, m_StreamList[i].m_VerticesProjected, m_StreamList[i].m_Indexes, pStorage);
+    }
+
+    for(int i = 0; i < inputCount; i++)
+    {
+        RecreateBuffers(i);
+    }
+    
+    D3D11_QUERY_DESC query_desc;
+    query_desc.Query=D3D11_QUERY_EVENT;
+    query_desc.MiscFlags=0; 
+
+    ASSERT_RETURN_IF_HR_FAILED(m_pd3dDevice->CreateQuery(&query_desc,&m_pQuery), AMF_DIRECTX_FAILED);
+    
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT StitchEngineDX11::RecreateBuffers(amf_int32 index)
+{
+    HRESULT hr = S_OK;
+    m_StreamList[index].m_pIndexBuffer.Release();
+    m_StreamList[index].m_pVertexBuffer.Release();
+
+    D3D11_BUFFER_DESC bd = {};
+    bd.CPUAccessFlags = 0;
+
+    D3D11_SUBRESOURCE_DATA InitData={};
+    bd.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+    bd.Usage = D3D11_USAGE_DYNAMIC;
+    bd.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    bd.StructureByteStride = 0;
+
+    bd.ByteWidth = sizeof(m_StreamList[index].m_VerticesProjected[0]) * (UINT)m_StreamList[index].m_VerticesProjected.size();
+    InitData.pSysMem = &m_StreamList[index].m_VerticesProjected[0];
+
+    hr = m_pd3dDevice->CreateBuffer(&bd, &InitData, &m_StreamList[index].m_pVertexBuffer);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateBuffer() - vertex failed");            
+
+    if(m_StreamList[index].m_Indexes.size() > 0)
+    {
+        bd.ByteWidth = sizeof(m_StreamList[index].m_Indexes[0]) * (UINT)m_StreamList[index].m_Indexes.size();       
+        bd.BindFlags = D3D11_BIND_INDEX_BUFFER;
+        bd.Usage = D3D11_USAGE_DYNAMIC;
+        bd.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+        bd.StructureByteStride = 0;
+
+        InitData.pSysMem = &m_StreamList[index].m_Indexes[0];
+        hr = m_pd3dDevice->CreateBuffer(&bd, &InitData, &m_StreamList[index].m_pIndexBuffer);
+        ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateBuffer() - index failed");            
+    }
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::UpdateMesh(amf_int32 index, amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, AMFPropertyStorage *pStorageMain)
+{
+    AMF_RESULT res = AMF_OK;
+
+    res = PrepareMesh(widthInput, heightInput, widthOutput, heightOutput, pStorage, pStorageMain, index, 
+        m_StreamList[index].m_Vertices, m_StreamList[index].m_VerticesRowSize, m_StreamList[index].m_BorderRect, m_StreamList[index].m_TexRect, 
+        m_StreamList[index].m_Sides, m_StreamList[index].m_Corners, m_StreamList[index].m_Plane, m_StreamList[index].m_PlaneCenter, &m_StreamList[index].m_pBorderMap);
+    res = UpdateRibs(widthInput, heightInput, pStorage);
+    res = UpdateTransparency(pStorage);
+    res = BuildMapForHistogram(widthInput, heightInput);
+
+    for(int i = 0; i < (int)m_StreamList.size(); i++)
+    {
+        res = ApplyMode(widthOutput, heightOutput, m_StreamList[i].m_Vertices, m_StreamList[i].m_VerticesRowSize, m_StreamList[i].m_VerticesProjected, m_StreamList[i].m_Indexes, pStorage);
+        RecreateBuffers(i);
+    }
+   
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL      StitchEngineDX11::UpdateFOV(amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage)
+{
+    AMF_RESULT res = AMF_OK;
+    HRESULT hr = S_OK;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_WIRE_RENDER, &m_bWireRender);
+
+    amf_int64 mode = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, &mode);
+    m_eOutputMode = (AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM)mode;
+
+
+    Transform transform;
+    Transform cubemap[6];
+    res = GetTransform(widthInput, heightInput, widthOutput, heightOutput, pStorage, m_CameraOrienation, transform, cubemap);
+   
+    D3D11_MAPPED_SUBRESOURCE MappedResource;
+    hr = m_pd3dDeviceContext->Map(m_pWorldCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"Map() - CB failed");            
+    memcpy(MappedResource.pData, &transform, sizeof(transform));
+    m_pd3dDeviceContext->Unmap(m_pWorldCB, 0);
+
+    if(m_eOutputMode == AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP)
+    {
+        hr = m_pd3dDeviceContext->Map(m_pCubemapWorldCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource);
+        ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"Map() - CB failed");            
+        memcpy(MappedResource.pData, cubemap, sizeof(cubemap));
+        m_pd3dDeviceContext->Unmap(m_pCubemapWorldCB, 0);
+    }
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL      StitchEngineDX11::Terminate()
+{
+    m_pSurfaceOutput = NULL;
+    m_StreamList.clear();
+
+    m_pCubemapWorldCB.Release();
+    m_pWorldCB.Release();
+    m_pDepthStencil.Release();
+    m_pDepthStencilView.Release();
+    m_pRenderTargetView.Release();
+    m_pBlendState.Release();
+    m_pRasterizerState.Release();
+    m_pRasterizerStateWire.Release();
+    m_pDepthStencilState.Release();
+    m_pSamplerLinear.Release();
+    m_pVertexLayout.Release();
+    m_pPixelShader.Release();
+    m_pPixelShaderCube.Release();
+    m_pGeometryShader.Release();
+    m_pVertexShader.Release();
+    m_pQuery.Release();
+    m_pQueryOcclusion.Release();
+    m_pd3dDeviceContext.Release();
+    m_pd3dDevice.Release();
+    AMFLock loc(&m_Sect);
+    m_AllocationQueue.clear();
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL      StitchEngineDX11::StartFrame(AMFSurface *pSurfaceOutput)
+{
+    HRESULT hr = S_OK;
+
+    pSurfaceOutput->Convert(AMF_MEMORY_DX11);
+    m_pSurfaceOutput = pSurfaceOutput;
+
+    AMFPlane* plane = m_pSurfaceOutput->GetPlane(AMF_PLANE_PACKED);
+
+    // Create render target view
+    CComPtr<ID3D11Texture2D> spBackBuffer = (ID3D11Texture2D*)plane->GetNative();
+
+    D3D11_TEXTURE2D_DESC backBufferDesc;
+    spBackBuffer->GetDesc(&backBufferDesc);
+
+    D3D11_RENDER_TARGET_VIEW_DESC RenderTargetViewDescription = {};
+    switch(backBufferDesc.Format)
+    {
+    case DXGI_FORMAT_B8G8R8A8_TYPELESS:
+        RenderTargetViewDescription.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+        break;
+    case DXGI_FORMAT_R8G8B8A8_TYPELESS:
+        RenderTargetViewDescription.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        break;
+    default:
+        RenderTargetViewDescription.Format = backBufferDesc.Format;
+        break;
+    }
+
+    m_pRenderTargetView = NULL;
+
+    if(m_eOutputMode == AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP)
+    {
+        RenderTargetViewDescription.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
+        RenderTargetViewDescription.Texture2DArray.ArraySize = 6;
+        RenderTargetViewDescription.Texture2DArray.FirstArraySlice = 0;
+        RenderTargetViewDescription.Texture2DArray.MipSlice = 0;
+    }
+    else
+    {
+        RenderTargetViewDescription.ViewDimension =D3D11_RTV_DIMENSION_TEXTURE2D;                   // render target view is a Texture2D array
+        RenderTargetViewDescription.Texture2D.MipSlice = 0;                                   // each array element is one Texture2D
+    }
+    hr = m_pd3dDevice->CreateRenderTargetView( spBackBuffer, &RenderTargetViewDescription, &m_pRenderTargetView.p );
+    ASSERT_RETURN_IF_HR_FAILED(hr,AMF_DIRECTX_FAILED,L"CreateRenderTargetView() - GetBuffer() failed");
+    
+    D3D11_TEXTURE2D_DESC depthBufferDesc = {};
+
+    if(m_pDepthStencil != NULL)
+    {
+        m_pDepthStencil->GetDesc(&depthBufferDesc);
+    }
+
+    float ClearColor[4] = { 1.0f, 1.0f, 1.0f, 0.0f };
+    m_pd3dDeviceContext->ClearRenderTargetView( m_pRenderTargetView, ClearColor );
+
+    // setup view
+    m_pd3dDeviceContext->OMSetRenderTargets( 1, &m_pRenderTargetView.p, m_pDepthStencilView );
+    m_pd3dDeviceContext->IASetInputLayout(m_pVertexLayout);
+    m_pd3dDeviceContext->PSSetSamplers( 0, 1, &m_pSamplerLinear.p );
+    m_pd3dDeviceContext->OMSetDepthStencilState(m_pDepthStencilState, 1);
+    m_pd3dDeviceContext->RSSetState(m_bWireRender ? m_pRasterizerStateWire : m_pRasterizerState);
+    float blendFactor[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
+    m_pd3dDeviceContext->OMSetBlendState(m_pBlendState, blendFactor, 0xFFFFFFFF);
+
+    m_pd3dDeviceContext->IASetPrimitiveTopology(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+    m_pd3dDeviceContext->VSSetShader(m_pVertexShader, NULL, 0);
+    m_pd3dDeviceContext->VSSetConstantBuffers( 0, 1, &m_pWorldCB.p );
+
+    if(m_eOutputMode == AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP)
+    {
+        m_pd3dDeviceContext->GSSetShader(m_pGeometryShader, NULL, 0);
+        m_pd3dDeviceContext->PSSetShader(m_pPixelShaderCube, NULL, 0);
+        m_pd3dDeviceContext->GSSetConstantBuffers( 0, 1, &m_pCubemapWorldCB.p );
+    }
+    else
+    {
+         m_pd3dDeviceContext->PSSetShader(m_pPixelShader, NULL, 0);
+    }
+
+    AMFPlane* planeOutput = m_pSurfaceOutput->GetPlane(AMF_PLANE_PACKED);
+
+    D3D11_VIEWPORT viewport = {};
+    viewport.TopLeftX = (FLOAT)planeOutput->GetOffsetX();
+    viewport.TopLeftY = (FLOAT)planeOutput->GetOffsetY();
+    viewport.Width = (FLOAT)planeOutput->GetWidth();
+    viewport.Height = (FLOAT)planeOutput->GetHeight();
+    viewport.MinDepth = 0.0f;
+    viewport.MaxDepth = 1.0f;
+
+    m_pd3dDeviceContext->RSSetViewports( 1, &viewport );
+
+    if(m_pQueryOcclusion != NULL)
+    { 
+        m_pd3dDeviceContext->Begin(m_pQueryOcclusion);
+    }
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::EndFrame(bool bWait)
+{
+    if(m_pQueryOcclusion != NULL)
+    {
+        m_pd3dDeviceContext->End(m_pQueryOcclusion);
+    }
+    m_pd3dDeviceContext->OMSetRenderTargets( 0, NULL, NULL );
+
+    if(m_eOutputMode == AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP)
+    {
+        m_pd3dDeviceContext->GSSetShader(NULL, NULL, 0);
+    }
+    m_pd3dDeviceContext->PSSetShader(NULL, NULL, 0);
+
+    if(bWait)
+    {
+        m_pd3dDeviceContext->Flush();
+        amf_sleep(1); //let DXX queue submit the job.
+    }
+    else
+    {
+        m_pd3dDeviceContext->Flush();
+    }
+
+    if(m_pQueryOcclusion != NULL)
+    {
+        UINT64 sampleCount = 0;
+        while(S_FALSE == m_pd3dDeviceContext->GetData(m_pQueryOcclusion, &sampleCount, sizeof(sampleCount), 0) )
+        {
+        }
+        AMFTraceWarning(AMF_FACILITY, L"Occlusion: = %" LPRId64, sampleCount);
+    }   
+
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::ProcessStream(int index, AMFSurface *pSurface)
+{
+    HRESULT hr = S_OK;
+
+    AMFPlane* planeInput = pSurface->GetPlane(AMF_PLANE_PACKED);
+    CComPtr<ID3D11Texture2D> textureInput = (ID3D11Texture2D*)planeInput->GetNative();
+    ATL::CComPtr<ID3D11ShaderResourceView> pShaderResource;
+    hr = m_pd3dDevice->CreateShaderResourceView( textureInput, NULL, &pShaderResource );
+    m_pd3dDeviceContext->PSSetShaderResources( 0, 1, &pShaderResource.p);
+
+    UINT stride  = sizeof(TextureVertex);
+    UINT offset = 0;
+    m_pd3dDeviceContext->IASetVertexBuffers(0, 1, &m_StreamList[index].m_pVertexBuffer.p, &stride, &offset);
+    if(m_StreamList[index].m_pIndexBuffer == NULL)
+    {
+        m_pd3dDeviceContext->Draw( (UINT)m_StreamList[index].m_VerticesProjected.size(), 0 );
+    }
+    else
+    {
+        m_pd3dDeviceContext->IASetIndexBuffer(m_StreamList[index].m_pIndexBuffer, DXGI_FORMAT_R16_UINT, 0);
+        m_pd3dDeviceContext->DrawIndexed((UINT)m_StreamList[index].m_Indexes.size(), 0 , 0);
+    }
+
+    void* pNULL[1] = {0};
+
+    m_pd3dDeviceContext->PSSetShaderResources( 0, 1, (ID3D11ShaderResourceView**)pNULL);
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::GetBorderRect(amf_int32 index, AMFRect &border)
+{
+    border = m_StreamList[index].m_BorderRect;
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::UpdateBrightness(amf_int32 index, AMFPropertyStorage *pStorage)
+{
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+static  int QuadrantByAngle(float angle, float &center)
+{
+    int quadrant = -1;
+    if(angle >= (float)M_PI / 2.0f && angle < (float)M_PI)
+    {
+        center = (float)M_PI * 3.0f /4.0f;
+        return 0;
+    }
+    if(angle >= 0.0f && angle < (float)M_PI / 2.0f)
+    {
+        center = (float)M_PI /4.0f;
+        return 1;
+    }
+    if(angle >=  -(float)M_PI / 2.0f && angle < 0)
+    {
+        center = -(float)M_PI /4.0f;
+        return 2;
+    }
+    if(angle >= -(float)M_PI && angle < -(float)M_PI / 2.0f)
+    {
+        center = -(float)M_PI * 3.0f /4.0f;
+        return 3;
+    }
+
+    return quadrant;
+}
+
+//re-generate the Rib and corner data based on the vertices
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT StitchEngineDX11::UpdateRibs(amf_int32 widthInput, amf_int32 heightInput, AMFPropertyStorage *pStorage)
+{
+    amf_int64 lensCorrectionMode = AMF_VIDEO_STITCH_LENS_RECTILINEAR;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_MODE, &lensCorrectionMode);
+
+    amf_int32 ribCount = (amf_int32)m_StreamList.size() * 2;
+    m_Ribs.clear();
+
+    //create rib pairs
+    for(int i1 = 0; i1 < (int)m_StreamList.size(); i1++)
+    {
+        XMVECTOR plane1 = m_StreamList[i1].m_Plane;
+        for(int i2 = i1 + 1; i2 < (int)m_StreamList.size(); i2++)
+        {
+            XMVECTOR plane2 = m_StreamList[i2].m_Plane;
+            XMVECTOR line1;
+            XMVECTOR line2;
+
+            //find the intersection between planes
+            XMPlaneIntersectPlane(&line1, &line2, plane1, plane2);
+
+            float distFromRibToCenter = XMVectorGetX(XMVector3LinePointDistance(line1, line2, XMVectorSet(0, 0, 0, 0)));
+            if(distFromRibToCenter > 2.0f )
+            {
+                continue; //wrong pair
+            }
+
+            //check if already inserted
+            bool bFound = false;
+            for(RibList::iterator it_rib = m_Ribs.begin();  it_rib != m_Ribs.begin(); it_rib++)
+            {
+                if( 
+                    (it_rib->channel1 == i1 && it_rib->channel1 == i2)  ||
+                    (it_rib->channel2 == i2 && it_rib->channel2 == i1)
+                    )
+                {
+                    bFound = true;
+                    break;
+                }
+            }
+            if(bFound)
+            {
+                continue;
+            }
+
+            //find the minimum distance from middle of line1&line2 to the sides for the first stream
+            XMVECTOR middle = XMVectorLerp(line1, line2, 0.5f);
+            int s1 = 0;
+            int s2 = 0;
+            float distanceMin = 1000.0f;
+            for(int i = 0; i < (int)m_StreamList[i1].m_Sides.size(); i++)
+            {
+                float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(m_StreamList[i1].m_Sides[i], middle)));
+                if(distance < distanceMin)
+                {
+                    distanceMin = distance;
+                    s1 = i;
+                }
+            }
+            //find the minimum distance from middle of line1&line2 to the sides for the second stream
+            distanceMin = 1000.0f;
+            for(int i = 0; i < (int)m_StreamList[i2].m_Sides.size(); i++)
+            {
+                float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(m_StreamList[i2].m_Sides[i], middle)));
+                if(distance < distanceMin)
+                {
+                    distanceMin = distance;
+                    s2 = i;
+                }
+            }
+
+            // insert pair
+            Rib rib;
+            rib.channel1 = i1;
+            rib.channel2 = i2;
+            rib.side1 = s1;
+            rib.side2 = s2;
+            rib.index = (amf_int32)m_Ribs.size();
+            m_Ribs.push_back(rib);
+
+        }
+    }
+    m_Corners.clear();
+
+    //build the list of corners
+    if (lensCorrectionMode == AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME || lensCorrectionMode == AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR)
+    {
+        //calculate corners for each stream
+        amf_vector<amf_vector<int>> planes;
+        for(int i = 0; i < (int)m_StreamList.size(); i++)
+        {
+            amf_vector<int>  corners;
+            corners.resize(4, -1);
+            float  minAngle[4] = {1000.f, 1000.f, 1000.f, 1000.f};
+
+            //go through the vertices for the stream
+            for (amf_int32 v = 0; v < (amf_int32)m_StreamList[i].m_Vertices.size(); v++)
+            {
+                TextureVertex &vertex = m_StreamList[i].m_Vertices[v];
+                XMVECTOR point = XMVectorSet(vertex.Pos[0], vertex.Pos[1], vertex.Pos[2], 0);
+                if(vertex.Tex[2] == 0)
+                {
+                    continue;
+                }
+                float distanceOwn = 0;
+                float distanceMin = 10000.f;
+                int nearest = -1;
+
+                //find the minimun distance to the center plane of each stream
+                for (int c = 0; c < (int)m_StreamList.size(); c++)
+                {
+                    float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(point, m_StreamList[c].m_PlaneCenter)));
+                    if(distanceMin > distance )
+                    {
+                        distanceMin = distance;
+                        nearest = c;
+                    }
+                    if(c == i)
+                    {
+                        distanceOwn = distance;
+                    }
+                }
+
+                if(nearest == i)
+                {
+                    continue;
+                }
+
+                float middle = (distanceOwn + distanceMin) / 2.0f;
+                float dist = fabs(distanceOwn - middle);
+
+                //skip if the distance is greater than the threshold
+                if(dist < 0.1f)
+                {
+                    float diff = 1000.0;
+                    int quadrant = -1;
+                    float angleEpsilon = 0.1f;
+
+                    //check against the distance to the 4 cornes of the stream
+                    for (int p = 0; p < 4; p++)
+                    {
+                        float distToCorner = XMVectorGetX(XMVector3Length(XMVectorSubtract(point, m_StreamList[i].m_Corners[p])));
+                        if(diff > distToCorner)
+                        {
+                            diff = distToCorner;
+                            quadrant = p;
+                        }
+                    }
+
+                    //find the distance to the plane constructed with the 3 vectors
+                    {
+                       XMVECTOR point1 = XMVectorSet( 0.0f, 0.0f, 0.0f, 0.0f);
+                       XMVECTOR point2 = m_StreamList[i].m_PlaneCenter;
+                       XMVECTOR point3 = m_StreamList[i].m_Corners[quadrant];
+
+                        XMVECTOR plane = XMPlaneFromPoints(point1, point2, point3);
+                        float distToPlane = fabs(XMVectorGetX(XMPlaneDotCoord(plane, point)));
+                        diff = distToPlane;
+                    }
+
+                    //update the minimum angle
+                    if (diff < angleEpsilon)
+                    {
+                        if(minAngle[quadrant] > diff)
+                        {
+                            minAngle[quadrant] = diff;
+                            corners[quadrant] = v;
+                        }
+                    }
+                }
+            }
+            planes.push_back(corners);
+        }
+
+        // match corners
+        for(int i1 = 0; i1 < (int)planes.size(); i1++)
+        {
+            //go through all the corners
+            for (int i2 = i1 + 1; i2 < (int)planes.size(); i2++)
+            {
+                //go through the 4 corners for each plane
+                for(int c1 = 0; c1 < 4; c1++)
+                {
+                    //go through the 4 corners for each plane
+                    for (int c2 = 0; c2 < 4; c2++)
+                    {
+                        if(planes[i1][c1] == -1 || planes[i2][c2] == -1)
+                        {
+                            continue;
+                        }
+                        TextureVertex &v1 = m_StreamList[i1].m_Vertices[planes[i1][c1]];
+                        TextureVertex &v2 = m_StreamList[i2].m_Vertices[planes[i2][c2]];
+                        float diff0 = v1.Pos[0] - v2.Pos[0];
+                        float diff1 = v1.Pos[1] - v2.Pos[1];
+                        float diff2 = v1.Pos[2] - v2.Pos[2];
+                        float distance12 = sqrt(diff0 * diff0 + diff1 * diff1 + diff2 * diff2);
+                        float distanceEpsilon = 0.30f;
+
+                        if(distance12 < distanceEpsilon)
+                        {
+                            DirectX::XMVECTOR  texRect1 = m_StreamList[i1].m_TexRect;
+                            DirectX::XMVECTOR  texRect2 = m_StreamList[i2].m_TexRect;
+                            Corner corner; 
+                            corner.count = 2;
+                            corner.channel[0] = i1;
+                            corner.channel[1] = i2;
+
+                            // on texture 
+                            float x = (v1.Tex[0] - 0.5f);
+                            float y = (v1.Tex[1] - 0.5f);
+                            if(x <= 0 && y <= 0)
+                            {
+                                corner.corner[0] = 0;
+                            }
+                            else if(x > 0 && y <= 0)
+                            {
+                                corner.corner[0] = 1;
+                            }
+                            else if(x > 0 && y > 0)
+                            {
+                                corner.corner[0] = 2;
+                            }
+                            else if(x <= 0 && y > 0)
+                            {
+                                corner.corner[0] = 3;
+                            }
+
+                            // update tex rect
+                            if(x<0)
+                            {
+                                ((float*)&texRect1)[0] = AMF_MAX(((float*)&texRect1)[0], v1.Tex[0]);
+                            }
+                            else 
+                            {
+                                ((float*)&texRect1)[2] = AMF_MIN(((float*)&texRect1)[2], v1.Tex[0]);
+                            }
+                            if(y < 0 )
+                            {
+                                ((float*)&texRect1)[1] = AMF_MAX(((float*)&texRect1)[1], v1.Tex[1]);
+                            }
+                            else
+                            {
+                                ((float*)&texRect1)[3] = AMF_MIN(((float*)&texRect1)[3], v1.Tex[1]);
+                            }
+
+                           //assign the value to corner
+                           x = (v2.Tex[0] - 0.5f) *2.0f;;
+                           y = (v2.Tex[1] - 0.5f) *2.0f;;
+                            if(x <= 0 && y <= 0)
+                            {
+                                corner.corner[1] = 0;
+                            }
+                            else if(x > 0 && y <= 0)
+                            {
+                                corner.corner[1] = 1;
+                            }
+                            else if(x > 0 && y > 0)
+                            {
+                                corner.corner[1] = 2;
+                            }
+                            else if(x <= 0 && y > 0)
+                            {
+                                corner.corner[1] = 3;
+                            }
+
+                            // update tex rect
+                            if(x<0)
+                            {
+                                ((float*)&texRect2)[0] = AMF_MAX(((float*)&texRect2)[0], v2.Tex[0]);
+                            }
+                            else 
+                            {
+                                ((float*)&texRect2)[2] = AMF_MIN(((float*)&texRect2)[2], v2.Tex[0]);
+                            }
+                            if(y < 0 )
+                            {
+                                ((float*)&texRect2)[1] = AMF_MAX(((float*)&texRect2)[1], v2.Tex[1]);
+                            }
+                            else
+                            {
+                                ((float*)&texRect2)[3] = AMF_MIN(((float*)&texRect2)[3], v2.Tex[1]);
+                            }
+
+                            corner.pos[0] = v1.Pos[0];
+                            corner.pos[1] = v1.Pos[1];
+                            corner.pos[2] = v1.Pos[2];
+
+                            //search if this corner was added
+                            bool bFound = false;
+                            for(int c = 0; c < (int)m_Corners.size(); c++)
+                            {
+                                diff0 = corner.pos[0] - m_Corners[c].pos[0];
+                                diff1 = corner.pos[1] - m_Corners[c].pos[1];
+                                diff2 = corner.pos[2] - m_Corners[c].pos[2];
+                                float distance = sqrt(diff0 * diff0 + diff1 * diff1 + diff2 * diff2);
+
+                                if(distance < distanceEpsilon)
+                                {
+                                    bool bCornerFound = false;
+                                    for(int f = 0; f < m_Corners[c].count; f++)
+                                    {
+                                        if(m_Corners[c].channel[f] == i2)
+                                        {
+                                            bCornerFound = true;
+                                            break;
+                                        }
+                                    }
+                                    bFound = true;
+                                    //construct new one
+                                    if(!bCornerFound)
+                                    {
+                                        m_Corners[c].channel[m_Corners[c].count] = corner.channel[corner.count - 1];
+                                        m_Corners[c].corner[m_Corners[c].count] = corner.corner[corner.count - 1];
+                                        m_Corners[c].count++;
+                                        m_StreamList[i1].m_TexRect = texRect1;
+                                        m_StreamList[i2].m_TexRect = texRect2;
+                                    }
+                                    break;
+                                }
+                            }
+
+                            //add new one
+                            if (!bFound)
+                            {
+                                m_StreamList[i1].m_TexRect = texRect1;
+                                m_StreamList[i2].m_TexRect = texRect2;
+                                m_Corners.push_back(corner);
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
+
+        //to handle 2 cameras case
+        if (m_Corners.size() == 2)
+        {
+            Corner corner[4] = { 0 };
+            corner[0].corner[0] = 0;
+            corner[0].corner[1] = 1;
+
+            corner[1].corner[0] = 1;
+            corner[1].corner[1] = 0;
+
+            corner[2].corner[0] = 3;
+            corner[2].corner[1] = 2;
+
+            corner[3].corner[0] = 2;
+            corner[3].corner[1] = 3;
+
+            //find the matching corner and update the index
+            for (amf_int32 idx = 0; idx < 4; idx++)
+            {
+                if ((corner[idx].corner[0] == m_Corners[0].corner[0]) && (corner[idx].corner[1] == m_Corners[0].corner[1]))
+                {
+                    corner[idx].count = 1;
+                }
+                else if ((corner[idx].corner[0] == m_Corners[1].corner[0]) && (corner[idx].corner[1] == m_Corners[1].corner[1]))
+                {
+                    corner[idx].count = 1;
+                }
+            }
+            
+            //add corners 
+            for (amf_int32 idx = 0; idx < 4; idx++)
+            {
+                if (corner[idx].count != 0)
+                {
+                    continue;
+                }
+
+                corner[idx].count = 2;
+                corner[idx].channel[0] = 0;
+                corner[idx].channel[1] = 1;
+
+                corner[idx].pos[0] = m_StreamList[0].m_Corners[corner[idx].corner[0]].m128_f32[0];
+                corner[idx].pos[1] = m_StreamList[0].m_Corners[corner[idx].corner[0]].m128_f32[1];
+                corner[idx].pos[2] = m_StreamList[0].m_Corners[corner[idx].corner[0]].m128_f32[2];
+                corner[idx].index = (amf_int32)m_Corners.size();
+                m_Corners.push_back(corner[idx]);
+            }
+        }
+
+    }
+    else if (lensCorrectionMode == AMF_VIDEO_STITCH_LENS_RECTILINEAR)
+    { 
+        //calculate corners
+        XMVECTOR center = XMVectorSet(0, 0, 0, 0);
+        // define each vertex for cube or other form
+        for(int i1 = 0; i1 < (int)m_StreamList.size(); i1++)
+        {
+            XMVECTOR plane1 = m_StreamList[i1].m_Plane;
+
+            //go through each stream
+            for(int i2 = i1 + 1; i2 < (int)m_StreamList.size(); i2++)
+            {
+                XMVECTOR plane2 = m_StreamList[i2].m_Plane;
+                XMVECTOR line_12_1;
+                XMVECTOR line_12_2;
+                XMPlaneIntersectPlane(&line_12_1, &line_12_2, plane1, plane2);
+
+                //go through each stream
+                for (int i3 = i2 + 1; i3 < (int)m_StreamList.size(); i3++)
+                {
+                    XMVECTOR plane3 = m_StreamList[i3].m_Plane;
+                    XMVECTOR line_13_1;
+                    XMVECTOR line_13_2;
+                    XMPlaneIntersectPlane(&line_13_1, &line_13_2, plane1, plane3);
+
+                    XMVECTOR line_23_1;
+                    XMVECTOR line_23_2;
+                    XMPlaneIntersectPlane(&line_23_1, &line_23_2, plane2, plane3);
+
+
+                   XMVECTOR point1 = XMPlaneIntersectLine(plane1, line_23_1, line_23_2);
+                   XMVECTOR point2 = XMPlaneIntersectLine(plane2, line_13_1, line_13_2);
+                   XMVECTOR point3 = XMPlaneIntersectLine(plane3, line_12_1, line_12_2);
+
+                  float distance1 = XMVectorGetX(XMVector3Length(XMVectorSubtract(point1, center)));
+                  float distance2 = XMVectorGetX(XMVector3Length(XMVectorSubtract(point2, center)));
+                  float distance3 = XMVectorGetX(XMVector3Length(XMVectorSubtract(point3, center)));
+
+                  if(m_StreamList.size() == 6)
+                  { 
+                      if(distance1 > 2.0f || distance2 > 2.0f  || distance3 > 2.0f ) // not close enough
+                      {
+                          continue;
+                      }
+                  }
+
+                //check if the corner is already in the list
+                  bool bFound = false;
+                  for(CornerList::iterator it_corner = m_Corners.begin(); it_corner != m_Corners.end(); it_corner++)
+                  {
+                      if( it_corner->channel[0] == i1 && it_corner->channel[1] == i2 && it_corner->channel[3] == i3)
+                      {
+                          bFound = true;
+                          break;
+                      }
+                  }
+
+                  if(bFound)
+                  {
+                      continue;
+                  }
+
+                  // define corner index
+                  amf_int32 c1 = 0;
+                  amf_int32 c2 = 0;
+                  amf_int32 c3 = 0;
+                  float distanceMin = 1000.0f;
+
+                  //find the minimum distance
+                  for (amf_int32 i = 0; i < (amf_int32)m_StreamList[i1].m_Corners.size(); i++)
+                  {
+                    float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(m_StreamList[i1].m_Corners[i], point1)));
+                    if(distance < distanceMin)
+                    {
+                        distanceMin = distance;
+                        c1 = i;
+                    }
+                  }
+                  //find the minimum distance
+                  distanceMin = 1000.0f;
+                  for(amf_int32 i = 0; i < (amf_int32)m_StreamList[i2].m_Corners.size(); i++)
+                  {
+                    float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(m_StreamList[i2].m_Corners[i], point2)));
+                    if(distance < distanceMin)
+                    {
+                        distanceMin = distance;
+                        c2 = i;
+                    }
+                  }
+                  //find the minimum distance
+                  distanceMin = 1000.0f;
+                  for(amf_int32 i = 0; i < (amf_int32)m_StreamList[i3].m_Corners.size(); i++)
+                  {
+                    float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(m_StreamList[i3].m_Corners[i], point3)));
+                    if(distance < distanceMin)
+                    {
+                        distanceMin = distance;
+                        c3 = i;
+                    }
+                  }
+
+                  // insert vertex
+                  Corner c;
+                  c.count = 3;
+                  c.channel[0] = i1;
+                  c.channel[1] = i2;
+                  c.channel[2] = i3;
+                  c.corner[0] = c1;
+                  c.corner[1] = c2;
+                  c.corner[2] = c3;
+                  c.index  = (amf_int32)m_Corners.size();
+
+                  XMVECTOR plane0 = m_StreamList[c.channel[0]].m_Plane;
+                  XMVECTOR plane1 = m_StreamList[c.channel[1]].m_Plane;
+                  XMVECTOR plane2 = m_StreamList[c.channel[2]].m_Plane;
+
+                  XMVECTOR line_01_0;
+                  XMVECTOR line_01_1;
+                  XMPlaneIntersectPlane(&line_01_0, &line_01_1, plane0, plane1);
+                  XMVECTOR corner = XMPlaneIntersectLine(plane2, line_01_0, line_01_1);
+                  c.pos[0] = XMVectorGetX(corner);
+                  c.pos[1] = XMVectorGetY(corner);
+                  c.pos[2] = XMVectorGetZ(corner);
+                  m_Corners.push_back(c);
+                }
+            }
+        }
+    }
+
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+float* AMF_STD_CALL StitchEngineDX11::GetTexRect(amf_int32 index)
+{
+    return (float*)&m_StreamList[index].m_TexRect;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMFSurface* AMF_STD_CALL StitchEngineDX11::GetBorderMap(amf_int32 index)
+{
+    return m_StreamList[index].m_pBorderMap;
+}
+
+//-------------------------------------------------------------------------------------------------
+struct IntermediatePoint
+{
+    float distance;
+    XMVECTOR add;
+};
+
+struct IntermediateHolder
+{
+    amf_int32 channel;
+    amf_int32 vertex;
+
+    std::vector<IntermediatePoint> points;
+};
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT          StitchEngineDX11::ApplyControlPoints()
+{
+    std::vector< std::map<amf_int32, std::vector<IntermediatePoint> > > holders;
+
+    holders.resize(m_StreamList.size());
+
+    int modifiedVerttexes = 0;
+    for(ControlPointList::iterator it = m_ControlPoints.begin(); it != m_ControlPoints.end(); it++)
+    {
+        if(it->index0 < 0 || it->index1 < 0)
+        {
+            continue;
+        }
+
+        // get points on the plane
+        TextureVertex v0 = it->point0;
+        TextureVertex v1 = it->point1;
+
+        // get points on the sphere
+        XMVECTOR center = XMVectorSet(0, 0, 0, 1.0f);
+        XMVECTOR pointOnShere0 = XMVectorSet(v0.Pos[0], v0.Pos[1], v0.Pos[2], 1.0f);
+        XMVECTOR pointOnShere1 = XMVectorSet(v1.Pos[0], v1.Pos[1], v1.Pos[2], 1.0f);
+
+        XMVECTOR middleOnShere = XMVectorLerp(pointOnShere0, pointOnShere1, 0.5f);
+
+        // process one point
+        for( int k = 0; k < 2; k++)
+        { 
+            int index = k == 0 ? it->index0 : it->index1;
+
+            XMVECTOR plane = m_StreamList[index].m_Plane;
+
+            // project middle on each plane from the center
+            XMVECTOR middleOnPlane = XMPlaneIntersectLine(plane, center, middleOnShere);
+            XMVECTOR pointOnShere = k == 0 ? pointOnShere0 : pointOnShere1;
+
+            // get control point on the plane 
+            TextureVertex  pointVertex = k == 0 ? it->point0 : it->point1;
+            XMVECTOR pointOnPlane = XMVectorSet(pointVertex.Pos[0], pointVertex.Pos[1], pointVertex.Pos[2], 1.0f);
+
+            float distanceShift = fabs(XMVectorGetX(XMVector3Length(XMVectorSubtract(pointOnPlane, middleOnPlane))));
+
+            // value to move from control point to middle point
+            XMVECTOR add = XMVectorSubtract(middleOnPlane, pointOnPlane);
+
+            std::vector<TextureVertex>& vertices = m_StreamList[index].m_Vertices;
+
+            for(amf_int32 i = 0; i < (amf_int32)vertices.size(); i++)
+            { 
+                TextureVertex v = vertices[i];
+                XMVECTOR veretexOnPlane = XMVectorSet(v.Pos[0], v.Pos[1], v.Pos[2], 1.0f);
+
+                // distance from control point to the current point
+                float distance = fabs(XMVectorGetX(XMVector3Length(XMVectorSubtract(pointOnPlane, veretexOnPlane))));
+                float maxRadius = 0.05f;
+
+                maxRadius = max(maxRadius, distanceShift * 2.0f);
+
+                if(distance < maxRadius && distance != 0)
+                {
+                    // from this XMVector3LinePointDistance();
+                    XMVECTOR a = pointOnPlane;
+                    XMVECTOR b = middleOnPlane;
+                    XMVECTOR p = veretexOnPlane;
+
+                    XMVECTOR ap = XMVectorSubtract(a, p);
+                    XMVECTOR ab = XMVectorSubtract(a, b);
+
+                    XMVECTOR ptProjection = XMVectorAdd(a, 
+                                XMVectorMultiply( 
+                                                XMVectorDivide(
+                                                                XMVector3Dot(ap, ab), 
+                                                                XMVector3Dot(ab, ab)
+                                                              ), 
+                                                ab)
+                       );
+                    XMVECTOR addThis = XMVectorSubtract(middleOnPlane, ptProjection);
+
+                    IntermediatePoint intermediatePoint;
+                    intermediatePoint.distance = distance;
+
+                    float addX = (1.0f - fabs(XMVectorGetX(ptProjection) - v.Pos[0] ) / maxRadius) * XMVectorGetX(addThis);
+                    float addY = (1.0f - fabs(XMVectorGetY(ptProjection) - v.Pos[1] ) / maxRadius) * XMVectorGetY(addThis);
+                    float addZ = (1.0f - fabs(XMVectorGetZ(ptProjection) - v.Pos[2] ) / maxRadius) * XMVectorGetZ(addThis);
+                    intermediatePoint.add = XMVectorSet(addX, addY, addZ, 0);
+                    holders[index][i].push_back(intermediatePoint);
+                    modifiedVerttexes++;
+                }
+            }
+        }
+    }
+
+    int channel = 0;
+    for(std::vector< std::map<amf_int32, std::vector<IntermediatePoint> > >::iterator it_h = holders.begin(); it_h != holders.end(); it_h++, channel++)
+    {
+        for(std::map<amf_int32, std::vector<IntermediatePoint> >::iterator it_v = it_h->begin(); it_v != it_h->end(); it_v++)
+        { 
+            TextureVertex &v = m_StreamList[channel].m_Vertices[it_v->first];
+            XMVECTOR veretexOnPlane = XMVectorSet(v.Pos[0], v.Pos[1], v.Pos[2], 1.0f);
+            float distanceMax = 1000.f;
+            XMVECTOR add = XMVectorSet(0, 0, 0, 0);;
+
+            for(std::vector<IntermediatePoint>::iterator it_p = it_v->second.begin(); it_p != it_v->second.end(); it_p++)
+            {
+                add = XMVectorAdd(add, it_p->add);
+            }
+
+            if(it_v->second.size() > 1)
+            {
+                int a = 1;
+            }
+
+            add = XMVectorScale(add, 1.0f / (float)it_v->second.size());
+            XMVECTOR newPoint = XMVectorAdd(veretexOnPlane, add);
+            v.Pos[0] = XMVectorGetX(newPoint);
+            v.Pos[1] = XMVectorGetY(newPoint);
+            v.Pos[2] = XMVectorGetZ(newPoint);
+        }
+    }
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT StitchEngineDX11::BuildMapForHistogram(amf_int32 widthInput, amf_int32 heightInput)
+{
+    AMF_RESULT res = AMF_OK;
+    amf_int32 mapWidth = widthInput / 8;
+    amf_int32 mapHeight = heightInput / 8;
+
+    for(int i = 0; i < (int)m_StreamList.size(); i++)
+    {
+         AMFSurfacePtr pBorderMap;
+        res = m_pContext->AllocSurface(AMF_MEMORY_HOST, AMF_SURFACE_GRAY8, mapWidth, mapHeight, &pBorderMap);
+        AMF_RETURN_IF_FAILED(res, L"AllocSurface() failed");
+
+         AMFPlane *pMap = pBorderMap->GetPlaneAt(0);
+         memset(pMap->GetNative(), 0, pMap->GetHPitch() * pMap->GetVPitch());
+         m_StreamList[i].m_pBorderMap = pBorderMap;
+    }
+
+    for(CornerList::iterator it_corner = m_Corners.begin(); it_corner != m_Corners.end(); it_corner++)
+    {
+        XMVECTOR corner = XMVectorSet(it_corner->pos[0], it_corner->pos[1], it_corner->pos[2], 0);
+
+        for( amf_int32 side = 0; side < it_corner->count; side++)
+        {
+            AMFSurfacePtr pBorderMap = m_StreamList[it_corner->channel[side]].m_pBorderMap;
+            AMFPlane *pMap = pBorderMap->GetPlaneAt(0);
+            amf_uint8* borderData = (amf_uint8*)pMap->GetNative();
+            amf_int32 pitch = pMap->GetHPitch();
+
+            for(amf_int32 v = 0; v < (amf_int32)m_StreamList[it_corner->channel[side]].m_Vertices.size(); v++)
+            {
+                TextureVertex &vertex = m_StreamList[it_corner->channel[side]].m_Vertices[v];
+                XMVECTOR point = XMVectorSet(vertex.Pos[0], vertex.Pos[1], vertex.Pos[2], 0);
+                float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(corner, point)));
+
+                if(distance < 0.3)
+                {
+
+                    amf_uint8 sizeMask =  (amf_uint8) (1 << it_corner->corner[side]);
+
+                      amf_int32 tex_x = amf_int32(vertex.Tex[0] * widthInput) / 8;
+                      amf_int32 tex_y = amf_int32(vertex.Tex[1] * heightInput) / 8;
+                      for(amf_int32 y = 0; y < 8; y++)
+                      {
+                          for(amf_int32 x = 0; x < 8; x++)
+                          {
+                              amf_int32 map_x = tex_x + x - 4;
+                              amf_int32 map_y = tex_y + y - 4;
+                              if(map_x >= 0 && map_y >= 0 && map_x < mapWidth && map_y < mapHeight)
+                              {
+                                  *(borderData + map_y * pitch + map_x)  |= sizeMask;
+                              }
+                          }
+                      }
+                }
+            }
+        }
+    }
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT          StitchEngineDX11::UpdateTransparency(AMFPropertyStorage *pStorage)
+{
+    amf_int64 lensCorrectionMode = AMF_VIDEO_STITCH_LENS_RECTILINEAR;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_MODE, &lensCorrectionMode);
+
+    // update transparency  for each rib
+    if (lensCorrectionMode == AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR || lensCorrectionMode == AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME) //MM TODO stupid switch for now 
+    {
+     float transparencySize = 0.05f;
+
+#if defined(DEBUG_TRANSPARENT)
+     float transparencyMax = 0.3f;
+     float transparencyMin = 0.3f;
+#else
+     float transparencyMin = 0.0f;
+     float transparencyMax = 1.0f;
+#endif
+
+
+    for(int i = 0; i < (int)m_StreamList.size(); i++)
+    {
+        for(amf_int32 v = 0; v < (amf_int32)m_StreamList[i].m_Vertices.size(); v++)
+        {
+            TextureVertex &vertex = m_StreamList[i].m_Vertices[v];
+            XMVECTOR point = XMVectorSet(vertex.Pos[0], vertex.Pos[1], vertex.Pos[2], 0);
+            float distanceOwn = 0;
+            float distanceMin = 10000.f;
+            int nearest = -1;
+            for(int c = 0; c < (int)m_StreamList.size(); c++)
+            {
+                float distance = XMVectorGetX(XMVector3Length(XMVectorSubtract(point, m_StreamList[c].m_PlaneCenter)));
+                if(distanceMin > distance )
+                {
+                    distanceMin = distance;
+                    nearest = c;
+                }
+                if(c == i)
+                {
+                    distanceOwn = distance;
+                }
+            }
+            float middle = (distanceOwn + distanceMin) / 2.0f;
+            float dist = distanceOwn - middle;
+
+            if(nearest != i)
+            {
+                if(dist < transparencySize)
+                { 
+                    float x0 = transparencySize;
+                    float x1 = 0;
+                    float y1 = transparencyMax;
+                    float y0 = transparencyMin;
+                    vertex.Tex[2] = y0 + (y1 - y0) * ( dist - x0) / (x1 - x0);
+                }
+                else 
+                { 
+                    vertex.Tex[2] = transparencyMin;
+                }
+            }
+            else
+            {
+                vertex.Tex[2] = transparencyMax;
+            }
+            
+        }
+    }
+    }
+    else if (lensCorrectionMode == AMF_VIDEO_STITCH_LENS_RECTILINEAR) //MM TODO stupid switch for now 
+    {
+     float transparencySize = 0.1f;
+
+#if defined(DEBUG_TRANSPARENT)
+     float transparencyMax = 0.3f;
+     float transparencyMin = 0.3f;
+#else
+     float transparencyMin = 0.0f;
+     float transparencyMax = 1.0f;
+#endif
+
+
+    for(RibList::iterator rib = m_Ribs.begin(); rib != m_Ribs.end(); rib++)
+    {
+        XMVECTOR center = XMVectorSet(0, 0, 0, 0);
+
+        for(amf_int32 loop = 0; loop < 2; loop++)
+        {
+            amf_int32 channelPoint = loop == 0 ? rib->channel1 : rib->channel2;
+            amf_int32 channelPlane = loop == 0 ? rib->channel2 : rib->channel1;
+            XMVECTOR plane = m_StreamList[channelPlane].m_Plane;
+
+            float a = XMVectorGetX(plane);
+            float b = XMVectorGetY(plane);
+            float c = XMVectorGetZ(plane);
+            float d = XMVectorGetW(plane);
+
+            // check each point in the mesh
+            for(amf_int32 v = 0; v < (amf_int32)m_StreamList[channelPoint].m_Vertices.size(); v++)
+            {
+                TextureVertex &vertex = m_StreamList[channelPoint].m_Vertices[v];
+                float dist = (a * vertex.Pos[0] + b * vertex.Pos[1] + c * vertex.Pos[2] + d) / sqrt(a * a + b * b + c * c + d * d);
+
+#if defined(DEBUG_TRANSPARENT)
+                vertex.Tex[2] = transparencyMax; //MM - this line is temporary - do not check in
+#endif                
+                if(dist < -transparencySize )
+                {
+                    vertex.Tex[2] = transparencyMin;
+                }
+                if(dist > 0 )
+                {
+                }
+                else 
+                {
+                    float x0 = -transparencySize;
+                    float x1 = 0;
+                    float y1 = transparencyMax;
+                    float y0 = transparencyMin;
+                    float val = y0 + (y1 - y0) * (dist - x0) / (x1 - x0);
+                    vertex.Tex[2] *= val;
+                }
+
+            }
+        }
+    }
+    }
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AMF_STD_CALL StitchEngineDX11::OnSurfaceDataRelease(AMFSurface* pSurface)
+{
+    if(m_pd3dDevice == NULL)
+    {
+        return;
+    }
+    AMFLock loc(&m_Sect);
+    if(m_AllocationQueue.size() >= 2)
+    {
+        m_AllocationQueue.pop_front();
+    }
+    m_AllocationQueue.push_back((ID3D11Texture2D*)pSurface->GetPlaneAt(0)->GetNative());
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineDX11::AllocCubeMap(AMF_SURFACE_FORMAT format, amf_int32 width, amf_int32 height, AMFSurface **ppSurface)
+{
+    AMF_RETURN_IF_FALSE(m_pd3dDevice != NULL, AMF_NOT_INITIALIZED, L"Not initialized");
+
+    ATL::CComPtr<ID3D11Texture2D> pSurface;
+
+    AMFLock loc(&m_Sect);
+    if(m_AllocationQueue.size() > 0)
+    {
+        pSurface = m_AllocationQueue.front();
+        m_AllocationQueue.pop_front();
+    }
+    else
+    {
+        D3D11_TEXTURE2D_DESC desc = {};
+
+        DXGI_FORMAT dxformat = DXGI_FORMAT_B8G8R8A8_UNORM;
+        switch(format)
+        {
+        case AMF_SURFACE_BGRA:
+            dxformat = DXGI_FORMAT_B8G8R8A8_TYPELESS;
+            break;
+        case AMF_SURFACE_RGBA_F16:
+            dxformat = DXGI_FORMAT_R16G16B16A16_FLOAT;
+            break;
+        case AMF_SURFACE_RGBA:
+            dxformat = DXGI_FORMAT_R8G8B8A8_TYPELESS;
+            break;
+
+        case AMF_SURFACE_GRAY8:
+            dxformat = DXGI_FORMAT_R8_UNORM;
+            break;
+
+        case AMF_SURFACE_U8V8:
+            dxformat = DXGI_FORMAT_R8G8_UNORM;
+            break;
+        default:
+            return AMF_NOT_SUPPORTED;
+        }
+
+        //we allocate alligned to 2 for all formats
+        width = AlignValue(width, 2);
+        height = AlignValue(height, 2);
+
+        if(width > height)
+        {
+            height = width;
+        }
+        else
+        {
+            width = height;
+        }
+
+        desc.ArraySize = 6; //CUBEMAP
+        desc.BindFlags = 0;
+
+        desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+        // This if/else is added because we can't create DX11 texture of BGRA format with D3D11_BIND_UNORDERED_ACCESS flag.
+        if((format == AMF_SURFACE_BGRA || format == AMF_SURFACE_RGBA || format == AMF_SURFACE_RGBA_F16))
+        {
+            desc.BindFlags |=  D3D11_BIND_RENDER_TARGET; // request renderer D3D11_BIND_RENDER_TARGET
+            if(format == AMF_SURFACE_RGBA || format == AMF_SURFACE_RGBA_F16)
+            { 
+                desc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
+            }
+        }
+        else
+        {
+            desc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
+        }
+
+        desc.Usage = D3D11_USAGE_DEFAULT;
+        desc.Format = dxformat;
+        desc.Width = width;
+        desc.Height = height;
+        desc.MipLevels = 1;
+
+        desc.SampleDesc.Count = 1;
+        desc.CPUAccessFlags = 0;
+        desc.MiscFlags = 0;
+        desc.MiscFlags |= D3D11_RESOURCE_MISC_SHARED; //MM for fast GPU interop
+        desc.MiscFlags |= D3D11_RESOURCE_MISC_TEXTURECUBE;
+
+        HRESULT hr = m_pd3dDevice->CreateTexture2D(&desc, NULL, &pSurface);
+        ASSERT_RETURN_IF_HR_FAILED(hr, AMF_DIRECTX_FAILED, L"CreateTexture2D() failed");
+    }
+    m_pContext->CreateSurfaceFromDX11Native(pSurface, ppSurface, this);
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/DirectX11/StitchEngineDX11.h Added

@@ -0,0 +1,131 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once 
+
+#include <D3D11.h>
+#include <d3dcompiler.h>
+#include <DirectXMath.h>
+#include <float.h>
+#include <atlbase.h>
+#include <list>
+
+#include "../StitchEngineBase.h"
+
+namespace amf
+{
+
+class StitchEngineDX11 : public StitchEngineBase, public AMFSurfaceObserver
+{
+public:
+    StitchEngineDX11(AMFContext* pContext);
+    virtual ~StitchEngineDX11();
+
+    virtual AMF_RESULT AMF_STD_CALL      Init(AMF_SURFACE_FORMAT formatInput, amf_int32 widthInput, amf_int32 heightInput, AMF_SURFACE_FORMAT formatOutput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, AMFPropertyStorage **ppStorageInputs);
+    virtual AMF_RESULT AMF_STD_CALL      Terminate();
+    virtual AMF_RESULT AMF_STD_CALL      StartFrame(AMFSurface *pSurfaceOutput);
+    virtual AMF_RESULT AMF_STD_CALL      EndFrame(bool bWait);
+    virtual AMF_RESULT AMF_STD_CALL      ProcessStream(int index, AMFSurface *pSurface);
+    virtual AMF_RESULT AMF_STD_CALL      UpdateFOV(amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage);
+    virtual AMF_RESULT AMF_STD_CALL      UpdateMesh(amf_int32 index, amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, AMFPropertyStorage *pStorageMain);
+    virtual AMF_RESULT AMF_STD_CALL      GetBorderRect(amf_int32 index, AMFRect &border);
+    virtual AMF_RESULT AMF_STD_CALL      UpdateBrightness(amf_int32 index, AMFPropertyStorage *pStorage);
+    virtual float*     AMF_STD_CALL      GetTexRect(amf_int32 index);
+    virtual AMFSurface* AMF_STD_CALL     GetBorderMap(amf_int32 index);
+    virtual AMF_RESULT AMF_STD_CALL      AllocCubeMap(AMF_SURFACE_FORMAT formatOut, amf_int32 width, amf_int32 height, AMFSurface **ppSurface);
+
+    // AMFSurfaceObserver interface
+    virtual void AMF_STD_CALL OnSurfaceDataRelease(AMFSurface* pSurface);
+
+protected:
+friend class Stream;
+    class Stream // per stream properties
+    {
+    public:
+
+        ATL::CComPtr<ID3D11Buffer>           m_pVertexBuffer;
+        ATL::CComPtr<ID3D11Buffer>           m_pIndexBuffer;
+        AMFRect                             m_BorderRect;
+        std::vector<DirectX::XMVECTOR>      m_Sides;
+        DirectX::XMVECTOR                   m_TexRect;
+        AMFSurfacePtr                       m_pBorderMap;
+        std::vector<TextureVertex>          m_Vertices;
+        std::vector<amf_uint16>             m_Indexes;
+        DirectX::XMVECTOR                   m_Plane;
+        DirectX::XMVECTOR                   m_PlaneCenter;
+        std::vector<TextureVertex>          m_VerticesProjected;
+        std::vector<amf_uint32>             m_VerticesRowSize;
+        std::vector<DirectX::XMVECTOR>      m_Corners;
+    };
+typedef std::vector<Stream> StreamList;
+
+    AMF_RESULT          UpdateRibs(amf_int32 widthInput, amf_int32 heightInput, AMFPropertyStorage *pStorage);
+    AMF_RESULT          RecreateBuffers(amf_int32 index);
+
+    AMF_RESULT          ApplyControlPoints();
+    AMF_RESULT          BuildMapForHistogram(amf_int32 widthInput, amf_int32 heightInput);
+    AMF_RESULT          UpdateTransparency(AMFPropertyStorage *pStorage);
+
+
+    StreamList      m_StreamList;
+    AMFSurfacePtr   m_pSurfaceOutput;
+
+    ATL::CComPtr<ID3D11Device>              m_pd3dDevice;
+    ATL::CComPtr<ID3D11DeviceContext>       m_pd3dDeviceContext;
+    ATL::CComPtr<ID3D11VertexShader>        m_pVertexShader;
+    ATL::CComPtr<ID3D11PixelShader>         m_pPixelShader;
+    ATL::CComPtr<ID3D11PixelShader>         m_pPixelShaderCube;
+    ATL::CComPtr<ID3D11GeometryShader>      m_pGeometryShader;
+
+    ATL::CComPtr<ID3D11InputLayout>         m_pVertexLayout;
+    ATL::CComPtr<ID3D11SamplerState>        m_pSamplerLinear;
+    ATL::CComPtr<ID3D11DepthStencilState>   m_pDepthStencilState;
+    ATL::CComPtr<ID3D11RasterizerState>     m_pRasterizerState;
+    ATL::CComPtr<ID3D11RasterizerState>     m_pRasterizerStateWire;
+    ATL::CComPtr<ID3D11BlendState>          m_pBlendState;
+    ATL::CComPtr<ID3D11RenderTargetView>    m_pRenderTargetView;
+    ATL::CComPtr<ID3D11Texture2D>           m_pDepthStencil;
+    ATL::CComPtr<ID3D11DepthStencilView>    m_pDepthStencilView;
+    ATL::CComPtr<ID3D11Buffer>              m_pWorldCB;
+    ATL::CComPtr<ID3D11Buffer>              m_pCubemapWorldCB;
+    ATL::CComPtr<ID3D11Query>                m_pQuery;
+    ATL::CComPtr<ID3D11Query>                m_pQueryOcclusion;
+
+    bool                                    m_bWireRender;
+    Transform                               m_CameraOrienation;
+
+    AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM       m_eOutputMode;
+
+    std::list< ATL::CComPtr<ID3D11Texture2D> > m_AllocationQueue;
+    AMFCriticalSection                      m_Sect;
+};
+
+} // namespace amf
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/HistogramImpl.cpp Added

@@ -0,0 +1,1449 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include "HistogramImpl.h"
+#include "public/include/core/Compute.h"
+#include "public/common/TraceAdapter.h"
+#include "public/include/core/Context.h"
+#define _ATL_DISABLE_NOTHROW_NEW
+
+
+extern const amf_uint8 Histogram[];
+extern const amf_size HistogramCount;
+
+#include <DirectXMath.h>
+
+using namespace amf;
+using namespace DirectX; 
+//TODO - implement - portable code
+
+#define AMF_FACILITY L"Histogram"
+#define MAX_CORNERS     100
+
+#define __global
+#define __local
+#define barrier(x)
+
+inline static amf_uint32 AlignValue(amf_uint32 value, amf_uint32 alignment)
+{
+    return ((value + (alignment - 1)) & ~(alignment - 1));
+}
+
+static amf::AMF_KERNEL_ID   m_KernelHistogramId = -1;
+static amf::AMF_KERNEL_ID   m_KernelColorId = -1;
+static amf::AMF_KERNEL_ID   m_KernelNV12toRGBId = -1;
+static amf::AMF_KERNEL_ID   m_KernelBuildLUTId = -1;
+static amf::AMF_KERNEL_ID   m_KernelBuildLUTCenterId = -1;
+static amf::AMF_KERNEL_ID   m_KernelBuildShiftsId = -1;
+
+static amf::AMF_KERNEL_ID   m_KernelHistogramIdBin = -1;
+static amf::AMF_KERNEL_ID   m_KernelColorIdBin = -1;
+static amf::AMF_KERNEL_ID   m_KernelNV12toRGBIdBin = -1;
+static amf::AMF_KERNEL_ID   m_KernelBuildLUTIdBin = -1;
+static amf::AMF_KERNEL_ID   m_KernelBuildLUTCenterIdBin = -1;
+static amf::AMF_KERNEL_ID   m_KernelBuildShiftsIdBin = -1;
+
+
+amf::AMF_KERNEL_ID   m_KernelHistogramIdDX11 = -1;
+amf::AMF_KERNEL_ID   m_KernelColorIdDX11 = -1;
+amf::AMF_KERNEL_ID   m_KernelNV12toRGBIdDX11 = -1;
+amf::AMF_KERNEL_ID   m_KernelBuildLUTIdDX11 = -1;
+amf::AMF_KERNEL_ID   m_KernelBuildLUTCenterIdDX11 = -1;
+amf::AMF_KERNEL_ID   m_KernelBuildShiftsIdDX11 = -1;
+
+//#define RGB_COLORSPACE
+#define LUT_CURVE_TABLE_SIZE    20
+
+extern AMF_RESULT  RegisterKernelsDX11();
+
+#pragma pack(push, 1)
+struct HistogramParameters
+{
+    amf_int32 maxDistanceBetweenPeaks[3];
+    amf_int32 whiteCutOffY;
+    amf_int32 blackCutOffY;
+    amf_int32 borderHistWidth; //TODO make image size - dependent
+    float   alphaLUT;
+    float   lutCurveTable[LUT_CURVE_TABLE_SIZE]; // curve from 0 to 1
+    amf_int32 align1;
+};
+#pragma pack(pop)
+
+static amf_int32 CrossCorrelation(amf_int32 *data1, amf_int32 *data2, amf_int32 maxdelay);
+static float OneCrossCorrelation(
+    __global amf_int32 *data1,    // [in]
+    __global amf_int32 *data2,    // [in]
+    amf_int32 col,
+    amf_int32 delay,
+    amf_int32 maxdelay,
+    __global HistogramParameters *params
+    );
+
+// static parameters
+static HistogramParameters params = {
+    {90 , 20, 20},     // maxDistanceBetweenPeaks[3]
+    217,                // whiteCutOffY
+    20,                 // blackCutOffY
+    100,                // borderHistWidth 
+    0.1f,               // alphaLUT
+};
+
+static amf_int32 minStretchValue = 10000;
+static amf_int32 borderForStretch = 0;
+
+static void BuildOneLUT(amf_int32 col, float brightness, float *lut, float *prev, HistogramParameters *params, amf_int32 frameCount);
+static void FilterData(amf_int32 *data,amf_int32 *dataPrev,  amf_int32 count, amf_int32 frameCount);
+static void FilterDataInplace(amf_int32 *data, amf_int32 count);
+
+//-------------------------------------------------------------------------------------------------
+HistogramImpl::HistogramImpl() : m_iFrameCount(0)
+{
+}
+//-------------------------------------------------------------------------------------------------
+HistogramImpl::~HistogramImpl()
+{
+    Terminate();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL HistogramImpl::CompileKernels(AMFCompute* pDevice, AMFComponentOptimizationCallback* pCallback)
+{
+    AMF_RESULT res = AMF_OK;
+    static int registered = 0;
+    if(!registered)
+    {
+         int count = 0;
+         int total  = 12;
+        
+         AMFPrograms *pPrograms = NULL;
+         g_AMFFactory.GetFactory()->GetPrograms(&pPrograms);
+        AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelSource(&m_KernelHistogramId,       L"StitchHistogramMapNV12"        , "StitchHistogramMapNV12"          , HistogramCount, Histogram, 0));
+        AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelSource(&m_KernelColorId,           L"WriteBorderRGB"        , "WriteBorderRGB"          , HistogramCount, Histogram, 0));
+        AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelSource(&m_KernelNV12toRGBId,       L"StitchConvertNV12ToRGB"        , "StitchConvertNV12ToRGB"          , HistogramCount, Histogram, 0));
+        AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelSource(&m_KernelBuildLUTId,        L"BuildLUT"        , "BuildLUT"          , HistogramCount, Histogram, 0));
+        AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelSource(&m_KernelBuildLUTCenterId,  L"BuildLUTCenter"        , "BuildLUTCenter"          , HistogramCount, Histogram, 0));
+        AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelSource(&m_KernelBuildShiftsId,     L"BuildShifts"        , "BuildShifts"          , HistogramCount, Histogram, 0));
+        registered = 1;
+    }
+
+    if(pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        static int registeredDX11 = 0;
+        if(!registeredDX11)
+        {
+            RegisterKernelsDX11();
+            registeredDX11 = 1;
+        }
+    }
+    return AMF_OK;
+}
+
+AMF_RESULT AMF_STD_CALL HistogramImpl::Init(AMFCompute* pDevice, AMFContext* pContext, amf_int32 count)
+{
+    AMF_RESULT res = AMF_OK;
+    CompileKernels(pDevice, NULL);
+    m_pContext = pContext;
+    m_pDevice = pDevice;
+    bool bGFX9 = false;
+    m_pContext->GetProperty(L"GFX9", &bGFX9);
+
+    if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelHistogramIdDX11, &m_pKernelHistogram));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelColorIdDX11, &m_pKernelColor));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelNV12toRGBIdDX11, &m_pKernelNV12toRGB));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildLUTIdDX11, &m_pKernelBuildLUT));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildLUTCenterIdDX11, &m_pKernelBuildLUTCenter));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildShiftsIdDX11, &m_pKernelBuildShifts));
+    }
+    else if(bGFX9 && (m_pDevice->GetMemoryType() == AMF_MEMORY_COMPUTE_FOR_DX9 || m_pDevice->GetMemoryType() == AMF_MEMORY_COMPUTE_FOR_DX11))
+    {
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelHistogramIdBin, &m_pKernelHistogram));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelColorIdBin, &m_pKernelColor));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelNV12toRGBIdBin, &m_pKernelNV12toRGB));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildLUTIdBin, &m_pKernelBuildLUT));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildLUTCenterIdBin, &m_pKernelBuildLUTCenter));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildShiftsIdBin, &m_pKernelBuildShifts));
+    }
+    else
+    {
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelHistogramId, &m_pKernelHistogram));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelColorId, &m_pKernelColor));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelNV12toRGBId, &m_pKernelNV12toRGB));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildLUTId, &m_pKernelBuildLUT));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildLUTCenterId, &m_pKernelBuildLUTCenter));
+        AMF_RETURN_IF_FAILED(pDevice->GetKernel(m_KernelBuildShiftsId, &m_pKernelBuildShifts));
+    }
+    for(int i = 0; i < _countof(params.lutCurveTable); i++)
+    {
+        params.lutCurveTable[i] = float((sin(M_PI_2 + i * M_PI / _countof(params.lutCurveTable)) + 1.0 ) / 2.0 );
+    }
+
+    amf_size histogramSize = count * (HIST_SIZE * 3 * 4 ) * sizeof(amf_uint32);
+    amf_size brightnessSize = count * ( 3 * 4 ) * sizeof(float);
+    amf_size lutSize = count * (HIST_SIZE * 5 * 3) * sizeof(float);
+
+    //init unit LUT
+    AMFBufferPtr pBufferLUTNone;
+    res = m_pContext->AllocBuffer(AMF_MEMORY_HOST, lutSize, &pBufferLUTNone);
+    AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+    for (amf_int32 channel = 0; channel < count; channel++)
+    {
+        for (amf_int32 side = 0; side < 5; side++)
+        {
+            for (amf_int32 col = 0; col < 3; col++)
+            {
+                float* lut = (float*)pBufferLUTNone->GetNative() + channel * 5 * 3 * HIST_SIZE + side * 3 * HIST_SIZE + col * HIST_SIZE;
+
+                BuildOneLUT(col, 0.0f, lut, NULL, &params, 0);
+            }
+        }
+    }
+
+    m_bUseDX11NativeBuffer = false;
+#if GPU_ACCELERATION
+    if (m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        m_bUseDX11NativeBuffer = true;
+        D3D11_BUFFER_DESC desc = {};
+        desc.ByteWidth = (UINT)histogramSize;
+        desc.Usage = D3D11_USAGE_DEFAULT;
+        desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS;
+        desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+        desc.MiscFlags = 0;
+        desc.StructureByteStride = 0;
+
+        res = CreateBufferFromDX11Native(&desc, NULL, &m_pHistogramsDX11);
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+
+        desc.ByteWidth = (UINT)brightnessSize;
+        res = CreateBufferFromDX11Native(&desc, NULL, &m_pBrightnessDX11);
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+
+        desc.ByteWidth = (UINT)lutSize;
+        res = CreateBufferFromDX11Native(&desc, NULL, &m_pBufferLUTDX11);
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+
+        res = CreateBufferFromDX11Native(&desc, NULL, &m_pBufferLUTPrevDX11);
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+
+        D3D11_SUBRESOURCE_DATA InitData = { 0 };
+        InitData.pSysMem = pBufferLUTNone->GetNative();
+        res = CreateBufferFromDX11Native(&desc, &InitData, &m_pBufferLUTNoneDX11);
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+
+        res = ClearBuffer(m_pHistogramsDX11);
+        AMF_RETURN_IF_FAILED(res, L"ZeroBuffer() failed");
+    }
+    else
+    {
+        res = m_pContext->AllocBuffer(m_pDevice->GetMemoryType(), histogramSize, &m_pHistograms);
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+        res = m_pContext->AllocBuffer(m_pDevice->GetMemoryType(), brightnessSize, &m_pBrightness);
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+        AMF_MEMORY_TYPE memoryType = m_pDevice->GetMemoryType();
+        res = m_pContext->AllocBuffer(memoryType, lutSize, &m_pBufferLUT);
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+        res = m_pContext->AllocBuffer(memoryType, lutSize, &m_pBufferLUTPrev);
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+    
+        m_pBufferLUTNone = pBufferLUTNone;
+        m_pBufferLUTNone->Convert(m_pDevice->GetMemoryType());
+
+        amf_uint8 nullData = 0;
+        res = m_pDevice->FillBuffer(m_pHistograms, 0, m_pHistograms->GetSize(), &nullData, sizeof(nullData));
+        AMF_RETURN_IF_FAILED(res, L"ZeroBuffer() failed");
+    }
+#else
+    if (m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        m_bUseDX11NativeBuffer = true;
+        D3D11_BUFFER_DESC desc = {};
+        desc.ByteWidth = (UINT)histogramSize;
+        desc.Usage = D3D11_USAGE_DEFAULT;
+        desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS;
+        desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+        desc.MiscFlags = 0;
+        desc.StructureByteStride = 0;
+
+        res = CreateBufferFromDX11Native(&desc, NULL, &m_pHistogramsDX11);  //no cpu version for histogram creation
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+        res = ClearBuffer(m_pHistogramsDX11);
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+        res = m_pContext->AllocBuffer(AMF_MEMORY_HOST, histogramSize, &m_pHistograms);
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+        desc.ByteWidth = (UINT)lutSize;
+        D3D11_SUBRESOURCE_DATA InitData = { 0 };
+        InitData.pSysMem = pBufferLUTNone->GetNative();
+        res = CreateBufferFromDX11Native(&desc, &InitData, &m_pBufferLUTNoneDX11);
+        AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+    }
+    else
+    {
+        res = m_pContext->AllocBuffer(m_pDevice->GetMemoryType(), histogramSize, &m_pHistograms);
+        amf_uint8 nullData = 0;
+        res = m_pDevice->FillBuffer(m_pHistograms, 0, m_pHistograms->GetSize(), &nullData, sizeof(nullData));
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+        m_pBufferLUTNone = pBufferLUTNone;
+        m_pBufferLUTNone->Convert(m_pDevice->GetMemoryType());
+    }
+
+    AMF_MEMORY_TYPE memoryType = AMF_MEMORY_HOST;
+
+    res = m_pContext->AllocBuffer(memoryType, brightnessSize, &m_pBrightness);
+    AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+    res = m_pContext->AllocBuffer(memoryType, lutSize, &m_pBufferLUT);
+    AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+    res = m_pContext->AllocBuffer(memoryType, lutSize, &m_pBufferLUTPrev);
+    AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+#endif
+
+    res = m_pContext->AllocBuffer(AMF_MEMORY_HOST, sizeof(HistogramParameters) , &m_pParams);
+    AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+
+    memcpy(m_pParams->GetNative(), &params, m_pParams->GetSize());
+    res = m_pParams->Convert(m_pDevice->GetMemoryType());
+    AMF_RETURN_IF_FAILED(res, L"Convert() failed");
+
+    m_iFrameCount = 0;
+#if DUMP_HISTOGRAM
+    amf::AMFDataStream::OpenDataStream(L"HistogramData.csv", AMFSO_WRITE, AMFFS_EXCLUSIVE, &m_pAllFile);
+
+    m_pInputFiles.resize(count);
+    for(amf_int32 i = 0; i < count; i++)
+    {
+        wchar_t buf[256];
+        swprintf(buf, _countof(buf), L"HistogramInput%d.csv", i);
+        amf::AMFDataStream::OpenDataStream(buf, AMFSO_WRITE, AMFFS_EXCLUSIVE, &m_pInputFiles[i]);
+    }
+#endif
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL HistogramImpl::Terminate()
+{
+    m_pBufferLUT = NULL;
+    m_pBufferLUTPrev = NULL;
+    m_pCorners = NULL;
+    m_pShifts = NULL;
+    m_pParams = NULL;
+    m_pHistograms = NULL;
+    m_pBrightness = NULL;
+    m_pHistogramsDX11 = NULL;
+    m_pBrightnessDX11 = NULL;
+    m_pBufferLUTDX11 = NULL;
+    m_pBufferLUTPrevDX11 = NULL;
+    m_pShiftsDX11 = NULL;
+
+    m_pKernelHistogram = NULL;
+    m_pKernelColor = NULL;
+    m_pKernelNV12toRGB = NULL;
+    m_pKernelBuildLUT = NULL;
+    m_pKernelBuildLUTCenter = NULL;
+    m_pKernelBuildShifts = NULL;
+    m_pDevice = NULL;
+    m_pContext = NULL;
+#if DUMP_HISTOGRAM
+    m_pAllFile = NULL; 
+    m_pInputFiles.clear(); 
+#endif
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL HistogramImpl::Build(amf_int32 channel, AMFSurface* pSrcSurface, AMFRect border, AMFSurface* pBorderMap)
+{
+    AMF_RESULT res = AMF_OK;
+    // convert to OpenCL /MCL
+    AMF_MEMORY_TYPE oldType = pSrcSurface->GetMemoryType();
+    res = pSrcSurface->Convert(m_pDevice->GetMemoryType());
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_OPENCL) failed");
+
+    res = pBorderMap->Convert(m_pDevice->GetMemoryType());
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_OPENCL) failed");
+
+    // run kernal
+    AMFPlanePtr planeY = pSrcSurface->GetPlane(AMF_PLANE_Y);
+    AMFPlanePtr planeUV = pSrcSurface->GetPlane(AMF_PLANE_UV);
+    AMFPlanePtr planeMap = pBorderMap->GetPlaneAt(0);
+
+    if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        DXGI_FORMAT format = DXGI_FORMAT_R8_UINT;
+        UINT size = sizeof(format);
+        ((ID3D11Texture2D*)planeY->GetNative())->SetPrivateData(AMFStructuredBufferFormatGUID, size, &format);
+    }
+
+    amf_size index = 0;
+    if (m_bUseDX11NativeBuffer)
+    {
+        DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_UINT;
+        AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgBufferNative(index++, m_pHistogramsDX11, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pHistogramsDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+    }
+    else
+    {
+        AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgBuffer(index++, m_pHistograms, AMF_ARGUMENT_ACCESS_WRITE));
+    }
+
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgPlane(index++, planeY, AMF_ARGUMENT_ACCESS_READ));
+
+    if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        DXGI_FORMAT format = DXGI_FORMAT_R8_UINT;
+        UINT size = sizeof(format);
+        ((ID3D11Texture2D*)planeUV->GetNative())->SetPrivateData(AMFStructuredBufferFormatGUID, size, &format);
+    }
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgPlane(index++, planeUV, AMF_ARGUMENT_ACCESS_READ));
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgPlane(index++, planeMap, AMF_ARGUMENT_ACCESS_READ));
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgBuffer(index++, m_pParams, AMF_ARGUMENT_ACCESS_READ));
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->SetArgInt32(index++, channel));
+
+    amf_size sizeLocal[3] = {8, 8, 1};
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->GetCompileWorkgroupSize(sizeLocal));
+
+    amf_size sizeGlobal[3] = {0, 0, 1};
+    sizeGlobal[0] = AlignValue(planeY->GetWidth() / 2, static_cast<amf_uint32>(sizeLocal[0]));
+    sizeGlobal[1] = AlignValue(planeY->GetHeight() / 2, static_cast<amf_uint32>(sizeLocal[1]));
+    amf_size offset[3] = {0, 0, 0};
+
+    AMF_RETURN_IF_FAILED(m_pKernelHistogram->Enqueue(2, offset, sizeGlobal, sizeLocal));
+    AMF_RETURN_IF_FAILED(m_pDevice->FlushQueue());
+    // draw border on surface
+#if DRAW_AREAS
+//    if(channel == 0 )
+    {
+        index = 0;
+        AMF_RETURN_IF_FAILED(m_pKernelColor->SetArgPlane(index++, planeY, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelColor->SetArgPlane(index++, planeUV, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelColor->SetArgPlane(index++, planeMap, AMF_ARGUMENT_ACCESS_READ));
+
+        AMF_RETURN_IF_FAILED(m_pKernelColor->Enqueue(2, offset, sizeGlobal, sizeLocal));
+        AMF_RETURN_IF_FAILED(m_pDevice->FlushQueue());
+    }
+#endif    
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL HistogramImpl::Convert(bool bColorBalance, amf_int32 channel, AMFSurface* pSrcSurface, float *borders, bool sRGB, AMFSurface* pDstSurface)
+{
+    AMF_RESULT res = AMF_OK;
+
+    // convert to OpenCL
+    AMF_MEMORY_TYPE oldTypeSrc = pSrcSurface->GetMemoryType();
+    AMF_MEMORY_TYPE oldTypeDst = pDstSurface->GetMemoryType();
+    res = pSrcSurface->Convert(m_pDevice->GetMemoryType());
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_OPENCL) failed");
+    res = pDstSurface->Convert(m_pDevice->GetMemoryType());
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_OPENCL) failed");
+   
+    // run kernal
+    AMFPlanePtr planeY = pSrcSurface->GetPlane(AMF_PLANE_Y);
+    AMFPlanePtr planeUV = pSrcSurface->GetPlane(AMF_PLANE_UV);
+    AMFPlanePtr planeRGB = pDstSurface->GetPlane(AMF_PLANE_PACKED);
+
+    amf_size index = 0;
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgPlane(index++, planeRGB, AMF_ARGUMENT_ACCESS_WRITE));
+
+    if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        DXGI_FORMAT format = DXGI_FORMAT_R8_UINT;
+        UINT size = sizeof(format);
+        ((ID3D11Texture2D*)planeY->GetNative())->SetPrivateData(AMFStructuredBufferFormatGUID, size, &format);
+    }
+
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgPlane(index++, planeY, AMF_ARGUMENT_ACCESS_READ));
+    if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        DXGI_FORMAT format = DXGI_FORMAT_R8_UINT;
+        UINT size = sizeof(format);
+        ((ID3D11Texture2D*)planeUV->GetNative())->SetPrivateData(AMFStructuredBufferFormatGUID, size, &format);
+    }
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgPlane(index++, planeUV, AMF_ARGUMENT_ACCESS_READ));
+
+    if(bColorBalance)
+    {
+#if GPU_ACCELERATION
+        if (m_bUseDX11NativeBuffer)
+        {
+            DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_FLOAT;
+            AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgBufferNative(index++, m_pBufferLUTDX11, AMF_ARGUMENT_ACCESS_READ));
+            AMF_RETURN_IF_FAILED(m_pBufferLUTDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+        }
+        else
+        {
+            AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgBuffer(index++, m_pBufferLUT, AMF_ARGUMENT_ACCESS_READ));
+        }
+#else
+        //work around with the Direct Compute using CPU filled data buffer
+        if (m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+        {
+            HRESULT hr = S_OK;
+            ID3D11Device* pDevice = (ID3D11Device*)m_pDevice->GetNativeDeviceID();
+            D3D11_BUFFER_DESC desc = {};
+            desc.ByteWidth = (UINT)m_pBufferLUT->GetSize();
+            desc.Usage = D3D11_USAGE_DEFAULT;
+            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+            desc.MiscFlags = 0;
+            desc.StructureByteStride = 0;
+
+            m_pBufferLUT->Convert(AMF_MEMORY_HOST);
+            D3D11_SUBRESOURCE_DATA InitData = { 0 };
+            InitData.pSysMem = m_pBufferLUT->GetNative();
+
+            ID3D11BufferPtr pBufferLut;
+            res = CreateBufferFromDX11Native(&desc, &InitData, &pBufferLut);
+            AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+
+            DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_FLOAT;
+            AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgBufferNative(index++, pBufferLut, AMF_ARGUMENT_ACCESS_READ));
+            AMF_RETURN_IF_FAILED(pBufferLut->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+        }
+        else
+        {
+            AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgBuffer(index++, m_pBufferLUT, AMF_ARGUMENT_ACCESS_READ));
+        }
+#endif
+    }
+    else
+    {
+        if (m_bUseDX11NativeBuffer)
+        {
+            DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_FLOAT;
+            AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgBufferNative(index++, m_pBufferLUTNoneDX11, AMF_ARGUMENT_ACCESS_READ));
+            AMF_RETURN_IF_FAILED(m_pBufferLUTNoneDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+        }
+        else
+        {
+            AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgBuffer(index++, m_pBufferLUTNone, AMF_ARGUMENT_ACCESS_READ));
+        }
+    }
+
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgFloat(index++, (borders[0] - 0.5f) * 2.0f));
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgFloat(index++, (borders[1] - 0.5f) * 2.0f));
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgFloat(index++, (borders[2] - 0.5f) * 2.0f));
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgFloat(index++, (borders[3] - 0.5f) * 2.0f));
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgInt32(index++, channel));
+    amf_int32 linearRGB = sRGB ? 1 : 0;
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->SetArgInt32(index++, linearRGB));
+
+    amf_size sizeLocal[3] = {8, 8, 1};
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->GetCompileWorkgroupSize(sizeLocal));
+
+    amf_size sizeGlobal[3] = {0, 0, 1};
+    sizeGlobal[0] = AlignValue(planeY->GetWidth() / 2, static_cast<amf_uint32>(sizeLocal[0]));
+    sizeGlobal[1] = AlignValue(planeY->GetHeight() /2, static_cast<amf_uint32>(sizeLocal[1]));
+
+    amf_size offset[3] = {0, 0, 0};
+    AMF_RETURN_IF_FAILED(m_pKernelNV12toRGB->Enqueue(2, offset, sizeGlobal, sizeLocal));
+    AMF_RETURN_IF_FAILED(m_pDevice->FlushQueue());
+    // convert memory back
+    res = pDstSurface->Convert(oldTypeDst);
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_OPENCL) failed");
+    return AMF_OK;
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+void BuildOneLUT(amf_int32 col, float brightness, __global float *lut, __global float *prev, __global struct HistogramParameters *params, amf_int32 frameCount)
+{
+    for(amf_int32 k=0; k < HIST_SIZE; k++)
+    {
+        float lutCurr = brightness;
+        if(col == 0)
+        {
+            if(k < params->blackCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k < LUT_CURVE_TABLE_SIZE + params->blackCutOffY)
+            {
+                lutCurr *= 1.0f - params->lutCurveTable[k - params->blackCutOffY];
+            }
+            else if(k > params->whiteCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k >= params->whiteCutOffY - LUT_CURVE_TABLE_SIZE)
+            {
+                lutCurr *= params->lutCurveTable[k - (params->whiteCutOffY - LUT_CURVE_TABLE_SIZE) ];
+            }
+        }
+
+        lutCurr += (float)k /255.f;
+
+        if(prev != NULL)
+        {
+            float lutPrev = prev[k];
+            if(frameCount != 0 )
+            {
+                lutCurr = lutPrev + params->alphaLUT * ( lutCurr - lutPrev);
+            }
+            prev[k] = lutCurr;
+        }
+        lut[k] = lutCurr;
+   }
+}
+
+#define MY_SIGN(a) (a == 0 ? 0 : (a < 0 ? -1 : 1)  )
+//-------------------------------------------------------------------------------------------------
+void BuildShifts(
+    __global float  *pShifts,
+    __global amf_int32 *pHistogram,
+    __global int *pCorners,
+    __global int *pParams,
+    amf_int32 corners,
+    amf_int32 frameCount
+)
+{
+    __global struct HistogramParameters *params = (__global struct HistogramParameters *)pParams;
+    for(amf_int32 corner = 0; corner < corners; corner++)
+    {
+        __global struct Corner* it_corner = (__global struct Corner*)pCorners + corner;
+
+        for(amf_int32 col = 0; col < 3; col++)
+        {
+            for(amf_int32 side = 0; side < it_corner->count; side++)
+            {
+                __local float corrs[HIST_SIZE * 2];
+
+                for(amf_int32 i = 0; i < HIST_SIZE *2; i++)
+                {
+                    corrs[i] = 0;
+                }
+                __global amf_int32* pHist[3];
+
+                for(amf_int32 i = 0; i < it_corner->count; i++)
+                {
+                    pHist[i] = pHistogram + it_corner->channel[i] * 4 * 3 * HIST_SIZE  + it_corner->corner[i] * HIST_SIZE * 3 +  col * HIST_SIZE;
+                }
+
+                int h1 = 0;
+                int h2 = 0;
+                if(it_corner->count == 3)
+                { 
+                    if(side == 0)
+                    {
+                        h1 = 0;
+                        h2 = 1;
+                    }
+                    else if(side == 1)
+                    {
+                        h1 = 1;
+                        h2 = 2;
+                    }
+                    else if(side == 2)
+                    {
+                        h1 = 2;
+                        h2 = 0;
+                    }
+                }
+                if(it_corner->count == 2)
+                {
+                    if(side == 0)
+                    { 
+                        h1 = 0;
+                        h2 = 1;
+                    }
+                    else 
+                    { 
+                        h1 = 1;
+                        h2 = 0;
+                    }
+                }
+
+                for(amf_int32 delay = 0; delay < params->maxDistanceBetweenPeaks[col] * 2; delay++)
+                {
+                    barrier  (CLK_LOCAL_MEM_FENCE);
+                    float shift =  OneCrossCorrelation(pHist[h1], pHist[h2], col, delay, params->maxDistanceBetweenPeaks[col], params);;
+                    float weight = 1.0f;
+                    corrs[delay] = shift * weight;
+                    barrier  (CLK_LOCAL_MEM_FENCE);
+                }
+                if(it_corner->index == 1)
+                {
+                    int a = 1;
+                }
+                float corrMax = -1.0e5f;
+                for(amf_int32 i = 0; i < params->maxDistanceBetweenPeaks[col] * 2; i++)
+                {
+                    if(corrMax < corrs[i])
+                    {
+                        corrMax = corrs[i];
+                        pShifts[corner * 3 * it_corner->count + col * it_corner->count + side] = (float)i - params->maxDistanceBetweenPeaks[col];
+                    }
+                }
+            }
+        }
+    }
+}
+
+//-------------------------------------------------------------------------------------------------
+static void BuildLUT(
+    __global float *pLUT,        ///< [out] histogram data  - 256 x 3 for RG, G and B
+    __global float *pLUTPrev,    ///< [in] histogram data  - 256 x 3 for RG, G and B
+    __global float *pBrightness,
+    __global float  *pShifts,
+    __global int *pCorners,
+    __global int *pParams,
+    amf_int32 corners,
+    amf_int32 frameCount
+)
+{
+    __global struct HistogramParameters *params = (__global struct HistogramParameters *)pParams;
+    for(amf_int32 corner = 0; corner < corners; corner++)
+    {
+        __global struct Corner* it_corner = (__global struct Corner*)pCorners + corner;
+
+        for(int col = 0; col < 3; col++)
+        {
+            float       brightness[3];
+            brightness[0] = 0;
+            brightness[1] = 0;
+            brightness[2] = 0;
+            int shiftOffset = corner * 3 * it_corner->count + col * it_corner->count;
+
+            if(it_corner->count == 2)
+            {
+                brightness[0] =  pShifts[shiftOffset + 0] / 2.0f;
+                brightness[1] =  pShifts[shiftOffset + 1] / 2.0f;
+            }
+            else if(it_corner->count == 3)
+            {
+
+                int shiftMaxIndex = 0;
+                int shiftMinIndex = HIST_SIZE *2;
+                float shiftMin = 10000.0f;
+                float shiftMax = 0.0f;
+
+
+                for(int side = 0; side < it_corner->count; side++)
+                {
+                    if(fabs(shiftMin) > fabs(pShifts[shiftOffset + side]))
+                    {
+                        shiftMin = pShifts[shiftOffset + side];
+                        shiftMinIndex = side;
+                    }
+                    if(fabs(shiftMax) < fabs(pShifts[shiftOffset + side]))
+                    {
+                        shiftMax = pShifts[shiftOffset + side];
+                        shiftMaxIndex = side;
+                    }
+                }
+                int shiftMinIndexSecond = 0;
+                for(int side = 0; side < it_corner->count; side++)
+                {
+                    if(side != shiftMinIndex && side != shiftMaxIndex)
+                    {
+                        shiftMinIndexSecond = side;
+                        break;
+                    }
+                }
+
+                shiftMin = pShifts[shiftOffset + shiftMinIndex];
+                float shiftMinSecond = pShifts[shiftOffset + shiftMinIndexSecond];
+
+                if(shiftMinIndex == 0 )
+                {
+                    brightness[0] =  shiftMin/ 2.0f;
+                    brightness[1] =  - shiftMin / 2.0f;
+
+                    if(shiftMinIndexSecond == 1)
+                    {
+                        brightness[2] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                        brightness[0] += shiftMinSecond / 3.0f;
+                        brightness[1] += shiftMinSecond / 3.0f;
+                    }
+                    else
+                    {
+                        brightness[2] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                        brightness[0] -= shiftMinSecond / 3.0f;
+                        brightness[1] -= shiftMinSecond / 3.0f;
+                    }
+
+                }
+                else  if(shiftMinIndex == 1 )
+                {
+                    brightness[1] =  shiftMin/ 2.0f;
+                    brightness[2] =  -shiftMin / 2.0f;
+
+                    if(shiftMinIndexSecond == 0)
+                    {
+                        brightness[0] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                        brightness[1] -=  shiftMinSecond / 3.0f;
+                        brightness[2] -=  shiftMinSecond / 3.0f;
+                    }
+                    else
+                    {
+                        brightness[0] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                        brightness[1] +=  shiftMinSecond / 3.0f;
+                        brightness[2] +=  shiftMinSecond / 3.0f;
+                    }
+                }
+                else if(shiftMinIndex ==  2)
+                {
+                    brightness[2] =  shiftMin/ 2.0f;
+                    brightness[0] =  - shiftMin / 2.0f;
+
+                    if(shiftMinIndexSecond == 0)
+                    {
+                        brightness[1] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                        brightness[2] +=  shiftMinSecond / 3.0f;
+                        brightness[0] +=  shiftMinSecond / 3.0f;
+                    }
+                    else // 1
+                    {
+                        brightness[1] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                        brightness[2] -=  shiftMinSecond / 3.0f;
+                        brightness[0] -=  shiftMinSecond / 3.0f;
+                    }
+                }
+            }
+
+            for(amf_int32 i = 0; i < it_corner->count; i++)
+            { 
+                __global float *lut  = pLUT + it_corner->channel[i] * 3 *5 * HIST_SIZE + it_corner->corner[i] * 3* HIST_SIZE + col * HIST_SIZE;
+                __global float *lutPrev = pLUTPrev + it_corner->channel[i] * 3 *5 * HIST_SIZE + it_corner->corner[i] * 3* HIST_SIZE + col * HIST_SIZE;
+                BuildOneLUT( col, brightness[i] / 255.f,  lut, lutPrev, params, frameCount);
+                pBrightness[it_corner->channel[i] * 4 *3 + it_corner->corner[i] *3 + col]  = brightness[i];
+            }
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+static void BuildLUTCenter(
+    __global float *pLUT,        ///< [out] histogram data  - 256 x 3 for RG, G and B
+    __global float *pLUTPrev,    ///< [in] histogram data  - 256 x 3 for RG, G and B
+    __global float *pBrightness,
+    __global int *pParams,
+    amf_int32 channels,
+    amf_int32 frameCount
+)
+{
+    __global struct HistogramParameters *params = (__global struct HistogramParameters *)pParams;
+    for(amf_int32 channel = 0; channel < channels; channel++)
+    {
+        for(amf_int32 col = 0; col < 3; col++)
+        {
+            float brightnessCenter = 0;
+            for( amf_int32 side = 0; side < 4; side++)
+            {
+                brightnessCenter +=  pBrightness[channel * 4 * 3 + side *3 + col];
+            }
+            brightnessCenter/=4.0f;
+
+            __global float *lutCenter  = pLUT + channel * 3 *5 * HIST_SIZE + 4 * 3* HIST_SIZE + col * HIST_SIZE;
+            __global float *lutPrevCenter = pLUTPrev + channel * 3 *5 * HIST_SIZE + 4 * 3* HIST_SIZE + col * HIST_SIZE;
+            BuildOneLUT( col, brightnessCenter / 255.f,  lutCenter, lutPrevCenter, params, frameCount);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+static amf_int32 CrossCorrelation(amf_int32 *data1, amf_int32 *data2, amf_int32 maxdelay)
+{
+    double x[HIST_SIZE];
+    double y[HIST_SIZE];
+
+    for(amf_int32 i = 0; i < HIST_SIZE; i++)
+    {
+        x[i]  = (double)data1[i];
+        y[i]  = (double)data2[i];
+    }
+
+   double sx,sy,sxy,denom;
+
+   /* Calculate the mean of the two series x[], y[] */
+   double mx = 0;
+   double my = 0;   
+   for (amf_int32 i=0 ; i < HIST_SIZE; i++) 
+   {
+      mx += x[i];
+      my += y[i];
+   }
+   mx /= HIST_SIZE;
+   my /= HIST_SIZE;
+
+   /* Calculate the denominator */
+   sx = 0;
+   sy = 0;
+   for (amf_int32 i=0; i < HIST_SIZE; i++) 
+   {
+      sx += (x[i] - mx) * (x[i] - mx);
+      sy += (y[i] - my) * (y[i] - my);
+   }
+   denom = sqrt(sx*sy);
+
+   /* Calculate the correlation series */
+   double rMax = 0;
+   amf_int32 delayMax = 0;
+   for (amf_int32 delay=-maxdelay; delay < maxdelay; delay++) 
+   {
+      sxy = 0;
+      for (int i=0;i<HIST_SIZE;i++) 
+      {
+         int j = i + delay;
+         if (j < 0 || j >= HIST_SIZE)
+         {
+             continue;
+         }
+         else
+         {
+             sxy += (x[i] - mx) * (y[j] - my);
+         }
+      }
+      double r = sxy / denom;
+      
+      /* r is the correlation coefficient at "delay" */
+      if(r > rMax)
+      {
+          rMax = r; 
+          delayMax = delay;
+      }
+   }
+   return delayMax;
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+#if DUMP_HISTOGRAM
+static AMF_RESULT WriteHistogramInt(AMFDataStream* file, amf_int32 *data, amf_int32 count)
+{
+   if(file != NULL)
+   {
+       char buf[100];
+       for(amf_int32 k=0; k < count; k++)
+       {
+           int pos = sprintf(buf, "%d", (int)data[k]);
+           if(k + 1 != count)
+           {
+               pos += sprintf(buf + pos, ",");
+           }
+           else
+           {
+               pos += sprintf(buf + pos, "\n");
+           }
+           file->Write(buf, pos, NULL);
+       }
+   }
+    return AMF_OK;
+}
+static AMF_RESULT WriteHistogramFloat(AMFDataStream* file, amf_int32 *data, amf_int32 count)
+{
+   if(file != NULL)
+   {
+       char buf[100];
+       for(amf_int32 k=0; k < count; k++)
+       {
+           int pos = sprintf(buf, "%f", ((float*)data)[k]);
+           if(k + 1 != count)
+           {
+               pos += sprintf(buf + pos, ",");
+           }
+           else
+           {
+               pos += sprintf(buf + pos, "\n");
+           }
+           file->Write(buf, pos, NULL);
+       }
+   }
+    return AMF_OK;
+}
+#endif
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL HistogramImpl::Adjust(amf_int32 count, RibList   &ribs, CornerList &corners, float *correction)
+{
+    AMF_RESULT res = AMF_OK;
+
+    if(corners.size() == 0 )
+    {
+        return AMF_OK;
+    }
+
+    if(m_pCorners == NULL)
+    {
+
+        if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+        {
+            res = m_pContext->AllocBuffer(AMF_MEMORY_HOST, MAX_CORNERS * sizeof(Corner) , &m_pCorners);
+        }
+        else
+        {
+            res = m_pContext->AllocBuffer(AMF_MEMORY_HOST, corners.size() * sizeof(Corner) , &m_pCorners);
+        }
+        AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+        Corner * corner = (Corner *)m_pCorners->GetNative();
+        for(CornerList::iterator it_corner = corners.begin(); it_corner != corners.end(); it_corner++)
+        {
+            *corner++ = *it_corner;
+        }
+#if GPU_ACCELERATION
+        res = m_pCorners->Convert(m_pDevice->GetMemoryType());
+        AMF_RETURN_IF_FAILED(res, L"Convert() failed");
+#endif
+    }
+    if ((m_pShifts == NULL) || (m_pShiftsDX11 == NULL))
+    {
+#if GPU_ACCELERATION
+        if (m_bUseDX11NativeBuffer)
+        {
+            if (m_pShiftsDX11 == NULL)
+            {
+                D3D11_BUFFER_DESC desc = {};
+                desc.ByteWidth = (UINT)corners.size() * 3 * corners[0].count * sizeof(float);
+                desc.Usage = D3D11_USAGE_DEFAULT;
+                desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS;
+                desc.CPUAccessFlags = 0;
+                desc.MiscFlags = 0;
+                desc.StructureByteStride = 0;
+
+                res = CreateBufferFromDX11Native(&desc, NULL, &m_pShiftsDX11);
+                AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+            }
+        }
+        else
+        {
+            res = m_pContext->AllocBuffer(m_pDevice->GetMemoryType(), corners.size() * 3 * corners[0].count * sizeof(float), &m_pShifts);
+            AMF_RETURN_IF_FAILED(res, L"AllocBuffer() failed");
+        }
+#else
+        amf_int32 len = (UINT)corners.size() * 3 * corners[0].count * sizeof(float);
+        res = m_pContext->AllocBuffer(AMF_MEMORY_HOST, len, &m_pShifts);
+#endif
+    }
+#if DUMP_HISTOGRAM
+    if(m_iFrameCount == 0 && m_pAllFile != NULL)
+    {
+        AMFDataPtr pData;
+        m_pHistograms->Duplicate(AMF_MEMORY_HOST, &pData);
+        AMFBufferPtr pHist(pData);
+        amf_int32* data = (amf_int32*)pHist->GetNative();
+
+        for(CornerList::iterator it_corner = corners.begin(); it_corner != corners.end(); it_corner++)
+        {
+            for( amf_int32 col = 0; col < 3; col ++)
+            {
+                
+                char buf[1000];
+
+                int pos = sprintf(buf, "index=,%d,col=,%d,",it_corner->index, col);
+
+                for(amf_int32  i = 0; i < it_corner->count; i++)
+                {
+                    pos += sprintf(buf + pos, "channel%d=,%d,", i, it_corner->channel[i]);
+                }
+                for(amf_int32  i = 0; i < it_corner->count; i++)
+                {
+                    pos += sprintf(buf + pos, "corner%d=,%d,", i, it_corner->corner[i]);
+                }
+                pos += sprintf(buf + pos, "\n");
+
+                m_pAllFile->Write(buf, pos, NULL);
+
+                for(amf_int32  i = 0; i < it_corner->count; i++)
+                {
+                    WriteHistogramInt(m_pAllFile, data + it_corner->channel[i] * 4 * 3 * HIST_SIZE  + it_corner->corner[i] * HIST_SIZE * 3 +  col * HIST_SIZE, HIST_SIZE);
+                }
+            }
+        }
+    }
+#endif
+#if GPU_ACCELERATION
+    amf_size index = 0;
+    amf_size sizeLocal[3] = {8, 8, 1};
+    amf_size sizeGlobal[3] = {0, 0, 1};
+    amf_size offset[3] = {0, 0, 0};
+
+    if (m_bUseDX11NativeBuffer)
+    {
+        DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_FLOAT;
+        AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgBufferNative(index++, m_pShiftsDX11, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pShiftsDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+
+        formatDX11 = DXGI_FORMAT_R32_UINT;
+        AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgBufferNative(index++, m_pHistogramsDX11, AMF_ARGUMENT_ACCESS_READ));
+        AMF_RETURN_IF_FAILED(m_pHistogramsDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+    }
+    else
+    {
+        AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgBuffer(index++, m_pShifts, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgBuffer(index++, m_pHistograms, AMF_ARGUMENT_ACCESS_READ));
+    }
+
+    AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgBuffer(index++, m_pCorners, AMF_ARGUMENT_ACCESS_READ));
+    AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgBuffer(index++, m_pParams, AMF_ARGUMENT_ACCESS_READ));  
+    AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgInt32(index++,  (amf_int32)corners.size()));
+    AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->SetArgInt32(index++,  (amf_int32)m_iFrameCount));
+
+    amf_int32 maxDist = 0;
+    for(int i = 0; i < 3; i++)
+    {
+        if(maxDist < params.maxDistanceBetweenPeaks[i])
+        {
+            maxDist = params.maxDistanceBetweenPeaks[i];
+        }
+    }
+
+    AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->GetCompileWorkgroupSize(sizeLocal));
+    sizeGlobal[0] = AlignValue(maxDist * 2, static_cast<amf_uint32>(sizeLocal[0]));                     // by delay
+    sizeGlobal[1] = AlignValue((amf_int32)corners.size() * _countof(corners[0].channel), static_cast<amf_uint32>(sizeLocal[1]));   // corners x 3 sides
+    sizeGlobal[2] = AlignValue(3, static_cast<amf_uint32>(sizeLocal[2]));                               // by color
+
+    AMF_RETURN_IF_FAILED(m_pKernelBuildShifts->Enqueue(3, offset, sizeGlobal, sizeLocal));
+
+    index = 0;
+    if (m_bUseDX11NativeBuffer)
+    {
+        DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_FLOAT;
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBufferNative(index++, m_pBufferLUTDX11, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pBufferLUTDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBufferNative(index++, m_pBufferLUTPrevDX11, AMF_ARGUMENT_ACCESS_READWRITE));
+        AMF_RETURN_IF_FAILED(m_pBufferLUTPrevDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBufferNative(index++, m_pBrightnessDX11, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pBrightnessDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBufferNative(index++, m_pShiftsDX11, AMF_ARGUMENT_ACCESS_READ));
+        AMF_RETURN_IF_FAILED(m_pShiftsDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+    }
+    else
+    {
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBuffer(index++, m_pBufferLUT, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBuffer(index++, m_pBufferLUTPrev, AMF_ARGUMENT_ACCESS_READWRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBuffer(index++, m_pBrightness, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBuffer(index++, m_pShifts, AMF_ARGUMENT_ACCESS_READ));
+    }
+
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBuffer(index++, m_pCorners, AMF_ARGUMENT_ACCESS_READ));
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgBuffer(index++, m_pParams, AMF_ARGUMENT_ACCESS_READ));  
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgInt32(index++,  (amf_int32)corners.size()));
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->SetArgInt32(index++,  (amf_int32)m_iFrameCount));
+
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->GetCompileWorkgroupSize(sizeLocal));
+    sizeGlobal[0] = AlignValue((amf_int32)corners.size(), static_cast<amf_uint32>(sizeLocal[0]));   //by  corner
+    sizeGlobal[1] = AlignValue(4, static_cast<amf_uint32>(sizeLocal[1]));                           // by side + center
+    sizeGlobal[2] = AlignValue(3, static_cast<amf_uint32>(sizeLocal[2]));                           // by color
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUT->Enqueue(3, offset, sizeGlobal, sizeLocal));
+
+    index = 0;
+    if (m_bUseDX11NativeBuffer)
+    {
+        DXGI_FORMAT formatDX11 = DXGI_FORMAT_R32_FLOAT;
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBufferNative(index++, m_pBufferLUTDX11, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pBufferLUTDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBufferNative(index++, m_pBufferLUTPrevDX11, AMF_ARGUMENT_ACCESS_READWRITE));
+        AMF_RETURN_IF_FAILED(m_pBufferLUTPrevDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBufferNative(index++, m_pBrightnessDX11, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pBrightnessDX11->SetPrivateData(AMFStructuredBufferFormatGUID, sizeof(DXGI_FORMAT), &formatDX11));
+    }
+    else
+    {
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBuffer(index++, m_pBufferLUT, AMF_ARGUMENT_ACCESS_WRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBuffer(index++, m_pBufferLUTPrev, AMF_ARGUMENT_ACCESS_READWRITE));
+        AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBuffer(index++, m_pBrightness, AMF_ARGUMENT_ACCESS_WRITE));
+    }
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgBuffer(index++, m_pParams, AMF_ARGUMENT_ACCESS_READ));
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgInt32(index++, (amf_int32)count));
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->SetArgInt32(index++,  (amf_int32)m_iFrameCount));
+
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->GetCompileWorkgroupSize(sizeLocal));
+    sizeGlobal[0] = AlignValue((amf_int32)count, static_cast<amf_uint32>(sizeLocal[0]));   //by  corner
+    sizeGlobal[1] = AlignValue(3, static_cast<amf_uint32>(sizeLocal[1]));                           // by color
+    AMF_RETURN_IF_FAILED(m_pKernelBuildLUTCenter->Enqueue(2, offset, sizeGlobal, sizeLocal));
+
+    if (m_bUseDX11NativeBuffer)
+    {
+        res = ClearBuffer(m_pHistogramsDX11);
+    }
+    else
+    {
+        amf_uint8 nullData = 0;
+        res = m_pDevice->FillBuffer(m_pHistograms, 0, m_pHistograms->GetSize(), &nullData, sizeof(nullData));
+    }
+
+    AMF_RETURN_IF_FAILED(res, L"ZeroBuffer() failed");
+
+    AMF_RETURN_IF_FAILED(m_pDevice->FlushQueue());
+
+#else // #if GPU_ACCELERATION
+    if (m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        res = CopyBuffer(m_pHistograms, m_pHistogramsDX11);
+        AMF_RETURN_IF_FAILED(res, L"CopyBuffer() failed");
+    }
+
+    AMFDataPtr pData;
+    res = m_pHistograms->Duplicate(AMF_MEMORY_HOST, &pData);
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_HOST) failed");
+    AMFBufferPtr pHistograms(pData);
+    AMFDataPtr pDataPrev;
+
+    AMFDataPtr pDataShifts;
+    res = m_pShifts->Duplicate(AMF_MEMORY_HOST, &pDataShifts);
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_HOST) failed");
+    AMFBufferPtr pDataShiftsHost(pDataShifts);
+
+    AMFDataPtr pBrightnessData;
+    res = m_pBrightness->Duplicate(AMF_MEMORY_HOST, &pBrightnessData);
+    AMF_RETURN_IF_FAILED(res, L"Convert(AMF_MEMORY_HOST) failed");
+    AMFBufferPtr pBrightnessHost(pBrightnessData);
+    
+    
+
+    amf_int32  *pOutHist = (amf_int32*)pHistograms->GetNative();
+    float      *pShifts = (float *)pDataShiftsHost->GetNative();
+    float      *pBrightness = (float *)pBrightnessHost->GetNative();
+    
+
+    m_pBufferLUT->Convert(AMF_MEMORY_HOST);
+    m_pBufferLUTPrev->Convert(AMF_MEMORY_HOST);
+
+    float* pLUT = (float*)m_pBufferLUT->GetNative();
+    float* pLUTPrev = (float*)m_pBufferLUTPrev->GetNative();
+
+    BuildShifts(pShifts,pOutHist, (amf_int32 *)m_pCorners->GetNative(), (amf_int32 *)&params, (amf_int32)corners.size(), (amf_int32)m_iFrameCount);
+    BuildLUT(pLUT, pLUTPrev, pBrightness, pShifts, (amf_int32 *)m_pCorners->GetNative(), (amf_int32 *)&params, (amf_int32)corners.size(), (amf_int32)m_iFrameCount);
+    BuildLUTCenter(pLUT,pLUTPrev, pBrightness, (amf_int32 *)&params, count, (amf_int32)m_iFrameCount);
+
+    m_pBufferLUT->Convert(m_pDevice->GetMemoryType());
+
+#if DUMP_HISTOGRAM
+//    m_pAllFile = NULL;
+    m_pInputFiles.clear();
+#endif
+    if(m_pDevice->GetMemoryType() == AMF_MEMORY_DX11)
+    {
+        res = ClearBuffer(m_pHistogramsDX11);
+    }
+    else
+    {
+        amf_uint8 pattern = 0;
+        res = m_pDevice->FillBuffer(m_pHistograms, 0, m_pHistograms->GetSize(), &pattern, sizeof(pattern));
+    }
+    AMF_RETURN_IF_FAILED(res, L"ZeroBuffer() failed");
+    AMF_RETURN_IF_FAILED(m_pDevice->FlushQueue());
+
+#endif // #if GPU_ACCELERATION
+    m_iFrameCount++;
+    return AMF_OK;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+static float OneCrossCorrelation(
+    __global amf_int32 *data1,    // [in]
+    __global amf_int32 *data2,    // [in]
+    amf_int32 col,
+    amf_int32 delay,
+    amf_int32 maxdelay,
+    __global HistogramParameters *params
+    )
+{
+    float r = 0;
+    float x[HIST_SIZE];
+    float y[HIST_SIZE];
+
+    for(amf_int32 i = 0; i < HIST_SIZE; i++)
+    {
+        if(i > params->blackCutOffY || i < params->whiteCutOffY)
+        {
+            x[i]  = (float)data1[i];
+            y[i]  = (float)data2[i];
+        }
+        else
+        {
+            x[i]  = 0;
+            y[i]  = 0;
+        }
+    }
+
+    if(delay  - maxdelay < maxdelay)
+    {
+        // Calculate the mean of the two series x[], y[]
+        float mx = 0;
+        float my = 0;   
+        for (amf_int32 i=0 ; i < HIST_SIZE; i++) 
+        {
+            mx += x[i];
+            my += y[i];
+        }
+        mx /= HIST_SIZE;
+        my /= HIST_SIZE;
+        for (amf_int32 i=0; i < HIST_SIZE; i++) 
+        {
+            x[i] -= mx;
+            y[i] -= my;
+        }
+        // Calculate the denominator
+        float sx = 0;
+        float sy = 0;
+        for (amf_int32 i = 0; i < HIST_SIZE; i++) 
+        {
+            sx += x[i] * x[i];
+            sy += y[i] * y[i];
+        }
+        float denom = sqrt(sx*sy);
+
+        // Calculate the correlation
+        float sxy = 0;
+        for (int i = 0; i < HIST_SIZE; i++) 
+        {
+            int j = i + delay  - maxdelay;
+            
+            if (j < 0 || j >= HIST_SIZE)
+            {
+                continue;
+            }
+            else
+            {
+                sxy += x[i] * y[j];
+            }
+                
+        }
+        r = (float)(sxy / denom);
+    }
+    return r;
+}
+
+//-------------------------------------------------------------------------------------------------
+static void FilterDataInplace(amf_int32 *data,amf_int32 count)
+{
+    // first element is left as is
+    for(amf_int32 i = 1; i < count; i++)
+    {
+        data[i] = data[i-1] + amf_int32(0.3 * (data[i] - data[i-1]));
+    }
+}
+//-------------------------------------------------------------------------------------------------
+static void FilterData(amf_int32 *data,amf_int32 *dataPrev,  amf_int32 count, amf_int32 frameCount)
+{
+    // first element is left as is
+    for(amf_int32 i = 0; i < count; i++)
+    {
+        if(frameCount != 0 )
+        {
+            data[i] = dataPrev[i] + amf_int32(0.3 * (data[i] - dataPrev[i]));
+        }
+        dataPrev[i] = data[i];
+    }
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT HistogramImpl::CreateBufferFromDX11Native(
+    const D3D11_BUFFER_DESC* pDesc,
+    D3D11_SUBRESOURCE_DATA* pInitData,
+    ID3D11Buffer** ppBuffer)
+{
+    ID3D11Device* pDevice = (ID3D11Device*)m_pDevice->GetNativeDeviceID();
+    HRESULT hr = pDevice->CreateBuffer(pDesc, pInitData, ppBuffer);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"CreateBuffer() failed");
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT HistogramImpl::CreateBufferFromDX11Native(
+    const D3D11_BUFFER_DESC* pDesc,
+    D3D11_SUBRESOURCE_DATA* pInitData,
+    amf_uint64 format,
+    AMFBuffer** ppBuffer)
+{
+//this code will be enabled once the context.h is updated.
+#if 0
+    ID3D11Device* pDevice = (ID3D11Device*)m_pDevice->GetNativeDeviceID();
+    ATL::CComPtr<ID3D11Buffer> pBuffer;
+    HRESULT hr = pDevice->CreateBuffer(pDesc, NULL, &pBuffer);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"CreateBuffer() failed");
+    AMF_RESULT res = AMFContextExPtr(m_pContext)->CreateBufferFromDX11Native(pBuffer, ppBuffer, NULL);
+    AMF_RETURN_IF_FAILED(res, L"CreateBufferFromDX11Native() failed");
+    (*ppBuffer)->SetProperty(AMF_STRUCTURED_BUFFER_FORMAT, format);
+#endif
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT HistogramImpl::ClearBuffer(ID3D11BufferPtr pBuffer)
+{
+    //init unit Histo
+    D3D11_BUFFER_DESC desc = { 0 };
+    pBuffer->GetDesc(&desc);
+
+    ID3D11Device* pDevice = (ID3D11Device*)m_pDevice->GetNativeDeviceID();
+    ATL::CComPtr<ID3D11DeviceContext> pContext;
+    pDevice->GetImmediateContext(&pContext);
+    D3D11_MAPPED_SUBRESOURCE mapped;
+    HRESULT hr = pContext->Map(pBuffer, 0, D3D11_MAP_WRITE, 0, &mapped);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"pContext->Map() failed");
+    amf_int8* data = (amf_int8*)mapped.pData;
+    memset(data, 0x00, desc.ByteWidth);
+    pContext->Unmap(pBuffer, 0);
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT HistogramImpl::CopyBuffer(AMFBufferPtr pDst, ID3D11BufferPtr pSrc)
+{
+    AMF_RETURN_IF_FALSE(pSrc && pDst, AMF_INVALID_POINTER);
+
+    //init unit Histo
+    D3D11_BUFFER_DESC desc = { 0 };
+    pSrc->GetDesc(&desc);
+
+    ID3D11Device* pDevice = (ID3D11Device*)m_pDevice->GetNativeDeviceID();
+    ATL::CComPtr<ID3D11DeviceContext> pContext;
+    pDevice->GetImmediateContext(&pContext);
+    D3D11_MAPPED_SUBRESOURCE mapped;
+    HRESULT hr = pContext->Map(pSrc, 0, D3D11_MAP_READ, 0, &mapped);
+    ASSERT_RETURN_IF_HR_FAILED(hr, AMF_FAIL, L"pContext->Map() failed");
+    amf_int8* pDataSrc = (amf_int8*)mapped.pData;
+    amf_int8* pDataDst = (amf_int8*)pDst->GetNative();
+    memcpy(pDataDst, pDataSrc, desc.ByteWidth);
+    pContext->Unmap(pSrc, 0);
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+#include "Programs/Histogram.cl.h"

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/HistogramImpl.h Added

@@ -0,0 +1,144 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once
+#define _USE_MATH_DEFINES
+#include "public/include/core/Context.h"
+#include "public/include/core/Trace.h"
+#include "public/common/InterfaceImpl.h"
+
+#define DUMP_HISTOGRAM 0
+//#define DUMP_HISTOGRAM 1
+
+#define GPU_ACCELERATION 1
+//#define GPU_ACCELERATION 0
+
+#define DRAW_AREAS 0
+//#define DRAW_AREAS 1
+
+#if DUMP_HISTOGRAM
+#include "public/common/DataStream.h"
+#endif
+#include "public/include/components/Component.h"
+#include "public/common/AMFFactory.h"
+#include <atlbase.h>
+#include <d3d11.h>
+
+
+#define HIST_SIZE   256
+namespace amf
+{
+
+#pragma pack(push, 1)
+struct Rib
+{
+    amf_int32 channel1;
+    amf_int32 side1;        // 0 - left, 1, top, 2 - right, 3 - bottom
+    amf_int32 channel2;
+    amf_int32 side2;        // 0 - left, 1, top, 2 - right, 3 - bottom
+    amf_int32 index;
+};
+#pragma pack(pop)
+
+#pragma pack(push, 1)
+struct Corner
+{
+    amf_int32 count;
+	amf_int32 align1[3];
+    amf_int32 channel[4];
+    amf_int32 corner[4];    // 0 - lt, 1 - rt, 2 - rb, 3 - lb
+    amf_int32 index;
+    float     pos[3];
+};
+
+#pragma pack(pop)
+
+typedef std::vector<Rib> RibList;
+typedef std::vector<Corner> CornerList;
+
+typedef ATL::CComPtr<ID3D11Buffer> ID3D11BufferPtr;
+
+class HistogramImpl : public AMFInterfaceImpl<AMFInterface>
+{
+public:
+    HistogramImpl();
+    virtual ~HistogramImpl();
+
+    AMF_RESULT AMF_STD_CALL Init(AMFCompute* pDevice, AMFContext* pContext, amf_int32 count);
+    AMF_RESULT AMF_STD_CALL Terminate();
+    AMF_RESULT AMF_STD_CALL Build(amf_int32 channel, AMFSurface* pSrcSurface, AMFRect border, AMFSurface* pBorderMap);
+    AMF_RESULT AMF_STD_CALL Adjust(amf_int32 count, RibList &ribs, CornerList &corners, float *correction);
+    AMF_RESULT AMF_STD_CALL Convert(bool bColorBalance, amf_int32 channel, AMFSurface* pSrcSurface, float *borders, bool sRGB, AMFSurface* pDstSurface);
+
+    static AMF_RESULT AMF_STD_CALL CompileKernels(AMFCompute* pDevice, AMFComponentOptimizationCallback* pCallback);
+
+private:
+    AMF_RESULT CreateBufferFromDX11Native(const D3D11_BUFFER_DESC* pDesc, D3D11_SUBRESOURCE_DATA* PInitData, ID3D11Buffer** ppBuffer);
+    AMF_RESULT CreateBufferFromDX11Native(const D3D11_BUFFER_DESC* pDesc, D3D11_SUBRESOURCE_DATA* pInitData, amf_uint64 format, AMFBuffer** ppBuffer);
+    AMF_RESULT ClearBuffer(ID3D11BufferPtr pBuffer);
+    AMF_RESULT CopyBuffer(AMFBufferPtr pDst, ID3D11BufferPtr pSrc);
+
+    AMFContextPtr         m_pContext;
+    AMFComputePtr         m_pDevice;
+    AMFComputeKernelPtr   m_pKernelHistogram;
+    AMFComputeKernelPtr   m_pKernelColor;
+    AMFComputeKernelPtr   m_pKernelNV12toRGB;
+    AMFComputeKernelPtr   m_pKernelBuildLUT;
+    AMFComputeKernelPtr   m_pKernelBuildLUTCenter;
+    AMFComputeKernelPtr   m_pKernelBuildShifts;
+
+    amf_int      m_iFrameCount;
+    AMFBufferPtr m_pParams;
+    AMFBufferPtr m_pCorners;
+
+    AMFBufferPtr m_pHistograms;
+    AMFBufferPtr m_pBufferLUT;
+    AMFBufferPtr m_pBufferLUTPrev;
+    AMFBufferPtr m_pBufferLUTNone;
+    AMFBufferPtr m_pShifts;
+    AMFBufferPtr m_pBrightness;
+
+    //the following will not be needed once the context.h is updated.
+    ID3D11BufferPtr m_pHistogramsDX11;
+    ID3D11BufferPtr m_pBufferLUTDX11;
+    ID3D11BufferPtr m_pBufferLUTPrevDX11;
+    ID3D11BufferPtr m_pBufferLUTNoneDX11;
+    ID3D11BufferPtr m_pShiftsDX11;
+    ID3D11BufferPtr m_pBrightnessDX11;
+    bool            m_bUseDX11NativeBuffer;
+
+#if DUMP_HISTOGRAM
+    AMFDataStreamPtr              m_pAllFile;
+    std::vector<AMFDataStreamPtr> m_pInputFiles;
+#endif
+};
+typedef AMFInterfacePtr_T<HistogramImpl> HistogramImplPtr;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/Programs Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/Programs/Histogram.cl Added

@@ -0,0 +1,911 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma OPENCL EXTENSION cl_amd_media_ops : enable
+
+__constant sampler_t sampler = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP | CLK_FILTER_NEAREST; 
+
+#define amf_int32 int
+
+#define WGX 32
+#define WGY 8
+
+
+#define HIST_SIZE   256
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+#define LUT_CURVE_TABLE_SIZE    20
+
+#define XM_PI           3.141592654f
+#define XM_2PI          6.283185307f
+#define XM_1DIVPI       0.318309886f
+#define XM_1DIV2PI      0.159154943f
+#define XM_PIDIV2       1.570796327f
+#define XM_PIDIV4       0.785398163f
+
+
+//--------------------------------------------------------------------------------------------------------------------
+struct __attribute__ ((packed)) HistogramParameters
+{
+    amf_int32 maxDistanceBetweenPeaks[3];
+    amf_int32 whiteCutOffY;
+    amf_int32 blackCutOffY;
+    amf_int32 borderHistWidth; //TODO make image size - dependent
+    float   alphaLUT;
+    float lutCurveTable[LUT_CURVE_TABLE_SIZE]; // curve from 0 to 1
+};
+
+//--------------------------------------------------------------------------------------------------------------------
+struct __attribute__ ((packed)) Rib
+{
+    amf_int32 channel1;
+    amf_int32 side1;             // 0 - left, 1, top, 2 - right, 3 - bottom
+    amf_int32 channel2;
+    amf_int32 side2;                 // 0 - left, 1, top, 2 - right, 3 - bottom
+    amf_int32 index;
+};
+//--------------------------------------------------------------------------------------------------------------------
+struct __attribute__ ((packed)) Corner
+{
+    amf_int32 count;
+    amf_int32 align1[3];
+    amf_int32 channel[4];
+    amf_int32 corner[4];             // 0 - lt, 1 - rt, 2 - rb, 3 - lb
+    amf_int32 index;
+    float     pos[3];
+};
+//--------------------------------------------------------------------------------------------------------------------
+amf_int32 CrossCorrelation(__global amf_int32 *data1, __global amf_int32 *data2, amf_int32 maxdelay);
+static float OneCrossCorrelation(
+    __global amf_int32 *data1,    // [in]
+    __global amf_int32 *data2,    // [in]
+    amf_int32 col,
+    amf_int32 delay,
+    amf_int32 maxdelay,
+    __global struct HistogramParameters *params
+    );
+//--------------------------------------------------------------------------------------------------------------------
+static void BuildOneLUT(amf_int32 col, float brightness, __global float *lut, __global float *prev, __global struct HistogramParameters *params, amf_int32 frameCount);
+
+//--------------------------------------------------------------------------------------------------------------------
+uint4 rgb_to_yuv( uint4 rgb )
+{    
+    float4 yuv;
+    yuv.x = clamp((  46.742f  *rgb.x + 157.243f   *rgb.y +  15.874f  *rgb.z + LEVEL ) / DIV_VAL, 0.f, 255.f);
+    yuv.y = clamp(( (-25.765f)*rgb.x + ( -86.674f)*rgb.y + 112.439f  *rgb.z) / DIV_VAL + 128.5f, 0.f, 255.f);
+    yuv.z = clamp(( 112.439f  *rgb.x + (-102.129f)*rgb.y + (-10.310f)*rgb.z) / DIV_VAL + 128.5f, 0.f, 255.f);
+    yuv.w = rgb.w;
+    return convert_uint4(yuv);
+}
+//--------------------------------------------------------------------------------------------------------------------
+float4 srgb_to_linear(float4 C)
+{
+    C *= 1.0f / 255.0f;
+    C = C > 0.04045f ? pow( C * (1.0f / 1.055f) + 0.0521327f, 2.4f ) : C * (1.0f / 12.92f);
+    return 255.0f * C;
+}
+
+uint4 yuv_to_rgb( uint4 yuv , amf_int32 linear)
+{
+    float y = convert_float(yuv.x) - LEVEL;
+    float u = convert_float(yuv.y) - 128.f; 
+    float v = convert_float(yuv.z) - 128.f;
+
+    float4 rgbf;
+    rgbf.x = 1.1643828125f * y +   0.0f     * u +   1.7927421875f * v;
+    rgbf.y = 1.1643828125f * y -  0.21325f   * u -   0.53291015625f * v;
+    rgbf.z = 1.1643828125f * y + 2.11240234375f   * u +     0.0f   * v;
+    if(linear)
+    {
+        rgbf = srgb_to_linear(rgbf);
+    }
+
+    uint4 rgb;
+    rgb.x = clamp(rgbf.x, 0.f, 255.f);
+    rgb.y = clamp(rgbf.y, 0.f, 255.f);
+    rgb.z = clamp(rgbf.z, 0.f, 255.f);
+    rgb.w = yuv.w;
+
+    return convert_uint4(rgb);
+}
+
+__kernel __attribute__((reqd_work_group_size(WGX, WGY, 1)))
+void StitchHistogramMapNV12(
+    __global amf_int32 *pOutHist,        ///< [out] histogram data  - 256 x 3 for RG, G and B
+    __read_only image2d_t frameY,    ///< [in] current frame
+    __read_only image2d_t frameUV,    ///< [in] current frame
+    __read_only image2d_t map,    ///< [in] current frame
+    __global uint *pParams,            ///< [in]  HistogramParameters*
+    amf_int32 channel
+)
+{
+    int2 posUV = (int2)(get_global_id(0), get_global_id(1));
+    int2 posY = posUV * 2;
+
+    if(posY.x < get_image_width(frameY) && posY.y < get_image_height(frameY))
+    {
+        int2 posMap = posY / 8;
+        uchar mapData = read_imageui(map, sampler, posMap).x;
+        amf_int32 sideX = -1;
+        amf_int32 sideY = -1;
+        if(((mapData >> 0)  & 1) != 0)
+        {
+            sideX = 0;
+        } 
+        if(((mapData >> 1)  & 1) != 0)
+        {
+            sideX = 1;
+        }
+        if(((mapData >> 2)  & 1) != 0)
+        {
+            sideY = 2;
+        }
+        if(((mapData >> 3)  & 1) != 0)
+        {
+            sideY = 3;
+        }
+        
+        if (sideX >= 0 || sideY >= 0)
+        {
+            // 4 pixel from Y - 1 from UV
+            uint2 uv = read_imageui(frameUV, sampler, posUV).xy;
+
+            for(int i = 0; i< 4; i++)
+            {
+                uint y = read_imageui(frameY, sampler, (int2)(posY.x + (i%2), posY.y + (i/2)) ).x;
+                uint4 color = (uint4)( y, uv.x, uv.y , 0);
+
+                if(sideX >= 0)
+                {
+                    __global amf_int32 *pOutHistY = pOutHist + channel * 4 *3 * HIST_SIZE + sideX * HIST_SIZE *3 + 0 * HIST_SIZE;
+
+                    atomic_inc(pOutHistY + color.x);
+
+                    if(i == 0)
+                    {
+                        __global amf_int32 *pOutHistU = pOutHistY + HIST_SIZE;
+                        __global amf_int32 *pOutHistV = pOutHistU + HIST_SIZE;
+
+                        atomic_inc(pOutHistU + color.y);
+                        atomic_inc(pOutHistV + color.z);
+                    }
+                }
+                if(sideY >= 0)
+                {
+                   __global amf_int32 *pOutHistY = pOutHist + channel * 4 *3 * HIST_SIZE + sideY * HIST_SIZE *3 + 0 * HIST_SIZE;
+                    atomic_inc(pOutHistY + color.x);
+
+                    if(i == 0)
+                    {
+                        __global amf_int32 *pOutHistU = pOutHistY + HIST_SIZE;
+                        __global amf_int32 *pOutHistV = pOutHistU + HIST_SIZE;
+                        atomic_inc(pOutHistU + color.y);
+                        atomic_inc(pOutHistV + color.z);
+                    }
+                }            
+            }
+        }
+    }
+}
+
+#define ATAN_POINTS 1000
+//--------------------------------------------------------------------------------------------------------------------
+uint applyLUT(__global float *pLUT, amf_int32 col, float2 pos, uint color, float4 border)
+{
+    float colorf = convert_float(color);
+
+
+    float l = border.x;
+    float t = border.y;
+    float r = border.z;
+    float b = border.w;
+
+    float x = (pos.x - 0.5f) * 2.0f;
+    float y = (pos.y - 0.5f) * 2.0f;
+    
+    
+    if(x < 0.0f)
+    {
+        x /= fabs(l);
+    }
+    else
+    {
+        x /= fabs(r);
+    }
+    if(y < 0.0f)
+    {
+        y /= fabs(t);
+    }
+    else
+    {
+        y /= fabs(b);
+    }
+
+    float x_abs = fabs(x);
+    float y_abs = fabs(y);
+
+    int index1 = 0;
+    int index2 = 0;
+
+    float weight1 = 1.0f;
+
+    if(x != 0)
+    {
+        if(y_abs < x_abs)
+        {
+            float q = y_abs / x_abs;
+            weight1 = q / (1.0f + 0.28125f * q * q ); // fast atan() implementation
+        }
+        else
+        {
+            float q = x_abs / y_abs;
+            weight1 = (XM_PIDIV2 - q / (1.0f + 0.28125f * q * q )); // fast atan() implementation
+        }
+        weight1 /= XM_PIDIV2;
+    }
+    if(weight1 >= 0.5f)
+    {
+        weight1 = 1.0f - weight1;
+    }
+    weight1 = weight1 + 0.5f;
+
+    float weight2 = 1.0f - weight1;
+
+    if(x <= 0.0f && y <= 0.0f)
+    { //LeftTop
+        index1 = 0;
+        if(-x < -y)
+        {
+            index2 = 1;
+        }
+        else
+        {
+            index2 = 3;
+        }
+    }
+    
+    else if(x > 0.0f && y <= 0.0f)
+    { //RightTop
+        index1 = 1;
+        if(x < -y)
+        {
+            index2 = 0;
+        }
+        else
+        {
+            index2 = 2;
+        }
+    }
+    else if(x > 0.0f && y > 0.0f)
+    { // RightBottom
+        index1 = 2;
+        if(x < y)
+        {
+            index2 = 3;
+        }
+        else
+        {
+            index2 = 1;
+        }
+    }
+    else if(x <= 0.0f && y > 0.0f)
+    { // LeftBottom
+        index1 = 3;
+        if(-x < y)
+        {
+            index2 = 2;
+        }
+        else
+        {
+            index2 = 0;
+        }
+    }
+
+    int colIndex =  col * HIST_SIZE + color;
+    
+    int HistCol = HIST_SIZE * 3;
+
+    float lut1 =      pLUT[index1 * HistCol + colIndex];
+    float lut2 =      pLUT[index2 * HistCol + colIndex];
+    float lutCenter = pLUT[4      * HistCol + colIndex];
+   
+
+    float radius = sqrt(x * x + y * y) * 1.3f;
+    float weightColor = 1.0f - radius;
+    if(weightColor < 0.0f)
+    {
+        weightColor = 0.0f;
+    }
+
+    float ready;
+    if(weight1 + weight2  + weightColor== 0)
+    {
+        ready = (lut1 + lut2) / 2.0f;
+    }
+    else
+    {
+        ready = lutCenter * weightColor + ((lut1 * weight1 + lut2 * weight2) / (weight1 + weight2)) * (1.0f - weightColor);
+    }
+    ready *= 255.0f;
+    return convert_uint(clamp(ready, 0.f, 255.f));
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+__kernel __attribute__((reqd_work_group_size(WGX, WGY, 1)))
+void StitchConvertNV12ToRGB(
+    __write_only image2d_t frameRGB,    ///< [out] current frame
+    __read_only image2d_t frameY,    ///< [in] current frame
+    __read_only image2d_t frameUV,    ///< [in] current frame
+    __global float *pLUT,        ///< [in] histogram data  - 256 x 3 for RG, G and B
+    float borderL,
+    float borderT,
+    float borderR,
+    float borderB,
+    amf_int32 channel,
+    amf_int32 linear
+)
+{
+
+    int2 posUV = (int2)(get_global_id(0), get_global_id(1));
+    int2 posY = posUV * 2;
+
+    int imageWidth = get_image_width(frameY);
+    int imageHeight = get_image_height(frameY);
+
+    if(posY.x < imageWidth && posY.y < imageHeight)
+    {
+        uint2 uv = read_imageui(frameUV, sampler, posUV).xy;
+        // apply LUT
+        float4 border = (float4)( borderL, borderT, borderR, borderB);
+         __global float *pLUTChannel =  pLUT + channel * 5 *3 * HIST_SIZE;
+
+         for(int i = 0; i < 4; i++)
+         {
+            int2 pos = (int2)(posY.x + (i%2), posY.y + (i/2));
+            float2 posF = (float2)(convert_float(pos.x) / imageWidth , convert_float(pos.y) / imageHeight );
+
+            uint y = read_imageui(frameY, sampler, pos).x;
+
+            uint4 color = (uint4)( y, uv.x, uv.y , 0);
+            uint4 colorLUT;
+            colorLUT.x = applyLUT(pLUTChannel, 0,  posF, color.x, border);
+            if(i == 0)
+            {
+                colorLUT.y = applyLUT(pLUTChannel, 1,  posF, color.y, border);
+                colorLUT.z = applyLUT(pLUTChannel, 2,  posF, color.z, border);
+                colorLUT.w = 0;
+            }
+
+            uint4 colorOUT = yuv_to_rgb(colorLUT, linear);
+            write_imageui(frameRGB, pos , colorOUT);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+__kernel __attribute__((reqd_work_group_size(WGX, WGY, 1)))
+void WriteBorderRGB(
+    __write_only image2d_t frameY,    ///< [out] current frame
+    __write_only image2d_t frameUV,    ///< [out] current frame
+    __read_only image2d_t borderMap    ///< [in] current map
+)
+{
+
+    int2 posUV = (int2)(get_global_id(0), get_global_id(1));
+    int2 posY = posUV * 2;
+
+    if(posY.x < get_image_width(frameY) && posY.y < get_image_height(frameY))
+    {
+        int2 posMap = posY / 8;
+        uint map = read_imageui(borderMap, sampler, posMap).x;
+        if(map != 0 )
+        {
+            uint4 rgb =  (uint4)(0, 0, 0, 255);
+
+            if(((map >> 0) & 1) != 0)
+            {
+                rgb.x = 255;
+            } 
+            if(((map >> 1) & 1) != 0)
+            {
+                rgb.y = 255;
+            }
+            if(((map >> 2) & 1) != 0)
+            {
+                rgb.z = 255;
+            }
+            if(((map >> 3) & 1) != 0)
+            {
+                rgb.x = 128;
+                rgb.y = 128;
+            }
+            
+            uint4 yuv = rgb_to_yuv( rgb );
+
+            uint4 y = (uint4)(yuv.x,  0, 0, 0);
+            uint4 uv = (uint4)(yuv.y,  yuv.z, 0, 0);
+
+
+            write_imageui(frameY, (int2)(posY.x + 0, posY.y + 0 ), y);
+            write_imageui(frameY, (int2)(posY.x + 1, posY.y + 0 ), y);
+            write_imageui(frameY, (int2)(posY.x + 0, posY.y + 1 ), y);
+            write_imageui(frameY, (int2)(posY.x + 1, posY.y + 1 ), y);
+            write_imageui(frameUV, posUV, uv);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+__kernel __attribute__((reqd_work_group_size(256, 1,  1)))
+void BuildShifts(
+    __global float  *pShifts,
+    __global amf_int32 *pHistogram,        ///< [in] maximum data
+    __global int *pCorners,        ///< [in] maximum data
+    __global int *pParams,			///< [in]  HistogramParameters*
+    amf_int32 corners,
+    amf_int32 frameCount
+)
+{
+    amf_int32 delay = get_global_id(0); // from 0 to max of params->maxDistanceBetweenPeaks
+    amf_int32 id = get_global_id(1);
+    amf_int32 corner  = id / 3;
+    amf_int32 side  = id % 3;
+    amf_int32 col = get_global_id(2);
+
+    __global struct HistogramParameters *params = (__global struct HistogramParameters *)pParams;
+
+    if(corner >= corners || delay >= params->maxDistanceBetweenPeaks[col] * 2 || col >= 3) 
+    {
+        return;
+    }
+    
+    __global struct Corner* it_corner = (__global struct Corner*)pCorners + corner;
+    if(side >= it_corner->count)
+    {
+        return;
+    }
+    __local float corrs[HIST_SIZE * 2];
+
+    amf_int32 local_id = 2 * get_local_id(0);
+    corrs[local_id] = 0;
+    corrs[local_id+1] = 0;
+    __global amf_int32* pHist[3];
+
+    for(amf_int32 i = 0; i < it_corner->count; i++)
+    {
+        pHist[i] = pHistogram + it_corner->channel[i] * 4 * 3 * HIST_SIZE  + it_corner->corner[i] * HIST_SIZE * 3 +  col * HIST_SIZE;
+    }
+
+    int h1 = 0;
+    int h2 = 0;
+    if(it_corner->count == 3)
+    { 
+        if(side == 0)
+        {
+            h1 = 0;
+            h2 = 1;
+        }
+        else if(side == 1)
+        {
+            h1 = 1;
+            h2 = 2;
+        }
+        else if(side == 2)
+        {
+            h1 = 2;
+            h2 = 0;
+        }
+    }
+    if(it_corner->count == 2)
+    {
+        if(side == 0)
+        { 
+            h1 = 0;
+            h2 = 1;
+        }
+        else 
+        { 
+            h1 = 1;
+            h2 = 0;
+        }
+    }
+
+    if(delay < params->maxDistanceBetweenPeaks[col] * 2)
+    {
+        barrier(CLK_LOCAL_MEM_FENCE);
+        corrs[delay] = OneCrossCorrelation(pHist[h1], pHist[h2], col, delay, params->maxDistanceBetweenPeaks[col], params);
+        barrier  (CLK_LOCAL_MEM_FENCE);
+
+        if(delay == 0)
+        {
+            float corrMax = -1.0e5f;
+            for(amf_int32 i = 0; i < params->maxDistanceBetweenPeaks[col] * 2; i++)
+            {
+                if(corrMax < corrs[i])
+                {    
+                    corrMax = corrs[i];
+                    pShifts[corner * 3 * it_corner->count + col * it_corner->count + side] = (float)i - params->maxDistanceBetweenPeaks[col];
+                }
+            }
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+__kernel __attribute__((reqd_work_group_size(256, 1,  1)))
+void BuildLUT(
+    __global float *pLUT,        ///< [out] histogram data  - 256 x 3 for RG, G and B
+    __global float *pLUTPrev,    ///< [in] histogram data  - 256 x 3 for RG, G and B
+    __global float *pBrightness,
+    __global float  *pShifts,
+    __global int *pCorners,
+    __global int *pParams,
+    amf_int32 corners,
+    amf_int32 frameCount
+)
+{
+    amf_int32 corner  = get_global_id(0);
+    amf_int32 side  = get_global_id(1);
+    amf_int32 col = get_global_id(2);
+
+    __global struct HistogramParameters *params = (__global struct HistogramParameters *)pParams;
+
+    if(corner >= corners || side >= 3 || col >= 3) 
+    {
+        return;
+    }
+    __global struct Corner* it_corner = (__global struct Corner*)pCorners + corner;
+
+    if(side >= it_corner->count)
+    {
+        return;
+    }
+
+
+    float       brightness[3];
+    brightness[0] = 0;
+    brightness[1] = 0;
+    brightness[2] = 0;
+
+    int shiftOffset = corner * 3 * it_corner->count + col * it_corner->count;
+
+    if(it_corner->count == 2)
+    {
+        brightness[0] =  pShifts[shiftOffset + 0] / 2.0f;
+        brightness[1] =  pShifts[shiftOffset + 1] / 2.0f;
+    }
+    else if(it_corner->count == 3)
+    {
+
+        int shiftMaxIndex = 0;
+        int shiftMinIndex = HIST_SIZE *2;
+        float shiftMin = 10000.0f;
+        float shiftMax = 0.0f;
+
+
+        for(int side = 0; side < it_corner->count; side++)
+        {
+            if(fabs(shiftMin) > fabs(pShifts[shiftOffset + side]))
+            {
+                shiftMin = pShifts[shiftOffset + side];
+                shiftMinIndex = side;
+            }
+            if(fabs(shiftMax) < fabs(pShifts[shiftOffset + side]))
+            {
+                shiftMax = pShifts[shiftOffset + side];
+                shiftMaxIndex = side;
+            }
+        }
+        int shiftMinIndexSecond = 0;
+        for(int side = 0; side < it_corner->count; side++)
+        {
+            if(side != shiftMinIndex && side != shiftMaxIndex)
+            {
+                shiftMinIndexSecond = side;
+                break;
+            }
+        }
+
+
+        shiftMin = pShifts[shiftOffset + shiftMinIndex];
+        float shiftMinSecond = pShifts[shiftOffset + shiftMinIndexSecond];
+
+            if(shiftMinIndex == 0 )
+            {
+                brightness[0] =  shiftMin/ 2.0f;
+                brightness[1] =  - shiftMin / 2.0f;
+
+                if(shiftMinIndexSecond == 1)
+                {
+                    brightness[2] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                    brightness[0] += shiftMinSecond / 3.0f;
+                    brightness[1] += shiftMinSecond / 3.0f;
+                }
+                else //2
+                {
+                    brightness[2] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                    brightness[0] -= shiftMinSecond / 3.0f;
+                    brightness[1] -= shiftMinSecond / 3.0f;
+                }
+
+            }
+            else  if(shiftMinIndex == 1 )
+            {
+                brightness[1] =  shiftMin/ 2.0f;
+                brightness[2] =  -shiftMin / 2.0f;
+
+                if(shiftMinIndexSecond == 0)
+                {
+                    brightness[0] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                    brightness[1] -=  shiftMinSecond / 3.0f;
+                    brightness[2] -=  shiftMinSecond / 3.0f;
+                }
+                else //2
+                {
+                    brightness[0] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                    brightness[1] +=  shiftMinSecond / 3.0f;
+                    brightness[2] +=  shiftMinSecond / 3.0f;
+                }
+            }
+            else if(shiftMinIndex ==  2)
+            {
+                brightness[2] =  shiftMin/ 2.0f;
+                brightness[0] =  - shiftMin / 2.0f;
+
+                if(shiftMinIndexSecond == 0)
+                {
+                    brightness[1] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                    brightness[2] +=  shiftMinSecond / 3.0f;
+                    brightness[0] +=  shiftMinSecond / 3.0f;
+                }
+                else // 1
+                {
+                    brightness[1] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                    brightness[2] -=  shiftMinSecond / 3.0f;
+                    brightness[0] -=  shiftMinSecond / 3.0f;
+                }
+            }
+    }
+    __global float *lut  = pLUT + it_corner->channel[side] * 3 *5 * HIST_SIZE + it_corner->corner[side] * 3* HIST_SIZE + col * HIST_SIZE;
+    __global float *lutPrev = pLUTPrev + it_corner->channel[side] * 3 *5 * HIST_SIZE + it_corner->corner[side] * 3* HIST_SIZE + col * HIST_SIZE;
+
+    BuildOneLUT( col, brightness[side]/ 255.f,  lut, lutPrev, params, frameCount);
+
+    pBrightness[it_corner->channel[side] * 4 *3 + side *3 + col]  = brightness[side];
+
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+__kernel __attribute__((reqd_work_group_size(256, 1,  1)))
+void BuildLUTCenter(
+    __global float *pLUT,        ///< [out] histogram data  - 256 x 3 for RG, G and B
+    __global float *pLUTPrev,        ///< [in] histogram data  - 256 x 3 for RG, G and B
+    __global float *pBrightness,
+    __global int *pParams,			///< [in]  HistogramParameters*
+    amf_int32 channels,
+    amf_int32 frameCount
+)
+{
+    __global struct HistogramParameters *params = (__global struct HistogramParameters *)pParams;
+    amf_int32 channel  = get_global_id(0);
+    amf_int32 col = get_global_id(1);
+
+    if(channel < channels)
+    {
+
+        float brightnessCenter = 0;
+        for( amf_int32 side = 0; side < 4; side++)
+        {
+            brightnessCenter +=  pBrightness[channel * 4 * 3 + side *3 + col];
+        }
+        brightnessCenter/=4.0f;
+
+        __global float *lutCenter  = pLUT + channel * 3 *5 * HIST_SIZE + 4 * 3* HIST_SIZE + col * HIST_SIZE;
+        __global float *lutPrevCenter = pLUTPrev + channel * 3 *5 * HIST_SIZE + 4 * 3* HIST_SIZE + col * HIST_SIZE;
+        BuildOneLUT( col, brightnessCenter / 255.f,  lutCenter, lutPrevCenter, params, frameCount);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+static void BuildOneLUT(amf_int32 col, float brightness, __global float *lut, __global float *prev, __global struct HistogramParameters *params, amf_int32 frameCount)
+{
+
+    for(amf_int32 k=0; k < HIST_SIZE; k++)
+    {
+        float lutCurr = brightness;
+
+        if(col == 0)
+        {
+            if(k < params->blackCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k < LUT_CURVE_TABLE_SIZE + params->blackCutOffY)
+            {
+                lutCurr *= 1.0f - params->lutCurveTable[k - params->blackCutOffY];
+            }
+            else if(k > params->whiteCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k >= params->whiteCutOffY - LUT_CURVE_TABLE_SIZE)
+            {
+                lutCurr *= params->lutCurveTable[k - (params->whiteCutOffY - LUT_CURVE_TABLE_SIZE) ];
+            }
+        }
+
+        lutCurr += (float)k /255.f;
+
+        float lutPrev = prev[k];
+        if(frameCount != 0 )
+        {
+            lutCurr = lutPrev + params->alphaLUT * ( lutCurr - lutPrev);
+        }
+        prev[k] = lutCurr;
+        lut[k] = lutCurr;
+   }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+amf_int32 CrossCorrelation(__global amf_int32 *data1, __global amf_int32 *data2, amf_int32 maxdelay)
+{
+
+    float x[HIST_SIZE];
+    float y[HIST_SIZE];
+    for(amf_int32 i = 0; i < HIST_SIZE; i++)
+    {
+        x[i]  = (float)data1[i];
+        y[i]  = (float)data2[i];
+    }
+
+   float sx,sy,sxy,denom;
+   
+   /* Calculate the mean of the two series x[], y[] */
+   float mx = 0;
+   float my = 0;   
+   for (amf_int32 i=0 ; i < HIST_SIZE; i++) 
+   {
+      mx += x[i];
+      my += y[i];
+   }
+   mx /= HIST_SIZE;
+   my /= HIST_SIZE;
+
+   /* Calculate the denominator */
+   sx = 0;
+   sy = 0;
+   for (amf_int32 i=0; i < HIST_SIZE; i++) 
+   {
+      sx += (x[i] - mx) * (x[i] - mx);
+      sy += (y[i] - my) * (y[i] - my);
+   }
+   denom = sqrt(sx*sy);
+
+   /* Calculate the correlation series */
+   float rMax = 0;
+   amf_int32 delayMax = 0;
+   for (amf_int32 delay=-maxdelay; delay < maxdelay; delay++) 
+   {
+      sxy = 0;
+      for (int i = 0; i < HIST_SIZE; i++) 
+      {
+         int j = i + delay;
+         if (j < 0 || j >= HIST_SIZE)
+         {
+            continue;
+         }
+         else
+         {
+            sxy += (x[i] - mx) * (y[j] - my);
+         }
+      }
+      float r = sxy / denom;
+      
+      /* r is the correlation coefficient at "delay" */
+      if(r > rMax)
+      {
+          rMax = r; 
+          delayMax = delay;
+      }
+   }
+   return delayMax;
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+static float OneCrossCorrelation(
+    __global amf_int32 *data1,    // [in]
+    __global amf_int32 *data2,    // [in]
+    amf_int32 col,
+    amf_int32 delay,
+    amf_int32 maxdelay,
+    __global struct HistogramParameters *params
+    )
+{
+    float r = 0;
+    float x;
+    float y;
+
+
+    if(delay  - maxdelay < maxdelay)
+    {
+        // Calculate the mean of the two series x[], y[]
+        float mx = 0;
+        float my = 0;   
+        for (amf_int32 i = params->blackCutOffY; i < params->whiteCutOffY; i++)
+        {
+            mx += data1[i];
+            my += data2[i];
+        }
+        mx /= HIST_SIZE;
+        my /= HIST_SIZE;
+        // Calculate the denominator
+        float sx = 0;
+        float sy = 0;
+        for (amf_int32 i = params->blackCutOffY; i < params->whiteCutOffY; i++)
+        {
+            x = (float)data1[i] - mx;
+            y = (float)data2[i] - my;
+            sx += x * x;
+            sy += y * y;
+        }
+        float denom = sqrt(sx*sy);
+
+        // Calculate the correlation
+        float sxy = 0;
+
+        for (amf_int32 i = params->blackCutOffY; i < params->whiteCutOffY; i++)
+        {
+            int j = i + delay  - maxdelay;
+            
+            if (j < params->blackCutOffY || j >= params->whiteCutOffY)
+            {
+                continue;
+            }
+            else
+            {
+                x = (float)data1[i] - mx;
+                y = (float)data2[j] - my;
+                sxy += x * y;
+            }                
+        }
+        r = (float)(sxy / denom);
+    }
+    return r;
+}
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11 Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11.cpp Added

@@ -0,0 +1,75 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include "public/include/core/Trace.h"
+#include "public/include/core/Compute.h"
+#include "public/common/TraceAdapter.h"
+#include "public/common/AMFFactory.h"
+
+#if defined( _M_AMD64)
+#include "ProgramsDX11/BuildLUT_64.h"
+#include "ProgramsDX11/BuildLUTCenter_64.h"
+#include "ProgramsDX11/BuildShifts_64.h"
+#include "ProgramsDX11/Color_64.h"
+#include "ProgramsDX11/Histogram_64.h"
+#include "ProgramsDX11/NV12toRGB_64.h"
+#else
+#include "ProgramsDX11/BuildLUT_32.h"
+#include "ProgramsDX11/BuildLUTCenter_32.h"
+#include "ProgramsDX11/BuildShifts_32.h"
+#include "ProgramsDX11/Color_32.h"
+#include "ProgramsDX11/Histogram_32.h"
+#include "ProgramsDX11/NV12toRGB_32.h"
+#endif
+
+extern amf::AMF_KERNEL_ID   m_KernelHistogramIdDX11;
+extern amf::AMF_KERNEL_ID   m_KernelColorIdDX11;
+extern amf::AMF_KERNEL_ID   m_KernelNV12toRGBIdDX11;
+extern amf::AMF_KERNEL_ID   m_KernelBuildLUTIdDX11;
+extern amf::AMF_KERNEL_ID   m_KernelBuildLUTCenterIdDX11;
+extern amf::AMF_KERNEL_ID   m_KernelBuildShiftsIdDX11;
+
+using namespace amf;
+
+AMF_RESULT RegisterKernelsDX11()
+{
+    AMFPrograms *pPrograms = NULL;
+    g_AMFFactory.GetFactory()->GetPrograms(&pPrograms);
+
+    AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelBinary1(AMF_MEMORY_DX11, &m_KernelHistogramIdDX11,      L"main"    , "main"   , sizeof(Histogram), Histogram, NULL));
+    AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelBinary1(AMF_MEMORY_DX11, &m_KernelColorIdDX11,          L"main"    , "main"   , sizeof(Color), Color, NULL));
+    AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelBinary1(AMF_MEMORY_DX11, &m_KernelNV12toRGBIdDX11,      L"main"    , "main"   , sizeof(NV12toRGB), NV12toRGB, NULL));
+    AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelBinary1(AMF_MEMORY_DX11, &m_KernelBuildLUTIdDX11,       L"main"    , "main"   , sizeof(BuildLUT), BuildLUT, NULL));
+    AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelBinary1(AMF_MEMORY_DX11, &m_KernelBuildLUTCenterIdDX11, L"main"    , "main"   , sizeof(BuildLUTCenter), BuildLUTCenter, NULL));
+    AMF_RETURN_IF_FAILED(pPrograms->RegisterKernelBinary1(AMF_MEMORY_DX11, &m_KernelBuildShiftsIdDX11,    L"main"    , "main"   , sizeof(BuildShifts), BuildShifts, NULL));
+
+    return AMF_OK;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11/BuildLUT.hlsl Added

@@ -0,0 +1,269 @@
+
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#define amf_int32 int
+#define WGX 32
+#define WGY 8
+
+//--------------------------------------------------------------------------------------------------------------------
+//struct __attribute__ ((packed)) Corner
+struct Corner
+{
+    amf_int32 count;
+    amf_int32 align1;
+    amf_int32 align2;
+    amf_int32 align3;
+    int4    channel;
+    int4    corner;             // 0 - lt, 1 - rt, 2 - rb, 3 - lb
+    amf_int32 index;
+    float3    pos;
+};
+
+RWBuffer<float> pLUT                : register(u0);
+RWBuffer<float> pLUTPrev            : register(u1);
+RWBuffer<float> pBrightness         : register(u2);
+
+Buffer<float> pShifts               : register(t0);
+
+#define HIST_SIZE   256
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+#define LUT_CURVE_TABLE_SIZE    20
+
+
+//--------------------------------------------------------------------------------------------------------------------
+struct HistogramParameters
+{
+    int3 maxDistanceBetweenPeaks;
+    amf_int32 whiteCutOffY;
+    amf_int32 blackCutOffY;
+    amf_int32 borderHistWidth;
+    float   alphaLUT;
+    float4 lutCurveTableInt[LUT_CURVE_TABLE_SIZE/4]; // curve from 0 to 1
+};
+
+#define MAX_CORNERS     100
+cbuffer Corners : register(b0)
+{
+    Corner pCorners[MAX_CORNERS];
+}
+
+cbuffer pParams : register(b1)
+{
+   HistogramParameters params;
+
+};
+
+cbuffer Params : register(b2)
+{
+    amf_int32 corners;
+    amf_int32 frameCount;
+};
+
+static   float lutCurveTable[LUT_CURVE_TABLE_SIZE] = (float[LUT_CURVE_TABLE_SIZE])params.lutCurveTableInt;
+void BuildOneLUT(amf_int32 col, float brightness, int lut, int prev)
+{
+    for(amf_int32 k=0; k < HIST_SIZE; k++)
+    {
+        float lutCurr = brightness;
+        
+        if(col == 0)
+        {
+            if(k < params.blackCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k < LUT_CURVE_TABLE_SIZE + params.blackCutOffY)
+            {
+                lutCurr *= 1.0f - lutCurveTable[k - params.blackCutOffY];
+            }
+            else if(k > params.whiteCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k >= params.whiteCutOffY - LUT_CURVE_TABLE_SIZE)
+            {
+                lutCurr *= lutCurveTable[k - (params.whiteCutOffY - LUT_CURVE_TABLE_SIZE) ];
+            }
+        }
+        
+        lutCurr += (float)k /255.f;
+
+        float lutPrev = pLUTPrev[prev + k];
+        if(frameCount != 0 )
+        {
+            lutCurr = lutPrev + params.alphaLUT * ( lutCurr - lutPrev);
+        }
+        lutCurr = clamp(lutCurr, 0, 1.0);
+        pLUTPrev[prev + k] = lutCurr;
+        pLUT[lut + k] = lutCurr;
+   }
+}
+
+[numthreads(256, 1, 1)]
+void main(uint3 coord : SV_DispatchThreadID)
+{
+    amf_int32 corner  = coord.x;
+    amf_int32 side  = coord.y;
+    amf_int32 col = coord.z;
+
+    if(corner >= corners || side >= 3 || col >= 3) 
+    {
+        return;
+    }
+    Corner it_corner = pCorners[corner];
+
+    if(side >= it_corner.count)
+    {
+        return;
+    }
+
+
+    float       brightness[3];
+    brightness[0] = 0;
+    brightness[1] = 0;
+    brightness[2] = 0;
+
+    int shiftOffset = corner * 3 * it_corner.count + col * it_corner.count;
+
+    if(it_corner.count == 2)
+    {
+        brightness[0] =  pShifts[shiftOffset + 0] / 2.0f;
+        brightness[1] =  pShifts[shiftOffset + 1] / 2.0f;
+    }
+    else if(it_corner.count == 3)
+    {
+
+        int shiftMaxIndex = 0;
+        int shiftMinIndex = HIST_SIZE *2;
+        float shiftMin = 10000.0f;
+        float shiftMax = 0.0f;
+
+
+        for(int side1 = 0; side1 < it_corner.count; side1++)
+        {
+            if(abs(shiftMin) > abs(pShifts[shiftOffset + side1]))
+            {
+                shiftMin = pShifts[shiftOffset + side1];
+                shiftMinIndex = side1;
+            }
+            if(abs(shiftMax) < abs(pShifts[shiftOffset + side1]))
+            {
+                shiftMax = pShifts[shiftOffset + side1];
+                shiftMaxIndex = side1;
+            }
+        }
+        int shiftMinIndexSecond = 0;
+        for(int side2 = 0; side2 < it_corner.count; side2++)
+        {
+            if(side2 != shiftMinIndex && side2 != shiftMaxIndex)
+            {
+                shiftMinIndexSecond = side2;
+                break;
+            }
+        }
+
+
+        shiftMin = pShifts[shiftOffset + shiftMinIndex];
+        float shiftMinSecond = pShifts[shiftOffset + shiftMinIndexSecond];
+
+            if(shiftMinIndex == 0 )
+            {
+                brightness[0] =  shiftMin/ 2.0f;
+                brightness[1] =  - shiftMin / 2.0f;
+
+                if(shiftMinIndexSecond == 1)
+                {
+                    brightness[2] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                    brightness[0] += shiftMinSecond / 3.0f;
+                    brightness[1] += shiftMinSecond / 3.0f;
+                }
+                else //2
+                {
+                    brightness[2] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                    brightness[0] -= shiftMinSecond / 3.0f;
+                    brightness[1] -= shiftMinSecond / 3.0f;
+                }
+
+            }
+            else  if(shiftMinIndex == 1 )
+            {
+                brightness[1] =  shiftMin/ 2.0f;
+                brightness[2] =  -shiftMin / 2.0f;
+
+                if(shiftMinIndexSecond == 0)
+                {
+                    brightness[0] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                    brightness[1] -=  shiftMinSecond / 3.0f;
+                    brightness[2] -=  shiftMinSecond / 3.0f;
+                }
+                else //2
+                {
+                    brightness[0] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                    brightness[1] +=  shiftMinSecond / 3.0f;
+                    brightness[2] +=  shiftMinSecond / 3.0f;
+                }
+            }
+            else if(shiftMinIndex ==  2)
+            {
+                brightness[2] =  shiftMin/ 2.0f;
+                brightness[0] =  - shiftMin / 2.0f;
+
+                if(shiftMinIndexSecond == 0)
+                {
+                    brightness[1] = -shiftMinSecond *2.0f / 3.0f - shiftMin/ 2.0f;
+
+                    brightness[2] +=  shiftMinSecond / 3.0f;
+                    brightness[0] +=  shiftMinSecond / 3.0f;
+                }
+                else // 1
+                {
+                    brightness[1] = shiftMinSecond *2.0f / 3.0f + shiftMin/ 2.0f;
+
+                    brightness[2] -=  shiftMinSecond / 3.0f;
+                    brightness[0] -=  shiftMinSecond / 3.0f;
+                }
+            }
+    }
+
+    int lut  = it_corner.channel[side] * 3 *5 * HIST_SIZE + it_corner.corner[side] * 3* HIST_SIZE + col * HIST_SIZE;
+    int lutPrev = it_corner.channel[side] * 3 *5 * HIST_SIZE + it_corner.corner[side] * 3* HIST_SIZE + col * HIST_SIZE;
+
+    BuildOneLUT( col, brightness[side]/ 255.f,  lut, lutPrev);
+
+    pBrightness[it_corner.channel[side] * 4 *3 + side *3 + col]  = brightness[side];
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11/BuildLUTCenter.hlsl Added

@@ -0,0 +1,134 @@
+
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#define amf_int32 int
+#define WGX 32
+#define WGY 8
+
+
+RWBuffer<float> pLUT                : register(u0);
+RWBuffer<float> pLUTPrev            : register(u1);
+RWBuffer<float> pBrightness         : register(u2);
+
+Buffer<float> pShifts               : register(t0);
+
+#define HIST_SIZE   256
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+#define LUT_CURVE_TABLE_SIZE    20
+
+//--------------------------------------------------------------------------------------------------------------------
+struct HistogramParameters
+{
+    int3 maxDistanceBetweenPeaks;
+    amf_int32 whiteCutOffY;
+    amf_int32 blackCutOffY;
+    amf_int32 borderHistWidth;
+    float   alphaLUT;
+    float4 lutCurveTableInt[LUT_CURVE_TABLE_SIZE/4]; // curve from 0 to 1
+};
+
+cbuffer pParams : register(b0)
+{
+   HistogramParameters params;
+
+};
+static float lutCurveTable[LUT_CURVE_TABLE_SIZE] = (float[LUT_CURVE_TABLE_SIZE])params.lutCurveTableInt;
+
+
+cbuffer Params : register(b1)
+{
+    amf_int32 channels;
+    amf_int32 frameCount;
+};
+
+void BuildOneLUT(amf_int32 col, float brightness, int lut, int prev)
+{
+    for(amf_int32 k=0; k < HIST_SIZE; k++)
+    {
+        float lutCurr = brightness;
+        
+        if(col == 0)
+        {
+            if(k < params.blackCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k < LUT_CURVE_TABLE_SIZE + params.blackCutOffY)
+            {
+                lutCurr *= 1.0f - lutCurveTable[k - params.blackCutOffY];
+            }
+            else if(k > params.whiteCutOffY)
+            {
+                lutCurr = 0.0f;
+            }
+            else if(k >= params.whiteCutOffY - LUT_CURVE_TABLE_SIZE)
+            {
+                lutCurr *= lutCurveTable[k - (params.whiteCutOffY - LUT_CURVE_TABLE_SIZE) ];
+            }
+        }
+        
+        lutCurr += (float)k /255.f;
+
+        float lutPrev = pLUTPrev[prev + k];
+        if(frameCount != 0 )
+        {
+            lutCurr = lutPrev + params.alphaLUT * ( lutCurr - lutPrev);
+        }
+        lutCurr = clamp(lutCurr, 0, 1.0);
+        pLUTPrev[prev + k] = lutCurr;
+        pLUT[lut + k] = lutCurr;
+   }
+}
+
+[numthreads(256, 1, 1)]
+void main(uint3 coord : SV_DispatchThreadID)
+{
+    amf_int32 channel  = coord.x;
+    amf_int32 col  = coord.y;
+
+    if(channel < channels)
+    {
+
+        float brightnessCenter = 0;
+        for( amf_int32 side = 0; side < 4; side++)
+        {
+            brightnessCenter +=  pBrightness[channel * 4 * 3 + side *3 + col];
+        }
+        brightnessCenter/=4.0f;
+
+         int lutCenter  = channel * 3 *5 * HIST_SIZE + 4 * 3* HIST_SIZE + col * HIST_SIZE;
+        int  lutPrevCenter = channel * 3 *5 * HIST_SIZE + 4 * 3* HIST_SIZE + col * HIST_SIZE;
+        BuildOneLUT( col, brightnessCenter / 255.f,  lutCenter, lutPrevCenter);
+    }
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11/BuildShifts.hlsl Added

@@ -0,0 +1,250 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#define amf_int32 int
+#define WGX 32
+#define WGY 8
+
+//--------------------------------------------------------------------------------------------------------------------
+struct Corner
+{
+    amf_int32 count;
+    amf_int32 align1;
+    amf_int32 align2;
+    amf_int32 align3;
+
+    int4    channel;
+    int4    corner;             // 0 - lt, 1 - rt, 2 - rb, 3 - lb
+
+    amf_int32 index;
+    float3    pos;
+};
+
+RWBuffer<float> pShifts               : register(u0);
+Buffer<uint> pHistogram               : register(t0);
+
+#define HIST_SIZE   256
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+#define LUT_CURVE_TABLE_SIZE    20
+
+#define MAX_CORNERS     100
+cbuffer Corners : register(b0)
+{
+    Corner pCorners[MAX_CORNERS];
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+struct HistogramParameters
+{
+    int3 maxDistanceBetweenPeaks;
+    amf_int32 whiteCutOffY;
+    amf_int32 blackCutOffY;
+    amf_int32 borderHistWidth;
+    float   alphaLUT;
+    float4 lutCurveTableInt[LUT_CURVE_TABLE_SIZE/4]; // curve from 0 to 1
+};
+
+cbuffer pParams : register(b1)
+{
+   HistogramParameters params;
+};
+
+cbuffer Params : register(b2)
+{
+    amf_int32 corners;
+    amf_int32 frameCount;
+};
+
+//--------------------------------------------------------------------------------------------------------------------
+float OneCrossCorrelation(
+    int data1,    // [in]
+    int data2,    // [in]
+    amf_int32 col,
+    amf_int32 delay,
+    amf_int32 maxdelay
+    );
+
+groupshared float corrs[HIST_SIZE * 2];
+
+[numthreads(256, 1, 1)]
+void main(uint3 coord : SV_DispatchThreadID)
+{
+    amf_int32 delay = coord.x; // from 0 to max of params.maxDistanceBetweenPeaks
+    uint id = coord.y;
+    amf_int32 corner  = id / 3;
+    amf_int32 side  = id % 3;
+    amf_int32 col = coord.z;
+
+    if(corner >= corners || delay >= params.maxDistanceBetweenPeaks[col] * 2 || col >= 3) 
+    {
+        return;
+    }
+
+    Corner it_corner = pCorners [corner];
+    if(side >= it_corner.count)
+    {
+        return;
+    }
+
+    amf_int32 i;
+    amf_int32 local_id = 2 * (coord.x % 256);
+    corrs[local_id] = 0;
+    corrs[local_id + 1] = 0;
+
+    int pHist[3];
+
+    for(i = 0; i < it_corner.count; i++)
+    {
+        pHist[i] = it_corner.channel[i] * 4 * 3 * HIST_SIZE  + it_corner.corner[i] * HIST_SIZE * 3 +  col * HIST_SIZE;
+    }
+    int h1 = 0;
+    int h2 = 0;
+    if(it_corner.count == 3)
+    { 
+        if(side == 0)
+        {
+            h1 = 0;
+            h2 = 1;
+        }
+        else if(side == 1)
+        {
+            h1 = 1;
+            h2 = 2;
+        }
+        else if(side == 2)
+        {
+            h1 = 2;
+            h2 = 0;
+        }
+    }
+    if(it_corner.count == 2)
+    {
+        if(side == 0)
+        { 
+            h1 = 0;
+            h2 = 1;
+        }
+        else 
+        { 
+            h1 = 1;
+            h2 = 0;
+        }
+    }
+
+    if(delay < params.maxDistanceBetweenPeaks[col] * 2)
+    {
+
+        GroupMemoryBarrier();
+        corrs[delay] = OneCrossCorrelation(pHist[h1], pHist[h2], col, delay, params.maxDistanceBetweenPeaks[col]);
+        GroupMemoryBarrier();
+
+        if(delay == 0)
+        {
+            float corrMax = -1.0e5f;
+            for(amf_int32 i = 0; i < params.maxDistanceBetweenPeaks[col] * 2; i++)
+            {
+                if(corrMax < corrs[i])
+                {    
+                    corrMax = corrs[i];
+                    pShifts[corner * 3 * it_corner.count + col * it_corner.count + side] = (float)i - params.maxDistanceBetweenPeaks[col];
+                }
+            }
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+float OneCrossCorrelation(
+     int data1,    // [in]
+     int data2,    // [in]
+    amf_int32 col,
+    amf_int32 delay,
+    amf_int32 maxdelay
+    )
+{
+    float r = 0;
+
+    if ((delay - maxdelay) < maxdelay)
+    {
+        float x;
+        float y;
+
+
+        // Calculate the mean of the two series x[], y[]
+        float mx = 0;
+        float my = 0;
+        amf_int32 i = 0;
+        for (i = params.blackCutOffY; i < params.whiteCutOffY; i++)
+        {
+            mx += (float)pHistogram[data1 + i];
+            my += (float)pHistogram[data2 + i];
+        }
+        mx /= (float)HIST_SIZE;
+        my /= (float)HIST_SIZE;
+        // Calculate the denominator
+        float sx = 0;
+        float sy = 0;
+        for (i = params.blackCutOffY; i < params.whiteCutOffY; i++)
+        {
+            x = (float)pHistogram[data1 + i] - mx;
+            y = (float)pHistogram[data2 + i] - my;
+            sx += x * x;
+            sy += y * y;
+        }
+        float denom = sqrt(sx*sy);
+
+        // Calculate the correlation
+        float sxy = 0;
+
+        for (i = params.blackCutOffY; i < params.whiteCutOffY; i++)
+        {
+            int j = i + delay - maxdelay;
+
+            if (j < params.blackCutOffY || j >= params.whiteCutOffY)
+            {
+                continue;
+            }
+            else
+            {
+                x = (float)pHistogram[data1 + i] - mx;
+                y = (float)pHistogram[data2 + j] - my;
+                sxy += x * y;
+            }
+        }
+        r = (float)(sxy / denom);
+    }
+    return r;
+}
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11/Color.hlsl Added

@@ -0,0 +1,99 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// 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.
+//
+
+Texture2D<float> borderMap : register(t0);
+
+RWTexture2D<uint> frameY : register(u0);
+RWTexture2D<uint2> frameUV : register(u1);
+
+#define amf_int32 int
+#define WGX 32
+#define WGY 8
+
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+
+//--------------------------------------------------------------------------------------------------------------------
+uint4 rgb_to_yuv( uint4 rgb )
+{    
+    float4 yuv;
+    yuv.x = clamp((  46.742f  *rgb.x + 157.243f   *rgb.y +  15.874f  *rgb.z + LEVEL ) / DIV_VAL, 0.f, 255.f);
+    yuv.y = clamp(( (-25.765f)*rgb.x + ( -86.674f)*rgb.y + 112.439f  *rgb.z) / DIV_VAL + 128.5f, 0.f, 255.f);
+    yuv.z = clamp(( 112.439f  *rgb.x + (-102.129f)*rgb.y + (-10.310f)*rgb.z) / DIV_VAL + 128.5f, 0.f, 255.f);
+    yuv.w = rgb.w;
+    return uint4(yuv);
+}
+
+[numthreads(WGX, WGY, 1)]
+void main(uint3 coord : SV_DispatchThreadID)
+{
+    uint2 posUV = uint2(coord.x, coord.y);
+    uint2 posY = posUV * 2;
+
+    uint2 dimensions;
+    frameY.GetDimensions(dimensions.x, dimensions.y);
+
+    if(posY.x < dimensions.x && posY.y < dimensions.y)
+    {
+        uint2 posMap = posY / 8;
+        uint map = borderMap[posMap] * 255.;
+        if (map != 0)
+        {
+            uint4 rgb =  uint4(0, 0, 0, 255);
+            if(((map >> 0) & 1) != 0)
+            {
+                rgb.x = 255;
+            } 
+            if(((map >> 1) & 1) != 0)
+            {
+                rgb.y = 255;
+            }
+            if(((map >> 2) & 1) != 0)
+            {
+                rgb.z = 255;
+            }
+            if(((map >> 3) & 1) != 0)
+            {
+                rgb.x = 128;
+                rgb.y = 128;
+            }
+            uint4 yuv = rgb_to_yuv(rgb);
+
+            frameY[uint2(posY.x + 0, posY.y + 0)] = yuv.x;
+            frameY[uint2(posY.x + 1, posY.y + 0)] = yuv.x;
+            frameY[uint2(posY.x + 0, posY.y + 1)] = yuv.x;
+            frameY[uint2(posY.x + 1, posY.y + 1)] = yuv.x;
+
+            frameUV[posUV] = yuv.yz;
+        }
+    }
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11/Histogram.hlsl Added

@@ -0,0 +1,144 @@
+
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// 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.
+//
+
+Texture2D<uint> frameY : register(t0);
+Texture2D<uint2> frameUV : register(t1);
+Texture2D<float> map : register(t2);
+
+RWBuffer<uint> pOutHist : register(u0);
+
+#define amf_int32 int
+#define WGX 32
+#define WGY 8
+
+#define HIST_SIZE   256
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+#define LUT_CURVE_TABLE_SIZE    20
+
+//--------------------------------------------------------------------------------------------------------------------
+struct HistogramParameters
+{
+    int3 maxDistanceBetweenPeaks;
+    amf_int32 whiteCutOffY;
+    amf_int32 blackCutOffY;
+    amf_int32 borderHistWidth;
+    float   alphaLUT;
+    float4 lutCurveTableInt[LUT_CURVE_TABLE_SIZE/4]; // curve from 0 to 1
+};
+
+cbuffer pParams : register(b0)
+{
+   HistogramParameters params;
+};
+
+cbuffer Params : register(b1)
+{
+    amf_int32 channel;
+};
+
+[numthreads(WGX, WGY, 1)]
+void main(uint3 coord : SV_DispatchThreadID)
+{
+    uint2 posUV = uint2(coord.x, coord.y);
+    uint2 posY = posUV * 2;
+
+    uint2 dimensions;
+    frameY.GetDimensions(dimensions.x, dimensions.y);
+
+    if(posY.x < dimensions.x && posY.y < dimensions.y)
+    {
+        uint2 posMap = posY / 8;
+        uint mapData = map[posMap].x * 255.;
+
+        amf_int32 sideX = -1;
+        amf_int32 sideY = -1;
+        if(((mapData >> 0)  & 1) != 0)
+        {
+            sideX = 0;
+        } 
+        if(((mapData >> 1)  & 1) != 0)
+        {
+            sideX = 1;
+        }
+        if(((mapData >> 2)  & 1) != 0)
+        {
+            sideY = 2;
+        }
+        if(((mapData >> 3)  & 1) != 0)
+        {
+            sideY = 3;
+        }
+        
+        if (sideX >= 0 || sideY >= 0)
+        {
+            // 4 pixel from Y - 1 from UV
+            uint2 uv = frameUV[posUV].xy;
+
+            for(uint i = 0; i< 4; i++)
+            {
+                uint y = frameY[uint2(posY.x + (i%2), posY.y + (i/2))];
+                uint4 color = uint4( y, uv.x, uv.y , 0);
+                if(sideX >= 0)
+                {
+                    int outHistY = channel * 4 *3 * HIST_SIZE + sideX * HIST_SIZE *3 + 0 * HIST_SIZE;
+
+                    InterlockedAdd(pOutHist[outHistY + color.x], 1);
+                    if(i == 0)
+                    {
+                        int outHistU = outHistY + HIST_SIZE;
+                        int outHistV = outHistU + HIST_SIZE;
+
+                        InterlockedAdd(pOutHist[outHistU + color.y], 1);
+                        InterlockedAdd(pOutHist[outHistV + color.z], 1);
+                    }
+                }
+                if(sideY >= 0)
+                {
+                   int outHistY = channel * 4 *3 * HIST_SIZE + sideY * HIST_SIZE *3 + 0 * HIST_SIZE;
+                    InterlockedAdd(pOutHist[outHistY + color.x], 1);
+                    if(i == 0)
+                    {
+                        int outHistU = outHistY + HIST_SIZE;
+                        int outHistV = outHistU + HIST_SIZE;
+                        InterlockedAdd(pOutHist[outHistU + color.y], 1);
+                        InterlockedAdd(pOutHist[outHistV + color.z], 1);
+                    }
+                }            
+            }
+        }
+    }
+}
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/ProgramsDX11/NV12toRGB.hlsl Added

@@ -0,0 +1,277 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// 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.
+//
+
+Texture2D<uint> frameY   : register(t0);
+Texture2D<uint2> frameUV : register(t1);
+Buffer<float> pLUT : register(t2);
+
+RWTexture2D<float4> frameRGB : register(u0);
+
+#define amf_int32 int
+
+cbuffer Params : register(b0)
+{
+    float borderL;
+    float borderT;
+    float borderR;
+    float borderB;
+    amf_int32 channel;
+    amf_int32 linearRGB;
+};
+
+#define WGX 32
+#define WGY 8
+
+#define HIST_SIZE   256
+#define LEVEL 16.f
+#define DIV_VAL   256.f
+#define LUT_CURVE_TABLE_SIZE    20
+
+#define XM_PI           3.141592654f
+#define XM_2PI          6.283185307f
+#define XM_1DIVPI       0.318309886f
+#define XM_1DIV2PI      0.159154943f
+#define XM_PIDIV2       1.570796327f
+#define XM_PIDIV4       0.785398163f
+
+#define ATAN_POINTS 1000
+
+//--------------------------------------------------------------------------------------------------------------------
+float applyLUT(int iLUT, amf_int32 col, float2 pos, float color, float4 border)
+{
+    float colorf = color;
+
+
+    float l = border.x;
+    float t = border.y;
+    float r = border.z;
+    float b = border.w;
+
+    float x = (pos.x - 0.5f) * 2.0f;
+    float y = (pos.y - 0.5f) * 2.0f;
+    
+    
+    if(x < 0.0f)
+    {
+        x /= abs(l);
+    }
+    else
+    {
+        x /= abs(r);
+    }
+    if(y < 0.0f)
+    {
+        y /= abs(t);
+    }
+    else
+    {
+        y /= abs(b);
+    }
+
+    float x_abs = abs(x);
+    float y_abs = abs(y);
+
+    int index1 = 0;
+    int index2 = 0;
+
+    float weight1 = 1.0;
+
+    if(x != 0)
+    {
+        if(y_abs < x_abs)
+        {
+            float q = y_abs / x_abs;
+            weight1 = q / (1.0f + 0.28125f * q * q ); // fast atan() implementation
+        }
+        else
+        {
+            float q = x_abs / y_abs;
+            weight1 = (XM_PIDIV2 - q / (1.0f + 0.28125f * q * q )); // fast atan() implementation
+        }
+        weight1 /= XM_PIDIV2;
+    }
+    if(weight1 >= 0.5)
+    {
+        weight1 = 1.0 - weight1;
+    }
+    weight1 = weight1 + 0.5;
+
+    float weight2 = 1.0 - weight1;
+
+    if(x <= 0.0f && y <= 0.0f)
+    { //LeftTop
+        index1 = 0;
+        if(-x < -y)
+        {
+            index2 = 1;
+        }
+        else
+        {
+            index2 = 3;
+        }
+    }
+    
+    else if(x > 0.0f && y <= 0.0f)
+    { //RightTop
+        index1 = 1;
+        if(x < -y)
+        {
+            index2 = 0;
+        }
+        else
+        {
+            index2 = 2;
+        }
+    }
+    else if(x > 0.0f && y > 0.0f)
+    { // RightBottom
+        index1 = 2;
+        if(x < y)
+        {
+            index2 = 3;
+        }
+        else
+        {
+            index2 = 1;
+        }
+    }
+    else if(x <= 0.0f && y > 0.0f)
+    { // LeftBottom
+        index1 = 3;
+        if(-x < y)
+        {
+            index2 = 2;
+        }
+        else
+        {
+            index2 = 0;
+        }
+    }
+
+    int colIndex =  col * HIST_SIZE + color;
+    
+    int HistCol = HIST_SIZE * 3;
+
+    float lut1 =      pLUT[iLUT + index1 * HistCol + colIndex];
+    float lut2 =      pLUT[iLUT + index2 * HistCol + colIndex];
+    float lutCenter = pLUT[iLUT + 4      * HistCol + colIndex];
+   
+
+    float radius = sqrt(x * x + y * y) * 1.3;
+    float weightColor = 1.0 - radius;
+    if(weightColor < 0.0)
+    {
+        weightColor = 0.0;
+    }
+
+    float ready;
+    if(weight1 + weight2  + weightColor== 0)
+    {
+        ready = (lut1 + lut2) / 2.0;
+    }
+    else
+    {
+        ready = lutCenter * weightColor + ((lut1 * weight1 + lut2 * weight2) / (weight1 + weight2)) * (1.0 - weightColor);
+    }
+    ready *= 255.0f;
+    return clamp(ready, 0.f, 255.f);
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+float4 yuv_to_rgb( float4 yuv )
+{
+    uint4 rgb;
+    float y = yuv.x - LEVEL;
+    float u = yuv.y - 128.f; 
+    float v = yuv.z - 128.f;
+
+    rgb.x = clamp((1.1643828125f * y +   0.0f     * u +   1.7927421875f * v) , 0.f, 255.f);
+    rgb.y = clamp((1.1643828125f * y -  0.21325f   * u -   0.53291015625f * v), 0.f, 255.f);
+    rgb.z = clamp((1.1643828125f * y + 2.11240234375f   * u +     0.0f   * v), 0.f, 255.f);
+    rgb.w = yuv.w;
+    return rgb;
+}
+
+float4 srgb_to_linear(float4 C)
+{
+    C *= 1.0f / 255.0f;
+    C = C > 0.04045f ? pow( C * (1.0f / 1.055f) + 0.0521327f, 2.4f ) : C * (1.0f / 12.92f);
+    return C;
+}
+
+[numthreads(WGX, WGY, 1)]
+void main(uint3 coord : SV_DispatchThreadID)
+{
+    uint2 posUV = uint2(coord.x, coord.y);
+    uint2 posY = posUV * 2;
+
+    uint2 dimensions;
+    frameY.GetDimensions(dimensions.x, dimensions.y);
+
+    if(posY.x < dimensions.x && posY.y < dimensions.y)
+    {
+        float2 uv = frameUV[posUV];
+
+        // apply LUT
+        float4 border = float4( borderL, borderT, borderR, borderB);
+
+        int iLUTChannel =  channel * 5 *3 * HIST_SIZE;
+
+         float4 colorLUT;
+         for(uint i = 0; i < 4; i++)
+         {
+            uint2 pos = uint2(posY.x + (i%2), posY.y + (i/2));
+            float2 posF = float2(float(pos.x) / dimensions.x , float(pos.y) / dimensions.y );
+
+            float y = frameY[pos];
+
+            float4 color = float4( y, uv.x, uv.y , 0);
+            colorLUT.x = applyLUT(iLUTChannel, 0,  posF, color.x, border);
+            if(i == 0)
+            {
+                colorLUT.y = applyLUT(iLUTChannel, 1,  posF, color.y, border);
+                colorLUT.z = applyLUT(iLUTChannel, 2,  posF, color.z, border);
+                colorLUT.w = 0;
+            }
+            float4 colorOUT = yuv_to_rgb(colorLUT);
+            if (linearRGB)
+            {
+                colorOUT = srgb_to_linear(colorOUT);
+            }
+            else
+            {
+                colorOUT = colorOUT / 255.;
+            }
+            frameRGB[pos] = clamp(colorOUT, 0, 1.0);
+        }
+    }
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/StitchEngineBase.cpp Added

@@ -0,0 +1,1031 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include "StitchEngineBase.h"
+#include <DirectXMath.h>
+#include <math.h>
+
+using namespace amf;
+using namespace DirectX;
+
+#define AMF_FACILITY L"StitchEngineBase"
+static XMVECTOR CorrectLensCircularFishEye(XMVECTOR src, double hfov, double f, double kz, float &transparency);
+static XMVECTOR CorrectLensRadial(XMVECTOR src, double a, double b, double c);
+static XMVECTOR CorrectLensRadialInverse(XMVECTOR src, double a, double b, double c);
+static float CalcTransparencyTex(float posx, float posy, bool bFullImage, float zoom_z);
+static XMVECTOR CartesianToEquirectangular(XMVECTOR src);
+
+//-------------------------------------------------------------------------------------------------
+StitchEngineBase::StitchEngineBase(AMFContext* pContext) :
+m_pContext(pContext),
+m_iWidthTriangle(128),
+m_iHeightTriangle(128)
+{
+}
+
+//-------------------------------------------------------------------------------------------------
+StitchEngineBase::~StitchEngineBase()
+{
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineBase::PrepareMesh(
+    amf_int32 widthInput, amf_int32 heightInput, 
+    amf_int32 widthOutput, amf_int32 heightOutput, 
+    AMFPropertyStorage *pStorage,
+    AMFPropertyStorage *pStorageMain,
+    int channel, 
+    std::vector<TextureVertex> &vertices,
+    std::vector<amf_uint32> &verticesRowSize,
+    AMFRect &borderRect,
+    DirectX::XMVECTOR &texRect,
+    std::vector<DirectX::XMVECTOR> &sides,
+    std::vector<DirectX::XMVECTOR> &corners,
+    DirectX::XMVECTOR &plane,
+    DirectX::XMVECTOR &planeCenter,
+    AMFSurface **ppBorderMap
+    )
+{
+    vertices.clear();
+    verticesRowSize.clear();
+
+    AMF_RESULT res = AMF_OK;
+
+    // get parameters
+    amf_int32 streamCount=0;
+    pStorageMain->GetProperty(AMF_VIDEO_STITCH_INPUTCOUNT, &streamCount);
+
+    double lensCorrK1 = 0.0;
+    res = pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_CORR_K1, &lensCorrK1);
+    double lensCorrK2 = 0.0;
+    res = pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_CORR_K2, &lensCorrK2);
+    double lensCorrK3 = 0.0;
+    res = pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_CORR_K3, &lensCorrK3);
+    double lensCorrOffX = 0.0;
+    res = pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_CORR_OFFX, &lensCorrOffX);
+    double lensCorrOffY = 0.0;
+    res = pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_CORR_OFFY, &lensCorrOffY);
+    double offset_x = 0;
+    double offset_y = 0;
+    double offset_z = 0;
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_OFFSET_X, &offset_x);
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_OFFSET_Y, &offset_y);
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_SCALE, &offset_z);
+
+    amf_int64 lensCorrectionMode = AMF_VIDEO_STITCH_LENS_RECTILINEAR;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_LENS_MODE, &lensCorrectionMode);
+
+    AMFRect crop = {};
+    res = pStorage->GetProperty(AMF_VIDEO_STITCH_CROP, &crop);
+    amf_int32 widthInputOrg  = widthInput;
+    amf_int32 heightInputOrg = heightInput; 
+
+    double crop_offset_x = 0;
+    double crop_offset_y = 0;
+
+    if(crop.Width() > 0 && crop.Height() > 0)
+    {
+        crop_offset_x = 0;
+        crop_offset_y = 0;
+        widthInput = crop.Width();
+        heightInput = crop.Height();
+    }
+
+    offset_x /= widthInputOrg / 2.0;
+    offset_y /= heightInputOrg / 2.0;
+
+    crop_offset_x /= widthInputOrg / 2.0;
+    crop_offset_y /= heightInputOrg / 2.0;
+
+    double pitch = 0.0; 
+    double yaw = 0.0; 
+    double roll = 0.0;
+
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_ANGLE_PITCH, &pitch);
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_ANGLE_YAW, &yaw);
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_ANGLE_ROLL, &roll);
+
+    double hfov = M_PI / 2.0;
+    pStorage->GetProperty(AMF_VIDEO_CAMERA_HFOV, &hfov);
+    
+    if(lensCorrectionMode == AMF_VIDEO_STITCH_LENS_RECTILINEAR)
+    {
+        offset_z = 1.0 / tan(hfov / 2.0);
+    }
+
+    offset_z = 1.0 - ((double)widthInput/ heightInput) * offset_z;
+
+    double zoom1 = 1.02;
+    double fishEyeZoom = 1.0;
+    switch(lensCorrectionMode)
+    {
+    case AMF_VIDEO_STITCH_LENS_RECTILINEAR:
+        lensCorrOffX /= widthInputOrg / 2.0;
+        lensCorrOffY /= heightInputOrg / 2.0;
+        break;
+    case AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME:
+        fishEyeZoom = 2.0;
+        lensCorrOffX /= widthInputOrg / 2.0;
+        lensCorrOffY /= heightInputOrg / 2.0;
+        offset_z *= 1.11;
+        break;
+    case AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR:
+        fishEyeZoom = 2.0;
+        lensCorrOffX /= widthInputOrg / 2.0;
+        lensCorrOffY /= widthInputOrg / 2.0;
+        break;
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // square texture 
+    //---------------------------------------------------------------------------------------------
+
+    float tex_l = 0.0f;
+    float tex_t = 0.0f;
+    float tex_w = 1.0f;
+    float tex_h = 1.0f;
+
+    float w = 2.0f;
+    float h = 2.0f;
+    float d = 2.0f;
+
+    float l = -1.0f;
+    float t = -1.0f;
+    float f = -1.0f;
+    float r = 1.0f;
+    float b = 1.0f;
+    float e = 1.0f;
+
+    if(crop.Width() > 0 && crop.Height() > 0)
+    {
+        tex_l = (float)crop.left / widthInputOrg;
+        tex_t = (float)crop.top / heightInputOrg;
+
+        tex_w = (float)crop.Width() / widthInputOrg;
+        tex_h = (float)crop.Height() / heightInputOrg;
+    }
+
+    double aspectX = 1.0f;
+    double aspectY = 1.0f;
+    if(widthInput > heightInput)
+    {
+        aspectX = (float)widthInput / heightInput;
+    }
+    else
+    {
+        aspectY = (float)heightInput / widthInput;
+    }
+
+    //---------------------------------------------------------------------------------------------
+    // Create and set vertex buffer
+    //---------------------------------------------------------------------------------------------
+    XMMATRIX orientation = XMMatrixRotationRollPitchYaw((float)pitch, (float)yaw, (float)roll);
+    XMMATRIX orientationRollPitch = XMMatrixRotationRollPitchYaw((float)pitch, (float)0, (float)roll);
+    XMMATRIX orientationYaw = XMMatrixRotationRollPitchYaw((float)0, (float)yaw, (float)0);
+    XMMATRIX textureReverse = XMMatrixRotationRollPitchYaw((float)0, (float)0, (float)M_PI);
+    XMMATRIX aspect = XMMatrixScaling((float)aspectX , (float)aspectY , 1.0f);
+    XMMATRIX aspectInv = XMMatrixScaling(1.0f/(float)aspectX , 1.0f/(float)aspectY , 1.0f);
+    XMMATRIX translation = XMMatrixTranslation((float)lensCorrOffX, (float)lensCorrOffY, 0);
+    XMMATRIX zoom = XMMatrixTranslation(0, 0, (float)offset_z);
+    XMMATRIX crop_translation = XMMatrixTranslation((float)crop_offset_x, (float)crop_offset_y, 0);
+    
+    // normalized rect
+    double leftB = -1.0;
+    double topB = -1.0;
+    double rightB = 1.0;
+    double bottomB = 1.0;
+
+    // scale
+    leftB /= aspectX;
+    topB /= aspectY;
+    rightB /= aspectX;
+    bottomB /= aspectY;
+
+    // translate XY
+    leftB -= lensCorrOffX;
+    topB -= lensCorrOffY;
+    rightB -= lensCorrOffX;
+    bottomB -= lensCorrOffY;
+
+    // fill DirectX::XMVECTOR* corners
+    switch(streamCount)
+    {
+     case 2:
+     case 4:
+     case 6:
+         corners.resize(4);
+         corners[0] = XMVectorSet( 1.0f, 1.0f, -1.0f, 0.0f); //lt
+         corners[1] = XMVectorSet( -1.0f, 1.0f, -1.0f, 0.0f); //rt
+         corners[2] = XMVectorSet( -1.0f,  -1.0f, -1.0f, 0.0f); //rb
+         corners[3] = XMVectorSet( 1.0f,  -1.0f, -1.0f, 0.0f); //lb
+
+         corners[0] = XMVector3Transform(corners[0], orientation);
+         corners[1] = XMVector3Transform(corners[1], orientation);
+         corners[2] = XMVector3Transform(corners[2], orientation);
+         corners[3] = XMVector3Transform(corners[3], orientation);
+
+         // fill DirectX::XMVECTOR* center of sides
+         sides.resize(4);
+         sides[0] = XMVectorSet( 1.0f,  0.0f, -1.0f, 0.0f); //right
+         sides[1] = XMVectorSet( 0.0f,  1.0f, -1.0f, 0.0f); //bottom
+         sides[2] = XMVectorSet(-1.0f,  0.0f, -1.0f, 0.0f); //left
+         sides[3] = XMVectorSet( 0.0f, -1.0f, -1.0f, 0.0f); //top
+
+         sides[0] = XMVector3Transform(sides[0], orientation);
+         sides[1] = XMVector3Transform(sides[1], orientation);
+         sides[2] = XMVector3Transform(sides[2], orientation);
+         sides[3] = XMVector3Transform(sides[3], orientation);
+
+         break;
+    }
+
+    // scale based on Z
+    leftB /= 1.0 + offset_z;
+    topB /= 1.0 + offset_z;
+    rightB /= 1.0 + offset_z;
+    bottomB /= 1.0 + offset_z;
+
+    // back to image
+    texRect = XMVectorSet(float( (leftB + 1.0) / 2.0),  float((topB + 1.0) / 2.0), float((rightB + 1.0) / 2.0), float((bottomB + 1.0) / 2.0));
+    borderRect.left = amf_int32((leftB + 1.0) / 2.0  * widthInput);
+    borderRect.top = amf_int32((topB + 1.0) / 2.0 * heightInput);
+    borderRect.right = amf_int32((rightB + 1.0) / 2.0 * widthInput);
+    borderRect.bottom = amf_int32((bottomB + 1.0) / 2.0 * heightInput);
+
+    // define camera plane
+    XMVECTOR point1 = XMVectorSet( -1.0f, -1.0f, -1.0f, 0.0f);
+    XMVECTOR point2 = XMVectorSet( 1.0f,  0.0f, -1.0f, 0.0f);
+    XMVECTOR point3 = XMVectorSet( 1.0f,  1.0f, -1.0f, 0.0f);
+
+    point1 = XMVector3Transform(point1, textureReverse);
+    point1 = XMVector3Transform(point1, aspect);
+    point1 = XMVector3Transform(point1, translation); 
+    point1 = XMVector3Transform(point1, zoom); 
+    point1 = XMVector3Transform(point1, orientation); 
+
+    point2 = XMVector3Transform(point2, textureReverse);
+    point2 = XMVector3Transform(point2, aspect);
+    point2 = XMVector3Transform(point2, translation); 
+    point2 = XMVector3Transform(point2, zoom); 
+    point2 = XMVector3Transform(point2, orientation); 
+
+    point3 = XMVector3Transform(point3, textureReverse);
+    point3 = XMVector3Transform(point3, aspect);
+    point3 = XMVector3Transform(point3, translation); 
+    point3 = XMVector3Transform(point3, zoom); 
+    point3 = XMVector3Transform(point3, orientation); 
+
+    plane = XMPlaneFromPoints(point1, point2, point3);
+
+    planeCenter = XMVectorSet( 0.0f, 0.0f, -1.0f, 0.0f);
+    planeCenter = XMVector3Transform(planeCenter, textureReverse);
+    planeCenter = XMVector3Transform(planeCenter, aspect);
+    planeCenter = XMVector3Transform(planeCenter, translation); 
+    planeCenter = XMVector3Transform(planeCenter, zoom); 
+    planeCenter = XMVector3Transform(planeCenter, orientation); 
+
+
+    float radiusCircular = 0;
+    if(widthInput > heightInput)
+    {
+        radiusCircular = tex_w / 2.0f;
+    }
+    else
+    {
+        radiusCircular = tex_h / 2.0f;
+    }
+    radiusCircular*=1.2f;
+
+    for(int y = 0; y <= m_iHeightTriangle; y++)
+    {
+        int countInRow = 0;
+        for(int x = 0; x <= m_iWidthTriangle; x++)
+        {
+            TextureVertex v;
+            float posx = l + (float) x / m_iWidthTriangle * w;
+            float posy = t +(float) y / m_iHeightTriangle * h;
+            float posz = f;
+
+            v.Tex[0] = (tex_l + ((float) x / m_iWidthTriangle) * tex_w);
+            v.Tex[1] = (tex_t + ((float) y / m_iHeightTriangle) * tex_h);
+
+            if(v.Tex[0] < 0 || v.Tex[1] < 0 || v.Tex[0] > 1.0f || v.Tex[1] > 1.0f)
+            {
+                continue;
+            }
+
+          v.Tex[2] = CalcTransparencyTex(v.Tex[0], v.Tex[1], true, 1.0f);
+          XMVECTOR vec= XMVectorSet(posx, posy, posz, 0.0f);
+
+          vec = XMVector3Transform(vec, textureReverse);
+          vec = XMVector3Transform(vec, crop_translation); 
+          vec = XMVector3Transform(vec, translation); 
+          vec = XMVector3Transform(vec, aspect);
+
+          switch(lensCorrectionMode)
+          {
+          case AMF_VIDEO_STITCH_LENS_RECTILINEAR:
+              vec = CorrectLensRadial(vec, lensCorrK1, lensCorrK2, lensCorrK3);
+              break;
+          case AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME:
+              vec = CorrectLensRadialInverse(vec, lensCorrK1, lensCorrK2, lensCorrK3);
+              vec = CorrectLensCircularFishEye(vec, hfov, 1.0, 1.0, v.Tex[2]);
+              break;
+          case AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR:
+              vec = CorrectLensRadialInverse(vec, lensCorrK1, lensCorrK2, lensCorrK3);
+              vec = CorrectLensCircularFishEye(vec, hfov, 1.0, 1.0, v.Tex[2]);
+              break;
+          default:
+              break;
+          }
+
+          vec = XMVector3Transform(vec, zoom); 
+          vec = XMVector3Transform(vec, orientation);
+          v.Pos[0] = XMVectorGetX(vec);
+          v.Pos[1] = XMVectorGetY(vec);
+          v.Pos[2] = XMVectorGetZ(vec);
+          vertices.push_back(v);
+          countInRow++;
+        }
+
+        if(countInRow > 0)
+        {
+            verticesRowSize.push_back(countInRow);
+        }
+    }
+
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineBase::GetTransform(amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, Transform &camera, Transform &transform, Transform *cubemap)
+{
+    AMF_RESULT res = AMF_OK;
+    amf_int32 streamCount=0;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_INPUTCOUNT, &streamCount);
+    amf_int64 modeTmp = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, &modeTmp);
+    AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode = (AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM)modeTmp;
+
+    switch(outputMode)
+    {
+    case AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP:
+    {
+        XMMATRIX &worldViewProjection = *((XMMATRIX*)&transform);
+        worldViewProjection = XMMatrixTranspose(XMMatrixIdentity());
+        
+        for(int f = 0; f < 6; f++)
+        {
+            XMVECTOR Eye = XMVectorSet(0.0f ,0.0f, 0.0f, 0.0f);
+            XMVECTOR At = XMVectorSet(0.0f, 0.0f, -1.0f, 0.0f);
+            float orientationX = 0;
+            float orientationY = 0;
+            float orientationZ = 0;
+            XMMATRIX correction = XMMatrixRotationZ(XM_PI) * XMMatrixRotationY(XM_PI);
+            XMMATRIX rotation = XMMatrixIdentity();
+            switch(f)
+            {
+            case 0:  //OK
+                rotation = XMMatrixRotationY(-XM_PIDIV2) * XMMatrixRotationZ(-XM_PIDIV2);
+                break; // +X
+            case 1: //OK
+                rotation = XMMatrixRotationY(XM_PIDIV2) * XMMatrixRotationZ(XM_PIDIV2);
+                break; // -X
+            case 2:  //OK
+                rotation = XMMatrixIdentity();
+                break; // +Y
+            case 3: //OK
+                rotation = XMMatrixRotationY(XM_PI) * XMMatrixRotationZ(XM_PI);
+                break; // -Y
+            case 4: // OK
+                rotation = XMMatrixRotationX(-XM_PIDIV2);
+                break; // +Z
+            case 5:  //OK
+                rotation = XMMatrixRotationX(-XM_PIDIV2) * XMMatrixRotationY(XM_PI);
+                break; // -Z
+            }
+
+            XMVECTOR Up = XMVectorSet(0.0f, 1.0f, 0.0f, 0.0f);
+            XMMATRIX orientation = XMMatrixLookToLH(Eye, At, Up);
+            XMMATRIX projection = XMMatrixPerspectiveFovLH(XM_PIDIV2, (float)1 / 1, 0.1f, 10.0f);
+            XMMATRIX &worldViewProjection = *((XMMATRIX*)&cubemap[f]);
+            worldViewProjection = XMMatrixTranspose(orientation * correction * rotation * projection); 
+       }
+    }
+        break;
+    case AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW:
+    {
+        double angle = 0.0;
+        pStorage->GetProperty(AMF_VIDEO_STITCH_VIEW_ROTATE_X, &angle);
+        float orientationX = (float)angle;
+        pStorage->GetProperty(AMF_VIDEO_STITCH_VIEW_ROTATE_Y, &angle);
+        float orientationY = (float)angle;
+        pStorage->GetProperty(AMF_VIDEO_STITCH_VIEW_ROTATE_Z, &angle);
+        float orientationZ = (float)angle;
+        XMMATRIX &rotation = *((XMMATRIX *)&camera);
+        XMVECTOR Eye = XMVectorSet(0.0f ,0.0f, 0.0f, 0.0f);
+        XMVECTOR At = XMVectorSet(0.0f, 0.0f, -1.0f, 0.0f);
+        XMVECTOR Up = XMVectorSet(0.0f, 1.0f, 0.0f, 0.0f);
+        XMMATRIX orientation = XMMatrixLookToLH(Eye, At, Up);
+        XMMATRIX viewX = XMMatrixRotationX(orientationX);
+        XMMATRIX viewY = XMMatrixRotationY(orientationY);
+        XMMATRIX viewZ = XMMatrixRotationZ(orientationZ);
+        rotation =  viewY * (rotation * viewZ * viewX); // calc and store 
+        XMMATRIX projection = XMMatrixPerspectiveFovLH(XM_PIDIV2, (float)widthOutput / heightOutput, 0.1f, 10.0f);
+        XMMATRIX &worldViewProjection = *((XMMATRIX*)&transform);
+        worldViewProjection = XMMatrixTranspose(orientation * rotation * projection); 
+    }
+        break;
+    case AMF_VIDEO_STITCH_OUTPUT_MODE_EQUIRECTANGULAR:
+    {
+        XMMATRIX worldViewProjection = XMMatrixIdentity();
+        memcpy(transform.m_WorldViewProjection, &worldViewProjection, sizeof(transform.m_WorldViewProjection));
+    }
+        break;
+    }
+
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+static XMVECTOR CorrectLensRadial(XMVECTOR src, double a, double b, double c)
+{
+    double d = 1.0 - a - b - c; //balanced scale
+    double x = XMVectorGetX(src);
+    double y = XMVectorGetY(src);
+    double r2 = (x*x) + (y*y);
+    double r1 = sqrt(r2);
+    double r3 = r2 * r1;
+    double cDist = d + a * r3 + b * r2 + c * r1;
+    double xd = x * cDist;
+    double yd = y * cDist;
+    double ud = xd;
+    double vd = yd;
+    XMVECTOR dst = XMVectorSet((float)ud, (float)vd, XMVectorGetZ(src), XMVectorGetW(src));
+    return dst;
+}
+
+static void matrix_inv_mult( double m[3][3], double vector[3] )
+{
+    register int i;
+    register double v0 = vector[0];
+    register double v1 = vector[1];
+    register double v2 = vector[2];
+    
+    for(i=0; i<3; i++)
+    {
+        vector[i] = m[0][i] * v0 + m[1][i] * v1 + m[2][i] * v2;
+    }
+}
+
+static void matrix_matrix_mult( double m1[3][3],double m2[3][3],double result[3][3])
+{
+    register int i,k;
+    
+    for(i=0;i<3;i++)
+    {
+        for(k=0; k<3; k++)
+        {
+            result[i][k] = m1[i][0] * m2[0][k] + m1[i][1] * m2[1][k] + m1[i][2] * m2[2][k];
+        }
+    }
+}
+
+static void SetMatrix( double a, double b, double c , double m[3][3], int cl )
+{
+    double mx[3][3], my[3][3], mz[3][3], dummy[3][3];
+    // Calculate Matrices;
+    mx[0][0] = 1.0 ;                mx[0][1] = 0.0 ;              mx[0][2] = 0.0;
+    mx[1][0] = 0.0 ;                mx[1][1] = cos(a) ;           mx[1][2] = sin(a);
+    mx[2][0] = 0.0 ;                mx[2][1] =-mx[1][2] ;         mx[2][2] = mx[1][1];
+    
+    my[0][0] = cos(b);              my[0][1] = 0.0 ;              my[0][2] =-sin(b);
+    my[1][0] = 0.0 ;                my[1][1] = 1.0 ;              my[1][2] = 0.0;
+    my[2][0] = -my[0][2];           my[2][1] = 0.0 ;              my[2][2] = my[0][0];
+    
+    mz[0][0] = cos(c) ;             mz[0][1] = sin(c) ;           mz[0][2] = 0.0;
+    mz[1][0] =-mz[0][1] ;           mz[1][1] = mz[0][0] ;         mz[1][2] = 0.0;
+    mz[2][0] = 0.0 ;                mz[2][1] = 0.0 ;              mz[2][2] = 1.0;
+
+    if( cl )
+    {
+        matrix_matrix_mult( mz, mx,     dummy);
+    }
+    else
+    {
+        matrix_matrix_mult( mx, mz,     dummy);
+    }
+
+    matrix_matrix_mult( dummy, my, m);
+}
+
+static XMVECTOR CorrectLensCircularFishEye(XMVECTOR src , double hfov, double f , double kz, float &transparency)
+{
+    double x = XMVectorGetX(src);
+    double y = XMVectorGetY(src);
+    double z = XMVectorGetZ(src);
+
+    if( fabs(x - 1.0) < 0.001 && fabs(y - 0.0) < 0.001)
+    {
+        int a = 1;
+    }
+    if( fabs(x - 0.0) < 0.001 && fabs(y - 1.0) < 0.001)
+    {
+        int a = 1;
+    }
+
+    double fov2 = hfov / 2.0;
+    double pheta = atan2(y , x);
+
+    double r = sqrt(x * x + y * y) ;
+    double theta = r / f * fov2; // equidistance projection
+
+    double new_r = 1.0;
+    double new_x = 0;
+    double new_y = 0;
+    double new_z = -new_r * cos(theta);
+    
+    if(fabs(theta) > M_PI / 2.0)
+    {
+        transparency = 0.0f;
+        new_x = new_r * sin(theta) * cos(pheta);
+        new_y = new_r * sin(theta) * sin(pheta);
+    }
+    else
+    {
+        transparency = 1.0f;
+        new_x = new_r * sin(theta) * cos(pheta);
+        new_y = new_r * sin(theta) * sin(pheta);
+    }
+
+    XMVECTOR dst = XMVectorSet((float)new_x, (float)new_y, (float)new_z, XMVectorGetW(src));
+    return dst;
+}
+
+//-------------------------------------------------------------------------------------------------
+static XMVECTOR CorrectLensRadialInverse(XMVECTOR src, double a, double b, double c)
+{
+    double d = 1.0 - a - b - c; //balanced scale
+    double x = XMVectorGetX(src) ;
+    double y = XMVectorGetY(src) ;
+    double r2 = (x*x) + (y*y);
+    double r1 = sqrt(r2);
+    double rd = r1;
+    double rs = rd;
+    double f = (((a * rs + b) * rs + c) * rs + d) * rs;
+
+#define MAXITER 100
+#define R_EPS 1.0e-6
+
+    int iter = 0;
+    while( std::abs(f - rd) > R_EPS && iter++ < MAXITER )
+    {
+        rs = rs - (f - rd) / ((( 4 * a * rs + 3 * b) * rs  + 2 * c) * rs + 1 * d);
+        f = (((a * rs + b) * rs + c) * rs + d) * rs;
+    }
+
+    double scale = rd == 0.0  || iter >= MAXITER  ? 1.0 : rs / rd;
+    double xd = x * scale;
+    double yd = y * scale;
+    double ud = xd;
+    double vd = yd;
+    XMVECTOR dst = XMVectorSet((float)ud, (float)vd, XMVectorGetZ(src), XMVectorGetW(src));
+    return dst;
+}
+
+double my_round(double x)
+{
+    return (int)x;
+}
+
+double cubicroot(double num )
+{
+  double flag = 1.0;
+  if (num < 0)
+  {
+        flag = -1.0;
+  }
+  num = num - num - num;
+  double x0 = num / 2.;
+  double x1 = x0 - (((x0 * x0 * x0) - num) / (3. * x0 * x0));
+  while(my_round(x0) != my_round(x1))
+  {
+    x0 = x1;
+    x1 = x0 - (((x0 * x0 * x0) - num) / (3. * x0 * x0));
+  }
+  return x1 * flag;
+}
+
+DirectX::XMVECTOR StitchEngineBase::CartesianToSpherical(DirectX::XMVECTOR src)
+{
+    double x = XMVectorGetX(src);
+    double y = XMVectorGetY(src);
+    double z = XMVectorGetZ(src);
+    double r = sqrt(x *x + y * y + z * z);
+    double theta = acos(z / r); // elevation
+    double pheta = atan2(y, x); //azimuth
+    XMVECTOR dst = XMVectorSet((float)theta, (float)pheta, (float)r, XMVectorGetW(src));
+    return dst;
+}
+
+XMVECTOR StitchEngineBase::MakeSphere(XMVECTOR src, float centerX,float centerY,float centerZ, float newRadius)
+{
+    double x = XMVectorGetX(src) - centerX;
+    double y = XMVectorGetY(src) - centerY;
+    double z = XMVectorGetZ(src) - centerZ;
+    double r = sqrt(x *x + y * y + z * z);
+    double theta = acos(z / r); // elevation
+    double pheta = atan2(y, x); //azimuth
+    double new_r = newRadius;
+    double new_x = new_r * sin(theta) * cos(pheta);
+    double new_y = new_r * sin(theta) * sin(pheta);
+    double new_z = new_r * cos(theta);
+    XMVECTOR dst = XMVectorSet((float)new_x + centerX, (float)new_y + centerY, (float)new_z + centerZ, XMVectorGetW(src));
+    return dst;
+}
+
+void StitchEngineBase::MakeSphere(TextureVertex &v, float centerX,float centerY,float centerZ, float newRadius)
+{
+    double x = v.Pos[0] - centerX;
+    double y = v.Pos[1] - centerY;
+    double z = v.Pos[2] - centerZ;
+    double r = sqrt(x *x + y * y + z * z);
+    double theta = acos(z / r); // elevation
+    double pheta = atan2(y, x); //azimuth
+    double new_r = newRadius;
+    double new_x = new_r * sin(theta) * cos(pheta);
+    double new_y = new_r * sin(theta) * sin(pheta);
+    double new_z = new_r * cos(theta);
+
+    v.Pos[0] = (float)new_x + centerX;
+    v.Pos[1] = (float)new_y + centerY;
+    v.Pos[2] = (float)new_z + centerZ;
+}
+
+//-------------------------------------------------------------------------------------------------
+float CalcTransparencyTex(float posx, float posy, bool bFullImage, float zoom_z)
+{
+    float transparency = 0.01f;
+    float transparencyBorder = 1.0f;
+
+#if defined(DEBUG_TRANSPARENT)
+    float transparencyMax = 0.3f;
+    float transparencyMin = 0.3f;
+#else
+    float transparencyMax = 1.0f;
+    float transparencyMin = 0.0f;
+#endif
+
+     transparencyBorder /= zoom_z;
+     float transparencyVertex = transparencyMax;
+
+     if(posx < 0 || posx > transparencyBorder )
+     {
+         transparencyVertex *= transparencyMin;
+     } 
+     else if(posx < 0 + transparency)
+     {
+         float x0 = transparency;
+         float x1 = 0;
+         float y0 = transparencyMax;
+         float y1 = transparencyMin;
+         float val = y0 + (y1 - y0) * (posx - x0) / (x1 - x0);
+         transparencyVertex *= val;
+     }
+     else if(posx > transparencyBorder - transparency)
+     {
+         float x0 = transparencyBorder - transparency;
+         float x1 = transparencyBorder;
+         float y0 = transparencyMax;
+         float y1 = transparencyMin;
+         float val = y0 + (y1 - y0) * (posx - x0) / (x1 - x0);
+         transparencyVertex *= val;
+     }
+
+     if(posy < 0 || posy > transparencyBorder )
+     {
+         transparencyVertex = transparencyMin;
+     } 
+     else if(posy < 0 + transparency)
+     {
+         float x0 = transparency;
+         float x1 = 0;
+         float y0 = transparencyMax;
+         float y1 = transparencyMin;
+         float val = y0 + (y1 - y0) * (posy - x0) / (x1 - x0);
+         transparencyVertex *= val;
+     }
+     else if(posy > transparencyBorder - transparency)
+     {
+         float x0 = transparencyBorder - transparency;
+         float x1 = transparencyBorder;
+         float y0 = transparencyMax;
+         float y1 = transparencyMin;
+         float val = y0 + (y1 - y0) * (posy - x0) / (x1 - x0);
+         transparencyVertex *= val;
+     }
+     return transparencyVertex;
+}
+
+//-------------------------------------------------------------------------------------------------
+#define MY_SIGN(a) (a == 0 ? 0 : (a < 0 ? -1 : 1)  )
+#define EPSILON 0.00001f
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL StitchEngineBase::ApplyMode(
+    amf_int32 widthOutput, amf_int32 heightOutput,
+    std::vector<TextureVertex> &vertices, 
+    std::vector<amf_uint32> &verticesRowSize,
+    std::vector<TextureVertex> &verticesProjected, 
+    std::vector<amf_uint16> &indexes, 
+    AMFPropertyStorage *pStorage)
+{
+    amf_int64 modeTmp = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+    pStorage->GetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, &modeTmp);
+    AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM outputMode = (AMF_VIDEO_STITCH_OUTPUT_MODE_ENUM)modeTmp;
+    
+    verticesProjected.clear();
+    indexes.clear();
+
+    switch(outputMode)
+    {
+    case AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP:
+    case AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW:
+        for(amf_uint32 y = 0; y < (amf_uint32)verticesRowSize.size() - 1; y++)
+        {
+            int base1 = y * verticesRowSize[y];
+            int base2 = (y + 1) * verticesRowSize[y];
+
+            for(amf_uint32 x = 0; x < verticesRowSize[y] - 1; x++)
+            {
+                // 2 trinagles
+                for( int i = 0; i < 2; i++)
+                {
+                    int index1 = i == 0 ? base1 + x : base2 + x; 
+                    int index2 = i == 0 ? base2 + x : base1 + x + 1; 
+                    int index3 = i == 0 ? base1 + x + 1 : base2 + x + 1;
+
+                    if(vertices[index1].Tex[2] != 0.0f || vertices[index2].Tex[2] != 0.0f || vertices[index3].Tex[2] != 0.0f) // cull transparent vertexes
+                    {
+                        verticesProjected.push_back(vertices[index1]);
+                        verticesProjected.push_back(vertices[index2]);
+                        verticesProjected.push_back(vertices[index3]);
+                    }
+                }
+            }
+        }
+        break;
+
+    case AMF_VIDEO_STITCH_OUTPUT_MODE_EQUIRECTANGULAR:
+        {
+        // make vertical plane along Z
+        XMVECTOR point1 = XMVectorSet( 0.0f, 0.0f, 0.0f, 0.0f);
+        XMVECTOR point2 = XMVectorSet( 0.0f, 0.0f, 1.0f, 0.0f);
+        XMVECTOR point3 = XMVectorSet( 0.0f, 1.0f, 0.0f, 0.0f);
+        XMVECTOR plane = XMPlaneFromPoints(point1, point2, point3);
+
+        float a = XMVectorGetX(plane);
+        float b = XMVectorGetY(plane);
+        float c = XMVectorGetZ(plane);
+        float d = XMVectorGetW(plane);
+        float sqrtabsd = sqrt(a * a + b * b + c * c + d * d);
+
+        float heightPixelSize = 2.0f / (float)heightOutput;
+
+        for(amf_uint32 y = 0; y < (amf_uint32)verticesRowSize.size() - 1; y++)
+        {
+            int base1 = y * verticesRowSize[y];
+            int base2 = (y + 1) * verticesRowSize[y];
+
+            for(amf_uint32 x = 0; x < verticesRowSize[y] - 1; x++)
+            {
+                // 2 trinagles
+                for( int i = 0; i < 2; i++)
+                {
+                    int index1 = i == 0 ? base1 + x     : base2 + x; 
+                    int index2 = i == 0 ? base2 + x     : base1 + x + 1; 
+                    int index3 = i == 0 ? base1 + x + 1 : base2 + x + 1;
+
+                    TextureVertex v1 = vertices[index1];
+                    TextureVertex v2 = vertices[index2];
+                    TextureVertex v3 = vertices[index3];
+
+                    MakeSphere(v1, 0, 0, 0, 1.0f);
+                    MakeSphere(v2, 0, 0, 0, 1.0f);
+                    MakeSphere(v3, 0, 0, 0, 1.0f);
+
+
+                    float dist1 = (a * v1.Pos[0] + b * v1.Pos[1] + c * v1.Pos[2] + d) / sqrtabsd;
+                    float dist2 = (a * v2.Pos[0] + b * v2.Pos[1] + c * v2.Pos[2] + d) / sqrtabsd;
+                    float dist3 = (a * v3.Pos[0] + b * v3.Pos[1] + c * v3.Pos[2] + d) / sqrtabsd;
+
+                    if(dist1 >= 0 && dist1 < EPSILON)
+                    {
+                        v1.Pos[0] = -EPSILON;
+                    }
+                    else if(dist1 < 0 && dist1 > -EPSILON)
+                    {
+                        v1.Pos[0] = EPSILON;
+                    }
+                    if(dist2 >= 0 && dist2 < EPSILON)
+                    {
+                        v2.Pos[0] = -EPSILON;
+                    }
+                    else if(dist2 < 0 && dist2 > -EPSILON)
+                    {
+                        v2.Pos[0] = EPSILON;
+                    }
+                    if(dist3 >= 0 && dist3 < EPSILON)
+                    {
+                        v3.Pos[0] = -EPSILON;
+                    }
+                    else if(dist3 < 0 && dist3 > -EPSILON)
+                    {
+                        v3.Pos[0] = EPSILON;
+                    }
+
+                    int sumOfSigns = abs(MY_SIGN(dist1) + MY_SIGN(dist2) + MY_SIGN(dist3));
+
+
+                    if((v1.Pos[2] < 0 || v2.Pos[2] < 0 || v3.Pos[2] < 0) &&  sumOfSigns != 3 )
+                    {
+                        if(MY_SIGN(dist1) != MY_SIGN(dist2) && MY_SIGN(dist1) != MY_SIGN(dist3))
+                        {
+                        }
+                        else if(MY_SIGN(dist2) != MY_SIGN(dist1) && MY_SIGN(dist2) != MY_SIGN(dist3))
+                        {
+                            TextureVertex tmp = v1;
+                            v1 = v2;
+                            v2 = v3;
+                            v3 = tmp;
+                        }
+                        else if(MY_SIGN(dist3) != MY_SIGN(dist1) && MY_SIGN(dist3) != MY_SIGN(dist2))
+                        {
+                            TextureVertex tmp = v1;
+                            v1 = v3;
+                            v3 = v2;
+                            v2 = tmp;
+                        }
+                        XMVECTOR point1 = XMVectorSet( v1.Pos[0], v1.Pos[1], v1.Pos[2], 0.0f);
+                        XMVECTOR point2 = XMVectorSet( v2.Pos[0], v2.Pos[1], v2.Pos[2], 0.0f);
+                        XMVECTOR point3 = XMVectorSet( v3.Pos[0], v3.Pos[1], v3.Pos[2], 0.0f);
+
+                        XMVECTOR point4 = XMPlaneIntersectLine(plane, point1, point2);
+                        XMVECTOR point5 = XMPlaneIntersectLine(plane, point1, point3);
+
+                        // move points to one side on a bit
+                        XMVECTOR point4_1 =XMVectorAdd(point4 , XMVectorScale(XMVectorSubtract(point1, point4), EPSILON));
+                        XMVECTOR point5_1 =XMVectorAdd(point5 , XMVectorScale(XMVectorSubtract(point1, point5), EPSILON));
+
+                        XMVECTOR point4_2 =  XMVectorSubtract(point4 , XMVectorScale(XMVectorSubtract(point1, point4), EPSILON));
+                        XMVECTOR point5_2 =  XMVectorSubtract(point5 , XMVectorScale(XMVectorSubtract(point1, point5), EPSILON));
+
+                        // move points to another one side on a bit
+
+                        TextureVertex v4;
+                        v4.Pos[0] = XMVectorGetX(point4_1);
+                        v4.Pos[1] = XMVectorGetY(point4_1);
+                        v4.Pos[2] = XMVectorGetZ(point4_1);
+
+                        float Distance1 = XMVectorGetX(XMVector2Length(XMVectorSubtract(point1, point4)));
+                        float Distance2 = XMVectorGetX(XMVector2Length(XMVectorSubtract(point1, point2)));
+
+
+                        v4.Tex[0] = v1.Tex[0] - (v1.Tex[0] - v2.Tex[0])  * Distance1 / Distance2; 
+                        v4.Tex[1] = v1.Tex[1] - (v1.Tex[1] - v2.Tex[1])  * Distance1 / Distance2; 
+                        v4.Tex[2] = v1.Tex[2] - (v1.Tex[2] - v2.Tex[2])  * Distance1 / Distance2; 
+
+                        TextureVertex v5;
+                        v5.Pos[0] = XMVectorGetX(point5_1);
+                        v5.Pos[1] = XMVectorGetY(point5_1);
+                        v5.Pos[2] = XMVectorGetZ(point5_1);
+
+                        float Distance3 = XMVectorGetX(XMVector2Length(XMVectorSubtract(point1, point5)));
+                        float Distance4 = XMVectorGetX(XMVector2Length(XMVectorSubtract(point1, point3)));
+
+
+                        v5.Tex[0] = v1.Tex[0] - (v1.Tex[0] - v3.Tex[0])  * Distance3 / Distance4; 
+                        v5.Tex[1] = v1.Tex[1] - (v1.Tex[1] - v3.Tex[1])  * Distance3 / Distance4; 
+                        v5.Tex[2] = v1.Tex[2] - (v1.Tex[2] - v3.Tex[2])  * Distance3 / Distance4; 
+
+
+                        if(v1.Tex[2] != 0.0f || v4.Tex[2] != 0.0f || v5.Tex[2] != 0.0f) // cull transparent vertexes
+                        {
+                            verticesProjected.push_back(v1);
+                            verticesProjected.push_back(v4);
+                            verticesProjected.push_back(v5);
+                        }
+                        v4.Pos[0] = XMVectorGetX(point4_2);
+                        v4.Pos[1] = XMVectorGetY(point4_2);
+                        v4.Pos[2] = XMVectorGetZ(point4_2);
+                        v5.Pos[0] = XMVectorGetX(point5_2);
+                        v5.Pos[1] = XMVectorGetY(point5_2);
+                        v5.Pos[2] = XMVectorGetZ(point5_2);
+
+
+                        if(v2.Tex[2] != 0.0f || v4.Tex[2] != 0.0f || v5.Tex[2] != 0.0f) // cull transparent vertexes
+                        {
+                            verticesProjected.push_back(v2);
+                            verticesProjected.push_back(v4);
+                            verticesProjected.push_back(v5);
+                        }
+                        if(v2.Tex[2] != 0.0f || v5.Tex[2] != 0.0f || v3.Tex[2] != 0.0f) // cull transparent vertexes
+                        {
+                            verticesProjected.push_back(v2);
+                            verticesProjected.push_back(v5);
+                            verticesProjected.push_back(v3);
+                        }
+                    }
+                    else
+                    {
+                        if(v1.Tex[2] != 0.0f || v2.Tex[2] != 0.0f || v3.Tex[2] != 0.0f) // cull transparent vertexes
+                        {
+                            verticesProjected.push_back(v1);
+                            verticesProjected.push_back(v2);
+                            verticesProjected.push_back(v3); 
+                        }
+                    }
+                }
+            }
+        }
+
+        for(amf_int32 i = 0; i < (amf_int32)verticesProjected.size(); i++)
+        {
+            TextureVertex &v = verticesProjected[i];
+
+            XMVECTOR vec = XMVectorSet(v.Pos[0], v.Pos[1], v.Pos[2], 0);
+
+            vec = CartesianToEquirectangular(vec);
+
+            v.Pos[0] = XMVectorGetX(vec);
+            v.Pos[1] = XMVectorGetY(vec);
+            v.Pos[2] = XMVectorGetZ(vec);
+
+        }
+        }
+        break;
+    }
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+XMVECTOR CartesianToEquirectangular(XMVECTOR src)
+{
+    double x = XMVectorGetX(src);
+    double y = XMVectorGetY(src);
+    double z = XMVectorGetZ(src);
+
+    // from cartesan to spheric
+    double r = sqrt(x *x + y * y + z * z);
+    double pheta = atan2(x, z); // azimuth - Longitude  -PI : PI 
+    double theta = acos(y / r); // elevation - Latitude   0 : PI
+
+    // handle imprefections of acos
+    if(fabs(y / r + 1.0) < 0.001)
+    {
+        theta = XM_PI;
+    }
+    if(fabs(y / r - 1.0) < 0.001)
+    {
+        theta = 0;
+    }
+
+    // Equirectangular mapping from spherical to flat
+    double out_x = pheta / XM_PI;
+    double out_y = -2.0 * theta / XM_PI +1.0;
+    double new_x = (float)out_x;
+    double new_y = (float)out_y;
+    double new_z = 0;
+    XMVECTOR dst = XMVectorSet((float)new_x, (float)new_y, (float)new_z, XMVectorGetW(src));
+    return dst;
+}
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/StitchEngineBase.h Added

@@ -0,0 +1,141 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once 
+
+#include "public/include/core/Trace.h"
+#include "public/include/core/Context.h"
+#include "public/common/InterfaceImpl.h"
+#include "public/include/components/VideoStitch.h"
+#include "HistogramImpl.h"
+#include <DirectXMath.h>
+
+#include <vector>
+//#define DEBUG_TRANSPARENT
+namespace amf
+{
+
+class StitchEngineBase : public AMFInterfaceImpl<AMFInterface>
+{
+public:
+    StitchEngineBase(AMFContext* pContext);
+    virtual ~StitchEngineBase();
+
+    virtual AMF_RESULT AMF_STD_CALL      Init(AMF_SURFACE_FORMAT formatInput, amf_int32 widthInput, amf_int32 heightInput, AMF_SURFACE_FORMAT formatOutput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, AMFPropertyStorage **ppStorageInputs) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      Terminate() = 0;
+    virtual AMF_RESULT AMF_STD_CALL      StartFrame(AMFSurface *pSurfaceOutput) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      EndFrame(bool bWait) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      ProcessStream(int index, AMFSurface *pSurface) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      UpdateFOV(amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      UpdateMesh(amf_int32 index, amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput, amf_int32 heightOutput, AMFPropertyStorage *pStorage, AMFPropertyStorage *pStorageMain) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      GetBorderRect(amf_int32 index, AMFRect &border) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      UpdateBrightness(amf_int32 index, AMFPropertyStorage *pStorage) = 0;
+    virtual RibList&   AMF_STD_CALL      GetRibs(){return m_Ribs;}  
+    virtual CornerList&   AMF_STD_CALL   GetCorners(){return m_Corners;}  
+    virtual float*     AMF_STD_CALL      GetTexRect(amf_int32 index) = 0;
+    virtual AMFSurface* AMF_STD_CALL     GetBorderMap(amf_int32 index) = 0;
+    virtual AMF_RESULT AMF_STD_CALL      AllocCubeMap(AMF_SURFACE_FORMAT formatOut, amf_int32 width, amf_int32 height, AMFSurface **ppSurface) = 0;
+
+protected:
+#pragma pack(push, r1, 1)
+    struct TextureVertex
+    {
+        TextureVertex(){}
+        TextureVertex(float pos_x,float pos_y, float pos_z, float tex_x, float tex_y, float tex_alpha)
+        {
+            Pos[0] = pos_x;
+            Pos[1] = pos_y;
+            Pos[2] = pos_z;
+            Tex[0] = tex_x;
+            Tex[1] = tex_y;
+            Tex[2] = tex_alpha;
+        }
+        float Pos[4];   //x, y, z, reserved
+        float Tex[3];   //x,y, alpha
+    };
+
+    struct ControlPoint
+    {
+        ControlPoint() : index0(-1),index1(-1){}
+
+        amf_int32       index0;   // input index
+        amf_int32       index1;   // input index
+        TextureVertex  point0;   // in world coordinate system - the same as mesh
+        TextureVertex  point1;   // in world coordinate system - the same as mesh
+    };
+    typedef std::vector<ControlPoint> ControlPointList;
+
+
+    __declspec(align(16)) struct Transform
+    {
+        float m_WorldViewProjection[4][4];
+    };
+#pragma pack(pop, r1)
+
+protected:
+    virtual AMF_RESULT AMF_STD_CALL      PrepareMesh(
+        amf_int32 widthInput, 
+        amf_int32 heightInput, 
+        amf_int32 widthOutput, 
+        amf_int32 heightOutput, 
+        AMFPropertyStorage *pStorage, 
+        AMFPropertyStorage *pStorageMain, 
+        int channel, 
+        std::vector<TextureVertex> &vertices,
+        std::vector<amf_uint32> &verticesRowSize,
+        AMFRect &borderRect, 
+        DirectX::XMVECTOR &texRect, 
+        std::vector<DirectX::XMVECTOR> &sides,
+        std::vector<DirectX::XMVECTOR> &corners,
+        DirectX::XMVECTOR &plane,
+        DirectX::XMVECTOR &planeCenter,
+        AMFSurface **ppBorderMap
+        );
+    virtual AMF_RESULT AMF_STD_CALL GetTransform(amf_int32 widthInput, amf_int32 heightInput, amf_int32 widthOutput,
+            amf_int32 heightOutput, AMFPropertyStorage *pStorage, Transform &camera, Transform &transform, Transform *cubemap);
+    virtual AMF_RESULT AMF_STD_CALL ApplyMode(amf_int32 widthOutput, amf_int32 heightOutput, std::vector<TextureVertex> &vertices, 
+        std::vector<amf_uint32> &verticesRowSize, std::vector<TextureVertex> &verticesProjected,  std::vector<amf_uint16> &indexes, 
+        AMFPropertyStorage *pStorage);
+
+    void MakeSphere(TextureVertex &v, float centerX,float centerY,float centerZ, float newRadius);
+    DirectX::XMVECTOR MakeSphere(DirectX::XMVECTOR src, float centerX,float centerY,float centerZ, float newRadius);
+    DirectX::XMVECTOR CartesianToSpherical(DirectX::XMVECTOR src);
+
+    AMFContextPtr    m_pContext;
+    RibList          m_Ribs;
+    CornerList       m_Corners;
+    ControlPointList m_ControlPoints;
+
+    amf_int32 m_iWidthTriangle;
+    amf_int32 m_iHeightTriangle;
+};
+    typedef AMFInterfacePtr_T<StitchEngineBase> StitchEngineBasePtr;
+} // namespace amf
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/VideoStitchCapsImpl.cpp Added

@@ -0,0 +1,165 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include "VideoStitchCapsImpl.h"
+#include "d3d11.h"
+
+using namespace amf;
+
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchCapsImpl::AMFVideoStitchCapsImpl()
+{
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchCapsImpl::~AMFVideoStitchCapsImpl()
+{
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchCapsImpl::Init(AMFContext* pContext)
+{
+    m_pContext = pContext;
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+//  AMFCaps methods
+//-------------------------------------------------------------------------------------------------
+AMF_ACCELERATION_TYPE AMF_STD_CALL AMFVideoStitchCapsImpl::GetAccelerationType() const
+{
+    return AMF_ACCEL_GPU;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchCapsImpl::GetInputCaps(AMFIOCaps **input)
+{
+    if (input != NULL)
+    {
+        *input = new AMFVideoStitchInputCapsImpl(m_pContext);
+        (*input)->Acquire();
+        return AMF_OK;
+    }
+    else
+    {
+        return AMF_INVALID_ARG;
+    }
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchCapsImpl::GetOutputCaps(AMFIOCaps **output)
+{
+    if (output != NULL)
+    {
+        *output = new AMFVideoStitchOutputCapsImpl(m_pContext);
+        (*output)->Acquire();
+        return AMF_OK;
+    }
+    else
+    {
+        return AMF_INVALID_ARG;
+    }
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchInputCapsImpl::AMFVideoStitchInputCapsImpl(AMFContext* pContext)
+{
+    SetResolution(32, D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION, 32, D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION);
+    SetVertAlign(2);
+
+    if (pContext->GetDX11Device() != NULL)
+    {
+        static amf::AMF_MEMORY_TYPE nativeDX11MemoryTypes[] = 
+        {
+            AMF_MEMORY_DX11
+        };
+        PopulateMemoryTypes(_countof(nativeDX11MemoryTypes), nativeDX11MemoryTypes, true);
+    }
+
+    static amf::AMF_MEMORY_TYPE nativeMemoryTypes[] = 
+    {
+        AMF_MEMORY_OPENCL,
+        AMF_MEMORY_OPENGL,
+    };
+
+    PopulateMemoryTypes(_countof(nativeMemoryTypes), nativeMemoryTypes, true);
+    static amf::AMF_MEMORY_TYPE nonNativeMemoryTypes[] = 
+    {
+        AMF_MEMORY_HOST,
+    };
+    PopulateMemoryTypes(_countof(nonNativeMemoryTypes), nonNativeMemoryTypes, false);
+
+
+    static AMF_SURFACE_FORMAT nativeFormats[] = 
+    { 
+        AMF_SURFACE_NV12,               ///< 1 - planar Y width x height + packed UV width/2 x height/2 - 8 bit per component
+        AMF_SURFACE_BGRA,               ///< 3 - packed - 8 bit per component
+        AMF_SURFACE_ARGB,               ///< 4 - packed - 8 bit per component
+        AMF_SURFACE_RGBA,               ///< 5 - packed - 8 bit per component
+    };
+    PopulateSurfaceFormats(_countof(nativeFormats), nativeFormats, true);
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchOutputCapsImpl::AMFVideoStitchOutputCapsImpl(AMFContext* pContext)
+{
+    pContext;
+    SetResolution(32, D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION, 32, D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION);
+    SetVertAlign(2);
+
+    if (pContext->GetDX11Device() != NULL)
+    {
+        static amf::AMF_MEMORY_TYPE nativeDX11MemoryTypes[] = 
+        {
+            AMF_MEMORY_DX11
+        };
+        PopulateMemoryTypes(_countof(nativeDX11MemoryTypes), nativeDX11MemoryTypes, true);
+    }
+
+    static amf::AMF_MEMORY_TYPE nativeMemoryTypes[] = 
+    {
+        AMF_MEMORY_OPENCL,
+        AMF_MEMORY_OPENGL,
+    };
+
+    PopulateMemoryTypes(_countof(nativeMemoryTypes), nativeMemoryTypes, true);
+    static amf::AMF_MEMORY_TYPE nonNativeMemoryTypes[] = 
+    {
+        AMF_MEMORY_HOST,
+    };
+    PopulateMemoryTypes(_countof(nonNativeMemoryTypes), nonNativeMemoryTypes, false);
+
+
+    static AMF_SURFACE_FORMAT nativeFormats[] = 
+    { 
+        AMF_SURFACE_NV12,               ///< 1 - planar Y width x height + packed UV width/2 x height/2 - 8 bit per component
+        AMF_SURFACE_BGRA,               ///< 3 - packed - 8 bit per component
+        AMF_SURFACE_ARGB,               ///< 4 - packed - 8 bit per component
+        AMF_SURFACE_RGBA,               ///< 5 - packed - 8 bit per component
+    };
+    PopulateSurfaceFormats(_countof(nativeFormats), nativeFormats, true);
+}
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/VideoStitchCapsImpl.h Added

@@ -0,0 +1,77 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#pragma once
+
+#include "public/include/components/Component.h"
+#include "public/include/components/ComponentCaps.h"
+#include "public/include/components/VideoStitch.h"
+#include "public/common/PropertyStorageImpl.h"
+#include "public/common/IOCapsImpl.h"
+
+namespace amf
+{
+    class AMFVideoStitchInputCapsImpl : public AMFIOCapsImpl
+    {
+    public:
+        AMFVideoStitchInputCapsImpl(AMFContext* pContext);
+    };
+
+    class AMFVideoStitchOutputCapsImpl : public AMFIOCapsImpl
+    {
+    public:
+        AMFVideoStitchOutputCapsImpl(AMFContext* pContext);
+    };
+
+
+    class AMFVideoStitchCapsImpl : public AMFInterfaceImpl< AMFPropertyStorageImpl <AMFCaps> >
+    {
+    public:
+        AMFVideoStitchCapsImpl();
+        ~AMFVideoStitchCapsImpl();
+
+        AMF_BEGIN_INTERFACE_MAP
+            AMF_INTERFACE_ENTRY(AMFCaps)
+            AMF_INTERFACE_CHAIN_ENTRY(AMFPropertyStorageImpl <AMFCaps>)
+        AMF_END_INTERFACE_MAP
+
+        virtual AMF_RESULT AMF_STD_CALL Init(AMFContext* pContext);
+
+        // AMFCaps interface
+        virtual AMF_ACCELERATION_TYPE AMF_STD_CALL GetAccelerationType() const;
+        virtual AMF_RESULT AMF_STD_CALL GetInputCaps(AMFIOCaps** input);
+        virtual AMF_RESULT AMF_STD_CALL GetOutputCaps(AMFIOCaps** output);
+    protected:
+        AMFContextPtr                 m_pContext;
+    };
+    typedef AMFInterfacePtr_T<AMFVideoStitchCapsImpl>  AMFVideoStitchCapsImplPtr;
+} // namespace amf

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/VideoStitchImpl.cpp Added

@@ -0,0 +1,744 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include "VideoStitchImpl.h"
+#include "public/include/core/Context.h"
+#include "public/include/core/Trace.h"
+#include "public/common/TraceAdapter.h"
+#include "VideoStitchCapsImpl.h"
+#include <sdkddkver.h>
+#include <VersionHelpers.h>
+
+#include "DirectX11/StitchEngineDX11.h"
+#include "math.h"
+
+//define export declaration
+#ifdef _WIN32
+        #if defined(AMF_COMPONENT_VSTITCH_EXPORTS)
+            #define AMF_COMPONENT_VSTITCH_LINK __declspec(dllexport)
+        #else
+            #define AMF_COMPONENT_VSTITCH_LINK __declspec(dllimport)
+        #endif
+#else // #ifdef _WIN32
+    #define AMF_COMPONENT_VSTITCH_LINK
+#endif // #ifdef _WIN32
+
+extern "C"
+{
+    AMF_COMPONENT_VSTITCH_LINK AMF_RESULT AMF_CDECL_CALL AMFCreateComponentInt(amf::AMFContext* pContext, void* reserved, amf::AMFComponent** ppComponent)
+    {
+        *ppComponent = new amf::AMFInterfaceMultiImpl< amf::AMFVideoStitchImpl, amf::AMFComponent, amf::AMFContext* >(pContext);
+        (*ppComponent)->Acquire();
+        return AMF_OK;
+    }
+}
+
+#define AMF_FACILITY L"AMFVideoStitchImpl"
+
+using namespace amf;
+
+static const AMFEnumDescriptionEntry AMF_OUTPUT_FORMATS_ENUM[] = 
+{
+    {AMF_SURFACE_UNKNOWN,       L"DEFAULT"},
+    {AMF_SURFACE_BGRA,          L"BGRA"}, 
+    {AMF_SURFACE_RGBA,          L"RGBA"}, 
+    {AMF_SURFACE_RGBA_F16,      L"RGBA_F16"}, 
+    { 0,                        NULL }  // This is end of description mark
+};
+
+static const AMFEnumDescriptionEntry AMF_OUTPUT_MODE_ENUM[] = 
+{
+    {AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW,         L"Preview"},
+    {AMF_VIDEO_STITCH_OUTPUT_MODE_EQUIRECTANGULAR, L"Equrectangular"},
+    {AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP,         L"Cubemap"},
+    {0,                                            NULL}      // This is end of description mark
+};
+
+static const AMFEnumDescriptionEntry AMF_LENS_MODE_ENUM[] = 
+{
+    { AMF_VIDEO_STITCH_LENS_RECTILINEAR,       L"Normal" },
+    { AMF_VIDEO_STITCH_LENS_FISHEYE_FULLFRAME, L"FishEye" },
+    { AMF_VIDEO_STITCH_LENS_FISHEYE_CIRCULAR,  L"CircularFishEye" },
+    {0,                                        NULL}      // This is end of description mark
+};
+
+static const AMFEnumDescriptionEntry AMF_MEMORY_ENUM_DESCRIPTION[] = 
+{
+    {AMF_MEMORY_UNKNOWN,            L"Default"},
+    {AMF_MEMORY_DX11,               L"DX11"},
+    { AMF_MEMORY_OPENCL,            L"OpenCL" },
+    { AMF_MEMORY_HOST,              L"CPU" },
+    {0,                             NULL}  // This is end of description mark
+};
+
+static const AMFEnumDescriptionEntry AMF_COMPUTE_DEVICE_ENUM_DESCRIPTION[] = 
+{
+    {AMF_MEMORY_UNKNOWN,            L"Default"},
+    {AMF_MEMORY_DX11,               L"DX11"},
+    {AMF_MEMORY_OPENCL,             L"OpenCL"},
+    {0,                             NULL}  // This is end of description mark
+};
+
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchImpl::AMFVideoStitchImpl(AMFContext* pContext)
+    :m_pContext(pContext),
+    m_formatIn(AMF_SURFACE_NV12),
+    m_formatOut(AMF_SURFACE_NV12),
+    m_width(0),
+    m_height(0),
+    m_outputMemoryType(AMF_MEMORY_UNKNOWN),
+    m_deviceMemoryType(AMF_MEMORY_HOST),
+    m_deviceHistogramMemoryType(AMF_MEMORY_UNKNOWN),
+    m_eof(false),
+    m_frameInd(0),
+    m_bColorBalance(true)
+{
+    g_AMFFactory.Init();
+    AMFPrimitivePropertyInfoMapBegin
+        AMFPropertyInfoEnum(AMF_VIDEO_STITCH_OUTPUT_FORMAT,     L"Output Format" , AMF_SURFACE_NV12, AMF_OUTPUT_FORMATS_ENUM, false),
+        AMFPropertyInfoEnum(AMF_VIDEO_STITCH_MEMORY_TYPE ,      L"Output Memory Type", AMF_MEMORY_UNKNOWN, AMF_MEMORY_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoEnum(AMF_VIDEO_STITCH_COMPUTE_DEVICE ,   L"Compute Device", AMF_MEMORY_UNKNOWN, AMF_COMPUTE_DEVICE_ENUM_DESCRIPTION, false),
+        AMFPropertyInfoInt64(AMF_VIDEO_STITCH_INPUTCOUNT,       L"Number of inputs", 1, 0, 100, true),
+        AMFPropertyInfoSize(AMF_VIDEO_STITCH_OUTPUT_SIZE,       L"Output Size", AMFConstructSize(0, 0), AMFConstructSize(1, 1), AMFConstructSize(0x7fffffff, 0x7fffffff), false),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_VIEW_ROTATE_X,   L"Angle X", 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_VIEW_ROTATE_Y,   L"Angle Y", 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_VIEW_ROTATE_Z,   L"Angle Z", 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoBool(AMF_VIDEO_STITCH_WIRE_RENDER,       L"Fill", false, true),
+        AMFPropertyInfoBool(AMF_VIDEO_STITCH_COLOR_BALANCE,     L"ColorBalance", true, true),
+        AMFPropertyInfoEnum(AMF_VIDEO_STITCH_OUTPUT_MODE,       L"Output Mode" , AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW, AMF_OUTPUT_MODE_ENUM, true),
+        AMFPropertyInfoBool(AMF_VIDEO_STITCH_COMBINED_SOURCE, AMF_VIDEO_STITCH_COMBINED_SOURCE, false, false),
+    AMFPrimitivePropertyInfoMapEnd
+}
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchImpl::~AMFVideoStitchImpl()
+{
+    Terminate();
+    g_AMFFactory.Terminate();
+}
+
+static bool amf_is_win7()
+{
+    bool  bVer = false;
+
+#if !defined(METRO_APP)
+    if (IsWindowsVersionOrGreater(10, 0, 0))
+    {
+        bVer = false;
+    }
+    else if (IsWindowsVersionOrGreater(6, 3, 0))
+    {
+        bVer = false;
+    }
+    else if (IsWindowsVersionOrGreater(6, 2, 0))
+    {
+        bVer = false;
+    }
+    else if (IsWindowsVersionOrGreater(6, 1, 0))
+    {
+        bVer = true;
+    }
+#endif
+    return bVer;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::Init(AMF_SURFACE_FORMAT format, amf_int32 width, amf_int32 height)
+{
+    AMFLock lock(&m_sync);
+
+    AMF_RESULT res = AMF_OK;
+
+    m_width = width;
+    m_height = height;
+    m_formatIn = format;
+
+    GetProperty(AMF_VIDEO_STITCH_COMBINED_SOURCE, &m_bCombinedSource);
+
+    amf_int64 formatOut = AMF_SURFACE_UNKNOWN;
+    if(GetProperty(AMF_VIDEO_STITCH_OUTPUT_FORMAT, (amf_int32*)&formatOut) == AMF_OK)
+    {
+        m_formatOut = (AMF_SURFACE_FORMAT)formatOut;
+    }
+
+    m_eof = false;
+    m_frameInd = 0;
+
+    GetProperty(AMF_VIDEO_STITCH_OUTPUT_SIZE, &m_outputSize);
+    if(m_outputSize.width == 0 || m_outputSize.height == 0)
+    {
+        m_outputSize.width = m_width;
+        m_outputSize.height = m_height;
+    }
+
+    amf_int32 computeDevice = AMF_MEMORY_UNKNOWN;
+    AMFPropertyStorage::GetProperty(AMF_VIDEO_STITCH_COMPUTE_DEVICE, &computeDevice);
+    m_deviceHistogramMemoryType = (AMF_MEMORY_TYPE)computeDevice;
+
+    amf_int32 outputMemoryType = AMF_MEMORY_UNKNOWN;
+    GetProperty(AMF_VIDEO_STITCH_MEMORY_TYPE, &outputMemoryType);
+    m_outputMemoryType = (AMF_MEMORY_TYPE)outputMemoryType;
+
+    if(m_outputMemoryType == AMF_MEMORY_UNKNOWN)
+    {
+        if(m_pContext->GetDX11Device(AMF_DX11_0) != NULL && !amf_is_win7())
+        {
+            m_outputMemoryType = AMF_MEMORY_DX11;
+        }
+        else if(m_pContext->GetDX9Device(amf::AMF_DX9) != NULL)
+        {
+            m_outputMemoryType = AMF_MEMORY_DX9;
+        }
+        else
+        {
+            m_outputMemoryType = AMF_MEMORY_OPENCL;
+        }
+    }
+
+    switch((int)m_outputMemoryType)
+    {
+    case AMF_MEMORY_DX11:
+        AMF_RETURN_IF_FALSE(m_formatIn == AMF_SURFACE_NV12 || m_formatIn == AMF_SURFACE_BGRA || m_formatIn == AMF_SURFACE_RGBA, AMF_INVALID_FORMAT, 
+            L"Invalid DX11 input format. Expected AMF_SURFACE_NV12 or AMF_SURFACE_BGRA or AMF_SURFACE_RGBA");
+        AMF_RETURN_IF_FALSE(m_formatOut == AMF_SURFACE_NV12 || m_formatOut == AMF_SURFACE_BGRA || m_formatOut == AMF_SURFACE_RGBA || m_formatOut == AMF_SURFACE_RGBA_F16, AMF_INVALID_FORMAT, 
+            L"Invalid DX11 output format. Expected AMF_SURFACE_NV12 or AMF_SURFACE_BGRA or AMF_SURFACE_RGBA or AMF_SURFACE_RGBA_F16");
+        if(m_pContext->GetDX11Device(AMF_DX11_0) == NULL)
+        {
+            AMF_RETURN_IF_FAILED(m_pContext->InitDX11(NULL));
+        }
+        m_deviceMemoryType = AMF_MEMORY_DX11;
+        if(m_deviceHistogramMemoryType == AMF_MEMORY_UNKNOWN)
+        {
+            if(m_pContext->GetOpenCLContext() != 0 )
+            {
+                m_deviceHistogramMemoryType = AMF_MEMORY_OPENCL;
+            }
+            else
+            {
+                m_deviceHistogramMemoryType = AMF_MEMORY_DX11;
+            }
+        }
+        break;
+    case AMF_MEMORY_OPENGL:
+        AMF_RETURN_IF_FALSE(m_formatIn == AMF_SURFACE_NV12 || m_formatIn == AMF_SURFACE_BGRA || m_formatIn == AMF_SURFACE_RGBA, AMF_INVALID_FORMAT, 
+            L"Invalid OpenGL input format. Expected AMF_SURFACE_BGRA or AMF_SURFACE_RGBA");
+        AMF_RETURN_IF_FALSE(m_formatOut == AMF_SURFACE_BGRA || m_formatOut == AMF_SURFACE_RGBA, AMF_INVALID_FORMAT, 
+            L"Invalid OpenGL output format. Expected AMF_SURFACE_BGRA or AMF_SURFACE_RGBA");
+        if(m_pContext->GetOpenGLContext() == NULL)
+        {
+            return AMF_NO_DEVICE;
+        }
+        m_deviceMemoryType = AMF_MEMORY_OPENGL;
+        m_deviceHistogramMemoryType = AMF_MEMORY_OPENCL;
+        break;
+    case AMF_MEMORY_HOST:
+        m_deviceMemoryType = AMF_MEMORY_HOST;
+        m_deviceHistogramMemoryType = AMF_MEMORY_OPENCL;
+        break;
+    case AMF_MEMORY_COMPUTE_FOR_DX9:
+        m_deviceMemoryType = AMF_MEMORY_COMPUTE_FOR_DX9;
+        m_deviceHistogramMemoryType = AMF_MEMORY_COMPUTE_FOR_DX9;
+        break;
+    case AMF_MEMORY_COMPUTE_FOR_DX11:
+        m_deviceMemoryType = AMF_MEMORY_COMPUTE_FOR_DX11;
+        if(m_deviceHistogramMemoryType == AMF_MEMORY_UNKNOWN)
+        {
+            m_deviceHistogramMemoryType = AMF_MEMORY_COMPUTE_FOR_DX11;
+        }
+        break;
+    case AMF_MEMORY_OPENCL:
+    default:
+        m_deviceMemoryType = AMF_MEMORY_OPENCL;
+        m_deviceHistogramMemoryType = AMF_MEMORY_OPENCL;
+        break;
+    }
+
+    // init OCL/COMPUTE if needed
+    AMFComputePtr compute;
+   
+    bool bGFX9 = false;
+    m_pContext->GetProperty(L"GFX9", &bGFX9);
+
+    if(bGFX9)
+    {
+        if(m_deviceHistogramMemoryType == AMF_MEMORY_COMPUTE_FOR_DX11)
+        {
+            m_deviceHistogramMemoryType = AMF_MEMORY_DX11;
+        }
+        else if(m_deviceHistogramMemoryType == AMF_MEMORY_COMPUTE_FOR_DX9)
+        {
+            m_deviceHistogramMemoryType = AMF_MEMORY_OPENCL;
+        }
+
+    }
+    res = m_pContext->GetCompute(m_deviceHistogramMemoryType, &compute);
+    if(res != AMF_OK)
+    {
+        m_deviceHistogramMemoryType = AMF_MEMORY_OPENCL;
+        AMF_RETURN_IF_FAILED(m_pContext->GetCompute(m_deviceHistogramMemoryType, &compute));
+        
+    }
+
+    std::vector<AMFPropertyStorage*> inputs;
+    inputs.resize(m_InputStatus.size());
+    for(size_t i = 0; i< m_InputStatus.size(); i++)
+    {
+        inputs[i] = AMFPropertyStoragePtr(m_InputStatus[i]);
+    }
+
+    m_pEngine = new StitchEngineDX11(GetContext());
+    res = m_pEngine->Init(m_formatIn, m_width, m_height, m_formatOut, m_outputSize.width, m_outputSize.height, this, &inputs[0]);
+
+    m_pContext->GetCompute(m_deviceHistogramMemoryType, &m_pDevice);
+    AMF_RETURN_IF_FALSE(m_pDevice != NULL, AMF_NO_DEVICE, L"Wrong device for %d", AMFGetMemoryTypeName(m_deviceHistogramMemoryType));
+
+    m_pHistogram = new HistogramImpl();
+    res = m_pHistogram->Init(m_pDevice, m_pContext, (amf_int32)m_InputStatus.size());
+    AMF_RETURN_IF_FAILED(res, L"HistogramImpl::Init() failed");
+
+    GetProperty(AMF_VIDEO_STITCH_COLOR_BALANCE, &m_bColorBalance);
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::Optimize(AMFComponentOptimizationCallback* pCallback)
+{
+    class Callback : public AMFComponentOptimizationCallback
+    {
+        AMFComponentOptimizationCallback*   m_pCallback;
+        amf_uint                            m_total;
+        amf_uint                            m_completed;
+        amf_uint                            m_lastTotalPercent;
+    public:
+        Callback(AMFComponentOptimizationCallback* pCallback, amf_uint total)
+            :m_pCallback(pCallback), m_total(total), m_completed(0), m_lastTotalPercent(-1)
+        {
+        }
+        virtual AMF_RESULT AMF_STD_CALL OnComponentOptimizationProgress(amf_uint percent)
+        {
+            amf_uint total_percent = (100*m_completed + percent) / m_total;
+            if(m_lastTotalPercent != total_percent)
+            {
+                m_lastTotalPercent = total_percent;
+                if(m_pCallback)
+                {
+                    m_pCallback->OnComponentOptimizationProgress(total_percent);
+                }
+            }
+            if(percent == 100)
+            {
+                m_completed++;
+            }
+            return AMF_OK;
+        }
+    };
+
+        amf_set<AMF_MEMORY_TYPE> deviceTypes;
+        AMF_RESULT err = AMF_OK;
+        if(m_pContext->GetOpenCLContext())
+        {
+            deviceTypes.insert(AMF_MEMORY_OPENCL);
+        }
+        amf_uint count = 0;
+        Callback callback(pCallback, (amf_uint)deviceTypes.size());
+        for(amf_set<AMF_MEMORY_TYPE>::iterator it = deviceTypes.begin(); it != deviceTypes.end(); ++it)
+        {
+            AMF_MEMORY_TYPE memoryType = *it;
+
+            amf::AMFComputePtr pDevice;
+            err = m_pContext->GetCompute(memoryType, &pDevice);
+            HistogramImpl::CompileKernels(pDevice, &callback);
+        }
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::ReInit(amf_int32 width,amf_int32 height)
+{
+    AMF_SURFACE_FORMAT format = m_formatIn;
+    Terminate();
+    return Init( format, width, height);
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::Terminate()
+{
+    if(m_pHistogram  != NULL)
+    {
+        m_pHistogram->Terminate();
+        m_pHistogram = NULL;
+    }
+
+    m_pTempSurface = NULL;
+    m_tmpOutputSurface = NULL;
+    m_InputStatus.clear();
+
+    if(m_pEngine != NULL)
+    {
+        m_pEngine->Terminate();
+        m_pEngine = NULL;
+    }
+
+    m_pDevice = NULL;
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::Drain()
+{
+    AMFLock lock(&m_sync);
+    m_eof = true;
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::Flush()
+{
+    AMFLock lock(&m_sync);
+    for(amf_int32 i = 0; i < (amf_int32)m_InputStatus.size(); i++)
+    {
+        m_InputStatus[i]->m_pSurface = NULL;
+    }
+    m_eof = false;
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::SubmitInput(AMFData* pData)
+{
+    return AMF_UNEXPECTED;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::Compose(AMFSurface **ppSurfaceOut)
+{
+    AMF_RESULT res = AMF_OK;
+    // allocate output
+    GetProperty(AMF_VIDEO_STITCH_OUTPUT_SIZE, &m_outputSize);
+    if(m_outputSize.width == 0 || m_outputSize.height == 0)
+    {
+        m_outputSize.width = m_width;
+       m_outputSize.height = m_height;
+    }
+    AMFSurfacePtr firstInSurface = m_InputStatus[0]->m_pSurface;
+
+    AMF_RETURN_IF_FAILED(AllocOutputSurface(firstInSurface->GetPts(), firstInSurface->GetDuration(), firstInSurface->GetFrameType(), ppSurfaceOut), L"Failed to allocate output surface");
+    AMF_RETURN_IF_FAILED((*ppSurfaceOut)->Interop(m_deviceMemoryType), L"Failed to interop output surface");
+    firstInSurface->CopyTo(*ppSurfaceOut, false);
+    
+    amf::AMFContext::AMFDX11Locker dxlock(m_pContext);
+    m_pEngine->StartFrame(*ppSurfaceOut);
+
+    std::vector<float> correction;
+    correction.resize(m_InputStatus.size() * 3, 0);
+
+    if(m_bColorBalance)
+    {
+        res = m_pHistogram->Adjust((amf_int32)m_InputStatus.size(), m_pEngine->GetRibs(), m_pEngine->GetCorners(), &correction[0]);
+        AMF_RETURN_IF_FAILED(res, L"HistogramImpl::Adjust() failed");
+    }
+
+    // submit all cashed inputs for composition - order is important 
+    for(amf_size ch = 0; ch < m_InputStatus.size(); ch++)
+    {
+        AMFSurfacePtr surfaceIn = m_InputStatus[ch]->m_pSurface;
+        AMFSurfacePtr surfaceOut;
+
+        bool sRGB = m_formatOut == AMF_SURFACE_RGBA_F16;
+        AMF_SURFACE_FORMAT  formatIntermediate = sRGB ? AMF_SURFACE_RGBA : m_formatOut;
+
+
+        res = m_pContext->AllocSurface(m_deviceMemoryType, formatIntermediate, surfaceIn->GetPlaneAt(0)->GetWidth(), surfaceIn->GetPlaneAt(0)->GetHeight(), &surfaceOut);
+        AMF_RETURN_IF_FAILED(res, L"AllocSurface() failed");
+        if(m_deviceHistogramMemoryType == AMF_MEMORY_OPENCL)
+        {
+            m_InputStatus[ch]->m_pSurfaceOut = surfaceOut;
+        }
+        res = m_pHistogram->Convert(m_bColorBalance, (amf_int32)ch, m_InputStatus[ch]->m_pSurface, m_pEngine->GetTexRect((amf_int32)ch), sRGB, surfaceOut);
+        AMF_RETURN_IF_FAILED(res, L"HistogramImpl::Convert() failed");
+        // submit kernel
+        res = m_pEngine->ProcessStream((int)ch, surfaceOut);
+        
+    }
+
+    m_pEngine->EndFrame(m_pDataAllocatorCB == NULL);
+
+    for(amf_size ch = 0; ch < m_InputStatus.size(); ch++)
+    {
+        m_InputStatus[ch]->m_pSurface = NULL; // release the surface
+    }    
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::QueryOutput(AMFData** ppData)
+{
+    AMFLock lock(&m_sync);
+
+    if(m_eof)
+    {
+        return AMF_EOF;
+    }
+    for(amf_size ch = 0; ch < m_InputStatus.size(); ch++)
+    {
+        if(m_InputStatus[ch]->m_pSurface == NULL)
+        {
+            return AMF_REPEAT; // need more input
+        }
+    }
+
+    AMFSurfacePtr       pSurfaceOut;
+    Compose(&pSurfaceOut);
+    pSurfaceOut->Convert(m_outputMemoryType);
+    (*ppData) = pSurfaceOut.Detach();
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::AllocOutputSurface(amf_pts pts, amf_pts duration, AMF_FRAME_TYPE type, AMFSurface** ppSurface)
+{
+    AMFSurfacePtr pSurface;
+    
+    amf_int64 outputMode = AMF_VIDEO_STITCH_OUTPUT_MODE_PREVIEW;
+    GetProperty(AMF_VIDEO_STITCH_OUTPUT_MODE, &outputMode);
+
+    if(m_pDataAllocatorCB)
+    {
+        AMF_RETURN_IF_FAILED(m_pDataAllocatorCB->AllocSurface(m_outputMemoryType, m_formatOut, 
+            m_outputSize.width, m_outputSize.height, 0, 0, &pSurface));
+    }
+    else if(outputMode == AMF_VIDEO_STITCH_OUTPUT_MODE_CUBEMAP)
+    {
+        AMF_RETURN_IF_FAILED(m_pEngine->AllocCubeMap(m_formatOut, m_outputSize.width, m_outputSize.height, &pSurface));
+    }
+    else
+    {
+#if defined(USE_RENDER_TARGET_POOL)
+        AMF_RETURN_IF_FAILED(m_pSurfacePool->AcquireSurface(&pSurface));
+#else
+        AMF_RETURN_IF_FAILED(m_pContext->AllocSurface(m_outputMemoryType, m_formatOut, m_outputSize.width, m_outputSize.height, &pSurface));
+#endif
+    }
+    pSurface->SetPts(pts);
+    pSurface->SetDuration(duration);
+    pSurface->SetFrameType(type);
+    *ppSurface = pSurface.Detach();
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AMF_STD_CALL AMFVideoStitchImpl::OnPropertyChanged(const wchar_t* pName)
+{
+    AMFLock lock(&m_sync);
+    amf_wstring name(pName);
+
+    if(name == AMF_VIDEO_STITCH_INPUTCOUNT)
+    {
+        amf_int64 inputCount=0;
+        GetProperty(AMF_VIDEO_STITCH_INPUTCOUNT, &inputCount);
+        m_InputStatus.clear();
+        for(amf_int32 i = 0; i < (amf_int32)inputCount; i++)
+        {
+            m_InputStatus.push_back(new AMFInputStitchImpl(this, i));
+        }
+    }
+    else if(name == AMF_VIDEO_STITCH_VIEW_ROTATE_X || name == AMF_VIDEO_STITCH_VIEW_ROTATE_Y || name == AMF_VIDEO_STITCH_VIEW_ROTATE_Z)
+    {
+        if(m_pEngine != NULL)
+        {
+            m_pEngine->UpdateFOV(m_width, m_height, m_outputSize.width, m_outputSize.height, this);
+        }
+        m_PropertyValues[name] = 0.0;
+    }
+    else if(name == AMF_VIDEO_STITCH_WIRE_RENDER)
+    {
+        if(m_pEngine != NULL)
+        {
+            m_pEngine->UpdateFOV(m_width, m_height, m_outputSize.width, m_outputSize.height, this);
+        }
+    }
+    else if(name == AMF_VIDEO_STITCH_COLOR_BALANCE)
+    {
+        GetProperty(AMF_VIDEO_STITCH_COLOR_BALANCE, &m_bColorBalance);
+    }
+    else if(name == AMF_VIDEO_STITCH_OUTPUT_MODE)
+    {
+        if(m_pEngine != NULL)
+        {
+            m_pEngine->Terminate();
+            std::vector<AMFPropertyStorage*> inputs;
+            inputs.resize(m_InputStatus.size());
+            for(size_t i = 0; i< m_InputStatus.size(); i++)
+            {
+                inputs[i] = AMFPropertyStoragePtr(m_InputStatus[i]);
+            }
+
+            m_pEngine->Init(m_formatIn, m_width, m_height, m_formatOut, m_outputSize.width, m_outputSize.height, this, &inputs[0]);
+            m_pEngine->UpdateFOV(m_width, m_height, m_outputSize.width, m_outputSize.height, this);
+        }
+    }
+    
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT  AMF_STD_CALL AMFVideoStitchImpl::GetInput(amf_int32 index, AMFInput** ppInput)
+{
+    AMF_RETURN_IF_FALSE(index >= 0 && index < (amf_int32)m_InputStatus.size(), AMF_INVALID_ARG, L"Invalid index");
+    AMF_RETURN_IF_FALSE(ppInput != NULL, AMF_INVALID_ARG, L"ppInput = NULL");
+    *ppInput = m_InputStatus[index];
+    (*ppInput)->Acquire();
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+amf_int32   AMF_STD_CALL AMFVideoStitchImpl::GetInputCount()
+{
+    return (amf_int32)m_InputStatus.size();
+}
+
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchImpl::AMFInputStitchImpl::AMFInputStitchImpl(AMFVideoStitchImpl* pHost, amf_int32 index) :
+m_pHost(pHost),
+m_iIndex(index)
+{
+    memset(m_fColorCorrection, 0 , sizeof(m_fColorCorrection));
+
+    AMFPrimitivePropertyInfoMapBegin
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_LENS_CORR_K1, AMF_VIDEO_STITCH_LENS_CORR_K1, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_LENS_CORR_K2, AMF_VIDEO_STITCH_LENS_CORR_K2, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_LENS_CORR_K3, AMF_VIDEO_STITCH_LENS_CORR_K3, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_LENS_CORR_OFFX, AMF_VIDEO_STITCH_LENS_CORR_OFFX, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_STITCH_LENS_CORR_OFFY, AMF_VIDEO_STITCH_LENS_CORR_OFFY, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoEnum(AMF_VIDEO_STITCH_LENS_MODE, L"Lens mode", AMF_VIDEO_STITCH_LENS_RECTILINEAR, AMF_LENS_MODE_ENUM, false),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_OFFSET_X, L"Camera Offset X", 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_OFFSET_Y, L"Camera Offset Y", 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_SCALE, L"Camera Scale", 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_ANGLE_PITCH, AMF_VIDEO_CAMERA_ANGLE_PITCH, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_ANGLE_YAW, AMF_VIDEO_CAMERA_ANGLE_YAW, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_ANGLE_ROLL, AMF_VIDEO_CAMERA_ANGLE_ROLL, 0.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoDouble(AMF_VIDEO_CAMERA_HFOV, L"Horizontal Filed of View", M_PI / 2.0, -DBL_MAX, DBL_MAX, true),
+        AMFPropertyInfoRect(AMF_VIDEO_STITCH_CROP, L"Crop video", 0,0,0,0, false),
+    AMFPrimitivePropertyInfoMapEnd
+}
+
+//-------------------------------------------------------------------------------------------------
+AMFVideoStitchImpl::AMFInputStitchImpl::~AMFInputStitchImpl()
+{
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT  AMF_STD_CALL AMFVideoStitchImpl::AMFInputStitchImpl::SubmitInput(AMFData* pData)
+{
+    AMF_RETURN_IF_FALSE(pData != NULL, AMF_INVALID_POINTER);
+    AMFLock lock(&m_pHost->m_sync);
+
+    if(m_pHost->m_eof)
+    {
+        return AMF_EOF;
+    }
+
+    AMFSurfacePtr pSurfaceIn(pData);
+    // get and validate surface atttributes
+    AMF_RETURN_IF_FALSE(pSurfaceIn != NULL, AMF_INVALID_DATA_TYPE, L"Invalid input data, AMFSurface expected");
+    AMF_RETURN_IF_FALSE(m_pHost->m_formatIn == pSurfaceIn->GetFormat(), AMF_INVALID_ARG, L"Invalid input surface format %s. Expected %s", 
+                    AMFSurfaceGetFormatName(pSurfaceIn->GetFormat()), AMFSurfaceGetFormatName(m_pHost->m_formatIn));
+
+    // parameters are OK
+    if(m_pSurface != NULL)
+    {
+        return AMF_INPUT_FULL; // this channel already processed for this output - resubmit later
+    }
+
+    // interop input
+    AMF_RETURN_IF_FAILED(pSurfaceIn->Convert(m_pHost->m_deviceMemoryType),L"Failed to interop input surface");
+
+    AMFSurfacePtr pSurfaceRight;
+    if (m_pHost->m_bCombinedSource && m_iIndex == 0)  //split the source into two
+    {
+        pSurfaceRight = pSurfaceIn; // store surface
+        m_pSurface = pSurfaceIn; // store surface
+    }
+    else
+    {
+        m_pSurface = pSurfaceIn; // store surface
+    }
+
+    // build histogram
+    AMFRect rect;
+
+    if(m_pHost->m_bColorBalance)
+    {
+        m_pHost->m_pEngine->GetBorderRect(m_iIndex, rect);
+        m_pHost->m_pHistogram->Build(m_iIndex, m_pSurface, rect, m_pHost->m_pEngine->GetBorderMap(m_iIndex));
+    }
+
+    if (pSurfaceRight)
+    {
+        m_pHost->SubmitInput(1, pSurfaceRight);
+    }
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AMF_STD_CALL AMFVideoStitchImpl::AMFInputStitchImpl::OnPropertyChanged(const wchar_t* pName)
+{
+    AMFLock lock(&m_pHost->m_sync);
+    amf_wstring name(pName);
+    if(name == AMF_VIDEO_STITCH_LENS_CORR_K1 || name == AMF_VIDEO_STITCH_LENS_CORR_K2 || name == AMF_VIDEO_STITCH_LENS_CORR_K3 || 
+        name == AMF_VIDEO_STITCH_LENS_CORR_OFFX || name == AMF_VIDEO_STITCH_LENS_CORR_OFFY || 
+        name == AMF_VIDEO_CAMERA_OFFSET_X || name == AMF_VIDEO_CAMERA_OFFSET_Y || name == AMF_VIDEO_CAMERA_SCALE ||
+        name == AMF_VIDEO_CAMERA_ANGLE_PITCH || name == AMF_VIDEO_CAMERA_ANGLE_YAW || name == AMF_VIDEO_CAMERA_ANGLE_ROLL
+        )
+    {
+        if(m_pHost->m_pEngine != NULL)
+        {
+            m_pHost->m_pEngine->UpdateMesh(m_iIndex, m_pHost->m_width, m_pHost->m_height, m_pHost->m_outputSize.width, m_pHost->m_outputSize.height, this, m_pHost);
+        }
+    }
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL AMFVideoStitchImpl::GetCaps(AMFCaps** ppCaps)
+{
+    AMFVideoStitchCapsImplPtr pCaps = new AMFVideoStitchCapsImpl();
+    AMF_RETURN_IF_FAILED(pCaps->Init(AMFContextPtr(m_pContext)));
+    *ppCaps = AMFCapsPtr(pCaps).Detach();
+    return AMF_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFVideoStitchImpl::SubmitInput(amf_int32 index, AMFData* pData)
+{
+    return m_InputStatus[index]->SubmitInput(pData);
+}
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/VideoStitch/VideoStitchImpl.h Added

@@ -0,0 +1,157 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///-------------------------------------------------------------------------
+///  @file   VideoStitchImpl.h
+///  @brief  AMFVideoStitchImpl interface
+///-------------------------------------------------------------------------
+#pragma once
+
+#include "public/include/components/Component.h"
+#include "public/common/PropertyStorageExImpl.h"
+#include "public/include/components/VideoStitch.h"
+#include "public/include/core/Context.h"
+#include "StitchEngineBase.h"
+#include "HistogramImpl.h"
+
+namespace amf
+{
+    //-------------------------------------------------------------------------------------------------
+
+    typedef AMFPropertyStorageExImpl <AMFComponentEx> baseclassStitchProperty;
+
+    class AMFVideoStitchImpl : 
+        public AMFInterfaceBase,
+        public baseclassStitchProperty 
+    {
+    //-------------------------------------------------------------------------------------------------
+    typedef AMFInterfaceImpl < AMFPropertyStorageExImpl <AMFInput> > baseclassInputProperty;
+
+        class AMFInputStitchImpl : 
+            public baseclassInputProperty
+        {
+            friend class AMFVideoStitchImpl;
+        public:
+            AMF_BEGIN_INTERFACE_MAP
+                AMF_INTERFACE_ENTRY(AMFInput)
+                AMF_INTERFACE_CHAIN_ENTRY(AMFPropertyStorageExImpl <AMFInput>)
+                AMF_INTERFACE_CHAIN_ENTRY(baseclassInputProperty)
+            AMF_END_INTERFACE_MAP
+
+            AMFInputStitchImpl(AMFVideoStitchImpl* pHost, amf_int32 index);
+            virtual ~AMFInputStitchImpl();
+            // AMFInput inteface
+            virtual AMF_RESULT  AMF_STD_CALL SubmitInput(AMFData* pData);
+
+            virtual void       AMF_STD_CALL OnPropertyChanged(const wchar_t* pName);
+
+        protected:
+            AMFVideoStitchImpl* m_pHost;
+            AMFSurfacePtr       m_pSurface;
+            AMFSurfacePtr       m_pSurfaceOut;
+            amf_int32           m_iIndex;
+            float               m_fColorCorrection[3];
+        };
+        typedef AMFInterfacePtr_T<AMFInputStitchImpl>    AMFInputStitchImplPtr;
+    //-------------------------------------------------------------------------------------------------
+
+    public:
+        // interface access
+        AMF_BEGIN_INTERFACE_MAP
+            AMF_INTERFACE_MULTI_ENTRY(AMFComponent)
+            AMF_INTERFACE_MULTI_ENTRY(AMFComponentEx)
+            AMF_INTERFACE_CHAIN_ENTRY(baseclassStitchProperty)
+        AMF_END_INTERFACE_MAP
+
+
+        AMFVideoStitchImpl(AMFContext* pContext);
+        virtual ~AMFVideoStitchImpl();
+
+        // AMFComponent interface
+        virtual AMF_RESULT   AMF_STD_CALL Init(AMF_SURFACE_FORMAT format, amf_int32 width, amf_int32 height);
+        virtual AMF_RESULT   AMF_STD_CALL ReInit(amf_int32 width,amf_int32 height);
+        virtual AMF_RESULT   AMF_STD_CALL Terminate();
+        virtual AMF_RESULT   AMF_STD_CALL Drain();
+        virtual AMF_RESULT   AMF_STD_CALL Flush();
+
+        virtual AMF_RESULT   AMF_STD_CALL SubmitInput(AMFData* pData);
+        virtual AMF_RESULT   AMF_STD_CALL QueryOutput(AMFData** ppData);
+        virtual AMFContext*  AMF_STD_CALL GetContext() { return m_pContext; }
+        virtual AMF_RESULT   AMF_STD_CALL SetOutputDataAllocatorCB(AMFDataAllocatorCB* callback){m_pDataAllocatorCB = callback; return AMF_OK;}
+        virtual AMF_RESULT   AMF_STD_CALL GetCaps(AMFCaps** ppCaps);
+        virtual AMF_RESULT   AMF_STD_CALL Optimize(AMFComponentOptimizationCallback* pCallback);
+
+        // AMFComponentEx interface
+        virtual amf_int32   AMF_STD_CALL GetInputCount();
+        virtual amf_int32   AMF_STD_CALL GetOutputCount(){ return 0; }
+        virtual AMF_RESULT  AMF_STD_CALL GetInput(amf_int32 index, AMFInput** ppInput);
+        virtual AMF_RESULT  AMF_STD_CALL GetOutput(amf_int32 index, AMFOutput** ppOutput) { return AMF_NOT_SUPPORTED; }
+
+        //  AMFComponentPrivate methods
+        virtual void        AMF_STD_CALL SetName(const wchar_t* name) { m_name = name; }
+        virtual void        AMF_STD_CALL OnPropertyChanged(const wchar_t* pName);
+
+    private:
+        amf_wstring         m_name;
+        AMFContextPtr       m_pContext;
+        AMF_SURFACE_FORMAT  m_formatIn;
+        AMF_SURFACE_FORMAT  m_formatOut;
+        amf_int32           m_width;
+        amf_int32           m_height;
+        AMFSize             m_outputSize;
+        bool                m_bColorBalance;
+        bool                m_bCombinedSource;
+
+        AMFCriticalSection  m_sync;
+
+        AMF_MEMORY_TYPE     m_outputMemoryType;
+        AMF_MEMORY_TYPE     m_deviceMemoryType;
+        AMF_MEMORY_TYPE     m_deviceHistogramMemoryType;
+
+        bool                m_eof;
+        amf_uint            m_frameInd;
+        AMFSurfacePtr                       m_tmpOutputSurface;
+        AMFDataAllocatorCBPtr               m_pDataAllocatorCB;
+        amf_vector<AMFInputStitchImplPtr>   m_InputStatus;
+        AMFSurfacePtr						m_pTempSurface;
+        AMFComputePtr                       m_pDevice;
+
+        StitchEngineBasePtr m_pEngine;
+        HistogramImplPtr    m_pHistogram;
+
+        AMF_RESULT AMF_STD_CALL Compose(AMFSurface **ppSurfaceOut);
+        AMF_RESULT AMF_STD_CALL AllocOutputSurface(amf_pts pts, amf_pts duration, AMF_FRAME_TYPE type, AMFSurface** ppSurface);
+
+        AMFVideoStitchImpl(const AMFVideoStitchImpl&);
+        AMFVideoStitchImpl& operator=(const AMFVideoStitchImpl&);
+        AMF_RESULT SubmitInput(amf_int32 index, AMFData* pData);
+   };
+}
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ZCamLiveStream Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ZCamLiveStream/DataStreamZCam.cpp Added

@@ -0,0 +1,656 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fstream>
+#include <Mstcpip.h>
+
+// Need to link with Ws2_32.lib, Mswsock.lib, and Advapi32.lib
+#pragma comment (lib, "Ws2_32.lib")
+#pragma comment (lib, "Mswsock.lib")
+#pragma comment (lib, "AdvApi32.lib")
+
+#include "public/common/TraceAdapter.h"
+#include "public/common/AMFSTL.h"
+#include "DataStreamZCam.h"
+
+#pragma warning(disable: 4996)
+#if defined(_WIN32)
+#include <io.h>
+#endif
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+const char* amf::AMFDataStreamZCamImpl::PortTCP = "9876";
+const char* amf::AMFDataStreamZCamImpl::PortHTTP = "80";
+
+using namespace amf;
+
+#if _DEBUG
+    #define ENABLE_LOG      0
+#endif
+//-------------------------------------------------------------------------------------------------
+AMFDataStreamZCamVideo::AMFDataStreamZCamVideo(SOCKET& mySocket, const char* pAddressIP) :
+    m_socket(mySocket),
+    m_pDataBuf(NULL),
+    m_dataLen(0),
+    m_dataStartPos(0),
+    m_curPos(0)
+{
+}
+//-------------------------------------------------------------------------------------------------
+AMFDataStreamZCamVideo::~AMFDataStreamZCamVideo()
+{
+    Close();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamVideo::Close()
+{
+    AMF_RESULT err = AMF_OK;
+    if (m_pDataBuf)
+    {
+        delete[] m_pDataBuf;
+        m_pDataBuf = NULL;
+    }
+
+    if (m_socket != INVALID_SOCKET)
+    {
+        closesocket(m_socket);
+        m_socket = INVALID_SOCKET;
+    }
+
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamVideo::Read(void* pData, amf_size iSize, amf_size* pRead)
+{
+    AMF_RETURN_IF_FALSE(m_socket != INVALID_SOCKET, AMF_WRONG_STATE, L"Read() - Camera not ready!");
+    AMF_RESULT err = AMF_OK;
+
+    if (m_curPos < m_dataLen)
+    {
+        amf_size dataAvailable = m_dataLen - m_curPos;
+        amf_size readSize = iSize;
+        if (iSize > dataAvailable)
+        {
+            readSize = dataAvailable;
+        }
+
+        memcpy(pData, &m_pDataBuf[(int)m_curPos + (int)m_dataStartPos], readSize);
+        m_curPos += readSize;
+        if (pRead)
+        {
+            *pRead = readSize;
+        }
+    }
+    else
+    {
+        if (pRead)
+        {
+            *pRead = 0;
+        }
+    }
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::VideoCaptureGetOneFrame()
+{
+    int result = 0;
+    for (int idx = m_startCamera; !result && (idx < m_endCamera); idx++)
+    {
+        if (m_videoZCam[idx])
+        {
+            result = m_videoZCam[idx]->VideoCaptureGetOneFrame();
+        }
+    }
+    m_framCount++;
+    return result;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::CaptureOneFrame(int index, char** ppData, int& lenData)
+{
+    if ((index >= m_endCamera) || !m_videoZCam[index])
+        return NULL;
+    int result = m_videoZCam[index]->CaptureOneFrameReq();
+    return m_videoZCam[index]->CaptureOneFrame(ppData, lenData);
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::RequestFrame()
+{
+    m_framCount++;
+    int result = 0;
+    for (int idx = m_startCamera; !result && (idx < m_endCamera); idx++)
+    {
+        result = m_videoZCam[idx]->CaptureOneFrameReq();
+    }
+    return result;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::CaptureOneFrame(std::vector<char*>& pDataList, std::vector<int>& lenDataList)
+{
+    int result = 0;
+    pDataList.clear();
+    lenDataList.clear();
+
+    if(m_bFirstCapture)
+    {
+        m_bFirstCapture = false;
+        RequestFrame();
+    }
+
+    for (int idx = m_startCamera; !result && (idx < m_endCamera); idx++)
+    {
+        int lenData = 0;
+        char* pData = NULL;
+        result = m_videoZCam[idx]->CaptureOneFrame(&pData, lenData);
+        if (result)
+        {
+            break;
+        }
+        lenDataList.push_back(lenData);
+        pDataList.push_back(pData);
+    }
+
+    // request frames for the next call
+    RequestFrame();
+    m_framCount++;
+    return result;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamVideo::CaptureOneFrameReq()
+{
+
+    char sendCommand = 0x01;
+    int sendSize = send(m_socket, &sendCommand, 1, 0);
+    if (sendSize != 1)
+    {
+        AMFTraceError(L"AMFDataStreamZCamVideo", L"CaptureOneFrameReq() failed!");
+        return AMF_FAIL;
+    }
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamVideo::CaptureOneFrame(char** ppData, int& lenData)
+{
+    m_dataStartPos = 0;
+    int result = VideoCaptureGetOneFrame();
+    if (!result)
+    {
+        lenData = (int)m_dataLen;
+        if (ppData)
+        {
+            *ppData  = &m_pDataBuf[m_dataStartPos];
+        }
+    }
+    return SUCCEEDED(result) ?  AMF_OK : AMF_FAIL;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamVideo::VideoCaptureGetOneFrame()
+{
+    int result = 0;
+    m_dataLen = 0;
+    int lenReceived = recv(m_socket, m_pDataBuf, DataBufLen, 0);
+
+    if (lenReceived <= 0)
+    {
+        result = WSAGetLastError();
+        ASSERT_RETURN_IF_HR_FAILED(result, AMF_FAIL, L"VideoCaptureGetOneFrame().recv() failed");
+    }
+    else if (lenReceived >= 4)
+    {
+        int packetLen = ntohl(*(int*)m_pDataBuf);
+        m_dataLen = lenReceived - 4;
+
+        while ((int)m_dataLen < packetLen)
+        {
+            lenReceived = recv(m_socket, &m_pDataBuf[4 + m_dataLen], (int)(DataBufLen - 4 - m_dataLen), 0);
+            if (lenReceived == 0)
+            {
+                Sleep(1);
+            }
+            else if (lenReceived == -1)
+            {
+                result = WSAGetLastError();
+                if (result == WSATRY_AGAIN || result == WSAEINTR || result == WSAEWOULDBLOCK)
+                {
+                    continue;
+                }
+                AMFTraceError(L"AMFDataStreamZCamVideo", L"VideoCaptureGetOneFrame().recv() failed!");
+                break;
+            }
+            m_dataLen += lenReceived;
+        };
+        m_dataStartPos = 4;
+    }
+
+    m_curPos = 0;
+    m_framCount++;
+    return SUCCEEDED(result) ? AMF_OK : AMF_FAIL;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamVideo::Init()
+{
+    AMF_RESULT err = AMF_OK;
+    if (!m_pDataBuf)
+    {
+        m_pDataBuf = new char[DataBufLen];
+        if (!m_pDataBuf)
+        {
+            AMFTraceError(L"AMFDataStreamZCamVideo", L"Init() failed!");
+            err = AMF_FAIL;
+        }
+    }
+    m_framCount = 0;
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMFDataStreamZCamImpl::AMFDataStreamZCamImpl() :
+m_framCount(0),
+m_framCountLog(0),
+m_activeCamera(0),
+m_startCamera(0),
+m_endCamera(CountCamera),
+m_bFirstCapture(true)
+{
+    // Initialize Winsock
+    WSADATA wsaData;
+    WORD winsockVer = MAKEWORD(2, 2);
+    WSAStartup(winsockVer, &wsaData);
+
+    m_socket.resize(CountCamera);
+    m_videoZCam.resize(CountCamera);
+
+    for (int idx = 0; idx < CountCamera; idx++)
+    {
+        m_socket[idx] = INVALID_SOCKET;
+        m_videoZCam[idx] = NULL;
+    }
+
+    m_addressIP.resize(CountCamera);
+}
+//-------------------------------------------------------------------------------------------------
+AMFDataStreamZCamImpl::~AMFDataStreamZCamImpl()
+{
+    Close();
+    WSACleanup();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamImpl::Close()
+{
+    AMF_RESULT err = AMF_OK;
+
+    for (int idx = 0; idx < (int)m_socket.size(); idx++)
+    {
+        if (m_socket[idx] != INVALID_SOCKET)
+        {
+            closesocket(m_socket[idx]);
+            m_socket[idx] = INVALID_SOCKET;
+        }
+
+        if (m_videoZCam[idx])
+        {
+            m_videoZCam[idx]->Close();
+            delete m_videoZCam[idx];
+            m_videoZCam[idx] = NULL;
+        }
+    }
+    m_socket.clear();
+
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamImpl::Read(void* pData, amf_size iSize, amf_size* pRead)
+{
+    AMF_RESULT err = AMF_OK;
+    if (m_videoZCam[m_activeCamera])
+    {
+        err = m_videoZCam[m_activeCamera]->Read(pData, iSize, pRead);
+
+        if ((err == AMF_OK) && (*pRead==0))
+        {
+            if (VideoCaptureGetOneFrame())  err = AMF_FAIL;
+            if (err == AMF_OK)
+            {
+                err = m_videoZCam[m_activeCamera]->Read(pData, iSize, pRead);
+            }
+        }
+    }
+
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamImpl::Open()
+{
+    return Open(m_addressIP[0].c_str(), AMF_STREAM_OPEN::AMFSO_READ, AMF_FILE_SHARE::AMFFS_SHARE_READ);
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamImpl::Open(const char* pAddressIP, AMF_STREAM_OPEN eOpenType, AMF_FILE_SHARE eShareType)
+{
+    m_bFirstCapture = true;
+    AMF_RESULT err = AMF_OK;
+    std::string addressIP = pAddressIP;
+
+    for (int idx = m_startCamera; (err == AMF_OK) && (idx < m_endCamera); idx++)
+    {
+        if (!memcmp(addressIP.c_str(), m_addressIP[idx].c_str(), addressIP.length()))
+        {
+            m_activeCamera = idx;
+        }
+
+        err = Open(m_addressIP[idx].c_str(), m_socket[idx]);
+
+        if (err == AMF_OK)
+        {
+            m_videoZCam[idx] = new AMFDataStreamZCamVideo(m_socket[idx], m_addressIP[idx].c_str());
+
+            if (m_videoZCam[idx])
+            {
+                err = m_videoZCam[idx]->Init();
+            }
+            else
+            {
+                AMFTraceError(L"AMFDataStreamZCamImpl", L"Open() failed!");
+                err = AMF_OUT_OF_MEMORY;
+            }
+        }
+    }
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFDataStreamZCamImpl::Open(const char* pAddressIP, SOCKET& mySocket)
+{
+    AMF_RESULT err = AMF_FAIL;
+
+    if (mySocket != INVALID_SOCKET)
+    {
+        closesocket(mySocket);
+    }
+
+    struct addrinfo address = { 0 };
+    mySocket = CreateSocket(pAddressIP, PortTCP, address);
+
+    if (mySocket != INVALID_SOCKET)
+    {
+        int result = ConnectToCamera(mySocket, address);
+        err = result ? AMF_FAIL : AMF_OK;
+    }
+
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+SOCKET AMFDataStreamZCamImpl::CreateSocket(const char* pAddressIP, const char* port, struct addrinfo& addressIP)
+{
+    SOCKET mySocket = INVALID_SOCKET;
+
+    struct addrinfo addressHints;
+    ZeroMemory(&addressHints, sizeof(addressHints));
+    addressHints.ai_family = AF_INET;
+    addressHints.ai_socktype = SOCK_STREAM;
+    addressHints.ai_protocol = IPPROTO_TCP;
+
+    // Resolve the server address and port
+    struct addrinfo* pAddress = NULL;
+    int result = getaddrinfo(pAddressIP, port, &addressHints, &pAddress);
+
+    if (!result)
+    {
+        memcpy(&addressIP, pAddress, sizeof(addrinfo));
+
+        // Create a SOCKET for connecting to server
+        mySocket = socket(addressIP.ai_family, addressIP.ai_socktype, addressIP.ai_protocol);
+        if (mySocket == INVALID_SOCKET)
+        {
+            AMFTraceError(L"AMFDataStreamZCamImpl", L"CreateSocket() failed!");
+            result = -1;
+        }
+    }
+
+    if (!result)
+    {
+        DWORD timeout = 2000;
+        result = setsockopt(mySocket, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout, sizeof(timeout));
+
+        if (result == 0)
+        {
+            result = setsockopt(mySocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout));
+            ASSERT_RETURN_IF_HR_FAILED(result, AMF_FAIL, L"CreateSocket() failed");
+        }
+    }
+
+    if (!result)
+    {
+        u_long mode = 1;
+        result = setsockopt(mySocket, SOL_SOCKET, SO_KEEPALIVE, (char*)&mode, sizeof(u_long));
+        ASSERT_RETURN_IF_HR_FAILED(result, AMF_FAIL, L"CreateSocket() failed");
+    }
+
+    if (result == 0)
+    {
+        int bufsize = AMFDataStreamZCamVideo::GetDataBufLength();
+         result = setsockopt(mySocket, SOL_SOCKET, SO_RCVBUF, (char *)&bufsize, (socklen_t)sizeof(bufsize));
+         ASSERT_RETURN_IF_HR_FAILED(result, AMF_FAIL, L"CreateSocket() failed");
+    }
+
+    if (result != 0)
+    {
+        mySocket = INVALID_SOCKET;
+    }
+
+    return mySocket;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::ConnectToCamera(SOCKET mySocket, struct addrinfo& address)
+{
+    int result = 0;
+
+    unsigned long iMode = 1; //non-blocking mode to use timeout
+    int iResult = ioctlsocket(mySocket, FIONBIO, &iMode);
+
+    result = connect(mySocket, address.ai_addr, (int)address.ai_addrlen);
+
+    if (result == SOCKET_ERROR)
+    {
+        result = WSAGetLastError();
+        if (result == WSAEINPROGRESS || result == WSAEWOULDBLOCK) 
+        { 
+            struct timeval tv; 
+            fd_set myset;
+            do 
+            { 
+                tv.tv_sec = 15; 
+                tv.tv_usec = 0; 
+                FD_ZERO(&myset); 
+                FD_SET(mySocket, &myset); 
+                result = select((int)mySocket + 1, NULL, &myset, NULL, &tv); 
+
+                if (result < 0 && (result = WSAGetLastError()) == WSAEINTR) 
+                { 
+                    AMFTraceError(L"AMFDataStreamZCamImpl", L"ConnectToCamera() failed!");
+                    break;
+                } 
+                if (result > 0) 
+                { 
+                    // Socket selected for write 
+                    int valopt;
+                    int lon = sizeof(valopt); 
+                    if (getsockopt(mySocket, SOL_SOCKET, SO_ERROR, (char*)(&valopt), &lon) < 0) 
+                    { 
+                        AMFTraceError(L"AMFDataStreamZCamImpl", L"ConnectToCamera() failed!");
+                        result = WSAGetLastError();
+                        break;
+                    } 
+                    // Check the value returned... 
+                    if (valopt) 
+                    { 
+                        result = WSAEINTR;
+                        break;
+                    } 
+                    result = 0; // connected 
+                    break; 
+                } 
+                else 
+                { 
+                    break; 
+                } 
+            } while (true); 
+        }
+    }
+
+    iMode = 0; //back to blocking mode 
+    iResult = ioctlsocket(mySocket, FIONBIO, &iMode);
+    return result;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::SetupCameras(const char* mode)
+{
+    int result = 0;
+
+    SOCKET mySocket[CountCamera] = { INVALID_SOCKET };
+    struct addrinfo address[CountCamera];
+
+    for (int idx = 0; !result && (idx < CountCamera); idx++)
+    {
+        mySocket[idx] = CreateSocket(m_addressIP[idx].c_str(), PortHTTP, address[idx]);
+
+        if (mySocket[idx] != INVALID_SOCKET)
+        {
+            result = ConnectToCamera(mySocket[idx], address[idx]);
+        }
+        else
+        {
+            result = -1;
+            AMFTraceError(L"AMFDataStreamZCamImpl", L"SetupCameras() failed!");
+        }
+    }
+
+    for (int idx = 0; !result && (idx < CountCamera); idx++)
+    {
+        bool isMaterCamer = !idx ? true : false;
+        result = SetupCamera(mySocket[idx], m_addressIP[idx].c_str(), isMaterCamer, mode);
+    }
+
+    for (int idx = 0; idx < CountCamera; idx++)
+    {
+        // shutdown the connection since no more data will be sent
+        result = shutdown(mySocket[idx], SD_SEND);
+        char  recvbuf[CommandBufLen];
+        ReceiveCommand(mySocket[idx], recvbuf, CommandBufLen);
+    }
+
+    // cleanup
+    for (int idx = 0; idx < CountCamera; idx++)
+    {
+        closesocket(mySocket[idx]);
+    }
+    return result;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::SetupCamera(SOCKET& mySocket, const char* ipAddress, bool isMaterCamer, const char* mode)
+{
+    int result = 0;
+    int recvbuflen = 1024;
+    char  recvbuf[1024];
+    char  sendBuf[256];
+
+    char* httpData01 = "Connection: Keep-Alive\r\nAccept-Encoding: gzip, deflate\r\nUser-Agent: Mozilla/5.0\r\nHost: ";
+    char* httpData02 = "Connection: Keep-Alive\r\nUser-Agent: cpprestsdk/2.9.0\r\nHost: ";
+    strcpy_s(sendBuf, "GET /ctrl/session HTTP/1.1\r\n");
+    strcat_s(sendBuf, httpData01);
+    SendCommand(mySocket, ipAddress, sendBuf, recvbuf, recvbuflen);
+
+    if (isMaterCamer)
+    {
+        strcpy_s(sendBuf, "GET /ctrl/set?movfmt=");
+        strcat_s(sendBuf, mode);
+        strcat_s(sendBuf, " HTTP/1.1\r\n");
+        strcat_s(sendBuf, httpData02);
+        SendCommand(mySocket, ipAddress, sendBuf, recvbuf, recvbuflen);
+    }
+
+    strcpy_s(sendBuf, "GET /ctrl/set?send_stream=Stream0 HTTP/1.1\r\n");
+    strcat_s(sendBuf, httpData02);
+    SendCommand(mySocket, ipAddress, sendBuf, recvbuf, recvbuflen);
+
+    strcpy_s(sendBuf, "GET /ctrl/stream_setting?index=stream0&bitrate=10000000 HTTP/1.1\r\n");
+    strcat_s(sendBuf, httpData02);
+    SendCommand(mySocket, ipAddress, sendBuf, recvbuf, recvbuflen);
+
+    strcpy_s(sendBuf, "GET /ctrl/session?action=quit HTTP/1.1\r\n");
+    SendCommand(mySocket, ipAddress, sendBuf, recvbuf, recvbuflen);
+
+    return 0;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::SendCommand(SOCKET mySocket, const char* ipCamera, char* sendBuf, char* recvbuf, int lenBuf)
+{
+    int result = 0;
+    strcat(sendBuf, ipCamera);
+    strcat(sendBuf, "\r\n\r\n\0");
+    int sendSize = send(mySocket, sendBuf, (int)strlen(sendBuf), 0);
+
+    if (sendSize != strlen(sendBuf))
+    {
+        AMFTraceError(L"AMFDataStreamZCamImpl", L"SendCommand() failed!");
+        return -1;
+    }
+
+    if (!result)
+    {
+        result = ReceiveCommand(mySocket, recvbuf, lenBuf);
+    }
+
+    return result;
+}
+//-------------------------------------------------------------------------------------------------
+int AMFDataStreamZCamImpl::ReceiveCommand(SOCKET mySocket, char* recvbuf, int lenBuf)
+{
+    int len = 0;
+
+    for (int idx = 0; idx < 2; idx++)   //header + body
+    {
+        len = recv(mySocket, recvbuf, lenBuf, 0);
+
+        if (len <= 0)
+        {
+            break;
+        }
+    }
+
+    return len;
+}
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ZCamLiveStream/DataStreamZCam.h Added

@@ -0,0 +1,125 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#pragma once
+
+#include "public/common/DataStream.h"
+#include "public/common/InterfaceImpl.h"
+#include <string>
+
+namespace amf
+{
+    class AMFDataStreamZCamVideo
+    {
+    public:
+        AMFDataStreamZCamVideo(SOCKET& mySocket, const char* pAddressIP);
+        ~AMFDataStreamZCamVideo();
+        // interface
+        AMF_RESULT Close();
+        AMF_RESULT Read(void* pData, amf_size iSize, amf_size* pRead);
+
+        AMF_RESULT Init();
+        AMF_RESULT VideoCaptureGetOneFrame();
+        AMF_RESULT CaptureOneFrame(char** ppData, int& lenData);
+        AMF_RESULT CaptureOneFrameReq();
+        static int GetDataBufLength(){ return DataBufLen; };
+
+    protected:
+        static const int DataBufLen = 3392 * 2544 * 3 / 2;// 1080p
+
+        SOCKET          m_socket;
+        std::ofstream   m_fileVideo;
+
+        std::vector<std::string> m_addressIP;
+
+        char*    m_pDataBuf;
+        amf_size m_dataLen;
+        amf_size m_dataStartPos;
+        amf_size m_curPos;
+
+        char m_message[256];
+        int m_framCount;
+
+        SOCKET CreateSocket(const char* pAddressIP, const char* port, struct addrinfo& addressIP);
+        int ConnectToCamera(SOCKET mySocket, struct addrinfo& address);
+        int SendCommand(SOCKET mySocket, const char* ipCamera, char* sendBuf, char* recvbuf, int lenBuf);
+        int ReceiveCommand(SOCKET mySocket, char* recvbuf, int lenBuf);
+        AMF_RESULT ReadInternal(void* pData, amf_size iSize, amf_size* pRead);
+    };
+
+    class AMFDataStreamZCamImpl
+    {
+    public:
+        AMFDataStreamZCamImpl();
+        virtual ~AMFDataStreamZCamImpl();
+
+        AMF_RESULT Read(void* pData, amf_size iSize, amf_size* pRead);
+        AMF_RESULT Open(const char* pFilePath, AMF_STREAM_OPEN eOpenType, AMF_FILE_SHARE eShareType);
+        AMF_RESULT Close();
+        int        SetupCameras(const char* mode);
+        AMF_RESULT Open();
+        int RequestFrame();
+        int CaptureOneFrame(int index, char** ppData, int& lenData);
+        int CaptureOneFrame(std::vector<char*>& ppDataList, std::vector<int>& lenDataList);
+        void       SetIP(int index, const char* addressIP){ m_addressIP[index] = addressIP;};
+
+        static const int CountCamera = 4;
+        static const int CommandBufLen = 256;
+        static const char* PortTCP;
+        static const char* PortHTTP;
+
+    protected:
+        std::vector<SOCKET>        m_socket;
+        std::vector<AMFDataStreamZCamVideo*> m_videoZCam;
+        std::vector<std::string> m_addressIP;
+
+        std::ofstream m_fileVideo;
+        std::ofstream m_fileLog;
+        int     m_framCount;
+        int     m_framCountLog;
+        int     m_activeCamera;
+        int     m_startCamera;
+        int     m_endCamera;
+        char    m_message[256];
+        bool    m_bFirstCapture;
+
+        int SetupCamera(SOCKET& mySocket, const char* ipAddress, bool isMaterCamer, const char* mode);
+        int VideoCaptureGetOneFrame();
+        SOCKET CreateSocket(const char* pAddressIP, const char* port, struct addrinfo& addressIP);
+        int ConnectToCamera(SOCKET mySocket, struct addrinfo& address);
+        int SendCommand(SOCKET mySocket, const char* ipCamera, char* sendBuf, char* recvbuf, int lenBuf);
+        int ReceiveCommand(SOCKET mySocket, char* recvbuf, int lenBuf);
+
+        AMF_RESULT Open(const char* pAddressIP, SOCKET& mySocket);
+        AMF_RESULT ReadInternal(void* pData, amf_size iSize, amf_size* pRead);
+    };
+} //namespace amf

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ZCamLiveStream/ZCamLiveStreamImpl.cpp Added

@@ -0,0 +1,466 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+//
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#include <stdio.h>
+#include <fstream>
+#include <iosfwd>
+#include "ZCamLiveStreamImpl.h"
+
+#include "public/include/core/Context.h"
+#include "public/include/core/Trace.h"
+#include "public/common/TraceAdapter.h"
+#include "public/common/AMFFactory.h"
+#include "public/common/DataStream.h"
+
+#include "public/include/components/ZCamLiveStream.h"
+
+#define AMF_FACILITY L"AMFZCamLiveStreamImpl"
+
+using namespace amf;
+
+extern "C"
+{
+    AMF_RESULT AMFCreateComponentZCamLiveStream(amf::AMFContext* pContext, amf::AMFComponentEx** ppComponent)
+    {
+        *ppComponent = new amf::AMFInterfaceMultiImpl< amf::AMFZCamLiveStreamImpl, amf::AMFComponentEx, amf::AMFContext*>(pContext);
+        (*ppComponent)->Acquire();
+        return AMF_OK;
+    }
+}
+
+static const AMFEnumDescriptionEntry ZCamVideoModeCommandEnum[] =
+{
+    { CAMLIVE_MODE_ZCAM_1080P24, L"1080P24" },
+    { CAMLIVE_MODE_ZCAM_1080P30, L"1080P30" },
+    { CAMLIVE_MODE_ZCAM_1080P60, L"1080P60" },
+    { CAMLIVE_MODE_ZCAM_2K7P24,  L"2.7KP24" },
+    { CAMLIVE_MODE_ZCAM_2K7P30,  L"2.7KP30" },
+    { CAMLIVE_MODE_ZCAM_2K7P60,  L"2.7KP60" },
+    { CAMLIVE_MODE_ZCAM_2544P24, L"2544P24%20(4:3)" },
+    { CAMLIVE_MODE_ZCAM_2544P30, L"2544P30%20(4:3)" },
+    { CAMLIVE_MODE_ZCAM_2544P60, L"2544P60%20(4:3)" },
+};
+
+
+const AMFSize AMFZCamLiveStreamImpl::VideoFrameSizeList[] =
+{
+    AMFConstructSize(1920, 1080),
+    AMFConstructSize(1920, 1080),
+    AMFConstructSize(1920, 1080),
+    AMFConstructSize(2704, 1520),
+    AMFConstructSize(2704, 1520),
+    AMFConstructSize(2704, 1520),
+    AMFConstructSize(3392, 2544),
+    AMFConstructSize(3392, 2544),
+    AMFConstructSize(3392, 2544)
+};
+
+const amf_int32 AMFZCamLiveStreamImpl::VideoFrameRateList[] =
+{ 24, 30, 60, 24, 30, 60, 24, 30, 60 };
+
+static const AMFEnumDescriptionEntry ZCamAudioModeEnum[] =
+{
+    { CAM_AUDIO_MODE_NONE,   L"NoAudio" },
+    { CAM_AUDIO_MODE_SILENT, L"SilentAudio" },
+    { CAM_AUDIO_MODE_CAMERA, L"CameraAudio" }
+};
+
+//-------------------------------------------------------------------------------------------------
+AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl(AMFZCamLiveStreamImpl* pHost, amf_int32 index) :
+    m_pHost(pHost),
+    m_iIndex(index),
+    m_frameCount(0),
+    m_iQueueSize(10),
+    m_isAudio(false),
+    m_audioTimeStamp(-1LL),
+    m_ptsLast(0),
+    m_lowLatency(1)
+{
+    m_pHost->GetProperty(ZCAMLIVE_LOWLATENCY, &m_lowLatency);
+    m_VideoFrameQueue.SetQueueSize(m_iQueueSize);
+}
+//-------------------------------------------------------------------------------------------------
+AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl::~AMFOutputZCamLiveStreamImpl()
+{
+    AMFTraceInfo(AMF_FACILITY, L"Stream# %d, frames read %d", m_iIndex, (int)m_frameCount);
+}
+//-------------------------------------------------------------------------------------------------
+// NOTE: this call will return one compressed frame for each QueryOutput call
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl::QueryOutput(AMFData** ppData)
+{
+    AMF_RETURN_IF_FALSE(m_pHost != NULL, AMF_UNEXPECTED, L"QueryOutput() - Host not Initialized");
+    AMF_RESULT  err = AMF_REPEAT;
+    AMFDataPtr  pFrame;
+    amf_ulong   ulID = 0;
+    if (m_isAudio)
+    {
+        err = GetAudioData(ppData);
+    }
+    else if (m_VideoFrameQueue.Get(ulID, pFrame, 0))
+    {
+        amf_pts timestamp = (m_lowLatency>0) ? amf_high_precision_clock() : m_ptsLast;
+        pFrame->SetPts(timestamp);
+        amf_uint32 frameRate = 30;
+        m_pHost->GetProperty(ZCAMLIVE_VIDEO_FRAMERATE, &frameRate);
+        m_frameCount++;
+        amf_pts duration = AMF_SECOND / frameRate;
+        pFrame->SetDuration(duration);
+        m_ptsLast += duration;
+
+        pFrame->SetProperty(L"DemuxerEnd", (double)timestamp);
+
+        *ppData = pFrame.Detach();
+        err = AMF_OK;
+    }
+    return err;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT  AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl::SubmitFrame(AMFData* pData)
+{
+    AMF_RETURN_IF_FALSE(m_pHost != NULL, AMF_UNEXPECTED, L"QueryOutput() - Host not Initialized");
+    AMF_RESULT  err = AMF_INPUT_FULL;
+
+    if (m_VideoFrameQueue.Add(0, pData, 0, 0))
+    {
+        err = AMF_OK;
+    }
+
+    return err;
+}
+
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT  AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl::GetAudioData(AMFData** ppData)
+{
+    AMF_RETURN_IF_FALSE(m_pHost != NULL, AMF_UNEXPECTED, L"QueryOutput() - Host not Initialized");
+    AMF_RESULT  err = AMF_REPEAT;
+
+    AMF_AUDIO_FORMAT sampleFormat = AMFAF_FLTP;
+    amf_int32 samples = 1024;
+    amf_int32 sampleRate = 44100;
+    amf_int32 channels = 2;
+    amf_int64 audioLength = 10000000LL * samples / sampleRate;
+    //audio
+    amf_int64 timestamp = amf_high_precision_clock();
+    if(m_audioTimeStamp == -1LL)
+    { 
+        m_audioTimeStamp = timestamp;
+    }
+    timestamp -= m_audioTimeStamp;
+
+    if (timestamp  > m_ptsLast - audioLength / 3 )
+    {
+        AMFAudioBufferPtr pAudioBuffer;
+        err = m_pHost->m_pContext->AllocAudioBuffer(AMF_MEMORY_HOST, sampleFormat, samples, sampleRate, channels, &pAudioBuffer);
+        if (AMF_OK == err && pAudioBuffer)
+        {
+            size_t lenData = pAudioBuffer->GetSize();
+            pAudioBuffer->SetPts(m_ptsLast);
+            pAudioBuffer->SetDuration(audioLength);
+            m_ptsLast += audioLength;
+            void* pMem = pAudioBuffer->GetNative();
+            *ppData = pAudioBuffer.Detach();
+            err = AMF_OK;
+        }
+    }
+    else
+    {
+        err = AMF_REPEAT;
+    }
+
+    return err;
+}
+// AMFZCamLiveStreamImpl
+//-------------------------------------------------------------------------------------------------
+AMFZCamLiveStreamImpl::AMFZCamLiveStreamImpl(AMFContext* pContext) :
+    m_pContext(pContext),
+    m_frameCount(0),
+    m_bForceEof(false),
+    m_bTerminated(true),
+    m_ZCamPollingThread(this),
+    m_streamCount(4),
+    m_streamActive(-1),
+    m_videoMode(CAMLIVE_MODE_ZCAM_2K7P30),
+    m_audioMode(CAM_AUDIO_MODE_SILENT)
+{
+    m_OutputStreams.clear();
+    AMFPrimitivePropertyInfoMapBegin
+        AMFPropertyInfoInt64(ZCAMLIVE_STREAMCOUNT, ZCAMLIVE_STREAMCOUNT, m_streamCount, 0, 32, false),
+        AMFPropertyInfoSize(ZCAMLIVE_VIDEO_FRAMESIZE, ZCAMLIVE_VIDEO_FRAMESIZE, AMFConstructSize(2704, 1520), AMFConstructSize(720, 480), AMFConstructSize(7680, 7680), false),
+        AMFPropertyInfoDouble(ZCAMLIVE_VIDEO_FRAMERATE, ZCAMLIVE_VIDEO_FRAMERATE, 30.0, 0., 100000., false),
+        AMFPropertyInfoInt64(ZCAMLIVE_VIDEO_BIT_RATE, ZCAMLIVE_VIDEO_BIT_RATE, 30000000, 0, 300000000, false),
+        AMFPropertyInfoInt64(ZCAMLIVE_STREAM_FRAMECOUNT, ZCAMLIVE_STREAM_FRAMECOUNT, 0, 0, LLONG_MAX, true),
+        AMFPropertyInfoInt64(ZCAMLIVE_STREAM_ACTIVE_CAMERA, ZCAMLIVE_STREAM_ACTIVE_CAMERA, -1, -1, 256, true),
+        AMFPropertyInfoInt64(ZCAMLIVE_STREAM_FRAMECOUNT, ZCAMLIVE_STREAM_FRAMECOUNT, 0, 0, LLONG_MAX, true),
+        AMFPropertyInfoWString(ZCAMLIVE_CODEC_ID, ZCAMLIVE_CODEC_ID, L"AMFVideoDecoderUVD_H264_AVC", false),
+        AMFPropertyInfoEnum(ZCAMLIVE_VIDEO_MODE, ZCAMLIVE_VIDEO_MODE, CAMLIVE_MODE_ZCAM_2K7P30, ZCamVideoModeCommandEnum, false),
+        AMFPropertyInfoEnum(ZCAMLIVE_AUDIO_MODE, ZCAMLIVE_AUDIO_MODE, CAM_AUDIO_MODE_SILENT, ZCamAudioModeEnum, false),
+        AMFPropertyInfoInt64(ZCAMLIVE_LOWLATENCY, ZCAMLIVE_LOWLATENCY, 1, 0, 1, false),
+        AMFPropertyInfoWString(ZCAMLIVE_IP_0, ZCAMLIVE_IP_0, L"10.98.32.1", false),
+        AMFPropertyInfoWString(ZCAMLIVE_IP_1, ZCAMLIVE_IP_1, L"10.98.32.2", false),
+        AMFPropertyInfoWString(ZCAMLIVE_IP_2, ZCAMLIVE_IP_2, L"10.98.32.3", false),
+        AMFPropertyInfoWString(ZCAMLIVE_IP_3, ZCAMLIVE_IP_3, L"10.98.32.4", false),
+        AMFPrimitivePropertyInfoMapEnd
+}
+//-------------------------------------------------------------------------------------------------
+AMFZCamLiveStreamImpl::~AMFZCamLiveStreamImpl()
+{
+    Terminate();
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::Init(AMF_SURFACE_FORMAT /*format*/, amf_int32 /*width*/, amf_int32 /*height*/)
+{
+    AMFLock lock(&m_sync);
+    AMF_RESULT res = AMF_OK;
+    if (!m_bTerminated)
+    {
+        Terminate();
+    }
+
+    amf_int64 streamActive = -1;
+    GetProperty(ZCAMLIVE_STREAM_ACTIVE_CAMERA, &streamActive);
+    m_streamActive = (amf_int32)streamActive;
+
+    m_OutputStreams.clear();
+
+    //create outputs 
+    amf_int32 outputs = (m_audioMode == CAM_AUDIO_MODE_SILENT) ? m_streamCount + 1 : m_streamCount;
+    for (amf_int32 idx = 0; idx < outputs; idx++)
+    {
+        AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImplPtr pStream = new AMFZCamLiveStreamImpl::AMFOutputZCamLiveStreamImpl(this, idx);
+        if (!pStream)
+        {
+            res = AMF_OUT_OF_MEMORY;
+            break;
+        }
+
+        m_OutputStreams.push_back(pStream);
+    }
+
+    for (amf_int32 idx = m_streamCount; idx < outputs; idx++)
+    {
+        m_OutputStreams[idx]->m_isAudio = true;
+    }
+
+    amf::AMFVariant var;
+    GetProperty(ZCAMLIVE_IP_0, &var);
+    m_dataStreamZCam.SetIP(0, var.ToString().c_str());
+    GetProperty(ZCAMLIVE_IP_1, &var);
+    m_dataStreamZCam.SetIP(1, var.ToString().c_str());
+    GetProperty(ZCAMLIVE_IP_2, &var);
+    m_dataStreamZCam.SetIP(2, var.ToString().c_str());
+    GetProperty(ZCAMLIVE_IP_3, &var);
+    m_dataStreamZCam.SetIP(3, var.ToString().c_str());
+
+    //init cameras
+    if (AMF_OK == res)
+    {
+        std::wstring modeCommandW = ZCamVideoModeCommandEnum[m_videoMode].name;
+        std::string modeCommand = std::string(modeCommandW.begin(), modeCommandW.end());
+
+        int err = m_dataStreamZCam.SetupCameras(modeCommand.c_str());
+        if (!err)
+        {
+            err = m_dataStreamZCam.Open();
+        }
+
+        if (err)
+        {
+            res = AMF_UNEXPECTED;
+        }
+    }
+
+    if (AMF_OK == res)
+    {
+        m_ZCamPollingThread.Start();
+    }
+
+    m_bTerminated = false;
+    return res;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::ReInit(amf_int32 width, amf_int32 height)
+{
+    Terminate();
+    return Init(AMF_SURFACE_UNKNOWN, width, height);
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::Terminate()
+{
+    m_ZCamPollingThread.RequestStop();
+    m_ZCamPollingThread.WaitForStop();
+
+    AMFLock lock(&m_sync);
+
+    m_OutputStreams.clear();
+    m_frameCount = 0;
+    m_bForceEof = false;
+    m_dataStreamZCam.Close();
+
+    m_bTerminated = true;
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::Drain()
+{
+    AMFLock lock(&m_sync);
+    m_bForceEof = true;
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::Flush()
+{
+    AMFLock lock(&m_sync);
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMF_STD_CALL  AMFZCamLiveStreamImpl::GetOutput(amf_int32 index, AMFOutput** ppOutput)
+{
+    AMF_RETURN_IF_FALSE(index >= 0 && index < (amf_int32)m_OutputStreams.size(), AMF_INVALID_ARG, L"Invalid index");
+    AMF_RETURN_IF_FALSE(ppOutput != NULL, AMF_INVALID_ARG, L"ppOutput = NULL");
+
+    *ppOutput = m_OutputStreams[index];
+    (*ppOutput)->Acquire();
+
+    return AMF_OK;
+}
+//-------------------------------------------------------------------------------------------------
+void AMF_STD_CALL  AMFZCamLiveStreamImpl::OnPropertyChanged(const wchar_t* pName)
+{
+    AMFLock lock(&m_sync);
+    amf_wstring name(pName);
+
+    if (name == ZCAMLIVE_VIDEO_MODE)
+    {
+        GetProperty(ZCAMLIVE_VIDEO_MODE, (amf_int64*)&m_videoMode);
+        SetProperty(ZCAMLIVE_VIDEO_FRAMESIZE, VideoFrameSizeList[m_videoMode]);
+        SetProperty(ZCAMLIVE_VIDEO_FRAMERATE, VideoFrameRateList[m_videoMode]);
+    }
+    else if (name == ZCAMLIVE_AUDIO_MODE)
+    {
+        GetProperty(ZCAMLIVE_AUDIO_MODE, (amf_int64*)&m_audioMode);
+    }
+}
+//-------------------------------------------------------------------------------------------------
+amf_int32   AMF_STD_CALL  AMFZCamLiveStreamImpl::GetOutputCount()
+{  
+    AMFLock lock(&m_sync);
+    return (amf_int32)((m_audioMode == CAM_AUDIO_MODE_SILENT) ? m_streamCount + 1 : m_streamCount);
+}
+//-------------------------------------------------------------------------------------------------
+AMF_RESULT AMFZCamLiveStreamImpl::PollStream()
+{  
+    AMF_RESULT res = AMF_OK; // error checking can be added later
+    std::vector<int> lenDataList;
+    std::vector<char*> pDataList;
+    amf_pts timestampCapStart = amf_high_precision_clock();
+    int err = m_dataStreamZCam.CaptureOneFrame(pDataList, lenDataList);
+    amf_pts timestampCapEnd = amf_high_precision_clock();
+    if (pDataList.size() != m_streamCount)
+    {
+        AMFTraceWarning(L"Videostitch", L"CaptureOneFrame, pDataList.size() != m_streamCount! Received streams = %d", (amf_int32)pDataList.size());
+        return AMF_OK;
+    }
+
+    for (amf_int32 idx = 0; idx < m_streamCount; idx++)
+    {
+        char* pData = pDataList[idx];
+        int lenData = lenDataList[idx];
+
+        if (!pData || lenData <= 0)
+        {
+            AMFTraceWarning(L"Videostitch", L"Data len- !pData || lenData <= 0!!");
+        }
+        else
+        {
+            AMFBufferPtr pBuf;
+            AMF_RESULT err = m_pContext->AllocBuffer(AMF_MEMORY_HOST, lenData, &pBuf);
+            if (AMF_OK == err && pBuf)
+            {
+                if (idx == 0)
+                {
+                    pBuf->SetProperty(L"CaptureStart", timestampCapStart);
+                    pBuf->SetProperty(L"CaptureEnd", timestampCapEnd);
+
+                    amf_pts timestamp = amf_high_precision_clock();
+                    pBuf->SetProperty(L"DemuxerStart", timestamp);
+                }
+
+                void* pMem = pBuf->GetNative();
+                memcpy(pMem, pData, lenData);
+                AMF_RESULT err = AMF_INPUT_FULL;
+                while (!m_ZCamPollingThread.StopRequested())
+                {
+                    //this is for playback
+                    if ((m_streamActive >= 0) && (idx != m_streamActive))
+                    {
+                        break;
+                    }
+                    err = m_OutputStreams[idx]->SubmitFrame(pBuf);
+                    if (AMF_INPUT_FULL != err)
+                    {
+                        break;
+                    }
+                    amf_sleep(1); // milliseconds
+                }
+            }
+        }
+    }
+    m_frameCount++;
+    return res;
+}
+//-------------------------------------------------------------------------------------------------
+void AMFZCamLiveStreamImpl::ZCamLiveStreamPollingThread::Run()
+{
+    AMF_RESULT res = AMF_OK; // error checking can be added later
+    while (true)
+    {
+        res = m_pHost->PollStream();
+        if (res == AMF_EOF)
+        {
+            break; // Drain complete
+        }
+        if (StopRequested())
+        {
+            break;
+        }
+    }
+}
+//-------------------------------------------------------------------------------------------------
+AMFZCamLiveStreamImpl::ZCamLiveStreamPollingThread::ZCamLiveStreamPollingThread(AMFZCamLiveStreamImpl *pHost) :
+m_pHost(pHost)
+{
+}
+//-------------------------------------------------------------------------------------------------
+AMFZCamLiveStreamImpl::ZCamLiveStreamPollingThread::~ZCamLiveStreamPollingThread()
+{
+}
+//-------------------------------------------------------------------------------------------------

obs-studio-22.0.1.tar.xz/plugins/enc-amf/AMF/amf/public/src/components/ZCamLiveStream/ZCamLiveStreamImpl.h Added

@@ -0,0 +1,157 @@
+// 
+// Notice Regarding Standards.  AMD does not provide a license or sublicense to
+// any Intellectual Property Rights relating to any standards, including but not
+// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
+// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
+// (collectively, the "Media Technologies"). For clarity, you will pay any
+// royalties due for such third party technologies, which may include the Media
+// Technologies that are owed as a result of AMD providing the Software to you.
+// 
+// MIT license 
+// 
+//
+// Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#pragma once
+
+#include "public/include/core/Context.h"
+#include "public/include/components/Component.h"
+#include "public/common/PropertyStorageExImpl.h"
+#include "public/include/components/ZCamLiveStream.h"
+#include "public/src/components/ZCamLiveStream/DataStreamZCam.h"
+
+namespace amf
+{
+    //-------------------------------------------------------------------------------------------------
+
+    class AMFZCamLiveStreamImpl : 
+        public AMFInterfaceBase,
+        public AMFPropertyStorageExImpl<AMFComponentEx>
+    {
+    //-------------------------------------------------------------------------------------------------
+    typedef AMFInterfaceImpl < AMFPropertyStorageExImpl <AMFOutput> > baseclassOutputProperty;
+
+    class AMFOutputZCamLiveStreamImpl :
+        public baseclassOutputProperty
+    {
+        friend class AMFZCamLiveStreamImpl;
+
+    public:
+        AMF_BEGIN_INTERFACE_MAP
+            AMF_INTERFACE_ENTRY(AMFOutput)
+            AMF_INTERFACE_CHAIN_ENTRY(AMFPropertyStorageExImpl <AMFOutput>)
+            AMF_INTERFACE_CHAIN_ENTRY(baseclassOutputProperty)
+        AMF_END_INTERFACE_MAP
+
+        AMFOutputZCamLiveStreamImpl(AMFZCamLiveStreamImpl* pHost, amf_int32 index);
+        virtual ~AMFOutputZCamLiveStreamImpl();
+
+        // AMFOutput interface
+        virtual AMF_RESULT AMF_STD_CALL  QueryOutput(AMFData** ppData);
+    protected:
+        AMF_RESULT              SubmitFrame(AMFData* pData);
+        AMF_RESULT              GetAudioData(AMFData** ppData);
+
+        amf_int32                m_iQueueSize;
+        AMFZCamLiveStreamImpl*   m_pHost;
+        amf_int32                m_iIndex;
+        amf_int64                m_frameCount;
+        AMFQueue<AMFDataPtr>     m_VideoFrameQueue;
+        bool                     m_isAudio;
+        amf_pts                  m_audioTimeStamp;
+        amf_pts                  m_ptsLast;                 
+        amf_int64                m_lowLatency;
+    };
+    typedef AMFInterfacePtr_T<AMFOutputZCamLiveStreamImpl>    AMFOutputZCamLiveStreamImplPtr;
+//-------------------------------------------------------------------------------------------------
+    protected:
+        class ZCamLiveStreamPollingThread : public amf::AMFThread
+        {
+        protected:
+            AMFZCamLiveStreamImpl*         m_pHost;
+        public:
+            ZCamLiveStreamPollingThread(AMFZCamLiveStreamImpl* pHost);
+            ~ZCamLiveStreamPollingThread();
+            virtual void Run();
+        };
+
+    public:
+        // interface access
+        AMF_BEGIN_INTERFACE_MAP
+            AMF_INTERFACE_MULTI_ENTRY(AMFComponent)
+            AMF_INTERFACE_MULTI_ENTRY(AMFComponentEx)
+            AMF_INTERFACE_CHAIN_ENTRY(AMFPropertyStorageExImpl<AMFComponentEx>)
+        AMF_END_INTERFACE_MAP
+
+
+        AMFZCamLiveStreamImpl(AMFContext* pContext);
+        virtual ~AMFZCamLiveStreamImpl();
+
+        // AMFComponent interface
+        virtual AMF_RESULT  AMF_STD_CALL  Init(AMF_SURFACE_FORMAT format, amf_int32 width, amf_int32 height);
+        virtual AMF_RESULT  AMF_STD_CALL  ReInit(amf_int32 width, amf_int32 height);
+        virtual AMF_RESULT  AMF_STD_CALL  Terminate();
+        virtual AMF_RESULT  AMF_STD_CALL  Drain();
+        virtual AMF_RESULT  AMF_STD_CALL  Flush();
+
+        virtual AMF_RESULT  AMF_STD_CALL  SubmitInput(AMFData* pData)                               { return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  QueryOutput(AMFData** ppData)                             { return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  SetOutputDataAllocatorCB(AMFDataAllocatorCB* callback)    { return AMF_OK; };
+        virtual AMF_RESULT  AMF_STD_CALL  GetCaps(AMFCaps** ppCaps)                                 { return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  Optimize(AMFComponentOptimizationCallback* pCallback)     { return AMF_OK;  };
+        virtual AMFContext* AMF_STD_CALL  GetContext()                                              { return m_pContext; };
+
+        // AMFComponentEx interface
+        virtual amf_int32   AMF_STD_CALL  GetInputCount()                                           {  return 0;  };
+        virtual amf_int32   AMF_STD_CALL  GetOutputCount();
+
+        virtual AMF_RESULT  AMF_STD_CALL  GetInput(amf_int32 index, AMFInput** ppInput)             {  return AMF_NOT_SUPPORTED;  };
+        virtual AMF_RESULT  AMF_STD_CALL  GetOutput(amf_int32 index, AMFOutput** ppOutput);
+
+        // AMFPropertyStorageObserver interface
+        virtual void        AMF_STD_CALL  OnPropertyChanged(const wchar_t* pName);
+
+    protected:
+        AMF_RESULT PollStream();
+
+    protected:
+        static const AMFSize   VideoFrameSizeList[];
+        static const amf_int32 VideoFrameRateList[];
+    private:
+        AMFContextPtr               m_pContext;
+        mutable AMFCriticalSection  m_sync;
+        amf_vector<AMFOutputZCamLiveStreamImplPtr>  m_OutputStreams;
+        ZCamLiveStreamPollingThread     m_ZCamPollingThread;
+        AMFDataStreamZCamImpl           m_dataStreamZCam;
+        bool                    m_bForceEof;
+        bool                    m_bTerminated;
+        amf_int64               m_frameCount;
+        amf_int32               m_streamCount;
+        amf_int32               m_streamActive;
+        amf_int64               m_videoMode;
+        amf_int64               m_audioMode;
+
+        AMFZCamLiveStreamImpl(const AMFZCamLiveStreamImpl&);
+        AMFZCamLiveStreamImpl& operator=(const AMFZCamLiveStreamImpl&);
+    };
+
+    typedef AMFInterfacePtr_T<AMFZCamLiveStreamImpl>    AMFZCamLiveStreamImplPtr;
+}
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/enc-amf/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/CMakeLists.txt Changed

@@ -16,28 +16,93 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 cmake_minimum_required(VERSION 3.1.0)
-PROJECT(enc-amf VERSION 2.3.3)
+PROJECT(enc-amf VERSION 2.4.2)
 
 ################################################################################
-# Version
+# CMake / Compiler
 ################################################################################
 configure_file(
-	"${PROJECT_SOURCE_DIR}/#Resources/package.in.bat"
-	"${PROJECT_SOURCE_DIR}/#Resources/package.bat"
-)
-configure_file(
-	"${PROJECT_SOURCE_DIR}/#Resources/Installer.in.iss"
-	"${PROJECT_SOURCE_DIR}/#Resources/Installer.iss"
+	"${PROJECT_SOURCE_DIR}/ci/installer.in.iss"
+	"${PROJECT_BINARY_DIR}/ci/installer.iss"
 )
+
 configure_file(
 	"${PROJECT_SOURCE_DIR}/Include/Version.h.in"
 	"${PROJECT_BINARY_DIR}/Include/Version.h"
 )
 
+# All Warnings, Extra Warnings, Pedantic
+if(MSVC)
+	# Force to always compile with W4
+	if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+	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
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
+endif()
+
+math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
+
+################################################################################
+# Options
+################################################################################
+SET(AMF_SDK_DIR  "${PROJECT_SOURCE_DIR}/AMF/" CACHE PATH "AMD Advanced Media Framework SDK Directory")
+
+IF(TARGET libobs)
+	MESSAGE(STATUS "enc-amf: Using native obs-studio.")
+	SET(OBS_NATIVE TRUE)
+	OPTION(BUILD_AMD_ENCODER "Build AMD Encoder module" ON)
+	
+	if (NOT BUILD_AMD_ENCODER)
+		message(STATUS "Not building AMD Encoder")
+		return()
+	endif()
+ELSE()
+	SET(OBS_NATIVE FALSE)
+	SET(OBS_STUDIO_DIR "" CACHE PATH "OBS Studio Source/Package Directory")	
+ENDIF()
+
+################################################################################
+# Dependencies
+################################################################################
+
+# AMF SDK
+if(AMF_SDK_DIR STREQUAL "")
+	message(STATUS "AMF_SDK_DIR not set! enc-amf plugin disabled.")
+	return()
+endif()
+
+if(NOT EXISTS "${AMF_SDK_DIR}/amf/public/include/components/VideoEncoderVCE.h")
+	message(STATUS "AMF_SDK_DIR invalid! enc-amf plugin disabled.")
+	return()
+endif()
+
+# Detect OBS_STUDIO_DIR type
+IF(NOT OBS_NATIVE)
+	IF(EXISTS "${OBS_STUDIO_DIR}/libobs/obs-module.h")
+		MESSAGE(STATUS "enc-amf: Using referenced obs-studio.")
+		SET(OBS_PACKAGE FALSE)
+		SET(obsPath "${OBS_STUDIO_DIR}")
+		INCLUDE("${OBS_STUDIO_DIR}/cmake/external/Findlibobs.cmake")
+	ELSEIF(EXISTS "${OBS_STUDIO_DIR}/cmake/LibObs/LibObsConfig.cmake")
+		MESSAGE(STATUS "enc-amf: Using packaged obs-studio.")
+		SET(OBS_PACKAGE TRUE)
+		INCLUDE("${OBS_STUDIO_DIR}/cmake/LibObs/LibObsConfig.cmake")
+	ELSE()
+		MESSAGE("Failed to detect OBS_STUDIO_DIR type, verify that the following is path correct '${OBS_STUDIO_DIR}'.")
+		return()
+	ENDIF()
+ENDIF()
+
 ################################################################################
 # Code
 ################################################################################
-SET(enc-amf_HEADERS
+SET(PROJECT_HEADERS
 	"${PROJECT_SOURCE_DIR}/Include/amf.h"
 	"${PROJECT_SOURCE_DIR}/Include/amf-capabilities.h"
 	"${PROJECT_SOURCE_DIR}/Include/amf-encoder.h"
@@ -53,7 +118,7 @@
 	"${PROJECT_SOURCE_DIR}/Include/strings.h"
 	"${PROJECT_BINARY_DIR}/Include/Version.h"
 )
-SET(enc-amf_SOURCES
+SET(PROJECT_SOURCES
 	"${PROJECT_SOURCE_DIR}/Source/amf.cpp"
 	"${PROJECT_SOURCE_DIR}/Source/amf-capabilities.cpp"
 	"${PROJECT_SOURCE_DIR}/Source/amf-encoder.cpp"
@@ -67,170 +132,148 @@
 	"${PROJECT_SOURCE_DIR}/Source/utility.cpp"
 	"${PROJECT_SOURCE_DIR}/Source/plugin.cpp"
 )
-SET(enc-amf_DATA
+SET(PROJECT_DATA
 	"${PROJECT_SOURCE_DIR}/Resources/locale/en-US.ini"
 	"${PROJECT_SOURCE_DIR}/LICENSE"
 	"${PROJECT_SOURCE_DIR}/AUTHORS"
 )
-SET(enc-amf_LIBRARIES
+SET(PROJECT_LIBRARIES
 	version
 	winmm
 )
 
-# Source Grouping
-source_group("Data Files" FILES ${enc-amf_DATA})
-
-# Windows Only
 if (WIN32)
-	LIST(APPEND enc-amf_HEADERS
+	# Windows Only
+	LIST(APPEND PROJECT_HEADERS
 		"Include/api-d3d9.h"
 		"Include/api-d3d11.h"
 	)
-	LIST(APPEND enc-amf_SOURCES
+	LIST(APPEND PROJECT_SOURCES
 		"Source/api-d3d9.cpp"
 		"Source/api-d3d11.cpp"
 	)
+	
+	# windows.h
+	add_definitions(-DWIN32_LEAN_AND_MEAN)
+	add_definitions(-DNOGPICAPMASKS)
+	add_definitions(-DNOVIRTUALKEYCODES)
+	#add_definitions(-DNOWINMESSAGES)
+	add_definitions(-DNOWINSTYLES)
+	add_definitions(-DNOSYSMETRICS)
+	add_definitions(-DNOMENUS)
+	add_definitions(-DNOICONS)
+	add_definitions(-DNOKEYSTATES)
+	add_definitions(-DNOSYSCOMMANDS)
+	add_definitions(-DNORASTEROPS)
+	add_definitions(-DNOSHOWWINDOW)
+	add_definitions(-DNOATOM)
+	add_definitions(-DNOCLIPBOARD)
+	add_definitions(-DNOCOLOR)
+	add_definitions(-DNOCTLMGR)
+	add_definitions(-DNODRAWTEXT)
+	#add_definitions(-DNOGDI)
+	add_definitions(-DNOKERNEL)
+	#add_definitions(-DNOUSER)
+	#add_definitions(-DNONLS)
+	add_definitions(-DNOMB)
+	add_definitions(-DNOMEMMGR)
+	add_definitions(-DNOMETAFILE)
+	add_definitions(-DNOMINMAX)
+	#add_definitions(-DNOMSG)
+	add_definitions(-DNOOPENFILE)
+	add_definitions(-DNOSCROLL)
+	add_definitions(-DNOSERVICE)
+	add_definitions(-DNOSOUND)
+	#add_definitions(-DNOTEXTMETRIC)
+	add_definitions(-DNOWH)
+	add_definitions(-DNOWINOFFSETS)
+	add_definitions(-DNOCOMM)
+	add_definitions(-DNOKANJI)
+	add_definitions(-DNOHELP)
+	add_definitions(-DNOPROFILER)
+	add_definitions(-DNODEFERWINDOWPOS)
+	add_definitions(-DNOMCX)
+	add_definitions(-DNOIME)
+	add_definitions(-DNOMDI)
+	add_definitions(-DNOINOUT)
 endif()
 
+# Source Grouping
+source_group("Data Files" FILES ${enc-amf_DATA})
+
 ################################################################################
-# Standalone and OBS Studio Build Data
+# Target
 ################################################################################
-if(TARGET libobs)
-	# OBS Studio Specific
-	
-	# Variables
-	OPTION(AMDAMF_Disable "Disable AMD Advanced Media Framework support" OFF)
-	SET(AMDAMF_SDKDir "${PROJECT_SOURCE_DIR}/AMF/" CACHE PATH "AMD Advanced Media Framework SDK Directory")
-
-	# Tests
-	if(AMDAMF_Disable)
-		message(STATUS "AMD AMF support disabled")
-		return()
-	endif()
 
-	if(AMDAMF_SDKDir STREQUAL "")
-		message(STATUS "AMDAMF_SDKDir not set!  enc-amf plugin disabled.")
-		return()
-	endif()
+ADD_LIBRARY(enc-amf MODULE
+	${PROJECT_HEADERS}
+	${PROJECT_SOURCES}
+	${PROJECT_DATA}
+)
 
-	if(NOT EXISTS "${AMDAMF_SDKDir}/amf/public/include/components/VideoEncoderVCE.h")
-		message(STATUS "AMDAMF_SDKDir invalid!  enc-amf plugin disabled.")
-		return()
-	endif()
-	
-	# Directories
-	INCLUDE_DIRECTORIES(
-		"${CMAKE_SOURCE_DIR}"
-		"${PROJECT_BINARY_DIR}"
+# Include Directories
+TARGET_INCLUDE_DIRECTORIES(enc-amf
+	PUBLIC
 		"${PROJECT_BINARY_DIR}/Include"
-		"${PROJECT_BINARY_DIR}/Source"
-		"${PROJECT_SOURCE_DIR}"
 		"${PROJECT_SOURCE_DIR}/Include"
+		"${AMF_SDK_DIR}/amf/public/include"
+	PRIVATE
+		"${PROJECT_BINARY_DIR}/Source"
 		"${PROJECT_SOURCE_DIR}/Source"
-		"${AMDAMF_SDKDir}/amf/public/include"
-	)
-	SET(LIBOBS_LIBRARIES libobs)
-else()
-	# Standlone Specific
-
-	# Variables
-	SET(PATH_AMDAMFSDK "${PROJECT_SOURCE_DIR}/AMF/" CACHE PATH "AMD Advanced Media Framework SDK Directory")
-	SET(PATH_OBSStudio "" CACHE PATH "OBS Studio Source Code Directory")
-	
-	# Tests
-	if(PATH_AMDAMFSDK STREQUAL "")
-		message(STATUS "PATH_AMDAMFSDK not set!")
-		return()
-	endif()
-
-	if(NOT EXISTS "${PATH_AMDAMFSDK}/amf/public/include/components/VideoEncoderVCE.h")
-		message(STATUS "PATH_AMDAMFSDK invalid!")
-		return()
-	endif()
-	
-	if(PATH_OBSStudio STREQUAL "")
-		message(STATUS "PATH_OBSStudio not set!")
-		return()
-	endif()
-
-	if(NOT EXISTS "${PATH_OBSStudio}/libobs/obs-module.h")
-		message(STATUS "PATH_OBSStudio invalid!")
-		return()
-	endif()
-	
-	# Find OBS Libraries
-	SET(obsPath "${PATH_OBSStudio}")
-	INCLUDE("${PATH_OBSStudio}/cmake/external/Findlibobs.cmake")
-	
-	# Compiling
-	INCLUDE_DIRECTORIES(
 		"${PROJECT_BINARY_DIR}"
-		"${PROJECT_BINARY_DIR}/Include"
-		"${PROJECT_BINARY_DIR}/Source"
 		"${PROJECT_SOURCE_DIR}"
-		"${PROJECT_SOURCE_DIR}/Include"
-		"${PROJECT_SOURCE_DIR}/Source"
-		"${PATH_AMDAMFSDK}/amf/public/include"
-		"${PATH_OBSStudio}/"
+		"${CMAKE_SOURCE_DIR}"
+)
+IF(OBS_NATIVE)
+	TARGET_LINK_LIBRARIES(enc-amf
+		libobs
 	)
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-endif()
+ELSEIF(OBS_PACKAGE)
+	TARGET_INCLUDE_DIRECTORIES(enc-amf
+		PRIVATE
+			"${OBS_STUDIO_DIR}/include"
+	)
+	TARGET_LINK_LIBRARIES(enc-amf
+		libobs
+	)
+ELSE()
+	TARGET_INCLUDE_DIRECTORIES(enc-amf
+		PRIVATE
+			"${OBS_STUDIO_DIR}/libobs"
+	)
+	TARGET_LINK_LIBRARIES(enc-amf
+		"${LIBOBS_LIB}"
+	)
+ENDIF()
 
-################################################################################
-# Build
-################################################################################
-ADD_LIBRARY(enc-amf MODULE
-	${enc-amf_HEADERS}
-	${enc-amf_SOURCES}
-	${enc-amf_DATA}
-)
+# Link Libraries
 TARGET_LINK_LIBRARIES(enc-amf
-	${LIBOBS_LIBRARIES}
-	${enc-amf_LIBRARIES}
+	"${PROJECT_LIBRARIES}"
 )
 
-# All Warnings, Extra Warnings, Pedantic
-if(MSVC)
-	# Force to always compile with W4
-	if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-	else()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-	endif()
-
-	# Enable Options
-	# /Gy (Function-Level Linking)
-	# /OPT:REF
-	# /OPT:NOICF	
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gy")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Gy")
-	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:NOICF")
-elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-	# Update if necessary
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
-endif()
+################################################################################
+# Installation
+################################################################################
 
-# Main Project
-if(TARGET libobs)
+IF(OBS_NATIVE)
 	install_obs_plugin_with_data(enc-amf Resources)
-else()
-	math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
-	add_custom_command(TARGET enc-amf POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy_directory
-		"${PROJECT_SOURCE_DIR}/Resources/locale"
-		"${PROJECT_SOURCE_DIR}/#Build/data/obs-plugins/enc-amf/locale"
+ELSE()
+	INSTALL(TARGETS enc-amf
+		RUNTIME DESTINATION "./obs-plugins/${BITS}bit/" COMPONENT Runtime
+		LIBRARY DESTINATION "./obs-plugins/${BITS}bit/" COMPONENT Runtime
 	)
-	add_custom_command(TARGET enc-amf POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy
-		"$<TARGET_FILE:enc-amf>"
-		"${PROJECT_SOURCE_DIR}/#Build/obs-plugins/${BITS}bit/$<TARGET_FILE_NAME:enc-amf>"
-	)
-	add_custom_command(TARGET enc-amf POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy
-		"$<TARGET_PDB_FILE:enc-amf>"
-		"${PROJECT_SOURCE_DIR}/#Build/obs-plugins/${BITS}bit/$<TARGET_PDB_FILE_NAME:enc-amf>"
+	INSTALL(FILES $<TARGET_PDB_FILE:enc-amf> DESTINATION "./obs-plugins/${BITS}bit/" OPTIONAL)
+	
+	INSTALL(
+		DIRECTORY "${PROJECT_SOURCE_DIR}/Resources/"
+		DESTINATION "./data/obs-plugins/enc-amf/"
 	)
-endif()
+ENDIF()
+
+################################################################################
+# Child Projects
+################################################################################
 
 # Sub Project
 add_subdirectory(amf-test)
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/amf-test/.clang-format Added

obs-studio-21.1.2.tar.xz/plugins/enc-amf/amf-test/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/amf-test/CMakeLists.txt Changed

@@ -18,11 +18,12 @@
 cmake_minimum_required(VERSION 3.1.0)
 PROJECT(enc-amf-test)
 
+################################################################################
+# CMake / Compiler
+################################################################################
+
 # All Warnings, Extra Warnings, Pedantic
 if(MSVC)
-	# Hide Microsofts insecurities, as they are usually not cross-platform compatible changes.
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS) 
-	
 	# Force to always compile with W4
 	if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
 		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -30,44 +31,81 @@
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
 	endif()
 	
-	# Use Static Linking instead of Dynamic Linking
-	string(REPLACE "/MT" "/MD"
-		"CMAKE_C_FLAGS" 
-		"${CMAKE_C_FLAGS}")
-	string(REPLACE "/MT" "/MD" 
-		"CMAKE_CXX_FLAGS" 
-		"${CMAKE_CXX_FLAGS}")
-	string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" UPPER_CONFIG_TYPES)
-	foreach(CONFIG_TYPE ${UPPER_CONFIG_TYPES})
-		string(REPLACE "/MT" "/MD"
-			"CMAKE_C_FLAGS_${CONFIG_TYPE}" 
-			"${CMAKE_C_FLAGS_${CONFIG_TYPE}}")
-
-		string(REPLACE "/MT" "/MD" 
-			"CMAKE_CXX_FLAGS_${CONFIG_TYPE}" 
-			"${CMAKE_CXX_FLAGS_${CONFIG_TYPE}}")
-	endforeach()
-	
-	# Enable Options
-	# /Gy (Function-Level Linking)
-	# /OPT:REF
-	# /OPT:NOICF	
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gy")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Gy")
-	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:NOICF")
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  # Update if necessary
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
+	# Update if necessary
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
 endif()
 
 # Detect Architecture (Bitness)
 math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
 
+add_definitions(-DLITE_OBS)
+
+################################################################################
+# Configuration
+################################################################################
+
+# From Parent:
+#   OBS_STUDIO_DIR
+#   OBS_NATIVE
+#   OBS_PACKAGE
+#   AMF_SDK_DIR
+
+IF(WIN32)	
+	# windows.h
+	add_definitions(-DWIN32_LEAN_AND_MEAN)
+	add_definitions(-DNOGPICAPMASKS)
+	add_definitions(-DNOVIRTUALKEYCODES)
+	#add_definitions(-DNOWINMESSAGES)
+	add_definitions(-DNOWINSTYLES)
+	add_definitions(-DNOSYSMETRICS)
+	add_definitions(-DNOMENUS)
+	add_definitions(-DNOICONS)
+	add_definitions(-DNOKEYSTATES)
+	add_definitions(-DNOSYSCOMMANDS)
+	add_definitions(-DNORASTEROPS)
+	add_definitions(-DNOSHOWWINDOW)
+	add_definitions(-DNOATOM)
+	add_definitions(-DNOCLIPBOARD)
+	add_definitions(-DNOCOLOR)
+	add_definitions(-DNOCTLMGR)
+	add_definitions(-DNODRAWTEXT)
+	#add_definitions(-DNOGDI)
+	add_definitions(-DNOKERNEL)
+	#add_definitions(-DNOUSER)
+	#add_definitions(-DNONLS)
+	add_definitions(-DNOMB)
+	add_definitions(-DNOMEMMGR)
+	add_definitions(-DNOMETAFILE)
+	add_definitions(-DNOMINMAX)
+	#add_definitions(-DNOMSG)
+	add_definitions(-DNOOPENFILE)
+	add_definitions(-DNOSCROLL)
+	add_definitions(-DNOSERVICE)
+	add_definitions(-DNOSOUND)
+	#add_definitions(-DNOTEXTMETRIC)
+	add_definitions(-DNOWH)
+	add_definitions(-DNOWINOFFSETS)
+	add_definitions(-DNOCOMM)
+	add_definitions(-DNOKANJI)
+	add_definitions(-DNOHELP)
+	add_definitions(-DNOPROFILER)
+	add_definitions(-DNODEFERWINDOWPOS)
+	add_definitions(-DNOMCX)
+	add_definitions(-DNOIME)
+	add_definitions(-DNOMDI)
+	add_definitions(-DNOINOUT)
+ENDIF()
+
+
+################################################################################
+# Dependencies
+################################################################################
+
 # Project
 add_executable(enc-amf-test
 	"${PROJECT_SOURCE_DIR}/main.cpp"
-	"${PROJECT_SOURCE_DIR}/libobs/obs-module.h"
-	"${PROJECT_SOURCE_DIR}/libobs/obs-module.c"
 	"${enc-amf_SOURCE_DIR}/Source/amf.cpp"
 	"${enc-amf_SOURCE_DIR}/Source/amf-capabilities.cpp"
 	"${enc-amf_SOURCE_DIR}/Source/amf-encoder.cpp"
@@ -87,23 +125,45 @@
 	"${enc-amf_SOURCE_DIR}/Include/api-d3d11.h"
 	"${enc-amf_SOURCE_DIR}/Include/utility.h"
 )
-include_directories(enc-amf-test BEFORE ${PROJECT_SOURCE_DIR})	
-target_link_libraries(enc-amf-test ${enc-amf_LIBRARIES})
+target_include_directories(enc-amf-test
+	PUBLIC 
+		"${PROJECT_SOURCE_DIR}"
+		"${enc-amf_SOURCE_DIR}/Include"
+		"${enc-amf_BINARY_DIR}/Include"
+		"${enc-amf_SOURCE_DIR}/Source"
+		"${AMF_SDK_DIR}/amf/public/include"
+)
+IF(OBS_NATIVE)
+	target_include_directories(enc-amf-test
+		PUBLIC
+	)
+ELSEIF(OBS_PACKAGE)
+	target_include_directories(enc-amf-test
+		PUBLIC
+	)
+ELSE()
+	target_include_directories(enc-amf-test
+		PUBLIC
+	)
+ENDIF()
+
+IF(WIN32)
+	target_link_libraries(enc-amf-test
+		version
+		winmm
+	)
+ENDIF()
+
 set_target_properties(enc-amf-test
 	PROPERTIES
 		OUTPUT_NAME "enc-amf-test${BITS}")
 
-if(TARGET libobs)
+if(OBS_NATIVE)
 	install_obs_datatarget(enc-amf-test "obs-plugins/enc-amf")
 else()
-	add_custom_command(TARGET enc-amf-test POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy
-		"$<TARGET_FILE:enc-amf-test>"
-		"${enc-amf_SOURCE_DIR}/#Build/data/obs-plugins/enc-amf/$<TARGET_FILE_NAME:enc-amf-test>"
-	)
-	add_custom_command(TARGET enc-amf-test POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy
-		"$<TARGET_PDB_FILE:enc-amf-test>"
-		"${enc-amf_SOURCE_DIR}/#Build/data/obs-plugins/enc-amf/$<TARGET_PDB_FILE_NAME:enc-amf-test>"
+	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)	
 endif()

obs-studio-21.1.2.tar.xz/plugins/enc-amf/amf-test/main.cpp -> obs-studio-22.0.1.tar.xz/plugins/enc-amf/amf-test/main.cpp Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/appveyor.yml Added

@@ -0,0 +1,65 @@
+matrix:
+  fast_finish: true
+
+image:
+  - Visual Studio 2017
+
+platform: x64
+
+version: '{build}-{branch}'
+
+environment:
+  CMAKE_SYSTEM_VERSION: 10.0.17134.0
+  OBS_STUDIO_32_URL: https://github.com/Xaymar/obs-studio/releases/download/21.1.2/obs-studio-x86-vs2017.7z
+  OBS_STUDIO_64_URL: https://github.com/Xaymar/obs-studio/releases/download/21.1.2/obs-studio-x64-vs2017.7z
+  OBS_STUDIO_32_FILE: obs32.7z
+  OBS_STUDIO_64_FILE: obs64.7z
+  OBS_STUDIO_32: obs-studio-x86-vs2017
+  OBS_STUDIO_64: obs-studio-x64-vs2017
+  PACKAGE_PREFIX: amd-encoder-for-obs-studio
+  INNOSETUP_URL: http://www.jrsoftware.org/download.php/is-unicode.exe
+
+install:
+- cmd: ci/appveyor-install.bat
+
+build_script:
+- cmd: ci/appveyor-build.bat
+
+after_build:
+- cmd: ci/appveyor-package.bat
+
+cache:
+  - obs32.7z
+  - obs64.7z
+  - inno.exe
+
+artifacts:
+  - path: build/$(PACKAGE_NAME).zip
+    name: $(PACKAGE_NAME).zip
+  - path: build/$(PACKAGE_NAME).7z
+    name: $(PACKAGE_NAME).7z
+  - path: build/*.exe
+
+deploy:
+  - provider: GitHub
+    auth_token:
+      secure: 9WaGfDtzH1lHXI9H0Sw++iIIEVWed5tDyTDaW5MtiidpILHNPXrRbBjKzF2Z3Pzs
+    draft: true
+    prerelease: false
+    force_update: true
+    on:
+      appveyor_repo_tag: true
+
+test: off
+
+notifications:
+  - provider: Webhook
+    url: 
+      secure: PTtt5ALhmK0q42jYyx4/Qa1Uf18+gLMXKGdzJjDISJuFBKpGtLtFkS2RAkVARq40kF3fy9SBICAjuc97/d733iaDv9Vpn0luTHJbuQlUK4ELSsYZOw1weoih54SM6ESHRnuOVoe7cmYAikYC29UrxLTTuLKxJwvY2AVwKog6vto=
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: true
+    body: >-
+      {
+        "content": "**Build {{status}}**: {{buildUrl}}\n[{{commitId}}] {{commitMessage}}\nBy {{commitAuthor}} on {{commitDate}}"
+      }
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/ci Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/ci/appveyor-build.bat Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/ci/appveyor-install.bat Added

@@ -0,0 +1,32 @@
+git submodule update --init --force --recursive
+
+IF EXIST "%OBS_STUDIO_32_FILE%" (
+	curl -kL "%OBS_STUDIO_32_URL%" -f --retry 5 -o "%OBS_STUDIO_32_FILE%" -z "%OBS_STUDIO_32_FILE%"
+) ELSE (
+	curl -kL "%OBS_STUDIO_32_URL%" -f --retry 5 -o "%OBS_STUDIO_32_FILE%"
+)
+7z x -y "%OBS_STUDIO_32_FILE%" -o. > nul
+
+IF EXIST "%OBS_STUDIO_64_FILE%" (
+	curl -kL "%OBS_STUDIO_64_URL%" -f --retry 5 -o "%OBS_STUDIO_64_FILE%" -z "%OBS_STUDIO_64_FILE%"
+) ELSE (
+	curl -kL "%OBS_STUDIO_64_URL%" -f --retry 5 -o "%OBS_STUDIO_64_FILE%"
+)
+7z x -y "%OBS_STUDIO_64_FILE%" -o. > nul
+
+IF "%APPVEYOR_REPO_TAG%"=="true" (
+  SET "PACKAGE_NAME=%PACKAGE_PREFIX%-%APPVEYOR_REPO_TAG_NAME%"
+) ELSE (
+	IF "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (
+		SET "PACKAGE_NAME=%PACKAGE_PREFIX%-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_NUMBER%"
+	) ELSE (
+		SET "PACKAGE_NAME=%PACKAGE_PREFIX%-%APPVEYOR_PULL_REQUEST_NUMBER%-%APPVEYOR_BUILD_NUMBER%"
+	)
+)
+
+IF EXIST inno.exe (
+	curl -kL "%INNOSETUP_URL%" -f --retry 5 -o inno.exe -z inno.exe
+) else (
+	curl -kL "%INNOSETUP_URL%" -f --retry 5 -o inno.exe
+)
+inno.exe /VERYSILENT /NORETART /SP- /SUPPRESSMSGBOXES
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/ci/appveyor-package.bat Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/ci/installer.in.iss Added

@@ -0,0 +1,114 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "AMD Encoder for OBS Studio"
+#define MyAppVersion "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"
+#define MyAppPublisher "Xaymars Technology Workshop"
+#define MyAppURL "http://www.xaymar.com/portfolio/plugin-amd-vce-plugin-for-obs-studio/"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{FD6676CE-0580-4B34-9DB4-4879A0BEB31D}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={code:GetDirName}
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+LicenseFile="@PROJECT_SOURCE_DIR@/LICENSE"
+OutputDir="@CMAKE_INSTALL_PREFIX@/../"
+OutputBaseFilename=AMD-Encoder-for-OBS-Studio.{#MyAppVersion}
+Compression=lzma
+SolidCompression=yes
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+VersionInfoDescription={#MyAppName} Setup
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "@CMAKE_INSTALL_PREFIX@/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+
+[Code]
+function GetDirName(Value: string): string;
+var
+  InstallPath: string;
+begin
+  // initialize default path, which will be returned when the following registry
+  // key queries fail due to missing keys or for some different reason
+  Result := '{pf}\obs-studio';
+  // query the first registry value; if this succeeds, return the obtained value
+  if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
+    Result := InstallPath
+end;
+
+/////////////////////////////////////////////////////////////////////
+function GetUninstallString(): String;
+var
+  sUnInstPath: String;
+  sUnInstallString: String;
+begin
+  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
+  sUnInstallString := '';
+  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
+    RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
+  Result := sUnInstallString;
+end;
+
+
+/////////////////////////////////////////////////////////////////////
+function IsUpgrade(): Boolean;
+begin
+  Result := (GetUninstallString() <> '');
+end;
+
+
+/////////////////////////////////////////////////////////////////////
+function UnInstallOldVersion(): Integer;
+var
+  sUnInstallString: String;
+  iResultCode: Integer;
+begin
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+
+  // default return value
+  Result := 0;
+
+  // get the uninstall string of the old app
+  sUnInstallString := GetUninstallString();
+  if sUnInstallString <> '' then begin
+    sUnInstallString := RemoveQuotes(sUnInstallString);
+    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+      Result := 3
+    else
+      Result := 2;
+  end else
+    Result := 1;
+end;
+
+/////////////////////////////////////////////////////////////////////
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if (CurStep=ssInstall) then
+  begin
+    if (IsUpgrade()) then
+    begin
+      UnInstallOldVersion();
+    end;
+  end;
+end;
\ No newline at end of file

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/amf-capabilities.h Added

@@ -0,0 +1,61 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <inttypes.h>
+#include <list>
+#include <map>
+#include <stdint.h>
+#include <tuple>
+#include <vector>
+#include "amf-encoder-h264.h"
+#include "amf-encoder-h265.h"
+#include "amf-encoder.h"
+#include "amf.h"
+#include "api-base.h"
+#include "components\ComponentCaps.h"
+#include "plugin.h"
+
+namespace Plugin {
+	namespace AMD {
+		class CapabilityManager {
+#pragma region Singleton
+			public:
+			static void               Initialize();
+			static CapabilityManager* Instance();
+			static void               Finalize();
+
+			private: // Private Initializer & Finalizer
+			CapabilityManager();
+			~CapabilityManager();
+
+			public: // Remove all Copy operators
+			CapabilityManager(CapabilityManager const&) = delete;
+			void operator=(CapabilityManager const&) = delete;
+#pragma endregion Singleton
+
+			bool IsCodecSupported(AMD::Codec codec);
+			bool IsCodecSupportedByAPI(AMD::Codec codec, API::Type api);
+			bool IsCodecSupportedByAPIAdapter(AMD::Codec codec, API::Type api, API::Adapter adapter);
+
+			private:
+			std::map<std::tuple<API::Type, API::Adapter, AMD::Codec>, bool> m_CapabilityMap;
+		};
+	} // namespace AMD
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/amf-encoder-h264.h Added

@@ -0,0 +1,197 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "amf-encoder.h"
+#include "components/VideoEncoderVCE.h"
+#include "plugin.h"
+
+namespace Plugin {
+	namespace AMD {
+		namespace H264 {
+			enum class SliceMode : uint8_t {
+				Row    = 1, // Horizontal?
+				Column = 2, // Vertical?
+			};
+		}
+
+		class EncoderH264 : public Encoder {
+			public:
+			EncoderH264(std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter = API::Adapter::Adapter(),
+						bool useOpenCLSubmission = false, bool useOpenCLConversion = false,
+						ColorFormat colorFormat = ColorFormat::NV12, ColorSpace colorSpace = ColorSpace::BT709,
+						bool fullRangeColor = false, bool useAsyncQueue = false, size_t asyncQueueSize = 0);
+			virtual ~EncoderH264();
+
+			// Properties - Initialization
+			virtual std::vector<Usage> CapsUsage() override;
+			virtual void               SetUsage(Usage v) override;
+			virtual Usage              GetUsage() override;
+
+			// Properties - Static
+			virtual std::vector<QualityPreset> CapsQualityPreset() override;
+			virtual void                       SetQualityPreset(QualityPreset v) override;
+			virtual QualityPreset              GetQualityPreset() override;
+
+#ifndef LITE_OBS
+			virtual std::vector<Profile> CapsProfile() override;
+			virtual void                 SetProfile(Profile v) override;
+			virtual Profile              GetProfile() override;
+
+			virtual std::vector<ProfileLevel> CapsProfileLevel() override;
+			virtual void                      SetProfileLevel(ProfileLevel v) override;
+			virtual void                      SetProfileLevel(ProfileLevel v, std::pair<uint32_t, uint32_t> r,
+															  std::pair<uint32_t, uint32_t> h) override;
+			virtual ProfileLevel              GetProfileLevel() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() override;
+			virtual void                          SetMaximumReferenceFrames(uint64_t v) override;
+			virtual uint64_t                      GetMaximumReferenceFrames() override;
+
+			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() override;
+			virtual void                          SetResolution(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetResolution() override;
+
+			virtual void                          SetAspectRatio(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() override;
+
+			virtual void                          SetFrameRate(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetFrameRate() override;
+
+			virtual std::vector<CodingType> CapsCodingType() override;
+			virtual void                    SetCodingType(CodingType v) override;
+			virtual CodingType              GetCodingType() override;
+
+			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() override;
+			virtual void                          SetMaximumLongTermReferenceFrames(uint32_t v) override;
+			virtual uint32_t                      GetMaximumLongTermReferenceFrames() override;
+
+			// Properties - Dynamic
+			virtual std::vector<RateControlMethod> CapsRateControlMethod() override;
+			virtual void                           SetRateControlMethod(RateControlMethod v) override;
+			virtual RateControlMethod              GetRateControlMethod() override;
+
+			virtual std::vector<PrePassMode> CapsPrePassMode() override;
+			virtual void                     SetPrePassMode(PrePassMode v) override;
+			virtual PrePassMode              GetPrePassMode() override;
+
+			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) override;
+			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() override;
+
+			virtual void SetFrameSkippingEnabled(bool v) override;
+			virtual bool IsFrameSkippingEnabled() override;
+
+			virtual void SetEnforceHRDEnabled(bool v) override;
+			virtual bool IsEnforceHRDEnabled() override;
+
+			virtual void SetFillerDataEnabled(bool v) override;
+			virtual bool IsFillerDataEnabled() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsQPMinimum();
+			void                                SetQPMinimum(uint8_t v);
+			uint8_t                             GetQPMinimum();
+
+			virtual std::pair<uint8_t, uint8_t> CapsQPMaximum();
+			void                                SetQPMaximum(uint8_t v);
+			uint8_t                             GetQPMaximum();
+
+			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() override;
+			virtual void                          SetTargetBitrate(uint64_t v) override;
+			virtual uint64_t                      GetTargetBitrate() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() override;
+			virtual void                          SetPeakBitrate(uint64_t v) override;
+			virtual uint64_t                      GetPeakBitrate() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsIFrameQP();
+			virtual void                        SetIFrameQP(uint8_t v) override;
+			virtual uint8_t                     GetIFrameQP() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsPFrameQP();
+			virtual void                        SetPFrameQP(uint8_t v) override;
+			virtual uint8_t                     GetPFrameQP() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsBFrameQP();
+			virtual void                        SetBFrameQP(uint8_t v);
+			virtual uint8_t                     GetBFrameQP();
+
+			virtual void     SetMaximumAccessUnitSize(uint32_t v) override;
+			virtual uint32_t GetMaximumAccessUnitSize() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() override;
+			virtual void                          SetVBVBufferSize(uint64_t v) override;
+			virtual uint64_t                      GetVBVBufferSize() override;
+
+			virtual void  SetVBVBufferInitialFullness(double v) override;
+			virtual float GetInitialVBVBufferFullness() override;
+
+			// Properties - Picture Control
+			virtual void     SetIDRPeriod(uint32_t v) override;
+			virtual uint32_t GetIDRPeriod() override;
+
+			void     SetHeaderInsertionSpacing(uint32_t v);
+			uint32_t GetHeaderInsertionSpacing();
+
+			virtual void SetGOPAlignmentEnabled(bool v) override;
+			virtual bool IsGOPAlignmentEnabled() override;
+
+			virtual void SetDeblockingFilterEnabled(bool v) override;
+			virtual bool IsDeblockingFilterEnabled() override;
+
+			virtual uint8_t CapsBFramePattern();
+			virtual void    SetBFramePattern(uint8_t v);
+			virtual uint8_t GetBFramePattern();
+
+			virtual void   SetBFrameDeltaQP(int8_t v);
+			virtual int8_t GetBFrameDeltaQP();
+
+			virtual void SetBFrameReferenceEnabled(bool v);
+			virtual bool IsBFrameReferenceEnabled();
+
+			virtual void   SetBFrameReferenceDeltaQP(int8_t v);
+			virtual int8_t GetBFrameReferenceDeltaQP();
+
+			// Properties - Motion Estimation
+			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationQuarterPixelEnabled() override;
+
+			virtual void SetMotionEstimationHalfPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationHalfPixelEnabled() override;
+
+			// Properties - Intra-Refresh
+			std::pair<uint32_t, uint32_t> CapsIntraRefreshNumMBsPerSlot();
+			void                          SetIntraRefreshNumMBsPerSlot(uint32_t v);
+			uint32_t                      GetIntraRefreshNumMBsPerSlot();
+
+			void     SetIntraRefreshNumOfStripes(uint32_t v);
+			uint32_t GetIntraRefreshNumOfStripes();
+
+			// Internal
+			virtual void LogProperties() override;
+
+			protected:
+			virtual void        PacketPriorityAndKeyframe(amf::AMFDataPtr& d, struct encoder_packet* p) override;
+			virtual AMF_RESULT  GetExtraDataInternal(amf::AMFVariant* p) override;
+			virtual std::string HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index) override;
+
+			AMF_VIDEO_ENCODER_PICTURE_TYPE_ENUM m_FrameSkipType = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
+#endif
+		};
+	} // namespace AMD
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/amf-encoder-h265.h Added

@@ -0,0 +1,218 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "amf-encoder.h"
+#include "components/VideoEncoderHEVC.h"
+#include "plugin.h"
+
+namespace Plugin {
+	namespace AMD {
+		namespace H265 {
+			enum class Tier : uint8_t {
+				Main,
+				High,
+			};
+			enum class GOPType : uint8_t {
+				Fixed,    // Fixed Interval GOP
+				Variable, // Variable Interval GOP
+			};
+			enum class HeaderInsertionMode : uint8_t {
+				None         = 0,
+				AlignedToGOP = 1,
+				AlignedToIDR = 2,
+			};
+		} // namespace H265
+
+		class EncoderH265 : public Encoder {
+			public:
+			EncoderH265(std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter = API::Adapter::Adapter(),
+						bool useOpenCLSubmission = false, bool useOpenCLConversion = false,
+						ColorFormat colorFormat = ColorFormat::NV12, ColorSpace colorSpace = ColorSpace::BT709,
+						bool fullRangeColor = false, bool useAsyncQueue = false, size_t asyncQueueSize = 0);
+			virtual ~EncoderH265();
+
+			// Initialization
+			virtual std::vector<Usage> CapsUsage() override;
+			virtual void               SetUsage(Usage v) override;
+			virtual Usage              GetUsage() override;
+
+			// Static
+			virtual std::vector<QualityPreset> CapsQualityPreset() override;
+			virtual void                       SetQualityPreset(QualityPreset v) override;
+			virtual QualityPreset              GetQualityPreset() override;
+
+#ifndef LITE_OBS
+			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() override;
+			virtual void                          SetResolution(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetResolution() override;
+
+			virtual void                          SetAspectRatio(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() override;
+
+			virtual void                          SetFrameRate(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetFrameRate() override;
+
+			virtual std::vector<Profile> CapsProfile() override;
+			virtual void                 SetProfile(Profile v) override;
+			virtual Profile              GetProfile() override;
+
+			virtual std::vector<ProfileLevel> CapsProfileLevel() override;
+			virtual void                      SetProfileLevel(ProfileLevel v) override;
+			virtual void                      SetProfileLevel(ProfileLevel v, std::pair<uint32_t, uint32_t> r,
+															  std::pair<uint32_t, uint32_t> h) override;
+			virtual ProfileLevel              GetProfileLevel() override;
+
+			std::vector<H265::Tier> CapsTier();
+			void                    SetTier(H265::Tier v);
+			H265::Tier              GetTier();
+
+			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() override;
+			virtual void                          SetMaximumReferenceFrames(uint64_t v) override;
+			virtual uint64_t                      GetMaximumReferenceFrames() override;
+
+			virtual std::vector<CodingType> CapsCodingType() override;
+			virtual void                    SetCodingType(CodingType v) override;
+			virtual CodingType              GetCodingType() override;
+
+			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() override;
+			virtual void                          SetMaximumLongTermReferenceFrames(uint32_t v) override;
+			virtual uint32_t                      GetMaximumLongTermReferenceFrames() override;
+
+			/// Rate Control
+			virtual std::vector<RateControlMethod> CapsRateControlMethod() override;
+			virtual void                           SetRateControlMethod(RateControlMethod v) override;
+			virtual RateControlMethod              GetRateControlMethod() override;
+
+			virtual std::vector<PrePassMode> CapsPrePassMode() override;
+			virtual void                     SetPrePassMode(PrePassMode v) override;
+			virtual PrePassMode              GetPrePassMode() override;
+
+			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) override;
+			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() override;
+
+			/// VBV Buffer
+			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() override;
+			virtual void                          SetVBVBufferSize(uint64_t v) override;
+			virtual uint64_t                      GetVBVBufferSize() override;
+
+			virtual void  SetVBVBufferInitialFullness(double v) override;
+			virtual float GetInitialVBVBufferFullness() override;
+
+			/// Picture Control
+			std::vector<H265::GOPType> CapsGOPType();
+			void                       SetGOPType(H265::GOPType v);
+			H265::GOPType              GetGOPType();
+
+			void     SetGOPSize(uint32_t v);
+			uint32_t GetGOPSize();
+
+			void     SetGOPSizeMin(uint32_t v);
+			uint32_t GetGOPSizeMin();
+
+			void     SetGOPSizeMax(uint32_t v);
+			uint32_t GetGOPSizeMax();
+
+			virtual void SetGOPAlignmentEnabled(bool v) override;
+			virtual bool IsGOPAlignmentEnabled() override;
+
+			virtual void     SetIDRPeriod(uint32_t v) override; // Distance in GOPs
+			virtual uint32_t GetIDRPeriod() override;
+
+			void                      SetHeaderInsertionMode(H265::HeaderInsertionMode v);
+			H265::HeaderInsertionMode GetHeaderInsertionMode();
+
+			virtual void SetDeblockingFilterEnabled(bool v) override;
+			virtual bool IsDeblockingFilterEnabled() override;
+
+			/// Motion Estimation
+			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationQuarterPixelEnabled() override;
+
+			virtual void SetMotionEstimationHalfPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationHalfPixelEnabled() override;
+
+			// Dynamic
+			virtual void SetFrameSkippingEnabled(bool v) override;
+			virtual bool IsFrameSkippingEnabled() override;
+
+			virtual void SetEnforceHRDEnabled(bool v) override;
+			virtual bool IsEnforceHRDEnabled() override;
+
+			virtual void SetFillerDataEnabled(bool v) override;
+			virtual bool IsFillerDataEnabled() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsIFrameQPMinimum();
+			void                                SetIFrameQPMinimum(uint8_t v);
+			uint8_t                             GetIFrameQPMinimum();
+
+			virtual std::pair<uint8_t, uint8_t> CapsIFrameQPMaximum();
+			void                                SetIFrameQPMaximum(uint8_t v);
+			uint8_t                             GetIFrameQPMaximum();
+
+			virtual std::pair<uint8_t, uint8_t> CapsPFrameQPMinimum();
+			void                                SetPFrameQPMinimum(uint8_t v);
+			uint8_t                             GetPFrameQPMinimum();
+
+			virtual std::pair<uint8_t, uint8_t> CapsPFrameQPMaximum();
+			void                                SetPFrameQPMaximum(uint8_t v);
+			uint8_t                             GetPFrameQPMaximum();
+
+			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() override;
+			virtual void                          SetTargetBitrate(uint64_t v) override;
+			virtual uint64_t                      GetTargetBitrate() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() override;
+			virtual void                          SetPeakBitrate(uint64_t v) override;
+			virtual uint64_t                      GetPeakBitrate() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsIFrameQP() override;
+			virtual void                        SetIFrameQP(uint8_t v) override;
+			virtual uint8_t                     GetIFrameQP() override;
+
+			virtual std::pair<uint8_t, uint8_t> CapsPFrameQP() override;
+			virtual void                        SetPFrameQP(uint8_t v) override;
+			virtual uint8_t                     GetPFrameQP() override;
+
+			virtual void     SetMaximumAccessUnitSize(uint32_t v) override;
+			virtual uint32_t GetMaximumAccessUnitSize() override;
+
+			std::pair<uint32_t, uint32_t> CapsInputQueueSize();
+			void                          SetInputQueueSize(uint32_t v);
+			uint32_t                      GetInputQueueSize();
+
+			// Internal
+			virtual void LogProperties() override;
+
+			protected:
+			virtual void        PacketPriorityAndKeyframe(amf::AMFDataPtr& d, struct encoder_packet* p) override;
+			virtual AMF_RESULT  GetExtraDataInternal(amf::AMFVariant* p) override;
+			virtual std::string HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index) override;
+
+			AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_ENUM m_FrameSkipType = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE;
+
+			//Remaining Properties
+			// PerformanceCounter (Interface, but which one?)
+			// HevcMaxNumOfTemporalLayers/HevcNumOfTemporalLayers/HevcTemporalLayerSelect - Only supports QP_I/P?
+			// BPicturesPattern (replaced by merge mode?)
+			// HevcMaxMBPerSec (PCI-E bandwidth, min/max)
+#endif
+		};
+	} // namespace AMD
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/amf-encoder.h Added

@@ -0,0 +1,474 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <chrono>
+#include <condition_variable>
+#include <inttypes.h>
+#include <mutex>
+#include <queue>
+#include <thread>
+#include <vector>
+#include "amf.h"
+#include "api-base.h"
+#include "components/Component.h"
+#include "plugin.h"
+
+#ifndef LITE_OBS
+#include <obs-encoder.h>
+#include <obs.h>
+#endif
+
+#define AMF_TIMESTAMP_ALLOCATE L"TS_Allocate"
+#define AMF_TIME_ALLOCATE L"T_Allocate"
+#define AMF_TIMESTAMP_STORE L"TS_Store"
+#define AMF_TIME_STORE L"T_Store"
+#define AMF_TIMESTAMP_CONVERT L"TS_Convert"
+#define AMF_TIME_CONVERT L"T_Convert"
+#define AMF_TIMESTAMP_SUBMIT L"TS_Submit"
+#define AMF_TIMESTAMP_QUERY L"TS_Query"
+#define AMF_TIME_MAIN L"T_Main" // Time between Submit and Query
+
+#define AMF_PRESENT_TIMESTAMP L"PTS"
+
+#ifdef _DEBUG
+#ifndef LITE_OBS
+#define AMFTRACECALL                                                                                     \
+	{                                                                                                    \
+		std::mbstate_t       state = std::mbstate_t();                                                   \
+		auto                 trace = AMF::Instance()->GetTrace();                                        \
+		const char*          file  = __FILE__;                                                           \
+		const char*          fname = __FUNCTION_NAME__;                                                  \
+		std::vector<wchar_t> buf(std::mbsrtowcs(NULL, &file, 0, &state) + 1);                            \
+		std::mbsrtowcs(buf.data(), &file, buf.size(), &state);                                           \
+		std::vector<wchar_t> buf2(std::mbsrtowcs(NULL, &fname, 0, &state) + 1);                          \
+		std::mbsrtowcs(buf2.data(), &fname, buf2.size(), &state);                                        \
+		trace->TraceW(buf.data(), __LINE__, AMF_TRACE_DEBUG, L"Trace", 1, L"Function: %s", buf2.data()); \
+		PLOG_DEBUG("<Trace> " __FUNCTION_NAME__);                                                        \
+	};
+#else
+#define AMFTRACECALL ;
+#endif
+#else
+#define AMFTRACECALL ;
+#endif
+
+namespace Plugin {
+	namespace AMD {
+		// Initialization Parameters
+		enum class Codec : uint8_t {
+			AVC,
+			SVC,
+			HEVC,
+		};
+		enum class ColorFormat : uint8_t {
+			/*	Support Table
+			 *	Open Broadcaster	AMD AMF
+			 *	-- 4:2:0 Formats --
+			 *	VIDEO_FORMAT_I420	AMF_SURFACE_YUV420P
+			 *	VIDEO_FORMAT_NV12	AMF_SURFACE_NV12
+			 *						AMF_SURFACE_YV12
+			 *	-- 4:2:2 Formats --
+			 *	VIDEO_FORMAT_YVYV
+			 *	VIDEO_FORMAT_YUY2	AMF_SURFACE_YUY2
+			 *	VIDEO_FORMAT_UYVY
+			 *
+			 *	-- 4:4:4 Formats --
+			 *	VIDEO_FORMAT_I444
+			 *
+			 *	-- Packed Uncompressed Formats --
+			 *	VIDEO_FORMAT_RGBA	AMF_SURFACE_RGBA
+			 *	VIDEO_FORMAT_BGRA	AMF_SURFACE_BGRA
+			 *						AMF_SURFACE_ARGB
+			 *	VIDEO_FORMAT_BGRX
+			 *
+			 *	-- Single/Dual Channel Formats --
+			 *	VIDEO_FORMAT_Y800	AMF_SURFACE_GRAY8
+			 *						AMF_SURFACE_U8V8
+			 *
+			 *	-- HDR Color Formats --
+			 *						AMF_SURFACE_P010
+			 *						AMF_SURFACE_RGBA_F16
+			 */
+
+			I420,
+			NV12,
+			YUY2,
+			BGRA,
+			RGBA,
+			GRAY,
+		};
+		enum class ColorSpace : uint8_t {
+			BT601,
+			BT709,
+			BT2020,
+		};
+
+		// Properties
+		enum class Usage : uint8_t { Transcoding, UltraLowLatency, LowLatency, Webcam };
+		enum class QualityPreset : uint8_t {
+			Speed,
+			Balanced,
+			Quality,
+		};
+		enum class Profile : uint16_t {
+			ConstrainedBaseline = 256,
+			Baseline            = 66,
+			Main                = 77,
+			ConstrainedHigh     = 257,
+			High                = 100,
+		};
+		enum class ProfileLevel : uint8_t {
+			Automatic,
+			L10 = 10,
+			L11,
+			L12,
+			L13,
+			L20 = 20,
+			L21,
+			L22,
+			L30 = 30,
+			L31,
+			L32,
+			L40 = 40,
+			L41,
+			L42,
+			L50 = 50,
+			L51,
+			L52,
+			L60 = 60,
+			L61,
+			L62,
+		};
+		enum class CodingType : uint8_t {
+			Automatic,
+			CALVC,
+			CABAC,
+		};
+		enum class RateControlMethod : uint8_t {
+			ConstantQP,
+			LatencyConstrainedVariableBitrate,
+			PeakConstrainedVariableBitrate,
+			ConstantBitrate,
+		};
+		enum class PrePassMode : uint8_t {
+			Disabled,
+			Enabled,
+			EnabledAtHalfScale,
+			EnabledAtQuarterScale,
+		};
+		enum class SliceControlMode : uint8_t {
+			Unknown0,
+			Unknown1,
+			Unknown2,
+			Unknown3,
+		};
+
+		class Encoder {
+			protected:
+			Encoder(Codec codec, std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+					bool useOpenCLSubmission, bool useOpenCLConversion, ColorFormat colorFormat, ColorSpace colorSpace,
+					bool fullRangeColor, bool multiThreaded, size_t queueSize);
+
+			public:
+			virtual ~Encoder();
+
+			public:
+#pragma region Initialization
+			uint64_t GetUniqueId();
+
+			//void SetCodec(Codec v);
+			Codec GetCodec();
+
+			//void SetVideoAPI(std::shared_ptr<API::IAPI> v);
+			std::shared_ptr<API::IAPI> GetVideoAPI();
+
+			//void SetVideoAdapter(API::Adapter v);
+			API::Adapter GetVideoAdapter();
+
+			//void SetOpenCLEnabled(bool v);
+			bool IsOpenCLEnabled();
+
+			//void SetColorFormat(ColorFormat v);
+			ColorFormat GetColorFormat();
+
+			//void SetColorSpace(ColorSpace v);
+			ColorSpace GetColorSpace();
+
+			//void SetFullRangeColor(bool v);
+			bool IsFullRangeColor();
+
+			//void SetAsynchronousQueueEnabled(bool v);
+			bool IsMultiThreaded();
+
+			//void SetAsynchronousQueueSize(size_t v);
+			size_t GetQueueSize();
+
+			void SetDebug(bool v);
+			bool IsDebug();
+
+//bool Initialize();
+#pragma endregion Initialization
+
+#pragma region Settings
+			virtual std::vector<Usage> CapsUsage()       = 0;
+			virtual void               SetUsage(Usage v) = 0;
+			virtual Usage              GetUsage()        = 0;
+
+			virtual std::vector<QualityPreset> CapsQualityPreset()               = 0;
+			virtual void                       SetQualityPreset(QualityPreset v) = 0;
+			virtual QualityPreset              GetQualityPreset()                = 0;
+
+#ifndef LITE_OBS
+#pragma region Frame
+			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() = 0;
+			virtual void                          SetResolution(std::pair<uint32_t, uint32_t> v)             = 0;
+			virtual std::pair<uint32_t, uint32_t> GetResolution()                                            = 0;
+
+			virtual void                          SetAspectRatio(std::pair<uint32_t, uint32_t> v) = 0;
+			virtual std::pair<uint32_t, uint32_t> GetAspectRatio()                                = 0;
+
+			virtual void                          SetFrameRate(std::pair<uint32_t, uint32_t> v) = 0;
+			virtual std::pair<uint32_t, uint32_t> GetFrameRate()                                = 0;
+#pragma endregion Frame
+
+#pragma region Profile
+			virtual std::vector<Profile> CapsProfile()         = 0;
+			virtual void                 SetProfile(Profile v) = 0;
+			virtual Profile              GetProfile()          = 0;
+
+			virtual std::vector<ProfileLevel> CapsProfileLevel()                               = 0;
+			virtual void                      SetProfileLevel(ProfileLevel v)                  = 0;
+			virtual void                      SetProfileLevel(ProfileLevel v, std::pair<uint32_t, uint32_t> r,
+															  std::pair<uint32_t, uint32_t> h) = 0;
+			virtual ProfileLevel              GetProfileLevel()                                = 0;
+#pragma endregion Profile
+
+			virtual std::vector<CodingType> CapsCodingType()            = 0;
+			virtual void                    SetCodingType(CodingType v) = 0;
+			virtual CodingType              GetCodingType()             = 0;
+
+#pragma region Reference Frames
+			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames()          = 0;
+			virtual void                          SetMaximumReferenceFrames(uint64_t v) = 0;
+			virtual uint64_t                      GetMaximumReferenceFrames()           = 0;
+
+			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames()          = 0;
+			virtual void                          SetMaximumLongTermReferenceFrames(uint32_t v) = 0;
+			virtual uint32_t                      GetMaximumLongTermReferenceFrames()           = 0;
+#pragma endregion Reference Frames
+
+			virtual std::vector<RateControlMethod> CapsRateControlMethod()                   = 0;
+			virtual void                           SetRateControlMethod(RateControlMethod v) = 0;
+			virtual RateControlMethod              GetRateControlMethod()                    = 0;
+
+			virtual std::vector<PrePassMode> CapsPrePassMode()             = 0;
+			virtual void                     SetPrePassMode(PrePassMode v) = 0;
+			virtual PrePassMode              GetPrePassMode()              = 0;
+
+			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) = 0;
+			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled()        = 0;
+
+			virtual void SetFrameSkippingEnabled(bool v) = 0;
+			virtual bool IsFrameSkippingEnabled()        = 0;
+
+			virtual void     SetFrameSkippingPeriod(uint32_t v);
+			virtual uint32_t GetFrameSkippingPeriod();
+
+			/// false skips every nth frame, true keeps every nth frame.
+			virtual void SetFrameSkippingBehaviour(bool v);
+			virtual bool GetFrameSkippingBehaviour();
+
+			/// Enforce Hypothethical Reference Decoder Restrictions
+			virtual void SetEnforceHRDEnabled(bool v) = 0;
+			virtual bool IsEnforceHRDEnabled()        = 0;
+
+			virtual void SetFillerDataEnabled(bool v) = 0;
+			virtual bool IsFillerDataEnabled()        = 0;
+
+			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate()          = 0;
+			virtual void                          SetTargetBitrate(uint64_t v) = 0;
+			virtual uint64_t                      GetTargetBitrate()           = 0;
+
+			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate()          = 0;
+			virtual void                          SetPeakBitrate(uint64_t v) = 0;
+			virtual uint64_t                      GetPeakBitrate()           = 0;
+
+			virtual std::pair<uint8_t, uint8_t> CapsIFrameQP()         = 0;
+			virtual void                        SetIFrameQP(uint8_t v) = 0;
+			virtual uint8_t                     GetIFrameQP()          = 0;
+
+			virtual std::pair<uint8_t, uint8_t> CapsPFrameQP()         = 0;
+			virtual void                        SetPFrameQP(uint8_t v) = 0;
+			virtual uint8_t                     GetPFrameQP()          = 0;
+
+			virtual void     SetMaximumAccessUnitSize(uint32_t v) = 0;
+			virtual uint32_t GetMaximumAccessUnitSize()           = 0;
+
+#pragma region Video Buffering Verifier
+			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize()          = 0;
+			virtual void                          SetVBVBufferSize(uint64_t v) = 0;
+			void                                  SetVBVBufferStrictness(double_t v);
+			virtual uint64_t                      GetVBVBufferSize() = 0;
+
+			virtual void  SetVBVBufferInitialFullness(double v) = 0;
+			virtual float GetInitialVBVBufferFullness()         = 0;
+#pragma endregion Video Buffering Verifier
+
+#pragma region Picture Control
+			virtual void     SetIDRPeriod(uint32_t v) = 0;
+			virtual uint32_t GetIDRPeriod()           = 0;
+
+			virtual void     SetIFramePeriod(uint32_t v);
+			virtual uint32_t GetIFramePeriod();
+
+			virtual void     SetPFramePeriod(uint32_t v);
+			virtual uint32_t GetPFramePeriod();
+
+			virtual void     SetBFramePeriod(uint32_t v);
+			virtual uint32_t GetBFramePeriod();
+
+			virtual void SetGOPAlignmentEnabled(bool v) = 0;
+			virtual bool IsGOPAlignmentEnabled()        = 0;
+
+			virtual void SetDeblockingFilterEnabled(bool v) = 0;
+			virtual bool IsDeblockingFilterEnabled()        = 0;
+#pragma endregion Picture Control
+
+#pragma region Motion Estimation
+			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) = 0;
+			virtual bool IsMotionEstimationQuarterPixelEnabled()        = 0;
+
+			virtual void SetMotionEstimationHalfPixelEnabled(bool v) = 0;
+			virtual bool IsMotionEstimationHalfPixelEnabled()        = 0;
+#pragma endregion Motion Estimation
+#pragma endregion        Settings
+
+#pragma region Control
+			void Start();
+			void Restart();
+			void Stop();
+
+			bool         IsStarted();
+			virtual void LogProperties() = 0;
+
+			bool Encode(struct encoder_frame* f, struct encoder_packet* p, bool* b);
+			void GetVideoInfo(struct video_scale_info* info);
+			bool GetExtraData(uint8_t** extra_data, size_t* size);
+#pragma endregion Control
+
+			protected:
+			void UpdateFrameRateValues();
+
+			private:
+			virtual void        PacketPriorityAndKeyframe(amf::AMFDataPtr& d, struct encoder_packet* p) = 0;
+			virtual AMF_RESULT  GetExtraDataInternal(amf::AMFVariant* p)                                = 0;
+			virtual std::string HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index)               = 0;
+
+			bool EncodeAllocate(OUT amf::AMFSurfacePtr& surface);
+			bool EncodeStore(OUT amf::AMFSurfacePtr& surface, IN struct encoder_frame* frame);
+			bool EncodeConvert(IN amf::AMFSurfacePtr& surface, OUT amf::AMFDataPtr& data);
+			bool EncodeMain(IN amf::AMFDataPtr& data, OUT amf::AMFDataPtr& packet);
+			bool EncodeLoad(IN amf::AMFDataPtr& data, OUT struct encoder_packet* packet, OUT bool* received_packet);
+
+			static int32_t AsyncSendMain(Encoder* obj);
+			int32_t        AsyncSendLocalMain();
+			static int32_t AsyncRetrieveMain(Encoder* obj);
+			int32_t        AsyncRetrieveLocalMain();
+
+#endif
+
+			protected:
+			// AMF Internals
+			Plugin::AMD::AMF*       m_AMF;
+			amf::AMFFactory*        m_AMFFactory;
+			amf::AMFContextPtr      m_AMFContext;
+			amf::AMFComputePtr      m_AMFCompute;
+			amf::AMFComponentPtr    m_AMFEncoder;
+			amf::AMFComponentPtr    m_AMFConverter;
+			amf::AMF_MEMORY_TYPE    m_AMFMemoryType;
+			amf::AMF_SURFACE_FORMAT m_AMFSurfaceFormat;
+
+			// API Related
+			std::shared_ptr<API::IAPI>     m_API;
+			API::Adapter                   m_APIAdapter;
+			std::shared_ptr<API::Instance> m_APIDevice;
+
+			// Buffers
+			std::vector<uint8_t> m_PacketDataBuffer;
+			std::vector<uint8_t> m_ExtraDataBuffer;
+
+			// Flags
+			bool m_Initialized;
+			bool m_Started;
+			bool m_OpenCL;
+			bool m_OpenCLSubmission; // Submit Frames using OpenCL
+			bool m_OpenCLConversion; // Convert Frames using OpenCL instead of DirectCompute
+			bool m_Debug;
+
+			// Properties
+			uint64_t    m_UniqueId;
+			Codec       m_Codec;
+			ColorFormat m_ColorFormat;
+			ColorSpace  m_ColorSpace;
+			bool        m_FullColorRange;
+			size_t      m_QueueSize;
+
+			/// Resolution + Rate
+			std::pair<uint32_t, uint32_t> m_Resolution;
+			std::pair<uint32_t, uint32_t> m_FrameRate;
+			double_t                      m_FrameRateFraction;
+
+			/// Timings
+			double_t                 m_TimestampStep;
+			uint64_t                 m_TimestampStepRounded;
+			uint64_t                 m_TimestampOffset;
+			std::chrono::nanoseconds m_SubmitQueryWaitTimer;
+			uint64_t                 m_SubmitQueryAttempts;
+			uint64_t                 m_InitialFrameLatency;
+
+			/// Status
+			uint64_t m_SubmittedFrameCount;
+			bool     m_InitialFramesSent;
+			bool     m_InitialPacketRetrieved;
+
+			/// Periods
+			uint32_t m_PeriodIDR;
+			uint32_t m_PeriodIFrame;
+			uint32_t m_PeriodPFrame;
+			uint32_t m_PeriodBFrame;
+			uint32_t m_FrameSkipPeriod;
+			bool     m_FrameSkipKeepOnlyNth; // false = drop every xth frame, true = drop all but every xth frame
+
+			/// Multi-Threading
+			bool m_MultiThreading;
+			struct EncoderThreadingData {
+				// Thread
+				std::thread worker;
+				bool        shutdown;
+				// Semaphore
+				size_t                  wakeupcount;
+				std::condition_variable condvar;
+				std::mutex              mutex;
+				// Data
+				amf::AMFDataPtr data;
+			} * m_AsyncSend, *m_AsyncRetrieve;
+		};
+	} // namespace AMD
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/amf.h Added

@@ -0,0 +1,81 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <memory>
+#include <windows.h>
+#include "plugin.h"
+
+// AMD AMF SDK
+#pragma warning(push)
+#pragma warning(disable : 4458)
+#include "components\Component.h"
+#include "components\ComponentCaps.h"
+#include "components\VideoEncoderVCE.h"
+#include "core\Factory.h"
+#pragma warning(pop)
+
+namespace Plugin {
+	namespace AMD {
+		class AMF {
+#pragma region Singleton
+			public:
+			static void Initialize();
+			static AMF* Instance();
+			static void Finalize();
+
+			private: // Private Initializer & Finalizer
+			AMF();
+			~AMF();
+
+			public: // Remove all Copy operators
+			AMF(AMF const&) = delete;
+			void operator=(AMF const&) = delete;
+#pragma endregion Singleton
+
+			public:
+			amf::AMFFactory* GetFactory();
+			amf::AMFTrace*   GetTrace();
+			amf::AMFDebug*   GetDebug();
+
+			void EnableDebugTrace(bool enable);
+
+			uint64_t GetPluginVersion();
+			uint64_t GetRuntimeVersion();
+
+			private:
+			uint32_t m_TimerPeriod; /// High-Precision Timer Accuracy (nanoseconds)
+
+			/// AMF Values
+			HMODULE  m_AMFModule;
+			uint64_t m_AMFVersion_Plugin;
+			uint64_t m_AMFVersion_Runtime;
+
+			/// AMF Functions
+			AMFQueryVersion_Fn AMFQueryVersion;
+			AMFInit_Fn         AMFInit;
+
+			/// AMF Objects
+			amf::AMFFactory*     m_AMFFactory;
+			amf::AMFTrace*       m_AMFTrace;
+			amf::AMFDebug*       m_AMFDebug;
+			amf::AMFTraceWriter* m_TraceWriter;
+		};
+	} // namespace AMD
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/api-base.h Added

@@ -0,0 +1,104 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <map>
+#include <memory>
+#include <string.h>
+#include <vector>
+#include "plugin.h"
+
+namespace Plugin {
+	namespace API {
+		enum class Type : uint8_t {
+			Host,
+			Direct3D9,
+			Direct3D11,
+			OpenGL,
+		};
+
+		// An Adapter on an API
+		struct Adapter {
+			int32_t     idLow, idHigh;
+			std::string Name;
+
+			Adapter() : idLow(0), idHigh(0), Name("Invalid Device") {}
+			Adapter(int32_t p_idLow, int32_t p_idHigh, std::string p_Name)
+				: idLow(p_idLow), idHigh(p_idHigh), Name(p_Name)
+			{}
+			Adapter(Adapter const& o)
+			{
+				idLow  = o.idLow;
+				idHigh = o.idHigh;
+				Name   = o.Name;
+			}
+			void operator=(Adapter const& o)
+			{
+				idLow  = o.idLow;
+				idHigh = o.idHigh;
+				Name   = o.Name;
+			}
+
+			friend bool operator<(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
+			friend bool operator>(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
+			friend bool operator<=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
+			friend bool operator>=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
+
+			friend bool operator==(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
+			friend bool operator!=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
+		};
+
+		// Instance of an API Adapter
+		struct Instance {
+			public:
+			Instance();
+			virtual ~Instance();
+
+			virtual Adapter GetAdapter() = 0;
+			virtual void*   GetContext() = 0;
+		};
+
+		// API Interface
+		class IAPI {
+			public:
+			IAPI();
+			virtual ~IAPI();
+
+			virtual std::string GetName() = 0;
+			virtual Type        GetType() = 0;
+
+			virtual std::vector<Adapter> EnumerateAdapters() = 0;
+			Adapter                      GetAdapterById(int32_t idLow, int32_t idHigh);
+			Adapter                      GetAdapterByName(std::string name);
+
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) = 0;
+		};
+
+		// Static API Stuff
+		void                               InitializeAPIs();
+		void                               FinalizeAPIs();
+		size_t                             CountAPIs();
+		std::string                        GetAPIName(size_t index);
+		std::shared_ptr<IAPI>              GetAPI(size_t index);
+		std::shared_ptr<IAPI>              GetAPI(std::string name);
+		std::shared_ptr<IAPI>              GetAPI(Type type);
+		std::vector<std::shared_ptr<IAPI>> EnumerateAPIs();
+		std::vector<std::string>           EnumerateAPINames();
+	} // namespace API
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/api-d3d11.h Added

@@ -0,0 +1,67 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <atlutil.h>
+#include <d3d11.h>
+#include <dxgi.h>
+#include <map>
+#include <mutex>
+#include <vector>
+#include "api-base.h"
+
+namespace Plugin {
+	namespace API {
+		class Direct3D11 : public IAPI {
+			friend class Direct3D11Instance;
+
+			public:
+			Direct3D11();
+			~Direct3D11();
+
+			virtual std::string               GetName() override;
+			virtual Type                      GetType() override;
+			virtual std::vector<Adapter>      EnumerateAdapters() override;
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+
+			protected:
+			ATL::CComPtr<IDXGIFactory1> m_DXGIFactory;
+			//std::mutex m_InstanceMapMutex;
+			//std::map<std::pair<int32_t, int32_t>, std::shared_ptr<Instance>> m_InstanceMap;
+
+			private:
+			std::vector<Adapter> m_AdapterList;
+		};
+
+		class Direct3D11Instance : public Instance {
+			public:
+			Direct3D11Instance(Direct3D11* api, Adapter adapter);
+			~Direct3D11Instance();
+
+			virtual Adapter GetAdapter() override;
+			virtual void*   GetContext() override;
+
+			private:
+			Direct3D11*          m_API;
+			Adapter              m_Adapter;
+			ID3D11DeviceContext* m_DeviceContext;
+			ID3D11Device*        m_Device;
+		};
+	} // namespace API
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/api-d3d9.h Added

@@ -0,0 +1,66 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <atlutil.h>
+#include <d3d9.h>
+#include "api-base.h"
+
+#ifdef _DEBUG
+#define D3D_DEBUG_INFO
+#endif
+#pragma comment(lib, "d3d9.lib")
+
+namespace Plugin {
+	namespace API {
+		class Direct3D9 : public IAPI {
+			friend class Direct3D9Instance;
+
+			public:
+			Direct3D9();
+			~Direct3D9();
+
+			virtual std::string               GetName() override;
+			virtual Type                      GetType() override;
+			virtual std::vector<Adapter>      EnumerateAdapters() override;
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+
+			protected:
+			IDirect3D9Ex* m_Direct3D9Ex;
+			//std::map<std::pair<int32_t, int32_t>, std::shared_ptr<Instance>> m_InstanceMap;
+
+			private:
+			std::vector<Adapter> m_Adapters;
+		};
+
+		class Direct3D9Instance : public Instance {
+			public:
+			Direct3D9Instance(Direct3D9* api, Adapter adapter);
+			~Direct3D9Instance();
+
+			virtual Adapter GetAdapter() override;
+			virtual void*   GetContext() override;
+
+			private:
+			Direct3D9*          m_API;
+			Adapter             m_Adapter;
+			IDirect3DDevice9Ex* m_Device;
+		};
+	} // namespace API
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/api-host.h Added

@@ -0,0 +1,39 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "api-base.h"
+
+namespace Plugin {
+	namespace API {
+		class Host : public IAPI {
+			public:
+			virtual std::string               GetName() override;
+			virtual Type                      GetType() override;
+			virtual std::vector<Adapter>      EnumerateAdapters() override;
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+		};
+
+		class HostInstance : public Instance {
+			public:
+			virtual Adapter GetAdapter() override;
+			virtual void*   GetContext() override;
+		};
+	} // namespace API
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/api-opengl.h Added

@@ -0,0 +1,53 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "api-base.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#include <gl/GL.h>
+
+namespace Plugin {
+	namespace API {
+		class OpenGL : public IAPI {
+			public:
+			OpenGL();
+			~OpenGL();
+
+			virtual std::string               GetName() override;
+			virtual Type                      GetType() override;
+			virtual std::vector<Adapter>      EnumerateAdapters() override;
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+		};
+
+		class OpenGLInstance : public Instance {
+			public:
+			OpenGLInstance();
+			~OpenGLInstance();
+
+			virtual Adapter GetAdapter() override;
+			virtual void*   GetContext() override;
+
+			private:
+			Adapter adapter;
+		};
+	} // namespace API
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/enc-h264.h Added

@@ -0,0 +1,63 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "amf-encoder-h264.h"
+#include "plugin.h"
+
+namespace Plugin {
+	namespace Interface {
+		class H264Interface {
+			public:
+			static void              encoder_register();
+			static const char*       get_name(void* type_data);
+			static void              get_defaults(obs_data_t* settings);
+			static obs_properties_t* get_properties(void* data);
+
+			static bool properties_modified(obs_properties_t* props, obs_property_t*, obs_data_t* data);
+
+			static void* create(obs_data_t* settings, obs_encoder_t* encoder);
+			static void  destroy(void* data);
+			static bool  update(void* data, obs_data_t* settings);
+			static bool  encode(void* data, struct encoder_frame* frame, struct encoder_packet* packet,
+								bool* received_packet);
+			static void  get_video_info(void* data, struct video_scale_info* info);
+			static bool  get_extra_data(void* data, uint8_t** extra_data, size_t* size);
+
+			//////////////////////////////////////////////////////////////////////////
+			// Module Code
+			//////////////////////////////////////////////////////////////////////////
+			public:
+			H264Interface(obs_data_t* settings, obs_encoder_t* encoder);
+			~H264Interface();
+
+			bool update(obs_data_t* settings);
+			bool encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet);
+			void get_video_info(struct video_scale_info* info);
+			bool get_extra_data(uint8_t** extra_data, size_t* size);
+
+			//////////////////////////////////////////////////////////////////////////
+			// Storage
+			//////////////////////////////////////////////////////////////////////////
+			private:
+			std::unique_ptr<Plugin::AMD::EncoderH264> m_VideoEncoder;
+			obs_encoder_t*                            m_Encoder;
+		};
+	} // namespace Interface
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/enc-h265.h Added

@@ -0,0 +1,63 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "amf-encoder-h265.h"
+#include "plugin.h"
+
+namespace Plugin {
+	namespace Interface {
+		class H265Interface {
+			public:
+			static void              encoder_register();
+			static const char*       get_name(void* type_data);
+			static void              get_defaults(obs_data_t* data);
+			static obs_properties_t* get_properties(void* ptr);
+
+			static bool properties_modified(obs_properties_t* props, obs_property_t*, obs_data_t* data);
+
+			static void* create(obs_data_t* settings, obs_encoder_t* encoder);
+			static void  destroy(void* ptr);
+			static bool  update(void* ptr, obs_data_t* data);
+			static bool  encode(void* ptr, struct encoder_frame* frame, struct encoder_packet* packet,
+								bool* received_packet);
+			static void  get_video_info(void* ptr, struct video_scale_info* info);
+			static bool  get_extra_data(void* ptr, uint8_t** extra_data, size_t* size);
+
+			//////////////////////////////////////////////////////////////////////////
+			// Module Code
+			//////////////////////////////////////////////////////////////////////////
+			public:
+			H265Interface(obs_data_t* data, obs_encoder_t* encoder);
+			~H265Interface();
+
+			bool update(obs_data_t* data);
+			bool encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet);
+			void get_video_info(struct video_scale_info* info);
+			bool get_extra_data(uint8_t** extra_data, size_t* size);
+
+			//////////////////////////////////////////////////////////////////////////
+			// Storage
+			//////////////////////////////////////////////////////////////////////////
+			private:
+			std::unique_ptr<Plugin::AMD::EncoderH265> m_VideoEncoder;
+			obs_encoder_t*                            m_Encoder;
+		};
+	} // namespace Interface
+} // namespace Plugin

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/plugin.h Added

@@ -0,0 +1,101 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <inttypes.h>
+
+#pragma warning(push)
+#pragma warning(disable : 4201)
+#ifndef LITE_OBS
+#include "obs-module.h"
+#include "util/base.h"
+#endif
+#pragma warning(pop)
+
+// Plugin
+#define PLUGIN_NAME "AMD Advanced Media Framework"
+#include "Version.h"
+
+#ifndef LITE_OBS
+#define PLOG(level, ...) blog(level, "[AMF] " __VA_ARGS__);
+#else
+#define PLOG(level, ...) ;
+#endif
+#define PLOG_ERROR(...) PLOG(LOG_ERROR, __VA_ARGS__)
+#define PLOG_WARNING(...) PLOG(LOG_WARNING, __VA_ARGS__)
+#define PLOG_INFO(...) PLOG(LOG_INFO, __VA_ARGS__)
+#define PLOG_DEBUG(...) PLOG(LOG_DEBUG, __VA_ARGS__)
+
+// Utility
+#define vstr(s) dstr(s)
+#define dstr(s) #s
+
+#define clamp(val, low, high) (val > high ? high : (val < low ? low : val))
+#ifdef max
+#undef max
+#endif
+#define max(val, high) (val > high ? val : high)
+#ifdef min
+#undef min
+#endif
+#define min(val, low) (val < low ? val : low)
+
+#ifdef IN
+#undef IN
+#endif
+#define IN
+#ifdef OUT
+#undef OUT
+#endif
+#define OUT
+
+#ifdef _WIN64
+#define BIT_STR "64"
+#else
+#define BIT_STR "32"
+#endif
+
+#define QUICK_FORMAT_MESSAGE(var, ...)                                                           \
+	std::string var = "";                                                                        \
+	{                                                                                            \
+		std::vector<char> QUICK_FORMAT_MESSAGE_buf(1024);                                        \
+		snprintf(QUICK_FORMAT_MESSAGE_buf.data(), QUICK_FORMAT_MESSAGE_buf.size(), __VA_ARGS__); \
+		var = std::string(QUICK_FORMAT_MESSAGE_buf.data());                                      \
+	}
+
+#ifndef __FUNCTION_NAME__
+#if defined(_WIN32) || defined(_WIN64) //WINDOWS
+#define __FUNCTION_NAME__ __FUNCTION__
+#else //*NIX
+#define __FUNCTION_NAME__ __func__
+#endif
+#endif
+
+enum class Presets : int8_t {
+	None            = -1,
+	ResetToDefaults = 0,
+	Recording,
+	HighQuality,
+	Indistinguishable,
+	Lossless,
+	Twitch,
+	YouTube,
+};
+
+enum class ViewMode : uint8_t { Basic, Advanced, Expert, Master };

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/strings.h Added

@@ -0,0 +1,140 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "plugin.h"
+#include "utility.h"
+
+#define P_TRANSLATE(x) Utility::obs_module_text_multi(x)
+#define P_DESC(x) x ".Description"
+
+// Shared
+#define P_VERSION "Version"
+#define P_UTIL_DEFAULT "Utility.Default"
+#define P_UTIL_AUTOMATIC "Utility.Automatic"
+#define P_UTIL_MANUAL "Utility.Manual"
+#define P_UTIL_SWITCH_DISABLED "Utility.Switch.Disabled"
+#define P_UTIL_SWITCH_ENABLED "Utility.Switch.Enabled"
+
+// Presets
+#define P_PRESET "Preset"
+#define P_PRESET_RESETTODEFAULTS "Preset.ResetToDefaults"
+#define P_PRESET_RECORDING "Preset.Recording"
+#define P_PRESET_HIGHQUALITY "Preset.HighQuality"
+#define P_PRESET_INDISTINGUISHABLE "Preset.Indistinguishable"
+#define P_PRESET_LOSSLESS "Preset.Lossless"
+#define P_PRESET_TWITCH "Preset.Twitch"
+#define P_PRESET_YOUTUBE "Preset.YouTube"
+
+// Static
+//#define P_USAGE				"Usage"
+//#define P_USAGE_TRANSCODING			"Usage.Transcoding"
+//#define P_USAGE_ULTRALOWLATENCY		"Usage.UltraLowLatency"
+//#define P_USAGE_LOWLATENCY			"Usage.LowLatency"
+//#define P_USAGE_WEBCAM			"Usage.Webcam"
+#define P_QUALITYPRESET "QualityPreset"
+#define P_QUALITYPRESET_SPEED "QualityPreset.Speed"
+#define P_QUALITYPRESET_BALANCED "QualityPreset.Balanced"
+#define P_QUALITYPRESET_QUALITY "QualityPreset.Quality"
+#define P_PROFILE "Profile"
+#define P_PROFILELEVEL "ProfileLevel"
+#define P_TIER "Tier"
+#define P_ASPECTRATIO "AspectRatio"
+#define P_CODINGTYPE "CodingType"
+#define P_CODINGTYPE_CABAC "CodingType.CABAC"
+#define P_CODINGTYPE_CAVLC "CodingType.CAVLC"
+#define P_MAXIMUMREFERENCEFRAMES "MaximumReferenceFrames"
+
+// Rate Control
+#define P_RATECONTROLMETHOD "RateControlMethod"
+#define P_RATECONTROLMETHOD_CQP "RateControlMethod.CQP"
+#define P_RATECONTROLMETHOD_CBR "RateControlMethod.CBR"
+#define P_RATECONTROLMETHOD_VBR "RateControlMethod.VBR"
+#define P_RATECONTROLMETHOD_VBRLAT "RateControlMethod.VBRLAT"
+#define P_PREPASSMODE "PrePassMode"
+#define P_PREPASSMODE_QUARTER "PrePassMode.Quarter"
+#define P_PREPASSMODE_HALF "PrePassMode.Half"
+#define P_PREPASSMODE_FULL "PrePassMode.Full"
+#define P_BITRATE_TARGET "Bitrate.Target"
+#define P_BITRATE_PEAK "Bitrate.Peak"
+#define P_QP_MINIMUM "QP.Minimum" // H264
+#define P_QP_MAXIMUM "QP.Maximum" // H264
+#define P_QP_IFRAME "QP.IFrame"
+#define P_QP_IFRAME_MINIMUM "QP.IFrame.Minimum" // H265
+#define P_QP_IFRAME_MAXIMUM "QP.IFrame.Maximum" // H265
+#define P_QP_PFRAME "QP.PFrame"
+#define P_QP_PFRAME_MINIMUM "QP.PFrame.Minimum" // H265
+#define P_QP_PFRAME_MAXIMUM "QP.PFrame.Maximum" // H265
+#define P_QP_BFRAME "QP.BFrame"                 // H264
+#define P_FILLERDATA "FillerData"
+#define P_FRAMESKIPPING "FrameSkipping"
+#define P_FRAMESKIPPING_PERIOD "FrameSkipping.Period"
+#define P_FRAMESKIPPING_BEHAVIOUR "FrameSkipping.Behaviour"
+#define P_FRAMESKIPPING_SKIPNTH "FrameSkipping.SkipNth"
+#define P_FRAMESKIPPING_KEEPNTH "FrameSkipping.KeepNth"
+#define P_VBAQ "VBAQ"
+#define P_ENFORCEHRD "EnforceHRD"
+
+// VBV Buffer
+#define P_VBVBUFFER "VBVBuffer"
+#define P_VBVBUFFER_SIZE "VBVBuffer.Size"
+#define P_VBVBUFFER_STRICTNESS "VBVBuffer.Strictness"
+#define P_VBVBUFFER_INITIALFULLNESS "VBVBuffer.InitialFullness"
+
+// Picture Control
+#define P_INTERVAL_KEYFRAME "Interval.Keyframe"
+#define P_PERIOD_IDR_H264 "Period.IDR.H264" // H264
+#define P_PERIOD_IDR_H265 "Period.IDR.H265" // H265
+#define P_INTERVAL_IFRAME "Interval.IFrame"
+#define P_PERIOD_IFRAME "Period.IFrame"
+#define P_INTERVAL_PFRAME "Interval.PFrame"
+#define P_PERIOD_PFRAME "Period.PFrame"
+#define P_INTERVAL_BFRAME "Interval.BFrame"
+#define P_PERIOD_BFRAME "Period.BFrame"
+#define P_GOP_TYPE "GOP.Type"                               // H265
+#define P_GOP_TYPE_FIXED "GOP.Type.Fixed"                   // H265
+#define P_GOP_TYPE_VARIABLE "GOP.Type.Variable"             // H265
+#define P_GOP_SIZE "GOP.Size"                               // H265
+#define P_GOP_SIZE_MINIMUM "GOP.Size.Minimum"               // H265
+#define P_GOP_SIZE_MAXIMUM "GOP.Size.Maximum"               // H265
+#define P_GOP_ALIGNMENT "GOP.Alignment"                     // Both?
+#define P_BFRAME_PATTERN "BFrame.Pattern"                   // H264
+#define P_BFRAME_DELTAQP "BFrame.DeltaQP"                   // H264
+#define P_BFRAME_REFERENCE "BFrame.Reference"               // H264
+#define P_BFRAME_REFERENCEDELTAQP "BFrame.ReferenceDeltaQP" // H264
+#define P_DEBLOCKINGFILTER "DeblockingFilter"
+#define P_MOTIONESTIMATION "MotionEstimation"
+#define P_MOTIONESTIMATION_QUARTER "MotionEstimation.Quarter"
+#define P_MOTIONESTIMATION_HALF "MotionEstimation.Half"
+#define P_MOTIONESTIMATION_FULL "MotionEstimation.Full"
+
+// System
+#define P_VIDEO_API "Video.API"
+#define P_VIDEO_ADAPTER "Video.Adapter"
+#define P_OPENCL_TRANSFER "OpenCL.Transfer"
+#define P_OPENCL_CONVERSION "OpenCL.Conversion"
+#define P_MULTITHREADING "MultiThreading"
+#define P_QUEUESIZE "QueueSize"
+#define P_DEBUG "Debug"
+
+#define P_VIEW "View"
+#define P_VIEW_BASIC "View.Basic"
+#define P_VIEW_ADVANCED "View.Advanced"
+#define P_VIEW_EXPERT "View.Expert"
+#define P_VIEW_MASTER "View.Master"

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/utility.h Added

@@ -0,0 +1,116 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include "amf-encoder-h264.h"
+#include "amf-encoder-h265.h"
+#include "amf-encoder.h"
+#include "amf.h"
+#include "components/VideoConverter.h"
+#include "components/VideoEncoderHEVC.h"
+#include "components/VideoEncoderVCE.h"
+
+namespace Utility {
+	uint64_t    GetUniqueIdentifier();
+	const char* obs_module_text_multi(const char* val, uint8_t depth = (uint8_t)1);
+
+	// Codec
+	const char*    CodecToString(Plugin::AMD::Codec v);
+	const wchar_t* CodecToAMF(Plugin::AMD::Codec v);
+
+	// Color Format
+	const char*             ColorFormatToString(Plugin::AMD::ColorFormat v);
+	amf::AMF_SURFACE_FORMAT ColorFormatToAMF(Plugin::AMD::ColorFormat v);
+
+	// Color Space
+	const char*                            ColorSpaceToString(Plugin::AMD::ColorSpace v);
+	AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM ColorSpaceToAMFConverter(Plugin::AMD::ColorSpace v);
+
+	// Usage
+	const char*                       UsageToString(Plugin::AMD::Usage v);
+	AMF_VIDEO_ENCODER_USAGE_ENUM      UsageToAMFH264(Plugin::AMD::Usage v);
+	Plugin::AMD::Usage                UsageFromAMFH264(AMF_VIDEO_ENCODER_USAGE_ENUM v);
+	AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM UsageToAMFH265(Plugin::AMD::Usage v);
+	Plugin::AMD::Usage                UsageFromAMFH265(AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM v);
+
+	// Quality Preset
+	const char*                                QualityPresetToString(Plugin::AMD::QualityPreset v);
+	AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM      QualityPresetToAMFH264(Plugin::AMD::QualityPreset v);
+	Plugin::AMD::QualityPreset                 QualityPresetFromAMFH264(AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM v);
+	AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM QualityPresetToAMFH265(Plugin::AMD::QualityPreset v);
+	Plugin::AMD::QualityPreset                 QualityPresetFromAMFH265(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM v);
+
+	// Profile
+	const char*                         ProfileToString(Plugin::AMD::Profile v);
+	AMF_VIDEO_ENCODER_PROFILE_ENUM      ProfileToAMFH264(Plugin::AMD::Profile v);
+	Plugin::AMD::Profile                ProfileFromAMFH264(AMF_VIDEO_ENCODER_PROFILE_ENUM v);
+	AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM ProfileToAMFH265(Plugin::AMD::Profile v);
+	Plugin::AMD::Profile                ProfileFromAMFH265(AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM v);
+
+	// Tier
+	const char*                      TierToString(Plugin::AMD::H265::Tier v);
+	AMF_VIDEO_ENCODER_HEVC_TIER_ENUM TierToAMFH265(Plugin::AMD::H265::Tier v);
+	Plugin::AMD::H265::Tier          TierFromAMFH265(AMF_VIDEO_ENCODER_HEVC_TIER_ENUM v);
+
+	// Coding Type
+	const char*                   CodingTypeToString(Plugin::AMD::CodingType v);
+	AMF_VIDEO_ENCODER_CODING_ENUM CodingTypeToAMFH264(Plugin::AMD::CodingType v);
+	Plugin::AMD::CodingType       CodingTypeFromAMFH264(AMF_VIDEO_ENCODER_CODING_ENUM v);
+	int64_t                       CodingTypeToAMFH265(Plugin::AMD::CodingType v);
+	Plugin::AMD::CodingType       CodingTypeFromAMFH265(int64_t v);
+
+	// Rate Control Method
+	const char*                                RateControlMethodToString(Plugin::AMD::RateControlMethod v);
+	AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM RateControlMethodToAMFH264(Plugin::AMD::RateControlMethod v);
+	Plugin::AMD::RateControlMethod RateControlMethodFromAMFH264(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM v);
+	AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM RateControlMethodToAMFH265(Plugin::AMD::RateControlMethod v);
+	Plugin::AMD::RateControlMethod RateControlMethodFromAMFH265(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM v);
+
+	// Pre-Pass Method
+	const char*                           PrePassModeToString(Plugin::AMD::PrePassMode v);
+	AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM PrePassModeToAMFH264(Plugin::AMD::PrePassMode v);
+	Plugin::AMD::PrePassMode              PrePassModeFromAMFH264(AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM v);
+
+	// GOP Type
+	const char*                GOPTypeToString(Plugin::AMD::H265::GOPType v);
+	Plugin::AMD::H265::GOPType GOPTypeFromAMFH265(int64_t v);
+	int64_t                    GOPTypeToAMFH265(Plugin::AMD::H265::GOPType v);
+
+	// Slicing
+	const char* SliceModeToString(Plugin::AMD::H264::SliceMode v);
+	const char* SliceControlModeToString(Plugin::AMD::SliceControlMode v);
+
+	Plugin::AMD::ProfileLevel H264ProfileLevel(std::pair<uint32_t, uint32_t> resolution,
+											   std::pair<uint32_t, uint32_t> frameRate);
+	Plugin::AMD::ProfileLevel H265ProfileLevel(std::pair<uint32_t, uint32_t> resolution,
+											   std::pair<uint32_t, uint32_t> frameRate);
+
+	//////////////////////////////////////////////////////////////////////////
+	// Threading Specific
+	//////////////////////////////////////////////////////////////////////////
+
+#if (defined _WIN32) || (defined _WIN64)
+	void SetThreadName(uint32_t dwThreadID, const char* threadName);
+	void SetThreadName(const char* threadName);
+	void SetThreadName(std::thread* pthread, const char* threadName);
+#else
+	void SetThreadName(std::thread* pthread, const char* threadName);
+	void SetThreadName(const char* threadName);
+#endif
+} // namespace Utility

obs-studio-22.0.1.tar.xz/plugins/enc-amf/include/version.h.in Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/bn-BD.ini Changed

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/cs-CZ.ini Added

@@ -0,0 +1,35 @@
+Utility.Default="Výchozí"
+Utility.Automatic="Automatické"
+Utility.Manual="Manuální"
+Utility.Switch.Disabled="Zakázáno"
+Utility.Switch.Enabled="Povoleno"
+Preset="Profil"
+Preset.ResetToDefaults="Obnovit výchozí"
+Preset.Recording="Nahrávání"
+Preset.HighQuality="Vysoká kvalita"
+Preset.Indistinguishable="Nerozeznatelné"
+Preset.Lossless="Lossless"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Využití"
+Usage.Transcoding="Transkódování"
+Usage.UltraLowLatency="Ultra nízká odezva"
+Usage.LowLatency="Nízká odezva"
+Usage.Webcam="Webkamera"
+QualityPreset="Profil kvality"
+QualityPreset.Speed="Rychlost"
+QualityPreset.Balanced="Vyvážený"
+QualityPreset.Quality="Kvalita"
+Profile="Profil"
+ProfileLevel="Úroveň profilu"
+Tier="Úroveň"
+AspectRatio="Poměr stran"
+CodingType="Typ kódování"
+GOP.Type.Variable="Proměnná"
+View.Basic="Základní"
+View.Advanced="Pokročilý"
+View.Expert="Expert"
+View.Master="Mistr"
+Debug="Ladění"
+AMF.H264.MaximumLTRFrames="Maximální počet LTR snímků"
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/da-DK.ini Changed

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/el-GR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/en-US.ini Changed

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/et-EE.ini Changed

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

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/fil-PH.ini Added

@@ -0,0 +1,179 @@
+Utility.Default="Pangunahin"
+Utility.Automatic="Awtomatiko"
+Utility.Manual="Mano-manong"
+Utility.Switch.Disabled="Hindi pinagana"
+Utility.Switch.Enabled="Pinagana"
+Preset="Preset"
+Preset.ResetToDefaults="I-reset sa pangunahin"
+Preset.Recording="Rekording"
+Preset.HighQuality="Mataas na kalidad"
+Preset.Indistinguishable="Hindi makilala"
+Preset.Lossless="Walang pagkawala"
+Preset.Twitch="Pagkibot"
+Preset.YouTube="Youtube"
+Usage="Ang pag-gamit"
+Usage.Description="Ano ang pag gamit ng AMF ay dapat nakatutok sa:\n- '\@Usage.Transcoding\@' ito ay pangkalahatang layunin transcoding ( inirekomenda),\n- '\@Usage.UltraLowLatency\@' ay para sa mababang latency encoding,\n- '\@Usage.LowLatency\@' ay pareho sa nasa taas pero bahagyang mas mataas ang latency.\nStreaming ay nakasuporta lamang '\@Usage.Transcoding\@', sa lahat ng iba pang mahalaga na ginagamit sa pag re-rekord."
+Usage.Transcoding="Transcoding"
+Usage.UltraLowLatency="Ultra mababa na Latency"
+Usage.LowLatency="Mababa na Latency"
+Usage.Webcam="Webcam"
+QualityPreset="Ang kalidad na naka handa"
+QualityPreset.Description="Ano ang kalidad na nakahanda sa AMF ay dapat itangkang i-target:\n- '\@QualityPreset.Speed\@' ay ang pinakamabilis pero ito ay may pinakapangit na kalidad,\n- '\@QualityPreset.Balanced\@' ay balanse naihalo sa kapwa,\n- '\@QualityPreset.Quality\@' nagbigay ng pinakamaganda na kalidad sa ibinigay na bitrate."
+QualityPreset.Speed="Bilis"
+QualityPreset.Balanced="Balanse"
+QualityPreset.Quality="Kalidad"
+Profile="Profile"
+Profile.Description="Anong profile ang e-encode sa kasama. Nakasunod mula sa pinaka suportado (itaas) to pinakamagandang kalidad (baba)."
+ProfileLevel="Antas ng profile"
+ProfileLevel.Description="Anong antas ng profile ang gagamitin. Ito ay ang pinakamaganda na nag-iiwan ito sa \@Utility.Automatic\@."
+Tier="Tier"
+Tier.Description="Anong Tier ang e-encode sa. 'Mataas' na target sa mataas na bitrate/bandwidth na ginamit habang 'Main' ay nakatutok sa mainstream media."
+AspectRatio="Aspeto ng Ratio"
+AspectRatio.Description="Aling Aspeto ng Ratio ang dapat isusulat para sa output file."
+CodingType="Uri ng pag coding"
+CodingType.Description="Anong uri ng coding ang ginamit\n* '\@Utility.Automatic\@' AMF ang magdesisyon ( inirekomenda).\n* 'CALVC' (Konteksto-Angkop sa Variable-haba ng Coding) ay mabilis, ngunit mas malaki.\n* 'CABAC' (Konteksto-Angkop Binary Aritmetikang pag coding) ay mas mabagal, ngunit mas maliit."
+MaximumReferenceFrames="Ang Frame ng sangguninan na naka maximum"
+MaximumReferenceFrames.Description="Ilan karmai ang Frames ng encoder na naka reference ay karamihan din kung kailan encoding. Meron direktang epekto sa kalidad ng pag encode."
+RateControlMethod="Paraan ng pagkontrol ng rate"
+RateControlMethod.Description="Anong pamaraan ng pag kontrol na dapat gamitin:\n- '\@RateControlMethod.CQP\@' nakatalaga ng maayos I-/P-/B-Frame QP values,\n- '\@RateControlMethod.CBR\@' mananatili sa naibigay na Target Bitrate(gamit ang Filler Datos) (inirekomenda para sa streaming),\n- '\@RateControlMethod.VBR\@' nanatiling nasa tugatog ng naibigay na Bitrate,\n- '\@RateControlMethod.VBRLAT\@' nanatiling malapit sa Target Bitrate kung GPU latency at load ang papayagan para sa mga ito, kung hindi ay gagamit ng mas mataas na bitrate (inirekomenda para sa rekording)."
+RateControlMethod.CQP="Walang pagbago QP (CQP)"
+RateControlMethod.CBR="Walang pagbago sa Bitrate (CBR)"
+RateControlMethod.VBR="Variable Bitrate (Tugatog na napipigilan) (VBR)"
+RateControlMethod.VBRLAT="Variable Bitrate ( Tugatog ng Latency) (VRBLAT)"
+PrePassMode="Bago na ipasa ang Mode"
+PrePassMode.Description="Bago naipasa ay isang pangalawang bitrate na naipamahagi sa pagpasa na nagpahintulot para sa maayus na pagpamahagi ng bitrate sa loob ng pagka sunod-sunod, subalit ang epekto nito ay naka ayun sa card sa card."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (Quarter Laki)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (Kalahati ng Laki)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (Buong Laki)"
+Bitrate.Target="Target Bitrate"
+Bitrate.Target.Description="Ang pagtangka ng Bitrate para makamit ang pangkalahatang pagkasunod-sunod."
+Bitrate.Peak="Tugatog ng Bitrate"
+Bitrate.Peak.Description="Ang pagtangka ng Bitrate para tugatog sa pangkalahatang pagkasunod-sunod."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Napakapirmi na QP sa halaga para gamitin sa I-Frames."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Nakapirmi na QP sa halaga upang gamiting sa P-Frames."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Nakapirming QP na halaga para gamit sa B-Frames."
+QP.Minimum="Pinakamaliit na QP"
+QP.Minimum.Description="Pinakamababa na halaga ng QP para gamit sa Frame."
+QP.IFrame.Minimum="Pinakamaliit na I-Frame QP"
+QP.IFrame.Minimum.Description="Pinakamababa na halaga ng QP para gamitin sa isang I-Frame."
+QP.PFrame.Minimum="Pinakamaliit na P-Frame QP"
+QP.PFrame.Minimum.Description="Pinakamababang halaga ng QP para gamitin sa P-Frame."
+QP.Maximum="Pinakamaliit na QP"
+QP.Maximum.Description="Pinakamataas na halaga ng QP para gamitin sa isang Frame."
+QP.IFrame.Maximum="Pinakamalaki na I-Frame QP"
+QP.IFrame.Maximum.Description="Pinakamataas na halaga ng QP para gamitin sa I-Frame."
+QP.PFrame.Maximum="Pinakamalaki na P-Frame QP"
+QP.PFrame.Maximum.Description="Pinakamataas na halaga ng QP para gamitin sa P-Frame."
+FillerData="Tagapuno ng datos"
+FillerData.Description="Ang pagpagana ng tagapuno ng datos para sa encoder upang panatilihin kahit ang  \@Bitrate.Target\@ gamit ang tagapuno para sakupin ang natitirang espasyo na nagkasunod-sunod pero walang impormasyon."
+FrameSkipping="Ang paglaktaw ng Frame"
+FrameSkipping.Description="Ang paglaktaw ng Frame ay nagbigay daan sa mga encoder upang laktawan ang frames para matugunan ang \@Bitrate.Target\@ mga kinakailangan. \nNung ang encoder ang lumaktaw sa frame sa halip na ipasok ang paulit-ulit na huling frame NAL papunta sa stream. \nIto ay makakatulong sa pinakamababang \@Bitrate.Target\@ mga kinakailangan."
+FrameSkipping.Period="Panahon ng paglaktaw sa Frame"
+FrameSkipping.Period.Description="Pagitang (sa Frames) sa pagitan ng nilaktawang frames. Ito ay maaring gamitin para gayahin ang mababang framerate kaysa OBS na naka-set habang meron pulidong stream."
+FrameSkipping.Behaviour="Panahon sa paglaktaw sa Ugali ng Frame"
+FrameSkipping.Behaviour.Description="Bigyan ng kahulugan ang paglaktaw sa mga ugali ng Frames."
+FrameSkipping.SkipNth="Ang paglaktaw ay nangyayari tuwing Nth frame"
+FrameSkipping.KeepNth="Panatilihin lamang tuwing Nth frame"
+VBAQ="VBAQ"
+VBAQ.Description="Paganahin ang pag-gamit ng 'Pagkakaiba batay sa Adaptive Quantization' (VBAQ) kung saan naka batay sa pixel ng pagkakaiba upang mabahagi ng maayus ang bitrate.\nIto ay gawa ng mga ideya ng tao sa sistemang biswal na hindi gaano ka senstibo para sa mga artifacts na mataas ang tekstura ng nasasakupan kaya naman maitutulak ang bitrate patungo sa malambot na lugar.\nPagpagana ay magdudulot ng pagkabuti sa subjective na kalidad sa isang tiyak na kontento."
+EnforceHRD="Ipatupad ang HRD"
+EnforceHRD.Description="Ipapatupad ang paggamit ng mga Hypothetical Sanggunian Decoder kung saan magagamit ito para i-verify ang kalalabasan ng bitstream kung tama."
+VBVBuffer="VBV Buffer"
+VBVBuffer.Description="Anong paraan ang dapat gamitin para matukoy ang VBV Buffer Size:\n- '\@Utility.Automnatic\@' para kalkulahin ang laki gamit ang kahigpitan ng pagpilit,\n- '\@Utility.Manual\@' nagpapahintulot ito sa gumagamit para kontrolin ang laki.\nVBV (Video Buffering Verifier) Buffer ay ginagamit sa isang tukoy na Rate Kontrol na Pamaraan para maipanatili ang kabuuang bitrate sa loob ng ibinigay na mga hadlang."
+VBVBuffer.Strictness="VBV Buffer Kahigpitan"
+VBVBuffer.Strictness.Description="Tumutukoy sa kahigpitang ng VBV Buffer, sa 100% na pagiging strikto ay posible at 0% naman kung hindi ipinagpapahintulot."
+VBVBuffer.Size="VBV Buffer Size"
+VBVBuffer.Size.Description="Ang laki ng VBV Buffer kung saan magagamit ang Bitrate kontrol sa pagka sunod-sunod."
+VBVBuffer.InitialFullness="Paunang pagbuo ng VBV Buffer"
+VBVBuffer.InitialFullness.Description="Paano mapuno ang VBV Buffer sa pagpauna ay (in %), makakaapekto lamang sa inisyal na pagkasunod-sunod na pag encode."
+Interval.Keyframe="Ang pagitan ng Keyframe interval"
+Interval.Keyframe.Description="Agwat (sa segundo) sa pagitang ng Keyframes."
+Period.IDR.H264="Panahon ng IDR (nasa Frames)"
+Period.IDR.H264.Description="Tumutukoy sa distansya sa pagitan ng madaliang pag Decoding na nag-refresh (IDR) sa frames."
+Period.IDR.H265="Panahon ng IDR (sa GOPs)"
+Period.IDR.H265.Description="Tumutukoy sa distansya sa pagitang ng madaliang pag decoding na nag-refresh (IDR) sa GOPs."
+Interval.IFrame="Ang pagitang ng I-Frame Interval"
+Interval.IFrame.Description="Agwat (sa segundo) sa pagitang ng I-Frames. I-Frames i-override P-Frames and B-Frames."
+Period.IFrame="Panahon ng I-Frame (nasa Frames)"
+Period.IFrame.Description="Agwat (sa Frames) sa pagitang ng I-Frames. I-Frames i-override P-Frames and B-Frames."
+Interval.PFrame="Ang pagitang ng P-Frame"
+Interval.PFrame.Description="Agwat (sa segundo) sa pagitan ng P-Frames P-Frames override B-Frames."
+Period.PFrame="Panahon ng P-Frame (nasa Frames)"
+Period.PFrame.Description="Distansya (sa Frames) sa pagitan ng P-Frames. P-Frames i-override B-Frames."
+Interval.BFrame="Ang pagitan ng B-Frame"
+Interval.BFrame.Description="Agwat (sa segundo) sa pagitan ng B-Frames."
+Period.BFrame="Panahon ng B-Frame (nasa Frames)"
+Period.BFrame.Description="Distansya (sa Frames) sa pagitang ng B-Frames."
+GOP.Type="Uri ng GoP"
+GOP.Type.Description="Aling uri ng GOP ang dapat gamitin:\n- '\@GOP.Type.Fixed\@' palaging ginagamit para ayusin ang distansya bawat isang GOP.\n- '\@GOP.Type.Variable\@' nagbibigay daan it para sa GOPs na iba't ibang laki, naka depende ito kung ano ang kailangan..\n'\@GOP.Type.Fixed\@' ay kung paano ang H264 na implementa sa trabaho at ang pinakamahusay na lokal network streaming, habang '\@GOP.Type.Variable\@' ang pinakamahusay para sa mababang laki pero mataas na kalidad ng rekordings."
+GOP.Type.Fixed="Naayos"
+GOP.Type.Variable="Baryabol"
+GOP.Size="Laki ng GOP"
+GOP.Size.Description="Laki ng GOP (Grupo ng mga larawan) nasa Frames."
+GOP.Size.Minimum="Pinakamababa na balyo ng GOP"
+GOP.Size.Minimum.Description="Pinakamababang balyo ng GOP (Grupo ng mga larawan) nasa Frames."
+GOP.Size.Maximum="Pinakamataas na balyo ng GOP"
+GOP.Size.Maximum.Description="Pinakamataas na balyo ng GOP (Grupo ng mga larawan) nasa Frames."
+GOP.Alignment="Paghahanay ng GOP"
+GOP.Alignment.Description="Eksperimental, epekto ay hindi maitukoy. Gamitin sa sariling kapakanan."
+BFrame.Pattern="Gabay ng B-Frame"
+BFrame.Pattern.Description="Ang halaga ng B-Frames na gagamitin habang nag e-encode.\nNakasuporta ito sa 2nd at 3rd na henerasyon ng VCE cards. Negatibo ang epekto sa pag encode lalo na sa pagganap."
+BFrame.DeltaQP="B-Frame Delta QP"
+BFrame.DeltaQP.Description="Delta QP ang halaga hanggang sa huli I- or P-Frame para sa hindi sa nauugnay B-Frames."
+BFrame.Reference="Sanggunian ng B-Frame"
+BFrame.Reference.Description="Papayagan ang B-Frame para gamitin ang B-frames bilang sanggunian, sa halip ay P- and I-Frames."
+BFrame.ReferenceDeltaQP="B-Frame sanggunian Delta QP"
+BFrame.ReferenceDeltaQP.Description="Delta QP halaga hanggang sa huli I- or P-Frame para sa hindi na uugnay B-Frames."
+DeblockingFilter="Ang pag iwas sa harang ng Filter"
+DeblockingFilter.Description="Payagan ang decoder na mag-aplay sa Deblocking Filter."
+MotionEstimation="Pag estima sa galaw"
+MotionEstimation.Description="Pag estima sa galaw ay nagpapayag sa encoder sa pagpababa ng pangangailangan ng bitrate ng ma tantya kung saan ang pixel pumunta."
+MotionEstimation.Quarter="Isang kapat na Pixel"
+MotionEstimation.Half="Kalahating Pixel"
+MotionEstimation.Full="Isang kapat at kalahating Pixel"
+Video.API="Video ng API"
+Video.API.Description="Anong API ang dapat gamitin para sa backend?"
+Video.Adapter="Video Adapter"
+Video.Adapter.Description="Sa anong Adapter dapat nating tangkain na mag encode sa?"
+OpenCL.Transfer="OpenCL Transfer"
+OpenCL.Transfer.Description="Ipasa ang frame patungo sa GPU gamit ang OpenCL sa halip na gumamit ng mapped memorya. Ipasa ito gamit ang OpenCl dahil ito ay may mababang sporadic kumpara sa pag pasa gamit ang mapped memorya tuwing ginagamit ang GPU."
+OpenCL.Conversion="Ang pagbago ng OpenCL"
+OpenCL.Conversion.Description="I-convert ang frame mula sa GPU gamit ang OpenCl sa halip na DirektangCompute."
+MultiThreading="Multi-Threading"
+MultiThreading.Description="Gumamit ng mas higit sa isang thread para hawakan ang pagpasa ng frames at pagbawi sa mga packets. Ito ay makakatulong sa mahihinang CPUs pero gagamit ng madaming magpag kukunan sa lahat. Ito ay may negatibong epekto sa pagganap ng mas mabilis na CPUs."
+QueueSize="Laki ng pila"
+QueueSize.Description="Pila ng maeaming frames para sa encoder bago tangkaing mabawi ang packets. Mas mataas na halaga ay ipinapakilala sa mas latency habang may mababang halaga at magdudulot ng labis na karga sa encoding. Hindi siya inirekomenda para bagohin mula sa simula."
+View="Tanaw ng Mode"
+View.Description="Anong katangian ang dapat ipakita?\ngamit'\@View.Master\@' ito ay magtatanggal sayo para makatanggap ng supporta."
+View.Basic="Madali"
+View.Advanced="Magaling"
+View.Expert="Dalubhasa"
+View.Master="Ma-dalubhasa"
+Debug="Debuf"
+Debug.Description="Payagan na magdagdag ng Debug na mensahe. Nangangailangan ito na patakbohin ang Open Broadcaster Software Studio na merong komand na linya '--verbose --log_unfiltered' (alisin ang ')."
+AMF.H264.MaximumLTRFrames="Pinakamataas na LTF Frames"
+AMF.H264.MaximumLTRFrames.Description="Mataas na Terminong Sangguniaan (LTR) Frames ay isang katangian na nagpagpapayag sa encoder na i-flag ang isang tiyak na frames sa pagkasunod-sunod bilanh sanggunian para sa mahabang panahon.\nLTR Frames ay hindi puwedeng gamitin na may B-frames at ang encoder ay hindi papaganahin ang B-Frames kapag ginamit."
+AMF.H264.MaximumAccessUnitSize="Pinakamataas na laki ng yunit sa pag-access"
+AMF.H264.MaximumAccessUnitSize.Description="Pinakamalaking Access Yunit para sa NAL."
+AMF.H264.HeaderInsertionSpacing="Pagpasok ng Header sa spacing"
+AMF.H264.HeaderInsertionSpacing.Description="Ilang frames ang dapat nasa pagitan ng NAL headers."
+AMF.H264.WaitForTask="Maghintay sa gawain"
+AMF.H264.WaitForTask.Description="Hindi kilala, eksperimental"
+AMF.H264.SlicesPerFrame="Hiwa bawat Frame"
+AMF.H264.SlicesPerFrame.Description="Ilang daming hiwa ng I-Frame ang dapat maimbak sa isang frame?\nAng halaga ng zero ay nakabatay sa encoder kung anong desisyon nya sa lipad.\nIntra-Refresh encoding ay ginagamit para sa mabilisang playback and paghahanap."
+AMF.H264.SliceMode="Hiwa ng Mode"
+AMF.H264.SliceMode.Description="Hindi kilala, eksperimental"
+AMF.H264.MaximumSliceSize="Pinakamataas na laki ng hiwa"
+AMF.H264.MaximumSliceSize.Description="Hindi kilala, Eksperimental"
+AMF.H264.SliceControlMode="Kontrol ng hiwa Mode"
+AMF.H264.SliceControlMode.Description="Hindi kilala, Eksperimental"
+AMF.H264.SliceControlSize="Kontrol sa laki ng hiwa"
+AMF.H264.SliceControlSize.Description="Hindi kilala, Eksperimental"
+AMF.H264.IntraRefresh.NumberOfStripes="Intra-Refresh bilang ng guhitan"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Hindi kilala, Eksperimental"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-Refreag Macroblocks kada bakante"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Ilang Macroblocks ang dapat maibahagi bawat isang slot?\nAng balyo ng 0 ay hindi pinapagana ang tampok.\nIntra-Refresg encodinf ay ginagamit sa mas mabilis na playback at paghahanap."
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/fr-FR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/he-IL.ini Added

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

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/ja-JP.ini Changed

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

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/nl-NL.ini Changed

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/pt-BR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/ro-RO.ini Added

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

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/sr-CS.ini Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/sv-SE.ini Added

@@ -0,0 +1,178 @@
+Utility.Default="Standard"
+Utility.Automatic="Automatisk"
+Utility.Manual="Manuell"
+Utility.Switch.Disabled="Inaktiverad"
+Utility.Switch.Enabled="Aktiverad"
+Preset="Förinställning"
+Preset.ResetToDefaults="Återställ till standardvärden"
+Preset.Recording="Spelar in"
+Preset.HighQuality="Hög kvalitet"
+Preset.Indistinguishable="Oskiljbar"
+Preset.Lossless="Förlustfritt"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Användning"
+Usage.Description="Vilken användning AMF borde vara inställd på:\n- '\@Usage.Transcoding\@' är för allmän omkodning (rekommenderas),\n- '\@Usage.UltraLowLatency\@' är för omkodning med riktigt låg latens,\n- '\@Usage.LowLatency\@' liknar ovanstående men med lite högre latens.\nStrömning stöder endast '\@Usage.Transcoding\@', alla andra värden kan användas för inspelning."
+Usage.Transcoding="Omkodning"
+Usage.UltraLowLatency="Ultralåg latens"
+Usage.LowLatency="Låg latens"
+Usage.Webcam="Webbkamera"
+QualityPreset="Kvalitetsförinställning"
+QualityPreset.Description="Vilken kvalitetsmall AMF bör försöka att uppnå:\n- '\@QualityPreset.Speed\@' är den snabbaste men har den sämsta kvaliteten,\n- '\@QualityPreset.Balanced\@' är en balanserad mix av båda,\n- '\@QualityPreset.Quality\@' ger den bästa kvaliteten för en angiven bithastighet."
+QualityPreset.Speed="Hastighet"
+QualityPreset.Balanced="Balanserad"
+QualityPreset.Quality="Kvalitet"
+Profile="Profil"
+Profile.Description="Vilken profil att använda för kodning, sorteras från mest utbrett stöd till högsta kvalitet."
+ProfileLevel="Profilnivå"
+ProfileLevel.Description="Vilken profilnivå att använda för kodning, det är bäst att lämna detta på \@Utility.Automatic\@"
+Tier="Nivå"
+Tier.Description="Vilken nivå att koda på. 'Hög' siktar på hög bithastighet/bandbredd använder medan 'Huvud' siktar på mainstreammedia."
+AspectRatio="Aspektförhållande"
+AspectRatio.Description="Vilket bildförhållande som bör skrivas till utmatningsfilen."
+CodingType="Kodningstyp"
+CodingType.Description="Vilken typ av kodning som ska användas:\n* '\@Utility.Automatic\@' låter AMF bestämma (rekommenderas).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) är snabbare, men större.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) är långsammare, men mindre."
+MaximumReferenceFrames="Maximalt antal referensbildrutor"
+MaximumReferenceFrames.Description="Hur många bildrutor kodaren kan referera som mest under kodning, påverkar kodningskvalitet avsevärt."
+RateControlMethod="Hastighetskontrollmetod"
+RateControlMethod.Description="Vilken hastighetskontrollmetod som ska användas:\n- '\@RateControlMethod.CQP\@' tilldelar fasta QP-värden för I-/P-/B-bildrutor,\n- '\@RateControlMethod.CBR\@' stannar vid angiven målbithastighet (med hjälp av Fyllningsdata) (rekommenderas för strömning),\n- '\@RateControlMethod.VBR\@' stannar under angiven bithastighetsgräns,\n- '\@RateControlMethod.VBRLAT\@' stannar nära målbithastigheten om grafikprocessorns latens och läsning tillåter det, annars kommer högre bithastighet användas (rekommenderas för inspelning)."
+RateControlMethod.CQP="Konstant QP (CQP)"
+RateControlMethod.CBR="Konstant bithastighet (CBR)"
+RateControlMethod.VBRLAT="Varierande bithastighet (begränsad latens) (VBR_LAT)"
+PrePassMode="Förpassläge"
+PrePassMode.Description="Förpass är en sekundär fördelning av bithastighet som gör det möjligt att fördela bithastigheten inom en sekvens, men resultatet kan variera för varje grafikkort."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (kvarts storlek)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (halv storlek)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (full storlek)"
+Bitrate.Target="Målbithastighet"
+Bitrate.Target.Description="Bithastighet att försöka uppnå i den övergripande sekvensen."
+Bitrate.Peak="Maximal bithastighet"
+Bitrate.Peak.Description="Bithastighet att maximalt försöka uppnå i den övergripande sekvensen."
+QP.IFrame="QP för I-bildrutor"
+QP.IFrame.Description="Konstant QP-värde att använda för I-bildrutor."
+QP.PFrame="QP för P-bildrutor"
+QP.PFrame.Description="Konstant QP-värde att använda för P-bildrutor."
+QP.BFrame="QP för B-bildrutor"
+QP.BFrame.Description="Konstant QP-värde att använda för B-bildrutor."
+QP.Minimum="Minimal QP"
+QP.Minimum.Description="Lägsta QP-värde att använda i en bildruta."
+QP.IFrame.Minimum="Minimalt QP för I-bildrutor"
+QP.IFrame.Minimum.Description="Lägsta QP-värde att använda i en I-bildruta."
+QP.PFrame.Minimum="Minimalt QP för P-bildrutor"
+QP.PFrame.Minimum.Description="Lägsta QP-värde att använda i en P-bildruta."
+QP.Maximum="Maximal QP"
+QP.Maximum.Description="Högsta QP-värde att använda i en bildruta."
+QP.IFrame.Maximum="Maximalt QP för I-bildrutor"
+QP.IFrame.Maximum.Description="Högsta QP-värde att använda i en I-bildruta."
+QP.PFrame.Maximum="Maximalt QP för P-bildrutor"
+QP.PFrame.Maximum.Description="Högsta QP-värde att använda i en P-bildruta."
+FillerData="Fyllningsdata"
+FillerData.Description="Fyllningsdata låter kodaren behålla minst \@Bitrate.Target\@ genom att fylla upp det återstående utrymmet i en sekvens med tom information."
+FrameSkipping="Hoppa över bildrutor"
+FrameSkipping.Description="Hoppa över bildrutor låter kodaren släppa bildrutor för att möta kraven för \@Bitrate.Target\@.\nNär kodaren släpper en bildruta infogar den istället en NAL som upprepar senaste bildrutan i strömmen.\nKan hjälpa när kraven för \@Bitrate.Target\@ är riktigt låga."
+FrameSkipping.Period="Period för att hoppa över bildrutor"
+FrameSkipping.Period.Description="Intervall (i bildrutor) mellan överhoppade bildrutor. Detta kan användas för att simulera en lägre bildfrekvens än vad OBS är inställd på medan en giltig ström upprätthålls."
+FrameSkipping.Behaviour="Beteende för att hoppa över bildrutor"
+FrameSkipping.Behaviour.Description="Definiera hur överhoppade bildrutor beter sig."
+FrameSkipping.SkipNth="Hoppar över varje N:de bildruta"
+FrameSkipping.KeepNth="Behåller endast varje N:de bildruta"
+VBAQ="VBAQ"
+VBAQ.Description="Aktiverar användning av \"Variance Based Adaptive Quantization\" (VBAQ) som baseras på bildpunktsvariation för att fördela bithastigheten bättre.\nDet bygger på idén att människans syn är mindre känslig för artefakter i områden med hög textur och kommer därför driva bithastigheten mot mjukare ytor.\nNär detta aktiveras kan det leda till förbättringar i subjektiv kvalitet för en del innehåll."
+EnforceHRD="Tvinga HRD"
+EnforceHRD.Description="Tvingar användning av en hypotetisk referensavkodare som används för att verifiera att utmatningens bitström är korrekt."
+VBVBuffer="VBV-buffert"
+VBVBuffer.Description="Vilken metod som ska användas för att bestämma VBV-buffertens storlek:\n- '\@Utlity.Automatic\@' beräknar storleken med hjälp av en strikt begränsning,\n- '\@Utlity.Manual\@' låter användaren kontrollera storleken.\nVBV-buffertern (Video Buffering Verifier) används av vissa Rate Control Methods för att hålla den övergripande bithastigheten inom de angivna begränsningarna."
+VBVBuffer.Strictness="Noggrannhet för VBV-buffert"
+VBVBuffer.Strictness.Description="Bestämmer noggrannheten för VBV-bufferten, där 100% är så noggrann som möjligt och 0% är gränslös."
+VBVBuffer.Size="VBV-buffertstorlek"
+VBVBuffer.Size.Description="Storleken för VBV-bufferten som används för bithastighetskontroll i en sekvens."
+VBVBuffer.InitialFullness="VBV-buffertens ursprungliga fyllnad"
+VBVBuffer.InitialFullness.Description="Hur full VBV-bufferten är från början (i %), kommer endast påverka den inledande kodningssekvensen."
+Interval.Keyframe="Intervall för keyframes"
+Interval.Keyframe.Description="Intervall (i sekunder) mellan keyframes."
+Period.IDR.H264="IDR-period (i bildrutor)"
+Period.IDR.H264.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i bildrutor."
+Period.IDR.H265="IDR-period (i GOP)"
+Period.IDR.H265.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i GOP."
+Interval.IFrame="Intervall för I-bildrutor"
+Interval.IFrame.Description="Intervall (i sekunder) mellan I-bildrutor. I-bildrutor överstrider P-bildrutor och B-bildrutor."
+Period.IFrame="Period för I-bildrutor (i bildrutor)"
+Period.IFrame.Description="Avstånd (i bildrutor) mellan I-bildrutor. I-bildrutor överstrider P-bildrutor och B-bildrutor."
+Interval.PFrame="Intervall för P-bildrutor"
+Interval.PFrame.Description="Intervall (i sekunder) mellan P-bildrutor. P-bildrutor överstrider B-bildrutor."
+Period.PFrame="Period för P-bildrutor (i bildrutor)"
+Period.PFrame.Description="Avstånd (i bildrutor) mellan P-Frames. P-Frame överstrider B-Frames."
+Interval.BFrame="Intervall för B-bildrutor"
+Interval.BFrame.Description="Intervall (i sekunder) mellan B-bildrutor."
+Period.BFrame="Period för B-bildrutor (i bildrutor)"
+Period.BFrame.Description="Avstånd (i bildrutor) mellan B-bildrutor."
+GOP.Type="GOP-typ"
+GOP.Type.Description="Vilken typ av GOP bör användas:\n- '\@GOP.Type.Fixed\@' kommer alltid använda fasta avstånd mellan varje GOP.\n- '\@GOP.Type.Variable\@' tillåter GOP i olika storlekar, beroende på vad som behövs.\n'\@GOP.Type.Fixed\@' är hur H264-implementeringen fungerar och är bäst för lokal nätverksströmning, medan '\@GOP.Type.Variable\@' är bäst för korta inspelningar i hög kvalitet."
+GOP.Type.Fixed="Konstant"
+GOP.Type.Variable="Variabel"
+GOP.Size="GOP-storlek"
+GOP.Size.Description="Storleken för en GOP (Group Of Pictures) i bildrutor."
+GOP.Size.Minimum="Minimal GOP-storlek"
+GOP.Size.Minimum.Description="Minimal storlek för en GOP (Group Of Pictures) i bildrutor."
+GOP.Size.Maximum="Maximal GOP-storlek"
+GOP.Size.Maximum.Description="Maximal storlek för en GOP (Group Of Pictures) i bildrutor."
+GOP.Alignment="GOP-justering"
+GOP.Alignment.Description="Experimentell. Bieffekterna är okända. Använd på egen risk."
+BFrame.Pattern="Mönster för B-bildrutor"
+BFrame.Pattern.Description="Antalet B-bildrutor att använda under kodning.\nStöds av andra och tredje generationens VCE-kort. Påverkar kodningsprestandan negativt."
+BFrame.DeltaQP="Delta QP för B-bildrutor"
+BFrame.DeltaQP.Description="Delta QP-värde till den sista I- eller P-bildrutan för icke-referensbara B-bildrutor."
+BFrame.Reference="Referens för B-bildrutor"
+BFrame.Reference.Description="Låt en B-bildruta också använda B-bildrutor som referens, i stället för bara P- och I-bildrutor."
+BFrame.ReferenceDeltaQP="Delta QP för referens för B-bildrutor"
+BFrame.ReferenceDeltaQP.Description="Delta QP-värde till den sista I- eller P-bildrutan för referensbara B-bildrutor."
+DeblockingFilter="Avblockningsfilter"
+DeblockingFilter.Description="Låter kodaren tillämpa ett avblockeringsfilter."
+MotionEstimation="Rörelseuppskattning"
+MotionEstimation.Description="Rörelseuppskattning låter kodaren reducera nödvändig bithastighet genom att uppskatta var en bildpunkt förflyttas."
+MotionEstimation.Quarter="Fjärdedels bildpunkt"
+MotionEstimation.Half="Halv bildpunkt"
+MotionEstimation.Full="Fjärdedels och halv bildpunkt"
+Video.API="Video-API"
+Video.API.Description="Vilket API bör användas av backend?"
+Video.Adapter="Grafikkort"
+Video.Adapter.Description="På vilken adapter bör vi försöka koda på?"
+OpenCL.Transfer="OpenCL-överföring"
+OpenCL.Transfer.Description="Överför bildrutan till grafikprocessorn med OpenCL istället för mappat minnet. Överföring via OpenCL är mindre oregelbunden än överföring via mappat minne när grafikprocessorn används."
+OpenCL.Conversion="OpenCL-konvertering"
+OpenCL.Conversion.Description="Konvertera bildrutan i grafikprocessorn med OpenCL istället för DirectCompute."
+MultiThreading="Flertrådning"
+MultiThreading.Description="Använd fler än en tråd för att hantera sändningar av bildrutor och hämtning av paket. Detta kan hjälpa långsammare processorer, men använder mer övergripande systemresurser. Den kommer att påverka prestandan negativt på långsammare processorer."
+QueueSize="Köstorlek"
+QueueSize.Description="Kölägg så många bildrutor för kodaren innan försök att hämta paket göra. Ett högre värde leder till mer latens medan ett lägre värde kan orsaka överlastad kodning. Det rekommenderas inte att ändra detta från standardvärdet."
+View="Visningsläge"
+View.Description="Vilka egenskaper bör visas?\nOm '\@View.Master\@' används kommer du inte få någon hjälp."
+View.Basic="Grundläggande"
+View.Advanced="Avancerat"
+View.Expert="Expert"
+View.Master="Mästare"
+Debug="Felsök"
+Debug.Description="Aktivera ytterligare felsökningsmeddelanden. Kräver att du kör Open Broadcaster Software Studio med kommandoraden \"--verbose --log_unfiltered\" (utan citationstecken)."
+AMF.H264.MaximumLTRFrames="Maximalt antal LTR-bildrutor"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) är en funktion som låter kodaren flagga vissa bildrutor i en sekvens som referensbar för en lång tid.\nLTR-bildrutor kan inte användas med B-bildrutor och kodaren kommer att inaktivera B-bildrutor om de används."
+AMF.H264.MaximumAccessUnitSize="Maximal storlek på åtkomstenhet"
+AMF.H264.MaximumAccessUnitSize.Description="Största storleken på en åtkomstenhet för en NAL."
+AMF.H264.HeaderInsertionSpacing="Avstånd för headerinmatning"
+AMF.H264.HeaderInsertionSpacing.Description="Hur många bildrutor som borde vara mellan NAL-headers."
+AMF.H264.WaitForTask="Väntar på arbetsuppgifter"
+AMF.H264.WaitForTask.Description="Okänd, experimentell"
+AMF.H264.SlicesPerFrame="Segment per bildruta"
+AMF.H264.SlicesPerFrame.Description="Hur många I-bildrutesegment bör lagras i varje bildruta?\nEtt värde på noll låter kodaren bestämma dynamiskt.\nIntra-uppdaterande kodning används för snabbare uppspelning och sökning."
+AMF.H264.SliceMode="Slice-läge"
+AMF.H264.SliceMode.Description="Okänd, experimentell"
+AMF.H264.MaximumSliceSize="Maximal segmentstorlek"
+AMF.H264.MaximumSliceSize.Description="Okänd, experimentell"
+AMF.H264.SliceControlMode="Segmentkontrolläge"
+AMF.H264.SliceControlMode.Description="Okänd, experimentell"
+AMF.H264.SliceControlSize="Segmentkontrollstorlek"
+AMF.H264.SliceControlSize.Description="Okänd, experimentell"
+AMF.H264.IntraRefresh.NumberOfStripes="Intra-uppdatera antal linjer"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Okänd, experimentell"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-uppdatera makroblock per plats"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Hur många Macroblock bör lagras i varje plats?\nEtt värde på 0 inaktiverar denna funktion.\nIntra-uppdaterande kodning används för snabbare uppspelning och sökning."
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/tl-PH.ini Added

@@ -0,0 +1,179 @@
+Utility.Default="Default"
+Utility.Automatic="Awtomatik"
+Utility.Manual="Manwal"
+Utility.Switch.Disabled="Hindi paganahin"
+Utility.Switch.Enabled="Paganahin"
+Preset="I-preset"
+Preset.ResetToDefaults="I-reset sa mga default"
+Preset.Recording="Mag-recording"
+Preset.HighQuality="Mataas ang kalidad"
+Preset.Indistinguishable="Mahirap kilalanin"
+Preset.Lossless="Walang nawala"
+Preset.Twitch="Ikibit"
+Preset.YouTube="YouTube"
+Usage="Ang nagamit"
+Usage.Description="Anong gagamitin na AMF na karapatdapat para sa:\n- '\@Usage.Transcoding\@' heneral na layunin ng transcoding (rekomendasyon),\n- '\@Usage.UltraLowLatency\@' para talagang maging mababa ang latency ng encoding,\n- '\@Usage.LowLatency\@' para maging katulad sa taas na medyo may kataasan ang latency.\nStreaming lang ang pwedeng supurtahan '\@Usage.Transcoding\@', lahat ng ibang mga halaga ay pwedeng magamit sa recording."
+Usage.Transcoding="Transcoding"
+Usage.UltraLowLatency="Ang Latency ay Masyadong Mababa"
+Usage.LowLatency="Ang Latency ay Mababa"
+Usage.Webcam="Ang Webcam"
+QualityPreset="Ang Quality ay I-preset"
+QualityPreset.Description="Anong Quality Preset AMF ang dapat na i-target:\n- '\@QualityPreset.Speed\@' ay ang pinakamabilis ngunit may mababang kalidad,\n- '\@QualityPreset.Balanced\@' ay ang balansing pag-halo sa dalawa,\n- '\@QualityPreset.Quality\@' nagbigay ng pinaka-magandang kalidad sa binigay na bitrate."
+QualityPreset.Speed="Bilis"
+QualityPreset.Balanced="Nabalanse"
+QualityPreset.Quality="Kalidad"
+Profile="Ang Profile"
+Profile.Description="Anong Profile na dapag i-encode nito. Uriin mula sa pinakamagaling na suporta (itaas) patungong pinakamahusay na kalidad (ibaba)."
+ProfileLevel="Lebel ng Profile"
+ProfileLevel.Description="Anong Lebel ng Profile ang gamitin. Masmainan kung iwanan nalang ito sa \@Utility.Automatic\@."
+Tier="Tier"
+Tier.Description="Anong Tier na i-encode sa. \"Mataas\" target na mataas na bitrate/bandwidth nagamit samantala 'Main' ay layon ang mainstream media."
+AspectRatio="Ang Aspect Ratio"
+AspectRatio.Description="Kung saan ang Aspect Ratio ay dapat isulat sa output na mga files."
+CodingType="Uri ng coding"
+CodingType.Description="Anong uri ng coding na gagamitin:\n* '\@Utility.Automatic\@' lets AMF decide (recommended).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) ay mas mabilis,pero malaki.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) ay mabagal, pero maliit."
+MaximumReferenceFrames="Pinakamataas na Reference na Frames"
+MaximumReferenceFrames.Description="Ilang Frames ang encoder ay maaring sanggunian sakaramihan habang nag-iiencode. Merong direktang epekto sa encoding na kalidad."
+RateControlMethod="Pamamaraan ng Rate Control"
+RateControlMethod.Description="Anong rate kontrol na pamamaraan ay dapat gamitin::\n- '\@RateControlMethod.CQP\@' nagtatalaga ng fixed I-/P-/B-Frame QP values,\n- '\@RateControlMethod.CBR\@' nanatili ang binigay na Bitrate(Gumagamit ng Filler Data) (inirekomenda para sa streaming),\n- '\@RateControlMethod.VBR\@' mananatili sa ibaba sa binigay na Peak Bitrate,\n- '\@RateControlMethod.VBRLAT\@'nanatiling malapit sa Target Bitrate king ang GPU latency at load ay pumupayag nito, kung hindi man ay gagamit ng mataas na bitrate(inirekomenda para sa pag-record)."
+RateControlMethod.CQP="Pare-parehong QP(CQP)"
+RateControlMethod.CBR="Pare-parehong BItrate (CBR)"
+RateControlMethod.VBR="Variable Bitrate (Peak Constrained) (VBR)"
+RateControlMethod.VBRLAT="Variable Bitrate (Latency Constrained) (VBRLAT)"
+PrePassMode="Pre-Pass Mode"
+PrePassMode.Description="Pre-pass ay pangalawang bitrate na pamamahagi na pass na nagpapahintulot para sa kabutihan ng pamamahagi sa bitrate sa loob ng pagkasunod-sunod, gayunpaman ang epekto nito ay iba-iba galing sa card-card."
+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 para subukan na makamit para sa pangkalahatang pagsunod-sunod."
+Bitrate.Peak="Peak Bitrate"
+Bitrate.Peak.Description="Bitrate para subukan ang maximally peak para sa pangkalahatang pagsunod-sunod."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Fixed QP balyo na magagamit para sa I-Frames."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Fixed QP balyo na magagamit para sa P-Frames."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Fixed QP balyo na magagamit para sa B-Frames."
+QP.Minimum="Pinakamaliit na QP"
+QP.Minimum.Description="Pinakamababa na QP na balyo na magagamit para sa Frame."
+QP.IFrame.Minimum="Pinakamababang I-Frame QP"
+QP.IFrame.Minimum.Description="Pinakamababang QP na balyo na magagamit para sa I-Frame."
+QP.PFrame.Minimum="Minimum P-Frame QP"
+QP.PFrame.Minimum.Description="Pinakamababang QP na magagamit para sa P-Frame."
+QP.Maximum="Maximum QP"
+QP.Maximum.Description="Pinakamataas na QP na balyo na magagamit para sa Frame."
+QP.IFrame.Maximum="Maximum I-Frame QP"
+QP.IFrame.Maximum.Description="Pinakamataas na QP na balyo na magagamit para sa I-Frame."
+QP.PFrame.Maximum="Maximum P-Frame QP"
+QP.PFrame.Maximum.Description="Pinakamataas na QP na balyo na magagamit para sa P-Frame."
+FillerData="Filler Data"
+FillerData.Description="Pagpapagana ng Filter Data ay nagpapahintulot sa encoder na panatilihin kahit na ang \@Bitrate.Target\@ sa pamamagitan ng pag fill-up ng natitirang space sa pagsunod-sunod na may blankong impormasyon."
+FrameSkipping="Frame Skipping"
+FrameSkipping.Description="Frame Skipping ay nagpapahintulot sa encoder na laktawan ang frames upang matugunan ang \@Bitrate.Target\@ requirements.\nKung ang encoder ay naglaktaw ng frame sa halip ay magpasok ng repeat-last-frame NAL para sa stream.\nMaaaring makatulong sa napakababang \@Bitrate.Target\@ requirements."
+FrameSkipping.Period="Skip-Frame Period"
+FrameSkipping.Period.Description="Agwat (sa Frames) sa pagitan ng skipped frames. Ito ay maaaring gamitin upang gayahin ang isang mas mababang framerate kaysa sa OBS ay nakatakda sa habang may isang wastong stream."
+FrameSkipping.Behaviour="Skip-Frame Behaviour"
+FrameSkipping.Behaviour.Description="Tukuyin kung paano kumikilos ang Frame Skipping."
+FrameSkipping.SkipNth="Maglaktaw ng tanging bawat Nth frame"
+FrameSkipping.KeepNth="Panatilihin lamang ang bawat frame ng Nth"
+VBAQ="VBAQ"
+VBAQ.Description="Pinapagana ang paggamit ng 'Variance Based Adaptive Quantization' (VBAQ) kung saan nakabasi sa pixel variance para maibigay ng bitrate na mabuti.\nGumagana ito sa ideya na ang visual na sistema ng tao na hindi mas sensitibo sa mga artifact sa mga mataas na lugar na may texture at sa gayon ay itulak ang bitrate patungo sa mas malinaw na ibabaw.\nAng pagpapagana nito ay naghahatid para sa pagpapabuti sa subjective na kalidad na may ilang nilalaman."
+EnforceHRD="Ipatupad ang HRD"
+EnforceHRD.Description="Ipatupad ang paggamit ng isang Hypothetical Reference Decoder kung saan magagamit upang i-verify na dapat ang kalalabasan ng bitsream ay tama."
+VBVBuffer="VBV Buffer"
+VBVBuffer.Description="Anong method na dapat gagamitin uoang matukoy ang VBV Buffer Size: \n- '\ @ Utility.Automatic \ @' kinakalkula ang laki gamit ang isang mahigpit na pagpilit, \n- '\ @ Utility.Manual \ @' na nagpapahintulot sa gumagamit uoang kontrolin ang laki.\nVBV (Video Buffering Verifier) Buffer ay ginagamit ng ilang Mga Pamamaraan sa Pamamahala ng Rate upang mapanatili ang pangkalahatang bitrate sa loob ng mga hadlang."
+VBVBuffer.Strictness="VBV Buffer Strictness"
+VBVBuffer.Strictness.Description="Tinutukoy ang katapatan ng VBV Buffer, na may 100% na bilang mahigpit hangga't maaari ay 0% at hindi ipinagpapahintulot."
+VBVBuffer.Size="VBV Buffer Size"
+VBVBuffer.Size.Description="Sa laki ng VBV Buffer na ginagamit para i-kontrol ng Bitrate sa isang pagkakasunud-sunod."
+VBVBuffer.InitialFullness="VBV Buffer Initial Fullness"
+VBVBuffer.InitialFullness.Description="Kung gaano ka-puno ang VBV Buffer sa una ay (sa%), makakaapekto lamang ang unang pagkakasunud-sunod ng encoding."
+Interval.Keyframe="Keyframe Interval"
+Interval.Keyframe.Description="Agwat (sa Segundos) sa pagitan ng Keyframes."
+Period.IDR.H264="IDR Period (in Frames)"
+Period.IDR.H264.Description="Tinutukoy ang distansya sa pagitan ng Instantaneous Decoding Refreshes (IDR) sa frame."
+Period.IDR.H265="IDR Period (in GOPs)"
+Period.IDR.H265.Description="Tinutukoy ang distansya sa pagitan ng Instantaneous Decoding Refreshes (IDR) sa GOPs."
+Interval.IFrame="I-Frame Interval"
+Interval.IFrame.Description="Agwat (sa Segundos) sa pagitan ng I-Frames. I-Frames ay nakapatong sa P-Frames at B-Frames."
+Period.IFrame="I-Frame Period (sa Frames)"
+Period.IFrame.Description="Distansya (sa Frames) sa pagitan ng I-Frames. Pumapatong ang I-Frames sa P-Frames at B-Frames."
+Interval.PFrame="P-Frame Interval"
+Interval.PFrame.Description="Agwat (sa Segundos) sa pagitan ng P-Frames. P-Frames ay pumapatong sa B-Frames."
+Period.PFrame="P-Frame Period (in Frames)"
+Period.PFrame.Description="Distance (sa Frames) sa pagitan ng P-Frames. P-Frames ay nakapatong sa B-Frames."
+Interval.BFrame="B-Frame Interval"
+Interval.BFrame.Description="Agwat (sa Segundos) sa pagitan ng B-Frames."
+Period.BFrame="B-Frame Period (sa Frames)"
+Period.BFrame.Description="Distansya (sa Frames) sa pagitan ng B-Frames."
+GOP.Type="Uri ng GOP"
+GOP.Type.Description="Kung saan ang uri ng GOP ay dapat gamitin:\n- '\@ GOP.Type.Fixed \@' ay laging gumamit ng takdang distansya sa pagitan ng bawat GOP.\n- '\@ GOP.Type.Variable \@' ay nagbibigay-daan para sa mga GOP ng iba't ibang laki, depende sa kung ano ang kinakailangan. \n '\@ GOP.Type.Fixed \@' ay kung paano gumagana ang pagpapatupad ng H264 at pinakamainam para sa lokal na streaming ng network, habang ang '\@ GOP.Type.Variable \@' ay pinakamainam para sa pag-record ng mababang laki at matatas na kalidad."
+GOP.Type.Fixed="Nakapirmi"
+GOP.Type.Variable="Variable"
+GOP.Size="Laki ng GOP"
+GOP.Size.Description="Laki ng isang GOP (Grupo ng mga imahi) sa Frames."
+GOP.Size.Minimum="Pinakamababang laki ng GOP"
+GOP.Size.Minimum.Description="Pinakamababang laki ng GOP (Grupo ng imahi) sa Frames."
+GOP.Size.Maximum="Pinakamalaking laki ng GOP"
+GOP.Size.Maximum.Description="Ang pinakamalaking laki ng GOP (Grupo ng imahi) sa Frames."
+GOP.Alignment="Paghahanay ng GOP"
+GOP.Alignment.Description="Experimental, Ang epekto ay Hindi-alam. Gamitin sa iyong sariling panganib."
+BFrame.Pattern="B-Frame Pattern"
+BFrame.Pattern.Description="Ang halaga ng B-Frames na gagamitin habang nag-iencode. \ NSupportado ng card ng 2nd at 3rd Generation VCE. Ang negatibong epekto sa paggawa ng pag-encode."
+BFrame.DeltaQP="B-Frame Delta QP"
+BFrame.DeltaQP.Description="Halaga ng Delta QP sa huling I- o P-Frame para sa mga hindi na-reference na B-Frames."
+BFrame.Reference="B-Frame Reference"
+BFrame.Reference.Description="Payagan ang B-Frame na gumamit din ng B-Frames bilang sanggunian, sa halip ay P- at I-Frame."
+BFrame.ReferenceDeltaQP="B-Frame Reference Delta QP"
+BFrame.ReferenceDeltaQP.Description="Halaga ng Delta QP sa huling I- o P-Frame para sa mga na reference na B-Frames."
+DeblockingFilter="Deblocking Filter"
+DeblockingFilter.Description="Payagan ang decoder na gamitin ang Deblocking Filter."
+MotionEstimation="Pag-estimate ng Galaw"
+MotionEstimation.Description="Ang pag-estimate ng galaw ay pinahihintulutan ang encoder na pababain ang kinakailangang bitrate sa pag-iestimate kung saan ang pixel galing."
+MotionEstimation.Quarter="Quarter-Pixel"
+MotionEstimation.Half="Half-Pixel"
+MotionEstimation.Full="Quarter- & Half-Pixel"
+Video.API="Video API"
+Video.API.Description="Anong API ang dapat gamitin na backend?"
+Video.Adapter="Video Adapter"
+Video.Adapter.Description="Sa kung anong Adapter ang dapat nating tangkaing i-encode?"
+OpenCL.Transfer="OpenCL Transfer"
+OpenCL.Transfer.Description="Paglipat ng Frame sa GPU gamit ang OpenCL sa halip ng mapped na memory. Paglipat ng OpenCL sa pamamagitan nito ay mababa na sporadic kaysa sa paglipat pamamagitan ng mapped memory kung saan ang GPU ay ginagamit."
+OpenCL.Conversion="OpenCL Conversion"
+OpenCL.Conversion.Description="Pag-convert ang frame para sa GPU gamit ang OpenCL sa halip ng DirectCompute."
+MultiThreading="Multi-Threading"
+MultiThreading.Description="Gamit ng higit sa isang thread para i-hawak sa submitting na frames at pag-retrieve ng packests. Ito ay makakatulong sa mas mabagal na CPUs ngunit gagamit ng higit na mapagkukunan ng system sa pangkalahatang. Ito ay negatibong epekto sa pagganap sa mas mabilis na CPUs."
+QueueSize="Queue Size"
+QueueSize.Description="I-queue itong maraming frames para sa encoder na bagi i-attemp na i-retrieve ang packets. Isang mas mataas na halaga ay nagpapakilala ng higit na latency habang ang isang mas mababang halaga ay maaaring maging sanhi ng overload na encoding. Hindi inirerekumenda na baguhin ito mula sa default."
+View="View Mode"
+View.Description="Anong ari-arian ang dapat malaman?\nSa paggamit ng '\@ View.Master \@ ay mawawalan ng karapatan sa iyo mula sa pagtanggap ng suporta."
+View.Basic="Basic"
+View.Advanced="Advanced"
+View.Expert="Dalubhasa"
+View.Master="Master"
+Debug="Debug"
+Debug.Description="Pinagan ang karagdagamg Debug na mga mensahi. Kinakailangan na ipatakbo ang Open Broadcaster Software Studio command line '--verbose --log_unfiltered' (alisin ang ')."
+AMF.H264.MaximumLTRFrames="Pinakamataas na LTR Frames"
+AMF.H264.MaximumLTRFrames.Description="Ang Long Term Reference (LTR) Frames ay isang katangian na nagbibigay-daan sa encoder na i-flag ang ilang mga frame sa isang pagkakasunud-sunod bilang referencable para sa mahabang panahon.\nLTR Frames ay hindi maaaring gamitin sa B-Frames at ang encoder ay huwag paganahin ang B-Frame kung ang mga ito ay ginamit."
+AMF.H264.MaximumAccessUnitSize="Pinakamataas na Access Unit Size"
+AMF.H264.MaximumAccessUnitSize.Description="Pinakamalaking Sukat ng isang Access Unit para sa NAL."
+AMF.H264.HeaderInsertionSpacing="Header Insertion Spacing"
+AMF.H264.HeaderInsertionSpacing.Description="Ilang mga frames ay dapat na sa pagitan ng NAL headers."
+AMF.H264.WaitForTask="Maghintay sa Task"
+AMF.H264.WaitForTask.Description="Unknown, Experimental"
+AMF.H264.SlicesPerFrame="Mga slice per Frame"
+AMF.H264.SlicesPerFrame.Description="Ilang mga I-Frame slices ay dapat na iimbak na may tig-iisang frame?\nAng balyo na zero ay hinahayaan ang encoder na maghusga sa pagluipad.\nAng Intra-Refresh na pag-encode ay ginagamit sa mas mabilis na pag-playback at paghahanap."
+AMF.H264.SliceMode="Slice Mode"
+AMF.H264.SliceMode.Description="Unknown, Experimental"
+AMF.H264.MaximumSliceSize="Pinakamataas na laki ng slice"
+AMF.H264.MaximumSliceSize.Description="Unknown, Experimental"
+AMF.H264.SliceControlMode="Slice Control Mode"
+AMF.H264.SliceControlMode.Description="Unknown, Experimental"
+AMF.H264.SliceControlSize="Slice Control Size"
+AMF.H264.SliceControlSize.Description="Unknown, Experimental"
+AMF.H264.IntraRefresh.NumberOfStripes="Bilang ng Intra-Refresh B sa Stripes"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Unknown, Experimental"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-Refresh Macroblocks per Slot"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Ilang mga Macroblocks ay dapat iimbak sa iisang lalagyan?\nAng isang balyo ng 0 ay hindi pinapagana ang katangian na ito.\nNintra-Refresh na encoding ay ginagamit para sa mas mabilis na pag-playback at paghahanap."
+

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

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

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

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/zh-CN.ini Added

@@ -0,0 +1,179 @@
+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"
+Usage="使用"
+Usage.Description="AMF 应调整为什么用法:\n-'\@Usage.Transcoding\@' 是通用转码(推荐),\n- '\@Usage.UltraLowLatency\@' 用于真正低延迟编码,\n-'\@Usage.LowLatency\@' 类似于上面稍高的延迟.\n 推流仅支持 '\@Usage.Transcoding\@', 所有其他值可以用于录制."
+Usage.Transcoding="转码"
+Usage.UltraLowLatency="超低延迟"
+Usage.LowLatency="低延迟"
+Usage.Webcam="网络摄像头"
+QualityPreset="质量预设"
+QualityPreset.Description="质量预设 AMF 应尝试向目标:\n-'\@QualityPreset.Speed\@' 是最快但最差的质量,\n-'\@QualityPreset.Balanced\@' 是平衡两者的混合,\n-'\@QualityPreset.Quality\@' 给出了最好的质量为给定的比特率."
+QualityPreset.Speed="速度"
+QualityPreset.Balanced="平衡"
+QualityPreset.Quality="质量"
+Profile="配置文件"
+Profile.Description="配置文件的编码是从最佳支持(顶部) 到最好的质量(底部) 排序。"
+ProfileLevel="配置等级"
+ProfileLevel.Description="要使用哪些配置文件级别. 最好设置在 \@Utility.Automatic\@."
+Tier="层"
+Tier.Description="要在编码在哪一层. '高' 目标高的比特率/带宽使用, 而 '主' 针对主流媒体."
+AspectRatio="长宽比"
+AspectRatio.Description="哪个长宽比应写入输出文件."
+CodingType="编码类型"
+CodingType.Description="使用哪种编码类型:\n* '\@Utility.Automatic\@' 让 AMF 决定(推荐).\n* 'CALVC'(上下文自适应可变长度编码) 速度更快但是更大.\n* 'CABAC'(上下文自适应二进制算术编码)速度更慢, 但是更小."
+MaximumReferenceFrames="最大参考帧"
+MaximumReferenceFrames.Description="在大多数编码时多少帧编码器可能会引用, 对编码质量有直接影响."
+RateControlMethod="速率控制方法"
+RateControlMethod.Description="应该使用什么比率控制方法:\n- '\@RateControlMethod.CQP\@' 赋值固定的 I/P/B 帧 QP(量化参数) 值,\n- '\@RateControlMethod.CBR\@' 保持在一个给定的目标比特率(使用过滤数据)(推荐用于推流),\n- '\@RateControlMethod.VBR\@' 保持在给定的峰值比特率以下,\n- '\@RateControlMethod.VBRLAT\@' 保持接近目标比特率如果 GPU 延迟和负载, 否则将会使用更高的比特率(推荐用于录制)."
+RateControlMethod.CQP="恒定 QP (CQP)"
+RateControlMethod.CBR="固定比特率 (CBR)"
+RateControlMethod.VBR="变比特率 (峰值约束) (VBR)"
+RateControlMethod.VBRLAT="变比特率 (延迟约束) (VBR_LAT)"
+PrePassMode="前通模式"
+PrePassMode.Description="前通是次选的比特率发行通过, 允许更好发行在一个序列内的比特率, 然而效果可能会随着不同的卡而不同."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (四分之一大小)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (半尺寸)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (全尺寸)"
+Bitrate.Target="目标比特率"
+Bitrate.Target.Description="尝试在整个序列中获取的比特率."
+Bitrate.Peak="峰值比特率"
+Bitrate.Peak.Description="尝试在整个序列中最大获取的比特率."
+QP.IFrame="I 帧 QP"
+QP.IFrame.Description="用于 I 帧的固定的 QP 值."
+QP.PFrame="P 帧 QP"
+QP.PFrame.Description="用于 P 帧的固定 QP 值."
+QP.BFrame="B 帧 QP"
+QP.BFrame.Description="用于 B 帧的固定的 QP 值."
+QP.Minimum="最低 QP"
+QP.Minimum.Description="在一个 I 帧中使用的最低 QP 值."
+QP.IFrame.Minimum="最小 I-帧 QP"
+QP.IFrame.Minimum.Description="在一个 I 帧中使用的最低 QP 值."
+QP.PFrame.Minimum="最小 I-帧 QP"
+QP.PFrame.Minimum.Description="在一个 P 帧中使用的最低 QP 值."
+QP.Maximum="最高 QP"
+QP.Maximum.Description="在一个帧中使用的最高 QP 值."
+QP.IFrame.Maximum="最大 I-帧 QP"
+QP.IFrame.Maximum.Description="在一个 I 帧中使用的最高 QP 值."
+QP.PFrame.Maximum="最大的 P 帧 QP"
+QP.PFrame.Maximum.Description="在一个 P 帧中使用的最高 QP 值."
+FillerData="填充数据"
+FillerData.Description="启用填充数据允许编码器至少保持 \@Bitrate.Target\@, 通过填满空信息序列中的剩余空间."
+FrameSkipping="跳过的帧"
+FrameSkipping.Description="跳过的帧允许编码器下丢帧, 以满足\@Bitrate.Target\@ 要求.\n当编码器丢帧时, 它反而插入一个重复最后一帧的 NAL 到流中.\n可以帮助非常低的\@Bitrate.Target\@."
+FrameSkipping.Period="跳过帧周期"
+FrameSkipping.Period.Description="跳过帧之间的间隔(以帧). 这个用来仿真比 OBS 设置的低的帧率同时仍然有一个合法的流."
+FrameSkipping.Behaviour="跳帧行为"
+FrameSkipping.Behaviour.Description="定义跳帧的处理方式."
+FrameSkipping.SkipNth="跳过每第 N 帧"
+FrameSkipping.KeepNth="保持每第 N 帧"
+VBAQ="VBAQ"
+VBAQ.Description="启用'基于方差的自适应量化'(VBAQ), 基于像素的方差来更好地区分比特率.\n他基于原理人类的视觉系统是对高纹理的物体不敏感, 因而将推动比特率来实现更平滑的界面.\n启用这个可能会导致某些内容的主观质量的改善."
+EnforceHRD="强制 HRD"
+EnforceHRD.Description="强制使用假设的参考解码器, 用于验证输出码流是否正确."
+VBVBuffer="VBV 缓存"
+VBVBuffer.Description="应使用什么方法来确定 VBV 缓冲区大小:\n-'\@Utlity.Automatic\@' 计算使用严格约束的大小,\n- '\@Utlity.Manual\@' 允许用户控制大小.\nVBV缓存 (视频缓冲程序验证程序) 用于某些率控制方法来保持整体的比特率在给定的约束内."
+VBVBuffer.Strictness="VBV 缓存规范性"
+VBVBuffer.Strictness.Description="决定 VBV 缓存的严格性, 100% 表示尽可能严格, 0% 表示无限制."
+VBVBuffer.Size="VBV 缓存大小"
+VBVBuffer.Size.Description="用于在一个序列中的控制比特率的 VBV 缓存的大小."
+VBVBuffer.InitialFullness="VBV 缓冲区初始满"
+VBVBuffer.InitialFullness.Description="VBV 缓存最初应该多满(百分比), 将只会影响最初的序列的编码."
+Interval.Keyframe="关键帧间隔"
+Interval.Keyframe.Description="关键帧之间间隔(以秒为单位)."
+Period.IDR.H264="IDR 周期 (以帧)"
+Period.IDR.H264.Description="定义瞬时解码刷新 (IDR) 的距离以帧为单位."
+Period.IDR.H265="IDR 周期 (以 GOP 为单位)"
+Period.IDR.H265.Description="定义瞬时解码刷新 (IDR) 的距离以 GOP 为单位."
+Interval.IFrame="关键帧间隔"
+Interval.IFrame.Description="I 帧间隔 (以秒为单位). I 帧覆盖 P 帧和 B 帧."
+Period.IFrame="关键帧周期 (以帧)"
+Period.IFrame.Description="I 帧间隔 (以帧为单位). I 帧覆盖 P 帧和 B 帧."
+Interval.PFrame="P 帧间隔"
+Interval.PFrame.Description="P 帧间隔 (以秒为单位). P 帧覆盖 B 帧."
+Period.PFrame="P 帧周期 (以帧为单位)"
+Period.PFrame.Description="P 帧之间距离 (以帧为单位). P 帧覆盖 B 帧."
+Interval.BFrame="B 帧间隔"
+Interval.BFrame.Description="B 帧之间间隔(以秒为单位)."
+Period.BFrame="B 帧间隔(以帧)"
+Period.BFrame.Description="B 帧直接的距离(以帧)."
+GOP.Type="GOP 类型"
+GOP.Type.Description="应使用哪种类型的 GOP:\n-'\@GOP.Type.Fixed\@' 将始终使用固定的每个 GOP 之间的距离之.\n-'\@GOP.Type.Variable\@' 允许 GOPs 为不同值, 取决于什么是需要的.\n'\@GOP.Type.Fixed\@' 是 H264 实现如何工作和最好的本地网络推流, 而 '\@GOP.Type.Variable\@' 是最适合低大小高品质的录像."
+GOP.Type.Fixed="固定的"
+GOP.Type.Variable="可变的"
+GOP.Size="GOP 大小"
+GOP.Size.Description="帧中最大的 GOP (Group Of Pictures) 大小"
+GOP.Size.Minimum="GOP 大小最小值"
+GOP.Size.Minimum.Description="帧中最小的 GOP (Group Of Pictures) 大小"
+GOP.Size.Maximum="GOP 大小最大值"
+GOP.Size.Maximum.Description="帧中最大的 GOP (Group Of Pictures) 大小"
+GOP.Alignment="GOP 对齐"
+GOP.Alignment.Description="实验, 效果是未知. 使用风险由自己负责."
+BFrame.Pattern="B 帧模式"
+BFrame.Pattern.Description="在编码时使用多少 B 帧.\n2 代和 3 代 VCE 卡支持. 对编码性能有负面影响."
+BFrame.DeltaQP="B 帧差值 QP"
+BFrame.DeltaQP.Description="对于非参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
+BFrame.Reference="B 帧参考"
+BFrame.Reference.Description="允许 B 帧也使用 B 帧作为参考, 而不是只是 P 和 I 帧."
+BFrame.ReferenceDeltaQP="B 帧参考差值 QP"
+BFrame.ReferenceDeltaQP.Description="对于参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
+DeblockingFilter="去块滤波"
+DeblockingFilter.Description="允许解码器申请去块滤波器."
+MotionEstimation="移动侦测"
+MotionEstimation.Description="运动侦测允许编码器通过预测一个像素去了哪里来降低需要的比特率."
+MotionEstimation.Quarter="四分之一像素"
+MotionEstimation.Half="半像素"
+MotionEstimation.Full="四分之一 & 半像素"
+Video.API="视频的 API"
+Video.API.Description="后端应使用什么 API?"
+Video.Adapter="视频适配器"
+Video.Adapter.Description="我们应该尝试在什么适配器上编码?"
+OpenCL.Transfer="OpenCL 转移"
+OpenCL.Transfer.Description="使用 OpenCL 来传输帧而不是映射内存. 当 GPU 被使用时, 通过 OpenCL 转移相比通过映射内存传输更少分散."
+OpenCL.Conversion="OpenCL 转换"
+OpenCL.Conversion.Description="使用 OpenCL 转换在 GPU 上的帧而不是 DirectCompute."
+MultiThreading="多线程"
+MultiThreading.Description="使用多个线程来处理提交帧和检索数据包. 这有助于在较慢的 CPU 上, 但将为整体的系统资源使用. 它将对更快的 CPU 的性能产生负面影响."
+QueueSize="队列大小"
+QueueSize.Description="在尝试检索数据包之前, 为编码器查询这些多个帧. 较高的值引入更多的延迟, 同时较低的值可能会导致超载编码. 不推荐更改此默认值."
+View="查看模式"
+View.Description="应显示哪些属性?\n使用 '\@View.Master\@' 会使你丧失获得技术支持的资格."
+View.Basic="基本"
+View.Advanced="高级"
+View.Expert="专家"
+View.Master="主"
+Debug="调试"
+Debug.Description="启用额外的调试消息. 需要你用 '--verbose --log_unfiltered'(删掉') 命令行运行打开OBS。"
+AMF.H264.MaximumLTRFrames="最大的 LTR 帧"
+AMF.H264.MaximumLTRFrames.Description="长期参考帧(LTR) 是一个特性允许编码器来标记在一个序列的一些帧作为参考帧一段时间.\nLTR 帧不能和 B 帧一起使用并且如果使用 LTR 帧, 编码器会禁用 B 帧."
+AMF.H264.MaximumAccessUnitSize="最大访问单元大小"
+AMF.H264.MaximumAccessUnitSize.Description="一个 NAL 的访问单元的最大大小. 值 0 允许编码器挑选最好的一个."
+AMF.H264.HeaderInsertionSpacing="头部插入空白"
+AMF.H264.HeaderInsertionSpacing.Description="NAL 头之间应该多少帧. 不推荐改为非零(自动) 值."
+AMF.H264.WaitForTask="等待任务"
+AMF.H264.WaitForTask.Description="未知, 实验"
+AMF.H264.SlicesPerFrame="每帧的切片数"
+AMF.H264.SlicesPerFrame.Description="每个帧应该和多少 I 帧切片一起存储?\n0 值让编码器运行时决定.\n内部刷新编码用于更快的回放和定位."
+AMF.H264.SliceMode="切片模式"
+AMF.H264.SliceMode.Description="未知, 实验"
+AMF.H264.MaximumSliceSize="最大切片大小"
+AMF.H264.MaximumSliceSize.Description="未知, 实验"
+AMF.H264.SliceControlMode="切片控制模式"
+AMF.H264.SliceControlMode.Description="未知, 实验"
+AMF.H264.SliceControlSize="切片控制大小"
+AMF.H264.SliceControlSize.Description="未知, 实验"
+AMF.H264.IntraRefresh.NumberOfStripes="帧内刷新的条纹的数目"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="未知, 实验"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="每个插槽的帧内刷新宏"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="每个槽应该和多少宏块一起存储?\n0 值让编码器在运行时决定.\n帧内刷新编码用于更快的回放和定位."
+

obs-studio-22.0.1.tar.xz/plugins/enc-amf/resources/locale/zh-TW.ini Changed

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source Added

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/amf-capabilities.cpp Added

@@ -0,0 +1,128 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "amf-capabilities.h"
+#include "utility.h"
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+
+#pragma region Singleton
+
+static CapabilityManager* __instance;
+static std::mutex         __instance_mutex;
+void                      Plugin::AMD::CapabilityManager::Initialize()
+{
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (!__instance)
+		__instance = new CapabilityManager();
+}
+
+CapabilityManager* Plugin::AMD::CapabilityManager::Instance()
+{
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	return __instance;
+}
+
+void Plugin::AMD::CapabilityManager::Finalize()
+{
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (__instance)
+		delete __instance;
+	__instance = nullptr;
+}
+#pragma endregion Singleton
+
+Plugin::AMD::CapabilityManager::CapabilityManager()
+{
+	// Potential fix for unintended crashes by AMD including asserts in release builds.
+	AMD::AMF::Instance()->EnableDebugTrace(false);
+
+	// Key order: API, Adapter, Codec
+	for (auto api : API::EnumerateAPIs()) {
+		PLOG_DEBUG("[Capability Manager] Testing %s API...", api->GetName().c_str());
+		for (auto adapter : api->EnumerateAdapters()) {
+			std::pair<Codec, bool> test_codecs[] = {
+				std::make_pair(Codec::AVC, false),
+				std::make_pair(Codec::HEVC, false),
+			};
+
+			for (auto& codec : test_codecs) {
+				try {
+					std::unique_ptr<AMD::Encoder> enc;
+
+					if (codec.first == Codec::AVC || codec.first == Codec::SVC) {
+						enc = std::make_unique<AMD::EncoderH264>(api, adapter);
+					} else if (codec.first == Codec::HEVC) {
+						enc = std::make_unique<AMD::EncoderH265>(api, adapter);
+					}
+
+					if (enc != nullptr) {
+						codec.second = true;
+					}
+				} catch (const std::exception& e) {
+					PLOG_DEBUG("[Capability Manager] Testing %s Adapter '%s' with codec %s failed, reason: %s",
+							   api->GetName().c_str(), adapter.Name.c_str(), Utility::CodecToString(codec.first),
+							   e.what());
+#ifdef LITE_OBS
+					e;
+#endif
+				}
+
+				std::tuple<API::Type, API::Adapter, AMD::Codec> key =
+					std::make_tuple(api->GetType(), adapter, codec.first);
+				m_CapabilityMap[key] = codec.second;
+			}
+
+			PLOG_INFO(
+				"[Capability Manager] Testing %s Adapter '%s':\n"
+				"  %s: %s\n"
+				"  %s: %s\n",
+				api->GetName().c_str(), adapter.Name.c_str(), Utility::CodecToString(test_codecs[0].first),
+				test_codecs[0].second ? "Supported" : "Not Supported", Utility::CodecToString(test_codecs[1].first),
+				test_codecs[1].second ? "Supported" : "Not Supported");
+		}
+	}
+}
+
+Plugin::AMD::CapabilityManager::~CapabilityManager() {}
+
+bool Plugin::AMD::CapabilityManager::IsCodecSupported(AMD::Codec codec)
+{
+	for (auto api : API::EnumerateAPIs()) {
+		if (IsCodecSupportedByAPI(codec, api->GetType()))
+			return true;
+	}
+	return false;
+}
+
+bool Plugin::AMD::CapabilityManager::IsCodecSupportedByAPI(AMD::Codec codec, API::Type type)
+{
+	auto api = API::GetAPI(type);
+	for (auto adapter : api->EnumerateAdapters()) {
+		if (IsCodecSupportedByAPIAdapter(codec, type, adapter) == true)
+			return true;
+	}
+	return false;
+}
+
+bool Plugin::AMD::CapabilityManager::IsCodecSupportedByAPIAdapter(AMD::Codec codec, API::Type api, API::Adapter adapter)
+{
+	return m_CapabilityMap[std::make_tuple(api, adapter, codec)];
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/amf-encoder-h264.cpp Added

@@ -0,0 +1,1659 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <inttypes.h>
+#include "amf-encoder-h264.h"
+#include "utility.h"
+
+#define PREFIX "[H264]<Id: %lld> "
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+using namespace Utility;
+
+Plugin::AMD::EncoderH264::EncoderH264(std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+									  bool useOpenCLSubmission, bool useOpenCLConversion, ColorFormat colorFormat,
+									  ColorSpace colorSpace, bool fullRangeColor, bool useAsyncQueue,
+									  size_t asyncQueueSize)
+	: Encoder(Codec::AVC, videoAPI, videoAdapter, useOpenCLSubmission, useOpenCLConversion, colorFormat, colorSpace,
+			  fullRangeColor, useAsyncQueue, asyncQueueSize)
+{
+	AMFTRACECALL;
+	this->SetUsage(Usage::Transcoding);
+
+	if (m_AMF->GetRuntimeVersion() < AMF_MAKE_FULL_VERSION(1, 4, 0, 0)) {
+		// Support for 1.3.x drivers.
+		AMF_RESULT res = res = m_AMFEncoder->SetProperty(L"NominalRange", m_FullColorRange);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Failed to set encoder color range, error %ls (code %d)", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+		}
+	} else {
+		AMF_RESULT res = res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FULL_RANGE_COLOR, m_FullColorRange);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Failed to set encoder color range, error %ls (code %d)", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+		}
+	}
+}
+
+Plugin::AMD::EncoderH264::~EncoderH264()
+{
+	AMFTRACECALL;
+}
+
+// Properties - Initialization
+std::vector<Usage> Plugin::AMD::EncoderH264::CapsUsage()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_USAGE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Usage> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::UsageFromAMFH264((AMF_VIDEO_ENCODER_USAGE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetUsage(Usage v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_USAGE, Utility::UsageToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::UsageToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Usage Plugin::AMD::EncoderH264::GetUsage()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_USAGE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::UsageFromAMFH264((AMF_VIDEO_ENCODER_USAGE_ENUM)e);
+}
+
+// Properties - Static
+std::vector<QualityPreset> Plugin::AMD::EncoderH264::CapsQualityPreset()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QUALITY_PRESET, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<QualityPreset> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::QualityPresetFromAMFH264((AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetQualityPreset(QualityPreset v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, Utility::QualityPresetToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::QualityPresetToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::QualityPreset Plugin::AMD::EncoderH264::GetQualityPreset()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::QualityPresetFromAMFH264((AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM)e);
+}
+
+#ifndef LITE_OBS
+std::vector<Profile> Plugin::AMD::EncoderH264::CapsProfile()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PROFILE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Profile> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::ProfileFromAMFH264((AMF_VIDEO_ENCODER_PROFILE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetProfile(Profile v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE, Utility::ProfileToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::ProfileToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Profile Plugin::AMD::EncoderH264::GetProfile()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PROFILE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::ProfileFromAMFH264((AMF_VIDEO_ENCODER_PROFILE_ENUM)e);
+}
+
+std::vector<ProfileLevel> Plugin::AMD::EncoderH264::CapsProfileLevel()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PROFILE_LEVEL, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<ProfileLevel> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back((ProfileLevel)enm->value);
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetProfileLevel(ProfileLevel v)
+{
+	AMFTRACECALL;
+
+	if (v == ProfileLevel::Automatic)
+		v = Utility::H264ProfileLevel(m_Resolution, m_FrameRate);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, (int64_t)v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+void Plugin::AMD::EncoderH264::SetProfileLevel(ProfileLevel v, std::pair<uint32_t, uint32_t> r,
+											   std::pair<uint32_t, uint32_t> h)
+{
+	AMFTRACECALL;
+
+	if (v == ProfileLevel::Automatic)
+		v = Utility::H264ProfileLevel(r, h);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, (int64_t)v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::ProfileLevel Plugin::AMD::EncoderH264::GetProfileLevel()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (ProfileLevel)e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsMaximumReferenceFrames()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MAX_NUM_REFRAMES, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetMaximumReferenceFrames(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_NUM_REFRAMES, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH264::GetMaximumReferenceFrames()
+{
+	AMFTRACECALL;
+
+	uint64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_NUM_REFRAMES, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(
+			errMsg, __FUNCTION_NAME__ PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> Plugin::AMD::EncoderH264::CapsResolution()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_FRAMESIZE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(std::make_pair(var->minValue.sizeValue.width, var->maxValue.sizeValue.width),
+						  std::make_pair(var->minValue.sizeValue.height, var->maxValue.sizeValue.height));
+}
+
+void Plugin::AMD::EncoderH264::SetResolution(std::pair<uint32_t, uint32_t> v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, ::AMFConstructSize(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ldx%ld, error %ls (code %d)",
+							 m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_Resolution.first  = v.first;
+	m_Resolution.second = v.second;
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::GetResolution()
+{
+	AMFTRACECALL;
+
+	AMFSize e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_Resolution.first  = e.width;
+	m_Resolution.second = e.height;
+	return std::make_pair(e.width, e.height);
+}
+
+void Plugin::AMD::EncoderH264::SetAspectRatio(std::pair<uint32_t, uint32_t> v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ASPECT_RATIO, ::AMFConstructRatio(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld:%ld, error %ls (code %d)",
+							 m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::GetAspectRatio()
+{
+	AMFTRACECALL;
+
+	AMFRatio e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ASPECT_RATIO, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return std::make_pair(e.num, e.den);
+}
+
+void Plugin::AMD::EncoderH264::SetFrameRate(std::pair<uint32_t, uint32_t> v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMERATE, ::AMFConstructRate(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld/%ld, error %ls (code %d)",
+							 m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_FrameRate = std::make_pair(v.first, v.second);
+	UpdateFrameRateValues();
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::GetFrameRate()
+{
+	AMFTRACECALL;
+
+	AMFRate e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Unable to retrieve value, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_FrameRate = std::make_pair(e.num, e.den);
+	UpdateFrameRateValues();
+	return m_FrameRate;
+}
+
+std::vector<CodingType> Plugin::AMD::EncoderH264::CapsCodingType()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_CABAC_ENABLE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<CodingType> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::CodingTypeFromAMFH264((AMF_VIDEO_ENCODER_CODING_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetCodingType(CodingType v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, Utility::CodingTypeToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::CodingTypeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::CodingType Plugin::AMD::EncoderH264::GetCodingType()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Unable to retrieve value, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::CodingTypeFromAMFH264((AMF_VIDEO_ENCODER_CODING_ENUM)e);
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::CapsMaximumLongTermReferenceFrames()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetMaximumLongTermReferenceFrames(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH264::GetMaximumLongTermReferenceFrames()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+// Properties - Dynamic
+std::vector<RateControlMethod> Plugin::AMD::EncoderH264::CapsRateControlMethod()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<RateControlMethod> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::RateControlMethodFromAMFH264((AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetRateControlMethod(RateControlMethod v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res =
+		m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, Utility::RateControlMethodToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::RateControlMethodToString(v), m_AMF->GetTrace()->GetResultText(res),
+							 res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::RateControlMethod Plugin::AMD::EncoderH264::GetRateControlMethod()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::RateControlMethodFromAMFH264((AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM)e);
+}
+
+std::vector<PrePassMode> Plugin::AMD::EncoderH264::CapsPrePassMode()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<PrePassMode> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::PrePassModeFromAMFH264((AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetPrePassMode(PrePassMode v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res =
+		m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE, Utility::PrePassModeToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::PrePassModeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::PrePassMode Plugin::AMD::EncoderH264::GetPrePassMode()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Unable to retrieve value, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::PrePassModeFromAMFH264((AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)e);
+}
+
+void Plugin::AMD::EncoderH264::SetVarianceBasedAdaptiveQuantizationEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENABLE_VBAQ, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsVarianceBasedAdaptiveQuantizationEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENABLE_VBAQ, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetFrameSkippingEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsFrameSkippingEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetEnforceHRDEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsEnforceHRDEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetFillerDataEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsFillerDataEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsQPMinimum()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MIN_QP, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetQPMinimum(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MIN_QP, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH264::GetQPMinimum()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MIN_QP, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsQPMaximum()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_MAX_QP, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetQPMaximum(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_QP, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH264::GetQPMaximum()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_QP, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsTargetBitrate()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_TARGET_BITRATE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetTargetBitrate(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH264::GetTargetBitrate()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsPeakBitrate()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PEAK_BITRATE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetPeakBitrate(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH264::GetPeakBitrate()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsIFrameQP()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QP_I, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetIFrameQP(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_I, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH264::GetIFrameQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_I, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsPFrameQP()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QP_P, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetPFrameQP(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_P, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH264::GetPFrameQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_P, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH264::CapsBFrameQP()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QP_B, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetBFrameQP(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_B, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH264::GetBFrameQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_B, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+void Plugin::AMD::EncoderH264::SetMaximumAccessUnitSize(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH264::GetMaximumAccessUnitSize()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH264::CapsVBVBufferSize()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetVBVBufferSize(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH264::GetVBVBufferSize()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetVBVBufferInitialFullness(double v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_INITIAL_VBV_BUFFER_FULLNESS, (int64_t)(v * 64));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %lf (%d), error %ls (code %d)",
+							 m_UniqueId, v, (uint8_t)(v * 64), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+float Plugin::AMD::EncoderH264::GetInitialVBVBufferFullness()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INITIAL_VBV_BUFFER_FULLNESS, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (e / 64.0f);
+}
+
+// Properties - Picture Control
+void Plugin::AMD::EncoderH264::SetIDRPeriod(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, (int64_t)clamp(v, 1, 1000000));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_PeriodIDR = v;
+}
+
+uint32_t Plugin::AMD::EncoderH264::GetIDRPeriod()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_PeriodIDR = (uint32_t)e;
+	return m_PeriodIDR;
+}
+
+void Plugin::AMD::EncoderH264::SetHeaderInsertionSpacing(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEADER_INSERTION_SPACING, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH264::GetHeaderInsertionSpacing()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEADER_INSERTION_SPACING, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+void Plugin::AMD::EncoderH264::SetGOPAlignmentEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"EnableGOPAlignment", v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsGOPAlignmentEnabled()
+{
+	AMFTRACECALL;
+
+	bool       e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"EnableGOPAlignment", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetDeblockingFilterEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsDeblockingFilterEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+uint8_t Plugin::AMD::EncoderH264::CapsBFramePattern()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return (uint8_t)var->maxValue.int64Value;
+}
+
+void Plugin::AMD::EncoderH264::SetBFramePattern(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_TimestampOffset = v;
+}
+
+uint8_t Plugin::AMD::EncoderH264::GetBFramePattern()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+void Plugin::AMD::EncoderH264::SetBFrameDeltaQP(int8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QP_B, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+int8_t Plugin::AMD::EncoderH264::GetBFrameDeltaQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (int8_t)e;
+}
+
+void Plugin::AMD::EncoderH264::SetBFrameReferenceEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsBFrameReferenceEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetBFrameReferenceDeltaQP(int8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+int8_t Plugin::AMD::EncoderH264::GetBFrameReferenceDeltaQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (int8_t)e;
+}
+
+// Properties - Motion Estimation
+void Plugin::AMD::EncoderH264::SetMotionEstimationQuarterPixelEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MOTION_HALF_PIXEL, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsMotionEstimationQuarterPixelEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MOTION_HALF_PIXEL, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH264::SetMotionEstimationHalfPixelEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MOTION_QUARTERPIXEL, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH264::IsMotionEstimationHalfPixelEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MOTION_QUARTERPIXEL, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+// Properties - Intra-Refresh
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH264::CapsIntraRefreshNumMBsPerSlot()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH264::SetIntraRefreshNumMBsPerSlot(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH264::GetIntraRefreshNumMBsPerSlot()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+void Plugin::AMD::EncoderH264::SetIntraRefreshNumOfStripes(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"IntraRefreshNumOfStripes", (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH264::GetIntraRefreshNumOfStripes()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"IntraRefreshNumOfStripes", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+// Internal
+void Plugin::AMD::EncoderH264::PacketPriorityAndKeyframe(amf::AMFDataPtr& pData, struct encoder_packet* packet)
+{
+	AMFTRACECALL;
+	uint64_t pktType;
+	pData->GetProperty(AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE, &pktType);
+	switch ((AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_ENUM)pktType) {
+	case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_IDR:
+		packet->keyframe = true;
+	case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_I:
+		packet->priority = 3;
+		break;
+	case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_P:
+		packet->priority = 2;
+		break;
+	case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_B:
+		packet->priority = 0;
+		break;
+	}
+}
+
+AMF_RESULT Plugin::AMD::EncoderH264::GetExtraDataInternal(amf::AMFVariant* p)
+{
+	AMFTRACECALL;
+	return m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_EXTRADATA, p);
+}
+
+std::string Plugin::AMD::EncoderH264::HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index)
+{
+	AMF_VIDEO_ENCODER_PICTURE_TYPE_ENUM type = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
+
+	if ((m_PeriodBFrame > 0) && ((index % m_PeriodBFrame) == 0)) {
+		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_B;
+	}
+	if ((m_PeriodPFrame > 0) && ((index % m_PeriodPFrame) == 0)) {
+		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_P;
+	}
+	if ((m_PeriodIFrame > 0) && ((index % m_PeriodIFrame) == 0)) {
+		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_I;
+	}
+	if ((type != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE) && (m_PeriodIDR > 0) && ((index % m_PeriodIDR) == 0)) {
+		type = AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR;
+	}
+	if (m_FrameSkipPeriod > 0) {
+		bool shouldSkip = m_FrameSkipKeepOnlyNth ? (index % m_FrameSkipPeriod) != 0 : (index % m_FrameSkipPeriod) == 0;
+
+		if (shouldSkip) {
+			if ((m_FrameSkipType <= AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP) || (type < m_FrameSkipType))
+				m_FrameSkipType = type;
+			type = AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP;
+		} else if (m_FrameSkipType != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE) {
+			type            = m_FrameSkipType; // Hopefully fixes the crash.
+			m_FrameSkipType = AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE;
+		}
+	}
+	if (type != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE)
+		d->SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, type);
+
+	switch (type) {
+	case AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE:
+		return "Automatic";
+		break;
+	case AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP:
+		return "Skip";
+		break;
+	case AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR:
+		return "IDR";
+		break;
+	case AMF_VIDEO_ENCODER_PICTURE_TYPE_I:
+		return "I";
+		break;
+	case AMF_VIDEO_ENCODER_PICTURE_TYPE_P:
+		return "P";
+		break;
+	case AMF_VIDEO_ENCODER_PICTURE_TYPE_B:
+		return "B";
+		break;
+	}
+	return "Unknown";
+}
+
+void Plugin::AMD::EncoderH264::LogProperties()
+{
+	AMFTRACECALL;
+
+	PLOG_INFO(PREFIX "Encoder Parameters:", m_UniqueId);
+#pragma region Backend
+	PLOG_INFO(PREFIX "  Backend:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Video API: %s", m_UniqueId, m_API->GetName().c_str());
+	PLOG_INFO(PREFIX "    Video Adapter: %s", m_UniqueId, m_APIAdapter.Name.c_str());
+	PLOG_INFO(PREFIX "    OpenCL: %s", m_UniqueId, m_OpenCL ? "Supported" : "Not Supported");
+	PLOG_INFO(PREFIX "      Transfer: %s", m_UniqueId, m_OpenCLSubmission ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "      Conversion: %s", m_UniqueId, m_OpenCLConversion ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Multi-Threading: %s", m_UniqueId, m_MultiThreading ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Queue Size: %" PRIu32, m_UniqueId, (uint32_t)GetQueueSize());
+#pragma endregion Backend
+#pragma region    Frame
+    PLOG_INFO(PREFIX "  Frame:", m_UniqueId);
+    PLOG_INFO(PREFIX "    Format: %s %s %s", m_UniqueId, Utility::ColorFormatToString(m_ColorFormat),
+              Utility::ColorSpaceToString(m_ColorSpace), m_FullColorRange ? "Full" : "Partial");
+    PLOG_INFO(PREFIX "    Resolution: %" PRIu32 "x%" PRIu32, m_UniqueId, m_Resolution.first, m_Resolution.second);
+    PLOG_INFO(PREFIX "    Frame Rate: %" PRIu32 "/%" PRIu32, m_UniqueId, m_FrameRate.first, m_FrameRate.second);
+    auto aspectRatio = GetAspectRatio();
+    PLOG_INFO(PREFIX "    Aspect Ratio: %" PRIu32 ":%" PRIu32, m_UniqueId, aspectRatio.first, aspectRatio.second);
+#pragma endregion Frame
+#pragma region    Static
+    PLOG_INFO(PREFIX "  Static:", m_UniqueId);
+    PLOG_INFO(PREFIX "    Usage: %s", m_UniqueId, Utility::UsageToString(GetUsage()));
+    PLOG_INFO(PREFIX "    Quality Preset: %s", m_UniqueId, Utility::QualityPresetToString(GetQualityPreset()));
+    auto profileLevel = static_cast<uint16_t>(GetProfileLevel());
+    PLOG_INFO(PREFIX "    Profile: %s %" PRIu16 ".%" PRIu16, m_UniqueId, Utility::ProfileToString(GetProfile()),
+              profileLevel / 10, profileLevel % 10);
+    PLOG_INFO(PREFIX "    Coding Type: %s", m_UniqueId, Utility::CodingTypeToString(GetCodingType()));
+    PLOG_INFO(PREFIX "    Max. Reference Frames: %" PRIu16, m_UniqueId, (uint16_t)GetMaximumReferenceFrames());
+    PLOG_INFO(PREFIX "    Max. Long-Term Reference Frames: %" PRIu16, m_UniqueId,
+              (uint16_t)GetMaximumLongTermReferenceFrames());
+#pragma endregion Static
+#pragma region Rate Control
+	PLOG_INFO(PREFIX "  Rate Control:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Method: %s", m_UniqueId, Utility::RateControlMethodToString(GetRateControlMethod()));
+	PLOG_INFO(PREFIX "    Pre-Pass Mode: %s", m_UniqueId, Utility::PrePassModeToString(GetPrePassMode()));
+#pragma region QP
+	PLOG_INFO(PREFIX "    QP:", m_UniqueId);
+	PLOG_INFO(PREFIX "      Range: %" PRIu8 " - %" PRIu8, m_UniqueId, GetQPMinimum(), GetQPMaximum());
+	PLOG_INFO(PREFIX "      I-Frame: %" PRIu8, m_UniqueId, GetIFrameQP());
+	PLOG_INFO(PREFIX "      P-Frame: %" PRIu8, m_UniqueId, GetPFrameQP());
+	try {
+		PLOG_INFO(PREFIX "      B-Frame: %" PRIu8, m_UniqueId, GetBFrameQP());
+	} catch (...) {
+		PLOG_INFO(PREFIX "      B-Frame: N/A", m_UniqueId);
+	}
+#pragma endregion QP
+#pragma region    Bitrate
+    PLOG_INFO(PREFIX "    Bitrate:", m_UniqueId);
+    PLOG_INFO(PREFIX "      Target: %" PRIu64 " bit/s", m_UniqueId, GetTargetBitrate());
+    PLOG_INFO(PREFIX "      Peak: %" PRIu64 " bit/s", m_UniqueId, GetPeakBitrate());
+#pragma endregion Bitrate
+#pragma region    Flags
+    PLOG_INFO(PREFIX "    Flags:", m_UniqueId);
+    PLOG_INFO(PREFIX "      Filler Data: %s", m_UniqueId, IsFillerDataEnabled() ? "Enabled" : "Disabled");
+    PLOG_INFO(PREFIX "      Frame Skipping: %s", m_UniqueId, IsFrameSkippingEnabled() ? "Enabled" : "Disabled");
+    PLOG_INFO(PREFIX "        Period: %" PRIu32 " Frames", m_UniqueId, GetFrameSkippingPeriod());
+    PLOG_INFO(PREFIX "        Behaviour: %s", m_UniqueId,
+              GetFrameSkippingBehaviour() ? "Keep every Nth frame" : "Skip every Nth frame");
+    PLOG_INFO(PREFIX "      Variance Based Adaptive Quantization: %s", m_UniqueId,
+              IsVarianceBasedAdaptiveQuantizationEnabled() ? "Enabled" : "Disabled");
+    PLOG_INFO(PREFIX "      Enforce Hypothetical Reference Decoder: %s", m_UniqueId,
+              IsEnforceHRDEnabled() ? "Enabled" : "Disabled");
+#pragma endregion Flags
+#pragma region Video Buffering Verifier
+	PLOG_INFO(PREFIX "    Video Buffering Verfier:", m_UniqueId);
+	PLOG_INFO(PREFIX "      Buffer Size: %" PRIu64 " bits", m_UniqueId, GetVBVBufferSize());
+	PLOG_INFO(PREFIX "      Initial Fullness: %" PRIu64 " %%", m_UniqueId,
+			  (uint64_t)round(GetInitialVBVBufferFullness() * 100.0));
+#pragma endregion Video Buffering Verifier
+	PLOG_INFO(PREFIX "    Max. Access Unit Size: %" PRIu32, m_UniqueId, GetMaximumAccessUnitSize());
+#pragma endregion Rate Control
+
+#pragma region Picture Control
+	PLOG_INFO(PREFIX "  Picture Control:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Period:", m_UniqueId);
+	PLOG_INFO(PREFIX "      IDR: %" PRIu32 " Frames", m_UniqueId, GetIDRPeriod());
+	PLOG_INFO(PREFIX "      I: %" PRIu32 " Frames", m_UniqueId, GetIFramePeriod());
+	PLOG_INFO(PREFIX "      P: %" PRIu32 " Frames", m_UniqueId, GetPFramePeriod());
+	PLOG_INFO(PREFIX "      B: %" PRIu32 " Frames", m_UniqueId, GetBFramePeriod());
+	PLOG_INFO(PREFIX "    Header Insertion Spacing: %" PRIu32, m_UniqueId, GetHeaderInsertionSpacing());
+	PLOG_INFO(PREFIX "    GOP Alignment: %s", m_UniqueId, IsGOPAlignmentEnabled() ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Deblocking Filter: %s", m_UniqueId, IsDeblockingFilterEnabled() ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Motion Estimation: %s%s", m_UniqueId,
+			  IsMotionEstimationQuarterPixelEnabled() ? (IsMotionEstimationHalfPixelEnabled() ? "Quarter, " : "Quarter")
+													  : "",
+			  IsMotionEstimationHalfPixelEnabled() ? "Half" : "");
+	PLOG_INFO(PREFIX "    B-Frames:", m_UniqueId);
+	try {
+		PLOG_INFO(PREFIX "      Pattern: %" PRIu8, m_UniqueId, GetBFramePattern());
+	} catch (...) {
+		PLOG_INFO(PREFIX "      Pattern: N/A", m_UniqueId);
+	}
+	try {
+		PLOG_INFO(PREFIX "      Delta QP: %" PRIi8, m_UniqueId, GetBFrameDeltaQP());
+	} catch (...) {
+		PLOG_INFO(PREFIX "      Delta QP: N/A", m_UniqueId);
+	}
+	try {
+		PLOG_INFO(PREFIX "      Reference: %s", m_UniqueId, IsBFrameReferenceEnabled() ? "Enabled" : "Disabled");
+	} catch (...) {
+		PLOG_INFO(PREFIX "      Reference: N/A", m_UniqueId);
+	}
+	try {
+		PLOG_INFO(PREFIX "      Reference Delta QP: %" PRIi8, m_UniqueId, GetBFrameReferenceDeltaQP());
+	} catch (...) {
+		PLOG_INFO(PREFIX "      Reference Delta QP: N/A", m_UniqueId);
+	}
+#pragma endregion Picture Control
+
+#pragma region Intra - Refresh
+	PLOG_INFO(PREFIX "  Intra-Refresh:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Number of Macroblocks Per Slot: %" PRIu32, m_UniqueId, GetIntraRefreshNumMBsPerSlot());
+	PLOG_INFO(PREFIX "    Number of Stripes: %" PRIu32, m_UniqueId, GetIntraRefreshNumOfStripes());
+#pragma endregion Intra - Refresh
+}
+#endif

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/amf-encoder-h265.cpp Added

@@ -0,0 +1,1718 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <inttypes.h>
+#include "amf-encoder-h265.h"
+#include "utility.h"
+
+#define PREFIX "[H265]<Id: %lld> "
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+using namespace Utility;
+
+Plugin::AMD::EncoderH265::EncoderH265(std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+									  bool useOpenCLSubmission, bool useOpenCLConversion, ColorFormat colorFormat,
+									  ColorSpace colorSpace, bool fullRangeColor, bool useAsyncQueue,
+									  size_t asyncQueueSize)
+	: Encoder(Codec::HEVC, videoAPI, videoAdapter, useOpenCLSubmission, useOpenCLConversion, colorFormat, colorSpace,
+			  fullRangeColor, useAsyncQueue, asyncQueueSize)
+{
+	AMFTRACECALL;
+	this->SetUsage(Usage::Transcoding);
+
+	AMF_RESULT res = res = m_AMFEncoder->SetProperty(L"NominalRange", m_FullColorRange);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "Failed to set encoder color range, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+	}
+}
+
+Plugin::AMD::EncoderH265::~EncoderH265()
+{
+	AMFTRACECALL;
+}
+
+// Initialization
+std::vector<Usage> Plugin::AMD::EncoderH265::CapsUsage()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_USAGE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Usage> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::UsageFromAMFH265((AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetUsage(Usage v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_USAGE, Utility::UsageToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::UsageToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Usage Plugin::AMD::EncoderH265::GetUsage()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_USAGE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::UsageFromAMFH265((AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM)e);
+}
+
+// Static
+std::vector<QualityPreset> Plugin::AMD::EncoderH265::CapsQualityPreset()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<QualityPreset> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::QualityPresetFromAMFH265((AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetQualityPreset(QualityPreset v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res =
+		m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, Utility::QualityPresetToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::QualityPresetToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::QualityPreset Plugin::AMD::EncoderH265::GetQualityPreset()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::QualityPresetFromAMFH265((AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM)e);
+}
+
+#ifndef LITE_OBS
+std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> Plugin::AMD::EncoderH265::CapsResolution()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(std::make_pair(var->minValue.sizeValue.width, var->maxValue.sizeValue.width),
+						  std::make_pair(var->minValue.sizeValue.height, var->maxValue.sizeValue.height));
+}
+
+void Plugin::AMD::EncoderH265::SetResolution(std::pair<uint32_t, uint32_t> v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, ::AMFConstructSize(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ldx%ld, error %ls (code %d)",
+							 m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_Resolution.first  = v.first;
+	m_Resolution.second = v.second;
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetResolution()
+{
+	AMFTRACECALL;
+
+	AMFSize e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_Resolution.first  = e.width;
+	m_Resolution.second = e.height;
+	return std::make_pair(e.width, e.height);
+}
+
+void Plugin::AMD::EncoderH265::SetAspectRatio(std::pair<uint32_t, uint32_t> v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res =
+		m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ::AMFConstructRatio(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld:%ld, error %ls (code %d)",
+							 m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetAspectRatio()
+{
+	AMFTRACECALL;
+
+	AMFRatio e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return std::make_pair(e.num, e.den);
+}
+
+void Plugin::AMD::EncoderH265::SetFrameRate(std::pair<uint32_t, uint32_t> v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, ::AMFConstructRate(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld/%ld, error %ls (code %d)",
+							 m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_FrameRate = std::make_pair(v.first, v.second);
+	UpdateFrameRateValues();
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetFrameRate()
+{
+	AMFTRACECALL;
+
+	AMFRate e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMERATE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to retrieve value, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_FrameRate = std::make_pair(e.num, e.den);
+	UpdateFrameRateValues();
+	return m_FrameRate;
+}
+
+std::vector<Profile> Plugin::AMD::EncoderH265::CapsProfile()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_PROFILE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Profile> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::ProfileFromAMFH265((AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetProfile(Profile v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE, Utility::ProfileToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::ProfileToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Profile Plugin::AMD::EncoderH265::GetProfile()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::ProfileFromAMFH265((AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM)e);
+}
+
+std::vector<ProfileLevel> Plugin::AMD::EncoderH265::CapsProfileLevel()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<ProfileLevel> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back((ProfileLevel)(enm->value / 3));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetProfileLevel(ProfileLevel v)
+{
+	AMFTRACECALL;
+
+	if (v == ProfileLevel::Automatic)
+		v = Utility::H265ProfileLevel(m_Resolution, m_FrameRate);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, ((int64_t)v) * 3);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, (int64_t)v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+void Plugin::AMD::EncoderH265::SetProfileLevel(ProfileLevel v, std::pair<uint32_t, uint32_t> r,
+											   std::pair<uint32_t, uint32_t> h)
+{
+	AMFTRACECALL;
+
+	if (v == ProfileLevel::Automatic)
+		v = Utility::H265ProfileLevel(r, h);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, ((int64_t)v) * 3);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, (int64_t)v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::ProfileLevel Plugin::AMD::EncoderH265::GetProfileLevel()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_PROFILE_LEVEL, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (ProfileLevel)(e / 3);
+}
+
+std::vector<H265::Tier> Plugin::AMD::EncoderH265::CapsTier()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_TIER, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<H265::Tier> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::TierFromAMFH265((AMF_VIDEO_ENCODER_HEVC_TIER_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetTier(H265::Tier v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_TIER, Utility::TierToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::TierToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::H265::Tier Plugin::AMD::EncoderH265::GetTier()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TIER, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (H265::Tier)e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsMaximumReferenceFrames()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetMaximumReferenceFrames(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH265::GetMaximumReferenceFrames()
+{
+	AMFTRACECALL;
+
+	uint64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 __FUNCTION_NAME__ "<Id: %lld> <" __FUNCTION_NAME__
+											   "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::vector<CodingType> Plugin::AMD::EncoderH265::CapsCodingType()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_CABAC_ENABLE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<CodingType> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::CodingTypeFromAMFH265((AMF_VIDEO_ENCODER_CODING_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetCodingType(CodingType v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, Utility::CodingTypeToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::CodingTypeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::CodingType Plugin::AMD::EncoderH265::GetCodingType()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_CABAC_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to retrieve value, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::CodingTypeFromAMFH265((AMF_VIDEO_ENCODER_CODING_ENUM)e);
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::CapsMaximumLongTermReferenceFrames()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_LTR_FRAMES, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetMaximumLongTermReferenceFrames(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_LTR_FRAMES, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetMaximumLongTermReferenceFrames()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_LTR_FRAMES, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+/// Rate Control
+std::vector<RateControlMethod> Plugin::AMD::EncoderH265::CapsRateControlMethod()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<RateControlMethod> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(
+			Utility::RateControlMethodFromAMFH265((AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetRateControlMethod(RateControlMethod v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res =
+		m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, Utility::RateControlMethodToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::RateControlMethodToString(v), m_AMF->GetTrace()->GetResultText(res),
+							 res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::RateControlMethod Plugin::AMD::EncoderH265::GetRateControlMethod()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::RateControlMethodFromAMFH265((AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM)e);
+}
+
+std::vector<PrePassMode> Plugin::AMD::EncoderH265::CapsPrePassMode()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_PREANALYSIS_ENABLE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	if (var->type == amf::AMF_VARIANT_BOOL) {
+		return std::vector<PrePassMode>({PrePassMode::Disabled, PrePassMode::Enabled});
+	} else {
+		std::vector<PrePassMode> ret;
+		for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+			PLOG_ERROR("Unknown Pre-Pass Mode: %ls %lld", enm->name, enm->value);
+			//ret.push_back(Utility::PrePassModeFromAMFH265((AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)enm->value));
+		}
+		return ret;
+	}
+}
+
+void Plugin::AMD::EncoderH265::SetPrePassMode(PrePassMode v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res =
+		m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_PREANALYSIS_ENABLE, v != PrePassMode::Disabled);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, (v != PrePassMode::Disabled) ? "Enabled" : "Disabled",
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::PrePassMode Plugin::AMD::EncoderH265::GetPrePassMode()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_PREANALYSIS_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to retrieve value, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	if (e) {
+		return PrePassMode::Enabled;
+	} else {
+		return PrePassMode::Disabled;
+	}
+}
+
+void Plugin::AMD::EncoderH265::SetVarianceBasedAdaptiveQuantizationEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ENABLE_VBAQ, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsVarianceBasedAdaptiveQuantizationEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_ENABLE_VBAQ, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+/// VBV Buffer
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsVBVBufferSize()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetVBVBufferSize(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH265::GetVBVBufferSize()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH265::SetVBVBufferInitialFullness(double v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_INITIAL_VBV_BUFFER_FULLNESS, (int64_t)(v * 64));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lf (%d), error %ls (code %d)",
+							 m_UniqueId, v, (uint8_t)(v * 64), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+float Plugin::AMD::EncoderH265::GetInitialVBVBufferFullness()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_INITIAL_VBV_BUFFER_FULLNESS, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (e / 64.0f);
+}
+
+/// Picture Control
+std::vector<H265::GOPType> Plugin::AMD::EncoderH265::CapsGOPType()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(L"GOPType", &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<H265::GOPType> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::GOPTypeFromAMFH265(enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetGOPType(H265::GOPType v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPType", Utility::GOPTypeToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
+							 m_UniqueId, Utility::GOPTypeToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::H265::GOPType Plugin::AMD::EncoderH265::GetGOPType()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPType", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::GOPTypeFromAMFH265(e);
+}
+
+void Plugin::AMD::EncoderH265::SetGOPSize(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetGOPSize()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+void Plugin::AMD::EncoderH265::SetGOPSizeMin(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSizeMin", (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetGOPSizeMin()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSizeMin", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+void Plugin::AMD::EncoderH265::SetGOPSizeMax(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSizeMax", (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetGOPSizeMax()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSizeMax", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+void Plugin::AMD::EncoderH265::SetGOPAlignmentEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"EnableGOPAlignment", v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsGOPAlignmentEnabled()
+{
+	AMFTRACECALL;
+
+	bool       e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"EnableGOPAlignment", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH265::SetIDRPeriod(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_PeriodIDR = v;
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetIDRPeriod()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_PeriodIDR = (uint32_t)e;
+	return (uint32_t)e;
+}
+
+void Plugin::AMD::EncoderH265::SetHeaderInsertionMode(H265::HeaderInsertionMode v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE,
+											   static_cast<AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE_ENUM>(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::H265::HeaderInsertionMode Plugin::AMD::EncoderH265::GetHeaderInsertionMode()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return static_cast<H265::HeaderInsertionMode>(e);
+}
+
+void Plugin::AMD::EncoderH265::SetDeblockingFilterEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_DE_BLOCKING_FILTER_DISABLE, !v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsDeblockingFilterEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"HevcDeBlockingFilter", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+/// Motion Estimation
+void Plugin::AMD::EncoderH265::SetMotionEstimationQuarterPixelEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_QUARTERPIXEL, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsMotionEstimationQuarterPixelEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_QUARTERPIXEL, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH265::SetMotionEstimationHalfPixelEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_HALF_PIXEL, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsMotionEstimationHalfPixelEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MOTION_HALF_PIXEL, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+// Dynamic
+void Plugin::AMD::EncoderH265::SetFrameSkippingEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_SKIP_FRAME_ENABLE, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsFrameSkippingEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_SKIP_FRAME_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH265::SetEnforceHRDEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ENFORCE_HRD, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsEnforceHRDEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_ENFORCE_HRD, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+void Plugin::AMD::EncoderH265::SetFillerDataEnabled(bool v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FILLER_DATA_ENABLE, v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+							 m_UniqueId, v ? "Enabled" : "Disabled", m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+bool Plugin::AMD::EncoderH265::IsFillerDataEnabled()
+{
+	AMFTRACECALL;
+
+	bool e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FILLER_DATA_ENABLE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsIFrameQPMinimum()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MIN_QP_I, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetIFrameQPMinimum(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_I, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH265::GetIFrameQPMinimum()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_I, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsIFrameQPMaximum()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_QP_I, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetIFrameQPMaximum(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_I, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH265::GetIFrameQPMaximum()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_I, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsPFrameQPMinimum()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MIN_QP_P, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetPFrameQPMinimum(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_P, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH265::GetPFrameQPMinimum()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MIN_QP_P, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsPFrameQPMaximum()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_MAX_QP_P, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetPFrameQPMaximum(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_P, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH265::GetPFrameQPMaximum()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_QP_P, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsTargetBitrate()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetTargetBitrate(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH265::GetTargetBitrate()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_TARGET_BITRATE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<uint64_t, uint64_t> Plugin::AMD::EncoderH265::CapsPeakBitrate()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(var->minValue.int64Value, var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetPeakBitrate(uint64_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %lld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint64_t Plugin::AMD::EncoderH265::GetPeakBitrate()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_PEAK_BITRATE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsIFrameQP()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QP_I, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetIFrameQP(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QP_I, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH265::GetIFrameQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QP_I, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+std::pair<uint8_t, uint8_t> Plugin::AMD::EncoderH265::CapsPFrameQP()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QP_P, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint8_t)var->minValue.int64Value, (uint8_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetPFrameQP(uint8_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QP_P, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %d, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint8_t Plugin::AMD::EncoderH265::GetPFrameQP()
+{
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QP_P, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint8_t)e;
+}
+
+void Plugin::AMD::EncoderH265::SetMaximumAccessUnitSize(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_AU_SIZE, (int64_t)v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetMaximumAccessUnitSize()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_MAX_AU_SIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::CapsInputQueueSize()
+{
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT                  res = m_AMFEncoder->GetPropertyInfo(L"HevcInputQueueSize", &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair((uint32_t)var->minValue.int64Value, (uint32_t)var->maxValue.int64Value);
+}
+
+void Plugin::AMD::EncoderH265::SetInputQueueSize(uint32_t v)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"HevcInputQueueSize", v);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+							 "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set mode to %ld, error %ls (code %d)",
+							 m_UniqueId, v, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+uint32_t Plugin::AMD::EncoderH265::GetInputQueueSize()
+{
+	AMFTRACECALL;
+
+	int64_t    e;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"HevcInputQueueSize", &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return (uint32_t)e;
+}
+
+// Internal
+void Plugin::AMD::EncoderH265::PacketPriorityAndKeyframe(amf::AMFDataPtr& pData, struct encoder_packet* packet)
+{
+	AMFTRACECALL;
+
+	uint64_t pktType;
+	pData->GetProperty(AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE, &pktType);
+	switch ((AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_ENUM)pktType) {
+	case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_I:
+		packet->keyframe = true;
+		packet->priority = 1;
+		break;
+	case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_P:
+		packet->priority = 0;
+		break;
+	}
+}
+
+AMF_RESULT Plugin::AMD::EncoderH265::GetExtraDataInternal(amf::AMFVariant* p)
+{
+	AMFTRACECALL;
+
+	return m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_EXTRADATA, p);
+}
+
+std::string Plugin::AMD::EncoderH265::HandleTypeOverride(amf::AMFSurfacePtr& d, uint64_t index)
+{
+	AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_ENUM type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE;
+
+	if ((m_PeriodPFrame > 0) && ((index % m_PeriodPFrame) == 0)) {
+		type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P;
+	}
+	if ((m_PeriodIFrame > 0) && ((index % m_PeriodIFrame) == 0)) {
+		type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I;
+	}
+	uint64_t realIPeriod = m_PeriodIDR * GetGOPSize();
+	if ((type != AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE) && (realIPeriod > 0) && ((index % realIPeriod) == 0)) {
+		type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR;
+	}
+	if (m_FrameSkipPeriod > 0) {
+		bool shouldSkip = m_FrameSkipKeepOnlyNth ? (index % m_FrameSkipPeriod) != 0 : (index % m_FrameSkipPeriod) == 0;
+
+		if (shouldSkip) {
+			if ((m_FrameSkipType <= AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP) || (type < m_FrameSkipType))
+				m_FrameSkipType = type;
+			type = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP;
+		} else if (m_FrameSkipType != AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE) {
+			type            = m_FrameSkipType; // Hopefully fixes the crash.
+			m_FrameSkipType = AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE;
+		}
+	}
+	if (type != AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE)
+		d->SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, type);
+
+	switch (type) {
+	case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE:
+		return "Automatic";
+		break;
+	case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP:
+		return "Skip";
+		break;
+	case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR:
+		return "IDR";
+		break;
+	case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I:
+		return "I";
+		break;
+	case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P:
+		return "P";
+		break;
+		//case AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_B:
+		//	return "B";
+		//	break;
+	}
+	return "Unknown";
+}
+
+void Plugin::AMD::EncoderH265::LogProperties()
+{
+	AMFTRACECALL;
+
+	PLOG_INFO(PREFIX "Encoder Parameters:", m_UniqueId);
+#pragma region Backend
+	PLOG_INFO(PREFIX "  Backend:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Video API: %s", m_UniqueId, m_API->GetName().c_str());
+	PLOG_INFO(PREFIX "    Video Adapter: %s", m_UniqueId, m_APIAdapter.Name.c_str());
+	PLOG_INFO(PREFIX "    OpenCL: %s", m_UniqueId, m_OpenCL ? "Supported" : "Not Supported");
+	PLOG_INFO(PREFIX "      Transfer: %s", m_UniqueId, m_OpenCLSubmission ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "      Conversion: %s", m_UniqueId, m_OpenCLConversion ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Multi-Threading: %s", m_UniqueId, m_MultiThreading ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Queue Size: %" PRIu32, m_UniqueId, (uint32_t)GetQueueSize());
+#pragma endregion Backend
+#pragma region    Frame
+    PLOG_INFO(PREFIX "  Frame:", m_UniqueId);
+    PLOG_INFO(PREFIX "    Format: %s %s %s", m_UniqueId, Utility::ColorFormatToString(m_ColorFormat),
+              Utility::ColorSpaceToString(m_ColorSpace), m_FullColorRange ? "Full" : "Partial");
+    PLOG_INFO(PREFIX "    Resolution: %" PRIu32 "x%" PRIu32, m_UniqueId, m_Resolution.first, m_Resolution.second);
+    PLOG_INFO(PREFIX "    Frame Rate: %" PRIu32 "/%" PRIu32, m_UniqueId, m_FrameRate.first, m_FrameRate.second);
+    auto aspectRatio = GetAspectRatio();
+    PLOG_INFO(PREFIX "    Aspect Ratio: %" PRIu32 ":%" PRIu32, m_UniqueId, aspectRatio.first, aspectRatio.second);
+#pragma endregion Frame
+#pragma region    Static
+    PLOG_INFO(PREFIX "  Static:", m_UniqueId);
+    PLOG_INFO(PREFIX "    Usage: %s", m_UniqueId, Utility::UsageToString(GetUsage()));
+    PLOG_INFO(PREFIX "    Quality Preset: %s", m_UniqueId, Utility::QualityPresetToString(GetQualityPreset()));
+    auto profileLevel = static_cast<uint16_t>(GetProfileLevel());
+    PLOG_INFO(PREFIX "    Profile: %s %" PRIu16 ".%" PRIu16, m_UniqueId, Utility::ProfileToString(GetProfile()),
+              profileLevel / 10, profileLevel % 10);
+    PLOG_INFO(PREFIX "    Tier: %s", m_UniqueId, Utility::TierToString(GetTier()));
+    PLOG_INFO(PREFIX "    Coding Type: %s", m_UniqueId, Utility::CodingTypeToString(GetCodingType()));
+    PLOG_INFO(PREFIX "    Max. Reference Frames: %" PRIu16, m_UniqueId, (uint16_t)GetMaximumReferenceFrames());
+    PLOG_INFO(PREFIX "    Max. Long-Term Reference Frames: %" PRIu16, m_UniqueId,
+              (uint16_t)GetMaximumLongTermReferenceFrames());
+#pragma endregion Static
+#pragma region Rate Control
+	PLOG_INFO(PREFIX "  Rate Control:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Method: %s", m_UniqueId, Utility::RateControlMethodToString(GetRateControlMethod()));
+	PLOG_INFO(PREFIX "    Pre-Pass Mode: %s", m_UniqueId, Utility::PrePassModeToString(GetPrePassMode()));
+#pragma region QP
+	PLOG_INFO(PREFIX "    QP:", m_UniqueId);
+	PLOG_INFO(PREFIX "      Ranges:", m_UniqueId);
+	PLOG_INFO(PREFIX "        I-Frame: %" PRIu8 " - %" PRIu8, m_UniqueId, GetIFrameQPMinimum(), GetIFrameQPMaximum());
+	PLOG_INFO(PREFIX "        P-Frame: %" PRIu8 " - %" PRIu8, m_UniqueId, GetPFrameQPMinimum(), GetPFrameQPMaximum());
+	PLOG_INFO(PREFIX "      Fixed:", m_UniqueId);
+	PLOG_INFO(PREFIX "        I-Frame: %" PRIu8, m_UniqueId, GetIFrameQP());
+	PLOG_INFO(PREFIX "        P-Frame: %" PRIu8, m_UniqueId, GetPFrameQP());
+#pragma endregion QP
+#pragma region    Bitrate
+    PLOG_INFO(PREFIX "    Bitrate:", m_UniqueId);
+    PLOG_INFO(PREFIX "      Target: %" PRIu64 " bit/s", m_UniqueId, GetTargetBitrate());
+    PLOG_INFO(PREFIX "      Peak: %" PRIu64 " bit/s", m_UniqueId, GetPeakBitrate());
+#pragma endregion Bitrate
+#pragma region    Flags
+    PLOG_INFO(PREFIX "    Flags:", m_UniqueId);
+    PLOG_INFO(PREFIX "      Filler Data: %s", m_UniqueId, IsFillerDataEnabled() ? "Enabled" : "Disabled");
+    PLOG_INFO(PREFIX "      Frame Skipping: %s", m_UniqueId, IsFrameSkippingEnabled() ? "Enabled" : "Disabled");
+    PLOG_INFO(PREFIX "        Period: %" PRIu32 " Frames", m_UniqueId, GetFrameSkippingPeriod());
+    PLOG_INFO(PREFIX "        Behaviour: %s", m_UniqueId,
+              GetFrameSkippingBehaviour() ? "Keep every Nth frame" : "Skip every Nth frame");
+    PLOG_INFO(PREFIX "      Variance Based Adaptive Quantization: %s", m_UniqueId,
+              IsVarianceBasedAdaptiveQuantizationEnabled() ? "Enabled" : "Disabled");
+    PLOG_INFO(PREFIX "      Enforce Hypothetical Reference Decoder: %s", m_UniqueId,
+              IsEnforceHRDEnabled() ? "Enabled" : "Disabled");
+#pragma endregion Flags
+#pragma region Video Buffering Verifier
+	PLOG_INFO(PREFIX "    Video Buffering Verfier:", m_UniqueId);
+	PLOG_INFO(PREFIX "      Buffer Size: %" PRIu64 " bits", m_UniqueId, GetVBVBufferSize());
+	PLOG_INFO(PREFIX "      Initial Fullness: %" PRIu64 " %%", m_UniqueId,
+			  (uint64_t)round(GetInitialVBVBufferFullness() * 100.0));
+#pragma endregion Video Buffering Verifier
+	PLOG_INFO(PREFIX "    Max. Access Unit Size: %" PRIu32, m_UniqueId, GetMaximumAccessUnitSize());
+#pragma endregion Rate Control
+
+#pragma region Picture Control
+	PLOG_INFO(PREFIX "  Picture Control:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Period:", m_UniqueId);
+	PLOG_INFO(PREFIX "      IDR: %" PRIu32 " GOPs", m_UniqueId, GetIDRPeriod());
+	PLOG_INFO(PREFIX "      I: %" PRIu32 " Frames", m_UniqueId, GetIFramePeriod());
+	PLOG_INFO(PREFIX "      P: %" PRIu32 " Frames", m_UniqueId, GetPFramePeriod());
+	PLOG_INFO(PREFIX "      B: %" PRIu32 " Frames", m_UniqueId, GetBFramePeriod());
+	PLOG_INFO(PREFIX "    GOP:", m_UniqueId);
+	PLOG_INFO(PREFIX "      Type: %s", m_UniqueId, Utility::GOPTypeToString(GetGOPType()));
+	PLOG_INFO(PREFIX "      Size: %" PRIu32, m_UniqueId, GetGOPSize());
+	PLOG_INFO(PREFIX "      Size Range: %" PRIu32 " - %" PRIu32, m_UniqueId, GetGOPSizeMin(), GetGOPSizeMax());
+	PLOG_INFO(PREFIX "      Alignment: %s", m_UniqueId, IsGOPAlignmentEnabled() ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Deblocking Filter: %s", m_UniqueId, IsDeblockingFilterEnabled() ? "Enabled" : "Disabled");
+	PLOG_INFO(PREFIX "    Motion Estimation: %s%s", m_UniqueId,
+			  IsMotionEstimationQuarterPixelEnabled() ? (IsMotionEstimationHalfPixelEnabled() ? "Quarter, " : "Quarter")
+													  : "",
+			  IsMotionEstimationHalfPixelEnabled() ? "Half" : "");
+#pragma endregion Picture Control
+
+#pragma region Experimental
+	PLOG_INFO(PREFIX "  Experimental:", m_UniqueId);
+	PLOG_INFO(PREFIX "    Input Queue: %" PRIu32, m_UniqueId, GetInputQueueSize());
+#pragma endregion Experimental
+}
+#endif

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/amf-encoder.cpp Added

@@ -0,0 +1,1124 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <thread>
+#include "amf-encoder.h"
+#include "components/VideoConverter.h"
+#include "components/VideoEncoderHEVC.h"
+#include "components/VideoEncoderVCE.h"
+#include "utility.h"
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+
+Plugin::AMD::Encoder::Encoder(Codec codec, std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+							  bool useOpenCLSubmission, bool useOpenCLConversion, ColorFormat colorFormat,
+							  ColorSpace colorSpace, bool fullRangeColor, bool multiThreading, size_t queueSize)
+{
+	m_UniqueId = Utility::GetUniqueIdentifier();
+
+#pragma region Null Values
+	/// AMF Internals
+	m_AMF              = nullptr;
+	m_AMFFactory       = nullptr;
+	m_AMFContext       = nullptr;
+	m_AMFEncoder       = nullptr;
+	m_AMFConverter     = nullptr;
+	m_AMFMemoryType    = amf::AMF_MEMORY_UNKNOWN;
+	m_AMFSurfaceFormat = Utility::ColorFormatToAMF(colorFormat);
+
+	/// API Related
+	m_API              = nullptr;
+	m_APIDevice        = nullptr;
+	m_OpenCLSubmission = false;
+
+	/// Properties
+	m_QueueSize = queueSize;
+
+	/// Resolution + Rate
+	m_Resolution        = std::make_pair<uint32_t, uint32_t>(0, 0);
+	m_FrameRate         = std::make_pair<uint32_t, uint32_t>(0, 0);
+	m_FrameRateFraction = 0;
+
+	/// Flags
+	m_Initialized = true;
+	m_Started     = false;
+	m_OpenCL      = false;
+	m_Debug       = false;
+
+	/// Timings
+	m_TimestampStep        = 0;
+	m_TimestampStepRounded = 0;
+	m_TimestampOffset      = 0;
+	m_SubmitQueryWaitTimer = std::chrono::milliseconds(1);
+	m_SubmitQueryAttempts  = 16;
+	m_InitialFrameLatency  = 0;
+
+	/// Status
+	m_SubmittedFrameCount    = 0;
+	m_InitialFramesSent      = false;
+	m_InitialPacketRetrieved = false;
+
+	/// Periods
+	m_PeriodIDR            = 0;
+	m_PeriodIFrame         = 0;
+	m_PeriodPFrame         = 0;
+	m_PeriodBFrame         = 0;
+	m_FrameSkipPeriod      = 0;
+	m_FrameSkipKeepOnlyNth = false;
+
+	/// Multi-Threading
+	m_MultiThreading = multiThreading;
+	m_AsyncRetrieve  = nullptr;
+	m_AsyncSend      = nullptr;
+#pragma endregion Null Values
+
+	// Setup
+	m_Codec            = codec;
+	m_ColorFormat      = colorFormat;
+	m_ColorSpace       = colorSpace;
+	m_FullColorRange   = fullRangeColor;
+	m_OpenCLSubmission = useOpenCLSubmission;
+	m_OpenCLConversion = useOpenCLConversion;
+
+	// Initialize selected API on Video Adapter
+	m_API        = videoAPI;
+	m_APIAdapter = videoAdapter;
+	m_APIDevice  = m_API->CreateInstance(m_APIAdapter);
+
+	// Initialize Advanced Media Framework
+	m_AMF = AMF::Instance();
+	m_AMF->EnableDebugTrace(m_Debug);
+	m_AMFFactory = m_AMF->GetFactory();
+
+	// Create Context for Conversion and Encoding
+	AMF_RESULT res = m_AMFFactory->CreateContext(&m_AMFContext);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Creating a AMF Context failed, error %ls (code %d).", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	/// Initialize Context using selected API
+	switch (m_API->GetType()) {
+	case API::Type::Direct3D11:
+	case API::Type::Direct3D9:
+		break;
+	default:
+		m_API = API::GetAPI(0);
+		switch (m_API->GetType()) {
+		case API::Type::Direct3D9:
+			m_APIAdapter = m_API->EnumerateAdapters()[0];
+			m_APIDevice  = m_API->CreateInstance(m_APIAdapter);
+			break;
+		case API::Type::Direct3D11:
+			m_APIAdapter = m_API->EnumerateAdapters()[0];
+			m_APIDevice  = m_API->CreateInstance(m_APIAdapter);
+			break;
+		}
+	}
+	switch (m_API->GetType()) {
+	case API::Type::Direct3D9:
+		m_AMFMemoryType = amf::AMF_MEMORY_DX9;
+		res             = m_AMFContext->InitDX9(m_APIDevice->GetContext());
+		break;
+	case API::Type::Direct3D11:
+		m_AMFMemoryType = amf::AMF_MEMORY_DX11;
+		res             = m_AMFContext->InitDX11(m_APIDevice->GetContext());
+		break;
+	}
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Initializing %s API with Adapter '%s' failed, error %ls (code %d).",
+							 m_UniqueId, m_API->GetName().c_str(), m_APIAdapter.Name.c_str(),
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	// Initialize OpenCL (if possible)
+	if (m_OpenCLSubmission || m_OpenCLConversion) {
+		res = m_AMFContext->InitOpenCL();
+		if (res == AMF_OK) {
+			m_OpenCL = true;
+
+			res = m_AMFContext->GetCompute(amf::AMF_MEMORY_OPENCL, &m_AMFCompute);
+			if (res != AMF_OK) {
+				m_OpenCLSubmission = false;
+				m_OpenCLConversion = false;
+
+				QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Retrieving Compute object failed, error %ls (code %d)",
+									 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+				PLOG_WARNING("%s", errMsg.data());
+			}
+		} else {
+			m_OpenCL           = false;
+			m_OpenCLSubmission = false;
+			m_OpenCLConversion = false;
+
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Initialising OpenCL failed, error %ls (code %d)", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.data());
+		}
+	}
+
+	// Create Converter
+	res = m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoConverter, &m_AMFConverter);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Creating frame converter component failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, amf::AMF_MEMORY_UNKNOWN);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to set converter memory type, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, amf::AMF_SURFACE_NV12);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to set converter output format, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	res =
+		m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, Utility::ColorSpaceToAMFConverter(m_ColorSpace));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to set convertor color profile, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	// Create Encoder
+	res = m_AMFFactory->CreateComponent(m_AMFContext, Utility::CodecToAMF(codec), &m_AMFEncoder);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to create %s encoder, error %ls (code %d)", m_UniqueId,
+							 Utility::CodecToString(codec), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	// Show complete initialization in log.
+	QUICK_FORMAT_MESSAGE(notice, "<Id: %lld> Initialized.", m_UniqueId);
+	PLOG_DEBUG("%s", notice.data());
+}
+
+Plugin::AMD::Encoder::~Encoder()
+{
+	// Destroy AMF Encoder
+	if (m_AMFEncoder) {
+		m_AMFEncoder->Terminate();
+		m_AMFEncoder = nullptr;
+	}
+
+	// Destroy AMF Converter
+	if (m_AMFConverter) {
+		m_AMFConverter->Terminate();
+		m_AMFConverter = nullptr;
+	}
+
+	// Destroy AMF Context
+	if (m_AMFContext) {
+		m_AMFContext->Terminate();
+		m_AMFContext = nullptr;
+	}
+
+	// Destroy API
+	if (m_API) {
+		m_APIDevice = nullptr;
+		m_API       = nullptr;
+	}
+
+	m_AMF = nullptr;
+
+	// Show complete initialization in log.
+	QUICK_FORMAT_MESSAGE(notice, "<Id: %lld> Finalized.", m_UniqueId);
+	PLOG_DEBUG("%s", notice.c_str());
+}
+
+uint64_t Plugin::AMD::Encoder::GetUniqueId()
+{
+	return m_UniqueId;
+}
+
+Plugin::AMD::Codec Plugin::AMD::Encoder::GetCodec()
+{
+	return m_Codec;
+}
+
+std::shared_ptr<API::IAPI> Plugin::AMD::Encoder::GetVideoAPI()
+{
+	return m_API;
+}
+
+Plugin::API::Adapter Plugin::AMD::Encoder::GetVideoAdapter()
+{
+	return m_APIAdapter;
+}
+
+bool Plugin::AMD::Encoder::IsOpenCLEnabled()
+{
+	return m_OpenCLSubmission;
+}
+
+Plugin::AMD::ColorFormat Plugin::AMD::Encoder::GetColorFormat()
+{
+	return m_ColorFormat;
+}
+
+Plugin::AMD::ColorSpace Plugin::AMD::Encoder::GetColorSpace()
+{
+	return m_ColorSpace;
+}
+
+bool Plugin::AMD::Encoder::IsFullRangeColor()
+{
+	return m_FullColorRange;
+}
+
+bool Plugin::AMD::Encoder::IsMultiThreaded()
+{
+	return m_MultiThreading;
+}
+
+size_t Plugin::AMD::Encoder::GetQueueSize()
+{
+	return m_QueueSize;
+}
+
+void Plugin::AMD::Encoder::SetDebug(bool v)
+{
+	m_Debug = v;
+	m_AMF->EnableDebugTrace(m_Debug);
+}
+
+bool Plugin::AMD::Encoder::IsDebug()
+{
+	return m_Debug;
+}
+
+#ifndef LITE_OBS
+void Plugin::AMD::Encoder::UpdateFrameRateValues()
+{
+	// 1			Second
+	// 1000			Millisecond
+	// 1000000		Microsecond
+	// 10000000		amf_pts
+	// 1000000000	Nanosecond
+	m_FrameRateFraction    = ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first);
+	m_TimestampStep        = AMF_SECOND * m_FrameRateFraction;
+	m_TimestampStepRounded = (uint64_t)round(m_TimestampStep);
+	m_SubmitQueryWaitTimer = std::chrono::milliseconds(
+		1); // std::chrono::nanoseconds((uint64_t)round(m_TimestampStep / m_SubmitQueryAttempts));
+}
+
+void Plugin::AMD::Encoder::SetVBVBufferStrictness(double_t v)
+{
+	AMFTRACECALL;
+
+	auto     bitrateCaps  = CapsVBVBufferSize();
+	uint64_t looseBitrate = bitrateCaps.second, targetBitrate = 0, strictBitrate = bitrateCaps.first;
+
+	Usage usage = GetUsage();
+	if (usage == Usage::UltraLowLatency) {
+		targetBitrate = clamp(GetTargetBitrate(), bitrateCaps.first, bitrateCaps.second);
+	} else {
+		switch (this->GetRateControlMethod()) {
+		case RateControlMethod::ConstantBitrate:
+			targetBitrate = clamp(GetTargetBitrate(), bitrateCaps.first, bitrateCaps.second);
+			break;
+		case RateControlMethod::LatencyConstrainedVariableBitrate:
+		case RateControlMethod::PeakConstrainedVariableBitrate:
+			targetBitrate = max(this->GetTargetBitrate(), this->GetPeakBitrate());
+			break;
+		case RateControlMethod::ConstantQP:
+			targetBitrate = bitrateCaps.second / 2;
+			break;
+		}
+	}
+	strictBitrate = clamp(
+		static_cast<uint64_t>(round(targetBitrate * ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first))),
+		bitrateCaps.first, targetBitrate);
+
+	// Three-Point Linear Lerp
+	// 0% = looseBitrate, 50% = targetBitrate, 100% = strictBitrate
+	v                 = clamp(v, 0.0, 1.0);
+	double_t aFadeVal = clamp(v * 2.0, 0.0, 1.0);       // 0 - 0.5
+	double_t bFadeVal = clamp(v * 2.0 - 1.0, 0.0, 0.0); // 0.5 - 1.0
+
+	double_t aFade = (looseBitrate * (1.0 - aFadeVal)) + (targetBitrate * aFadeVal);
+	double_t bFade = (aFade * (1.0 - bFadeVal)) + (strictBitrate * bFadeVal);
+
+	uint64_t vbvBufferSize = static_cast<uint64_t>(round(bFade));
+	this->SetVBVBufferSize(vbvBufferSize);
+}
+
+void Plugin::AMD::Encoder::SetIFramePeriod(uint32_t v)
+{
+	m_PeriodIFrame = v;
+}
+
+uint32_t Plugin::AMD::Encoder::GetIFramePeriod()
+{
+	return m_PeriodIFrame;
+}
+
+void Plugin::AMD::Encoder::SetPFramePeriod(uint32_t v)
+{
+	m_PeriodPFrame = v;
+}
+
+uint32_t Plugin::AMD::Encoder::GetPFramePeriod()
+{
+	return m_PeriodPFrame;
+}
+
+void Plugin::AMD::Encoder::SetBFramePeriod(uint32_t v)
+{
+	m_PeriodBFrame = v;
+}
+
+uint32_t Plugin::AMD::Encoder::GetBFramePeriod()
+{
+	return m_PeriodBFrame;
+}
+
+void Plugin::AMD::Encoder::SetFrameSkippingPeriod(uint32_t v)
+{
+	m_FrameSkipPeriod = v;
+}
+
+uint32_t Plugin::AMD::Encoder::GetFrameSkippingPeriod()
+{
+	return m_FrameSkipPeriod;
+}
+
+void Plugin::AMD::Encoder::SetFrameSkippingBehaviour(bool v)
+{
+	m_FrameSkipKeepOnlyNth = v;
+}
+
+bool Plugin::AMD::Encoder::GetFrameSkippingBehaviour()
+{
+	return m_FrameSkipKeepOnlyNth;
+}
+
+void Plugin::AMD::Encoder::Start()
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res;
+
+	res = m_AMFConverter->Init(Utility::ColorFormatToAMF(m_ColorFormat), m_Resolution.first, m_Resolution.second);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to initalize converter, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	res = m_AMFEncoder->Init(amf::AMF_SURFACE_NV12, m_Resolution.first, m_Resolution.second);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Failed to initialize encoder, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	// Threading
+	if (m_MultiThreading) {
+		m_AsyncSend                  = new EncoderThreadingData;
+		m_AsyncSend->shutdown        = false;
+		m_AsyncSend->wakeupcount     = 0; // 2 ^ 32;
+		m_AsyncSend->data            = nullptr;
+		m_AsyncSend->worker          = std::thread(AsyncSendMain, this);
+		m_AsyncRetrieve              = new EncoderThreadingData;
+		m_AsyncRetrieve->shutdown    = false;
+		m_AsyncRetrieve->wakeupcount = 0;
+		m_AsyncRetrieve->data        = nullptr;
+		m_AsyncRetrieve->worker      = std::thread(AsyncRetrieveMain, this);
+	}
+
+	m_Started = true;
+}
+
+void Plugin::AMD::Encoder::Restart()
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->ReInit(m_Resolution.first, m_Resolution.second);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Could not re-initialize encoder, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+void Plugin::AMD::Encoder::Stop()
+{
+	AMFTRACECALL;
+
+	if (!m_Started)
+		throw std::logic_error("Can't stop an encoder that isn't running!");
+
+	m_AMFConverter->Drain();
+	m_AMFConverter->Flush();
+	m_AMFEncoder->Drain();
+	m_AMFEncoder->Flush();
+
+	// Threading
+	if (m_MultiThreading) {
+		{
+			std::unique_lock<std::mutex> lock(m_AsyncRetrieve->mutex);
+			m_AsyncRetrieve->shutdown    = true;
+			m_AsyncRetrieve->wakeupcount = 2 ^ 32;
+			m_AsyncRetrieve->condvar.notify_all();
+			m_AsyncRetrieve->data = nullptr;
+		}
+		m_AsyncRetrieve->worker.join();
+		delete m_AsyncRetrieve;
+		{
+			std::unique_lock<std::mutex> lock(m_AsyncSend->mutex);
+			m_AsyncSend->shutdown    = true;
+			m_AsyncSend->wakeupcount = 2 ^ 32;
+			m_AsyncSend->condvar.notify_all();
+			m_AsyncSend->data = nullptr;
+		}
+		m_AsyncSend->worker.join();
+		delete m_AsyncSend;
+	}
+
+	m_Started = false;
+}
+
+bool Plugin::AMD::Encoder::IsStarted()
+{
+	AMFTRACECALL;
+
+	return m_Started;
+}
+
+bool Plugin::AMD::Encoder::Encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet)
+{
+	AMFTRACECALL;
+
+	if (!m_Started)
+		return false;
+
+	amf::AMFSurfacePtr surface      = nullptr;
+	amf::AMFDataPtr    surface_data = nullptr;
+	amf::AMFDataPtr    packet_data  = nullptr;
+
+	// Encoding Steps
+	if (!EncodeAllocate(surface))
+		return false;
+	if (!EncodeStore(surface, frame))
+		return false;
+	if (!EncodeConvert(surface, surface_data))
+		return false;
+	if (!EncodeMain(surface_data, packet_data))
+		return false;
+	if (!EncodeLoad(packet_data, packet, received_packet))
+		return false;
+
+	return true;
+}
+
+void Plugin::AMD::Encoder::GetVideoInfo(struct video_scale_info* info)
+{
+	AMFTRACECALL;
+
+	if (!m_AMFContext || !m_AMFEncoder)
+		throw std::exception("<" __FUNCTION_NAME__ "> Called while not initialized.");
+
+	switch (m_ColorFormat) {
+	// 4:2:0 Formats
+	case ColorFormat::NV12:
+		info->format = VIDEO_FORMAT_NV12;
+		break;
+	case ColorFormat::I420:
+		info->format = VIDEO_FORMAT_I420;
+		break;
+		// 4:2:2 Formats
+	case ColorFormat::YUY2:
+		info->format = VIDEO_FORMAT_YUY2;
+		break;
+		// Uncompressed
+	case ColorFormat::RGBA:
+		info->format = VIDEO_FORMAT_RGBA;
+		break;
+	case ColorFormat::BGRA:
+		info->format = VIDEO_FORMAT_BGRA;
+		break;
+		// Other
+	case ColorFormat::GRAY:
+		info->format = VIDEO_FORMAT_Y800;
+		break;
+	}
+
+	if (m_FullColorRange) { // Only use Full range if actually enabled.
+		info->range = VIDEO_RANGE_FULL;
+	} else {
+		info->range = VIDEO_RANGE_PARTIAL;
+	}
+}
+
+bool Plugin::AMD::Encoder::GetExtraData(uint8_t** extra_data, size_t* size)
+{
+	AMFTRACECALL;
+
+	if (!m_AMFContext || !m_AMFEncoder)
+		throw std::exception("<" __FUNCTION_NAME__ "> Called while not initialized.");
+
+	amf::AMFVariant var;
+	AMF_RESULT      res = GetExtraDataInternal(&var);
+	if (res == AMF_OK && var.type == amf::AMF_VARIANT_INTERFACE) {
+		amf::AMFBufferPtr buf(var.pInterface);
+
+		*size = buf->GetSize();
+		m_ExtraDataBuffer.resize(*size);
+		std::memcpy(m_ExtraDataBuffer.data(), buf->GetNative(), *size);
+		*extra_data = m_ExtraDataBuffer.data();
+
+		return true;
+	}
+	return false;
+}
+
+bool Plugin::AMD::Encoder::EncodeAllocate(OUT amf::AMFSurfacePtr& surface)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res;
+	auto       clk_start = std::chrono::high_resolution_clock::now();
+
+	// Allocate
+	if (m_OpenCLSubmission) {
+		res = m_AMFContext->AllocSurface(m_AMFMemoryType, m_AMFSurfaceFormat, m_Resolution.first, m_Resolution.second,
+										 &surface);
+	} else {
+		// Required when not using OpenCL, can't directly write to GPU memory with memcpy.
+		res = m_AMFContext->AllocSurface(amf::AMF_MEMORY_HOST, m_AMFSurfaceFormat, m_Resolution.first,
+										 m_Resolution.second, &surface);
+	}
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Unable to allocate Surface, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		PLOG_ERROR("%s", errMsg.data());
+		return false;
+	}
+
+	// Performance Tracking
+	auto     clk_end      = std::chrono::high_resolution_clock::now();
+	uint64_t pf_timestamp = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
+	uint64_t pf_time      = std::chrono::nanoseconds(clk_end - clk_start).count();
+
+	surface->SetProperty(AMF_TIMESTAMP_ALLOCATE, pf_timestamp);
+	surface->SetProperty(AMF_TIME_ALLOCATE, pf_time);
+
+	return true;
+}
+
+bool Plugin::AMD::Encoder::EncodeStore(OUT amf::AMFSurfacePtr& surface, IN struct encoder_frame* frame)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT                  res;
+	amf::AMFComputeSyncPointPtr pSyncPoint;
+	auto                        clk_start = std::chrono::high_resolution_clock::now();
+
+	if (m_OpenCLSubmission) {
+		m_AMFCompute->PutSyncPoint(&pSyncPoint);
+		res = surface->Convert(amf::AMF_MEMORY_OPENCL);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(errMsg,
+								 "<Id: %lld> [Store] Conversion of Surface to OpenCL failed, error %ls (code %d)",
+								 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.data());
+			return false;
+		}
+	}
+
+	size_t planeCount = surface->GetPlanesCount();
+	for (uint8_t i = 0; i < planeCount; i++) {
+		amf::AMFPlanePtr plane  = surface->GetPlaneAt(i);
+		int32_t          width  = plane->GetWidth();
+		int32_t          height = plane->GetHeight();
+		int32_t          hpitch = plane->GetHPitch();
+
+		if (m_OpenCLSubmission) {
+			static const amf_size l_origin[] = {0, 0, 0};
+			const amf_size        l_size[]   = {(amf_size)width, (amf_size)height, 1};
+			res = m_AMFCompute->CopyPlaneFromHost(frame->data[i], l_origin, l_size, frame->linesize[i],
+												  surface->GetPlaneAt(i), false);
+			if (res != AMF_OK) {
+				QUICK_FORMAT_MESSAGE(errMsg,
+									 "<Id: %lld> [Store] Unable to copy plane %d with OpenCL, error %ls (code %d)",
+									 m_UniqueId, i, m_AMF->GetTrace()->GetResultText(res), res);
+				PLOG_WARNING("%s", errMsg.data());
+				return false;
+			}
+		} else {
+			void* plane_nat = plane->GetNative();
+			for (int32_t py = 0; py < height; py++) {
+				int32_t plane_off = py * hpitch;
+				int32_t frame_off = py * frame->linesize[i];
+				std::memcpy(static_cast<void*>(static_cast<uint8_t*>(plane_nat) + plane_off),
+							static_cast<void*>(frame->data[i] + frame_off), frame->linesize[i]);
+			}
+		}
+	}
+
+	if (m_OpenCLSubmission) {
+		res = m_AMFCompute->FinishQueue();
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Store] Failed to finish OpenCL queue, error %ls (code %d)",
+								 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.data());
+			return false;
+		}
+		pSyncPoint->Wait();
+	}
+	res = surface->Convert(m_AMFMemoryType);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Store] Conversion of Surface failed, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		PLOG_WARNING("%s", errMsg.data());
+		return false;
+	}
+
+	// Data Stuff
+	int64_t tsLast = (int64_t)round((frame->pts - 1) * m_TimestampStep);
+	int64_t tsNow  = (int64_t)round(frame->pts * m_TimestampStep);
+
+	/// Decode Timestamp
+	surface->SetPts(tsNow);
+	/// Presentation Timestamp
+	surface->SetProperty(AMF_PRESENT_TIMESTAMP, frame->pts);
+	/// Duration
+	surface->SetDuration(tsNow - tsLast);
+	/// Type override
+	std::string printableType = HandleTypeOverride(surface, frame->pts);
+
+	// Performance Tracking
+	auto     clk_end      = std::chrono::high_resolution_clock::now();
+	uint64_t pf_timestamp = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
+	uint64_t pf_time      = std::chrono::nanoseconds(clk_end - clk_start).count();
+	surface->SetProperty(AMF_TIMESTAMP_STORE, pf_timestamp);
+	surface->SetProperty(AMF_TIME_STORE, pf_time);
+
+	if (m_Debug) {
+		PLOG_DEBUG("<Id: %lld> EncodeStore: PTS(%8lld) DTS(%8lld) TS(%16lld) Duration(%16lld) Type(%s)", m_UniqueId,
+				   frame->pts, frame->pts, surface->GetPts(), surface->GetDuration(), printableType.c_str());
+	}
+
+	return true;
+}
+
+bool Plugin::AMD::Encoder::EncodeConvert(IN amf::AMFSurfacePtr& surface, OUT amf::AMFDataPtr& data)
+{
+	AMFTRACECALL;
+
+	AMF_RESULT res;
+	auto       clk_start = std::chrono::high_resolution_clock::now();
+
+	if (m_OpenCLConversion) {
+		res = surface->Convert(amf::AMF_MEMORY_OPENCL);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(errMsg,
+								 "<Id: %lld> [Convert] Conversion of Surface to OpenCL failed, error %ls (code %d)",
+								 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.data());
+			return false;
+		}
+	}
+	res = m_AMFConverter->SubmitInput(surface);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Convert] Submit to converter failed, error %ls (code %d)", m_UniqueId,
+							 m_AMF->GetTrace()->GetResultText(res), res);
+		PLOG_WARNING("%s", errMsg.data());
+		return false;
+	}
+	res = m_AMFConverter->QueryOutput(&data);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Convert] Querying output from converter failed, error %ls (code %d)",
+							 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		PLOG_WARNING("%s", errMsg.data());
+		return false;
+	}
+	if (m_OpenCLConversion) {
+		res = surface->Convert(m_AMFMemoryType);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Convert] Conversion of Surface failed, error %ls (code %d)",
+								 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.data());
+			return false;
+		}
+	}
+
+	// Performance Tracking
+	auto     clk_end      = std::chrono::high_resolution_clock::now();
+	uint64_t pf_timestamp = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
+	uint64_t pf_time      = std::chrono::nanoseconds(clk_end - clk_start).count();
+	surface->SetProperty(AMF_TIMESTAMP_CONVERT, pf_timestamp);
+	surface->SetProperty(AMF_TIME_CONVERT, pf_time);
+
+	return true;
+}
+
+bool Plugin::AMD::Encoder::EncodeMain(IN amf::AMFDataPtr& data, OUT amf::AMFDataPtr& packet)
+{
+	AMFTRACECALL;
+
+	bool frameSubmitted = false, packetRetrieved = false;
+
+	bool keepLooping = true;
+	for (uint64_t attempt = 1; keepLooping; attempt++) {
+		// Lets just change the stupid huge bitwise and/or into proper ifs.
+		// Since this is rather small and can be kept in L1 we should not see
+		// any differences in performance.
+		if (m_InitialFramesSent) {
+			if (m_InitialPacketRetrieved) {
+				if (attempt <= m_SubmitQueryAttempts) {
+					keepLooping = (!frameSubmitted || !packetRetrieved);
+				} else {
+					keepLooping = false;
+				}
+			} else {
+				keepLooping = !frameSubmitted || !packetRetrieved;
+			}
+		} else {
+			keepLooping = !frameSubmitted;
+		}
+
+		// Submit
+		if (!frameSubmitted) {
+			if (m_MultiThreading) { // Asynchronous
+				std::unique_lock<std::mutex> slock(m_AsyncSend->mutex);
+				if (m_AsyncSend->data == nullptr) {
+					m_AsyncSend->data = data;
+					m_AsyncSend->condvar.notify_all();
+					frameSubmitted = true;
+				} else {
+					m_AsyncSend->condvar.notify_all();
+				}
+			} else {
+				// Performance Tracking
+				auto     clk   = std::chrono::high_resolution_clock::now();
+				uint64_t pf_ts = std::chrono::nanoseconds(clk.time_since_epoch()).count();
+				data->SetProperty(AMF_TIMESTAMP_SUBMIT, pf_ts);
+
+				AMF_RESULT res = m_AMFEncoder->SubmitInput(data);
+				if (m_Debug) {
+					QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Main/Submit] SubmitInput returned %ls (code %d).",
+										 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+					PLOG_WARNING("%s", errMsg.c_str());
+				}
+
+				if (res == AMF_OK) {
+					frameSubmitted = true;
+					m_SubmittedFrameCount++;
+				} else if (res == AMF_INPUT_FULL) {
+					if (m_InitialFramesSent == false) {
+						QUICK_FORMAT_MESSAGE(
+							errMsg, "<Id: %lld> Queue Size is too large, starting to query for packets...", m_UniqueId);
+						PLOG_ERROR("%s", errMsg.data());
+						m_InitialFramesSent = true;
+					}
+				} else {
+					QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Main] Submitting Surface failed, error %ls (code %d)",
+										 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+					PLOG_ERROR("%s", errMsg.data());
+					return false;
+				}
+			}
+		}
+
+		// Retrieve
+		if (m_InitialFramesSent && !packetRetrieved) {
+			if (m_MultiThreading) {
+				std::unique_lock<std::mutex> rlock(m_AsyncRetrieve->mutex);
+				if (m_AsyncRetrieve->data != nullptr) {
+					packet                   = m_AsyncRetrieve->data;
+					m_AsyncRetrieve->data    = nullptr;
+					packetRetrieved          = true;
+					m_InitialPacketRetrieved = true;
+				} else {
+					m_AsyncRetrieve->condvar.notify_all();
+					if (m_AsyncRetrieve->wakeupcount == 0)
+						m_AsyncRetrieve->wakeupcount = 1;
+				}
+			} else {
+				AMF_RESULT res = m_AMFEncoder->QueryOutput(&packet);
+				if (m_Debug) {
+					QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Main/Query] QueryOutput returned %ls (code %d).",
+										 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+					PLOG_WARNING("%s", errMsg.c_str());
+				}
+
+				if (res == AMF_OK) {
+					m_InitialPacketRetrieved = true;
+					packetRetrieved          = true;
+
+					// Performance Tracking
+					auto     clk      = std::chrono::high_resolution_clock::now();
+					uint64_t pf_query = std::chrono::nanoseconds(clk.time_since_epoch()).count(), pf_submit, pf_main;
+					packet->GetProperty(AMF_TIMESTAMP_SUBMIT, &pf_submit);
+					packet->SetProperty(AMF_TIMESTAMP_QUERY, pf_query);
+					pf_main = (pf_query - pf_submit);
+					packet->SetProperty(AMF_TIME_MAIN, pf_main);
+				} else if (res == AMF_NEED_MORE_INPUT) {
+					// Returned with B-Frames, means that we need more frames.
+					if (!m_InitialPacketRetrieved)
+						packetRetrieved = true;
+				} else if (res != AMF_REPEAT) {
+					QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Main] Retrieving Packet failed, error %ls (code %d)",
+										 m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+					PLOG_ERROR("%s", errMsg.data());
+					return false;
+				}
+			}
+		}
+
+		if (!packetRetrieved || !frameSubmitted)
+			std::this_thread::sleep_for(m_SubmitQueryWaitTimer);
+	}
+	if (!frameSubmitted) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Input Queue is full, encoder is overloaded!", m_UniqueId);
+		PLOG_WARNING("%s", errMsg.data());
+	}
+	if (!m_InitialPacketRetrieved) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Waiting for initial frame...", m_UniqueId);
+		PLOG_DEBUG("%s", errMsg.data());
+	}
+	if (m_InitialPacketRetrieved && !packetRetrieved) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> No output Packet, encoder is overloaded!", m_UniqueId);
+		PLOG_WARNING("%s", errMsg.data());
+	}
+	if (m_SubmittedFrameCount >= (m_TimestampOffset + m_QueueSize))
+		m_InitialFramesSent = true;
+	return true;
+}
+
+bool Plugin::AMD::Encoder::EncodeLoad(IN amf::AMFDataPtr& data, OUT struct encoder_packet* packet,
+									  OUT bool* received_packet)
+{
+	AMFTRACECALL;
+
+	if (data == nullptr)
+		return true;
+
+	amf::AMFBufferPtr pBuffer   = amf::AMFBufferPtr(data);
+	auto              clk_start = std::chrono::high_resolution_clock::now();
+
+	// Timestamps
+	packet->type = OBS_ENCODER_VIDEO;
+	/// Present Timestamp
+	data->GetProperty(AMF_PRESENT_TIMESTAMP, &packet->pts);
+	/// Decode Timestamp
+	packet->dts = (int64_t)round((double_t)data->GetPts() / m_TimestampStep) - m_TimestampOffset;
+	/// Data
+	PacketPriorityAndKeyframe(data, packet);
+	packet->size = pBuffer->GetSize();
+	if (m_PacketDataBuffer.size() < packet->size) {
+		size_t newBufferSize = (size_t)exp2(ceil(log2(packet->size)));
+		//AMF_LOG_DEBUG("Packet Buffer was resized to %d byte from %d byte.", newBufferSize, m_PacketDataBuffer.size());
+		m_PacketDataBuffer.resize(newBufferSize);
+	}
+	packet->data = m_PacketDataBuffer.data();
+	std::memcpy(packet->data, pBuffer->GetNative(), packet->size);
+
+	// Performance Tracking
+	auto     clk_end = std::chrono::high_resolution_clock::now();
+	uint64_t pf_allocate_ts, pf_allocate_t, pf_store_ts, pf_store_t, pf_convert_ts, pf_convert_t, pf_submit_ts,
+		pf_query_ts, pf_main_t, pf_load_ts, pf_load_t;
+
+	data->GetProperty(AMF_TIMESTAMP_ALLOCATE, &pf_allocate_ts);
+	data->GetProperty(AMF_TIME_ALLOCATE, &pf_allocate_t);
+	data->GetProperty(AMF_TIMESTAMP_STORE, &pf_store_ts);
+	data->GetProperty(AMF_TIME_STORE, &pf_store_t);
+	data->GetProperty(AMF_TIMESTAMP_CONVERT, &pf_convert_ts);
+	data->GetProperty(AMF_TIME_CONVERT, &pf_convert_t);
+	data->GetProperty(AMF_TIMESTAMP_SUBMIT, &pf_submit_ts);
+	data->GetProperty(AMF_TIMESTAMP_QUERY, &pf_query_ts);
+	data->GetProperty(AMF_TIME_MAIN, &pf_main_t);
+	pf_load_ts = std::chrono::nanoseconds(clk_end.time_since_epoch()).count();
+	pf_load_t  = std::chrono::nanoseconds(clk_end - clk_start).count();
+
+	if (m_Debug) {
+		std::string printableType = "Unknown";
+		if (m_Codec == Codec::AVC || m_Codec == Codec::SVC) {
+			uint64_t type = AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_IDR;
+			data->GetProperty(AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE, &type);
+			switch ((AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_ENUM)type) {
+			case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_IDR:
+				printableType = "IDR";
+				break;
+			case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_I:
+				printableType = "I";
+				break;
+			case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_P:
+				printableType = "P";
+				break;
+			case AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE_B:
+				printableType = "B";
+				break;
+			}
+		}
+		if (m_Codec == Codec::HEVC) {
+			uint64_t type = AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_IDR;
+			data->GetProperty(AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE, &type);
+			switch ((AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_ENUM)type) {
+			case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_IDR:
+				printableType = "IDR";
+				break;
+			case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_I:
+				printableType = "I";
+				break;
+			case AMF_VIDEO_ENCODER_HEVC_OUTPUT_DATA_TYPE_P:
+				printableType = "P";
+				break;
+			}
+		}
+
+		PLOG_DEBUG("<Id: %" PRIu64 "> EncodeLoad: PTS(%8" PRIu64 ") DTS(%8" PRIu64 ") TS(%16" PRIu64
+				   ") Duration(%16" PRIu64 ") Size(%16" PRIuPTR ") Type(%s)",
+				   m_UniqueId, packet->pts, packet->dts, data->GetPts(), data->GetDuration(), packet->size,
+				   printableType.c_str());
+		PLOG_DEBUG("<Id: %" PRIu64 ">    Timings: Allocate(%8" PRIu64 " ns) Store(%8" PRIu64 " ns) Convert(%8" PRIu64
+				   " ns) Main(%8" PRIu64 " ns) Load(%8" PRIu64 " ns)",
+				   m_UniqueId, pf_allocate_t, pf_store_t, pf_convert_t, pf_main_t, pf_load_t);
+	}
+	if (m_InitialFrameLatency == 0) {
+		m_InitialFrameLatency = pf_main_t;
+		PLOG_INFO("<Id: %" PRIu64 "> Initial Frame Latency is %" PRIu64 " nanoseconds.", m_UniqueId,
+				  m_InitialFrameLatency);
+	}
+
+	*received_packet = true;
+
+	return true;
+}
+
+int32_t Plugin::AMD::Encoder::AsyncSendMain(Encoder* obj)
+{
+	return obj->AsyncSendLocalMain();
+}
+
+int32_t Plugin::AMD::Encoder::AsyncSendLocalMain()
+{
+	EncoderThreadingData* own = m_AsyncSend;
+
+	std::unique_lock<std::mutex> lock(own->mutex);
+	while (!own->shutdown) {
+		own->condvar.wait(lock, [&own] { return own->shutdown || (own->data != nullptr); });
+
+		if (own->data == nullptr)
+			continue;
+
+		{
+			// Performance Tracking
+			auto     clk   = std::chrono::high_resolution_clock::now();
+			uint64_t pf_ts = std::chrono::nanoseconds(clk.time_since_epoch()).count();
+			own->data->SetProperty(AMF_TIMESTAMP_SUBMIT, pf_ts);
+		}
+
+		AMF_RESULT res = m_AMFEncoder->SubmitInput(own->data);
+		if (m_Debug) {
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Main/Submit] SubmitInput returned %ls (code %d).", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.c_str());
+		}
+
+		if (res == AMF_OK) {
+			own->data = nullptr;
+			m_SubmittedFrameCount++;
+		} else if (res == AMF_INPUT_FULL) {
+			if (m_InitialFramesSent == false) {
+				QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Queue Size is too large, starting to query for packets...",
+									 m_UniqueId);
+				PLOG_ERROR("%s", errMsg.data());
+				m_InitialFramesSent = true;
+			}
+		} else {
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Submitting Surface failed, error %ls (code %d)", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_ERROR("%s", errMsg.data());
+			return -1;
+		}
+
+		std::this_thread::sleep_for(m_SubmitQueryWaitTimer);
+	}
+	return 0;
+}
+
+int32_t Plugin::AMD::Encoder::AsyncRetrieveMain(Encoder* obj)
+{
+	return obj->AsyncRetrieveLocalMain();
+}
+
+int32_t Plugin::AMD::Encoder::AsyncRetrieveLocalMain()
+{
+	EncoderThreadingData* own = m_AsyncRetrieve;
+
+	std::unique_lock<std::mutex> lock(own->mutex);
+	while (!own->shutdown) {
+		own->condvar.wait(lock, [&own] { return own->shutdown || (own->wakeupcount > 0); });
+
+		if (own->wakeupcount == 0)
+			continue;
+
+		if (own->data != nullptr)
+			continue;
+
+		amf::AMFDataPtr packet;
+		AMF_RESULT      res = m_AMFEncoder->QueryOutput(&packet);
+		if (m_Debug) {
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> [Main/Query] QueryOutput returned %ls (code %d).", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.c_str());
+		}
+
+		if (res == AMF_OK) {
+			own->data = packet;
+			own->wakeupcount--;
+
+			// Performance Tracking
+			{
+				auto     clk      = std::chrono::high_resolution_clock::now();
+				uint64_t pf_query = std::chrono::nanoseconds(clk.time_since_epoch()).count(), pf_submit, pf_main;
+				packet->GetProperty(AMF_TIMESTAMP_SUBMIT, &pf_submit);
+				packet->SetProperty(AMF_TIMESTAMP_QUERY, pf_query);
+				pf_main = (pf_query - pf_submit);
+				packet->SetProperty(AMF_TIME_MAIN, pf_main);
+			}
+		} else if (res == AMF_REPEAT) {
+			m_AsyncRetrieve->condvar.notify_all();
+		} else if (res == AMF_NEED_MORE_INPUT) {
+			{
+				std::unique_lock<std::mutex> slock(m_AsyncSend->mutex);
+				if (m_AsyncSend->data != nullptr)
+					m_AsyncSend->condvar.notify_all();
+			}
+		} else {
+			QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> Retrieving Packet failed, error %ls (code %d)", m_UniqueId,
+								 m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_ERROR("%s", errMsg.data());
+			return -1;
+		}
+
+		std::this_thread::sleep_for(m_SubmitQueryWaitTimer);
+	}
+	return 0;
+}
+#endif

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/amf.cpp Added

@@ -0,0 +1,315 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <mutex>
+#include <vector>
+#include "amf.h"
+#include "components\Component.h"
+#include "components\ComponentCaps.h"
+#include "components\VideoEncoderVCE.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#include "windows.h"
+#endif
+
+using namespace Plugin::AMD;
+
+class CustomWriter : public amf::AMFTraceWriter {
+	public:
+	virtual void __cdecl Write(const wchar_t* scope, const wchar_t* message) override
+	{
+#ifndef LITE_OBS
+		const wchar_t* realmsg = &(message[(33 + wcslen(scope) + 2)]); // Skip Time & Scope
+		size_t         msgLen  = wcslen(realmsg) - (sizeof(wchar_t));
+
+		blog(LOG_DEBUG, "[AMF Runtime] [%.*ls][%ls] %.*ls", 12, &(message[11]), scope, msgLen, realmsg);
+#else
+		scope;
+		message;
+#endif
+	}
+
+	virtual void __cdecl Flush() override {}
+};
+
+#pragma region    Singleton
+static AMF*       __instance;
+static std::mutex __instance_mutex;
+void              Plugin::AMD::AMF::Initialize()
+{
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (!__instance)
+		__instance = new AMF();
+}
+
+AMF* Plugin::AMD::AMF::Instance()
+{
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	return __instance;
+}
+
+void Plugin::AMD::AMF::Finalize()
+{
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (__instance)
+		delete __instance;
+	__instance = nullptr;
+}
+#pragma endregion Singleton
+
+const wchar_t* loggername = L"OBSWriter";
+
+Plugin::AMD::AMF::AMF()
+{
+	AMF_RESULT res = AMF_OK;
+
+#pragma region Null Class Members
+	m_TimerPeriod        = 0;
+	m_AMFVersion_Plugin  = AMF_FULL_VERSION;
+	m_AMFVersion_Runtime = 0;
+	m_AMFModule          = 0;
+
+	m_AMFFactory    = nullptr;
+	m_AMFTrace      = nullptr;
+	m_AMFDebug      = nullptr;
+	AMFQueryVersion = nullptr;
+	AMFInit         = nullptr;
+	m_TraceWriter   = nullptr;
+	m_TimerPeriod   = 0;
+#pragma endregion Null Class Members
+
+#ifdef _WIN32
+	std::vector<char> verbuf;
+	void*             pProductVersion     = nullptr;
+	uint32_t          lProductVersionSize = 0;
+#endif
+
+	// Initialize AMF Library
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
+
+	// Load AMF Runtime Library
+	m_AMFModule = LoadLibraryW(AMF_DLL_NAME);
+	if (!m_AMFModule) {
+		QUICK_FORMAT_MESSAGE(msg, "Unable to load '%ls', error code %ld.", AMF_DLL_NAME, GetLastError());
+		throw std::exception(msg.data());
+	} else {
+		PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded '%ls'.", AMF_DLL_NAME);
+	}
+
+// Windows: Get Product Version for Driver Matching
+#ifdef _WIN32
+	{
+		verbuf.resize(GetFileVersionInfoSizeW(AMF_DLL_NAME, nullptr) * 2);
+		GetFileVersionInfoW(AMF_DLL_NAME, 0, (DWORD)verbuf.size(), verbuf.data());
+
+		void* pBlock = verbuf.data();
+
+		// Read the list of languages and code pages.
+		struct LANGANDCODEPAGE {
+			WORD wLanguage;
+			WORD wCodePage;
+		} * lpTranslate;
+		UINT cbTranslate = sizeof(LANGANDCODEPAGE);
+
+		VerQueryValueA(pBlock, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &cbTranslate);
+
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "%s%04x%04x%s", "\\StringFileInfo\\", lpTranslate[0].wLanguage,
+				 lpTranslate[0].wCodePage, "\\ProductVersion");
+
+		// Retrieve file description for language and code page "i".
+		VerQueryValueA(pBlock, buf.data(), &pProductVersion, &lProductVersionSize);
+	}
+#endif _WIN32
+
+	// Query Runtime Version
+	AMFQueryVersion = (AMFQueryVersion_Fn)GetProcAddress(m_AMFModule, AMF_QUERY_VERSION_FUNCTION_NAME);
+	if (!AMFQueryVersion) {
+		QUICK_FORMAT_MESSAGE(msg, "Incompatible AMF Runtime (could not find '%s'), error code %ld.",
+							 AMF_QUERY_VERSION_FUNCTION_NAME, GetLastError());
+		throw std::exception(msg.data());
+	} else {
+		res = AMFQueryVersion(&m_AMFVersion_Runtime);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(msg, "Querying Version failed, error code %ld.", res);
+			throw std::exception(msg.data());
+		}
+	}
+
+	/// Blacklist Drivers with older SDK.
+	if (m_AMFVersion_Runtime < AMF_MAKE_FULL_VERSION(1, 4, 6, 0)) {
+		PLOG_WARNING("The AMF Runtime is very old and unsupported, consider updating your drivers.");
+	}
+
+	/// Initialize AMF
+	AMFInit = (AMFInit_Fn)GetProcAddress(m_AMFModule, AMF_INIT_FUNCTION_NAME);
+	if (!AMFInit) {
+		QUICK_FORMAT_MESSAGE(msg, "Incompatible AMF Runtime (could not find '%s'), error code %ld.",
+							 AMF_QUERY_VERSION_FUNCTION_NAME, GetLastError());
+		throw std::exception(msg.data());
+	} else {
+		res = AMFInit(m_AMFVersion_Runtime, &m_AMFFactory);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(msg, "Initializing AMF Library failed, error code %ld.", res);
+			throw std::exception(msg.data());
+		}
+	}
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> AMF Library initialized.");
+
+	/// Retrieve Trace Object.
+	res = m_AMFFactory->GetTrace(&m_AMFTrace);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(msg, "Retrieving AMF Trace class failed, error code %ld.", res);
+		throw std::exception(msg.data());
+	}
+
+	/// Retrieve Debug Object.
+	res = m_AMFFactory->GetDebug(&m_AMFDebug);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(msg, "Retrieving AMF Debug class failed, error code %ld.", res);
+		throw std::exception(msg.data());
+	}
+
+/// Register Trace Writer and disable Debug Tracing.
+#ifndef _WIN64
+	// Older drivers crash due to using the wrong calling standard.
+	if (m_AMFVersion_Runtime >= AMF_MAKE_FULL_VERSION(1, 4, 4, 0)) {
+#endif
+		m_TraceWriter = new CustomWriter();
+		m_AMFTrace->RegisterWriter(loggername, m_TraceWriter, true);
+#ifndef _WIN64
+	}
+#endif
+	this->EnableDebugTrace(false);
+
+	// Log success
+	PLOG_INFO(
+		"Version %d.%d.%d loaded (Compiled: %d.%d.%d.%d, Runtime: %d.%d.%d.%d, Library: %.*s).", PLUGIN_VERSION_MAJOR,
+		PLUGIN_VERSION_MINOR, PLUGIN_VERSION_PATCH, (uint16_t)((m_AMFVersion_Plugin >> 48ull) & 0xFFFF),
+		(uint16_t)((m_AMFVersion_Plugin >> 32ull) & 0xFFFF), (uint16_t)((m_AMFVersion_Plugin >> 16ull) & 0xFFFF),
+		(uint16_t)((m_AMFVersion_Plugin & 0xFFFF)), (uint16_t)((m_AMFVersion_Runtime >> 48ull) & 0xFFFF),
+		(uint16_t)((m_AMFVersion_Runtime >> 32ull) & 0xFFFF), (uint16_t)((m_AMFVersion_Runtime >> 16ull) & 0xFFFF),
+		(uint16_t)((m_AMFVersion_Runtime & 0xFFFF)), lProductVersionSize, pProductVersion);
+
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initialized.");
+}
+
+Plugin::AMD::AMF::~AMF()
+{
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing.");
+	if (m_AMFModule) {
+		if (m_TraceWriter) {
+			if (m_AMFTrace)
+				m_AMFTrace->UnregisterWriter(loggername);
+			delete m_TraceWriter;
+			m_TraceWriter = nullptr;
+		}
+
+		FreeLibrary(m_AMFModule);
+	}
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalized.");
+
+#pragma region Null Class Members
+	m_TimerPeriod        = 0;
+	m_AMFVersion_Plugin  = 0;
+	m_AMFVersion_Runtime = 0;
+	m_AMFModule          = 0;
+
+	m_AMFFactory    = nullptr;
+	m_AMFTrace      = nullptr;
+	m_AMFDebug      = nullptr;
+	AMFQueryVersion = nullptr;
+	AMFInit         = nullptr;
+#pragma endregion Null Class Members
+}
+
+amf::AMFFactory* Plugin::AMD::AMF::GetFactory()
+{
+	return m_AMFFactory;
+}
+
+amf::AMFTrace* Plugin::AMD::AMF::GetTrace()
+{
+	return m_AMFTrace;
+}
+
+amf::AMFDebug* Plugin::AMD::AMF::GetDebug()
+{
+	return m_AMFDebug;
+}
+
+void Plugin::AMD::AMF::EnableDebugTrace(bool enable)
+{
+	if (!m_AMFTrace)
+		throw std::exception("<" __FUNCTION_NAME__ "> called without a AMFTrace object!");
+	if (!m_AMFDebug)
+		throw std::exception("<" __FUNCTION_NAME__ "> called without a AMFDebug object!");
+
+#ifndef _WIN64
+	// Older drivers crash due to using the wrong calling standard.
+	if (m_AMFVersion_Runtime < AMF_MAKE_FULL_VERSION(1, 4, 4, 0)) {
+		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, false);
+		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_NOLOG);
+		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_FILE, false);
+		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_FILE, AMF_TRACE_NOLOG);
+		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, false);
+		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_NOLOG);
+		m_AMFDebug->AssertsEnable(false);
+		m_AMFDebug->EnablePerformanceMonitor(false);
+		m_AMFTrace->TraceEnableAsync(false);
+		m_AMFTrace->SetGlobalLevel(AMF_TRACE_NOLOG);
+		return;
+	}
+#endif
+
+	// Console
+	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, false);
+	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_NOLOG);
+
+	// File
+	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_FILE, false);
+	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_FILE, AMF_TRACE_NOLOG);
+	m_AMFTrace->SetPath(L"C:\\AMFTrace.log");
+
+// Debug Output
+#ifdef _DEBUG
+	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, true);
+	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_TEST);
+#else
+	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, false);
+	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_NOLOG);
+#endif
+
+	m_AMFDebug->AssertsEnable(enable);
+	m_AMFDebug->EnablePerformanceMonitor(enable);
+	//m_AMFTrace->TraceEnableAsync(true);
+	uint32_t loglevel = enable ? AMF_TRACE_TEST : AMF_TRACE_WARNING;
+	m_AMFTrace->SetGlobalLevel(loglevel);
+	m_AMFTrace->SetWriterLevel(L"OBSWriter", loglevel);
+}
+
+uint64_t Plugin::AMD::AMF::GetPluginVersion()
+{
+	return m_AMFVersion_Plugin;
+}
+
+uint64_t Plugin::AMD::AMF::GetRuntimeVersion()
+{
+	return m_AMFVersion_Runtime;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/api-base.cpp Added

@@ -0,0 +1,200 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "api-base.h"
+#include "api-d3d11.h"
+#include "api-d3d9.h"
+#include "api-host.h"
+#include "api-opengl.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#include <VersionHelpers.h>
+#include <windows.h>
+#endif
+
+using namespace Plugin::API;
+
+// An Adapter on an API
+bool Plugin::API::operator<(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right)
+{
+	if (left == right)
+		return left.Name < right.Name;
+	else
+		return (((uint64_t)left.idLow + ((uint64_t)left.idHigh << 32))
+				< ((uint64_t)right.idLow + ((uint64_t)right.idHigh << 32)));
+}
+
+bool Plugin::API::operator>(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right)
+{
+	return right < left;
+}
+
+bool Plugin::API::operator<=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right)
+{
+	return !(right < left);
+}
+
+bool Plugin::API::operator>=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right)
+{
+	return !(left < right);
+}
+
+bool Plugin::API::operator==(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right)
+{
+	return ((left.idLow == right.idLow) && (right.idHigh == right.idHigh));
+}
+
+bool Plugin::API::operator!=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right)
+{
+	return !(left == right);
+}
+
+// Instance of an API Adapter
+Plugin::API::Instance::Instance() {}
+
+Plugin::API::Instance::~Instance() {}
+
+// API Interface
+Plugin::API::IAPI::IAPI() {}
+
+Plugin::API::IAPI::~IAPI() {}
+
+Plugin::API::Adapter Plugin::API::IAPI::GetAdapterById(int32_t idLow, int32_t idHigh)
+{
+	for (auto adapter : EnumerateAdapters()) {
+		if ((adapter.idLow == idLow) && (adapter.idHigh == idHigh))
+			return adapter;
+	}
+	return *(EnumerateAdapters().begin());
+}
+
+Plugin::API::Adapter Plugin::API::IAPI::GetAdapterByName(std::string name)
+{
+	for (auto adapter : EnumerateAdapters()) {
+		if (adapter.Name == name)
+			return adapter;
+	}
+	return *(EnumerateAdapters().begin());
+}
+
+// Static API Stuff
+static std::vector<std::shared_ptr<IAPI>> s_APIInstances;
+void                                      Plugin::API::InitializeAPIs()
+{
+// DirectX 11
+#ifdef _WIN32
+	if (IsWindows8OrGreater()) {
+		try {
+			s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Direct3D11>());
+		} catch (...) {
+			PLOG_WARNING("Direct3D 11 not supported.");
+		}
+	}
+#endif
+
+// DirectX 9
+#ifdef _WIN32
+	if (IsWindowsXPOrGreater()) {
+		try {
+			s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Direct3D9>());
+		} catch (...) {
+			PLOG_WARNING("Direct3D 9 not supported.");
+		}
+	}
+#endif
+
+	// Mikhail says these are for compatibility only, not actually backends.
+	//// OpenGL
+	//{
+	//	s_APIInstances.insert(s_APIInstances.end(), std::make_shared<OpenGL>());
+	//}
+
+	//// Host
+	//{
+	//	s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Host>());
+	//}
+}
+
+void Plugin::API::FinalizeAPIs()
+{
+	s_APIInstances.clear();
+}
+
+size_t Plugin::API::CountAPIs()
+{
+	return s_APIInstances.size();
+}
+
+std::string Plugin::API::GetAPIName(size_t index)
+{
+	auto indAPI = s_APIInstances.begin();
+	indAPI + index; // Advanced by x elements.
+
+	if (indAPI == s_APIInstances.end())
+		throw std::exception("Invalid API Index");
+
+	return indAPI->get()->GetName();
+}
+
+std::shared_ptr<IAPI> Plugin::API::GetAPI(size_t index)
+{
+	auto indAPI = s_APIInstances.begin();
+	indAPI + index; // Advanced by x elements.
+
+	if (indAPI == s_APIInstances.end())
+		throw std::exception("Invalid API Index");
+
+	return *indAPI;
+}
+
+std::shared_ptr<IAPI> Plugin::API::GetAPI(std::string name)
+{
+	for (auto api : s_APIInstances) {
+		if (name == api->GetName()) {
+			return api;
+		}
+	}
+	// If none was found, return the first one.
+	return *s_APIInstances.begin();
+}
+
+std::shared_ptr<IAPI> Plugin::API::GetAPI(Type type)
+{
+	for (auto api : s_APIInstances) {
+		if (type == api->GetType()) {
+			return api;
+		}
+	}
+	// If none was found, return the first one.
+	return *s_APIInstances.begin();
+}
+
+std::vector<std::shared_ptr<IAPI>> Plugin::API::EnumerateAPIs()
+{
+	return std::vector<std::shared_ptr<IAPI>>(s_APIInstances);
+}
+
+std::vector<std::string> Plugin::API::EnumerateAPINames()
+{
+	std::vector<std::string> names;
+	for (auto api : s_APIInstances) {
+		names.push_back(api->GetName());
+	}
+	return names;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/api-d3d11.cpp Added

@@ -0,0 +1,274 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <mutex>
+#include <sstream>
+#include <stdlib.h>
+#include "api-d3d11.h"
+
+using namespace Plugin::API;
+
+class SingletonDXGI {
+	public:
+#pragma region Singleton
+	static std::shared_ptr<SingletonDXGI> GetInstance()
+	{
+		static std::shared_ptr<SingletonDXGI> __instance = std::make_shared<SingletonDXGI>();
+		static std::mutex                     __mutex;
+
+		const std::lock_guard<std::mutex> lock(__mutex);
+		return __instance;
+	}
+#pragma endregion Singleton
+
+	SingletonDXGI()
+	{
+		hModule = LoadLibrary(TEXT("dxgi.dll"));
+		if (hModule == 0)
+			throw std::exception("Unable to load 'dxgi.dll'.");
+	}
+	~SingletonDXGI()
+	{
+		if (hModule)
+			FreeLibrary(hModule);
+	}
+
+	HRESULT CreateDXGIFactory(REFIID riid, _Out_ void** ppFactory)
+	{
+		if (hModule == 0)
+			return S_FALSE;
+
+		typedef HRESULT(__stdcall * t_CreateDXGIFactory)(REFIID, void**);
+		t_CreateDXGIFactory pCreateDXGIFactory = (t_CreateDXGIFactory)GetProcAddress(hModule, "CreateDXGIFactory");
+
+		if (pCreateDXGIFactory) {
+			return pCreateDXGIFactory(riid, ppFactory);
+		}
+		return S_FALSE;
+	}
+	HRESULT CreateDXGIFactory1(REFIID riid, _Out_ void** ppFactory)
+	{
+		if (hModule == 0)
+			return S_FALSE;
+
+		typedef HRESULT(__stdcall * t_CreateDXGIFactory1)(REFIID, void**);
+		t_CreateDXGIFactory1 pCreateDXGIFactory1 = (t_CreateDXGIFactory1)GetProcAddress(hModule, "CreateDXGIFactory1");
+
+		if (pCreateDXGIFactory1) {
+			return pCreateDXGIFactory1(riid, ppFactory);
+		}
+		return S_FALSE;
+	}
+
+	private:
+	HMODULE hModule;
+};
+
+class SingletonD3D11 {
+	public:
+#pragma region Singleton
+	static std::shared_ptr<SingletonD3D11> GetInstance()
+	{
+		static std::shared_ptr<SingletonD3D11> __instance = std::make_shared<SingletonD3D11>();
+		static std::mutex                      __mutex;
+
+		const std::lock_guard<std::mutex> lock(__mutex);
+		return __instance;
+	}
+#pragma endregion Singleton
+
+	SingletonD3D11()
+	{
+		hModule = LoadLibrary(TEXT("d3d11.dll"));
+		if (hModule == 0)
+			throw std::exception("Unable to load 'd3d11.dll'.");
+	}
+	~SingletonD3D11()
+	{
+		if (hModule)
+			FreeLibrary(hModule);
+	}
+
+	HRESULT WINAPI D3D11CreateDevice(_In_opt_ IDXGIAdapter* pAdapter, D3D_DRIVER_TYPE DriverType, HMODULE Software,
+									 UINT Flags, _In_reads_opt_(FeatureLevels) CONST D3D_FEATURE_LEVEL* pFeatureLevels,
+									 UINT FeatureLevels, UINT SDKVersion, _Out_opt_ ID3D11Device** ppDevice,
+									 _Out_opt_ D3D_FEATURE_LEVEL* pFeatureLevel,
+									 _Out_opt_ ID3D11DeviceContext** ppImmediateContext)
+	{
+		if (hModule == 0)
+			return S_FALSE;
+
+		typedef HRESULT(__stdcall * t_D3D11CreateDevice)(_In_opt_ IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT,
+														 CONST D3D_FEATURE_LEVEL*, UINT, UINT, _Out_opt_ ID3D11Device**,
+														 _Out_opt_ D3D_FEATURE_LEVEL*, _Out_opt_ ID3D11DeviceContext**);
+		t_D3D11CreateDevice pD3D11CreateDevice = (t_D3D11CreateDevice)GetProcAddress(hModule, "D3D11CreateDevice");
+
+		if (pD3D11CreateDevice) {
+			return pD3D11CreateDevice(pAdapter, DriverType, Software, Flags, pFeatureLevels, FeatureLevels, SDKVersion,
+									  ppDevice, pFeatureLevel, ppImmediateContext);
+		}
+		return S_FALSE;
+	}
+
+	private:
+	HMODULE hModule;
+};
+
+Plugin::API::Direct3D11::Direct3D11()
+{
+	auto    dxgiInst = SingletonDXGI::GetInstance();
+	HRESULT hr       = dxgiInst->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&m_DXGIFactory);
+	if (FAILED(hr))
+		throw std::exception("<" __FUNCTION_NAME__ "> Unable to create DXGI, error code %X.", hr);
+
+	// Enumerate Adapters
+	IDXGIAdapter1* dxgiAdapter = nullptr;
+	for (size_t adapterIndex = 0; !FAILED(m_DXGIFactory->EnumAdapters1((UINT)adapterIndex, &dxgiAdapter));
+		 adapterIndex++) {
+		DXGI_ADAPTER_DESC1 desc = DXGI_ADAPTER_DESC1();
+		dxgiAdapter->GetDesc1(&desc);
+
+		if (desc.VendorId != 0x1002 /* AMD */)
+			continue;
+
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "%ls (VEN_%04x/DEV_%04x/SUB_%04x/REV_%04x)", desc.Description, desc.VendorId,
+				 desc.DeviceId, desc.SubSysId, desc.Revision);
+
+		m_AdapterList.emplace_back(desc.AdapterLuid.LowPart, desc.AdapterLuid.HighPart, std::string(buf.data()));
+	}
+}
+
+Plugin::API::Direct3D11::~Direct3D11() {}
+
+std::string Plugin::API::Direct3D11::GetName()
+{
+	return std::string("Direct3D 11");
+}
+
+std::vector<Adapter> Plugin::API::Direct3D11::EnumerateAdapters()
+{
+	// We shouldn't expect HW to change during Runtime, at least not in a normal System.
+	return m_AdapterList;
+}
+
+std::shared_ptr<Instance> Plugin::API::Direct3D11::CreateInstance(Adapter adapter)
+{
+	//std::lock_guard<std::mutex> lock(m_InstanceMapMutex);
+	//std::pair<int32_t, int32_t> key = std::make_pair(adapter.idLow, adapter.idHigh);
+	//auto inst = m_InstanceMap.find(key);
+	//if (inst != m_InstanceMap.end())
+	//	return inst->second;
+
+	auto inst2 = std::make_shared<Direct3D11Instance>(this, adapter);
+	//m_InstanceMap.insert_or_assign(key, inst2);
+	return inst2;
+}
+
+Plugin::API::Type Plugin::API::Direct3D11::GetType()
+{
+	return Type::Direct3D11;
+}
+
+Plugin::API::Direct3D11Instance::Direct3D11Instance(Direct3D11* api, Adapter adapter)
+{
+	m_API           = api;
+	m_Adapter       = adapter;
+	m_Device        = nullptr;
+	m_DeviceContext = nullptr;
+
+	LUID adapterLUID;
+	adapterLUID.LowPart  = adapter.idLow;
+	adapterLUID.HighPart = adapter.idHigh;
+
+	HRESULT       hr = E_FAIL;
+	IDXGIAdapter* dxgiAdapter;
+	for (size_t adapterIndex = 0; !FAILED(api->m_DXGIFactory->EnumAdapters((UINT)adapterIndex, &dxgiAdapter));
+		 adapterIndex++) {
+		DXGI_ADAPTER_DESC desc = DXGI_ADAPTER_DESC();
+		dxgiAdapter->GetDesc(&desc);
+
+		if (desc.VendorId != 0x1002 /* AMD */)
+			continue;
+
+		if ((desc.AdapterLuid.HighPart == adapterLUID.HighPart) && (desc.AdapterLuid.LowPart == adapterLUID.LowPart)) {
+			hr = NOERROR;
+			break;
+		} else {
+			hr = E_INVALIDARG;
+		}
+	}
+	if (FAILED(hr))
+		throw std::invalid_argument("adapter");
+
+	// Create D3D Stuff
+	auto              d3dInst         = SingletonD3D11::GetInstance();
+	D3D_FEATURE_LEVEL featureLevels[] = {D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0};
+	for (size_t featureLevel = 0; featureLevel < _countof(featureLevels); featureLevel++) {
+		for (size_t enabledFlags = 0; enabledFlags < 3; enabledFlags++) {
+			uint32_t flags = 0;
+
+			switch (enabledFlags) {
+			case 0:
+				flags |= D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
+			case 1:
+				flags |= D3D11_CREATE_DEVICE_BGRA_SUPPORT;
+			case 2:
+				break;
+			}
+
+			hr = d3dInst->D3D11CreateDevice(
+				dxgiAdapter, dxgiAdapter == NULL ? D3D_DRIVER_TYPE_HARDWARE : D3D_DRIVER_TYPE_UNKNOWN, NULL, flags,
+				featureLevels + featureLevel, UINT(_countof(featureLevels) - featureLevel), D3D11_SDK_VERSION,
+				&m_Device, NULL, &m_DeviceContext);
+			if (SUCCEEDED(hr)) {
+				break;
+			} else {
+				PLOG_DEBUG("<" __FUNCTION_NAME__
+						   "> Unable to create D3D11 device, error code %X (mode %lld, level %lld).",
+						   hr, enabledFlags, featureLevel);
+			}
+		}
+	}
+	if (FAILED(hr)) {
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "<" __FUNCTION_NAME__ "> Unable to create D3D11 device, error code %X.", hr);
+		throw std::exception(buf.data());
+	}
+}
+
+Plugin::API::Direct3D11Instance::~Direct3D11Instance()
+{
+	if (m_Device)
+		m_Device->Release();
+
+	//std::lock_guard<std::mutex> lock(m_API->m_InstanceMapMutex);
+	//std::pair<int32_t, int32_t> key = std::make_pair(m_Adapter.idLow, m_Adapter.idHigh);
+	//m_API->m_InstanceMap.erase(key);
+}
+
+Plugin::API::Adapter Plugin::API::Direct3D11Instance::GetAdapter()
+{
+	return m_Adapter;
+}
+
+void* Plugin::API::Direct3D11Instance::GetContext()
+{
+	return m_Device;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/api-d3d9.cpp Added

@@ -0,0 +1,201 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <list>
+#include <mutex>
+#include "api-d3d9.h"
+
+using namespace Plugin::API;
+
+Plugin::API::Direct3D9::Direct3D9()
+{
+	HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &m_Direct3D9Ex);
+	if (FAILED(hr))
+		throw std::exception("<" __FUNCTION_NAME__ "> Failed to create D3D9Ex, error code %X.", hr);
+
+	std::list<LUID>        enumeratedLUIDs;
+	D3DADAPTER_IDENTIFIER9 adapterIdentifier;
+	for (size_t adapterIndex = 0;
+		 !FAILED(m_Direct3D9Ex->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier)); adapterIndex++) {
+		if (adapterIdentifier.VendorId != 0x1002 /* AMD */)
+			continue;
+
+		LUID adapterLUID;
+		if (FAILED(m_Direct3D9Ex->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
+			continue;
+
+		bool enumerated = false;
+		for (LUID enumeratedLUID : enumeratedLUIDs) {
+			if ((enumeratedLUID.LowPart == adapterLUID.LowPart) && (enumeratedLUID.HighPart == adapterLUID.HighPart)) {
+				enumerated = true;
+				break;
+			}
+		}
+		if (enumerated)
+			continue;
+		else
+			enumeratedLUIDs.push_back(adapterLUID);
+
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "%s [%s] (VEN_%04x/DEV_%04x/SUB_%04x/REV_%04x)", adapterIdentifier.Description,
+				 adapterIdentifier.DeviceName,
+
+				 adapterIdentifier.VendorId, adapterIdentifier.DeviceId, adapterIdentifier.SubSysId,
+				 adapterIdentifier.Revision);
+
+		m_Adapters.emplace_back(Adapter(adapterLUID.LowPart, adapterLUID.HighPart, std::string(buf.data())));
+	}
+}
+
+Plugin::API::Direct3D9::~Direct3D9()
+{
+	//m_InstanceMap.clear(); // Need to destroy IDirect3D9Device9Ex before IDirect3D9Ex.
+	m_Direct3D9Ex->Release();
+}
+
+std::string Plugin::API::Direct3D9::GetName()
+{
+	return std::string("Direct3D 9");
+}
+
+Plugin::API::Type Plugin::API::Direct3D9::GetType()
+{
+	return Type::Direct3D9;
+}
+
+std::vector<Adapter> Plugin::API::Direct3D9::EnumerateAdapters()
+{
+	return m_Adapters;
+}
+
+std::shared_ptr<Instance> Plugin::API::Direct3D9::CreateInstance(Adapter adapter)
+{
+	//std::pair<int32_t, int32_t> key = std::make_pair(adapter.idLow, adapter.idHigh);
+	//auto inst = m_InstanceMap.find(key);
+	//if (inst != m_InstanceMap.end())
+	//	return inst->second;
+
+	auto inst2 = std::make_shared<Direct3D9Instance>(this, adapter);
+	//m_InstanceMap.insert_or_assign(key, inst2);
+	return inst2;
+}
+
+Plugin::API::Direct3D9Instance::Direct3D9Instance(Direct3D9* api, Adapter adapter)
+{
+	this->m_API     = api;
+	this->m_Adapter = adapter;
+
+	size_t                 adapterNum = (size_t)-1;
+	D3DADAPTER_IDENTIFIER9 adapterIdentifier;
+	for (size_t adapterIndex = 0;
+		 !FAILED(api->m_Direct3D9Ex->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier)); adapterIndex++) {
+		if (adapterIdentifier.VendorId != 0x1002 /* AMD */)
+			continue;
+
+		LUID adapterLUID;
+		if (FAILED(api->m_Direct3D9Ex->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
+			continue;
+
+		if ((static_cast<int32_t>(adapterLUID.LowPart) == adapter.idLow)
+			&& (static_cast<int32_t>(adapterLUID.HighPart) == adapter.idHigh)) {
+			adapterNum = adapterIndex;
+			break;
+		}
+	}
+	if (adapterNum == -1)
+		throw std::invalid_argument("adapter");
+
+	D3DPRESENT_PARAMETERS presentParameters;
+	std::memset(&presentParameters, 0, sizeof(D3DPRESENT_PARAMETERS));
+	presentParameters.BackBufferWidth      = 0;
+	presentParameters.BackBufferHeight     = 0;
+	presentParameters.BackBufferFormat     = D3DFMT_UNKNOWN;
+	presentParameters.Windowed             = TRUE;
+	presentParameters.SwapEffect           = D3DSWAPEFFECT_COPY;
+	presentParameters.hDeviceWindow        = GetDesktopWindow();
+	presentParameters.Flags                = D3DPRESENTFLAG_VIDEO;
+	presentParameters.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
+
+	D3DCAPS9 ddCaps;
+	std::memset(&ddCaps, 0, sizeof(ddCaps));
+	HRESULT hr = api->m_Direct3D9Ex->GetDeviceCaps((UINT)adapterNum, D3DDEVTYPE_HAL, &ddCaps);
+	if (FAILED(hr)) {
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(),
+				 "<" __FUNCTION_NAME__ "> Unable to query capabilities for D3D9 adapter, error code %X.", hr);
+		throw std::exception(buf.data());
+	}
+
+	DWORD vp = 0;
+	if (ddCaps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) {
+		vp = D3DCREATE_HARDWARE_VERTEXPROCESSING;
+	} else {
+		vp = D3DCREATE_SOFTWARE_VERTEXPROCESSING;
+	}
+
+	hr = api->m_Direct3D9Ex->CreateDeviceEx((UINT)adapterNum, D3DDEVTYPE_HAL, presentParameters.hDeviceWindow,
+											vp | D3DCREATE_NOWINDOWCHANGES | D3DCREATE_MULTITHREADED,
+											&presentParameters, NULL, &m_Device);
+	if (FAILED(hr)) {
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "<" __FUNCTION_NAME__ "> Unable to create D3D9 device, error code %X.", hr);
+		throw std::exception(buf.data());
+	}
+}
+
+Plugin::API::Direct3D9Instance::~Direct3D9Instance()
+{
+	//std::pair<int32_t, int32_t> key = std::make_pair(m_Adapter.idLow, m_Adapter.idHigh);
+	//m_API->m_InstanceMap.erase(key);
+
+	//m_Device->Release(); // Can't release/free on AMD hardware?
+}
+
+Plugin::API::Adapter Plugin::API::Direct3D9Instance::GetAdapter()
+{
+	/*if (pInstance == nullptr)
+		throw std::invalid_argument("instance");
+
+	Direct3D9Instance* instance = static_cast<Direct3D9Instance*>(pInstance);
+	if (instance == nullptr)
+		throw std::invalid_argument("instance");
+
+	D3DDEVICE_CREATION_PARAMETERS par;
+	HRESULT hr = instance->device->GetCreationParameters(&par);
+	if (FAILED(hr)) {
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), "<" __FUNCTION_NAME__ "> Unable to get adapter from D3D9 device, error code %X.", hr);
+		throw std::exception(buf.data());
+	}
+
+	auto adapters = Direct3D9::EnumerateAdapters();
+	if (par.AdapterOrdinal > adapters.size())
+		return *adapters.begin();
+
+	auto adapter = adapters.begin();
+	for (size_t n = 0; n < par.AdapterOrdinal; n++)
+		adapter++;
+	return *adapter;*/
+	return m_Adapter;
+}
+
+void* Plugin::API::Direct3D9Instance::GetContext()
+{
+	return m_Device;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/api-host.cpp Added

@@ -0,0 +1,54 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "api-host.h"
+
+using namespace Plugin::API;
+
+std::string Plugin::API::Host::GetName()
+{
+	return "Host";
+}
+
+Plugin::API::Type Plugin::API::Host::GetType()
+{
+	return Type::Host;
+}
+
+std::vector<Adapter> Plugin::API::Host::EnumerateAdapters()
+{
+	std::vector<Adapter> list;
+	list.push_back(Adapter(0, 0, "Default"));
+	return list;
+}
+
+std::shared_ptr<Instance> Plugin::API::Host::CreateInstance(Adapter adapter)
+{
+	return std::make_unique<HostInstance>();
+}
+
+Plugin::API::Adapter Plugin::API::HostInstance::GetAdapter()
+{
+	return Adapter(0, 0, "Default");
+}
+
+void* Plugin::API::HostInstance::GetContext()
+{
+	return nullptr;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/api-opengl.cpp Added

@@ -0,0 +1,69 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <vector>
+#include "api-opengl.h"
+
+using namespace Plugin::API;
+
+Plugin::API::OpenGL::OpenGL()
+{
+	// ToDo: Adapter enumeration needs to go by Display/Desktop.
+	// - Nvidia is the only one that has GPU Affinity extension.
+	// - Intel perhaps too since they used Nvidia technology. (Until recently at least)
+}
+
+Plugin::API::OpenGL::~OpenGL() {}
+
+std::string Plugin::API::OpenGL::GetName()
+{
+	return std::string("OpenGL");
+}
+
+Plugin::API::Type Plugin::API::OpenGL::GetType()
+{
+	return Type::OpenGL;
+}
+
+std::vector<Adapter> Plugin::API::OpenGL::EnumerateAdapters()
+{
+	std::vector<Adapter> adapters;
+	adapters.push_back(Adapter(0, 0, "Default"));
+	return adapters;
+}
+
+std::shared_ptr<Instance> Plugin::API::OpenGL::CreateInstance(Adapter adapter)
+{
+	// ToDo: Actually create a hidden window and OpenGL context. Not that it is going to be useful.
+	return std::make_unique<OpenGLInstance>();
+}
+
+Plugin::API::OpenGLInstance::OpenGLInstance() {}
+
+Plugin::API::OpenGLInstance::~OpenGLInstance() {}
+
+Plugin::API::Adapter Plugin::API::OpenGLInstance::GetAdapter()
+{
+	return Adapter(0, 0, "Default");
+}
+
+void* Plugin::API::OpenGLInstance::GetContext()
+{
+	return nullptr;
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/enc-h264.cpp Added

@@ -0,0 +1,1586 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "amf-capabilities.h"
+#include "amf-encoder-h264.h"
+#include "enc-h264.h"
+#include "strings.h"
+#include "utility.h"
+
+#define PREFIX "[H264/AVC]"
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+using namespace Plugin::Interface;
+using namespace Utility;
+
+void Plugin::Interface::H264Interface::encoder_register()
+{
+	// Test if we actually have AVC support.
+	if (!AMD::CapabilityManager::Instance()->IsCodecSupported(Codec::AVC)) {
+		PLOG_WARNING(PREFIX " Not supported by any GPU, disabling...");
+		return;
+	}
+
+	// Create structure
+	static std::unique_ptr<obs_encoder_info> encoder_info = std::make_unique<obs_encoder_info>();
+	std::memset(encoder_info.get(), 0, sizeof(obs_encoder_info));
+
+	// Initialize Structure
+	encoder_info->type               = obs_encoder_type::OBS_ENCODER_VIDEO;
+	static const char* encoder_name  = "amd_amf_h264";
+	encoder_info->id                 = encoder_name;
+	static const char* encoder_codec = "h264";
+	encoder_info->codec              = encoder_codec;
+
+	// Functions
+	encoder_info->get_name       = &get_name;
+	encoder_info->get_defaults   = &get_defaults;
+	encoder_info->get_properties = &get_properties;
+	encoder_info->create         = &create;
+	encoder_info->destroy        = &destroy;
+	encoder_info->encode         = &encode;
+	encoder_info->update         = &update;
+	encoder_info->get_video_info = &get_video_info;
+	encoder_info->get_extra_data = &get_extra_data;
+
+	obs_register_encoder(encoder_info.get());
+	PLOG_DEBUG(PREFIX " Registered.");
+}
+
+const char* Plugin::Interface::H264Interface::get_name(void*)
+{
+	static const char* name = "H264/AVC Encoder (" PLUGIN_NAME ")";
+	return name;
+}
+
+void* Plugin::Interface::H264Interface::create(obs_data_t* settings, obs_encoder_t* encoder)
+{
+	try {
+		return new Plugin::Interface::H264Interface(settings, encoder);
+	} catch (std::exception e) {
+		PLOG_ERROR("%s", e.what());
+	}
+	return nullptr;
+}
+
+void Plugin::Interface::H264Interface::destroy(void* data)
+{
+	if (data)
+		delete static_cast<Plugin::Interface::H264Interface*>(data);
+}
+
+bool Plugin::Interface::H264Interface::encode(void* data, struct encoder_frame* frame, struct encoder_packet* packet,
+											  bool* received_packet)
+{
+	try {
+		if (data)
+			return static_cast<Plugin::Interface::H264Interface*>(data)->encode(frame, packet, received_packet);
+	} catch (std::exception e) {
+		PLOG_ERROR("%s", e.what());
+	}
+	return false;
+}
+
+void Plugin::Interface::H264Interface::get_defaults(obs_data_t* data)
+{
+#pragma region OBS - Enforce Streaming Service Restrictions
+	obs_data_set_default_int(data, "keyint_sec", 0);
+	obs_data_set_default_string(data, "rate_control", "");
+	obs_data_set_default_string(data, "profile", "");
+	obs_data_set_default_string(data, "preset", "");
+#pragma endregion OBS - Enforce Streaming Service Restrictions
+
+	// Preset
+	obs_data_set_default_int(data, P_PRESET, static_cast<int64_t>(Presets::None));
+
+	// Static Properties
+	//obs_data_set_default_int(data, P_USAGE, static_cast<int64_t>(Usage::Transcoding));
+	obs_data_set_default_int(data, P_QUALITYPRESET, static_cast<int64_t>(QualityPreset::Balanced));
+	obs_data_set_default_int(data, P_PROFILE, static_cast<int64_t>(Profile::High));
+	obs_data_set_default_int(data, P_PROFILELEVEL, static_cast<int64_t>(ProfileLevel::Automatic));
+	//obs_data_set_default_frames_per_second(data, P_ASPECTRATIO, media_frames_per_second{ 1, 1 }, "");
+	obs_data_set_default_int(data, P_CODINGTYPE, static_cast<int64_t>(CodingType::Automatic));
+	obs_data_set_default_int(data, P_MAXIMUMREFERENCEFRAMES, 4);
+
+	// Rate Control Properties
+	obs_data_set_default_int(data, ("last" P_RATECONTROLMETHOD), -1);
+	obs_data_set_default_int(data, P_RATECONTROLMETHOD, static_cast<int64_t>(RateControlMethod::ConstantBitrate));
+	obs_data_set_default_int(data, P_PREPASSMODE, static_cast<int64_t>(PrePassMode::Disabled));
+	obs_data_set_default_int(data, "bitrate", 3500);
+	obs_data_set_default_int(data, P_BITRATE_PEAK, 9000);
+	obs_data_set_default_int(data, P_QP_IFRAME, 22);
+	obs_data_set_default_int(data, P_QP_PFRAME, 22);
+	obs_data_set_default_int(data, P_QP_BFRAME, 22);
+	obs_data_set_default_int(data, P_QP_MINIMUM, 18);
+	obs_data_set_default_int(data, P_QP_MAXIMUM, 51);
+	obs_data_set_default_int(data, P_FILLERDATA, 1);
+	obs_data_set_default_int(data, P_FRAMESKIPPING, 0);
+	obs_data_set_default_int(data, P_FRAMESKIPPING_PERIOD, 0);
+	obs_data_set_default_int(data, P_FRAMESKIPPING_BEHAVIOUR, 0);
+	obs_data_set_default_int(data, P_VBAQ, 0);
+	obs_data_set_default_int(data, P_ENFORCEHRD, 1);
+
+	// VBV Buffer
+	obs_data_set_default_int(data, ("last" P_VBVBUFFER), -1);
+	obs_data_set_default_int(data, P_VBVBUFFER, 0);
+	obs_data_set_default_int(data, P_VBVBUFFER_SIZE, 3500);
+	obs_data_set_default_double(data, P_VBVBUFFER_STRICTNESS, 50);
+	obs_data_set_default_double(data, P_VBVBUFFER_INITIALFULLNESS, 100);
+
+	// Picture Control
+	obs_data_set_default_double(data, P_INTERVAL_KEYFRAME, 2.0);
+	obs_data_set_default_int(data, P_PERIOD_IDR_H264, 0);
+	obs_data_set_default_double(data, P_INTERVAL_IFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_IFRAME, 0);
+	obs_data_set_default_double(data, P_INTERVAL_PFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_PFRAME, 0);
+	obs_data_set_default_double(data, P_INTERVAL_BFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_BFRAME, 0);
+	obs_data_set_default_int(data, ("last" P_BFRAME_PATTERN), -1);
+	obs_data_set_default_int(data, P_BFRAME_PATTERN, 0);
+	obs_data_set_default_int(data, ("last" P_BFRAME_REFERENCE), -1);
+	obs_data_set_default_int(data, P_BFRAME_REFERENCE, 0);
+	obs_data_set_default_int(data, P_BFRAME_REFERENCEDELTAQP, 2);
+	obs_data_set_default_int(data, P_BFRAME_DELTAQP, 4);
+	obs_data_set_default_int(data, P_DEBLOCKINGFILTER, 1);
+	obs_data_set_default_int(data, P_MOTIONESTIMATION, 3);
+
+	// System Properties
+	obs_data_set_default_string(data, ("last" P_VIDEO_API), "");
+	obs_data_set_default_string(data, P_VIDEO_API, "");
+	obs_data_set_default_int(data, ("last" P_VIDEO_ADAPTER), 0);
+	obs_data_set_default_int(data, P_VIDEO_ADAPTER, 0);
+	obs_data_set_default_int(data, P_OPENCL_TRANSFER, 0);
+	obs_data_set_default_int(data, P_OPENCL_CONVERSION, 0);
+	obs_data_set_default_int(data, P_MULTITHREADING, 0);
+	obs_data_set_default_int(data, P_QUEUESIZE, 8);
+	obs_data_set_default_int(data, ("last" P_VIEW), -1);
+	obs_data_set_default_int(data, P_VIEW, static_cast<int64_t>(ViewMode::Basic));
+	obs_data_set_default_bool(data, P_DEBUG, false);
+	obs_data_set_default_int(data, P_VERSION, PLUGIN_VERSION_FULL);
+}
+
+static void fill_api_list(obs_property_t* p)
+{
+	obs_property_list_clear(p);
+	auto cm = CapabilityManager::Instance();
+
+	for (auto api : Plugin::API::EnumerateAPIs()) {
+		if (cm->IsCodecSupportedByAPI(Codec::AVC, api->GetType()))
+			obs_property_list_add_string(p, api->GetName().c_str(), api->GetName().c_str());
+	}
+}
+
+static void fill_device_list(obs_property_t* p, const char* apiname)
+{
+	obs_property_list_clear(p);
+
+	auto cm  = CapabilityManager::Instance();
+	auto api = Plugin::API::GetAPI(std::string(apiname));
+	for (auto adapter : api->EnumerateAdapters()) {
+		union {
+			int32_t id[2];
+			int64_t v;
+		} adapterid = {adapter.idLow, adapter.idHigh};
+		if (cm->IsCodecSupportedByAPIAdapter(Codec::AVC, api->GetType(), adapter))
+			obs_property_list_add_int(p, adapter.Name.c_str(), adapterid.v);
+	}
+}
+
+obs_properties_t* Plugin::Interface::H264Interface::get_properties(void* data)
+{
+	obs_properties* props = obs_properties_create();
+	obs_property_t* p;
+
+#pragma region Preset
+	p = obs_properties_add_list(props, P_PRESET, P_TRANSLATE(P_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_modified_callback(p, properties_modified);
+	obs_property_list_add_int(p, "", -1);
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_RESETTODEFAULTS), static_cast<int32_t>(Presets::ResetToDefaults));
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_RECORDING), static_cast<int32_t>(Presets::Recording));
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_HIGHQUALITY), static_cast<int32_t>(Presets::HighQuality));
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_INDISTINGUISHABLE),
+							  static_cast<int32_t>(Presets::Indistinguishable));
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_LOSSLESS), static_cast<int32_t>(Presets::Lossless));
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_TWITCH), static_cast<int32_t>(Presets::Twitch));
+	obs_property_list_add_int(p, P_TRANSLATE(P_PRESET_YOUTUBE), static_cast<int32_t>(Presets::YouTube));
+#pragma endregion Preset
+
+	// Static Properties
+#pragma region Quality Preset
+	p = obs_properties_add_list(props, P_QUALITYPRESET, P_TRANSLATE(P_QUALITYPRESET), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUALITYPRESET)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_SPEED), static_cast<int32_t>(QualityPreset::Speed));
+	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_BALANCED), static_cast<int32_t>(QualityPreset::Balanced));
+	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_QUALITY), static_cast<int32_t>(QualityPreset::Quality));
+#pragma endregion Quality Preset
+
+#pragma region Profile, Levels
+	p = obs_properties_add_list(props, P_PROFILE, P_TRANSLATE(P_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILE)));
+	obs_property_list_add_int(p, "Constrained Baseline", static_cast<int32_t>(Profile::ConstrainedBaseline));
+	obs_property_list_add_int(p, "Baseline", static_cast<int32_t>(Profile::Baseline));
+	obs_property_list_add_int(p, "Main", static_cast<int32_t>(Profile::Main));
+	obs_property_list_add_int(p, "Constrained High", static_cast<int32_t>(Profile::ConstrainedHigh));
+	obs_property_list_add_int(p, "High", static_cast<int32_t>(Profile::High));
+
+	p = obs_properties_add_list(props, P_PROFILELEVEL, P_TRANSLATE(P_PROFILELEVEL), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILELEVEL)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(ProfileLevel::Automatic));
+	obs_property_list_add_int(p, "1.0", static_cast<int32_t>(ProfileLevel::L10));
+	obs_property_list_add_int(p, "1.1", static_cast<int32_t>(ProfileLevel::L11));
+	obs_property_list_add_int(p, "1.2", static_cast<int32_t>(ProfileLevel::L12));
+	obs_property_list_add_int(p, "1.3", static_cast<int32_t>(ProfileLevel::L13));
+	obs_property_list_add_int(p, "2.0", static_cast<int32_t>(ProfileLevel::L20));
+	obs_property_list_add_int(p, "2.1", static_cast<int32_t>(ProfileLevel::L21));
+	obs_property_list_add_int(p, "2.2", static_cast<int32_t>(ProfileLevel::L22));
+	obs_property_list_add_int(p, "3.0", static_cast<int32_t>(ProfileLevel::L30));
+	obs_property_list_add_int(p, "3.1", static_cast<int32_t>(ProfileLevel::L31));
+	obs_property_list_add_int(p, "3.2", static_cast<int32_t>(ProfileLevel::L32));
+	obs_property_list_add_int(p, "4.0", static_cast<int32_t>(ProfileLevel::L40));
+	obs_property_list_add_int(p, "4.1", static_cast<int32_t>(ProfileLevel::L41));
+	obs_property_list_add_int(p, "4.2", static_cast<int32_t>(ProfileLevel::L42));
+	obs_property_list_add_int(p, "5.0", static_cast<int32_t>(ProfileLevel::L50));
+	obs_property_list_add_int(p, "5.1", static_cast<int32_t>(ProfileLevel::L51));
+	obs_property_list_add_int(p, "5.2", static_cast<int32_t>(ProfileLevel::L52));
+#pragma endregion Profile, Levels
+
+#pragma region Coding Type
+	p = obs_properties_add_list(props, P_CODINGTYPE, P_TRANSLATE(P_CODINGTYPE), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_CODINGTYPE)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(CodingType::Automatic));
+	obs_property_list_add_int(p, "CABAC", static_cast<int32_t>(CodingType::CABAC));
+	obs_property_list_add_int(p, "CALVC", static_cast<int32_t>(CodingType::CALVC));
+#pragma endregion Coding Type
+
+#pragma region Maximum Reference Frames
+	p = obs_properties_add_int_slider(props, P_MAXIMUMREFERENCEFRAMES, P_TRANSLATE(P_MAXIMUMREFERENCEFRAMES), 1, 16, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MAXIMUMREFERENCEFRAMES)));
+#pragma endregion Maximum Reference Frames
+
+	// Rate Control
+#pragma region Rate Control Method
+	p = obs_properties_add_list(props, P_RATECONTROLMETHOD, P_TRANSLATE(P_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_RATECONTROLMETHOD)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CQP),
+							  static_cast<int32_t>(RateControlMethod::ConstantQP));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CBR),
+							  static_cast<int32_t>(RateControlMethod::ConstantBitrate));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBR),
+							  static_cast<int32_t>(RateControlMethod::PeakConstrainedVariableBitrate));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBRLAT),
+							  static_cast<int32_t>(RateControlMethod::LatencyConstrainedVariableBitrate));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion Rate Control Method
+
+#pragma region Pre - Pass
+	p = obs_properties_add_list(props, P_PREPASSMODE, P_TRANSLATE(P_PREPASSMODE), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PREPASSMODE)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), static_cast<int32_t>(PrePassMode::Disabled));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), static_cast<int32_t>(PrePassMode::Enabled));
+#pragma endregion Pre - Pass
+
+#pragma region Parameters
+	/// Bitrate Constraints
+	p = obs_properties_add_int(props, "bitrate", P_TRANSLATE(P_BITRATE_TARGET), 0, 1, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_TARGET)));
+	p = obs_properties_add_int(props, P_BITRATE_PEAK, P_TRANSLATE(P_BITRATE_PEAK), 0, 1, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_PEAK)));
+
+	/// Minimum QP, Maximum QP
+	p = obs_properties_add_int_slider(props, P_QP_MINIMUM, P_TRANSLATE(P_QP_MINIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_MINIMUM)));
+	p = obs_properties_add_int_slider(props, P_QP_MAXIMUM, P_TRANSLATE(P_QP_MAXIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_MAXIMUM)));
+
+	/// Method: Constant QP
+	p = obs_properties_add_int_slider(props, P_QP_IFRAME, P_TRANSLATE(P_QP_IFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME)));
+	p = obs_properties_add_int_slider(props, P_QP_PFRAME, P_TRANSLATE(P_QP_PFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME)));
+	p = obs_properties_add_int_slider(props, P_QP_BFRAME, P_TRANSLATE(P_QP_BFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_BFRAME)));
+#pragma endregion Parameters
+
+#pragma region Filler Data
+	p = obs_properties_add_list(props, P_FILLERDATA, P_TRANSLATE(P_FILLERDATA), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FILLERDATA)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion Filler Data
+
+#pragma region Frame Skipping
+	p = obs_properties_add_list(props, P_FRAMESKIPPING, P_TRANSLATE(P_FRAMESKIPPING), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+	p = obs_properties_add_int(props, P_FRAMESKIPPING_PERIOD, P_TRANSLATE(P_FRAMESKIPPING_PERIOD), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_PERIOD)));
+	p = obs_properties_add_list(props, P_FRAMESKIPPING_BEHAVIOUR, P_TRANSLATE(P_FRAMESKIPPING_BEHAVIOUR),
+								OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_BEHAVIOUR)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_SKIPNTH), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_KEEPNTH), 1);
+#pragma endregion Frame Skipping
+
+#pragma region VBAQ
+	p = obs_properties_add_list(props, P_VBAQ, P_TRANSLATE(P_VBAQ), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBAQ)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion VBAQ
+
+#pragma region Enforce Hyptothetical Reference Decoder Restrictions
+	p = obs_properties_add_list(props, P_ENFORCEHRD, P_TRANSLATE(P_ENFORCEHRD), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_ENFORCEHRD)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion Enforce Hyptothetical Reference Decoder Restrictions
+
+	// VBV Buffer
+#pragma region VBV Buffer Mode
+	p = obs_properties_add_list(props, P_VBVBUFFER, P_TRANSLATE(P_VBVBUFFER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_MANUAL), 1);
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion VBV Buffer Mode
+
+#pragma region VBV Buffer Strictness
+	p = obs_properties_add_float_slider(props, P_VBVBUFFER_STRICTNESS, P_TRANSLATE(P_VBVBUFFER_STRICTNESS), 0.0, 100.0,
+										0.1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_STRICTNESS)));
+#pragma endregion VBV Buffer Strictness
+
+#pragma region VBV Buffer Size
+	p = obs_properties_add_int_slider(props, P_VBVBUFFER_SIZE, P_TRANSLATE(P_VBVBUFFER_SIZE), 1, 1000000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_SIZE)));
+#pragma endregion VBV Buffer Size
+
+#pragma region VBV Buffer Initial Fullness
+	p = obs_properties_add_float_slider(props, P_VBVBUFFER_INITIALFULLNESS, P_TRANSLATE(P_VBVBUFFER_INITIALFULLNESS),
+										0.0, 100.0, 100.0 / 64.0);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_INITIALFULLNESS)));
+#pragma endregion VBV Buffer Initial Fullness
+
+	// Picture Control
+#pragma region Interval and Periods
+	/// Keyframe, IDR
+	p = obs_properties_add_float(props, P_INTERVAL_KEYFRAME, P_TRANSLATE(P_INTERVAL_KEYFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_KEYFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_IDR_H264, P_TRANSLATE(P_PERIOD_IDR_H264), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IDR_H264)));
+	/// I-Frame
+	p = obs_properties_add_float(props, P_INTERVAL_IFRAME, P_TRANSLATE(P_INTERVAL_IFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_IFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_IFRAME, P_TRANSLATE(P_PERIOD_IFRAME), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IFRAME)));
+	/// P-Frame
+	p = obs_properties_add_float(props, P_INTERVAL_PFRAME, P_TRANSLATE(P_INTERVAL_PFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_PFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_PFRAME, P_TRANSLATE(P_PERIOD_PFRAME), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_PFRAME)));
+	/// B-Frame
+	p = obs_properties_add_float(props, P_INTERVAL_BFRAME, P_TRANSLATE(P_INTERVAL_BFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_BFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_BFRAME, P_TRANSLATE(P_PERIOD_BFRAME), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_BFRAME)));
+#pragma endregion Interval and Periods
+
+#pragma region B - Frames Pattern
+	p = obs_properties_add_int_slider(props, P_BFRAME_PATTERN, P_TRANSLATE(P_BFRAME_PATTERN), 0, 3, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_PATTERN)));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion B - Frames Pattern
+
+#pragma region B - Frames Reference
+	p = obs_properties_add_list(props, P_BFRAME_REFERENCE, P_TRANSLATE(P_BFRAME_REFERENCE), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_REFERENCE)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion B - Frames Reference
+
+#pragma region B - Frames Delta QP
+	p = obs_properties_add_int_slider(props, P_BFRAME_REFERENCEDELTAQP, P_TRANSLATE(P_BFRAME_REFERENCEDELTAQP), -10, 10,
+									  1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_REFERENCEDELTAQP)));
+
+	p = obs_properties_add_int_slider(props, P_BFRAME_DELTAQP, P_TRANSLATE(P_BFRAME_DELTAQP), -10, 10, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BFRAME_DELTAQP)));
+#pragma endregion B - Frames Delta QP
+
+#pragma region Deblocking Filter
+	p = obs_properties_add_list(props, P_DEBLOCKINGFILTER, P_TRANSLATE(P_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBLOCKINGFILTER)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion Deblocking Filter
+
+#pragma region Motion Estimation
+	p = obs_properties_add_list(props, P_MOTIONESTIMATION, P_TRANSLATE(P_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MOTIONESTIMATION)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_HALF), 1);
+	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_QUARTER), 2);
+	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_FULL), 3);
+#pragma endregion Motion Estimation
+
+	// System
+#pragma region Video APIs
+	p = obs_properties_add_list(props, P_VIDEO_API, P_TRANSLATE(P_VIDEO_API), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_STRING);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_API)));
+	obs_property_set_modified_callback(p, properties_modified);
+	fill_api_list(p);
+#pragma endregion Video APIs
+
+#pragma region Video Adapters
+	p = obs_properties_add_list(props, P_VIDEO_ADAPTER, P_TRANSLATE(P_VIDEO_ADAPTER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_ADAPTER)));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion Video Adapters
+
+#pragma region OpenCL
+	p = obs_properties_add_list(props, P_OPENCL_TRANSFER, P_TRANSLATE(P_OPENCL_TRANSFER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_TRANSFER)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+
+	p = obs_properties_add_list(props, P_OPENCL_CONVERSION, P_TRANSLATE(P_OPENCL_CONVERSION), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_CONVERSION)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion OpenCL
+
+#pragma region Asynchronous Queue
+	p = obs_properties_add_list(props, P_MULTITHREADING, P_TRANSLATE(P_MULTITHREADING), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MULTITHREADING)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+
+	p = obs_properties_add_int_slider(props, P_QUEUESIZE, P_TRANSLATE(P_QUEUESIZE), 1, 32, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUEUESIZE)));
+#pragma endregion Asynchronous Queue
+
+#pragma region View Mode
+	p = obs_properties_add_list(props, P_VIEW, P_TRANSLATE(P_VIEW), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIEW)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_BASIC), static_cast<int32_t>(ViewMode::Basic));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_ADVANCED), static_cast<int32_t>(ViewMode::Advanced));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_EXPERT), static_cast<int32_t>(ViewMode::Expert));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_MASTER), static_cast<int32_t>(ViewMode::Master));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion View Mode
+
+	/// Debug
+	p = obs_properties_add_bool(props, P_DEBUG, P_TRANSLATE(P_DEBUG));
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBUG)));
+
+	// Disable non-dynamic properties if we have an encoder.
+	obs_properties_set_param(props, data, nullptr);
+
+	return props;
+}
+
+static void obs_data_transfer_settings(obs_data_t* data)
+{
+#define TRANSFER_STRING(xold, xnew) obs_data_set_string(data, xnew, obs_data_get_string(data, xold))
+#define TRANSFER_FLOAT(xold, xnew) obs_data_set_double(data, xnew, obs_data_get_double(data, xold))
+#define TRANSFER_INT(xold, xnew) obs_data_set_int(data, xnew, obs_data_get_int(data, xold))
+#define TRANSFER_BOOL(xold, xnew) obs_data_set_bool(data, xnew, obs_data_get_bool(data, xold))
+
+	uint64_t version = obs_data_get_int(data, P_VERSION);
+	switch (version) {
+	case (((uint64_t)(1 & 0xFFFF) << 48ull) | ((uint64_t)(4 & 0xFFFF) << 32ull) | ((uint64_t)(3 & 0xFFFF) << 16ull)
+		  | ((uint64_t)(5) & 0xFFFF)):
+		obs_data_set_double(data, "AMF.H264.VBVBuffer.Strictness",
+							obs_data_get_double(data, "AMF.H264.VBVBuffer.Strictness") + 50.0);
+	case (((uint64_t)(1 & 0xFFFF) << 48ull) | ((uint64_t)(4 & 0xFFFF) << 32ull) | ((uint64_t)(3 & 0xFFFF) << 16ull)
+		  | ((uint64_t)(8) & 0xFFFF)):
+		TRANSFER_INT("AMF.H264.Preset", P_PRESET);
+
+		// Static
+		//TRANSFER_INT("AMF.H264.Usage", P_USAGE);
+		TRANSFER_INT("AMF.H264.QualityPreset", P_QUALITYPRESET);
+		TRANSFER_INT("AMF.H264.Profile", P_PROFILE);
+		TRANSFER_INT("AMF.H264.ProfileLevel", P_PROFILELEVEL);
+		TRANSFER_INT("AMF.H264.AspectRatio", P_ASPECTRATIO);
+		TRANSFER_INT("AMF.H264.CodingType", P_CODINGTYPE);
+		TRANSFER_INT("AMF.H264.MaximumReferenceFrames", P_MAXIMUMREFERENCEFRAMES);
+
+		// Rate Control
+		TRANSFER_INT("AMF.H264.RateControlMethod", P_RATECONTROLMETHOD);
+		TRANSFER_INT("AMF.H264.PreAnalysisPass", P_PREPASSMODE);
+		TRANSFER_INT("AMF.H264.Bitrate.Target", P_BITRATE_TARGET);
+		TRANSFER_INT("AMF.H264.Bitrate.Peak", P_BITRATE_PEAK);
+		TRANSFER_INT("AMF.H264.QP.IFrame", P_QP_IFRAME);
+		TRANSFER_INT("AMF.H264.QP.PFrame", P_QP_PFRAME);
+		TRANSFER_INT("AMF.H264.QP.BFrame", P_QP_BFRAME);
+		TRANSFER_INT("AMF.H264.QP.Minimum", P_QP_MINIMUM);
+		TRANSFER_INT("AMF.H264.QP.Maximum", P_QP_MAXIMUM);
+		TRANSFER_INT("AMF.H264.FillerData", P_FILLERDATA);
+		TRANSFER_INT("AMF.H264.FrameSkipping", P_FRAMESKIPPING);
+		TRANSFER_INT("AMF.H264.VBAQ", P_VBAQ);
+		TRANSFER_INT("AMF.H264.EnforceHRD", P_ENFORCEHRD);
+
+		// VBV Buffer
+		TRANSFER_INT("AMF.H264.VBVBuffer", P_VBVBUFFER);
+		TRANSFER_FLOAT("AMF.H264.VBVBuffer.Strictness", P_VBVBUFFER_STRICTNESS);
+		TRANSFER_INT("AMF.H264.VBVBuffer.Size", P_VBVBUFFER_SIZE);
+		TRANSFER_FLOAT("AMF.H264.VBVBuffer.Fullness", P_VBVBUFFER_INITIALFULLNESS);
+
+		// Picture Control
+		TRANSFER_FLOAT("AMF.H264.KeyframeInterval", P_INTERVAL_KEYFRAME);
+		TRANSFER_INT("AMF.H264.IDRPeriod", P_PERIOD_IDR_H264);
+		/// GOP Type
+		/// GOP Size
+		/// GOP Alignment
+		TRANSFER_INT("AMF.H264.BFrame.Pattern", P_BFRAME_PATTERN);
+		TRANSFER_INT("AMF.H264.BFrame.DeltaQP", P_BFRAME_DELTAQP);
+		TRANSFER_INT("AMF.H264.BFrame.Reference", P_BFRAME_REFERENCE);
+		TRANSFER_INT("AMF.H264.BFrame.DeltaQP", P_BFRAME_REFERENCEDELTAQP);
+		TRANSFER_INT("AMF.H264.DeblockingFilter", P_DEBLOCKINGFILTER);
+		TRANSFER_INT("AMF.H264.MotionEstimation", P_MOTIONESTIMATION);
+
+		// System
+		TRANSFER_STRING("AMF.H264.VideoAPI", P_VIDEO_API);
+		TRANSFER_INT("AMF.H264.VideoAdapter", P_VIDEO_ADAPTER);
+		TRANSFER_INT("AMF.H264.OpenCL", P_OPENCL_TRANSFER);
+		TRANSFER_INT("AMF.H264.OpenCL", P_OPENCL_CONVERSION);
+		TRANSFER_INT("AMF.H264.View", P_VIEW);
+		TRANSFER_INT("AMF.H264.Debug", P_DEBUG);
+	case (((uint64_t)(2 & 0xFFFF) << 48ull) | ((uint64_t)(0 & 0xFFFF) << 32ull) | ((uint64_t)(0) & 0xFFFFFFFF)):
+		TRANSFER_FLOAT("KeyframeInterval", P_INTERVAL_KEYFRAME);
+		TRANSFER_INT("H264.IDRPeriod", P_PERIOD_IDR_H264);
+		TRANSFER_INT("H265.IDRPeriod", P_PERIOD_IDR_H265);
+	case (((uint64_t)(2 & 0xFFFF) << 48ull) | ((uint64_t)(3 & 0xFFFF) << 32ull) | ((uint64_t)(0) & 0xFFFFFFFF)):
+		TRANSFER_INT(P_BITRATE_TARGET, "bitrate");
+	}
+	obs_data_set_int(data, P_VERSION, PLUGIN_VERSION_FULL);
+}
+
+bool Plugin::Interface::H264Interface::properties_modified(obs_properties_t* props, obs_property_t*, obs_data_t* data)
+{
+	bool            result = false;
+	obs_property_t* p;
+
+	// Transfer settings from older Plugin versions to newer ones.
+	obs_data_transfer_settings(data);
+
+#pragma region Video API& Adapter
+	// Video API
+	const char *videoAPI_last = obs_data_get_string(data, ("last" P_VIDEO_API)),
+			   *videoAPI_cur  = obs_data_get_string(data, P_VIDEO_API);
+	if (strlen(videoAPI_cur) == 0) {
+		p = obs_properties_get(props, P_VIDEO_API);
+		obs_data_set_string(data, P_VIDEO_API, obs_property_list_item_string(p, 0));
+		videoAPI_cur = obs_data_get_string(data, P_VIDEO_API);
+
+		result = true;
+	}
+	/// If a different API was selected, rebuild the device list.
+	if (strcmp(videoAPI_last, videoAPI_cur) != 0) {
+		obs_data_set_string(data, ("last" P_VIDEO_API), videoAPI_cur);
+		fill_device_list(obs_properties_get(props, P_VIDEO_ADAPTER), videoAPI_cur);
+		result = true;
+
+		// Reset Video Adapter to first in list.
+		obs_data_set_int(data, P_VIDEO_ADAPTER,
+						 obs_property_list_item_int(obs_properties_get(props, P_VIDEO_ADAPTER), 0));
+	}
+
+	// Video Adapter
+	int64_t videoAdapter_last = obs_data_get_int(data, ("last" P_VIDEO_ADAPTER)),
+			videoAdapter_cur  = obs_data_get_int(data, P_VIDEO_ADAPTER);
+	if (videoAdapter_last != videoAdapter_cur) {
+		obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), videoAdapter_cur);
+		result = true;
+
+		auto api = Plugin::API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
+		union {
+			int64_t  v;
+			uint32_t id[2];
+		} adapterid  = {videoAdapter_cur};
+		auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
+		try {
+			auto enc = EncoderH264(api, adapter);
+
+#define TEMP_LIMIT_DROPDOWN(func, enm, prop)                                             \
+	{                                                                                    \
+		auto tmp_p = obs_properties_get(props, prop);                                    \
+		auto tmp_l = enc.func();                                                         \
+		enm  tmp_s = static_cast<enm>(obs_data_get_int(data, obs_property_name(tmp_p))); \
+		for (size_t idx = 0; idx < obs_property_list_item_count(tmp_p); idx++) {         \
+			bool enabled = false;                                                        \
+			enm  tmp_v   = static_cast<enm>(obs_property_list_item_int(tmp_p, idx));     \
+			for (auto tmp_k : tmp_l) {                                                   \
+				if (tmp_k == tmp_v) {                                                    \
+					enabled = true;                                                      \
+					break;                                                               \
+				}                                                                        \
+			}                                                                            \
+			obs_property_list_item_disable(tmp_p, idx, !enabled);                        \
+			if ((enabled == false) && (tmp_s == tmp_v))                                  \
+				obs_data_unset_user_value(data, obs_property_name(tmp_p));               \
+		}                                                                                \
+	}
+#define TEMP_LIMIT_SLIDER(func, prop)                                               \
+	{                                                                               \
+		auto tmp_p = obs_properties_get(props, prop);                               \
+		auto tmp_l = enc.func();                                                    \
+		obs_property_int_set_limits(tmp_p, (int)tmp_l.first, (int)tmp_l.second, 1); \
+	}
+#define TEMP_LIMIT_SLIDER_BITRATE(func, prop)                                                     \
+	{                                                                                             \
+		auto tmp_p = obs_properties_get(props, prop);                                             \
+		auto tmp_l = enc.func();                                                                  \
+		obs_property_int_set_limits(tmp_p, (int)tmp_l.first / 1000, (int)tmp_l.second / 1000, 1); \
+	}
+
+			//TEMP_LIMIT_DROPDOWN(CapsUsage, AMD::Usage, P_USAGE);
+			TEMP_LIMIT_DROPDOWN(CapsQualityPreset, AMD::QualityPreset, P_QUALITYPRESET);
+			TEMP_LIMIT_DROPDOWN(CapsProfile, AMD::Profile, P_PROFILE);
+			TEMP_LIMIT_DROPDOWN(CapsProfileLevel, AMD::ProfileLevel, P_PROFILELEVEL);
+			{
+				auto tmp_p = obs_properties_get(props, P_PROFILELEVEL);
+				obs_property_list_item_disable(tmp_p, 0, false);
+			}
+			TEMP_LIMIT_DROPDOWN(CapsCodingType, AMD::CodingType, P_CODINGTYPE);
+			TEMP_LIMIT_SLIDER(CapsMaximumReferenceFrames, P_MAXIMUMREFERENCEFRAMES);
+			TEMP_LIMIT_DROPDOWN(CapsRateControlMethod, AMD::RateControlMethod, P_RATECONTROLMETHOD);
+			try {
+				TEMP_LIMIT_DROPDOWN(CapsPrePassMode, AMD::PrePassMode, P_PREPASSMODE);
+				obs_property_set_enabled(obs_properties_get(props, P_PREPASSMODE), true);
+			} catch (...) {
+				obs_property_set_enabled(obs_properties_get(props, P_PREPASSMODE), false);
+			}
+
+			TEMP_LIMIT_SLIDER_BITRATE(CapsTargetBitrate, "bitrate");
+			TEMP_LIMIT_SLIDER_BITRATE(CapsPeakBitrate, P_BITRATE_PEAK);
+			TEMP_LIMIT_SLIDER_BITRATE(CapsVBVBufferSize, P_VBVBUFFER_SIZE);
+			{
+				auto bframep    = obs_properties_get(props, P_BFRAME_PATTERN);
+				auto bframecaps = enc.CapsBFramePattern();
+				obs_property_int_set_limits(bframep, 0, (int)bframecaps, 1);
+				if (obs_data_get_int(data, obs_property_name(bframep)) > bframecaps) {
+					obs_data_set_int(data, obs_property_name(bframep), bframecaps);
+				}
+			}
+		} catch (const std::exception& e) {
+			PLOG_ERROR("Exception occured while updating capabilities: %s", e.what());
+		}
+	}
+#pragma endregion Video API& Adapter
+
+#pragma region Presets
+	Presets lastPreset = static_cast<Presets>(obs_data_get_int(data, ("last" P_PRESET))),
+			preset     = static_cast<Presets>(obs_data_get_int(data, P_PRESET));
+	if (lastPreset != preset) { // Reset State
+		obs_property_t* pn = obs_properties_first(props);
+		do {
+			obs_property_set_enabled(pn, true);
+		} while (obs_property_next(&pn));
+
+		result = true;
+	}
+	if (preset != Presets::None)
+		result = true;
+
+	switch (preset) {
+	case Presets::ResetToDefaults:
+#pragma region Default
+	{
+		obs_property_t* pn = obs_properties_first(props);
+		do {
+			const char* name = obs_property_name(pn);
+
+			// Do not reset Video Adapter or API.
+			if ((strcmp(name, P_VIDEO_API) == 0) || (strcmp(name, P_VIDEO_ADAPTER) == 0))
+				continue;
+
+			switch (obs_property_get_type(pn)) {
+			case obs_property_type::OBS_PROPERTY_BOOL:
+				obs_data_set_bool(data, name, obs_data_get_default_bool(data, name));
+				break;
+			case obs_property_type::OBS_PROPERTY_FLOAT:
+				obs_data_set_double(data, name, obs_data_get_default_double(data, name));
+				break;
+			case obs_property_type::OBS_PROPERTY_INT:
+				obs_data_set_int(data, name, obs_data_get_default_int(data, name));
+				break;
+			case obs_property_type::OBS_PROPERTY_TEXT:
+				obs_data_set_string(data, name, obs_data_get_default_string(data, name));
+				break;
+			case obs_property_type::OBS_PROPERTY_LIST:
+				switch (obs_property_list_format(pn)) {
+				case obs_combo_format::OBS_COMBO_FORMAT_INT:
+					obs_data_set_int(data, name, obs_data_get_default_int(data, name));
+					break;
+				case obs_combo_format::OBS_COMBO_FORMAT_FLOAT:
+					obs_data_set_double(data, name, obs_data_get_default_double(data, name));
+					break;
+				case obs_combo_format::OBS_COMBO_FORMAT_STRING:
+					obs_data_set_string(data, name, obs_data_get_default_string(data, name));
+					break;
+				}
+				break;
+			}
+			obs_property_set_enabled(pn, true);
+		} while (obs_property_next(&pn));
+	} break;
+#pragma endregion Default
+	case Presets::Recording:
+#pragma region Recording
+		// Static Properties
+		//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
+		//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
+		obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
+		obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
+
+		// Rate Control Properties
+		obs_data_set_int(data, P_RATECONTROLMETHOD,
+						 static_cast<int32_t>(RateControlMethod::LatencyConstrainedVariableBitrate));
+		obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
+		if (obs_data_get_int(data, "bitrate") < 10000)
+			obs_data_set_int(data, "bitrate", 10000);
+		obs_data_unset_user_value(data, P_QP_MINIMUM);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_MINIMUM), false);
+		obs_data_unset_user_value(data, P_QP_MAXIMUM);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_MAXIMUM), false);
+		obs_data_set_int(data, P_FILLERDATA, 0);
+		obs_property_set_enabled(obs_properties_get(props, P_FILLERDATA), false);
+
+		// Frame Control Properties
+		if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
+			obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+
+		// Miscellaneous Properties
+		obs_data_set_int(data, P_MOTIONESTIMATION, 3);
+		obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
+		break;
+#pragma endregion Recording
+	case Presets::HighQuality:
+#pragma region High Quality
+		// Static Properties
+		//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
+		//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
+		obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
+		obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
+
+		// Rate Control Properties
+		obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantQP));
+		obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
+		obs_data_set_int(data, P_QP_IFRAME, 18);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_IFRAME), false);
+		obs_data_set_int(data, P_QP_PFRAME, 18);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_PFRAME), false);
+		obs_data_set_int(data, P_QP_BFRAME, 18);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_BFRAME), false);
+
+		// Frame Control Properties
+		if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
+			obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+
+		// Miscellaneous Properties
+		obs_data_set_int(data, P_MOTIONESTIMATION, 3);
+		obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
+		break;
+#pragma endregion High Quality
+	case Presets::Indistinguishable:
+#pragma region Indistinguishable
+		// Static Properties
+		//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
+		//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
+		obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
+		obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
+
+		// Rate Control Properties
+		obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantQP));
+		obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
+		obs_data_set_int(data, P_QP_IFRAME, 15);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_IFRAME), false);
+		obs_data_set_int(data, P_QP_PFRAME, 15);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_PFRAME), false);
+		obs_data_set_int(data, P_QP_BFRAME, 15);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_BFRAME), false);
+
+		// Frame Control Properties
+		if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
+			obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+
+		// Miscellaneous Properties
+		obs_data_set_int(data, P_MOTIONESTIMATION, 3);
+		obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
+		break;
+#pragma endregion Indistinguishable
+	case Presets::Lossless:
+#pragma region Lossless
+		// Static Properties
+		//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
+		//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
+		obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::High));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
+		obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
+
+		// Rate Control Properties
+		obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantQP));
+		obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
+		obs_data_set_int(data, P_QP_IFRAME, 0);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_IFRAME), false);
+		obs_data_set_int(data, P_QP_PFRAME, 0);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_PFRAME), false);
+
+		// Frame Control Properties
+		if (obs_data_get_double(data, P_INTERVAL_KEYFRAME) < 2)
+			obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+		//obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+		//obs_property_set_enabled(obs_properties_get(props, P_INTERVAL_KEYFRAME), true);
+		obs_data_set_int(data, P_BFRAME_PATTERN, 0);
+		obs_property_set_enabled(obs_properties_get(props, P_BFRAME_PATTERN), false);
+
+		// Miscellaneous Properties
+		obs_data_set_int(data, P_MOTIONESTIMATION, 3);
+		obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
+		break;
+#pragma endregion Lossless
+	case Presets::Twitch:
+#pragma region Twitch
+		// Static Properties
+		//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
+		//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
+		obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::Main));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
+		obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
+
+		// Rate Control Properties
+		obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantBitrate));
+		obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
+		if (obs_data_get_int(data, "bitrate") < 500)
+			obs_data_set_int(data, "bitrate", 500);
+		obs_data_unset_user_value(data, P_QP_MINIMUM);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_MINIMUM), false);
+		obs_data_unset_user_value(data, P_QP_MAXIMUM);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_MAXIMUM), false);
+		obs_data_set_int(data, P_FILLERDATA, 1);
+		obs_property_set_enabled(obs_properties_get(props, P_FILLERDATA), false);
+
+		// Frame Control Properties
+		obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+		obs_property_set_enabled(obs_properties_get(props, P_INTERVAL_KEYFRAME), false);
+
+		// Miscellaneous Properties
+		obs_data_set_int(data, P_MOTIONESTIMATION, 3);
+		obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
+		break;
+#pragma endregion Twitch
+	case Presets::YouTube:
+#pragma region YouTube
+		// Static Properties
+		//obs_data_set_int(data, P_USAGE, static_cast<int32_t>(Usage::Transcoding));
+		//obs_property_set_enabled(obs_properties_get(props, P_USAGE), false);
+		obs_data_set_int(data, P_PROFILE, static_cast<int32_t>(Profile::Main));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILE), false);
+		obs_data_set_int(data, P_PROFILELEVEL, static_cast<int32_t>(ProfileLevel::Automatic));
+		obs_property_set_enabled(obs_properties_get(props, P_PROFILELEVEL), false);
+
+		// Rate Control Properties
+		obs_data_set_int(data, P_RATECONTROLMETHOD, static_cast<int32_t>(RateControlMethod::ConstantBitrate));
+		obs_property_set_enabled(obs_properties_get(props, P_RATECONTROLMETHOD), false);
+		if (obs_data_get_int(data, "bitrate") < 500)
+			obs_data_set_int(data, "bitrate", 500);
+		obs_data_unset_user_value(data, P_QP_MINIMUM);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_MINIMUM), false);
+		obs_data_unset_user_value(data, P_QP_MAXIMUM);
+		obs_property_set_enabled(obs_properties_get(props, P_QP_MAXIMUM), false);
+		obs_data_set_int(data, P_FILLERDATA, 1);
+		obs_property_set_enabled(obs_properties_get(props, P_FILLERDATA), false);
+
+		// Frame Control Properties
+		obs_data_set_double(data, P_INTERVAL_KEYFRAME, 2);
+		obs_property_set_enabled(obs_properties_get(props, P_INTERVAL_KEYFRAME), false);
+
+		// Miscellaneous Properties
+		obs_data_set_int(data, P_MOTIONESTIMATION, 3);
+		obs_property_set_enabled(obs_properties_get(props, P_MOTIONESTIMATION), false);
+		break;
+#pragma endregion YouTube
+	}
+#pragma endregion Presets
+
+#pragma region View Mode
+	ViewMode lastView = static_cast<ViewMode>(obs_data_get_int(data, ("last" P_VIEW))),
+			 curView  = static_cast<ViewMode>(obs_data_get_int(data, P_VIEW));
+	if (lastView != curView) {
+		obs_data_set_int(data, ("last" P_VIEW), static_cast<int32_t>(curView));
+		result = true;
+	}
+
+	std::vector<std::pair<const char*, ViewMode>> viewstuff = {
+		std::make_pair(P_PRESET, ViewMode::Basic),
+		// ----------- Static Section
+		//std::make_pair(P_USAGE, ViewMode::Master),
+		std::make_pair(P_QUALITYPRESET, ViewMode::Basic),
+		std::make_pair(P_PROFILE, ViewMode::Advanced),
+		std::make_pair(P_PROFILELEVEL, ViewMode::Advanced),
+		std::make_pair(P_ASPECTRATIO, ViewMode::Master),
+		std::make_pair(P_CODINGTYPE, ViewMode::Expert),
+		std::make_pair(P_MAXIMUMREFERENCEFRAMES, ViewMode::Expert),
+		// ----------- Rate Control Section
+		std::make_pair(P_RATECONTROLMETHOD, ViewMode::Basic),
+		//std::make_pair(P_PREPASSMODE, ViewMode::Basic),
+		//std::make_pair(P_BITRATE_TARGET, ViewMode::Basic),
+		//std::make_pair(P_BITRATE_PEAK, ViewMode::Basic),
+		//std::make_pair(P_QP_IFRAME, ViewMode::Basic),
+		//std::make_pair(P_QP_PFRAME, ViewMode::Basic),
+		//std::make_pair(P_QP_BFRAME, ViewMode::Basic),
+		//std::make_pair(P_QP_MINIMUM, ViewMode::Advanced),
+		//std::make_pair(P_QP_MAXIMUM, ViewMode::Advanced),
+		//std::make_pair(P_FILLERDATA, ViewMode::Basic),
+		std::make_pair(P_FRAMESKIPPING, ViewMode::Advanced),
+		std::make_pair(P_FRAMESKIPPING_PERIOD, ViewMode::Master),
+		std::make_pair(P_FRAMESKIPPING_BEHAVIOUR, ViewMode::Master),
+		//std::make_pair(P_VBAQ, ViewMode::Expert),
+		std::make_pair(P_ENFORCEHRD, ViewMode::Expert),
+		// ----------- VBV Buffer
+		std::make_pair(P_VBVBUFFER, ViewMode::Advanced),
+		//std::make_pair(P_VBVBUFFER_STRICTNESS, ViewMode::Advanced),
+		//std::make_pair(P_VBVBUFFER_SIZE, ViewMode::Advanced),
+		std::make_pair(P_VBVBUFFER_INITIALFULLNESS, ViewMode::Expert),
+		// ----------- Picture Control
+		std::make_pair(P_INTERVAL_KEYFRAME, ViewMode::Basic),
+		std::make_pair(P_PERIOD_IDR_H264, ViewMode::Master),
+		std::make_pair(P_INTERVAL_IFRAME, ViewMode::Master),
+		std::make_pair(P_PERIOD_IFRAME, ViewMode::Master),
+		std::make_pair(P_INTERVAL_PFRAME, ViewMode::Master),
+		std::make_pair(P_PERIOD_PFRAME, ViewMode::Master),
+		//std::make_pair(P_INTERVAL_BFRAME, ViewMode::Master),
+		//std::make_pair(P_PERIOD_BFRAME, ViewMode::Master),
+		std::make_pair(P_BFRAME_PATTERN, ViewMode::Advanced),
+		std::make_pair(P_BFRAME_DELTAQP, ViewMode::Advanced),
+		std::make_pair(P_BFRAME_REFERENCE, ViewMode::Advanced),
+		std::make_pair(P_BFRAME_REFERENCEDELTAQP, ViewMode::Advanced),
+		std::make_pair(P_DEBLOCKINGFILTER, ViewMode::Expert),
+		std::make_pair(P_MOTIONESTIMATION, ViewMode::Expert),
+		// ----------- Intra-Refresh
+		//std::make_pair("", ViewMode::Master),
+		// ----------- System
+		std::make_pair(P_VIDEO_API, ViewMode::Advanced),
+		std::make_pair(P_VIDEO_ADAPTER, ViewMode::Advanced),
+		std::make_pair(P_OPENCL_TRANSFER, ViewMode::Advanced),
+		std::make_pair(P_OPENCL_CONVERSION, ViewMode::Advanced),
+		std::make_pair(P_MULTITHREADING, ViewMode::Expert),
+		std::make_pair(P_QUEUESIZE, ViewMode::Expert),
+		std::make_pair(P_VIEW, ViewMode::Basic),
+		std::make_pair(P_DEBUG, ViewMode::Basic),
+	};
+	for (std::pair<const char*, ViewMode> kv : viewstuff) {
+		bool vis  = curView >= kv.second;
+		auto visp = obs_properties_get(props, kv.first);
+		if (visp != nullptr) {
+			obs_property_set_visible(visp, vis);
+			if (!vis)
+				obs_data_unset_user_value(data, kv.first);
+		}
+	}
+
+	// Special Logic
+#pragma region B - Frames
+	auto bframeProperty  = obs_properties_get(props, P_BFRAME_PATTERN);
+	bool bframeSupported = obs_property_int_max(bframeProperty) > 0;
+	bool bframeVisible   = (curView >= ViewMode::Advanced) && bframeSupported;
+
+	/// Pattern
+	obs_property_set_visible(bframeProperty, (curView >= ViewMode::Advanced) && bframeSupported);
+	if (!bframeVisible)
+		obs_data_unset_user_value(data, P_BFRAME_PATTERN);
+	bool lastUsingBFrames = obs_data_get_int(data, ("last" P_BFRAME_PATTERN)) != 0,
+		 usingBFrames     = obs_data_get_int(data, P_BFRAME_PATTERN) != 0;
+	if (usingBFrames != lastUsingBFrames) {
+		obs_data_set_int(data, ("last" P_BFRAME_PATTERN), obs_data_get_int(data, P_BFRAME_PATTERN));
+		result = true;
+	}
+
+	/// Reference
+	bool bframeReferenceVisible = (curView >= ViewMode::Advanced) && bframeSupported && usingBFrames;
+	obs_property_set_visible(obs_properties_get(props, P_BFRAME_REFERENCE), bframeReferenceVisible);
+	if (!bframeReferenceVisible)
+		obs_data_unset_user_value(data, P_BFRAME_REFERENCE);
+	bool lastUsingBFrameReference = obs_data_get_int(data, ("last" P_BFRAME_REFERENCE)) != 0,
+		 usingBFrameReference     = obs_data_get_int(data, P_BFRAME_REFERENCE) == 1;
+	if (usingBFrameReference != lastUsingBFrameReference) {
+		obs_data_set_int(data, ("last" P_BFRAME_REFERENCE), obs_data_get_int(data, P_BFRAME_REFERENCE));
+		result = true;
+	}
+
+	/// QP Delta
+	obs_property_set_visible(obs_properties_get(props, P_BFRAME_DELTAQP), bframeVisible && usingBFrames);
+	if (!bframeVisible || !usingBFrames)
+		obs_data_unset_user_value(data, P_BFRAME_DELTAQP);
+	obs_property_set_visible(obs_properties_get(props, P_BFRAME_REFERENCEDELTAQP),
+							 bframeVisible && usingBFrames && usingBFrameReference);
+	if (!bframeVisible || !usingBFrames || !usingBFrameReference)
+		obs_data_unset_user_value(data, P_BFRAME_REFERENCEDELTAQP);
+#pragma endregion B - Frames
+
+#pragma region Rate Control
+	bool vis_rcm_bitrate_target = false, vis_rcm_bitrate_peak = false, vis_rcm_qp = false, vis_rcm_qp_b = false,
+		 vis_rcm_fillerdata = false;
+
+	RateControlMethod lastRCM = static_cast<RateControlMethod>(obs_data_get_int(data, ("last" P_RATECONTROLMETHOD))),
+					  curRCM  = static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD));
+	if (lastRCM != curRCM) {
+		obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), static_cast<int32_t>(curRCM));
+		result = true;
+	}
+	switch (curRCM) {
+	case RateControlMethod::ConstantQP:
+		vis_rcm_qp   = true;
+		vis_rcm_qp_b = bframeSupported && usingBFrames;
+		break;
+	case RateControlMethod::ConstantBitrate:
+		vis_rcm_bitrate_target = true;
+		vis_rcm_fillerdata     = true;
+		break;
+	case RateControlMethod::PeakConstrainedVariableBitrate:
+		vis_rcm_bitrate_target = true;
+		vis_rcm_bitrate_peak   = true;
+		break;
+	case RateControlMethod::LatencyConstrainedVariableBitrate:
+		vis_rcm_bitrate_target = true;
+		vis_rcm_bitrate_peak   = true;
+		break;
+	}
+
+	/// Bitrate
+	obs_property_set_visible(obs_properties_get(props, "bitrate"), vis_rcm_bitrate_target);
+	if (!vis_rcm_bitrate_target)
+		obs_data_unset_user_value(data, "bitrate");
+	obs_property_set_visible(obs_properties_get(props, P_BITRATE_PEAK), vis_rcm_bitrate_peak);
+	if (!vis_rcm_bitrate_peak)
+		obs_data_unset_user_value(data, P_BITRATE_PEAK);
+
+	/// QP
+	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME), vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME), vis_rcm_qp);
+	if (!vis_rcm_qp) {
+		obs_data_unset_user_value(data, P_QP_IFRAME);
+		obs_data_unset_user_value(data, P_QP_PFRAME);
+	}
+	obs_property_set_visible(obs_properties_get(props, P_QP_BFRAME), vis_rcm_qp_b);
+	if (!vis_rcm_qp_b)
+		obs_data_unset_user_value(data, P_QP_BFRAME);
+
+	/// QP Min/Max
+	obs_property_set_visible(obs_properties_get(props, P_QP_MINIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, P_QP_MAXIMUM), (curView >= ViewMode::Advanced) && !vis_rcm_qp);
+	if (!(curView >= ViewMode::Advanced) || vis_rcm_qp) {
+		obs_data_unset_user_value(data, P_QP_MINIMUM);
+		obs_data_unset_user_value(data, P_QP_MAXIMUM);
+	}
+
+	/// Pre-Pass
+	obs_property_set_visible(obs_properties_get(props, P_PREPASSMODE), (curView >= ViewMode::Basic) && !vis_rcm_qp);
+	if (!(curView >= ViewMode::Basic) || vis_rcm_qp)
+		obs_data_unset_user_value(data, P_PREPASSMODE);
+
+	/// VBAQ
+	obs_property_set_visible(obs_properties_get(props, P_VBAQ), (curView >= ViewMode::Expert) && !vis_rcm_qp);
+	if (!(curView >= ViewMode::Expert) || vis_rcm_qp)
+		obs_data_unset_user_value(data, P_VBAQ);
+
+	/// Filler Data (CBR only at the moment)
+	obs_property_set_visible(obs_properties_get(props, P_FILLERDATA), vis_rcm_fillerdata);
+	if (!vis_rcm_fillerdata)
+		obs_data_unset_user_value(data, P_FILLERDATA);
+#pragma endregion Rate Control
+
+#pragma region VBV Buffer
+	uint32_t vbvBufferMode    = static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER));
+	bool     vbvBufferVisible = (curView >= ViewMode::Advanced);
+
+	uint32_t lastVBVBufferMode = static_cast<uint32_t>(obs_data_get_int(data, ("last" P_VBVBUFFER)));
+	if (lastVBVBufferMode != vbvBufferMode) {
+		obs_data_set_int(data, ("last" P_VBVBUFFER), vbvBufferMode);
+		result = true;
+	}
+
+	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_STRICTNESS),
+							 vbvBufferVisible && (vbvBufferMode == 0));
+	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_SIZE), vbvBufferVisible && (vbvBufferMode == 1));
+	if (!vbvBufferVisible || vbvBufferMode == 0)
+		obs_data_unset_user_value(data, P_VBVBUFFER_SIZE);
+	if (!vbvBufferVisible || vbvBufferMode == 1)
+		obs_data_unset_user_value(data, P_VBVBUFFER_STRICTNESS);
+#pragma endregion VBV Buffer
+
+#pragma region B - Frame Interval
+	bool bframeIntervalVisible = bframeSupported && (curView >= ViewMode::Master);
+	obs_property_set_visible(obs_properties_get(props, P_PERIOD_BFRAME), bframeIntervalVisible);
+	obs_property_set_visible(obs_properties_get(props, P_INTERVAL_BFRAME), bframeIntervalVisible);
+	if (!bframeIntervalVisible) {
+		obs_data_unset_user_value(data, P_PERIOD_BFRAME);
+		obs_data_unset_user_value(data, P_INTERVAL_BFRAME);
+	}
+#pragma endregion B - Frame Interval
+#pragma endregion View Mode
+
+	// Permanently disable static properties while encoding.
+	void* enc = obs_properties_get_param(props);
+	if (enc) {
+		std::vector<const char*> hiddenProperties = {
+			// Static
+			///P_USAGE,
+			P_QUALITYPRESET,
+			P_PROFILE,
+			P_PROFILELEVEL,
+			P_CODINGTYPE,
+			P_MAXIMUMREFERENCEFRAMES,
+
+			P_BFRAME_PATTERN,
+			P_BFRAME_REFERENCE,
+
+			// Dynamic
+			/// Rate Control
+			//P_RATECONTROLMETHOD,
+			//P_PREPASSMODE,
+			//P_FRAMESKIPPING,
+			//P_FRAMESKIPPING_PERIOD,
+			//P_FRAMESKIPPING_BEHAVIOUR,
+			//P_DEBLOCKINGFILTER,
+
+			//P_VBVBUFFER,
+			//P_VBVBUFFER_STRICTNESS,
+			//P_VBVBUFFER_SIZE,
+			//P_VBVBUFFER_INITIALFULLNESS,
+			//P_VBAQ,
+
+			//// Picture Control
+			//P_INTERVAL_KEYFRAME,
+			//P_PERIOD_IDR_H264,
+			//P_INTERVAL_IFRAME,
+			//P_PERIOD_IFRAME,
+			//P_INTERVAL_PFRAME,
+			//P_PERIOD_PFRAME,
+			//P_INTERVAL_BFRAME,
+			//P_PERIOD_BFRAME,
+
+			//P_BFRAME_PATTERN,
+			//P_BFRAME_REFERENCE,
+
+			// System
+			P_VIDEO_API,
+			P_VIDEO_ADAPTER,
+			P_OPENCL_TRANSFER,
+			P_OPENCL_CONVERSION,
+			P_MULTITHREADING,
+			P_QUEUESIZE,
+			P_DEBUG,
+		};
+		for (const char* pr : hiddenProperties) {
+			obs_property_set_enabled(obs_properties_get(props, pr), false);
+		}
+	}
+
+	return result;
+}
+
+bool Plugin::Interface::H264Interface::update(void* data, obs_data_t* settings)
+{
+	if (data)
+		return static_cast<Plugin::Interface::H264Interface*>(data)->update(settings);
+	return false;
+}
+
+void Plugin::Interface::H264Interface::get_video_info(void* data, struct video_scale_info* info)
+{
+	if (data)
+		return static_cast<Plugin::Interface::H264Interface*>(data)->get_video_info(info);
+}
+
+bool Plugin::Interface::H264Interface::get_extra_data(void* data, uint8_t** extra_data, size_t* size)
+{
+	if (data)
+		return static_cast<Plugin::Interface::H264Interface*>(data)->get_extra_data(extra_data, size);
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Module Code
+//////////////////////////////////////////////////////////////////////////
+Plugin::Interface::H264Interface::H264Interface(obs_data_t* data, obs_encoder_t* encoder)
+{
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
+
+	m_Encoder = encoder;
+
+	// OBS Settings
+	uint32_t                        obsWidth     = obs_encoder_get_width(encoder);
+	uint32_t                        obsHeight    = obs_encoder_get_height(encoder);
+	video_t*                        obsVideoInfo = obs_encoder_video(encoder);
+	const struct video_output_info* voi          = video_output_get_info(obsVideoInfo);
+	uint32_t                        obsFPSnum    = voi->fps_num;
+	uint32_t                        obsFPSden    = voi->fps_den;
+
+	//////////////////////////////////////////////////////////////////////////
+	/// Initialize Encoder
+	bool debug = obs_data_get_bool(data, P_DEBUG);
+	Plugin::AMD::AMF::Instance()->EnableDebugTrace(debug);
+
+	ColorFormat colorFormat = ColorFormat::NV12;
+	switch (voi->format) {
+	case VIDEO_FORMAT_NV12:
+		colorFormat = ColorFormat::NV12;
+		break;
+	case VIDEO_FORMAT_I420:
+		colorFormat = ColorFormat::I420;
+		break;
+	case VIDEO_FORMAT_YUY2:
+		colorFormat = ColorFormat::YUY2;
+		break;
+	case VIDEO_FORMAT_RGBA:
+		colorFormat = ColorFormat::RGBA;
+		break;
+	case VIDEO_FORMAT_BGRA:
+		colorFormat = ColorFormat::BGRA;
+		break;
+	case VIDEO_FORMAT_Y800:
+		colorFormat = ColorFormat::GRAY;
+		break;
+	}
+	ColorSpace colorSpace = ColorSpace::BT601;
+	switch (voi->colorspace) {
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_601:
+		colorSpace = ColorSpace::BT601;
+		break;
+	case VIDEO_CS_709:
+		colorSpace = ColorSpace::BT709;
+		break;
+	}
+
+	auto api = API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
+	union {
+		int64_t  v;
+		uint32_t id[2];
+	} adapterid  = {obs_data_get_int(data, P_VIDEO_ADAPTER)};
+	auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
+
+	m_VideoEncoder = std::make_unique<EncoderH264>(
+		api, adapter, !!obs_data_get_int(data, P_OPENCL_TRANSFER), !!obs_data_get_int(data, P_OPENCL_CONVERSION),
+		colorFormat, colorSpace, voi->range == VIDEO_RANGE_FULL, !!obs_data_get_int(data, P_MULTITHREADING),
+		(size_t)obs_data_get_int(data, P_QUEUESIZE));
+
+	/// Static Properties
+	m_VideoEncoder->SetQualityPreset(static_cast<QualityPreset>(obs_data_get_int(data, P_QUALITYPRESET)));
+
+	/// Profile & Level
+	m_VideoEncoder->SetProfile(static_cast<Profile>(obs_data_get_int(data, P_PROFILE)));
+	m_VideoEncoder->SetProfileLevel(static_cast<ProfileLevel>(obs_data_get_int(data, P_PROFILELEVEL)),
+									std::make_pair(obsWidth, obsHeight), std::make_pair(obsFPSnum, obsFPSden));
+
+	/// Frame
+	m_VideoEncoder->SetResolution(std::make_pair(obsWidth, obsHeight));
+	m_VideoEncoder->SetFrameRate(std::make_pair(obsFPSnum, obsFPSden));
+
+	try {
+		m_VideoEncoder->SetCodingType(static_cast<CodingType>(obs_data_get_int(data, P_CODINGTYPE)));
+	} catch (...) {
+	}
+	try {
+		m_VideoEncoder->SetMaximumReferenceFrames(obs_data_get_int(data, P_MAXIMUMREFERENCEFRAMES));
+	} catch (...) {
+	}
+
+	// OBS - Enforce Streaming Service Restrictions
+#pragma region OBS - Enforce Streaming Service Restrictions
+	{
+		// Profile
+		const char* p_str = obs_data_get_string(data, "profile");
+		if (strcmp(p_str, "") != 0) {
+			if (strcmp(p_str, "constrained_baseline") == 0) {
+				m_VideoEncoder->SetProfile(Profile::ConstrainedBaseline);
+			} else if (strcmp(p_str, "baseline") == 0) {
+				m_VideoEncoder->SetProfile(Profile::Baseline);
+			} else if (strcmp(p_str, "main") == 0) {
+				m_VideoEncoder->SetProfile(Profile::Main);
+			} else if (strcmp(p_str, "constrained_high") == 0) {
+				m_VideoEncoder->SetProfile(Profile::ConstrainedHigh);
+			} else if (strcmp(p_str, "high") == 0) {
+				m_VideoEncoder->SetProfile(Profile::High);
+			}
+			obs_data_unset_user_value(data, "profile");
+		}
+
+		// Preset
+		const char* preset = obs_data_get_string(data, "preset");
+		if (strcmp(preset, "") != 0) {
+			if (strcmp(preset, "speed") == 0) {
+				m_VideoEncoder->SetQualityPreset(QualityPreset::Speed);
+			} else if (strcmp(preset, "balanced") == 0) {
+				m_VideoEncoder->SetQualityPreset(QualityPreset::Balanced);
+			} else if (strcmp(preset, "quality") == 0) {
+				m_VideoEncoder->SetQualityPreset(QualityPreset::Quality);
+			}
+			obs_data_set_int(data, P_QUALITYPRESET, (int32_t)m_VideoEncoder->GetQualityPreset());
+			obs_data_unset_user_value(data, "preset");
+		}
+	}
+#pragma endregion OBS - Enforce Streaming Service Restrictions
+
+	// Dynamic Properties (Can be changed during Encoding)
+	this->update(data);
+
+	// Initialize (locks static properties)
+	try {
+		m_VideoEncoder->Start();
+	} catch (...) {
+		throw;
+	}
+
+	// Dynamic Properties (Can be changed during Encoding)
+	this->update(data);
+
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
+}
+
+Plugin::Interface::H264Interface::~H264Interface()
+{
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing...");
+	if (m_VideoEncoder) {
+		m_VideoEncoder->Stop();
+		m_VideoEncoder = nullptr;
+	}
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
+}
+
+bool Plugin::Interface::H264Interface::update(obs_data_t* data)
+{
+	const video_t*                  obsVideoInfo = obs_encoder_video(m_Encoder);
+	const struct video_output_info* voi          = video_output_get_info(obsVideoInfo);
+	uint32_t                        obsFPSnum    = voi->fps_num;
+	uint32_t                        obsFPSden    = voi->fps_den;
+
+	// Rate Control
+	RateControlMethod rcm = static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD));
+	m_VideoEncoder->SetRateControlMethod(rcm);
+	if (rcm == RateControlMethod::ConstantQP) {
+		m_VideoEncoder->SetQPMinimum(0);
+		m_VideoEncoder->SetQPMaximum(51);
+		m_VideoEncoder->SetIFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME)));
+		m_VideoEncoder->SetPFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME)));
+		if (m_VideoEncoder->CapsBFramePattern() > 0) {
+			try {
+				m_VideoEncoder->SetBFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_BFRAME)));
+			} catch (...) {
+			}
+		}
+		try {
+			m_VideoEncoder->SetPrePassMode(PrePassMode::Disabled);
+		} catch (...) {
+		}
+		try {
+			m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled(false);
+		} catch (...) {
+		}
+	} else {
+		m_VideoEncoder->SetQPMinimum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_MINIMUM)));
+		m_VideoEncoder->SetQPMaximum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_MAXIMUM)));
+		m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
+		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, P_BITRATE_PEAK) * 1000));
+		try {
+			m_VideoEncoder->SetPrePassMode(static_cast<PrePassMode>(obs_data_get_int(data, P_PREPASSMODE)));
+		} catch (...) {
+		}
+		try {
+			m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled(!!obs_data_get_int(data, P_VBAQ));
+		} catch (...) {
+		}
+	}
+	if (rcm == RateControlMethod::ConstantBitrate) {
+		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
+		m_VideoEncoder->SetFillerDataEnabled(!!obs_data_get_int(data, P_FILLERDATA));
+	} else {
+		m_VideoEncoder->SetFillerDataEnabled(false);
+	}
+	m_VideoEncoder->SetFrameSkippingEnabled(!!obs_data_get_int(data, P_FRAMESKIPPING));
+	m_VideoEncoder->SetEnforceHRDEnabled(!!obs_data_get_int(data, P_ENFORCEHRD));
+	m_VideoEncoder->SetVBVBufferInitialFullness((float)obs_data_get_double(data, P_VBVBUFFER_INITIALFULLNESS) / 100.0f);
+	if (obs_data_get_int(data, P_VBVBUFFER) == 0) {
+		m_VideoEncoder->SetVBVBufferStrictness(obs_data_get_double(data, P_VBVBUFFER_STRICTNESS) / 100.0);
+	} else {
+		m_VideoEncoder->SetVBVBufferSize(static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER_SIZE) * 1000));
+	}
+
+	// Picture Control
+	double_t framerate = (double_t)obsFPSnum / (double_t)obsFPSden;
+	/// Keyframe Interval/Period
+	{
+		uint32_t idrperiod = static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IDR_H264));
+		if (idrperiod == 0) {
+			double_t keyinterv = obs_data_get_double(data, P_INTERVAL_KEYFRAME);
+			idrperiod          = static_cast<uint32_t>(ceil((keyinterv * framerate)));
+		}
+		m_VideoEncoder->SetIDRPeriod(idrperiod);
+	}
+	/// I/P/Skip Frame Interval/Period
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_IFRAME) * framerate);
+		period          = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IFRAME)));
+		m_VideoEncoder->SetIFramePeriod(period);
+	}
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_PFRAME) * framerate);
+		period          = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_PFRAME)));
+		m_VideoEncoder->SetPFramePeriod(period);
+	}
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_BFRAME) * framerate);
+		period          = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_BFRAME)));
+		m_VideoEncoder->SetBFramePeriod(period);
+	}
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_int(data, P_FRAMESKIPPING_PERIOD));
+		m_VideoEncoder->SetFrameSkippingPeriod(period);
+		m_VideoEncoder->SetFrameSkippingBehaviour(!!obs_data_get_int(data, P_FRAMESKIPPING_BEHAVIOUR));
+	}
+	m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, P_DEBLOCKINGFILTER));
+
+#pragma region B - Frames
+	if (m_VideoEncoder->CapsBFramePattern() > 0) {
+		try {
+			m_VideoEncoder->SetBFramePattern(static_cast<uint8_t>(obs_data_get_int(data, P_BFRAME_PATTERN)));
+			if (obs_data_get_int(data, P_BFRAME_PATTERN) != 0)
+				m_VideoEncoder->SetBFrameDeltaQP(static_cast<int8_t>(obs_data_get_int(data, P_BFRAME_DELTAQP)));
+			m_VideoEncoder->SetBFrameReferenceEnabled(!!obs_data_get_int(data, P_BFRAME_REFERENCE));
+			if (!!obs_data_get_int(data, P_BFRAME_REFERENCE))
+				m_VideoEncoder->SetBFrameReferenceDeltaQP(
+					static_cast<int8_t>(obs_data_get_int(data, P_BFRAME_REFERENCEDELTAQP)));
+		} catch (...) {
+		}
+	}
+#pragma endregion B - Frames
+
+	// Motion Estimation
+	m_VideoEncoder->SetMotionEstimationHalfPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 1));
+	m_VideoEncoder->SetMotionEstimationQuarterPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 2));
+
+#pragma region OBS Enforce Streaming Service Settings
+	{
+		// Rate Control Method
+		const char* t_str = obs_data_get_string(data, "rate_control");
+		if (strcmp(t_str, "") != 0) {
+			if (strcmp(t_str, "CBR") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantBitrate);
+				m_VideoEncoder->SetFillerDataEnabled(true);
+			} else if (strcmp(t_str, "VBR") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::PeakConstrainedVariableBitrate);
+			} else if (strcmp(t_str, "VBR_LAT") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::LatencyConstrainedVariableBitrate);
+			} else if (strcmp(t_str, "CQP") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantQP);
+			}
+
+			obs_data_set_int(data, P_RATECONTROLMETHOD, (int32_t)m_VideoEncoder->GetRateControlMethod());
+			obs_data_unset_user_value(data, "rate_control");
+		}
+
+		// IDR-Period (Keyframes)
+		uint32_t fpsNum = m_VideoEncoder->GetFrameRate().first;
+		uint32_t fpsDen = m_VideoEncoder->GetFrameRate().second;
+		if (obs_data_get_int(data, "keyint_sec") > 0) {
+			m_VideoEncoder->SetIDRPeriod(
+				static_cast<uint32_t>(obs_data_get_int(data, "keyint_sec")
+									  * (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
+
+			obs_data_set_double(data, P_INTERVAL_KEYFRAME, static_cast<double_t>(obs_data_get_int(data, "keyint_sec")));
+			obs_data_set_int(data, P_PERIOD_IDR_H264,
+							 static_cast<uint32_t>(obs_data_get_int(data, "keyint_sec")
+												   * (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
+			obs_data_unset_user_value(data, "keyint_sec");
+		}
+	}
+#pragma endregion OBS Enforce Streaming Service Settings
+
+	m_VideoEncoder->SetDebug(obs_data_get_bool(data, P_DEBUG));
+
+	if (m_VideoEncoder->IsStarted()) {
+		m_VideoEncoder->LogProperties();
+		if (static_cast<ViewMode>(obs_data_get_int(data, P_VIEW)) >= ViewMode::Master)
+			PLOG_ERROR(
+				"View Mode 'Master' is active, avoid giving anything but basic support. Error is most likely caused by "
+				"user settings themselves.");
+	}
+
+	return true;
+}
+
+bool Plugin::Interface::H264Interface::encode(struct encoder_frame* frame, struct encoder_packet* packet,
+											  bool* received_packet)
+{
+	if (!frame || !packet || !received_packet)
+		return false;
+
+	bool retVal = false;
+
+	try {
+		retVal = m_VideoEncoder->Encode(frame, packet, received_packet);
+	} catch (std::exception e) {
+		PLOG_ERROR("Exception during encoding: %s", e.what());
+	} catch (...) {
+		PLOG_ERROR("Unknown exception during encoding.");
+	}
+
+	return retVal;
+}
+
+void Plugin::Interface::H264Interface::get_video_info(struct video_scale_info* info)
+{
+	m_VideoEncoder->GetVideoInfo(info);
+}
+
+bool Plugin::Interface::H264Interface::get_extra_data(uint8_t** extra_data, size_t* size)
+{
+	return m_VideoEncoder->GetExtraData(extra_data, size);
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/enc-h265.cpp Added

@@ -0,0 +1,1167 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "amf-capabilities.h"
+#include "amf-encoder-h265.h"
+#include "amf-encoder.h"
+#include "enc-h265.h"
+#include "strings.h"
+#include "utility.h"
+
+#define PREFIX "[H265/HEVC]"
+
+using namespace Plugin::AMD;
+
+void Plugin::Interface::H265Interface::encoder_register()
+{
+	// Test if we actually have AVC support.
+	if (!AMD::CapabilityManager::Instance()->IsCodecSupported(Codec::HEVC)) {
+		PLOG_WARNING(PREFIX " Not supported by any GPU, disabling...");
+		return;
+	}
+
+	// Create structure
+	static std::unique_ptr<obs_encoder_info> encoder_info = std::make_unique<obs_encoder_info>();
+	std::memset(encoder_info.get(), 0, sizeof(obs_encoder_info));
+
+	// Initialize Structure
+	encoder_info->type               = obs_encoder_type::OBS_ENCODER_VIDEO;
+	static const char* encoder_name  = "amd_amf_h265";
+	encoder_info->id                 = encoder_name;
+	static const char* encoder_codec = "hevc";
+	encoder_info->codec              = encoder_codec;
+
+	// Functions
+	encoder_info->get_name       = &get_name;
+	encoder_info->get_defaults   = &get_defaults;
+	encoder_info->get_properties = &get_properties;
+	encoder_info->create         = &create;
+	encoder_info->destroy        = &destroy;
+	encoder_info->encode         = &encode;
+	encoder_info->update         = &update;
+	encoder_info->get_video_info = &get_video_info;
+	encoder_info->get_extra_data = &get_extra_data;
+
+	obs_register_encoder(encoder_info.get());
+	PLOG_DEBUG(PREFIX " Registered.");
+}
+
+const char* Plugin::Interface::H265Interface::get_name(void*)
+{
+	static const char* name = "H265/HEVC Encoder (" PLUGIN_NAME ")";
+	return name;
+}
+
+void Plugin::Interface::H265Interface::get_defaults(obs_data_t* data)
+{
+#pragma region OBS - Enforce Streaming Service Restrictions
+	obs_data_set_default_int(data, "bitrate", 0);
+	obs_data_set_default_int(data, "keyint_sec", 0);
+	obs_data_set_default_string(data, "rate_control", "");
+	obs_data_set_default_string(data, "profile", "");
+	obs_data_set_default_string(data, "preset", "");
+#pragma endregion OBS - Enforce Streaming Service Restrictions
+
+	// Static
+	//obs_data_set_default_int(data, P_USAGE, static_cast<int64_t>(Usage::Transcoding));
+	obs_data_set_default_int(data, P_QUALITYPRESET, static_cast<int64_t>(QualityPreset::Balanced));
+	obs_data_set_default_int(data, P_PROFILE, static_cast<int64_t>(Profile::Main));
+	obs_data_set_default_int(data, P_PROFILELEVEL, static_cast<int64_t>(ProfileLevel::Automatic));
+	obs_data_set_default_int(data, P_TIER, static_cast<int64_t>(H265::Tier::Main));
+	//obs_data_set_default_frames_per_second(data, P_ASPECTRATIO, media_frames_per_second{ 1, 1 }, "");
+	obs_data_set_default_int(data, P_CODINGTYPE, static_cast<int64_t>(CodingType::Automatic));
+	obs_data_set_default_int(data, P_MAXIMUMREFERENCEFRAMES, 1);
+
+	// Rate Control
+	obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), -1);
+	obs_data_set_default_int(data, ("last" P_RATECONTROLMETHOD), -1);
+	obs_data_set_default_int(data, P_RATECONTROLMETHOD, static_cast<int64_t>(RateControlMethod::ConstantBitrate));
+	obs_data_set_default_int(data, P_PREPASSMODE, static_cast<int64_t>(PrePassMode::Disabled));
+	obs_data_set_default_int(data, "bitrate", 3500);
+	obs_data_set_default_int(data, P_BITRATE_PEAK, 9000);
+	obs_data_set_default_int(data, P_QP_IFRAME, 22);
+	obs_data_set_default_int(data, P_QP_PFRAME, 22);
+	obs_data_set_default_int(data, P_QP_BFRAME, 22);
+	obs_data_set_default_int(data, P_QP_IFRAME_MINIMUM, 18);
+	obs_data_set_default_int(data, P_QP_IFRAME_MAXIMUM, 51);
+	obs_data_set_default_int(data, P_QP_PFRAME_MINIMUM, 18);
+	obs_data_set_default_int(data, P_QP_PFRAME_MAXIMUM, 51);
+	obs_data_set_default_int(data, P_FILLERDATA, 1);
+	obs_data_set_default_int(data, P_FRAMESKIPPING, 0);
+	obs_data_set_default_int(data, P_VBAQ, 0);
+	obs_data_set_default_int(data, P_ENFORCEHRD, 1);
+
+	// VBV Buffer
+	obs_data_set_int(data, ("last" P_VBVBUFFER), -1);
+	obs_data_set_default_int(data, ("last" P_VBVBUFFER), -1);
+	obs_data_set_default_int(data, P_VBVBUFFER, 0);
+	obs_data_set_default_int(data, P_VBVBUFFER_SIZE, 3500);
+	obs_data_set_default_double(data, P_VBVBUFFER_STRICTNESS, 50);
+	obs_data_set_default_double(data, P_VBVBUFFER_INITIALFULLNESS, 100);
+
+	// Picture Control
+	obs_data_set_default_double(data, P_INTERVAL_KEYFRAME, 2.0);
+	obs_data_set_default_int(data, P_PERIOD_IDR_H265, 0);
+	obs_data_set_default_double(data, P_INTERVAL_IFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_IFRAME, 0);
+	obs_data_set_default_double(data, P_INTERVAL_PFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_PFRAME, 0);
+	obs_data_set_default_int(data, P_FRAMESKIPPING_PERIOD, 0);
+	obs_data_set_default_int(data, P_FRAMESKIPPING_BEHAVIOUR, 0);
+	obs_data_set_default_int(data, P_GOP_TYPE, static_cast<int64_t>(H265::GOPType::Fixed));
+	obs_data_set_default_int(data, P_GOP_SIZE, 60);
+	obs_data_set_default_int(data, P_GOP_SIZE_MINIMUM, 1);
+	obs_data_set_default_int(data, P_GOP_SIZE_MAXIMUM, 16);
+	obs_data_set_default_int(data, P_DEBLOCKINGFILTER, 0);
+	obs_data_set_default_int(data, P_MOTIONESTIMATION, 3);
+
+	// System Properties
+	obs_data_set_string(data, ("last" P_VIDEO_API), "");
+	obs_data_set_default_string(data, ("last" P_VIDEO_API), "");
+	obs_data_set_default_string(data, P_VIDEO_API, "");
+	obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), 0);
+	obs_data_set_default_int(data, ("last" P_VIDEO_ADAPTER), 0);
+	obs_data_set_default_int(data, P_VIDEO_ADAPTER, 0);
+	obs_data_set_default_int(data, P_OPENCL_TRANSFER, 0);
+	obs_data_set_default_int(data, P_OPENCL_CONVERSION, 0);
+	obs_data_set_default_int(data, P_MULTITHREADING, 0);
+	obs_data_set_default_int(data, P_QUEUESIZE, 8);
+	obs_data_set_int(data, ("last" P_VIEW), -1);
+	obs_data_set_default_int(data, ("last" P_VIEW), -1);
+	obs_data_set_default_int(data, P_VIEW, static_cast<int64_t>(ViewMode::Basic));
+	obs_data_set_default_bool(data, P_DEBUG, false);
+	obs_data_set_default_int(data, P_VERSION, PLUGIN_VERSION_FULL);
+}
+
+static void fill_api_list(obs_property_t* p)
+{
+	obs_property_list_clear(p);
+	auto cm = CapabilityManager::Instance();
+
+	for (auto api : Plugin::API::EnumerateAPIs()) {
+		if (cm->IsCodecSupportedByAPI(Codec::HEVC, api->GetType()))
+			obs_property_list_add_string(p, api->GetName().c_str(), api->GetName().c_str());
+	}
+}
+
+static void fill_device_list(obs_property_t* p, const char* apiname)
+{
+	obs_property_list_clear(p);
+
+	auto cm  = CapabilityManager::Instance();
+	auto api = Plugin::API::GetAPI(std::string(apiname));
+	for (auto adapter : api->EnumerateAdapters()) {
+		union {
+			int32_t id[2];
+			int64_t v;
+		} adapterid = {adapter.idLow, adapter.idHigh};
+		if (cm->IsCodecSupportedByAPIAdapter(Codec::HEVC, api->GetType(), adapter))
+			obs_property_list_add_int(p, adapter.Name.c_str(), adapterid.v);
+	}
+}
+
+obs_properties_t* Plugin::Interface::H265Interface::get_properties(void* data)
+{
+	obs_properties* props = obs_properties_create();
+	obs_property_t* p;
+
+	// Static Properties
+#pragma region Quality Preset
+	p = obs_properties_add_list(props, P_QUALITYPRESET, P_TRANSLATE(P_QUALITYPRESET), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUALITYPRESET)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_SPEED), static_cast<int32_t>(QualityPreset::Speed));
+	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_BALANCED), static_cast<int32_t>(QualityPreset::Balanced));
+	obs_property_list_add_int(p, P_TRANSLATE(P_QUALITYPRESET_QUALITY), static_cast<int32_t>(QualityPreset::Quality));
+#pragma endregion Quality Preset
+
+#pragma region Profile, Levels
+	p = obs_properties_add_list(props, P_PROFILE, P_TRANSLATE(P_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILE)));
+	obs_property_list_add_int(p, "Main", static_cast<int32_t>(Profile::Main));
+
+	p = obs_properties_add_list(props, P_PROFILELEVEL, P_TRANSLATE(P_PROFILELEVEL), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PROFILELEVEL)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(ProfileLevel::Automatic));
+	obs_property_list_add_int(p, "1.0", static_cast<int32_t>(ProfileLevel::L10));
+	obs_property_list_add_int(p, "2.0", static_cast<int32_t>(ProfileLevel::L20));
+	obs_property_list_add_int(p, "2.1", static_cast<int32_t>(ProfileLevel::L21));
+	obs_property_list_add_int(p, "3.0", static_cast<int32_t>(ProfileLevel::L30));
+	obs_property_list_add_int(p, "3.1", static_cast<int32_t>(ProfileLevel::L31));
+	obs_property_list_add_int(p, "4.0", static_cast<int32_t>(ProfileLevel::L40));
+	obs_property_list_add_int(p, "4.1", static_cast<int32_t>(ProfileLevel::L41));
+	obs_property_list_add_int(p, "5.0", static_cast<int32_t>(ProfileLevel::L50));
+	obs_property_list_add_int(p, "5.1", static_cast<int32_t>(ProfileLevel::L51));
+	obs_property_list_add_int(p, "5.2", static_cast<int32_t>(ProfileLevel::L52));
+	obs_property_list_add_int(p, "6.0", static_cast<int32_t>(ProfileLevel::L60));
+	obs_property_list_add_int(p, "6.1", static_cast<int32_t>(ProfileLevel::L61));
+	obs_property_list_add_int(p, "6.2", static_cast<int32_t>(ProfileLevel::L62));
+#pragma endregion Profile, Levels
+
+#pragma region Tier
+	p = obs_properties_add_list(props, P_TIER, P_TRANSLATE(P_TIER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_TIER)));
+	obs_property_list_add_int(p, "Main", static_cast<int32_t>(H265::Tier::Main));
+	obs_property_list_add_int(p, "High", static_cast<int32_t>(H265::Tier::High));
+#pragma endregion Tier
+
+#pragma region Coding Type
+	p = obs_properties_add_list(props, P_CODINGTYPE, P_TRANSLATE(P_CODINGTYPE), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_CODINGTYPE)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), static_cast<int32_t>(CodingType::Automatic));
+	obs_property_list_add_int(p, "CABAC", static_cast<int32_t>(CodingType::CABAC));
+#pragma endregion Coding Type
+
+#pragma region Maximum Reference Frames
+	p = obs_properties_add_int_slider(props, P_MAXIMUMREFERENCEFRAMES, P_TRANSLATE(P_MAXIMUMREFERENCEFRAMES), 1, 16, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MAXIMUMREFERENCEFRAMES)));
+#pragma endregion Maximum Reference Frames
+
+	// Rate Control
+#pragma region Rate Control Method
+	p = obs_properties_add_list(props, P_RATECONTROLMETHOD, P_TRANSLATE(P_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_RATECONTROLMETHOD)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CQP),
+							  static_cast<int32_t>(RateControlMethod::ConstantQP));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_CBR),
+							  static_cast<int32_t>(RateControlMethod::ConstantBitrate));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBR),
+							  static_cast<int32_t>(RateControlMethod::PeakConstrainedVariableBitrate));
+	obs_property_list_add_int(p, P_TRANSLATE(P_RATECONTROLMETHOD_VBRLAT),
+							  static_cast<int32_t>(RateControlMethod::LatencyConstrainedVariableBitrate));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion Rate Control Method
+
+#pragma region Pre - Pass
+	p = obs_properties_add_list(props, P_PREPASSMODE, P_TRANSLATE(P_PREPASSMODE), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PREPASSMODE)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), static_cast<int32_t>(PrePassMode::Disabled));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), static_cast<int32_t>(PrePassMode::Enabled));
+#pragma endregion Pre - Pass
+
+#pragma region Parameters
+	/// Bitrate Constraints
+	p = obs_properties_add_int(props, "bitrate", P_TRANSLATE(P_BITRATE_TARGET), 0, 1, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_TARGET)));
+	p = obs_properties_add_int(props, P_BITRATE_PEAK, P_TRANSLATE(P_BITRATE_PEAK), 0, 1, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_BITRATE_PEAK)));
+
+	/// Method: Constant QP
+	p = obs_properties_add_int_slider(props, P_QP_IFRAME, P_TRANSLATE(P_QP_IFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME)));
+	p = obs_properties_add_int_slider(props, P_QP_PFRAME, P_TRANSLATE(P_QP_PFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME)));
+
+	/// Minimum QP, Maximum QP
+	p = obs_properties_add_int_slider(props, P_QP_IFRAME_MINIMUM, P_TRANSLATE(P_QP_IFRAME_MINIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME_MINIMUM)));
+	p = obs_properties_add_int_slider(props, P_QP_IFRAME_MAXIMUM, P_TRANSLATE(P_QP_IFRAME_MAXIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_IFRAME_MAXIMUM)));
+	p = obs_properties_add_int_slider(props, P_QP_PFRAME_MINIMUM, P_TRANSLATE(P_QP_PFRAME_MINIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME_MINIMUM)));
+	p = obs_properties_add_int_slider(props, P_QP_PFRAME_MAXIMUM, P_TRANSLATE(P_QP_PFRAME_MAXIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QP_PFRAME_MAXIMUM)));
+#pragma endregion Parameters
+
+#pragma region Filler Data
+	p = obs_properties_add_list(props, P_FILLERDATA, P_TRANSLATE(P_FILLERDATA), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FILLERDATA)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion Filler Data
+
+#pragma region Frame Skipping
+	p = obs_properties_add_list(props, P_FRAMESKIPPING, P_TRANSLATE(P_FRAMESKIPPING), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+	p = obs_properties_add_int(props, P_FRAMESKIPPING_PERIOD, P_TRANSLATE(P_FRAMESKIPPING_PERIOD), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_PERIOD)));
+	p = obs_properties_add_list(props, P_FRAMESKIPPING_BEHAVIOUR, P_TRANSLATE(P_FRAMESKIPPING_BEHAVIOUR),
+								OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_FRAMESKIPPING_BEHAVIOUR)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_SKIPNTH), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_FRAMESKIPPING_KEEPNTH), 1);
+#pragma endregion Frame Skipping
+
+#pragma region VBAQ
+	p = obs_properties_add_list(props, P_VBAQ, P_TRANSLATE(P_VBAQ), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBAQ)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion VBAQ
+
+#pragma region Enforce Hypothetical Reference Decoder Restrictions
+	p = obs_properties_add_list(props, P_ENFORCEHRD, P_TRANSLATE(P_ENFORCEHRD), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_ENFORCEHRD)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion Enforce Hyptothetical Reference Decoder Restrictions
+
+	// VBV Buffer
+#pragma region VBV Buffer Mode
+	p = obs_properties_add_list(props, P_VBVBUFFER, P_TRANSLATE(P_VBVBUFFER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_AUTOMATIC), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_MANUAL), 1);
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion VBV Buffer Mode
+
+#pragma region VBV Buffer Strictness
+	p = obs_properties_add_float_slider(props, P_VBVBUFFER_STRICTNESS, P_TRANSLATE(P_VBVBUFFER_STRICTNESS), 0.0, 100.0,
+										0.1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_STRICTNESS)));
+#pragma endregion VBV Buffer Strictness
+
+#pragma region VBV Buffer Size
+	p = obs_properties_add_int_slider(props, P_VBVBUFFER_SIZE, P_TRANSLATE(P_VBVBUFFER_SIZE), 1, 1000000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_SIZE)));
+#pragma endregion VBV Buffer Size
+
+#pragma region VBV Buffer Initial Fullness
+	p = obs_properties_add_float_slider(props, P_VBVBUFFER_INITIALFULLNESS, P_TRANSLATE(P_VBVBUFFER_INITIALFULLNESS),
+										0.0, 100.0, 100.0 / 64.0);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VBVBUFFER_INITIALFULLNESS)));
+#pragma endregion VBV Buffer Initial Fullness
+
+	// Picture Control
+#pragma region Interval and Periods
+	/// Keyframe, IDR
+	p = obs_properties_add_float(props, P_INTERVAL_KEYFRAME, P_TRANSLATE(P_INTERVAL_KEYFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_KEYFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_IDR_H265, P_TRANSLATE(P_PERIOD_IDR_H265), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IDR_H265)));
+	/// I-Frame
+	p = obs_properties_add_float(props, P_INTERVAL_IFRAME, P_TRANSLATE(P_INTERVAL_IFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_IFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_IFRAME, P_TRANSLATE(P_PERIOD_IFRAME), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_IFRAME)));
+	/// P-Frame
+	p = obs_properties_add_float(props, P_INTERVAL_PFRAME, P_TRANSLATE(P_INTERVAL_PFRAME), 0, 100, 0.001);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_INTERVAL_PFRAME)));
+	p = obs_properties_add_int(props, P_PERIOD_PFRAME, P_TRANSLATE(P_PERIOD_PFRAME), 0, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_PERIOD_PFRAME)));
+#pragma endregion Interval and Periods
+
+#pragma region GOP Type
+	p = obs_properties_add_list(props, P_GOP_TYPE, P_TRANSLATE(P_GOP_TYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_TYPE)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_GOP_TYPE_FIXED), static_cast<int64_t>(H265::GOPType::Fixed));
+	obs_property_list_add_int(p, P_TRANSLATE(P_GOP_TYPE_VARIABLE), static_cast<int64_t>(H265::GOPType::Variable));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion GOP Type
+
+#pragma region GOP Size
+	p = obs_properties_add_int(props, P_GOP_SIZE, P_TRANSLATE(P_GOP_SIZE), 1, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_SIZE)));
+
+	p = obs_properties_add_int(props, P_GOP_SIZE_MINIMUM, P_TRANSLATE(P_GOP_SIZE_MINIMUM), 1, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_SIZE_MINIMUM)));
+
+	p = obs_properties_add_int(props, P_GOP_SIZE_MAXIMUM, P_TRANSLATE(P_GOP_SIZE_MAXIMUM), 1, 1000, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_GOP_SIZE_MAXIMUM)));
+#pragma endregion GOP Size
+
+	/// GOP Alignment?
+
+#pragma region Deblocking Filter
+	p = obs_properties_add_list(props, P_DEBLOCKINGFILTER, P_TRANSLATE(P_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBLOCKINGFILTER)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion Deblocking Filter
+
+#pragma region Motion Estimation
+	p = obs_properties_add_list(props, P_MOTIONESTIMATION, P_TRANSLATE(P_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MOTIONESTIMATION)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_HALF), 1);
+	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_QUARTER), 2);
+	obs_property_list_add_int(p, P_TRANSLATE(P_MOTIONESTIMATION_FULL), 3);
+#pragma endregion Motion Estimation
+
+	// System
+#pragma region Video APIs
+	p = obs_properties_add_list(props, P_VIDEO_API, P_TRANSLATE(P_VIDEO_API), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_STRING);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_API)));
+	obs_property_set_modified_callback(p, properties_modified);
+	fill_api_list(p);
+#pragma endregion Video APIs
+
+#pragma region Video Adapters
+	p = obs_properties_add_list(props, P_VIDEO_ADAPTER, P_TRANSLATE(P_VIDEO_ADAPTER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIDEO_ADAPTER)));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion Video Adapters
+
+#pragma region OpenCL
+	p = obs_properties_add_list(props, P_OPENCL_TRANSFER, P_TRANSLATE(P_OPENCL_TRANSFER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_TRANSFER)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+
+	p = obs_properties_add_list(props, P_OPENCL_CONVERSION, P_TRANSLATE(P_OPENCL_CONVERSION), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_OPENCL_CONVERSION)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+#pragma endregion OpenCL
+
+#pragma region Asynchronous Queue
+	p = obs_properties_add_list(props, P_MULTITHREADING, P_TRANSLATE(P_MULTITHREADING), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_MULTITHREADING)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_DISABLED), 0);
+	obs_property_list_add_int(p, P_TRANSLATE(P_UTIL_SWITCH_ENABLED), 1);
+
+	p = obs_properties_add_int_slider(props, P_QUEUESIZE, P_TRANSLATE(P_QUEUESIZE), 1, 32, 1);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_QUEUESIZE)));
+#pragma endregion Asynchronous Queue
+
+#pragma region View Mode
+	p = obs_properties_add_list(props, P_VIEW, P_TRANSLATE(P_VIEW), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_VIEW)));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_BASIC), static_cast<int32_t>(ViewMode::Basic));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_ADVANCED), static_cast<int32_t>(ViewMode::Advanced));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_EXPERT), static_cast<int32_t>(ViewMode::Expert));
+	obs_property_list_add_int(p, P_TRANSLATE(P_VIEW_MASTER), static_cast<int32_t>(ViewMode::Master));
+	obs_property_set_modified_callback(p, properties_modified);
+#pragma endregion View Mode
+
+	/// Debug
+	p = obs_properties_add_bool(props, P_DEBUG, P_TRANSLATE(P_DEBUG));
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(P_DEBUG)));
+
+	// Disable non-dynamic properties if we have an encoder.
+	obs_properties_set_param(props, data, nullptr);
+
+	return props;
+}
+
+static void obs_data_transfer_settings(obs_data_t* data)
+{
+#define TRANSFER_STRING(xold, xnew) obs_data_set_string(data, xnew, obs_data_get_string(data, xold))
+#define TRANSFER_FLOAT(xold, xnew) obs_data_set_double(data, xnew, obs_data_get_double(data, xold))
+#define TRANSFER_INT(xold, xnew) obs_data_set_int(data, xnew, obs_data_get_int(data, xold))
+#define TRANSFER_BOOL(xold, xnew) obs_data_set_bool(data, xnew, obs_data_get_bool(data, xold))
+
+	uint64_t version = obs_data_get_int(data, P_VERSION);
+	switch (version) {
+	case (((uint64_t)(2 & 0xFFFF) << 48ull) | ((uint64_t)(3 & 0xFFFF) << 32ull) | ((uint64_t)(0) & 0xFFFFFFFF)):
+		TRANSFER_INT(P_BITRATE_TARGET, "bitrate");
+		break;
+	case PLUGIN_VERSION_FULL:
+		obs_data_set_int(data, P_VERSION, PLUGIN_VERSION_FULL);
+		break;
+	}
+}
+
+bool Plugin::Interface::H265Interface::properties_modified(obs_properties_t* props, obs_property_t*, obs_data_t* data)
+{
+	bool            result = false;
+	obs_property_t* p;
+
+	// Transfer settings from older Plugin versions to newer ones.
+	obs_data_transfer_settings(data);
+
+#pragma region Video API& Adapter
+	// Video API
+	const char *videoAPI_last = obs_data_get_string(data, ("last" P_VIDEO_API)),
+			   *videoAPI_cur  = obs_data_get_string(data, P_VIDEO_API);
+	if (strlen(videoAPI_cur) == 0) {
+		p = obs_properties_get(props, P_VIDEO_API);
+		obs_data_set_string(data, P_VIDEO_API, obs_property_list_item_string(p, 0));
+		videoAPI_cur = obs_data_get_string(data, P_VIDEO_API);
+
+		result = true;
+	}
+	/// If a different API was selected, rebuild the device list.
+	if (strcmp(videoAPI_last, videoAPI_cur) != 0) {
+		obs_data_set_string(data, ("last" P_VIDEO_API), videoAPI_cur);
+		fill_device_list(obs_properties_get(props, P_VIDEO_ADAPTER), videoAPI_cur);
+		result = true;
+
+		// Reset Video Adapter to first in list.
+		obs_data_set_int(data, P_VIDEO_ADAPTER,
+						 obs_property_list_item_int(obs_properties_get(props, P_VIDEO_ADAPTER), 0));
+	}
+
+	// Video Adapter
+	int64_t videoAdapter_last = obs_data_get_int(data, ("last" P_VIDEO_ADAPTER)),
+			videoAdapter_cur  = obs_data_get_int(data, P_VIDEO_ADAPTER);
+	if (videoAdapter_last != videoAdapter_cur) {
+		obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), videoAdapter_cur);
+		result = true;
+
+		auto api = Plugin::API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
+		union {
+			int64_t  v;
+			uint32_t id[2];
+		} adapterid  = {videoAdapter_cur};
+		auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
+		try {
+			auto enc = EncoderH265(api, adapter);
+
+#define TEMP_LIMIT_DROPDOWN(func, enm, prop)                                             \
+	{                                                                                    \
+		auto tmp_p = obs_properties_get(props, prop);                                    \
+		auto tmp_l = enc.func();                                                         \
+		enm  tmp_s = static_cast<enm>(obs_data_get_int(data, obs_property_name(tmp_p))); \
+		for (size_t idx = 0; idx < obs_property_list_item_count(tmp_p); idx++) {         \
+			bool enabled = false;                                                        \
+			enm  tmp_v   = static_cast<enm>(obs_property_list_item_int(tmp_p, idx));     \
+			for (auto tmp_k : tmp_l) {                                                   \
+				if (tmp_k == tmp_v) {                                                    \
+					enabled = true;                                                      \
+					break;                                                               \
+				}                                                                        \
+			}                                                                            \
+			obs_property_list_item_disable(tmp_p, idx, !enabled);                        \
+			if ((enabled == false) && (tmp_s == tmp_v))                                  \
+				obs_data_unset_user_value(data, obs_property_name(tmp_p));               \
+		}                                                                                \
+	}
+#define TEMP_LIMIT_SLIDER(func, prop)                                               \
+	{                                                                               \
+		auto tmp_p = obs_properties_get(props, prop);                               \
+		auto tmp_l = enc.func();                                                    \
+		obs_property_int_set_limits(tmp_p, (int)tmp_l.first, (int)tmp_l.second, 1); \
+	}
+#define TEMP_LIMIT_SLIDER_BITRATE(func, prop)                                                     \
+	{                                                                                             \
+		auto tmp_p = obs_properties_get(props, prop);                                             \
+		auto tmp_l = enc.func();                                                                  \
+		obs_property_int_set_limits(tmp_p, (int)tmp_l.first / 1000, (int)tmp_l.second / 1000, 1); \
+	}
+
+			//TEMP_LIMIT_DROPDOWN(CapsUsage, AMD::Usage, P_USAGE);
+			TEMP_LIMIT_DROPDOWN(CapsQualityPreset, AMD::QualityPreset, P_QUALITYPRESET);
+			TEMP_LIMIT_DROPDOWN(CapsProfile, AMD::Profile, P_PROFILE);
+			TEMP_LIMIT_DROPDOWN(CapsProfileLevel, AMD::ProfileLevel, P_PROFILELEVEL);
+			{
+				auto tmp_p = obs_properties_get(props, P_PROFILELEVEL);
+				obs_property_list_item_disable(tmp_p, 0, false);
+			}
+			TEMP_LIMIT_DROPDOWN(CapsTier, AMD::H265::Tier, P_TIER);
+			// Aspect Ratio - No limits, only affects players/transcoders
+			TEMP_LIMIT_DROPDOWN(CapsCodingType, AMD::CodingType, P_CODINGTYPE);
+			TEMP_LIMIT_SLIDER(CapsMaximumReferenceFrames, P_MAXIMUMREFERENCEFRAMES);
+			TEMP_LIMIT_DROPDOWN(CapsRateControlMethod, AMD::RateControlMethod, P_RATECONTROLMETHOD);
+			TEMP_LIMIT_DROPDOWN(CapsPrePassMode, AMD::PrePassMode, P_PREPASSMODE);
+			TEMP_LIMIT_SLIDER_BITRATE(CapsTargetBitrate, "bitrate");
+			TEMP_LIMIT_SLIDER_BITRATE(CapsPeakBitrate, P_BITRATE_PEAK);
+			TEMP_LIMIT_SLIDER_BITRATE(CapsVBVBufferSize, P_VBVBUFFER_SIZE);
+		} catch (const std::exception& e) {
+			PLOG_ERROR("Exception occured while updating capabilities: %s", e.what());
+		}
+	}
+#pragma endregion Video API& Adapter
+
+#pragma region View Mode
+	ViewMode lastView = static_cast<ViewMode>(obs_data_get_int(data, ("last" P_VIEW))),
+			 curView  = static_cast<ViewMode>(obs_data_get_int(data, P_VIEW));
+	if (lastView != curView) {
+		obs_data_set_int(data, ("last" P_VIEW), static_cast<int32_t>(curView));
+		result = true;
+	}
+
+	std::vector<std::pair<const char*, ViewMode>> viewstuff = {
+		//std::make_pair(P_PRESET, ViewMode::Basic),
+		// ----------- Static Section
+		//std::make_pair(P_USAGE, ViewMode::Master),
+		std::make_pair(P_QUALITYPRESET, ViewMode::Basic),
+		std::make_pair(P_PROFILE, ViewMode::Advanced),
+		std::make_pair(P_PROFILELEVEL, ViewMode::Advanced),
+		std::make_pair(P_TIER, ViewMode::Advanced),
+		std::make_pair(P_ASPECTRATIO, ViewMode::Master),
+		std::make_pair(P_CODINGTYPE, ViewMode::Expert),
+		std::make_pair(P_MAXIMUMREFERENCEFRAMES, ViewMode::Expert),
+		// ----------- Rate Control Section
+		std::make_pair(P_RATECONTROLMETHOD, ViewMode::Basic),
+		//std::make_pair(P_PREPASSMODE, ViewMode::Basic),
+		//std::make_pair(P_BITRATE_TARGET, ViewMode::Basic),
+		//std::make_pair(P_BITRATE_PEAK, ViewMode::Basic),
+		//std::make_pair(P_QP_IFRAME, ViewMode::Basic),
+		//std::make_pair(P_QP_PFRAME, ViewMode::Basic),
+		//std::make_pair(P_QP_BFRAME, ViewMode::Basic),
+		//std::make_pair(P_QP_MINIMUM, ViewMode::Advanced),
+		//std::make_pair(P_QP_MAXIMUM, ViewMode::Advanced),
+		//std::make_pair(P_FILLERDATA, ViewMode::Basic),
+		std::make_pair(P_FRAMESKIPPING, ViewMode::Advanced),
+		std::make_pair(P_FRAMESKIPPING_PERIOD, ViewMode::Master),
+		std::make_pair(P_FRAMESKIPPING_BEHAVIOUR, ViewMode::Master),
+		//std::make_pair(P_VBAQ, ViewMode::Expert),
+		std::make_pair(P_ENFORCEHRD, ViewMode::Expert),
+		// ----------- VBV Buffer
+		std::make_pair(P_VBVBUFFER, ViewMode::Advanced),
+		//std::make_pair(P_VBVBUFFER_STRICTNESS, ViewMode::Advanced),
+		//std::make_pair(P_VBVBUFFER_SIZE, ViewMode::Advanced),
+		std::make_pair(P_VBVBUFFER_INITIALFULLNESS, ViewMode::Expert),
+		// ----------- Picture Control
+		std::make_pair(P_INTERVAL_KEYFRAME, ViewMode::Basic),
+		std::make_pair(P_PERIOD_IDR_H265, ViewMode::Master),
+		std::make_pair(P_INTERVAL_IFRAME, ViewMode::Master),
+		std::make_pair(P_PERIOD_IFRAME, ViewMode::Master),
+		std::make_pair(P_INTERVAL_PFRAME, ViewMode::Master),
+		std::make_pair(P_PERIOD_PFRAME, ViewMode::Master),
+		std::make_pair(P_GOP_TYPE, ViewMode::Expert),
+		//std::make_pair(P_GOP_SIZE, ViewMode::Expert),
+		//std::make_pair(P_GOP_SIZE_MINIMUM, ViewMode::Expert),
+		//std::make_pair(P_GOP_SIZE_MAXIMUM, ViewMode::Expert),
+		std::make_pair(P_DEBLOCKINGFILTER, ViewMode::Expert),
+		std::make_pair(P_MOTIONESTIMATION, ViewMode::Expert),
+		// ----------- Intra-Refresh
+		//std::make_pair("", ViewMode::Master),
+		// ----------- System
+		std::make_pair(P_VIDEO_API, ViewMode::Advanced),
+		std::make_pair(P_VIDEO_ADAPTER, ViewMode::Advanced),
+		std::make_pair(P_OPENCL_TRANSFER, ViewMode::Advanced),
+		std::make_pair(P_OPENCL_CONVERSION, ViewMode::Advanced),
+		std::make_pair(P_MULTITHREADING, ViewMode::Expert),
+		std::make_pair(P_QUEUESIZE, ViewMode::Expert),
+		std::make_pair(P_VIEW, ViewMode::Basic),
+		std::make_pair(P_DEBUG, ViewMode::Basic),
+	};
+	for (std::pair<const char*, ViewMode> kv : viewstuff) {
+		bool vis = curView >= kv.second;
+		obs_property_set_visible(obs_properties_get(props, kv.first), vis);
+		if (!vis)
+			obs_data_unset_user_value(data, kv.first);
+	}
+
+#pragma region Rate Control
+	bool vis_rcm_bitrate_target = false, vis_rcm_bitrate_peak = false, vis_rcm_qp = false, vis_rcm_fillerdata = false;
+
+	RateControlMethod lastRCM = static_cast<RateControlMethod>(obs_data_get_int(data, ("last" P_RATECONTROLMETHOD))),
+					  curRCM  = static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD));
+	if (lastRCM != curRCM) {
+		obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), static_cast<int32_t>(curRCM));
+		result = true;
+	}
+	switch (curRCM) {
+	case RateControlMethod::ConstantQP:
+		vis_rcm_qp = true;
+		break;
+	case RateControlMethod::ConstantBitrate:
+		vis_rcm_bitrate_target = true;
+		vis_rcm_fillerdata     = true;
+		break;
+	case RateControlMethod::PeakConstrainedVariableBitrate:
+		vis_rcm_bitrate_target = true;
+		vis_rcm_bitrate_peak   = true;
+		break;
+	case RateControlMethod::LatencyConstrainedVariableBitrate:
+		vis_rcm_bitrate_target = true;
+		vis_rcm_bitrate_peak   = true;
+		break;
+	}
+
+	/// Bitrate
+	obs_property_set_visible(obs_properties_get(props, "bitrate"), vis_rcm_bitrate_target);
+	if (!vis_rcm_bitrate_target)
+		obs_data_unset_user_value(data, "bitrate");
+	obs_property_set_visible(obs_properties_get(props, P_BITRATE_PEAK), vis_rcm_bitrate_peak);
+	if (!vis_rcm_bitrate_peak)
+		obs_data_unset_user_value(data, P_BITRATE_PEAK);
+
+	/// QP
+	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME), vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME), vis_rcm_qp);
+	if (!vis_rcm_qp) {
+		obs_data_unset_user_value(data, P_QP_IFRAME);
+		obs_data_unset_user_value(data, P_QP_PFRAME);
+	}
+
+	/// QP Min/Max
+	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME_MINIMUM),
+							 (curView >= ViewMode::Advanced) && !vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, P_QP_IFRAME_MAXIMUM),
+							 (curView >= ViewMode::Advanced) && !vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME_MINIMUM),
+							 (curView >= ViewMode::Advanced) && !vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, P_QP_PFRAME_MAXIMUM),
+							 (curView >= ViewMode::Advanced) && !vis_rcm_qp);
+	if (!(curView >= ViewMode::Advanced) || vis_rcm_qp) {
+		obs_data_unset_user_value(data, P_QP_IFRAME_MINIMUM);
+		obs_data_unset_user_value(data, P_QP_IFRAME_MAXIMUM);
+		obs_data_unset_user_value(data, P_QP_PFRAME_MINIMUM);
+		obs_data_unset_user_value(data, P_QP_PFRAME_MAXIMUM);
+	}
+
+	/// Filler Data (CBR only at the moment)
+	obs_property_set_visible(obs_properties_get(props, P_FILLERDATA), vis_rcm_fillerdata);
+	if (!vis_rcm_fillerdata)
+		obs_data_unset_user_value(data, P_FILLERDATA);
+
+	/// Pre-Pass
+	obs_property_set_visible(obs_properties_get(props, P_PREPASSMODE), (curView >= ViewMode::Basic) && !vis_rcm_qp);
+	if (!(curView >= ViewMode::Basic) || vis_rcm_qp) {
+		obs_data_unset_user_value(data, P_PREPASSMODE);
+	}
+
+	/// VBAQ
+	obs_property_set_visible(obs_properties_get(props, P_VBAQ), (curView >= ViewMode::Expert) && !vis_rcm_qp);
+	if (!(curView >= ViewMode::Expert) || vis_rcm_qp) {
+		obs_data_unset_user_value(data, P_VBAQ);
+	}
+#pragma endregion Rate Control
+
+#pragma region VBV Buffer
+	uint32_t vbvBufferMode    = static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER));
+	bool     vbvBufferVisible = (curView >= ViewMode::Advanced);
+
+	uint32_t lastVBVBufferMode = static_cast<uint32_t>(obs_data_get_int(data, ("last" P_VBVBUFFER)));
+	if (lastVBVBufferMode != vbvBufferMode) {
+		obs_data_set_int(data, ("last" P_VBVBUFFER), vbvBufferMode);
+		result = true;
+	}
+
+	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_STRICTNESS),
+							 vbvBufferVisible && (vbvBufferMode == 0));
+	obs_property_set_visible(obs_properties_get(props, P_VBVBUFFER_SIZE), vbvBufferVisible && (vbvBufferMode == 1));
+	if (!vbvBufferVisible || vbvBufferMode == 0)
+		obs_data_unset_user_value(data, P_VBVBUFFER_SIZE);
+	if (!vbvBufferVisible || vbvBufferMode == 1)
+		obs_data_unset_user_value(data, P_VBVBUFFER_STRICTNESS);
+#pragma endregion VBV Buffer
+
+#pragma region GOP
+	bool gopvisible    = (curView >= ViewMode::Expert);
+	bool goptype_fixed = (static_cast<H265::GOPType>(obs_data_get_int(data, P_GOP_TYPE)) == H265::GOPType::Fixed);
+	obs_property_set_visible(obs_properties_get(props, P_GOP_SIZE), goptype_fixed && gopvisible);
+	obs_property_set_visible(obs_properties_get(props, P_GOP_SIZE_MINIMUM), !goptype_fixed && gopvisible);
+	obs_property_set_visible(obs_properties_get(props, P_GOP_SIZE_MAXIMUM), !goptype_fixed && gopvisible);
+	if (!goptype_fixed) {
+		obs_data_unset_user_value(data, P_GOP_SIZE);
+	} else if (goptype_fixed) {
+		obs_data_unset_user_value(data, P_GOP_SIZE_MINIMUM);
+		obs_data_unset_user_value(data, P_GOP_SIZE_MAXIMUM);
+	}
+#pragma endregion GOP
+#pragma endregion View Mode
+
+	// Permanently disable static properties while encoding.
+	void* enc = obs_properties_get_param(props);
+	if (enc) {
+		std::vector<const char*> hiddenProperties = {
+			// Static
+			///P_USAGE,
+			P_QUALITYPRESET,
+			P_PROFILE,
+			P_PROFILELEVEL,
+			P_TIER,
+			P_CODINGTYPE,
+			P_MAXIMUMREFERENCEFRAMES,
+
+			/// Rate Control
+			P_RATECONTROLMETHOD,
+			P_VBVBUFFER,
+			P_VBVBUFFER_STRICTNESS,
+			P_VBVBUFFER_SIZE,
+			P_VBVBUFFER_INITIALFULLNESS,
+			P_PREPASSMODE,
+			P_VBAQ,
+
+			/// Picture Control
+			P_GOP_SIZE,
+			P_GOP_SIZE_MAXIMUM,
+			P_GOP_SIZE_MINIMUM,
+			P_GOP_TYPE,
+			P_INTERVAL_KEYFRAME,
+			P_PERIOD_IDR_H265,
+			P_DEBLOCKINGFILTER,
+			P_MOTIONESTIMATION,
+
+			// System
+			P_VIDEO_API,
+			P_VIDEO_ADAPTER,
+			P_OPENCL_TRANSFER,
+			P_OPENCL_CONVERSION,
+			P_MULTITHREADING,
+			P_QUEUESIZE,
+			P_DEBUG,
+		};
+		for (const char* pr : hiddenProperties) {
+			obs_property_set_enabled(obs_properties_get(props, pr), false);
+		}
+	}
+
+	return true;
+}
+
+void* Plugin::Interface::H265Interface::create(obs_data_t* data, obs_encoder_t* encoder)
+{
+	try {
+		return new H265Interface(data, encoder);
+	} catch (std::exception e) {
+		PLOG_ERROR("%s", e.what());
+	}
+	return nullptr;
+}
+
+Plugin::Interface::H265Interface::H265Interface(obs_data_t* data, obs_encoder_t* encoder)
+{
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
+
+	m_Encoder = encoder;
+
+	// OBS Settings
+	uint32_t                        obsWidth     = obs_encoder_get_width(encoder);
+	uint32_t                        obsHeight    = obs_encoder_get_height(encoder);
+	video_t*                        obsVideoInfo = obs_encoder_video(encoder);
+	const struct video_output_info* voi          = video_output_get_info(obsVideoInfo);
+	uint32_t                        obsFPSnum    = voi->fps_num;
+	uint32_t                        obsFPSden    = voi->fps_den;
+
+	//////////////////////////////////////////////////////////////////////////
+	/// Initialize Encoder
+	bool debug = obs_data_get_bool(data, P_DEBUG);
+	Plugin::AMD::AMF::Instance()->EnableDebugTrace(debug);
+
+	ColorFormat colorFormat = ColorFormat::NV12;
+	switch (voi->format) {
+	case VIDEO_FORMAT_NV12:
+		colorFormat = ColorFormat::NV12;
+		break;
+	case VIDEO_FORMAT_I420:
+		colorFormat = ColorFormat::I420;
+		break;
+	case VIDEO_FORMAT_YUY2:
+		colorFormat = ColorFormat::YUY2;
+		break;
+	case VIDEO_FORMAT_RGBA:
+		colorFormat = ColorFormat::RGBA;
+		break;
+	case VIDEO_FORMAT_BGRA:
+		colorFormat = ColorFormat::BGRA;
+		break;
+	case VIDEO_FORMAT_Y800:
+		colorFormat = ColorFormat::GRAY;
+		break;
+	}
+	ColorSpace colorSpace = ColorSpace::BT601;
+	switch (voi->colorspace) {
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_601:
+		colorSpace = ColorSpace::BT601;
+		break;
+	case VIDEO_CS_709:
+		colorSpace = ColorSpace::BT709;
+		break;
+	}
+
+	auto api = API::GetAPI(obs_data_get_string(data, P_VIDEO_API));
+	union {
+		int64_t  v;
+		uint32_t id[2];
+	} adapterid  = {obs_data_get_int(data, P_VIDEO_ADAPTER)};
+	auto adapter = api->GetAdapterById(adapterid.id[0], adapterid.id[1]);
+
+	m_VideoEncoder = std::make_unique<EncoderH265>(
+		api, adapter, !!obs_data_get_int(data, P_OPENCL_TRANSFER), !!obs_data_get_int(data, P_OPENCL_CONVERSION),
+		colorFormat, colorSpace, voi->range == VIDEO_RANGE_FULL, !!obs_data_get_int(data, P_MULTITHREADING),
+		(size_t)obs_data_get_int(data, P_QUEUESIZE));
+
+	/// Static Properties
+	//m_VideoEncoder->SetUsage(Usage::Transcoding);
+	m_VideoEncoder->SetQualityPreset(static_cast<QualityPreset>(obs_data_get_int(data, P_QUALITYPRESET)));
+
+	/// Profile & Level
+	m_VideoEncoder->SetProfile(static_cast<Profile>(obs_data_get_int(data, P_PROFILE)));
+	m_VideoEncoder->SetProfileLevel(static_cast<ProfileLevel>(obs_data_get_int(data, P_PROFILELEVEL)),
+									std::make_pair(obsWidth, obsHeight), std::make_pair(obsFPSnum, obsFPSden));
+	m_VideoEncoder->SetTier(static_cast<H265::Tier>(obs_data_get_int(data, P_TIER)));
+
+	/// Frame
+	m_VideoEncoder->SetResolution(std::make_pair(obsWidth, obsHeight));
+	m_VideoEncoder->SetFrameRate(std::make_pair(obsFPSnum, obsFPSden));
+	///- Aspect Ratio
+
+	try {
+		m_VideoEncoder->SetCodingType(static_cast<CodingType>(obs_data_get_int(data, P_CODINGTYPE)));
+	} catch (...) {
+	}
+	try {
+		m_VideoEncoder->SetMaximumReferenceFrames(obs_data_get_int(data, P_MAXIMUMREFERENCEFRAMES));
+	} catch (...) {
+	}
+
+	// Rate Control
+	m_VideoEncoder->SetRateControlMethod(static_cast<RateControlMethod>(obs_data_get_int(data, P_RATECONTROLMETHOD)));
+	if (obs_data_get_int(data, P_VBVBUFFER) == 0) {
+		m_VideoEncoder->SetVBVBufferStrictness(obs_data_get_double(data, P_VBVBUFFER_STRICTNESS) / 100.0);
+	} else {
+		m_VideoEncoder->SetVBVBufferSize(static_cast<uint32_t>(obs_data_get_int(data, P_VBVBUFFER_SIZE) * 1000));
+	}
+	m_VideoEncoder->SetVBVBufferInitialFullness(obs_data_get_double(data, P_VBVBUFFER_INITIALFULLNESS) / 100.0f);
+	if (m_VideoEncoder->GetRateControlMethod() != RateControlMethod::ConstantQP) {
+		m_VideoEncoder->SetPrePassMode(static_cast<PrePassMode>(obs_data_get_int(data, P_PREPASSMODE)));
+		m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled((!!obs_data_get_int(data, P_VBAQ)));
+	} else {
+		m_VideoEncoder->SetPrePassMode(PrePassMode::Disabled);
+		m_VideoEncoder->SetVarianceBasedAdaptiveQuantizationEnabled(false);
+	}
+
+	// Picture Control
+	uint32_t      gopSize = static_cast<uint32_t>(clamp(floor(obsFPSnum / (double_t)obsFPSden), 1, 1000));
+	H265::GOPType gopType = static_cast<H265::GOPType>(obs_data_get_int(data, P_GOP_TYPE));
+	m_VideoEncoder->SetGOPType(gopType);
+	if (static_cast<ViewMode>(obs_data_get_int(data, P_VIEW)) >= ViewMode::Expert) {
+		switch (gopType) {
+		case H265::GOPType::Fixed:
+			gopSize = (uint32_t)obs_data_get_int(data, P_GOP_SIZE);
+			break;
+		case H265::GOPType::Variable:
+			gopSize =
+				(uint32_t)(obs_data_get_int(data, P_GOP_SIZE_MINIMUM) + obs_data_get_int(data, P_GOP_SIZE_MAXIMUM)) / 2;
+			m_VideoEncoder->SetGOPSizeMin((uint32_t)obs_data_get_int(data, P_GOP_SIZE_MINIMUM));
+			m_VideoEncoder->SetGOPSizeMax((uint32_t)obs_data_get_int(data, P_GOP_SIZE_MAXIMUM));
+			break;
+		}
+	}
+	m_VideoEncoder->SetGOPSize(gopSize);
+	/// Keyframe Interval/Period
+	double_t framerate = (double_t)obsFPSnum / (double_t)obsFPSden;
+	{
+		uint32_t idrperiod = static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IDR_H265));
+		if (idrperiod == 0) {
+			double_t keyinterv = obs_data_get_double(data, P_INTERVAL_KEYFRAME);
+			idrperiod          = static_cast<uint32_t>(ceil((keyinterv * framerate) / gopSize));
+		}
+		m_VideoEncoder->SetIDRPeriod(clamp(idrperiod, 1, 1000));
+	}
+	m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, P_DEBLOCKINGFILTER));
+	m_VideoEncoder->SetMotionEstimationHalfPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 1));
+	m_VideoEncoder->SetMotionEstimationQuarterPixelEnabled(!!(obs_data_get_int(data, P_MOTIONESTIMATION) & 2));
+
+	// OBS - Enforce Streaming Service Restrictions
+#pragma region OBS - Enforce Streaming Service Restrictions
+	{
+		// Profile
+		const char* p_str = obs_data_get_string(data, "profile");
+		if (strcmp(p_str, "") != 0) {
+			if (strcmp(p_str, "main")) {
+				m_VideoEncoder->SetProfile(Profile::Main);
+			}
+			obs_data_unset_user_value(data, "profile");
+		}
+
+		// Preset
+		const char* preset = obs_data_get_string(data, "preset");
+		if (strcmp(preset, "") != 0) {
+			if (strcmp(preset, "speed") == 0) {
+				m_VideoEncoder->SetQualityPreset(QualityPreset::Speed);
+			} else if (strcmp(preset, "balanced") == 0) {
+				m_VideoEncoder->SetQualityPreset(QualityPreset::Balanced);
+			} else if (strcmp(preset, "quality") == 0) {
+				m_VideoEncoder->SetQualityPreset(QualityPreset::Quality);
+			}
+			obs_data_set_int(data, P_QUALITYPRESET, (int32_t)m_VideoEncoder->GetQualityPreset());
+			obs_data_unset_user_value(data, "preset");
+		}
+
+		// Rate Control Method
+		const char* t_str = obs_data_get_string(data, "rate_control");
+		if (strcmp(t_str, "") != 0) {
+			if (strcmp(t_str, "CBR") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantBitrate);
+				m_VideoEncoder->SetFillerDataEnabled(true);
+			} else if (strcmp(t_str, "VBR") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::PeakConstrainedVariableBitrate);
+			} else if (strcmp(t_str, "VBR_LAT") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::LatencyConstrainedVariableBitrate);
+			} else if (strcmp(t_str, "CQP") == 0) {
+				m_VideoEncoder->SetRateControlMethod(RateControlMethod::ConstantQP);
+			}
+
+			obs_data_set_int(data, P_RATECONTROLMETHOD, (int32_t)m_VideoEncoder->GetRateControlMethod());
+			obs_data_unset_user_value(data, "rate_control");
+		}
+	}
+#pragma endregion OBS - Enforce Streaming Service Restrictions
+
+	// Dynamic Properties (Can be changed during Encoding)
+	this->update(data);
+
+	// Initialize (locks static properties)
+	try {
+		m_VideoEncoder->Start();
+	} catch (...) {
+		throw;
+	}
+
+	// Dynamic Properties (Can be changed during Encoding)
+	this->update(data);
+
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
+}
+
+void Plugin::Interface::H265Interface::destroy(void* ptr)
+{
+	if (ptr)
+		delete static_cast<H265Interface*>(ptr);
+}
+
+Plugin::Interface::H265Interface::~H265Interface()
+{
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing...");
+	if (m_VideoEncoder) {
+		m_VideoEncoder->Stop();
+		m_VideoEncoder = nullptr;
+	}
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Complete.");
+}
+
+bool Plugin::Interface::H265Interface::update(void* ptr, obs_data_t* settings)
+{
+	if (ptr)
+		return static_cast<H265Interface*>(ptr)->update(settings);
+	return false;
+}
+
+bool Plugin::Interface::H265Interface::update(obs_data_t* data)
+{
+	const video_t*                  obsVideoInfo = obs_encoder_video(m_Encoder);
+	const struct video_output_info* voi          = video_output_get_info(obsVideoInfo);
+	uint32_t                        obsFPSnum    = voi->fps_num;
+	uint32_t                        obsFPSden    = voi->fps_den;
+
+	// Rate Control
+	RateControlMethod rcm = m_VideoEncoder->GetRateControlMethod();
+	if (rcm == RateControlMethod::ConstantQP) {
+		m_VideoEncoder->SetIFrameQPMinimum(m_VideoEncoder->CapsIFrameQPMinimum().first);
+		m_VideoEncoder->SetIFrameQPMaximum(m_VideoEncoder->CapsIFrameQPMaximum().second);
+		m_VideoEncoder->SetPFrameQPMinimum(m_VideoEncoder->CapsPFrameQPMinimum().first);
+		m_VideoEncoder->SetPFrameQPMaximum(m_VideoEncoder->CapsPFrameQPMaximum().second);
+		m_VideoEncoder->SetIFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME)));
+		m_VideoEncoder->SetPFrameQP(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME)));
+		m_VideoEncoder->SetFillerDataEnabled(false);
+	} else {
+		m_VideoEncoder->SetIFrameQPMinimum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME_MINIMUM)));
+		m_VideoEncoder->SetIFrameQPMaximum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_IFRAME_MAXIMUM)));
+		m_VideoEncoder->SetPFrameQPMinimum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME_MINIMUM)));
+		m_VideoEncoder->SetPFrameQPMaximum(static_cast<uint8_t>(obs_data_get_int(data, P_QP_PFRAME_MAXIMUM)));
+		m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
+		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, P_BITRATE_PEAK) * 1000));
+	}
+	if (rcm == RateControlMethod::ConstantBitrate) {
+		m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, "bitrate") * 1000));
+		m_VideoEncoder->SetFillerDataEnabled(!!obs_data_get_int(data, P_FILLERDATA));
+	} else {
+		m_VideoEncoder->SetFillerDataEnabled(false);
+	}
+	m_VideoEncoder->SetFrameSkippingEnabled(!!obs_data_get_int(data, P_FRAMESKIPPING));
+	m_VideoEncoder->SetEnforceHRDEnabled(!!obs_data_get_int(data, P_ENFORCEHRD));
+
+	// Picture Control
+	double_t framerate = (double_t)obsFPSnum / (double_t)obsFPSden;
+	/// I/P/Skip Frame Interval/Period
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_IFRAME) * framerate);
+		period          = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_IFRAME)));
+		m_VideoEncoder->SetIFramePeriod(period);
+	}
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_PFRAME) * framerate);
+		period          = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_PFRAME)));
+		m_VideoEncoder->SetPFramePeriod(period);
+	}
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_double(data, P_INTERVAL_BFRAME) * framerate);
+		period          = max(period, static_cast<uint32_t>(obs_data_get_int(data, P_PERIOD_BFRAME)));
+		m_VideoEncoder->SetBFramePeriod(period);
+	}
+	{
+		uint32_t period = static_cast<uint32_t>(obs_data_get_int(data, P_FRAMESKIPPING_PERIOD));
+		m_VideoEncoder->SetFrameSkippingPeriod(period);
+		m_VideoEncoder->SetFrameSkippingBehaviour(!!obs_data_get_int(data, P_FRAMESKIPPING_BEHAVIOUR));
+	}
+
+	m_VideoEncoder->SetDebug(obs_data_get_bool(data, P_DEBUG));
+
+	if (m_VideoEncoder->IsStarted()) {
+		m_VideoEncoder->LogProperties();
+		if (static_cast<ViewMode>(obs_data_get_int(data, P_VIEW)) >= ViewMode::Master)
+			PLOG_ERROR(
+				"View Mode 'Master' is active, avoid giving anything but basic support. Error is most likely caused by "
+				"user settings themselves.");
+	}
+
+	return true;
+}
+
+bool Plugin::Interface::H265Interface::encode(void* ptr, struct encoder_frame* frame, struct encoder_packet* packet,
+											  bool* received_packet)
+{
+	if (ptr)
+		return static_cast<H265Interface*>(ptr)->encode(frame, packet, received_packet);
+	return false;
+}
+
+bool Plugin::Interface::H265Interface::encode(struct encoder_frame* frame, struct encoder_packet* packet,
+											  bool* received_packet)
+{
+	if (!frame || !packet || !received_packet)
+		return false;
+
+	try {
+		return m_VideoEncoder->Encode(frame, packet, received_packet);
+	} catch (std::exception e) {
+		PLOG_ERROR("Exception during encoding: %s", e.what());
+	} catch (...) {
+		PLOG_ERROR("Unknown exception during encoding.");
+	}
+	return false;
+}
+
+void Plugin::Interface::H265Interface::get_video_info(void* ptr, struct video_scale_info* info)
+{
+	if (ptr)
+		static_cast<H265Interface*>(ptr)->get_video_info(info);
+}
+
+void Plugin::Interface::H265Interface::get_video_info(struct video_scale_info* info)
+{
+	m_VideoEncoder->GetVideoInfo(info);
+}
+
+bool Plugin::Interface::H265Interface::get_extra_data(void* ptr, uint8_t** extra_data, size_t* size)
+{
+	if (ptr)
+		return static_cast<H265Interface*>(ptr)->get_extra_data(extra_data, size);
+	return false;
+}
+
+bool Plugin::Interface::H265Interface::get_extra_data(uint8_t** extra_data, size_t* size)
+{
+	return m_VideoEncoder->GetExtraData(extra_data, size);
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/plugin.cpp Added

@@ -0,0 +1,370 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+#include <sstream>
+#include "amf-capabilities.h"
+#include "amf.h"
+#include "api-base.h"
+#include "enc-h264.h"
+#include "enc-h265.h"
+#include "plugin.h"
+
+#pragma warning(push)
+#pragma warning(disable : 4201)
+#include <obs-module.h>
+#include <util/pipe.h>
+#include <util/platform.h>
+#pragma warning(pop)
+
+#if defined(_WIN32) || defined(_WIN64)
+#include <windows.h>
+#endif
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+
+#if defined(_WIN32) || defined(_WIN64)
+BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID)
+{
+	return TRUE;
+}
+
+static inline bool create_process(const char* cmd_line, HANDLE stdin_handle, HANDLE stdout_handle, HANDLE* process)
+{
+	PROCESS_INFORMATION pi         = {0};
+	wchar_t*            cmd_line_w = NULL;
+	STARTUPINFOW        si         = {0};
+	bool                success    = false;
+
+	si.cb         = sizeof(si);
+	si.dwFlags    = STARTF_USESTDHANDLES;
+	si.hStdInput  = stdin_handle;
+	si.hStdOutput = stdout_handle;
+
+	os_utf8_to_wcs_ptr(cmd_line, 0, &cmd_line_w);
+	if (cmd_line_w) {
+		success = !!CreateProcessW(NULL, cmd_line_w, NULL, NULL, true, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+
+		if (success) {
+			*process = pi.hProcess;
+			CloseHandle(pi.hThread);
+		}
+
+		bfree(cmd_line_w);
+	}
+
+	return success;
+}
+
+static bool create_pipe(HANDLE* input, HANDLE* output)
+{
+	SECURITY_ATTRIBUTES sa = {0};
+
+	sa.nLength        = sizeof(sa);
+	sa.bInheritHandle = true;
+
+	if (!CreatePipe(input, output, &sa, 0)) {
+		return false;
+	}
+
+	return true;
+}
+#endif
+
+OBS_DECLARE_MODULE();
+OBS_MODULE_AUTHOR("Michael Fabian Dirks");
+OBS_MODULE_USE_DEFAULT_LOCALE("enc-amf", "en-US");
+
+#ifdef _DEBUG
+#include "components/VideoConverter.h"
+#include "components/VideoEncoderHEVC.h"
+#include "components/VideoEncoderVCE.h"
+
+static std::string fastPrintVariant(const char* text, amf::AMFVariantStruct variant)
+{
+	std::vector<char> buf(1024);
+	switch (variant.type) {
+	case amf::AMF_VARIANT_EMPTY:
+		snprintf(buf.data(), buf.size(), "%s%s", text, "Empty");
+		break;
+	case amf::AMF_VARIANT_BOOL:
+		snprintf(buf.data(), buf.size(), "%s%s", text, variant.boolValue ? "true" : "false");
+		break;
+	case amf::AMF_VARIANT_INT64:
+		snprintf(buf.data(), buf.size(), "%s%lld", text, variant.int64Value);
+		break;
+	case amf::AMF_VARIANT_DOUBLE:
+		snprintf(buf.data(), buf.size(), "%s%f", text, variant.doubleValue);
+		break;
+	case amf::AMF_VARIANT_RECT:
+		snprintf(buf.data(), buf.size(), "%s[%ld,%ld,%ld,%ld]", text, variant.rectValue.top, variant.rectValue.left,
+				 variant.rectValue.bottom, variant.rectValue.right);
+		break;
+	case amf::AMF_VARIANT_SIZE:
+		snprintf(buf.data(), buf.size(), "%s%ldx%ld", text, variant.sizeValue.width, variant.sizeValue.height);
+		break;
+	case amf::AMF_VARIANT_POINT:
+		snprintf(buf.data(), buf.size(), "%s[%ld,%ld]", text, variant.pointValue.x, variant.pointValue.y);
+		break;
+	case amf::AMF_VARIANT_RATE:
+		snprintf(buf.data(), buf.size(), "%s%ld/%ld", text, variant.rateValue.num, variant.rateValue.den);
+		break;
+	case amf::AMF_VARIANT_RATIO:
+		snprintf(buf.data(), buf.size(), "%s%ld:%ld", text, variant.ratioValue.num, variant.ratioValue.den);
+		break;
+	case amf::AMF_VARIANT_COLOR:
+		snprintf(buf.data(), buf.size(), "%s(%d,%d,%d,%d)", text, variant.colorValue.r, variant.colorValue.g,
+				 variant.colorValue.b, variant.colorValue.a);
+		break;
+	case amf::AMF_VARIANT_STRING:
+		snprintf(buf.data(), buf.size(), "%s'%s'", text, variant.stringValue);
+		break;
+	case amf::AMF_VARIANT_WSTRING:
+		snprintf(buf.data(), buf.size(), "%s'%ls'", text, variant.wstringValue);
+		break;
+	}
+	return std::string(buf.data());
+};
+
+static void printDebugInfo(amf::AMFComponentPtr m_AMFEncoder)
+{
+	amf::AMFPropertyInfo* pInfo;
+	size_t                propCount = m_AMFEncoder->GetPropertyCount();
+	//PLOG_INFO("-- Internal AMF Encoder Properties --");
+	for (size_t propIndex = 0; propIndex < propCount; propIndex++) {
+		static const char* typeToString[] = {"Empty", "Boolean", "Int64", "Double", "Rect",    "Size",     "Point",
+											 "Rate",  "Ratio",   "Color", "String", "WString", "Interface"};
+
+		AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(propIndex, (const amf::AMFPropertyInfo**)&pInfo);
+		if (res != AMF_OK)
+			continue;
+
+		amf::AMFVariantStruct curStruct = amf::AMFVariantStruct();
+		m_AMFEncoder->GetProperty(pInfo->name, &curStruct);
+
+		auto              vcur = fastPrintVariant("Current: ", curStruct);
+		auto              vdef = fastPrintVariant("Default: ", pInfo->defaultValue);
+		auto              vmin = fastPrintVariant("Minimum: ", pInfo->minValue);
+		auto              vmax = fastPrintVariant("Maximum: ", pInfo->maxValue);
+		std::stringstream venum;
+		if (pInfo->pEnumDescription) {
+			const amf::AMFEnumDescriptionEntry* pEnumEntry = pInfo->pEnumDescription;
+			while (pEnumEntry->name != nullptr) {
+				QUICK_FORMAT_MESSAGE(tmp, "%ls[%ld]", pEnumEntry->name, pEnumEntry->value);
+				venum << tmp.c_str() << "; ";
+				pEnumEntry++;
+			}
+		}
+
+		PLOG_INFO(
+			"%ls(Description: %ls, Type: %s, Index %d, Content Type: %d, Access: %s%s%s, Values: {%s, %s, %s, %s%s%s})",
+			pInfo->name, pInfo->desc, typeToString[pInfo->type], propIndex, pInfo->contentType,
+			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_READ) ? "R" : "",
+			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE) ? "W" : "",
+			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE_RUNTIME) ? "X" : "", vcur.c_str(), vdef.c_str(),
+			vmin.c_str(), vmax.c_str(), (venum.str().length() > 0) ? ", Enum: " : "", venum.str().c_str());
+	}
+}
+#endif
+
+MODULE_EXPORT bool obs_module_load(void)
+{
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loading...");
+
+#ifdef _WIN32
+	// Out-of-process AMF Test
+	{
+		unsigned long returnCode = 0xFFFFFFFF;
+		HANDLE        hProcess, hIn, hOut;
+		char*         path = obs_module_file("enc-amf-test" BIT_STR ".exe");
+
+		if (!create_pipe(&hIn, &hOut)) {
+			PLOG_ERROR("Failed to create pipes for AMF test.");
+			bfree(path);
+			return false;
+		}
+		if (!SetHandleInformation(hIn, HANDLE_FLAG_INHERIT, false)
+			|| !SetHandleInformation(hOut, HANDLE_FLAG_INHERIT, false)) {
+			CloseHandle(hIn);
+			CloseHandle(hOut);
+			PLOG_ERROR("Failed to modify pipes for AMF test.");
+			bfree(path);
+			return false;
+		};
+		if (!create_process(path, hIn, hOut, &hProcess)) {
+			CloseHandle(hIn);
+			CloseHandle(hOut);
+			PLOG_ERROR("Failed to start AMF test subprocess.");
+			bfree(path);
+			return false;
+		}
+
+		bfree(path);
+		std::vector<char> buf(1024);
+		DWORD             bufread = 0;
+		while (ReadFile(hOut, buf.data(), 1024, &bufread, NULL)) {
+			PLOG_ERROR("%s", buf.data());
+		}
+
+		if (WaitForSingleObject(hProcess, 2000) == WAIT_OBJECT_0)
+			GetExitCodeProcess(hProcess, &returnCode);
+
+		CloseHandle(hProcess);
+		CloseHandle(hIn);
+		CloseHandle(hOut);
+
+		switch (returnCode) {
+		case STATUS_ACCESS_VIOLATION:
+		case STATUS_ARRAY_BOUNDS_EXCEEDED:
+		case STATUS_BREAKPOINT:
+		case STATUS_DATATYPE_MISALIGNMENT:
+		case STATUS_FLOAT_DENORMAL_OPERAND:
+		case STATUS_FLOAT_DIVIDE_BY_ZERO:
+		case STATUS_FLOAT_INEXACT_RESULT:
+		case STATUS_FLOAT_INVALID_OPERATION:
+		case STATUS_FLOAT_OVERFLOW:
+		case STATUS_FLOAT_STACK_CHECK:
+		case STATUS_FLOAT_UNDERFLOW:
+		case STATUS_GUARD_PAGE_VIOLATION:
+		case STATUS_ILLEGAL_INSTRUCTION:
+		case STATUS_IN_PAGE_ERROR:
+		case STATUS_INTEGER_DIVIDE_BY_ZERO:
+		case STATUS_INTEGER_OVERFLOW:
+		case STATUS_INVALID_DISPOSITION:
+		case STATUS_INVALID_HANDLE:
+		case STATUS_NONCONTINUABLE_EXCEPTION:
+		case STATUS_PRIVILEGED_INSTRUCTION:
+		case STATUS_SINGLE_STEP:
+		case STATUS_STACK_OVERFLOW:
+		case STATUS_UNWIND_CONSOLIDATE:
+		default:
+			PLOG_ERROR("A critical error occured during AMF Testing.");
+			return false;
+		case 2:
+		case 1:
+			PLOG_ERROR("AMF Test failed due to one or more errors.");
+			return false;
+		case 0:
+			break;
+		}
+	}
+#endif
+
+	// AMF
+	try {
+		Plugin::AMD::AMF::Initialize();
+	} catch (const std::exception& e) {
+		PLOG_ERROR("Encountered Exception during AMF initialization: %s", e.what());
+		return false;
+	} catch (...) {
+		PLOG_ERROR("Unexpected Exception during AMF initialization.");
+		return false;
+	}
+
+	// Initialize Graphics APIs
+	Plugin::API::InitializeAPIs();
+
+	// AMF Capabilities
+	try {
+		Plugin::AMD::CapabilityManager::Initialize();
+	} catch (const std::exception& e) {
+		PLOG_ERROR("Encountered Exception during Capability Manager initialization: %s", e.what());
+		return false;
+	} catch (...) {
+		PLOG_ERROR("Unexpected Exception during Capability Manager initialization.");
+		return false;
+	}
+
+	// Register Encoders
+	Plugin::Interface::H264Interface::encoder_register();
+	Plugin::Interface::H265Interface::encoder_register();
+
+#ifdef _DEBUG
+	{
+		PLOG_INFO("Dumping Parameter Information...");
+		const wchar_t* encoders[]   = {AMFVideoEncoderVCE_AVC, AMFVideoEncoder_HEVC};
+		auto           m_AMF        = AMF::Instance();
+		auto           m_AMFFactory = m_AMF->GetFactory();
+		amf::AMFTrace* m_AMFTrace;
+		m_AMFFactory->GetTrace(&m_AMFTrace);
+		amf::AMFDebug* m_AMFDebug;
+		m_AMFFactory->GetDebug(&m_AMFDebug);
+		m_AMFDebug->AssertsEnable(true);
+		m_AMFDebug->EnablePerformanceMonitor(true);
+		m_AMFTrace->SetGlobalLevel(AMF_TRACE_TEST);
+		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_TEST);
+		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_FILE, AMF_TRACE_TEST);
+		m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_TEST);
+		m_AMFTrace->SetPath(L"AMFTrace.log");
+		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_FILE, true);
+		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, true);
+		m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, true);
+		m_AMFTrace->TraceEnableAsync(true);
+		amf::AMFContextPtr m_AMFContext;
+		if (m_AMFFactory->CreateContext(&m_AMFContext) == AMF_OK) {
+			for (auto enc : encoders) {
+				m_AMFContext->InitDX11(nullptr);
+				amf::AMFComponentPtr m_AMFComponent;
+				if (m_AMFFactory->CreateComponent(m_AMFContext, enc, &m_AMFComponent) == AMF_OK) {
+					PLOG_INFO("-- %ls --", enc);
+					printDebugInfo(m_AMFComponent);
+					m_AMFComponent->Terminate();
+				}
+			}
+			amf::AMFComponentPtr m_AMFComponent, m_AMFComponent2;
+			if (m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoConverter, &m_AMFComponent) == AMF_OK) {
+				m_AMFComponent->Init(amf::AMF_SURFACE_NV12, 1280, 720);
+				if (m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoEncoderVCE_AVC, &m_AMFComponent2) == AMF_OK) {
+					PLOG_INFO("-- %s --", "Converter");
+					m_AMFComponent->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE,
+												AMF_VIDEO_CONVERTER_COLOR_PROFILE_JPEG);
+					printDebugInfo(m_AMFComponent);
+					m_AMFComponent2->Terminate();
+				}
+				m_AMFComponent->Terminate();
+			}
+			m_AMFContext->Terminate();
+		}
+	}
+#endif
+
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded.");
+	return true;
+}
+
+/** Optional: Called when the module is unloaded.  */
+MODULE_EXPORT void obs_module_unload(void)
+{
+	Plugin::AMD::CapabilityManager::Finalize();
+	Plugin::API::FinalizeAPIs();
+	Plugin::AMD::AMF::Finalize();
+}
+
+/** Optional: Returns the full name of the module */
+MODULE_EXPORT const char* obs_module_name()
+{
+	return "AMD Media Framework Plugin";
+}
+
+/** Optional: Returns a description of the module */
+MODULE_EXPORT const char* obs_module_description()
+{
+	return "AMD Media Framework Plugin";
+}

obs-studio-22.0.1.tar.xz/plugins/enc-amf/source/utility.cpp Added

@@ -0,0 +1,827 @@
+/*
+ * A Plugin that integrates the AMD AMF encoder into OBS Studio
+ * Copyright (C) 2016 - 2018 Michael Fabian Dirks
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#pragma once
+
+#include <map>
+#include <sstream>
+#include "amf-encoder-h264.h"
+#include "amf-encoder-h265.h"
+#include "amf-encoder.h"
+#include "amf.h"
+#include "components/VideoConverter.h"
+#include "components/VideoEncoderHEVC.h"
+#include "components/VideoEncoderVCE.h"
+#include "utility.h"
+
+using namespace Plugin::AMD;
+
+uint64_t Utility::GetUniqueIdentifier()
+{
+	static std::mutex __mutex;
+	static uint64_t   __curId;
+
+	const std::lock_guard<std::mutex> lock(__mutex);
+	return ++__curId;
+}
+
+const char* Utility::obs_module_text_multi(const char* key, uint8_t depth)
+{
+	static std::map<std::string, std::string> translatedMap;
+#ifndef LITE_OBS
+	// Check if it already was translated.
+	if (!translatedMap.count(std::string(key))) { // If not, translate it now.
+		const char* out = obs_module_text(key);
+
+		// Allow for nested translations using \@...\@ sequences.
+		if (depth > 0) {
+			// I'm pretty sure this can be optimized a ton if necessary.
+
+			size_t seqStart = 0, seqEnd = 0;
+			bool   haveSequence = false;
+
+			std::stringstream fout;
+
+			// Walk the given string.
+			std::string walkable = std::string(out);
+
+			for (size_t pos = 0; pos <= walkable.length(); pos++) {
+				std::string walked = walkable.substr(pos, 2);
+
+				if (walked == "\\@") { // Sequence Start/End
+					if (haveSequence) {
+						seqEnd = pos;
+
+						std::string sequence = walkable.substr(seqStart, seqEnd - seqStart);
+						fout << obs_module_text_multi(sequence.c_str(), depth--);
+					} else {
+						seqStart = pos + 2;
+					}
+					haveSequence = !haveSequence;
+					pos          = pos + 1;
+				} else if (!haveSequence) {
+					fout << walked.substr(0, 1); // Append the left character.
+				}
+			}
+
+			std::pair<std::string, std::string> kv = std::pair<std::string, std::string>(std::string(key), fout.str());
+			translatedMap.insert(kv);
+		} else {
+			return out;
+		}
+	}
+
+	auto value = translatedMap.find(std::string(key));
+	return value->second.c_str();
+#else
+	depth;
+	return key;
+#endif
+}
+
+// Codec
+const char* Utility::CodecToString(Plugin::AMD::Codec v)
+{
+	switch (v) {
+	case Codec::AVC:
+		return "H264/AVC";
+	case Codec::SVC:
+		return "H264/SVC";
+	case Codec::HEVC:
+		return "H265/HEVC";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+const wchar_t* Utility::CodecToAMF(Plugin::AMD::Codec v)
+{
+	switch (v) {
+	case Codec::AVC:
+		return AMFVideoEncoderVCE_AVC;
+	case Codec::SVC:
+		return AMFVideoEncoderVCE_SVC;
+	case Codec::HEVC:
+		return AMFVideoEncoder_HEVC;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Color Format
+const char* Utility::ColorFormatToString(Plugin::AMD::ColorFormat v)
+{
+	switch (v) {
+	case ColorFormat::I420:
+		return "YUV 4:2:0";
+	case ColorFormat::NV12:
+		return "NV12";
+	case ColorFormat::YUY2:
+		return "YUY2";
+	case ColorFormat::BGRA:
+		return "BGRA";
+	case ColorFormat::RGBA:
+		return "RGBA";
+	case ColorFormat::GRAY:
+		return "GRAY";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+amf::AMF_SURFACE_FORMAT Utility::ColorFormatToAMF(Plugin::AMD::ColorFormat v)
+{
+	switch (v) {
+	case ColorFormat::I420:
+		return amf::AMF_SURFACE_YUV420P;
+	case ColorFormat::NV12:
+		return amf::AMF_SURFACE_NV12;
+	case ColorFormat::YUY2:
+		return amf::AMF_SURFACE_YUY2;
+	case ColorFormat::BGRA:
+		return amf::AMF_SURFACE_BGRA;
+	case ColorFormat::RGBA:
+		return amf::AMF_SURFACE_RGBA;
+	case ColorFormat::GRAY:
+		return amf::AMF_SURFACE_GRAY8;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Color Space
+const char* Utility::ColorSpaceToString(Plugin::AMD::ColorSpace v)
+{
+	switch (v) {
+	case ColorSpace::BT601:
+		return "601";
+	case ColorSpace::BT709:
+		return "709";
+	case ColorSpace::BT2020:
+		return "2020";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM
+Utility::ColorSpaceToAMFConverter(Plugin::AMD::ColorSpace v)
+{
+	switch (v) {
+	case ColorSpace::BT601:
+		return AMF_VIDEO_CONVERTER_COLOR_PROFILE_601;
+	case ColorSpace::BT709:
+		return AMF_VIDEO_CONVERTER_COLOR_PROFILE_709;
+	case ColorSpace::BT2020:
+		return AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Usage
+const char* Utility::UsageToString(Plugin::AMD::Usage v)
+{
+	switch (v) {
+	case Usage::Transcoding:
+		return "Transcoding";
+	case Usage::UltraLowLatency:
+		return "Ultra Low Latency";
+	case Usage::LowLatency:
+		return "Low Latency";
+	case Usage::Webcam:
+		return "Webcam";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_USAGE_ENUM Utility::UsageToAMFH264(Plugin::AMD::Usage v)
+{
+	switch (v) {
+	case Usage::Transcoding:
+		return AMF_VIDEO_ENCODER_USAGE_TRANSCONDING;
+	case Usage::UltraLowLatency:
+		return AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY;
+	case Usage::LowLatency:
+		return AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY;
+	case Usage::Webcam:
+		return AMF_VIDEO_ENCODER_USAGE_WEBCAM;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::Usage Utility::UsageFromAMFH264(AMF_VIDEO_ENCODER_USAGE_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_USAGE_TRANSCONDING:
+		return Plugin::AMD::Usage::Transcoding;
+	case AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY:
+		return Plugin::AMD::Usage::UltraLowLatency;
+	case AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY:
+		return Plugin::AMD::Usage::LowLatency;
+	case AMF_VIDEO_ENCODER_USAGE_WEBCAM:
+		return Plugin::AMD::Usage::Webcam;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM Utility::UsageToAMFH265(Plugin::AMD::Usage v)
+{
+	switch (v) {
+	case Usage::Transcoding:
+		return AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCONDING;
+	case Usage::UltraLowLatency:
+		return AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY;
+	case Usage::LowLatency:
+		return AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY;
+	case Usage::Webcam:
+		return AMF_VIDEO_ENCODER_HEVC_USAGE_WEBCAM;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::Usage Utility::UsageFromAMFH265(AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCONDING:
+		return Usage::Transcoding;
+	case AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY:
+		return Usage::UltraLowLatency;
+	case AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY:
+		return Usage::LowLatency;
+	case AMF_VIDEO_ENCODER_HEVC_USAGE_WEBCAM:
+		return Usage::Webcam;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Quality Preset
+const char* Utility::QualityPresetToString(Plugin::AMD::QualityPreset v)
+{
+	switch (v) {
+	case QualityPreset::Speed:
+		return "Speed";
+	case QualityPreset::Balanced:
+		return "Balanced";
+	case QualityPreset::Quality:
+		return "Quality";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM
+Utility::QualityPresetToAMFH264(Plugin::AMD::QualityPreset v)
+{
+	switch (v) {
+	case QualityPreset::Speed:
+		return AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED;
+	case QualityPreset::Balanced:
+		return AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED;
+	case QualityPreset::Quality:
+		return AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::QualityPreset Utility::QualityPresetFromAMFH264(AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED:
+		return QualityPreset::Speed;
+	case AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED:
+		return QualityPreset::Balanced;
+	case AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY:
+		return QualityPreset::Quality;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM
+Utility::QualityPresetToAMFH265(Plugin::AMD::QualityPreset v)
+{
+	switch (v) {
+	case QualityPreset::Speed:
+		return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED;
+	case QualityPreset::Balanced:
+		return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_BALANCED;
+	case QualityPreset::Quality:
+		return AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_QUALITY;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::QualityPreset Utility::QualityPresetFromAMFH265(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_SPEED:
+		return QualityPreset::Speed;
+	case AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_BALANCED:
+		return QualityPreset::Balanced;
+	case AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_QUALITY:
+		return QualityPreset::Quality;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Profile
+const char* Utility::ProfileToString(Plugin::AMD::Profile v)
+{
+	switch (v) {
+	case Profile::ConstrainedBaseline:
+		return "Constrained Baseline";
+	case Profile::Baseline:
+		return "Baseline";
+	case Profile::Main:
+		return "Main";
+	case Profile::ConstrainedHigh:
+		return "Constrained High";
+	case Profile::High:
+		return "High";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_PROFILE_ENUM Utility::ProfileToAMFH264(Plugin::AMD::Profile v)
+{
+	switch (v) {
+	case Profile::ConstrainedBaseline:
+		return AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_BASELINE;
+	case Profile::Baseline:
+		return AMF_VIDEO_ENCODER_PROFILE_BASELINE;
+	case Profile::Main:
+		return AMF_VIDEO_ENCODER_PROFILE_MAIN;
+	case Profile::ConstrainedHigh:
+		return AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH;
+	case Profile::High:
+		return AMF_VIDEO_ENCODER_PROFILE_HIGH;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::Profile Utility::ProfileFromAMFH264(AMF_VIDEO_ENCODER_PROFILE_ENUM v)
+{
+#pragma warning(disable : 4063) // Developer Note: I know better, Compiler.
+	switch (v) {
+	case AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_BASELINE:
+		return Profile::ConstrainedBaseline;
+	case AMF_VIDEO_ENCODER_PROFILE_BASELINE:
+		return Profile::Baseline;
+	case AMF_VIDEO_ENCODER_PROFILE_MAIN:
+		return Profile::Main;
+	case AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH:
+		return Profile::ConstrainedHigh;
+	case AMF_VIDEO_ENCODER_PROFILE_HIGH:
+		return Profile::High;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM
+Utility::ProfileToAMFH265(Plugin::AMD::Profile v)
+{
+	switch (v) {
+	case Profile::Main:
+		return AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::Profile Utility::ProfileFromAMFH265(AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN:
+		return Profile::Main;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Tier
+const char* Utility::TierToString(Plugin::AMD::H265::Tier v)
+{
+	switch (v) {
+	case H265::Tier::Main:
+		return "Main";
+	case H265::Tier::High:
+		return "High";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_HEVC_TIER_ENUM
+Utility::TierToAMFH265(Plugin::AMD::H265::Tier v)
+{
+	switch (v) {
+	case H265::Tier::Main:
+		return AMF_VIDEO_ENCODER_HEVC_TIER_MAIN;
+	case H265::Tier::High:
+		return AMF_VIDEO_ENCODER_HEVC_TIER_HIGH;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::H265::Tier Utility::TierFromAMFH265(AMF_VIDEO_ENCODER_HEVC_TIER_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_HEVC_TIER_MAIN:
+		return H265::Tier::Main;
+	case AMF_VIDEO_ENCODER_HEVC_TIER_HIGH:
+		return H265::Tier::High;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Coding Type
+const char* Utility::CodingTypeToString(Plugin::AMD::CodingType v)
+{
+	switch (v) {
+	case CodingType::Automatic:
+		return "Automatic";
+	case CodingType::CALVC:
+		return "CALVC";
+	case CodingType::CABAC:
+		return "CABAC";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_CODING_ENUM
+Utility::CodingTypeToAMFH264(Plugin::AMD::CodingType v)
+{
+	switch (v) {
+	case CodingType::Automatic:
+		return AMF_VIDEO_ENCODER_UNDEFINED;
+	case CodingType::CALVC:
+		return AMF_VIDEO_ENCODER_CALV;
+	case CodingType::CABAC:
+		return AMF_VIDEO_ENCODER_CABAC;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::CodingType Utility::CodingTypeFromAMFH264(AMF_VIDEO_ENCODER_CODING_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_UNDEFINED:
+		return CodingType::Automatic;
+	case AMF_VIDEO_ENCODER_CALV:
+		return CodingType::CALVC;
+	case AMF_VIDEO_ENCODER_CABAC:
+		return CodingType::CABAC;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+int64_t Utility::CodingTypeToAMFH265(Plugin::AMD::CodingType v)
+{
+	switch (v) {
+	case CodingType::Automatic:
+		return 0;
+	case CodingType::CABAC:
+		return 1;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::CodingType Utility::CodingTypeFromAMFH265(int64_t v)
+{
+	switch (v) {
+	case 0:
+		return CodingType::Automatic;
+	case 1:
+		return CodingType::CABAC;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Rate Control Method
+const char* Utility::RateControlMethodToString(Plugin::AMD::RateControlMethod v)
+{
+	switch (v) {
+	case RateControlMethod::ConstantQP:
+		return "Constant Quantization Parameter";
+	case RateControlMethod::ConstantBitrate:
+		return "Constant Bitrate";
+	case RateControlMethod::PeakConstrainedVariableBitrate:
+		return "Peak Constrained Variable Bitrate";
+	case RateControlMethod::LatencyConstrainedVariableBitrate:
+		return "Latency Constrained Variable Bitrate";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM
+Utility::RateControlMethodToAMFH264(Plugin::AMD::RateControlMethod v)
+{
+	switch (v) {
+	case RateControlMethod::ConstantQP:
+		return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP;
+	case RateControlMethod::ConstantBitrate:
+		return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR;
+	case RateControlMethod::PeakConstrainedVariableBitrate:
+		return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR;
+	case RateControlMethod::LatencyConstrainedVariableBitrate:
+		return AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::RateControlMethod Utility::RateControlMethodFromAMFH264(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP:
+		return RateControlMethod::ConstantQP;
+	case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR:
+		return RateControlMethod::ConstantBitrate;
+	case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR:
+		return RateControlMethod::PeakConstrainedVariableBitrate;
+	case AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR:
+		return RateControlMethod::LatencyConstrainedVariableBitrate;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM
+Utility::RateControlMethodToAMFH265(Plugin::AMD::RateControlMethod v)
+{
+	switch (v) {
+	case RateControlMethod::ConstantQP:
+		return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP;
+	case RateControlMethod::ConstantBitrate:
+		return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR;
+	case RateControlMethod::PeakConstrainedVariableBitrate:
+		return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR;
+	case RateControlMethod::LatencyConstrainedVariableBitrate:
+		return AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::RateControlMethod Utility::RateControlMethodFromAMFH265(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP:
+		return RateControlMethod::ConstantQP;
+	case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR:
+		return RateControlMethod::ConstantBitrate;
+	case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR:
+		return RateControlMethod::PeakConstrainedVariableBitrate;
+	case AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR:
+		return RateControlMethod::LatencyConstrainedVariableBitrate;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Pre-Pass Method
+const char* Utility::PrePassModeToString(Plugin::AMD::PrePassMode v)
+{
+	switch (v) {
+	case PrePassMode::Disabled:
+		return "Disabled";
+	case PrePassMode::Enabled:
+		return "Enabled";
+	case PrePassMode::EnabledAtHalfScale:
+		return "Enabled (Half Scale)";
+	case PrePassMode::EnabledAtQuarterScale:
+		return "Enabled (Quarter Scale)";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM
+Utility::PrePassModeToAMFH264(Plugin::AMD::PrePassMode v)
+{
+	switch (v) {
+	case PrePassMode::Disabled:
+		return AMF_VIDEO_ENCODER_PREENCODE_DISABLED;
+	case PrePassMode::Enabled:
+		return AMF_VIDEO_ENCODER_PREENCODE_ENABLED;
+	case PrePassMode::EnabledAtHalfScale:
+		return (AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)2;
+	case PrePassMode::EnabledAtQuarterScale:
+		return (AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM)3;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+Plugin::AMD::PrePassMode Utility::PrePassModeFromAMFH264(AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM v)
+{
+	switch (v) {
+	case AMF_VIDEO_ENCODER_PREENCODE_DISABLED:
+		return PrePassMode::Disabled;
+	case AMF_VIDEO_ENCODER_PREENCODE_ENABLED:
+		return PrePassMode::Enabled;
+	case 2:
+		return PrePassMode::EnabledAtHalfScale;
+	case 3:
+		return PrePassMode::EnabledAtQuarterScale;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// GOP Type
+const char* Utility::GOPTypeToString(Plugin::AMD::H265::GOPType v)
+{
+	switch (v) {
+	case H265::GOPType::Fixed:
+		return "Fixed";
+	case H265::GOPType::Variable:
+		return "Variable";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+Plugin::AMD::H265::GOPType Utility::GOPTypeFromAMFH265(int64_t v)
+{
+	switch (v) {
+	case 0:
+		return H265::GOPType::Fixed;
+	case 1:
+		return H265::GOPType::Variable;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+int64_t Utility::GOPTypeToAMFH265(Plugin::AMD::H265::GOPType v)
+{
+	switch (v) {
+	case H265::GOPType::Fixed:
+		return 0;
+	case H265::GOPType::Variable:
+		return 1;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Slicing
+const char* Utility::SliceModeToString(Plugin::AMD::H264::SliceMode v)
+{
+	switch (v) {
+	case H264::SliceMode::Row:
+		return "Row";
+	case H264::SliceMode::Column:
+		return "Column";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+const char* Utility::SliceControlModeToString(Plugin::AMD::SliceControlMode v)
+{
+	switch (v) {
+	case SliceControlMode::Unknown0:
+		return "Unknown 0";
+	case SliceControlMode::Unknown1:
+		return "Unknown 1";
+	case SliceControlMode::Unknown2:
+		return "Unknown 2";
+	case SliceControlMode::Unknown3:
+		return "Unknown 3";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+Plugin::AMD::ProfileLevel Utility::H264ProfileLevel(std::pair<uint32_t, uint32_t> resolution,
+													std::pair<uint32_t, uint32_t> frameRate)
+{
+	typedef std::pair<uint32_t, uint32_t>             levelRestriction;
+	typedef std::pair<ProfileLevel, levelRestriction> level;
+
+	static const level profileLevelLimit[] = {
+		// [Level, [Samples, Samples_Per_Sec]]
+		level(ProfileLevel::L10, levelRestriction(25344, 380160)),
+		level(ProfileLevel::L11, levelRestriction(101376, 768000)),
+		level(ProfileLevel::L12, levelRestriction(101376, 1536000)),
+		level(ProfileLevel::L13, levelRestriction(101376, 3041280)),
+		level(ProfileLevel::L20, levelRestriction(101376, 3041280)),
+		level(ProfileLevel::L21, levelRestriction(202752, 5068800)),
+		level(ProfileLevel::L22, levelRestriction(414720, 5184000)),
+		level(ProfileLevel::L30, levelRestriction(414720, 10368000)),
+		level(ProfileLevel::L31, levelRestriction(921600, 27648000)),
+		level(ProfileLevel::L32, levelRestriction(1310720, 55296000)),
+		//level(H264ProfileLevel::40, levelRestriction(2097152, 62914560)), // Technically identical to 4.1, but backwards compatible.
+		level(ProfileLevel::L41, levelRestriction(2097152, 62914560)),
+		level(ProfileLevel::L42, levelRestriction(2228224, 133693440)),
+		level(ProfileLevel::L50, levelRestriction(5652480, 150994944)),
+		level(ProfileLevel::L51, levelRestriction(9437184, 251658240)),
+		level(ProfileLevel::L52, levelRestriction(9437184, 530841600)),
+		level((ProfileLevel)-1, levelRestriction(0, 0))};
+
+	uint32_t samples     = resolution.first * resolution.second;
+	uint32_t samples_sec = (uint32_t)ceil((double_t)samples * ((double_t)frameRate.first / (double_t)frameRate.second));
+
+	level curLevel = profileLevelLimit[0];
+	for (uint32_t index = 0; (int32_t)curLevel.first != -1; index++) {
+		curLevel = profileLevelLimit[index];
+
+		if (samples > curLevel.second.first)
+			continue;
+
+		if (samples_sec > curLevel.second.second)
+			continue;
+
+		return curLevel.first;
+	}
+	return ProfileLevel::L52;
+}
+Plugin::AMD::ProfileLevel Utility::H265ProfileLevel(std::pair<uint32_t, uint32_t> resolution,
+													std::pair<uint32_t, uint32_t> frameRate)
+{
+	typedef std::pair<uint32_t, uint32_t>             levelRestriction; // Total, Main/Sec, High/Sec
+	typedef std::pair<ProfileLevel, levelRestriction> level;
+
+	static const level profileLevelLimit[] = {// [Level, [Samples, Samples_Per_Sec]]
+											  level(ProfileLevel::L10, levelRestriction(36864, 552960)),
+											  level(ProfileLevel::L20, levelRestriction(122880, 3686400)),
+											  level(ProfileLevel::L21, levelRestriction(245760, 7372800)),
+											  level(ProfileLevel::L30, levelRestriction(552960, 16588800)),
+											  level(ProfileLevel::L31, levelRestriction(983040, 33177600)),
+											  level(ProfileLevel::L40, levelRestriction(2228224, 66846720)),
+											  level(ProfileLevel::L41, levelRestriction(2228224, 133693440)),
+											  level(ProfileLevel::L50, levelRestriction(8912896, 267386880)),
+											  level(ProfileLevel::L51, levelRestriction(8912896, 534773760)),
+											  level(ProfileLevel::L52, levelRestriction(8912896, 1069547520)),
+											  level(ProfileLevel::L60, levelRestriction(35651584, 1069547520)),
+											  level(ProfileLevel::L61, levelRestriction(35651584, 2139095040)),
+											  level(ProfileLevel::L62, levelRestriction(35651584, 4278190080)),
+											  level((ProfileLevel)-1, levelRestriction(0, 0))};
+
+	uint32_t samples     = resolution.first * resolution.second;
+	uint32_t samples_sec = (uint32_t)ceil((double_t)samples * ((double_t)frameRate.first / (double_t)frameRate.second));
+
+	level curLevel = profileLevelLimit[0];
+	for (uint32_t index = 0; (int32_t)curLevel.first != -1; index++) {
+		curLevel = profileLevelLimit[index];
+
+		if (samples > curLevel.second.first)
+			continue;
+
+		if (samples_sec > curLevel.second.second)
+			continue;
+
+		return curLevel.first;
+	}
+	return ProfileLevel::L62;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Threading Specific
+//////////////////////////////////////////////////////////////////////////
+
+#if (defined _WIN32) || (defined _WIN64) // Windows
+#include <windows.h>
+
+const DWORD MS_VC_EXCEPTION = 0x406D1388;
+
+#pragma pack(push, 8)
+typedef struct tagTHREADNAME_INFO {
+	DWORD  dwType;     // Must be 0x1000.
+	LPCSTR szName;     // Pointer to name (in user addr space).
+	DWORD  dwThreadID; // Thread ID (-1=caller thread).
+	DWORD  dwFlags;    // Reserved for future use, must be zero.
+} THREADNAME_INFO;
+#pragma pack(pop)
+
+void Utility::SetThreadName(uint32_t dwThreadID, const char* threadName)
+{
+	// DWORD dwThreadID = ::GetThreadId( static_cast<HANDLE>( t.native_handle() ) );
+
+	THREADNAME_INFO info;
+	info.dwType     = 0x1000;
+	info.szName     = threadName;
+	info.dwThreadID = dwThreadID;
+	info.dwFlags    = 0;
+
+	__try {
+		RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+	} __except (EXCEPTION_EXECUTE_HANDLER) {
+	}
+}
+void Utility::SetThreadName(const char* threadName)
+{
+	Utility::SetThreadName(GetCurrentThreadId(), threadName);
+}
+void Utility::SetThreadName(std::thread* pthread, const char* threadName)
+{
+	DWORD threadId = ::GetThreadId(static_cast<HANDLE>(pthread->native_handle()));
+	Utility::SetThreadName(threadId, threadName);
+}
+
+#else // Linux, Mac
+#include <sys/prctl.h>
+
+void Utility::SetThreadName(std::thread* pthread, const char* threadName)
+{
+	auto handle = pthread->native_handle();
+	pthread_setname_np(handle, threadName);
+}
+void Utility::SetThreadName(const char* threadName)
+{
+	prctl(PR_SET_NAME, threadName, 0, 0, 0);
+}
+
+#endif

obs-studio-21.1.2.tar.xz/plugins/image-source/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/image-source/data/locale/el-GR.ini Changed

@@ -9,11 +9,25 @@
 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)"
+SlideShow.PlayPause="Αναπαραγωγή/Παύση"
+SlideShow.Restart="Επανεκκίνηση"
+SlideShow.Stop="Διακοπή"
+SlideShow.NextSlide="Επόμενη διαφάνεια"
+SlideShow.PreviousSlide="Προηγούμενη διαφάνεια"
+SlideShow.HideWhenDone="Απόκρυψη όταν η παρουσίαση τελειώσει"
 
 ColorSource="Πηγή χρώματος"
 ColorSource.Color="Χρώμα"

obs-studio-21.1.2.tar.xz/plugins/image-source/data/locale/et-EE.ini -> obs-studio-22.0.1.tar.xz/plugins/image-source/data/locale/et-EE.ini Changed

obs-studio-22.0.1.tar.xz/plugins/image-source/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/linux-alsa/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/linux-capture/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/linux-pulseaudio/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/linux-pulseaudio/data/locale/pt-BR.ini -> obs-studio-22.0.1.tar.xz/plugins/linux-pulseaudio/data/locale/pt-BR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/linux-v4l2/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-avcapture/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-avcapture/data/locale/ka-GE.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-capture/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-capture/data/locale/ka-GE.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-syphon/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-syphon/data/locale/ka-GE.ini Added

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

obs-studio-22.0.1.tar.xz/plugins/mac-vth264/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/mac-vth264/data/locale/ka-GE.ini Added

obs-studio-21.1.2.tar.xz/plugins/mac-vth264/encoder.c -> obs-studio-22.0.1.tar.xz/plugins/mac-vth264/encoder.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-browser/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/plugins/obs-browser/CMakeLists.txt Changed

@@ -1,263 +1,151 @@
-#cmake_minimum_required(VERSION 3.0)
 cmake_minimum_required(VERSION 2.8.12)
-project(cef-isolation)
+project(obs-browser)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/UI/obs-frontend-api")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps")
 
-include(BSUtils)
+find_package(CEF QUIET)
 
-find_package(LibObs REQUIRED)
-find_package(CEF REQUIRED)
+if(NOT CEF_FOUND)
+	message(STATUS "CEF Not found -- obs-browser plugin disabled.")
+	return()
+endif()
 
-if(MSVC)
-	option(USE_STATIC_CRT "Use static CRT" ON)
+option(EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED "Enable shared texture support for the browser plugin (Win32)" ON)
+option(BROWSER_PANEL_SUPPORT_ENABLED "Enables Qt web browser panel support" ON)
 
-	if(USE_STATIC_CRT)
-		string(REPLACE "/MD" "/MT" 
-			"CMAKE_C_FLAGS" 
-			"${CMAKE_C_FLAGS}")
+configure_file(
+	"${CMAKE_CURRENT_SOURCE_DIR}/browser-config.h.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/browser-config.h")
 
-		string(REPLACE "/MD" "/MT" 
-			"CMAKE_CXX_FLAGS" 
-			"${CMAKE_CXX_FLAGS}")
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+include_directories("${CEF_ROOT_DIR}")
 
-		string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" UPPER_CONFIG_TYPES)
-		foreach(CONFIG_TYPE ${UPPER_CONFIG_TYPES})
-			string(REPLACE "/MD" "/MT" 
-				"CMAKE_C_FLAGS_${CONFIG_TYPE}" 
-				"${CMAKE_C_FLAGS_${CONFIG_TYPE}}")
+# ----------------------------------------------------------------------------
 
-			string(REPLACE "/MD" "/MT" 
-				"CMAKE_CXX_FLAGS_${CONFIG_TYPE}" 
-				"${CMAKE_CXX_FLAGS_${CONFIG_TYPE}}")
-		endforeach()
-	endif()
-endif()
+set(obs-browser_LIBRARIES
+	libobs
+	obs-frontend-api
+	)
 
-if(APPLE)
-	find_library(COCOA_FRAMEWORK Cocoa)
-	find_library(APPKIT_FRAMEWORK AppKit)
-	find_library(IOSURFACE_FRAMEWORK IOSurface)
-endif(APPLE)
+list(APPEND obs-browser_LIBRARIES
+	${CEF_LIBRARIES})
 
-if (NOT APPLE)
-	# This is needed to load the libraries from a 
-	# separate directory
-	add_library(obs-browser-facade MODULE
-		obs-browser-facade/main.c)
-	target_link_libraries(obs-browser-facade
-		libobs)
+if(MSVC)
+	string(REPLACE "/MD" "/MT"
+		"CMAKE_C_FLAGS"
+		"${CMAKE_C_FLAGS}")
+
+	string(REPLACE "/MD" "/MT"
+		"CMAKE_CXX_FLAGS"
+		"${CMAKE_CXX_FLAGS}")
+
+	string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" UPPER_CONFIG_TYPES)
+	foreach(CONFIG_TYPE ${UPPER_CONFIG_TYPES})
+		string(REPLACE "/MD" "/MT"
+			"CMAKE_C_FLAGS_${CONFIG_TYPE}"
+			"${CMAKE_C_FLAGS_${CONFIG_TYPE}}")
+
+		string(REPLACE "/MD" "/MT"
+			"CMAKE_CXX_FLAGS_${CONFIG_TYPE}"
+			"${CMAKE_CXX_FLAGS_${CONFIG_TYPE}}")
+	endforeach()
+	list(APPEND obs-browser_LIBRARIES
+		d3d11
+		dxgi
+		)
 endif()
 
 set(obs-browser_SOURCES
-	obs-browser/main.cpp
-	obs-browser/main-source.cpp
-	shared/browser-source.cpp
-	shared/base64.cpp
-	shared/util.cpp)
-
+	obs-browser-source.cpp
+	obs-browser-plugin.cpp
+	browser-scheme.cpp
+	browser-client.cpp
+	browser-app.cpp
+	deps/json11/json11.cpp
+	deps/base64/base64.cpp
+	deps/wide-string.cpp
+	)
 set(obs-browser_HEADERS
-	shared/browser-manager.hpp
-	shared/browser-source.hpp
-	shared/browser-listener.hpp
-	shared/browser-settings.hpp
-	shared/browser-types.h
-	shared/base64.hpp
-	shared/browser-types.h
-	shared/browser-version.h
-	shared/util.hpp)
+	obs-browser-source.hpp
+	browser-scheme.hpp
+	browser-client.hpp
+	browser-app.hpp
+	browser-version.h
+	deps/json11/json11.hpp
+	deps/base64/base64.hpp
+	deps/wide-string.hpp
+	cef-headers.hpp
+	)
 
-if (APPLE)
-	list(APPEND obs-browser_SOURCES
-		shared-apple/browser-bridges.mm
-		obs-browser/apple/browser-source-mac.mm
-		obs-browser/apple/browser-manager-mac.mm
-		obs-browser/apple/browser-source-listener-mac.mm
-		obs-browser/apple/cef-isolation-service-manager.mm
-		obs-browser/apple/cef-isolation-service.mm
-		obs-browser/apple/client-connection-delegate.mm
-		obs-browser/apple/graphics-helpers.c)
+# only allow browser panels on win32 for now -- other operating systems
+# need more testing
+if(WIN32 AND BROWSER_PANEL_SUPPORT_ENABLED)
+	if(DEFINED QTDIR${_lib_suffix})
+		list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
+	elseif(DEFINED QTDIR)
+		list(APPEND CMAKE_PREFIX_PATH "${QTDIR}")
+	elseif(DEFINED ENV{QTDIR${_lib_suffix}})
+		list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR${_lib_suffix}}")
+	elseif(DEFINED ENV{QTDIR})
+		list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
+	endif()
 
+	set(CMAKE_AUTOMOC TRUE)
+	find_package(Qt5Widgets REQUIRED)
 
-	list(APPEND obs-browser_HEADERS
-		shared-apple/cef-logging.h
-		shared-apple/cef-isolation.h
-		shared-apple/browser-bridges.h
-		obs-browser/apple/browser-source-mac.h
-		obs-browser/apple/browser-manager-mac.h
-		obs-browser/apple/browser-source-listener-mac.h
-		obs-browser/apple/cef-isolation-service.h
-		obs-browser/apple/cef-isolation-service-manager.h
-		obs-browser/apple/client-connection-delegate.h
-		obs-browser/apple/graphics-helpers.h
-		obs-browser/apple/texture-ref.hpp)
-
-else (APPLE)
-	
 	list(APPEND obs-browser_SOURCES
-		shared/browser-client.cpp
-		shared/browser-task.cpp
-		shared/browser-app.cpp
-		obs-browser/browser-source-listener-base.cpp
-		obs-browser/browser-manager-base.cpp
-		obs-browser/browser-render-handler.cpp
-		obs-browser/browser-source-base.cpp
-		obs-browser/browser-load-handler.cpp
-		obs-browser/browser-obs-bridge-base.cpp
-		shared/browser-scheme.cpp
-		fmt/format.cc)
-
+		panel/browser-panel.cpp
+		panel/browser-panel-client.cpp
+		)
 	list(APPEND obs-browser_HEADERS
-		shared/browser-client.hpp
-		shared/browser-task.hpp
-		shared/browser-app.hpp
-		obs-browser/browser-source-listener-base.hpp
-		obs-browser/browser-manager-base.hpp
-		obs-browser/browser-render-handler.hpp
-		obs-browser/browser-source-base.hpp
-		obs-browser/browser-load-handler.hpp
-		obs-browser/browser-obs-bridge-base.hpp
-		shared/browser-scheme.hpp
-		fmt/format.h)
-
-endif(APPLE)
-
-set(obs-browser_LIBRARIES
-	obs-frontend-api
-	${OBS_JANSSON_IMPORT})
-
-if (APPLE)
-	list(APPEND obs-browser_LIBRARIES
-		${IOSURFACE_FRAMEWORK})
-endif(APPLE)
-
-
-add_library(obs-browser MODULE 
-	${obs-browser_SOURCES} 
-	${obs-browser_HEADERS})
-
-
-target_include_directories(obs-browser PRIVATE 
-	"obs-browser" 
-	"shared")
-
-target_include_directories(obs-browser PUBLIC
-	${OBS_JANSSON_INCLUDE_DIRS})
-
-if (APPLE)
-	target_include_directories(obs-browser PUBLIC 
-		"shared-apple")
-else (APPLE)
-	target_include_directories_system(obs-browser PUBLIC ${CEF_ROOT_DIR})
-endif(APPLE)
-
-
-if (APPLE)
-	set_xcode_property(obs-browser CLANG_CXX_LIBRARY "libc++")
-endif(APPLE)
-
-if (NOT APPLE)
+		panel/browser-panel.hpp
+		panel/browser-panel-client.hpp
+		panel/browser-panel-internal.hpp
+		)
 	list(APPEND obs-browser_LIBRARIES
-		${CEF_LIBRARIES})
-	if (WIN32)
-		list(APPEND obs-browser_LIBRARIES
-			w32-pthreads)
-	endif(WIN32)
-else(NOT APPLE)
-	list(APPEND obs-browser_LIBRARIES 
-		${COCOA_FRAMEWORK} 
-		${APPKIT_FRAMEWORK}
-		${IOSURFACE_FRAMEWORK})
-endif(NOT APPLE)
-
-target_link_libraries(obs-browser 
-        ${obs-browser_LIBRARIES})
-
-if(APPLE)
-	set(cef-isolation_SOURCES
-		cef-isolation/main.mm
-		cef-isolation/cef-isolated-client.mm
-		cef-isolation/browser-obs-bridge-mac.mm
-		cef-isolation/browser-handle.mm
-		cef-isolation/browser-render-handler.mm
-		cef-isolation/browser-texture-mac.mm
-		cef-isolation/service-connection-delegate.mm
-		shared/browser-client.cpp
-		shared/browser-task.cpp
-		shared/browser-app.cpp
-		shared/browser-scheme.cpp
-		shared/base64.cpp
-		obs-browser/browser-load-handler.cpp
-		fmt/format.cc)
-
-	set(cef-isolation_HEADERS
-		shared-apple/cef-logging.h
-		shared-apple/cef-isolation.h
-		cef-isolation/cef-isolated-client.h
-		cef-isolation/browser-handle.h
-		cef-isolation/browser-render-handler.hpp
-		cef-isolation/browser-texture-mac.h
-		cef-isolation/service-connection-delegate.h
-		cef-isolation/browser-obs-bridge-mac.hpp
-		shared/browser-texture.hpp
-		shared/browser-client.hpp
-		shared/browser-task.hpp
-		shared/browser-app.hpp
-		shared/base64.hpp
-		obs-browser/browser-load-handler.hpp
-		shared/browser-scheme.hpp
-		shared/browser-types.h
-		shared/browser-obs-bridge.hpp
-		shared-apple/browser-bridges.h)
-
-	add_executable(cef-isolation
-		${cef-isolation_SOURCES}
-		${cef-isolation_HEADERS})
-
-	set(MACOSX_DEPLOYMENT_TARGET "10.8")
+		Qt5::Widgets
+		)
+endif()
 
-	if (XCODE)
-		set_xcode_property(cef-isolation
-			CLANG_CXX_LIBRARY "libc++")
-	endif(XCODE)
+add_library(obs-browser MODULE
+	${obs-browser_SOURCES}
+	${obs-browser_HEADERS}
+	)
 
-	target_include_directories(cef-isolation PRIVATE 
-		"cef-isolation" 
-		"shared"
-		"shared-apple")
-	
-	target_include_directories_system(cef-isolation
-		PUBLIC
-			${CEF_INCLUDE_DIR}
-			${OBS_JANSSON_INCLUDE_DIRS})
-	
-	target_link_libraries(cef-isolation
-		${CEF_LIBRARIES}
-		${OBS_JANSSON_IMPORT}
-		${APPKIT_FRAMEWORK}
-		${IOSURFACE_FRAMEWORK})
+target_link_libraries(obs-browser
+	${obs-browser_LIBRARIES}
+	)
 
-endif(APPLE)
+# ----------------------------------------------------------------------------
 
 set(cef-bootstrap_SOURCES
-	cef-bootstrap/main.cpp
-	shared/browser-app.cpp
-	fmt/format.cc)
-
+	cef-bootstrap/cef-bootstrap-main.cpp
+	browser-app.cpp
+	deps/json11/json11.cpp
+	)
 set(cef-bootstrap_HEADERS
-	shared/browser-app.hpp
-	fmt/format.h)
+	cef-bootstrap/cef-bootstrap-main.cpp
+	browser-app.hpp
+	deps/json11/json11.hpp
+	cef-headers.hpp
+	)
 
-add_executable(cef-bootstrap 
-	${cef-bootstrap_SOURCES} 
-	${cef-bootstrap_HEADERS})
+add_executable(cef-bootstrap
+	${cef-bootstrap_SOURCES}
+	${cef-bootstrap_HEADERS}
+	)
+target_link_libraries(cef-bootstrap
+	${CEF_LIBRARIES}
+	)
 
 if (APPLE)
-	set_target_properties(cef-bootstrap PROPERTIES 
-		COMPILE_FLAGS "-mmacosx-version-min=10.8")		
+	set_target_properties(cef-bootstrap PROPERTIES
+		COMPILE_FLAGS "-mmacosx-version-min=10.8")
 endif(APPLE)
 
 if (WIN32)
@@ -268,68 +156,9 @@
 	set_xcode_property(cef-bootstrap CLANG_CXX_LIBRARY "libc++")
 endif(APPLE AND XCODE)
 
-target_include_directories(cef-bootstrap PRIVATE "shared")
-target_include_directories_system(cef-bootstrap
-	PUBLIC
-		${CEF_ROOT_DIR}
-		${OBS_JANSSON_INCLUDE_DIRS})
-
-target_link_libraries(cef-bootstrap
-	${CEF_LIBRARIES}
-	${OBS_JANSSON_IMPORT})
-
-if (APPLE)
-
-	set_target_properties(cef-isolation PROPERTIES
-		OUTPUT_NAME "CEF"
-		MACOSX_BUNDLE TRUE
-		BUILD_WITH_INSTALL_RPATH TRUE
-		INSTALL_RPATH "@executable_path/.."
-		MACOSX_BUNDLE_BUNDLE_NAME "CEF Helper"
-		MACOSX_BUNDLE_GUI_IDENTIFIER "org.catchexception.cef.cef-isolation")
-
-	set_target_properties(cef-bootstrap PROPERTIES
-		OUTPUT_NAME "CEF Helper"
-		MACOSX_BUNDLE TRUE
-		BUILD_WITH_INSTALL_RPATH TRUE
-		INSTALL_RPATH "@executable_path/../../../.."
-		MACOSX_BUNDLE_BUNDLE_NAME "CEF Helper"
-		MACOSX_BUNDLE_GUI_IDENTIFIER "org.catchexception.cef.cef-bootstrap")
-
-
-	add_custom_command(TARGET obs-browser POST_BUILD
-		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/CEF.app/Contents/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:obs-browser>"
-		)
-
-	add_custom_command(TARGET cef-isolation
-		# Disable taskbar visibility
-		COMMAND defaults write "$<TARGET_FILE_DIR:cef-isolation>/../Info.plist" "LSUIElement" 1
-		)
-
-	add_custom_command(TARGET cef-bootstrap POST_BUILD
-		# Remember if you change this but don't cause a recompile it will not rename it successfully
-		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:cef-bootstrap>"
-		
-		# Disable taskbar visibility
-		COMMAND defaults write "$<TARGET_FILE_DIR:cef-bootstrap>/../Info.plist" "LSUIElement" 1
-		)
-
-	add_custom_command(TARGET cef-isolation POST_BUILD
-		# Remember if you change this but don't cause a recompile in the shared object it will not rename it successfully
-		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:cef-isolation>"		
-
-		# Make a Frameworks directory
-		COMMAND mkdir -p "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks"
-
-		# Copy the CEF and support frameworks
-		COMMAND cp -Rf "${CEF_ROOT_DIR}/Release/Chromium Embedded Framework.framework" "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks/"
+# ----------------------------------------------------------------------------
 
-		# Setup the helper apps
-		COMMAND rm -rf "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks/CEF Helper.app"
-		COMMAND cp -Rf "$<TARGET_FILE_DIR:cef-bootstrap>/../../../CEF Helper.app" "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks"
-		)
-
-else(APPLE)
+if (WIN32)
 	math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
 	add_custom_command(TARGET obs-browser POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
@@ -356,13 +185,11 @@
 		COMMAND ${CMAKE_COMMAND} -E copy
 		"${CEF_ROOT_DIR}/Release/snapshot_blob.bin"
 		"${CMAKE_BINARY_DIR}/rundir/$<CONFIGURATION>/obs-plugins/${BITS}bit/"
+		COMMAND ${CMAKE_COMMAND} -E copy
+		"${CEF_ROOT_DIR}/Release/v8_context_snapshot.bin"
+		"${CMAKE_BINARY_DIR}/rundir/$<CONFIGURATION>/obs-plugins/${BITS}bit/"
 	)
-endif(APPLE)
+endif()
 
-if(APPLE)
-	install_obs_plugin_with_data(obs-browser data)
-	install_obs_plugin_bundle(cef-isolation "CEF.app")
-else(APPLE)
-	install_obs_plugin_with_data(obs-browser data)
-	install_obs_plugin(cef-bootstrap)
-endif(APPLE)
+install_obs_plugin_with_data(obs-browser data)
+install_obs_plugin(cef-bootstrap)

obs-studio-21.1.2.tar.xz/plugins/obs-browser/FindCEF.cmake -> obs-studio-22.0.1.tar.xz/plugins/obs-browser/FindCEF.cmake Changed

@@ -2,7 +2,7 @@
 
 SET(CEF_ROOT_DIR "" CACHE PATH "Path to a CEF distributed build")
 
-message("Looking for Chromium Embedded Framework in ${CEF_ROOT_DIR}")
+message(STATUS "Looking for Chromium Embedded Framework in ${CEF_ROOT_DIR}")
 
 find_path(CEF_INCLUDE_DIR "include/cef_version.h"
 	HINTS ${CEF_ROOT_DIR})
@@ -24,13 +24,17 @@
 	NAMES cef_dll_wrapper libcef_dll_wrapper
 	PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Debug ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Debug)
 
-if (NOT CEF_LIBRARY)
-	message(FATAL_ERROR "Could not find the CEF shared library" )
-endif (NOT CEF_LIBRARY)
+if(NOT CEF_LIBRARY)
+	message(WARNING "Could not find the CEF shared library" )
+	set(CEF_FOUND FALSE)
+	return()
+endif()
 
-if (NOT CEFWRAPPER_LIBRARY)
-	message(FATAL_ERROR "Could not find the CEF wrapper library" )
-endif (NOT CEFWRAPPER_LIBRARY)
+if(NOT CEFWRAPPER_LIBRARY)
+	message(WARNING "Could not find the CEF wrapper library" )
+	set(CEF_FOUND FALSE)
+	return()
+endif()
 
 set(CEF_LIBRARIES
 		optimized ${CEFWRAPPER_LIBRARY}
@@ -42,8 +46,7 @@
 			debug ${CEF_LIBRARY_DEBUG})
 endif()
 
-find_package_handle_standard_args(CEF DEFAULT_MSG CEF_LIBRARY 
+find_package_handle_standard_args(CEF DEFAULT_MSG CEF_LIBRARY
 	CEFWRAPPER_LIBRARY CEF_INCLUDE_DIR)
-
-mark_as_advanced(CEF_LIBRARY CEF_WRAPPER_LIBRARY CEF_LIBRARIES 
+mark_as_advanced(CEF_LIBRARY CEF_WRAPPER_LIBRARY CEF_LIBRARIES
 	CEF_INCLUDE_DIR)

obs-studio-21.1.2.tar.xz/plugins/obs-browser/README.md -> obs-studio-22.0.1.tar.xz/plugins/obs-browser/README.md Changed

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-app.cpp Added

@@ -0,0 +1,244 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include "browser-app.hpp"
+#include "browser-version.h"
+#include <json11/json11.hpp>
+
+using namespace json11;
+
+CefRefPtr<CefRenderProcessHandler> BrowserApp::GetRenderProcessHandler()
+{
+	return this;
+}
+
+void BrowserApp::OnRegisterCustomSchemes(
+		CefRawPtr<CefSchemeRegistrar> registrar)
+{
+#if CHROME_VERSION_BUILD >= 3029
+	registrar->AddCustomScheme("http", true, false, false, false, true,
+			false);
+#else
+	registrar->AddCustomScheme("http", true, false, false, false, true);
+#endif
+}
+
+void BrowserApp::OnBeforeCommandLineProcessing(
+		const CefString &,
+		CefRefPtr<CefCommandLine> command_line)
+{
+	if (!shared_texture_available) {
+		bool enableGPU = command_line->HasSwitch("enable-gpu");
+		CefString type = command_line->GetSwitchValue("type");
+
+		if (!enableGPU && type.empty()) {
+			command_line->AppendSwitch("disable-gpu");
+			command_line->AppendSwitch("disable-gpu-compositing");
+		}
+	}
+
+	command_line->AppendSwitch("enable-system-flash");
+
+	command_line->AppendSwitchWithValue("autoplay-policy",
+			"no-user-gesture-required");
+}
+
+void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser>,
+		CefRefPtr<CefFrame>,
+		CefRefPtr<CefV8Context> context)
+{
+	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
+
+	CefRefPtr<CefV8Value> obsStudioObj = CefV8Value::CreateObject(0, 0);
+	globalObj->SetValue("obsstudio",
+			obsStudioObj, V8_PROPERTY_ATTRIBUTE_NONE);
+
+	CefRefPtr<CefV8Value> pluginVersion =
+		CefV8Value::CreateString(OBS_BROWSER_VERSION_STRING);
+	obsStudioObj->SetValue("pluginVersion",
+			pluginVersion, V8_PROPERTY_ATTRIBUTE_NONE);
+
+	CefRefPtr<CefV8Value> func =
+		CefV8Value::CreateFunction("getCurrentScene", this);
+	obsStudioObj->SetValue("getCurrentScene",
+			func, V8_PROPERTY_ATTRIBUTE_NONE);
+
+	CefRefPtr<CefV8Value> getStatus =
+		CefV8Value::CreateFunction("getStatus", this);
+	obsStudioObj->SetValue("getStatus",
+			getStatus, V8_PROPERTY_ATTRIBUTE_NONE);
+}
+
+void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
+		const char *functionName,
+		CefV8ValueList arguments)
+{
+	CefRefPtr<CefV8Context> context =
+		browser->GetMainFrame()->GetV8Context();
+
+	context->Enter();
+
+	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
+	CefRefPtr<CefV8Value> obsStudioObj = globalObj->GetValue("obsstudio");
+	CefRefPtr<CefV8Value> jsFunction = obsStudioObj->GetValue(functionName);
+
+	if (jsFunction && jsFunction->IsFunction())
+		jsFunction->ExecuteFunction(NULL, arguments);
+
+	context->Exit();
+}
+
+bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+		CefProcessId source_process,
+		CefRefPtr<CefProcessMessage> message)
+{
+	DCHECK(source_process == PID_BROWSER);
+
+	CefRefPtr<CefListValue> args = message->GetArgumentList();
+
+	if (message->GetName() == "Visibility") {
+		CefV8ValueList arguments;
+		arguments.push_back(CefV8Value::CreateBool(args->GetBool(0)));
+
+		ExecuteJSFunction(browser, "onVisibilityChange", arguments);
+
+	} else if (message->GetName() == "Active") {
+		CefV8ValueList arguments;
+		arguments.push_back(CefV8Value::CreateBool(args->GetBool(0)));
+
+		ExecuteJSFunction(browser, "onActiveChange", arguments);
+
+	} else if (message->GetName() == "DispatchJSEvent") {
+		CefRefPtr<CefV8Context> context =
+			browser->GetMainFrame()->GetV8Context();
+
+		context->Enter();
+
+		CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
+
+		Json::object json;
+		if (args->GetSize() > 1)
+			json["detail"] = args->GetString(1).ToString();
+		std::string jsonString = Json(json).dump();
+		std::string script;
+
+		script += "new CustomEvent('";
+		script += args->GetString(0).ToString();
+		script += "', ";
+		script += jsonString;
+		script += ");";
+
+		CefRefPtr<CefV8Value> returnValue;
+		CefRefPtr<CefV8Exception> exception;
+
+		/* Create the CustomEvent object
+		 * We have to use eval to invoke the new operator */
+		context->Eval(script, browser->GetMainFrame()->GetURL(),
+				0, returnValue, exception);
+
+		CefV8ValueList arguments;
+		arguments.push_back(returnValue);
+
+		CefRefPtr<CefV8Value> dispatchEvent =
+			globalObj->GetValue("dispatchEvent");
+		dispatchEvent->ExecuteFunction(NULL, arguments);
+
+		context->Exit();
+
+	} else if (message->GetName() == "executeCallback") {
+		CefRefPtr<CefV8Context> context =
+			browser->GetMainFrame()->GetV8Context();
+		CefRefPtr<CefV8Value> retval;
+		CefRefPtr<CefV8Exception> exception;
+
+		context->Enter();
+
+		CefRefPtr<CefListValue> arguments = message->GetArgumentList();
+		int callbackID = arguments->GetInt(0);
+		CefString jsonString = arguments->GetString(1);
+
+		std::string script;
+		script += "JSON.parse('";
+		script += arguments->GetString(1).ToString();
+		script += "');";
+
+		CefRefPtr<CefV8Value> callback = callbackMap[callbackID];
+		CefV8ValueList args;
+
+		context->Eval(script, browser->GetMainFrame()->GetURL(),
+				0, retval, exception);
+
+		args.push_back(retval);
+
+		if(callback)
+			callback->ExecuteFunction(NULL, args);
+
+		context->Exit();
+
+		callbackMap.erase(callbackID);
+
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+bool BrowserApp::Execute(const CefString &name,
+		CefRefPtr<CefV8Value>,
+		const CefV8ValueList &arguments,
+		CefRefPtr<CefV8Value> &,
+		CefString &)
+{
+	if (name == "getCurrentScene") {
+		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
+			callbackId++;
+			callbackMap[callbackId] = arguments[0];
+		}
+
+		CefRefPtr<CefProcessMessage> msg =
+			CefProcessMessage::Create("getCurrentScene");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetInt(0, callbackId);
+
+		CefRefPtr<CefBrowser> browser =
+			CefV8Context::GetCurrentContext()->GetBrowser();
+		browser->SendProcessMessage(PID_BROWSER, msg);
+
+	} else if (name == "getStatus") {
+		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
+			callbackId++;
+			callbackMap[callbackId] = arguments[0];
+		}
+
+		CefRefPtr<CefProcessMessage> msg =
+			CefProcessMessage::Create("getStatus");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetInt(0, callbackId);
+
+		CefRefPtr<CefBrowser> browser =
+			CefV8Context::GetCurrentContext()->GetBrowser();
+		browser->SendProcessMessage(PID_BROWSER, msg);
+
+	} else {
+		/* Function does not exist. */
+		return false;
+	}
+
+	return true;
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-app.hpp Added

@@ -0,0 +1,64 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include <map>
+#include "cef-headers.hpp"
+
+class BrowserApp : public CefApp,
+                   public CefRenderProcessHandler,
+                   public CefV8Handler {
+
+	void ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
+			const char *functionName,
+			CefV8ValueList arguments);
+
+	typedef std::map<int, CefRefPtr<CefV8Value>> CallbackMap;
+
+	bool shared_texture_available;
+	CallbackMap callbackMap;
+	int callbackId;
+
+public:
+	inline BrowserApp(bool shared_texture_available_ = false)
+		: shared_texture_available(shared_texture_available_)
+	{
+	}
+
+	virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
+	virtual void OnRegisterCustomSchemes(
+			CefRawPtr<CefSchemeRegistrar> registrar) override;
+	virtual void OnBeforeCommandLineProcessing(
+			const CefString &process_type,
+			CefRefPtr<CefCommandLine> command_line) override;
+	virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
+			CefRefPtr<CefFrame> frame,
+			CefRefPtr<CefV8Context> context) override;
+	virtual bool OnProcessMessageReceived(
+			CefRefPtr<CefBrowser> browser,
+			CefProcessId source_process,
+			CefRefPtr<CefProcessMessage> message) override;
+	virtual bool Execute(const CefString &name,
+			CefRefPtr<CefV8Value> object,
+			const CefV8ValueList &arguments,
+			CefRefPtr<CefV8Value> &retval,
+			CefString &exception) override;
+
+	IMPLEMENT_REFCOUNTING(BrowserApp);
+};

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-client.cpp Added

@@ -0,0 +1,274 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include "browser-client.hpp"
+#include "obs-browser-source.hpp"
+#include "base64/base64.hpp"
+#include "json11/json11.hpp"
+#include <obs-frontend-api.h>
+
+using namespace json11;
+
+BrowserClient::~BrowserClient()
+{
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	if (sharing_available) {
+		obs_enter_graphics();
+		gs_texture_destroy(texture);
+		obs_leave_graphics();
+	}
+#endif
+}
+
+CefRefPtr<CefLoadHandler> BrowserClient::GetLoadHandler()
+{
+	return this;
+}
+
+CefRefPtr<CefRenderHandler> BrowserClient::GetRenderHandler()
+{
+	return this;
+}
+
+CefRefPtr<CefDisplayHandler> BrowserClient::GetDisplayHandler()
+{
+	return this;
+}
+
+CefRefPtr<CefLifeSpanHandler> BrowserClient::GetLifeSpanHandler()
+{
+	return this;
+}
+
+CefRefPtr<CefContextMenuHandler> BrowserClient::GetContextMenuHandler()
+{
+	return this;
+}
+
+bool BrowserClient::OnBeforePopup(
+		CefRefPtr<CefBrowser>,
+		CefRefPtr<CefFrame>,
+		const CefString &,
+		const CefString &,
+		WindowOpenDisposition,
+		bool,
+		const CefPopupFeatures &,
+		CefWindowInfo &,
+		CefRefPtr<CefClient> &,
+		CefBrowserSettings&,
+		bool *)
+{
+	/* block popups */
+	return true;
+}
+
+void BrowserClient::OnBeforeContextMenu(
+		CefRefPtr<CefBrowser>,
+		CefRefPtr<CefFrame>,
+		CefRefPtr<CefContextMenuParams>,
+		CefRefPtr<CefMenuModel> model)
+{
+	/* remove all context menu contributions */
+	model->Clear();
+}
+
+bool BrowserClient::OnProcessMessageReceived(
+	CefRefPtr<CefBrowser> browser,
+	CefProcessId,
+	CefRefPtr<CefProcessMessage> message)
+{
+	const std::string &name = message->GetName();
+	Json json;
+
+	if (!bs) {
+		return false;
+	}
+
+	if (name == "getCurrentScene") {
+		json = Json::object {
+			{"name", obs_source_get_name(bs->source)},
+			{"width", (int)obs_source_get_width(bs->source)},
+			{"height", (int)obs_source_get_height(bs->source)}
+		};
+
+	} else if (name == "getStatus") {
+		json = Json::object {
+			{"recording", obs_frontend_recording_active()},
+			{"streaming", obs_frontend_streaming_active()},
+			{"replaybuffer", obs_frontend_replay_buffer_active()}
+		};
+
+	} else {
+		return false;
+	}
+
+	CefRefPtr<CefProcessMessage> msg =
+		CefProcessMessage::Create("executeCallback");
+
+	CefRefPtr<CefListValue> args = msg->GetArgumentList();
+	args->SetInt(0, message->GetArgumentList()->GetInt(0));
+	args->SetString(1, json.dump());
+
+	browser->SendProcessMessage(PID_RENDERER, msg);
+
+	return true;
+}
+
+bool BrowserClient::GetViewRect(
+		CefRefPtr<CefBrowser>,
+		CefRect &rect)
+{
+	if (!bs) {
+		return false;
+	}
+
+	rect.Set(0, 0, bs->width, bs->height);
+	return true;
+}
+
+void BrowserClient::OnPaint(
+		CefRefPtr<CefBrowser>,
+		PaintElementType type,
+		const RectList &,
+		const void *buffer,
+		int width,
+		int height)
+{
+	if (type != PET_VIEW) {
+		return;
+	}
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	if (sharing_available) {
+		return;
+	}
+#endif
+
+	if (!bs) {
+		return;
+	}
+
+	if (bs->width != width || bs->height != height) {
+		obs_enter_graphics();
+		bs->DestroyTextures();
+		obs_leave_graphics();
+	}
+
+	if (!bs->texture && width && height) {
+		obs_enter_graphics();
+		bs->texture = gs_texture_create(
+				width, height, GS_BGRA, 1,
+				(const uint8_t **)&buffer,
+				GS_DYNAMIC);
+		bs->width = width;
+		bs->height = height;
+		obs_leave_graphics();
+	} else {
+		obs_enter_graphics();
+		gs_texture_set_image(bs->texture,
+				(const uint8_t *)buffer,
+				width * 4, false);
+		obs_leave_graphics();
+	}
+}
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+void BrowserClient::OnAcceleratedPaint(
+		CefRefPtr<CefBrowser>,
+		PaintElementType,
+		const RectList &,
+		void *shared_handle)
+{
+	if (!bs) {
+		return;
+	}
+
+	if (shared_handle != last_handle) {
+		obs_enter_graphics();
+		gs_texture_destroy(texture);
+		gs_texture_destroy(bs->texture);
+		bs->texture = nullptr;
+		texture = nullptr;
+
+		texture = gs_texture_open_shared(
+				(uint32_t)(uintptr_t)shared_handle);
+
+		uint32_t cx = gs_texture_get_width(texture);
+		uint32_t cy = gs_texture_get_height(texture);
+		gs_color_format format = gs_texture_get_color_format(texture);
+
+		bs->texture = gs_texture_create(cx, cy, format, 1, nullptr, 0);
+		obs_leave_graphics();
+
+		last_handle = shared_handle;
+	}
+
+	if (texture && bs->texture) {
+		obs_enter_graphics();
+		gs_copy_texture(bs->texture, texture);
+		obs_leave_graphics();
+	}
+}
+#endif
+
+void BrowserClient::OnLoadEnd(
+		CefRefPtr<CefBrowser>,
+		CefRefPtr<CefFrame> frame,
+		int)
+{
+	if (!bs) {
+		return;
+	}
+
+	if (frame->IsMain()) {
+		std::string base64EncodedCSS = base64_encode(bs->css);
+
+		std::string href;
+		href += "data:text/css;charset=utf-8;base64,";
+		href += base64EncodedCSS;
+
+		std::string script;
+		script += "var link = document.createElement('link');";
+		script += "link.setAttribute('rel', 'stylesheet');";
+		script += "link.setAttribute('type', 'text/css');";
+		script += "link.setAttribute('href', '" + href + "');";
+		script += "document.getElementsByTagName('head')[0].appendChild(link);";
+
+		frame->ExecuteJavaScript(script, href, 0);
+	}
+}
+
+bool BrowserClient::OnConsoleMessage(CefRefPtr<CefBrowser>,
+#if CHROME_VERSION_BUILD >= 3282
+		cef_log_severity_t level,
+#endif
+		const CefString &message,
+		const CefString &source,
+		int line)
+{
+#if CHROME_VERSION_BUILD >= 3282
+	if (level < LOGSEVERITY_ERROR)
+		return false;
+#endif
+
+	blog(LOG_INFO, "obs-browser: %s (source: %s:%d)",
+			message.ToString().c_str(),
+			source.ToString().c_str(),
+			line);
+	return false;
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-client.hpp Added

@@ -0,0 +1,122 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include <graphics/graphics.h>
+#include "cef-headers.hpp"
+#include "browser-config.h"
+
+struct BrowserSource;
+
+class BrowserClient : public CefClient,
+                      public CefDisplayHandler,
+                      public CefLifeSpanHandler,
+                      public CefContextMenuHandler,
+                      public CefRenderHandler,
+                      public CefLoadHandler {
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	gs_texture_t *texture = nullptr;
+	void *last_handle = INVALID_HANDLE_VALUE;
+#endif
+	bool sharing_available = false;
+
+public:
+	BrowserSource *bs;
+	CefRect popupRect;
+	CefRect originalPopupRect;
+
+	inline BrowserClient(BrowserSource *bs_, bool sharing_avail)
+		: bs(bs_)
+	{
+		sharing_available = sharing_avail;
+	}
+
+	virtual ~BrowserClient();
+
+	/* CefClient */
+	virtual CefRefPtr<CefLoadHandler> GetLoadHandler() override;
+	virtual CefRefPtr<CefRenderHandler> GetRenderHandler() override;
+	virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
+	virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override;
+	virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler()
+		override;
+
+	virtual bool OnProcessMessageReceived(
+			CefRefPtr<CefBrowser> browser,
+			CefProcessId source_process,
+			CefRefPtr<CefProcessMessage> message) override;
+
+	/* CefDisplayHandler */
+	virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+#if CHROME_VERSION_BUILD >= 3282
+			cef_log_severity_t level,
+#endif
+			const CefString &message,
+			const CefString &source,
+			int line) override;
+
+	/* CefLifeSpanHandler */
+	virtual bool OnBeforePopup(
+			CefRefPtr<CefBrowser> browser,
+			CefRefPtr<CefFrame> frame,
+			const CefString &target_url,
+			const CefString &target_frame_name,
+			WindowOpenDisposition target_disposition,
+			bool user_gesture,
+			const CefPopupFeatures &popupFeatures,
+			CefWindowInfo &windowInfo,
+			CefRefPtr<CefClient> &client,
+			CefBrowserSettings &settings,
+			bool *no_javascript_access) override;
+
+	/* CefContextMenuHandler */
+	virtual void OnBeforeContextMenu(
+			CefRefPtr<CefBrowser> browser,
+			CefRefPtr<CefFrame> frame,
+			CefRefPtr<CefContextMenuParams> params,
+			CefRefPtr<CefMenuModel> model) override;
+
+	/* CefRenderHandler */
+	virtual bool GetViewRect(
+			CefRefPtr<CefBrowser> browser,
+			CefRect &rect) override;
+	virtual void OnPaint(
+			CefRefPtr<CefBrowser> browser,
+			PaintElementType type,
+			const RectList &dirtyRects,
+			const void *buffer,
+			int width,
+			int height) override;
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	virtual void OnAcceleratedPaint(
+			CefRefPtr<CefBrowser> browser,
+			PaintElementType type,
+			const RectList &dirtyRects,
+			void *shared_handle) override;
+#endif
+
+	/* CefLoadHandler */
+	virtual void OnLoadEnd(
+			CefRefPtr<CefBrowser> browser,
+			CefRefPtr<CefFrame> frame,
+			int httpStatusCode) override;
+
+	IMPLEMENT_REFCOUNTING(BrowserClient);
+};

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-config.h.in Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-scheme.cpp Added

@@ -0,0 +1,130 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include "browser-scheme.hpp"
+#include "wide-string.hpp"
+
+/* ------------------------------------------------------------------------- */
+
+CefRefPtr<CefResourceHandler> BrowserSchemeHandlerFactory::Create(
+		CefRefPtr<CefBrowser> browser,
+		CefRefPtr<CefFrame>,
+		const CefString &,
+		CefRefPtr<CefRequest> request)
+{
+	if (!browser || !request)
+		return nullptr;
+
+	return CefRefPtr<BrowserSchemeHandler>(new BrowserSchemeHandler());
+}
+
+/* ------------------------------------------------------------------------- */
+
+bool BrowserSchemeHandler::ProcessRequest(
+		CefRefPtr<CefRequest> request,
+		CefRefPtr<CefCallback> callback)
+{
+	CefURLParts parts;
+	CefParseURL(request->GetURL(), parts);
+
+	std::string path = CefString(&parts.path);
+
+	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_SPACES);
+	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
+
+#ifdef WIN32
+	inputStream.open(to_wide(path.erase(0,1)), std::ifstream::binary);
+#else
+	inputStream.open(path, std::ifstream::binary);
+#endif
+
+	/* Set fileName for use in GetResponseHeaders */
+	fileName = path;
+
+	if (!inputStream.is_open()) {
+		callback->Cancel();
+		return false;
+	}
+
+	inputStream.seekg(0, std::ifstream::end);
+	length = remaining = inputStream.tellg();
+	inputStream.seekg(0, std::ifstream::beg);
+	callback->Continue();
+	return true;
+}
+
+void BrowserSchemeHandler::GetResponseHeaders(
+		CefRefPtr<CefResponse> response,
+		int64 &response_length,
+		CefString &redirectUrl)
+{
+	if (!response) {
+		response_length = -1;
+		redirectUrl = "";
+		return;
+	}
+
+	std::string fileExtension =
+		fileName.substr(fileName.find_last_of(".") + 1);
+
+	for (char &ch : fileExtension)
+		ch = (char)tolower(ch);
+	if (fileExtension.compare("woff2") == 0)
+		fileExtension = "woff";
+
+	response->SetStatus(200);
+	response->SetMimeType(CefGetMimeType(fileExtension));
+	response->SetStatusText("OK");
+	response_length = length;
+	redirectUrl = "";
+}
+
+bool BrowserSchemeHandler::ReadResponse(
+		void *data_out,
+		int bytes_to_read,
+		int &bytes_read,
+		CefRefPtr<CefCallback>)
+{
+	if (!data_out || !inputStream.is_open()) {
+		bytes_read = 0;
+		inputStream.close();
+		return false;
+	}
+
+	if (isComplete) {
+		bytes_read = 0;
+		return false;
+	}
+
+	inputStream.read((char *)data_out, bytes_to_read);
+	bytes_read = (int)inputStream.gcount();
+	remaining -= bytes_read;
+
+	if (remaining == 0) {
+		isComplete = true;
+		inputStream.close();
+	}
+
+	return true;
+}
+
+void BrowserSchemeHandler::Cancel()
+{
+	if (inputStream.is_open())
+		inputStream.close();
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-scheme.hpp Added

@@ -0,0 +1,59 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include "cef-headers.hpp"
+#include <string>
+#include <fstream>
+
+class BrowserSchemeHandlerFactory : public CefSchemeHandlerFactory {
+public:
+	virtual CefRefPtr<CefResourceHandler> Create(
+			CefRefPtr<CefBrowser> browser,
+			CefRefPtr<CefFrame>,
+			const CefString &,
+			CefRefPtr<CefRequest> request) override;
+
+	IMPLEMENT_REFCOUNTING(BrowserSchemeHandlerFactory);
+};
+
+class BrowserSchemeHandler : public CefResourceHandler {
+	std::string fileName;
+	std::ifstream inputStream;
+	bool isComplete = false;
+	int64 length = 0;
+	int64 remaining = 0;
+
+public:
+	virtual bool ProcessRequest(
+			CefRefPtr<CefRequest> request,
+			CefRefPtr<CefCallback> callback) override;
+	virtual void GetResponseHeaders(
+			CefRefPtr<CefResponse> response,
+			int64 &response_length,
+			CefString &redirectUrl) override;
+	virtual bool ReadResponse(
+			void *data_out,
+			int bytes_to_read,
+			int &bytes_read,
+			CefRefPtr<CefCallback> callback) override;
+	virtual void Cancel() override;
+
+	IMPLEMENT_REFCOUNTING(BrowserSchemeHandler);
+};

obs-studio-22.0.1.tar.xz/plugins/obs-browser/browser-version.h Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/cef-bootstrap/cef-bootstrap-main.cpp Added

@@ -0,0 +1,41 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include "cef-headers.hpp"
+#include "browser-app.hpp"
+
+#ifdef _WIN32
+
+// GPU hint exports for AMD/NVIDIA laptops
+#ifdef _MSC_VER
+extern "C" __declspec(dllexport) DWORD NvOptimusEnablement = 1;
+extern "C" __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+#endif
+
+int CALLBACK WinMain(HINSTANCE, HINSTANCE,
+	LPSTR, int)
+{
+	CefMainArgs mainArgs(nullptr);
+#else
+int main(int argc, char *argv[])
+{
+	CefMainArgs mainArgs(argc, argv);
+#endif
+	CefRefPtr<BrowserApp> mainApp(new BrowserApp());
+	return CefExecuteProcess(mainArgs, mainApp.get(), NULL);
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/cef-headers.hpp Added

@@ -0,0 +1,43 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable : 4100)
+#else
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-parameter"
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#include <include/cef_app.h>
+#include <include/cef_base.h>
+#include <include/cef_task.h>
+#include <include/cef_client.h>
+#include <include/cef_parser.h>
+#include <include/cef_scheme.h>
+#include <include/cef_version.h>
+#include <include/cef_render_process_handler.h>
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#else
+# pragma GCC diagnostic pop
+#endif

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

obs-studio-21.1.2.tar.xz/plugins/obs-browser/data/locale/en-US.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-browser/data/locale/en-US.ini Changed

obs-studio-22.0.1.tar.xz/plugins/obs-browser/data/locale/et-EE.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/data/locale/fil-PH.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/data/locale/gd-GB.ini Added

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

obs-studio-22.0.1.tar.xz/plugins/obs-browser/data/locale/ka-GE.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/base64 Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/base64/base64.cpp Added

@@ -0,0 +1,123 @@
+/*
+base64.cpp and base64.h
+
+Copyright (C) 2004-2008 René Nyffenegger
+
+This source code is provided 'as-is', without any express or implied
+warranty. In no event will the author be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this source code must not be misrepresented; you must not
+claim that you wrote the original source code. If you use this source code
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original source code.
+
+3. This notice may not be removed or altered from any source distribution.
+
+René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+*/
+
+#include "base64.hpp"
+#include <iostream>
+
+static const std::string base64_chars =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+"abcdefghijklmnopqrstuvwxyz"
+"0123456789+/";
+
+
+static inline bool is_base64(unsigned char c) {
+	return (isalnum(c) || (c == '+') || (c == '/'));
+}
+
+std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
+	std::string ret;
+	int i = 0;
+	int j = 0;
+	unsigned char char_array_3[3];
+	unsigned char char_array_4[4];
+
+	while (in_len--) {
+		char_array_3[i++] = *(bytes_to_encode++);
+		if (i == 3) {
+			char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+			char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+			char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+			char_array_4[3] = char_array_3[2] & 0x3f;
+
+			for (i = 0; (i <4); i++)
+				ret += base64_chars[char_array_4[i]];
+			i = 0;
+		}
+	}
+
+	if (i)
+	{
+		for (j = i; j < 3; j++)
+			char_array_3[j] = '\0';
+
+		char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+		char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+		char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+		char_array_4[3] = char_array_3[2] & 0x3f;
+
+		for (j = 0; (j < i + 1); j++)
+			ret += base64_chars[char_array_4[j]];
+
+		while ((i++ < 3))
+			ret += '=';
+
+	}
+
+	return ret;
+
+}
+
+std::string base64_decode(std::string const& encoded_string) {
+	int in_len = (int)encoded_string.size();
+	int i = 0;
+	int j = 0;
+	int in_ = 0;
+	unsigned char char_array_4[4], char_array_3[3];
+	std::string ret;
+
+	while (in_len-- && (encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
+		char_array_4[i++] = encoded_string[in_]; in_++;
+		if (i == 4) {
+			for (i = 0; i <4; i++)
+				char_array_4[i] = (unsigned char)base64_chars.find(char_array_4[i]);
+
+			char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+			char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+			char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+			for (i = 0; (i < 3); i++)
+				ret += char_array_3[i];
+			i = 0;
+		}
+	}
+
+	if (i) {
+		for (j = i; j <4; j++)
+			char_array_4[j] = 0;
+
+		for (j = 0; j <4; j++)
+			char_array_4[j] = (unsigned char)base64_chars.find(char_array_4[j]);
+
+		char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+		char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+		char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+		for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
+	}
+
+	return ret;
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/base64/base64.hpp Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/json11 Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/json11/LICENSE.txt Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/json11/json11.cpp Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/json11/json11.hpp Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/wide-string.cpp Added

@@ -0,0 +1,54 @@
+/******************************************************************************
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include "wide-string.hpp"
+#include <util/platform.h>
+
+using namespace std;
+
+wstring to_wide(const char *utf8)
+{
+	if (!utf8 || !*utf8)
+		return wstring();
+
+	size_t isize = strlen(utf8);
+	size_t osize = os_utf8_to_wcs(utf8, isize, nullptr, 0);
+
+	if (!osize)
+		return wstring();
+
+	wstring wide;
+	wide.resize(osize);
+	os_utf8_to_wcs(utf8, isize, &wide[0], osize + 1);
+	return wide;
+}
+
+wstring to_wide(const std::string &utf8)
+{
+	if (utf8.empty())
+		return wstring();
+
+	size_t osize = os_utf8_to_wcs(utf8.c_str(), utf8.size(), nullptr, 0);
+
+	if (!osize)
+		return wstring();
+
+	wstring wide;
+	wide.resize(osize);
+	os_utf8_to_wcs(utf8.c_str(), utf8.size(), &wide[0], osize + 1);
+	return wide;
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/deps/wide-string.hpp Added

@@ -0,0 +1,23 @@
+/******************************************************************************
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include <string>
+
+extern std::wstring to_wide(const char *utf8);
+extern std::wstring to_wide(const std::string &utf8);

obs-studio-22.0.1.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp Added

@@ -0,0 +1,455 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include <obs-frontend-api.h>
+#include <util/threading.h>
+#include <util/platform.h>
+#include <util/util.hpp>
+#include <util/dstr.hpp>
+#include <obs-module.h>
+#include <thread>
+#include <mutex>
+
+#include "obs-browser-source.hpp"
+#include "browser-scheme.hpp"
+#include "browser-app.hpp"
+#include "browser-version.h"
+
+#include "json11/json11.hpp"
+#include "cef-headers.hpp"
+
+#ifdef _WIN32
+#include <util/windows/ComPtr.hpp>
+#include <dxgi.h>
+#include <dxgi1_2.h>
+#include <d3d11.h>
+#endif
+
+OBS_DECLARE_MODULE()
+OBS_MODULE_USE_DEFAULT_LOCALE("obs-browser", "en-US")
+
+using namespace std;
+using namespace json11;
+
+static thread manager_thread;
+
+static int adapterCount = 0;
+static std::wstring deviceId;
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+bool hwaccel = false;
+#endif
+
+/* ========================================================================= */
+
+class BrowserTask : public CefTask {
+public:
+	std::function<void()> task;
+
+	inline BrowserTask(std::function<void()> task_) : task(task_) {}
+	virtual void Execute() override {task();}
+
+	IMPLEMENT_REFCOUNTING(BrowserTask);
+};
+
+bool QueueCEFTask(std::function<void()> task)
+{
+	return CefPostTask(TID_UI, CefRefPtr<BrowserTask>(new BrowserTask(task)));
+}
+
+/* ========================================================================= */
+
+static const char *default_css = "\
+body { \
+background-color: rgba(0, 0, 0, 0); \
+margin: 0px auto; \
+overflow: hidden; \
+}";
+
+static void browser_source_get_defaults(obs_data_t *settings)
+{
+	obs_data_set_default_string(settings, "url",
+			"https://www.obsproject.com");
+	obs_data_set_default_int(settings, "width", 800);
+	obs_data_set_default_int(settings, "height", 600);
+	obs_data_set_default_int(settings, "fps", 30);
+	obs_data_set_default_bool(settings, "shutdown", false);
+	obs_data_set_default_bool(settings, "restart_when_active", false);
+	obs_data_set_default_string(settings, "css", default_css);
+}
+
+static bool is_local_file_modified(obs_properties_t *props,
+		obs_property_t *, obs_data_t *settings)
+{
+	bool enabled = obs_data_get_bool(settings, "is_local_file");
+	obs_property_t *url = obs_properties_get(props, "url");
+	obs_property_t *local_file = obs_properties_get(props, "local_file");
+	obs_property_set_visible(url, !enabled);
+	obs_property_set_visible(local_file, enabled);
+
+	return true;
+}
+
+static obs_properties_t *browser_source_get_properties(void *data)
+{
+	obs_properties_t *props = obs_properties_create();
+	BrowserSource *bs = static_cast<BrowserSource *>(data);
+	DStr path;
+
+	obs_properties_set_flags(props, OBS_PROPERTIES_DEFER_UPDATE);
+	obs_property_t *prop = obs_properties_add_bool(props, "is_local_file",
+			obs_module_text("LocalFile"));
+
+	if (bs && !bs->url.empty()) {
+		const char *slash;
+
+		dstr_copy(path, bs->url.c_str());
+		dstr_replace(path, "\\", "/");
+		slash = strrchr(path->array, '/');
+		if (slash)
+			dstr_resize(path, slash - path->array + 1);
+	}
+
+	obs_property_set_modified_callback(prop, is_local_file_modified);
+	obs_properties_add_path(props, "local_file",
+			obs_module_text("Local file"), OBS_PATH_FILE, "*.*",
+			path->array);
+	obs_properties_add_text(props, "url",
+			obs_module_text("URL"), OBS_TEXT_DEFAULT);
+
+	obs_properties_add_int(props, "width",
+			obs_module_text("Width"), 1, 4096, 1);
+	obs_properties_add_int(props, "height",
+			obs_module_text("Height"), 1, 4096, 1);
+	obs_properties_add_int(props, "fps",
+			obs_module_text("FPS"), 1, 60, 1);
+	obs_properties_add_text(props, "css",
+			obs_module_text("CSS"), OBS_TEXT_MULTILINE);
+	obs_properties_add_bool(props, "shutdown",
+			obs_module_text("ShutdownSourceNotVisible"));
+	obs_properties_add_bool(props, "restart_when_active",
+			obs_module_text("RefreshBrowserActive"));
+
+	obs_properties_add_button(props, "refreshnocache",
+			obs_module_text("RefreshNoCache"),
+			[] (obs_properties_t *, obs_property_t *, void *data)
+			{
+				static_cast<BrowserSource *>(data)->Refresh();
+				return false;
+			});
+	return props;
+}
+
+static void BrowserManagerThread(void)
+{
+	string path = obs_get_module_binary_path(obs_current_module());
+	path = path.substr(0, path.find_last_of('/') + 1);
+	path += "//cef-bootstrap";
+#ifdef _WIN32
+	path += ".exe";
+#endif
+
+	CefMainArgs args;
+	CefSettings settings;
+	settings.log_severity = LOGSEVERITY_VERBOSE;
+	settings.windowless_rendering_enabled = true;
+	settings.no_sandbox = true;
+
+#if defined(__APPLE__) && defined(_DEBUG)
+	CefString(&settings.framework_dir_path) =
+		"/Library/Frameworks/Chromium Embedded Framework.framework";
+#endif
+
+	BPtr<char> conf_path = obs_module_config_path("");
+	CefString(&settings.cache_path) = conf_path;
+	CefString(&settings.browser_subprocess_path) = path;
+
+	bool tex_sharing_avail = false;
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	if (hwaccel) {
+		obs_enter_graphics();
+		tex_sharing_avail = gs_shared_texture_available();
+		obs_leave_graphics();
+	}
+#endif
+
+	CefRefPtr<BrowserApp> app(new BrowserApp(tex_sharing_avail));
+	CefExecuteProcess(args, app, nullptr);
+	CefInitialize(args, settings, app, nullptr);
+	CefRegisterSchemeHandlerFactory("http", "absolute",
+			new BrowserSchemeHandlerFactory());
+	CefRunMessageLoop();
+	CefShutdown();
+}
+
+extern "C" EXPORT void obs_browser_initialize(void)
+{
+	static bool manager_initialized = false;
+	if (!os_atomic_set_bool(&manager_initialized, true)) {
+		manager_thread = thread(BrowserManagerThread);
+	}
+}
+
+void RegisterBrowserSource()
+{
+	struct obs_source_info info = {};
+	info.id                     = "browser_source";
+	info.type                   = OBS_SOURCE_TYPE_INPUT;
+	info.output_flags           = OBS_SOURCE_VIDEO |
+	                              OBS_SOURCE_CUSTOM_DRAW |
+	                              OBS_SOURCE_INTERACTION |
+	                              OBS_SOURCE_DO_NOT_DUPLICATE;
+	info.get_properties         = browser_source_get_properties;
+	info.get_defaults           = browser_source_get_defaults;
+
+	info.get_name = [] (void *)
+	{
+		return obs_module_text("BrowserSource");
+	};
+	info.create = [] (obs_data_t *settings, obs_source_t *source) -> void *
+	{
+		obs_browser_initialize();
+		return new BrowserSource(settings, source);
+	};
+	info.destroy = [] (void *data)
+	{
+		delete static_cast<BrowserSource *>(data);
+	};
+	info.update = [] (void *data, obs_data_t *settings)
+	{
+		static_cast<BrowserSource *>(data)->Update(settings);
+	};
+	info.get_width = [] (void *data)
+	{
+		return (uint32_t)static_cast<BrowserSource *>(data)->width;
+	};
+	info.get_height = [] (void *data)
+	{
+		return (uint32_t)static_cast<BrowserSource *>(data)->height;
+	};
+	info.video_tick = [] (void *data, float)
+	{
+		static_cast<BrowserSource *>(data)->Tick();
+	};
+	info.video_render = [] (void *data, gs_effect_t *)
+	{
+		static_cast<BrowserSource *>(data)->Render();
+	};
+	info.mouse_click = [] (
+			void *data,
+			const struct obs_mouse_event *event,
+			int32_t type,
+			bool mouse_up,
+			uint32_t click_count)
+	{
+		static_cast<BrowserSource *>(data)->SendMouseClick(
+				event, type, mouse_up, click_count);
+	};
+	info.mouse_move = [] (
+			void *data,
+			const struct obs_mouse_event *event,
+			bool mouse_leave)
+	{
+		static_cast<BrowserSource *>(data)->SendMouseMove(
+				event, mouse_leave);
+	};
+	info.mouse_wheel = [] (
+			void *data,
+			const struct obs_mouse_event *event,
+			int x_delta,
+			int y_delta)
+	{
+		static_cast<BrowserSource *>(data)->SendMouseWheel(
+				event, x_delta, y_delta);
+	};
+	info.focus = [] (void *data, bool focus)
+	{
+		static_cast<BrowserSource *>(data)->SendFocus(focus);
+	};
+	info.key_click = [] (
+			void *data,
+			const struct obs_key_event *event,
+			bool key_up)
+	{
+		static_cast<BrowserSource *>(data)->SendKeyClick(event, key_up);
+	};
+	info.show = [] (void *data)
+	{
+		static_cast<BrowserSource *>(data)->SetShowing(true);
+	};
+	info.hide = [] (void *data)
+	{
+		static_cast<BrowserSource *>(data)->SetShowing(false);
+	};
+	info.activate = [] (void *data)
+	{
+		BrowserSource *bs = static_cast<BrowserSource *>(data);
+		if (bs->restart)
+			bs->Refresh();
+		bs->SetActive(true);
+	};
+	info.deactivate = [] (void *data)
+	{
+		static_cast<BrowserSource *>(data)->SetActive(false);
+	};
+
+	obs_register_source(&info);
+}
+
+/* ========================================================================= */
+
+extern void DispatchJSEvent(const char *eventName, const char *jsonString);
+
+static void handle_obs_frontend_event(enum obs_frontend_event event, void *)
+{
+	switch (event) {
+	case OBS_FRONTEND_EVENT_STREAMING_STARTING:
+		DispatchJSEvent("obsStreamingStarting", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STARTED:
+		DispatchJSEvent("obsStreamingStarted", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
+		DispatchJSEvent("obsStreamingStopping", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
+		DispatchJSEvent("obsStreamingStopped", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STARTING:
+		DispatchJSEvent("obsRecordingStarting", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STARTED:
+		DispatchJSEvent("obsRecordingStarted", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STOPPING:
+		DispatchJSEvent("obsRecordingStopping", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STOPPED:
+		DispatchJSEvent("obsRecordingStopped", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_SCENE_CHANGED:
+		{
+			obs_source_t *source = obs_frontend_get_current_scene();
+
+			Json json = Json::object {
+				{"name", obs_source_get_name(source)},
+				{"width", (int)obs_source_get_width(source)},
+				{"height", (int)obs_source_get_height(source)}
+			};
+
+			obs_source_release(source);
+
+			DispatchJSEvent("obsSceneChanged", json.dump().c_str());
+			break;
+		}
+	case OBS_FRONTEND_EVENT_EXIT:
+		DispatchJSEvent("obsExit", nullptr);
+		break;
+	default:;
+	}
+}
+
+#ifdef _WIN32
+static inline void EnumAdapterCount()
+{
+	ComPtr<IDXGIFactory1> factory;
+	ComPtr<IDXGIAdapter1> adapter;
+	HRESULT hr;
+	UINT i = 0;
+
+	hr = CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&factory);
+	if (FAILED(hr))
+		return;
+
+	while (factory->EnumAdapters1(i++, &adapter) == S_OK) {
+		DXGI_ADAPTER_DESC desc;
+
+		hr = adapter->GetDesc(&desc);
+		if (FAILED(hr))
+			continue;
+
+		if (i == 1)
+			deviceId = desc.Description;
+
+		/* ignore Microsoft's 'basic' renderer' */
+		if (desc.VendorId == 0x1414 && desc.DeviceId == 0x8c)
+			continue;
+
+		adapterCount++;
+	}
+}
+#endif
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+static const wchar_t *blacklisted_devices[] = {
+	L"Intel(R) HD Graphics",
+	nullptr
+};
+#endif
+
+bool obs_module_load(void)
+{
+	blog(LOG_INFO, "[obs-browser]: Version %s",
+			OBS_BROWSER_VERSION_STRING);
+
+#ifdef _WIN32
+	EnumAdapterCount();
+#endif
+	RegisterBrowserSource();
+	obs_frontend_add_event_callback(handle_obs_frontend_event, nullptr);
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	obs_data_t *private_data = obs_get_private_data();
+	hwaccel = obs_data_get_bool(private_data, "BrowserHWAccel");
+	if (hwaccel) {
+		/* do not use hardware acceleration if a blacklisted device is
+		 * the default and on 2 or more adapters */
+		if (adapterCount >= 2) {
+			const wchar_t **device = blacklisted_devices;
+			while (*device) {
+				if (!!wstrstri(deviceId.c_str(), *device)) {
+					hwaccel = false;
+					blog(LOG_INFO, "[obs-browser]: "
+							"Blacklisted device "
+							"detected on a "
+							"computer with more "
+							"than one adapter, "
+							"disabling browser "
+							"source hardware "
+							"acceleration.");
+					break;
+				}
+				device++;
+			}
+		}
+	}
+	obs_data_release(private_data);
+#endif
+	return true;
+}
+
+void obs_module_unload(void)
+{
+	if (manager_thread.joinable()) {
+		while (!QueueCEFTask([] () {CefQuitMessageLoop();}))
+			os_sleep_ms(5);
+
+		manager_thread.join();
+	}
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/obs-browser-source.cpp Added

@@ -0,0 +1,428 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#include "obs-browser-source.hpp"
+#include "browser-client.hpp"
+#include "wide-string.hpp"
+#include <util/threading.h>
+#include <functional>
+#include <thread>
+#include <mutex>
+
+using namespace std;
+
+extern bool QueueCEFTask(std::function<void()> task);
+
+static mutex browser_list_mutex;
+static BrowserSource *first_browser = nullptr;
+
+BrowserSource::BrowserSource(obs_data_t *, obs_source_t *source_)
+	: source(source_)
+{
+	/* defer update */
+	obs_source_update(source, nullptr);
+
+	lock_guard<mutex> lock(browser_list_mutex);
+	p_prev_next = &first_browser;
+	next = first_browser;
+	if (first_browser) first_browser->p_prev_next = &next;
+	first_browser = this;
+}
+
+BrowserSource::~BrowserSource()
+{
+	DestroyBrowser();
+	DestroyTextures();
+
+	lock_guard<mutex> lock(browser_list_mutex);
+	if (next) next->p_prev_next = p_prev_next;
+	*p_prev_next = next;
+}
+
+void BrowserSource::ExecuteOnBrowser(std::function<void()> func, bool async)
+{
+	if (!async) {
+		os_event_t *finishedEvent;
+		os_event_init(&finishedEvent, OS_EVENT_TYPE_AUTO);
+		bool success = QueueCEFTask([&] () {
+			if (!!cefBrowser)
+				func();
+			os_event_signal(finishedEvent);
+		});
+		if (success)
+			os_event_wait(finishedEvent);
+		os_event_destroy(finishedEvent);
+	} else {
+		QueueCEFTask([this, func] () {
+			if (!!cefBrowser)
+				func();
+		});
+	}
+}
+
+bool BrowserSource::CreateBrowser()
+{
+	return QueueCEFTask([this] ()
+	{
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+		if (hwaccel) {
+			obs_enter_graphics();
+			tex_sharing_avail = gs_shared_texture_available();
+			obs_leave_graphics();
+		}
+#else
+		bool hwaccel = false;
+#endif
+
+		struct obs_video_info ovi;
+		obs_get_video_info(&ovi);
+
+		CefRefPtr<BrowserClient> browserClient =
+			new BrowserClient(this, hwaccel && tex_sharing_avail);
+
+		CefWindowInfo windowInfo;
+#if CHROME_VERSION_BUILD < 3071
+		windowInfo.transparent_painting_enabled = true;
+#endif
+		windowInfo.width = width;
+		windowInfo.height = height;
+		windowInfo.windowless_rendering_enabled = true;
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+		windowInfo.shared_texture_enabled = hwaccel;
+		windowInfo.external_begin_frame_enabled = true;
+#endif
+
+		CefBrowserSettings cefBrowserSettings;
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+		cefBrowserSettings.windowless_frame_rate = 0;
+#else
+		cefBrowserSettings.windowless_frame_rate = fps;
+#endif
+
+		cefBrowser = CefBrowserHost::CreateBrowserSync(
+				windowInfo,
+				browserClient,
+				url,
+				cefBrowserSettings,
+				nullptr);
+	});
+}
+
+void BrowserSource::DestroyBrowser(bool async)
+{
+	ExecuteOnBrowser([this] ()
+	{
+		CefRefPtr<CefClient> client =
+				cefBrowser->GetHost()->GetClient();
+		BrowserClient *bc =
+				reinterpret_cast<BrowserClient*>(client.get());
+		if (bc) {
+			bc->bs = nullptr;
+		}
+
+		/*
+		 * This stops rendering
+		 * http://magpcss.org/ceforum/viewtopic.php?f=6&t=12079
+		 * https://bitbucket.org/chromiumembedded/cef/issues/1363/washidden-api-got-broken-on-branch-2062)
+		 */
+		cefBrowser->GetHost()->WasHidden(true);
+		cefBrowser->GetHost()->CloseBrowser(true);
+		cefBrowser = nullptr;
+	}, async);
+}
+
+void BrowserSource::SendMouseClick(
+		const struct obs_mouse_event *event,
+		int32_t type,
+		bool mouse_up,
+		uint32_t click_count)
+{
+	uint32_t modifiers = event->modifiers;
+	int32_t  x         = event->x;
+	int32_t  y         = event->y;
+
+	ExecuteOnBrowser([this, modifiers, x, y, type, mouse_up, click_count] ()
+	{
+		CefMouseEvent e;
+		e.modifiers = modifiers;
+		e.x = x;
+		e.y = y;
+		CefBrowserHost::MouseButtonType buttonType =
+			(CefBrowserHost::MouseButtonType)type;
+		cefBrowser->GetHost()->SendMouseClickEvent(e, buttonType,
+			mouse_up, click_count);
+	}, true);
+}
+
+void BrowserSource::SendMouseMove(
+		const struct obs_mouse_event *event,
+		bool mouse_leave)
+{
+	uint32_t modifiers = event->modifiers;
+	int32_t  x         = event->x;
+	int32_t  y         = event->y;
+
+	ExecuteOnBrowser([this, modifiers, x, y, mouse_leave] ()
+	{
+		CefMouseEvent e;
+		e.modifiers = modifiers;
+		e.x = x;
+		e.y = y;
+		cefBrowser->GetHost()->SendMouseMoveEvent(e, mouse_leave);
+	}, true);
+}
+
+void BrowserSource::SendMouseWheel(
+		const struct obs_mouse_event *event,
+		int x_delta,
+		int y_delta)
+{
+	uint32_t modifiers = event->modifiers;
+	int32_t  x         = event->x;
+	int32_t  y         = event->y;
+
+	ExecuteOnBrowser([this, modifiers, x, y, x_delta, y_delta] ()
+	{
+		CefMouseEvent e;
+		e.modifiers = modifiers;
+		e.x = x;
+		e.y = y;
+		cefBrowser->GetHost()->SendMouseWheelEvent(e, x_delta, y_delta);
+	}, true);
+}
+
+void BrowserSource::SendFocus(bool focus)
+{
+	ExecuteOnBrowser([this, focus] ()
+	{
+		cefBrowser->GetHost()->SendFocusEvent(focus);
+	}, true);
+}
+
+void BrowserSource::SendKeyClick(
+		const struct obs_key_event *event,
+		bool key_up)
+{
+	uint32_t    modifiers   = event->modifiers;
+	std::string text        = event->text;
+	uint32_t    native_vkey = event->native_vkey;
+
+	ExecuteOnBrowser([this, modifiers, text, native_vkey, key_up] ()
+	{
+		CefKeyEvent e;
+		e.windows_key_code = native_vkey;
+		e.native_key_code = 0;
+
+		e.type = key_up ? KEYEVENT_KEYUP : KEYEVENT_RAWKEYDOWN;
+
+		if (!text.empty()) {
+			wstring wide = to_wide(text);
+			if (wide.size())
+				e.character = wide[0];
+		}
+
+		//e.native_key_code = native_vkey;
+		e.modifiers = modifiers;
+
+		cefBrowser->GetHost()->SendKeyEvent(e);
+		if (!text.empty() && !key_up) {
+			e.type = KEYEVENT_CHAR;
+			e.windows_key_code = e.character;
+			e.native_key_code = native_vkey;
+			cefBrowser->GetHost()->SendKeyEvent(e);
+		}
+	}, true);
+}
+
+void BrowserSource::SetShowing(bool showing)
+{
+	if (!showing) {
+		ExecuteOnBrowser([this] ()
+		{
+			cefBrowser->GetHost()->WasHidden(true);
+		}, true);
+	}
+
+	if (shutdown_on_invisible) {
+		if (showing) {
+			Update();
+		} else {
+			DestroyBrowser(true);
+		}
+	} else {
+		ExecuteOnBrowser([this, showing] ()
+		{
+			CefRefPtr<CefProcessMessage> msg =
+				CefProcessMessage::Create("Visibility");
+			CefRefPtr<CefListValue> args = msg->GetArgumentList();
+			args->SetBool(0, showing);
+			cefBrowser->SendProcessMessage(PID_RENDERER, msg);
+		}, true);
+	}
+
+	if (showing) {
+		ExecuteOnBrowser([this] ()
+		{
+			cefBrowser->GetHost()->WasHidden(false);
+			cefBrowser->GetHost()->Invalidate(PET_VIEW);
+		}, true);
+	}
+}
+
+void BrowserSource::SetActive(bool active)
+{
+	ExecuteOnBrowser([this, active] ()
+	{
+		CefRefPtr<CefProcessMessage> msg =
+			CefProcessMessage::Create("Active");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetBool(0, active);
+		cefBrowser->SendProcessMessage(PID_RENDERER, msg);
+	}, true);
+}
+
+void BrowserSource::Refresh()
+{
+	ExecuteOnBrowser([this] ()
+	{
+		cefBrowser->ReloadIgnoreCache();
+	}, true);
+}
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+inline void BrowserSource::SignalBeginFrame()
+{
+	if (reset_frame) {
+		ExecuteOnBrowser([this] ()
+		{
+			cefBrowser->GetHost()->SendExternalBeginFrame();
+		}, true);
+
+		reset_frame = false;
+	}
+}
+#endif
+
+void BrowserSource::Update(obs_data_t *settings)
+{
+	if (settings) {
+		bool n_is_local;
+		int n_width;
+		int n_height;
+		int n_fps;
+		bool n_shutdown;
+		bool n_restart;
+		std::string n_url;
+		std::string n_css;
+
+		n_is_local  = obs_data_get_bool(settings, "is_local_file");
+		n_width     = (int)obs_data_get_int(settings, "width");
+		n_height    = (int)obs_data_get_int(settings, "height");
+		n_fps       = (int)obs_data_get_int(settings, "fps");
+		n_shutdown  = obs_data_get_bool(settings, "shutdown");
+		n_restart   = obs_data_get_bool(settings, "restart_when_active");
+		n_css       = obs_data_get_string(settings, "css");
+		n_url       = obs_data_get_string(settings,
+				n_is_local ? "local_file" : "url");
+
+		if (n_is_local)
+			n_url = "http://absolute/" + n_url;
+
+		if (n_is_local == is_local &&
+		    n_width == width &&
+		    n_height == height &&
+		    n_fps == fps &&
+		    n_shutdown == shutdown_on_invisible &&
+		    n_restart == restart &&
+		    n_css == css &&
+		    n_url == url) {
+			return;
+		}
+
+		is_local              = n_is_local;
+		width                 = n_width;
+		height                = n_height;
+		fps                   = n_fps;
+		shutdown_on_invisible = n_shutdown;
+		restart               = n_restart;
+		css                   = n_css;
+		url                   = n_url;
+	}
+
+	DestroyBrowser(true);
+	DestroyTextures();
+	if (!shutdown_on_invisible || obs_source_showing(source))
+		create_browser = true;
+}
+
+void BrowserSource::Tick()
+{
+	if (create_browser && CreateBrowser())
+		create_browser = false;
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	reset_frame = true;
+#endif
+}
+
+void BrowserSource::Render()
+{
+	bool flip = false;
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	flip = hwaccel;
+#endif
+
+	if (texture) {
+		gs_effect_t *effect = obs_get_base_effect(
+				OBS_EFFECT_PREMULTIPLIED_ALPHA);
+		while (gs_effect_loop(effect, "Draw"))
+			obs_source_draw(texture, 0, 0, 0, 0, flip);
+	}
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	SignalBeginFrame();
+#endif
+}
+
+static void ExecuteOnAllBrowsers(function<void(BrowserSource*)> func)
+{
+	lock_guard<mutex> lock(browser_list_mutex);
+
+	BrowserSource *bs = first_browser;
+	while (bs) {
+		BrowserSource *bsw =
+			reinterpret_cast<BrowserSource *>(bs);
+		bsw->ExecuteOnBrowser([&] () {func(bsw);});
+		bs = bs->next;
+	}
+}
+
+void DispatchJSEvent(const char *eventName, const char *jsonString)
+{
+	ExecuteOnAllBrowsers([&] (BrowserSource *bsw)
+	{
+		CefRefPtr<CefProcessMessage> msg =
+			CefProcessMessage::Create("DispatchJSEvent");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+
+		args->SetString(0, eventName);
+		args->SetString(1, jsonString);
+		bsw->cefBrowser->SendProcessMessage(PID_RENDERER, msg);
+	});
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/obs-browser-source.hpp Added

@@ -0,0 +1,103 @@
+/******************************************************************************
+ Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
+ Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include <obs-module.h>
+
+#include "cef-headers.hpp"
+#include "browser-config.h"
+
+#include <functional>
+#include <string>
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+extern bool hwaccel;
+#endif
+
+struct BrowserSource {
+	BrowserSource         **p_prev_next            = nullptr;
+	BrowserSource         *next                    = nullptr;
+
+	obs_source_t          *source                  = nullptr;
+
+	bool                  tex_sharing_avail        = false;
+	bool                  create_browser           = false;
+	CefRefPtr<CefBrowser> cefBrowser;
+
+	std::string           url;
+	std::string           css;
+	gs_texture_t          *texture                 = nullptr;
+	int                   width                    = 0;
+	int                   height                   = 0;
+	int                   fps                      = 0;
+	bool                  restart                  = false;
+	bool                  shutdown_on_invisible    = false;
+	bool                  is_local                 = false;
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	bool                  reset_frame              = false;
+#endif
+
+	inline void DestroyTextures()
+	{
+		if (texture) {
+			obs_enter_graphics();
+			gs_texture_destroy(texture);
+			texture = nullptr;
+			obs_leave_graphics();
+		}
+	}
+
+	/* ---------------------------- */
+
+	bool CreateBrowser();
+	void DestroyBrowser(bool async = false);
+	void ExecuteOnBrowser(std::function<void()> func, bool async = false);
+
+	/* ---------------------------- */
+
+	BrowserSource(obs_data_t *settings, obs_source_t *source);
+	~BrowserSource();
+
+	void Update(obs_data_t *settings = nullptr);
+	void Tick();
+	void Render();
+	void SendMouseClick(
+			const struct obs_mouse_event *event,
+			int32_t type,
+			bool mouse_up,
+			uint32_t click_count);
+	void SendMouseMove(
+			const struct obs_mouse_event *event,
+			bool mouse_leave);
+	void SendMouseWheel(
+			const struct obs_mouse_event *event,
+			int x_delta,
+			int y_delta);
+	void SendFocus(bool focus);
+	void SendKeyClick(
+			const struct obs_key_event *event,
+			bool key_up);
+	void SetShowing(bool showing);
+	void SetActive(bool active);
+	void Refresh();
+
+#if EXPERIMENTAL_SHARED_TEXTURE_SUPPORT_ENABLED
+	inline void SignalBeginFrame();
+#endif
+};

obs-studio-22.0.1.tar.xz/plugins/obs-browser/panel Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/panel/browser-panel-client.cpp Added

@@ -0,0 +1,55 @@
+#include "browser-panel-client.hpp"
+
+#include <QUrl>
+#include <QDesktopServices>
+
+/* CefClient */
+CefRefPtr<CefLoadHandler> QCefBrowserClient::GetLoadHandler()
+{
+	return this;
+}
+
+CefRefPtr<CefDisplayHandler> QCefBrowserClient::GetDisplayHandler()
+{
+	return this;
+}
+
+CefRefPtr<CefLifeSpanHandler> QCefBrowserClient::GetLifeSpanHandler()
+{
+	return this;
+}
+
+
+/* CefDisplayHandler */
+void QCefBrowserClient::OnTitleChange(
+		CefRefPtr<CefBrowser>,
+		const CefString &title)
+{
+	std::string str_title = title;
+	if (widget) {
+		QString qt_title = QString::fromUtf8(str_title.c_str());
+		QMetaObject::invokeMethod(widget, "titleChanged",
+				Q_ARG(QString, qt_title));
+	}
+}
+
+/* CefLifeSpanHandler */
+bool QCefBrowserClient::OnBeforePopup(
+		CefRefPtr<CefBrowser>,
+		CefRefPtr<CefFrame>,
+		const CefString &target_url,
+		const CefString &,
+		WindowOpenDisposition,
+		bool,
+		const CefPopupFeatures &,
+		CefWindowInfo &,
+		CefRefPtr<CefClient> &,
+		CefBrowserSettings &,
+		bool *)
+{
+	/* Open popup URLs in user's actual browser */
+	std::string str_url = target_url;
+	QUrl url = QUrl(str_url.c_str(), QUrl::TolerantMode);
+	QDesktopServices::openUrl(url);
+	return true;
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/panel/browser-panel-client.hpp Added

@@ -0,0 +1,44 @@
+#pragma once
+
+#include "cef-headers.hpp"
+#include "browser-panel-internal.hpp"
+
+class QCefBrowserClient : public CefClient,
+                          public CefDisplayHandler,
+                          public CefLifeSpanHandler,
+                          public CefLoadHandler {
+
+public:
+	inline QCefBrowserClient(QCefWidgetInternal *widget_)
+		: widget(widget_)
+	{
+	}
+
+	/* CefClient */
+	virtual CefRefPtr<CefLoadHandler> GetLoadHandler() override;
+	virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
+	virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override;
+
+	/* CefDisplayHandler */
+	virtual void OnTitleChange(
+			CefRefPtr<CefBrowser> browser,
+			const CefString &title) override;
+
+	/* CefLifeSpanHandler */
+	virtual bool OnBeforePopup(
+			CefRefPtr<CefBrowser> browser,
+			CefRefPtr<CefFrame> frame,
+			const CefString &target_url,
+			const CefString &target_frame_name,
+			WindowOpenDisposition target_disposition,
+			bool user_gesture,
+			const CefPopupFeatures &popupFeatures,
+			CefWindowInfo &windowInfo,
+			CefRefPtr<CefClient> &client,
+			CefBrowserSettings &settings,
+			bool *no_javascript_access) override;
+
+	QCefWidgetInternal *widget = nullptr;
+
+	IMPLEMENT_REFCOUNTING(QCefBrowserClient);
+};

obs-studio-22.0.1.tar.xz/plugins/obs-browser/panel/browser-panel-internal.hpp Added

obs-studio-22.0.1.tar.xz/plugins/obs-browser/panel/browser-panel.cpp Added

@@ -0,0 +1,140 @@
+#include "browser-panel-internal.hpp"
+#include "browser-panel-client.hpp"
+#include "cef-headers.hpp"
+
+#include <QWindow>
+
+#include <util/threading.h>
+#include <util/base.h>
+#include <thread>
+
+extern bool QueueCEFTask(std::function<void()> task);
+extern "C" void obs_browser_initialize(void);
+
+static void ExecuteOnBrowser(std::function<void()> func, bool async = false)
+{
+	if (!async) {
+		os_event_t *finishedEvent;
+		os_event_init(&finishedEvent, OS_EVENT_TYPE_AUTO);
+		bool success = QueueCEFTask([&] () {
+			func();
+			os_event_signal(finishedEvent);
+		});
+		if (success)
+			os_event_wait(finishedEvent);
+		os_event_destroy(finishedEvent);
+	} else {
+		QueueCEFTask(func);
+	}
+}
+
+QCefWidgetInternal::QCefWidgetInternal(QWidget *parent, const std::string &url_)
+	: QCefWidget (parent),
+	  url        (url_)
+{
+	setAttribute(Qt::WA_PaintOnScreen);
+	setAttribute(Qt::WA_StaticContents);
+	setAttribute(Qt::WA_NoSystemBackground);
+	setAttribute(Qt::WA_OpaquePaintEvent);
+	setAttribute(Qt::WA_DontCreateNativeAncestors);
+	setAttribute(Qt::WA_NativeWindow);
+
+	setFocusPolicy(Qt::ClickFocus);
+}
+
+QCefWidgetInternal::~QCefWidgetInternal()
+{
+	ExecuteOnBrowser([this] ()
+	{
+		if (!cefBrowser) {
+			return;
+		}
+		CefRefPtr<CefClient> client =
+				cefBrowser->GetHost()->GetClient();
+		QCefBrowserClient *bc =
+				reinterpret_cast<QCefBrowserClient*>(
+					client.get());
+
+		bc->widget = nullptr;
+		cefBrowser = nullptr;
+	});
+}
+
+void QCefWidgetInternal::Init()
+{
+	QSize size = this->size() * devicePixelRatio();
+	WId id = winId();
+
+	bool success = QueueCEFTask([this, size, id] ()
+	{
+		CefWindowInfo windowInfo;
+#ifdef _WIN32
+		RECT rc = {0, 0, size.width(), size.height()};
+		windowInfo.SetAsChild((HWND)id, rc);
+#endif
+
+		CefRefPtr<QCefBrowserClient> browserClient =
+			new QCefBrowserClient(this);
+
+		CefBrowserSettings cefBrowserSettings;
+		cefBrowser = CefBrowserHost::CreateBrowserSync(
+				windowInfo,
+				browserClient,
+				url,
+				cefBrowserSettings,
+				nullptr);
+	});
+
+	if (success)
+		timer.stop();
+}
+
+void QCefWidgetInternal::resizeEvent(QResizeEvent *event)
+{
+	QWidget::resizeEvent(event);
+
+	QSize size = this->size() * devicePixelRatio();
+
+	QueueCEFTask([this, size] ()
+	{
+		if (!cefBrowser)
+			return;
+#ifdef _WIN32
+		HWND hwnd = cefBrowser->GetHost()->GetWindowHandle();
+		SetWindowPos(hwnd, nullptr, 0, 0, size.width(), size.height(),
+				SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER);
+#endif
+	});
+}
+
+void QCefWidgetInternal::showEvent(QShowEvent *event)
+{
+	QWidget::showEvent(event);
+
+	if (!cefBrowser) {
+		obs_browser_initialize();
+		connect(&timer, SIGNAL(timeout()), this, SLOT(Init()));
+		timer.start(500);
+		Init();
+	}
+}
+
+QPaintEngine *QCefWidgetInternal::paintEngine() const
+{
+	return nullptr;
+}
+
+void QCefWidgetInternal::setURL(const std::string &url)
+{
+	if (cefBrowser) {
+		cefBrowser->GetMainFrame()->LoadURL(url);
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+
+extern "C" EXPORT QCefWidget *obs_browser_create_widget(QWidget *parent,
+		const std::string &url)
+{
+	return new QCefWidgetInternal(parent, url);
+}

obs-studio-22.0.1.tar.xz/plugins/obs-browser/panel/browser-panel.hpp Added

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/da-DK.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/da-DK.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/es-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/es-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/eu-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/eu-ES.ini Changed

obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/gd-GB.ini Added

@@ -0,0 +1,49 @@
+FFmpegOutput="Às-chur FFmpeg"
+FFmpegAAC="Inneal-còdachaidh AAC tùsail airson FFmpeg"
+FFmpegOpus="Inneal-còdachaidh Opus airson FFmpeg"
+Bitrate="Reat bhiotaichean"
+Preset="Ro-sheata"
+RateControl="Smachd air an reat"
+KeyframeIntervalSec="Eadaramh nam frèamaichean-iuchrach (diog, fèin-obrachail)"
+Lossless="Gun chall càileachd"
+
+BFrames="Frèamaichean-B"
+
+NVENC.Use2Pass="Cleachd còdachadh dà phas"
+NVENC.Preset.default="Bun-roghainn"
+NVENC.Preset.hq="Càileachd àrd"
+NVENC.Preset.hp="Dèanadas àrd"
+NVENC.Preset.bd="Bluray"
+NVENC.Preset.ll="Foillidheachd ìosal"
+NVENC.Preset.llhq="Foillidheachd ìosal ⁊ càileachd àrd"
+NVENC.Preset.llhp="Foillidheachd ìosal ⁊ dèanadas àrd"
+NVENC.Level="Leibheil"
+
+FFmpegSource="Tùs a’ mheadhain"
+LocalFile="Faidhle ionadail"
+Looping="Lùb"
+Input="Ion-chur"
+InputFormat="Fòrmat an ion-chuir"
+BufferingMB="Bufair an lìonraidh (MB)"
+HardwareDecode="Cleachd dì-chòdachadh bathair-chruaidh ma bhios e ri fhaighinn"
+ClearOnMediaEnd="Falaich an tùs nuair a bhios a’ chluiche deiseil"
+Advanced="Adhartach"
+RestartWhenActivated="Ath-thòisich a’ chluiche nuair a thig gnìomh on tùs"
+CloseFileWhenInactive="Dùin am faidhle mur eil gnìomh ann"
+ColorRange="Rainse dhathan YUV"
+ColorRange.Auto="Fèin-obrachail"
+ColorRange.Partial="Leth-phàirteach"
+ColorRange.Full="Làn"
+RestartMedia="Ath-thòisich am meadhan"
+SpeedPercentage="Luaths (sa cheud)"
+Seekable="Gabhaidh sireadh ann"
+
+MediaFileFilter.AllMediaFiles="A h-uile faidhle meadhain"
+MediaFileFilter.VideoFiles="Faidhlichean video"
+MediaFileFilter.AudioFiles="Faidhlichean fuaime"
+MediaFileFilter.AllFiles="A h-uile faidhle"
+
+ReplayBuffer="Bufair na h-ath-chluiche"
+ReplayBuffer.Save="Sàbhail an ath-chluiche"
+
+

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini Changed

obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/ka-GE.ini Added

@@ -0,0 +1,52 @@
+FFmpegOutput="FFmpeg გამომავალი სიგნალი"
+FFmpegAAC="FFmpeg ნაგულისხმევი AAC დამშიფრავი"
+FFmpegOpus="FFmpeg Opus დამშიფრავი"
+Bitrate="ბიტური სიხშირე"
+Preset="მზა პარამეტრები"
+RateControl="სიხშირის მართვა"
+KeyframeIntervalSec="საკვანძო კადრებს შორის შუალედი (წამი, 0=თვითშერჩევა)"
+Lossless="უდანაკარგო"
+
+BFrames="B-კადრები"
+
+NVENC.Use2Pass="ორმაგი დაშიფვრის გამოყენება"
+NVENC.Preset.default="ნაგულისხმევი"
+NVENC.Preset.hq="მაღალი ხარისხი"
+NVENC.Preset.hp="მაღალი წარმადობა"
+NVENC.Preset.bd="Bluray"
+NVENC.Preset.ll="მცირე დაყოვნება"
+NVENC.Preset.llhq="მცირე დაყოვნება, მაღალი ხარისხი"
+NVENC.Preset.llhp="მცირე დაყოვნება, მაღალი წარმადობა"
+NVENC.Level="საფეხური"
+
+FFmpegSource="მასალის წყარო"
+LocalFile="ადგილობრივი ფაილი"
+Looping="დაუსრულებლად გამეორება"
+Input="შეტანა"
+InputFormat="შეტანის ფორმატი"
+BufferingMB="ქსელის ბუფერიზაცია (მბაიტი)"
+HardwareDecode="აპარატურული დაშიფვრის გამოყენება, ხელმისაწვდომობის შემთხვევაში"
+ClearOnMediaEnd="წყაროს დამალვა, გაშვების დამთავრებისას"
+Advanced="გაფართოებული"
+RestartWhenActivated="ხელახლა გაშვება წყაროს ამოქმედებისას"
+CloseFileWhenInactive="ფაილის დახურვა უმოქმედობისას"
+CloseFileWhenInactive.ToolTip="ფაილი დაიხურება, თუ წყარო არ იქნება ეთერში ან\nჩაწერაზე გაშვებული.  ეს საშუალებას იძლევა შეიცვალოს ფაილი, როცა წყარო არაა მოქმედი,\nთუმცა ხელახლა ამოქმედებისას, შესაძლოა გარკვეული დროით დაყოვნებას ჰქონდეს ადგილი."
+ColorRange="YUV ფერთა გამა"
+ColorRange.Auto="ავტომატური"
+ColorRange.Partial="ნაწილობრივი"
+ColorRange.Full="სრული"
+RestartMedia="მასალის ხელახლა გაშვება"
+SpeedPercentage="სიჩქარე (პროცენტი)"
+Seekable="გადახვევით"
+
+MediaFileFilter.AllMediaFiles="ყველა მასალა"
+MediaFileFilter.VideoFiles="ვიდეოფაილები"
+MediaFileFilter.AudioFiles="ხმოვანი ფაილები"
+MediaFileFilter.AllFiles="ყველა ფაილი"
+
+ReplayBuffer="გადახვევა"
+ReplayBuffer.Save="გადახვევის შენახვა"
+
+HelperProcessFailed="ჩაწერის პროცესის გაშვება ვერ ხერხდება. გადაამოწმეთ, ხომ არ არის OBS ფაილები შეზღუდული ან წაშლილი ანტივირუსის / უსაფრთხოების სხვა პროგრამების მიერ."
+UnableToWritePath="%1-ში ჩაწერა ვერ ხერხდება. დარწმუნდით, რომ ჩაწერისთვის ისეთი მისამართი გაქვთ მითითებული, სადაც ჩაწერის ნებართვაც გააჩნია თქვენს ანგარიშს და ამასთან, არის საკმარისი ადგილი დისკზე."
+

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/data/locale/nb-NO.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/nb-NO.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c -> obs-studio-22.0.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-filters/color-correction-filter.c -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/color-correction-filter.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-filters/compressor-filter.c -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/compressor-filter.c Changed

@@ -40,12 +40,12 @@
 #define TEXT_OUTPUT_GAIN                MT_("Compressor.OutputGain")
 #define TEXT_SIDECHAIN_SOURCE           MT_("Compressor.SidechainSource")
 
-#define MIN_RATIO                       1.0f
-#define MAX_RATIO                       32.0f
-#define MIN_THRESHOLD_DB                -60.0f
+#define MIN_RATIO                       1.0
+#define MAX_RATIO                       32.0
+#define MIN_THRESHOLD_DB                -60.0
 #define MAX_THRESHOLD_DB                0.0f
-#define MIN_OUTPUT_GAIN_DB              -32.0f
-#define MAX_OUTPUT_GAIN_DB              32.0f
+#define MIN_OUTPUT_GAIN_DB              -32.0
+#define MAX_OUTPUT_GAIN_DB              32.0
 #define MIN_ATK_RLS_MS                  1
 #define MAX_RLS_MS                      1000
 #define MAX_ATK_MS                      500
@@ -442,6 +442,9 @@
 	struct compressor_data *cd = data;
 
 	const uint32_t num_samples = audio->frames;
+	if (num_samples == 0)
+		return audio;
+
 	float **samples = (float**)audio->data;
 
 	pthread_mutex_lock(&cd->sidechain_update_mutex);
@@ -497,15 +500,15 @@
 		parent = obs_filter_get_parent(cd->context);
 
 	obs_properties_add_float_slider(props, S_RATIO,
-		TEXT_RATIO, MIN_RATIO, MAX_RATIO, 0.5f);
+		TEXT_RATIO, MIN_RATIO, MAX_RATIO, 0.5);
 	obs_properties_add_float_slider(props, S_THRESHOLD,
-		TEXT_THRESHOLD, MIN_THRESHOLD_DB, MAX_THRESHOLD_DB, 0.1f);
+		TEXT_THRESHOLD, MIN_THRESHOLD_DB, MAX_THRESHOLD_DB, 0.1);
 	obs_properties_add_int_slider(props, S_ATTACK_TIME,
 		TEXT_ATTACK_TIME, MIN_ATK_RLS_MS, MAX_ATK_MS, 1);
 	obs_properties_add_int_slider(props, S_RELEASE_TIME,
 		TEXT_RELEASE_TIME, MIN_ATK_RLS_MS, MAX_RLS_MS, 1);
 	obs_properties_add_float_slider(props, S_OUTPUT_GAIN,
-		TEXT_OUTPUT_GAIN, MIN_OUTPUT_GAIN_DB, MAX_OUTPUT_GAIN_DB, 0.1f);
+		TEXT_OUTPUT_GAIN, MIN_OUTPUT_GAIN_DB, MAX_OUTPUT_GAIN_DB, 0.1);
 
 	obs_property_t *sources = obs_properties_add_list(props,
 			S_SIDECHAIN_SOURCE, TEXT_SIDECHAIN_SOURCE,

obs-studio-21.1.2.tar.xz/plugins/obs-filters/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/data/locale/el-GR.ini Changed

@@ -1,15 +1,25 @@
 ColorFilter="Διόρθωση Χρώματος"
 ColorGradeFilter="Εφαρμογή LUT"
+MaskFilter="Μάσκα εικόνα/μείγμα"
 AsyncDelayFilter="Καθυστέρηση Βίντεο (Ασύγχρονη)"
+CropFilter="Αποκοπή/Pad"
 ScrollFilter="Κύλιση"
 ChromaKeyFilter="Κλειδί Chroma"
 ColorKeyFilter="Κλειδί Χρώματος"
 SharpnessFilter="Όξυνση"
+ScaleFilter="Κλιμάκωση/αναλογίες"
+GPUDelayFilter="Καταστήσει καθυστέρηση"
+UndistortCenter="Undistort κέντρο της εικόνας κατά την κλιμάκωση από ultrawide"
+NoiseGate="Πύλη θορύβου"
+NoiseSuppress="Καταστολή θορύβου"
 Gain="Απολαβή"
 DelayMs="Καθυστέρηση (χιλιοστά του δευτερολέπτου)"
 Type="Τύπος"
 MaskBlendType.MaskColor="Μάσκα Άλφα (Κανάλι Χρώματος)"
 MaskBlendType.MaskAlpha="Μάσκα Άλφα (Κανάλι Άλφα)"
+MaskBlendType.BlendMultiply="Ανάμιξη (πολλαπλασιάζονται)"
+MaskBlendType.BlendAddition="Μείγμα (Προσθήκη)"
+MaskBlendType.BlendSubtraction="Μείγμα (αφαίρεση)"
 Path="Διαδρομή"
 Color="Χρώμα"
 Opacity="Αδιαφάνεια"
@@ -18,8 +28,11 @@
 Gamma="Γάμμα"
 BrowsePath.Images="Όλα τα αρχεία εικόνας"
 BrowsePath.AllFiles="Όλα τα αρχεία"
+KeyColorType="Βασικό χρώμα τύπου"
+KeyColor="Βασικό χρώμα"
 Similarity="Ομοιότητα (1-1000)"
 Smoothness="Ομαλότητα (1-1000)"
+ColorSpillReduction="Βασικό χρώμα πετρελαιοκηλίδα μείωση (1-1000)"
 Crop.Left="Αριστερά"
 Crop.Right="Δεξιά"
 Crop.Top="Πάνω"
@@ -36,15 +49,29 @@
 Green="Πράσινο"
 Blue="Μπλε"
 Magenta="Ματζέντα"
+NoiseGate.OpenThreshold="Ανοικτό όριο (dB)"
+NoiseGate.CloseThreshold="Κλείστό όριο (dB)"
 NoiseGate.AttackTime="Χρόνος προσβολής (msec)"
 NoiseGate.HoldTime="Χρόνος αναμονής (msec)"
 NoiseGate.ReleaseTime="Χρόνος διάχυσης (msec)"
 Gain.GainDB="Απολαβή (dB)"
+StretchImage="Τέντωση εικόνας (απόρριψη αναλογίας εικόνας)"
 Resolution="Ανάλυση"
 None="Καμία"
+ScaleFiltering="Κλίμακα φιλτραρίσματος"
+ScaleFiltering.Point="Σημείο"
+ScaleFiltering.Bilinear="Διγραμμικές"
+ScaleFiltering.Bicubic="Δικυβική"
+ScaleFiltering.Lanczos="Lanczos"
+NoiseSuppress.SuppressLevel="Καταστολή επιπέδου (dB)"
 Saturation="Κορεσμός"
 HueShift="Μετατόπιση Απόχρωσης"
 Amount="Ποσό"
+Compressor="Συμπιεστής"
 Compressor.Ratio="Αναλογία (X:1)"
 Compressor.Threshold="Κατώφλι (dB)"
+Compressor.AttackTime="Επίθεση (ms)"
+Compressor.ReleaseTime="Απελευθέρωση (ms)"
+Compressor.OutputGain="Εξόδου κέρδος (dB)"
+Compressor.SidechainSource="Πηγή sidechain/βουτιά"

obs-studio-22.0.1.tar.xz/plugins/obs-filters/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/obs-filters/data/locale/ka-GE.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/data/locale/ka-GE.ini Changed

@@ -1,4 +1,77 @@
+ColorFilter="ფერთა გასწორება"
+ColorGradeFilter="LUT-ის ასახვა"
+MaskFilter="სურათის ნიღაბი/შერევა"
+AsyncDelayFilter="ვიდეოს დაყოვნება (ასინქრონული)"
+CropFilter="შემოჭრა/არეები"
+ScrollFilter="გადაადგილება"
+ChromaKeyFilter="ფონის ჩანაცვლება (Chroma Key)"
+ColorKeyFilter="ფერის ჩანაცვლება (Color Key)"
+SharpnessFilter="სიმკვეთრის მომატება"
+ScaleFilter="ზომების ცვლილება/გვერდების თანაფარდობა"
+GPUDelayFilter="დაყოვნება დამუშავებისას"
+UndistortCenter="ზეფართო სურათის შუაგულის გამრუდების არიდება, ზომების შეცვლისას"
+NoiseGate="ხმაურის შეზღუდვა"
+NoiseSuppress="ხმაურის დახშობა"
+Gain="სიგნალის გაძლიერება"
+DelayMs="დაყოვნება (მილიწამი)"
+Type="სახეობა"
+MaskBlendType.MaskColor="ალფა-ნიღაბი (ფერის არხი)"
+MaskBlendType.MaskAlpha="ალფა-ნიღაბი (გამჭვირვალობის არხი)"
+MaskBlendType.BlendMultiply="შერევა (გამრავლება)"
+MaskBlendType.BlendAddition="შერევა (დამატება)"
+MaskBlendType.BlendSubtraction="შერევა (გამოკლება)"
+Path="მისამართი"
+Color="ფერი"
+Opacity="გაუმჭვირვალობა"
+Contrast="კონტრასტი"
+Brightness="სიკაშკაშე"
+Gamma="ფერთა გამა"
+BrowsePath.Images="ყველანაირი სურათი"
+BrowsePath.AllFiles="ყველა ფაილი"
+KeyColorType="საკვანძო ფერის სახე"
+KeyColor="საკვანძო ფერი"
+Similarity="მსგავსება (1-1000)"
+Smoothness="სიგლუვე (1-1000)"
+ColorSpillReduction="საკვანძო ფერთა გაბნევის შემცირება (1-1000)"
+Crop.Left="მარცხენა"
+Crop.Right="მარჯვენა"
+Crop.Top="ზედა"
+Crop.Bottom="ქვედა"
+Crop.Width="სიგანე"
+Crop.Height="სიმაღლე"
+Crop.Relative="თანაფარდობა"
+ScrollFilter.SpeedX="თარაზული სიჩქარე"
+ScrollFilter.SpeedY="შვეული სიჩქარე"
+ScrollFilter.LimitWidth="სიგანის შეზღუდვა"
+ScrollFilter.LimitHeight="სიმაღლის შეზღუდვა"
+CustomColor="მითითებული ფერი"
 Red="წითელი"
 Green="მწვანე"
 Blue="ლურჯი"
+Magenta="მეწამული"
+NoiseGate.OpenThreshold="ქვედა ზღურბლი (dB)"
+NoiseGate.CloseThreshold="ზედა ზღურბლი (dB)"
+NoiseGate.AttackTime="მომატების (Attack) ხანგრძლივობა (მილიწამი)"
+NoiseGate.HoldTime="დაყოვნების (Hold) ხანგრძლივობა (მილიწამი)"
+NoiseGate.ReleaseTime="შემცირების (Release) ხანგრძლივობა (მილიწამი)"
+Gain.GainDB="გაძლიერება (dB)"
+StretchImage="სურათის გაწელვა (გვერდების თანაფარდობის უგულებელყოფა)"
+Resolution="გაფართოება"
+None="არცერთი"
+ScaleFiltering="მასშტაბირების ფილტრი"
+ScaleFiltering.Point="წერტილოვანი"
+ScaleFiltering.Bilinear="ორხაზოვანი"
+ScaleFiltering.Bicubic="ბიკუბური"
+ScaleFiltering.Lanczos="Lanczos"
+NoiseSuppress.SuppressLevel="დახშობის ხარისხი (dB)"
+Saturation="გაჯერებულობა"
+HueShift="შეფერილობის შეცვლა"
+Amount="რაოდენობა"
+Compressor="დამხშობი"
+Compressor.Ratio="ფარდობა (X:1)"
+Compressor.Threshold="ზღურბლი (dB)"
+Compressor.AttackTime="მომატება (მწ)"
+Compressor.ReleaseTime="შემცირება (მწ)"
+Compressor.OutputGain="გამომავალი სიგნალის გაძლიერება (dB)"
+Compressor.SidechainSource="Sidechain/ხმის დონის დადაბლების წყარო"

obs-studio-21.1.2.tar.xz/plugins/obs-filters/data/locale/vi-VN.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/data/locale/vi-VN.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-filters/noise-gate-filter.c -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/noise-gate-filter.c Changed

@@ -41,8 +41,8 @@
 	float held_time;
 };
 
-#define VOL_MIN -96.0f
-#define VOL_MAX 0.0f
+#define VOL_MIN -96.0
+#define VOL_MAX 0.0
 
 static const char *noise_gate_name(void *unused)
 {
@@ -155,8 +155,8 @@
 
 static void noise_gate_defaults(obs_data_t *s)
 {
-	obs_data_set_default_double(s, S_OPEN_THRESHOLD, -26.0f);
-	obs_data_set_default_double(s, S_CLOSE_THRESHOLD, -32.0f);
+	obs_data_set_default_double(s, S_OPEN_THRESHOLD, -26.0);
+	obs_data_set_default_double(s, S_CLOSE_THRESHOLD, -32.0);
 	obs_data_set_default_int   (s, S_ATTACK_TIME, 25);
 	obs_data_set_default_int   (s, S_HOLD_TIME, 200);
 	obs_data_set_default_int   (s, S_RELEASE_TIME, 150);
@@ -167,9 +167,9 @@
 	obs_properties_t *ppts = obs_properties_create();
 
 	obs_properties_add_float_slider(ppts, S_CLOSE_THRESHOLD,
-			TEXT_CLOSE_THRESHOLD, VOL_MIN, VOL_MAX, 1.0f);
+			TEXT_CLOSE_THRESHOLD, VOL_MIN, VOL_MAX, 1.0);
 	obs_properties_add_float_slider(ppts, S_OPEN_THRESHOLD,
-			TEXT_OPEN_THRESHOLD, VOL_MIN, VOL_MAX, 1.0f);
+			TEXT_OPEN_THRESHOLD, VOL_MIN, VOL_MAX, 1.0);
 	obs_properties_add_int(ppts, S_ATTACK_TIME, TEXT_ATTACK_TIME,
 			0, 10000, 1);
 	obs_properties_add_int(ppts, S_HOLD_TIME, TEXT_HOLD_TIME,

obs-studio-21.1.2.tar.xz/plugins/obs-filters/scroll-filter.c -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/scroll-filter.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-filters/sharpness-filter.c -> obs-studio-22.0.1.tar.xz/plugins/obs-filters/sharpness-filter.c Changed

obs-studio-22.0.1.tar.xz/plugins/obs-libfdk/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-libfdk/data/locale/ka-GE.ini Added

obs-studio-21.1.2.tar.xz/plugins/obs-libfdk/data/locale/ur-PK.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-libfdk/data/locale/ur-PK.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/CMakeLists.txt Changed

@@ -1,20 +1,25 @@
 project(obs-outputs)
 
-option(USE_SSL "Enable rtmps support with OpenSSL" OFF)
+set(WITH_RTMPS AUTO CACHE STRING "Enable RTMPS support with mbedTLS")
+set_property(CACHE WITH_RTMPS PROPERTY STRINGS AUTO ON OFF)
 
-if (USE_SSL)
-	find_package(SSL QUIET)
+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)
 endif()
 
-if (SSL_FOUND AND ZLIB_FOUND)
-	add_definitions(-DCRYPTO -DUSE_OPENSSL)
-	include_directories(${SSL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+if (LIBMBEDTLS_FOUND AND ZLIB_FOUND)
+	add_definitions(-DCRYPTO -DUSE_MBEDTLS)
+	include_directories(${LIBMBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
 else()
-	if (USE_SSL)
-		message(WARNING "SSL enabled by user, but OpenSSL was not found")
+	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(SSL_LIBRARIES)
+	unset(LIBMBEDTLS_LIBRARIES)
 	unset(ZLIB_LIBRARIES)
 	add_definitions(-DNO_CRYPTO)
 endif()
@@ -84,6 +89,12 @@
 		ws2_32
 		winmm
 		Iphlpapi)
+
+	if (WITH_RTMPS OR (WITH_RTMPS STREQUAL "AUTO"))
+		SET(obs-outputs_PLATFORM_DEPS
+			${obs-outputs_PLATFORM_DEPS}
+			crypt32)
+	endif()
 endif()
 
 if(MSVC)
@@ -92,6 +103,16 @@
 		w32-pthreads)
 endif()
 
+if(APPLE AND (WITH_RTMPS OR (WITH_RTMPS STREQUAL "AUTO")))
+	find_library(FOUNDATION_FRAMEWORK Foundation)
+	find_library(SECURITY_FRAMEWORK Security)
+
+	set(obs-outputs_PLATFORM_DEPS
+		${obs-outputs_PLATFORM_DEPS}
+		${FOUNDATION_FRAMEWORK}
+		${SECURITY_FRAMEWORK})
+endif()
+
 set(obs-outputs_librtmp_HEADERS
 	librtmp/amf.h
 	librtmp/bytes.h
@@ -133,7 +154,7 @@
 	flv-output.c
 	flv-mux.c
 	net-if.c)
-	
+
 add_library(obs-outputs MODULE
 	${ftl_SOURCES}
 	${ftl_HEADERS}
@@ -143,7 +164,7 @@
 	${obs-outputs_librtmp_HEADERS})
 target_link_libraries(obs-outputs
 	libobs
-	${SSL_LIBRARIES}
+	${LIBMBEDTLS_LIBRARIES}
 	${ZLIB_LIBRARIES}
 	${ftl_IMPORTS}
 	${obs-outputs_PLATFORM_DEPS})

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/ar-SA.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/ar-SA.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/ca-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/ca-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/cs-CZ.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/cs-CZ.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/da-DK.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/da-DK.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/de-DE.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/de-DE.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/el-GR.ini Changed

@@ -4,4 +4,11 @@
 FLVOutput.FilePath="Διαδρομή Αρχείου"
 Default="Προεπιλογή"
 
+ConnectionTimedOut="Εξαντλήθηκε το χρονικό όριο της σύνδεσης. Βεβαιωθείτε ότι έχετε ρυθμίσει μια έγκυρη υπηρεσία συνεχούς ροής και το τείχος προστασίας δεν εμποδίζει τη σύνδεση."
+PermissionDenied="Αποκλείστηκε η σύνδεση. Ελέγξτε το τείχος προστασίας / ρυθμίσεις προστασίας από ιούς για να βεβαιωθείτε οτι στο OBS επιτρέπεται να έχει πλήρης πρόσβαση στο διαδίκτυο."
+ConnectionAborted="Η σύνδεση ματαιώθηκε. Αυτό συνήθως υποδεικνύει προβλήματα σύνδεσης στο διαδίκτυο ανάμεσα σε εσάς και την υπηρεσία συνεχούς ροής."
+ConnectionReset="Η σύνδεση ήταν επαναφέρθηκε στον ομότιμο υπολογιστή. Αυτό συνήθως υποδεικνύει προβλήματα σύνδεσης στο διαδίκτυο ανάμεσα σε εσάς και την υπηρεσία συνεχούς ροής."
+HostNotFound="Το όνομα του κεντρικού υπολογιστή δεν βρέθηκε. Βεβαιωθείτε ότι πληκτρολογήσατε έναν έγκυρο διακομιστή συνεχούς ροής και η σύνδεση στο διαδίκτυο / DNS λειτουργεί σωστά."
+NoData="Το όνομα του κεντρικού υπολογιστή βρέθηκε, αλλά χωρίς δεδομένα του ζητούμενου τύπου. Αυτό μπορεί να συμβεί αν έχετε δεσμεύσει μια διεύθυνση IPv6 και για την υπηρεσία συνεχούς ροής μόνο διευθύνσεις IPv4 (ανατρέξτε στην ενότητα ρυθμίσεις)."
+AddressNotAvailable="Η διεύθυνση δεν είναι διαθέσιμη. Μπορεί να έχετε δοκιμάσει να συνδεθείτε σε μια άκυρη διεύθυνση IP (βλ. ρυθμίσεις)."

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/en-US.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/en-US.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/es-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/es-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/eu-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/eu-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/fi-FI.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/fi-FI.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/fr-FR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/fr-FR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/hu-HU.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/hu-HU.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/ja-JP.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/ja-JP.ini Changed

obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/ka-GE.ini Added

@@ -0,0 +1,15 @@
+RTMPStream="RTMP ნაკადი"
+RTMPStream.DropThreshold="ქვედა ზღურბლი (მილიწამი)"
+FLVOutput="გამომავალი FLV ფაილი"
+FLVOutput.FilePath="ფაილის მისამართი"
+Default="ნაგულისხმევი"
+
+ConnectionTimedOut="კავშირის ვადა ამოიწურა. გადაამოწმეთ, სწორად გაქვთ თუ არა გამართული ნაკადის გაშვების მომსახურება და ქსელის ფარი ხომ არ ზღუდავს კავშირს."
+PermissionDenied="კავშირი შეიზღუდა. გადაამოწმეთ ქსელის ფარის ან ანტივირუსული პროგრამის პარამეტრები და დარწმუნდით, რომ OBS-ს აქვს სრული დაშვება ინტერნეტთან."
+ConnectionAborted="კავშირი გაუქმდა. ძირითადად, ეს მიუთითებს ინტერნეტკავშირის ხარვეზების არსებობას, თქვენსა და ნაკადის გაშვების მომსახურების მომწოდებელს შორის."
+ConnectionReset="კავშირი გაწყდა ერთ-ერთი მხარის მიერ. ძირითადად, ეს მიუთითებს ინტერნეტკავშირის ხარვეზების არსებობას, თქვენსა და ნაკადის გაშვების მომსახურების მომწოდებელს შორის."
+HostNotFound="დაკავშირების წერტილი ვერ მოიძებნა. დარწმუნდით, რომ სწორად უთითებთ ნაკადის გაშვების მომსახურების მონაცემებს და თქვენი DNS / ინტერნეტკავშირის პარამეტრებიც სწორადაა გამართული."
+NoData="დაკავშირების წერტილი მოიძებნა, მაგრამ მოთხოვნილი სახის მონაცემები არა. ეს შეიძლება გამოწვეული იყოს იმით, რომ თქვენ უკავშირდებით IPv6 მისამართზე, ხოლო თქვენს ნაკადის გაშვების მომსახურებას, მხოლოდ IPv4 მისამართები გააჩნია (იხილეთ  პარამეტრები / დამატებითი)."
+AddressNotAvailable="მისამართი მიუწვდომელია. შესაძლოა, თქვენ ცდილობთ მცდარ IP მისამართზე დაკავშირებას (იხილეთ  პარამეტრები / დამატებითი)."
+SSLCertVerifyFailed="RTMP სერვერმა გაგზავნა არამართებული SSL სერტიფიკატი."
+

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/ko-KR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/ko-KR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/nb-NO.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/nb-NO.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/nl-NL.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/nl-NL.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/pl-PL.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/pl-PL.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/pt-BR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/pt-BR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/ru-RU.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/ru-RU.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/sv-SE.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/sv-SE.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/tr-TR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/tr-TR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/uk-UA.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/uk-UA.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/zh-CN.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/zh-CN.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/data/locale/zh-TW.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/data/locale/zh-TW.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/flv-mux.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/flv-mux.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/CMakeLists.txt -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/CMakeLists.txt Changed

@@ -3,7 +3,13 @@
 project(libftl)
 
 option(DISABLE_AUTO_INGEST "Set to TRUE to disable auto ingest feature which removes curl and jansson dependancies" FALSE)
-MESSAGE( STATUS "FTL DISABLE_AUTO_INGEST: " ${DISABLE_AUTO_INGEST})
+MESSAGE(STATUS "FTL DISABLE_AUTO_INGEST: " ${DISABLE_AUTO_INGEST})
+
+option(DISABLE_FTL_APP "Set to TRUE to disable including the ftl app in the cmake output." FALSE)
+MESSAGE(STATUS "FTL DISABLE_FTL_APP: " ${DISABLE_FTL_APP})
+
+option(FTL_STATIC_COMPILE "Set to TRUE if you want ftl to be compiled as a static lib. If TRUE, the program will want to statically link to the ftl cmake object." FALSE)
+MESSAGE(STATUS "FTL FTL_STATIC_COMPILE: " ${FTL_STATIC_COMPILE})
 
 find_package(Threads REQUIRED)
 
@@ -64,7 +70,15 @@
   include_directories(libftl/posix)
 endif()
 
-add_library(ftl SHARED libftl/hmac/hmac.c
+# Figure out what kind of lib we should be producing.
+if(FTL_STATIC_COMPILE)
+  set(FTL_LIB_TYPE STATIC)
+  add_definitions(-DFTL_STATIC_COMPILE=1)
+else(FTL_STATIC_COMPILE)
+  set(FTL_LIB_TYPE SHARED)
+endif(FTL_STATIC_COMPILE)
+
+add_library(ftl ${FTL_LIB_TYPE} libftl/hmac/hmac.c
                        libftl/hmac/hmac.h
                        libftl/hmac/sha2.c
                        libftl/hmac/sha2.h
@@ -90,28 +104,30 @@
   target_link_libraries(ftl ws2_32)
 endif()
 
-add_executable(ftl_app
-               ftl_app/main.c
-               ftl_app/main.h
-               ftl_app/file_parser.c
-               ftl_app/file_parser.h			   
-               ftl_app/gettimeofday.c
-               ftl_app/gettimeofday.h
-               ftl_app/bitstream.c
-               ftl_app/bitstream.h
-               ftl_app/cavlc.c
-               ftl_app/cavlc.h
-               ftl_app/decode.c
-               ftl_app/decode.h
-               ftl_app/nalu.c
-               ftl_app/nalu.h
-               ftl_app/utils.c
-               ftl_app/utils.h
-               ftl_app/dec_obj.h
-               ${FTL_PLATFORM_FILES})
-
-target_link_libraries(ftl_app ftl ${CURL_LIBRARIES} ${JANSSON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${FTL_PLATFORM_LIBS})
-target_include_directories(ftl_app PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ftl_app)
+if (NOT DISABLE_FTL_APP)
+  add_executable(ftl_app
+                ftl_app/main.c
+                ftl_app/main.h
+                ftl_app/file_parser.c
+                ftl_app/file_parser.h
+                ftl_app/gettimeofday.c
+                ftl_app/gettimeofday.h
+                ftl_app/bitstream.c
+                ftl_app/bitstream.h
+                ftl_app/cavlc.c
+                ftl_app/cavlc.h
+                ftl_app/decode.c
+                ftl_app/decode.h
+                ftl_app/nalu.c
+                ftl_app/nalu.h
+                ftl_app/utils.c
+                ftl_app/utils.h
+                ftl_app/dec_obj.h
+                ${FTL_PLATFORM_FILES})
+
+  target_link_libraries(ftl_app ftl ${CURL_LIBRARIES} ${JANSSON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${FTL_PLATFORM_LIBS})
+  target_include_directories(ftl_app PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ftl_app)
+endif()
 
 # Install rules
 install(TARGETS ftl DESTINATION lib)
\ No newline at end of file

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/ftl-sdk.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/ftl-sdk.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/ftl.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/ftl.h Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/handshake.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/handshake.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/ingest.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/ingest.c Changed

@@ -92,6 +92,115 @@
     return 0;
 }
 
+ftl_status_t ftl_find_closest_available_ingest(const char* ingestHosts[], int ingestsCount, char* bestIngestHostComputed)
+{
+    if (ingestHosts == NULL || ingestsCount <= 0) {
+      return FTL_UNKNOWN_ERROR_CODE;
+    }
+
+    ftl_ingest_t* ingestElements = NULL;
+    OS_THREAD_HANDLE *handles = NULL;
+    _tmp_ingest_thread_data_t *data = NULL;
+    
+    int i;
+
+    ftl_status_t ret_status = FTL_SUCCESS;
+    do {
+        if ((ingestElements = calloc(ingestsCount, sizeof(ftl_ingest_t))) == NULL) {
+            ret_status = FTL_MALLOC_FAILURE;
+            break;
+        }
+
+        for (i = 0; i < ingestsCount; i++) {
+            size_t host_len = strlen(ingestHosts[i]) + 1;
+            if ((ingestElements[i].hostname = malloc(host_len)) == NULL) {
+                ret_status = FTL_MALLOC_FAILURE;
+                break;
+            }
+            strcpy_s(ingestElements[i].hostname, host_len, ingestHosts[i]);
+            ingestElements[i].rtt = 1000;
+            ingestElements[i].next = NULL;
+        }
+        if (ret_status != FTL_SUCCESS) {
+            break;
+        }
+
+        if ((handles = (OS_THREAD_HANDLE *)malloc(sizeof(OS_THREAD_HANDLE) * ingestsCount)) == NULL) {
+            ret_status = FTL_MALLOC_FAILURE;
+            break;
+        }
+
+        if ((data = (_tmp_ingest_thread_data_t *)malloc(sizeof(_tmp_ingest_thread_data_t) * ingestsCount)) == NULL) {
+            ret_status = FTL_MALLOC_FAILURE;
+            break;
+        }
+    } while (0);
+
+    // malloc failed, cleanup
+    if (ret_status != FTL_SUCCESS) {
+        if (ingestElements != NULL) {
+            for (i = 0; i < ingestsCount; i++) {
+              free(ingestElements[i].hostname);
+            }
+        }
+        free(ingestElements);
+        free(handles);
+        free(data);
+        return ret_status;
+    }
+
+    ftl_ingest_t *best = NULL;
+    struct timeval start, stop, delta;
+    gettimeofday(&start, NULL);
+
+    /*query all the ingests about cpu and rtt*/
+    for (i = 0; i < ingestsCount; i++) {
+        handles[i] = 0;
+        data[i].ingest = &ingestElements[i];
+        data[i].ftl = NULL;
+        os_create_thread(&handles[i], NULL, _ingest_get_rtt, &data[i]);
+        sleep_ms(5); //space out the pings
+    }
+
+    /*wait for all the ingests to complete*/
+    for (i = 0; i < ingestsCount; i++) {
+
+        if (handles[i] != 0) {
+            os_wait_thread(handles[i]);
+        }
+
+        if (best == NULL || ingestElements[i].rtt < best->rtt) {
+            best = &ingestElements[i];
+        }
+    }
+
+    gettimeofday(&stop, NULL);
+    timeval_subtract(&delta, &stop, &start);
+    int ms = (int)timeval_to_ms(&delta);
+
+    for (i = 0; i < ingestsCount; i++) {
+        if (handles[i] != 0) {
+            os_destroy_thread(handles[i]);
+        }
+    }
+
+    free(handles);
+    free(data);
+
+    if (best) {
+        strcpy_s(bestIngestHostComputed, strlen(best->hostname), best->hostname);
+    } else {
+        ret_status = FTL_UNKNOWN_ERROR_CODE;
+    }
+
+    for (i = 0; i < ingestsCount; i++) {
+        free(ingestElements[i].hostname);
+    }
+    free(ingestElements);
+
+    return ret_status;
+}
+
 #ifndef DISABLE_AUTO_INGEST
 OS_THREAD_ROUTINE _ingest_get_hosts(ftl_stream_configuration_private_t *ftl);

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/media.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/media.c Changed

@@ -162,12 +162,12 @@
       break;
     }
 
-    if (os_semaphore_create(&ftl->video.media_component.pkt_ready, "/VideoPkt", O_CREAT, 0, FALSE) < 0) {
+    if (os_semaphore_create(&ftl->video.media_component.pkt_ready, "/VideoPkt", O_CREAT, 0) < 0) {
       status = FTL_MALLOC_FAILURE;
       break;
     }
 
-    if (os_semaphore_create(&ftl->audio.media_component.pkt_ready, "/AudioPkt", O_CREAT, 0, FALSE) < 0) {
+    if (os_semaphore_create(&ftl->audio.media_component.pkt_ready, "/AudioPkt", O_CREAT, 0) < 0) {
         status = FTL_MALLOC_FAILURE;
         break;
     }
@@ -190,7 +190,7 @@
         break;
     }
 
-    if (os_semaphore_create(&media->ping_thread_shutdown, "/PingThreadShutdown", O_CREAT, 0, FALSE) < 0) {
+    if (os_semaphore_create(&media->ping_thread_shutdown, "/PingThreadShutdown", O_CREAT, 0) < 0) {
       status = FTL_MALLOC_FAILURE;
       break;
     }
@@ -1539,12 +1539,10 @@
 BOOL is_bitrate_reduction_required(
   const float nacks_to_frames_ratio,
   const float avg_rtt,
-  const uint64_t avg_frames_dropped_per_second,
   const float queue_fullness)
 {
   // TODO : Improve estimation of rtt stability.
   if (nacks_to_frames_ratio > MIN_NACKS_RECEIVED_TO_PACKETS_SENT_RATIO_FOR_BITRATE_DOWNGRADE
-    || avg_frames_dropped_per_second > 3
     || avg_rtt > MIN_AVG_RTT_TO_DEEM_BW_CONSTRAINED
     || queue_fullness > MIN_QUEUE_FULLNESS_TO_DEEM_BW_CONSTRAINED
     )
@@ -1630,7 +1628,7 @@
     thread_params->min_encoding_bitrate = min_encoding_bitrate;
     thread_params->context = context;
 
-    if (os_semaphore_create(&ftl->bitrate_thread_shutdown, "/BitrateThreadShutdown", O_CREAT, 0, FALSE) < 0)
+    if (os_semaphore_create(&ftl->bitrate_thread_shutdown, "/BitrateThreadShutdown", O_CREAT, 0) < 0)
     {
       ret_status = FTL_MALLOC_FAILURE;
       break;
@@ -1783,9 +1781,9 @@
 
       // Check if bandwidth is constrained and bitrate reduction is required. The bandwidth can be constrained for two reasons.
       // Either the available bandwidth has decreased, or we tried to upgrade the bitrate and its too excessive.
-      if (is_bitrate_reduction_required(nacks_to_frames_ratio, avg_rtt, avg_frames_dropped_per_second, queue_fullness))
+      if (is_bitrate_reduction_required(nacks_to_frames_ratio, avg_rtt, queue_fullness))
       {
-        FTL_LOG(params->handle->priv, FTL_LOG_INFO, "Bitrate reduction required. Nacks Received %d , Frames Sent %d rtt %d queue_fullness %4.2f",
+        FTL_LOG(params->handle->priv, FTL_LOG_INFO, "Bitrate reduction required. Nacks Received %ull , Frames Sent %ull rtt %4.2f queue_fullness %4.2f",
           nacks_received_total,
           frames_sent_total,
           avg_rtt,

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/posix/threads.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/posix/threads.c Changed

@@ -66,118 +66,80 @@
   return 0;
 }
 
-int os_semaphore_create(OS_SEMAPHORE *sem, const char *name, int oflag, unsigned int value, BOOL is_global) {
+int os_semaphore_create(OS_SEMAPHORE *sem, const char *name, int oflag, unsigned int value) {
 
   int retval = 0;
 
-  sem->name = NULL;
-  sem->sem = NULL;
+  if (pthread_mutex_init(&sem->mutex, NULL))
+    return -2;
 
-  do {
-    if (name == NULL || name[0] != '/') {
-      retval = -1;
-      break;
-    }
-
-    //if the semaphore is intended to only be used by the same process and not across processes, give it unique name
-    if(!is_global) {
-      int name_len = strlen(name);
-
-      if ((sem->name = (char*)malloc( (name_len + 20) * sizeof(char))) == NULL) {
-        retval = -2;
-        break;
-      }
-
-      sprintf(sem->name, "%s_%d", name, (unsigned int)rand());
-    }
-    else {
-      if ((sem->name = strdup(name)) == NULL) {
-        return -2;
-      }
-    }
-
-#ifdef __ANDROID__
-    if ((sem->sem = (sem_t*)malloc(sizeof(sem_t))) == NULL) {
-      retval = -4;
-      break;
-    }
-
-    if (sem_init(sem->sem, 0 /* pshared */, 0 /* value */)) {
-#else
-    if ((sem->sem = sem_open(sem->name, oflag, 0644, value)) == SEM_FAILED) {
-#endif
-      retval = -3;
-      break;
-    }
-
-    return retval;
-  }while(0);
-
-  if(sem->name != NULL){
-    free(sem->name);
+  if (pthread_cond_init(&sem->cond, NULL)) {
+    pthread_mutex_destroy(&sem->mutex);
+    return -3;
   }
 
-  if(sem->sem != NULL){
-    free(sem->sem);
-  }
+  sem->value = value;
 
-  return retval;
+  return 0;
 }
 
 int os_semaphore_pend(OS_SEMAPHORE *sem, int ms_timeout) {
 
-  if (ms_timeout < 0) {
-    return sem_wait(sem->sem);
-  }
-  else {
-#ifdef __APPLE__
-    int sleep_interval = 50;
-    int retval;
-    //TODO find a better solution
-    /*OSX doesnt have a timedwait so this is an ugly polling solution since this SDK doesnt currently use timedwait for performance critical things*/
-    while (ms_timeout > 0) {
-      if ((retval = sem_trywait(sem->sem)) == 0) {
-        break;
-      }
-      sleep_ms(sleep_interval);
-      ms_timeout -= sleep_interval;
-    }
+  int retval = 0;
 
-    return retval;
-#else
-    struct timespec ts;
-    clock_gettime(CLOCK_REALTIME, &ts);
-    timespec_add_ms(&ts, ms_timeout);
-    return sem_timedwait(sem->sem, &ts);
+  if (pthread_mutex_lock(&sem->mutex))
+    return -1;
 
-#endif
+  while (1) {
+    if (sem->value > 0) {
+      sem->value--;
+      break;
+    } else {
+      if (ms_timeout < 0) {
+        if (pthread_cond_wait(&sem->cond, &sem->mutex)) {
+          retval = -2;
+          break;
+        }
+      } else {
+        struct timespec ts;
+        if (clock_gettime(CLOCK_REALTIME, &ts)) {
+          retval = -3;
+          break;
+        }
+        timespec_add_ms(&ts, ms_timeout);
+        if (pthread_cond_timedwait(&sem->cond, &sem->mutex, &ts)) {
+          retval = -4;
+          break;
+        }
+      }
+      continue;
+    }
   }
-}
 
-int os_semaphore_post(OS_SEMAPHORE *sem) {
-  return sem_post(sem->sem);
+  pthread_mutex_unlock(&sem->mutex);
+  return retval;
 }
 
-int os_semaphore_delete(OS_SEMAPHORE *sem) {
-  
+int os_semaphore_post(OS_SEMAPHORE *sem) {
   int retval = 0;
 
-#ifdef __ANDROID__
-  retval = sem_destroy(sem->sem);
-  free(sem->sem);
-
-#else
-  if ( (retval = sem_close(sem->sem)) == 0) {
-    
-    retval = sem_unlink(sem->name);
-  }
-#endif
+  if (pthread_mutex_lock(&sem->mutex))
+    return -1;
 
-  free(sem->name);
+  sem->value++;
+  if (pthread_cond_broadcast(&sem->cond))
+    retval = -2;
 
+  pthread_mutex_unlock(&sem->mutex);
   return retval;
 }
 
+int os_semaphore_delete(OS_SEMAPHORE *sem) {
+  pthread_mutex_destroy(&sem->mutex);
+  pthread_cond_destroy(&sem->cond);
+  return 0;
+}
+
 void sleep_ms(int ms)
 {
     usleep(ms * 1000);

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/posix/threads.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/posix/threads.h Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/win32/threads.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/win32/threads.c Changed

@@ -87,7 +87,7 @@
   return 0;
 }
 
-int os_semaphore_create(OS_SEMAPHORE *sem, const char *name, int oflag, unsigned int value, BOOL is_global) {
+int os_semaphore_create(OS_SEMAPHORE *sem, const char *name, int oflag, unsigned int value) {
 
   char *internal_name = NULL;
   int retval = 0;
@@ -99,23 +99,15 @@
     }
 
     //if the semaphore is intended to only be used by the same process and not across processes, give it unique name
-    if(!is_global) {
-      size_t name_len = strlen(name);
-      size_t max_name = name_len + 20;
+    size_t name_len = strlen(name);
+    size_t max_name = name_len + 20;
 
-      if ((internal_name = (char*)malloc(max_name * sizeof(char))) == NULL) {
-        retval = -2;
-        break;
-      }
-
-      sprintf_s(internal_name, max_name, "%s_%d", name, (unsigned int)rand());
+    if ((internal_name = (char*)malloc(max_name * sizeof(char))) == NULL) {
+      retval = -2;
+      break;
     }
-    else {
-      if ((internal_name = _strdup(name)) == NULL) {
-        retval = -2;
-        break;
-      }
-    }  
+
+    sprintf_s(internal_name, max_name, "%s_%d", name, (unsigned int)rand());
 
     if ( (*sem = CreateSemaphoreA(NULL, value, MAX_SEM_COUNT, (LPCSTR)internal_name)) == NULL){
       retval = -3;

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/win32/threads.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/ftl-sdk/libftl/win32/threads.h Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/amf.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/amf.c Changed

@@ -29,6 +29,7 @@
 #include "bytes.h"
 
 static const AMFObjectProperty AMFProp_Invalid = { {0, 0}, AMF_INVALID };
+static const AMFObject AMFObj_Invalid = { 0, 0 };
 static const AVal AV_empty = { 0, 0 };
 
 /* Data is Big-Endian */
@@ -336,13 +337,19 @@
 void
 AMFProp_GetString(AMFObjectProperty *prop, AVal *str)
 {
-    *str = prop->p_vu.p_aval;
+    if (prop->p_type == AMF_STRING)
+        *str = prop->p_vu.p_aval;
+    else
+        *str = AV_empty;
 }
 
 void
 AMFProp_GetObject(AMFObjectProperty *prop, AMFObject *obj)
 {
-    *obj = prop->p_vu.p_object;
+    if (prop->p_type == AMF_OBJECT)
+        *obj = prop->p_vu.p_object;
+    else
+        *obj = AMFObj_Invalid;
 }
 
 int
@@ -472,6 +479,8 @@
         RTMP_Log(RTMP_LOGDEBUG,
                  "%s, string reference, index: %d, not supported, ignoring!",
                  __FUNCTION__, refIndex);
+        str->av_val = NULL;
+        str->av_len = 0;
         return len;
     }
     else
@@ -511,9 +520,12 @@
         if (name.av_len <= 0)
             return nRes;
 
+        nSize -= nRes;
+        if (nSize <= 0)
+            return -1;
+
         prop->p_name = name;
         pBuffer += nRes;
-        nSize -= nRes;
     }
 
     /* decode */
@@ -601,6 +613,9 @@
         return -1;
     }
 
+    if (nSize < 0)
+        return -1;
+
     return nOriginalSize - nSize;
 }
 
@@ -994,9 +1009,18 @@
         int nRes;
         nArrayLen--;
 
+        if (nSize <= 0)
+        {
+            bError = TRUE;
+            break;
+        }
+
         nRes = AMFProp_Decode(&prop, pBuffer, nSize, bDecodeName);
         if (nRes == -1)
+        {
             bError = TRUE;
+            break;
+        }
         else
         {
             nSize -= nRes;
@@ -1057,12 +1081,12 @@
         else
         {
             int32_t classExtRef = (classRef >> 1);
-            int i;
+            int i, cdnum;
 
             cd.cd_externalizable = (classExtRef & 0x1) == 1;
             cd.cd_dynamic = ((classExtRef >> 1) & 0x1) == 1;
 
-            cd.cd_num = classExtRef >> 2;
+            cdnum = classExtRef >> 2;
 
             /* class name */
 
@@ -1077,9 +1101,16 @@
                      cd.cd_name.av_val, cd.cd_externalizable, cd.cd_dynamic,
                      cd.cd_num);
 
-            for (i = 0; i < cd.cd_num; i++)
+            for (i = 0; i < cdnum; i++)
             {
                 AVal memberName = AV_empty;
+                if (nSize <= 0)
+                {
+                invalid:
+                    RTMP_Log(RTMP_LOGDEBUG, "%s, invalid class encoding!",
+                        __FUNCTION__);
+                    return nOriginalSize;
+                }
                 len = AMF3ReadString(pBuffer, &memberName);
                 RTMP_Log(RTMP_LOGDEBUG, "Member: %s", memberName.av_val);
                 AMF3CD_AddProp(&cd, &memberName);
@@ -1115,6 +1146,8 @@
             int nRes, i;
             for (i = 0; i < cd.cd_num; i++)	/* non-dynamic */
             {
+                if (nSize <= 0)
+                    goto invalid;
                 nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, FALSE);
                 if (nRes == -1)
                     RTMP_Log(RTMP_LOGDEBUG, "%s, failed to decode AMF3 property!",
@@ -1132,6 +1165,8 @@
 
                 do
                 {
+                    if (nSize <= 0)
+                        goto invalid;
                     nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, TRUE);
                     AMF_AddProp(obj, &prop);
 
@@ -1179,10 +1214,18 @@
 
         nRes = AMFProp_Decode(&prop, pBuffer, nSize, bDecodeName);
         if (nRes == -1)
+        {
             bError = TRUE;
+            break;
+        }
         else
         {
             nSize -= nRes;
+            if (nSize < 0)
+            {
+                bError = TRUE;
+                break;
+            }
             pBuffer += nRes;
             AMF_AddProp(obj, &prop);
         }

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/dh.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/dh.h Changed

@@ -21,7 +21,59 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+#include <mbedtls/dhm.h>
+#include <mbedtls/bignum.h>
+typedef  mbedtls_mpi* MP_t;
+#define MP_new(m)	m = malloc(sizeof(mbedtls_mpi)); mbedtls_mpi_init(m)
+#define MP_set_w(mpi, w)	mbedtls_mpi_lset(mpi, w)
+#define MP_cmp(u, v)	mbedtls_mpi_cmp_mpi(u, v)
+#define MP_set(u, v)	mbedtls_mpi_copy(u, v)
+#define MP_sub_w(mpi, w)	mbedtls_mpi_sub_int(mpi, mpi, w)
+#define MP_cmp_1(mpi)	mbedtls_mpi_cmp_int(mpi, 1)
+#define MP_modexp(r, y, q, p)	mbedtls_mpi_exp_mod(r, y, q, p, NULL)
+#define MP_free(mpi)	mbedtls_mpi_free(mpi); free(mpi)
+#define MP_gethex(u, hex, res)	MP_new(u); res = mbedtls_mpi_read_string(u, 16, hex) == 0
+#define MP_bytes(u)	mbedtls_mpi_size(u)
+#define MP_setbin(u,buf,len)	mbedtls_mpi_write_binary(u,buf,len)
+#define MP_getbin(u,buf,len)	MP_new(u); mbedtls_mpi_read_binary(u,buf,len)
+
+typedef struct MDH
+{
+    MP_t p;
+    MP_t g;
+    MP_t pub_key;
+    MP_t priv_key;
+    long length;
+    mbedtls_dhm_context ctx;
+} MDH;
+
+#define MDH_new()	calloc(1,sizeof(MDH))
+#define MDH_free(vp)	{MDH *_dh = vp; mbedtls_dhm_free(&_dh->ctx); MP_free(_dh->p); MP_free(_dh->g); MP_free(_dh->pub_key); MP_free(_dh->priv_key); free(_dh);}
+
+static int MDH_generate_key(MDH *dh)
+{
+    unsigned char out[2];
+    MP_set(&dh->ctx.P, dh->p);
+    MP_set(&dh->ctx.G, dh->g);
+    dh->ctx.len = 128;
+    mbedtls_dhm_make_public(&dh->ctx, 1024, out, 1, mbedtls_ctr_drbg_random, &RTMP_TLS_ctx->ctr_drbg);
+    MP_new(dh->pub_key);
+    MP_new(dh->priv_key);
+    MP_set(dh->pub_key, &dh->ctx.GX);
+    MP_set(dh->priv_key, &dh->ctx.X);
+    return 1;
+}
+
+static int MDH_compute_key(uint8_t *secret, size_t len, MP_t pub, MDH *dh)
+{
+    MP_set(&dh->ctx.GY, pub);
+    size_t olen;
+    mbedtls_dhm_calc_secret(&dh->ctx, secret, len, &olen, NULL, NULL);
+    return 0;
+}
+
+#elif defined(USE_POLARSSL)
 #include <polarssl/dhm.h>
 typedef mpi * MP_t;
 #define MP_new(m)	m = malloc(sizeof(mpi)); mpi_init(m)
@@ -271,7 +323,7 @@
     if (!dh || !dh->pub_key)
         return 0;
 
-    len = MP_bytes(dh->pub_key);
+    len = (int)MP_bytes(dh->pub_key);
     if (len <= 0 || len > (int) nPubkeyLen)
         return 0;

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/handshake.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/handshake.h Changed

@@ -24,7 +24,28 @@
 
 /* This file is #included in rtmp.c, it is not meant to be compiled alone */
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+#include <mbedtls/md.h>
+#include <mbedtls/arc4.h>
+#ifndef SHA256_DIGEST_LENGTH
+#define SHA256_DIGEST_LENGTH	32
+#endif
+typedef mbedtls_md_context_t *HMAC_CTX;
+#define HMAC_setup(ctx, key, len)	ctx = malloc(sizeof(mbedtls_md_context_t)); mbedtls_md_init(ctx); \
+  mbedtls_md_setup(ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1); \
+  mbedtls_md_hmac_starts(ctx, (const unsigned char *)key, len)
+#define HMAC_crunch(ctx, buf, len) mbedtls_md_hmac_update(ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; mbedtls_md_hmac_finish(ctx, dig)
+#define HMAC_close(ctx) mbedtls_md_free(ctx); free(ctx); ctx = NULL
+
+typedef mbedtls_arc4_context*	RC4_handle;
+#define RC4_alloc(h)	*h = malloc(sizeof(mbedtls_arc4_context)); mbedtls_arc4_init(*h)
+#define RC4_setkey(h,l,k)	mbedtls_arc4_setup(h,k,l)
+#define RC4_encrypt(h,l,d)	mbedtls_arc4_crypt(h,l,(unsigned char *)d,(unsigned char *)d)
+#define RC4_encrypt2(h,l,s,d)	mbedtls_arc4_crypt(h,l,(unsigned char *)s,(unsigned char *)d)
+#define RC4_free(h)	mbedtls_arc4_free(h); free(h); h = NULL
+
+#elif defined(USE_POLARSSL)
 #include <polarssl/sha2.h>
 #include <polarssl/arc4.h>
 #ifndef SHA256_DIGEST_LENGTH
@@ -148,6 +169,8 @@
 static unsigned int
 GetDHOffset2(uint8_t *handshake, unsigned int len)
 {
+    (void) len;
+
     unsigned int offset = 0;
     uint8_t *ptr = handshake + 768;
     unsigned int res;
@@ -177,6 +200,8 @@
 static unsigned int
 GetDigestOffset2(uint8_t *handshake, unsigned int len)
 {
+    (void) len;
+
     unsigned int offset = 0;
     uint8_t *ptr = handshake + 772;
     unsigned int res;
@@ -206,6 +231,8 @@
 static unsigned int
 GetDHOffset1(uint8_t *handshake, unsigned int len)
 {
+    (void) len;
+
     unsigned int offset = 0;
     uint8_t *ptr = handshake + 1532;
     unsigned int res;
@@ -235,6 +262,8 @@
 static unsigned int
 GetDigestOffset1(uint8_t *handshake, unsigned int len)
 {
+    (void) len;
+
     unsigned int offset = 0;
     uint8_t *ptr = handshake + 8;
     unsigned int res;
@@ -1128,6 +1157,7 @@
                      __FUNCTION__);
         }
     }
+    // TODO(mgoulet): Should this have a HMAC_finish here?
 
     RTMP_Log(RTMP_LOGDEBUG, "%s: Handshaking finished....", __FUNCTION__);
     return TRUE;
@@ -1482,6 +1512,8 @@
         }
     }
 
+    // TODO(mgoulet): Should this have an Rc4_free?
+
     RTMP_Log(RTMP_LOGDEBUG, "%s: Handshaking finished....", __FUNCTION__);
     return TRUE;
 }

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/hashswf.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/hashswf.c Changed

@@ -30,7 +30,20 @@
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+#include <mbedtls/md.h>
+#ifndef SHA256_DIGEST_LENGTH
+#define SHA256_DIGEST_LENGTH	32
+#endif
+typedef mbedtls_md_context_t *HMAC_CTX;
+#define HMAC_setup(ctx, key, len)	ctx = malloc(sizeof(mbedtls_md_context_t)); mbedtls_md_init(ctx); \
+  mbedtls_md_setup(ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1); \
+  mbedtls_md_hmac_starts(ctx, (const unsigned char *)key, len)
+#define HMAC_crunch(ctx, buf, len) mbedtls_md_hmac_update(ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; mbedtls_md_hmac_finish(ctx, dig)
+#define HMAC_close(ctx) free(ctx); mbedtls_md_free(ctx); ctx = NULL
+
+#elif defined(USE_POLARSSL)
 #include <polarssl/sha2.h>
 #ifndef SHA256_DIGEST_LENGTH
 #define SHA256_DIGEST_LENGTH	32
@@ -40,6 +53,7 @@
 #define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
 #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
 #define HMAC_close(ctx)
+
 #elif defined(USE_GNUTLS)
 #include <nettle/hmac.h>
 #ifndef SHA256_DIGEST_LENGTH
@@ -51,6 +65,7 @@
 #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
 #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
 #define HMAC_close(ctx)
+
 #else	/* USE_OPENSSL */
 #include <openssl/ssl.h>
 #include <openssl/sha.h>
@@ -161,8 +176,17 @@
         goto leave;
 #else
         TLS_client(RTMP_TLS_ctx, sb.sb_ssl);
+
+#if defined(USE_MBEDTLS)
+        mbedtls_net_context *server_fd = &RTMP_TLS_ctx->net;
+        server_fd->fd = sb.sb_socket;
+        TLS_setfd(sb.sb_ssl, server_fd);
+#else
         TLS_setfd(sb.sb_ssl, sb.sb_socket);
-        if (TLS_connect(sb.sb_ssl) < 0)
+#endif
+
+        int connect_return = TLS_connect(sb.sb_ssl);
+        if (connect_return < 0)
         {
             RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed", __FUNCTION__);
             ret = HTTPRES_LOST_CONNECTION;
@@ -318,21 +342,21 @@
     {
         unsigned char out[CHUNK];
         i->zs->next_in = (unsigned char *)p;
-        i->zs->avail_in = len;
+        i->zs->avail_in = (uInt)len;
         do
         {
             i->zs->avail_out = CHUNK;
             i->zs->next_out = out;
             inflate(i->zs, Z_NO_FLUSH);
             len = CHUNK - i->zs->avail_out;
-            i->size += len;
+            i->size += (int)len;
             HMAC_crunch(i->ctx, out, len);
         }
         while (i->zs->avail_out == 0);
     }
     else
     {
-        i->size += len;
+        i->size += (int)len;
         HMAC_crunch(i->ctx, (unsigned char *)p, len);
     }
     return size * nmemb;
@@ -469,7 +493,7 @@
     home.av_val = "\\UserData";
 #else
     hpre.av_val = getenv("HOMEDRIVE");
-    hpre.av_len = strlen(hpre.av_val);
+    hpre.av_len = (int)strlen(hpre.av_val);
     home.av_val = getenv("HOMEPATH");
 #endif
 #define DIRSEP	"\\"
@@ -482,7 +506,7 @@
 #endif
     if (!home.av_val)
         home.av_val = ".";
-    home.av_len = strlen(home.av_val);
+    home.av_len = (int)strlen(home.av_val);
 
     /* SWF hash info is cached in a fixed-format file.
      * url: <url of SWF file>
@@ -528,7 +552,7 @@
             if (strncmp(buf + 5, url, hlen))
                 continue;
             r1 = strrchr(buf, '/');
-            i = strlen(r1);
+            i = (int)strlen(r1);
             r1[--i] = '\0';
             if (strncmp(r1, file, i))
                 continue;
@@ -543,7 +567,7 @@
                 else if (!strncmp(buf, "hash: ", 6))
                 {
                     unsigned char *ptr = hash, *in = (unsigned char *)buf + 6;
-                    int l = strlen((char *)in) - 1;
+                    int l = (int)strlen((char *)in) - 1;
                     for (i = 0; i < l; i += 2)
                         *ptr++ = (HEX2BIN(in[i]) << 4) | HEX2BIN(in[i + 1]);
                     got++;
@@ -625,7 +649,7 @@
             if (q)
                 i = q - url;
             else
-                i = strlen(url);
+                i = (int)strlen(url);
 
             fprintf(f, "url: %.*s\n", i, url);
         }

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/rtmp.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/rtmp.c Changed

@@ -40,7 +40,20 @@
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+#if defined(_WIN32)
+#include <windows.h>
+#include <wincrypt.h>
+#elif defined(__APPLE__)
+#include <Security/Security.h>
+#endif
+
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/md5.h>
+#include <mbedtls/base64.h>
+#define MD5_DIGEST_LENGTH 16
+
+#elif defined(USE_POLARSSL)
 #include <polarssl/havege.h>
 #include <polarssl/md5.h>
 #include <polarssl/base64.h>
@@ -57,7 +70,6 @@
     "E8A700D60B7F1200FA8E77B0A979DABF";
 
 static const char *my_dhm_G = "4";
-
 #elif defined(USE_GNUTLS)
 #include <gnutls/gnutls.h>
 #define MD5_DIGEST_LENGTH 16
@@ -70,7 +82,8 @@
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #endif
-TLS_CTX RTMP_TLS_ctx;
+
+TLS_CTX RTMP_TLS_ctx = NULL;
 #endif
 
 #define RTMP_SIG_SIZE 1536
@@ -226,9 +239,13 @@
 }
 
 int
-RTMPPacket_Alloc(RTMPPacket *p, int nSize)
+RTMPPacket_Alloc(RTMPPacket *p, uint32_t nSize)
 {
-    char *ptr = calloc(1, nSize + RTMP_MAX_HEADER_SIZE);
+    char *ptr;
+    if (nSize > SIZE_MAX - RTMP_MAX_HEADER_SIZE)
+        return FALSE;
+
+    ptr = calloc(1, nSize + RTMP_MAX_HEADER_SIZE);
     if (!ptr)
         return FALSE;
     p->m_body = ptr + RTMP_MAX_HEADER_SIZE;
@@ -262,10 +279,100 @@
 }
 
 void
+RTMP_TLS_LoadCerts() {
+#ifdef USE_MBEDTLS
+    mbedtls_x509_crt *chain = RTMP_TLS_ctx->cacert = calloc(1, sizeof(struct mbedtls_x509_crt));
+    mbedtls_x509_crt_init(chain);
+
+#if defined(_WIN32)
+    HCERTSTORE hCertStore;
+    PCCERT_CONTEXT pCertContext = NULL;
+
+    if (!(hCertStore = CertOpenSystemStore((HCRYPTPROV)NULL, L"ROOT"))) {
+        goto error;
+    }
+
+    while (pCertContext = CertEnumCertificatesInStore(hCertStore, pCertContext)) {
+        mbedtls_x509_crt_parse_der(chain,
+                                   (unsigned char *)pCertContext->pbCertEncoded,
+                                   pCertContext->cbCertEncoded);
+    }
+
+    CertFreeCertificateContext(pCertContext);
+    CertCloseStore(hCertStore, 0);
+#elif defined(__APPLE__)
+    SecKeychainRef keychain_ref;
+    CFMutableDictionaryRef search_settings_ref;
+    CFArrayRef result_ref;
+
+    if (SecKeychainOpen("/System/Library/Keychains/SystemRootCertificates.keychain",
+                        &keychain_ref)
+        != errSecSuccess) {
+      goto error;
+    }
+
+    search_settings_ref = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
+    CFDictionarySetValue(search_settings_ref, kSecClass, kSecClassCertificate);
+    CFDictionarySetValue(search_settings_ref, kSecMatchLimit, kSecMatchLimitAll);
+    CFDictionarySetValue(search_settings_ref, kSecReturnRef, kCFBooleanTrue);
+    CFDictionarySetValue(search_settings_ref, kSecMatchSearchList,
+                         CFArrayCreate(NULL, (const void **)&keychain_ref, 1, NULL));
+
+    if (SecItemCopyMatching(search_settings_ref, (CFTypeRef *)&result_ref)
+        != errSecSuccess) {
+      goto error;
+    }
+
+    for (CFIndex i = 0; i < CFArrayGetCount(result_ref); i++) {
+      SecCertificateRef item_ref = (SecCertificateRef)
+                                   CFArrayGetValueAtIndex(result_ref, i);
+      CFDataRef data_ref;
+
+      if ((data_ref = SecCertificateCopyData(item_ref))) {
+        mbedtls_x509_crt_parse_der(chain,
+                                   (unsigned char *)CFDataGetBytePtr(data_ref),
+                                   CFDataGetLength(data_ref));
+        CFRelease(data_ref);
+      }
+    }
+
+    CFRelease(keychain_ref);
+#elif defined(__linux__)
+    if (mbedtls_x509_crt_parse_path(chain, "/etc/ssl/certs/") != 0) {
+        goto error;
+    }
+#endif
+
+    mbedtls_ssl_conf_ca_chain(&RTMP_TLS_ctx->conf, chain, NULL);
+    return;
+
+error:
+    mbedtls_x509_crt_free(chain);
+    free(chain);
+    RTMP_TLS_ctx->cacert = NULL;
+#endif /* USE_MBEDTLS */
+}
+
+void
 RTMP_TLS_Init()
 {
 #ifdef CRYPTO
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+    const char * pers = "RTMP_TLS";
+    RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx));
+
+    mbedtls_ssl_config_init(&RTMP_TLS_ctx->conf);
+    mbedtls_ctr_drbg_init(&RTMP_TLS_ctx->ctr_drbg);
+    mbedtls_entropy_init(&RTMP_TLS_ctx->entropy);
+
+    mbedtls_ctr_drbg_seed(&RTMP_TLS_ctx->ctr_drbg,
+                          mbedtls_entropy_func,
+                          &RTMP_TLS_ctx->entropy,
+                          (const unsigned char *)pers,
+                          strlen(pers));
+
+    RTMP_TLS_LoadCerts();
+#elif defined(USE_POLARSSL)
     /* Do this regardless of NO_SSL, we use havege for rtmpe too */
     RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx));
     havege_init(&RTMP_TLS_ctx->hs);
@@ -289,6 +396,26 @@
     SSL_CTX_set_options(RTMP_TLS_ctx, SSL_OP_ALL);
     SSL_CTX_set_default_verify_paths(RTMP_TLS_ctx);
 #endif
+#else
+#endif
+}
+
+void
+RTMP_TLS_Free() {
+#ifdef USE_MBEDTLS
+    mbedtls_ssl_config_free(&RTMP_TLS_ctx->conf);
+    mbedtls_ctr_drbg_free(&RTMP_TLS_ctx->ctr_drbg);
+    mbedtls_entropy_free(&RTMP_TLS_ctx->entropy);
+
+    if (RTMP_TLS_ctx->cacert) {
+        mbedtls_x509_crt_free(RTMP_TLS_ctx->cacert);
+        free(RTMP_TLS_ctx->cacert);
+        RTMP_TLS_ctx->cacert = NULL;
+    }
+
+    // NO mbedtls_net_free() BECAUSE WE SET IT UP BY HAND!
+    free(RTMP_TLS_ctx);
+    RTMP_TLS_ctx = NULL;
 #endif
 }
 
@@ -299,7 +426,27 @@
 #ifdef CRYPTO
     if (!RTMP_TLS_ctx)
         RTMP_TLS_Init();
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+    tls_server_ctx *tc = ctx = calloc(1, sizeof(struct tls_server_ctx));
+    tc->conf = &RTMP_TLS_ctx->conf;
+    tc->ctr_drbg = &RTMP_TLS_ctx->ctr_drbg;
+
+    mbedtls_x509_crt_init(&tc->cert);
+    if (mbedtls_x509_crt_parse_file(&tc->cert, cert))
+    {
+        free(tc);
+        return NULL;
+    }
+
+    mbedtls_pk_init(&tc->key);
+    if (mbedtls_pk_parse_keyfile(&tc->key, key, NULL))
+    {
+        mbedtls_x509_crt_free(&tc->cert);
+        mbedtls_pk_free(&tc->key);
+        free(tc);
+        return NULL;
+    }
+#elif defined(USE_POLARSSL)
     tls_server_ctx *tc = ctx = calloc(1, sizeof(struct tls_server_ctx));
     tc->dhm_P = my_dhm_P;
     tc->dhm_G = my_dhm_G;
@@ -346,7 +493,11 @@
 RTMP_TLS_FreeServerContext(void *ctx)
 {
 #ifdef CRYPTO
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+    mbedtls_x509_crt_free(&((tls_server_ctx*)ctx)->cert);
+    mbedtls_pk_free(&((tls_server_ctx*)ctx)->key);
+    free(ctx);
+#elif defined(USE_POLARSSL)
     x509_free(&((tls_server_ctx*)ctx)->cert);
     rsa_free(&((tls_server_ctx*)ctx)->key);
     free(ctx);
@@ -370,6 +521,10 @@
 void
 RTMP_Free(RTMP *r)
 {
+#if defined(CRYPTO) && defined(USE_MBEDTLS)
+  if (RTMP_TLS_ctx)
+    RTMP_TLS_Free();
+#endif
     free(r);
 }
 
@@ -846,9 +1001,20 @@
 RTMP_TLS_Accept(RTMP *r, void *ctx)
 {
 #if defined(CRYPTO) && !defined(NO_SSL)
-    TLS_server(ctx, r->m_sb.sb_ssl);
+    tls_server_ctx *srv_ctx = ctx;
+    TLS_server(srv_ctx, r->m_sb.sb_ssl);
+
+#if defined(USE_MBEDTLS)
+    mbedtls_net_context *client_fd = &RTMP_TLS_ctx->net;
+    mbedtls_net_init(client_fd);
+    client_fd->fd = r->m_sb.sb_socket;
+    TLS_setfd(r->m_sb.sb_ssl, client_fd);
+#else
     TLS_setfd(r->m_sb.sb_ssl, r->m_sb.sb_socket);
-    if (TLS_accept(r->m_sb.sb_ssl) < 0)
+#endif
+
+    int connect_return = TLS_connect(r->m_sb.sb_ssl);
+    if (connect_return < 0)
     {
         RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed", __FUNCTION__);
         return FALSE;
@@ -868,10 +1034,59 @@
     {
 #if defined(CRYPTO) && !defined(NO_SSL)
         TLS_client(RTMP_TLS_ctx, r->m_sb.sb_ssl);
+
+#if defined(USE_MBEDTLS)
+        mbedtls_net_context *server_fd = &RTMP_TLS_ctx->net;
+        server_fd->fd = r->m_sb.sb_socket;
+        TLS_setfd(r->m_sb.sb_ssl, server_fd);
+
+        // make sure we verify the certificate hostname
+        char hostname[MBEDTLS_SSL_MAX_HOST_NAME_LEN + 1];
+
+        if (r->Link.hostname.av_len >= MBEDTLS_SSL_MAX_HOST_NAME_LEN)
+            return FALSE;
+
+        memcpy(hostname, r->Link.hostname.av_val, r->Link.hostname.av_len);
+        hostname[r->Link.hostname.av_len] = 0;
+
+        if (mbedtls_ssl_set_hostname(r->m_sb.sb_ssl, hostname))
+            return FALSE;
+#else
         TLS_setfd(r->m_sb.sb_ssl, r->m_sb.sb_socket);
-        if (TLS_connect(r->m_sb.sb_ssl) < 0)
+#endif
+
+        int connect_return = TLS_connect(r->m_sb.sb_ssl);
+        if (connect_return < 0)
         {
-            RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed", __FUNCTION__);
+#if defined(USE_MBEDTLS)
+            if (connect_return == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED)
+            {
+                r->last_error_code = connect_return;
+
+                // show a more detailed error in the log if possible
+                int verify_result = mbedtls_ssl_get_verify_result(r->m_sb.sb_ssl);
+                if (verify_result)
+                {
+                    char err[256], *e;
+                    if (mbedtls_x509_crt_verify_info(err, sizeof(err), "", verify_result) > 0)
+                    {
+                        e = strchr(err, '\n');
+                        if (e)
+                            *e = '\0';
+                    }
+                    else
+                    {
+                        strcpy(err, "unknown error");
+                    }
+                    RTMP_Log(RTMP_LOGERROR, "%s, Cert verify failed: %d (%s)", __FUNCTION__, verify_result, err);
+                    RTMP_Close(r);
+                    return FALSE;
+                }
+            }
+#endif
+            // output the error in a format that matches mbedTLS
+            connect_return = abs(connect_return);
+            RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed: -0x%x", __FUNCTION__, connect_return);
             RTMP_Close(r);
             return FALSE;
         }
@@ -879,7 +1094,6 @@
         RTMP_Log(RTMP_LOGERROR, "%s, no SSL/TLS support", __FUNCTION__);
         RTMP_Close(r);
         return FALSE;
-
 #endif
     }
     if (r->Link.protocol & RTMP_FEATURE_HTTP)
@@ -1108,7 +1322,7 @@
     while (!bHasMediaPacket && RTMP_IsConnected(r)
             && RTMP_ReadPacket(r, packet))
     {
-        if (!RTMPPacket_IsReady(packet))
+        if (!RTMPPacket_IsReady(packet) || !packet->m_nBodySize)
         {
             continue;
         }
@@ -2398,7 +2612,19 @@
 {
     (void)maxsize;
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+    size_t osize;
+    if(mbedtls_base64_encode((unsigned char *) output, maxsize, &osize, input, length) == 0)
+    {
+        output[osize] = '\0';
+        return 1;
+    }
+    else
+    {
+        RTMP_Log(RTMP_LOGDEBUG, "%s, error", __FUNCTION__);
+        return 0;
+    }
+#elif defined(USE_POLARSSL)
     size_t buf_size = maxsize;
     if(base64_encode((unsigned char *) output, &buf_size, input, length) == 0)
     {
@@ -2457,7 +2683,13 @@
     return 1;
 }
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+typedef	mbedtls_md5_context MD5_CTX;
+#define MD5_Init(ctx)	mbedtls_md5_init(ctx); mbedtls_md5_starts(ctx)
+#define MD5_Update(ctx,data,len)	mbedtls_md5_update(ctx,(unsigned char *)data,len)
+#define MD5_Final(dig,ctx)	mbedtls_md5_finish(ctx,dig); mbedtls_md5_free(ctx)
+
+#elif defined(USE_POLARSSL)
 #define MD5_CTX	md5_context
 #define MD5_Init(ctx)	md5_starts(ctx)
 #define MD5_Update(ctx,data,len)	md5_update(ctx,(unsigned char *)data,len)
@@ -3713,7 +3945,6 @@
         {
             packet->m_nBodySize = AMF_DecodeInt24(header + 3);
             packet->m_nBytesRead = 0;
-            RTMPPacket_Free(packet);
 
             if (nSize > 6)
             {
@@ -4288,14 +4519,14 @@
     r->m_customSendParam = NULL;
 
 #if defined(CRYPTO) || defined(USE_ONLY_MD5)
-    if (!(r->Link.protocol & RTMP_FEATURE_WRITE) || (r->Link.pFlags & RTMP_PUB_CLEAN))
+    for (int idx = 0; idx < r->Link.nStreams; idx++)
     {
-        for (int idx = 0; idx < r->Link.nStreams; idx++)
-        {
-            free(r->Link.streams[idx].playpath.av_val);
-            r->Link.streams[idx].playpath.av_val = NULL;
-        }
+        free(r->Link.streams[idx].playpath.av_val);
+        r->Link.streams[idx].playpath.av_val = NULL;
+    }
 
+    if (!(r->Link.protocol & RTMP_FEATURE_WRITE) || (r->Link.pFlags & RTMP_PUB_CLEAN))
+    {
         r->Link.curStreamIdx = 0;
         r->Link.nStreams = 0;
     }

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/rtmp.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/rtmp.h Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/librtmp/rtmp_sys.h -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/librtmp/rtmp_sys.h Changed

@@ -80,7 +80,76 @@
 
 #include "rtmp.h"
 
-#ifdef USE_POLARSSL
+#if defined(USE_MBEDTLS)
+#include <mbedtls/version.h>
+#include <mbedtls/net.h>
+#include <mbedtls/ssl.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/entropy.h>
+
+#define my_dhm_P \
+    "E4004C1F94182000103D883A448B3F80" \
+    "2CE4B44A83301270002C20D0321CFD00" \
+    "11CCEF784C26A400F43DFB901BCA7538" \
+    "F2C6B176001CF5A0FD16D2C48B1D0C1C" \
+    "F6AC8E1DA6BCC3B4E1F96B0564965300" \
+    "FFA1D0B601EB2800F489AA512C4B248C" \
+    "01F76949A60BB7F00A40B1EAB64BDD48" \
+    "E8A700D60B7F1200FA8E77B0A979DABF"
+
+#define my_dhm_G "4"
+
+#define	SSL_SET_SESSION(S,resume,timeout,ctx)	mbedtls_ssl_set_session(S,ctx)
+
+typedef struct tls_ctx
+{
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+    mbedtls_ssl_config conf;
+    mbedtls_ssl_session ssn;
+    mbedtls_x509_crt *cacert;
+    mbedtls_net_context net;
+} tls_ctx;
+
+typedef struct tls_server_ctx
+{
+  mbedtls_ssl_config *conf;
+  mbedtls_ctr_drbg_context *ctr_drbg;
+  mbedtls_pk_context key;
+  mbedtls_x509_crt cert;
+} tls_server_ctx;
+
+typedef tls_ctx *TLS_CTX;
+
+#define TLS_client(ctx,s)	\
+  s = malloc(sizeof(mbedtls_ssl_context));\
+  mbedtls_ssl_init(s);\
+  mbedtls_ssl_setup(s, &ctx->conf);\
+	mbedtls_ssl_config_defaults(&ctx->conf, MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT);\
+  mbedtls_ssl_conf_authmode(&ctx->conf, MBEDTLS_SSL_VERIFY_REQUIRED);\
+	mbedtls_ssl_conf_rng(&ctx->conf, mbedtls_ctr_drbg_random, &ctx->ctr_drbg)
+
+#define TLS_server(ctx,s)\
+  s = malloc(sizeof(mbedtls_ssl_context));\
+  mbedtls_ssl_init(s);\
+  mbedtls_ssl_setup(s, ctx->conf);\
+	mbedtls_ssl_conf_endpoint(ctx->conf, MBEDTLS_SSL_IS_SERVER);\
+  mbedtls_ssl_conf_authmode(ctx->conf, MBEDTLS_SSL_VERIFY_REQUIRED);\
+	mbedtls_ssl_conf_rng(ctx->conf, mbedtls_ctr_drbg_random, ctx->ctr_drbg);\
+	mbedtls_ssl_conf_own_cert(ctx->conf, &ctx->cert, &ctx->key);\
+	mbedtls_ssl_conf_dh_param_bin(ctx->conf,\
+    (const unsigned char *)my_dhm_P, strlen(my_dhm_P),\
+    (const unsigned char *)my_dhm_G, strlen(my_dhm_G))
+
+#define TLS_setfd(s,fd)	mbedtls_ssl_set_bio(s, fd, mbedtls_net_send, mbedtls_net_recv, NULL)
+#define TLS_connect(s)	mbedtls_ssl_handshake(s)
+#define TLS_accept(s)	mbedtls_ssl_handshake(s)
+#define TLS_read(s,b,l)	mbedtls_ssl_read(s,(unsigned char *)b,l)
+#define TLS_write(s,b,l)	mbedtls_ssl_write(s,(unsigned char *)b,l)
+#define TLS_shutdown(s)	mbedtls_ssl_close_notify(s)
+#define TLS_close(s)	mbedtls_ssl_free(s); free(s)
+
+#elif defined(USE_POLARSSL)
 #include <polarssl/version.h>
 #include <polarssl/net.h>
 #include <polarssl/ssl.h>
@@ -128,6 +197,7 @@
 #define TLS_shutdown(s)	ssl_close_notify(s)
 #define TLS_close(s)	ssl_free(s); free(s)
 
+
 #elif defined(USE_GNUTLS)
 #include <gnutls/gnutls.h>
 typedef struct tls_ctx

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/rtmp-stream.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/rtmp-stream.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-outputs/rtmp-windows.c -> obs-studio-22.0.1.tar.xz/plugins/obs-outputs/rtmp-windows.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp -> obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp Changed

obs-studio-21.1.2.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp -> obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp Changed

@@ -69,7 +69,11 @@
 #define info(format, ...)  do_log(LOG_INFO,    format, ##__VA_ARGS__)
 #define debug(format, ...) do_log(LOG_DEBUG,   format, ##__VA_ARGS__)
 
+mfxHDL QSV_Encoder_Internal::g_DX_Handle = NULL;
+mfxU16 QSV_Encoder_Internal::g_numEncodersOpen = 0;
+
 QSV_Encoder_Internal::QSV_Encoder_Internal(mfxIMPL& impl, mfxVersion& version) :
+	m_pmfxSurfaces(NULL),
 	m_pmfxENC(NULL),
 	m_nSPSBufferSize(100),
 	m_nPPSBufferSize(100),
@@ -152,10 +156,10 @@
 
 	if (m_bUseD3D11)
 		// Use D3D11 surface
-		sts = Initialize(m_impl, m_ver, &m_session, &m_mfxAllocator, false, false);
+		sts = Initialize(m_impl, m_ver, &m_session, &m_mfxAllocator, &g_DX_Handle, false, false);
 	else if (m_bD3D9HACK)
 		// Use hack
-		sts = Initialize(m_impl, m_ver, &m_session, &m_mfxAllocator, false, true);
+		sts = Initialize(m_impl, m_ver, &m_session, &m_mfxAllocator, &g_DX_Handle, false, true);
 	else
 		sts = Initialize(m_impl, m_ver, &m_session, NULL);
 
@@ -182,6 +186,9 @@
 	sts = InitBitstream();
 	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
+	if (sts >= MFX_ERR_NONE) {
+		g_numEncodersOpen++;
+	}
 	return sts;
 }
 
@@ -598,11 +605,15 @@
 	delete m_pmfxENC;
 	m_pmfxENC = NULL;
 
-	if (m_bUseD3D11 || m_bD3D9HACK)
-		Release();
+	if (sts >= MFX_ERR_NONE) {
+		g_numEncodersOpen--;
+	}
 
+	if ((m_bUseD3D11 || m_bD3D9HACK) && (g_numEncodersOpen <= 0)) {
+		Release();
+		g_DX_Handle = NULL;
+	}
 	m_session.Close();
-
 	return sts;
 }

obs-studio-21.1.2.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.h -> obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.h Changed

obs-studio-21.1.2.tar.xz/plugins/obs-qsv11/common_utils.h -> obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/common_utils.h Changed

obs-studio-21.1.2.tar.xz/plugins/obs-qsv11/common_utils_windows.cpp -> obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/common_utils_windows.cpp Changed

@@ -23,7 +23,7 @@
  * Windows implementation of OS-specific utility functions
  */
 
-mfxStatus Initialize(mfxIMPL impl, mfxVersion ver, MFXVideoSession* pSession, mfxFrameAllocator* pmfxAllocator, bool bCreateSharedHandles, bool dx9hack)
+mfxStatus Initialize(mfxIMPL impl, mfxVersion ver, MFXVideoSession* pSession, mfxFrameAllocator* pmfxAllocator, mfxHDL *deviceHandle, bool bCreateSharedHandles, bool dx9hack)
 {
     bCreateSharedHandles; // (Hugh) Currently unused
     pmfxAllocator; // (Hugh) Currently unused
@@ -37,12 +37,15 @@
         MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
         // Create DirectX device context
-        mfxHDL deviceHandle;
-        sts = CreateHWDevice(*pSession, &deviceHandle, NULL, bCreateSharedHandles);
-        MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+        if (deviceHandle == NULL || *deviceHandle == NULL) {
+            sts = CreateHWDevice(*pSession, deviceHandle, NULL, bCreateSharedHandles);
+            MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+        }
+
+        if (deviceHandle == NULL || *deviceHandle == NULL) return MFX_ERR_DEVICE_FAILED;
 
         // Provide device manager to Media SDK
-        sts = pSession->SetHandle(DEVICE_MGR_TYPE, deviceHandle);
+        sts = pSession->SetHandle(DEVICE_MGR_TYPE, *deviceHandle);
         MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
         pmfxAllocator->pthis  = *pSession; // We use Media SDK session ID as the allocation identifier
@@ -62,12 +65,14 @@
         MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
         // Create DirectX device context
-        mfxHDL deviceHandle;
-        sts = DX9_CreateHWDevice(*pSession, &deviceHandle, NULL, bCreateSharedHandles);
-        MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+        if (deviceHandle == NULL || *deviceHandle == NULL ) {
+            sts = DX9_CreateHWDevice(*pSession, deviceHandle, NULL, false);
+            MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+        }
+        if (*deviceHandle == NULL) return MFX_ERR_DEVICE_FAILED;
 
         // Provide device manager to Media SDK
-        sts = pSession->SetHandle(MFX_HANDLE_D3D9_DEVICE_MANAGER, deviceHandle);
+        sts = pSession->SetHandle(MFX_HANDLE_D3D9_DEVICE_MANAGER, *deviceHandle);
         MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
         pmfxAllocator->pthis  = *pSession; // We use Media SDK session ID as the allocation identifier

obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/data/locale/ka-GE.ini Added

obs-studio-21.1.2.tar.xz/plugins/obs-qsv11/obs-qsv11.c -> obs-studio-22.0.1.tar.xz/plugins/obs-qsv11/obs-qsv11.c Changed

obs-studio-21.1.2.tar.xz/plugins/obs-text/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-text/data/locale/el-GR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/obs-text/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-text/data/locale/ka-GE.ini Added

@@ -0,0 +1,34 @@
+TextGDIPlus="Text (GDI+)"
+Font="შრიფტი"
+Text="ტექსტი"
+ReadFromFile="ფაილიდან წაკითხვა"
+TextFile="ტექსტური ფაილი (UTF-8)"
+Filter.TextFiles="ტექსტური ფაილები"
+Filter.AllFiles="ყველა ფაილი"
+Color="ფერი"
+Opacity="გაუმჭვირვალობა"
+Gradient="გრადიენტი"
+Gradient.Color="გრადიენტის ფერი"
+Gradient.Opacity="გრადიენტის გაუმჭვირვალობა"
+Gradient.Direction="გრადიენტის მიმართულება"
+BkColor="ფონის ფერი"
+BkOpacity="ფონის გაუმჭვივალობა"
+Alignment="განლაგება"
+Alignment.Left="მარცხნივ"
+Alignment.Center="შუაში"
+Alignment.Right="მარჯვნივ"
+Vertical="შვეულად"
+VerticalAlignment="შვეული განლაგება"
+VerticalAlignment.Top="ზემოთ"
+VerticalAlignment.Bottom="ქვემოთ"
+Outline="გარემოხაზულობა"
+Outline.Size="გარემოხაზულობის ზომა"
+Outline.Color="გარემოხაზულობის ფერი"
+Outline.Opacity="გარემოხაზულობის გაუმჭვირვალობა"
+ChatlogMode="სასაუბროს (Chatlog) რეჟიმი"
+ChatlogMode.Lines="სასაუბროს ხაზების შეზღუდვა"
+UseCustomExtents="ტექსტის ველის მითითებული ზომის გამოყენება"
+UseCustomExtents.Wrap="ხაზზე გადატანა"
+Width="სიგანე"
+Height="სიმაღლე"
+

obs-studio-22.0.1.tar.xz/plugins/obs-transitions/data/locale/bg-BG.ini Added

obs-studio-21.1.2.tar.xz/plugins/obs-transitions/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-transitions/data/locale/el-GR.ini Changed

@@ -1,9 +1,66 @@
 FadeTransition="Ξεθώριασμα"
 CutTransition="Αποκοπή"
+SwipeTransition="Σύρσιμο"
+SlideTransition="Ολίσθηση"
+StingerTransition="Τσούξιμο"
+FadeToColorTransition="Ξεθωριάζει το Χρώμα"
+Direction="Κατεύθυνση"
 Direction.Left="Αριστερά"
 Direction.Right="Δεξιά"
+Direction.Up="Επάνω"
+Direction.Down="Κάτω"
+SwipeIn="Σύρετε προς τα επάνω"
 Color="Χρώμα"
 VideoFile="Αρχείο Βίντεο"
+TransitionPoint="Ταχύτητα μετάβασης (χιλιοστά δευτερολέπτου)"
+TransitionPointFrame="Σημείο μετάβασης (πλαίσιο)"
+TransitionPointType="Τύπος σημείου μετάβασης"
 TransitionPointTypeFrame="Καρέ"
 TransitionPointTypeTime="Χρόνος (χιλιοστά δευτερολέπτου)"
+AudioFadeStyle="Στυλ ήχου Fade"
+AudioFadeStyle.FadeOutFadeIn="Fade out στο σημείο μετάβασης στη συνέχεια, fade in"
+AudioFadeStyle.CrossFade="Σταδιακή Εξασθένιση"
+SwitchPoint="Peak Χρώμα Σημείου (ποσοστό)"
+LumaWipeTransition="Luma Wipe"
+LumaWipe.Image="Εικόνα"
+LumaWipe.Invert="Αντιστροφή"
+LumaWipe.Softness="Απαλότητα"
+LumaWipe.Type.BarndoorBottomLeft="Barndoor Κάτω Αριστερά"
+LumaWipe.Type.BarndoorHorizontal="Barndoor οριζόντια"
+LumaWipe.Type.BarndoorTopLeft="Barndoor Πάνω Αριστερά"
+LumaWipe.Type.BarndoorVertical="Barndoor Κάθετα"
+LumaWipe.Type.BlindsHorizontal="Barndoor οριζόντια"
+LumaWipe.Type.BoxBottomLeft="Κουτί Κάτω Αριστερά"
+LumaWipe.Type.BoxBottomRight="Κουτί Κάτω Δεξιά"
+LumaWipe.Type.BoxTopLeft="Κουτί Πάνω Αριστερά"
+LumaWipe.Type.BoxTopRight="Κουτί Πάνω Δεξιά"
+LumaWipe.Type.Burst="Έκρηξη"
+LumaWipe.Type.CheckerboardSmall="Μικρή σκακιέρα"
+LumaWipe.Type.Circles="Κύκλοι"
+LumaWipe.Type.Clock="Ρολόι"
+LumaWipe.Type.Cloud="Σύννεφο"
+LumaWipe.Type.Curtain="Κουρτίνες"
+LumaWipe.Type.Fan="Ανεμιστήρας"
+LumaWipe.Type.Fractal="Φράκταλ"
+LumaWipe.Type.Iris="Ίρις"
+LumaWipe.Type.LinearHorizontal="Γραμμική Οριζόντια"
+LumaWipe.Type.LinearTopLeft="Γραμμική Πάνω Αριστερά"
+LumaWipe.Type.LinearTopRight="Γραμμική Πάνω Δεξιά"
+LumaWipe.Type.LinearVertical="Γραμμική Κατακόρυφα"
+LumaWipe.Type.ParallelZigzagHorizontal="Παράλληλα Ζιγκ-Ζαγκ Οριζόντια"
+LumaWipe.Type.ParallelZigzagVertical="Παράλληλα Ζιγκ-Ζαγκ Κάθετα"
+LumaWipe.Type.Sinus9="Sinus 9"
+LumaWipe.Type.Spiral="Σπείρα"
+LumaWipe.Type.Square="Τετράγωνο"
+LumaWipe.Type.Squares="Τετράγωνα"
+LumaWipe.Type.Stripes="Ρίγες"
+LumaWipe.Type.StripsHorizontal="Οριζόντια Αναστροφή"
+LumaWipe.Type.StripsVertical="Κάθετη Αναστροφή"
+LumaWipe.Type.Watercolor="Ακουαρέλα"
+LumaWipe.Type.ZigzagHorizontal="Γραμμική Οριζόντια"
+LumaWipe.Type.ZigzagVertical="Γραμμική Κατακόρυφα"
+AudioMonitoring="Ηχητική παρακολούθηση"
+AudioMonitoring.None="Monitor Off"
+AudioMonitoring.MonitorOnly="Μόνο η οθόνη (σίγαση εξόδου)"
+AudioMonitoring.Both="Παρακολούθηση και έξοδος"

obs-studio-22.0.1.tar.xz/plugins/obs-transitions/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/obs-transitions/data/locale/ka-GE.ini Added

@@ -0,0 +1,66 @@
+FadeTransition="მილევა"
+CutTransition="მოჭრა"
+SwipeTransition="შენაცვლება"
+SlideTransition="გადაწევა"
+StingerTransition="Stinger"
+FadeToColorTransition="ფერში გადასვლა"
+Direction="მიმართულება"
+Direction.Left="მარცხნივ"
+Direction.Right="მარჯვნივ"
+Direction.Up="ზემოთ"
+Direction.Down="ქვემოთ"
+SwipeIn="უძრავად შენაცვლება"
+Color="ფერი"
+VideoFile="ვიდეოფაილი"
+TransitionPoint="გადასვლის წერტილი (მილიწამი)"
+TransitionPointFrame="გადასვლის წერტილი (კადრი)"
+TransitionPointType="გადასვლის წერტილის სახეობა"
+TransitionPointTypeFrame="კადრი"
+TransitionPointTypeTime="დრო (წამები)"
+AudioFadeStyle="ხმის მილევის ნაირსახეობა"
+AudioFadeStyle.FadeOutFadeIn="თანდათან მილევა გადასვლის წერტილში და შემდეგ მომატება"
+AudioFadeStyle.CrossFade="ჯვარედინი გადასვლა"
+SwitchPoint="ფერის უმაღლესი წერტილი (პროცენტი)"
+LumaWipeTransition="Luma Wipe"
+LumaWipe.Image="სურათი"
+LumaWipe.Invert="შებრუნება"
+LumaWipe.Softness="სირბილე"
+LumaWipe.Type.BarndoorBottomLeft="მარცხნივ ქვემოთ დახრილი გადაფარვა"
+LumaWipe.Type.BarndoorHorizontal="თარაზული გადაფარვა"
+LumaWipe.Type.BarndoorTopLeft="მარცხნივ ზემოთ დახრილი გადაფარვა"
+LumaWipe.Type.BarndoorVertical="შვეული გადაფარვა"
+LumaWipe.Type.BlindsHorizontal="თარაზული ჟალუზები"
+LumaWipe.Type.BoxBottomLeft="ქვედა მარცხენა კუთხიდან გადაფარვა"
+LumaWipe.Type.BoxBottomRight="ქვედა მარჯვენა კუთხიდან გადაფარვა"
+LumaWipe.Type.BoxTopLeft="ზედა მარცხენა კუთხიდან გადაფარვა"
+LumaWipe.Type.BoxTopRight="ზედა მარჯვენა კუთხიდან გადაფარვა"
+LumaWipe.Type.Burst="აფეთქება"
+LumaWipe.Type.CheckerboardSmall="უჯრები"
+LumaWipe.Type.Circles="წრეები"
+LumaWipe.Type.Clock="საათი"
+LumaWipe.Type.Cloud="ღრუბელი"
+LumaWipe.Type.Curtain="ფარდა"
+LumaWipe.Type.Fan="დატრიალება"
+LumaWipe.Type.Fractal="ნამსხვრევები"
+LumaWipe.Type.Iris="წერტილოვანი"
+LumaWipe.Type.LinearHorizontal="ხაზოვანი თარაზულად"
+LumaWipe.Type.LinearTopLeft="ხაზოვანი ზედა მარცხენა კუთხიდან"
+LumaWipe.Type.LinearTopRight="ხაზოვანი ზედა მარჯვენა კუთხიდან"
+LumaWipe.Type.LinearVertical="ხაზოვანი შვეულად"
+LumaWipe.Type.ParallelZigzagHorizontal="პარალელური თარაზული ტეხილები"
+LumaWipe.Type.ParallelZigzagVertical="პარალელური შვეული ტეხილები"
+LumaWipe.Type.Sinus9="თხევადი"
+LumaWipe.Type.Spiral="ხვეული"
+LumaWipe.Type.Square="მართკუთხა"
+LumaWipe.Type.Squares="მართკუთხედები"
+LumaWipe.Type.Stripes="ზოლები"
+LumaWipe.Type.StripsHorizontal="თარაზული ზოლები"
+LumaWipe.Type.StripsVertical="შვეული ზოლები"
+LumaWipe.Type.Watercolor="წყლის საღებავი"
+LumaWipe.Type.ZigzagHorizontal="თარაზული ტეხილი"
+LumaWipe.Type.ZigzagVertical="შვეული ტეხილი"
+AudioMonitoring="ხმის მოსმენა"
+AudioMonitoring.None="მოსმენის გარეშე"
+AudioMonitoring.MonitorOnly="მხოლოდ მოსმენა (უხმო გამომავალი სიგნალით)"
+AudioMonitoring.Both="მოსმენა და გამოტანა"
+

obs-studio-21.1.2.tar.xz/plugins/obs-transitions/transition-stinger.c -> obs-studio-22.0.1.tar.xz/plugins/obs-transitions/transition-stinger.c Changed

obs-studio-22.0.1.tar.xz/plugins/obs-x264/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/obs-x264/data/locale/ka-GE.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-x264/data/locale/ka-GE.ini Changed

obs-studio-21.1.2.tar.xz/plugins/obs-x264/data/locale/zh-CN.ini -> obs-studio-22.0.1.tar.xz/plugins/obs-x264/data/locale/zh-CN.ini Changed

obs-studio-21.1.2.tar.xz/plugins/rtmp-services/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/rtmp-services/data/locale/el-GR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/rtmp-services/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/rtmp-services/data/locale/ka-GE.ini Added

obs-studio-21.1.2.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-22.0.1.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-21.1.2.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-22.0.1.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -537,9 +537,27 @@
             "servers": [
                 {
                     "name": "Primary",
-                    "url": "rtmp://www.gameplank.tv/live"
+                    "url": "rtmp://live.gameplank.tv/app"
+                },
+                {
+                    "name": "US: Oregon",
+                    "url": "rtmp://live-or.gameplank.tv/app"
+                },
+                {
+                    "name": "US: Virginia",
+                    "url": "rtmp://live-va.gameplank.tv/app"
+                },
+                {
+                    "name": "UK: London",
+                    "url": "rtmp://live-ldn.gameplank.tv/app"
                 }
-            ]
+            ],
+            "recommended": {
+                "keyint": 1,
+                "max video bitrate": 1500,
+                "max audio bitrate": 160,
+                "x264opts": "scenecut=0"
+            }
         },
         {
             "name": "Vaughn Live / iNSTAGIB",
@@ -635,7 +653,7 @@
             "servers": [
                 {
                     "name": "Default",
-                    "url": "rtmp://rtmp-api.facebook.com:80/rtmp/"
+                    "url": "rtmps://rtmp-api.facebook.com:443/rtmp/"
                 }
             ],
             "recommended": {
@@ -650,6 +668,10 @@
             "common": true,
             "servers": [
                 {
+                    "name": "Autodetect",
+                    "url": "rtmp://live.restream.io/live"
+                },
+                {
                     "name": "EU-West (London, GB)",
                     "url": "rtmp://eu-london.restream.io/live"
                 },
@@ -662,6 +684,10 @@
                     "url": "rtmp://eu-luxembourg.restream.io/live"
                 },
                 {
+                    "name": "EU-West (Paris, FR)",
+                    "url": "rtmp://eu-paris.restream.io/live"
+                },
+                {
                     "name": "EU-Central (Frankfurt, DE)",
                     "url": "rtmp://eu-central.restream.io/live"
                 },
@@ -797,7 +823,48 @@
             "recommended": {
                 "keyint": 2,
                 "max video bitrate": 25000,
-                "max audio bitrate": 192
+                "max audio bitrate": 192,
+                "x264opts": "scenecut=0"
+            }
+        },
+        {
+            "name": "Castr.io",
+            "servers": [
+                {
+                    "name": "Chicago US",
+                    "url": "rtmp://cg.castr.io"
+                },
+                {
+                    "name": "Los Angeles US",
+                    "url": "rtmp://la.castr.io"
+                },
+                {
+                    "name": "Montreal CA",
+                    "url": "rtmp://qc.castr.io"
+                },
+                {
+                    "name": "London UK",
+                    "url": "rtmp://uk.castr.io"
+                },
+                {
+                    "name": "Frankfurt DE",
+                    "url": "rtmp://de.castr.io"
+                },
+                {
+                    "name": "Moscow RU",
+                    "url": "rtmp://ru.castr.io"
+                },
+                {
+                    "name": "Singapore",
+                    "url": "rtmp://sg.castr.io"
+                },
+                {
+                    "name": "Sydney AU",
+                    "url": "rtmp://au.castr.io"
+                }
+            ],
+            "recommended": {
+                "keyint": 2
             }
         },
         {
@@ -1232,6 +1299,40 @@
                     "url": "rtmp://rtmp.cdn.asset.aparat.com:443/event"
                 }
             ]
+        },
+        {
+            "name": "KakaoTV",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://rtmp.play.kakao.com/kakaotv"
+                }
+            ],
+            "recommended": {
+                "max video bitrate": 8000,
+                "max audio bitrate": 192
+            }
+        },
+        {
+            "name": "Piczel.tv",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://piczel.tv:1935/live"
+                }
+            ],
+            "recommended": {
+                "max video bitrate": 5000
+            }
+        },
+        {
+            "name": "DTube",
+            "servers": [
+                {
+                    "name": "Default",
+                    "url": "rtmp://stream.dtube.top/live/"
+                }
+            ]
         }
     ]
 }

obs-studio-21.1.2.tar.xz/plugins/rtmp-services/rtmp-common.c -> obs-studio-22.0.1.tar.xz/plugins/rtmp-services/rtmp-common.c Changed

@@ -26,6 +26,39 @@
 
 extern void twitch_ingests_refresh(int seconds);
 
+static void ensure_valid_url(struct rtmp_common *service, json_t *json,
+		obs_data_t *settings)
+{
+	json_t *servers = json_object_get(json, "servers");
+	const char *top_url = NULL;
+	json_t *server;
+	size_t index;
+
+	if (!service->server || !servers || !json_is_array(servers))
+		return;
+	if (astrcmpi(service->server, "auto") == 0)
+		return;
+
+	json_array_foreach (servers, index, server) {
+		const char *url = get_string_val(server, "url");
+		if (!url)
+			continue;
+
+		if (!top_url)
+			top_url = url;
+
+		if (astrcmpi(service->server, url) == 0)
+			return;
+	}
+
+	/* server was not found in server list, use first server instead */
+	if (top_url) {
+		bfree(service->server);
+		service->server = bstrdup(top_url);
+		obs_data_set_string(settings, "server", top_url);
+	}
+}
+
 static void rtmp_common_update(void *data, obs_data_t *settings)
 {
 	struct rtmp_common *service = data;
@@ -50,6 +83,8 @@
 				if (out)
 					service->output = bstrdup(out);
 			}
+
+			ensure_valid_url(service, serv, settings);
 		}
 	}
 	json_decref(root);
@@ -295,7 +330,7 @@
 		obs_property_list_add_string(servers_prop,
 				obs_module_text("Server.Auto"), "auto");
 	}
-	if (name && strcmp(name, "Twitch") == 0) {
+	if (strcmp(name, "Twitch") == 0) {
 		if (fill_twitch_servers(servers_prop))
 			return;
 	}

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ar-SA.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ar-SA.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/bn-BD.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/bn-BD.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ca-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ca-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/cs-CZ.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/cs-CZ.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/da-DK.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/da-DK.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/el-GR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/en-US.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/en-US.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/es-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/es-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/et-EE.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/et-EE.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/eu-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/eu-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/fil-PH.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/fil-PH.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/fr-FR.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/fr-FR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/gd-GB.ini Added

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/gl-ES.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/gl-ES.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/he-IL.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/he-IL.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/hr-HR.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/hr-HR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/hu-HU.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/hu-HU.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/it-IT.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/it-IT.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ja-JP.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ja-JP.ini Changed

obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ka-GE.ini Added

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ko-KR.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ko-KR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ms-MY.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ms-MY.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/nb-NO.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/nb-NO.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/nl-NL.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/nl-NL.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/pl-PL.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/pl-PL.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/pt-BR.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/pt-BR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/pt-PT.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/pt-PT.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ro-RO.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ro-RO.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/ru-RU.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/ru-RU.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/sk-SK.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/sk-SK.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/sl-SI.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/sl-SI.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/sr-CS.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/sr-CS.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/sr-SP.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/sr-SP.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/sv-SE.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/sv-SE.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/tl-PH.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/tl-PH.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/tr-TR.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/tr-TR.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/uk-UA.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/uk-UA.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/vi-VN.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/vi-VN.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/data/locale/zh-TW.ini -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/data/locale/zh-TW.ini Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/obs-convenience.c -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/obs-convenience.c Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/text-freetype2.c -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/text-freetype2.c Changed

@@ -136,6 +136,9 @@
 	obs_properties_add_bool(props, "log_mode",
 		obs_module_text("ChatLogMode"));
 
+	obs_properties_add_int(props, "log_lines",
+		obs_module_text("ChatLogLines"), 1, 1000, 1);
+
 	obs_properties_add_path(props,
 		"text_file", obs_module_text("TextFile"),
 		OBS_PATH_FILE, obs_module_text("TextFileFilter"), NULL);
@@ -169,7 +172,7 @@
 		FT_Done_Face(srcdata->font_face);
 		srcdata->font_face = NULL;
 	}
-	
+
 	for (uint32_t i = 0; i < num_cache_slots; i++) {
 		if (srcdata->cacheglyphs[i] != NULL) {
 			bfree(srcdata->cacheglyphs[i]);
@@ -324,7 +327,12 @@
 
 	bool from_file = obs_data_get_bool(settings, "from_file");
 	bool chat_log_mode = obs_data_get_bool(settings, "log_mode");
+	uint32_t log_lines = (uint32_t)obs_data_get_int(settings, "log_lines");
 
+	if (srcdata->log_lines != log_lines) {
+		srcdata->log_lines = log_lines;
+		vbuf_needs_update = true;
+	}
 	srcdata->log_mode = chat_log_mode;
 
 	if (ft2_lib == NULL) goto error;
@@ -381,7 +389,7 @@
 		goto error;
 	}
 	else {
-		FT_Set_Pixel_Sizes(srcdata->font_face, 0, srcdata->font_size); 
+		FT_Set_Pixel_Sizes(srcdata->font_face, 0, srcdata->font_size);
 		FT_Select_Charmap(srcdata->font_face, FT_ENCODING_UNICODE);
 	}
 
@@ -468,6 +476,8 @@
 	obs_data_set_default_int(font_obj, "size", 32);
 	obs_data_set_default_obj(settings, "font", font_obj);
 
+	obs_data_set_default_int(settings, "log_lines", 6);
+
 	obs_data_set_default_int(settings, "color1", 0xFFFFFFFF);
 	obs_data_set_default_int(settings, "color2", 0xFFFFFFFF);

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/text-freetype2.h -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/text-freetype2.h Changed

obs-studio-21.1.2.tar.xz/plugins/text-freetype2/text-functionality.c -> obs-studio-22.0.1.tar.xz/plugins/text-freetype2/text-functionality.c Changed

obs-studio-22.0.1.tar.xz/plugins/vlc-video/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/vlc-video/data/locale/ka-GE.ini Added

obs-studio-21.1.2.tar.xz/plugins/vlc-video/vlc-video-plugin.c -> obs-studio-22.0.1.tar.xz/plugins/vlc-video/vlc-video-plugin.c Changed

obs-studio-21.1.2.tar.xz/plugins/win-capture/cursor-capture.c -> obs-studio-22.0.1.tar.xz/plugins/win-capture/cursor-capture.c Changed

obs-studio-21.1.2.tar.xz/plugins/win-capture/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/win-capture/data/locale/el-GR.ini Changed

obs-studio-22.0.1.tar.xz/plugins/win-capture/data/locale/gd-GB.ini Added

@@ -0,0 +1,26 @@
+MonitorCapture="Glacadh uidheim-taisbeanaidh"
+WindowCapture="Glacadh uinneige"
+WindowCapture.Window="Uinneag"
+WindowCapture.Priority="Prìomhachas air maidseadh na h-uinneige"
+WindowCapture.Priority.Title="Feumaidh tiotal na h-uinneige a bhith co-ionnann"
+WindowCapture.Priority.Class="Maidsich an tiotal air neo lorg uinneag dhen aon seòrsa"
+WindowCapture.Priority.Exe="Maidsich an tiotal air neo lorg uinneag dhen aon fhaidhle sho-ghnìomhaichte"
+CaptureCursor="Glac an cùrsair"
+Compatibility="Co-chòrdalachd le iomadh adaptar"
+SLIFix="Modh glacadh SLI/Crossfire (slaodach)"
+AllowTransparency="Ceadaich trìd-shoillearachd"
+Monitor="Uidheam-taisbeanaidh"
+PrimaryMonitor="Am prìomh-mhonatair"
+GameCapture="Glacadh geama"
+GameCapture.AnyFullscreen="Glac aplacaid làn-sgrìn sam bith"
+GameCapture.CaptureWindow="Glac uinneag shònraichte"
+GameCapture.UseHotkey="Glac uinneag a’ bheulaibh le grad-iuchair"
+GameCapture.ForceScaling="Sparr sgèileadh air"
+GameCapture.ScaleRes="Dùmhlachd-bhreacaidh an sgèilidh"
+GameCapture.LimitFramerate="Cuingich reat fhrèamaichean a’ glacaidh"
+GameCapture.CaptureOverlays="Glac tar-chòmhdachaidhean treas-phàrtaidh (mar Steam)"
+GameCapture.AntiCheatHook="Cleachd huca airson co-chòrdalachd le gleusan an aghaidh cealgaireachd"
+GameCapture.HotkeyStart="Glac uinneag a’ bheulaibh"
+GameCapture.HotkeyStop="Cuir an glacadh à gnìomh"
+Mode="Modh"
+

obs-studio-22.0.1.tar.xz/plugins/win-capture/data/locale/ka-GE.ini Added

@@ -0,0 +1,26 @@
+MonitorCapture="ეკრანის გადაღება"
+WindowCapture="ფანჯრის გადაღება"
+WindowCapture.Window="ფანჯარა"
+WindowCapture.Priority="უპირატესობა ფანჯრის შერჩევისას"
+WindowCapture.Priority.Title="ფანჯრის დასახელების შესაბამისობა"
+WindowCapture.Priority.Class="დასახელების შესაბამისობა, წინააღმდეგ შემთხვევაში, მსგავსი სახის ფანჯრის მონახვა"
+WindowCapture.Priority.Exe="დასახელების შესაბამისობა, წინააღმდეგ შემთხვევაში, იმავე გამშვების ფანჯრის მონახვა"
+CaptureCursor="მაჩვენებლის ასახვა"
+Compatibility="მრავალდაფიან სისტემასთან თავსებადობა"
+SLIFix="SLI/Crossfire გადაღების რეჟიმი (ნელი)"
+AllowTransparency="გამჭვირვალობის დაშვება"
+Monitor="ეკრანი"
+PrimaryMonitor="ძირითადი მონიტორი"
+GameCapture="თამაშის გადაღება"
+GameCapture.AnyFullscreen="ნებისმიერი სრულეკრანიანი პროგრამის გადაღება"
+GameCapture.CaptureWindow="ცალკეული ფანჯრის გადაღება"
+GameCapture.UseHotkey="ზედა ფანჯრის გადაღება სწრაფი ღილაკით"
+GameCapture.ForceScaling="იძულებითი მასშტაბირება"
+GameCapture.ScaleRes="მასშტაბირების გაფართოება"
+GameCapture.LimitFramerate="გადაღების კადრის სიხშირის შეზღუდვა"
+GameCapture.CaptureOverlays="სხვა პროგრამის შრეების გადაღებაც (როგორიცაა steam)"
+GameCapture.AntiCheatHook="თაღლითობის საწინააღმდეგო საშუალებებთან თავსებადობა"
+GameCapture.HotkeyStart="ზედა ფანჯრის გადაღება"
+GameCapture.HotkeyStop="გადაღების გაუქმება"
+Mode="რეჟიმი"
+

obs-studio-21.1.2.tar.xz/plugins/win-capture/data/locale/nb-NO.ini -> obs-studio-22.0.1.tar.xz/plugins/win-capture/data/locale/nb-NO.ini Changed

obs-studio-21.1.2.tar.xz/plugins/win-capture/dc-capture.c -> obs-studio-22.0.1.tar.xz/plugins/win-capture/dc-capture.c Changed

obs-studio-21.1.2.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-22.0.1.tar.xz/plugins/win-capture/game-capture.c Changed

obs-studio-21.1.2.tar.xz/plugins/win-capture/load-graphics-offsets.c -> obs-studio-22.0.1.tar.xz/plugins/win-capture/load-graphics-offsets.c Changed

@@ -153,11 +153,11 @@
 	return !ver_mismatch;
 }
 
-bool load_graphics_offsets(bool is32bit)
+bool load_graphics_offsets(bool is32bit, const char *config_path)
 {
 	char *offset_exe_path = NULL;
 	struct dstr offset_exe = {0};
-	char *config_ini = NULL;
+	struct dstr config_ini = {0};
 	struct dstr str = {0};
 	os_process_pipe_t *pp;
 	bool success = false;
@@ -188,10 +188,12 @@
 		dstr_ncat(&str, data, len);
 	}
 
-	config_ini = obs_module_config_path(is32bit ? "32.ini" : "64.ini");
-	os_quick_write_utf8_file_safe(config_ini, str.array, str.len, false,
+	dstr_copy(&config_ini, config_path);
+	dstr_cat(&config_ini, is32bit ? "32.ini" : "64.ini");
+
+	os_quick_write_utf8_file_safe(config_ini.array, str.array, str.len, false,
 			"tmp", NULL);
-	bfree(config_ini);
+	dstr_free(&config_ini);
 
 	success = load_offsets_from_string(is32bit ? &offsets32 : &offsets64,
 			str.array);
@@ -208,17 +210,18 @@
 	return success;
 }
 
-bool load_cached_graphics_offsets(bool is32bit)
+bool load_cached_graphics_offsets(bool is32bit, const char *config_path)
 {
-	char *config_ini = NULL;
+	struct dstr config_ini = {0};
 	bool success;
 
-	config_ini = obs_module_config_path(is32bit ? "32.ini" : "64.ini");
+	dstr_copy(&config_ini, config_path);
+	dstr_cat(&config_ini, is32bit ? "32.ini" : "64.ini");
 	success = load_offsets_from_file(is32bit ? &offsets32 : &offsets64,
-			config_ini);
+			config_ini.array);
 	if (!success)
-		success = load_graphics_offsets(is32bit);
+		success = load_graphics_offsets(is32bit, config_path);
 
-	bfree(config_ini);
+	dstr_free(&config_ini);
 	return success;
 }

obs-studio-21.1.2.tar.xz/plugins/win-capture/plugin-main.c -> obs-studio-22.0.1.tar.xz/plugins/win-capture/plugin-main.c Changed

@@ -14,8 +14,8 @@
 static HANDLE init_hooks_thread = NULL;
 
 extern bool cached_versions_match(void);
-extern bool load_cached_graphics_offsets(bool is32bit);
-extern bool load_graphics_offsets(bool is32bit);
+extern bool load_cached_graphics_offsets(bool is32bit, const char *config_path);
+extern bool load_graphics_offsets(bool is32bit, const char *config_path);
 
 /* temporary, will eventually be erased once we figure out how to create both
  * 32bit and 64bit versions of the helpers/hook */
@@ -27,20 +27,22 @@
 
 #define USE_HOOK_ADDRESS_CACHE false
 
-static DWORD WINAPI init_hooks(LPVOID unused)
+static DWORD WINAPI init_hooks(LPVOID param)
 {
+	char *config_path = param;
+
 	if (USE_HOOK_ADDRESS_CACHE &&
 	    cached_versions_match() &&
-	    load_cached_graphics_offsets(IS32BIT)) {
+	    load_cached_graphics_offsets(IS32BIT, config_path)) {
 
-		load_cached_graphics_offsets(!IS32BIT);
+		load_cached_graphics_offsets(!IS32BIT, config_path);
 		obs_register_source(&game_capture_info);
 
-	} else if (load_graphics_offsets(IS32BIT)) {
-		load_graphics_offsets(!IS32BIT);
+	} else if (load_graphics_offsets(IS32BIT, config_path)) {
+		load_graphics_offsets(!IS32BIT, config_path);
 	}
 
-	UNUSED_PARAMETER(unused);
+	bfree(config_path);
 	return 0;
 }
 
@@ -85,7 +87,9 @@
 
 	obs_register_source(&window_capture_info);
 
-	init_hooks_thread = CreateThread(NULL, 0, init_hooks, NULL, 0, NULL);
+	char *config_path = obs_module_config_path(NULL);
+
+	init_hooks_thread = CreateThread(NULL, 0, init_hooks, config_path, 0, NULL);
 	obs_register_source(&game_capture_info);
 
 	return true;

obs-studio-21.1.2.tar.xz/plugins/win-dshow/data/locale/el-GR.ini -> obs-studio-22.0.1.tar.xz/plugins/win-dshow/data/locale/el-GR.ini Changed

@@ -1,6 +1,8 @@
 VideoCaptureDevice="Συσκευή Λήψης Βίντεο"
 Device="Συσκευή"
+ColorSpace="Χώρος χρωμάτων YUV"
 ColorSpace.Default="Προεπιλογή"
+ColorRange="Ποικιλία χρωμάτων YUV"
 ColorRange.Partial="Μερικό"
 ColorRange.Full="Πλήρες"
 ConfigureAudio="Ρύθμιση Ήχου"
@@ -22,11 +24,14 @@
 UseCustomAudioDevice="Χρήση προσαρμοσμένης συσκευής ήχου"
 AudioDevice="Συσκευή Ήχου"
 Buffering="Γίνεται φόρτωση"
+Buffering.ToolTip="Όταν είναι ενεργοποιημένο, το buffer ήχου/βίντεο δεδομένων θα διασφαλιστεί η ομαλότερη και πιο\ακριβή αναπαραγωγή, αλλά με κόστος την αύξηση του λανθάνοντα χρόνου. Όταν χρησιμοποιείτε\nbuffering με μια κάρτα καταγραφής βίντεο, συνιστάται να ορίσετε την κάρτα και το\nprogram στο ίδιο framerate για καλύτερα αποτελέσματα.\n\εξασφαλίζει χαμηλότερο latency αναπαραγωγή, αλλά με το κόστος των πλαισίων\nplayback ακρίβεια. Αυτό είναι ιδανικό για το πρόσωπο κάμερες, ή όταν θέλετε να χρησιμοποιήσετε το\nprogram είναι το παράθυρο προεπισκόπησης για να παίξει μια κονσόλα.\n\nAuto-detect (προεπιλογή) σύνολα για να ενεργοποιηθεί εάν η συσκευή σας έχει καθυστέρηση, και άτομα με ειδικές ανάγκες\nif δεν έχει καμία καθυστέρηση."
+Buffering.AutoDetect="Αυτόματος εντοπισμός"
 Buffering.Enable="Ενεργοποίηση"
 Buffering.Disable="Απενεργοποίηση"
 Activate="Ενεργοποίηση"
 Deactivate="Απενεργοποίηση"
 FlipVertically="Κάθετη αναστροφή"
+DeactivateWhenNotShowing="Απενεργοποίηση όταν δεν εμφανίζεται"
 
 Bitrate="Ρυθμός μετάδοσης bit"
 Encoder.C985="Κωδικοποιητής H.264 της AVerMedia (c985)"

obs-studio-22.0.1.tar.xz/plugins/win-dshow/data/locale/gd-GB.ini Added

@@ -0,0 +1,38 @@
+VideoCaptureDevice="Uidheam glacadh video"
+Device="Uidheam"
+ColorSpace="Spàs dhathan YUV"
+ColorSpace.Default="Bun-roghainn"
+ColorRange="Rainse dhathan YUV"
+ColorRange.Partial="Leth-phàirteach"
+ColorRange.Full="Làn"
+ConfigureAudio="Rèitich an fhuaim"
+ConfigureVideo="Rèitich a’ video"
+ConfigureCrossbar="Rèitich crois-bhàraichean"
+ResFPSType="Seòrsa de dhùmhlachd-bhreacaidh/FPS"
+ResFPSType.Custom="Gnàthaichte"
+ResFPSType.DevPreferred="Bun-roghainn an uidheim"
+FPS.Matching="Co-fhreagair às-chur nan FPS"
+FPS.Highest="Na FPS as àirde"
+Resolution="Dùmhlachd-bhreacaidh"
+VideoFormat="Fòrmat a’ video"
+VideoFormat.Any="Gin sam bith"
+VideoFormat.Unknown="Chan eil fhios (%1)"
+AudioOutputMode="Modh às-chur fuaime"
+AudioOutputMode.Capture="Glac an fhuaim a-mhàin"
+AudioOutputMode.DirectSound="Fuaim às-chur an deasg (DirectSound)"
+AudioOutputMode.WaveOut="Fuaim às-chur an deasg (WaveOut)"
+UseCustomAudioDevice="Cleachd uidheam fuaime gnàthaichte"
+AudioDevice="Uidheam fuaime"
+Buffering="Bufaireadh"
+Buffering.AutoDetect="Mothachadh leis fhèin"
+Buffering.Enable="Cuir an comas"
+Buffering.Disable="Cuir à comas"
+Activate="Gnìomhaich"
+Deactivate="Cuir à gnìomh"
+FlipVertically="Thoir flip gu h-inghearach"
+DeactivateWhenNotShowing="Cuir à gnìomh mur eil e ’ga shealltainn"
+
+Bitrate="Reat bhiotaichean"
+Encoder.C985="Inneal-còdachaidh AVerMedia H.264 (c985)"
+Encoder.C353="Inneal-còdachaidh AVerMedia H.264"
+

obs-studio-22.0.1.tar.xz/plugins/win-dshow/data/locale/ka-GE.ini Added

@@ -0,0 +1,39 @@
+VideoCaptureDevice="ვიდეოს ჩამწერი მოწყობილობა"
+Device="მოწყობილობა"
+ColorSpace="YUV ფერთა სისტემა"
+ColorSpace.Default="ნაგულისხმევი"
+ColorRange="YUV ფერთა გამა"
+ColorRange.Partial="ნაწილობრივი"
+ColorRange.Full="სრული"
+ConfigureAudio="ხმის გამართვა"
+ConfigureVideo="ვიდეოს გამართვა"
+ConfigureCrossbar="შემავალი სიგნალების გამართვა"
+ResFPSType="გაფართოება/FPS სახეობა"
+ResFPSType.Custom="მითითებული"
+ResFPSType.DevPreferred="მოწყობილობის ნაგულისხმევი"
+FPS.Matching="გამომავალი ვიდეოს FPS-ის შესაბამისი"
+FPS.Highest="უმაღლესი FPS"
+Resolution="გაფართოება"
+VideoFormat="ვიდეოს ფორმატი"
+VideoFormat.Any="ნებისმიერი"
+VideoFormat.Unknown="უცნობი (%1)"
+AudioOutputMode="ხმის გამოტანის რეჟიმი"
+AudioOutputMode.Capture="ხმის ჩაწერა მხოლოდ"
+AudioOutputMode.DirectSound="გამომავალი ხმა (DirectSound)"
+AudioOutputMode.WaveOut="გამომავალი ხმა (WaveOut)"
+UseCustomAudioDevice="ხმის მითითებული მოწყობილობის გამოყენება"
+AudioDevice="ხმის მოწყობილობა"
+Buffering="ბუფერიზაცია"
+Buffering.ToolTip="როცა ჩართულია, მიმდინარეობს ვიდეოს/ხმის მონაცემების ბუფერიზაცია, რაც უზრუნველყოფს შეუფერხებლად და უმაღლესი\nხარისხით გადაცემას, თუმცა გაზრდილი დაყოვნების ხარჯზე.  როცა იყენებთ\nბუფერიზაციას ვიდეოს ჩამწერი დაფით, სასურველია, რომ აპარატურასა და\nპროგრამას მიეთითოს ერთი და იგივე კადრის სიხშირე, საუკეთესო შედეგის მისაღებად.\n\nროცა გამორთულია, დაყოვნება მეტად მცირეა, თუმცა კადრების\nგადაცემის სისუფთავის ხარჯზე. ეს მეტად გამოსადეგია, კამერით გადაღებისას ან\nპროგრამის შესათვალიერებელი ფანჯრისთვის, ვიდეოთამაშისას.\n\nთვითშერჩევით (ნაგულისხმევი) მიეთითება ჩართვა, თუ მოწყობილობას აქვს დაყოვნება, ხოლო გამორთვა\n იმ შემთხვევაში, თუ არ აქვს დაყოვნება."
+Buffering.AutoDetect="თვითშერჩევა"
+Buffering.Enable="ჩართვა"
+Buffering.Disable="გამორთვა"
+Activate="ამოქმედება"
+Deactivate="გაუქმება"
+FlipVertically="შვეულად შეტრიალება"
+DeactivateWhenNotShowing="გაუქმება, როცა არ ჩანს"
+
+Bitrate="ბიტური სიხშირე"
+Encoder.C985="AVerMedia H.264 დამშიფრავი (c985)"
+Encoder.C353="AVerMedia H.264 დამშიფრავი"
+

obs-studio-21.1.2.tar.xz/plugins/win-dshow/win-dshow.cpp -> obs-studio-22.0.1.tar.xz/plugins/win-dshow/win-dshow.cpp Changed

@@ -150,6 +150,7 @@
 enum class Action {
 	None,
 	Activate,
+	ActivateBlock,
 	Deactivate,
 	Shutdown,
 	ConfigVideo,
@@ -179,6 +180,7 @@
 	obs_source_audio audio;
 
 	WinHandle semaphore;
+	WinHandle activated_event;
 	WinHandle thread;
 	CriticalSection mutex;
 	vector<Action> actions;
@@ -190,6 +192,16 @@
 		ReleaseSemaphore(semaphore, 1, nullptr);
 	}
 
+	inline void QueueActivate(obs_data_t *settings)
+	{
+		bool block = obs_data_get_bool(settings, "synchronous_activate");
+		QueueAction(block ? Action::ActivateBlock : Action::Activate);
+		if (block) {
+			obs_data_erase(settings, "synchronous_activate");
+			WaitForSingleObject(activated_event, INFINITE);
+		}
+	}
+
 	inline DShowInput(obs_source_t *source_, obs_data_t *settings)
 		: source         (source_),
 		  device         (InitGraph::False)
@@ -204,6 +216,10 @@
 		if (!semaphore)
 			throw "Failed to create semaphore";
 
+		activated_event = CreateEvent(nullptr, false, false, nullptr);
+		if (!activated_event)
+			throw "Failed to create activated_event";
+
 		thread = CreateThread(nullptr, 0, DShowThread, this, 0,
 				nullptr);
 		if (!thread)
@@ -215,7 +231,7 @@
 		if (obs_data_get_bool(settings, "active")) {
 			bool showing = obs_source_showing(source);
 			if (!deactivateWhenNotShowing || showing)
-				QueueAction(Action::Activate);
+				QueueActivate(settings);
 
 			active = true;
 		}
@@ -304,13 +320,18 @@
 
 		switch (action) {
 		case Action::Activate:
+		case Action::ActivateBlock:
 			{
+				bool block = action == Action::ActivateBlock;
+
 				obs_data_t *settings;
 				settings = obs_source_get_settings(source);
 				if (!Activate(settings)) {
 					obs_source_output_video(source,
 							nullptr);
 				}
+				if (block)
+					SetEvent(activated_event);
 				obs_data_release(settings);
 				break;
 			}
@@ -1075,9 +1096,7 @@
 {
 	DShowInput *input = reinterpret_cast<DShowInput*>(data);
 	if (input->active)
-		input->QueueAction(Action::Activate);
-
-	UNUSED_PARAMETER(settings);
+		input->QueueActivate(settings);
 }
 
 static void GetDShowDefaults(obs_data_t *settings)

obs-studio-22.0.1.tar.xz/plugins/win-mf/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/win-mf/data/locale/ka-GE.ini Added

@@ -0,0 +1,30 @@
+MFAACEnc="Media Foundation AAC დამშიფრავი"
+Bitrate="ბიტური სიხშირე"
+
+MF.H264.EncoderName="Media Foundation H264 დამშიფრავი"
+MF.H264.Encoder="დამშიფრავის სახელი"
+MF.H264.LowLatency="მცირე დაყოვნება (კადრის გადალაგების გათიშვა)"
+MF.H264.BFrames="თანმიმდევრული B-კადრის რაოდენობა"
+MF.H264.CustomBufsize="ბუფერის მითითებული ზომის გამოყენება"
+MF.H264.BufferSize="ბუფერის ზომა"
+MF.H264.CustomMaxBitrate="მითითებული დასაშვები ბიტური სიხშირე"
+MF.H264.Bitrate="ბიტური სიხშირე"
+MF.H264.MaxBitrate="უმაღლესი დასაშვები ბიტური სიხშირე"
+MF.H264.KeyframeIntervalSec="საკვანძო კადრებს შორის შუალედი (წამი, 0=თვითშერჩევა)"
+MF.H264.RateControl="სიხშირის მართვა"
+MF.H264.CBR="CBR (მუდმივი ბიტური სიხშირე)"
+MF.H264.VBR="VBR (ცვლადი ბიტური სიხშირე)"
+MF.H264.CQP="CQP (ხარისხის მუდმივი დონე)"
+MF.H264.MinQP="უმცირესი QP"
+MF.H264.MaxQP="უმაღლესი QP"
+MF.H264.QPI="QP I-კადრი"
+MF.H264.QPP="QP P-კადრი"
+MF.H264.QPB="QP B-კადრი"
+MF.H264.Profile="პროფილი"
+MF.H264.Advanced="გაფართოებული"
+
+MF.H264.EncoderSWMicrosoft="Microsoft Software H.264 დამშიფრავი"
+MF.H264.EncoderHWAMD="AMD Video Coding Engine (VCE) 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-21.1.2.tar.xz/plugins/win-mf/mf-common.cpp -> obs-studio-22.0.1.tar.xz/plugins/win-mf/mf-common.cpp Changed

obs-studio-22.0.1.tar.xz/plugins/win-wasapi/data/locale/gd-GB.ini Added

obs-studio-22.0.1.tar.xz/plugins/win-wasapi/data/locale/ka-GE.ini Added