Added option to choose between 8-Bit and 10-Bit encoding at runtime. We now include...

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

diff --git a/src/thread_encode.h b/src/thread_encode.h
index 92aa3b3..0ed9b37 100644 (file)
--- a/src/thread_encode.h
+++ b/src/thread_encode.h
@@ -25,6 +25,7 @@
 #include <QUuid>
 #include <QMutex>
 #include <QStringList>
+#include <QSemaphore>
 
 class OptionsModel;
 class QProcess;
@@ -44,24 +45,43 @@ public:
                JobStatus_Running_Pass2 = 5,
                JobStatus_Completed = 6,
                JobStatus_Failed = 7,
-               JobStatus_Aborting = 8,
-               JobStatus_Aborted = 9
+               JobStatus_Pausing = 8,
+               JobStatus_Paused = 9,
+               JobStatus_Resuming = 10,
+               JobStatus_Aborting = 11,
+               JobStatus_Aborted = 12,
+               JobStatus_Undefined = 666
        };
        
-       EncodeThread(const QString &sourceFileName, const QString &outputFileName, const OptionsModel *options, const QString &binDir, bool x64);
+       EncodeThread(const QString &sourceFileName, const QString &outputFileName, const OptionsModel *options, const QString &binDir, bool x264_x64, bool x264_10bit, bool avs2yuv_x64);
        ~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; };
-
-       void abortJob(void) { m_abort = true; }
+       const QString &sourceFileName(void) { return this->m_sourceFileName; }
+       const QString &outputFileName(void) { return this->m_outputFileName; }
+       const OptionsModel *options(void) { return m_options; }
+       
+       void pauseJob(void)
+       {
+               m_pause = true;
+       }
+       void resumeJob(void)
+       {
+               m_pause = false;
+               m_semaphorePaused.release();
+       }
+       void abortJob(void)
+       {
+               m_abort = true;
+               m_pause = false;
+               m_semaphorePaused.release();
+       }
 
 protected:
        static QMutex m_mutex_startProcess;
-       static void *m_handle_jobObject;
-
-       static const int m_processTimeoutInterval = 60000;
+       static const unsigned int m_processTimeoutInterval = 2500;
+       static const unsigned int m_processTimeoutMaxCounter = 120;
+       static const unsigned int m_processTimeoutWarning = 24;
 
        //Constants
        const QUuid m_jobId;
@@ -69,37 +89,57 @@ protected:
        const QString m_outputFileName;
        const OptionsModel *m_options;
        const QString m_binDir;
-       const bool m_x64;
+       const bool m_x264_x64;
+       const bool m_x264_10bit;
+       const bool m_avs2yuv_x64;
 
        //Flags
        volatile bool m_abort;
+       volatile bool m_pause;
        
+       //Synchronization
+       QSemaphore m_semaphorePaused;
+
+       //Job handle
+       void *m_handle_jobObject;
+
        //Internal status values
        JobStatus m_status;
        unsigned int m_progress;
 
        //Entry point
        virtual void run(void);
+       virtual void checkedRun(void);
        
        //Encode functions
        void encode(void);
-       bool runEncodingPass(bool x64, int pass = 0, const QString &passLogFile = QString());
-       QStringList buildCommandLine(int pass = 0, const QString &passLogFile = QString());
-       unsigned int checkVersion(bool x64);
+       bool runEncodingPass(bool x264_x64, bool x264_10bit, bool avs2yuv_x64, bool usePipe, 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 checkProperties(bool x64, 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 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);
+
+       //Static functions
        static QString commandline2string(const QString &program, const QStringList &arguments);
+       static QString sizeToString(qint64 size);
 
 signals:
        void statusChanged(const QUuid &jobId, EncodeThread::JobStatus newStatus);
        void progressChanged(const QUuid &jobId, unsigned int newProgress);
        void messageLogged(const QUuid &jobId, const QString &text);
        void detailsChanged(const QUuid &jobId, const QString &details);
+
+public slots:
+       void start(Priority priority = InheritPriority);
 };