locale: Add new NVENC translation strings

Also allocate 8MB of storage initially, and free the buffers in the packet on stop.

CMakeLists.txt

@@ -1,19 +1,23 @@
-# Integrates most FFmpeg supported encoders into OBS Studio
+# FFMPEG Video Encoder Integration for OBS Studio
-# Copyright (C) 2018 - 2019 Michael Fabian Dirks
+# Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-# it under the terms of the GNU General Public License as published by
+# of this software and associated documentation files (the "Software"), to deal
-# the Free Software Foundation; either version 2 of the License, or
+# in the Software without restriction, including without limitation the rights
-# (at your option) any later version.
+# 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:
 #
-# This program is distributed in the hope that it will be useful,
+# The above copyright notice and this permission notice shall be included in all
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# copies or substantial portions of the Software.
-# 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
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# along with this program; if not, write to the Free Software
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+# 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.
 
 # CMake Setup
 CMake_Minimum_Required(VERSION 3.8.0)
@@ -266,6 +270,8 @@ set(PROJECT_PRIVATE
 	"${PROJECT_SOURCE_DIR}/source/strings.hpp"
 	"${PROJECT_SOURCE_DIR}/source/codecs/hevc.hpp"
 	"${PROJECT_SOURCE_DIR}/source/codecs/hevc.cpp"
+	"${PROJECT_SOURCE_DIR}/source/codecs/h264.hpp"
+	"${PROJECT_SOURCE_DIR}/source/codecs/h264.cpp"
 	"${PROJECT_SOURCE_DIR}/source/encoders/generic.hpp"
 	"${PROJECT_SOURCE_DIR}/source/encoders/generic.cpp"
 	"${PROJECT_SOURCE_DIR}/source/encoders/prores_aw.hpp"
@@ -284,6 +290,8 @@ set(PROJECT_PRIVATE
 	"${PROJECT_SOURCE_DIR}/source/ui/prores_aw_handler.cpp"
 	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_shared.hpp"
 	"${PROJECT_SOURCE_DIR}/source/ui/nvenc_shared.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"
 )

LICENSE

@@ -1,278 +1,21 @@
-		    GNU GENERAL PUBLIC LICENSE
+MIT License
-		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
 
-			    Preamble
+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 licenses for most software are designed to take away your
+The above copyright notice and this permission notice shall be included in all
-freedom to share and change it.  By contrast, the GNU General Public
+copies or substantial portions of the Software.
-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.
 
-  When we speak of free software, we are referring to freedom, not
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-price.  Our General Public Licenses are designed to make sure that you
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-have the freedom to distribute copies of free software (and charge for
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-this service if you wish), that you receive source code or can get it
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-if you want it, that you can change the software or use pieces of it
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-in new free programs; and that you know you can do these things.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+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.

data/locale/en-US.ini

@@ -39,6 +39,7 @@ 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"
@@ -61,6 +62,15 @@ ProRes.Profile.Light="Light (LT)"
 ProRes.Profile.Standard="Standard"
 ProRes.Profile.HighQuality="High Quality (HQ)"
 
+# 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"
@@ -106,17 +116,33 @@ 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"
+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"
+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.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"

source/codecs/h264.cpp

@@ -0,0 +1,22 @@
+// 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

@@ -0,0 +1,67 @@
+// 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,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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"
 

source/codecs/hevc.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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>

source/encoder.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "encoder.hpp"
 

source/encoder.hpp

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

source/encoders/generic.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "generic.hpp"
 #include <iomanip>
@@ -438,8 +442,51 @@ encoder::generic::generic(obs_data_t* settings, obs_encoder_t* encoder)
 			AVPixelFormat source = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format);
 			AVPixelFormat target = AV_PIX_FMT_NONE;
 
