Updated CA certificates file for cURL.

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

diff --git a/src/encoder_abstract.cpp b/src/encoder_abstract.cpp
index 935ec3d..3ccd4c9 100644 (file)
--- a/src/encoder_abstract.cpp
+++ b/src/encoder_abstract.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 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
@@ -28,7 +28,6 @@
 #include "model_sysinfo.h"
 #include "model_status.h"
 #include "source_abstract.h"
-#include "binaries.h"
 
 //MUtils
 #include <MUtils/Global.h>
@@ -46,20 +45,6 @@
 #include <QLocale>
 
 // ------------------------------------------------------------
-// Helper Macros
-// ------------------------------------------------------------
-
-#define APPEND_AND_CLEAR(LIST, STR) do \
-{ \
-       if(!((STR).isEmpty())) \
-       { \
-               (LIST) << (STR); \
-               (STR).clear(); \
-       } \
-} \
-while(0)
-
-// ------------------------------------------------------------
 // Constructor & Destructor
 // ------------------------------------------------------------
 
@@ -82,7 +67,7 @@ AbstractEncoder::~AbstractEncoder(void)
 // Encoding Functions
 // ------------------------------------------------------------
 
-bool AbstractEncoder::runEncodingPass(AbstractSource* pipedSource, const QString outputFile, const unsigned int &frames, const int &pass, const QString &passLogFile)
+bool AbstractEncoder::runEncodingPass(AbstractSource* pipedSource, const QString outputFile, const ClipInfo &clipInfo, const int &pass, const QString &passLogFile)
 {
        QProcess processEncode, processInput;
        
@@ -92,10 +77,10 @@ bool AbstractEncoder::runEncodingPass(AbstractSource* pipedSource, const QString
        }
 
        QStringList cmdLine_Encode;
-       buildCommandLine(cmdLine_Encode, (pipedSource != NULL), frames, m_indexFile, pass, passLogFile);
+       buildCommandLine(cmdLine_Encode, (pipedSource != NULL), clipInfo, m_indexFile, pass, passLogFile);
 
        log("Creating encoder process:");
-       if(!startProcess(processEncode, ENC_BINARY(m_sysinfo, m_options), cmdLine_Encode))
+       if(!startProcess(processEncode, getBinaryPath(), cmdLine_Encode, true, &getExtraPaths(), &getExtraEnv()))
        {
                return false;
        }
@@ -179,12 +164,12 @@ bool AbstractEncoder::runEncodingPass(AbstractSource* pipedSource, const QString
                }
 
                //Process all output
-               PROCESS_PENDING_LINES(processEncode, runEncodingPass_parseLine, patterns, pass, last_progress, size_estimate);
+               PROCESS_PENDING_LINES(processEncode, runEncodingPass_parseLine, patterns, clipInfo, pass, last_progress, size_estimate);
        }
        
        if(!(bTimeout || bAborted))
        {
-               PROCESS_PENDING_LINES(processEncode, runEncodingPass_parseLine, patterns, pass, last_progress, size_estimate);
+               PROCESS_PENDING_LINES(processEncode, runEncodingPass_parseLine, patterns, clipInfo, pass, last_progress, size_estimate);
        }
 
        processEncode.waitForFinished(5000);
@@ -265,38 +250,6 @@ bool AbstractEncoder::runEncodingPass(AbstractSource* pipedSource, const QString
 // Utilities
 // ------------------------------------------------------------
 
-QStringList AbstractEncoder::splitParams(const QString &params, const QString &sourceFile, const QString &outputFile)
-{
-       QStringList list; 
-       bool ignoreWhitespaces = false;
-       QString temp;
-
-       for(int i = 0; i < params.length(); i++)
-       {
-               const QChar c = params.at(i);
-
-               if(c == QChar::fromLatin1('"'))
-               {
-                       ignoreWhitespaces = (!ignoreWhitespaces);
-                       continue;
-               }
-               else if((!ignoreWhitespaces) && (c == QChar::fromLatin1(' ')))
-               {
-                       APPEND_AND_CLEAR(list, temp);
-                       continue;
-               }
-               
-               temp.append(c);
-       }
-       
-       APPEND_AND_CLEAR(list, temp);
-
-       list.replaceInStrings("$(INPUT)",  QDir::toNativeSeparators(sourceFile), Qt::CaseInsensitive);
-       list.replaceInStrings("$(OUTPUT)", QDir::toNativeSeparators(outputFile), Qt::CaseInsensitive);
-
-       return list;
-}
-
 double AbstractEncoder::estimateSize(const QString &fileName, const double &progress)
 {
        double estimatedSize = 0.0;
@@ -340,7 +293,47 @@ QString AbstractEncoder::sizeToString(qint64 size)
 // Encoder Info
 // ------------------------------------------------------------
 
-const AbstractEncoderInfo& AbstractEncoder::getEncoderInfo(void)
+template <class T>
+static T getElementAt(const QList<T> &list, const quint32 &index)
+{
+       if (index >= quint32(list.count()))
+       {
+               MUTILS_THROW("Index is out of bounds!");
+       }
+       return list[index];
+}
+
+QStringList AbstractEncoderInfo::getDependencies(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const
+{
+       return QStringList();
+}
+
+QString AbstractEncoderInfo::getFullName(const quint32 &encArch, const quint32 &encVariant) const
+{
+       return QString("%1, %2, %3").arg(getName(), archToString(encArch), variantToString(encVariant));
+}
+
+QString AbstractEncoderInfo::archToString(const quint32 &index) const
+{
+       return getElementAt(getArchitectures(), index).first;
+}
+
+AbstractEncoderInfo::ArchBit AbstractEncoderInfo::archToType(const quint32 &index) const
+{
+       return getElementAt(getArchitectures(), index).second;
+}
+
+QString AbstractEncoderInfo::variantToString(const quint32 &index) const
+{
+       return getElementAt(getVariants(), index);
+}
+
+QString AbstractEncoderInfo::rcModeToString(const quint32 &index) const
+{
+       return getElementAt(getRCModes(), index).first;
+}
+
+AbstractEncoderInfo::RCType AbstractEncoderInfo::rcModeToType(const quint32 &index) const
 {
-       MUTILS_THROW("[getEncoderInfo] This function must be overwritten in sub-classes!");
+       return getElementAt(getRCModes(), index).second;
 }