Request 2967 (accepted)

obs-studio.changes Changed

@@ -1,4 +1,88 @@
 -------------------------------------------------------------------
+Fri Nov 04 15:36:07 UTC 2016 - jimmy@boombatower.com
+
+- Update to version 0.16.4:
+  * libobs/util: Fix get_dll_ver not reporting DLL name
+  * Display license in MSI installer
+  * rtmp-services: Add Asian Livecoding.tv server and increase video bitrate
+  * UI: Enable HiDPI scaling.
+  * frontend-tools: Fix crash when adding invalid regex
+  * UI: Use Qt lib for screen info instead of x11 libs
+  * enc-amf: Update to 1.3.2.3
+  * UI: Only scale HiDPI on QT 5.6+
+  * enc-amf: Update to 1.3.3.1
+  * libobs-d3d11: Log GetDeviceRemovedReason
+  * Add 256x256 icon to windows ico for HiDPI displays
+  * UI: Add Portable Mode indicator to title bar and log
+  * UI: Add raw text and text file to drag&drop support
+  * UI: Split Properties window with a QSplitter
+  * CMake: Warn if empty QTDIR/DepsPath vars on Windows
+  * OSX Travis build
+  * CI: Upload artifacts on all pushes
+  * CI: Add irc notifications to travis config
+  * CI: Reduce travis irc notice to one line
+  * CI: Package OSX build into an actual app
+  * CI: Use python2 to run package script
+  * Build browser plugin on travis for OSX
+  * Update obs-browser submodule to a working version
+  * obs-frontend-api: Add library version
+  * cmake: Fix FFmpeg search path on debian
+  * decklink: Update Blackmagic SDK to 10.8.0
+  * CI: Build on OSX 10.10 on travis
+  * UI: Fix bug in frontend API event
+  * frontend-tools: Add output timers
+  * frontend-tools: Code cleanup of output timers
+  * frontend-tools: Add ability to start timer if output is already active
+  * UI: Fix sys. tray crashes when sys. tray not available
+  * UI: Fix poor handling of system tray pointers
+  * UI: Fix improper brace placement for function
+  * UI: Remove unused variable
+  * UI: Fix full screen projector on screens that have reserved areas
+  * obs-ffmpeg: Add b-frames to NVENC logging
+  * UI: Fix --profile option not working on non-windows
+  * rtmp-services: Add Picarto
+  * libobs/util: Add Get() function to CoTaskMemPtr
+  * libobs: Fix missing call to profile_end() when encoding fails
+  * libobs: Add date/time to crash handler
+  * obs-transitions: Avoid branching in slide_transition.effect
+  * obs-ffmpeg: Fix a couple printf compiler warnings.
+  * libobs-d3d11: Store dxgi adapter used for device
+  * libobs-d3d11: Store compiled shader data (for rebuilding)
+  * libobs-d3d11: Correct error message for pixel shaders
+  * libobs-d3d11: Store shader samplers as pointers
+  * libobs-d3d11: Correct error message for staging surfaces
+  * libobs-d3d11: Correct error message creating blend states
+  * libobs-d3d11: Store index and add "Start" function
+  * libobs-d3d11: Clear device state before unloading
+  * libobs-d3d11: Store swap initialization data (for rebuilding)
+  * libobs-d3d11: Store device adapter index (for rebuilding)
+  * libobs-d3d11: Store static textures in RAM (for rebuilding)
+  * libobs-d3d11: Store static vertex buffer data (for rebuilding)
+  * libobs-d3d11: Save all D3D11 object descriptors (for rebuilding)
+  * libobs-d3d11: Make shared texture error message less vague
+  * libobs-d3d11: Use linked list for all objects (for rebuilding)
+  * libobs-d3d11: Remove unused function
+  * libobs-d3d11: Add Release funtions to all GS objects
+  * libobs-d3d11: Rebuild device and assets if device removed/reset
+  * win-capture: Cache cursor textures to prevent reallocation
+  * win-capture: Use IUnknown for getting swap backbuffers
+  * win-capture: Add D3D12 capture support
+  * UI: Allow the ability to use deprecated sources
+  * UI: Add AMD presets and update settings
+  * enc-amf: Update to release 1.4.0.0
+  * Update translations from CrowdIn
+  * libobs: Update to version 0.16.3
+  * win-mf: Deprecate AMD Media Foundation H.264 encoder
+  * UI: Fix tab order of Crop fields in Transform Properties
+  * enc-amf: Update to Version 1.4.1.0
+  * Revert "UI: Only scale HiDPI on QT 5.6+"
+  * Revert "UI: Enable HiDPI scaling."
+  * enc-amf: Fix VS2013 compiling issue
+  * libobs: Update to version 0.16.4
+- Expand libobs-frontend-api.so to include all versions in %files.
+- After upstream fix place libobs-(opengl|frontend-api).so in devel.
+
+-------------------------------------------------------------------
 Thu Sep 29 20:07:16 UTC 2016 - jimmy@boombatower.com
 
 - Update to version 0.16.2:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/InstallerLicense.txt Deleted

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

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/Libs Deleted

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/Libs/16.8.3 Deleted

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/Libs/16.8.3/amfrt64.i64 Deleted

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/Libs/16.9.2 Deleted

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/Libs/16.9.2/amfrt32.i64 Deleted

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#ThirdParty Deleted

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#ThirdParty/README.md Deleted

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

@@ -1,82 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2016 Michael Fabian Dirks
-
-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
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <stdint.h>
-#include <inttypes.h>
-
-// Plugin
-#include "plugin.h"
-#include "amd-amf.h"
-#include "amd-amf-vce.h"
-#include "amd-amf-vce-capabilities.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-namespace Plugin {
-	namespace Interface {
-		class H264SimpleInterface {
-			//////////////////////////////////////////////////////////////////////////
-			// Static Code
-			//////////////////////////////////////////////////////////////////////////
-			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 ui_modified(obs_properties_t *props, obs_property_t *property, obs_data_t *settings);
-			
-			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:
-
-			H264SimpleInterface(obs_data_t* settings, obs_encoder_t* encoder);
-			~H264SimpleInterface();
-
-			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:
-			Plugin::AMD::VCEEncoder* m_VideoEncoder;
-
-		};
-	}
-}
\ No newline at end of file

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

@@ -1,987 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2016 Michael Fabian Dirks
-
-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.
-*/
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include "enc-h264-simple.h"
-
-#if (defined _WIN32) | (defined _WIN64)
-#include <VersionHelpers.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Defines
-//////////////////////////////////////////////////////////////////////////
-
-// Simple Interface
-#define AMF_H264SIMPLE_NAME						TEXT_AMF_H264SIMPLE("Name")
-#define AMF_H264SIMPLE_PRESET					TEXT_AMF_H264SIMPLE("Preset")
-#define AMF_H264SIMPLE_PRESET_RECORDING			TEXT_AMF_H264SIMPLE("Preset.Recording")
-#define AMF_H264SIMPLE_PRESET_TWITCH			TEXT_AMF_H264SIMPLE("Preset.Twitch")
-#define AMF_H264SIMPLE_PRESET_YOUTUBE			TEXT_AMF_H264SIMPLE("Preset.YouTube")
-#define AMF_H264SIMPLE_PRESET_HIGHQUALTIY		TEXT_AMF_H264SIMPLE("Preset.HighQuality")
-#define AMF_H264SIMPLE_PRESET_INDISTINGUISHABLE	TEXT_AMF_H264SIMPLE("Preset.Indistinguishable")
-#define AMF_H264SIMPLE_PRESET_LOSSLESS			TEXT_AMF_H264SIMPLE("Preset.Lossless")
-#define AMF_H264SIMPLE_KEYFRAME_INTERVAL		TEXT_AMF_H264SIMPLE("KeyframeInterval")
-#define AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE	TEXT_AMF_H264SIMPLE("UseCustomBufferSize")
-#define AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE		TEXT_AMF_H264SIMPLE("CustomBufferSize")
-#define AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS	TEXT_AMF_H264SIMPLE("CustomBufferFullness")
-#define AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE		TEXT_AMF_H264SIMPLE("UseCustomGOPSize")
-#define AMF_H264SIMPLE_ADVANCED_SHOW_PARAMETERS	TEXT_AMF_H264SIMPLE("ShowAdvancedParameters")
-#define AMF_H264SIMPLE_EXPERT_SHOW_PARAMETERS	TEXT_AMF_H264SIMPLE("ShowExpertParameters")
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-using namespace Plugin;
-using namespace Plugin::AMD;
-using namespace Plugin::Interface;
-
-enum Preset {
-	Preset_Recording,
-	Preset_Twitch,
-	Preset_YouTube,
-	Preset_HighQuality,
-	Preset_Indistinguishable,
-	Preset_Lossless,
-};
-
-void Plugin::Interface::H264SimpleInterface::encoder_register() {
-	static obs_encoder_info* encoder_info = new obs_encoder_info();
-	static const char* encoder_name = "amd_amf_h264_simple";
-	static const char* encoder_codec = "h264";
-
-	std::memset(encoder_info, 0, sizeof(obs_encoder_info));
-
-	// Initialize Structure
-	encoder_info->id = encoder_name;
-	encoder_info->type = obs_encoder_type::OBS_ENCODER_VIDEO;
-	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);
-}
-
-const char* Plugin::Interface::H264SimpleInterface::get_name(void*) {
-	return obs_module_text(AMF_H264SIMPLE_NAME);
-}
-
-void Plugin::Interface::H264SimpleInterface::get_defaults(obs_data_t *data) {
-	// Main Properties
-	/// Preset
-	obs_data_set_default_int(data, AMF_H264SIMPLE_PRESET, -1);
-	/// Keyframe Interval
-	obs_data_set_default_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 2);
-	/// Quality Preset
-	obs_data_set_default_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Balanced);
-	/// Profile
-	obs_data_set_default_int(data, AMF_H264_PROFILE, VCEProfile_Main);
-	obs_data_set_default_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_41);
-	/// Rate Control
-	obs_data_set_default_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
-	obs_data_set_default_int(data, AMF_H264_QP_MINIMUM, 18);
-	obs_data_set_default_int(data, AMF_H264_QP_MAXIMUM, 51);
-	/// Rate Control: CBR, VBR
-	obs_data_set_default_int(data, AMF_H264_BITRATE_TARGET, 2500);
-	obs_data_set_default_int(data, AMF_H264_BITRATE_PEAK, 2500);
-	/// Rate Control: Constant QP
-	obs_data_set_default_int(data, AMF_H264_QP_IFRAME, 22);
-	obs_data_set_default_int(data, AMF_H264_QP_PFRAME, 22);
-	obs_data_set_default_int(data, AMF_H264_QP_BFRAME, 22);
-	/// VBV Buffer
-	obs_data_set_default_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-	obs_data_set_default_int(data, AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE, 2500);
-	obs_data_set_default_double(data, AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS, 100.0);
-	/// Frame Skipping
-	obs_data_set_default_bool(data, AMF_H264_FRAMESKIPPING, false);
-
-	// Advanced Properties
-	obs_data_set_default_bool(data, AMF_H264SIMPLE_ADVANCED_SHOW_PARAMETERS, false);
-	obs_data_set_default_int(data, AMF_H264_BPICTURE_PATTERN, 0);
-	obs_data_set_default_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
-	obs_data_set_default_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-	obs_data_set_default_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-	obs_data_set_default_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
-	obs_data_set_default_int(data, AMF_H264_DEBLOCKINGFILTER, 0);
-
-	// Expert Properties
-	obs_data_set_default_bool(data, AMF_H264SIMPLE_EXPERT_SHOW_PARAMETERS, false);
-	obs_data_set_default_int(data, AMF_H264_MEMORYTYPE, VCEMemoryType_Host);
-	obs_data_set_default_int(data, AMF_H264_COMPUTETYPE, VCEComputeType_None);
-	obs_data_set_default_int(data, AMF_H264_SURFACEFORMAT, -1);
-	/// GOP Size
-	obs_data_set_default_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-	obs_data_set_default_int(data, AMF_H264_GOP_SIZE, 60);
-	/// CABAC
-	obs_data_set_default_bool(data, AMF_H264_CABAC, true);
-
-	// Debug Mode
-	obs_data_set_default_bool(data, AMF_H264_DEBUGTRACING, false);
-
-	//////////////////////////////////////////////////////////////////////////
-	// OBS - Enforce Streaming Service Restrictions
-	//////////////////////////////////////////////////////////////////////////
-	obs_data_set_default_int(data, "bitrate", -1);
-	obs_data_set_default_int(data, "keyint_sec", -1);
-	obs_data_set_default_string(data, "rate_control", "");
-	obs_data_set_default_string(data, "profile", "");
-	obs_data_set_int(data, "bitrate", -1);
-	obs_data_set_int(data, "keyint_sec", -1);
-	obs_data_set_string(data, "rate_control", "");
-	obs_data_set_string(data, "profile", "");
-}
-
-obs_properties_t* Plugin::Interface::H264SimpleInterface::get_properties(void*) {
-	obs_properties* props = obs_properties_create();
-	obs_property_t* list;
-	obs_property_t* p;
-
-	// Main Properties
-	/// Preset
-	list = obs_properties_add_list(props, AMF_H264SIMPLE_PRESET, obs_module_text(AMF_H264SIMPLE_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, "", -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_TWITCH), Preset_Twitch);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_YOUTUBE), Preset_YouTube);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_RECORDING), Preset_Recording);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_HIGHQUALTIY), Preset_HighQuality);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_INDISTINGUISHABLE), Preset_Indistinguishable);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_LOSSLESS), Preset_Lossless);
-	obs_property_set_modified_callback(list, &ui_modified);
-
-	/// Key-Frame Interval
-	obs_properties_add_int(props, AMF_H264SIMPLE_KEYFRAME_INTERVAL, obs_module_text(AMF_H264SIMPLE_KEYFRAME_INTERVAL), 1, 60, 1);
-
-	/// Quality Preset
-	list = obs_properties_add_list(props, AMF_H264_QUALITY_PRESET, obs_module_text(AMF_H264_QUALITY_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_QUALITY_PRESET_SPEED), Plugin::AMD::VCEQualityPreset::VCEQualityPreset_Speed);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_QUALITY_PRESET_BALANCED), Plugin::AMD::VCEQualityPreset::VCEQualityPreset_Balanced);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_QUALITY_PRESET_QUALITY), Plugin::AMD::VCEQualityPreset::VCEQualityPreset_Quality);
-
-	/// Profile
-	list = obs_properties_add_list(props, AMF_H264_PROFILE, obs_module_text(AMF_H264_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, "Baseline", Plugin::AMD::VCEProfile::VCEProfile_Baseline);
-	obs_property_list_add_int(list, "Main", Plugin::AMD::VCEProfile::VCEProfile_Main);
-	obs_property_list_add_int(list, "High", Plugin::AMD::VCEProfile::VCEProfile_High);
-
-	/// Profile Level
-	list = obs_properties_add_list(props, AMF_H264_PROFILELEVEL, obs_module_text(AMF_H264_PROFILELEVEL), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	switch (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel) {
-		case 62:
-			obs_property_list_add_int(list, "6.2", VCEProfileLevel_62);
-		case 61:
-			obs_property_list_add_int(list, "6.1", VCEProfileLevel_61);
-		case 60:
-			obs_property_list_add_int(list, "6.0", VCEProfileLevel_60);
-		case 52:
-			obs_property_list_add_int(list, "5.2", VCEProfileLevel_52);
-		case 51:
-			obs_property_list_add_int(list, "5.1", VCEProfileLevel_51);
-		case 50:
-			obs_property_list_add_int(list, "5.0", VCEProfileLevel_50);
-		case 42: // Some VCE 2.0 Cards.
-			obs_property_list_add_int(list, "4.2", VCEProfileLevel_42);
-		case 41: // Some APUs and VCE 1.0 Cards.
-			obs_property_list_add_int(list, "4.1", VCEProfileLevel_41);
-		case 40: // These should in theory be supported by all VCE 1.0 devices and APUs.
-			obs_property_list_add_int(list, "4.0", VCEProfileLevel_40);
-		case 32:
-			obs_property_list_add_int(list, "3.2", VCEProfileLevel_32);
-		case 31:
-			obs_property_list_add_int(list, "3.1", VCEProfileLevel_31);
-		case 30:
-			obs_property_list_add_int(list, "3.0", VCEProfileLevel_30);
-		case 22:
-			obs_property_list_add_int(list, "2.2", VCEProfileLevel_22);
-		case 21:
-			obs_property_list_add_int(list, "2.1", VCEProfileLevel_21);
-		case 20:
-			obs_property_list_add_int(list, "2.0", VCEProfileLevel_20);
-		case 13:
-			obs_property_list_add_int(list, "1.3", VCEProfileLevel_13);
-		case 12:
-			obs_property_list_add_int(list, "1.2", VCEProfileLevel_12);
-		case 11:
-			obs_property_list_add_int(list, "1.1", VCEProfileLevel_11);
-		case 10:
-		default:
-			obs_property_list_add_int(list, "1.0", VCEProfileLevel_10);
-	}
-
-	/// Rate Control
-	list = obs_properties_add_list(props, AMF_H264_RATECONTROLMETHOD, obs_module_text(AMF_H264_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_CQP), Plugin::AMD::VCERateControlMethod::VCERateControlMethod_ConstantQP);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_CBR), Plugin::AMD::VCERateControlMethod::VCERateControlMethod_ConstantBitrate);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_VBR), Plugin::AMD::VCERateControlMethod::VCERateControlMethod_VariableBitrate_PeakConstrained);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_VBR_LAT), Plugin::AMD::VCERateControlMethod::VCERateControlMethod_VariableBitrate_LatencyConstrained);
-	obs_property_set_modified_callback(list, &ui_modified);
-
-	/// Rate Control: CBR, VBR
-	obs_properties_add_int(props, AMF_H264_BITRATE_TARGET, obs_module_text(AMF_H264_BITRATE_TARGET), 10, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000, 1);
-	obs_properties_add_int(props, AMF_H264_BITRATE_PEAK, obs_module_text(AMF_H264_BITRATE_PEAK), 10, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000, 1);
-
-	/// Rate Control: Constrained QP
-	obs_properties_add_int_slider(props, AMF_H264_QP_MINIMUM, obs_module_text(AMF_H264_QP_MINIMUM), 0, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_MAXIMUM, obs_module_text(AMF_H264_QP_MAXIMUM), 0, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_IFRAME, obs_module_text(AMF_H264_QP_IFRAME), 0, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_PFRAME, obs_module_text(AMF_H264_QP_PFRAME), 0, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_BFRAME, obs_module_text(AMF_H264_QP_BFRAME), 0, 51, 1);
-
-	/// VBV Buffer
-	p = obs_properties_add_bool(props, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, obs_module_text(AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE));
-	obs_properties_add_int(props, AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE, obs_module_text(AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE), 1, 100000, 1);
-	obs_properties_add_float_slider(props, AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS, obs_module_text(AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS), 0, 100, 1.5625);
-	obs_property_set_modified_callback(p, &ui_modified);
-
-	/// Other Options
-	list = obs_properties_add_list(props, AMF_H264_FILLERDATA, obs_module_text(AMF_H264_FILLERDATA), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-	list = obs_properties_add_list(props, AMF_H264_FRAMESKIPPING, obs_module_text(AMF_H264_FRAMESKIPPING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-
-	{ // Advanced Properties
-		p = obs_properties_add_bool(props, AMF_H264SIMPLE_ADVANCED_SHOW_PARAMETERS, obs_module_text(AMF_H264SIMPLE_ADVANCED_SHOW_PARAMETERS));
-		obs_property_set_modified_callback(p, &ui_modified);
-
-		/// B-Pictures
-		obs_properties_add_int_slider(props, AMF_H264_BPICTURE_PATTERN, obs_module_text(AMF_H264_BPICTURE_PATTERN), 0, 3, 1);
-		list = obs_properties_add_list(props, AMF_H264_BPICTURE_REFERENCE, obs_module_text(AMF_H264_BPICTURE_REFERENCE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-		obs_properties_add_int_slider(props, AMF_H264_QP_BPICTURE_DELTA, obs_module_text(AMF_H264_QP_BPICTURE_DELTA), -10, 10, 1);
-		obs_properties_add_int_slider(props, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, obs_module_text(AMF_H264_QP_REFERENCE_BPICTURE_DELTA), -10, 10, 1);
-
-		/// De-Blocking Filter
-		list = obs_properties_add_list(props, AMF_H264_DEBLOCKINGFILTER, obs_module_text(AMF_H264_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-
-		/// HRD Restrictions
-		list = obs_properties_add_list(props, AMF_H264_ENFORCEHRDCOMPATIBILITY, obs_module_text(AMF_H264_ENFORCEHRDCOMPATIBILITY), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-	}
-
-	{ // Expert Properties
-		p = obs_properties_add_bool(props, AMF_H264SIMPLE_EXPERT_SHOW_PARAMETERS, obs_module_text(AMF_H264SIMPLE_EXPERT_SHOW_PARAMETERS));
-		obs_property_set_modified_callback(p, &ui_modified);
-
-		/// Memory Type
-		list = obs_properties_add_list(props, AMF_H264_MEMORYTYPE, obs_module_text(AMF_H264_MEMORYTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_AUTOMATIC), VCEMemoryType_Auto);
-		obs_property_list_add_int(list, "Host", VCEMemoryType_Host);
-		if (IsWindowsXPOrGreater()) {
-			obs_property_list_add_int(list, "DirectX 9", VCEMemoryType_DirectX9);
-			if (IsWindows8OrGreater()) {
-				obs_property_list_add_int(list, "DirectX 11", VCEMemoryType_DirectX11);
-			}
-		}
-		obs_property_list_add_int(list, "OpenGL", VCEMemoryType_OpenGL);
-
-		/// Compute Type
-		list = obs_properties_add_list(props, AMF_H264_COMPUTETYPE, obs_module_text(AMF_H264_COMPUTETYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), VCEComputeType_None);
-		obs_property_list_add_int(list, "OpenCL", VCEComputeType_OpenCL);
-
-		/// Surface Format
-		list = obs_properties_add_list(props, AMF_H264_SURFACEFORMAT, obs_module_text(AMF_H264_SURFACEFORMAT), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_AUTOMATIC), -1);
-		auto formats = Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->input.formats;
-		for (auto format = formats.begin(); format != formats.end(); format++) {
-			switch (format->first) {
-				case amf::AMF_SURFACE_NV12:
-					obs_property_list_add_int(list, "NV12 (4:2:0)", VCESurfaceFormat_NV12);
-					break;
-				case amf::AMF_SURFACE_YUV420P:
-					obs_property_list_add_int(list, "I420 (4:2:0)", VCESurfaceFormat_I420);
-					break;
-				case amf::AMF_SURFACE_YUY2:
-					obs_property_list_add_int(list, "YUY2 (4:2:2)", VCESurfaceFormat_YUY2);
-					break;
-				case amf::AMF_SURFACE_BGRA:
-					obs_property_list_add_int(list, "BGRA (Uncompressed)", VCESurfaceFormat_BGRA);
-					break;
-				case amf::AMF_SURFACE_RGBA:
-					obs_property_list_add_int(list, "RGBA (Uncompressed)", VCESurfaceFormat_RGBA);
-					break;
-				case amf::AMF_SURFACE_GRAY8:
-					obs_property_list_add_int(list, "Y800 (Gray)", VCESurfaceFormat_GRAY);
-					break;
-			}
-		}
-
-		/// GOP Size
-		p = obs_properties_add_bool(props, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, obs_module_text(AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE));
-		obs_property_set_modified_callback(p, &ui_modified);
-		obs_properties_add_int(props, AMF_H264_GOP_SIZE, obs_module_text(AMF_H264_GOP_SIZE), 1, 1000, 1);
-
-		/// CABAC
-		list = obs_properties_add_list(props, AMF_H264_CABAC, obs_module_text(AMF_H264_CABAC), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-		obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-
-
-		// Debug Mode
-		obs_properties_add_bool(props, AMF_H264_DEBUGTRACING, obs_module_text(AMF_H264_DEBUGTRACING));
-	}
-
-	return props;
-}
-
-bool Plugin::Interface::H264SimpleInterface::ui_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
-	if (obs_data_get_int(data, AMF_H264SIMPLE_PRESET) != -1) {
-		switch (obs_data_get_int(data, AMF_H264SIMPLE_PRESET)) {
-			case Preset_Twitch: // Twitch
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 2);
-				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
-				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_41);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 18);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 3000);
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-
-				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
-				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
-				obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-
-				// Expert Properties
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-				obs_data_set_int(data, AMF_H264_CABAC, -1);
-				break;
-			case Preset_YouTube: // YouTube
-				// Basic Properties
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 2);
-				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
-				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_41);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 18);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 6000);
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-
-				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
-				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
-				obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-
-				// Expert Properties
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-				obs_data_set_int(data, AMF_H264_CABAC, -1);
-				break;
-			case Preset_Recording: // Recording
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 1);
-				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
-				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_VariableBitrate_LatencyConstrained);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 1);
-
-				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0));
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
-				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
-				obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-
-				// Expert Properties
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-				obs_data_set_int(data, AMF_H264_CABAC, -1);
-				break;
-			case Preset_HighQuality:
-				// Basic Properties
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 1);
-				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
-				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_QP_IFRAME, 16);
-				obs_data_set_int(data, AMF_H264_QP_PFRAME, 19);
-				obs_data_set_int(data, AMF_H264_QP_BFRAME, 21);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-
-				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0));
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
-				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
-				obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-
-				// Expert Properties
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-				obs_data_set_int(data, AMF_H264_CABAC, -1);
-				break;
-			case Preset_Indistinguishable:
-				// Basic Properties
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 1);
-				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
-				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_QP_IFRAME, 11);
-				obs_data_set_int(data, AMF_H264_QP_PFRAME, 14);
-				obs_data_set_int(data, AMF_H264_QP_BFRAME, 16);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-
-				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0));
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
-				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
-				obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-
-				// Expert Properties
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-				obs_data_set_int(data, AMF_H264_CABAC, -1);
-				break;
-			case Preset_Lossless:
-				// Basic Properties
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 1);
-				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
-				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_QP_IFRAME, 0);
-				obs_data_set_int(data, AMF_H264_QP_PFRAME, 0);
-				obs_data_set_int(data, AMF_H264_QP_BFRAME, 0);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, true);
-				obs_data_set_int(data, AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-
-				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0));
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
-				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
-				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
-				obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-
-				// Expert Properties
-				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
-				obs_data_set_int(data, AMF_H264_CABAC, -1);
-				break;
-		}
-		//obs_data_set_int(data, AMF_H264SIMPLE_PRESET, -1);
-	}
-
-	{ // Rate Control Settings
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_BITRATE_PEAK), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_BITRATE_TARGET), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_IFRAME), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_PFRAME), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_BFRAME), false);
-
-		switch (obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD)) {
-			case Plugin::AMD::VCERateControlMethod::VCERateControlMethod_ConstantQP:
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_IFRAME), true);
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_PFRAME), true);
-				if (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames) {
-					obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_BFRAME), true);
-				}
-				break;
-			case Plugin::AMD::VCERateControlMethod::VCERateControlMethod_VariableBitrate_PeakConstrained:
-			case Plugin::AMD::VCERateControlMethod::VCERateControlMethod_VariableBitrate_LatencyConstrained:
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_BITRATE_PEAK), true);
-			case Plugin::AMD::VCERateControlMethod::VCERateControlMethod_ConstantBitrate:
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_BITRATE_TARGET), true);
-				break;
-		}
-	}
-
-	{ // Buffer Size
-		obs_property_set_visible(obs_properties_get(props, AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS), false);
-		if (obs_data_get_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE)) {
-			obs_property_set_visible(obs_properties_get(props, AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE), true);
-			obs_property_set_visible(obs_properties_get(props, AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS), true);
-		}
-	}
-
-	{ // Advanced Properties
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_BPICTURE_PATTERN), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_BPICTURE_REFERENCE), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_BPICTURE_DELTA), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_REFERENCE_BPICTURE_DELTA), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_DEBLOCKINGFILTER), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_ENFORCEHRDCOMPATIBILITY), false);
-
-		if (obs_data_get_bool(data, AMF_H264SIMPLE_ADVANCED_SHOW_PARAMETERS)) {
-			if (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames) {
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_BPICTURE_PATTERN), true);
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_BPICTURE_REFERENCE), true);
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_BPICTURE_DELTA), true);
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_REFERENCE_BPICTURE_DELTA), true);
-			}
-			obs_property_set_visible(obs_properties_get(props, AMF_H264_DEBLOCKINGFILTER), true);
-			obs_property_set_visible(obs_properties_get(props, AMF_H264_ENFORCEHRDCOMPATIBILITY), true);
-		}
-	}
-
-	{ // Expert Properties
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_MEMORYTYPE), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_COMPUTETYPE), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_SURFACEFORMAT), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_GOP_SIZE), false);
-		obs_property_set_visible(obs_properties_get(props, AMF_H264_CABAC), false);
-
-		if (obs_data_get_bool(data, AMF_H264SIMPLE_EXPERT_SHOW_PARAMETERS)) {
-			obs_property_set_visible(obs_properties_get(props, AMF_H264_MEMORYTYPE), true);
-			obs_property_set_visible(obs_properties_get(props, AMF_H264_COMPUTETYPE), true);
-			obs_property_set_visible(obs_properties_get(props, AMF_H264_SURFACEFORMAT), true);
-
-			/// GOP Size
-			obs_property_set_visible(obs_properties_get(props, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE), true);
-			if (obs_data_get_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE))
-				obs_property_set_visible(obs_properties_get(props, AMF_H264_GOP_SIZE), true);
-
-			/// CABAC
-			obs_property_set_visible(obs_properties_get(props, AMF_H264_CABAC), true);
-		}
-	}
-
-	return true;
-}
-
-void* Plugin::Interface::H264SimpleInterface::create(obs_data_t* settings, obs_encoder_t* encoder) {
-	try {
-		return new Plugin::Interface::H264SimpleInterface(settings, encoder);
-	} catch (...) {
-		AMF_LOG_ERROR("Unable to create Encoder, see log for more information.");
-		return NULL;
-	}
-}
-
-#pragma warning( push )
-#pragma warning( disable: 4702 )
-void Plugin::Interface::H264SimpleInterface::destroy(void* data) {
-	try {
-		delete (static_cast<Plugin::Interface::H264SimpleInterface*>(data));
-		data = nullptr;
-	} catch (...) {
-		AMF_LOG_ERROR("Unable to destroy Encoder, see log for more information.");
-	}
-}
-#pragma warning( pop )
-
-#pragma warning( push )
-#pragma warning( disable: 4702 )
-bool Plugin::Interface::H264SimpleInterface::update(void *data, obs_data_t *settings) {
-	try {
-		return static_cast<Plugin::Interface::H264SimpleInterface*>(data)->update(settings);
-	} catch (...) {
-		AMF_LOG_ERROR("Unable to update Encoder, see log for more information.");
-		return false;
-	}
-}
-#pragma warning( pop )
-
-bool Plugin::Interface::H264SimpleInterface::encode(void *data, struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
-	try {
-		return static_cast<Plugin::Interface::H264SimpleInterface*>(data)->encode(frame, packet, received_packet);
-	} catch (...) {
-		AMF_LOG_ERROR("Unable to encode, see log for more information.");
-		return false;
-	}
-}
-
-void Plugin::Interface::H264SimpleInterface::get_video_info(void *data, struct video_scale_info *info) {
-	try {
-		static_cast<Plugin::Interface::H264SimpleInterface*>(data)->get_video_info(info);
-	} catch (...) {
-		AMF_LOG_ERROR("Unable to get video info, see log for more information.");
-	}
-}
-
-bool Plugin::Interface::H264SimpleInterface::get_extra_data(void *data, uint8_t** extra_data, size_t* size) {
-	try {
-		return static_cast<Plugin::Interface::H264SimpleInterface*>(data)->get_extra_data(extra_data, size);
-	} catch (...) {
-		AMF_LOG_ERROR("Unable to get extra data, see log for more information.");
-		return false;
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Module Code
-//////////////////////////////////////////////////////////////////////////
-Plugin::Interface::H264SimpleInterface::H264SimpleInterface(obs_data_t* settings, obs_encoder_t* encoder) {
-	int32_t width, height, fpsNum, fpsDen;
-
-	AMF_LOG_INFO("<AMFEncoder::H264SimpleInterface::H264SimpleInterface> Initializing...");
-
-	// OBS Settings
-	width = obs_encoder_get_width(encoder);
-	height = obs_encoder_get_height(encoder);
-	video_t *video = obs_encoder_video(encoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-	fpsNum = voi->fps_num;
-	fpsDen = voi->fps_den;
-
-	// AMF Setup
-	Plugin::AMD::AMF::GetInstance()->EnableDebugTrace(obs_data_get_bool(settings, AMF_H264_DEBUGTRACING));
-
-	// Set up Encoder
-	VCESurfaceFormat surfFormat = (VCESurfaceFormat)obs_data_get_int(settings, AMF_H264_SURFACEFORMAT);
-	if (surfFormat == -1) {
-		switch (voi->format) {
-			case VIDEO_FORMAT_NV12:
-				surfFormat = VCESurfaceFormat_NV12;
-				break;
-			case VIDEO_FORMAT_I420:
-				surfFormat = VCESurfaceFormat_I420;
-				break;
-			case VIDEO_FORMAT_RGBA:
-				surfFormat = VCESurfaceFormat_RGBA;
-				break;
-			case VIDEO_FORMAT_BGRA:
-				surfFormat = VCESurfaceFormat_BGRA;
-				break;
-			case VIDEO_FORMAT_Y800:
-				surfFormat = VCESurfaceFormat_GRAY;
-				break;
-			default:
-				surfFormat = VCESurfaceFormat_NV12;
-				break;
-		}
-	}
-	m_VideoEncoder = new Plugin::AMD::VCEEncoder(VCEEncoderType_AVC, surfFormat, (VCEMemoryType)obs_data_get_int(settings, AMF_H264_MEMORYTYPE), (VCEComputeType)obs_data_get_int(settings, AMF_H264_COMPUTETYPE));
-
-	// Static Parameters
-	/// Usage - Always Transcoding
-	m_VideoEncoder->SetUsage(VCEUsage_Transcoding);
-
-	/// Quality Preset - User Defined
-	m_VideoEncoder->SetQualityPreset((VCEQualityPreset)obs_data_get_int(settings, AMF_H264_QUALITY_PRESET));
-
-	/// Frame Size, Frame Rate - Taken from OBS
-	m_VideoEncoder->SetFrameSize(width, height);
-	m_VideoEncoder->SetFrameRate(fpsNum, fpsDen);
-
-	/// Profile, Profile Level - User Defined
-	m_VideoEncoder->SetProfile((VCEProfile)obs_data_get_int(settings, AMF_H264_PROFILE));
-	m_VideoEncoder->SetProfileLevel((VCEProfileLevel)obs_data_get_int(settings, AMF_H264_PROFILELEVEL));
-
-	// Static Parameters
-	/// Rate Control Method - User Defined
-	m_VideoEncoder->SetRateControlMethod((VCERateControlMethod)obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD));
-
-	/// Frame Skipping - User Defined
-	m_VideoEncoder->SetRateControlSkipFrameEnabled(!!obs_data_get_int(settings, AMF_H264_FRAMESKIPPING));
-
-	/// Minimum QP, Maximum QP - User Defined
-	m_VideoEncoder->SetMinimumQP((uint8_t)obs_data_get_int(settings, AMF_H264_QP_MINIMUM));
-	m_VideoEncoder->SetMaximumQP((uint8_t)obs_data_get_int(settings, AMF_H264_QP_MAXIMUM));
-
-	/// Rate Control Method: CBR, VBR, VBR_LAT
-	if (obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD) != VCERateControlMethod_ConstantQP) {
-		if (obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD) == VCERateControlMethod_ConstantBitrate) {
-			/// Target Bitrate - User Defined
-			uint32_t bitrate = (uint32_t)obs_data_get_int(settings, AMF_H264_BITRATE_TARGET) * 1000;
-			m_VideoEncoder->SetTargetBitrate(bitrate);
-			m_VideoEncoder->SetPeakBitrate(bitrate);
-		} else {
-			/// Target Bitrate - User Defined
-			m_VideoEncoder->SetTargetBitrate((uint32_t)obs_data_get_int(settings, AMF_H264_BITRATE_TARGET) * 1000);
-			/// Peak Bitrate - User Defined
-			m_VideoEncoder->SetPeakBitrate((uint32_t)obs_data_get_int(settings, AMF_H264_BITRATE_PEAK) * 1000);
-		}
-	}
-
-	/// Rate Control Method: CQP
-	if (obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD) == VCERateControlMethod_ConstantQP) {
-		/// I-, P-, B-Frame QP - User Defined
-		m_VideoEncoder->SetIFrameQP((uint8_t)obs_data_get_int(settings, AMF_H264_QP_IFRAME));
-		m_VideoEncoder->SetPFrameQP((uint8_t)obs_data_get_int(settings, AMF_H264_QP_PFRAME));
-		try {
-			m_VideoEncoder->SetBFrameQP((uint8_t)obs_data_get_int(settings, AMF_H264_QP_BFRAME));
-		} catch (...) {}
-	}
-
-	/// Buffer Size, Initial Fullness - User Defined or Automatic
-	if (obs_data_get_bool(settings, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE)) {
-		m_VideoEncoder->SetVBVBufferSize((uint32_t)obs_data_get_int(settings, AMF_H264SIMPLE_CUSTOM_BUFFER_SIZE) * 1000);
-		m_VideoEncoder->SetInitialVBVBufferFullness(obs_data_get_double(settings, AMF_H264SIMPLE_CUSTOM_BUFFER_FULLNESS) / 100.0);
-	} else {
-		if (obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD) != VCERateControlMethod_ConstantQP) {
-			uint32_t bitrate = (uint32_t)max(obs_data_get_int(settings, AMF_H264_BITRATE_TARGET), obs_data_get_int(settings, AMF_H264_BITRATE_PEAK));
-			m_VideoEncoder->SetVBVBufferSize(bitrate * 1000);
-		} else {
-			// When using Constant QP, one will have to pick a QP that is decent
-			// in both quality and bitrate. We can easily calculate both the QP
-			// required for an average bitrate and the average bitrate itself 
-			// with these formulas:
-			// BITRATE = ((1 - (QP / 51)) ^ 2) * ((Width * Height) * 1.5 * (FPSNumerator / FPSDenumerator))
-			// QP = (1 - sqrt(BITRATE / ((Width * Height) * 1.5 * (FPSNumerator / FPSDenumerator)))) * 51
-			double_t bitrate = (width * height);
-			switch (voi->format) {
-				case VIDEO_FORMAT_NV12: // Y=W*H, UV=W*H/2. Total = 1.5
-					bitrate *= 1.5;
-					break;
-				case VIDEO_FORMAT_I420: // Y=W*H, U=W*H/2, V=W*H/2. Total = 2
-					bitrate *= 2;
-					break;
-				case VIDEO_FORMAT_RGBA: // R=W*H, G=W*H, B=W*H. Total = 3
-					bitrate *= 3;
-					break;
-			}
-			bitrate *= ((double_t)fpsNum / (double_t)fpsDen);
-			double_t qpMult = (double_t)min(
-				min(
-					obs_data_get_int(settings, AMF_H264_QP_MINIMUM),
-					obs_data_get_int(settings, AMF_H264_QP_MAXIMUM)
-				), min(
-					min(
-						obs_data_get_int(settings, AMF_H264_QP_IFRAME),
-						obs_data_get_int(settings, AMF_H264_QP_PFRAME)
-					), obs_data_get_int(settings, AMF_H264_QP_BFRAME)
-				)
-			);
-			qpMult = (51 - qpMult) / 51.0;
-			qpMult = qpMult * qpMult;
-			qpMult = max(qpMult, 0.001); // Needs to be at least 0.001.
-			bitrate *= qpMult;
-			m_VideoEncoder->SetVBVBufferSize((uint32_t)bitrate);
-		}
-		m_VideoEncoder->SetInitialVBVBufferFullness(1.0);
-	}
-
-	/// Filler Data - User Defined
-	m_VideoEncoder->SetFillerDataEnabled(!!obs_data_get_int(settings, AMF_H264_FILLERDATA));
-
-	/// Enforce HRD Compatibility - User Defined or Default
-	if (obs_data_get_int(settings, AMF_H264_ENFORCEHRDCOMPATIBILITY) != -1)
-		m_VideoEncoder->SetEnforceHRDRestrictionsEnabled(!!obs_data_get_int(settings, AMF_H264_ENFORCEHRDCOMPATIBILITY));
-
-	/// IDR Period - User Defined (Full Second Granularity)
-	m_VideoEncoder->SetIDRPeriod((uint32_t)((double_t)obs_data_get_int(settings, AMF_H264SIMPLE_KEYFRAME_INTERVAL) * ((double_t)fpsNum / (double_t)fpsDen)));
-
-	/// Deblocking Filter - User Defined or Default
-	if (obs_data_get_int(settings, AMF_H264_DEBLOCKINGFILTER) != -1)
-		m_VideoEncoder->SetDeBlockingFilterEnabled(!!obs_data_get_int(settings, AMF_H264_DEBLOCKINGFILTER));
-
-	try {
-		m_VideoEncoder->SetBPicturePattern((VCEBPicturePattern)obs_data_get_int(settings, AMF_H264_BPICTURE_PATTERN));
-	} catch (...) {}
-	try {
-		m_VideoEncoder->SetBPictureReferenceEnabled(!!obs_data_get_int(settings, AMF_H264_BPICTURE_REFERENCE));
-	} catch (...) {}
-	try {
-		m_VideoEncoder->SetBPictureDeltaQP((int8_t)obs_data_get_int(settings, AMF_H264_QP_BPICTURE_DELTA));
-	} catch (...) {}
-	try {
-		m_VideoEncoder->SetReferenceBPictureDeltaQP((int8_t)obs_data_get_int(settings, AMF_H264_QP_REFERENCE_BPICTURE_DELTA));
-	} catch (...) {}
-
-	/// Encoder Miscellaneous Parameters
-	m_VideoEncoder->SetScanType(VCEScanType_Progressive);
-	if (obs_data_get_bool(settings, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE))
-		m_VideoEncoder->SetGOPSize((uint32_t)obs_data_get_int(settings, AMF_H264_GOP_SIZE));
-	if (obs_data_get_int(settings, AMF_H264_CABAC) != -1)
-		m_VideoEncoder->SetCABACEnabled(!!obs_data_get_bool(settings, AMF_H264_CABAC));
-
-	/// Encoder Motion Estimation Parameters
-	m_VideoEncoder->SetHalfPixelMotionEstimationEnabled(true);
-	m_VideoEncoder->SetQuarterPixelMotionEstimationEnabled(true);
-
-	/// Encoder Resolution Parameters
-	m_VideoEncoder->SetFrameSize(width, height);
-	m_VideoEncoder->SetFrameRate(fpsNum, fpsDen);
-
-	//////////////////////////////////////////////////////////////////////////
-	// OBS - Enforce Streaming Service Restrictions
-	//////////////////////////////////////////////////////////////////////////
-	{
-		// Profile
-		const char* p_str = obs_data_get_string(settings, "profile");
-		if (strcmp(p_str, "") != 0) {
-			if (strcmp(p_str, "baseline")) {
-				m_VideoEncoder->SetProfile(VCEProfile_Baseline);
-			} else if (strcmp(p_str, "main")) {
-				m_VideoEncoder->SetProfile(VCEProfile_Main);
-			} else if (strcmp(p_str, "high")) {
-				m_VideoEncoder->SetProfile(VCEProfile_High);
-			}
-		} else {
-			switch (m_VideoEncoder->GetProfile()) {
-				case VCEProfile_Baseline:
-					obs_data_set_string(settings, "profile", "baseline");
-					break;
-				case VCEProfile_Main:
-					obs_data_set_string(settings, "profile", "main");
-					break;
-				case VCEProfile_High:
-					obs_data_set_string(settings, "profile", "high");
-					break;
-			}
-		}
-
-		// Rate Control Method
-		const char* t_str = obs_data_get_string(settings, "rate_control");
-		if (strcmp(t_str, "") != 0) {
-			if (strcmp(t_str, "CBR") == 0) {
-				m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_ConstantBitrate);
-				m_VideoEncoder->SetFillerDataEnabled(true);
-			} else if (strcmp(t_str, "VBR") == 0) {
-				m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_VariableBitrate_PeakConstrained);
-			} else if (strcmp(t_str, "VBR_LAT") == 0) {
-				m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_VariableBitrate_LatencyConstrained);
-			} else if (strcmp(t_str, "CQP") == 0) {
-				m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_ConstantQP);
-			}
-		} else {
-			switch (m_VideoEncoder->GetRateControlMethod()) {
-				case VCERateControlMethod_ConstantBitrate:
-					obs_data_set_string(settings, "rate_control", "CBR");
-					break;
-				case VCERateControlMethod_VariableBitrate_PeakConstrained:
-					obs_data_set_string(settings, "rate_control", "VBR");
-					break;
-				case VCERateControlMethod_VariableBitrate_LatencyConstrained:
-					obs_data_set_string(settings, "rate_control", "VBR_LAT");
-					break;
-				case VCERateControlMethod_ConstantQP:
-					obs_data_set_string(settings, "rate_control", "CQP");
-					break;
-			}
-		}
-
-		// Bitrate
-		uint64_t bitrateOvr = obs_data_get_int(settings, "bitrate") * 1000;
-		if (bitrateOvr != -1) {
-			if (m_VideoEncoder->GetTargetBitrate() > bitrateOvr)
-				m_VideoEncoder->SetTargetBitrate((uint32_t)bitrateOvr);
-
-			if (m_VideoEncoder->GetPeakBitrate() > bitrateOvr)
-				m_VideoEncoder->SetPeakBitrate((uint32_t)bitrateOvr);
-
-			obs_data_set_int(settings, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
-		} else {
-			obs_data_set_int(settings, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
-		}
-
-		// IDR-Period (Keyframes)
-		if (obs_data_get_int(settings, "keyint_sec") != -1) {
-			m_VideoEncoder->SetIDRPeriod((uint32_t)(obs_data_get_int(settings, "keyint_sec") * ((double_t)fpsNum / (double_t)fpsDen)));
-		} else {
-			obs_data_set_int(settings, "keyint_sec", (uint64_t)(m_VideoEncoder->GetIDRPeriod() / ((double_t)fpsNum / (double_t)fpsDen)));
-		}
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Verify
-	//////////////////////////////////////////////////////////////////////////
-	m_VideoEncoder->LogProperties();
-
-	//////////////////////////////////////////////////////////////////////////
-	// Start Encoding
-	//////////////////////////////////////////////////////////////////////////
-	m_VideoEncoder->Start();
-
-	AMF_LOG_INFO("<AMFEncoder::H264SimpleInterface::H264SimpleInterface> Initialized.");
-}
-
-Plugin::Interface::H264SimpleInterface::~H264SimpleInterface() {
-	AMF_LOG_INFO("<AMFEncoder::H264SimpleInterface::~H264SimpleInterface> Finalizing...");
-	m_VideoEncoder->Stop();
-	delete m_VideoEncoder;
-	AMF_LOG_INFO("<AMFEncoder::H264SimpleInterface::~H264SimpleInterface> Complete.");
-}
-
-#pragma warning( push )
-#pragma warning( disable: 4100 )
-bool Plugin::Interface::H264SimpleInterface::update(obs_data_t* settings) {
-	// settings is not flagged as a unused here, since a future update may add support for this.
-	return false;
-}
-#pragma warning( pop )
-
-bool Plugin::Interface::H264SimpleInterface::encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
-	bool retVal = true;
-	retVal = m_VideoEncoder->SendInput(frame);
-	m_VideoEncoder->GetOutput(packet, received_packet);
-	return retVal;
-}
-
-void Plugin::Interface::H264SimpleInterface::get_video_info(struct video_scale_info* info) {
-	m_VideoEncoder->GetVideoInfo(info);
-}
-
-bool Plugin::Interface::H264SimpleInterface::get_extra_data(uint8_t** extra_data, size_t* size) {
-	return m_VideoEncoder->GetExtraData(extra_data, size);
-}

obs-studio-0.16.4.tar.xz/.travis.yml Added

@@ -0,0 +1,39 @@
+os: osx
+osx_image: xcode7.1
+env:
+  matrix:
+  - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake
+  global:
+  # AWS S3 creds
+  # access key
+  - secure: "MfhOg+84yb4ZHB2tM8PIPFQX2Y+WLN0I0iiAgyLC4KaHPUoNOyloe9yk6OjV7Lj7SZWqTlQUsqHa8S9mOUswGIody1Ydglo4RvyGOKCd8I6b2ri/jE8qHVuD9sO+sNlIxq4YqqG/qReTsbSs2YEgLneZUCYLCk/fihl8L6eVuSc="
+  # secret
+  - secure: "JRQVU2zgC3hY6CEY+Crmh/upp93En0BzKaLcsuBT538johNlK7m5hn3m2UOw63seLvBvVaKKWUDj9N986a3DwcXxWPMyF/9ctXgNWy39WzaVWxrbVR5nQB1fdiRp5YEgkoVN+gEm3OVF7sV5AGzh5/8CvEdRCoTLIGgMGHxW9mc="
+
+language: cpp
+
+before_install: "./CI/install-dependencies-osx.sh"
+before_script: "./CI/before-script-osx.sh"
+script: cd ./build && make -j4 && cd -
+before_deploy: "./CI/before-deploy-osx.sh"
+
+deploy:
+  provider: s3
+  access_key_id: $AWS_ACCESS_KEY
+  secret_access_key: $AWS_SECRET_KEY
+  skip_cleanup: true
+  local_dir: nightly
+  bucket: obs-nightly
+  region: us-west-2
+  acl: public_read
+  on:
+    repo: jp9000/obs-studio
+
+# The channel name "azubu.il.us.quakenet.org#obs-dev" is encrypted against jp9000/obs-studio to prevent IRC spam of forks
+notifications:
+  irc:
+    skip_join: true
+    template:
+      - "%{message} %{build_url}"
+    channels:
+      - secure: k9j7+ogVODMlveZdd5pP73AVLCFl1VbzVaVon0ECn3EQcxnLSpiZbc6l+PnIUKgee5pRKtUB4breufgmr4puq3s69YeQiOVKk5gx2yJGZ5jGacbSne0xTspzPxapiEbVUkcJ2L7gKntDG4+SUiW67dtt4G26O7zsErDF/lY/woQ=

obs-studio-0.16.4.tar.xz/CI Added

obs-studio-0.16.4.tar.xz/CI/before-deploy-osx.sh Added

obs-studio-0.16.4.tar.xz/CI/before-script-osx.sh Added

obs-studio-0.16.4.tar.xz/CI/install Added

obs-studio-0.16.4.tar.xz/CI/install-dependencies-osx.sh Added

obs-studio-0.16.4.tar.xz/CI/install/osx Added

obs-studio-0.16.4.tar.xz/CI/install/osx/build_app.py Added

@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+ 
+candidate_paths = "bin obs-plugins data".split()
+ 
+plist_path = "../cmake/osxbundle/Info.plist"
+icon_path = "../cmake/osxbundle/obs.icns"
+run_path = "../cmake/osxbundle/obslaunch.sh"
+ 
+#not copied
+blacklist = """/usr /System""".split()
+ 
+#copied
+whitelist = """/usr/local""".split()
+ 
+#
+#
+#
+ 
+ 
+from sys import argv
+from glob import glob
+from subprocess import check_output, call
+from collections import namedtuple
+from shutil import copy, copytree, rmtree
+from os import makedirs, rename, walk, path as ospath
+import plistlib
+
+import argparse
+parser = argparse.ArgumentParser(description='obs-studio package util')
+parser.add_argument('-d', '--base-dir', dest='dir', default='rundir/RelWithDebInfo')
+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('-u', '--user', dest='user', default='jp9000')
+parser.add_argument('-c', '--channel', dest='channel', default='master')
+parser.add_argument('-s', '--stable', dest='stable', required=False, action='store_true', default=False)
+parser.add_argument('-p', '--prefix', dest='prefix', default='')
+args = parser.parse_args()
+
+def cmd(cmd):
+    import subprocess
+    import shlex
+    return subprocess.check_output(shlex.split(cmd)).rstrip('\r\n')
+
+LibTarget = namedtuple("LibTarget", ("path", "external", "copy_as"))
+ 
+inspect = list()
+ 
+inspected = set()
+ 
+build_path = args.dir
+build_path = build_path.replace("\\ ", " ")
+ 
+def add(name, external=False, copy_as=None):
+	if external and copy_as is None:
+		copy_as = name.split("/")[-1]
+	if name[0] != "/":
+		name = build_path+"/"+name
+	t = LibTarget(name, external, copy_as)
+	if t in inspected:
+		return
+	inspect.append(t)
+	inspected.add(t)
+
+
+for i in candidate_paths:
+	print("Checking " + i)
+	for root, dirs, files in walk(build_path+"/"+i):
+		for file_ in files:
+			path = root + "/" + file_
+			try:
+				out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
+						universal_newlines=True)
+				if "is not an object file" in out:
+					continue
+			except:
+				continue
+			rel_path = path[len(build_path)+1:]
+			print(repr(path), repr(rel_path))
+			add(rel_path)
+ 
+def add_plugins(path, replace):
+	for img in glob(path.replace(
+		"lib/QtCore.framework/Versions/5/QtCore",
+		"plugins/%s/*"%replace).replace(
+			"Library/Frameworks/QtCore.framework/Versions/5/QtCore",
+			"share/qt5/plugins/%s/*"%replace)):
+		if "_debug" in img:
+			continue
+		add(img, True, img.split("plugins/")[-1])
+
+actual_sparkle_path = '@loader_path/Frameworks/Sparkle.framework/Versions/A/Sparkle'
+
+while inspect:
+	target = inspect.pop()
+	print("inspecting", repr(target))
+	path = target.path
+	if path[0] == "@":
+		continue
+	out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
+			universal_newlines=True)
+ 
+	if "QtCore" in path:
+		add_plugins(path, "platforms")
+		add_plugins(path, "imageformats")
+		add_plugins(path, "accessible")
+ 
+ 
+	for line in out.split("\n")[1:]:
+		new = line.strip().split(" (")[0]
+		if '@' in new and "sparkle.framework" in new.lower():
+			actual_sparkle_path = new
+			print "Using sparkle path:", repr(actual_sparkle_path)
+		if not new or new[0] == "@" or new.endswith(path.split("/")[-1]):
+			continue
+		whitelisted = False
+		for i in whitelist:
+			if new.startswith(i):
+				whitelisted = True
+		if not whitelisted:
+			blacklisted = False
+			for i in blacklist:
+				if new.startswith(i):
+					blacklisted = True
+					break
+			if blacklisted:
+				continue
+		add(new, True)
+
+changes = list()
+for path, external, copy_as in inspected:
+	if not external:
+		continue #built with install_rpath hopefully
+	changes.append("-change '%s' '@rpath/%s'"%(path, copy_as))
+changes = " ".join(changes)
+
+info = plistlib.readPlist(plist_path)
+
+latest_tag = cmd('git describe --tags --abbrev=0')
+log = cmd('git log --pretty=oneline {0}...HEAD'.format(latest_tag))
+
+from os import path
+# set version
+if args.stable:
+    info["CFBundleVersion"] = latest_tag
+    info["CFBundleShortVersionString"] = latest_tag
+    info["SUFeedURL"] = '{0}/stable/updates.xml'.format(args.base_url)
+else:
+    info["CFBundleVersion"] = args.build_number
+    info["CFBundleShortVersionString"] = '{0}.{1}'.format(latest_tag, args.build_number)
+    info["SUFeedURL"] = '{0}/{1}/{2}/updates.xml'.format(args.base_url, args.user, args.channel)
+
+info["SUPublicDSAKeyFile"] = path.basename(args.public_key)
+info["OBSFeedsURL"] = '{0}/feeds.xml'.format(args.base_url)
+
+app_name = info["CFBundleName"]+".app"
+icon_file = "tmp/Contents/Resources/%s"%info["CFBundleIconFile"]
+
+copytree(build_path, "tmp/Contents/Resources/", symlinks=True)
+copy(icon_path, icon_file)
+plistlib.writePlist(info, "tmp/Contents/Info.plist")
+makedirs("tmp/Contents/MacOS")
+copy(run_path, "tmp/Contents/MacOS/%s"%info["CFBundleExecutable"])
+try:
+	copy(args.public_key, "tmp/Contents/Resources")
+except:
+	pass
+
+if args.sparkle is not None:
+    copytree(args.sparkle, "tmp/Contents/Frameworks/Sparkle.framework", symlinks=True)
+
+prefix = "tmp/Contents/Resources/"
+sparkle_path = '@loader_path/{0}/Frameworks/Sparkle.framework/Versions/A/Sparkle'
+
+cmd('{0}install_name_tool -change {1} {2} {3}/bin/obs'.format(
+    args.prefix, actual_sparkle_path, sparkle_path.format('../..'), prefix))
+
+
+
+for path, external, copy_as in inspected:
+	id_ = ""
+	filename = path
+	rpath = ""
+	if external:
+		id_ = "-id '@rpath/%s'"%copy_as
+		filename = prefix + "bin/" +copy_as
+		rpath = "-add_rpath @loader_path/ -add_rpath @executable_path/"
+		if "/" in copy_as:
+			try:
+				dirs = copy_as.rsplit("/", 1)[0]
+				makedirs(prefix + "bin/" + dirs)
+			except:
+				pass
+		copy(path, filename)
+	else:
+		filename = path[len(build_path)+1:]
+		id_ = "-id '@rpath/../%s'"%filename
+		if not filename.startswith("bin"):
+			print(filename)
+			rpath = "-add_rpath '@loader_path/{}/'".format(ospath.relpath("bin/", ospath.dirname(filename)))
+		filename = prefix + filename
+ 
+	cmd = "{0}install_name_tool {1} {2} {3} '{4}'".format(args.prefix, changes, id_, rpath, filename)
+	call(cmd, shell=True)
+
+try:
+	rename("tmp", app_name)
+except:
+	print("App already exists")
+	rmtree("tmp")
\ No newline at end of file

obs-studio-0.16.2.tar.xz/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/CMakeLists.txt Changed

obs-studio-0.16.2.tar.xz/UI/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/UI/CMakeLists.txt Changed

obs-studio-0.16.2.tar.xz/UI/api-interface.cpp -> obs-studio-0.16.4.tar.xz/UI/api-interface.cpp Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/ca-ES.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/ca-ES.ini Changed

@@ -49,6 +49,9 @@
 Top="Part superior"
 Bottom="Part inferior"
 Reset="Restableix"
+Hours="Hores"
+Minutes="Minuts"
+Seconds="Segons"
 
 QuickTransitions.SwapScenes="Canvia la vista prèvia i sortida d'escenes després de la transició"
 QuickTransitions.SwapScenesTT="Canvia la vista prèvia i sortida d'escenes després de la transició (si encara existeix l'escena original de la sortida). \nAixò no desfarà qualsevol canvi que pugui haver fet a l'escena original de la sortida."
@@ -369,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Advertència: No es poden utilitzar diversos descodificadors QSV separats en transmetre i enregistrar al mateix temps. Per transmetre i engrestriar al mateix temps, si us plau modifiqueu-los, ja sigui el codificador de gravació o el codificador de transmissió."
 Basic.Settings.Output.Simple.Encoder.Software="Programari (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Maquinari (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Maquinari (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Maquinari (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Programari (preconfiguració de x264 amb baix ús de CPU, augmenta la mida del fitxer)"
 Basic.Settings.Output.VideoBitrate="Bitrate de vídeo"

obs-studio-0.16.2.tar.xz/UI/data/locale/cs-CZ.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/cs-CZ.ini Changed

@@ -49,6 +49,9 @@
 Top="Nahoře"
 Bottom="Dole"
 Reset="Resetovat"
+Hours="Hodiny"
+Minutes="Minuty"
+Seconds="Vteřiny"
 
 QuickTransitions.SwapScenes="Prohodit scény náhledu a výstupu po přechodu"
 QuickTransitions.SwapScenesTT="Prohodí scény náhledu a výstupu po přechodu (pokud originální výstupní scéna stále existuje).\nTato funkce nevrátí provedené změny, které byly provedeny v originální scéně výstupu."
@@ -369,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Varování: Není možné použit více oddělených QSV enkodérů pro streamování a nahrávání ve stejnou dobu. Pokud chcete tuto limitaci obejít, tak změňte použitý enkodér pro streamování či nahrávání."
 Basic.Settings.Output.Simple.Encoder.Software="Softwarový (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardwarový (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardwarový (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardwarový (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softwarový (x264 předvolba nízkého zatížení CPU, větší soubory)"
 Basic.Settings.Output.VideoBitrate="Bitrate videa"

obs-studio-0.16.2.tar.xz/UI/data/locale/da-DK.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/da-DK.ini Changed

@@ -49,10 +49,16 @@
 Top="Top"
 Bottom="Bund"
 Reset="Nulstil"
+Hours="Timer"
+Minutes="Minutter"
+Seconds="Sekunder"
 
 QuickTransitions.SwapScenes="Byt om på forhåndsvisning/output scener efter overgang"
+QuickTransitions.SwapScenesTT="Ombytter uddrag- og output-scener efter omskiftning (hvis oprindelige output-scene stadig eksisterer).\nDette vil ikke omgøre eventuelle ændringer, der måtte været udført på den oprindelige output-scene."
 QuickTransitions.DuplicateScene="Dupliker scene"
+QuickTransitions.DuplicateSceneTT="Muliggør, ved redigere af den samme, scene, redigering af transformering/synlighed af kilder uden at ændre på output. \nFor at rediger egenskaber for kilder uden at ændre på output, aktivér 'Duplikér Kilder'.\nÆndring af denne værd vil nulstille den nuværende output-scene (hvis den stadig findes)."
 QuickTransitions.EditProperties="Dupliker kilder"
+QuickTransitions.EditPropertiesTT="Muliggør, ved redigering af den samme scene, redigering af egenskaber for kilder uden at ændre på output.\nDette kan kun benyttes, hvis 'Duplikér Scene' er aktiv. \nVisse kilder (såsom optagne kilder eller mediekilder) understøtter ikke dette og kan ikke redigeres separat.\nÆndring af denne værdi vil nulstille den nuværende output-scene (hvis den stadig findes).\n\nAdvarsel: Da kilder vil blive duplikeret, kan dette kræve ekstra system- eller videoressourcer."
 QuickTransitions.HotkeyName="Hurtig overgang: %1"
 
 Basic.AddTransition="Tilføj konfigurerbar overgang"
@@ -85,6 +91,7 @@
 
 ConfirmRemove.Title="Bekræfte fjern"
 ConfirmRemove.Text="Er du sikker på du ønsker at fjerne '$1'?"
+ConfirmRemove.TextMultiple="Er du sikker på at du vil fjerne %1 elementer?"
 
 Output.ConnectFail.Title="Kunne ikke oprette forbindelse"
 Output.ConnectFail.BadPath="Ugyldig sti eller forbindelses URL.  Kontroller indstillinger for at bekræfte, at de er gyldige."
@@ -116,6 +123,7 @@
 Remux.SourceFile="OBS optagelse"
 Remux.TargetFile="Destinationsfil"
 Remux.Remux="Remux"
+Remux.OBSRecording="OBS optagelse"
 Remux.FinishedTitle="Remuxing færdigt"
 Remux.Finished="Optagelse remuxed"
 Remux.FinishedError="Optagelse remuxed, men filen kan være ufuldstændige"
@@ -141,10 +149,16 @@
 
 Basic.Main.PreviewConextMenu.Enable="Aktiver visning"
 
+ScaleFiltering="Skala filtrering"
+ScaleFiltering.Point="Punkt"
+ScaleFiltering.Bilinear="Bilinear"
+ScaleFiltering.Bicubic="Bikubisk"
+ScaleFiltering.Lanczos="Lanczos"
 
 Deinterlacing="Deinterlacing"
 Deinterlacing.Discard="Kassér"
 Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Bland"
 Deinterlacing.Linear="Lineær"
 Deinterlacing.Linear2x="Lineær 2x"
 
@@ -178,7 +192,9 @@
 Basic.PropertiesWindow.Confirm="Der er ændringer, som ikke er gemt.  Vil du gerne beholde dem?"
 Basic.PropertiesWindow.NoProperties="Ingen egenskaber tilgængelige"
 Basic.PropertiesWindow.AddFiles="Tilføj filer"
+Basic.PropertiesWindow.AddDir="Tilføj mappe"
 Basic.PropertiesWindow.AddURL="Tilføj sti/url"
+Basic.PropertiesWindow.AddEditableListDir="Tilføj mappe til '%1'"
 Basic.PropertiesWindow.AddEditableListFiles="Tilføj filer til '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Tilføj emne til '%1'"
 Basic.PropertiesWindow.EditEditableListEntry="Rediger emne fra '%1'"
@@ -242,7 +258,9 @@
 Basic.Main.StartRecording="Start optagelse"
 Basic.Main.StartStreaming="Start streaming"
 Basic.Main.StopRecording="Stop optagelse"
+Basic.Main.StoppingRecording="Stopper optagelse..."
 Basic.Main.StopStreaming="Stop streaming"
+Basic.Main.StoppingStreaming="Stopper stream..."
 Basic.Main.ForceStopStreaming="Stop streaming (ignorer forsinkelse)"
 
 Basic.MainMenu.File="&Fil"
@@ -261,8 +279,9 @@
 Basic.MainMenu.Edit.Redo="&Redo"
 Basic.MainMenu.Edit.UndoAction="Fortryd $1 (&U)"
 Basic.MainMenu.Edit.RedoAction="&Redo $1"
+Basic.MainMenu.Edit.LockPreview="&Lås forhåndsvisning"
 Basic.MainMenu.Edit.Transform="&Transformering"
-Basic.MainMenu.Edit.Transform.EditTransform="Redigere transformering... (&E)"
+Basic.MainMenu.Edit.Transform.EditTransform="Rediger transformering... (&E)"
 Basic.MainMenu.Edit.Transform.ResetTransform="Nulstille transformering (&R)"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Roter 90 grader CW"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Roter 90 grader CCW"
@@ -279,10 +298,16 @@
 Basic.MainMenu.Edit.Order.MoveToBottom="Flyt til &Bunden"
 Basic.MainMenu.Edit.AdvAudio="&Avancerede lydegenskaber"
 
+Basic.MainMenu.View="&Vis"
+Basic.MainMenu.View.Toolbars="&Værktøjslinjer"
+Basic.MainMenu.View.Toolbars.Listboxes="&Listebokse"
+Basic.MainMenu.View.SceneTransitions="S&cene overgange"
+Basic.MainMenu.View.StatusBar="&Statuslinje"
 
 Basic.MainMenu.SceneCollection="&Scenesamling"
 Basic.MainMenu.Profile="&Profil"
 
+Basic.MainMenu.Tools="Værk&tøjer"
 
 Basic.MainMenu.Help="&Hjælp"
 Basic.MainMenu.Help.Website="Besøg &websted"
@@ -302,11 +327,17 @@
 Basic.Settings.General.Language="Sprog"
 Basic.Settings.General.WarnBeforeStartingStream="Vis bekræftelses-dialog ved opstart af stream"
 Basic.Settings.General.WarnBeforeStoppingStream="Vis bekræftelses-dialog ved afslutning af stream"
+Basic.Settings.General.HideProjectorCursor="Skjul markør over projektorer"
+Basic.Settings.General.ProjectorAlwaysOnTop="Hav altid projektorer øverst"
 Basic.Settings.General.Snapping="Kilde justeringsfastgørelse"
 Basic.Settings.General.ScreenSnapping="Fastgør kilder til kanten af skærmen"
 Basic.Settings.General.CenterSnapping="Fastgør kilder til horisontalt og vertikalt centrum"
 Basic.Settings.General.SourceSnapping="Fastgør kilder til andre kilder"
 Basic.Settings.General.SnapDistance="Fastgørings-følsomhed"
+Basic.Settings.General.RecordWhenStreaming="Optag automatisk ved streaming"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Bliv ved med at optage når stream stopper"
+Basic.Settings.General.SysTrayEnabled="Aktiver proceslinje-ikon"
+Basic.Settings.General.SysTrayWhenStarted="Minimer til proceslinjen ved start"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Streamtype"
@@ -329,6 +360,7 @@
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Tabsfri kvalitet, utrolig stor filstørrelse"
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -409,6 +441,11 @@
 Basic.Settings.Audio.UnknownAudioDevice="[Enhed ikke tilsluttet eller ikke tilgængelig]"
 
 Basic.Settings.Advanced="Avanceret"
+Basic.Settings.Advanced.General.ProcessPriority="Proces prioritet"
+Basic.Settings.Advanced.General.ProcessPriority.High="Høj"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Over normal"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Normal"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="Ikke aktiv"
 Basic.Settings.Advanced.Video.ColorFormat="Farveformat"
 Basic.Settings.Advanced.Video.ColorSpace="YUV farverum"
 Basic.Settings.Advanced.Video.ColorRange="YUV farveområde"
@@ -417,6 +454,8 @@
 Basic.Settings.Advanced.StreamDelay="Stream forsinkelse"
 Basic.Settings.Advanced.StreamDelay.Duration="Varighed (sekunder)"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Anslået hukommelsesbrug: %1 MB"
+Basic.Settings.Advanced.Network="Netværk"
+Basic.Settings.Advanced.Network.BindToIP="Bind til IP"
 
 Basic.AdvAudio="Avancerede lydegenskaber"
 Basic.AdvAudio.Name="Navn"
@@ -432,7 +471,10 @@
 Basic.Hotkeys.StopRecording="Stop optagelse"
 Basic.Hotkeys.SelectScene="Skift til scene"
 
+Basic.SystemTray.Show="Vis"
+Basic.SystemTray.Hide="Skjul"
 
+Basic.SystemTray.Message.Reconnecting="Afbrudt. Forbinder igen..."
 
 Hotkeys.Insert="Insert"
 Hotkeys.Delete="Delete"

obs-studio-0.16.2.tar.xz/UI/data/locale/de-DE.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/de-DE.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/el-GR.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/en-US.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/en-US.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/es-ES.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/es-ES.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/eu-ES.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/eu-ES.ini Changed

@@ -49,6 +49,9 @@
 Top="Goian"
 Bottom="Behean"
 Reset="Berrezarri"
+Hours="ordu"
+Minutes="minutu"
+Seconds="segundo"
 
 QuickTransitions.SwapScenes="Trukatu Aurrebista/Irteera-eszenak trantsizioen ondoren"
 QuickTransitions.SwapScenesTT="Trukatu aurrebistak eta irteera-eszenak trantsizioen ondoren (baldin eta irteerakoaren jatorrizkoa eszena badago).\n Honek ez du desegingo irteerakoaren jatorrizko eszenari egindako aldaketak."
@@ -369,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Kontuz: Ezin dituzu QSV kodeatzaile ugari bananduta erabili aldiberean jariotu eta grabatzerakoan.  Aldiberean jariotu eta grabatzea nahi baduzu, mesedez aldatu bietako bat, grabaketa kodeatzailea edo jariotze kodeatzailea."
 Basic.Settings.Output.Simple.Encoder.Software="Softwarea (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardwarea (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardwarea (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardwarea (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softwarea (x264 PUZ erabilpen apaleko aurre-ezarpena, fitxategiaren tamaina handitzen du)"
 Basic.Settings.Output.VideoBitrate="Bideo bit-emaria"

obs-studio-0.16.2.tar.xz/UI/data/locale/fi-FI.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/fi-FI.ini Changed

@@ -49,6 +49,9 @@
 Top="Ylhäältä"
 Bottom="Alhaalta"
 Reset="Palauta"
+Hours="Tuntia"
+Minutes="Minuuttia"
+Seconds="Sekuntia"
 
 QuickTransitions.SwapScenes="Vaihda esikatselu- ja ulostulo-skenet siirtymän jälkeen"
 QuickTransitions.SwapScenesTT="Vaihda esikatselu- ja ulostulo-skenet siirtymän jälkeen (jos ulostulon alkuperäinen skene on yhä olemassa).\nTämä ei peruuta muutoksia joita on tehty alkuperäiseen skeneen."
@@ -369,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Varoitus: Et voi käyttää useampaa QSV-enkooderia lähettäessä ja tallentaessa samaan aikaan. Jos haluat tehdä molempia yhtä aikaa, vaihda lähetys tai tallennus-enkooderi."
 Basic.Settings.Output.Simple.Encoder.Software="Ohjelmistopohjainen (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Laitteistopohjainen (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Laitteisto (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Laitteistopohjainen (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Ohjelmistopohjainen (x264 matala CPU-käyttö, lisää tiedostokokoa)"
 Basic.Settings.Output.VideoBitrate="Kuvan bitrate"

obs-studio-0.16.2.tar.xz/UI/data/locale/fr-FR.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/fr-FR.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/hr-HR.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/hr-HR.ini Changed

@@ -48,6 +48,10 @@
 Right="Zdesna"
 Top="Odozgo"
 Bottom="Odozdo"
+Reset="Poništi"
+Hours="Sati"
+Minutes="Minuta"
+Seconds="Sekundi"
 
 QuickTransitions.SwapScenes="Zameni scene pregleda/izlaza nakon prelaza"
 QuickTransitions.SwapScenesTT="Zamenjuje scene pregleda i izlaza nakon prelaza (ako originalna scena izlaza još uvek postoji).\nOvo neće poništiti promene koje su načinjene nad originalnom scenom izlaza."
@@ -368,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Upozorenje: Ne možete koristi više odvojenih QSV enkodera kada emitujete i snimate u isto vreme. Ako želite da emitujete i snimate u isto vreme, molim promenite ili enkoder snimanja ili enkoder emitovanja."
 Basic.Settings.Output.Simple.Encoder.Software="Softverski (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Mašinski (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Mašinski (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Mašinski (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softverski (x264 niska upotreba procesora, povećava veličinu datoteke)"
 Basic.Settings.Output.VideoBitrate="Protok videa"

obs-studio-0.16.2.tar.xz/UI/data/locale/hu-HU.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/hu-HU.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/it-IT.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/it-IT.ini Changed

@@ -48,6 +48,10 @@
 Right="Destra"
 Top="Alto"
 Bottom="Basso"
+Reset="Reset"
+Hours="Ore"
+Minutes="Minuti"
+Seconds="Secondi"
 
 QuickTransitions.SwapScenes="Scambia Scena Preview/Uscita dopo la Transizione"
 QuickTransitions.SwapScenesTT="Scambia la scena in uniscita con quella in preview dopo la transizione (ammesso che la scena in uscita originale ci sia ancora).\nQuesto non modificherà eventuali cambiamenti apportati alla scena di uscita originale."
@@ -308,6 +312,7 @@
 Basic.MainMenu.SceneCollection="&Collezione scene"
 Basic.MainMenu.Profile="&Profilo"
 
+Basic.MainMenu.Tools="&Strumenti"
 
 Basic.MainMenu.Help="Aiuto (&H)"
 Basic.MainMenu.Help.Website="Visita il sito"
@@ -328,6 +333,7 @@
 Basic.Settings.General.WarnBeforeStartingStream="Chiedi conferma quando si avvia una diretta"
 Basic.Settings.General.WarnBeforeStoppingStream="Chiedi conferma quando si termina una diretta"
 Basic.Settings.General.HideProjectorCursor="Nascondi cursore sopra proiettori"
+Basic.Settings.General.ProjectorAlwaysOnTop="Rendono i proiettori sempre in primo piano"
 Basic.Settings.General.Snapping="Allineamento Snapping Source"
 Basic.Settings.General.ScreenSnapping="Snap source nei bordi dello schermo"
 Basic.Settings.General.CenterSnapping="Snap source al centro orizzontale e verticale"
@@ -335,6 +341,8 @@
 Basic.Settings.General.SnapDistance="Sensibilità Snap"
 Basic.Settings.General.RecordWhenStreaming="Registra automaticamente quando si è in diretta"
 Basic.Settings.General.KeepRecordingWhenStreamStops="Continua a registrare quando la diretta s'interrompe"
+Basic.Settings.General.SysTrayEnabled="Abilita icona area di notifica"
+Basic.Settings.General.SysTrayWhenStarted="Minimizza all'area di notifica all'avvio"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Tipo di stream"
@@ -364,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Attenzione: Non è possibile usare più encoder QSV quando si è in diretta e si registra allo stesso tempo. Se vuoi andare in diretta e registrare allo stesso tempo, cambia l'encoder per la registrazione o l'encoder per la diretta."
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 Preset con basso utilizzo della CPU, aumenta le dimensioni del file)"
 Basic.Settings.Output.VideoBitrate="Bitrate video"
@@ -489,7 +498,10 @@
 Basic.Hotkeys.StopRecording="Ferma registrazione"
 Basic.Hotkeys.SelectScene="Passa alla scena"
 
+Basic.SystemTray.Show="Mostra"
+Basic.SystemTray.Hide="Nascondi"
 
+Basic.SystemTray.Message.Reconnecting="Disconnesso.  Riconnessione..."
 
 Hotkeys.Insert="Ins"
 Hotkeys.Delete="Canc"

obs-studio-0.16.2.tar.xz/UI/data/locale/ja-JP.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/ja-JP.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/ko-KR.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/ko-KR.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/ms-MY.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/ms-MY.ini Changed

@@ -23,11 +23,11 @@
 Display="Paparan"
 Name="Nama"
 Exit="Keluar"
-Mixer="Pengadun(suara)"
+Mixer="Pengadun suara"
 Browse="Cari"
 Mono="Mono"
 Stereo="Stereo"
-DroppedFrames="Gambar-gambar Terjatuh %1 (%2%)"
+DroppedFrames="%1 Gambar Hilang (%2%)"
 PreviewProjector="Paparan Projektor penuh (Pratonton)"
 SceneProjector="Paparan Projektor penuh (Adegan)"
 SourceProjector="Paparan Projektor penuh (Sumber)"
@@ -36,29 +36,33 @@
 Show="Tunjuk"
 Hide="Sembunyi"
 Untitled="Tiada tajuk"
-New="Baru"
-Duplicate="Salin"
+New="Baharu"
+Duplicate="Salin semula"
 Enable="Benarkan"
-DisableOSXVSync="Nyahaktifkan OSX V-Sync"
-ResetOSXVSyncOnExit="Tetapkan semula OSX V-Sync apabila keluar"
-HighResourceUsage="Pengekodan terbeban! Cuba turunkan tetapan video ataupun gunakan pratetapan pengekodan yang lebih cepat."
+DisableOSXVSync="Nyahaktifkan V-Sync OSX"
+ResetOSXVSyncOnExit="Set semula OSX V-Sync apabila keluar"
+HighResourceUsage="Pengekodan terbeban! Cuba turunkan tetapan video ataupun gunakan pratetap pengekodan yang lebih laju."
 Transition="Peralihan"
 QuickTransitions="Peralihan Pantas"
 Left="Kiri"
 Right="Kanan"
 Top="Atas"
 Bottom="Bawah"
+Reset="Set semula"
+Hours="Jam"
+Minutes="Minit"
+Seconds="Saat"
 
-QuickTransitions.SwapScenes="Tukar Pratonton/Output Adegan-adegan Selepas Peralihan"
-QuickTransitions.SwapScenesTT="Menukarkan pratonton dan output adegan-adegan sleeps peralihan(jika output adegan mash wujud).\nIni tidak akan mengundurkan semarang perubahan yang mungkin telah dibuat pada output adegan yang asal."
+QuickTransitions.SwapScenes="Tukar Pratonton/Pengeluaran Adegan Selepas Peralihan"
+QuickTransitions.SwapScenesTT="Menukarkan pratonton dan pengeluaran adegan-adegan selepas peralihan(jika pengeluaran adegan mash wujud).\nIni tidak akan mengundurkan sebarang perubahan yang mungkin telah dilakukan pada pengeluaran adegan yang asal."
 QuickTransitions.DuplicateScene="Klonkan Adegan"
-QuickTransitions.DuplicateSceneTT="Apabila menyunting adegan yang sama, ini membolehkan penyuntingan perubahan/keterlihatan tanpa mengubah output..\nUntuk edit sifat-sifat adegan-adegan tanpa mengubah suai output, aktifkan 'Klonkan Adegan'.\nPengubahan nilai ini akan menetapkan semula output adegan (jika adegan masih wujud)."
+QuickTransitions.DuplicateSceneTT="Apabila menyunting adegan yang sama, ini membolehkan penyuntingan perubahan/keterlihatan tanpa mengubah pengeluaran.\nUntuk edit sifat-sifat adegan tanpa mengubah suai pengeluaran, aktifkan 'Klonkan Adegan'.\nPengubahan nilai ini akan menetapkan semula pengeluaran adegan (jika adegan masih wujud)."
 QuickTransitions.EditProperties="Klonkan Sumber"
-QuickTransitions.EditPropertiesTT="Apabila menyunting adegan yang sama, ini membolehkan penyuntingan sumber-sumber tanpa mengubah output.\nIni hanya boleh dilakukan jika 'Klonkan Adegan' diaktifkan.\nSebahagian sumber (seperti sumber-sumber tangkapan atau media) tidak menyokong tetapan ini dan tidak boleh disunting secara berasingan.\nPenukaran nilai ini akan menetapkan semula output adegan yang sedang digunakan (jika adegan masih wujud).\n\nAmaran: Kerana sumber-sumber akan diklonkan, ini mungkin memerlukan penambahan sumber-sumber sistem/video."
+QuickTransitions.EditPropertiesTT="Apabila menyunting adegan yang sama, ini membolehkan penyuntingan sumber-sumber tanpa mengubah pengeluaran.\nIni hanya boleh dilakukan jika 'Klonkan Adegan' diaktifkan.\nSebahagian sumber (seperti sumber-sumber penangkapan atau media) tidak menyokong tetapan ini dan tidak boleh disunting secara berasingan.\nPenukaran nilai ini akan menetapkan semula pengeluaran adegan yang sedang digunakan (jika adegan masih wujud).\n\nAmaran: Pilihan ini mungkin memerlukan sumber-sumber sistem/audio tambahan kerana sumber-sumber akan diklonkan."
 QuickTransitions.HotkeyName="Peralihan Pantas: %1"
 
-Basic.AddTransition="Tambah Peralihan Yang Boleh Diubahsuai"
-Basic.RemoveTransition="Buang Peralihan Yang Boleh Diubahsuai"
+Basic.AddTransition="Tambah Peralihan yang Boleh Diubahsuai"
+Basic.RemoveTransition="Buang Peralihan yang Boleh Diubahsuai"
 Basic.TransitionProperties="Sifat-sifat Peralihan"
 Basic.SceneTransitions="Peralihan-peralihan Adegan"
 Basic.TransitionDuration="Tempoh"
@@ -87,24 +91,26 @@
 
 ConfirmRemove.Title="Pengesahan untuk Buang"
 ConfirmRemove.Text="Adakah anda pasti untuk buang '$1'?"
+ConfirmRemove.TextMultiple="Adakah anda yakin untuk buang %1 barang?"
 
 Output.ConnectFail.Title="Penyambungan gagal"
 Output.ConnectFail.BadPath="Sambungan URL atau Laluan yang tidak sah. Sila semak semula tetapan anda to mengesahkan bahawa semuanya sah."
 Output.ConnectFail.ConnectFailed="Penyambungan ke pelayan gagal"
+Output.ConnectFail.InvalidStream="Tidak dapat mencapai saluran yang ditetapkan/kata kunci 'stream', sila semak semula kata kunci 'stream'. Jika ia betul, kemungkinan ada masalah menyambung kepada pelayan."
 Output.ConnectFail.Error="Ralat tidak dijangka berlaku sewaktu percubaan menyambung ke pelayan. Maklumat lanjut di dalam fail log."
 Output.ConnectFail.Disconnected="Terputus daripada pelayan."
 
 Output.RecordFail.Title="Gagal memulakan rakaman"
-Output.RecordFail.Unsupported="Output format adalah tidak disokong atau tidak membenarkan lebih daripada satu 'audio track'. Sila semak tetapan anda dan cuba lagi."
+Output.RecordFail.Unsupported="Format pengeluaran tidak disokong atau tidak membenarkan lebih daripada satu trek audio. Sila semak tetapan anda dan cuba lagi."
 Output.RecordNoSpace.Title="Ruang simpanan tidak cukup"
 Output.RecordNoSpace.Msg="Tiada ruang simpanan yang cukup untuk meneruskan rakaman."
 Output.RecordError.Title="Ralat rakaman"
 Output.RecordError.Msg="Ralat yang tidak ditetapkan berlaku semasa rakaman."
 
 Output.BadPath.Title="Laluan Fail Rosak"
-Output.BadPath.Text="Laluan output fail yang dikonfigurasikan tidak sah.Sila semak semula tetapan anda untuk mengesahkan laluan fail yang sah telah ditetapkan."
+Output.BadPath.Text="Laluan pengeluaran fail yang dikonfigurasikan tidak sah. Sila semak semula tetapan anda untuk mengesahkan laluan fail yang sah telah ditetapkan."
 
-LogReturnDialog="Memuat naik Log Berjaya"
+LogReturnDialog="Muat naik Log Berjaya"
 LogReturnDialog.CopyURL="Salin URL"
 LogReturnDialog.ErrorUploadingLog="Ralat memuat naikkan fail log"
 
@@ -115,30 +121,51 @@
 LicenseAgreement.Exit="Keluar"
 
 Remux.SourceFile="Rakaman OBS"
-Remux.TargetFile="Fail sasaran"
+Remux.TargetFile="Fail Sasaran"
+Remux.Remux="Tukar format"
 Remux.OBSRecording="Rakaman OBS"
+Remux.FinishedTitle="Penukaran format selesai"
+Remux.Finished="Format rakaman ditukar"
+Remux.FinishedError="Format rakaman ditukar, tetapi fail itu mungkin tidak lengkap"
 Remux.SelectRecording="Pilih Rakaman OBS …"
 Remux.SelectTarget="Pilih fail sasaran …"
 Remux.FileExistsTitle="Fail sasaran wujud"
 Remux.FileExists="Fail sasaran wujud, adakah anda mahu gantikannya?"
+Remux.ExitUnfinishedTitle="Penukaran format sedang dijalankan"
+Remux.ExitUnfinished="Penukaran format masih belum selesai, menghentikannya sekarang boleh menyebabkan fail sasaran tidak boleh digunakan.\nAdakah anda pasti untuk memberhentikan proses ini?"
 
 UpdateAvailable="Ada Versi Baru"
 UpdateAvailable.Text="Versi %1.%2.%3 kini ada. <a href='%4'>Klik sini untuk memuat turun</a>"
 
 Basic.DesktopDevice1="Audio Desktop"
-Basic.DesktopDevice2="Audio Desktop"
+Basic.DesktopDevice2="Audio Desktop 2"
 Basic.AuxDevice1="Mic/Aux"
 Basic.AuxDevice2="Mic/Aux 2"
 Basic.AuxDevice3="Mic/Aux 3"
 Basic.AuxDevice4="Mic/Aux 4"
 
 Basic.Scene="Adegan"
+Basic.DisplayCapture="Paparan Penuh"
 
 Basic.Main.PreviewConextMenu.Enable="Benarkan Pratonton"
 
+ScaleFiltering="Skala Tapisan"
+ScaleFiltering.Point="Point"
+ScaleFiltering.Bilinear="Bilinear"
+ScaleFiltering.Bicubic="Bicubic"
+ScaleFiltering.Lanczos="Lanczos"
 
+Deinterlacing="Deinterlacing"
+Deinterlacing.Discard="Discard"
 Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
 Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Bahagian Atas Dahulu"
+Deinterlacing.BottomFieldFirst="Bahagian Bawah Dahulu"
 
 Basic.Main.AddSceneDlg.Title="Tambah Adegan"
 Basic.Main.AddSceneDlg.Text="Sila taip nama adegan"
@@ -170,14 +197,16 @@
 Basic.PropertiesWindow.Confirm="Ada perubahan yang belum disimpan. Adakah anda mahu menyimpannya?"
 Basic.PropertiesWindow.NoProperties="Tiada sifat-sifat disediakan"
 Basic.PropertiesWindow.AddFiles="Tambah Fail-Fail"
+Basic.PropertiesWindow.AddDir="Tambah Direktori"
 Basic.PropertiesWindow.AddURL="Tambah laluan/URL"
+Basic.PropertiesWindow.AddEditableListDir="Tambah direktori ke '%1'"
 Basic.PropertiesWindow.AddEditableListFiles="Tambah fail ke '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Tambah entri ke '%1'"
 Basic.PropertiesWindow.EditEditableListEntry="Sunting entri daripada '%1'"
 
-Basic.PropertiesView.FPS.Simple="Nilai-nilai mudah FPS"
-Basic.PropertiesView.FPS.Rational="Nilai-nilai pecahan FPS"
-Basic.PropertiesView.FPS.ValidFPSRanges="Julat sah FPS:"
+Basic.PropertiesView.FPS.Simple="Nilai-nilai FPS mudah"
+Basic.PropertiesView.FPS.Rational="Nilai-nilai FPS pecahan"
+Basic.PropertiesView.FPS.ValidFPSRanges="Julat FPS sah:"
 
 Basic.InteractionWindow="Berinteraksi dengan '%1'"
 
@@ -201,6 +230,8 @@
 Basic.TransformWindow.Position="Kedudukan"
 Basic.TransformWindow.Rotation="Pusingan"
 Basic.TransformWindow.Size="Saiz"
+Basic.TransformWindow.Alignment="Kedudukan Penjajaran"
+Basic.TransformWindow.Crop="Potong"
 
 Basic.TransformWindow.Alignment.TopLeft="Kiri Atas"
 Basic.TransformWindow.Alignment.TopCenter="Tengah Atas"
@@ -224,13 +255,16 @@
 Basic.Main.StartRecording="Mula rakaman"
 Basic.Main.StartStreaming="Mula 'streaming'"
 Basic.Main.StopRecording="Hentikan rakaman"
+Basic.Main.StoppingRecording="Menghentikan rakaman..."
 Basic.Main.StopStreaming="Hentikan 'streaming'"
+Basic.Main.StoppingStreaming="Menghentikan 'streaming'..."
 Basic.Main.ForceStopStreaming="Berhenti 'streaming' (buang kelewatan)"
 
 Basic.MainMenu.File="&Fail"
 Basic.MainMenu.File.Export="&Export"
 Basic.MainMenu.File.Import="&Import"
 Basic.MainMenu.File.ShowRecordings="Papar &Rakaman"
+Basic.MainMenu.File.Remux="Format& rakaman"
 Basic.MainMenu.File.Settings="&Tetapan"
 Basic.MainMenu.File.ShowSettingsFolder="Tunjukkan Folder Tetapan"
 Basic.MainMenu.File.ShowProfileFolder="Tunjukkan Folder Profil"
@@ -242,11 +276,14 @@
 Basic.MainMenu.Edit.Redo="Buat Semula (&R)"
 Basic.MainMenu.Edit.UndoAction="&Ubah Balik $1"
 Basic.MainMenu.Edit.RedoAction="&Ubah Semula $1"
+Basic.MainMenu.Edit.LockPreview="&Kunci Pratonton"
 Basic.MainMenu.Edit.Transform="&Ubah"
 Basic.MainMenu.Edit.Transform.EditTransform="&Sunting Perubahan..."
 Basic.MainMenu.Edit.Transform.Rotate90CW="Putarkan 90 darjah mengikut arah jam"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Putarkan 90 darjah melawan arah jam"
 Basic.MainMenu.Edit.Transform.Rotate180="Putarkan 180 darjah"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Flip secara &Mendatar"
+Basic.MainMenu.Edit.Transform.FlipVertical="Flip secara &Menegak"
 Basic.MainMenu.Edit.Transform.FitToScreen="&Muat di skrin"
 Basic.MainMenu.Edit.Transform.StretchToScreen="&Regangkan ke skrin"
 Basic.MainMenu.Edit.Order.MoveUp="Gerakkan ke &atas"
@@ -260,8 +297,11 @@
 Basic.MainMenu.Help.Logs="Fail &Log"
 Basic.MainMenu.Help.Logs.ShowLogs="&Tunjukkan Fail-Fail Log"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Muat naik Fail Log &Kini"
+Basic.MainMenu.Help.Logs.UploadLastLog="Muat naik &Fail Log Terakhir"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Paparkan Log Semasa"
 Basic.MainMenu.Help.CheckForUpdates="Semak Versi Baharu"
 
+Basic.Settings.ProgramRestart="Program ini mesti dimulakan semula untuk tetapan-tetapan ini berkesan."
 Basic.Settings.ConfirmTitle="Sahkan Perubahan"
 Basic.Settings.Confirm="Anda mempunyai perubahan yang tidak disimpan. Simpan perubahan?"
 
@@ -270,38 +310,112 @@
 Basic.Settings.General.Language="Bahasa"
 Basic.Settings.General.WarnBeforeStartingStream="Tunjukkan dialog pengesahan ketika memulakan 'stream'"
 Basic.Settings.General.WarnBeforeStoppingStream="Tunjukkan dialog pengesahan ketika menghentikan 'stream'"
+Basic.Settings.General.HideProjectorCursor="Sembunyikan tetikus atas projektor"
+Basic.Settings.General.ProjectorAlwaysOnTop="Jadikan projektor sentiasa di atas"
+Basic.Settings.General.SnapDistance="Kepekaan 'snap'"
+Basic.Settings.General.RecordWhenStreaming="Rakam apabila 'streaming' secara automatik"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Tetap rakam selepas 'stream' berhenti"
 
 Basic.Settings.Stream="'Stream'"
 Basic.Settings.Stream.StreamType="Jenis 'Stream'"
 
+Basic.Settings.Output="Hasil"
 Basic.Settings.Output.Format="Format Rakaman"
 Basic.Settings.Output.SelectFile="Pilih Fail Rakaman"
+Basic.Settings.Output.EnforceBitrate="Kuatkuasakan had nilai bit perkhidmatan 'streaming'"
+Basic.Settings.Output.Mode.Simple="Mudah"
+Basic.Settings.Output.Mode.Adv="Lanjutan"
 Basic.Settings.Output.Simple.RecordingQuality="Kualiti Rakaman"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Sama seperti 'stream'"
 Basic.Settings.Output.Simple.Encoder.Software="Perisian (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (Preset x264: pengunaan CPU rendah, menaikkan saiz fail)"
+Basic.Settings.Output.VideoBitrate="Nilai Bit Video"
+Basic.Settings.Output.AudioBitrate="Nilai Bit Audio"
 Basic.Settings.Output.Reconnect="Sambung semula secara automatik"
 Basic.Settings.Output.RetryDelay="Kelewatan Percubaan (saat)"
 Basic.Settings.Output.MaxRetries="Cubaan Maksimum"
 
+Basic.Settings.Output.Adv.AudioTrack="Trek Audio"
+Basic.Settings.Output.Adv.Streaming="'Streaming'"
+Basic.Settings.Output.Adv.Audio.Track1="Trek 1"
+Basic.Settings.Output.Adv.Audio.Track2="Trek 2"
+Basic.Settings.Output.Adv.Audio.Track3="Trek 3"
+Basic.Settings.Output.Adv.Audio.Track4="Trek 4"
 
 Basic.Settings.Output.Adv.Recording="Rakaman"
 Basic.Settings.Output.Adv.Recording.Type="Jenis"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Bias"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Gantikan jika fail wujud"
 Basic.Settings.Output.Adv.FFmpeg.Type="Jenis Output FFmpeg"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Semua Fail"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Laluan fail atau URL"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Audio"
+Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Format Asal"
 
 
 
 
 
+Basic.Settings.Audio.EnablePushToMute="Benarkan Tekan-untuk-senyap"
+Basic.Settings.Audio.PushToMuteDelay="Kelewatan Tekan-untuk-senyap"
+Basic.Settings.Audio.EnablePushToTalk="Benarkan Tekan-untuk-cakap"
+Basic.Settings.Audio.PushToTalkDelay="Kelewatan Tekan-untuk-cakap"
+Basic.Settings.Audio.UnknownAudioDevice="[Peranti tidak disambung atau tiada]"
 
+Basic.Settings.Advanced="Lanjutan"
+Basic.Settings.Advanced.General.ProcessPriority="Keutamaan Proses"
+Basic.Settings.Advanced.General.ProcessPriority.High="Tinggi"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Atas Normal"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Normal"
 Basic.Settings.Advanced.FormatWarning="Amaran:Format warna selain daripada 'NV12' lebih digunakan untuk rakaman,dan tidak disyorkan apabila 'streaming'.'Streaming' mungkin menyebabkan peningkatan penggunaan CPU disebabkan oleh penukaran format warna."
-
-
-
-
-
-
+Basic.Settings.Advanced.Video.ColorFormat="Format Warna"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Sebahagian"
+Basic.Settings.Advanced.Video.ColorRange.Full="Penuh"
+Basic.Settings.Advanced.StreamDelay="Kelewatan 'Stream'"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Anggaran Penggunaan Memori: %1 MB"
+Basic.Settings.Advanced.Network="Rangkaian"
+
+Basic.AdvAudio.Name="Nama"
+Basic.AdvAudio.AudioTracks="Trek-trek"
+
+Basic.Settings.Hotkeys="Kekunci Pantas"
+
+Basic.Hotkeys.StartStreaming="Mula 'Streaming'"
+Basic.Hotkeys.StartRecording="Mula Rakaman"
+Basic.Hotkeys.StopRecording="Hentikan Rakaman"
+
+Basic.SystemTray.Show="Papar"
+Basic.SystemTray.Hide="Sembunyi"
+
+Basic.SystemTray.Message.Reconnecting="Terputus. Menyambung semula..."
+
+Hotkeys.Insert="Insert"
+Hotkeys.Delete="Delete"
+Hotkeys.Home="Home"
+Hotkeys.End="End"
+Hotkeys.PageUp="Page Up"
+Hotkeys.PageDown="Page Down"
+Hotkeys.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
+Hotkeys.CapsLock="Caps Lock"
+Hotkeys.Backspace="Backspace"
+Hotkeys.Tab="Tab"
+Hotkeys.Print="Print"
+Hotkeys.Pause="Pause"
+Hotkeys.Left="Left"
+Hotkeys.Right="Right"
+Hotkeys.Up="Up"
+Hotkeys.Down="Down"
+Hotkeys.Windows="Windows"
 Hotkeys.NumpadDecimal="Perpuluhan Numpad"
 
+Mute="Senyap"
+Push-to-mute="Tekan-untuk-senyap"
+Push-to-talk="Tekan-untuk-cakap"

obs-studio-0.16.2.tar.xz/UI/data/locale/pl-PL.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/pl-PL.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/pt-BR.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/pt-BR.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/pt-PT.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/pt-PT.ini Changed

@@ -48,6 +48,10 @@
 Right="Direita"
 Top="Cima"
 Bottom="Baixo"
+Reset="Repor"
+Hours="Horas"
+Minutes="Minutos"
+Seconds="Segundos"
 
 QuickTransitions.SwapScenes="Trocar pré-visualização/saída de cenas Depois de uma Transição"
 QuickTransitions.DuplicateScene="Duplicar cena"
@@ -85,6 +89,7 @@
 
 ConfirmRemove.Title="Comfirmar Remover"
 ConfirmRemove.Text="Tem a certeza que quer remover '$1'?"
+ConfirmRemove.TextMultiple="Tem a certeza de que pretende remover %1 itens?"
 
 Output.ConnectFail.Title="Falha ao ligar"
 Output.ConnectFail.BadPath="Caminho ou endereço de ligação inválido. Por favor, verifique as suas definições para confirmar que são válidas."
@@ -185,7 +190,9 @@
 Basic.PropertiesWindow.Confirm="Há alterações não guardadas. Pretende mantê-las?"
 Basic.PropertiesWindow.NoProperties="Sem propriedades disponíveis"
 Basic.PropertiesWindow.AddFiles="Adicionar ficheiros"
+Basic.PropertiesWindow.AddDir="Adicionar diretório"
 Basic.PropertiesWindow.AddURL="Adicionar caminho ou endereço"
+Basic.PropertiesWindow.AddEditableListDir="Adicionar diretório a '%1'"
 Basic.PropertiesWindow.AddEditableListFiles="Adicionar ficheiros a '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Adicionar entrada a '%1'"
 Basic.PropertiesWindow.EditEditableListEntry="Editar entrada a '%1'"
@@ -249,7 +256,9 @@
 Basic.Main.StartRecording="Começar Gravação"
 Basic.Main.StartStreaming="Iniciar transmissão"
 Basic.Main.StopRecording="Parar Gravação"
+Basic.Main.StoppingRecording="A parar gravação..."
 Basic.Main.StopStreaming="Parar transmissão"
+Basic.Main.StoppingStreaming="A parar transmissão..."
 Basic.Main.ForceStopStreaming="Parar transmissão (ignorar atraso)"
 
 Basic.MainMenu.File="&Ficheiro"
@@ -268,6 +277,7 @@
 Basic.MainMenu.Edit.Redo="&Refazer"
 Basic.MainMenu.Edit.UndoAction="Desfazer $1"
 Basic.MainMenu.Edit.RedoAction="&Refazer $1"
+Basic.MainMenu.Edit.LockPreview="B&loquear pré-visualização"
 Basic.MainMenu.Edit.Transform="&Transformar"
 Basic.MainMenu.Edit.Transform.EditTransform="&Editar Transformação..."
 Basic.MainMenu.Edit.Transform.ResetTransform="&Reset Transform"
@@ -286,10 +296,15 @@
 Basic.MainMenu.Edit.Order.MoveToBottom="Mover para o Fundo"
 Basic.MainMenu.Edit.AdvAudio="Propriedades &avançadas de áudio"
 
+Basic.MainMenu.View="&Ver"
+Basic.MainMenu.View.Toolbars="Barras de ferramen&tas"
+Basic.MainMenu.View.SceneTransitions="Transições de &cenas"
+Basic.MainMenu.View.StatusBar="&Barra de estado"
 
 Basic.MainMenu.SceneCollection="Coleção de cena"
 Basic.MainMenu.Profile="&Perfil"
 
+Basic.MainMenu.Tools="&Ferramentas"
 
 Basic.MainMenu.Help="&Ajuda"
 Basic.MainMenu.Help.Website="Visitar &website"
@@ -311,6 +326,10 @@
 Basic.Settings.General.WarnBeforeStoppingStream="Mostrar caixa de diálogo de confirmação ao parar transmissões"
 Basic.Settings.General.Snapping="Alinhamentos com encaixe na Cena"
 Basic.Settings.General.SnapDistance="Sensibilidade do Snap"
+Basic.Settings.General.RecordWhenStreaming="Gravar automaticamente quando estiver a transmitir"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Continuar a gravar quando a transmissão parar"
+Basic.Settings.General.SysTrayEnabled="Ativar ícone da área de notificações"
+Basic.Settings.General.SysTrayWhenStarted="Minimizar para a área de notificações quando iniciado"
 
 Basic.Settings.Stream="Transmissão"
 Basic.Settings.Stream.StreamType="Tipo de transmissão"
@@ -423,6 +442,11 @@
 Basic.Settings.Audio.UnknownAudioDevice="[Dispositivo não conectado ou não disponível]"
 
 Basic.Settings.Advanced="Avançado"
+Basic.Settings.Advanced.General.ProcessPriority="Prioridade do precesso"
+Basic.Settings.Advanced.General.ProcessPriority.High="Alta"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Acima do normal"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Normal"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="Inativo"
 Basic.Settings.Advanced.FormatWarning="Aviso: Formatos de cor diferentes de NV12 destinam-se principalmente a gravação e não são recomendados durante a transmissão. A transmissão pode incorrer numa maior utilização do processador devido à conversão do formato de cor."
 Basic.Settings.Advanced.Audio.BufferingTime="Tempo de carregamento do áudio"
 Basic.Settings.Advanced.Video.ColorFormat="Formato de cor"
@@ -434,6 +458,8 @@
 Basic.Settings.Advanced.StreamDelay.Duration="Duração (segundos)"
 Basic.Settings.Advanced.StreamDelay.Preserve="Preservar o ponto de corte (aumentar atraso) quando reconectar"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Utilização estimada de memória: %1 MB"
+Basic.Settings.Advanced.Network="Rede"
+Basic.Settings.Advanced.Network.BindToIP="Ligar pelo IP"
 
 Basic.AdvAudio="Propriedades avançadas de áudio"
 Basic.AdvAudio.Name="Nome"
@@ -452,7 +478,10 @@
 Basic.Hotkeys.StopRecording="Parar gravação"
 Basic.Hotkeys.SelectScene="Mudar para cena"
 
+Basic.SystemTray.Show="Mostrar"
+Basic.SystemTray.Hide="Ocultar"
 
+Basic.SystemTray.Message.Reconnecting="Desligado. A religar..."
 
 Hotkeys.Insert="Insert"
 Hotkeys.Delete="Delete"

obs-studio-0.16.2.tar.xz/UI/data/locale/ru-RU.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/ru-RU.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/sk-SK.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/sk-SK.ini Changed

@@ -8,6 +8,7 @@
 Close="Zatvoriť"
 Save="Uložiť"
 Discard="Zahodiť"
+Disable="Zakázané"
 Yes="Áno"
 No="Nie"
 Add="Pridať"
@@ -18,6 +19,7 @@
 MoveDown="Posunúť nižšie"
 Settings="Nastavenia"
 Display="Monitor"
+Name="Meno"
 Exit="Ukončiť"
 Mixer="Zmiešavač"
 Browse="Prehľadávať"
@@ -32,8 +34,16 @@
 New="Nový"
 Duplicate="Duplikovať"
 Enable="Povoliť"
+Left="Vľavo"
+Right="Vpravo"
+Reset="Vynulovať"
+Hours="Hodín"
+Minutes="Minúty"
+Seconds="Sekundy"
 
 
+Basic.TransitionDuration="Trvanie"
+Basic.TogglePreviewProgramMode="Štúdiový režim"
 
 
 TitleBar.Profile="Profil"
@@ -45,7 +55,11 @@
 NoNameEntered.Title="Prosím, zadajte platný názov"
 NoNameEntered.Text="Nemôžete použiť prázdne názvy."
 
+ConfirmStart.Title="Spustiť stream?"
+ConfirmStart.Text="Naozaj chcete spustiť stream?"
 
+ConfirmStop.Title="Zastaviť stream?"
+ConfirmStop.Text="Naozaj chcete zastaviť stream?"
 
 ConfirmExit.Title="Ukončiť OBS?"
 ConfirmExit.Text="OBS je momentálne aktívny.  Všetky prúdy údajov/záznamy sa ukončia.  Naozaj pokračovať?"
@@ -57,6 +71,9 @@
 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.RecordFail.Title="Nepodarilo sa spustiť nahrávanie"
+Output.RecordNoSpace.Title="Nedostatok miesta na disku"
+Output.RecordError.Title="Chyba nahrávania"
 
 Output.BadPath.Title="Nesprávna cesta k súboru"
 
@@ -68,6 +85,7 @@
 
 Remux.SourceFile="OBS nahrávka"
 Remux.TargetFile="Cieľový súbor"
+Remux.OBSRecording="OBS nahrávanie"
 Remux.SelectRecording="Vybrať OBS nahrávku …"
 Remux.SelectTarget="Vyberte cieľový súbor …"
 Remux.FileExistsTitle="Cieľový súbor existuje"

obs-studio-0.16.2.tar.xz/UI/data/locale/sr-CS.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/sr-CS.ini Changed

@@ -48,6 +48,10 @@
 Right="Zdesna"
 Top="Odozgo"
 Bottom="Odozdo"
+Reset="Poništi"
+Hours="Sati"
+Minutes="Minuta"
+Seconds="Sekundi"
 
 QuickTransitions.SwapScenes="Zameni scene pregleda/izlaza nakon prelaza"
 QuickTransitions.SwapScenesTT="Zamenjuje scene pregleda i izlaza nakon prelaza (ako originalna scena izlaza još uvek postoji).\nOvo neće poništiti promene koje su načinjene nad originalnom scenom izlaza."
@@ -368,6 +372,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Upozorenje: Ne možete koristi više odvojenih QSV enkodera kada emitujete i snimate u isto vreme. Ako želite da emitujete i snimate u isto vreme, molim promenite ili enkoder snimanja ili enkoder emitovanja."
 Basic.Settings.Output.Simple.Encoder.Software="Softverski (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Mašinski (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Mašinski (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Mašinski (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softverski (x264 niska upotreba procesora, povećava veličinu datoteke)"
 Basic.Settings.Output.VideoBitrate="Protok videa"

obs-studio-0.16.2.tar.xz/UI/data/locale/sr-SP.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/sr-SP.ini Changed

@@ -48,6 +48,10 @@
 Right="Здесна"
 Top="Одозго"
 Bottom="Одоздо"
+Reset="Поништи"
+Hours="Сати"
+Minutes="Минута"
+Seconds="Секунди"
 
 QuickTransitions.SwapScenes="Замени сцене прегледа/излаза након прелаза"
 QuickTransitions.SwapScenesTT="Замењује сцене прегледа и излаза након прелаза (ако оригинална сцена још увек постоји).\nОво неће поништити промене које су начињене над оригиналном сценом излаза."
@@ -368,6 +372,7 @@
 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="Проток видеа"

obs-studio-0.16.2.tar.xz/UI/data/locale/sv-SE.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/sv-SE.ini Changed

@@ -367,6 +367,7 @@
 Basic.Settings.Output.Simple.Warn.MultipleQSV="Varning: Du kan inte använda flera separata QSV-kodare när du streamar och spelar in samtidigt. Om du vill streama och spela in samtidigt, vänligen ändra inspelnings-kodek eller streaming-kodek."
 Basic.Settings.Output.Simple.Encoder.Software="Programvara (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hårdvara (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hårdvara (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hårdvara (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Mjukvaru-kodek (x264-förinställning för lågt CPU-användning, ökar filstorleken)"
 Basic.Settings.Output.VideoBitrate="Bithastighet för video"
@@ -483,6 +484,7 @@
 Basic.AdvAudio.AudioTracks="Spår"
 
 Basic.Settings.Hotkeys="Kortkommandon"
+Basic.Settings.Hotkeys.Pair="Tangentkombinationer som delas med \"%1\" fungerar som strömbrytare"
 
 Basic.Hotkeys.StartStreaming="Börja strömma"
 Basic.Hotkeys.StopStreaming="Sluta strömma"

obs-studio-0.16.2.tar.xz/UI/data/locale/uk-UA.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/uk-UA.ini Changed

@@ -49,6 +49,9 @@
 Top="Зверху"
 Bottom="Знизу"
 Reset="Скинути"
+Hours="Годин"
+Minutes="Хвилин"
+Seconds="Секунд"
 
 QuickTransitions.SwapScenes="Поміняти місцями сцени Перегляд/Вивід після Відео-переходу"
 QuickTransitions.SwapScenesTT="Міняє місцями сцени Перегляд та Вивід після закінчення Відео-переходу (якщо сцена Вивід ще існує).\nЗміни внесені до обох сцен залишаються."
@@ -369,6 +372,7 @@
 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="Відео бітрейт"

obs-studio-0.16.2.tar.xz/UI/data/locale/vi-VN.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/vi-VN.ini Changed

@@ -24,7 +24,7 @@
 Name="Tên"
 Exit="Thoát"
 Mixer="Bộ trộn"
-Browse="trình duyệt"
+Browse="Chọn đường dẫn"
 Mono="Âm thanh đơn"
 Stereo="Âm thanh nổi"
 DroppedFrames="Khung rớt %1 (%2%)"
@@ -41,18 +41,30 @@
 Enable="Kích hoạt"
 DisableOSXVSync="Tắt OSX V-Sync"
 ResetOSXVSyncOnExit="Đặt lại OSX V-Sync khi Thoát"
-Transition="Chuyển tiếp"
+HighResourceUsage="Encoder quá tải!  Hãy xem xét giảm chất lượng video hoặc sử dụng 1 encoder nhanh hơn."
+Transition="Chuyển cảnh"
 QuickTransitions="C. cảnh nhanh"
 Left="Trái"
 Right="Phải"
 Top="Trên"
 Bottom="Dưới"
+Reset="Thiết lập lại"
+Hours="Giờ"
+Minutes="Phút"
+Seconds="Giây"
 
 QuickTransitions.SwapScenes="Hoán đổi cảnh Xem trước/Đầu ra sau khi Chuyển cảnh"
 QuickTransitions.SwapScenesTT="Hoán đổi cảnh xem trước và cảnh đầu ra sau khi chuyển cảnh (nếu cảnh đầu ra gốc vẫn tồn tại).\nMọi thay đổi với cảnh đầu ra gốc sẽ không hoàn tác."
 QuickTransitions.DuplicateScene="Tạo bản sao cảnh"
+QuickTransitions.HotkeyName="C. cảnh nhanh: %1"
 
+Basic.AddTransition="Thêm cấu hình chuyển cảnh"
+Basic.RemoveTransition="Xóa cấu hình chuyển cảnh"
+Basic.TransitionDuration="Thời gian"
+Basic.TogglePreviewProgramMode="Chế độ Studio"
 
+TransitionNameDlg.Text="Vui lòng nhập tên của cảnh"
+TransitionNameDlg.Title="Tên chuyển cảnh"
 
 TitleBar.Profile="Cấu hình"
 TitleBar.Scenes="Cảnh"
@@ -63,18 +75,24 @@
 NoNameEntered.Title="Vui lòng nhập tên hợp lệ"
 NoNameEntered.Text="Bạn không thể sử dụng tên có sản phẩm nào."
 
+ConfirmStart.Title="Bắt đầu Stream?"
+ConfirmStart.Text="Bạn có chắc muốn bắt đầu stream?"
 
+ConfirmStop.Title="Ngừng Stream?"
+ConfirmStop.Text="Bạn có chắc muốn dừng stream?"
 
 ConfirmExit.Title="Thoát OBS?"
-ConfirmExit.Text="OBS là hiện đang hoạt động.  Tất cả dòng/bản ghi sẽ được đóng cửa.  Bạn có chắc bạn muốn thoát khỏi không?"
+ConfirmExit.Text="OBS hiện đang hoạt động.  Tất cả các stream/quay video sẽ bị tắt.  Bạn có chắc muốn thoát không?"
 
 ConfirmRemove.Title="Xác nhận loại bỏ"
 ConfirmRemove.Text="Bạn có chắc bạn muốn loại bỏ '$1' không?"
+ConfirmRemove.TextMultiple="Bạn có chắc bạn muốn xóa %1 nội dung không?"
 
 Output.ConnectFail.Title="Không thể kết nối"
 Output.ConnectFail.BadPath="URL không hợp lệ của đường dẫn hoặc kết nối.  Xin vui lòng kiểm tra cài đặt của bạn để xác nhận rằng họ là hợp lệ."
 Output.ConnectFail.ConnectFailed="Không thể kết nối tới hệ phục vụ"
-Output.ConnectFail.Error="Lỗi bất ngờ xảy ra khi thử kết nối tới hệ phục vụ.  Biết thêm thông tin trong các tập tin log."
+Output.ConnectFail.InvalidStream="Không thể truy cập kênh chỉ định hoặc khóa stream, Vui lòng kiểm tra khóa stream của bạn.  Nếu nó đúng, có thể có một vấn đề về kết nối với máy chủ."
+Output.ConnectFail.Error="1 lỗi bất ngờ xảy ra khi thử kết nối tới máy chủ.  Thông tin thêm nằm trong log file."
 Output.ConnectFail.Disconnected="Ngắt kết nối từ máy chủ."
 
 Output.RecordFail.Title="Không thể bắt đầu ghi âm"
@@ -100,6 +118,7 @@
 Remux.SourceFile="Ghi âm OBS"
 Remux.TargetFile="Tệp đích"
 Remux.Remux="Remux"
+Remux.OBSRecording="Ghi OBS"
 Remux.FinishedTitle="Remuxing đã hoàn thành"
 Remux.Finished="Ghi remuxed"
 Remux.FinishedError="Ghi âm remuxed, nhưng các tập tin có thể không đầy đủ"
@@ -125,7 +144,21 @@
 
 Basic.Main.PreviewConextMenu.Enable="Bật xem trước"
 
-
+ScaleFiltering="Scale Filtering"
+ScaleFiltering.Point="Point"
+ScaleFiltering.Bilinear="Bilinear"
+ScaleFiltering.Bicubic="Bicubic"
+ScaleFiltering.Lanczos="Lanczos"
+
+Deinterlacing="Deinterlacing"
+Deinterlacing.Discard="Discard"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
 
 Basic.Main.AddSceneDlg.Title="Thêm cảnh"
 Basic.Main.AddSceneDlg.Text="Vui lòng nhập tên của cảnh"
@@ -157,7 +190,9 @@
 Basic.PropertiesWindow.Confirm="Có được lưu thay đổi.  Bạn có muốn giữ họ?"
 Basic.PropertiesWindow.NoProperties="Không có tài sản có sẵn"
 Basic.PropertiesWindow.AddFiles="Thêm tập tin"
+Basic.PropertiesWindow.AddDir="Thêm thư mục"
 Basic.PropertiesWindow.AddURL="Thêm đường dẫn/URL"
+Basic.PropertiesWindow.AddEditableListDir="Thêm thư mục vào '%1'"
 Basic.PropertiesWindow.AddEditableListFiles="Thêm các tệp vào '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Thêm mục nhập vào '%1'"
 Basic.PropertiesWindow.EditEditableListEntry="Chỉnh sửa mục nhập từ '%1'"
@@ -192,6 +227,7 @@
 Basic.TransformWindow.BoundsType="Các giáp ranh hộp loại"
 Basic.TransformWindow.BoundsAlignment="Liên kết trong các giáp ranh hộp"
 Basic.TransformWindow.Bounds="Các giáp ranh hộp kích thước"
+Basic.TransformWindow.Crop="Cắt"
 
 Basic.TransformWindow.Alignment.TopLeft="Góc trên trái"
 Basic.TransformWindow.Alignment.TopCenter="Đỉnh Trung tâm"
@@ -220,7 +256,9 @@
 Basic.Main.StartRecording="Bắt đầu ghi âm"
 Basic.Main.StartStreaming="Bắt đầu Streaming"
 Basic.Main.StopRecording="Dừng ghi âm"
+Basic.Main.StoppingRecording="Dừng ghi video..."
 Basic.Main.StopStreaming="Ngừng Streaming"
+Basic.Main.StoppingStreaming="Dừng stream..."
 Basic.Main.ForceStopStreaming="Ngừng Streaming (huỷ chậm trễ)"
 
 Basic.MainMenu.File="&Tập tin"
@@ -231,6 +269,7 @@
 Basic.MainMenu.File.Settings="&Cài đặt"
 Basic.MainMenu.File.ShowSettingsFolder="Hiển thị cài đặt thư mục"
 Basic.MainMenu.File.ShowProfileFolder="Hiển thị thư mục hồ sơ"
+Basic.MainMenu.AlwaysOnTop="&Luôn trên đầu trang"
 Basic.MainMenu.File.Exit="&Thoát"
 
 Basic.MainMenu.Edit="& Chỉnh sửa"
@@ -238,6 +277,7 @@
 Basic.MainMenu.Edit.Redo="& Làm lại"
 Basic.MainMenu.Edit.UndoAction="& Hoàn tác $1"
 Basic.MainMenu.Edit.RedoAction="& Làm lại $1"
+Basic.MainMenu.Edit.LockPreview="&Khóa xem trước"
 Basic.MainMenu.Edit.Transform="Biến đổi"
 Basic.MainMenu.Edit.Transform.EditTransform="& Chỉnh sửa biến đổi..."
 Basic.MainMenu.Edit.Transform.ResetTransform="& Đặt lại biến đổi"
@@ -256,10 +296,15 @@
 Basic.MainMenu.Edit.Order.MoveToBottom="Chuyển đến dưới cùng"
 Basic.MainMenu.Edit.AdvAudio="Thuộc tính âm thanh nâng cao"
 
+Basic.MainMenu.View="&Hiển thị"
+Basic.MainMenu.View.Toolbars="&Thanh công cụ"
+Basic.MainMenu.View.Toolbars.Listboxes="&Listboxes"
+Basic.MainMenu.View.StatusBar="&Thanh trạng thái"
 
 Basic.MainMenu.SceneCollection="& Cảnh bộ sưu tập"
 Basic.MainMenu.Profile="& Hồ sơ"
 
+Basic.MainMenu.Tools="&Công cụ"
 
 Basic.MainMenu.Help="&Trợ giúp"
 Basic.MainMenu.Help.Website="Ghé thăm Website"
@@ -277,6 +322,9 @@
 Basic.Settings.General="Chung"
 Basic.Settings.General.Theme="Theme"
 Basic.Settings.General.Language="Ngôn ngữ"
+Basic.Settings.General.HideProjectorCursor="Ẩn con trỏ chuột trên màn chiếu"
+Basic.Settings.General.ProjectorAlwaysOnTop="Làm cho màn chiếu luôn luôn trên đầu"
+Basic.Settings.General.SysTrayEnabled="Bật khay biểu tượng hệ thống"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Kiểu Stream"
@@ -301,6 +349,9 @@
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Bạn có chắc bạn muốn sử dụng lossless chất lượng?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless chất lượng cảnh báo!"
 Basic.Settings.Output.Simple.Encoder.Software="Phần mềm (x 264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Phần cứng (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Phần cứng (AMD)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Phần cứng (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Phần mềm (x 264 sử dụng CPU thấp cài sẵn, tăng kích thước)"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Âm thanh Bitrate"
@@ -327,6 +378,8 @@
 Basic.Settings.Output.Adv.Recording.Type.Standard="Chuản"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Tùy chỉnh đầu ra (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Sử dụng dòng mã hóa)"
+Basic.Settings.Output.Adv.Recording.Filename="Định dạng tệp tin"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Ghi đè nếu tập tin tồn tại"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg ra loại"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Sản lượng để URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Đầu ra vào tập tin"
@@ -374,27 +427,35 @@
 Basic.Settings.Audio.SampleRate="Tỷ lệ mẫu"
 Basic.Settings.Audio.Channels="Kênh Tivi"
 Basic.Settings.Audio.DesktopDevice="Thiết bị âm thanh máy tính"
-Basic.Settings.Audio.DesktopDevice2="Thiết bị âm thanh máy tính"
-Basic.Settings.Audio.AuxDevice="Mic/liên minh thiết bị âm thanh"
-Basic.Settings.Audio.AuxDevice2="Mic/liên minh thiết bị âm thanh 2"
-Basic.Settings.Audio.AuxDevice3="Mic/liên minh thiết bị âm thanh 3"
+Basic.Settings.Audio.DesktopDevice2="Thiết bị âm thanh máy tính 2"
+Basic.Settings.Audio.AuxDevice="Thiết bị âm thanh mic/phụ trợ"
+Basic.Settings.Audio.AuxDevice2="Thiết bị âm thanh mic/phụ trợ 2"
+Basic.Settings.Audio.AuxDevice3="Thiết bị âm thanh mic/phụ trợ 3"
 Basic.Settings.Audio.EnablePushToMute="Sử đẩy để tắt tiếng"
 Basic.Settings.Audio.PushToMuteDelay="Sự chậm trễ đẩy để tắt tiếng"
 Basic.Settings.Audio.EnablePushToTalk="Sử Push-to-talk"
-Basic.Settings.Audio.PushToTalkDelay="Push-to-talk chậm trễ"
+Basic.Settings.Audio.PushToTalkDelay="Bấm để nói trễ"
+Basic.Settings.Audio.UnknownAudioDevice="[Thiết bị không được kết nối hoặc không sẵn dùng]"
 
 Basic.Settings.Advanced="Nâng cao"
-Basic.Settings.Advanced.FormatWarning="Cảnh báo: Định dạng màu sắc khác hơn so với NV12 chủ yếu dành cho ghi âm, và không được khuyến cáo khi streaming.  Trực tuyến có thể phải tăng sử dụng CPU do chuyển đổi định dạng màu sắc."
+Basic.Settings.Advanced.General.ProcessPriority="Chương trình ưu tiên"
+Basic.Settings.Advanced.General.ProcessPriority.High="Cao"
+Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Trên bình thường"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Thường"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="Rảnh"
+Basic.Settings.Advanced.FormatWarning="Cảnh báo: Định dạng màu sắc khác với NV12 chủ yếu dành cho ghi âm và không được khuyến cáo khi streaming.  Stream có thể làm tăng sử dụng CPU do phải chuyển đổi định dạng màu sắc."
 Basic.Settings.Advanced.Audio.BufferingTime="Âm thanh thời gian đệm"
 Basic.Settings.Advanced.Video.ColorFormat="Định dạng màu sắc"
 Basic.Settings.Advanced.Video.ColorSpace="Không gian màu YUV"
 Basic.Settings.Advanced.Video.ColorRange="Phạm vi màu YUV"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Một phần"
 Basic.Settings.Advanced.Video.ColorRange.Full="Đầy đủ"
-Basic.Settings.Advanced.StreamDelay="Sự chậm trễ Stream"
-Basic.Settings.Advanced.StreamDelay.Duration="Thời gian (phút)"
-Basic.Settings.Advanced.StreamDelay.Preserve="Bảo tồn cutoff điểm (tăng chậm trễ) khi kết nối lại"
-Basic.Settings.Advanced.StreamDelay.MemoryUsage="Sử dụng ước tính bộ nhớ: %1 MB"
+Basic.Settings.Advanced.StreamDelay="Stream trễ"
+Basic.Settings.Advanced.StreamDelay.Duration="Thời gian (giây)"
+Basic.Settings.Advanced.StreamDelay.Preserve="Giữ điểm cắt (tăng chậm trễ) khi kết nối lại"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Ước tính bộ nhớ sử dụng: %1 MB"
+Basic.Settings.Advanced.Network="Mạng"
+Basic.Settings.Advanced.Network.BindToIP="Liên kết với IP"
 
 Basic.AdvAudio="Thuộc tính âm thanh nâng cao"
 Basic.AdvAudio.Name="Tên"
@@ -413,7 +474,10 @@
 Basic.Hotkeys.StopRecording="Dừng ghi âm"
 Basic.Hotkeys.SelectScene="Chuyển cảnh"
 
+Basic.SystemTray.Show="Hiện"
+Basic.SystemTray.Hide="Ẩn"
 
+Basic.SystemTray.Message.Reconnecting="Ngắt kết nối.  Đang kết nối lại..."
 
 Hotkeys.Insert="Chèn"
 Hotkeys.Delete="Xoá"
@@ -453,12 +517,12 @@
 
 Mute="Tắt Tiếng"
 Unmute="Bật tiếng"
-Push-to-mute="Đẩy để tắt tiếng"
-Push-to-talk="Push-to-talk"
+Push-to-mute="Bấm để tắt tiếng"
+Push-to-talk="Bấm để nói"
 
 SceneItemShow="Hiển thị '%1'"
 SceneItemHide="Ẩn '%1'"
 
-OutputWarnings.NoTracksSelected="Bạn phải chọn ít nhất một ca khúc"
-OutputWarnings.MultiTrackRecording="Chú ý: Một số định dạng (chẳng hạn như FLV) không hỗ trợ nhiều bài hát cho một ghi âm"
+OutputWarnings.NoTracksSelected="Bạn phải chọn ít nhất một track"
+OutputWarnings.MultiTrackRecording="Chú ý: Một số định dạng (chẳng hạn như FLV) không hỗ trợ nhiều track cho mỗi video"

obs-studio-0.16.2.tar.xz/UI/data/locale/zh-CN.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/zh-CN.ini Changed

obs-studio-0.16.2.tar.xz/UI/data/locale/zh-TW.ini -> obs-studio-0.16.4.tar.xz/UI/data/locale/zh-TW.ini Changed

obs-studio-0.16.2.tar.xz/UI/forms/OBSBasicTransform.ui -> obs-studio-0.16.4.tar.xz/UI/forms/OBSBasicTransform.ui Changed

@@ -493,6 +493,25 @@
 </item>
 <item row="9" column="1">
 <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="cropLeft">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximum">
+ <number>100000</number>
+ </property>
+ </widget>
+ </item>
 <item row="0" column="3">
 <widget class="QSpinBox" name="cropRight">
 <property name="sizePolicy">
@@ -602,25 +621,6 @@
 </property>
 </widget>
 </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="cropLeft">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>70</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximum">
- <number>100000</number>
- </property>
- </widget>
- </item>
 <item row="0" column="4">
 <spacer name="horizontalSpacer">
 <property name="orientation">

obs-studio-0.16.2.tar.xz/UI/frontend-plugins/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/UI/frontend-plugins/CMakeLists.txt Changed

obs-studio-0.16.2.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt Changed

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

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

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

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

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

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

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

obs-studio-0.16.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/eu-ES.ini -> obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/eu-ES.ini Changed

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

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

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

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

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/it-IT.ini Added

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

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

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ms-MY.ini Added

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/nb-NO.ini Added

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

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

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

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-PT.ini Added

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

obs-studio-0.16.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sr-CS.ini -> obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/sr-CS.ini Changed

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

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

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

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/vi-VN.ini Added

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

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

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/forms/output-timer.ui Added

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OutputTimer</class>
+ <widget class="QDialog" name="OutputTimer">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>600</width>
+ <height>150</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>OutputTimer</string>
+ </property>
+ <layout class="QGridLayout" name="timerLayout">
+ <item row="0" column="1">
+ <widget class="QLabel" name="streamingLabel">
+ <property name="text">
+ <string>OutputTimer.Stream</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSpinBox" name="streamingTimerHours">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>24</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel" name="hoursLabel">
+ <property name="text">
+ <string>Hours</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="streamingTimerMinutes">
+ <property name="maximum">
+ <number>59</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5">
+ <widget class="QLabel" name="minutesLabel">
+ <property name="text">
+ <string>Minutes</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="6">
+ <widget class="QSpinBox" name="streamingTimerSeconds">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>59</number>
+ </property>
+ <property name="value">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="7">
+ <widget class="QLabel" name="secondsLabel">
+ <property name="text">
+ <string>Seconds</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="8">
+ <widget class="QPushButton" name="outputTimerStream">
+ <property name="text">
+ <string>Start</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="streamStoppingIn">
+ <property name="text">
+ <string>OutputTimer.Stream.StoppingIn</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QLabel" name="streamTime">
+ <property name="text">
+ <string>00:00:00</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="recordingLabel">
+ <property name="text">
+ <string>OutputTimer.Record</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QSpinBox" name="recordingTimerHours">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>24</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel" name="hoursLabel_2">
+ <property name="text">
+ <string>Hours</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4">
+ <widget class="QSpinBox" name="recordingTimerMinutes">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>59</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="5">
+ <widget class="QLabel" name="minutesLabel_2">
+ <property name="text">
+ <string>Minutes</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="6">
+ <widget class="QSpinBox" name="recordingTimerSeconds">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>59</number>
+ </property>
+ <property name="value">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="7">
+ <widget class="QLabel" name="secondsLabel_2">
+ <property name="text">
+ <string>Seconds</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="8">
+ <widget class="QPushButton" name="outputTimerRecord">
+ <property name="text">
+ <string>Start</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="recordStoppingIn">
+ <property name="text">
+ <string>OutputTimer.Record.StoppingIn</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QLabel" name="recordTime">
+ <property name="text">
+ <string>00:00:00</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources />
+ <connections />
+</ui>

obs-studio-0.16.2.tar.xz/UI/frontend-plugins/frontend-tools/frontend-tools.c -> obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/frontend-tools.c Changed

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp Added

@@ -0,0 +1,302 @@
+#include <obs-frontend-api.h>
+#include <obs-module.h>
+#include <obs.hpp>
+#include <util/util.hpp>
+#include <QAction>
+#include <QMainWindow>
+#include <QTimer>
+#include <QObject>
+#include "output-timer.hpp"
+
+using namespace std;
+
+OutputTimer *ot;
+
+OutputTimer::OutputTimer(QWidget *parent)
+	: QDialog(parent),
+	ui(new Ui_OutputTimer)
+{
+	ui->setupUi(this);
+
+	QObject::connect(ui->outputTimerStream, SIGNAL(clicked()), this,
+		SLOT(StreamingTimerButton()));
+	QObject::connect(ui->outputTimerRecord, SIGNAL(clicked()), this,
+		SLOT(RecordingTimerButton()));
+
+	streamingTimer = new QTimer(this);
+	streamingTimerDisplay = new QTimer(this);
+
+	recordingTimer = new QTimer(this);
+	recordingTimerDisplay = new QTimer(this);
+}
+
+void OutputTimer::closeEvent(QCloseEvent*)
+{
+	obs_frontend_save();
+}
+
+void OutputTimer::StreamingTimerButton()
+{
+	if (!obs_frontend_streaming_active()) {
+		obs_frontend_streaming_start();
+	} else if (streamingAlreadyActive) {
+		StreamTimerStart();
+		streamingAlreadyActive = false;
+	} else if (obs_frontend_streaming_active()) {
+		obs_frontend_streaming_stop();
+	}
+}
+
+void OutputTimer::RecordingTimerButton()
+{
+	if (!obs_frontend_recording_active()) {
+		obs_frontend_recording_start();
+	} else if (recordingAlreadyActive) {
+		RecordTimerStart();
+		recordingAlreadyActive = false;
+	} else if (obs_frontend_recording_active()) {
+		obs_frontend_recording_stop();
+	}
+}
+
+void OutputTimer::StreamTimerStart()
+{
+	if (!isVisible()) {
+		streamingAlreadyActive = true;
+		return;
+	}
+
+	int hours = ui->streamingTimerHours->value();
+	int minutes = ui->streamingTimerMinutes->value();
+	int seconds = ui->streamingTimerSeconds->value();
+
+	int total = (((hours * 3600) +
+		(minutes * 60)) +
+		seconds) * 1000;
+
+	if (total == 0)
+		total = 1000;
+
+	streamingTimer->setInterval(total);
+	streamingTimer->setSingleShot(true);
+
+	QObject::connect(streamingTimer, SIGNAL(timeout()),
+		SLOT(EventStopStreaming()));
+
+	QObject::connect(streamingTimerDisplay, SIGNAL(timeout()), this,
+		SLOT(UpdateStreamTimerDisplay()));
+
+	streamingTimer->start();
+	streamingTimerDisplay->start(1000);
+	ui->outputTimerStream->setText(tr("Stop"));
+
+	UpdateStreamTimerDisplay();
+}
+
+void OutputTimer::RecordTimerStart()
+{
+	if (!isVisible()) {
+		recordingAlreadyActive = true;
+		return;
+	}
+
+	int hours = ui->recordingTimerHours->value();
+	int minutes = ui->recordingTimerMinutes->value();
+	int seconds = ui->recordingTimerSeconds->value();
+
+	int total = (((hours * 3600) +
+			(minutes * 60)) +
+			seconds) * 1000;
+
+	if (total == 0)
+		total = 1000;
+
+	recordingTimer->setInterval(total);
+	recordingTimer->setSingleShot(true);
+
+	QObject::connect(recordingTimer, SIGNAL(timeout()),
+		SLOT(EventStopRecording()));
+
+	QObject::connect(recordingTimerDisplay, SIGNAL(timeout()), this,
+		SLOT(UpdateRecordTimerDisplay()));
+
+	recordingTimer->start();
+	recordingTimerDisplay->start(1000);
+	ui->outputTimerRecord->setText(tr("Stop"));
+
+	UpdateRecordTimerDisplay();
+}
+
+void OutputTimer::StreamTimerStop()
+{
+	streamingAlreadyActive = false;
+
+	if (!isVisible() && streamingTimer->isActive() == false)
+		return;
+
+	if (streamingTimer->isActive())
+		streamingTimer->stop();
+
+	ui->outputTimerStream->setText(tr("Start"));
+
+	if (streamingTimerDisplay->isActive())
+		streamingTimerDisplay->stop();
+
+	ui->streamTime->setText("00:00:00");
+}
+
+void OutputTimer::RecordTimerStop()
+{
+	recordingAlreadyActive = false;
+
+	if (!isVisible() && recordingTimer->isActive() == false)
+		return;
+
+	if (recordingTimer->isActive())
+		recordingTimer->stop();
+
+	ui->outputTimerRecord->setText(tr("Start"));
+
+	if (recordingTimerDisplay->isActive())
+		recordingTimerDisplay->stop();
+
+	ui->recordTime->setText("00:00:00");
+}
+
+void OutputTimer::UpdateStreamTimerDisplay()
+{
+	int remainingTime = streamingTimer->remainingTime() / 1000;
+
+	int seconds = remainingTime % 60;
+	int minutes = (remainingTime % 3600) / 60;
+	int hours = remainingTime / 3600;
+
+	QString text;
+	text.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
+	ui->streamTime->setText(text);
+}
+
+void OutputTimer::UpdateRecordTimerDisplay()
+{
+	int remainingTime = recordingTimer->remainingTime() / 1000;
+
+	int seconds = remainingTime % 60;
+	int minutes = (remainingTime % 3600) / 60;
+	int hours = remainingTime / 3600;
+
+	QString text;
+	text.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
+	ui->recordTime->setText(text);
+}
+
+void OutputTimer::ShowHideDialog()
+{
+	if (!isVisible()) {
+		setVisible(true);
+		QTimer::singleShot(250, this, SLOT(show()));
+	} else {
+		setVisible(false);
+		QTimer::singleShot(250, this, SLOT(hide()));
+	}
+}
+
+void OutputTimer::EventStopStreaming()
+{
+	obs_frontend_streaming_stop();
+}
+
+void OutputTimer::EventStopRecording()
+{
+	obs_frontend_recording_stop();
+}
+
+static void SaveOutputTimer(obs_data_t *save_data, bool saving, void *)
+{
+	if (saving) {
+		obs_data_t *obj = obs_data_create();
+
+		obs_data_set_int(obj, "streamTimerHours",
+				ot->ui->streamingTimerHours->value());
+		obs_data_set_int(obj, "streamTimerMinutes",
+				ot->ui->streamingTimerMinutes->value());
+		obs_data_set_int(obj, "streamTimerSeconds",
+				ot->ui->streamingTimerSeconds->value());
+
+		obs_data_set_int(obj, "recordTimerHours",
+				ot->ui->recordingTimerHours->value());
+		obs_data_set_int(obj, "recordTimerMinutes",
+				ot->ui->recordingTimerMinutes->value());
+		obs_data_set_int(obj, "recordTimerSeconds",
+				ot->ui->recordingTimerSeconds->value());
+
+		obs_data_set_obj(save_data, "output-timer", obj);
+
+		obs_data_release(obj);
+	} else {
+		obs_data_t *obj = obs_data_get_obj(save_data,
+				"output-timer");
+
+		if (!obj)
+			obj = obs_data_create();
+
+		ot->ui->streamingTimerHours->setValue(
+				obs_data_get_int(obj, "streamTimerHours"));
+		ot->ui->streamingTimerMinutes->setValue(
+				obs_data_get_int(obj, "streamTimerMinutes"));
+		ot->ui->streamingTimerSeconds->setValue(
+				obs_data_get_int(obj, "streamTimerSeconds"));
+
+		ot->ui->recordingTimerHours->setValue(
+				obs_data_get_int(obj, "recordTimerHours"));
+		ot->ui->recordingTimerMinutes->setValue(
+				obs_data_get_int(obj, "recordTimerMinutes"));
+		ot->ui->recordingTimerSeconds->setValue(
+				obs_data_get_int(obj, "recordTimerSeconds"));
+
+		obs_data_release(obj);
+	}
+}
+
+extern "C" void FreeOutputTimer()
+{
+}
+
+static void OBSEvent(enum obs_frontend_event event, void *)
+{
+	if (event == OBS_FRONTEND_EVENT_EXIT) {
+		obs_frontend_save();
+		FreeOutputTimer();
+	} else if (event == OBS_FRONTEND_EVENT_STREAMING_STARTED) {
+		ot->StreamTimerStart();
+	} else if (event == OBS_FRONTEND_EVENT_STREAMING_STOPPING) {
+		ot->StreamTimerStop();
+	} else if (event == OBS_FRONTEND_EVENT_RECORDING_STARTED) {
+		ot->RecordTimerStart();
+	} else if (event == OBS_FRONTEND_EVENT_RECORDING_STOPPING) {
+		ot->RecordTimerStop();
+	}
+}
+
+extern "C" void InitOutputTimer()
+{
+	QAction *action = (QAction*)obs_frontend_add_tools_menu_qaction(
+			obs_module_text("OutputTimer"));
+
+	obs_frontend_push_ui_translation(obs_module_get_string);
+
+	QMainWindow *window = (QMainWindow*)obs_frontend_get_main_window();
+
+	ot = new OutputTimer(window);
+
+	auto cb = [] ()
+	{
+		ot->ShowHideDialog();
+	};
+
+	obs_frontend_pop_ui_translation();
+
+	obs_frontend_add_save_callback(SaveOutputTimer, nullptr);
+	obs_frontend_add_event_callback(OBSEvent, nullptr);
+
+	action->connect(action, &QAction::triggered, cb);
+}

obs-studio-0.16.4.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.hpp Added

obs-studio-0.16.2.tar.xz/UI/obs-app.cpp -> obs-studio-0.16.4.tar.xz/UI/obs-app.cpp Changed

@@ -29,7 +29,9 @@
 #include <obs-config.h>
 #include <obs.hpp>
 
+#include <QGuiApplication>
 #include <QProxyStyle>
+#include <QScreen>
 
 #include "qt-wrappers.hpp"
 #include "obs-app.hpp"
@@ -448,7 +450,7 @@
 	if (GetConfigPath(path, sizeof(path), "obs-studio/basic/profiles") <= 0)
 		return outputPath;
 
-	strcat(path, "/*.*");
+	strcat(path, "/*");
 
 	if (os_glob(path, 0, &glob) != 0)
 		return outputPath;
@@ -855,6 +857,9 @@
 		if (!StartupOBS(locale.c_str(), GetProfilerNameStore()))
 			return false;
 
+		blog(LOG_INFO, "Portable mode: %s",
+				portable_mode ? "true" : "false");
+
 		mainWindow = new OBSBasic();
 
 		mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -906,6 +911,11 @@
 	return ver.str();
 }
 
+bool OBSApp::IsPortableMode()
+{
+	return portable_mode;
+}
+
 #ifdef __APPLE__
 #define INPUT_AUDIO_SOURCE "coreaudio_input_capture"
 #define OUTPUT_AUDIO_SOURCE "coreaudio_output_capture"
@@ -1520,20 +1530,10 @@
 
 bool WindowPositionValid(QRect rect)
 {
-	vector<MonitorInfo> monitors;
-	GetMonitors(monitors);
-
-	for (auto &monitor : monitors) {
-		int left = int(monitor.x);
-		int top = int(monitor.y);
-		int right = left + int(monitor.cx);
-		int bottom = top + int(monitor.cy);
-
-		if ((rect.left() - right) < 0 && (left - rect.right()) < 0 &&
-		 (rect.top() - bottom) < 0 && (top - rect.bottom()) < 0)
+	for (QScreen* screen: QGuiApplication::screens()) {
+		if (screen->availableGeometry().intersects(rect))
 			return true;
 	}
-
 	return false;
 }

obs-studio-0.16.2.tar.xz/UI/obs-app.hpp -> obs-studio-0.16.4.tar.xz/UI/obs-app.hpp Changed

obs-studio-0.16.2.tar.xz/UI/obs-frontend-api/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/UI/obs-frontend-api/CMakeLists.txt Changed

obs-studio-0.16.2.tar.xz/UI/platform-osx.mm -> obs-studio-0.16.4.tar.xz/UI/platform-osx.mm Changed

obs-studio-0.16.2.tar.xz/UI/platform-windows.cpp -> obs-studio-0.16.4.tar.xz/UI/platform-windows.cpp Changed

obs-studio-0.16.2.tar.xz/UI/platform-x11.cpp -> obs-studio-0.16.4.tar.xz/UI/platform-x11.cpp Changed

@@ -16,16 +16,12 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-/* Here we use xinerama to fetch data about monitor geometry
- * Even if there are not multiple monitors, this should still work.
- */
-
 #include <obs-config.h>
 #include "obs-app.hpp"
 
-#include <xcb/xcb.h>
-#include <xcb/xinerama.h> 
-#include <xcb/randr.h> 
+#include <QGuiApplication>
+#include <QScreen>
+
 #include <unistd.h>
 #include <sstream>
 #include <locale.h>
@@ -63,59 +59,6 @@
 	return false;
 }
 
-void GetMonitors(vector<MonitorInfo> &monitors)
-{
-	xcb_connection_t* xcb_conn;
-
-	monitors.clear();
-	xcb_conn = xcb_connect(NULL, NULL);
-
-	bool use_xinerama = false;
-	if (xcb_get_extension_data(xcb_conn, &xcb_xinerama_id)->present) {
-		xcb_xinerama_is_active_cookie_t xinerama_cookie;
-		xcb_xinerama_is_active_reply_t* xinerama_reply = NULL;
-
-		xinerama_cookie = xcb_xinerama_is_active(xcb_conn);
-		xinerama_reply = xcb_xinerama_is_active_reply(xcb_conn,
-						 xinerama_cookie, NULL);
-
-		if (xinerama_reply && xinerama_reply->state != 0)
-			use_xinerama = true;
-		free(xinerama_reply);
-	}
-
-	if (use_xinerama) {
-		xcb_xinerama_query_screens_cookie_t screens_cookie;
-		xcb_xinerama_query_screens_reply_t* screens_reply = NULL;
-		xcb_xinerama_screen_info_iterator_t iter;
-
-		screens_cookie = xcb_xinerama_query_screens(xcb_conn);
-		screens_reply = xcb_xinerama_query_screens_reply(xcb_conn,
-							screens_cookie, NULL);
-		iter = xcb_xinerama_query_screens_screen_info_iterator(
-								screens_reply);
-
-		for(; iter.rem; xcb_xinerama_screen_info_next(&iter)) {
-			monitors.emplace_back(iter.data->x_org,
-					 iter.data->y_org,
-					 iter.data->width,
-					 iter.data->height);
-		}
-		free(screens_reply);
-	} else {
-		// no xinerama so fall back to basic x11 calls
-		xcb_screen_iterator_t iter;
-
-		iter = xcb_setup_roots_iterator(xcb_get_setup(xcb_conn));
-		for(; iter.rem; xcb_screen_next(&iter)) {
-			monitors.emplace_back(0,0,iter.data->width_in_pixels,
-					 iter.data->height_in_pixels);
-		}
-	}
-
-	xcb_disconnect(xcb_conn);
-}
-
 bool InitApplicationBundle()
 {
 	return true;

obs-studio-0.16.2.tar.xz/UI/platform.hpp -> obs-studio-0.16.4.tar.xz/UI/platform.hpp Changed

obs-studio-0.16.2.tar.xz/UI/window-basic-main-dropfiles.cpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-main-dropfiles.cpp Changed

@@ -11,6 +11,10 @@
 
 using namespace std;
 
+static const char *textExtensions[] = {
+	"txt", "log", nullptr
+};
+
 static const char *imageExtensions[] = {
 	"bmp", "tga", "png", "jpg", "jpeg", "gif", nullptr
 };
@@ -52,19 +56,31 @@
 	}
 }
 
-void OBSBasic::AddDropSource(const char *file, bool image)
+void OBSBasic::AddDropSource(const char *data, DropType image)
 {
 	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
 	obs_data_t *settings = obs_data_create();
 	obs_source_t *source = nullptr;
 	const char *type = nullptr;
 
-	if (image) {
-		obs_data_set_string(settings, "file", file);
+	switch (image) {
+	case DropType_RawText:
+		obs_data_set_string(settings, "text", data);
+		type = "text_gdiplus";
+		break;
+	case DropType_Text:
+		obs_data_set_bool(settings, "read_from_file", true);
+		obs_data_set_string(settings, "file", data);
+		type = "text_gdiplus";
+		break;
+	case DropType_Image:
+		obs_data_set_string(settings, "file", data);
 		type = "image_source";
-	} else {
-		obs_data_set_string(settings, "local_file", file);
+		break;
+	case DropType_Media:
+		obs_data_set_string(settings, "local_file", data);
 		type = "ffmpeg_source";
+		break;
 	}
 
 	const char *name = obs_source_get_display_name(type);
@@ -113,10 +129,28 @@
 			const char *suffix = suffixArray.constData();
 			bool found = false;
 
-			const char **cmp = imageExtensions;
+			const char **cmp;
+
+			cmp = textExtensions;
+			while (*cmp) {
+				if (strcmp(*cmp, suffix) == 0) {
+					AddDropSource(QT_TO_UTF8(file),
+							DropType_Text);
+					found = true;
+					break;
+				}
+
+				cmp++;
+			}
+
+			if (found)
+				continue;
+
+			cmp = imageExtensions;
 			while (*cmp) {
 				if (strcmp(*cmp, suffix) == 0) {
-					AddDropSource(QT_TO_UTF8(file), true);
+					AddDropSource(QT_TO_UTF8(file),
+							DropType_Image);
 					found = true;
 					break;
 				}
@@ -130,13 +164,16 @@
 			cmp = mediaExtensions;
 			while (*cmp) {
 				if (strcmp(*cmp, suffix) == 0) {
-					AddDropSource(QT_TO_UTF8(file), false);
+					AddDropSource(QT_TO_UTF8(file),
+							DropType_Media);
 					break;
 				}
 
 				cmp++;
 			}
 		}
+	} else if (mimeData->hasText()) {
+		AddDropSource(QT_TO_UTF8(mimeData->text()), DropType_RawText);
 	}
 }

obs-studio-0.16.2.tar.xz/UI/window-basic-main-outputs.cpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-main-outputs.cpp Changed

@@ -501,42 +501,49 @@
 void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings,
 		int bitrate)
 {
-	int bits = bitrate * 1000;
+	// Static Properties
 	obs_data_set_int(settings, "AMF.H264.Usage", 0);
-	obs_data_set_int(settings, "AMF.H264.QualityPreset", 2);
-	obs_data_set_int(settings, "AMF.H264.ProfileLevel", 51);
+	obs_data_set_int(settings, "AMF.H264.Profile", 100); // High
+	obs_data_set_string(settings, "profile", "high"); // High
+	obs_data_set_int(settings, "AMF.H264.ProfileLevel", 0); // Automatic
+	
+	// Rate Control Properties
+	obs_data_set_int(settings, "AMF.H264.RateControlMethod", 1);
+	obs_data_set_string(settings, "rate_control", "CBR");
+	obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bitrate);
+	obs_data_set_int(settings, "bitrate", bitrate);
 	obs_data_set_int(settings, "AMF.H264.FillerData", 1);
-	obs_data_set_int(settings, "AMF.H264.FrameSkipping", -1);
-	obs_data_set_int(settings, "AMF.H264.BPicture.Pattern", 2);
-	obs_data_set_int(settings, "AMF.H264.BPicture.Reference", 1);
-	obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bits);
-	obs_data_set_int(settings, "AMF.H264.Bitrate.Peak", bits);
-	obs_data_set_int(settings, "AMF.H264Advanced.VBVBuffer.Size", bits);
-	obs_data_set_string(settings, "profile", "high");
+	obs_data_set_int(settings, "AMF.H264.VBVBuffer", 0); // Automatic VBV Buffer
+	obs_data_set_double(settings, "AMF.H264.VBVBuffer.Strictness", 0.9);
+	
+	// Picture Control Properties
+	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
+	obs_data_set_int(settings, "keyint_sec", 2);
 }
 
 void SimpleOutput::UpdateRecordingSettings_amd_cqp(int cqp)
 {
 	obs_data_t *settings = obs_data_create();
 
+	// Static Properties
 	obs_data_set_int(settings, "AMF.H264.Usage", 0);
-	obs_data_set_int(settings, "AMF.H264.QualityPreset", 2);
-	obs_data_set_int(settings, "AMF.H264.ProfileLevel", 51);
-	obs_data_set_int(settings, "AMF.H264.FillerData", 0);
-	obs_data_set_int(settings, "AMF.H264.FrameSkipping", 0);
-	obs_data_set_int(settings, "AMF.H264.QP.Minimum", 0);
-	obs_data_set_int(settings, "AMF.H264.QP.Maximum", 51);
+	obs_data_set_int(settings, "AMF.H264.Profile", 100); // High
+	obs_data_set_string(settings, "profile", "high"); // High
+	obs_data_set_int(settings, "AMF.H264.ProfileLevel", 0); // Automatic
+
+															// Rate Control Properties
+	obs_data_set_int(settings, "AMF.H264.RateControlMethod", 0);
+	obs_data_set_string(settings, "rate_control", "CQP");
 	obs_data_set_int(settings, "AMF.H264.QP.IFrame", cqp);
 	obs_data_set_int(settings, "AMF.H264.QP.PFrame", cqp);
 	obs_data_set_int(settings, "AMF.H264.QP.BFrame", cqp);
-	obs_data_set_int(settings, "AMF.H264.BPicture.Pattern", 3);
-	obs_data_set_int(settings, "AMF.H264.BPicture.Reference", 1);
-	obs_data_set_int(settings, "keyint_sec", 1);
-	obs_data_set_string(settings, "rate_control", "CQP");
-	obs_data_set_string(settings, "profile", "high");
 
-	obs_encoder_update(h264Recording, settings);
+	// Picture Control Properties
+	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
+	obs_data_set_int(settings, "keyint_sec", 2);
 
+	// Update and release
+	obs_encoder_update(h264Recording, settings);
 	obs_data_release(settings);
 }

obs-studio-0.16.2.tar.xz/UI/window-basic-main.cpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-main.cpp Changed

@@ -19,11 +19,14 @@
 
 #include <time.h>
 #include <obs.hpp>
+#include <QGuiApplication>
 #include <QMessageBox>
 #include <QShowEvent>
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QDesktopWidget>
+#include <QRect>
+#include <QScreen>
 
 #include <util/dstr.h>
 #include <util/util.hpp>
@@ -138,7 +141,7 @@
 
 		QRect windowGeometry = normalGeometry();
 		if (!WindowPositionValid(windowGeometry)) {
-			QRect rect = App()->desktop()->availableGeometry();
+			QRect rect = App()->desktop()->geometry();
 			setGeometry(QStyle::alignedRect(
 						Qt::LeftToRight,
 						Qt::AlignCenter,
@@ -780,17 +783,18 @@
 
 bool OBSBasic::InitBasicConfigDefaults()
 {
-	vector<MonitorInfo> monitors;
-	GetMonitors(monitors);
+	QList<QScreen*> screens = QGuiApplication::screens();
 
-	if (!monitors.size()) {
+	if (!screens.size()) {
 		OBSErrorBox(NULL, "There appears to be no monitors. Er, this "
 		 "technically shouldn't be possible.");
 		return false;
 	}
 
-	uint32_t cx = monitors[0].cx;
-	uint32_t cy = monitors[0].cy;
+	QScreen *primaryScreen = QGuiApplication::primaryScreen();
+
+	uint32_t cx = primaryScreen->size().width();
+	uint32_t cy = primaryScreen->size().height();
 
 	/* ----------------------------------------------------- */
 	/* move over mixer values in advanced if older config */
@@ -2768,19 +2772,16 @@
 		const char *slot)
 {
 	QAction *action;
-	std::vector<MonitorInfo> monitors;
-	GetMonitors(monitors);
-
-	for (int i = 0; (size_t)i < monitors.size(); i++) {
-		const MonitorInfo &monitor = monitors[i];
-
+	QList<QScreen*> screens = QGuiApplication::screens();
+	for (int i = 0; i < screens.size(); i++) {
+		QRect screenGeometry = screens[i]->geometry();
 		QString str = QString("%1 %2: %3x%4 @ %5,%6").
 			arg(QTStr("Display"),
 			 QString::number(i),
-			 QString::number((int)monitor.cx),
-			 QString::number((int)monitor.cy),
-			 QString::number((int)monitor.x),
-			 QString::number((int)monitor.y));
+			 QString::number((int)screenGeometry.width()),
+			 QString::number((int)screenGeometry.height()),
+			 QString::number((int)screenGeometry.x()),
+			 QString::number((int)screenGeometry.y()));
 
 		action = parent->addAction(str, target, slot);
 		action->setProperty("monitor", i);
@@ -3184,9 +3185,11 @@
 {
 	const char *type;
 	bool foundValues = false;
+	bool foundDeprecated = false;
 	size_t idx = 0;
 
 	QMenu *popup = new QMenu(QTStr("Add"), this);
+	QMenu *deprecated = new QMenu(QTStr("Deprecated"), popup);
 
 	auto getActionAfter = [] (QMenu *menu, const QString &name)
 	{
@@ -3219,15 +3222,26 @@
 
 		if ((caps & OBS_SOURCE_DEPRECATED) == 0) {
 			addSource(popup, type, name);
-			foundValues = true;
+		} else {
+			addSource(deprecated, type, name);
+			foundDeprecated = true;
 		}
+		foundValues = true;
 	}
 
 	addSource(popup, "scene", Str("Basic.Scene"));
 
+	if (!foundDeprecated) {
+		delete deprecated;
+		deprecated = nullptr;
+	}
+
 	if (!foundValues) {
 		delete popup;
 		popup = nullptr;
+
+	} else if (foundDeprecated) {
+		popup->addMenu(deprecated);
 	}
 
 	return popup;
@@ -3601,14 +3615,20 @@
 
 	ui->streamButton->setEnabled(false);
 	ui->streamButton->setText(QTStr("Basic.Main.Connecting"));
-	sysTrayStream->setEnabled(false);
-	sysTrayStream->setText(ui->streamButton->text());
+
+	if (sysTrayStream) {
+		sysTrayStream->setEnabled(false);
+		sysTrayStream->setText(ui->streamButton->text());
+	}
 
 	if (!outputHandler->StartStreaming(service)) {
 		ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
 		ui->streamButton->setEnabled(true);
-		sysTrayStream->setText(ui->streamButton->text());
-		sysTrayStream->setEnabled(true);
+
+		if (sysTrayStream) {
+			sysTrayStream->setText(ui->streamButton->text());
+			sysTrayStream->setEnabled(true);
+		}
 	}
 
 	bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
@@ -3645,7 +3665,8 @@
 		App()->IncrementSleepInhibition();
 		UpdateProcessPriority();
 
-		trayIcon->setIcon(QIcon(":/res/images/tray_active.png"));
+		if (trayIcon)
+			trayIcon->setIcon(QIcon(":/res/images/tray_active.png"));
 	}
 }
 
@@ -3656,7 +3677,8 @@
 		App()->DecrementSleepInhibition();
 		ClearProcessPriority();
 
-		trayIcon->setIcon(QIcon(":/res/images/obs.png"));
+		if (trayIcon)
+			trayIcon->setIcon(QIcon(":/res/images/obs.png"));
 	}
 }
 
@@ -3698,8 +3720,11 @@
 {
 	ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
 	ui->streamButton->setEnabled(true);
-	sysTrayStream->setText(ui->streamButton->text());
-	sysTrayStream->setEnabled(true);
+
+	if (sysTrayStream) {
+		sysTrayStream->setText(ui->streamButton->text());
+		sysTrayStream->setEnabled(true);
+	}
 
 	if (!startStreamMenu.isNull())
 		startStreamMenu->deleteLater();
@@ -3720,8 +3745,11 @@
 {
 	ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
 	ui->streamButton->setEnabled(true);
-	sysTrayStream->setText(ui->streamButton->text());
-	sysTrayStream->setEnabled(true);
+
+	if (sysTrayStream) {
+		sysTrayStream->setText(ui->streamButton->text());
+		sysTrayStream->setEnabled(true);
+	}
 
 	if (!startStreamMenu.isNull())
 		startStreamMenu->deleteLater();
@@ -3741,8 +3769,11 @@
 	ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
 	ui->streamButton->setEnabled(true);
 	ui->statusbar->StreamStarted(outputHandler->streamOutput);
-	sysTrayStream->setText(ui->streamButton->text());
-	sysTrayStream->setEnabled(true);
+
+	if (sysTrayStream) {
+		sysTrayStream->setText(ui->streamButton->text());
+		sysTrayStream->setEnabled(true);
+	}
 
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTED);
@@ -3755,7 +3786,9 @@
 void OBSBasic::StreamStopping()
 {
 	ui->streamButton->setText(QTStr("Basic.Main.StoppingStreaming"));
-	sysTrayStream->setText(ui->streamButton->text());
+
+	if (sysTrayStream)
+		sysTrayStream->setText(ui->streamButton->text());
 
 	streamingStopping = true;
 	if (api)
@@ -3794,8 +3827,11 @@
 
 	ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
 	ui->streamButton->setEnabled(true);
-	sysTrayStream->setText(ui->streamButton->text());
-	sysTrayStream->setEnabled(true);
+
+	if (sysTrayStream) {
+		sysTrayStream->setText(ui->streamButton->text());
+		sysTrayStream->setEnabled(true);
+	}
 
 	streamingStopping = false;
 	if (api)
@@ -3835,7 +3871,9 @@
 void OBSBasic::RecordStopping()
 {
 	ui->recordButton->setText(QTStr("Basic.Main.StoppingRecording"));
-	sysTrayRecord->setText(ui->recordButton->text());
+
+	if (sysTrayRecord)
+		sysTrayRecord->setText(ui->recordButton->text());
 
 	recordingStopping = true;
 	if (api)
@@ -3856,7 +3894,9 @@
 {
 	ui->statusbar->RecordingStarted(outputHandler->fileOutput);
 	ui->recordButton->setText(QTStr("Basic.Main.StopRecording"));
-	sysTrayRecord->setText(ui->recordButton->text());
+
+	if (sysTrayRecord)
+		sysTrayRecord->setText(ui->recordButton->text());
 
 	recordingStopping = false;
 	if (api)
@@ -3871,7 +3911,9 @@
 {
 	ui->statusbar->RecordingStopped();
 	ui->recordButton->setText(QTStr("Basic.Main.StartRecording"));
-	sysTrayRecord->setText(ui->recordButton->text());
+
+	if (sysTrayRecord)
+		sysTrayRecord->setText(ui->recordButton->text());
 	blog(LOG_INFO, RECORDING_STOP);
 
 	if (code == OBS_OUTPUT_UNSUPPORTED && isVisible()) {
@@ -4458,6 +4500,9 @@
 		name << "Studio ";
 
 	name << App()->GetVersionString();
+	if (App()->IsPortableMode())
+		name << " - Portable Mode";
+
 	name << " - " << Str("TitleBar.Profile") << ": " << profile;
 	name << " - " << Str("TitleBar.Scenes") << ": " << sceneCollection;
 
@@ -4527,7 +4572,8 @@
 			"BasicWindow", "geometry",
 			saveGeometry().toBase64().constData());
 
-		showHide->setText(QTStr("Basic.SystemTray.Show"));
+		if (showHide)
+			showHide->setText(QTStr("Basic.SystemTray.Show"));
 		QTimer::singleShot(250, this, SLOT(hide()));
 
 		if (previewEnabled)
@@ -4536,7 +4582,8 @@
 		setVisible(false);
 
 	} else if (showing && !isVisible()) {
-		showHide->setText(QTStr("Basic.SystemTray.Hide"));
+		if (showHide)
+			showHide->setText(QTStr("Basic.SystemTray.Hide"));
 		QTimer::singleShot(250, this, SLOT(show()));
 
 		if (previewEnabled)
@@ -4546,7 +4593,8 @@
 	}
 }
 
-void OBSBasic::SystemTrayInit() {
+void OBSBasic::SystemTrayInit()
+{
 	trayIcon = new QSystemTrayIcon(QIcon(":/res/images/obs.png"),
 			this);
 	trayIcon->setToolTip("OBS Studio");

obs-studio-0.16.2.tar.xz/UI/window-basic-main.hpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-main.hpp Changed

@@ -95,6 +95,13 @@
 		Right
 	};
 
+	enum DropType {
+		DropType_RawText,
+		DropType_Text,
+		DropType_Image,
+		DropType_Media
+	};
+
 private:
 	obs_frontend_callbacks *api = nullptr;
 
@@ -144,13 +151,12 @@
 
 	QPointer<QMenu> startStreamMenu;
 
-	QSystemTrayIcon *trayIcon;
-	QMenu *trayMenu;
-	QAction *sysTrayStream;
-	QAction *sysTrayRecord;
-	QAction *showHide;
-	QAction *showPreview;
-	QAction *exit;
+	QPointer<QSystemTrayIcon> trayIcon;
+	QPointer<QAction> sysTrayStream;
+	QPointer<QAction> sysTrayRecord;
+	QPointer<QAction> showHide;
+	QPointer<QAction> exit;
+	QPointer<QMenu> trayMenu;
 	bool disableHiding = false;
 
 	void DrawBackdrop(float cx, float cy);
@@ -299,7 +305,7 @@
 	inline void OnActivate();
 	inline void OnDeactivate();
 
-	void AddDropSource(const char *file, bool image);
+	void AddDropSource(const char *file, DropType image);
 	void dragEnterEvent(QDragEnterEvent *event) override;
 	void dragLeaveEvent(QDragLeaveEvent *event) override;
 	void dragMoveEvent(QDragMoveEvent *event) override;

obs-studio-0.16.2.tar.xz/UI/window-basic-properties.cpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-properties.cpp Changed

@@ -70,21 +70,27 @@
 	view = new OBSPropertiesView(settings, source,
 			(PropertiesReloadCallback)obs_source_properties,
 			(PropertiesUpdateCallback)obs_source_update);
+	view->setMinimumHeight(150);
 
-	preview->setMinimumSize(20, 20);
+	preview->setMinimumSize(20, 150);
 	preview->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
 				QSizePolicy::Expanding));
 
+	// Create a QSplitter to keep a unified workflow here.
+	windowSplitter = new QSplitter(Qt::Orientation::Vertical, this);
+	windowSplitter->addWidget(preview);
+	windowSplitter->addWidget(view);
+	windowSplitter->setChildrenCollapsible(false);
+	//windowSplitter->setSizes(QList<int>({ 16777216, 150 }));
+	windowSplitter->setStretchFactor(0, 3);
+	windowSplitter->setStretchFactor(1, 1);
+
 	setLayout(new QVBoxLayout(this));
-	layout()->addWidget(preview);
-	layout()->addWidget(view);
+	layout()->addWidget(windowSplitter);
 	layout()->addWidget(buttonBox);
 	layout()->setAlignment(buttonBox, Qt::AlignRight | Qt::AlignBottom);
-	layout()->setAlignment(view, Qt::AlignBottom);
-	view->setMaximumHeight(250);
-	view->setMinimumHeight(150);
-	view->show();
 
+	view->show();
 	installEventFilter(CreateShortcutFilter());
 
 	const char *name = obs_source_get_name(source);

obs-studio-0.16.2.tar.xz/UI/window-basic-properties.hpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-properties.hpp Changed

obs-studio-0.16.2.tar.xz/UI/window-basic-settings.cpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-settings.cpp Changed

@@ -23,6 +23,7 @@
 #include <initializer_list>
 #include <sstream>
 #include <QCompleter>
+#include <QGuiApplication>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QCloseEvent>
@@ -30,6 +31,7 @@
 #include <QDirIterator>
 #include <QVariant>
 #include <QTreeView>
+#include <QScreen>
 #include <QStandardItemModel>
 #include <QSpacerItem>
 
@@ -950,8 +952,6 @@
 #endif
 }
 
-Q_DECLARE_METATYPE(MonitorInfo);
-
 static string ResString(uint32_t cx, uint32_t cy)
 {
 	stringstream res;
@@ -1097,14 +1097,12 @@
 	uint32_t cy = config_get_uint(main->Config(), "Video", "BaseCY");
 	uint32_t out_cx = config_get_uint(main->Config(), "Video", "OutputCX");
 	uint32_t out_cy = config_get_uint(main->Config(), "Video", "OutputCY");
-	vector<MonitorInfo> monitors;
 
 	ui->baseResolution->clear();
 
-	GetMonitors(monitors);
-
-	for (MonitorInfo &monitor : monitors) {
-		string res = ResString(monitor.cx, monitor.cy);
+	for (QScreen* screen: QGuiApplication::screens()) {
+		QSize as = screen->size();
+		string res = ResString(as.width(), as.height());
 		ui->baseResolution->addItem(res.c_str());
 	}
 
@@ -3333,9 +3331,12 @@
 		preset = curNVENCPreset;
 
 	} else if (encoder == SIMPLE_ENCODER_AMD) {
-		/* none */
-		defaultPreset = "";
+		ui->simpleOutPreset->addItem("Speed", "speed");
+		ui->simpleOutPreset->addItem("Balanced", "balanced");
+		ui->simpleOutPreset->addItem("Quality", "quality");
 
+		defaultPreset = "balanced";
+		preset = curAMDPreset;
 	} else {
 		ui->simpleOutPreset->addItem("ultrafast", "ultrafast");
 		ui->simpleOutPreset->addItem("superfast", "superfast");

obs-studio-0.16.2.tar.xz/UI/window-basic-settings.hpp -> obs-studio-0.16.4.tar.xz/UI/window-basic-settings.hpp Changed

obs-studio-0.16.2.tar.xz/UI/window-projector.cpp -> obs-studio-0.16.4.tar.xz/UI/window-projector.cpp Changed

obs-studio-0.16.2.tar.xz/cmake/Modules/FindFFmpeg.cmake -> obs-studio-0.16.4.tar.xz/cmake/Modules/FindFFmpeg.cmake Changed

obs-studio-0.16.2.tar.xz/cmake/Modules/ObsCpack.cmake -> obs-studio-0.16.4.tar.xz/cmake/Modules/ObsCpack.cmake Changed

obs-studio-0.16.2.tar.xz/cmake/winrc/obs-studio.ico -> obs-studio-0.16.4.tar.xz/cmake/winrc/obs-studio.ico Changed

obs-studio-0.16.2.tar.xz/libobs-d3d11/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/libobs-d3d11/CMakeLists.txt Changed

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-duplicator.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-duplicator.cpp Changed

@@ -20,20 +20,9 @@
 static inline bool get_monitor(gs_device_t *device, int monitor_idx,
 		IDXGIOutput **dxgiOutput)
 {
-	ComPtr<IDXGIAdapter> dxgiAdapter;
-	ComPtr<IDXGIDevice> dxgiDevice;
 	HRESULT hr;
 
-	hr = device->device->QueryInterface(__uuidof(IDXGIDevice),
-			(void**)dxgiDevice.Assign());
-	if (FAILED(hr))
-		throw HRError("Failed to query IDXGIDevice", hr);
-
-	hr = dxgiDevice->GetAdapter(dxgiAdapter.Assign());
-	if (FAILED(hr))
-		throw HRError("Failed to get adapter", hr);
-
-	hr = dxgiAdapter->EnumOutputs(monitor_idx, dxgiOutput);
+	hr = device->adapter->EnumOutputs(monitor_idx, dxgiOutput);
 	if (FAILED(hr)) {
 		if (hr == DXGI_ERROR_NOT_FOUND)
 			return false;
@@ -44,14 +33,13 @@
 	return true;
 }
 
-gs_duplicator::gs_duplicator(gs_device_t *device_, int monitor_idx)
-	: texture(nullptr), device(device_)
+void gs_duplicator::Start()
 {
 	ComPtr<IDXGIOutput1> output1;
 	ComPtr<IDXGIOutput> output;
 	HRESULT hr;
 
-	if (!get_monitor(device, monitor_idx, output.Assign()))
+	if (!get_monitor(device, idx, output.Assign()))
 		throw "Invalid monitor index";
 
 	hr = output->QueryInterface(__uuidof(IDXGIOutput1),
@@ -64,6 +52,14 @@
 		throw HRError("Failed to duplicate output", hr);
 }
 
+gs_duplicator::gs_duplicator(gs_device_t *device_, int monitor_idx)
+	: gs_obj (device_, gs_type::gs_duplicator),
+	 texture (nullptr),
+	 idx (monitor_idx)
+{
+	Start();
+}
+
 gs_duplicator::~gs_duplicator()
 {
 	delete texture;

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-indexbuffer.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-indexbuffer.cpp Changed

obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-rebuild.cpp Added

@@ -0,0 +1,313 @@
+/******************************************************************************
+ Copyright (C) 2016 by Hugh Bailey <obs.jim@gmail.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#include "d3d11-subsystem.hpp"
+
+inline void gs_vertex_buffer::Rebuild()
+{
+	uvBuffers.clear();
+	uvSizes.clear();
+	BuildBuffers();
+}
+
+inline void gs_index_buffer::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = dev->CreateBuffer(&bd, &srd, &indexBuffer);
+	if (FAILED(hr))
+		throw HRError("Failed to create buffer", hr);
+}
+
+inline void gs_texture_2d::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr;
+	if (isShared) {
+		hr = dev->OpenSharedResource((HANDLE)(uintptr_t)sharedHandle,
+				__uuidof(ID3D11Texture2D), (void**)&texture);
+		if (FAILED(hr))
+			throw HRError("Failed to open shared 2D texture", hr);
+	} else {
+		hr = dev->CreateTexture2D(&td,
+				data.size() ? srd.data() : nullptr,
+				&texture);
+		if (FAILED(hr))
+			throw HRError("Failed to create 2D texture", hr);
+	}
+
+	hr = dev->CreateShaderResourceView(texture, &resourceDesc, &shaderRes);
+	if (FAILED(hr))
+		throw HRError("Failed to create resource view", hr);
+
+	if (isRenderTarget)
+		InitRenderTargets();
+}
+
+inline void gs_zstencil_buffer::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr;
+	hr = dev->CreateTexture2D(&td, nullptr, &texture);
+	if (FAILED(hr))
+		throw HRError("Failed to create depth stencil texture", hr);
+
+	hr = dev->CreateDepthStencilView(texture, &dsvd, &view);
+	if (FAILED(hr))
+		throw HRError("Failed to create depth stencil view", hr);
+}
+
+inline void gs_stage_surface::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = dev->CreateTexture2D(&td, nullptr, &texture);
+	if (FAILED(hr))
+		throw HRError("Failed to create staging surface", hr);
+}
+
+inline void gs_sampler_state::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = dev->CreateSamplerState(&sd, state.Assign());
+	if (FAILED(hr))
+		throw HRError("Failed to create sampler state", hr);
+}
+
+inline void gs_vertex_shader::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr;
+	hr = dev->CreateVertexShader(data.data(), data.size(), nullptr, &shader);
+	if (FAILED(hr))
+		throw HRError("Failed to create vertex shader", hr);
+
+	hr = dev->CreateInputLayout(layoutData.data(), (UINT)layoutData.size(),
+			data.data(), data.size(), &layout);
+	if (FAILED(hr))
+		throw HRError("Failed to create input layout", hr);
+
+	if (constantSize) {
+		hr = dev->CreateBuffer(&bd, NULL, &constants);
+		if (FAILED(hr))
+			throw HRError("Failed to create constant buffer", hr);
+	}
+
+	for (gs_shader_param &param : params) {
+		param.nextSampler = nullptr;
+		param.curValue.clear();
+		gs_shader_set_default(&param);
+	}
+}
+
+inline void gs_pixel_shader::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr;
+	
+	hr = dev->CreatePixelShader(data.data(), data.size(), nullptr,
+			&shader);
+	if (FAILED(hr))
+		throw HRError("Failed to create pixel shader", hr);
+
+	if (constantSize) {
+		hr = dev->CreateBuffer(&bd, NULL, &constants);
+		if (FAILED(hr))
+			throw HRError("Failed to create constant buffer", hr);
+	}
+
+	for (gs_shader_param &param : params) {
+		param.nextSampler = nullptr;
+		param.curValue.clear();
+		gs_shader_set_default(&param);
+	}
+}
+
+inline void gs_swap_chain::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = device->factory->CreateSwapChain(dev, &swapDesc, &swap);
+	if (FAILED(hr))
+		throw HRError("Failed to create swap chain", hr);
+	Init();
+}
+
+inline void SavedBlendState::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = dev->CreateBlendState(&bd, &state);
+	if (FAILED(hr))
+		throw HRError("Failed to create blend state", hr);
+}
+
+inline void SavedZStencilState::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = dev->CreateDepthStencilState(&dsd, &state);
+	if (FAILED(hr))
+		throw HRError("Failed to create depth stencil state", hr);
+}
+
+inline void SavedRasterState::Rebuild(ID3D11Device *dev)
+{
+	HRESULT hr = dev->CreateRasterizerState(&rd, &state);
+	if (FAILED(hr))
+		throw HRError("Failed to create rasterizer state", hr);
+}
+
+const static D3D_FEATURE_LEVEL featureLevels[] =
+{
+	D3D_FEATURE_LEVEL_11_0,
+	D3D_FEATURE_LEVEL_10_1,
+	D3D_FEATURE_LEVEL_10_0,
+	D3D_FEATURE_LEVEL_9_3,
+};
+
+void gs_device::RebuildDevice()
+try {
+	ID3D11Device *dev = nullptr;
+	HRESULT hr;
+
+	blog(LOG_WARNING, "Device Remove/Reset! Rebuilding all assets...");
+
+	/* ----------------------------------------------------------------- */
+
+	gs_obj *obj = first_obj;
+
+	while (obj) {
+		switch (obj->obj_type) {
+		case gs_type::gs_vertex_buffer:
+			((gs_vertex_buffer*)obj)->Release();
+			break;
+		case gs_type::gs_index_buffer:
+			((gs_index_buffer*)obj)->Release();
+			break;
+		case gs_type::gs_texture_2d:
+			((gs_texture_2d*)obj)->Release();
+			break;
+		case gs_type::gs_zstencil_buffer:
+			((gs_zstencil_buffer*)obj)->Release();
+			break;
+		case gs_type::gs_stage_surface:
+			((gs_stage_surface*)obj)->Release();
+			break;
+		case gs_type::gs_sampler_state:
+			((gs_sampler_state*)obj)->Release();
+			break;
+		case gs_type::gs_vertex_shader:
+			((gs_vertex_shader*)obj)->Release();
+			break;
+		case gs_type::gs_pixel_shader:
+			((gs_pixel_shader*)obj)->Release();
+			break;
+		case gs_type::gs_duplicator:
+			((gs_duplicator*)obj)->Release();
+			break;
+		case gs_type::gs_swap_chain:
+			((gs_swap_chain*)obj)->Release();
+			break;
+		}
+
+		obj = obj->next;
+	}
+
+	for (auto &state : zstencilStates)
+		state.Release();
+	for (auto &state : rasterStates)
+		state.Release();
+	for (auto &state : blendStates)
+		state.Release();
+
+	context->ClearState();
+
+	context.Release();
+	device.Release();
+	adapter.Release();
+	factory.Release();
+
+	/* ----------------------------------------------------------------- */
+
+	InitFactory(adpIdx);
+
+	uint32_t createFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
+	hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN,
+			nullptr, createFlags, featureLevels,
+			sizeof(featureLevels) / sizeof(D3D_FEATURE_LEVEL),
+			D3D11_SDK_VERSION, &device, nullptr, &context);
+	if (FAILED(hr))
+		throw HRError("Failed to create device", hr);
+
+	dev = device;
+
+	obj = first_obj;
+	while (obj) {
+		switch (obj->obj_type) {
+		case gs_type::gs_vertex_buffer:
+			((gs_vertex_buffer*)obj)->Rebuild();
+			break;
+		case gs_type::gs_index_buffer:
+			((gs_index_buffer*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_texture_2d:
+			((gs_texture_2d*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_zstencil_buffer:
+			((gs_zstencil_buffer*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_stage_surface:
+			((gs_stage_surface*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_sampler_state:
+			((gs_sampler_state*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_vertex_shader:
+			((gs_vertex_shader*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_pixel_shader:
+			((gs_pixel_shader*)obj)->Rebuild(dev);
+			break;
+		case gs_type::gs_duplicator:
+			((gs_duplicator*)obj)->Start();
+			break;
+		case gs_type::gs_swap_chain:
+			((gs_swap_chain*)obj)->Rebuild(dev);
+			break;
+		}
+
+		obj = obj->next;
+	}
+
+	curRenderTarget = nullptr;
+	curZStencilBuffer = nullptr;
+	curRenderSide = 0;
+	memset(&curTextures, 0, sizeof(curTextures));
+	memset(&curSamplers, 0, sizeof(curSamplers));
+	curVertexBuffer = nullptr;
+	curIndexBuffer = nullptr;
+	curVertexShader = nullptr;
+	curPixelShader = nullptr;
+	curSwapChain = nullptr;
+	zstencilStateChanged = true;
+	rasterStateChanged = true;
+	blendStateChanged = true;
+	curDepthStencilState = nullptr;
+	curRasterState = nullptr;
+	curBlendState = nullptr;
+	curToplogy = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
+
+	for (auto &state : zstencilStates)
+		state.Rebuild(dev);
+	for (auto &state : rasterStates)
+		state.Rebuild(dev);
+	for (auto &state : blendStates)
+		state.Rebuild(dev);
+
+} catch (const char *error) {
+	bcrash("Failed to recreate D3D11: %s", error);
+
+} catch (HRError error) {
+	bcrash("Failed to recreate D3D11: %s (%08lX)",
+			error.str, error.hr);
+}

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-samplerstate.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-samplerstate.cpp Changed

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-shader.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-shader.cpp Changed

@@ -40,13 +40,12 @@
 
 gs_vertex_shader::gs_vertex_shader(gs_device_t *device, const char *file,
 		const char *shaderString)
-	: gs_shader (device, GS_SHADER_VERTEX),
+	: gs_shader (device, gs_type::gs_vertex_shader, GS_SHADER_VERTEX),
 	 hasNormals (false),
 	 hasColors (false),
 	 hasTangents (false),
 	 nTexUnits (0)
 {
-	vector<D3D11_INPUT_ELEMENT_DESC> inputs;
 	ShaderProcessor processor(device);
 	ComPtr<ID3D10Blob> shaderBlob;
 	string outputString;
@@ -55,20 +54,23 @@
 	processor.Process(shaderString, file);
 	processor.BuildString(outputString);
 	processor.BuildParams(params);
-	processor.BuildInputLayout(inputs);
-	GetBuffersExpected(inputs);
+	processor.BuildInputLayout(layoutData);
+	GetBuffersExpected(layoutData);
 	BuildConstantBuffer();
 
 	Compile(outputString.c_str(), file, "vs_4_0", shaderBlob.Assign());
 
-	hr = device->device->CreateVertexShader(shaderBlob->GetBufferPointer(),
-			shaderBlob->GetBufferSize(), NULL, shader.Assign());
+	data.resize(shaderBlob->GetBufferSize());
+	memcpy(&data[0], shaderBlob->GetBufferPointer(), data.size());
+
+	hr = device->device->CreateVertexShader(data.data(), data.size(),
+			NULL, shader.Assign());
 	if (FAILED(hr))
 		throw HRError("Failed to create vertex shader", hr);
 
-	hr = device->device->CreateInputLayout(inputs.data(),
-			(UINT)inputs.size(), shaderBlob->GetBufferPointer(),
-			shaderBlob->GetBufferSize(), layout.Assign());
+	hr = device->device->CreateInputLayout(layoutData.data(),
+			(UINT)layoutData.size(),
+			data.data(), data.size(), layout.Assign());
 	if (FAILED(hr))
 		throw HRError("Failed to create input layout", hr);
 
@@ -78,7 +80,7 @@
 
 gs_pixel_shader::gs_pixel_shader(gs_device_t *device, const char *file,
 		const char *shaderString)
-	: gs_shader(device, GS_SHADER_PIXEL)
+	: gs_shader(device, gs_type::gs_pixel_shader, GS_SHADER_PIXEL)
 {
 	ShaderProcessor processor(device);
 	ComPtr<ID3D10Blob> shaderBlob;
@@ -93,10 +95,13 @@
 
 	Compile(outputString.c_str(), file, "ps_4_0", shaderBlob.Assign());
 
-	hr = device->device->CreatePixelShader(shaderBlob->GetBufferPointer(),
-			shaderBlob->GetBufferSize(), NULL, shader.Assign());
+	data.resize(shaderBlob->GetBufferSize());
+	memcpy(&data[0], shaderBlob->GetBufferPointer(), data.size());
+
+	hr = device->device->CreatePixelShader(data.data(), data.size(),
+			NULL, shader.Assign());
 	if (FAILED(hr))
-		throw HRError("Failed to create vertex shader", hr);
+		throw HRError("Failed to create pixel shader", hr);
 }
 
 /*
@@ -157,11 +162,11 @@
 		constantSize += size;
 	}
 
+	memset(&bd, 0, sizeof(bd));
+
 	if (constantSize) {
-		D3D11_BUFFER_DESC bd;
 		HRESULT hr;
 
-		memset(&bd, 0, sizeof(bd));
 		bd.ByteWidth = (constantSize+15)&0xFFFFFFF0; /* align */
 		bd.Usage = D3D11_USAGE_DYNAMIC;
 		bd.BindFlags = D3D11_BIND_CONSTANT_BUFFER;

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-shaderprocessor.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-shaderprocessor.cpp Changed

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-shaderprocessor.hpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-shaderprocessor.hpp Changed

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-stagesurf.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-stagesurf.cpp Changed

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

@@ -33,9 +33,39 @@
 #pragma warning (disable : 4316)
 #endif
 
+static inline void LogD3D11ErrorDetails(HRError error, gs_device_t *device)
+{
+	if (error.hr == DXGI_ERROR_DEVICE_REMOVED) {
+		HRESULT DeviceRemovedReason =
+				device->device->GetDeviceRemovedReason();
+		blog(LOG_ERROR, " Device Removed Reason: %08lX",
+				DeviceRemovedReason);
+	}
+}
+
 static const IID dxgiFactory2 =
 {0x50c83a1c, 0xe072, 0x4c48, {0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0}};
 
+
+gs_obj::gs_obj(gs_device_t *device_, gs_type type) :
+	device (device_),
+	obj_type (type)
+{
+	prev_next = &device->first_obj;
+	next = device->first_obj;
+	device->first_obj = this;
+	if (next)
+		next->prev_next = &next;
+}
+
+gs_obj::~gs_obj()
+{
+	if (prev_next)
+		*prev_next = next;
+	if (next)
+		next->prev_next = prev_next;
+}
+
 static inline void make_swap_desc(DXGI_SWAP_CHAIN_DESC &desc,
 		const gs_init_data *data)
 {
@@ -91,6 +121,9 @@
 	zs.texture.Clear();
 	zs.view.Clear();
 
+	initData.cx = cx;
+	initData.cy = cy;
+
 	if (cx == 0 || cy == 0) {
 		GetClientRect(hwnd, &clientRect);
 		if (cx == 0) cx = clientRect.right;
@@ -105,27 +138,27 @@
 	InitZStencilBuffer(cx, cy);
 }
 
-void gs_swap_chain::Init(const gs_init_data *data)
+void gs_swap_chain::Init()
 {
 	target.device = device;
 	target.isRenderTarget = true;
-	target.format = data->format;
-	target.dxgiFormat = ConvertGSTextureFormat(data->format);
-	InitTarget(data->cx, data->cy);
+	target.format = initData.format;
+	target.dxgiFormat = ConvertGSTextureFormat(initData.format);
+	InitTarget(initData.cx, initData.cy);
 
 	zs.device = device;
-	zs.format = data->zsformat;
-	zs.dxgiFormat = ConvertGSZStencilFormat(data->zsformat);
-	InitZStencilBuffer(data->cx, data->cy);
+	zs.format = initData.zsformat;
+	zs.dxgiFormat = ConvertGSZStencilFormat(initData.zsformat);
+	InitZStencilBuffer(initData.cx, initData.cy);
 }
 
 gs_swap_chain::gs_swap_chain(gs_device *device, const gs_init_data *data)
-	: device (device),
+	: gs_obj (device, gs_type::gs_swap_chain),
 	 numBuffers (data->num_backbuffers),
-	 hwnd ((HWND)data->window.hwnd)
+	 hwnd ((HWND)data->window.hwnd),
+	 initData (*data)
 {
 	HRESULT hr;
-	DXGI_SWAP_CHAIN_DESC swapDesc;
 
 	make_swap_desc(swapDesc, data);
 	hr = device->factory->CreateSwapChain(device->device, &swapDesc,
@@ -133,7 +166,7 @@
 	if (FAILED(hr))
 		throw HRError("Failed to create swap chain", hr);
 
-	Init(data);
+	Init();
 }
 
 void gs_device::InitCompiler()
@@ -161,7 +194,7 @@
 	throw "Could not find any D3DCompiler libraries";
 }
 
-void gs_device::InitFactory(uint32_t adapterIdx, IDXGIAdapter1 **padapter)
+void gs_device::InitFactory(uint32_t adapterIdx)
 {
 	HRESULT hr;
 	IID factoryIID = (GetWinVer() >= 0x602) ? dxgiFactory2 :
@@ -171,7 +204,7 @@
 	if (FAILED(hr))
 		throw UnsupportedHWError("Failed to create DXGIFactory", hr);
 
-	hr = factory->EnumAdapters1(adapterIdx, padapter);
+	hr = factory->EnumAdapters1(adapterIdx, &adapter);
 	if (FAILED(hr))
 		throw UnsupportedHWError("Failed to enumerate DXGIAdapter", hr);
 }
@@ -184,13 +217,15 @@
 	D3D_FEATURE_LEVEL_9_3,
 };
 
-void gs_device::InitDevice(uint32_t adapterIdx, IDXGIAdapter *adapter)
+void gs_device::InitDevice(uint32_t adapterIdx)
 {
 	wstring adapterName;
 	DXGI_ADAPTER_DESC desc;
 	D3D_FEATURE_LEVEL levelUsed = D3D_FEATURE_LEVEL_9_3;
 	HRESULT hr = 0;
 
+	adpIdx = adapterIdx;
+
 	uint32_t createFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
 #ifdef _DEBUG
 	//createFlags |= D3D11_CREATE_DEVICE_DEBUG;
@@ -230,7 +265,6 @@
 {
 	HRESULT hr;
 	D3D11_DEPTH_STENCIL_DESC dsd;
-	SavedZStencilState savedState(zstencilState);
 	ID3D11DepthStencilState *state;
 
 	dsd.DepthEnable = zstencilState.depthEnabled;
@@ -244,6 +278,7 @@
 	ConvertStencilSide(dsd.FrontFace, zstencilState.stencilFront);
 	ConvertStencilSide(dsd.BackFace, zstencilState.stencilBack);
 
+	SavedZStencilState savedState(zstencilState, dsd);
 	hr = device->CreateDepthStencilState(&dsd, savedState.state.Assign());
 	if (FAILED(hr))
 		throw HRError("Failed to create depth stencil state", hr);
@@ -258,7 +293,6 @@
 {
 	HRESULT hr;
 	D3D11_RASTERIZER_DESC rd;
-	SavedRasterState savedState(rasterState);
 	ID3D11RasterizerState *state;
 
 	memset(&rd, 0, sizeof(rd));
@@ -269,6 +303,7 @@
 	rd.DepthClipEnable = true;
 	rd.ScissorEnable = rasterState.scissorEnabled;
 
+	SavedRasterState savedState(rasterState, rd);
 	hr = device->CreateRasterizerState(&rd, savedState.state.Assign());
 	if (FAILED(hr))
 		throw HRError("Failed to create rasterizer state", hr);
@@ -283,7 +318,6 @@
 {
 	HRESULT hr;
 	D3D11_BLEND_DESC bd;
-	SavedBlendState savedState(blendState);
 	ID3D11BlendState *state;
 
 	memset(&bd, 0, sizeof(bd));
@@ -303,9 +337,10 @@
 			D3D11_COLOR_WRITE_ENABLE_ALL;
 	}
 
+	SavedBlendState savedState(blendState, bd);
 	hr = device->CreateBlendState(&bd, savedState.state.Assign());
 	if (FAILED(hr))
-		throw HRError("Failed to create disabled blend state", hr);
+		throw HRError("Failed to create blend state", hr);
 
 	state = savedState.state;
 	blendStates.push_back(savedState);
@@ -413,8 +448,6 @@
 gs_device::gs_device(uint32_t adapterIdx)
 	: curToplogy (D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED)
 {
-	ComPtr<IDXGIAdapter1> adapter;
-
 	matrix4_identity(&curProjMatrix);
 	matrix4_identity(&curViewMatrix);
 	matrix4_identity(&curViewProjMatrix);
@@ -427,11 +460,16 @@
 	}
 
 	InitCompiler();
-	InitFactory(adapterIdx, adapter.Assign());
-	InitDevice(adapterIdx, adapter);
+	InitFactory(adapterIdx);
+	InitDevice(adapterIdx);
 	device_set_render_target(this, NULL, NULL);
 }
 
+gs_device::~gs_device()
+{
+	context->ClearState();
+}
+
 const char *device_get_name(void)
 {
 	return "Direct3D 11";
@@ -612,6 +650,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_swapchain_create (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	}
 
 	return swap;
@@ -641,6 +680,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_resize (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	}
 }
 
@@ -688,6 +728,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_texture_create (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	} catch (const char *error) {
 		blog(LOG_ERROR, "device_texture_create (D3D11): %s", error);
 	}
@@ -708,6 +749,7 @@
 		blog(LOG_ERROR, "device_cubetexture_create (D3D11): %s "
 		 "(%08lX)",
 		 error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	} catch (const char *error) {
 		blog(LOG_ERROR, "device_cubetexture_create (D3D11): %s",
 				error);
@@ -743,6 +785,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_zstencil_create (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	}
 
 	return zstencil;
@@ -759,6 +802,7 @@
 		blog(LOG_ERROR, "device_stagesurface_create (D3D11): %s "
 		 "(%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	}
 
 	return surf;
@@ -774,6 +818,7 @@
 		blog(LOG_ERROR, "device_samplerstate_create (D3D11): %s "
 		 "(%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	}
 
 	return ss;
@@ -791,6 +836,7 @@
 		blog(LOG_ERROR, "device_vertexshader_create (D3D11): %s "
 		 "(%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 
 	} catch (ShaderError error) {
 		const char *buf = (const char*)error.errors->GetBufferPointer();
@@ -820,6 +866,7 @@
 		blog(LOG_ERROR, "device_pixelshader_create (D3D11): %s "
 		 "(%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 
 	} catch (ShaderError error) {
 		const char *buf = (const char*)error.errors->GetBufferPointer();
@@ -847,6 +894,7 @@
 		blog(LOG_ERROR, "device_vertexbuffer_create (D3D11): %s "
 		 "(%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	} catch (const char *error) {
 		blog(LOG_ERROR, "device_vertexbuffer_create (D3D11): %s",
 				error);
@@ -865,6 +913,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_indexbuffer_create (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	}
 
 	return buffer;
@@ -1308,6 +1357,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_draw (D3D11): %s (%08lX)", error.str,
 				error.hr);
+		LogD3D11ErrorDetails(error, device);
 		return;
 	}
 
@@ -1382,8 +1432,14 @@
 
 void device_present(gs_device_t *device)
 {
+	HRESULT hr;
+
 	if (device->curSwapChain) {
-		device->curSwapChain->swap->Present(0, 0);
+		hr = device->curSwapChain->swap->Present(0, 0);
+		if (hr == DXGI_ERROR_DEVICE_REMOVED ||
+		 hr == DXGI_ERROR_DEVICE_RESET) {
+			device->RebuildDevice();
+		}
 	} else {
 		blog(LOG_WARNING, "device_present (D3D11): No active swap");
 	}
@@ -1964,6 +2020,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "device_texture_create_gdi (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	} catch (const char *error) {
 		blog(LOG_ERROR, "device_texture_create_gdi (D3D11): %s", error);
 	}
@@ -2018,6 +2075,7 @@
 	} catch (HRError error) {
 		blog(LOG_ERROR, "gs_texture_open_shared (D3D11): %s (%08lX)",
 				error.str, error.hr);
+		LogD3D11ErrorDetails(error, device);
 	} catch (const char *error) {
 		blog(LOG_ERROR, "gs_texture_open_shared (D3D11): %s", error);
 	}

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-subsystem.hpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-subsystem.hpp Changed

@@ -22,6 +22,7 @@
 
 #include <vector>
 #include <string>
+#include <memory>
 
 #include <windows.h>
 #include <dxgi.h>
@@ -197,20 +198,46 @@
 struct VBDataPtr {
 	gs_vb_data *data;
 
-	inline void Clear() {gs_vbdata_destroy(data); data = nullptr;}
-
 	inline VBDataPtr(gs_vb_data *data) : data(data) {}
 	inline ~VBDataPtr() {gs_vbdata_destroy(data);}
 };
 
-struct gs_vertex_buffer {
+enum class gs_type {
+	gs_vertex_buffer,
+	gs_index_buffer,
+	gs_texture_2d,
+	gs_zstencil_buffer,
+	gs_stage_surface,
+	gs_sampler_state,
+	gs_vertex_shader,
+	gs_pixel_shader,
+	gs_duplicator,
+	gs_swap_chain,
+};
+
+struct gs_obj {
+	gs_device_t *device;
+	gs_type obj_type;
+	gs_obj *next;
+	gs_obj **prev_next;
+
+	inline gs_obj() :
+		device(nullptr),
+		next(nullptr),
+		prev_next(nullptr)
+	{}
+
+	gs_obj(gs_device_t *device, gs_type type);
+	virtual ~gs_obj();
+};
+
+struct gs_vertex_buffer : gs_obj {
 	ComPtr<ID3D11Buffer> vertexBuffer;
 	ComPtr<ID3D11Buffer> normalBuffer;
 	ComPtr<ID3D11Buffer> colorBuffer;
 	ComPtr<ID3D11Buffer> tangentBuffer;
 	vector<ComPtr<ID3D11Buffer>> uvBuffers;
 
-	gs_device_t *device;
 	bool dynamic;
 	VBDataPtr vbd;
 	size_t numVerts;
@@ -223,10 +250,23 @@
 			vector<ID3D11Buffer*> &buffers,
 			vector<uint32_t> &strides);
 
-	inline void InitBuffer(const size_t elementSize,
+	void InitBuffer(const size_t elementSize,
 			const size_t numVerts, void *array,
 			ID3D11Buffer **buffer);
 
+	void BuildBuffers();
+
+	inline void Release()
+	{
+		vertexBuffer.Release();
+		normalBuffer.Release();
+		colorBuffer.Release();
+		tangentBuffer.Release();
+		uvBuffers.clear();
+	}
+
+	inline void Rebuild();
+
 	gs_vertex_buffer(gs_device_t *device, struct gs_vb_data *data,
 			uint32_t flags);
 };
@@ -239,41 +279,61 @@
 	inline ~DataPtr() {bfree(data);}
 };
 
-struct gs_index_buffer {
+struct gs_index_buffer : gs_obj {
 	ComPtr<ID3D11Buffer> indexBuffer;
-	gs_device_t *device;
 	bool dynamic;
 	gs_index_type type;
 	size_t indexSize;
 	size_t num;
 	DataPtr indices;
 
+	D3D11_BUFFER_DESC bd = {};
+	D3D11_SUBRESOURCE_DATA srd = {};
+
 	void InitBuffer();
 
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release() {indexBuffer.Release();}
+
 	gs_index_buffer(gs_device_t *device, enum gs_index_type type,
 			void *indices, size_t num, uint32_t flags);
 };
 
-struct gs_texture {
+struct gs_texture : gs_obj {
 	gs_texture_type type;
-	gs_device *device;
 	uint32_t levels;
 	gs_color_format format;
 
 	ComPtr<ID3D11ShaderResourceView> shaderRes;
+	D3D11_SHADER_RESOURCE_VIEW_DESC resourceDesc = {};
 
-	inline gs_texture() {}
+	inline void Rebuild(ID3D11Device *dev);
 
-	inline gs_texture(gs_device *device, gs_texture_type type,
-			uint32_t levels, gs_color_format format)
+	inline gs_texture(gs_texture_type type, uint32_t levels,
+			gs_color_format format)
 		: type (type),
-		 device (device),
 		 levels (levels),
 		 format (format)
 	{
 	}
 
-	virtual ~gs_texture() {}
+	inline gs_texture(gs_device *device, gs_type obj_type,
+			gs_texture_type type)
+		: gs_obj (device, obj_type),
+		 type (type)
+	{
+	}
+
+	inline gs_texture(gs_device *device, gs_type obj_type,
+			gs_texture_type type,
+			uint32_t levels, gs_color_format format)
+		: gs_obj (device, obj_type),
+		 type (type),
+		 levels (levels),
+		 format (format)
+	{
+	}
 };
 
 struct gs_texture_2d : gs_texture {
@@ -290,13 +350,29 @@
 	bool genMipmaps = false;
 	uint32_t sharedHandle = 0;
 
-	void InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd, const uint8_t **data);
+	vector<vector<uint8_t>> data;
+	vector<D3D11_SUBRESOURCE_DATA> srd;
+	D3D11_TEXTURE2D_DESC td = {};
+
+	void InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd);
 	void InitTexture(const uint8_t **data);
 	void InitResourceView();
 	void InitRenderTargets();
+	void BackupTexture(const uint8_t **data);
+
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		texture.Release();
+		for (auto &rt : renderTarget)
+			rt.Release();
+		gdiSurface.Release();
+		shaderRes.Release();
+	}
 
 	inline gs_texture_2d()
-		: gs_texture (NULL, GS_TEXTURE_2D, 0, GS_UNKNOWN)
+		: gs_texture (GS_TEXTURE_2D, 0, GS_UNKNOWN)
 	{
 	}
 
@@ -308,20 +384,29 @@
 	gs_texture_2d(gs_device_t *device, uint32_t handle);
 };
 
-struct gs_zstencil_buffer {
+struct gs_zstencil_buffer : gs_obj {
 	ComPtr<ID3D11Texture2D> texture;
 	ComPtr<ID3D11DepthStencilView> view;
 
-	gs_device *device;
 	uint32_t width, height;
 	gs_zstencil_format format;
 	DXGI_FORMAT dxgiFormat;
 
+	D3D11_TEXTURE2D_DESC td = {};
+	D3D11_DEPTH_STENCIL_VIEW_DESC dsvd = {};
+
 	void InitBuffer();
 
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		texture.Release();
+		view.Release();
+	}
+
 	inline gs_zstencil_buffer()
-		: device (NULL),
-		 width (0),
+		: width (0),
 		 height (0),
 		 dxgiFormat (DXGI_FORMAT_UNKNOWN)
 	{
@@ -331,23 +416,34 @@
 			gs_zstencil_format format);
 };
 
-struct gs_stage_surface {
+struct gs_stage_surface : gs_obj {
 	ComPtr<ID3D11Texture2D> texture;
+	D3D11_TEXTURE2D_DESC td = {};
 
-	gs_device *device;
 	uint32_t width, height;
 	gs_color_format format;
 	DXGI_FORMAT dxgiFormat;
 
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		texture.Release();
+	}
+
 	gs_stage_surface(gs_device_t *device, uint32_t width, uint32_t height,
 			gs_color_format colorFormat);
 };
 
-struct gs_sampler_state {
+struct gs_sampler_state : gs_obj {
 	ComPtr<ID3D11SamplerState> state;
-	gs_device_t *device;
+	D3D11_SAMPLER_DESC sd = {};
 	gs_sampler_info info;
 
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release() {state.Release();}
+
 	gs_sampler_state(gs_device_t *device, const gs_sampler_info *info);
 };
 
@@ -380,13 +476,15 @@
 	}
 };
 
-struct gs_shader {
-	gs_device_t *device;
+struct gs_shader : gs_obj {
 	gs_shader_type type;
 	vector<gs_shader_param> params;
 	ComPtr<ID3D11Buffer> constants;
 	size_t constantSize;
 
+	D3D11_BUFFER_DESC bd = {};
+	vector<uint8_t> data;
+
 	inline void UpdateParam(vector<uint8_t> &constData,
 			gs_shader_param &param, bool &upload);
 	void UploadParams();
@@ -395,8 +493,9 @@
 	void Compile(const char *shaderStr, const char *file,
 			const char *target, ID3D10Blob **shader);
 
-	inline gs_shader(gs_device_t *device, gs_shader_type type)
-		: device (device),
+	inline gs_shader(gs_device_t *device, gs_type obj_type,
+			gs_shader_type type)
+		: gs_obj (device, obj_type),
 		 type (type),
 		 constantSize (0)
 	{
@@ -423,11 +522,22 @@
 
 	gs_shader_param *world, *viewProj;
 
+	vector<D3D11_INPUT_ELEMENT_DESC> layoutData;
+
 	bool hasNormals;
 	bool hasColors;
 	bool hasTangents;
 	uint32_t nTexUnits;
 
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		shader.Release();
+		layout.Release();
+		constants.Release();
+	}
+
 	inline uint32_t NumBuffersExpected() const
 	{
 		uint32_t count = nTexUnits+1;
@@ -444,10 +554,17 @@
 			const char *shaderString);
 };
 
-struct gs_duplicator {
+struct gs_duplicator : gs_obj {
 	ComPtr<IDXGIOutputDuplication> duplicator;
 	gs_texture_2d *texture;
-	gs_device_t *device;
+	int idx;
+
+	void Start();
+
+	inline void Release()
+	{
+		duplicator.Release();
+	}
 
 	gs_duplicator(gs_device_t *device, int monitor_idx);
 	~gs_duplicator();
@@ -455,13 +572,21 @@
 
 struct gs_pixel_shader : gs_shader {
 	ComPtr<ID3D11PixelShader> shader;
-	vector<ShaderSampler> samplers;
+	vector<unique_ptr<ShaderSampler>> samplers;
+
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		shader.Release();
+		constants.Release();
+	}
 
 	inline void GetSamplerStates(ID3D11SamplerState **states)
 	{
 		size_t i;
 		for (i = 0; i < samplers.size(); i++)
-			states[i] = samplers[i].sampler.state;
+			states[i] = samplers[i]->sampler.state;
 		for (; i < GS_MAX_TEXTURES; i++)
 			states[i] = NULL;
 	}
@@ -470,10 +595,11 @@
 			const char *shaderString);
 };
 
-struct gs_swap_chain {
-	gs_device *device;
+struct gs_swap_chain : gs_obj {
 	uint32_t numBuffers;
 	HWND hwnd;
+	gs_init_data initData;
+	DXGI_SWAP_CHAIN_DESC swapDesc = {};
 
 	gs_texture_2d target;
 	gs_zstencil_buffer zs;
@@ -482,13 +608,15 @@
 	void InitTarget(uint32_t cx, uint32_t cy);
 	void InitZStencilBuffer(uint32_t cx, uint32_t cy);
 	void Resize(uint32_t cx, uint32_t cy);
-	void Init(const gs_init_data *data);
+	void Init();
+
+	inline void Rebuild(ID3D11Device *dev);
 
-	inline gs_swap_chain()
-		: device (NULL),
-		 numBuffers (0),
-		 hwnd (NULL)
+	inline void Release()
 	{
+		target.Release();
+		zs.Release();
+		swap.Release();
 	}
 
 	gs_swap_chain(gs_device *device, const gs_init_data *data);
@@ -527,8 +655,17 @@
 
 struct SavedBlendState : BlendState {
 	ComPtr<ID3D11BlendState> state;
+	D3D11_BLEND_DESC bd;
 
-	inline SavedBlendState(const BlendState &val) : BlendState(val)
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		state.Release();
+	}
+
+	inline SavedBlendState(const BlendState &val, D3D11_BLEND_DESC &desc)
+		: BlendState(val), bd(desc)
 	{
 	}
 };
@@ -575,9 +712,19 @@
 
 struct SavedZStencilState : ZStencilState {
 	ComPtr<ID3D11DepthStencilState> state;
+	D3D11_DEPTH_STENCIL_DESC dsd;
 
-	inline SavedZStencilState(const ZStencilState &val)
-		: ZStencilState (val)
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		state.Release();
+	}
+
+	inline SavedZStencilState(const ZStencilState &val,
+			D3D11_DEPTH_STENCIL_DESC desc)
+		: ZStencilState (val),
+		 dsd (desc)
 	{
 	}
 };
@@ -600,9 +747,19 @@
 
 struct SavedRasterState : RasterState {
 	ComPtr<ID3D11RasterizerState> state;
+	D3D11_RASTERIZER_DESC rd;
+
+	inline void Rebuild(ID3D11Device *dev);
+
+	inline void Release()
+	{
+		state.Release();
+	}
 
-	inline SavedRasterState(const RasterState &val)
-	 : RasterState (val)
+	inline SavedRasterState(const RasterState &val,
+			D3D11_RASTERIZER_DESC &desc)
+	 : RasterState (val),
+	 rd (desc)
 	{
 	}
 };
@@ -613,8 +770,10 @@
 
 struct gs_device {
 	ComPtr<IDXGIFactory1> factory;
+	ComPtr<IDXGIAdapter1> adapter;
 	ComPtr<ID3D11Device> device;
 	ComPtr<ID3D11DeviceContext> context;
+	uint32_t adpIdx = 0;
 
 	gs_texture_2d *curRenderTarget = nullptr;
 	gs_zstencil_buffer *curZStencilBuffer = nullptr;
@@ -651,9 +810,11 @@
 	matrix4 curViewMatrix;
 	matrix4 curViewProjMatrix;
 
+	gs_obj *first_obj = nullptr;
+
 	void InitCompiler();
-	void InitFactory(uint32_t adapterIdx, IDXGIAdapter1 **adapter);
-	void InitDevice(uint32_t adapterIdx, IDXGIAdapter *adapter);
+	void InitFactory(uint32_t adapterIdx);
+	void InitDevice(uint32_t adapterIdx);
 
 	ID3D11DepthStencilState *AddZStencilState();
 	ID3D11RasterizerState *AddRasterState();
@@ -669,5 +830,8 @@
 
 	void UpdateViewProjMatrix();
 
+	void RebuildDevice();
+
 	gs_device(uint32_t adapterIdx);
+	~gs_device();
 };

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-texture2d.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-texture2d.cpp Changed

@@ -18,13 +18,13 @@
 #include <util/base.h>
 #include "d3d11-subsystem.hpp"
 
-void gs_texture_2d::InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd,
-		const uint8_t **data)
+void gs_texture_2d::InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd)
 {
 	uint32_t rowSizeBytes = width * gs_get_format_bpp(format);
 	uint32_t texSizeBytes = height * rowSizeBytes / 8;
 	size_t textures = type == GS_TEXTURE_2D ? 1 : 6;
 	uint32_t actual_levels = levels;
+	size_t curTex = 0;
 
 	if (!actual_levels)
 		actual_levels = gs_get_total_levels(width, height);
@@ -37,22 +37,42 @@
 
 		for (uint32_t j = 0; j < actual_levels; j++) {
 			D3D11_SUBRESOURCE_DATA newSRD;
-			newSRD.pSysMem = *data;
+			newSRD.pSysMem = data[curTex++].data();
 			newSRD.SysMemPitch = newRowSize;
 			newSRD.SysMemSlicePitch = newTexSize;
 			srd.push_back(newSRD);
 
 			newRowSize /= 2;
 			newTexSize /= 4;
-			data++;
 		}
 	}
 }
 
+void gs_texture_2d::BackupTexture(const uint8_t **data)
+{
+	this->data.resize(levels);
+
+	uint32_t w = width;
+	uint32_t h = height;
+	uint32_t bbp = gs_get_format_bpp(format);
+
+	for (uint32_t i = 0; i < levels; i++) {
+		if (!data[i])
+			break;
+
+		uint32_t texSize = bbp * w * h / 8;
+		this->data[i].resize(texSize);
+
+		vector<uint8_t> &subData = this->data[i];
+		memcpy(&subData[0], data[i], texSize);
+
+		w /= 2;
+		h /= 2;
+	}
+}
+
 void gs_texture_2d::InitTexture(const uint8_t **data)
 {
-	vector<D3D11_SUBRESOURCE_DATA> srd;
-	D3D11_TEXTURE2D_DESC td;
 	HRESULT hr;
 
 	memset(&td, 0, sizeof(td));
@@ -76,8 +96,10 @@
 	if (isGDICompatible)
 		td.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE;
 
-	if (data)
-		InitSRD(srd, data);
+	if (data) {
+		BackupTexture(data);
+		InitSRD(srd);
+	}
 
 	hr = device->device->CreateTexture2D(&td, data ? srd.data() : NULL,
 			texture.Assign());
@@ -94,7 +116,6 @@
 
 void gs_texture_2d::InitResourceView()
 {
-	D3D11_SHADER_RESOURCE_VIEW_DESC resourceDesc;
 	HRESULT hr;
 
 	memset(&resourceDesc, 0, sizeof(resourceDesc));
@@ -145,7 +166,8 @@
 		uint32_t height, gs_color_format colorFormat, uint32_t levels,
 		const uint8_t **data, uint32_t flags, gs_texture_type type,
 		bool gdiCompatible, bool shared)
-	: gs_texture (device, type, levels, colorFormat),
+	: gs_texture (device, gs_type::gs_texture_2d, type, levels,
+	 colorFormat),
 	 width (width),
 	 height (height),
 	 dxgiFormat (ConvertGSTextureFormat(format)),
@@ -163,29 +185,30 @@
 }
 
 gs_texture_2d::gs_texture_2d(gs_device_t *device, uint32_t handle)
-	: isShared (true),
+	: gs_texture (device, gs_type::gs_texture_2d,
+	 GS_TEXTURE_2D),
+	 isShared (true),
 	 sharedHandle (handle)
 {
 	HRESULT hr;
 	hr = device->device->OpenSharedResource((HANDLE)(uintptr_t)handle,
 			__uuidof(ID3D11Texture2D), (void**)texture.Assign());
 	if (FAILED(hr))
-		throw HRError("Failed to open resource", hr);
+		throw HRError("Failed to open shared 2D texture", hr);
 
-	D3D11_TEXTURE2D_DESC desc;
-	texture->GetDesc(&desc);
+	texture->GetDesc(&td);
 
 	this->type = GS_TEXTURE_2D;
-	this->format = ConvertDXGITextureFormat(desc.Format);
+	this->format = ConvertDXGITextureFormat(td.Format);
 	this->levels = 1;
 	this->device = device;
 
-	this->width = desc.Width;
-	this->height = desc.Height;
-	this->dxgiFormat = desc.Format;
+	this->width = td.Width;
+	this->height = td.Height;
+	this->dxgiFormat = td.Format;
 
-	D3D11_SHADER_RESOURCE_VIEW_DESC resourceDesc = {};
-	resourceDesc.Format = desc.Format;
+	memset(&resourceDesc, 0, sizeof(resourceDesc));
+	resourceDesc.Format = td.Format;
 	resourceDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
 	resourceDesc.Texture2D.MipLevels = 1;

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp Changed

@@ -72,7 +72,7 @@
 	}
 }
 
-inline void gs_vertex_buffer::InitBuffer(const size_t elementSize,
+void gs_vertex_buffer::InitBuffer(const size_t elementSize,
 		const size_t numVerts, void *array, ID3D11Buffer **buffer)
 {
 	D3D11_BUFFER_DESC bd;
@@ -93,35 +93,25 @@
 		throw HRError("Failed to create buffer", hr);
 }
 
-gs_vertex_buffer::gs_vertex_buffer(gs_device_t *device, struct gs_vb_data *data,
-		uint32_t flags)
-	: device (device),
-	 dynamic ((flags & GS_DYNAMIC) != 0),
-	 vbd (data),
-	 numVerts (data->num)
+void gs_vertex_buffer::BuildBuffers()
 {
-	if (!data->num)
-		throw "Cannot initialize vertex buffer with 0 vertices";
-	if (!data->points)
-		throw "No points specified for vertex buffer";
+	InitBuffer(sizeof(vec3), vbd.data->num, vbd.data->points,
+			&vertexBuffer);
 
-	InitBuffer(sizeof(vec3), data->num, data->points,
-			vertexBuffer.Assign());
+	if (vbd.data->normals)
+		InitBuffer(sizeof(vec3), vbd.data->num, vbd.data->normals,
+				&normalBuffer);
 
-	if (data->normals)
-		InitBuffer(sizeof(vec3), data->num, data->normals,
-				normalBuffer.Assign());
+	if (vbd.data->tangents)
+		InitBuffer(sizeof(vec3), vbd.data->num, vbd.data->tangents,
+				&tangentBuffer);
 
-	if (data->tangents)
-		InitBuffer(sizeof(vec3), data->num, data->tangents,
-				tangentBuffer.Assign());
+	if (vbd.data->colors)
+		InitBuffer(sizeof(uint32_t), vbd.data->num, vbd.data->colors,
+				&colorBuffer);
 
-	if (data->colors)
-		InitBuffer(sizeof(uint32_t), data->num, data->colors,
-				colorBuffer.Assign());
-
-	for (size_t i = 0; i < data->num_tex; i++) {
-		struct gs_tvertarray *tverts = data->tvarray+i;
+	for (size_t i = 0; i < vbd.data->num_tex; i++) {
+		struct gs_tvertarray *tverts = vbd.data->tvarray+i;
 
 		if (tverts->width != 2 && tverts->width != 4)
 			throw "Invalid texture vertex size specified";
@@ -129,13 +119,25 @@
 			throw "No texture vertices specified";
 
 		ComPtr<ID3D11Buffer> buffer;
-		InitBuffer(tverts->width * sizeof(float), data->num,
-				tverts->array, buffer.Assign());
+		InitBuffer(tverts->width * sizeof(float), vbd.data->num,
+				tverts->array, &buffer);
 
 		uvBuffers.push_back(buffer);
 		uvSizes.push_back(tverts->width * sizeof(float));
 	}
+}
+
+gs_vertex_buffer::gs_vertex_buffer(gs_device_t *device, struct gs_vb_data *data,
+		uint32_t flags)
+	: gs_obj (device, gs_type::gs_vertex_buffer),
+	 dynamic ((flags & GS_DYNAMIC) != 0),
+	 vbd (data),
+	 numVerts (data->num)
+{
+	if (!data->num)
+		throw "Cannot initialize vertex buffer with 0 vertices";
+	if (!data->points)
+		throw "No points specified for vertex buffer";
 
-	if (!dynamic)
-		vbd.Clear();
+	BuildBuffers();
 }

obs-studio-0.16.2.tar.xz/libobs-d3d11/d3d11-zstencilbuffer.cpp -> obs-studio-0.16.4.tar.xz/libobs-d3d11/d3d11-zstencilbuffer.cpp Changed

obs-studio-0.16.2.tar.xz/libobs/obs-config.h -> obs-studio-0.16.4.tar.xz/libobs/obs-config.h Changed

obs-studio-0.16.2.tar.xz/libobs/obs-encoder.c -> obs-studio-0.16.4.tar.xz/libobs/obs-encoder.c Changed

obs-studio-0.16.2.tar.xz/libobs/obs-win-crash-handler.c -> obs-studio-0.16.4.tar.xz/libobs/obs-win-crash-handler.c Changed

obs-studio-0.16.2.tar.xz/libobs/util/platform-windows.c -> obs-studio-0.16.4.tar.xz/libobs/util/platform-windows.c Changed

obs-studio-0.16.2.tar.xz/libobs/util/windows/CoTaskMemPtr.hpp -> obs-studio-0.16.4.tar.xz/libobs/util/windows/CoTaskMemPtr.hpp Changed

obs-studio-0.16.4.tar.xz/plugins/coreaudio-encoder/data/locale/ms-MY.ini Added

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -57,23 +57,31 @@
 
 BMD_CONST REFIID IID_IDeckLinkVideoOutputCallback = /* 20AA5225-1958-47CB-820B-80A8D521A6EE */ {0x20,0xAA,0x52,0x25,0x19,0x58,0x47,0xCB,0x82,0x0B,0x80,0xA8,0xD5,0x21,0xA6,0xEE};
 BMD_CONST REFIID IID_IDeckLinkInputCallback = /* DD04E5EC-7415-42AB-AE4A-E80C4DFC044A */ {0xDD,0x04,0xE5,0xEC,0x74,0x15,0x42,0xAB,0xAE,0x4A,0xE8,0x0C,0x4D,0xFC,0x04,0x4A};
+BMD_CONST REFIID IID_IDeckLinkEncoderInputCallback = /* ACF13E61-F4A0-4974-A6A7-59AFF6268B31 */ {0xAC,0xF1,0x3E,0x61,0xF4,0xA0,0x49,0x74,0xA6,0xA7,0x59,0xAF,0xF6,0x26,0x8B,0x31};
 BMD_CONST REFIID IID_IDeckLinkMemoryAllocator = /* B36EB6E7-9D29-4AA8-92EF-843B87A289E8 */ {0xB3,0x6E,0xB6,0xE7,0x9D,0x29,0x4A,0xA8,0x92,0xEF,0x84,0x3B,0x87,0xA2,0x89,0xE8};
 BMD_CONST REFIID IID_IDeckLinkAudioOutputCallback = /* 403C681B-7F46-4A12-B993-2BB127084EE6 */ {0x40,0x3C,0x68,0x1B,0x7F,0x46,0x4A,0x12,0xB9,0x93,0x2B,0xB1,0x27,0x08,0x4E,0xE6};
 BMD_CONST REFIID IID_IDeckLinkIterator = /* 50FB36CD-3063-4B73-BDBB-958087F2D8BA */ {0x50,0xFB,0x36,0xCD,0x30,0x63,0x4B,0x73,0xBD,0xBB,0x95,0x80,0x87,0xF2,0xD8,0xBA};
 BMD_CONST REFIID IID_IDeckLinkAPIInformation = /* 7BEA3C68-730D-4322-AF34-8A7152B532A4 */ {0x7B,0xEA,0x3C,0x68,0x73,0x0D,0x43,0x22,0xAF,0x34,0x8A,0x71,0x52,0xB5,0x32,0xA4};
 BMD_CONST REFIID IID_IDeckLinkOutput = /* CC5C8A6E-3F2F-4B3A-87EA-FD78AF300564 */ {0xCC,0x5C,0x8A,0x6E,0x3F,0x2F,0x4B,0x3A,0x87,0xEA,0xFD,0x78,0xAF,0x30,0x05,0x64};
 BMD_CONST REFIID IID_IDeckLinkInput = /* AF22762B-DFAC-4846-AA79-FA8883560995 */ {0xAF,0x22,0x76,0x2B,0xDF,0xAC,0x48,0x46,0xAA,0x79,0xFA,0x88,0x83,0x56,0x09,0x95};
+BMD_CONST REFIID IID_IDeckLinkEncoderInput = /* 270587DA-6B7D-42E7-A1F0-6D853F581185 */ {0x27,0x05,0x87,0xDA,0x6B,0x7D,0x42,0xE7,0xA1,0xF0,0x6D,0x85,0x3F,0x58,0x11,0x85};
 BMD_CONST REFIID IID_IDeckLinkVideoFrame = /* 3F716FE0-F023-4111-BE5D-EF4414C05B17 */ {0x3F,0x71,0x6F,0xE0,0xF0,0x23,0x41,0x11,0xBE,0x5D,0xEF,0x44,0x14,0xC0,0x5B,0x17};
 BMD_CONST REFIID IID_IDeckLinkMutableVideoFrame = /* 69E2639F-40DA-4E19-B6F2-20ACE815C390 */ {0x69,0xE2,0x63,0x9F,0x40,0xDA,0x4E,0x19,0xB6,0xF2,0x20,0xAC,0xE8,0x15,0xC3,0x90};
 BMD_CONST REFIID IID_IDeckLinkVideoFrame3DExtensions = /* DA0F7E4A-EDC7-48A8-9CDD-2DB51C729CD7 */ {0xDA,0x0F,0x7E,0x4A,0xED,0xC7,0x48,0xA8,0x9C,0xDD,0x2D,0xB5,0x1C,0x72,0x9C,0xD7};
+BMD_CONST REFIID IID_IDeckLinkVideoFrameMetadataExtensions = /* D5973DC9-6432-46D0-8F0B-2496F8A1238F */ {0xD5,0x97,0x3D,0xC9,0x64,0x32,0x46,0xD0,0x8F,0x0B,0x24,0x96,0xF8,0xA1,0x23,0x8F};
 BMD_CONST REFIID IID_IDeckLinkVideoInputFrame = /* 05CFE374-537C-4094-9A57-680525118F44 */ {0x05,0xCF,0xE3,0x74,0x53,0x7C,0x40,0x94,0x9A,0x57,0x68,0x05,0x25,0x11,0x8F,0x44};
 BMD_CONST REFIID IID_IDeckLinkVideoFrameAncillary = /* 732E723C-D1A4-4E29-9E8E-4A88797A0004 */ {0x73,0x2E,0x72,0x3C,0xD1,0xA4,0x4E,0x29,0x9E,0x8E,0x4A,0x88,0x79,0x7A,0x00,0x04};
+BMD_CONST REFIID IID_IDeckLinkEncoderPacket = /* B693F36C-316E-4AF1-B6C2-F389A4BCA620 */ {0xB6,0x93,0xF3,0x6C,0x31,0x6E,0x4A,0xF1,0xB6,0xC2,0xF3,0x89,0xA4,0xBC,0xA6,0x20};
+BMD_CONST REFIID IID_IDeckLinkEncoderVideoPacket = /* 4E7FD944-E8C7-4EAC-B8C0-7B77F80F5AE0 */ {0x4E,0x7F,0xD9,0x44,0xE8,0xC7,0x4E,0xAC,0xB8,0xC0,0x7B,0x77,0xF8,0x0F,0x5A,0xE0};
+BMD_CONST REFIID IID_IDeckLinkEncoderAudioPacket = /* 49E8EDC8-693B-4E14-8EF6-12C658F5A07A */ {0x49,0xE8,0xED,0xC8,0x69,0x3B,0x4E,0x14,0x8E,0xF6,0x12,0xC6,0x58,0xF5,0xA0,0x7A};
+BMD_CONST REFIID IID_IDeckLinkH265NALPacket = /* 639C8E0B-68D5-4BDE-A6D4-95F3AEAFF2E7 */ {0x63,0x9C,0x8E,0x0B,0x68,0xD5,0x4B,0xDE,0xA6,0xD4,0x95,0xF3,0xAE,0xAF,0xF2,0xE7};
 BMD_CONST REFIID IID_IDeckLinkAudioInputPacket = /* E43D5870-2894-11DE-8C30-0800200C9A66 */ {0xE4,0x3D,0x58,0x70,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66};
 BMD_CONST REFIID IID_IDeckLinkScreenPreviewCallback = /* B1D3F49A-85FE-4C5D-95C8-0B5D5DCCD438 */ {0xB1,0xD3,0xF4,0x9A,0x85,0xFE,0x4C,0x5D,0x95,0xC8,0x0B,0x5D,0x5D,0xCC,0xD4,0x38};
 BMD_CONST REFIID IID_IDeckLinkGLScreenPreviewHelper = /* 504E2209-CAC7-4C1A-9FB4-C5BB6274D22F */ {0x50,0x4E,0x22,0x09,0xCA,0xC7,0x4C,0x1A,0x9F,0xB4,0xC5,0xBB,0x62,0x74,0xD2,0x2F};
 BMD_CONST REFIID IID_IDeckLinkNotificationCallback = /* B002A1EC-070D-4288-8289-BD5D36E5FF0D */ {0xB0,0x02,0xA1,0xEC,0x07,0x0D,0x42,0x88,0x82,0x89,0xBD,0x5D,0x36,0xE5,0xFF,0x0D};
 BMD_CONST REFIID IID_IDeckLinkNotification = /* 0A1FB207-E215-441B-9B19-6FA1575946C5 */ {0x0A,0x1F,0xB2,0x07,0xE2,0x15,0x44,0x1B,0x9B,0x19,0x6F,0xA1,0x57,0x59,0x46,0xC5};
 BMD_CONST REFIID IID_IDeckLinkAttributes = /* ABC11843-D966-44CB-96E2-A1CB5D3135C4 */ {0xAB,0xC1,0x18,0x43,0xD9,0x66,0x44,0xCB,0x96,0xE2,0xA1,0xCB,0x5D,0x31,0x35,0xC4};
+BMD_CONST REFIID IID_IDeckLinkStatus = /* 5F558200-4028-49BC-BEAC-DB3FA4A96E46 */ {0x5F,0x55,0x82,0x00,0x40,0x28,0x49,0xBC,0xBE,0xAC,0xDB,0x3F,0xA4,0xA9,0x6E,0x46};
 BMD_CONST REFIID IID_IDeckLinkKeyer = /* 89AFCAF5-65F8-421E-98F7-96FE5F5BFBA3 */ {0x89,0xAF,0xCA,0xF5,0x65,0xF8,0x42,0x1E,0x98,0xF7,0x96,0xFE,0x5F,0x5B,0xFB,0xA3};
 BMD_CONST REFIID IID_IDeckLinkVideoConversion = /* 3BBCB8A2-DA2C-42D9-B5D8-88083644E99A */ {0x3B,0xBC,0xB8,0xA2,0xDA,0x2C,0x42,0xD9,0xB5,0xD8,0x88,0x08,0x36,0x44,0xE9,0x9A};
 BMD_CONST REFIID IID_IDeckLinkDeviceNotificationCallback = /* 4997053B-0ADF-4CC8-AC70-7A50C4BE728F */ {0x49,0x97,0x05,0x3B,0x0A,0xDF,0x4C,0xC8,0xAC,0x70,0x7A,0x50,0xC4,0xBE,0x72,0x8F};
@@ -90,12 +98,21 @@
 bmdVideoOutputDualStream3D = 1 << 4
 };
 
+/* Enum BMDPacketType - Type of packet */
+
+typedef uint32_t BMDPacketType;
+enum _BMDPacketType {
+ bmdPacketTypeStreamInterruptedMarker = /* 'sint' */ 0x73696E74,	// A packet of this type marks the time when a video stream was interrupted, for example by a disconnected cable
+ bmdPacketTypeStreamData = /* 'sdat' */ 0x73646174	// Regular stream data
+};
+
 /* Enum BMDFrameFlags - Frame flags */
 
 typedef uint32_t BMDFrameFlags;
 enum _BMDFrameFlags {
 bmdFrameFlagDefault = 0,
 bmdFrameFlagFlipVertical = 1 << 0,
+ bmdFrameContainsHDRMetadata = 1 << 1,
 
 /* Flags that are applicable only to instances of IDeckLinkVideoInputFrame */
 
@@ -133,6 +150,7 @@
 
 typedef uint32_t BMDDeckLinkCapturePassthroughMode;
 enum _BMDDeckLinkCapturePassthroughMode {
+ bmdDeckLinkCapturePassthroughModeDisabled = /* 'pdis' */ 0x70646973,
 bmdDeckLinkCapturePassthroughModeDirect = /* 'pdir' */ 0x70646972,
 bmdDeckLinkCapturePassthroughModeCleanSwitch = /* 'pcln' */ 0x70636C6E
 };
@@ -155,6 +173,13 @@
 bmdReferenceLocked = 1 << 1
 };
 
+/* Enum BMDAudioFormat - Audio Format */
+
+typedef uint32_t BMDAudioFormat;
+enum _BMDAudioFormat {
+ bmdAudioFormatPCM = /* 'lpcm' */ 0x6C70636D	// Linear signed PCM samples
+};
+
 /* Enum BMDAudioSampleRate - Audio sample rates supported for output/input */
 
 typedef uint32_t BMDAudioSampleRate;
@@ -267,8 +292,71 @@
 typedef uint32_t BMDIdleVideoOutputOperation;
 enum _BMDIdleVideoOutputOperation {
 bmdIdleVideoOutputBlack = /* 'blac' */ 0x626C6163,
- bmdIdleVideoOutputLastFrame = /* 'lafa' */ 0x6C616661,
- bmdIdleVideoOutputDesktop = /* 'desk' */ 0x6465736B
+ bmdIdleVideoOutputLastFrame = /* 'lafa' */ 0x6C616661
+};
+
+/* Enum BMDVideoEncoderFrameCodingMode - Video frame coding mode */
+
+typedef uint32_t BMDVideoEncoderFrameCodingMode;
+enum _BMDVideoEncoderFrameCodingMode {
+ bmdVideoEncoderFrameCodingModeInter = /* 'inte' */ 0x696E7465,
+ bmdVideoEncoderFrameCodingModeIntra = /* 'intr' */ 0x696E7472
+};
+
+/* Enum BMDDNxHRLevel - DNxHR Levels */
+
+typedef uint32_t BMDDNxHRLevel;
+enum _BMDDNxHRLevel {
+ bmdDNxHRLevelSQ = /* 'dnsq' */ 0x646E7371,
+ bmdDNxHRLevelLB = /* 'dnlb' */ 0x646E6C62,
+ bmdDNxHRLevelHQ = /* 'dnhq' */ 0x646E6871,
+ bmdDNxHRLevelHQX = /* 'dhqx' */ 0x64687178,
+ bmdDNxHRLevel444 = /* 'd444' */ 0x64343434
+};
+
+/* Enum BMDLinkConfiguration - Video link configuration */
+
+typedef uint32_t BMDLinkConfiguration;
+enum _BMDLinkConfiguration {
+ bmdLinkConfigurationSingleLink = /* 'lcsl' */ 0x6C63736C,
+ bmdLinkConfigurationDualLink = /* 'lcdl' */ 0x6C63646C,
+ bmdLinkConfigurationQuadLink = /* 'lcql' */ 0x6C63716C
+};
+
+/* Enum BMDDeviceInterface - Device interface type */
+
+typedef uint32_t BMDDeviceInterface;
+enum _BMDDeviceInterface {
+ bmdDeviceInterfacePCI = /* 'pci ' */ 0x70636920,
+ bmdDeviceInterfaceUSB = /* 'usb ' */ 0x75736220,
+ bmdDeviceInterfaceThunderbolt = /* 'thun' */ 0x7468756E
+};
+
+/* Enum BMDDeckLinkFrameMetadataID - DeckLink Frame Metadata ID */
+
+typedef uint32_t BMDDeckLinkFrameMetadataID;
+enum _BMDDeckLinkFrameMetadataID {
+ bmdDeckLinkFrameMetadataHDRElectroOpticalTransferFunc = /* 'eotf' */ 0x656F7466,	// EOTF in range 0-7 as per CEA 861.3
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedX = /* 'hdrx' */ 0x68647278,	// Red display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedY = /* 'hdry' */ 0x68647279,	// Red display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenX = /* 'hdgx' */ 0x68646778,	// Green display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenY = /* 'hdgy' */ 0x68646779,	// Green display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueX = /* 'hdbx' */ 0x68646278,	// Blue display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueY = /* 'hdby' */ 0x68646279,	// Blue display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRWhitePointX = /* 'hdwx' */ 0x68647778,	// White point in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRWhitePointY = /* 'hdwy' */ 0x68647779,	// White point in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRMaxDisplayMasteringLuminance = /* 'hdml' */ 0x68646D6C,	// Max display mastering luminance in range 1 cd/m2 - 65535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMinDisplayMasteringLuminance = /* 'hmil' */ 0x686D696C,	// Min display mastering luminance in range 0.0001 cd/m2 - 6.5535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMaximumContentLightLevel = /* 'mcll' */ 0x6D636C6C,	// Maximum Content Light Level in range 1 cd/m2 - 65535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMaximumFrameAverageLightLevel = /* 'fall' */ 0x66616C6C	// Maximum Frame Average Light Level in range 1 cd/m2 - 65535 cd/m2
+};
+
+/* Enum BMDDuplexMode - Duplex for configurable ports */
+
+typedef uint32_t BMDDuplexMode;
+enum _BMDDuplexMode {
+ bmdDuplexModeFull = /* 'fdup' */ 0x66647570,
+ bmdDuplexModeHalf = /* 'hdup' */ 0x68647570
 };
 
 /* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
@@ -288,10 +376,16 @@
 BMDDeckLinkCanOnlyAdjustOverallVideoOutputGain = /* 'ovog' */ 0x6F766F67,
 BMDDeckLinkHasVideoInputAntiAliasingFilter = /* 'aafl' */ 0x6161666C,
 BMDDeckLinkHasBypass = /* 'byps' */ 0x62797073,
- BMDDeckLinkSupportsDesktopDisplay = /* 'extd' */ 0x65787464,
 BMDDeckLinkSupportsClockTimingAdjustment = /* 'ctad' */ 0x63746164,
 BMDDeckLinkSupportsFullDuplex = /* 'fdup' */ 0x66647570,
 BMDDeckLinkSupportsFullFrameReferenceInputTimingOffset = /* 'frin' */ 0x6672696E,
+ BMDDeckLinkSupportsSMPTELevelAOutput = /* 'lvla' */ 0x6C766C61,
+ BMDDeckLinkSupportsDualLinkSDI = /* 'sdls' */ 0x73646C73,
+ BMDDeckLinkSupportsQuadLinkSDI = /* 'sqls' */ 0x73716C73,
+ BMDDeckLinkSupportsIdleOutput = /* 'idou' */ 0x69646F75,
+ BMDDeckLinkHasLTCTimecodeInput = /* 'hltc' */ 0x686C7463,
+ BMDDeckLinkSupportsDuplexModeConfiguration = /* 'dupx' */ 0x64757078,
+ BMDDeckLinkSupportsHDRMetadata = /* 'hdrm' */ 0x6864726D,
 
 /* Integers */
 
@@ -300,13 +394,20 @@
 BMDDeckLinkNumberOfSubDevices = /* 'nsbd' */ 0x6E736264,
 BMDDeckLinkSubDeviceIndex = /* 'subi' */ 0x73756269,
 BMDDeckLinkPersistentID = /* 'peid' */ 0x70656964,
+ BMDDeckLinkDeviceGroupID = /* 'dgid' */ 0x64676964,
 BMDDeckLinkTopologicalID = /* 'toid' */ 0x746F6964,
 BMDDeckLinkVideoOutputConnections = /* 'vocn' */ 0x766F636E,
 BMDDeckLinkVideoInputConnections = /* 'vicn' */ 0x7669636E,
 BMDDeckLinkAudioOutputConnections = /* 'aocn' */ 0x616F636E,
 BMDDeckLinkAudioInputConnections = /* 'aicn' */ 0x6169636E,
- BMDDeckLinkDeviceBusyState = /* 'dbst' */ 0x64627374,
 BMDDeckLinkVideoIOSupport = /* 'vios' */ 0x76696F73,	// Returns a BMDVideoIOSupport bit field
+ BMDDeckLinkDeckControlConnections = /* 'dccn' */ 0x6463636E,
+ BMDDeckLinkDeviceInterface = /* 'dbus' */ 0x64627573,	// Returns a BMDDeviceInterface
+ BMDDeckLinkAudioInputRCAChannelCount = /* 'airc' */ 0x61697263,
+ BMDDeckLinkAudioInputXLRChannelCount = /* 'aixc' */ 0x61697863,
+ BMDDeckLinkAudioOutputRCAChannelCount = /* 'aorc' */ 0x616F7263,
+ BMDDeckLinkAudioOutputXLRChannelCount = /* 'aoxc' */ 0x616F7863,
+ BMDDeckLinkPairedDevicePersistentID = /* 'ppid' */ 0x70706964,
 
 /* Floats */
 
@@ -314,10 +415,16 @@
 BMDDeckLinkVideoInputGainMaximum = /* 'vigx' */ 0x76696778,
 BMDDeckLinkVideoOutputGainMinimum = /* 'vogm' */ 0x766F676D,
 BMDDeckLinkVideoOutputGainMaximum = /* 'vogx' */ 0x766F6778,
+ BMDDeckLinkMicrophoneInputGainMinimum = /* 'migm' */ 0x6D69676D,
+ BMDDeckLinkMicrophoneInputGainMaximum = /* 'migx' */ 0x6D696778,
 
 /* Strings */
 
- BMDDeckLinkSerialPortDeviceName = /* 'slpn' */ 0x736C706E
+ BMDDeckLinkSerialPortDeviceName = /* 'slpn' */ 0x736C706E,
+ BMDDeckLinkVendorName = /* 'vndr' */ 0x766E6472,
+ BMDDeckLinkDisplayName = /* 'dspn' */ 0x6473706E,
+ BMDDeckLinkModelName = /* 'mdln' */ 0x6D646C6E,
+ BMDDeckLinkDeviceHandle = /* 'devh' */ 0x64657668
 };
 
 /* Enum BMDDeckLinkAPIInformationID - DeckLinkAPI information ID */
@@ -327,6 +434,52 @@
 BMDDeckLinkAPIVersion = /* 'vers' */ 0x76657273
 };
 
+/* Enum BMDDeckLinkStatusID - DeckLink Status ID */
+
+typedef uint32_t BMDDeckLinkStatusID;
+enum _BMDDeckLinkStatusID {
+
+ /* Integers */
+
+ bmdDeckLinkStatusDetectedVideoInputMode = /* 'dvim' */ 0x6476696D,
+ bmdDeckLinkStatusDetectedVideoInputFlags = /* 'dvif' */ 0x64766966,
+ bmdDeckLinkStatusCurrentVideoInputMode = /* 'cvim' */ 0x6376696D,
+ bmdDeckLinkStatusCurrentVideoInputPixelFormat = /* 'cvip' */ 0x63766970,
+ bmdDeckLinkStatusCurrentVideoInputFlags = /* 'cvif' */ 0x63766966,
+ bmdDeckLinkStatusCurrentVideoOutputMode = /* 'cvom' */ 0x63766F6D,
+ bmdDeckLinkStatusCurrentVideoOutputFlags = /* 'cvof' */ 0x63766F66,
+ bmdDeckLinkStatusPCIExpressLinkWidth = /* 'pwid' */ 0x70776964,
+ bmdDeckLinkStatusPCIExpressLinkSpeed = /* 'plnk' */ 0x706C6E6B,
+ bmdDeckLinkStatusLastVideoOutputPixelFormat = /* 'opix' */ 0x6F706978,
+ bmdDeckLinkStatusReferenceSignalMode = /* 'refm' */ 0x7265666D,
+ bmdDeckLinkStatusReferenceSignalFlags = /* 'reff' */ 0x72656666,
+ bmdDeckLinkStatusDuplexMode = /* 'dupx' */ 0x64757078,
+ bmdDeckLinkStatusBusy = /* 'busy' */ 0x62757379,
+
+ /* Flags */
+
+ bmdDeckLinkStatusVideoInputSignalLocked = /* 'visl' */ 0x7669736C,
+ bmdDeckLinkStatusReferenceSignalLocked = /* 'refl' */ 0x7265666C
+};
+
+/* Enum BMDDeckLinkVideoStatusFlags - */
+
+typedef uint32_t BMDDeckLinkVideoStatusFlags;
+enum _BMDDeckLinkVideoStatusFlags {
+ bmdDeckLinkVideoStatusPsF = 1 << 0,
+ bmdDeckLinkVideoStatusDualStream3D = 1 << 1
+};
+
+/* Enum BMDDuplexStatus - Duplex status of the device */
+
+typedef uint32_t BMDDuplexStatus;
+enum _BMDDuplexStatus {
+ bmdDuplexStatusFullDuplex = /* 'fdup' */ 0x66647570,
+ bmdDuplexStatusHalfDuplex = /* 'hdup' */ 0x68647570,
+ bmdDuplexStatusSimplex = /* 'splx' */ 0x73706C78,
+ bmdDuplexStatusInactive = /* 'inac' */ 0x696E6163
+};
+
 /* Enum BMDDeviceBusyState - Current device busy state */
 
 typedef uint32_t BMDDeviceBusyState;
@@ -359,7 +512,8 @@
 
 typedef uint32_t BMDNotifications;
 enum _BMDNotifications {
- bmdPreferencesChanged = /* 'pref' */ 0x70726566
+ bmdPreferencesChanged = /* 'pref' */ 0x70726566,
+ bmdStatusChanged = /* 'stat' */ 0x73746174
 };
 
 #if defined(__cplusplus)
@@ -368,23 +522,31 @@
 
 class IDeckLinkVideoOutputCallback;
 class IDeckLinkInputCallback;
+class IDeckLinkEncoderInputCallback;
 class IDeckLinkMemoryAllocator;
 class IDeckLinkAudioOutputCallback;
 class IDeckLinkIterator;
 class IDeckLinkAPIInformation;
 class IDeckLinkOutput;
 class IDeckLinkInput;
+class IDeckLinkEncoderInput;
 class IDeckLinkVideoFrame;
 class IDeckLinkMutableVideoFrame;
 class IDeckLinkVideoFrame3DExtensions;
+class IDeckLinkVideoFrameMetadataExtensions;
 class IDeckLinkVideoInputFrame;
 class IDeckLinkVideoFrameAncillary;
+class IDeckLinkEncoderPacket;
+class IDeckLinkEncoderVideoPacket;
+class IDeckLinkEncoderAudioPacket;
+class IDeckLinkH265NALPacket;
 class IDeckLinkAudioInputPacket;
 class IDeckLinkScreenPreviewCallback;
 class IDeckLinkGLScreenPreviewHelper;
 class IDeckLinkNotificationCallback;
 class IDeckLinkNotification;
 class IDeckLinkAttributes;
+class IDeckLinkStatus;
 class IDeckLinkKeyer;
 class IDeckLinkVideoConversion;
 class IDeckLinkDeviceNotificationCallback;
@@ -414,6 +576,19 @@
 virtual ~IDeckLinkInputCallback () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderInputCallback - Frame arrival callback. */
+
+class IDeckLinkEncoderInputCallback : public IUnknown
+{
+public:
+ virtual HRESULT VideoInputSignalChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+ virtual HRESULT VideoPacketArrived (/* in */ IDeckLinkEncoderVideoPacket* videoPacket) = 0;
+ virtual HRESULT AudioPacketArrived (/* in */ IDeckLinkEncoderAudioPacket* audioPacket) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderInputCallback () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkMemoryAllocator - Memory allocator for video frames. */
 
 class IDeckLinkMemoryAllocator : public IUnknown
@@ -552,6 +727,43 @@
 virtual ~IDeckLinkInput () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkEncoderInput : public IUnknown
+{
+public:
+ virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0;
+ virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+ /* Video Input */
+
+ virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0;
+ virtual HRESULT DisableVideoInput (void) = 0;
+ virtual HRESULT GetAvailablePacketsCount (/* out */ uint32_t *availablePacketsCount) = 0;
+ virtual HRESULT SetMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+
+ /* Audio Input */
+
+ virtual HRESULT EnableAudioInput (/* in */ BMDAudioFormat audioFormat, /* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0;
+ virtual HRESULT DisableAudioInput (void) = 0;
+ virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+ /* Input Control */
+
+ virtual HRESULT StartStreams (void) = 0;
+ virtual HRESULT StopStreams (void) = 0;
+ virtual HRESULT PauseStreams (void) = 0;
+ virtual HRESULT FlushStreams (void) = 0;
+ virtual HRESULT SetCallback (/* in */ IDeckLinkEncoderInputCallback *theCallback) = 0;
+
+ /* Hardware Timing */
+
+ virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderInput () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
 
 class IDeckLinkVideoFrame : public IUnknown
@@ -599,6 +811,20 @@
 virtual ~IDeckLinkVideoFrame3DExtensions () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkVideoFrameMetadataExtensions - Optional interface implemented on IDeckLinkVideoFrame to support frame metadata such as HDMI HDR information */
+
+class IDeckLinkVideoFrameMetadataExtensions : public IUnknown
+{
+public:
+ virtual HRESULT GetInt (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ int64_t *value) = 0;
+ virtual HRESULT GetFloat (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ double *value) = 0;
+ virtual HRESULT GetFlag (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ bool* value) = 0;
+ virtual HRESULT GetString (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ const char **value) = 0;
+
+protected:
+ virtual ~IDeckLinkVideoFrameMetadataExtensions () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
 
 class IDeckLinkVideoInputFrame : public IDeckLinkVideoFrame
@@ -625,6 +851,58 @@
 virtual ~IDeckLinkVideoFrameAncillary () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderPacket - Interface to encapsulate an encoded packet. */
+
+class IDeckLinkEncoderPacket : public IUnknown
+{
+public:
+ virtual HRESULT GetBytes (/* out */ void **buffer) = 0;
+ virtual long GetSize (void) = 0;
+ virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* in */ BMDTimeScale timeScale) = 0;
+ virtual BMDPacketType GetPacketType (void) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderPacket () {} // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkEncoderVideoPacket - Provided by the IDeckLinkEncoderInput video packet arrival callback. */
+
+class IDeckLinkEncoderVideoPacket : public IDeckLinkEncoderPacket
+{
+public:
+ virtual BMDPixelFormat GetPixelFormat (void) = 0;
+ virtual HRESULT GetHardwareReferenceTimestamp (/* in */ BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0;
+
+ virtual HRESULT GetTimecode (/* in */ BMDTimecodeFormat format, /* out */ IDeckLinkTimecode **timecode) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderVideoPacket () {} // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkEncoderAudioPacket - Provided by the IDeckLinkEncoderInput audio packet arrival callback. */
+
+class IDeckLinkEncoderAudioPacket : public IDeckLinkEncoderPacket
+{
+public:
+ virtual BMDAudioFormat GetAudioFormat (void) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderAudioPacket () {} // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkH265NALPacket - Obtained through QueryInterface() on an IDeckLinkEncoderVideoPacket object */
+
+class IDeckLinkH265NALPacket : public IDeckLinkEncoderVideoPacket
+{
+public:
+ virtual HRESULT GetUnitType (/* out */ uint8_t *unitType) = 0;
+ virtual HRESULT GetBytesNoPrefix (/* out */ void **buffer) = 0;
+ virtual long GetSizeNoPrefix (void) = 0;
+
+protected:
+ virtual ~IDeckLinkH265NALPacket () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkAudioInputPacket - Provided by the IDeckLinkInput callback. */
 
 class IDeckLinkAudioInputPacket : public IUnknown
@@ -697,6 +975,21 @@
 virtual ~IDeckLinkAttributes () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkStatus - DeckLink Status interface */
+
+class IDeckLinkStatus : public IUnknown
+{
+public:
+ virtual HRESULT GetFlag (/* in */ BMDDeckLinkStatusID statusID, /* out */ bool *value) = 0;
+ virtual HRESULT GetInt (/* in */ BMDDeckLinkStatusID statusID, /* out */ int64_t *value) = 0;
+ virtual HRESULT GetFloat (/* in */ BMDDeckLinkStatusID statusID, /* out */ double *value) = 0;
+ virtual HRESULT GetString (/* in */ BMDDeckLinkStatusID statusID, /* out */ const char **value) = 0;
+ virtual HRESULT GetBytes (/* in */ BMDDeckLinkStatusID statusID, /* out */ void *buffer, /* in, out */ uint32_t *bufferSize) = 0;
+
+protected:
+ virtual ~IDeckLinkStatus () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkKeyer - DeckLink Keyer interface */
 
 class IDeckLinkKeyer : public IUnknown

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -42,7 +42,8 @@
 
 // Interface ID Declarations
 
-BMD_CONST REFIID IID_IDeckLinkConfiguration                       = /* 1E69FCF6-4203-4936-8076-2A9F4CFD50CB */ {0x1E,0x69,0xFC,0xF6,0x42,0x03,0x49,0x36,0x80,0x76,0x2A,0x9F,0x4C,0xFD,0x50,0xCB};
+BMD_CONST REFIID IID_IDeckLinkConfiguration                       = /* CB71734A-FE37-4E8D-8E13-802133A1C3F2 */ {0xCB,0x71,0x73,0x4A,0xFE,0x37,0x4E,0x8D,0x8E,0x13,0x80,0x21,0x33,0xA1,0xC3,0xF2};
+BMD_CONST REFIID IID_IDeckLinkEncoderConfiguration                = /* 138050E5-C60A-4552-BF3F-0F358049327E */ {0x13,0x80,0x50,0xE5,0xC6,0x0A,0x45,0x52,0xBF,0x3F,0x0F,0x35,0x80,0x49,0x32,0x7E};
 
 /* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
 
@@ -62,6 +63,7 @@
     bmdDeckLinkConfigHDMI3DPackingFormat                         = /* '3dpf' */ 0x33647066,
     bmdDeckLinkConfigBypass                                      = /* 'byps' */ 0x62797073,
     bmdDeckLinkConfigClockTimingAdjustment                       = /* 'ctad' */ 0x63746164,
+    bmdDeckLinkConfigDuplexMode                                  = /* 'dupx' */ 0x64757078,
 
     /* Audio Input/Output Flags */
 
@@ -72,9 +74,10 @@
     bmdDeckLinkConfigFieldFlickerRemoval                         = /* 'fdfr' */ 0x66646672,
     bmdDeckLinkConfigHD1080p24ToHD1080i5994Conversion            = /* 'to59' */ 0x746F3539,
     bmdDeckLinkConfig444SDIVideoOutput                           = /* '444o' */ 0x3434346F,
-    bmdDeckLinkConfigSingleLinkVideoOutput                       = /* 'sglo' */ 0x73676C6F,
     bmdDeckLinkConfigBlackVideoOutputDuringCapture               = /* 'bvoc' */ 0x62766F63,
     bmdDeckLinkConfigLowLatencyVideoOutput                       = /* 'llvo' */ 0x6C6C766F,
+    bmdDeckLinkConfigDownConversionOnAllAnalogOutput             = /* 'caao' */ 0x6361616F,
+    bmdDeckLinkConfigSMPTELevelAOutput                           = /* 'smta' */ 0x736D7461,
 
     /* Video Output Integers */
 
@@ -85,6 +88,7 @@
     bmdDeckLinkConfigVideoOutputIdleOperation                    = /* 'voio' */ 0x766F696F,
     bmdDeckLinkConfigDefaultVideoOutputMode                      = /* 'dvom' */ 0x64766F6D,
     bmdDeckLinkConfigDefaultVideoOutputModeFlags                 = /* 'dvof' */ 0x64766F66,
+    bmdDeckLinkConfigSDIOutputLinkConfiguration                  = /* 'solc' */ 0x736F6C63,
 
     /* Video Output Floats */
 
@@ -100,6 +104,7 @@
 
     bmdDeckLinkConfigVideoInputScanning                          = /* 'visc' */ 0x76697363,	// Applicable to H264 Pro Recorder only
     bmdDeckLinkConfigUseDedicatedLTCInput                        = /* 'dltc' */ 0x646C7463,	// Use timecode from LTC input instead of SDI stream
+    bmdDeckLinkConfigSDIInput3DPayloadOverride                   = /* '3dds' */ 0x33646473,
 
     /* Video Input Integers */
 
@@ -122,6 +127,10 @@
     bmdDeckLinkConfigVideoInputSVideoLumaGain                    = /* 'islg' */ 0x69736C67,
     bmdDeckLinkConfigVideoInputSVideoChromaGain                  = /* 'iscg' */ 0x69736367,
 
+    /* Audio Input Flags */
+
+    bmdDeckLinkConfigMicrophonePhantomPower                      = /* 'mphp' */ 0x6D706870,
+
     /* Audio Input Integers */
 
     bmdDeckLinkConfigAudioInputConnection                        = /* 'aicn' */ 0x6169636E,
@@ -133,6 +142,7 @@
     bmdDeckLinkConfigAnalogAudioInputScaleChannel3               = /* 'ais3' */ 0x61697333,
     bmdDeckLinkConfigAnalogAudioInputScaleChannel4               = /* 'ais4' */ 0x61697334,
     bmdDeckLinkConfigDigitalAudioInputScale                      = /* 'dais' */ 0x64616973,
+    bmdDeckLinkConfigMicrophoneInputGain                         = /* 'micg' */ 0x6D696367,
 
     /* Audio Output Integers */
 
@@ -144,12 +154,55 @@
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel2              = /* 'aos2' */ 0x616F7332,
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel3              = /* 'aos3' */ 0x616F7333,
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel4              = /* 'aos4' */ 0x616F7334,
-    bmdDeckLinkConfigDigitalAudioOutputScale                     = /* 'daos' */ 0x64616F73
+    bmdDeckLinkConfigDigitalAudioOutputScale                     = /* 'daos' */ 0x64616F73,
+    bmdDeckLinkConfigHeadphoneVolume                             = /* 'hvol' */ 0x68766F6C,
+
+    /* Device Information Strings */
+
+    bmdDeckLinkConfigDeviceInformationLabel                      = /* 'dila' */ 0x64696C61,
+    bmdDeckLinkConfigDeviceInformationSerialNumber               = /* 'disn' */ 0x6469736E,
+    bmdDeckLinkConfigDeviceInformationCompany                    = /* 'dico' */ 0x6469636F,
+    bmdDeckLinkConfigDeviceInformationPhone                      = /* 'diph' */ 0x64697068,
+    bmdDeckLinkConfigDeviceInformationEmail                      = /* 'diem' */ 0x6469656D,
+    bmdDeckLinkConfigDeviceInformationDate                       = /* 'dida' */ 0x64696461,
+
+    /* Deck Control Integers */
+
+    bmdDeckLinkConfigDeckControlConnection                       = /* 'dcco' */ 0x6463636F
+};
+
+/* Enum BMDDeckLinkEncoderConfigurationID - DeckLink Encoder Configuration ID */
+
+typedef uint32_t BMDDeckLinkEncoderConfigurationID;
+enum _BMDDeckLinkEncoderConfigurationID {
+
+    /* Video Encoder Integers */
+
+    bmdDeckLinkEncoderConfigPreferredBitDepth                    = /* 'epbr' */ 0x65706272,
+    bmdDeckLinkEncoderConfigFrameCodingMode                      = /* 'efcm' */ 0x6566636D,
+
+    /* HEVC/H.265 Encoder Integers */
+
+    bmdDeckLinkEncoderConfigH265TargetBitrate                    = /* 'htbr' */ 0x68746272,
+
+    /* DNxHR/DNxHD Compression ID */
+
+    bmdDeckLinkEncoderConfigDNxHRCompressionID                   = /* 'dcid' */ 0x64636964,
+
+    /* DNxHR/DNxHD Level */
+
+    bmdDeckLinkEncoderConfigDNxHRLevel                           = /* 'dlev' */ 0x646C6576,
+
+    /* Encoded Sample Decriptions */
+
+    bmdDeckLinkEncoderConfigMPEG4SampleDescription               = /* 'stsE' */ 0x73747345,	// Full MPEG4 sample description (aka SampleEntry of an 'stsd' atom-box). Useful for MediaFoundation, QuickTime, MKV and more
+    bmdDeckLinkEncoderConfigMPEG4CodecSpecificDesc               = /* 'esds' */ 0x65736473	// Sample description extensions only (atom stream, each with size and fourCC header). Useful for AVFoundation, VideoToolbox, MKV and more
 };
 
 // Forward Declarations
 
 class IDeckLinkConfiguration;
+class IDeckLinkEncoderConfiguration;
 
 /* Interface IDeckLinkConfiguration - DeckLink Configuration interface */
 
@@ -170,6 +223,25 @@
     virtual ~IDeckLinkConfiguration () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderConfiguration - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */
+
+class IDeckLinkEncoderConfiguration : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ const char *value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ const char **value) = 0;
+    virtual HRESULT GetBytes (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ void *buffer /* optional */, /* in, out */ uint32_t *bufferSize) = 0;
+
+protected:
+    virtual ~IDeckLinkEncoderConfiguration () {} // call Release method to drop reference count
+};
+
 /* Functions */
 
 extern "C" {

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration_v10_2.h Added

@@ -0,0 +1,60 @@
+/* -LICENSE-START-
+** Copyright (c) 2014 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_2_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_2_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkConfiguration_v10_2                = /* C679A35B-610C-4D09-B748-1D0478100FC0 */ {0xC6,0x79,0xA3,0x5B,0x61,0x0C,0x4D,0x09,0xB7,0x48,0x1D,0x04,0x78,0x10,0x0F,0xC0};
+
+// Forward Declarations
+
+class IDeckLinkConfiguration_v10_2;
+
+/* Interface IDeckLinkConfiguration_v10_2 - DeckLink Configuration interface */
+
+class IDeckLinkConfiguration_v10_2 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ const char *value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ const char **value) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+protected:
+    virtual ~IDeckLinkConfiguration_v10_2 () {} // call Release method to drop reference count
+};
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_2_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration_v10_4.h Added

@@ -0,0 +1,63 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_4_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_4_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkConfiguration_v10_4                       = /* 1E69FCF6-4203-4936-8076-2A9F4CFD50CB */ {0x1E,0x69,0xFC,0xF6,0x42,0x03,0x49,0x36,0x80,0x76,0x2A,0x9F,0x4C,0xFD,0x50,0xCB};
+
+
+//
+// Forward Declarations
+
+class IDeckLinkConfiguration_v10_4;
+
+/* Interface IDeckLinkConfiguration_v10_4 - DeckLink Configuration interface */
+
+class IDeckLinkConfiguration_v10_4 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ const char *value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ const char **value) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+protected:
+    virtual ~IDeckLinkConfiguration_v10_4 () {} // call Release method to drop reference count
+};
+
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_4_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration_v10_5.h Added

@@ -0,0 +1,60 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_5_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_5_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkEncoderConfiguration_v10_5          = /* 67455668-0848-45DF-8D8E-350A77C9A028 */ {0x67,0x45,0x56,0x68,0x08,0x48,0x45,0xDF,0x8D,0x8E,0x35,0x0A,0x77,0xC9,0xA0,0x28};
+
+// Forward Declarations
+
+class IDeckLinkEncoderConfiguration_v10_5;
+
+/* Interface IDeckLinkEncoderConfiguration_v10_5 - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */
+
+class IDeckLinkEncoderConfiguration_v10_5 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ const char *value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ const char **value) = 0;
+    virtual HRESULT GetDecoderConfigurationInfo (/* out */ void *buffer, /* in */ long bufferSize, /* out */ long *returnedSize) = 0;
+
+protected:
+    virtual ~IDeckLinkEncoderConfiguration_v10_5 () {} // call Release method to drop reference count
+};
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_5_H) */

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h Changed

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h Changed

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDispatch_v7_6.cpp Added

@@ -0,0 +1,109 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+**/
+
+#include <stdio.h>
+#include <pthread.h>
+#include <dlfcn.h>
+
+#include "DeckLinkAPI_v7_6.h"
+
+#define kDeckLinkAPI_Name "libDeckLinkAPI.so"
+#define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
+
+typedef IDeckLinkIterator* (*CreateIteratorFunc_v7_6)(void);
+typedef IDeckLinkGLScreenPreviewHelper_v7_6* (*CreateOpenGLScreenPreviewHelperFunc_v7_6)(void);
+typedef IDeckLinkVideoConversion_v7_6* (*CreateVideoConversionInstanceFunc_v7_6)(void);
+
+static pthread_once_t					gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
+static pthread_once_t					gPreviewOnceControl = PTHREAD_ONCE_INIT;
+
+static CreateIteratorFunc_v7_6						gCreateIteratorFunc			= NULL;
+static CreateOpenGLScreenPreviewHelperFunc_v7_6		gCreateOpenGLPreviewFunc	= NULL;
+static CreateVideoConversionInstanceFunc_v7_6		gCreateVideoConversionFunc	= NULL;
+
+void	InitDeckLinkAPI_v7_6 (void)
+{
+	void *libraryHandle;
+
+	libraryHandle = dlopen(kDeckLinkAPI_Name, RTLD_NOW|RTLD_GLOBAL);
+	if (!libraryHandle)
+	{
+		fprintf(stderr, "%s\n", dlerror());
+		return;
+	}
+
+	gCreateIteratorFunc = (CreateIteratorFunc_v7_6)dlsym(libraryHandle, "CreateDeckLinkIteratorInstance");
+	if (!gCreateIteratorFunc)
+		fprintf(stderr, "%s\n", dlerror());
+	gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc_v7_6)dlsym(libraryHandle, "CreateVideoConversionInstance");
+	if (!gCreateVideoConversionFunc)
+		fprintf(stderr, "%s\n", dlerror());
+}
+
+void	InitDeckLinkPreviewAPI_v7_6 (void)
+{
+	void *libraryHandle;
+
+	libraryHandle = dlopen(KDeckLinkPreviewAPI_Name, RTLD_NOW|RTLD_GLOBAL);
+	if (!libraryHandle)
+	{
+		fprintf(stderr, "%s\n", dlerror());
+		return;
+	}
+	gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc_v7_6)dlsym(libraryHandle, "CreateOpenGLScreenPreviewHelper");
+	if (!gCreateOpenGLPreviewFunc)
+		fprintf(stderr, "%s\n", dlerror());
+}
+
+IDeckLinkIterator*		CreateDeckLinkIteratorInstance_v7_6 (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+
+	if (gCreateIteratorFunc == NULL)
+		return NULL;
+	return gCreateIteratorFunc();
+}
+
+IDeckLinkGLScreenPreviewHelper_v7_6*		CreateOpenGLScreenPreviewHelper_v7_6 (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+	pthread_once(&gPreviewOnceControl, InitDeckLinkPreviewAPI_v7_6);
+
+	if (gCreateOpenGLPreviewFunc == NULL)
+		return NULL;
+	return gCreateOpenGLPreviewFunc();
+}
+
+IDeckLinkVideoConversion_v7_6* CreateVideoConversionInstance_v7_6 (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+
+	if (gCreateVideoConversionFunc == NULL)
+		return NULL;
+	return gCreateVideoConversionFunc();
+}
+

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDispatch_v8_0.cpp Added

@@ -0,0 +1,133 @@
+/* -LICENSE-START-
+** Copyright (c) 2011 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+**/
+
+#include <stdio.h>
+#include <pthread.h>
+#include <dlfcn.h>
+
+#include "DeckLinkAPI_v8_0.h"
+
+#define kDeckLinkAPI_Name "libDeckLinkAPI.so"
+#define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
+
+typedef IDeckLinkIterator_v8_0* (*CreateIteratorFunc)(void);
+typedef IDeckLinkAPIInformation* (*CreateAPIInformationFunc)(void);
+typedef IDeckLinkGLScreenPreviewHelper* (*CreateOpenGLScreenPreviewHelperFunc)(void);
+typedef IDeckLinkVideoConversion* (*CreateVideoConversionInstanceFunc)(void);
+
+static pthread_once_t					gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
+static pthread_once_t					gPreviewOnceControl = PTHREAD_ONCE_INIT;
+
+static bool								gLoadedDeckLinkAPI = false;
+
+static CreateIteratorFunc					gCreateIteratorFunc = NULL;
+static CreateAPIInformationFunc				gCreateAPIInformationFunc = NULL;
+static CreateOpenGLScreenPreviewHelperFunc	gCreateOpenGLPreviewFunc = NULL;
+static CreateVideoConversionInstanceFunc	gCreateVideoConversionFunc	= NULL;
+
+void	InitDeckLinkAPI (void)
+{
+	void *libraryHandle;
+
+	libraryHandle = dlopen(kDeckLinkAPI_Name, RTLD_NOW|RTLD_GLOBAL);
+	if (!libraryHandle)
+	{
+		fprintf(stderr, "%s\n", dlerror());
+		return;
+	}
+
+	gLoadedDeckLinkAPI = true;
+
+	gCreateIteratorFunc = (CreateIteratorFunc)dlsym(libraryHandle, "CreateDeckLinkIteratorInstance_0001");
+	if (!gCreateIteratorFunc)
+		fprintf(stderr, "%s\n", dlerror());
+	gCreateAPIInformationFunc = (CreateAPIInformationFunc)dlsym(libraryHandle, "CreateDeckLinkAPIInformationInstance_0001");
+	if (!gCreateAPIInformationFunc)
+		fprintf(stderr, "%s\n", dlerror());
+	gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc)dlsym(libraryHandle, "CreateVideoConversionInstance_0001");
+	if (!gCreateVideoConversionFunc)
+		fprintf(stderr, "%s\n", dlerror());
+}
+
+void	InitDeckLinkPreviewAPI (void)
+{
+	void *libraryHandle;
+
+	libraryHandle = dlopen(KDeckLinkPreviewAPI_Name, RTLD_NOW|RTLD_GLOBAL);
+	if (!libraryHandle)
+	{
+		fprintf(stderr, "%s\n", dlerror());
+		return;
+	}
+	gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc)dlsym(libraryHandle, "CreateOpenGLScreenPreviewHelper_0001");
+	if (!gCreateOpenGLPreviewFunc)
+		fprintf(stderr, "%s\n", dlerror());
+}
+
+bool		IsDeckLinkAPIPresent (void)
+{
+	// If the DeckLink API dynamic library was successfully loaded, return this knowledge to the caller
+	return gLoadedDeckLinkAPI;
+}
+
+IDeckLinkIterator_v8_0*		CreateDeckLinkIteratorInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateIteratorFunc == NULL)
+		return NULL;
+	return gCreateIteratorFunc();
+}
+
+IDeckLinkAPIInformation*	CreateDeckLinkAPIInformationInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateAPIInformationFunc == NULL)
+		return NULL;
+	return gCreateAPIInformationFunc();
+}
+
+IDeckLinkGLScreenPreviewHelper*		CreateOpenGLScreenPreviewHelper (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+	pthread_once(&gPreviewOnceControl, InitDeckLinkPreviewAPI);
+
+	if (gCreateOpenGLPreviewFunc == NULL)
+		return NULL;
+	return gCreateOpenGLPreviewFunc();
+}
+
+IDeckLinkVideoConversion* CreateVideoConversionInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateVideoConversionFunc == NULL)
+		return NULL;
+	return gCreateVideoConversionFunc();
+}
+

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -135,7 +135,12 @@
     bmdFormat12BitRGB                                            = /* 'R12B' */ 0x52313242,	// Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component
     bmdFormat12BitRGBLE                                          = /* 'R12L' */ 0x5231324C,	// Little-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component
     bmdFormat10BitRGBXLE                                         = /* 'R10l' */ 0x5231306C,	// Little-endian 10-bit RGB with SMPTE video levels (64-940)
-    bmdFormat10BitRGBX                                           = /* 'R10b' */ 0x52313062	// Big-endian 10-bit RGB with SMPTE video levels (64-940)
+    bmdFormat10BitRGBX                                           = /* 'R10b' */ 0x52313062,	// Big-endian 10-bit RGB with SMPTE video levels (64-940)
+    bmdFormatH265                                                = /* 'hev1' */ 0x68657631,	// High Efficiency Video Coding (HEVC/h.265)
+
+    /* AVID DNxHR */
+
+    bmdFormatDNxHR                                               = /* 'AVdh' */ 0x41566468
 };
 
 /* Enum BMDDisplayModeFlags - Flags to describe the characteristics of an IDeckLinkDisplayMode. */

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -77,7 +77,17 @@
 bmdAudioConnectionAESEBU = 1 << 1,
 bmdAudioConnectionAnalog = 1 << 2,
 bmdAudioConnectionAnalogXLR = 1 << 3,
- bmdAudioConnectionAnalogRCA = 1 << 4
+ bmdAudioConnectionAnalogRCA = 1 << 4,
+ bmdAudioConnectionMicrophone = 1 << 5,
+ bmdAudioConnectionHeadphones = 1 << 6
+};
+
+/* Enum BMDDeckControlConnection - Deck control connections */
+
+typedef uint32_t BMDDeckControlConnection;
+enum _BMDDeckControlConnection {
+ bmdDeckControlConnectionRS422Remote1 = 1 << 0,
+ bmdDeckControlConnectionRS422Remote2 = 1 << 1
 };
 
 // Forward Declarations

obs-studio-0.16.2.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h Changed

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v10_2.h Added

@@ -0,0 +1,55 @@
+/* -LICENSE-START-
+** Copyright (c) 2014 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_2_H
+#define BMD_DECKLINKAPI_v10_2_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef uint32_t BMDDeckLinkConfigurationID_v10_2;
+enum  _BMDDeckLinkConfigurationID_v10_2 {
+    /* Video output flags */
+
+    bmdDeckLinkConfig3GBpsVideoOutput_v10_2                      = '3gbs',
+};
+
+/* Enum BMDAudioConnection_v10_2 - Audio connection types */
+
+typedef uint32_t BMDAudioConnection_v10_2;
+enum _BMDAudioConnection_v10_2 {
+    bmdAudioConnectionEmbedded_v10_2                             = /* 'embd' */ 0x656D6264,
+    bmdAudioConnectionAESEBU_v10_2                               = /* 'aes ' */ 0x61657320,
+    bmdAudioConnectionAnalog_v10_2                               = /* 'anlg' */ 0x616E6C67,
+    bmdAudioConnectionAnalogXLR_v10_2                            = /* 'axlr' */ 0x61786C72,
+    bmdAudioConnectionAnalogRCA_v10_2                            = /* 'arca' */ 0x61726361
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_2_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v10_4.h Added

@@ -0,0 +1,45 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_4_H
+#define BMD_DECKLINKAPI_v10_4_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef uint32_t BMDDeckLinkConfigurationID_v10_4;
+enum _BMDDeckLinkConfigurationID_v10_4 {
+
+    /* Video output flags */
+
+    bmdDeckLinkConfigSingleLinkVideoOutput_v10_4                       = /* 'sglo' */ 0x73676C6F,
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_4_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v10_5.h Added

@@ -0,0 +1,46 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_5_H
+#define BMD_DECKLINKAPI_v10_5_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
+
+typedef uint32_t BMDDeckLinkAttributeID_v10_5;
+enum _BMDDeckLinkAttributeID_v10_5 {
+
+    /* Integers */
+
+    BMDDeckLinkDeviceBusyState_v10_5                             = /* 'dbst' */ 0x64627374,
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_5_H) */
+

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v10_6.h Added

@@ -0,0 +1,50 @@
+/* -LICENSE-START-
+** Copyright (c) 2016 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_6_H
+#define BMD_DECKLINKAPI_v10_6_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
+
+typedef uint32_t BMDDeckLinkAttributeID_c10_6;
+enum _BMDDeckLinkAttributeID_v10_6 {
+
+    /* Flags */
+
+    BMDDeckLinkSupportsDesktopDisplay_v10_6                      = /* 'extd' */ 0x65787464,
+};
+
+typedef uint32_t BMDIdleVideoOutputOperation_v10_6;
+enum _BMDIdleVideoOutputOperation_v10_6 {
+    bmdIdleVideoOutputDesktop_v10_6                              = /* 'desk' */ 0x6465736B
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_6_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v7_1.h Added

@@ -0,0 +1,198 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v7_1.h */
+
+#ifndef __DeckLink_API_v7_1_h__
+#define __DeckLink_API_v7_1_h__
+
+#include "DeckLinkAPI.h"
+
+// "B28131B6-59AC-4857-B5AC-CD75D5883E2F"
+#define IID_IDeckLinkDisplayModeIterator_v7_1	(REFIID){0xB2,0x81,0x31,0xB6,0x59,0xAC,0x48,0x57,0xB5,0xAC,0xCD,0x75,0xD5,0x88,0x3E,0x2F}
+
+// "AF0CD6D5-8376-435E-8433-54F9DD530AC3"
+#define IID_IDeckLinkDisplayMode_v7_1			(REFIID){0xAF,0x0C,0xD6,0xD5,0x83,0x76,0x43,0x5E,0x84,0x33,0x54,0xF9,0xDD,0x53,0x0A,0xC3}
+
+// "EBD01AFA-E4B0-49C6-A01D-EDB9D1B55FD9"
+#define IID_IDeckLinkVideoOutputCallback_v7_1	(REFIID){0xEB,0xD0,0x1A,0xFA,0xE4,0xB0,0x49,0xC6,0xA0,0x1D,0xED,0xB9,0xD1,0xB5,0x5F,0xD9}
+
+// "7F94F328-5ED4-4E9F-9729-76A86BDC99CC"
+#define IID_IDeckLinkInputCallback_v7_1			(REFIID){0x7F,0x94,0xF3,0x28,0x5E,0xD4,0x4E,0x9F,0x97,0x29,0x76,0xA8,0x6B,0xDC,0x99,0xCC}
+
+// "AE5B3E9B-4E1E-4535-B6E8-480FF52F6CE5"
+#define IID_IDeckLinkOutput_v7_1				(REFIID){0xAE,0x5B,0x3E,0x9B,0x4E,0x1E,0x45,0x35,0xB6,0xE8,0x48,0x0F,0xF5,0x2F,0x6C,0xE5}
+
+// "2B54EDEF-5B32-429F-BA11-BB990596EACD"
+#define IID_IDeckLinkInput_v7_1					(REFIID){0x2B,0x54,0xED,0xEF,0x5B,0x32,0x42,0x9F,0xBA,0x11,0xBB,0x99,0x05,0x96,0xEA,0xCD}
+
+// "333F3A10-8C2D-43CF-B79D-46560FEEA1CE"
+#define IID_IDeckLinkVideoFrame_v7_1			(REFIID){0x33,0x3F,0x3A,0x10,0x8C,0x2D,0x43,0xCF,0xB7,0x9D,0x46,0x56,0x0F,0xEE,0xA1,0xCE}
+
+// "C8B41D95-8848-40EE-9B37-6E3417FB114B"
+#define IID_IDeckLinkVideoInputFrame_v7_1		(REFIID){0xC8,0xB4,0x1D,0x95,0x88,0x48,0x40,0xEE,0x9B,0x37,0x6E,0x34,0x17,0xFB,0x11,0x4B}
+
+// "C86DE4F6-A29F-42E3-AB3A-1363E29F0788"
+#define IID_IDeckLinkAudioInputPacket_v7_1		(REFIID){0xC8,0x6D,0xE4,0xF6,0xA2,0x9F,0x42,0xE3,0xAB,0x3A,0x13,0x63,0xE2,0x9F,0x07,0x88}
+
+#if defined(__cplusplus)
+
+class IDeckLinkDisplayModeIterator_v7_1;
+class IDeckLinkDisplayMode_v7_1;
+class IDeckLinkVideoFrame_v7_1;
+class IDeckLinkVideoInputFrame_v7_1;
+class IDeckLinkAudioInputPacket_v7_1;
+
+class IDeckLinkDisplayModeIterator_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT	STDMETHODCALLTYPE	Next (IDeckLinkDisplayMode_v7_1* *deckLinkDisplayMode) = 0;
+};
+
+
+class IDeckLinkDisplayMode_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT			STDMETHODCALLTYPE	GetName (const char **name) = 0;
+	virtual	BMDDisplayMode	STDMETHODCALLTYPE	GetDisplayMode () = 0;
+	virtual	long			STDMETHODCALLTYPE	GetWidth () = 0;
+	virtual	long			STDMETHODCALLTYPE	GetHeight () = 0;
+	virtual	HRESULT			STDMETHODCALLTYPE	GetFrameRate (BMDTimeValue *frameDuration, BMDTimeScale *timeScale) = 0;
+};
+
+class IDeckLinkVideoOutputCallback_v7_1 : public IUnknown
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE	ScheduledFrameCompleted (IDeckLinkVideoFrame_v7_1* completedFrame, BMDOutputFrameCompletionResult result) = 0;
+};
+
+class IDeckLinkInputCallback_v7_1 : public IUnknown
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE	VideoInputFrameArrived (IDeckLinkVideoInputFrame_v7_1* videoFrame, IDeckLinkAudioInputPacket_v7_1* audioPacket) = 0;
+};
+
+// IDeckLinkOutput_v7_1.  Created by QueryInterface from IDeckLink.
+class IDeckLinkOutput_v7_1 : public IUnknown
+{
+public:
+	// Display mode predicates
+	virtual	HRESULT	STDMETHODCALLTYPE	DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDDisplayModeSupport *result) = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	GetDisplayModeIterator (IDeckLinkDisplayModeIterator_v7_1* *iterator) = 0;
+
+
+	// Video output
+	virtual HRESULT STDMETHODCALLTYPE	EnableVideoOutput (BMDDisplayMode displayMode) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableVideoOutput () = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	SetVideoOutputFrameMemoryAllocator (IDeckLinkMemoryAllocator* theAllocator) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1* *outFrame) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	CreateVideoFrameFromBuffer (void* buffer, int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1* *outFrame) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	DisplayVideoFrameSync (IDeckLinkVideoFrame_v7_1* theFrame) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ScheduleVideoFrame (IDeckLinkVideoFrame_v7_1* theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	SetScheduledFrameCompletionCallback (IDeckLinkVideoOutputCallback_v7_1* theCallback) = 0;
+
+
+	// Audio output
+	virtual HRESULT STDMETHODCALLTYPE	EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableAudioOutput () = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	WriteAudioSamplesSync (void* buffer, uint32_t sampleFrameCount, uint32_t *sampleFramesWritten) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	BeginAudioPreroll () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	EndAudioPreroll () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ScheduleAudioSamples (void* buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, uint32_t *sampleFramesWritten) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	GetBufferedAudioSampleFrameCount (uint32_t *bufferedSampleCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	FlushBufferedAudioSamples () = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	SetAudioCallback (IDeckLinkAudioOutputCallback* theCallback) = 0;
+
+
+	// Output control
+	virtual HRESULT STDMETHODCALLTYPE	StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, BMDTimeValue *elapsedTimeSinceSchedulerBegan) = 0;
+};
+
+// IDeckLinkInput_v7_1.  Created by QueryInterface from IDeckLink.
+class IDeckLinkInput_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT	STDMETHODCALLTYPE	DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDDisplayModeSupport *result) = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	GetDisplayModeIterator (IDeckLinkDisplayModeIterator_v7_1 **iterator) = 0;
+
+	// Video input
+	virtual HRESULT STDMETHODCALLTYPE	EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableVideoInput () = 0;
+
+	// Audio input
+	virtual HRESULT STDMETHODCALLTYPE	EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableAudioInput () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ReadAudioSamples (void* buffer, uint32_t sampleFrameCount, uint32_t *sampleFramesRead, BMDTimeValue *audioPacketTime, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	GetBufferedAudioSampleFrameCount (uint32_t *bufferedSampleCount) = 0;
+
+	// Input control
+	virtual HRESULT	STDMETHODCALLTYPE	StartStreams () = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	StopStreams () = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	PauseStreams () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	SetCallback (IDeckLinkInputCallback_v7_1* theCallback) = 0;
+};
+
+// IDeckLinkVideoFrame_v7_1.  Created by IDeckLinkOutput::CreateVideoFrame.
+class IDeckLinkVideoFrame_v7_1 : public IUnknown
+{
+public:
+	virtual long STDMETHODCALLTYPE					GetWidth () = 0;
+	virtual long STDMETHODCALLTYPE					GetHeight () = 0;
+	virtual long STDMETHODCALLTYPE					GetRowBytes () = 0;
+	virtual BMDPixelFormat STDMETHODCALLTYPE		GetPixelFormat () = 0;
+	virtual BMDFrameFlags STDMETHODCALLTYPE			GetFlags () = 0;
+	virtual HRESULT STDMETHODCALLTYPE				GetBytes (void* *buffer) = 0;
+};
+
+// IDeckLinkVideoInputFrame_v7_1.  Provided by the IDeckLinkInput_v7_1 frame arrival callback.
+class IDeckLinkVideoInputFrame_v7_1 : public IDeckLinkVideoFrame_v7_1
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE			GetFrameTime (BMDTimeValue *frameTime, BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+};
+
+// IDeckLinkAudioInputPacket_v7_1.  Provided by the IDeckLinkInput_v7_1 callback.
+class IDeckLinkAudioInputPacket_v7_1 : public IUnknown
+{
+public:
+	virtual long STDMETHODCALLTYPE				GetSampleCount () = 0;
+	virtual HRESULT STDMETHODCALLTYPE			GetBytes (void* *buffer) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE			GetAudioPacketTime (BMDTimeValue *packetTime, BMDTimeScale timeScale) = 0;
+};
+
+#endif		// defined(__cplusplus)
+
+#endif		// __DeckLink_API_v7_1_h__
+

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v7_3.h Added

@@ -0,0 +1,173 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_3.h */
+
+#ifndef __DeckLink_API_v7_3_h__
+#define __DeckLink_API_v7_3_h__
+
+#include "DeckLinkAPI.h"
+#include "DeckLinkAPI_v7_6.h"
+
+/* Interface ID Declarations */
+
+#define IID_IDeckLinkInputCallback_v7_3                  /* FD6F311D-4D00-444B-9ED4-1F25B5730AD0 */ (REFIID){0xFD,0x6F,0x31,0x1D,0x4D,0x00,0x44,0x4B,0x9E,0xD4,0x1F,0x25,0xB5,0x73,0x0A,0xD0}
+#define IID_IDeckLinkOutput_v7_3                         /* 271C65E3-C323-4344-A30F-D908BCB20AA3 */ (REFIID){0x27,0x1C,0x65,0xE3,0xC3,0x23,0x43,0x44,0xA3,0x0F,0xD9,0x08,0xBC,0xB2,0x0A,0xA3}
+#define IID_IDeckLinkInput_v7_3                          /* 4973F012-9925-458C-871C-18774CDBBECB */ (REFIID){0x49,0x73,0xF0,0x12,0x99,0x25,0x45,0x8C,0x87,0x1C,0x18,0x77,0x4C,0xDB,0xBE,0xCB}
+#define IID_IDeckLinkVideoInputFrame_v7_3                /* CF317790-2894-11DE-8C30-0800200C9A66 */ (REFIID){0xCF,0x31,0x77,0x90,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66}
+
+/* End Interface ID Declarations */
+
+#if defined(__cplusplus)
+
+/* Forward Declarations */
+
+class IDeckLinkVideoInputFrame_v7_3;
+
+/* End Forward Declarations */
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (BMDDisplayMode displayMode, BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame_v7_6 **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount, BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *elapsedTimeSinceSchedulerBegan) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkOutput */
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+class IDeckLinkInputCallback_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode_v7_6 *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+    virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame_v7_3 *videoFrame, /* in */ IDeckLinkAudioInputPacket *audioPacket) = 0;
+
+protected:
+    virtual ~IDeckLinkInputCallback_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInputCallback */
+
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v7_3 *theCallback) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInput */
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+class IDeckLinkVideoInputFrame_v7_3 : public IDeckLinkVideoFrame_v7_6
+{
+public:
+    virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoInputFrame_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoInputFrame */
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_3_h__

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v7_6.h Added

@@ -0,0 +1,404 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_6.h */
+
+#ifndef __DeckLink_API_v7_6_h__
+#define __DeckLink_API_v7_6_h__
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkVideoOutputCallback_v7_6            /* E763A626-4A3C-49D1-BF13-E7AD3692AE52 */ (REFIID){0xE7,0x63,0xA6,0x26,0x4A,0x3C,0x49,0xD1,0xBF,0x13,0xE7,0xAD,0x36,0x92,0xAE,0x52}
+#define IID_IDeckLinkInputCallback_v7_6                  /* 31D28EE7-88B6-4CB1-897A-CDBF79A26414 */ (REFIID){0x31,0xD2,0x8E,0xE7,0x88,0xB6,0x4C,0xB1,0x89,0x7A,0xCD,0xBF,0x79,0xA2,0x64,0x14}
+#define IID_IDeckLinkDisplayModeIterator_v7_6            /* 455D741F-1779-4800-86F5-0B5D13D79751 */ (REFIID){0x45,0x5D,0x74,0x1F,0x17,0x79,0x48,0x00,0x86,0xF5,0x0B,0x5D,0x13,0xD7,0x97,0x51}
+#define IID_IDeckLinkDisplayMode_v7_6                    /* 87451E84-2B7E-439E-A629-4393EA4A8550 */ (REFIID){0x87,0x45,0x1E,0x84,0x2B,0x7E,0x43,0x9E,0xA6,0x29,0x43,0x93,0xEA,0x4A,0x85,0x50}
+#define IID_IDeckLinkOutput_v7_6                         /* 29228142-EB8C-4141-A621-F74026450955 */ (REFIID){0x29,0x22,0x81,0x42,0xEB,0x8C,0x41,0x41,0xA6,0x21,0xF7,0x40,0x26,0x45,0x09,0x55}
+#define IID_IDeckLinkInput_v7_6                          /* 300C135A-9F43-48E2-9906-6D7911D93CF1 */ (REFIID){0x30,0x0C,0x13,0x5A,0x9F,0x43,0x48,0xE2,0x99,0x06,0x6D,0x79,0x11,0xD9,0x3C,0xF1}
+#define IID_IDeckLinkTimecode_v7_6                       /* EFB9BCA6-A521-44F7-BD69-2332F24D9EE6 */ (REFIID){0xEF,0xB9,0xBC,0xA6,0xA5,0x21,0x44,0xF7,0xBD,0x69,0x23,0x32,0xF2,0x4D,0x9E,0xE6}
+#define IID_IDeckLinkVideoFrame_v7_6                     /* A8D8238E-6B18-4196-99E1-5AF717B83D32 */ (REFIID){0xA8,0xD8,0x23,0x8E,0x6B,0x18,0x41,0x96,0x99,0xE1,0x5A,0xF7,0x17,0xB8,0x3D,0x32}
+#define IID_IDeckLinkMutableVideoFrame_v7_6              /* 46FCEE00-B4E6-43D0-91C0-023A7FCEB34F */ (REFIID){0x46,0xFC,0xEE,0x00,0xB4,0xE6,0x43,0xD0,0x91,0xC0,0x02,0x3A,0x7F,0xCE,0xB3,0x4F}
+#define IID_IDeckLinkVideoInputFrame_v7_6                /* 9A74FA41-AE9F-47AC-8CF4-01F42DD59965 */ (REFIID){0x9A,0x74,0xFA,0x41,0xAE,0x9F,0x47,0xAC,0x8C,0xF4,0x01,0xF4,0x2D,0xD5,0x99,0x65}
+#define IID_IDeckLinkScreenPreviewCallback_v7_6          /* 373F499D-4B4D-4518-AD22-6354E5A5825E */ (REFIID){0x37,0x3F,0x49,0x9D,0x4B,0x4D,0x45,0x18,0xAD,0x22,0x63,0x54,0xE5,0xA5,0x82,0x5E}
+#define IID_IDeckLinkGLScreenPreviewHelper_v7_6          /* BA575CD9-A15E-497B-B2C2-F9AFE7BE4EBA */ (REFIID){0xBA,0x57,0x5C,0xD9,0xA1,0x5E,0x49,0x7B,0xB2,0xC2,0xF9,0xAF,0xE7,0xBE,0x4E,0xBA}
+#define IID_IDeckLinkVideoConversion_v7_6                /* 3EB504C9-F97D-40FE-A158-D407D48CB53B */ (REFIID){0x3E,0xB5,0x04,0xC9,0xF9,0x7D,0x40,0xFE,0xA1,0x58,0xD4,0x07,0xD4,0x8C,0xB5,0x3B}
+#define IID_IDeckLinkConfiguration_v7_6                  /* B8EAD569-B764-47F0-A73F-AE40DF6CBF10 */ (REFIID){0xB8,0xEA,0xD5,0x69,0xB7,0x64,0x47,0xF0,0xA7,0x3F,0xAE,0x40,0xDF,0x6C,0xBF,0x10}
+
+
+#if defined(__cplusplus)
+
+/* Enum BMDVideoConnection - Video connection types */
+
+typedef uint32_t BMDVideoConnection_v7_6;
+enum _BMDVideoConnection_v7_6 {
+    bmdVideoConnectionSDI_v7_6                              = 'sdi ',
+    bmdVideoConnectionHDMI_v7_6                             = 'hdmi',
+    bmdVideoConnectionOpticalSDI_v7_6                       = 'opti',
+    bmdVideoConnectionComponent_v7_6                        = 'cpnt',
+    bmdVideoConnectionComposite_v7_6                        = 'cmst',
+    bmdVideoConnectionSVideo_v7_6                           = 'svid'
+};
+
+// Forward Declarations
+
+class IDeckLinkVideoOutputCallback_v7_6;
+class IDeckLinkInputCallback_v7_6;
+class IDeckLinkDisplayModeIterator_v7_6;
+class IDeckLinkDisplayMode_v7_6;
+class IDeckLinkOutput_v7_6;
+class IDeckLinkInput_v7_6;
+class IDeckLinkTimecode_v7_6;
+class IDeckLinkVideoFrame_v7_6;
+class IDeckLinkMutableVideoFrame_v7_6;
+class IDeckLinkVideoInputFrame_v7_6;
+class IDeckLinkScreenPreviewCallback_v7_6;
+class IDeckLinkGLScreenPreviewHelper_v7_6;
+class IDeckLinkVideoConversion_v7_6;
+
+
+/* Interface IDeckLinkVideoOutputCallback - Frame completion callback. */
+
+class IDeckLinkVideoOutputCallback_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT ScheduledFrameCompleted (/* in */ IDeckLinkVideoFrame_v7_6 *completedFrame, /* in */ BMDOutputFrameCompletionResult result) = 0;
+    virtual HRESULT ScheduledPlaybackHasStopped (void) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoOutputCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+class IDeckLinkInputCallback_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode_v7_6 *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+    virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame_v7_6* videoFrame, /* in */ IDeckLinkAudioInputPacket* audioPacket) = 0;
+
+protected:
+    virtual ~IDeckLinkInputCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkDisplayModeIterator - enumerates over supported input/output display modes. */
+
+class IDeckLinkDisplayModeIterator_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT Next (/* out */ IDeckLinkDisplayMode_v7_6 **deckLinkDisplayMode) = 0;
+
+protected:
+    virtual ~IDeckLinkDisplayModeIterator_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkDisplayMode - represents a display mode */
+
+class IDeckLinkDisplayMode_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT GetName (/* out */ const char **name) = 0;
+    virtual BMDDisplayMode GetDisplayMode (void) = 0;
+    virtual long GetWidth (void) = 0;
+    virtual long GetHeight (void) = 0;
+    virtual HRESULT GetFrameRate (/* out */ BMDTimeValue *frameDuration, /* out */ BMDTimeScale *timeScale) = 0;
+    virtual BMDFieldDominance GetFieldDominance (void) = 0;
+
+protected:
+    virtual ~IDeckLinkDisplayMode_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback_v7_6 *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (/* in */ BMDDisplayMode displayMode, /* in */ BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (/* in */ int32_t width, /* in */ int32_t height, /* in */ int32_t rowBytes, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame_v7_6 **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (/* in */ BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame, /* in */ BMDTimeValue displayTime, /* in */ BMDTimeValue displayDuration, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback_v7_6 *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount, /* in */ BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* in */ BMDTimeValue streamTime, /* in */ BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (/* in */ BMDTimeValue playbackStartTime, /* in */ BMDTimeScale timeScale, /* in */ double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (/* in */ BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetScheduledStreamTime (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *streamTime, /* out */ double *playbackSpeed) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkInput_v7_6 - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback_v7_6 *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v7_6 *theCallback) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkTimecode - Used for video frame timecode representation. */
+
+class IDeckLinkTimecode_v7_6 : public IUnknown
+{
+public:
+    virtual BMDTimecodeBCD GetBCD (void) = 0;
+    virtual HRESULT GetComponents (/* out */ uint8_t *hours, /* out */ uint8_t *minutes, /* out */ uint8_t *seconds, /* out */ uint8_t *frames) = 0;
+    virtual HRESULT GetString (/* out */ const char **timecode) = 0;
+    virtual BMDTimecodeFlags GetFlags (void) = 0;
+
+protected:
+    virtual ~IDeckLinkTimecode_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
+
+class IDeckLinkVideoFrame_v7_6 : public IUnknown
+{
+public:
+    virtual long GetWidth (void) = 0;
+    virtual long GetHeight (void) = 0;
+    virtual long GetRowBytes (void) = 0;
+    virtual BMDPixelFormat GetPixelFormat (void) = 0;
+    virtual BMDFrameFlags GetFlags (void) = 0;
+    virtual HRESULT GetBytes (/* out */ void **buffer) = 0;
+
+    virtual HRESULT GetTimecode (BMDTimecodeFormat format, /* out */ IDeckLinkTimecode_v7_6 **timecode) = 0;
+    virtual HRESULT GetAncillaryData (/* out */ IDeckLinkVideoFrameAncillary **ancillary) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoFrame_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkMutableVideoFrame - Created by IDeckLinkOutput::CreateVideoFrame. */
+
+class IDeckLinkMutableVideoFrame_v7_6 : public IDeckLinkVideoFrame_v7_6
+{
+public:
+    virtual HRESULT SetFlags (BMDFrameFlags newFlags) = 0;
+
+    virtual HRESULT SetTimecode (BMDTimecodeFormat format, /* in */ IDeckLinkTimecode_v7_6 *timecode) = 0;
+    virtual HRESULT SetTimecodeFromComponents (BMDTimecodeFormat format, uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t frames, BMDTimecodeFlags flags) = 0;
+    virtual HRESULT SetAncillaryData (/* in */ IDeckLinkVideoFrameAncillary *ancillary) = 0;
+
+protected:
+    virtual ~IDeckLinkMutableVideoFrame_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+class IDeckLinkVideoInputFrame_v7_6 : public IDeckLinkVideoFrame_v7_6
+{
+public:
+    virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT GetHardwareReferenceTimestamp (BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoInputFrame_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkScreenPreviewCallback - Screen preview callback */
+
+class IDeckLinkScreenPreviewCallback_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT DrawFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkScreenPreviewCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkGLScreenPreviewHelper - Created with CoCreateInstance(). */
+
+class IDeckLinkGLScreenPreviewHelper_v7_6 : public IUnknown
+{
+public:
+
+    /* Methods must be called with OpenGL context set */
+
+    virtual HRESULT InitializeGL (void) = 0;
+    virtual HRESULT PaintGL (void) = 0;
+    virtual HRESULT SetFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkGLScreenPreviewHelper_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkVideoConversion - Created with CoCreateInstance(). */
+
+class IDeckLinkVideoConversion_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT ConvertFrame (/* in */ IDeckLinkVideoFrame_v7_6* srcFrame, /* in */ IDeckLinkVideoFrame_v7_6* dstFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoConversion_v7_6 () {}; // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkConfiguration - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkConfiguration_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT GetConfigurationValidator (/* out */ IDeckLinkConfiguration_v7_6 **configObject) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+    /* Video Output Configuration */
+
+    virtual HRESULT SetVideoOutputFormat (/* in */ BMDVideoConnection_v7_6 videoOutputConnection) = 0;
+    virtual HRESULT IsVideoOutputActive (/* in */ BMDVideoConnection_v7_6 videoOutputConnection, /* out */ bool *active) = 0;
+
+    virtual HRESULT SetAnalogVideoOutputFlags (/* in */ BMDAnalogVideoFlags analogVideoFlags) = 0;
+    virtual HRESULT GetAnalogVideoOutputFlags (/* out */ BMDAnalogVideoFlags *analogVideoFlags) = 0;
+
+    virtual HRESULT EnableFieldFlickerRemovalWhenPaused (/* in */ bool enable) = 0;
+    virtual HRESULT IsEnabledFieldFlickerRemovalWhenPaused (/* out */ bool *enabled) = 0;
+
+    virtual HRESULT Set444And3GBpsVideoOutput (/* in */ bool enable444VideoOutput, /* in */ bool enable3GbsOutput) = 0;
+    virtual HRESULT Get444And3GBpsVideoOutput (/* out */ bool *is444VideoOutputEnabled, /* out */ bool *threeGbsOutputEnabled) = 0;
+
+    virtual HRESULT SetVideoOutputConversionMode (/* in */ BMDVideoOutputConversionMode conversionMode) = 0;
+    virtual HRESULT GetVideoOutputConversionMode (/* out */ BMDVideoOutputConversionMode *conversionMode) = 0;
+
+    virtual HRESULT Set_HD1080p24_to_HD1080i5994_Conversion (/* in */ bool enable) = 0;
+    virtual HRESULT Get_HD1080p24_to_HD1080i5994_Conversion (/* out */ bool *enabled) = 0;
+
+    /* Video Input Configuration */
+
+    virtual HRESULT SetVideoInputFormat (/* in */ BMDVideoConnection_v7_6 videoInputFormat) = 0;
+    virtual HRESULT GetVideoInputFormat (/* out */ BMDVideoConnection_v7_6 *videoInputFormat) = 0;
+
+    virtual HRESULT SetAnalogVideoInputFlags (/* in */ BMDAnalogVideoFlags analogVideoFlags) = 0;
+    virtual HRESULT GetAnalogVideoInputFlags (/* out */ BMDAnalogVideoFlags *analogVideoFlags) = 0;
+
+    virtual HRESULT SetVideoInputConversionMode (/* in */ BMDVideoInputConversionMode conversionMode) = 0;
+    virtual HRESULT GetVideoInputConversionMode (/* out */ BMDVideoInputConversionMode *conversionMode) = 0;
+
+    virtual HRESULT SetBlackVideoOutputDuringCapture (/* in */ bool blackOutInCapture) = 0;
+    virtual HRESULT GetBlackVideoOutputDuringCapture (/* out */ bool *blackOutInCapture) = 0;
+
+    virtual HRESULT Set32PulldownSequenceInitialTimecodeFrame (/* in */ uint32_t aFrameTimecode) = 0;
+    virtual HRESULT Get32PulldownSequenceInitialTimecodeFrame (/* out */ uint32_t *aFrameTimecode) = 0;
+
+    virtual HRESULT SetVancSourceLineMapping (/* in */ uint32_t activeLine1VANCsource, /* in */ uint32_t activeLine2VANCsource, /* in */ uint32_t activeLine3VANCsource) = 0;
+    virtual HRESULT GetVancSourceLineMapping (/* out */ uint32_t *activeLine1VANCsource, /* out */ uint32_t *activeLine2VANCsource, /* out */ uint32_t *activeLine3VANCsource) = 0;
+
+    /* Audio Input Configuration */
+
+    virtual HRESULT SetAudioInputFormat (/* in */ BMDAudioConnection audioInputFormat) = 0;
+    virtual HRESULT GetAudioInputFormat (/* out */ BMDAudioConnection *audioInputFormat) = 0;
+};
+
+/* Functions */
+
+extern "C" {
+
+	IDeckLinkIterator*							CreateDeckLinkIteratorInstance_v7_6 (void);
+	IDeckLinkGLScreenPreviewHelper_v7_6*		CreateOpenGLScreenPreviewHelper_v7_6 (void);
+    IDeckLinkVideoConversion_v7_6*				CreateVideoConversionInstance_v7_6 (void);
+
+};
+
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_6_h__

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v7_9.h Added

@@ -0,0 +1,88 @@
+/* -LICENSE-START-
+** Copyright (c) 2010 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_9.h */
+
+#ifndef __DeckLink_API_v7_9_h__
+#define __DeckLink_API_v7_9_h__
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+#define IID_IDeckLinkDeckControl_v7_9                    /* A4D81043-0619-42B7-8ED6-602D29041DF7 */ (REFIID){0xA4,0xD8,0x10,0x43,0x06,0x19,0x42,0xB7,0x8E,0xD6,0x60,0x2D,0x29,0x04,0x1D,0xF7}
+
+#if defined(__cplusplus)
+
+
+// Forward Declarations
+class IDeckLinkDeckControl_v7_9;
+
+/* Interface IDeckLinkDeckControl_v7_9 - Deck Control main interface */
+class IDeckLinkDeckControl_v7_9 : public IUnknown
+{
+public:
+    virtual HRESULT Open (/* in */ BMDTimeScale timeScale, /* in */ BMDTimeValue timeValue, /* in */ bool timecodeIsDropFrame, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Close (/* in */ bool standbyOn) = 0;
+    virtual HRESULT GetCurrentState (/* out */ BMDDeckControlMode *mode, /* out */ BMDDeckControlVTRControlState *vtrControlState, /* out */ BMDDeckControlStatusFlags *flags) = 0;
+    virtual HRESULT SetStandby (/* in */ bool standbyOn) = 0;
+    virtual HRESULT Play (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Stop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT TogglePlayStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Eject (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GoToTimecode (/* in */ BMDTimecodeBCD timecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT FastForward (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Rewind (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepForward (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepBack (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Jog (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Shuttle (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeString (/* out */ const char **currentTimeCode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecode (/* out */ IDeckLinkTimecode **currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeBCD (/* out */ BMDTimecodeBCD *currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetPreroll (/* in */ uint32_t prerollSeconds) = 0;
+    virtual HRESULT GetPreroll (/* out */ uint32_t *prerollSeconds) = 0;
+    virtual HRESULT SetExportOffset (/* in */ int32_t exportOffsetFields) = 0;
+    virtual HRESULT GetExportOffset (/* out */ int32_t *exportOffsetFields) = 0;
+    virtual HRESULT GetManualExportOffset (/* out */ int32_t *deckManualExportOffsetFields) = 0;
+    virtual HRESULT SetCaptureOffset (/* in */ int32_t captureOffsetFields) = 0;
+    virtual HRESULT GetCaptureOffset (/* out */ int32_t *captureOffsetFields) = 0;
+    virtual HRESULT StartExport (/* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* in */ BMDDeckControlExportModeOpsFlags exportModeOps, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StartCapture (/* in */ bool useVITC, /* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetDeviceID (/* out */ uint16_t *deviceId, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Abort (void) = 0;
+    virtual HRESULT CrashRecordStart (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT CrashRecordStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkDeckControlStatusCallback *callback) = 0;
+
+protected:
+    virtual ~IDeckLinkDeckControl_v7_9 () {}; // call Release method to drop reference count
+};
+
+
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_9_h__

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v8_0.h Added

@@ -0,0 +1,63 @@
+/* -LICENSE-START-
+** Copyright (c) 2011 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v8_0_H
+#define BMD_DECKLINKAPI_v8_0_H
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+
+#define IID_IDeckLink_v8_0                                    /* 62BFF75D-6569-4E55-8D4D-66AA03829ABC */ (REFIID){0x62,0xBF,0xF7,0x5D,0x65,0x69,0x4E,0x55,0x8D,0x4D,0x66,0xAA,0x03,0x82,0x9A,0xBC}
+#define IID_IDeckLinkIterator_v8_0                            /* 74E936FC-CC28-4A67-81A0-1E94E52D4E69 */ (REFIID){0x74,0xE9,0x36,0xFC,0xCC,0x28,0x4A,0x67,0x81,0xA0,0x1E,0x94,0xE5,0x2D,0x4E,0x69}
+
+#if defined (__cplusplus)
+
+/* Interface IDeckLink_v8_0 - represents a DeckLink device */
+
+class IDeckLink_v8_0 : public IUnknown
+{
+public:
+    virtual HRESULT GetModelName (/* out */ const char **modelName) = 0;
+};
+
+/* Interface IDeckLinkIterator_v8_0 - enumerates installed DeckLink hardware */
+
+class IDeckLinkIterator_v8_0 : public IUnknown
+{
+public:
+    virtual HRESULT Next (/* out */ IDeckLink_v8_0 **deckLinkInstance) = 0;
+};
+
+extern "C" {
+    IDeckLinkIterator_v8_0*                     CreateDeckLinkIteratorInstance_v8_0 (void);
+};
+
+#endif	// defined __cplusplus
+
+#endif /* defined(BMD_DECKLINKAPI_v8_0_H) */
+

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v8_1.h Added

@@ -0,0 +1,111 @@
+/* -LICENSE-START-
+ ** Copyright (c) 2011 Blackmagic Design
+ **
+ ** Permission is hereby granted, free of charge, to any person or organization
+ ** obtaining a copy of the software and accompanying documentation covered by
+ ** this license (the "Software") to use, reproduce, display, distribute,
+ ** execute, and transmit the Software, and to prepare derivative works of the
+ ** Software, and to permit third-parties to whom the Software is furnished to
+ ** do so, all subject to the following:
+ **
+ ** The copyright notices in the Software and this entire statement, including
+ ** the above license grant, this restriction and the following disclaimer,
+ ** must be included in all copies of the Software, in whole or in part, and
+ ** all derivative works of the Software, unless such copies or derivative
+ ** works are solely in the form of machine-executable object code generated by
+ ** a source language processor.
+ **
+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ ** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ ** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ ** DEALINGS IN THE SOFTWARE.
+ ** -LICENSE-END-
+ */
+
+#ifndef BMD_DECKLINKAPI_v8_1_H
+#define BMD_DECKLINKAPI_v8_1_H
+
+#include "DeckLinkAPI.h"
+
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkDeckControlStatusCallback_v8_1           /* E5F693C1-4283-4716-B18F-C1431521955B */ (REFIID){0xE5,0xF6,0x93,0xC1,0x42,0x83,0x47,0x16,0xB1,0x8F,0xC1,0x43,0x15,0x21,0x95,0x5B}
+#define IID_IDeckLinkDeckControl_v8_1                         /* 522A9E39-0F3C-4742-94EE-D80DE335DA1D */ (REFIID){0x52,0x2A,0x9E,0x39,0x0F,0x3C,0x47,0x42,0x94,0xEE,0xD8,0x0D,0xE3,0x35,0xDA,0x1D}
+
+
+/* Enum BMDDeckControlVTRControlState_v8_1 - VTR Control state */
+
+typedef uint32_t BMDDeckControlVTRControlState_v8_1;
+enum _BMDDeckControlVTRControlState_v8_1 {
+    bmdDeckControlNotInVTRControlMode_v8_1                            = 'nvcm',
+    bmdDeckControlVTRControlPlaying_v8_1                              = 'vtrp',
+    bmdDeckControlVTRControlRecording_v8_1                            = 'vtrr',
+    bmdDeckControlVTRControlStill_v8_1                                = 'vtra',
+    bmdDeckControlVTRControlSeeking_v8_1                              = 'vtrs',
+    bmdDeckControlVTRControlStopped_v8_1                              = 'vtro'
+};
+
+
+/* Interface IDeckLinkDeckControlStatusCallback_v8_1 - Deck control state change callback. */
+
+class IDeckLinkDeckControlStatusCallback_v8_1 : public IUnknown
+{
+public:
+    virtual HRESULT TimecodeUpdate (/* in */ BMDTimecodeBCD currentTimecode) = 0;
+    virtual HRESULT VTRControlStateChanged (/* in */ BMDDeckControlVTRControlState_v8_1 newState, /* in */ BMDDeckControlError error) = 0;
+    virtual HRESULT DeckControlEventReceived (/* in */ BMDDeckControlEvent event, /* in */ BMDDeckControlError error) = 0;
+    virtual HRESULT DeckControlStatusChanged (/* in */ BMDDeckControlStatusFlags flags, /* in */ uint32_t mask) = 0;
+
+protected:
+    virtual ~IDeckLinkDeckControlStatusCallback_v8_1 () {}; // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkDeckControl_v8_1 - Deck Control main interface */
+
+class IDeckLinkDeckControl_v8_1 : public IUnknown
+{
+public:
+    virtual HRESULT Open (/* in */ BMDTimeScale timeScale, /* in */ BMDTimeValue timeValue, /* in */ bool timecodeIsDropFrame, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Close (/* in */ bool standbyOn) = 0;
+    virtual HRESULT GetCurrentState (/* out */ BMDDeckControlMode *mode, /* out */ BMDDeckControlVTRControlState_v8_1 *vtrControlState, /* out */ BMDDeckControlStatusFlags *flags) = 0;
+    virtual HRESULT SetStandby (/* in */ bool standbyOn) = 0;
+    virtual HRESULT SendCommand (/* in */ uint8_t *inBuffer, /* in */ uint32_t inBufferSize, /* out */ uint8_t *outBuffer, /* out */ uint32_t *outDataSize, /* in */ uint32_t outBufferSize, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Play (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Stop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT TogglePlayStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Eject (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GoToTimecode (/* in */ BMDTimecodeBCD timecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT FastForward (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Rewind (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepForward (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepBack (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Jog (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Shuttle (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeString (/* out */ const char **currentTimeCode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecode (/* out */ IDeckLinkTimecode **currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeBCD (/* out */ BMDTimecodeBCD *currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetPreroll (/* in */ uint32_t prerollSeconds) = 0;
+    virtual HRESULT GetPreroll (/* out */ uint32_t *prerollSeconds) = 0;
+    virtual HRESULT SetExportOffset (/* in */ int32_t exportOffsetFields) = 0;
+    virtual HRESULT GetExportOffset (/* out */ int32_t *exportOffsetFields) = 0;
+    virtual HRESULT GetManualExportOffset (/* out */ int32_t *deckManualExportOffsetFields) = 0;
+    virtual HRESULT SetCaptureOffset (/* in */ int32_t captureOffsetFields) = 0;
+    virtual HRESULT GetCaptureOffset (/* out */ int32_t *captureOffsetFields) = 0;
+    virtual HRESULT StartExport (/* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* in */ BMDDeckControlExportModeOpsFlags exportModeOps, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StartCapture (/* in */ bool useVITC, /* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetDeviceID (/* out */ uint16_t *deviceId, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Abort (void) = 0;
+    virtual HRESULT CrashRecordStart (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT CrashRecordStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkDeckControlStatusCallback_v8_1 *callback) = 0;
+
+protected:
+    virtual ~IDeckLinkDeckControl_v8_1 () {}; // call Release method to drop reference count
+};
+
+
+#endif	// BMD_DECKLINKAPI_v8_1_H

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_2.h Added

@@ -0,0 +1,81 @@
+/* -LICENSE-START-
+** Copyright (c) 2012 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v9_2_H
+#define BMD_DECKLINKAPI_v9_2_H
+
+#include "DeckLinkAPI.h"
+
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkInput_v9_2                          /* 6D40EF78-28B9-4E21-990D-95BB7750A04F */ (REFIID){0x6D,0x40,0xEF,0x78,0x28,0xB9,0x4E,0x21,0x99,0x0D,0x95,0xBB,0x77,0x50,0xA0,0x4F}
+
+
+#if defined(__cplusplus)
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v9_2 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v9_2 () {}; // call Release method to drop reference count
+};
+
+
+#endif      // defined(__cplusplus)
+#endif	// BMD_DECKLINKAPI_v9_2_H

obs-studio-0.16.4.tar.xz/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_9.h Added

@@ -0,0 +1,98 @@
+/* -LICENSE-START-
+** Copyright (c) 2013 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v9_9_H
+#define BMD_DECKLINKAPI_v9_9_H
+
+#include "DeckLinkAPI.h"
+
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkOutput_v9_9                         /* A3EF0963-0862-44ED-92A9-EE89ABF431C7 */ (REFIID){0xA3,0xEF,0x09,0x63,0x08,0x62,0x44,0xED,0x92,0xA9,0xEE,0x89,0xAB,0xF4,0x31,0xC7}
+
+
+#if defined(__cplusplus)
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v9_9 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoOutputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (/* in */ BMDDisplayMode displayMode, /* in */ BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (/* in */ int32_t width, /* in */ int32_t height, /* in */ int32_t rowBytes, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (/* in */ BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame *theFrame, /* in */ BMDTimeValue displayTime, /* in */ BMDTimeValue displayDuration, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount, /* in */ BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* in */ BMDTimeValue streamTime, /* in */ BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (/* in */ BMDTimeValue playbackStartTime, /* in */ BMDTimeScale timeScale, /* in */ double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (/* in */ BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetScheduledStreamTime (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *streamTime, /* out */ double *playbackSpeed) = 0;
+    virtual HRESULT GetReferenceStatus (/* out */ BMDReferenceStatus *referenceStatus) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v9_9 () {}; // call Release method to drop reference count
+};
+
+#endif      // defined(__cplusplus)
+#endif	// BMD_DECKLINKAPI_v9_9_H

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -60,17 +60,24 @@
 
 BMD_CONST REFIID IID_IDeckLinkVideoOutputCallback = /* 20AA5225-1958-47CB-820B-80A8D521A6EE */ {0x20,0xAA,0x52,0x25,0x19,0x58,0x47,0xCB,0x82,0x0B,0x80,0xA8,0xD5,0x21,0xA6,0xEE};
 BMD_CONST REFIID IID_IDeckLinkInputCallback = /* DD04E5EC-7415-42AB-AE4A-E80C4DFC044A */ {0xDD,0x04,0xE5,0xEC,0x74,0x15,0x42,0xAB,0xAE,0x4A,0xE8,0x0C,0x4D,0xFC,0x04,0x4A};
+BMD_CONST REFIID IID_IDeckLinkEncoderInputCallback = /* ACF13E61-F4A0-4974-A6A7-59AFF6268B31 */ {0xAC,0xF1,0x3E,0x61,0xF4,0xA0,0x49,0x74,0xA6,0xA7,0x59,0xAF,0xF6,0x26,0x8B,0x31};
 BMD_CONST REFIID IID_IDeckLinkMemoryAllocator = /* B36EB6E7-9D29-4AA8-92EF-843B87A289E8 */ {0xB3,0x6E,0xB6,0xE7,0x9D,0x29,0x4A,0xA8,0x92,0xEF,0x84,0x3B,0x87,0xA2,0x89,0xE8};
 BMD_CONST REFIID IID_IDeckLinkAudioOutputCallback = /* 403C681B-7F46-4A12-B993-2BB127084EE6 */ {0x40,0x3C,0x68,0x1B,0x7F,0x46,0x4A,0x12,0xB9,0x93,0x2B,0xB1,0x27,0x08,0x4E,0xE6};
 BMD_CONST REFIID IID_IDeckLinkIterator = /* 50FB36CD-3063-4B73-BDBB-958087F2D8BA */ {0x50,0xFB,0x36,0xCD,0x30,0x63,0x4B,0x73,0xBD,0xBB,0x95,0x80,0x87,0xF2,0xD8,0xBA};
 BMD_CONST REFIID IID_IDeckLinkAPIInformation = /* 7BEA3C68-730D-4322-AF34-8A7152B532A4 */ {0x7B,0xEA,0x3C,0x68,0x73,0x0D,0x43,0x22,0xAF,0x34,0x8A,0x71,0x52,0xB5,0x32,0xA4};
 BMD_CONST REFIID IID_IDeckLinkOutput = /* CC5C8A6E-3F2F-4B3A-87EA-FD78AF300564 */ {0xCC,0x5C,0x8A,0x6E,0x3F,0x2F,0x4B,0x3A,0x87,0xEA,0xFD,0x78,0xAF,0x30,0x05,0x64};
 BMD_CONST REFIID IID_IDeckLinkInput = /* AF22762B-DFAC-4846-AA79-FA8883560995 */ {0xAF,0x22,0x76,0x2B,0xDF,0xAC,0x48,0x46,0xAA,0x79,0xFA,0x88,0x83,0x56,0x09,0x95};
+BMD_CONST REFIID IID_IDeckLinkEncoderInput = /* 270587DA-6B7D-42E7-A1F0-6D853F581185 */ {0x27,0x05,0x87,0xDA,0x6B,0x7D,0x42,0xE7,0xA1,0xF0,0x6D,0x85,0x3F,0x58,0x11,0x85};
 BMD_CONST REFIID IID_IDeckLinkVideoFrame = /* 3F716FE0-F023-4111-BE5D-EF4414C05B17 */ {0x3F,0x71,0x6F,0xE0,0xF0,0x23,0x41,0x11,0xBE,0x5D,0xEF,0x44,0x14,0xC0,0x5B,0x17};
 BMD_CONST REFIID IID_IDeckLinkMutableVideoFrame = /* 69E2639F-40DA-4E19-B6F2-20ACE815C390 */ {0x69,0xE2,0x63,0x9F,0x40,0xDA,0x4E,0x19,0xB6,0xF2,0x20,0xAC,0xE8,0x15,0xC3,0x90};
 BMD_CONST REFIID IID_IDeckLinkVideoFrame3DExtensions = /* DA0F7E4A-EDC7-48A8-9CDD-2DB51C729CD7 */ {0xDA,0x0F,0x7E,0x4A,0xED,0xC7,0x48,0xA8,0x9C,0xDD,0x2D,0xB5,0x1C,0x72,0x9C,0xD7};
+BMD_CONST REFIID IID_IDeckLinkVideoFrameMetadataExtensions = /* D5973DC9-6432-46D0-8F0B-2496F8A1238F */ {0xD5,0x97,0x3D,0xC9,0x64,0x32,0x46,0xD0,0x8F,0x0B,0x24,0x96,0xF8,0xA1,0x23,0x8F};
 BMD_CONST REFIID IID_IDeckLinkVideoInputFrame = /* 05CFE374-537C-4094-9A57-680525118F44 */ {0x05,0xCF,0xE3,0x74,0x53,0x7C,0x40,0x94,0x9A,0x57,0x68,0x05,0x25,0x11,0x8F,0x44};
 BMD_CONST REFIID IID_IDeckLinkVideoFrameAncillary = /* 732E723C-D1A4-4E29-9E8E-4A88797A0004 */ {0x73,0x2E,0x72,0x3C,0xD1,0xA4,0x4E,0x29,0x9E,0x8E,0x4A,0x88,0x79,0x7A,0x00,0x04};
+BMD_CONST REFIID IID_IDeckLinkEncoderPacket = /* B693F36C-316E-4AF1-B6C2-F389A4BCA620 */ {0xB6,0x93,0xF3,0x6C,0x31,0x6E,0x4A,0xF1,0xB6,0xC2,0xF3,0x89,0xA4,0xBC,0xA6,0x20};
+BMD_CONST REFIID IID_IDeckLinkEncoderVideoPacket = /* 4E7FD944-E8C7-4EAC-B8C0-7B77F80F5AE0 */ {0x4E,0x7F,0xD9,0x44,0xE8,0xC7,0x4E,0xAC,0xB8,0xC0,0x7B,0x77,0xF8,0x0F,0x5A,0xE0};
+BMD_CONST REFIID IID_IDeckLinkEncoderAudioPacket = /* 49E8EDC8-693B-4E14-8EF6-12C658F5A07A */ {0x49,0xE8,0xED,0xC8,0x69,0x3B,0x4E,0x14,0x8E,0xF6,0x12,0xC6,0x58,0xF5,0xA0,0x7A};
+BMD_CONST REFIID IID_IDeckLinkH265NALPacket = /* 639C8E0B-68D5-4BDE-A6D4-95F3AEAFF2E7 */ {0x63,0x9C,0x8E,0x0B,0x68,0xD5,0x4B,0xDE,0xA6,0xD4,0x95,0xF3,0xAE,0xAF,0xF2,0xE7};
 BMD_CONST REFIID IID_IDeckLinkAudioInputPacket = /* E43D5870-2894-11DE-8C30-0800200C9A66 */ {0xE4,0x3D,0x58,0x70,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66};
 BMD_CONST REFIID IID_IDeckLinkScreenPreviewCallback = /* B1D3F49A-85FE-4C5D-95C8-0B5D5DCCD438 */ {0xB1,0xD3,0xF4,0x9A,0x85,0xFE,0x4C,0x5D,0x95,0xC8,0x0B,0x5D,0x5D,0xCC,0xD4,0x38};
 BMD_CONST REFIID IID_IDeckLinkCocoaScreenPreviewCallback = /* D174152F-8F96-4C07-83A5-DD5F5AF0A2AA */ {0xD1,0x74,0x15,0x2F,0x8F,0x96,0x4C,0x07,0x83,0xA5,0xDD,0x5F,0x5A,0xF0,0xA2,0xAA};
@@ -78,6 +85,7 @@
 BMD_CONST REFIID IID_IDeckLinkNotificationCallback = /* B002A1EC-070D-4288-8289-BD5D36E5FF0D */ {0xB0,0x02,0xA1,0xEC,0x07,0x0D,0x42,0x88,0x82,0x89,0xBD,0x5D,0x36,0xE5,0xFF,0x0D};
 BMD_CONST REFIID IID_IDeckLinkNotification = /* 0A1FB207-E215-441B-9B19-6FA1575946C5 */ {0x0A,0x1F,0xB2,0x07,0xE2,0x15,0x44,0x1B,0x9B,0x19,0x6F,0xA1,0x57,0x59,0x46,0xC5};
 BMD_CONST REFIID IID_IDeckLinkAttributes = /* ABC11843-D966-44CB-96E2-A1CB5D3135C4 */ {0xAB,0xC1,0x18,0x43,0xD9,0x66,0x44,0xCB,0x96,0xE2,0xA1,0xCB,0x5D,0x31,0x35,0xC4};
+BMD_CONST REFIID IID_IDeckLinkStatus = /* 5F558200-4028-49BC-BEAC-DB3FA4A96E46 */ {0x5F,0x55,0x82,0x00,0x40,0x28,0x49,0xBC,0xBE,0xAC,0xDB,0x3F,0xA4,0xA9,0x6E,0x46};
 BMD_CONST REFIID IID_IDeckLinkKeyer = /* 89AFCAF5-65F8-421E-98F7-96FE5F5BFBA3 */ {0x89,0xAF,0xCA,0xF5,0x65,0xF8,0x42,0x1E,0x98,0xF7,0x96,0xFE,0x5F,0x5B,0xFB,0xA3};
 BMD_CONST REFIID IID_IDeckLinkVideoConversion = /* 3BBCB8A2-DA2C-42D9-B5D8-88083644E99A */ {0x3B,0xBC,0xB8,0xA2,0xDA,0x2C,0x42,0xD9,0xB5,0xD8,0x88,0x08,0x36,0x44,0xE9,0x9A};
 BMD_CONST REFIID IID_IDeckLinkDeviceNotificationCallback = /* 4997053B-0ADF-4CC8-AC70-7A50C4BE728F */ {0x49,0x97,0x05,0x3B,0x0A,0xDF,0x4C,0xC8,0xAC,0x70,0x7A,0x50,0xC4,0xBE,0x72,0x8F};
@@ -94,12 +102,21 @@
 bmdVideoOutputDualStream3D = 1 << 4
 };
 
+/* Enum BMDPacketType - Type of packet */
+
+typedef uint32_t BMDPacketType;
+enum _BMDPacketType {
+ bmdPacketTypeStreamInterruptedMarker = 'sint',	// A packet of this type marks the time when a video stream was interrupted, for example by a disconnected cable
+ bmdPacketTypeStreamData = 'sdat'	// Regular stream data
+};
+
 /* Enum BMDFrameFlags - Frame flags */
 
 typedef uint32_t BMDFrameFlags;
 enum _BMDFrameFlags {
 bmdFrameFlagDefault = 0,
 bmdFrameFlagFlipVertical = 1 << 0,
+ bmdFrameContainsHDRMetadata = 1 << 1,
 
 /* Flags that are applicable only to instances of IDeckLinkVideoInputFrame */
 
@@ -137,6 +154,7 @@
 
 typedef uint32_t BMDDeckLinkCapturePassthroughMode;
 enum _BMDDeckLinkCapturePassthroughMode {
+ bmdDeckLinkCapturePassthroughModeDisabled = 'pdis',
 bmdDeckLinkCapturePassthroughModeDirect = 'pdir',
 bmdDeckLinkCapturePassthroughModeCleanSwitch = 'pcln'
 };
@@ -159,6 +177,13 @@
 bmdReferenceLocked = 1 << 1
 };
 
+/* Enum BMDAudioFormat - Audio Format */
+
+typedef uint32_t BMDAudioFormat;
+enum _BMDAudioFormat {
+ bmdAudioFormatPCM = 'lpcm'	// Linear signed PCM samples
+};
+
 /* Enum BMDAudioSampleRate - Audio sample rates supported for output/input */
 
 typedef uint32_t BMDAudioSampleRate;
@@ -271,8 +296,71 @@
 typedef uint32_t BMDIdleVideoOutputOperation;
 enum _BMDIdleVideoOutputOperation {
 bmdIdleVideoOutputBlack = 'blac',
- bmdIdleVideoOutputLastFrame = 'lafa',
- bmdIdleVideoOutputDesktop = 'desk'
+ bmdIdleVideoOutputLastFrame = 'lafa'
+};
+
+/* Enum BMDVideoEncoderFrameCodingMode - Video frame coding mode */
+
+typedef uint32_t BMDVideoEncoderFrameCodingMode;
+enum _BMDVideoEncoderFrameCodingMode {
+ bmdVideoEncoderFrameCodingModeInter = 'inte',
+ bmdVideoEncoderFrameCodingModeIntra = 'intr'
+};
+
+/* Enum BMDDNxHRLevel - DNxHR Levels */
+
+typedef uint32_t BMDDNxHRLevel;
+enum _BMDDNxHRLevel {
+ bmdDNxHRLevelSQ = 'dnsq',
+ bmdDNxHRLevelLB = 'dnlb',
+ bmdDNxHRLevelHQ = 'dnhq',
+ bmdDNxHRLevelHQX = 'dhqx',
+ bmdDNxHRLevel444 = 'd444'
+};
+
+/* Enum BMDLinkConfiguration - Video link configuration */
+
+typedef uint32_t BMDLinkConfiguration;
+enum _BMDLinkConfiguration {
+ bmdLinkConfigurationSingleLink = 'lcsl',
+ bmdLinkConfigurationDualLink = 'lcdl',
+ bmdLinkConfigurationQuadLink = 'lcql'
+};
+
+/* Enum BMDDeviceInterface - Device interface type */
+
+typedef uint32_t BMDDeviceInterface;
+enum _BMDDeviceInterface {
+ bmdDeviceInterfacePCI = 'pci ',
+ bmdDeviceInterfaceUSB = 'usb ',
+ bmdDeviceInterfaceThunderbolt = 'thun'
+};
+
+/* Enum BMDDeckLinkFrameMetadataID - DeckLink Frame Metadata ID */
+
+typedef uint32_t BMDDeckLinkFrameMetadataID;
+enum _BMDDeckLinkFrameMetadataID {
+ bmdDeckLinkFrameMetadataHDRElectroOpticalTransferFunc = 'eotf',	// EOTF in range 0-7 as per CEA 861.3
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedX = 'hdrx',	// Red display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedY = 'hdry',	// Red display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenX = 'hdgx',	// Green display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenY = 'hdgy',	// Green display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueX = 'hdbx',	// Blue display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueY = 'hdby',	// Blue display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRWhitePointX = 'hdwx',	// White point in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRWhitePointY = 'hdwy',	// White point in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRMaxDisplayMasteringLuminance = 'hdml',	// Max display mastering luminance in range 1 cd/m2 - 65535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMinDisplayMasteringLuminance = 'hmil',	// Min display mastering luminance in range 0.0001 cd/m2 - 6.5535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMaximumContentLightLevel = 'mcll',	// Maximum Content Light Level in range 1 cd/m2 - 65535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMaximumFrameAverageLightLevel = 'fall'	// Maximum Frame Average Light Level in range 1 cd/m2 - 65535 cd/m2
+};
+
+/* Enum BMDDuplexMode - Duplex for configurable ports */
+
+typedef uint32_t BMDDuplexMode;
+enum _BMDDuplexMode {
+ bmdDuplexModeFull = 'fdup',
+ bmdDuplexModeHalf = 'hdup'
 };
 
 /* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
@@ -292,10 +380,16 @@
 BMDDeckLinkCanOnlyAdjustOverallVideoOutputGain = 'ovog',
 BMDDeckLinkHasVideoInputAntiAliasingFilter = 'aafl',
 BMDDeckLinkHasBypass = 'byps',
- BMDDeckLinkSupportsDesktopDisplay = 'extd',
 BMDDeckLinkSupportsClockTimingAdjustment = 'ctad',
 BMDDeckLinkSupportsFullDuplex = 'fdup',
 BMDDeckLinkSupportsFullFrameReferenceInputTimingOffset = 'frin',
+ BMDDeckLinkSupportsSMPTELevelAOutput = 'lvla',
+ BMDDeckLinkSupportsDualLinkSDI = 'sdls',
+ BMDDeckLinkSupportsQuadLinkSDI = 'sqls',
+ BMDDeckLinkSupportsIdleOutput = 'idou',
+ BMDDeckLinkHasLTCTimecodeInput = 'hltc',
+ BMDDeckLinkSupportsDuplexModeConfiguration = 'dupx',
+ BMDDeckLinkSupportsHDRMetadata = 'hdrm',
 
 /* Integers */
 
@@ -304,13 +398,20 @@
 BMDDeckLinkNumberOfSubDevices = 'nsbd',
 BMDDeckLinkSubDeviceIndex = 'subi',
 BMDDeckLinkPersistentID = 'peid',
+ BMDDeckLinkDeviceGroupID = 'dgid',
 BMDDeckLinkTopologicalID = 'toid',
 BMDDeckLinkVideoOutputConnections = 'vocn',
 BMDDeckLinkVideoInputConnections = 'vicn',
 BMDDeckLinkAudioOutputConnections = 'aocn',
 BMDDeckLinkAudioInputConnections = 'aicn',
- BMDDeckLinkDeviceBusyState = 'dbst',
 BMDDeckLinkVideoIOSupport = 'vios',	// Returns a BMDVideoIOSupport bit field
+ BMDDeckLinkDeckControlConnections = 'dccn',
+ BMDDeckLinkDeviceInterface = 'dbus',	// Returns a BMDDeviceInterface
+ BMDDeckLinkAudioInputRCAChannelCount = 'airc',
+ BMDDeckLinkAudioInputXLRChannelCount = 'aixc',
+ BMDDeckLinkAudioOutputRCAChannelCount = 'aorc',
+ BMDDeckLinkAudioOutputXLRChannelCount = 'aoxc',
+ BMDDeckLinkPairedDevicePersistentID = 'ppid',
 
 /* Floats */
 
@@ -318,10 +419,16 @@
 BMDDeckLinkVideoInputGainMaximum = 'vigx',
 BMDDeckLinkVideoOutputGainMinimum = 'vogm',
 BMDDeckLinkVideoOutputGainMaximum = 'vogx',
+ BMDDeckLinkMicrophoneInputGainMinimum = 'migm',
+ BMDDeckLinkMicrophoneInputGainMaximum = 'migx',
 
 /* Strings */
 
- BMDDeckLinkSerialPortDeviceName = 'slpn'
+ BMDDeckLinkSerialPortDeviceName = 'slpn',
+ BMDDeckLinkVendorName = 'vndr',
+ BMDDeckLinkDisplayName = 'dspn',
+ BMDDeckLinkModelName = 'mdln',
+ BMDDeckLinkDeviceHandle = 'devh'
 };
 
 /* Enum BMDDeckLinkAPIInformationID - DeckLinkAPI information ID */
@@ -331,6 +438,52 @@
 BMDDeckLinkAPIVersion = 'vers'
 };
 
+/* Enum BMDDeckLinkStatusID - DeckLink Status ID */
+
+typedef uint32_t BMDDeckLinkStatusID;
+enum _BMDDeckLinkStatusID {
+
+ /* Integers */
+
+ bmdDeckLinkStatusDetectedVideoInputMode = 'dvim',
+ bmdDeckLinkStatusDetectedVideoInputFlags = 'dvif',
+ bmdDeckLinkStatusCurrentVideoInputMode = 'cvim',
+ bmdDeckLinkStatusCurrentVideoInputPixelFormat = 'cvip',
+ bmdDeckLinkStatusCurrentVideoInputFlags = 'cvif',
+ bmdDeckLinkStatusCurrentVideoOutputMode = 'cvom',
+ bmdDeckLinkStatusCurrentVideoOutputFlags = 'cvof',
+ bmdDeckLinkStatusPCIExpressLinkWidth = 'pwid',
+ bmdDeckLinkStatusPCIExpressLinkSpeed = 'plnk',
+ bmdDeckLinkStatusLastVideoOutputPixelFormat = 'opix',
+ bmdDeckLinkStatusReferenceSignalMode = 'refm',
+ bmdDeckLinkStatusReferenceSignalFlags = 'reff',
+ bmdDeckLinkStatusDuplexMode = 'dupx',
+ bmdDeckLinkStatusBusy = 'busy',
+
+ /* Flags */
+
+ bmdDeckLinkStatusVideoInputSignalLocked = 'visl',
+ bmdDeckLinkStatusReferenceSignalLocked = 'refl'
+};
+
+/* Enum BMDDeckLinkVideoStatusFlags - */
+
+typedef uint32_t BMDDeckLinkVideoStatusFlags;
+enum _BMDDeckLinkVideoStatusFlags {
+ bmdDeckLinkVideoStatusPsF = 1 << 0,
+ bmdDeckLinkVideoStatusDualStream3D = 1 << 1
+};
+
+/* Enum BMDDuplexStatus - Duplex status of the device */
+
+typedef uint32_t BMDDuplexStatus;
+enum _BMDDuplexStatus {
+ bmdDuplexStatusFullDuplex = 'fdup',
+ bmdDuplexStatusHalfDuplex = 'hdup',
+ bmdDuplexStatusSimplex = 'splx',
+ bmdDuplexStatusInactive = 'inac'
+};
+
 /* Enum BMDDeviceBusyState - Current device busy state */
 
 typedef uint32_t BMDDeviceBusyState;
@@ -363,7 +516,8 @@
 
 typedef uint32_t BMDNotifications;
 enum _BMDNotifications {
- bmdPreferencesChanged = 'pref'
+ bmdPreferencesChanged = 'pref',
+ bmdStatusChanged = 'stat'
 };
 
 #if defined(__cplusplus)
@@ -372,17 +526,24 @@
 
 class IDeckLinkVideoOutputCallback;
 class IDeckLinkInputCallback;
+class IDeckLinkEncoderInputCallback;
 class IDeckLinkMemoryAllocator;
 class IDeckLinkAudioOutputCallback;
 class IDeckLinkIterator;
 class IDeckLinkAPIInformation;
 class IDeckLinkOutput;
 class IDeckLinkInput;
+class IDeckLinkEncoderInput;
 class IDeckLinkVideoFrame;
 class IDeckLinkMutableVideoFrame;
 class IDeckLinkVideoFrame3DExtensions;
+class IDeckLinkVideoFrameMetadataExtensions;
 class IDeckLinkVideoInputFrame;
 class IDeckLinkVideoFrameAncillary;
+class IDeckLinkEncoderPacket;
+class IDeckLinkEncoderVideoPacket;
+class IDeckLinkEncoderAudioPacket;
+class IDeckLinkH265NALPacket;
 class IDeckLinkAudioInputPacket;
 class IDeckLinkScreenPreviewCallback;
 class IDeckLinkCocoaScreenPreviewCallback;
@@ -390,6 +551,7 @@
 class IDeckLinkNotificationCallback;
 class IDeckLinkNotification;
 class IDeckLinkAttributes;
+class IDeckLinkStatus;
 class IDeckLinkKeyer;
 class IDeckLinkVideoConversion;
 class IDeckLinkDeviceNotificationCallback;
@@ -419,6 +581,19 @@
 virtual ~IDeckLinkInputCallback () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderInputCallback - Frame arrival callback. */
+
+class IDeckLinkEncoderInputCallback : public IUnknown
+{
+public:
+ virtual HRESULT VideoInputSignalChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+ virtual HRESULT VideoPacketArrived (/* in */ IDeckLinkEncoderVideoPacket* videoPacket) = 0;
+ virtual HRESULT AudioPacketArrived (/* in */ IDeckLinkEncoderAudioPacket* audioPacket) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderInputCallback () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkMemoryAllocator - Memory allocator for video frames. */
 
 class IDeckLinkMemoryAllocator : public IUnknown
@@ -557,6 +732,43 @@
 virtual ~IDeckLinkInput () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkEncoderInput : public IUnknown
+{
+public:
+ virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0;
+ virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+ /* Video Input */
+
+ virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0;
+ virtual HRESULT DisableVideoInput (void) = 0;
+ virtual HRESULT GetAvailablePacketsCount (/* out */ uint32_t *availablePacketsCount) = 0;
+ virtual HRESULT SetMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+
+ /* Audio Input */
+
+ virtual HRESULT EnableAudioInput (/* in */ BMDAudioFormat audioFormat, /* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0;
+ virtual HRESULT DisableAudioInput (void) = 0;
+ virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+ /* Input Control */
+
+ virtual HRESULT StartStreams (void) = 0;
+ virtual HRESULT StopStreams (void) = 0;
+ virtual HRESULT PauseStreams (void) = 0;
+ virtual HRESULT FlushStreams (void) = 0;
+ virtual HRESULT SetCallback (/* in */ IDeckLinkEncoderInputCallback *theCallback) = 0;
+
+ /* Hardware Timing */
+
+ virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderInput () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
 
 class IDeckLinkVideoFrame : public IUnknown
@@ -604,6 +816,20 @@
 virtual ~IDeckLinkVideoFrame3DExtensions () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkVideoFrameMetadataExtensions - Optional interface implemented on IDeckLinkVideoFrame to support frame metadata such as HDMI HDR information */
+
+class IDeckLinkVideoFrameMetadataExtensions : public IUnknown
+{
+public:
+ virtual HRESULT GetInt (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ int64_t *value) = 0;
+ virtual HRESULT GetFloat (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ double *value) = 0;
+ virtual HRESULT GetFlag (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ bool* value) = 0;
+ virtual HRESULT GetString (/* in */ BMDDeckLinkFrameMetadataID metadataID, /* out */ CFStringRef *value) = 0;
+
+protected:
+ virtual ~IDeckLinkVideoFrameMetadataExtensions () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
 
 class IDeckLinkVideoInputFrame : public IDeckLinkVideoFrame
@@ -630,6 +856,58 @@
 virtual ~IDeckLinkVideoFrameAncillary () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderPacket - Interface to encapsulate an encoded packet. */
+
+class IDeckLinkEncoderPacket : public IUnknown
+{
+public:
+ virtual HRESULT GetBytes (/* out */ void **buffer) = 0;
+ virtual long GetSize (void) = 0;
+ virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* in */ BMDTimeScale timeScale) = 0;
+ virtual BMDPacketType GetPacketType (void) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderPacket () {} // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkEncoderVideoPacket - Provided by the IDeckLinkEncoderInput video packet arrival callback. */
+
+class IDeckLinkEncoderVideoPacket : public IDeckLinkEncoderPacket
+{
+public:
+ virtual BMDPixelFormat GetPixelFormat (void) = 0;
+ virtual HRESULT GetHardwareReferenceTimestamp (/* in */ BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0;
+
+ virtual HRESULT GetTimecode (/* in */ BMDTimecodeFormat format, /* out */ IDeckLinkTimecode **timecode) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderVideoPacket () {} // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkEncoderAudioPacket - Provided by the IDeckLinkEncoderInput audio packet arrival callback. */
+
+class IDeckLinkEncoderAudioPacket : public IDeckLinkEncoderPacket
+{
+public:
+ virtual BMDAudioFormat GetAudioFormat (void) = 0;
+
+protected:
+ virtual ~IDeckLinkEncoderAudioPacket () {} // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkH265NALPacket - Obtained through QueryInterface() on an IDeckLinkEncoderVideoPacket object */
+
+class IDeckLinkH265NALPacket : public IDeckLinkEncoderVideoPacket
+{
+public:
+ virtual HRESULT GetUnitType (/* out */ uint8_t *unitType) = 0;
+ virtual HRESULT GetBytesNoPrefix (/* out */ void **buffer) = 0;
+ virtual long GetSizeNoPrefix (void) = 0;
+
+protected:
+ virtual ~IDeckLinkH265NALPacket () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkAudioInputPacket - Provided by the IDeckLinkInput callback. */
 
 class IDeckLinkAudioInputPacket : public IUnknown
@@ -712,6 +990,21 @@
 virtual ~IDeckLinkAttributes () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkStatus - DeckLink Status interface */
+
+class IDeckLinkStatus : public IUnknown
+{
+public:
+ virtual HRESULT GetFlag (/* in */ BMDDeckLinkStatusID statusID, /* out */ bool *value) = 0;
+ virtual HRESULT GetInt (/* in */ BMDDeckLinkStatusID statusID, /* out */ int64_t *value) = 0;
+ virtual HRESULT GetFloat (/* in */ BMDDeckLinkStatusID statusID, /* out */ double *value) = 0;
+ virtual HRESULT GetString (/* in */ BMDDeckLinkStatusID statusID, /* out */ CFStringRef *value) = 0;
+ virtual HRESULT GetBytes (/* in */ BMDDeckLinkStatusID statusID, /* out */ void *buffer, /* in, out */ uint32_t *bufferSize) = 0;
+
+protected:
+ virtual ~IDeckLinkStatus () {} // call Release method to drop reference count
+};
+
 /* Interface IDeckLinkKeyer - DeckLink Keyer interface */
 
 class IDeckLinkKeyer : public IUnknown

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -42,7 +42,8 @@
 
 // Interface ID Declarations
 
-BMD_CONST REFIID IID_IDeckLinkConfiguration                       = /* 1E69FCF6-4203-4936-8076-2A9F4CFD50CB */ {0x1E,0x69,0xFC,0xF6,0x42,0x03,0x49,0x36,0x80,0x76,0x2A,0x9F,0x4C,0xFD,0x50,0xCB};
+BMD_CONST REFIID IID_IDeckLinkConfiguration                       = /* CB71734A-FE37-4E8D-8E13-802133A1C3F2 */ {0xCB,0x71,0x73,0x4A,0xFE,0x37,0x4E,0x8D,0x8E,0x13,0x80,0x21,0x33,0xA1,0xC3,0xF2};
+BMD_CONST REFIID IID_IDeckLinkEncoderConfiguration                = /* 138050E5-C60A-4552-BF3F-0F358049327E */ {0x13,0x80,0x50,0xE5,0xC6,0x0A,0x45,0x52,0xBF,0x3F,0x0F,0x35,0x80,0x49,0x32,0x7E};
 
 /* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
 
@@ -62,6 +63,7 @@
     bmdDeckLinkConfigHDMI3DPackingFormat                         = '3dpf',
     bmdDeckLinkConfigBypass                                      = 'byps',
     bmdDeckLinkConfigClockTimingAdjustment                       = 'ctad',
+    bmdDeckLinkConfigDuplexMode                                  = 'dupx',
 
     /* Audio Input/Output Flags */
 
@@ -72,9 +74,10 @@
     bmdDeckLinkConfigFieldFlickerRemoval                         = 'fdfr',
     bmdDeckLinkConfigHD1080p24ToHD1080i5994Conversion            = 'to59',
     bmdDeckLinkConfig444SDIVideoOutput                           = '444o',
-    bmdDeckLinkConfigSingleLinkVideoOutput                       = 'sglo',
     bmdDeckLinkConfigBlackVideoOutputDuringCapture               = 'bvoc',
     bmdDeckLinkConfigLowLatencyVideoOutput                       = 'llvo',
+    bmdDeckLinkConfigDownConversionOnAllAnalogOutput             = 'caao',
+    bmdDeckLinkConfigSMPTELevelAOutput                           = 'smta',
 
     /* Video Output Integers */
 
@@ -85,6 +88,7 @@
     bmdDeckLinkConfigVideoOutputIdleOperation                    = 'voio',
     bmdDeckLinkConfigDefaultVideoOutputMode                      = 'dvom',
     bmdDeckLinkConfigDefaultVideoOutputModeFlags                 = 'dvof',
+    bmdDeckLinkConfigSDIOutputLinkConfiguration                  = 'solc',
 
     /* Video Output Floats */
 
@@ -100,6 +104,7 @@
 
     bmdDeckLinkConfigVideoInputScanning                          = 'visc',	// Applicable to H264 Pro Recorder only
     bmdDeckLinkConfigUseDedicatedLTCInput                        = 'dltc',	// Use timecode from LTC input instead of SDI stream
+    bmdDeckLinkConfigSDIInput3DPayloadOverride                   = '3dds',
 
     /* Video Input Integers */
 
@@ -122,6 +127,10 @@
     bmdDeckLinkConfigVideoInputSVideoLumaGain                    = 'islg',
     bmdDeckLinkConfigVideoInputSVideoChromaGain                  = 'iscg',
 
+    /* Audio Input Flags */
+
+    bmdDeckLinkConfigMicrophonePhantomPower                      = 'mphp',
+
     /* Audio Input Integers */
 
     bmdDeckLinkConfigAudioInputConnection                        = 'aicn',
@@ -133,6 +142,7 @@
     bmdDeckLinkConfigAnalogAudioInputScaleChannel3               = 'ais3',
     bmdDeckLinkConfigAnalogAudioInputScaleChannel4               = 'ais4',
     bmdDeckLinkConfigDigitalAudioInputScale                      = 'dais',
+    bmdDeckLinkConfigMicrophoneInputGain                         = 'micg',
 
     /* Audio Output Integers */
 
@@ -144,12 +154,55 @@
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel2              = 'aos2',
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel3              = 'aos3',
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel4              = 'aos4',
-    bmdDeckLinkConfigDigitalAudioOutputScale                     = 'daos'
+    bmdDeckLinkConfigDigitalAudioOutputScale                     = 'daos',
+    bmdDeckLinkConfigHeadphoneVolume                             = 'hvol',
+
+    /* Device Information Strings */
+
+    bmdDeckLinkConfigDeviceInformationLabel                      = 'dila',
+    bmdDeckLinkConfigDeviceInformationSerialNumber               = 'disn',
+    bmdDeckLinkConfigDeviceInformationCompany                    = 'dico',
+    bmdDeckLinkConfigDeviceInformationPhone                      = 'diph',
+    bmdDeckLinkConfigDeviceInformationEmail                      = 'diem',
+    bmdDeckLinkConfigDeviceInformationDate                       = 'dida',
+
+    /* Deck Control Integers */
+
+    bmdDeckLinkConfigDeckControlConnection                       = 'dcco'
+};
+
+/* Enum BMDDeckLinkEncoderConfigurationID - DeckLink Encoder Configuration ID */
+
+typedef uint32_t BMDDeckLinkEncoderConfigurationID;
+enum _BMDDeckLinkEncoderConfigurationID {
+
+    /* Video Encoder Integers */
+
+    bmdDeckLinkEncoderConfigPreferredBitDepth                    = 'epbr',
+    bmdDeckLinkEncoderConfigFrameCodingMode                      = 'efcm',
+
+    /* HEVC/H.265 Encoder Integers */
+
+    bmdDeckLinkEncoderConfigH265TargetBitrate                    = 'htbr',
+
+    /* DNxHR/DNxHD Compression ID */
+
+    bmdDeckLinkEncoderConfigDNxHRCompressionID                   = 'dcid',
+
+    /* DNxHR/DNxHD Level */
+
+    bmdDeckLinkEncoderConfigDNxHRLevel                           = 'dlev',
+
+    /* Encoded Sample Decriptions */
+
+    bmdDeckLinkEncoderConfigMPEG4SampleDescription               = 'stsE',	// Full MPEG4 sample description (aka SampleEntry of an 'stsd' atom-box). Useful for MediaFoundation, QuickTime, MKV and more
+    bmdDeckLinkEncoderConfigMPEG4CodecSpecificDesc               = 'esds'	// Sample description extensions only (atom stream, each with size and fourCC header). Useful for AVFoundation, VideoToolbox, MKV and more
 };
 
 // Forward Declarations
 
 class IDeckLinkConfiguration;
+class IDeckLinkEncoderConfiguration;
 
 /* Interface IDeckLinkConfiguration - DeckLink Configuration interface */
 
@@ -170,6 +223,25 @@
     virtual ~IDeckLinkConfiguration () {} // call Release method to drop reference count
 };
 
+/* Interface IDeckLinkEncoderConfiguration - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */
+
+class IDeckLinkEncoderConfiguration : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ CFStringRef value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ CFStringRef *value) = 0;
+    virtual HRESULT GetBytes (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ void *buffer /* optional */, /* in, out */ uint32_t *bufferSize) = 0;
+
+protected:
+    virtual ~IDeckLinkEncoderConfiguration () {} // call Release method to drop reference count
+};
+
 /* Functions */
 
 extern "C" {

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration_v10_2.h Added

@@ -0,0 +1,60 @@
+/* -LICENSE-START-
+** Copyright (c) 2014 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_2_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_2_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkConfiguration_v10_2                = /* C679A35B-610C-4D09-B748-1D0478100FC0 */ {0xC6,0x79,0xA3,0x5B,0x61,0x0C,0x4D,0x09,0xB7,0x48,0x1D,0x04,0x78,0x10,0x0F,0xC0};
+
+// Forward Declarations
+
+class IDeckLinkConfiguration_v10_2;
+
+/* Interface IDeckLinkConfiguration_v10_2 - DeckLink Configuration interface */
+
+class IDeckLinkConfiguration_v10_2 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ CFStringRef value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ CFStringRef *value) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+protected:
+    virtual ~IDeckLinkConfiguration_v10_2 () {} // call Release method to drop reference count
+};
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_2_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration_v10_4.h Added

@@ -0,0 +1,62 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_4_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_4_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkConfiguration_v10_4                       = /* 1E69FCF6-4203-4936-8076-2A9F4CFD50CB */ {0x1E,0x69,0xFC,0xF6,0x42,0x03,0x49,0x36,0x80,0x76,0x2A,0x9F,0x4C,0xFD,0x50,0xCB};
+
+//
+// Forward Declarations
+
+class IDeckLinkConfiguration_v10_4;
+
+/* Interface IDeckLinkConfiguration_v10_4 - DeckLink Configuration interface */
+
+class IDeckLinkConfiguration_v10_4 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ CFStringRef value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ CFStringRef *value) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+protected:
+    virtual ~IDeckLinkConfiguration_v10_4 () {} // call Release method to drop reference count
+};
+
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_4_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration_v10_5.h Added

@@ -0,0 +1,60 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_5_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_5_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkEncoderConfiguration_v10_5          = /* 67455668-0848-45DF-8D8E-350A77C9A028 */ {0x67,0x45,0x56,0x68,0x08,0x48,0x45,0xDF,0x8D,0x8E,0x35,0x0A,0x77,0xC9,0xA0,0x28};
+
+// Forward Declarations
+
+class IDeckLinkConfiguration_v10_5;
+
+/* Interface IDeckLinkEncoderConfiguration_v10_5 - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */
+
+class IDeckLinkEncoderConfiguration_v10_5 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* in */ CFStringRef value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkEncoderConfigurationID cfgID, /* out */ CFStringRef *value) = 0;
+    virtual HRESULT GetDecoderConfigurationInfo (/* out */ void *buffer, /* in */ long bufferSize, /* out */ long *returnedSize) = 0;
+
+protected:
+    virtual ~IDeckLinkEncoderConfiguration_v10_5 () {} // call Release method to drop reference count
+};
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_5_H) */

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h Changed

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h Changed

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDispatch_v7_6.cpp Added

@@ -0,0 +1,105 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPIDispatch_v7_6.cpp */
+
+#include "DeckLinkAPI_v7_6.h"
+#include <pthread.h>
+
+#define kDeckLinkAPI_BundlePath "/Library/Frameworks/DeckLinkAPI.framework"
+
+typedef IDeckLinkIterator* (*CreateIteratorFunc_v7_6)(void);
+typedef IDeckLinkGLScreenPreviewHelper_v7_6* (*CreateOpenGLScreenPreviewHelperFunc_v7_6)(void);
+typedef IDeckLinkCocoaScreenPreviewCallback_v7_6* (*CreateCocoaScreenPreviewFunc_v7_6)(void*);
+typedef IDeckLinkVideoConversion_v7_6* (*CreateVideoConversionInstanceFunc_v7_6)(void);
+
+static pthread_once_t								gDeckLinkOnceControl		= PTHREAD_ONCE_INIT;
+static CFBundleRef									gBundleRef					= NULL;
+static CreateIteratorFunc_v7_6						gCreateIteratorFunc			= NULL;
+static CreateOpenGLScreenPreviewHelperFunc_v7_6		gCreateOpenGLPreviewFunc	= NULL;
+static CreateCocoaScreenPreviewFunc_v7_6			gCreateCocoaPreviewFunc		= NULL;
+static CreateVideoConversionInstanceFunc_v7_6		gCreateVideoConversionFunc	= NULL;
+
+
+void	InitDeckLinkAPI_v7_6 (void)
+{
+	CFURLRef		bundleURL;
+
+	bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, CFSTR(kDeckLinkAPI_BundlePath), kCFURLPOSIXPathStyle, true);
+	if (bundleURL != NULL)
+	{
+		gBundleRef = CFBundleCreate(kCFAllocatorDefault, bundleURL);
+		if (gBundleRef != NULL)
+		{
+			gCreateIteratorFunc = (CreateIteratorFunc_v7_6)CFBundleGetFunctionPointerForName(gBundleRef, CFSTR("CreateDeckLinkIteratorInstance"));
+			gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc_v7_6)CFBundleGetFunctionPointerForName(gBundleRef, CFSTR("CreateOpenGLScreenPreviewHelper"));
+			gCreateCocoaPreviewFunc = (CreateCocoaScreenPreviewFunc_v7_6)CFBundleGetFunctionPointerForName(gBundleRef, CFSTR("CreateCocoaScreenPreview"));
+			gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc_v7_6)CFBundleGetFunctionPointerForName(gBundleRef, CFSTR("CreateVideoConversionInstance"));
+		}
+		CFRelease(bundleURL);
+	}
+}
+
+IDeckLinkIterator*		CreateDeckLinkIteratorInstance_v7_6 (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+
+	if (gCreateIteratorFunc == NULL)
+		return NULL;
+
+	return gCreateIteratorFunc();
+}
+
+IDeckLinkGLScreenPreviewHelper_v7_6*		CreateOpenGLScreenPreviewHelper_v7_6 (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+
+	if (gCreateOpenGLPreviewFunc == NULL)
+		return NULL;
+
+	return gCreateOpenGLPreviewFunc();
+}
+
+IDeckLinkCocoaScreenPreviewCallback_v7_6*	CreateCocoaScreenPreview_v7_6 (void* parentView)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+
+	if (gCreateCocoaPreviewFunc == NULL)
+		return NULL;
+
+	return gCreateCocoaPreviewFunc(parentView);
+}
+
+IDeckLinkVideoConversion_v7_6* CreateVideoConversionInstance_v7_6 (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
+
+	if (gCreateVideoConversionFunc == NULL)
+		return NULL;
+
+	return gCreateVideoConversionFunc();
+}
+

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDispatch_v8_0.cpp Added

@@ -0,0 +1,131 @@
+/* -LICENSE-START-
+** Copyright (c) 2011 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPIDispatch.cpp */
+
+#include "DeckLinkAPI_v8_0.h"
+#include <pthread.h>
+
+#if BLACKMAGIC_DECKLINK_API_MAGIC != 1
+	#error The DeckLink API version of DeckLinkAPIDispatch.cpp is not the same version as DeckLinkAPI.h
+#endif
+
+#define kDeckLinkAPI_BundlePath "/Library/Frameworks/DeckLinkAPI.framework"
+
+typedef IDeckLinkIterator_v8_0* (*CreateIteratorFunc)(void);
+typedef IDeckLinkAPIInformation* (*CreateAPIInformationFunc)(void);
+typedef IDeckLinkGLScreenPreviewHelper* (*CreateOpenGLScreenPreviewHelperFunc)(void);
+typedef IDeckLinkCocoaScreenPreviewCallback* (*CreateCocoaScreenPreviewFunc)(void*);
+typedef IDeckLinkVideoConversion* (*CreateVideoConversionInstanceFunc)(void);
+
+static pthread_once_t						gDeckLinkOnceControl		= PTHREAD_ONCE_INIT;
+static CFBundleRef							gDeckLinkAPIBundleRef		= NULL;
+static CreateIteratorFunc					gCreateIteratorFunc			= NULL;
+static CreateAPIInformationFunc				gCreateAPIInformationFunc	= NULL;
+static CreateOpenGLScreenPreviewHelperFunc	gCreateOpenGLPreviewFunc	= NULL;
+static CreateCocoaScreenPreviewFunc			gCreateCocoaPreviewFunc		= NULL;
+static CreateVideoConversionInstanceFunc	gCreateVideoConversionFunc	= NULL;
+
+
+void	InitDeckLinkAPI (void)
+{
+	CFURLRef		bundleURL;
+
+	bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, CFSTR(kDeckLinkAPI_BundlePath), kCFURLPOSIXPathStyle, true);
+	if (bundleURL != NULL)
+	{
+		gDeckLinkAPIBundleRef = CFBundleCreate(kCFAllocatorDefault, bundleURL);
+		if (gDeckLinkAPIBundleRef != NULL)
+		{
+			gCreateIteratorFunc = (CreateIteratorFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateDeckLinkIteratorInstance_0001"));
+			gCreateAPIInformationFunc = (CreateAPIInformationFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateDeckLinkAPIInformationInstance_0001"));
+			gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateOpenGLScreenPreviewHelper_0001"));
+			gCreateCocoaPreviewFunc = (CreateCocoaScreenPreviewFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateCocoaScreenPreview_0001"));
+			gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc)CFBundleGetFunctionPointerForName(gDeckLinkAPIBundleRef, CFSTR("CreateVideoConversionInstance_0001"));
+		}
+		CFRelease(bundleURL);
+	}
+}
+
+bool		IsDeckLinkAPIPresent (void)
+{
+	// If the DeckLink API bundle was successfully loaded, return this knowledge to the caller
+	if (gDeckLinkAPIBundleRef != NULL)
+		return true;
+
+	return false;
+}
+
+IDeckLinkIterator_v8_0*		CreateDeckLinkIteratorInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateIteratorFunc == NULL)
+		return NULL;
+
+	return gCreateIteratorFunc();
+}
+
+IDeckLinkAPIInformation*	CreateDeckLinkAPIInformationInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateAPIInformationFunc == NULL)
+		return NULL;
+
+	return gCreateAPIInformationFunc();
+}
+
+IDeckLinkGLScreenPreviewHelper*		CreateOpenGLScreenPreviewHelper (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateOpenGLPreviewFunc == NULL)
+		return NULL;
+
+	return gCreateOpenGLPreviewFunc();
+}
+
+IDeckLinkCocoaScreenPreviewCallback*	CreateCocoaScreenPreview (void* parentView)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateCocoaPreviewFunc == NULL)
+		return NULL;
+
+	return gCreateCocoaPreviewFunc(parentView);
+}
+
+IDeckLinkVideoConversion* CreateVideoConversionInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+
+	if (gCreateVideoConversionFunc == NULL)
+		return NULL;
+
+	return gCreateVideoConversionFunc();
+}
+

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -135,7 +135,12 @@
     bmdFormat12BitRGB                                            = 'R12B',	// Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component
     bmdFormat12BitRGBLE                                          = 'R12L',	// Little-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component
     bmdFormat10BitRGBXLE                                         = 'R10l',	// Little-endian 10-bit RGB with SMPTE video levels (64-940)
-    bmdFormat10BitRGBX                                           = 'R10b'	// Big-endian 10-bit RGB with SMPTE video levels (64-940)
+    bmdFormat10BitRGBX                                           = 'R10b',	// Big-endian 10-bit RGB with SMPTE video levels (64-940)
+    bmdFormatH265                                                = 'hev1',	// High Efficiency Video Coding (HEVC/h.265)
+
+    /* AVID DNxHR */
+
+    bmdFormatDNxHR                                               = 'AVdh'
 };
 
 /* Enum BMDDisplayModeFlags - Flags to describe the characteristics of an IDeckLinkDisplayMode. */

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h Changed

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -77,7 +77,17 @@
 bmdAudioConnectionAESEBU = 1 << 1,
 bmdAudioConnectionAnalog = 1 << 2,
 bmdAudioConnectionAnalogXLR = 1 << 3,
- bmdAudioConnectionAnalogRCA = 1 << 4
+ bmdAudioConnectionAnalogRCA = 1 << 4,
+ bmdAudioConnectionMicrophone = 1 << 5,
+ bmdAudioConnectionHeadphones = 1 << 6
+};
+
+/* Enum BMDDeckControlConnection - Deck control connections */
+
+typedef uint32_t BMDDeckControlConnection;
+enum _BMDDeckControlConnection {
+ bmdDeckControlConnectionRS422Remote1 = 1 << 0,
+ bmdDeckControlConnectionRS422Remote2 = 1 << 1
 };
 
 // Forward Declarations

obs-studio-0.16.2.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h Changed

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v10_2.h Added

@@ -0,0 +1,55 @@
+/* -LICENSE-START-
+** Copyright (c) 2014 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_2_H
+#define BMD_DECKLINKAPI_v10_2_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef uint32_t BMDDeckLinkConfigurationID_v10_2;
+enum  _BMDDeckLinkConfigurationID_v10_2 {
+    /* Video output flags */
+
+    bmdDeckLinkConfig3GBpsVideoOutput_v10_2                      = '3gbs',
+};
+
+/* Enum BMDAudioConnection_v10_2 - Audio connection types */
+
+typedef uint32_t BMDAudioConnection_v10_2;
+enum _BMDAudioConnection_v10_2 {
+    bmdAudioConnectionEmbedded_v10_2                             = 'embd',
+    bmdAudioConnectionAESEBU_v10_2                               = 'aes ',
+    bmdAudioConnectionAnalog_v10_2                               = 'anlg',
+    bmdAudioConnectionAnalogXLR_v10_2                            = 'axlr',
+    bmdAudioConnectionAnalogRCA_v10_2                            = 'arca'
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_2_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v10_4.h Added

@@ -0,0 +1,45 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_4_H
+#define BMD_DECKLINKAPI_v10_4_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef uint32_t BMDDeckLinkConfigurationID_v10_4;
+enum _BMDDeckLinkConfigurationID_v10_4 {
+
+    /* Video output flags */
+
+    bmdDeckLinkConfigSingleLinkVideoOutput_v10_4                       = /* 'sglo' */ 0x73676C6F,
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_4_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v10_5.h Added

@@ -0,0 +1,46 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_5_H
+#define BMD_DECKLINKAPI_v10_5_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
+
+typedef uint32_t BMDDeckLinkAttributeID_v10_5;
+enum _BMDDeckLinkAttributeID_v10_5 {
+
+    /* Integers */
+
+    BMDDeckLinkDeviceBusyState_v10_5                             = /* 'dbst' */ 0x64627374,
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_5_H) */
+

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v10_6.h Added

@@ -0,0 +1,51 @@
+/* -LICENSE-START-
+** Copyright (c) 2016 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_6_H
+#define BMD_DECKLINKAPI_v10_6_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
+
+typedef uint32_t BMDDeckLinkAttributeID_c10_6;
+enum _BMDDeckLinkAttributeID_v10_6 {
+
+    /* Flags */
+
+    BMDDeckLinkSupportsDesktopDisplay_v10_6                      = 'extd',
+};
+
+typedef uint32_t BMDIdleVideoOutputOperation_v10_6;
+enum _BMDIdleVideoOutputOperation_v10_6 {
+    bmdIdleVideoOutputDesktop_v10_6                              = 'desk'
+};
+
+
+#endif /* defined(BMD_DECKLINKAPI_v10_6_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v7_1.h Added

@@ -0,0 +1,198 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v7_1.h */
+
+#ifndef __DeckLink_API_v7_1_h__
+#define __DeckLink_API_v7_1_h__
+
+#include "DeckLinkAPI.h"
+
+// "B28131B6-59AC-4857-B5AC-CD75D5883E2F"
+#define IID_IDeckLinkDisplayModeIterator_v7_1	(REFIID){0xB2,0x81,0x31,0xB6,0x59,0xAC,0x48,0x57,0xB5,0xAC,0xCD,0x75,0xD5,0x88,0x3E,0x2F}
+
+// "AF0CD6D5-8376-435E-8433-54F9DD530AC3"
+#define IID_IDeckLinkDisplayMode_v7_1			(REFIID){0xAF,0x0C,0xD6,0xD5,0x83,0x76,0x43,0x5E,0x84,0x33,0x54,0xF9,0xDD,0x53,0x0A,0xC3}
+
+// "EBD01AFA-E4B0-49C6-A01D-EDB9D1B55FD9"
+#define IID_IDeckLinkVideoOutputCallback_v7_1	(REFIID){0xEB,0xD0,0x1A,0xFA,0xE4,0xB0,0x49,0xC6,0xA0,0x1D,0xED,0xB9,0xD1,0xB5,0x5F,0xD9}
+
+// "7F94F328-5ED4-4E9F-9729-76A86BDC99CC"
+#define IID_IDeckLinkInputCallback_v7_1			(REFIID){0x7F,0x94,0xF3,0x28,0x5E,0xD4,0x4E,0x9F,0x97,0x29,0x76,0xA8,0x6B,0xDC,0x99,0xCC}
+
+// "AE5B3E9B-4E1E-4535-B6E8-480FF52F6CE5"
+#define IID_IDeckLinkOutput_v7_1				(REFIID){0xAE,0x5B,0x3E,0x9B,0x4E,0x1E,0x45,0x35,0xB6,0xE8,0x48,0x0F,0xF5,0x2F,0x6C,0xE5}
+
+// "2B54EDEF-5B32-429F-BA11-BB990596EACD"
+#define IID_IDeckLinkInput_v7_1					(REFIID){0x2B,0x54,0xED,0xEF,0x5B,0x32,0x42,0x9F,0xBA,0x11,0xBB,0x99,0x05,0x96,0xEA,0xCD}
+
+// "333F3A10-8C2D-43CF-B79D-46560FEEA1CE"
+#define IID_IDeckLinkVideoFrame_v7_1			(REFIID){0x33,0x3F,0x3A,0x10,0x8C,0x2D,0x43,0xCF,0xB7,0x9D,0x46,0x56,0x0F,0xEE,0xA1,0xCE}
+
+// "C8B41D95-8848-40EE-9B37-6E3417FB114B"
+#define IID_IDeckLinkVideoInputFrame_v7_1		(REFIID){0xC8,0xB4,0x1D,0x95,0x88,0x48,0x40,0xEE,0x9B,0x37,0x6E,0x34,0x17,0xFB,0x11,0x4B}
+
+// "C86DE4F6-A29F-42E3-AB3A-1363E29F0788"
+#define IID_IDeckLinkAudioInputPacket_v7_1		(REFIID){0xC8,0x6D,0xE4,0xF6,0xA2,0x9F,0x42,0xE3,0xAB,0x3A,0x13,0x63,0xE2,0x9F,0x07,0x88}
+
+#if defined(__cplusplus)
+
+class IDeckLinkVideoFrame_v7_1;
+class IDeckLinkDisplayModeIterator_v7_1;
+class IDeckLinkDisplayMode_v7_1;
+class IDeckLinkVideoInputFrame_v7_1;
+class IDeckLinkAudioInputPacket_v7_1;
+
+class IDeckLinkDisplayModeIterator_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT	STDMETHODCALLTYPE	Next (IDeckLinkDisplayMode_v7_1* *deckLinkDisplayMode) = 0;
+};
+
+
+class IDeckLinkDisplayMode_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT			STDMETHODCALLTYPE	GetName (CFStringRef* name) = 0;
+	virtual	BMDDisplayMode	STDMETHODCALLTYPE	GetDisplayMode () = 0;
+	virtual	long			STDMETHODCALLTYPE	GetWidth () = 0;
+	virtual	long			STDMETHODCALLTYPE	GetHeight () = 0;
+	virtual	HRESULT			STDMETHODCALLTYPE	GetFrameRate (BMDTimeValue *frameDuration, BMDTimeScale *timeScale) = 0;
+};
+
+class IDeckLinkVideoOutputCallback_v7_1 : public IUnknown
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE	ScheduledFrameCompleted (IDeckLinkVideoFrame_v7_1* completedFrame, BMDOutputFrameCompletionResult result) = 0;
+};
+
+class IDeckLinkInputCallback_v7_1 : public IUnknown
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE	VideoInputFrameArrived (IDeckLinkVideoInputFrame_v7_1* videoFrame, IDeckLinkAudioInputPacket_v7_1* audioPacket) = 0;
+};
+
+// IDeckLinkOutput_v7_1.  Created by QueryInterface from IDeckLink.
+class IDeckLinkOutput_v7_1 : public IUnknown
+{
+public:
+	// Display mode predicates
+	virtual	HRESULT	STDMETHODCALLTYPE	DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDDisplayModeSupport *result) = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	GetDisplayModeIterator (IDeckLinkDisplayModeIterator_v7_1* *iterator) = 0;
+
+
+	// Video output
+	virtual HRESULT STDMETHODCALLTYPE	EnableVideoOutput (BMDDisplayMode displayMode) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableVideoOutput () = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	SetVideoOutputFrameMemoryAllocator (IDeckLinkMemoryAllocator* theAllocator) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1* *outFrame) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	CreateVideoFrameFromBuffer (void* buffer, int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1* *outFrame) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	DisplayVideoFrameSync (IDeckLinkVideoFrame_v7_1* theFrame) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ScheduleVideoFrame (IDeckLinkVideoFrame_v7_1* theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	SetScheduledFrameCompletionCallback (IDeckLinkVideoOutputCallback_v7_1* theCallback) = 0;
+
+
+	// Audio output
+	virtual HRESULT STDMETHODCALLTYPE	EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableAudioOutput () = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	WriteAudioSamplesSync (void* buffer, uint32_t sampleFrameCount, uint32_t *sampleFramesWritten) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	BeginAudioPreroll () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	EndAudioPreroll () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ScheduleAudioSamples (void* buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, uint32_t *sampleFramesWritten) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	GetBufferedAudioSampleFrameCount (uint32_t *bufferedSampleCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	FlushBufferedAudioSamples () = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE	SetAudioCallback (IDeckLinkAudioOutputCallback* theCallback) = 0;
+
+
+	// Output control
+	virtual HRESULT STDMETHODCALLTYPE	StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, BMDTimeValue *elapsedTimeSinceSchedulerBegan) = 0;
+};
+
+// IDeckLinkInput_v7_1.  Created by QueryInterface from IDeckLink.
+class IDeckLinkInput_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT	STDMETHODCALLTYPE	DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDDisplayModeSupport *result) = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	GetDisplayModeIterator (IDeckLinkDisplayModeIterator_v7_1 **iterator) = 0;
+
+	// Video input
+	virtual HRESULT STDMETHODCALLTYPE	EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableVideoInput () = 0;
+
+	// Audio input
+	virtual HRESULT STDMETHODCALLTYPE	EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableAudioInput () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ReadAudioSamples (void* buffer, uint32_t sampleFrameCount, uint32_t *sampleFramesRead, BMDTimeValue *audioPacketTime, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	GetBufferedAudioSampleFrameCount (uint32_t *bufferedSampleCount) = 0;
+
+	// Input control
+	virtual HRESULT	STDMETHODCALLTYPE	StartStreams () = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	StopStreams () = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	PauseStreams () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	SetCallback (IDeckLinkInputCallback_v7_1* theCallback) = 0;
+};
+
+// IDeckLinkVideoFrame_v7_1.  Created by IDeckLinkOutput::CreateVideoFrame.
+class IDeckLinkVideoFrame_v7_1 : public IUnknown
+{
+public:
+	virtual long STDMETHODCALLTYPE					GetWidth () = 0;
+	virtual long STDMETHODCALLTYPE					GetHeight () = 0;
+	virtual long STDMETHODCALLTYPE					GetRowBytes () = 0;
+	virtual BMDPixelFormat STDMETHODCALLTYPE		GetPixelFormat () = 0;
+	virtual BMDFrameFlags STDMETHODCALLTYPE			GetFlags () = 0;
+	virtual HRESULT STDMETHODCALLTYPE				GetBytes (void* *buffer) = 0;
+};
+
+// IDeckLinkVideoInputFrame_v7_1.  Provided by the IDeckLinkInput_v7_1 frame arrival callback.
+class IDeckLinkVideoInputFrame_v7_1 : public IDeckLinkVideoFrame_v7_1
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE			GetFrameTime (BMDTimeValue *frameTime, BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+};
+
+// IDeckLinkAudioInputPacket_v7_1.  Provided by the IDeckLinkInput_v7_1 callback.
+class IDeckLinkAudioInputPacket_v7_1 : public IUnknown
+{
+public:
+	virtual long STDMETHODCALLTYPE				GetSampleCount () = 0;
+	virtual HRESULT STDMETHODCALLTYPE			GetBytes (void* *buffer) = 0;
+
+	virtual HRESULT STDMETHODCALLTYPE			GetAudioPacketTime (BMDTimeValue *packetTime, BMDTimeScale timeScale) = 0;
+};
+
+#endif		// defined(__cplusplus)
+
+#endif		// __DeckLink_API_v7_1_h__
+

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v7_3.h Added

@@ -0,0 +1,173 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_3.h */
+
+#ifndef __DeckLink_API_v7_3_h__
+#define __DeckLink_API_v7_3_h__
+
+#include "DeckLinkAPI.h"
+#include "DeckLinkAPI_v7_6.h"
+
+/* Interface ID Declarations */
+
+#define IID_IDeckLinkInputCallback_v7_3                  /* FD6F311D-4D00-444B-9ED4-1F25B5730AD0 */ (REFIID){0xFD,0x6F,0x31,0x1D,0x4D,0x00,0x44,0x4B,0x9E,0xD4,0x1F,0x25,0xB5,0x73,0x0A,0xD0}
+#define IID_IDeckLinkOutput_v7_3                         /* 271C65E3-C323-4344-A30F-D908BCB20AA3 */ (REFIID){0x27,0x1C,0x65,0xE3,0xC3,0x23,0x43,0x44,0xA3,0x0F,0xD9,0x08,0xBC,0xB2,0x0A,0xA3}
+#define IID_IDeckLinkInput_v7_3                          /* 4973F012-9925-458C-871C-18774CDBBECB */ (REFIID){0x49,0x73,0xF0,0x12,0x99,0x25,0x45,0x8C,0x87,0x1C,0x18,0x77,0x4C,0xDB,0xBE,0xCB}
+#define IID_IDeckLinkVideoInputFrame_v7_3                /* CF317790-2894-11DE-8C30-0800200C9A66 */ (REFIID){0xCF,0x31,0x77,0x90,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66}
+
+/* End Interface ID Declarations */
+
+#if defined(__cplusplus)
+
+/* Forward Declarations */
+
+class IDeckLinkVideoInputFrame_v7_3;
+
+/* End Forward Declarations */
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (BMDDisplayMode displayMode, BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame_v7_6 **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount, BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *elapsedTimeSinceSchedulerBegan) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkOutput */
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+class IDeckLinkInputCallback_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode_v7_6 *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+    virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame_v7_3 *videoFrame, /* in */ IDeckLinkAudioInputPacket *audioPacket) = 0;
+
+protected:
+    virtual ~IDeckLinkInputCallback_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInputCallback */
+
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v7_3 *theCallback) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInput */
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+class IDeckLinkVideoInputFrame_v7_3 : public IDeckLinkVideoFrame_v7_6
+{
+public:
+    virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoInputFrame_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoInputFrame */
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_3_h__

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v7_6.h Added

@@ -0,0 +1,421 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_6.h */
+
+#ifndef __DeckLink_API_v7_6_h__
+#define __DeckLink_API_v7_6_h__
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkVideoOutputCallback_v7_6            /* E763A626-4A3C-49D1-BF13-E7AD3692AE52 */ (REFIID){0xE7,0x63,0xA6,0x26,0x4A,0x3C,0x49,0xD1,0xBF,0x13,0xE7,0xAD,0x36,0x92,0xAE,0x52}
+#define IID_IDeckLinkInputCallback_v7_6                  /* 31D28EE7-88B6-4CB1-897A-CDBF79A26414 */ (REFIID){0x31,0xD2,0x8E,0xE7,0x88,0xB6,0x4C,0xB1,0x89,0x7A,0xCD,0xBF,0x79,0xA2,0x64,0x14}
+#define IID_IDeckLinkDisplayModeIterator_v7_6            /* 455D741F-1779-4800-86F5-0B5D13D79751 */ (REFIID){0x45,0x5D,0x74,0x1F,0x17,0x79,0x48,0x00,0x86,0xF5,0x0B,0x5D,0x13,0xD7,0x97,0x51}
+#define IID_IDeckLinkDisplayMode_v7_6                    /* 87451E84-2B7E-439E-A629-4393EA4A8550 */ (REFIID){0x87,0x45,0x1E,0x84,0x2B,0x7E,0x43,0x9E,0xA6,0x29,0x43,0x93,0xEA,0x4A,0x85,0x50}
+#define IID_IDeckLinkOutput_v7_6                         /* 29228142-EB8C-4141-A621-F74026450955 */ (REFIID){0x29,0x22,0x81,0x42,0xEB,0x8C,0x41,0x41,0xA6,0x21,0xF7,0x40,0x26,0x45,0x09,0x55}
+#define IID_IDeckLinkInput_v7_6                          /* 300C135A-9F43-48E2-9906-6D7911D93CF1 */ (REFIID){0x30,0x0C,0x13,0x5A,0x9F,0x43,0x48,0xE2,0x99,0x06,0x6D,0x79,0x11,0xD9,0x3C,0xF1}
+#define IID_IDeckLinkTimecode_v7_6                       /* EFB9BCA6-A521-44F7-BD69-2332F24D9EE6 */ (REFIID){0xEF,0xB9,0xBC,0xA6,0xA5,0x21,0x44,0xF7,0xBD,0x69,0x23,0x32,0xF2,0x4D,0x9E,0xE6}
+#define IID_IDeckLinkVideoFrame_v7_6                     /* A8D8238E-6B18-4196-99E1-5AF717B83D32 */ (REFIID){0xA8,0xD8,0x23,0x8E,0x6B,0x18,0x41,0x96,0x99,0xE1,0x5A,0xF7,0x17,0xB8,0x3D,0x32}
+#define IID_IDeckLinkMutableVideoFrame_v7_6              /* 46FCEE00-B4E6-43D0-91C0-023A7FCEB34F */ (REFIID){0x46,0xFC,0xEE,0x00,0xB4,0xE6,0x43,0xD0,0x91,0xC0,0x02,0x3A,0x7F,0xCE,0xB3,0x4F}
+#define IID_IDeckLinkVideoInputFrame_v7_6                /* 9A74FA41-AE9F-47AC-8CF4-01F42DD59965 */ (REFIID){0x9A,0x74,0xFA,0x41,0xAE,0x9F,0x47,0xAC,0x8C,0xF4,0x01,0xF4,0x2D,0xD5,0x99,0x65}
+#define IID_IDeckLinkScreenPreviewCallback_v7_6          /* 373F499D-4B4D-4518-AD22-6354E5A5825E */ (REFIID){0x37,0x3F,0x49,0x9D,0x4B,0x4D,0x45,0x18,0xAD,0x22,0x63,0x54,0xE5,0xA5,0x82,0x5E}
+#define IID_IDeckLinkCocoaScreenPreviewCallback_v7_6     /* D174152F-8F96-4C07-83A5-DD5F5AF0A2AA */ (REFIID){0xD1,0x74,0x15,0x2F,0x8F,0x96,0x4C,0x07,0x83,0xA5,0xDD,0x5F,0x5A,0xF0,0xA2,0xAA}
+#define IID_IDeckLinkGLScreenPreviewHelper_v7_6          /* BA575CD9-A15E-497B-B2C2-F9AFE7BE4EBA */ (REFIID){0xBA,0x57,0x5C,0xD9,0xA1,0x5E,0x49,0x7B,0xB2,0xC2,0xF9,0xAF,0xE7,0xBE,0x4E,0xBA}
+#define IID_IDeckLinkVideoConversion_v7_6                /* 3EB504C9-F97D-40FE-A158-D407D48CB53B */ (REFIID){0x3E,0xB5,0x04,0xC9,0xF9,0x7D,0x40,0xFE,0xA1,0x58,0xD4,0x07,0xD4,0x8C,0xB5,0x3B}
+#define IID_IDeckLinkConfiguration_v7_6                  /* B8EAD569-B764-47F0-A73F-AE40DF6CBF10 */ (REFIID){0xB8,0xEA,0xD5,0x69,0xB7,0x64,0x47,0xF0,0xA7,0x3F,0xAE,0x40,0xDF,0x6C,0xBF,0x10}
+
+
+#if defined(__cplusplus)
+
+/* Enum BMDVideoConnection - Video connection types */
+
+typedef uint32_t BMDVideoConnection_v7_6;
+enum _BMDVideoConnection_v7_6 {
+    bmdVideoConnectionSDI_v7_6                              = 'sdi ',
+    bmdVideoConnectionHDMI_v7_6                             = 'hdmi',
+    bmdVideoConnectionOpticalSDI_v7_6                       = 'opti',
+    bmdVideoConnectionComponent_v7_6                        = 'cpnt',
+    bmdVideoConnectionComposite_v7_6                        = 'cmst',
+    bmdVideoConnectionSVideo_v7_6                           = 'svid'
+};
+
+
+// Forward Declarations
+
+class IDeckLinkVideoOutputCallback_v7_6;
+class IDeckLinkInputCallback_v7_6;
+class IDeckLinkDisplayModeIterator_v7_6;
+class IDeckLinkDisplayMode_v7_6;
+class IDeckLinkOutput_v7_6;
+class IDeckLinkInput_v7_6;
+class IDeckLinkTimecode_v7_6;
+class IDeckLinkVideoFrame_v7_6;
+class IDeckLinkMutableVideoFrame_v7_6;
+class IDeckLinkVideoInputFrame_v7_6;
+class IDeckLinkScreenPreviewCallback_v7_6;
+class IDeckLinkCocoaScreenPreviewCallback_v7_6;
+class IDeckLinkGLScreenPreviewHelper_v7_6;
+class IDeckLinkVideoConversion_v7_6;
+
+
+/* Interface IDeckLinkVideoOutputCallback - Frame completion callback. */
+
+class IDeckLinkVideoOutputCallback_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT ScheduledFrameCompleted (/* in */ IDeckLinkVideoFrame_v7_6 *completedFrame, /* in */ BMDOutputFrameCompletionResult result) = 0;
+    virtual HRESULT ScheduledPlaybackHasStopped (void) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoOutputCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+class IDeckLinkInputCallback_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode_v7_6 *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+    virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame_v7_6* videoFrame, /* in */ IDeckLinkAudioInputPacket* audioPacket) = 0;
+
+protected:
+    virtual ~IDeckLinkInputCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkDisplayModeIterator - enumerates over supported input/output display modes. */
+
+class IDeckLinkDisplayModeIterator_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT Next (/* out */ IDeckLinkDisplayMode_v7_6 **deckLinkDisplayMode) = 0;
+
+protected:
+    virtual ~IDeckLinkDisplayModeIterator_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkDisplayMode - represents a display mode */
+
+class IDeckLinkDisplayMode_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT GetName (/* out */ CFStringRef *name) = 0;
+    virtual BMDDisplayMode GetDisplayMode (void) = 0;
+    virtual long GetWidth (void) = 0;
+    virtual long GetHeight (void) = 0;
+    virtual HRESULT GetFrameRate (/* out */ BMDTimeValue *frameDuration, /* out */ BMDTimeScale *timeScale) = 0;
+    virtual BMDFieldDominance GetFieldDominance (void) = 0;
+
+protected:
+    virtual ~IDeckLinkDisplayMode_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback_v7_6 *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (/* in */ BMDDisplayMode displayMode, /* in */ BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (/* in */ int32_t width, /* in */ int32_t height, /* in */ int32_t rowBytes, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame_v7_6 **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (/* in */ BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame, /* in */ BMDTimeValue displayTime, /* in */ BMDTimeValue displayDuration, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback_v7_6 *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount, /* in */ BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* in */ BMDTimeValue streamTime, /* in */ BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (/* in */ BMDTimeValue playbackStartTime, /* in */ BMDTimeScale timeScale, /* in */ double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (/* in */ BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetScheduledStreamTime (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *streamTime, /* out */ double *playbackSpeed) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkInput_v7_6 - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator_v7_6 **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback_v7_6 *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v7_6 *theCallback) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkTimecode - Used for video frame timecode representation. */
+
+class IDeckLinkTimecode_v7_6 : public IUnknown
+{
+public:
+    virtual BMDTimecodeBCD GetBCD (void) = 0;
+    virtual HRESULT GetComponents (/* out */ uint8_t *hours, /* out */ uint8_t *minutes, /* out */ uint8_t *seconds, /* out */ uint8_t *frames) = 0;
+    virtual HRESULT GetString (/* out */ CFStringRef *timecode) = 0;
+    virtual BMDTimecodeFlags GetFlags (void) = 0;
+
+protected:
+    virtual ~IDeckLinkTimecode_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
+
+class IDeckLinkVideoFrame_v7_6 : public IUnknown
+{
+public:
+    virtual long GetWidth (void) = 0;
+    virtual long GetHeight (void) = 0;
+    virtual long GetRowBytes (void) = 0;
+    virtual BMDPixelFormat GetPixelFormat (void) = 0;
+    virtual BMDFrameFlags GetFlags (void) = 0;
+    virtual HRESULT GetBytes (/* out */ void **buffer) = 0;
+
+    virtual HRESULT GetTimecode (BMDTimecodeFormat format, /* out */ IDeckLinkTimecode_v7_6 **timecode) = 0;
+    virtual HRESULT GetAncillaryData (/* out */ IDeckLinkVideoFrameAncillary **ancillary) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoFrame_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkMutableVideoFrame - Created by IDeckLinkOutput::CreateVideoFrame. */
+
+class IDeckLinkMutableVideoFrame_v7_6 : public IDeckLinkVideoFrame_v7_6
+{
+public:
+    virtual HRESULT SetFlags (BMDFrameFlags newFlags) = 0;
+
+    virtual HRESULT SetTimecode (BMDTimecodeFormat format, /* in */ IDeckLinkTimecode_v7_6 *timecode) = 0;
+    virtual HRESULT SetTimecodeFromComponents (BMDTimecodeFormat format, uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t frames, BMDTimecodeFlags flags) = 0;
+    virtual HRESULT SetAncillaryData (/* in */ IDeckLinkVideoFrameAncillary *ancillary) = 0;
+
+protected:
+    virtual ~IDeckLinkMutableVideoFrame_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+class IDeckLinkVideoInputFrame_v7_6 : public IDeckLinkVideoFrame_v7_6
+{
+public:
+    virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT GetHardwareReferenceTimestamp (BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoInputFrame_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkScreenPreviewCallback - Screen preview callback */
+
+class IDeckLinkScreenPreviewCallback_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT DrawFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkScreenPreviewCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkCocoaScreenPreviewCallback - Screen preview callback for Cocoa-based applications */
+
+class IDeckLinkCocoaScreenPreviewCallback_v7_6 : public IDeckLinkScreenPreviewCallback_v7_6
+{
+public:
+
+protected:
+    virtual ~IDeckLinkCocoaScreenPreviewCallback_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkGLScreenPreviewHelper - Created with CoCreateInstance(). */
+
+class IDeckLinkGLScreenPreviewHelper_v7_6 : public IUnknown
+{
+public:
+
+    /* Methods must be called with OpenGL context set */
+
+    virtual HRESULT InitializeGL (void) = 0;
+    virtual HRESULT PaintGL (void) = 0;
+    virtual HRESULT SetFrame (/* in */ IDeckLinkVideoFrame_v7_6 *theFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkGLScreenPreviewHelper_v7_6 () {}; // call Release method to drop reference count
+};
+
+
+/* Interface IDeckLinkVideoConversion - Created with CoCreateInstance(). */
+
+class IDeckLinkVideoConversion_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT ConvertFrame (/* in */ IDeckLinkVideoFrame_v7_6* srcFrame, /* in */ IDeckLinkVideoFrame_v7_6* dstFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoConversion_v7_6 () {}; // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkConfiguration - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkConfiguration_v7_6 : public IUnknown
+{
+public:
+    virtual HRESULT GetConfigurationValidator (/* out */ IDeckLinkConfiguration_v7_6 **configObject) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+    /* Video Output Configuration */
+
+    virtual HRESULT SetVideoOutputFormat (/* in */ BMDVideoConnection_v7_6 videoOutputConnection) = 0;
+    virtual HRESULT IsVideoOutputActive (/* in */ BMDVideoConnection_v7_6 videoOutputConnection, /* out */ bool *active) = 0;
+
+    virtual HRESULT SetAnalogVideoOutputFlags (/* in */ BMDAnalogVideoFlags analogVideoFlags) = 0;
+    virtual HRESULT GetAnalogVideoOutputFlags (/* out */ BMDAnalogVideoFlags *analogVideoFlags) = 0;
+
+    virtual HRESULT EnableFieldFlickerRemovalWhenPaused (/* in */ bool enable) = 0;
+    virtual HRESULT IsEnabledFieldFlickerRemovalWhenPaused (/* out */ bool *enabled) = 0;
+
+    virtual HRESULT Set444And3GBpsVideoOutput (/* in */ bool enable444VideoOutput, /* in */ bool enable3GbsOutput) = 0;
+    virtual HRESULT Get444And3GBpsVideoOutput (/* out */ bool *is444VideoOutputEnabled, /* out */ bool *threeGbsOutputEnabled) = 0;
+
+    virtual HRESULT SetVideoOutputConversionMode (/* in */ BMDVideoOutputConversionMode conversionMode) = 0;
+    virtual HRESULT GetVideoOutputConversionMode (/* out */ BMDVideoOutputConversionMode *conversionMode) = 0;
+
+    virtual HRESULT Set_HD1080p24_to_HD1080i5994_Conversion (/* in */ bool enable) = 0;
+    virtual HRESULT Get_HD1080p24_to_HD1080i5994_Conversion (/* out */ bool *enabled) = 0;
+
+    /* Video Input Configuration */
+
+    virtual HRESULT SetVideoInputFormat (/* in */ BMDVideoConnection_v7_6 videoInputFormat) = 0;
+    virtual HRESULT GetVideoInputFormat (/* out */ BMDVideoConnection_v7_6 *videoInputFormat) = 0;
+
+    virtual HRESULT SetAnalogVideoInputFlags (/* in */ BMDAnalogVideoFlags analogVideoFlags) = 0;
+    virtual HRESULT GetAnalogVideoInputFlags (/* out */ BMDAnalogVideoFlags *analogVideoFlags) = 0;
+
+    virtual HRESULT SetVideoInputConversionMode (/* in */ BMDVideoInputConversionMode conversionMode) = 0;
+    virtual HRESULT GetVideoInputConversionMode (/* out */ BMDVideoInputConversionMode *conversionMode) = 0;
+
+    virtual HRESULT SetBlackVideoOutputDuringCapture (/* in */ bool blackOutInCapture) = 0;
+    virtual HRESULT GetBlackVideoOutputDuringCapture (/* out */ bool *blackOutInCapture) = 0;
+
+    virtual HRESULT Set32PulldownSequenceInitialTimecodeFrame (/* in */ uint32_t aFrameTimecode) = 0;
+    virtual HRESULT Get32PulldownSequenceInitialTimecodeFrame (/* out */ uint32_t *aFrameTimecode) = 0;
+
+    virtual HRESULT SetVancSourceLineMapping (/* in */ uint32_t activeLine1VANCsource, /* in */ uint32_t activeLine2VANCsource, /* in */ uint32_t activeLine3VANCsource) = 0;
+    virtual HRESULT GetVancSourceLineMapping (/* out */ uint32_t *activeLine1VANCsource, /* out */ uint32_t *activeLine2VANCsource, /* out */ uint32_t *activeLine3VANCsource) = 0;
+
+    /* Audio Input Configuration */
+
+    virtual HRESULT SetAudioInputFormat (/* in */ BMDAudioConnection audioInputFormat) = 0;
+    virtual HRESULT GetAudioInputFormat (/* out */ BMDAudioConnection *audioInputFormat) = 0;
+};
+
+
+
+/* Functions */
+
+extern "C" {
+
+	IDeckLinkIterator*							CreateDeckLinkIteratorInstance_v7_6 (void);
+	IDeckLinkGLScreenPreviewHelper_v7_6*		CreateOpenGLScreenPreviewHelper_v7_6 (void);
+    IDeckLinkCocoaScreenPreviewCallback_v7_6*	CreateCocoaScreenPreview_v7_6 (void* /* (NSView*) */ parentView);
+    IDeckLinkVideoConversion_v7_6*				CreateVideoConversionInstance_v7_6 (void);
+
+};
+
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_6_h__

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v7_9.h Added

@@ -0,0 +1,91 @@
+/* -LICENSE-START-
+** Copyright (c) 2010 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_9.h */
+
+#ifndef __DeckLink_API_v7_9_h__
+#define __DeckLink_API_v7_9_h__
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkDeckControl_v7_9                    /* A4D81043-0619-42B7-8ED6-602D29041DF7 */ (REFIID){0xA4,0xD8,0x10,0x43,0x06,0x19,0x42,0xB7,0x8E,0xD6,0x60,0x2D,0x29,0x04,0x1D,0xF7}
+
+
+#if defined(__cplusplus)
+
+// Forward Declarations
+
+class IDeckLinkDeckControl_v7_9;
+
+
+/* Interface IDeckLinkDeckControl_v7_9 - Deck Control main interface */
+
+class IDeckLinkDeckControl_v7_9 : public IUnknown
+{
+public:
+    virtual HRESULT Open (/* in */ BMDTimeScale timeScale, /* in */ BMDTimeValue timeValue, /* in */ bool timecodeIsDropFrame, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Close (/* in */ bool standbyOn) = 0;
+    virtual HRESULT GetCurrentState (/* out */ BMDDeckControlMode *mode, /* out */ BMDDeckControlVTRControlState *vtrControlState, /* out */ BMDDeckControlStatusFlags *flags) = 0;
+    virtual HRESULT SetStandby (/* in */ bool standbyOn) = 0;
+    virtual HRESULT Play (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Stop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT TogglePlayStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Eject (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GoToTimecode (/* in */ BMDTimecodeBCD timecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT FastForward (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Rewind (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepForward (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepBack (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Jog (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Shuttle (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeString (/* out */ BMDstring *currentTimeCode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecode (/* out */ IDeckLinkTimecode **currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeBCD (/* out */ BMDTimecodeBCD *currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetPreroll (/* in */ uint32_t prerollSeconds) = 0;
+    virtual HRESULT GetPreroll (/* out */ uint32_t *prerollSeconds) = 0;
+    virtual HRESULT SetExportOffset (/* in */ int32_t exportOffsetFields) = 0;
+    virtual HRESULT GetExportOffset (/* out */ int32_t *exportOffsetFields) = 0;
+    virtual HRESULT GetManualExportOffset (/* out */ int32_t *deckManualExportOffsetFields) = 0;
+    virtual HRESULT SetCaptureOffset (/* in */ int32_t captureOffsetFields) = 0;
+    virtual HRESULT GetCaptureOffset (/* out */ int32_t *captureOffsetFields) = 0;
+    virtual HRESULT StartExport (/* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* in */ BMDDeckControlExportModeOpsFlags exportModeOps, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StartCapture (/* in */ bool useVITC, /* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetDeviceID (/* out */ uint16_t *deviceId, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Abort (void) = 0;
+    virtual HRESULT CrashRecordStart (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT CrashRecordStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkDeckControlStatusCallback *callback) = 0;
+
+protected:
+    virtual ~IDeckLinkDeckControl_v7_9 () {}; // call Release method to drop reference count
+};
+
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_9_h__

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v8_0.h Added

@@ -0,0 +1,63 @@
+/* -LICENSE-START-
+** Copyright (c) 2011 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v8_0_H
+#define BMD_DECKLINKAPI_v8_0_H
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+
+#define IID_IDeckLink_v8_0                                    /* 62BFF75D-6569-4E55-8D4D-66AA03829ABC */ (REFIID){0x62,0xBF,0xF7,0x5D,0x65,0x69,0x4E,0x55,0x8D,0x4D,0x66,0xAA,0x03,0x82,0x9A,0xBC}
+#define IID_IDeckLinkIterator_v8_0                            /* 74E936FC-CC28-4A67-81A0-1E94E52D4E69 */ (REFIID){0x74,0xE9,0x36,0xFC,0xCC,0x28,0x4A,0x67,0x81,0xA0,0x1E,0x94,0xE5,0x2D,0x4E,0x69}
+
+#if defined (__cplusplus)
+
+/* Interface IDeckLink_v8_0 - represents a DeckLink device */
+
+class IDeckLink_v8_0 : public IUnknown
+{
+public:
+    virtual HRESULT GetModelName (/* out */ CFStringRef *modelName) = 0;
+};
+
+/* Interface IDeckLinkIterator_v8_0 - enumerates installed DeckLink hardware */
+
+class IDeckLinkIterator_v8_0 : public IUnknown
+{
+public:
+    virtual HRESULT Next (/* out */ IDeckLink_v8_0 **deckLinkInstance) = 0;
+};
+
+extern "C" {
+    IDeckLinkIterator_v8_0*                     CreateDeckLinkIteratorInstance_v8_0 (void);
+};
+
+
+#endif	// defined __cplusplus
+
+#endif /* defined(BMD_DECKLINKAPI_v8_0_H) */

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v8_1.h Added

@@ -0,0 +1,111 @@
+/* -LICENSE-START-
+ ** Copyright (c) 2011 Blackmagic Design
+ **
+ ** Permission is hereby granted, free of charge, to any person or organization
+ ** obtaining a copy of the software and accompanying documentation covered by
+ ** this license (the "Software") to use, reproduce, display, distribute,
+ ** execute, and transmit the Software, and to prepare derivative works of the
+ ** Software, and to permit third-parties to whom the Software is furnished to
+ ** do so, all subject to the following:
+ **
+ ** The copyright notices in the Software and this entire statement, including
+ ** the above license grant, this restriction and the following disclaimer,
+ ** must be included in all copies of the Software, in whole or in part, and
+ ** all derivative works of the Software, unless such copies or derivative
+ ** works are solely in the form of machine-executable object code generated by
+ ** a source language processor.
+ **
+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ ** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ ** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ ** DEALINGS IN THE SOFTWARE.
+ ** -LICENSE-END-
+ */
+
+#ifndef BMD_DECKLINKAPI_v8_1_H
+#define BMD_DECKLINKAPI_v8_1_H
+
+#include "DeckLinkAPI.h"
+
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkDeckControlStatusCallback_v8_1           /* E5F693C1-4283-4716-B18F-C1431521955B */ (REFIID){0xE5,0xF6,0x93,0xC1,0x42,0x83,0x47,0x16,0xB1,0x8F,0xC1,0x43,0x15,0x21,0x95,0x5B}
+#define IID_IDeckLinkDeckControl_v8_1                         /* 522A9E39-0F3C-4742-94EE-D80DE335DA1D */ (REFIID){0x52,0x2A,0x9E,0x39,0x0F,0x3C,0x47,0x42,0x94,0xEE,0xD8,0x0D,0xE3,0x35,0xDA,0x1D}
+
+
+/* Enum BMDDeckControlVTRControlState_v8_1 - VTR Control state */
+
+typedef uint32_t BMDDeckControlVTRControlState_v8_1;
+enum _BMDDeckControlVTRControlState_v8_1 {
+    bmdDeckControlNotInVTRControlMode_v8_1                            = 'nvcm',
+    bmdDeckControlVTRControlPlaying_v8_1                              = 'vtrp',
+    bmdDeckControlVTRControlRecording_v8_1                            = 'vtrr',
+    bmdDeckControlVTRControlStill_v8_1                                = 'vtra',
+    bmdDeckControlVTRControlSeeking_v8_1                              = 'vtrs',
+    bmdDeckControlVTRControlStopped_v8_1                              = 'vtro'
+};
+
+
+/* Interface IDeckLinkDeckControlStatusCallback_v8_1 - Deck control state change callback. */
+
+class IDeckLinkDeckControlStatusCallback_v8_1 : public IUnknown
+{
+public:
+    virtual HRESULT TimecodeUpdate (/* in */ BMDTimecodeBCD currentTimecode) = 0;
+    virtual HRESULT VTRControlStateChanged (/* in */ BMDDeckControlVTRControlState_v8_1 newState, /* in */ BMDDeckControlError error) = 0;
+    virtual HRESULT DeckControlEventReceived (/* in */ BMDDeckControlEvent event, /* in */ BMDDeckControlError error) = 0;
+    virtual HRESULT DeckControlStatusChanged (/* in */ BMDDeckControlStatusFlags flags, /* in */ uint32_t mask) = 0;
+
+protected:
+    virtual ~IDeckLinkDeckControlStatusCallback_v8_1 () {}; // call Release method to drop reference count
+};
+
+/* Interface IDeckLinkDeckControl_v8_1 - Deck Control main interface */
+
+class IDeckLinkDeckControl_v8_1 : public IUnknown
+{
+public:
+    virtual HRESULT Open (/* in */ BMDTimeScale timeScale, /* in */ BMDTimeValue timeValue, /* in */ bool timecodeIsDropFrame, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Close (/* in */ bool standbyOn) = 0;
+    virtual HRESULT GetCurrentState (/* out */ BMDDeckControlMode *mode, /* out */ BMDDeckControlVTRControlState_v8_1 *vtrControlState, /* out */ BMDDeckControlStatusFlags *flags) = 0;
+    virtual HRESULT SetStandby (/* in */ bool standbyOn) = 0;
+    virtual HRESULT SendCommand (/* in */ uint8_t *inBuffer, /* in */ uint32_t inBufferSize, /* out */ uint8_t *outBuffer, /* out */ uint32_t *outDataSize, /* in */ uint32_t outBufferSize, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Play (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Stop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT TogglePlayStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Eject (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GoToTimecode (/* in */ BMDTimecodeBCD timecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT FastForward (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Rewind (/* in */ bool viewTape, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepForward (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StepBack (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Jog (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Shuttle (/* in */ double rate, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeString (/* out */ CFStringRef *currentTimeCode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecode (/* out */ IDeckLinkTimecode **currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetTimecodeBCD (/* out */ BMDTimecodeBCD *currentTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetPreroll (/* in */ uint32_t prerollSeconds) = 0;
+    virtual HRESULT GetPreroll (/* out */ uint32_t *prerollSeconds) = 0;
+    virtual HRESULT SetExportOffset (/* in */ int32_t exportOffsetFields) = 0;
+    virtual HRESULT GetExportOffset (/* out */ int32_t *exportOffsetFields) = 0;
+    virtual HRESULT GetManualExportOffset (/* out */ int32_t *deckManualExportOffsetFields) = 0;
+    virtual HRESULT SetCaptureOffset (/* in */ int32_t captureOffsetFields) = 0;
+    virtual HRESULT GetCaptureOffset (/* out */ int32_t *captureOffsetFields) = 0;
+    virtual HRESULT StartExport (/* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* in */ BMDDeckControlExportModeOpsFlags exportModeOps, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT StartCapture (/* in */ bool useVITC, /* in */ BMDTimecodeBCD inTimecode, /* in */ BMDTimecodeBCD outTimecode, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT GetDeviceID (/* out */ uint16_t *deviceId, /* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT Abort (void) = 0;
+    virtual HRESULT CrashRecordStart (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT CrashRecordStop (/* out */ BMDDeckControlError *error) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkDeckControlStatusCallback_v8_1 *callback) = 0;
+
+protected:
+    virtual ~IDeckLinkDeckControl_v8_1 () {}; // call Release method to drop reference count
+};
+
+
+#endif	// BMD_DECKLINKAPI_v8_1_H

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_2.h Added

@@ -0,0 +1,81 @@
+/* -LICENSE-START-
+** Copyright (c) 2012 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v9_2_H
+#define BMD_DECKLINKAPI_v9_2_H
+
+#include "DeckLinkAPI.h"
+
+
+// Interface ID Declarations
+
+#define IID_IDeckLinkInput_v9_2                          /* 6D40EF78-28B9-4E21-990D-95BB7750A04F */ (REFIID){0x6D,0x40,0xEF,0x78,0x28,0xB9,0x4E,0x21,0x99,0x0D,0x95,0xBB,0x77,0x50,0xA0,0x4F}
+
+
+#if defined(__cplusplus)
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v9_2 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v9_2 () {}; // call Release method to drop reference count
+};
+
+
+#endif      // defined(__cplusplus)
+#endif	// BMD_DECKLINKAPI_v9_2_H

obs-studio-0.16.4.tar.xz/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_9.h Added

@@ -0,0 +1,101 @@
+/* -LICENSE-START-
+** Copyright (c) 2013 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v9_9_H
+#define BMD_DECKLINKAPI_v9_9_H
+
+#include "DeckLinkAPI.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkOutput_v9_9                              = /* A3EF0963-0862-44ED-92A9-EE89ABF431C7 */ {0xA3,0xEF,0x09,0x63,0x08,0x62,0x44,0xED,0x92,0xA9,0xEE,0x89,0xAB,0xF4,0x31,0xC7};
+
+
+#if defined(__cplusplus)
+
+// Forward Declarations
+class IDeckLinkOutput_v9_9;
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v9_9 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (/* in */ BMDDisplayMode displayMode, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDVideoOutputFlags flags, /* out */ BMDDisplayModeSupport *result, /* out */ IDeckLinkDisplayMode **resultDisplayMode) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (/* in */ BMDDisplayMode displayMode, /* in */ BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (/* in */ int32_t width, /* in */ int32_t height, /* in */ int32_t rowBytes, /* in */ BMDPixelFormat pixelFormat, /* in */ BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (/* in */ BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame *theFrame, /* in */ BMDTimeValue displayTime, /* in */ BMDTimeValue displayDuration, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (/* in */ BMDAudioSampleRate sampleRate, /* in */ BMDAudioSampleType sampleType, /* in */ uint32_t channelCount, /* in */ BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, /* in */ uint32_t sampleFrameCount, /* in */ BMDTimeValue streamTime, /* in */ BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (/* in */ BMDTimeValue playbackStartTime, /* in */ BMDTimeScale timeScale, /* in */ double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (/* in */ BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, /* in */ BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetScheduledStreamTime (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *streamTime, /* out */ double *playbackSpeed) = 0;
+    virtual HRESULT GetReferenceStatus (/* out */ BMDReferenceStatus *referenceStatus) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (/* in */ BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v9_9 () {}; // call Release method to drop reference count
+};
+
+#endif      // defined(__cplusplus)
+#endif /* defined(BMD_DECKLINKAPI_v9_9_H) */
+

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -55,13 +55,13 @@
 
 // Enumeration Mapping
 
-cpp_quote("typedef unsigned long BMDFrameFlags;")
-cpp_quote("typedef unsigned long BMDVideoInputFlags;")
-cpp_quote("typedef unsigned long BMDVideoInputFormatChangedEvents;")
-cpp_quote("typedef unsigned long BMDDetectedVideoInputFormatFlags;")
-cpp_quote("typedef unsigned long BMDDeckLinkCapturePassthroughMode;")
-cpp_quote("typedef unsigned long BMDAnalogVideoFlags;")
-cpp_quote("typedef unsigned long BMDDeviceBusyState;")
+cpp_quote("typedef unsigned int BMDFrameFlags;")
+cpp_quote("typedef unsigned int BMDVideoInputFlags;")
+cpp_quote("typedef unsigned int BMDVideoInputFormatChangedEvents;")
+cpp_quote("typedef unsigned int BMDDetectedVideoInputFormatFlags;")
+cpp_quote("typedef unsigned int BMDDeckLinkCapturePassthroughMode;")
+cpp_quote("typedef unsigned int BMDAnalogVideoFlags;")
+cpp_quote("typedef unsigned int BMDDeviceBusyState;")
 cpp_quote("#if 0")
 typedef enum _BMDFrameFlags BMDFrameFlags;
 typedef enum _BMDVideoInputFlags BMDVideoInputFlags;
@@ -82,11 +82,19 @@
 bmdVideoOutputDualStream3D = 1 << 4
 } BMDVideoOutputFlags;
 
+/* Enum BMDPacketType - Type of packet */
+
+typedef [v1_enum] enum	_BMDPacketType {
+ bmdPacketTypeStreamInterruptedMarker = /* 'sint' */ 0x73696E74,	// A packet of this type marks the time when a video stream was interrupted, for example by a disconnected cable
+ bmdPacketTypeStreamData = /* 'sdat' */ 0x73646174	// Regular stream data
+} BMDPacketType;
+
 /* Enum BMDFrameFlags - Frame flags */
 
 [v1_enum] enum	_BMDFrameFlags {
 bmdFrameFlagDefault = 0,
 bmdFrameFlagFlipVertical = 1 << 0,
+ bmdFrameContainsHDRMetadata = 1 << 1,
 
 /* Flags that are applicable only to instances of IDeckLinkVideoInputFrame */
 
@@ -120,6 +128,7 @@
 /* Enum BMDDeckLinkCapturePassthroughMode - Enumerates whether the video output is electrically connected to the video input or if the clean switching mode is enabled */
 
 [v1_enum] enum	_BMDDeckLinkCapturePassthroughMode {
+ bmdDeckLinkCapturePassthroughModeDisabled = /* 'pdis' */ 0x70646973,
 bmdDeckLinkCapturePassthroughModeDirect = /* 'pdir' */ 0x70646972,
 bmdDeckLinkCapturePassthroughModeCleanSwitch = /* 'pcln' */ 0x70636C6E
 };
@@ -140,6 +149,12 @@
 bmdReferenceLocked = 1 << 1
 } BMDReferenceStatus;
 
+/* Enum BMDAudioFormat - Audio Format */
+
+typedef [v1_enum] enum	_BMDAudioFormat {
+ bmdAudioFormatPCM = /* 'lpcm' */ 0x6C70636D	// Linear signed PCM samples
+} BMDAudioFormat;
+
 /* Enum BMDAudioSampleRate - Audio sample rates supported for output/input */
 
 typedef [v1_enum] enum	_BMDAudioSampleRate {
@@ -241,10 +256,67 @@
 
 typedef [v1_enum] enum	_BMDIdleVideoOutputOperation {
 bmdIdleVideoOutputBlack = /* 'blac' */ 0x626C6163,
- bmdIdleVideoOutputLastFrame = /* 'lafa' */ 0x6C616661,
- bmdIdleVideoOutputDesktop = /* 'desk' */ 0x6465736B
+ bmdIdleVideoOutputLastFrame = /* 'lafa' */ 0x6C616661
 } BMDIdleVideoOutputOperation;
 
+/* Enum BMDVideoEncoderFrameCodingMode - Video frame coding mode */
+
+typedef [v1_enum] enum	_BMDVideoEncoderFrameCodingMode {
+ bmdVideoEncoderFrameCodingModeInter = /* 'inte' */ 0x696E7465,
+ bmdVideoEncoderFrameCodingModeIntra = /* 'intr' */ 0x696E7472
+} BMDVideoEncoderFrameCodingMode;
+
+/* Enum BMDDNxHRLevel - DNxHR Levels */
+
+typedef [v1_enum] enum	_BMDDNxHRLevel {
+ bmdDNxHRLevelSQ = /* 'dnsq' */ 0x646E7371,
+ bmdDNxHRLevelLB = /* 'dnlb' */ 0x646E6C62,
+ bmdDNxHRLevelHQ = /* 'dnhq' */ 0x646E6871,
+ bmdDNxHRLevelHQX = /* 'dhqx' */ 0x64687178,
+ bmdDNxHRLevel444 = /* 'd444' */ 0x64343434
+} BMDDNxHRLevel;
+
+/* Enum BMDLinkConfiguration - Video link configuration */
+
+typedef [v1_enum] enum	_BMDLinkConfiguration {
+ bmdLinkConfigurationSingleLink = /* 'lcsl' */ 0x6C63736C,
+ bmdLinkConfigurationDualLink = /* 'lcdl' */ 0x6C63646C,
+ bmdLinkConfigurationQuadLink = /* 'lcql' */ 0x6C63716C
+} BMDLinkConfiguration;
+
+/* Enum BMDDeviceInterface - Device interface type */
+
+typedef [v1_enum] enum	_BMDDeviceInterface {
+ bmdDeviceInterfacePCI = /* 'pci ' */ 0x70636920,
+ bmdDeviceInterfaceUSB = /* 'usb ' */ 0x75736220,
+ bmdDeviceInterfaceThunderbolt = /* 'thun' */ 0x7468756E
+} BMDDeviceInterface;
+
+/* Enum BMDDeckLinkFrameMetadataID - DeckLink Frame Metadata ID */
+
+typedef [v1_enum] enum	_BMDDeckLinkFrameMetadataID {
+ bmdDeckLinkFrameMetadataHDRElectroOpticalTransferFunc = /* 'eotf' */ 0x656F7466,	// EOTF in range 0-7 as per CEA 861.3
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedX = /* 'hdrx' */ 0x68647278,	// Red display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedY = /* 'hdry' */ 0x68647279,	// Red display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenX = /* 'hdgx' */ 0x68646778,	// Green display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenY = /* 'hdgy' */ 0x68646779,	// Green display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueX = /* 'hdbx' */ 0x68646278,	// Blue display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueY = /* 'hdby' */ 0x68646279,	// Blue display primaries in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRWhitePointX = /* 'hdwx' */ 0x68647778,	// White point in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRWhitePointY = /* 'hdwy' */ 0x68647779,	// White point in range 0.0 - 1.0
+ bmdDeckLinkFrameMetadataHDRMaxDisplayMasteringLuminance = /* 'hdml' */ 0x68646D6C,	// Max display mastering luminance in range 1 cd/m2 - 65535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMinDisplayMasteringLuminance = /* 'hmil' */ 0x686D696C,	// Min display mastering luminance in range 0.0001 cd/m2 - 6.5535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMaximumContentLightLevel = /* 'mcll' */ 0x6D636C6C,	// Maximum Content Light Level in range 1 cd/m2 - 65535 cd/m2
+ bmdDeckLinkFrameMetadataHDRMaximumFrameAverageLightLevel = /* 'fall' */ 0x66616C6C	// Maximum Frame Average Light Level in range 1 cd/m2 - 65535 cd/m2
+} BMDDeckLinkFrameMetadataID;
+
+/* Enum BMDDuplexMode - Duplex for configurable ports */
+
+typedef [v1_enum] enum	_BMDDuplexMode {
+ bmdDuplexModeFull = /* 'fdup' */ 0x66647570,
+ bmdDuplexModeHalf = /* 'hdup' */ 0x68647570
+} BMDDuplexMode;
+
 /* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
 
 typedef [v1_enum] enum	_BMDDeckLinkAttributeID {
@@ -261,10 +333,16 @@
 BMDDeckLinkCanOnlyAdjustOverallVideoOutputGain = /* 'ovog' */ 0x6F766F67,
 BMDDeckLinkHasVideoInputAntiAliasingFilter = /* 'aafl' */ 0x6161666C,
 BMDDeckLinkHasBypass = /* 'byps' */ 0x62797073,
- BMDDeckLinkSupportsDesktopDisplay = /* 'extd' */ 0x65787464,
 BMDDeckLinkSupportsClockTimingAdjustment = /* 'ctad' */ 0x63746164,
 BMDDeckLinkSupportsFullDuplex = /* 'fdup' */ 0x66647570,
 BMDDeckLinkSupportsFullFrameReferenceInputTimingOffset = /* 'frin' */ 0x6672696E,
+ BMDDeckLinkSupportsSMPTELevelAOutput = /* 'lvla' */ 0x6C766C61,
+ BMDDeckLinkSupportsDualLinkSDI = /* 'sdls' */ 0x73646C73,
+ BMDDeckLinkSupportsQuadLinkSDI = /* 'sqls' */ 0x73716C73,
+ BMDDeckLinkSupportsIdleOutput = /* 'idou' */ 0x69646F75,
+ BMDDeckLinkHasLTCTimecodeInput = /* 'hltc' */ 0x686C7463,
+ BMDDeckLinkSupportsDuplexModeConfiguration = /* 'dupx' */ 0x64757078,
+ BMDDeckLinkSupportsHDRMetadata = /* 'hdrm' */ 0x6864726D,
 
 /* Integers */
 
@@ -273,13 +351,20 @@
 BMDDeckLinkNumberOfSubDevices = /* 'nsbd' */ 0x6E736264,
 BMDDeckLinkSubDeviceIndex = /* 'subi' */ 0x73756269,
 BMDDeckLinkPersistentID = /* 'peid' */ 0x70656964,
+ BMDDeckLinkDeviceGroupID = /* 'dgid' */ 0x64676964,
 BMDDeckLinkTopologicalID = /* 'toid' */ 0x746F6964,
 BMDDeckLinkVideoOutputConnections = /* 'vocn' */ 0x766F636E,
 BMDDeckLinkVideoInputConnections = /* 'vicn' */ 0x7669636E,
 BMDDeckLinkAudioOutputConnections = /* 'aocn' */ 0x616F636E,
 BMDDeckLinkAudioInputConnections = /* 'aicn' */ 0x6169636E,
- BMDDeckLinkDeviceBusyState = /* 'dbst' */ 0x64627374,
 BMDDeckLinkVideoIOSupport = /* 'vios' */ 0x76696F73,	// Returns a BMDVideoIOSupport bit field
+ BMDDeckLinkDeckControlConnections = /* 'dccn' */ 0x6463636E,
+ BMDDeckLinkDeviceInterface = /* 'dbus' */ 0x64627573,	// Returns a BMDDeviceInterface
+ BMDDeckLinkAudioInputRCAChannelCount = /* 'airc' */ 0x61697263,
+ BMDDeckLinkAudioInputXLRChannelCount = /* 'aixc' */ 0x61697863,
+ BMDDeckLinkAudioOutputRCAChannelCount = /* 'aorc' */ 0x616F7263,
+ BMDDeckLinkAudioOutputXLRChannelCount = /* 'aoxc' */ 0x616F7863,
+ BMDDeckLinkPairedDevicePersistentID = /* 'ppid' */ 0x70706964,
 
 /* Floats */
 
@@ -287,10 +372,16 @@
 BMDDeckLinkVideoInputGainMaximum = /* 'vigx' */ 0x76696778,
 BMDDeckLinkVideoOutputGainMinimum = /* 'vogm' */ 0x766F676D,
 BMDDeckLinkVideoOutputGainMaximum = /* 'vogx' */ 0x766F6778,
+ BMDDeckLinkMicrophoneInputGainMinimum = /* 'migm' */ 0x6D69676D,
+ BMDDeckLinkMicrophoneInputGainMaximum = /* 'migx' */ 0x6D696778,
 
 /* Strings */
 
- BMDDeckLinkSerialPortDeviceName = /* 'slpn' */ 0x736C706E
+ BMDDeckLinkSerialPortDeviceName = /* 'slpn' */ 0x736C706E,
+ BMDDeckLinkVendorName = /* 'vndr' */ 0x766E6472,
+ BMDDeckLinkDisplayName = /* 'dspn' */ 0x6473706E,
+ BMDDeckLinkModelName = /* 'mdln' */ 0x6D646C6E,
+ BMDDeckLinkDeviceHandle = /* 'devh' */ 0x64657668
 } BMDDeckLinkAttributeID;
 
 /* Enum BMDDeckLinkAPIInformationID - DeckLinkAPI information ID */
@@ -299,6 +390,49 @@
 BMDDeckLinkAPIVersion = /* 'vers' */ 0x76657273
 } BMDDeckLinkAPIInformationID;
 
+/* Enum BMDDeckLinkStatusID - DeckLink Status ID */
+
+typedef [v1_enum] enum	_BMDDeckLinkStatusID {
+
+ /* Integers */
+
+ bmdDeckLinkStatusDetectedVideoInputMode = /* 'dvim' */ 0x6476696D,
+ bmdDeckLinkStatusDetectedVideoInputFlags = /* 'dvif' */ 0x64766966,
+ bmdDeckLinkStatusCurrentVideoInputMode = /* 'cvim' */ 0x6376696D,
+ bmdDeckLinkStatusCurrentVideoInputPixelFormat = /* 'cvip' */ 0x63766970,
+ bmdDeckLinkStatusCurrentVideoInputFlags = /* 'cvif' */ 0x63766966,
+ bmdDeckLinkStatusCurrentVideoOutputMode = /* 'cvom' */ 0x63766F6D,
+ bmdDeckLinkStatusCurrentVideoOutputFlags = /* 'cvof' */ 0x63766F66,
+ bmdDeckLinkStatusPCIExpressLinkWidth = /* 'pwid' */ 0x70776964,
+ bmdDeckLinkStatusPCIExpressLinkSpeed = /* 'plnk' */ 0x706C6E6B,
+ bmdDeckLinkStatusLastVideoOutputPixelFormat = /* 'opix' */ 0x6F706978,
+ bmdDeckLinkStatusReferenceSignalMode = /* 'refm' */ 0x7265666D,
+ bmdDeckLinkStatusReferenceSignalFlags = /* 'reff' */ 0x72656666,
+ bmdDeckLinkStatusDuplexMode = /* 'dupx' */ 0x64757078,
+ bmdDeckLinkStatusBusy = /* 'busy' */ 0x62757379,
+
+ /* Flags */
+
+ bmdDeckLinkStatusVideoInputSignalLocked = /* 'visl' */ 0x7669736C,
+ bmdDeckLinkStatusReferenceSignalLocked = /* 'refl' */ 0x7265666C
+} BMDDeckLinkStatusID;
+
+/* Enum BMDDeckLinkVideoStatusFlags - */
+
+typedef [v1_enum] enum	_BMDDeckLinkVideoStatusFlags {
+ bmdDeckLinkVideoStatusPsF = 1 << 0,
+ bmdDeckLinkVideoStatusDualStream3D = 1 << 1
+} BMDDeckLinkVideoStatusFlags;
+
+/* Enum BMDDuplexStatus - Duplex status of the device */
+
+typedef [v1_enum] enum	_BMDDuplexStatus {
+ bmdDuplexStatusFullDuplex = /* 'fdup' */ 0x66647570,
+ bmdDuplexStatusHalfDuplex = /* 'hdup' */ 0x68647570,
+ bmdDuplexStatusSimplex = /* 'splx' */ 0x73706C78,
+ bmdDuplexStatusInactive = /* 'inac' */ 0x696E6163
+} BMDDuplexStatus;
+
 /* Enum BMDDeviceBusyState - Current device busy state */
 
 [v1_enum] enum	_BMDDeviceBusyState {
@@ -327,24 +461,32 @@
 /* Enum BMDNotifications - Events that can be subscribed through IDeckLinkNotification */
 
 typedef [v1_enum] enum	_BMDNotifications {
- bmdPreferencesChanged = /* 'pref' */ 0x70726566
+ bmdPreferencesChanged = /* 'pref' */ 0x70726566,
+ bmdStatusChanged = /* 'stat' */ 0x73746174
 } BMDNotifications;
 
 // Forward Declarations
 
 interface IDeckLinkVideoOutputCallback;
 interface IDeckLinkInputCallback;
+interface IDeckLinkEncoderInputCallback;
 interface IDeckLinkMemoryAllocator;
 interface IDeckLinkAudioOutputCallback;
 interface IDeckLinkIterator;
 interface IDeckLinkAPIInformation;
 interface IDeckLinkOutput;
 interface IDeckLinkInput;
+interface IDeckLinkEncoderInput;
 interface IDeckLinkVideoFrame;
 interface IDeckLinkMutableVideoFrame;
 interface IDeckLinkVideoFrame3DExtensions;
+interface IDeckLinkVideoFrameMetadataExtensions;
 interface IDeckLinkVideoInputFrame;
 interface IDeckLinkVideoFrameAncillary;
+interface IDeckLinkEncoderPacket;
+interface IDeckLinkEncoderVideoPacket;
+interface IDeckLinkEncoderAudioPacket;
+interface IDeckLinkH265NALPacket;
 interface IDeckLinkAudioInputPacket;
 interface IDeckLinkScreenPreviewCallback;
 interface IDeckLinkGLScreenPreviewHelper;
@@ -352,6 +494,7 @@
 interface IDeckLinkNotificationCallback;
 interface IDeckLinkNotification;
 interface IDeckLinkAttributes;
+interface IDeckLinkStatus;
 interface IDeckLinkKeyer;
 interface IDeckLinkVideoConversion;
 interface IDeckLinkDeviceNotificationCallback;
@@ -381,6 +524,19 @@
 HRESULT VideoInputFrameArrived([in] IDeckLinkVideoInputFrame* videoFrame, [in] IDeckLinkAudioInputPacket* audioPacket);
 };
 
+/* Interface IDeckLinkEncoderInputCallback - Frame arrival callback. */
+
+[
+ object,
+ uuid(ACF13E61-F4A0-4974-A6A7-59AFF6268B31),
+ helpstring("Frame arrival callback.")
+] interface IDeckLinkEncoderInputCallback : IUnknown
+{
+ HRESULT VideoInputSignalChanged([in] BMDVideoInputFormatChangedEvents notificationEvents, [in] IDeckLinkDisplayMode *newDisplayMode, [in] BMDDetectedVideoInputFormatFlags detectedSignalFlags);
+ HRESULT VideoPacketArrived([in] IDeckLinkEncoderVideoPacket* videoPacket);
+ HRESULT AudioPacketArrived([in] IDeckLinkEncoderAudioPacket* audioPacket);
+};
+
 /* Interface IDeckLinkMemoryAllocator - Memory allocator for video frames. */
 
 [
@@ -390,7 +546,7 @@
 helpstring("Memory allocator for video frames.")
 ] interface IDeckLinkMemoryAllocator : IUnknown
 {
- HRESULT AllocateBuffer([in] unsigned long bufferSize, [out] void **allocatedBuffer);
+ HRESULT AllocateBuffer([in] unsigned int bufferSize, [out] void **allocatedBuffer);
 HRESULT ReleaseBuffer([in] void *buffer);
 
 HRESULT Commit(void);
@@ -454,26 +610,26 @@
 HRESULT DisableVideoOutput(void);
 
 HRESULT SetVideoOutputFrameMemoryAllocator([in] IDeckLinkMemoryAllocator *theAllocator);
- HRESULT CreateVideoFrame([in] long width, [in] long height, [in] long rowBytes, [in] BMDPixelFormat pixelFormat, [in] BMDFrameFlags flags, [out] IDeckLinkMutableVideoFrame **outFrame);
+ HRESULT CreateVideoFrame([in] int width, [in] int height, [in] int rowBytes, [in] BMDPixelFormat pixelFormat, [in] BMDFrameFlags flags, [out] IDeckLinkMutableVideoFrame **outFrame);
 HRESULT CreateAncillaryData([in] BMDPixelFormat pixelFormat, [out] IDeckLinkVideoFrameAncillary **outBuffer);
 
 HRESULT DisplayVideoFrameSync([in] IDeckLinkVideoFrame *theFrame);
 HRESULT ScheduleVideoFrame([in] IDeckLinkVideoFrame *theFrame, [in] BMDTimeValue displayTime, [in] BMDTimeValue displayDuration, [in] BMDTimeScale timeScale);
 HRESULT SetScheduledFrameCompletionCallback([in] IDeckLinkVideoOutputCallback *theCallback);
- HRESULT GetBufferedVideoFrameCount([out] unsigned long *bufferedFrameCount);
+ HRESULT GetBufferedVideoFrameCount([out] unsigned int *bufferedFrameCount);
 
 /* Audio Output */
 
- HRESULT EnableAudioOutput([in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned long channelCount, [in] BMDAudioOutputStreamType streamType);
+ HRESULT EnableAudioOutput([in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned int channelCount, [in] BMDAudioOutputStreamType streamType);
 HRESULT DisableAudioOutput(void);
 
- HRESULT WriteAudioSamplesSync([in] void *buffer, [in] unsigned long sampleFrameCount, [out] unsigned long *sampleFramesWritten);
+ HRESULT WriteAudioSamplesSync([in] void *buffer, [in] unsigned int sampleFrameCount, [out] unsigned int *sampleFramesWritten);
 
 HRESULT BeginAudioPreroll(void);
 HRESULT EndAudioPreroll(void);
- HRESULT ScheduleAudioSamples([in] void *buffer, [in] unsigned long sampleFrameCount, [in] BMDTimeValue streamTime, [in] BMDTimeScale timeScale, [out] unsigned long *sampleFramesWritten);
+ HRESULT ScheduleAudioSamples([in] void *buffer, [in] unsigned int sampleFrameCount, [in] BMDTimeValue streamTime, [in] BMDTimeScale timeScale, [out] unsigned int *sampleFramesWritten);
 
- HRESULT GetBufferedAudioSampleFrameCount([out] unsigned long *bufferedSampleFrameCount);
+ HRESULT GetBufferedAudioSampleFrameCount([out] unsigned int *bufferedSampleFrameCount);
 HRESULT FlushBufferedAudioSamples(void);
 
 HRESULT SetAudioCallback([in] IDeckLinkAudioOutputCallback *theCallback);
@@ -509,14 +665,14 @@
 
 HRESULT EnableVideoInput([in] BMDDisplayMode displayMode, [in] BMDPixelFormat pixelFormat, [in] BMDVideoInputFlags flags);
 HRESULT DisableVideoInput(void);
- HRESULT GetAvailableVideoFrameCount([out] unsigned long *availableFrameCount);
+ HRESULT GetAvailableVideoFrameCount([out] unsigned int *availableFrameCount);
 HRESULT SetVideoInputFrameMemoryAllocator([in] IDeckLinkMemoryAllocator *theAllocator);
 
 /* Audio Input */
 
- HRESULT EnableAudioInput([in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned long channelCount);
+ HRESULT EnableAudioInput([in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned int channelCount);
 HRESULT DisableAudioInput(void);
- HRESULT GetAvailableAudioSampleFrameCount([out] unsigned long *availableSampleFrameCount);
+ HRESULT GetAvailableAudioSampleFrameCount([out] unsigned int *availableSampleFrameCount);
 
 /* Input Control */
 
@@ -531,6 +687,43 @@
 HRESULT GetHardwareReferenceClock([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue *hardwareTime, [out] BMDTimeValue *timeInFrame, [out] BMDTimeValue *ticksPerFrame);
 };
 
+/* Interface IDeckLinkEncoderInput - Created by QueryInterface from IDeckLink. */
+
+[
+ object,
+ uuid(270587DA-6B7D-42E7-A1F0-6D853F581185),
+ helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkEncoderInput : IUnknown
+{
+ HRESULT DoesSupportVideoMode([in] BMDDisplayMode displayMode, [in] BMDPixelFormat pixelFormat, [in] BMDVideoInputFlags flags, [out] BMDDisplayModeSupport *result, [out] IDeckLinkDisplayMode **resultDisplayMode);
+ HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator **iterator);
+
+ /* Video Input */
+
+ HRESULT EnableVideoInput([in] BMDDisplayMode displayMode, [in] BMDPixelFormat pixelFormat, [in] BMDVideoInputFlags flags);
+ HRESULT DisableVideoInput(void);
+ HRESULT GetAvailablePacketsCount([out] unsigned int *availablePacketsCount);
+ HRESULT SetMemoryAllocator([in] IDeckLinkMemoryAllocator *theAllocator);
+
+ /* Audio Input */
+
+ HRESULT EnableAudioInput([in] BMDAudioFormat audioFormat, [in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned int channelCount);
+ HRESULT DisableAudioInput(void);
+ HRESULT GetAvailableAudioSampleFrameCount([out] unsigned int *availableSampleFrameCount);
+
+ /* Input Control */
+
+ HRESULT StartStreams(void);
+ HRESULT StopStreams(void);
+ HRESULT PauseStreams(void);
+ HRESULT FlushStreams(void);
+ HRESULT SetCallback([in] IDeckLinkEncoderInputCallback *theCallback);
+
+ /* Hardware Timing */
+
+ HRESULT GetHardwareReferenceClock([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue *hardwareTime, [out] BMDTimeValue *timeInFrame, [out] BMDTimeValue *ticksPerFrame);
+};
+
 /* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
 
 [
@@ -581,6 +774,21 @@
 HRESULT GetFrameForRightEye([out] IDeckLinkVideoFrame* *rightEyeFrame);
 };
 
+/* Interface IDeckLinkVideoFrameMetadataExtensions - Optional interface implemented on IDeckLinkVideoFrame to support frame metadata such as HDMI HDR information */
+
+[
+ object,
+ uuid(D5973DC9-6432-46D0-8F0B-2496F8A1238F),
+ local,
+ helpstring("Optional interface implemented on IDeckLinkVideoFrame to support frame metadata such as HDMI HDR information")
+] interface IDeckLinkVideoFrameMetadataExtensions : IUnknown
+{
+ HRESULT GetInt([in] BMDDeckLinkFrameMetadataID metadataID, [out] LONGLONG *value);
+ HRESULT GetFloat([in] BMDDeckLinkFrameMetadataID metadataID, [out] double *value);
+ HRESULT GetFlag([in] BMDDeckLinkFrameMetadataID metadataID, [out] BOOL* value);
+ HRESULT GetString([in] BMDDeckLinkFrameMetadataID metadataID, [out] BSTR *value);
+};
+
 /* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
 
 [
@@ -604,11 +812,67 @@
 ] interface IDeckLinkVideoFrameAncillary : IUnknown
 {
 
- HRESULT GetBufferForVerticalBlankingLine([in] unsigned long lineNumber, [out] void **buffer);
+ HRESULT GetBufferForVerticalBlankingLine([in] unsigned int lineNumber, [out] void **buffer);
 BMDPixelFormat GetPixelFormat(void);
 BMDDisplayMode GetDisplayMode(void);
 };
 
+/* Interface IDeckLinkEncoderPacket - Interface to encapsulate an encoded packet. */
+
+[
+ object,
+ uuid(B693F36C-316E-4AF1-B6C2-F389A4BCA620),
+ local,
+ helpstring("Interface to encapsulate an encoded packet.")
+] interface IDeckLinkEncoderPacket : IUnknown
+{
+ HRESULT GetBytes([out] void **buffer);
+ long GetSize(void);
+ HRESULT GetStreamTime([out] BMDTimeValue *frameTime, [in] BMDTimeScale timeScale);
+ BMDPacketType GetPacketType(void);
+};
+
+/* Interface IDeckLinkEncoderVideoPacket - Provided by the IDeckLinkEncoderInput video packet arrival callback. */
+
+[
+ object,
+ uuid(4E7FD944-E8C7-4EAC-B8C0-7B77F80F5AE0),
+ local,
+ helpstring("Provided by the IDeckLinkEncoderInput video packet arrival callback.")
+] interface IDeckLinkEncoderVideoPacket : IDeckLinkEncoderPacket
+{
+ BMDPixelFormat GetPixelFormat(void);
+ HRESULT GetHardwareReferenceTimestamp([in] BMDTimeScale timeScale, [out] BMDTimeValue *frameTime, [out] BMDTimeValue *frameDuration);
+
+ HRESULT GetTimecode([in] BMDTimecodeFormat format, [out] IDeckLinkTimecode **timecode);
+};
+
+/* Interface IDeckLinkEncoderAudioPacket - Provided by the IDeckLinkEncoderInput audio packet arrival callback. */
+
+[
+ object,
+ uuid(49E8EDC8-693B-4E14-8EF6-12C658F5A07A),
+ local,
+ helpstring("Provided by the IDeckLinkEncoderInput audio packet arrival callback.")
+] interface IDeckLinkEncoderAudioPacket : IDeckLinkEncoderPacket
+{
+ BMDAudioFormat GetAudioFormat(void);
+};
+
+/* Interface IDeckLinkH265NALPacket - Obtained through QueryInterface() on an IDeckLinkEncoderVideoPacket object */
+
+[
+ object,
+ uuid(639C8E0B-68D5-4BDE-A6D4-95F3AEAFF2E7),
+ local,
+ helpstring("Obtained through QueryInterface() on an IDeckLinkEncoderVideoPacket object")
+] interface IDeckLinkH265NALPacket : IDeckLinkEncoderVideoPacket
+{
+ HRESULT GetUnitType([out] unsigned char *unitType);
+ HRESULT GetBytesNoPrefix([out] void **buffer);
+ long GetSizeNoPrefix(void);
+};
+
 /* Interface IDeckLinkAudioInputPacket - Provided by the IDeckLinkInput callback. */
 
 [
@@ -708,6 +972,22 @@
 HRESULT GetString([in] BMDDeckLinkAttributeID cfgID, [out] BSTR *value);
 };
 
+/* Interface IDeckLinkStatus - DeckLink Status interface */
+
+[
+ object,
+ uuid(5F558200-4028-49BC-BEAC-DB3FA4A96E46),
+ local,
+ helpstring("DeckLink Status interface")
+] interface IDeckLinkStatus : IUnknown
+{
+ HRESULT GetFlag([in] BMDDeckLinkStatusID statusID, [out] BOOL *value);
+ HRESULT GetInt([in] BMDDeckLinkStatusID statusID, [out] LONGLONG *value);
+ HRESULT GetFloat([in] BMDDeckLinkStatusID statusID, [out] double *value);
+ HRESULT GetString([in] BMDDeckLinkStatusID statusID, [out] BSTR *value);
+ HRESULT GetBytes([in] BMDDeckLinkStatusID statusID, [out] void *buffer, [in, out] unsigned int *bufferSize);
+};
+
 /* Interface IDeckLinkKeyer - DeckLink Keyer interface */
 
 [
@@ -719,8 +999,8 @@
 {
 HRESULT Enable([in] BOOL isExternal);
 HRESULT SetLevel([in] unsigned char level);
- HRESULT RampUp([in] unsigned long numberOfFrames);
- HRESULT RampDown([in] unsigned long numberOfFrames);
+ HRESULT RampUp([in] unsigned int numberOfFrames);
+ HRESULT RampDown([in] unsigned int numberOfFrames);
 HRESULT Disable(void);
 };
 
@@ -762,6 +1042,8 @@
 
 /* Coclasses */
 
+importlib("stdole2.tlb");
+
 [
 uuid(1F2E109A-8F4F-49E4-9203-135595CB6FA5),
 helpstring("CDeckLinkIterator Class")
@@ -810,4 +1092,18 @@
 [default] interface IDeckLinkDiscovery;
 };
 
+
+// import deprecated interfaces
+#include "DeckLinkAPI_v10_6.idl"
+#include "DeckLinkAPI_v10_5.idl"
+#include "DeckLinkAPI_v10_4.idl"
+#include "DeckLinkAPI_v10_2.idl"
+#include "DeckLinkAPI_v9_9.idl"
+#include "DeckLinkAPI_v9_2.idl"
+#include "DeckLinkAPI_v8_1.idl"
+#include "DeckLinkAPI_v8_0.idl"
+#include "DeckLinkAPI_v7_9.idl"
+#include "DeckLinkAPI_v7_6.idl"
+#include "DeckLinkAPI_v7_3.idl"
+#include "DeckLinkAPI_v7_1.idl"
 };

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -59,6 +59,7 @@
     bmdDeckLinkConfigHDMI3DPackingFormat                         = /* '3dpf' */ 0x33647066,
     bmdDeckLinkConfigBypass                                      = /* 'byps' */ 0x62797073,
     bmdDeckLinkConfigClockTimingAdjustment                       = /* 'ctad' */ 0x63746164,
+    bmdDeckLinkConfigDuplexMode                                  = /* 'dupx' */ 0x64757078,
 
     /* Audio Input/Output Flags */
 
@@ -69,9 +70,10 @@
     bmdDeckLinkConfigFieldFlickerRemoval                         = /* 'fdfr' */ 0x66646672,
     bmdDeckLinkConfigHD1080p24ToHD1080i5994Conversion            = /* 'to59' */ 0x746F3539,
     bmdDeckLinkConfig444SDIVideoOutput                           = /* '444o' */ 0x3434346F,
-    bmdDeckLinkConfigSingleLinkVideoOutput                       = /* 'sglo' */ 0x73676C6F,
     bmdDeckLinkConfigBlackVideoOutputDuringCapture               = /* 'bvoc' */ 0x62766F63,
     bmdDeckLinkConfigLowLatencyVideoOutput                       = /* 'llvo' */ 0x6C6C766F,
+    bmdDeckLinkConfigDownConversionOnAllAnalogOutput             = /* 'caao' */ 0x6361616F,
+    bmdDeckLinkConfigSMPTELevelAOutput                           = /* 'smta' */ 0x736D7461,
 
     /* Video Output Integers */
 
@@ -82,6 +84,7 @@
     bmdDeckLinkConfigVideoOutputIdleOperation                    = /* 'voio' */ 0x766F696F,
     bmdDeckLinkConfigDefaultVideoOutputMode                      = /* 'dvom' */ 0x64766F6D,
     bmdDeckLinkConfigDefaultVideoOutputModeFlags                 = /* 'dvof' */ 0x64766F66,
+    bmdDeckLinkConfigSDIOutputLinkConfiguration                  = /* 'solc' */ 0x736F6C63,
 
     /* Video Output Floats */
 
@@ -97,6 +100,7 @@
 
     bmdDeckLinkConfigVideoInputScanning                          = /* 'visc' */ 0x76697363,	// Applicable to H264 Pro Recorder only
     bmdDeckLinkConfigUseDedicatedLTCInput                        = /* 'dltc' */ 0x646C7463,	// Use timecode from LTC input instead of SDI stream
+    bmdDeckLinkConfigSDIInput3DPayloadOverride                   = /* '3dds' */ 0x33646473,
 
     /* Video Input Integers */
 
@@ -119,6 +123,10 @@
     bmdDeckLinkConfigVideoInputSVideoLumaGain                    = /* 'islg' */ 0x69736C67,
     bmdDeckLinkConfigVideoInputSVideoChromaGain                  = /* 'iscg' */ 0x69736367,
 
+    /* Audio Input Flags */
+
+    bmdDeckLinkConfigMicrophonePhantomPower                      = /* 'mphp' */ 0x6D706870,
+
     /* Audio Input Integers */
 
     bmdDeckLinkConfigAudioInputConnection                        = /* 'aicn' */ 0x6169636E,
@@ -130,6 +138,7 @@
     bmdDeckLinkConfigAnalogAudioInputScaleChannel3               = /* 'ais3' */ 0x61697333,
     bmdDeckLinkConfigAnalogAudioInputScaleChannel4               = /* 'ais4' */ 0x61697334,
     bmdDeckLinkConfigDigitalAudioInputScale                      = /* 'dais' */ 0x64616973,
+    bmdDeckLinkConfigMicrophoneInputGain                         = /* 'micg' */ 0x6D696367,
 
     /* Audio Output Integers */
 
@@ -141,18 +150,60 @@
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel2              = /* 'aos2' */ 0x616F7332,
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel3              = /* 'aos3' */ 0x616F7333,
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel4              = /* 'aos4' */ 0x616F7334,
-    bmdDeckLinkConfigDigitalAudioOutputScale                     = /* 'daos' */ 0x64616F73
+    bmdDeckLinkConfigDigitalAudioOutputScale                     = /* 'daos' */ 0x64616F73,
+    bmdDeckLinkConfigHeadphoneVolume                             = /* 'hvol' */ 0x68766F6C,
+
+    /* Device Information Strings */
+
+    bmdDeckLinkConfigDeviceInformationLabel                      = /* 'dila' */ 0x64696C61,
+    bmdDeckLinkConfigDeviceInformationSerialNumber               = /* 'disn' */ 0x6469736E,
+    bmdDeckLinkConfigDeviceInformationCompany                    = /* 'dico' */ 0x6469636F,
+    bmdDeckLinkConfigDeviceInformationPhone                      = /* 'diph' */ 0x64697068,
+    bmdDeckLinkConfigDeviceInformationEmail                      = /* 'diem' */ 0x6469656D,
+    bmdDeckLinkConfigDeviceInformationDate                       = /* 'dida' */ 0x64696461,
+
+    /* Deck Control Integers */
+
+    bmdDeckLinkConfigDeckControlConnection                       = /* 'dcco' */ 0x6463636F
 } BMDDeckLinkConfigurationID;
 
+/* Enum BMDDeckLinkEncoderConfigurationID - DeckLink Encoder Configuration ID */
+
+typedef [v1_enum] enum	_BMDDeckLinkEncoderConfigurationID {
+
+    /* Video Encoder Integers */
+
+    bmdDeckLinkEncoderConfigPreferredBitDepth                    = /* 'epbr' */ 0x65706272,
+    bmdDeckLinkEncoderConfigFrameCodingMode                      = /* 'efcm' */ 0x6566636D,
+
+    /* HEVC/H.265 Encoder Integers */
+
+    bmdDeckLinkEncoderConfigH265TargetBitrate                    = /* 'htbr' */ 0x68746272,
+
+    /* DNxHR/DNxHD Compression ID */
+
+    bmdDeckLinkEncoderConfigDNxHRCompressionID                   = /* 'dcid' */ 0x64636964,
+
+    /* DNxHR/DNxHD Level */
+
+    bmdDeckLinkEncoderConfigDNxHRLevel                           = /* 'dlev' */ 0x646C6576,
+
+    /* Encoded Sample Decriptions */
+
+    bmdDeckLinkEncoderConfigMPEG4SampleDescription               = /* 'stsE' */ 0x73747345,	// Full MPEG4 sample description (aka SampleEntry of an 'stsd' atom-box). Useful for MediaFoundation, QuickTime, MKV and more
+    bmdDeckLinkEncoderConfigMPEG4CodecSpecificDesc               = /* 'esds' */ 0x65736473	// Sample description extensions only (atom stream, each with size and fourCC header). Useful for AVFoundation, VideoToolbox, MKV and more
+} BMDDeckLinkEncoderConfigurationID;
+
 // Forward Declarations
 
 interface IDeckLinkConfiguration;
+interface IDeckLinkEncoderConfiguration;
 
 /* Interface IDeckLinkConfiguration - DeckLink Configuration interface */
 
 [
     object,
-    uuid(1E69FCF6-4203-4936-8076-2A9F4CFD50CB),
+    uuid(CB71734A-FE37-4E8D-8E13-802133A1C3F2),
     local,
     helpstring("DeckLink Configuration interface")
 ] interface IDeckLinkConfiguration : IUnknown
@@ -168,4 +219,28 @@
     HRESULT WriteConfigurationToPreferences(void);
 };
 
+/* Interface IDeckLinkEncoderConfiguration - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */
+
+[
+    object,
+    uuid(138050E5-C60A-4552-BF3F-0F358049327E),
+    local,
+    helpstring("DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput")
+] interface IDeckLinkEncoderConfiguration : IUnknown
+{
+    HRESULT SetFlag([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] BOOL value);
+    HRESULT GetFlag([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] BOOL *value);
+    HRESULT SetInt([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] LONGLONG value);
+    HRESULT GetInt([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] LONGLONG *value);
+    HRESULT SetFloat([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] double value);
+    HRESULT GetFloat([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] double *value);
+    HRESULT SetString([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] BSTR value);
+    HRESULT GetString([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] BSTR *value);
+    HRESULT GetBytes([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] void *buffer /* optional */, [in, out] unsigned int *bufferSize);
+};
+
 /* Coclasses */
+
+importlib("stdole2.tlb");
+
+

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -39,8 +39,8 @@
 
 // Enumeration Mapping
 
-cpp_quote("typedef unsigned long BMDDeckControlStatusFlags;")
-cpp_quote("typedef unsigned long BMDDeckControlExportModeOpsFlags;")
+cpp_quote("typedef unsigned int BMDDeckControlStatusFlags;")
+cpp_quote("typedef unsigned int BMDDeckControlExportModeOpsFlags;")
 cpp_quote("#if 0")
 typedef enum _BMDDeckControlStatusFlags BMDDeckControlStatusFlags;
 typedef enum _BMDDeckControlExportModeOpsFlags BMDDeckControlExportModeOpsFlags;
@@ -153,7 +153,7 @@
     HRESULT TimecodeUpdate([in] BMDTimecodeBCD currentTimecode);
     HRESULT VTRControlStateChanged([in] BMDDeckControlVTRControlState newState, [in] BMDDeckControlError error);
     HRESULT DeckControlEventReceived([in] BMDDeckControlEvent event, [in] BMDDeckControlError error);
-    HRESULT DeckControlStatusChanged([in] BMDDeckControlStatusFlags flags, [in] unsigned long mask);
+    HRESULT DeckControlStatusChanged([in] BMDDeckControlStatusFlags flags, [in] unsigned int mask);
 };
 
 /* Interface IDeckLinkDeckControl - Deck Control main interface */
@@ -168,7 +168,7 @@
     HRESULT Close([in] BOOL standbyOn);
     HRESULT GetCurrentState([out] BMDDeckControlMode *mode, [out] BMDDeckControlVTRControlState *vtrControlState, [out] BMDDeckControlStatusFlags *flags);
     HRESULT SetStandby([in] BOOL standbyOn);
-    HRESULT SendCommand([in] unsigned char *inBuffer, [in] unsigned long inBufferSize, [out] unsigned char *outBuffer, [out] unsigned long *outDataSize, [in] unsigned long outBufferSize, [out] BMDDeckControlError *error);
+    HRESULT SendCommand([in] unsigned char *inBuffer, [in] unsigned int inBufferSize, [out] unsigned char *outBuffer, [out] unsigned int *outDataSize, [in] unsigned int outBufferSize, [out] BMDDeckControlError *error);
     HRESULT Play([out] BMDDeckControlError *error);
     HRESULT Stop([out] BMDDeckControlError *error);
     HRESULT TogglePlayStop([out] BMDDeckControlError *error);
@@ -183,13 +183,13 @@
     HRESULT GetTimecodeString([out] BSTR *currentTimeCode, [out] BMDDeckControlError *error);
     HRESULT GetTimecode([out] IDeckLinkTimecode **currentTimecode, [out] BMDDeckControlError *error);
     HRESULT GetTimecodeBCD([out] BMDTimecodeBCD *currentTimecode, [out] BMDDeckControlError *error);
-    HRESULT SetPreroll([in] unsigned long prerollSeconds);
-    HRESULT GetPreroll([out] unsigned long *prerollSeconds);
-    HRESULT SetExportOffset([in] long exportOffsetFields);
-    HRESULT GetExportOffset([out] long *exportOffsetFields);
-    HRESULT GetManualExportOffset([out] long *deckManualExportOffsetFields);
-    HRESULT SetCaptureOffset([in] long captureOffsetFields);
-    HRESULT GetCaptureOffset([out] long *captureOffsetFields);
+    HRESULT SetPreroll([in] unsigned int prerollSeconds);
+    HRESULT GetPreroll([out] unsigned int *prerollSeconds);
+    HRESULT SetExportOffset([in] int exportOffsetFields);
+    HRESULT GetExportOffset([out] int *exportOffsetFields);
+    HRESULT GetManualExportOffset([out] int *deckManualExportOffsetFields);
+    HRESULT SetCaptureOffset([in] int captureOffsetFields);
+    HRESULT GetCaptureOffset([out] int *captureOffsetFields);
     HRESULT StartExport([in] BMDTimecodeBCD inTimecode, [in] BMDTimecodeBCD outTimecode, [in] BMDDeckControlExportModeOpsFlags exportModeOps, [out] BMDDeckControlError *error);
     HRESULT StartCapture([in] BOOL useVITC, [in] BMDTimecodeBCD inTimecode, [in] BMDTimecodeBCD outTimecode, [out] BMDDeckControlError *error);
     HRESULT GetDeviceID([out] unsigned short *deviceId, [out] BMDDeckControlError *error);
@@ -200,3 +200,7 @@
 };
 
 /* Coclasses */
+
+importlib("stdole2.tlb");
+
+

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl Changed

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -39,7 +39,7 @@
 
 // Enumeration Mapping
 
-cpp_quote("typedef unsigned long BMDDisplayModeFlags;")
+cpp_quote("typedef unsigned int BMDDisplayModeFlags;")
 cpp_quote("#if 0")
 typedef enum _BMDDisplayModeFlags BMDDisplayModeFlags;
 cpp_quote("#endif")
@@ -131,7 +131,12 @@
     bmdFormat12BitRGB                                            = /* 'R12B' */ 0x52313242,	// Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component
     bmdFormat12BitRGBLE                                          = /* 'R12L' */ 0x5231324C,	// Little-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component
     bmdFormat10BitRGBXLE                                         = /* 'R10l' */ 0x5231306C,	// Little-endian 10-bit RGB with SMPTE video levels (64-940)
-    bmdFormat10BitRGBX                                           = /* 'R10b' */ 0x52313062	// Big-endian 10-bit RGB with SMPTE video levels (64-940)
+    bmdFormat10BitRGBX                                           = /* 'R10b' */ 0x52313062,	// Big-endian 10-bit RGB with SMPTE video levels (64-940)
+    bmdFormatH265                                                = /* 'hev1' */ 0x68657631,	// High Efficiency Video Coding (HEVC/h.265)
+
+    /* AVID DNxHR */
+
+    bmdFormatDNxHR                                               = /* 'AVdh' */ 0x41566468
 } BMDPixelFormat;
 
 /* Enum BMDDisplayModeFlags - Flags to describe the characteristics of an IDeckLinkDisplayMode. */
@@ -176,3 +181,7 @@
 };
 
 /* Coclasses */
+
+importlib("stdole2.tlb");
+
+

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -237,8 +237,8 @@
     helpstring("Represents a mutable encoded video mode.")
 ] interface IBMDStreamingMutableVideoEncodingMode : IBMDStreamingVideoEncodingMode
 {
-    HRESULT SetSourceRect([in] unsigned long posX, [in] unsigned long posY, [in] unsigned long width, [in] unsigned long height);
-    HRESULT SetDestSize([in] unsigned long width, [in] unsigned long height);
+    HRESULT SetSourceRect([in] unsigned int posX, [in] unsigned int posY, [in] unsigned int width, [in] unsigned int height);
+    HRESULT SetDestSize([in] unsigned int width, [in] unsigned int height);
     HRESULT SetFlag([in] BMDStreamingEncodingModePropertyID cfgID, [in] BOOL value);
     HRESULT SetInt([in] BMDStreamingEncodingModePropertyID cfgID, [in] LONGLONG value);
     HRESULT SetFloat([in] BMDStreamingEncodingModePropertyID cfgID, [in] double value);
@@ -298,7 +298,7 @@
     HRESULT GetBytes([out] void** buffer);
     HRESULT GetBytesWithSizePrefix([out] void** buffer); // Contains a 32-bit unsigned big endian size prefix
     HRESULT GetDisplayTime([in] ULONGLONG requestedTimeScale, [out] ULONGLONG* displayTime);
-    HRESULT GetPacketIndex([out] unsigned long* packetIndex); // Deprecated
+    HRESULT GetPacketIndex([out] unsigned int* packetIndex); // Deprecated
 };
 
 /* Interface IBMDStreamingAudioPacket - Represents a chunk of audio data */
@@ -313,7 +313,7 @@
     long GetPayloadSize(void);
     HRESULT GetBytes([out] void** buffer);
     HRESULT GetPlayTime([in] ULONGLONG requestedTimeScale, [out] ULONGLONG* playTime);
-    HRESULT GetPacketIndex([out] unsigned long* packetIndex); // Deprecated
+    HRESULT GetPacketIndex([out] unsigned int* packetIndex); // Deprecated
 };
 
 /* Interface IBMDStreamingMPEG2TSPacket - Represent an MPEG2 Transport Stream packet */
@@ -338,11 +338,13 @@
 {
     HRESULT IsNALSequenceParameterSet([in] IBMDStreamingH264NALPacket* nal);
     HRESULT IsNALPictureParameterSet([in] IBMDStreamingH264NALPacket* nal);
-    HRESULT GetProfileAndLevelFromSPS([in] IBMDStreamingH264NALPacket* nal, [out] unsigned long* profileIdc, [out] unsigned long* profileCompatability, [out] unsigned long* levelIdc);
+    HRESULT GetProfileAndLevelFromSPS([in] IBMDStreamingH264NALPacket* nal, [out] unsigned int* profileIdc, [out] unsigned int* profileCompatability, [out] unsigned int* levelIdc);
 };
 
 /* Coclasses */
 
+importlib("stdole2.tlb");
+
 [
     uuid(0CAA31F6-8A26-40B0-86A4-BF58DCCA710C),
     helpstring("CBMDStreamingDiscovery Class")
@@ -358,3 +360,5 @@
 {
     [default] interface IBMDStreamingH264NALParser;
 };
+
+

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl Changed

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2014 Blackmagic Design
+** Copyright (c) 2016 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by
@@ -38,12 +38,12 @@
 
 typedef LONGLONG BMDTimeValue;
 typedef LONGLONG BMDTimeScale;
-typedef unsigned long BMDTimecodeBCD;
-typedef unsigned long BMDTimecodeUserBits;
+typedef unsigned int BMDTimecodeBCD;
+typedef unsigned int BMDTimecodeUserBits;
 
 // Enumeration Mapping
 
-cpp_quote("typedef unsigned long BMDTimecodeFlags;")
+cpp_quote("typedef unsigned int BMDTimecodeFlags;")
 cpp_quote("#if 0")
 typedef enum _BMDTimecodeFlags BMDTimecodeFlags;
 cpp_quote("#endif")
@@ -74,9 +74,18 @@
 bmdAudioConnectionAESEBU = 1 << 1,
 bmdAudioConnectionAnalog = 1 << 2,
 bmdAudioConnectionAnalogXLR = 1 << 3,
- bmdAudioConnectionAnalogRCA = 1 << 4
+ bmdAudioConnectionAnalogRCA = 1 << 4,
+ bmdAudioConnectionMicrophone = 1 << 5,
+ bmdAudioConnectionHeadphones = 1 << 6
 } BMDAudioConnection;
 
+/* Enum BMDDeckControlConnection - Deck control connections */
+
+typedef [v1_enum] enum	_BMDDeckControlConnection {
+ bmdDeckControlConnectionRS422Remote1 = 1 << 0,
+ bmdDeckControlConnectionRS422Remote2 = 1 << 1
+} BMDDeckControlConnection;
+
 // Forward Declarations
 
 interface IDeckLinkTimecode;
@@ -97,3 +106,7 @@
 };
 
 /* Coclasses */
+
+importlib("stdole2.tlb");
+
+

obs-studio-0.16.2.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h -> obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h Changed

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_2.idl Added

@@ -0,0 +1,73 @@
+/* -LICENSE-START-
+** Copyright (c) 2014 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v10_2.idl */
+
+// Enumeration Mapping
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef [v1_enum] enum  _BMDDeckLinkConfigurationID_v10_2 {
+
+    /* Video output flags */
+
+    bmdDeckLinkConfig3GBpsVideoOutput_v10_2                      = /* '3gbs' */ 0x33676273
+
+} BMDDeckLinkConfigurationID_v10_2;
+
+/* Enum BMDAudioConnection_v10_2 - Audio connection types */
+
+typedef [v1_enum] enum	_BMDAudioConnection_v10_2 {
+    bmdAudioConnectionEmbedded_v10_2                             = /* 'embd' */ 0x656D6264,
+    bmdAudioConnectionAESEBU_v10_2                               = /* 'aes ' */ 0x61657320,
+    bmdAudioConnectionAnalog_v10_2                               = /* 'anlg' */ 0x616E6C67,
+    bmdAudioConnectionAnalogXLR_v10_2                            = /* 'axlr' */ 0x61786C72,
+    bmdAudioConnectionAnalogRCA_v10_2                            = /* 'arca' */ 0x61726361
+} BMDAudioConnection_v10_2;
+
+// Forward Declarations
+
+interface IDeckLinkConfiguration_v10_2;
+
+/* Interface IDeckLinkConfiguration_v10_2 - DeckLink Configuration interface */
+
+[
+    object,
+    uuid(C679A35B-610C-4D09-B748-1D0478100FC0),
+    local,
+    helpstring("DeckLink Configuration interface")
+] interface IDeckLinkConfiguration_v10_2 : IUnknown
+{
+    HRESULT SetFlag([in] BMDDeckLinkConfigurationID cfgID, [in] BOOL value);
+    HRESULT GetFlag([in] BMDDeckLinkConfigurationID cfgID, [out] BOOL *value);
+    HRESULT SetInt([in] BMDDeckLinkConfigurationID cfgID, [in] LONGLONG value);
+    HRESULT GetInt([in] BMDDeckLinkConfigurationID cfgID, [out] LONGLONG *value);
+    HRESULT SetFloat([in] BMDDeckLinkConfigurationID cfgID, [in] double value);
+    HRESULT GetFloat([in] BMDDeckLinkConfigurationID cfgID, [out] double *value);
+    HRESULT SetString([in] BMDDeckLinkConfigurationID cfgID, [in] BSTR value);
+    HRESULT GetString([in] BMDDeckLinkConfigurationID cfgID, [out] BSTR *value);
+    HRESULT WriteConfigurationToPreferences(void);
+};

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_4.idl Added

@@ -0,0 +1,61 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v10_4.idl */
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef [v1_enum] enum	_BMDDeckLinkConfigurationID_v10_4 {
+
+    /* Video output flags */
+
+    bmdDeckLinkConfigSingleLinkVideoOutput_v10_4                       = /* 'sglo' */ 0x73676C6F,
+
+} BMDDeckLinkConfigurationID_v10_4;
+
+// Forward Declarations
+
+interface IDeckLinkConfiguration_v10_4;
+
+/* Interface IDeckLinkConfiguration_v10_4 - DeckLink Configuration interface */
+
+[
+    object,
+    uuid(1E69FCF6-4203-4936-8076-2A9F4CFD50CB),
+    local,
+    helpstring("DeckLink Configuration interface")
+] interface IDeckLinkConfiguration_v10_4 : IUnknown
+{
+    HRESULT SetFlag([in] BMDDeckLinkConfigurationID cfgID, [in] BOOL value);
+    HRESULT GetFlag([in] BMDDeckLinkConfigurationID cfgID, [out] BOOL *value);
+    HRESULT SetInt([in] BMDDeckLinkConfigurationID cfgID, [in] LONGLONG value);
+    HRESULT GetInt([in] BMDDeckLinkConfigurationID cfgID, [out] LONGLONG *value);
+    HRESULT SetFloat([in] BMDDeckLinkConfigurationID cfgID, [in] double value);
+    HRESULT GetFloat([in] BMDDeckLinkConfigurationID cfgID, [out] double *value);
+    HRESULT SetString([in] BMDDeckLinkConfigurationID cfgID, [in] BSTR value);
+    HRESULT GetString([in] BMDDeckLinkConfigurationID cfgID, [out] BSTR *value);
+    HRESULT WriteConfigurationToPreferences(void);
+};

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_5.idl Added

@@ -0,0 +1,61 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v10_5.idl */
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef [v1_enum] enum	_BMDDeckLinkAttributeID_v10_5 {
+
+    /* Integers */
+
+    BMDDeckLinkDeviceBusyState_v10_5                             = /* 'dbst' */ 0x64627374,
+
+} BMDDeckLinkAttributeID_v10_5;
+
+// Forward Declarations
+
+interface IDeckLinkEncoderConfiguration_v10_5;
+
+/* Interface IDeckLinkEncoderConfiguration_v10_5 - DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput */
+
+[
+    object,
+    uuid(67455668-0848-45DF-8D8E-350A77C9A028),
+    local,
+    helpstring("DeckLink Encoder Configuration interface. Obtained from IDeckLinkEncoderInput")
+] interface IDeckLinkEncoderConfiguration_v10_5 : IUnknown
+{
+    HRESULT SetFlag([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] BOOL value);
+    HRESULT GetFlag([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] BOOL *value);
+    HRESULT SetInt([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] LONGLONG value);
+    HRESULT GetInt([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] LONGLONG *value);
+    HRESULT SetFloat([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] double value);
+    HRESULT GetFloat([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] double *value);
+    HRESULT SetString([in] BMDDeckLinkEncoderConfigurationID cfgID, [in] BSTR value);
+    HRESULT GetString([in] BMDDeckLinkEncoderConfigurationID cfgID, [out] BSTR *value);
+    HRESULT GetDecoderConfigurationInfo([out] void *buffer, [in] long bufferSize, [out] long *returnedSize);
+};

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_6.idl Added

@@ -0,0 +1,41 @@
+/* -LICENSE-START-
+** Copyright (c) 2016 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v10_6.idl */
+
+/* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
+
+typedef [v1_enum] enum	_BMDDeckLinkAttributeID_v10_6 {
+
+    /* Flags */
+
+    BMDDeckLinkSupportsDesktopDisplay_v10_6                      = /* 'extd' */ 0x65787464,
+
+} BMDDeckLinkAttributeID_v10_6;
+
+typedef [v1_enum] enum _BMDIdleVideoOutputOperation_v10_6 {
+    bmdIdleVideoOutputDesktop_v10_6                              = /* 'desk' */ 0x6465736B
+} BMDIdleVideoOutputOperation_v10_6;

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v7_1.idl Added

@@ -0,0 +1,160 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v7_1.idl */
+
+	interface IDeckLinkDisplayModeIterator_v7_1;
+	interface IDeckLinkDisplayMode_v7_1;
+	interface IDeckLinkVideoFrame_v7_1;
+	interface IDeckLinkVideoInputFrame_v7_1;
+	interface IDeckLinkAudioInputPacket_v7_1;
+
+	[object, uuid(B28131B6-59AC-4857-B5AC-CD75D5883E2F),
+	 helpstring("IDeckLinkDisplayModeIterator_v7_1 enumerates over supported input/output display modes.")]
+	interface IDeckLinkDisplayModeIterator_v7_1 : IUnknown
+	{
+		HRESULT		Next ([out] IDeckLinkDisplayMode_v7_1** deckLinkDisplayMode);
+	};
+
+
+	[object, uuid(AF0CD6D5-8376-435E-8433-54F9DD530AC3),
+	 helpstring("IDeckLinkDisplayMode_v7_1 represents a display mode")]
+	interface IDeckLinkDisplayMode_v7_1 : IUnknown
+	{
+		HRESULT				GetName ([out] BSTR* name);
+		BMDDisplayMode		GetDisplayMode ();
+		long				GetWidth ();
+		long				GetHeight ();
+		HRESULT				GetFrameRate ([out] BMDTimeValue *frameDuration, [out] BMDTimeScale *timeScale);
+	};
+
+	[object, uuid(EBD01AFA-E4B0-49C6-A01D-EDB9D1B55FD9),
+     helpstring("IDeckLinkVideoOutputCallback. Frame completion callback.")]
+    interface IDeckLinkVideoOutputCallback_v7_1 : IUnknown
+    {
+        HRESULT		ScheduledFrameCompleted ([in] IDeckLinkVideoFrame_v7_1* completedFrame, [in] BMDOutputFrameCompletionResult result);
+    };
+
+    [object, uuid(7F94F328-5ED4-4E9F-9729-76A86BDC99CC),
+     helpstring("IDeckLinkInputCallback_v7_1. Frame arrival callback.")]
+    interface IDeckLinkInputCallback_v7_1 : IUnknown
+    {
+        HRESULT		VideoInputFrameArrived ([in] IDeckLinkVideoInputFrame_v7_1* videoFrame, [in] IDeckLinkAudioInputPacket_v7_1* audioPacket);
+    };
+
+
+    [object, uuid(AE5B3E9B-4E1E-4535-B6E8-480FF52F6CE5), local,
+     helpstring("IDeckLinkOutput_v7_1.  Created by QueryInterface from IDeckLink.")]
+    interface IDeckLinkOutput_v7_1 : IUnknown
+    {
+		HRESULT		DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, [out] BMDDisplayModeSupport *result);
+		HRESULT		GetDisplayModeIterator ([out] IDeckLinkDisplayModeIterator_v7_1 **iterator);
+
+		// Video output
+        HRESULT		EnableVideoOutput (BMDDisplayMode displayMode);
+        HRESULT		DisableVideoOutput ();
+
+		HRESULT		SetVideoOutputFrameMemoryAllocator ([in] IDeckLinkMemoryAllocator* theAllocator);
+        HRESULT		CreateVideoFrame (int width, int height, int rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1** outFrame);
+        HRESULT		CreateVideoFrameFromBuffer (void* buffer, int width, int height, int rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1** outFrame);
+
+        HRESULT		DisplayVideoFrameSync (IDeckLinkVideoFrame_v7_1* theFrame);
+        HRESULT		ScheduleVideoFrame (IDeckLinkVideoFrame_v7_1* theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale);
+        HRESULT		SetScheduledFrameCompletionCallback ([in] IDeckLinkVideoOutputCallback_v7_1* theCallback);
+
+		// Audio output
+		HRESULT		EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, unsigned int channelCount);
+		HRESULT		DisableAudioOutput ();
+
+		HRESULT		WriteAudioSamplesSync (void* buffer, unsigned int sampleFrameCount, [out] unsigned int *sampleFramesWritten);
+
+		HRESULT		BeginAudioPreroll ();
+		HRESULT		EndAudioPreroll ();
+		HRESULT		ScheduleAudioSamples (void* buffer, unsigned int sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, [out] unsigned int *sampleFramesWritten);
+
+		HRESULT		GetBufferedAudioSampleFrameCount ( [out] unsigned int *bufferedSampleCount);
+		HRESULT		FlushBufferedAudioSamples ();
+
+		HRESULT		SetAudioCallback ( [in] IDeckLinkAudioOutputCallback* theCallback);
+
+		// Output control
+        HRESULT		StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed);
+        HRESULT		StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, BMDTimeValue *actualStopTime, BMDTimeScale timeScale);
+        HRESULT		GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, BMDTimeValue *elapsedTimeSinceSchedulerBegan);
+    };
+
+    [object, uuid(2B54EDEF-5B32-429F-BA11-BB990596EACD),
+     helpstring("IDeckLinkInput_v7_1.  Created by QueryInterface from IDeckLink.")]
+    interface IDeckLinkInput_v7_1 : IUnknown
+    {
+		HRESULT		DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, [out] BMDDisplayModeSupport *result);
+		HRESULT		GetDisplayModeIterator ([out] IDeckLinkDisplayModeIterator_v7_1 **iterator);
+
+		// Video input
+		HRESULT		EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags);
+		HRESULT		DisableVideoInput ();
+
+		// Audio input
+		HRESULT		EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, unsigned int channelCount);
+		HRESULT		DisableAudioInput ();
+		HRESULT		ReadAudioSamples (void* buffer, unsigned int sampleFrameCount, [out] unsigned int *sampleFramesRead, [out] BMDTimeValue *audioPacketTime, BMDTimeScale timeScale);
+		HRESULT		GetBufferedAudioSampleFrameCount ( [out] unsigned int *bufferedSampleCount);
+
+		// Input control
+		HRESULT		StartStreams ();
+		HRESULT		StopStreams ();
+		HRESULT		PauseStreams ();
+		HRESULT		SetCallback ([in] IDeckLinkInputCallback_v7_1* theCallback);
+    };
+
+	[object, uuid(333F3A10-8C2D-43CF-B79D-46560FEEA1CE), local,
+     helpstring("IDeckLinkVideoFrame_v7_1.  Created by IDeckLinkVideoOutput::CreateVideoFrame.")]
+    interface IDeckLinkVideoFrame_v7_1 : IUnknown
+    {
+        long				GetWidth ();
+        long				GetHeight ();
+        long				GetRowBytes ();
+        BMDPixelFormat		GetPixelFormat ();
+        BMDFrameFlags		GetFlags ();
+        HRESULT				GetBytes (void* *buffer);
+    };
+
+	[object, uuid(C8B41D95-8848-40EE-9B37-6E3417FB114B), local,
+     helpstring("IDeckLinkVideoInputFrame_v7_1.  Provided by the IDeckLinkVideoInput frame arrival callback.")]
+    interface IDeckLinkVideoInputFrame_v7_1 : IDeckLinkVideoFrame_v7_1
+    {
+        HRESULT				GetFrameTime (BMDTimeValue *frameTime, BMDTimeValue *frameDuration, BMDTimeScale timeScale);
+    };
+
+	[object, uuid(C86DE4F6-A29F-42E3-AB3A-1363E29F0788), local,
+     helpstring("IDeckLinkAudioInputPacket_v7_1.  Provided by the IDeckLinkInput callback.")]
+    interface IDeckLinkAudioInputPacket_v7_1 : IUnknown
+    {
+		long				GetSampleCount ();
+		HRESULT				GetBytes (void* *buffer);
+		HRESULT				GetAudioPacketTime (BMDTimeValue *packetTime, BMDTimeScale timeScale);
+    };
+

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v7_3.idl Added

@@ -0,0 +1,157 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* Forward Declarations */
+
+interface IDeckLinkInputCallback_v7_3;
+interface IDeckLinkOutput_v7_3;
+interface IDeckLinkInput_v7_3;
+interface IDeckLinkVideoInputFrame_v7_3;
+
+/* End Forward Declarations */
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+[
+    object,
+    uuid(FD6F311D-4D00-444B-9ED4-1F25B5730AD0),
+    helpstring("Frame arrival callback.")
+] interface IDeckLinkInputCallback_v7_3 : IUnknown
+{
+    HRESULT VideoInputFormatChanged([in] BMDVideoInputFormatChangedEvents notificationEvents, [in] IDeckLinkDisplayMode_v7_6 *newDisplayMode, [in] BMDDetectedVideoInputFormatFlags detectedSignalFlags);
+    HRESULT VideoInputFrameArrived([in] IDeckLinkVideoInputFrame_v7_3 *videoFrame, [in] IDeckLinkAudioInputPacket *audioPacket);
+};
+
+/* End Interface IDeckLinkInputCallback */
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(271C65E3-C323-4344-A30F-D908BCB20AA3),
+    local,
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkOutput_v7_3 : IUnknown
+{
+    HRESULT DoesSupportVideoMode(BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, [out] BMDDisplayModeSupport *result);
+    HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator_v7_6 **iterator);
+
+    HRESULT SetScreenPreviewCallback([in] IDeckLinkScreenPreviewCallback *previewCallback);
+
+    /* Video Output */
+
+    HRESULT EnableVideoOutput(BMDDisplayMode displayMode, BMDVideoOutputFlags flags);
+    HRESULT DisableVideoOutput(void);
+
+    HRESULT SetVideoOutputFrameMemoryAllocator([in] IDeckLinkMemoryAllocator *theAllocator);
+    HRESULT CreateVideoFrame(int width, int height, int rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, [out] IDeckLinkMutableVideoFrame_v7_6 **outFrame);
+    HRESULT CreateAncillaryData(BMDPixelFormat pixelFormat, [out] IDeckLinkVideoFrameAncillary **outBuffer);
+
+    HRESULT DisplayVideoFrameSync([in] IDeckLinkVideoFrame_v7_6 *theFrame);
+    HRESULT ScheduleVideoFrame([in] IDeckLinkVideoFrame_v7_6 *theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale);
+    HRESULT SetScheduledFrameCompletionCallback([in] IDeckLinkVideoOutputCallback *theCallback);
+    HRESULT GetBufferedVideoFrameCount([out] unsigned int *bufferedFrameCount);
+
+    /* Audio Output */
+
+    HRESULT EnableAudioOutput(BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, unsigned int channelCount, BMDAudioOutputStreamType streamType);
+    HRESULT DisableAudioOutput(void);
+
+    HRESULT WriteAudioSamplesSync([in] void *buffer, unsigned int sampleFrameCount, [out] unsigned int *sampleFramesWritten);
+
+    HRESULT BeginAudioPreroll(void);
+    HRESULT EndAudioPreroll(void);
+    HRESULT ScheduleAudioSamples([in] void *buffer, unsigned int sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, [out] unsigned int *sampleFramesWritten);
+
+    HRESULT GetBufferedAudioSampleFrameCount([out] unsigned int *bufferedSampleFrameCount);
+    HRESULT FlushBufferedAudioSamples(void);
+
+    HRESULT SetAudioCallback([in] IDeckLinkAudioOutputCallback *theCallback);
+
+    /* Output Control */
+
+    HRESULT StartScheduledPlayback(BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed);
+    HRESULT StopScheduledPlayback(BMDTimeValue stopPlaybackAtTime, [out] BMDTimeValue *actualStopTime, BMDTimeScale timeScale);
+    HRESULT IsScheduledPlaybackRunning([out] BOOL *active);
+    HRESULT GetHardwareReferenceClock(BMDTimeScale desiredTimeScale, [out] BMDTimeValue *elapsedTimeSinceSchedulerBegan);
+};
+
+/* End Interface IDeckLinkOutput */
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(4973F012-9925-458C-871C-18774CDBBECB),
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkInput_v7_3 : IUnknown
+{
+    HRESULT DoesSupportVideoMode(BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, [out] BMDDisplayModeSupport *result);
+    HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator_v7_6 **iterator);
+
+    HRESULT SetScreenPreviewCallback([in] IDeckLinkScreenPreviewCallback *previewCallback);
+
+    /* Video Input */
+
+    HRESULT EnableVideoInput(BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags);
+    HRESULT DisableVideoInput(void);
+    HRESULT GetAvailableVideoFrameCount([out] unsigned int *availableFrameCount);
+
+    /* Audio Input */
+
+    HRESULT EnableAudioInput(BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, unsigned int channelCount);
+    HRESULT DisableAudioInput(void);
+    HRESULT GetAvailableAudioSampleFrameCount([out] unsigned int *availableSampleFrameCount);
+
+    /* Input Control */
+
+    HRESULT StartStreams(void);
+    HRESULT StopStreams(void);
+    HRESULT PauseStreams(void);
+    HRESULT FlushStreams(void);
+    HRESULT SetCallback([in] IDeckLinkInputCallback_v7_3 *theCallback);
+};
+
+/* End Interface IDeckLinkInput */
+
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+[
+    object,
+    uuid(CF317790-2894-11DE-8C30-0800200C9A66),
+    local,
+    helpstring("Provided by the IDeckLinkVideoInput frame arrival callback.")
+] interface IDeckLinkVideoInputFrame_v7_3 : IDeckLinkVideoFrame_v7_6
+{
+    HRESULT GetStreamTime([out] BMDTimeValue *frameTime, [out] BMDTimeValue *frameDuration, BMDTimeScale timeScale);
+};
+
+/* End Interface IDeckLinkVideoInputFrame */
+

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v7_6.idl Added

@@ -0,0 +1,396 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* Enum BMDVideoConnection - Video connection types */
+
+typedef [v1_enum] enum  _BMDVideoConnection_v7_6 {
+    bmdVideoConnectionSDI_v7_6                              = /* 'sdi ' */ 0x73646920,
+    bmdVideoConnectionHDMI_v7_6                             = /* 'hdmi' */ 0x68646D69,
+    bmdVideoConnectionOpticalSDI_v7_6                       = /* 'opti' */ 0x6F707469,
+    bmdVideoConnectionComponent_v7_6                        = /* 'cpnt' */ 0x63706E74,
+    bmdVideoConnectionComposite_v7_6                        = /* 'cmst' */ 0x636D7374,
+    bmdVideoConnectionSVideo_v7_6                           = /* 'svid' */ 0x73766964
+} BMDVideoConnection_v7_6;
+
+
+
+/* Forward Declarations */
+
+interface IDeckLinkDisplayModeIterator_v7_6;
+interface IDeckLinkDisplayMode_v7_6;
+interface IDeckLinkOutput_v7_6;
+interface IDeckLinkInput_v7_6;
+interface IDeckLinkTimecode_v7_6;
+interface IDeckLinkVideoFrame_v7_6;
+interface IDeckLinkMutableVideoFrame_v7_6;
+interface IDeckLinkVideoInputFrame_v7_6;
+interface IDeckLinkScreenPreviewCallback_v7_6;
+interface IDeckLinkGLScreenPreviewHelper_v7_6;
+interface IDeckLinkVideoConversion_v7_6;
+interface IDeckLinkConfiguration_v7_6;
+
+
+/* Interface IDeckLinkVideoOutputCallback - Frame completion callback. */
+
+[
+    object,
+    uuid(E763A626-4A3C-49D1-BF13-E7AD3692AE52),
+    helpstring("Frame completion callback.")
+] interface IDeckLinkVideoOutputCallback_v7_6 : IUnknown
+{
+    HRESULT ScheduledFrameCompleted([in] IDeckLinkVideoFrame_v7_6 *completedFrame, [in] BMDOutputFrameCompletionResult result);
+    HRESULT ScheduledPlaybackHasStopped(void);
+};
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+[
+    object,
+    uuid(31D28EE7-88B6-4CB1-897A-CDBF79A26414),
+    helpstring("Frame arrival callback.")
+] interface IDeckLinkInputCallback_v7_6 : IUnknown
+{
+    HRESULT VideoInputFormatChanged([in] BMDVideoInputFormatChangedEvents notificationEvents, [in] IDeckLinkDisplayMode_v7_6 *newDisplayMode, [in] BMDDetectedVideoInputFormatFlags detectedSignalFlags);
+    HRESULT VideoInputFrameArrived([in] IDeckLinkVideoInputFrame_v7_6* videoFrame, [in] IDeckLinkAudioInputPacket* audioPacket);
+};
+
+
+/* Interface IDeckLinkDisplayModeIterator - enumerates over supported input/output display modes. */
+
+[
+    object,
+    uuid(455D741F-1779-4800-86F5-0B5D13D79751),
+    helpstring("enumerates over supported input/output display modes.")
+] interface IDeckLinkDisplayModeIterator_v7_6 : IUnknown
+{
+    HRESULT Next([out] IDeckLinkDisplayMode_v7_6 **deckLinkDisplayMode);
+};
+
+
+/* Interface IDeckLinkDisplayMode - represents a display mode */
+
+[
+    object,
+    uuid(87451E84-2B7E-439E-A629-4393EA4A8550),
+    helpstring("represents a display mode")
+] interface IDeckLinkDisplayMode_v7_6 : IUnknown
+{
+    HRESULT GetName([out] BSTR *name);
+    BMDDisplayMode GetDisplayMode(void);
+    long GetWidth(void);
+    long GetHeight(void);
+    HRESULT GetFrameRate([out] BMDTimeValue *frameDuration, [out] BMDTimeScale *timeScale);
+    BMDFieldDominance GetFieldDominance(void);
+};
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(29228142-EB8C-4141-A621-F74026450955),
+    local,
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkOutput_v7_6 : IUnknown
+{
+    HRESULT DoesSupportVideoMode(BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, [out] BMDDisplayModeSupport *result);
+    HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator_v7_6 **iterator);
+
+    HRESULT SetScreenPreviewCallback([in] IDeckLinkScreenPreviewCallback_v7_6 *previewCallback);
+
+    /* Video Output */
+
+    HRESULT EnableVideoOutput(BMDDisplayMode displayMode, BMDVideoOutputFlags flags);
+    HRESULT DisableVideoOutput(void);
+
+    HRESULT SetVideoOutputFrameMemoryAllocator([in] IDeckLinkMemoryAllocator *theAllocator);
+    HRESULT CreateVideoFrame(int width, int height, int rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, [out] IDeckLinkMutableVideoFrame_v7_6 **outFrame);
+    HRESULT CreateAncillaryData(BMDPixelFormat pixelFormat, [out] IDeckLinkVideoFrameAncillary **outBuffer);
+
+    HRESULT DisplayVideoFrameSync([in] IDeckLinkVideoFrame_v7_6 *theFrame);
+    HRESULT ScheduleVideoFrame([in] IDeckLinkVideoFrame_v7_6 *theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale);
+    HRESULT SetScheduledFrameCompletionCallback([in] IDeckLinkVideoOutputCallback_v7_6 *theCallback);
+    HRESULT GetBufferedVideoFrameCount([out] unsigned int *bufferedFrameCount);
+
+    /* Audio Output */
+
+    HRESULT EnableAudioOutput(BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, unsigned int channelCount, BMDAudioOutputStreamType streamType);
+    HRESULT DisableAudioOutput(void);
+
+    HRESULT WriteAudioSamplesSync([in] void *buffer, unsigned int sampleFrameCount, [out] unsigned int *sampleFramesWritten);
+
+    HRESULT BeginAudioPreroll(void);
+    HRESULT EndAudioPreroll(void);
+    HRESULT ScheduleAudioSamples([in] void *buffer, unsigned int sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, [out] unsigned int *sampleFramesWritten);
+
+    HRESULT GetBufferedAudioSampleFrameCount([out] unsigned int *bufferedSampleFrameCount);
+    HRESULT FlushBufferedAudioSamples(void);
+
+    HRESULT SetAudioCallback([in] IDeckLinkAudioOutputCallback *theCallback);
+
+    /* Output Control */
+
+    HRESULT StartScheduledPlayback(BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed);
+    HRESULT StopScheduledPlayback(BMDTimeValue stopPlaybackAtTime, [out] BMDTimeValue *actualStopTime, BMDTimeScale timeScale);
+    HRESULT IsScheduledPlaybackRunning([out] BOOL *active);
+    HRESULT GetScheduledStreamTime(BMDTimeScale desiredTimeScale, [out] BMDTimeValue *streamTime, [out] double *playbackSpeed);
+
+    /* Hardware Timing */
+
+    HRESULT GetHardwareReferenceClock(BMDTimeScale desiredTimeScale, [out] BMDTimeValue *hardwareTime, [out] BMDTimeValue *timeInFrame, [out] BMDTimeValue *ticksPerFrame);
+};
+
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(300C135A-9F43-48E2-9906-6D7911D93CF1),
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkInput_v7_6 : IUnknown
+{
+    HRESULT DoesSupportVideoMode(BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, [out] BMDDisplayModeSupport *result);
+    HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator_v7_6 **iterator);
+
+    HRESULT SetScreenPreviewCallback([in] IDeckLinkScreenPreviewCallback_v7_6 *previewCallback);
+
+    /* Video Input */
+
+    HRESULT EnableVideoInput(BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags);
+    HRESULT DisableVideoInput(void);
+    HRESULT GetAvailableVideoFrameCount([out] unsigned int *availableFrameCount);
+
+    /* Audio Input */
+
+    HRESULT EnableAudioInput(BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, unsigned int channelCount);
+    HRESULT DisableAudioInput(void);
+    HRESULT GetAvailableAudioSampleFrameCount([out] unsigned int *availableSampleFrameCount);
+
+    /* Input Control */
+
+    HRESULT StartStreams(void);
+    HRESULT StopStreams(void);
+    HRESULT PauseStreams(void);
+    HRESULT FlushStreams(void);
+    HRESULT SetCallback([in] IDeckLinkInputCallback_v7_6 *theCallback);
+
+    /* Hardware Timing */
+
+    HRESULT GetHardwareReferenceClock(BMDTimeScale desiredTimeScale, [out] BMDTimeValue *hardwareTime, [out] BMDTimeValue *timeInFrame, [out] BMDTimeValue *ticksPerFrame);
+};
+
+
+/* Interface IDeckLinkTimecode_v7_6 - Used for video frame timecode representation. */
+
+[
+    object,
+    uuid(EFB9BCA6-A521-44F7-BD69-2332F24D9EE6),
+    helpstring("Used for video frame timecode representation.")
+] interface IDeckLinkTimecode_v7_6 : IUnknown
+{
+    BMDTimecodeBCD GetBCD(void);
+    HRESULT GetComponents([out] unsigned char *hours, [out] unsigned char *minutes, [out] unsigned char *seconds, [out] unsigned char *frames);
+    HRESULT GetString([out] BSTR *timecode);
+    BMDTimecodeFlags GetFlags(void);
+};
+
+
+/* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
+
+[
+    object,
+    uuid(A8D8238E-6B18-4196-99E1-5AF717B83D32),
+    local,
+    helpstring("Interface to encapsulate a video frame; can be caller-implemented.")
+] interface IDeckLinkVideoFrame_v7_6 : IUnknown
+{
+    long GetWidth(void);
+    long GetHeight(void);
+    long GetRowBytes(void);
+    BMDPixelFormat GetPixelFormat(void);
+    BMDFrameFlags GetFlags(void);
+    HRESULT GetBytes([out] void **buffer);
+
+    HRESULT GetTimecode(BMDTimecodeFormat format, [out] IDeckLinkTimecode_v7_6 **timecode);
+    HRESULT GetAncillaryData([out] IDeckLinkVideoFrameAncillary **ancillary);
+};
+
+
+/* Interface IDeckLinkMutableVideoFrame - Created by IDeckLinkOutput::CreateVideoFrame. */
+
+[
+    object,
+    uuid(46FCEE00-B4E6-43D0-91C0-023A7FCEB34F),
+    local,
+    helpstring("Created by IDeckLinkOutput::CreateVideoFrame.")
+] interface IDeckLinkMutableVideoFrame_v7_6 : IDeckLinkVideoFrame_v7_6
+{
+    HRESULT SetFlags(BMDFrameFlags newFlags);
+
+    HRESULT SetTimecode(BMDTimecodeFormat format, [in] IDeckLinkTimecode_v7_6 *timecode);
+    HRESULT SetTimecodeFromComponents(BMDTimecodeFormat format, unsigned char hours, unsigned char minutes, unsigned char seconds, unsigned char frames, BMDTimecodeFlags flags);
+    HRESULT SetAncillaryData([in] IDeckLinkVideoFrameAncillary *ancillary);
+};
+
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+[
+    object,
+    uuid(9A74FA41-AE9F-47AC-8CF4-01F42DD59965),
+    local,
+    helpstring("Provided by the IDeckLinkVideoInput frame arrival callback.")
+] interface IDeckLinkVideoInputFrame_v7_6 : IDeckLinkVideoFrame_v7_6
+{
+    HRESULT GetStreamTime([out] BMDTimeValue *frameTime, [out] BMDTimeValue *frameDuration, BMDTimeScale timeScale);
+    HRESULT GetHardwareReferenceTimestamp(BMDTimeScale timeScale, [out] BMDTimeValue *frameTime, [out] BMDTimeValue *frameDuration);
+};
+
+
+/* Interface IDeckLinkScreenPreviewCallback - Screen preview callback */
+
+[
+    object,
+    uuid(373F499D-4B4D-4518-AD22-6354E5A5825E),
+    local,
+    helpstring("Screen preview callback")
+] interface IDeckLinkScreenPreviewCallback_v7_6 : IUnknown
+{
+    HRESULT DrawFrame([in] IDeckLinkVideoFrame_v7_6 *theFrame);
+};
+
+
+/* Interface IDeckLinkGLScreenPreviewHelper - Created with CoCreateInstance(). */
+
+[
+    object,
+    uuid(BA575CD9-A15E-497B-B2C2-F9AFE7BE4EBA),
+    local,
+    helpstring("Created with CoCreateInstance().")
+] interface IDeckLinkGLScreenPreviewHelper_v7_6 : IUnknown
+{
+
+    /* Methods must be called with OpenGL context set */
+
+    HRESULT InitializeGL(void);
+    HRESULT PaintGL(void);
+    HRESULT SetFrame([in] IDeckLinkVideoFrame_v7_6 *theFrame);
+};
+
+
+/* Interface IDeckLinkVideoConversion - Created with CoCreateInstance(). */
+
+[
+    object,
+    uuid(3EB504C9-F97D-40FE-A158-D407D48CB53B),
+    local,
+    helpstring("Created with CoCreateInstance().")
+] interface IDeckLinkVideoConversion_v7_6 : IUnknown
+{
+    HRESULT ConvertFrame([in] IDeckLinkVideoFrame_v7_6* srcFrame, [in] IDeckLinkVideoFrame_v7_6* dstFrame);
+};
+
+/* Interface IDeckLinkConfiguration_v7_6 - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(B8EAD569-B764-47F0-A73F-AE40DF6CBF10),
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkConfiguration_v7_6 : IUnknown
+{
+    HRESULT GetConfigurationValidator([out] IDeckLinkConfiguration_v7_6 **configObject);
+    HRESULT WriteConfigurationToPreferences(void);
+
+    /* Video Output Configuration */
+
+    HRESULT SetVideoOutputFormat([in] BMDVideoConnection_v7_6 videoOutputConnection);
+    HRESULT IsVideoOutputActive([in] BMDVideoConnection_v7_6 videoOutputConnection, [out] BOOL *active);
+
+    HRESULT SetAnalogVideoOutputFlags([in] BMDAnalogVideoFlags analogVideoFlags);
+    HRESULT GetAnalogVideoOutputFlags([out] BMDAnalogVideoFlags *analogVideoFlags);
+
+    HRESULT EnableFieldFlickerRemovalWhenPaused([in] BOOL enable);
+    HRESULT IsEnabledFieldFlickerRemovalWhenPaused([out] BOOL *enabled);
+
+    HRESULT Set444And3GBpsVideoOutput([in] BOOL enable444VideoOutput, [in] BOOL enable3GbsOutput);
+    HRESULT Get444And3GBpsVideoOutput([out] BOOL *is444VideoOutputEnabled, [out] BOOL *threeGbsOutputEnabled);
+
+    HRESULT SetVideoOutputConversionMode([in] BMDVideoOutputConversionMode conversionMode);
+    HRESULT GetVideoOutputConversionMode([out] BMDVideoOutputConversionMode *conversionMode);
+
+    HRESULT Set_HD1080p24_to_HD1080i5994_Conversion([in] BOOL enable);
+    HRESULT Get_HD1080p24_to_HD1080i5994_Conversion([out] BOOL *enabled);
+
+    /* Video Input Configuration */
+
+    HRESULT SetVideoInputFormat([in] BMDVideoConnection_v7_6 videoInputFormat);
+    HRESULT GetVideoInputFormat([out] BMDVideoConnection_v7_6 *videoInputFormat);
+
+    HRESULT SetAnalogVideoInputFlags([in] BMDAnalogVideoFlags analogVideoFlags);
+    HRESULT GetAnalogVideoInputFlags([out] BMDAnalogVideoFlags *analogVideoFlags);
+
+    HRESULT SetVideoInputConversionMode([in] BMDVideoInputConversionMode conversionMode);
+    HRESULT GetVideoInputConversionMode([out] BMDVideoInputConversionMode *conversionMode);
+
+    HRESULT SetBlackVideoOutputDuringCapture([in] BOOL blackOutInCapture);
+    HRESULT GetBlackVideoOutputDuringCapture([out] BOOL *blackOutInCapture);
+
+    HRESULT Set32PulldownSequenceInitialTimecodeFrame([in] unsigned int aFrameTimecode);
+    HRESULT Get32PulldownSequenceInitialTimecodeFrame([out] unsigned int *aFrameTimecode);
+
+    HRESULT SetVancSourceLineMapping([in] unsigned int activeLine1VANCsource, [in] unsigned int activeLine2VANCsource, [in] unsigned int activeLine3VANCsource);
+    HRESULT GetVancSourceLineMapping([out] unsigned int *activeLine1VANCsource, [out] unsigned int *activeLine2VANCsource, [out] unsigned int *activeLine3VANCsource);
+
+    /* Audio Input Configuration */
+
+    HRESULT SetAudioInputFormat([in] BMDAudioConnection_v10_2 audioInputFormat);
+    HRESULT GetAudioInputFormat([out] BMDAudioConnection_v10_2 *audioInputFormat);
+};
+
+
+
+/* Coclasses */
+
+importlib("stdole2.tlb");
+
+[
+    uuid(D398CEE7-4434-4CA3-9BA6-5AE34556B905),
+    helpstring("CDeckLinkGLScreenPreviewHelper Class (DeckLink API v7.6)")
+] coclass CDeckLinkGLScreenPreviewHelper_v7_6
+{
+    [default] interface IDeckLinkGLScreenPreviewHelper_v7_6;
+};
+
+[
+    uuid(FFA84F77-73BE-4FB7-B03E-B5E44B9F759B),
+    helpstring("CDeckLinkVideoConversion Class (DeckLink API v7.6)")
+] coclass CDeckLinkVideoConversion_v7_6
+{
+    [default] interface IDeckLinkVideoConversion_v7_6;
+};
+

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v7_9.idl Added

@@ -0,0 +1,69 @@
+/* -LICENSE-START-
+** Copyright (c) 2010 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v7_9.idl */
+
+/* Interface IDeckLinkDeckControl_v7_9 - Deck Control main interface */
+
+[
+	object,
+	uuid(A4D81043-0619-42B7-8ED6-602D29041DF7),
+	helpstring("Deck Control main interface")
+] interface IDeckLinkDeckControl_v7_9 : IUnknown
+{
+	HRESULT Open([in] BMDTimeScale timeScale, [in] BMDTimeValue timeValue, [in] BOOL timecodeIsDropFrame, [out] BMDDeckControlError *error);
+	HRESULT Close([in] BOOL standbyOn);
+	HRESULT GetCurrentState([out] BMDDeckControlMode *mode, [out] BMDDeckControlVTRControlState *vtrControlState, [out] BMDDeckControlStatusFlags *flags);
+	HRESULT SetStandby([in] BOOL standbyOn);
+	HRESULT Play([out] BMDDeckControlError *error);
+	HRESULT Stop([out] BMDDeckControlError *error);
+	HRESULT TogglePlayStop([out] BMDDeckControlError *error);
+	HRESULT Eject([out] BMDDeckControlError *error);
+	HRESULT GoToTimecode([in] BMDTimecodeBCD timecode, [out] BMDDeckControlError *error);
+	HRESULT FastForward([in] BOOL viewTape, [out] BMDDeckControlError *error);
+	HRESULT Rewind([in] BOOL viewTape, [out] BMDDeckControlError *error);
+	HRESULT StepForward([out] BMDDeckControlError *error);
+	HRESULT StepBack([out] BMDDeckControlError *error);
+	HRESULT Jog([in] double rate, [out] BMDDeckControlError *error);
+	HRESULT Shuttle([in] double rate, [out] BMDDeckControlError *error);
+	HRESULT GetTimecodeString([out] BSTR *currentTimeCode, [out] BMDDeckControlError *error);
+	HRESULT GetTimecode([out] IDeckLinkTimecode **currentTimecode, [out] BMDDeckControlError *error);
+	HRESULT GetTimecodeBCD([out] BMDTimecodeBCD *currentTimecode, [out] BMDDeckControlError *error);
+	HRESULT SetPreroll([in] unsigned int prerollSeconds);
+	HRESULT GetPreroll([out] unsigned int *prerollSeconds);
+	HRESULT SetExportOffset([in] int exportOffsetFields);
+	HRESULT GetExportOffset([out] int *exportOffsetFields);
+	HRESULT GetManualExportOffset([out] int *deckManualExportOffsetFields);
+	HRESULT SetCaptureOffset([in] int captureOffsetFields);
+	HRESULT GetCaptureOffset([out] int *captureOffsetFields);
+	HRESULT StartExport([in] BMDTimecodeBCD inTimecode, [in] BMDTimecodeBCD outTimecode, [in] BMDDeckControlExportModeOpsFlags exportModeOps, [out] BMDDeckControlError *error);
+	HRESULT StartCapture([in] BOOL useVITC, [in] BMDTimecodeBCD inTimecode, [in] BMDTimecodeBCD outTimecode, [out] BMDDeckControlError *error);
+	HRESULT GetDeviceID([out] unsigned short *deviceId, [out] BMDDeckControlError *error);
+	HRESULT Abort(void);
+	HRESULT CrashRecordStart([out] BMDDeckControlError *error);
+	HRESULT CrashRecordStop([out] BMDDeckControlError *error);
+	HRESULT SetCallback([in] IDeckLinkDeckControlStatusCallback *callback);
+};

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v8_0.idl Added

@@ -0,0 +1,62 @@
+/* -LICENSE-START-
+** Copyright (c) 2011 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v8_0.idl */
+
+/* Interface IDeckLink_v8_0 - represents a DeckLink device */
+
+[
+    object,
+    uuid(62BFF75D-6569-4E55-8D4D-66AA03829ABC),
+    helpstring("represents a DeckLink device")
+] interface IDeckLink_v8_0 : IUnknown
+{
+    HRESULT GetModelName([out] BSTR *modelName);
+};
+
+/* Interface IDeckLinkIterator_v8_0 - enumerates installed DeckLink hardware */
+
+[
+    object,
+    uuid(74E936FC-CC28-4A67-81A0-1E94E52D4E69),
+    helpstring("enumerates installed DeckLink hardware")
+] interface IDeckLinkIterator_v8_0 : IUnknown
+{
+    HRESULT Next([out] IDeckLink_v8_0 **deckLinkInstance);
+};
+
+
+/* Coclasses */
+
+importlib("stdole2.tlb");
+
+[
+    uuid(D9EDA3B3-2887-41FA-B724-017CF1EB1D37),
+    helpstring("CDeckLinkIterator Class (DeckLink API v8.0)")
+] coclass CDeckLinkIterator_v8_0
+{
+    [default] interface IDeckLinkIterator_v8_0;
+};

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v8_1.idl Added

@@ -0,0 +1,101 @@
+/* -LICENSE-START-
+** Copyright (c) 2011 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v8_1.idl */
+
+/* Enum BMDDeckControlVTRControlState_v8_1 - VTR Control state */
+
+typedef [v1_enum] enum  _BMDDeckControlVTRControlState_v8_1 {
+    bmdDeckControlNotInVTRControlMode_v8_1                            = /* 'nvcm' */ 0x6E76636D,
+    bmdDeckControlVTRControlPlaying_v8_1                              = /* 'vtrp' */ 0x76747270,
+    bmdDeckControlVTRControlRecording_v8_1                            = /* 'vtrr' */ 0x76747272,
+    bmdDeckControlVTRControlStill_v8_1                                = /* 'vtra' */ 0x76747261,
+    bmdDeckControlVTRControlSeeking_v8_1                              = /* 'vtrs' */ 0x76747273,
+    bmdDeckControlVTRControlStopped_v8_1                              = /* 'vtro' */ 0x7674726F
+} BMDDeckControlVTRControlState_v8_1;
+
+
+interface IDeckLinkDeckControlStatusCallback;
+interface IDeckLinkDeckControl;
+
+/* Interface IDeckLinkDeckControlStatusCallback_v8_1 - Deck control state change callback. */
+
+[
+    object,
+    uuid(E5F693C1-4283-4716-B18F-C1431521955B),
+    helpstring("Deck control state change callback.")
+] interface IDeckLinkDeckControlStatusCallback_v8_1 : IUnknown
+{
+    HRESULT TimecodeUpdate([in] BMDTimecodeBCD currentTimecode);
+    HRESULT VTRControlStateChanged([in] BMDDeckControlVTRControlState_v8_1 newState, [in] BMDDeckControlError error);
+    HRESULT DeckControlEventReceived([in] BMDDeckControlEvent event, [in] BMDDeckControlError error);
+    HRESULT DeckControlStatusChanged([in] BMDDeckControlStatusFlags flags, [in] unsigned int mask);
+};
+
+/* Interface IDeckLinkDeckControl - Deck Control main interface */
+
+[
+    object,
+    uuid(522A9E39-0F3C-4742-94EE-D80DE335DA1D),
+    helpstring("Deck Control main interface")
+] interface IDeckLinkDeckControl_v8_1 : IUnknown
+{
+    HRESULT Open([in] BMDTimeScale timeScale, [in] BMDTimeValue timeValue, [in] BOOL timecodeIsDropFrame, [out] BMDDeckControlError *error);
+    HRESULT Close([in] BOOL standbyOn);
+    HRESULT GetCurrentState([out] BMDDeckControlMode *mode, [out] BMDDeckControlVTRControlState_v8_1 *vtrControlState, [out] BMDDeckControlStatusFlags *flags);
+    HRESULT SetStandby([in] BOOL standbyOn);
+    HRESULT SendCommand([in] unsigned char *inBuffer, [in] unsigned int inBufferSize, [out] unsigned char *outBuffer, [out] unsigned int *outDataSize, [in] unsigned int outBufferSize, [out] BMDDeckControlError *error);
+    HRESULT Play([out] BMDDeckControlError *error);
+    HRESULT Stop([out] BMDDeckControlError *error);
+    HRESULT TogglePlayStop([out] BMDDeckControlError *error);
+    HRESULT Eject([out] BMDDeckControlError *error);
+    HRESULT GoToTimecode([in] BMDTimecodeBCD timecode, [out] BMDDeckControlError *error);
+    HRESULT FastForward([in] BOOL viewTape, [out] BMDDeckControlError *error);
+    HRESULT Rewind([in] BOOL viewTape, [out] BMDDeckControlError *error);
+    HRESULT StepForward([out] BMDDeckControlError *error);
+    HRESULT StepBack([out] BMDDeckControlError *error);
+    HRESULT Jog([in] double rate, [out] BMDDeckControlError *error);
+    HRESULT Shuttle([in] double rate, [out] BMDDeckControlError *error);
+    HRESULT GetTimecodeString([out] BSTR *currentTimeCode, [out] BMDDeckControlError *error);
+    HRESULT GetTimecode([out] IDeckLinkTimecode **currentTimecode, [out] BMDDeckControlError *error);
+    HRESULT GetTimecodeBCD([out] BMDTimecodeBCD *currentTimecode, [out] BMDDeckControlError *error);
+    HRESULT SetPreroll([in] unsigned int prerollSeconds);
+    HRESULT GetPreroll([out] unsigned int *prerollSeconds);
+    HRESULT SetExportOffset([in] int exportOffsetFields);
+    HRESULT GetExportOffset([out] int *exportOffsetFields);
+    HRESULT GetManualExportOffset([out] int *deckManualExportOffsetFields);
+    HRESULT SetCaptureOffset([in] int captureOffsetFields);
+    HRESULT GetCaptureOffset([out] int *captureOffsetFields);
+    HRESULT StartExport([in] BMDTimecodeBCD inTimecode, [in] BMDTimecodeBCD outTimecode, [in] BMDDeckControlExportModeOpsFlags exportModeOps, [out] BMDDeckControlError *error);
+    HRESULT StartCapture([in] BOOL useVITC, [in] BMDTimecodeBCD inTimecode, [in] BMDTimecodeBCD outTimecode, [out] BMDDeckControlError *error);
+    HRESULT GetDeviceID([out] unsigned short *deviceId, [out] BMDDeckControlError *error);
+    HRESULT Abort(void);
+    HRESULT CrashRecordStart([out] BMDDeckControlError *error);
+    HRESULT CrashRecordStop([out] BMDDeckControlError *error);
+    HRESULT SetCallback([in] IDeckLinkDeckControlStatusCallback_v8_1 *callback);
+};
+
+

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_2.idl Added

@@ -0,0 +1,68 @@
+/* -LICENSE-START-
+** Copyright (c) 2012 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v9_2.idl */
+
+
+/* Interface IDeckLinkInput_v9_2 - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(6D40EF78-28B9-4E21-990D-95BB7750A04F),
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkInput_v9_2 : IUnknown
+{
+    HRESULT DoesSupportVideoMode([in] BMDDisplayMode displayMode, [in] BMDPixelFormat pixelFormat, [in] BMDVideoInputFlags flags, [out] BMDDisplayModeSupport *result, [out] IDeckLinkDisplayMode **resultDisplayMode);
+    HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator **iterator);
+
+    HRESULT SetScreenPreviewCallback([in] IDeckLinkScreenPreviewCallback *previewCallback);
+
+    /* Video Input */
+
+    HRESULT EnableVideoInput([in] BMDDisplayMode displayMode, [in] BMDPixelFormat pixelFormat, [in] BMDVideoInputFlags flags);
+    HRESULT DisableVideoInput(void);
+    HRESULT GetAvailableVideoFrameCount([out] unsigned int *availableFrameCount);
+
+    /* Audio Input */
+
+    HRESULT EnableAudioInput([in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned int channelCount);
+    HRESULT DisableAudioInput(void);
+    HRESULT GetAvailableAudioSampleFrameCount([out] unsigned int *availableSampleFrameCount);
+
+    /* Input Control */
+
+    HRESULT StartStreams(void);
+    HRESULT StopStreams(void);
+    HRESULT PauseStreams(void);
+    HRESULT FlushStreams(void);
+    HRESULT SetCallback([in] IDeckLinkInputCallback *theCallback);
+
+    /* Hardware Timing */
+
+    HRESULT GetHardwareReferenceClock([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue *hardwareTime, [out] BMDTimeValue *timeInFrame, [out] BMDTimeValue *ticksPerFrame);
+};
+

obs-studio-0.16.4.tar.xz/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_9.idl Added

@@ -0,0 +1,87 @@
+/* -LICENSE-START-
+** Copyright (c) 2012 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v9_9.idl */
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+[
+    object,
+    uuid(A3EF0963-0862-44ED-92A9-EE89ABF431C7),
+    local,
+    helpstring("Created by QueryInterface from IDeckLink.")
+] interface IDeckLinkOutput_v9_9 : IUnknown
+{
+    HRESULT DoesSupportVideoMode([in] BMDDisplayMode displayMode, [in] BMDPixelFormat pixelFormat, [in] BMDVideoOutputFlags flags, [out] BMDDisplayModeSupport *result, [out] IDeckLinkDisplayMode **resultDisplayMode);
+    HRESULT GetDisplayModeIterator([out] IDeckLinkDisplayModeIterator **iterator);
+
+    HRESULT SetScreenPreviewCallback([in] IDeckLinkScreenPreviewCallback *previewCallback);
+
+    /* Video Output */
+
+    HRESULT EnableVideoOutput([in] BMDDisplayMode displayMode, [in] BMDVideoOutputFlags flags);
+    HRESULT DisableVideoOutput(void);
+
+    HRESULT SetVideoOutputFrameMemoryAllocator([in] IDeckLinkMemoryAllocator *theAllocator);
+    HRESULT CreateVideoFrame([in] int width, [in] int height, [in] int rowBytes, [in] BMDPixelFormat pixelFormat, [in] BMDFrameFlags flags, [out] IDeckLinkMutableVideoFrame **outFrame);
+    HRESULT CreateAncillaryData([in] BMDPixelFormat pixelFormat, [out] IDeckLinkVideoFrameAncillary **outBuffer);
+
+    HRESULT DisplayVideoFrameSync([in] IDeckLinkVideoFrame *theFrame);
+    HRESULT ScheduleVideoFrame([in] IDeckLinkVideoFrame *theFrame, [in] BMDTimeValue displayTime, [in] BMDTimeValue displayDuration, [in] BMDTimeScale timeScale);
+    HRESULT SetScheduledFrameCompletionCallback([in] IDeckLinkVideoOutputCallback *theCallback);
+    HRESULT GetBufferedVideoFrameCount([out] unsigned int *bufferedFrameCount);
+
+    /* Audio Output */
+
+    HRESULT EnableAudioOutput([in] BMDAudioSampleRate sampleRate, [in] BMDAudioSampleType sampleType, [in] unsigned int channelCount, [in] BMDAudioOutputStreamType streamType);
+    HRESULT DisableAudioOutput(void);
+
+    HRESULT WriteAudioSamplesSync([in] void *buffer, [in] unsigned int sampleFrameCount, [out] unsigned int *sampleFramesWritten);
+
+    HRESULT BeginAudioPreroll(void);
+    HRESULT EndAudioPreroll(void);
+    HRESULT ScheduleAudioSamples([in] void *buffer, [in] unsigned int sampleFrameCount, [in] BMDTimeValue streamTime, [in] BMDTimeScale timeScale, [out] unsigned int *sampleFramesWritten);
+
+    HRESULT GetBufferedAudioSampleFrameCount([out] unsigned int *bufferedSampleFrameCount);
+    HRESULT FlushBufferedAudioSamples(void);
+
+    HRESULT SetAudioCallback([in] IDeckLinkAudioOutputCallback *theCallback);
+
+    /* Output Control */
+
+    HRESULT StartScheduledPlayback([in] BMDTimeValue playbackStartTime, [in] BMDTimeScale timeScale, [in] double playbackSpeed);
+    HRESULT StopScheduledPlayback([in] BMDTimeValue stopPlaybackAtTime, [out] BMDTimeValue *actualStopTime, [in] BMDTimeScale timeScale);
+    HRESULT IsScheduledPlaybackRunning([out] BOOL *active);
+    HRESULT GetScheduledStreamTime([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue *streamTime, [out] double *playbackSpeed);
+    HRESULT GetReferenceStatus([out] BMDReferenceStatus *referenceStatus);
+
+    /* Hardware Timing */
+
+    HRESULT GetHardwareReferenceClock([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue *hardwareTime, [out] BMDTimeValue *timeInFrame, [out] BMDTimeValue *ticksPerFrame);
+};
+

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/HiddenParameters.md -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/#Resources/HiddenParameters.md Changed

@@ -1,109 +1,67 @@
-AMD hides certain parameters from us, but i think some of them should be accessible. Might need some in depth IDA work first.
+For an unknown reason, there are hidden parameters in the Runtime that can be set.
 
-# Sorted Discoveries
-
-## Encoder Types
-* AMFVideoEncoderVCE_AVC
-* AMFVideoEncoderVCE_SVC
-* AMFVideoEncoderHW_AVC
-* AMFVideoEncoderHW_HEVC (AMFEncoderHEVC Component)
-
-## Parameters
-
-### Capabilities
-* MaxNumRefFrames
-* EncoderMaxInstances
-* MaxNumOfTemporalLayers
-
-### Encoder
-* Tier
-* ProfileLevel
+## AVC Properties
+### Static
+* FrameSize
+* FrameRate
+* ExtraData (Read-Only)
+* Usage
+* Profile Two new profiles are in the runtime, Constrained Base and Constrained High.
+* Profile Level
 * MaxOfLTRFrames
+* ScanType
+* QualityPreset
+
+### Dynamic
+* RateControlMethod
 * TargetBitrate
 * PeakBitrate
-* RateControlMethod
-* QP_I
-* QP_P
+* RateControlSkipFrameEnable
+* MinQP
+* MaxQP
+* QPI
+* QPP
+* QPB
 * VBVBufferSize
-* InitialVBVBufferFullness
+* VBVBufferFullness
+* EnforceHRD
 * MaxAUSize
+* FillerDataEnable
+* BPicturesDeltaQP
+* ReferenceBPicturesDeltaQP
 * HeaderInsertionSpacing
 * IDRPeriod
 * DeBlockingFilter
+* IntraRefreshMBsNumberPerSlot
 * SlicesPerFrame
 * BPicturesPattern
 * BReferenceEnable
-* ScanType
 * HalfPixel
 * QuarterPixel
-* NumOfTemporalLayers
-* **MinQP_I**
-* **MaxQP_I**
-* **MinQP_P**
-* **MaxQP_P**
-* **QPCBOFFSET**
-* **QPCROFFSET**
-* **GOPType**
-* **GOPPerIDR**
-* **GOPSize**
-* **GOPSizeMin**
-* **GOPSizeMax**
+
+### Unknown / New
+
+* **QualityEnhancementMode** So far always 0.
+* **MaxNumRefFrames** Shouldn't this be a Capability instead? Could perhaps be used to control B-Pictures more.
+* **MaxMBPerSec** Unknown value.
+* **InstanceID**
+* **EnableVBAQ** Unknown meaning.
+* **RateControlPreanalysisEnable** Is this Two-Pass encoding?
+* **GOPSize** Technically ignored, but still there in code.
 * **AspectRatio**
 * **NominalRange**
-* **IntraRefreshMode**
+* **IntraRefreshNumOfStripes** New, was not here before.
+* **SliceMode** New, was not here before.
+* **MaxSliceSize** New, was not here before.
 * **LowLatencyInternal**
 * **CommonLowLatencyInternal**
-* **EnableGOPAlignment**
 * **SliceControlMode**
 * **SliceControlSize**
-* **CABACEnable**
+* **CABACEnable** Not yet publicly available, but 16.10.3 always uses it anyway.
 * **UniqueInstance**
+* **EncoderMaxInstances**
 * **MultiInstanceMode**
 * **MultiInstanceCurrentQueue**
+* **WaitForTask**
 
-### Per Submission
-* EndOfSequence = AMF_VIDEO_ENCODER_END_OF_SEQUENCE
-* EndOfStream = AMF_VIDEO_ENCODER_END_OF_STREAM
-* ForcePictureType = AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE
-* InsertAUD = AMF_VIDEO_ENCODER_INSERT_AUD
-* InsertSPS = AMF_VIDEO_ENCODER_INSERT_SPS
-* InsertPPS = AMF_VIDEO_ENCODER_INSERT_PPS
-* MarkCurrentWithLTRIndex = AMF_VIDEO_ENCODER_MARK_CURRENT_WITH_LTR_INDEX
-* ForceLTRReferenceBitfield = AMF_VIDEO_ENCODER_FORCE_LTR_REFERENCE_BITFIELD
-* **IntraRefreshFrameNum**
-* **TemporalLayerSelect** (Per Frame?)
-
-### Per Output
-
-### Unknown
-
-## Values
-
-### Constants found
-* AHEVC_PARAMETER_NAME__TEMPORAL_LAYER_SELECT
-* AHEVC_PARAMETER_NAME__NUM_TEMPORAL_LAYERS
-* AHEVC_PARAMETER_NAME__MAX_NUM_TEMPORAL_LAYE
-* AHEVC_PARAMETER_NAME__TIER
-* and some more.
-
-### Other Strings in the same list:
-* GOP_ALIGNED
-* IDR_ALIGNED
-* Cabac
-* Calv
-* Undefined
-* XVBA
-* AHEVCEncode
-* AHEHVCApplySpeedQualityPreset is bypassed, because it is not implemented
-
-### Profile Levels
-Libraries support as high as 6.2, which is most likely for HEVC. Full List: 
-1.0 2.0 2.1 3.0 3.1 4.0 4.1 5.0 5.1 5.2 6.0 6.1 6.2
-
-# Other Discoveries
-
-## SubmitInput, QueryOutput
-There are references to deque, which is something in std::queue. Or BufferQueue.
 
-## Typos
-* CheckRes**oul**tion

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/Installer.iss -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/#Resources/Installer.iss Changed

obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/PatchNotes.txt -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/#Resources/PatchNotes.txt Changed

@@ -1,161 +1,20 @@
-# 1.3.0 - The AMF SDK Path
+# The Oversight Fix
 
-It has been a long time since we've seen a version without any attachments to the number, hasn't it? But now is finally the time! We've come a long way since 1.1.2, going through two rewrites, one to make it easier for me and one to update to a new SDK - and it was worth it. Now we have arrived at a plugin for OBS Studio that manages solid 4K at 60 fps while still being light on the CPU side.
+Sometimes your changes seem fine and then users happen. Have you ever had users happen? They break things in ways that you didn't think was possible before! It's insane!
 
-### Notes
+This update aims to fix some of the reported issues in addition to making the user interface even simpler to use.
 
-Before installing this Version, please uninstall any previous versions. If you used the installer, it is as simple as using the Uninstaller entry it created. If you extracted it, you will need to manually remove the extracted files.
+## Notes
 
-### Changelog
+Due to the nature of changes in this update, your previous settings may end up lost or incorrect. Make sure to revalidate them before attempting to record or stream.
 
-*1.3.0pre1*
+## Changelog
 
-* Changed: Loading of required libraries was changed to match AMF documentation.
-* Changed: Shared Encoder is now using new Library linking class and was rewritten from the ground up.
-* Changed: Advanced Encoder is temporarily unavailable.
-
-*1.3.0pre2*
-
-* Added: In depth AMF tracing to the OBS log files, allowing me to spot bugs much faster than before.
-
-*1.3.0pre3*
-
-* Added: Preset selection (Simple Interface).
-* Added: Profile Level selection (Simple Interface).
-* Added: Further capability logging to startup.
-* Fixed: SetRateControlSkipFrameEnabled (Option: Frame Skipping) will no longer override the Rate Control Method.
-* Fixed: Fixes for the threading model, higher framerates/resolutions should now be possible.
-* Fixed: Advanced Interface is available again.
-
-*1.3.0pre5*
-
-* Skipped pre4 due to major issues.
-* Added: Checkbox to enable in depth tracing, to be used when reporting errors and crashes.
-* Changed: Default AMF Trace level is now ERROR instead of TEST.
-* Changed: Profile Level now goes to 6.2 if a GPU ever supports it (matches AMF values).
-* Changed: Simple Interface will calculate the best Buffer Size for your stream based on your settings.
-* Changed: Simple Interface will automatically set B-Pictures Pattern to 0 for best Quality.
-* Updated: Languages en-US, vi-VN and es-ES have been updated.
-* Fixed: Max LTR Frames slider only goes up to 2.
-* Fixed: Log Spam due to getting stuck on AMF_REPEAT or AMF_INPUT_FULL.
-* Fixed: Crash in SetProfile and GetProfile internal functions.
-* Fixed: Crash when clicking Update Values from AMF.
-* Fixed: Crash when clicking Apply in Advanced Interface.
-* Fixed: Constant QP will now apply the correct values.
-
-*1.3.0pre6*
-
-* Added: B-Picture settings for Simple Interface (only shown if supported).
-* Added: De-Blocking Filter setting for Simple Interface.
-* Added: Enforce HRD Compatibility setting for Simple Interface.
-* Changed: Language files have been massively simplified.
-* Changed: Timer Resolution is now half the expected frametime (1000 / framerate / 2) to reduce CPU usage and Power draw.
-* Updated: Languages en-US, vi-VN, ru-RU and es-ES.
-* Updated: Presets in Simpler Interface will now also set up advanced properties (if supported).
-* Fixed: Log messages from encoder will not come from an impossible source/class.
-* Fixed: 32-Bit now shows the correct Version number.
-
-*1.3.0pre7*
-
-* Fixed: Incorrect Packet order in Streams and Recordings.
-* Fixed: Crushed Colors in Streams and Recordings by forcing a specific set of color settings.
-* Fixed: High CPU usage due to increasing timer resolution too early.
-* Fixed: Slowness due to repeated Library loading, caused by lost references.
-* Fixed: Advanced Interface now applies properties in the same order as the Simple Interface.
-* Fixed: Crash in Simple Interface on Cards that don't support B-Pictures.
-* Updated: Languages en-US (American English), de-DE (German), Vi-VN (Vietnamese).
-
-*1.3.0pre8*
-
-* Fixed: Fixed some values not being applied in 32-Bit.
-* Fixed: "Enforce streaming service encoder settings" is now properly used, thanks to Jim.
-* Fixed: Simple Interface will now correctly update when a setting is modified.
-* Fixed: Decode and Presentation Timestamps are now correct, thanks to Jim.
-* Changed: Reduced log output length for readability.
-* Changed: Threads are now forcefully terminating if they are stuck instead of freezing OBS.
-* Added: Fail-Safe so that Stop Streaming/Recording still works even when GetOutput fails.
-* Added: Experimental capability logging for future HEVC implementation.
-
-*1.3.0rc1*
-
-* Updated: Languages en-US (American English), vi-VN (Vietnamese), de-DE (German).
-* Changed: Internally using 64-Bit Integers instead of Doubles to improve timestamp precision.
-* Fixed: Emergency Quit will now use a timestamp in the future so that OBS exits properly.
-* Fixed: Audio/Video desynchronization due to modifying presentation instead of decode timestamp.
-* Added: Options for CABAC and GOP Size, thanks to a bit of RE-work.
-
-*1.3.0rc2*
-
-* Updated: Languages vi-VN (Vietnamese), es-ES (Spanish).
-* Changed: Advanced Interface applies Parameters slightly differently now.
-* Added: 'Default' for Enforce HRD Compatibility, Deblocking Filter and CABAC.
-
-*1.3.0rc3*
-
-* Changed: Shared Encoder now initializes DirectX and OpenCL devices internally.
-* Changed: Always force NV12 color format for now, since other color formats are too slow.
-* Changed: Encoder will now drop frames instead of closing if the input queue grows too large.
-* Updated: Simple Interface Presets for Recording and Streaming.
-* Updated: Languages en-US (American English).
-* Fixed: Plugin should no longer crash on shut down due to requesting to join a terminated thread.
-* Fixed: Memory Leak when stopping streaming and/or recording.
-* Fixed: 'Enforce Streaming Service Settings' no longer applies permanently.
-
-*1.3.0rc4*
-
-* Changed: Now using OpenCL to copy the frame from RAM to VRAM to speed up submission.
-* Changed: Increased queue delta needed to reduce log spam.
-* Changed: Threads will internally wake up each other if a specific event happened.
-* Updated: Presets in Simple Interface will always attempt to use Quality encoding.
-
-*1.3.0rc4hf1*
-
-* Changed: Minimum requirement for DirectX11 backend is now Windows 8.
-
-*1.3.0rc5*
-
-* Fixed: Localization should now fall back to en-US instead of showing untranslated strings.
-* Fixed: Debug Tracing code in Advanced interface now matches Simple interface.
-* Fixed: Bitrate shown in FLV files should now match Target Bitrate.
-* Changed: Internally now using a Single-Threaded approach.
-* Changed: Some parameters have been moved to the expert category in the Simple interface.
-* Changed: Presentation and Decode Timestamp are now the same again (fixes ffmpeg muxing issue).
-* Updated: Languages en-US (American English), de-De (German) and es-ES (Spanish).
-* Added: Ability to select Backend (Memory and Compute Type).
-
-*1.3.0rc6*
-
-* Added: Ability to override Surface Format.
-* Changed: Presentation Timestamps are now properly calculated again to be standard compliant.
-
-*1.3.0*
-
-* Added: 'High Quality', 'Indistinguishable' and 'Lossless' preset to Simple interface.
-* Removed: DirectCompute Compute Type since it was a misunderstanding on my part.
-* Changed: DirectX 9 is now Windows XP or greater only, DirectX 11 is Windows 8 or greater only.
-* Changed: Internal Log logic to reduce disk-related encoding slowdown.
-* Changed: 'Twitch' Preset in Simple interface now uses 'High' Profile.
-* Changed: Translations have been updated from CrowdIn.
-* Fixed: Memory Type 'Host' should now work properly.
-
-*1.3.0.1*
-
-* Removed: Translation string for Profiles (untranslateable).
-* Changed: Some internal changes to match remaining code.
-
-*1.3.0.2*
-
-* Changed: Internally restructured memory layout for fast access on low cache CPUs.
-* Changed: Added additional error checking code that should catch all errors instead of crashing OBS.
-
-*1.3.0.3*
-
-* Changed: Translations have been updated from CrowdIn.
-
-*1.3.1.0*
-
-* Fixed: Simple Interface will now permanently apply Presets.
-* Fixed: 'Indistinguishable' had Maximum QP at 21.
-* Changed: 'Recording' preset enables 'Frame Skipping' by default.
-* Changed: 'High Quality' Preset now uses CQP 16/19/21.
-* Changed: 'Indistinguishable' Preset now uses CQP 11/14/16.
+* Fixed: Crash with default settings being used.
+* Fixed: Properties should now show the correct tooltip when hovered over.
+* Fixed: Frame Rate should now be applied properly again.
+* Fixed: Compatibility issues with Windows 7 and older.
+* Changed: Default value for LTR Frames is now 0 for better compatibility.
+* Changed: Profile is now a Basic property.
+* Changed: Profile Level is now an Expert property to avoid user errors.
+* Changed: Min/Max QP is now considered an Advanced property to avoid user errors.
\ No newline at end of file

obs-studio-0.16.2.tar.xz/plugins/enc-amf/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/CMakeLists.txt Changed

obs-studio-0.16.4.tar.xz/plugins/enc-amf/CONTRIBUTING.md Added

@@ -0,0 +1,91 @@
+# Reporting Issues
+
+Before you report an issue, please read the [Troubleshooting Guide](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/wiki/Troubleshooting-Guide).
+It contains a step-by-step guide on how to solve your issue and even includes a FAQ for you to read through.
+
+# Git and the Project
+
+## Committing Changes
+
+Read [this wiki page for information](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/wiki/Contributing) and please follow it. Rebasing a bunch of pushed commits is terrible for anyone involved.
+
+## Pull Requests
+
+Pull Request titles should follow the guidelines for committing changes and also have a short description of what the change does.
+
+# Building
+
+## Getting Started
+This plugin is included in the Open Broadcaster Studio project itself. 
+This is only necessary if you wish to verify functionality with a standalone build.
+
+## Pre-Requisites
+* [Visual Studio® 2013 or Visual Studio® 2015 (Community or better)](http://visualstudio.com/)
+* Windows 10 SDK (Version 10586 or better, bundled with Visual Studio)
+* [OBS Studio](https://github.com/jp9000/obs-studio)
+* [AMF SDK](https://github.com/GPUOpen-LibrariesAndSDKs/AMF)
+* [InnoSetup](http://www.jrsoftware.org/isinfo.php)
+
+### Step 1: Third Party Headers
+
+#### Open Broadcaster Studio
+1. Clone the [Open Broadcaster Studio Source Code](https://github.com/jp9000/obs-studio).
+2. Build both x86 and x64 with the same Visual Studio version you indent to use for the plugin.
+3. Create a *Soft Link* (Directory Junction) in /#ThirdParty/ to the cloned repository, call it 'OBS-Studio'. 
+Ex (Windows): mklink /J ./#ThirdParty/OBS-Studio C:/Src/OBS/
+4. Verify that it works by visiting the ./#ThirdParty/OBS-Studio directory.
+
+#### AMD Advanced Media Framework SDK (AMF SDK)
+1. Clone the [AMF SDK](https://github.com/GPUOpen-LibrariesAndSDKs/AMF).
+2. Create a *Soft Link* (Directory Junction) in /#ThirdParty/ to the cloned repository, call it 'AMD-AMF-SDK'. 
+Ex (Windows): mklink /J ./#ThirdParty/AMD-AMF-SDK C:/Src/AMF/
+3. Verify that it works by visiting the ./#ThirdParty/AMD-AMF-SDK directory.
+
+### Step 2: Build the Project
+
+1. Open the Visual Studio Solution file.
+2. Build for both x86 and x64 (Normal or Batch Build).
+3. Binaries should be located in /#Build/$(Configuration)/
+4. (Optional) Create Archives and an Installer with the package.bat in /#Resources/.
+
+If any errors during building or creating the archives and installer, start again from Step 1.
+
+### Step 3: Verify Functionality
+
+*[You can only do this with an AMD APU or GPU installed](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/wiki/Hardware,-GCN-and-VCE-Limits)*. 
+Install the plugin into your OBS Studio installation or test environment and select it in either Simple Output Mode or Advanced Output Mode. It should encode fine without crashing at any point.
+
+# Coding Standard
+
+The entire Project is written in C++ and as such follows common C++ writing practices.
+
+## Namespaces
+
+Namespaces should be named in *Pascal Case*. You may create a nested namespace that is 3 levels deep, not more.
+
+## Enumerations
+
+Enumerations should be named in *Pascal Case* and be inside a namespace or class. 
+Enumeration Constants should always be prefixed by the enumeration name so no ambiguity exists.
+
+## Functions
+
+Functions should be named in *Pascal Case* and should always be inside a namespace or class.
+Ideally your function should be either inlinable or have parameters passed by reference for optimization.
+
+## Classes
+
+Classes should be named in *Pascal Case* and should always be inside a namespace - a class not in a namespace must be really important to everything.
+
+### Methods (Class-specific Functions)
+
+Methods should be named in *Pascal Case* and always reside in the class it belongs to.
+
+### Members (Class-specific Variables)
+
+Members should be prefixed by 'm_' and then use a *Pascal Case* name. There is no special prefix per-type, per-usage or per-source.
+
+## Variables
+
+Variables should be named in *camel Case*
+

obs-studio-0.16.2.tar.xz/plugins/enc-amf/CONTRIBUTORS.md -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/CONTRIBUTORS.md Changed

@@ -12,11 +12,59 @@
 | [niteforce](https://github.com/niteforce) | Provided hu-HU language files (Hungarian) |
 | [nwgat](https://github.com/nwgat) | Provided nb-NO language files (Norwegian) |
 | [wazerstar](https://github.com/wazerstar) | Provided da-DK language files (Danish) |
+| [Jim](https://github.com/jp9000) | General OBS Support for development questions. |
+| GolDAce | CrowdIn integration stuff. |
 
 # The Amazing Supporters
 
 And these great people have decided to support the project by one or another means.
 
+## September 2016
+### Marcos Vidal
+Spanish translator.  
+[Website](https://markitos.ovh), [Steam](http://steamcommunity.com/id/markitos22/)
+
+### nwgat.ninja
+nwgat.ninja is proud to support Xaymars Technology Projects.  
+[Website](https://nwgat.ninja)
+
+### AJ
+Este espacio para el alquiler.
+
+### Jeremy "razorlikes" Nieth
+I like to support this project becuase it gives me a way to stream without having to sacrifice immense amounts of cpu resources for encoding.  
+[Twitch](https://twitch.tv/razorlikes), [GitHub](https://github.com/razorlikes)
+
+### Kristian Kirkes(ae)ther
+Kristian has not been able to provide a comment in time.
+
+### Markus Wiegand
+Earth has not been able to find Markus and make him respond in time.
+[Twitter](https://twitter.com/Morphy2k/), [GitHub](https://github.com/Morphy2k)
+
+### SneakyJoe
+Russian streamer and stream teacher, AMD fanboy. Wants to make AMD great again.  
+[Website](http://sneakyjoe.ru/), [YouTube](https://www.youtube.com/channel/UCUmRv5GwQcsnxXRzuPCGr-Q)
+
+### vektorDex
+Well, he's my big brother. Could at least have responded. ;_; (just kidding)
+[Website](http://blog-of-dex.de/), [Twitter](https://twitter.com/vektordex), [Studio](http://digitaldawnstudios.com)
+
+### Daniel Bagge
+Kini nga luna alang sa abang.
+
+### John Difool
+John Difool der alte Sack
+[YouTube](https://www.youtube.com/channel/UC5FPsFLQh4ah0-vz-eoZlOA)
+
+### Nucu
+Thanks AMD and Xaymar to make hardware encoding possible.
+
+### DaOrgest
+Currently studying computer and I do YouTube for a hobby
+
+[Website](http://daorgest.me), [YouTube](http://youtube.com/daorgest)
+
 ## August 2016
 ### Jeremy Nieth
 Jeremy has decided to not specify what he wanted to be written here. So this will have to do for now.

obs-studio-0.16.2.tar.xz/plugins/enc-amf/README.md -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/README.md Changed

@@ -1,27 +1,10 @@
-This Plugin adds support for AMDs Hardware Encoder for H264 and HEVC. It is based on the MIT licensed AMF SDK.
+This is a plugin for OBS Studio that enables almost fully native hardware encoding instead of passing things off to Media Foundation Transform which is known to have issues with some certain settings. The plugin is based on the new AMF SDK and thus will work with any future driver releases.
 
-# Contributing
+[Read More on the Wiki](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/wiki)
 
-## Pre-requisites
-* AMD Radeon Software Crimson Edition 16.7.3 (16.30.2311) or newer
-* Windows® 7 (SP1 with the Platform Update), Windows® 8.1, or Windows® 10
-* Visual Studio® 2013 or Visual Studio® 2015 (Community or better)
-* Windows 10 SDK (Version 10586 or better)
-* [OBS Studio](https://github.com/jp9000/obs-studio)
-* [AMF SDK](https://github.com/GPUOpen-LibrariesAndSDKs/AMF)
+## Contributing
 
-## Getting Started
-1. Clone the Project to your Disk
-2. Set up any #ThirdParty directory junctions, see the README.md inside the folder for more info.
-3. Open the Solution
-4. Build the Solution (or Batch Build)
-5. Binaries should be located in /#Build/$(Configuration)/
-
-## Committing Changes
-
-Read [this wiki page for information](https://github.com/Xaymar/OBS-AMD-Advanced-Media-Framework/wiki/Contributing) and please follow it. Rebasing a bunch of pushed commits is not good.
-
-# License
+Read [CONTRIBUTING.md](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/CONTRIBUTING.md) for a guide on how to start.
 
 ## MIT License

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Include/amd-amf-vce.h -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Include/amd-amf-vce.h Changed

@@ -37,6 +37,7 @@
 // Plugin
 #include "plugin.h"
 #include "amd-amf.h"
+#include "api-base.h"
 
 //////////////////////////////////////////////////////////////////////////
 // Code
@@ -56,11 +57,7 @@
 			VCEMemoryType_DirectX11,	// DirectX11
 			VCEMemoryType_OpenGL,		// OpenGL
 
-			VCEMemoryType_Auto = -1,	// Autodetect without OpenCL
-		};
-		enum VCEComputeType {
-			VCEComputeType_None, // Default
-			VCEComputeType_OpenCL, // OpenCL
+			VCEMemoryType_Auto = -1,	// Auto-Detect
 		};
 		enum VCESurfaceFormat {
 			// 4:2:0 Formats
@@ -90,6 +87,7 @@
 			VCEProfile_Unknown = -1,
 		};
 		enum VCEProfileLevel {
+			VCEProfileLevel_Automatic = 0,
 			VCEProfileLevel_10 = 10,
 			VCEProfileLevel_11,
 			VCEProfileLevel_12,
@@ -106,10 +104,6 @@
 			VCEProfileLevel_50 = 50,
 			VCEProfileLevel_51,
 			VCEProfileLevel_52,
-			VCEProfileLevel_60 = 60,
-			VCEProfileLevel_61,
-			VCEProfileLevel_62,
-
 			VCEProfileLevel_Unknown = -1,
 		};
 		enum VCERateControlMethod {
@@ -149,7 +143,11 @@
 			#pragma region Initializer & Finalizer
 			//////////////////////////////////////////////////////////////////////////
 			public:
-			VCEEncoder(VCEEncoderType p_Type, VCESurfaceFormat p_SurfaceFormat = VCESurfaceFormat_NV12, VCEMemoryType p_MemoryType = VCEMemoryType_Auto, VCEComputeType p_ComputeType = VCEComputeType_None);
+			VCEEncoder(VCEEncoderType p_Type,
+				VCESurfaceFormat p_SurfaceFormat = VCESurfaceFormat_NV12,
+				VCEMemoryType p_MemoryType = VCEMemoryType_Auto,
+				bool p_UseOpenCL = false,
+				std::string p_DeviceUniqueId = "");
 			~VCEEncoder();
 			#pragma endregion Initializer & Finalizer
 
@@ -158,6 +156,7 @@
 			//////////////////////////////////////////////////////////////////////////
 			public:
 			void Start();
+			void Restart();
 			void Stop();
 			bool SendInput(struct encoder_frame* frame);
 			void GetOutput(struct encoder_packet* packet, bool* received_packet);
@@ -172,20 +171,19 @@
 			// Utility
 			inline amf::AMFSurfacePtr CreateSurfaceFromFrame(struct encoder_frame*& frame);
 
-			#pragma region AMF Properties
 			public:
 			void LogProperties();
+			
+			/************************************************************************/
+			/* Static Properties */
+			/************************************************************************/
 
 			/*	Usage Type
-			 *	Sets up the entire encoder to a specific set of properties.
-			 *	Must be called first if you want to override properties. */
+			*	Sets up the entire encoder to a specific set of properties.
+			*	Must be called first if you want to override properties. */
 			void SetUsage(VCEUsage usage);
 			VCEUsage GetUsage();
-
-			/*	Quality Preset */
-			void SetQualityPreset(VCEQualityPreset preset);
-			VCEQualityPreset GetQualityPreset();
-
+			
 			/*	H.264 Profile */
 			void SetProfile(VCEProfile profile);
 			VCEProfile GetProfile();
@@ -205,45 +203,59 @@
 			void SetMaximumLongTermReferenceFrames(uint32_t maximumLTRFrames);	// Long-Term Reference Frames. If 0, Encoder decides, if non-0 B-Pictures and Intra-Refresh are not supported.
 			uint32_t GetMaximumLongTermReferenceFrames();
 
+			/************************************************************************/
+			/* Resolution Properties */
+			/************************************************************************/
+
 			/*	Output Resolution */
 			void SetFrameSize(uint32_t width, uint32_t height);
 			std::pair<uint32_t, uint32_t> GetFrameSize();
 
-			/// Encoder Rate Control
+			/*	Sets the Frame Rate numerator and denumerator */
+			void SetFrameRate(uint32_t num, uint32_t den);
+			std::pair<uint32_t, uint32_t> GetFrameRate();
+
+			/************************************************************************/
+			/* Rate Control Properties */
+			/************************************************************************/
+			
 			/*	Selects the rate control method:
-			 *	- CQP - Constrained QP,
-			 *	- CBR - Constant Bitrate,
-			 *	- VBR - Peak Constrained VBR,
-			 *	- VBR_LAT - Latency Constrained VBR
-			 *
-			 *	Remarks:
-			 *	- When SVC encoding is enabled, all Rate-control parameters (with some restrictions) can be configured differently for a particular SVC-layer. An SVC-layer is denoted by an index pair [SVC-Temporal Layer index][SVC-Quality Layer index]. E.g. The bitrate may be configured differently for SVC-layers [0][0] and [1][0].
-			 *	- We restrict all SVC layers to have the same Rate Control method. Some RC parameters are not enabled with SVC encoding (e.g. all parameters related to B-pictures).
-			 **/
+			*	- CQP - Constrained QP,
+			*	- CBR - Constant Bitrate,
+			*	- VBR - Peak Constrained VBR,
+			*	- VBR_LAT - Latency Constrained VBR
+			*
+			*	Remarks:
+			*	- When SVC encoding is enabled, all Rate-control parameters (with some restrictions) can be configured differently for a particular SVC-layer. An SVC-layer is denoted by an index pair [SVC-Temporal Layer index][SVC-Quality Layer index]. E.g. The bitrate may be configured differently for SVC-layers [0][0] and [1][0].
+			*	- We restrict all SVC layers to have the same Rate Control method. Some RC parameters are not enabled with SVC encoding (e.g. all parameters related to B-pictures).
+			**/
 			void SetRateControlMethod(VCERateControlMethod method);
 			VCERateControlMethod GetRateControlMethod();
-			/*	Enables skip frame for rate control */
-			void SetRateControlSkipFrameEnabled(bool enabled);
-			bool IsRateControlSkipFrameEnabled();
-			/*	Sets the minimum QP */
-			void SetMinimumQP(uint8_t qp);
-			uint8_t GetMinimumQP();
-			/*	Sets the maximum QP */
-			void SetMaximumQP(uint8_t qp);
-			uint8_t GetMaximumQP();
+
 			/*	Sets the target bitrate */
 			void SetTargetBitrate(uint32_t bitrate);
 			uint32_t GetTargetBitrate();
+
 			/*	Sets the peak bitrate */
 			void SetPeakBitrate(uint32_t bitrate);
 			uint32_t GetPeakBitrate();
+
+			/*	Sets the minimum QP */
+			void SetMinimumQP(uint8_t qp);
+			uint8_t GetMinimumQP();
+
+			/*	Sets the maximum QP */
+			void SetMaximumQP(uint8_t qp);
+			uint8_t GetMaximumQP();
+
 			/*	Sets the Constant QP for I-Pictures.
-			 *
-			 *	Remarks:
-			 *	- Only available for CQP rate control method.
-			 **/
+			*
+			*	Remarks:
+			*	- Only available for CQP rate control method.
+			**/
 			void SetIFrameQP(uint8_t qp);
 			uint8_t GetIFrameQP();
+
 			/*	Sets the Constant QP for P-Pictures.
 			*
 			*	Remarks:
@@ -251,6 +263,7 @@
 			**/
 			void SetPFrameQP(uint8_t qp);
 			uint8_t GetPFrameQP();
+
 			/*	Sets the Constant QP for B-Pictures.
 			*
 			*	Remarks:
@@ -258,99 +271,149 @@
 			**/
 			void SetBFrameQP(uint8_t qp);
 			uint8_t GetBFrameQP();
-			/*	Sets the Frame Rate numerator and denumerator */
-			void SetFrameRate(uint32_t num, uint32_t den);
-			std::pair<uint32_t, uint32_t> GetFrameRate();
+
+			/* Selects the delta QP of non-reference B-Pictures with respect to I pictures */
+			void SetBPictureDeltaQP(int8_t qp);
+			int8_t GetBPictureDeltaQP();
+
+			/* Selects delta QP of reference B-Pictures with respect to I pictures */
+			void SetReferenceBPictureDeltaQP(int8_t qp);
+			int8_t GetReferenceBPictureDeltaQP();
+
 			/*	Sets the VBV Buffer Size in bits */
 			void SetVBVBufferSize(uint32_t size);
+			void SetVBVBufferAutomatic(double_t strictness);
 			uint32_t GetVBVBufferSize();
+
 			/*	Sets the initial VBV Buffer Fullness */
 			void SetInitialVBVBufferFullness(double_t fullness);
 			double_t GetInitialVBVBufferFullness();
-			/*	Enables/Disables constraints on QP variation within a picture to meet HRD requirement(s) */
-			void SetEnforceHRDRestrictionsEnabled(bool enforce);
-			bool IsEnforceHRDRestrictionsEnabled();
-			/*	Enables/Disables filler data */
-			void SetFillerDataEnabled(bool enabled);
-			bool IsFillerDataEnabled();
+
 			/*	Sets Maximum AU Size in bits */
 			void SetMaximumAccessUnitSize(uint32_t size);
 			uint32_t GetMaximumAccessUnitSize();
-			/*	Selects the delta QP of non-reference B pictures with respect to I pictures */
-			void SetBPictureDeltaQP(int8_t qp);
-			int8_t GetBPictureDeltaQP();
-			/*	Selects delta QP of reference B pictures with respect to I pictures */
-			void SetReferenceBPictureDeltaQP(int8_t qp);
-			int8_t GetReferenceBPictureDeltaQP();
-			/// Encoder Picture Control Parameters
-			/*	Sets the headers insertion spacing */
-			void SetHeaderInsertionSpacing(uint32_t spacing); // Similar to IDR Period, spacing (in frames) between headers.
-			uint32_t GetHeaderInsertionSpacing();
+
+			/*	Enables/Disables filler data */
+			void SetFillerDataEnabled(bool enabled);
+			bool IsFillerDataEnabled();
+
+			/*	Enables skip frame for rate control */
+			void SetFrameSkippingEnabled(bool enabled);
+			bool IsFrameSkippingEnabled();
+
+			/*	Enables/Disables constraints on QP variation within a picture to meet HRD requirement(s) */
+			void SetEnforceHRDRestrictionsEnabled(bool enforce);
+			bool IsEnforceHRDRestrictionsEnabled();
+
+			/************************************************************************/
+			/* Picture Control Properties */
+			/************************************************************************/
+
 			/*	Sets IDR period. IDRPeriod= 0 turns IDR off */
 			void SetIDRPeriod(uint32_t period);
 			uint32_t GetIDRPeriod();
-			/*	Turns on/off the de-blocking filter */
-			void SetDeBlockingFilterEnabled(bool enabled);
-			bool IsDeBlockingFilterEnabled();
-			/*	Sets the number of intra-refresh macro-blocks per slot */
-			void SetIntraRefreshMBsNumberPerSlot(uint32_t mbs);
-			uint32_t GetIntraRefreshMBsNumberPerSlot();
-			/*	Sets the number of slices per frame */
-			void SetSlicesPerFrame(uint32_t slices);
-			uint32_t GetSlicesPerFrame();
+
+			/*	Sets the headers insertion spacing */
+			void SetHeaderInsertionSpacing(uint32_t spacing); // Similar to IDR Period, spacing (in frames) between headers.
+			uint32_t GetHeaderInsertionSpacing();
+
 			/*	Sets the number of consecutive B-pictures in a GOP. BPicturesPattern = 0 indicates that B-pictures are not used */
 			void SetBPicturePattern(VCEBPicturePattern pattern);
 			VCEBPicturePattern GetBPicturePattern();
+
 			/*	Enables or disables using B-pictures as references */
 			void SetBPictureReferenceEnabled(bool enabled);
 			bool IsBPictureReferenceEnabled();
-			/// Encoder Miscellaneous Parameters
-			/*	Selects progressive or interlaced scan */
+
+			/*	Turns on/off the Deblocking Filter */
+			void SetDeblockingFilterEnabled(bool enabled);
+			bool IsDeblockingFilterEnabled();
+
+			/*	Sets the number of slices per frame */
+			void SetSlicesPerFrame(uint32_t slices);
+			uint32_t GetSlicesPerFrame();
+
+			/*	Sets the number of intra-refresh macro-blocks per slot */
+			void SetIntraRefreshMBsNumberPerSlot(uint32_t mbs);
+			uint32_t GetIntraRefreshMBsNumberPerSlot();
+
+			/************************************************************************/
+			/* Miscellaneous Control Properties */
+			/************************************************************************/
+
+			/** Quality Preset
+			 * Static Property, changes cause a restart. */
+			void SetQualityPreset(VCEQualityPreset preset);
+			VCEQualityPreset GetQualityPreset();
+
+			/* Selects progressive or interlaced scan
+			 * Static Property, changes cause a restart. */
 			void SetScanType(VCEScanType scanType);
 			VCEScanType GetScanType();
-			/// Encoder Motion Estimation Parameters
-			/*	Turns on/off half-pixel motion estimation */
+
+			/* Turns on/off half-pixel motion estimation */
 			void SetHalfPixelMotionEstimationEnabled(bool enabled);
 			bool IsHalfPixelMotionEstimationEnabled();
-			/*	Turns on/off quarter-pixel motion estimation */
+
+			/* Turns on/off quarter-pixel motion estimation */
 			void SetQuarterPixelMotionEstimationEnabled(bool enabled);
 			bool IsQuarterPixelMotionEstimationEnabled();
-			/// Encoder SVC Parameters (Only Webcam Usage)
-			/*	Change the number of temporal enhancement layers. The maximum number allowed is set by the corresponding create parameter.
-			 *
-			 *	Remarks:
-			 *	- Actual modification of the number of temporal enhancement layers will be delayed until the start of the next temporal GOP.
-			 *	- B-pictures and Intra-refresh features are not supported with SVC.
-			 **/
-			void SetNumberOfTemporalEnhancementLayers(uint32_t layers);
-			uint32_t GetNumberOfTemporalEnhancementLayers();
-			/*	Set the currently modified SVC Temporal Layer */
-			void SetCurrentTemporalLayer(uint32_t layer);
-			uint32_t GetCurrentTemporalLayer();
-			/*	Set the currently modified SVC Temporal Quality Layer
-			 *
-			 *	Remarks:
-			 *	- Quality layers are not supported on VCE 1.0. QL0 must be used for quality layers.
-			 **/
-			void SetCurrentTemporalQualityLayer(uint32_t layer);
-			uint32_t GetCurrentTemporalQualityLayer();
 
-			/// Hidden Parameters
+			/** Enable CABAC entropy coding instead of CALV.
+			 * CABAC is a more efficient way of compressing data and on
+			 * average 5% extra data to be stored in the same bitrate.
+			 * Static Property, changes cause a restart. */
+			void SetCABACEnabled(bool enabled);
+			bool IsCABACEnabled();
+
+			/************************************************************************/
+			/* Hidden Properties */
+			/************************************************************************/
+			void SetGOPSize(uint32_t gopSize);
+			uint32_t GetGOPSize();
+			
 			void SetNominalRange(bool enabled);
 			bool GetNominalRange();
+
 			void SetWaitForTask(bool enabled);
 			bool GetWaitForTask();
-			void SetGOPSize(uint32_t size);
-			uint32_t GetGOPSize();
+
 			void SetAspectRatio(uint32_t x, uint32_t y);
 			std::pair<uint32_t, uint32_t> GetAspectRatio();
-			void SetCABACEnabled(bool enabled);
-			bool IsCABACEnabled();
-			//void SetQualityEnhancementMode(uint32_t qualityEnhancementMode);
-			//uint32_t GetQualityEnhancementMode();
 
-			// VCE Parameters
+			void SetQualityEnhancementMode(uint32_t qualityEnhancementMode);
+			uint32_t GetQualityEnhancementMode();
+
+			void SetMaximumNumberOfReferenceFrames(uint32_t frameCount);
+			uint32_t GetMaximumNumberOfReferenceFrames();
+
+			void SetMaxMBPerSec(uint32_t maxMBPerSec);
+			uint32_t GetMaxMBPerSec();
+
+			void SetInstanceID(uint32_t instanceId);
+			uint32_t GetInstanceID();
+
+			void SetVBAQEnabled(bool enabled);
+			bool IsVBAQEnabled();
+
+			void SetRateControlPreanalysisEnabled(bool enabled);
+			bool IsRateControlPreanalysisEnabled();
+
+			void SetIntraRefreshNumberOfStripes(uint32_t stripes);
+			uint32_t GetIntraRefreshNumberOfStripes();
+
+			void SetSliceMode(uint32_t mode);
+			uint32_t GetSliceMode();
+
+			void SetMaximumSliceSize(uint32_t size);
+			uint32_t GetMaximumSliceSize();
+
 			// - SliceControlMode: AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB_ROW, AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB
+			void SetSliceControlMode(uint32_t mode);
+			uint32_t GetSliceControlMode();
+
+			void SetSliceControlSize(uint32_t size);
+			uint32_t GetSliceControlSize();
 
 			// HEVC Parameters
 			// - MinQP_I, MaxQP_I
@@ -360,8 +423,6 @@
 			// - GOPSizeMin, GOPSizeMax
 			// - EnableGOPAlignment
 
-			#pragma endregion AMF Properties
-
 			#pragma endregion Methods
 			//////////////////////////////////////////////////////////////////////////
 
@@ -377,6 +438,9 @@
 			amf::AMFComponentPtr m_AMFEncoder;
 			amf::AMFComputePtr m_AMFCompute;
 
+			// API References
+			Plugin::API::BaseAPI m_APIDevice = Plugin::API::BaseAPI(Plugin::API::Device());
+
 			// Static Buffers
 			std::vector<uint8_t> m_PacketDataBuffer;
 			std::vector<uint8_t> m_ExtraDataBuffer;
@@ -404,17 +468,18 @@
 			// Internal Properties
 			VCEEncoderType m_EncoderType;
 			VCEMemoryType m_MemoryType;
-			VCEComputeType m_ComputeType;
+			bool m_UseOpenCL;
 			VCESurfaceFormat m_SurfaceFormat;
 			bool m_Flag_IsStarted,
-				m_Flag_EmergencyQuit,
 				m_Flag_Threading;
-			std::pair<uint32_t, uint32_t> m_FrameSize, m_FrameRate;
-			double_t m_FrameRateDivisor, m_FrameRateReverseDivisor;
+			std::pair<uint32_t, uint32_t> m_FrameSize,
+				m_FrameRate;
+			double_t m_FrameRateDivisor,
+				m_FrameRateReverseDivisor;
 			size_t m_InputQueueLimit,
 				m_InputQueueLastSize;
 			uint32_t m_TimerPeriod;
-
+			
 			#pragma endregion Members
 			//////////////////////////////////////////////////////////////////////////
 		};

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Include/api-base.h Added

@@ -0,0 +1,60 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+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
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+#include "plugin.h"
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+namespace Plugin {
+	namespace API {
+		struct Device {
+			std::string Name;
+			std::string UniqueId;
+
+			Device();
+			Device(std::string Name, std::string UniqueId);
+			~Device();
+		};
+
+		class BaseAPI {
+			public:
+			static std::vector<Plugin::API::Device> EnumerateDevices();
+
+			BaseAPI(Device device);
+			virtual ~BaseAPI();
+
+			virtual void* GetContext();
+			Plugin::API::Device GetDevice();
+			
+			private:
+			Plugin::API::Device myDevice;
+		};
+	}
+}
\ No newline at end of file

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Include/api-d3d11.h Added

@@ -0,0 +1,55 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+#ifdef _WIN32
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+#include "api-base.h"
+
+#include <d3d11.h>
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+namespace Plugin {
+	namespace API {
+		class Direct3D11 : public Plugin::API::BaseAPI {
+			public:
+			static std::vector<Plugin::API::Device> EnumerateDevices();
+			static Plugin::API::Device GetDeviceForUniqueId(std::string uniqueId);
+
+			Direct3D11(Device device);
+			~Direct3D11();
+
+			void* GetContext();
+
+			private:
+			ID3D11Device* pDevice;
+			ID3D11DeviceContext* pDeviceContext;
+		};
+	}
+}
+#endif

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Include/api-d3d9.h Added

@@ -0,0 +1,57 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+#ifdef _WIN32
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+#include "api-base.h"
+
+#define D3D_DEBUG_INFO
+#include <d3d9.h>
+#pragma comment(lib, "d3d9.lib")
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+namespace Plugin {
+	namespace API {
+		class Direct3D9 : public Plugin::API::BaseAPI {
+			public:
+			static std::vector<Plugin::API::Device> EnumerateDevices();
+			static Plugin::API::Device GetDeviceForUniqueId(std::string uniqueId);
+
+			Direct3D9(Device device);
+			~Direct3D9();
+
+			void* GetContext();
+
+			private:
+			IDirect3D9* pDirect3D;
+			IDirect3DDevice9* pDirect3DDevice;
+		};
+	}
+}
+#endif

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Include/enc-h264.h -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Include/enc-h264.h Changed

@@ -40,10 +40,16 @@
 			public:
 			static void encoder_register();
 			static const char* get_name(void* type_data);
+			static const char* get_name_simple(void* type_data);
 			static void get_defaults(obs_data_t *settings);
 			static obs_properties_t* get_properties(void* data);
-			static bool reset_callback(obs_properties_t *props, obs_property_t *property, obs_data_t *settings);
-			static bool update_from_amf(obs_properties_t *props, obs_property_t *property, obs_data_t *settings);
+			
+			static bool preset_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
+			static bool maximum_ltr_frames_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
+			static bool rate_control_method_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
+			static bool bpictures_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
+			static bool view_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
+			static bool unlock_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);
@@ -65,8 +71,6 @@
 			void get_video_info(struct video_scale_info* info);
 			bool get_extra_data(uint8_t** extra_data, size_t* size);
 
-			bool update_properties(obs_data_t* settings);
-
 			//////////////////////////////////////////////////////////////////////////
 			// Storage
 			//////////////////////////////////////////////////////////////////////////

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Include/plugin.h -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Include/plugin.h Changed

@@ -31,6 +31,7 @@
 #include <exception>
 #include <stdexcept>
 #include <thread>
+#include <memory>
 
 // Open Broadcaster Software
 #pragma warning( disable: 4201 )
@@ -45,14 +46,13 @@
 #define dstr(s) #s
 
 #define PLUGIN_VERSION_MAJOR			1
-#define PLUGIN_VERSION_MINOR			3
+#define PLUGIN_VERSION_MINOR			4
 #define PLUGIN_VERSION_PATCH			1
 #define PLUGIN_VERSION_BUILD			0
 #define PLUGIN_VERSION_FULL				(((uint64_t)PLUGIN_VERSION_MAJOR << 48ull) | ((uint64_t)PLUGIN_VERSION_MINOR << 32ull) | ((uint64_t)PLUGIN_VERSION_PATCH) | ((uint64_t)PLUGIN_VERSION_BUILD))
 #define PLUGIN_VERSION_TEXT				vstr(PLUGIN_VERSION_MAJOR) "." vstr(PLUGIN_VERSION_MINOR) "." vstr(PLUGIN_VERSION_PATCH) "." vstr(PLUGIN_VERSION_BUILD) "-" vstr(AMF_VERSION_MAJOR) "." vstr(AMF_VERSION_MINOR) "." vstr(AMF_VERSION_RELEASE) "." vstr(AMF_VERSION_BUILD_NUM)
 
 #define AMF_LOG(level, format, ...)		blog(level, "[AMF Encoder] " format, ##__VA_ARGS__);
-
 #define AMF_LOG_ERROR(format, ...)		AMF_LOG(LOG_ERROR, format, ##__VA_ARGS__)
 #define AMF_LOG_WARNING(format, ...)	AMF_LOG(LOG_WARNING, format, ##__VA_ARGS__)
 #define AMF_LOG_INFO(format, ...)		AMF_LOG(LOG_INFO, format, ##__VA_ARGS__)
@@ -74,58 +74,139 @@
 	std::vector<char> _throwexceptionwithamferror_buf(8192);\
 	sprintf_s(_throwexceptionwithamferror_buf.data(), _throwexceptionwithamferror_buf.size(), format, ##__VA_ARGS__, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);\
 	AMF_LOG_ERROR("%s", _throwexceptionwithamferror_buf.data()); \
-	throw new std::exception(_throwexceptionwithamferror_buf.data(), res); \
+	throw std::exception(_throwexceptionwithamferror_buf.data()); \
 }
 
 //////////////////////////////////////////////////////////////////////////
 // Defines - Translation Strings
 //////////////////////////////////////////////////////////////////////////
 
-// Shared
+// Presets
+#define AMF_H264_PRESET							TEXT_AMF_H264("Preset")
+#define AMF_H264_PRESET_RECORDING				TEXT_AMF_H264("Preset.Recording")
+#define AMF_H264_PRESET_HIGHQUALITY				TEXT_AMF_H264("Preset.HighQuality")
+#define AMF_H264_PRESET_INDISTINGUISHABLE		TEXT_AMF_H264("Preset.Indistinguishable")
+#define AMF_H264_PRESET_LOSSLESS				TEXT_AMF_H264("Preset.Lossless")
+#define AMF_H264_PRESET_TWITCH					TEXT_AMF_H264("Preset.Twitch")
+#define AMF_H264_PRESET_YOUTUBE					TEXT_AMF_H264("Preset.YouTube")
+
+// Static Properties
 #define AMF_H264_USAGE							TEXT_AMF_H264("Usage")
+#define AMF_H264_USAGE_DESCRIPTION				TEXT_AMF_H264("Usage.Description")
 #define AMF_H264_USAGE_TRANSCODING				TEXT_AMF_H264("Usage.Transcoding")
 #define AMF_H264_USAGE_ULTRALOWLATENCY			TEXT_AMF_H264("Usage.UltraLowLatency")
 #define AMF_H264_USAGE_LOWLATENCY				TEXT_AMF_H264("Usage.LowLatency")
 #define AMF_H264_USAGE_WEBCAM					TEXT_AMF_H264("Usage.Webcam")
-#define AMF_H264_QUALITY_PRESET					TEXT_AMF_H264("QualityPreset")
-#define AMF_H264_QUALITY_PRESET_SPEED			TEXT_AMF_H264("QualityPreset.Speed")
-#define AMF_H264_QUALITY_PRESET_BALANCED		TEXT_AMF_H264("QualityPreset.Balanced")
-#define AMF_H264_QUALITY_PRESET_QUALITY			TEXT_AMF_H264("QualityPreset.Quality")
 #define AMF_H264_PROFILE						TEXT_AMF_H264("Profile")
+#define AMF_H264_PROFILE_DESCRIPTION			TEXT_AMF_H264("Profile.Description")
 #define AMF_H264_PROFILELEVEL					TEXT_AMF_H264("ProfileLevel")
+#define AMF_H264_PROFILELEVEL_DESCRIPTION		TEXT_AMF_H264("ProfileLevel.Description")
+#define AMF_H264_MAXIMUMLTRFRAMES				TEXT_AMF_H264("MaximumLTRFrames")
+#define AMF_H264_MAXIMUMLTRFRAMES_DESCRIPTION	TEXT_AMF_H264("MaximumLTRFrames.Description")
+
+// Rate Control Properties
 #define AMF_H264_RATECONTROLMETHOD				TEXT_AMF_H264("RateControlMethod")
+#define AMF_H264_RATECONTROLMETHOD_DESCRIPTION	TEXT_AMF_H264("RateControlMethod.Description")
 #define AMF_H264_RATECONTROLMETHOD_CQP			TEXT_AMF_H264("RateControlMethod.CQP")
 #define AMF_H264_RATECONTROLMETHOD_CBR			TEXT_AMF_H264("RateControlMethod.CBR")
 #define AMF_H264_RATECONTROLMETHOD_VBR			TEXT_AMF_H264("RateControlMethod.VBR.Peak")
 #define AMF_H264_RATECONTROLMETHOD_VBR_LAT		TEXT_AMF_H264("RateControlMethod.VBR.Latency")
 #define AMF_H264_BITRATE_TARGET					TEXT_AMF_H264("Bitrate.Target")
+#define AMF_H264_BITRATE_TARGET_DESCRIPTION		TEXT_AMF_H264("Bitrate.Target.Description")
 #define AMF_H264_BITRATE_PEAK					TEXT_AMF_H264("Bitrate.Peak")
+#define AMF_H264_BITRATE_PEAK_DESCRIPTION		TEXT_AMF_H264("Bitrate.Peak.Description")
 #define AMF_H264_QP_MINIMUM						TEXT_AMF_H264("QP.Minimum")
+#define AMF_H264_QP_MINIMUM_DESCRIPTION			TEXT_AMF_H264("QP.Minimum.Description")
 #define AMF_H264_QP_MAXIMUM						TEXT_AMF_H264("QP.Maximum")
+#define AMF_H264_QP_MAXIMUM_DESCRIPTION			TEXT_AMF_H264("QP.Maximum.Description")
 #define AMF_H264_QP_IFRAME						TEXT_AMF_H264("QP.IFrame")
+#define AMF_H264_QP_IFRAME_DESCRIPTION			TEXT_AMF_H264("QP.IFrame.Description")
 #define AMF_H264_QP_PFRAME						TEXT_AMF_H264("QP.PFrame")
+#define AMF_H264_QP_PFRAME_DESCRIPTION			TEXT_AMF_H264("QP.PFrame.Description")
 #define AMF_H264_QP_BFRAME						TEXT_AMF_H264("QP.BFrame")
+#define AMF_H264_QP_BFRAME_DESCRIPTION			TEXT_AMF_H264("QP.BFrame.Description")
 #define AMF_H264_QP_BPICTURE_DELTA				TEXT_AMF_H264("QP.BPictureDelta")
+#define AMF_H264_QP_BPICTURE_DELTA_DESCRIPTION	TEXT_AMF_H264("QP.BPictureDelta.Description")
 #define AMF_H264_QP_REFERENCE_BPICTURE_DELTA	TEXT_AMF_H264("QP.ReferenceBPictureDelta")
+#define AMF_H264_QP_REFERENCE_BPICTURE_DELTA_DESCRIPTION	TEXT_AMF_H264("QP.ReferenceBPictureDelta.Description")
+#define AMF_H264_VBVBUFFER						TEXT_AMF_H264("VBVBuffer")
+#define AMF_H264_VBVBUFFER_DESCRIPTION			TEXT_AMF_H264("VBVBuffer.Description")
+#define AMF_H264_VBVBUFFER_STRICTNESS			TEXT_AMF_H264("VBVBuffer.Strictness")
+#define AMF_H264_VBVBUFFER_STRICTNESS_DESCRIPTION	TEXT_AMF_H264("VBVBuffer.Strictness.Description")
+#define AMF_H264_VBVBUFFER_SIZE					TEXT_AMF_H264("VBVBuffer.Size")
+#define AMF_H264_VBVBUFFER_SIZE_DESCRIPTION		TEXT_AMF_H264("VBVBuffer.Size.Description")
+#define AMF_H264_VBVBUFFER_FULLNESS				TEXT_AMF_H264("VBVBuffer.Fullness")
+#define AMF_H264_VBVBUFFER_FULLNESS_DESCRIPTION	TEXT_AMF_H264("VBVBuffer.Fullness.Description")
 #define AMF_H264_FILLERDATA						TEXT_AMF_H264("FillerData")
+#define AMF_H264_FILLERDATA_DESCRIPTION			TEXT_AMF_H264("FillerData.Description")
 #define AMF_H264_FRAMESKIPPING					TEXT_AMF_H264("FrameSkipping")
+#define AMF_H264_FRAMESKIPPING_DESCRIPTION		TEXT_AMF_H264("FrameSkipping.Description")
 #define AMF_H264_ENFORCEHRDCOMPATIBILITY		TEXT_AMF_H264("EnforceHRDCompatibility")
+#define AMF_H264_ENFORCEHRDCOMPATIBILITY_DESCRIPTION	TEXT_AMF_H264("EnforceHRDCompatibility.Description")
+#define AMF_H264_MAXIMUMACCESSUNITSIZE			TEXT_AMF_H264("MaximumAccessUnitSize")
+#define AMF_H264_MAXIMUMACCESSUNITSIZE_DESCRIPTION	TEXT_AMF_H264("MaximumAccessUnitSize.Description")
+
+// Picture Control Properties
+#define AMF_H264_KEYFRAME_INTERVAL				TEXT_AMF_H264("KeyframeInterval")
+#define AMF_H264_KEYFRAME_INTERVAL_DESCRIPTION	TEXT_AMF_H264("KeyframeInterval.Description")
+#define AMF_H264_IDR_PERIOD						TEXT_AMF_H264("IDRPeriod")
+#define AMF_H264_IDR_PERIOD_DESCRIPTION			TEXT_AMF_H264("IDRPeriod.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_BPICTURE_PATTERN				TEXT_AMF_H264("BPicture.Pattern")
+#define AMF_H264_BPICTURE_PATTERN_DESCRIPTION	TEXT_AMF_H264("BPicture.Pattern.Description")
+#define AMF_H264_BPICTURE_REFERENCE				TEXT_AMF_H264("BPicture.Reference")
+#define AMF_H264_BPICTURE_REFERENCE_DESCRIPTION	TEXT_AMF_H264("BPicture.Reference.Description")
 #define AMF_H264_DEBLOCKINGFILTER				TEXT_AMF_H264("DeblockingFilter")
+#define AMF_H264_DEBLOCKINGFILTER_DESCRIPTION	TEXT_AMF_H264("DeblockingFilter.Description")
+#define AMF_H264_SLICESPERFRAME					TEXT_AMF_H264("SlicesPerFrame")
+#define AMF_H264_SLICESPERFRAME_DESCRIPTION		TEXT_AMF_H264("SlicesPerFrame.Description")
+#define AMF_H264_INTRAREFRESHNUMMBSPERSLOT		TEXT_AMF_H264("IntraRefreshNumMBsPerSlot")
+#define AMF_H264_INTRAREFRESHNUMMBSPERSLOT_DESCRIPTION	TEXT_AMF_H264("IntraRefreshNumMBsPerSlot.Description")
+
+// Miscellaneous Properties
+#define AMF_H264_QUALITY_PRESET					TEXT_AMF_H264("QualityPreset")
+#define AMF_H264_QUALITY_PRESET_DESCRIPTION		TEXT_AMF_H264("QualityPreset.Description")
+#define AMF_H264_QUALITY_PRESET_SPEED			TEXT_AMF_H264("QualityPreset.Speed")
+#define AMF_H264_QUALITY_PRESET_BALANCED		TEXT_AMF_H264("QualityPreset.Balanced")
+#define AMF_H264_QUALITY_PRESET_QUALITY			TEXT_AMF_H264("QualityPreset.Quality")
 #define AMF_H264_SCANTYPE						TEXT_AMF_H264("ScanType")
+#define AMF_H264_SCANTYPE_DESCRIPTION			TEXT_AMF_H264("ScanType.Description")
 #define AMF_H264_SCANTYPE_PROGRESSIVE			TEXT_AMF_H264("ScanType.Progressive")
 #define AMF_H264_SCANTYPE_INTERLACED			TEXT_AMF_H264("ScanType.Interlaced")
-#define AMF_H264_BPICTURE_PATTERN				TEXT_AMF_H264("BPicture.Pattern")
-#define AMF_H264_BPICTURE_REFERENCE				TEXT_AMF_H264("BPicture.Reference")
-#define AMF_H264_GOP_SIZE						TEXT_AMF_H264("GOPSize")
+#define AMF_H264_MOTIONESTIMATION				TEXT_AMF_H264("MotionEstimation")
+#define AMF_H264_MOTIONESTIMATION_DESCRIPTION	TEXT_AMF_H264("MotionEstimation.Description")
+#define AMF_H264_MOTIONESTIMATION_NONE			TEXT_AMF_H264("MotionEstimation.None")
+#define AMF_H264_MOTIONESTIMATION_HALF			TEXT_AMF_H264("MotionEstimation.Half")
+#define AMF_H264_MOTIONESTIMATION_QUARTER		TEXT_AMF_H264("MotionEstimation.Quarter")
+#define AMF_H264_MOTIONESTIMATION_BOTH			TEXT_AMF_H264("MotionEstimation.Both")
 #define AMF_H264_CABAC							TEXT_AMF_H264("CABAC")
-#define AMF_H264_DEBUGTRACING					TEXT_AMF_H264("DebugTracing")
+#define AMF_H264_CABAC_DESCRIPTION				TEXT_AMF_H264("CABAC.Description")
+
+// System Properties
 #define AMF_H264_MEMORYTYPE						TEXT_AMF_H264("MemoryType")
-#define AMF_H264_COMPUTETYPE					TEXT_AMF_H264("ComputeType")
+#define AMF_H264_MEMORYTYPE_DESCRIPTION			TEXT_AMF_H264("MemoryType.Description")
+#define AMF_H264_DEVICE							TEXT_AMF_H264("Device")
+#define AMF_H264_DEVICE_DESCRIPTION				TEXT_AMF_H264("Device.Description")
+#define AMF_H264_USE_OPENCL						TEXT_AMF_H264("UseOpenCL")
+#define AMF_H264_USE_OPENCL_DESCRIPTION			TEXT_AMF_H264("UseOpenCL.Description")
 #define AMF_H264_SURFACEFORMAT					TEXT_AMF_H264("SurfaceFormat")
+#define AMF_H264_SURFACEFORMAT_DESCRIPTION		TEXT_AMF_H264("SurfaceFormat.Description")
+#define AMF_H264_VIEW							TEXT_AMF_H264("View")
+#define AMF_H264_VIEW_DESCRIPTION				TEXT_AMF_H264("View.Description")
+#define AMF_H264_VIEW_BASIC						TEXT_AMF_H264("View.Basic")
+#define AMF_H264_VIEW_ADVANCED					TEXT_AMF_H264("View.Advanced")
+#define AMF_H264_VIEW_EXPERT					TEXT_AMF_H264("View.Expert")
+#define AMF_H264_VIEW_MASTER					TEXT_AMF_H264("View.Master")
+#define AMF_H264_UNLOCK_PROPERTIES				TEXT_AMF_H264("UnlockProperties")
+#define AMF_H264_UNLOCK_PROPERTIES_DESCRIPTION	TEXT_AMF_H264("UnlockProperties.Description")
+#define AMF_H264_DEBUG							TEXT_AMF_H264("Debug")
+#define AMF_H264_DEBUG_DESCRIPTION				TEXT_AMF_H264("Debug.Description")
 
 // Utility
 #define AMF_UTIL_DEFAULT						TEXT_AMF_UTIL("Default")
 #define AMF_UTIL_AUTOMATIC						TEXT_AMF_UTIL("Automatic")
+#define AMF_UTIL_MANUAL							TEXT_AMF_UTIL("Manual")
 #define AMF_UTIL_TOGGLE_DISABLED				TEXT_AMF_UTIL("Toggle.Disabled")
 #define AMF_UTIL_TOGGLE_ENABLED					TEXT_AMF_UTIL("Toggle.Enabled")

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/bg-BG.ini Added

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ca-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ca-ES.ini Changed

@@ -1,14 +1,9 @@
-AMF.H264.Usage="Tipus d'ús"
 AMF.H264.Usage.Transcoding="Transcodificació"
 AMF.H264.Usage.UltraLowLatency="Latència ultra baixa"
 AMF.H264.Usage.LowLatency="Latència baixa"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Qualitat del perfil"
-AMF.H264.QualityPreset.Speed="Velocitat"
-AMF.H264.QualityPreset.Balanced="Equilibrat"
-AMF.H264.QualityPreset.Quality="Qualitat"
 AMF.H264.Profile="Perfil"
 AMF.H264.ProfileLevel="Nivell de perfil"
+AMF.H264.MaximumLTRFrames="Fotogrames màxims LTR"
 AMF.H264.RateControlMethod="Mètode de control del flux"
 AMF.H264.RateControlMethod.CQP="QP constant (CQP)"
 AMF.H264.RateControlMethod.CBR="Flux constant (CBR)"
@@ -22,54 +17,24 @@
 AMF.H264.QP.PFrame="P-Frame QP"
 AMF.H264.QP.BFrame="B-Frame QP"
 AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
-AMF.H264.QP.ReferenceBPictureDelta="Referència B-Picture Delta QP"
+AMF.H264.QP.ReferenceBPictureDelta="QP Delta en B-Pictures de referencia"
 AMF.H264.FillerData="Dades a omplir"
 AMF.H264.FrameSkipping="Omissió de fotogrames"
 AMF.H264.EnforceHRDCompatibility="Força la compatibilitat amb HRD"
-AMF.H264.DeblockingFilter="Filtre de desbloqueig"
+AMF.H264.BPicture.Pattern="Patró B-Picture"
+AMF.H264.BPicture.Reference="Referència B-Picture"
+AMF.H264.DeblockingFilter="Filtre d'eliminació de blocs"
 AMF.H264.ScanType="Tipus d'exploració"
 AMF.H264.ScanType.Progressive="Progressiu"
 AMF.H264.ScanType.Interlaced="Entrellaçat"
-AMF.H264.BPicture.Pattern="Patró B-Picture"
-AMF.H264.BPicture.Reference="Referència B-Picture"
-AMF.H264.GOPSize="Mida del GOP"
+AMF.H264.QualityPreset="Qualitat del perfil"
+AMF.H264.QualityPreset.Speed="Velocitat"
+AMF.H264.QualityPreset.Balanced="Equilibrat"
+AMF.H264.QualityPreset.Quality="Qualitat"
 AMF.H264.CABAC="Codificació adaptativa segons el context binari aritmètic (CABAC)"
-AMF.H264.DebugTracing="Seguiment de la depuració"
 AMF.H264.MemoryType="Tipus de memòria"
-AMF.H264.ComputeType="Tipus de computació"
-
-AMF.H264Advanced.Name="H264 Encoder [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Restaura els valors predeterminats"
-AMF.H264Advanced.Update="Actualitza els valors d'AMF (si per defecte/-1)"
-AMF.H264Advanced.MaxLTRFrames="Fotogrames màxims LTR"
-AMF.H264Advanced.VBVBuffer.Size="Mida de buffer VBV (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Amplitud del buffer VBV"
-AMF.H264Advanced.MaxAUSize="Mida màxima d'AU (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Capçalera d'inserció espaiat (fotogrames)"
-AMF.H264Advanced.IDRPeriod="Període de fotogrames clau (fotogrames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Memòria intra-refresh per ranura en macroblocs (en MB)"
-AMF.H264Advanced.SlicesPerFrame="Llesques per fotograma"
-AMF.H264Advanced.MotionEstimation="Estimació de moviment"
-AMF.H264Advanced.MotionEstimation.None="Cap"
-AMF.H264Advanced.MotionEstimation.Half="Només mig pixel"
-AMF.H264Advanced.MotionEstimation.Quarter="Només un quart de pixel"
-AMF.H264Advanced.MotionEstimation.Both="Ambdós"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Configuració preestablerta"
-AMF.H264Simple.Preset.Recording="S'està enregistrant"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Interval de fotogrames clau (segons)"
-AMF.H264Simple.UseCustomBufferSize="Utilitza mida de buffer personalitzat"
-AMF.H264Simple.CustomBufferSize="Mida del buffer (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Amplitud del buffer inicial"
-AMF.H264Simple.UseCustomGOPSize="Utilitza una mida GOP personalitzada"
-AMF.H264Simple.ShowAdvancedParameters="Mostra els paràmetres avançats"
-AMF.H264Simple.ShowExpertParameters="Mostra paràmetres per a experts"
-
+AMF.H264.SurfaceFormat="Format de la superfície"
 AMF.Util.Default="Per defecte"
 AMF.Util.Automatic="Automàtic"
 AMF.Util.Toggle.Disabled="Desactivat"
 AMF.Util.Toggle.Enabled="Activat"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/cs-CZ.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/cs-CZ.ini Changed

@@ -1,12 +1,14 @@
-AMF.H264.Usage="Typ použití"
+AMF.H264.Preset="Profil"
+AMF.H264.Preset.Recording="Nahrávání"
+AMF.H264.Preset.HighQuality="Vysoká kvalita"
+AMF.H264.Preset.Indistinguishable="Nerozeznatelné"
+AMF.H264.Preset.Lossless="Lossless"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Využití"
 AMF.H264.Usage.Transcoding="Kódování"
 AMF.H264.Usage.UltraLowLatency="Ultra nízká odezva"
 AMF.H264.Usage.LowLatency="Nízká odezva"
-AMF.H264.Usage.Webcam="Webkamera"
-AMF.H264.QualityPreset="Profil kvality"
-AMF.H264.QualityPreset.Speed="Rychlost"
-AMF.H264.QualityPreset.Balanced="Vyváženo"
-AMF.H264.QualityPreset.Quality="Kvalita"
 AMF.H264.Profile="Profil"
 AMF.H264.ProfileLevel="Úroveň profilu"
 AMF.H264.RateControlMethod="Metoda řízení"
@@ -21,23 +23,38 @@
 AMF.H264.FillerData="Filtrovat data"
 AMF.H264.FrameSkipping="Přeskakování snímků"
 AMF.H264.EnforceHRDCompatibility="Vynutit kompatibilitu s HRD"
+AMF.H264.KeyframeInterval="Interval klíčový snímků"
+AMF.H264.KeyframeInterval.Description="Kolik vteřin by mělo být mezi ne-zahazovatelnými snímky.\nTaké ovládá velikost sekvence(GOP)."
+AMF.H264.IDRPeriod.Description="Kolik snímků by mělo být mezi ne-zahazovatelnými snímky.\nTaké ovládá velikost sekvence(GOP)."
 AMF.H264.ScanType="Typ skenování"
+AMF.H264.ScanType.Description="Určuje použitou metodu skenování, vždy ponechejte na 'Progresivní'."
 AMF.H264.ScanType.Progressive="Progresivní"
 AMF.H264.ScanType.Interlaced="Prokládané"
-AMF.H264.GOPSize="Velikost GOP"
-
-AMF.H264Advanced.Name="H264 [Rozšířené] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Obnovit výchozí"
-AMF.H264Advanced.MotionEstimation.Both="Obojí"
-
-AMF.H264Simple.Name="H264 (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Předvolba"
-AMF.H264Simple.Preset.Recording="Nahrávka"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.ShowAdvancedParameters="Zobrazit rozšířené nastavení"
-
+AMF.H264.QualityPreset="Profil kvality"
+AMF.H264.QualityPreset.Speed="Rychlost"
+AMF.H264.QualityPreset.Balanced="Vyváženo"
+AMF.H264.QualityPreset.Quality="Kvalita"
+AMF.H264.MotionEstimation="Odhad pohybu"
+AMF.H264.MotionEstimation.Description="Odhad pohybu umožňuje enkodéru snížit požadovaný bitrate předpovídáním, kam se určitý pixel posunul."
+AMF.H264.MotionEstimation.None="Žádný"
+AMF.H264.MotionEstimation.Half="Polovina pixelu"
+AMF.H264.MotionEstimation.Quarter="Čtvrtina pixelu"
+AMF.H264.MotionEstimation.Both="Polovina & čtvrtina pixelu"
+AMF.H264.CABAC="CABAC"
+AMF.H264.MemoryType="Typ paměti"
+AMF.H264.SurfaceFormat="Formát povrchu"
+AMF.H264.View="Režim zobrazení"
+AMF.H264.View.Description="Které možnosti mají být zobrazeny. Nezískáte žádnou pomoc při použití módu 'Expert' či 'Master'."
+AMF.H264.View.Basic="Základní"
+AMF.H264.View.Advanced="Pokročilý"
+AMF.H264.View.Expert="Expert"
+AMF.H264.View.Master="Master"
+AMF.H264.UnlockProperties="Odblokovat vlastnosti"
+AMF.H264.UnlockProperties.Description="Odblokuje určité vlastnosti do jejich plného rozsahu místo omezování do určitého."
+AMF.H264.Debug="Ladění"
+AMF.H264.Debug.Description="Zapne rozšířené protokolování, mělo by být zapnuto, pokud pořebujete pomoci s tmto enkodérem."
 AMF.Util.Default="Výchozí"
+AMF.Util.Automatic="Automatické"
+AMF.Util.Manual="Manuální"
 AMF.Util.Toggle.Disabled="Zakázáno"
 AMF.Util.Toggle.Enabled="Povoleno"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/da-DK.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/da-DK.ini Changed

@@ -1,12 +1,6 @@
-AMF.H264.Usage="Forbrugs Type"
 AMF.H264.Usage.Transcoding="Transcoding"
 AMF.H264.Usage.UltraLowLatency="Ekstrem Lav Ventetid"
 AMF.H264.Usage.LowLatency="Lav Ventetid"
-AMF.H264.Usage.Webcam="Webkamera"
-AMF.H264.QualityPreset="Kvalitets profiler"
-AMF.H264.QualityPreset.Speed="Hastighed (Dårligste kvalitet)"
-AMF.H264.QualityPreset.Balanced="Balanceret (Mellem Kvalitet)"
-AMF.H264.QualityPreset.Quality="Kvalitet (Bedste Kvalitet)"
 AMF.H264.Profile="Profil"
 AMF.H264.ProfileLevel="Profil Niveau"
 AMF.H264.RateControlMethod="Rate Control Method"
@@ -25,42 +19,16 @@
 AMF.H264.FillerData="Filler Data"
 AMF.H264.FrameSkipping="Billede skip"
 AMF.H264.EnforceHRDCompatibility="Tving HRD Kompatibilitet"
+AMF.H264.BPicture.Pattern="B-Picture Pattern"
+AMF.H264.BPicture.Reference="B-Picture Reference"
 AMF.H264.DeblockingFilter="Deblocking Filter"
 AMF.H264.ScanType="Scan Type"
 AMF.H264.ScanType.Progressive="Progressive"
 AMF.H264.ScanType.Interlaced="Interlaced"
-AMF.H264.BPicture.Pattern="B-Picture Pattern"
-AMF.H264.BPicture.Reference="B-Picture Reference"
-AMF.H264.DebugTracing="Debug Tracing"
-
-AMF.H264Advanced.Name="H264 Encoder [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Gendan indstillinger"
-AMF.H264Advanced.Update="Hent værdierne fra AMF (hvis værdierne er sat til standard eller -1)"
-AMF.H264Advanced.MaxLTRFrames="Maksimum LTR Frames"
-AMF.H264Advanced.VBVBuffer.Size="VBV Buffer størrelse (i Bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Initial VBV Buffer Fullness"
-AMF.H264Advanced.MaxAUSize="Maksimum AU størrelse (i Bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="Keyframe Period (Frames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory Per Slot In Macroblocks (in MB)"
-AMF.H264Advanced.SlicesPerFrame="Slices Per Frame"
-AMF.H264Advanced.MotionEstimation="Motion Estimation"
-AMF.H264Advanced.MotionEstimation.None="Intet"
-AMF.H264Advanced.MotionEstimation.Half="Halv"
-AMF.H264Advanced.MotionEstimation.Quarter="Kvart"
-AMF.H264Advanced.MotionEstimation.Both="Begge"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Preset"
-AMF.H264Simple.Preset.Recording="Optagelse"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Keyframe Interval (Sekunder)"
-AMF.H264Simple.UseCustomBufferSize="Brug brugerdefinerede Buffer størrelse"
-AMF.H264Simple.CustomBufferSize="Buffer størrelse (i kbit/s)"
-AMF.H264Simple.ShowAdvancedParameters="Show Advanced Parameters"
-
+AMF.H264.QualityPreset="Kvalitets profiler"
+AMF.H264.QualityPreset.Speed="Hastighed (Dårligste kvalitet)"
+AMF.H264.QualityPreset.Balanced="Balanceret (Mellem Kvalitet)"
+AMF.H264.QualityPreset.Quality="Kvalitet (Bedste Kvalitet)"
 AMF.Util.Default="Standard"
 AMF.Util.Toggle.Disabled="Deaktiveret"
 AMF.Util.Toggle.Enabled="Aktiveret"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/de-DE.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/de-DE.ini Changed

@@ -1,79 +1,115 @@
-AMF.H264.Usage="Verwendungstyp"
+AMF.H264.Preset="Voreinstellungen"
+AMF.H264.Preset.Recording="Aufnahme"
+AMF.H264.Preset.HighQuality="Hohe Qualität"
+AMF.H264.Preset.Indistinguishable="Ununterscheidbar"
+AMF.H264.Preset.Lossless="Verlustfrei"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Nutzungsart"
+AMF.H264.Usage.Description="Auf welche Nutzungsart AMF eingestellt werden soll:\n- 'Umwandeln' für generelle umwandlung (empfohlen),\n- 'Sehr Niedrige Latenz' für codierung mit sehr niedriger latenz,\n- 'Niedrige Latenz' ist ähnlich dem oberen mit leicht erhöhter latenz.\nNur 'Umwandeln' wird für das streamen unterstützt, alle anderen können für aufnahmen verwendet werden."
 AMF.H264.Usage.Transcoding="Umwandeln"
 AMF.H264.Usage.UltraLowLatency="Sehr Niedrige Latenz"
 AMF.H264.Usage.LowLatency="Niedrige Latenz"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Qualitätsvoreinstellung"
-AMF.H264.QualityPreset.Speed="Geschwindigkeit"
-AMF.H264.QualityPreset.Balanced="Ausgeglichen"
-AMF.H264.QualityPreset.Quality="Qualität"
 AMF.H264.Profile="Profil"
+AMF.H264.Profile.Description="Welches H.264 Profil für das Codieren verwendet werden soll:\n- 'Baseline' hat die größte Unterstützung,\n- 'Main' wird von ca 95% an Geräten unterstützt (empfohlen),\n- 'High' wird nur von Hoch-Performance Geräten unterstützt."
 AMF.H264.ProfileLevel="Profillevel"
+AMF.H264.ProfileLevel.Description="Welches H.264 Profil Level für das verarbeiten verwendet werden soll:\n- 'Automatisch' errechnet das beste Profil Level für die gegeben Frame Rate und Frame Größe,\n- '4.1' unterstützt 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' unterstützt 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' unterstützt 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' unterstützt 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' unterstützt 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Maximale Langzeitreferenz-Bilder"
+AMF.H264.MaximumLTRFrames.Description="Langzeitreferenz (LTR) Bilder ist ein feature das dem Codierer erlaubt, einige Bilder innerhalb einer Sequenz als referenzierbar zu markieren.\nDies kann einen positiven Effekt auf die Qualität haben sofern B-Bilder nicht unterstützt oder gewollt sind.\nLTR Bilder können nicht zusammen mit B-Bildern verwendet werden und der encoder wird B-Bilder deaktivieren sofern diese verwendet werden."
 AMF.H264.RateControlMethod="Ratenkontrollmethode"
+AMF.H264.RateControlMethod.Description="Welche Ratenkontrollmethode verwendet werden soll:\n- CQP setzt feste QP (Quantifizierungsparameter) werte für I-/P-/B- Bilder,\n- CBR bleibt auf der Zielbitrate (mithilfe von Füllungsdaten) (empfohlen für das Streamen),\n- VBR bleibt unter der Höchstbitrate,\n- VBR_LAT bleibt nahe der Zielbitrate sofern GPU-Latenz und GPU-Benutzung dies erlauben, ansonsten wird eine höhere Bitrate verwendet (empfohlen für Aufnamen).\nAlle Methoden bis auf CQP nutzen die Minimum und Maximum QP (Quantifizierungsparameter) Begrenzungen."
 AMF.H264.RateControlMethod.CQP="Konstante QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Konstante Bitrate (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="Variable Bitrate (Eingeschränkt via Spitzenbitrate) (VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="Variable Bitrate (Eingeschränkt via Latenz) (VBR_LAT)"
 AMF.H264.Bitrate.Target="Zielbitrate"
+AMF.H264.Bitrate.Target.Description="Bitrate die versucht werden soll zu erreichen in einer Sequenz.\nWird von CBR und VBR_LAT verwendet."
 AMF.H264.Bitrate.Peak="Spitzenbitrate"
+AMF.H264.Bitrate.Peak.Description="Maximale Bitrate in einer Sequenz.\nWird von VBR und VBR_LAT verwendet."
 AMF.H264.QP.Minimum="Minimale QP"
+AMF.H264.QP.Minimum.Description="Niedrigster QP wert der in einem Bild verwendet werden darf.\nWird von CBR, VBR und VBR_LAT verwendet."
 AMF.H264.QP.Maximum="Maximale QP"
+AMF.H264.QP.Maximum.Description="Größter QP wert der in einem Bild verwendet werden darf.\nWird von CBR, VBR und VBR_LAT verwendet."
 AMF.H264.QP.IFrame="I-Einzelbild QP"
+AMF.H264.QP.IFrame.Description="Festgelegter QP wert der für I-Bilder verwendet wird.\nNiedriger = größere Datei, bessere Qualität. Höher = Kleinere Datei, schlechtere Qualität.\nDer QP wert für I-Bilder sollte gleich oder höher als der für P- und B-Bilder sein.\nWird von CQP verwendet."
 AMF.H264.QP.PFrame="P-Einzelbild QP"
+AMF.H264.QP.PFrame.Description="Festgelegter QP wert der für P-Bilder verwendet wird.\nNiedriger = größere Datei, bessere Qualität. Höher = Kleinere Datei, schlechtere Qualität.\nDer QP wert für P-Bilder sollte gleich oder höher als der für B-Bilder sein.\nWird von CQP verwendet."
 AMF.H264.QP.BFrame="B-Einzelbild QP"
+AMF.H264.QP.BFrame.Description="Festgelegter QP wert der für B-Bilder verwendet wird.\nNiedriger = größere Datei, bessere Qualität. Höher = Kleinere Datei, schlechtere Qualität.\nWird von CQP verwendet."
 AMF.H264.QP.BPictureDelta="B-Bild Delta QP"
+AMF.H264.QP.BPictureDelta.Description="Delta QP wert zum letzten nicht-Referenz B-Bild."
 AMF.H264.QP.ReferenceBPictureDelta="Referenz B-Bild Delta QP"
+AMF.H264.QP.ReferenceBPictureDelta.Description="Delta QP wert zum letzten Referenz B-Bild."
+AMF.H264.VBVBuffer="VBV Buffer"
+AMF.H264.VBVBuffer.Description="Welche methode genutzt werden soll um die VBV-Puffergröße zu bestimmen:\n- 'Automatisch' errechnet diese mithilfe einer Strengeneinschränkung,\n- 'Manuell' erlaubt es dem Nutzer die Größe zu kontrollieren.\n
+VBV (Videopufferungsverifizierer) Puffer wird von verschiedenen Ratenkontrollmethoden genutzt um die gesamte Bitrate innerhalb der Begrenzungen zu halten."
+AMF.H264.VBVBuffer.Strictness="VBV Buffer Genauigkeit"
+AMF.H264.VBVBuffer.Strictness.Description="Wie streng der VBV Buffer sein soll, wobei 100% fast exakt die Zielbitrate und 0% komplett unbeschränkt ist."
+AMF.H264.VBVBuffer.Size="VBV Buffer Größe"
+AMF.H264.VBVBuffer.Size.Description="Die Größe des VBV Buffers der für die Bitratenkontrollen in einer Sequenz verwendet wird.\nEine kleine Größe ergibt eine fast perfekte Übereinstimmung mit der Bitrate aber hat einen größeren Performanzeinfluss.\nDie ideale (100% streng) VBV Buffer Größe ist Bitrate/Framerate."
+AMF.H264.VBVBuffer.Fullness="VBV Buffer Füllung"
+AMF.H264.VBVBuffer.Fullness.Description="Wie voll der VBV Buffer anfangs ist, hat nur einen Effekt auf die erste Sequenz beim codieren."
 AMF.H264.FillerData="Füllungsdaten"
+AMF.H264.FillerData.Description="Füllungsdaten sind leere/invalide Daten die der Decodierer ignoriert.\nWenn aktiv und CBR verwendet wird, dann wird der Codierer den verbleibenden Platz in einer Sequenz mit diesen Daten füllen."
 AMF.H264.FrameSkipping="Einzelbildüberspringung"
+AMF.H264.FrameSkipping.Description="Einzelbildüberspringung erlaubt es dem Codierer selektiv Bilder auszulassen sollten diese zu ähnlich sein oder zu lange zum codieren brauchen.\nSofern dies aktiv ist nutzt die Ausgabe Variable Frameraten, was die meiste Bearbeitungssoftware nicht unterstützt."
 AMF.H264.EnforceHRDCompatibility="Erzwinge HRD Kompatiblität"
-AMF.H264.DeblockingFilter="Entblockungsfilter"
-AMF.H264.ScanType="Abtasttyp"
-AMF.H264.ScanType.Progressive="Progressiv"
-AMF.H264.ScanType.Interlaced="Interlaced"
+AMF.H264.EnforceHRDCompatibility.Description="Erzwinge Hypothetischer-Referenz-Decodierer Limitierungen welches die maximale Änderung des QP werts innerhalb eines Bildes begrenzt.\nNicht empfohlen für Aufname oder Streamen und sollte nur verwendet werden sofern das Ziel sehr alte Geräte mit einem Softwarereferenz Decodierer sind."
+AMF.H264.MaximumAccessUnitSize="Maximale Zugriffseinheitsgröße"
+AMF.H264.MaximumAccessUnitSize.Description="Größte Größe einer Zugriffseinheit für einen NAL. Ein Wert von 0 erlaubt es dem Codierer die beste Größte zu wählen."
+AMF.H264.KeyframeInterval="Schlüsselbilderintervall"
+AMF.H264.KeyframeInterval.Description="Wie viele Sekunden sollen zwischen nicht-auslassbaren Bildern sein.\nKontrolliert auf die Größe einer Sequenz (GOP)."
+AMF.H264.IDRPeriod="IDR Zeitraum"
+AMF.H264.IDRPeriod.Description="Wie viele Bilder sollen zwischen nicht-auslassbaren Bildern sein.\nKontrolliert auf die Größe einer Sequenz (GOP)."
+AMF.H264.HeaderInsertionSpacing="Dateikopfeinfügungsabstand"
+AMF.H264.HeaderInsertionSpacing.Description="Wie viele Bilder zwischen NAL-kopfzeilen sein sollen. Es wird nicht empfohlen dies von 0 (automatisch) zu ändern."
 AMF.H264.BPicture.Pattern="B-Bild Muster"
+AMF.H264.BPicture.Pattern.Description="Wie viele B-Bilder sollen erlaubt sein für das codieren. Dies hat einen positiven Einfluss auf Qualität und einen negativen Einfluss auf Performanz.\nWird nur von der 2. und 3. Generation an VCE-Karten unterstützt."
 AMF.H264.BPicture.Reference="B-Bild Referenz"
-AMF.H264.GOPSize="GOP Größe"
+AMF.H264.BPicture.Reference.Description="Erlaube B-Bilder andere B-Bilder zu verwenden.\nSehr großer Einfluss auf Performanz, wenig Einfluss auf Qualität."
+AMF.H264.DeblockingFilter="Entblockungsfilter"
+AMF.H264.DeblockingFilter.Description="Setze die Markierung dass der Decodierer einen Entblockungsfilter verwenden darf."
+AMF.H264.SlicesPerFrame="Slices pro Frame"
+AMF.H264.SlicesPerFrame.Description="Benutze eine feste anzahl an Schnitten anstatt einer dynamischen für das codieren.\nKann mit größeren Auflösungen und Frameraten helfen da dies dem Codierer erlaubt mehr Daten mit dem selben Profil-level zu speichern, hat aber oft einen negativen Effekt auf die Qualität."
+AMF.H264.IntraRefreshNumMBsPerSlot="Intra-Refresh Anzahl der Makroblöcke pro Slot"
+AMF.H264.IntraRefreshNumMBsPerSlot.Description="Wie viele Makroblöcke sollen pro Slot in der Intra-Refresh-Kodierung erlaubt sein?\nIntra-Refresh-Kodierung erlaubt schnelleres Durchsuchen und decodieren auf Kosten einer höheren Bitrate, da zusätzliche Daten gespeichert werden.\nBeim Streamen auf der Standardeinstellung lassen."
+AMF.H264.ScanType="Abtastverfahren"
+AMF.H264.ScanType.Description="Welches Abtastverfahren verwendet werden soll. Sollte immer 'Progressiv' sein."
+AMF.H264.ScanType.Progressive="Progressiv"
+AMF.H264.ScanType.Interlaced="Zeilensprung"
+AMF.H264.QualityPreset="Qualitätsvoreinstellung"
+AMF.H264.QualityPreset.Description="Welche Qualitätsvoreinstellungen AMF versuchen soll zu verwenden:\n- 'Geschwindigkeit' ist der schnellste aber hat die schlechteste Qualität,\n- 'Balanciert' ist zwischen 'Geschwindigkeit' und 'Qualität' und ergibt eine großartige balance zwischen beiden,\n- 'Qualität' gibt die beste Qualität für eine gegebene bitrate."
+AMF.H264.QualityPreset.Speed="Geschwindigkeit"
+AMF.H264.QualityPreset.Balanced="Ausgeglichen"
+AMF.H264.QualityPreset.Quality="Qualität"
+AMF.H264.MotionEstimation="Bewegungsschätzung"
+AMF.H264.MotionEstimation.Description="Bewegungsschätzung erlaubt des dem Codierer die gebrauchte Bitrate zu reduzieren durch das herausfinden wo ein Pixel hinbewegt wurde."
+AMF.H264.MotionEstimation.None="Keine"
+AMF.H264.MotionEstimation.Half="Halb-Pixel"
+AMF.H264.MotionEstimation.Quarter="Viertel-Pixel"
+AMF.H264.MotionEstimation.Both="Halb- & Viertel-Pixel"
 AMF.H264.CABAC="Kontextbasierende adaptive Binäre Arithmetische Kodierung (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing"
+AMF.H264.CABAC.Description="Benutze CABAC (Kontextbasierende Adaptive Binäre Arithmetische Kodierung) anstatt von CALV.\nKein Einfluss auf Qualität aber hilft bei der Kompression. Im Durschnitt ist eine Verbesserung von 5% zu erwarten."
 AMF.H264.MemoryType="Speichertyp"
-AMF.H264.ComputeType="Compute Typ"
+AMF.H264.MemoryType.Description="Wie sollen Bilder bevor der Übertragung zum Codierer gespeichert werden:\n- 'Automatisch' wählt die beste verfügbare Speicher-methode aus,\n- Host verwendet Ram,\n- DirectX 9 verwendet DirectX Texturflächen,\n- DirectX 11 verwendet DirectX Texturflächen,\n- OpenGL verwendet OpenGL Texturflächen.\n\nHost ist gut genug für die meisten Systeme, aber DirectX kann gelegentlich bei hoher Last helfen."
+AMF.H264.Device="Gerät"
+AMF.H264.Device.Description="Welches Gerät für das codieren verwendet werden soll.\nBenötigt einen anderen Speichertyp als 'Host'."
+AMF.H264.UseOpenCL="Benutze OpenCL"
+AMF.H264.UseOpenCL.Description="Soll OpenCL verwendet werden um Einzelbilder zum Codierer zu senden?"
 AMF.H264.SurfaceFormat="Oberflächenformat"
-
-AMF.H264Advanced.Name="H264 Encoder [Erweitert] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Zurücksetzen auf Standard"
-AMF.H264Advanced.Update="Werte aus AMF lesen (Sofern diese auf Standard/-1 sind)"
-AMF.H264Advanced.MaxLTRFrames="Maximale LTR Bilder"
-AMF.H264Advanced.VBVBuffer.Size="VBV Puffergröße (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Anfängliche VBV Pufferfüllung"
-AMF.H264Advanced.MaxAUSize="Maximale AU Größe (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Kopfzeileneinfügungsabstand (Bilder)"
-AMF.H264Advanced.IDRPeriod="Schlüsselbild Periode (Bilder)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory Per Slot In Macroblocks (in MB)"
-AMF.H264Advanced.SlicesPerFrame="Slices pro Frame"
-AMF.H264Advanced.MotionEstimation="Bewegungsschätzung"
-AMF.H264Advanced.MotionEstimation.None="Keine"
-AMF.H264Advanced.MotionEstimation.Half="Nur Halb-Pixel"
-AMF.H264Advanced.MotionEstimation.Quarter="Nur Viertel-Pixel"
-AMF.H264Advanced.MotionEstimation.Both="Beide"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Preset"
-AMF.H264Simple.Preset.Recording="Aufnahme"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="Hohe Qualität"
-AMF.H264Simple.Preset.Indistinguishable="Ununterscheidbar"
-AMF.H264Simple.Preset.Lossless="Verlustfrei"
-AMF.H264Simple.KeyframeInterval="Keyframe Periode (Sekunden)"
-AMF.H264Simple.UseCustomBufferSize="Verwende benutzerdefinierte Puffergröße"
-AMF.H264Simple.CustomBufferSize="Puffergröße (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Anfängliche Pufferfüllung"
-AMF.H264Simple.UseCustomGOPSize="Benutzerdefinierte GOP Größe"
-AMF.H264Simple.ShowAdvancedParameters="Zeige Erweiterte Parameter"
-AMF.H264Simple.ShowExpertParameters="Expertenparameter anzeigen"
-
+AMF.H264.SurfaceFormat.Description="Welches Oberflächenformat für das Codieren verwendet werden soll.\nNur NV12 wird nativ unterstützt, alle anderen müssen konvertiert werden."
+AMF.H264.View="Ansichtsmodus"
+AMF.H264.View.Description="Welche Einstellungen sichtbar sein sollen. Hilfe mit Einstellungen wird abgelehnt sofern 'Experte' oder 'Meister' als Ansichtsmodus verwendet wird."
+AMF.H264.View.Basic="Grundlegend"
+AMF.H264.View.Advanced="Erweitert"
+AMF.H264.View.Expert="Experte"
+AMF.H264.View.Master="Meister"
+AMF.H264.UnlockProperties="Entsperre Einstellungen"
+AMF.H264.UnlockProperties.Description="Entsperre einige Einstellungen so dass diese die volle Reichweite haben anstatt nur eine begrenzte."
+AMF.H264.Debug="Debug"
+AMF.H264.Debug.Description="Aktiviere erweiterte debug nachrichten, sollte aktiv sein wenn man Hilfe erwartet mit diesem encoder."
 AMF.Util.Default="Standard"
 AMF.Util.Automatic="Automatisch"
-AMF.Util.Toggle.Disabled="Aus"
-AMF.Util.Toggle.Enabled="An"
-
+AMF.Util.Manual="Manuell"
+AMF.Util.Toggle.Disabled="Deaktiviert"
+AMF.Util.Toggle.Enabled="Aktiviert"

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/el-GR.ini Added

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/en-US.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/en-US.ini Changed

@@ -1,82 +1,121 @@
-# Shared
-AMF.H264.Usage="Usage Type"
+# Presets
+AMF.H264.Preset="Preset"
+AMF.H264.Preset.Recording="Recording"
+AMF.H264.Preset.HighQuality="High Quality"
+AMF.H264.Preset.Indistinguishable="Indistinguishable"
+AMF.H264.Preset.Lossless="Lossless"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+# Static Properties
+AMF.H264.Usage="Usage"
+AMF.H264.Usage.Description="What usage AMF should be tuned for:\n- 'Transcoding' is general purpose transcoding (recommended),\n- 'Ultra Low Latency' is for really low latency encoding,\n- 'Low Latency' is similar to above with a slightly higher latency.\nStreaming only supports 'Transcoding', all other values can be used for recording."
 AMF.H264.Usage.Transcoding="Transcoding"
 AMF.H264.Usage.UltraLowLatency="Ultra Low Latency"
 AMF.H264.Usage.LowLatency="Low Latency"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Quality Preset"
-AMF.H264.QualityPreset.Speed="Speed"
-AMF.H264.QualityPreset.Balanced="Balanced"
-AMF.H264.QualityPreset.Quality="Quality"
 AMF.H264.Profile="Profile"
+AMF.H264.Profile.Description="Which H.264 Profile to use for encoding:\n- 'Baseline' has the widest support,\n- 'Main' is supported by 95% of devices (recommended),\n- 'High' is only supported by high-end devices."
 AMF.H264.ProfileLevel="Profile Level"
+AMF.H264.ProfileLevel.Description="Which H.264 Profile Level to use for encoding:\n- 'Automatic' calculates the best profile level for the given Frame Rate and Frame Size,\n- '4.1' supports 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' supports 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' supports 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' supports 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' supports 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Maximum LTR Frames"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) Frames are a feature that allows the encoder to flag certain frames in a sequence as referencable.\nThis can have a positive effect on quality when B-Pictures are not support or wanted.\nLTR Frames can't be used with B-Pictures and the encoder will disable B-Pictures if these are used."
+# Rate Control Properties
 AMF.H264.RateControlMethod="Rate Control Method"
+AMF.H264.RateControlMethod.Description="What rate control method should be used:\n- CQP assigns fixed I-/P-/B-Frame QP (Quantization Parameter) values,\n- CBR stays at the given Target Bitrate (using Filler Data) (recommended for streaming),\n- VBR stays below the given Peak Bitrate,\n- VBR_LAT stays close to the Target Bitrate if GPU latency and load allow for it, otherwise will use higher bitrate (recommended for recording).\nAll Methods but CQP use Minimum and Maximum QP (Quantization Parameter) constraints."
 AMF.H264.RateControlMethod.CQP="Constant QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Constant Bitrate (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="Variable Bitrate (Peak Constrained) (VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="Variable Bitrate (Latency Constrained) (VBR_LAT)"
 AMF.H264.Bitrate.Target="Target Bitrate"
+AMF.H264.Bitrate.Target.Description="Bitrate to attempt to achieve in the overall sequence.\nUsed by CBR and VBR_LAT."
 AMF.H264.Bitrate.Peak="Peak Bitrate"
+AMF.H264.Bitrate.Peak.Description="Bitrate to attempt to maximally peak to in the overall sequence.\nUsed by VBR and VBR_LAT."
 AMF.H264.QP.Minimum="Minimum QP"
+AMF.H264.QP.Minimum.Description="Lowest QP (Quantization Parameter) value to use in a frame.\nUsed by CBR, VBR and VBR_LAT."
 AMF.H264.QP.Maximum="Maximum QP"
+AMF.H264.QP.Maximum.Description="Highest QP (Quantization Parameter) value to use in a frame.\nUsed by CBR, VBR and VBR_LAT."
 AMF.H264.QP.IFrame="I-Frame QP"
+AMF.H264.QP.IFrame.Description="Fixed QP (Quantization Parameter) value to use for I-Frames.\nLower = Bigger File, Better Quality. Higher = Smaller File, Worse Quality.\nI-Frame QP should be at or higher than P- and B-Frame QP.\nUsed by CQP."
 AMF.H264.QP.PFrame="P-Frame QP"
+AMF.H264.QP.PFrame.Description="Fixed QP (Quantization Parameter) value to use for P-Frames.\nLower = Bigger File, Better Quality. Higher = Smaller File, Worse Quality.\nP-Frame QP should be at or higher than B-Frame QP.\nUsed by CQP."
 AMF.H264.QP.BFrame="B-Frame QP"
+AMF.H264.QP.BFrame.Description="Fixed QP (Quantization Parameter) value to use for B-Frames.\nLower = Bigger File, Better Quality. Higher = Smaller File, Worse Quality.\nUsed by CQP."
 AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
+AMF.H264.QP.BPictureDelta.Description="Delta QP (Quantization Parameter) value to the last non-reference B-Picture."
 AMF.H264.QP.ReferenceBPictureDelta="Reference B-Picture Delta QP"
+AMF.H264.QP.ReferenceBPictureDelta.Description="Delta QP (Quantization Parameter) value to the last reference B-Picture."
+AMF.H264.VBVBuffer="VBV Buffer"
+AMF.H264.VBVBuffer.Description="What method should be used to determine the VBV Buffer Size:\n- 'Automatic' calculates the size using a strictness constraint,\n- 'Manual' allows the user to control the size.\nVBV (Video Buffering Verifier) Buffer is used by certain Rate Control Methods to keep the overall bitrate within the given constraints."
+AMF.H264.VBVBuffer.Strictness="VBV Buffer Strictness"
+AMF.H264.VBVBuffer.Strictness.Description="How strict the VBV Buffer is, with 100% being almost exactly the targetted Bitrate and 0% being unrestricted."
+AMF.H264.VBVBuffer.Size="VBV Buffer Size"
+AMF.H264.VBVBuffer.Size.Description="The size of the VBV Buffer which is used for Bitrate control in a sequence.\nA small size results in an almost perfect bitrate match but has a larger performance impact.\nThe ideal (100% strict) VBV Buffer size is Bitrate/Framerate."
+AMF.H264.VBVBuffer.Fullness="VBV Buffer Fullness"
+AMF.H264.VBVBuffer.Fullness.Description="How full the VBV Buffer initially is, will only affect the initial sequence of encoding."
 AMF.H264.FillerData="Filler Data"
+AMF.H264.FillerData.Description="Filler Data is empty/invalid data that the decoder ignores.\nIf enabled and using CBR the encoder will fill up the remaining space in a sequence up with this data."
 AMF.H264.FrameSkipping="Frame Skipping"
+AMF.H264.FrameSkipping.Description="Frame Skipping allows the encoder to selectively skip over frames if they are very similar or would take too long to encode.\nEnabling this will make the output file be in variable framerate, which most editing software does not support."
 AMF.H264.EnforceHRDCompatibility="Enforce HRD Compatibility"
+AMF.H264.EnforceHRDCompatibility.Description="Enforce Hypothetical Reference Decoder restrictions which limit the maximum QP value change within a frame.\nNot recommended for recording or streaming and should only be used for targeting very old devices that only have reference software decoders."
+AMF.H264.MaximumAccessUnitSize="Maximum Access Unit Size"
+AMF.H264.MaximumAccessUnitSize.Description="Largest Size of an Access Unit for a NAL. A value of 0 allows the encoder to pick the best one."
+# Picture Control Properties
+AMF.H264.KeyframeInterval="Keyframe Interval"
+AMF.H264.KeyframeInterval.Description="How many seconds should be between non-droppable Frames.\nAlso controls sequence(GOP) size."
+AMF.H264.IDRPeriod="IDR Period"
+AMF.H264.IDRPeriod.Description="How many frames should be between non-droppable Frames.\nAlso controls sequence(GOP) size."
+AMF.H264.HeaderInsertionSpacing="Header Insertion Spacing"
+AMF.H264.HeaderInsertionSpacing.Description="How many frames should be between NAL headers. It is not recommended to change this from 0 (automatic)."
+AMF.H264.BPicture.Pattern="B-Picture Pattern"
+AMF.H264.BPicture.Pattern.Description="How many B-Pictures should be allowed for encoding, has a positive impact on quality and negative impact on performance.\nSupported by 2nd and 3rd Generation VCE cards."
+AMF.H264.BPicture.Reference="B-Picture Reference"
+AMF.H264.BPicture.Reference.Description="Allow B-Pictures to reference other B-Pictures additionally to P- and I-Frames.\nHuge performance impact, low quality improvement."
 AMF.H264.DeblockingFilter="Deblocking Filter"
+AMF.H264.DeblockingFilter.Description="Sets the flag that the decoder is allowed to use a Deblocking Filter for the encoded stream."
+AMF.H264.SlicesPerFrame="Slices Per Frame"
+AMF.H264.SlicesPerFrame.Description="Use fixed slice encoding instead of dynamic slice encoding.\nCan help with large resolutions and framerates as it allows for more data to be stored in the same profile level but will have a negative effect on quality most of the time."
+AMF.H264.IntraRefreshNumMBsPerSlot="Intra-Refresh Number of Macroblocks Per Slot"
+AMF.H264.IntraRefreshNumMBsPerSlot.Description="How many Macroblocks should be allowed per slot in Intra-Refresh encoding.\nIntra-Refresh encoding allows faster seeking and decoding at the cost of a higher bitrate due to additional data being stored.\nLeave at default for streaming."
+# Miscellaneous Properties
 AMF.H264.ScanType="Scan Type"
+AMF.H264.ScanType.Description="Which scanning method to use, always leave this on 'Progressive'."
 AMF.H264.ScanType.Progressive="Progressive"
 AMF.H264.ScanType.Interlaced="Interlaced"
-AMF.H264.BPicture.Pattern="B-Picture Pattern"
-AMF.H264.BPicture.Reference="B-Picture Reference"
-AMF.H264.GOPSize="GOP Size"
-AMF.H264.CABAC="Context Adaptive Binary Arithmetic Coding (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing"
+AMF.H264.QualityPreset="Quality Preset"
+AMF.H264.QualityPreset.Description="What Quality Preset AMF should attempt to target:\n- 'Speed' is the fastest but has the worst quality,\n- 'Balanced' is between 'Speed' and 'Quality' and offers a great balance between both,\n- 'Quality' gives the best quality for a given bitrate."
+AMF.H264.QualityPreset.Speed="Speed"
+AMF.H264.QualityPreset.Balanced="Balanced"
+AMF.H264.QualityPreset.Quality="Quality"
+AMF.H264.MotionEstimation="Motion Estimation"
+AMF.H264.MotionEstimation.Description="Motion Estimation allows the encoder to reduce needed bitrate by estimating where a pixel went."
+AMF.H264.MotionEstimation.None="None"
+AMF.H264.MotionEstimation.Half="Half-Pixel"
+AMF.H264.MotionEstimation.Quarter="Quarter-Pixel"
+AMF.H264.MotionEstimation.Both="Half- & Quarter-Pixel"
+AMF.H264.CABAC="CABAC"
+AMF.H264.CABAC.Description="Use CABAC (Context Adaptive Binary Arithmetic Coding) instead of CALV.\nNo impact on Quality but helps with compression. On average, 5% better compression can be expected."
+# System Properties
 AMF.H264.MemoryType="Memory Type"
-AMF.H264.ComputeType="Compute Type"
+AMF.H264.MemoryType.Description="How Frames should be stored before submission to the encoder:\n- 'Automatic' picks the best available memory backend type available,\n- Host uses system memory,\n- DirectX 9 uses DirectX surfaces for submission,\n- DirectX 11 uses DirectX surfaces for submission,\n- OpenGL uses OpenGL surfaces for submission.\n\n'Host' is good enough for most systems but DirectX can occasionally help with high load situations."
+AMF.H264.Device="Device"
+AMF.H264.Device.Description="Which Device to use for encoding.\nRequires Memory Type to not be set to 'Host'."
+AMF.H264.UseOpenCL="Use OpenCL"
+AMF.H264.UseOpenCL.Description="Should the Encoder use OpenCL to submit the individual frames?"
 AMF.H264.SurfaceFormat="Surface Format"
-
-# Advanced Interface
-AMF.H264Advanced.Name="H264 Encoder [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Reset to Defaults"
-AMF.H264Advanced.Update="Update Values from AMF (if at default/-1)"
-AMF.H264Advanced.MaxLTRFrames="Maximum LTR Frames"
-AMF.H264Advanced.VBVBuffer.Size="VBV Buffer Size (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Initial VBV Buffer Fullness"
-AMF.H264Advanced.MaxAUSize="Maximum AU Size (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="Keyframe Period (Frames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory Per Slot In Macroblocks (in MB)"
-AMF.H264Advanced.SlicesPerFrame="Slices Per Frame"
-AMF.H264Advanced.MotionEstimation="Motion Estimation"
-AMF.H264Advanced.MotionEstimation.None="None"
-AMF.H264Advanced.MotionEstimation.Half="Only Half-Pixel"
-AMF.H264Advanced.MotionEstimation.Quarter="Only Quarter-Pixel"
-AMF.H264Advanced.MotionEstimation.Both="Both"
-
-# Simple Interface
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Preset"
-AMF.H264Simple.Preset.Recording="Recording"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="High Quality"
-AMF.H264Simple.Preset.Indistinguishable="Indistinguishable"
-AMF.H264Simple.Preset.Lossless="Lossless"
-AMF.H264Simple.KeyframeInterval="Keyframe Interval (Seconds)"
-AMF.H264Simple.UseCustomBufferSize="Use Custom Buffer Size"
-AMF.H264Simple.CustomBufferSize="Buffer Size (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Initial Buffer Fullness"
-AMF.H264Simple.UseCustomGOPSize="Use Custom GOP Size"
-AMF.H264Simple.ShowAdvancedParameters="Show Advanced Parameters"
-AMF.H264Simple.ShowExpertParameters="Show Expert Parameters"
-
+AMF.H264.SurfaceFormat.Description="What Surface Format to use for encoding.\nOnly NV12 is natively supported, other types require conversion."
+AMF.H264.View="View Mode"
+AMF.H264.View.Description="What properties should be visible.  You will receive no support when using 'Expert' or 'Master' view mode."
+AMF.H264.View.Basic="Basic"
+AMF.H264.View.Advanced="Advanced"
+AMF.H264.View.Expert="Expert"
+AMF.H264.View.Master="Master"
+AMF.H264.UnlockProperties="Unlock Properties"
+AMF.H264.UnlockProperties.Description="Unlock certain properties to their full range instead of limiting them to a partial range."
+AMF.H264.Debug="Debug"
+AMF.H264.Debug.Description="Enable additional Debug logging, should be active whenever you need support with this encoder."
 # Utility
 AMF.Util.Default="Default"
 AMF.Util.Automatic="Automatic"
+AMF.Util.Manual="Manual"
 AMF.Util.Toggle.Disabled="Disabled"
 AMF.Util.Toggle.Enabled="Enabled"
\ No newline at end of file

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/es-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/es-ES.ini Changed

@@ -1,18 +1,22 @@
-AMF.H264.Usage="Tipo de uso"
+AMF.H264.Preset="Preajuste"
+AMF.H264.Preset.Recording="Grabación"
+AMF.H264.Preset.HighQuality="Alta Calidad"
+AMF.H264.Preset.Indistinguishable="Indistinguible"
+AMF.H264.Preset.Lossless="Sin pérdidas"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Uso"
 AMF.H264.Usage.Transcoding="Codificación"
 AMF.H264.Usage.UltraLowLatency="Latencia ultra baja"
 AMF.H264.Usage.LowLatency="Latencia baja"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Calidad del perfil"
-AMF.H264.QualityPreset.Speed="Velocidad"
-AMF.H264.QualityPreset.Balanced="Equilibrado"
-AMF.H264.QualityPreset.Quality="Calidad"
 AMF.H264.Profile="Perfil del Códec"
 AMF.H264.ProfileLevel="Nivel del Perfil"
+AMF.H264.ProfileLevel.Description="Nivel de perfil H.264 a utilizar para la codificación:\n- 'Automático' calcula el mejor nivel de perfil para cierta velocidad y tamaño de fotogramas,\n- '4.1' soporta 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' soporta 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' soporta 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' soporta 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' soporta 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Fotogramas LTR máximos"
 AMF.H264.RateControlMethod="Método de control del flujo"
 AMF.H264.RateControlMethod.CQP="QP constante (CQP)"
 AMF.H264.RateControlMethod.CBR="Flujo constante (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Flujo variable (pico restringido)(VBR)"
+AMF.H264.RateControlMethod.VBR.Peak="Flujo variable (pico restringido) (VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="Flujo variable (latencia restringida) (VBR_LAT)"
 AMF.H264.Bitrate.Target="Tasa de bits deseada"
 AMF.H264.Bitrate.Peak="Pico de tasa de bits"
@@ -22,58 +26,54 @@
 AMF.H264.QP.PFrame="P-Frame QP"
 AMF.H264.QP.BFrame="B-Frame QP"
 AMF.H264.QP.BPictureDelta="QP Delta en B-Pictures"
-AMF.H264.QP.ReferenceBPictureDelta="Referencia B-Picture Delta QP"
+AMF.H264.QP.BPictureDelta.Description="QP Delta del último B-Picture que no es de referencia."
+AMF.H264.QP.ReferenceBPictureDelta="QP Delta en B-Pictures de referencia"
+AMF.H264.QP.ReferenceBPictureDelta.Description="QP Delta del último B-Picture de referencia."
+AMF.H264.VBVBuffer="Buffer VBV"
+AMF.H264.VBVBuffer.Strictness="Estricticidad del Buffer VBV"
+AMF.H264.VBVBuffer.Size="Tamaño de buffer VBV"
+AMF.H264.VBVBuffer.Fullness="Amplitud del Buffer VBV"
 AMF.H264.FillerData="Datos de relleno"
 AMF.H264.FrameSkipping="Omisión de fotogramas"
 AMF.H264.EnforceHRDCompatibility="Forzar compatibilidad con HRD"
-AMF.H264.DeblockingFilter="Filtro de desbloqueo"
+AMF.H264.MaximumAccessUnitSize="Tamaño máximo de la unidad de acceso"
+AMF.H264.KeyframeInterval="Intervalo de fotogramas clave"
+AMF.H264.IDRPeriod="Periodo IDR"
+AMF.H264.HeaderInsertionSpacing="Espaciado de inserción de cabeceras (Frames)"
+AMF.H264.BPicture.Pattern="Patron de B-Pictures"
+AMF.H264.BPicture.Reference="B-Pictures de referencia"
+AMF.H264.DeblockingFilter="Filtro de eliminación de bloques"
+AMF.H264.SlicesPerFrame="Porciones por fotograma"
+AMF.H264.IntraRefreshNumMBsPerSlot="Numero de macrobloques intra-refresh por Slot"
 AMF.H264.ScanType="Tipo de escaneo"
 AMF.H264.ScanType.Progressive="Progresivo"
 AMF.H264.ScanType.Interlaced="Entrelazado"
-AMF.H264.BPicture.Pattern="Patron de B-Pictures"
-AMF.H264.BPicture.Reference="Referencia de B-Pictures"
-AMF.H264.GOPSize="Tamaño del GOP"
+AMF.H264.QualityPreset="Calidad del perfil"
+AMF.H264.QualityPreset.Speed="Velocidad"
+AMF.H264.QualityPreset.Balanced="Equilibrado"
+AMF.H264.QualityPreset.Quality="Calidad"
+AMF.H264.MotionEstimation="Estimación de movimiento"
+AMF.H264.MotionEstimation.Description="Estimación de movimiento permite al codificador reducir el flujo de datos necesario estimando de donde vienen los pixeles."
+AMF.H264.MotionEstimation.None="Ninguno"
+AMF.H264.MotionEstimation.Half="Mitad de Pixel"
+AMF.H264.MotionEstimation.Quarter="Cuarto de Pixel"
+AMF.H264.MotionEstimation.Both="Mitad y cuarto de Pixel"
 AMF.H264.CABAC="Codificación adaptativa según el contexto binario aritmético (CABAC)"
-AMF.H264.DebugTracing="Seguimiento de depuración"
+AMF.H264.CABAC.Description="Usar CABAC (Codificación aritmética binaria adaptable al contexto) en vez de CALV.\nNo afecta a la calidad pero ayuda en la compresión. De media, podemos esperar un 5% mejor compersión."
 AMF.H264.MemoryType="Tipo de memoria"
-AMF.H264.ComputeType="Tipo de computación"
 AMF.H264.SurfaceFormat="Formato de la superficie"
-
-AMF.H264Advanced.Name="H264 Encoder [Avanzado] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Restablecer por defecto"
-AMF.H264Advanced.Update="Actualizar valores desde AMF (si por defecto/-1)"
-AMF.H264Advanced.MaxLTRFrames="Fotogramas máximos LTR"
-AMF.H264Advanced.VBVBuffer.Size="Tamaño del buffer VBV (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Amplitud del Buffer VBV"
-AMF.H264Advanced.MaxAUSize="Tamaño máximo de AU (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="Periodo IDR de fotogramas clave (en Frames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Tamaño de Memoria Intra-Refresh en Macrobloques (en MB)"
-AMF.H264Advanced.SlicesPerFrame="Porciones por Frame"
-AMF.H264Advanced.MotionEstimation="Estimación de movimiento"
-AMF.H264Advanced.MotionEstimation.None="Ninguno"
-AMF.H264Advanced.MotionEstimation.Half="Solo la mitad"
-AMF.H264Advanced.MotionEstimation.Quarter="Solo un cuarto"
-AMF.H264Advanced.MotionEstimation.Both="Ambos"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Ajustes Preestablecidos"
-AMF.H264Simple.Preset.Recording="Grabación"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="Alta Calidad"
-AMF.H264Simple.Preset.Indistinguishable="Indistinguible"
-AMF.H264Simple.Preset.Lossless="Sin pérdidas"
-AMF.H264Simple.KeyframeInterval="Intervalo de Fotogramas Clave (Segundos)"
-AMF.H264Simple.UseCustomBufferSize="Usar tamaño de buffer personalizado"
-AMF.H264Simple.CustomBufferSize="Tamaño del buffer (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Amplitud del Buffer inicial"
-AMF.H264Simple.UseCustomGOPSize="Usar tamaño del GOP personalizado"
-AMF.H264Simple.ShowAdvancedParameters="Mostrar parámetros avanzados"
-AMF.H264Simple.ShowExpertParameters="Mostrar Parametros para Expertos"
-
+AMF.H264.View="Modo de Vista"
+AMF.H264.View.Description="Que propiedades deben ser visibles. No recibirás soporte si usas el modo de vista 'Experto' o 'Maestro'."
+AMF.H264.View.Basic="Básico"
+AMF.H264.View.Advanced="Avanzado"
+AMF.H264.View.Expert="Experto"
+AMF.H264.View.Master="Maestro"
+AMF.H264.UnlockProperties="Desbloquear propiedades"
+AMF.H264.UnlockProperties.Description="Desbloquea ciertas propiedades a su maxima capacidad en lugar de limitarlas de forma parcial."
+AMF.H264.Debug="Depurar"
+AMF.H264.Debug.Description="Habilita el registro de información de depuración adicional, debe ser activado cuando necesites ayuda con este codificador."
 AMF.Util.Default="Por defecto"
 AMF.Util.Automatic="Automático"
+AMF.Util.Manual="Manual"
 AMF.Util.Toggle.Disabled="Deshabilitado"
 AMF.Util.Toggle.Enabled="Habilitado"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/eu-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/eu-ES.ini Changed

@@ -1,14 +1,21 @@
-AMF.H264.Usage="Erabilera"
+AMF.H264.Preset="Aurrezarrita"
+AMF.H264.Preset.Recording="Grabatzen"
+AMF.H264.Preset.HighQuality="Kalitate handia"
+AMF.H264.Preset.Indistinguishable="Sumaezina"
+AMF.H264.Preset.Lossless="Galerarik gabe"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Erabilpena"
+AMF.H264.Usage.Description="AMFrentzat zer erabilerak aukeratu behar dira:\n- 'Transcoding' oro har proposatzen da transmisiorako (gomendatua),\n- 'Ultra Low Latency' latentzia oso baxuko kodetzerako,\n- 'Low Latency' aurrekoaren antzekoa da latentzia apur bat handiagoarekin.\nStreaming bakarrik onartzen du 'Transcoding', gainerako balio guztiak erabili daitezke grabaziorako."
 AMF.H264.Usage.Transcoding="Kodeketa"
 AMF.H264.Usage.UltraLowLatency="Latentzia oso txikia"
 AMF.H264.Usage.LowLatency="Latentzia txikia"
-AMF.H264.Usage.Webcam="Web-kamera"
-AMF.H264.QualityPreset="Aurrezarritako kalitatea"
-AMF.H264.QualityPreset.Speed="Abiadura"
-AMF.H264.QualityPreset.Balanced="Orekatua"
-AMF.H264.QualityPreset.Quality="Kalitatea"
 AMF.H264.Profile="Profila"
+AMF.H264.Profile.Description="Zein H.264 profila erabili kodetzeko:\n- 'Baseline' dauka soporterik zabalena,\n- 'Main' gailuen %95ak onartzen du (gomendatua),\n- 'High' bakarrik gama handiko gailuek onartzen dute."
 AMF.H264.ProfileLevel="Profilaren maila"
+AMF.H264.ProfileLevel.Description="H.264 profilaren zein maila erabili behar da kodetzeko:\n- 'Automatic' automatikoki kalkulatzen du emandako abiadura eta fotogramen tamainarako egokiena,\n- '4.1'-ek onartzen du 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2'-k onartzen du 1920x1080 60FPS, 1280x720 120FPS\n- '5.0'-k onartzen du 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1'-k onartzen du 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2'-k onartzen du 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Gehienezko LTR fotogramak"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) Fotogramak aukera ematen dio kodegailuari sekuentzia baten hainbat fotograma erreferente moduan markatzeko.\nHonek kalitatean eragin positiboa izan dezake B-Pictures onartzen ez direnean.\nLTR Fotogramak ezin dira B-Pictures-ekin erabili eta kodegailuak B-Pictures-ak desgaituko ditu hauek erabiltzean."
 AMF.H264.RateControlMethod="Emaria kontrolatzeko metodoa"
 AMF.H264.RateControlMethod.CQP="Konstantea QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Bit emari konstantea (CBR)"
@@ -23,53 +30,46 @@
 AMF.H264.QP.BFrame="B-Frame QP"
 AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
 AMF.H264.QP.ReferenceBPictureDelta="B-Picture Delta QP erreferentzia"
+AMF.H264.VBVBuffer="VBV bufferra"
+AMF.H264.VBVBuffer.Strictness="VBV bufferraren zorroztasuna"
+AMF.H264.VBVBuffer.Size="VBV bufferraren tamaina"
+AMF.H264.VBVBuffer.Fullness="VBV bufferraren betetasuna"
 AMF.H264.FillerData="Datu betegarria"
 AMF.H264.FrameSkipping="Fotogramen saltoa"
 AMF.H264.EnforceHRDCompatibility="Behartu HRD bateragarritasuna"
+AMF.H264.MaximumAccessUnitSize="Sarbide unitatearen gehienezko tamaina"
+AMF.H264.KeyframeInterval="Gako fotogramen tartea"
+AMF.H264.IDRPeriod="IDR periodoa"
+AMF.H264.HeaderInsertionSpacing="Goiburuak txertatzeko tartea"
+AMF.H264.BPicture.Pattern="B-Picture eredua"
+AMF.H264.BPicture.Reference="B-Picture erreferentzia"
 AMF.H264.DeblockingFilter="Desblokeoko iragazkia"
+AMF.H264.SlicesPerFrame="Zatiak fotogramako"
+AMF.H264.IntraRefreshNumMBsPerSlot="Makroblokeen barne freskatze kopura erreteneko"
 AMF.H264.ScanType="Eskaneatze mota"
 AMF.H264.ScanType.Progressive="Progresiboa"
 AMF.H264.ScanType.Interlaced="Gurutzelarkatua"
-AMF.H264.BPicture.Pattern="B-Picture eredua"
-AMF.H264.BPicture.Reference="B-Picture erreferentzia"
-AMF.H264.GOPSize="GOP tamaina"
+AMF.H264.QualityPreset="Aurrezarritako kalitatea"
+AMF.H264.QualityPreset.Speed="Abiadura"
+AMF.H264.QualityPreset.Balanced="Orekatua"
+AMF.H264.QualityPreset.Quality="Kalitatea"
+AMF.H264.MotionEstimation="Mugimenduaren estimazioa"
+AMF.H264.MotionEstimation.None="Ezer ez"
+AMF.H264.MotionEstimation.Half="Pixel erdia"
+AMF.H264.MotionEstimation.Quarter="Pixel laurdena"
+AMF.H264.MotionEstimation.Both="Pixel erdia eta laurdena"
 AMF.H264.CABAC="Testuinguru moldakorreko kodeketa bitar aritmetikoa (CABAC)"
-AMF.H264.DebugTracing="Arazketaren segimendua"
 AMF.H264.MemoryType="Memoria mota"
-AMF.H264.ComputeType="Kalkulu mota"
-
-AMF.H264Advanced.Name="H264 kodetzailea [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Berrezarri balio lehenetsiak"
-AMF.H264Advanced.Update="Eguneratu balioak AMFtik (baldin eta lehenetsia/-1)"
-AMF.H264Advanced.MaxLTRFrames="Gehienezko LTR fotogramak"
-AMF.H264Advanced.VBVBuffer.Size="VBV bufferraren tamaina (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Hasierako VBV bufferraren osotasuna"
-AMF.H264Advanced.MaxAUSize="AUren gehienezko tamaina (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Goiburuaren txertaketa espazioa (fotogramak)"
-AMF.H264Advanced.IDRPeriod="Gako fotogramen periodoa (fotogramak)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Erretenen arteko Intra-Refresh memoria makrobloketan (MBak)"
-AMF.H264Advanced.SlicesPerFrame="Zatiak fotogramako"
-AMF.H264Advanced.MotionEstimation="Mugimenduaren estimazioa"
-AMF.H264Advanced.MotionEstimation.None="Ezer ez"
-AMF.H264Advanced.MotionEstimation.Half="Pixel erdia bakarrik"
-AMF.H264Advanced.MotionEstimation.Quarter="Pixel laurdena bakarrik"
-AMF.H264Advanced.MotionEstimation.Both="Biak"
-
-AMF.H264Simple.Name="H264 kodetzailea (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Aurrezarrita"
-AMF.H264Simple.Preset.Recording="Grabatzen"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Fotogramen tartea (segundoak)"
-AMF.H264Simple.UseCustomBufferSize="Erabili buffer tamaina pertsonalizatua"
-AMF.H264Simple.CustomBufferSize="Buffer tamaina (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Hasierako bufferraren osotasuna"
-AMF.H264Simple.UseCustomGOPSize="Erabili GOP tamaina pertsonalizatua"
-AMF.H264Simple.ShowAdvancedParameters="Erakutsi parametro aurreratuak"
-AMF.H264Simple.ShowExpertParameters="Erakutsi adituentzako parametroak"
-
+AMF.H264.SurfaceFormat="Gainazalaren formatua"
+AMF.H264.View="Ikuspegia"
+AMF.H264.View.Basic="Oinarrizkoa"
+AMF.H264.View.Advanced="Aurreratua"
+AMF.H264.View.Expert="Aditu"
+AMF.H264.View.Master="Maixu"
+AMF.H264.UnlockProperties="Desblokeatu propietateak"
+AMF.H264.Debug="Garbiketa"
 AMF.Util.Default="Lehenetsia"
 AMF.Util.Automatic="Automatikoa"
+AMF.Util.Manual="Eskuz"
 AMF.Util.Toggle.Disabled="Ezgaituta"
 AMF.Util.Toggle.Enabled="Gaituta"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/fi-FI.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/fi-FI.ini Changed

@@ -1,12 +1,14 @@
-AMF.H264.Usage="Käyttötyyppi"
+AMF.H264.Preset="Esiasetus"
+AMF.H264.Preset.Recording="Tallennus"
+AMF.H264.Preset.HighQuality="Korkea laatu"
+AMF.H264.Preset.Indistinguishable="Erottamaton"
+AMF.H264.Preset.Lossless="Häviötön"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Käyttö"
 AMF.H264.Usage.Transcoding="Transkoodaus"
 AMF.H264.Usage.UltraLowLatency="Erittäin alhainen latenssi"
 AMF.H264.Usage.LowLatency="Alhainen latenssi"
-AMF.H264.Usage.Webcam="Web-kamera"
-AMF.H264.QualityPreset="Laatuasetus"
-AMF.H264.QualityPreset.Speed="Nopeus"
-AMF.H264.QualityPreset.Balanced="Tasapainotettu"
-AMF.H264.QualityPreset.Quality="Laatu"
 AMF.H264.Profile="Profiili"
 AMF.H264.ProfileLevel="Profiilin taso"
 AMF.H264.RateControlMethod="Rate Control -tapa"
@@ -23,53 +25,35 @@
 AMF.H264.QP.BFrame="B-Frame QP"
 AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
 AMF.H264.QP.ReferenceBPictureDelta="Reference B-Picture Delta QP"
+AMF.H264.VBVBuffer="VBV-puskuri"
+AMF.H264.VBVBuffer.Size="VBV-puskurin koko"
 AMF.H264.FillerData="Täyttödata"
 AMF.H264.FrameSkipping="Ruudun ohitus"
 AMF.H264.EnforceHRDCompatibility="Pakota HRD-yhteensopivuus"
+AMF.H264.BPicture.Pattern="B-Picture Pattern"
+AMF.H264.BPicture.Reference="B-Picture Reference"
 AMF.H264.DeblockingFilter="Deblocking filtteri"
 AMF.H264.ScanType="Skannaustyyppi"
 AMF.H264.ScanType.Progressive="Progressiivinen"
 AMF.H264.ScanType.Interlaced="Lomitettu"
-AMF.H264.BPicture.Pattern="B-Picture Pattern"
-AMF.H264.BPicture.Reference="B-Picture Reference"
-AMF.H264.GOPSize="GOP-koko"
+AMF.H264.QualityPreset="Laatuasetus"
+AMF.H264.QualityPreset.Speed="Nopeus"
+AMF.H264.QualityPreset.Balanced="Tasapainotettu"
+AMF.H264.QualityPreset.Quality="Laatu"
+AMF.H264.MotionEstimation="Liikkeen ennakointi"
+AMF.H264.MotionEstimation.None="Ei mitään"
 AMF.H264.CABAC="Context Adaptive Binary Arithmetic Coding (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing"
 AMF.H264.MemoryType="Memory Type"
-AMF.H264.ComputeType="Compute Type"
-
-AMF.H264Advanced.Name="H264 Encoder [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Palauta oletukset"
-AMF.H264Advanced.Update="Päivitä arvot AMF:stä (jos oletuksena/-1)"
-AMF.H264Advanced.MaxLTRFrames="Maksimi LTR framet"
-AMF.H264Advanced.VBVBuffer.Size="VBV puskurin koko (bitteinä)"
-AMF.H264Advanced.VBVBuffer.Fullness="Initial VBV Buffer Fullness"
-AMF.H264Advanced.MaxAUSize="Maksimi AU koko (bitteinä)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="Keyframe Period (Frames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory Per Slot In Macroblocks (in MB)"
-AMF.H264Advanced.SlicesPerFrame="Slices Per Frame"
-AMF.H264Advanced.MotionEstimation="Liikkeen ennakointi"
-AMF.H264Advanced.MotionEstimation.None="Ei mitään"
-AMF.H264Advanced.MotionEstimation.Half="Vain puoli-pikseli"
-AMF.H264Advanced.MotionEstimation.Quarter="Vain neljännes-pikseli"
-AMF.H264Advanced.MotionEstimation.Both="Molemmat"
-
-AMF.H264Simple.Name="H264-enkooderi (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Esiasetus"
-AMF.H264Simple.Preset.Recording="Tallennus"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Keyframe-väli (sekunteina)"
-AMF.H264Simple.UseCustomBufferSize="Käytä mukautettua puskurin kokoa"
-AMF.H264Simple.CustomBufferSize="Puskurin koko (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Initial Buffer Fullness"
-AMF.H264Simple.UseCustomGOPSize="Käytä mukautettua GOP-kokoa"
-AMF.H264Simple.ShowAdvancedParameters="Näytä edistyneet parametrit"
-AMF.H264Simple.ShowExpertParameters="Show Expert Parameters"
-
+AMF.H264.SurfaceFormat="Surface Format"
+AMF.H264.View="Näyttötila"
+AMF.H264.View.Basic="Yksinkertainen"
+AMF.H264.View.Advanced="Kehittynyt"
+AMF.H264.View.Expert="Expertti"
+AMF.H264.View.Master="Jumalallinen"
+AMF.H264.UnlockProperties="Avaa ominaisuudet"
+AMF.H264.Debug="Debug"
 AMF.Util.Default="Oletusarvo"
 AMF.Util.Automatic="Automaattinen"
+AMF.Util.Manual="Manuaalinen"
 AMF.Util.Toggle.Disabled="Pois käytöstä"
 AMF.Util.Toggle.Enabled="Käytössä"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/fr-FR.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/fr-FR.ini Changed

@@ -1,14 +1,10 @@
-AMF.H264.Usage="Type d’utilisation"
 AMF.H264.Usage.Transcoding="Transcodage"
 AMF.H264.Usage.UltraLowLatency="Très faible latence"
 AMF.H264.Usage.LowLatency="Faible latence"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Préréglages de qualité"
-AMF.H264.QualityPreset.Speed="Vitesse"
-AMF.H264.QualityPreset.Balanced="Equilibré"
-AMF.H264.QualityPreset.Quality="Qualité"
 AMF.H264.Profile="Profil"
 AMF.H264.ProfileLevel="Niveau de profil"
+AMF.H264.ProfileLevel.Description="Quel niveau de profil H.264 utiliser pour l'encodage :\n- \"Automatique\" laisse l'encodeur déterminer le meilleur profil en fonction de la résolution d'image et du nombre d'images par seconde.\n- \"4.1\" supporte les formats suivants : 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- \"4.2\" supporte les formats suivants : 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- \"5.0\" supporte les formats suivants : 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- \"5.1\" supporte les formats suivants : 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- \"5.2\" supporte les formats suivants : 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Maximum de trames LTR"
 AMF.H264.RateControlMethod="Méthode de contrôle du débit"
 AMF.H264.RateControlMethod.CQP="QP constant (CQP)"
 AMF.H264.RateControlMethod.CBR="Débit constant (CBR)"
@@ -22,47 +18,46 @@
 AMF.H264.QP.PFrame="QP P-Frame"
 AMF.H264.QP.BFrame="QP B-Frame"
 AMF.H264.QP.BPictureDelta="QP B-Image Delta"
+AMF.H264.QP.ReferenceBPictureDelta="Delta QP de l'image B de référence"
+AMF.H264.VBVBuffer="Tampon VBV"
+AMF.H264.VBVBuffer.Strictness="Respect du tampon VBV"
+AMF.H264.VBVBuffer.Size="Taille du tampon VBV"
+AMF.H264.VBVBuffer.Fullness="Remplissage du tampon VBV"
 AMF.H264.FillerData="Données de remplissage"
 AMF.H264.FrameSkipping="Saut d'images"
 AMF.H264.EnforceHRDCompatibility="Appliquer la compatibilité avec l'HRD"
+AMF.H264.MaximumAccessUnitSize="Taille max. d'une Access Unit"
+AMF.H264.KeyframeInterval="Intervalle d'images-clé"
+AMF.H264.IDRPeriod="Périodicité des trames IDR"
+AMF.H264.HeaderInsertionSpacing="Intervalle d'insertion de l'en-tête de stream"
+AMF.H264.BPicture.Pattern="Modèle d'image B"
+AMF.H264.BPicture.Reference="Référence d'image B"
 AMF.H264.DeblockingFilter="Filtre de dégroupage"
+AMF.H264.SlicesPerFrame="Tranches par image"
 AMF.H264.ScanType="Balayage"
 AMF.H264.ScanType.Progressive="Progressif"
 AMF.H264.ScanType.Interlaced="Entrelacé"
+AMF.H264.QualityPreset="Préréglages de qualité"
+AMF.H264.QualityPreset.Speed="Vitesse"
+AMF.H264.QualityPreset.Balanced="Equilibré"
+AMF.H264.QualityPreset.Quality="Qualité"
+AMF.H264.MotionEstimation="Estimation de mouvement"
+AMF.H264.MotionEstimation.None="Aucun"
+AMF.H264.MotionEstimation.Half="Demi-pixel"
+AMF.H264.MotionEstimation.Quarter="Quart de pixel"
+AMF.H264.MotionEstimation.Both="Demi-pixel & quart de pixel"
 AMF.H264.CABAC="Codage adaptif (CABAC)"
-AMF.H264.DebugTracing="Traçage de débogage"
-
-AMF.H264Advanced.Name="EncodeurH264 [Avancé] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Valeurs par défaut"
-AMF.H264Advanced.VBVBuffer.Size="Taille de mémoire tampon VBV (bits)"
-AMF.H264Advanced.MaxAUSize="Taille AU maximale (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Intervalle d'insertion de l'en-tête (en Images)"
-AMF.H264Advanced.IDRPeriod="Période d'images clés (cadres)"
-AMF.H264Advanced.SlicesPerFrame="Tranches par image"
-AMF.H264Advanced.MotionEstimation="Estimation de mouvement"
-AMF.H264Advanced.MotionEstimation.None="Aucun"
-AMF.H264Advanced.MotionEstimation.Half="Seulement une moitié de pixel"
-AMF.H264Advanced.MotionEstimation.Quarter="Seulement un quart de pixel"
-AMF.H264Advanced.MotionEstimation.Both="Les deux"
-
-AMF.H264Simple.Name="Encodeur H264 (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Préréglage"
-AMF.H264Simple.Preset.Recording="Enregistrement"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="Haute qualité"
-AMF.H264Simple.Preset.Indistinguishable="Indiscernable"
-AMF.H264Simple.Preset.Lossless="Sans perte"
-AMF.H264Simple.KeyframeInterval="Intervalle des images clés (Secondes)"
-AMF.H264Simple.UseCustomBufferSize="Utiliser une taille de tampon personnalisée"
-AMF.H264Simple.CustomBufferSize="Taille du Buffer (kbit)"
-AMF.H264Simple.CustomBufferFullness="Remplissage initial du tampon"
-AMF.H264Simple.UseCustomGOPSize="Utiliser une taille GOP personnalisée"
-AMF.H264Simple.ShowAdvancedParameters="Afficher les paramètres avancés"
-AMF.H264Simple.ShowExpertParameters="Afficher les paramètres d'expert"
-
+AMF.H264.MemoryType="Type de mémoire"
+AMF.H264.SurfaceFormat="Format de la surface"
+AMF.H264.View="Mode de visualisation"
+AMF.H264.View.Basic="Basique"
+AMF.H264.View.Advanced="Avancé"
+AMF.H264.View.Expert="Expert"
+AMF.H264.View.Master="Maître"
+AMF.H264.UnlockProperties="Débloquer les propriétés"
+AMF.H264.Debug="Débogage"
 AMF.Util.Default="Défaut"
 AMF.Util.Automatic="Automatique"
+AMF.Util.Manual="Manuel"
 AMF.Util.Toggle.Disabled="Désactivé"
 AMF.Util.Toggle.Enabled="Activé"
-

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/hr-HR.ini Added

@@ -0,0 +1,39 @@
+AMF.H264.Usage.Transcoding="Transkodiranje"
+AMF.H264.Usage.UltraLowLatency="Ultra nisko kašnjenje"
+AMF.H264.Usage.LowLatency="Nisko kašnjenje"
+AMF.H264.Profile="Profil"
+AMF.H264.ProfileLevel="Nivo profila"
+AMF.H264.RateControlMethod="Metoda kontrole protoka"
+AMF.H264.RateControlMethod.CQP="Konstantan kvalitet (CQP)"
+AMF.H264.RateControlMethod.CBR="Konstantan protok (CBR)"
+AMF.H264.RateControlMethod.VBR.Peak="Promenjivi protok (sa gornjom granicom) (VBR)"
+AMF.H264.RateControlMethod.VBR.Latency="Promenjivi protok (sa granicom kašnjenja) (VBR_LAT)"
+AMF.H264.Bitrate.Target="Ciljani protok"
+AMF.H264.Bitrate.Peak="Granica protoka"
+AMF.H264.QP.Minimum="Minimalni QP"
+AMF.H264.QP.Maximum="Maksimalni QP"
+AMF.H264.QP.IFrame="I-Frejm QP"
+AMF.H264.QP.PFrame="P-Frejm QP"
+AMF.H264.QP.BFrame="B-Frejm QP"
+AMF.H264.QP.BPictureDelta="B-Promena slike QP"
+AMF.H264.QP.ReferenceBPictureDelta="Referenca B-Promena slike QP"
+AMF.H264.FillerData="Data za popunjavanje"
+AMF.H264.FrameSkipping="Preskakanje frejmova"
+AMF.H264.EnforceHRDCompatibility="Prisilna HRD kompatibilnost"
+AMF.H264.BPicture.Pattern="B-Šablonska slika"
+AMF.H264.BPicture.Reference="B-Referentna slika"
+AMF.H264.DeblockingFilter="Odblokirajući filter"
+AMF.H264.ScanType="Vrsta skeniranja"
+AMF.H264.ScanType.Progressive="Progresivno"
+AMF.H264.ScanType.Interlaced="Isprekidano"
+AMF.H264.QualityPreset="Šablon kvaliteta"
+AMF.H264.QualityPreset.Speed="Brzina"
+AMF.H264.QualityPreset.Balanced="Izbalansirano"
+AMF.H264.QualityPreset.Quality="Kvalitet"
+AMF.H264.CABAC="Binarno aritmetičko kodiranje prilagodljivo sadržaju (CABAC)"
+AMF.H264.MemoryType="Vrsta memorije"
+AMF.H264.SurfaceFormat="Format površine"
+AMF.Util.Default="Podrazumevano"
+AMF.Util.Automatic="Automatski"
+AMF.Util.Toggle.Disabled="Onemogućeno"
+AMF.Util.Toggle.Enabled="Omogućeno"

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/hu-HU.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/hu-HU.ini Changed

@@ -1,14 +1,17 @@
-AMF.H264.Usage="Használat módja"
+AMF.H264.Preset="Készlet"
+AMF.H264.Preset.Recording="Felvétel"
+AMF.H264.Preset.HighQuality="Kiváló minőség"
+AMF.H264.Preset.Indistinguishable="Megkülönböztethetetlen"
+AMF.H264.Preset.Lossless="Veszteségmentes"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Használat"
 AMF.H264.Usage.Transcoding="Transzkódolás"
 AMF.H264.Usage.UltraLowLatency="Nagyon alacsony késleltesésű"
 AMF.H264.Usage.LowLatency="Alacsony késleltetésű"
-AMF.H264.Usage.Webcam="Webkamera"
-AMF.H264.QualityPreset="Minőségi profil"
-AMF.H264.QualityPreset.Speed="Gyors"
-AMF.H264.QualityPreset.Balanced="Kiegyenlített"
-AMF.H264.QualityPreset.Quality="Minőségi"
 AMF.H264.Profile="Enkóder profil"
 AMF.H264.ProfileLevel="Profil szint"
+AMF.H264.MaximumLTRFrames="Maximális LTR képkocka"
 AMF.H264.RateControlMethod="Bitráta vezérlés"
 AMF.H264.RateControlMethod.CQP="Erőltetett QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Konstans bitráta (CBR)"
@@ -23,57 +26,42 @@
 AMF.H264.QP.BFrame="B-Képkocka QP"
 AMF.H264.QP.BPictureDelta="B-Képkocka Delta QP"
 AMF.H264.QP.ReferenceBPictureDelta="Referencia B-képkocka Delta QP"
+AMF.H264.VBVBuffer="VBV puffer"
+AMF.H264.VBVBuffer.Strictness="VBV Puffer kötöttség"
+AMF.H264.VBVBuffer.Size="VBV pufferméret"
+AMF.H264.VBVBuffer.Fullness="VBV puffer telítettség"
 AMF.H264.FillerData="Filler adat"
 AMF.H264.FrameSkipping="Képkocka kihagyás"
 AMF.H264.EnforceHRDCompatibility="HRD Kompatibilitás kényszerítése"
+AMF.H264.KeyframeInterval="Kulcsképkocka időköze"
+AMF.H264.IDRPeriod="IDR időköz"
+AMF.H264.BPicture.Pattern="B-képkockák száma"
+AMF.H264.BPicture.Reference="B-képkocka referencia"
 AMF.H264.DeblockingFilter="Deblocking Filter"
+AMF.H264.SlicesPerFrame="Szeletelés képkockánként"
 AMF.H264.ScanType="Rögzítés módja"
 AMF.H264.ScanType.Progressive="Progreszív"
 AMF.H264.ScanType.Interlaced="Interlaced (Kísérleti)"
-AMF.H264.BPicture.Pattern="B-képkockák száma"
-AMF.H264.BPicture.Reference="B-képkocka referencia"
-AMF.H264.GOPSize="GOP méret"
+AMF.H264.QualityPreset="Minőségi profil"
+AMF.H264.QualityPreset.Speed="Gyors"
+AMF.H264.QualityPreset.Balanced="Kiegyenlített"
+AMF.H264.QualityPreset.Quality="Minőségi"
+AMF.H264.MotionEstimation="Mozgásbecslés"
+AMF.H264.MotionEstimation.None="Semmi"
+AMF.H264.MotionEstimation.Half="Fél-pixel"
+AMF.H264.MotionEstimation.Quarter="Negyed-pixel"
+AMF.H264.MotionEstimation.Both="Fél-&negyed-pixel"
 AMF.H264.CABAC="Kontextus adaptív bináris aritmetikus kódolás (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing"
 AMF.H264.MemoryType="Memória típus"
-AMF.H264.ComputeType="Számítás típus"
 AMF.H264.SurfaceFormat="Felület formátum"
-
-AMF.H264Advanced.Name="H264 Encoder [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Alapértelmezett értékek"
-AMF.H264Advanced.Update="Adatok frissítése AMF-ből (ha alapértelmezett/-1)"
-AMF.H264Advanced.MaxLTRFrames="Maximális LTR Képkockák"
-AMF.H264Advanced.VBVBuffer.Size="VBV Buffer méret (Bitben)"
-AMF.H264Advanced.VBVBuffer.Fullness="Kezdeti VBV Buffer telítettség"
-AMF.H264Advanced.MaxAUSize="Maximum AU méret (Bitben)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="IDR (Kulcsképkocka) Időköz (Képkockában)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory Per Slot In Macroblocks (in MB)"
-AMF.H264Advanced.SlicesPerFrame="Szeletek képkockánként"
-AMF.H264Advanced.MotionEstimation="Mozgás becslése"
-AMF.H264Advanced.MotionEstimation.None="Nincs"
-AMF.H264Advanced.MotionEstimation.Half="Fél pixeles"
-AMF.H264Advanced.MotionEstimation.Quarter="Negyed pixeles"
-AMF.H264Advanced.MotionEstimation.Both="Mindkettő"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Preset"
-AMF.H264Simple.Preset.Recording="Recording"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="Kiváló minőség"
-AMF.H264Simple.Preset.Indistinguishable="Megkülönböztethetetlen"
-AMF.H264Simple.Preset.Lossless="Veszteségmentes"
-AMF.H264Simple.KeyframeInterval="Keyframe Interval (Seconds)"
-AMF.H264Simple.UseCustomBufferSize="Use Custom Buffer Size"
-AMF.H264Simple.CustomBufferSize="Buffer Size (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Kezdeti puffer telítettség"
-AMF.H264Simple.UseCustomGOPSize="Egyéni GOP méret"
-AMF.H264Simple.ShowAdvancedParameters="Show Advanced Parameters"
-AMF.H264Simple.ShowExpertParameters="Haladó paraméterek mutatása"
-
+AMF.H264.View="Nézet mód"
+AMF.H264.View.Basic="Alap"
+AMF.H264.View.Advanced="Haladó"
+AMF.H264.View.Expert="Szakértő"
+AMF.H264.View.Master="Mester"
+AMF.H264.Debug="Hibakeresés"
 AMF.Util.Default="Alapértelmezett"
 AMF.Util.Automatic="Automatikus"
+AMF.Util.Manual="Manuális"
 AMF.Util.Toggle.Disabled="Letiltva"
 AMF.Util.Toggle.Enabled="Engedélyezve"
-

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/it-IT.ini Added

@@ -0,0 +1,64 @@
+AMF.H264.Usage.Transcoding="Transcodifica"
+AMF.H264.Usage.UltraLowLatency="Latenza ultra bassa"
+AMF.H264.Usage.LowLatency="Bassa latenza"
+AMF.H264.Profile="Profilo"
+AMF.H264.ProfileLevel="Livello profilo"
+AMF.H264.ProfileLevel.Description="Quale livello di profilo H.264 usare per l'encoding:\n- 'Automatico' calcola il miglior livello per il dato Frame Rate e Frame Size,\n- '4.1' supporta 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' supporta 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' supporta 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' supporta 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' supporta 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Fotogrammi LTR Massimi"
+AMF.H264.RateControlMethod="Metodo di controllo della frequenza"
+AMF.H264.RateControlMethod.CQP="QP Costante (QPC)"
+AMF.H264.RateControlMethod.CBR="Bitrate costante (CBR)"
+AMF.H264.RateControlMethod.VBR.Peak="Bitrate Variabile (Peak Constrained) (VBR)"
+AMF.H264.RateControlMethod.VBR.Latency="Bitrate variabile (latenza vincolata) (VBR_LAT)"
+AMF.H264.Bitrate.Target="Bitrate di destinazione"
+AMF.H264.Bitrate.Peak="Picco Bitrate"
+AMF.H264.QP.Minimum="QP Minimo"
+AMF.H264.QP.Maximum="QP Massimo"
+AMF.H264.QP.IFrame="I-Frame QP"
+AMF.H264.QP.PFrame="P-Frame QP"
+AMF.H264.QP.BFrame="B-Frame QP"
+AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
+AMF.H264.QP.ReferenceBPictureDelta="Riferimento B-Picture Delta QP"
+AMF.H264.VBVBuffer="Buffer VBV"
+AMF.H264.VBVBuffer.Strictness="Strettezza Buffer VBV"
+AMF.H264.VBVBuffer.Size="Dimensione Buffer VBV"
+AMF.H264.VBVBuffer.Fullness="Larghezza Buffer VBV"
+AMF.H264.FillerData="Dati di riempimento"
+AMF.H264.FrameSkipping="Frame Skipping"
+AMF.H264.EnforceHRDCompatibility="Forza compatibilità HRD"
+AMF.H264.MaximumAccessUnitSize="Massima dimensione di unità d'accesso"
+AMF.H264.KeyframeInterval="Intervallo Keyframe"
+AMF.H264.IDRPeriod="Periodo IDR"
+AMF.H264.HeaderInsertionSpacing="Spaziatura di inserimento di intestazione"
+AMF.H264.BPicture.Pattern="Modello B-Picture"
+AMF.H264.BPicture.Reference="Riferimento B-Picture"
+AMF.H264.DeblockingFilter="Filtro di deblock"
+AMF.H264.SlicesPerFrame="Slices Per Frame"
+AMF.H264.IntraRefreshNumMBsPerSlot="Intra-Refresh Number of Macroblocks Per Slot"
+AMF.H264.ScanType="Tipo di scansione"
+AMF.H264.ScanType.Progressive="Progressivo"
+AMF.H264.ScanType.Interlaced="Interlacciato"
+AMF.H264.QualityPreset="Qualità Preset"
+AMF.H264.QualityPreset.Speed="Velocità"
+AMF.H264.QualityPreset.Balanced="Bilanciato"
+AMF.H264.QualityPreset.Quality="Qualità"
+AMF.H264.MotionEstimation="Stima Movimento"
+AMF.H264.MotionEstimation.None="Nessuno"
+AMF.H264.MotionEstimation.Half="Metà-Pixel"
+AMF.H264.MotionEstimation.Quarter="Quarto-Pixel"
+AMF.H264.MotionEstimation.Both="Meta- & Quarto-Pixel"
+AMF.H264.CABAC="CABAC"
+AMF.H264.MemoryType="Tipo Memoria"
+AMF.H264.SurfaceFormat="Formato di superficie"
+AMF.H264.View="Modalità di visualizzazione"
+AMF.H264.View.Basic="Basico"
+AMF.H264.View.Advanced="Avanzate"
+AMF.H264.View.Expert="Esperto"
+AMF.H264.View.Master="Master"
+AMF.H264.UnlockProperties="Sblocca proprietà"
+AMF.H264.Debug="Debug"
+AMF.Util.Default="Predefinito"
+AMF.Util.Automatic="Automatico"
+AMF.Util.Manual="Manuale"
+AMF.Util.Toggle.Disabled="Disabilitato"
+AMF.Util.Toggle.Enabled="Attivo"

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ja-JP.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ja-JP.ini Changed

@@ -1,79 +1,88 @@
-AMF.H264.Usage="使用タイプ"
+AMF.H264.Preset="プリセット"
+AMF.H264.Preset.Recording="録画中"
+AMF.H264.Preset.HighQuality="高品質"
+AMF.H264.Preset.Indistinguishable="区別不能品質"
+AMF.H264.Preset.Lossless="無損失品質"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="用途"
 AMF.H264.Usage.Transcoding="変換"
 AMF.H264.Usage.UltraLowLatency="超低遅延"
 AMF.H264.Usage.LowLatency="低遅延"
-AMF.H264.Usage.Webcam="ウェブカメラ"
-AMF.H264.QualityPreset="品質プリセット"
-AMF.H264.QualityPreset.Speed="速度"
-AMF.H264.QualityPreset.Balanced="バランス"
-AMF.H264.QualityPreset.Quality="品質"
 AMF.H264.Profile="プロファイル"
+AMF.H264.Profile.Description="エンコードに使用する H.264 プロファイル:\n- 'Baseline' は最も広くサポートされており、\n- 'Main' は95%のデバイスでサポートされており (推奨)、\n- 'High' は高性能デバイスのみでサポートされている。"
 AMF.H264.ProfileLevel="プロファイルレベル"
+AMF.H264.ProfileLevel.Description="エンコードに使用する H.264 プロファイルレベル:\n- '自動' は与えられたフレームレートと解像度に対して最適なプロファイルレベルを計算し、\n- '4.1' は 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS をサポートし、\n- '4.2' は 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS をサポートし、\n- '5.0' は 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS をサポートし、\n- '5.1' は 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS をサポートし、\n- '5.2' は 3840x2160 60FPS、1920 x 1080 172FPS, 1280 x 720 172FPS, 960 x 540 172FPS をサポートします。"
+AMF.H264.MaximumLTRFrames="最大 LTR フレーム"
 AMF.H264.RateControlMethod="レート制御方式"
 AMF.H264.RateControlMethod.CQP="固定QP (CQP)"
 AMF.H264.RateControlMethod.CBR="固定ビットレート (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="可変ビットレート (ピーク制約) (VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="可変ビットレート (遅延制約) (VBR_LAT)"
 AMF.H264.Bitrate.Target="目標ビットレート"
+AMF.H264.Bitrate.Target.Description="全体的なシーケンスで達成しようとするビットレート。\nCBR と VBR_LAT で使用されます。"
 AMF.H264.Bitrate.Peak="最大ビットレート"
+AMF.H264.Bitrate.Peak.Description="全体的なシーケンスでピークを最大にしようとするビットレート。\nVBR と VBR_LAT で使用されます。"
 AMF.H264.QP.Minimum="最小QP"
+AMF.H264.QP.Minimum.Description="フレームで使用する最小QP値。\nCBR, VBR および VBR_LAT で使用される。"
 AMF.H264.QP.Maximum="最大QP"
+AMF.H264.QP.Maximum.Description="フレームで使用する最大QP値。\nCBR, VBR および VBR_LAT で使用される。"
 AMF.H264.QP.IFrame="I-フレーム QP"
 AMF.H264.QP.PFrame="P-フレーム QP"
 AMF.H264.QP.BFrame="B-フレーム QP"
 AMF.H264.QP.BPictureDelta="B-画像デルタ QP"
+AMF.H264.QP.BPictureDelta.Description="最後の非参照B-画像のデルタQPです。"
 AMF.H264.QP.ReferenceBPictureDelta="B-画像参照のデルタQP"
+AMF.H264.QP.ReferenceBPictureDelta.Description="最後の参照B-画像のデルタQPです。"
+AMF.H264.VBVBuffer="VBV バッファ"
+AMF.H264.VBVBuffer.Strictness="VBV バッファ厳密性"
+AMF.H264.VBVBuffer.Size="VBV バッファサイズ"
+AMF.H264.VBVBuffer.Fullness="VBV バッファ充満"
 AMF.H264.FillerData="フィラーデータ"
 AMF.H264.FrameSkipping="フレームスキップ"
 AMF.H264.EnforceHRDCompatibility="HRD 互換性を強制"
-AMF.H264.DeblockingFilter="デブロック フィルター"
+AMF.H264.MaximumAccessUnitSize="最大アクセスユニットサイズ"
+AMF.H264.KeyframeInterval="キーフレーム間隔"
+AMF.H264.KeyframeInterval.Description="ドロップ不可能なフレーム間の秒数。\nGOPのサイズも制御します。"
+AMF.H264.IDRPeriod="IDR 周期"
+AMF.H264.IDRPeriod.Description="ドロップ不可能なフレーム間のフレーム数。\nGOPのサイズも制御します。"
+AMF.H264.HeaderInsertionSpacing="ヘッダー挿入間隔"
+AMF.H264.BPicture.Pattern="B-画像パターン"
+AMF.H264.BPicture.Reference="B-画像参照"
+AMF.H264.DeblockingFilter="デブロックフィルタ"
+AMF.H264.DeblockingFilter.Description="デコーダがエンコードされたストリームに対してデブロックフィルタの使用を許可されているかのフラグを設定します。"
+AMF.H264.SlicesPerFrame="フレームあたりのスライス"
+AMF.H264.IntraRefreshNumMBsPerSlot="スロットごとのマクロブロックのイントラリフレッシュ数"
 AMF.H264.ScanType="スキャンの種類"
+AMF.H264.ScanType.Description="どのスキャン方法が使用されるか、'プログレッシブ'を常にこのままにしておきます。"
 AMF.H264.ScanType.Progressive="プログレッシブ"
 AMF.H264.ScanType.Interlaced="インターレース"
-AMF.H264.BPicture.Pattern="B-画像パターン"
-AMF.H264.BPicture.Reference="B-画像参照"
-AMF.H264.GOPSize="GOP サイズ"
+AMF.H264.QualityPreset="品質プリセット"
+AMF.H264.QualityPreset.Speed="速度"
+AMF.H264.QualityPreset.Balanced="バランス"
+AMF.H264.QualityPreset.Quality="品質"
+AMF.H264.MotionEstimation="動き推定"
+AMF.H264.MotionEstimation.Description="動き推定はピクセルがどこに移動したかを推定することによってエンコーダが必要とするビットレートを削減します。"
+AMF.H264.MotionEstimation.None="未設定"
+AMF.H264.MotionEstimation.Half="1/2ピクセル"
+AMF.H264.MotionEstimation.Quarter="1/4ピクセル"
+AMF.H264.MotionEstimation.Both="ハーフ & クォーターピクセル"
 AMF.H264.CABAC="コンテキスト適応型のバイナリ演算コーディング (CABAC)"
-AMF.H264.DebugTracing="デバッグトレース"
 AMF.H264.MemoryType="メモリの種類"
-AMF.H264.ComputeType="計算の種類"
+AMF.H264.Device="デバイス"
+AMF.H264.UseOpenCL="OpenCL を使用する"
 AMF.H264.SurfaceFormat="カラーフォーマット"
-
-AMF.H264Advanced.Name="H264 エンコーダー [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="既定値に戻す"
-AMF.H264Advanced.Update="AMF から値を更新 (デフォルトであれば/-1)"
-AMF.H264Advanced.MaxLTRFrames="最大 LTR フレーム"
-AMF.H264Advanced.VBVBuffer.Size="VBV バッファーサイズ (ビット)"
-AMF.H264Advanced.VBVBuffer.Fullness="初期 VBV バッファー充満"
-AMF.H264Advanced.MaxAUSize="AU の最大サイズ (ビット)"
-AMF.H264Advanced.HeaderInsertionSpacing="ヘッダー挿入間隔 (フレーム)"
-AMF.H264Advanced.IDRPeriod="キーフレーム間隔 (フレーム)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="マクロブロック中のスロットあたりのイントラリフレッシュメモリ (MB)"
-AMF.H264Advanced.SlicesPerFrame="フレームあたりのスライス"
-AMF.H264Advanced.MotionEstimation="動き推定"
-AMF.H264Advanced.MotionEstimation.None="未設定"
-AMF.H264Advanced.MotionEstimation.Half="1/2ピクセルのみ"
-AMF.H264Advanced.MotionEstimation.Quarter="1/4ピクセルのみ"
-AMF.H264Advanced.MotionEstimation.Both="両方"
-
-AMF.H264Simple.Name="H264 エンコーダー (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="プリセット"
-AMF.H264Simple.Preset.Recording="録画中"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="高品質"
-AMF.H264Simple.Preset.Indistinguishable="区別不能品質"
-AMF.H264Simple.Preset.Lossless="無損失品質"
-AMF.H264Simple.KeyframeInterval="キーフレーム間隔 (秒)"
-AMF.H264Simple.UseCustomBufferSize="特定バッファサイズを使用"
-AMF.H264Simple.CustomBufferSize="バッファーサイズ (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="初期バッファー充満"
-AMF.H264Simple.UseCustomGOPSize="特定GOPサイズを使用"
-AMF.H264Simple.ShowAdvancedParameters="高度なパラメーターを表示"
-AMF.H264Simple.ShowExpertParameters="専門的なパラメーターを表示"
-
+AMF.H264.View="表示モード"
+AMF.H264.View.Description="どのプロパティが表示されるか。  'エキスパート' または 'マスター' の表示モードを使用する場合はサポートを受けられません。"
+AMF.H264.View.Basic="基本"
+AMF.H264.View.Advanced="詳細設定"
+AMF.H264.View.Expert="エキスパート"
+AMF.H264.View.Master="マスター"
+AMF.H264.UnlockProperties="プロパティのロック解除"
+AMF.H264.Debug="デバッグ"
+AMF.H264.Debug.Description="追加のデバッグログ出力を有効にし、これはこのエンコーダでサポートが必要なときにアクティブにする必要があります。"
 AMF.Util.Default="既定値"
 AMF.Util.Automatic="自動"
+AMF.Util.Manual="手動"
 AMF.Util.Toggle.Disabled="無効"
 AMF.Util.Toggle.Enabled="有効"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ko-KR.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ko-KR.ini Changed

@@ -1,75 +1,107 @@
-AMF.H264.Usage="사용 종류"
+AMF.H264.Preset="사전 설정"
+AMF.H264.Preset.Recording="녹화"
+AMF.H264.Preset.HighQuality="우수한 품질"
+AMF.H264.Preset.Indistinguishable="무손실과 거의 구분 불가"
+AMF.H264.Preset.Lossless="무손실"
+AMF.H264.Preset.Twitch="트위치"
+AMF.H264.Preset.YouTube="유튜브"
+AMF.H264.Usage="용도"
+AMF.H264.Usage.Description="용도에 따라 AMF을 조율합니다:\n- '트랜스코딩'은 일반적인 용도에 적합한 설정입니다(추천).\n- '매우 낮은 지연시간'은 아주 낮은 인코딩 레이턴시를 의미합니다.\n- '낮은 지연시간'은 그 수준이 조금 더 높습니다.\n방송 목적으로는 '트랜스코딩'만 지원됩니다. 모든 다른 설정값은 녹화 용도에만 사용됩니다."
 AMF.H264.Usage.Transcoding="트랜스코딩"
 AMF.H264.Usage.UltraLowLatency="매우 낮은 지연 시간"
 AMF.H264.Usage.LowLatency="낮은 지연 시간"
-AMF.H264.Usage.Webcam="웹캠"
-AMF.H264.QualityPreset="품질 사전 설정"
-AMF.H264.QualityPreset.Speed="속도"
-AMF.H264.QualityPreset.Balanced="균형"
-AMF.H264.QualityPreset.Quality="품질"
 AMF.H264.Profile="사전설정"
+AMF.H264.Profile.Description="인코딩에 사용하는 H.264프로파일을 설정합니다.\n- 'Baseline'은 가장 많은 환경 및 기기에서 지원가능한 수준입니다.\n- 'Main'은 시장에서 95%의 기기가 지원합니다(추천).\n- 'High'는 고급 기기에만 지원되는 설정입니다."
 AMF.H264.ProfileLevel="프로필 수준"
+AMF.H264.ProfileLevel.Description="인코딩으로 사용할 H.264 프로파일 수준을 지정합니다:\n-'자동'은 설정된 프레임과 그 크기에 맞춰 가장 좋은 수준을 계산합니다,\n-'4.1'은 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS을 지원합니다,\n-'4.2'는 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS을 지원합니다,\n- '5.0'은 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS을 지원합니다,\n- '5.1'은 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS을 지원합니다,\n- '5.2'은 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS을 지원합니다."
+AMF.H264.MaximumLTRFrames="최대 장기참조 프레임"
+AMF.H264.MaximumLTRFrames.Description="장기참조 프레임(LTR)은 인코더가 특정 프레임을 참조 가능하게 만들어 줍니다.\n이 설정은 B-화면 기능이 지원되지 않거나 필요한 경우 품질을 올리는데 도움이 될 수 있습니다.\n장기참조 프레임은 B-화면과 동시에 사용할 수 없습니다."
 AMF.H264.RateControlMethod="속도 제어 방식"
 AMF.H264.RateControlMethod.CQP="고정 QP (CQP)"
 AMF.H264.RateControlMethod.CBR="고정 비트레이트 (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="가변 비트레이트 (최대 비트레이트 제약) (VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="가변 비트레이트(지연율 제약) (VBR_LAT)"
 AMF.H264.Bitrate.Target="목표 비트레이트"
+AMF.H264.Bitrate.Target.Description="전반적인 영상 장면을 구성하기 위한 비트레이트.\nCBR과 VBR_LAT에 사용됨."
 AMF.H264.Bitrate.Peak="최대 비트레이트"
+AMF.H264.Bitrate.Peak.Description="전반적인 영상 장면을 구성할 때 최대로 사용할 수 있는 비트레이트.\nVBR과 VBR_LAT에 사용."
 AMF.H264.QP.Minimum="최소 QP"
+AMF.H264.QP.Minimum.Description="프레임 하나에 사용하는 최저 QP 값.\n CBR, VBR 그리고 VBR_LAT에 사용됨."
 AMF.H264.QP.Maximum="최대 QP"
+AMF.H264.QP.Maximum.Description="프레임 하나에 사용하는 최대 QP 값.\n CBR, VBR 그리고 VBR_LAT에 사용됨."
 AMF.H264.QP.IFrame="I-프레임 QP"
+AMF.H264.QP.IFrame.Description="I-화면에 사용하는 고정 QP 값.\n 낮음= 더 큰 파일, 더 좋은 품질. 높음 = 더 작은 파일, 더 나쁜 품질.\nI-화면 QP는 P-,B-화면 QP값 수치보다 높아야함.\nCQP에서 사용."
 AMF.H264.QP.PFrame="P-프레임 QP"
+AMF.H264.QP.PFrame.Description="P-화면에 사용하는 고정 QP 값.\n 낮음= 더 큰 파일, 더 좋은 품질. 높음 = 더 작은 파일, 더 나쁜 품질.\nP-화면 QP는 B-화면 QP값 수치보다 같거나 높아야함.\nCQP에서 사용."
 AMF.H264.QP.BFrame="BP-프레임 QP"
+AMF.H264.QP.BFrame.Description="B-화면에 사용하는 고정 QP 값.\n 낮음= 더 큰 파일, 더 좋은 품질. 높음 = 더 작은 파일, 더 나쁜 품질.\nCQP에서 사용."
 AMF.H264.QP.BPictureDelta="B-화면 델타 QP"
+AMF.H264.QP.BPictureDelta.Description="마지막 비참조 B-화면의 델타 QP."
 AMF.H264.QP.ReferenceBPictureDelta="참조 B-화면 델타 QP"
+AMF.H264.QP.ReferenceBPictureDelta.Description="마지막 참조 B-화면의 델타 QP."
+AMF.H264.VBVBuffer="VBV 버퍼"
+AMF.H264.VBVBuffer.Strictness="VBV 버퍼 엄격도"
+AMF.H264.VBVBuffer.Strictness.Description="VBV 버퍼가 어떤 수준으로 제어될지 결정합니다. 100%에는 목표로 정한 비트레이트와 거의 일치하도록 조절하며 0%에서는 제약이 사라집니다."
+AMF.H264.VBVBuffer.Size="VBV 버퍼 크기"
+AMF.H264.VBVBuffer.Size.Description="한 장면의 비트레이트 제어에 사용하는 VBV 버퍼 크기를 의미합니다.\n작은 크기는 지정한 비트레이트 값과 일치하는 결과를 가져오지만 작업에 더 많은 자원을 요구합니다.\n이상적인 (100% 엄격) VBV버퍼 크기는 비트레이트/프레임율입니다."
+AMF.H264.VBVBuffer.Fullness="VBV 버퍼 충만도"
+AMF.H264.VBVBuffer.Fullness.Description="초기 VBV버퍼가 얼마나 충만한지는 오로지 인코딩의 초반에만 영향을 미칩니다."
 AMF.H264.FillerData="채우기 정보"
+AMF.H264.FillerData.Description="채우기 정보는 디코더가 무시하는 빈 혹은 잘못된 데이터입니다.\n만약 이 설정이 활성화되어있고 CBR을 사용할 경우 인코더가 남은 공간을 이 것으로 채워둡니다."
 AMF.H264.FrameSkipping="프레임 생략"
+AMF.H264.FrameSkipping.Description="프레임 생략은 프레임이 아주 유사하거나 작업이 너무 오래 소요할 경우, 인코더가 선택적으로 그것을 생략할 수 있게 합니다.\n이 설정을 활성화하면 파일은 가변 프레임율로 출력이 되며 대다수 편집 소프트웨어는 지원하지 않습니다."
 AMF.H264.EnforceHRDCompatibility="HDR 호환모드 적용"
+AMF.H264.EnforceHRDCompatibility.Description="이론적 기본 디코더 강제는 프레임 하나의 최대 QP값 변화를 제한하는 설정입니다.\n녹화나 방송에는 적합하지 않고 기본 소프트웨어 디코더만 사용 가능한 매우 낡은 장치에서 영상을 재생할 때 사용합니다."
+AMF.H264.MaximumAccessUnitSize="최대 접근 유닛 크기"
+AMF.H264.MaximumAccessUnitSize.Description="NAL 장치에서 단일 접근 유닛의 가장 큰 크기를 결정합니다. 0 값은 인코더가 최적화된 수치를 결정하도록 허용합니다."
+AMF.H264.KeyframeInterval="키프레임 간격"
+AMF.H264.KeyframeInterval.Description="손실이 불가능한 프레임 사이에 얼마나 많은 시간(초)이 필요한지 설정합니다.\n또한 영상(GOP) 크기도 제어합니다."
+AMF.H264.IDRPeriod="IDR 주기"
+AMF.H264.IDRPeriod.Description="손실이 불가능한 프레임 사이에 얼마나 많은 프레임이 필요한지 설정합니다.\n또한 영상(GOP) 크기도 제어합니다."
+AMF.H264.HeaderInsertionSpacing="헤더 삽입 간격"
+AMF.H264.HeaderInsertionSpacing.Description="NAL 헤더 사이에 얼마나 많은 프레임이 필요한지 설정합니다. 0(자동)에서 바꾸는 것은 추천하지 않습니다."
+AMF.H264.BPicture.Pattern="B-화면 양식"
+AMF.H264.BPicture.Reference="B-화면 참조"
+AMF.H264.BPicture.Reference.Description="다른 B-화면뿐만 아니라 P-/I-화면에도 B-화면을 참조할 수 있도록 허용합니다.\n높은 성능이 요구되지만 품질 개선에는 그리 큰 효과가 없습니다."
 AMF.H264.DeblockingFilter="디블록 필터"
+AMF.H264.DeblockingFilter.Description="디코더가 인코딩된 작업에 디블록 필터를 사용할 수 있도록 허용합니다."
+AMF.H264.SlicesPerFrame="조각 당 프레임"
+AMF.H264.SlicesPerFrame.Description="동적 대신 고정식 분할 인코딩을 사용합니다.\n높은 해상도와 초당 프레임 환경에서 도움이 될 수 있습니다. 이 설정으로 동일한 프로파일 수준을 유지하면서 더 많은 데이터를 저장할 수 있습니다. 하지만 품질에 부정적인 영향을 미칠 수 있습니다."
+AMF.H264.IntraRefreshNumMBsPerSlot="슬롯 당 매크로블록의 인트라-리프레시 수"
+AMF.H264.IntraRefreshNumMBsPerSlot.Description="인트라-리프레시 인코딩에서 슬롯마다 얼마나 많은 수의 매크로블록이 필요한지 설정합니다.\n인트라-리프레시 인코딩은 높은 비트레이트를 기반으로 추가 정보를 저장하여 빠른 탐색과 디코딩을 허용합니다.\n방송할 때는 기본으로 두십시오."
 AMF.H264.ScanType="스캔 형식"
+AMF.H264.ScanType.Description="주사 방식을 설정합니다. 항상 '프로그레시브'로 두십시오."
 AMF.H264.ScanType.Progressive="프로그레시브"
 AMF.H264.ScanType.Interlaced="인터레이스"
-AMF.H264.BPicture.Pattern="B-화면 양식"
-AMF.H264.BPicture.Reference="B-화면 참조"
-AMF.H264.GOPSize="GOP 크기"
+AMF.H264.QualityPreset="품질 사전 설정"
+AMF.H264.QualityPreset.Description="AMF 품질을 결정할 때 어떤 수준을 목표로 할지 결정합니다:\n-'속도'는 가장 빠르지만, 품질이 가장 나쁘며,\n- '균형'은 '속도'와 '품질' 사이의 수준을 제공합니다.\n- '품질'은 주어진 비트레이트 내에서 가장 뛰어난 품질을 제공합니다."
+AMF.H264.QualityPreset.Speed="속도"
+AMF.H264.QualityPreset.Balanced="균형"
+AMF.H264.QualityPreset.Quality="품질"
+AMF.H264.MotionEstimation="동작 예측"
+AMF.H264.MotionEstimation.Description="동작 추정은 픽셀의 움직임을 추정하여 필요한 비트레이트를 줄일 수 있게 합니다."
+AMF.H264.MotionEstimation.None="없음"
+AMF.H264.MotionEstimation.Half="1/2 화소"
+AMF.H264.MotionEstimation.Quarter="1/4 화소"
+AMF.H264.MotionEstimation.Both="1/2 & 1/4 화소"
 AMF.H264.CABAC="Context Adaptive Binary Arithmetic Coding (CABAC)"
-AMF.H264.DebugTracing="디버그 추적"
+AMF.H264.CABAC.Description="CALV대신 CABAC (Context Adaptive Binary Arithmetic Coding)을 사용합니다.\n품질엔 영향을 주지 않지만 압축에 도움이 됩니다. 평균적으로 5% 정도 더 나은 압축률을 보여줍니다."
 AMF.H264.MemoryType="메모리 유형"
-AMF.H264.ComputeType="계산 유형"
-
-AMF.H264Advanced.Name="H264 인코더 [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="기본값으로 설정"
-AMF.H264Advanced.Update="AMF에서 값을 갱신(기본 수치라면/-1)"
-AMF.H264Advanced.MaxLTRFrames="최대 LTR 프레임"
-AMF.H264Advanced.VBVBuffer.Size="VBV 버퍼 크기 (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="초기 VBV 버퍼 충만도"
-AMF.H264Advanced.MaxAUSize="최대 AU 크기 (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="헤더 삽입 간격 (프레임)"
-AMF.H264Advanced.IDRPeriod="키프레임 간격 (프레임)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="매크로블록 내 슬롯 당 Intra-Refresh 메모리 (MB)"
-AMF.H264Advanced.SlicesPerFrame="조각 당 프레임"
-AMF.H264Advanced.MotionEstimation="움직임 예측"
-AMF.H264Advanced.MotionEstimation.None="없음"
-AMF.H264Advanced.MotionEstimation.Half="화소 절반만 처리"
-AMF.H264Advanced.MotionEstimation.Quarter="화소 1/4만 처리"
-AMF.H264Advanced.MotionEstimation.Both="모두"
-
-AMF.H264Simple.Name="H264 인코더 (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="사전 설정"
-AMF.H264Simple.Preset.Recording="녹화"
-AMF.H264Simple.Preset.Twitch="트위치"
-AMF.H264Simple.Preset.YouTube="유튜브"
-AMF.H264Simple.KeyframeInterval="키프레임 간격 (초 단위)"
-AMF.H264Simple.UseCustomBufferSize="사용자 임의 버퍼 크기 설정"
-AMF.H264Simple.CustomBufferSize="버퍼 크기 (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="초기 버퍼 충만도"
-AMF.H264Simple.UseCustomGOPSize="사용자 임의 GOP 버퍼 크기 설정"
-AMF.H264Simple.ShowAdvancedParameters="고급설정 표시"
-AMF.H264Simple.ShowExpertParameters="고급 사용자용 매개 변수 표시"
-
+AMF.H264.MemoryType.Description="인코더에 제출하기 전에 얼마나 많은 프레임을 저장할지 설정합니다:\n- '자동'은 후위처리 형식 내에 기억장치가 가용할 수 있는 최댓값을 선택합니다.\n- Host는 시스템 메모리를 사용합니다,\n- DirectX 9은 DirectX 표면을 제출에 사용합니다,\n- DirectX 11은 DirectX 표면을 제출에 사용합니다,\n- OpenGL은 OpenGL 표면을 제출에 사용합니다,\n\n'Host''는 대다수 시스템에서 충분하지만, DirectX는 종종 높은 부하가 일어날 때 도움이 될 수 있습니다."
+AMF.H264.SurfaceFormat="표면 형식"
+AMF.H264.SurfaceFormat.Description="인코딩에 사용할 표면 형식을 설정합니다.\n오로지 NV12만 기본적으로 지원이 되며 다른 형식은 전환 작업이 필요합니다."
+AMF.H264.View="보기 모드"
+AMF.H264.View.Description="어떤 설정을 표시할지 결정합니다. '숙련' 혹은 '달인' 표시 모드에서는 지원을 받을 수 없습니다."
+AMF.H264.View.Basic="기본"
+AMF.H264.View.Advanced="고급"
+AMF.H264.View.Expert="숙련"
+AMF.H264.View.Master="달인"
+AMF.H264.UnlockProperties="속성 잠금해제"
+AMF.H264.UnlockProperties.Description="특정 설정을 부분적이 아닌 전체 범위를 다룰 수 있도록 잠금을 해제합니다."
+AMF.H264.Debug="디버그"
+AMF.H264.Debug.Description="추가적인 디버그 기록을 활성화하여 이 인코더에 대한 지원이 필요할 때 제출하십시오."
 AMF.Util.Default="기본값"
 AMF.Util.Automatic="자동"
+AMF.Util.Manual="수동"
 AMF.Util.Toggle.Disabled="비활성화"
 AMF.Util.Toggle.Enabled="활성화"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/nb-NO.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/nb-NO.ini Changed

@@ -1,12 +1,6 @@
-AMF.H264.Usage="Bruk Type"
 AMF.H264.Usage.Transcoding="Transkoding"
 AMF.H264.Usage.UltraLowLatency="Ultra-lav latens"
 AMF.H264.Usage.LowLatency="Lav latens"
-AMF.H264.Usage.Webcam="Webkamera"
-AMF.H264.QualityPreset="Kvalitet forhåndsinnstilling"
-AMF.H264.QualityPreset.Speed="Hastighet"
-AMF.H264.QualityPreset.Balanced="Balansert"
-AMF.H264.QualityPreset.Quality="Kvalitet"
 AMF.H264.Profile="Profil"
 AMF.H264.ProfileLevel="Profilnivå"
 AMF.H264.Bitrate.Target="Mål Bitrate"
@@ -15,23 +9,11 @@
 AMF.H264.QP.Maximum="Maksimal QP"
 AMF.H264.EnforceHRDCompatibility="Håndheve HRD kompatibilitet"
 AMF.H264.ScanType="Skanne Type"
-AMF.H264.GOPSize="GOP størrelse"
-
-AMF.H264Advanced.Reset="Tilbakestill innstillinger"
-AMF.H264Advanced.Update="Oppdatere verdier fra AMF (hvis med standard /-1)"
-AMF.H264Advanced.MaxLTRFrames="Maksimal LTR rammer"
-AMF.H264Advanced.VBVBuffer.Size="VBV bufferstørrelsen (biter)"
-AMF.H264Advanced.MaxAUSize="AU maksimumsstørrelsen (biter)"
-AMF.H264Advanced.MotionEstimation.None="Ingen"
-AMF.H264Advanced.MotionEstimation.Both="Begge"
-
-AMF.H264Simple.Preset="Forhåndsinnstilling"
-AMF.H264Simple.Preset.Recording="Opptak"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.ShowAdvancedParameters="Vis avanserte parametere"
-
+AMF.H264.QualityPreset="Kvalitet forhåndsinnstilling"
+AMF.H264.QualityPreset.Speed="Hastighet"
+AMF.H264.QualityPreset.Balanced="Balansert"
+AMF.H264.QualityPreset.Quality="Kvalitet"
 AMF.Util.Default="Standard"
+AMF.Util.Automatic="Automatisk"
 AMF.Util.Toggle.Disabled="Deaktivert"
 AMF.Util.Toggle.Enabled="Aktivert"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/nl-NL.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/nl-NL.ini Changed

@@ -1,12 +1,6 @@
-AMF.H264.Usage="Gebruikstype"
 AMF.H264.Usage.Transcoding="Transcoding"
 AMF.H264.Usage.UltraLowLatency="Ultra Low Latency"
 AMF.H264.Usage.LowLatency="Low Latency"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Kwaliteitsinstelling"
-AMF.H264.QualityPreset.Speed="Snelheid"
-AMF.H264.QualityPreset.Balanced="Gebalanceerd"
-AMF.H264.QualityPreset.Quality="Kwaliteit"
 AMF.H264.Profile="Profiel"
 AMF.H264.ProfileLevel="Profielniveau"
 AMF.H264.RateControlMethod="Rate control methode"
@@ -25,46 +19,17 @@
 AMF.H264.FillerData="Opvuldata"
 AMF.H264.FrameSkipping="Frames overslaan"
 AMF.H264.EnforceHRDCompatibility="Forceer HDR compatibiliteit"
+AMF.H264.BPicture.Pattern="B-Picture patroon"
+AMF.H264.BPicture.Reference="B-Picture referentie"
 AMF.H264.DeblockingFilter="Deblocking Filter"
 AMF.H264.ScanType="Scantype"
 AMF.H264.ScanType.Progressive="Progressive"
 AMF.H264.ScanType.Interlaced="Interlaced"
-AMF.H264.BPicture.Pattern="B-Picture patroon"
-AMF.H264.BPicture.Reference="B-Picture referentie"
-AMF.H264.GOPSize="GOP grootte"
+AMF.H264.QualityPreset="Kwaliteitsinstelling"
+AMF.H264.QualityPreset.Speed="Snelheid"
+AMF.H264.QualityPreset.Balanced="Gebalanceerd"
+AMF.H264.QualityPreset.Quality="Kwaliteit"
 AMF.H264.CABAC="Context Adaptive Binary Arithmetic Coding (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing"
-
-AMF.H264Advanced.Name="H264 Encoder [Geavanceerd] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Standaardinstellingen herstellen"
-AMF.H264Advanced.Update="Waardes updaten van AMF (bij standaard/-1)"
-AMF.H264Advanced.MaxLTRFrames="Maximale LTR Frames"
-AMF.H264Advanced.VBVBuffer.Size="VBV buffergrootte (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Initiële VBV buffervulling"
-AMF.H264Advanced.MaxAUSize="Maximale AU grootte (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="Keyframe periode (frames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh geheugen per slot in macroblocks (in MB)"
-AMF.H264Advanced.SlicesPerFrame="Segmenten Per Frame"
-AMF.H264Advanced.MotionEstimation="Bewegingsinschatting"
-AMF.H264Advanced.MotionEstimation.None="Geen"
-AMF.H264Advanced.MotionEstimation.Half="Alleen halve pixel"
-AMF.H264Advanced.MotionEstimation.Quarter="Alleen kwart pixel"
-AMF.H264Advanced.MotionEstimation.Both="Beide"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Voorkeursinstelling"
-AMF.H264Simple.Preset.Recording="Opnemen"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Tijd tussen keyframes (seconden)"
-AMF.H264Simple.UseCustomBufferSize="Aangepaste buffergrootte gebruiken"
-AMF.H264Simple.CustomBufferSize="Buffergrootte (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Initiële buffervulling"
-AMF.H264Simple.UseCustomGOPSize="Aangepaste GOP-grootte gebruiken"
-AMF.H264Simple.ShowAdvancedParameters="Geavanceerde Instellingen tonen"
-
 AMF.Util.Default="Standaard"
 AMF.Util.Toggle.Disabled="Uitgeschakeld"
 AMF.Util.Toggle.Enabled="Ingeschakeld"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/pl-PL.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/pl-PL.ini Changed

@@ -1,12 +1,14 @@
-AMF.H264.Usage="Tryb działania"
+AMF.H264.Preset="Profil"
+AMF.H264.Preset.Recording="Nagrywanie"
+AMF.H264.Preset.HighQuality="Wysoka jakość"
+AMF.H264.Preset.Indistinguishable="Nie do odróżnienia"
+AMF.H264.Preset.Lossless="Bezstratny"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Sposób użycia"
 AMF.H264.Usage.Transcoding="Konwersja"
 AMF.H264.Usage.UltraLowLatency="Bardzo niskie opóźnienie"
 AMF.H264.Usage.LowLatency="Niskie opóźnienie"
-AMF.H264.Usage.Webcam="Kamerka internetowa"
-AMF.H264.QualityPreset="Ustawienie jakości"
-AMF.H264.QualityPreset.Speed="Szybkość"
-AMF.H264.QualityPreset.Balanced="Zrównoważone"
-AMF.H264.QualityPreset.Quality="Jakość"
 AMF.H264.Profile="Profil"
 AMF.H264.ProfileLevel="Profil"
 AMF.H264.RateControlMethod="Metoda kontroli przepływności"
@@ -26,54 +28,20 @@
 AMF.H264.FillerData="Filler Data"
 AMF.H264.FrameSkipping="Pomijanie klatek"
 AMF.H264.EnforceHRDCompatibility="Wymuszanie zgodności HRD"
+AMF.H264.BPicture.Pattern="Schemat B-Picture"
+AMF.H264.BPicture.Reference="Referencyjny B-Picture"
 AMF.H264.DeblockingFilter="Filtr niwelujacy bloki obrazu"
 AMF.H264.ScanType="Metoda skanowania"
 AMF.H264.ScanType.Progressive="Progresywne"
 AMF.H264.ScanType.Interlaced="Z przeplotem"
-AMF.H264.BPicture.Pattern="Schemat B-Picture"
-AMF.H264.BPicture.Reference="Referencyjny B-Picture"
-AMF.H264.GOPSize="Rozmiar GOP"
+AMF.H264.QualityPreset="Ustawienie jakości"
+AMF.H264.QualityPreset.Speed="Szybkość"
+AMF.H264.QualityPreset.Balanced="Zrównoważone"
+AMF.H264.QualityPreset.Quality="Jakość"
 AMF.H264.CABAC="Kodowanie Context Adaptive Binary Arithmetic Coding (CABAC)"
-AMF.H264.DebugTracing="Debugowanie śladów"
 AMF.H264.MemoryType="Typ pamięci"
-AMF.H264.ComputeType="Typ obliczeń"
 AMF.H264.SurfaceFormat="Format powierzchni"
-
-AMF.H264Advanced.Name="Enkoder H264 [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Przywróć ustawienia domyślne"
-AMF.H264Advanced.Update="Aktualizacja wartości z AMF (dla domyślnych/-1)"
-AMF.H264Advanced.MaxLTRFrames="Maksimum ramek LTR"
-AMF.H264Advanced.VBVBuffer.Size="Rozmiar bufora VBV (w bitach)"
-AMF.H264Advanced.VBVBuffer.Fullness="Początkowe zapełnienie bufora VBV"
-AMF.H264Advanced.MaxAUSize="Maksymalny rozmiar AU (w bitach)"
-AMF.H264Advanced.HeaderInsertionSpacing="Rozmiar nagłówka (w klatkach)"
-AMF.H264Advanced.IDRPeriod="Odległość między klatkami kluczowymi (w klatkach)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Pamięć Intra-Refresh w makroblokach na jeden slot (w megabajtach)"
-AMF.H264Advanced.SlicesPerFrame="Liczba bloków w jednej klatce"
-AMF.H264Advanced.MotionEstimation="Przewidywanie ruchu"
-AMF.H264Advanced.MotionEstimation.None="Brak"
-AMF.H264Advanced.MotionEstimation.Half="Tylko pół piksela"
-AMF.H264Advanced.MotionEstimation.Quarter="Tylko 1/4 piksela"
-AMF.H264Advanced.MotionEstimation.Both="Obydwa"
-
-AMF.H264Simple.Name="Enkoder H264 (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Profil ustawień"
-AMF.H264Simple.Preset.Recording="Nagrywanie"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="High Quality (wysoka jakość)"
-AMF.H264Simple.Preset.Indistinguishable="Indistinguishable (nie do odróżnienia)"
-AMF.H264Simple.Preset.Lossless="Lossless (bezstratny)"
-AMF.H264Simple.KeyframeInterval="Odstęp między klatkami kluczowymi (sekundy)"
-AMF.H264Simple.UseCustomBufferSize="Użyj własnego rozmiaru bufora"
-AMF.H264Simple.CustomBufferSize="Rozmiar bufora (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Początkowe zapełnienie bufora"
-AMF.H264Simple.UseCustomGOPSize="Użyj własnego rozmiaru GOP"
-AMF.H264Simple.ShowAdvancedParameters="Zaawansowane"
-AMF.H264Simple.ShowExpertParameters="Eksperckie"
-
 AMF.Util.Default="Domyślne"
 AMF.Util.Automatic="Automatycznie"
 AMF.Util.Toggle.Disabled="Wyłączone"
 AMF.Util.Toggle.Enabled="Włączone"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ru-RU.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/ru-RU.ini Changed

@@ -1,79 +1,98 @@
-AMF.H264.Usage="Тип использования"
+AMF.H264.Preset="Предустановка"
+AMF.H264.Preset.Recording="Запись"
+AMF.H264.Preset.HighQuality="Высокое качество"
+AMF.H264.Preset.Indistinguishable="Незаметные потери"
+AMF.H264.Preset.Lossless="Без потерь"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Назначение"
+AMF.H264.Usage.Description="На какой режим использования должен быть настроен AMF:\n- 'Перекодировка' — для перекодировки общего назначения (рекомендуется),\n- 'Очень низкая задержка' — для кодировки с очень низкой задержкой,\n- 'Низкая задержка' похожа на пункт выше, но с немного большей задержкой.\nТрансляции поддерживают только 'перекодировку', все остальные значения могут быть использованы для записи."
 AMF.H264.Usage.Transcoding="Транскодирование"
 AMF.H264.Usage.UltraLowLatency="Очень низкая задержка"
 AMF.H264.Usage.LowLatency="Низкая задержка"
-AMF.H264.Usage.Webcam="Вебкамера"
-AMF.H264.QualityPreset="Предустановки качества"
-AMF.H264.QualityPreset.Speed="Скорость"
-AMF.H264.QualityPreset.Balanced="Баланс"
-AMF.H264.QualityPreset.Quality="Качество"
 AMF.H264.Profile="Профиль кодирования"
+AMF.H264.Profile.Description="Какой профиль H.264 следует использовать для кодирования:\n- 'Базовый' поддерживается наибольшим количеством платформ,\n- 'Основной' поддерживается 95% устройств (рекомендуется),\n- 'Высокий' поддерживается только устройствами высокого класса."
 AMF.H264.ProfileLevel="Уровень профиля"
+AMF.H264.ProfileLevel.Description="Какой уровень профиля H.264 использовать для кодирования:\n- 'Автоматически' выбирает наиболее подходящий уровень под выбранную частоту и размер кадра,\n- '4.1' поддерживает 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' поддерживает 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' поддерживает 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' поддерживает 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' поддерживает 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="Максимум LTR-кадров"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) Frames - функция позволяющая кодировщику помечать определенные кадры в последовательности как ссылаемые.\nЭта функция может поднять качество, если функция B-Pictrues не поддерживается или не желательна.\nФункция LTR Frames не может использоваться вместе с функцией B-Pictrues и кодировщик отключит функцию B-Pictrues если таковая используется."
 AMF.H264.RateControlMethod="Метод кодирования"
 AMF.H264.RateControlMethod.CQP="CQP: постоянное качество"
 AMF.H264.RateControlMethod.CBR="CBR: постоянный битрейт"
 AMF.H264.RateControlMethod.VBR.Peak="VBR: переменный битрейт (Ограничение пиков)"
 AMF.H264.RateControlMethod.VBR.Latency="VBR: переменный битрейт (Ограничение задержки)"
 AMF.H264.Bitrate.Target="Битрейт"
+AMF.H264.Bitrate.Target.Description="Желаемый для получения битрейт всего потока.\nИспользуется с CBR и VBR_LAT."
 AMF.H264.Bitrate.Peak="Пиковый битрейт"
+AMF.H264.Bitrate.Peak.Description="Битрейт работает на максимально пике в общей последовательности.\nИспользуется VBR и VBR_LAT."
 AMF.H264.QP.Minimum="Минимальное QP"
+AMF.H264.QP.Minimum.Description="Наименьшее значение QP для использования в кадре.\nИспользуется CBR, VBR и VBR_LAT."
 AMF.H264.QP.Maximum="Максимальное QP"
+AMF.H264.QP.Maximum.Description="Наибольшее значение QP для использования в кадре.\nИспользуется CBR, VBR и VBR_LAT."
 AMF.H264.QP.IFrame="I-кадр QP"
+AMF.H264.QP.IFrame.Description="Фиксированное значение QP для использования в I-кадрах.\nМеньше = больше файл, лучше качество. Выше = меньше файл, хуже качество.\nQP у I-кадров должно быть больше или равно QP у P- и B-кадров.\nИспользуется CQP."
 AMF.H264.QP.PFrame="P-кадр QP"
+AMF.H264.QP.PFrame.Description="Фиксированное значение QP для использования в P-кадрах.\nМеньше = больше файл, лучше качество. Выше = меньше файл, хуже качество.\nQP у P-кадров должно быть больше или равно QP у B-кадров.\nИспользуется CQP."
 AMF.H264.QP.BFrame="B-кадр QP"
+AMF.H264.QP.BFrame.Description="Фиксированное значение QP для использования в B-кадрах.\nМеньше = больше файл, лучше качество. Больше = меньше файл, хуже качество.\nИспользуется CQP."
 AMF.H264.QP.BPictureDelta="B-кадры дельта QP"
+AMF.H264.QP.BPictureDelta.Description="Дельта QP до последнего не референсного B-кадра."
 AMF.H264.QP.ReferenceBPictureDelta="Референсные B-кадры дельта QP"
-AMF.H264.FillerData="Фильтрация данных"
+AMF.H264.QP.ReferenceBPictureDelta.Description="Дельта QP до последнего референсного B-кадра."
+AMF.H264.VBVBuffer="Буфер VBV"
+AMF.H264.VBVBuffer.Strictness="Строгость буфера VBV"
+AMF.H264.VBVBuffer.Strictness.Description="Насколько строго должен быть ограничен буфер VBV: 100% — почти полное соответствие целевому битрейту, 0% — без ограничений."
+AMF.H264.VBVBuffer.Size="Размер буфера VBV"
+AMF.H264.VBVBuffer.Fullness="Заполнение буфера VBV"
+AMF.H264.FillerData="Данные наполнителя"
 AMF.H264.FrameSkipping="Пропуск кадров"
 AMF.H264.EnforceHRDCompatibility="Принудительная HRD совместимость"
+AMF.H264.MaximumAccessUnitSize="Максимальный Размер Блока Доступа"
+AMF.H264.KeyframeInterval="Интервал ключевых кадров"
+AMF.H264.KeyframeInterval.Description="Сколько секунд должен быть просадок кадров.\nТакже контролирует GOP Size."
+AMF.H264.IDRPeriod="Период IDR"
+AMF.H264.IDRPeriod.Description="Сколько кадров должно быть что-бы не было просадка кадров.\nТакже контролирует GOP Size."
+AMF.H264.HeaderInsertionSpacing="Расстояние вставки заголовка"
+AMF.H264.BPicture.Pattern="Патерн B-кадра"
+AMF.H264.BPicture.Reference="Референс B-кадра"
+AMF.H264.BPicture.Reference.Description="Разрешает B-Кадрам ссылаться на другие B-Кадры как и на P- и I-Кадры.\nОгромный урон производительности, исправление низкого качества."
 AMF.H264.DeblockingFilter="Фильтр деблокинга"
+AMF.H264.DeblockingFilter.Description="Устанавливает флаг, что декодер может использовать фильтр удаления блочности для прямой трансляции."
+AMF.H264.SlicesPerFrame="Количество частей на кадр"
+AMF.H264.IntraRefreshNumMBsPerSlot="Интра-обновить Количество Макроблоков в слот"
 AMF.H264.ScanType="Развертка"
+AMF.H264.ScanType.Description="Какой режим сканирования использовать; всегда оставляется этот параметр на 'прогрессивном'."
 AMF.H264.ScanType.Progressive="Прогрессивная"
 AMF.H264.ScanType.Interlaced="Чересстрочная"
-AMF.H264.BPicture.Pattern="Патерн B-кадра"
-AMF.H264.BPicture.Reference="Референс B-кадра"
-AMF.H264.GOPSize="Размер GOP"
+AMF.H264.QualityPreset="Предустановки качества"
+AMF.H264.QualityPreset.Description="К какому пресету качества AMF нужно стремиться:\n-'Speed' самый быстрый, но имеет самое низкое качество,\n-'Balanced' между 'Speed' и 'Quality', предоставляет хорошее соотношение между скоростью и качеством,\n-'Quality' предоставляет наилучшее качество для предоставленного битрейта."
+AMF.H264.QualityPreset.Speed="Скорость"
+AMF.H264.QualityPreset.Balanced="Баланс"
+AMF.H264.QualityPreset.Quality="Качество"
+AMF.H264.MotionEstimation="Оценка движения"
+AMF.H264.MotionEstimation.Description="Оценки движения позволяет кодировщику необходимость уменьшить Битрейт, оценивая, где пиксель прошел."
+AMF.H264.MotionEstimation.None="Нет"
+AMF.H264.MotionEstimation.Half="Пол-пиксельная"
+AMF.H264.MotionEstimation.Quarter="Четверть-пиксельная"
+AMF.H264.MotionEstimation.Both="Пол- & Четверть-пиксельная"
 AMF.H264.CABAC="Контекстно-адаптивное двоичное арифметическое кодирование (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing"
+AMF.H264.CABAC.Description="Использовать CABAC (Контекстно-адаптивное двоичное арифметическое кодирование) вместо CALV.\nНе влияет на качество, но помогает со сжатием. В среднем можно ожидать улучшение сжатия на 5%."
 AMF.H264.MemoryType="Тип памяти"
-AMF.H264.ComputeType="Тип вычислений"
+AMF.H264.MemoryType.Description="Как кадры должны быть сохранены перед передачей кодировщику:\n-'Автоматически' выбирает наилучший доступный источник памяти,\n-Host использует системную память,\n-DirectX 9 использует DirectX для передачи,\n-DirectX 11 использует DirectX для передачи,\n-OpenGL использует OpenGL для передачи.\n\n'Host' хороший выбор для большинства систем, но порой DirectX может помочь в ситуациях высокой нагрузки."
 AMF.H264.SurfaceFormat="Формат поверхности"
-
-AMF.H264Advanced.Name="Кодировщик H.264 [Расширенный] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Сбрость настройки"
-AMF.H264Advanced.Update="Скопировать настройки из AMF (если стоят по умолчанию/-1)"
-AMF.H264Advanced.MaxLTRFrames="Максимум LTR кадров"
-AMF.H264Advanced.VBVBuffer.Size="VBV размер буфера (в Битах)"
-AMF.H264Advanced.VBVBuffer.Fullness="Первоначальное заполнение буфера VBV"
-AMF.H264Advanced.MaxAUSize="Максимальный размер AU (в Битах)"
-AMF.H264Advanced.HeaderInsertionSpacing="Расстояние вставки заголовка (в кадрах)"
-AMF.H264Advanced.IDRPeriod="IDR (Keyframe) период (в Кадрах)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory на слот в макроблоках (в MB)"
-AMF.H264Advanced.SlicesPerFrame="Количество частей (slices) на кадр"
-AMF.H264Advanced.MotionEstimation="Оценка движения"
-AMF.H264Advanced.MotionEstimation.None="Нет"
-AMF.H264Advanced.MotionEstimation.Half="Полу-пиксельная точность"
-AMF.H264Advanced.MotionEstimation.Quarter="Четверть-пиксельная точность"
-AMF.H264Advanced.MotionEstimation.Both="Оба"
-
-AMF.H264Simple.Name="Кодировщик H.264 (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Предустановки"
-AMF.H264Simple.Preset.Recording="Локальная запись"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.Preset.HighQuality="Высокое качество"
-AMF.H264Simple.Preset.Indistinguishable="Незаметные потери"
-AMF.H264Simple.Preset.Lossless="Без потерь"
-AMF.H264Simple.KeyframeInterval="Интервал ключевых кадров (сек)"
-AMF.H264Simple.UseCustomBufferSize="Использовать пользовательский размер буфера"
-AMF.H264Simple.CustomBufferSize="Размер буфера (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="Первоначальное заполнение буфера"
-AMF.H264Simple.UseCustomGOPSize="Использовать пользовательский размер GOP"
-AMF.H264Simple.ShowAdvancedParameters="Показать расширенные параметры"
-AMF.H264Simple.ShowExpertParameters="Показать дополнительные параметры"
-
+AMF.H264.SurfaceFormat.Description="Какой формат использоваться для кодирования.\nТолько NV12 изначально поддерживается, другие типы требуют преобразования."
+AMF.H264.View="Режим просмотра"
+AMF.H264.View.Description="Какие параметры должны быть видны. Вы не будете получать поддержку при использовании режимов 'Эксперт' и 'Мастер'."
+AMF.H264.View.Basic="Обычный"
+AMF.H264.View.Advanced="Расширенный"
+AMF.H264.View.Expert="Эксперт"
+AMF.H264.View.Master="Мастер"
+AMF.H264.UnlockProperties="Разблокировать параметры"
+AMF.H264.UnlockProperties.Description="Разблокировать определённые параметры до их полного, неограниченного диапазона."
+AMF.H264.Debug="Отладка"
+AMF.H264.Debug.Description="Включить дополнительные логи для отладки; следует включить, если вам нужна поддержка с этим кодировщиком."
 AMF.Util.Default="По умолчанию"
 AMF.Util.Automatic="Автоматически"
+AMF.Util.Manual="Руководство"
 AMF.Util.Toggle.Disabled="Выключено"
 AMF.Util.Toggle.Enabled="Включено"
-

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/sr-CS.ini Added

@@ -0,0 +1,39 @@
+AMF.H264.Usage.Transcoding="Transkodiranje"
+AMF.H264.Usage.UltraLowLatency="Ultra nisko kašnjenje"
+AMF.H264.Usage.LowLatency="Nisko kašnjenje"
+AMF.H264.Profile="Profil"
+AMF.H264.ProfileLevel="Nivo profila"
+AMF.H264.RateControlMethod="Metoda kontrole protoka"
+AMF.H264.RateControlMethod.CQP="Konstantan kvalitet (CQP)"
+AMF.H264.RateControlMethod.CBR="Konstantan protok (CBR)"
+AMF.H264.RateControlMethod.VBR.Peak="Promenjivi protok (sa gornjom granicom) (VBR)"
+AMF.H264.RateControlMethod.VBR.Latency="Promenjivi protok (sa granicom kašnjenja) (VBR_LAT)"
+AMF.H264.Bitrate.Target="Ciljani protok"
+AMF.H264.Bitrate.Peak="Granica protoka"
+AMF.H264.QP.Minimum="Minimalni QP"
+AMF.H264.QP.Maximum="Maksimalni QP"
+AMF.H264.QP.IFrame="I-Frejm QP"
+AMF.H264.QP.PFrame="P-Frejm QP"
+AMF.H264.QP.BFrame="B-Frejm QP"
+AMF.H264.QP.BPictureDelta="B-Promena slike QP"
+AMF.H264.QP.ReferenceBPictureDelta="Referenca B-Promena slike QP"
+AMF.H264.FillerData="Podaci za popunjavanje"
+AMF.H264.FrameSkipping="Preskakanje frejmova"
+AMF.H264.EnforceHRDCompatibility="Prisilna HRD kompatibilnost"
+AMF.H264.BPicture.Pattern="B-Šablonska slika"
+AMF.H264.BPicture.Reference="B-Referentna slika"
+AMF.H264.DeblockingFilter="Odblokirajući filter"
+AMF.H264.ScanType="Vrsta skeniranja"
+AMF.H264.ScanType.Progressive="Progresivno"
+AMF.H264.ScanType.Interlaced="Isprekidano"
+AMF.H264.QualityPreset="Šablon kvaliteta"
+AMF.H264.QualityPreset.Speed="Brzina"
+AMF.H264.QualityPreset.Balanced="Izbalansirano"
+AMF.H264.QualityPreset.Quality="Kvalitet"
+AMF.H264.CABAC="Binarno aritmetičko kodiranje prilagodljivo sadržaju (CABAC)"
+AMF.H264.MemoryType="Vrsta memorije"
+AMF.H264.SurfaceFormat="Format površine"
+AMF.Util.Default="Podrazumevano"
+AMF.Util.Automatic="Automatski"
+AMF.Util.Toggle.Disabled="Onemogućeno"
+AMF.Util.Toggle.Enabled="Omogućeno"

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/sr-SP.ini Added

@@ -0,0 +1,39 @@
+AMF.H264.Usage.Transcoding="Транскодирање"
+AMF.H264.Usage.UltraLowLatency="Ултра ниско кашњење"
+AMF.H264.Usage.LowLatency="Ниско кашњење"
+AMF.H264.Profile="Профил"
+AMF.H264.ProfileLevel="Ниво профила"
+AMF.H264.RateControlMethod="Метода контроле протока"
+AMF.H264.RateControlMethod.CQP="Константан квалитет (CQP)"
+AMF.H264.RateControlMethod.CBR="Константан проток (CBR)"
+AMF.H264.RateControlMethod.VBR.Peak="Промењиви проток (са горњом границом) (VBR)"
+AMF.H264.RateControlMethod.VBR.Latency="Промењиви проток (са границом кашњења) (VBR_LAT)"
+AMF.H264.Bitrate.Target="Циљани проток"
+AMF.H264.Bitrate.Peak="Граница протока"
+AMF.H264.QP.Minimum="Минимални QP"
+AMF.H264.QP.Maximum="Максимални QP"
+AMF.H264.QP.IFrame="I-Фрејм QP"
+AMF.H264.QP.PFrame="P-Фрејм QP"
+AMF.H264.QP.BFrame="B-Фрејм QP"
+AMF.H264.QP.BPictureDelta="B-Промена слике QP"
+AMF.H264.QP.ReferenceBPictureDelta="Референца B-Промена слике QP"
+AMF.H264.FillerData="Подаци за попуњавање"
+AMF.H264.FrameSkipping="Прескакање фрејмова"
+AMF.H264.EnforceHRDCompatibility="Присилна HRD компатибилност"
+AMF.H264.BPicture.Pattern="B-Шаблонска слика"
+AMF.H264.BPicture.Reference="B-Референтна слика"
+AMF.H264.DeblockingFilter="Одблокирајући филтер"
+AMF.H264.ScanType="Врста скенирања"
+AMF.H264.ScanType.Progressive="Прогресивно"
+AMF.H264.ScanType.Interlaced="Испрекидано"
+AMF.H264.QualityPreset="Шаблон квалитета"
+AMF.H264.QualityPreset.Speed="Брзина"
+AMF.H264.QualityPreset.Balanced="Избалансирано"
+AMF.H264.QualityPreset.Quality="Квалитет"
+AMF.H264.CABAC="Бинарно аритметичко кодирање прилагодљиво садржају (CABAC)"
+AMF.H264.MemoryType="Врста меморије"
+AMF.H264.SurfaceFormat="Формат површине"
+AMF.Util.Default="Подразумевано"
+AMF.Util.Automatic="Аутоматски"
+AMF.Util.Toggle.Disabled="Онемогућено"
+AMF.Util.Toggle.Enabled="Омогућено"

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/sv-SE.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/sv-SE.ini Changed

@@ -1,44 +1,41 @@
-AMF.H264.Usage="Användningstyp"
+AMF.H264.Preset="Förinställning"
+AMF.H264.Preset.HighQuality="Hög kvalitet"
+AMF.H264.Preset.Indistinguishable="Oskiljbar"
+AMF.H264.Preset.Lossless="Förlustfri"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Användning"
+AMF.H264.Usage.Transcoding="Omkodning"
 AMF.H264.Usage.UltraLowLatency="Ultralåg latens"
 AMF.H264.Usage.LowLatency="Låg latens"
-AMF.H264.Usage.Webcam="Webbkamera"
-AMF.H264.QualityPreset="Kvalitetsförinställning"
-AMF.H264.QualityPreset.Speed="Hastighet"
-AMF.H264.QualityPreset.Balanced="Balanserad"
-AMF.H264.QualityPreset.Quality="Kvalitet"
 AMF.H264.Profile="Profil"
 AMF.H264.ProfileLevel="Profilnivå"
 AMF.H264.RateControlMethod.CQP="Konstant QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Konstant bithastighet (CBR)"
 AMF.H264.Bitrate.Target="Målets bithastighet"
+AMF.H264.Bitrate.Peak="Maximal bithastighet"
 AMF.H264.QP.Minimum="Minimal QP"
 AMF.H264.QP.Maximum="Maximal QP"
+AMF.H264.FrameSkipping="Hoppa över bildrutor"
 AMF.H264.EnforceHRDCompatibility="Tvinga HRD-kompatibilitet"
 AMF.H264.DeblockingFilter="Avblockningsfilter"
 AMF.H264.ScanType="Typ av skanning"
 AMF.H264.ScanType.Progressive="Progressiv"
-AMF.H264.GOPSize="GOP-storlek"
+AMF.H264.ScanType.Interlaced="Sammanflätad"
+AMF.H264.QualityPreset="Kvalitetsförinställning"
+AMF.H264.QualityPreset.Speed="Hastighet"
+AMF.H264.QualityPreset.Balanced="Balanserad"
+AMF.H264.QualityPreset.Quality="Kvalitet"
+AMF.H264.MotionEstimation.None="Ingen"
 AMF.H264.MemoryType="Minnestyp"
-
-AMF.H264Advanced.Name="H264-kodare [Avancerad] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Grundinställningar"
-AMF.H264Advanced.MotionEstimation.None="Ingen"
-AMF.H264Advanced.MotionEstimation.Both="Båda"
-
-AMF.H264Simple.Name="H264-kodare (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Förinställning"
-AMF.H264Simple.Preset.Recording="Inspelning"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Intervall för keyframes (sekunder)"
-AMF.H264Simple.UseCustomBufferSize="Använd anpassad buffertstorlek"
-AMF.H264Simple.CustomBufferSize="Buffertstorlek (kbit/s)"
-AMF.H264Simple.UseCustomGOPSize="Använd anpassad GOP-storlek"
-AMF.H264Simple.ShowAdvancedParameters="Visa avancerade parametrar"
-AMF.H264Simple.ShowExpertParameters="Visa expertparametrar"
-
+AMF.H264.View="Visningsläge"
+AMF.H264.View.Basic="Grundläggande"
+AMF.H264.View.Advanced="Avancerad"
+AMF.H264.View.Expert="Expert"
+AMF.H264.View.Master="Master"
+AMF.H264.Debug="Felsök"
 AMF.Util.Default="Standard"
 AMF.Util.Automatic="Automatisk"
+AMF.Util.Manual="Manuell"
 AMF.Util.Toggle.Disabled="Inaktiverad"
 AMF.Util.Toggle.Enabled="Aktiverad"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/uk-UA.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/uk-UA.ini Changed

@@ -1,15 +1,19 @@
-AMF.H264.Usage="Тип використання"
+AMF.H264.Preset="Шаблон"
+AMF.H264.Preset.Recording="Звичайний запис"
+AMF.H264.Preset.HighQuality="Висока якість"
+AMF.H264.Preset.Indistinguishable="Якість майже без втрат"
+AMF.H264.Preset.Lossless="Без втрат якості"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Використання"
+AMF.H264.Usage.Description="Тип використання AMF або напрямок його використання, тобто:\n  'Для перекодування' - загальний тип налаштувань (рекомендований).\n  'З ультра-низькою затримкою' - тип лише для дійсно низької затримки під час кодування.\n  'З низькою затримкою' - схожий на зазначений вище, але з трохи більшою затримкою.\n\nТрансляції підтримують лише напрямок використання 'Для перекодування'."
 AMF.H264.Usage.Transcoding="Для перекодування"
 AMF.H264.Usage.UltraLowLatency="З ультра-низькою затримкою"
 AMF.H264.Usage.LowLatency="З низькою затримкою"
-AMF.H264.Usage.Webcam="Для вебкамери"
-AMF.H264.QualityPreset="Шаблон якості"
-AMF.H264.QualityPreset.Speed="Швидкість"
-AMF.H264.QualityPreset.Balanced="Збалансований"
-AMF.H264.QualityPreset.Quality="Якість"
 AMF.H264.Profile="Профіль"
 AMF.H264.ProfileLevel="Рівень профілю"
-AMF.H264.RateControlMethod="Контроль потоку"
+AMF.H264.MaximumLTRFrames="Кількість LTR-кадрів контрольованих користувачем"
+AMF.H264.MaximumLTRFrames.Description="Long-Term Reference (LTR) кадри дозволяють при кодуванні маркувати декілька кадрів як опорні для інших.\nЦе може поліпшити якість у разі відсутності підтримки B-кадрів або небажаності їх використання.\nЯкщо 'Кількість LTR-кадрів контрольованих користувачем' вказано, то енкодер не підтримуватиме B-кадри у відео."
 AMF.H264.RateControlMethod.CQP="Фіксований QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Постійний бітрейт (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="Змінний бітрейт (максимальний бітрейт обмежено) (VBR)"
@@ -23,53 +27,50 @@
 AMF.H264.QP.BFrame="QP для B-кадрів"
 AMF.H264.QP.BPictureDelta="B-кадри, відхил QP"
 AMF.H264.QP.ReferenceBPictureDelta="Опорні B-кадри, відхил QP"
+AMF.H264.VBVBuffer="Буфер VBV"
+AMF.H264.VBVBuffer.Size="Розмір VBV буфера"
+AMF.H264.VBVBuffer.Fullness="Початкова повнота буферу VBV"
+AMF.H264.VBVBuffer.Fullness.Description="Визначає початкову заповнюваність Буферу VBV, діє лише на початку кодування."
 AMF.H264.FillerData="Заповнювати пустоти у бітрейту"
 AMF.H264.FrameSkipping="Пропускати кадри"
 AMF.H264.EnforceHRDCompatibility="Застосувати примусову сумісність з HRD"
+AMF.H264.MaximumAccessUnitSize="Максимальний розмір Access Unit"
+AMF.H264.KeyframeInterval="Інтервал ключових кадрів"
+AMF.H264.IDRPeriod="IDR, період (кадрів)"
+AMF.H264.HeaderInsertionSpacing="Заголовки потоку, період (кадрів)"
+AMF.H264.BPicture.Pattern="Послідовні B-кадри"
+AMF.H264.BPicture.Reference="B-кадри як опорні"
 AMF.H264.DeblockingFilter="Деблокінг-фільтр"
+AMF.H264.SlicesPerFrame="Фрагментів на кадр"
+AMF.H264.IntraRefreshNumMBsPerSlot="Кількість Intra-Refresh макроблоків на слот"
 AMF.H264.ScanType="Вид розгортки"
 AMF.H264.ScanType.Progressive="Прогресивна"
 AMF.H264.ScanType.Interlaced="Черезрядкова"
-AMF.H264.BPicture.Pattern="Послідовні B-кадри"
-AMF.H264.BPicture.Reference="B-кадри як опорні"
-AMF.H264.GOPSize="Розмір GOP"
+AMF.H264.QualityPreset="Шаблон якості"
+AMF.H264.QualityPreset.Speed="Швидкість"
+AMF.H264.QualityPreset.Balanced="Збалансований"
+AMF.H264.QualityPreset.Quality="Якість"
+AMF.H264.MotionEstimation="Оцінка руху"
+AMF.H264.MotionEstimation.Description="Оцінка руху дозволяє енкодеру зменшити вимоги до бітрейту завдяки розрахункам з переміщення пікселів."
+AMF.H264.MotionEstimation.None="Немає"
+AMF.H264.MotionEstimation.Half="Пів-пікселя"
+AMF.H264.MotionEstimation.Quarter="Чверть-пікселя"
+AMF.H264.MotionEstimation.Both="Пів-пікселя та Чверть-пікселя"
 AMF.H264.CABAC="CABAC кодування"
-AMF.H264.DebugTracing="Інформація для відладки"
 AMF.H264.MemoryType="Пам'ять адресується"
-AMF.H264.ComputeType="Використовувати бібліотеки"
+AMF.H264.MemoryType.Description="Визначає як кадри зберігатимуться перед надсиланням до енкодеру:\n  'Автоматично' - програма обирає найкращий спосіб самостійно;\n  'Host' - буде використано системну пам'ять;\n  'DirectX 9' - використовуються поверхні DirectX9 (Windows), пам'ять\nграфічного адаптера;\n  'DirectX 11' - використовуються поверхні DirectX11 (для Windows 8.1\nта новіших), пам'ять графічного адаптера;\n  'OpenGL' - використовуються поверхні OpenGL, пам'ять графічного\nадаптера.\n\nHost - достатньо гарний вибір для багатьох систем, хоча DirectX можна\nвикористати у край навантажених ситуаціях обміну даними (інколи допомагає)."
 AMF.H264.SurfaceFormat="Формат поверхні (або кольору)"
-
-AMF.H264Advanced.Name="H264 енкодер [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Відновити параметри за замовчанням"
-AMF.H264Advanced.MaxLTRFrames="Кількість LTR-кадрів"
-AMF.H264Advanced.VBVBuffer.Size="Розмір VBV буфера (біт)"
-AMF.H264Advanced.VBVBuffer.Fullness="Початкова повнота буферу VBV"
-AMF.H264Advanced.MaxAUSize="Максимальний розмір AU (біт)"
-AMF.H264Advanced.HeaderInsertionSpacing="Заголовки потоку, період (кадрів)"
-AMF.H264Advanced.IDRPeriod="Ключові кадри, період (кадрів)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Кількість Intra-Refresh макроблоків на слот"
-AMF.H264Advanced.SlicesPerFrame="Фрагментів на кадр"
-AMF.H264Advanced.MotionEstimation="Оцінка руху"
-AMF.H264Advanced.MotionEstimation.None="Немає"
-AMF.H264Advanced.MotionEstimation.Half="Тільки Пів-пікселя"
-AMF.H264Advanced.MotionEstimation.Quarter="Тільки Чверть-пікселя"
-AMF.H264Advanced.MotionEstimation.Both="Обидва методи (Пів-пікселя + Чверть-пікселя)"
-
-AMF.H264Simple.Name="H264 енкодер (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Шаблон"
-AMF.H264Simple.Preset.Recording="Локальний запис"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Інтервал ключових кадрів (секунд)"
-AMF.H264Simple.UseCustomBufferSize="Розмір буфера за користувачем"
-AMF.H264Simple.CustomBufferSize="Розмір буфера (кбіт/c)"
-AMF.H264Simple.CustomBufferFullness="Початкова повнота буферу"
-AMF.H264Simple.UseCustomGOPSize="Розмір GOP за користувачем"
-AMF.H264Simple.ShowAdvancedParameters="Показати додаткові параметри"
-AMF.H264Simple.ShowExpertParameters="Показати екстра параметри"
-
+AMF.H264.SurfaceFormat.Description="Визначає Формат поверхні (кольору) що використовується для кодування.\nЛише NV12 має вбудовану підтримку, інші типи потребують додаткового перетворення."
+AMF.H264.View="Вид для налаштувань"
+AMF.H264.View.Description="Визначає кількість наявних опцій для налаштування. Навряд чи розробник вам допомагатиме, якщо ви оберете рівень 'Експерт' або 'Бог енкодерів'."
+AMF.H264.View.Basic="Базовий"
+AMF.H264.View.Advanced="Розширений"
+AMF.H264.View.Expert="Експерт"
+AMF.H264.View.Master="Бог енкодерів"
+AMF.H264.Debug="Відладка"
+AMF.H264.Debug.Description="Вмикає занесення до лог-файлу додаткової інформації про процес кодування. Корисно у випадку коли ви бажаєте звернутися за допомогою до розробника енкодера."
 AMF.Util.Default="За замовчанням"
 AMF.Util.Automatic="Автоматично"
+AMF.Util.Manual="Вручну"
 AMF.Util.Toggle.Disabled="Вимкнено"
 AMF.Util.Toggle.Enabled="Увімкнено"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/vi-VN.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/vi-VN.ini Changed

@@ -1,14 +1,16 @@
-AMF.H264.Usage="Sử dụng loại"
+AMF.H264.Preset="Mẫu thiết lập"
+AMF.H264.Preset.Recording="Quay video"
+AMF.H264.Preset.HighQuality="Chất lượng cao"
+AMF.H264.Preset.Indistinguishable="Không thể phân biệt"
+AMF.H264.Preset.Lossless="Lossless"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
 AMF.H264.Usage.Transcoding="Chuyển mã"
 AMF.H264.Usage.UltraLowLatency="Độ trễ cực thấp"
 AMF.H264.Usage.LowLatency="Độ trễ thấp"
-AMF.H264.Usage.Webcam="Webcam"
-AMF.H264.QualityPreset="Quality Preset"
-AMF.H264.QualityPreset.Speed="Tốc độ"
-AMF.H264.QualityPreset.Balanced="Cân bằng"
-AMF.H264.QualityPreset.Quality="Chất lượng"
 AMF.H264.Profile="Profile"
 AMF.H264.ProfileLevel="Profile Level"
+AMF.H264.MaximumLTRFrames="LTR Frames tối đa"
 AMF.H264.RateControlMethod="Cách kiểm soát Bitrate"
 AMF.H264.RateControlMethod.CQP="QP Không thay đổi (CQP)"
 AMF.H264.RateControlMethod.CBR="Bitrate Không thay đổi (CBR)"
@@ -22,48 +24,41 @@
 AMF.H264.QP.PFrame="P-Frame QP"
 AMF.H264.QP.BFrame="B-Frame QP"
 AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
+AMF.H264.QP.ReferenceBPictureDelta="Reference B-Picture Delta QP"
 AMF.H264.FillerData="Filler Data (Thêm data cho đủ bitrate)"
 AMF.H264.FrameSkipping="Frame Skipping"
 AMF.H264.EnforceHRDCompatibility="Enforce HRD Compatibility"
+AMF.H264.KeyframeInterval="Thời gian đặt keyframe"
+AMF.H264.BPicture.Pattern="B-Picture Pattern"
+AMF.H264.BPicture.Reference="B-Picture Reference"
 AMF.H264.DeblockingFilter="De-blocking Filter (Lọc chống nhiễu ảnh)"
+AMF.H264.SlicesPerFrame="Lát cho mỗi khung hình"
 AMF.H264.ScanType="Quét hình loại"
 AMF.H264.ScanType.Progressive="Quét nguyên ảnh (Progressive)"
 AMF.H264.ScanType.Interlaced="Quét 1/2 ảnh (Interlaced)"
-AMF.H264.BPicture.Pattern="B-Picture Pattern"
-AMF.H264.BPicture.Reference="B-Picture Reference"
-AMF.H264.GOPSize="Kích cỡ GOP"
+AMF.H264.QualityPreset="Quality Preset"
+AMF.H264.QualityPreset.Speed="Tốc độ"
+AMF.H264.QualityPreset.Balanced="Cân bằng"
+AMF.H264.QualityPreset.Quality="Chất lượng"
+AMF.H264.MotionEstimation="Dự đoán bù trừ chuyển động"
+AMF.H264.MotionEstimation.Description="Dự toán chuyển động cho phép bộ mã hóa giảm bitrate cần thiết bằng cách ước tính một pixel sẽ đi đâu."
+AMF.H264.MotionEstimation.None="Không"
+AMF.H264.MotionEstimation.Half="1/2 Pixel"
+AMF.H264.MotionEstimation.Quarter="1/4 Pixel"
+AMF.H264.MotionEstimation.Both="1/2 và 1/4 Pixel"
 AMF.H264.CABAC="Nén lossless theo tình huống (CABAC)"
-AMF.H264.DebugTracing="Debug Tracing (Dò lỗi)"
-
-AMF.H264Advanced.Name="H264 Encoder [Nâng cao] (AMD Advanced Media Framework)"
-AMF.H264Advanced.Reset="Thiết lập về mặc định"
-AMF.H264Advanced.Update="Cập nhật giá trị từ AMF (Nếu mặc định/-1)"
-AMF.H264Advanced.MaxLTRFrames="LTR Frames tối đa"
-AMF.H264Advanced.VBVBuffer.Size="VBV Buffer Size (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="Initial VBV Buffer Fullness"
-AMF.H264Advanced.MaxAUSize="AU Size tối đa (bits)"
-AMF.H264Advanced.HeaderInsertionSpacing="Header Insertion Spacing (Frames)"
-AMF.H264Advanced.IDRPeriod="Keyframe IDR-Period (Frames)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="Intra-Refresh Memory Per Slot In Macroblocks (trong MB)"
-AMF.H264Advanced.SlicesPerFrame="Slices Per Frame"
-AMF.H264Advanced.MotionEstimation="Dự đoán bù trừ chuyển động"
-AMF.H264Advanced.MotionEstimation.None="Không"
-AMF.H264Advanced.MotionEstimation.Half="Chỉ 1/2"
-AMF.H264Advanced.MotionEstimation.Quarter="Chỉ 1/4"
-AMF.H264Advanced.MotionEstimation.Both="Cả hai"
-
-AMF.H264Simple.Name="H264 Encoder (AMD Advanced Media Framework)"
-AMF.H264Simple.Preset="Preset"
-AMF.H264Simple.Preset.Recording="Quay video"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="Thời gian đặt Keyframe (giây)"
-AMF.H264Simple.UseCustomBufferSize="Dùng Custom Buffer Size"
-AMF.H264Simple.CustomBufferSize="Buffer Size (kbit/s)"
-AMF.H264Simple.UseCustomGOPSize="Dùng Kích cỡ GOP tùy chỉnh"
-AMF.H264Simple.ShowAdvancedParameters="Hiện các thông số nâng cao"
-
+AMF.H264.CABAC.Description="Sử dụng CABAC (Context Adaptive Binary Arithmethic Coding) thay vì CALV.\nKhông ảnh hưởng đến chất lượng nhưng tăng khả năng nén. Trung bình có thể nén được 5% tổng dung lượng."
+AMF.H264.MemoryType="Loại bộ nhớ"
+AMF.H264.SurfaceFormat="Định dạng bề mặt"
+AMF.H264.View="Chế độ xem"
+AMF.H264.View.Basic="Cơ bản"
+AMF.H264.View.Advanced="Nâng cao"
+AMF.H264.View.Expert="Chuyên gia"
+AMF.H264.View.Master="Bật cả tính năng ẩn"
+AMF.H264.UnlockProperties="Mở khóa Properties"
+AMF.H264.Debug="Gỡ lỗi"
 AMF.Util.Default="Mặc định"
+AMF.Util.Automatic="Tự động"
+AMF.Util.Manual="Thủ công"
 AMF.Util.Toggle.Disabled="Tắt"
 AMF.Util.Toggle.Enabled="Bật"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/zh-CN.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/zh-CN.ini Changed

@@ -1,76 +1,107 @@
-AMF.H264.Usage="使用类型"
+AMF.H264.Preset="预设"
+AMF.H264.Preset.Recording="录像"
+AMF.H264.Preset.HighQuality="高质量"
+AMF.H264.Preset.Indistinguishable="无法区分"
+AMF.H264.Preset.Lossless="无损"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="使用"
+AMF.H264.Usage.Description="AMF 应调整为什么用法:\n-'转码' 是通用转码(推荐), \n '超低延迟' 对于真的低延迟编码,\n-'低延迟' 类似于上面稍高的延迟.\n 推流仅支持 '转码', 所有其他值可以用于录制."
 AMF.H264.Usage.Transcoding="转码"
 AMF.H264.Usage.UltraLowLatency="超低延迟"
 AMF.H264.Usage.LowLatency="低延迟"
-AMF.H264.Usage.Webcam="网络摄像头"
-AMF.H264.QualityPreset="质量预设"
-AMF.H264.QualityPreset.Speed="速度"
-AMF.H264.QualityPreset.Balanced="平衡"
-AMF.H264.QualityPreset.Quality="质量"
 AMF.H264.Profile="配置文件"
+AMF.H264.Profile.Description="使用哪个 H.264 Profile 来编码:\n-'Baseline' 最广泛支持,\n-'Main'被 95% 设备支持(推荐),\n-'High' 只被高端设备支持."
 AMF.H264.ProfileLevel="配置等级"
+AMF.H264.ProfileLevel.Description="对于编码使用哪种 H.264 Profile Level:\n-'Automatic' 根据给定的帧率和帧大小计算最优的 profile level,\n-'4.1' 支持 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n-'4.2' 支持 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n-'5.0' 支持 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n-'5.1' 支持 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n-'5.2' 支持 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
+AMF.H264.MaximumLTRFrames="最大的 LTR 帧"
+AMF.H264.MaximumLTRFrames.Description="长期参考帧(LTR) 是一个特性允许编码器来标记在一个序列的一些帧作为参考帧.\n这会使当 B 帧不支持或者不需要时提高质量.\nLTR真不能和 B 帧一起使用, 并且当使用LTR时, 编码器会禁用 B 帧."
 AMF.H264.RateControlMethod="速率控制方法"
 AMF.H264.RateControlMethod.CQP="恒定 QP (CQP)"
 AMF.H264.RateControlMethod.CBR="固定比特率 (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="变比特率 (峰值约束) (VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="变比特率 (延迟约束) (VBR_LAT)"
 AMF.H264.Bitrate.Target="目标比特率"
+AMF.H264.Bitrate.Target.Description="比特率尝试在整个序列获得.\n用于 CBR 和 VBR_LAT."
 AMF.H264.Bitrate.Peak="峰值比特率"
+AMF.H264.Bitrate.Peak.Description="比特率尝试最大峰值在整个序列.\n 用于 VBR 和 VBR_LAT"
 AMF.H264.QP.Minimum="最低 QP"
+AMF.H264.QP.Minimum.Description="在一个帧中的追的 QP 值.\n 用于 CBR, VBR 和 VBR_LAT."
 AMF.H264.QP.Maximum="最高 QP"
+AMF.H264.QP.Maximum.Description="在一个帧中的最高 QP 值.\n 用于 CBR, VBR 和 VBR_LAT."
 AMF.H264.QP.IFrame="I 帧 QP"
+AMF.H264.QP.IFrame.Description="用于 I 帧的固定 QP 值.\n 较低 = 较大的文件, 较好的资料. 较高 = 较小的文件, 较差的质量.\nI 帧 QP 应该等于或者大于 P 和 B 帧的 QP 值.\n 用于 CQP."
 AMF.H264.QP.PFrame="P 帧 QP"
+AMF.H264.QP.PFrame.Description="固定的 QP 值用于 P 帧.\n 较低 = 较大的文件, 较高的质量. 较高 = 较小的文件, 较差的质量.\nP 帧 QP 值应该等于或者高于 B 帧的 QP 值.\n用于 CQP."
 AMF.H264.QP.BFrame="B 帧 QP"
+AMF.H264.QP.BFrame.Description="用于 B 帧的固定的 QP 值.\n 较小 = 较大的文件, 较好的质量. 较大 = 较小的文件, 较差的质量.\n 用于 CQP."
 AMF.H264.QP.BPictureDelta="B 图片 差值 QP"
+AMF.H264.QP.BPictureDelta.Description="相对于上一个非参考 B 帧的差值 QP 值."
 AMF.H264.QP.ReferenceBPictureDelta="参考 B 图片 差值 QP"
+AMF.H264.QP.ReferenceBPictureDelta.Description="相对于上一个参考 B 帧的差值 QP 值."
+AMF.H264.VBVBuffer="VBV 缓存"
+AMF.H264.VBVBuffer.Strictness="VBV 缓存规范性"
+AMF.H264.VBVBuffer.Strictness.Description="VBV 缓存应该怎样严格, 100% 几乎完全和目标比特率一致和 0% 不受限制的."
+AMF.H264.VBVBuffer.Size="VBV 缓存大小"
+AMF.H264.VBVBuffer.Size.Description="VBV 缓存大小用于在一个序列中的比特率控制.\n体积小会产生几乎完美的比特率控制但有较大的性能影响.\n理想的(100% 严格) VBV 缓存大小是比特率/帧率."
+AMF.H264.VBVBuffer.Fullness="VBV 缓冲满"
+AMF.H264.VBVBuffer.Fullness.Description="VBV 缓存最初应该多满, 将只会影响最初的序列的编码."
 AMF.H264.FillerData="填充数据"
+AMF.H264.FillerData.Description="填充数据是解码器忽略的空/无效数据.\n如果启用和使用 CBR, 编码器将会塞满序列中的剩余空间此数据."
 AMF.H264.FrameSkipping="跳过的帧"
+AMF.H264.FrameSkipping.Description="跳过的帧允许编码器有选择地跳过帧, 如果他们非常相似, 或太长时间编码.\n编码这个将使输出文件为可变帧率, 这样大多数编辑软件不支持."
 AMF.H264.EnforceHRDCompatibility="强制 HRD 兼容"
+AMF.H264.EnforceHRDCompatibility.Description="强制假设的参考解码器限制在一个帧内的最大的 QP 值更改.\n不推荐用于录制或推流, 并且应仅用于面向只有参考软件解码器的很老的设备."
+AMF.H264.MaximumAccessUnitSize="最大访问单元大小"
+AMF.H264.MaximumAccessUnitSize.Description="一个 NAL 的访问单元的最大大小. 值 0 允许编码器挑选最好的一个."
+AMF.H264.KeyframeInterval="关键帧间隔"
+AMF.H264.KeyframeInterval.Description="非丢弃帧之间应该多少秒.\n也控制序列(GOP) 的大小."
+AMF.H264.IDRPeriod="IDR 周期"
+AMF.H264.IDRPeriod.Description="非丢弃帧之间应该多少帧.\n也控制序列(GOP) 的大小."
+AMF.H264.HeaderInsertionSpacing="头部插入空白"
+AMF.H264.HeaderInsertionSpacing.Description="NAL 头之间应该多少帧. 不推荐改为非零(自动) 值."
+AMF.H264.BPicture.Pattern="B 图片模式"
+AMF.H264.BPicture.Reference="B 图片参考"
+AMF.H264.BPicture.Reference.Description="允许 B 帧参考 P 帧和 I 帧之外的其他 B 帧.\n 巨大的性能影响, 较小的质量提高."
 AMF.H264.DeblockingFilter="去块滤波"
+AMF.H264.DeblockingFilter.Description="设置解码器允许使用的标记, 用于编码流去块滤波器."
+AMF.H264.SlicesPerFrame="每帧的切片数"
+AMF.H264.SlicesPerFrame.Description="使用固定切片编码而不动态切片编码.\n可以帮助用大分辨率和帧率, 由于它允许更多的数据存储在相同的 profile level, 但大多时候会对质量有负面影响."
+AMF.H264.IntraRefreshNumMBsPerSlot="每个槽的内部宏块刷新数量"
+AMF.H264.IntraRefreshNumMBsPerSlot.Description="应该允许每个插槽中多少个宏块用于帧内刷新编码.\n帧内刷新编码允许更快的寻找和解码, 以一个较高的比特率为代价, 由于需要存储额外的数据.\n 推流时保持为默认值."
 AMF.H264.ScanType="扫描类型"
+AMF.H264.ScanType.Description="使用哪种扫描方法, 通常设置为'Progressive'."
 AMF.H264.ScanType.Progressive="渐进"
 AMF.H264.ScanType.Interlaced="交错"
-AMF.H264.BPicture.Pattern="B 图片模式"
-AMF.H264.BPicture.Reference="B 图片参考"
-AMF.H264.GOPSize="GOP 大小"
+AMF.H264.QualityPreset="质量预设"
+AMF.H264.QualityPreset.Description="哪种质量预设 AMF 应该尝试对于目标:\n-'速度' 是最快但有最差的质量,\n-'平衡' 是 '速度' 和 '质量' 之间, 提供一个两者之间的较好的平衡,\n-'质量' 给出了最好的质量对于给定的比特率."
+AMF.H264.QualityPreset.Speed="速度"
+AMF.H264.QualityPreset.Balanced="平衡"
+AMF.H264.QualityPreset.Quality="质量"
+AMF.H264.MotionEstimation="移动侦测"
+AMF.H264.MotionEstimation.Description="运动侦测允许编码器通过估计一个像素去了哪里来降低比特率."
+AMF.H264.MotionEstimation.None="无"
+AMF.H264.MotionEstimation.Half="半像素"
+AMF.H264.MotionEstimation.Quarter="四分之一像素"
+AMF.H264.MotionEstimation.Both="半&四分之一像素"
 AMF.H264.CABAC="上下文自适应二进制算术编码 (CABAC)"
-AMF.H264.DebugTracing="调试跟踪"
+AMF.H264.CABAC.Description="使用 CABAC(Context Adaptive Binary Arithmethic Coding) 取代 CALV.\n 不影响质量但是对压缩有帮助. 平均, 可以预期有 5% 更好的压缩率."
 AMF.H264.MemoryType="内存类型"
-AMF.H264.ComputeType="计算类型"
+AMF.H264.MemoryType.Description="在提交给编码器之前应该如何存储帧:\n-'自动' 选择最佳可用内存后端类型,\n- '主机' 使用系统内存,\n- 'DirectX 9' 使用 DirectX 接口来提交, \n- 'DirectX 11' 使用 DirectX 来提交, \n 'OpenGL' 使用 OpenGL 接口来提交.\n\n 'Host' 对于大多数系统不够好, 但 DirectX 可以偶尔缓解高负载的情况."
 AMF.H264.SurfaceFormat="表面格式"
-
-AMF.H264Advanced.Name="H264 编码器 [Advanced] (AMD 高级媒体框架)"
-AMF.H264Advanced.Reset="重设为默认值"
-AMF.H264Advanced.Update="更新来自 AMF 的值 (如果在默认 /-1)"
-AMF.H264Advanced.MaxLTRFrames="最大的 LTR 帧"
-AMF.H264Advanced.VBVBuffer.Size="VBV 缓冲区大小 (bits)"
-AMF.H264Advanced.VBVBuffer.Fullness="初始 VBV 缓冲区满"
-AMF.H264Advanced.MaxAUSize="最大化 AU 大小(比特)"
-AMF.H264Advanced.HeaderInsertionSpacing="头部插入空白 (帧)"
-AMF.H264Advanced.IDRPeriod="关键帧间隔 (帧)"
-AMF.H264Advanced.IntraRefreshNumMBPerSlot="在宏块中每个插槽的内刷新内存 (单位 MB)"
-AMF.H264Advanced.SlicesPerFrame="每帧的切片数"
-AMF.H264Advanced.MotionEstimation="移动侦测"
-AMF.H264Advanced.MotionEstimation.None="无"
-AMF.H264Advanced.MotionEstimation.Half="只有半像素"
-AMF.H264Advanced.MotionEstimation.Quarter="只有四分之一像素"
-AMF.H264Advanced.MotionEstimation.Both="两个"
-
-AMF.H264Simple.Name="H264 编码器 (AMD 高级媒体框架)"
-AMF.H264Simple.Preset="预设"
-AMF.H264Simple.Preset.Recording="录像"
-AMF.H264Simple.Preset.Twitch="Twitch"
-AMF.H264Simple.Preset.YouTube="YouTube"
-AMF.H264Simple.KeyframeInterval="关键帧间隔 (秒)"
-AMF.H264Simple.UseCustomBufferSize="使用自定义缓存大小"
-AMF.H264Simple.CustomBufferSize="缓冲大小 (kbit/s)"
-AMF.H264Simple.CustomBufferFullness="初始缓冲区满"
-AMF.H264Simple.UseCustomGOPSize="使用自定义 GOP 大小"
-AMF.H264Simple.ShowAdvancedParameters="显示高级参数"
-AMF.H264Simple.ShowExpertParameters="显示专家参数"
-
+AMF.H264.SurfaceFormat.Description="什么接口格式用于编码.\n 只有 NV12 本地支持, 其他类型需要转换."
+AMF.H264.View="查看模式"
+AMF.H264.View.Description="哪些属性应该是可见的. 当使用 '专家' 或者 '大师' 模式时, 您将不会得到支持."
+AMF.H264.View.Basic="基本"
+AMF.H264.View.Advanced="高级"
+AMF.H264.View.Expert="专家"
+AMF.H264.View.Master="主"
+AMF.H264.UnlockProperties="解锁属性"
+AMF.H264.UnlockProperties.Description="解锁给他们完整范围的某些属性, 而不是将他们局限到一定范围内."
+AMF.H264.Debug="调试"
+AMF.H264.Debug.Description="启用附加调试日志记录, 应该是启用的, 无论何时您需要此编码器的支持."
 AMF.Util.Default="默认"
 AMF.Util.Automatic="自动"
+AMF.Util.Manual="手动"
 AMF.Util.Toggle.Disabled="禁用"
 AMF.Util.Toggle.Enabled="启用"
-

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/zh-TW.ini -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Resources/locale/zh-TW.ini Changed

@@ -1,12 +1,6 @@
-AMF.H264.Usage="使用類型"
 AMF.H264.Usage.Transcoding="轉碼"
 AMF.H264.Usage.UltraLowLatency="超低延遲"
 AMF.H264.Usage.LowLatency="低延遲"
-AMF.H264.Usage.Webcam="網路攝影機"
-AMF.H264.QualityPreset="預設品質"
-AMF.H264.QualityPreset.Speed="速度"
-AMF.H264.QualityPreset.Balanced="平衡"
-AMF.H264.QualityPreset.Quality="品質"
 AMF.H264.Profile="設定檔"
 AMF.H264.ProfileLevel="設定檔級別"
 AMF.H264.RateControlMethod="速率控制方法"
@@ -21,13 +15,25 @@
 AMF.H264.QP.IFrame="I-訊框 QP"
 AMF.H264.QP.PFrame="P-訊框 QP"
 AMF.H264.QP.BFrame="B-訊框 QP"
+AMF.H264.QP.BPictureDelta="B-Picture Delta QP"
+AMF.H264.QP.ReferenceBPictureDelta="Reference B-Picture Delta QP"
+AMF.H264.FillerData="填充資料"
 AMF.H264.FrameSkipping="省略訊框"
-
-AMF.H264Advanced.Name="H264 編碼器 [Advanced] (AMD Advanced Media Framework)"
-AMF.H264Advanced.HeaderInsertionSpacing="標頭插入間距 (訊框)"
-AMF.H264Advanced.IDRPeriod="關鍵訊框週期 (訊框)"
-
-AMF.H264Simple.Name="H264 編碼器 (AMD Advanced Media Framework)"
-AMF.H264Simple.KeyframeInterval="關鍵訊框間隔 (秒)"
-
-
+AMF.H264.EnforceHRDCompatibility="與 HRD 相容"
+AMF.H264.BPicture.Pattern="B-Picture 模式"
+AMF.H264.BPicture.Reference="B-Picture 參照"
+AMF.H264.DeblockingFilter="去塊狀色斑濾鏡"
+AMF.H264.ScanType="掃描類型"
+AMF.H264.ScanType.Progressive="漸進式"
+AMF.H264.ScanType.Interlaced="交错式"
+AMF.H264.QualityPreset="預設品質"
+AMF.H264.QualityPreset.Speed="速度"
+AMF.H264.QualityPreset.Balanced="平衡"
+AMF.H264.QualityPreset.Quality="品質"
+AMF.H264.CABAC="前文參考之適應性二元算術編碼 (CABAC)"
+AMF.H264.MemoryType="記憶體類型"
+AMF.H264.SurfaceFormat="表面格式"
+AMF.Util.Default="預設"
+AMF.Util.Automatic="自動"
+AMF.Util.Toggle.Disabled="停用"
+AMF.Util.Toggle.Enabled="啟用"

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf-vce.cpp -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf-vce.cpp Changed

@@ -27,10 +27,14 @@
 //////////////////////////////////////////////////////////////////////////
 #include "amd-amf-vce.h"
 #include "amd-amf-vce-capabilities.h"
+#include "misc-util.cpp"
 
-#if (defined _WIN32) | (defined _WIN64)
+#ifdef _WIN32
 #include <windows.h>
 #include <VersionHelpers.h>
+
+#include "api-d3d9.h"
+#include "api-d3d11.h"
 #endif
 
 //////////////////////////////////////////////////////////////////////////
@@ -56,7 +60,10 @@
 	p_this->OutputThreadLogic();
 }
 
-Plugin::AMD::VCEEncoder::VCEEncoder(VCEEncoderType p_Type, VCESurfaceFormat p_SurfaceFormat /*= VCESurfaceFormat_NV12*/, VCEMemoryType p_MemoryType /*= VCEMemoryType_Auto*/, VCEComputeType p_ComputeType /*= VCEComputeType_None*/) {
+Plugin::AMD::VCEEncoder::VCEEncoder(VCEEncoderType p_Type,
+	VCESurfaceFormat p_SurfaceFormat /*= VCESurfaceFormat_NV12*/,
+	VCEMemoryType p_MemoryType /*= VCEMemoryType_Auto*/,
+	bool p_UseOpenCL /*= false*/, std::string p_DeviceUniqueId /*= ""*/) {
 	AMF_RESULT res;
 
 	AMF_LOG_INFO("<Plugin::AMD::VCEEncoder::VCEEncoder> Initializing...");
@@ -65,15 +72,15 @@
 	m_EncoderType = p_Type;
 	m_SurfaceFormat = p_SurfaceFormat;
 	m_MemoryType = p_MemoryType;
-	m_ComputeType = p_ComputeType;
+	m_UseOpenCL = p_UseOpenCL;
 	m_Flag_IsStarted = false;
-	m_Flag_EmergencyQuit = false;
 	m_Flag_Threading = true;
 	m_FrameSize.first = 64;	m_FrameSize.second = 64;
 	m_FrameRate.first = 30; m_FrameRate.second = 1;
 	m_FrameRateDivisor = ((double_t)m_FrameRate.first / (double_t)m_FrameRate.second);
 	m_FrameRateReverseDivisor = ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first);
 	m_InputQueueLimit = (uint32_t)(m_FrameRateDivisor * 3);
+	m_InputQueueLastSize = 0;
 	m_TimerPeriod = 1;
 
 	// AMF
@@ -82,8 +89,7 @@
 	/// AMF Context
 	res = m_AMFFactory->CreateContext(&m_AMFContext);
 	if (res != AMF_OK) {
-		AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::VCEEncoder> Creating a context object failed with error code %d.", res);
-		throw;
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> Creating a context object failed with error %ls (code %ld).", res);
 	}
 
 	// Initialize Memory
@@ -105,9 +111,23 @@
 		case VCEMemoryType_Host:
 			res = AMF_OK;
 			break;
+			#ifdef _WIN32
+		case VCEMemoryType_OpenGL:
+			if (p_DeviceUniqueId.empty()) {
+				res = m_AMFContext->InitOpenGL(nullptr, nullptr, nullptr);
+			} else {
+				/*m_APIDevice = Plugin::API::OpenGL(Plugin::API::OpenGL::GetDeviceForUniqueId(p_DeviceUniqueId));
+				res = m_AMFContext->InitOpenGL(m_APIDevice.GetContext(), nullptr, nullptr);*/
+			}
+			break;
 		case VCEMemoryType_DirectX11:
 			if (IsWindows8OrGreater()) {
-				res = m_AMFContext->InitDX11(nullptr);
+				if (p_DeviceUniqueId.empty()) {
+					res = m_AMFContext->InitDX11(nullptr);
+				} else {
+					m_APIDevice = Plugin::API::Direct3D11(Plugin::API::Direct3D11::GetDeviceForUniqueId(p_DeviceUniqueId));
+					res = m_AMFContext->InitDX11(m_APIDevice.GetContext());
+				}
 			} else {
 				AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::VCEEncoder> DirectX 11 is only supported on Windows 8 or newer, using Host Memory Type instead.");
 				m_MemoryType = VCEMemoryType_Host;
@@ -115,28 +135,30 @@
 			break;
 		case VCEMemoryType_DirectX9:
 			if (IsWindowsXPOrGreater()) {
-				res = m_AMFContext->InitDX9(nullptr);
+				if (p_DeviceUniqueId.empty()) {
+					res = m_AMFContext->InitDX9(nullptr);
+				} else {
+					m_APIDevice = Plugin::API::Direct3D9(Plugin::API::Direct3D9::GetDeviceForUniqueId(p_DeviceUniqueId));
+					res = m_AMFContext->InitDX9(m_APIDevice.GetContext());
+				}
 			} else {
 				AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::VCEEncoder> DirectX 11 is only supported on Windows 8 or newer, using Host Memory Type instead.");
 				m_MemoryType = VCEMemoryType_Host;
 			}
 			break;
-		case VCEMemoryType_OpenGL:
-			res = m_AMFContext->InitOpenGL(nullptr, nullptr, nullptr);
-			break;
+			#endif
 	}
 	if (res != AMF_OK)
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> Initializing 3D queue failed with error %ls (code %d)", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> Initializing 3D queue failed with error %ls (code %ld).", res);
 
-	switch (m_ComputeType) {
-		case VCEComputeType_None:
-			break;
-		case VCEComputeType_OpenCL:
-			res = m_AMFContext->InitOpenCL(nullptr);
-			if (res != AMF_OK)
-				ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> InitOpenCL failed with error %ls (code %d)", res);
-			m_AMFContext->GetCompute(amf::AMF_MEMORY_OPENCL, &m_AMFCompute);
-			break;
+	if (m_UseOpenCL) {
+		if (m_MemoryType == VCEMemoryType_Host)
+			ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> Use of OpenCL without DirectX or OpenGL is not supported, error %ls (code %d).", AMF_NOT_SUPPORTED);
+
+		res = m_AMFContext->InitOpenCL(nullptr);
+		if (res != AMF_OK)
+			ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> InitOpenCL failed with error %ls (code %ld).", res);
+		m_AMFContext->GetCompute(amf::AMF_MEMORY_OPENCL, &m_AMFCompute);
 	}
 
 	/// AMF Component (Encoder)
@@ -152,7 +174,7 @@
 			break;
 	}
 	if (res != AMF_OK)
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> Creating a component object failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::VCEEncoder> Creating a component object failed with error %ls (code %ld).", res);
 
 	AMF_LOG_INFO("<Plugin::AMD::VCEEncoder::VCEEncoder> Initialization complete!");
 }
@@ -196,7 +218,7 @@
 	// Create Encoder
 	AMF_RESULT res = m_AMFEncoder->Init(surfaceFormatToAMF[m_SurfaceFormat], m_FrameSize.first, m_FrameSize.second);
 	if (res != AMF_OK)
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::Start> Initialization failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::Start> Initialization failed with error %ls (code %ld).", res);
 
 	m_Flag_IsStarted = true;
 
@@ -206,18 +228,39 @@
 	}
 }
 
-void Plugin::AMD::VCEEncoder::Stop() {
-	m_Flag_IsStarted = false;
+void Plugin::AMD::VCEEncoder::Restart() {
+	static amf::AMF_SURFACE_FORMAT surfaceFormatToAMF[] = {
+		// 4:2:0 Formats
+		amf::AMF_SURFACE_NV12,
+		amf::AMF_SURFACE_YUV420P,
+		// 4:2:2 Formats
+		amf::AMF_SURFACE_YUY2,
+		// Uncompressed
+		amf::AMF_SURFACE_BGRA,
+		amf::AMF_SURFACE_RGBA,
+		// Other
+		amf::AMF_SURFACE_GRAY8,
+	};
+
+	if (!m_Flag_IsStarted)
+		return;
+
+	std::unique_lock<std::mutex> ilock(m_Input.mutex);
+	std::unique_lock<std::mutex> olock(m_Output.mutex);
+
+	// Create Encoder
+	AMF_RESULT res = m_AMFEncoder->ReInit(m_FrameSize.first, m_FrameSize.second);
+	if (res != AMF_OK)
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::Start> Initialization failed with error %ls (code %ld).", res);
+}
 
+void Plugin::AMD::VCEEncoder::Stop() {
 	// Restore Timer precision.
 	if (m_TimerPeriod != 0) {
 		timeEndPeriod(m_TimerPeriod);
 	}
 
-	// Stop AMF Encoder
-	m_AMFEncoder->Drain();
-	m_AMFEncoder->Flush();
-
+	m_Flag_IsStarted = false;
 	if (m_Flag_Threading) { // Threading
 		m_Output.condvar.notify_all();
 		#if defined _WIN32 || defined _WIN64
@@ -256,6 +299,12 @@
 		#endif
 	}
 
+	// Stop AMF Encoder
+	if (m_AMFEncoder) {
+		m_AMFEncoder->Drain();
+		m_AMFEncoder->Flush();
+	}
+
 	// Clear Queues, Data
 	std::queue<amf::AMFSurfacePtr>().swap(m_Input.queue);
 	std::queue<amf::AMFDataPtr>().swap(m_Output.queue);
@@ -275,6 +324,11 @@
 	if (frame != nullptr) {
 		amf::AMFSurfacePtr pAMFSurface = CreateSurfaceFromFrame(frame);
 		if (pAMFSurface) {
+			// Set Surface Properties
+			pAMFSurface->SetPts(frame->pts / m_FrameRate.second);
+			pAMFSurface->SetProperty(L"Frame", frame->pts);
+
+			// Add to Queue
 			std::unique_lock<std::mutex> qlock(m_Input.queuemutex);
 			size_t uiQueueSize = m_Input.queue.size();
 
@@ -299,7 +353,6 @@
 			}
 		} else {
 			AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::SendInput> Critical error while trying to create a frame.");
-			m_Flag_EmergencyQuit = true;
 			return false;
 		}
 	}
@@ -325,7 +378,7 @@
 					if (frame != nullptr)
 						GetOutput(nullptr, nullptr);
 				} else {
-					AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::SendInput> SubmitInput returned error %ls (code %d).", m_AMF->GetTrace()->GetResultText(res), res);
+					AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::SendInput> SubmitInput returned error %ls (code %lld).", m_AMF->GetTrace()->GetResultText(res), res);
 				}
 			}
 		}
@@ -369,7 +422,7 @@
 					__amf_repeat_count = 0;
 				}
 			} else {
-				AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::GetOutput> QueryOutput returned error %ls (code %d).", m_AMF->GetTrace()->GetResultText(res), res);
+				AMF_LOG_ERROR("<Plugin::AMD::VCEEncoder::GetOutput> QueryOutput returned error %ls (code %lld).", m_AMF->GetTrace()->GetResultText(res), res);
 			}
 		}
 	}
@@ -385,10 +438,12 @@
 			m_Output.queue.pop();
 		}
 
+		// We've got a DataPtr, let's use it.
 		amf::AMFBufferPtr pAMFBuffer = amf::AMFBufferPtr(pAMFData);
 
 		// Assemble Packet
 		packet->type = OBS_ENCODER_VIDEO;
+		/// Data
 		size_t uiBufferSize = pAMFBuffer->GetSize();
 		if (m_PacketDataBuffer.size() < uiBufferSize) {
 			size_t newSize = (size_t)exp2(ceil(log2(uiBufferSize)));
@@ -398,9 +453,10 @@
 		packet->data = m_PacketDataBuffer.data();
 		packet->size = uiBufferSize;
 		std::memcpy(packet->data, pAMFBuffer->GetNative(), packet->size);
-
-		{ // What Type of Frame is it?
-			 // Read Packet Type
+		/// Timestamps
+		packet->dts = (pAMFData->GetPts() - 2) * m_FrameRate.second; // Offset by 2 to support B-Pictures
+		pAMFBuffer->GetProperty(L"Frame", &packet->pts);
+		{ /// Packet Priority & Keyframe
 			uint64_t pktType;
 			pAMFData->GetProperty(AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE, &pktType);
 
@@ -424,32 +480,14 @@
 					break;
 			}
 		}
-
-		{ // Timestamps
-			int64_t frameTimeStep = (int64_t)(m_FrameRateReverseDivisor * 1e6);
-			int64_t dtsTimeOffset = frameTimeStep << 1;
-
-			 /// Retrieve Decode-Timestamp from AMF and convert it to micro-seconds.
-			int64_t dts_usec = (pAMFData->GetPts() / 10);
-			/// Decode Timestamp
-			packet->dts_usec = (int64_t)(dts_usec - dtsTimeOffset);
-			packet->dts = (int64_t)(packet->dts_usec / frameTimeStep);
-			/// Presentation Timestamp
-			pAMFBuffer->GetProperty(L"Frame", &packet->pts);
-			//pkt.pts_usec = (int64_t)(pkt.pts * frTimeStep);
-			//packet->pts_usec = pkt.dts_usec;
-			//packet->pts = packet->dts;
-
-			// See: https://stackoverflow.com/questions/6044330/ffmpeg-c-what-are-pts-and-dts-what-does-this-code-block-do-in-ffmpeg-c
-			// PTS may not be needed: https://github.com/GPUOpen-LibrariesAndSDKs/AMF/issues/17
-		}
-
 		*received_packet = true;
 
 		// Debug: Packet Information
-		#ifdef DEBUG
-		AMF_LOG_INFO("Packet: Type(%lld), PTS(%4lld), DTS(%4lld), Size(%8lld)", packet->priority, packet->pts, packet->dts, packet->size);
-		#endif
+		std::vector<wchar_t> fileName(128);
+		mbstowcs(fileName.data(), __FILE__, fileName.size());
+		std::vector<wchar_t> functionName(128);
+		mbstowcs(functionName.data(), __FUNCTION__, functionName.size());
+		m_AMF->GetTrace()->TraceW(fileName.data(), __LINE__, AMF_TRACE_TRACE, L"Plugin::GetOutput", 4, L"Packet: Type(%lld), PTS(%4lld), DTS(%4lld), Size(%8lld)", (int64_t)packet->priority, (int64_t)packet->pts, (int64_t)packet->dts, (int64_t)packet->size);
 	}
 }
 
@@ -520,9 +558,10 @@
 	// Assign Thread Name
 	static const char* __threadName = "enc-amf Input Thread";
 	SetThreadName(__threadName);
-
+	
 	// Core Loop
 	std::unique_lock<std::mutex> lock(m_Input.mutex);
+	uint32_t repeatSurfaceSubmission = 0;
 	do {
 		m_Input.condvar.wait(lock);
 
@@ -530,44 +569,44 @@
 		if (!m_Flag_IsStarted)
 			continue;
 
-		// Skip to next wait if queue is empty.
-		AMF_RESULT res = AMF_OK;
-		int32_t __amf_input_full_repeat = 0;
-		while (res == AMF_OK) { // Repeat until impossible.
-			amf::AMFSurfacePtr surface;
+		// Dequeue Surface
+		amf::AMFSurfacePtr surface;
+		{
+			std::unique_lock<std::mutex> qlock(m_Input.queuemutex);
+			if (m_Input.queue.size() == 0)
+				continue; // Queue is empty, 
+			surface = m_Input.queue.front();
+		}
 
-			{ // Dequeue Surface
+		/// Submit to AMF
+		AMF_RESULT res = m_AMFEncoder->SubmitInput(surface);
+		if (res == AMF_OK) {
+			{ // Remove Surface from Queue
 				std::unique_lock<std::mutex> qlock(m_Input.queuemutex);
-				if (m_Input.queue.size() == 0)
-					break;
-				surface = m_Input.queue.front();
+				m_Input.queue.pop();
 			}
 
-			/// Submit to AMF
-			res = m_AMFEncoder->SubmitInput(surface);
-			if (res == AMF_OK) {
-				{ // Remove Surface from Queue
-					std::unique_lock<std::mutex> qlock(m_Input.queuemutex);
-					m_Input.queue.pop();
-				}
+			// Reset AMF_INPUT_FULL retries.
+			repeatSurfaceSubmission = 0;
 
-				// Reset AMF_INPUT_FULL retries.
-				__amf_input_full_repeat = 0;
-			} else if (res == AMF_INPUT_FULL) { // Try submitting for 5 milliseconds
-				m_Output.condvar.notify_all(); // Signal Querying Thread
+			// Continue with next Surface.
+			m_Input.condvar.notify_all();
+		} else if (res == AMF_INPUT_FULL) {
+			m_Output.condvar.notify_all();
+			if (repeatSurfaceSubmission < 5) {
+				repeatSurfaceSubmission++;
 
 				std::this_thread::sleep_for(std::chrono::milliseconds(1));
-				if (__amf_input_full_repeat < 5) {
-					res = AMF_OK;
-					__amf_input_full_repeat++;
-					continue;
-				}
-			} else {
-				std::vector<char> msgBuf(128);
-				FormatTextWithAMFError(&msgBuf, "%ls (code %d)", Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);
-				AMF_LOG_WARNING("<Plugin::AMD::VCEEncoder::InputThreadLogic> SubmitInput failed with error %s.", msgBuf.data());
-				continue;
+				m_Input.condvar.notify_all();
 			}
+		} else if (res == AMF_EOF) {
+			// This should never happen, but on the off-chance that it does, just straight up leave the loop.
+			break;
+		} else {
+			// Unknown, unexpected return code.
+			std::vector<char> msgBuf(128);
+			FormatTextWithAMFError(&msgBuf, "%ls (code %d)", Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);
+			AMF_LOG_WARNING("<Plugin::AMD::VCEEncoder::InputThreadLogic> SubmitInput failed with error %s.", msgBuf.data());
 		}
 	} while (m_Flag_IsStarted);
 }
@@ -586,28 +625,26 @@
 		if (!m_Flag_IsStarted)
 			continue;
 
-		AMF_RESULT res = AMF_OK;
-		while (res == AMF_OK) { // Repeat until impossible.
-			amf::AMFDataPtr pData;
-
-			res = m_AMFEncoder->QueryOutput(&pData);
-			if (res == AMF_OK) {
-				/*if (pData->GetMemoryType() != amf::AMF_MEMORY_HOST) {
-					pData->Convert(amf::AMF_MEMORY_HOST);
-				}*/
-
-				// Queue
-				{
-					std::unique_lock<std::mutex> qlock(m_Output.queuemutex);
-					m_Output.queue.push(pData);
-				}
-			} else if (res == AMF_REPEAT) {
-				m_Input.condvar.notify_all();
-			} else {
-				std::vector<char> msgBuf(128);
-				FormatTextWithAMFError(&msgBuf, "%s (code %d)", res);
-				AMF_LOG_WARNING("<Plugin::AMD::VCEEncoder::OutputThreadLogic> QueryOutput failed with error %s.", msgBuf.data());
+		amf::AMFDataPtr pData;
+		AMF_RESULT res = m_AMFEncoder->QueryOutput(&pData);
+		if (res == AMF_OK) {
+			{ // Queue
+				std::unique_lock<std::mutex> qlock(m_Output.queuemutex);
+				m_Output.queue.push(pData);
 			}
+
+			// Continue querying until nothing is left.
+			m_Output.condvar.notify_all();
+		} else if (res == AMF_REPEAT) {
+			m_Input.condvar.notify_all();
+		} else if (res == AMF_EOF) {
+			// This should never happen, but on the off-chance that it does, just straight up leave the loop.
+			break;
+		} else {
+			// Unknown, unexpected return code.
+			std::vector<char> msgBuf(128);
+			FormatTextWithAMFError(&msgBuf, "%s (code %d)", res);
+			AMF_LOG_WARNING("<Plugin::AMD::VCEEncoder::OutputThreadLogic> QueryOutput failed with error %s.", msgBuf.data());
 		}
 	} while (m_Flag_IsStarted);
 }
@@ -634,24 +671,23 @@
 
 	AMF_RESULT res = AMF_UNEXPECTED;
 	amf::AMFSurfacePtr pSurface = nullptr;
-	if (m_ComputeType != VCEComputeType_None) {
+	if (m_UseOpenCL) {
 		amf_size l_origin[] = { 0, 0, 0 };
 		amf_size l_size0[] = { m_FrameSize.first, m_FrameSize.second, 1 };
 		amf_size l_size1[] = { m_FrameSize.first >> 1, m_FrameSize.second >> 1, 1 };
 
-		amf::AMFComputeSyncPointPtr pSyncPoint;
 		res = m_AMFContext->AllocSurface(memoryTypeToAMF[m_MemoryType], surfaceFormatToAMF[m_SurfaceFormat], m_FrameSize.first, m_FrameSize.second, &pSurface);
-		if (m_ComputeType == VCEComputeType_OpenCL) {
-			pSurface->Convert(amf::AMF_MEMORY_OPENCL);
-		}
+		if (res != AMF_OK) // Unable to create Surface
+			ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::CreateSurfaceFromFrame> Unable to create AMFSurface, error %ls (code %d).", res);
+
+		amf::AMFComputeSyncPointPtr pSyncPoint;
 		m_AMFCompute->PutSyncPoint(&pSyncPoint);
+		pSurface->Convert(amf::AMF_MEMORY_OPENCL);
 		m_AMFCompute->CopyPlaneFromHost(frame->data[0], l_origin, l_size0, frame->linesize[0], pSurface->GetPlaneAt(0), false);
 		m_AMFCompute->CopyPlaneFromHost(frame->data[1], l_origin, l_size1, frame->linesize[1], pSurface->GetPlaneAt(1), false);
 		m_AMFCompute->FinishQueue();
-		pSyncPoint->Wait();
-
-		// Convert to AMF native type.
 		pSurface->Convert(memoryTypeToAMF[m_MemoryType]);
+		pSyncPoint->Wait();
 	} else {
 		res = m_AMFContext->AllocSurface(amf::AMF_MEMORY_HOST, surfaceFormatToAMF[m_SurfaceFormat], m_FrameSize.first, m_FrameSize.second, &pSurface);
 		if (res != AMF_OK) // Unable to create Surface
@@ -675,11 +711,6 @@
 		pSurface->Convert(memoryTypeToAMF[m_MemoryType]);
 	}
 
-	// Convert Frame Index to Nanoseconds.
-	amf_pts amfPts = (int64_t)(frame->pts * (m_FrameRateReverseDivisor * 1e7));
-	pSurface->SetPts(amfPts);
-	pSurface->SetProperty(L"Frame", frame->pts);
-
 	return pSurface;
 }
 
@@ -694,10 +725,6 @@
 		"DirectX11",
 		"OpenGL",
 	};
-	static const char* computeTypeToString[] = {
-		"None",
-		"OpenCL",
-	};
 	static const char* surfaceFormatToString[] = {
 		"NV12",
 		"I420",
@@ -729,8 +756,9 @@
 	AMF_LOG_INFO("-- AMD Advanced Media Framework VCE Encoder --");
 	AMF_LOG_INFO("Initialization Parameters: ");
 	AMF_LOG_INFO(" Memory Type: %s", memoryTypeToString[m_MemoryType]);
-	AMF_LOG_INFO(" Compute Type: %s", computeTypeToString[m_ComputeType]);
-	AMF_LOG_INFO(" Surface Format: %s", surfaceFormatToString[m_SurfaceFormat]);
+	AMF_LOG_INFO(" Device: %s", m_APIDevice.GetDevice().Name);
+	AMF_LOG_INFO(" OpenCL: %s", m_UseOpenCL ? "Disabled" : "Enabled");
+	AMF_LOG_INFO(" Surface Format: %s", surfaceFormatToString[max(m_SurfaceFormat,0)]);
 	AMF_LOG_INFO("Static Parameters: ");
 	AMF_LOG_INFO(" Usage: %s", usageToString[this->GetUsage()]);
 	AMF_LOG_INFO(" Quality Preset: %s", qualityPresetToString[this->GetQualityPreset()]);
@@ -741,9 +769,9 @@
 	AMF_LOG_INFO(" Frame Rate: %d/%d", this->GetFrameRate().first, this->GetFrameRate().second);
 	AMF_LOG_INFO("Rate Control Parameters: ");
 	AMF_LOG_INFO(" Method: %s", rateControlMethodToString[this->GetRateControlMethod()]);
-	AMF_LOG_INFO(" Frame Skipping Enabled: %s", this->IsRateControlSkipFrameEnabled() ? "Yes" : "No");
+	AMF_LOG_INFO(" Frame Skipping Enabled: %s", this->IsFrameSkippingEnabled() ? "Yes" : "No");
 	AMF_LOG_INFO(" Filler Data Enabled: %s", this->IsFillerDataEnabled() ? "Yes" : "No");
-	AMF_LOG_INFO(" Enforcce HRD Restrictions: %s", this->IsEnforceHRDRestrictionsEnabled() ? "Yes" : "No");
+	AMF_LOG_INFO(" Enforce HRD Restrictions: %s", this->IsEnforceHRDRestrictionsEnabled() ? "Yes" : "No");
 	AMF_LOG_INFO(" Maximum Access Unit Size: %d bits", this->GetMaximumAccessUnitSize());
 	AMF_LOG_INFO(" Bitrate: ");
 	AMF_LOG_INFO(" Target: %d bits", this->GetTargetBitrate());
@@ -770,7 +798,7 @@
 	AMF_LOG_INFO("Picture Control Parameters: ");
 	AMF_LOG_INFO(" IDR Period: %d frames", this->GetIDRPeriod());
 	AMF_LOG_INFO(" Header Insertion Spacing: %d frames", this->GetHeaderInsertionSpacing());
-	AMF_LOG_INFO(" Deblocking Filter Enabled: %s", this->IsDeBlockingFilterEnabled() ? "Yes" : "No");
+	AMF_LOG_INFO(" Deblocking Filter Enabled: %s", this->IsDeblockingFilterEnabled() ? "Yes" : "No");
 	AMF_LOG_INFO(" B-Picture Pattern: %d", this->GetBPicturePattern());
 	AMF_LOG_INFO(" B-Picture Reference Enabled: %s", this->IsBPictureReferenceEnabled() ? "Yes" : "No");
 	AMF_LOG_INFO(" Intra-Refresh MBs Number per Slot: %d", this->GetIntraRefreshMBsNumberPerSlot());
@@ -782,11 +810,14 @@
 	AMF_LOG_INFO("Experimental Parameters: ");
 	AMF_LOG_INFO(" Nominal Range: %s", this->GetNominalRange() ? "Enabled" : "Disabled");
 	AMF_LOG_INFO(" Wait For Task: %s", this->GetWaitForTask() ? "Enabled" : "Disabled");
-	AMF_LOG_INFO(" GOP Size: %d frames", this->GetGOPSize());
 	AMF_LOG_INFO(" Aspect Ratio: %d:%d", this->GetAspectRatio().first, this->GetAspectRatio().second);
 	AMF_LOG_INFO(" CABAC: %s", this->IsCABACEnabled() ? "Enabled" : "Disabled");
 }
 
+/************************************************************************/
+/* Static Properties */
+/************************************************************************/
+
 void Plugin::AMD::VCEEncoder::SetUsage(VCEUsage usage) {
 	static AMF_VIDEO_ENCODER_USAGE_ENUM customToAMF[] = {
 		AMF_VIDEO_ENCODER_USAGE_TRANSCONDING,
@@ -831,46 +862,6 @@
 	return AMFToCustom[usage];
 }
 
-void Plugin::AMD::VCEEncoder::SetQualityPreset(VCEQualityPreset preset) {
-	static AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM CustomToAMF[] = {
-		AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED,
-		AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED,
-		AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY,
-	};
-	static char* CustomToName[] = {
-		"Speed",
-		"Balanced",
-		"Quality",
-	};
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, (uint32_t)CustomToAMF[preset]);
-	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetQualityPreset> Setting to %s failed with error %ls (code %d).", res, CustomToName[preset]);
-	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetQualityPreset> Set to %s.", CustomToName[preset]);
-}
-
-Plugin::AMD::VCEQualityPreset Plugin::AMD::VCEEncoder::GetQualityPreset() {
-	static VCEQualityPreset AMFToCustom[] = {
-		VCEQualityPreset_Balanced,
-		VCEQualityPreset_Speed,
-		VCEQualityPreset_Quality,
-	};
-	static char* CustomToName[] = {
-		"Speed",
-		"Balanced",
-		"Quality",
-	};
-
-	uint32_t preset;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, &preset);
-	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetQualityPreset> Failed with error %ls (code %d).", res);
-	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetQualityPreset> Value is %s.", CustomToName[AMFToCustom[preset]]);
-	return AMFToCustom[preset];
-}
-
 void Plugin::AMD::VCEEncoder::SetProfile(VCEProfile profile) {
 	if ((profile != VCEProfile_High) && (profile != VCEProfile_Main) && (profile != VCEProfile_Baseline)) {
 		profile = VCEProfile_Baseline;
@@ -894,6 +885,13 @@
 }
 
 void Plugin::AMD::VCEEncoder::SetProfileLevel(VCEProfileLevel level) {
+	// Automatic Detection
+	if (level == VCEProfileLevel_Automatic) {
+		auto frameSize = this->GetFrameSize();
+		auto frameRate = this->GetFrameRate();
+		level = Plugin::Utility::GetMinimumProfileLevel(frameSize, frameRate);
+	}
+
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL, (uint32_t)level);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetProfile> Setting to %d failed with error %ls (code %d).", res, level);
@@ -932,6 +930,11 @@
 	return maximumLTRFrames;
 }
 
+
+/************************************************************************/
+/* Resolution Properties */
+/************************************************************************/
+
 void Plugin::AMD::VCEEncoder::SetFrameSize(uint32_t width, uint32_t height) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, ::AMFConstructSize(width, height));
 	if (res != AMF_OK) {
@@ -939,6 +942,8 @@
 		sprintf(msgBuf.data(), "%dx%d", width, height);
 		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetFrameSize> Setting to %s failed with error %ls (code %d).", res, msgBuf.data());
 	}
+	m_FrameSize.first = width;
+	m_FrameSize.second = height;
 	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetFrameSize> Set to %dx%d.", width, height);
 }
 
@@ -954,48 +959,51 @@
 	return std::pair<uint32_t, uint32_t>(m_FrameSize);
 }
 
-void Plugin::AMD::VCEEncoder::SetTargetBitrate(uint32_t bitrate) {
-	// Clamp Value
-	bitrate = min(max(bitrate, 10000), Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(m_EncoderType)->maxBitrate);
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, bitrate);
-	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetTargetBitrate> Setting to %d bits failed with error %ls (code %d).", res, bitrate);
-	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetTargetBitrate> Set to %d bits.", bitrate);
-}
-
-uint32_t Plugin::AMD::VCEEncoder::GetTargetBitrate() {
-	uint32_t bitrate;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &bitrate);
+void Plugin::AMD::VCEEncoder::SetFrameRate(uint32_t num, uint32_t den) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMERATE, ::AMFConstructRate(num, den));
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetTargetBitrate> Failed with error %ls (code %d).", res);
+		std::vector<char> msgBuf;
+		sprintf(msgBuf.data(), "%d/%d", num, den);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetFrameRate> Setting to %s failed with error %ls (code %d).", res, msgBuf.data());
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetTargetBitrate> Value is %d bits.", bitrate);
-	return bitrate;
-}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetFrameRate> Set to %d/%d.", num, den);
+	m_FrameRate.first = num;
+	m_FrameRate.second = den;
+	m_FrameRateDivisor = (double_t)m_FrameRate.first / (double_t)m_FrameRate.second;
+	m_FrameRateReverseDivisor = ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first);
+	m_InputQueueLimit = (uint32_t)ceil(m_FrameRateDivisor * 3);
 
-void Plugin::AMD::VCEEncoder::SetPeakBitrate(uint32_t bitrate) {
-	// Clamp Value
-	bitrate = min(max(bitrate, 10000), Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(m_EncoderType)->maxBitrate);
+	if (m_Flag_IsStarted) { // Change Timer precision if encoding.
+		if (m_TimerPeriod != 0) {
+			// Restore Timer precision.
+			timeEndPeriod(m_TimerPeriod);
+		}
 
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, (uint32_t)bitrate);
-	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetPeakBitrate> Setting to %d bits failed with error %ls (code %d).", res, bitrate);
+		m_TimerPeriod = 1;
+		while (timeBeginPeriod(m_TimerPeriod) == TIMERR_NOCANDO) {
+			++m_TimerPeriod;
+		}
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetPeakBitrate> Set to %d bits.", bitrate);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetPeakBitrate() {
-	uint32_t bitrate;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, &bitrate);
+std::pair<uint32_t, uint32_t> Plugin::AMD::VCEEncoder::GetFrameRate() {
+	AMFRate frameRate;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &frameRate);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetPeakBitrate> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetFrameRate> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetPeakBitrate> Value is %d bits.", bitrate);
-	return bitrate;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetFrameRate> Value is %d/%d.", frameRate.num, frameRate.den);
+	m_FrameRate.first = frameRate.num;
+	m_FrameRate.second = frameRate.den;
+	m_FrameRateDivisor = (double_t)frameRate.num / (double_t)frameRate.den;
+	m_InputQueueLimit = (uint32_t)ceil(m_FrameRateDivisor * 3);
+	return std::pair<uint32_t, uint32_t>(m_FrameRate);
 }
 
+/************************************************************************/
+/* Rate Control Properties */
+/************************************************************************/
+
 void Plugin::AMD::VCEEncoder::SetRateControlMethod(VCERateControlMethod method) {
 	static AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM CustomToAMF[] = {
 		AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP,
@@ -1040,22 +1048,48 @@
 	return AMFToCustom[method];
 }
 
-void Plugin::AMD::VCEEncoder::SetRateControlSkipFrameEnabled(bool enabled) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, enabled);
+void Plugin::AMD::VCEEncoder::SetTargetBitrate(uint32_t bitrate) {
+	// Clamp Value
+	if (bitrate != 0)
+		bitrate = min(max(bitrate, 10000), Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(m_EncoderType)->maxBitrate);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, bitrate);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetRateControlSkipFrameEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetTargetBitrate> Setting to %d bits failed with error %ls (code %d).", res, bitrate);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetRateControlSkipFrameEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetTargetBitrate> Set to %d bits.", bitrate);
 }
 
-bool Plugin::AMD::VCEEncoder::IsRateControlSkipFrameEnabled() {
-	bool enabled;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, &enabled);
+uint32_t Plugin::AMD::VCEEncoder::GetTargetBitrate() {
+	uint32_t bitrate;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &bitrate);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsRateControlSkipFrameEnabled> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetTargetBitrate> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsRateControlSkipFrameEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
-	return enabled;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetTargetBitrate> Value is %d bits.", bitrate);
+	return bitrate;
+}
+
+void Plugin::AMD::VCEEncoder::SetPeakBitrate(uint32_t bitrate) {
+	// Clamp Value
+	if (bitrate != 0)
+		bitrate = min(max(bitrate, 10000), Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(m_EncoderType)->maxBitrate);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, (uint32_t)bitrate);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetPeakBitrate> Setting to %d bits failed with error %ls (code %d).", res, bitrate);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetPeakBitrate> Set to %d bits.", bitrate);
+}
+
+uint32_t Plugin::AMD::VCEEncoder::GetPeakBitrate() {
+	uint32_t bitrate;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, &bitrate);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetPeakBitrate> Failed with error %ls (code %d).", res);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetPeakBitrate> Value is %d bits.", bitrate);
+	return bitrate;
 }
 
 void Plugin::AMD::VCEEncoder::SetMinimumQP(uint8_t qp) {
@@ -1163,46 +1197,46 @@
 	return (uint8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetFrameRate(uint32_t num, uint32_t den) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMERATE, ::AMFConstructRate(num, den));
+void Plugin::AMD::VCEEncoder::SetBPictureDeltaQP(int8_t qp) {
+	// Clamp Value
+	qp = max(min(qp, 10), -10);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, (int32_t)qp);
 	if (res != AMF_OK) {
-		std::vector<char> msgBuf;
-		sprintf(msgBuf.data(), "%d/%d", num, den);
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetFrameRate> Setting to %s failed with error %ls (code %d).", res, msgBuf.data());
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetBPictureDeltaQP> Setting to %d failed with error %ls (code %d).", res, qp);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetFrameRate> Set to %d/%d.", num, den);
-	m_FrameRate.first = num;
-	m_FrameRate.second = den;
-	m_FrameRateDivisor = (double_t)m_FrameRate.first / (double_t)m_FrameRate.second;
-	m_FrameRateReverseDivisor = ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first);
-	m_InputQueueLimit = (uint32_t)ceil(m_FrameRateDivisor * 3);
-	//AMF_LOG_DEBUG("%f div, %f revdiv", m_FrameRateDivisor, m_FrameRateReverseDivisor);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetBPictureDeltaQP> Set to %d.", qp);
+}
 
-	if (m_Flag_IsStarted) { // Change Timer precision if encoding.
-		if (m_TimerPeriod != 0) {
-			// Restore Timer precision.
-			timeEndPeriod(m_TimerPeriod);
-		}
+int8_t Plugin::AMD::VCEEncoder::GetBPictureDeltaQP() {
+	int32_t qp;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, &qp);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetBPictureDeltaQP> Failed with error %ls (code %d).", res);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetBPictureDeltaQP> Value is %d.", qp);
+	return (int8_t)qp;
+}
 
-		m_TimerPeriod = 1;
-		while (timeBeginPeriod(m_TimerPeriod) == TIMERR_NOCANDO) {
-			++m_TimerPeriod;
-		}
+void Plugin::AMD::VCEEncoder::SetReferenceBPictureDeltaQP(int8_t qp) {
+	// Clamp Value
+	qp = max(min(qp, 10), -10);
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, (int32_t)qp);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetReferenceBPictureDeltaQP> Setting to %d failed with error %ls (code %d).", res, qp);
 	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetReferenceBPictureDeltaQP> Set to %d.", qp);
 }
 
-std::pair<uint32_t, uint32_t> Plugin::AMD::VCEEncoder::GetFrameRate() {
-	AMFRate frameRate;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &frameRate);
+int8_t Plugin::AMD::VCEEncoder::GetReferenceBPictureDeltaQP() {
+	int32_t qp;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, &qp);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetFrameRate> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetReferenceBPictureDeltaQP> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetFrameRate> Value is %d/%d.", frameRate.num, frameRate.den);
-	m_FrameRate.first = frameRate.num;
-	m_FrameRate.second = frameRate.den;
-	m_FrameRateDivisor = (double_t)frameRate.num / (double_t)frameRate.den;
-	m_InputQueueLimit = (uint32_t)ceil(m_FrameRateDivisor * 3);
-	return std::pair<uint32_t, uint32_t>(m_FrameRate);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetReferenceBPictureDeltaQP> Value is %d.", qp);
+	return (int8_t)qp;
 }
 
 void Plugin::AMD::VCEEncoder::SetVBVBufferSize(uint32_t size) {
@@ -1216,6 +1250,68 @@
 	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetVBVBufferSize> Set to %d bits.", size);
 }
 
+void Plugin::AMD::VCEEncoder::SetVBVBufferAutomatic(double_t strictness) {
+	uint32_t strictBitrate = 1000, looseBitrate = 100000000;
+
+	// Strict VBV Buffer Size = Bitrate / FPS
+	// Loose VBV Buffer Size = Bitrate
+
+	switch (this->GetRateControlMethod()) {
+		case VCERateControlMethod_ConstantBitrate:
+		case VCERateControlMethod_VariableBitrate_LatencyConstrained:
+			looseBitrate = this->GetTargetBitrate();
+			break;
+		case VCERateControlMethod_VariableBitrate_PeakConstrained:
+			looseBitrate = max(this->GetTargetBitrate(), this->GetPeakBitrate());
+			break;
+		case VCERateControlMethod_ConstantQP:
+			// When using Constant QP, one will have to pick a QP that is decent
+			// in both quality and bitrate. We can easily calculate both the QP
+			// required for an average bitrate and the average bitrate itself 
+			// with these formulas:
+			// BITRATE = ((1 - (QP / 51)) ^ 2) * ((Width * Height) * 1.5 * (FPSNumerator / FPSDenumerator))
+			// QP = (1 - sqrt(BITRATE / ((Width * Height) * 1.5 * (FPSNumerator / FPSDenumerator)))) * 51
+
+			auto frameSize = this->GetFrameSize();
+			auto frameRate = this->GetFrameRate();
+
+			double_t bitrate = frameSize.first * frameSize.second;
+			switch (this->m_SurfaceFormat) {
+				case VCESurfaceFormat_NV12:
+				case VCESurfaceFormat_I420:
+					bitrate *= 1.5;
+					break;
+				case VCESurfaceFormat_YUY2:
+					bitrate *= 4;
+					break;
+				case VCESurfaceFormat_BGRA:
+				case VCESurfaceFormat_RGBA:
+					bitrate *= 3;
+					break;
+				case VCESurfaceFormat_GRAY:
+					bitrate *= 1;
+					break;
+			}
+			bitrate *= frameRate.first / frameRate.second;
+
+			uint8_t qp_i, qp_p, qp_b;
+			qp_i = this->GetIFrameQP();
+			qp_p = this->GetPFrameQP();
+			try { qp_b = this->GetBFrameQP(); } catch (...) { qp_b = 51; }
+			double_t qp = 1 - ((double_t)(min(min(qp_i, qp_p), qp_b)) / 51.0);
+			qp = max(qp * qp, 0.001); // Needs to be at least 0.001.
+
+			looseBitrate = static_cast<uint32_t>(bitrate * qp);
+			break;
+	}
+	strictBitrate = static_cast<uint32_t>(looseBitrate * m_FrameRateReverseDivisor);
+
+	#define PI 3.14159265
+	double_t interpVal = (sin(max(min(strictness, 1.0), 0.0) * 90 * (PI / 180))); // sin curve?
+	uint32_t realBitrate = static_cast<uint32_t>((strictBitrate * interpVal) + (looseBitrate * (1.0 - interpVal)));
+	this->SetVBVBufferSize(realBitrate);
+}
+
 uint32_t Plugin::AMD::VCEEncoder::GetVBVBufferSize() {
 	uint32_t size;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, &size);
@@ -1247,22 +1343,25 @@
 	return ((double_t)vbvBufferFullness / 64.0);
 }
 
-void Plugin::AMD::VCEEncoder::SetEnforceHRDRestrictionsEnabled(bool enabled) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, enabled);
+void Plugin::AMD::VCEEncoder::SetMaximumAccessUnitSize(uint32_t size) {
+	// Clamp Value
+	size = max(min(size, 100000000), 0); // 1kbit to 100mbit.
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, (uint32_t)size);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetEnforceHRD> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetMaxAUSize> Setting to %d bits failed with error %ls (code %d).", res, size);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetEnforceHRD> Set to %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetMaxAUSize> Set to %d bits.", size);
 }
 
-bool Plugin::AMD::VCEEncoder::IsEnforceHRDRestrictionsEnabled() {
-	bool enabled;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, &enabled);
+uint32_t Plugin::AMD::VCEEncoder::GetMaximumAccessUnitSize() {
+	uint32_t size;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, &size);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetEnforceHRD> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetMaxAUSize> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetEnforceHRD> Value is %s.", enabled ? "Enabled" : "Disabled");
-	return enabled;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetMaxAUSize> Value is %d.", size);
+	return size;
 }
 
 void Plugin::AMD::VCEEncoder::SetFillerDataEnabled(bool enabled) {
@@ -1283,67 +1382,65 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetMaximumAccessUnitSize(uint32_t size) {
-	// Clamp Value
-	size = max(min(size, 100000000), 0); // 1kbit to 100mbit.
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, (uint32_t)size);
+void Plugin::AMD::VCEEncoder::SetFrameSkippingEnabled(bool enabled) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetMaxAUSize> Setting to %d bits failed with error %ls (code %d).", res, size);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetRateControlSkipFrameEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetMaxAUSize> Set to %d bits.", size);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetRateControlSkipFrameEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetMaximumAccessUnitSize() {
-	uint32_t size;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, &size);
+bool Plugin::AMD::VCEEncoder::IsFrameSkippingEnabled() {
+	bool enabled;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, &enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetMaxAUSize> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsRateControlSkipFrameEnabled> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetMaxAUSize> Value is %d.", size);
-	return size;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsRateControlSkipFrameEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
+	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetBPictureDeltaQP(int8_t qp) {
-	// Clamp Value
-	qp = max(min(qp, 10), -10);
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, (int32_t)qp);
+void Plugin::AMD::VCEEncoder::SetEnforceHRDRestrictionsEnabled(bool enabled) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetBPictureDeltaQP> Setting to %d failed with error %ls (code %d).", res, qp);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetEnforceHRD> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetBPictureDeltaQP> Set to %d.", qp);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetEnforceHRD> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-int8_t Plugin::AMD::VCEEncoder::GetBPictureDeltaQP() {
-	int32_t qp;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, &qp);
+bool Plugin::AMD::VCEEncoder::IsEnforceHRDRestrictionsEnabled() {
+	bool enabled;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, &enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetBPictureDeltaQP> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetEnforceHRD> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetBPictureDeltaQP> Value is %d.", qp);
-	return (int8_t)qp;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetEnforceHRD> Value is %s.", enabled ? "Enabled" : "Disabled");
+	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetReferenceBPictureDeltaQP(int8_t qp) {
+/************************************************************************/
+/* Picture Control Properties */
+/************************************************************************/
+
+void Plugin::AMD::VCEEncoder::SetIDRPeriod(uint32_t period) {
 	// Clamp Value
-	qp = max(min(qp, 10), -10);
+	period = max(min(period, m_FrameRate.second * 1000), 1); // 1-1000 so that OBS can actually quit.
 
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, (int32_t)qp);
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, (uint32_t)period);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetReferenceBPictureDeltaQP> Setting to %d failed with error %ls (code %d).", res, qp);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetIDRPeriod> Setting to %d failed with error %ls (code %d).", res, period);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetReferenceBPictureDeltaQP> Set to %d.", qp);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetIDRPeriod> Set to %d.", period);
 }
 
-int8_t Plugin::AMD::VCEEncoder::GetReferenceBPictureDeltaQP() {
-	int32_t qp;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, &qp);
+uint32_t Plugin::AMD::VCEEncoder::GetIDRPeriod() {
+	int32_t period;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, &period);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetReferenceBPictureDeltaQP> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetIDRPeriod> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetReferenceBPictureDeltaQP> Value is %d.", qp);
-	return (int8_t)qp;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetIDRPeriod> Value is %d.", period);
+	return period;
 }
 
 void Plugin::AMD::VCEEncoder::SetHeaderInsertionSpacing(uint32_t spacing) {
@@ -1367,61 +1464,58 @@
 	return headerInsertionSpacing;
 }
 
-void Plugin::AMD::VCEEncoder::SetIDRPeriod(uint32_t period) {
-	// Clamp Value
-	period = max(min(period, m_FrameRate.second * 1000), 1); // 1-1000 so that OBS can actually quit.
-
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, (uint32_t)period);
+void Plugin::AMD::VCEEncoder::SetBPicturePattern(VCEBPicturePattern pattern) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, (uint32_t)pattern);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetIDRPeriod> Setting to %d failed with error %ls (code %d).", res, period);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetBPicturesPattern> Setting to %d failed with error %ls (code %d).", res, pattern);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetIDRPeriod> Set to %d.", period);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetBPicturesPattern> Set to %d.", pattern);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetIDRPeriod() {
-	int32_t period;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, &period);
+Plugin::AMD::VCEBPicturePattern Plugin::AMD::VCEEncoder::GetBPicturePattern() {
+	uint32_t pattern;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &pattern);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetIDRPeriod> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetBPicturesPattern> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetIDRPeriod> Value is %d.", period);
-	return period;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetBPicturesPattern> Value is %d.", pattern);
+	return (Plugin::AMD::VCEBPicturePattern)pattern;
 }
 
-void Plugin::AMD::VCEEncoder::SetDeBlockingFilterEnabled(bool enabled) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, enabled);
+void Plugin::AMD::VCEEncoder::SetBPictureReferenceEnabled(bool enabled) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetDeBlockingFilterEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetBReferenceEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetDeBlockingFilterEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetBReferenceEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsDeBlockingFilterEnabled() {
+bool Plugin::AMD::VCEEncoder::IsBPictureReferenceEnabled() {
 	bool enabled;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, &enabled);
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, &enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsDeBlockingFilterEnabled> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsBReferenceEnabled> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsDeBlockingFilterEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsBReferenceEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetIntraRefreshMBsNumberPerSlot(uint32_t mbs) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, (uint32_t)mbs);
+void Plugin::AMD::VCEEncoder::SetDeblockingFilterEnabled(bool enabled) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetIntraRefreshMBsNumberPerSlot> Setting to %d failed with error %ls (code %d).", res, mbs);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetDeBlockingFilterEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetIntraRefreshMBsNumberPerSlot> Set to %d.", mbs);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetDeBlockingFilterEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetIntraRefreshMBsNumberPerSlot() {
-	int32_t mbs;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &mbs);
+bool Plugin::AMD::VCEEncoder::IsDeblockingFilterEnabled() {
+	bool enabled;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, &enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetIntraRefreshMBsNumberPerSlot> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsDeBlockingFilterEnabled> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetIntraRefreshMBsNumberPerSlot> Value is %d.", mbs);
-	return mbs;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsDeBlockingFilterEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
+	return enabled;
 }
 
 void Plugin::AMD::VCEEncoder::SetSlicesPerFrame(uint32_t slices) {
@@ -1444,40 +1538,66 @@
 	return slices;
 }
 
-void Plugin::AMD::VCEEncoder::SetBPicturePattern(VCEBPicturePattern pattern) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, (uint32_t)pattern);
+void Plugin::AMD::VCEEncoder::SetIntraRefreshMBsNumberPerSlot(uint32_t mbs) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, (uint32_t)mbs);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetBPicturesPattern> Setting to %d failed with error %ls (code %d).", res, pattern);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetIntraRefreshMBsNumberPerSlot> Setting to %d failed with error %ls (code %d).", res, mbs);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetBPicturesPattern> Set to %d.", pattern);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetIntraRefreshMBsNumberPerSlot> Set to %d.", mbs);
 }
 
-Plugin::AMD::VCEBPicturePattern Plugin::AMD::VCEEncoder::GetBPicturePattern() {
-	uint32_t pattern;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &pattern);
+uint32_t Plugin::AMD::VCEEncoder::GetIntraRefreshMBsNumberPerSlot() {
+	int32_t mbs;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &mbs);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetBPicturesPattern> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetIntraRefreshMBsNumberPerSlot> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetBPicturesPattern> Value is %d.", pattern);
-	return (Plugin::AMD::VCEBPicturePattern)pattern;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetIntraRefreshMBsNumberPerSlot> Value is %d.", mbs);
+	return mbs;
 }
 
-void Plugin::AMD::VCEEncoder::SetBPictureReferenceEnabled(bool enabled) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, enabled);
+/************************************************************************/
+/* Miscellaneous Control Properties */
+/************************************************************************/
+
+void Plugin::AMD::VCEEncoder::SetQualityPreset(VCEQualityPreset preset) {
+	static AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM CustomToAMF[] = {
+		AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED,
+		AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED,
+		AMF_VIDEO_ENCODER_QUALITY_PRESET_QUALITY,
+	};
+	static char* CustomToName[] = {
+		"Speed",
+		"Balanced",
+		"Quality",
+	};
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, (uint32_t)CustomToAMF[preset]);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetBReferenceEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetQualityPreset> Setting to %s failed with error %ls (code %d).", res, CustomToName[preset]);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetBReferenceEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetQualityPreset> Set to %s.", CustomToName[preset]);
 }
 
-bool Plugin::AMD::VCEEncoder::IsBPictureReferenceEnabled() {
-	bool enabled;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, &enabled);
+Plugin::AMD::VCEQualityPreset Plugin::AMD::VCEEncoder::GetQualityPreset() {
+	static VCEQualityPreset AMFToCustom[] = {
+		VCEQualityPreset_Balanced,
+		VCEQualityPreset_Speed,
+		VCEQualityPreset_Quality,
+	};
+	static char* CustomToName[] = {
+		"Speed",
+		"Balanced",
+		"Quality",
+	};
+
+	uint32_t preset;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, &preset);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsBReferenceEnabled> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetQualityPreset> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsBReferenceEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
-	return enabled;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetQualityPreset> Value is %s.", CustomToName[AMFToCustom[preset]]);
+	return AMFToCustom[preset];
 }
 
 void Plugin::AMD::VCEEncoder::SetScanType(VCEScanType scanType) {
@@ -1548,26 +1668,51 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetNumberOfTemporalEnhancementLayers(uint32_t layers) {
-	layers = min(layers, 2);
+void Plugin::AMD::VCEEncoder::SetCABACEnabled(bool enabled) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"CABACEnable", enabled);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetCABACEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetCABACEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
+}
+
+bool Plugin::AMD::VCEEncoder::IsCABACEnabled() {
+	bool enabled;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"CABACEnable", &enabled);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsCABACEnabled> Failed with error %ls (code %d).", res);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsCABACEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
+	return enabled;
+}
+
+/************************************************************************/
+/* Hidden Properties */
+/************************************************************************/
 
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_NUM_TEMPORAL_ENHANCMENT_LAYERS, (uint32_t)layers);
+void Plugin::AMD::VCEEncoder::SetGOPSize(uint32_t size) {
+	AMF_LOG_WARNING("Using unsupported SetGOPSize function. Unexpected behaviour may happen.");
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSize", (uint32_t)size);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetNumberOfTemporalEnhancementLayers> Setting to %d failed with error %ls (code %d).", res, layers);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetGOPSize> Setting to %d failed with error %ls (code %d).", res, size);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetNumberOfTemporalEnhancementLayers> Set to %d.", layers);
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetGOPSize> Set to %d.", size);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetNumberOfTemporalEnhancementLayers() {
-	uint32_t layers;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_NUM_TEMPORAL_ENHANCMENT_LAYERS, &layers);
+uint32_t Plugin::AMD::VCEEncoder::GetGOPSize() {
+	AMF_LOG_WARNING("Using unsupported GetGOPSize function. Unexpected behaviour may happen.");
+
+	uint32_t size;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSize", &size);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetNumberOfTemporalEnhancementLayers> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetGOPSize> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetNumberOfTemporalEnhancementLayers> Value is %d.", layers);
-	return layers;
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetGOPSize> Value is %d.", size);
+	return size;
 }
 
+
 void Plugin::AMD::VCEEncoder::SetNominalRange(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"NominalRange", enabled);
 	if (res != AMF_OK) {
@@ -1604,24 +1749,6 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetGOPSize(uint32_t size) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSize", (uint32_t)size);
-	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetGOPSize> Setting to %d failed with error %ls (code %d).", res, size);
-	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetGOPSize> Set to %d.", size);
-}
-
-uint32_t Plugin::AMD::VCEEncoder::GetGOPSize() {
-	uint32_t size;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSize", &size);
-	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetGOPSize> Failed with error %ls (code %d).", res);
-	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetGOPSize> Value is %d.", size);
-	return size;
-}
-
 void Plugin::AMD::VCEEncoder::SetAspectRatio(uint32_t num, uint32_t den) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"AspectRatio", ::AMFConstructRate(num, den));
 	if (res != AMF_OK) {
@@ -1642,20 +1769,57 @@
 	return std::pair<uint32_t, uint32_t>(aspectRatio.num, aspectRatio.den);
 }
 
-void Plugin::AMD::VCEEncoder::SetCABACEnabled(bool enabled) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"CABACEnable", enabled);
+void Plugin::AMD::VCEEncoder::SetMaximumNumberOfReferenceFrames(uint32_t numFrames) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"MaxNumRefFrames", (uint32_t)numFrames);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetCABACEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetMaximumNumberOfReferenceFrames> Setting to %d failed with error %ls (code %d).", res, numFrames);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetCABACEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetMaximumNumberOfReferenceFrames> Set to %d.", numFrames);
 }
 
-bool Plugin::AMD::VCEEncoder::IsCABACEnabled() {
+uint32_t Plugin::AMD::VCEEncoder::GetMaximumNumberOfReferenceFrames() {
+	uint32_t numFrames;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"MaxNumRefFrames", &numFrames);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetMaximumNumberOfReferenceFrames> Failed with error %ls (code %d).", res);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetMaximumNumberOfReferenceFrames> Value is %d.", numFrames);
+	return numFrames;
+}
+
+void Plugin::AMD::VCEEncoder::SetMaxMBPerSec(uint32_t maxMBPerSec) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"MaxMBPerSec", (uint32_t)maxMBPerSec);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetMaxMBPerSec> Setting to %d failed with error %ls (code %d).", res, maxMBPerSec);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetMaxMBPerSec> Set to %d.", maxMBPerSec);
+}
+
+uint32_t Plugin::AMD::VCEEncoder::GetMaxMBPerSec() {
+	uint32_t maxMBPerSec;
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"MaxMBPerSec", &maxMBPerSec);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::GetMaxMBPerSec> Failed with error %ls (code %d).", res);
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::GetMaxMBPerSec> Value is %d.", maxMBPerSec);
+	return maxMBPerSec;
+}
+
+void Plugin::AMD::VCEEncoder::SetRateControlPreanalysisEnabled(bool enabled) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"RateControlPreanalysisEnable", enabled);
+	if (res != AMF_OK) {
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::SetRateControlPreanalysisEnabled> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
+	}
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::SetRateControlPreanalysisEnabled> Set to %s.", enabled ? "Enabled" : "Disabled");
+}
+
+bool Plugin::AMD::VCEEncoder::IsRateControlPreanalysisEnabled() {
 	bool enabled;
-	AMF_RESULT res = m_AMFEncoder->GetProperty(L"CABACEnable", &enabled);
+	AMF_RESULT res = m_AMFEncoder->GetProperty(L"RateControlPreanalysisEnable", &enabled);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsCABACEnabled> Failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::VCEEncoder::IsRateControlPreanalysisEnabled> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsCABACEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
+	AMF_LOG_DEBUG("<Plugin::AMD::VCEEncoder::IsRateControlPreanalysisEnabled> Value is %s.", enabled ? "Enabled" : "Disabled");
 	return enabled;
 }
+

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf.cpp -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf.cpp Changed

@@ -29,6 +29,7 @@
 #include <mutex>
 
 #include "amd-amf.h"
+#include "windows.h"
 
 // AMD AMF SDK
 #include "components\Component.h"
@@ -42,33 +43,28 @@
 
 class CustomWriter : public amf::AMFTraceWriter {
 	public:
-	virtual void Write(const wchar_t*, const wchar_t* message) override {
-		//const wchar_t* realmsg = &(message[(33 + wcslen(scope) + 2)]);
-		size_t msgLen = wcslen(message) - (sizeof(wchar_t));
+	virtual void 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_INFO, "[AMFTrace] %.*ls", msgLen, message);
+		blog(LOG_INFO, "[%ls] %.*ls", scope, msgLen, realmsg);
 	}
 
 	virtual void Flush() override {}
 };
 
-
 std::shared_ptr<Plugin::AMD::AMF> Plugin::AMD::AMF::GetInstance() {
 	static std::shared_ptr<AMF> __instance = std::make_shared<AMF>();
 	static std::mutex __mutex;
 
-	try {
-		const std::lock_guard<std::mutex> lock(__mutex);
-		return __instance;
-	} catch (...) {
-		return nullptr;
-	}
+	const std::lock_guard<std::mutex> lock(__mutex);
+	return __instance;
 }
 
 Plugin::AMD::AMF::AMF() {
 	AMF_RESULT res = AMF_OK;
 
-	AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> Initializing...");
+	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Initializing...");
 
 	// Null Values
 	m_TimerPeriod = 0;
@@ -86,11 +82,38 @@
 	if (!m_AMFModule) {
 		DWORD error = GetLastError();
 		std::vector<char> buf(1024);
-		sprintf(buf.data(), "<Plugin::AMD::AMF::AMF> Loading of '%ls' failed with error code %d.", AMF_DLL_NAME, error);
+		sprintf(buf.data(), "Unable to load '%ls', error code %ld.", AMF_DLL_NAME, error);
 		AMF_LOG_ERROR("%s", buf.data());
 		throw std::exception(buf.data(), error);
 	} else {
-		AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> Loaded '%ls'.", AMF_DLL_NAME);
+		std::vector<char> verbuf(GetFileVersionInfoSizeW(AMF_DLL_NAME, nullptr));
+		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 = 1024;
+
+		VerQueryValueA(pBlock, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &cbTranslate);
+
+		std::vector<char> buf(1024);
+		sprintf(buf.data(), "%s%04x%04x%s",
+			"\\StringFileInfo\\",
+			lpTranslate[0].wLanguage,
+			lpTranslate[0].wCodePage,
+			"\\ProductVersion");
+
+		// Retrieve file description for language and code page "i". 
+		void* lpBuffer;
+		uint32_t dwBytes;
+		VerQueryValueA(pBlock, buf.data(), &lpBuffer, &dwBytes);
+
+		AMF_LOG_INFO("Runtime Library is on Version %.*s.", dwBytes, lpBuffer);
+		AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Loaded '%ls'.", AMF_DLL_NAME);
 	}
 
 	// Find Function: Query Version
@@ -98,7 +121,7 @@
 	if (!AMFQueryVersion) {
 		DWORD error = GetLastError();
 		std::vector<char> buf(1024);
-		sprintf(buf.data(), "<Plugin::AMD::AMF::AMF> Finding Address of Function '%s' failed with error code %d.", AMF_QUERY_VERSION_FUNCTION_NAME, error);
+		sprintf(buf.data(), "<Plugin::AMD::AMF::AMF> Finding Address of Function '%s' failed with error code %ld.", AMF_QUERY_VERSION_FUNCTION_NAME, error);
 		AMF_LOG_ERROR("%s", buf.data());
 		throw std::exception(buf.data(), error);
 	}
@@ -106,12 +129,9 @@
 	// Query Runtime Version
 	m_AMFVersion_Compiler = AMF_FULL_VERSION;
 	res = AMFQueryVersion(&m_AMFVersion_Runtime);
-	if (res != AMF_OK) {
-
-		AMF_LOG_ERROR("<Plugin::AMD::AMF::AMF> Querying Version failed with error code %d.", res);
-		throw std::exception("<Plugin::AMD::AMF::AMF> Querying Version failed with error code ", res);
-	}
-	AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> Runtime is on Version %d.%d.%d.%d",
+	if (res != AMF_OK)
+		ThrowExceptionWithAMFError("<Plugin::AMD::AMF::AMF> Querying Version failed with error %ls (code %ld).", res);
+	AMF_LOG_DEBUG("Runtime reports back Version %d.%d.%d.%d",
 		(uint16_t)((m_AMFVersion_Runtime >> 48ull) & 0xFFFF),
 		(uint16_t)((m_AMFVersion_Runtime >> 32ull) & 0xFFFF),
 		(uint16_t)((m_AMFVersion_Runtime >> 16ull) & 0xFFFF),
@@ -121,43 +141,40 @@
 	AMFInit = (AMFInit_Fn)GetProcAddress(m_AMFModule, AMF_INIT_FUNCTION_NAME);
 	if (!AMFInit) {
 		DWORD error = GetLastError();
-		AMF_LOG_ERROR("<Plugin::AMD::AMF::AMF> Finding Address of Function '%ls' failed with error code %d.", AMF_INIT_FUNCTION_NAME, error);
-		throw std::exception("", error);
+		std::vector<char> buf(1024);
+		sprintf(buf.data(), "<Plugin::AMD::AMF::AMF> Finding Address of Function '%s' failed with error code %ld.", AMF_INIT_FUNCTION_NAME, error);
+		AMF_LOG_ERROR("%s", buf.data());
+		throw std::exception(buf.data(), error);
 	}
 
 	// Initialize AMF Libraries
 	res = AMFInit(m_AMFVersion_Runtime, &m_AMFFactory);
 	if (res != AMF_OK) {
-		AMF_LOG_ERROR("<Plugin::AMD::AMF::AMF> Initializing AMF Library failed with error code %d.", res);
-		throw std::exception("", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::AMF::AMF> Initializing AMF Library failed with error %ls (code %ld).", res);
 	} else {
-		AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> AMF Library initialized.");
+		AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> AMF Library initialized.");
 	}
 
 	// Retrieve Trace Object
 	res = m_AMFFactory->GetTrace(&m_AMFTrace);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<Plugin::AMD::AMF::AMF> Retrieving Trace object failed with error %ls (code %d).", res);
+		ThrowExceptionWithAMFError("<Plugin::AMD::AMF::AMF> Retrieving Trace object failed with error %ls (code %ld).", res);
 	}
 
 	// Retrieve Debug Object
 	res = m_AMFFactory->GetDebug(&m_AMFDebug);
 	if (res != AMF_OK) {
-		AMF_LOG_ERROR("<Plugin::AMD::AMF::AMF> Retrieving Debug object failed with error code %ls (code %d).", res);
+		AMF_LOG_ERROR("<Plugin::AMD::AMF::AMF> Retrieving Debug object failed with error code %ls (code %ld).", res);
 		throw std::exception("", res);
 	}
-	#ifdef DEBUG
-	m_AMFTrace->SetGlobalLevel(AMF_TRACE_TEST);
-	#else
-	m_AMFTrace->SetGlobalLevel(AMF_TRACE_WARNING);
-	#endif
 	m_AMFTrace->RegisterWriter(L"OBSWriter", new CustomWriter(), true);
-
-	AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> Initialized.");
+	this->EnableDebugTrace(false);
+	
+	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Initialized.");
 }
 
 Plugin::AMD::AMF::~AMF() {
-	AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> Finalizing.");
+	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Finalizing.");
 
 	// Free Library again
 	if (m_AMFModule)
@@ -174,7 +191,7 @@
 	AMFQueryVersion = nullptr;
 	AMFInit = nullptr;
 
-	AMF_LOG_INFO("<Plugin::AMD::AMF::AMF> Finalized.");
+	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Finalized.");
 }
 
 amf::AMFFactory* Plugin::AMD::AMF::GetFactory() {
@@ -195,6 +212,7 @@
 	#ifdef DEBUG
 	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, true);
 	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_TEST);
+	m_AMFTrace->SetPath(L"C:/AMFTrace.log");
 	#else
 	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_DEBUG_OUTPUT, false);
 	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_DEBUG_OUTPUT, AMF_TRACE_ERROR);
@@ -212,7 +230,7 @@
 		m_AMFDebug->AssertsEnable(false);
 		m_AMFDebug->EnablePerformanceMonitor(false);
 		m_AMFTrace->TraceEnableAsync(true);
-		m_AMFTrace->SetGlobalLevel(AMF_TRACE_INFO);
-		m_AMFTrace->SetWriterLevel(L"OBSWriter", AMF_TRACE_INFO);
+		m_AMFTrace->SetGlobalLevel(AMF_TRACE_WARNING);
+		m_AMFTrace->SetWriterLevel(L"OBSWriter", AMF_TRACE_WARNING);
 	}
 }

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/api-base.cpp Added

@@ -0,0 +1,66 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+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
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+#include "api-base.h"
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+
+Plugin::API::Device::Device() {
+	this->Name = "";
+	this->UniqueId = "";
+}
+
+Plugin::API::Device::Device(std::string Name, std::string UniqueId) {
+	this->Name = Name;
+	this->UniqueId = UniqueId;
+}
+
+Plugin::API::Device::~Device() {
+}
+
+std::vector<Plugin::API::Device> Plugin::API::BaseAPI::EnumerateDevices() {
+	return std::vector<Plugin::API::Device>();
+}
+
+Plugin::API::BaseAPI::BaseAPI(Device device) {
+	myDevice = device;
+}
+
+Plugin::API::BaseAPI::~BaseAPI() {
+
+}
+
+void* Plugin::API::BaseAPI::GetContext() {
+	return nullptr;
+}
+
+Plugin::API::Device Plugin::API::BaseAPI::GetDevice() {
+	return myDevice;
+}

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/api-d3d11.cpp Added

@@ -0,0 +1,289 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+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.
+*/
+
+#ifdef _WIN32
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+#include "api-d3d11.h"
+
+#include <vector>
+#include <string>
+#include <sstream>
+
+#include <dxgi.h>
+#include <d3d11.h>
+
+#include <mutex>
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+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 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::Device BuildDeviceFromAdapter(DXGI_ADAPTER_DESC1* pAdapter) {
+	if (pAdapter == nullptr)
+		return Device("INVALID DEVICE", "");
+
+	std::vector<char> uidBuf(1024);
+	sprintf(uidBuf.data(), "%ld:%ld:%ld:%ld",
+		pAdapter->VendorId,
+		pAdapter->DeviceId,
+		pAdapter->SubSysId,
+		pAdapter->Revision);
+
+	std::vector<char> nameBuf(1024);
+	wcstombs(nameBuf.data(), pAdapter->Description, 1024);
+
+	return Device(std::string(nameBuf.data()), std::string(uidBuf.data()));
+}
+
+std::vector<Plugin::API::Device> Plugin::API::Direct3D11::EnumerateDevices() {
+	std::vector<Plugin::API::Device> devices = std::vector<Plugin::API::Device>();
+
+	IDXGIFactory1* pFactory = NULL;
+	auto singletonDXGI = SingletonDXGI::GetInstance();
+	HRESULT hr = singletonDXGI->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)(&pFactory));
+	if (FAILED(hr)) {
+		return devices;
+	}
+
+	IDXGIAdapter1* pAdapter = NULL;
+	for (uint32_t iAdapterIndex = 0; pFactory->EnumAdapters1(iAdapterIndex, &pAdapter) != DXGI_ERROR_NOT_FOUND; iAdapterIndex++) {
+		DXGI_ADAPTER_DESC1 adapterDesc = DXGI_ADAPTER_DESC1();
+		std::memset(&adapterDesc, 0, sizeof(DXGI_ADAPTER_DESC1));
+
+		if (pAdapter->GetDesc1(&adapterDesc) == S_OK) {
+			// Only allow AMD devices to be listed here.
+			if (adapterDesc.VendorId != 0x1002)
+				continue;
+
+			devices.push_back(BuildDeviceFromAdapter(&adapterDesc));
+		}
+	}
+
+	pFactory->Release();
+
+	return devices;
+}
+
+Plugin::API::Device Plugin::API::Direct3D11::GetDeviceForUniqueId(std::string uniqueId) {
+	Plugin::API::Device device = Device("", "");
+
+	IDXGIFactory1* pFactory = NULL;
+	auto singletonDXGI = SingletonDXGI::GetInstance();
+	HRESULT hr = singletonDXGI->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)(&pFactory));
+	if (FAILED(hr)) {
+		return device;
+	}
+
+	IDXGIAdapter1* pAdapter = NULL;
+	for (uint32_t iAdapterIndex = 0; pFactory->EnumAdapters1(iAdapterIndex, &pAdapter) != DXGI_ERROR_NOT_FOUND; iAdapterIndex++) {
+		DXGI_ADAPTER_DESC1 adapterDesc = DXGI_ADAPTER_DESC1();
+		std::memset(&adapterDesc, 0, sizeof(DXGI_ADAPTER_DESC1));
+
+		if (pAdapter->GetDesc1(&adapterDesc) == S_OK) {
+			// Only allow AMD devices to be listed here.
+			if (adapterDesc.VendorId != 0x1002)
+				continue;
+
+			Plugin::API::Device device2 = BuildDeviceFromAdapter(&adapterDesc);
+
+			if (uniqueId == device2.UniqueId) {
+				device = device2;
+				break;
+			}
+		}
+	}
+
+	pFactory->Release();
+	return device;
+}
+
+Plugin::API::Direct3D11::Direct3D11(Device device) : BaseAPI(device) {
+	IDXGIFactory1 *pFactory;
+
+	auto singletonDXGI = SingletonDXGI::GetInstance();
+	if (FAILED(singletonDXGI->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)(&pFactory))))
+		throw new std::exception("Unable to create D3D11 driver.");
+
+	try {
+		IDXGIAdapter1 *pAdapter = NULL,
+			*pAdapter2 = NULL;
+		for (uint32_t iAdapterIndex = 0; pFactory->EnumAdapters1(iAdapterIndex, &pAdapter2) != DXGI_ERROR_NOT_FOUND; iAdapterIndex++) {
+			DXGI_ADAPTER_DESC1 adapterDesc = DXGI_ADAPTER_DESC1();
+			std::memset(&adapterDesc, 0, sizeof(DXGI_ADAPTER_DESC1));
+
+			if (pAdapter2->GetDesc1(&adapterDesc) == S_OK) {
+				// Only allow AMD devices to be listed here.
+				if (adapterDesc.VendorId != 0x1002)
+					continue;
+
+				Plugin::API::Device device2 = BuildDeviceFromAdapter(&adapterDesc);
+
+				if (device.UniqueId == device2.UniqueId) {
+					pAdapter = pAdapter2;
+					break;
+				}
+			}
+		}
+
+		try {
+			D3D_FEATURE_LEVEL featureLevels[] = {
+				D3D_FEATURE_LEVEL_11_1,
+				D3D_FEATURE_LEVEL_11_0,
+			};
+			uint32_t flags =
+				D3D11_CREATE_DEVICE_BGRA_SUPPORT |
+				D3D11_CREATE_DEVICE_DISABLE_GPU_TIMEOUT |
+				D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
+
+			auto singletonD3D11 = SingletonD3D11::GetInstance();
+			HRESULT hr = singletonD3D11->D3D11CreateDevice(pAdapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
+				flags, featureLevels, 2, D3D11_SDK_VERSION,
+				&pDevice, NULL, &pDeviceContext);
+
+			if (FAILED(hr)) {
+				throw new std::exception("Unable to create D3D11 device.");
+			}
+		} catch (...) {
+			if (pAdapter)
+				pAdapter->Release();
+
+			throw;
+		}
+	} catch (...) {
+		if (pFactory)
+			pFactory->Release();
+
+		throw;
+	}
+}
+
+Plugin::API::Direct3D11::~Direct3D11() {
+	if (pDeviceContext)
+		pDeviceContext->Release();
+	if (pDevice)
+		pDevice->Release();
+}
+
+void* Plugin::API::Direct3D11::GetContext() {
+	return pDevice;
+}
+#endif

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/api-d3d9.cpp Added

@@ -0,0 +1,197 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+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.
+*/
+
+#ifdef _WIN32
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+#include "api-d3d9.h"
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+using namespace Plugin::API;
+
+Plugin::API::Device BuildDeviceFromAdapter(D3DADAPTER_IDENTIFIER9* pAdapter) {
+	if (pAdapter == nullptr)
+		return Device("INVALID DEVICE", "");
+
+	std::vector<char> uidBuf(1024);
+	sprintf(uidBuf.data(), "%ld:%ld:%ld:%ld",
+		pAdapter->VendorId,
+		pAdapter->DeviceId,
+		pAdapter->SubSysId,
+		pAdapter->Revision);
+
+	std::vector<char> nameBuf(1024);
+	sprintf(nameBuf.data(), "%s (%s)",
+		pAdapter->DeviceName,
+		pAdapter->Description);
+
+	return Device(std::string(nameBuf.data()), std::string(uidBuf.data()));
+}
+
+
+std::vector<Plugin::API::Device> Plugin::API::Direct3D9::EnumerateDevices() {
+	std::vector<Plugin::API::Device> devices = std::vector<Plugin::API::Device>();
+
+	IDirect3D9* pDirect3D = Direct3DCreate9(D3D_SDK_VERSION);
+
+	uint32_t adapterCount = pDirect3D->GetAdapterCount();
+	for (uint32_t adapterIndex = 0; adapterIndex < adapterCount; adapterIndex++) {
+		D3DADAPTER_IDENTIFIER9 adapterDesc = D3DADAPTER_IDENTIFIER9();
+		pDirect3D->GetAdapterIdentifier(adapterIndex, 0, &adapterDesc);
+
+		if (adapterDesc.VendorId != 0x1002)
+			continue;
+
+		Device device = BuildDeviceFromAdapter(&adapterDesc);
+		devices.push_back(device);
+	}
+
+	pDirect3D->Release();
+
+	return devices;
+}
+
+Plugin::API::Device Plugin::API::Direct3D9::GetDeviceForUniqueId(std::string uniqueId) {
+	Plugin::API::Device device = Device("", "");
+
+	IDirect3D9* pDirect3D = Direct3DCreate9(D3D_SDK_VERSION);
+
+	uint32_t adapterCount = pDirect3D->GetAdapterCount();
+	for (uint32_t adapterIndex = 0; adapterIndex <= adapterCount; adapterIndex++) {
+		D3DADAPTER_IDENTIFIER9 adapterDesc = D3DADAPTER_IDENTIFIER9();
+		pDirect3D->GetAdapterIdentifier(adapterIndex, 0, &adapterDesc);
+
+		if (adapterDesc.VendorId != 0x1002)
+			continue;
+
+		Device device2 = BuildDeviceFromAdapter(&adapterDesc);
+		if (device2.UniqueId == uniqueId)
+			device = device2;
+	}
+
+	pDirect3D->Release();
+
+	return device;
+}
+
+struct EnumWindowsData {
+	DWORD processId;
+	HWND bestWindowId;
+};
+
+BOOL CALLBACK EnumWindowsCallback(HWND handle, LPARAM lParam) {
+	EnumWindowsData* data = (EnumWindowsData*)lParam;
+
+	DWORD processId;
+	GetWindowThreadProcessId(handle, &processId);
+	if ((processId == data->processId)
+		&& (GetWindow(handle, GW_OWNER) == (HWND)0)
+		&& (IsWindowVisible(handle))) {
+		return TRUE;
+	}
+	data->bestWindowId = handle;
+	return FALSE;
+}
+
+Plugin::API::Direct3D9::Direct3D9(Device device) : BaseAPI(device) {
+	pDirect3D = Direct3DCreate9(D3D_SDK_VERSION);
+	if (!pDirect3D)
+		throw std::exception("Unable to create D3D9 driver.");
+
+	// Find Adapter Index
+	uint32_t usedAdapter = 0;
+	uint32_t adapterCount = pDirect3D->GetAdapterCount();
+	for (uint32_t adapterIndex = 0; adapterIndex <= adapterCount; adapterIndex++) {
+		D3DADAPTER_IDENTIFIER9 adapterDesc = D3DADAPTER_IDENTIFIER9();
+		pDirect3D->GetAdapterIdentifier(adapterIndex, 0, &adapterDesc);
+
+		if (adapterDesc.VendorId != 0x1002)
+			continue;
+
+		Device device2 = BuildDeviceFromAdapter(&adapterDesc);
+		if (device2.UniqueId == device.UniqueId) {
+			usedAdapter = adapterIndex++;
+			break;
+		}
+	}
+
+	EnumWindowsData data = EnumWindowsData();
+	data.processId = GetCurrentProcessId();
+	EnumWindows(EnumWindowsCallback, (LPARAM)&data);
+
+	D3DPRESENT_PARAMETERS pPresentParameter = D3DPRESENT_PARAMETERS();
+	pPresentParameter.BackBufferWidth = 1280;
+	pPresentParameter.BackBufferHeight = 720;
+	pPresentParameter.BackBufferFormat = D3DFORMAT::D3DFMT_R8G8B8;
+	pPresentParameter.BackBufferCount = 2;
+	pPresentParameter.MultiSampleType = D3DMULTISAMPLE_TYPE::D3DMULTISAMPLE_NONE;
+	pPresentParameter.MultiSampleQuality = 0;
+	pPresentParameter.SwapEffect = D3DSWAPEFFECT::D3DSWAPEFFECT_DISCARD;
+	pPresentParameter.hDeviceWindow = data.bestWindowId;
+	pPresentParameter.Windowed = TRUE;
+	pPresentParameter.EnableAutoDepthStencil = FALSE;
+	pPresentParameter.AutoDepthStencilFormat = D3DFORMAT::D3DFMT_A1;
+	pPresentParameter.Flags = D3DPRESENTFLAG_VIDEO;
+	pPresentParameter.FullScreen_RefreshRateInHz = 0;
+	pPresentParameter.PresentationInterval = 1;
+		
+	HRESULT hr = pDirect3D->CreateDevice(usedAdapter,
+		D3DDEVTYPE_HAL,
+		data.bestWindowId,
+		D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX | D3DCREATE_MULTITHREADED | D3DCREATE_PUREDEVICE | D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_NOWINDOWCHANGES,
+		&pPresentParameter,
+		&pDirect3DDevice);
+	switch (hr) {
+		case D3DERR_DEVICELOST:
+			throw std::exception("D3DERR_DEVICELOST");
+			break;
+		case D3DERR_INVALIDCALL:
+			throw std::exception("D3DERR_INVALIDCALL");
+			break;
+		case D3DERR_NOTAVAILABLE:
+			throw std::exception("D3DERR_NOTAVAILABLE");
+			break;
+		case D3DERR_OUTOFVIDEOMEMORY:
+			throw std::exception("D3DERR_OUTOFVIDEOMEMORY");
+			break;
+	}
+	if (FAILED(hr))
+		throw std::exception("Unable to create D3D9 device.");
+}
+
+Plugin::API::Direct3D9::~Direct3D9() {
+	if (pDirect3DDevice)
+		pDirect3DDevice->Release();
+
+	if (pDirect3D)
+		pDirect3D->Release();
+}
+
+void* Plugin::API::Direct3D9::GetContext() {
+	return pDirect3DDevice;
+}
+#endif

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/enc-h264.cpp -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/enc-h264.cpp Changed

@@ -28,32 +28,14 @@
 // Includes
 //////////////////////////////////////////////////////////////////////////
 #include "enc-h264.h"
+#include "misc-util.cpp"
 
 #if (defined _WIN32) | (defined _WIN64)
 #include <VersionHelpers.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-// Defines
-//////////////////////////////////////////////////////////////////////////
 
-// Advanced Interface
-#define AMF_H264ADVANCED_NAME						TEXT_AMF_H264ADVANCED("Name")
-#define AMF_H264ADVANCED_RESET						TEXT_AMF_H264ADVANCED("Reset")
-#define AMF_H264ADVANCED_UPDATE						TEXT_AMF_H264ADVANCED("Update")
-#define AMF_H264ADVANCED_MAX_LTR_FRAMES				TEXT_AMF_H264ADVANCED("MaxLTRFrames")
-#define AMF_H264ADVANCED_VBVBUFFER_SIZE				TEXT_AMF_H264ADVANCED("VBVBuffer.Size")
-#define AMF_H264ADVANCED_VBVBUFFER_FULLNESS			TEXT_AMF_H264ADVANCED("VBVBuffer.Fullness")
-#define AMF_H264ADVANCED_MAX_AU_SIZE				TEXT_AMF_H264ADVANCED("MaxAUSize")
-#define AMF_H264ADVANCED_HEADER_INSERTION_SPACING	TEXT_AMF_H264ADVANCED("HeaderInsertionSpacing")
-#define AMF_H264ADVANCED_IDR_PERIOD					TEXT_AMF_H264ADVANCED("IDRPeriod")
-#define AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT	TEXT_AMF_H264ADVANCED("IntraRefreshNumMBPerSlot")
-#define AMF_H264ADVANCED_SLICESPERFRAME				TEXT_AMF_H264ADVANCED("SlicesPerFrame")
-#define AMF_H264ADVANCED_MOTIONESTIMATION			TEXT_AMF_H264ADVANCED("MotionEstimation")
-#define AMF_H264ADVANCED_MOTIONESTIMATION_NONE		TEXT_AMF_H264ADVANCED("MotionEstimation.None")
-#define AMF_H264ADVANCED_MOTIONESTIMATION_HALF		TEXT_AMF_H264ADVANCED("MotionEstimation.Half")
-#define AMF_H264ADVANCED_MOTIONESTIMATION_QUARTER	TEXT_AMF_H264ADVANCED("MotionEstimation.Quarter")
-#define AMF_H264ADVANCED_MOTIONESTIMATION_BOTH		TEXT_AMF_H264ADVANCED("MotionEstimation.Both")
+#include "api-d3d9.h"
+#include "api-d3d11.h"
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 // Code
@@ -62,6 +44,23 @@
 using namespace Plugin::AMD;
 using namespace Plugin::Interface;
 
+enum Presets {
+	None = -1,
+	Default = 0,
+	Recording,
+	HighQuality,
+	Indistinguishable,
+	Lossless,
+	Twitch,
+	YouTube,
+};
+enum ViewMode {
+	Basic,
+	Advanced,
+	Expert,
+	Master
+};
+
 void Plugin::Interface::H264Interface::encoder_register() {
 	static obs_encoder_info* encoder_info = new obs_encoder_info();
 	static const char* encoder_name = "amd_amf_h264";
@@ -86,19 +85,58 @@
 	encoder_info->get_extra_data = &get_extra_data;
 
 	obs_register_encoder(encoder_info);
+
+	//////////////////////////////////////////////////////////////////////////
+	// Deprecated old Encoder
+	static obs_encoder_info* encoder_info_simple = new obs_encoder_info();
+	static const char* encoder_name_simple = "amd_amf_h264_simple";
+
+	std::memset(encoder_info_simple, 0, sizeof(obs_encoder_info));
+
+	// Initialize Structure
+	encoder_info_simple->id = encoder_name_simple;
+	encoder_info_simple->type = obs_encoder_type::OBS_ENCODER_VIDEO;
+	encoder_info_simple->codec = encoder_codec;
+
+	// Functions
+	encoder_info_simple->get_name = &get_name_simple;
+	encoder_info_simple->get_defaults = &get_defaults;
+	encoder_info_simple->get_properties = &get_properties;
+	encoder_info_simple->create = &create;
+	encoder_info_simple->destroy = &destroy;
+	encoder_info_simple->encode = &encode;
+	encoder_info_simple->update = &update;
+	encoder_info_simple->get_video_info = &get_video_info;
+	encoder_info_simple->get_extra_data = &get_extra_data;
+
+	obs_register_encoder(encoder_info_simple);
+	//////////////////////////////////////////////////////////////////////////
 }
 
 const char* Plugin::Interface::H264Interface::get_name(void*) {
-	return obs_module_text(AMF_H264ADVANCED_NAME);
+	static const char* name = "H264 Encoder (AMD Advanced Media Framework)";
+	return name;
 }
 
+//////////////////////////////////////////////////////////////////////////
+// Deprecated old Encoder
+const char* Plugin::Interface::H264Interface::get_name_simple(void*) {
+	static const char* name = "[DEPRECATED] H264 Encoder (AMD Advanced Media Framework)";
+	return name;
+}
+//////////////////////////////////////////////////////////////////////////
 void* Plugin::Interface::H264Interface::create(obs_data_t* settings, obs_encoder_t* encoder) {
 	try {
+		AMF_LOG_INFO("Starting up...");
 		Plugin::Interface::H264Interface* enc = new Plugin::Interface::H264Interface(settings, encoder);
 		return enc;
-	} catch (...) {
+	} catch (std::exception e) {
+		AMF_LOG_ERROR("Exception: %s", e.what());
 		AMF_LOG_ERROR("Unable to create Encoder, see log for more information.");
 		return NULL;
+	} catch (...) {
+		AMF_LOG_ERROR("Unhandled Exception during start up.");
+		return NULL;
 	}
 }
 
@@ -106,11 +144,15 @@
 #pragma warning( disable: 4702 )
 void Plugin::Interface::H264Interface::destroy(void* data) {
 	try {
+		AMF_LOG_INFO("Shutting down...");
 		Plugin::Interface::H264Interface* enc = static_cast<Plugin::Interface::H264Interface*>(data);
 		delete enc;
 		data = nullptr;
-	} catch (...) {
+	} catch (std::exception e) {
+		AMF_LOG_ERROR("Exception: %s", e.what());
 		AMF_LOG_ERROR("Unable to destroy Encoder, see log for more information.");
+	} catch (...) {
+		AMF_LOG_ERROR("Unhandled Exception during shut down.");
 	}
 }
 #pragma warning( pop )
@@ -118,539 +160,1043 @@
 bool Plugin::Interface::H264Interface::encode(void *data, struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet) {
 	try {
 		return static_cast<Plugin::Interface::H264Interface*>(data)->encode(frame, packet, received_packet);
-	} catch (...) {
+	} catch (std::exception e) {
+		AMF_LOG_ERROR("Exception: %s", e.what());
 		AMF_LOG_ERROR("Unable to encode, see log for more information.");
 		return false;
+	} catch (...) {
+		throw;
 	}
 }
 
 void Plugin::Interface::H264Interface::get_defaults(obs_data_t *data) {
-	// Controls
-	obs_data_set_default_bool(data, AMF_H264ADVANCED_RESET, false);
-	obs_data_set_default_bool(data, AMF_H264ADVANCED_UPDATE, false);
-
-	// Static Properties
-	/// Memory Type & Compute Type
-	obs_data_set_default_int(data, AMF_H264_MEMORYTYPE, VCEMemoryType_Host);
-	obs_data_set_default_int(data, AMF_H264_COMPUTETYPE, VCEComputeType_None);
-	obs_data_set_default_int(data, AMF_H264_SURFACEFORMAT, -1);
-	/// Usage & Quality Preset
-	obs_data_set_default_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
-	obs_data_set_default_int(data, AMF_H264_QUALITY_PRESET, -1);
-	/// Profile & Level
-	obs_data_set_default_int(data, AMF_H264_PROFILE, -1);
-	obs_data_set_default_int(data, AMF_H264_PROFILELEVEL, -1);
-	/// Other
-	obs_data_set_default_int(data, AMF_H264ADVANCED_MAX_LTR_FRAMES, -1);
-	obs_data_set_default_int(data, AMF_H264_SCANTYPE, -1);
-
-	// Dynamic Properties
-	/// Rate Control
-	obs_data_set_default_int(data, AMF_H264_RATECONTROLMETHOD, -1);
-	/// Other
-	obs_data_set_default_int(data, AMF_H264_FILLERDATA, -1);
-	obs_data_set_default_int(data, AMF_H264_FRAMESKIPPING, -1);
-	obs_data_set_default_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, -1);
-	/// Video Coding Settings
-	obs_data_set_default_int(data, AMF_H264ADVANCED_VBVBUFFER_SIZE, -1);
-	obs_data_set_default_double(data, AMF_H264ADVANCED_VBVBUFFER_FULLNESS, 1.0);
-	obs_data_set_default_int(data, AMF_H264ADVANCED_MAX_AU_SIZE, -1);
-	/// Rate Control: CBR, VBR
-	obs_data_set_default_int(data, AMF_H264_BITRATE_TARGET, -1);
-	obs_data_set_default_int(data, AMF_H264_BITRATE_PEAK, -1);
-	/// Todo: Unknown Rate Control Method, possibly just used for internal storage. I believe there is a Constrained QP setting that is yet undiscovered.
-	obs_data_set_default_int(data, AMF_H264_QP_MINIMUM, -1);
-	obs_data_set_default_int(data, AMF_H264_QP_MAXIMUM, -1);
-	/// Rate Control: Constrained QP
-	obs_data_set_default_int(data, AMF_H264_QP_IFRAME, -1);
-	obs_data_set_default_int(data, AMF_H264_QP_PFRAME, -1);
-	obs_data_set_default_int(data, AMF_H264_QP_BFRAME, -1);
-	/// B-Picture Stuff
-	obs_data_set_default_int(data, AMF_H264_QP_BPICTURE_DELTA, -11);
-	obs_data_set_default_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, -11);
-
-	// Picture Control Properties
-	obs_data_set_default_int(data, AMF_H264_BPICTURE_PATTERN, -1);
-	obs_data_set_default_int(data, AMF_H264_BPICTURE_REFERENCE, -1);
-	obs_data_set_default_int(data, AMF_H264ADVANCED_HEADER_INSERTION_SPACING, -1);
-	obs_data_set_default_int(data, AMF_H264_DEBLOCKINGFILTER, -1);
-	obs_data_set_default_int(data, AMF_H264ADVANCED_IDR_PERIOD, -1);
-	obs_data_set_default_int(data, AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT, -1);
-	obs_data_set_default_int(data, AMF_H264ADVANCED_SLICESPERFRAME, -1);
-
-	// Motion Estimation
-	obs_data_set_default_int(data, AMF_H264ADVANCED_MOTIONESTIMATION, -1);
-
-	// Other
-	obs_data_set_default_int(data, AMF_H264_GOP_SIZE, -1);
-	obs_data_set_default_int(data, AMF_H264_CABAC, -1);
-
-	/// Debug Mode
-	obs_data_set_default_bool(data, AMF_H264_DEBUGTRACING, false);
-
-	//////////////////////////////////////////////////////////////////////////
+	#pragma region OBS - Enforce Streaming Service Restrictions
 	// OBS - Enforce Streaming Service Restrictions
-	//////////////////////////////////////////////////////////////////////////
 	obs_data_set_default_int(data, "bitrate", -1);
 	obs_data_set_default_int(data, "keyint_sec", -1);
 	obs_data_set_default_string(data, "rate_control", "");
 	obs_data_set_default_string(data, "profile", "");
+	obs_data_set_default_string(data, "preset", "");
 	obs_data_set_int(data, "bitrate", -1);
 	obs_data_set_int(data, "keyint_sec", -1);
 	obs_data_set_string(data, "rate_control", "");
 	obs_data_set_string(data, "profile", "");
+	obs_data_set_string(data, "preset", "");
+	#pragma endregion OBS - Enforce Streaming Service Restrictions
+
+	obs_data_set_default_int(data, AMF_H264_PRESET, -1);
+
+	// Static Properties
+	obs_data_set_default_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+	obs_data_set_default_int(data, AMF_H264_PROFILE, VCEProfile_Main);
+	obs_data_set_default_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+	obs_data_set_default_int(data, AMF_H264_MAXIMUMLTRFRAMES, 0);
+
+	// Rate Control Properties
+	obs_data_set_default_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
+	obs_data_set_default_int(data, AMF_H264_BITRATE_TARGET, 3500);
+	obs_data_set_default_int(data, AMF_H264_BITRATE_PEAK, 9000);
+	obs_data_set_default_int(data, AMF_H264_QP_MINIMUM, 1);
+	obs_data_set_default_int(data, AMF_H264_QP_MAXIMUM, 51);
+	obs_data_set_default_int(data, AMF_H264_QP_IFRAME, 22);
+	obs_data_set_default_int(data, AMF_H264_QP_PFRAME, 22);
+	obs_data_set_default_int(data, AMF_H264_QP_BFRAME, 22);
+	obs_data_set_default_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
+	obs_data_set_default_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
+	obs_data_set_default_int(data, AMF_H264_VBVBUFFER, 0);
+	obs_data_set_default_int(data, AMF_H264_VBVBUFFER_SIZE, 3500);
+	obs_data_set_default_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 100);
+	obs_data_set_default_double(data, AMF_H264_VBVBUFFER_FULLNESS, 100);
+	obs_data_set_default_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+	obs_data_set_default_int(data, AMF_H264_FILLERDATA, 1);
+	obs_data_set_default_int(data, AMF_H264_FRAMESKIPPING, 0);
+	obs_data_set_default_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+	// Picture Control Properties
+	obs_data_set_default_double(data, AMF_H264_KEYFRAME_INTERVAL, 2);
+	obs_data_set_default_int(data, AMF_H264_IDR_PERIOD, 60);
+	obs_data_set_default_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+	obs_data_set_default_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? VCEBPicturePattern_Three : VCEBPicturePattern_None));
+	obs_data_set_default_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
+	obs_data_set_default_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
+	obs_data_set_default_int(data, AMF_H264_SLICESPERFRAME, 0);
+	obs_data_set_default_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+	// Miscellaneous Control Properties
+	obs_data_set_default_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+	obs_data_set_default_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+	obs_data_set_default_int(data, AMF_H264_MOTIONESTIMATION, 3);
+	obs_data_set_default_int(data, AMF_H264_CABAC, 0);
+
+	// System Properties
+	obs_data_set_default_int(data, AMF_H264_MEMORYTYPE, VCEMemoryType_Host);
+	obs_data_set_default_int(data, AMF_H264_USE_OPENCL, 0);
+	obs_data_set_default_int(data, AMF_H264_SURFACEFORMAT, -1);
+	obs_data_set_default_int(data, AMF_H264_VIEW, ViewMode::Basic);
+	obs_data_set_default_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+	obs_data_set_default_bool(data, AMF_H264_DEBUG, 0);
+}
+
+void fill_device_list(obs_property_t* p, obs_data_t* data) {
+	std::vector<Plugin::API::Device> devices;
+
+	switch ((VCEMemoryType)obs_data_get_int(data, AMF_H264_MEMORYTYPE)) {
+		case VCEMemoryType_Auto:
+			#ifdef _WIN32
+			if (IsWindows8OrGreater()) {
+				// DirectX 11
+				devices = Plugin::API::Direct3D11::EnumerateDevices();
+			} else if (IsWindowsXPOrGreater()) {
+				// DirectX 9
+				//devices = Plugin::API::Direct3D9::EnumerateDevices();
+			} else
+				#endif
+			{
+				// OpenGL
+			}
+			break;
+
+			#ifdef _WIN32
+		case VCEMemoryType_DirectX9:
+			if (IsWindowsXPOrGreater()) // DirectX 9
+				//devices = Plugin::API::Direct3D9::EnumerateDevices();
+				break;
+		case VCEMemoryType_DirectX11:
+			if (IsWindows8OrGreater()) // DirectX 11
+				devices = Plugin::API::Direct3D11::EnumerateDevices();
+			break;
+			#endif
+		case VCEMemoryType_OpenGL:
+			// OpenGL
+			break;
+		/*case VCEMemoryType_Host:
+			break;*/
+	}
+
+	obs_property_list_clear(p);
+	obs_property_list_add_string(p, obs_module_text(AMF_UTIL_DEFAULT), "");
+	for (Plugin::API::Device device : devices) {
+		obs_property_list_add_string(p, device.Name.c_str(), device.UniqueId.c_str());
+	}
 }
 
 obs_properties_t* Plugin::Interface::H264Interface::get_properties(void*) {
 	obs_properties* props = obs_properties_create();
-	obs_property_t* list;
 	obs_property_t* p;
 
-	//////////////////////////////////////////////////////////////////////////
-	// Controls
-	//////////////////////////////////////////////////////////////////////////
-	p = obs_properties_add_bool(props, AMF_H264ADVANCED_RESET, obs_module_text(AMF_H264ADVANCED_RESET));
-	obs_property_set_modified_callback(p, &reset_callback);
-	p = obs_properties_add_bool(props, AMF_H264ADVANCED_UPDATE, obs_module_text(AMF_H264ADVANCED_UPDATE));
-	obs_property_set_modified_callback(p, &update_from_amf);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Encoder Static Parameters
-	//////////////////////////////////////////////////////////////////////////
-	/// Memory Type
-	list = obs_properties_add_list(props, AMF_H264_MEMORYTYPE, obs_module_text(AMF_H264_MEMORYTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_AUTOMATIC), VCEMemoryType_Auto);
-	obs_property_list_add_int(list, "Host", VCEMemoryType_Host);
-	if (IsWindowsXPOrGreater()) {
-		obs_property_list_add_int(list, "DirectX 9", VCEMemoryType_DirectX9);
-		if (IsWindows8OrGreater()) {
-			obs_property_list_add_int(list, "DirectX 11", VCEMemoryType_DirectX11);
-		}
-	}
-	obs_property_list_add_int(list, "OpenGL", VCEMemoryType_OpenGL);
-	/// Compute Type
-	list = obs_properties_add_list(props, AMF_H264_COMPUTETYPE, obs_module_text(AMF_H264_COMPUTETYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), VCEComputeType_None);
-	obs_property_list_add_int(list, "OpenCL", VCEComputeType_OpenCL);
-	/// Surface Format
-	list = obs_properties_add_list(props, AMF_H264_SURFACEFORMAT, obs_module_text(AMF_H264_SURFACEFORMAT), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_AUTOMATIC), -1);
-	auto formats = Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->input.formats;
-	for (auto format = formats.begin(); format != formats.end(); format++) {
-		switch (format->first) {
-			case amf::AMF_SURFACE_NV12:
-				obs_property_list_add_int(list, "NV12 (4:2:0)", VCESurfaceFormat_NV12);
-				break;
-			case amf::AMF_SURFACE_YUV420P:
-				obs_property_list_add_int(list, "I420 (4:2:0)", VCESurfaceFormat_I420);
-				break;
-			case amf::AMF_SURFACE_YUY2:
-				obs_property_list_add_int(list, "YUY2 (4:2:2)", VCESurfaceFormat_YUY2);
-				break;
-			case amf::AMF_SURFACE_BGRA:
-				obs_property_list_add_int(list, "BGRA (Uncompressed)", VCESurfaceFormat_BGRA);
-				break;
-			case amf::AMF_SURFACE_RGBA:
-				obs_property_list_add_int(list, "RGBA (Uncompressed)", VCESurfaceFormat_RGBA);
-				break;
-			case amf::AMF_SURFACE_GRAY8:
-				obs_property_list_add_int(list, "Y800 (Gray)", VCESurfaceFormat_GRAY);
-				break;
-		}
-	}
-	/// Usage
-	list = obs_properties_add_list(props, AMF_H264_USAGE, obs_module_text(AMF_H264_USAGE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_USAGE_TRANSCODING), VCEUsage_Transcoding);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_USAGE_ULTRALOWLATENCY), VCEUsage_UltraLowLatency);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_USAGE_LOWLATENCY), VCEUsage_LowLatency);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_USAGE_WEBCAM), VCEUsage_Webcam);
-	/// h264 Profile
-	list = obs_properties_add_list(props, AMF_H264_PROFILE, obs_module_text(AMF_H264_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
+	#pragma region Preset
+	p = obs_properties_add_list(props, AMF_H264_PRESET, obs_module_text(AMF_H264_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_modified_callback(p, preset_modified);
+	obs_property_list_add_int(p, "", -1);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_DEFAULT), Presets::Default);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_PRESET_RECORDING), Presets::Recording);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_PRESET_HIGHQUALITY), Presets::HighQuality);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_PRESET_INDISTINGUISHABLE), Presets::Indistinguishable);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_PRESET_LOSSLESS), Presets::Lossless);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_PRESET_TWITCH), Presets::Twitch);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_PRESET_YOUTUBE), Presets::YouTube);
+	#pragma endregion Preset
+
+	#pragma region Static Properties
+	#pragma region Usage
+	p = obs_properties_add_list(props, AMF_H264_USAGE, obs_module_text(AMF_H264_USAGE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_USAGE_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_USAGE_TRANSCODING), VCEUsage_Transcoding);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_USAGE_ULTRALOWLATENCY), VCEUsage_UltraLowLatency);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_USAGE_LOWLATENCY), VCEUsage_LowLatency);
+	//obs_property_list_add_int(list, obs_module_text(AMF_H264_USAGE_WEBCAM), VCEUsage_Webcam); // Requires SVC? SVC is not implemented by default.
+	#pragma endregion Usage
+	#pragma region Profile
+	p = obs_properties_add_list(props, AMF_H264_PROFILE, obs_module_text(AMF_H264_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_PROFILE_DESCRIPTION));
 	switch (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfile) {
 		case 100:
-			obs_property_list_add_int(list, "High", VCEProfile_High);
+			obs_property_list_add_int(p, "High", VCEProfile_High);
 		case 77:
-			obs_property_list_add_int(list, "Main", VCEProfile_Main);
+			obs_property_list_add_int(p, "Main", VCEProfile_Main);
 		case 66:
-			obs_property_list_add_int(list, "Baseline", VCEProfile_Baseline);
+			obs_property_list_add_int(p, "Baseline", VCEProfile_Baseline);
 			break;
 	}
-	/// h264 Profile Level
-	list = obs_properties_add_list(props, AMF_H264_PROFILELEVEL, obs_module_text(AMF_H264_PROFILELEVEL), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
+	#pragma endregion Profile
+	#pragma region Profile Level
+	p = obs_properties_add_list(props, AMF_H264_PROFILELEVEL, obs_module_text(AMF_H264_PROFILELEVEL), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_PROFILELEVEL_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_AUTOMATIC), VCEProfileLevel_Automatic);
 	switch (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel) {
-		case 62:
-			obs_property_list_add_int(list, "6.2", VCEProfileLevel_62);
-		case 61:
-			obs_property_list_add_int(list, "6.1", VCEProfileLevel_61);
-		case 60:
-			obs_property_list_add_int(list, "6.0", VCEProfileLevel_60);
 		case 52:
-			obs_property_list_add_int(list, "5.2", VCEProfileLevel_52);
+			obs_property_list_add_int(p, "5.2", VCEProfileLevel_52);
 		case 51:
-			obs_property_list_add_int(list, "5.1", VCEProfileLevel_51);
+			obs_property_list_add_int(p, "5.1", VCEProfileLevel_51);
 		case 50:
-			obs_property_list_add_int(list, "5.0", VCEProfileLevel_50);
+			obs_property_list_add_int(p, "5.0", VCEProfileLevel_50);
 		case 42: // Some VCE 2.0 Cards.
-			obs_property_list_add_int(list, "4.2", VCEProfileLevel_42);
+			obs_property_list_add_int(p, "4.2", VCEProfileLevel_42);
 		case 41: // Some APUs and VCE 1.0 Cards.
-			obs_property_list_add_int(list, "4.1", VCEProfileLevel_41);
+			obs_property_list_add_int(p, "4.1", VCEProfileLevel_41);
 		case 40: // These should in theory be supported by all VCE 1.0 devices and APUs.
-			obs_property_list_add_int(list, "4.0", VCEProfileLevel_40);
+			obs_property_list_add_int(p, "4.0", VCEProfileLevel_40);
 		case 32:
-			obs_property_list_add_int(list, "3.2", VCEProfileLevel_32);
+			obs_property_list_add_int(p, "3.2", VCEProfileLevel_32);
 		case 31:
-			obs_property_list_add_int(list, "3.1", VCEProfileLevel_31);
+			obs_property_list_add_int(p, "3.1", VCEProfileLevel_31);
 		case 30:
-			obs_property_list_add_int(list, "3.0", VCEProfileLevel_30);
+			obs_property_list_add_int(p, "3.0", VCEProfileLevel_30);
 		case 22:
-			obs_property_list_add_int(list, "2.2", VCEProfileLevel_22);
+			obs_property_list_add_int(p, "2.2", VCEProfileLevel_22);
 		case 21:
-			obs_property_list_add_int(list, "2.1", VCEProfileLevel_21);
+			obs_property_list_add_int(p, "2.1", VCEProfileLevel_21);
 		case 20:
-			obs_property_list_add_int(list, "2.0", VCEProfileLevel_20);
+			obs_property_list_add_int(p, "2.0", VCEProfileLevel_20);
 		case 13:
-			obs_property_list_add_int(list, "1.3", VCEProfileLevel_13);
+			obs_property_list_add_int(p, "1.3", VCEProfileLevel_13);
 		case 12:
-			obs_property_list_add_int(list, "1.2", VCEProfileLevel_12);
+			obs_property_list_add_int(p, "1.2", VCEProfileLevel_12);
 		case 11:
-			obs_property_list_add_int(list, "1.1", VCEProfileLevel_11);
+			obs_property_list_add_int(p, "1.1", VCEProfileLevel_11);
 		case 10:
 		default:
-			obs_property_list_add_int(list, "1.0", VCEProfileLevel_10);
+			obs_property_list_add_int(p, "1.0", VCEProfileLevel_10);
 	}
-	/// Maximum Long-Term-Reference Frames
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_MAX_LTR_FRAMES, obs_module_text(AMF_H264ADVANCED_MAX_LTR_FRAMES), -1, 2, 1);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Encoder Rate Control
-	//////////////////////////////////////////////////////////////////////////
-	/// Method
-	list = obs_properties_add_list(props, AMF_H264_RATECONTROLMETHOD, obs_module_text(AMF_H264_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_CQP), VCERateControlMethod_ConstantQP);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_CBR), VCERateControlMethod_ConstantBitrate);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_VBR), VCERateControlMethod_VariableBitrate_PeakConstrained);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_RATECONTROLMETHOD_VBR_LAT), VCERateControlMethod_VariableBitrate_LatencyConstrained);
-	/// Skip Frames if necessary
-	list = obs_properties_add_list(props, AMF_H264_FRAMESKIPPING, obs_module_text(AMF_H264_FRAMESKIPPING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-	/// Method: Bitrate
-	obs_properties_add_int_slider(props, AMF_H264_BITRATE_TARGET, obs_module_text(AMF_H264_BITRATE_TARGET), -1, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
-	obs_properties_add_int_slider(props, AMF_H264_BITRATE_PEAK, obs_module_text(AMF_H264_BITRATE_PEAK), -1, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
+	#pragma endregion Profile Levels
+	#pragma region Long Term Reference Frames
+	p = obs_properties_add_int_slider(props, AMF_H264_MAXIMUMLTRFRAMES, obs_module_text(AMF_H264_MAXIMUMLTRFRAMES), 0, 2, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_MAXIMUMLTRFRAMES_DESCRIPTION));
+	obs_property_set_modified_callback(p, maximum_ltr_frames_modified);
+	#pragma endregion Long Term Reference Frames
+	#pragma endregion Static Properties
+
+	#pragma region Rate Control Properties
+	//p = obs_properties_add_bool(props, "rcp_delimiter", "------ Rate Control Properties ------");
+	#pragma region Method
+	p = obs_properties_add_list(props, AMF_H264_RATECONTROLMETHOD, obs_module_text(AMF_H264_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_RATECONTROLMETHOD_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_RATECONTROLMETHOD_CQP), VCERateControlMethod_ConstantQP);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_RATECONTROLMETHOD_CBR), VCERateControlMethod_ConstantBitrate);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_RATECONTROLMETHOD_VBR), VCERateControlMethod_VariableBitrate_PeakConstrained);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_RATECONTROLMETHOD_VBR_LAT), VCERateControlMethod_VariableBitrate_LatencyConstrained);
+	obs_property_set_modified_callback(p, rate_control_method_modified);
+	#pragma endregion Method
+	#pragma region Method Parameters
+	/// Bitrate Constraints
+	p = obs_properties_add_int(props, AMF_H264_BITRATE_TARGET, obs_module_text(AMF_H264_BITRATE_TARGET), 0, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_BITRATE_TARGET_DESCRIPTION));
+	p = obs_properties_add_int(props, AMF_H264_BITRATE_PEAK, obs_module_text(AMF_H264_BITRATE_PEAK), 0, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_BITRATE_PEAK_DESCRIPTION));
 	/// Minimum QP, Maximum QP
-	obs_properties_add_int_slider(props, AMF_H264_QP_MINIMUM, obs_module_text(AMF_H264_QP_MINIMUM), -1, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_MAXIMUM, obs_module_text(AMF_H264_QP_MAXIMUM), -1, 51, 1);
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_MINIMUM, obs_module_text(AMF_H264_QP_MINIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_MINIMUM_DESCRIPTION));
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_MAXIMUM, obs_module_text(AMF_H264_QP_MAXIMUM), 0, 51, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_MAXIMUM_DESCRIPTION));
 	/// Method: Constant QP
-	obs_properties_add_int_slider(props, AMF_H264_QP_IFRAME, obs_module_text(AMF_H264_QP_IFRAME), -1, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_PFRAME, obs_module_text(AMF_H264_QP_PFRAME), -1, 51, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_BFRAME, obs_module_text(AMF_H264_QP_BFRAME), -1, 51, 1);
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_IFRAME, obs_module_text(AMF_H264_QP_IFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_IFRAME_DESCRIPTION));
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_PFRAME, obs_module_text(AMF_H264_QP_PFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_PFRAME_DESCRIPTION));
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_BFRAME, obs_module_text(AMF_H264_QP_BFRAME), 0, 51, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_BFRAME_DESCRIPTION));
 	/// B-Picture Related
-	obs_properties_add_int_slider(props, AMF_H264_QP_BPICTURE_DELTA, obs_module_text(AMF_H264_QP_BPICTURE_DELTA), -11, 10, 1);
-	obs_properties_add_int_slider(props, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, obs_module_text(AMF_H264_QP_REFERENCE_BPICTURE_DELTA), -11, 10, 1);
-	/// VBV Buffer
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_VBVBUFFER_SIZE, obs_module_text(AMF_H264ADVANCED_VBVBUFFER_SIZE), -1, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
-	obs_properties_add_float_slider(props, AMF_H264ADVANCED_VBVBUFFER_FULLNESS, obs_module_text(AMF_H264ADVANCED_VBVBUFFER_FULLNESS), 0.0, 1.0, 0.015625);
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_BPICTURE_DELTA, obs_module_text(AMF_H264_QP_BPICTURE_DELTA), -10, 10, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_BPICTURE_DELTA_DESCRIPTION));
+	p = obs_properties_add_int_slider(props, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, obs_module_text(AMF_H264_QP_REFERENCE_BPICTURE_DELTA), -10, 10, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QP_REFERENCE_BPICTURE_DELTA_DESCRIPTION));
+	#pragma endregion Method Parameters
+	#pragma region VBV Buffer
+	p = obs_properties_add_list(props, AMF_H264_VBVBUFFER, obs_module_text(AMF_H264_VBVBUFFER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_VBVBUFFER_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_AUTOMATIC), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_MANUAL), 1);
+	obs_property_set_modified_callback(p, view_modified);
+	p = obs_properties_add_float_slider(props, AMF_H264_VBVBUFFER_STRICTNESS, obs_module_text(AMF_H264_VBVBUFFER_STRICTNESS), 0.0, 100.0, 0.1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_VBVBUFFER_STRICTNESS_DESCRIPTION));
+	p = obs_properties_add_int_slider(props, AMF_H264_VBVBUFFER_SIZE, obs_module_text(AMF_H264_VBVBUFFER_SIZE), 1, 1000000, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_VBVBUFFER_SIZE_DESCRIPTION));
+	p = obs_properties_add_float_slider(props, AMF_H264_VBVBUFFER_FULLNESS, obs_module_text(AMF_H264_VBVBUFFER_FULLNESS), 0.0, 100.0, 100.0 / 64.0);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_VBVBUFFER_FULLNESS_DESCRIPTION));
+	#pragma endregion VBV Buffer
+	/// Max Access Unit Size
+	p = obs_properties_add_int_slider(props, AMF_H264_MAXIMUMACCESSUNITSIZE, obs_module_text(AMF_H264_MAXIMUMACCESSUNITSIZE), 0, 100000000, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_MAXIMUMACCESSUNITSIZE_DESCRIPTION));
+	#pragma region Flags
+	/// Filler Data (Only supported by CBR so far)
+	p = obs_properties_add_list(props, AMF_H264_FILLERDATA, obs_module_text(AMF_H264_FILLERDATA), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_FILLERDATA_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	/// Frame Skipping
+	p = obs_properties_add_list(props, AMF_H264_FRAMESKIPPING, obs_module_text(AMF_H264_FRAMESKIPPING), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_FRAMESKIPPING_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
 	/// Enforce Hypothetical Reference Decoder Compatibility
-	list = obs_properties_add_list(props, AMF_H264_ENFORCEHRDCOMPATIBILITY, obs_module_text(AMF_H264_ENFORCEHRDCOMPATIBILITY), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-	/// Filler Data
-	list = obs_properties_add_list(props, AMF_H264_FILLERDATA, obs_module_text(AMF_H264_FILLERDATA), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-	/// Max AU Size
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_MAX_AU_SIZE, obs_module_text(AMF_H264ADVANCED_MAX_AU_SIZE), -1, 100000000, 1);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Encoder Picture Control
-	//////////////////////////////////////////////////////////////////////////
-	/// Header Insertion Spacing
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_HEADER_INSERTION_SPACING, obs_module_text(AMF_H264ADVANCED_HEADER_INSERTION_SPACING), -1, 1000, 1);
-	/// IDR Period
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_IDR_PERIOD, obs_module_text(AMF_H264ADVANCED_IDR_PERIOD), -1, 1000, 1);
-	/// De-Blocking Filter
-	list = obs_properties_add_list(props, AMF_H264_DEBLOCKINGFILTER, obs_module_text(AMF_H264_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-	/// Intra Refresh MBs Number Per Slot in Macro-Blocks
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT, obs_module_text(AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT), -1, 1024, 1);
-	/// Number of slices Per Frame 
-	obs_properties_add_int_slider(props, AMF_H264ADVANCED_SLICESPERFRAME, obs_module_text(AMF_H264ADVANCED_SLICESPERFRAME), -1, 1000, 1);
+	p = obs_properties_add_list(props, AMF_H264_ENFORCEHRDCOMPATIBILITY, obs_module_text(AMF_H264_ENFORCEHRDCOMPATIBILITY), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_ENFORCEHRDCOMPATIBILITY_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	#pragma endregion Flags
+	#pragma endregion Rate Control Properties
+
+	#pragma region Picture Control Properties
+	//p = obs_properties_add_bool(props, "pcp_delimiter", "------ Picture Control Properties ------");
+	#pragma region IDR Period / Keyframe Interval / Header Insertion Spacing
+	p = obs_properties_add_float(props, AMF_H264_KEYFRAME_INTERVAL, obs_module_text(AMF_H264_KEYFRAME_INTERVAL), 0, 100, 0.001);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_KEYFRAME_INTERVAL_DESCRIPTION));
+	p = obs_properties_add_int(props, AMF_H264_IDR_PERIOD, obs_module_text(AMF_H264_IDR_PERIOD), 1, 1000, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_IDR_PERIOD_DESCRIPTION));
+	p = obs_properties_add_int(props, AMF_H264_HEADER_INSERTION_SPACING, obs_module_text(AMF_H264_HEADER_INSERTION_SPACING), 0, 1000, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_HEADER_INSERTION_SPACING_DESCRIPTION));
+	#pragma endregion IDR Period / Keyframe Interval / Header Insertion Spacing
+	#pragma region B-Pictures
 	/// B-Pictures Pattern
-	obs_properties_add_int_slider(props, AMF_H264_BPICTURE_PATTERN, obs_module_text(AMF_H264_BPICTURE_PATTERN), -1, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0), 1);
+	p = obs_properties_add_int_slider(props, AMF_H264_BPICTURE_PATTERN, obs_module_text(AMF_H264_BPICTURE_PATTERN), 0, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0), 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_BPICTURE_PATTERN_DESCRIPTION));
+	obs_property_set_modified_callback(p, bpictures_modified);
 	/// Enable Reference to B-Frames (2nd Generation GCN and newer)
-	list = obs_properties_add_list(props, AMF_H264_BPICTURE_REFERENCE, obs_module_text(AMF_H264_BPICTURE_REFERENCE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Encoder Miscellaneous Parameters
-	//////////////////////////////////////////////////////////////////////////
-	/// Scan Type
-	list = obs_properties_add_list(props, AMF_H264_SCANTYPE, obs_module_text(AMF_H264_SCANTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_SCANTYPE_PROGRESSIVE), VCEScanType_Progressive);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_SCANTYPE_INTERLACED), VCEScanType_Interlaced);
+	p = obs_properties_add_list(props, AMF_H264_BPICTURE_REFERENCE, obs_module_text(AMF_H264_BPICTURE_REFERENCE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_BPICTURE_REFERENCE_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	#pragma endregion B-Pictures
+	/// De-Blocking Filter
+	p = obs_properties_add_list(props, AMF_H264_DEBLOCKINGFILTER, obs_module_text(AMF_H264_DEBLOCKINGFILTER), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_DEBLOCKINGFILTER_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	/// Number of Slices Per Frame 
+	p = obs_properties_add_int_slider(props, AMF_H264_SLICESPERFRAME, obs_module_text(AMF_H264_SLICESPERFRAME), 0, 65535, 1);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_SLICESPERFRAME_DESCRIPTION));
+	/// Intra Refresh Number of Macro Blocks per Slot
+	obs_properties_add_int_slider(props, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, obs_module_text(AMF_H264_INTRAREFRESHNUMMBSPERSLOT), 0, 65535, 1);
+	#pragma endregion Picture Control Properties
+
+	#pragma region Miscellaneous Control Properties
+	//p = obs_properties_add_bool(props, "msc_delimiter", "------ Miscellaneous Properties ------");
 	/// Quality Preset
-	list = obs_properties_add_list(props, AMF_H264_QUALITY_PRESET, obs_module_text(AMF_H264_QUALITY_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_QUALITY_PRESET_SPEED), VCEQualityPreset_Speed);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_QUALITY_PRESET_BALANCED), VCEQualityPreset_Balanced);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264_QUALITY_PRESET_QUALITY), VCEQualityPreset_Quality);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Encoder Motion Estimation Parameters
-	//////////////////////////////////////////////////////////////////////////
+	p = obs_properties_add_list(props, AMF_H264_QUALITY_PRESET, obs_module_text(AMF_H264_QUALITY_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_QUALITY_PRESET_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_QUALITY_PRESET_SPEED), VCEQualityPreset_Speed);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_QUALITY_PRESET_BALANCED), VCEQualityPreset_Balanced);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_QUALITY_PRESET_QUALITY), VCEQualityPreset_Quality);
+	/// Scan Type
+	p = obs_properties_add_list(props, AMF_H264_SCANTYPE, obs_module_text(AMF_H264_SCANTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_SCANTYPE_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_SCANTYPE_PROGRESSIVE), VCEScanType_Progressive);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_SCANTYPE_INTERLACED), VCEScanType_Interlaced);
 	/// Motion Estimation
-	list = obs_properties_add_list(props, AMF_H264ADVANCED_MOTIONESTIMATION, obs_module_text(AMF_H264ADVANCED_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264ADVANCED_MOTIONESTIMATION_NONE), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264ADVANCED_MOTIONESTIMATION_HALF), 1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264ADVANCED_MOTIONESTIMATION_QUARTER), 2);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264ADVANCED_MOTIONESTIMATION_BOTH), 3);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Other Parameters
-	//////////////////////////////////////////////////////////////////////////
-	/// GOP Size
-	obs_properties_add_int_slider(props, AMF_H264_GOP_SIZE, obs_module_text(AMF_H264_GOP_SIZE), -1, 1000, 1);
+	p = obs_properties_add_list(props, AMF_H264_MOTIONESTIMATION, obs_module_text(AMF_H264_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_MOTIONESTIMATION_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_MOTIONESTIMATION_NONE), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_MOTIONESTIMATION_HALF), 1);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_MOTIONESTIMATION_QUARTER), 2);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_MOTIONESTIMATION_BOTH), 3);
 	/// CABAC
-	list = obs_properties_add_list(props, AMF_H264_CABAC, obs_module_text(AMF_H264_CABAC), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_DEFAULT), -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
-	obs_property_list_add_int(list, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	p = obs_properties_add_list(props, AMF_H264_CABAC, obs_module_text(AMF_H264_CABAC), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_CABAC_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	#pragma endregion Miscellaneous Control Properties
+
+	#pragma region System Properties
+	//p = obs_properties_add_bool(props, "sys_delimiter", "------ System Properties ------");
+	/// Memory Type
+	p = obs_properties_add_list(props, AMF_H264_MEMORYTYPE, obs_module_text(AMF_H264_MEMORYTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_MEMORYTYPE_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_AUTOMATIC), VCEMemoryType_Auto);
+	obs_property_list_add_int(p, "Host", VCEMemoryType_Host);
+	#ifdef _WIN32
+	if (IsWindowsXPOrGreater()) {
+		obs_property_list_add_int(p, "DirectX 9", VCEMemoryType_DirectX9);
+		if (IsWindows8OrGreater()) {
+			obs_property_list_add_int(p, "DirectX 11", VCEMemoryType_DirectX11);
+		}
+	}
+	#endif
+	obs_property_list_add_int(p, "OpenGL", VCEMemoryType_OpenGL);
+	obs_property_set_modified_callback(p, view_modified);
+	/// Device
+	p = obs_properties_add_list(props, AMF_H264_DEVICE, obs_module_text(AMF_H264_DEVICE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_DEVICE_DESCRIPTION));
+	/// Compute Type
+	p = obs_properties_add_list(props, AMF_H264_USE_OPENCL, obs_module_text(AMF_H264_USE_OPENCL), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_USE_OPENCL_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_DISABLED), 0);
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_TOGGLE_ENABLED), 1);
+	/// Surface Format
+	p = obs_properties_add_list(props, AMF_H264_SURFACEFORMAT, obs_module_text(AMF_H264_SURFACEFORMAT), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_SURFACEFORMAT_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_UTIL_AUTOMATIC), -1);
+	auto formats = Plugin::AMD::VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->input.formats;
+	for (auto format = formats.begin(); format != formats.end(); format++) {
+		switch (format->first) {
+			case amf::AMF_SURFACE_NV12:
+				obs_property_list_add_int(p, "NV12 (4:2:0)", VCESurfaceFormat_NV12);
+				break;
+			case amf::AMF_SURFACE_YUV420P:
+				obs_property_list_add_int(p, "I420 (4:2:0)", VCESurfaceFormat_I420);
+				break;
+			case amf::AMF_SURFACE_YUY2:
+				obs_property_list_add_int(p, "YUY2 (4:2:2)", VCESurfaceFormat_YUY2);
+				break;
+			case amf::AMF_SURFACE_BGRA:
+				obs_property_list_add_int(p, "BGRA (Uncompressed)", VCESurfaceFormat_BGRA);
+				break;
+			case amf::AMF_SURFACE_RGBA:
+				obs_property_list_add_int(p, "RGBA (Uncompressed)", VCESurfaceFormat_RGBA);
+				break;
+			case amf::AMF_SURFACE_GRAY8:
+				obs_property_list_add_int(p, "Y800 (Gray)", VCESurfaceFormat_GRAY);
+				break;
+		}
+	}
 
-	//////////////////////////////////////////////////////////////////////////
-	// Debug
-	//////////////////////////////////////////////////////////////////////////
-	/// Debug Mode
-	obs_properties_add_bool(props, AMF_H264_DEBUGTRACING, obs_module_text(AMF_H264_DEBUGTRACING));
+	/// View Mode
+	p = obs_properties_add_list(props, AMF_H264_VIEW, obs_module_text(AMF_H264_VIEW), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_VIEW_DESCRIPTION));
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_VIEW_BASIC), ViewMode::Basic);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_VIEW_ADVANCED), ViewMode::Advanced);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_VIEW_EXPERT), ViewMode::Expert);
+	obs_property_list_add_int(p, obs_module_text(AMF_H264_VIEW_MASTER), ViewMode::Master);
+	obs_property_set_modified_callback(p, view_modified);
+	/// Unlock Properties to full range.
+	p = obs_properties_add_bool(props, AMF_H264_UNLOCK_PROPERTIES, obs_module_text(AMF_H264_UNLOCK_PROPERTIES));
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_UNLOCK_PROPERTIES_DESCRIPTION));
+	obs_property_set_modified_callback(p, unlock_properties_modified);
+
+	/// Debug
+	p = obs_properties_add_bool(props, AMF_H264_DEBUG, obs_module_text(AMF_H264_DEBUG));
+	obs_property_set_long_description(p, obs_module_text(AMF_H264_DEBUG_DESCRIPTION));
+	#pragma endregion System Properties
 
 	return props;
 }
 
-bool Plugin::Interface::H264Interface::reset_callback(obs_properties_t *props, obs_property_t *, obs_data_t *settings) {
-	if (obs_data_get_bool(settings, AMF_H264ADVANCED_RESET) == false)
-		return false;
-	obs_data_set_bool(settings, AMF_H264ADVANCED_RESET, false);
-
-	for (obs_property_t* el = obs_properties_first(props); obs_property_next(&el);) {
-		const char* name = obs_property_name(el);
-
-		if (!obs_data_has_default_value(settings, name))
-			continue;
-
-		obs_property_type type = obs_property_get_type(el);
-		switch (type) {
-			case OBS_PROPERTY_BOOL:
-				obs_data_set_bool(settings, name, obs_data_get_default_bool(settings, name));
-				break;
-			case OBS_PROPERTY_INT:
-				obs_data_set_int(settings, name, obs_data_get_default_int(settings, name));
-				break;
-			case OBS_PROPERTY_FLOAT:
-				obs_data_set_double(settings, name, obs_data_get_default_double(settings, name));
-				break;
-			case OBS_PROPERTY_TEXT:
-			case OBS_PROPERTY_PATH:
-			case OBS_PROPERTY_FONT:
-				obs_data_set_string(settings, name, obs_data_get_default_string(settings, name));
-				break;
-			case OBS_PROPERTY_LIST:
-			case OBS_PROPERTY_EDITABLE_LIST:
-			{
-				obs_combo_format format = obs_property_list_format(el);
-				switch (format) {
-					case OBS_COMBO_FORMAT_INT:
-						obs_data_set_int(settings, name, obs_data_get_default_int(settings, name));
+bool Plugin::Interface::H264Interface::preset_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
+	auto caps = VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC);
+	Presets preset = (Presets)obs_data_get_int(data, AMF_H264_PRESET);
+	switch (preset) {
+		case Default:
+			#pragma region Default
+		{
+			obs_property_t* pn = obs_properties_first(props);
+			while (pn) {
+				const char* name = obs_property_name(pn);
+				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_COMBO_FORMAT_FLOAT:
-						obs_data_set_double(settings, name, obs_data_get_default_double(settings, name));
+					case obs_property_type::OBS_PROPERTY_INT:
+						obs_data_set_int(data, name, obs_data_get_default_int(data, name));
 						break;
-					case OBS_COMBO_FORMAT_STRING:
-						obs_data_set_string(settings, name, obs_data_get_default_string(settings, name));
+					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;
 				}
-				break;
+				obs_property_next(&pn);
 			}
-			case OBS_PROPERTY_COLOR:
-				break;
-			case OBS_PROPERTY_BUTTON:
-				break;
-			case OBS_PROPERTY_FRAME_RATE:
-				break;
-			default:
-				break;
 		}
+		break;
+		#pragma endregion Default
+		case Recording:
+			#pragma region Recording
+			// Static Properties
+			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
+			switch (caps->maxProfileLevel) {
+				case 52:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_52);
+					break;
+				case 51:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_51);
+					break;
+				case 50:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_50);
+					break;
+				default:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+					break;
+			}
+			//obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, obs_data_get_default_int(data, AMF_H264_MAXIMUMLTRFRAMES));
+
+			// Rate Control Properties
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_VariableBitrate_LatencyConstrained);
+			obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 35000 * (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1000 : 1));
+			obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1 : 1000));
+			obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+			/*obs_data_set_int(data, AMF_H264_QP_IFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_PFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_BFRAME, 0);*/
+			obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+			obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
+			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+			obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+			// Picture Control Properties
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
+			//obs_data_set_int(data, AMF_H264_IDR_PERIOD, 60);
+			obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, obs_data_get_default_int(data, AMF_H264_BPICTURE_PATTERN));
+			//obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, obs_data_get_default_int(data, AMF_H264_BPICTURE_REFERENCE));
+			//obs_data_set_int(data, AMF_H264_SLICESPERFRAME, 0);
+			//obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+			// Miscellaneous Properties
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+			obs_data_set_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
+			obs_data_set_int(data, AMF_H264_CABAC, 0);
+
+			// System Properties
+			obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+
+			break;
+			#pragma endregion Recording
+		case HighQuality:
+			#pragma region High Quality
+			// Static Properties
+			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
+			switch (caps->maxProfileLevel) {
+				case 52:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_52);
+					break;
+				case 51:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_51);
+					break;
+				case 50:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_50);
+					break;
+				default:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+					break;
+			}
+			//obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, obs_data_get_default_int(data, AMF_H264_MAXIMUMLTRFRAMES));
+
+			// Rate Control Properties
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
+			//obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 35000 * (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1000 : 1));
+			//obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1 : 1000));
+			/*obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);*/
+			obs_data_set_int(data, AMF_H264_QP_IFRAME, 21);
+			obs_data_set_int(data, AMF_H264_QP_PFRAME, 18);
+			obs_data_set_int(data, AMF_H264_QP_BFRAME, 16);
+			obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+			//obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
+			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+			obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+			// Picture Control Properties
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
+			//obs_data_set_int(data, AMF_H264_IDR_PERIOD, 60);
+			obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, obs_data_get_default_int(data, AMF_H264_BPICTURE_PATTERN));
+			//obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, obs_data_get_default_int(data, AMF_H264_BPICTURE_REFERENCE));
+			//obs_data_set_int(data, AMF_H264_SLICESPERFRAME, 0);
+			//obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+			// Miscellaneous Properties
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+			obs_data_set_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
+			obs_data_set_int(data, AMF_H264_CABAC, 0);
+
+			// System Properties
+			obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+
+			break;
+			#pragma endregion High Quality
+		case Indistinguishable:
+			#pragma region Indistinguishable
+			// Static Properties
+			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
+			switch (caps->maxProfileLevel) {
+				case 52:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_52);
+					break;
+				case 51:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_51);
+					break;
+				case 50:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_50);
+					break;
+				default:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+					break;
+			}
+			//obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, obs_data_get_default_int(data, AMF_H264_MAXIMUMLTRFRAMES));
+
+			// Rate Control Properties
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
+			//obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 35000 * (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1000 : 1));
+			//obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1 : 1000));
+			/*obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);*/
+			obs_data_set_int(data, AMF_H264_QP_IFRAME, 16);
+			obs_data_set_int(data, AMF_H264_QP_PFRAME, 13);
+			obs_data_set_int(data, AMF_H264_QP_BFRAME, 11);
+			obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, -4);
+			obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, -2);
+			obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+			//obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
+			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+			obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+			// Picture Control Properties
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
+			//obs_data_set_int(data, AMF_H264_IDR_PERIOD, 60);
+			obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, obs_data_get_default_int(data, AMF_H264_BPICTURE_PATTERN));
+			//obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, obs_data_get_default_int(data, AMF_H264_BPICTURE_REFERENCE));
+			//obs_data_set_int(data, AMF_H264_SLICESPERFRAME, 0);
+			//obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+			// Miscellaneous Properties
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+			obs_data_set_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
+			obs_data_set_int(data, AMF_H264_CABAC, 0);
+
+			// System Properties
+			obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+
+			break;
+			#pragma endregion Indistinguishable
+		case Lossless:
+			#pragma region Lossless
+			// Static Properties
+			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
+			switch (caps->maxProfileLevel) {
+				case 52:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_52);
+					break;
+				case 51:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_51);
+					break;
+				case 50:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_50);
+					break;
+				default:
+					obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+					break;
+			}
+			obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, 0);
+
+			// Rate Control Properties
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
+			//obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 35000 * (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1000 : 1));
+			//obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1 : 1000));
+			/*obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);*/
+			obs_data_set_int(data, AMF_H264_QP_IFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_PFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_BFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, -10);
+			obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, -10);
+			obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+			//obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
+			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+			obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+			// Picture Control Properties
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 0);
+			obs_data_set_int(data, AMF_H264_IDR_PERIOD, 1);
+			obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+			obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
+			obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
+			//obs_data_set_int(data, AMF_H264_SLICESPERFRAME, 0);
+			//obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+			// Miscellaneous Properties
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+			obs_data_set_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
+			obs_data_set_int(data, AMF_H264_CABAC, 0);
+
+			// System Properties
+			obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+
+			break;
+			#pragma endregion Lossless
+		case Twitch:
+			#pragma region Twitch
+			// Static Properties
+			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_Main);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, obs_data_get);
+
+			// Rate Control Properties
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
+			obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 3500);
+			//obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / (obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1 : 1000));
+			obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+			/*obs_data_set_int(data, AMF_H264_QP_IFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_PFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_BFRAME, 0);*/
+			obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 90);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 100);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+			obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
+			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+			obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+			// Picture Control Properties
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 2);
+			//obs_data_set_int(data, AMF_H264_IDR_PERIOD, 120);
+			obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
+			//obs_data_set_int(data, AMF_H264_SLICESPERFRAME, 0);
+			//obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+			// Miscellaneous Properties
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+			obs_data_set_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
+			obs_data_set_int(data, AMF_H264_CABAC, 0);
+
+			// System Properties
+			obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+
+			break;
+			#pragma endregion Twitch
+		case YouTube:
+			#pragma region YouTube
+			// Static Properties
+			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_Main);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, obs_data_get);
+
+			// Rate Control Properties
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
+			obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 6000);
+			obs_data_set_int(data, AMF_H264_BITRATE_PEAK, 9000);
+			obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+			/*obs_data_set_int(data, AMF_H264_QP_IFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_PFRAME, 0);
+			obs_data_set_int(data, AMF_H264_QP_BFRAME, 0);*/
+			obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
+			obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 75);
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 100);
+			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
+			obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
+			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+			obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
+
+			// Picture Control Properties
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 2);
+			//obs_data_set_int(data, AMF_H264_IDR_PERIOD, 120);
+			obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
+			//obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
+			//obs_data_set_int(data, AMF_H264_SLICESPERFRAME, 0);
+			//obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, 0);
+
+			// Miscellaneous Properties
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
+			obs_data_set_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
+			obs_data_set_int(data, AMF_H264_CABAC, 0);
+
+			// System Properties
+			obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, 0);
+
+			break;
+			#pragma endregion YouTube
 	}
-	return true;
+	return view_modified(props, nullptr, data);
 }
 
-bool Plugin::Interface::H264Interface::update_from_amf(obs_properties_t *, obs_property_t *, obs_data_t *settings) {
-	if (obs_data_get_bool(settings, AMF_H264ADVANCED_UPDATE) == false)
-		return false;
-	obs_data_set_bool(settings, AMF_H264ADVANCED_UPDATE, false);
+bool Plugin::Interface::H264Interface::maximum_ltr_frames_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
+	return view_modified(props, nullptr, data);
+}
 
-	try {
-		VCEEncoder* vce = new VCEEncoder(VCEEncoderType_AVC);
+bool Plugin::Interface::H264Interface::rate_control_method_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
+	return view_modified(props, nullptr, data);
+}
 
-		// Usage & Quality Preset
-		int64_t usage = obs_data_get_int(settings, AMF_H264_USAGE);
-		vce->SetUsage((VCEUsage)usage);
-		try {
-			int64_t preset = obs_data_get_int(settings, AMF_H264_QUALITY_PRESET);
-			if (preset == -1)
-				obs_data_set_int(settings, AMF_H264_QUALITY_PRESET, vce->GetQualityPreset());
-			else
-				vce->SetQualityPreset((VCEQualityPreset)preset);
-		} catch (...) {}
+bool Plugin::Interface::H264Interface::bpictures_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
+	view_modified(props, nullptr, data);
+	return false;
+}
 
-		// Profile & Level
-		try {
-			if (obs_data_get_int(settings, AMF_H264_PROFILE) == -1)
-				obs_data_set_int(settings, AMF_H264_PROFILE, vce->GetProfile());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_PROFILELEVEL) == -1)
-				obs_data_set_int(settings, AMF_H264_PROFILELEVEL, vce->GetProfileLevel());
-		} catch (...) {}
+bool Plugin::Interface::H264Interface::view_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
+	uint32_t view = (uint32_t)obs_data_get_int(data, AMF_H264_VIEW);
+	bool vis_basic = view >= ViewMode::Basic,
+		vis_advanced = view >= ViewMode::Advanced,
+		vis_expert = view >= ViewMode::Expert,
+		vis_master = view >= ViewMode::Master,
+		vis_rcm_bitrate_target = false,
+		vis_rcm_bitrate_peak = false,
+		vis_rcm_qp = false,
+		vis_rcm_qp_b = false,
+		vis_rcm_fillerdata = false;
 
-		// Other
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_MAX_LTR_FRAMES) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_MAX_LTR_FRAMES, vce->GetMaximumLongTermReferenceFrames());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_SCANTYPE) == -1)
-				obs_data_set_int(settings, AMF_H264_SCANTYPE, vce->GetScanType());
-		} catch (...) {}
+	// Static Properties
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_USAGE), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_USAGE, obs_data_get_default_int(data, AMF_H264_USAGE));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_PROFILE), vis_advanced);
+	if (!vis_basic)
+		obs_data_set_int(data, AMF_H264_PROFILE, obs_data_get_default_int(data, AMF_H264_PROFILE));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_PROFILELEVEL), vis_expert);
+	if (!vis_expert)
+		obs_data_set_int(data, AMF_H264_PROFILELEVEL, obs_data_get_default_int(data, AMF_H264_PROFILELEVEL));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_MAXIMUMLTRFRAMES), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_MAXIMUMLTRFRAMES, obs_data_get_default_int(data, AMF_H264_MAXIMUMLTRFRAMES));
+	bool using_ltr_frames = obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES) > 0;
+
+	// Rate Control Properties
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), vis_basic);
+	if (!vis_basic)
+		obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, obs_data_get_default_int(data, AMF_H264_RATECONTROLMETHOD));
+	switch ((VCERateControlMethod)obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD)) {
+		case VCERateControlMethod_ConstantBitrate:
+			vis_rcm_bitrate_target = true;
+			vis_rcm_fillerdata = true;
+			break;
+		case VCERateControlMethod_VariableBitrate_PeakConstrained:
+			vis_rcm_bitrate_target = true;
+			vis_rcm_bitrate_peak = true;
+			break;
+		case VCERateControlMethod_VariableBitrate_LatencyConstrained:
+			vis_rcm_bitrate_target = true;
+			break;
+		case VCERateControlMethod_ConstantQP:
+			vis_rcm_qp = true;
+			vis_rcm_qp_b = VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames
+				&& (using_ltr_frames == false);
+			break;
+	}
 
-		//////////////////////////////////////////////////////////////////////////
-		// Dynamic Properties (Can be changed during Encoding)
-		//////////////////////////////////////////////////////////////////////////
-		// Rate Control
-		/// Method
-		try {
-			if (obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD) == -1)
-				obs_data_set_int(settings, AMF_H264_RATECONTROLMETHOD, vce->GetRateControlMethod());
-		} catch (...) {}
-			/// Skip Frames if necessary
-		try {
-			if (obs_data_get_int(settings, AMF_H264_FRAMESKIPPING) == -1)
-				obs_data_set_int(settings, AMF_H264_FRAMESKIPPING, vce->IsRateControlSkipFrameEnabled() ? 1 : 0);
-		} catch (...) {}
-		// Rate Control - Other
-		/// Filler Data
-		try {
-			if (obs_data_get_int(settings, AMF_H264_FILLERDATA) == -1)
-				obs_data_set_int(settings, AMF_H264_FILLERDATA, vce->IsFillerDataEnabled() ? 1 : 0);
-		} catch (...) {}
-		/// Enforce Hyptohecial Reference Decoder Compatability
-		try {
-			if (obs_data_get_int(settings, AMF_H264_ENFORCEHRDCOMPATIBILITY) == -1)
-				obs_data_set_int(settings, AMF_H264_ENFORCEHRDCOMPATIBILITY, vce->IsEnforceHRDRestrictionsEnabled() ? 1 : 0);
-		} catch (...) {}
-		// Video Coding Settings
-		/// VBV Buffer
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_VBVBUFFER_SIZE) == -1) {
-				obs_data_set_int(settings, AMF_H264ADVANCED_VBVBUFFER_SIZE, vce->GetVBVBufferSize());
-				obs_data_set_double(settings, AMF_H264ADVANCED_VBVBUFFER_FULLNESS, vce->GetInitialVBVBufferFullness());
-			}
-		} catch (...) {}
-		/// Max AU Size
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_MAX_AU_SIZE) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_MAX_AU_SIZE, vce->GetMaximumAccessUnitSize());
-		} catch (...) {}
-		/// B-Picture Related
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_BPICTURE_DELTA) == -11)
-				obs_data_set_int(settings, AMF_H264_QP_BPICTURE_DELTA, vce->GetBPictureDeltaQP());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_REFERENCE_BPICTURE_DELTA) == -11)
-				obs_data_set_int(settings, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, vce->GetReferenceBPictureDeltaQP());
-		} catch (...) {}
-		// Rate Control: Constrained QP
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_MINIMUM) == -1)
-				obs_data_set_int(settings, AMF_H264_QP_MINIMUM, vce->GetMinimumQP());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_MAXIMUM) == -1)
-				obs_data_set_int(settings, AMF_H264_QP_MAXIMUM, vce->GetMaximumQP());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_IFRAME) == -1)
-				obs_data_set_int(settings, AMF_H264_QP_IFRAME, vce->GetIFrameQP());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_PFRAME) == -1)
-				obs_data_set_int(settings, AMF_H264_QP_PFRAME, vce->GetPFrameQP());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_QP_BFRAME) == -1)
-				obs_data_set_int(settings, AMF_H264_QP_BFRAME, vce->GetBFrameQP());
-		} catch (...) {}
-		// Rate Control: CBR, VBR
-		try {
-			if (obs_data_get_int(settings, AMF_H264_BITRATE_TARGET) == -1)
-				obs_data_set_int(settings, AMF_H264_BITRATE_TARGET, vce->GetTargetBitrate());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_BITRATE_PEAK) == -1)
-				obs_data_set_int(settings, AMF_H264_BITRATE_PEAK, vce->GetPeakBitrate());
-		} catch (...) {}
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_BITRATE_TARGET), (vis_basic && vis_rcm_bitrate_target));
+	if (!((vis_basic && vis_rcm_bitrate_target)))
+		obs_data_set_int(data, AMF_H264_BITRATE_TARGET, obs_data_get_default_int(data, AMF_H264_BITRATE_TARGET));
 
-		// Picture Control Properties
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_HEADER_INSERTION_SPACING) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_HEADER_INSERTION_SPACING, vce->GetHeaderInsertionSpacing());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_BPICTURE_PATTERN) == -1)
-				obs_data_set_int(settings, AMF_H264_BPICTURE_PATTERN, vce->GetBPicturePattern());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_DEBLOCKINGFILTER) == -1)
-				obs_data_set_int(settings, AMF_H264_DEBLOCKINGFILTER, vce->IsDeBlockingFilterEnabled() ? 1 : 0);
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264_BPICTURE_REFERENCE) == -1)
-				obs_data_set_int(settings, AMF_H264_BPICTURE_REFERENCE, vce->IsBPictureReferenceEnabled() ? 1 : 0);
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_IDR_PERIOD) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_IDR_PERIOD, vce->GetIDRPeriod());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT, vce->GetIntraRefreshMBsNumberPerSlot());
-		} catch (...) {}
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_SLICESPERFRAME) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_SLICESPERFRAME, vce->GetSlicesPerFrame());
-		} catch (...) {}
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_BITRATE_PEAK), (vis_basic && vis_rcm_bitrate_peak));
+	if (!((vis_basic && vis_rcm_bitrate_peak)))
+		obs_data_set_int(data, AMF_H264_BITRATE_PEAK, obs_data_get_default_int(data, AMF_H264_BITRATE_PEAK));
 
-		// Motion Estimation
-		try {
-			if (obs_data_get_int(settings, AMF_H264ADVANCED_MOTIONESTIMATION) == -1)
-				obs_data_set_int(settings, AMF_H264ADVANCED_MOTIONESTIMATION, (vce->IsHalfPixelMotionEstimationEnabled() ? 1 : 0) + (vce->IsQuarterPixelMotionEstimationEnabled() ? 2 : 0));
-		} catch (...) {}
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_MINIMUM), vis_advanced && !vis_rcm_qp);
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_MAXIMUM), vis_advanced && !vis_rcm_qp);
+	if (!(vis_advanced && !vis_rcm_qp)) {
+		obs_data_set_int(data, AMF_H264_QP_MINIMUM, obs_data_get_default_int(data, AMF_H264_QP_MINIMUM));
+		obs_data_set_int(data, AMF_H264_QP_MAXIMUM, obs_data_get_default_int(data, AMF_H264_QP_MAXIMUM));
+	}
 
-		// Remove Instance again.
-		delete vce;
-	} catch (...) {
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_IFRAME), (vis_basic && vis_rcm_qp));
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_PFRAME), (vis_basic && vis_rcm_qp));
+	if (!(vis_basic && vis_rcm_qp)) {
+		obs_data_set_int(data, AMF_H264_QP_IFRAME, obs_data_get_default_int(data, AMF_H264_QP_IFRAME));
+		obs_data_set_int(data, AMF_H264_QP_PFRAME, obs_data_get_default_int(data, AMF_H264_QP_PFRAME));
 	}
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_BFRAME), (vis_basic && vis_rcm_qp_b));
+	if (!(vis_basic && vis_rcm_qp_b))
+		obs_data_set_int(data, AMF_H264_QP_BFRAME, obs_data_get_default_int(data, AMF_H264_QP_BFRAME));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_BPICTURE_DELTA), (vis_advanced && vis_rcm_qp_b));
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QP_REFERENCE_BPICTURE_DELTA), (vis_advanced && vis_rcm_qp_b));
+	if (!(vis_advanced && vis_rcm_qp_b)) {
+		obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, obs_data_get_default_int(data, AMF_H264_QP_BPICTURE_DELTA));
+		obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, obs_data_get_default_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA));
+	}
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_VBVBUFFER), vis_advanced);
+	if (!vis_advanced)
+		obs_data_set_int(data, AMF_H264_VBVBUFFER, obs_data_get_default_int(data, AMF_H264_VBVBUFFER));
+	uint32_t vbvBuffer = (uint32_t)obs_data_get_int(data, AMF_H264_VBVBUFFER);
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), (vis_advanced && (vbvBuffer == 0)));
+	if (!(vis_advanced && (vbvBuffer == 0)))
+		obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, obs_data_get_default_double(data, AMF_H264_VBVBUFFER_STRICTNESS));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_VBVBUFFER_SIZE), vis_advanced && (vbvBuffer == 1));
+	if (!(vis_advanced && (vbvBuffer == 1)))
+		obs_data_set_int(data, AMF_H264_VBVBUFFER_SIZE, obs_data_get_default_int(data, AMF_H264_VBVBUFFER_SIZE));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), vis_expert);
+	if (!vis_expert)
+		obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, obs_data_get_default_double(data, AMF_H264_VBVBUFFER_FULLNESS));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_FILLERDATA), vis_rcm_fillerdata);
+	if (!vis_rcm_fillerdata)
+		obs_data_set_int(data, AMF_H264_FILLERDATA, obs_data_get_default_int(data, AMF_H264_FILLERDATA));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_FRAMESKIPPING), vis_advanced);
+	if (!vis_advanced)
+		obs_data_set_int(data, AMF_H264_FRAMESKIPPING, obs_data_get_default_int(data, AMF_H264_FRAMESKIPPING));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_ENFORCEHRDCOMPATIBILITY), vis_expert);
+	if (!vis_expert)
+		obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, obs_data_get_default_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_MAXIMUMACCESSUNITSIZE), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, obs_data_get_default_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE));
+
+	// Picture Control Properties
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), !vis_master);
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_IDR_PERIOD), vis_master);
+	if (vis_master)
+		obs_data_set_int(data, AMF_H264_KEYFRAME_INTERVAL, obs_data_get_default_int(data, AMF_H264_KEYFRAME_INTERVAL));
+	else
+		obs_data_set_int(data, AMF_H264_IDR_PERIOD, obs_data_get_default_int(data, AMF_H264_IDR_PERIOD));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_HEADER_INSERTION_SPACING), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, obs_data_get_default_int(data, AMF_H264_HEADER_INSERTION_SPACING));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_DEBLOCKINGFILTER), vis_advanced);
+	if (!vis_advanced)
+		obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, obs_data_get_default_int(data, AMF_H264_DEBLOCKINGFILTER));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_INTRAREFRESHNUMMBSPERSLOT), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT, obs_data_get_default_int(data, AMF_H264_INTRAREFRESHNUMMBSPERSLOT));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_SLICESPERFRAME), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_SLICESPERFRAME, obs_data_get_default_int(data, AMF_H264_SLICESPERFRAME));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_BPICTURE_PATTERN), vis_advanced && !using_ltr_frames);
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_BPICTURE_REFERENCE), vis_advanced && !using_ltr_frames);
+	if (!vis_advanced) {
+		obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, obs_data_get_default_int(data, AMF_H264_BPICTURE_PATTERN));
+		obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, obs_data_get_default_int(data, AMF_H264_BPICTURE_REFERENCE));
+	}
+	if (using_ltr_frames) {
+		obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, VCEBPicturePattern_None);
+		obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
+	}
+
+	// Miscellaneous Properties
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_SCANTYPE), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_SCANTYPE, obs_data_get_default_int(data, AMF_H264_SCANTYPE));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_QUALITY_PRESET), vis_basic);
+	if (!vis_basic)
+		obs_data_set_int(data, AMF_H264_QUALITY_PRESET, obs_data_get_default_int(data, AMF_H264_QUALITY_PRESET));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), vis_expert);
+	if (!vis_expert)
+		obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, obs_data_get_default_int(data, AMF_H264_MOTIONESTIMATION));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_CABAC), vis_expert);
+	if (!vis_expert)
+		obs_data_set_int(data, AMF_H264_CABAC, obs_data_get_default_int(data, AMF_H264_CABAC));
+
+	// System Properties
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_MEMORYTYPE), vis_expert);
+	if (!vis_expert)
+		obs_data_set_int(data, AMF_H264_MEMORYTYPE, obs_data_get_default_int(data, AMF_H264_MEMORYTYPE));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_DEVICE), vis_expert && (obs_data_get_int(data, AMF_H264_MEMORYTYPE) != 0));
+	if (vis_expert && (obs_data_get_int(data, AMF_H264_MEMORYTYPE) != 0)) {
+		fill_device_list(obs_properties_get(props, AMF_H264_DEVICE), data);
+	} else {
+		obs_data_set_string(data, AMF_H264_DEVICE, "");
+	}
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_USE_OPENCL), vis_expert);
+	if (!vis_expert)
+		obs_data_set_int(data, AMF_H264_USE_OPENCL, obs_data_get_default_int(data, AMF_H264_USE_OPENCL));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_SURFACEFORMAT), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_SURFACEFORMAT, obs_data_get_default_int(data, AMF_H264_SURFACEFORMAT));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_VIEW), vis_basic);
+	if (!vis_basic)
+		obs_data_set_int(data, AMF_H264_VIEW, obs_data_get_default_int(data, AMF_H264_VIEW));
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_UNLOCK_PROPERTIES), vis_master);
+	if (!vis_master)
+		obs_data_set_int(data, AMF_H264_UNLOCK_PROPERTIES, obs_data_get_default_int(data, AMF_H264_UNLOCK_PROPERTIES));
+	unlock_properties_modified(props, nullptr, data);
+
+	obs_property_set_visible(obs_properties_get(props, AMF_H264_DEBUG), vis_basic);
+	if (!vis_basic)
+		obs_data_set_int(data, AMF_H264_DEBUG, obs_data_get_default_int(data, AMF_H264_DEBUG));
+
+	return true;
+}
+
+bool Plugin::Interface::H264Interface::unlock_properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
+	bool unlocked = obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES);
+	bool last_unlocked = obs_data_get_bool(data, "last_" vstr(AMF_H264_UNLOCK_PROPERTIES));
+
+	if (last_unlocked != unlocked) {
+		uint32_t multiplier = (unlocked == true ? 1000 : 1),
+			divisor = (unlocked == false ? 1000 : 1);
+		obs_data_set_int(data, AMF_H264_BITRATE_TARGET, (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * multiplier) / divisor);
+		obs_data_set_int(data, AMF_H264_BITRATE_PEAK, (obs_data_get_int(data, AMF_H264_BITRATE_PEAK) * multiplier) / divisor);
+		obs_data_set_int(data, AMF_H264_VBVBUFFER_SIZE, (obs_data_get_int(data, AMF_H264_VBVBUFFER_SIZE) * multiplier) / divisor);
+
+		obs_data_set_bool(data, "last_" vstr(AMF_H264_UNLOCK_PROPERTIES), unlocked);
+	}
+
+	if (unlocked) {
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 1000, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_PEAK), 1000, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate, 1);
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_VBVBUFFER_SIZE), 1000, 100000000, 1);
+		obs_property_float_set_limits(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), 0, 100, 1);
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_IDR_PERIOD), 0, 1000, 1);
+	} else {
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 1, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000, 1);
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_PEAK), 1, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000, 1);
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_VBVBUFFER_SIZE), 1, 100000, 1);
+		obs_property_float_set_limits(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), 1, 100, 1);
+		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_IDR_PERIOD), 1, 1000, 1);
+	}
+
 	return true;
 }
 
@@ -683,10 +1229,8 @@
 //////////////////////////////////////////////////////////////////////////
 // Module Code
 //////////////////////////////////////////////////////////////////////////
-Plugin::Interface::H264Interface::H264Interface(obs_data_t* settings, obs_encoder_t* encoder) {
-	int64_t value;
-
-	AMF_LOG_INFO("<AMFEncoder::H264Interface::H264Interface> Initializing...");
+Plugin::Interface::H264Interface::H264Interface(obs_data_t* data, obs_encoder_t* encoder) {
+	AMF_LOG_DEBUG("<AMFEncoder::H264Interface::H264Interface> Initializing...");
 
 	// OBS Settings
 	uint32_t m_cfgWidth = obs_encoder_get_width(encoder);
@@ -696,14 +1240,11 @@
 	uint32_t m_cfgFPSnum = voi->fps_num;
 	uint32_t m_cfgFPSden = voi->fps_den;
 
-	// AMF Setup
-	Plugin::AMD::AMF::GetInstance()->EnableDebugTrace(obs_data_get_bool(settings, AMF_H264_DEBUGTRACING));
-
 	//////////////////////////////////////////////////////////////////////////
-	// Static Properties (Can't be changed during Encoding)
-	//////////////////////////////////////////////////////////////////////////
-	// Encoder
-	VCESurfaceFormat surfFormat = (VCESurfaceFormat)obs_data_get_int(settings, AMF_H264_SURFACEFORMAT);
+	/// Initialize Encoder
+	bool debug = obs_data_get_bool(data, AMF_H264_DEBUG);
+	Plugin::AMD::AMF::GetInstance()->EnableDebugTrace(debug);
+	VCESurfaceFormat surfFormat = (VCESurfaceFormat)obs_data_get_int(data, AMF_H264_SURFACEFORMAT);
 	if (surfFormat == -1) {
 		switch (voi->format) {
 			case VIDEO_FORMAT_NV12:
@@ -726,53 +1267,31 @@
 				break;
 		}
 	}
-	m_VideoEncoder = new VCEEncoder(VCEEncoderType_AVC, surfFormat, (VCEMemoryType)obs_data_get_int(settings, AMF_H264_MEMORYTYPE), (VCEComputeType)obs_data_get_int(settings, AMF_H264_COMPUTETYPE));
-
-	/// Usage & Quality Preset
-	m_VideoEncoder->SetUsage((VCEUsage)obs_data_get_int(settings, AMF_H264_USAGE));
-	value = obs_data_get_int(settings, AMF_H264_QUALITY_PRESET);
-	if (value != -1)
-		m_VideoEncoder->SetQualityPreset((VCEQualityPreset)value);
-
-	// Profile & Level
-	/// Profile
-	value = obs_data_get_int(settings, AMF_H264_PROFILE);
-	if (value != -1)
-		m_VideoEncoder->SetProfile((VCEProfile)value);
-	/// Profile Level
-	value = obs_data_get_int(settings, AMF_H264_PROFILELEVEL);
-	if (value != -1)
-		m_VideoEncoder->SetProfileLevel((VCEProfileLevel)value);
-
-	// Other
-	/// Maximum Long-Term-Reference Frames
-	value = obs_data_get_int(settings, AMF_H264ADVANCED_MAX_LTR_FRAMES);
-	if (value != -1)
-		m_VideoEncoder->SetMaximumLongTermReferenceFrames((uint32_t)value);
-	/// Scan Type
-	value = obs_data_get_int(settings, AMF_H264_SCANTYPE);
-	if (value != -1)
-		m_VideoEncoder->SetScanType((VCEScanType)value);
-
-	// Framesize & Framerate
+	m_VideoEncoder = new VCEEncoder(VCEEncoderType_AVC, surfFormat,
+		(VCEMemoryType)obs_data_get_int(data, AMF_H264_MEMORYTYPE),
+		!!obs_data_get_int(data, AMF_H264_USE_OPENCL),
+		std::string(obs_data_get_string(data, AMF_H264_DEVICE)));
+
+	/// Static Properties
+	m_VideoEncoder->SetUsage((VCEUsage)obs_data_get_int(data, AMF_H264_USAGE));
+	m_VideoEncoder->SetProfile((VCEProfile)obs_data_get_int(data, AMF_H264_PROFILE));
+	m_VideoEncoder->SetProfileLevel((VCEProfileLevel)obs_data_get_int(data, AMF_H264_PROFILELEVEL));
+	m_VideoEncoder->SetMaximumLongTermReferenceFrames((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES));
+
+	/// Framesize & Framerate
 	m_VideoEncoder->SetFrameSize(m_cfgWidth, m_cfgHeight);
 	m_VideoEncoder->SetFrameRate(m_cfgFPSnum, m_cfgFPSden);
 
-	//////////////////////////////////////////////////////////////////////////
-	// Dynamic Properties (Can be changed during Encoding)
-	//////////////////////////////////////////////////////////////////////////
-	update_properties(settings);
-
-	// Framesize & Framerate
-	m_VideoEncoder->SetFrameSize(m_cfgWidth, m_cfgHeight);
-	m_VideoEncoder->SetFrameRate(m_cfgFPSnum, m_cfgFPSden);
+	/// Miscellaneous Properties
+	m_VideoEncoder->SetScanType((VCEScanType)obs_data_get_int(data, AMF_H264_SCANTYPE));
+	m_VideoEncoder->SetQualityPreset((VCEQualityPreset)obs_data_get_int(data, AMF_H264_QUALITY_PRESET));
+	m_VideoEncoder->SetCABACEnabled(!!obs_data_get_int(data, AMF_H264_CABAC));
 
-	//////////////////////////////////////////////////////////////////////////
 	// OBS - Enforce Streaming Service Restrictions
-	//////////////////////////////////////////////////////////////////////////
+	#pragma region OBS - Enforce Streaming Service Restrictions
 	{
 		// Profile
-		const char* p_str = obs_data_get_string(settings, "profile");
+		const char* p_str = obs_data_get_string(data, "profile");
 		if (strcmp(p_str, "") != 0) {
 			if (strcmp(p_str, "baseline")) {
 				m_VideoEncoder->SetProfile(VCEProfile_Baseline);
@@ -784,19 +1303,139 @@
 		} else {
 			switch (m_VideoEncoder->GetProfile()) {
 				case VCEProfile_Baseline:
-					obs_data_set_string(settings, "profile", "baseline");
+					obs_data_set_string(data, "profile", "baseline");
 					break;
 				case VCEProfile_Main:
-					obs_data_set_string(settings, "profile", "main");
+					obs_data_set_string(data, "profile", "main");
 					break;
 				case VCEProfile_High:
-					obs_data_set_string(settings, "profile", "high");
+					obs_data_set_string(data, "profile", "high");
+					break;
+			}
+		}
+
+		// Preset
+		const char* preset = obs_data_get_string(data, "preset");
+		if (strcmp(preset, "") != 0) {
+			if (strcmp(preset, "speed") == 0) {
+				m_VideoEncoder->SetQualityPreset(VCEQualityPreset_Speed);
+			} else if (strcmp(preset, "balanced") == 0) {
+				m_VideoEncoder->SetQualityPreset(VCEQualityPreset_Balanced);
+			} else if (strcmp(preset, "quality") == 0) {
+				m_VideoEncoder->SetQualityPreset(VCEQualityPreset_Quality);
+			}
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, m_VideoEncoder->GetQualityPreset());
+		} else {
+			switch (m_VideoEncoder->GetQualityPreset()) {
+				case VCEQualityPreset_Speed:
+					obs_data_set_string(data, "preset", "speed");
+					break;
+				case VCEQualityPreset_Balanced:
+					obs_data_set_string(data, "preset", "balanced");
+					break;
+				case VCEQualityPreset_Quality:
+					obs_data_set_string(data, "preset", "quality");
 					break;
 			}
 		}
+	}
+	#pragma endregion OBS - Enforce Streaming Service Restrictions
+	
+	// Initialize (locks static properties)
+	try {
+		m_VideoEncoder->Start();
+	} catch (...) {
+		throw;
+	}
+
+	// Dynamic Properties (Can be changed during Encoding)
+	this->update(data);
+
+	AMF_LOG_DEBUG("<AMFEncoder::H264Interface::H264Interface> Complete.");
+}
+
+Plugin::Interface::H264Interface::~H264Interface() {
+	AMF_LOG_DEBUG("<AMFEncoder::H264Interface::~H264Interface> Finalizing...");
+	m_VideoEncoder->Stop();
+	delete m_VideoEncoder;
+	AMF_LOG_DEBUG("<AMFEncoder::H264Interface::~H264Interface> Complete.");
+}
+
+bool Plugin::Interface::H264Interface::update(obs_data_t* data) {
+	double_t framerate = (double_t)m_VideoEncoder->GetFrameRate().first / (double_t)m_VideoEncoder->GetFrameRate().second;
+	int32_t bitrateMultiplier = obs_data_get_bool(data, AMF_H264_UNLOCK_PROPERTIES) ? 1 : 1000;
+
+	// Rate Control Properties
+	switch ((VCERateControlMethod)obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD)) {
+		case VCERateControlMethod_ConstantBitrate:
+			m_VideoEncoder->SetTargetBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * bitrateMultiplier);
+			m_VideoEncoder->SetPeakBitrate(m_VideoEncoder->GetTargetBitrate());
+			m_VideoEncoder->SetFillerDataEnabled(obs_data_get_int(data, AMF_H264_FILLERDATA) == 1);
+			break;
+		case VCERateControlMethod_VariableBitrate_PeakConstrained:
+			m_VideoEncoder->SetTargetBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * bitrateMultiplier);
+			m_VideoEncoder->SetPeakBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_PEAK) * bitrateMultiplier);
+			m_VideoEncoder->SetFillerDataEnabled(false);
+			break;
+		case VCERateControlMethod_VariableBitrate_LatencyConstrained:
+			m_VideoEncoder->SetTargetBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * bitrateMultiplier);
+			m_VideoEncoder->SetPeakBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_PEAK) * bitrateMultiplier);
+			m_VideoEncoder->SetFillerDataEnabled(false);
+			break;
+		case VCERateControlMethod_ConstantQP:
+			m_VideoEncoder->SetIFrameQP((uint8_t)obs_data_get_int(data, AMF_H264_QP_IFRAME));
+			m_VideoEncoder->SetPFrameQP((uint8_t)obs_data_get_int(data, AMF_H264_QP_PFRAME));
+			try {
+				m_VideoEncoder->SetBFrameQP((uint8_t)obs_data_get_int(data, AMF_H264_QP_BFRAME));
+			} catch (...) {}
+			m_VideoEncoder->SetTargetBitrate(0);
+			m_VideoEncoder->SetPeakBitrate(0);
+			m_VideoEncoder->SetFillerDataEnabled(false);
+			break;
+	}
+	m_VideoEncoder->SetRateControlMethod((VCERateControlMethod)obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD));
+	m_VideoEncoder->SetMinimumQP((uint8_t)obs_data_get_int(data, AMF_H264_QP_MINIMUM));
+	m_VideoEncoder->SetMaximumQP((uint8_t)obs_data_get_int(data, AMF_H264_QP_MAXIMUM));
+	if (obs_data_get_int(data, AMF_H264_VBVBUFFER) == 0) {
+		m_VideoEncoder->SetVBVBufferAutomatic(obs_data_get_double(data, AMF_H264_VBVBUFFER_STRICTNESS) / 100.0);
+	} else {
+		m_VideoEncoder->SetVBVBufferSize((uint32_t)obs_data_get_int(data, AMF_H264_VBVBUFFER_SIZE) * bitrateMultiplier);
+	}
+	m_VideoEncoder->SetInitialVBVBufferFullness(obs_data_get_double(data, AMF_H264_VBVBUFFER_FULLNESS) / 100.0);
+	m_VideoEncoder->SetFrameSkippingEnabled(obs_data_get_int(data, AMF_H264_FRAMESKIPPING) == 1);
+	m_VideoEncoder->SetEnforceHRDRestrictionsEnabled(obs_data_get_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY) == 1);
+	if (obs_data_get_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE) != 0)
+		m_VideoEncoder->SetMaximumAccessUnitSize((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE));
 
+	// Picture Control Properties
+	if (obs_data_get_int(data, AMF_H264_VIEW) == ViewMode::Master)
+		m_VideoEncoder->SetIDRPeriod((uint32_t)obs_data_get_int(data, AMF_H264_IDR_PERIOD));
+	else
+		m_VideoEncoder->SetIDRPeriod(max((uint32_t)(obs_data_get_double(data, AMF_H264_KEYFRAME_INTERVAL) * framerate), 1));
+	if (obs_data_get_int(data, AMF_H264_HEADER_INSERTION_SPACING) != 0)
+		m_VideoEncoder->SetHeaderInsertionSpacing((uint32_t)obs_data_get_int(data, AMF_H264_HEADER_INSERTION_SPACING));
+	m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, AMF_H264_DEBLOCKINGFILTER));
+	if (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames) {
+		try {
+			m_VideoEncoder->SetBPicturePattern((VCEBPicturePattern)obs_data_get_int(data, AMF_H264_BPICTURE_PATTERN));
+			m_VideoEncoder->SetBPictureReferenceEnabled(!!obs_data_get_int(data, AMF_H264_BPICTURE_REFERENCE));
+		} catch (...) {}
+		try {
+			if (m_VideoEncoder->GetBPicturePattern() != VCEBPicturePattern_None) {
+				m_VideoEncoder->SetBPictureDeltaQP((int8_t)obs_data_get_int(data, AMF_H264_QP_BPICTURE_DELTA));
+				m_VideoEncoder->SetReferenceBPictureDeltaQP((int8_t)obs_data_get_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA));
+			}
+		} catch (...) {}
+	}
+
+	// Miscellaneous Properties
+	m_VideoEncoder->SetHalfPixelMotionEstimationEnabled(!!(obs_data_get_int(data, AMF_H264_MOTIONESTIMATION) & 1));
+	m_VideoEncoder->SetQuarterPixelMotionEstimationEnabled(!!(obs_data_get_int(data, AMF_H264_MOTIONESTIMATION) & 2));
+
+	// OBS - Enforce Streaming Service Stuff
+	{
 		// Rate Control Method
-		const char* t_str = obs_data_get_string(settings, "rate_control");
+		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(VCERateControlMethod_ConstantBitrate);
@@ -808,25 +1447,27 @@
 			} else if (strcmp(t_str, "CQP") == 0) {
 				m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_ConstantQP);
 			}
+
+			obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, m_VideoEncoder->GetRateControlMethod());
 		} else {
 			switch (m_VideoEncoder->GetRateControlMethod()) {
 				case VCERateControlMethod_ConstantBitrate:
-					obs_data_set_string(settings, "rate_control", "CBR");
+					obs_data_set_string(data, "rate_control", "CBR");
 					break;
 				case VCERateControlMethod_VariableBitrate_PeakConstrained:
-					obs_data_set_string(settings, "rate_control", "VBR");
+					obs_data_set_string(data, "rate_control", "VBR");
 					break;
 				case VCERateControlMethod_VariableBitrate_LatencyConstrained:
-					obs_data_set_string(settings, "rate_control", "VBR_LAT");
+					obs_data_set_string(data, "rate_control", "VBR_LAT");
 					break;
 				case VCERateControlMethod_ConstantQP:
-					obs_data_set_string(settings, "rate_control", "CQP");
+					obs_data_set_string(data, "rate_control", "CQP");
 					break;
 			}
 		}
 
 		// Bitrate
-		uint64_t bitrateOvr = obs_data_get_int(settings, "bitrate") * 1000;
+		uint64_t bitrateOvr = obs_data_get_int(data, "bitrate") * 1000;
 		if (bitrateOvr != -1) {
 			if (m_VideoEncoder->GetTargetBitrate() > bitrateOvr)
 				m_VideoEncoder->SetTargetBitrate((uint32_t)bitrateOvr);
@@ -834,43 +1475,33 @@
 			if (m_VideoEncoder->GetPeakBitrate() > bitrateOvr)
 				m_VideoEncoder->SetPeakBitrate((uint32_t)bitrateOvr);
 
-			obs_data_set_int(settings, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
+			obs_data_set_int(data, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
+
+			obs_data_set_int(data, AMF_H264_BITRATE_TARGET, m_VideoEncoder->GetTargetBitrate() / bitrateMultiplier);
+			obs_data_set_int(data, AMF_H264_BITRATE_PEAK, m_VideoEncoder->GetPeakBitrate() / bitrateMultiplier);
 		} else {
-			obs_data_set_int(settings, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
+			obs_data_set_int(data, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
 		}
 
 		// IDR-Period (Keyframes)
 		uint32_t fpsNum = m_VideoEncoder->GetFrameRate().first;
 		uint32_t fpsDen = m_VideoEncoder->GetFrameRate().second;
-		if (obs_data_get_int(settings, "keyint_sec") != -1) {
-			m_VideoEncoder->SetIDRPeriod((uint32_t)(obs_data_get_int(settings, "keyint_sec") * ((double_t)fpsNum / (double_t)fpsDen)));
+		if (obs_data_get_int(data, "keyint_sec") != -1) {
+			m_VideoEncoder->SetIDRPeriod((uint32_t)(obs_data_get_int(data, "keyint_sec") * ((double_t)fpsNum / (double_t)fpsDen)));
+
+			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, (double_t)obs_data_get_int(data, "keyint_sec"));
+			obs_data_set_int(data, AMF_H264_IDR_PERIOD, (uint32_t)(obs_data_get_int(data, "keyint_sec") * ((double_t)fpsNum / (double_t)fpsDen)));
 		} else {
-			obs_data_set_int(settings, "keyint_sec", (uint64_t)(m_VideoEncoder->GetIDRPeriod() / ((double_t)fpsNum / (double_t)fpsDen)));
+			obs_data_set_int(data, "keyint_sec", (uint64_t)(m_VideoEncoder->GetIDRPeriod() / ((double_t)fpsNum / (double_t)fpsDen)));
 		}
 	}
 
-	//////////////////////////////////////////////////////////////////////////
 	// Verify
-	//////////////////////////////////////////////////////////////////////////
 	m_VideoEncoder->LogProperties();
+	if (obs_data_get_int(data, AMF_H264_VIEW) >= ViewMode::Master)
+		AMF_LOG_ERROR("View Mode 'Master' is active, avoid giving anything but basic support. Error is most likely caused by user settings themselves.");
 
-	//////////////////////////////////////////////////////////////////////////
-	// Initialize (locks static properties)
-	//////////////////////////////////////////////////////////////////////////
-	m_VideoEncoder->Start();
-
-	AMF_LOG_INFO("<AMFEncoder::H264Interface::H264Interface> Complete.");
-}
-
-Plugin::Interface::H264Interface::~H264Interface() {
-	AMF_LOG_INFO("<AMFEncoder::H264Interface::~H264Interface> Finalizing...");
-	m_VideoEncoder->Stop();
-	delete m_VideoEncoder;
-	AMF_LOG_INFO("<AMFEncoder::H264Interface::~H264Interface> Complete.");
-}
-
-bool Plugin::Interface::H264Interface::update(obs_data_t* settings) {
-	return update_properties(settings);
+	return true;
 }
 
 bool Plugin::Interface::H264Interface::encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
@@ -892,170 +1523,3 @@
 bool Plugin::Interface::H264Interface::get_extra_data(uint8_t** extra_data, size_t* size) {
 	return m_VideoEncoder->GetExtraData(extra_data, size);
 }
-
-bool Plugin::Interface::H264Interface::update_properties(obs_data_t* settings) {
-	int64_t value; double_t valued;
-
-	/// Minimum & Maximum QP
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_MINIMUM);
-		if (value != -1)
-			m_VideoEncoder->SetMinimumQP((uint8_t)value);
-	} catch (...) {}
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_MAXIMUM);
-		if (value != -1)
-			m_VideoEncoder->SetMaximumQP((uint8_t)value);
-	} catch (...) {}
-
-	/// Bitrate
-	try {
-		value = obs_data_get_int(settings, AMF_H264_BITRATE_TARGET);
-		if (value != -1)
-			m_VideoEncoder->SetTargetBitrate((uint32_t)value);
-	} catch (...) {}
-	try {
-		value = obs_data_get_int(settings, AMF_H264_BITRATE_PEAK);
-		if (value != -1)
-			m_VideoEncoder->SetPeakBitrate((uint32_t)value);
-	} catch (...) {}
-
-	/// I-, P-, B-Frame QP
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_IFRAME);
-		if (value != -1)
-			m_VideoEncoder->SetIFrameQP((uint8_t)value);
-	} catch (...) {}
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_PFRAME);
-		if (value != -1)
-			m_VideoEncoder->SetPFrameQP((uint8_t)value);
-	} catch (...) {}
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_BFRAME);
-		if (value != -1)
-			m_VideoEncoder->SetBFrameQP((uint8_t)value);
-	} catch (...) {}
-
-	/// Rate Control
-	try {
-		value = obs_data_get_int(settings, AMF_H264_RATECONTROLMETHOD);
-		if (value != -1)
-			m_VideoEncoder->SetRateControlMethod((VCERateControlMethod)value);
-	} catch (...) {}
-	try {
-		value = obs_data_get_int(settings, AMF_H264_FILLERDATA);
-		if (value != -1)
-			m_VideoEncoder->SetFillerDataEnabled(value == 1);
-	} catch (...) {}
-	try {
-		value = obs_data_get_int(settings, AMF_H264_FRAMESKIPPING);
-		if (value != -1)
-			m_VideoEncoder->SetRateControlSkipFrameEnabled(value == 1);
-	} catch (...) {}
-	/// CABAC
-	try {
-		value = obs_data_get_int(settings, AMF_H264_CABAC);
-		if (value != -1)
-			m_VideoEncoder->SetCABACEnabled(value != 0);
-	} catch (...) {}
-
-	/// VBV Buffer
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_VBVBUFFER_SIZE);
-		if (value != -1)
-			m_VideoEncoder->SetVBVBufferSize((uint32_t)value);
-	} catch (...) {}
-	try {
-		valued = obs_data_get_double(settings, AMF_H264ADVANCED_VBVBUFFER_FULLNESS);
-		m_VideoEncoder->SetInitialVBVBufferFullness(valued);
-	} catch (...) {}
-
-	/// Header Insertion Spacing
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_HEADER_INSERTION_SPACING);
-		if (value != -1)
-			m_VideoEncoder->SetHeaderInsertionSpacing((uint32_t)value);
-	} catch (...) {}
-	/// IDR Period / Keyframe Period
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_IDR_PERIOD);
-		if (value != -1)
-			m_VideoEncoder->SetIDRPeriod((uint32_t)value);
-	} catch (...) {}
-	/// GOP Size
-	try {
-		value = obs_data_get_int(settings, AMF_H264_GOP_SIZE);
-		if (value != -1)
-			m_VideoEncoder->SetGOPSize((uint32_t)value);
-	} catch (...) {}
-	/// Max AU Size
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_MAX_AU_SIZE);
-		if (value != -1)
-			m_VideoEncoder->SetMaximumAccessUnitSize((uint32_t)value);
-	} catch (...) {}
-
-	/// De-Blocking Filter
-	try {
-		value = obs_data_get_int(settings, AMF_H264_DEBLOCKINGFILTER);
-		if (value != -1)
-			m_VideoEncoder->SetDeBlockingFilterEnabled(value == 1);
-	} catch (...) {}
-	/// Enforce HRD Compatibility Restrictions
-	try {
-		value = obs_data_get_int(settings, AMF_H264_ENFORCEHRDCOMPATIBILITY);
-		if (value != -1)
-			m_VideoEncoder->SetEnforceHRDRestrictionsEnabled(value == 1);
-	} catch (...) {}
-
-	/// B-Pictures Pattern
-	try {
-		value = obs_data_get_int(settings, AMF_H264_BPICTURE_PATTERN);
-		if (value != -1)
-			m_VideoEncoder->SetBPicturePattern((VCEBPicturePattern)value);
-	} catch (...) {}
-	/// B-Picture Reference
-	try {
-		value = obs_data_get_int(settings, AMF_H264_BPICTURE_REFERENCE);
-		if (value != -1)
-			m_VideoEncoder->SetBPictureReferenceEnabled(value == 1);
-	} catch (...) {}
-	/// B-Picture Delta QP
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_BPICTURE_DELTA);
-		if (value != -11)
-			m_VideoEncoder->SetBPictureDeltaQP((int8_t)value);
-	} catch (...) {}
-	/// Ref B-Picture Delta QP
-	try {
-		value = obs_data_get_int(settings, AMF_H264_QP_REFERENCE_BPICTURE_DELTA);
-		if (value != -11)
-			m_VideoEncoder->SetReferenceBPictureDeltaQP((int8_t)value);
-	} catch (...) {}
-
-	/// Motion Estimation
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_MOTIONESTIMATION);
-		if (value != -1) {
-			m_VideoEncoder->SetHalfPixelMotionEstimationEnabled(!!(value & 0x1));
-			m_VideoEncoder->SetQuarterPixelMotionEstimationEnabled(!!(value & 0x2));
-		}
-	} catch (...) {}
-
-	/// Intra Refresh MBs Number Per Slot in Macroblocks
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_INTRAREFRESHNUMMBPERSLOT);
-		if (value != -1)
-			m_VideoEncoder->SetIntraRefreshMBsNumberPerSlot((uint32_t)value);
-	} catch (...) {}
-	/// Number of slices Per Frame
-	try {
-		value = obs_data_get_int(settings, AMF_H264ADVANCED_SLICESPERFRAME);
-		if (value != -1)
-			m_VideoEncoder->SetSlicesPerFrame((uint32_t)value);
-	} catch (...) {}
-
-
-	return true;
-}

obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/misc-util.cpp Added

@@ -0,0 +1,85 @@
+/*
+MIT License
+
+Copyright (c) 2016 Michael Fabian Dirks
+
+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
+//////////////////////////////////////////////////////////////////////////
+// Includes
+//////////////////////////////////////////////////////////////////////////
+
+// Plugin
+#include "plugin.h"
+#include "amd-amf.h"
+#include "amd-amf-vce.h"
+#include "amd-amf-vce-capabilities.h"
+
+//////////////////////////////////////////////////////////////////////////
+// Code
+//////////////////////////////////////////////////////////////////////////
+using namespace Plugin::AMD;
+
+namespace Plugin {
+	namespace Utility {
+		VCEProfileLevel inline GetMinimumProfileLevel(std::pair<uint32_t, uint32_t> frameSize, std::pair<uint32_t, uint32_t> frameRate) {
+			typedef std::pair<uint32_t, uint32_t> levelRestriction;
+			typedef std::pair<VCEProfileLevel, levelRestriction> level;
+
+			static const level profileLevelLimit[] = { // [Level, [Samples, Samples_Per_Sec]]
+				level(VCEProfileLevel_10, levelRestriction(25344, 380160)),
+				level(VCEProfileLevel_11, levelRestriction(101376, 768000)),
+				level(VCEProfileLevel_12, levelRestriction(101376, 1536000)),
+				level(VCEProfileLevel_13, levelRestriction(101376, 3041280)),
+				level(VCEProfileLevel_20, levelRestriction(101376, 3041280)),
+				level(VCEProfileLevel_21, levelRestriction(202752, 5068800)),
+				level(VCEProfileLevel_22, levelRestriction(414720, 5184000)),
+				level(VCEProfileLevel_30, levelRestriction(414720, 10368000)),
+				level(VCEProfileLevel_31, levelRestriction(921600, 27648000)),
+				level(VCEProfileLevel_32, levelRestriction(1310720, 55296000)),
+				//level(VCEProfileLevel_40, levelRestriction(2097152, 62914560)), // Technically identical to 4.1, but backwards compatible.
+				level(VCEProfileLevel_41, levelRestriction(2097152, 62914560)),
+				level(VCEProfileLevel_42, levelRestriction(2228224, 133693440)),
+				level(VCEProfileLevel_50, levelRestriction(5652480, 150994944)),
+				level(VCEProfileLevel_51, levelRestriction(9437184, 251658240)),
+				level(VCEProfileLevel_52, levelRestriction(9437184, 530841600)),
+				level((VCEProfileLevel)-1, levelRestriction(0, 0))
+			};
+
+			uint32_t samples = frameSize.first * frameSize.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; curLevel.first != -1; index++) {
+				curLevel = profileLevelLimit[index];
+
+				if (samples > curLevel.second.first)
+					continue;
+
+				if (samples_sec > curLevel.second.second)
+					continue;
+
+				return curLevel.first;
+			}
+			return VCEProfileLevel_52;
+		}
+	}
+}
\ No newline at end of file

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/plugin.cpp -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/Source/plugin.cpp Changed

@@ -31,15 +31,13 @@
 // Plugin
 #include "plugin.h"
 #include "amd-amf.h"
-#include "amd-amf-vce.h"
 #include "amd-amf-vce-capabilities.h"
-#include "enc-h264-simple.h"
 #include "enc-h264.h"
 
 //////////////////////////////////////////////////////////////////////////
 // Code
 //////////////////////////////////////////////////////////////////////////
-BOOL WINAPI DllMain(HINSTANCE , DWORD , LPVOID ) {
+BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID) {
 	return TRUE;
 }
 
@@ -58,18 +56,16 @@
 MODULE_EXPORT bool obs_module_load(void) {
 	try {
 		AMF_LOG_INFO("Version " PLUGIN_VERSION_TEXT);
-		
-		// Attempt to load libraries
+
+		// Load AMF Runtime
 		auto instance = Plugin::AMD::AMF::GetInstance();
 
-		// Report Capabilities
+		// Report AMF Capabilities
 		Plugin::AMD::VCECapabilities::ReportCapabilities();
 
 		// Register Encoders
-		Plugin::Interface::H264SimpleInterface::encoder_register();
 		Plugin::Interface::H264Interface::encoder_register();
-		return true;
-	} catch(...) {
+	} catch (...) {
 	}
 	return true;
 }

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/enc-amf.vcxproj -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/enc-amf.vcxproj Changed

@@ -70,28 +70,28 @@
 </ImportGroup>
 <PropertyGroup Label="UserMacros" />
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+ <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\amf\public\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
 <SourcePath>$(ProjectDir)Source;$(VC_SourcePath)</SourcePath>
 <OutDir>$(ProjectDir)#Build\$(Configuration)\obs-plugins\$(PlatformArchitecture)bit\</OutDir>
 <IntDir>$(ProjectDir)#Intermediate\$(Configuration)\$(PlatformArchitecture)\</IntDir>
 <LibraryPath>$(SolutionDir)#ThirdParty\OBS-Studio\build$(PlatformArchitecture)\libobs\$(Configuration)\;$(LibraryPath)</LibraryPath>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+ <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\amf\public\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
 <SourcePath>$(ProjectDir)Source;$(VC_SourcePath)</SourcePath>
 <OutDir>$(ProjectDir)#Build\$(Configuration)\obs-plugins\$(PlatformArchitecture)bit\</OutDir>
 <IntDir>$(ProjectDir)#Intermediate\$(Configuration)\$(PlatformArchitecture)\</IntDir>
 <LibraryPath>$(SolutionDir)#ThirdParty\OBS-Studio\build$(PlatformArchitecture)\libobs\$(Configuration)\;$(LibraryPath)</LibraryPath>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+ <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\amf\public\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
 <SourcePath>$(ProjectDir)Source;$(VC_SourcePath)</SourcePath>
 <OutDir>$(ProjectDir)#Build\$(Configuration)\obs-plugins\$(PlatformArchitecture)bit\</OutDir>
 <IntDir>$(ProjectDir)#Intermediate\$(Configuration)\$(PlatformArchitecture)\</IntDir>
 <LibraryPath>$(SolutionDir)#ThirdParty\OBS-Studio\build$(PlatformArchitecture)\libobs\$(Configuration)\;$(LibraryPath)</LibraryPath>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+ <IncludePath>$(SolutionDir)#ThirdParty\AMD-AMF-SDK\amf\public\include;$(SolutionDir)#ThirdParty\OBS-Studio;$(SolutionDir)#ThirdParty;$(ProjectDir)Include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
 <SourcePath>$(ProjectDir)Source;$(VC_SourcePath)</SourcePath>
 <OutDir>$(ProjectDir)#Build\$(Configuration)\obs-plugins\$(PlatformArchitecture)bit\</OutDir>
 <IntDir>$(ProjectDir)#Intermediate\$(Configuration)\$(PlatformArchitecture)\</IntDir>
@@ -106,7 +106,7 @@
 </ClCompile>
 <Link>
 <EnableCOMDATFolding>false</EnableCOMDATFolding>
- <AdditionalDependencies>obs.lib;winmm.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>
+ <AdditionalDependencies>obs.lib;version.lib;winmm.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;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 </ItemDefinitionGroup>
 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -118,7 +118,7 @@
 </ClCompile>
 <Link>
 <EnableCOMDATFolding>false</EnableCOMDATFolding>
- <AdditionalDependencies>obs.lib;winmm.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>
+ <AdditionalDependencies>obs.lib;version.lib;winmm.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'">
@@ -137,10 +137,11 @@
 <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
 <BufferSecurityCheck>false</BufferSecurityCheck>
 <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+ <OmitFramePointers>false</OmitFramePointers>
 </ClCompile>
 <Link>
 <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <AdditionalDependencies>obs.lib;winmm.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>
+ <AdditionalDependencies>obs.lib;version.lib;winmm.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;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
 <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
 </Link>
@@ -164,7 +165,7 @@
 </ClCompile>
 <Link>
 <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <AdditionalDependencies>obs.lib;winmm.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>
+ <AdditionalDependencies>obs.lib;version.lib;winmm.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>
 <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
 </Link>
 </ItemDefinitionGroup>
@@ -172,7 +173,9 @@
 <ClInclude Include="Include\amd-amf-vce.h" />
 <ClInclude Include="Include\amd-amf.h" />
 <ClInclude Include="Include\amd-amf-vce-capabilities.h" />
- <ClInclude Include="Include\enc-h264-simple.h" />
+ <ClInclude Include="Include\api-base.h" />
+ <ClInclude Include="Include\api-d3d11.h" />
+ <ClInclude Include="Include\api-d3d9.h" />
 <ClInclude Include="Include\enc-h264.h" />
 <ClInclude Include="Include\plugin.h" />
 </ItemGroup>
@@ -180,32 +183,15 @@
 <ClCompile Include="Source\amd-amf-vce.cpp" />
 <ClCompile Include="Source\amd-amf.cpp" />
 <ClCompile Include="Source\amd-amf-vce-capabilities.cpp" />
- <ClCompile Include="Source\enc-h264-simple.cpp" />
+ <ClCompile Include="Source\api-base.cpp" />
+ <ClCompile Include="Source\api-d3d11.cpp" />
+ <ClCompile Include="Source\api-d3d9.cpp" />
 <ClCompile Include="Source\enc-h264.cpp" />
+ <ClCompile Include="Source\misc-util.cpp" />
 <ClCompile Include="Source\plugin.cpp" />
 </ItemGroup>
 <ItemGroup>
- <None Include="Resources\locale\ca-ES.ini" />
- <None Include="Resources\locale\cs-CZ.ini" />
- <None Include="Resources\locale\da-DK.ini" />
- <None Include="Resources\locale\de-DE.ini" />
 <None Include="Resources\locale\en-US.ini" />
- <None Include="Resources\locale\es-ES.ini" />
- <None Include="Resources\locale\eu-ES.ini" />
- <None Include="Resources\locale\fi-FI.ini" />
- <None Include="Resources\locale\fr-FR.ini" />
- <None Include="Resources\locale\hu-HU.ini" />
- <None Include="Resources\locale\ja-JP.ini" />
- <None Include="Resources\locale\ko-KR.ini" />
- <None Include="Resources\locale\nb-NO.ini" />
- <None Include="Resources\locale\nl-NL.ini" />
- <None Include="Resources\locale\pl-PL.ini" />
- <None Include="Resources\locale\ru-RU.ini" />
- <None Include="Resources\locale\sv-SE.ini" />
- <None Include="Resources\locale\uk-UA.ini" />
- <None Include="Resources\locale\vi-VN.ini" />
- <None Include="Resources\locale\zh-CN.ini" />
- <None Include="Resources\locale\zh-TW.ini" />
 </ItemGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 <ImportGroup Label="ExtensionTargets">

obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/enc-amf.vcxproj.filters -> obs-studio-0.16.4.tar.xz/plugins/enc-amf/enc-amf/enc-amf.vcxproj.filters Changed

@@ -21,9 +21,6 @@
 <ClInclude Include="Include\enc-h264.h">
 <Filter>Header Files</Filter>
 </ClInclude>
- <ClInclude Include="Include\enc-h264-simple.h">
- <Filter>Header Files</Filter>
- </ClInclude>
 <ClInclude Include="Include\amd-amf.h">
 <Filter>Header Files</Filter>
 </ClInclude>
@@ -36,14 +33,20 @@
 <ClInclude Include="Include\amd-amf-vce-capabilities.h">
 <Filter>Header Files</Filter>
 </ClInclude>
+ <ClInclude Include="Include\api-d3d11.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Include\api-base.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Include\api-d3d9.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
 </ItemGroup>
 <ItemGroup>
 <ClCompile Include="Source\enc-h264.cpp">
 <Filter>Source Files</Filter>
 </ClCompile>
- <ClCompile Include="Source\enc-h264-simple.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
 <ClCompile Include="Source\amd-amf.cpp">
 <Filter>Source Files</Filter>
 </ClCompile>
@@ -56,70 +59,22 @@
 <ClCompile Include="Source\amd-amf-vce.cpp">
 <Filter>Source Files</Filter>
 </ClCompile>
+ <ClCompile Include="Source\misc-util.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\api-d3d11.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\api-base.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\api-d3d9.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
 </ItemGroup>
 <ItemGroup>
 <None Include="Resources\locale\en-US.ini">
 <Filter>Resource Files\locale</Filter>
 </None>
- <None Include="Resources\locale\es-ES.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\da-DK.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\hu-HU.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\ru-RU.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\vi-VN.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\de-DE.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\nb-NO.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\ca-ES.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\cs-CZ.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\eu-ES.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\fi-FI.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\fr-FR.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\ja-JP.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\ko-KR.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\nl-NL.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\pl-PL.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\sv-SE.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\uk-UA.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\zh-CN.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
- <None Include="Resources\locale\zh-TW.ini">
- <Filter>Resource Files\locale</Filter>
- </None>
 </ItemGroup>
 </Project>
\ No newline at end of file

obs-studio-0.16.2.tar.xz/plugins/image-source/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/plugins/image-source/data/locale/el-GR.ini Changed

obs-studio-0.16.4.tar.xz/plugins/image-source/data/locale/ms-MY.ini Added

obs-studio-0.16.4.tar.xz/plugins/linux-jack/data/locale/vi-VN.ini Added

obs-studio-0.16.4.tar.xz/plugins/mac-syphon/data/locale/ms-MY.ini Added

obs-studio-0.16.4.tar.xz/plugins/mac-vth264/data/locale/ms-MY.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-browser/cef-isolation/cef-isolated-client.mm -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/cef-isolation/cef-isolated-client.mm Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.h -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.h Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.mm -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.mm Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/apple/browser-source-mac.mm -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/apple/browser-source-mac.mm Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service-manager.h -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service-manager.h Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service-manager.mm -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service-manager.mm Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.cpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.cpp Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.hpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.hpp Changed

@@ -36,17 +36,17 @@
 	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 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);
@@ -58,6 +58,8 @@
 
 	void ExecuteSceneChangeJSCallback(const char *name);
 
+	void RefreshPageNoCache(int browserIdentifier);
+
 private: 
 	void ExecuteOnBrowser(int browserIdentifier, 
 			std::function<void(CefRefPtr<CefBrowser>)> f,

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/main-source.cpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/main-source.cpp Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/obs-browser/main.cpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/obs-browser/main.cpp Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/shared/browser-app.hpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/shared/browser-app.hpp Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/shared/browser-manager.hpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/shared/browser-manager.hpp Changed

obs-studio-0.16.2.tar.xz/plugins/obs-browser/shared/browser-scheme.cpp -> obs-studio-0.16.4.tar.xz/plugins/obs-browser/shared/browser-scheme.cpp Changed

obs-studio-0.16.2.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-ffmpeg/data/locale/ko-KR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-ffmpeg/data/locale/ko-KR.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-ffmpeg/data/locale/vi-VN.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-aac.c -> obs-studio-0.16.4.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-aac.c Changed

obs-studio-0.16.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c -> obs-studio-0.16.4.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c Changed

obs-studio-0.16.2.tar.xz/plugins/obs-filters/data/locale/nb-NO.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-filters/data/locale/nb-NO.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-outputs/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-outputs/data/locale/el-GR.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-outputs/data/locale/nb-NO.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-outputs/data/locale/nb-NO.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-outputs/rtmp-stream.c -> obs-studio-0.16.4.tar.xz/plugins/obs-outputs/rtmp-stream.c Changed

obs-studio-0.16.4.tar.xz/plugins/obs-qsv11/data/locale/el-GR.ini Added

obs-studio-0.16.4.tar.xz/plugins/obs-qsv11/data/locale/vi-VN.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/ca-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/ca-ES.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/cs-CZ.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/cs-CZ.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/de-DE.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/de-DE.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/el-GR.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/es-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/es-ES.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/eu-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/eu-ES.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/fi-FI.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/fi-FI.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/fr-FR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/fr-FR.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/hr-HR.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/hu-HU.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/hu-HU.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/it-IT.ini Added

@@ -0,0 +1,34 @@
+TextGDIPlus="Testo (GDI+)"
+Font="Font"
+Text="Testo"
+ReadFromFile="Leggi da file"
+TextFile="File di testo (UTF-8)"
+Filter.TextFiles="File di testo"
+Filter.AllFiles="Tutti i file"
+Color="Colore"
+Opacity="Opacità"
+Gradient="Sfumato"
+Gradient.Color="Colore sfumatura"
+Gradient.Opacity="Opacità sfumatura"
+Gradient.Direction="Direzione sfumatura"
+BkColor="Colore dello sfondo"
+BkOpacity="Opacità Sfondo"
+Alignment="Allineamento"
+Alignment.Left="A sinistra"
+Alignment.Center="Al centro"
+Alignment.Right="A destra"
+Vertical="Verticale"
+VerticalAlignment="Allineamento verticale"
+VerticalAlignment.Top="Alto"
+VerticalAlignment.Bottom="Dal basso"
+Outline="Contorno"
+Outline.Size="Dimensione contorno"
+Outline.Color="Colore del contorno"
+Outline.Opacity="Opacità contorno"
+ChatlogMode="Modalità Chatlog"
+ChatlogMode.Lines="Limite linea Chatlog"
+UseCustomExtents="Usa personalizzazioni testo"
+UseCustomExtents.Wrap="A capo automatico"
+Width="Larghezza"
+Height="Altezza"
+

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/ja-JP.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/ja-JP.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/ko-KR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/ko-KR.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/nb-NO.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/pl-PL.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/pl-PL.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/ru-RU.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/ru-RU.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/sr-CS.ini Added

obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/sr-SP.ini Added

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/sv-SE.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/sv-SE.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/uk-UA.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/uk-UA.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/zh-CN.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/zh-CN.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/zh-TW.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-text/data/locale/zh-TW.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-transitions/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-transitions/data/locale/el-GR.ini Changed

obs-studio-0.16.2.tar.xz/plugins/obs-transitions/data/slide_transition.effect -> obs-studio-0.16.4.tar.xz/plugins/obs-transitions/data/slide_transition.effect Changed

obs-studio-0.16.2.tar.xz/plugins/obs-x264/data/locale/ko-KR.ini -> obs-studio-0.16.4.tar.xz/plugins/obs-x264/data/locale/ko-KR.ini Changed

obs-studio-0.16.4.tar.xz/plugins/obs-x264/data/locale/vi-VN.ini Added

obs-studio-0.16.2.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-0.16.4.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-0.16.2.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-0.16.4.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -326,10 +326,14 @@
                 {
                     "name": "EU",
                     "url": "rtmp://eumedia1.livecoding.tv/livecodingtv"
+                },
+                {
+                    "name": "Asia Pacific",
+                    "url": "rtmp://apmedia1.livecoding.tv/livecodingtv"
                 }
             ],
             "recommended": {
-                "max video bitrate": 1300
+                "max video bitrate": 2300
             }
         },
         {
@@ -803,6 +807,21 @@
                 "max video bitrate": 3000,
                 "max audio bitrate": 128
             }
+        },
+        {
+            "name": "Picarto",
+            "servers": [
+                {
+                    "name": "USA/Canada",
+                    "url": "rtmp://live.us.picarto.tv/golive"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "profile": "main",
+                "max video bitrate": 2000,
+                "max audio bitrate": 160
+            }
         }
     ]
 }

obs-studio-0.16.4.tar.xz/plugins/text-freetype2/data/locale/ms-MY.ini Added

obs-studio-0.16.2.tar.xz/plugins/win-capture/cursor-capture.c -> obs-studio-0.16.4.tar.xz/plugins/win-capture/cursor-capture.c Changed

@@ -131,6 +131,25 @@
 	return output;
 }
 
+static gs_texture_t *get_cached_texture(struct cursor_data *data,
+		uint32_t cx, uint32_t cy)
+{
+	struct cached_cursor cc;
+
+	for (size_t i = 0; i < data->cached_textures.num; i++) {
+		struct cached_cursor *pcc = &data->cached_textures.array[i];
+
+		if (pcc->cx == cx && pcc->cy == cy)
+			return pcc->texture;
+	}
+
+	cc.texture = gs_texture_create(cx, cy, GS_BGRA, 1, NULL, GS_DYNAMIC);
+	cc.cx = cx;
+	cc.cy = cy;
+	da_push_back(data->cached_textures, &cc);
+	return cc.texture;
+}
+
 static inline bool cursor_capture_icon(struct cursor_data *data, HICON icon)
 {
 	uint8_t *bitmap;
@@ -138,9 +157,6 @@
 	uint32_t width;
 	ICONINFO ii;
 
-	gs_texture_destroy(data->texture);
-	data->texture = NULL;
-
 	if (!icon) {
 		return false;
 	}
@@ -150,8 +166,12 @@
 
 	bitmap = cursor_capture_icon_bitmap(&ii, &width, &height);
 	if (bitmap) {
-		data->texture = gs_texture_create(width, height, GS_BGRA,
-				1, (const uint8_t**)&bitmap, 0);
+		if (data->last_cx != width && data->last_cy != height) {
+			data->texture = get_cached_texture(data, width, height);
+			data->last_cx = width;
+			data->last_cy = height;
+		}
+		gs_texture_set_image(data->texture, bitmap, width * 4, false);
 		bfree(bitmap);
 
 		data->x_hotspot = ii.xHotspot;
@@ -217,6 +237,10 @@
 
 void cursor_data_free(struct cursor_data *data)
 {
-	gs_texture_destroy(data->texture);
+	for (size_t i = 0; i < data->cached_textures.num; i++) {
+		struct cached_cursor *pcc = &data->cached_textures.array[i];
+		gs_texture_destroy(pcc->texture);
+	}
+	da_free(data->cached_textures);
 	memset(data, 0, sizeof(*data));
 }

obs-studio-0.16.2.tar.xz/plugins/win-capture/cursor-capture.h -> obs-studio-0.16.4.tar.xz/plugins/win-capture/cursor-capture.h Changed

obs-studio-0.16.2.tar.xz/plugins/win-capture/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/plugins/win-capture/data/locale/el-GR.ini Changed

obs-studio-0.16.2.tar.xz/plugins/win-capture/data/locale/es-ES.ini -> obs-studio-0.16.4.tar.xz/plugins/win-capture/data/locale/es-ES.ini Changed

obs-studio-0.16.2.tar.xz/plugins/win-capture/data/locale/it-IT.ini -> obs-studio-0.16.4.tar.xz/plugins/win-capture/data/locale/it-IT.ini Changed

obs-studio-0.16.2.tar.xz/plugins/win-capture/data/locale/nb-NO.ini -> obs-studio-0.16.4.tar.xz/plugins/win-capture/data/locale/nb-NO.ini Changed

obs-studio-0.16.4.tar.xz/plugins/win-capture/data/locale/vi-VN.ini Added

obs-studio-0.16.2.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt -> obs-studio-0.16.4.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt Changed

obs-studio-0.16.4.tar.xz/plugins/win-capture/graphics-hook/d3d12-capture.cpp Added

@@ -0,0 +1,301 @@
+#define _CRT_SECURE_NO_WARNINGS
+#include <windows.h>
+#include "graphics-hook.h"
+
+#if COMPILE_D3D12_HOOK
+
+#include <d3d11on12.h>
+#include <d3d12.h>
+#include <dxgi1_2.h>
+
+#include "dxgi-helpers.hpp"
+#include "../funchook.h"
+
+struct d3d12_data {
+	ID3D12Device *device; /* do not release */
+	uint32_t base_cx;
+	uint32_t base_cy;
+	uint32_t cx;
+	uint32_t cy;
+	DXGI_FORMAT format;
+	bool using_shtex : 1;
+	bool using_scale : 1;
+	bool multisampled : 1;
+
+	ID3D11Device *device11;
+	ID3D11DeviceContext *context11;
+	ID3D11On12Device *device11on12;
+
+	union {
+		struct {
+			struct shtex_data *shtex_info;
+			ID3D11Resource *backbuffer11;
+			ID3D11Texture2D *copy_tex;
+			HANDLE handle;
+		};
+	};
+};
+
+static struct d3d12_data data = {};
+
+void d3d12_free(void)
+{
+	if (data.copy_tex)
+		data.copy_tex->Release();
+	if (data.backbuffer11)
+		data.backbuffer11->Release();
+	if (data.device11)
+		data.device11->Release();
+	if (data.context11)
+		data.context11->Release();
+	if (data.device11on12)
+		data.device11on12->Release();
+
+	capture_free();
+
+	memset(&data, 0, sizeof(data));
+
+	hlog("----------------- d3d12 capture freed ----------------");
+}
+
+static bool create_d3d12_tex(ID3D12Resource *backbuffer)
+{
+	D3D11_RESOURCE_FLAGS rf11 = {};
+	HRESULT hr;
+
+	hr = data.device11on12->CreateWrappedResource(backbuffer, &rf11,
+			D3D12_RESOURCE_STATE_COPY_SOURCE,
+			D3D12_RESOURCE_STATE_PRESENT,
+			__uuidof(ID3D11Resource),
+			(void**)&data.backbuffer11);
+	if (FAILED(hr)) {
+		hlog_hr("create_d3d12_tex: failed to create backbuffer11",
+				hr);
+		return false;
+	}
+
+	D3D11_TEXTURE2D_DESC desc11 = {};
+	desc11.Width = data.cx;
+	desc11.Height = data.cy;
+	desc11.MipLevels = 1;
+	desc11.ArraySize = 1;
+	desc11.Format = data.format;
+	desc11.SampleDesc.Count = 1;
+	desc11.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+	desc11.MiscFlags = D3D11_RESOURCE_MISC_SHARED;
+
+	hr = data.device11->CreateTexture2D(&desc11, nullptr, &data.copy_tex);
+	if (FAILED(hr)) {
+		hlog_hr("create_d3d12_tex: creation of d3d11 copy tex failed",
+				hr);
+		return false;
+	}
+
+	data.device11on12->ReleaseWrappedResources(&data.backbuffer11, 1);
+
+	IDXGIResource *dxgi_res;
+	hr = data.copy_tex->QueryInterface(__uuidof(IDXGIResource),
+			(void**)&dxgi_res);
+	if (FAILED(hr)) {
+		hlog_hr("create_d3d12_tex: failed to query "
+			"IDXGIResource interface from texture", hr);
+		return false;
+	}
+
+	hr = dxgi_res->GetSharedHandle(&data.handle);
+	dxgi_res->Release();
+	if (FAILED(hr)) {
+		hlog_hr("create_d3d12_tex: failed to get shared handle", hr);
+		return false;
+	}
+
+	return true;
+}
+
+typedef PFN_D3D11ON12_CREATE_DEVICE create_11_on_12_t;
+
+const static D3D_FEATURE_LEVEL feature_levels[] =
+{
+	D3D_FEATURE_LEVEL_11_0,
+	D3D_FEATURE_LEVEL_10_1,
+	D3D_FEATURE_LEVEL_10_0,
+	D3D_FEATURE_LEVEL_9_3,
+};
+
+static bool d3d12_init_11on12(void)
+{
+	static HMODULE d3d11 = nullptr;
+	static create_11_on_12_t create_11_on_12 = nullptr;
+	static bool initialized_11 = false;
+	static bool initialized_func = false;
+	HRESULT hr;
+
+	if (!initialized_11 && !d3d11) {
+		d3d11 = load_system_library("d3d11.dll");
+		if (!d3d11) {
+			hlog("d3d12_init_11on12: failed to load d3d11");
+		}
+		initialized_11 = true;
+	}
+
+	if (!d3d11) {
+		return false;
+	}
+
+	if (!initialized_func && !create_11_on_12) {
+		create_11_on_12 = (create_11_on_12_t)GetProcAddress(d3d11,
+				"D3D11On12CreateDevice");
+		if (!create_11_on_12) {
+			hlog("d3d12_init_11on12: Failed to get "
+					"D3D11On12CreateDevice address");
+		}
+
+		initialized_func = true;
+	}
+
+	if (!create_11_on_12) {
+		return false;
+	}
+
+	hr = create_11_on_12(data.device, 0, nullptr, 0,
+			nullptr, 0, 0,
+			&data.device11, &data.context11, nullptr);
+	if (FAILED(hr)) {
+		hlog_hr("d3d12_init_11on12: failed to create 11 device", hr);
+		return false;
+	}
+
+	data.device11->QueryInterface(__uuidof(ID3D11On12Device),
+			(void**)&data.device11on12);
+	if (FAILED(hr)) {
+		hlog_hr("d3d12_init_11on12: failed to query 11on12 device", hr);
+		return false;
+	}
+
+	return true;
+}
+
+static bool d3d12_shtex_init(HWND window, ID3D12Resource *backbuffer)
+{
+	if (!d3d12_init_11on12()) {
+		return false;
+	}
+	if (!create_d3d12_tex(backbuffer)) {
+		return false;
+	}
+	if (!capture_init_shtex(&data.shtex_info, window,
+				data.base_cx, data.base_cy, data.cx, data.cy,
+				data.format, false, (uintptr_t)data.handle)) {
+		return false;
+	}
+
+	hlog("d3d12 shared texture capture successful");
+	return true;
+}
+
+static inline bool d3d12_init_format(IDXGISwapChain *swap, HWND &window)
+{
+	DXGI_SWAP_CHAIN_DESC desc;
+	HRESULT hr;
+
+	hr = swap->GetDesc(&desc);
+	if (FAILED(hr)) {
+		hlog_hr("d3d12_init_format: swap->GetDesc failed", hr);
+		return false;
+	}
+
+	data.format = fix_dxgi_format(desc.BufferDesc.Format);
+	data.multisampled = desc.SampleDesc.Count > 1;
+	window = desc.OutputWindow;
+	data.base_cx = desc.BufferDesc.Width;
+	data.base_cy = desc.BufferDesc.Height;
+
+	if (data.using_scale) {
+		data.cx = global_hook_info->cx;
+		data.cy = global_hook_info->cy;
+	} else {
+		data.cx = desc.BufferDesc.Width;
+		data.cy = desc.BufferDesc.Height;
+	}
+	return true;
+}
+
+static void d3d12_init(IDXGISwapChain *swap, ID3D12Resource *backbuffer)
+{
+	bool success = true;
+	HWND window;
+	HRESULT hr;
+
+	data.using_scale = global_hook_info->use_scale;
+
+	hr = swap->GetDevice(__uuidof(ID3D12Device), (void**)&data.device);
+	if (FAILED(hr)) {
+		hlog_hr("d3d12_init: failed to get device from swap", hr);
+		return;
+	}
+
+	data.device->Release();
+
+	if (!d3d12_init_format(swap, window)) {
+		return;
+	}
+	if (data.using_scale) {
+		hlog("d3d12_init: scaling currently unsupported; ignoring");
+	}
+	if (success) {
+		if (global_hook_info->force_shmem) {
+			hlog("d3d12_init: shared memory capture currently "
+					"unsupported; ignoring");
+		}
+
+		success = d3d12_shtex_init(window, backbuffer);
+	}
+
+	if (!success)
+		d3d12_free();
+}
+
+static inline void d3d12_copy_texture(ID3D11Resource *dst, ID3D11Resource *src)
+{
+	if (data.multisampled) {
+		data.context11->ResolveSubresource(dst, 0, src, 0, data.format);
+	} else {
+		data.context11->CopyResource(dst, src);
+	}
+}
+
+static inline void d3d12_shtex_capture()
+{
+	data.device11on12->AcquireWrappedResources(&data.backbuffer11, 1);
+	d3d12_copy_texture(data.copy_tex, data.backbuffer11);
+	data.device11on12->ReleaseWrappedResources(&data.backbuffer11, 1);
+	data.context11->Flush();
+}
+
+void d3d12_capture(void *swap_ptr, void *backbuffer_ptr)
+{
+	IUnknown *unk_backbuffer = (IUnknown*)backbuffer_ptr;
+	IDXGISwapChain *swap = (IDXGISwapChain*)swap_ptr;
+	ID3D12Resource *backbuffer;
+	HRESULT hr;
+
+	if (capture_should_stop()) {
+		d3d12_free();
+	}
+	if (capture_should_init()) {
+		hr = unk_backbuffer->QueryInterface(__uuidof(ID3D12Resource),
+				(void**)&backbuffer);
+		if (FAILED(hr)) {
+			hlog_hr("d3d12_capture: failed to get backbuffer", hr);
+			return;
+		}
+
+		d3d12_init(swap, backbuffer);
+		backbuffer->Release();
+	}
+	if (capture_ready()) {
+		d3d12_shtex_capture();
+	}
+}
+
+#endif

obs-studio-0.16.2.tar.xz/plugins/win-capture/graphics-hook/dxgi-capture.cpp -> obs-studio-0.16.4.tar.xz/plugins/win-capture/graphics-hook/dxgi-capture.cpp Changed

@@ -8,6 +8,10 @@
 #include "graphics-hook.h"
 #include "../funchook.h"
 
+#if COMPILE_D3D12_HOOK
+#include <d3d12.h>
+#endif
+
 typedef HRESULT (STDMETHODCALLTYPE *resize_buffers_t)(IDXGISwapChain*, UINT,
 		UINT, UINT, DXGI_FORMAT, UINT);
 typedef HRESULT (STDMETHODCALLTYPE *present_t)(IDXGISwapChain*, UINT, UINT);
@@ -59,6 +63,17 @@
 		return true;
 	}
 
+#if COMPILE_D3D12_HOOK
+	hr = swap->GetDevice(__uuidof(ID3D12Device), (void**)&device);
+	if (SUCCEEDED(hr)) {
+		data.swap = swap;
+		data.capture = d3d12_capture;
+		data.free = d3d12_free;
+		device->Release();
+		return true;
+	}
+#endif
+
 	return false;
 }
 
@@ -87,12 +102,12 @@
 	return hr;
 }
 
-static inline IDXGIResource *get_dxgi_backbuffer(IDXGISwapChain *swap)
+static inline IUnknown *get_dxgi_backbuffer(IDXGISwapChain *swap)
 {
 	IDXGIResource *res = nullptr;
 	HRESULT hr;
 
-	hr = swap->GetBuffer(0, __uuidof(ID3D11Resource), (void**)&res);
+	hr = swap->GetBuffer(0, __uuidof(IUnknown), (void**)&res);
 	if (FAILED(hr))
 		hlog_hr("get_dxgi_backbuffer: GetBuffer failed", hr);
 
@@ -102,7 +117,7 @@
 static HRESULT STDMETHODCALLTYPE hook_present(IDXGISwapChain *swap,
 		UINT sync_interval, UINT flags)
 {
-	IDXGIResource *backbuffer = nullptr;
+	IUnknown *backbuffer = nullptr;
 	bool capture_overlay = global_hook_info->capture_overlay;
 	bool test_draw = (flags & DXGI_PRESENT_TEST) != 0;
 	bool capture;

obs-studio-0.16.4.tar.xz/plugins/win-capture/graphics-hook/graphics-hook-config.h.in Added

obs-studio-0.16.2.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h -> obs-studio-0.16.4.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h Changed

obs-studio-0.16.2.tar.xz/plugins/win-dshow/data/locale/el-GR.ini -> obs-studio-0.16.4.tar.xz/plugins/win-dshow/data/locale/el-GR.ini Changed

obs-studio-0.16.2.tar.xz/plugins/win-dshow/data/locale/it-IT.ini -> obs-studio-0.16.4.tar.xz/plugins/win-dshow/data/locale/it-IT.ini Changed

obs-studio-0.16.2.tar.xz/plugins/win-dshow/data/locale/nb-NO.ini -> obs-studio-0.16.4.tar.xz/plugins/win-dshow/data/locale/nb-NO.ini Changed

obs-studio-0.16.2.tar.xz/plugins/win-dshow/data/locale/sv-SE.ini -> obs-studio-0.16.4.tar.xz/plugins/win-dshow/data/locale/sv-SE.ini Changed

obs-studio-0.16.4.tar.xz/plugins/win-mf/data/locale/vi-VN.ini Added

@@ -0,0 +1,29 @@
+MFAACEnc="Media Foundation AAC Encoder"
+Bitrate="Bitrate"
+
+MF.H264.EncoderName="Media Foundation H264 Encoder"
+MF.H264.Encoder="Tên Encoder"
+MF.H264.LowLatency="Độ trễ thấp (Tắt frame re-ordering)"
+MF.H264.CustomBufsize="Sử dụng tùy chỉnh bộ đệm kích thước"
+MF.H264.BufferSize="Kích cỡ bộ đệm"
+MF.H264.CustomMaxBitrate="Sử dụng tùy chỉnh Bitrate cao nhất"
+MF.H264.Bitrate="Bitrate"
+MF.H264.MaxBitrate="Bitrate Cao nhất"
+MF.H264.KeyframeIntervalSec="Keyframe Interval (giây, 0 = auto)"
+MF.H264.RateControl="Cách kiểm soát bitrate"
+MF.H264.CBR="CBR (Bitrate cố định)"
+MF.H264.VBR="VBR (Bitrate thay đổi được)"
+MF.H264.CQP="CQP (Chất lượng cố định)"
+MF.H264.MinQP="QP Thấp nhất"
+MF.H264.MaxQP="QP Cao nhất"
+MF.H264.QPI="QP I-Frame"
+MF.H264.QPP="QP P-Frame"
+MF.H264.QPB="QP B-Frame"
+MF.H264.Profile="Hồ sơ"
+MF.H264.Advanced="Nâng cao"
+
+MF.H264.EncoderSWMicrosoft="Microsoft Software H.264 Encoder"
+MF.H264.EncoderHWAMD="AMD Video Coding Engine H.264 Encoder (Media Foundation)"
+MF.H264.EncoderHWIntel="Intel Quick Sync H.264 Encoder (Media Foundation)"
+MF.H264.EncoderHWNVIDIA="NVIDIA NVENC H.264 Encoder (Media Foundation)"
+

obs-studio-0.16.2.tar.xz/plugins/win-mf/mf-h264.cpp -> obs-studio-0.16.4.tar.xz/plugins/win-mf/mf-h264.cpp Changed

Overview

Request 2967 (accepted)

Request History