Bump x264 minimum required version to API-#160 (r2999).

[x264-launcher/x264-launcher.git] / src / thread_encode.h

diff --git a/src/thread_encode.h b/src/thread_encode.h
index 65f9449..e8b53a2 100644 (file)
--- a/src/thread_encode.h
+++ b/src/thread_encode.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 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
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "thread_abstract.h"
 #include "model_status.h"
 
 #include <QThread>
@@ -29,31 +30,38 @@
 #include <QStringList>
 #include <QSemaphore>
 
+class SysinfoModel;
+class PreferencesModel;
 class OptionsModel;
 class QProcess;
+class JobObject;
+class AbstractEncoder;
+class AbstractSource;
 
-class EncodeThread : public QThread
+class EncodeThread : public AbstractThread
 {
        Q_OBJECT
 
 public:
-       EncodeThread(const QString &sourceFileName, const QString &outputFileName, const OptionsModel *options, const QString &binDir, const QString &vpsDir, bool x264_x64, bool x264_10bit, bool avs2yuv_x64, bool const skipVersionTest, int processPriroity);
+       EncodeThread(const QString &sourceFileName, const QString &outputFileName, const OptionsModel *options, const SysinfoModel *const sysinfo, const PreferencesModel *const m_preferences);
        ~EncodeThread(void);
 
        QUuid getId(void) { return this->m_jobId; };
-       const QString &sourceFileName(void) { return this->m_sourceFileName; }
-       const QString &outputFileName(void) { return this->m_outputFileName; }
-       const OptionsModel *options(void) { return m_options; }
+       const QString &sourceFileName(void) const { return this->m_sourceFileName; }
+       const QString &outputFileName(void) const { return this->m_outputFileName; }
+       const OptionsModel *options(void)   const { return m_options; }
        
        void pauseJob(void)
        {
                m_pause = true;
        }
+
        void resumeJob(void)
        {
                m_pause = false;
                m_semaphorePaused.release();
        }
+
        void abortJob(void)
        {
                m_abort = true;
@@ -62,31 +70,15 @@ public:
        }
 
 protected:
-       static QMutex m_mutex_startProcess;
-       static const unsigned int m_processTimeoutInterval = 2500;
-       static const unsigned int m_processTimeoutMaxCounter = 120;
-       static const unsigned int m_processTimeoutWarning = 24;
+       //Globals
+       const SysinfoModel *const m_sysinfo;
+       const PreferencesModel *const m_preferences;
 
        //Constants
        const QUuid m_jobId;
+       const OptionsModel *m_options;
        const QString m_sourceFileName;
        const QString m_outputFileName;
-       const OptionsModel *m_options;
-       const QString m_binDir;
-       const QString m_vpsDir;
-       const bool m_x264_x64;
-       const bool m_x264_10bit;
-       const bool m_avs2yuv_x64;
-       const bool m_skipVersionTest;
-       const int m_processPriority;
-
-       //Types
-       enum inputType_t
-       {
-               INPUT_NATIVE = 0,
-               INPUT_AVISYN = 1,
-               INPUT_VAPOUR = 2
-       };
 
        //Flags
        volatile bool m_abort;
@@ -95,50 +87,39 @@ protected:
        //Synchronization
        QSemaphore m_semaphorePaused;
 
-       //Job handle
-       void *m_handle_jobObject;
+       //Job Object
+       JobObject *m_jobObject;
 
        //Internal status values
        JobStatus m_status;
        unsigned int m_progress;
+       QString m_details;
+
+       //Encoder and Source objects
+       AbstractEncoder *m_encoder;
+       AbstractSource *m_pipedSource;
 
        //Entry point
        virtual void run(void);
-       virtual void checkedRun(void);
        
-       //Encode functions
-       void encode(void);
-       bool runEncodingPass(bool x264_x64, bool x264_10bit, bool avs2yuv_x64, int inputType, unsigned int frames, const QString &indexFile, int pass = 0, const QString &passLogFile = QString());
-       QStringList buildCommandLine(bool usePipe, bool use10Bit, unsigned int frames, const QString &indexFile, int pass = 0, const QString &passLogFile = QString());
-       unsigned int checkVersionX264(bool use_x64, bool use_10bit, bool &modified);
-       unsigned int checkVersionAvs2yuv(bool x64);
-       bool checkVersionVapoursynth(const QString &vspipePath);
-       bool checkPropertiesAvisynth(bool x64, unsigned int &frames);
-       bool checkPropertiesVapoursynth(const QString &vspipePath, unsigned int &frames);
-
-       //Auxiallary Stuff
-       void log(const QString &text) { emit messageLogged(m_jobId, text); }
-       inline void setStatus(JobStatus newStatus);
-       inline void setProgress(unsigned int newProgress);
-       inline void setDetails(const QString &text);
-       bool startProcess(QProcess &process, const QString &program, const QStringList &args, bool mergeChannels = true);
-       QString pathToLocal(const QString &longPath, bool create = false, bool keep = true);
-       QStringList splitParams(const QString &params);
-       qint64 estimateSize(int progress);
+       //Thread main
+       virtual int threadMain(void);
 
        //Static functions
-       static QString commandline2string(const QString &program, const QStringList &arguments);
-       static QString sizeToString(qint64 size);
-       static void setPorcessPriority(void *processId, int priroity);
-       static int getInputType(const QString &fileExt);
+       static QString getPasslogFile(const QString &outputFile);
 
 signals:
-       void statusChanged(const QUuid &jobId, JobStatus newStatus);
-       void progressChanged(const QUuid &jobId, unsigned int newProgress);
-       void messageLogged(const QUuid &jobId, const QString &text);
+       void statusChanged(const QUuid &jobId, const JobStatus &newStatus);
+       void progressChanged(const QUuid &jobId, const unsigned int &newProgress);
+       void messageLogged(const QUuid &jobId, qint64, const QString &text);
        void detailsChanged(const QUuid &jobId, const QString &details);
 
+private slots:
+       void log(const QString &text);
+       void setStatus(const JobStatus &newStatus);
+       void setProgress(const unsigned int &newProgress);
+       void setDetails(const QString &text);
+
 public slots:
        void start(Priority priority = InheritPriority);
 };
-