X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Frenderjob.cpp;h=779f0fbc8299c5f45d187a531e6b525e838bfaa0;hb=68f509945187b8896a1c3612aa07df4b0f2a9443;hp=4a118bad82aa2e88fb24a1446913d35a15eac75b;hpb=0be7647d0c2a74546776d698f110c8715942200a;p=kdenlive diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index 4a118bad..779f0fbc 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -45,7 +45,7 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con m_jobUiserver(NULL), m_kdenliveinterface(NULL), m_usekuiserver(usekuiserver), - m_enablelog( false ) + m_enablelog(false) { m_scenelist = scenelist; m_dest = dest; @@ -53,6 +53,18 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con 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); @@ -69,26 +81,27 @@ 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); - m_enablelog = ( getenv( "KDENLIVE_RENDER_LOG" ) != NULL ); - if ( m_enablelog ) { + 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]; + 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; @@ -107,7 +120,7 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con RenderJob::~RenderJob() { if (m_renderProcess) delete m_renderProcess; - if ( m_enablelog ) { + if (m_enablelog) { m_logfile.close(); } } @@ -134,7 +147,7 @@ void RenderJob::slotAbort() } QFile f(m_dest); f.remove(); - if ( m_enablelog ) { + if (m_enablelog) { m_logstream << "Job aborted by user" << endl; m_logstream.flush(); m_logfile.close(); @@ -145,9 +158,10 @@ void RenderJob::slotAbort() 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 { - if ( m_enablelog ) m_logstream << "ReceivedStderr from melt: " << 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; @@ -184,10 +198,10 @@ void RenderJob::start() if (interface && m_usekuiserver) { if (!interface->isServiceRegistered("org.kde.JobViewServer")) { qDebug() << "No org.kde.JobViewServer registered, trying to start kuiserver"; - if ( m_enablelog ) 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"; - if ( m_enablelog ) m_logstream << "Started kuiserver"; + if (m_enablelog) m_logstream << "Started kuiserver"; // Give it a couple of seconds to start QTime t; t.start(); @@ -196,7 +210,7 @@ void RenderJob::start() } } else { qDebug() << "Failed to start kuiserver"; - if ( m_enablelog ) m_logstream << "Failed to start kuiserver"; + if (m_enablelog) m_logstream << "Failed to start kuiserver"; } } @@ -220,7 +234,7 @@ 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); - if ( m_enablelog ) 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(" "); } @@ -255,14 +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; @@ -271,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); - if ( m_enablelog ) 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(); @@ -302,10 +323,10 @@ void RenderJob::slotIsOver(int /*exitcode*/, QProcess::ExitStatus status) m.setArguments(args); QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m); } - if ( m_enablelog ) 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 != "-") { - if ( m_enablelog ) m_logstream << "Starting player" << endl; + if (m_enablelog) m_logstream << "Starting player" << endl; QStringList args; args << m_dest; QProcess::startDetached(m_player, args);