OSDN Git Service

Updated version history.
[x264-launcher/x264-launcher.git] / src / encoder_x264.cpp
index 99b377e..84182ce 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 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
@@ -25,8 +25,9 @@
 #include "global.h"
 #include "model_options.h"
 #include "model_status.h"
-#include "binaries.h"
 #include "mediainfo.h"
+#include "model_sysinfo.h"
+#include "model_clipInfo.h"
 
 //MUtils
 #include <MUtils/Exception.h>
 #include <QStringList>
 #include <QDir>
 #include <QRegExp>
+#include <QPair>
 
 //x264 version info
-static const unsigned int VERSION_X264_MINIMUM_REV = 2533;
-static const unsigned int VERSION_X264_CURRENT_API = 146;
+static const unsigned int VERSION_X264_MINIMUM_REV = 2708;
+static const unsigned int VERSION_X264_CURRENT_API =  148;
 
 // ------------------------------------------------------------
 // Helper Macros
@@ -82,13 +84,6 @@ while(0)
 } \
 while(0)
 
-static QString MAKE_NAME(const char *baseName, const OptionsModel *options)
-{
-       const QString arch = (options->encArch() == OptionsModel::EncArch_x64) ? "x64" : "x86";
-       const QString vari = (options->encVariant() == OptionsModel::EncVariant_HiBit ) ? "10-Bit" : "8-Bit";
-       return QString("%1, %2, %3").arg(QString::fromLatin1(baseName), arch, vari);
-}
-
 // ------------------------------------------------------------
 // Encoder Info
 // ------------------------------------------------------------
@@ -96,65 +91,62 @@ static QString MAKE_NAME(const char *baseName, const OptionsModel *options)
 class X264EncoderInfo : public AbstractEncoderInfo
 {
 public:
-       virtual QString getVariantId(const int &variant) const
+       virtual QString getName(void) const
        {
-               switch(variant)
-               {
-               case OptionsModel::EncVariant_LoBit:
-                       return QString::fromLatin1("8-Bit");
-               case OptionsModel::EncVariant_HiBit:
-                       return QString::fromLatin1("10-Bit");
-               default:
-                       return QString::fromLatin1("N/A");
-               }
+               return "x264 (AVC/H.264)";
        }
 
-       virtual QStringList getTunings(void) const
+       virtual QList<ArchId> getArchitectures(void) const
        {
-               QStringList tunings;
-
-               tunings << "Film"       << "Animation"   << "Grain";
-               tunings << "StillImage" << "PSNR"        << "SSIM";
-               tunings << "FastDecode" << "ZeroLatency" << "Touhou";
-               
-               return tunings;
+               return QList<ArchId>()
+               << qMakePair(QString("32-Bit (x86)"), ARCH_TYPE_X86)
+               << qMakePair(QString("64-Bit (x64)"), ARCH_TYPE_X64);
        }
 
-       virtual QStringList getProfiles(const int &variant) const
+       virtual QStringList getVariants(void) const
        {
-               QStringList profiles;
+               return QStringList() << "8-Bit" << "10-Bit";
+       }
 
-               if(variant == OptionsModel::EncVariant_LoBit)
-               {
-                       profiles << "Baseline" << "Main" << "High";
-               }
-               if((variant == OptionsModel::EncVariant_LoBit) || (variant == OptionsModel::EncVariant_HiBit))
-               {
-                       profiles << "High10" << "High422" << "High444";
-               }
+       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);
+       }
 
-               return profiles;
+       virtual QStringList getTunings(void) const
+       {
+               return QStringList()
+               << "Film"       << "Animation"   << "Grain"
+               << "StillImage" << "PSNR"        << "SSIM"
+               << "FastDecode" << "ZeroLatency" << "Touhou";
        }
 
-       virtual QStringList supportedOutputFormats(void) const
+       virtual QStringList getPresets(void) const
        {
-               QStringList extLst;
-               extLst << "264" << "mkv" << "mp4";
-               return extLst;
+               return QStringList()
+               << "ultrafast" << "superfast" << "veryfast" << "faster"   << "fast"
+               << "medium"    << "slow"      << "slower"   << "veryslow" << "placebo";
        }
 
-       virtual bool isRCModeSupported(const int rcMode) const
+       virtual QStringList getProfiles(const quint32 &variant) const
        {
-               switch(rcMode)
+               QStringList profiles;
+               switch(variant)
                {
-               case OptionsModel::RCMode_CRF:
-               case OptionsModel::RCMode_CQ:
-               case OptionsModel::RCMode_2Pass:
-               case OptionsModel::RCMode_ABR:
-                       return true;
-               default:
-                       return false;
+                       case 0: profiles << "Baseline" << "Main"    << "High";    break;
+                       case 1: profiles << "High10"   << "High422" << "High444"; break;
+                       default: MUTILS_THROW("Unknown encoder variant!");
                }
+               return profiles;
+       }
+
+       virtual QStringList supportedOutputFormats(void) const
+       {
+               return QStringList() << "264" << "mkv" << "mp4";
        }
 
        virtual bool isInputTypeSupported(const int format) const
@@ -169,24 +161,50 @@ public:
                        return false;
                }
        }
