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

Bump x265 encoder version.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-06-04 19:36:20 +02:00
parent ee2e684365
commit e2ad461784
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/encoder_x265.cpp
View File

@ -32,8 +32,8 @@
#include <QRegExp> #include <QRegExp>
//x265 version info //x265 version info
static const unsigned int VERSION_X265_MINIMUM_VER = 10; static const unsigned int VERSION_X265_MINIMUM_VER = 11;
static const unsigned int VERSION_X265_MINIMUM_REV = 38; static const unsigned int VERSION_X265_MINIMUM_REV = 0;
// ------------------------------------------------------------ // ------------------------------------------------------------
// Helper Macros // Helper Macros
@ -188,7 +188,8 @@ const QString &X265Encoder::getName(void)
void X265Encoder::checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine) void X265Encoder::checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine)
{ {
cmdLine << "--version"; cmdLine << "--version";
patterns << new QRegExp("\\bHEVC\\s+encoder\\s+version\\s+(\\d)\\.(\\d+)\\+(\\d+)-[a-f0-9]+\\b", Qt::CaseInsensitive); patterns << new QRegExp("\\bHEVC\\s+encoder\\s+version\\s+(\\d)\\.(\\d+)\\+(\\d+)\\b", Qt::CaseInsensitive);
patterns << new QRegExp("\\bHEVC\\s+encoder\\s+version\\s+(\\d)\\.(\\d+)\\b", Qt::CaseInsensitive);
} }
void X265Encoder::checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified) void X265Encoder::checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified)
@ -208,6 +209,18 @@ void X265Encoder::checkVersion_parseLine(const QString &line, QList<QRegExp*> &p
} }
if(ok[2]) build = temp[2]; if(ok[2]) build = temp[2];
} }
else if((offset = patterns[1]->lastIndexIn(line)) >= 0)
{
bool ok[2] = { false, false };
unsigned int temp[2];
temp[0] = patterns[1]->cap(1).toUInt(&ok[0]);
temp[1] = patterns[1]->cap(2).toUInt(&ok[1]);
if(ok[0] && ok[1])
{
core = (10 * temp[0]) + temp[1];
}
build = 0;
}
if(!line.isEmpty()) if(!line.isEmpty())
{ {

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 4 #define VER_X264_MINOR 4
#define VER_X264_PATCH 0 #define VER_X264_PATCH 0
#define VER_X264_BUILD 876 #define VER_X264_BUILD 878
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)