X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Frenderjob.cpp;h=60ba1df6be468195f0191ee4373ae4e93d3ceb47;hb=b6d6c25f1bd07f11a0ceaf32a3a5bcaeab367336;hp=33f7b7b4680b57fbe952195145c3da458de31c04;hpb=cd85961a9520f2f3c909e889dacd8de539468b89;p=kdenlive diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index 33f7b7b4..60ba1df6 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -20,28 +20,51 @@ #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 + // Can't believe I need to do this to sleep. -class SleepThread : QThread { +class SleepThread : QThread +{ public: - virtual void run() {}; + virtual void run() {} static void msleep(unsigned long msecs) { QThread::msleep(msecs); } }; -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, int pid, 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_pid(pid) +{ 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); @@ -58,44 +81,70 @@ 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))); 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() { - if (m_renderProcess) delete m_renderProcess; - // m_logfile.close(); +RenderJob::~RenderJob() +{ + delete m_renderProcess; + if (m_enablelog) { + m_logfile.close(); + } +} + +void RenderJob::setLocale(const QString &locale) +{ +#if QT_VERSION >= 0x040600 + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("LC_NUMERIC", locale); + m_renderProcess->setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << QString("LC_NUMERIC=%1").arg(locale); + m_renderProcess->setEnvironment(env); +#endif } -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) { @@ -110,36 +159,43 @@ 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; if (pro > m_progress) { m_progress = pro; + if (m_args.contains("pass=1")) { + m_progress /= 2.0; + } else if (m_args.contains("pass=2")) { + m_progress = 50 + m_progress / 2.0; + } if (m_kdenliveinterface) { 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_dbusargs[1] = m_progress; 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(); } @@ -153,15 +209,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(); @@ -170,45 +227,67 @@ 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", 0x0001); + 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) { + + // Use of the KDE JobViewServer is an ugly hack, it is not reliable + QString dbusView = "org.kde.JobViewV2"; + m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, dbusView); + if (!m_jobUiserver || !m_jobUiserver->isValid()) { + dbusView = "org.kde.JobView"; + m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, dbusView); + } + + if (m_jobUiserver && m_jobUiserver->isValid()) { m_startTime = QTime::currentTime(); - m_jobUiserver->call("setPercent", (uint) 0); - 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())); + if (!m_args.contains("pass=2")) + m_jobUiserver->call("setPercent", (uint) 0); + //m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(QFileInfo(m_dest).fileName())); + m_jobUiserver->call("setDescriptionField", (uint) 0, tr("Rendering"), m_dest); + QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, dbusView, "cancelRequested", this, SLOT(slotAbort())); } } } initKdenliveDbusInterface(); + + // Make sure the destination file is writable + QFile checkDestination(m_dest); + if (!checkDestination.open(QIODevice::WriteOnly)) { + slotIsOver(QProcess::NormalExit, false); + } + checkDestination.close(); // 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(); - const QStringList services = ibus->registeredServiceNames(); - foreach(const QString &service, services) { - if (!service.startsWith("org.kde.kdenlive")) - continue; - kdenliveId = service; - break; + QDBusConnectionInterface* ibus = connection.interface(); + kdenliveId = QString("org.kde.kdenlive-%1").arg(m_pid); + if (!ibus->isServiceRegistered(kdenliveId)) + { + kdenliveId.clear(); + const QStringList services = ibus->registeredServiceNames(); + foreach(const QString & service, services) { + if (!service.startsWith("org.kde.kdenlive")) + continue; + kdenliveId = service; + break; + } } m_dbusargs.clear(); if (kdenliveId.isEmpty()) return; @@ -221,20 +300,43 @@ void RenderJob::initKdenliveDbusInterface() { if (m_kdenliveinterface) { m_dbusargs.append(m_dest); m_dbusargs.append((int) 0); - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); - connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString &)), - this, SLOT(slotAbort(const QString&))); + if (!m_args.contains("pass=2")) + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); + connect(m_kdenliveinterface, SIGNAL(abortRenderJob(QString)), + this, SLOT(slotAbort(QString))); } } -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, bool isWritable) +{ if (m_jobUiserver) m_jobUiserver->call("terminate", QString()); + if (!isWritable) { + QString error = tr("Cannot write to %1, check the permissions.").arg(m_dest); + if (m_kdenliveinterface) { + m_dbusargs[1] = (int) - 2; + m_dbusargs.append(error); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); + } + QStringList args; + args << "--error" << error; + if (m_enablelog) m_logstream << error << endl; + qDebug() << error; + QProcess::startDetached("kdialog", args); + qApp->quit(); + } 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; @@ -242,9 +344,10 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) { m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); } 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; - qDebug() << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted."; + QString error = tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest); + args << "--error" << error; + if (m_enablelog) m_logstream << error << endl; + qDebug() << error; QProcess::startDetached("kdialog", args); qApp->quit(); } else { @@ -268,16 +371,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);