#include <QProcess>
#include <QDBusConnectionInterface>
#include <QDBusInterface>
+#include <QThread>
const int GroupRole = Qt::UserRole;
const int ExtensionRole = GroupRole + 1;
const int FINISHEDJOB = 2;
-RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
+RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidget * parent) :
QDialog(parent),
m_projectFolder(projectfolder),
m_blockProcessing(false)
m_view.buttonFavorite->setIcon(KIcon("favorites"));
m_view.buttonFavorite->setToolTip(i18n("Copy profile to favorites"));
+
+ m_view.advanced_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
if (KdenliveSettings::showrenderparams()) {
m_view.buttonInfo->setDown(true);
} else m_view.advanced_params->hide();
- m_view.proxy_render->setHidden(!KdenliveSettings::enableproxy());
+ 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.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)));
connect(m_view.guide_start, SIGNAL(activated(int)), this, SLOT(slotCheckEndGuidePosition()));
connect(m_view.format_selection, SIGNAL(activated(int)), this, SLOT(refreshView()));
+ connect(m_view.tc_overlay, SIGNAL(toggled(bool)), m_view.tc_type, SLOT(setEnabled(bool)));
m_view.buttonRender->setEnabled(false);
m_view.buttonGenerateScript->setEnabled(false);
m_view.create_chapter->setVisible(false);
m_view.open_browser->setVisible(false);
m_view.error_box->setVisible(false);
+ m_view.tc_type->setEnabled(false);
m_view.splitter->setStretchFactor(1, 5);
m_view.splitter->setStretchFactor(0, 2);
QStringList overlayargs;
if (m_view.tc_overlay->isChecked()) {
QString filterFile = KStandardDirs::locate("appdata", "metadata.properties");
- overlayargs << "meta.attr.timecode=1" << "meta.attr.timecode.markup=#timecode";
+ overlayargs << "meta.attr.timecode=1" << "meta.attr.timecode.markup=#" + QString(m_view.tc_type->currentIndex() ? "frame" : "timecode");
overlayargs << "-attach" << "data_feed:attr_check" << "-attach";
overlayargs << "data_show:" + filterFile << "_loader=1" << "dynamic=1";
}
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));
// Adjust scanning
if (m_view.scanning_list->currentIndex() == 1) renderArgs.append(" progressive=1");
// disable audio if requested
if (!exportAudio) renderArgs.append(" an=1 ");
+ // Set the thread counts
+ renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads()));
+ renderArgs.append(QString(" real_time=-%1").arg(KdenliveSettings::mltthreads()));
+
// 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;
break;
}
}
-
+
if (resizeProfile)
render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath);
else
QTextStream outStream(&file);
outStream << "#! /bin/sh" << "\n" << "\n";
outStream << "SOURCE=" << "\"" + playlistPath + "\"" << "\n";
- outStream << "TARGET=" << "\"" + dest + "\"" << "\n";
+ outStream << "TARGET=" << "\"" + KUrl(dest).url() + "\"" << "\n";
outStream << "RENDERER=" << "\"" + m_renderer + "\"" << "\n";
outStream << "MELT=" << "\"" + render_process_args.takeFirst() + "\"" << "\n";
outStream << "PARAMETERS=" << "\"" + render_process_args.join(" ") + "\"" << "\n";
renderProps.insert("renderrescalewidth", QString::number(m_view.rescale_width->value()));
renderProps.insert("renderrescaleheight", QString::number(m_view.rescale_height->value()));
renderProps.insert("rendertcoverlay", QString::number(m_view.tc_overlay->isChecked()));
+ renderProps.insert("rendertctype", QString::number(m_view.tc_type->currentIndex()));
renderProps.insert("renderratio", QString::number(m_view.rescale_keep->isChecked()));
renderProps.insert("renderplay", QString::number(m_view.play_after->isChecked()));
// can also override profiles installed by KNewStuff
fileList.removeAll("customprofiles.xml");
foreach(const QString &filename, fileList)
- parseFile(exportFolder + filename, true);
+ parseFile(exportFolder + filename, true);
if (QFile::exists(exportFolder + "customprofiles.xml")) parseFile(exportFolder + "customprofiles.xml", true);
if (!meta.isEmpty()) {
while (!stream.atEnd()) {
QString line = stream.readLine();
if (line.startsWith("TARGET=")) {
- target = line.section("TARGET=", 1).simplified();
- target.remove(QChar('"'));
- } else if (line.startsWith("RENDERER=")) {
- renderer = line.section("RENDERER=", 1).simplified();
- renderer.remove(QChar('"'));
- } else if (line.startsWith("MELT=")) {
- melt = line.section("MELT=", 1).simplified();
- melt.remove(QChar('"'));
+ target = line.section("TARGET=\"", 1);
+ target = target.section('"', 0, 0);
+ } else if (line.startsWith("RENDERER=\"")) {
+ renderer = line.section("RENDERER=", 1);
+ renderer = renderer.section('"', 0, 0);
+ } else if (line.startsWith("MELT=\"")) {
+ melt = line.section("MELT=", 1);
+ melt = melt.section('"', 0, 0);
}
}
file.close();
item->setData(0, Qt::UserRole, '1');
} else item->setIcon(0, KIcon("application-x-executable-script"));
item->setSizeHint(0, QSize(m_view.scripts_list->columnWidth(0), fontMetrics().height() * 2));
- item->setData(1, Qt::UserRole, target.simplified());
+ item->setData(1, Qt::UserRole, KUrl(target).path());
item->setData(1, Qt::UserRole + 1, scriptpath.path());
}
bool activate = false;
if (props.contains("renderrescalewidth")) m_view.rescale_width->setValue(props.value("renderrescalewidth").toInt());
if (props.contains("renderrescaleheight")) m_view.rescale_height->setValue(props.value("renderrescaleheight").toInt());
if (props.contains("rendertcoverlay")) m_view.tc_overlay->setChecked(props.value("rendertcoverlay").toInt());
+ if (props.contains("rendertctype")) m_view.tc_type->setCurrentIndex(props.value("rendertctype").toInt());
if (props.contains("renderratio")) m_view.rescale_keep->setChecked(props.value("renderratio").toInt());
if (props.contains("renderplay")) m_view.play_after->setChecked(props.value("renderplay").toInt());
void RenderWidget::slotPlayRendering(QTreeWidgetItem *item, int)
{
if (KdenliveSettings::defaultplayerapp().isEmpty() || item->data(1, Qt::UserRole + 2).toInt() != FINISHEDJOB) return;
- const QByteArray startId = KStartupInfo::createNewStartupId();
- const QString command = KdenliveSettings::defaultplayerapp() + ' ' + item->text(1);
- KRun::runCommand(command, KdenliveSettings::defaultplayerapp(), KdenliveSettings::defaultplayerapp(), this, startId);
+ KUrl::List urls;
+ urls.append(KUrl(item->text(1)));
+ KRun::run(KdenliveSettings::defaultplayerapp(), urls, this);
}
void RenderWidget::missingClips(bool hasMissing)
} else m_view.errorBox->setHidden(true);
}
+void RenderWidget::slotUpdateEncodeThreads(int val)
+{
+ KdenliveSettings::setEncodethreads(val);
+}
+
void RenderWidget::slotUpdateRescaleWidth(int val)
{
KdenliveSettings::setDefaultrescalewidth(val);
return (m_view.export_audio->checkState() != Qt::Unchecked);
}
-void RenderWidget::updateProxyConfig()
+void RenderWidget::updateProxyConfig(bool enable)
{
- m_view.proxy_render->setHidden(!KdenliveSettings::enableproxy());
+ m_view.proxy_render->setHidden(!enable);
}
bool RenderWidget::proxyRendering()
projects / kdenlive / blobdiff