Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Show an estimate(!) of the final size during the encode.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-02-23 03:18:46 +01:00
parent 912f9e576e
commit ae97181d06
3 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/thread_encode.cpp
View File

@ -310,7 +310,7 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool avs2yuv_x64, bool usePipe
} }
QRegExp regExpIndexing("indexing.+\\[(\\d+)\\.\\d+%\\]"); QRegExp regExpIndexing("indexing.+\\[(\\d+)\\.\\d+%\\]");
QRegExp regExpProgress("\\[(\\d+)\\.\\d+%\\].+frames"); QRegExp regExpProgress("\\[(\\d+)\\.(\\d+)%\\].+frames");
QRegExp regExpFrameCnt("^(\\d+) frames:"); QRegExp regExpFrameCnt("^(\\d+) frames:");
QTextCodec *localCodec = QTextCodec::codecForName("System"); QTextCodec *localCodec = QTextCodec::codecForName("System");
@ -394,11 +394,12 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool avs2yuv_x64, bool usePipe
int offset = -1; int offset = -1;
if((offset = regExpProgress.lastIndexIn(text)) >= 0) if((offset = regExpProgress.lastIndexIn(text)) >= 0)
{ {
bool ok = false; bool ok[2] = {false, false};
unsigned int progress = regExpProgress.cap(1).toUInt(&ok); unsigned int progressInt = regExpProgress.cap(1).toUInt(&ok[0]);
unsigned int progressFrc = regExpProgress.cap(2).toUInt(&ok[1]);
setStatus((pass == 2) ? JobStatus_Running_Pass2 : ((pass == 1) ? JobStatus_Running_Pass1 : JobStatus_Running)); setStatus((pass == 2) ? JobStatus_Running_Pass2 : ((pass == 1) ? JobStatus_Running_Pass1 : JobStatus_Running));
setDetails(text.mid(offset).trimmed()); setDetails(tr("%1, est. size %2").arg(text.mid(offset).trimmed(), estimateSize(ok[0] ? progressInt : 0, ok[1] ? progressFrc : 0)));
if(ok) setProgress(progress); if(ok[0]) setProgress(progressInt);
} }
else if((offset = regExpIndexing.lastIndexIn(text)) >= 0) else if((offset = regExpIndexing.lastIndexIn(text)) >= 0)
{ {
@ -1102,3 +1103,33 @@ QStringList EncodeThread::splitParams(const QString &params)
return list; return list;
} }
QString EncodeThread::estimateSize(int progressInt, int progressFrc)
{
int progress = (10 * progressInt) + (progressFrc % 10);
static char *prefix[5] = {"Byte", "KB", "MB", "GB", "TB"};
if(progress >= 30)
{
qint64 currentSize = QFileInfo(m_outputFileName).size();
if(currentSize > 1024I64)
{
qint64 estimatedSize = (currentSize * 1000I64) / static_cast<qint64>(progress);
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]);
}
}
return tr("N/A");
}

1
src/thread_encode.h
View File

@ -126,6 +126,7 @@ protected:
bool startProcess(QProcess &process, const QString &program, const QStringList &args, bool mergeChannels = true); bool startProcess(QProcess &process, const QString &program, const QStringList &args, bool mergeChannels = true);
QString pathToLocal(const QString &longPath, bool create = false, bool keep = true); QString pathToLocal(const QString &longPath, bool create = false, bool keep = true);
QStringList splitParams(const QString &params); QStringList splitParams(const QString &params);
QString estimateSize(int progressInt, int progressFrc);
//Static functions //Static functions
static QString commandline2string(const QString &program, const QStringList &arguments); static QString commandline2string(const QString &program, const QStringList &arguments);

2
src/version.h
View File

@ -22,7 +22,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 0 #define VER_X264_MINOR 0
#define VER_X264_PATCH 2 #define VER_X264_PATCH 2
#define VER_X264_BUILD 256 #define VER_X264_BUILD 266
#define VER_X264_MINIMUM_REV 2146 #define VER_X264_MINIMUM_REV 2146
#define VER_X264_CURRENT_API 120 #define VER_X264_CURRENT_API 120