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;
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)));
}
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, pid, render, profile, rendermodule, player, src, dest, preargs, args, in, out);