Packman Build Service PMBS

Changes of Revision 41

obs-studio.changes Changed

@@ -1,4 +1,36 @@
 -------------------------------------------------------------------
+Tue Jan 17 23:38:37 UTC 2017 - jimmy@boombatower.com
+
+- Update to version 17.0.1:
+  * deps/libff: Fix VP8/VP9/webm alpha support
+  * rtmp-services: Increase video bitrate limit for YouTube
+  * obs-outputs: fix build error on freebsd
+  * Update translations from Crowdin
+  * [CI] Use prebuilt deps so we can build on 10.9
+  * CI: Build more features into FFMPEG deps
+  * CI: Update browser plugin ref and build scripts.
+  * CI: Fix zip permission issue on CEF plist files
+  * obs-x264: ignore opencl param
+  * enc-amf: Update to 1.4.3.8
+  * CI: Ability to make packages on travis
+  * CI: actually call packagesbuild from the right place 😑
+  * cmake: Remove unnecessary find_package calls
+  * libobs: Fix scale filtering bug when duplicating scenes
+  * win-capture: Don't use FindWindow for game capture keepalive
+  * CI: Install Packages and use the full version
+  * Revert "win-capture: Use FindWindowEx to traverse window list"
+  * obs-filters.c: Fix color correction filter OpenGL crash
+  * obs-filters.c: Fix color correction filter saturation
+  * Update translations from Crowdin
+  * UI: Fix bug with uncopied profile import/export files
+  * win-capture: Fix game capture size bug when rehooking
+  * libobs: Add func to enum active and inactive child tree
+  * libobs: Enumerate full tree when adding active child
+  * libobs: Add callback for enumerating all scene children
+  * obs-x264: Allow opencl through much longer alias
+  * libobs: Update to version 17.0.1
+
+-------------------------------------------------------------------
 Mon Dec 26 08:32:58 UTC 2016 - jimmy@boombatower.com
 
 - Update to version 0.17.0:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-0.17.0.tar.xz/CI/before-deploy-osx.sh -> obs-studio-17.0.1.tar.xz/CI/before-deploy-osx.sh Changed

obs-studio-0.17.0.tar.xz/CI/before-script-osx.sh -> obs-studio-17.0.1.tar.xz/CI/before-script-osx.sh Changed

obs-studio-0.17.0.tar.xz/CI/install-dependencies-osx.sh -> obs-studio-17.0.1.tar.xz/CI/install-dependencies-osx.sh Changed

@@ -1,17 +1,22 @@
+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
+sudo installer -pkg ./Packages.pkg -target /
+
 brew update
 
 #Base OBS Deps
-brew install ffmpeg x264 qt5
+brew install qt5
+
+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz
+tar -xf ./osx-deps.tar.gz -C /tmp
 
 # CEF Stuff
 cd ../
-curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2704.1434.gec3e9ed_macosx64.tar.bz2
-tar -xf ./cef_binary_3.2704.1434.gec3e9ed_macosx64.tar.bz2
-cd ./cef_binary_3.2704.1434.gec3e9ed_macosx64
+curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2
+tar -xf ./cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2
+cd ./cef_binary_3.2883.1540.gedbfb20_macosx64
 mkdir build
 cd ./build
-cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" ..
+cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
 make -j4
 mkdir libcef_dll
-mv ./libcef_dll_wrapper/libcef_dll_wrapper.a ./libcef_dll/libcef_dll_wrapper.a
 cd ../../

obs-studio-17.0.1.tar.xz/CI/install/osx/CMakeLists.pkgproj Added

@@ -0,0 +1,1021 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PACKAGES</key>
+	<array>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>../../../build/OBS.app</string>
+									<key>PATH_TYPE</key>
+									<integer>3</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>3</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Utilities</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array>
+														<dict>
+															<key>CHILDREN</key>
+															<array>
+																<dict>
+																	<key>CHILDREN</key>
+																	<array>
+																		<dict>
+																			<key>CHILDREN</key>
+																			<array/>
+																			<key>GID</key>
+																			<integer>80</integer>
+																			<key>PATH</key>
+																			<string>../../../build/plugins/obs-browser/CEF.app</string>
+																			<key>PATH_TYPE</key>
+																			<integer>3</integer>
+																			<key>PERMISSIONS</key>
+																			<integer>493</integer>
+																			<key>TYPE</key>
+																			<integer>3</integer>
+																			<key>UID</key>
+																			<integer>0</integer>
+																		</dict>
+																		<dict>
+																			<key>CHILDREN</key>
+																			<array/>
+																			<key>GID</key>
+																			<integer>80</integer>
+																			<key>PATH</key>
+																			<string>../../../build/plugins/obs-browser/obs-browser.so</string>
+																			<key>PATH_TYPE</key>
+																			<integer>3</integer>
+																			<key>PERMISSIONS</key>
+																			<integer>493</integer>
+																			<key>TYPE</key>
+																			<integer>3</integer>
+																			<key>UID</key>
+																			<integer>0</integer>
+																		</dict>
+																	</array>
+																	<key>GID</key>
+																	<integer>80</integer>
+																	<key>PATH</key>
+																	<string>bin</string>
+																	<key>PATH_TYPE</key>
+																	<integer>0</integer>
+																	<key>PERMISSIONS</key>
+																	<integer>493</integer>
+																	<key>TYPE</key>
+																	<integer>2</integer>
+																	<key>UID</key>
+																	<integer>0</integer>
+																</dict>
+															</array>
+															<key>GID</key>
+															<integer>80</integer>
+															<key>PATH</key>
+															<string>obs-browser</string>
+															<key>PATH_TYPE</key>
+															<integer>0</integer>
+															<key>PERMISSIONS</key>
+															<integer>493</integer>
+															<key>TYPE</key>
+															<integer>2</integer>
+															<key>UID</key>
+															<integer>0</integer>
+														</dict>
+													</array>
+													<key>GID</key>
+													<integer>80</integer>
+													<key>PATH</key>
+													<string>plugins</string>
+													<key>PATH_TYPE</key>
+													<integer>0</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>2</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>80</integer>
+											<key>PATH</key>
+											<string>obs-studio</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>Extensions</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>1</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Library</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>System</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>2</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>POSTINSTALL_PATH</key>
+				<dict/>
+				<key>PREINSTALL_PATH</key>
+				<dict/>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>org.obsproject.pkg.obs-studio</string>
+				<key>NAME</key>
+				<string>OBS</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<false/>
+				<key>VERSION</key>
+				<string>1.0</string>
+			</dict>
+			<key>UUID</key>
+			<string>19CCE3F2-8911-4364-B673-8B5BC3ABD4DA</string>
+		</dict>
+		<dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>SyphonInject</string>
+			</dict>
+			<key>PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>SyphonInject.pkg</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+			</dict>
+			<key>TYPE</key>
+			<integer>1</integer>
+			<key>UUID</key>
+			<string>0CC9C67E-4D14-4794-9930-019925513B1C</string>
+		</dict>
+	</array>
+	<key>PROJECT</key>
+	<dict>
+		<key>PROJECT_COMMENTS</key>
+		<dict>
+			<key>NOTES</key>
+			<data>
+			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
+			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
+			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
+			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
+			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
+			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
+			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
+			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuNzYiPgo8c3R5bGUg
+			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
+			Pgo8L2JvZHk+CjwvaHRtbD4K
+			</data>
+		</dict>
+		<key>PROJECT_PRESENTATION</key>
+		<dict>
+			<key>BACKGROUND</key>
+			<dict>
+				<key>ALIGNMENT</key>
+				<integer>4</integer>
+				<key>BACKGROUND_PATH</key>
+				<dict>
+					<key>PATH</key>
+					<string>obs.png</string>
+					<key>PATH_TYPE</key>
+					<integer>1</integer>
+				</dict>
+				<key>CUSTOM</key>
+				<integer>1</integer>
+				<key>SCALING</key>
+				<integer>0</integer>
+			</dict>
+			<key>INSTALLATION TYPE</key>
+			<dict>
+				<key>HIERARCHIES</key>
+				<dict>
+					<key>INSTALLER</key>
+					<dict>
+						<key>LIST</key>
+						<array>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>0</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>19CCE3F2-8911-4364-B673-8B5BC3ABD4DA</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>7C540711-59F4-479C-9CFD-8C4D6594992E</string>
+							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>0CC9C67E-4D14-4794-9930-019925513B1C</string>
+								<key>REQUIREMENTS</key>
+								<array/>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>BBDE08F6-D7EE-47CB-881F-7F208B3A604B</string>
+							</dict>
+						</array>
+						<key>REMOVED</key>
+						<dict/>
+					</dict>
+				</dict>
+				<key>INSTALLATION TYPE</key>
+				<integer>0</integer>
+				<key>MODE</key>
+				<integer>0</integer>
+			</dict>
+			<key>INSTALLATION_STEPS</key>
+			<array>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewIntroductionController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Introduction</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewReadMeController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>ReadMe</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewLicenseController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>License</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewDestinationSelectController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>TargetSelect</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewInstallationTypeController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>PackageSelection</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewInstallationController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Install</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewSummaryController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Summary</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+			</array>
+			<key>INTRODUCTION</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array/>
+			</dict>
+			<key>LICENSE</key>
+			<dict>
+				<key>KEYWORDS</key>
+				<dict/>
+				<key>LOCALIZATIONS</key>
+				<array/>
+				<key>MODE</key>
+				<integer>0</integer>
+			</dict>
+			<key>README</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array/>
+			</dict>
+			<key>SUMMARY</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array/>
+			</dict>
+			<key>TITLE</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<string>OBS</string>
+					</dict>
+				</array>
+			</dict>
+		</dict>
+		<key>PROJECT_REQUIREMENTS</key>
+		<dict>
+			<key>LIST</key>
+			<array/>
+			<key>POSTINSTALL_PATH</key>
+			<dict/>
+			<key>PREINSTALL_PATH</key>
+			<dict/>
+			<key>RESOURCES</key>
+			<array/>
+			<key>ROOT_VOLUME_ONLY</key>
+			<false/>
+		</dict>
+		<key>PROJECT_SETTINGS</key>
+		<dict>
+			<key>ADVANCED_OPTIONS</key>
+			<dict/>
+			<key>BUILD_FORMAT</key>
+			<integer>0</integer>
+			<key>BUILD_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>../../../build</string>
+				<key>PATH_TYPE</key>
+				<integer>3</integer>
+			</dict>
+			<key>EXCLUDED_FILES</key>
+			<array>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.DS_Store</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove .DS_Store files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove ".DS_Store" files created by the Finder.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.pbdevelopment</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove .pbdevelopment files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>CVS</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.cvsignore</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.cvspass</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.svn</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.git</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.gitignore</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove SCM metadata</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>classes.nib</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>designable.db</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>info.nib</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Optimize nib files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>Resources Disabled</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove Resources Disabled folders</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove "Resources Disabled" folders.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>SEPARATOR</key>
+					<true/>
+				</dict>
+			</array>
+			<key>NAME</key>
+			<string>OBS</string>
+		</dict>
+	</dict>
+	<key>TYPE</key>
+	<integer>0</integer>
+	<key>VERSION</key>
+	<integer>2</integer>
+</dict>
+</plist>

obs-studio-17.0.1.tar.xz/CI/install/osx/OBSPublicDSAKey.pem Added

@@ -0,0 +1,36 @@
+-----BEGIN PUBLIC KEY-----
+MIIGSDCCBDoGByqGSM44BAEwggQtAoICAQDDTtoCl3zVYY4jq2ZvJhY+jZB23BdR
+k+oTQH0lIUuIBjJR+S8NZqylr4SIGF2S76sCDdpK5P7Waj1y5WyBIJQDCPA7UI1T
+P8UeZgxLazl+oVPnDhUeiEWCNkZIcn746/pPgdoG5KNjb6CUNQ8X+zkUzq6LJ7w9
+Sn02g1FPf0HUlR0D9bx8KweetAZrBGYNP2Mv0RvUSE3TS+t1zJadOp7GsMcoRBxD
+XnJXirBiTjGu3pUZ5bJSLEw+Jm46DdEj0f+SSMpPjgRAG3Pn8ac7U+CVonGHEIRB
+4+yjHTqF9aPtsABIbAeSh63U54yYcmYuF/ioxTNjXXsNGNm5ZAeGq1/o0iT2eesu
+nC6yUYggWSBVZEdTD4uI9iYsYnpjbp+fAUoD53MxTRgKqdOESdtZTJ0HSUqTjngH
+kwzpvxN7WmCpxISzAjs5bknu90DcdP2R4KrJfiJJzAMFp0hmwuy4OaUX0+BWZzvW
+KxCbHsvJL2asHkX4kQpoGVnYmEglH0vOLuK3iJi96jDcGBDGGPO0OXgu6P00iALT
+JF1KylJNnyH0K1a7EbS1QJlF50+zW+okc5Da1iy4vktTP7gPxBHZWeFHPMRZOp1H
+CZeP6Lipf9NpE5dqzMuHLFmxWeKn/7CQ2T9LyeTIajbeGqRsoSII3qEgQd/nDM3k
+NYt6e7dKx6rk6QIhAJ8/wlS8dyJEnvMwVRqn5ER05q7NuHocmGGiX2V/ONLnAoIC
+AQCTFu8RESwHSQ4uR3O0CjlvQKwqEM3Vlv+nyEqYvfqJNAfxrncpV0TF05GvUV7M
+e31solt3eK31qjK1H3AMaD8ToCinSYMLaoyMt0AfGljGK5cNZKXn/xFVM4mq71id
+RzrIfmL2327+kH7wC/8sk7R3FB/mxPV1fRhKuBqG+Y6x9NX7vz57JnIio20OQKCE
+Sn7a18QWHgmt+e+n9R6x7JiVOj+ZTwuPPXpomNB6nPVnQftf3lwB7ug1wJyBxAqy
+NkIhzkAk4RDn4NzhP70ULD80GdS36swCIOg08uTSsYA6FMgrD6JLpmKC4Uha8vPM
+421qxX8Si/Dk3r4one6NUr2WD0sy754MKOCZ5aD8XUB2ylLzfvdSEaGo+G/IyPtC
+o71PMnIStEPXH6GkvzxJv17zvhqQcyKBciqxR7GCQhbwMimp96EPIA3/2UDXQ9UE
+O+/JulJKVEuu4HhWLW8+s+qKhyTyP1dRd0qzLoLj81JA3FcotB1Lncas8mtv+eET
+Z1tKuDy8f4esOh0fuGNrDiMnm3y+cnsa41k4XLDLPrqGbJHxiRTlGwCMLxLEMcFa
+0gjYU3UFFiEvNG0vFWr4h57taLBoyKoyBON+Cmn5hsrKs1J1kTBTc1EvDF5mXjoX
+RhlrPxd/6b5aa12d3xIYofcp70RyPBM1AZ7jfWeSgKhN6AOCAgYAAoICAQClbOeZ
+cnCCsOaZyXp7aiZmDmJ4dtvCRXc+uD+VzRHlg/8X3BYQ01KUMc5/m+fFT7x8w12w
+FEN/txOxTB+NzQBlnRFHWjBOioxHWqAnYLuADP4nZM+1bwaMUBCRUX0MHZbaMMSR
+/dBa45Y9quc4JTV8rpfIzXdw1NZjDmnKYwKQxQ6eD/WymJFNpWKkaniMda0HQVCU
+eBEEpLjW4UE1YUFQgKuIKUdZ1eBxeXHgX6uDpU53reK8gC5ry8xZXryJlcqhKyQ8
+TrDarZgmxhzAvAwPbtCutiOpPaVpCQCdgi4PgA3sAgmdGENXDqTxcSCbCcmCYMzl
+pJLh+giO74OwZMqWvHwHPY5wgZbx9Tnw4JS+gsjl3K3XUeY1+J6cgrFCK/9iaRUx
+7lBroEgQoi+O+yM9ikPeGZYKwgobWslmNuMdYvbZl+hQF+eo7dgnABl+WHLkHogv
+O0wfbENlYECAHXJ/ncyRWoiyd3d/HrZBwMfMFv0hv9JdQ1EjVePXGh9+cDxO0W+Y
+ZJhXsXEmQ82+Pg9cCVywLKdbNWi4qPgwYEKKagq4ack6JHCcwbLMmNTz/PaDZpfP
+wCCxYzVxKksGnV2tb2quAW1/GB+H9FcPSHvE1MMsPhRwAGAm4+aKuL1IvrvLh8fj
+0tZk6dhMjtrBOkZMfnBbSKDKQlcHvXM25yIjgA==
+-----END PUBLIC KEY-----

obs-studio-17.0.1.tar.xz/CI/install/osx/SyphonInject.pkg Added

obs-studio-17.0.1.tar.xz/CI/install/osx/obs.png Added

@@ -0,0 +1,703 @@
+
+
+
+
+<!DOCTYPE html>
+<html lang="en" class=" emoji-size-boost is-u2f-enabled">
+  <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# object: http://ogp.me/ns/object# article: http://ogp.me/ns/article# profile: http://ogp.me/ns/profile#">
+    <meta charset='utf-8'>
+    
+
+    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/frameworks-c9ae4d373fcb2c40952201451cd449e00d6dbcedc778b79c9dfb2d076d04993b.css" integrity="sha256-ya5NNz/LLECVIgFFHNRJ4A1tvO3HeLecnfstB20EmTs=" media="all" rel="stylesheet" />
+    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/github-4d14493830801ffc6d6d6363f3fcef8a6e41fd9e74776dce15fa2c18b2a9bb72.css" integrity="sha256-TRRJODCAH/xtbWNj8/zvim5B/Z50d23OFfosGLKpu3I=" media="all" rel="stylesheet" />
+    
+    
+    
+    
+
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="Content-Language" content="en">
+    <meta name="viewport" content="width=device-width">
+    
+    <title>obs-studio-utils/obs.png at master · kc5nra/obs-studio-utils</title>
+    <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
+    <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub">
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
+    <meta property="fb:app_id" content="1401488693436528">
+
+      <meta content="https://avatars0.githubusercontent.com/u/231018?v=3&amp;s=400" name="twitter:image:src" /><meta content="@github" name="twitter:site" /><meta content="summary" name="twitter:card" /><meta content="kc5nra/obs-studio-utils" name="twitter:title" /><meta content="Contribute to obs-studio-utils development by creating an account on GitHub." name="twitter:description" />
+      <meta content="https://avatars0.githubusercontent.com/u/231018?v=3&amp;s=400" property="og:image" /><meta content="GitHub" property="og:site_name" /><meta content="object" property="og:type" /><meta content="kc5nra/obs-studio-utils" property="og:title" /><meta content="https://github.com/kc5nra/obs-studio-utils" property="og:url" /><meta content="Contribute to obs-studio-utils development by creating an account on GitHub." property="og:description" />
+      <meta name="browser-stats-url" content="https://api.github.com/_private/browser/stats">
+    <meta name="browser-errors-url" content="https://api.github.com/_private/browser/errors">
+    <link rel="assets" href="https://assets-cdn.github.com/">
+    <link rel="web-socket" href="wss://live.github.com/_sockets/VjI6NTA0OTIxMTc6ZDJjMjcyYzA1MjZiMGM4MGI5MmU2NzBkMTMyMWNiYWZhMjZiZGQ0MGQxOGY1MWNkYmI1NzA0NjhlZTdjM2E2OA==--561fd74d4042c982502dd897714172236351f238">
+    <meta name="pjax-timeout" content="1000">
+    <link rel="sudo-modal" href="/sessions/sudo_modal">
+    <meta name="request-id" content="683BCFFA:2DABC:EE980D1:587831B3" data-pjax-transient>
+
+    <meta name="msapplication-TileImage" content="/windows-tile.png">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="selected-link" value="repo_source" data-pjax-transient>
+
+    <meta name="google-site-verification" content="KT5gs8h0wvaagLKAVWq8bbeNwnZZK1r1XQysX3xurLU">
+<meta name="google-site-verification" content="ZzhVyEFwb7w3e0-uOTltm8Jsck2F5StVihD0exw2fsA">
+    <meta name="google-analytics" content="UA-3769691-2">
+
+<meta content="collector.githubapp.com" name="octolytics-host" /><meta content="github" name="octolytics-app-id" /><meta content="683BCFFA:2DABC:EE980D1:587831B3" name="octolytics-dimension-request_id" /><meta content="207897" name="octolytics-actor-id" /><meta content="DDRBoxman" name="octolytics-actor-login" /><meta content="951d1462a992f6b4236b5008d6b11c4331eba4c658fe50ec7c9882e14af522bd" name="octolytics-actor-hash" />
+<meta content="/&lt;user-name&gt;/&lt;repo-name&gt;/blob/show" data-pjax-transient="true" name="analytics-location" />
+
+
+
+  <meta class="js-ga-set" name="dimension1" content="Logged In">
+
+
+
+        <meta name="hostname" content="github.com">
+    <meta name="user-login" content="DDRBoxman">
+
+        <meta name="expected-hostname" content="github.com">
+      <meta name="js-proxy-site-detection-payload" content="ZDQzNzZjM2MwNTlmYWFjNzhmNWJlMzY0MzNkMjdiOThhM2U2OTI0ZjlmMzFlYzJmODdjYjMxNDQ5OTBkNjc4NXx7InJlbW90ZV9hZGRyZXNzIjoiMTA0LjU5LjIwNy4yNTAiLCJyZXF1ZXN0X2lkIjoiNjgzQkNGRkE6MkRBQkM6RUU5ODBEMTo1ODc4MzFCMyIsInRpbWVzdGFtcCI6MTQ4NDI3MjA1NiwiaG9zdCI6ImdpdGh1Yi5jb20ifQ==">
+
+
+      <link rel="mask-icon" href="https://assets-cdn.github.com/pinned-octocat.svg" color="#000000">
+      <link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico">
+
+    <meta name="html-safe-nonce" content="0a420a0a7ff0cff8568da5f27c46880ec53370cf">
+
+    <meta http-equiv="x-pjax-version" content="f36bd54ef0fdb145d68369e21555ea6f">
+    
+
+      
+  <meta name="description" content="Contribute to obs-studio-utils development by creating an account on GitHub.">
+  <meta name="go-import" content="github.com/kc5nra/obs-studio-utils git https://github.com/kc5nra/obs-studio-utils.git">
+
+  <meta content="231018" name="octolytics-dimension-user_id" /><meta content="kc5nra" name="octolytics-dimension-user_login" /><meta content="24656398" name="octolytics-dimension-repository_id" /><meta content="kc5nra/obs-studio-utils" name="octolytics-dimension-repository_nwo" /><meta content="true" name="octolytics-dimension-repository_public" /><meta content="false" name="octolytics-dimension-repository_is_fork" /><meta content="24656398" name="octolytics-dimension-repository_network_root_id" /><meta content="kc5nra/obs-studio-utils" name="octolytics-dimension-repository_network_root_nwo" />
+  <link href="https://github.com/kc5nra/obs-studio-utils/commits/master.atom" rel="alternate" title="Recent Commits to obs-studio-utils:master" type="application/atom+xml">
+
+
+      <link rel="canonical" href="https://github.com/kc5nra/obs-studio-utils/blob/master/install/osx/obs.png" data-pjax-transient>
+  </head>
+
+
+  <body class="logged-in  env-production macintosh vis-public page-blob">
+    <div id="js-pjax-loader-bar" class="pjax-loader-bar"><div class="progress"></div></div>
+    <a href="#start-of-content" tabindex="1" class="accessibility-aid js-skip-to-content">Skip to content</a>
+
+    
+    
+    
+
+
+
+        <div class="header header-logged-in true" role="banner">
+  <div class="container clearfix">
+
+    <a class="header-logo-invertocat" href="https://github.com/" data-hotkey="g d" aria-label="Homepage" data-ga-click="Header, go to dashboard, icon:logo">
+  <svg aria-hidden="true" class="octicon octicon-mark-github" height="28" version="1.1" viewBox="0 0 16 16" width="28"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
+</a>
+
+
+        <div class="header-search scoped-search site-scoped-search js-site-search" role="search">
+  </option></form><form accept-charset="UTF-8" action="/kc5nra/obs-studio-utils/search" class="js-site-search-form" data-scoped-search-url="/kc5nra/obs-studio-utils/search" data-unscoped-search-url="/search" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>
+    <label class="form-control header-search-wrapper js-chromeless-input-container">
+      <div class="header-search-scope">This repository</div>
+      <input type="text"
+        class="form-control header-search-input js-site-search-focus js-site-search-field is-clearable"
+        data-hotkey="s"
+        name="q"
+        placeholder="Search"
+        aria-label="Search this repository"
+        data-unscoped-placeholder="Search GitHub"
+        data-scoped-placeholder="Search"
+        autocapitalize="off">
+    </label>
+</form></div>
+
+
+      <ul class="header-nav float-left" role="navigation">
+        <li class="header-nav-item">
+          <a href="/pulls" aria-label="Pull requests you created" class="js-selected-navigation-item header-nav-link" data-ga-click="Header, click, Nav menu - item:pulls context:user" data-hotkey="g p" data-selected-links="/pulls /pulls/assigned /pulls/mentioned /pulls">
+            Pull requests
+</a>        </li>
+        <li class="header-nav-item">
+          <a href="/issues" aria-label="Issues you created" class="js-selected-navigation-item header-nav-link" data-ga-click="Header, click, Nav menu - item:issues context:user" data-hotkey="g i" data-selected-links="/issues /issues/assigned /issues/mentioned /issues">
+            Issues
+</a>        </li>
+          <li class="header-nav-item">
+            <a class="header-nav-link" href="https://gist.github.com/" data-ga-click="Header, go to gist, text:gist">Gist</a>
+          </li>
+      </ul>
+
+    
+<ul class="header-nav user-nav float-right" id="user-links">
+  <li class="header-nav-item">
+    
+    <a href="/notifications" aria-label="You have no unread notifications" class="header-nav-link notification-indicator tooltipped tooltipped-s js-socket-channel js-notification-indicator" data-channel="tenant:1:notification-changed:207897" data-ga-click="Header, go to notifications, icon:read" data-hotkey="g n">
+        <span class="mail-status "></span>
+        <svg aria-hidden="true" class="octicon octicon-bell" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M14 12v1H0v-1l.73-.58c.77-.77.81-2.55 1.19-4.42C2.69 3.23 6 2 6 2c0-.55.45-1 1-1s1 .45 1 1c0 0 3.39 1.23 4.16 5 .38 1.88.42 3.66 1.19 4.42l.66.58H14zm-7 4c1.11 0 2-.89 2-2H5c0 1.11.89 2 2 2z"/></svg>
+</a>
+  </li>
+
+  <li class="header-nav-item dropdown js-menu-container">
+    <a class="header-nav-link tooltipped tooltipped-s js-menu-target" href="/new"
+       aria-label="Create new…"
+       data-ga-click="Header, create new, icon:add">
+      <svg aria-hidden="true" class="octicon octicon-plus float-left" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M12 9H7v5H5V9H0V7h5V2h2v5h5z"/></svg>
+      <span class="dropdown-caret"></span>
+    </a>
+
+    <div class="dropdown-menu-content js-menu-content">
+      <ul class="dropdown-menu dropdown-menu-sw">
+        
+<a class="dropdown-item" href="/new" data-ga-click="Header, create new repository">
+  New repository
+</a>
+
+  <a class="dropdown-item" href="/new/import" data-ga-click="Header, import a repository">
+    Import repository
+  </a>
+
+<a class="dropdown-item" href="https://gist.github.com/" data-ga-click="Header, create new gist">
+  New gist
+</a>
+
+  <a class="dropdown-item" href="/organizations/new" data-ga-click="Header, create new organization">
+    New organization
+  </a>
+
+
+
+  <div class="dropdown-divider"></div>
+  <div class="dropdown-header">
+    <span title="kc5nra/obs-studio-utils">This repository</span>
+  </div>
+    <a class="dropdown-item" href="/kc5nra/obs-studio-utils/issues/new" data-ga-click="Header, create new issue">
+      New issue
+    </a>
+
+      </ul>
+    </div>
+  </li>
+
+  <li class="header-nav-item dropdown js-menu-container">
+    <a class="header-nav-link name tooltipped tooltipped-sw js-menu-target" href="/DDRBoxman"
+       aria-label="View profile and more"
+       data-ga-click="Header, show menu, icon:avatar">
+      <img alt="@DDRBoxman" class="avatar" height="20" src="https://avatars3.githubusercontent.com/u/207897?v=3&amp;s=40" width="20" />
+      <span class="dropdown-caret"></span>
+    </a>
+
+    <div class="dropdown-menu-content js-menu-content">
+      <div class="dropdown-menu dropdown-menu-sw">
+        <div class="dropdown-header header-nav-current-user css-truncate">
+          Signed in as <strong class="css-truncate-target">DDRBoxman</strong>
+        </div>
+
+        <div class="dropdown-divider"></div>
+
+        <a class="dropdown-item" href="/DDRBoxman" data-ga-click="Header, go to profile, text:your profile">
+          Your profile
+        </a>
+        <a class="dropdown-item" href="/DDRBoxman?tab=stars" data-ga-click="Header, go to starred repos, text:your stars">
+          Your stars
+        </a>
+        <a class="dropdown-item" href="/explore" data-ga-click="Header, go to explore, text:explore">
+          Explore
+        </a>
+          <a class="dropdown-item" href="/integrations" data-ga-click="Header, go to integrations, text:integrations">
+            Integrations
+          </a>
+        <a class="dropdown-item" href="https://help.github.com" data-ga-click="Header, go to help, text:help">
+          Help
+        </a>
+
+        <div class="dropdown-divider"></div>
+
+        <a class="dropdown-item" href="/settings/profile" data-ga-click="Header, go to settings, icon:settings">
+          Settings
+        </a>
+
+        </option></form><form accept-charset="UTF-8" action="/logout" class="logout-form" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="authenticity_token" type="hidden" value="mbjQPqcKKO6Yuqt3Dvczikt53JctIh6E47+gkXyZ3vFinTikSLP4X/o4pVzB6UDZReamEALdVHKN3UNUxVdRFQ==" /></div>
+          <button type="submit" class="dropdown-item dropdown-signout" data-ga-click="Header, sign out, icon:logout">
+            Sign out
+          </button>
+</form>      </div>
+    </div>
+  </li>
+</ul>
+
+
+    
+  </div>
+</div>
+
+
+      
+
+
+    <div id="start-of-content" class="accessibility-aid"></div>
+
+      <div id="js-flash-container">
+</div>
+
+
+    <div role="main">
+        <div itemscope itemtype="http://schema.org/SoftwareSourceCode">
+    <div id="js-repo-pjax-container" data-pjax-container>
+      
+<div class="pagehead repohead instapaper_ignore readability-menu experiment-repo-nav">
+  <div class="container repohead-details-container">
+
+    
+
+<ul class="pagehead-actions">
+
+  <li>
+        </option></form><form accept-charset="UTF-8" action="/notifications/subscribe" class="js-social-container" data-autosubmit="true" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="authenticity_token" type="hidden" value="7woW5zqjJpvg5IbCp+Gf47Op+jJvsrXFlv5u5Cwuwg3CsPTT6eYZ7inxEYqPhx9rxluEnL+P7mYdgOYTMzC6HQ==" /></div>      <input class="form-control" id="repository_id" name="repository_id" type="hidden" value="24656398" />
+
+        <div class="select-menu js-menu-container js-select-menu">
+          <a href="/kc5nra/obs-studio-utils/subscription"
+            class="btn btn-sm btn-with-count select-menu-button js-menu-target" role="button" tabindex="0" aria-haspopup="true"
+            data-ga-click="Repository, click Watch settings, action:blob#show">
+            <span class="js-select-button">
+              <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
+              Watch
+            </span>
+          </a>
+          <a class="social-count js-social-count"
+            href="/kc5nra/obs-studio-utils/watchers"
+            aria-label="6 users are watching this repository">
+            6
+          </a>
+
+        <div class="select-menu-modal-holder">
+          <div class="select-menu-modal subscription-menu-modal js-menu-content" aria-hidden="true">
+            <div class="select-menu-header js-navigation-enable" tabindex="-1">
+              <svg aria-label="Close" class="octicon octicon-x js-menu-close" height="16" role="img" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+              <span class="select-menu-title">Notifications</span>
+            </div>
+
+              <div class="select-menu-list js-navigation-container" role="menu">
+
+                <div class="select-menu-item js-navigation-item selected" role="menuitem" tabindex="0">
+                  <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"/></svg>
+                  <div class="select-menu-item-text">
+                    <input checked="checked" id="do_included" name="do" type="radio" value="included" />
+                    <span class="select-menu-item-heading">Not watching</span>
+                    <span class="description">Be notified when participating or @mentioned.</span>
+                    <span class="js-select-button-text hidden-select-button-text">
+                      <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
+                      Watch
+                    </span>
+                  </div>
+                </div>
+
+                <div class="select-menu-item js-navigation-item " role="menuitem" tabindex="0">
+                  <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"/></svg>
+                  <div class="select-menu-item-text">
+                    <input id="do_subscribed" name="do" type="radio" value="subscribed" />
+                    <span class="select-menu-item-heading">Watching</span>
+                    <span class="description">Be notified of all conversations.</span>
+                    <span class="js-select-button-text hidden-select-button-text">
+                      <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
+                      Unwatch
+                    </span>
+                  </div>
+                </div>
+
+                <div class="select-menu-item js-navigation-item " role="menuitem" tabindex="0">
+                  <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"/></svg>
+                  <div class="select-menu-item-text">
+                    <input id="do_ignore" name="do" type="radio" value="ignore" />
+                    <span class="select-menu-item-heading">Ignoring</span>
+                    <span class="description">Never be notified.</span>
+                    <span class="js-select-button-text hidden-select-button-text">
+                      <svg aria-hidden="true" class="octicon octicon-mute" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8 2.81v10.38c0 .67-.81 1-1.28.53L3 10H1c-.55 0-1-.45-1-1V7c0-.55.45-1 1-1h2l3.72-3.72C7.19 1.81 8 2.14 8 2.81zm7.53 3.22l-1.06-1.06-1.97 1.97-1.97-1.97-1.06 1.06L11.44 8 9.47 9.97l1.06 1.06 1.97-1.97 1.97 1.97 1.06-1.06L13.56 8l1.97-1.97z"/></svg>
+                      Stop ignoring
+                    </span>
+                  </div>
+                </div>
+
+              </div>
+
+            </div>
+          </div>
+        </div>
+</form>
+  </li>
+
+  <li>
+      <div class="js-toggler-container js-social-container starring-container ">
+    </option></form><form accept-charset="UTF-8" action="/kc5nra/obs-studio-utils/unstar" class="starred" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="authenticity_token" type="hidden" value="uNPwxvmyPhwAsjUibCbKxZPg+6FNyS0wqv8HPlluJPjUflJmxafLWYbN3BQrvfH8Lc0ZHtLc/rWvAedO7AIezw==" /></div>
+      <button
+        type="submit"
+        class="btn btn-sm btn-with-count js-toggler-target"
+        aria-label="Unstar this repository" title="Unstar kc5nra/obs-studio-utils"
+        data-ga-click="Repository, click unstar button, action:blob#show; text:Unstar">
+        <svg aria-hidden="true" class="octicon octicon-star" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74z"/></svg>
+        Unstar
+      </button>
+        <a class="social-count js-social-count" href="/kc5nra/obs-studio-utils/stargazers"
+           aria-label="8 users starred this repository">
+          8
+        </a>
+</form>
+    </option></form><form accept-charset="UTF-8" action="/kc5nra/obs-studio-utils/star" class="unstarred" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="authenticity_token" type="hidden" value="/sSbA/aj/l81g7HuzKrbvT/fZClJWTOY1T6jjNOGbTpB0vtZBytYMlHPt25VUZnhDcnvUHq56bYpHx4cSnYfgA==" /></div>
+      <button
+        type="submit"
+        class="btn btn-sm btn-with-count js-toggler-target"
+        aria-label="Star this repository" title="Star kc5nra/obs-studio-utils"
+        data-ga-click="Repository, click star button, action:blob#show; text:Star">
+        <svg aria-hidden="true" class="octicon octicon-star" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74z"/></svg>
+        Star
+      </button>
+        <a class="social-count js-social-count" href="/kc5nra/obs-studio-utils/stargazers"
+           aria-label="8 users starred this repository">
+          8
+        </a>
+</form>  </div>
+
+  </li>
+
+  <li>
+          <a href="#fork-destination-box" class="btn btn-sm btn-with-count"
+              title="Fork your own copy of kc5nra/obs-studio-utils to your account"
+              aria-label="Fork your own copy of kc5nra/obs-studio-utils to your account"
+              rel="facebox"
+              data-ga-click="Repository, show fork modal, action:blob#show; text:Fork">
+              <svg aria-hidden="true" class="octicon octicon-repo-forked" height="16" version="1.1" viewBox="0 0 10 16" width="10"><path fill-rule="evenodd" d="M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
+            Fork
+          </a>
+
+          <div id="fork-destination-box" style="display: none;">
+            <h2 class="facebox-header" data-facebox-id="facebox-header">Where should we fork this repository?</h2>
+            <include-fragment src=""
+                class="js-fork-select-fragment fork-select-fragment"
+                data-url="/kc5nra/obs-studio-utils/fork?fragment=1">
+              <img alt="Loading" height="64" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-128.gif" width="64" />
+            </include-fragment>
+          </div>
+
+    <a href="/kc5nra/obs-studio-utils/network" class="social-count"
+       aria-label="4 users forked this repository">
+      4
+    </a>
+  </li>
+</ul>
+
+    <h1 class="public ">
+  <svg aria-hidden="true" class="octicon octicon-repo" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M4 9H3V8h1v1zm0-3H3v1h1V6zm0-2H3v1h1V4zm0-2H3v1h1V2zm8-1v12c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1zm-1 10H1v2h2v-1h3v1h5v-2zm0-10H2v9h9V1z"/></svg>
+  <span class="author" itemprop="author"><a href="/kc5nra" class="url fn" rel="author">kc5nra</a></span><span class="path-divider">/</span><strong itemprop="name"><a href="/kc5nra/obs-studio-utils" data-pjax="#js-repo-pjax-container">obs-studio-utils</a></strong>
+
+</h1>
+
+  </div>
+  <div class="container">
+    
+<nav class="reponav js-repo-nav js-sidenav-container-pjax"
+     itemscope
+     itemtype="http://schema.org/BreadcrumbList"
+     role="navigation"
+     data-pjax="#js-repo-pjax-container">
+
+  <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
+    <a href="/kc5nra/obs-studio-utils" class="js-selected-navigation-item selected reponav-item" data-hotkey="g c" data-selected-links="repo_source repo_downloads repo_commits repo_releases repo_tags repo_branches /kc5nra/obs-studio-utils" itemprop="url">
+      <svg aria-hidden="true" class="octicon octicon-code" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg>
+      <span itemprop="name">Code</span>
+      <meta itemprop="position" content="1">
+</a>  </span>
+
+    <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
+      <a href="/kc5nra/obs-studio-utils/issues" class="js-selected-navigation-item reponav-item" data-hotkey="g i" data-selected-links="repo_issues repo_labels repo_milestones /kc5nra/obs-studio-utils/issues" itemprop="url">
+        <svg aria-hidden="true" class="octicon octicon-issue-opened" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"/></svg>
+        <span itemprop="name">Issues</span>
+        <span class="counter">1</span>
+        <meta itemprop="position" content="2">
+</a>    </span>
+
+  <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
+    <a href="/kc5nra/obs-studio-utils/pulls" class="js-selected-navigation-item reponav-item" data-hotkey="g p" data-selected-links="repo_pulls /kc5nra/obs-studio-utils/pulls" itemprop="url">
+      <svg aria-hidden="true" class="octicon octicon-git-pull-request" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
+      <span itemprop="name">Pull requests</span>
+      <span class="counter">0</span>
+      <meta itemprop="position" content="3">
+</a>  </span>
+
+  <a href="/kc5nra/obs-studio-utils/projects" class="js-selected-navigation-item reponav-item" data-selected-links="repo_projects new_repo_project repo_project /kc5nra/obs-studio-utils/projects">
+    <svg aria-hidden="true" class="octicon octicon-project" height="16" version="1.1" viewBox="0 0 15 16" width="15"><path fill-rule="evenodd" d="M10 12h3V2h-3v10zm-4-2h3V2H6v8zm-4 4h3V2H2v12zm-1 1h13V1H1v14zM14 0H1a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h13a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1z"/></svg>
+    Projects
+    <span class="counter">0</span>
+</a>
+    <a href="/kc5nra/obs-studio-utils/wiki" class="js-selected-navigation-item reponav-item" data-hotkey="g w" data-selected-links="repo_wiki /kc5nra/obs-studio-utils/wiki">
+      <svg aria-hidden="true" class="octicon octicon-book" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z"/></svg>
+      Wiki
+</a>
+
+  <a href="/kc5nra/obs-studio-utils/pulse" class="js-selected-navigation-item reponav-item" data-selected-links="pulse /kc5nra/obs-studio-utils/pulse">
+    <svg aria-hidden="true" class="octicon octicon-pulse" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M11.5 8L8.8 5.4 6.6 8.5 5.5 1.6 2.38 8H0v2h3.6l.9-1.8.9 5.4L9 8.5l1.6 1.5H14V8z"/></svg>
+    Pulse
+</a>
+  <a href="/kc5nra/obs-studio-utils/graphs" class="js-selected-navigation-item reponav-item" data-selected-links="repo_graphs repo_contributors /kc5nra/obs-studio-utils/graphs">
+    <svg aria-hidden="true" class="octicon octicon-graph" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M16 14v1H0V0h1v14h15zM5 13H3V8h2v5zm4 0H7V3h2v10zm4 0h-2V6h2v7z"/></svg>
+    Graphs
+</a>
+
+</nav>
+
+  </div>
+</div>
+
+<div class="container new-discussion-timeline experiment-repo-nav">
+  <div class="repository-content">
+
+    
+
+<a href="/kc5nra/obs-studio-utils/blob/b3ffed1c23a254e44d3dcdd2af3f9b13f63d7939/install/osx/obs.png" class="d-none js-permalink-shortcut" data-hotkey="y">Permalink</a>
+
+
+
+<div class="file-navigation js-zeroclipboard-container">
+  
+<div class="select-menu branch-select-menu js-menu-container js-select-menu float-left">
+  <button class="btn btn-sm select-menu-button js-menu-target css-truncate" data-hotkey="w"
+    
+    type="button" aria-label="Switch branches or tags" tabindex="0" aria-haspopup="true">
+    <i>Branch:</i>
+    <span class="js-select-button css-truncate-target">master</span>
+  </button>
+
+  <div class="select-menu-modal-holder js-menu-content js-navigation-container" data-pjax aria-hidden="true">
+
+    <div class="select-menu-modal">
+      <div class="select-menu-header">
+        <svg aria-label="Close" class="octicon octicon-x js-menu-close" height="16" role="img" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+        <span class="select-menu-title">Switch branches/tags</span>
+      </div>
+
+      <div class="select-menu-filters">
+        <div class="select-menu-text-filter">
+          <input type="text" aria-label="Filter branches/tags" id="context-commitish-filter-field" class="form-control js-filterable-field js-navigation-enable" placeholder="Filter branches/tags">
+        </div>
+        <div class="select-menu-tabs">
+          <ul>
+            <li class="select-menu-tab">
+              <a href="#" data-tab-filter="branches" data-filter-placeholder="Filter branches/tags" class="js-select-menu-tab" role="tab">Branches</a>
+            </li>
+            <li class="select-menu-tab">
+              <a href="#" data-tab-filter="tags" data-filter-placeholder="Find a tag…" class="js-select-menu-tab" role="tab">Tags</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="branches" role="menu">
+
+        <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring">
+
+
+            <a class="select-menu-item js-navigation-item js-navigation-open selected"
+               href="/kc5nra/obs-studio-utils/blob/master/install/osx/obs.png"
+               data-name="master"
+               data-skip-pjax="true"
+               rel="nofollow">
+              <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"/></svg>
+              <span class="select-menu-item-text css-truncate-target js-select-menu-filter-text">
+                master
+              </span>
+            </a>
+        </div>
+
+          <div class="select-menu-no-results">Nothing to show</div>
+      </div>
+
+      <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="tags">
+        <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring">
+
+
+        </div>
+
+        <div class="select-menu-no-results">Nothing to show</div>
+      </div>
+
+    </div>
+  </div>
+</div>
+
+  <div class="BtnGroup float-right">
+    <a href="/kc5nra/obs-studio-utils/find/master"
+          class="js-pjax-capture-input btn btn-sm BtnGroup-item"
+          data-pjax
+          data-hotkey="t">
+      Find file
+    </a>
+    <button aria-label="Copy file path to clipboard" class="js-zeroclipboard btn btn-sm BtnGroup-item tooltipped tooltipped-s" data-copied-hint="Copied!" type="button">Copy path</button>
+  </div>
+  <div class="breadcrumb js-zeroclipboard-target">
+    <span class="repo-root js-repo-root"><span class="js-path-segment"><a href="/kc5nra/obs-studio-utils"><span>obs-studio-utils</span></a></span></span><span class="separator">/</span><span class="js-path-segment"><a href="/kc5nra/obs-studio-utils/tree/master/install"><span>install</span></a></span><span class="separator">/</span><span class="js-path-segment"><a href="/kc5nra/obs-studio-utils/tree/master/install/osx"><span>osx</span></a></span><span class="separator">/</span><strong class="final-path">obs.png</strong>
+  </div>
+</div>
+
+
+  <div class="commit-tease">
+      <span class="float-right">
+        <a class="commit-tease-sha" href="/kc5nra/obs-studio-utils/commit/b83a806a64ffd96f547029d64ed28aad49e20d5b" data-pjax>
+          b83a806
+        </a>
+        <relative-time datetime="2014-10-01T22:46:15Z">Oct 1, 2014</relative-time>
+      </span>
+      <div>
+        <img alt="@kc5nra" class="avatar" height="20" src="https://avatars3.githubusercontent.com/u/231018?v=3&amp;s=40" width="20" />
+        <a href="/kc5nra" class="user-mention" rel="author">kc5nra</a>
+          <a href="/kc5nra/obs-studio-utils/commit/b83a806a64ffd96f547029d64ed28aad49e20d5b" class="message" data-pjax="true" title="Png more transparent, obs bundle id and img loc">Png more transparent, obs bundle id and img loc</a>
+      </div>
+
+    <div class="commit-tease-contributors">
+      <button type="button" class="btn-link muted-link contributors-toggle" data-facebox="#blob_contributors_box">
+        <strong>1</strong>
+         contributor
+      </button>
+      
+    </div>
+
+    <div id="blob_contributors_box" style="display:none">
+      <h2 class="facebox-header" data-facebox-id="facebox-header">Users who have contributed to this file</h2>
+      <ul class="facebox-user-list" data-facebox-id="facebox-description">
+          <li class="facebox-user-list-item">
+            <img alt="@kc5nra" height="24" src="https://avatars1.githubusercontent.com/u/231018?v=3&amp;s=48" width="24" />
+            <a href="/kc5nra">kc5nra</a>
+          </li>
+      </ul>
+    </div>
+  </div>
+
+
+<div class="file">
+  <div class="file-header">
+  <div class="file-actions">
+
+    <div class="BtnGroup">
+      <a href="/kc5nra/obs-studio-utils/raw/master/install/osx/obs.png" class="btn btn-sm BtnGroup-item" id="raw-url">Download</a>
+      <a href="/kc5nra/obs-studio-utils/commits/master/install/osx/obs.png" class="btn btn-sm BtnGroup-item" rel="nofollow">History</a>
+    </div>
+
+        <a class="btn-octicon tooltipped tooltipped-nw"
+           href="github-mac://openRepo/https://github.com/kc5nra/obs-studio-utils?branch=master&amp;filepath=install%2Fosx%2Fobs.png"
+           aria-label="Open this file in GitHub Desktop"
+           data-ga-click="Repository, open with desktop, type:mac">
+            <svg aria-hidden="true" class="octicon octicon-device-desktop" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M15 2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 9H1V3h14v8z"/></svg>
+        </a>
+
+        </option></form><form accept-charset="UTF-8" action="/kc5nra/obs-studio-utils/delete/master/install/osx/obs.png" class="inline-form" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="authenticity_token" type="hidden" value="uGzTDUGxcZBqCvnvwWvHWxzog35RyhtwqPCf9WmjMskKj0JcMzGgzzfI9Vg2tnJjAjFGp9psbMbIg54+M9+7/A==" /></div>
+          <button class="btn-octicon btn-octicon-danger tooltipped tooltipped-nw" type="submit"
+            aria-label="Delete the file in your fork of this project" data-disable-with>
+            <svg aria-hidden="true" class="octicon octicon-trashcan" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"/></svg>
+          </button>
+</form>  </div>
+
+  <div class="file-info">
+    52.8 KB
+  </div>
+</div>
+
+  
+
+  <div itemprop="text" class="blob-wrapper data type-text">
+      <div class="image">
+          <span class="border-wrap"><img src="/kc5nra/obs-studio-utils/blob/master/install/osx/obs.png?raw=true" alt="obs.png"></span>
+      </div>
+  </div>
+
+</div>
+
+<button type="button" data-facebox="#jump-to-line" data-facebox-class="linejump" data-hotkey="l" class="d-none">Jump to Line</button>
+<div id="jump-to-line" style="display:none">
+  </option></form><form accept-charset="UTF-8" action="" class="js-jump-to-line-form" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>
+    <input class="form-control linejump-input js-jump-to-line-field" type="text" placeholder="Jump to line&hellip;" aria-label="Jump to line" autofocus>
+    <button type="submit" class="btn">Go</button>
+</form></div>
+
+  </div>
+  <div class="modal-backdrop js-touch-events"></div>
+</div>
+
+
+    </div>
+  </div>
+
+    </div>
+
+        <div class="container site-footer-container">
+  <div class="site-footer" role="contentinfo">
+    <ul class="site-footer-links float-right">
+        <li><a href="https://github.com/contact" data-ga-click="Footer, go to contact, text:contact">Contact GitHub</a></li>
+      <li><a href="https://developer.github.com" data-ga-click="Footer, go to api, text:api">API</a></li>
+      <li><a href="https://training.github.com" data-ga-click="Footer, go to training, text:training">Training</a></li>
+      <li><a href="https://shop.github.com" data-ga-click="Footer, go to shop, text:shop">Shop</a></li>
+        <li><a href="https://github.com/blog" data-ga-click="Footer, go to blog, text:blog">Blog</a></li>
+        <li><a href="https://github.com/about" data-ga-click="Footer, go to about, text:about">About</a></li>
+
+    </ul>
+
+    <a href="https://github.com" aria-label="Homepage" class="site-footer-mark" title="GitHub">
+      <svg aria-hidden="true" class="octicon octicon-mark-github" height="24" version="1.1" viewBox="0 0 16 16" width="24"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
+</a>
+    <ul class="site-footer-links">
+      <li>&copy; 2017 <span title="0.13223s from github-fe143-cp1-prd.iad.github.net">GitHub</span>, Inc.</li>
+        <li><a href="https://github.com/site/terms" data-ga-click="Footer, go to terms, text:terms">Terms</a></li>
+        <li><a href="https://github.com/site/privacy" data-ga-click="Footer, go to privacy, text:privacy">Privacy</a></li>
+        <li><a href="https://github.com/security" data-ga-click="Footer, go to security, text:security">Security</a></li>
+        <li><a href="https://status.github.com/" data-ga-click="Footer, go to status, text:status">Status</a></li>
+        <li><a href="https://help.github.com" data-ga-click="Footer, go to help, text:help">Help</a></li>
+    </ul>
+  </div>
+</div>
+
+
+
+    
+
+    <div id="ajax-error-message" class="ajax-error-message flash flash-error">
+      <svg aria-hidden="true" class="octicon octicon-alert" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.865 1.52c-.18-.31-.51-.5-.87-.5s-.69.19-.87.5L.275 13.5c-.18.31-.18.69 0 1 .19.31.52.5.87.5h13.7c.36 0 .69-.19.86-.5.17-.31.18-.69.01-1L8.865 1.52zM8.995 13h-2v-2h2v2zm0-3h-2V6h2v4z"/></svg>
+      <button type="button" class="flash-close js-flash-close js-ajax-error-dismiss" aria-label="Dismiss error">
+        <svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+      </button>
+      You can't perform that action at this time.
+    </div>
+
+
+      
+      <script crossorigin="anonymous" integrity="sha256-uzmufYSNQNbwHmc1XigpZPVPo5E3wOzJ/E7Dfn1GlQg=" src="https://assets-cdn.github.com/assets/frameworks-bb39ae7d848d40d6f01e67355e282964f54fa39137c0ecc9fc4ec37e7d469508.js"></script>
+      <script async="async" crossorigin="anonymous" integrity="sha256-/48DIbQkaCd8FbKJGEm8s5jOpo2/L4j5LZ+RY+umtSU=" src="https://assets-cdn.github.com/assets/github-ff8f0321b42468277c15b2891849bcb398cea68dbf2f88f92d9f9163eba6b525.js"></script>
+      
+      
+      
+      
+    <div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner d-none">
+      <svg aria-hidden="true" class="octicon octicon-alert" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.865 1.52c-.18-.31-.51-.5-.87-.5s-.69.19-.87.5L.275 13.5c-.18.31-.18.69 0 1 .19.31.52.5.87.5h13.7c.36 0 .69-.19.86-.5.17-.31.18-.69.01-1L8.865 1.52zM8.995 13h-2v-2h2v2zm0-3h-2V6h2v4z"/></svg>
+      <span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span>
+      <span class="signed-out-tab-flash">You signed out in another tab or window. <a href="">Reload</a> to refresh your session.</span>
+    </div>
+    <div class="facebox" id="facebox" style="display:none;">
+  <div class="facebox-popup">
+    <div class="facebox-content" role="dialog" aria-labelledby="facebox-header" aria-describedby="facebox-description">
+    </div>
+    <button type="button" class="facebox-close js-facebox-close" aria-label="Close modal">
+      <svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+    </button>
+  </div>
+</div>
+
+  </body>
+</html>
+

obs-studio-17.0.1.tar.xz/CI/install/osx/package_util.py Added

@@ -0,0 +1,94 @@
+def cmd(cmd):
+    import subprocess
+    import shlex
+    return subprocess.check_output(shlex.split(cmd)).rstrip('\r\n')
+
+def get_tag_info(tag):
+    rev = cmd('git rev-parse {0}'.format(latest_tag))
+    anno = cmd('git cat-file -p {0}'.format(rev))
+    tag_info = []
+    for i, v in enumerate(anno.splitlines()):
+        if i <= 4:
+            continue
+        tag_info.append(v.lstrip())
+
+    return tag_info
+
+def gen_html(github_user, latest_tag):
+
+    url = 'https://github.com/{0}/obs-studio/commit/%H'.format(github_user)
+
+    with open('readme.html', 'w') as f:
+        f.write("<html><body>")
+        log_cmd = """git log {0}...HEAD --pretty=format:'<li>&bull; <a href="{1}">(view)</a> %s</li>'"""
+        log_res = cmd(log_cmd.format(latest_tag, url))
+        if len(log_res.splitlines()):
+            f.write('<p>Changes since {0}: (Newest to oldest)</p>'.format(latest_tag))
+            f.write(log_res)
+
+        ul = False
+        f.write('<p>')
+        import re
+
+        for l in get_tag_info(latest_tag):
+            if not len(l):
+                continue
+            if l.startswith('*'):
+                ul = True
+                if not ul:
+                    f.write('<ul>')
+                f.write('<li>&bull; {0}</li>'.format(re.sub(r'^(\s*)?[*](\s*)?', '', l)))
+            else:
+                if ul:
+                    f.write('</ul><p/>')
+                ul = False
+                f.write('<p>{0}</p>'.format(l))
+        if ul:
+            f.write('</ul>')
+        f.write('</p></body></html>')
+
+    cmd('textutil -convert rtf readme.html -output readme.rtf')
+    cmd("""sed -i '' 's/Times-Roman/Verdana/g' readme.rtf""")
+
+def save_manifest(latest_tag, user, jenkins_build, branch, stable):
+    log = cmd('git log --pretty=oneline {0}...HEAD'.format(latest_tag))
+    manifest = {}
+    manifest['commits'] = []
+    for v in log.splitlines():
+        manifest['commits'].append(v)
+    manifest['tag'] = {
+        'name': latest_tag,
+        'description': get_tag_info(latest_tag)
+    }
+
+    manifest['version'] = cmd('git rev-list HEAD --count')
+    manifest['sha1'] = cmd('git rev-parse HEAD')
+    manifest['jenkins_build'] = jenkins_build
+
+    manifest['user'] = user
+    manifest['branch'] = branch
+    manifest['stable'] = stable
+
+    import cPickle
+    with open('manifest', 'w') as f:
+        cPickle.dump(manifest, f)
+
+def prepare_pkg(project, package_id):
+    cmd('packagesutil --file "{0}" set package-1 identifier {1}'.format(project, package_id))
+    cmd('packagesutil --file "{0}" set package-1 version {1}'.format(project, '1.0'))
+
+
+import argparse
+parser = argparse.ArgumentParser(description='obs-studio package util')
+parser.add_argument('-u', '--user', dest='user', default='jp9000')
+parser.add_argument('-p', '--package-id', dest='package_id', default='org.obsproject.pkg.obs-studio')
+parser.add_argument('-f', '--project-file', dest='project', default='OBS.pkgproj')
+parser.add_argument('-j', '--jenkins-build', dest='jenkins_build', default='0')
+parser.add_argument('-b', '--branch', dest='branch', default='master')
+parser.add_argument('-s', '--stable', dest='stable', required=False, action='store_true', default=False)
+args = parser.parse_args()
+
+latest_tag = cmd('git describe --tags --abbrev=0')
+gen_html(args.user, latest_tag)
+prepare_pkg(args.project, args.package_id)
+save_manifest(latest_tag, args.user, args.jenkins_build, args.branch, args.stable)

obs-studio-17.0.1.tar.xz/CI/util Added

obs-studio-17.0.1.tar.xz/CI/util/build-package-deps-osx.sh Added

@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+
+CURDIR=$(pwd)
+
+# the temp directory
+WORK_DIR=`mktemp -d`
+
+# deletes the temp directory
+function cleanup {
+  #rm -rf "$WORK_DIR"
+  echo "Deleted temp working directory $WORK_DIR"
+}
+
+# register the cleanup function to be called on the EXIT signal
+trap cleanup EXIT
+
+cd $WORK_DIR
+
+DEPS_DEST=$WORK_DIR/obsdeps
+
+# make dest dirs
+mkdir $DEPS_DEST
+mkdir $DEPS_DEST/bin
+mkdir $DEPS_DEST/include
+
+# OSX COMPAT
+export MACOSX_DEPLOYMENT_TARGET=10.9
+
+# If you need an olders SDK and Xcode won't give it to you
+# https://github.com/phracker/MacOSX-SDKs
+
+# libopus
+curl -L -O http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz
+tar -xf opus-1.1.3.tar.gz
+cd ./opus-1.1.3
+mkdir build
+cd ./build
+../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
+make -j 12
+make install
+
+cd $WORK_DIR
+
+# libogg
+curl -L -O http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
+tar -xf libogg-1.3.2.tar.gz
+cd ./libogg-1.3.2
+mkdir build
+cd ./build
+../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
+make -j 12
+make install
+
+cd $WORK_DIR
+
+# libvorbis
+curl -L -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
+tar -xf libvorbis-1.3.5.tar.gz
+cd ./libvorbis-1.3.5
+mkdir build
+cd ./build
+../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
+make -j 12
+make install
+
+cd $WORK_DIR
+
+# libvpx
+curl -L -O http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.0.tar.bz2
+tar -xf libvpx-1.6.0.tar.bz2
+cd ./libvpx-1.6.0
+mkdir build
+cd ./build
+../configure --disable-shared --libdir="/tmp/obsdeps/bin"
+make -j 12
+make install
+
+cd $WORK_DIR
+
+# x264
+git clone git://git.videolan.org/x264.git
+cd ./x264
+mkdir build
+cd ./build
+../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-static --prefix="/tmp/obsdeps"
+make -j 12
+make install
+../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --libdir="/tmp/obsdeps/bin" --prefix="/tmp/obsdeps"
+make -j 12
+ln -f -s libx264.*.dylib libx264.dylib
+find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
+rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/
+rsync -avh --include="*/" --include="*.h" --exclude="*" ./* $DEPS_DEST/include/
+
+cd $WORK_DIR
+
+# janson
+curl -L -O http://www.digip.org/jansson/releases/jansson-2.9.tar.gz
+tar -xf jansson-2.9.tar.gz
+cd jansson-2.9
+mkdir build
+cd ./build
+../configure --libdir="/tmp/obsdeps/bin" --enable-shared --disable-static
+make -j 12
+find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
+rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/
+rsync -avh --include="*/" --include="*.h" --exclude="*" ./* $DEPS_DEST/include/
+
+cd $WORK_DIR
+
+export LDFLAGS="-L/tmp/obsdeps/lib"
+export CFLAGS="-I/tmp/obsdeps/include"
+
+# FFMPEG
+curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n3.2.2.zip
+unzip ./n3.2.2.zip
+cd ./FFmpeg-n3.2.2
+mkdir build
+cd ./build
+../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx
+make -j 12
+find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
+rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/
+rsync -avh --include="*/" --include="*.h" --exclude="*" ./* $DEPS_DEST/include/
+
+cd $WORK_DIR
+
+tar -czf osx-deps.tar.gz obsdeps
+
+cp ./osx-deps.tar.gz $CURDIR
\ No newline at end of file

obs-studio-17.0.1.tar.xz/CI/util/win32.sh Added

@@ -0,0 +1,69 @@
+#/bin/bash
+
+cd x264
+make clean
+LDFLAGS="-static-libgcc" ./configure --enable-shared --enable-win32thread --disable-avs --disable-ffms --disable-gpac --disable-interlaced --disable-lavf --cross-prefix=i686-w64-mingw32- --host=i686-pc-mingw32 --prefix="/home/jim/packages/win32"
+make -j6 fprofiled VIDS="CITY_704x576_60_orig_01.yuv"
+make install
+i686-w64-mingw32-dlltool -z /home/jim/packages/win32/bin/x264.orig.def --export-all-symbols /home/jim/packages/win32/bin/libx264-148.dll
+grep "EXPORTS\|x264" /home/jim/packages/win32/bin/x264.orig.def > /home/jim/packages/win32/bin/x264.def
+rm -f /home/jim/packages/win32/bin/x264.org.def
+sed -i -e "/\\t.*DATA/d" -e "/\\t\".*/d" -e "s/\s@.*//" /home/jim/packages/win32/bin/x264.def
+i686-w64-mingw32-dlltool -m i386 -d /home/jim/packages/win32/bin/x264.def -l /home/jim/packages/win32/bin/x264.lib -D /home/jim/win32/packages/bin/libx264-148.dll
+cd ..
+
+cd opus
+make clean
+LDFLAGS="-static-libgcc" ./configure -host=i686-w64-mingw32 --prefix="/home/jim/packages/win32" --enable-shared
+make -j6
+make install
+cd ..
+
+cd zlib/build32
+make clean
+cmake .. -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc -DCMAKE_INSTALL_PREFIX=/home/jim/packages/win32 -DINSTALL_PKGCONFIG_DIR=/home/jim/packages/win32/lib/pkgconfig -DCMAKE_RC_COMPILER=i686-w64-mingw32-windres -DCMAKE_SHARED_LINKER_FLAGS="-static-libgcc"
+make -j6
+make install
+mv ../../win32/lib/libzlib.dll.a ../../win32/lib/libz.dll.a
+mv ../../win32/lib/libzlibstatic.a ../../win32/lib/libz.a
+cp ../win32/zlib.def /home/jim/packages/win32/bin
+i686-w64-mingw32-dlltool -m i386 -d ../win32/zlib.def -l /home/jim/packages/win32/bin/zlib.lib -D /home/jim/win32/packages/bin/zlib.dll
+cd ../..
+
+cd libpng
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win32/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win32/lib -static-libgcc" CPPFLAGS="-I/home/jim/packages/win32/include" ./configure -host=i686-w64-mingw32 --prefix="/home/jim/packages/win32" --enable-shared
+make -j6
+make install
+cd ..
+
+cd libogg
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win32/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win32/lib -static-libgcc" CPPFLAGS="-I/home/jim/packages/win32/include" ./configure -host=i686-w64-mingw32 --prefix="/home/jim/packages/win32" --enable-shared
+make -j6
+make install
+cd ..
+
+cd libvorbis
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win32/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win32/lib -static-libgcc" CPPFLAGS="-I/home/jim/packages/win32/include" ./configure -host=i686-w64-mingw32 --prefix="/home/jim/packages/win32" --enable-shared --with-ogg="/home/jim/packages/win32"
+make -j6
+make install
+cd ..
+
+cd libvpxbuild
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win32/lib/pkgconfig" CROSS=i686-w64-mingw32- LDFLAGS="-static-libgcc" ../libvpx/configure --prefix=/home/jim/packages/win32 --enable-vp8 --enable-vp9 --disable-docs --disable-examples --enable-shared --disable-static --enable-runtime-cpu-detect --enable-realtime-only --disable-install-bins --disable-install-docs --disable-unit-tests --target=x86-win32-gcc
+make -j6
+make install
+i686-w64-mingw32-dlltool -m i386 -d libvpx.def -l /home/jim/packages/win32/bin/vpx.lib -D /home/jim/win32/packages/bin/libvpx-1.dll
+cd ..
+
+cd ffmpeg
+make clean
+cp /media/sf_linux/nvEncodeAPI.h /home/jim/packages/win32/include
+PKG_CONFIG_PATH="/home/jim/packages/win32/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win32/lib -static-libgcc" CFLAGS="-I/home/jim/packages/win32/include" ./configure --enable-memalign-hack --enable-gpl --disable-programs --disable-doc --arch=x86 --enable-shared --enable-nvenc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-debug --cross-prefix=i686-w64-mingw32- --target-os=mingw32 --pkg-config=pkg-config --prefix="/home/jim/packages/win32" --disable-postproc
+read -n1 -r -p "Press any key to continue building FFmpeg..." key
+make -j6
+make install
+cd ..

obs-studio-17.0.1.tar.xz/CI/util/win64.sh Added

@@ -0,0 +1,69 @@
+#/bin/bash
+
+cd x264
+make clean
+LDFLAGS="-static-libgcc" ./configure --enable-shared --enable-win32thread --disable-avs --disable-ffms --disable-gpac --disable-interlaced --disable-lavf --cross-prefix=x86_64-w64-mingw32- --host=x86_64-pc-mingw32 --prefix="/home/jim/packages/win64"
+make -j6 fprofiled VIDS="CITY_704x576_60_orig_01.yuv"
+make install
+x86_64-w64-mingw32-dlltool -z /home/jim/packages/win64/bin/x264.orig.def --export-all-symbols /home/jim/packages/win64/bin/libx264-148.dll
+grep "EXPORTS\|x264" /home/jim/packages/win64/bin/x264.orig.def > /home/jim/packages/win64/bin/x264.def
+rm -f /home/jim/packages/win64/bin/x264.org.def
+sed -i -e "/\\t.*DATA/d" -e "/\\t\".*/d" -e "s/\s@.*//" /home/jim/packages/win64/bin/x264.def
+x86_64-w64-mingw32-dlltool -m i386:x86-64 -d /home/jim/packages/win64/bin/x264.def -l /home/jim/packages/win64/bin/x264.lib -D /home/jim/win64/packages/bin/libx264-148.dll
+cd ..
+
+cd opus
+make clean
+LDFLAGS="-static-libgcc" ./configure -host=x86_64-w64-mingw32 --prefix="/home/jim/packages/win64" --enable-shared
+make -j6
+make install
+cd ..
+
+cd zlib/build64
+make clean
+cmake .. -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_INSTALL_PREFIX=/home/jim/packages/win64 -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres -DCMAKE_SHARED_LINKER_FLAGS="-static-libgcc"
+make -j6
+make install
+mv ../../win64/lib/libzlib.dll.a ../../win64/lib/libz.dll.a
+mv ../../win64/lib/libzlibstatic.a ../../win64/lib/libz.a
+cp ../win64/zlib.def /home/jim/packages/win64/bin
+x86_64-w64-mingw32-dlltool -m i386:x86-64 -d ../win32/zlib.def -l /home/jim/packages/win64/bin/zlib.lib -D /home/jim/win64/packages/bin/zlib.dll
+cd ../..
+
+cd libpng
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win64/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win64/lib" CPPFLAGS="-I/home/jim/packages/win64/include" ./configure -host=x86_64-w64-mingw32 --prefix="/home/jim/packages/win64" --enable-shared
+make -j6
+make install
+cd ..
+
+cd libogg
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win64/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win64/lib -static-libgcc" CPPFLAGS="-I/home/jim/packages/win64/include" ./configure -host=x86_64-w64-mingw32 --prefix="/home/jim/packages/win64" --enable-shared
+make -j6
+make install
+cd ..
+
+cd libvorbis
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win64/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win64/lib -static-libgcc" CPPFLAGS="-I/home/jim/packages/win64/include" ./configure -host=x86_64-w64-mingw32 --prefix="/home/jim/packages/win64" --enable-shared --with-ogg="/home/jim/packages/win64"
+make -j6
+make install
+cd ..
+
+cd libvpxbuild
+make clean
+PKG_CONFIG_PATH="/home/jim/packages/win64/lib/pkgconfig" CROSS=x86_64-w64-mingw32- LDFLAGS="-static-libgcc" ../libvpx/configure --prefix=/home/jim/packages/win64 --enable-vp8 --enable-vp9 --disable-docs --disable-examples --enable-shared --disable-static --enable-runtime-cpu-detect --enable-realtime-only --disable-install-bins --disable-install-docs --disable-unit-tests --target=x86_64-win64-gcc
+make -j6
+make install
+x86_64-w64-mingw32-dlltool -m i386:x86-64 -d libvpx.def -l /home/jim/packages/win64/bin/vpx.lib -D /home/jim/win64/packages/bin/libvpx-1.dll
+cd ..
+
+cd ffmpeg
+make clean
+cp /media/sf_linux/nvEncodeAPI.h /home/jim/packages/win64/include
+PKG_CONFIG_PATH="/home/jim/packages/win64/lib/pkgconfig" LDFLAGS="-L/home/jim/packages/win64/lib" CPPFLAGS="-I/home/jim/packages/win64/include" ./configure --enable-memalign-hack --enable-gpl --disable-doc --arch=x86_64 --enable-shared --enable-nvenc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-debug --cross-prefix=x86_64-w64-mingw32- --target-os=mingw32 --pkg-config=pkg-config --prefix="/home/jim/packages/win64" --disable-postproc
+read -n1 -r -p "Press any key to continue building FFmpeg..." key
+make -j6
+make install
+cd ..

obs-studio-0.17.0.tar.xz/UI/data/locale/ca-ES.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/ca-ES.ini Changed

@@ -52,6 +52,10 @@
 Hours="Hores"
 Minutes="Minuts"
 Seconds="Segons"
+Deprecated="Obsolet"
+ReplayBuffer="Memòria intermèdia de reproducció"
+Import="Importa"
+Export="Exporta"
 
 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."
@@ -106,6 +110,8 @@
 Output.RecordNoSpace.Msg="No hi ha prou espai de disc per continuar la gravació."
 Output.RecordError.Title="Error en l'enregistrament"
 Output.RecordError.Msg="S'ha produït un error desconegut mentre es gravava."
+Output.ReplayBuffer.NoHotkey.Title="Cap tecla d'accés ràpid!"
+Output.ReplayBuffer.NoHotkey.Msg="Cap tecla d'accés ràpid establerta per la memòria intermèdia de reproducció. Configureu la tecla d'accés \"Desa\" per desar els enregistraments de reproducció."
 
 Output.BadPath.Title="Ruta de l'arxiu incorrecta"
 Output.BadPath.Text="La ruta configurada pel fitxer de sortida no és vàlida.  Si us plau, comproveu la configuració per confirmar que s'ha creat una ruta de fitxer vàlida."
@@ -261,9 +267,12 @@
 Basic.Main.Sources="Orígens"
 Basic.Main.Connecting="S'està connectant..."
 Basic.Main.StartRecording="Inicia l'enregistrament"
-Basic.Main.StartStreaming="Inicia l'enregistrament"
+Basic.Main.StartReplayBuffer="Inicia la reproducció de la memòria intermèdia"
+Basic.Main.StartStreaming="Inicia la transmissió"
 Basic.Main.StopRecording="Atura l'enregistrament"
 Basic.Main.StoppingRecording="Aturant l'enregistrament..."
+Basic.Main.StopReplayBuffer="Atura la reproducció de la memòria intermèdia"
+Basic.Main.StoppingReplayBuffer="S'està aturant la reproducció de la memòria intermèdia..."
 Basic.Main.StopStreaming="Atura l'enregistrament"
 Basic.Main.StoppingStreaming="Aturant la transmissió..."
 Basic.Main.ForceStopStreaming="Atura l'enregistrament (descarta el retard)"
@@ -273,7 +282,7 @@
 Basic.MainMenu.File.Import="&Importa"
 Basic.MainMenu.File.ShowRecordings="Mostra els en&registraments"
 Basic.MainMenu.File.Remux="Converteix format de gravacions"
-Basic.MainMenu.File.Settings="&Paràmetres"
+Basic.MainMenu.File.Settings="&Configuració"
 Basic.MainMenu.File.ShowSettingsFolder="Mostrar carpeta de configuració"
 Basic.MainMenu.File.ShowProfileFolder="Mostra la carpeta del perfil"
 Basic.MainMenu.AlwaysOnTop="&Sempre al davant"
@@ -285,8 +294,14 @@
 Basic.MainMenu.Edit.UndoAction="&Desfés $1"
 Basic.MainMenu.Edit.RedoAction="&Refés $1"
 Basic.MainMenu.Edit.LockPreview="&Bloquejar vista prèvia"
+Basic.MainMenu.Edit.Scale="Vista prèvia i escalat"
+Basic.MainMenu.Edit.Scale.Window="Ajusta a la finestra"
+Basic.MainMenu.Edit.Scale.Canvas="Tela (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="Sortida (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Transforma"
 Basic.MainMenu.Edit.Transform.EditTransform="&Editar Transformació..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Copia la transformació"
+Basic.MainMenu.Edit.Transform.PasteTransform="Enganxa la transformació"
 Basic.MainMenu.Edit.Transform.ResetTransform="&Reinicialitza Transformació"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Gira 90 graus a la dreta"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Gira 90 graus a l'esquerra"
@@ -311,6 +326,12 @@
 
 Basic.MainMenu.SceneCollection="&Col·lecció d'escenes"
 Basic.MainMenu.Profile="&Perfil"
+Basic.MainMenu.Profile.Import="Importació del perfil"
+Basic.MainMenu.Profile.Export="Exportació del perfil"
+Basic.MainMenu.SceneCollection.Import="Importa col·lecció d'escenes"
+Basic.MainMenu.SceneCollection.Export="Exporta la col·lecció d'escenes"
+Basic.MainMenu.Profile.Exists="El perfil ja existeix"
+Basic.MainMenu.SceneCollection.Exists="La col·lecció d'escenes ja existeix"
 
 Basic.MainMenu.Tools="&Eines"
 
@@ -357,6 +378,14 @@
 Basic.Settings.Output.Mode.Simple="Simple"
 Basic.Settings.Output.Mode.Adv="Avançat"
 Basic.Settings.Output.Mode.FFmpeg="Sortida FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Activa la reproducció de la memòria intermèdia"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Temps de reproducció màxim (segons)"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memòria màxima (MB)"
+Basic.Settings.Output.ReplayBuffer.Estimate="Ús aproximat de memòria: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="No es pot estimar l'ús de memòria. Establiu el límit màxim de memòria."
+Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Assegureu-vos d'establir una tecla d'accés ràpid per la memòria intermèdia de reproducció a la secció de tecles ràpides)"
+Basic.Settings.Output.ReplayBuffer.Prefix="Prefix del nom del fitxer de la memòria intermèdia"
+Basic.Settings.Output.ReplayBuffer.Suffix="Sufix"
 Basic.Settings.Output.Simple.SavePath="Camí d'enregistrament"
 Basic.Settings.Output.Simple.RecordingQuality="Qualitat de l'enregistrament"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Mateixa que en directe"
@@ -394,6 +423,8 @@
 Basic.Settings.Output.Adv.Audio.Track2="Pista 2"
 Basic.Settings.Output.Adv.Audio.Track3="Pista 3"
 Basic.Settings.Output.Adv.Audio.Track4="Pista 4"
+Basic.Settings.Output.Adv.Audio.Track5="Pista 5"
+Basic.Settings.Output.Adv.Audio.Track6="Pista 6"
 
 Basic.Settings.Output.Adv.Recording="Enregistrament"
 Basic.Settings.Output.Adv.Recording.Type="Tipus"

obs-studio-0.17.0.tar.xz/UI/data/locale/cs-CZ.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/cs-CZ.ini Changed

obs-studio-0.17.0.tar.xz/UI/data/locale/de-DE.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/de-DE.ini Changed

obs-studio-0.17.0.tar.xz/UI/data/locale/fi-FI.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/fi-FI.ini Changed

obs-studio-0.17.0.tar.xz/UI/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/hu-HU.ini Changed

@@ -281,7 +281,7 @@
 Basic.MainMenu.File.Export="&Exportálás"
 Basic.MainMenu.File.Import="&Importálás"
 Basic.MainMenu.File.ShowRecordings="&Felvételek megjelenítése"
-Basic.MainMenu.File.Remux="Re&mux felvételek"
+Basic.MainMenu.File.Remux="Felvételek re&muxolása"
 Basic.MainMenu.File.Settings="&Beállítások"
 Basic.MainMenu.File.ShowSettingsFolder="Beállítási mappa megjelenítése"
 Basic.MainMenu.File.ShowProfileFolder="Profilmappa megjelenítése"
@@ -295,7 +295,7 @@
 Basic.MainMenu.Edit.RedoAction="&Ismét $1"
 Basic.MainMenu.Edit.LockPreview="&Előnézet zárolás"
 Basic.MainMenu.Edit.Scale="Előnézet &méretezés"
-Basic.MainMenu.Edit.Scale.Window="Ablakhoz skálázás"
+Basic.MainMenu.Edit.Scale.Window="Ablakhoz igazítás"
 Basic.MainMenu.Edit.Scale.Canvas="Vászon (%1x%2)"
 Basic.MainMenu.Edit.Scale.Output="Kimenet (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Alakítás"
@@ -336,12 +336,12 @@
 Basic.MainMenu.Tools="&Eszközök"
 
 Basic.MainMenu.Help="&Segítség"
-Basic.MainMenu.Help.Website="Weboldal meglátogatása"
+Basic.MainMenu.Help.Website="Weboldal megtekintése"
 Basic.MainMenu.Help.Logs="&Naplófájlok"
 Basic.MainMenu.Help.Logs.ShowLogs="&Naplófájlok megjelenítése"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Aktuális Naplófájl feltöltése"
 Basic.MainMenu.Help.Logs.UploadLastLog="&Utolsó Naplófájl feltöltése"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&Jelenlegi napló megtekintése"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Jelenlegi Naplófájl megtekintése"
 Basic.MainMenu.Help.CheckForUpdates="Frissítések ellenőrzése"
 
 Basic.Settings.ProgramRestart="A beállítások érvénybe lépéséhez a program újraindítása szükséges."
@@ -373,7 +373,7 @@
 Basic.Settings.Output.Encoder="Kódoló"
 Basic.Settings.Output.SelectDirectory="Felvételi könyvtár kiválasztása"
 Basic.Settings.Output.SelectFile="Felvétel fájljának kiválasztása"
-Basic.Settings.Output.EnforceBitrate="Stream kiszolgáló bitráta korlátainak kényszerítése"
+Basic.Settings.Output.EnforceBitrate="Stream kiszolgáló bitsebesség korlátainak kényszerítése"
 Basic.Settings.Output.Mode="Kimeneti mód"
 Basic.Settings.Output.Mode.Simple="Egyszerű"
 Basic.Settings.Output.Mode.Adv="Haladó"
@@ -392,8 +392,8 @@
 Basic.Settings.Output.Simple.RecordingQuality.Small="Jó minőség, közepes fájlméret"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Megkülönböztethetetlen minőség, nagy fájlméret"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Veszteségmentes minőség, hatalmas fájlméret"
-Basic.Settings.Output.Simple.Warn.VideoBitrate="Figyelem: Az adás videó bitrátája %1 értéken áll, ami a kiválasztott kiszolgáló felső határértéke. Amennyiben túl kívánja lépni a megadott %1 értéket, úgy engedélyezze a haladó kódolási opciókat és törölje a \"stream kiszolgáló bitráta korlátainak kényszerítése\" opciót."
-Basic.Settings.Output.Simple.Warn.AudioBitrate="Figyelem: Az adás audio bitrátája %1 értéken áll, ami a kiválasztott kiszolgáló felső határértéke. Amennyiben túl kívánja lépni a megadott %1 értéket, úgy engedélyezze a haladó kódolási opciókat és törölje a \"stream kiszolgáló bitráta korlátainak kényszerítése\" opciót."
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Figyelem: Az adás videó bitsebessége %1 értéken áll, ami a kiválasztott kiszolgáló felső határértéke. Amennyiben túl kívánja lépni a megadott %1 értéket, úgy engedélyezze a haladó kódolási opciókat és törölje a \"stream kiszolgáló bitsebesség korlátainak kényszerítése\" opciót."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Figyelem: Az adás audio bitsebessége %1 értéken áll, ami a kiválasztott kiszolgáló felső határértéke. Amennyiben túl kívánja lépni a megadott %1 értéket, úgy engedélyezze a haladó kódolási opciókat és törölje a \"stream kiszolgáló bitsebesség korlátainak kényszerítése\" opciót."
 Basic.Settings.Output.Simple.Warn.Encoder="Figyelem: A streamtől eltérő minőséggel történő rögzítés, további CPU erőforrásokat igényel, ha egyidejűleg használja mindkettőt."
 Basic.Settings.Output.Simple.Warn.Lossless="Figyelem: A veszteségmentes minőséggel történő felvétel hatalmas fájlméretet generál. Ezzel a minőséggel percenként akár 7 gigabájt adatot is generálhat nagy felbontáson és képkockasebességen. Ez az eljárás nem ajánlott hosszú felvételekhez, kivéve ha hatalmas lemezterület áll rendelkezésre."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Biztos benne, hogy veszteségmentes minőséget kíván használni?"
@@ -404,8 +404,8 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardver (AMD)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardver (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Szoftveres (x264 alacsony CPU használati készlet, növekvő fájlméret)"
-Basic.Settings.Output.VideoBitrate="Videó bitráta"
-Basic.Settings.Output.AudioBitrate="Audio bitráta"
+Basic.Settings.Output.VideoBitrate="Videó bitsebesség"
+Basic.Settings.Output.AudioBitrate="Audio bitsebesség"
 Basic.Settings.Output.Reconnect="Automatikus újracsatlakozás"
 Basic.Settings.Output.RetryDelay="Újrapróbálkozás késleltetése (másodperc)"
 Basic.Settings.Output.MaxRetries="Újrapróbálkozások maximális száma"

obs-studio-0.17.0.tar.xz/UI/data/locale/it-IT.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/it-IT.ini Changed

@@ -20,7 +20,7 @@
 MoveUp="Sposta su"
 MoveDown="Sposta giù"
 Settings="Impostazioni"
-Display="Display"
+Display="Schermo"
 Name="Nome"
 Exit="Esci"
 Mixer="Mixer"
@@ -28,36 +28,39 @@
 Mono="Mono"
 Stereo="Stereo"
 DroppedFrames="Fotogrammi persi %1 (%2%)"
-PreviewProjector="Proiettore Schermo intero (Anteprima)"
-SceneProjector="Proiettore Schermo intero (Scena)"
-SourceProjector="Proiettore Schermo intero (Sorgente)"
+PreviewProjector="Proiettore a schermo intero (anteprima)"
+SceneProjector="Proiettore a schermo intero (scena)"
+SourceProjector="Proiettore a schermo intero (sorgente)"
 Clear="Svuota"
 Revert="Ripristina"
 Show="Mostra"
 Hide="Nascondi"
-Untitled="Senza Titolo"
+Untitled="Senza titolo"
 New="Nuovo"
 Duplicate="Duplica"
 Enable="Abilita"
-DisableOSXVSync="Disabilita il V-Sync OSX"
-ResetOSXVSyncOnExit="Reimpostare V-Sync OSX in uscita"
-HighResourceUsage="Codifica in sovraccarico!  È consigliabile abbassare le impostazioni video o utilizzare un settaggio predefinito di codifica più veloce."
+DisableOSXVSync="Disabilita V-Sync OSX"
+ResetOSXVSyncOnExit="Reimposta V-Sync OSX in uscita"
+HighResourceUsage="Codifica in sovraccarico!  È consigliabile abbassare le impostazioni video o utilizzare una preimpostazione predefinita di codifica più veloce."
 Transition="Transizione"
 QuickTransitions="Transizioni rapide"
 Left="Sinistra"
 Right="Destra"
 Top="Alto"
 Bottom="Basso"
-Reset="Reset"
+Reset="Ripristina"
 Hours="Ore"
 Minutes="Minuti"
 Seconds="Secondi"
 Deprecated="Deprecato"
-
-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."
-QuickTransitions.DuplicateScene="Duplica Scena"
-QuickTransitions.DuplicateSceneTT="Quando si modifica la stessa scena, permette di modificare la trasformazione/visibilità di source senza modificare l'output. \nPer modificare le proprietà delle source senza modificare l'output, abilità 'Source duplicate'.\nCambiare questo valore resetterà la scena output attuale (se esite ancora)."
+ReplayBuffer="Buffer di replay"
+Import="Importa"
+Export="Esporta"
+
+QuickTransitions.SwapScenes="Scambia scene di anteprima/uscita dopo la transizione"
+QuickTransitions.SwapScenesTT="Scambia le scene di uscita con quella in anteprima dopo la transizione (ammesso che la scena in uscita originale ci sia ancora).\nQuesto non modificherà eventuali cambiamenti apportati alla scena di uscita originale."
+QuickTransitions.DuplicateScene="Duplica scena"
+QuickTransitions.DuplicateSceneTT="Quando si modifica la stessa scena, permette di modificare la trasformazione/visibilità delle sorgenti senza modificare l'uscita.\nPer modificare le proprietà delle source senza modificare l'uscita, abilità 'Sorgenti duplicate'.\nCambiare questo valore ripristinerà la scena di uscita attuale (se esiste ancora)."
 QuickTransitions.EditProperties="Duplica Risorsa"
 QuickTransitions.EditPropertiesTT="Quando si modifica la stessa scena, consente la modifica di risorse senza modificarne l'output. \nQuesto può essere usato solo se 'Scene doppia' è attivo. \nCerte risorse (come media o catture) non lo supportano e devono essere modificate separatamente. \nCambiare questo valore resetterà l'attuale scena di output (se esiste ancora). \n\nAttenzione: Dato che la risorsa verrà duplicata, questo potrebbe richiedere risorse di sistema o video aggiuntive."
 QuickTransitions.HotkeyName="Transizioni rapide: %1"
@@ -69,7 +72,7 @@
 Basic.TransitionDuration="Durata"
 Basic.TogglePreviewProgramMode="Modalità studio"
 
-TransitionNameDlg.Text="Per favore inserisci il nome della transizione"
+TransitionNameDlg.Text="Inserisci il nome della transizione"
 TransitionNameDlg.Title="Nome transizione"
 
 TitleBar.Profile="Profilo"
@@ -81,13 +84,13 @@
 NoNameEntered.Title="Inserisci un nome valido"
 NoNameEntered.Text="Non è possibile utilizzare nomi vuoti."
 
-ConfirmStart.Title="Inizia diretta?"
+ConfirmStart.Title="Vuoi iniziare la trasmissione?"
 ConfirmStart.Text="Sei sicuro di voler iniziare una diretta?"
 
-ConfirmStop.Title="Interrompere diretta?"
-ConfirmStop.Text="Sei sicuro di voler interrompere questa diretta?"
+ConfirmStop.Title="Vuoi fermare la trasmissione?"
+ConfirmStop.Text="Sei sicuro di voler interrompere questa trasmissione?"
 
-ConfirmExit.Title="Uscire da OBS?"
+ConfirmExit.Title="Vuoi uscire da OBS?"
 ConfirmExit.Text="OBS è attualmente attivo. Tutte le dirette/registrazioni saranno fermate. Sei sicuro di voler uscire?"
 
 ConfirmRemove.Title="Conferma la rimozione"
@@ -107,6 +110,8 @@
 Output.RecordNoSpace.Msg="Non c'è abbastanza spazio su disco per continuazre la registrazione."
 Output.RecordError.Title="Errore di registrazione"
 Output.RecordError.Msg="Si è verificato un errore non specificato durante la registrazione."
+Output.ReplayBuffer.NoHotkey.Title="Nessuna scorciatoia assegnata!"
+Output.ReplayBuffer.NoHotkey.Msg="Nessuna scorciatoia impostata per salvare il buffer di replay. Impostare la scorciatoia \"Salva\" per poter salvare le registrazioni in replay."
 
 Output.BadPath.Title="Percorso di file invalido"
 Output.BadPath.Text="Il percorso configurato per il file di output non è valido. Controlla le tue impostazioni per confermare che un percorso di file valido è stato impostato."
@@ -127,8 +132,8 @@
 Remux.OBSRecording="Registrazione OBS"
 Remux.FinishedTitle="Conversione finita"
 Remux.Finished="Registrazione convertita"
-Remux.FinishedError="Registrazione convertita, ma il file potrebbe essere incompleta"
-Remux.SelectRecording="Selezionare registrazione OBS …"
+Remux.FinishedError="Registrazione convertita, ma il file potrebbe essere incompleto"
+Remux.SelectRecording="Selezionare registrazione OBS…"
 Remux.SelectTarget="Selezionare il file di destinazione…"
 Remux.FileExistsTitle="Il file di destinazione esiste"
 Remux.FileExists="Il file di destinazione esiste, si desidera sostituirlo?"
@@ -148,7 +153,7 @@
 Basic.Scene="Scena"
 Basic.DisplayCapture="Mostra cattura"
 
-Basic.Main.PreviewConextMenu.Enable="Abilita Anteprima"
+Basic.Main.PreviewConextMenu.Enable="Abilita anteprima"
 
 ScaleFiltering="Scala di filtraggio"
 ScaleFiltering.Point="Punto"
@@ -262,9 +267,12 @@
 Basic.Main.Sources="Origini"
 Basic.Main.Connecting="Connessione..."
 Basic.Main.StartRecording="Avvia registrazione"
+Basic.Main.StartReplayBuffer="Avvia Buffer di Replay"
 Basic.Main.StartStreaming="Avvia trasmissione"
 Basic.Main.StopRecording="Ferma registrazione"
 Basic.Main.StoppingRecording="Fermando la registrazione..."
+Basic.Main.StopReplayBuffer="Termina Buffer di Replay"
+Basic.Main.StoppingReplayBuffer="Fermando il Buffer di Replay..."
 Basic.Main.StopStreaming="Ferma trasmissione"
 Basic.Main.StoppingStreaming="Arresto diretta..."
 Basic.Main.ForceStopStreaming="Ferma Diretta (annulla ritardo)"
@@ -278,20 +286,22 @@
 Basic.MainMenu.File.ShowSettingsFolder="Visualizza cartella impostazioni"
 Basic.MainMenu.File.ShowProfileFolder="Mostra la cartella del profilo"
 Basic.MainMenu.AlwaysOnTop="&Sempre in primo piano"
-Basic.MainMenu.File.Exit="Esci (&X)"
+Basic.MainMenu.File.Exit="E&sci"
 
 Basic.MainMenu.Edit="&Modifica"
 Basic.MainMenu.Edit.Undo="&Annulla"
 Basic.MainMenu.Edit.Redo="&Ripristina"
 Basic.MainMenu.Edit.UndoAction="&Ripristina $1"
 Basic.MainMenu.Edit.RedoAction="&Ripristina $1"
-Basic.MainMenu.Edit.LockPreview="&Blocca Anteprima"
-Basic.MainMenu.Edit.Scale="Anteprima & ridimensionamento"
+Basic.MainMenu.Edit.LockPreview="&Blocca anteprima"
+Basic.MainMenu.Edit.Scale="Anteprima ridimen&sionamento"
 Basic.MainMenu.Edit.Scale.Window="Scala alla finestra"
 Basic.MainMenu.Edit.Scale.Canvas="Tela (%1x%2)"
 Basic.MainMenu.Edit.Scale.Output="Uscita (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Trasforma"
 Basic.MainMenu.Edit.Transform.EditTransform="&Modifica e trasforma..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Copia Trasformazione"
+Basic.MainMenu.Edit.Transform.PasteTransform="Incolla Trasformazione"
 Basic.MainMenu.Edit.Transform.ResetTransform="&Reset e trasforma"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Ruota di 90 gradi DW"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Ruota di 90 gradi CCW"
@@ -306,7 +316,7 @@
 Basic.MainMenu.Edit.Order.MoveDown="Sposta in &basso"
 Basic.MainMenu.Edit.Order.MoveToTop="Sposta in &primo piano"
 Basic.MainMenu.Edit.Order.MoveToBottom="Sposta in &fondo"
-Basic.MainMenu.Edit.AdvAudio="Proprietà Audio &Avanzate"
+Basic.MainMenu.Edit.AdvAudio="Proprietà audio &avanzate"
 
 Basic.MainMenu.View="&Visualizza"
 Basic.MainMenu.View.Toolbars="&Barre degli strumenti"
@@ -316,10 +326,16 @@
 
 Basic.MainMenu.SceneCollection="&Collezione scene"
 Basic.MainMenu.Profile="&Profilo"
+Basic.MainMenu.Profile.Import="Importa profilo"
+Basic.MainMenu.Profile.Export="Esporta profilo"
+Basic.MainMenu.SceneCollection.Import="Importa collezione scene"
+Basic.MainMenu.SceneCollection.Export="Esporta collezione scene"
+Basic.MainMenu.Profile.Exists="Il profilo esiste già"
+Basic.MainMenu.SceneCollection.Exists="La collezione di scene già esiste"
 
 Basic.MainMenu.Tools="&Strumenti"
 
-Basic.MainMenu.Help="Aiuto (&H)"
+Basic.MainMenu.Help="&Aiuto"
 Basic.MainMenu.Help.Website="Visita il sito"
 Basic.MainMenu.Help.Logs="File di &log"
 Basic.MainMenu.Help.Logs.ShowLogs="&Visualizza i file di Log"
@@ -362,6 +378,14 @@
 Basic.Settings.Output.Mode.Simple="Semplice"
 Basic.Settings.Output.Mode.Adv="Avanzate"
 Basic.Settings.Output.Mode.FFmpeg="Uscita FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Abilita il Buffer di Replay"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Tempo massimo di Replay (Secondi)"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memoria Massima (Megabytes)"
+Basic.Settings.Output.ReplayBuffer.Estimate="Uso della memoria stimato: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Impossibile stimare la memoria utilizzata. Impostare un limite massimo di memoria."
+Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Assicurati di aver impostato una hotkey per il Buffer di Replay nella sezione delle hotkeys)"
+Basic.Settings.Output.ReplayBuffer.Prefix="Prefisso del file per i Buffer di Replay"
+Basic.Settings.Output.ReplayBuffer.Suffix="Suffisso"
 Basic.Settings.Output.Simple.SavePath="Percorso registrazione"
 Basic.Settings.Output.Simple.RecordingQuality="Qualità della registrazione"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Stesso della diretta"
@@ -399,13 +423,15 @@
 Basic.Settings.Output.Adv.Audio.Track2="Traccia 2"
 Basic.Settings.Output.Adv.Audio.Track3="Traccia 3"
 Basic.Settings.Output.Adv.Audio.Track4="Traccia 4"
+Basic.Settings.Output.Adv.Audio.Track5="Traccia 5"
+Basic.Settings.Output.Adv.Audio.Track6="Traccia 6"
 
 Basic.Settings.Output.Adv.Recording="Registrazione"
 Basic.Settings.Output.Adv.Recording.Type="Tipo"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Output personalizzato (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Utilizzare il codificatore del flusso)"
-Basic.Settings.Output.Adv.Recording.Filename="Formattazione del nome del file"
+Basic.Settings.Output.Adv.Recording.Filename="Formattazione nome del file"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Sovrascrivi il file se già esistente"
 Basic.Settings.Output.Adv.FFmpeg.Type="Tipo di Output FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Output in URL"
@@ -486,7 +512,7 @@
 Basic.Settings.Advanced.Network="Rete"
 Basic.Settings.Advanced.Network.BindToIP="Associa a IP"
 
-Basic.AdvAudio="Proprietà Audio Avanzate"
+Basic.AdvAudio="Proprietà audio avanzate"
 Basic.AdvAudio.Name="Nome"
 Basic.AdvAudio.Volume="Volume (%)"
 Basic.AdvAudio.Mono="Downmix to Mono"

obs-studio-0.17.0.tar.xz/UI/data/locale/pt-BR.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/pt-BR.ini Changed

@@ -52,6 +52,9 @@
 Hours="Horas"
 Minutes="Minutos"
 Seconds="Segundos"
+Deprecated="Obsoleto"
+ReplayBuffer="Buffer do Replay"
+Export="Exportar"
 
 QuickTransitions.SwapScenes="Trocar Cenas de Prévia/Saída após a Transição"
 QuickTransitions.SwapScenesTT="Troca a preview e a saída após transicionar (se a a cena original de saída ainda exisitr).\nIsto não irá desfazer nenhuma mudança que foi feita na cena original da saída."
@@ -106,6 +109,8 @@
 Output.RecordNoSpace.Msg="Não há espaço em disco suficiente para continuar a gravação."
 Output.RecordError.Title="Erro de gravação"
 Output.RecordError.Msg="Ocorreu um erro não especificado durante a gravação."
+Output.ReplayBuffer.NoHotkey.Title="Tecla de Atalho não configurada!"
+Output.ReplayBuffer.NoHotkey.Msg="Tecla de Atalho para salvar o Buffer do replay não definida. Por favor, configure uma tecla de atalho para salvar gravações de replays."
 
 Output.BadPath.Title="Caminho de Arquivo Inválido"
 Output.BadPath.Text="O caminho do arquivo de saída é inválido. Por Favor, certifique-se de que um caminho válido foi informado."
@@ -153,6 +158,7 @@
 ScaleFiltering.Point="Ponto"
 ScaleFiltering.Bilinear="Bilinear"
 ScaleFiltering.Bicubic="Bicúbico"
+ScaleFiltering.Lanczos="Lanczos"
 
 Deinterlacing="Desentrelaçamento"
 Deinterlacing.Discard="Descartar"
@@ -260,9 +266,12 @@
 Basic.Main.Sources="Fontes"
 Basic.Main.Connecting="Conectando..."
 Basic.Main.StartRecording="Iniciar gravação"
+Basic.Main.StartReplayBuffer="Iniciar Buffer do Replay"
 Basic.Main.StartStreaming="Iniciar Transmissão"
 Basic.Main.StopRecording="Parar Gravação"
 Basic.Main.StoppingRecording="Parando de Gravar..."
+Basic.Main.StopReplayBuffer="Parar Buffer do Replay"
+Basic.Main.StoppingReplayBuffer="Parando Buffer do Replay..."
 Basic.Main.StopStreaming="Parar Transmissão"
 Basic.Main.StoppingStreaming="Parando Transmissão..."
 Basic.Main.ForceStopStreaming="Pare de transmitir (descartar atraso)"
@@ -290,6 +299,8 @@
 Basic.MainMenu.Edit.Scale.Output="Saída (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Transformar"
 Basic.MainMenu.Edit.Transform.EditTransform="&Editar Transformação..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Copiar Transformação"
+Basic.MainMenu.Edit.Transform.PasteTransform="Colar Transformação"
 Basic.MainMenu.Edit.Transform.ResetTransform="&Limpar Transformação"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Girar 90º sentido Horário"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Girar 90º sentido Anti-Horário"
@@ -314,6 +325,12 @@
 
 Basic.MainMenu.SceneCollection="&Coleção de cena"
 Basic.MainMenu.Profile="&Perfil"
+Basic.MainMenu.Profile.Import="Importar Perfil"
+Basic.MainMenu.Profile.Export="Exportar Perfil"
+Basic.MainMenu.SceneCollection.Import="Importar Grupo de Cenas"
+Basic.MainMenu.SceneCollection.Export="Exportar Grupo de Cenas"
+Basic.MainMenu.Profile.Exists="Perfil já existe"
+Basic.MainMenu.SceneCollection.Exists="O Grupo de Cenas já existe"
 
 Basic.MainMenu.Tools="Ferramentas (&T)"
 
@@ -360,6 +377,14 @@
 Basic.Settings.Output.Mode.Simple="Simples"
 Basic.Settings.Output.Mode.Adv="Avançado"
 Basic.Settings.Output.Mode.FFmpeg="Saída de FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Habilitar Buffer de Repetição"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Tempo de Replay máximo (Segundos)"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Memória Máxima (Megabytes)"
+Basic.Settings.Output.ReplayBuffer.Estimate="Uso de memória estimado: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Impossível estimar o uso de memória. Por favor, defina o limite máximo de memória."
+Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Nota: Não se esqueça de configurar uma Tecla de Atalho para o Buffer de Replay na seção Teclas de Atalhos)"
+Basic.Settings.Output.ReplayBuffer.Prefix="Prefixo do Buffer de Repetição"
+Basic.Settings.Output.ReplayBuffer.Suffix="Sufixo"
 Basic.Settings.Output.Simple.SavePath="Caminho de gravação"
 Basic.Settings.Output.Simple.RecordingQuality="Qualidade da gravação"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Mesmo que a stream"
@@ -397,6 +422,8 @@
 Basic.Settings.Output.Adv.Audio.Track2="Faixa 2"
 Basic.Settings.Output.Adv.Audio.Track3="Faixa 3"
 Basic.Settings.Output.Adv.Audio.Track4="Faixa 4"
+Basic.Settings.Output.Adv.Audio.Track5="Faixa 5"
+Basic.Settings.Output.Adv.Audio.Track6="Faixa 6"
 
 Basic.Settings.Output.Adv.Recording="Gravação"
 Basic.Settings.Output.Adv.Recording.Type="Tipo"

obs-studio-0.17.0.tar.xz/UI/data/locale/ru-RU.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/ru-RU.ini Changed

@@ -52,6 +52,10 @@
 Hours="Часов"
 Minutes="Минут"
 Seconds="Секунд"
+Deprecated="Устаревшее"
+ReplayBuffer="Буфер повтора"
+Import="Импорт"
+Export="Экспорт"
 
 QuickTransitions.SwapScenes="Замена Просмотра/Вывода Сцены После Перехода"
 QuickTransitions.SwapScenesTT="Замена просмотра и вывода сцены после перехода (если выходная оригинальная сцена до сих пор существует).\nЭто будет не отмена каких-либо изменений, что, возможно, было сделано в выходной оригинальной сцены."
@@ -107,6 +111,7 @@
 Output.RecordError.Title="Ошибка записи"
 Output.RecordError.Msg="Во время записи произошла неопознанная ошибка."
 Output.ReplayBuffer.NoHotkey.Title="Нет набора горячих клавиш!"
+Output.ReplayBuffer.NoHotkey.Msg="Не установлено клавиши для сохранения повтора. Пожалуйста, установите горячую клавишу для сохранения записей повторов."
 
 Output.BadPath.Title="Неправильный путь к файлу"
 Output.BadPath.Text="Некорректный путь к файлу.  Пожалуйста, проверьте настройки, чтобы убедиться в корректности установленного пути."
@@ -262,9 +267,12 @@
 Basic.Main.Sources="Источники"
 Basic.Main.Connecting="Соединение..."
 Basic.Main.StartRecording="Начать запись"
+Basic.Main.StartReplayBuffer="Запустить повтор"
 Basic.Main.StartStreaming="Запустить трансляцию"
 Basic.Main.StopRecording="Остановить запись"
 Basic.Main.StoppingRecording="Остановка Записи..."
+Basic.Main.StopReplayBuffer="Остановить повтор"
+Basic.Main.StoppingReplayBuffer="Остановка повтора..."
 Basic.Main.StopStreaming="Остановить трансляцию"
 Basic.Main.StoppingStreaming="Остановка вещания..."
 Basic.Main.ForceStopStreaming="Остановить передачу (отменить задержку)"
@@ -288,8 +296,12 @@
 Basic.MainMenu.Edit.LockPreview="&Заблокировать предпросмотр"
 Basic.MainMenu.Edit.Scale="Просмотр и масштабирование"
 Basic.MainMenu.Edit.Scale.Window="Масштаб окна"
+Basic.MainMenu.Edit.Scale.Canvas="Холст (%1x%2)"
+Basic.MainMenu.Edit.Scale.Output="Вывод (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Преобразовать"
 Basic.MainMenu.Edit.Transform.EditTransform="&Изменить преобразование..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Копировать преобразование"
+Basic.MainMenu.Edit.Transform.PasteTransform="Вставить преобразование"
 Basic.MainMenu.Edit.Transform.ResetTransform="&Сбросить преобразование"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Повернуть на 90 градусов по часовой"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Повернуть на 90 градусов против часовой"
@@ -314,6 +326,12 @@
 
 Basic.MainMenu.SceneCollection="Коллекция сцен"
 Basic.MainMenu.Profile="Профиль"
+Basic.MainMenu.Profile.Import="Импортировать профиль"
+Basic.MainMenu.Profile.Export="Экспортировать профиль"
+Basic.MainMenu.SceneCollection.Import="Импортировать коллекцию сцен"
+Basic.MainMenu.SceneCollection.Export="Экспортировать коллекцию сцен"
+Basic.MainMenu.Profile.Exists="Профиль уже существует"
+Basic.MainMenu.SceneCollection.Exists="Коллекция сцен уже существует"
 
 Basic.MainMenu.Tools="&Инструменты"
 
@@ -360,8 +378,14 @@
 Basic.Settings.Output.Mode.Simple="Простой"
 Basic.Settings.Output.Mode.Adv="Расширенные"
 Basic.Settings.Output.Mode.FFmpeg="Вывод FFmpeg"
+Basic.Settings.Output.UseReplayBuffer="Включить Буфер повтора"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Максимальное время повтора (секунд)"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимальный объем памяти (МБ)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Предполагаемое использование памяти: %1 МБ"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Невозможно оценить использование памяти.  Пожалуйста, установите максимальный объем памяти."
+Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(Примечание: Убедитесь, что установили горячую клавишу для воспроизведения буфера в разделе горячие клавиши)"
+Basic.Settings.Output.ReplayBuffer.Prefix="Префикс имени файла повтора"
+Basic.Settings.Output.ReplayBuffer.Suffix="Суффикс"
 Basic.Settings.Output.Simple.SavePath="Путь к записи"
 Basic.Settings.Output.Simple.RecordingQuality="Качество записи"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="То же, что у трансляции"
@@ -399,6 +423,8 @@
 Basic.Settings.Output.Adv.Audio.Track2="Дорожка 2"
 Basic.Settings.Output.Adv.Audio.Track3="Дорожка 3"
 Basic.Settings.Output.Adv.Audio.Track4="Дорожка 4"
+Basic.Settings.Output.Adv.Audio.Track5="Дорожка 5"
+Basic.Settings.Output.Adv.Audio.Track6="Дорожка 6"
 
 Basic.Settings.Output.Adv.Recording="Запись"
 Basic.Settings.Output.Adv.Recording.Type="Тип"

obs-studio-0.17.0.tar.xz/UI/data/locale/sv-SE.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/sv-SE.ini Changed

@@ -53,6 +53,9 @@
 Minutes="minuter"
 Seconds="sekunder"
 Deprecated="Föråldrat"
+ReplayBuffer="Reprisbuffert"
+Import="Importera"
+Export="Exportera"
 
 QuickTransitions.SwapScenes="Byt plats på Förhandsvisnings-/utdatascenerna efter skifte"
 QuickTransitions.SwapScenesTT="Byter plats på förhandsvisnings- och utdatascenerna efter övergång (om utdatans originalscen fortfarande finns). \nDet här kommer inte att ångra några förändringar i utdatans originalscen."
@@ -108,6 +111,7 @@
 Output.RecordError.Title="Inspelningsfel"
 Output.RecordError.Msg="Ett okänt fel uppstod vid inspelning."
 Output.ReplayBuffer.NoHotkey.Title="Ingen angivet kortkommando!"
+Output.ReplayBuffer.NoHotkey.Msg="Inget kortkommando för att spara reprisbufferten har angivits. Ange kortkommandot \"Spara\" för att kunna spara reprisinspelningar."
 
 Output.BadPath.Title="Ogiltig sökväg"
 Output.BadPath.Text="Den angivna sökvägen för utmatningsfil är ogiltig. Kontrollera att dina inställningar är korrekta och att en giltig sökväg har angetts."
@@ -263,9 +267,12 @@
 Basic.Main.Sources="Källor"
 Basic.Main.Connecting="Ansluter..."
 Basic.Main.StartRecording="Starta inspelning"
+Basic.Main.StartReplayBuffer="Starta reprisbuffert"
 Basic.Main.StartStreaming="Börja strömma"
 Basic.Main.StopRecording="Stoppa inspelning"
 Basic.Main.StoppingRecording="Stoppar inspelning..."
+Basic.Main.StopReplayBuffer="Stoppa reprisbuffert"
+Basic.Main.StoppingReplayBuffer="Stoppar reprisbuffert..."
 Basic.Main.StopStreaming="Sluta strömma"
 Basic.Main.StoppingStreaming="Stoppar ström..."
 Basic.Main.ForceStopStreaming="Sluta strömma (ignorera fördröjning)"
@@ -293,6 +300,8 @@
 Basic.MainMenu.Edit.Scale.Output="Utmatning (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Omvandla"
 Basic.MainMenu.Edit.Transform.EditTransform="&Redigera omvandling..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Kopiera transformering"
+Basic.MainMenu.Edit.Transform.PasteTransform="Klistra in transformering"
 Basic.MainMenu.Edit.Transform.ResetTransform="&Återställ omvandling"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Rotera 90 grader medsols &>"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Rotera 90 grader motsols &<"
@@ -317,6 +326,12 @@
 
 Basic.MainMenu.SceneCollection="&Scensamling"
 Basic.MainMenu.Profile="&Profil"
+Basic.MainMenu.Profile.Import="Importera profil"
+Basic.MainMenu.Profile.Export="Exportera profil"
+Basic.MainMenu.SceneCollection.Import="Importera scensamling"
+Basic.MainMenu.SceneCollection.Export="Exportera scensamling"
+Basic.MainMenu.Profile.Exists="Profilen finns redan"
+Basic.MainMenu.SceneCollection.Exists="Scensamlingen finns redan"
 
 Basic.MainMenu.Tools="&Verktyg"
 
@@ -363,8 +378,14 @@
 Basic.Settings.Output.Mode.Simple="Simpel"
 Basic.Settings.Output.Mode.Adv="Avancerat"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg-utmatning"
+Basic.Settings.Output.UseReplayBuffer="Aktivera reprisbuffert"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Maximal repristid (sekunder)"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximalt minne (Megabyte)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Uppskattad minnesanvändning: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Kan inte uppskatta minnesanvändningen. Ange maximal minnesgräns."
+Basic.Settings.Output.ReplayBuffer.HotkeyMessage="(OBS: Se till att ange ett kortkommando för reprisbufferten i avsnittet för kortkommandon)"
+Basic.Settings.Output.ReplayBuffer.Prefix="Filnamnsprefix för reprisbuffert"
+Basic.Settings.Output.ReplayBuffer.Suffix="Suffix"
 Basic.Settings.Output.Simple.SavePath="Inspelningssökväg"
 Basic.Settings.Output.Simple.RecordingQuality="Inspelningskvalitet"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Samma som ström"
@@ -402,6 +423,8 @@
 Basic.Settings.Output.Adv.Audio.Track2="Spår 2"
 Basic.Settings.Output.Adv.Audio.Track3="Spår 3"
 Basic.Settings.Output.Adv.Audio.Track4="Spår 4"
+Basic.Settings.Output.Adv.Audio.Track5="Spår 5"
+Basic.Settings.Output.Adv.Audio.Track6="Spår 6"
 
 Basic.Settings.Output.Adv.Recording="Inspelning"
 Basic.Settings.Output.Adv.Recording.Type="Typ"

obs-studio-0.17.0.tar.xz/UI/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/tr-TR.ini Changed

@@ -40,6 +40,7 @@
 Duplicate="Çoğalt"
 Enable="Etkinleştir"
 DisableOSXVSync="OSX V-Sync Devre Dışı Bırakma"
+ResetOSXVSyncOnExit="OSX V-Sync'i Çıkışta Sıfırla"
 HighResourceUsage="Kodlama aşırı yüklendi!  Video ayarlarını kapatmayı veya daha hızlı bir kodlama ön ayarını kullanmayı düşünün."
 Transition="Geçiş"
 QuickTransitions="Hızlı Geçiş"
@@ -169,7 +170,7 @@
 Basic.Main.AddSceneDlg.Title="Sahne Ekle"
 Basic.Main.AddSceneDlg.Text="Lütfen sahne adını giriniz"
 
-Basic.Main.DefaultSceneName.Text="%1 Sahnesi"
+Basic.Main.DefaultSceneName.Text="Sahne %1"
 
 Basic.Main.AddSceneCollection.Title="Sahne Koleksiyonu Ekle"
 Basic.Main.AddSceneCollection.Text="Sahne koleksiyonunun isimini giriniz"
@@ -460,6 +461,9 @@
 Basic.Settings.Video.CurrentlyActive="Video çıkışı şu anda etkin durumda.  Video ayarlarını değiştirmek için lütfen bütün çıkışları kapalı duruma getirin."
 Basic.Settings.Video.DisableAero="Aero'yu Devre Dışı Bırak"
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (En hızlı, ancak boyutlandırmada bulanık görüntü)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Keskinleştirilmiş boyutlandırma, 16 örnek)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Keskinleştirilmiş boyutlandırma, 32 örnek)"
 
 Basic.Settings.Audio="Ses"
 Basic.Settings.Audio.SampleRate="Örnekleme Sıklığı"
@@ -550,6 +554,7 @@
 
 Mute="Sesi Kapat"
 Unmute="Sesi Aç"
+Push-to-mute="Bas-Sessize Al"
 Push-to-talk="Bas konuş"
 
 SceneItemShow="'%1' Göster"

obs-studio-0.17.0.tar.xz/UI/data/locale/uk-UA.ini -> obs-studio-17.0.1.tar.xz/UI/data/locale/uk-UA.ini Changed

@@ -300,6 +300,8 @@
 Basic.MainMenu.Edit.Scale.Output="Як Вивід (%1x%2)"
 Basic.MainMenu.Edit.Transform="&Розміри"
 Basic.MainMenu.Edit.Transform.EditTransform="Редагуват&и Розміри..."
+Basic.MainMenu.Edit.Transform.CopyTransform="Копіювати Розміри"
+Basic.MainMenu.Edit.Transform.PasteTransform="Вставити Розміри"
 Basic.MainMenu.Edit.Transform.ResetTransform="Розміри за &замовчуванням"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Повернути на 90 За годинниковою стрілкою"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Повернути на 90 Проти годинникової стрілки"
@@ -324,6 +326,12 @@
 
 Basic.MainMenu.SceneCollection="&Набір Сцен"
 Basic.MainMenu.Profile="&Профіль"
+Basic.MainMenu.Profile.Import="Імпорт Профілю"
+Basic.MainMenu.Profile.Export="Експорт Профілю"
+Basic.MainMenu.SceneCollection.Import="Імпорт Набору Сцен"
+Basic.MainMenu.SceneCollection.Export="Експорт Набору Сцен"
+Basic.MainMenu.Profile.Exists="Профіль вже існує"
+Basic.MainMenu.SceneCollection.Exists="Набір Сцен вже існує"
 
 Basic.MainMenu.Tools="Додаткові &засоби"
 
@@ -415,6 +423,8 @@
 Basic.Settings.Output.Adv.Audio.Track2="Доріжка 2"
 Basic.Settings.Output.Adv.Audio.Track3="Доріжка 3"
 Basic.Settings.Output.Adv.Audio.Track4="Доріжка 4"
+Basic.Settings.Output.Adv.Audio.Track5="Доріжка 5"
+Basic.Settings.Output.Adv.Audio.Track6="Доріжка 6"
 
 Basic.Settings.Output.Adv.Recording="Запис"
 Basic.Settings.Output.Adv.Recording.Type="Тип"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,17 +1,25 @@
 SceneSwitcher="Otomatik Sahne Değiştirici"
+SceneSwitcher.OnNoMatch="Hiçbir pencere ile eşleşmez ise:"
 SceneSwitcher.OnNoMatch.DontSwitch="Geçiş yapma"
 SceneSwitcher.OnNoMatch.SwitchTo="Şuna geç:"
 SceneSwitcher.CheckInterval="Etkin pencere başlığını kontrol et:"
 SceneSwitcher.ActiveOrNotActive="Sahne Değiştirici:"
+InvalidRegex.Title="Geçersiz Kurallı İfade"
+InvalidRegex.Text="Girdiğiniz kurallı ifade geçersiz."
 Active="Etkin"
 Inactive="Devre Dışı"
 Start="Başlat"
 Stop="Durdur"
 
+Captions="Altyazı (Deneysel)"
+Captions.AudioSource="Ses kaynağı"
+Captions.CurrentSystemLanguage="Geçerli Sistem Dili (%1)"
 
 OutputTimer="Çıkış Zamanlayıcısı"
 OutputTimer.Stream="Şuradan sonra yayını durdur:"
 OutputTimer.Record="Şuradan sonra kaydı durdur:"
+OutputTimer.Stream.StoppingIn="Yayın durduruluyor:"
+OutputTimer.Record.StoppingIn="Kayıt durduruluyor:"
 OutputTimer.Stream.EnableEverytime="Her zaman yayın zamanlayıcıyı etkinleştir"
 OutputTimer.Record.EnableEverytime="Her zaman kayıt zamanlayıcıyı etkinleştir"

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

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

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

obs-studio-0.17.0.tar.xz/UI/window-basic-main-profiles.cpp -> obs-studio-17.0.1.tar.xz/UI/window-basic-main-profiles.cpp Changed

obs-studio-0.17.0.tar.xz/cmake/Modules/CopyMSVCBins.cmake -> obs-studio-17.0.1.tar.xz/cmake/Modules/CopyMSVCBins.cmake Changed

obs-studio-0.17.0.tar.xz/deps/libff/libff/ff-demuxer.c -> obs-studio-17.0.1.tar.xz/deps/libff/libff/ff-demuxer.c Changed

obs-studio-0.17.0.tar.xz/libobs/obs-config.h -> obs-studio-17.0.1.tar.xz/libobs/obs-config.h Changed

obs-studio-0.17.0.tar.xz/libobs/obs-scene.c -> obs-studio-17.0.1.tar.xz/libobs/obs-scene.c Changed

@@ -162,7 +162,7 @@
 
 static void scene_enum_sources(void *data,
 		obs_source_enum_proc_t enum_callback,
-		void *param)
+		void *param, bool active)
 {
 	struct obs_scene *scene = data;
 	struct obs_scene_item *item;
@@ -175,7 +175,7 @@
 		next = item->next;
 
 		obs_sceneitem_addref(item);
-		if (os_atomic_load_long(&item->active_refs) > 0)
+		if (!active || os_atomic_load_long(&item->active_refs) > 0)
 			enum_callback(scene->source, item->source, param);
 		obs_sceneitem_release(item);
 
@@ -185,6 +185,20 @@
 	full_unlock(scene);
 }
 
+static void scene_enum_active_sources(void *data,
+		obs_source_enum_proc_t enum_callback,
+		void *param)
+{
+	scene_enum_sources(data, enum_callback, param, true);
+}
+
+static void scene_enum_all_sources(void *data,
+		obs_source_enum_proc_t enum_callback,
+		void *param)
+{
+	scene_enum_sources(data, enum_callback, param, false);
+}
+
 static inline void detach_sceneitem(struct obs_scene_item *item)
 {
 	if (item->prev)
@@ -957,7 +971,8 @@
 	.get_height    = scene_getheight,
 	.load          = scene_load,
 	.save          = scene_save,
-	.enum_active_sources = scene_enum_sources
+	.enum_active_sources = scene_enum_active_sources,
+	.enum_all_sources = scene_enum_all_sources
 };
 
 obs_scene_t *obs_scene_create(const char *name)
@@ -1072,6 +1087,8 @@
 			new_item->align = item->align;
 			new_item->last_width = item->last_width;
 			new_item->last_height = item->last_height;
+			new_item->output_scale = item->output_scale;
+			new_item->scale_filter = item->scale_filter;
 			new_item->box_transform = item->box_transform;
 			new_item->draw_transform = item->draw_transform;
 			new_item->bounds_type = item->bounds_type;

obs-studio-0.17.0.tar.xz/libobs/obs-source.c -> obs-studio-17.0.1.tar.xz/libobs/obs-source.c Changed

@@ -2968,19 +2968,19 @@
 	void *param;
 };
 
-static void enum_source_tree_callback(obs_source_t *parent, obs_source_t *child,
-		void *param)
+static void enum_source_active_tree_callback(obs_source_t *parent,
+		obs_source_t *child, void *param)
 {
 	struct source_enum_data *data = param;
 	bool is_transition = child->info.type == OBS_SOURCE_TYPE_TRANSITION;
 
 	if (is_transition)
 		obs_transition_enum_sources(child,
-				enum_source_tree_callback, param);
+				enum_source_active_tree_callback, param);
 	if (child->info.enum_active_sources) {
 		if (child->context.data) {
 			child->info.enum_active_sources(child->context.data,
-					enum_source_tree_callback, data);
+					enum_source_active_tree_callback, data);
 		}
 	}
 
@@ -3027,11 +3027,67 @@
 	obs_source_addref(source);
 
 	if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
-		obs_transition_enum_sources(source, enum_source_tree_callback,
-				&data);
+		obs_transition_enum_sources(source,
+				enum_source_active_tree_callback, &data);
 	if (source->info.enum_active_sources)
 		source->info.enum_active_sources(source->context.data,
-				enum_source_tree_callback, &data);
+				enum_source_active_tree_callback, &data);
+
+	obs_source_release(source);
+}
+
+static void enum_source_full_tree_callback(obs_source_t *parent,
+		obs_source_t *child, void *param)
+{
+	struct source_enum_data *data = param;
+	bool is_transition = child->info.type == OBS_SOURCE_TYPE_TRANSITION;
+
+	if (is_transition)
+		obs_transition_enum_sources(child,
+				enum_source_full_tree_callback, param);
+	if (child->info.enum_all_sources) {
+		if (child->context.data) {
+			child->info.enum_active_sources(child->context.data,
+					enum_source_full_tree_callback, data);
+		}
+	} else if (child->info.enum_active_sources) {
+		if (child->context.data) {
+			child->info.enum_active_sources(child->context.data,
+					enum_source_full_tree_callback, data);
+		}
+	}
+
+	data->enum_callback(parent, child, data->param);
+}
+
+static void obs_source_enum_full_tree(obs_source_t *source,
+		obs_source_enum_proc_t enum_callback,
+		void *param)
+{
+	struct source_enum_data data = {enum_callback, param};
+	bool is_transition;
+
+	if (!data_valid(source, "obs_source_enum_active_tree"))
+		return;
+
+	is_transition = source->info.type == OBS_SOURCE_TYPE_TRANSITION;
+	if (!is_transition && !source->info.enum_active_sources)
+		return;
+
+	obs_source_addref(source);
+
+	if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
+		obs_transition_enum_sources(source,
+				enum_source_full_tree_callback, &data);
+
+	if (source->info.enum_all_sources) {
+		source->info.enum_all_sources(source->context.data,
+				enum_source_full_tree_callback, &data);
+
+	} else if (source->info.enum_active_sources) {
+		source->info.enum_active_sources(source->context.data,
+				enum_source_full_tree_callback, &data);
+	}
 
 	obs_source_release(source);
 }
@@ -3063,7 +3119,7 @@
 		return false;
 	}
 
-	obs_source_enum_active_tree(child, check_descendant, &info);
+	obs_source_enum_full_tree(child, check_descendant, &info);
 	if (info.exists)
 		return false;

obs-studio-0.17.0.tar.xz/libobs/obs-source.h -> obs-studio-17.0.1.tar.xz/libobs/obs-source.h Changed

obs-studio-0.17.0.tar.xz/plugins/coreaudio-encoder/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/coreaudio-encoder/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/coreaudio-encoder/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/coreaudio-encoder/data/locale/tr-TR.ini Changed

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

@@ -1,11 +1,18 @@
-# 1.4.3.4 - Crimson ReLive Compatibility Update (Hotfix 1)
-Crimson ReLive changed how the Full Range flag is applied, which caused the plugin to break since it expected another property there. This has been fixed and some log messages have been changed to also result in better readability for users and support.
+# 1.4.3.8 - Settings Transfer, Automatic VBV Buffer adjustment and Fixes (Hotfix 2)
+Another day, another new feature: this time it is transferring settings between versions, so that you will no longer use settings when a change to a setting is made. Since it only just now started tracking the config version, it will only work with settings created between 1.4.3.0 and 1.4.3.5, any other version might end up with broken settings.
 
-Hotfix 1: The Driver update also broke VBAQ, but it caused less issues than the Full Range flag. This has been fixed.
+Another change has been done to the Automatic VBV Buffer Size, which will now behave much more predictable. A value of 0% is completely unrestricted, 50% matches the calculated bitrate and 100% matches the calculated strict bitrate.
+
+Presets will also now use the proper minimum and maximum QP values and the minimum QP default value has been increased to 11.
+
+Hotfix 1: Fix enumeration based properties not working correctly due to a programming error.
+Hotfix 2: Actually fix the enumeration based properties for real this time.
 
 ## Changelog
-* Hotfix 1: Experimental Property VBAQ would not be properly set.
-* Hotfix 1: Runtime and Compiled Against version numbers were switched around.
-* Fixed: Experimental Full Range Color mode no longer causes encoding to fail. (Fixes #175)
-* Changed: Queue status log messages have been reduced to once per second instead of once per frame.
-* Changed: First submission log message now show the time in seconds instead of nanoseconds.
+* Added: Version-specific setting transfer code which should reduce the lost settings between updates.
+* Changed: VBV Buffer Strictness is now linear with three steps: 100000 (0%), Target Bitrate (50%) and Strict Target Bitrate (100%).
+* Changed: Default for Minimum QP is now 11.
+* Fixed: Presets not using the proper QP Minimum and Maximum.
+* Fixed: Startup log messages not showing proper error codes.
+* Hotfix: Fix enumeration based properties not using the correct values.
+* Hotfix: Fix the default value for B-Frame Pattern being '-1' due to an oversight in code.
\ No newline at end of file

obs-studio-0.17.0.tar.xz/plugins/enc-amf/CMakeLists.txt -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/CMakeLists.txt Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/CONTRIBUTING.md -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/CONTRIBUTING.md Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/amf-capabilities.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/amf-capabilities.h Changed

@@ -85,10 +85,10 @@
 				Plugin::API::Adapter adapter);
 			static void ReportAdapterTypeCapabilities(std::shared_ptr<Plugin::API::Base> api,
 				Plugin::API::Adapter adapter,
-				VCEEncoderType type);
+				H264EncoderType type);
 			static void ReportAdapterTypeIOCapabilities(std::shared_ptr<Plugin::API::Base> api,
 				Plugin::API::Adapter adapter,
-				VCEEncoderType type,
+				H264EncoderType type,
 				bool output);
 
 			//////////////////////////////////////////////////////////////////////////
@@ -99,13 +99,13 @@
 			~VCECapabilities();
 
 			bool Refresh();
-			std::vector<std::pair<VCEEncoderType, VCEDeviceCapabilities>>
+			std::vector<std::pair<H264EncoderType, VCEDeviceCapabilities>>
 				GetAllAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter);
 			VCEDeviceCapabilities
-				GetAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, VCEEncoderType type);
+				GetAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type);
 
 			private:
-			std::map<std::tuple<std::string, Plugin::API::Adapter, Plugin::AMD::VCEEncoderType>, VCEDeviceCapabilities> capabilityMap;
+			std::map<std::tuple<std::string, Plugin::API::Adapter, Plugin::AMD::H264EncoderType>, VCEDeviceCapabilities> capabilityMap;
 		};
 	}
 }
\ No newline at end of file

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/amf-h264.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/amf-h264.h Changed

@@ -46,125 +46,120 @@
 namespace Plugin {
 	namespace AMD {
 		// Internal Properties
-		enum VCEEncoderType {
-			VCEEncoderType_AVC,		// Advanced Video Coding
-			VCEEncoderType_SVC,		// Scalable Video Coding
-			VCEEncoderType_HEVC,	// High-Efficiency Video Coding (Discovered in amfrt64.dll)
+		enum class H264EncoderType : uint8_t {
+			AVC = 0,	// Advanced Video Coding
+			SVC,		// Scalable Video Coding
+			HEVC,		// High-Efficiency Video Coding (Discovered in amfrt64.dll)
 		};
-		enum VCEMemoryType {
-			VCEMemoryType_Host,			// Host-Managed Memory
-			VCEMemoryType_DirectX9,		// DirectX9
-			VCEMemoryType_DirectX11,	// DirectX11
-			VCEMemoryType_OpenGL,		// OpenGL
+		enum class H264MemoryType : uint8_t {
+			Host = 0,	// Host-Managed Memory
+			DirectX9,	// DirectX9
+			DirectX11,	// DirectX11
+			OpenGL,		// OpenGL
 		};
-		enum VCEColorFormat {
+		enum class H264ColorFormat : uint8_t {
 			// 4:2:0 Formats
-			VCEColorFormat_NV12,	// NV12
-			VCEColorFormat_I420,	// YUV 4:2:0
+			NV12 = 0,	// NV12
+			I420,		// YUV 4:2:0
 			// 4:2:2 Formats
-			VCEColorFormat_YUY2,
+			YUY2,
 			// Uncompressed
-			VCEColorFormat_BGRA,	// ARGB
-			VCEColorFormat_RGBA,	// RGBA
+			BGRA,		// ARGB
+			RGBA,		// RGBA
 			// Other
-			VCEColorFormat_GRAY,
+			GRAY,		// Y 4:0:0
 		};
-		enum VCEColorProfile {
-			VCEColorProfile_601,
-			VCEColorProfile_709,
-			VCEColorProfile_2020, // HDR
+		enum class H264ColorProfile : uint8_t {
+			Rec601 = 0,
+			Rec709,
+			Rec2020, // Truer to world color, used for HDR
 		};
 
 		// Static Properties
-		enum VCEUsage {
-			VCEUsage_Transcoding,
-			VCEUsage_UltraLowLatency,
-			VCEUsage_LowLatency,
-			VCEUsage_Webcam,			// For SVC
+		enum class H264Usage : uint8_t {
+			Transcoding = 0,	// Only one capable of streaming to services.
+			UltraLowLatency,	// Low Latency Recording or Network Streaming
+			LowLatency,			// Low Latency Recording or Network Streaming
+			Webcam,				// For SVC Recording and Streaming
 		};
-		enum VCEQualityPreset {
-			VCEQualityPreset_Speed,
-			VCEQualityPreset_Balanced,
-			VCEQualityPreset_Quality,
+		enum class H264QualityPreset : uint8_t {
+			Speed = 0,
+			Balanced,
+			Quality,
 		};
-		enum VCEProfile {
-			VCEProfile_Baseline = 66,
-			VCEProfile_Main = 77,
-			VCEProfile_High = 100,
-			VCEProfile_ConstrainedBaseline = 256,
-			VCEProfile_ConstrainedHigh = 257
+		enum class H264Profile : uint16_t {
+			Baseline = 66,
+			Main = 77,
+			High = 100,
+			ConstrainedBaseline = 256,
+			ConstrainedHigh = 257
 		};
-		enum VCEProfileLevel {
-			VCEProfileLevel_Automatic = 0,
-			VCEProfileLevel_10 = 10,
-			VCEProfileLevel_11,
-			VCEProfileLevel_12,
-			VCEProfileLevel_13,
-			VCEProfileLevel_20 = 20,
-			VCEProfileLevel_21,
-			VCEProfileLevel_22,
-			VCEProfileLevel_30 = 30,
-			VCEProfileLevel_31,
-			VCEProfileLevel_32,
-			VCEProfileLevel_40 = 40,
-			VCEProfileLevel_41,
-			VCEProfileLevel_42,
-			VCEProfileLevel_50 = 50,
-			VCEProfileLevel_51,
-			VCEProfileLevel_52,
-			VCEProfileLevel_60 = 60,
-			VCEProfileLevel_61,
-			VCEProfileLevel_62,
+		enum class H264ProfileLevel : uint8_t {
+			Automatic = 0,
+			L10 = 10,
+			L11,
+			L12,
+			L13,
+			L20 = 20,
+			L21,
+			L22,
+			L30 = 30,
+			L31,
+			L32,
+			L40 = 40,
+			L41,
+			L42,
+			L50 = 50,
+			L51,
+			L52,
 		};
-		enum VCEScanType {
-			VCEScanType_Progressive,
-			VCEScanType_Interlaced,
+		enum class H264ScanType : uint8_t {
+			Progressive = 0,
+			Interlaced,
 		};
-		enum VCECodingType {
-			VCECodingType_Default = 0,
-			VCECodingType_CABAC = 1,
-			VCECodingType_CALVC = 2,
+		enum class H264CodingType : uint8_t {
+			Default = 0,
+			CABAC = 1,
+			CALVC = 2,
 		};
 
 		// Dynamic Properties
-		enum VCERateControlMethod {
-			VCERateControlMethod_ConstantQP,
-			VCERateControlMethod_ConstantBitrate,
-			VCERateControlMethod_VariableBitrate_PeakConstrained,
-			VCERateControlMethod_VariableBitrate_LatencyConstrained,
+		enum class H264RateControlMethod : uint8_t {
+			ConstantQP = 0,
+			ConstantBitrate,
+			VariableBitrate_PeakConstrained,
+			VariableBitrate_LatencyConstrained = 3,
 		};
-		enum VCEBFramePattern {
-			VCEBFramePattern_None,
-			VCEBFramePattern_One,
-			VCEBFramePattern_Two,
-			VCEBFramePattern_Three,
+		enum class H264BFramePattern : uint8_t {
+			None = 0,
+			One,
+			Two,
+			Three,
 		};
 
 		// Experimental
-		enum VCESliceMode {
-			VCESliceMode_Horizontal = 1,
-			VCESliceMode_Vertical = 2
+		enum class H264SliceMode : uint8_t {
+			Horizontal = 1,
+			Vertical = 2
 		};
-		enum VCESliceControlMode {
-			VCESliceControlMode_Off,
-			VCESliceControlMode_Macroblock = 1, // AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB
-			VCESliceControlMode_Invalid,
-			VCESliceControlMode_Macroblock_Row = 3 // AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB_ROW
+		enum class H264SliceControlMode : uint8_t {
+			Off = 0,
+			Macroblock = 1, // AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB
+			Invalid,
+			Macroblock_Row = 3 // AMF_VIDEO_ENCODER_SLICE_CTRL_MODE_MB_ROW
 		};
-
-
-
-		class VCEEncoder {
+		
+		class H264Encoder {
 			#pragma region Initializer & Finalizer
 			public:
-			VCEEncoder(
-				VCEEncoderType p_Type,
+			H264Encoder(
+				H264EncoderType p_Type,
 				std::string p_VideoAPI,
 				uint64_t p_VideoAdapterId,
 				bool p_OpenCL,
-				VCEColorFormat p_SurfaceFormat = VCEColorFormat_NV12
+				H264ColorFormat p_SurfaceFormat = H264ColorFormat::NV12
 			);
-			~VCEEncoder();
+			~H264Encoder();
 			#pragma endregion Initializer & Finalizer
 
 			public:
@@ -187,27 +182,27 @@
 			#pragma region Startup Properties
 			// Set which Usage preset to use.
 			// Changing this will also change a lot of other properties.
-			void SetUsage(VCEUsage usage);
-			VCEUsage GetUsage();
+			void SetUsage(H264Usage usage);
+			H264Usage GetUsage();
 
 			// Set which Quality Preset AMF should use.
 			// Affects the quality of the output.
-			void SetQualityPreset(VCEQualityPreset preset);
-			VCEQualityPreset GetQualityPreset();
+			void SetQualityPreset(H264QualityPreset preset);
+			H264QualityPreset GetQualityPreset();
 
 			// Set the Profile the output should have.
-			void SetProfile(VCEProfile profile);
-			VCEProfile GetProfile();
+			void SetProfile(H264Profile profile);
+			H264Profile GetProfile();
 
 			// Set the Profile Level the output should have.
-			void SetProfileLevel(VCEProfileLevel level);
-			VCEProfileLevel GetProfileLevel();
+			void SetProfileLevel(H264ProfileLevel level);
+			H264ProfileLevel GetProfileLevel();
 			#pragma endregion Startup Properties
 
 			#pragma region Frame Properties
 			// Set which Color Profile the input frame is.
-			void SetColorProfile(VCEColorProfile profile);
-			VCEColorProfile GetColorProfile();
+			void SetColorProfile(H264ColorProfile profile);
+			H264ColorProfile GetColorProfile();
 
 			// Set if the input frame is in full color range.
 			void SetFullRangeColorEnabled(bool enabled);
@@ -222,8 +217,8 @@
 			std::pair<uint32_t, uint32_t> GetFrameRate();
 
 			// Scanning method for input (and output?).
-			void SetScanType(VCEScanType scanType);
-			VCEScanType GetScanType();
+			void SetScanType(H264ScanType scanType);
+			H264ScanType GetScanType();
 			#pragma endregion Frame Properties
 
 			// Dynamic
@@ -239,8 +234,8 @@
 			 *	- 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-Frames).
 			**/
-			void SetRateControlMethod(VCERateControlMethod method);
-			VCERateControlMethod GetRateControlMethod();
+			void SetRateControlMethod(H264RateControlMethod method);
+			H264RateControlMethod GetRateControlMethod();
 
 			/*	Sets the target bitrate */
 			void SetTargetBitrate(uint32_t bitrate);
@@ -300,8 +295,8 @@
 
 			#pragma region B-Frames
 			/*	Sets the number of consecutive B-Frames. BFramesPattern = 0 indicates that B-Frames are not used */
-			void SetBFramePattern(VCEBFramePattern pattern);
-			VCEBFramePattern GetBFramePattern();
+			void SetBFramePattern(H264BFramePattern pattern);
+			H264BFramePattern GetBFramePattern();
 
 			/* Selects the delta QP of non-reference B-Frames with respect to the last non-B-Frame */
 			void SetBFrameDeltaQP(int8_t qp);
@@ -338,8 +333,8 @@
 			uint32_t GetMaxMBPerSec();
 
 			/* Coding Type */
-			void SetCodingType(VCECodingType type);
-			VCECodingType GetCodingType();
+			void SetCodingType(H264CodingType type);
+			H264CodingType GetCodingType();
 
 			void SetWaitForTaskEnabled(bool enabled);
 			bool IsWaitForTaskEnabled();
@@ -404,16 +399,16 @@
 			uint32_t GetSlicesPerFrame();
 
 			// - SliceMode (1 - 2, Default is 1)
-			void SetSliceMode(VCESliceMode mode);
-			VCESliceMode GetSliceMode();
+			void SetSliceMode(H264SliceMode mode);
+			H264SliceMode GetSliceMode();
 
 			// - MaxSliceSize (1 - INT_MAX)
 			void SetMaximumSliceSize(uint32_t size);
 			uint32_t GetMaximumSliceSize();
 
 			// - SliceControlMode (0 - 3)
-			void SetSliceControlMode(VCESliceControlMode mode);
-			VCESliceControlMode GetSliceControlMode();
+			void SetSliceControlMode(H264SliceControlMode mode);
+			H264SliceControlMode GetSliceControlMode();
 
 			// - SliceControlSize (0 - INT_MAX)
 			void SetSliceControlSize(uint32_t size);
@@ -437,9 +432,9 @@
 
 			// Threading
 			private:
-			static void InputThreadMain(Plugin::AMD::VCEEncoder* p_this);
+			static void InputThreadMain(Plugin::AMD::H264Encoder* p_this);
 			void InputThreadLogic();
-			static void OutputThreadMain(Plugin::AMD::VCEEncoder* p_this);
+			static void OutputThreadMain(Plugin::AMD::H264Encoder* p_this);
 			void OutputThreadLogic();
 			inline amf::AMFSurfacePtr CreateSurfaceFromFrame(struct encoder_frame*& frame);
 
@@ -483,10 +478,10 @@
 			} m_Output;
 
 			// Internal Properties
-			VCEEncoderType m_EncoderType;
-			VCEMemoryType m_MemoryType;
+			H264EncoderType m_EncoderType;
+			H264MemoryType m_MemoryType;
 			bool m_OpenCL;
-			VCEColorFormat m_ColorFormat;
+			H264ColorFormat m_ColorFormat;
 			bool m_Flag_IsStarted,
 				m_Flag_FirstFrameSubmitted,
 				m_Flag_FirstFrameReceived;
@@ -497,7 +492,7 @@
 			size_t m_InputQueueLimit,
 				m_InputQueueLastSize;
 			uint32_t m_TimerPeriod;
-			VCEColorProfile m_ColorProfile;
+			H264ColorProfile m_ColorProfile;
 			std::chrono::time_point<std::chrono::high_resolution_clock> m_LastQueueWarnMessageTime;
 
 			#pragma endregion Members

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/amf.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/amf.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/api-base.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/api-base.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/api-d3d11.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/api-d3d11.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/api-d3d9.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/api-d3d9.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/api-host.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/api-host.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/api-opengl.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/api-opengl.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/enc-h264.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/enc-h264.h Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Include/plugin.h -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Include/plugin.h Changed

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

@@ -4,6 +4,7 @@
 AMF.Util.Toggle.Disabled="Desactivat"
 AMF.Util.Toggle.Enabled="Activat"
 AMF.H264.Preset="Configuració preestablerta"
+AMF.H264.Preset.ResetToDefaults="Restableix als valors per defecte"
 AMF.H264.Preset.Recording="S'està enregistrant"
 AMF.H264.Preset.HighQuality="Alta qualitat"
 AMF.H264.Preset.Indistinguishable="Indistinguible"
@@ -16,34 +17,112 @@
 AMF.H264.Usage.UltraLowLatency="Latència ultra baixa"
 AMF.H264.Usage.LowLatency="Latència baixa"
 AMF.H264.QualityPreset="Qualitat del perfil"
+AMF.H264.QualityPreset.Description="Quina qualitat del perfil d'AMD s'ha d'intentar aconseguir:\n- 'Velocitat' és la més ràpida però la que pitjor qualitat obté,\n- 'Equilibrat' està entre 'Velocitat' i 'Qualitat' oferint un balanç entre els dos,\n- 'Qualitat' ofereix la millor qualitat possible per una determinada tassa de marcs."
 AMF.H264.QualityPreset.Speed="Velocitat"
 AMF.H264.QualityPreset.Balanced="Equilibrat"
 AMF.H264.QualityPreset.Quality="Qualitat"
 AMF.H264.Profile="Perfil"
+AMF.H264.Profile.Description="Quin perfil H.264 s'ha d'utilitzar per la codificació, ordenats de major qualitat al més suportat."
 AMF.H264.ProfileLevel="Nivell de perfil"
+AMF.H264.ProfileLevel.Description="Nivell de perfil H.264 a utilitzar per la codificació:\n- 'Automàtic' calcula el millor nivell de perfil per certa velocitat i mida de marcs,\n- '4.1' suporta 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' suporta 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' suporta 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' suporta 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' suporta 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
 AMF.H264.RateControlMethod="Mètode de control del flux"
+AMF.H264.RateControlMethod.Description="Quin mètode de control de flux s'ha d'utilitzar:\n- '\@AMF.H264.RateControlMethod.CQP\@' assigna valors fixos de QP a I-/P-/B-Frames (Paràmetre de quantització),\n- '\@AMF.H264.RateControlMethod.CBR\@' es manté en la tassa de marcs objectiu (utilitzant dades de farciment) (recomanat per transmissions en directe),\n- '\@AMF.H264.RateControlMethod.VBR\@' es manté per sota d'un pic de tassa de marcs,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' es manté prop de la tassa de marcs desitjada si la latència i carrega de la GPU ho permet, si no s'augmentarà la taxa de marcs (recomanat per a enregistraments)."
 AMF.H264.RateControlMethod.CQP="QP constant (CQP)"
 AMF.H264.RateControlMethod.CBR="Flux constant (CBR)"
 AMF.H264.RateControlMethod.VBR.Peak="Flux variable (pic restringit)(VBR)"
 AMF.H264.RateControlMethod.VBR.Latency="Flux variable (latència restringida) (VBR_LAT)"
 AMF.H264.Bitrate.Target="Tassa de bits desitjada"
+AMF.H264.Bitrate.Target.Description="Tassa de marcs a intentar arribar a la seqüència general."
 AMF.H264.Bitrate.Peak="Pic de tassa de bits"
+AMF.H264.Bitrate.Peak.Description="Tassa de marcs a intentar aconseguir com pic màxim en la seqüència general."
 AMF.H264.QP.Minimum="QP mínim"
+AMF.H264.QP.Minimum.Description="Valor mínim de QP (paràmetre de quantització) a utilitzar en un fotograma."
 AMF.H264.QP.Maximum="QP màxim"
+AMF.H264.QP.Maximum.Description="Valor màxim de QP (paràmetre de quantització) a utilitzar en un fotograma."
 AMF.H264.QP.IFrame="I-Frame QP"
+AMF.H264.QP.IFrame.Description="Valor fix de QP per I-Frames."
 AMF.H264.QP.PFrame="P-Frame QP"
+AMF.H264.QP.PFrame.Description="Valor fix de QP per P-Frames."
 AMF.H264.QP.BFrame="B-Frame QP"
+AMF.H264.QP.BFrame.Description="Valor de QP fix (paràmetre de quantització) a utilitzar per B-Frames."
+AMF.H264.VBVBuffer="Memòria intermèdia VBV"
+AMF.H264.VBVBuffer.Description="Quin mètode s'ha d'utilitzar per determinar la mida de la memòria intermèdia VBV:\n- 'Automàtic' calcula la mida utilitzant una restricció estricta,\n- 'Manual' permet a l'usuari controlar la mida.\nLa memòria intermèdia VBV (Verificador de la memòria intermèdia del vídeo) és usat per certs mètodes de control del flux per mantenir la taxa de bits dins dels paràmetres establerts."
+AMF.H264.VBVBuffer.Strictness="Rigorositat de la memòria intermèdia VBV"
+AMF.H264.VBVBuffer.Strictness.Description="Determina la rigidesa de la memòria intermèdia VBV, con 100% essent tant estricte com sigui possible i 0% sense restricció."
+AMF.H264.VBVBuffer.Size="Mida de la memòria intermèdia VBV"
+AMF.H264.VBVBuffer.Size.Description="La mida de la memòria intermèdia VBV que s'utilitza per al control de la tassa de marcs en una seqüencia."
+AMF.H264.VBVBuffer.Fullness="Amplitud de la memòria intermèdia VBV"
+AMF.H264.VBVBuffer.Fullness.Description="Com de ple és la memòria intermèdia VMV inicialment, només afectarà la seqüència inicial de la codificació."
 AMF.H264.FillerData="Dades a omplir"
+AMF.H264.FillerData.Description="En activar les dades de farciment es permet al codificador mantenir almenys la tassa de marcs desitjada omplint l'espai que falta amb informació sense valor."
 AMF.H264.FrameSkipping="Omissió de fotogrames"
+AMF.H264.FrameSkipping.Description="L'omissió de fotogrames permet al codificador saltar fotogrames per complir amb el requeriment de la tassa de marcs objectiu.\nQuan el codificador salta un fotograma inserirà una NAL que repetirà el darrer fotograma codificat a la transmissió.\nPot ajudar amb tassa de bits objectiu molt baixes."
 AMF.H264.EnforceHRDCompatibility="Força la compatibilitat amb HRD"
+AMF.H264.EnforceHRDCompatibility.Description="Força les restriccions del descodificador hipotètic de referència que limiten el canvi de valor màxim de QP dins d'un fotograma."
+AMF.H264.KeyframeInterval="Interval de fotogrames clau"
+AMF.H264.KeyframeInterval.Description="Quants segons han d'haver entre fotogrames que no es poden descartar.\nTambé controla la mida de la seqüència (GOP)."
+AMF.H264.IDRPeriod="Període IDR"
+AMF.H264.IDRPeriod.Description="Defineix la distància entre Instantaneous Decoding Refreshes (IDR) en fotogrames. També controla la mida de la seqüència del GOP."
+AMF.H264.BFrame.Pattern="B-Frames"
+AMF.H264.BFrame.Pattern.Description="La quantitat de B-Frames a utilitzar mestre es codifica.\nCompatible amb targetes de 2ª i 3ª generació VCE. Impacte negatiu en el rendiment de codificació."
+AMF.H264.BFrame.DeltaQP="Delta QP per B-Frames"
+AMF.H264.BFrame.DeltaQP.Description="Valor Delta QP per al darrer I- o P-Frame per B-Frames no referenciables."
+AMF.H264.BFrame.Reference="B-Frames referenciables"
+AMF.H264.BFrame.Reference.Description="Permet a un B-Frames utilitzar també B-Frames com referència, enlloc de P- i I-Frames."
+AMF.H264.BFrame.ReferenceDeltaQP="Delta QP per als fotogrames referenciables"
+AMF.H264.BFrame.ReferenceDeltaQP.Description="Valor Delta QP per al darrer I- o P-Frame per B-Frames referenciables."
 AMF.H264.DeblockingFilter="Filtre d'eliminació de blocs"
+AMF.H264.DeblockingFilter.Description="Estableix l'indicador que el descodificador està permès a utilitzar el Filtre d'eliminació de blocs per a la transmissió codificada."
 AMF.H264.ScanType="Tipus d'exploració"
+AMF.H264.ScanType.Description="Quin mètode de escaneig utilitzar, deixeu-lo sempre a '\@AMF.H264.ScanType.Progressive\@'."
 AMF.H264.ScanType.Progressive="Progressiu"
 AMF.H264.ScanType.Interlaced="Entrellaçat"
+AMF.H264.MotionEstimation="Estimació del moviment"
+AMF.H264.MotionEstimation.Description="L'estimació del moviment permet al codificador reduir el flux de dades necessari calculant d'on vénen els píxels."
 AMF.H264.MotionEstimation.None="Cap"
 AMF.H264.MotionEstimation.Half="Meitat de píxel"
 AMF.H264.MotionEstimation.Quarter="Quart de Píxel"
+AMF.H264.MotionEstimation.Both="Meitat i quart de píxel"
+AMF.H264.CodingType="Tipus de codificació"
+AMF.H264.CodingType.Description="Quin tipus de codificació utilitzar:\n* \@AMF.Util.Default\@ deixeu que AMF ho decideixi (recomanat).\n* CALVC (Context-Adaptive Variable-Length Coding) és més ràpid, però mes gran.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) es més lent, però més petit."
 AMF.H264.MaximumLTRFrames="Fotogrames màxims LTR"
+AMF.H264.MaximumLTRFrames.Description="Fotogrames de referència a llarg plaç (LTR) és una característica que permet al codificador marcar certs marcs en una seqüencia com referents per un llarg temps.\nEls fotogrames LTR no poden ser utilitzats amb B-Pictures i el codificador desactivarà B-Pictures si s'utilitza."
+AMF.H264.MaximumAccessUnitSize="Mida màxima de la unitat d'accés"
+AMF.H264.MaximumAccessUnitSize.Description="Mida d'una unitat d'accés per a una NAL."
+AMF.H264.HeaderInsertionSpacing="Espaiat d'inserció de capçaleres"
+AMF.H264.HeaderInsertionSpacing.Description="Quants fotogrames han d'haver entre capçaleres NAL."
+AMF.H264.WaitForTask="Espera per la tasca"
+AMF.H264.WaitForTask.Description="Desconegut, Experimental"
+AMF.H264.PreAnalysisPass="Passada d'anàlisi previ"
+AMF.H264.PreAnalysisPass.Description="Desconegut, Experimental"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Desconegut, Experimental"
+AMF.H264.GOPSize="Mida del GOP"
+AMF.H264.GOPSize.Description="Desconegut, Experimental"
+AMF.H264.GOPAlignment="Alineació del GOP"
+AMF.H264.GOPAlignment.Description="Desconegut, Experimental"
+AMF.H264.MaximumReferenceFrames="Fotogrames de referència màxims"
+AMF.H264.MaximumReferenceFrames.Description="Desconegut, Experimental"
+AMF.H264.SlicesPerFrame="Porcions per fotograma"
+AMF.H264.SlicesPerFrame.Description="Quantes porcions I-Frame han de ser emmagatzemats en cada fotograma?\nUn valor de 0 permet al codificador decidir sobre la marxa.\nLa codificació Intra-Refresh és usada per a una reproducció i exploració més fluïda."
+AMF.H264.SliceMode="Mode de porcions"
+AMF.H264.SliceMode.Description="Desconegut, Experimental"
+AMF.H264.MaximumSliceSize="Mida màxima de la porció"
+AMF.H264.MaximumSliceSize.Description="Desconegut, Experimental"
+AMF.H264.SliceControlMode="Mode de control de la porció"
+AMF.H264.SliceControlMode.Description="Desconegut, Experimental"
+AMF.H264.SliceControlSize="Control de mida de la porció"
+AMF.H264.SliceControlSize.Description="Desconegut, Experimental"
+AMF.H264.IntraRefresh.NumberOfStripes="Numero de línies Intra-Refresh"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Desconegut, Experimental"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Macroblocs intra-refresh per Slot"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Quants macroblocs han de ser emmagatzemats en cada slot?\nUn valor de 0 desactiva aquesta funció.\nLa codificació Intra-Refresh és usada per a una reproducció i exploració més fluïda."
+AMF.H264.VideoAPI="API de vídeo"
+AMF.H264.VideoAPI.Description="Quina API utilitzar per la codificació."
+AMF.H264.VideoAdapter="Adaptador de vídeo"
+AMF.H264.VideoAdapter.Description="Quin adaptador utilitzar per la codificació."
+AMF.H264.OpenCL="OpenCL"
+AMF.H264.OpenCL.Description="El codificador hauria d'utilitzar OpenCL per presentar els fotogrames individuals?"
 AMF.H264.View="Mode de visualització"
 AMF.H264.View.Description="Quines propietats han de ser visibles. No rebreu suport si feu servir el mode de vista 'Expert' o 'Màster'."
 AMF.H264.View.Basic="Bàsic"

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

@@ -1,15 +1,29 @@
 AMF.Util.Default="Standard"
+AMF.Util.Automatic="Automatisk"
+AMF.Util.Manual="Manuelt"
 AMF.Util.Toggle.Disabled="Deaktiveret"
 AMF.Util.Toggle.Enabled="Aktiveret"
+AMF.H264.Preset="Forudindstillinger"
+AMF.H264.Preset.ResetToDefaults="Nulstil til standarder"
+AMF.H264.Preset.Recording="Optagelse"
+AMF.H264.Preset.HighQuality="Højkvalitet"
+AMF.H264.Preset.Indistinguishable="Indistingverbar"
+AMF.H264.Preset.Lossless="Tabsfri"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Anvendelse"
+AMF.H264.Usage.Description="Hvilken anvendelse AMF bør indstilles til:\n- '\@AMF.H264.Usage.Transcoding\@' er omkodning til generelle formål (anbefalet),\n - '\@AMF.H264.Usage.UltraLowLatency\@' er til virkelig lav-forsinkelseskodning,\n- '\@AMF.H264.Usage.LowLatency\@' er tilsvarende ovennævnte med en lidt større forsinkelse.\nStreaming understøtter kun '\@AMF.H264.Usage.Transcoding\@', alle andre værdier kan benyttes til optagelse."
 AMF.H264.Usage.Transcoding="Transcoding"
 AMF.H264.Usage.UltraLowLatency="Ekstrem Lav Ventetid"
 AMF.H264.Usage.LowLatency="Lav Ventetid"
 AMF.H264.QualityPreset="Kvalitets profiler"
+AMF.H264.QualityPreset.Description="Hvilken Kvalitetsforudindstilling AMF bør forsøges målrettet imod:\n- '\@AMF. H264. QualityPreset.Speed\@' er den hurtigste, men har den ringeste kvalitet,\n- '\@AMF. H264. QualityPreset.Balanced\@' er en balanceret blanding af begge,\n- '\@AMF. H264. QualityPreset.Quality\@' giver den bedste kvalitet for en given bithastighed."
 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.Profile.Description="Hvilken H.264-profil at benytte til kodning, sorteret fra højeste kvalitet til mest udbredte understøttelse."
 AMF.H264.ProfileLevel="Profil Niveau"
+AMF.H264.ProfileLevel.Description="Hvilket H.264-profilniveau at benytte til kodning:\n- ' \@AMF. Util.Automatic\@' beregner det best profilniveau for en given billedhastighed og -størrelse,\n- '4.1' understøtter 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' understøtter 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' understøtter 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' understøtter 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' understøtter 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960 x 540 172 FPS"
 AMF.H264.RateControlMethod="Rate Control Method"
 AMF.H264.RateControlMethod.CQP="Constant QP (CQP)"
 AMF.H264.RateControlMethod.CBR="Constant Bitrate (CBR)"

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

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

@@ -24,13 +24,13 @@
 AMF.H264.ProfileLevel="Profil szint"
 AMF.H264.RateControlMethod="Bitráta vezérlés"
 AMF.H264.RateControlMethod.CQP="Erőltetett QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Konstans bitráta (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Változó bitráta (Csúcsértéket betartva) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Változó bitráta (Késleltetés kényszerítése) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Bitráta (Bitben)"
+AMF.H264.RateControlMethod.CBR="Konstans bitsebesség (CBR)"
+AMF.H264.RateControlMethod.VBR.Peak="Változó bitsebesség (Csúcsértéket betartva) (VBR)"
+AMF.H264.RateControlMethod.VBR.Latency="Változó bitsebesség (Késleltetés kényszerítése) (VBR_LAT)"
+AMF.H264.Bitrate.Target="Célbitsebesség"
 AMF.H264.Bitrate.Target.Description="Bitráta amelyet szeretne elérni a konvertálás során."
-AMF.H264.Bitrate.Peak="Csúcs bitráta (Bitben)"
-AMF.H264.Bitrate.Peak.Description="Bitráta amelyet maximálisan elérhet a konvertálás során."
+AMF.H264.Bitrate.Peak="Csúcs bitsebesség"
+AMF.H264.Bitrate.Peak.Description="Bitsebesség amelyet maximálisan elérhet a konvertálás során."
 AMF.H264.QP.Minimum="Minimum QP"
 AMF.H264.QP.Minimum.Description="Legalacsonyabb QP (Quantization Parameter) képkockában használható érték."
 AMF.H264.QP.Maximum="Maximum QP"
@@ -52,7 +52,9 @@
 AMF.H264.KeyframeInterval="Kulcsképkocka időköze"
 AMF.H264.IDRPeriod="IDR időköz"
 AMF.H264.BFrame.Pattern="B képkocka"
+AMF.H264.BFrame.Pattern.Description="A B képkockák száma kódolás közben.\nA második és harmadik generációjú VCE kártyák támogatják. Hátráltató hatása van a kódolás teljesítményére."
 AMF.H264.BFrame.DeltaQP="B képkocka Delta QP"
+AMF.H264.BFrame.DeltaQP.Description="Delta QP érték az utolsó I vagy P képkocka nem referenciálható B képkockáihoz."
 AMF.H264.BFrame.Reference="Referenciálható B képkockák"
 AMF.H264.BFrame.Reference.Description="Lehetővé teszi a B képkockák számára, hogy B képkockát referenciaként használjon, P és I képkockák helyett."
 AMF.H264.BFrame.ReferenceDeltaQP="Delta QP a referenciálható B kockákhoz"
@@ -62,6 +64,7 @@
 AMF.H264.ScanType.Progressive="Progresszív"
 AMF.H264.ScanType.Interlaced="Váltottsoros (Kísérleti)"
 AMF.H264.MotionEstimation="Mozgásbecslés"
+AMF.H264.MotionEstimation.Description="Mozdulat becslés lehetővé teszi a kódolónak, hogy csökkentse a bitsebesség követelményt a pixel elmozdulásának a felbecsülésével."
 AMF.H264.MotionEstimation.None="Semmi"
 AMF.H264.MotionEstimation.Half="Fél-pixel"
 AMF.H264.MotionEstimation.Quarter="Negyed-pixel"
@@ -69,20 +72,39 @@
 AMF.H264.CodingType="Kódolás típusa"
 AMF.H264.MaximumLTRFrames="Maximális LTR képkocka"
 AMF.H264.MaximumAccessUnitSize="Hozzáférési egység maximális mérete"
+AMF.H264.MaximumAccessUnitSize.Description="NAL számára a legnagyobb elérési egység."
+AMF.H264.HeaderInsertionSpacing.Description="NAL fejlécek közötti képkockák száma."
+AMF.H264.WaitForTask="Feladatra várakozás"
+AMF.H264.WaitForTask.Description="Ismeretlen, kísérleti"
 AMF.H264.PreAnalysisPass="Elemzés előtti fázis"
+AMF.H264.PreAnalysisPass.Description="Ismeretlen, kísérleti"
 AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Ismeretlen, kísérleti"
 AMF.H264.GOPSize="GOP méret"
+AMF.H264.GOPSize.Description="Ismeretlen, kísérleti"
 AMF.H264.GOPAlignment="GOP igazítás"
+AMF.H264.GOPAlignment.Description="Ismeretlen, kísérleti"
 AMF.H264.MaximumReferenceFrames="Maximális referencia képkockák"
+AMF.H264.MaximumReferenceFrames.Description="Ismeretlen, kísérleti"
 AMF.H264.SlicesPerFrame="Szeletelés képkockánként"
 AMF.H264.SliceMode="Szelet mód"
+AMF.H264.SliceMode.Description="Ismeretlen, kísérleti"
 AMF.H264.MaximumSliceSize="Maximális szeletméret"
+AMF.H264.MaximumSliceSize.Description="Ismeretlen, kísérleti"
+AMF.H264.SliceControlMode="Szelet ellenőrzési mód"
+AMF.H264.SliceControlMode.Description="Ismeretlen, kísérleti"
+AMF.H264.SliceControlSize="Szeletméret ellenőrzés"
+AMF.H264.SliceControlSize.Description="Ismeretlen, kísérleti"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Ismeretlen, kísérleti"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Hány makroblokkot tároljon céllánként?\nA 0 érték kikapcsolja a funkciót.\nIntra-Refresh kódolás a gyorsabb lejátszáshoz és kereséshez használható."
 AMF.H264.VideoAPI="Videó API"
 AMF.H264.VideoAPI.Description="Melyik API használható kódoláshoz."
 AMF.H264.VideoAdapter="Videó adapter"
 AMF.H264.VideoAdapter.Description="Melyik adapter használható kódoláshoz."
 AMF.H264.OpenCL="OpenCL"
+AMF.H264.OpenCL.Description="A kódolós használhat OpenCL-t az egyes képkockák elkészítéséhez?"
 AMF.H264.View="Nézet mód"
+AMF.H264.View.Description="Milyen tulajdonságok jelenjenek meg?\nA '\@AMF.H264.View.Master\@' használata kizárja a támogatásban való részesülésből."
 AMF.H264.View.Basic="Alap"
 AMF.H264.View.Advanced="Haladó"
 AMF.H264.View.Expert="Szakértő"

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Resources/locale/it-IT.ini -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Resources/locale/it-IT.ini Changed

@@ -59,7 +59,23 @@
 AMF.H264.MaximumAccessUnitSize="Massima dimensione di unità d'accesso"
 AMF.H264.HeaderInsertionSpacing="Spaziatura di inserimento di intestazione"
 AMF.H264.WaitForTask="Attendere per attività"
+AMF.H264.WaitForTask.Description="Sconosciuto, sperimentale"
+AMF.H264.PreAnalysisPass="Analisi pre-pass"
+AMF.H264.PreAnalysisPass.Description="Sconosciuto, sperimentale"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Sconosciuto, sperimentale"
+AMF.H264.GOPSize="Dimensione del GOP"
+AMF.H264.GOPSize.Description="Sconosciuto, sperimentale"
+AMF.H264.GOPAlignment="Allineamento del GOP"
+AMF.H264.GOPAlignment.Description="Sconosciuto, sperimentale"
+AMF.H264.MaximumReferenceFrames="Numero massimo di frames di riferimento"
+AMF.H264.MaximumReferenceFrames.Description="Sconosciuto, sperimentale"
 AMF.H264.SlicesPerFrame="Slices Per Frame"
+AMF.H264.SliceMode="Modalità Slice"
+AMF.H264.SliceMode.Description="Sconosciuto, sperimentale"
+AMF.H264.MaximumSliceSize="Dimensione massima frame"
+AMF.H264.MaximumSliceSize.Description="Sconosciuto, sperimentale"
+AMF.H264.SliceControlMode="Modalità di controllo Slice"
 AMF.H264.View="Modalità di visualizzazione"
 AMF.H264.View.Basic="Basico"
 AMF.H264.View.Advanced="Avanzate"

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

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

@@ -1,8 +1,10 @@
 AMF.Util.Default="Standaard"
 AMF.Util.Automatic="Automatisch"
+AMF.Util.Manual="Handmatig"
 AMF.Util.Toggle.Disabled="Uitgeschakeld"
 AMF.Util.Toggle.Enabled="Ingeschakeld"
 AMF.H264.Preset="Voorkeursinstelling"
+AMF.H264.Preset.ResetToDefaults="Standaardinstellingen herstellen"
 AMF.H264.Preset.Recording="Opname"
 AMF.H264.Preset.HighQuality="Hoge kwaliteit"
 AMF.H264.Preset.Indistinguishable="Ononderscheidbaar"
@@ -15,31 +17,118 @@
 AMF.H264.Usage.UltraLowLatency="Ultra Low Latency"
 AMF.H264.Usage.LowLatency="Low Latency"
 AMF.H264.QualityPreset="Kwaliteitsinstelling"
+AMF.H264.QualityPreset.Description="Welke kwaliteitsinstelling AMF moet proberen te halen:\n- '\@AMF.H264.QualityPreset.Speed\@' is de snelste maar heeft de slechtste kwaliteit,\n- '\@AMF.H264.QualityPreset.Balanced\@' is een gebalanceerde mix van beide,\n- '\@AMF.H264.QualityPreset.Quality\@' geeft de beste kwaliteit voor een gekozen bitrate."
 AMF.H264.QualityPreset.Speed="Snelheid"
 AMF.H264.QualityPreset.Balanced="Gebalanceerd"
 AMF.H264.QualityPreset.Quality="Kwaliteit"
 AMF.H264.Profile="Profiel"
+AMF.H264.Profile.Description="Welk h.264 profiel gebruikt moet worden, gesorteerd van beste kwaliteit tot breedste ondersteuning."
 AMF.H264.ProfileLevel="Profielniveau"
 AMF.H264.ProfileLevel.Description="Welk H.264 profielniveau moet worden gebruikt voor encoden:\n- 'Automatisch' berekent het beste profielniveau voor de gebruikte framerate en framegrootte.\n- '4.1' ondersteunt 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' ondersteunt 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' ondersteunt1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' ondersteunt3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' ondersteunt 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
 AMF.H264.RateControlMethod="Rate control methode"
+AMF.H264.RateControlMethod.Description="Welke rate control methode gebruikt moet worden:\n- '\@AMF.H264.RateControlMethod.CQP\@' kent vaste I-/P-/B-Frame QP waardes toe,\n- '\@AMF.H264.RateControlMethod.CBR\@' blijft op de insgestelde doelbitrate (met opvuldata) (aanbevolen voor streamen),\n- '\@AMF.H264.RateControlMethod.VBR\@' blijft onder de ingestelde piek bitrate,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' blijft in de buurt van de doelbitrate als de GPU latency en belasting het toestaan, anders zal er een hogere bitrate worden gebruikt (aanbevolen voor opnames)."
 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="Doelbitrate"
+AMF.H264.Bitrate.Target.Description="Bitrate om te proberen aan te houden in de gehele reeks."
 AMF.H264.Bitrate.Peak="Maximale bitrate"
+AMF.H264.Bitrate.Peak.Description="Bitrate om in de gehele reeks maximaal naartoe te pieken."
 AMF.H264.QP.Minimum="Minimale QP"
+AMF.H264.QP.Minimum.Description="Laagste QP waarde om te gebruiken in een frame."
 AMF.H264.QP.Maximum="Maximale QP"
+AMF.H264.QP.Maximum.Description="Hoogste QP waarde om te gebruiken in een frame."
 AMF.H264.QP.IFrame="I-Frame QP"
+AMF.H264.QP.IFrame.Description="Vaste QP waarde om te gebruiken voor I-frames."
 AMF.H264.QP.PFrame="P-Frame QP"
+AMF.H264.QP.PFrame.Description="Vaste QP waarde om te gebruiken voor P-frames."
 AMF.H264.QP.BFrame="B-Frame QP"
+AMF.H264.QP.BFrame.Description="Vaste QP waarde om te gebruiken voor B-frames."
 AMF.H264.VBVBuffer="VBV Buffer"
+AMF.H264.VBVBuffer.Description="Welke methode moet worden gebruikt om de VBV buffergrootte te bepalen:\n- '\@AMF.Util.Automatic\@' berekent de grootte met een strengheid-instelling.\n- '\@AMF.Util.Manual\@' laat de gebruiker de grootte bepalen.\nVBV (Video Buffering Verifier) buffer wordt gebruikt door bepaalde Rate Control methodes om de algehele bitrate binnen de aangegeven perken te houden."
+AMF.H264.VBVBuffer.Strictness="VBV Buffer-strengheid"
+AMF.H264.VBVBuffer.Strictness.Description="Bepaalt de strengheid van de VBV buffer, waar 100% zo streng mogelijk is, en 0% geen restricties oplegt."
+AMF.H264.VBVBuffer.Size="VBV Buffergrootte"
+AMF.H264.VBVBuffer.Size.Description="De grootte van de VBV Buffer welke wordt gebruikt voor bitrate controle in een reeks."
+AMF.H264.VBVBuffer.Fullness="VBV Buffervulling"
+AMF.H264.VBVBuffer.Fullness.Description="Hoe vol de VBV Buffer initieel is, beïnvloedt alleen de initiële reeks van encoden."
 AMF.H264.FillerData="Opvuldata"
+AMF.H264.FillerData.Description="Inschakelen van opvuldata laat de encoder tenminste de doelbitrate aanhouden door de overtollige ruimte in een reeks te vullen met lege informatie."
 AMF.H264.FrameSkipping="Frames overslaan"
+AMF.H264.FrameSkipping.Description="Frame Skipping laat een encoder frames droppen om de doelbitrate te halen.\nAls de encoder een frame dropt vult het een herhaal-laatste-frame NAL in de stream.\nKan helpen bij erg lage doelbitrates."
 AMF.H264.EnforceHRDCompatibility="Forceer HDR compatibiliteit"
+AMF.H264.EnforceHRDCompatibility.Description="Forceer hypothetische referentiedecoder-restricties welke de maximale QP waarde veranderen binnen een frame."
+AMF.H264.KeyframeInterval="Keyframe-Interval"
+AMF.H264.KeyframeInterval.Description="Bepaalt de afstand tussen keyframes in seconden. Bepaalt ook de GOP-sequence size."
+AMF.H264.IDRPeriod="IDR Periode"
+AMF.H264.IDRPeriod.Description="Bepaalt de afstand tussen Instantaneous Decoding Refreshes (IDR) in frames. Bepaalt ook de GOP-sequence size."
+AMF.H264.BFrame.Pattern="B-frames"
+AMF.H264.BFrame.Pattern.Description="Het aantal B-frames om te gebruiken tijdens het encoden.\nOndersteund door 2e en 3e generatie VCE-kaarten. Negatieve invloed op encodingprestaties."
+AMF.H264.BFrame.DeltaQP="Delta QP voor B-frames"
+AMF.H264.BFrame.DeltaQP.Description="Delta QP waarde tot de laatste I- of P-frame voor niet-refereerbare B-frames."
+AMF.H264.BFrame.Reference="Refereerbare B-frames"
+AMF.H264.BFrame.Reference.Description="Laat een B-frame ook B-frames gebruiken als referentie, in plaats van enkel P- en I-frames."
+AMF.H264.BFrame.ReferenceDeltaQP="Delta QP voor refereerbare B-frames"
+AMF.H264.BFrame.ReferenceDeltaQP.Description="Delta QP waarde tot de laatste I- of P-frame voor refereerbare B-frames."
 AMF.H264.DeblockingFilter="Deblocking Filter"
+AMF.H264.DeblockingFilter.Description="Staat de encoder toe om een Deblocking Filter te gebruiken voor de gecodeerde stream."
 AMF.H264.ScanType="Scantype"
+AMF.H264.ScanType.Description="Welke scanmethode gebruikt moet worden, laat dit altijd op '\@AMF.H264.ScanType.Progressive\@'."
 AMF.H264.ScanType.Progressive="Progressive"
 AMF.H264.ScanType.Interlaced="Interlaced"
+AMF.H264.MotionEstimation="Bewegingsschatting"
+AMF.H264.MotionEstimation.Description="Bewigingsschatting laat de encoder de benodigde bitrate verlagen door te schatten waar een pixel heen ging."
+AMF.H264.MotionEstimation.None="Geen"
+AMF.H264.MotionEstimation.Half="Halve pixel"
+AMF.H264.MotionEstimation.Quarter="Kwartpixel"
+AMF.H264.MotionEstimation.Both="Halve en kwartpixel"
+AMF.H264.CodingType="Codeertype"
+AMF.H264.CodingType.Description="Welk codeertype gebruikt moet worden:\n* \@AMF.Util.Default\@ laat AMF bepalen (aanbevolen).\n* CALVC (Context-Adaptive Variable-Length Coding) is sneller, maar groter.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) is langzamer, maar kleiner."
 AMF.H264.MaximumLTRFrames="Maximale LTR Frames"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) frames zijn een functie waarmee de encoder bepaalde frames in een reeks kan aanmerken als refereerbaar gedurende een lange tijd.\nLTR frames kunnen niet met B-frames gebruikt worden, en de encoder zal B-frames ook uitzetten als deze gebruikt worden."
+AMF.H264.MaximumAccessUnitSize="Maximale Access Unit grootte"
+AMF.H264.MaximumAccessUnitSize.Description="De maximale grootte voor een Access Unit voor een NAL."
+AMF.H264.HeaderInsertionSpacing="Header Insertion Spacing"
+AMF.H264.HeaderInsertionSpacing.Description="Hoeveel frames er tussen NAL headers moeten zitten."
+AMF.H264.WaitForTask="Wacht op taak"
+AMF.H264.WaitForTask.Description="Onbekend, experimenteel"
+AMF.H264.PreAnalysisPass="Pre-analyse pass"
+AMF.H264.PreAnalysisPass.Description="Onbekend, experimenteel"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Onbekend, experimenteel"
+AMF.H264.GOPSize="GOP-grootte"
+AMF.H264.GOPSize.Description="Onbekend, experimenteel"
+AMF.H264.GOPAlignment="GOP-uitlijning"
+AMF.H264.GOPAlignment.Description="Onbekend, experimenteel"
+AMF.H264.MaximumReferenceFrames="Maximale referentieframes"
+AMF.H264.MaximumReferenceFrames.Description="Onbekend, experimenteel"
+AMF.H264.SlicesPerFrame="Segmenten per frame"
+AMF.H264.SlicesPerFrame.Description="Hoeveel I-frame segmenten moeten er worden opgeslagen bij elke frame?\nEen waarde van nul laat de encoder bepalen.\nIntra-refresh encoding wordt gebruikt voor snellere weergave van en zoeken door video."
+AMF.H264.SliceMode="Slice-modus"
+AMF.H264.SliceMode.Description="Onbekend, experimenteel"
+AMF.H264.MaximumSliceSize="Maximale Segmentgrootte"
+AMF.H264.MaximumSliceSize.Description="Onbekend, experimenteel"
+AMF.H264.SliceControlMode="Slice Control Mode"
+AMF.H264.SliceControlMode.Description="Onbekend, experimenteel"
+AMF.H264.SliceControlSize="Slice Control Size"
+AMF.H264.SliceControlSize.Description="Onbekend, experimenteel"
+AMF.H264.IntraRefresh.NumberOfStripes="Intra-Refresh Number of Stripes"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Onbekend, experimenteel"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-Refresh Macroblocks per Slot"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Hoeveel Macroblocks moeten er in elk slot worden opgeslagen?\nEen waarde van 0 schakelt deze functie uit.\nIntra-Refresh encoding wordt gebruikt voor snellere weergave van en zoeken door video."
+AMF.H264.VideoAPI="Video API"
+AMF.H264.VideoAPI.Description="Welke API gebruikt moet worden voor encoden."
+AMF.H264.VideoAdapter="Videoadapter"
+AMF.H264.VideoAdapter.Description="Welke apter gebruikt moet worden voor encoding."
+AMF.H264.OpenCL="OpenCL"
+AMF.H264.OpenCL.Description="Moet de encoder OpenCL gebruiken om de individuele frames te leveren?"
+AMF.H264.View="Weergavemodus"
+AMF.H264.View.Description="Welke eigenschappen moeten getoond worden?\nHet gebruiken van '\@AMF.H264.View.Master\@' diskwalificeert je voor het ontvangen van ondersteuning."
+AMF.H264.View.Basic="Simpel"
+AMF.H264.View.Advanced="Geavanceerd"
+AMF.H264.View.Expert="Expert"
+AMF.H264.View.Master="Meester"
+AMF.H264.Debug="Debug"
+AMF.H264.Debug.Description="Schakel extra debug-logging in, dit moet actief zijn als je ondersteuning nodig hebt met deze encoder."

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

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

@@ -22,9 +22,11 @@
 AMF.H264.QualityPreset.Balanced="Баланс"
 AMF.H264.QualityPreset.Quality="Качество"
 AMF.H264.Profile="Профиль кодирования"
+AMF.H264.Profile.Description="Какой профиль формата H.264, использовать для кодирования, отсортированный от высочайшего качества для самой широкой поддержки."
 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.RateControlMethod="Метод кодирования"
+AMF.H264.RateControlMethod.Description="Как оценить способ контроля должны быть использованы:\n- '\@AMF.H264.RateControlMethod.CQP\@' назначает фиксированные I-/P-/B-Значения кадра QP,\n- '\@AMF.H264.RateControlMethod.CBR\@' остается в данном целевом Битрейте (используя данные заполнителя) (рекомендуется для стрима),\n-'\@AMF.H264.RateControlMethod.VBR\@' остается ниже пика Битрейта,\n-'\@AMF.H264.RateControlMethod.VBR_LAT\@' остается близко к целевому Битрейту, если задержка GPU и нагрузки позволяют, в противном случае будут использовать более высокий Битрейт (рекомендуется для стрима)."
 AMF.H264.RateControlMethod.CQP="CQP: постоянное качество"
 AMF.H264.RateControlMethod.CBR="CBR: постоянный битрейт"
 AMF.H264.RateControlMethod.VBR.Peak="VBR: переменный битрейт (Ограничение пиков)"
@@ -38,22 +40,37 @@
 AMF.H264.QP.Maximum="Максимальное QP"
 AMF.H264.QP.Maximum.Description="Наибольшее значение QP (Параметр квантования) для использования в кадре."
 AMF.H264.QP.IFrame="I-кадр QP"
+AMF.H264.QP.IFrame.Description="Фиксированное значение QP используемое для I-Кадров."
 AMF.H264.QP.PFrame="P-кадр QP"
+AMF.H264.QP.PFrame.Description="Фиксированное значение QP используемое для P-Кадров."
 AMF.H264.QP.BFrame="B-кадр QP"
 AMF.H264.QP.BFrame.Description="Фиксированное значение QP (Параметр квантования) для использования в B-Кадрах."
 AMF.H264.VBVBuffer="Буфер VBV"
 AMF.H264.VBVBuffer.Description="Какой метод следует использовать для определения Размера буфера VBV:\n- '\@AMF.Util.Automatic\@' рассчитывает размер ограничивающийся строгостью,\n- '\@AMF.Util.Manual\@' позволяет пользователю контролировать размер буфера.\nVBV (Верификатор буферизации видео) буфер используется некоторыми Методами управления скоростью, чтобы сохранить общий битрейт в пределах заданных ограничений."
 AMF.H264.VBVBuffer.Strictness="Строгость буфера VBV"
+AMF.H264.VBVBuffer.Strictness.Description="Определяет жесткость буфера vbv, при 100% будет максимально жестким и 0% будет неограниченным."
 AMF.H264.VBVBuffer.Size="Размер буфера VBV"
+AMF.H264.VBVBuffer.Size.Description="Размер буфера vbv, которая используется для управления скорости передачи данных в последовательности."
 AMF.H264.VBVBuffer.Fullness="Заполнение буфера VBV"
 AMF.H264.VBVBuffer.Fullness.Description="Изначальная степень заполнения VBV буфера, будет влиять только на первоначальную последовательность кодирования."
 AMF.H264.FillerData="Данные наполнителя"
+AMF.H264.FillerData.Description="Включение данных наполнителей позволяет кодировщику сохранять, по крайней мере, целевой Битрейт, заполняя оставшееся пространство в последовательности с пустой информации."
 AMF.H264.FrameSkipping="Пропуск кадров"
+AMF.H264.FrameSkipping.Description="Пропуск кадров позволяет кодировщику падение кадров в целях соответствия требованиям целевого битрейта.\nКогда в энкодере пропадает рамка вместо этого вставьте повторять-последний кадр NAL в стрим.\nМожет помочь с очень низким битрейтом."
 AMF.H264.EnforceHRDCompatibility="Принудительная HRD совместимость"
+AMF.H264.EnforceHRDCompatibility.Description="Соблюдение гипотетическому эталону Декодера ограничения, которые ограничивают максимальное значение QP изменения в кадре."
 AMF.H264.KeyframeInterval="Интервал ключевых кадров"
 AMF.H264.KeyframeInterval.Description="Сколько секунд должен быть просадок кадров.\nТакже контролирует GOP Size."
 AMF.H264.IDRPeriod="Период IDR"
 AMF.H264.IDRPeriod.Description="Определяет расстояние между Мгновенными обновлениями декодирования (IDR) в кадрах. Так же контролирует размер последовательности GOP."
+AMF.H264.BFrame.Pattern="B-Кадры"
+AMF.H264.BFrame.Pattern.Description="Количество B-кадров использованное при кодировании.\nПоддерживается 2-й и 3-й VCE карт поколения. Негативно влияет на производительность кодирования."
+AMF.H264.BFrame.DeltaQP="QP дельта для B-Кадров"
+AMF.H264.BFrame.DeltaQP.Description="Значение дельты QP в последних I- или P-Кадров для нессылаемых B-Кадров."
+AMF.H264.BFrame.Reference="Ссылаемые B-Кадры"
+AMF.H264.BFrame.Reference.Description="Разрешить B-Кадру так же использовать B-Кадры как ссылки, вместо просто P- и I-Кадров."
+AMF.H264.BFrame.ReferenceDeltaQP="Дельта QP для ссылаемых B-кадров"
+AMF.H264.BFrame.ReferenceDeltaQP.Description="Значение дельты QP в последних I- или P-Кадров для ссылаемых B-Кадров."
 AMF.H264.DeblockingFilter="Фильтр деблокинга"
 AMF.H264.DeblockingFilter.Description="Устанавливает флаг, что декодер может использовать фильтр удаления блочности для прямой трансляции."
 AMF.H264.ScanType="Развертка"
@@ -66,13 +83,46 @@
 AMF.H264.MotionEstimation.Half="Пол-пиксельная"
 AMF.H264.MotionEstimation.Quarter="Четверть-пиксельная"
 AMF.H264.MotionEstimation.Both="Пол- & Четверть-пиксельная"
+AMF.H264.CodingType="Тип кодирования"
+AMF.H264.CodingType.Description="Какой тип кодирования использовать:\n* \@AMF.Util.Default\@ позволяет решать AMF (рекомендуется).\n* CALVC (контекстно-Адаптивное с переменной длинной кодирования) - это быстрее, но больше.\n* CABAC (контекстно-Адаптивное Двоичное арифметическое кодирование) - это медленнее, но меньше."
 AMF.H264.MaximumLTRFrames="Максимум LTR-кадров"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) Frames - функция позволяющая кодировщику помечать определенные кадры в последовательности как ссылаемые.\nLTR Frames не может использоваться B-кадры и энкодер будет отключать B-кадры, если они используются."
 AMF.H264.MaximumAccessUnitSize="Максимальный Размер Блока Доступа"
 AMF.H264.MaximumAccessUnitSize.Description="Большой размер блока доступа для NAL. Значение 0 позволяет регулировать, чтобы выбрать лучший."
 AMF.H264.HeaderInsertionSpacing="Расстояние вставки заголовка"
 AMF.H264.HeaderInsertionSpacing.Description="Сколько кадров должно быть между заголовками NAL. Не рекомендуется менять значение с 0 (автоматически)."
+AMF.H264.WaitForTask="Дождитесь Задач"
+AMF.H264.WaitForTask.Description="Неизвестно, Экспериментально"
+AMF.H264.PreAnalysisPass="Проход пред-анализа"
+AMF.H264.PreAnalysisPass.Description="Неизвестно, Экспериментально"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Неизвестно, Экспериментально"
+AMF.H264.GOPSize="Размер GOP"
+AMF.H264.GOPSize.Description="Неизвестно, Экспериментально"
+AMF.H264.GOPAlignment="Выравнивание GOP"
+AMF.H264.GOPAlignment.Description="Неизвестно, Экспериментально"
+AMF.H264.MaximumReferenceFrames="Максимум кадров-ссылок"
+AMF.H264.MaximumReferenceFrames.Description="Неизвестно, Экспериментально"
 AMF.H264.SlicesPerFrame="Количество частей на кадр"
 AMF.H264.SlicesPerFrame.Description="Сколько кусков I-Кадров должно быть сохранено в каждом кадре?\nЗначение 0 позволяет кодировщику выбирать \"на лету\".\nКодирование Intra-Refresh используется для быстрого воспроизведения и поиска при перемотке."
+AMF.H264.SliceMode="Режим Slice"
+AMF.H264.SliceMode.Description="Неизвестно, Экспериментально"
+AMF.H264.MaximumSliceSize="Максимальный размер Slice"
+AMF.H264.MaximumSliceSize.Description="Неизвестно, Экспериментально"
+AMF.H264.SliceControlMode="Режим управления Slice"
+AMF.H264.SliceControlMode.Description="Неизвестно, Экспериментально"
+AMF.H264.SliceControlSize="Размер элемента управления Slice"
+AMF.H264.SliceControlSize.Description="Неизвестно, Экспериментально"
+AMF.H264.IntraRefresh.NumberOfStripes="Число полос Intra-Refresh"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Неизвестно, Экспериментально"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Количество Intra-Refresh Макроблоков на слот"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Сколько Макроблоков должно быть сохранено в каждом слоте?\nЗначение 0 отключает эту функцию.\nКодирование Intra-Refresh используется для быстрого воспроизведения и поиска при перемотке."
+AMF.H264.VideoAPI="Video API"
+AMF.H264.VideoAPI.Description="Какой API использовать для кодирования."
+AMF.H264.VideoAdapter="Видеоадаптер"
+AMF.H264.VideoAdapter.Description="Какой видеоадаптер использовать для кодирования."
+AMF.H264.OpenCL="OpenCL"
+AMF.H264.OpenCL.Description="Должен ли кодировщик использовать OpenCL для подтверждения индивидуальных кадров?"
 AMF.H264.View="Режим просмотра"
 AMF.H264.View.Description="Какие параметры должны быть видны. Вы не будете получать поддержку при использовании режимов 'Эксперт' и 'Мастер'."
 AMF.H264.View.Basic="Обычный"

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

@@ -31,15 +31,29 @@
 AMF.H264.Bitrate.Target.Description="Bithastighet att försöka uppnå i den övergripande sekvensen."
 AMF.H264.Bitrate.Peak="Maximal bithastighet"
 AMF.H264.QP.Minimum="Minimal QP"
+AMF.H264.QP.Minimum.Description="Lägsta QP-värde att använda i en bildruta."
 AMF.H264.QP.Maximum="Maximal QP"
+AMF.H264.QP.Maximum.Description="Högsta QP-värde att använda i en bildruta."
+AMF.H264.QP.IFrame="QP för I-bildrutor"
+AMF.H264.QP.IFrame.Description="Konstant QP-värde att använda för I-bildrutor."
+AMF.H264.QP.PFrame="QP för P-bildrutor"
+AMF.H264.QP.PFrame.Description="Konstant QP-värde att använda för P-bildrutor."
+AMF.H264.QP.BFrame="QP för B-bildrutor"
+AMF.H264.QP.BFrame.Description="Konstant QP-värde att använda för B-bildrutor."
 AMF.H264.VBVBuffer="VBV-buffert"
 AMF.H264.VBVBuffer.Description="Vilken metod som ska användas för att bestämma VBV-buffertens storlek:\n- '\@AMF.Util.Automatic\@' beräknar storleken med hjälp av en strikt begränsning,\n- '\@AMF.Util.Manual\@' låter användaren kontrollera storleken.\nVBV-buffertern (Video Buffering Verifier) används av vissa Rate Control Methods för att hålla den övergripande bithastigheten inom de angivna begränsningarna."
 AMF.H264.VBVBuffer.Strictness="Strikthet för VBV-buffert"
+AMF.H264.VBVBuffer.Strictness.Description="Bestämmer noggrannheten för VBV-bufferten, där 100% är så noggrann som möjligt och 0% är gränslös."
 AMF.H264.VBVBuffer.Size="VBV-buffertstorlek"
+AMF.H264.FillerData="Fyllningsdata"
+AMF.H264.FillerData.Description="Fyllningsdata låter kodaren behålla önskad bithastighet genom att fylla upp det återstående utrymmet i en sekvens med tom information."
 AMF.H264.FrameSkipping="Hoppa över bildrutor"
 AMF.H264.EnforceHRDCompatibility="Tvinga HRD-kompatibilitet"
+AMF.H264.KeyframeInterval="Intervall för keyframes"
+AMF.H264.KeyframeInterval.Description="Definierar avståndet mellan keyframes i sekunder. Kontrollerar även GOP-sekvensens storlek."
 AMF.H264.IDRPeriod="IDR-period"
 AMF.H264.IDRPeriod.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i bildrutor. Kontrollerar även GOP-sekvensens storlek."
+AMF.H264.BFrame.Pattern="B-bildrutor"
 AMF.H264.DeblockingFilter="Avblockningsfilter"
 AMF.H264.ScanType="Typ av skanning"
 AMF.H264.ScanType.Description="Vilken skanningsmetod att använda, lämna alltid detta på '\@AMF.H264.ScanType.Progressive\@'."
@@ -54,6 +68,28 @@
 AMF.H264.CodingType="Kodningstyp"
 AMF.H264.CodingType.Description="Vilken typ av kodning som ska användas:\n* \@AMF.Util.Default\@ låter AMF bestämma (rekommenderas).\n* CALVC (Context-Adaptive Variable-Length Coding) är snabbare, men större.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) är långsammare, men mindre."
 AMF.H264.MaximumLTRFrames="Maximalt antal LTR-bildrutor"
+AMF.H264.HeaderInsertionSpacing.Description="Hur många bildrutor som borde vara mellan NAL-headers."
+AMF.H264.WaitForTask="Väntar på arbetsuppgifter"
+AMF.H264.WaitForTask.Description="Okänd, experimentell"
+AMF.H264.PreAnalysisPass.Description="Okänd, experimentell"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Okänd, experimentell"
+AMF.H264.GOPSize="GOP-storlek"
+AMF.H264.GOPSize.Description="Okänd, experimentell"
+AMF.H264.GOPAlignment="GOP-justering"
+AMF.H264.GOPAlignment.Description="Okänd, experimentell"
+AMF.H264.MaximumReferenceFrames.Description="Okänd, experimentell"
+AMF.H264.SliceMode.Description="Okänd, experimentell"
+AMF.H264.MaximumSliceSize.Description="Okänd, experimentell"
+AMF.H264.SliceControlMode.Description="Okänd, experimentell"
+AMF.H264.SliceControlSize.Description="Okänd, experimentell"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Okänd, experimentell"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Hur många Macroblock bör lagras i varje plats?\nEtt värdet på 0 inaktiverar denna funktion.\nIntra-uppdaterade kodning används för snabbare uppspelning och sökning."
+AMF.H264.VideoAPI="Video-API"
+AMF.H264.VideoAPI.Description="Vilken API att använda för kodning."
+AMF.H264.VideoAdapter="Grafikkort"
+AMF.H264.OpenCL="OpenCL"
+AMF.H264.OpenCL.Description="Bör kodaren använda OpenCL för att skicka de individuella bildrutorna?"
 AMF.H264.View="Visningsläge"
 AMF.H264.View.Basic="Grundläggande"
 AMF.H264.View.Advanced="Avancerad"

obs-studio-17.0.1.tar.xz/plugins/enc-amf/Resources/locale/tr-TR.ini Added

@@ -0,0 +1,52 @@
+AMF.Util.Default="Varsayılan"
+AMF.Util.Automatic="Otomatik"
+AMF.Util.Manual="Elle"
+AMF.Util.Toggle.Disabled="Devre Dışı"
+AMF.Util.Toggle.Enabled="Etkin"
+AMF.H264.Preset="Ön Tanımlı"
+AMF.H264.Preset.ResetToDefaults="Varsayılan Ayarlara Geri Dön"
+AMF.H264.Preset.Recording="Kaydediliyor"
+AMF.H264.Preset.HighQuality="Yüksek Kalite"
+AMF.H264.Preset.Lossless="Kayıpsız"
+AMF.H264.Preset.Twitch="Twitch"
+AMF.H264.Preset.YouTube="YouTube"
+AMF.H264.Usage="Kullanım"
+AMF.H264.Usage.UltraLowLatency="Ultra Düşük Gecikme"
+AMF.H264.Usage.LowLatency="Düşük Gecikme"
+AMF.H264.QualityPreset.Speed="Hız"
+AMF.H264.QualityPreset.Balanced="Dengeli"
+AMF.H264.QualityPreset.Quality="Kalite"
+AMF.H264.Profile="Profil"
+AMF.H264.ProfileLevel="Profil Seviyesi"
+AMF.H264.Bitrate.Target="Hedef Bit Hızı"
+AMF.H264.QP.Minimum="Minimum QP"
+AMF.H264.QP.Maximum="Maksimum QP"
+AMF.H264.VBVBuffer.Size="VBV Arabellek Boyutu"
+AMF.H264.FrameSkipping="Kare Atlama"
+AMF.H264.ScanType="Tarama Türü"
+AMF.H264.MotionEstimation.None="Hiçbiri"
+AMF.H264.MotionEstimation.Half="Yarım Piksel"
+AMF.H264.MotionEstimation.Quarter="Çeyrek Piksel"
+AMF.H264.MotionEstimation.Both="Yarım ve Çeyrek Piksel"
+AMF.H264.WaitForTask.Description="Bilinmeyen, Deneysel"
+AMF.H264.PreAnalysisPass.Description="Bilinmeyen, Deneysel"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Bilinmeyen, Deneysel"
+AMF.H264.GOPSize.Description="Bilinmeyen, Deneysel"
+AMF.H264.GOPAlignment.Description="Bilinmeyen, Deneysel"
+AMF.H264.MaximumReferenceFrames.Description="Bilinmeyen, Deneysel"
+AMF.H264.SliceMode.Description="Bilinmeyen, Deneysel"
+AMF.H264.MaximumSliceSize.Description="Bilinmeyen, Deneysel"
+AMF.H264.SliceControlMode.Description="Bilinmeyen, Deneysel"
+AMF.H264.SliceControlSize.Description="Bilinmeyen, Deneysel"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Bilinmeyen, Deneysel"
+AMF.H264.VideoAPI="Video API"
+AMF.H264.VideoAdapter="Ekran Kartı"
+AMF.H264.OpenCL="OpenCL"
+AMF.H264.View="Görüntüleme Modu"
+AMF.H264.View.Basic="Temel"
+AMF.H264.View.Advanced="Gelişmiş"
+AMF.H264.View.Expert="Uzman"
+AMF.H264.View.Master="Usta"
+AMF.H264.Debug="Hata Ayıklama"
+

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

@@ -66,6 +66,11 @@
 AMF.H264.BFrame.Pattern="B-кадри"
 AMF.H264.BFrame.Pattern.Description="Визначає кількість послідовних B-кадрів у кодуванні.\nПідтримується принаймні 2-м та 3-м поколінням VCE карт. Маєнегативний вплив на продуктивність."
 AMF.H264.BFrame.DeltaQP="B-кадри, відхил QP"
+AMF.H264.BFrame.DeltaQP.Description="Відхил QP (параметра квантування) для не опорних B-кадрів, по відношенню до I-кадрів та P-кадрів."
+AMF.H264.BFrame.Reference="B-кадри як опорні"
+AMF.H264.BFrame.Reference.Description="Дозволяє робити B-кадри опорними для інших B-кадрів в додаток до вже існуючих P- та I-кадрів."
+AMF.H264.BFrame.ReferenceDeltaQP="Відхил QP (параметра квантування) для опорних B-кадрів"
+AMF.H264.BFrame.ReferenceDeltaQP.Description="Відхил QP (параметра квантування) для опорних B-кадрів, по відношенню до I-кадрів та P-кадрів."
 AMF.H264.DeblockingFilter="Деблокінг-фільтр"
 AMF.H264.DeblockingFilter.Description="Встановлює позначку, що дозволяє декодеру використовувати Деблокінг-фільтр для цього відео."
 AMF.H264.ScanType="Вид розгортки"
@@ -92,6 +97,9 @@
 AMF.H264.SlicesPerFrame.Description="Скільки фрагментів I-кадрів буде у кожному кадру?\nНульове значення дозволяє енкодеру визначати цю кількість під час кодування самостійно.\nIntra-Refresh кодування використовується для більш швидкого відтворення та навігації."
 AMF.H264.IntraRefresh.NumberOfStripes="Кількість рядків Intra-Refresh"
 AMF.H264.IntraRefresh.MacroblocksPerSlot="Кількість Intra-Refresh макроблоків на слот"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Визначає скільки Intra-Refresh макроблоків на слот можна використовувати при кодуванні.\nНульове значення вимикає цю опцію.\nIntra-Refresh кодування використовується для більш швидкого відтворення та навігації."
+AMF.H264.VideoAPI="Відео API"
+AMF.H264.VideoAPI.Description="Визначає який API використовувати для кодування."
 AMF.H264.VideoAdapter="Відеоадаптер"
 AMF.H264.VideoAdapter.Description="Визначає який відеоадаптер використовувати для кодування."
 AMF.H264.OpenCL="OpenCL"

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

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

@@ -17,6 +17,7 @@
 AMF.H264.Usage.UltraLowLatency="超低延遲"
 AMF.H264.Usage.LowLatency="低延遲"
 AMF.H264.QualityPreset="預設品質"
+AMF.H264.QualityPreset.Description="AMF 嘗試達成的預設品質：\n- '\@AMF.H264.QualityPreset.Speed\@' 為最快但最差的品質，\n- '\@AMF.H264.QualityPreset.Balanced\@' 為中間點，\n- '\@AMF.H264.QualityPreset.Quality\@' 在給定的位元速率下有最佳的品質。"
 AMF.H264.QualityPreset.Speed="速度"
 AMF.H264.QualityPreset.Balanced="平衡"
 AMF.H264.QualityPreset.Quality="品質"
@@ -39,21 +40,41 @@
 AMF.H264.QP.Maximum="最大 QP 值"
 AMF.H264.QP.Maximum.Description="一個訊框中使用的最高 QP （量化參數） 值。"
 AMF.H264.QP.IFrame="I-訊框 QP"
+AMF.H264.QP.IFrame.Description="I 訊框所使用的固定 QP 值"
 AMF.H264.QP.PFrame="P-訊框 QP"
+AMF.H264.QP.PFrame.Description="P 訊框所使用的固定 QP 值"
 AMF.H264.QP.BFrame="B-訊框 QP"
 AMF.H264.QP.BFrame.Description="B-訊框使用的固定 QP (量化參數) 值。"
 AMF.H264.VBVBuffer="VBV(Video Buffering Verifier) 緩衝區"
 AMF.H264.VBVBuffer.Description="決定 VBV 緩衝區大小的方法：\n- '\@AMF.Util.Automatic\@' 根據嚴格性計算大小，\n- '\@AMF.Util.Manual\@' 允許使用者調整大小。\n 某些速率控制方法會使用 VBV (Video Buffering Verifier) 緩衝區讓整體的位元速率保持在給定的條件之內。"
 AMF.H264.VBVBuffer.Strictness="VBV 緩衝區嚴格性"
+AMF.H264.VBVBuffer.Strictness.Description="決定 VBV 緩衝區的嚴密性，100% 表示盡可能的嚴格，0% 表示完全不限制。"
 AMF.H264.VBVBuffer.Size="VBV 緩衝區大小"
+AMF.H264.VBVBuffer.Size.Description="VBV緩衝區的大小，這將用於過程中的位元速率控制"
 AMF.H264.VBVBuffer.Fullness="初始 VBV 緩衝區填充度"
 AMF.H264.VBVBuffer.Fullness.Description="VBV 緩衝區起始該多滿，將只影響編碼的起始。"
 AMF.H264.FillerData="填塞空白資料"
 AMF.H264.FillerData.Description="啟用填塞空白資料允許編碼器保持位元速率至少有目標位元速率，編碼器將會將不足的位元用空白訊息填滿"
 AMF.H264.FrameSkipping="省略訊框"
+AMF.H264.FrameSkipping.Description="省略訊框允許編碼器在為了達成目標位元速率時省略部份訊框。\n當編碼器省略訊框時，他將插入重複上一個訊框的指令。\n對極低的目標位元速率有幫助。"
 AMF.H264.EnforceHRDCompatibility="與 HRD 相容"
+AMF.H264.EnforceHRDCompatibility.Description="執行 Hypothetical Reference Decoder 限制，這將限制單一訊框內 QP 值的最大變化量。"
+AMF.H264.KeyframeInterval="關鍵訊框間隔"
+AMF.H264.KeyframeInterval.Description="以秒為單位，定義關鍵訊框之間的距離。同時也控制了 GOP 序列的大小。"
+AMF.H264.IDRPeriod="IDR 周期"
+AMF.H264.IDRPeriod.Description="以訊框為單位，定義瞬間解碼重新更新（Instantaneous Decoding Refreshes）間的距離。同時也控制了 GOP 序列的大小。"
+AMF.H264.BFrame.Pattern="B 訊框"
+AMF.H264.BFrame.Pattern.Description="編碼時使用的 B 訊框數量。\n搭載第二代和第三代影像編碼引擎的顯示卡支援此參數。對編碼效能會有不良影響。"
+AMF.H264.BFrame.DeltaQP="B 訊框的 QP 值變化"
+AMF.H264.BFrame.DeltaQP.Description="在沒使用可參照 B 訊框時， B 訊框與上一個I或P訊框間的QP值變化。"
+AMF.H264.BFrame.Reference="可參照 B 訊框"
+AMF.H264.BFrame.Reference.Description="允許 B 訊框也使用 B 訊框作為參照，而不限於 P 和 I 訊框。"
+AMF.H264.BFrame.ReferenceDeltaQP="可參照 B 訊框的 QP 值變化"
+AMF.H264.BFrame.ReferenceDeltaQP.Description="在使用可參照 B 訊框時，B 訊框與上一個 I 或 P 訊框間的 QP 值變化。"
 AMF.H264.DeblockingFilter="去塊狀色斑濾鏡"
+AMF.H264.DeblockingFilter.Description="設定選項，讓解碼器可以使用去塊狀色斑濾鏡。"
 AMF.H264.ScanType="掃描類型"
+AMF.H264.ScanType.Description="掃描方式，請確保此值為'\@AMF.H264.ScanType.Progressive\@'。"
 AMF.H264.ScanType.Progressive="漸進式"
 AMF.H264.ScanType.Interlaced="交错式"
 AMF.H264.MotionEstimation="動態估算"
@@ -62,7 +83,46 @@
 AMF.H264.MotionEstimation.Half="半像素"
 AMF.H264.MotionEstimation.Quarter="四分之一像素"
 AMF.H264.MotionEstimation.Both="半 & 四分之一像素"
-AMF.H264.MaximumLTRFrames="長期參照訊框(LTR)最大數量"
+AMF.H264.CodingType="Coding Type"
+AMF.H264.CodingType.Description="Which type of coding to use:\n* \@AMF.Util.Default\@ lets AMF decide (recommended).\n* CALVC (Context-Adaptive Variable-Length Coding) is faster, but larger.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) is slower, but smaller."
+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 for a long time.\nLTR Frames can't be used with B-Frames and the encoder will disable B-Frames if these are used."
+AMF.H264.MaximumAccessUnitSize="Maximum Access Unit Size"
+AMF.H264.MaximumAccessUnitSize.Description="Largest Size of an Access Unit for a NAL."
+AMF.H264.HeaderInsertionSpacing="Header Insertion Spacing"
+AMF.H264.HeaderInsertionSpacing.Description="How many frames should be between NAL headers."
+AMF.H264.WaitForTask="Wait For Task"
+AMF.H264.WaitForTask.Description="Unknown, Experimental"
+AMF.H264.PreAnalysisPass="預分析階段"
+AMF.H264.PreAnalysisPass.Description="Unknown, Experimental"
+AMF.H264.VBAQ="VBAQ"
+AMF.H264.VBAQ.Description="Unknown, Experimental"
+AMF.H264.GOPSize="GOP Size"
+AMF.H264.GOPSize.Description="Unknown, Experimental"
+AMF.H264.GOPAlignment="GOP Alignment"
+AMF.H264.GOPAlignment.Description="Unknown, Experimental"
+AMF.H264.MaximumReferenceFrames="Maximum Reference Frames"
+AMF.H264.MaximumReferenceFrames.Description="Unknown, Experimental"
+AMF.H264.SlicesPerFrame="Slices Per Frame"
+AMF.H264.SlicesPerFrame.Description="How many I-Frame slices should be stored with each frame?\nA value of zero lets the encoder decide on the fly.\nIntra-Refresh encoding is used for faster playback and seeking."
+AMF.H264.SliceMode="Slice Mode"
+AMF.H264.SliceMode.Description="Unknown, Experimental"
+AMF.H264.MaximumSliceSize="Maximum Slice Size"
+AMF.H264.MaximumSliceSize.Description="Unknown, Experimental"
+AMF.H264.SliceControlMode="Slice Control Mode"
+AMF.H264.SliceControlMode.Description="Unknown, Experimental"
+AMF.H264.SliceControlSize="Slice Control Size"
+AMF.H264.SliceControlSize.Description="Unknown, Experimental"
+AMF.H264.IntraRefresh.NumberOfStripes="Intra-Refresh Number of Stripes"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Unknown, Experimental"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-Refresh Macroblocks per Slot"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="How many Macroblocks should be stored in each slot?\nA value of 0 disables this feature.\nIntra-Refresh encoding is used for faster playback and seeking."
+AMF.H264.VideoAPI="影像 API"
+AMF.H264.VideoAPI.Description="用於編碼的API。"
+AMF.H264.VideoAdapter="顯示卡"
+AMF.H264.VideoAdapter.Description="用於編碼的顯示卡。"
+AMF.H264.OpenCL="OpenCL"
+AMF.H264.OpenCL.Description="編碼器應該使用 OpenCL 來發送各個訊框？"
 AMF.H264.View="檢視模式"
 AMF.H264.View.Description="該顯示哪些屬性？\n使用'\@AMF.H264.View.Master\@'時將不提供任何的支援。"
 AMF.H264.View.Basic="基本"

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/amf-capabilities.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/amf-capabilities.cpp Changed

@@ -92,26 +92,26 @@
 
 void Plugin::AMD::VCECapabilities::ReportAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter) {
 	auto inst = GetInstance();
-	VCEEncoderType types[] = {
-		VCEEncoderType_AVC,
-		VCEEncoderType_SVC,
+	H264EncoderType types[] = {
+		H264EncoderType::AVC,
+		H264EncoderType::SVC,
 	};
 
-	AMF_LOG_INFO("Capabilities for Device '%s' on API %s:",
-		adapter.Name.c_str(),
-		api->GetName().c_str());
+	AMF_LOG_INFO("Capabilities for %s adapter '%s':",
+		api->GetName().c_str(),
+		adapter.Name.c_str());
 
 	for (auto type : types) {
 		ReportAdapterTypeCapabilities(api, adapter, type);
 	}
 }
 
-void Plugin::AMD::VCECapabilities::ReportAdapterTypeCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, VCEEncoderType type) {
+void Plugin::AMD::VCECapabilities::ReportAdapterTypeCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type) {
 	auto inst = GetInstance();
 	auto caps = inst->GetAdapterCapabilities(api, adapter, type);
 
 	AMF_LOG_INFO("  %s (Acceleration: %s)",
-		(type == VCEEncoderType_AVC ? "AVC" : (type == VCEEncoderType_SVC ? "SVC" : (type == VCEEncoderType_HEVC ? "HEVC" : "Unknown"))),
+		(type == H264EncoderType::AVC ? "AVC" : (type == H264EncoderType::SVC ? "SVC" : "Unknown")),
 		(caps.acceleration_type == amf::AMF_ACCEL_SOFTWARE ? "Software" : (caps.acceleration_type == amf::AMF_ACCEL_GPU ? "GPU" : (caps.acceleration_type == amf::AMF_ACCEL_HARDWARE ? "Hardware" : "None")))
 	);
 
@@ -119,11 +119,11 @@
 		return;
 
 	AMF_LOG_INFO("    Limits");
-	AMF_LOG_INFO("      Profile: %s", Plugin::Utility::ProfileAsString((VCEProfile)caps.maxProfile));
+	AMF_LOG_INFO("      Profile: %s", Plugin::Utility::ProfileAsString((H264Profile)caps.maxProfile));
 	AMF_LOG_INFO("      Profile Level: %ld.%ld", caps.maxProfileLevel / 10, caps.maxProfileLevel % 10);
 	AMF_LOG_INFO("      Bitrate: %ld", caps.maxBitrate);
 	AMF_LOG_INFO("      Reference Frames: %ld (min) - %ld (max)", caps.minReferenceFrames, caps.maxReferenceFrames);
-	if (type == VCEEncoderType_SVC)
+	if (type == H264EncoderType::SVC)
 		AMF_LOG_INFO("      Temporal Layers: %ld", caps.maxTemporalLayers);
 	AMF_LOG_INFO("    Features");
 	AMF_LOG_INFO("      B-Frames: %s", caps.supportsBFrames ? "Supported" : "Not Supported");
@@ -137,7 +137,7 @@
 	ReportAdapterTypeIOCapabilities(api, adapter, type, true);
 }
 
-void Plugin::AMD::VCECapabilities::ReportAdapterTypeIOCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, VCEEncoderType type, bool output) {
+void Plugin::AMD::VCECapabilities::ReportAdapterTypeIOCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type, bool output) {
 	auto amf = Plugin::AMD::AMF::GetInstance();
 
 	auto inst = GetInstance();
@@ -229,19 +229,23 @@
 		try {
 			adapters = api->EnumerateAdapters();
 		} catch (std::exception e) {
-			AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unexpected exception while enumerating adapters for API '%s':", api->GetName());
-			AMF_LOG_ERROR("%s", e.what());
+			AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Exception while enumerating %s adapters: %s.",
+				api->GetName(),
+				e.what());
 			continue;
 		} catch (...) {
-			AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unexpected critical exception while enumerating adapters for API '%s'.", api->GetName());
+			AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Critical exception while enumerating %s adapters.",
+				api->GetName());
 			throw;
 		}
 
 		for (auto adapter : adapters) {
 			// Create AMF Instance
 			amf::AMFContextPtr amfContext;
-			if (amfFactory->CreateContext(&amfContext) != AMF_OK) {
-				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> CreateContext failed for device '%s', error %ls (code %d).",
+			res = amfFactory->CreateContext(&amfContext);
+			if (res != AMF_OK) {
+				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unable to create context on %s adapter '%s', error %ls (code %lld).",
+					api->GetName().c_str(),
 					adapter.Name.c_str(),
 					amfInstance->GetTrace()->GetResultText(res),
 					res);
@@ -252,21 +256,25 @@
 			try {
 				apiInst = api->CreateInstanceOnAdapter(adapter);
 			} catch (std::exception e) {
-				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unexpected exception while testing adapter '%s' on API '%s':", adapter.Name, api->GetName());
-				AMF_LOG_ERROR("%s", e.what());
+				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Exception while intializing %s adapter '%s': %s.",
+					api->GetName(),
+					adapter.Name,
+					e.what());
 				continue;
 			} catch (...) {
-				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unexpected critical exceptionwhile testing adapter '%s' on API '%s'.", adapter.Name, api->GetName());
+				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Critical exception while intializing %s adapter '%s'.",
+					api->GetName(),
+					adapter.Name);
 				throw;
 			}
 			switch (api->GetType()) {
-				case Plugin::API::APIType_Direct3D11:
+				case Plugin::API::Type::Direct3D11:
 					res = amfContext->InitDX11(api->GetContextFromInstance(apiInst));
 					break;
-				case Plugin::API::APIType_Direct3D9:
+				case Plugin::API::Type::Direct3D9:
 					res = amfContext->InitDX9(api->GetContextFromInstance(apiInst));
 					break;
-				case Plugin::API::APIType_OpenGL:
+				case Plugin::API::Type::OpenGL:
 					res = amfContext->InitOpenGL(api->GetContextFromInstance(apiInst), nullptr, nullptr);
 					break;
 				default:
@@ -274,40 +282,42 @@
 					break;
 			}
 			if (res != AMF_OK) {
-				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Init failed for device '%s', error %ls (code %d).",
+				AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Initialization failed for %s adapter '%s', error %ls (code %lld).",
+					api->GetName(),
 					adapter.Name.c_str(),
 					amfInstance->GetTrace()->GetResultText(res),
 					res);
 				continue;
 			}
 
-			VCEEncoderType types[] = {
-				VCEEncoderType_AVC,
-				VCEEncoderType_SVC
+			H264EncoderType types[] = {
+				H264EncoderType::AVC,
+				H264EncoderType::SVC
 			};
 			for (auto type : types) {
 				VCEDeviceCapabilities devCaps = VCEDeviceCapabilities();
 
 				amf::AMFComponentPtr amfComponent;
-				if (amfFactory->CreateComponent(amfContext,
+				res = amfFactory->CreateComponent(amfContext,
 					Plugin::Utility::VCEEncoderTypeAsAMF(type),
-					&amfComponent) != AMF_OK) {
-					AMF_LOG_ERROR("CreateComponent failed for device '%s' with codec '%s', error %ls (code %d).",
+					&amfComponent);
+				if (res != AMF_OK) {
+					AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unable to create component for %s adapter '%s' with codec '%s', error %ls (code %lld).",
+						api->GetName(),
 						adapter.Name.c_str(),
 						Plugin::Utility::VCEEncoderTypeAsString(type),
-						amfInstance->GetTrace()->GetResultText(res),
-						res);
+						amfInstance->GetTrace()->GetResultText(res), res);
 					continue;
 				}
 
 				amf::AMFCapsPtr amfCaps;
 				res = amfComponent->GetCaps(&amfCaps);
 				if (res != AMF_OK) {
-					AMF_LOG_ERROR("GetCaps failed for device '%s' with codec '%s', error %ls (code %d).",
+					AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unable to query capabilities for %s adapter '%s' with codec '%s', error %ls (code %lld).",
+						api->GetName(),
 						adapter.Name.c_str(),
 						Plugin::Utility::VCEEncoderTypeAsString(type),
-						amfInstance->GetTrace()->GetResultText(res),
-						res);
+						amfInstance->GetTrace()->GetResultText(res), res);
 					amfComponent->Terminate();
 					continue;
 				}
@@ -325,14 +335,18 @@
 					amfCaps->GetProperty(AMF_VIDEO_ENCODER_CAP_FIXED_SLICE_MODE, &(devCaps.supportsFixedSliceMode));
 					amfCaps->GetProperty(AMF_VIDEO_ENCODER_CAP_NUM_OF_HW_INSTANCES, &(devCaps.maxNumOfHwInstances));
 
-					if (GetIOCapability(false, amfCaps, &(devCaps.input)) != AMF_OK)
-						AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> GetInputCaps failed for device '%s' with codec '%ls', error %ls (code %d).",
+					res = GetIOCapability(false, amfCaps, &(devCaps.input));
+					if (res != AMF_OK)
+						AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unable to query input capabilities for %s adapter '%s' with codec '%s', error %ls (code %lld).",
+							api->GetName(),
 							adapter.Name.c_str(),
 							Plugin::Utility::VCEEncoderTypeAsString(type),
 							amfInstance->GetTrace()->GetResultText(res), res);
 
-					if (GetIOCapability(true, amfCaps, &(devCaps.output)) != AMF_OK)
-						AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> GetOutputCaps failed capabilities for device '%s' with codec '%ls', error %ls (code %d).",
+					res = GetIOCapability(true, amfCaps, &(devCaps.output));
+					if (res != AMF_OK)
+						AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Unable to query output capabilities for %s adapter '%s' with codec '%s', error %ls (code %lld).",
+							api->GetName(),
 							adapter.Name.c_str(),
 							Plugin::Utility::VCEEncoderTypeAsString(type),
 							amfInstance->GetTrace()->GetResultText(res), res);
@@ -353,8 +367,8 @@
 	return true;
 }
 
-std::vector<std::pair<VCEEncoderType, VCEDeviceCapabilities>> Plugin::AMD::VCECapabilities::GetAllAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter) {
-	std::vector<std::pair<VCEEncoderType, VCEDeviceCapabilities>> caps;
+std::vector<std::pair<H264EncoderType, VCEDeviceCapabilities>> Plugin::AMD::VCECapabilities::GetAllAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter) {
+	std::vector<std::pair<H264EncoderType, VCEDeviceCapabilities>> caps;
 	for (auto kv : capabilityMap) {
 		auto apiName = std::get<0>(kv.first);
 		auto adapter = std::get<1>(kv.first);
@@ -370,7 +384,7 @@
 	return caps;
 }
 
-Plugin::AMD::VCEDeviceCapabilities Plugin::AMD::VCECapabilities::GetAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, VCEEncoderType type) {
+Plugin::AMD::VCEDeviceCapabilities Plugin::AMD::VCECapabilities::GetAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type) {
 	auto key = std::make_tuple(api->GetName(), adapter, type);
 
 	if (capabilityMap.count(key) == 0)

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/amf-h264.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/amf-h264.cpp Changed

@@ -40,6 +40,12 @@
 // Code
 //////////////////////////////////////////////////////////////////////////
 
+#define AMF_PROPERTY_FRAME L"Frame"
+#define AMF_PROPERTY_TIME_SENDINPUT L"TimeSendInput"
+#define AMF_PROPERTY_TIME_CREATESURFACE L"TimeCreateSurface"
+#define AMF_PROPERTY_TIME_CONVERT L"TimeConvert"
+#define AMF_PROPERTY_TIME_ENCODE L"TimeEncode"
+
 // Logging and Exception Helpers
 static void FormatTextWithAMFError(std::vector<char>* buffer, const char* format, AMF_RESULT res) {
 	sprintf(buffer->data(), format, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);
@@ -161,12 +167,12 @@
 }
 #endif
 
-Plugin::AMD::VCEEncoder::VCEEncoder(
-	VCEEncoderType p_Type,
+Plugin::AMD::H264Encoder::H264Encoder(
+	H264EncoderType p_Type,
 	std::string p_VideoAPI,
 	uint64_t p_VideoAdapterId,
 	bool p_OpenCL,
-	VCEColorFormat p_SurfaceFormat/* = VCESurfaceFormat_NV12*/
+	H264ColorFormat p_SurfaceFormat/* = VCESurfaceFormat_NV12*/
 ) {
 	#pragma region Assign Default Values
 	m_EncoderType = p_Type;
@@ -179,7 +185,7 @@
 	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);
+	m_InputQueueLimit = (uint32_t)(m_FrameRateDivisor * 3);
 	m_InputQueueLastSize = 0;
 	m_TimerPeriod = 1;
 	m_LastQueueWarnMessageTime = std::chrono::high_resolution_clock::time_point(std::chrono::high_resolution_clock::duration(0));
@@ -199,20 +205,20 @@
 	m_APIAdapter = m_API->GetAdapterById(p_VideoAdapterId & UINT_MAX, (p_VideoAdapterId >> 32) & UINT_MAX);
 	m_APIInstance = m_API->CreateInstanceOnAdapter(m_APIAdapter);
 	switch (m_API->GetType()) {
-		case Plugin::API::APIType_Direct3D11:
-			m_MemoryType = VCEMemoryType_DirectX11;
+		case Plugin::API::Type::Direct3D11:
+			m_MemoryType = H264MemoryType::DirectX11;
 			res = m_AMFContext->InitDX11(m_API->GetContextFromInstance(m_APIInstance));
 			break;
-		case Plugin::API::APIType_Direct3D9:
-			m_MemoryType = VCEMemoryType_DirectX9;
+		case Plugin::API::Type::Direct3D9:
+			m_MemoryType = H264MemoryType::DirectX11;
 			res = m_AMFContext->InitDX9(m_API->GetContextFromInstance(m_APIInstance));
 			break;
-		case Plugin::API::APIType_OpenGL:
-			m_MemoryType = VCEMemoryType_OpenGL;
+		case Plugin::API::Type::OpenGL:
+			m_MemoryType = H264MemoryType::OpenGL;
 			res = m_AMFContext->InitOpenGL(m_API->GetContextFromInstance(m_APIInstance), GetDesktopWindow(), nullptr);
 			break;
-		case Plugin::API::APIType_Host:
-			m_MemoryType = VCEMemoryType_Host;
+		case Plugin::API::Type::Host:
+			m_MemoryType = H264MemoryType::Host;
 			m_OpenCL = false;
 			break;
 	}
@@ -234,10 +240,6 @@
 	/// Create the AMF Converter component.
 	if (m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoConverter, &m_AMFConverter) != AMF_OK)
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Unable to create VideoConverter component, error %ls (code %ld).", res);
-	if (m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, Utility::MemoryTypeAsAMF(m_MemoryType)) != AMF_OK)
-		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Memory Type not supported by VideoConverter component, error %ls (code %ld).", res);
-	if (m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, Utility::SurfaceFormatAsAMF(m_ColorFormat)))
-		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Color Format not supported by VideoConverter component, error %ls (code %ld).", res);
 
 	#ifdef _DEBUG
 	printDebugInfo(m_AMFEncoder);
@@ -246,7 +248,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Initialized.");
 }
 
-Plugin::AMD::VCEEncoder::~VCEEncoder() {
+Plugin::AMD::H264Encoder::~H264Encoder() {
 	if (m_Flag_IsStarted)
 		Stop();
 
@@ -268,40 +270,45 @@
 	m_API = nullptr;
 }
 
-void Plugin::AMD::VCEEncoder::Start() {
+void Plugin::AMD::H264Encoder::Start() {
+	AMF_RESULT res = AMF_UNEXPECTED;
+
 	// Set proper Timer resolution.
 	m_TimerPeriod = 1;
 	while (timeBeginPeriod(m_TimerPeriod) == TIMERR_NOCANDO) {
 		++m_TimerPeriod;
 	}
 
-	// Create Encoder
-	AMF_RESULT res = m_AMFEncoder->Init(Utility::SurfaceFormatAsAMF(m_ColorFormat),
-		m_FrameSize.first, m_FrameSize.second);
-	if (res != AMF_OK)
-		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Encoder initialization failed with error %ls (code %ld).", res);
-
-	// Create Converter
-	m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, this->GetColorProfile());
+	// Initialize Converter
+	if (m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, Utility::MemoryTypeAsAMF(m_MemoryType)) != AMF_OK)
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Memory Type not supported by VideoConverter component, error %ls (code %ld).", res);
+	if (m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, amf::AMF_SURFACE_NV12))
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Color Format not supported by VideoConverter component, error %ls (code %ld).", res);
+	m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, (size_t)this->GetColorProfile());
 	if (m_AMFConverter->SetProperty(L"FullRangeColor", this->IsFullRangeColorEnabled()) != AMF_OK)
 		m_AMFConverter->SetProperty(L"NominalRange", this->IsFullRangeColorEnabled());
-
 	res = m_AMFConverter->Init(Utility::SurfaceFormatAsAMF(m_ColorFormat), m_FrameSize.first, m_FrameSize.second);
 	if (res != AMF_OK)
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Converter initialization failed with error %ls (code %ld).", res);
 
+	// Initialize Encoder
+	res = m_AMFEncoder->Init(amf::AMF_SURFACE_NV12,
+		m_FrameSize.first, m_FrameSize.second);
+	if (res != AMF_OK)
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Encoder initialization failed with error %ls (code %ld).", res);
+
 	m_Flag_IsStarted = true;
 
 	// Threading
-	m_Input.thread = std::thread(&(Plugin::AMD::VCEEncoder::InputThreadMain), this);
-	m_Output.thread = std::thread(&(Plugin::AMD::VCEEncoder::OutputThreadMain), this);
+	m_Input.thread = std::thread(&(Plugin::AMD::H264Encoder::InputThreadMain), this);
+	m_Output.thread = std::thread(&(Plugin::AMD::H264Encoder::OutputThreadMain), this);
 
 	#ifdef _DEBUG
 	printDebugInfo(m_AMFEncoder);
 	#endif
 }
 
-void Plugin::AMD::VCEEncoder::Restart() {
+void Plugin::AMD::H264Encoder::Restart() {
 	if (!m_Flag_IsStarted)
 		return;
 
@@ -314,7 +321,7 @@
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Initialization failed with error %ls (code %ld).", res);
 }
 
-void Plugin::AMD::VCEEncoder::Stop() {
+void Plugin::AMD::H264Encoder::Stop() {
 	// Restore Timer precision.
 	if (m_TimerPeriod != 0) {
 		timeEndPeriod(m_TimerPeriod);
@@ -374,13 +381,13 @@
 	std::queue<amf::AMFDataPtr>().swap(m_Output.queue);
 	m_PacketDataBuffer.clear();
 	m_ExtraDataBuffer.clear();
-	}
+}
 
-bool Plugin::AMD::VCEEncoder::IsStarted() {
+bool Plugin::AMD::H264Encoder::IsStarted() {
 	return m_Flag_IsStarted;
 }
 
-bool Plugin::AMD::VCEEncoder::SendInput(struct encoder_frame* frame) {
+bool Plugin::AMD::H264Encoder::SendInput(struct encoder_frame* frame) {
 	// Early-Exception if not encoding.
 	if (!m_Flag_IsStarted) {
 		const char* error = "<" __FUNCTION_NAME__ "> Attempted to send input while not running.";
@@ -388,6 +395,8 @@
 		throw std::exception(error);
 	}
 
+	/* Performance Monitoring */ std::chrono::high_resolution_clock::time_point tpSend = std::chrono::high_resolution_clock::now();
+
 	// Attempt to queue for 1 second (forces "Encoding overloaded" message to appear).
 	bool queueSuccessful = false;
 	auto queueStart = std::chrono::high_resolution_clock::now();
@@ -404,14 +413,20 @@
 
 		// Push into queue if it has room.
 		if (queueSize < m_InputQueueLimit) {
+			/* Performance Monitoring */ std::chrono::high_resolution_clock::time_point tpCreateSurface = std::chrono::high_resolution_clock::now();
 			amf::AMFSurfacePtr pAMFSurface = CreateSurfaceFromFrame(frame);
+			/* Performance Monitoring */ auto timeCreate = std::chrono::high_resolution_clock::now() - tpCreateSurface;
 			if (!pAMFSurface) {
 				AMF_LOG_ERROR("Unable copy frame for submission, terminating...");
 				return false;
 			} else {
 				pAMFSurface->SetPts(frame->pts / m_FrameRate.second);
-				pAMFSurface->SetProperty(L"Frame", frame->pts);
 				pAMFSurface->SetDuration((uint64_t)ceil(m_FrameRateReverseDivisor * AMF_SECOND));
+				pAMFSurface->SetProperty(AMF_PROPERTY_FRAME, frame->pts);
+				/* Performance Monitoring */ pAMFSurface->SetProperty(AMF_PROPERTY_TIME_SENDINPUT, std::chrono::nanoseconds(tpSend.time_since_epoch()).count());
+				/* Performance Monitoring */ pAMFSurface->SetProperty(AMF_PROPERTY_TIME_CREATESURFACE, std::chrono::nanoseconds(timeCreate).count());
+				/* Performance Monitoring */ pAMFSurface->SetProperty(AMF_PROPERTY_TIME_CONVERT, 0);
+				/* Performance Monitoring */ pAMFSurface->SetProperty(AMF_PROPERTY_TIME_ENCODE, 0);
 			}
 
 			{
@@ -472,7 +487,7 @@
 	return true;
 }
 
-bool Plugin::AMD::VCEEncoder::GetOutput(struct encoder_packet* packet, bool* received_packet) {
+bool Plugin::AMD::H264Encoder::GetOutput(struct encoder_packet* packet, bool* received_packet) {
 	// Early-Exception if not encoding.
 	if (!m_Flag_IsStarted) {
 		const char* error = "<" __FUNCTION_NAME__ "> Attempted to send input while not running.";
@@ -480,6 +495,8 @@
 		throw std::exception(error);
 	}
 
+	/* Performance Monitoring */ std::chrono::high_resolution_clock::time_point tpRetrieve = std::chrono::high_resolution_clock::now();
+
 	// Signal Output Thread to wake up.
 	m_Output.condvar.notify_all();
 
@@ -549,17 +566,47 @@
 		*received_packet = true;
 
 		// Debug: Packet Information
-		std::vector<wchar_t> fileName(128);
+			/// Convert File Name and Function Name
+		static std::vector<wchar_t> fileName(2048);
 		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);
+
+		/// Timing Information
+		uint64_t debugPacketType, debugDTS, debugPTS, debugDuration,
+			debugTimeSend,
+			debugTimeCreate,
+			debugTimeConvert,
+			debugTimeEncode;
+		pAMFData->GetProperty(AMF_VIDEO_ENCODER_OUTPUT_DATA_TYPE, &debugPacketType);
+		debugDTS = pAMFData->GetPts();
+		pAMFData->GetProperty(AMF_PROPERTY_FRAME, &debugPTS);
+		debugDuration = pAMFData->GetDuration();
+		pAMFData->GetProperty(AMF_PROPERTY_TIME_SENDINPUT, &debugTimeSend);
+		pAMFData->GetProperty(AMF_PROPERTY_TIME_CREATESURFACE, &debugTimeCreate);
+		pAMFData->GetProperty(AMF_PROPERTY_TIME_CONVERT, &debugTimeConvert);
+		pAMFData->GetProperty(AMF_PROPERTY_TIME_ENCODE, &debugTimeEncode);
+		uint64_t totalTimeSendRetrieve = std::chrono::nanoseconds(tpRetrieve.time_since_epoch()).count() - debugTimeSend;
+
+		/// All times are in nanoseconds.
+		/// Frame DTS() PTS() Duration() Type() TimeCreate() TimeConvert(SUBMIT,QUERY,TOTAL) TimeEncode(SUBMIT,ENCODE,QUERY,TOTAL) TimeSendToRetrieve()
+		m_AMF->GetTrace()->TraceW(
+			fileName.data(), __LINE__,
+			AMF_TRACE_TRACE, L"Performance Tracking", 9,
+			L"Frame DTS(%8lld) PTS(%8lld) Duration(%8lld) Type(%1lld) Size(%8lld) TimeCreate(%8lld) TimeConvert(%8lld) TimeEncode(%8lld) TimeSendToRetrieve(%8lld)",
+			(uint64_t)debugDTS,
+			(uint64_t)debugPTS,
+			(uint64_t)debugDuration,
+			(uint64_t)debugPacketType,
+			(uint64_t)packet->size,
+			(uint64_t)debugTimeCreate,
+			(uint64_t)debugTimeConvert,
+			(uint64_t)debugTimeEncode,
+			(uint64_t)totalTimeSendRetrieve);
 	}
 
 	return true;
 }
 
-bool Plugin::AMD::VCEEncoder::GetExtraData(uint8_t**& extra_data, size_t*& extra_data_size) {
+bool Plugin::AMD::H264Encoder::GetExtraData(uint8_t**& extra_data, size_t*& extra_data_size) {
 	if (!m_AMFContext || !m_AMFEncoder)
 		throw std::exception("<" __FUNCTION_NAME__ "> Called while not initialized.");
 
@@ -581,7 +628,7 @@
 	return false;
 }
 
-void Plugin::AMD::VCEEncoder::GetVideoInfo(struct video_scale_info*& vsi) {
+void Plugin::AMD::H264Encoder::GetVideoInfo(struct video_scale_info*& vsi) {
 	if (!m_AMFContext || !m_AMFEncoder)
 		throw std::exception("<" __FUNCTION_NAME__ "> Called while not initialized.");
 
@@ -590,25 +637,25 @@
 
 	switch (m_ColorFormat) {
 		// 4:2:0 Formats
-		case VCEColorFormat_NV12:
+		case H264ColorFormat::NV12:
 			vsi->format = VIDEO_FORMAT_NV12;
 			break;
-		case VCEColorFormat_I420:
+		case H264ColorFormat::I420:
 			vsi->format = VIDEO_FORMAT_I420;
 			break;
 		// 4:2:2 Formats
-		case VCEColorFormat_YUY2:
+		case H264ColorFormat::YUY2:
 			vsi->format = VIDEO_FORMAT_YUY2;
 			break;
 		// Uncompressed
-		case VCEColorFormat_RGBA:
+		case H264ColorFormat::RGBA:
 			vsi->format = VIDEO_FORMAT_RGBA;
 			break;
-		case VCEColorFormat_BGRA:
+		case H264ColorFormat::BGRA:
 			vsi->format = VIDEO_FORMAT_BGRA;
 			break;
 		// Other
-		case VCEColorFormat_GRAY:
+		case H264ColorFormat::GRAY:
 			vsi->format = VIDEO_FORMAT_Y800;
 			break;
 	}
@@ -621,15 +668,15 @@
 	}
 }
 
-void Plugin::AMD::VCEEncoder::InputThreadMain(Plugin::AMD::VCEEncoder* p_this) {
+void Plugin::AMD::H264Encoder::InputThreadMain(Plugin::AMD::H264Encoder* p_this) {
 	p_this->InputThreadLogic();
 }
 
-void Plugin::AMD::VCEEncoder::OutputThreadMain(Plugin::AMD::VCEEncoder* p_this) {
+void Plugin::AMD::H264Encoder::OutputThreadMain(Plugin::AMD::H264Encoder* p_this) {
 	p_this->OutputThreadLogic();
 }
 
-void Plugin::AMD::VCEEncoder::InputThreadLogic() {	// Thread Loop that handles Surface Submission
+void Plugin::AMD::H264Encoder::InputThreadLogic() {	// Thread Loop that handles Surface Submission
 	// Assign Thread Name
 	static const char* __threadName = "enc-amf Input Thread";
 	SetThreadName(__threadName);
@@ -640,10 +687,6 @@
 	do {
 		m_Input.condvar.wait(lock);
 
-		// Assign Thread Name
-		static const char* __threadName = "enc-amf Input Thread";
-		SetThreadName(__threadName);
-
 		// Skip to check if isStarted is false.
 		if (!m_Flag_IsStarted)
 			continue;
@@ -661,14 +704,18 @@
 		AMF_RESULT res;
 		amf::AMFDataPtr outbuf;
 
+		/* Performance Monitoring */ std::chrono::high_resolution_clock::time_point tpConvert = std::chrono::high_resolution_clock::now();
 		res = m_AMFConverter->SubmitInput(surface);
 		if (res != AMF_OK)
 			ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Unable to submit Frame to Converter, error %ls (code %ld).", res);
 		res = m_AMFConverter->QueryOutput(&outbuf);
 		if (res != AMF_OK)
 			ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Unable to retrieve Frame from Converter, error %ls (code %ld).", res);
+		/* Performance Monitoring */ outbuf->SetProperty(AMF_PROPERTY_TIME_CONVERT,
+			std::chrono::nanoseconds(std::chrono::high_resolution_clock::now() - tpConvert).count());
 
 		/// Submit to AMF
+		/* Performance Monitoring */ outbuf->SetProperty(AMF_PROPERTY_TIME_ENCODE, std::chrono::nanoseconds(std::chrono::high_resolution_clock::now().time_since_epoch()).count());
 		res = m_AMFEncoder->SubmitInput(outbuf);
 		if (res == AMF_OK) {
 			m_Flag_FirstFrameSubmitted = true;
@@ -684,10 +731,10 @@
 			// Continue with next Surface.
 			m_Input.condvar.notify_all();
 		} else if (res == AMF_INPUT_FULL) {
-			m_Output.condvar.notify_all();
 			if (repeatSurfaceSubmission < 5) {
 				repeatSurfaceSubmission++;
 				m_Input.condvar.notify_all();
+				m_Output.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.
@@ -703,7 +750,7 @@
 	} while (m_Flag_IsStarted);
 }
 
-void Plugin::AMD::VCEEncoder::OutputThreadLogic() {	// Thread Loop that handles Querying
+void Plugin::AMD::H264Encoder::OutputThreadLogic() {	// Thread Loop that handles Querying
 	// Assign Thread Name
 	static const char* __threadName = "enc-amf Output Thread";
 	SetThreadName(__threadName);
@@ -713,10 +760,6 @@
 	do {
 		m_Output.condvar.wait(lock);
 
-		// Assign Thread Name
-		static const char* __threadName = "enc-amf Output Thread";
-		SetThreadName(__threadName);
-
 		// Skip to check if isStarted is false.
 		if (!m_Flag_IsStarted)
 			continue;
@@ -726,6 +769,14 @@
 		if (res == AMF_OK) {
 			m_Flag_FirstFrameReceived = true;
 
+			uint64_t debugTimeEncode = 0;
+			pData->GetProperty(AMF_PROPERTY_TIME_ENCODE, &debugTimeEncode);
+			/* Performance Monitoring */ pData->SetProperty(AMF_PROPERTY_TIME_ENCODE,
+				(uint64_t)(
+					std::chrono::high_resolution_clock::now().time_since_epoch().count() -
+					debugTimeEncode
+				));
+
 			{ // Queue
 				std::unique_lock<std::mutex> qlock(m_Output.queuemutex);
 				m_Output.queue.push(pData);
@@ -749,7 +800,7 @@
 	} while (m_Flag_IsStarted);
 }
 
-inline amf::AMFSurfacePtr Plugin::AMD::VCEEncoder::CreateSurfaceFromFrame(struct encoder_frame*& frame) {
+inline amf::AMFSurfacePtr Plugin::AMD::H264Encoder::CreateSurfaceFromFrame(struct encoder_frame*& frame) {
 	AMF_RESULT res = AMF_UNEXPECTED;
 	amf::AMFSurfacePtr pSurface = nullptr;
 	if (m_OpenCL) {
@@ -805,14 +856,14 @@
 // AMF Properties
 //////////////////////////////////////////////////////////////////////////
 
-void Plugin::AMD::VCEEncoder::LogProperties() {
+void Plugin::AMD::H264Encoder::LogProperties() {
 	AMF_LOG_INFO("-- AMD Advanced Media Framework Encoder --");
 
 	// Initialization Properties
 	AMF_LOG_INFO("Initialization Properties: ");
 	AMF_LOG_INFO("  Type: %s", Utility::VCEEncoderTypeAsString(m_EncoderType));
 	AMF_LOG_INFO("  Video API: %s", Utility::MemoryTypeAsString(m_MemoryType));
-	if (m_MemoryType != VCEMemoryType_Host) {
+	if (m_MemoryType != H264MemoryType::Host) {
 		AMF_LOG_INFO("  Video Adapter: %s", m_APIAdapter.Name.c_str());
 		AMF_LOG_INFO("  OpenCL: %s", m_OpenCL ? "Enabled" : "Disabled");
 	}
@@ -822,12 +873,13 @@
 	AMF_LOG_INFO("Startup Properties: ");
 	AMF_LOG_INFO("  Usage: %s", Utility::UsageAsString(GetUsage()));
 	AMF_LOG_INFO("  Quality Preset: %s", Utility::QualityPresetAsString(GetQualityPreset()));
-	AMF_LOG_INFO("  Profile: %s %d.%d", Utility::ProfileAsString(GetProfile()), GetProfileLevel() / 10, this->GetProfileLevel() % 10);
+	uint8_t profileLevel = (uint8_t)this->GetProfileLevel();
+	AMF_LOG_INFO("  Profile: %s %d.%d", Utility::ProfileAsString(GetProfile()), profileLevel / 10, profileLevel % 10);
 
 	// Frame Properties
 	AMF_LOG_INFO("Frame Properties: ");
 	try {
-		AMF_LOG_INFO("  Color Profile: %s", GetColorProfile() == VCEColorProfile_709 ? "709" : "601");
+		AMF_LOG_INFO("  Color Profile: %s", GetColorProfile() == H264ColorProfile::Rec709 ? "709" : "601");
 	} catch (...) {
 		AMF_LOG_INFO("  Color Profile: N/A");
 	}
@@ -838,47 +890,70 @@
 	}
 	AMF_LOG_INFO("  Resolution: %dx%d", GetResolution().first, GetResolution().second);
 	AMF_LOG_INFO("  Frame Rate: %d/%d", GetFrameRate().first, GetFrameRate().second);
-	AMF_LOG_INFO("  Scan Type: %s", GetScanType() == VCEScanType_Progressive ? "Progressive" : "Interlaced");
+	AMF_LOG_INFO("  Scan Type: %s", GetScanType() == H264ScanType::Progressive ? "Progressive" : "Interlaced");
 
 	// Rate Control Properties
 	AMF_LOG_INFO("Rate Control Properties: ");
-	AMF_LOG_INFO("  Method: %s", Utility::RateControlMethodAsString(GetRateControlMethod()));
+	if (GetUsage() != H264Usage::UltraLowLatency) {
+		AMF_LOG_INFO("  Method: %s", Utility::RateControlMethodAsString(GetRateControlMethod()));
+	} else {
+		AMF_LOG_INFO("  Method: Ultra Low Latency");
+	}
 	AMF_LOG_INFO("  Bitrate: ");
 	AMF_LOG_INFO("    Target: %d bits", GetTargetBitrate());
-	AMF_LOG_INFO("    Peak: %d bits", GetPeakBitrate());
+	if (GetUsage() != H264Usage::UltraLowLatency) {
+		AMF_LOG_INFO("    Peak: %d bits", GetPeakBitrate());
+	} else {
+		AMF_LOG_INFO("    Peak: Ultra Low Latency");
+	}
 	AMF_LOG_INFO("  Quantization Parameter: ");
 	AMF_LOG_INFO("    Minimum: %d", GetMinimumQP());
 	AMF_LOG_INFO("    Maximum: %d", GetMaximumQP());
 	AMF_LOG_INFO("    I-Frame: %d", GetIFrameQP());
 	AMF_LOG_INFO("    P-Frame: %d", GetPFrameQP());
-	if (VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, VCEEncoderType_AVC).supportsBFrames) {
+	if (VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, H264EncoderType::AVC).supportsBFrames) {
 		try { AMF_LOG_INFO("    B-Frame: %d", GetBFrameQP()); } catch (...) {}
 	} else {
 		AMF_LOG_INFO("    B-Frame: N/A");
 	}
 	AMF_LOG_INFO("  VBV Buffer: ");
 	AMF_LOG_INFO("    Size: %d bits", GetVBVBufferSize());
-	AMF_LOG_INFO("    Initial Fullness: %f%%", GetInitialVBVBufferFullness() * 100.0);
+	if (GetUsage() != H264Usage::UltraLowLatency) {
+		AMF_LOG_INFO("    Initial Fullness: %f%%", GetInitialVBVBufferFullness() * 100.0);
+	} else {
+		AMF_LOG_INFO("    Initial Fullness: Ultra Low Latency");
+	}
 	AMF_LOG_INFO("  Flags: ");
-	AMF_LOG_INFO("    Filler Data: %s", IsFillerDataEnabled() ? "Enabled" : "Disabled");
-	AMF_LOG_INFO("    Frame Skipping: %s", IsFrameSkippingEnabled() ? "Enabled" : "Disabled");
-	AMF_LOG_INFO("    Enforce HRD Restrictions: %s", IsEnforceHRDRestrictionsEnabled() ? "Enabled" : "Disabled");
+	if (GetUsage() != H264Usage::UltraLowLatency) {
+		AMF_LOG_INFO("    Filler Data: %s", IsFillerDataEnabled() ? "Enabled" : "Disabled");
+		AMF_LOG_INFO("    Frame Skipping: %s", IsFrameSkippingEnabled() ? "Enabled" : "Disabled");
+		AMF_LOG_INFO("    Enforce HRD Restrictions: %s", IsEnforceHRDRestrictionsEnabled() ? "Enabled" : "Disabled");
+	} else {
+		AMF_LOG_INFO("    Filler Data: Ultra Low Latency");
+		AMF_LOG_INFO("    Frame Skipping: Ultra Low Latency");
+		AMF_LOG_INFO("    Enforce HRD Restrictions: Ultra Low Latency");
+	}
 
 	// Picture Control Properties
 	AMF_LOG_INFO("Picture Control Properties: ");
 	AMF_LOG_INFO("  IDR Period: %d frames", GetIDRPeriod());
-	if (VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, VCEEncoderType_AVC).supportsBFrames) {
+	if (VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, H264EncoderType::AVC).supportsBFrames) {
 		AMF_LOG_INFO("  B-Frame Pattern: %d", GetBFramePattern());
 		try {
 			AMF_LOG_INFO("  B-Frame Delta QP: %d", GetBFrameDeltaQP());
 		} catch (...) {
 			AMF_LOG_INFO("  B-Frame Delta QP: N/A");
 		}
-		AMF_LOG_INFO("  B-Frame Reference: %s", IsBFrameReferenceEnabled() ? "Enabled" : "Disabled");
-		try {
-			AMF_LOG_INFO("  B-Frame Reference Delta QP: %d", GetBFrameReferenceDeltaQP());
-		} catch (...) {
-			AMF_LOG_INFO("  B-Frame Reference Delta QP: N/A");
+		if (GetUsage() == H264Usage::Transcoding) {
+			AMF_LOG_INFO("  B-Frame Reference: %s", IsBFrameReferenceEnabled() ? "Enabled" : "Disabled");
+			try {
+				AMF_LOG_INFO("  B-Frame Reference Delta QP: %d", GetBFrameReferenceDeltaQP());
+			} catch (...) {
+				AMF_LOG_INFO("  B-Frame Reference Delta QP: N/A");
+			}
+		} else {
+			AMF_LOG_INFO("  B-Frame Reference: Low Latency Mode");
+			AMF_LOG_INFO("  B-Frame Reference Delta QP: Low Latency Mode");
 		}
 	} else {
 		AMF_LOG_INFO("  B-Frame Pattern: N/A");
@@ -888,7 +963,11 @@
 	}
 
 	AMF_LOG_INFO("Miscellaneous Properties: ");
-	AMF_LOG_INFO("  Deblocking Filter: %s", IsDeblockingFilterEnabled() ? "Enabled" : "Disabled");
+	if (GetUsage() == H264Usage::Transcoding) {
+		AMF_LOG_INFO("  Deblocking Filter: %s", IsDeblockingFilterEnabled() ? "Enabled" : "Disabled");
+	} else {
+		AMF_LOG_INFO("  Deblocking Filter: Low Latency Mode");
+	}
 	AMF_LOG_INFO("  Motion Estimation: %s",
 		(this->IsHalfPixelMotionEstimationEnabled()
 			? (this->IsQuarterPixelMotionEstimationEnabled()
@@ -930,7 +1009,7 @@
 	AMF_LOG_INFO("-- AMD Advanced Media Framework VCE Encoder --");
 }
 
-void Plugin::AMD::VCEEncoder::SetUsage(VCEUsage usage) {
+void Plugin::AMD::H264Encoder::SetUsage(H264Usage usage) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_USAGE,
 		(uint32_t)Utility::UsageAsAMF(usage));
 	if (res != AMF_OK) {
@@ -940,7 +1019,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", Utility::UsageAsString(usage));
 }
 
-Plugin::AMD::VCEUsage Plugin::AMD::VCEEncoder::GetUsage() {
+Plugin::AMD::H264Usage Plugin::AMD::H264Encoder::GetUsage() {
 	uint32_t usage;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_USAGE, &usage);
 	if (res != AMF_OK) {
@@ -951,7 +1030,7 @@
 	return Utility::UsageFromAMF(usage);
 }
 
-void Plugin::AMD::VCEEncoder::SetQualityPreset(VCEQualityPreset preset) {
+void Plugin::AMD::H264Encoder::SetQualityPreset(H264QualityPreset preset) {
 	static AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM CustomToAMF[] = {
 		AMF_VIDEO_ENCODER_QUALITY_PRESET_SPEED,
 		AMF_VIDEO_ENCODER_QUALITY_PRESET_BALANCED,
@@ -963,18 +1042,18 @@
 		"Quality",
 	};
 
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, (uint32_t)CustomToAMF[preset]);
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, (uint32_t)CustomToAMF[(uint8_t)preset]);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, CustomToName[preset]);
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, CustomToName[(uint8_t)preset]);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", CustomToName[preset]);
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", CustomToName[(uint8_t)preset]);
 }
 
-Plugin::AMD::VCEQualityPreset Plugin::AMD::VCEEncoder::GetQualityPreset() {
-	static VCEQualityPreset AMFToCustom[] = {
-		VCEQualityPreset_Balanced,
-		VCEQualityPreset_Speed,
-		VCEQualityPreset_Quality,
+Plugin::AMD::H264QualityPreset Plugin::AMD::H264Encoder::GetQualityPreset() {
+	static H264QualityPreset AMFToCustom[] = {
+		H264QualityPreset::Balanced,
+		H264QualityPreset::Speed,
+		H264QualityPreset::Quality,
 	};
 	static char* CustomToName[] = {
 		"Speed",
@@ -987,11 +1066,11 @@
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", CustomToName[AMFToCustom[preset]]);
-	return AMFToCustom[preset];
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", CustomToName[(uint8_t)AMFToCustom[(uint8_t)preset]]);
+	return AMFToCustom[(uint8_t)preset];
 }
 
-void Plugin::AMD::VCEEncoder::SetProfile(VCEProfile profile) {
+void Plugin::AMD::H264Encoder::SetProfile(H264Profile profile) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE, (uint32_t)profile);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, Utility::ProfileAsString(profile));
@@ -999,19 +1078,19 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", Utility::ProfileAsString(profile));
 }
 
-Plugin::AMD::VCEProfile Plugin::AMD::VCEEncoder::GetProfile() {
+Plugin::AMD::H264Profile Plugin::AMD::H264Encoder::GetProfile() {
 	uint32_t profile;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PROFILE, &profile);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::ProfileAsString((VCEProfile)profile));
-	return (VCEProfile)profile;
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::ProfileAsString((H264Profile)profile));
+	return (H264Profile)profile;
 }
 
-void Plugin::AMD::VCEEncoder::SetProfileLevel(VCEProfileLevel level) {
+void Plugin::AMD::H264Encoder::SetProfileLevel(H264ProfileLevel level) {
 	// Automatic Detection
-	if (level == VCEProfileLevel_Automatic) {
+	if (level == H264ProfileLevel::Automatic) {
 		auto frameSize = this->GetResolution();
 		auto frameRate = this->GetFrameRate();
 		level = Plugin::Utility::GetMinimumProfileLevel(frameSize, frameRate);
@@ -1024,17 +1103,17 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", level);
 }
 
-Plugin::AMD::VCEProfileLevel Plugin::AMD::VCEEncoder::GetProfileLevel() {
+Plugin::AMD::H264ProfileLevel Plugin::AMD::H264Encoder::GetProfileLevel() {
 	uint32_t profileLevel;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PROFILE_LEVEL, &profileLevel);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %d.", profileLevel);
-	return (VCEProfileLevel)(profileLevel);
+	return (H264ProfileLevel)(profileLevel);
 }
 
-void Plugin::AMD::VCEEncoder::SetColorProfile(VCEColorProfile profile) {
+void Plugin::AMD::H264Encoder::SetColorProfile(H264ColorProfile profile) {
 	AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM pluginToAMF[] = {
 		AMF_VIDEO_CONVERTER_COLOR_PROFILE_601,
 		AMF_VIDEO_CONVERTER_COLOR_PROFILE_709,
@@ -1047,18 +1126,18 @@
 	};
 
 	AMF_RESULT res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE,
-		pluginToAMF[profile]);
+		pluginToAMF[(uint8_t)profile]);
 	if (res != AMF_OK)
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Unable to set Color Profile, error %ls (code %ld).", res);
 	m_ColorProfile = profile;
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", pluginToString[profile]);
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", pluginToString[(uint8_t)profile]);
 }
 
-Plugin::AMD::VCEColorProfile Plugin::AMD::VCEEncoder::GetColorProfile() {
+Plugin::AMD::H264ColorProfile Plugin::AMD::H264Encoder::GetColorProfile() {
 	return m_ColorProfile;
 }
 
-void Plugin::AMD::VCEEncoder::SetFullRangeColorEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetFullRangeColorEnabled(bool enabled) {
 	// Info from Mikhail:
 	// - Name may change in the future
 	// - Use GetProperty or GetPropertyDescription to test for older or newer drivers.
@@ -1081,7 +1160,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsFullRangeColorEnabled() {
+bool Plugin::AMD::H264Encoder::IsFullRangeColorEnabled() {
 	// Info from Mikhail:
 	// - Name may change in the future
 	// - Use GetProperty or GetPropertyDescription to test for older or newer drivers.
@@ -1104,7 +1183,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetResolution(uint32_t width, uint32_t height) {
+void Plugin::AMD::H264Encoder::SetResolution(uint32_t width, uint32_t height) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, ::AMFConstructSize(width, height));
 	if (res != AMF_OK) {
 		std::vector<char> msgBuf(128);
@@ -1115,11 +1194,11 @@
 	m_FrameSize.first = width;
 	m_FrameSize.second = height;
 
-	if (this->GetProfileLevel() == VCEProfileLevel_Automatic)
-		this->SetProfileLevel(VCEProfileLevel_Automatic);
+	if (this->GetProfileLevel() == H264ProfileLevel::Automatic)
+		this->SetProfileLevel(H264ProfileLevel::Automatic);
 }
 
-std::pair<uint32_t, uint32_t> Plugin::AMD::VCEEncoder::GetResolution() {
+std::pair<uint32_t, uint32_t> Plugin::AMD::H264Encoder::GetResolution() {
 	AMFSize frameSize;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMESIZE, &frameSize);
 	if (res != AMF_OK) {
@@ -1129,13 +1208,13 @@
 	m_FrameSize.first = frameSize.width;
 	m_FrameSize.second = frameSize.height;
 
-	if (this->GetProfileLevel() == VCEProfileLevel_Automatic)
-		this->SetProfileLevel(VCEProfileLevel_Automatic);
+	if (this->GetProfileLevel() == H264ProfileLevel::Automatic)
+		this->SetProfileLevel(H264ProfileLevel::Automatic);
 
 	return std::pair<uint32_t, uint32_t>(m_FrameSize);
 }
 
-void Plugin::AMD::VCEEncoder::SetFrameRate(uint32_t num, uint32_t den) {
+void Plugin::AMD::H264Encoder::SetFrameRate(uint32_t num, uint32_t den) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FRAMERATE, ::AMFConstructRate(num, den));
 	if (res != AMF_OK) {
 		std::vector<char> msgBuf;
@@ -1147,13 +1226,13 @@
 	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);
+	m_InputQueueLimit = (uint32_t)ceil(m_FrameRateDivisor * 3);
 
-	if (this->GetProfileLevel() == VCEProfileLevel_Automatic)
-		this->SetProfileLevel(VCEProfileLevel_Automatic);
+	if (this->GetProfileLevel() == H264ProfileLevel::Automatic)
+		this->SetProfileLevel(H264ProfileLevel::Automatic);
 }
 
-std::pair<uint32_t, uint32_t> Plugin::AMD::VCEEncoder::GetFrameRate() {
+std::pair<uint32_t, uint32_t> Plugin::AMD::H264Encoder::GetFrameRate() {
 	AMFRate frameRate;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FRAMERATE, &frameRate);
 	if (res != AMF_OK) {
@@ -1163,15 +1242,15 @@
 	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);
+	m_InputQueueLimit = (uint32_t)ceil(m_FrameRateDivisor * 3);
 
-	if (this->GetProfileLevel() == VCEProfileLevel_Automatic)
-		this->SetProfileLevel(VCEProfileLevel_Automatic);
+	if (this->GetProfileLevel() == H264ProfileLevel::Automatic)
+		this->SetProfileLevel(H264ProfileLevel::Automatic);
 
 	return std::pair<uint32_t, uint32_t>(m_FrameRate);
 }
 
-void Plugin::AMD::VCEEncoder::SetScanType(VCEScanType scanType) {
+void Plugin::AMD::H264Encoder::SetScanType(H264ScanType scanType) {
 	static AMF_VIDEO_ENCODER_SCANTYPE_ENUM CustomToAMF[] = {
 		AMF_VIDEO_ENCODER_SCANTYPE_PROGRESSIVE,
 		AMF_VIDEO_ENCODER_SCANTYPE_INTERLACED,
@@ -1181,14 +1260,14 @@
 		"Interlaced",
 	};
 
-	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_SCANTYPE, (uint32_t)CustomToAMF[scanType]);
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_SCANTYPE, (uint32_t)CustomToAMF[(uint8_t)scanType]);
 	if (res != AMF_OK) {
-		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, CustomToName[scanType]);
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, CustomToName[(uint8_t)scanType]);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", CustomToName[scanType]);
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", CustomToName[(uint8_t)scanType]);
 }
 
-Plugin::AMD::VCEScanType Plugin::AMD::VCEEncoder::GetScanType() {
+Plugin::AMD::H264ScanType Plugin::AMD::H264Encoder::GetScanType() {
 	static char* CustomToName[] = {
 		"Progressive",
 		"Interlaced",
@@ -1200,10 +1279,10 @@
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", CustomToName[scanType]);
-	return (Plugin::AMD::VCEScanType)scanType;
+	return (Plugin::AMD::H264ScanType)scanType;
 }
 
-void Plugin::AMD::VCEEncoder::SetRateControlMethod(VCERateControlMethod method) {
+void Plugin::AMD::H264Encoder::SetRateControlMethod(H264RateControlMethod method) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD,
 		(uint64_t)Utility::RateControlMethodAsAMF(method));
 	if (res != AMF_OK) {
@@ -1214,7 +1293,7 @@
 		Utility::RateControlMethodAsString(method));
 }
 
-Plugin::AMD::VCERateControlMethod Plugin::AMD::VCEEncoder::GetRateControlMethod() {
+Plugin::AMD::H264RateControlMethod Plugin::AMD::H264Encoder::GetRateControlMethod() {
 	uint32_t method;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD, &method);
 	if (res != AMF_OK) {
@@ -1225,10 +1304,10 @@
 	return Utility::RateControlMethodFromAMF(method);
 }
 
-void Plugin::AMD::VCEEncoder::SetTargetBitrate(uint32_t bitrate) {
+void Plugin::AMD::H264Encoder::SetTargetBitrate(uint32_t bitrate) {
 	// Clamp Value
 	bitrate = clamp(bitrate, 10000,
-		Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, VCEEncoderType_AVC).maxBitrate);
+		Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, H264EncoderType::AVC).maxBitrate);
 
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, bitrate);
 	if (res != AMF_OK) {
@@ -1237,7 +1316,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d bits.", bitrate);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetTargetBitrate() {
+uint32_t Plugin::AMD::H264Encoder::GetTargetBitrate() {
 	uint32_t bitrate;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_TARGET_BITRATE, &bitrate);
 	if (res != AMF_OK) {
@@ -1247,10 +1326,10 @@
 	return bitrate;
 }
 
-void Plugin::AMD::VCEEncoder::SetPeakBitrate(uint32_t bitrate) {
+void Plugin::AMD::H264Encoder::SetPeakBitrate(uint32_t bitrate) {
 	// Clamp Value
 	bitrate = clamp(bitrate, 10000,
-		Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, VCEEncoderType_AVC).maxBitrate);
+		Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, H264EncoderType::AVC).maxBitrate);
 
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, (uint32_t)bitrate);
 	if (res != AMF_OK) {
@@ -1259,7 +1338,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d bits.", bitrate);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetPeakBitrate() {
+uint32_t Plugin::AMD::H264Encoder::GetPeakBitrate() {
 	uint32_t bitrate;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_PEAK_BITRATE, &bitrate);
 	if (res != AMF_OK) {
@@ -1269,7 +1348,7 @@
 	return bitrate;
 }
 
-void Plugin::AMD::VCEEncoder::SetMinimumQP(uint8_t qp) {
+void Plugin::AMD::H264Encoder::SetMinimumQP(uint8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, 0, 51);
 
@@ -1280,7 +1359,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-uint8_t Plugin::AMD::VCEEncoder::GetMinimumQP() {
+uint8_t Plugin::AMD::H264Encoder::GetMinimumQP() {
 	uint32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MIN_QP, &qp);
 	if (res != AMF_OK) {
@@ -1290,7 +1369,7 @@
 	return (uint8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetMaximumQP(uint8_t qp) {
+void Plugin::AMD::H264Encoder::SetMaximumQP(uint8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, 0, 51);
 
@@ -1301,7 +1380,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-uint8_t Plugin::AMD::VCEEncoder::GetMaximumQP() {
+uint8_t Plugin::AMD::H264Encoder::GetMaximumQP() {
 	uint32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_QP, &qp);
 	if (res != AMF_OK) {
@@ -1311,7 +1390,7 @@
 	return (uint8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetIFrameQP(uint8_t qp) {
+void Plugin::AMD::H264Encoder::SetIFrameQP(uint8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, 0, 51);
 
@@ -1322,7 +1401,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-uint8_t Plugin::AMD::VCEEncoder::GetIFrameQP() {
+uint8_t Plugin::AMD::H264Encoder::GetIFrameQP() {
 	uint32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_I, &qp);
 	if (res != AMF_OK) {
@@ -1332,7 +1411,7 @@
 	return (uint8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetPFrameQP(uint8_t qp) {
+void Plugin::AMD::H264Encoder::SetPFrameQP(uint8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, 0, 51);
 
@@ -1343,7 +1422,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-uint8_t Plugin::AMD::VCEEncoder::GetPFrameQP() {
+uint8_t Plugin::AMD::H264Encoder::GetPFrameQP() {
 	uint32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_P, &qp);
 	if (res != AMF_OK) {
@@ -1353,7 +1432,7 @@
 	return (uint8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetBFrameQP(uint8_t qp) {
+void Plugin::AMD::H264Encoder::SetBFrameQP(uint8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, 0, 51);
 
@@ -1364,7 +1443,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-uint8_t Plugin::AMD::VCEEncoder::GetBFrameQP() {
+uint8_t Plugin::AMD::H264Encoder::GetBFrameQP() {
 	uint32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QP_B, &qp);
 	if (res != AMF_OK) {
@@ -1374,7 +1453,7 @@
 	return (uint8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetVBVBufferSize(uint32_t size) {
+void Plugin::AMD::H264Encoder::SetVBVBufferSize(uint32_t size) {
 	// Clamp Value
 	size = clamp(size, 1000, 100000000); // 1kbit to 100mbit.
 
@@ -1385,69 +1464,79 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d bits.", size);
 }
 
-void Plugin::AMD::VCEEncoder::SetVBVBufferAutomatic(double_t strictness) {
+void Plugin::AMD::H264Encoder::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->GetResolution();
-			auto frameRate = this->GetFrameRate();
-
-			double_t bitrate = frameSize.first * frameSize.second;
-			switch (this->m_ColorFormat) {
-				case VCEColorFormat_NV12:
-				case VCEColorFormat_I420:
-					bitrate *= 1.5;
-					break;
-				case VCEColorFormat_YUY2:
-					bitrate *= 4;
-					break;
-				case VCEColorFormat_BGRA:
-				case VCEColorFormat_RGBA:
-					bitrate *= 3;
-					break;
-				case VCEColorFormat_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;
+	if (GetUsage() == H264Usage::UltraLowLatency) {
+		looseBitrate = GetTargetBitrate();
+	} else {
+		switch (this->GetRateControlMethod()) {
+			case H264RateControlMethod::ConstantBitrate:
+			case H264RateControlMethod::VariableBitrate_LatencyConstrained:
+				looseBitrate = this->GetTargetBitrate();
+				break;
+			case H264RateControlMethod::VariableBitrate_PeakConstrained:
+				looseBitrate = max(this->GetTargetBitrate(), this->GetPeakBitrate());
+				break;
+			case H264RateControlMethod::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->GetResolution();
+				auto frameRate = this->GetFrameRate();
+
+				double_t bitrate = frameSize.first * frameSize.second;
+				switch (this->m_ColorFormat) {
+					case H264ColorFormat::NV12:
+					case H264ColorFormat::I420:
+						bitrate *= 1.5;
+						break;
+					case H264ColorFormat::YUY2:
+						bitrate *= 4;
+						break;
+					case H264ColorFormat::BGRA:
+					case H264ColorFormat::RGBA:
+						bitrate *= 3;
+						break;
+					case H264ColorFormat::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>(ceil((strictBitrate * interpVal) + (looseBitrate * (1.0 - interpVal))));
-	this->SetVBVBufferSize(realBitrate);
+	// 0% = 100000, 50% = looseBitrate, 100% = strictBitrate
+	strictness = min(max(strictness, 0.0), 1.0);
+	double_t aAB = min(strictness * 2.0, 1.0f);
+	double_t bAB = max(strictness * 2.0 - 1.0, 0.0);
+
+	double_t aFade = (looseBitrate * aAB) + (100000 * (1.0 - aAB));
+	double_t bFade = (strictness * bAB) + (aFade * (1.0 - bAB));
+
+	uint32_t vbvBufferSize = static_cast<uint32_t>(round(bFade));
+	this->SetVBVBufferSize(vbvBufferSize);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetVBVBufferSize() {
+uint32_t Plugin::AMD::H264Encoder::GetVBVBufferSize() {
 	uint32_t size;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_VBV_BUFFER_SIZE, &size);
 	if (res != AMF_OK) {
@@ -1457,7 +1546,7 @@
 	return size;
 }
 
-void Plugin::AMD::VCEEncoder::SetInitialVBVBufferFullness(double_t fullness) {
+void Plugin::AMD::H264Encoder::SetInitialVBVBufferFullness(double_t fullness) {
 	// Clamp Value
 	fullness = max(min(fullness, 1), 0); // 0 to 100 %
 
@@ -1468,7 +1557,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %f%%.", fullness * 100);
 }
 
-double_t Plugin::AMD::VCEEncoder::GetInitialVBVBufferFullness() {
+double_t Plugin::AMD::H264Encoder::GetInitialVBVBufferFullness() {
 	uint32_t vbvBufferFullness;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INITIAL_VBV_BUFFER_FULLNESS, &vbvBufferFullness);
 	if (res != AMF_OK) {
@@ -1478,7 +1567,7 @@
 	return ((double_t)vbvBufferFullness / 64.0);
 }
 
-void Plugin::AMD::VCEEncoder::SetFillerDataEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetFillerDataEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1486,7 +1575,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsFillerDataEnabled() {
+bool Plugin::AMD::H264Encoder::IsFillerDataEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_FILLER_DATA_ENABLE, &enabled);
 	if (res != AMF_OK) {
@@ -1496,7 +1585,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetFrameSkippingEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetFrameSkippingEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1504,7 +1593,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsFrameSkippingEnabled() {
+bool Plugin::AMD::H264Encoder::IsFrameSkippingEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_RATE_CONTROL_SKIP_FRAME_ENABLE, &enabled);
 	if (res != AMF_OK) {
@@ -1514,7 +1603,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetEnforceHRDRestrictionsEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetEnforceHRDRestrictionsEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1522,7 +1611,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsEnforceHRDRestrictionsEnabled() {
+bool Plugin::AMD::H264Encoder::IsEnforceHRDRestrictionsEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_ENFORCE_HRD, &enabled);
 	if (res != AMF_OK) {
@@ -1532,7 +1621,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetIDRPeriod(uint32_t period) {
+void Plugin::AMD::H264Encoder::SetIDRPeriod(uint32_t period) {
 	// Clamp Value
 	period = max(min(period, 1000), 1); // 1-1000 so that OBS can actually quit.
 
@@ -1543,7 +1632,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", period);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetIDRPeriod() {
+uint32_t Plugin::AMD::H264Encoder::GetIDRPeriod() {
 	int32_t period;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_IDR_PERIOD, &period);
 	if (res != AMF_OK) {
@@ -1553,7 +1642,7 @@
 	return period;
 }
 
-void Plugin::AMD::VCEEncoder::SetBFramePattern(VCEBFramePattern pattern) {
+void Plugin::AMD::H264Encoder::SetBFramePattern(H264BFramePattern pattern) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, (uint32_t)pattern);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %d failed with error %ls (code %d).", res, pattern);
@@ -1561,17 +1650,17 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", pattern);
 }
 
-Plugin::AMD::VCEBFramePattern Plugin::AMD::VCEEncoder::GetBFramePattern() {
+Plugin::AMD::H264BFramePattern Plugin::AMD::H264Encoder::GetBFramePattern() {
 	uint32_t pattern;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_PATTERN, &pattern);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %d.", pattern);
-	return (Plugin::AMD::VCEBFramePattern)pattern;
+	return (Plugin::AMD::H264BFramePattern)pattern;
 }
 
-void Plugin::AMD::VCEEncoder::SetBFrameDeltaQP(int8_t qp) {
+void Plugin::AMD::H264Encoder::SetBFrameDeltaQP(int8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, -10, 10);
 
@@ -1582,7 +1671,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-int8_t Plugin::AMD::VCEEncoder::GetBFrameDeltaQP() {
+int8_t Plugin::AMD::H264Encoder::GetBFrameDeltaQP() {
 	int32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_PIC_DELTA_QP, &qp);
 	if (res != AMF_OK) {
@@ -1592,7 +1681,7 @@
 	return (int8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetBFrameReferenceEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetBFrameReferenceEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1600,7 +1689,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsBFrameReferenceEnabled() {
+bool Plugin::AMD::H264Encoder::IsBFrameReferenceEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE, &enabled);
 	if (res != AMF_OK) {
@@ -1610,7 +1699,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetBFrameReferenceDeltaQP(int8_t qp) {
+void Plugin::AMD::H264Encoder::SetBFrameReferenceDeltaQP(int8_t qp) {
 	// Clamp Value
 	qp = clamp(qp, -10, 10);
 
@@ -1621,7 +1710,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", qp);
 }
 
-int8_t Plugin::AMD::VCEEncoder::GetBFrameReferenceDeltaQP() {
+int8_t Plugin::AMD::H264Encoder::GetBFrameReferenceDeltaQP() {
 	int32_t qp;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP, &qp);
 	if (res != AMF_OK) {
@@ -1631,7 +1720,7 @@
 	return (int8_t)qp;
 }
 
-void Plugin::AMD::VCEEncoder::SetDeblockingFilterEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetDeblockingFilterEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1639,7 +1728,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsDeblockingFilterEnabled() {
+bool Plugin::AMD::H264Encoder::IsDeblockingFilterEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_DE_BLOCKING_FILTER, &enabled);
 	if (res != AMF_OK) {
@@ -1649,7 +1738,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetHalfPixelMotionEstimationEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetHalfPixelMotionEstimationEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MOTION_HALF_PIXEL, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1657,7 +1746,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsHalfPixelMotionEstimationEnabled() {
+bool Plugin::AMD::H264Encoder::IsHalfPixelMotionEstimationEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MOTION_HALF_PIXEL, &enabled);
 	if (res != AMF_OK) {
@@ -1667,7 +1756,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetQuarterPixelMotionEstimationEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetQuarterPixelMotionEstimationEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_MOTION_QUARTERPIXEL, enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1675,7 +1764,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsQuarterPixelMotionEstimationEnabled() {
+bool Plugin::AMD::H264Encoder::IsQuarterPixelMotionEstimationEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MOTION_QUARTERPIXEL, &enabled);
 	if (res != AMF_OK) {
@@ -1690,7 +1779,7 @@
 //////////////////////////////////////////////////////////////////////////
 // Their effect may vary from driver to driver, card to card.
 
-uint32_t Plugin::AMD::VCEEncoder::GetMaxMBPerSec() {
+uint32_t Plugin::AMD::H264Encoder::GetMaxMBPerSec() {
 	uint32_t maxMBPerSec;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"MaxMBPerSec", &maxMBPerSec);
 	if (res != AMF_OK) {
@@ -1700,7 +1789,7 @@
 	return maxMBPerSec;
 }
 
-void Plugin::AMD::VCEEncoder::SetHeaderInsertionSpacing(uint32_t spacing) {
+void Plugin::AMD::H264Encoder::SetHeaderInsertionSpacing(uint32_t spacing) {
 	// Clamp Value
 	spacing = max(min(spacing, m_FrameRate.second * 1000), 0);
 
@@ -1711,7 +1800,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", spacing);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetHeaderInsertionSpacing() {
+uint32_t Plugin::AMD::H264Encoder::GetHeaderInsertionSpacing() {
 	int32_t headerInsertionSpacing;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEADER_INSERTION_SPACING, &headerInsertionSpacing);
 	if (res != AMF_OK) {
@@ -1721,7 +1810,7 @@
 	return headerInsertionSpacing;
 }
 
-void Plugin::AMD::VCEEncoder::SetMaximumLongTermReferenceFrames(uint32_t maximumLTRFrames) {
+void Plugin::AMD::H264Encoder::SetMaximumLongTermReferenceFrames(uint32_t maximumLTRFrames) {
 	// Clamp Parameter Value
 	maximumLTRFrames = max(min(maximumLTRFrames, 2), 0);
 
@@ -1732,7 +1821,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", maximumLTRFrames);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetMaximumLongTermReferenceFrames() {
+uint32_t Plugin::AMD::H264Encoder::GetMaximumLongTermReferenceFrames() {
 	uint32_t maximumLTRFrames;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_LTR_FRAMES, &maximumLTRFrames);
 	if (res != AMF_OK) {
@@ -1742,25 +1831,25 @@
 	return maximumLTRFrames;
 }
 
-void Plugin::AMD::VCEEncoder::SetCodingType(VCECodingType type) {
-	AMF_RESULT res = m_AMFEncoder->SetProperty(L"CABACEnable", type);
+void Plugin::AMD::H264Encoder::SetCodingType(H264CodingType type) {
+	AMF_RESULT res = m_AMFEncoder->SetProperty(L"CABACEnable", (size_t)type);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, Utility::CodingTypeAsString(type));
 	}
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", Utility::CodingTypeAsString(type));
 }
 
-VCECodingType Plugin::AMD::VCEEncoder::GetCodingType() {
+H264CodingType Plugin::AMD::H264Encoder::GetCodingType() {
 	uint64_t type;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"CABACEnable", &type);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::CodingTypeAsString((VCECodingType)type));
-	return (VCECodingType)type;
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::CodingTypeAsString((H264CodingType)type));
+	return (H264CodingType)type;
 }
 
-void Plugin::AMD::VCEEncoder::SetMaximumAccessUnitSize(uint32_t size) {
+void Plugin::AMD::H264Encoder::SetMaximumAccessUnitSize(uint32_t size) {
 	// Clamp Value
 	size = max(min(size, 100000000), 0); // 1kbit to 100mbit.
 
@@ -1771,7 +1860,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d bits.", size);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetMaximumAccessUnitSize() {
+uint32_t Plugin::AMD::H264Encoder::GetMaximumAccessUnitSize() {
 	uint32_t size;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_MAX_AU_SIZE, &size);
 	if (res != AMF_OK) {
@@ -1781,7 +1870,7 @@
 	return size;
 }
 
-void Plugin::AMD::VCEEncoder::SetWaitForTaskEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetWaitForTaskEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"WaitForTask", enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1789,7 +1878,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsWaitForTaskEnabled() {
+bool Plugin::AMD::H264Encoder::IsWaitForTaskEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"WaitForTask", &enabled);
 	if (res != AMF_OK) {
@@ -1799,7 +1888,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetPreAnalysisPassEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetPreAnalysisPassEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"RateControlPreanalysisEnable", enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1807,7 +1896,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsPreAnalysisPassEnabled() {
+bool Plugin::AMD::H264Encoder::IsPreAnalysisPassEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"RateControlPreanalysisEnable", &enabled);
 	if (res != AMF_OK) {
@@ -1817,7 +1906,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetVBAQEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetVBAQEnabled(bool enabled) {
 	const wchar_t* names[] = {
 		L"EnableVBAQ", // 16.12.1
 		L"EanbleVBAQ", // 16.11.5 and below.
@@ -1838,7 +1927,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsVBAQEnabled() {
+bool Plugin::AMD::H264Encoder::IsVBAQEnabled() {
 	const wchar_t* names[] = {
 		L"EnableVBAQ", // 16.12.1
 		L"EanbleVBAQ", // 16.11.5 and below.
@@ -1859,7 +1948,7 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetGOPSize(uint32_t size) {
+void Plugin::AMD::H264Encoder::SetGOPSize(uint32_t size) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"GOPSize", (uint32_t)size);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %d failed with error %ls (code %d).", res, size);
@@ -1867,7 +1956,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", size);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetGOPSize() {
+uint32_t Plugin::AMD::H264Encoder::GetGOPSize() {
 	uint32_t size;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"GOPSize", &size);
 	if (res != AMF_OK) {
@@ -1877,7 +1966,7 @@
 	return size;
 }
 
-void Plugin::AMD::VCEEncoder::SetGOPAlignmentEnabled(bool enabled) {
+void Plugin::AMD::H264Encoder::SetGOPAlignmentEnabled(bool enabled) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"EnableGOPAlignment", enabled);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, enabled ? "Enabled" : "Disabled");
@@ -1885,7 +1974,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", enabled ? "Enabled" : "Disabled");
 }
 
-bool Plugin::AMD::VCEEncoder::IsGOPAlignementEnabled() {
+bool Plugin::AMD::H264Encoder::IsGOPAlignementEnabled() {
 	bool enabled;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"EnableGOPAlignment", &enabled);
 	if (res != AMF_OK) {
@@ -1895,8 +1984,8 @@
 	return enabled;
 }
 
-void Plugin::AMD::VCEEncoder::SetMaximumReferenceFrames(uint32_t numFrames) {
-	auto caps = VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, VCEEncoderType_AVC);
+void Plugin::AMD::H264Encoder::SetMaximumReferenceFrames(uint32_t numFrames) {
+	auto caps = VCECapabilities::GetInstance()->GetAdapterCapabilities(m_API, m_APIAdapter, H264EncoderType::AVC);
 	numFrames = clamp(numFrames,
 		caps.minReferenceFrames,
 		caps.maxReferenceFrames);
@@ -1908,7 +1997,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", numFrames);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetMaximumReferenceFrames() {
+uint32_t Plugin::AMD::H264Encoder::GetMaximumReferenceFrames() {
 	uint32_t numFrames;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"MaxNumRefFrames", &numFrames);
 	if (res != AMF_OK) {
@@ -1918,7 +2007,7 @@
 	return numFrames;
 }
 
-void Plugin::AMD::VCEEncoder::SetAspectRatio(uint32_t num, uint32_t den) {
+void Plugin::AMD::H264Encoder::SetAspectRatio(uint32_t num, uint32_t den) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"AspectRatio", ::AMFConstructRate(num, den));
 	if (res != AMF_OK) {
 		std::vector<char> msgBuf;
@@ -1928,7 +2017,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d:%d.", num, den);
 }
 
-std::pair<uint32_t, uint32_t> Plugin::AMD::VCEEncoder::GetAspectRatio() {
+std::pair<uint32_t, uint32_t> Plugin::AMD::H264Encoder::GetAspectRatio() {
 	AMFRate aspectRatio;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"AspectRatio", &aspectRatio);
 	if (res != AMF_OK) {
@@ -1938,7 +2027,7 @@
 	return std::pair<uint32_t, uint32_t>(aspectRatio.num, aspectRatio.den);
 }
 
-void Plugin::AMD::VCEEncoder::SetIntraRefreshMacroblocksPerSlot(uint32_t mbs) {
+void Plugin::AMD::H264Encoder::SetIntraRefreshMacroblocksPerSlot(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("<" __FUNCTION_NAME__ "> Setting to %d failed with error %ls (code %d).", res, mbs);
@@ -1946,7 +2035,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", mbs);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetIntraRefreshMacroblocksPerSlot() {
+uint32_t Plugin::AMD::H264Encoder::GetIntraRefreshMacroblocksPerSlot() {
 	int32_t mbs;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_INTRA_REFRESH_NUM_MBS_PER_SLOT, &mbs);
 	if (res != AMF_OK) {
@@ -1956,7 +2045,7 @@
 	return mbs;
 }
 
-void Plugin::AMD::VCEEncoder::SetIntraRefreshNumberOfStripes(uint32_t stripes) {
+void Plugin::AMD::H264Encoder::SetIntraRefreshNumberOfStripes(uint32_t stripes) {
 	stripes = clamp(stripes, 0, INT_MAX);
 
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"IntraRefreshNumOfStripes", (uint32_t)stripes);
@@ -1967,7 +2056,7 @@
 
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetIntraRefreshNumberOfStripes() {
+uint32_t Plugin::AMD::H264Encoder::GetIntraRefreshNumberOfStripes() {
 	uint32_t stripes;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"IntraRefreshNumOfStripes", &stripes);
 	if (res != AMF_OK) {
@@ -1977,7 +2066,7 @@
 	return stripes;
 }
 
-void Plugin::AMD::VCEEncoder::SetSlicesPerFrame(uint32_t slices) {
+void Plugin::AMD::H264Encoder::SetSlicesPerFrame(uint32_t slices) {
 	slices = max(slices, 1);
 
 	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_SLICES_PER_FRAME, (uint32_t)slices);
@@ -1987,7 +2076,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", slices);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetSlicesPerFrame() {
+uint32_t Plugin::AMD::H264Encoder::GetSlicesPerFrame() {
 	uint32_t slices;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_SLICES_PER_FRAME, &slices);
 	if (res != AMF_OK) {
@@ -1997,7 +2086,7 @@
 	return slices;
 }
 
-void Plugin::AMD::VCEEncoder::SetSliceMode(VCESliceMode mode) {
+void Plugin::AMD::H264Encoder::SetSliceMode(H264SliceMode mode) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"SliceMode", (uint32_t)mode);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, Utility::SliceModeAsString(mode));
@@ -2005,17 +2094,17 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", Utility::SliceModeAsString(mode));
 }
 
-Plugin::AMD::VCESliceMode Plugin::AMD::VCEEncoder::GetSliceMode() {
+Plugin::AMD::H264SliceMode Plugin::AMD::H264Encoder::GetSliceMode() {
 	uint32_t mode;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"SliceMode", &mode);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::SliceModeAsString((VCESliceMode)mode));
-	return (VCESliceMode)mode;
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::SliceModeAsString((H264SliceMode)mode));
+	return (H264SliceMode)mode;
 }
 
-void Plugin::AMD::VCEEncoder::SetMaximumSliceSize(uint32_t size) {
+void Plugin::AMD::H264Encoder::SetMaximumSliceSize(uint32_t size) {
 	size = clamp(size, 1, INT_MAX);
 
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"MaxSliceSize", (uint32_t)size);
@@ -2025,7 +2114,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", size);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetMaximumSliceSize() {
+uint32_t Plugin::AMD::H264Encoder::GetMaximumSliceSize() {
 	uint32_t size;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"MaxSliceSize", &size);
 	if (res != AMF_OK) {
@@ -2035,7 +2124,7 @@
 	return size;
 }
 
-void Plugin::AMD::VCEEncoder::SetSliceControlMode(VCESliceControlMode mode) {
+void Plugin::AMD::H264Encoder::SetSliceControlMode(H264SliceControlMode mode) {
 	AMF_RESULT res = m_AMFEncoder->SetProperty(L"SliceControlMode", (uint32_t)mode);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Setting to %s failed with error %ls (code %d).", res, Utility::SliceControlModeAsString(mode));
@@ -2043,17 +2132,17 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %s.", Utility::SliceControlModeAsString(mode));
 }
 
-Plugin::AMD::VCESliceControlMode Plugin::AMD::VCEEncoder::GetSliceControlMode() {
+Plugin::AMD::H264SliceControlMode Plugin::AMD::H264Encoder::GetSliceControlMode() {
 	uint32_t mode;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"SliceControlMode", &mode);
 	if (res != AMF_OK) {
 		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Failed with error %ls (code %d).", res);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::SliceControlModeAsString((VCESliceControlMode)mode));
-	return (VCESliceControlMode)mode;
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Value is %s.", Utility::SliceControlModeAsString((H264SliceControlMode)mode));
+	return (H264SliceControlMode)mode;
 }
 
-void Plugin::AMD::VCEEncoder::SetSliceControlSize(uint32_t size) {
+void Plugin::AMD::H264Encoder::SetSliceControlSize(uint32_t size) {
 	// If GetSliceMode() is VCESliceMode_Vertical, then it outputs nothing with the following settings:
 	// - SliceControlMode: VCESliceControlMode_Macroblock
 	// - SliceControlSize: < 3600
@@ -2063,12 +2152,12 @@
 
 	// H264 Macroblock = 16*16 = 256
 	switch (GetSliceControlMode()) {
-		case VCESliceControlMode_Off:
+		case H264SliceControlMode::Off:
 			return;
-		case VCESliceControlMode_Macroblock:
+		case H264SliceControlMode::Macroblock:
 			size = clamp(size, 0, (uint32_t)(ceil(m_FrameSize.first / 16) * ceil(m_FrameSize.second / 16)));
 			break;
-		case VCESliceControlMode_Macroblock_Row:
+		case H264SliceControlMode::Macroblock_Row:
 			size = clamp(size, 0, (uint32_t)ceil(m_FrameSize.second / 16));
 			break;
 	}
@@ -2080,7 +2169,7 @@
 	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Set to %d.", size);
 }
 
-uint32_t Plugin::AMD::VCEEncoder::GetSliceControlSize() {
+uint32_t Plugin::AMD::H264Encoder::GetSliceControlSize() {
 	uint32_t size;
 	AMF_RESULT res = m_AMFEncoder->GetProperty(L"SliceControlSize", &size);
 	if (res != AMF_OK) {

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/amf.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/amf.cpp Changed

@@ -43,25 +43,18 @@
 
 class CustomWriter : public amf::AMFTraceWriter {
 	public:
+
 	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, "[AMF Encoder] [%.*ls][%ls] %.*ls", 
+		blog(LOG_INFO, "[AMF Encoder] [%.*ls][%ls] %.*ls",
 			12, &(message[11]),
-			scope, 
+			scope,
 			msgLen, realmsg);
 	}
 
 	virtual void Flush() override {}
-
-	static std::shared_ptr<CustomWriter> GetInstance() {
-		static std::shared_ptr<CustomWriter> __instance = std::make_shared<CustomWriter>();
-		static std::mutex __mutex;
-
-		const std::lock_guard<std::mutex> lock(__mutex);
-		return __instance;
-	}
 };
 
 std::shared_ptr<Plugin::AMD::AMF> Plugin::AMD::AMF::GetInstance() {
@@ -76,7 +69,7 @@
 	AMF_RESULT res = AMF_OK;
 
 	// Initialize AMF Library
-	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Initializing...");
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
 
 	#pragma region Null Class Members
 	m_TimerPeriod = 0;
@@ -97,10 +90,9 @@
 		DWORD error = GetLastError();
 		std::vector<char> buf(1024);
 		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);
+		throw std::exception(buf.data());
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Loaded '%ls'.", AMF_DLL_NAME);
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded '%ls'.", AMF_DLL_NAME);
 	#ifdef _WIN32 // Windows: Get Product Version
 	std::vector<char> verbuf(GetFileVersionInfoSizeW(AMF_DLL_NAME, nullptr));
 	GetFileVersionInfoW(AMF_DLL_NAME, 0, (DWORD)verbuf.size(), verbuf.data());
@@ -135,15 +127,14 @@
 	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 %ld.", AMF_QUERY_VERSION_FUNCTION_NAME, error);
-		AMF_LOG_ERROR("%s", buf.data());
-		throw std::exception(buf.data(), error);
+		sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Finding Address of Function '%s' failed with error code %ld.", AMF_QUERY_VERSION_FUNCTION_NAME, error);
+		throw std::exception(buf.data());
 	}
 	/// Query Runtime Version
 	m_AMFVersion_Compiler = AMF_FULL_VERSION;
 	res = AMFQueryVersion(&m_AMFVersion_Runtime);
 	if (res != AMF_OK)
-		ThrowExceptionWithAMFError("<Plugin::AMD::AMF::AMF> Querying Version failed with error %ls (code %ld).", res);
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Querying Version failed with error %ls (code %ld).", res);
 	#pragma endregion Query AMF Runtime Version
 
 		/// Find Function for Initializing AMF.
@@ -151,31 +142,31 @@
 	if (!AMFInit) {
 		DWORD error = GetLastError();
 		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());
+		sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Finding Address of Function '%s' failed with error code %ld.", AMF_INIT_FUNCTION_NAME, error);
 		throw std::exception(buf.data(), error);
 	} else {
 		res = AMFInit(m_AMFVersion_Runtime, &m_AMFFactory);
 		if (res != AMF_OK)
-			ThrowExceptionWithAMFError("<Plugin::AMD::AMF::AMF> Initializing AMF Library failed with error %ls (code %ld).", res);
+			ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> Initializing AMF Library failed with error %ls (code %ld).", res);
 	}
-	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> AMF Library initialized.");
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> 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 %ld).", res);
+		ThrowExceptionWithAMFError("<" __FUNCTION_NAME__ "> 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 %ld).", res);
+		AMF_LOG_ERROR("<" __FUNCTION_NAME__ "> Retrieving Debug object failed with error code %ls (code %ld).", res);
 		throw std::exception("", res);
 	}
 
-	/// Register Custom Trace Writer and disable Debug Tracing.
-	m_AMFTrace->RegisterWriter(L"OBSWriter", CustomWriter::GetInstance().get(), true);
+	/// Register Trace Writer and disable Debug Tracing.
+	m_TraceWriter = new CustomWriter();
+	m_AMFTrace->RegisterWriter(L"OBSWriter", m_TraceWriter, true);
 	this->EnableDebugTrace(false);
 
 	// Log success
@@ -191,15 +182,16 @@
 		lProductVersionSize, pProductVersion
 	);
 
-	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Initialized.");
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Initialized.");
 }
 
 Plugin::AMD::AMF::~AMF() {
-	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Finalizing.");
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Finalizing.");
 
-	/// Unregister Writer
-	if (m_AMFTrace)
-		m_AMFTrace->UnregisterWriter(L"OBSWriter");
+	/// Unregister Trace Writer
+	m_AMFTrace->UnregisterWriter(L"OBSWriter");
+	delete m_TraceWriter;
+	m_TraceWriter = nullptr;
 
 	// Free Library again
 	if (m_AMFModule)
@@ -218,7 +210,7 @@
 	AMFInit = nullptr;
 	#pragma endregion Null Class Members
 
-	AMF_LOG_DEBUG("<Plugin::AMD::AMF::AMF> Finalized.");
+	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Finalized.");
 }
 
 amf::AMFFactory* Plugin::AMD::AMF::GetFactory() {
@@ -235,9 +227,9 @@
 
 void Plugin::AMD::AMF::EnableDebugTrace(bool enable) {
 	if (!m_AMFTrace)
-		throw std::exception(__FUNCTION_NAME__ " called without a AMFTrace object!");
+		throw std::exception("<" __FUNCTION_NAME__ "> called without a AMFTrace object!");
 	if (!m_AMFDebug)
-		throw std::exception(__FUNCTION_NAME__ " called without a AMFDebug object!");
+		throw std::exception("<" __FUNCTION_NAME__ "> called without a AMFDebug object!");
 
 	m_AMFTrace->EnableWriter(AMF_TRACE_WRITER_CONSOLE, false);
 	m_AMFTrace->SetWriterLevel(AMF_TRACE_WRITER_CONSOLE, AMF_TRACE_ERROR);

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/api-d3d11.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/api-d3d11.cpp Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/api-d3d9.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/api-d3d9.cpp Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/api-host.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/api-host.cpp Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/api-opengl.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/api-opengl.cpp Changed

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/enc-h264.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/enc-h264.cpp Changed

@@ -44,7 +44,7 @@
 using namespace Plugin::AMD;
 using namespace Plugin::Interface;
 
-enum Presets {
+enum class Presets : int8_t {
 	None = -1,
 	ResetToDefaults = 0,
 	Recording,
@@ -54,7 +54,7 @@
 	Twitch,
 	YouTube,
 };
-enum ViewMode {
+enum class ViewMode :uint8_t {
 	Basic,
 	Advanced,
 	Expert,
@@ -66,7 +66,7 @@
 	bool haveAVCsupport = false;
 	for (auto api : Plugin::API::Base::EnumerateAPIs()) {
 		for (auto adapter : api->EnumerateAdapters()) {
-			auto caps = VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, VCEEncoderType_AVC);
+			auto caps = VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, H264EncoderType::AVC);
 			if (caps.acceleration_type != amf::AMF_ACCEL_NOT_SUPPORTED)
 				haveAVCsupport = true;
 		}
@@ -118,7 +118,7 @@
 		AMF_LOG_ERROR("%s", e->what());
 		delete e;
 	} catch (...) {
-		AMF_LOG_ERROR("Unknown Exception during start up.");
+		AMF_LOG_ERROR("Unknown Exception.");
 	}
 	if (enc)
 		delete enc;
@@ -136,7 +136,7 @@
 		AMF_LOG_ERROR("%s", e->what());
 		delete e;
 	} catch (...) {
-		AMF_LOG_ERROR("Unknown Exception during shut down.");
+		AMF_LOG_ERROR("Unknown Exception.");
 	}
 	data = nullptr;
 }
@@ -145,12 +145,15 @@
 	try {
 		return static_cast<Plugin::Interface::H264Interface*>(data)->encode(frame, packet, received_packet);
 	} catch (std::exception e) {
-		AMF_LOG_ERROR("Exception: %s", e.what());
-		AMF_LOG_ERROR("Unable to encode, see log for more information.");
-		return false;
+		AMF_LOG_ERROR("%s", e.what());
+	} catch (std::exception* e) {
+		AMF_LOG_ERROR("%s", e->what());
+		delete e;
 	} catch (...) {
+		AMF_LOG_ERROR("Unknown Exception.");
 		throw;
 	}
+	return false;
 }
 
 void Plugin::Interface::H264Interface::get_defaults(obs_data_t *data) {
@@ -168,20 +171,20 @@
 	#pragma endregion OBS - Enforce Streaming Service Restrictions
 
 	// Preset
-	obs_data_set_default_int(data, AMF_H264_PRESET, -1);
+	obs_data_set_default_int(data, AMF_H264_PRESET, static_cast<int32_t>(Presets::None));
 
 	// Static Properties
-	obs_data_set_default_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
-	obs_data_set_default_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Balanced);
-	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_USAGE, static_cast<int32_t>(H264Usage::Transcoding));
+	obs_data_set_default_int(data, AMF_H264_QUALITY_PRESET, static_cast<int32_t>(H264QualityPreset::Balanced));
+	obs_data_set_default_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::Main));
+	obs_data_set_default_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 
 	// Rate Control Properties
 	obs_data_set_int(data, "last" vstr(AMF_H264_RATECONTROLMETHOD), -1);
-	obs_data_set_default_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
+	obs_data_set_default_int(data, AMF_H264_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::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, 0);
+	obs_data_set_default_int(data, AMF_H264_QP_MINIMUM, 11);
 	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);
@@ -189,7 +192,7 @@
 	obs_data_set_int(data, "last" vstr(AMF_H264_VBVBUFFER), -1);
 	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, 0);
+	obs_data_set_default_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 50);
 	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);
@@ -200,7 +203,7 @@
 	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_int(data, "last" vstr(AMF_H264_BFRAME_PATTERN), -1);
-	obs_data_set_default_int(data, AMF_H264_BFRAME_PATTERN, VCEBFramePattern_None);
+	obs_data_set_default_int(data, AMF_H264_BFRAME_PATTERN, static_cast<int32_t>(H264BFramePattern::None));
 	obs_data_set_int(data, "last" vstr(AMF_H264_BFRAME_REFERENCE), -1);
 	obs_data_set_default_int(data, AMF_H264_BFRAME_REFERENCE, 0);
 	obs_data_set_default_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, 2);
@@ -208,17 +211,17 @@
 	obs_data_set_default_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
 
 	// Miscellaneous Control Properties
-	obs_data_set_default_int(data, AMF_H264_SCANTYPE, VCEScanType_Progressive);
+	obs_data_set_default_int(data, AMF_H264_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 	obs_data_set_default_int(data, AMF_H264_MOTIONESTIMATION, 3);
 
 	// Experimental Properties
 	obs_data_set_default_int(data, AMF_H264_MAXIMUMLTRFRAMES, 0);
-	obs_data_set_default_int(data, AMF_H264_CODINGTYPE, VCECodingType_Default);
+	obs_data_set_default_int(data, AMF_H264_CODINGTYPE, static_cast<int32_t>(H264CodingType::Default));
 	obs_data_set_default_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
 	obs_data_set_default_int(data, AMF_H264_SLICESPERFRAME, 1);
-	obs_data_set_default_int(data, AMF_H264_SLICEMODE, VCESliceMode_Horizontal);
+	obs_data_set_default_int(data, AMF_H264_SLICEMODE, static_cast<int32_t>(H264SliceMode::Horizontal));
 	obs_data_set_default_int(data, AMF_H264_MAXIMUMSLICESIZE, INT_MAX);
-	obs_data_set_default_int(data, AMF_H264_SLICECONTROLMODE, VCESliceControlMode_Off);
+	obs_data_set_default_int(data, AMF_H264_SLICECONTROLMODE, static_cast<int32_t>(H264SliceControlMode::Off));
 	obs_data_set_default_int(data, AMF_H264_SLICECONTROLSIZE, 0);
 	obs_data_set_default_int(data, AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES, 0);
 	obs_data_set_default_int(data, AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT, 0);
@@ -236,8 +239,9 @@
 	obs_data_set_default_int(data, AMF_H264_VIDEOADAPTER, 0);
 	obs_data_set_default_int(data, AMF_H264_OPENCL, 0);
 	obs_data_set_int(data, "last" vstr(AMF_H264_VIEW), -1);
-	obs_data_set_default_int(data, AMF_H264_VIEW, ViewMode::Basic);
+	obs_data_set_default_int(data, AMF_H264_VIEW, static_cast<int32_t>(ViewMode::Basic));
 	obs_data_set_default_bool(data, AMF_H264_DEBUG, false);
+	obs_data_set_default_int(data, AMF_H264_VERSION, 0x0001000400030005ull);
 }
 
 static void fill_api_list(obs_property_t* p) {
@@ -263,22 +267,22 @@
 	p = obs_properties_add_list(props, AMF_H264_PRESET, TEXT_T(AMF_H264_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_modified_callback(p, properties_modified);
 	obs_property_list_add_int(p, "", -1);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_RESETTODEFAULTS), Presets::ResetToDefaults);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_RECORDING), Presets::Recording);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_HIGHQUALITY), Presets::HighQuality);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_INDISTINGUISHABLE), Presets::Indistinguishable);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_LOSSLESS), Presets::Lossless);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_TWITCH), Presets::Twitch);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_YOUTUBE), Presets::YouTube);
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_RESETTODEFAULTS), static_cast<int32_t>(Presets::ResetToDefaults));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_RECORDING), static_cast<int32_t>(Presets::Recording));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_HIGHQUALITY), static_cast<int32_t>(Presets::HighQuality));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_INDISTINGUISHABLE), static_cast<int32_t>(Presets::Indistinguishable));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_LOSSLESS), static_cast<int32_t>(Presets::Lossless));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_TWITCH), static_cast<int32_t>(Presets::Twitch));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_PRESET_YOUTUBE), static_cast<int32_t>(Presets::YouTube));
 	#pragma endregion Preset
 
 	#pragma region Static Properties
 	#pragma region Usage
 	p = obs_properties_add_list(props, AMF_H264_USAGE, TEXT_T(AMF_H264_USAGE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_USAGE_DESCRIPTION));
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_USAGE_TRANSCODING), VCEUsage_Transcoding);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_USAGE_ULTRALOWLATENCY), VCEUsage_UltraLowLatency);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_USAGE_LOWLATENCY), VCEUsage_LowLatency);
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_USAGE_TRANSCODING), static_cast<int32_t>(H264Usage::Transcoding));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_USAGE_ULTRALOWLATENCY), static_cast<int32_t>(H264Usage::UltraLowLatency));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_USAGE_LOWLATENCY), static_cast<int32_t>(H264Usage::LowLatency));
 	// Webcam requires SVC, which is not something OBSs properties API makes easy to support. Nor would it look like anything usable.
 	//obs_property_list_add_int(list, TEXT_T(AMF_H264_USAGE_WEBCAM), VCEUsage_Webcam);
 	#pragma endregion Usage
@@ -286,9 +290,9 @@
 	#pragma region Quality Preset
 	p = obs_properties_add_list(props, AMF_H264_QUALITY_PRESET, TEXT_T(AMF_H264_QUALITY_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_QUALITY_PRESET_DESCRIPTION));
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_QUALITY_PRESET_SPEED), VCEQualityPreset_Speed);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_QUALITY_PRESET_BALANCED), VCEQualityPreset_Balanced);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_QUALITY_PRESET_QUALITY), VCEQualityPreset_Quality);
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_QUALITY_PRESET_SPEED), static_cast<int32_t>(H264QualityPreset::Speed));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_QUALITY_PRESET_BALANCED), static_cast<int32_t>(H264QualityPreset::Balanced));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_QUALITY_PRESET_QUALITY), static_cast<int32_t>(H264QualityPreset::Quality));
 	#pragma endregion Quality Preset
 
 	#pragma region Profile
@@ -306,20 +310,20 @@
 	#pragma region Method
 	p = obs_properties_add_list(props, AMF_H264_RATECONTROLMETHOD, TEXT_T(AMF_H264_RATECONTROLMETHOD), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_DESCRIPTION));
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_CQP), VCERateControlMethod_ConstantQP);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_CBR), VCERateControlMethod_ConstantBitrate);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_VBR), VCERateControlMethod_VariableBitrate_PeakConstrained);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_VBR_LAT), VCERateControlMethod_VariableBitrate_LatencyConstrained);
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_CQP), static_cast<int32_t>(H264RateControlMethod::ConstantQP));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_CBR), static_cast<int32_t>(H264RateControlMethod::ConstantBitrate));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_VBR), static_cast<int32_t>(H264RateControlMethod::VariableBitrate_PeakConstrained));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_RATECONTROLMETHOD_VBR_LAT), static_cast<int32_t>(H264RateControlMethod::VariableBitrate_LatencyConstrained));
 	obs_property_set_modified_callback(p, properties_modified);
 	#pragma endregion Method
 
 	#pragma region Method Parameters
 	/// Bitrate Constraints
 	p = obs_properties_add_int(props, AMF_H264_BITRATE_TARGET, TEXT_T(AMF_H264_BITRATE_TARGET), 0,
-		1, 1);
+							   1, 1);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_BITRATE_TARGET_DESCRIPTION));
 	p = obs_properties_add_int(props, AMF_H264_BITRATE_PEAK, TEXT_T(AMF_H264_BITRATE_PEAK), 0,
-		1, 1);
+							   1, 1);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_BITRATE_PEAK_DESCRIPTION));
 
 	/// Minimum QP, Maximum QP
@@ -387,7 +391,9 @@
 	#pragma region B-Frames
 	/// B-Frames Pattern
 	p = obs_properties_add_int_slider(props, AMF_H264_BFRAME_PATTERN, TEXT_T(AMF_H264_BFRAME_PATTERN),
-		VCEBFramePattern_None, VCEBFramePattern_Three, 1);
+									  static_cast<int32_t>(H264BFramePattern::None),
+									  static_cast<int32_t>(H264BFramePattern::Three),
+									  1);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_BFRAME_PATTERN_DESCRIPTION));
 	obs_property_set_modified_callback(p, properties_modified);
 	/// Enable Reference to B-Frames (2nd Generation GCN and newer)
@@ -414,8 +420,8 @@
 	/// Scan Type
 	p = obs_properties_add_list(props, AMF_H264_SCANTYPE, TEXT_T(AMF_H264_SCANTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_SCANTYPE_DESCRIPTION));
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_SCANTYPE_PROGRESSIVE), VCEScanType_Progressive);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_SCANTYPE_INTERLACED), VCEScanType_Interlaced);
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_SCANTYPE_PROGRESSIVE), static_cast<int32_t>(H264ScanType::Progressive));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_SCANTYPE_INTERLACED), static_cast<int32_t>(H264ScanType::Interlaced));
 
 	/// Motion Estimation
 	p = obs_properties_add_list(props, AMF_H264_MOTIONESTIMATION, TEXT_T(AMF_H264_MOTIONESTIMATION), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
@@ -430,9 +436,9 @@
 	#pragma region Coding Type
 	p = obs_properties_add_list(props, AMF_H264_CODINGTYPE, TEXT_T(AMF_H264_CODINGTYPE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_CODINGTYPE_DESCRIPTION));
-	obs_property_list_add_int(p, TEXT_T(AMF_UTIL_DEFAULT), VCECodingType_Default);
-	obs_property_list_add_int(p, "CABAC", VCECodingType_CABAC);
-	obs_property_list_add_int(p, "CALVC", VCECodingType_CALVC);
+	obs_property_list_add_int(p, TEXT_T(AMF_UTIL_DEFAULT), static_cast<int32_t>(H264CodingType::Default));
+	obs_property_list_add_int(p, "CABAC", static_cast<int32_t>(H264CodingType::CABAC));
+	obs_property_list_add_int(p, "CALVC", static_cast<int32_t>(H264CodingType::CALVC));
 	#pragma endregion Coding Type
 
 	#pragma region Long Term Reference Frames
@@ -453,8 +459,8 @@
 	/// Slice Mode
 	p = obs_properties_add_list(props, AMF_H264_SLICEMODE, TEXT_T(AMF_H264_SLICEMODE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_SLICEMODE_DESCRIPTION));
-	obs_property_list_add_int(p, "Horizontal", VCESliceMode_Horizontal);
-	obs_property_list_add_int(p, "Vertical", VCESliceMode_Vertical);
+	obs_property_list_add_int(p, "Horizontal", static_cast<int32_t>(H264SliceMode::Horizontal));
+	obs_property_list_add_int(p, "Vertical", static_cast<int32_t>(H264SliceMode::Vertical));
 
 	/// Maximum Slice Size
 	p = obs_properties_add_int_slider(props, AMF_H264_MAXIMUMSLICESIZE, TEXT_T(AMF_H264_MAXIMUMSLICESIZE), 1, INT_MAX, 1);
@@ -463,9 +469,9 @@
 	/// Slice Control Mode
 	p = obs_properties_add_list(props, AMF_H264_SLICECONTROLMODE, TEXT_T(AMF_H264_SLICECONTROLMODE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_SLICECONTROLMODE_DESCRIPTION));
-	obs_property_list_add_int(p, Utility::SliceControlModeAsString(VCESliceControlMode_Off), VCESliceControlMode_Off);
-	obs_property_list_add_int(p, Utility::SliceControlModeAsString(VCESliceControlMode_Macroblock), VCESliceControlMode_Macroblock);
-	obs_property_list_add_int(p, Utility::SliceControlModeAsString(VCESliceControlMode_Macroblock_Row), VCESliceControlMode_Macroblock_Row);
+	obs_property_list_add_int(p, Utility::SliceControlModeAsString(H264SliceControlMode::Off), static_cast<int32_t>(H264SliceControlMode::Off));
+	obs_property_list_add_int(p, Utility::SliceControlModeAsString(H264SliceControlMode::Macroblock), static_cast<int32_t>(H264SliceControlMode::Macroblock));
+	obs_property_list_add_int(p, Utility::SliceControlModeAsString(H264SliceControlMode::Macroblock_Row), static_cast<int32_t>(H264SliceControlMode::Macroblock_Row));
 
 	/// Slice Control Size
 	p = obs_properties_add_int_slider(props, AMF_H264_SLICECONTROLSIZE, TEXT_T(AMF_H264_SLICECONTROLSIZE), 0, 34560, 1); // 4096x2160 / 16x16
@@ -537,10 +543,10 @@
 	/// View Mode
 	p = obs_properties_add_list(props, AMF_H264_VIEW, TEXT_T(AMF_H264_VIEW), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, TEXT_T(AMF_H264_VIEW_DESCRIPTION));
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_BASIC), ViewMode::Basic);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_ADVANCED), ViewMode::Advanced);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_EXPERT), ViewMode::Expert);
-	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_MASTER), ViewMode::Master);
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_BASIC), static_cast<int32_t>(ViewMode::Basic));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_ADVANCED), static_cast<int32_t>(ViewMode::Advanced));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_EXPERT), static_cast<int32_t>(ViewMode::Expert));
+	obs_property_list_add_int(p, TEXT_T(AMF_H264_VIEW_MASTER), static_cast<int32_t>(ViewMode::Master));
 	obs_property_set_modified_callback(p, properties_modified);
 
 	/// Debug
@@ -594,13 +600,28 @@
 	}
 }
 
+static void obs_data_transfer_settings(obs_data_t * data) {
+	#pragma region Version Differences
+	uint64_t version = obs_data_get_int(data, AMF_H264_VERSION);
+	switch (version) {
+		case 0x0001000400030005ull:
+			obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, obs_data_get_double(data, AMF_H264_VBVBUFFER_STRICTNESS) + 50.0);
+		case PLUGIN_VERSION_FULL:
+			obs_data_set_int(data, AMF_H264_VERSION, PLUGIN_VERSION_FULL);
+			break;
+	}
+	#pragma endregion Version Differences
+}
+
 bool Plugin::Interface::H264Interface::properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
 	bool result = false;
 	obs_property_t* p;
 
+	obs_data_transfer_settings(data);
+
 	#pragma region Presets
-	Presets lastPreset = (Presets)obs_data_get_int(data, "last" vstr(AMF_H264_PRESET)),
-		preset = (Presets)obs_data_get_int(data, AMF_H264_PRESET);
+	Presets lastPreset = static_cast<Presets>(obs_data_get_int(data, "last" vstr(AMF_H264_PRESET))),
+		preset = static_cast<Presets>(obs_data_get_int(data, AMF_H264_PRESET));
 	if (lastPreset != preset) { // Reset State
 		obs_property_t* pn = obs_properties_first(props);
 		do {
@@ -613,125 +634,98 @@
 		result = true;
 
 	switch (preset) {
-		case ResetToDefaults:
+		case Presets::ResetToDefaults:
 			#pragma region Default
-		{
-			obs_property_t* pn = obs_properties_first(props);
-			do {
-				const char* name = obs_property_name(pn);
-
-				// Do not reset Video Adapter or API.
-				if ((strcmp(name, AMF_H264_VIDEOAPI) == 0) || (strcmp(name, AMF_H264_VIDEOADAPTER) == 0))
-					continue;
-
-				switch (obs_property_get_type(pn)) {
-					case obs_property_type::OBS_PROPERTY_BOOL:
-						obs_data_set_bool(data, name, obs_data_get_default_bool(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_FLOAT:
-						obs_data_set_double(data, name, obs_data_get_default_double(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_INT:
-						obs_data_set_int(data, name, obs_data_get_default_int(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_TEXT:
-						obs_data_set_string(data, name, obs_data_get_default_string(data, name));
-						break;
-					case obs_property_type::OBS_PROPERTY_LIST:
-						switch (obs_property_list_format(pn)) {
-							case obs_combo_format::OBS_COMBO_FORMAT_INT:
-								obs_data_set_int(data, name, obs_data_get_default_int(data, name));
-								break;
-							case obs_combo_format::OBS_COMBO_FORMAT_FLOAT:
-								obs_data_set_double(data, name, obs_data_get_default_double(data, name));
-								break;
-							case obs_combo_format::OBS_COMBO_FORMAT_STRING:
-								obs_data_set_string(data, name, obs_data_get_default_string(data, name));
-								break;
-						}
-						break;
-				}
-				obs_property_set_enabled(pn, true);
-			} while (obs_property_next(&pn));
-		}
-		break;
-		#pragma endregion Default
-		case Recording:
+			{
+				obs_property_t* pn = obs_properties_first(props);
+				do {
+					const char* name = obs_property_name(pn);
+
+					// Do not reset Video Adapter or API.
+					if ((strcmp(name, AMF_H264_VIDEOAPI) == 0) || (strcmp(name, AMF_H264_VIDEOADAPTER) == 0))
+						continue;
+
+					switch (obs_property_get_type(pn)) {
+						case obs_property_type::OBS_PROPERTY_BOOL:
+							obs_data_set_bool(data, name, obs_data_get_default_bool(data, name));
+							break;
+						case obs_property_type::OBS_PROPERTY_FLOAT:
+							obs_data_set_double(data, name, obs_data_get_default_double(data, name));
+							break;
+						case obs_property_type::OBS_PROPERTY_INT:
+							obs_data_set_int(data, name, obs_data_get_default_int(data, name));
+							break;
+						case obs_property_type::OBS_PROPERTY_TEXT:
+							obs_data_set_string(data, name, obs_data_get_default_string(data, name));
+							break;
+						case obs_property_type::OBS_PROPERTY_LIST:
+							switch (obs_property_list_format(pn)) {
+								case obs_combo_format::OBS_COMBO_FORMAT_INT:
+									obs_data_set_int(data, name, obs_data_get_default_int(data, name));
+									break;
+								case obs_combo_format::OBS_COMBO_FORMAT_FLOAT:
+									obs_data_set_double(data, name, obs_data_get_default_double(data, name));
+									break;
+								case obs_combo_format::OBS_COMBO_FORMAT_STRING:
+									obs_data_set_string(data, name, obs_data_get_default_string(data, name));
+									break;
+							}
+							break;
+					}
+					obs_property_set_enabled(pn, true);
+				} while (obs_property_next(&pn));
+			}
+			break;
+			#pragma endregion Default
+		case Presets::Recording:
 			#pragma region Recording
 			// Static Properties
 			//obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
-			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
+			obs_data_set_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::High));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILE), false);
-			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILELEVEL), false);
 			//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_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::VariableBitrate_LatencyConstrained));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), false);
 			if (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) < 10000)
 				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
 			obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 10000, 100000, 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_default_single(props, data, AMF_H264_QP_MINIMUM);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_MINIMUM), false);
-			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+			obs_data_default_single(props, data, AMF_H264_QP_MAXIMUM);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_MAXIMUM), false);
-			/*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_BFRAME_DELTAQP, 0);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_DELTAQP), false);
 			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, 0);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCEDELTAQP), false);
-			//obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), false);
-			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
 			obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_FILLERDATA), false);
-			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-			//obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
 
 			// Frame Control Properties
 			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), false);
-			//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_BFrame_PATTERN, obs_data_get_default_int(data, AMF_H264_BFrame_PATTERN));
-			//obs_data_set_int(data, AMF_H264_BFrame_REFERENCE, obs_data_get_default_int(data, AMF_H264_BFrame_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_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_SCANTYPE), false);
 			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), false);
-			//obs_data_set_int(data, AMF_H264_CABAC, 0);
 			break;
 			#pragma endregion Recording
-		case HighQuality:
+		case Presets::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);
+			obs_data_set_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::High));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILE), false);
-			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILELEVEL), false);
-			//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_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::ConstantQP));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), false);
-			//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, 26);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_IFRAME), false);
 			obs_data_set_int(data, AMF_H264_QP_PFRAME, 24);
@@ -742,53 +736,29 @@
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_DELTAQP), false);
 			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, -2);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCEDELTAQP), false);
-			//obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), false);
-			//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);
 
 			// Frame Control Properties
 			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), false);
-			//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_BFrame_PATTERN, obs_data_get_default_int(data, AMF_H264_BFrame_PATTERN));
-			//obs_data_set_int(data, AMF_H264_BFrame_REFERENCE, obs_data_get_default_int(data, AMF_H264_BFrame_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_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_SCANTYPE), false);
 			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), false);
-			//obs_data_set_int(data, AMF_H264_CABAC, 0);
 			break;
 			#pragma endregion High Quality
-		case Indistinguishable:
+		case Presets::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);
+			obs_data_set_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::High));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILE), false);
-			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILELEVEL), false);
-			//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_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::ConstantQP));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), false);
-			//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_property_set_enabled(obs_properties_get(props, AMF_H264_QP_IFRAME), false);
 			obs_data_set_int(data, AMF_H264_QP_PFRAME, 19);
@@ -799,53 +769,29 @@
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_DELTAQP), false);
 			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, -2);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCEDELTAQP), false);
-			//obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), false);
-			//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);
 
 			// Frame Control Properties
 			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), false);
-			//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_BFRAME_PATTERN, obs_data_get_default_int(data, AMF_H264_BFRAME_PATTERN));
-			//obs_data_set_int(data, AMF_H264_BFRAME_REFERENCE, obs_data_get_default_int(data, AMF_H264_BFRAME_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_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_SCANTYPE), false);
 			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), false);
-			//obs_data_set_int(data, AMF_H264_CABAC, 0);
 			break;
 			#pragma endregion Indistinguishable
-		case Lossless:
+		case Presets::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);
+			obs_data_set_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::High));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILE), false);
-			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILELEVEL), false);
-			//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_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::ConstantQP));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), false);
-			//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_property_set_enabled(obs_properties_get(props, AMF_H264_QP_IFRAME), false);
 			obs_data_set_int(data, AMF_H264_QP_PFRAME, 0);
@@ -856,160 +802,88 @@
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_DELTAQP), false);
 			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, 0);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCEDELTAQP), false);
-			//obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), false);
-			//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);
 
 			// Frame Control Properties
 			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 1);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), false);
-			obs_data_set_int(data, AMF_H264_IDR_PERIOD, 30);
-			obs_property_set_enabled(obs_properties_get(props, AMF_H264_IDR_PERIOD), false);
-			//obs_data_set_int(data, AMF_H264_HEADER_INSERTION_SPACING, 0);
 			obs_data_set_int(data, AMF_H264_BFRAME_PATTERN, 0);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_PATTERN), false);
 			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCE, 0);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCE), false);
-			//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_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_SCANTYPE), false);
 			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), false);
-			//obs_data_set_int(data, AMF_H264_CABAC, 0);
 			break;
 			#pragma endregion Lossless
-		case Twitch:
+		case Presets::Twitch:
 			#pragma region Twitch
 			// Static Properties
-			obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_USAGE, static_cast<int32_t>(H264Usage::Transcoding));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_USAGE), false);
-			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_Main);
+			obs_data_set_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::Main));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILE), false);
-			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILELEVEL), false);
-			//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_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::ConstantBitrate));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), false);
-			if (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) < 1000)
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 1000);
-			if (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) > 4000)
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 4000);
-			obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 1000, 4000, 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);
+			if (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) < 500)
+				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 500);
+			obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 500, 100000, 1);
+			obs_data_default_single(props, data, AMF_H264_QP_MINIMUM);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_MINIMUM), false);
-			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+			obs_data_default_single(props, data, AMF_H264_QP_MAXIMUM);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_MAXIMUM), false);
-			/*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_BFRAME_DELTAQP, 0);
-			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_DELTAQP), false);
-			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, 0);
-			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCEDELTAQP), false);
-			//obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 80);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 100);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), false);
-			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
 			obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_FILLERDATA), false);
-			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-			//obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
 
 			// Frame Control Properties
 			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 2);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), false);
-			//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_BFRAME_PATTERN, 0);
-			//obs_data_set_int(data, AMF_H264_BFRAME_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_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_SCANTYPE), false);
 			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), false);
-			//obs_data_set_int(data, AMF_H264_CABAC, 0);
 			break;
 			#pragma endregion Twitch
-		case YouTube:
+		case Presets::YouTube:
 			#pragma region YouTube
 			// Static Properties
-			obs_data_set_int(data, AMF_H264_USAGE, VCEUsage_Transcoding);
+			obs_data_set_int(data, AMF_H264_USAGE, static_cast<int32_t>(H264Usage::Transcoding));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_USAGE), false);
-			obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_Main);
+			obs_data_set_int(data, AMF_H264_PROFILE, static_cast<int32_t>(H264Profile::Main));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILE), false);
-			obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_Automatic);
+			obs_data_set_int(data, AMF_H264_PROFILELEVEL, static_cast<int32_t>(H264ProfileLevel::Automatic));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_PROFILELEVEL), false);
-			//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_RATECONTROLMETHOD, static_cast<int32_t>(H264RateControlMethod::ConstantBitrate));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_RATECONTROLMETHOD), false);
-			if (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) < 1000)
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 1000);
-			if (obs_data_get_int(data, AMF_H264_BITRATE_PEAK) > 25000)
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, 25000);
-			obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 1000, 25000, 1);
-			obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+			if (obs_data_get_int(data, AMF_H264_BITRATE_TARGET) < 500)
+				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 500);
+			obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET), 500, 100000, 1);
+			obs_data_default_single(props, data, AMF_H264_QP_MINIMUM);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_MINIMUM), false);
-			obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+			obs_data_default_single(props, data, AMF_H264_QP_MAXIMUM);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_QP_MAXIMUM), false);
-			/*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_BFRAME_DELTAQP, 0);
-			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_DELTAQP), false);
-			obs_data_set_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP, 0);
-			obs_property_set_enabled(obs_properties_get(props, AMF_H264_BFRAME_REFERENCEDELTAQP), false);
-			//obs_data_set_int(data, AMF_H264_VBVBUFFER, 0);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_STRICTNESS, 80);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_STRICTNESS), false);
-			//obs_data_set_double(data, AMF_H264_VBVBUFFER_FULLNESS, 100);
-			//obs_property_set_enabled(obs_properties_get(props, AMF_H264_VBVBUFFER_FULLNESS), false);
-			//obs_data_set_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE, 0);
 			obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_FILLERDATA), false);
-			//obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
-			//obs_data_set_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY, 0);
 
 			// Frame Control Properties
 			obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, 2);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL), false);
-			//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_BFRAME_PATTERN, 0);
-			//obs_data_set_int(data, AMF_H264_BFRAME_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_SCANTYPE, static_cast<int32_t>(H264ScanType::Progressive));
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_SCANTYPE), false);
 			obs_data_set_int(data, AMF_H264_MOTIONESTIMATION, 3);
 			obs_property_set_enabled(obs_properties_get(props, AMF_H264_MOTIONESTIMATION), false);
-			//obs_data_set_int(data, AMF_H264_CABAC, 0);
 			break;
 			#pragma endregion YouTube
 	}
@@ -1023,7 +897,7 @@
 		//fill_api_list(p);
 
 		obs_data_set_string(data, AMF_H264_VIDEOAPI,
-			obs_property_list_item_string(p, 0));
+							obs_property_list_item_string(p, 0));
 		curVideoAPI = obs_data_get_string(data, AMF_H264_VIDEOAPI);
 	}
 	if ((strcmp(lastVideoAPI, curVideoAPI) != 0)
@@ -1033,7 +907,7 @@
 
 		// Reset Video Adapter to first in list.
 		obs_data_set_int(data, AMF_H264_VIDEOADAPTER,
-			obs_property_list_item_int(obs_properties_get(props, AMF_H264_VIDEOADAPTER), 0));
+						 obs_property_list_item_int(obs_properties_get(props, AMF_H264_VIDEOADAPTER), 0));
 	}
 	#pragma endregion Video API
 
@@ -1044,7 +918,7 @@
 	{
 		auto api = Plugin::API::Base::GetAPIByName(obs_data_get_string(data, AMF_H264_VIDEOAPI));
 		auto adapter = api->GetAdapterById(curAdapterId & UINT_MAX, (curAdapterId >> 32) & UINT_MAX);
-		devCaps = Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, VCEEncoderType_AVC);
+		devCaps = Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, H264EncoderType::AVC);
 	}
 	if (lastAdapterId != curAdapterId) {
 		obs_data_set_int(data, "last" vstr(AMF_H264_VIDEOADAPTER), curAdapterId);
@@ -1054,13 +928,13 @@
 		obs_property_list_clear(p);
 		switch (devCaps.maxProfile) {
 			case 100:
-				obs_property_list_add_int(p, "High", VCEProfile_High);
-				obs_property_list_add_int(p, "Constrained High", VCEProfile_ConstrainedHigh);
+				obs_property_list_add_int(p, "High", (int32_t)H264Profile::High);
+				obs_property_list_add_int(p, "Constrained High", (int32_t)H264Profile::ConstrainedHigh);
 			case 77:
-				obs_property_list_add_int(p, "Main", VCEProfile_Main);
+				obs_property_list_add_int(p, "Main", (int32_t)H264Profile::Main);
 			case 66:
-				obs_property_list_add_int(p, "Baseline", VCEProfile_Baseline);
-				obs_property_list_add_int(p, "Constrained Baseline", VCEProfile_ConstrainedBaseline);
+				obs_property_list_add_int(p, "Baseline", (int32_t)H264Profile::Baseline);
+				obs_property_list_add_int(p, "Constrained Baseline", (int32_t)H264Profile::ConstrainedBaseline);
 				break;
 		}
 		#pragma endregion Profile
@@ -1068,72 +942,66 @@
 		#pragma region Profile Level
 		p = obs_properties_get(props, AMF_H264_PROFILELEVEL);
 		obs_property_list_clear(p);
-		obs_property_list_add_int(p, TEXT_T(AMF_UTIL_AUTOMATIC), VCEProfileLevel_Automatic);
+		obs_property_list_add_int(p, TEXT_T(AMF_UTIL_AUTOMATIC), (int32_t)H264ProfileLevel::Automatic);
 		switch (devCaps.maxProfileLevel) {
-			case 62:
-				obs_property_list_add_int(p, "6.2", VCEProfileLevel_62);
-			case 61:
-				obs_property_list_add_int(p, "6.1", VCEProfileLevel_61);
-			case 60:
-				obs_property_list_add_int(p, "6.0", VCEProfileLevel_60);
 			case 52:
-				obs_property_list_add_int(p, "5.2", VCEProfileLevel_52);
+				obs_property_list_add_int(p, "5.2", (int32_t)H264ProfileLevel::L52);
 			case 51:
-				obs_property_list_add_int(p, "5.1", VCEProfileLevel_51);
+				obs_property_list_add_int(p, "5.1", (int32_t)H264ProfileLevel::L51);
 			case 50:
-				obs_property_list_add_int(p, "5.0", VCEProfileLevel_50);
+				obs_property_list_add_int(p, "5.0", (int32_t)H264ProfileLevel::L50);
 			case 42: // Some VCE 2.0 Cards.
-				obs_property_list_add_int(p, "4.2", VCEProfileLevel_42);
+				obs_property_list_add_int(p, "4.2", (int32_t)H264ProfileLevel::L42);
 			case 41: // Some APUs and VCE 1.0 Cards.
-				obs_property_list_add_int(p, "4.1", VCEProfileLevel_41);
+				obs_property_list_add_int(p, "4.1", (int32_t)H264ProfileLevel::L41);
 			case 40: // These should in theory be supported by all VCE 1.0 devices and APUs.
-				obs_property_list_add_int(p, "4.0", VCEProfileLevel_40);
+				obs_property_list_add_int(p, "4.0", (int32_t)H264ProfileLevel::L40);
 			case 32:
-				obs_property_list_add_int(p, "3.2", VCEProfileLevel_32);
+				obs_property_list_add_int(p, "3.2", (int32_t)H264ProfileLevel::L32);
 			case 31:
-				obs_property_list_add_int(p, "3.1", VCEProfileLevel_31);
+				obs_property_list_add_int(p, "3.1", (int32_t)H264ProfileLevel::L31);
 			case 30:
-				obs_property_list_add_int(p, "3.0", VCEProfileLevel_30);
+				obs_property_list_add_int(p, "3.0", (int32_t)H264ProfileLevel::L30);
 			case 22:
-				obs_property_list_add_int(p, "2.2", VCEProfileLevel_22);
+				obs_property_list_add_int(p, "2.2", (int32_t)H264ProfileLevel::L22);
 			case 21:
-				obs_property_list_add_int(p, "2.1", VCEProfileLevel_21);
+				obs_property_list_add_int(p, "2.1", (int32_t)H264ProfileLevel::L21);
 			case 20:
-				obs_property_list_add_int(p, "2.0", VCEProfileLevel_20);
+				obs_property_list_add_int(p, "2.0", (int32_t)H264ProfileLevel::L20);
 			case 13:
-				obs_property_list_add_int(p, "1.3", VCEProfileLevel_13);
+				obs_property_list_add_int(p, "1.3", (int32_t)H264ProfileLevel::L13);
 			case 12:
-				obs_property_list_add_int(p, "1.2", VCEProfileLevel_12);
+				obs_property_list_add_int(p, "1.2", (int32_t)H264ProfileLevel::L12);
 			case 11:
-				obs_property_list_add_int(p, "1.1", VCEProfileLevel_11);
+				obs_property_list_add_int(p, "1.1", (int32_t)H264ProfileLevel::L11);
 			case 10:
 			default:
-				obs_property_list_add_int(p, "1.0", VCEProfileLevel_10);
+				obs_property_list_add_int(p, "1.0", (int32_t)H264ProfileLevel::L10);
 		}
 		#pragma endregion Profile Level
 
 		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_TARGET),
-			10, devCaps.maxBitrate / 1000, 1);
+									10, devCaps.maxBitrate / 1000, 1);
 		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_BITRATE_PEAK),
-			10, devCaps.maxBitrate / 1000, 1);
+									10, devCaps.maxBitrate / 1000, 1);
 		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_VBVBUFFER_SIZE),
-			1, 100000, 1);
+									1, 100000, 1);
 		obs_property_float_set_limits(obs_properties_get(props, AMF_H264_KEYFRAME_INTERVAL),
-			1.0 / 144.0, 30, 1.0 / 144.0);
+									  1.0 / 144.0, 30, 1.0 / 144.0);
 		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_IDR_PERIOD),
-			1, 1000, 1);
+									1, 1000, 1);
 
-		// Experimental
+								// Experimental
 		obs_property_int_set_limits(obs_properties_get(props, AMF_H264_MAXIMUMREFERENCEFRAMES),
-			devCaps.minReferenceFrames, devCaps.maxReferenceFrames, 1);
+									devCaps.minReferenceFrames, devCaps.maxReferenceFrames, 1);
 	}
 	#pragma endregion Video Adapter
 
 	#pragma region View Mode
-	uint32_t lastView = (uint32_t)obs_data_get_int(data, "last" vstr(AMF_H264_VIEW)),
-		curView = (uint32_t)obs_data_get_int(data, AMF_H264_VIEW);
+	ViewMode lastView = static_cast<ViewMode>(obs_data_get_int(data, "last" vstr(AMF_H264_VIEW))),
+		curView = static_cast<ViewMode>(obs_data_get_int(data, AMF_H264_VIEW));
 	if (lastView != curView) {
-		obs_data_set_int(data, "last" vstr(AMF_H264_VIEW), curView);
+		obs_data_set_int(data, "last" vstr(AMF_H264_VIEW), static_cast<int32_t>(curView));
 		result = true;
 	}
 
@@ -1217,7 +1085,7 @@
 	#pragma endregion Master
 
 	#pragma region Special Logic
-	uint32_t ltrFrames = (uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES);
+	uint32_t ltrFrames = static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES));
 	bool usingLTRFrames = ltrFrames > 0;
 
 	// Key-frame Interval
@@ -1264,26 +1132,26 @@
 		vis_rcm_qp_b = false,
 		vis_rcm_fillerdata = false;
 
-	VCERateControlMethod lastRCM = (VCERateControlMethod)obs_data_get_int(data, "last" vstr(AMF_H264_RATECONTROLMETHOD)),
-		curRCM = (VCERateControlMethod)obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD);
+	H264RateControlMethod lastRCM = static_cast<H264RateControlMethod>(obs_data_get_int(data, "last" vstr(AMF_H264_RATECONTROLMETHOD))),
+		curRCM = static_cast<H264RateControlMethod>(obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD));
 	if (lastRCM != curRCM) {
-		obs_data_set_int(data, "last" vstr(AMF_H264_RATECONTROLMETHOD), curRCM);
+		obs_data_set_int(data, "last" vstr(AMF_H264_RATECONTROLMETHOD), static_cast<int32_t>(curRCM));
 		result = true;
 	}
 	switch (curRCM) {
-		case VCERateControlMethod_ConstantBitrate:
+		case H264RateControlMethod::ConstantBitrate:
 			vis_rcm_bitrate_target = true;
 			vis_rcm_fillerdata = true;
 			break;
-		case VCERateControlMethod_VariableBitrate_PeakConstrained:
+		case H264RateControlMethod::VariableBitrate_PeakConstrained:
 			vis_rcm_bitrate_target = true;
 			vis_rcm_bitrate_peak = true;
 			break;
-		case VCERateControlMethod_VariableBitrate_LatencyConstrained:
+		case H264RateControlMethod::VariableBitrate_LatencyConstrained:
 			vis_rcm_bitrate_target = true;
 			vis_rcm_bitrate_peak = true;
 			break;
-		case VCERateControlMethod_ConstantQP:
+		case H264RateControlMethod::ConstantQP:
 			vis_rcm_qp = true;
 			vis_rcm_qp_b = (!usingLTRFrames) && devCaps.supportsBFrames && usingBFrames;
 			break;
@@ -1323,10 +1191,10 @@
 	#pragma endregion Rate Control
 
 	#pragma region VBV Buffer
-	uint32_t vbvBufferMode = (uint32_t)obs_data_get_int(data, AMF_H264_VBVBUFFER);
+	uint32_t vbvBufferMode = static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_VBVBUFFER));
 	bool vbvBufferVisible = vis_advanced;
 
-	uint32_t lastVBVBufferMode = (uint32_t)obs_data_get_int(data, "last" vstr(AMF_H264_VBVBUFFER));
+	uint32_t lastVBVBufferMode = static_cast<uint32_t>(obs_data_get_int(data, "last" vstr(AMF_H264_VBVBUFFER)));
 	if (lastVBVBufferMode != vbvBufferMode) {
 		obs_data_set_int(data, "last" vstr(AMF_H264_VBVBUFFER), vbvBufferMode);
 		result = true;
@@ -1359,27 +1227,43 @@
 bool Plugin::Interface::H264Interface::update(void *data, obs_data_t *settings) {
 	try {
 		return static_cast<Plugin::Interface::H264Interface*>(data)->update(settings);
+	} catch (std::exception e) {
+		AMF_LOG_ERROR("%s", e.what());
+	} catch (std::exception* e) {
+		AMF_LOG_ERROR("%s", e->what());
+		delete e;
 	} catch (...) {
-		AMF_LOG_ERROR("Unable to update Encoder, see log for more information.");
-		return false;
+		AMF_LOG_ERROR("Unknown Exception.");
 	}
+	return false;
 }
 
 void Plugin::Interface::H264Interface::get_video_info(void *data, struct video_scale_info *info) {
 	try {
 		return static_cast<Plugin::Interface::H264Interface*>(data)->get_video_info(info);
+	} catch (std::exception e) {
+		AMF_LOG_ERROR("%s", e.what());
+	} catch (std::exception* e) {
+		AMF_LOG_ERROR("%s", e->what());
+		delete e;
 	} catch (...) {
-		AMF_LOG_ERROR("Unable to get video info, see log for more information.");
+		AMF_LOG_ERROR("Unknown Exception.");
+		return;
 	}
 }
 
 bool Plugin::Interface::H264Interface::get_extra_data(void *data, uint8_t** extra_data, size_t* size) {
 	try {
 		return static_cast<Plugin::Interface::H264Interface*>(data)->get_extra_data(extra_data, size);
+	} catch (std::exception e) {
+		AMF_LOG_ERROR("%s", e.what());
+	} catch (std::exception* e) {
+		AMF_LOG_ERROR("%s", e->what());
+		delete e;
 	} catch (...) {
-		AMF_LOG_ERROR("Unable to get extra data, see log for more information.");
-		return false;
+		AMF_LOG_ERROR("Unknown Exception.");
 	}
+	return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1396,55 +1280,57 @@
 	uint32_t m_cfgFPSnum = voi->fps_num;
 	uint32_t m_cfgFPSden = voi->fps_den;
 
+	obs_data_transfer_settings(data);
+
 	//////////////////////////////////////////////////////////////////////////
 	/// Initialize Encoder
 	bool debug = obs_data_get_bool(data, AMF_H264_DEBUG);
 	Plugin::AMD::AMF::GetInstance()->EnableDebugTrace(debug);
 
-	VCEColorFormat surfFormat = VCEColorFormat_NV12;
+	H264ColorFormat surfFormat = H264ColorFormat::NV12;
 	switch (voi->format) {
 		case VIDEO_FORMAT_NV12:
-			surfFormat = VCEColorFormat_NV12;
+			surfFormat = H264ColorFormat::NV12;
 			break;
 		case VIDEO_FORMAT_I420:
-			surfFormat = VCEColorFormat_I420;
+			surfFormat = H264ColorFormat::I420;
 			break;
 		case VIDEO_FORMAT_YUY2:
-			surfFormat = VCEColorFormat_YUY2;
+			surfFormat = H264ColorFormat::YUY2;
 			break;
 		case VIDEO_FORMAT_RGBA:
-			surfFormat = VCEColorFormat_RGBA;
+			surfFormat = H264ColorFormat::RGBA;
 			break;
 		case VIDEO_FORMAT_BGRA:
-			surfFormat = VCEColorFormat_BGRA;
+			surfFormat = H264ColorFormat::BGRA;
 			break;
 		case VIDEO_FORMAT_Y800:
-			surfFormat = VCEColorFormat_GRAY;
+			surfFormat = H264ColorFormat::GRAY;
 			break;
 	}
-	m_VideoEncoder = new VCEEncoder(VCEEncoderType_AVC, obs_data_get_string(data, AMF_H264_VIDEOAPI),
-		obs_data_get_int(data, AMF_H264_VIDEOADAPTER), !!obs_data_get_int(data, AMF_H264_OPENCL), surfFormat);
+	m_VideoEncoder = new H264Encoder(H264EncoderType::AVC, obs_data_get_string(data, AMF_H264_VIDEOAPI),
+									 obs_data_get_int(data, AMF_H264_VIDEOADAPTER), !!obs_data_get_int(data, AMF_H264_OPENCL), surfFormat);
 
-	/// Static Properties
-	m_VideoEncoder->SetUsage((VCEUsage)obs_data_get_int(data, AMF_H264_USAGE));
-	m_VideoEncoder->SetQualityPreset((VCEQualityPreset)obs_data_get_int(data, AMF_H264_QUALITY_PRESET));
+								 /// Static Properties
+	m_VideoEncoder->SetUsage(static_cast<H264Usage>(obs_data_get_int(data, AMF_H264_USAGE)));
+	m_VideoEncoder->SetQualityPreset(static_cast<H264QualityPreset>(obs_data_get_int(data, AMF_H264_QUALITY_PRESET)));
 
 	/// Frame
-	m_VideoEncoder->SetColorProfile(voi->colorspace == VIDEO_CS_709 ? VCEColorProfile_709 : VCEColorProfile_601);
+	m_VideoEncoder->SetColorProfile(voi->colorspace == VIDEO_CS_709 ? H264ColorProfile::Rec709 : H264ColorProfile::Rec601);
 	try { m_VideoEncoder->SetFullRangeColorEnabled(voi->range == VIDEO_RANGE_FULL); } catch (...) {}
 	m_VideoEncoder->SetResolution(m_cfgWidth, m_cfgHeight);
 	m_VideoEncoder->SetFrameRate(m_cfgFPSnum, m_cfgFPSden);
-	m_VideoEncoder->SetScanType((VCEScanType)obs_data_get_int(data, AMF_H264_SCANTYPE)); /// Progressive or Interlaced
+	m_VideoEncoder->SetScanType(static_cast<H264ScanType>(obs_data_get_int(data, AMF_H264_SCANTYPE)));
 
 	/// Profile & Level
-	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->SetProfile(static_cast<H264Profile>(obs_data_get_int(data, AMF_H264_PROFILE)));
+	m_VideoEncoder->SetProfileLevel(static_cast<H264ProfileLevel>(obs_data_get_int(data, AMF_H264_PROFILELEVEL)));
 
 	#pragma region Experimental
 	/// Long Term Reference
-	if ((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES) > 0)
-		m_VideoEncoder->SetBFramePattern(VCEBFramePattern_None);
-	m_VideoEncoder->SetMaximumLongTermReferenceFrames((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES));
+	if (static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES) > 0))
+		m_VideoEncoder->SetBFramePattern(H264BFramePattern::None);
+	m_VideoEncoder->SetMaximumLongTermReferenceFrames(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_MAXIMUMLTRFRAMES)));
 
 	#pragma endregion Experimental
 
@@ -1455,31 +1341,31 @@
 		const char* p_str = obs_data_get_string(data, "profile");
 		if (strcmp(p_str, "") != 0) {
 			if (strcmp(p_str, "constrained_baseline")) {
-				m_VideoEncoder->SetProfile(VCEProfile_ConstrainedBaseline);
+				m_VideoEncoder->SetProfile(H264Profile::ConstrainedBaseline);
 			} else if (strcmp(p_str, "baseline")) {
-				m_VideoEncoder->SetProfile(VCEProfile_Baseline);
+				m_VideoEncoder->SetProfile(H264Profile::Baseline);
 			} else if (strcmp(p_str, "main")) {
-				m_VideoEncoder->SetProfile(VCEProfile_Main);
+				m_VideoEncoder->SetProfile(H264Profile::Main);
 			} else if (strcmp(p_str, "constrained_high")) {
-				m_VideoEncoder->SetProfile(VCEProfile_ConstrainedHigh);
+				m_VideoEncoder->SetProfile(H264Profile::ConstrainedHigh);
 			} else if (strcmp(p_str, "high")) {
-				m_VideoEncoder->SetProfile(VCEProfile_High);
+				m_VideoEncoder->SetProfile(H264Profile::High);
 			}
 		} else {
 			switch (m_VideoEncoder->GetProfile()) {
-				case VCEProfile_ConstrainedBaseline:
+				case H264Profile::ConstrainedBaseline:
 					obs_data_set_string(data, "profile", "constrained_baseline");
 					break;
-				case VCEProfile_Baseline:
+				case H264Profile::Baseline:
 					obs_data_set_string(data, "profile", "baseline");
 					break;
-				case VCEProfile_Main:
+				case H264Profile::Main:
 					obs_data_set_string(data, "profile", "main");
 					break;
-				case VCEProfile_ConstrainedHigh:
+				case H264Profile::ConstrainedHigh:
 					obs_data_set_string(data, "profile", "constrained_high");
 					break;
-				case VCEProfile_High:
+				case H264Profile::High:
 					obs_data_set_string(data, "profile", "high");
 					break;
 			}
@@ -1489,22 +1375,22 @@
 		const char* preset = obs_data_get_string(data, "preset");
 		if (strcmp(preset, "") != 0) {
 			if (strcmp(preset, "speed") == 0) {
-				m_VideoEncoder->SetQualityPreset(VCEQualityPreset_Speed);
+				m_VideoEncoder->SetQualityPreset(H264QualityPreset::Speed);
 			} else if (strcmp(preset, "balanced") == 0) {
-				m_VideoEncoder->SetQualityPreset(VCEQualityPreset_Balanced);
+				m_VideoEncoder->SetQualityPreset(H264QualityPreset::Balanced);
 			} else if (strcmp(preset, "quality") == 0) {
-				m_VideoEncoder->SetQualityPreset(VCEQualityPreset_Quality);
+				m_VideoEncoder->SetQualityPreset(H264QualityPreset::Quality);
 			}
-			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, m_VideoEncoder->GetQualityPreset());
+			obs_data_set_int(data, AMF_H264_QUALITY_PRESET, (int32_t)m_VideoEncoder->GetQualityPreset());
 		} else {
 			switch (m_VideoEncoder->GetQualityPreset()) {
-				case VCEQualityPreset_Speed:
+				case H264QualityPreset::Speed:
 					obs_data_set_string(data, "preset", "speed");
 					break;
-				case VCEQualityPreset_Balanced:
+				case H264QualityPreset::Balanced:
 					obs_data_set_string(data, "preset", "balanced");
 					break;
-				case VCEQualityPreset_Quality:
+				case H264QualityPreset::Quality:
 					obs_data_set_string(data, "preset", "quality");
 					break;
 			}
@@ -1542,70 +1428,85 @@
 	auto api = Plugin::API::Base::GetAPIByName(obs_data_get_string(data, AMF_H264_VIDEOAPI));
 	int64_t adapterId = obs_data_get_int(data, AMF_H264_VIDEOADAPTER);
 	auto adapter = api->GetAdapterById(adapterId & UINT_MAX, (adapterId >> 32) & UINT_MAX);
-	auto devCaps = Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, VCEEncoderType_AVC);
+	auto devCaps = Plugin::AMD::VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, H264EncoderType::AVC);
 	#pragma endregion Device Capabilities
 
 	#pragma region Rate Control
 	// Rate Control Properties
-	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));
-	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) * 1000);
-			m_VideoEncoder->SetPeakBitrate(m_VideoEncoder->GetTargetBitrate());
-			break;
-		case VCERateControlMethod_VariableBitrate_PeakConstrained:
-			m_VideoEncoder->SetTargetBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * 1000);
-			m_VideoEncoder->SetPeakBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_PEAK) * 1000);
-			break;
-		case VCERateControlMethod_VariableBitrate_LatencyConstrained:
-			m_VideoEncoder->SetTargetBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * 1000);
-			m_VideoEncoder->SetPeakBitrate((uint32_t)obs_data_get_int(data, AMF_H264_BITRATE_PEAK) * 1000);
-			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 (std::exception e) {} catch (...) {}
-			break;
-	}
-	if (obs_data_get_int(data, AMF_H264_VBVBUFFER) == 0) {
-		m_VideoEncoder->SetVBVBufferAutomatic(obs_data_get_double(data, AMF_H264_VBVBUFFER_STRICTNESS) / 100.0);
+	if (m_VideoEncoder->GetUsage() != H264Usage::UltraLowLatency) {
+		m_VideoEncoder->SetRateControlMethod(static_cast<H264RateControlMethod>(obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD)));
+		m_VideoEncoder->SetMinimumQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_MINIMUM)));
+		m_VideoEncoder->SetMaximumQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_MAXIMUM)));
+		switch (static_cast<H264RateControlMethod>(obs_data_get_int(data, AMF_H264_RATECONTROLMETHOD))) {
+			case H264RateControlMethod::ConstantBitrate:
+				m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * 1000));
+				m_VideoEncoder->SetPeakBitrate(m_VideoEncoder->GetTargetBitrate());
+				break;
+			case H264RateControlMethod::VariableBitrate_PeakConstrained:
+			case H264RateControlMethod::VariableBitrate_LatencyConstrained:
+				m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * 1000));
+				m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_BITRATE_PEAK) * 1000));
+				break;
+			case H264RateControlMethod::ConstantQP:
+				m_VideoEncoder->SetIFrameQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_IFRAME)));
+				m_VideoEncoder->SetPFrameQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_PFRAME)));
+				if (devCaps.supportsBFrames && m_VideoEncoder->GetUsage() != H264Usage::UltraLowLatency)
+					try { m_VideoEncoder->SetBFrameQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_BFRAME))); } catch (...) {}
+				break;
+		}
+		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(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_VBVBUFFER_SIZE) * 1000));
+		}
+		m_VideoEncoder->SetInitialVBVBufferFullness(obs_data_get_double(data, AMF_H264_VBVBUFFER_FULLNESS) / 100.0);
+		m_VideoEncoder->SetFillerDataEnabled(!!obs_data_get_int(data, AMF_H264_FILLERDATA));
+		m_VideoEncoder->SetFrameSkippingEnabled(!!obs_data_get_int(data, AMF_H264_FRAMESKIPPING));
 	} else {
-		m_VideoEncoder->SetVBVBufferSize((uint32_t)obs_data_get_int(data, AMF_H264_VBVBUFFER_SIZE) * 1000);
+		m_VideoEncoder->SetMinimumQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_MINIMUM)));
+		m_VideoEncoder->SetMaximumQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_MAXIMUM)));
+		m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * 1000));
+
+		m_VideoEncoder->SetIFrameQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_IFRAME)));
+		m_VideoEncoder->SetPFrameQP(static_cast<uint8_t>(obs_data_get_int(data, AMF_H264_QP_PFRAME)));
+
+		if (obs_data_get_int(data, AMF_H264_VBVBUFFER) == 0) {
+			m_VideoEncoder->SetVBVBufferSize(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_BITRATE_TARGET) * 1000));
+		} else {
+			m_VideoEncoder->SetVBVBufferSize(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_VBVBUFFER_SIZE) * 1000));
+		}
 	}
-	m_VideoEncoder->SetInitialVBVBufferFullness(obs_data_get_double(data, AMF_H264_VBVBUFFER_FULLNESS) / 100.0);
-	m_VideoEncoder->SetFillerDataEnabled(obs_data_get_int(data, AMF_H264_FILLERDATA) == 1);
-	m_VideoEncoder->SetFrameSkippingEnabled(obs_data_get_int(data, AMF_H264_FRAMESKIPPING) == 1);
 	m_VideoEncoder->SetEnforceHRDRestrictionsEnabled(obs_data_get_int(data, AMF_H264_ENFORCEHRDCOMPATIBILITY) == 1);
 	#pragma endregion Rate Control
 
 	// Key-frame Interval
 	double_t framerate = (double_t)m_VideoEncoder->GetFrameRate().first / (double_t)m_VideoEncoder->GetFrameRate().second;
-	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));
+	if (static_cast<ViewMode>(obs_data_get_int(data, AMF_H264_VIEW)) == ViewMode::Master)
+		m_VideoEncoder->SetIDRPeriod(static_cast<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));
+		m_VideoEncoder->SetIDRPeriod(max(static_cast<uint32_t>(obs_data_get_double(data, AMF_H264_KEYFRAME_INTERVAL) * framerate), 1));
 
 	#pragma region B-Frames
 	if (devCaps.supportsBFrames) {
 		try {
-			m_VideoEncoder->SetBFramePattern((VCEBFramePattern)obs_data_get_int(data, AMF_H264_BFRAME_PATTERN));
-			m_VideoEncoder->SetBFrameReferenceEnabled(!!obs_data_get_int(data, AMF_H264_BFRAME_REFERENCE));
-		} catch (std::exception e) {} catch (...) {}
-		try {
-			if (m_VideoEncoder->GetBFramePattern() != VCEBFramePattern_None) {
-				m_VideoEncoder->SetBFrameDeltaQP((int8_t)obs_data_get_int(data, AMF_H264_BFRAME_DELTAQP));
-				if (m_VideoEncoder->IsBFrameReferenceEnabled())
-					m_VideoEncoder->SetBFrameReferenceDeltaQP((int8_t)obs_data_get_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP));
-			}
-		} catch (std::exception e) {} catch (...) {}
+			m_VideoEncoder->SetBFramePattern(static_cast<H264BFramePattern>(obs_data_get_int(data, AMF_H264_BFRAME_PATTERN)));
+			if (obs_data_get_int(data, AMF_H264_BFRAME_PATTERN) != 0)
+				m_VideoEncoder->SetBFrameDeltaQP(static_cast<int8_t>(obs_data_get_int(data, AMF_H264_BFRAME_DELTAQP)));
+		} catch (...) {}
+
+		// B-Frame Reference can't be used with anything else but Transcoding.
+		if (m_VideoEncoder->GetUsage() == H264Usage::Transcoding) {
+			try {
+				m_VideoEncoder->SetBFrameReferenceEnabled(!!obs_data_get_int(data, AMF_H264_BFRAME_REFERENCE));
+				if (!!obs_data_get_int(data, AMF_H264_BFRAME_REFERENCE))
+					m_VideoEncoder->SetBFrameReferenceDeltaQP(static_cast<int8_t>(obs_data_get_int(data, AMF_H264_BFRAME_REFERENCEDELTAQP)));
+			} catch (...) {}
+		}
 	}
 	#pragma endregion B-Frames
 
-	m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, AMF_H264_DEBLOCKINGFILTER));
+	if (m_VideoEncoder->GetUsage() == H264Usage::Transcoding)
+		m_VideoEncoder->SetDeblockingFilterEnabled(!!obs_data_get_int(data, AMF_H264_DEBLOCKINGFILTER));
 
 	#pragma region Motion Estimation
 	m_VideoEncoder->SetHalfPixelMotionEstimationEnabled(!!(obs_data_get_int(data, AMF_H264_MOTIONESTIMATION) & 1));
@@ -1613,26 +1514,32 @@
 	#pragma endregion Motion Estimation
 
 	#pragma region Experimental
-	try { m_VideoEncoder->SetCodingType((VCECodingType)obs_data_get_int(data, AMF_H264_CODINGTYPE)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetWaitForTaskEnabled(!!obs_data_get_int(data, AMF_H264_WAITFORTASK)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetPreAnalysisPassEnabled(!!obs_data_get_int(data, AMF_H264_PREANALYSISPASS)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetVBAQEnabled(!!obs_data_get_int(data, AMF_H264_VBAQ)); } catch (std::exception e) {} catch (...) {}
-
-	try { m_VideoEncoder->SetHeaderInsertionSpacing((uint32_t)obs_data_get_int(data, AMF_H264_HEADER_INSERTION_SPACING)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetMaximumAccessUnitSize((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetMaximumReferenceFrames((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMREFERENCEFRAMES)); } catch (std::exception e) {} catch (...) {}
-
-	try { m_VideoEncoder->SetGOPSize((uint32_t)obs_data_get_int(data, AMF_H264_GOPSIZE)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetGOPAlignmentEnabled(!!obs_data_get_int(data, AMF_H264_GOPALIGNMENT)); } catch (std::exception e) {} catch (...) {}
-
-	try { m_VideoEncoder->SetIntraRefreshNumberOfStripes((uint32_t)obs_data_get_int(data, AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetIntraRefreshMacroblocksPerSlot((uint32_t)obs_data_get_int(data, AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT)); } catch (std::exception e) {} catch (...) {}
-
-	try { m_VideoEncoder->SetSlicesPerFrame((uint32_t)obs_data_get_int(data, AMF_H264_SLICESPERFRAME)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetSliceMode((VCESliceMode)obs_data_get_int(data, AMF_H264_SLICEMODE)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetMaximumSliceSize((uint32_t)obs_data_get_int(data, AMF_H264_MAXIMUMSLICESIZE)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetSliceControlMode((VCESliceControlMode)obs_data_get_int(data, AMF_H264_SLICECONTROLMODE)); } catch (std::exception e) {} catch (...) {}
-	try { m_VideoEncoder->SetSliceControlSize((uint32_t)obs_data_get_int(data, AMF_H264_SLICECONTROLSIZE)); } catch (std::exception e) {} catch (...) {}
+	try { m_VideoEncoder->SetCodingType(static_cast<H264CodingType>(obs_data_get_int(data, AMF_H264_CODINGTYPE))); } catch (...) {}
+	try { m_VideoEncoder->SetWaitForTaskEnabled(!!obs_data_get_int(data, AMF_H264_WAITFORTASK)); } catch (...) {}
+	if (m_VideoEncoder->GetUsage() == H264Usage::Transcoding || m_VideoEncoder->GetUsage() == H264Usage::Webcam) {
+		try { m_VideoEncoder->SetPreAnalysisPassEnabled(!!obs_data_get_int(data, AMF_H264_PREANALYSISPASS)); } catch (...) {}
+		try { m_VideoEncoder->SetVBAQEnabled(!!obs_data_get_int(data, AMF_H264_VBAQ)); } catch (...) {}
+	}
+
+	try { m_VideoEncoder->SetHeaderInsertionSpacing(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_HEADER_INSERTION_SPACING))); } catch (...) {}
+	if (m_VideoEncoder->GetUsage() == H264Usage::Transcoding || m_VideoEncoder->GetUsage() == H264Usage::Webcam) {
+		try { m_VideoEncoder->SetMaximumAccessUnitSize(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_MAXIMUMACCESSUNITSIZE))); } catch (...) {}
+	}
+	try { m_VideoEncoder->SetMaximumReferenceFrames(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_MAXIMUMREFERENCEFRAMES))); } catch (...) {}
+
+	if (m_VideoEncoder->GetUsage() == H264Usage::Transcoding || m_VideoEncoder->GetUsage() == H264Usage::Webcam) {
+		try { m_VideoEncoder->SetGOPSize(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_GOPSIZE))); } catch (...) {}
+	}
+	try { m_VideoEncoder->SetGOPAlignmentEnabled(!!obs_data_get_int(data, AMF_H264_GOPALIGNMENT)); } catch (...) {}
+
+	try { m_VideoEncoder->SetIntraRefreshNumberOfStripes(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES))); } catch (...) {}
+	try { m_VideoEncoder->SetIntraRefreshMacroblocksPerSlot(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT))); } catch (...) {}
+
+	try { m_VideoEncoder->SetSlicesPerFrame(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_SLICESPERFRAME))); } catch (...) {}
+	try { m_VideoEncoder->SetSliceMode(static_cast<H264SliceMode>(obs_data_get_int(data, AMF_H264_SLICEMODE))); } catch (...) {}
+	try { m_VideoEncoder->SetMaximumSliceSize(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_MAXIMUMSLICESIZE))); } catch (...) {}
+	try { m_VideoEncoder->SetSliceControlMode(static_cast<H264SliceControlMode>(obs_data_get_int(data, AMF_H264_SLICECONTROLMODE))); } catch (...) {}
+	try { m_VideoEncoder->SetSliceControlSize(static_cast<uint32_t>(obs_data_get_int(data, AMF_H264_SLICECONTROLSIZE))); } catch (...) {}
 	#pragma endregion Experimental
 
 	if (m_VideoEncoder->IsStarted()) {
@@ -1643,47 +1550,50 @@
 			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);
+					m_VideoEncoder->SetRateControlMethod(H264RateControlMethod::ConstantBitrate);
 					m_VideoEncoder->SetFillerDataEnabled(true);
 				} else if (strcmp(t_str, "VBR") == 0) {
-					m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_VariableBitrate_PeakConstrained);
+					m_VideoEncoder->SetRateControlMethod(H264RateControlMethod::VariableBitrate_PeakConstrained);
 				} else if (strcmp(t_str, "VBR_LAT") == 0) {
-					m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_VariableBitrate_LatencyConstrained);
+					m_VideoEncoder->SetRateControlMethod(H264RateControlMethod::VariableBitrate_LatencyConstrained);
 				} else if (strcmp(t_str, "CQP") == 0) {
-					m_VideoEncoder->SetRateControlMethod(VCERateControlMethod_ConstantQP);
+					m_VideoEncoder->SetRateControlMethod(H264RateControlMethod::ConstantQP);
 				}
 
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, m_VideoEncoder->GetRateControlMethod());
+				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, (int32_t)m_VideoEncoder->GetRateControlMethod());
 			} else {
-				switch (m_VideoEncoder->GetRateControlMethod()) {
-					case VCERateControlMethod_ConstantBitrate:
-						obs_data_set_string(data, "rate_control", "CBR");
-						break;
-					case VCERateControlMethod_VariableBitrate_PeakConstrained:
-						obs_data_set_string(data, "rate_control", "VBR");
-						break;
-					case VCERateControlMethod_VariableBitrate_LatencyConstrained:
-						obs_data_set_string(data, "rate_control", "VBR_LAT");
-						break;
-					case VCERateControlMethod_ConstantQP:
-						obs_data_set_string(data, "rate_control", "CQP");
-						break;
-				}
+				if (m_VideoEncoder->GetUsage() != H264Usage::UltraLowLatency)
+					switch (m_VideoEncoder->GetRateControlMethod()) {
+						case H264RateControlMethod::ConstantBitrate:
+							obs_data_set_string(data, "rate_control", "CBR");
+							break;
+						case H264RateControlMethod::VariableBitrate_PeakConstrained:
+							obs_data_set_string(data, "rate_control", "VBR");
+							break;
+						case H264RateControlMethod::VariableBitrate_LatencyConstrained:
+							obs_data_set_string(data, "rate_control", "VBR_LAT");
+							break;
+						case H264RateControlMethod::ConstantQP:
+							obs_data_set_string(data, "rate_control", "CQP");
+							break;
+					}
 			}
 
 			// Bitrate
 			uint64_t bitrateOvr = obs_data_get_int(data, "bitrate") * 1000;
 			if (bitrateOvr != -1) {
 				if (m_VideoEncoder->GetTargetBitrate() > bitrateOvr)
-					m_VideoEncoder->SetTargetBitrate((uint32_t)bitrateOvr);
+					m_VideoEncoder->SetTargetBitrate(static_cast<uint32_t>(bitrateOvr));
 
-				if (m_VideoEncoder->GetPeakBitrate() > bitrateOvr)
-					m_VideoEncoder->SetPeakBitrate((uint32_t)bitrateOvr);
+				if (m_VideoEncoder->GetUsage() != H264Usage::UltraLowLatency)
+					if (m_VideoEncoder->GetPeakBitrate() > bitrateOvr)
+						m_VideoEncoder->SetPeakBitrate(static_cast<uint32_t>(bitrateOvr));
 
 				obs_data_set_int(data, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
 
 				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, m_VideoEncoder->GetTargetBitrate() / 1000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, m_VideoEncoder->GetPeakBitrate() / 1000);
+				if (m_VideoEncoder->GetUsage() != H264Usage::UltraLowLatency)
+					obs_data_set_int(data, AMF_H264_BITRATE_PEAK, m_VideoEncoder->GetPeakBitrate() / 1000);
 			} else {
 				obs_data_set_int(data, "bitrate", m_VideoEncoder->GetTargetBitrate() / 1000);
 			}
@@ -1692,19 +1602,19 @@
 			uint32_t fpsNum = m_VideoEncoder->GetFrameRate().first;
 			uint32_t fpsDen = m_VideoEncoder->GetFrameRate().second;
 			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)));
+				m_VideoEncoder->SetIDRPeriod(static_cast<uint32_t>(obs_data_get_int(data, "keyint_sec") * (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
 
-				obs_data_set_double(data, 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)));
+				obs_data_set_double(data, AMF_H264_KEYFRAME_INTERVAL, static_cast<double_t>(obs_data_get_int(data, "keyint_sec")));
+				obs_data_set_int(data, AMF_H264_IDR_PERIOD, static_cast<uint32_t>(obs_data_get_int(data, "keyint_sec") *  (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
 			} else {
-				obs_data_set_int(data, "keyint_sec", (uint64_t)(m_VideoEncoder->GetIDRPeriod() / ((double_t)fpsNum / (double_t)fpsDen)));
+				obs_data_set_int(data, "keyint_sec", static_cast<uint64_t>(m_VideoEncoder->GetIDRPeriod() / (static_cast<double_t>(fpsNum) / static_cast<double_t>(fpsDen))));
 			}
 		}
 		#pragma endregion OBS Enforce Streaming Service Settings
 
 		// Verify
 		m_VideoEncoder->LogProperties();
-		if (obs_data_get_int(data, AMF_H264_VIEW) >= ViewMode::Master)
+		if (static_cast<ViewMode>(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.");
 	}

obs-studio-0.17.0.tar.xz/plugins/enc-amf/Source/misc-util.cpp -> obs-studio-17.0.1.tar.xz/plugins/enc-amf/Source/misc-util.cpp Changed

@@ -40,35 +40,35 @@
 
 namespace Plugin {
 	namespace Utility {
-		VCEProfileLevel inline GetMinimumProfileLevel(std::pair<uint32_t, uint32_t> frameSize, std::pair<uint32_t, uint32_t> frameRate) {
+		H264ProfileLevel 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;
+			typedef std::pair<H264ProfileLevel, 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))
+				level(H264ProfileLevel::L10, levelRestriction(25344, 380160)),
+				level(H264ProfileLevel::L11, levelRestriction(101376, 768000)),
+				level(H264ProfileLevel::L12, levelRestriction(101376, 1536000)),
+				level(H264ProfileLevel::L13, levelRestriction(101376, 3041280)),
+				level(H264ProfileLevel::L20, levelRestriction(101376, 3041280)),
+				level(H264ProfileLevel::L21, levelRestriction(202752, 5068800)),
+				level(H264ProfileLevel::L22, levelRestriction(414720, 5184000)),
+				level(H264ProfileLevel::L30, levelRestriction(414720, 10368000)),
+				level(H264ProfileLevel::L31, levelRestriction(921600, 27648000)),
+				level(H264ProfileLevel::L32, levelRestriction(1310720, 55296000)),
+				//level(H264ProfileLevel::40, levelRestriction(2097152, 62914560)), // Technically identical to 4.1, but backwards compatible.
+				level(H264ProfileLevel::L41, levelRestriction(2097152, 62914560)),
+				level(H264ProfileLevel::L42, levelRestriction(2228224, 133693440)),
+				level(H264ProfileLevel::L50, levelRestriction(5652480, 150994944)),
+				level(H264ProfileLevel::L51, levelRestriction(9437184, 251658240)),
+				level(H264ProfileLevel::L52, levelRestriction(9437184, 530841600)),
+				level((H264ProfileLevel)-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++) {
+			for (uint32_t index = 0; (int32_t)curLevel.first != -1; index++) {
 				curLevel = profileLevelLimit[index];
 
 				if (samples > curLevel.second.first)
@@ -79,49 +79,49 @@
 
 				return curLevel.first;
 			}
-			return VCEProfileLevel_52;
+			return H264ProfileLevel::L52;
 		}
 
 		#pragma region VCEEncoderType
-		inline const char* VCEEncoderTypeAsString(VCEEncoderType type) {
+		inline const char* VCEEncoderTypeAsString(H264EncoderType type) {
 			const char* types[] = {
 				"AVC",
 				"SVC",
 				"HEVC"
 			};
-			return types[type];
+			return types[(uint8_t)type];
 		}
-		inline const wchar_t* VCEEncoderTypeAsAMF(VCEEncoderType type) {
+		inline const wchar_t* VCEEncoderTypeAsAMF(H264EncoderType type) {
 			const wchar_t* types[] = {
 				AMFVideoEncoderVCE_AVC,
 				AMFVideoEncoderVCE_SVC,
 				L"AMFVideoEncoderHW_HEVC"
 			};
-			return types[type];
+			return types[(uint8_t)type];
 		}
 		#pragma endregion VCEEncoderType
 		#pragma region VCEMemoryType
-		inline const char* MemoryTypeAsString(VCEMemoryType memoryType) {
+		inline const char* MemoryTypeAsString(H264MemoryType memoryType) {
 			static const char* memoryTypeToString[] = {
 				"Host",
 				"DirectX9",
 				"DirectX11",
 				"OpenGL"
 			};
-			return memoryTypeToString[memoryType];
+			return memoryTypeToString[(uint8_t)memoryType];
 		}
-		inline amf::AMF_MEMORY_TYPE MemoryTypeAsAMF(VCEMemoryType memoryType) {
+		inline amf::AMF_MEMORY_TYPE MemoryTypeAsAMF(H264MemoryType memoryType) {
 			static amf::AMF_MEMORY_TYPE memoryTypeToAMF[] = {
 				amf::AMF_MEMORY_HOST,
 				amf::AMF_MEMORY_DX9,
 				amf::AMF_MEMORY_DX11,
 				amf::AMF_MEMORY_OPENGL,
 			};
-			return memoryTypeToAMF[memoryType];
+			return memoryTypeToAMF[(uint8_t)memoryType];
 		}
 		#pragma endregion VCEMemoryType
 		#pragma region VCESurfaceFormat
-		inline const char* SurfaceFormatAsString(VCEColorFormat surfaceFormat) {
+		inline const char* SurfaceFormatAsString(H264ColorFormat surfaceFormat) {
 			static const char* surfaceFormatToString[] = {
 				"NV12",
 				"I420",
@@ -130,9 +130,9 @@
 				"RGBA",
 				"GRAY",
 			};
-			return surfaceFormatToString[surfaceFormat];
+			return surfaceFormatToString[(uint8_t)surfaceFormat];
 		}
-		inline amf::AMF_SURFACE_FORMAT SurfaceFormatAsAMF(VCEColorFormat surfaceFormat) {
+		inline amf::AMF_SURFACE_FORMAT SurfaceFormatAsAMF(H264ColorFormat surfaceFormat) {
 			static amf::AMF_SURFACE_FORMAT surfaceFormatToAMF[] = {
 				// 4:2:0 Formats
 				amf::AMF_SURFACE_NV12,
@@ -145,60 +145,60 @@
 				// Other
 				amf::AMF_SURFACE_GRAY8,
 			};
-			return surfaceFormatToAMF[surfaceFormat];
+			return surfaceFormatToAMF[(uint8_t)surfaceFormat];
 		}
 		#pragma endregion VCESurfaceFormat
 		#pragma region VCEUsage
-		inline const char* UsageAsString(VCEUsage usage) {
+		inline const char* UsageAsString(H264Usage usage) {
 			static const char* usageToString[] = {
 				"Transcoding",
 				"Ultra Low Latency",
 				"Low Latency",
 				"Webcam"
 			};
-			return usageToString[usage];
+			return usageToString[(uint8_t)usage];
 		}
-		inline AMF_VIDEO_ENCODER_USAGE_ENUM UsageAsAMF(VCEUsage usage) {
+		inline AMF_VIDEO_ENCODER_USAGE_ENUM UsageAsAMF(H264Usage usage) {
 			static AMF_VIDEO_ENCODER_USAGE_ENUM usageToAMF[] = {
 				AMF_VIDEO_ENCODER_USAGE_TRANSCONDING,
 				AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY,
 				AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY,
 				AMF_VIDEO_ENCODER_USAGE_WEBCAM,
 			};
-			return usageToAMF[usage];
+			return usageToAMF[(uint8_t)usage];
 		}
-		inline VCEUsage UsageFromAMF(uint32_t usage) {
-			static VCEUsage usageFromAMF[] = {
-				VCEUsage_Transcoding,
-				VCEUsage_UltraLowLatency,
-				VCEUsage_LowLatency,
-				VCEUsage_Webcam,
+		inline H264Usage UsageFromAMF(uint32_t usage) {
+			static H264Usage usageFromAMF[] = {
+				H264Usage::Transcoding,
+				H264Usage::UltraLowLatency,
+				H264Usage::LowLatency,
+				H264Usage::Webcam,
 			};
-			return usageFromAMF[usage];
+			return usageFromAMF[(uint8_t)usage];
 		}
 		#pragma endregion VCEUsage
 		#pragma region VCEQualityPreset
-		inline const char* QualityPresetAsString(VCEQualityPreset preset) {
+		inline const char* QualityPresetAsString(H264QualityPreset preset) {
 			static const char* qualityPresetToString[] = {
 				"Speed",
 				"Balanced",
 				"Quality"
 			};
-			return qualityPresetToString[preset];
+			return qualityPresetToString[(uint8_t)preset];
 		}
 		#pragma endregion VCEQualityPreset
 		#pragma region VCEProfile
-		inline const char* ProfileAsString(VCEProfile profile) {
+		inline const char* ProfileAsString(H264Profile profile) {
 			switch (profile) {
-				case VCEProfile_Baseline:
+				case H264Profile::Baseline:
 					return "Baseline";
-				case VCEProfile_Main:
+				case H264Profile::Main:
 					return "Main";
-				case VCEProfile_High:
+				case H264Profile::High:
 					return "High";
-				case VCEProfile_ConstrainedBaseline:
+				case H264Profile::ConstrainedBaseline:
 					return "Constrained Baseline";
-				case VCEProfile_ConstrainedHigh:
+				case H264Profile::ConstrainedHigh:
 					return "Constrained High";
 			}
 
@@ -206,62 +206,62 @@
 		}
 		#pragma endregion VCEProfile
 		#pragma region VCERateControlMethod
-		inline const char* RateControlMethodAsString(VCERateControlMethod method) {
+		inline const char* RateControlMethodAsString(H264RateControlMethod method) {
 			static const char* rateControlMethodToString[] = {
 				"Constant Quantization Parameter (CQP)",
 				"Constant Bitrate (CBR)",
 				"Peak Constrained Variable Bitrate (VBR)",
 				"Latency Constrained Variable Bitrate (VBR_LAT)"
 			};
-			return rateControlMethodToString[method];
+			return rateControlMethodToString[(uint8_t)method];
 		}
-		inline AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM RateControlMethodAsAMF(VCERateControlMethod method) {
+		inline AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM RateControlMethodAsAMF(H264RateControlMethod method) {
 			static AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM CustomToAMF[] = {
 				AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP,
 				AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR,
 				AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR,
 				AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR,
 			};
-			return CustomToAMF[method];
+			return CustomToAMF[(uint8_t)method];
 		}
-		inline VCERateControlMethod RateControlMethodFromAMF(uint32_t method) {
-			static VCERateControlMethod AMFToCustom[] = {
-				VCERateControlMethod_ConstantQP,
-				VCERateControlMethod_ConstantBitrate,
-				VCERateControlMethod_VariableBitrate_PeakConstrained,
-				VCERateControlMethod_VariableBitrate_LatencyConstrained,
+		inline H264RateControlMethod RateControlMethodFromAMF(uint32_t method) {
+			static H264RateControlMethod AMFToCustom[] = {
+				H264RateControlMethod::ConstantQP,
+				H264RateControlMethod::ConstantBitrate,
+				H264RateControlMethod::VariableBitrate_PeakConstrained,
+				H264RateControlMethod::VariableBitrate_LatencyConstrained,
 			};
-			return AMFToCustom[method];
+			return AMFToCustom[(uint8_t)method];
 		}
 		#pragma endregion VCERateControlMethod
 
-		inline const char* CodingTypeAsString(VCECodingType type) {
+		inline const char* CodingTypeAsString(H264CodingType type) {
 			switch (type) {
-				case VCECodingType_CABAC:
+				case H264CodingType::CABAC:
 					return "CABAC";
-				case VCECodingType_CALVC:
+				case H264CodingType::CALVC:
 					return "CALVC";
-				case VCECodingType_Default:
+				case H264CodingType::Default:
 					return "Default";
 			}
 			return "MEMORY CORRUPTION";
 		}
-		inline const char* SliceModeAsString(VCESliceMode mode) {
+		inline const char* SliceModeAsString(H264SliceMode mode) {
 			switch (mode) {
-				case VCESliceMode_Horizontal:
+				case H264SliceMode::Horizontal:
 					return "Horizontal";
-				case VCESliceMode_Vertical:
+				case H264SliceMode::Vertical:
 					return "Vertical";
 			}
 			return "MEMORY CORRUPTION";
 		}
-		inline const char* SliceControlModeAsString(VCESliceControlMode mode) {
+		inline const char* SliceControlModeAsString(H264SliceControlMode mode) {
 			switch (mode) {
-				case VCESliceControlMode_Off:
+				case H264SliceControlMode::Off:
 					return "Off";
-				case VCESliceControlMode_Macroblock:
+				case H264SliceControlMode::Macroblock:
 					return "Macroblock";
-				case VCESliceControlMode_Macroblock_Row:
+				case H264SliceControlMode::Macroblock_Row:
 					return "Macroblock Row";
 			}
 			return "MEMORY CORRUPTION";

obs-studio-0.17.0.tar.xz/plugins/image-source/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/image-source/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/linux-capture/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/linux-capture/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/mac-capture/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/mac-capture/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/mac-vth264/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/mac-vth264/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/mac-vth264/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/mac-vth264/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/CMakeLists.txt -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/CMakeLists.txt Changed

@@ -46,7 +46,8 @@
 	obs-browser/main.cpp
 	obs-browser/main-source.cpp
 	shared/browser-source.cpp
-	shared/base64.cpp)
+	shared/base64.cpp
+	shared/util.cpp)
 
 set(obs-browser_HEADERS
 	shared/browser-manager.hpp
@@ -56,7 +57,8 @@
 	shared/browser-types.h
 	shared/base64.hpp
 	shared/browser-types.h
-	shared/browser-version.h)
+	shared/browser-version.h
+	shared/util.hpp)
 
 if (APPLE)
 	list(APPEND obs-browser_SOURCES
@@ -94,7 +96,9 @@
 		obs-browser/browser-render-handler.cpp
 		obs-browser/browser-source-base.cpp
 		obs-browser/browser-load-handler.cpp
-		shared/browser-scheme.cpp)
+		obs-browser/browser-obs-bridge-base.cpp
+		shared/browser-scheme.cpp
+		fmt/format.cc)
 
 	list(APPEND obs-browser_HEADERS
 		shared/browser-client.hpp
@@ -105,13 +109,15 @@
 		obs-browser/browser-render-handler.hpp
 		obs-browser/browser-source-base.hpp
 		obs-browser/browser-load-handler.hpp
-		shared/browser-scheme.hpp)
+		obs-browser/browser-obs-bridge-base.hpp
+		shared/browser-scheme.hpp
+		fmt/format.h)
 
 endif(APPLE)
 
 set(obs-browser_LIBRARIES
-	libobs
-	obs-frontend-api)
+	obs-frontend-api
+	${OBS_JANSSON_IMPORT})
 
 if (APPLE)
 	list(APPEND obs-browser_LIBRARIES
@@ -128,13 +134,17 @@
 	"obs-browser" 
 	"shared")
 
+target_include_directories(obs-browser PUBLIC
+	${OBS_JANSSON_INCLUDE_DIRS})
+
 if (APPLE)
 	target_include_directories(obs-browser PUBLIC 
 		"shared-apple")
-else(APPLE)
-	target_include_directories_system(obs-browser PUBLIC ${CEF_INCLUDE_DIR})
+else (APPLE)
+	target_include_directories_system(obs-browser PUBLIC ${CEF_ROOT_DIR})
 endif(APPLE)
 
+
 if (APPLE)
 	set_xcode_property(obs-browser CLANG_CXX_LIBRARY "libc++")
 endif(APPLE)
@@ -160,6 +170,7 @@
 	set(cef-isolation_SOURCES
 		cef-isolation/main.mm
 		cef-isolation/cef-isolated-client.mm
+		cef-isolation/browser-obs-bridge-mac.mm
 		cef-isolation/browser-handle.mm
 		cef-isolation/browser-render-handler.mm
 		cef-isolation/browser-texture-mac.mm
@@ -169,7 +180,8 @@
 		shared/browser-app.cpp
 		shared/browser-scheme.cpp
 		shared/base64.cpp
-		obs-browser/browser-load-handler.cpp)
+		obs-browser/browser-load-handler.cpp
+		fmt/format.cc)
 
 	set(cef-isolation_HEADERS
 		shared-apple/cef-logging.h
@@ -179,6 +191,7 @@
 		cef-isolation/browser-render-handler.hpp
 		cef-isolation/browser-texture-mac.h
 		cef-isolation/service-connection-delegate.h
+		cef-isolation/browser-obs-bridge-mac.hpp
 		shared/browser-texture.hpp
 		shared/browser-client.hpp
 		shared/browser-task.hpp
@@ -187,6 +200,7 @@
 		obs-browser/browser-load-handler.hpp
 		shared/browser-scheme.hpp
 		shared/browser-types.h
+		shared/browser-obs-bridge.hpp
 		shared-apple/browser-bridges.h)
 
 	add_executable(cef-isolation
@@ -205,10 +219,14 @@
 		"shared"
 		"shared-apple")
 	
-	target_include_directories_system(cef-isolation PUBLIC ${CEF_INCLUDE_DIR})
+	target_include_directories_system(cef-isolation
+		PUBLIC
+			${CEF_INCLUDE_DIR}
+			${OBS_JANSSON_INCLUDE_DIRS})
 	
 	target_link_libraries(cef-isolation
 		${CEF_LIBRARIES}
+		${OBS_JANSSON_IMPORT}
 		${APPKIT_FRAMEWORK}
 		${IOSURFACE_FRAMEWORK})
 
@@ -216,10 +234,12 @@
 
 set(cef-bootstrap_SOURCES
 	cef-bootstrap/main.cpp
-	shared/browser-app.cpp)
+	shared/browser-app.cpp
+	fmt/format.cc)
 
 set(cef-bootstrap_HEADERS
-	shared/browser-app.hpp)
+	shared/browser-app.hpp
+	fmt/format.h)
 
 add_executable(cef-bootstrap 
 	${cef-bootstrap_SOURCES} 
@@ -239,10 +259,14 @@
 endif(APPLE AND XCODE)
 
 target_include_directories(cef-bootstrap PRIVATE "shared")
-target_include_directories_system(cef-bootstrap PUBLIC ${CEF_INCLUDE_DIR})
+target_include_directories_system(cef-bootstrap
+	PUBLIC
+		${CEF_ROOT_DIR}
+		${OBS_JANSSON_INCLUDE_DIRS})
 
 target_link_libraries(cef-bootstrap
-	${CEF_LIBRARIES})
+	${CEF_LIBRARIES}
+	${OBS_JANSSON_IMPORT})
 
 if (APPLE)
 
@@ -250,7 +274,7 @@
 		OUTPUT_NAME "CEF"
 		MACOSX_BUNDLE TRUE
 		BUILD_WITH_INSTALL_RPATH TRUE
-		INSTALL_RPATH "@loader_path/../Frameworks"
+		INSTALL_RPATH "@executable_path/.."
 		MACOSX_BUNDLE_BUNDLE_NAME "CEF Helper"
 		MACOSX_BUNDLE_GUI_IDENTIFIER "org.catchexception.cef.cef-isolation")
 
@@ -258,7 +282,7 @@
 		OUTPUT_NAME "CEF Helper"
 		MACOSX_BUNDLE TRUE
 		BUILD_WITH_INSTALL_RPATH TRUE
-		INSTALL_RPATH "@loader_path/../../../"
+		INSTALL_RPATH "@executable_path/../../../.."
 		MACOSX_BUNDLE_BUNDLE_NAME "CEF Helper"
 		MACOSX_BUNDLE_GUI_IDENTIFIER "org.catchexception.cef.cef-bootstrap")

obs-studio-0.17.0.tar.xz/plugins/obs-browser/FindCEF.cmake -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/FindCEF.cmake Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/README.md -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/README.md Changed

@@ -26,14 +26,24 @@
 
 ### Register for scene change callbacks
 ```
-/**
- * onSceneChange gets callbacks when the scene is changed
- *
- * @param {string} sceneName - The name of the scene that was changed to.
- */
-window.obsstudio.onSceneChange = function(sceneName) {
-	
-};
+window.addEventListener('obsSceneChanged', function(evt) {
+	var t = document.createTextNode(evt.detail.name);
+    document.body.appendChild(t);
+});
+```
+#### Other events that are available
+* obsStreamingStarting
+* obsStreamingStarted
+* obsStreamingStopping
+* obsStreamingStopped
+* obsRecordingStarting
+* obsRecordingStarted
+* obsRecordingStopping
+* obsRecordingStopped
+
+### Get the current scene
+```
+window.obsstudio.getCurrentScene(function(data) {console.log(data);});
 ```
 
 ## Building on OSX
@@ -41,7 +51,7 @@
 ### Building CEF
 #### Getting
 *  Download CEF Mac 64 from [https://cefbuilds.com/](https://cefbuilds.com/)
-  *  At the time of writing this I used build 2704
+  *  At the time of writing this I used build 2883
 *  Extract and cd into the folder
 
 #### Setting Up Project
@@ -70,7 +80,7 @@
 echo "add_subdirectory(obs-browser)" >> ./plugins/CMakeLists.txt
 mkdir build
 cd ./build
-cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake -D CEF_ROOT_DIR=/Users/username/Development/cef_binary_3.2704.1434.gec3e9ed_macosx64 -G Xcode ..
+cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake -D CEF_ROOT_DIR=/Users/username/Development/cef_binary_3.2883.1540.gedbfb20_macosx64 -D BUILD_BROWSER=yes -G Xcode ..
 open obs-studio.xcodeproj/
 ```

obs-studio-17.0.1.tar.xz/plugins/obs-browser/cef-isolation/browser-obs-bridge-mac.hpp Added

obs-studio-17.0.1.tar.xz/plugins/obs-browser/cef-isolation/browser-obs-bridge-mac.mm Added

obs-studio-0.17.0.tar.xz/plugins/obs-browser/cef-isolation/browser-render-handler.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/cef-isolation/browser-render-handler.hpp Changed

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

@@ -16,6 +16,7 @@
  ******************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 #include <include/cef_app.h>
 #include <include/cef_browser.h>
@@ -35,6 +36,8 @@
 
 #import "cef-isolated-client.h"
 
+#import "browser-obs-bridge-mac.hpp"
+
 @implementation CEFIsolatedClient
 
 - (id)init
@@ -73,6 +76,8 @@
 		new BrowserHandle(browserSettings.width,
 			browserSettings.height, _server));
 
+	BrowserOBSBridge *browserOBSBridge = new BrowserOBSBridgeMac(_server);
+
 	sync_on_cef_ui(^{
 
 		CefRefPtr<BrowserRenderHandler> browserRenderHandler =
@@ -82,7 +87,7 @@
 				new BrowserLoadHandler(std::string([browserSettings.css UTF8String]));
 
 		CefRefPtr<BrowserClient> browserClient =
-				new BrowserClient(browserRenderHandler.get(),loadHandler);
+				new BrowserClient(browserRenderHandler.get(),loadHandler, browserOBSBridge);
 
 		CefWindowInfo windowInfo;
 		windowInfo.view = nullptr;
@@ -286,13 +291,7 @@
 				return;
 			}
 
-			host->HandleKeyEventBeforeTextInputClient(nsEvent);
-
-			NSTextInputContext *inputContext =
-					host->GetNSTextInputContext();
-			[inputContext handleEvent:nsEvent];
-
-			host->HandleKeyEventAfterTextInputClient(nsEvent);
+			host->SendKeyEvent(keyEvent);
 		}
 	 }];
 }
@@ -335,7 +334,20 @@
      }];
 }
 
+-(void)dispatchJSEvent:(const char *)eventName data:(const char *)jsonString
+{
+	[self sendEventToAllBrowsers:^(SharedBrowserHandle browserHandle)
+	{
+		CefRefPtr<CefBrowser> browser = browserHandle->GetBrowser();
+
+		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("DispatchJSEvent");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetString(0, eventName);
+		args->SetString(1, jsonString);
 
+		browser->SendProcessMessage(PID_RENDERER, msg);
+	}];
+}
 
 - (void)destroyBrowser:(const int)browserIdentifier {
 	if (map.count(browserIdentifier) == 1) {

obs-studio-17.0.1.tar.xz/plugins/obs-browser/fmt Added

obs-studio-17.0.1.tar.xz/plugins/obs-browser/fmt/format.cc Added

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

obs-studio-17.0.1.tar.xz/plugins/obs-browser/fmt/format.h Added

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

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.h -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.h Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.mm -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/apple/browser-manager-mac.mm Changed

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

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

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service.mm -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/apple/cef-isolation-service.mm Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.cpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.cpp Changed

@@ -8,6 +8,7 @@
 #include "browser-client.hpp"
 #include "browser-render-handler.hpp"
 #include "browser-load-handler.hpp"
+#include "browser-obs-bridge-base.hpp"
 
 BrowserManager::BrowserManager()
 : pimpl(new BrowserManager::Impl())
@@ -90,6 +91,19 @@
 	pimpl->RefreshPageNoCache(browserIdentifier);
 }
 
+/**
+	Sends JSON Data about an OBS event to be executed as a DOM event.
+	The jsonString is already encoded so that we can pass it across the process boundary that cef-isolation creates.
+
+	@param eventName the name of the DOM event that we will fire
+	@param jsonString A json encoded string that will be accessable from the detail field of the event object
+	@return
+*/
+void BrowserManager::DispatchJSEvent(const char *eventName, const char *jsonString)
+{
+	pimpl->DispatchJSEvent(eventName, jsonString);
+}
+
 BrowserManager::Impl::Impl()
 {
 	os_event_init(&dispatchEvent, OS_EVENT_TYPE_AUTO);
@@ -110,6 +124,8 @@
 	os_event_t *createdEvent;
 	os_event_init(&createdEvent, OS_EVENT_TYPE_AUTO);
 
+	BrowserOBSBridge *browserOBSBridge = new BrowserOBSBridgeBase();
+
 	CefPostTask(TID_UI, BrowserTask::newTask(
 			[&] 
 	{
@@ -121,7 +137,7 @@
 				new BrowserLoadHandler(browserSettings.css));
 
 		CefRefPtr<BrowserClient> browserClient(
-				new BrowserClient(renderHandler,loadHandler)); 
+				new BrowserClient(renderHandler, loadHandler, browserOBSBridge));
 
 		CefWindowInfo windowInfo;
 		windowInfo.transparent_painting_enabled = true;
@@ -335,6 +351,18 @@
 	});
 }
 
+void BrowserManager::Impl::DispatchJSEvent(const char *eventName, const char *jsonString)
+{
+	ExecuteOnAllBrowsers([&](CefRefPtr<CefBrowser> b)
+	{
+		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("DispatchJSEvent");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetString(0, eventName);
+		args->SetString(1, jsonString);
+		b->SendProcessMessage(PID_RENDERER, msg);
+	});
+}
+
 void
 BrowserManager::Impl::Startup() 
 {

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/browser-manager-base.hpp Changed

obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/browser-obs-bridge-base.cpp Added

obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/browser-obs-bridge-base.hpp Added

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/main-source.cpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/main-source.cpp Changed

@@ -29,6 +29,7 @@
 	obs_data_set_default_int(settings, "height", 600);
 	obs_data_set_default_int(settings, "fps", 30);
 	obs_data_set_default_bool(settings, "shutdown", false);
+	obs_data_set_default_bool(settings, "restart_when_active", false);
 	obs_data_set_default_string(settings, "css", "body { background-color: rgba(0, 0, 0, 0); margin: 0px auto; overflow: hidden; }");
 }
 
@@ -106,7 +107,9 @@
 	obs_properties_add_text(props, "css",
 		obs_module_text("CSS"), OBS_TEXT_MULTILINE);
 	obs_properties_add_bool(props, "shutdown",
-		obs_module_text("Shutdown when not active"));
+		obs_module_text("Shutdown source when not visible"));
+	obs_properties_add_bool(props, "restart_when_active",
+		obs_module_text("Refresh browser when scene becomes active"));
 
 	obs_properties_add_button(props, "refreshnocache",
 		obs_module_text("Refresh cache of current page"), refreshnocache_button_clicked);
@@ -143,6 +146,21 @@
 	return obs_module_text("BrowserSource");
 }
 
+static void browser_source_activate(void *data)
+{
+	BrowserSource *bs = static_cast<BrowserSource *>(data);
+	obs_data_t *settings = obs_source_get_settings(bs->GetSource());
+	bool restart = obs_data_get_bool(settings, "restart_when_active");
+
+	if (restart)
+		BrowserManager::Instance()->RefreshPageNoCache(bs->GetBrowserIdentifier());
+}
+
+static void browser_source_deactivate(void *data)
+{
+
+}
+
 // Called when the source is visible
 static void browser_source_show(void *data)
 {
@@ -267,6 +285,9 @@
 	browser_source_info.video_render = browser_source_render;
 	browser_source_info.show = browser_source_show;
 	browser_source_info.hide = browser_source_hide;
+	browser_source_info.activate = browser_source_activate;
+	browser_source_info.deactivate = browser_source_deactivate;
+
 
 	return browser_source_info;
 }
\ No newline at end of file

obs-studio-0.17.0.tar.xz/plugins/obs-browser/obs-browser/main.cpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/obs-browser/main.cpp Changed

@@ -20,6 +20,7 @@
 
 #include "browser-version.h"
 #include "browser-manager.hpp"
+#include "util.hpp"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("obs-browser", "en-US")
@@ -30,14 +31,62 @@
 // Handle events from the frontend
 static void handle_obs_frontend_event(enum obs_frontend_event event, void *)
 {
-	if (event == OBS_FRONTEND_EVENT_SCENE_CHANGED) {
-
-		obs_source_t *source = obs_frontend_get_current_scene();
-
-		const char *name = obs_source_get_name(source);
-
-		BrowserManager::Instance()->ExecuteSceneChangeJSCallback(name);
-		obs_source_release(source);
+	switch(event)
+	{
+	case OBS_FRONTEND_EVENT_STREAMING_STARTING:
+		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStarting", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STARTED:
+		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStarted", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
+		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStopping", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
+		BrowserManager::Instance()->DispatchJSEvent("obsStreamingStopped", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STARTING:
+		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStarting", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STARTED:
+		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStarted", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STOPPING:
+		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStopping", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_RECORDING_STOPPED:
+		BrowserManager::Instance()->DispatchJSEvent("obsRecordingStopped", nullptr);
+		break;
+	case OBS_FRONTEND_EVENT_SCENE_CHANGED:
+		{
+			obs_source_t *source = obs_frontend_get_current_scene();
+
+			const char* jsonString = obsSourceToJSON(source);
+
+			BrowserManager::Instance()->DispatchJSEvent("obsSceneChanged", jsonString);
+
+			obs_source_release(source);
+			break;
+		}
+	case OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_TRANSITION_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_TRANSITION_STOPPED:
+		break;
+	case OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_PROFILE_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_PROFILE_LIST_CHANGED:
+		break;
+	case OBS_FRONTEND_EVENT_EXIT:
+		BrowserManager::Instance()->DispatchJSEvent("obsExit", nullptr);
+		break;
 	}
 }

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared-apple/cef-isolation.h -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared-apple/cef-isolation.h Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-app.cpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-app.cpp Changed

@@ -19,8 +19,9 @@
 
 #include <iostream>
 #include <string>
+#include <jansson.h>
 
-#include "cefsimple/simple_handler.h"
+#include "fmt/format.h"
 #include "include/cef_browser.h"
 #include "include/cef_command_line.h"
 #include "include/wrapper/cef_helpers.h"
@@ -64,11 +65,14 @@
 {
 	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
 
-	CefRefPtr<CefV8Value> obsStudioObj = CefV8Value::CreateObject(0);
+	CefRefPtr<CefV8Value> obsStudioObj = CefV8Value::CreateObject(0, 0);
 	globalObj->SetValue("obsstudio", obsStudioObj, V8_PROPERTY_ATTRIBUTE_NONE);
 
 	CefRefPtr<CefV8Value> pluginVersion = CefV8Value::CreateString(OBS_BROWSER_VERSION);
 	obsStudioObj->SetValue("pluginVersion", pluginVersion, V8_PROPERTY_ATTRIBUTE_NONE);
+
+	CefRefPtr<CefV8Value> func = CefV8Value::CreateFunction("getCurrentScene", this);
+  	obsStudioObj->SetValue("getCurrentScene", func, V8_PROPERTY_ATTRIBUTE_NONE);
 }
 
 void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
@@ -93,7 +97,8 @@
 
 bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
 		CefProcessId source_process,
-		CefRefPtr<CefProcessMessage> message) {
+		CefRefPtr<CefProcessMessage> message)
+{
 	DCHECK(source_process == PID_BROWSER);
 
 	CefRefPtr<CefListValue> args = message->GetArgumentList();
@@ -105,13 +110,101 @@
 		ExecuteJSFunction(browser, "onVisibilityChange", arguments);
 		return true;
 	}
-	else if (message->GetName() == "SceneChange") {
+	else if (message->GetName() == "DispatchJSEvent") {       
+		CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
+
+		context->Enter();
+
+		CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
+
+		// Build up a new json object to store the CustomEvent data in.
+		json_t *json = json_object();
+        
+		if (args->GetSize() > 1) {
+			json_error_t error;
+
+			json_object_set_new(json, "detail", json_loads(args->GetString(1).ToString().c_str(), 0, &error));
+		}
+
+		char *jsonString = json_dumps(json, 0);
+
+		std::string script = fmt::format(
+			"new CustomEvent('{}', {});", 
+			args->GetString(0).ToString(),
+			jsonString);
+
+		free(jsonString);
+
+		CefRefPtr<CefV8Value> returnValue;
+		CefRefPtr<CefV8Exception> exception;
+
+		// Create the CustomEvent object
+		// We have to use eval to invoke the new operator
+		context->Eval(script, browser->GetMainFrame()->GetURL(), 0, returnValue, exception);
+
 		CefV8ValueList arguments;
-		arguments.push_back(CefV8Value::CreateString(args->GetString(0)));
+		arguments.push_back(returnValue);
+
+		CefRefPtr<CefV8Value> dispatchEvent = globalObj->GetValue("dispatchEvent");
+		dispatchEvent->ExecuteFunction(NULL, arguments);
+
+		context->Exit();
+
+		return true;
+	}
+	else if (message->GetName() == "executeCallback") {
+        CefRefPtr<CefV8Context> context = browser->GetMainFrame()->GetV8Context();
+        
+        context->Enter();
+
+		int callbackID = message->GetArgumentList()->GetInt(0);
+		CefString jsonString = message->GetArgumentList()->GetString(1);
+
+		CefRefPtr<CefV8Value> callback = callbackMap[callbackID];
+		
+		CefV8ValueList args;
+		args.push_back(CefV8Value::CreateString(jsonString));
+
+		CefRefPtr<CefV8Value> retval;
+		CefRefPtr<CefV8Exception> exception;
+        callback->ExecuteFunction(NULL, args);
+        
+        context->Exit();
+
+		callbackMap.erase(callbackID);
+
+		
+		return true;
+	}
+
+	return false;
+}
+
+// CefV8Handler::Execute
+bool BrowserApp::Execute(const CefString& name,
+		CefRefPtr<CefV8Value> object,
+		const CefV8ValueList& arguments,
+		CefRefPtr<CefV8Value>& retval,
+		CefString& exception)
+{
+	if (name == "getCurrentScene") {
+
+		if (arguments.size() == 1 && arguments[0]->IsFunction()) {
+			callbackId++;
+			callbackMap[callbackId] = arguments[0];
+		}
+
+		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("getCurrentScene");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetInt(0, callbackId);
+
+		CefRefPtr<CefBrowser> browser = 
+                CefV8Context::GetCurrentContext()->GetBrowser();
+		browser->SendProcessMessage(PID_BROWSER, msg);
 
-		ExecuteJSFunction(browser , "onSceneChange", arguments);
 		return true;
 	}
 
+	// Function does not exist.
 	return false;
 }

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-app.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-app.hpp Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-client.cpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-client.cpp Changed

@@ -18,10 +18,11 @@
 #include <include/cef_render_handler.h>
 
 #include "browser-client.hpp"
+#include "browser-obs-bridge.hpp"
 
 BrowserClient::BrowserClient(CefRenderHandler *renderHandler,
-	CefLoadHandler *loadHandler)
-	: renderHandler(renderHandler), loadHandler(loadHandler)
+	CefLoadHandler *loadHandler, BrowserOBSBridge *browserOBSBridge)
+	: renderHandler(renderHandler), loadHandler(loadHandler), browserOBSBridge(browserOBSBridge)
 {
 }
 
@@ -81,4 +82,28 @@
 
 	// remove all context menu contributions
 	model->Clear();
-}
\ No newline at end of file
+}
+
+bool BrowserClient::OnProcessMessageReceived(
+	CefRefPtr<CefBrowser> browser,
+	CefProcessId source_process,
+	CefRefPtr<CefProcessMessage> message)
+{
+	const std::string& message_name = message->GetName();
+	if (message_name == "getCurrentScene") {
+
+		int callbackID = message->GetArgumentList()->GetInt(0);
+
+		const char* jsonString = browserOBSBridge->GetCurrentSceneJSONData();
+
+		CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("executeCallback");
+		CefRefPtr<CefListValue> args = msg->GetArgumentList();
+		args->SetInt(0, callbackID);
+		args->SetString(1, jsonString);
+
+		browser->SendProcessMessage(PID_RENDERER, msg);
+
+		return true;
+	}
+	return false;
+}

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-client.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-client.hpp Changed

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <include/cef_client.h>
+#include "browser-obs-bridge.hpp"
 
 class BrowserSource;
 class BrowserRenderHandler;
@@ -28,7 +29,8 @@
 {
 public:
 	BrowserClient(CefRenderHandler *renderHandler,
-		CefLoadHandler *loadHandler);
+		CefLoadHandler *loadHandler,
+		BrowserOBSBridge *browserOBSBridge);
 
 public: /* CefClient overrides */
 	virtual CefRefPtr<CefRenderHandler> GetRenderHandler() OVERRIDE;
@@ -36,6 +38,10 @@
 	virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler()
 			OVERRIDE;
 	virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE;
+	virtual bool OnProcessMessageReceived(
+			CefRefPtr<CefBrowser> browser,
+			CefProcessId source_process,
+			CefRefPtr<CefProcessMessage> message) OVERRIDE;
 
 public: /* CefLifeSpanHandler overrides */
 	virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
@@ -52,10 +58,12 @@
 			CefRefPtr<CefFrame> frame,
 			CefRefPtr<CefContextMenuParams> params,
 			CefRefPtr<CefMenuModel> model);
+
 private:
 	CefRefPtr<CefRenderHandler> renderHandler;
 	CefRefPtr<CefLoadHandler> loadHandler;
+	BrowserOBSBridge *browserOBSBridge;
 
 public:
 	IMPLEMENT_REFCOUNTING(BrowserClient);
-};
\ No newline at end of file
+};

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-listener.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-listener.hpp Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-manager.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-manager.hpp Changed

obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-obs-bridge.hpp Added

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-source.hpp -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-source.hpp Changed

obs-studio-0.17.0.tar.xz/plugins/obs-browser/shared/browser-version.h -> obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/browser-version.h Changed

obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/util.cpp Added

obs-studio-17.0.1.tar.xz/plugins/obs-browser/shared/util.hpp Added

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/ca-ES.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/ca-ES.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/ru-RU.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/ru-RU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/sv-SE.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/sv-SE.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-ffmpeg/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/color-correction-filter.c -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/color-correction-filter.c Changed

@@ -71,6 +71,10 @@
 };
 
 const static float root3 = 0.57735f;
+const static float red_weight = 0.299f;
+const static float green_weight = 0.587f;
+const static float blue_weight = 0.114f;
+
 
 /*
  * As the functions' namesake, this provides the internal name of your Filter,
@@ -130,15 +134,19 @@
 			SETTING_SATURATION) + 1.0f;
 
 	/* Factor in the selected color weights. */
-	float one_minus_sat = (1.0f - filter->saturation) / 3.0f;
-	float sat_val = one_minus_sat + filter->saturation;
+	float one_minus_sat_red = (1.0f - filter->saturation) * red_weight;
+	float one_minus_sat_green = (1.0f - filter->saturation) * green_weight;
+	float one_minus_sat_blue = (1.0f - filter->saturation) * blue_weight;
+	float sat_val_red   = one_minus_sat_red + filter->saturation;
+	float sat_val_green = one_minus_sat_green + filter->saturation;
+	float sat_val_blue  = one_minus_sat_blue + filter->saturation;
 
 	/* Now we build our Saturation matrix. */
 	filter->sat_matrix = (struct matrix4)
 	{
-		sat_val, one_minus_sat, one_minus_sat, 0.0f,
-		one_minus_sat, sat_val, one_minus_sat, 0.0f,
-		one_minus_sat, one_minus_sat, sat_val, 0.0f,
+		sat_val_red, one_minus_sat_red, one_minus_sat_red, 0.0f,
+		one_minus_sat_green, sat_val_green, one_minus_sat_green, 0.0f,
+		one_minus_sat_blue, one_minus_sat_blue, sat_val_blue, 0.0f,
 		0.0f, 0.0f, 0.0f, 1.0f
 	};

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/color_correction_filter.effect -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/color_correction_filter.effect Changed

@@ -35,10 +35,6 @@
 	float2 uv : TEXCOORD0;
 };
 
-struct CurrentPixel {
-	float4 current_pixel;
-};
-
 VertData VSDefault(VertData vert_in)
 {
 	VertData vert_out;
@@ -49,23 +45,20 @@
 
 float4 PSColorFilterRGBA(VertData vert_in) : TARGET
 {
-	/* Realize the struct. */
-	CurrentPixel pixel = (CurrentPixel) 0;
-
 	/* Grab the current pixel to perform operations on. */
-	pixel.current_pixel = image.Sample(textureSampler, vert_in.uv);
+	float4 currentPixel = image.Sample(textureSampler, vert_in.uv);
 
 	/* Always address the gamma first. */
-	pixel.current_pixel.rgb = pow(pixel.current_pixel.rgb, gamma);
+	currentPixel.rgb = pow(currentPixel.rgb, gamma);
 
 	/* Much easier to manipulate pixels for these types of operations
 	 * when in a matrix such as the below. See
 	 * http://www.graficaobscura.com/matrix/index.html and
 	 * https://docs.rainmeter.net/tips/colormatrix-guide/for more info.
 	 */
-	pixel.current_pixel = mul(color_matrix, pixel.current_pixel);
+	currentPixel = mul(color_matrix, currentPixel);
 
-	return pixel.current_pixel;
+	return currentPixel;
 }
 
 technique Draw

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/ca-ES.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/ca-ES.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/cs-CZ.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/cs-CZ.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/eu-ES.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/eu-ES.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/fi-FI.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/fi-FI.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/it-IT.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/it-IT.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/ru-RU.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/ru-RU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/sv-SE.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/sv-SE.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-filters/data/locale/uk-UA.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-filters/data/locale/uk-UA.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-libfdk/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-libfdk/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-outputs/net-if.h -> obs-studio-17.0.1.tar.xz/plugins/obs-outputs/net-if.h Changed

obs-studio-0.17.0.tar.xz/plugins/obs-qsv11/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-qsv11/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-qsv11/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-qsv11/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-text/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-text/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-transitions/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-transitions/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-x264/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-x264/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-x264/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/obs-x264/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/obs-x264/obs-x264.c -> obs-studio-17.0.1.tar.xz/plugins/obs-x264/obs-x264.c Changed

obs-studio-0.17.0.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-17.0.1.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-0.17.0.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-17.0.1.tar.xz/plugins/rtmp-services/data/services.json Changed

obs-studio-0.17.0.tar.xz/plugins/vlc-video/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/vlc-video/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/win-capture/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/win-capture/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-17.0.1.tar.xz/plugins/win-capture/game-capture.c Changed

@@ -136,8 +136,7 @@
 	ipc_pipe_server_t             pipe;
 	gs_texture_t                  *texture;
 	struct hook_info              *global_hook_info;
-	HANDLE                        keepalive_thread;
-	DWORD                         keepalive_thread_id;
+	HANDLE                        keepalive_mutex;
 	HANDLE                        hook_init;
 	HANDLE                        hook_restart;
 	HANDLE                        hook_stop;
@@ -281,12 +280,6 @@
 		gc->data = NULL;
 	}
 
-	if (gc->keepalive_thread) {
-		PostThreadMessage(gc->keepalive_thread_id, WM_QUIT, 0, 0);
-		WaitForSingleObject(gc->keepalive_thread, 300);
-		close_handle(&gc->keepalive_thread);
-	}
-
 	if (gc->app_sid) {
 		LocalFree(gc->app_sid);
 		gc->app_sid = NULL;
@@ -298,6 +291,7 @@
 	close_handle(&gc->hook_exit);
 	close_handle(&gc->hook_init);
 	close_handle(&gc->hook_data_map);
+	close_handle(&gc->keepalive_mutex);
 	close_handle(&gc->global_hook_info_map);
 	close_handle(&gc->target_process);
 	close_handle(&gc->texture_mutexes[0]);
@@ -641,78 +635,18 @@
 	return true;
 }
 
-struct keepalive_data {
-	struct game_capture *gc;
-	HANDLE initialized;
-};
-
-#define DEF_FLAGS (WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS)
-
-static DWORD WINAPI keepalive_window_thread(struct keepalive_data *data)
-{
-	HANDLE initialized = data->initialized;
-	struct game_capture *gc = data->gc;
-	wchar_t new_name[64];
-	WNDCLASSW wc;
-	HWND window;
-	MSG msg;
-
-	_snwprintf(new_name, sizeof(new_name), L"%s%lu",
-			WINDOW_HOOK_KEEPALIVE, gc->process_id);
-
-	memset(&wc, 0, sizeof(wc));
-	wc.style = CS_OWNDC;
-	wc.hInstance = GetModuleHandleW(NULL);
-	wc.lpfnWndProc = (WNDPROC)DefWindowProc;
-	wc.lpszClassName = new_name;
-
-	if (!RegisterClass(&wc)) {
-		warn("Failed to create keepalive window class: %lu",
-				GetLastError());
-		return 0;
-	}
-
-	window = CreateWindowExW(0, new_name, NULL, DEF_FLAGS, 0, 0, 1, 1,
-			NULL, NULL, wc.hInstance, NULL);
-	if (!window) {
-		warn("Failed to create keepalive window: %lu",
-				GetLastError());
-		return 0;
-	}
-
-	SetEvent(initialized);
-
-	while (GetMessage(&msg, NULL, 0, 0)) {
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-
-	DestroyWindow(window);
-	UnregisterClassW(new_name, wc.hInstance);
-
-	return 0;
-}
-
 static inline bool init_keepalive(struct game_capture *gc)
 {
-	struct keepalive_data data;
-	HANDLE initialized = CreateEvent(NULL, false, false, NULL);
-
-	data.gc = gc;
-	data.initialized = initialized;
+	wchar_t new_name[64];
+	_snwprintf(new_name, 64, L"%s%lu", WINDOW_HOOK_KEEPALIVE,
+			gc->process_id);
 
-	gc->keepalive_thread = CreateThread(NULL, 0,
-			(LPTHREAD_START_ROUTINE)keepalive_window_thread,
-			&data, 0, &gc->keepalive_thread_id);
-	if (!gc->keepalive_thread) {
-		warn("Failed to create keepalive window thread: %lu",
-				GetLastError());
+	gc->keepalive_mutex = CreateMutexW(NULL, false, new_name);
+	if (!gc->keepalive_mutex) {
+		warn("Failed to create keepalive mutex: %lu", GetLastError());
 		return false;
 	}
 
-	WaitForSingleObject(initialized, INFINITE);
-	CloseHandle(initialized);
-
 	return true;
 }
 
@@ -794,8 +728,10 @@
 	gc->global_hook_info->capture_overlay = gc->config.capture_overlays;
 	gc->global_hook_info->force_shmem = gc->config.force_shmem;
 	gc->global_hook_info->use_scale = gc->config.force_scaling;
-	gc->global_hook_info->cx = gc->config.scale_cx;
-	gc->global_hook_info->cy = gc->config.scale_cy;
+	if (gc->config.scale_cx)
+		gc->global_hook_info->cx = gc->config.scale_cx;
+	if (gc->config.scale_cy)
+		gc->global_hook_info->cy = gc->config.scale_cy;
 	reset_frame_interval(gc);
 
 	obs_enter_graphics();

obs-studio-0.17.0.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h -> obs-studio-17.0.1.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h Changed

obs-studio-0.17.0.tar.xz/plugins/win-capture/window-helpers.c -> obs-studio-17.0.1.tar.xz/plugins/win-capture/window-helpers.c Changed

obs-studio-0.17.0.tar.xz/plugins/win-dshow/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/win-dshow/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/win-dshow/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/win-dshow/data/locale/tr-TR.ini Changed

obs-studio-0.17.0.tar.xz/plugins/win-mf/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/win-mf/data/locale/hu-HU.ini Changed

obs-studio-0.17.0.tar.xz/plugins/win-mf/data/locale/tr-TR.ini -> obs-studio-17.0.1.tar.xz/plugins/win-mf/data/locale/tr-TR.ini Changed

@@ -3,15 +3,28 @@
 
 MF.H264.EncoderName="Medya Vakfı H264 Kodlayıcısı"
 MF.H264.Encoder="Kodlayıcı Adı"
+MF.H264.LowLatency="Düşük Gecikme Süresi (Çerçeve yeniden sıralamasını devre dışı bırak)"
+MF.H264.BFrames="Ardışık B-Frame sayısı"
 MF.H264.CustomBufsize="İsteğe Bağlı Arabellek Boyutu Kullan"
 MF.H264.BufferSize="Arabellek Boyutu"
+MF.H264.CustomMaxBitrate="Özel En Yüksek Bit Hızı Kullan"
 MF.H264.Bitrate="Bithızı"
-MF.H264.MaxBitrate="Maks Bit hızı"
+MF.H264.MaxBitrate="En Yüksek Bit Hızı"
 MF.H264.KeyframeIntervalSec="Anahtarkare Aralığı (saniye, 0=otomatik)"
+MF.H264.RateControl="Oran Kontrolü"
+MF.H264.CBR="CBR (Sabit bit hızı)"
 MF.H264.VBR="VBR (Değişken Bit Hızı)"
+MF.H264.CQP="CQP (Sabit Kalite)"
 MF.H264.MinQP="Minimum QP"
 MF.H264.MaxQP="Maksimum QP"
+MF.H264.QPI="QP I-Frame"
+MF.H264.QPP="QP P-Frame"
+MF.H264.QPB="QP B-Frame"
 MF.H264.Profile="Profil"
 MF.H264.Advanced="Gelişmiş"
 
+MF.H264.EncoderSWMicrosoft="Microsoft Software H.264 Kodlayıcısı"
+MF.H264.EncoderHWAMD="AMD Video Coding Engine H.264 Kodlayıcısı (Media Foundation)"
+MF.H264.EncoderHWIntel="Intel Quick Sync H.264 Kodlayıcısı (Media Foundation)"
+MF.H264.EncoderHWNVIDIA="NVIDIA NVENC H.264 Kodlayıcısı (Media Foundation)"

obs-studio-0.17.0.tar.xz/plugins/win-wasapi/data/locale/hu-HU.ini -> obs-studio-17.0.1.tar.xz/plugins/win-wasapi/data/locale/hu-HU.ini Changed