///////////////////////////////////////////////////////////////////////////////
// Simple x264 Launcher
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2017 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 "source_avisynth.h"
#include "global.h"
-#include "model_sysinfo.h"
-#include "model_preferences.h"
-#include "binaries.h"
+
+#include <MUtils/Global.h>
#include <QDir>
#include <QProcess>
-static const unsigned int VER_X264_AVS2YUV_VER = 242;
+static const unsigned int VER_X264_AVS2YUV_VER = 245;
+
+// ------------------------------------------------------------
+// Encoder Info
+// ------------------------------------------------------------
+
+class AvisynthSourceInfo : public AbstractSourceInfo
+{
+public:
+ virtual QString getBinaryPath(const SysinfoModel *const sysinfo, const bool& x64) const
+ {
+ return QString("%1/toolset/%2/avs2yuv_%2.exe").arg(sysinfo->getAppPath(), (x64 ? "x64": "x86"));
+ }
+
+ virtual QStringList getExtraPaths(const SysinfoModel *const sysinfo, const bool& x64) const
+ {
+ const QString avsPath = sysinfo->getAVSPath();
+ if (!avsPath.isEmpty())
+ {
+
+ return QStringList() << QString("%1/%2").arg(avsPath, x64 ? QLatin1String("x64") : QLatin1String("x86"));
+ }
+ return QStringList();
+ }
+};
+
+static const AvisynthSourceInfo s_avisynthEncoderInfo;
+
+const AbstractSourceInfo &AvisynthSource::getSourceInfo(void)
+{
+ return s_avisynthEncoderInfo;
+}
+
// ------------------------------------------------------------
// Constructor & Destructor
AvisynthSource::AvisynthSource(JobObject *jobObject, const OptionsModel *options, const SysinfoModel *const sysinfo, const PreferencesModel *const preferences, JobStatus &jobStatus, volatile bool *abort, volatile bool *pause, QSemaphore *semaphorePause, const QString &sourceFile)
:
- AbstractSource(jobObject, options, sysinfo, preferences, jobStatus, abort, pause, semaphorePause, sourceFile),
- m_sourceName("Avisynth (avs)"),
- m_binaryFile(AVS_BINARY(m_sysinfo, m_preferences))
+ AbstractSource(jobObject, options, sysinfo, preferences, jobStatus, abort, pause, semaphorePause, sourceFile)
{
/*Nothing to do here*/
}
/*Nothing to do here*/
}
-const QString &AvisynthSource::getName(void)
+QString AvisynthSource::getName(void) const
{
- return m_sourceName;
+ return tr("Avisynth (avs)");
}
// ------------------------------------------------------------
bool AvisynthSource::isSourceAvailable()
{
- if(!(m_sysinfo->hasAVSSupport()))
+ if(!(m_sysinfo->hasAvisynth()))
{
log(tr("\nAVS INPUT REQUIRES AVISYNTH, BUT IT IS *NOT* AVAILABLE !!!"));
return false;
patterns << new QRegExp("\\bAvs2YUV (\\d+).(\\d+)bm(\\d)\\b", Qt::CaseInsensitive);
}
-void AvisynthSource::checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified)
+void AvisynthSource::checkVersion_parseLine(const QString &line, const QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified)
{
int offset = -1;
void AvisynthSource::checkSourceProperties_init(QList<QRegExp*> &patterns, QStringList &cmdLine)
{
+ if(!m_options->customAvs2YUV().isEmpty())
+ {
+ cmdLine << splitParams(m_options->customAvs2YUV());
+ }
+
cmdLine << "-frames" << "1";
cmdLine << QDir::toNativeSeparators(x264_path2ansi(m_sourceFile, true)) << "NUL";
- patterns << new QRegExp(": (\\d+)x(\\d+), (\\d+) fps, (\\d+) frames");
- patterns << new QRegExp(": (\\d+)x(\\d+), (\\d+)/(\\d+) fps, (\\d+) frames");
+ patterns << new QRegExp(":\\s+(\\d+)\\s*x\\s*(\\d+)\\s*,\\s+\\w+\\s*,\\s+\\d+-bits\\s*,\\s+\\w+\\s*,\\s+(\\d+)\\s+fps\\s*,\\s+(\\d+)\\s+frames");
+ patterns << new QRegExp(":\\s+(\\d+)\\s*x\\s*(\\d+)\\s*,\\s+\\w+\\s*,\\s+\\d+-bits\\s*,\\s+\\w+\\s*,\\s+(\\d+)\\s*/\\s*(\\d+)\\s+fps\\s*,\\s+(\\d+)\\s+frames");
}
-void AvisynthSource::checkSourceProperties_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &frames, unsigned int &fSizeW, unsigned int &fSizeH, unsigned int &fpsNom, unsigned int &fpsDen)
+void AvisynthSource::checkSourceProperties_parseLine(const QString &line, const QList<QRegExp*> &patterns, ClipInfo &clipInfo)
{
int offset = -1;
+ quint32 temp[5];
if((offset = patterns[0]->lastIndexIn(line)) >= 0)
{
- bool ok1 = false, ok2 = false;
- bool ok3 = false, ok4 = false;
- unsigned int temp1 = patterns[0]->cap(1).toUInt(&ok1);
- unsigned int temp2 = patterns[0]->cap(2).toUInt(&ok2);
- unsigned int temp3 = patterns[0]->cap(3).toUInt(&ok3);
- unsigned int temp4 = patterns[0]->cap(4).toUInt(&ok4);
- if(ok1) fSizeW = temp1;
- if(ok2) fSizeH = temp2;
- if(ok3) fpsNom = temp3;
- if(ok4) frames = temp4;
+ if (MUtils::regexp_parse_uint32((*patterns[0]), temp, 4))
+ {
+ clipInfo.setFrameSize(temp[0], temp[1]);
+ clipInfo.setFrameRate(temp[2], 0);
+ clipInfo.setFrameCount(temp[3]);
+ }
}
else if((offset = patterns[1]->lastIndexIn(line)) >= 0)
{
- bool ok1 = false, ok2 = false;
- bool ok3 = false, ok4 = false, ok5 = false;
- unsigned int temp1 = patterns[1]->cap(1).toUInt(&ok1);
- unsigned int temp2 = patterns[1]->cap(2).toUInt(&ok2);
- unsigned int temp3 = patterns[1]->cap(3).toUInt(&ok3);
- unsigned int temp4 = patterns[1]->cap(4).toUInt(&ok4);
- unsigned int temp5 = patterns[1]->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 (MUtils::regexp_parse_uint32((*patterns[1]), temp, 5))
+ {
+ clipInfo.setFrameSize(temp[0], temp[1]);
+ clipInfo.setFrameRate(temp[2], temp[3]);
+ clipInfo.setFrameCount(temp[4]);
+ }
}
if(!line.isEmpty())
if(line.contains("failed to load avisynth.dll", Qt::CaseInsensitive))
{
- log(tr("\nWarning: It seems that %1-Bit Avisynth is not currently installed !!!").arg(m_preferences->getUseAvisyth64Bit() ? "64" : "32"));
+ log(tr("\nWarning: It seems that Avisynth is not currently installed/available !!!"));
}
if(line.contains(QRegExp("couldn't convert input clip to (YV16|YV24)", Qt::CaseInsensitive)))
{
void AvisynthSource::buildCommandLine(QStringList &cmdLine)
{
+ if(!m_options->customAvs2YUV().isEmpty())
+ {
+ cmdLine << splitParams(m_options->customAvs2YUV());
+ }
+
cmdLine << QDir::toNativeSeparators(x264_path2ansi(m_sourceFile, true));
cmdLine << "-";
}
OSDN Git Service
