Fixed parsing of source properties for new Avs2YUV version.

[x264-launcher/x264-launcher.git] / src / source_avisynth.cpp

diff --git a/src/source_avisynth.cpp b/src/source_avisynth.cpp
index 5bcd6ed..d86417a 100644 (file)
--- a/src/source_avisynth.cpp
+++ b/src/source_avisynth.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 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
@@ -25,10 +25,12 @@
 
 #include "global.h"
 
+#include <MUtils/Global.h>
+
 #include <QDir>
 #include <QProcess>
 
-static const unsigned int VER_X264_AVS2YUV_VER = 243;
+static const unsigned int VER_X264_AVS2YUV_VER = 245;
 
 // ------------------------------------------------------------
 // Encoder Info
@@ -37,10 +39,21 @@ static const unsigned int VER_X264_AVS2YUV_VER = 243;
 class AvisynthSourceInfo : public AbstractSourceInfo
 {
 public:
-       virtual QString getBinaryPath(const SysinfoModel *sysinfo, const bool& x64) const
+       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;
@@ -50,6 +63,7 @@ const AbstractSourceInfo &AvisynthSource::getSourceInfo(void)
        return s_avisynthEncoderInfo;
 }
 
+
 // ------------------------------------------------------------
 // Constructor & Destructor
 // ------------------------------------------------------------
@@ -91,7 +105,7 @@ void AvisynthSource::checkVersion_init(QList<QRegExp*> &patterns, QStringList &c
        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;
 
@@ -156,44 +170,40 @@ bool AvisynthSource::isVersionSupported(const unsigned int &revision, const bool
 
 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())
@@ -217,6 +227,11 @@ void AvisynthSource::checkSourceProperties_parseLine(const QString &line, QList<
 
 void AvisynthSource::buildCommandLine(QStringList &cmdLine)
 {
+       if(!m_options->customAvs2YUV().isEmpty())
+       {
+               cmdLine << splitParams(m_options->customAvs2YUV());
+       }
+
        cmdLine << QDir::toNativeSeparators(x264_path2ansi(m_sourceFile, true));
        cmdLine << "-";
 }