ui/libvpx_vp9_handler: Add UI handler for libvpx-vp9

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-issuehunt: xaymar
-patreon: xaymar
-custom: https://www.paypal.me/xaymar

.github/ISSUE_TEMPLATE/feature.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Want a new feature implemented?
-
----
-
-<!--- Please fill out the following template, which will help other contributors review your Issue. -->
-<!--- Make sure you’ve read the contribution guidelines -->
-
-### Description
-<!-- Describe the feature (and behavior) in as much detail as possible (yes, that means write an essay if you have to) -->
-<!-- Include images of what you expect from the feature -->
-
-### Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have read the contribution guidelines.
-- [ ] This feature is necessary and can't be done through other means.
-- [ ] This feature does not break existing functionality.
-- [ ] I am willing to hire/pay someone to implement this.

.github/ISSUE_TEMPLATE/feedback.md

@@ -1,27 +0,0 @@
----
-name: Question/Feedback
-about: Submit a question or some feedback! (Not for bugs, issues or crashes!)
-
----
-
-<!--- Please fill out the following template, which will help other contributors review your Issue. -->
-<!--- Make sure you’ve read the contribution guidelines -->
-
-### Description
-<!-- Describe the feature (and behavior) in as much detail as possible (yes, that means write an essay if you have to) -->
-<!-- Include images of what you expect from the feature -->
-
-### System Information
-<!-- Include as much information about the system you're using as possible. -->
-- Software Version: [e. g. 1.0.0, 1.2.1, ... - NEVER LATEST]
-- Operating System: [e. g. Windows, Debian, Ubuntu, RedHat, FreeBSD, ...]
-- Kernel Version: [e. g. 1903/1809 (Windows), 4.12 (Linux), ...]
-- CPU: [e. g. Intel i7, AMD Zen2, Qualcomm, ...]
-- GPU: [e. g. Nvidia RTX 2xxx Series, AMD Radeone 5xxx Series, ...]
-- RAM: [e. g. 16GB, 32GB, 64GB, ...]
-
-### Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have read the contribution guidelines.
-- [ ] This is not a bug, crash or generic issue.

.github/ISSUE_TEMPLATE/issue.md

@@ -1,38 +0,0 @@
----
-name: Issue/Bug report
-about: Encountered a problem, a bug or a crash?
-
----
-
-<!--- Please fill out the following template, which will help other contributors review your Issue. -->
-<!--- Make sure you’ve read the contribution guidelines -->
-
-### Description
-<!-- Describe the bug (and behavior) in as much detail as necessary -->
-<!-- Include screenshots and attach (crash) logs if possible -->
-
-### Expected Behavior
-<!-- What is the expected behavior in this case? -->
-
-### Reproduction Steps
-<!-- Describe the steps required to get this to happen from a cleanly installed obs-studio -->
-<!-- Leave out detail that is not relevant to  -->
-1. Open a portal to the Infinite Void
-2. Summon an ancient God
-3. Realize your mistake
-
-### System Information
-<!-- Include as much information about the system you're using as possible. -->
-- Software Version: [e. g. 1.0.0, 1.2.1, ... - NEVER LATEST]
-- Operating System: [e. g. Windows, Debian, Ubuntu, RedHat, FreeBSD, ...]
-- Kernel Version: [e. g. 1903/1809 (Windows), 4.12 (Linux), ...]
-- CPU: [e. g. Intel i7, AMD Zen2, Qualcomm, ...]
-- GPU: [e. g. Nvidia RTX 2xxx Series, AMD Radeone 5xxx Series, ...]
-- RAM: [e. g. 16GB, 32GB, 64GB, ...]
-
-### Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have read the contribution guidelines.
-- [ ] I can reproduce the issue with the exact reproduction steps I have provided.
-- [ ] The issue appears on all of my systems that can run this software.

.github/pull_request_template.md

@@ -1,35 +0,0 @@
-<!--- Please fill out the following template, which will help other contributors review your Pull Request. -->
-
-<!--- Make sure you’ve read the contribution guidelines -->
-
-### Description
-<!--- Describe your changes in detail. -->
-<!--- If this change includes UI elements, please include screenshots. -->
-
-### Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open Mantis issue, or implements feature request -->
-<!--- from the Ideas page, please link to the issue here. -->
-
-### How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment (hardware, OS version, etc.),-->
-<!--- and the tests you ran, including how it may affect other areas of code. -->
-
-### Types of changes
-<!--- What types of changes does your PR introduce? Uncomment all that apply -->
-<!--- - Bug fix (non-breaking change which fixes an issue) -->
-<!--- - New feature (non-breaking change which adds functionality) -->
-<!--- - Performance enhancement (non-breaking change which improves efficiency) -->
-<!--- - Code cleanup (non-breaking change which makes code smaller or more readable) -->
-<!--- - Breaking change (fix or feature that would cause existing functionality to change) -->
-<!--- - Documentation (a change to documentation pages) -->
-
-### Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code has been run through [clang-format](https://github.com/obsproject/obs-studio/blob/master/.clang-format).
-- [ ] I have read the [**contributing** document](https://github.com/obsproject/obs-studio/blob/master/CONTRIBUTING.rst).
-- [ ] My code is not on the master branch.
-- [ ] The code has been tested.
-- [ ] All commit messages are properly formatted and commits squashed where appropriate.

CMakeLists.txt

@@ -1,23 +1,19 @@
-# FFMPEG Video Encoder Integration for OBS Studio
+# Integrates most FFmpeg supported encoders into OBS Studio
-# Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+# Copyright (C) 2018 - 2019 Michael Fabian Dirks
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# This program is free software; you can redistribute it and/or modify
-# of this software and associated documentation files (the "Software"), to deal
+# it under the terms of the GNU General Public License as published by
-# in the Software without restriction, including without limitation the rights
+# the Free Software Foundation; either version 2 of the License, or
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# (at your option) any later version.
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in all
+# This program is distributed in the hope that it will be useful,
-# copies or substantial portions of the Software.
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# You should have received a copy of the GNU General Public License
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# along with this program; if not, write to the Free Software
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
 
 # CMake Setup
 CMake_Minimum_Required(VERSION 3.8.0)
@@ -25,7 +21,7 @@ Include("cmake/util.cmake")
 
 # Automatic Versioning
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 2)
+set(VERSION_MINOR 1)
 set(VERSION_PATCH 0)
 set(VERSION_TWEAK 0)
 set(PROJECT_COMMIT "N/A")
