OSDN Git Service

Fixed detection of x265 versions with `_Au` suffix.
[x264-launcher/x264-launcher.git] / src / encoder_x265.cpp
index 7e0f7a2..9806e9b 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2019 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
 #include "model_status.h"
 #include "mediainfo.h"
 #include "model_sysinfo.h"
+#include "model_clipInfo.h"
 
 //MUtils
+#include <MUtils/Global.h>
 #include <MUtils/Exception.h>
 
 //Qt
 #include <QStringList>
 #include <QDir>
 #include <QRegExp>
+#include <QPair>
 
 //x265 version info
-static const unsigned int VERSION_X265_MINIMUM_VER =  19;
-static const unsigned int VERSION_X265_MINIMUM_REV = 140;
+static const unsigned int VERSION_X265_MINIMUM_VER = 30;
+static const unsigned int VERSION_X265_MINIMUM_REV =  8;
 
 // ------------------------------------------------------------
 // Helper Macros
@@ -89,67 +92,59 @@ while(0)
 class X265EncoderInfo : public AbstractEncoderInfo
 {
 public:
-       virtual QFlags<OptionsModel::EncVariant> getVariants(void) const
+       virtual QString getName(void) const
        {
-               QFlags<OptionsModel::EncVariant> variants;
-               variants |= OptionsModel::EncVariant_8Bit;
-               variants |= OptionsModel::EncVariant_10Bit;
-               variants |= OptionsModel::EncVariant_12Bit;
-               return variants;
+               return "x265 (HEVC/H.265)";
+       }
+
+       virtual QList<ArchId> getArchitectures(void) const
+       {
+               return QList<ArchId>()
+               << qMakePair(QString("32-Bit (x86)"), ARCH_TYPE_X86)
+               << qMakePair(QString("64-Bit (x64)"), ARCH_TYPE_X64);
+       }
+
+       virtual QStringList getVariants(void) const
+       {
+               return QStringList() << "8-Bit" << "10-Bit" << "12-Bit";
+       }
+       virtual QList<RCMode> getRCModes(void) const
+       {
+               return QList<RCMode>()
+               << qMakePair(QString("CRF"),    RC_TYPE_QUANTIZER)
+               << qMakePair(QString("CQ"),     RC_TYPE_QUANTIZER)
+               << qMakePair(QString("2-Pass"), RC_TYPE_MULTIPASS)
+               << qMakePair(QString("ABR"),    RC_TYPE_RATE_KBPS);
        }
 
        virtual QStringList getTunings(void) const
        {
-               QStringList tunings;
-               tunings << "Grain" << "PSNR" << "SSIM" << "FastDecode" << "ZeroLatency";
-               return tunings;
+               return QStringList() << "Grain" << "PSNR" << "SSIM" << "FastDecode" << "ZeroLatency";
        }
 
        virtual QStringList getPresets(void) const
        {
-               QStringList presets;
-               presets << "ultrafast" << "superfast" << "veryfast" << "faster"   << "fast";
-               presets << "medium"    << "slow"      << "slower"   << "veryslow" << "placebo";
-               return presets;
+               return QStringList()
+               << "ultrafast" << "superfast" << "veryfast" << "faster"   << "fast"
+               << "medium"    << "slow"      << "slower"   << "veryslow" << "placebo";
        }
 
-       virtual QStringList getProfiles(const OptionsModel::EncVariant &variant) const
+       virtual QStringList getProfiles(const quint32 &variant) const
        {
                QStringList profiles;
                switch(variant)
                {
-               case OptionsModel::EncVariant_8Bit:
-                       profiles << "main" << "main-intra" << "mainstillpicture" << "main444-8" << "main444-intra" << "main444-stillpicture";
-                       break;
-               case OptionsModel::EncVariant_10Bit:
-                       profiles << "main10" << "main10-intra" << "main422-10" << "main422-10-intra" << "main444-10" << "main444-10-intra";
-                       break;
-               case OptionsModel::EncVariant_12Bit:
-                       profiles << "main12" << "main12-intra" << "main422-12" << "main422-12-intra" << "main444-12" << "main444-12-intra";
-                       break;
+                       case 0: profiles << "main"   << "main-intra"   << "mainstillpicture" << "main444-8"        << "main444-intra" << "main444-stillpicture"; break;
+                       case 1: profiles << "main10" << "main10-intra" << "main422-10"       << "main422-10-intra" << "main444-10"    << "main444-10-intra";     break;
+                       case 2: profiles << "main12" << "main12-intra" << "main422-12"       << "main422-12-intra" << "main444-12"    << "main444-12-intra";     break;
+                       default: MUTILS_THROW("Unknown encoder variant!");
                }
                return profiles;
        }
 
        virtual QStringList supportedOutputFormats(void) const
        {
-               QStringList extLst;
-               extLst << "hevc";
-               return extLst;
-       }
-
-       virtual bool isRCModeSupported(const OptionsModel::RCMode &rcMode) const
-       {
-               switch(rcMode)
-               {
-               case OptionsModel::RCMode_CRF:
-               case OptionsModel::RCMode_CQ:
-               case OptionsModel::RCMode_2Pass:
-               case OptionsModel::RCMode_ABR:
-                       return true;
-               default:
-                       return false;
-               }
+               return QStringList() << "hevc";
        }
 
        virtual bool isInputTypeSupported(const int format) const
@@ -163,33 +158,40 @@ public:
                }
        }
 
