Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Updated NvencC version.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-04-08 14:15:53 +02:00
parent 18ce4e48e0
commit 712d597080
9 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY.txt
View File

@ -2,6 +2,9 @@
Simple x264/x265 Launcher version history Simple x264/x265 Launcher version history
----------------------------------------- -----------------------------------------
Version 2.81 [2017-??-??]
* Updated NVEncC to version 3.07
Version 2.80 [2017-04-01] Version 2.80 [2017-04-01]
* Another attempt to fix application startup error "0xc0000005" * Another attempt to fix application startup error "0xc0000005"
* Some tweaks to speed-up the update checker * Some tweaks to speed-up the update checker

2
src/encoder_factory.cpp
View File

@ -26,7 +26,7 @@
#include "model_options.h" #include "model_options.h"
#include "encoder_x264.h" #include "encoder_x264.h"
#include "encoder_x265.h" #include "encoder_x265.h"
#include "encoder_nvenc.h" #include "encoder_nvencc.h"
//MUtils //MUtils
#include <MUtils/Exception.h> #include <MUtils/Exception.h>

6
src/encoder_nvenc.cpp → src/encoder_nvencc.cpp
View File

@ -19,7 +19,7 @@
// http://www.gnu.org/licenses/gpl-2.0.txt // http://www.gnu.org/licenses/gpl-2.0.txt
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include "encoder_nvenc.h" #include "encoder_nvencc.h"
//Internal //Internal
#include "global.h" #include "global.h"
@ -40,7 +40,7 @@
#include <QPair> #include <QPair>
//x265 version info //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; 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) void NVEncEncoder::checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine)
{ {
cmdLine << "--version"; 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) void NVEncEncoder::checkVersion_parseLine(const QString &line, const QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified)

0
src/encoder_nvenc.h → src/encoder_nvencc.h
View File

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 8 #define VER_X264_MINOR 8
#define VER_X264_PATCH 0 #define VER_X264_PATCH 0
#define VER_X264_BUILD 1101 #define VER_X264_BUILD 1105
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)

4
x264_launcher_MSVC2013.vcxproj
View File

@ -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)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild> </CustomBuild>
<ClInclude Include="src\encoder_nvenc.h" /> <ClInclude Include="src\encoder_nvencc.h" />
<ClInclude Include="src\model_clipInfo.h" /> <ClInclude Include="src\model_clipInfo.h" />
<ClInclude Include="src\source_factory.h" /> <ClInclude Include="src\source_factory.h" />
<ClInclude Include="src\string_validator.h" /> <ClInclude Include="src\string_validator.h" />
@ -433,7 +433,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
<ItemGroup> <ItemGroup>
<ClCompile Include="src\encoder_abstract.cpp" /> <ClCompile Include="src\encoder_abstract.cpp" />
<ClCompile Include="src\encoder_factory.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_x264.cpp" />
<ClCompile Include="src\encoder_x265.cpp" /> <ClCompile Include="src\encoder_x265.cpp" />
<ClCompile Include="src\job_object.cpp" /> <ClCompile Include="src\job_object.cpp" />

12
x264_launcher_MSVC2013.vcxproj.filters
View File

@ -111,15 +111,15 @@
<ClInclude Include="src\source_factory.h"> <ClInclude Include="src\source_factory.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\encoder_nvenc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\model_clipInfo.h"> <ClInclude Include="src\model_clipInfo.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\string_validator.h"> <ClInclude Include="src\string_validator.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\encoder_nvencc.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\main.cpp"> <ClCompile Include="src\main.cpp">
@ -275,15 +275,15 @@
<ClCompile Include="src\source_factory.cpp"> <ClCompile Include="src\source_factory.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\encoder_nvenc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\model_clipInfo.cpp"> <ClCompile Include="src\model_clipInfo.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\string_validator.cpp"> <ClCompile Include="src\string_validator.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\encoder_nvencc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="src\win_main.h"> <CustomBuild Include="src\win_main.h">

4
x264_launcher_MSVC2015.vcxproj
View File

@ -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)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild> </CustomBuild>
<ClInclude Include="src\encoder_nvenc.h" /> <ClInclude Include="src\encoder_nvencc.h" />
<ClInclude Include="src\model_clipInfo.h" /> <ClInclude Include="src\model_clipInfo.h" />
<ClInclude Include="src\source_factory.h" /> <ClInclude Include="src\source_factory.h" />
<ClInclude Include="src\string_validator.h" /> <ClInclude Include="src\string_validator.h" />
@ -433,7 +433,7 @@ copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\im
<ItemGroup> <ItemGroup>
<ClCompile Include="src\encoder_abstract.cpp" /> <ClCompile Include="src\encoder_abstract.cpp" />
<ClCompile Include="src\encoder_factory.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_x264.cpp" />
<ClCompile Include="src\encoder_x265.cpp" /> <ClCompile Include="src\encoder_x265.cpp" />
<ClCompile Include="src\job_object.cpp" /> <ClCompile Include="src\job_object.cpp" />

12
x264_launcher_MSVC2015.vcxproj.filters
View File

@ -111,15 +111,15 @@
<ClInclude Include="src\source_factory.h"> <ClInclude Include="src\source_factory.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\encoder_nvenc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\model_clipInfo.h"> <ClInclude Include="src\model_clipInfo.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\string_validator.h"> <ClInclude Include="src\string_validator.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\encoder_nvencc.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\main.cpp"> <ClCompile Include="src\main.cpp">
@ -275,15 +275,15 @@
<ClCompile Include="src\source_factory.cpp"> <ClCompile Include="src\source_factory.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\encoder_nvenc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\model_clipInfo.cpp"> <ClCompile Include="src\model_clipInfo.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\string_validator.cpp"> <ClCompile Include="src\string_validator.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\encoder_nvencc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="src\win_main.h"> <CustomBuild Include="src\win_main.h">