X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Frenderjob.cpp;h=779f0fbc8299c5f45d187a531e6b525e838bfaa0;hb=f41ed100be081b273e920285d544a79e476d2789;hp=5c76175b0a2212ecf2921b1482ebfc68ec061f39;hpb=e307ce736b87de6c928dfcc19d198fc6324dc9f0;p=kdenlive diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index 5c76175b..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,59 +40,99 @@ 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); if (out != -1) m_args << "out=" + QString::number(out); + m_args << preargs; //qDebug()<<"PRE ARGS: "<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(); - } 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; + 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); + 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) { @@ -100,41 +147,61 @@ 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 + "
"); - m_logstream << "ReceivedStderr from inigo: " << result << endl; - result = result.section(" ", -1); - int pro = result.toInt(); - if (m_kdenliveinterface && pro > m_progress) { - m_dbusargs[1] = pro; - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); - } - if (m_jobUiserver && pro > m_progress) { - m_progress = pro; - m_jobUiserver->call("setPercent", (uint) m_progress); - int seconds = m_startTime.secsTo(QTime::currentTime()); - seconds = seconds * (100 - m_progress) / m_progress; - m_jobUiserver->call("setDescriptionField", (uint) 1, tr("Remaining time"), QTime(0, 0, seconds).toString("hh:mm:ss")); - } + else { + if (m_enablelog) m_logstream << "ReceivedStderr from melt: " << result << endl; + result = result.section(' ', -1); + int pro = result.toInt(); + if (pro < 0 || pro > 100) return; + if (pro > m_progress) { + m_progress = pro; + if (m_kdenliveinterface) { + if (!m_kdenliveinterface->isValid()) { + delete m_kdenliveinterface; + m_kdenliveinterface = NULL; + // 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"; + initKdenliveDbusInterface(); + } + if (m_jobUiserver) { + m_jobUiserver->call("setPercent", (uint) m_progress); + /*int seconds = m_startTime.secsTo(QTime::currentTime()); + seconds = seconds * (100 - m_progress) / m_progress; + m_jobUiserver->call("setDescriptionField", (uint) 1, tr("Remaining time"), QTime().addSecs(seconds).toString("hh:mm:ss"));*/ + } + } + } } -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(); @@ -143,25 +210,37 @@ void RenderJob::start() { } } else { qDebug() << "Failed to start kuiserver"; - m_logstream << "Failed to start kuiserver"; + if (m_enablelog) m_logstream << "Failed to start kuiserver"; } } if (interface->isServiceRegistered("org.kde.JobViewServer")) { QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer"); - QDBusReply objectPath = kuiserver.call("requestView", "kdenlive", "kdenlive", 1); + QDBusReply objectPath = kuiserver.call("requestView", "kdenlive", "kdenlive", 0x0001); QString reply = ((QDBusObjectPath) objectPath).path(); m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, "org.kde.JobView"); if (m_jobUiserver) { m_startTime = QTime::currentTime(); m_jobUiserver->call("setPercent", (uint) 0); - QDBusReply reply = m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(QFileInfo(m_dest).fileName())); - m_jobUiserver->call("setDescriptionField", (uint) 0, tr("Rendering to"), m_dest); + m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(QFileInfo(m_dest).fileName())); + //m_jobUiserver->call("setDescriptionField", (uint) 0, tr("Rendering to"), m_dest); QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, "org.kde.JobView", "cancelRequested", this, SLOT(slotAbort())); } } } + initKdenliveDbusInterface(); + + // 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); + 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() +{ QString kdenliveId; QDBusConnection connection = QDBusConnection::sessionBus(); QDBusConnectionInterface *ibus = connection.interface(); @@ -172,12 +251,12 @@ void RenderJob::start() { kdenliveId = service; break; } - - QDBusConnection bus = QDBusConnection::sessionBus(); + m_dbusargs.clear(); + if (kdenliveId.isEmpty()) return; m_kdenliveinterface = new QDBusInterface(kdenliveId, "/MainWindow", "org.kdenlive.MainWindow", - bus, + connection, this); if (m_kdenliveinterface) { @@ -187,22 +266,24 @@ void RenderJob::start() { connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString &)), this, SLOT(slotAbort(const QString&))); } +} - // 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; - qDebug() << "Started render process: " << m_prog << " " << m_args.join(" "); + +void RenderJob::slotCheckProcess(QProcess::ProcessState state) +{ + if (state == QProcess::NotRunning) slotIsOver(m_renderProcess->exitStatus()); } -void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) { + +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; @@ -211,17 +292,18 @@ 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(); } else { - if (m_kdenliveinterface) { + if (!m_dualpass && m_kdenliveinterface) { m_dbusargs[1] = (int) - 1; m_dbusargs.append(QString()); m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); } QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); - if (interface && interface->isServiceRegistered("org.kde.knotify")) { + if (!m_dualpass && interface && interface->isServiceRegistered("org.kde.knotify")) { QDBusMessage m = QDBusMessage::createMethodCall("org.kde.knotify", "/Notify", "org.kde.KNotify", @@ -235,22 +317,25 @@ 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_player != "-") { - m_logstream << "Starting player" << endl; + if (!m_dualpass && m_player != "-") { + if (m_enablelog) m_logstream << "Starting player" << endl; QStringList args; args << m_dest; QProcess::startDetached(m_player, args); } + if (m_dualpass) { + emit renderingFinished(); + deleteLater(); + } else qApp->quit(); } - qApp->quit(); } #include "renderjob.moc"