-			int loss = 0;
+			// Prefer lossless or zero-change formats.
-			target   = avcodec_find_best_pix_fmt_of_list(this->codec->pix_fmts, source, false, &loss);
+			for (auto ptr = this->codec->pix_fmts; *ptr != AV_PIX_FMT_NONE; ptr++) {
+				switch (source) {
+				case AV_PIX_FMT_RGBA:
+					switch (*ptr) {
+					case AV_PIX_FMT_RGB0:
+					case AV_PIX_FMT_RGBA:
+						target = *ptr;
+						break;
+					case AV_PIX_FMT_BGR0:
+					case AV_PIX_FMT_BGRA:
+						target = *ptr;
+						break;
+					}
+					break;
+				case AV_PIX_FMT_BGRA:
+				case AV_PIX_FMT_BGR0:
+					switch (*ptr) {
+					case AV_PIX_FMT_RGB0:
+					case AV_PIX_FMT_RGBA:
+						target = *ptr;
+						break;
+					case AV_PIX_FMT_BGR0:
+					case AV_PIX_FMT_BGRA:
+						target = *ptr;
+						break;
+					}
+					break;
+				case AV_PIX_FMT_YUV444P:
+				case AV_PIX_FMT_YUYV422:
+				case AV_PIX_FMT_YVYU422:
+				case AV_PIX_FMT_UYVY422:
+				case AV_PIX_FMT_YUV420P:
+				case AV_PIX_FMT_NV12:
+					if (*ptr == source) {
+						target = *ptr;
+					}
+					break;
+				}
+			}
+
+			if (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);
@@ -493,20 +540,18 @@ encoder::generic::generic(obs_data_t* settings, obs_encoder_t* encoder)
 		// 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);
+		this->frame_queue.precache(2);
 	} else if (this->codec->type == AVMEDIA_TYPE_AUDIO) {
 	}
 
-	// Create Packet
+	av_init_packet(&this->current_packet);
-	this->current_packet = av_packet_alloc();
+	av_new_packet(&this->current_packet, 8 * 1024 * 1024); // 8 MB precached Packet size.
-	if (!this->current_packet) {
-		PLOG_ERROR("Failed to allocate packet storage.");
-		throw std::runtime_error("Failed to allocate packet storage.");
-	}
 }
 
 encoder::generic::~generic()
 {
+	av_packet_unref(&this->current_packet);
+
 	this->frame_queue.clear();
 	this->frame_queue_used.clear();
 	this->swscale.finalize();
@@ -577,32 +622,75 @@ bool encoder::generic::get_extra_data(uint8_t** extra_data, size_t* size)
 	return true;
 }
 