+
+       virtual QString getBinaryPath(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const
+       {
+               QString arch, variant;
+               switch(encArch)
+               {
+                       case 0: arch = "x86"; break;
+                       case 1: arch = "x64"; break;
+                       default: MUTILS_THROW("Unknown encoder arch!");
+               }
+               switch(encVariant)
+               {
+                       case 0: variant = "8bit";  break;
+                       case 1: variant = "10bit"; break;
+                       default: MUTILS_THROW("Unknown encoder variant!");
+               }
+               return QString("%1/toolset/%2/x264_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant);
+       }
+
+       virtual QString getHelpCommand(void) const
+       {
+               return "--fullhelp";
+       }
 };
 
 static const X264EncoderInfo s_x264EncoderInfo;
 
-const AbstractEncoderInfo &X264Encoder::getEncoderInfo(void)
+const AbstractEncoderInfo& X264Encoder::encoderInfo(void)
 {
        return s_x264EncoderInfo;
 }
 
+const AbstractEncoderInfo &X264Encoder::getEncoderInfo(void) const
+{
+       return encoderInfo();
+}
+
 // ------------------------------------------------------------
 // Constructor & Destructor
 // ------------------------------------------------------------
 
 X264Encoder::X264Encoder(JobObject *jobObject, const OptionsModel *options, const SysinfoModel *const sysinfo, const PreferencesModel *const preferences, JobStatus &jobStatus, volatile bool *abort, volatile bool *pause, QSemaphore *semaphorePause, const QString &sourceFile, const QString &outputFile)
 :
-       AbstractEncoder(jobObject, options, sysinfo, preferences, jobStatus, abort, pause, semaphorePause, sourceFile, outputFile),
-       m_encoderName(MAKE_NAME("x264 (H.264/AVC)", m_options)),
-       m_binaryFile(ENC_BINARY(sysinfo, options))
+       AbstractEncoder(jobObject, options, sysinfo, preferences, jobStatus, abort, pause, semaphorePause, sourceFile, outputFile)
 {
        if(options->encType() != OptionsModel::EncType_X264)
        {
@@ -199,9 +217,9 @@ X264Encoder::~X264Encoder(void)
        /*Nothing to do here*/
 }
 
-const QString &X264Encoder::getName(void)
+QString X264Encoder::getName(void) const
 {
-       return m_encoderName;
+       return s_x264EncoderInfo.getFullName(m_options->encArch(), m_options->encVariant());
 }
 
 // ------------------------------------------------------------
@@ -287,21 +305,21 @@ bool X264Encoder::isVersionSupported(const unsigned int &revision, const bool &m
 // Encoding Functions
 // ------------------------------------------------------------
 
-void X264Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, const unsigned int &frames, const QString &indexFile, const int &pass, const QString &passLogFile)
+void X264Encoder::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())
        {
-       case OptionsModel::RCMode_CQ:
-               cmdLine << "--qp" << QString::number(qRound(m_options->quantizer()));
-               break;
-       case OptionsModel::RCMode_CRF:
+       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:
@@ -314,21 +332,30 @@ void X264Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, co
                cmdLine << "--stats" << QDir::toNativeSeparators(passLogFile);
        }
 
-       cmdLine << "--preset" << m_options->preset().toLower();
+       const QString preset = m_options->preset().simplified().toLower();
+       if(!preset.isEmpty())
+       {
+               if(preset.compare(QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED), Qt::CaseInsensitive) != 0)
+               {
+                       cmdLine << "--preset" << preset;
+               }
+       }
 
-       if(!m_options->tune().simplified().isEmpty())
+       const QString tune = m_options->tune().simplified().toLower();
+       if(!tune.isEmpty())
        {
-               if(m_options->tune().simplified().compare(QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED), Qt::CaseInsensitive) != 0)
+               if(tune.compare(QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED), Qt::CaseInsensitive) != 0)
                {
-                       cmdLine << "--tune" << m_options->tune().simplified().toLower();
+                       cmdLine << "--tune" << tune;
                }
        }
 
-       if(!m_options->profile().simplified().isEmpty())
+       const QString profile = m_options->profile().simplified().toLower();
+       if(!profile.isEmpty())
        {
-               if(m_options->profile().simplified().compare(QString::fromLatin1(OptionsModel::PROFILE_UNRESTRICTED), Qt::CaseInsensitive) != 0)
+               if(profile.compare(QString::fromLatin1(OptionsModel::PROFILE_UNRESTRICTED), Qt::CaseInsensitive) != 0)
                {
-                       cmdLine << "--profile" << m_options->profile().simplified().toLower();
+                       cmdLine << "--profile" << profile;
                }
        }
 
@@ -353,8 +380,11 @@ void X264Encoder::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 << "--demuxer" << "y4m";
                cmdLine << "--stdin" << "y4m" << "-";
        }
@@ -373,7 +403,7 @@ void X264Encoder::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 X264Encoder::runEncodingPass_parseLine(const QString &line, QList<QRegExp*> &patterns, const int &pass, double &last_progress, double &size_estimate)
+void X264Encoder::runEncodingPass_parseLine(const QString &line, 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)