X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderwidget.cpp;h=1636722200f83beea45337bb5bfcc027bcd4cf82;hb=12b5cd682d1d614c9a21a73f9d07b8502b6de4b9;hp=631c84703f938e6da690a0b19fff4331675a9197;hpb=4e1438fe486d77af1afb75825f3aa1f766715e6f;p=kdenlive diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 631c8470..16367222 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -43,6 +43,7 @@ #include #include #include +#include const int GroupRole = Qt::UserRole; const int ExtensionRole = GroupRole + 1; @@ -59,7 +60,7 @@ const int RUNNINGJOB = 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) @@ -82,11 +83,19 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : 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(!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))); @@ -104,12 +113,12 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.format_list->setAlternatingRowColors(true); m_view.size_list->setAlternatingRowColors(true); - KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); - QPalette p = m_view.errorLabel->palette(); - p.setColor(QPalette::Background, scheme.background(KColorScheme::NegativeBackground).color()); - m_view.errorLabel->setAutoFillBackground(true); - m_view.errorLabel->setPalette(p); - m_view.errorLabel->setHidden(true); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor bg = scheme.background(KColorScheme::NegativeBackground).color(); + m_view.errorBox->setStyleSheet(QString("QGroupBox { background-color: rgb(%1, %2, %3); border-radius: 5px;}; ").arg(bg.red()).arg(bg.green()).arg(bg.blue())); + int height = QFontInfo(font()).pixelSize(); + m_view.errorIcon->setPixmap(KIcon("dialog-warning").pixmap(height, height)); + m_view.errorBox->setHidden(true); connect(m_view.export_audio, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateAudioLabel(int))); m_view.export_audio->setCheckState(Qt::PartiallyChecked); @@ -156,6 +165,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : 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); @@ -165,6 +175,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : 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); @@ -176,7 +187,6 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.running_jobs->setItemDelegate(m_jobsDelegate); QHeaderView *header = m_view.running_jobs->header(); - QFontMetrics fm = fontMetrics(); header->setResizeMode(0, QHeaderView::Fixed); header->resizeSection(0, 30); header->setResizeMode(1, QHeaderView::Interactive); @@ -346,7 +356,7 @@ void RenderWidget::slotSaveProfile() QString dest = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QString customGroup = m_view.format_list->currentItem()->text(); - if (customGroup.isEmpty()) customGroup = i18n("Custom"); + if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom"); ui.group_name->setText(customGroup); ui.parameters->setText(m_view.advanced_params->toPlainText()); @@ -356,7 +366,7 @@ void RenderWidget::slotSaveProfile() if (d->exec() == QDialog::Accepted && !ui.profile_name->text().simplified().isEmpty()) { QString newProfileName = ui.profile_name->text().simplified(); QString newGroupName = ui.group_name->text().simplified(); - if (newGroupName.isEmpty()) newGroupName = i18n("Custom"); + if (newGroupName.isEmpty()) newGroupName = i18nc("Group Name", "Custom"); QString newMetaGroupId = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QDomDocument doc; @@ -449,7 +459,7 @@ void RenderWidget::slotCopyToFavorites() QDomDocument doc; QDomElement profileElement = doc.createElement("profile"); profileElement.setAttribute("name", currentProfile); - profileElement.setAttribute("category", i18n("Custom")); + profileElement.setAttribute("category", i18nc("Category Name", "Custom")); profileElement.setAttribute("destinationid", "favorites"); profileElement.setAttribute("extension", extension); profileElement.setAttribute("args", params); @@ -479,7 +489,7 @@ void RenderWidget::slotEditProfile() QString dest = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QString customGroup = m_view.format_list->currentItem()->text(); - if (customGroup.isEmpty()) customGroup = i18n("Custom"); + if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom"); ui.group_name->setText(customGroup); ui.profile_name->setText(currentProfile); @@ -515,7 +525,7 @@ void RenderWidget::slotEditProfile() QString newProfileName = ui.profile_name->text().simplified(); QString newGroupName = ui.group_name->text().simplified(); - if (newGroupName.isEmpty()) newGroupName = i18n("Custom"); + if (newGroupName.isEmpty()) newGroupName = i18nc("Group Name", "Custom"); QString newMetaGroupId = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QDomNodeList profilelist = doc.elementsByTagName("profile"); int i = 0; @@ -706,7 +716,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const 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"; } @@ -746,6 +756,8 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const 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"); @@ -754,6 +766,10 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const // 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; @@ -762,7 +778,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString subsize = currentSize; if (std.startsWith("s=")) { subsize = std.section(' ', 0, 0).toLower(); - subsize = subsize.section("=", 1, 1); + subsize = subsize.section('=', 1, 1); } else if (std.contains(" s=")) { subsize = std.section(" s=", 1, 1); subsize = subsize.section(' ', 0, 0).toLower(); @@ -779,10 +795,12 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const break; } } - - if (resizeProfile) render_process_args << "consumer:" + playlistPath; - else render_process_args << playlistPath; - render_process_args << dest; + + if (resizeProfile) + render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath); + else + render_process_args << (scriptExport ? "$SOURCE" : playlistPath); + render_process_args << (scriptExport ? "$TARGET" : dest); render_process_args << paramsList; QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); @@ -803,7 +821,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const 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"; @@ -823,7 +841,30 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const renderParameters << scriptName; // Save rendering profile to document - emit selectedRenderProfile(m_view.size_list->currentItem()->data(MetaGroupRole).toString(), m_view.size_list->currentItem()->data(GroupRole).toString(), m_view.size_list->currentItem()->text(), dest, m_view.render_zone->isChecked(), m_view.render_guide->isChecked(), m_view.guide_start->currentIndex(), m_view.guide_end->currentIndex()); + QMap renderProps; + renderProps.insert("renderdestination", m_view.size_list->currentItem()->data(MetaGroupRole).toString()); + renderProps.insert("rendercategory", m_view.size_list->currentItem()->data(GroupRole).toString()); + renderProps.insert("renderprofile", m_view.size_list->currentItem()->text()); + renderProps.insert("renderurl", dest); + renderProps.insert("renderzone", QString::number(m_view.render_zone->isChecked())); + renderProps.insert("renderguide", QString::number(m_view.render_guide->isChecked())); + renderProps.insert("renderstartguide", QString::number(m_view.guide_start->currentIndex())); + renderProps.insert("renderendguide", QString::number(m_view.guide_end->currentIndex())); + renderProps.insert("renderendguide", QString::number(m_view.guide_end->currentIndex())); + renderProps.insert("renderscanning", QString::number(m_view.scanning_list->currentIndex())); + int export_audio = 0; + if (m_view.export_audio->checkState() == Qt::Checked) export_audio = 2; + else if (m_view.export_audio->checkState() == Qt::Unchecked) export_audio = 1; + renderProps.insert("renderexportaudio", QString::number(export_audio)); + renderProps.insert("renderrescale", QString::number(m_view.rescale->isChecked())); + 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())); + + emit selectedRenderProfile(renderProps); // insert item in running jobs list QTreeWidgetItem *renderItem; @@ -1205,7 +1246,7 @@ void RenderWidget::parseProfiles(QString meta, QString group, QString profile) // 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()) { @@ -1262,7 +1303,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) newdoc.appendChild(newprofiles); QDomNodeList profilelist = doc.elementsByTagName("profile"); for (int i = 0; i < profilelist.count(); i++) { - QString category = i18n("Custom"); + QString category = i18nc("Category Name", "Custom"); QString extension; QDomNode parent = profilelist.at(i).parentNode(); if (!parent.isNull()) { @@ -1307,7 +1348,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) params = params.replace("aac", "libfaac"); } - QString category = profile.attribute("category", i18n("Custom")); + QString category = profile.attribute("category", i18nc("Category Name", "Custom")); QString dest = profile.attribute("destinationid"); QString prof_extension = profile.attribute("extension"); if (!prof_extension.isEmpty()) extension = prof_extension; @@ -1387,7 +1428,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) m_view.destination_list->addItem(icon, i18n(metagroupName.toUtf8().data()), metagroupId); } } - groupName = documentElement.attribute("name", i18n("Custom")); + groupName = documentElement.attribute("name", i18nc("Attribute Name", "Custom")); extension = documentElement.attribute("extension", QString()); renderer = documentElement.attribute("renderer", QString()); bool exists = false; @@ -1590,17 +1631,18 @@ void RenderWidget::parseScriptFiles() QString melt; QFile file(scriptpath.path()); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - while (!file.atEnd()) { - QByteArray line = file.readLine(); + QTextStream stream(&file); + while (!stream.atEnd()) { + QString line = stream.readLine(); if (line.startsWith("TARGET=")) { - target = QString(line).section("TARGET=", 1).simplified(); - target.remove(QChar('"')); - } else if (line.startsWith("RENDERER=")) { - renderer = QString(line).section("RENDERER=", 1).simplified(); - renderer.remove(QChar('"')); - } else if (line.startsWith("MELT=")) { - melt = QString(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(); @@ -1617,14 +1659,14 @@ void RenderWidget::parseScriptFiles() 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; QTreeWidgetItem *script = m_view.scripts_list->topLevelItem(0); if (script) { - script->setSelected(true); m_view.scripts_list->setCurrentItem(script); + script->setSelected(true); activate = true; } // m_view.start_script->setEnabled(activate); @@ -1697,23 +1739,44 @@ void RenderWidget::slotHideLog() m_view.error_box->setVisible(false); } -void RenderWidget::setRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &url, bool renderZone, bool renderGuide, int guideStart, int guideEnd) +void RenderWidget::setRenderProfile(QMap props) { m_view.destination_list->blockSignals(true); m_view.format_list->blockSignals(true); - if (renderZone) m_view.render_zone->setChecked(true); - else if (renderGuide) { + m_view.scanning_list->setCurrentIndex(props.value("renderscanning").toInt()); + int exportAudio = props.value("renderexportaudio").toInt(); + switch (exportAudio) { + case 1: + m_view.export_audio->setCheckState(Qt::Unchecked); + break; + case 2: + m_view.export_audio->setCheckState(Qt::Checked); + break; + default: + m_view.export_audio->setCheckState(Qt::PartiallyChecked); + } + if (props.contains("renderrescale")) m_view.rescale->setChecked(props.value("renderrescale").toInt()); + 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()); + + if (props.value("renderzone") == "1") m_view.render_zone->setChecked(true); + else if (props.value("renderguide") == "1") { m_view.render_guide->setChecked(true); - m_view.guide_start->setCurrentIndex(guideStart); - m_view.guide_end->setCurrentIndex(guideEnd); + m_view.guide_start->setCurrentIndex(props.value("renderstartguide").toInt()); + m_view.guide_end->setCurrentIndex(props.value("renderendguide").toInt()); } else m_view.render_full->setChecked(true); slotUpdateGuideBox(); + QString url = props.value("renderurl"); if (!url.isEmpty()) m_view.out_file->setUrl(KUrl(url)); // set destination for (int i = 0; i < m_view.destination_list->count(); i++) { - if (m_view.destination_list->itemData(i, Qt::UserRole) == dest) { + if (m_view.destination_list->itemData(i, Qt::UserRole) == props.value("renderdestination")) { m_view.destination_list->setCurrentIndex(i); break; } @@ -1721,6 +1784,7 @@ void RenderWidget::setRenderProfile(const QString &dest, const QString &group, c refreshCategory(); // set category + QString group = props.value("rendercategory"); if (!group.isEmpty()) { QList childs = m_view.format_list->findItems(group, Qt::MatchExactly); if (!childs.isEmpty()) { @@ -1731,7 +1795,7 @@ void RenderWidget::setRenderProfile(const QString &dest, const QString &group, c } // set profile - QList childs = m_view.size_list->findItems(name, Qt::MatchExactly); + QList childs = m_view.size_list->findItems(props.value("renderprofile"), Qt::MatchExactly); if (!childs.isEmpty()) { m_view.size_list->setCurrentItem(childs.at(0)); m_view.size_list->scrollToItem(childs.at(0)); @@ -1799,17 +1863,22 @@ QString RenderWidget::getFreeScriptName(const QString &prefix) 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) { if (hasMissing) { m_view.errorLabel->setText(i18n("Check missing clips")); - m_view.errorLabel->setHidden(false); - } else m_view.errorLabel->setHidden(true); + m_view.errorBox->setHidden(false); + } else m_view.errorBox->setHidden(true); +} + +void RenderWidget::slotUpdateEncodeThreads(int val) +{ + KdenliveSettings::setEncodethreads(val); } void RenderWidget::slotUpdateRescaleWidth(int val) @@ -1856,3 +1925,12 @@ bool RenderWidget::selectedAudioExport() const return (m_view.export_audio->checkState() != Qt::Unchecked); } +void RenderWidget::updateProxyConfig(bool enable) +{ + m_view.proxy_render->setHidden(!enable); +} + +bool RenderWidget::proxyRendering() +{ + return m_view.proxy_render->isChecked(); +}