+static inline void copy_data(encoder_frame* frame, AVFrame* vframe)
+{
+	int h_chroma_shift, v_chroma_shift;
+	av_pix_fmt_get_chroma_sub_sample(static_cast<AVPixelFormat>(vframe->format), &h_chroma_shift, &v_chroma_shift);
+
+	for (size_t idx = 0; idx < MAX_AV_PLANES; idx++) {
+		if (!frame->data[idx] || !vframe->data[idx])
+			continue;
+
+		size_t plane_height = vframe->height >> (idx ? v_chroma_shift : 0);
+
+		if (static_cast<uint32_t>(vframe->linesize[idx]) == frame->linesize[idx]) {
+			std::memcpy(vframe->data[idx], frame->data[idx], frame->linesize[idx] * plane_height);
+		} else {
+			size_t ls_in  = frame->linesize[idx];
+			size_t ls_out = vframe->linesize[idx];
+			size_t bytes  = ls_in < ls_out ? ls_in : ls_out;
+
+			uint8_t* to   = vframe->data[idx];
+			uint8_t* from = frame->data[idx];
+
+			for (size_t y = 0; y < plane_height; y++) {
+				std::memcpy(to, from, bytes);
+				to += ls_out;
+				from += ls_in;
+			}
+		}
+	}
+}
+
 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.
 	{
+#ifdef _DEBUG
 		ScopeProfiler profile("convert");
+#endif
 
+		vframe->height      = this->context->height;
+		vframe->format      = this->context->pix_fmt;
 		vframe->color_range = this->context->color_range;
 		vframe->colorspace  = this->context->colorspace;
 
-		int res =
+		if ((swscale.is_source_full_range() == swscale.is_target_full_range())
-		    swscale.convert(reinterpret_cast<uint8_t**>(frame->data), reinterpret_cast<int*>(frame->linesize),
+		    && (swscale.get_source_colorspace() == swscale.get_target_colorspace())
-		                    0, this->context->height, vframe->data, vframe->linesize);
+		    && (swscale.get_source_format() == swscale.get_target_format())) {
-		if (res <= 0) {
+			copy_data(frame, vframe.get());
-			PLOG_ERROR("Failed to convert frame: %s (%ld).", ffmpeg::tools::get_error_description(res),
+		} else {
-			           res);
+			int res = swscale.convert(reinterpret_cast<uint8_t**>(frame->data),
-			return false;
+			                          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.
 	{
+#ifdef _DEBUG
 		ScopeProfiler profile("loop");
-		bool          sent_frame  = false;
+#endif
-		bool          recv_packet = false;
+
-		bool          should_lag  = (lag_in_frames - frame_count) <= 0;
+		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);
@@ -612,7 +700,9 @@ bool encoder::generic::video_encode(encoder_frame* frame, encoder_packet* packet
 			bool eagain_is_stupid = false;
 
 			if (!sent_frame) {
+#ifdef _DEBUG
 				ScopeProfiler profile_inner("send");
+#endif
 
 				vframe->pts = frame->pts;
 
@@ -620,7 +710,7 @@ bool encoder::generic::video_encode(encoder_frame* frame, encoder_packet* packet
 				switch (res) {
 				case 0:
 					sent_frame = true;
-					frame_count++;
+					vframe     = nullptr;
 					break;
 				case AVERROR(EAGAIN):
 					// This means we should call receive_packet again, but what do we do with that data?
@@ -629,7 +719,6 @@ bool encoder::generic::video_encode(encoder_frame* frame, encoder_packet* packet
 						PLOG_WARNING(
 						    "Skipped frame due to EAGAIN when a packet was already returned.");
 						sent_frame = true;
-						frame_count++;
 					}
 					eagain_is_stupid = true;
 					break;
@@ -645,7 +734,9 @@ bool encoder::generic::video_encode(encoder_frame* frame, encoder_packet* packet
 			}
 
 			if (!recv_packet) {
+#ifdef _DEBUG
 				ScopeProfiler profile_inner("recieve");
+#endif
 
 				int res = receive_packet(received_packet, packet);
 				switch (res) {
@@ -678,6 +769,10 @@ bool encoder::generic::video_encode(encoder_frame* frame, encoder_packet* packet
 		}
 	}
 
+	if (vframe != nullptr) {
+		frame_queue.push(vframe);
+	}
+
 	return true;
 }
 
@@ -688,14 +783,14 @@ bool encoder::generic::video_encode_texture(uint32_t, int64_t, uint64_t, uint64_
 
 int encoder::generic::receive_packet(bool* received_packet, struct encoder_packet* packet)
 {
-	int res = avcodec_receive_packet(this->context, this->current_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->pts           = this->current_packet.pts;
-		packet->dts           = this->current_packet->dts;
+		packet->dts           = this->current_packet.dts;
-		packet->data          = this->current_packet->data;
+		packet->data          = this->current_packet.data;
-		packet->size          = this->current_packet->size;
+		packet->size          = this->current_packet.size;
-		packet->keyframe      = !!(this->current_packet->flags & AV_PKT_FLAG_KEY);
+		packet->keyframe      = !!(this->current_packet.flags & AV_PKT_FLAG_KEY);
 		packet->drop_priority = 0;
 		*received_packet      = true;
 
@@ -704,6 +799,7 @@ int encoder::generic::receive_packet(bool* received_packet, struct encoder_packe
 			frame_queue.push(uframe);
 		}
 	}
+
 	return res;
 }
 
@@ -712,6 +808,7 @@ int encoder::generic::send_frame(std::shared_ptr<AVFrame> frame)
 	int res = avcodec_send_frame(this->context, frame.get());
 	switch (res) {
 	case 0:
+		frame_queue_used.push(frame);
 		frame_count++;
 	case AVERROR(EAGAIN):
 	case AVERROR(EOF):

source/encoders/generic.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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
 
@@ -63,7 +67,7 @@ namespace encoder {
 		ffmpeg::avframe_queue frame_queue;
 		ffmpeg::avframe_queue frame_queue_used;
 		ffmpeg::swscale       swscale;
-		AVPacket*             current_packet = nullptr;
+		AVPacket              current_packet;
 
 		int64_t lag_in_frames;
 		int64_t frame_count;

source/encoders/prores_aw.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "prores_aw.hpp"
 #include <obs-module.h>

source/encoders/prores_aw.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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
 

source/ffmpeg/avframe-queue.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "avframe-queue.hpp"
 #include "tools.hpp"

source/ffmpeg/avframe-queue.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 <deque>

source/ffmpeg/swscale.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "swscale.hpp"
 #include <stdexcept>

source/ffmpeg/swscale.hpp

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

source/ffmpeg/tools.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "tools.hpp"
 #include <sstream>
@@ -169,7 +173,7 @@ AVPixelFormat ffmpeg::tools::obs_videoformat_to_avpixelformat(video_format v)
 	switch (v) {
 		// 32-Bits
 	case VIDEO_FORMAT_BGRX:
-		return AV_PIX_FMT_BGRA;
+		return AV_PIX_FMT_BGR0;
 	case VIDEO_FORMAT_BGRA:
 		return AV_PIX_FMT_BGRA;
 	case VIDEO_FORMAT_RGBA:

source/ffmpeg/tools.hpp

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

source/plugin.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "plugin.hpp"
 #include <memory>

source/plugin.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 <functional>

source/strings.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "utility.hpp"

source/ui/debug_handler.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "debug_handler.hpp"
 #include <map>

source/ui/debug_handler.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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"

source/ui/handler.cpp

@@ -1,18 +1,22 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "handler.hpp"

source/ui/handler.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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
 

source/ui/nvenc_h264_handler.cpp

@@ -0,0 +1,162 @@
+// 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::get_defaults(obs_data_t* settings, 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, 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, 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, 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(G_STATE_DEFAULT),
+			                          static_cast<int64_t>(codecs::h264::profile::UNKNOWN));
+			for (auto 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(G_STATE_AUTOMATIC),
+			                          static_cast<int64_t>(codecs::h264::level::UNKNOWN));
+			for (auto 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, AVCodec* codec,
+                                                               AVCodecContext* context)
+{
+	nvenc::get_runtime_properties(props, codec, context);
+}

source/ui/nvenc_h264_handler.hpp

@@ -0,0 +1,51 @@
+// 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 get_defaults(obs_data_t* settings, AVCodec* codec,
+			                          AVCodecContext* context) override;
+
+			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;
+
+			private:
+			void get_encoder_properties(obs_properties_t* props, AVCodec* codec);
+
+			void get_runtime_properties(obs_properties_t* props, AVCodec* codec, AVCodecContext* context);
+		};
+	} // namespace ui
+} // namespace obsffmpeg

source/ui/nvenc_hevc_handler.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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"

source/ui/nvenc_hevc_handler.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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"

source/ui/nvenc_shared.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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"
@@ -48,6 +52,14 @@ extern "C" {
 #define P_RATECONTROL_QUALITY_MINIMUM P_RATECONTROL_QUALITY ".Minimum"
 #define P_RATECONTROL_QUALITY_MAXIMUM P_RATECONTROL_QUALITY ".Maximum"
 
+#define P_RATECONTROL_QP P_RATECONTROL ".QP"
+#define P_RATECONTROL_QP_I P_RATECONTROL_QP ".I"
+#define P_RATECONTROL_QP_I_INITIAL P_RATECONTROL_QP_I ".Initial"
+#define P_RATECONTROL_QP_P P_RATECONTROL_QP ".P"
+#define P_RATECONTROL_QP_P_INITIAL P_RATECONTROL_QP_P ".Initial"
+#define P_RATECONTROL_QP_B P_RATECONTROL_QP ".B"
+#define P_RATECONTROL_QP_B_INITIAL P_RATECONTROL_QP_B ".Initial"
+
 #define P_AQ "NVENC.AQ"
 #define P_AQ_SPATIAL P_AQ ".Spatial"
 #define P_AQ_TEMPORAL P_AQ ".Temporal"
@@ -102,8 +114,8 @@ std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmodes{
 };
 
 std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmode_to_opt{
-    {ratecontrolmode::CQP, "const_qp"}, {ratecontrolmode::VBR, "vbr"},       {ratecontrolmode::VBR_HQ, "vbr_hq"},
+    {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"},
+    {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{
@@ -135,12 +147,12 @@ void obsffmpeg::nvenc::get_defaults(obs_data_t* settings, AVCodec*, AVCodecConte
 	obs_data_set_default_int(settings, P_RATECONTROL_QUALITY_MINIMUM, 51);
 	obs_data_set_default_int(settings, P_RATECONTROL_QUALITY_MAXIMUM, -1);
 
-	obs_data_set_default_int(settings, G_RATECONTROL_QP_I, 21);
+	obs_data_set_default_int(settings, P_RATECONTROL_QP_I, 21);
-	obs_data_set_default_int(settings, G_RATECONTROL_QP_P, 21);
+	obs_data_set_default_int(settings, P_RATECONTROL_QP_I_INITIAL, -1);
-	obs_data_set_default_int(settings, G_RATECONTROL_QP_B, 21);
+	obs_data_set_default_int(settings, P_RATECONTROL_QP_P, 21);
-	obs_data_set_default_int(settings, G_RATECONTROL_QP_I_INITIAL, -1);
+	obs_data_set_default_int(settings, P_RATECONTROL_QP_P_INITIAL, -1);
-	obs_data_set_default_int(settings, G_RATECONTROL_QP_P_INITIAL, -1);
+	obs_data_set_default_int(settings, P_RATECONTROL_QP_B, 21);
-	obs_data_set_default_int(settings, G_RATECONTROL_QP_B_INITIAL, -1);
+	obs_data_set_default_int(settings, P_RATECONTROL_QP_B_INITIAL, -1);
 
 	obs_data_set_default_int(settings, G_KEYFRAMES_INTERVALTYPE, 0);
 	obs_data_set_default_double(settings, G_KEYFRAMES_INTERVAL_SECONDS, 2.0);
@@ -195,12 +207,12 @@ static bool modified_ratecontrol(obs_properties_t* props, obs_property_t*, obs_d
 	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QUALITY_MINIMUM), have_quality);
 	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QUALITY_MAXIMUM), have_quality);
 
-	obs_property_set_visible(obs_properties_get(props, G_RATECONTROL_QP_I), have_qp);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QP_I), have_qp);
-	obs_property_set_visible(obs_properties_get(props, G_RATECONTROL_QP_P), have_qp);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QP_P), have_qp);
-	obs_property_set_visible(obs_properties_get(props, G_RATECONTROL_QP_B), have_qp);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QP_B), have_qp);
-	obs_property_set_visible(obs_properties_get(props, G_RATECONTROL_QP_I_INITIAL), have_qp_init);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QP_I_INITIAL), have_qp_init);
-	obs_property_set_visible(obs_properties_get(props, G_RATECONTROL_QP_P_INITIAL), have_qp_init);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QP_P_INITIAL), have_qp_init);
-	obs_property_set_visible(obs_properties_get(props, G_RATECONTROL_QP_B_INITIAL), have_qp_init);
+	obs_property_set_visible(obs_properties_get(props, P_RATECONTROL_QP_B_INITIAL), have_qp_init);
 
 	return true;
 }
