From 712d597080f6a8325f629d302fea44b0723b108b Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sat, 8 Apr 2017 14:15:53 +0200
Subject: [PATCH] Updated NvencC version.

---
 HISTORY.txt                                   |  3 +++
 src/encoder_factory.cpp                       |  2 +-
 src/{encoder_nvenc.cpp => encoder_nvencc.cpp} |  6 +++---
 src/{encoder_nvenc.h => encoder_nvencc.h}     |  0
 src/version.h                                 |  2 +-
 x264_launcher_MSVC2013.vcxproj                |  4 ++--
 x264_launcher_MSVC2013.vcxproj.filters        | 12 ++++++------
 x264_launcher_MSVC2015.vcxproj                |  4 ++--
 x264_launcher_MSVC2015.vcxproj.filters        | 12 ++++++------
 9 files changed, 24 insertions(+), 21 deletions(-)
 rename src/{encoder_nvenc.cpp => encoder_nvencc.cpp} (98%)
 rename src/{encoder_nvenc.h => encoder_nvencc.h} (100%)

diff --git a/HISTORY.txt b/HISTORY.txt
index f14f310..1344da5 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -2,6 +2,9 @@
 Simple x264/x265 Launcher version history 
 ----------------------------------------- 
 
+Version 2.81 [2017-??-??]
+* Updated NVEncC to version 3.07
+
 Version 2.80 [2017-04-01]
 * Another attempt to fix application startup error "0xc0000005"
 * Some tweaks to speed-up the update checker
diff --git a/src/encoder_factory.cpp b/src/encoder_factory.cpp
index 4c89d0f..2835f37 100644
--- a/src/encoder_factory.cpp
+++ b/src/encoder_factory.cpp
@@ -26,7 +26,7 @@
 #include "model_options.h"
 #include "encoder_x264.h"
 #include "encoder_x265.h"
-#include "encoder_nvenc.h"
+#include "encoder_nvencc.h"
 
 //MUtils
 #include <MUtils/Exception.h>
diff --git a/src/encoder_nvenc.cpp b/src/encoder_nvencc.cpp
similarity index 98%
rename from src/encoder_nvenc.cpp
rename to src/encoder_nvencc.cpp
index 61c7bb6..d95b5e7 100644
--- a/src/encoder_nvenc.cpp
+++ b/src/encoder_nvencc.cpp
@@ -19,7 +19,7 @@
 // http://www.gnu.org/licenses/gpl-2.0.txt
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "encoder_nvenc.h"
+#include "encoder_nvencc.h"
 
 //Internal
 #include "global.h"
@@ -40,7 +40,7 @@
 #include <QPair>
 
 //x265 version info
-static const unsigned int VERSION_NVENCC_MINIMUM_VER = 302;
+static const unsigned int VERSION_NVENCC_MINIMUM_VER = 307;
 static const unsigned int VERSION_NVENCC_MINIMUM_API =  70;
 
 // ------------------------------------------------------------
@@ -249,7 +249,7 @@ QString NVEncEncoder::getName(void) const
 void NVEncEncoder::checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine)
 {
 	cmdLine << "--version";
-	patterns << new QRegExp("\\bNVEncC\\s+\\(x\\d+\\)\\s+(\\d)\\.(\\d+).*\\[NVENC\\s+API\\s+v(\\d+)\\.(\\d+)\\]", Qt::CaseInsensitive);
+	patterns << new QRegExp("\\bNVEncC\\s+\\(x\\d+\\)\\s+(\\d)\\.(\\d+).*\\[NVENC\\s+API\\s+v(\\d+)\\.(\\d+)[^\\d]+", Qt::CaseInsensitive);
 }
 
 void NVEncEncoder::checkVersion_parseLine(const QString &line, const QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified)
diff --git a/src/encoder_nvenc.h b/src/encoder_nvencc.h
similarity index 100%
rename from src/encoder_nvenc.h
rename to src/encoder_nvencc.h
diff --git a/src/version.h b/src/version.h
index 264b266..e403694 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 8
 #define VER_X264_PATCH 0
