X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Frenderjob.cpp;h=779f0fbc8299c5f45d187a531e6b525e838bfaa0;hb=ddbaec2157f0cb06746fd514ebad3b27222006ad;hp=b6808743c44b4eeceae5ecfb44c62b00ec50ab39;hpb=23dc500f7a8b1ef26040a9e27e3c4dfe6b4140a9;p=kdenlive diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index b6808743..779f0fbc 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -17,13 +17,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ + +#include "renderjob.h" + +#include // for getenv, posix portable to Windows: http://msdn.microsoft.com/en-us/library/tehxacec(VS.80).aspx + #include #include #include -#include "renderjob.h" +#include + // Can't believe I need to do this to sleep. -class SleepThread : QThread { +class SleepThread : QThread +{ public: virtual void run() {}; static void msleep(unsigned long msecs) { @@ -33,13 +40,31 @@ public: static QDBusConnection connection(QLatin1String("")); -RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) : QObject(), m_usekuiserver(usekuiserver), m_jobUiserver(NULL), m_kdenliveinterface(NULL) { +RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) : + QObject(), + m_jobUiserver(NULL), + m_kdenliveinterface(NULL), + m_usekuiserver(usekuiserver), + m_enablelog(false) +{ m_scenelist = scenelist; m_dest = dest; m_player = player; m_progress = 0; m_erase = erase; m_renderProcess = new QProcess; + + // Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU +#if QT_VERSION >= 0x040600 + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("MLT_NO_VDPAU", "1"); + m_renderProcess->setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << "MLT_NO_VDPAU=1"; + m_renderProcess->setEnvironment(env); +#endif + m_prog = renderer; m_args << scenelist; if (in != -1) m_args << "in=" + QString::number(in); @@ -56,44 +81,58 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con m_dualpass = false; if (args.contains("pass=1")) m_dualpass = true; - connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus))); + connect(m_renderProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotCheckProcess(QProcess::ProcessState))); + //connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus))); m_renderProcess->setReadChannel(QProcess::StandardError); - /* - // Create a log of every render process. - m_logfile.setAutoRemove(false); - m_logfile.setFileTemplate(QDir::tempPath() + "/kdenlive_render.log.XXXXXXXX"); - if (m_logfile.open()) { - qDebug() << "Writing render log to " << m_logfile.fileName(); + m_enablelog = (getenv("KDENLIVE_RENDER_LOG") != NULL); + if (m_enablelog) { + // Create a log of every render process. + m_logfile.setAutoRemove(false); + m_logfile.setFileTemplate(QDir::tempPath() + "/kdenlive_render.log.XXXXXXXX"); + if (m_logfile.open()) { + qDebug() << "Writing render log to " << m_logfile.fileName(); - } else { - qDebug() << "Unable to log to " << m_logfile.fileName(); - } - m_logstream.setDevice(&m_logfile); - m_logstream << "Log starting. Dumping contents of " << scenelist << endl; - QFile file(scenelist); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - m_logstream << "Unable to read contents of " << scenelist << endl; - } else { - m_logstream.flush(); - QTextStream in(&file); - m_logstream << in.readAll() << endl; + } else { + qDebug() << "Unable to log to " << m_logfile.fileName(); + } + m_logstream.setDevice(&m_logfile); + QString tmplist = scenelist; + if (tmplist.contains("consumer:")) { + QStringList tl = tmplist.split("consumer:"); + if (tl.count() == 2) { + tmplist = tl[1]; + } + } + m_logstream << "Log starting. Dumping contents of " << tmplist << endl; + QFile file(tmplist); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + m_logstream << "Unable to read contents of " << tmplist << endl; + } else { + m_logstream.flush(); + QTextStream in(&file); + m_logstream << in.readAll() << endl; + } } - */ } -RenderJob::~RenderJob() { +RenderJob::~RenderJob() +{ if (m_renderProcess) delete m_renderProcess; - // m_logfile.close(); + if (m_enablelog) { + m_logfile.close(); + } } -void RenderJob::slotAbort(const QString& url) { +void RenderJob::slotAbort(const QString& url) +{ if (m_dest == url) slotAbort(); } -void RenderJob::slotAbort() { - qDebug() << "Kdenlive-render: JOB ABORTED BY USER..."; +void RenderJob::slotAbort() +{ + qDebug() << "Kdenlive-render: JOB ABORTED BY USER..."; m_renderProcess->kill(); if (m_kdenliveinterface) { @@ -108,19 +147,21 @@ void RenderJob::slotAbort() { } QFile f(m_dest); f.remove(); - /* - m_logstream << "Job aborted by user" << endl; - m_logstream.flush(); - m_logfile.close(); - */ + if (m_enablelog) { + m_logstream << "Job aborted by user" << endl; + m_logstream.flush(); + m_logfile.close(); + } qApp->quit(); } -void RenderJob::receivedStderr() { +void RenderJob::receivedStderr() +{ QString result = QString(m_renderProcess->readAllStandardError()).simplified(); + //fprintf(stderr, "* * * *RENDER LG: %s\n", result.toUtf8().data()); if (!result.startsWith("Current Frame")) m_errorMessage.append(result + "
"); else { - // m_logstream << "ReceivedStderr from inigo: " << result << endl; + if (m_enablelog) m_logstream << "ReceivedStderr from melt: " << result << endl; result = result.section(' ', -1); int pro = result.toInt(); if (pro < 0 || pro > 100) return; @@ -130,14 +171,14 @@ void RenderJob::receivedStderr() { if (!m_kdenliveinterface->isValid()) { delete m_kdenliveinterface; m_kdenliveinterface = NULL; - // qDebug() << "BROKEN COMMUNICATION WITH KDENLIVE"; + // qDebug() << "BROKEN COMMUNICATION WITH KDENLIVE"; } else { m_dbusargs[1] = pro; m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); } } else if (pro % 5 == 0) { // Try to restart communication with Kdenlive every 5 percents - // qDebug() << "TRYING TO RESTART COMMUNICATION WITH KDENLIVE"; + // qDebug() << "TRYING TO RESTART COMMUNICATION WITH KDENLIVE"; initKdenliveDbusInterface(); } @@ -151,15 +192,16 @@ void RenderJob::receivedStderr() { } } -void RenderJob::start() { +void RenderJob::start() +{ QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); if (interface && m_usekuiserver) { if (!interface->isServiceRegistered("org.kde.JobViewServer")) { qDebug() << "No org.kde.JobViewServer registered, trying to start kuiserver"; - // m_logstream << "No org.kde.JobViewServer registered, trying to start kuiserver"; + if (m_enablelog) m_logstream << "No org.kde.JobViewServer registered, trying to start kuiserver"; if (QProcess::startDetached("kuiserver")) { qDebug() << "Started kuiserver"; - // m_logstream << "Started kuiserver"; + if (m_enablelog) m_logstream << "Started kuiserver"; // Give it a couple of seconds to start QTime t; t.start(); @@ -168,7 +210,7 @@ void RenderJob::start() { } } else { qDebug() << "Failed to start kuiserver"; - // m_logstream << "Failed to start kuiserver"; + if (m_enablelog) m_logstream << "Failed to start kuiserver"; } } @@ -192,12 +234,13 @@ void RenderJob::start() { // Because of the logging, we connect to stderr in all cases. connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr())); m_renderProcess->start(m_prog, m_args); - // m_logstream << "Started render process: " << m_prog << " " << m_args.join(" ") << endl; + if (m_enablelog) m_logstream << "Started render process: " << m_prog << " " << m_args.join(" ") << endl; qDebug() << "Started render process: " << m_prog << " " << m_args.join(" "); } -void RenderJob::initKdenliveDbusInterface() { +void RenderJob::initKdenliveDbusInterface() +{ QString kdenliveId; QDBusConnection connection = QDBusConnection::sessionBus(); QDBusConnectionInterface *ibus = connection.interface(); @@ -226,13 +269,21 @@ void RenderJob::initKdenliveDbusInterface() { } -void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) { +void RenderJob::slotCheckProcess(QProcess::ProcessState state) +{ + if (state == QProcess::NotRunning) slotIsOver(m_renderProcess->exitStatus()); +} + + + +void RenderJob::slotIsOver(QProcess::ExitStatus status) +{ if (m_jobUiserver) m_jobUiserver->call("terminate", QString()); if (m_erase) { QFile f(m_scenelist); f.remove(); } - if (status == QProcess::CrashExit) { + if (status == QProcess::CrashExit || m_renderProcess->error() != QProcess::UnknownError) { // rendering crashed if (m_kdenliveinterface) { m_dbusargs[1] = (int) - 2; @@ -241,7 +292,7 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) { } QStringList args; args << "--error" << tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest); - // m_logstream << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted." << endl; + if (m_enablelog) m_logstream << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted." << endl; qDebug() << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted."; QProcess::startDetached("kdialog", args); qApp->quit(); @@ -266,16 +317,16 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) { args.append(QByteArray()); // app icon QStringList actionList; args.append(actionList); // actions - qlonglong wid; + qlonglong wid = 0; args.append(wid); // win id m.setArguments(args); QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m); } - // m_logstream << "Rendering of " << m_dest << " finished" << endl; + if (m_enablelog) m_logstream << "Rendering of " << m_dest << " finished" << endl; qDebug() << "Rendering of " << m_dest << " finished"; if (!m_dualpass && m_player != "-") { - // m_logstream << "Starting player" << endl; + if (m_enablelog) m_logstream << "Starting player" << endl; QStringList args; args << m_dest; QProcess::startDetached(m_player, args);