#include <QDBusConnectionInterface>
#include <QDBusInterface>
#include <QThread>
+#include <QScriptEngine>
const int GroupRole = Qt::UserRole;
const int ExtensionRole = GroupRole + 1;
const int EditableRole = GroupRole + 5;
const int MetaGroupRole = GroupRole + 6;
const int ExtraRole = GroupRole + 7;
-const int TwoPassRole = GroupRole + 8;
-const int BitratesRole = GroupRole + 9;
-const int DefaultBitrateRole = GroupRole + 10;
+const int BitratesRole = GroupRole + 8;
+const int DefaultBitrateRole = GroupRole + 9;
// Running job status
const int WAITINGJOB = 0;
m_view.proxy_render->setHidden(!enableProxy);
- m_view.encoder_threads->setMaximum(QThread::idealThreadCount());
- m_view.encoder_threads->setValue(KdenliveSettings::encodethreads());
- connect(m_view.encoder_threads, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateEncodeThreads(int)));
-
+ m_view.encoder_threads->setMaximum(QThread::idealThreadCount());
+ m_view.encoder_threads->setValue(KdenliveSettings::encodethreads());
+ connect(m_view.encoder_threads, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateEncodeThreads(int)));
+
m_view.rescale_keep->setChecked(KdenliveSettings::rescalekeepratio());
connect(m_view.rescale_width, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleWidth(int)));
connect(m_view.rescale_height, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleHeight(int)));
double fps = (double) m_profile.frame_rate_num / m_profile.frame_rate_den;
guideStart = m_view.guide_start->itemData(m_view.guide_start->currentIndex()).toDouble();
guideEnd = m_view.guide_end->itemData(m_view.guide_end->currentIndex()).toDouble();
- render_process_args << "in=" + QString::number(GenTime(guideStart).frames(fps)) << "out=" + QString::number(GenTime(guideEnd).frames(fps));
+ render_process_args << "in=" + QString::number((int) GenTime(guideStart).frames(fps)) << "out=" + QString::number((int) GenTime(guideEnd).frames(fps));
}
if (!overlayargs.isEmpty()) render_process_args << "preargs=" + overlayargs.join(" ");
width = m_profile.width;
height = m_profile.height;
}
- renderArgs.replace("%dar", '@' + QString::number(m_profile.display_aspect_num) + '/' + QString::number(m_profile.display_aspect_den));
+
//renderArgs.replace("%width", QString::number((int)(m_profile.height * m_profile.display_aspect_num / (double) m_profile.display_aspect_den + 0.5)));
//renderArgs.replace("%height", QString::number((int)m_profile.height));
renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads()));
renderArgs.append(QString(" real_time=-%1").arg(KdenliveSettings::mltthreads()));
- // 2 pass
- if (m_view.checkTwoPass->isEnabled() && m_view.checkTwoPass->isChecked())
- renderArgs.append(" pass=2");
-
- // bitrate
- if (m_view.comboBitrates->isEnabled())
- renderArgs.replace("%bitrate", m_view.comboBitrates->currentText());
-
// Check if the rendering profile is different from project profile,
// in which case we need to use the producer_comsumer from MLT
QString std = renderArgs;
}
bool resizeProfile = (subsize != currentSize);
QStringList paramsList = renderArgs.split(" ", QString::SkipEmptyParts);
- for (int i = 0; i < paramsList.count(); i++) {
- if (paramsList.at(i).startsWith("profile=")) {
- if (paramsList.at(i).section('=', 1) != m_profile.path) resizeProfile = true;
- break;
+
+ QScriptEngine sEngine;
+ sEngine.globalObject().setProperty("bitrate", m_view.comboBitrates->currentText());
+ sEngine.globalObject().setProperty("dar", '@' + QString::number(m_profile.display_aspect_num) + '/' + QString::number(m_profile.display_aspect_den));
+ sEngine.globalObject().setProperty("passes", static_cast<int>(m_view.checkTwoPass->isChecked()) + 1);
+
+ for (int i = 0; i < paramsList.count(); ++i) {
+ QString paramName = paramsList.at(i).section('=', 0, 0);
+ QString paramValue = paramsList.at(i).section('=', 1, 1);
+ // If the profiles do not match we need to use the consumer tag
+ if (paramName == "mlt_profile=" && paramValue != m_profile.path) {
+ resizeProfile = true;
}
+ // evaluate expression
+ if (paramValue.startsWith('%')) {
+ paramValue = sEngine.evaluate(paramValue.remove(0, 1)).toString();
+ paramsList[i] = paramName + '=' + paramValue;
+ }
+ sEngine.globalObject().setProperty(paramName.toUtf8().constData(), paramValue);
}
-
+
if (resizeProfile)
render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath);
else
if (group == "dvd") {
if (m_view.open_dvd->isChecked()) {
renderItem->setData(0, Qt::UserRole, group);
- if (renderArgs.contains("profile=")) {
+ if (renderArgs.contains("mlt_profile=")) {
// rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd
- QString prof = renderArgs.section("profile=", 1, 1);
+ QString prof = renderArgs.section("mlt_profile=", 1, 1);
prof = prof.section(' ', 0, 0);
kDebug() << "// render profile: " << prof;
renderItem->setData(0, Qt::UserRole + 1, prof);
if (m_view.destination_list->currentIndex() > 0)
destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString();
KIcon brokenIcon("dialog-close");
-
- if (m_view.format_list->currentItem()->data(TwoPassRole).canConvert(QVariant::Bool))
- m_view.checkTwoPass->setEnabled(m_view.format_list->currentItem()->data(TwoPassRole).toBool());
- else
- m_view.checkTwoPass->setEnabled(true);
+ KIcon warningIcon("dialog-warning");
const QStringList formatsList = KdenliveSettings::supportedformats();
const QStringList vcodecsList = KdenliveSettings::videocodecs();
m_view.size_list->addItem(dupItem);
std = dupItem->data(ParamsRole).toString();
// Make sure the selected profile uses the same frame rate as project profile
- if (std.contains("profile=")) {
- QString profile = std.section("profile=", 1, 1).section(' ', 0, 0);
+ if (std.contains("mlt_profile=")) {
+ QString profile = std.section("mlt_profile=", 1, 1).section(' ', 0, 0);
MltVideoProfile p = ProfilesDialog::getVideoProfile(profile);
if (p.frame_rate_den > 0) {
double profile_rate = (double) p.frame_rate_num / p.frame_rate_den;
}
}
}
+ if (std.contains(" profile=") || std.startsWith("profile=")) {
+ // changed in MLT commit d8a3a5c9190646aae72048f71a39ee7446a3bd45
+ // (http://www.mltframework.org/gitweb/mlt.git?p=mltframework.org/mlt.git;a=commit;h=d8a3a5c9190646aae72048f71a39ee7446a3bd45)
+ dupItem->setToolTip(i18n("This render profile uses a 'profile' parameter.<br />Unless you know what you are doing you will probably have to change it to 'mlt_profile'."));
+ dupItem->setIcon(warningIcon);
+ }
}
}
}
m_view.comboBitrates->setEnabled(false);
}
+ m_view.checkTwoPass->setEnabled(params.contains("passes"));
+
m_view.buttonRender->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty());
m_view.buttonGenerateScript->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty());
}
QString renderer;
QString params;
QString standard;
- QString twoPass;
QString bitrates, defaultBitrate;
KIcon icon;
groupName = documentElement.attribute("name", i18nc("Attribute Name", "Custom"));
extension = documentElement.attribute("extension", QString());
renderer = documentElement.attribute("renderer", QString());
- twoPass = documentElement.attribute("twopass", "true");
bool exists = false;
for (int j = 0; j < m_renderCategory.count(); j++) {
if (m_renderCategory.at(j)->text() == groupName && m_renderCategory.at(j)->data(MetaGroupRole) == metagroupId) {
if (!exists) {
QListWidgetItem *itemcat = new QListWidgetItem(groupName); //, m_view.format_list);
itemcat->setData(MetaGroupRole, metagroupId);
- itemcat->setData(TwoPassRole, twoPass == "false" ? false : true);
m_renderCategory.append(itemcat);
}
projects / kdenlive / blobdiff