@@ -285,37 +297,6 @@ void obsffmpeg::nvenc::get_properties_post(obs_properties_t* props, AVCodec* cod
 			    obs_properties_add_bool(grp, P_RATECONTROL_ADAPTIVEB, TRANSLATE(P_RATECONTROL_ADAPTIVEB));
 			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_ADAPTIVEB)));
 		}
-
-		{
-			auto p = obs_properties_add_int_slider(grp, G_RATECONTROL_QP_I, TRANSLATE(G_RATECONTROL_QP_I),
-			                                       0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(G_RATECONTROL_QP_I)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, G_RATECONTROL_QP_I_INITIAL,
-			                                       TRANSLATE(G_RATECONTROL_QP_I_INITIAL), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(G_RATECONTROL_QP_I_INITIAL)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, G_RATECONTROL_QP_P, TRANSLATE(G_RATECONTROL_QP_P),
-			                                       0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(G_RATECONTROL_QP_P)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, G_RATECONTROL_QP_P_INITIAL,
-			                                       TRANSLATE(G_RATECONTROL_QP_P_INITIAL), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(G_RATECONTROL_QP_P_INITIAL)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, G_RATECONTROL_QP_B, TRANSLATE(G_RATECONTROL_QP_B),
-			                                       0, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(G_RATECONTROL_QP_B)));
-		}
-		{
-			auto p = obs_properties_add_int_slider(grp, G_RATECONTROL_QP_B_INITIAL,
-			                                       TRANSLATE(G_RATECONTROL_QP_B_INITIAL), -1, 51, 1);
-			obs_property_set_long_description(p, TRANSLATE(DESC(G_RATECONTROL_QP_B_INITIAL)));
-		}
 	}
 
 	{
@@ -373,6 +354,46 @@ void obsffmpeg::nvenc::get_properties_post(obs_properties_t* props, AVCodec* cod
 			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QUALITY_MAXIMUM)));
 		}
 	}