@@ -261,17 +257,17 @@ set(PROJECT_GENERATED
 	"${PROJECT_BINARY_DIR}/source/version.hpp"
 )
 set(PROJECT_PRIVATE
-	"${PROJECT_SOURCE_DIR}/source/encoder.hpp"
 	"${PROJECT_SOURCE_DIR}/source/encoder.cpp"
+	"${PROJECT_SOURCE_DIR}/source/encoder.hpp"
 	"${PROJECT_SOURCE_DIR}/source/plugin.cpp"
 	"${PROJECT_SOURCE_DIR}/source/plugin.hpp"
 	"${PROJECT_SOURCE_DIR}/source/utility.cpp"
 	"${PROJECT_SOURCE_DIR}/source/utility.hpp"
 	"${PROJECT_SOURCE_DIR}/source/strings.hpp"
-	"${PROJECT_SOURCE_DIR}/source/codecs/hevc.hpp"
+	"${PROJECT_SOURCE_DIR}/source/encoders/generic.hpp"
-	"${PROJECT_SOURCE_DIR}/source/codecs/hevc.cpp"
+	"${PROJECT_SOURCE_DIR}/source/encoders/generic.cpp"
-	"${PROJECT_SOURCE_DIR}/source/codecs/h264.hpp"
+	"${PROJECT_SOURCE_DIR}/source/encoders/prores_aw.hpp"
-	"${PROJECT_SOURCE_DIR}/source/codecs/h264.cpp"
+	"${PROJECT_SOURCE_DIR}/source/encoders/prores_aw.cpp"
 	"${PROJECT_SOURCE_DIR}/source/ffmpeg/avframe-queue.cpp"
 	"${PROJECT_SOURCE_DIR}/source/ffmpeg/avframe-queue.hpp"
 	"${PROJECT_SOURCE_DIR}/source/ffmpeg/swscale.hpp"
@@ -284,12 +280,8 @@ set(PROJECT_PRIVATE
 	"${PROJECT_SOURCE_DIR}/source/ui/debug_handler.cpp"
 	"${PROJECT_SOURCE_DIR}/source/ui/prores_aw_handler.hpp"
 	"${PROJECT_SOURCE_DIR}/source/ui/prores_aw_handler.cpp"
-	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_shared.hpp"
+	"${PROJECT_SOURCE_DIR}/source/ui/libvpx_vp9_handler.hpp"
-	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_shared.cpp"
+	"${PROJECT_SOURCE_DIR}/source/ui/libvpx_vp9_handler.cpp"
-	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_h264_handler.hpp"
-	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_h264_handler.cpp"
-	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_hevc_handler.hpp"
-	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_hevc_handler.cpp"
 )
 
 # Source Grouping

CONTRIBUTING.md

@@ -1,192 +0,0 @@
-# Build Instructions
-The project is compatible with being included directly in an obs-studio build, but can be built standalone. Depending on which you chose, the instructions differ greatly.
-
-## Building with OBS Studio
-1. Prepare OBS Studio for building on your platform.
-2. Navigate to <obs-studio-clone>/plugins in a git-enabled shell.
-3. Run `git submodule add https://github.com/Xaymar/obs-ffmpeg-encoder.git obs-ffmpeg-encoder` and wait for it to complete.
-4. Edit the CMakeLists.txt in the same directory and append `add_subdirectory(obs-ffmpeg-encoder)`.
-5. Use CMake to reconfigure OBS Studio, at which point it should detect the new plugin and allow you to build it.
-6. Done.
-
-## Building Standalone
-This mode of building is used by CI providers and offers the fastest compile time, but does not allow quick testing as it requires a working OBS Studio installation to test.
-
-1. Install CMake (3.1 or newer) and if you aren't using Windows, build the PACKAGE target in OBS Studio, which will generate a CPack archive in the build folder.
-2. Clone the obs-ffmpeg-encoder repository using git or a comparable tool.
-3. Configure obs-ffmpeg-encoder using CMake to build a subdirectory or any other location that is not the same as the source directory, and adjust the following options to suit your needs:
-    - OBS_STUDIO_DIR: Path to a normal or CPack OBS Studio build.
-	- OBS_DOWNLOAD_VERSION: The version to attempt to automatically download and use if no OBS Studio is detected (may not work on all platforms).
-	- CMAKE_INSTALL_PREFIX: Path that the INSTALL target copies files to.
-	- CMAKE_PACKAGE_PREFIX: Path for the archives generated by PACKAGE_ZIP and PACKAGE_7Z.
-	- CMAKE_PACKAGE_NAME: Name for the archives generated by PACKAGE_ZIP and PACKAGE_7Z.
-	- CMAKE_PACKAGE_SUFFIX_OVERRIDE: 
-4. Build obs-ffmpeg-encoder.
-
-### Installing into a local OBS Studio Installation
-Modify CMAKE_INSTALL_PREFIX to point at your OBS Studio installation directory (not the data directory) and build the INSTALL target.
-
-### Packaging Release Archives
-Generate release archives by building either PACKAGE_ZIP or PACKAGE_7Z. To generate a full release archive, CMAKE_INSTALL_PREFIX has to be set to a directory that only contains release files for this plugin. See the CI scripts for an example on this.
-
-# Commits
-Commits should always only focus on a single change that is necessary for that commit to work. For example, a commit that changes how something logs messages should not also include a new blur effect. In those cases, the commit should be split up into two, so that they can be reverted independently from another.
-
-## Commit Subject
-The subject line of a commit should begin with the prefix followed by a `: `, and then followed by a summary of what the change does, which should be no longer than 52 alphanumerical characters including whitespace. The prefix is determined by the file being modified, simply remove the extension or find the group that a file belongs to. For example, a modifiation to blur.effect would have the category effects, due to it being re-usable.
-
-### Prefixes
-- effects: Anything modifying generic effects like blur.effect, color-conversion.effect, mask.effect, etc.
-- locale: Changes in `/data/locale`.
-- shaders: Changes in `/data/shaders` that are not directly influenced by a change to custom shaders.
-- project: Changes to files like README, CONTRIBUTING, AUTHORS, etc.
-- cmake: Changes to CMake build scripts.
-- ci: Changes to Continuous Integration.
-
-All other files should be prefixed with the main file changed, so a change to the translations for Source Mirror would be `source-mirror: commit`.
-
-## Commit Messages
-The commit message should always convey why this change was necessary, what is being changed and how it affects the code when being run. There are rare cases where this can be left out (formatting, refactoring, ...) but it should always be descriptive of what is actually being done.
-
-# Coding Guidelines
-
-## Naming
-The project uses the generally known snake_case for code and the uppercase variant for enumerations and macros:
-
-### Macros (ELEPHANT_CASE)
-- Casing: Uppercase
-- Separator: `_`
-- Prefixes: `S_` for global values, `ST_` for local (this file) values, `D_` for simple functions, `P_` for complex functions
-- Suffixes: No
-
-Example:
-```
-#define S_PI 3.14141
-#define ST_PI2 S_PI / 2.0
-#define D_(x) S_PI * x
-#define P_(x, y) double_t x(double_t a, double_t b) { return a * b * y; }
-```
-
-### Enumerations (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-
-Example:
-```
-enum my_enum {};
-enum class my_enum_class {};
-enum class my_enum_class_int : int {};
-```
-
-#### Enumeration Entries (ELEPHANT_CASE)
-- Casing: Uppercase
-- Separator: `_`
-
-Example:
-```
-enum my_enum {
-	ENTRY_1,
-	ENTRY_2
-};
-```
-
-### Variables (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-- Prefixes: No
-- Suffixes: No
-
-Example:
-```
-int my_var = 0;
-```
-
-### Functions (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-- Prefixes: No
-- Suffixes: No (differentiate by parameters only)
-
-Example:
-```
-// This is forbidden.
-void func();
-int func_int();
-
-// This is okay.
-void func();
-void func(int& result);
-```
-
-### Namespaces (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-
-Example:
-```
-namespace a_space {};
-```
-
-### Classes, Structs, Unions (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-- Prefixes: No
-- Suffixes: No
-
-Example:
-```
-class a_class {};
-class interface_class {};
-```
-
-#### Interface Classes
-Interface Classes are handled like normal classes. There are no prefixes or suffixes to attach.
-
-#### Methods (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-- Prefixes: No
-- Suffixes: No (differentiate by parameters only)
-
-Example:
-```
-class a_class {	
-	// This is forbidden.
-	void func();
-	int func_int();
-	
-	// This is okay.
-	void func();
-	void func(int& result);
-};
-```
-
-#### Member Variables (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-- Prefixes: `_` if private, otherwise none
-- Suffixes: No
-
-Example:
-```
-class a_class {
-	int64_t _local_var;
-	void* _pointer;
-	int32_t _id;
-};
-```
-
-### Type Definitions (snake_case)
-- Casing: Lowercase
-- Separator: `_`
-- Prefixes: No
-- Suffixes: `_t`
-
-Example:
-```
-typedef int32_t my_type_t;
-```
-
-## Preprocessor Macros
-Preprocessor `#define` Macros should be used sparingly, due to their nature of changing code before the compiler gets a chance to work with it. Unless necessary, they should never be in a header file.
-

LICENSE

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

appveyor.yml

@@ -29,7 +29,7 @@ install:
 - cmd: ci/appveyor-install.bat
 
 build_script:
-- cmd: node ci/builder.js
+- cmd: node ci/appveyor-build.js
 
 after_build:
 - cmd: ci/appveyor-package.bat

ci/appveyor-build.js

@@ -0,0 +1,98 @@
+const cp = require('child_process');
+
+var config32 = cp.spawn(
+	"cmake", [
+		'-H.',
+		'-B"build/32"',
+		'-G"Visual Studio 15 2017"',
+		'-DCMAKE_INSTALL_PREFIX="build/distrib"',
+		'-DCMAKE_PACKAGE_PREFIX="build"',
+		'-DCMAKE_PACKAGE_NAME="xmr-ffmpeg-encoders"'
+	], {
+		windowsVerbatimArguments: true,
+		windowsHide: true
+	}
+);
+config32.stdout.on('data', (data) => {
+	process.stdout.write(`[32:Out] ${data}`);
+});
+config32.stderr.on('data', (data) => {
+	console.log(`[32:Err] ${data}`);
+});
+config32.on('exit', (code, signal) => {
+	if (code != 0) {
+		process.exit(code)
+	}
+	var build32 = cp.spawn(
+		"cmake", [
+			'--build build/32',
+			'--target INSTALL',
+			'--config RelWithDebInfo',
+			'--',
+			'/logger:"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll"'
+		], {
+			windowsVerbatimArguments: true,
+			windowsHide: true
+		}
+	);
+	build32.stdout.on('data', (data) => {
+		process.stdout.write(`[32:Out] ${data}`);
+	});
+	build32.stderr.on('data', (data) => {
+		process.stderr.write(`[32:Err] ${data}`);
+	});
+	build32.on('exit', (code, signal) => {
+		if (code != 0) {
+			process.exit(code)
+		}
+	});
+});
+
+var config64 = cp.spawn(
+	"cmake", [
+		'-H.',
+		'-B"build/64"',
+		'-G"Visual Studio 15 2017 Win64"',
+		'-DCMAKE_INSTALL_PREFIX="build/distrib"',
+		'-DCMAKE_PACKAGE_PREFIX="build"',
+		'-DCMAKE_PACKAGE_NAME="xmr-ffmpeg-encoders"'
+	], {
+		windowsVerbatimArguments: true,
+		windowsHide: true
+	}
+);
+config64.stdout.on('data', (data) => {
+	process.stdout.write(`[64:Out] ${data}`);
+});
+config64.stderr.on('data', (data) => {
+	console.log(`[64:Err] ${data}`);
+});
+config64.on('exit', (code, signal) => {
+	if (code != 0) {
+		process.exit(code)
+	}
+	var build64 = cp.spawn(
+		"cmake", [
+			'--build build/64',
+			'--target INSTALL',
+			'--config RelWithDebInfo',
+			'--',
+			'/logger:"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll"'
+		], {
+			windowsVerbatimArguments: true,
+			windowsHide: true
+		}
+	);
+	build64.stdout.on('data', (data) => {
+		process.stdout.write(`[32:Out] ${data}`);
+	});
+	build64.stderr.on('data', (data) => {
+		process.stderr.write(`[32:Err] ${data}`);
+	});
+	build64.on('exit', (code, signal) => {
+		if (code != 0) {
+			process.exit(code)
+		}
+	});
+});
+

ci/appveyor-package.bat

@@ -1,3 +1,7 @@
 @ECHO OFF
+ECHO -- Building 7z Archive --
+cmake --build build/64 --target PACKAGE_7Z --config RelWithDebInfo
+ECHO -- Building Zip Archive --
+cmake --build build/64 --target PACKAGE_ZIP --config RelWithDebInfo
 ECHO -- Building Installer --
 "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /Qp ".\build\64\installer.iss" > nul

ci/builder.js

@@ -1,109 +0,0 @@
-"use strict";
-
-const process = require('process');
-const runner = require('./runner.js');
-
-// Steps
-let configure_runners = [];
-let build_runners = [];
-let package_runners = [];
-
-{
-	let cmake_configure_extra = [
-		`-DCMAKE_SYSTEM_VERSION=${process.env.CMAKE_SYSTEM_VERSION}`,
-		'-DCMAKE_INSTALL_PREFIX="build/distrib/"',
-		'-DCMAKE_PACKAGE_PREFIX="build/"',
-		`-DCMAKE_PACKAGE_NAME="${process.env.PACKAGE_PREFIX}"`,
-	];
-	let cmake_build_extra = [
-	];
-
-	// Configuration depends on platform
-	if (process.platform == "win32" || process.platform == "win64") {
-		configure_runners.push(new runner('32-bit', 'cmake', [
-				'-H.',
-				'-Bbuild/32',
-				`-G"Visual Studio 15 2017"`,
-			].concat(cmake_configure_extra)));
-		configure_runners.push(new runner('64-bit', 'cmake', [
-				'-H.',
-				'-Bbuild/64',
-				`-G"Visual Studio 15 2017 Win64"`,
-				'-T"host=x64"',
-			].concat(cmake_configure_extra)));
-		
-		// Extra build steps for AppVeyor on Windows for Logging purposes.
-		if(process.env.APPVEYOR) {
-			cmake_build_extra.concat(['--', '/logger:"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll"']);
-		}
-	} else if (process.platform == "linux") {
-		configure_runners.push(new runner('32-bit', 'cmake', [
-				'-H.',
-				'-Bbuild32',
-				`-G"Unix Makefiles"`,
-				`-DCOPIED_DEPENDENCIES=false`,
-			].concat(cmake_configure_extra),
-			{ ...process.env, ...{
-				CFLAGS: `${process.env.COMPILER_FLAGS_32}`,
-				CXXFLAGS: `${process.env.COMPILER_FLAGS_32}`,
-			}}));
-		configure_runners.push(new runner('64-bit', 'cmake', [
-				'-H.',
-				'-Bbuild64',
-				`-G"Unix Makefiles"`,
-				`-DCOPIED_DEPENDENCIES=false`,
-			].concat(cmake_configure_extra),
-			{ ...process.env, ...{
-				CFLAGS: `${process.env.COMPILER_FLAGS_64}`,
-				CXXFLAGS: `${process.env.COMPILER_FLAGS_64}`,
-			}}));
-	}
-	
-	build_runners.push(new runner('32-bit', 'cmake', [
-		'--build', 'build/32', 
-		'--config', 'RelWithDebInfo',
-		'--target', 'INSTALL'
-	].concat(cmake_build_extra)));
-	build_runners.push(new runner('64-bit', 'cmake', [
-		'--build', 'build/64', 
-		'--config', 'RelWithDebInfo',
-		'--target', 'INSTALL'
-	].concat(cmake_build_extra)));
-	package_runners.push(new runner('32-bit', 'cmake', [
-		'--build', 'build/32',
-		'--target', 'PACKAGE_7Z',
-		'--config', 'RelWithDebInfo'
-	].concat(cmake_build_extra)));
-	package_runners.push(new runner('64-bit', 'cmake', [
-		'--build', 'build/64',
-		'--target', 'PACKAGE_ZIP',
-		'--config', 'RelWithDebInfo'
-	].concat(cmake_build_extra)));
-}
-
-// Run Configure steps.
-let configure_promises = [];
-for (let config of configure_runners) {
-	configure_promises.push(config.run());
-}
-Promise.all(configure_promises).then(function(result) {    
-	let build_promises = [];
-	for (let build of build_runners) {
-		build_promises.push(build.run());
-	}
-	Promise.all(build_promises).then(function(result) {    
-		let package_promises = [];
-		for (let pack of package_runners) {
-			package_promises.push(pack.run());
-		}
-		Promise.all(package_promises).then(function(result) {    
-			process.exit(result);
-		}).catch(function(result) {
-			process.exit(result);
-		});
-	}).catch(function(result) {
-		process.exit(result);
-	});
-}).catch(function(result) {
-	process.exit(result);
-});

ci/runner.js

@@ -1,51 +0,0 @@
-"use strict";
-
-const process = require('process');
-const cp = require('child_process');
-
-class Runner {
-    constructor(name, cmd, args, env) {
-        this.name = name;
-        this.cmd = cmd;
-		if (args == undefined)
-			args = [];
-        this.args = args;
-		if (env == undefined)
-			env = process.env;
-		this.env = env;
-    }
-    
-	run() {
-        let self = this;
-        return new Promise(function(resolve, reject) {
-			console.log(self.cmd, self.args);
-            self.proc = cp.spawn(
-                self.cmd, self.args, {
-                    windowsVerbatimArguments: true,
-                    windowsHide: true,
-					env: self.env,
-                }
-            );
-            self.proc.stdout.on('data', (data) => {
-                process.stdout.write(`[${self.name}:Out] ${data}`);
-            });
-            self.proc.stderr.on('data', (data) => {
-                process.stderr.write(`[${self.name}:Err] ${data}`);
-            });
-            self.proc.on('exit', (code, signal) => {
-                if (code != 0) {
-                    reject(code);
-                    return;
-                }
-                resolve(code);
-                return;
-            });
-        });
-	}
-	
-    execute() {
-		return this.run();
-    }
-}
-
-module.exports = Runner;

data/locale/en-US.ini

@@ -1,9 +1,11 @@
+# ProRes
+ProRes.Profile.Proxy="Proxy (PXY)"
+ProRes.Profile.Light="Light (LT)"
+ProRes.Profile.Standard="Standard"
+ProRes.Profile.HighQuality="High Quality (HQ)"
+
 # Generic
-State.Automatic="Automatic"
+Automatic="Automatic"
-State.Default="Default"
-State.Disabled="Disabled"
-State.Enabled="Enabled"
-State.Manual="Manual"
 
 # FFmpeg
 FFmpeg="FFmpeg Options"
@@ -21,33 +23,6 @@ FFmpeg.StandardCompliance.Normal="Normal"
 FFmpeg.StandardCompliance.Unofficial="Unofficial"
 FFmpeg.StandardCompliance.Experimental="Experimental"
 
-# Rate Control
-RateControl="Rate Control"
-RateControl.Mode="Method"
-RateControl.Mode.ConstantBitrate="Constant Bitrate"
-RateControl.Mode.AverageBitrate="Average Bitrate"
-RateControl.Mode.VariableBitrate="Variable Bitrate"
-RateControl.Mode.ConstantQuantizationParameter="Constant Quantization Parameter"
-RateControl.Mode.ConstantRateFactor="Constant Rate Factor"
-RateControl.Mode.ConstantQuality="Constant Quality"
-RateControl.Mode.VariableQuality="Variable Quality"
-RateControl.Mode.Lossless="Lossless"
-RateControl.Bitrate.Target="Target Bitrate"
-RateControl.Bitrate.Minimum="Minimum Bitrate"
-RateControl.Bitrate.Maximum="Maximum Bitrate"
-RateControl.Quality.Target="Target Quality"
-RateControl.Quality.Minimum="Minimum Quality"
-RateControl.Quality.Maximum="Maximum Quality"
-RateControl.BufferSize="Buffer Size"
-RateControl.BufferSize.Description="The size of the buffer to use when determining the remaining available bitrate.\nIdeally should be equal to your bitrate times the key frame interval in seconds."
-
-# Key Frames
-KeyFrames="Key Frames"
-KeyFrames.IntervalType="Interval Type"
-KeyFrames.IntervalType.Frames="Frames"
-KeyFrames.IntervalType.Seconds="Seconds"
-KeyFrames.Interval="Interval"
-
 # Apple ProRes
 AppleProRes.Profile="Profile"
 AppleProRes.Profile.APCO="Proxy"
@@ -56,101 +31,32 @@ AppleProRes.Profile.APCN="Standard Definition"
 AppleProRes.Profile.APCH="High Quality"
 AppleProRes.Profile.AP4H="4444"
 
-# ProRes
+# VP9
-ProRes.Profile.Proxy="Proxy (PXY)"
+VP9.RateControl="Rate Control"
-ProRes.Profile.Light="Light (LT)"
+VP9.RateControl.Mode="Mode"
-ProRes.Profile.Standard="Standard"
+VP9.RateControl.Mode.ConstantBitrate="Constant Bitrate (CBR)"
-ProRes.Profile.HighQuality="High Quality (HQ)"
+VP9.RateControl.Mode.AverageBitrate="Average Bitrate (ABR)"
+VP9.RateControl.Mode.VariableBitrate="Variable Bitrate (VBR)"
+VP9.RateControl.Mode.ConstantQuality="Constant Quality (CQ)"
+VP9.RateControl.Mode.VariableQuality="Variable Quality (VQ)"
+VP9.RateControl.Mode.Lossless="Lossless (LL)"
+VP9.RateControl.Bitrate.Target="Target Bitrate (kbit/s)"
+VP9.RateControl.Bitrate.Minimum="Minimum Bitrate (kbit/s)"
+VP9.RateControl.Bitrate.Maximum="Maximum Bitrate (kbit/s)"
+VP9.RateControl.BufferSize="Buffer Size (kbit/s)"
+VP9.RateControl.Quality="Target Quality"
+VP9.RateControl.Quality.Description="This is the quality to reach, with lower values being higher quality, and higher values being more compressed but lower quality.\nOnly affects Constant Quality and Variable Quality (Constrained Quality) modes."
+VP9.KeyFrames="Key Frames"
+VP9.KeyFrames.IntervalType="Interval Type"
+VP9.KeyFrames.IntervalType.Frames="Frames"
+VP9.KeyFrames.IntervalType.Seconds="Seconds"
+VP9.KeyFrames.Interval="Interval"
+VP9.Performance="Performance Settings"
+VP9.Performance.QualitySpeedRatio="Quality/Speed Ratio"
+VP9.Performance.QualitySpeedRatio.Description="Ratio of Quality to Speed. Values towards -16 favor quality, while values towards +16 favor speed."
+VP9.Performance.Deadline="Deadline Multiplier (%)"
+VP9.Performance.Deadline.Description="The deadline parameter is used to determine how many tests for quality should be done.\nFor real time capture a multiplier of 100.0 or below should be used, unless the CPU is powerful enough for more."
+VP9.Performance.Tiling="Tiling"
+VP9.Performance.Tiling.Columns="Columns"
+VP9.Performance.Tiling.Rows="Rows"
 
-# Codec: H264
-Codec.H264="H264"
-Codec.H264.Profile="Profile"
-Codec.H264.Profile.baseline="Baseline"
-Codec.H264.Profile.main="Main"
-Codec.H264.Profile.high="High"
-Codec.H264.Profile.high444p="High 4:4:4 Predictive"
-Codec.H264.Level="Level"
-
-# Codec: HEVC
-Codec.HEVC="HEVC"
-Codec.HEVC.Profile="Profile"
-Codec.HEVC.Profile.main="Main"
-Codec.HEVC.Profile.main10="Main 10-bit"
-Codec.HEVC.Profile.rext="Range Extended"
-Codec.HEVC.Tier="Tier"
-Codec.HEVC.Tier.main="Main"
-Codec.HEVC.Tier.high="High"
-Codec.HEVC.Level="Level"
-
-# NVENC
-NVENC.Preset="Preset"
-NVENC.Preset.Default="Default"
-NVENC.Preset.Slow="Slow"
-NVENC.Preset.Medium="Medium"
-NVENC.Preset.Fast="Fast"
-NVENC.Preset.HighPerformance="High Performance"
-NVENC.Preset.HighQuality="High Quality"
-NVENC.Preset.BluRayDisc="BluRay Disc"
-NVENC.Preset.LowLatency="Low Latency"
-NVENC.Preset.LowLatencyHighPerformance="Low Latency High Performance"
-NVENC.Preset.LowLatencyHighQuality="Low Latency High Quality"
-NVENC.Preset.Lossless="Lossless"
-NVENC.Preset.LosslessHighPerformance="Lossless High Performance"
-NVENC.RateControl="Rate Control Options"
-NVENC.RateControl.Mode="Mode"
-NVENC.RateControl.Mode.CQP="Constant Quantization Parameter"
-NVENC.RateControl.Mode.VBR="Variable Bitrate"
-NVENC.RateControl.Mode.VBR_HQ="High Quality Variable Bitrate"
-NVENC.RateControl.Mode.CBR="Constant Bitrate"
-NVENC.RateControl.Mode.CBR_HQ="High Quality Constant Bitrate"
-NVENC.RateControl.Mode.CBR_LD_HQ="Low Delay High Quality Constant Bitrate"
-NVENC.RateControl.LookAhead="Look Ahead"
-NVENC.RateControl.LookAhead.Description="Look ahead this many frames while encoding to better distribute bitrate.\nImproves quality slightly at the cost of some GPU time.\nSet to 0 to disable."
-NVENC.RateControl.AdaptiveI="Enable adaptive I-Frame insertion"
-NVENC.RateControl.AdaptiveI.Description="Enables adaptive I-Frame insertion.\nOnly has an effect when look ahead is set to a value other than 0."
-NVENC.RateControl.AdaptiveB="Enable adaptive B-Frame insertion"
-NVENC.RateControl.AdaptiveB.Description="Enables adaptive B-Frame insertion.\nOnly has an effect when look ahead is set to a value other than 0."
-NVENC.RateControl.TwoPass="Enable Two Pass"
-NVENC.RateControl.TwoPass.Description="Enable a secondary pass for encoding, which can help with quality and bitrate stability.\nImproves quality slightly at the cost of some GPU time.\nNvidia Turing hardware might actually see a quality degrade from this."
-NVENC.RateControl.Bitrate="Bitrate Limits"
-NVENC.RateControl.Bitrate.Target="Target Bitrate"
-NVENC.RateControl.Bitrate.Maximum="Maximum Bitrate"
-NVENC.RateControl.Quality="Enable Quality Limits"
-NVENC.RateControl.Quality.Minimum="Minimum Quality"
-NVENC.RateControl.Quality.Minimum.Description="Minimum quality to achieve, with values closer to 0 being better quality."
-NVENC.RateControl.Quality.Maximum="Maximum Quality"
-NVENC.RateControl.Quality.Maximum.Description="Maximum quality to achieve, with values closer to 0 being better quality.\nSet to -1 to disable the maximum restriction."
-NVENC.RateControl.Quality.Target="Target Quality"
-NVENC.RateControl.Quality.Target.Description="Target quality to achieve, with values closer to 0 being better quality.\nSet to 0 to disable the maximum restriction."
-NVENC.RateControl.QP="Quantization Parameters"
-NVENC.RateControl.QP.I="I-Frame QP"
-NVENC.RateControl.QP.I.Description="Quantization parameter for I-Frames.\nSmaller values mean better quality in exchange for higher bitrate, while higher values mean less bitrate in exchange for less quality."
-NVENC.RateControl.QP.I.Initial="Initial I-Frame QP"
-NVENC.RateControl.QP.I.Initial.Description="Initial B-Frame quantization parameter.\nSet to -1 to use the automatically detected value instead."
-NVENC.RateControl.QP.P="P-Frame QP"
-NVENC.RateControl.QP.P.Description="Quantization parameter for P-Frames.\nSmaller values mean better quality in exchange for higher bitrate, while higher values mean less bitrate in exchange for less quality."
-NVENC.RateControl.QP.P.Initial="Initial P-Frame QP"
-NVENC.RateControl.QP.P.Initial.Description="Initial P-Frame quantization parameter.\nSet to -1 to use the automatically detected value instead."
-NVENC.RateControl.QP.B="B-Frame QP"
-NVENC.RateControl.QP.B.Description="Quantization parameter for B-Frames.\nSmaller values mean better quality in exchange for higher bitrate, while higher values mean less bitrate in exchange for less quality."
-NVENC.RateControl.QP.B.Initial="Initial B-Frame QP"
-NVENC.RateControl.QP.B.Initial.Description="Initial B-Frame quantization parameter.\nSet to -1 to use the automatically detected value instead."
-NVENC.AQ="Adaptive Quantization"
-NVENC.AQ.Spatial="Enable Spatial Adaptive Quantization"
-NVENC.AQ.Spatial.Description="Enable spatial adaptive quantization, also sometimes referred to as Psychovisual Adaptive Quantization."
-NVENC.AQ.Strength="Spatial AQ Strength"
-NVENC.AQ.Strength.Description="Strength of the spatial adaptive quantization.\nValues closer to 15 mean more aggressive, while values closer to 1 mean more relaxed."
-NVENC.AQ.Temporal="Enable Temporal Adaptive Quantization"
-NVENC.AQ.Temporal.Description="Enable temporal adaptive quantization."
-NVENC.Other="Other Options"
-NVENC.Other.BFrames="Maximum B-Frames"
-NVENC.Other.BFrames.Description="Maximum number of B-Frames to insert into the encoded bitstream.\nActual number of B-Frames may be lower depending on content and lookahead settings."
-NVENC.Other.BFrameReferenceMode="B-Frame Reference Mode"
-NVENC.Other.BFrameReferenceMode.Each="Each B-Frame will be used for references"
-NVENC.Other.BFrameReferenceMode.Middle="Only (# of B-Frames)/2 will be used for references"
-NVENC.Other.ZeroLatency="Enable Zero Latency"
-NVENC.Other.ZeroLatency.Description="Enable zero latency operation, which ensures that there is no reordering delay."
-NVENC.Other.WeightedPrediction="Enable Weighted Prediction"
-NVENC.Other.WeightedPrediction.Description="Enable weighted prediction for encoding.\nCan't be used with B-Frames."
-NVENC.Other.NonReferencePFrames="Enable non-reference P-Frames"
-NVENC.Other.NonReferencePFrames.Description="Enable the automatic insertion of non-reference P-Frames."

source/codecs/h264.cpp

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

source/codecs/h264.hpp

@@ -1,67 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include <map>
-
-// Codec: H264
-#define P_H264 "Codec.H264"
-#define P_H264_PROFILE "Codec.H264.Profile"
-#define P_H264_LEVEL "Codec.H264.Level"
-
-namespace obsffmpeg {
-	namespace codecs {
-		namespace h264 {
-			enum class profile {
-				CONSTRAINED_BASELINE,
-				BASELINE,
-				MAIN,
-				HIGH,
-				HIGH444_PREDICTIVE,
-				UNKNOWN = -1,
-			};
-
-			enum class level {
-				L1_0 = 10,
-				L1_0b,
-				L1_1,
-				L1_2,
-				L1_3,
-				L2_0 = 20,
-				L2_1,
-				L2_2,
-				L3_0 = 30,
-				L3_1,
-				L3_2,
-				L4_0 = 40,
-				L4_1,
-				L4_2,
-				L5_0 = 50,
-				L5_1,
-				L5_2,
-				L6_0 = 60,
-				L6_1,
-				L6_2,
-				UNKNOWN = -1,
-			};
-		} // namespace h264
-	}         // namespace codecs
-} // namespace obsffmpeg

source/codecs/hevc.cpp

@@ -1,236 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "hevc.hpp"
-#include "utility.hpp"
-
-enum class nal_unit_type : uint8_t { // 6 bits
-	TRAIL_N        = 0,
-	TRAIL_R        = 1,
-	TSA_N          = 2,
-	TSA_R          = 3,
-	STSA_N         = 4,
-	STSA_R         = 5,
-	RADL_N         = 6,
-	RADL_R         = 7,
-	RASL_N         = 8,
-	RASL_R         = 9,
-	RSV_VCL_N10    = 10,
-	RSV_VCL_R11    = 11,
-	RSV_VCL_N12    = 12,
-	RSV_VCL_R13    = 13,
-	RSV_VCL_N14    = 14,
-	RSV_VCL_R15    = 15,
-	BLA_W_LP       = 16,
-	BLA_W_RADL     = 17,
-	BLA_N_LP       = 18,
-	IDR_W_RADL     = 19,
-	IDR_N_LP       = 20,
-	CRA            = 21,
-	RSV_IRAP_VCL22 = 22,
-	RSV_IRAP_VCL23 = 23,
-	RSV_VCL24      = 24,
-	RSV_VCL25      = 25,
-	RSV_VCL26      = 26,
-	RSV_VCL27      = 27,
-	RSV_VCL28      = 28,
-	RSV_VCL29      = 29,
-	RSV_VCL30      = 30,
-	RSV_VCL31      = 31,
-	VPS            = 32,
-	SPS            = 33,
-	PPS            = 34,
-	AUD            = 35,
-	EOS            = 36,
-	EOB            = 37,
-	FD             = 38,
-	PREFIX_SEI     = 39,
-	SUFFIX_SEI     = 40,
-	RSV_NVCL41     = 41,
-	RSV_NVCL42     = 42,
-	RSV_NVCL43     = 43,
-	RSV_NVCL44     = 44,
-	RSV_NVCL45     = 45,
-	RSV_NVCL46     = 46,
-	RSV_NVCL47     = 47,
-	UNSPEC48       = 48,
-	UNSPEC49       = 49,
-	UNSPEC50       = 50,
-	UNSPEC51       = 51,
-	UNSPEC52       = 52,
-	UNSPEC53       = 53,
-	UNSPEC54       = 54,
-	UNSPEC55       = 55,
-	UNSPEC56       = 56,
-	UNSPEC57       = 57,
-	UNSPEC58       = 58,
-	UNSPEC59       = 59,
-	UNSPEC60       = 60,
-	UNSPEC61       = 61,
-	UNSPEC62       = 62,
-	UNSPEC63       = 63,
-};
-
-struct hevc_nal_unit_header {
-	bool          zero_bit : 1;
-	nal_unit_type nut : 6;
-	uint8_t       layer_id : 6;
-	uint8_t       temporal_id_plus1 : 3;
-};
-
-struct hevc_nal {
-	hevc_nal_unit_header* header;
-	size_t                size = 0;
-	uint8_t*              data = nullptr;
-};
-
-bool is_nal(uint8_t* data, uint8_t* end)
-{
-	size_t s = end - data;
-	if (s < 4)
-		return false;
-
-	if (*data != 0x0)
-		return false;
-	if (*(data + 1) != 0x0)
-		return false;
-	if (*(data + 2) != 0x0)
-		return false;
-	if (*(data + 3) != 0x1)
-		return false;
-
-	return true;
-}
-
-bool seek_to_nal(uint8_t*& data, uint8_t* end)
-{
-	if (data > end)
-		return false;
-
-	for (; data <= end; data++) {
-		if (is_nal(data, end)) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-size_t get_nal_size(uint8_t* data, uint8_t* end)
-{
-	uint8_t* ptr = data + 4;
-	if (!seek_to_nal(ptr, end)) {
-		return end - data;
-	}
-	return ptr - data;
-}
-
-bool is_discard_marker(uint8_t* data, uint8_t* end)
-{
-	size_t s = end - data;
-	if (s < 4)
-		return false;
-
-	if (*data != 0x0)
-		return false;
-	if (*(data + 1) != 0x0)
-		return false;
-
-	if (*(data + 2) == 0x3) {
-		// Discard marker only if the next byte is not 0x0, 0x1, 0x2 or 0x3.
-		if (*(data + 3) != 0x0)
-			return false;
-		if (*(data + 3) != 0x1)
-			return false;
-		if (*(data + 3) != 0x2)
-			return false;
-		if (*(data + 3) != 0x3)
-			return false;
-
-		return true;
-	} else {
-		if (*(data + 2) == 0x0)
-			return true;
-		if (*(data + 2) == 0x1)
-			return true;
-		if (*(data + 2) == 0x2)
-			return true;
-
-		return false;
-	}
-}
-
-bool should_discard_nal(uint8_t* data, uint8_t* end)
-{
-	if (data > end)
-		return true;
-
-	for (; data <= end; data++) {
-		if (is_discard_marker(data, end))
-			return true;
-	}
-
-	return false;
-}
-
-void progress_parse(uint8_t*& ptr, uint8_t* end, size_t& sz)
-{
-	ptr += sz;
-	sz = get_nal_size(ptr, end);
-}
-
-void obsffmpeg::codecs::hevc::extract_header_sei(uint8_t* data, size_t sz_data,
-                                                 std::vector<uint8_t>& header, std::vector<uint8_t>& sei)
-{
-	uint8_t* ptr = data;
-	uint8_t* end = data + sz_data;
-
-	// Reserve enough memory to store the entire packet data if necessary.
-	header.reserve(sz_data);
-	sei.reserve(sz_data);
-
-	if (!seek_to_nal(ptr, end)) {
-		return;
-	}
-
-	for (size_t nal_sz = get_nal_size(ptr, end); nal_sz > 0; progress_parse(ptr, end, nal_sz)) {
-		if (should_discard_nal(ptr + 4, ptr + nal_sz)) {
-			continue;
-		}
-
-		hevc_nal nal;
-		nal.header = reinterpret_cast<hevc_nal_unit_header*>(ptr + 4);
-		nal.size   = nal_sz - 4 - 2;
-		nal.data   = ptr + 4 + 2;
-
-		switch (nal.header->nut) {
-		case nal_unit_type::VPS:
-		case nal_unit_type::SPS:
-		case nal_unit_type::PPS:
-			header.insert(header.end(), ptr, ptr + nal_sz);
-			break;
-		case nal_unit_type::PREFIX_SEI:
-		case nal_unit_type::SUFFIX_SEI:
-			sei.insert(sei.end(), ptr, ptr + nal_sz);
-			break;
-		}
-	}
-}

source/codecs/hevc.hpp

@@ -1,69 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include <vector>
-
-// Codec: HEVC
-#define P_HEVC "Codec.HEVC"
-#define P_HEVC_PROFILE "Codec.HEVC.Profile"
-#define P_HEVC_TIER "Codec.HEVC.Tier"
-#define P_HEVC_LEVEL "Codec.HEVC.Level"
-
-namespace obsffmpeg {
-	namespace codecs {
-		namespace hevc {
-			enum class profile {
-				MAIN,
-				MAIN10,
-				RANGE_EXTENDED,
-				UNKNOWN = -1,
-			};
-
-			enum class tier {
-				MAIN,
-				HIGH,
-				UNKNOWN = -1,
-			};
-
-			enum class level {
-				L1_0    = 30,
-				L2_0    = 60,
-				L2_1    = 63,
-				L3_0    = 90,
-				L3_1    = 93,
-				L4_0    = 120,
-				L4_1    = 123,
-				L5_0    = 150,
-				L5_1    = 153,
-				L5_2    = 156,
-				L6_0    = 180,
-				L6_1    = 183,
-				L6_2    = 186,
-				UNKNOWN = -1,
-			};
-
-			void extract_header_sei(uint8_t* data, size_t sz_data,
-			                        std::vector<uint8_t>& header, std::vector<uint8_t>& sei);
-
-		} // namespace hevc
-	}         // namespace codecs
-} // namespace obsffmpeg

source/encoder.hpp

@@ -1,118 +1,145 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
+#ifndef OBS_FFMPEG_ENCODER_HPP
+#define OBS_FFMPEG_ENCODER_HPP
 #pragma once
 
-#include <condition_variable>
+#include <map>
-#include <mutex>
+#include <string>
-#include <thread>
-#include "ffmpeg/avframe-queue.hpp"
 #include "ffmpeg/swscale.hpp"
 
-extern "C" {
-#include <obs-properties.h>
 #include <obs.h>
+
+extern "C" {
 #pragma warning(push)
 #pragma warning(disable : 4244)
-#include <libavcodec/avcodec.h>
+#include "libavcodec/avcodec.h"
-#include <libavutil/frame.h>
+#include "libswscale/swscale.h"
 #pragma warning(pop)
 }
 
 namespace obsffmpeg {
-	class encoder_factory {
+	namespace encoder {
-		struct info {
+		class base {
-			std::string      uid;
+			protected:
-			std::string      codec;
+			obs_encoder_t* self = nullptr;
-			std::string      readable_name;
-			obs_encoder_info oei;
-		} info;
-		const AVCodec* avcodec_ptr;
 
-		public:
+			AVCodec*        avcodec = nullptr;
-		encoder_factory(const AVCodec* codec);
+			AVCodecContext* avcontext = nullptr;
-		virtual ~encoder_factory();
+			AVDictionary*   avdictionary = nullptr;
+			ffmpeg::swscale swscale;
 
-		void register_encoder();
+			std::pair<uint32_t, uint32_t> resolution;
+			std::pair<uint32_t, uint32_t> framerate;
 
-		const char* get_name();
+			AVPixelFormat source_format;
+			AVColorSpace  source_colorspace;
+			AVColorRange  source_range;
 
-		void get_defaults(obs_data_t* settings);
+			AVPixelFormat target_format;
+			AVColorSpace  target_colorspace;
+			AVColorRange  target_range;
 
-		void get_properties(obs_properties_t* props);
+			public:
+			virtual ~base();
 
-		const AVCodec* get_avcodec();
+			virtual void get_properties(obs_properties_t* props) = 0;
-	};
 
-	class encoder {
+			virtual bool update(obs_data_t* settings) = 0;
-		obs_encoder_t*   _self;
-		encoder_factory* _factory;
 
-		const AVCodec*  _codec;
+			virtual bool get_extra_data(uint8_t** extra_data, size_t* size) = 0;
-		AVCodecContext* _context;
 
-		ffmpeg::avframe_queue _frame_queue;
+			virtual bool get_sei_data(uint8_t** sei_data, size_t* size) = 0;
-		ffmpeg::avframe_queue _frame_queue_used;
-		ffmpeg::swscale       _swscale;
-		AVPacket              _current_packet;
 
-		int64_t _lag_in_frames;
+			virtual void get_video_info(struct video_scale_info* info) = 0;
-		int64_t _count_send_frames;
 
-		// Extra Data
+			virtual bool encode(struct encoder_frame* frame, struct encoder_packet* packet,
-		bool                 _have_first_frame;
+			                    bool* received_packet) = 0;
-		std::vector<uint8_t> _extra_data;
+		};
-		std::vector<uint8_t> _sei_data;
 
-		public:
+#define make_encoder_base(_source, _target, _name, _codec) \
-		encoder(obs_data_t* settings, obs_encoder_t* encoder);
+	static void* _source##_create(obs_data_t* settings, obs_encoder_t* encoder) \
-		virtual ~encoder();
+	{ \
+		_target* ptr = nullptr; \
+		try { \
+			ptr = new _target(settings, encoder); \
+		} catch (...) { \
+		} \
+		return ptr; \
+	} \
+	static void _source##_destroy(void* ptr) \
+	{ \
+		delete static_cast<_target*>(ptr); \
+	} \
+	static const char* _source##_get_name(void*) \
+	{ \
+		return _name; \
+	} \
+	static obs_properties_t* _source##_get_properties(void* ptr) \
+	{ \
+		obs_properties_t* pr = _target::get_properties(); \
+		if (ptr) { \
+			static_cast<_target*>(ptr)->get_properties(pr); \
+		} \
+		return pr; \
+	} \
+	static void _source##_get_defaults(obs_data_t* settings) \
+	{ \
+		_target::get_defaults(settings); \
+	} \
+	static bool _source##_get_extra_data(void* ptr, uint8_t** extra_data, size_t* size) \
+	{ \
+		return static_cast<_target*>(ptr)->get_extra_data(extra_data, size); \
+	} \
+	static bool _source##_get_sei_data(void* ptr, uint8_t** sei_data, size_t* size) \
+	{ \
+		return static_cast<_target*>(ptr)->get_sei_data(sei_data, size); \
+	} \
+	static void _source##_get_video_info(void* ptr, struct video_scale_info* info) \
+	{ \
+		static_cast<_target*>(ptr)->get_video_info(info); \
+	} \
+	static bool _source##_encode(void* ptr, struct encoder_frame* frame, struct encoder_packet* packet, \
+	                             bool* received_packet) \
+	{ \
+		return static_cast<_target*>(ptr)->encode(frame, packet, received_packet); \
+	} \
+	static obs_encoder_info _source##_info; \
+	static void             _source##_initialize() \
+	{ \
+		_source##_info.id             = "obs-ffmpeg-encoder-" #_source; \
+		_source##_info.type           = OBS_ENCODER_VIDEO; \
+		_source##_info.caps           = 0; \
+		_source##_info.codec          = _codec; \
+		_source##_info.create         = _source##_create; \
+		_source##_info.destroy        = _source##_destroy; \
+		_source##_info.get_name       = _source##_get_name; \
+		_source##_info.get_properties = _source##_get_properties; \
+		_source##_info.get_defaults   = _source##_get_defaults; \
+		_source##_info.get_extra_data = _source##_get_extra_data; \
+		_source##_info.get_sei_data   = _source##_get_sei_data; \
+		_source##_info.get_video_info = _source##_get_video_info; \
+		_source##_info.encode         = _source##_encode; \
+		obs_register_encoder(&(_source##_info)); \
+	}
+		//*/
 
-		public: // OBS API
+	} // namespace encoder
-		// Shared
-		void get_properties(obs_properties_t* props);
-
-		bool update(obs_data_t* settings);
-
-		// Audio only
-		void get_audio_info(struct audio_convert_info* info);
-
-		size_t get_frame_size();
-
-		bool audio_encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet);
-
-		// Video only
-		void get_video_info(struct video_scale_info* info);
-
-		bool get_sei_data(uint8_t** sei_data, size_t* size);
-
-		bool get_extra_data(uint8_t** extra_data, size_t* size);
-
-		bool video_encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet);
-
-		bool video_encode_texture(uint32_t handle, int64_t pts, uint64_t lock_key, uint64_t* next_key,
-		                          struct encoder_packet* packet, bool* received_packet);
-
-		int receive_packet(bool* received_packet, struct encoder_packet* packet);
-
-		int send_frame(std::shared_ptr<AVFrame> frame);
-	};
 } // namespace obsffmpeg
+
+#endif OBS_FFMPEG_ENCODER_HPP

source/encoders/generic.cpp

@@ -0,0 +1,707 @@
+// FFMPEG Video Encoder Integration for OBS Studio
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+#include "generic.hpp"
+#include <iomanip>
+#include <sstream>
+#include <thread>
+#include <util/profiler.hpp>
+#include "ffmpeg/tools.hpp"
+#include "plugin.hpp"
+#include "utility.hpp"
+
+extern "C" {
+#include <obs-module.h>
+#pragma warning(push)
+#pragma warning(disable : 4244)
+#include "libavutil/dict.h"
+#include "libavutil/frame.h"
+#include "libavutil/opt.h"
+#pragma warning(pop)
+}
+
+// Generic
+#define P_AUTOMATIC "Automatic"
+
+// FFmpeg
+#define P_FFMPEG "FFmpeg"
+#define P_FFMPEG_CUSTOMSETTINGS "FFmpeg.CustomSettings"
+#define P_FFMPEG_THREADS "FFmpeg.Threads"
+#define P_FFMPEG_COLORFORMAT "FFmpeg.ColorFormat"
+#define P_FFMPEG_STANDARDCOMPLIANCE "FFmpeg.StandardCompliance"
+
+enum class keyframe_type { Seconds, Frames };
+
+encoder::generic_factory::generic_factory(AVCodec* codec) : avcodec_ptr(codec), info() {}
+
+encoder::generic_factory::~generic_factory() {}
+
+void encoder::generic_factory::register_encoder()
+{
+	// Generate unique name from given Id
+	{
+		std::stringstream sstr;
+		sstr << "ffmpeg-" << avcodec_ptr->name << "-0x" << std::uppercase << std::setfill('0') << std::setw(8)
+		     << std::hex << avcodec_ptr->capabilities;
+		this->info.uid = sstr.str();
+	}
+
+	// Also generate a human readable name while we're at it.
+	// TODO: Figure out a way to translate from names to other names.
+	{
+		std::stringstream sstr;
+		sstr << "[FFmpeg] " << (avcodec_ptr->long_name ? avcodec_ptr->long_name : avcodec_ptr->name) << " ("
+		     << avcodec_ptr->name << ")";
+		std::string caps = ffmpeg::tools::translate_encoder_capabilities(avcodec_ptr->capabilities);
+		if (caps.length() != 0) {
+			sstr << " (" << caps << ")";
+		}
+		this->info.readable_name = sstr.str();
+	}
+
+	// Assign Ids.
+	{
+		const AVCodecDescriptor* desc = avcodec_descriptor_get(this->avcodec_ptr->id);
+		if (desc) {
+			this->info.codec = desc->name;
+		} else {
+			this->info.codec = avcodec_ptr->name;
+		}
+	}
+	this->info.oei.id    = this->info.uid.c_str();
+	this->info.oei.codec = this->info.codec.c_str();
+
+	// Detect encoder type (only Video and Audio supported)
+	if (avcodec_ptr->type == AVMediaType::AVMEDIA_TYPE_VIDEO) {
+		this->info.oei.type = obs_encoder_type::OBS_ENCODER_VIDEO;
+	} else if (avcodec_ptr->type == AVMediaType::AVMEDIA_TYPE_AUDIO) {
+		this->info.oei.type = obs_encoder_type::OBS_ENCODER_AUDIO;
+	} else {
+		throw std::invalid_argument("unsupported codec type");
+	}
+
+	// Register functions.
+	this->info.oei.create = [](obs_data_t* settings, obs_encoder_t* encoder) {
+		try {
+			return reinterpret_cast<void*>(new generic(settings, encoder));
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			return reinterpret_cast<void*>(0);
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			return reinterpret_cast<void*>(0);
+		}
+	};
+	this->info.oei.destroy = [](void* ptr) {
+		try {
+			delete reinterpret_cast<generic*>(ptr);
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+	this->info.oei.get_name = [](void* type_data) {
+		try {
+			return reinterpret_cast<generic_factory*>(type_data)->get_name();
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+	this->info.oei.get_defaults2 = [](obs_data_t* settings, void* type_data) {
+		try {
+			reinterpret_cast<generic_factory*>(type_data)->get_defaults(settings);
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+	this->info.oei.get_properties2 = [](void* ptr, void* type_data) {
+		try {
+			obs_properties_t* props = obs_properties_create();
+			if (type_data != nullptr) {
+				reinterpret_cast<generic_factory*>(type_data)->get_properties(props);
+			}
+			if (ptr != nullptr) {
+				reinterpret_cast<generic*>(ptr)->get_properties(props);
+			}
+			return props;
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+	this->info.oei.update = [](void* ptr, obs_data_t* settings) {
+		try {
+			return reinterpret_cast<generic*>(ptr)->update(settings);
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+	this->info.oei.get_sei_data = [](void* ptr, uint8_t** sei_data, size_t* size) {
+		try {
+			return reinterpret_cast<generic*>(ptr)->get_sei_data(sei_data, size);
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+	this->info.oei.get_extra_data = [](void* ptr, uint8_t** extra_data, size_t* size) {
+		try {
+			return reinterpret_cast<generic*>(ptr)->get_extra_data(extra_data, size);
+		} catch (std::exception const& e) {
+			PLOG_ERROR("exception: %s", e.what());
+			throw e;
+		} catch (...) {
+			PLOG_ERROR("unknown exception");
+			throw;
+		}
+	};
+
+	if (this->avcodec_ptr->type == AVMediaType::AVMEDIA_TYPE_VIDEO) {
+		this->info.oei.get_video_info = [](void* ptr, struct video_scale_info* info) {
+			try {
+				reinterpret_cast<generic*>(ptr)->get_video_info(info);
+			} catch (std::exception const& e) {
+				PLOG_ERROR("exception: %s", e.what());
+				throw e;
+			} catch (...) {
+				PLOG_ERROR("unknown exception");
+				throw;
+			}
+		};
+		this->info.oei.encode = [](void* ptr, struct encoder_frame* frame, struct encoder_packet* packet,
+		                           bool* received_packet) {
+			try {
+				return reinterpret_cast<generic*>(ptr)->video_encode(frame, packet, received_packet);
+			} catch (std::exception const& e) {
+				PLOG_ERROR("exception: %s", e.what());
+				throw e;
+			} catch (...) {
+				PLOG_ERROR("unknown exception");
+				throw;
+			}
+		};
+		this->info.oei.encode_texture = [](void* ptr, uint32_t handle, int64_t pts, uint64_t lock_key,
+		                                   uint64_t* next_key, struct encoder_packet* packet,
+		                                   bool* received_packet) {
+			try {
+				return reinterpret_cast<generic*>(ptr)->video_encode_texture(
+				    handle, pts, lock_key, next_key, packet, received_packet);
+			} catch (std::exception const& e) {
+				PLOG_ERROR("exception: %s", e.what());
+				throw e;
+			} catch (...) {
+				PLOG_ERROR("unknown exception");
+				throw;
+			}
+		};
+
+	} else if (this->avcodec_ptr->type == AVMediaType::AVMEDIA_TYPE_AUDIO) {
+		this->info.oei.get_audio_info = [](void* ptr, struct audio_convert_info* info) {
+			try {
+				reinterpret_cast<generic*>(ptr)->get_audio_info(info);
+			} catch (std::exception const& e) {
+				PLOG_ERROR("exception: %s", e.what());
+				throw e;
+			} catch (...) {
+				PLOG_ERROR("unknown exception");
+				throw;
+			}
+		};
+		this->info.oei.get_frame_size = [](void* ptr) {
+			try {
+				return reinterpret_cast<generic*>(ptr)->get_frame_size();
+			} catch (std::exception const& e) {
+				PLOG_ERROR("exception: %s", e.what());
+				throw e;
+			} catch (...) {
+				PLOG_ERROR("unknown exception");
+				throw;
+			}
+		};
+		this->info.oei.encode = [](void* ptr, struct encoder_frame* frame, struct encoder_packet* packet,
+		                           bool* received_packet) {
+			try {
+				return reinterpret_cast<generic*>(ptr)->audio_encode(frame, packet, received_packet);
+			} catch (std::exception const& e) {
+				PLOG_ERROR("exception: %s", e.what());
+				throw e;
+			} catch (...) {
+				PLOG_ERROR("unknown exception");
+				throw;
+			}
+		};
+	}
+
+	// Finally store ourself as type data.
+	this->info.oei.type_data = this;
+
+	obs_register_encoder(&this->info.oei);
+	PLOG_INFO("Registered encoder #%llX with name '%s' and long name '%s' and caps %llX", avcodec_ptr,
+	          avcodec_ptr->name, avcodec_ptr->long_name, avcodec_ptr->capabilities);
+}
+
+const char* encoder::generic_factory::get_name()
+{
+	return this->info.readable_name.c_str();
+}
+
+void encoder::generic_factory::get_defaults(obs_data_t* settings)
+{
+	{ // Handler
+		auto ptr = obsffmpeg::find_codec_handler(this->avcodec_ptr->name);
+		if (ptr) {
+			ptr->get_defaults(settings, this->avcodec_ptr, nullptr);
+		}
+	}
+
+	{ // Integrated Options
+		// FFmpeg
+		obs_data_set_default_string(settings, P_FFMPEG_CUSTOMSETTINGS, "");
+		obs_data_set_default_int(settings, P_FFMPEG_COLORFORMAT, static_cast<int64_t>(AV_PIX_FMT_NONE));
+		obs_data_set_default_int(settings, P_FFMPEG_THREADS, 0);
+		obs_data_set_default_int(settings, P_FFMPEG_STANDARDCOMPLIANCE, FF_COMPLIANCE_STRICT);
+	}
+}
+
+void encoder::generic_factory::get_properties(obs_properties_t* props)
+{
+	{ // Handler
+		auto ptr = obsffmpeg::find_codec_handler(this->avcodec_ptr->name);
+		if (ptr) {
+			ptr->get_properties(props, this->avcodec_ptr, nullptr);
+		}
+	}
+
+	{
+		auto prs = obs_properties_create();
+		{
+			auto p =
+			    obs_properties_add_text(prs, P_FFMPEG_CUSTOMSETTINGS, TRANSLATE(P_FFMPEG_CUSTOMSETTINGS),
+			                            obs_text_type::OBS_TEXT_DEFAULT);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_FFMPEG_CUSTOMSETTINGS)));
+		}
+		if (this->avcodec_ptr->pix_fmts) {
+			auto p = obs_properties_add_list(prs, P_FFMPEG_COLORFORMAT, TRANSLATE(P_FFMPEG_COLORFORMAT),
+			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_FFMPEG_COLORFORMAT)));
+			obs_property_list_add_int(p, TRANSLATE(P_AUTOMATIC), static_cast<int64_t>(AV_PIX_FMT_NONE));
+			for (auto ptr = this->avcodec_ptr->pix_fmts; *ptr != AV_PIX_FMT_NONE; ptr++) {
+				obs_property_list_add_int(p, ffmpeg::tools::get_pixel_format_name(*ptr),
+				                          static_cast<int64_t>(*ptr));
+			}
+		}
+		{
+			auto p = obs_properties_add_int_slider(prs, P_FFMPEG_THREADS, TRANSLATE(P_FFMPEG_THREADS), 0,
+			                                       std::thread::hardware_concurrency() * 2, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_FFMPEG_THREADS)));
+		}
+		{
+			auto p = obs_properties_add_list(prs, P_FFMPEG_STANDARDCOMPLIANCE,
+			                                 TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE), OBS_COMBO_TYPE_LIST,
+			                                 OBS_COMBO_FORMAT_INT);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_FFMPEG_STANDARDCOMPLIANCE)));
+			obs_property_list_add_int(p, TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE ".VeryStrict"),
+			                          FF_COMPLIANCE_VERY_STRICT);
+			obs_property_list_add_int(p, TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE ".Strict"),
+			                          FF_COMPLIANCE_STRICT);
+			obs_property_list_add_int(p, TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE ".Normal"),
+			                          FF_COMPLIANCE_NORMAL);
+			obs_property_list_add_int(p, TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE ".Unofficial"),
+			                          FF_COMPLIANCE_UNOFFICIAL);
+			obs_property_list_add_int(p, TRANSLATE(P_FFMPEG_STANDARDCOMPLIANCE ".Experimental"),
+			                          FF_COMPLIANCE_EXPERIMENTAL);
+		}
+		obs_properties_add_group(props, P_FFMPEG, TRANSLATE(P_FFMPEG), OBS_GROUP_NORMAL, prs);
+	};
+}
+
+AVCodec* encoder::generic_factory::get_avcodec()
+{
+	return this->avcodec_ptr;
+}
+
+encoder::generic::generic(obs_data_t* settings, obs_encoder_t* encoder)
+    : self(encoder), lag_in_frames(0), frame_count(0)
+{
+	this->factory = reinterpret_cast<generic_factory*>(obs_encoder_get_type_data(self));
+
+	// Verify that the codec actually still exists.
+	this->codec = avcodec_find_encoder_by_name(this->factory->get_avcodec()->name);
+	if (!this->codec) {
+		PLOG_ERROR("Failed to find encoder for codec '%s'.", this->factory->get_avcodec()->name);
+		throw std::runtime_error("failed to find codec");
+	}
+
+	// Initialize context.
+	this->context = avcodec_alloc_context3(this->codec);
+	if (!this->context) {
+		PLOG_ERROR("Failed to create context for encoder '%s'.", this->codec->name);
+		throw std::runtime_error("failed to create context");
+	}
+
+	// Settings
+	/// Rate Control
+	this->context->strict_std_compliance =
+	    static_cast<int>(obs_data_get_int(settings, P_FFMPEG_STANDARDCOMPLIANCE));
+	this->context->debug = 0;
+	/// Threading
+	if (this->codec->capabilities & AV_CODEC_CAP_SLICE_THREADS) {
+		this->context->thread_type = FF_THREAD_SLICE;
+	} else if (this->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS) {
+		this->context->thread_type = FF_THREAD_FRAME;
+	} else {
+		this->context->thread_type = 0;
+	}
+	int64_t threads = obs_data_get_int(settings, P_FFMPEG_THREADS);
+	if (threads > 0) {
+		this->context->thread_count = static_cast<int>(threads);
+		this->lag_in_frames         = this->context->thread_count;
+	} else {
+		this->context->thread_count = std::thread::hardware_concurrency();
+		this->lag_in_frames         = this->context->thread_count;
+	}
+
+	// Video and Audio exclusive setup
+	if (this->codec->type == AVMEDIA_TYPE_VIDEO) {
+		// FFmpeg Video Settings
+		auto encvideo = obs_encoder_video(this->self);
+		auto voi      = video_output_get_info(encvideo);
+
+		// Resolution
+		this->context->width  = voi->width;
+		this->context->height = voi->height;
+		this->swscale.set_source_size(this->context->width, this->context->height);
+		this->swscale.set_target_size(this->context->width, this->context->height);
+
+		// Color
+		this->context->colorspace  = ffmpeg::tools::obs_videocolorspace_to_avcolorspace(voi->colorspace);
+		this->context->color_range = ffmpeg::tools::obs_videorangetype_to_avcolorrange(voi->range);
+		this->context->field_order = AV_FIELD_PROGRESSIVE;
+		this->swscale.set_source_color(this->context->color_range, this->context->colorspace);
+		this->swscale.set_target_color(this->context->color_range, this->context->colorspace);
+
+		// Pixel Format
+		{
+			// Due to unsupported color formats and ffmpeg not automatically converting formats from A to B,
+			// we have to detect the closest format that we can still use and initialize our swscale instance
+			// these formats. This has a massive cost attached unfortunately.
+
+			AVPixelFormat source = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format);
+			AVPixelFormat target = AV_PIX_FMT_NONE;
+
+			int loss = 0;
+			target   = avcodec_find_best_pix_fmt_of_list(this->codec->pix_fmts, source, false, &loss);
+
+			this->context->pix_fmt = target;
+			this->swscale.set_source_format(source);
+			this->swscale.set_target_format(this->context->pix_fmt);
+
+			PLOG_INFO("Automatically detected target format '%s' for source format '%s'.",
+			          ffmpeg::tools::get_pixel_format_name(target),
+			          ffmpeg::tools::get_pixel_format_name(source));
+		}
+		AVPixelFormat color_format_override =
+		    static_cast<AVPixelFormat>(obs_data_get_int(settings, P_FFMPEG_COLORFORMAT));
+		if (color_format_override != AV_PIX_FMT_NONE) {
+			// User specified override for color format.
+			this->context->pix_fmt = color_format_override;
+			this->swscale.set_target_format(this->context->pix_fmt);
+			PLOG_INFO("User specified target format override '%s'.",
+			          ffmpeg::tools::get_pixel_format_name(this->context->pix_fmt));
+		}
+
+		// Framerate
+		this->context->time_base.num   = voi->fps_num;
+		this->context->time_base.den   = voi->fps_den;
+		this->context->ticks_per_frame = 1;
+	} else if (this->codec->type == AVMEDIA_TYPE_AUDIO) {
+	}
+
+	// Update settings
+	this->update(settings);
+
+	// Initialize
+	int res = avcodec_open2(this->context, this->codec, NULL);
+	if (res < 0) {
+		PLOG_ERROR("Failed to initialize encoder '%s' due to error code %lld: %s", this->codec->name, res,
+		           ffmpeg::tools::get_error_description(res));
+		throw std::runtime_error(ffmpeg::tools::get_error_description(res));
+	}
+
+	// Video/Audio exclusive setup part 2.
+	if (this->codec->type == AVMEDIA_TYPE_VIDEO) {
+		// Create Scaler
+		if (!swscale.initialize(SWS_FAST_BILINEAR)) {
+			PLOG_ERROR(
+			    " Failed to initialize Software Scaler for pixel format '%s' with color space '%s' and "
+			    "range '%s'.",
+			    ffmpeg::tools::get_pixel_format_name(this->context->pix_fmt),
+			    ffmpeg::tools::get_color_space_name(this->context->colorspace),
+			    this->swscale.is_source_full_range() ? "Full" : "Partial");
+			throw std::runtime_error("failed to initialize swscaler.");
+		}
+
+		// Create Frame queue
+		this->frame_queue.set_pixel_format(this->context->pix_fmt);
+		this->frame_queue.set_resolution(this->context->width, this->context->height);
+		this->frame_queue.precache(std::thread::hardware_concurrency() / 4);
+	} else if (this->codec->type == AVMEDIA_TYPE_AUDIO) {
+	}
+
+	// Create Packet
+	this->current_packet = av_packet_alloc();
+	if (!this->current_packet) {
+		PLOG_ERROR("Failed to allocate packet storage.");
+		throw std::runtime_error("Failed to allocate packet storage.");
+	}
+}
+
+encoder::generic::~generic()
+{
+	this->frame_queue.clear();
+	this->frame_queue_used.clear();
+	this->swscale.finalize();
+
+	if (this->context) {
+		avcodec_close(this->context);
+		avcodec_free_context(&this->context);
+	}
+}
+
+void encoder::generic::get_properties(obs_properties_t* props)
+{
+	{ // Handler
+		auto ptr = obsffmpeg::find_codec_handler(this->codec->name);
+		if (ptr) {
+			ptr->get_properties(props, this->codec, this->context);
+		}
+	}
+
+	obs_property_set_enabled(obs_properties_get(props, P_FFMPEG_COLORFORMAT), false);
+	obs_property_set_enabled(obs_properties_get(props, P_FFMPEG_THREADS), false);
+	obs_property_set_enabled(obs_properties_get(props, P_FFMPEG_STANDARDCOMPLIANCE), false);
+}
+
+bool encoder::generic::update(obs_data_t* settings)
+{
+	{ // Handler
+		auto ptr = obsffmpeg::find_codec_handler(this->codec->name);
+		if (ptr) {
+			ptr->update(settings, this->codec, this->context);
+		}
+	}
+
+	{ // FFmpeg
+		// Apply custom options.
+		av_opt_set_from_string(this->context, obs_data_get_string(settings, P_FFMPEG_CUSTOMSETTINGS), nullptr,
+		                       ";", "=");
+	}
+	return false;
+}
+
+void encoder::generic::get_audio_info(audio_convert_info*) {}
+
+size_t encoder::generic::get_frame_size()
+{
+	return size_t();
+}
+
+bool encoder::generic::audio_encode(encoder_frame*, encoder_packet*, bool*)
+{
+	return false;
+}
+
+void encoder::generic::get_video_info(video_scale_info*) {}
+
+bool encoder::generic::get_sei_data(uint8_t**, size_t*)
+{
+	return false;
+}
+
+bool encoder::generic::get_extra_data(uint8_t** extra_data, size_t* size)
+{
+	if (!this->context->extradata) {
+		return false;
+	}
+	*extra_data = this->context->extradata;
+	*size       = this->context->extradata_size;
+	return true;
+}
+
+bool encoder::generic::video_encode(encoder_frame* frame, encoder_packet* packet, bool* received_packet)
+{
+	// Convert frame.
+	std::shared_ptr<AVFrame> vframe = frame_queue.pop(); // Retrieve an empty frame.
+	{
+		ScopeProfiler profile("convert");
+
+		vframe->color_range = this->context->color_range;
+		vframe->colorspace  = this->context->colorspace;
+
+		int res =
+		    swscale.convert(reinterpret_cast<uint8_t**>(frame->data), reinterpret_cast<int*>(frame->linesize),
+		                    0, this->context->height, vframe->data, vframe->linesize);
+		if (res <= 0) {
+			PLOG_ERROR("Failed to convert frame: %s (%ld).", ffmpeg::tools::get_error_description(res),
+			           res);
+			return false;
+		}
+	}
+
+	// Send and receive frames.
+	{
+		ScopeProfiler profile("loop");
+		bool          sent_frame  = false;
+		bool          recv_packet = false;
+		bool          should_lag  = (lag_in_frames - frame_count) <= 0;
+
+		auto loop_begin = std::chrono::high_resolution_clock::now();
+		auto loop_end   = loop_begin + std::chrono::milliseconds(50);
+
+		while ((!sent_frame || (should_lag && !recv_packet))
+		       && !(std::chrono::high_resolution_clock::now() > loop_end)) {
+			bool eagain_is_stupid = false;
+
+			if (!sent_frame) {
+				ScopeProfiler profile_inner("send");
+
+				vframe->pts = frame->pts;
+
+				int res = send_frame(vframe);
+				switch (res) {
+				case 0:
+					sent_frame = true;
+					frame_count++;
+					break;
+				case AVERROR(EAGAIN):
+					// This means we should call receive_packet again, but what do we do with that data?
+					// Why can't we queue on both? Do I really have to implement threading for this stuff?
+					if (*received_packet == true) {
+						PLOG_WARNING(
+						    "Skipped frame due to EAGAIN when a packet was already returned.");
+						sent_frame = true;
+						frame_count++;
+					}
+					eagain_is_stupid = true;
+					break;
+				case AVERROR(EOF):
+					PLOG_ERROR("Skipped frame due to end of stream.");
+					sent_frame = true;
+					break;
+				default:
+					PLOG_ERROR("Failed to encode frame: %s (%ld).",
+					           ffmpeg::tools::get_error_description(res), res);
+					return false;
+				}
+			}
+
+			if (!recv_packet) {
+				ScopeProfiler profile_inner("recieve");
+
+				int res = receive_packet(received_packet, packet);
+				switch (res) {
+				case 0:
+					recv_packet = true;
+					break;
+				case AVERROR(EOF):
+					PLOG_ERROR("Received end of file.");
+					recv_packet = true;
+					break;
+				case AVERROR(EAGAIN):
+					if (sent_frame) {
+						recv_packet = true;
+					}
+					if (eagain_is_stupid) {
+						PLOG_ERROR("Both send and recieve returned EAGAIN, encoder is broken.");
+						return false;
+					}
+					break;
+				default:
+					PLOG_ERROR("Failed to receive packet: %s (%ld).",
+					           ffmpeg::tools::get_error_description(res), res);
+					return false;
+				}
+			}
+
+			if (!sent_frame || !recv_packet) {
+				std::this_thread::sleep_for(std::chrono::milliseconds(1));
+			}
+		}
+	}
+
+	return true;
+}
+
+bool encoder::generic::video_encode_texture(uint32_t, int64_t, uint64_t, uint64_t*, encoder_packet*, bool*)
+{
+	return false;
+}
+
+int encoder::generic::receive_packet(bool* received_packet, struct encoder_packet* packet)
+{
+	int res = avcodec_receive_packet(this->context, this->current_packet);
+	if (res == 0) {
+		packet->type          = OBS_ENCODER_VIDEO;
+		packet->pts           = this->current_packet->pts;
+		packet->dts           = this->current_packet->pts;
+		packet->data          = this->current_packet->data;
+		packet->size          = this->current_packet->size;
+		packet->keyframe      = !!(this->current_packet->flags & AV_PKT_FLAG_KEY);
+		packet->drop_priority = 0;
+		*received_packet      = true;
+
+		{
+			std::shared_ptr<AVFrame> uframe = frame_queue_used.pop_only();
+			frame_queue.push(uframe);
+		}
+	}
+	return res;
+}
+
+int encoder::generic::send_frame(std::shared_ptr<AVFrame> frame)
+{
+	int res = avcodec_send_frame(this->context, frame.get());
+	switch (res) {
+	case 0:
+		frame_count++;
+	case AVERROR(EAGAIN):
+	case AVERROR(EOF):
+		break;
+	}
+	return res;
+}

