///////////////////////////////////////////////////////////////////////////////
// Simple x264 Launcher
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2018 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 "thread_encode.h"
+//Internal
#include "global.h"
#include "model_options.h"
-#include "version.h"
+#include "model_preferences.h"
+#include "model_sysinfo.h"
+#include "model_clipInfo.h"
+#include "job_object.h"
+#include "mediainfo.h"
+//Encoders
+#include "encoder_factory.h"
+
+//Source
+#include "source_factory.h"
+
+//MUtils
+#include <MUtils/OSSupport.h>
+#include <MUtils/Version.h>
+
+//Qt Framework
#include <QDate>
#include <QTime>
#include <QDateTime>
#include <QMutex>
#include <QTextCodec>
#include <QLocale>
+#include <QCryptographicHash>
/*
- * Static vars
+ * RAII execution state handler
*/
-QMutex EncodeThread::m_mutex_startProcess;
+class ExecutionStateHandler
+{
+public:
+ ExecutionStateHandler(void)
+ {
+ x264_set_thread_execution_state(true);
+ }
+ ~ExecutionStateHandler(void)
+ {
+ x264_set_thread_execution_state(false);
+ }
+private:
+ //Disable copy constructor and assignment
+ ExecutionStateHandler(const ExecutionStateHandler &other) {}
+ ExecutionStateHandler &operator=(const ExecutionStateHandler &) {}
+
+ //Prevent object allocation on the heap
+ void *operator new(size_t); void *operator new[](size_t);
+ void operator delete(void *); void operator delete[](void*);
+};
/*
* Macros
*/
-#define CHECK_STATUS(ABORT_FLAG, OK_FLAG) \
+#define CHECK_STATUS(ABORT_FLAG, OK_FLAG) do \
{ \
if(ABORT_FLAG) \
{ \
log("\nPROCESS ABORTED BY USER !!!"); \
setStatus(JobStatus_Aborted); \
- if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \
if(QFileInfo(m_outputFileName).exists() && (QFileInfo(m_outputFileName).size() == 0)) QFile::remove(m_outputFileName); \
return; \
} \
else if(!(OK_FLAG)) \
{ \
setStatus(JobStatus_Failed); \
- if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \
if(QFileInfo(m_outputFileName).exists() && (QFileInfo(m_outputFileName).size() == 0)) QFile::remove(m_outputFileName); \
return; \
} \
-}
+} \
+while(0)
-#define APPEND_AND_CLEAR(LIST, STR) \
+#define CONNECT(OBJ) do \
{ \
- if(!((STR).isEmpty())) \
+ if((OBJ)) \
{ \
- (LIST) << (STR); \
- (STR).clear(); \
+ connect((OBJ), SIGNAL(statusChanged(JobStatus)), this, SLOT(setStatus(JobStatus)), Qt::DirectConnection); \
+ connect((OBJ), SIGNAL(progressChanged(unsigned int)), this, SLOT(setProgress(unsigned int)), Qt::DirectConnection); \
+ connect((OBJ), SIGNAL(detailsChanged(QString)), this, SLOT(setDetails(QString)), Qt::DirectConnection); \
+ connect((OBJ), SIGNAL(messageLogged(QString)), this, SLOT(log(QString)), Qt::DirectConnection); \
} \
-}
-
-#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) QString("%1/x264_%2_%3.exe").arg((BIN_DIR), ((IS_10BIT) ? "10bit" : "8bit"), ((IS_X64) ? "x64" : "x86"))
-
-/*
- * Static vars
- */
-static const unsigned int REV_MULT = 10000;
+} \
+while(0)
///////////////////////////////////////////////////////////////////////////////
// Constructor & Destructor
///////////////////////////////////////////////////////////////////////////////
-EncodeThread::EncodeThread(const QString &sourceFileName, const QString &outputFileName, const OptionsModel *options, const QString &binDir, bool x264_x64, bool x264_10bit, bool avs2yuv_x64)
+EncodeThread::EncodeThread(const QString &sourceFileName, const QString &outputFileName, const OptionsModel *options, const SysinfoModel *const sysinfo, const PreferencesModel *const preferences)
:
m_jobId(QUuid::createUuid()),
m_sourceFileName(sourceFileName),
m_outputFileName(outputFileName),
m_options(new OptionsModel(*options)),
- m_binDir(binDir),
- m_x264_x64(x264_x64),
- m_x264_10bit(x264_10bit),
- m_avs2yuv_x64(avs2yuv_x64),
- m_handle_jobObject(NULL),
- m_semaphorePaused(0)
+ m_sysinfo(sysinfo),
+ m_preferences(preferences),
+ m_jobObject(new JobObject),
+ m_semaphorePaused(0),
+ m_encoder(NULL),
+ m_pipedSource(NULL)
{
m_abort = false;
m_pause = false;
+
+ //Create encoder object
+ m_encoder = EncoderFactory::createEncoder(m_jobObject, m_options, m_sysinfo, m_preferences, m_status, &m_abort, &m_pause, &m_semaphorePaused, m_sourceFileName, m_outputFileName);
+
+ //Create input handler object
+ switch(MediaInfo::analyze(m_sourceFileName))
+ {
+ case MediaInfo::FILETYPE_AVISYNTH:
+ if(m_sysinfo->hasAvisynth())
+ {
+ m_pipedSource = SourceFactory::createSource(SourceFactory::SourceType_AVS, m_jobObject, m_options, m_sysinfo, m_preferences, m_status, &m_abort, &m_pause, &m_semaphorePaused, m_sourceFileName);
+ }
+ break;
+ case MediaInfo::FILETYPE_VAPOURSYNTH:
+ if(m_sysinfo->hasVapourSynth())
+ {
+ m_pipedSource = SourceFactory::createSource(SourceFactory::SourceType_VPS, m_jobObject, m_options, m_sysinfo, m_preferences, m_status, &m_abort, &m_pause, &m_semaphorePaused, m_sourceFileName);
+ }
+ break;
+ }
+
+ //Establish connections
+ CONNECT(m_encoder);
+ CONNECT(m_pipedSource);
}
EncodeThread::~EncodeThread(void)
{
- X264_DELETE(m_options);
-
- if(m_handle_jobObject)
- {
- CloseHandle(m_handle_jobObject);
- m_handle_jobObject = NULL;
- }
+ MUTILS_DELETE(m_encoder);
+ MUTILS_DELETE(m_jobObject);
+ MUTILS_DELETE(m_options);
+ MUTILS_DELETE(m_pipedSource);
}
///////////////////////////////////////////////////////////////////////////////
void EncodeThread::run(void)
{
+#if !defined(_DEBUG)
__try
{
checkedRun();
{
qWarning("STRUCTURED EXCEPTION ERROR IN ENCODE THREAD !!!");
}
+#else
+ checkedRun();
+#endif
- if(m_handle_jobObject)
+ if(m_jobObject)
{
- TerminateJobObject(m_handle_jobObject, 42);
- m_handle_jobObject = NULL;
+ m_jobObject->terminateJob(42);
+ MUTILS_DELETE(m_jobObject);
}
}
{
try
{
+ ExecutionStateHandler executionStateHandler;
encode();
}
+ catch(const std::exception &e)
+ {
+ log(tr("EXCEPTION ERROR IN THREAD: ").append(QString::fromLatin1(e.what())));
+ setStatus(JobStatus_Failed);
+ }
catch(char *msg)
{
log(tr("EXCEPTION ERROR IN THREAD: ").append(QString::fromLatin1(msg)));
}
catch(...)
{
- RaiseException(EXCEPTION_ACCESS_VIOLATION, 0, 0, NULL);
+ MUtils::OS::fatal_exit(L"Unhandeled exception error in encode thread!");
}
}
{
QDateTime startTime = QDateTime::currentDateTime();
+ // -----------------------------------------------------------------------------------
+ // Print Information
+ // -----------------------------------------------------------------------------------
+
//Print some basic info
- log(tr("Simple x264 Launcher (Build #%1), built %2\n").arg(QString::number(x264_version_build()), x264_version_date().toString(Qt::ISODate)));
+ log(tr("Simple x264 Launcher (Build #%1), built %2\n").arg(QString::number(x264_version_build()), MUtils::Version::app_build_date().toString(Qt::ISODate)));
log(tr("Job started at %1, %2.\n").arg(QDate::currentDate().toString(Qt::ISODate), QTime::currentTime().toString( Qt::ISODate)));
- log(tr("Source file: %1").arg(m_sourceFileName));
- log(tr("Output file: %1").arg(m_outputFileName));
+ log(tr("Source file : %1").arg(QDir::toNativeSeparators(m_sourceFileName)));
+ log(tr("Output file : %1").arg(QDir::toNativeSeparators(m_outputFileName)));
+ //Print system info
+ log(tr("\n--- SYSTEMINFO ---\n"));
+ log(tr("Binary Path : %1").arg(QDir::toNativeSeparators(m_sysinfo->getAppPath())));
+ log(tr("Avisynth : %1").arg(m_sysinfo->hasAvisynth() ? tr("Yes") : tr("No")));
+ log(tr("VapourSynth : %1").arg(m_sysinfo->hasVapourSynth() ? tr("Yes") : tr("No")));
+
//Print encoder settings
log(tr("\n--- SETTINGS ---\n"));
- log(tr("RC Mode: %1").arg(OptionsModel::rcMode2String(m_options->rcMode())));
- log(tr("Preset: %1").arg(m_options->preset()));
- log(tr("Tuning: %1").arg(m_options->tune()));
- log(tr("Profile: %1").arg(m_options->profile()));
- log(tr("Custom: %1").arg(m_options->customX264().isEmpty() ? tr("(None)") : m_options->customX264()));
+ log(tr("Encoder : %1").arg(m_encoder->getName()));
+ log(tr("Source : %1").arg(m_pipedSource ? m_pipedSource->getName() : tr("Native")));
+ log(tr("RC Mode : %1").arg(m_encoder->getEncoderInfo().rcModeToString(m_options->rcMode())));
+ log(tr("Preset : %1").arg(m_options->preset()));
+ log(tr("Tuning : %1").arg(m_options->tune()));
+ log(tr("Profile : %1").arg(m_options->profile()));
+ log(tr("Custom : %1").arg(m_options->customEncParams().isEmpty() ? tr("<None>") : m_options->customEncParams()));
bool ok = false;
- unsigned int frames = 0;
-
- //Use Avisynth?
- const bool usePipe = (QFileInfo(m_sourceFileName).suffix().compare("avs", Qt::CaseInsensitive) == 0);
- const QString indexFile = QString("%1/%2.ffindex").arg(QDir::tempPath(), m_jobId.toString());
-
- //Checking x264 version
- log(tr("\n--- CHECK VERSION ---\n"));
- unsigned int revision_x264 = UINT_MAX;
- bool x264_modified = false;
- ok = ((revision_x264 = checkVersionX264(m_x264_x64, m_x264_10bit, x264_modified)) != UINT_MAX);
- CHECK_STATUS(m_abort, ok);
-
- //Checking avs2yuv version
- unsigned int revision_avs2yuv = UINT_MAX;
- if(usePipe)
- {
- ok = ((revision_avs2yuv = checkVersionAvs2yuv(m_avs2yuv_x64)) != UINT_MAX);
- CHECK_STATUS(m_abort, ok);
- }
-
- //Print versions
- log(tr("\nx264 revision: %1 (core #%2)").arg(QString::number(revision_x264 % REV_MULT), QString::number(revision_x264 / REV_MULT)).append(x264_modified ? tr(" - with custom patches!") : QString()));
- if(revision_avs2yuv != UINT_MAX) log(tr("Avs2YUV version: %1.%2.%3").arg(QString::number(revision_avs2yuv / REV_MULT), QString::number((revision_avs2yuv % REV_MULT) / 10),QString::number((revision_avs2yuv % REV_MULT) % 10)));
-
- //Is x264 revision supported?
- if((revision_x264 % REV_MULT) < (VER_X264_MINIMUM_REV))
- {
- log(tr("\nERROR: Your revision of x264 is too old! (Minimum required revision is %2)").arg(QString::number(VER_X264_MINIMUM_REV)));
- setStatus(JobStatus_Failed);
- return;
- }
- if((revision_x264 / REV_MULT) != (VER_X264_CURRENT_API))
- {
- log(tr("\nWARNING: Your revision of x264 uses an unsupported core (API) version, take care!"));
- log(tr("This application works best with x264 core (API) version %2.").arg(QString::number(VER_X264_CURRENT_API)));
- }
- if((revision_avs2yuv != UINT_MAX) && ((revision_avs2yuv % REV_MULT) != (VER_X264_AVS2YUV_VER)))
- {
- log(tr("\nERROR: Your version of avs2yuv is unsupported (Required version: v0.24 BugMaster's mod 2)"));
- log(tr("You can find the required version at: http://komisar.gin.by/tools/avs2yuv/"));
- setStatus(JobStatus_Failed);
- return;
- }
-
- //Detect source info
- if(usePipe)
- {
- log(tr("\n--- AVS INFO ---\n"));
- ok = checkProperties(m_avs2yuv_x64, frames);
- CHECK_STATUS(m_abort, ok);
- }
-
- //Run encoding passes
- if(m_options->rcMode() == OptionsModel::RCMode_2Pass)
- {
- QFileInfo info(m_outputFileName);
- QString passLogFile = QString("%1/%2.stats").arg(info.path(), info.completeBaseName());
-
- if(QFileInfo(passLogFile).exists())
- {
- int n = 2;
- while(QFileInfo(passLogFile).exists())
- {
- passLogFile = QString("%1/%2.%3.stats").arg(info.path(), info.completeBaseName(), QString::number(n++));
- }
- }
-
- log(tr("\n--- PASS 1 ---\n"));
- ok = runEncodingPass(m_x264_x64, m_x264_10bit, m_avs2yuv_x64, usePipe, frames, indexFile, 1, passLogFile);
- CHECK_STATUS(m_abort, ok);
-
- log(tr("\n--- PASS 2 ---\n"));
- ok = runEncodingPass(m_x264_x64, m_x264_10bit, m_avs2yuv_x64, usePipe, frames, indexFile, 2, passLogFile);
- CHECK_STATUS(m_abort, ok);
- }
- else
- {
- log(tr("\n--- ENCODING ---\n"));
- ok = runEncodingPass(m_x264_x64, m_x264_10bit, m_avs2yuv_x64, usePipe, frames, indexFile);
- CHECK_STATUS(m_abort, ok);
- }
-
- log(tr("\n--- DONE ---\n"));
- if(QFileInfo(indexFile).exists()) QFile::remove(indexFile);
- int timePassed = startTime.secsTo(QDateTime::currentDateTime());
- log(tr("Job finished at %1, %2. Process took %3 minutes, %4 seconds.").arg(QDate::currentDate().toString(Qt::ISODate), QTime::currentTime().toString( Qt::ISODate), QString::number(timePassed / 60), QString::number(timePassed % 60)));
- setStatus(JobStatus_Completed);
-}
-
-bool EncodeThread::runEncodingPass(bool x264_x64, bool x264_10bit, bool avs2yuv_x64, bool usePipe, unsigned int frames, const QString &indexFile, int pass, const QString &passLogFile)
-{
- QProcess processEncode, processAvisynth;
-
- if(usePipe)
- {
- QStringList cmdLine_Avisynth;
- if(!m_options->customAvs2YUV().isEmpty())
- {
- cmdLine_Avisynth.append(splitParams(m_options->customAvs2YUV()));
- }
- cmdLine_Avisynth << pathToLocal(QDir::toNativeSeparators(m_sourceFileName));
- cmdLine_Avisynth << "-";
- processAvisynth.setStandardOutputProcess(&processEncode);
-
- log("Creating Avisynth process:");
- if(!startProcess(processAvisynth, QString("%1/%2.exe").arg(m_binDir, avs2yuv_x64 ? "avs2yuv_x64" : "avs2yuv_x86"), cmdLine_Avisynth, false))
- {
- return false;
- }
- }
-
- QStringList cmdLine_Encode = buildCommandLine(usePipe, x264_10bit, frames, indexFile, pass, passLogFile);
-
- log("Creating x264 process:");
- if(!startProcess(processEncode, X264_BINARY(m_binDir, x264_10bit, x264_x64), cmdLine_Encode))
- {
- return false;
- }
-
- QRegExp regExpIndexing("indexing.+\\[(\\d+)\\.(\\d+)%\\]");
- QRegExp regExpProgress("\\[(\\d+)\\.(\\d+)%\\].+frames");
- QRegExp regExpFrameCnt("^(\\d+) frames:");
-
- QTextCodec *localCodec = QTextCodec::codecForName("System");
-
- bool bTimeout = false;
- bool bAborted = false;
-
- unsigned int last_progress = UINT_MAX;
- unsigned int last_indexing = UINT_MAX;
- qint64 size_estimate = 0I64;
-
- //Main processing loop
- while(processEncode.state() != QProcess::NotRunning)
- {
- unsigned int waitCounter = 0;
-
- //Wait until new output is available
- forever
- {
- if(m_abort)
- {
- processEncode.kill();
- processAvisynth.kill();
- bAborted = true;
- break;
- }
- if(m_pause && (processEncode.state() == QProcess::Running))
- {
- JobStatus previousStatus = m_status;
- setStatus(JobStatus_Paused);
- log(tr("Job paused by user at %1, %2.").arg(QDate::currentDate().toString(Qt::ISODate), QTime::currentTime().toString( Qt::ISODate)));
- bool ok[2] = {false, false};
- Q_PID pid[2] = {processEncode.pid(), processAvisynth.pid()};
- if(pid[0]) { ok[0] = (SuspendThread(pid[0]->hThread) != (DWORD)(-1)); }
- if(pid[1]) { ok[1] = (SuspendThread(pid[1]->hThread) != (DWORD)(-1)); }
- while(m_pause) m_semaphorePaused.acquire();
- while(m_semaphorePaused.tryAcquire(1, 0));
- if(pid[0]) { if(ok[0]) ResumeThread(pid[0]->hThread); }
- if(pid[1]) { if(ok[1]) ResumeThread(pid[1]->hThread); }
- if(!m_abort) setStatus(previousStatus);
- log(tr("Job resumed by user at %1, %2.").arg(QDate::currentDate().toString(Qt::ISODate), QTime::currentTime().toString( Qt::ISODate)));
- waitCounter = 0;
- continue;
- }
- if(!processEncode.waitForReadyRead(m_processTimeoutInterval))
- {
- if(processEncode.state() == QProcess::Running)
- {
- if(waitCounter++ > m_processTimeoutMaxCounter)
- {
- processEncode.kill();
- qWarning("x264 process timed out <-- killing!");
- log("\nPROCESS TIMEOUT !!!");
- bTimeout = true;
- break;
- }
- else if(waitCounter == m_processTimeoutWarning)
- {
- unsigned int timeOut = (waitCounter * m_processTimeoutInterval) / 1000U;
- log(tr("Warning: x264 did not respond for %1 seconds, potential deadlock...").arg(QString::number(timeOut)));
- }
- continue;
- }
- }
- if(m_abort || (m_pause && (processEncode.state() == QProcess::Running)))
- {
- continue;
- }
- break;
- }
-
- //Exit main processing loop now?
- if(bAborted || bTimeout)
- {
- break;
- }
-
- //Process all output
- while(processEncode.bytesAvailable() > 0)
- {
- QList<QByteArray> lines = processEncode.readLine().split('\r');
- while(!lines.isEmpty())
- {
- QString text = localCodec->toUnicode(lines.takeFirst().constData()).simplified();
- int offset = -1;
- if((offset = regExpProgress.lastIndexIn(text)) >= 0)
- {
- bool ok = false;
- unsigned int progress = regExpProgress.cap(1).toUInt(&ok);
- setStatus((pass == 2) ? JobStatus_Running_Pass2 : ((pass == 1) ? JobStatus_Running_Pass1 : JobStatus_Running));
- if(ok && ((progress > last_progress) || (last_progress == UINT_MAX)))
- {
- setProgress(progress);
- size_estimate = estimateSize(progress);
- last_progress = progress;
- }
- setDetails(tr("%1, est. file size %2").arg(text.mid(offset).trimmed(), sizeToString(size_estimate)));
- last_indexing = UINT_MAX;
- }
- else if((offset = regExpIndexing.lastIndexIn(text)) >= 0)
- {
- bool ok = false;
- unsigned int progress = regExpIndexing.cap(1).toUInt(&ok);
- setStatus(JobStatus_Indexing);
- if(ok && ((progress > last_indexing) || (last_indexing == UINT_MAX)))
- {
- setProgress(progress);
- last_indexing = progress;
- }
- setDetails(text.mid(offset).trimmed());
- last_progress = UINT_MAX;
- }
- else if((offset = regExpFrameCnt.lastIndexIn(text)) >= 0)
- {
- last_progress = last_indexing = UINT_MAX;
- setStatus((pass == 2) ? JobStatus_Running_Pass2 : ((pass == 1) ? JobStatus_Running_Pass1 : JobStatus_Running));
- setDetails(text.mid(offset).trimmed());
- }
- else if(!text.isEmpty())
- {
- last_progress = last_indexing = UINT_MAX;
- log(text);
- }
- }
- }
- }
-
- processEncode.waitForFinished(5000);
- if(processEncode.state() != QProcess::NotRunning)
- {
- qWarning("x264 process still running, going to kill it!");
- processEncode.kill();
- processEncode.waitForFinished(-1);
- }
-
- processAvisynth.waitForFinished(5000);
- if(processAvisynth.state() != QProcess::NotRunning)
- {
- qWarning("Avisynth process still running, going to kill it!");
- processAvisynth.kill();
- processAvisynth.waitForFinished(-1);
- }
-
- if(!(bTimeout || bAborted))
- {
- while(processAvisynth.bytesAvailable() > 0)
- {
- log(tr("av2y [info]: %1").arg(QString::fromUtf8(processAvisynth.readLine()).simplified()));
- }
- }
-
- if(usePipe && (processAvisynth.exitCode() != EXIT_SUCCESS))
- {
- if(!(bTimeout || bAborted))
- {
- log(tr("\nWARNING: Avisynth process exited with error code: %1").arg(QString::number(processAvisynth.exitCode())));
- }
- }
-
- if(bTimeout || bAborted || processEncode.exitCode() != EXIT_SUCCESS)
- {
- if(!(bTimeout || bAborted))
- {
- log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(processEncode.exitCode())));
- }
- processEncode.close();
- processAvisynth.close();
- return false;
- }
-
- QThread::yieldCurrentThread();
-
- const qint64 finalSize = QFileInfo(m_outputFileName).size();
- QLocale locale(QLocale::English);
- log(tr("Final file size is %1 bytes.").arg(locale.toString(finalSize)));
-
- switch(pass)
- {
- case 1:
- setStatus(JobStatus_Running_Pass1);
- setDetails(tr("First pass completed. Preparing for second pass..."));
- break;
- case 2:
- setStatus(JobStatus_Running_Pass2);
- setDetails(tr("Second pass completed successfully. Final size is %1.").arg(sizeToString(finalSize)));
- break;
- default:
- setStatus(JobStatus_Running);
- setDetails(tr("Encode completed successfully. Final size is %1.").arg(sizeToString(finalSize)));
- break;
- }
-
- setProgress(100);
- processEncode.close();
- processAvisynth.close();
- return true;
-}
-
-QStringList EncodeThread::buildCommandLine(bool usePipe, bool use10Bit, unsigned int frames, const QString &indexFile, int pass, const QString &passLogFile)
-{
- QStringList cmdLine;
- 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:
- 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:
- cmdLine << "--bitrate" << QString::number(m_options->bitrate());
- break;
- default:
- throw "Bad rate-control mode !!!";
- break;
- }
-
- if((pass == 1) || (pass == 2))
- {
- cmdLine << "--pass" << QString::number(pass);
- cmdLine << "--stats" << pathToLocal(QDir::toNativeSeparators(passLogFile), true);
- }
-
- cmdLine << "--preset" << m_options->preset().toLower();
-
- if(m_options->tune().compare("none", Qt::CaseInsensitive))
- {
- cmdLine << "--tune" << m_options->tune().toLower();
- }
-
- if(m_options->profile().compare("auto", Qt::CaseInsensitive))
- {
- if(use10Bit)
- {
- if(m_options->profile().compare("baseline", Qt::CaseInsensitive) || m_options->profile().compare("main", Qt::CaseInsensitive) || m_options->profile().compare("high", Qt::CaseInsensitive))
- {
- log(tr("WARNING: Selected H.264 Profile not compatible with 10-Bit encoding. Ignoring!\n"));
- }
- else
- {
- cmdLine << "--profile" << m_options->profile().toLower();
- }
- }
- else
- {
- cmdLine << "--profile" << m_options->profile().toLower();
- }
- }
-
- if(!m_options->customX264().isEmpty())
- {
- cmdLine.append(splitParams(m_options->customX264()));
- }
-
- cmdLine << "--output" << pathToLocal(QDir::toNativeSeparators(m_outputFileName), true);
-
- if(usePipe)
- {
- if(frames < 1) throw "Frames not set!";
- cmdLine << "--frames" << QString::number(frames);
- cmdLine << "--demuxer" << "y4m";
- cmdLine << "--stdin" << "y4m" << "-";
- }
- else
- {
- cmdLine << "--index" << pathToLocal(QDir::toNativeSeparators(indexFile), true, false);
- cmdLine << pathToLocal(QDir::toNativeSeparators(m_sourceFileName));
- }
-
- return cmdLine;
-}
-
-unsigned int EncodeThread::checkVersionX264(bool use_x64, bool use_10bit, bool &modified)
-{
- QProcess process;
- QStringList cmdLine = QStringList() << "--version";
-
- log("Creating process:");
- if(!startProcess(process, X264_BINARY(m_binDir, use_10bit, use_x64), cmdLine))
- {
- return false;;
- }
-
- QRegExp regExpVersion("\\bx264\\s(\\d)\\.(\\d+)\\.(\\d+)\\s([a-f0-9]{7})", Qt::CaseInsensitive);
- QRegExp regExpVersionMod("\\bx264 (\\d)\\.(\\d+)\\.(\\d+)", Qt::CaseInsensitive);
+ ClipInfo clipInfo;
- bool bTimeout = false;
- bool bAborted = false;
-
- unsigned int revision = UINT_MAX;
- unsigned int coreVers = UINT_MAX;
- modified = false;
-
- while(process.state() != QProcess::NotRunning)
- {
- if(m_abort)
- {
- process.kill();
- bAborted = true;
- break;
- }
- if(!process.waitForReadyRead())
- {
- if(process.state() == QProcess::Running)
- {
- process.kill();
- qWarning("x264 process timed out <-- killing!");
- log("\nPROCESS TIMEOUT !!!");
- bTimeout = true;
- break;
- }
- }
- while(process.bytesAvailable() > 0)
- {
- QList<QByteArray> lines = process.readLine().split('\r');
- while(!lines.isEmpty())
- {
- QString text = QString::fromUtf8(lines.takeFirst().constData()).simplified();
- int offset = -1;
- if((offset = regExpVersion.lastIndexIn(text)) >= 0)
- {
- bool ok1 = false, ok2 = false;
- unsigned int temp1 = regExpVersion.cap(2).toUInt(&ok1);
- unsigned int temp2 = regExpVersion.cap(3).toUInt(&ok2);
- if(ok1) coreVers = temp1;
- if(ok2) revision = temp2;
- }
- else if((offset = regExpVersionMod.lastIndexIn(text)) >= 0)
- {
- bool ok1 = false, ok2 = false;
- unsigned int temp1 = regExpVersionMod.cap(2).toUInt(&ok1);
- unsigned int temp2 = regExpVersionMod.cap(3).toUInt(&ok2);
- if(ok1) coreVers = temp1;
- if(ok2) revision = temp2;
- modified = true;
- }
- if(!text.isEmpty())
- {
- log(text);
- }
- }
- }
- }
-
- process.waitForFinished();
- if(process.state() != QProcess::NotRunning)
- {
- process.kill();
- process.waitForFinished(-1);
- }
-
- if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
- {
- if(!(bTimeout || bAborted))
- {
- log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(process.exitCode())));
- }
- return UINT_MAX;
- }
-
- if((revision == UINT_MAX) || (coreVers == UINT_MAX))
- {
- log(tr("\nFAILED TO DETERMINE X264 VERSION !!!"));
- return UINT_MAX;
- }
+ // -----------------------------------------------------------------------------------
+ // Check Versions
+ // -----------------------------------------------------------------------------------
- return (coreVers * REV_MULT) + (revision % REV_MULT);
-}
+ log(tr("\n--- CHECK VERSION ---\n"));
-unsigned int EncodeThread::checkVersionAvs2yuv(bool x64)
-{
- QProcess process;
+ unsigned int encoderRevision = UINT_MAX, sourceRevision = UINT_MAX;
+ bool encoderModified = false, sourceModified = false;
- log("\nCreating process:");
- if(!startProcess(process, QString("%1/%2.exe").arg(m_binDir, x64 ? "avs2yuv_x64" : "avs2yuv_x86"), QStringList()))
- {
- return false;;
- }
+ log("Detect video encoder version:\n");
- QRegExp regExpVersionMod("\\bAvs2YUV (\\d+).(\\d+)bm(\\d)\\b", Qt::CaseInsensitive);
- QRegExp regExpVersionOld("\\bAvs2YUV (\\d+).(\\d+)\\b", Qt::CaseInsensitive);
-
- bool bTimeout = false;
- bool bAborted = false;
+ //Check encoder version
+ encoderRevision = m_encoder->checkVersion(encoderModified);
+ CHECK_STATUS(m_abort, (ok = (encoderRevision != UINT_MAX)));
- unsigned int ver_maj = UINT_MAX;
- unsigned int ver_min = UINT_MAX;
- unsigned int ver_mod = 0;
+ //Is encoder version suppoprted?
+ CHECK_STATUS(m_abort, (ok = m_encoder->isVersionSupported(encoderRevision, encoderModified)));
- while(process.state() != QProcess::NotRunning)
+ if(m_pipedSource)
{
- if(m_abort)
- {
- process.kill();
- bAborted = true;
- break;
- }
- if(!process.waitForReadyRead())
- {
- if(process.state() == QProcess::Running)
- {
- process.kill();
- qWarning("Avs2YUV process timed out <-- killing!");
- log("\nPROCESS TIMEOUT !!!");
- bTimeout = true;
- break;
- }
- }
- while(process.bytesAvailable() > 0)
- {
- QList<QByteArray> lines = process.readLine().split('\r');
- while(!lines.isEmpty())
- {
- QString text = QString::fromUtf8(lines.takeFirst().constData()).simplified();
- int offset = -1;
- if((ver_maj == UINT_MAX) || (ver_min == UINT_MAX) || (ver_mod == UINT_MAX))
- {
- if(!text.isEmpty())
- {
- log(text);
- }
- }
- if((offset = regExpVersionMod.lastIndexIn(text)) >= 0)
- {
- bool ok1 = false, ok2 = false, ok3 = false;
- unsigned int temp1 = regExpVersionMod.cap(1).toUInt(&ok1);
- unsigned int temp2 = regExpVersionMod.cap(2).toUInt(&ok2);
- unsigned int temp3 = regExpVersionMod.cap(3).toUInt(&ok3);
- if(ok1) ver_maj = temp1;
- if(ok2) ver_min = temp2;
- if(ok3) ver_mod = temp3;
- }
- else if((offset = regExpVersionOld.lastIndexIn(text)) >= 0)
- {
- bool ok1 = false, ok2 = false;
- unsigned int temp1 = regExpVersionOld.cap(1).toUInt(&ok1);
- unsigned int temp2 = regExpVersionOld.cap(2).toUInt(&ok2);
- if(ok1) ver_maj = temp1;
- if(ok2) ver_min = temp2;
- }
- }
- }
- }
+ log("\nDetect video source version:\n");
- process.waitForFinished();
- if(process.state() != QProcess::NotRunning)
- {
- process.kill();
- process.waitForFinished(-1);
- }
+ //Is source type available?
+ CHECK_STATUS(m_abort, (ok = m_pipedSource->isSourceAvailable()));
- if(bTimeout || bAborted || ((process.exitCode() != EXIT_SUCCESS) && (process.exitCode() != 2)))
- {
- if(!(bTimeout || bAborted))
- {
- log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(process.exitCode())));
- }
- return UINT_MAX;
- }
+ //Checking source version
+ sourceRevision = m_pipedSource->checkVersion(sourceModified);
+ CHECK_STATUS(m_abort, (ok = (sourceRevision != UINT_MAX)));
- if((ver_maj == UINT_MAX) || (ver_min == UINT_MAX))
- {
- log(tr("\nFAILED TO DETERMINE AVS2YUV VERSION !!!"));
- return UINT_MAX;
+ //Is source version supported?
+ CHECK_STATUS(m_abort, (ok = m_pipedSource->isVersionSupported(sourceRevision, sourceModified)));
}
-
- return (ver_maj * REV_MULT) + ((ver_min % REV_MULT) * 10) + (ver_mod % 10);
-}
-bool EncodeThread::checkProperties(bool x64, unsigned int &frames)
-{
- QProcess process;
- QStringList cmdLine;
-
- if(!m_options->customAvs2YUV().isEmpty())
+ //Print tool versions
+ log(QString("\n> %1").arg(m_encoder->printVersion(encoderRevision, encoderModified)));
+ if(m_pipedSource)
{
- cmdLine.append(splitParams(m_options->customAvs2YUV()));
+ log(QString("> %1").arg(m_pipedSource->printVersion(sourceRevision, sourceModified)));
}
- cmdLine << "-frames" << "1";
- cmdLine << pathToLocal(QDir::toNativeSeparators(m_sourceFileName)) << "NUL";
+ // -----------------------------------------------------------------------------------
+ // Detect Source Info
+ // -----------------------------------------------------------------------------------
- log("Creating process:");
- if(!startProcess(process, QString("%1/%2.exe").arg(m_binDir, x64 ? "avs2yuv_x64" : "avs2yuv_x86"), cmdLine))
+ //Detect source info
+ if(m_pipedSource)
{
- return false;;
+ log(tr("\n--- GET SOURCE INFO ---\n"));
+ ok = m_pipedSource->checkSourceProperties(clipInfo);
+ CHECK_STATUS(m_abort, ok);
}
- QRegExp regExpInt(": (\\d+)x(\\d+), (\\d+) fps, (\\d+) frames");
- QRegExp regExpFrc(": (\\d+)x(\\d+), (\\d+)/(\\d+) fps, (\\d+) frames");
-
- QTextCodec *localCodec = QTextCodec::codecForName("System");
+ // -----------------------------------------------------------------------------------
+ // Encoding Passes
+ // -----------------------------------------------------------------------------------
- bool bTimeout = false;
- bool bAborted = false;
-
- frames = 0;
-
- unsigned int fpsNom = 0;
- unsigned int fpsDen = 0;
- unsigned int fSizeW = 0;
- unsigned int fSizeH = 0;
-
- unsigned int waitCounter = 0;
-
- while(process.state() != QProcess::NotRunning)
+ //Run encoding passes
+ if(m_encoder->getEncoderInfo().rcModeToType(m_options->rcMode()) == AbstractEncoderInfo::RC_TYPE_MULTIPASS)
{
- if(m_abort)
- {
- process.kill();
- bAborted = true;
- break;
- }
- if(!process.waitForReadyRead(m_processTimeoutInterval))
- {
- if(process.state() == QProcess::Running)
- {
- if(waitCounter++ > m_processTimeoutMaxCounter)
- {
- process.kill();
- qWarning("Avs2YUV process timed out <-- killing!");
- log("\nPROCESS TIMEOUT !!!");
- log("\nAvisynth has encountered a deadlock or your script takes EXTREMELY long to initialize!");
- bTimeout = true;
- break;
- }
- else if(waitCounter == m_processTimeoutWarning)
- {
- unsigned int timeOut = (waitCounter * m_processTimeoutInterval) / 1000U;
- log(tr("Warning: Avisynth did not respond for %1 seconds, potential deadlock...").arg(QString::number(timeOut)));
- }
- }
- continue;
- }
-
- waitCounter = 0;
+ const QString passLogFile = getPasslogFile(m_outputFileName);
- while(process.bytesAvailable() > 0)
- {
- QList<QByteArray> lines = process.readLine().split('\r');
- while(!lines.isEmpty())
- {
- QString text = localCodec->toUnicode(lines.takeFirst().constData()).simplified();
- int offset = -1;
- if((offset = regExpInt.lastIndexIn(text)) >= 0)
- {
- bool ok1 = false, ok2 = false;
- bool ok3 = false, ok4 = false;
- unsigned int temp1 = regExpInt.cap(1).toUInt(&ok1);
- unsigned int temp2 = regExpInt.cap(2).toUInt(&ok2);
- unsigned int temp3 = regExpInt.cap(3).toUInt(&ok3);
- unsigned int temp4 = regExpInt.cap(4).toUInt(&ok4);
- if(ok1) fSizeW = temp1;
- if(ok2) fSizeH = temp2;
- if(ok3) fpsNom = temp3;
- if(ok4) frames = temp4;
- }
- else if((offset = regExpFrc.lastIndexIn(text)) >= 0)
- {
- bool ok1 = false, ok2 = false;
- bool ok3 = false, ok4 = false, ok5 = false;
- unsigned int temp1 = regExpFrc.cap(1).toUInt(&ok1);
- unsigned int temp2 = regExpFrc.cap(2).toUInt(&ok2);
- unsigned int temp3 = regExpFrc.cap(3).toUInt(&ok3);
- unsigned int temp4 = regExpFrc.cap(4).toUInt(&ok4);
- unsigned int temp5 = regExpFrc.cap(5).toUInt(&ok5);
- if(ok1) fSizeW = temp1;
- if(ok2) fSizeH = temp2;
- if(ok3) fpsNom = temp3;
- if(ok4) fpsDen = temp4;
- if(ok5) frames = temp5;
- }
- if(!text.isEmpty())
- {
- log(text);
- }
- if(text.contains("failed to load avisynth.dll", Qt::CaseInsensitive))
- {
- log(tr("\nWarning: It seems that %1-Bit Avisynth is not currently installed !!!").arg(x64 ? "64" : "32"));
- }
- if(text.contains(QRegExp("couldn't convert input clip to (YV16|YV24)", Qt::CaseInsensitive)))
- {
- log(tr("\nWarning: YV16 (4:2:2) and YV24 (4:4:4) color-spaces only supported in Avisynth 2.6 !!!"));
- }
- }
- }
- }
+ log(tr("\n--- ENCODING PASS #1 ---\n"));
+ ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, clipInfo, 1, passLogFile);
+ CHECK_STATUS(m_abort, ok);
- process.waitForFinished();
- if(process.state() != QProcess::NotRunning)
- {
- process.kill();
- process.waitForFinished(-1);
+ log(tr("\n--- ENCODING PASS #2 ---\n"));
+ ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, clipInfo, 2, passLogFile);
+ CHECK_STATUS(m_abort, ok);
}
-
- if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
+ else
{
- if(!(bTimeout || bAborted))
- {
- log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(process.exitCode())));
- }
- return false;
+ log(tr("\n--- ENCODING VIDEO ---\n"));
+ ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, clipInfo);
+ CHECK_STATUS(m_abort, ok);
}
- if(frames == 0)
- {
- log(tr("\nFAILED TO DETERMINE AVS PROPERTIES !!!"));
- return false;
- }
-
- log("");
+ // -----------------------------------------------------------------------------------
+ // Encoding complete
+ // -----------------------------------------------------------------------------------
- if((fSizeW > 0) && (fSizeH > 0))
- {
- log(tr("Resolution: %1x%2").arg(QString::number(fSizeW), QString::number(fSizeH)));
- }
- if((fpsNom > 0) && (fpsDen > 0))
- {
- log(tr("Frame Rate: %1/%2").arg(QString::number(fpsNom), QString::number(fpsDen)));
- }
- if((fpsNom > 0) && (fpsDen == 0))
- {
- log(tr("Frame Rate: %1").arg(QString::number(fpsNom)));
- }
- if(frames > 0)
- {
- log(tr("No. Frames: %1").arg(QString::number(frames)));
- }
+ log(tr("\n--- COMPLETED ---\n"));
- return true;
+ int timePassed = startTime.secsTo(QDateTime::currentDateTime());
+ log(tr("Job finished at %1, %2. Process took %3 minutes, %4 seconds.").arg(QDate::currentDate().toString(Qt::ISODate), QTime::currentTime().toString(Qt::ISODate), QString::number(timePassed / 60), QString::number(timePassed % 60)));
+ setStatus(JobStatus_Completed);
}
///////////////////////////////////////////////////////////////////////////////
// Misc functions
///////////////////////////////////////////////////////////////////////////////
-void EncodeThread::setStatus(JobStatus newStatus)
+void EncodeThread::log(const QString &text)
+{
+ emit messageLogged(m_jobId, QDateTime::currentMSecsSinceEpoch(), text);
+}
+
+void EncodeThread::setStatus(const JobStatus &newStatus)
{
if(m_status != newStatus)
{
}
}
-void EncodeThread::setProgress(unsigned int newProgress)
+void EncodeThread::setProgress(const unsigned int &newProgress)
{
if(m_progress != newProgress)
{
void EncodeThread::setDetails(const QString &text)
{
- emit detailsChanged(m_jobId, text);
-}
-
-QString EncodeThread::pathToLocal(const QString &longPath, bool create, bool keep)
-{
- QTextCodec *localCodec = QTextCodec::codecForName("System");
-
- //Do NOT convert to short, if path can be represented in local Codepage
- if(localCodec->toUnicode(localCodec->fromUnicode(longPath)).compare(longPath, Qt::CaseInsensitive) == 0)
- {
- return longPath;
- }
-
- //Create dummy file, if required (only existing files can have a short path!)
- QFile tempFile;
- if((!QFileInfo(longPath).exists()) && create)
- {
- tempFile.setFileName(longPath);
- tempFile.open(QIODevice::WriteOnly);
- }
-
- QString shortPath;
- DWORD buffSize = GetShortPathNameW(reinterpret_cast<const wchar_t*>(longPath.utf16()), NULL, NULL);
-
- if(buffSize > 0)
- {
- wchar_t *buffer = new wchar_t[buffSize];
- DWORD result = GetShortPathNameW(reinterpret_cast<const wchar_t*>(longPath.utf16()), buffer, buffSize);
-
- if(result > 0 && result < buffSize)
- {
- shortPath = QString::fromUtf16(reinterpret_cast<const unsigned short*>(buffer));
- }
-
- delete[] buffer;
- buffer = NULL;
- }
-
- //Remove the dummy file now (FFMS2 fails, if index file does exist but is empty!)
- if(tempFile.isOpen())
- {
- if(!keep) tempFile.remove();
- tempFile.close();
- }
-
- if(shortPath.isEmpty())
- {
- log(tr("Warning: Failed to convert path \"%1\" to short!\n").arg(longPath));
- }
-
- return (shortPath.isEmpty() ? longPath : shortPath);
-}
-
-bool EncodeThread::startProcess(QProcess &process, const QString &program, const QStringList &args, bool mergeChannels)
-{
- QMutexLocker lock(&m_mutex_startProcess);
- log(commandline2string(program, args) + "\n");
-
- //Create a new job object, if not done yet
- if(!m_handle_jobObject)
- {
- m_handle_jobObject = CreateJobObject(NULL, NULL);
- if(m_handle_jobObject == INVALID_HANDLE_VALUE)
- {
- m_handle_jobObject = NULL;
- }
- if(m_handle_jobObject)
- {
- JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobExtendedLimitInfo;
- memset(&jobExtendedLimitInfo, 0, sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
- jobExtendedLimitInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION;
- SetInformationJobObject(m_handle_jobObject, JobObjectExtendedLimitInformation, &jobExtendedLimitInfo, sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
- }
- }
-
- if(mergeChannels)
- {
- process.setProcessChannelMode(QProcess::MergedChannels);
- process.setReadChannel(QProcess::StandardOutput);
- }
- else
- {
- process.setProcessChannelMode(QProcess::SeparateChannels);
- process.setReadChannel(QProcess::StandardError);
- }
-
- process.start(program, args);
-
- if(process.waitForStarted())
- {
- Q_PID pid = process.pid();
- AssignProcessToJobObject(m_handle_jobObject, process.pid()->hProcess);
- if(pid != NULL)
- {
- if(!SetPriorityClass(process.pid()->hProcess, BELOW_NORMAL_PRIORITY_CLASS))
- {
- SetPriorityClass(process.pid()->hProcess, IDLE_PRIORITY_CLASS);
- }
- }
-
- lock.unlock();
- return true;
- }
-
- log("Process creation has failed :-(");
- QString errorMsg= process.errorString().trimmed();
- if(!errorMsg.isEmpty()) log(errorMsg);
-
- process.kill();
- process.waitForFinished(-1);
- return false;
-}
-
-QString EncodeThread::commandline2string(const QString &program, const QStringList &arguments)
-{
- QString commandline = (program.contains(' ') ? QString("\"%1\"").arg(program) : program);
-
- for(int i = 0; i < arguments.count(); i++)
- {
- commandline += (arguments.at(i).contains(' ') ? QString(" \"%1\"").arg(arguments.at(i)) : QString(" %1").arg(arguments.at(i)));
- }
-
- return commandline;
-}
-
-QStringList EncodeThread::splitParams(const QString ¶ms)
-{
- QStringList list;
- bool ignoreWhitespaces = false;
- QString temp;
-
- for(int i = 0; i < params.length(); i++)
+ if((!text.isEmpty()) && (m_details.compare(text) != 0))
{
- 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);
+ emit detailsChanged(m_jobId, text);
+ m_details = text;
}
-
- APPEND_AND_CLEAR(list, temp);
-
- list.replaceInStrings("$(INPUT)", QDir::toNativeSeparators(m_sourceFileName), Qt::CaseInsensitive);
- list.replaceInStrings("$(OUTPUT)", QDir::toNativeSeparators(m_outputFileName), Qt::CaseInsensitive);
-
- return list;
-}
-
-qint64 EncodeThread::estimateSize(int progress)
-{
- if(progress >= 3)
- {
- qint64 currentSize = QFileInfo(m_outputFileName).size();
- qint64 estimatedSize = (currentSize * 100I64) / static_cast<qint64>(progress);
- return estimatedSize;
- }
-
- return 0I64;
}
-QString EncodeThread::sizeToString(qint64 size)
+QString EncodeThread::getPasslogFile(const QString &outputFile)
{
- static char *prefix[5] = {"Byte", "KB", "MB", "GB", "TB"};
+ QFileInfo info(outputFile);
+ QString passLogFile = QString("%1/%2.stats").arg(info.absolutePath(), info.completeBaseName());
+ int counter = 1;
- if(size > 1024I64)
+ while(QFileInfo(passLogFile).exists())
{
- qint64 estimatedSize = size;
- qint64 remainderSize = 0I64;
-
- int prefixIdx = 0;
- while((estimatedSize > 1024I64) && (prefixIdx < 4))
- {
- remainderSize = estimatedSize % 1024I64;
- estimatedSize = estimatedSize / 1024I64;
- prefixIdx++;
- }
-
- double value = static_cast<double>(estimatedSize) + (static_cast<double>(remainderSize) / 1024.0);
- return QString().sprintf((value < 10.0) ? "%.2f %s" : "%.1f %s", value, prefix[prefixIdx]);
+ passLogFile = QString("%1/%2_%3.stats").arg(info.absolutePath(), info.completeBaseName(), QString::number(++counter));
}
- return tr("N/A");
+ return passLogFile;
}
OSDN Git Service
