X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Fkdenlive_render.cpp;h=593d002c367df9ce5968b01754ff0bdb0676a9ba;hb=4ae3260592acc87712db77b7d3fe0cc2be7d76bc;hp=8a08c2683f3bec11707017a91087f69bba5d0c77;hpb=55bcc23d4c1c479c32cdd8c9401eb27f92eea1f9;p=kdenlive

diff --git a/renderer/kdenlive_render.cpp b/renderer/kdenlive_render.cpp
index 8a08c268..593d002c 100644
--- a/renderer/kdenlive_render.cpp
+++ b/renderer/kdenlive_render.cpp
@@ -32,6 +32,7 @@ int main(int argc, char **argv)
     QStringList args = app.arguments();
     QStringList preargs;
     QString locale;
+    int pid = 0;
     int in = -1;
     int out = -1;
     if (args.count() >= 7) {
@@ -48,6 +49,11 @@ int main(int argc, char **argv)
             usekuiserver = true;
             args.removeFirst();
         }
+        if (QString(args.at(0)).startsWith("-pid:")) {
+            pid = QString(args.at(0)).section(':', 1).toInt();
+            args.removeFirst();
+        }
+
         if (QString(args.at(0)).startsWith("-locale:")) {
             locale = QString(args.at(0)).section(':', 1);
             args.removeFirst();
@@ -63,7 +69,12 @@ int main(int argc, char **argv)
         QString profile = args.takeFirst();
         QString rendermodule = args.takeFirst();
         QString player = args.takeFirst();
-        QString src = args.takeFirst();
+        QByteArray srcString = args.takeFirst().toUtf8();
+        QUrl srcurl = QUrl::fromEncoded(srcString);
+        QString src = srcurl.path();
+        // The QUrl path() strips the consumer: protocol, so re-add it if necessary
+        if (srcString.startsWith("consumer:"))
+            src.prepend("consumer:");
         QUrl desturl = QUrl::fromEncoded(args.takeFirst().toUtf8());
         QString dest = desturl.path();
         bool dualpass = false;
@@ -74,7 +85,7 @@ int main(int argc, char **argv)
         if (vprepos >= 0) {
             vpre=args.at(vprepos);
         }
-        QStringList vprelist = vpre.replace("vpre=", "").split(",");
+        QStringList vprelist = vpre.replace("vpre=", "").split(',');
         if (vprelist.size() > 0) {
             args.replaceInStrings(QRegExp("^vpre=.*"), QString("vpre=").append(vprelist.at(0)));
         }
@@ -84,20 +95,29 @@ int main(int argc, char **argv)
             dualpass = true;
             doerase = false;
             args.replace(args.indexOf("pass=2"), "pass=1");
+            if (args.contains("vcodec=libx264")) args << QString("passlogfile=%1").arg(dest + ".log");
         } else {
             args.removeAll("pass=1");
             doerase = erase;
         }
+        
+        // Decode metadata
+        for (int i = 0; i < args.count(); ++i) {
+            if (args.at(i).startsWith("meta.attr")) {
+                QString data = args.at(i);
+                args.replace(i, data.section('=', 0, 0) + "=\"" + QUrl::fromPercentEncoding(data.section('=', 1).toUtf8()) + "\"");
+            }
+        }
 
         qDebug() << "//STARTING RENDERING: " << erase << "," << usekuiserver << "," << render << "," << profile << "," << rendermodule << "," << player << "," << src << "," << dest << "," << preargs << "," << args << "," << in << "," << out ;
-        RenderJob *job = new RenderJob(doerase, usekuiserver, render, profile, rendermodule, player, src, dest, preargs, args, in, out);
+        RenderJob *job = new RenderJob(doerase, usekuiserver, pid, render, profile, rendermodule, player, src, dest, preargs, args, in, out);
         if (!locale.isEmpty()) job->setLocale(locale);
         job->start();
         if (dualpass) {
             if (vprelist.size()>1)
                 args.replaceInStrings(QRegExp("^vpre=.*"),QString("vpre=").append(vprelist.at(1)));
             args.replace(args.indexOf("pass=1"), "pass=2");
-            RenderJob *dualjob = new RenderJob(erase, usekuiserver, render, profile, rendermodule, player, src, dest, preargs, args, in, out);
+            RenderJob *dualjob = new RenderJob(erase, usekuiserver, pid, render, profile, rendermodule, player, src, dest, preargs, args, in, out);
             QObject::connect(job, SIGNAL(renderingFinished()), dualjob, SLOT(start()));
         }
         app.exec();