source/encoders/generic.hpp

@@ -0,0 +1,104 @@
+// FFMPEG Video Encoder Integration for OBS Studio
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+#pragma once
+
+#include <condition_variable>
+#include <encoder.hpp>
+#include <mutex>
+#include <thread>
+#include "ffmpeg/avframe-queue.hpp"
+#include "ffmpeg/swscale.hpp"
+
+namespace encoder {
+	class generic_factory {
+		struct info {
+			std::string      uid;
+			std::string      codec;
+			std::string      readable_name;
+			obs_encoder_info oei;
+		} info;
+		AVCodec* avcodec_ptr;
+
+		public:
+		generic_factory(AVCodec* codec);
+		virtual ~generic_factory();
+
+		void register_encoder();
+
+		const char* get_name();
+
+		void get_defaults(obs_data_t* settings);
+
+		void get_properties(obs_properties_t* props);
+
+		AVCodec* get_avcodec();
+
+		public:
+		static bool modified_ratecontrol_properties(void* priv, obs_properties_t* props, obs_property_t* prop,
+		                                            obs_data_t* settings);
+	};
+
+	class generic {
+		obs_encoder_t*   self;
+		generic_factory* factory;
+
+		AVCodec*        codec;
+		AVCodecContext* context;
+
+		ffmpeg::avframe_queue frame_queue;
+		ffmpeg::avframe_queue frame_queue_used;
+		ffmpeg::swscale       swscale;
+		AVPacket*             current_packet = nullptr;
+
+		int64_t lag_in_frames;
+		int64_t frame_count;
+
+		public:
+		generic(obs_data_t* settings, obs_encoder_t* encoder);
+		virtual ~generic();
+
+		public: // OBS API
+		// Shared
+		void get_properties(obs_properties_t* props);
+
+		bool update(obs_data_t* settings);
+
+		// Audio only
+		void get_audio_info(struct audio_convert_info* info);
+
+		size_t get_frame_size();
+
+		bool audio_encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet);
+
+		// Video only
+		void get_video_info(struct video_scale_info* info);
+
+		bool get_sei_data(uint8_t** sei_data, size_t* size);
+
+		bool get_extra_data(uint8_t** extra_data, size_t* size);
+
+		bool video_encode(struct encoder_frame* frame, struct encoder_packet* packet, bool* received_packet);
+
+		bool video_encode_texture(uint32_t handle, int64_t pts, uint64_t lock_key, uint64_t* next_key,
+		                          struct encoder_packet* packet, bool* received_packet);
+
+		int receive_packet(bool* received_packet, struct encoder_packet* packet);
+
+		int send_frame(std::shared_ptr<AVFrame> frame);
+	};
+} // namespace encoder

