Updated CA certificates file for cURL.

[x264-launcher/x264-launcher.git] / src / encoder_x265.cpp

diff --git a/src/encoder_x265.cpp b/src/encoder_x265.cpp
index 99eb230..e877431 100644 (file)
--- a/src/encoder_x265.cpp
+++ b/src/encoder_x265.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2021 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 #include "model_clipInfo.h"
 
 //MUtils
+#include <MUtils/Global.h>
 #include <MUtils/Exception.h>
 
 //Qt
@@ -39,8 +40,8 @@
 #include <QPair>
 
 //x265 version info
-static const unsigned int VERSION_X265_MINIMUM_VER =  19;
-static const unsigned int VERSION_X265_MINIMUM_REV = 183;
+static const unsigned int VERSION_X265_MINIMUM_VER = 35;
+static const unsigned int VERSION_X265_MINIMUM_REV = 20;
 
 // ------------------------------------------------------------
 // Helper Macros
@@ -118,7 +119,7 @@ public:
 
        virtual QStringList getTunings(void) const
        {
-               return QStringList() << "Grain" << "PSNR" << "SSIM" << "FastDecode" << "ZeroLatency";
+               return QStringList() << "Grain" << "PSNR" << "SSIM" << "FastDecode" << "ZeroLatency" << "Animation";
        }
 
        virtual QStringList getPresets(void) const
@@ -159,21 +160,18 @@ public:
 
        virtual QString getBinaryPath(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const
        {
-               QString arch, variant;
+               QString arch;
                switch(encArch)
                {
                        case 0: arch = "x86"; break;
                        case 1: arch = "x64"; break;
                        default: MUTILS_THROW("Unknown encoder arch!");
                }
-               switch(encVariant)
+               if((encVariant < 0) || (encVariant > 2))
                {
-                       case 0: variant =  "8bit"; break;
-                       case 1: variant = "10bit"; break;
-                       case 2: variant = "12bit"; break;
-                       default: MUTILS_THROW("Unknown encoder arch!");
+                       MUTILS_THROW("Unknown encoder variant!");
                }
-               return QString("%1/toolset/%2/x265_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant);
+               return QString("%1/toolset/%2/x265_%2.exe").arg(sysinfo->getAppPath(), arch);
        }
 
        virtual QString getHelpCommand(void) const
@@ -225,38 +223,40 @@ QString X265Encoder::getName(void) const
 void X265Encoder::checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine)
 {
        cmdLine << "--version";
-       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);
+       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+)\\_Au\\+(\\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, const QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified)
 {
        int offset = -1;
 
-       if((offset = patterns[0]->lastIndexIn(line)) >= 0)
+       for (size_t q = 0; q < 2; ++q)
        {
-               bool ok[3] = { false, false, false };
-               unsigned int temp[3];
-               temp[0] = patterns[0]->cap(1).toUInt(&ok[0]);
-               temp[1] = patterns[0]->cap(2).toUInt(&ok[1]);
-               temp[2] = patterns[0]->cap(3).toUInt(&ok[2]);
-               if(ok[0] && ok[1])
+               if ((offset = patterns[q]->lastIndexIn(line)) >= 0)
                {
-                       core = (10 * temp[0]) + temp[1];
+                       unsigned int temp[3];
+                       if (MUtils::regexp_parse_uint32(*patterns[q], temp, 3))
+                       {
+                               core = (10 * temp[0]) + temp[1];
+                               build = temp[2];
+                               break;
+                       }
                }
-               if(ok[2]) build = temp[2];
        }
-       else if((offset = patterns[1]->lastIndexIn(line)) >= 0)
+
+       if ((!core) || (core == UINT_MAX))
        {
-               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])
+               if ((offset = patterns[2]->lastIndexIn(line)) >= 0)
                {
-                       core = (10 * temp[0]) + temp[1];
+                       unsigned int temp[2];
+                       if (MUtils::regexp_parse_uint32(*patterns[2], temp, 2))
+                       {
+                               core = (10 * temp[0]) + temp[1];
+                       }
+                       build = 0;
                }
-               build = 0;
        }
 
        if(!line.isEmpty())
@@ -280,7 +280,7 @@ bool X265Encoder::isVersionSupported(const unsigned int &revision, const bool &m
 
        if((core < VERSION_X265_MINIMUM_VER) || ((core == VERSION_X265_MINIMUM_VER) && (build < VERSION_X265_MINIMUM_REV)))
        {
-               log(tr("\nERROR: Your version of x265 is too old! (Minimum required revision is 0.%1+%2)").arg(QString::number(VERSION_X265_MINIMUM_VER), QString::number(VERSION_X265_MINIMUM_REV)));
+               log(tr("\nERROR: Your version of x265 is too old! (Minimum required revision is %1.%2+%3)").arg(QString::number(VERSION_X265_MINIMUM_VER / 10), QString::number(VERSION_X265_MINIMUM_VER % 10), QString::number(VERSION_X265_MINIMUM_REV)));
                return false;
        }
        else if(core > VERSION_X265_MINIMUM_VER)
@@ -300,6 +300,22 @@ void X265Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, co
 {
        double crf_int = 0.0, crf_frc = 0.0;
 
+       cmdLine << "-D";
+       switch (m_options->encVariant())
+       {
+       case 0:
+               cmdLine << QString::number(8);
+               break;
+       case 1:
+               cmdLine << QString::number(10);
+               break;
+       case 2:
+               cmdLine << QString::number(12);
+               break;
+       default:
+               MUTILS_THROW("Unknown encoder variant!");
+       }
+
        switch(m_options->rcMode())
        {
        case 0:
@@ -393,7 +409,7 @@ void X265Encoder::runEncodingPass_init(QList<QRegExp*> &patterns)
        patterns << new QRegExp("\\[\\s*(\\d+)\\.(\\d+)%\\]\\s+(\\d+)/(\\d+)\\s(\\d+).(\\d+)\\s(\\d+).(\\d+)\\s+(\\d+):(\\d+):(\\d+)\\s+(\\d+):(\\d+):(\\d+)"); //regExpModified
 }
 
-void X265Encoder::runEncodingPass_parseLine(const QString &line, QList<QRegExp*> &patterns, const ClipInfo &clipInfo, const int &pass, double &last_progress, double &size_estimate)
+void X265Encoder::runEncodingPass_parseLine(const QString &line, const QList<QRegExp*> &patterns, const ClipInfo &clipInfo, const int &pass, double &last_progress, double &size_estimate)
 {
        int offset = -1;
        if((offset = patterns[0]->lastIndexIn(line)) >= 0)