+	{
+		obs_properties_t* grp = props;
+		if (!obsffmpeg::are_property_groups_broken()) {
+			grp    = obs_properties_create();
+			auto p = obs_properties_add_group(props, P_RATECONTROL_QP, TRANSLATE(P_RATECONTROL_QP),
+			                                  OBS_GROUP_CHECKABLE, grp);
+			obs_property_set_modified_callback(p, modified_quality);
+		}
+
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QP_I, TRANSLATE(P_RATECONTROL_QP_I),
+			                                       0, 51, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QP_I)));
+		}
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QP_I_INITIAL,
+			                                       TRANSLATE(P_RATECONTROL_QP_I_INITIAL), -1, 51, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QP_I_INITIAL)));
+		}
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QP_P, TRANSLATE(P_RATECONTROL_QP_P),
+			                                       0, 51, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QP_P)));
+		}
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QP_P_INITIAL,
+			                                       TRANSLATE(P_RATECONTROL_QP_P_INITIAL), -1, 51, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QP_P_INITIAL)));
+		}
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QP_B, TRANSLATE(P_RATECONTROL_QP_B),
+			                                       0, 51, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QP_B)));
+		}
+		{
+			auto p = obs_properties_add_int_slider(grp, P_RATECONTROL_QP_B_INITIAL,
+			                                       TRANSLATE(P_RATECONTROL_QP_B_INITIAL), -1, 51, 1);
+			obs_property_set_long_description(p, TRANSLATE(DESC(P_RATECONTROL_QP_B_INITIAL)));
+		}
+	}
 
 	{
 		obs_properties_t* grp = props;
@@ -488,6 +509,13 @@ void obsffmpeg::nvenc::get_runtime_properties(obs_properties_t* props, AVCodec*,
 	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QUALITY), false);
 	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QUALITY_MINIMUM), false);
 	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QUALITY_MAXIMUM), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP_I), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP_I_INITIAL), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP_P), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP_P_INITIAL), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP_B), false);