source/encoders/prores_aw.cpp

@@ -0,0 +1,341 @@
+// FFMPEG Video Encoder Integration for OBS Studio
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+#include "prores_aw.hpp"
+#include <obs-module.h>
+#include <thread>
+#include "ffmpeg/tools.hpp"
+#include "utility.hpp"
+
+extern "C" {
+#pragma warning(push)
+#pragma warning(disable : 4244)
+#include "libavutil/dict.h"
+#include "libavutil/frame.h"
+#include "libavutil/opt.h"
+#pragma warning(pop)
+}
+
+#include <util/profiler.hpp>
+
+#define T_PROFILE "ProRes.Profile"
+#define T_PROFILE_(x) "ProRes.Profile." D_VSTR(x)
+#define T_CUSTOM "Custom"
+
+#define LOG_PREFIX "[prores_aw] "
+
+make_encoder_base(prores_aw, obsffmpeg::encoder::prores_aw, "ProRes (Anatoliy Wasserman) (FFMPEG)", "prores");
+
+void obsffmpeg::encoder::prores_aw::initialize()
+{
+	auto avd = avcodec_find_encoder_by_name("prores_aw");
+	if (!avd) {
+		PLOG_INFO("ProRes (Anatoliy Wasserman) not supported.");
+		return;
+	}
+	prores_aw_initialize();
+	PLOG_INFO("ProRes (Anatoliy Wasserman) supported.");
+}
+
+void obsffmpeg::encoder::prores_aw::finalize()
+{
+	//prores_aw_finalize();
+}
+
+void obsffmpeg::encoder::prores_aw::get_defaults(obs_data_t* settings)
+{
+	obs_data_set_default_int(settings, T_PROFILE, static_cast<long long>(profile::HighQuality));
+}
+
+obs_properties_t* obsffmpeg::encoder::prores_aw::get_properties()
+{
+	obs_properties_t* prs = obs_properties_create();
+	obs_property_t*   p   = nullptr;
+
+	p = obs_properties_add_list(prs, T_PROFILE, TRANSLATE(T_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, TRANSLATE(DESC(T_PROFILE)));
+	obs_property_list_add_int(p, TRANSLATE(T_PROFILE_(Proxy)), static_cast<long long>(profile::Proxy));
+	obs_property_list_add_int(p, TRANSLATE(T_PROFILE_(Light)), static_cast<long long>(profile::Light));
+	obs_property_list_add_int(p, TRANSLATE(T_PROFILE_(Standard)), static_cast<long long>(profile::Standard));
+	obs_property_list_add_int(p, TRANSLATE(T_PROFILE_(HighQuality)), static_cast<long long>(profile::HighQuality));
+
+	p = obs_properties_add_text(prs, T_CUSTOM, TRANSLATE(T_CUSTOM), OBS_TEXT_DEFAULT);
+	obs_property_set_long_description(p, TRANSLATE(DESC(T_CUSTOM)));
+
+	return prs;
+}
+
+obsffmpeg::encoder::prores_aw::prores_aw(obs_data_t* settings, obs_encoder_t* encoder)
+{
+	this->self    = encoder;
+	auto encvideo = obs_encoder_video(this->self);
+	auto voi      = video_output_get_info(encvideo);
+
+	// Options, Parameters, etc.
+	/// Resolution, Frame Rate
+	this->resolution.first  = voi->width;
+	this->resolution.second = voi->height;
+	this->framerate.first   = voi->fps_num;
+	this->framerate.second  = voi->fps_den;
+	/// Source/Input
+	this->source_colorspace = ffmpeg::tools::obs_videocolorspace_to_avcolorspace(voi->colorspace);
+	this->source_range      = ffmpeg::tools::obs_videorangetype_to_avcolorrange(voi->range);
+	this->source_format     = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format);
+	/// Target/Output
+	this->target_colorspace = this->source_colorspace;
+	this->target_range      = this->source_range;
+	switch (voi->format) {
+	case VIDEO_FORMAT_RGBA:
+	case VIDEO_FORMAT_BGRA:
+	case VIDEO_FORMAT_BGRX:
+		this->target_format = AV_PIX_FMT_YUV444P10;
+		this->video_profile = profile::FourFourFourFour;
+		break;
+	case VIDEO_FORMAT_I444:
+	case VIDEO_FORMAT_YVYU:
+	case VIDEO_FORMAT_YUY2:
+	case VIDEO_FORMAT_UYVY:
+	case VIDEO_FORMAT_I420:
+	case VIDEO_FORMAT_NV12:
+		this->video_profile = static_cast<profile>(obs_data_get_int(settings, T_PROFILE));
+		if (this->video_profile == profile::FourFourFourFour) {
+			this->target_format = AV_PIX_FMT_YUV444P10;
+		} else {
+			this->target_format = AV_PIX_FMT_YUV422P10;
+		}
+		break;
+	}
+
+	// Log Settings
+	PLOG_INFO(LOG_PREFIX
+	          "Initializing encoder...\n\tResolution: %lux%lu\n\tFramerate: %lu/%lu (%.2lf fps)\n\tInput: %s %s "
+	          "%s\n\tOutput: %s %s %s\n\tProfile: %ld",
+	          this->resolution.first, this->resolution.second, this->framerate.first, this->framerate.second,
+	          (double_t(this->framerate.first) / double_t(this->framerate.second)),
+	          ffmpeg::tools::get_pixel_format_name(this->source_format),
+	          ffmpeg::tools::get_color_space_name(this->source_colorspace),
+	          swscale.is_source_full_range() ? "Full" : "Partial",
+	          ffmpeg::tools::get_pixel_format_name(this->target_format),
+	          ffmpeg::tools::get_color_space_name(this->target_colorspace),
+	          swscale.is_target_full_range() ? "Full" : "Partial", static_cast<int>(this->video_profile));
+
+	// prores_aw restriction
+	if (this->resolution.first % 2 == 1) {
+		PLOG_ERROR(LOG_PREFIX "Width must be a multiple of 2.");
+		throw std::exception();
+	}
+
+	// Quit if we for some reason can't find prores_aw anymore.
+	this->avcodec = avcodec_find_encoder_by_name("prores_aw");
+	if (!this->avcodec) {
+		PLOG_ERROR(LOG_PREFIX "Failed to find encoder.");
+		throw std::exception();
+	}
+
+	this->avcontext = avcodec_alloc_context3(this->avcodec);
+	if (!this->avcontext) {
+		PLOG_ERROR(LOG_PREFIX "Failed to create context.");
+		throw std::exception();
+	}
+
+	// Apply Settings
+	/// Resolution
+	this->avcontext->width  = this->resolution.first;
+	this->avcontext->height = this->resolution.second;
+	/// Framerate
+	this->avcontext->time_base.num   = this->framerate.first;
+	this->avcontext->time_base.den   = this->framerate.second;
+	this->avcontext->ticks_per_frame = 1;
+	/// GOP/Keyframe (ProRes is Intra only)
+	this->avcontext->gop_size = 0;
+	/// Color, Profile
+	this->avcontext->colorspace  = this->target_colorspace;
+	this->avcontext->color_range = this->target_range;
+	this->avcontext->pix_fmt     = this->target_format;
+	this->avcontext->profile     = static_cast<int>(this->video_profile);
+	/// Other
+	this->avcontext->field_order           = AV_FIELD_PROGRESSIVE;
+	this->avcontext->strict_std_compliance = FF_COMPLIANCE_NORMAL;
+	this->avcontext->debug                 = 0;
+	/// Threading
+	this->avcontext->thread_type = FF_THREAD_FRAME;
+#if defined(__cplusplus)
+	this->avcontext->thread_count = std::thread::hardware_concurrency();
+#elif defined(_WIN32)
+	{
+		SYSTEM_INFO sysinfo;
+		GetSystemInfo(&sysinfo);
+		this->avcontext->thread_count = sysinfo.dwNumberOfProcessors;
+	}
+#elif defined(_GNU)
+	this->avcontext->thread_count = 16;
+#else
+	this->avcontext->thread_count = 16;
+#endif
+	/// Dynamic Stuff
+	this->update(settings);
+
+	// Open Encoder
+	int res = avcodec_open2(this->avcontext, this->avcodec, NULL);
+	if (res < 0) {
+		avcodec_free_context(&this->avcontext);
+		PLOG_ERROR(LOG_PREFIX "Failed to open codec: %s (%ld).", ffmpeg::tools::get_error_description(res),
+		           res);
+		throw std::exception();
+	}
+
+	// Configure and initialize SWScale
+	swscale.set_source_size(voi->width, voi->height);
+	swscale.set_source_format(this->source_format);
+	swscale.set_source_color(this->source_range == AVCOL_RANGE_JPEG, this->source_colorspace);
+	swscale.set_target_size(voi->width, voi->height);
+	swscale.set_target_format(this->target_format);
+	swscale.set_target_color(this->target_range == AVCOL_RANGE_JPEG, this->target_colorspace);
+
+	if (!swscale.initialize(SWS_FAST_BILINEAR)) {
+		PLOG_ERROR(LOG_PREFIX "Incompatible conversion parameters:\n\tInput: %s %s %s\n\tOutput: %s %s %s",
+		           ffmpeg::tools::get_pixel_format_name(this->source_format),
+		           ffmpeg::tools::get_color_space_name(this->source_colorspace),
+		           swscale.is_source_full_range() ? "Full" : "Partial",
+		           ffmpeg::tools::get_pixel_format_name(this->target_format),
+		           ffmpeg::tools::get_color_space_name(this->target_colorspace),
+		           swscale.is_target_full_range() ? "Full" : "Partial");
+		throw std::exception();
+	}
+
+	frame_queue.set_pixel_format(this->avcontext->pix_fmt);
+	frame_queue.set_resolution(this->resolution.first, this->resolution.second);
+	frame_queue.precache(this->avcontext->thread_count / 2);
+
+	this->current_packet = av_packet_alloc();
+	if (!this->current_packet) {
+		PLOG_ERROR(LOG_PREFIX "Failed to allocated packet.");
+		throw std::exception();
+	}
+
+	PLOG_INFO(LOG_PREFIX "Encoder initialized.");
+}
+
+obsffmpeg::encoder::prores_aw::~prores_aw()
+{
+	frame_queue.clear();
+
+	swscale.finalize();
+	if (this->avcontext) {
+		avcodec_close(this->avcontext);
+		avcodec_free_context(&this->avcontext);
+	}
+}
+
+void obsffmpeg::encoder::prores_aw::get_properties(obs_properties_t*) {}
+
+bool obsffmpeg::encoder::prores_aw::update(obs_data_t*)
+{
+	return false;
+}
+
+bool obsffmpeg::encoder::prores_aw::get_extra_data(uint8_t** extra_data, size_t* size)
+{
+	if (!this->avcontext->extradata) {
+		return false;
+	}
+	*extra_data = this->avcontext->extradata;
+	*size       = this->avcontext->extradata_size;
+	return true;
+}
+
+bool obsffmpeg::encoder::prores_aw::get_sei_data(uint8_t**, size_t*)
+{
+	return false;
+}
+
+void obsffmpeg::encoder::prores_aw::get_video_info(video_scale_info*)
+{
+	return;
+}
+
+bool obsffmpeg::encoder::prores_aw::encode(encoder_frame* frame, encoder_packet* packet, bool* received_packet)
+{
+	int res = 0;
+
+	{
+		ScopeProfiler            sp_frame("frame");
+		std::shared_ptr<AVFrame> vframe = frame_queue.pop();
+		vframe->pts                     = frame->pts;
+
+		vframe->color_range = this->avcontext->color_range;
+		vframe->colorspace  = this->avcontext->colorspace;
+
+		{
+			ScopeProfiler profile("convert");
+			res = swscale.convert(reinterpret_cast<uint8_t**>(frame->data),
+			                      reinterpret_cast<int*>(frame->linesize), 0, this->resolution.second,
+			                      vframe->data, vframe->linesize);
+			if (res <= 0) {
+				PLOG_ERROR(LOG_PREFIX "Failed to convert frame: %s (%ld).",
+				           ffmpeg::tools::get_error_description(res), res);
+				return false;
+			}
+		}
+
+		{
+			ScopeProfiler profile("send");
+			res = avcodec_send_frame(this->avcontext, vframe.get());
+			if (res < 0) {
+				PLOG_ERROR(LOG_PREFIX "Failed to encode frame: %s (%ld).",
+				           ffmpeg::tools::get_error_description(res), res);
+				return false;
+			}
+		}
+
+		frame_queue_used.push(vframe);
+	}
+
+	{
+		ScopeProfiler profile("receive");
+		res = avcodec_receive_packet(this->avcontext, this->current_packet);
+		if (res < 0) {
+			if (res == AVERROR(EAGAIN)) {
+				*received_packet = false;
+				return true;
+			} else if (res == AVERROR(EOF)) {
+				return true;
+			} else {
+				PLOG_ERROR(LOG_PREFIX "Failed to receive packet: %s (%ld).",
+				           ffmpeg::tools::get_error_description(res), res);
+				return false;
+			}
+		} else {
+			std::shared_ptr<AVFrame> uframe = frame_queue_used.pop_only();
+			if (uframe) {
+				if (frame_queue.empty()) {
+					frame_queue.push(uframe);
+				}
+			}
+			packet->type          = OBS_ENCODER_VIDEO;
+			packet->pts           = this->current_packet->pts;
+			packet->dts           = this->current_packet->pts;
+			packet->data          = this->current_packet->data;
+			packet->size          = this->current_packet->size;
+			packet->keyframe      = true; // There are only keyframes in ProRes (Intra Only)
+			packet->drop_priority = 0;
+			*received_packet      = true;
+		}
+	}
+
+	return true;
+}

source/encoders/prores_aw.hpp

@@ -0,0 +1,75 @@
+// FFMPEG Video Encoder Integration for OBS Studio
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+#pragma once
+
+#include <encoder.hpp>
+#include <vector>
+#include "ffmpeg/avframe-queue.hpp"
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+
+namespace obsffmpeg {
+	namespace encoder {
+		class prores_aw : base {
+			enum class profile {
+				Auto        = FF_PROFILE_UNKNOWN,
+				Proxy       = 0 /*FF_PROFILE_PRORES_PROXY*/,
+				Light       = 1 /*FF_PROFILE_PRORES_LT*/,
+				Standard    = 2 /*FF_PROFILE_PRORES_STANDARD*/,
+				HighQuality = 3 /*FF_PROFILE_PRORES_HQ*/,
+				FourFourFourFour =
+				    4 /*FF_PROFILE_PRORES_4444*/ // Automatically set if I444 or RGB input.
+			};
+
+			private:
+			profile               video_profile = profile::Auto;
+			ffmpeg::avframe_queue frame_queue;
+			ffmpeg::avframe_queue frame_queue_used;
+			AVPacket*             current_packet = nullptr;
+
+			public:
+			prores_aw(obs_data_t* settings, obs_encoder_t* encoder);
+
+			~prores_aw();
+
+			virtual void get_properties(obs_properties_t* props) override;
+
+			virtual bool update(obs_data_t* settings) override;
+
+			virtual bool get_extra_data(uint8_t** extra_data, size_t* size) override;
+
+			virtual bool get_sei_data(uint8_t** sei_data, size_t* size) override;
+
+			virtual void get_video_info(video_scale_info* info) override;
+
+			virtual bool encode(encoder_frame* frame, encoder_packet* packet,
+			                    bool* received_packet) override;
+
+			public:
+			static void initialize();
+
+			static void finalize();
+
+			static void get_defaults(obs_data_t* settings);
+
+			static obs_properties_t* get_properties();
+		};
+	} // namespace encoder
+} // namespace obsffmpeg

source/ffmpeg/avframe-queue.cpp

@@ -1,38 +1,32 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "avframe-queue.hpp"
 #include "tools.hpp"
 
 std::shared_ptr<AVFrame> ffmpeg::avframe_queue::create_frame()
 {
-	std::shared_ptr<AVFrame> frame = std::shared_ptr<AVFrame>(av_frame_alloc(), [](AVFrame* frame) {
+	std::shared_ptr<AVFrame> frame =
-		av_frame_unref(frame);
+	    std::shared_ptr<AVFrame>(av_frame_alloc(), [](AVFrame* frame) { av_frame_free(&frame); });
-		av_frame_free(&frame);
+	frame->width  = this->resolution.first;
-	});
+	frame->height = this->resolution.second;
-	frame->width                   = this->resolution.first;
+	frame->format = this->format;
-	frame->height                  = this->resolution.second;
-	frame->format                  = this->format;
 
-	int res = av_frame_get_buffer(frame.get(), 32);
+	int res = av_frame_get_buffer(frame.get(), 0);
 	if (res < 0) {
 		throw std::exception(ffmpeg::tools::get_error_description(res));
 	}
@@ -47,7 +41,7 @@ ffmpeg::avframe_queue::~avframe_queue()
 	clear();
 }
 
-void ffmpeg::avframe_queue::set_resolution(uint32_t const width, uint32_t const height)
+void ffmpeg::avframe_queue::set_resolution(uint32_t width, uint32_t height)
 {
 	this->resolution.first  = width;
 	this->resolution.second = height;
@@ -69,7 +63,7 @@ uint32_t ffmpeg::avframe_queue::get_height()
 	return this->resolution.second;
 }
 
-void ffmpeg::avframe_queue::set_pixel_format(AVPixelFormat const format)
+void ffmpeg::avframe_queue::set_pixel_format(AVPixelFormat format)
 {
 	this->format = format;
 }
@@ -92,7 +86,7 @@ void ffmpeg::avframe_queue::clear()
 	frames.clear();
 }
 