-       virtual QString getBinaryPath(const SysinfoModel *sysinfo, const OptionsModel::EncArch &encArch, const OptionsModel::EncVariant &encVariant) const
+       virtual QString getBinaryPath(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const
        {
-               QString arch, variant;
+               QString arch;
                switch(encArch)
                {
-                       case OptionsModel::EncArch_x86_32: arch = "x86"; break;
-                       case OptionsModel::EncArch_x86_64: arch = "x64"; break;
+                       case 0: arch = "x86"; break;
+                       case 1: arch = "x64"; break;
                        default: MUTILS_THROW("Unknown encoder arch!");
                }
-               switch(encVariant)
+               if((encVariant < 0) || (encVariant > 2))
                {
-                       case OptionsModel::EncVariant_8Bit:  variant = "8bit";  break;
-                       case OptionsModel::EncVariant_10Bit: variant = "10bit"; break;
-                       case OptionsModel::EncVariant_12Bit: 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
+       {
+               return "--fullhelp";
        }
 };
 
 static const X265EncoderInfo s_x265EncoderInfo;
 
-const AbstractEncoderInfo &X265Encoder::getEncoderInfo(void)
+const AbstractEncoderInfo& X265Encoder::encoderInfo(void)
 {
        return s_x265EncoderInfo;
 }
 
+const AbstractEncoderInfo &X265Encoder::getEncoderInfo(void) const
+{
+       return encoderInfo();
+}
+
 // ------------------------------------------------------------
 // Constructor & Destructor
 // ------------------------------------------------------------
@@ -211,21 +213,7 @@ X265Encoder::~X265Encoder(void)
 
 QString X265Encoder::getName(void) const
 {
-       QString arch, variant;
-       switch(m_options->encArch())
-       {
-               case OptionsModel::EncArch_x86_32: arch = "x86"; break;
-               case OptionsModel::EncArch_x86_64: arch = "x64"; break;
-               default: MUTILS_THROW("Unknown encoder arch!");
-       }
-       switch(m_options->encVariant())
-       {
-               case OptionsModel::EncVariant_8Bit:  variant = "8-Bit";  break;
-               case OptionsModel::EncVariant_10Bit: variant = "10-Bit"; break;
-               case OptionsModel::EncVariant_12Bit: variant = "12-Bit"; break;
-               default: MUTILS_THROW("Unknown encoder arch!");
-       }
-       return QString("x265 (H.265/HEVC), %1, %2").arg(arch, variant);
+       return s_x265EncoderInfo.getFullName(m_options->encArch(), m_options->encVariant());
 }
 
 // ------------------------------------------------------------
@@ -235,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())
@@ -290,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)
@@ -306,21 +296,37 @@ bool X265Encoder::isVersionSupported(const unsigned int &revision, const bool &m
 // Encoding Functions
 // ------------------------------------------------------------
 
-void X265Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, const unsigned int &frames, const QString &indexFile, const int &pass, const QString &passLogFile)
+void X265Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, const ClipInfo &clipInfo, const QString &indexFile, const int &pass, const QString &passLogFile)
 {
        double crf_int = 0.0, crf_frc = 0.0;
 
-       switch(m_options->rcMode())
+       cmdLine << "-D";
+       switch (m_options->encVariant())
        {
-       case OptionsModel::RCMode_CQ:
-               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
+       case 0:
+               cmdLine << QString::number(8);
                break;
-       case OptionsModel::RCMode_CRF:
+       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:
                crf_frc = modf(m_options->quantizer(), &crf_int);
                cmdLine << "--crf" << QString("%1.%2").arg(QString::number(qRound(crf_int)), QString::number(qRound(crf_frc * 10.0)));
                break;
-       case OptionsModel::RCMode_2Pass:
-       case OptionsModel::RCMode_ABR:
+       case 1:
+               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
+               break;
+       case 2:
+       case 3:
                cmdLine << "--bitrate" << QString::number(m_options->bitrate());
                break;
        default:
@@ -382,8 +388,11 @@ void X265Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, co
        
        if(usePipe)
        {
-               if(frames < 1) MUTILS_THROW("Frames not set!");
-               cmdLine << "--frames" << QString::number(frames);
+               if (clipInfo.getFrameCount() < 1)
+               {
+                       MUTILS_THROW("Frames not set!");
+               }
+               cmdLine << "--frames" << QString::number(clipInfo.getFrameCount());
                cmdLine << "--y4m" << "-";
        }
        else
@@ -400,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 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)