-#define VER_X264_BUILD 1101
+#define VER_X264_BUILD 1105
 
 #define VER_X264_PORTABLE_EDITION (0)
 
diff --git a/x264_launcher_MSVC2013.vcxproj b/x264_launcher_MSVC2013.vcxproj
index 0d1b073..02cb5a9 100644
--- a/x264_launcher_MSVC2013.vcxproj
+++ b/x264_launcher_MSVC2013.vcxproj
@@ -287,7 +287,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <ClInclude Include="src\encoder_nvenc.h" />
+    <ClInclude Include="src\encoder_nvencc.h" />
     <ClInclude Include="src\model_clipInfo.h" />
     <ClInclude Include="src\source_factory.h" />
     <ClInclude Include="src\string_validator.h" />
@@ -433,7 +433,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
   <ItemGroup>
     <ClCompile Include="src\encoder_abstract.cpp" />
     <ClCompile Include="src\encoder_factory.cpp" />
-    <ClCompile Include="src\encoder_nvenc.cpp" />
+    <ClCompile Include="src\encoder_nvencc.cpp" />
     <ClCompile Include="src\encoder_x264.cpp" />
     <ClCompile Include="src\encoder_x265.cpp" />
     <ClCompile Include="src\job_object.cpp" />
diff --git a/x264_launcher_MSVC2013.vcxproj.filters b/x264_launcher_MSVC2013.vcxproj.filters
index 7184bfd..89f52d3 100644
--- a/x264_launcher_MSVC2013.vcxproj.filters
+++ b/x264_launcher_MSVC2013.vcxproj.filters
@@ -111,15 +111,15 @@
     <ClInclude Include="src\source_factory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\encoder_nvenc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\model_clipInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\string_validator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\encoder_nvencc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\main.cpp">
@@ -275,15 +275,15 @@
     <ClCompile Include="src\source_factory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\encoder_nvenc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\model_clipInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\string_validator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\encoder_nvencc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\win_main.h">
diff --git a/x264_launcher_MSVC2015.vcxproj b/x264_launcher_MSVC2015.vcxproj
index df2271f..c655f91 100644
--- a/x264_launcher_MSVC2015.vcxproj
+++ b/x264_launcher_MSVC2015.vcxproj
@@ -287,7 +287,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <ClInclude Include="src\encoder_nvenc.h" />
+    <ClInclude Include="src\encoder_nvencc.h" />
     <ClInclude Include="src\model_clipInfo.h" />
     <ClInclude Include="src\source_factory.h" />
     <ClInclude Include="src\string_validator.h" />
@@ -433,7 +433,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
   <ItemGroup>
     <ClCompile Include="src\encoder_abstract.cpp" />
     <ClCompile Include="src\encoder_factory.cpp" />
-    <ClCompile Include="src\encoder_nvenc.cpp" />
+    <ClCompile Include="src\encoder_nvencc.cpp" />
     <ClCompile Include="src\encoder_x264.cpp" />
     <ClCompile Include="src\encoder_x265.cpp" />
     <ClCompile Include="src\job_object.cpp" />
diff --git a/x264_launcher_MSVC2015.vcxproj.filters b/x264_launcher_MSVC2015.vcxproj.filters
index 7184bfd..89f52d3 100644
--- a/x264_launcher_MSVC2015.vcxproj.filters
+++ b/x264_launcher_MSVC2015.vcxproj.filters
@@ -111,15 +111,15 @@
     <ClInclude Include="src\source_factory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\encoder_nvenc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\model_clipInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\string_validator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\encoder_nvencc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\main.cpp">
@@ -275,15 +275,15 @@
     <ClCompile Include="src\source_factory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\encoder_nvenc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\model_clipInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\string_validator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\encoder_nvencc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\win_main.h">