X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Fkdenlive_render.cpp;h=593d002c367df9ce5968b01754ff0bdb0676a9ba;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=128d17dd2893b4b6f90ff2f1b0a98d2635809a8c;hpb=755284e1b42e5d01c797d93f77cc974b91d11cef;p=kdenlive

diff --git a/renderer/kdenlive_render.cpp b/renderer/kdenlive_render.cpp
index 128d17dd..593d002c 100644
--- a/renderer/kdenlive_render.cpp
+++ b/renderer/kdenlive_render.cpp
@@ -31,6 +31,8 @@ int main(int argc, char **argv)
     QCoreApplication app(argc, argv);
     QStringList args = app.arguments();
     QStringList preargs;
+    QString locale;
+    int pid = 0;
     int in = -1;
     int out = -1;
     if (args.count() >= 7) {
@@ -47,6 +49,15 @@ 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();
+        }
         if (args.at(0).startsWith("in="))
             in = args.takeFirst().section('=', -1).toInt();
         if (args.at(0).startsWith("out="))
@@ -58,38 +69,64 @@ 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;
         bool doerase;
-        QString vpre=args.at(args.indexOf(QRegExp("vpre=.*")));
-        QStringList vprelist=vpre.replace("vpre=","").split(",");
-        if (vprelist.size()>0)
-            args.replaceInStrings(QRegExp("^vpre=.*"),QString("vpre=").append(vprelist.at(0)));
+        QString vpre;
+
+        int vprepos = args.indexOf(QRegExp("vpre=.*"));
+        if (vprepos >= 0) {
+            vpre=args.at(vprepos);
+        }
+        QStringList vprelist = vpre.replace("vpre=", "").split(',');
+        if (vprelist.size() > 0) {
+            args.replaceInStrings(QRegExp("^vpre=.*"), QString("vpre=").append(vprelist.at(0)));
+        }
+
         if (args.contains("pass=2")) {
             // dual pass encoding
             dualpass = true;
             doerase = false;
             args.replace(args.indexOf("pass=2"), "pass=1");
-        } else doerase = erase;
+            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");
-            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();
     } else {
         fprintf(stderr, "Kdenlive video renderer for MLT.\nUsage: "
-                "kdenlive_render [-erase] [-kuiserver] [in=pos] [out=pos] [render] [profile] [rendermodule] [player] [src] [dest] [[arg1] [arg2] ...]\n"
+                "kdenlive_render [-erase] [-kuiserver] [-locale:LOCALE] [in=pos] [out=pos] [render] [profile] [rendermodule] [player] [src] [dest] [[arg1] [arg2] ...]\n"
                 "  -erase: if that parameter is present, src file will be erased at the end\n"
                 "  -kuiserver: if that parameter is present, use KDE job tracker\n"
+                "  -locale:LOCALE : set a locale for rendering. For example, -locale:fr_FR.UTF-8 will use a french locale (comma as numeric separator)\n"
                 "  in=pos: start rendering at frame pos\n"
                 "  out=pos: end rendering at frame pos\n"
                 "  render: path to MLT melt renderer\n"