+	obs_property_set_enabled(obs_properties_get(props, P_RATECONTROL_QP_B_INITIAL), false);
 	obs_property_set_enabled(obs_properties_get(props, G_KEYFRAMES), false);
 	obs_property_set_enabled(obs_properties_get(props, G_KEYFRAMES_INTERVALTYPE), false);
 	obs_property_set_enabled(obs_properties_get(props, G_KEYFRAMES_INTERVAL_SECONDS), false);
@@ -588,19 +616,19 @@ void obsffmpeg::nvenc::update(obs_data_t* settings, AVCodec* codec, AVCodecConte
 
 		if (have_qp) {
 			av_opt_set_int(context->priv_data, "init_qpI",
-			               static_cast<int>(obs_data_get_int(settings, G_RATECONTROL_QP_I)), 0);
+			               static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_QP_I)), 0);
 			av_opt_set_int(context->priv_data, "init_qpP",
-			               static_cast<int>(obs_data_get_int(settings, G_RATECONTROL_QP_P)), 0);
+			               static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_QP_P)), 0);
 			av_opt_set_int(context->priv_data, "init_qpB",
-			               static_cast<int>(obs_data_get_int(settings, G_RATECONTROL_QP_B)), 0);
+			               static_cast<int>(obs_data_get_int(settings, P_RATECONTROL_QP_B)), 0);
 		}
 		if (have_qp_init) {
 			av_opt_set_int(context->priv_data, "init_qpI",
-			               obs_data_get_int(settings, G_RATECONTROL_QP_I_INITIAL), 0);
+			               obs_data_get_int(settings, P_RATECONTROL_QP_I_INITIAL), 0);
 			av_opt_set_int(context->priv_data, "init_qpP",
-			               obs_data_get_int(settings, G_RATECONTROL_QP_P_INITIAL), 0);
+			               obs_data_get_int(settings, P_RATECONTROL_QP_P_INITIAL), 0);
 			av_opt_set_int(context->priv_data, "init_qpB",
-			               obs_data_get_int(settings, G_RATECONTROL_QP_B_INITIAL), 0);
+			               obs_data_get_int(settings, P_RATECONTROL_QP_B_INITIAL), 0);
 		}
 	}
 