-void ffmpeg::avframe_queue::push(std::shared_ptr<AVFrame> const frame)
+void ffmpeg::avframe_queue::push(std::shared_ptr<AVFrame> frame)
 {
 	std::unique_lock<std::mutex> ulock(this->lock);
 	frames.push_back(frame);
@@ -111,8 +105,7 @@ std::shared_ptr<AVFrame> ffmpeg::avframe_queue::pop()
 				ret = create_frame();
 			} else {
 				frames.pop_front();
-				if ((static_cast<uint32_t>(ret->width) != this->resolution.first)
+				if ((ret->width != this->resolution.first) || (ret->height != this->resolution.second)
-				    || (static_cast<uint32_t>(ret->height) != this->resolution.second)
 				    || (ret->format != this->format)) {
 					ret = nullptr;
 				}

source/ffmpeg/avframe-queue.hpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 #include <deque>

source/ffmpeg/swscale.cpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "swscale.hpp"
 #include <stdexcept>
@@ -176,8 +172,8 @@ bool ffmpeg::swscale::initialize(int flags)
 	}
 
 	sws_setColorspaceDetails(this->context, sws_getCoefficients(source_colorspace), source_full_range ? 1 : 0,
-	                         sws_getCoefficients(target_colorspace), target_full_range ? 1 : 0, 1L << 16 | 0L,
+	                         sws_getCoefficients(target_colorspace), target_full_range ? 1 : 0, 1l << 16 | 0l,
-	                         1L << 16 | 0L, 1L << 16 | 0L);
+	                         1l << 16 | 0l, 1l << 16 | 0l);
 
 	return true;
 }

source/ffmpeg/swscale.hpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #ifndef OBS_FFMPEG_FFMPEG_SWSCALE
 #define OBS_FFMPEG_FFMPEG_SWSCALE

source/ffmpeg/tools.cpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "tools.hpp"
 #include <sstream>
@@ -40,22 +36,31 @@ std::string ffmpeg::tools::translate_encoder_capabilities(int capabilities)
 
 	    // Quality
 	    {AV_CODEC_CAP_LOSSLESS, "Lossless"},
+	    {AV_CODEC_CAP_INTRA_ONLY, "I-Frames only"},
+
+	    // Threading
+	    {AV_CODEC_CAP_FRAME_THREADS, "Frame-Threading"},
+	    {AV_CODEC_CAP_SLICE_THREADS, "Slice-Threading"},
+	    {AV_CODEC_CAP_AUTO_THREADS, "Automatic-Threading"},
 
 	    // Features
 	    {AV_CODEC_CAP_PARAM_CHANGE, "Dynamic Parameter Change"},
 	    {AV_CODEC_CAP_SUBFRAMES, "Sub-Frames"},
 	    {AV_CODEC_CAP_VARIABLE_FRAME_SIZE, "Variable Frame Size"},
 	    {AV_CODEC_CAP_SMALL_LAST_FRAME, "Small Final Frame"},
+	    //{AV_CODEC_CAP_DR1, "Uses get_buffer"},
+	    {AV_CODEC_CAP_DELAY, "Requires Flush"},
 
 	    // Other
 	    {AV_CODEC_CAP_TRUNCATED, "Truncated"},
 	    {AV_CODEC_CAP_CHANNEL_CONF, "AV_CODEC_CAP_CHANNEL_CONF"},
 	    {AV_CODEC_CAP_DRAW_HORIZ_BAND, "AV_CODEC_CAP_DRAW_HORIZ_BAND"},
+	    {AV_CODEC_CAP_HWACCEL_VDPAU, "AV_CODEC_CAP_HWACCEL_VDPAU"},
 	    {AV_CODEC_CAP_AVOID_PROBING, "AV_CODEC_CAP_AVOID_PROBING"},
 	};
 
 	std::stringstream sstr;
-	for (auto const kv : caps) {
+	for (auto kv : caps) {
 		if (capabilities & kv.first) {
 			capabilities &= ~kv.first;
 			sstr << kv.second;
@@ -164,7 +169,7 @@ AVPixelFormat ffmpeg::tools::obs_videoformat_to_avpixelformat(video_format v)
 	switch (v) {
 		// 32-Bits
 	case VIDEO_FORMAT_BGRX:
-		return AV_PIX_FMT_BGR0;
+		return AV_PIX_FMT_BGRA;
 	case VIDEO_FORMAT_BGRA:
 		return AV_PIX_FMT_BGRA;
 	case VIDEO_FORMAT_RGBA:
@@ -185,33 +190,6 @@ AVPixelFormat ffmpeg::tools::obs_videoformat_to_avpixelformat(video_format v)
 	throw std::invalid_argument("unknown format");
 }
 
-video_format ffmpeg::tools::avpixelformat_to_obs_videoformat(AVPixelFormat v)
-{
-	switch (v) {
-	case AV_PIX_FMT_YUV420P:
-		return VIDEO_FORMAT_I420;
-	case AV_PIX_FMT_NV12:
-		return VIDEO_FORMAT_NV12;
-	case AV_PIX_FMT_YVYU422:
-		return VIDEO_FORMAT_YVYU;
-	case AV_PIX_FMT_YUYV422:
-		return VIDEO_FORMAT_YUY2;
-	case AV_PIX_FMT_UYVY422:
-		return VIDEO_FORMAT_UYVY;
-	case AV_PIX_FMT_RGBA:
-		return VIDEO_FORMAT_RGBA;
-	case AV_PIX_FMT_BGRA:
-		return VIDEO_FORMAT_BGRA;
-	case AV_PIX_FMT_BGR0:
-		return VIDEO_FORMAT_BGRX;
-	case AV_PIX_FMT_GRAY8:
-		return VIDEO_FORMAT_Y800;
-	case AV_PIX_FMT_YUV444P:
-		return VIDEO_FORMAT_I444;
-	}
-	return VIDEO_FORMAT_NONE;
-}
-
 AVColorSpace ffmpeg::tools::obs_videocolorspace_to_avcolorspace(video_colorspace v)
 {
 	switch (v) {
@@ -219,7 +197,7 @@ AVColorSpace ffmpeg::tools::obs_videocolorspace_to_avcolorspace(video_colorspace
 	case VIDEO_CS_709:
 		return AVCOL_SPC_BT709;
 	case VIDEO_CS_601:
-		return AVCOL_SPC_BT470BG;
+		return AVCOL_SPC_SMPTE170M;
 	}
 	throw std::invalid_argument("unknown color space");
 }

source/ffmpeg/tools.hpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #ifndef OBS_FFMPEG_FFMPEG_UTILITY
 #define OBS_FFMPEG_FFMPEG_UTILITY
@@ -42,8 +38,6 @@ namespace ffmpeg {
 
 		AVPixelFormat obs_videoformat_to_avpixelformat(video_format v);
 
-		video_format avpixelformat_to_obs_videoformat(AVPixelFormat v);
-
 		AVColorSpace obs_videocolorspace_to_avcolorspace(video_colorspace v);
 
 		AVColorRange obs_videorangetype_to_avcolorrange(video_range_type v);

source/plugin.cpp

@@ -1,28 +1,24 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "plugin.hpp"
-#include <map>
 #include <memory>
-#include "encoder.hpp"
+#include "encoders/generic.hpp"
+#include "encoders/prores_aw.hpp"
 #include "ui/debug_handler.hpp"
 #include "ui/handler.hpp"
 #include "utility.hpp"
@@ -45,12 +41,12 @@ std::list<std::function<void()>> obsffmpeg::finalizers;
 static std::map<std::string, std::shared_ptr<obsffmpeg::ui::handler>> codec_to_handler_map;
 static std::shared_ptr<obsffmpeg::ui::handler> debug_handler = std::make_shared<obsffmpeg::ui::debug_handler>();
 
-void obsffmpeg::register_codec_handler(std::string const codec, std::shared_ptr<obsffmpeg::ui::handler> const handler)
+void obsffmpeg::register_codec_handler(std::string codec, std::shared_ptr<obsffmpeg::ui::handler> handler)
 {
 	codec_to_handler_map.emplace(codec, handler);
 }
 
-std::shared_ptr<obsffmpeg::ui::handler> obsffmpeg::find_codec_handler(std::string const codec)
+std::shared_ptr<obsffmpeg::ui::handler> obsffmpeg::find_codec_handler(std::string codec)
 {
 	auto found = codec_to_handler_map.find(codec);
 	if (found == codec_to_handler_map.end())
@@ -58,83 +54,50 @@ std::shared_ptr<obsffmpeg::ui::handler> obsffmpeg::find_codec_handler(std::strin
 	return found->second;
 }
 
-bool obsffmpeg::has_codec_handler(std::string const codec)
+static std::map<AVCodec*, std::shared_ptr<encoder::generic_factory>> generic_factories;
-{
-	auto found = codec_to_handler_map.find(codec);
-	return (found != codec_to_handler_map.end());
-}
 
-static std::map<const AVCodec*, std::shared_ptr<obsffmpeg::encoder_factory>> generic_factories;
-
-#pragma warning(push)
-#pragma warning(disable : 4996) // Handled by software and precompiler branch
 MODULE_EXPORT bool obs_module_load(void)
 try {
-#if FF_API_NEXT
+	// Initialize avcodec.
-	if (avcodec_version() < AV_VERSION_INT(58, 0, 0)) {
+	avcodec_register_all();
-		// Initialize avcodec.
-		avcodec_register_all();
-	}
-#endif
 
 	// Run all initializers.
-	for (auto const func : obsffmpeg::initializers) {
+	for (auto func : obsffmpeg::initializers) {
 		func();
 	}
 
 	// Register all codecs.
-#if FF_API_NEXT
+	AVCodec* cdc = nullptr;
-	if (avcodec_version() < AV_VERSION_INT(58, 0, 0)) {
+	while ((cdc = av_codec_next(cdc)) != nullptr) {
-		AVCodec* cdc = nullptr;
+		if (!av_codec_is_encoder(cdc))
-		while ((cdc = av_codec_next(cdc)) != nullptr) {
+			continue;
-			if (!av_codec_is_encoder(cdc))
-				continue;
 
-			if ((cdc->type == AVMediaType::AVMEDIA_TYPE_AUDIO)
+		if ((cdc->type == AVMediaType::AVMEDIA_TYPE_AUDIO) || (cdc->type == AVMediaType::AVMEDIA_TYPE_VIDEO)) {
-			    || (cdc->type == AVMediaType::AVMEDIA_TYPE_VIDEO)) {
+			auto ptr = std::make_shared<encoder::generic_factory>(cdc);
-				auto ptr = std::make_shared<obsffmpeg::encoder_factory>(cdc);
+			ptr->register_encoder();
-				ptr->register_encoder();
+			generic_factories.emplace(cdc, ptr);
-				generic_factories.emplace(cdc, ptr);
-			}
 		}
-	} else {
-#endif
-#if LIBAVCODEC_VERSION_MAJOR >= 58
-		void*          storage = nullptr;
-		const AVCodec* cdc     = nullptr;
-		for (cdc = av_codec_iterate(&storage); cdc != nullptr; cdc = av_codec_iterate(&storage)) {
-			if (!av_codec_is_encoder(cdc))
-				continue;
-
-			if ((cdc->type == AVMediaType::AVMEDIA_TYPE_AUDIO)
-			    || (cdc->type == AVMediaType::AVMEDIA_TYPE_VIDEO)) {
-				auto ptr = std::make_shared<obsffmpeg::encoder_factory>(cdc);
-				ptr->register_encoder();
-				generic_factories.emplace(cdc, ptr);
-			}
-		}
-#endif
-#if FF_API_NEXT
 	}
-#endif
 
+	obsffmpeg::encoder::prores_aw::initialize();
 	return true;
-} catch (std::exception& ex) {
+} catch (std::exception ex) {
 	PLOG_ERROR("Exception during initalization: %s.", ex.what());
 	return false;
 } catch (...) {
 	PLOG_ERROR("Unrecognized exception during initalization.");
 	return false;
 }
-#pragma warning(pop)
 
 MODULE_EXPORT void obs_module_unload(void)
 try {
+	obsffmpeg::encoder::prores_aw::finalize();
+
 	// Run all finalizers.
-	for (auto const func : obsffmpeg::finalizers) {
+	for (auto func : obsffmpeg::finalizers) {
 		func();
 	}
-} catch (std::exception& ex) {
+} catch (std::exception ex) {
 	PLOG_ERROR("Exception during finalizing: %s.", ex.what());
 } catch (...) {
 	PLOG_ERROR("Unrecognized exception during finalizing.");

source/plugin.hpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 #include <functional>
@@ -35,8 +31,6 @@ namespace obsffmpeg {
 
 	std::shared_ptr<obsffmpeg::ui::handler> find_codec_handler(std::string codec);
 
-	bool has_codec_handler(std::string codec);
-
 } // namespace obsffmpeg
 
 MODULE_EXPORT bool obs_module_load(void);

source/strings.hpp

@@ -1,53 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 #include "utility.hpp"
-
-#define S_STATE_DEFAULT "State.Default"
-#define S_STATE_DISABLED "State.Disabled"
-#define S_STATE_ENABLED "State.Enabled"
-#define S_STATE_AUTOMATIC "State.Automatic"
-#define S_STATE_MANUAL "State.Manual"
-
-#define S_RATECONTROL "RateControl"
-#define S_RATECONTROL_MODE "RateControl.Mode"
-#define S_RATECONTROL_MODE_(x) "RateControl.Mode." D_VSTR(x)
-#define S_RATECONTROL_BITRATE_TARGET "RateControl.Bitrate.Target"
-#define S_RATECONTROL_BITRATE_MINIMUM "RateControl.Bitrate.Minimum"
-#define S_RATECONTROL_BITRATE_MAXIMUM "RateControl.Bitrate.Maximum"
-#define S_RATECONTROL_BUFFERSIZE "RateControl.BufferSize"
-#define S_RATECONTROL_QUALITY_TARGET "RateControl.Quality.Target"
-#define S_RATECONTROL_QUALITY_MINIMUM "RateControl.Quality.Minimum"
-#define S_RATECONTROL_QUALITY_MAXIMUM "RateControl.Quality.Maximum"
-#define S_RATECONTROL_QP_I "RateControl.QP.I"
-#define S_RATECONTROL_QP_P "RateControl.QP.P"
-#define S_RATECONTROL_QP_B "RateControl.QP.B"
-#define S_RATECONTROL_QP_I_INITIAL "RateControl.QP.I.Initial"
-#define S_RATECONTROL_QP_P_INITIAL "RateControl.QP.P.Initial"
-#define S_RATECONTROL_QP_B_INITIAL "RateControl.QP.B.Initial"
-
-#define S_KEYFRAMES "KeyFrames"
-#define S_KEYFRAMES_INTERVALTYPE "KeyFrames.IntervalType"
-#define S_KEYFRAMES_INTERVALTYPE_(x) "KeyFrames.IntervalType." D_VSTR(x)
-#define S_KEYFRAMES_INTERVAL "KeyFrames.Interval"
-#define S_KEYFRAMES_INTERVAL_SECONDS "KeyFrames.Interval.Seconds"
-#define S_KEYFRAMES_INTERVAL_FRAMES "KeyFrames.Interval.Frames"

source/ui/debug_handler.cpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "debug_handler.hpp"
 #include <map>
@@ -35,7 +31,7 @@ extern "C" {
 #pragma warning(pop)
 }
 
-void obsffmpeg::ui::debug_handler::get_defaults(obs_data_t*, const AVCodec*, AVCodecContext*) {}
+void obsffmpeg::ui::debug_handler::get_defaults(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) {}
 
 template<typename T>
 std::string to_string(T value){};
@@ -64,16 +60,14 @@ std::string to_string(double_t value)
 	return std::string(buf.data(), buf.data() + buf.size());
 }
 
-void obsffmpeg::ui::debug_handler::get_properties(obs_properties_t*, const AVCodec* codec, AVCodecContext* context)
+void obsffmpeg::ui::debug_handler::get_properties(obs_properties_t* props, AVCodec* codec, AVCodecContext* context)
 {
 	if (context)
 		return;
 
 	AVCodecContext* ctx = avcodec_alloc_context3(codec);
-	if (!ctx->priv_data) {
+	if (!ctx->priv_data)
-		avcodec_free_context(&ctx);
 		return;
-	}
 
 	PLOG_INFO("Options for '%s':", codec->name);
 
@@ -206,4 +200,4 @@ void obsffmpeg::ui::debug_handler::get_properties(obs_properties_t*, const AVCod
 	}
 }
 
-void obsffmpeg::ui::debug_handler::update(obs_data_t*, const AVCodec*, AVCodecContext*) {}
+void obsffmpeg::ui::debug_handler::update(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) {}

source/ui/debug_handler.hpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 #include "handler.hpp"
@@ -26,14 +22,13 @@ namespace obsffmpeg {
 	namespace ui {
 		class debug_handler : public handler {
 			public:
-			virtual void get_defaults(obs_data_t* settings, const AVCodec* codec,
+			virtual void get_defaults(obs_data_t* settings, AVCodec* codec,
 			                          AVCodecContext* context) override;
 
-			virtual void get_properties(obs_properties_t* props, const AVCodec* codec,
+			virtual void get_properties(obs_properties_t* props, AVCodec* codec,
 			                            AVCodecContext* context) override;
 
-			virtual void update(obs_data_t* settings, const AVCodec* codec,
+			virtual void update(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) override;
-			                    AVCodecContext* context) override;
 		};
 	} // namespace ui
 } // namespace obsffmpeg

source/ui/handler.cpp

@@ -1,24 +1,18 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "handler.hpp"
-
-void obsffmpeg::ui::handler::override_visible_name(const AVCodec*, std::string&) {}

source/ui/handler.hpp

@@ -1,30 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 
-#include <string>
-
 extern "C" {
-#include <obs-data.h>
 #include <obs-properties.h>
 #pragma warning(push)
 #pragma warning(disable : 4244)
@@ -36,15 +29,12 @@ namespace obsffmpeg {
 	namespace ui {
 		class handler {
 			public:
-			virtual void override_visible_name(const AVCodec* codec, std::string& name);
+			virtual void get_defaults(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) = 0;
 
-			virtual void get_defaults(obs_data_t* settings, const AVCodec* codec,
+			virtual void get_properties(obs_properties_t* props, AVCodec* codec,
-			                          AVCodecContext* context) = 0;
-
-			virtual void get_properties(obs_properties_t* props, const AVCodec* codec,
 			                            AVCodecContext* context) = 0;
 
-			virtual void update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* context) = 0;
+			virtual void update(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) = 0;
 		};
 	} // namespace ui
 } // namespace obsffmpeg

source/ui/libvpx_vp9_handler.cpp

@@ -0,0 +1,434 @@
+// FFMPEG Video Encoder Integration for OBS Studio
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+#include "libvpx_vp9_handler.hpp"
+#include "plugin.hpp"
+#include "strings.hpp"
+#include "utility.hpp"
+
+extern "C" {
+#include <obs-module.h>
+#pragma warning(push)
+#pragma warning(disable : 4244)
+#include <libavutil/opt.h>
+#pragma warning(pop)
+}
+
+/*
+[obs-ffmpeg-encoder] Options for 'libvpx-vp9':
+[obs-ffmpeg-encoder]   Option 'auto-alt-ref' with help 'Enable use of alternate reference frames (2-pass only)' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2.000000'.
+[obs-ffmpeg-encoder]   Option 'lag-in-frames' with help 'Number of frames to look ahead for alternate reference frame selection' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'arnr-maxframes' with help 'altref noise reduction max frame count' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'arnr-strength' with help 'altref noise reduction filter strength' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'arnr-type' with unit (arnr_type) with help 'altref noise reduction filter type' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   [arnr_type] Flag 'backward' and help text '(null)' with value '1'.
+[obs-ffmpeg-encoder]   [arnr_type] Flag 'forward' and help text '(null)' with value '2'.
+[obs-ffmpeg-encoder]   [arnr_type] Flag 'centered' and help text '(null)' with value '3'.
+[obs-ffmpeg-encoder]   Option 'tune' with unit (tune) with help 'Tune the encoding to a specific scenario' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   [tune] Constant 'psnr' and help text '(null)' with value '0'.
+[obs-ffmpeg-encoder]   [tune] Constant 'ssim' and help text '(null)' with value '1'.
+[obs-ffmpeg-encoder]   Option 'deadline' with unit (quality) with help 'Time to spend encoding, in microseconds.' of type 'Int' with default value '1000000', minimum '-2147483648.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   [quality] Flag 'best' and help text '(null)' with value '0'.
+[obs-ffmpeg-encoder]   [quality] Flag 'good' and help text '(null)' with value 'F4240'.
+[obs-ffmpeg-encoder]   [quality] Flag 'realtime' and help text '(null)' with value '1'.
+[obs-ffmpeg-encoder]   Option 'error-resilient' with unit (er) with help 'Error resilience configuration' of type 'Flags' with default value '0', minimum '-2147483648.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'max-intra-rate' with help 'Maximum I-frame bitrate (pct) 0=unlimited' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   [er] Flag 'default' and help text 'Improve resiliency against losses of whole frames' with value '1'.
+[obs-ffmpeg-encoder]   [er] Flag 'partitions' and help text 'The frame partitions are independently decodable by the bool decoder, meaning that partitions can be decoded even though earlier partitions have been lost. Note that intra predicition is still done over the partition boundary.' with value '2'.
+[obs-ffmpeg-encoder]   Option 'crf' with help 'Select the quality for constant quality mode' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '63.000000'.
+[obs-ffmpeg-encoder]   Option 'static-thresh' with help 'A change threshold on blocks below which they will be skipped by the encoder' of type 'Int' with default value '0', minimum '0.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'drop-threshold' with help 'Frame drop threshold' of type 'Int' with default value '0', minimum '-2147483648.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'noise-sensitivity' with help 'Noise sensitivity' of type 'Int' with default value '0', minimum '0.000000' and maximum '4.000000'.
+[obs-ffmpeg-encoder]   Option 'undershoot-pct' with help 'Datarate undershoot (min) target (%)' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '100.000000'.
+[obs-ffmpeg-encoder]   Option 'overshoot-pct' with help 'Datarate overshoot (max) target (%)' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '1000.000000'.
+[obs-ffmpeg-encoder]   Option 'cpu-used' with help 'Quality/Speed ratio modifier' of type 'Int' with default value '1', minimum '-8.000000' and maximum '8.000000'.
+[obs-ffmpeg-encoder]   Option 'lossless' with help 'Lossless mode' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '1.000000'.
+[obs-ffmpeg-encoder]   Option 'tile-columns' with help 'Number of tile columns to use, log2' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '6.000000'.
+[obs-ffmpeg-encoder]   Option 'tile-rows' with help 'Number of tile rows to use, log2' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '2.000000'.
+[obs-ffmpeg-encoder]   Option 'frame-parallel' with help 'Enable frame parallel decodability features' of type 'Bool' with default value 'true', minimum '-1.000000' and maximum '1.000000'.
+[obs-ffmpeg-encoder]   Option 'aq-mode' with unit (aq_mode) with help 'adaptive quantization mode' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '4.000000'.
+[obs-ffmpeg-encoder]   [aq_mode] Flag 'none' and help text 'Aq not used' with value '0'.
+[obs-ffmpeg-encoder]   [aq_mode] Flag 'variance' and help text 'Variance based Aq' with value '1'.
+[obs-ffmpeg-encoder]   [aq_mode] Flag 'complexity' and help text 'Complexity based Aq' with value '2'.
+[obs-ffmpeg-encoder]   [aq_mode] Flag 'cyclic' and help text 'Cyclic Refresh Aq' with value '3'.
+[obs-ffmpeg-encoder]   [aq_mode] Flag 'equator360' and help text '360 video Aq' with value '4'.
+[obs-ffmpeg-encoder]   Option 'level' with help 'Specify level' of type 'Float' with default value '-1.000000', minimum '-1.000000' and maximum '6.200000'.
+[obs-ffmpeg-encoder]   Option 'row-mt' with help 'Row based multi-threading' of type 'Bool' with default value 'true', minimum '-1.000000' and maximum '1.000000'.
+[obs-ffmpeg-encoder]   Option 'speed' with help '' of type 'Int' with default value '1', minimum '-16.000000' and maximum '16.000000'.
+[obs-ffmpeg-encoder]   Option 'quality' with unit (quality) with help '' of type 'Int' with default value '1000000', minimum '-2147483648.000000' and maximum '2147483647.000000'.
+[obs-ffmpeg-encoder]   Option 'vp8flags' with unit (flags) with help '' of type 'Flags' with default value '0', minimum '0.000000' and maximum '4294967295.000000'.
+[obs-ffmpeg-encoder]   [flags] Flag 'error_resilient' and help text 'enable error resilience' with value '1'.
+[obs-ffmpeg-encoder]   [flags] Flag 'altref' and help text 'enable use of alternate reference frames (VP8/2-pass only)' with value '2'.
+[obs-ffmpeg-encoder]   Option 'arnr_max_frames' with help 'altref noise reduction max frame count' of type 'Int' with default value '0', minimum '0.000000' and maximum '15.000000'.
+[obs-ffmpeg-encoder]   Option 'arnr_strength' with help 'altref noise reduction filter strength' of type 'Int' with default value '3', minimum '0.000000' and maximum '6.000000'.
+[obs-ffmpeg-encoder]   Option 'arnr_type' with help 'altref noise reduction filter type' of type 'Int' with default value '3', minimum '1.000000' and maximum '3.000000'.
+[obs-ffmpeg-encoder]   Option 'rc_lookahead' with help 'Number of frames to look ahead for alternate reference frame selection' of type 'Int' with default value '25', minimum '0.000000' and maximum '25.000000'.
+*/
+
+INITIALIZER(libvpx_vp9_handler_init)
+{
+	obsffmpeg::initializers.push_back([]() {
+		obsffmpeg::register_codec_handler("libvpx-vp9", std::make_shared<obsffmpeg::ui::libvpx_vp9_handler>());
+	});
+};
+
+#define P_RATECONTROL "VP9.RateControl"
+#define P_RATECONTROL_MODE "VP9.RateControl.Mode"
+#define P_RATECONTROL_MODE_(x) "VP9.RateControl.Mode." D_VSTR(x)
+#define P_RATECONTROL_QUALITY "VP9.RateControl.Quality"
+#define P_RATECONTROL_BITRATE_TARGET "VP9.RateControl.Bitrate.Target"
+#define P_RATECONTROL_BITRATE_MINIMUM "VP9.RateControl.Bitrate.Minimum"
+#define P_RATECONTROL_BITRATE_MAXIMUM "VP9.RateControl.Bitrate.Maximum"
+#define P_RATECONTROL_BUFFERSIZE "VP9.RateControl.BufferSize"
+
+#define P_KEYFRAMES "VP9.KeyFrames"
+#define P_KEYFRAMES_INTERVALTYPE "VP9.KeyFrames.IntervalType"
+#define P_KEYFRAMES_INTERVALTYPE_(x) "VP9.KeyFrames.IntervalType." D_VSTR(x)
+#define P_KEYFRAMES_INTERVAL "VP9.KeyFrames.Interval"
+#define P_KEYFRAMES_INTERVAL_SECONDS "VP9.KeyFrames.Interval.Seconds"
+#define P_KEYFRAMES_INTERVAL_FRAMES "VP9.KeyFrames.Interval.Frames"
+
+#define P_PERFORMANCE "VP9.Performance"
+#define P_PERFORMANCE_QUALITYSPEEDRATIO P_PERFORMANCE ".QualitySpeedRatio"
+#define P_PERFORMANCE_DEADLINE P_PERFORMANCE ".Deadline"
+#define P_PERFORMANCE_TILING P_PERFORMANCE ".Tiling"
+#define P_PERFORMANCE_TILING_ROWS P_PERFORMANCE_TILING ".Rows"
+#define P_PERFORMANCE_TILING_COLUMNS P_PERFORMANCE_TILING ".Columns"
+
+#define S_RATECONTROL_MODE_CBR "CBR"
+#define S_RATECONTROL_MODE_ABR "ABR"
+#define S_RATECONTROL_MODE_VBR "VBR"
+#define S_RATECONTROL_MODE_CQ "CQ"
+#define S_RATECONTROL_MODE_VQ "VQ"
+#define S_RATECONTROL_MODE_LL "LL"
+
+std::pair<std::string, std::string> rc_modes[] = {
+
+    // CBR defines bitrate, minrate, maxrate, buffersize. Min and maxrate are bitrate.
+    {S_RATECONTROL_MODE_CBR, P_RATECONTROL_MODE_(ConstantBitrate)},
+    // ABR defines bitrate
+    {S_RATECONTROL_MODE_ABR, P_RATECONTROL_MODE_(AverageBitrate)},
+    // VBR defines bitrate, minrate, maxrate (and buffersize?)
+    {S_RATECONTROL_MODE_VBR, P_RATECONTROL_MODE_(VariableBitrate)},
+    // CQ defines "crf" and sets bitrate to 0.
+    {S_RATECONTROL_MODE_CQ, P_RATECONTROL_MODE_(ConstantQuality)},
+    // VQ defines "crf" and non-zero bitrate maximum.
+    {S_RATECONTROL_MODE_VQ, P_RATECONTROL_MODE_(VariableQuality)},
+    // Lossless defines nothing but lossless.
+    {S_RATECONTROL_MODE_LL, P_RATECONTROL_MODE_(Lossless)},
+};
+
+void obsffmpeg::ui::libvpx_vp9_handler::get_defaults(obs_data_t* settings, AVCodec*, AVCodecContext*)
+{
+	obs_data_set_default_string(settings, P_RATECONTROL_MODE, S_RATECONTROL_MODE_CBR);
+	obs_data_set_default_int(settings, P_RATECONTROL_QUALITY, 23);
+	obs_data_set_default_int(settings, P_RATECONTROL_BITRATE_TARGET, 2500);
+	obs_data_set_default_int(settings, P_RATECONTROL_BITRATE_MINIMUM, 2500);
+	obs_data_set_default_int(settings, P_RATECONTROL_BITRATE_MAXIMUM, 2500);
+	obs_data_set_default_int(settings, P_RATECONTROL_BUFFERSIZE, 5000);
+
+	obs_data_set_default_int(settings, P_KEYFRAMES_INTERVALTYPE, 0);
+	obs_data_set_default_double(settings, P_KEYFRAMES_INTERVAL_SECONDS, 2.0);
+	obs_data_set_default_int(settings, P_KEYFRAMES_INTERVAL_FRAMES, 300);
+
+	obs_data_set_default_int(settings, P_PERFORMANCE_QUALITYSPEEDRATIO, 1);
+	obs_data_set_default_double(settings, P_PERFORMANCE_DEADLINE, 100.0);
+	obs_data_set_default_bool(settings, P_PERFORMANCE_TILING, false);
+	obs_data_set_default_int(settings, P_PERFORMANCE_TILING_COLUMNS, -1);
+	obs_data_set_default_int(settings, P_PERFORMANCE_TILING_ROWS, -1);
+}
+
+void obsffmpeg::ui::libvpx_vp9_handler::get_properties_codec(obs_properties_t* props, AVCodec* codec)
+{
+	{
+		auto grp = obs_properties_create();
+		{
+			auto p = obs_properties_add_list(grp, P_RATECONTROL_MODE, TRANSLATE(P_RATECONTROL_MODE),
+			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_MODE)));
+			obs_property_set_modified_callback(p, modified_ratecontrol);
+			for (auto kv : rc_modes) {
+				obs_property_list_add_string(p, TRANSLATE(kv.second.c_str()), kv.first.c_str());
+			}
+		}
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QUALITY,
+			                                       TRANSLATE(P_RATECONTROL_QUALITY), 0, 63, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QUALITY)));
+		}
+		{
+			auto p = obs_properties_add_int(grp, P_RATECONTROL_BITRATE_TARGET,
+			                                TRANSLATE(P_RATECONTROL_BITRATE_TARGET), 1,
+			                                std::numeric_limits<int32_t>::max(), 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_BITRATE_TARGET)));
+		}
+		{
+			auto p = obs_properties_add_int(grp, P_RATECONTROL_BITRATE_MINIMUM,
+			                                TRANSLATE(P_RATECONTROL_BITRATE_MINIMUM), 0,
+			                                std::numeric_limits<int32_t>::max(), 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_BITRATE_MINIMUM)));
+		}
+		{
+			auto p = obs_properties_add_int(grp, P_RATECONTROL_BITRATE_MAXIMUM,
+			                                TRANSLATE(P_RATECONTROL_BITRATE_MAXIMUM), 0,
+			                                std::numeric_limits<int32_t>::max(), 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_BITRATE_MAXIMUM)));
+		}
+		{
+			auto p =
+			    obs_properties_add_int(grp, P_RATECONTROL_BUFFERSIZE, TRANSLATE(P_RATECONTROL_BUFFERSIZE),
+			                           0, std::numeric_limits<int32_t>::max(), 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_BUFFERSIZE)));
+		}
+
+		obs_properties_add_group(props, P_RATECONTROL, TRANSLATE(P_RATECONTROL), OBS_GROUP_NORMAL, grp);
+	}
+	{
+		auto grp = obs_properties_create();
+		{
+			auto p =
+			    obs_properties_add_list(grp, P_KEYFRAMES_INTERVALTYPE, TRANSLATE(P_KEYFRAMES_INTERVALTYPE),
+			                            OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_KEYFRAMES_INTERVALTYPE)));
+			obs_property_set_modified_callback(p, &modified_keyframes);
+			obs_property_list_add_int(p, TRANSLATE(P_KEYFRAMES_INTERVALTYPE_(Seconds)), 0);
+			obs_property_list_add_int(p, TRANSLATE(P_KEYFRAMES_INTERVALTYPE_(Frames)), 1);
+		}
+		{
+			auto p =
+			    obs_properties_add_float(grp, P_KEYFRAMES_INTERVAL_SECONDS, TRANSLATE(P_KEYFRAMES_INTERVAL),
+			                             0.00, std::numeric_limits<int16_t>::max(), 0.01);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_KEYFRAMES_INTERVAL)));
+		}
+		{
+			auto p =
+			    obs_properties_add_int(grp, P_KEYFRAMES_INTERVAL_FRAMES, TRANSLATE(P_KEYFRAMES_INTERVAL), 0,
+			                           std::numeric_limits<int32_t>::max(), 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_KEYFRAMES_INTERVAL)));
+		}
+
+		obs_properties_add_group(props, P_KEYFRAMES, TRANSLATE(P_KEYFRAMES), OBS_GROUP_NORMAL, grp);
+	}
+	{
+		auto grp = obs_properties_create();
+		{
+			auto p = obs_properties_add_int_slider(grp, P_PERFORMANCE_QUALITYSPEEDRATIO,
+			                                       TRANSLATE(P_PERFORMANCE_QUALITYSPEEDRATIO), -16, 16, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_PERFORMANCE_QUALITYSPEEDRATIO)));
+		}
+		{
+			auto p = obs_properties_add_float_slider(grp, P_PERFORMANCE_DEADLINE,
+			                                         TRANSLATE(P_PERFORMANCE_DEADLINE), 0.0, 1000.0, 0.01);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_PERFORMANCE_DEADLINE)));
+		}
+		{
+			auto grp2 = obs_properties_create();
+			{
+				auto p =
+				    obs_properties_add_int_slider(grp2, P_PERFORMANCE_TILING_COLUMNS,
+				                                  TRANSLATE(P_PERFORMANCE_TILING_COLUMNS), 0, 6, 1);
+				obs_property_set_long_description(p, TRANSLATE(DESC(P_PERFORMANCE_TILING_COLUMNS)));
+			}
+			{
+				auto p = obs_properties_add_int_slider(grp2, P_PERFORMANCE_TILING_ROWS,
+				                                       TRANSLATE(P_PERFORMANCE_TILING_ROWS), 0, 2, 1);
+				obs_property_set_long_description(p, TRANSLATE(DESC(P_PERFORMANCE_TILING_ROWS)));
+			}
+
+			obs_properties_add_group(grp, P_PERFORMANCE_TILING, TRANSLATE(P_PERFORMANCE_TILING),
+			                         OBS_GROUP_CHECKABLE, grp2);
+		}
+		obs_properties_add_group(props, P_PERFORMANCE, TRANSLATE(P_PERFORMANCE), OBS_GROUP_NORMAL, grp);
+	}
+}
+
+void obsffmpeg::ui::libvpx_vp9_handler::get_properties_encoder(obs_properties_t* props, AVCodec* codec,
+                                                               AVCodecContext* context)
+{
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL), false);
+	obs_property_set_enabled(obs_properties_get(props, P_KEYFRAMES), false);
+	obs_property_set_enabled(obs_properties_get(props, P_PERFORMANCE), false);
+}
+
+void obsffmpeg::ui::libvpx_vp9_handler::get_properties(obs_properties_t* props, AVCodec* codec, AVCodecContext* context)
+{
+	if (!context) {
+		get_properties_codec(props, codec);
+	} else {
+		get_properties_encoder(props, codec, context);
+	}
+}
+
+void obsffmpeg::ui::libvpx_vp9_handler::update(obs_data_t* settings, AVCodec*, AVCodecContext* context)
+{
+	obs_video_info ovi;
+	if (!obs_get_video_info(&ovi)) {
+		throw std::runtime_error("no video info");
+	}
+
+	{ // Rate Control
+		bool        has_quality     = false;
+		bool        has_bitrate     = false;
+		bool        has_bitrate_min = false;
+		bool        has_bitrate_max = false;
+		bool        has_buffer      = false;
+		const char* rc_mode         = obs_data_get_string(settings, P_RATECONTROL_MODE);
+		if (strcmp(rc_mode, S_RATECONTROL_MODE_LL) == 0) {
+		} else if (strcmp(rc_mode, S_RATECONTROL_MODE_CBR) == 0) {
+			has_bitrate = true;
+			has_buffer  = true;
+		} else if (strcmp(rc_mode, S_RATECONTROL_MODE_ABR) == 0) {
+			has_bitrate = true;
+		} else if (strcmp(rc_mode, S_RATECONTROL_MODE_VBR) == 0) {
+			has_bitrate     = true;
+			has_bitrate_max = true;
+			has_bitrate_min = true;
+			has_buffer      = true;
+		} else if (strcmp(rc_mode, S_RATECONTROL_MODE_CQ) == 0) {
+			has_quality = true;
+		} else if (strcmp(rc_mode, S_RATECONTROL_MODE_VQ) == 0) {
+			has_quality     = true;
+			has_bitrate_max = true;
+		}
+
+		if (has_quality) {
+			av_opt_set_int(context->priv_data, "crf", obs_data_get_int(settings, P_RATECONTROL_QUALITY), 0);
+		}
+		if (has_bitrate) {
+			context->bit_rate = static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_BITRATE_TARGET));
+		}
+		if (has_bitrate_min) {
+			context->rc_min_rate =
+			    static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_BITRATE_MINIMUM));
+		}
+		if (has_bitrate_max) {
+			context->rc_max_rate =
+			    static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_BITRATE_MAXIMUM));
+		}
+		if (has_buffer) {
+			context->rc_buffer_size =
+			    static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_BUFFERSIZE));
+		}
+	}
+
+	{ // Key Frames
+		int64_t kf_type    = obs_data_get_int(settings, P_KEYFRAMES_INTERVALTYPE);
+		bool    is_seconds = (kf_type == 0);
+
+		if (is_seconds) {
+			context->gop_size = static_cast<int>(obs_data_get_double(settings, P_KEYFRAMES_INTERVAL_SECONDS)
+			                                     * (ovi.fps_num / ovi.fps_den));
+		} else {
+			context->gop_size = static_cast<int>(obs_data_get_int(settings, P_KEYFRAMES_INTERVAL_FRAMES));
+		}
+		context->keyint_min = context->gop_size;
+	}
+
+	{ // Performance
+		// Row Multithreading is always on.
+		av_opt_set_int(context->priv_data, "row-mt", 1, 0);
+
+		// Quality/Speed Ratio Modifier
+		{
+			int v = static_cast<int>(obs_data_get_int(settings, P_PERFORMANCE_QUALITYSPEEDRATIO));
+			av_opt_set_int(context->priv_data, "cpu-used", v, 0);
+			av_opt_set_int(context->priv_data, "speed", v, 0);
+		}
+
+		{ // Deadline
+			auto deadline_mul = obs_data_get_double(settings, P_PERFORMANCE_DEADLINE) / 100.0;
+			auto frame_ms     = 1000.0 / (ovi.fps_num * ovi.fps_den);
+			int  final_ms     = static_cast<int>(deadline_mul * frame_ms);
+			av_opt_set_int(context->priv_data, "deadline", final_ms, 0);
+		}
+
+		{ // Tiling
+			int columns, rows;
+
+			columns = context->width / 64;
+			if (columns == 0) {
+				columns = -1;
+			} else if (columns > 6) {
+				columns = 6;
+			}
+
+			rows = context->height / 64;
+			if (rows == 0) {
+				rows = -1;
+			} else if (rows > 2) {
+				rows = 2;
+			}
+
+			av_opt_set_int(context->priv_data, "tile-columns", columns, 0);
+			av_opt_set_int(context->priv_data, "tile-rows", rows, 0);
+		}
+	}
+
+	av_opt_set_int(context->priv_data, "lag-in-frames", 0, 0);
+	av_opt_set_int(context->priv_data, "arnr-maxframes", 0, 0);
+	av_opt_set_int(context->priv_data, "aq-mode", 0, 0);
+	av_opt_set_double(context->priv_data, "level", 6.2, 0);
+	av_opt_set_int(context->priv_data, "rc_lookahead", 0, 0);
+}
+
+bool obsffmpeg::ui::libvpx_vp9_handler::modified_ratecontrol(obs_properties_t* props, obs_property_t* property,
+                                                             obs_data_t* settings)
+{
+	bool has_quality     = false;
+	bool has_bitrate     = false;
+	bool has_bitrate_min = false;
+	bool has_bitrate_max = false;
+	bool has_buffer      = false;
+
+	const char* rc_mode = obs_data_get_string(settings, P_RATECONTROL_MODE);
+	if (strcmp(rc_mode, S_RATECONTROL_MODE_LL) == 0) {
+	} else if (strcmp(rc_mode, S_RATECONTROL_MODE_CBR) == 0) {
+		has_bitrate = true;
+		has_buffer  = true;
+	} else if (strcmp(rc_mode, S_RATECONTROL_MODE_ABR) == 0) {
+		has_bitrate = true;
+	} else if (strcmp(rc_mode, S_RATECONTROL_MODE_VBR) == 0) {
+		has_bitrate     = true;
+		has_bitrate_max = true;
+		has_bitrate_min = true;
+		has_buffer      = true;
+	} else if (strcmp(rc_mode, S_RATECONTROL_MODE_CQ) == 0) {
+		has_quality = true;
+	} else if (strcmp(rc_mode, S_RATECONTROL_MODE_VQ) == 0) {
+		has_quality     = true;
+		has_bitrate_max = true;
+	}
+
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QUALITY), has_quality);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_BITRATE_TARGET), has_bitrate);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_BITRATE_MINIMUM), has_bitrate_min);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_BITRATE_MAXIMUM), has_bitrate_max);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_BUFFERSIZE), has_buffer);
+
+	return true;
+}
+
+bool obsffmpeg::ui::libvpx_vp9_handler::modified_keyframes(obs_properties_t* props, obs_property_t* property,
+                                                           obs_data_t* settings)
+{
+	bool is_seconds = obs_data_get_int(settings, P_KEYFRAMES_INTERVALTYPE) == 0;
+
+	obs_property_set_visible(obs_properties_get(props, P_KEYFRAMES_INTERVAL_FRAMES), !is_seconds);
+	obs_property_set_visible(obs_properties_get(props, P_KEYFRAMES_INTERVAL_SECONDS), is_seconds);
+
+	return true;
+}

