///////////////////////////////////////////////////////////////////////////////
// Simple x264 Launcher
-// Copyright (C) 2004-2014 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 "model_options.h"
#include "model_preferences.h"
#include "model_sysinfo.h"
+#include "model_clipInfo.h"
#include "job_object.h"
-#include "binaries.h"
+#include "mediainfo.h"
//Encoders
#include "encoder_factory.h"
//Source
-#include "source_avisynth.h"
-#include "source_vapoursynth.h"
+#include "source_factory.h"
+
+//MUtils
+#include <MUtils/OSSupport.h>
+#include <MUtils/Version.h>
//Qt Framework
#include <QDate>
} \
while(0)
-/*
- * Input types
- */
-typedef enum
-{
- INPUT_NATIVE = 0,
- INPUT_AVISYN = 1,
- INPUT_VAPOUR = 2
-};
-
-/*
- * Static vars
- */
-//static const char *VPS_TEST_FILE = "import vapoursynth as vs\ncore = vs.get_core()\nv = core.std.BlankClip()\nv.set_output()\n";
-
///////////////////////////////////////////////////////////////////////////////
// Constructor & Destructor
///////////////////////////////////////////////////////////////////////////////
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(getInputType(QFileInfo(m_sourceFileName).suffix()))
+ switch(MediaInfo::analyze(m_sourceFileName))
{
- case INPUT_AVISYN:
- m_pipedSource = new AvisynthSource (m_jobObject, m_options, m_sysinfo, m_preferences, m_status, &m_abort, &m_pause, &m_semaphorePaused, 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 INPUT_VAPOUR:
- m_pipedSource = new VapoursynthSource(m_jobObject, m_options, m_sysinfo, m_preferences, m_status, &m_abort, &m_pause, &m_semaphorePaused, m_sourceFileName);
+ 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;
}
EncodeThread::~EncodeThread(void)
{
- X264_DELETE(m_encoder);
- X264_DELETE(m_jobObject);
- X264_DELETE(m_options);
+ MUTILS_DELETE(m_encoder);
+ MUTILS_DELETE(m_jobObject);
+ MUTILS_DELETE(m_options);
+ MUTILS_DELETE(m_pipedSource);
}
///////////////////////////////////////////////////////////////////////////////
if(m_jobObject)
{
m_jobObject->terminateJob(42);
- X264_DELETE(m_jobObject);
+ MUTILS_DELETE(m_jobObject);
}
}
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(...)
{
- x264_fatal_exit(L"Unhandeled exception error in encode thread!");
+ MUtils::OS::fatal_exit(L"Unhandeled exception error in encode thread!");
}
}
// -----------------------------------------------------------------------------------
//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(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->hasAVSSupport() ? tr("Yes") : tr("No")));
- log(tr("VapourSynth : %1").arg(m_sysinfo->hasVPSSupport() ? QDir::toNativeSeparators(m_sysinfo->getVPSPath()) : tr("N/A")));
+ 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("Encoder : %1").arg(m_encoder->getName()));
log(tr("Source : %1").arg(m_pipedSource ? m_pipedSource->getName() : tr("Native")));
- log(tr("RC Mode : %1").arg(OptionsModel::rcMode2String(m_options->rcMode())));
+ 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()));
+ log(tr("Custom : %1").arg(m_options->customEncParams().isEmpty() ? tr("<None>") : m_options->customEncParams()));
bool ok = false;
- unsigned int frames = 0;
+ ClipInfo clipInfo;
// -----------------------------------------------------------------------------------
// Check Versions
if(m_pipedSource)
{
log(tr("\n--- GET SOURCE INFO ---\n"));
- ok = m_pipedSource->checkSourceProperties(frames);
+ ok = m_pipedSource->checkSourceProperties(clipInfo);
CHECK_STATUS(m_abort, ok);
}
// -----------------------------------------------------------------------------------
//Run encoding passes
- if(m_options->rcMode() == OptionsModel::RCMode_2Pass)
+ if(m_encoder->getEncoderInfo().rcModeToType(m_options->rcMode()) == AbstractEncoderInfo::RC_TYPE_MULTIPASS)
{
const QString passLogFile = getPasslogFile(m_outputFileName);
log(tr("\n--- ENCODING PASS #1 ---\n"));
- ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, frames, 1, passLogFile);
+ ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, clipInfo, 1, passLogFile);
CHECK_STATUS(m_abort, ok);
log(tr("\n--- ENCODING PASS #2 ---\n"));
- ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, frames, 2, passLogFile);
+ ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, clipInfo, 2, passLogFile);
CHECK_STATUS(m_abort, ok);
}
else
{
log(tr("\n--- ENCODING VIDEO ---\n"));
- ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, frames);
+ ok = m_encoder->runEncodingPass(m_pipedSource, m_outputFileName, clipInfo);
CHECK_STATUS(m_abort, ok);
}
void EncodeThread::log(const QString &text)
{
- emit messageLogged(m_jobId, text);
+ emit messageLogged(m_jobId, QDateTime::currentMSecsSinceEpoch(), text);
}
void EncodeThread::setStatus(const JobStatus &newStatus)
}
}
-int EncodeThread::getInputType(const QString &fileExt)
-{
- int type = INPUT_NATIVE;
-
- if(fileExt.compare("avs", Qt::CaseInsensitive) == 0) type = INPUT_AVISYN;
- if(fileExt.compare("avsi", Qt::CaseInsensitive) == 0) type = INPUT_AVISYN;
- if(fileExt.compare("vpy", Qt::CaseInsensitive) == 0) type = INPUT_VAPOUR;
- if(fileExt.compare("py", Qt::CaseInsensitive) == 0) type = INPUT_VAPOUR;
-
- return type;
-}
-
QString EncodeThread::getPasslogFile(const QString &outputFile)
{
QFileInfo info(outputFile);
OSDN Git Service