@@ -623,9 +651,8 @@ void obsffmpeg::nvenc::update(obs_data_t* settings, AVCodec* codec, AVCodecConte
 	}
 
 	{ // AQ
-		bool saq  = obs_data_get_bool(settings, P_AQ_SPATIAL);
+		bool saq = obs_data_get_bool(settings, P_AQ_SPATIAL);
-		int  saqs = static_cast<int>(obs_data_get_int(settings, P_AQ_STRENGTH));
+		bool taq = obs_data_get_bool(settings, P_AQ_TEMPORAL);
-		bool taq  = obs_data_get_bool(settings, P_AQ_TEMPORAL);
 
 		if (strcmp(codec->name, "h264_nvenc")) {
 			av_opt_set_int(context->priv_data, "spatial-aq", saq ? 1 : 0, 0);
@@ -634,7 +661,10 @@ void obsffmpeg::nvenc::update(obs_data_t* settings, AVCodec* codec, AVCodecConte
 			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);
 		}
-		av_opt_set_int(context->priv_data, "aq-strength", saqs, 0);
+		if (saq) {
+			av_opt_set_int(context->priv_data, "aq-strength",
+			               static_cast<int>(obs_data_get_int(settings, P_AQ_STRENGTH)), 0);
+		}
 	}
 
 	{ // Other

source/ui/nvenc_shared.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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>

source/ui/prores_aw_handler.cpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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 "prores_aw_handler.hpp"
 #include "plugin.hpp"

source/ui/prores_aw_handler.hpp

@@ -1,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2019 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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"

source/utility.cpp

@@ -0,0 +1,20 @@
+// 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,19 +1,23 @@
 // FFMPEG Video Encoder Integration for OBS Studio
-// Copyright (C) 2018 - 2018 Michael Fabian Dirks
+// Copyright (c) 2019 Michael Fabian Dirks <info@xaymar.com>
 //
-// This program is free software; you can redistribute it and/or modify
+// Permission is hereby granted, free of charge, to any person obtaining a copy
-// it under the terms of the GNU General Public License as published by
+// of this software and associated documentation files (the "Software"), to deal
-// the Free Software Foundation; either version 2 of the License, or
+// in the Software without restriction, including without limitation the rights
-// (at your option) any later version.
+// 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:
 //
-// This program is distributed in the hope that it will be useful,
+// The above copyright notice and this permission notice shall be included in all
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// copies or substantial portions of the Software.
-// 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
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// along with this program; if not, write to the Free Software
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+// 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