source/ui/libvpx_vp9_handler.hpp

@@ -0,0 +1,53 @@
+// FFMPEG Video Encoder Integration for OBS Studio
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+#pragma once
+#include "handler.hpp"
+
+extern "C" {
+#include <obs-properties.h>
+#pragma warning(push)
+#pragma warning(disable : 4244)
+#include <libavcodec/avcodec.h>
+#pragma warning(pop)
+}
+
+namespace obsffmpeg {
+	namespace ui {
+		class libvpx_vp9_handler : public handler {
+			public:
+			virtual void get_defaults(obs_data_t* settings, AVCodec* codec,
+			                          AVCodecContext* context) override;
+
+			void get_properties_codec(obs_properties_t* props, AVCodec* codec);
+
+			void get_properties_encoder(obs_properties_t* props, AVCodec* codec, AVCodecContext* context);
+
+			virtual void get_properties(obs_properties_t* props, AVCodec* codec,
+			                            AVCodecContext* context) override;
+
+			virtual void update(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) override;
+
+			public:
+			static bool modified_ratecontrol(obs_properties_t* props, obs_property_t* property,
+			                                 obs_data_t* settings);
+
+			static bool modified_keyframes(obs_properties_t* props, obs_property_t* property,
+			                               obs_data_t* settings);
+		};
+	} // namespace ui
+} // namespace obsffmpeg

source/ui/nvenc_h264_handler.cpp

@@ -1,169 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "nvenc_h264_handler.hpp"
-#include "codecs/h264.hpp"
-#include "nvenc_shared.hpp"
-#include "plugin.hpp"
-#include "strings.hpp"
-#include "utility.hpp"
-
-extern "C" {
-#include <obs-module.h>
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#include <libavutil/opt.h>
-#pragma warning(pop)
-}
-
-/* Missing Options:
-
-Seem to be covered by initQP_* instead.
-- [obs-ffmpeg-encoder]   Option 'cq' with help 'Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control' of type 'Float' with default value '0.000000', minimum '0.000000' and maximum '51.000000'.
-- [obs-ffmpeg-encoder]   Option 'qp' with help 'Constant quantization parameter rate control method' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '51.000000'.
-
-Not sure what there are useful for.
-[obs-ffmpeg-encoder]   Option 'aud' with help 'Use access unit delimiters' of type 'Bool' with default value 'false', minimum '0.000000' and maximum '1.000000'.
-[obs-ffmpeg-encoder]   Option 'surfaces' with help 'Number of concurrent surfaces' of type 'Int' with default value '0', minimum '0.000000' and maximum '64.000000'.
-[obs-ffmpeg-encoder]   Option 'delay' with help 'Delay frame output by the given amount of frames' of type 'Int' with default value '2147483647', minimum '0.000000' and maximum '2147483647.000000'.
-
-Should probably add this.
-[obs-ffmpeg-encoder]   Option 'gpu' with unit (gpu) with help 'Selects which NVENC capable GPU to use. First GPU is 0, second is 1, and so on.' of type 'Int' with default value '-1', minimum '-2.000000' and maximum '2147483647.000000'.
-[obs-ffmpeg-encoder]   [gpu] Constant 'any' and help text 'Pick the first device available' with value '-1'.
-[obs-ffmpeg-encoder]   [gpu] Constant 'list' and help text 'List the available devices' with value '-2'.
-
-Useless except for strict_gop maybe?
-[obs-ffmpeg-encoder]   Option 'forced-idr' with help 'If forcing keyframes, force them as IDR frames.' of type 'Bool' with default value 'false', minimum '-1.000000' and maximum '1.000000'.
-[obs-ffmpeg-encoder]   Option 'strict_gop' with help 'Set 1 to minimize GOP-to-GOP rate fluctuations' of type 'Bool' with default value 'false', minimum '0.000000' and maximum '1.000000'.
-[obs-ffmpeg-encoder]   Option 'bluray-compat' with help 'Bluray compatibility workarounds' of type 'Bool' with default value 'false', minimum '0.000000' and maximum '1.000000'.
-*/
-
-using namespace obsffmpeg::codecs::h264;
-
-std::map<profile, std::string> profiles{
-    {profile::BASELINE, "baseline"},
-    {profile::MAIN, "main"},
-    {profile::HIGH, "high"},
-    {profile::HIGH444_PREDICTIVE, "high444p"},
-};
-
-std::map<level, std::string> levels{
-    {level::L1_0, "1.0"}, {level::L1_0b, "1.0b"}, {level::L1_1, "1.1"}, {level::L1_2, "1.2"}, {level::L1_3, "1.3"},
-    {level::L2_0, "2.0"}, {level::L2_1, "2.1"},   {level::L2_2, "2.2"}, {level::L3_0, "3.0"}, {level::L3_1, "3.1"},
-    {level::L3_2, "3.2"}, {level::L4_0, "4.0"},   {level::L4_1, "4.1"}, {level::L4_2, "4.2"}, {level::L5_0, "5.0"},
-    {level::L5_1, "5.1"}, {level::L5_2, "5.2"},
-};
-
-INITIALIZER(nvenc_h264_handler_init)
-{
-	obsffmpeg::initializers.push_back([]() {
-		obsffmpeg::register_codec_handler("h264_nvenc", std::make_shared<obsffmpeg::ui::nvenc_h264_handler>());
-	});
-};
-
-void obsffmpeg::ui::nvenc_h264_handler::override_visible_name(const AVCodec*, std::string& name)
-{
-	name = "H.264/AVC Encoder (NVidia NVENC)";
-}
-
-void obsffmpeg::ui::nvenc_h264_handler::get_defaults(obs_data_t* settings, const AVCodec* codec,
-                                                     AVCodecContext* context)
-{
-	nvenc::get_defaults(settings, codec, context);
-
-	obs_data_set_default_int(settings, P_H264_PROFILE, static_cast<int64_t>(codecs::h264::profile::HIGH));
-	obs_data_set_default_int(settings, P_H264_LEVEL, static_cast<int64_t>(codecs::h264::level::UNKNOWN));
-}
-
-void obsffmpeg::ui::nvenc_h264_handler::get_properties(obs_properties_t* props, const AVCodec* codec,
-                                                       AVCodecContext* context)
-{
-	if (!context) {
-		this->get_encoder_properties(props, codec);
-	} else {
-		this->get_runtime_properties(props, codec, context);
-	}
-}
-
-void obsffmpeg::ui::nvenc_h264_handler::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* context)
-{
-	nvenc::update(settings, codec, context);
-
-	{
-		auto found =
-		    profiles.find(static_cast<codecs::h264::profile>(obs_data_get_int(settings, P_H264_PROFILE)));
-		if (found != profiles.end()) {
-			av_opt_set(context->priv_data, "profile", found->second.c_str(), 0);
-		}
-	}
-
-	{
-		auto found = levels.find(static_cast<codecs::h264::level>(obs_data_get_int(settings, P_H264_LEVEL)));
-		if (found != levels.end()) {
-			av_opt_set(context->priv_data, "level", found->second.c_str(), 0);
-		} else {
-			av_opt_set(context->priv_data, "level", "auto", 0);
-		}
-	}
-}
-
-void obsffmpeg::ui::nvenc_h264_handler::get_encoder_properties(obs_properties_t* props, const AVCodec* codec)
-{
-	nvenc::get_properties_pre(props, codec);
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp = obs_properties_create();
-			obs_properties_add_group(props, P_H264, TRANSLATE(P_H264), OBS_GROUP_NORMAL, grp);
-		}
-
-		{
-			auto p = obs_properties_add_list(grp, P_H264_PROFILE, TRANSLATE(P_H264_PROFILE),
-			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(P_H264_PROFILE)));
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_DEFAULT),
-			                          static_cast<int64_t>(codecs::h264::profile::UNKNOWN));
-			for (auto const kv : profiles) {
-				std::string trans = std::string(P_H264_PROFILE) + "." + kv.second;
-				obs_property_list_add_int(p, TRANSLATE(trans.c_str()), static_cast<int64_t>(kv.first));
-			}
-		}
-		{
-			auto p = obs_properties_add_list(grp, P_H264_LEVEL, TRANSLATE(P_H264_LEVEL),
-			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(P_H264_LEVEL)));
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_AUTOMATIC),
-			                          static_cast<int64_t>(codecs::h264::level::UNKNOWN));
-			for (auto const kv : levels) {
-				obs_property_list_add_int(p, kv.second.c_str(), static_cast<int64_t>(kv.first));
-			}
-		}
-	}
-
-	nvenc::get_properties_post(props, codec);
-}
-
-void obsffmpeg::ui::nvenc_h264_handler::get_runtime_properties(obs_properties_t* props, const AVCodec* codec,
-                                                               AVCodecContext* context)
-{
-	nvenc::get_runtime_properties(props, codec, context);
-}

source/ui/nvenc_h264_handler.hpp

@@ -1,55 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include "handler.hpp"
-
-extern "C" {
-#include <obs-properties.h>
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#include <libavcodec/avcodec.h>
-#pragma warning(pop)
-}
-
-namespace obsffmpeg {
-	namespace ui {
-		class nvenc_h264_handler : public handler {
-			public:
-			virtual void override_visible_name(const AVCodec* codec, std::string& name) override;
-
-			virtual void get_defaults(obs_data_t* settings, const AVCodec* codec,
-			                          AVCodecContext* context) override;
-
-			virtual void get_properties(obs_properties_t* props, const AVCodec* codec,
-			                            AVCodecContext* context) override;
-
-			virtual void update(obs_data_t* settings, const AVCodec* codec,
-			                    AVCodecContext* context) override;
-
-			private:
-			void get_encoder_properties(obs_properties_t* props, const AVCodec* codec);
-
-			void get_runtime_properties(obs_properties_t* props, const AVCodec* codec,
-			                            AVCodecContext* context);
-		};
-	} // namespace ui
-} // namespace obsffmpeg

source/ui/nvenc_hevc_handler.cpp

@@ -1,188 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "nvenc_hevc_handler.hpp"
-#include "codecs/hevc.hpp"
-#include "nvenc_shared.hpp"
-#include "plugin.hpp"
-#include "strings.hpp"
-#include "utility.hpp"
-
-extern "C" {
-#include <obs-module.h>
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#include <libavutil/opt.h>
-#pragma warning(pop)
-}
-
-/* Missing Options:
-
-Seem to be covered by initQP_* instead.
-- [obs-ffmpeg-encoder]   Option 'cq' with help 'Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control' of type 'Float' with default value '0.000000', minimum '0.000000' and maximum '51.000000'.
-- [obs-ffmpeg-encoder]   Option 'qp' with help 'Constant quantization parameter rate control method' of type 'Int' with default value '-1', minimum '-1.000000' and maximum '51.000000'.
-
-Not sure what there are useful for.
-[obs-ffmpeg-encoder]   Option 'aud' with help 'Use access unit delimiters' of type 'Bool' with default value 'false', minimum '0.000000' and maximum '1.000000'.
-[obs-ffmpeg-encoder]   Option 'surfaces' with help 'Number of concurrent surfaces' of type 'Int' with default value '0', minimum '0.000000' and maximum '64.000000'.
-[obs-ffmpeg-encoder]   Option 'delay' with help 'Delay frame output by the given amount of frames' of type 'Int' with default value '2147483647', minimum '0.000000' and maximum '2147483647.000000'.
-
-Should probably add this.
-[obs-ffmpeg-encoder]   Option 'gpu' with unit (gpu) with help 'Selects which NVENC capable GPU to use. First GPU is 0, second is 1, and so on.' of type 'Int' with default value '-1', minimum '-2.000000' and maximum '2147483647.000000'.
-[obs-ffmpeg-encoder]   [gpu] Constant 'any' and help text 'Pick the first device available' with value '-1'.
-[obs-ffmpeg-encoder]   [gpu] Constant 'list' and help text 'List the available devices' with value '-2'.
-
-Useless except for strict_gop maybe?
-[obs-ffmpeg-encoder]   Option 'forced-idr' with help 'If forcing keyframes, force them as IDR frames.' of type 'Bool' with default value 'false', minimum '-1.000000' and maximum '1.000000'.
-[obs-ffmpeg-encoder]   Option 'strict_gop' with help 'Set 1 to minimize GOP-to-GOP rate fluctuations' of type 'Bool' with default value 'false', minimum '0.000000' and maximum '1.000000'.
-[obs-ffmpeg-encoder]   Option 'bluray-compat' with help 'Bluray compatibility workarounds' of type 'Bool' with default value 'false', minimum '0.000000' and maximum '1.000000'.
-*/
-
-using namespace obsffmpeg::codecs::hevc;
-
-std::map<profile, std::string> profiles{
-    {profile::MAIN, "main"},
-    {profile::MAIN10, "main10"},
-    {profile::RANGE_EXTENDED, "rext"},
-};
-
-std::map<tier, std::string> tiers{
-    {tier::MAIN, "main"},
-    {tier::HIGH, "high"},
-};
-
-std::map<level, std::string> levels{
-    {level::L1_0, "1.0"}, {level::L2_0, "2.0"}, {level::L2_1, "2.1"}, {level::L3_0, "3.0"}, {level::L3_1, "3.1"},
-    {level::L4_0, "4.0"}, {level::L4_1, "4.1"}, {level::L5_0, "5.0"}, {level::L5_1, "5.1"}, {level::L5_2, "5.2"},
-    {level::L6_0, "6.0"}, {level::L6_1, "6.1"}, {level::L6_2, "6.2"},
-};
-
-INITIALIZER(nvenc_hevc_handler_init)
-{
-	obsffmpeg::initializers.push_back([]() {
-		obsffmpeg::register_codec_handler("hevc_nvenc", std::make_shared<obsffmpeg::ui::nvenc_hevc_handler>());
-	});
-};
-
-void obsffmpeg::ui::nvenc_hevc_handler::override_visible_name(const AVCodec*, std::string& name)
-{
-	name = "H.265/HEVC Encoder (NVidia NVENC)";
-}
-
-void obsffmpeg::ui::nvenc_hevc_handler::get_defaults(obs_data_t* settings, const AVCodec* codec,
-                                                     AVCodecContext* context)
-{
-	nvenc::get_defaults(settings, codec, context);
-
-	obs_data_set_default_int(settings, P_HEVC_PROFILE, static_cast<int64_t>(codecs::hevc::profile::MAIN));
-	obs_data_set_default_int(settings, P_HEVC_TIER, static_cast<int64_t>(codecs::hevc::profile::MAIN));
-	obs_data_set_default_int(settings, P_HEVC_LEVEL, static_cast<int64_t>(codecs::hevc::level::UNKNOWN));
-}
-
-void obsffmpeg::ui::nvenc_hevc_handler::get_properties(obs_properties_t* props, const AVCodec* codec,
-                                                       AVCodecContext* context)
-{
-	if (!context) {
-		this->get_encoder_properties(props, codec);
-	} else {
-		this->get_runtime_properties(props, codec, context);
-	}
-}
-
-void obsffmpeg::ui::nvenc_hevc_handler::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* context)
-{
-	nvenc::update(settings, codec, context);
-
-	{ // HEVC Options
-		auto found = profiles.find(static_cast<profile>(obs_data_get_int(settings, P_HEVC_PROFILE)));
-		if (found != profiles.end()) {
-			av_opt_set(context->priv_data, "profile", found->second.c_str(), 0);
-		}
-	}
-	{
-		auto found = tiers.find(static_cast<tier>(obs_data_get_int(settings, P_HEVC_TIER)));
-		if (found != tiers.end()) {
-			av_opt_set(context->priv_data, "tier", found->second.c_str(), 0);
-		}
-	}
-	{
-		auto found = levels.find(static_cast<level>(obs_data_get_int(settings, P_HEVC_LEVEL)));
-		if (found != levels.end()) {
-			av_opt_set(context->priv_data, "level", found->second.c_str(), 0);
-		} else {
-			av_opt_set(context->priv_data, "level", "auto", 0);
-		}
-	}
-}
-
-void obsffmpeg::ui::nvenc_hevc_handler::get_encoder_properties(obs_properties_t* props, const AVCodec* codec)
-{
-	nvenc::get_properties_pre(props, codec);
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp = obs_properties_create();
-			obs_properties_add_group(props, P_HEVC, TRANSLATE(P_HEVC), OBS_GROUP_NORMAL, grp);
-		}
-
-		{
-			auto p = obs_properties_add_list(grp, P_HEVC_PROFILE, TRANSLATE(P_HEVC_PROFILE),
-			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(P_HEVC_PROFILE)));
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_DEFAULT),
-			                          static_cast<int64_t>(codecs::hevc::profile::UNKNOWN));
-			for (auto const kv : profiles) {
-				std::string trans = std::string(P_HEVC_PROFILE) + "." + kv.second;
-				obs_property_list_add_int(p, TRANSLATE(trans.c_str()), static_cast<int64_t>(kv.first));
-			}
-		}
-		{
-			auto p = obs_properties_add_list(grp, P_HEVC_TIER, TRANSLATE(P_HEVC_TIER), OBS_COMBO_TYPE_LIST,
-			                                 OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(P_HEVC_TIER)));
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_DEFAULT),
-			                          static_cast<int64_t>(codecs::hevc::tier::UNKNOWN));
-			for (auto const kv : tiers) {
-				std::string trans = std::string(P_HEVC_TIER) + "." + kv.second;
-				obs_property_list_add_int(p, TRANSLATE(trans.c_str()), static_cast<int64_t>(kv.first));
-			}
-		}
-		{
-			auto p = obs_properties_add_list(grp, P_HEVC_LEVEL, TRANSLATE(P_HEVC_LEVEL),
-			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(P_HEVC_LEVEL)));
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_AUTOMATIC),
-			                          static_cast<int64_t>(codecs::hevc::level::UNKNOWN));
-			for (auto const kv : levels) {
-				obs_property_list_add_int(p, kv.second.c_str(), static_cast<int64_t>(kv.first));
-			}
-		}
-	}
-
-	nvenc::get_properties_post(props, codec);
-}
-
-void obsffmpeg::ui::nvenc_hevc_handler::get_runtime_properties(obs_properties_t* props, const AVCodec* codec,
-                                                               AVCodecContext* context)
-{
-	nvenc::get_runtime_properties(props, codec, context);
-}

source/ui/nvenc_hevc_handler.hpp

@@ -1,55 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include "handler.hpp"
-
-extern "C" {
-#include <obs-properties.h>
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#include <libavcodec/avcodec.h>
-#pragma warning(pop)
-}
-
-namespace obsffmpeg {
-	namespace ui {
-		class nvenc_hevc_handler : public handler {
-			public:
-			virtual void override_visible_name(const AVCodec* codec, std::string& name) override;
-
-			virtual void get_defaults(obs_data_t* settings, const AVCodec* codec,
-			                          AVCodecContext* context) override;
-
-			virtual void get_properties(obs_properties_t* props, const AVCodec* codec,
-			                            AVCodecContext* context) override;
-
-			virtual void update(obs_data_t* settings, const AVCodec* codec,
-			                    AVCodecContext* context) override;
-
-			private:
-			void get_encoder_properties(obs_properties_t* props, const AVCodec* codec);
-
-			void get_runtime_properties(obs_properties_t* props, const AVCodec* codec,
-			                            AVCodecContext* context);
-		};
-	} // namespace ui
-} // namespace obsffmpeg

source/ui/nvenc_shared.cpp

@@ -1,648 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "nvenc_shared.hpp"
-#include "codecs/hevc.hpp"
-#include "plugin.hpp"
-#include "strings.hpp"
-#include "utility.hpp"
-
-extern "C" {
-#include <obs-module.h>
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#include <libavutil/opt.h>
-#pragma warning(pop)
-}
-
-#define ST_PRESET "NVENC.Preset"
-#define ST_PRESET_(x) ST_PRESET "." D_VSTR(x)
-
-#define ST_RATECONTROL "NVENC.RateControl"
-#define ST_RATECONTROL_MODE ST_RATECONTROL ".Mode"
-#define ST_RATECONTROL_MODE_(x) ST_RATECONTROL_MODE "." D_VSTR(x)
-#define ST_RATECONTROL_TWOPASS ST_RATECONTROL ".TwoPass"
-#define ST_RATECONTROL_LOOKAHEAD ST_RATECONTROL ".LookAhead"
-#define ST_RATECONTROL_ADAPTIVEI ST_RATECONTROL ".AdaptiveI"
-#define ST_RATECONTROL_ADAPTIVEB ST_RATECONTROL ".AdaptiveB"
-
-#define ST_RATECONTROL_BITRATE ST_RATECONTROL ".Bitrate"
-#define ST_RATECONTROL_BITRATE_TARGET ST_RATECONTROL_BITRATE ".Target"
-#define ST_RATECONTROL_BITRATE_MAXIMUM ST_RATECONTROL_BITRATE ".Maximum"
-
-#define ST_RATECONTROL_QUALITY ST_RATECONTROL ".Quality"
-#define ST_RATECONTROL_QUALITY_MINIMUM ST_RATECONTROL_QUALITY ".Minimum"
-#define ST_RATECONTROL_QUALITY_MAXIMUM ST_RATECONTROL_QUALITY ".Maximum"
-#define ST_RATECONTROL_QUALITY_TARGET ST_RATECONTROL_QUALITY ".Target"
-
-#define ST_RATECONTROL_QP ST_RATECONTROL ".QP"
-#define ST_RATECONTROL_QP_I ST_RATECONTROL_QP ".I"
-#define ST_RATECONTROL_QP_I_INITIAL ST_RATECONTROL_QP_I ".Initial"
-#define ST_RATECONTROL_QP_P ST_RATECONTROL_QP ".P"
-#define ST_RATECONTROL_QP_ST_INITIAL ST_RATECONTROL_QP_P ".Initial"
-#define ST_RATECONTROL_QP_B ST_RATECONTROL_QP ".B"
-#define ST_RATECONTROL_QP_B_INITIAL ST_RATECONTROL_QP_B ".Initial"
-
-#define ST_AQ "NVENC.AQ"
-#define ST_AQ_SPATIAL ST_AQ ".Spatial"
-#define ST_AQ_TEMPORAL ST_AQ ".Temporal"
-#define ST_AQ_STRENGTH ST_AQ ".Strength"
-
-#define ST_OTHER "NVENC.Other"
-#define ST_OTHER_BFRAMES ST_OTHER ".BFrames"
-#define ST_OTHER_BFRAME_REFERENCEMODE ST_OTHER ".BFrameReferenceMode"
-#define ST_OTHER_ZEROLATENCY ST_OTHER ".ZeroLatency"
-#define ST_OTHER_WEIGHTED_PREDICTION ST_OTHER ".WeightedPrediction"
-#define ST_OTHER_NONREFERENCE_PFRAMES ST_OTHER ".NonReferencePFrames"
-
-using namespace obsffmpeg::nvenc;
-
-std::map<preset, std::string> obsffmpeg::nvenc::presets{
-    {preset::DEFAULT, ST_PRESET_(Default)},
-    {preset::SLOW, ST_PRESET_(Slow)},
-    {preset::MEDIUM, ST_PRESET_(Medium)},
-    {preset::FAST, ST_PRESET_(Fast)},
-    {preset::HIGH_PERFORMANCE, ST_PRESET_(HighPerformance)},
-    {preset::HIGH_QUALITY, ST_PRESET_(HighQuality)},
-    {preset::BLURAYDISC, ST_PRESET_(BluRayDisc)},
-    {preset::LOW_LATENCY, ST_PRESET_(LowLatency)},
-    {preset::LOW_LATENCY_HIGH_PERFORMANCE, ST_PRESET_(LowLatencyHighPerformance)},
-    {preset::LOW_LATENCY_HIGH_QUALITY, ST_PRESET_(LowLatencyHighQuality)},
-    {preset::LOSSLESS, ST_PRESET_(Lossless)},
-    {preset::LOSSLESS_HIGH_PERFORMANCE, ST_PRESET_(LosslessHighPerformance)},
-};
-
-std::map<preset, std::string> obsffmpeg::nvenc::preset_to_opt{
-    {preset::DEFAULT, "default"},
-    {preset::SLOW, "slow"},
-    {preset::MEDIUM, "medium"},
-    {preset::FAST, "fast"},
-    {preset::HIGH_PERFORMANCE, "hp"},
-    {preset::HIGH_QUALITY, "hq"},
-    {preset::BLURAYDISC, "bd"},
-    {preset::LOW_LATENCY, "ll"},
-    {preset::LOW_LATENCY_HIGH_PERFORMANCE, "llhp"},
-    {preset::LOW_LATENCY_HIGH_QUALITY, "llhq"},
-    {preset::LOSSLESS, "lossless"},
-    {preset::LOSSLESS_HIGH_PERFORMANCE, "losslesshp"},
-};
-
-std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmodes{
-    {ratecontrolmode::CQP, ST_RATECONTROL_MODE_(CQP)},
-    {ratecontrolmode::VBR, ST_RATECONTROL_MODE_(VBR)},
-    {ratecontrolmode::VBR_HQ, ST_RATECONTROL_MODE_(VBR_HQ)},
-    {ratecontrolmode::CBR, ST_RATECONTROL_MODE_(CBR)},
-    {ratecontrolmode::CBR_HQ, ST_RATECONTROL_MODE_(CBR_HQ)},
-    {ratecontrolmode::CBR_LD_HQ, ST_RATECONTROL_MODE_(CBR_LD_HQ)},
-};
-
-std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmode_to_opt{
-    {ratecontrolmode::CQP, "constqp"}, {ratecontrolmode::VBR, "vbr"},       {ratecontrolmode::VBR_HQ, "vbr_hq"},
-    {ratecontrolmode::CBR, "cbr"},     {ratecontrolmode::CBR_HQ, "cbr_hq"}, {ratecontrolmode::CBR_LD_HQ, "cbr_ld_hq"},
-};
-
-std::map<b_ref_mode, std::string> obsffmpeg::nvenc::b_ref_modes{
-    {b_ref_mode::DISABLED, S_STATE_DISABLED},
-    {b_ref_mode::EACH, ST_OTHER_BFRAME_REFERENCEMODE ".Each"},
-    {b_ref_mode::MIDDLE, ST_OTHER_BFRAME_REFERENCEMODE ".Middle"},
-};
-
-std::map<b_ref_mode, std::string> obsffmpeg::nvenc::b_ref_mode_to_opt{
-    {b_ref_mode::DISABLED, "disabled"},
-    {b_ref_mode::EACH, "each"},
-    {b_ref_mode::MIDDLE, "middle"},
-};
-
-void obsffmpeg::nvenc::get_defaults(obs_data_t* settings, const AVCodec*, AVCodecContext*)
-{
-	obs_data_set_default_int(settings, ST_PRESET, static_cast<int64_t>(preset::DEFAULT));
-
-	obs_data_set_default_int(settings, ST_RATECONTROL_MODE, static_cast<int64_t>(ratecontrolmode::CBR_HQ));
-	obs_data_set_default_int(settings, ST_RATECONTROL_TWOPASS, -1);
-	obs_data_set_default_int(settings, ST_RATECONTROL_LOOKAHEAD, 0);
-	obs_data_set_default_bool(settings, ST_RATECONTROL_ADAPTIVEI, true);
-	obs_data_set_default_bool(settings, ST_RATECONTROL_ADAPTIVEB, true);
-
-	obs_data_set_default_int(settings, ST_RATECONTROL_BITRATE_TARGET, 6000);
-	obs_data_set_default_int(settings, ST_RATECONTROL_BITRATE_MAXIMUM, 6000);
-	obs_data_set_default_int(settings, S_RATECONTROL_BUFFERSIZE, 12000);
-
-	obs_data_set_default_int(settings, ST_RATECONTROL_QUALITY_MINIMUM, 51);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QUALITY_MAXIMUM, -1);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QUALITY_TARGET, 0);
-
-	obs_data_set_default_int(settings, ST_RATECONTROL_QP_I, 21);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QP_I_INITIAL, -1);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QP_P, 21);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QP_ST_INITIAL, -1);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QP_B, 21);
-	obs_data_set_default_int(settings, ST_RATECONTROL_QP_B_INITIAL, -1);
-
-	obs_data_set_default_bool(settings, ST_AQ_SPATIAL, true);
-	obs_data_set_default_int(settings, ST_AQ_STRENGTH, 8);
-	obs_data_set_default_bool(settings, ST_AQ_TEMPORAL, true);
-
-	obs_data_set_default_int(settings, ST_OTHER_BFRAMES, 2);
-	obs_data_set_default_int(settings, ST_OTHER_BFRAME_REFERENCEMODE, static_cast<int64_t>(b_ref_mode::DISABLED));
-	obs_data_set_default_bool(settings, ST_OTHER_ZEROLATENCY, false);
-	obs_data_set_default_bool(settings, ST_OTHER_WEIGHTED_PREDICTION, false);
-	obs_data_set_default_bool(settings, ST_OTHER_NONREFERENCE_PFRAMES, false);
-}
-
-static bool modified_ratecontrol(obs_properties_t* props, obs_property_t*, obs_data_t* settings)
-{
-	using namespace obsffmpeg::nvenc;
-
-	bool have_bitrate     = false;
-	bool have_bitrate_max = false;
-	bool have_quality     = false;
-	bool have_qp          = false;
-	bool have_qp_init     = false;
-
-	ratecontrolmode rc = static_cast<ratecontrolmode>(obs_data_get_int(settings, ST_RATECONTROL_MODE));
-	switch (rc) {
-	case ratecontrolmode::CQP:
-		have_qp = true;
-		break;
-	case ratecontrolmode::CBR:
-	case ratecontrolmode::CBR_HQ:
-	case ratecontrolmode::CBR_LD_HQ:
-		have_bitrate = true;
-		break;
-	case ratecontrolmode::VBR:
-	case ratecontrolmode::VBR_HQ:
-		have_bitrate     = true;
-		have_bitrate_max = true;
-		have_quality     = true;
-		have_qp_init     = true;
-		break;
-	}
-
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_BITRATE), have_bitrate || have_bitrate_max);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_BITRATE_TARGET), have_bitrate);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_BITRATE_MAXIMUM), have_bitrate_max);
-	obs_property_set_visible(obs_properties_get(props, S_RATECONTROL_BUFFERSIZE), have_bitrate || have_bitrate_max);
-
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QUALITY), have_quality);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QUALITY_MINIMUM), have_quality);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QUALITY_MAXIMUM), have_quality);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QUALITY_TARGET), have_quality);
-
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP), have_qp || have_qp_init);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP_I), have_qp);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP_P), have_qp);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP_B), have_qp);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP_I_INITIAL), have_qp_init);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP_ST_INITIAL), have_qp_init);
-	obs_property_set_visible(obs_properties_get(props, ST_RATECONTROL_QP_B_INITIAL), have_qp_init);
-
-	return true;
-}
-
-static bool modified_quality(obs_properties_t* props, obs_property_t*, obs_data_t* settings)
-{
-	bool enabled = obs_data_get_bool(settings, ST_RATECONTROL_QUALITY);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QUALITY_MINIMUM), enabled);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QUALITY_MAXIMUM), enabled);
-	return true;
-}
-
-static bool modified_aq(obs_properties_t* props, obs_property_t*, obs_data_t* settings)
-{
-	bool spatial_aq = obs_data_get_bool(settings, ST_AQ_SPATIAL);
-	obs_property_set_visible(obs_properties_get(props, ST_AQ_STRENGTH), spatial_aq);
-	return true;
-}
-
-void obsffmpeg::nvenc::get_properties_pre(obs_properties_t* props, const AVCodec*)
-{
-	{
-		auto p = obs_properties_add_list(props, ST_PRESET, TRANSLATE(ST_PRESET), OBS_COMBO_TYPE_LIST,
-		                                 OBS_COMBO_FORMAT_INT);
-		obs_property_set_long_description(p, TRANSLATE(DESC(ST_PRESET)));
-		for (auto kv : presets) {
-			obs_property_list_add_int(p, TRANSLATE(kv.second.c_str()), static_cast<int64_t>(kv.first));
-		}
-	}
-}
-
-void obsffmpeg::nvenc::get_properties_post(obs_properties_t* props, const AVCodec* codec)
-{
-	{ // Rate Control
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp = obs_properties_create();
-			obs_properties_add_group(props, ST_RATECONTROL, TRANSLATE(ST_RATECONTROL), OBS_GROUP_NORMAL,
-			                         grp);
-		}
-
-		{
-			auto p = obs_properties_add_list(grp, ST_RATECONTROL_MODE, TRANSLATE(ST_RATECONTROL_MODE),
-			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_MODE)));
-			obs_property_set_modified_callback(p, modified_ratecontrol);
-			for (auto kv : ratecontrolmodes) {
-				obs_property_list_add_int(p, TRANSLATE(kv.second.c_str()),
-				                          static_cast<int64_t>(kv.first));
-			}
-		}
-
-		{
-			auto p = obs_properties_add_list(grp, ST_RATECONTROL_TWOPASS, TRANSLATE(ST_RATECONTROL_TWOPASS),
-			                                 OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_TWOPASS)));
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_DEFAULT), -1);
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_DISABLED), 0);
-			obs_property_list_add_int(p, TRANSLATE(S_STATE_ENABLED), 1);
-		}
-
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_LOOKAHEAD,
-			                                       TRANSLATE(ST_RATECONTROL_LOOKAHEAD), 0, 32, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_LOOKAHEAD)));
-			obs_property_int_set_suffix(p, " frames");
-		}
-		{
-			auto p =
-			    obs_properties_add_bool(grp, ST_RATECONTROL_ADAPTIVEI, TRANSLATE(ST_RATECONTROL_ADAPTIVEI));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_ADAPTIVEI)));
-		}
-		if (strcmp(codec->name, "h264_nvenc") == 0) {
-			auto p =
-			    obs_properties_add_bool(grp, ST_RATECONTROL_ADAPTIVEB, TRANSLATE(ST_RATECONTROL_ADAPTIVEB));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_ADAPTIVEB)));
-		}
-	}
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp = obs_properties_create();
-			obs_properties_add_group(props, ST_RATECONTROL_BITRATE, TRANSLATE(ST_RATECONTROL_BITRATE),
-			                         OBS_GROUP_NORMAL, grp);
-		}
-
-		{
-			auto p = obs_properties_add_int(grp, ST_RATECONTROL_BITRATE_TARGET,
-			                                TRANSLATE(ST_RATECONTROL_BITRATE_TARGET), 1,
-			                                std::numeric_limits<int32_t>::max(), 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_BITRATE_TARGET)));
-			obs_property_int_set_suffix(p, " kbit/s");
-		}
-		{
-			auto p = obs_properties_add_int(grp, ST_RATECONTROL_BITRATE_MAXIMUM,
-			                                TRANSLATE(ST_RATECONTROL_BITRATE_MAXIMUM), 0,
-			                                std::numeric_limits<int32_t>::max(), 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_BITRATE_MAXIMUM)));
-			obs_property_int_set_suffix(p, " kbit/s");
-		}
-		{
-			auto p =
-			    obs_properties_add_int(grp, S_RATECONTROL_BUFFERSIZE, TRANSLATE(S_RATECONTROL_BUFFERSIZE),
-			                           0, std::numeric_limits<int32_t>::max(), 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(S_RATECONTROL_BUFFERSIZE)));
-			obs_property_int_set_suffix(p, " kbit");
-		}
-	}
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp    = obs_properties_create();
-			auto p = obs_properties_add_group(props, ST_RATECONTROL_QUALITY,
-			                                  TRANSLATE(ST_RATECONTROL_QUALITY), OBS_GROUP_CHECKABLE, grp);
-			obs_property_set_modified_callback(p, modified_quality);
-		} else {
-			auto p =
-			    obs_properties_add_bool(props, ST_RATECONTROL_QUALITY, TRANSLATE(ST_RATECONTROL_QUALITY));
-			obs_property_set_modified_callback(p, modified_quality);
-		}
-
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QUALITY_MINIMUM,
-			                                       TRANSLATE(ST_RATECONTROL_QUALITY_MINIMUM), 0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QUALITY_MINIMUM)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QUALITY_MAXIMUM,
-			                                       TRANSLATE(ST_RATECONTROL_QUALITY_MAXIMUM), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QUALITY_MAXIMUM)));
-		}
-	}
-
-	{
-		auto p = obs_properties_add_float_slider(props, ST_RATECONTROL_QUALITY_TARGET,
-		                                         TRANSLATE(ST_RATECONTROL_QUALITY_TARGET), 0, 100, 0.01);
-		obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QUALITY_TARGET)));
-	}
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp    = obs_properties_create();
-			auto p = obs_properties_add_group(props, ST_RATECONTROL_QP, TRANSLATE(ST_RATECONTROL_QP),
-			                                  OBS_GROUP_CHECKABLE, grp);
-			obs_property_set_modified_callback(p, modified_quality);
-		}
-
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QP_I, TRANSLATE(ST_RATECONTROL_QP_I),
-			                                       0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QP_I)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QP_I_INITIAL,
-			                                       TRANSLATE(ST_RATECONTROL_QP_I_INITIAL), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QP_I_INITIAL)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QP_P, TRANSLATE(ST_RATECONTROL_QP_P),
-			                                       0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QP_P)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QP_ST_INITIAL,
-			                                       TRANSLATE(ST_RATECONTROL_QP_ST_INITIAL), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QP_ST_INITIAL)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QP_B, TRANSLATE(ST_RATECONTROL_QP_B),
-			                                       0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QP_B)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, ST_RATECONTROL_QP_B_INITIAL,
-			                                       TRANSLATE(ST_RATECONTROL_QP_B_INITIAL), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_RATECONTROL_QP_B_INITIAL)));
-		}
-	}
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp = obs_properties_create();
-			obs_properties_add_group(props, ST_AQ, TRANSLATE(ST_AQ), OBS_GROUP_NORMAL, grp);
-		}
-
-		{
-			auto p = obs_properties_add_bool(grp, ST_AQ_SPATIAL, TRANSLATE(ST_AQ_SPATIAL));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_AQ_SPATIAL)));
-			obs_property_set_modified_callback(p, modified_aq);
-		}
-		{
-			auto p =
-			    obs_properties_add_int_slider(grp, ST_AQ_STRENGTH, TRANSLATE(ST_AQ_STRENGTH), 1, 15, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_AQ_STRENGTH)));
-		}
-		{
-			auto p = obs_properties_add_bool(grp, ST_AQ_TEMPORAL, TRANSLATE(ST_AQ_TEMPORAL));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_AQ_TEMPORAL)));
-		}
-	}
-
-	{
-		obs_properties_t* grp = props;
-		if (!obsffmpeg::are_property_groups_broken()) {
-			grp = obs_properties_create();
-			obs_properties_add_group(props, ST_OTHER, TRANSLATE(ST_OTHER), OBS_GROUP_NORMAL, grp);
-		}
-
-		{
-			auto p =
-			    obs_properties_add_int_slider(grp, ST_OTHER_BFRAMES, TRANSLATE(ST_OTHER_BFRAMES), 0, 4, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_OTHER_BFRAMES)));
-			obs_property_int_set_suffix(p, " frames");
-		}
-
-		{
-			auto p = obs_properties_add_list(grp, ST_OTHER_BFRAME_REFERENCEMODE,
-			                                 TRANSLATE(ST_OTHER_BFRAME_REFERENCEMODE), OBS_COMBO_TYPE_LIST,
-			                                 OBS_COMBO_FORMAT_INT);
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_OTHER_BFRAME_REFERENCEMODE)));
-			for (auto kv : b_ref_modes) {
-				obs_property_list_add_int(p, TRANSLATE(kv.second.c_str()),
-				                          static_cast<int64_t>(kv.first));
-			}
-		}
-
-		{
-			auto p = obs_properties_add_bool(grp, ST_OTHER_ZEROLATENCY, TRANSLATE(ST_OTHER_ZEROLATENCY));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_OTHER_ZEROLATENCY)));
-		}
-
-		{
-			auto p = obs_properties_add_bool(grp, ST_OTHER_WEIGHTED_PREDICTION,
-			                                 TRANSLATE(ST_OTHER_WEIGHTED_PREDICTION));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_OTHER_WEIGHTED_PREDICTION)));
-		}
-
-		{
-			auto p = obs_properties_add_bool(grp, ST_OTHER_NONREFERENCE_PFRAMES,
-			                                 TRANSLATE(ST_OTHER_NONREFERENCE_PFRAMES));
-			obs_property_set_long_description(p, TRANSLATE(DESC(ST_OTHER_NONREFERENCE_PFRAMES)));
-		}
-	}
-}
-
-void obsffmpeg::nvenc::get_runtime_properties(obs_properties_t* props, const AVCodec*, AVCodecContext*)
-{
-	obs_property_set_enabled(obs_properties_get(props, ST_PRESET), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_MODE), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_TWOPASS), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_LOOKAHEAD), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_ADAPTIVEI), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_ADAPTIVEB), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_BITRATE), true);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_BITRATE_TARGET), true);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_BITRATE_MAXIMUM), true);
-	obs_property_set_enabled(obs_properties_get(props, S_RATECONTROL_BUFFERSIZE), true);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QUALITY), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QUALITY_MINIMUM), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QUALITY_MAXIMUM), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QUALITY_TARGET), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP_I), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP_I_INITIAL), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP_P), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP_ST_INITIAL), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP_B), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_RATECONTROL_QP_B_INITIAL), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_AQ), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_AQ_SPATIAL), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_AQ_STRENGTH), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_AQ_TEMPORAL), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_OTHER), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_OTHER_BFRAMES), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_OTHER_BFRAME_REFERENCEMODE), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_OTHER_ZEROLATENCY), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_OTHER_WEIGHTED_PREDICTION), false);
-	obs_property_set_enabled(obs_properties_get(props, ST_OTHER_NONREFERENCE_PFRAMES), false);
-}
-
-void obsffmpeg::nvenc::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* context)
-{
-	{
-		preset c_preset = static_cast<preset>(obs_data_get_int(settings, ST_PRESET));
-		auto   found    = preset_to_opt.find(c_preset);
-		if (found != preset_to_opt.end()) {
-			av_opt_set(context->priv_data, "preset", found->second.c_str(), 0);
-		} else {
-			av_opt_set(context->priv_data, "preset", nullptr, 0);
-		}
-	}
-
-	{ // Rate Control
-		bool have_bitrate     = false;
-		bool have_bitrate_max = false;
-		bool have_quality     = false;
-		bool have_qp          = false;
-		bool have_qp_init     = false;
-
-		ratecontrolmode rc    = static_cast<ratecontrolmode>(obs_data_get_int(settings, ST_RATECONTROL_MODE));
-		auto            rcopt = nvenc::ratecontrolmode_to_opt.find(rc);
-		if (rcopt != nvenc::ratecontrolmode_to_opt.end()) {
-			av_opt_set(context->priv_data, "rc", rcopt->second.c_str(), 0);
-		}
-
-		switch (rc) {
-		case ratecontrolmode::CQP:
-			have_qp = true;
-			break;
-		case ratecontrolmode::CBR:
-		case ratecontrolmode::CBR_HQ:
-		case ratecontrolmode::CBR_LD_HQ:
-			have_bitrate = true;
-			av_opt_set_int(context->priv_data, "cbr", 1, 0);
-			break;
-		case ratecontrolmode::VBR:
-		case ratecontrolmode::VBR_HQ:
-			have_bitrate_max = true;
-			have_bitrate     = true;
-			have_quality     = true;
-			have_qp_init     = true;
-			break;
-		}
-
-		int tp = static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_TWOPASS));
-		if (tp >= 0) {
-			av_opt_set_int(context->priv_data, "2pass", tp ? 1 : 0, 0);
-		}
-
-		int la = static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_LOOKAHEAD));
-		av_opt_set_int(context->priv_data, "lookahead", la, 0);
-		if (la > 0) {
-			bool adapt_i = obs_data_get_bool(settings, ST_RATECONTROL_ADAPTIVEI);
-			av_opt_set_int(context->priv_data, "no-scenecut", !adapt_i ? 1 : 0, 0);
-
-			if (strcmp(codec->name, "h264_nvenc")) {
-				bool adapt_b = obs_data_get_bool(settings, ST_RATECONTROL_ADAPTIVEB);
-				av_opt_set_int(context->priv_data, "b_adapt", adapt_b ? 1 : 0, 0);
-			}
-		}
-
-		if (have_bitrate)
-			context->bit_rate =
-			    static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_BITRATE_TARGET) * 1000);
-		if (have_bitrate_max)
-			context->rc_max_rate =
-			    static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_BITRATE_MAXIMUM) * 1000);
-		if (have_bitrate || have_bitrate_max)
-			context->rc_buffer_size =
-			    static_cast<int>(obs_data_get_int(settings, S_RATECONTROL_BUFFERSIZE) * 1000);
-
-		if (have_quality && obs_data_get_bool(settings, ST_RATECONTROL_QUALITY)) {
-			int qmin      = static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_QUALITY_MINIMUM));
-			context->qmin = qmin;
-			if (qmin >= 0) {
-				context->qmax =
-				    static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_QUALITY_MAXIMUM));
-			}
-		}
-
-		{
-			double_t v = obs_data_get_double(settings, ST_RATECONTROL_QUALITY_TARGET) / 100.0 * 51.0;
-			if (v > 0) {
-				av_opt_set_double(context->priv_data, "cq", v, 0);
-			}
-		}
-
-		if (have_qp) {
-			av_opt_set_int(context->priv_data, "init_qpI",
-			               static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_QP_I)), 0);
-			av_opt_set_int(context->priv_data, "init_qpP",
-			               static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_QP_P)), 0);
-			av_opt_set_int(context->priv_data, "init_qpB",
-			               static_cast<int>(obs_data_get_int(settings, ST_RATECONTROL_QP_B)), 0);
-		}
-		if (have_qp_init) {
-			av_opt_set_int(context->priv_data, "init_qpI",
-			               obs_data_get_int(settings, ST_RATECONTROL_QP_I_INITIAL), 0);
-			av_opt_set_int(context->priv_data, "init_qpP",
-			               obs_data_get_int(settings, ST_RATECONTROL_QP_ST_INITIAL), 0);
-			av_opt_set_int(context->priv_data, "init_qpB",
-			               obs_data_get_int(settings, ST_RATECONTROL_QP_B_INITIAL), 0);
-		}
-	}
-
-	{ // AQ
-		bool saq = obs_data_get_bool(settings, ST_AQ_SPATIAL);
-		bool taq = obs_data_get_bool(settings, ST_AQ_TEMPORAL);
-
-		if (strcmp(codec->name, "h264_nvenc")) {
-			av_opt_set_int(context->priv_data, "spatial-aq", saq ? 1 : 0, 0);
-			av_opt_set_int(context->priv_data, "temporal-aq", taq ? 1 : 0, 0);
-		} else {
-			av_opt_set_int(context->priv_data, "spatial_aq", saq ? 1 : 0, 0);
-			av_opt_set_int(context->priv_data, "temporal_aq", taq ? 1 : 0, 0);
-		}
-		if (saq) {
-			av_opt_set_int(context->priv_data, "aq-strength",
-			               static_cast<int>(obs_data_get_int(settings, ST_AQ_STRENGTH)), 0);
-		}
-	}
-
-	{ // Other
-		bool zl  = obs_data_get_bool(settings, ST_OTHER_ZEROLATENCY);
-		bool wp  = obs_data_get_bool(settings, ST_OTHER_WEIGHTED_PREDICTION);
-		bool nrp = obs_data_get_bool(settings, ST_OTHER_NONREFERENCE_PFRAMES);
-
-		context->max_b_frames = static_cast<int>(obs_data_get_int(settings, ST_OTHER_BFRAMES));
-
-		av_opt_set_int(context->priv_data, "zerolatency", zl ? 1 : 0, 0);
-		av_opt_set_int(context->priv_data, "nonref_p", nrp ? 1 : 0, 0);
-
-		if ((context->max_b_frames != 0) && wp) {
-			PLOG_WARNING(
-			    "Automatically disabled weighted prediction due to being incompatible with B-Frames.");
-		} else {
-			av_opt_set_int(context->priv_data, "weighted_pred", wp ? 1 : 0, 0);
-		}
-
-		{
-			auto found = b_ref_mode_to_opt.find(
-			    static_cast<b_ref_mode>(obs_data_get_int(settings, ST_OTHER_BFRAME_REFERENCEMODE)));
-			if (found != b_ref_mode_to_opt.end()) {
-				av_opt_set(context->priv_data, "b_ref_mode", found->second.c_str(), 0);
-			}
-		}
-	}
-}

source/ui/nvenc_shared.hpp

@@ -1,88 +0,0 @@
-// FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include <map>
-#include "utility.hpp"
-
-extern "C" {
-#include <obs-properties.h>
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#include <libavcodec/avcodec.h>
-#pragma warning(pop)
-}
-
-namespace obsffmpeg {
-	namespace nvenc {
-		enum class preset : int64_t {
-			DEFAULT,
-			SLOW,
-			MEDIUM,
-			FAST,
-			HIGH_PERFORMANCE,
-			HIGH_QUALITY,
-			BLURAYDISC,
-			LOW_LATENCY,
-			LOW_LATENCY_HIGH_PERFORMANCE,
-			LOW_LATENCY_HIGH_QUALITY,
-			LOSSLESS,
-			LOSSLESS_HIGH_PERFORMANCE,
-		};
-
-		enum class ratecontrolmode : int64_t {
-			CQP,
-			VBR,
-			VBR_HQ,
-			CBR,
-			CBR_HQ,
-			CBR_LD_HQ,
-		};
-
-		enum class b_ref_mode : int64_t {
-			DISABLED,
-			EACH,
-			MIDDLE,
-		};
-
-		extern std::map<preset, std::string> presets;
-
-		extern std::map<preset, std::string> preset_to_opt;
-
-		extern std::map<ratecontrolmode, std::string> ratecontrolmodes;
-
-		extern std::map<ratecontrolmode, std::string> ratecontrolmode_to_opt;
-
-		extern std::map<b_ref_mode, std::string> b_ref_modes;
-
-		extern std::map<b_ref_mode, std::string> b_ref_mode_to_opt;
-
-		void get_defaults(obs_data_t* settings, const AVCodec* codec, AVCodecContext* context);
-
-		void get_properties_pre(obs_properties_t* props, const AVCodec* codec);
-
-		void get_properties_post(obs_properties_t* props, const AVCodec* codec);
-
-		void get_runtime_properties(obs_properties_t* props, const AVCodec* codec, AVCodecContext* context);
-
-		void update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* context);
-	} // namespace nvenc
-} // namespace obsffmpeg

source/ui/prores_aw_handler.cpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "prores_aw_handler.hpp"
 #include "plugin.hpp"
@@ -41,13 +37,12 @@ INITIALIZER(prores_aw_handler_init)
 	});
 };
 
-void obsffmpeg::ui::prores_aw_handler::get_defaults(obs_data_t* settings, const AVCodec*, AVCodecContext*)
+void obsffmpeg::ui::prores_aw_handler::get_defaults(obs_data_t* settings, AVCodec*, AVCodecContext*)
 {
 	obs_data_set_default_int(settings, P_PROFILE, 0);
 }
 
-void obsffmpeg::ui::prores_aw_handler::get_properties(obs_properties_t* props, const AVCodec* codec,
+void obsffmpeg::ui::prores_aw_handler::get_properties(obs_properties_t* props, AVCodec* codec, AVCodecContext* context)
-                                                      AVCodecContext* context)
 {
 	if (!context) {
 		auto p = obs_properties_add_list(props, P_PROFILE, TRANSLATE(P_PROFILE), OBS_COMBO_TYPE_LIST,
@@ -78,7 +73,7 @@ void obsffmpeg::ui::prores_aw_handler::get_properties(obs_properties_t* props, c
 	}
 }
 
-void obsffmpeg::ui::prores_aw_handler::update(obs_data_t* settings, const AVCodec*, AVCodecContext* context)
+void obsffmpeg::ui::prores_aw_handler::update(obs_data_t* settings, AVCodec*, AVCodecContext* context)
 {
 	context->profile = static_cast<int>(obs_data_get_int(settings, P_PROFILE));
 }

source/ui/prores_aw_handler.hpp

@@ -1,23 +1,19 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2019 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 #include "handler.hpp"
@@ -34,14 +30,13 @@ namespace obsffmpeg {
 	namespace ui {
 		class prores_aw_handler : public handler {
 			public:
-			virtual void get_defaults(obs_data_t* settings, const AVCodec* codec,
+			virtual void get_defaults(obs_data_t* settings, AVCodec* codec,
 			                          AVCodecContext* context) override;
 
-			virtual void get_properties(obs_properties_t* props, const AVCodec* codec,
+			virtual void get_properties(obs_properties_t* props, AVCodec* codec,
 			                            AVCodecContext* context) override;
 
-			virtual void update(obs_data_t* settings, const AVCodec* codec,
+			virtual void update(obs_data_t* settings, AVCodec* codec, AVCodecContext* context) override;
-			                    AVCodecContext* context) override;
 		};
 	} // namespace ui
 } // namespace obsffmpeg

source/utility.cpp

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

source/utility.hpp

@@ -1,33 +1,24 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
+// Copyright (C) 2018 - 2018 Michael Fabian Dirks
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
+// This program is free software; you can redistribute it and/or modify
-// of this software and associated documentation files (the "Software"), to deal
+// it under the terms of the GNU General Public License as published by
-// in the Software without restriction, including without limitation the rights
+// the Free Software Foundation; either version 2 of the License, or
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// (at your option) any later version.
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
 //
-// The above copyright notice and this permission notice shall be included in all
+// This program is distributed in the hope that it will be useful,
-// copies or substantial portions of the Software.
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// You should have received a copy of the GNU General Public License
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// along with this program; if not, write to the Free Software
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 
 #include "version.hpp"
 
-extern "C" {
-#include <obs-config.h>
-#include <obs.h>
-}
-
 // Logging
 #define PLOG(level, ...) blog(level, "[obs-ffmpeg-encoder] " __VA_ARGS__);
 #define PLOG_ERROR(...) PLOG(LOG_ERROR, __VA_ARGS__)
@@ -80,11 +71,3 @@ extern "C" {
 	static void f(void) __attribute__((constructor)); \
 	static void f(void)
 #endif
-
-// Helpers
-namespace obsffmpeg {
-	bool inline are_property_groups_broken()
-	{
-		return obs_get_version() < MAKE_SEMANTIC_VERSION(24, 0, 0);
-	}
-} // namespace obsffmpeg