X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderwidget.cpp;h=39cc878a84708d3332bd70c2fe682b130e4a5571;hb=7560d0d9549a7c750b92ce2e004c41e921c99f83;hp=631c84703f938e6da690a0b19fff4331675a9197;hpb=4e1438fe486d77af1afb75825f3aa1f766715e6f;p=kdenlive diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 631c8470..39cc878a 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -22,6 +22,7 @@ #include "kdenlivesettings.h" #include "ui_saveprofile_ui.h" #include "timecode.h" +#include "profilesdialog.h" #include #include @@ -43,6 +44,8 @@ #include #include #include +#include +#include const int GroupRole = Qt::UserRole; const int ExtensionRole = GroupRole + 1; @@ -52,6 +55,10 @@ const int ParamsRole = GroupRole + 4; const int EditableRole = GroupRole + 5; const int MetaGroupRole = GroupRole + 6; const int ExtraRole = GroupRole + 7; +const int BitratesRole = GroupRole + 8; +const int DefaultBitrateRole = GroupRole + 9; +const int AudioBitratesRole = GroupRole + 10; +const int DefaultAudioBitrateRole = GroupRole + 11; // Running job status const int WAITINGJOB = 0; @@ -59,7 +66,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,10 +89,18 @@ 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))); @@ -104,12 +119,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); @@ -155,7 +170,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : connect(m_view.guide_end, SIGNAL(activated(int)), this, SLOT(slotCheckStartGuidePosition())); 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 +180,8 @@ 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.checkTwoPass->setEnabled(false); m_view.splitter->setStretchFactor(1, 5); m_view.splitter->setStretchFactor(0, 2); @@ -176,7 +193,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); @@ -206,6 +222,20 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.shutdown->setEnabled(false); focusFirstVisibleItem(); + adjustSize(); + +#if KDE_IS_VERSION(4,7,0) + m_infoMessage = new KMessageWidget; + QGridLayout *s = static_cast (m_view.tab->layout()); + s->addWidget(m_infoMessage, 12, 0, 1, -1); + m_infoMessage->hide(); +#endif +} + +QSize RenderWidget::sizeHint() const +{ + // Make sure the widget has minimum size on opening + return QSize(200, 200); } RenderWidget::~RenderWidget() @@ -238,7 +268,7 @@ void RenderWidget::showInfoPanel() } } -void RenderWidget::setDocumentPath(const QString path) +void RenderWidget::setDocumentPath(const QString &path) { if (m_view.out_file->url().directory() == KUrl(m_projectFolder).directory()) { const QString fileName = m_view.out_file->url().fileName(); @@ -346,17 +376,18 @@ 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()); + QStringList arguments = m_view.advanced_params->toPlainText().split(" ", QString::SkipEmptyParts); + ui.parameters->setText(arguments.join(" ")); ui.extension->setText(m_view.size_list->currentItem()->data(ExtensionRole).toString()); ui.profile_name->setFocus(); 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; @@ -365,7 +396,24 @@ void RenderWidget::slotSaveProfile() profileElement.setAttribute("category", newGroupName); profileElement.setAttribute("destinationid", newMetaGroupId); profileElement.setAttribute("extension", ui.extension->text().simplified()); - profileElement.setAttribute("args", ui.parameters->toPlainText().simplified()); + QString args = ui.parameters->toPlainText().simplified(); + profileElement.setAttribute("args", args); + if (args.contains("%bitrate")) { + // profile has a variable bitrate + profileElement.setAttribute("defaultbitrate", m_view.comboBitrates->currentText()); + QStringList bitrateValues; + for (int i = 0; i < m_view.comboBitrates->count(); i++) + bitrateValues << m_view.comboBitrates->itemText(i); + profileElement.setAttribute("bitrates", bitrateValues.join(",")); + } + if (args.contains("%audiobitrate")) { + // profile has a variable bitrate + profileElement.setAttribute("defaultaudiobitrate", m_view.comboAudioBitrates->currentText()); + QStringList bitrateValues; + for (int i = 0; i < m_view.comboAudioBitrates->count(); i++) + bitrateValues << m_view.comboAudioBitrates->itemText(i); + profileElement.setAttribute("audiobitrates", bitrateValues.join(",")); + } doc.appendChild(profileElement); saveProfile(doc.documentElement()); @@ -449,10 +497,14 @@ 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); + profileElement.setAttribute("bitrates", item->data(BitratesRole).toStringList().join(",")); + profileElement.setAttribute("defaultbitrate", item->data(DefaultBitrateRole).toString()); + profileElement.setAttribute("audiobitrates", item->data(AudioBitratesRole).toStringList().join(",")); + profileElement.setAttribute("defaultaudiobitrate", item->data(DefaultAudioBitrateRole).toString()); doc.appendChild(profileElement); saveProfile(doc.documentElement()); parseProfiles(m_view.destination_list->itemData(m_view.destination_list->currentIndex(), Qt::UserRole).toString(), currentGroup, currentProfile); @@ -479,7 +531,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 +567,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; @@ -541,7 +593,25 @@ void RenderWidget::slotEditProfile() profileElement.setAttribute("category", newGroupName); profileElement.setAttribute("destinationid", newMetaGroupId); profileElement.setAttribute("extension", ui.extension->text().simplified()); - profileElement.setAttribute("args", ui.parameters->toPlainText().simplified()); + QString args = ui.parameters->toPlainText().simplified(); + profileElement.setAttribute("args", args); + if (args.contains("%bitrate")) { + // profile has a variable bitrate + profileElement.setAttribute("defaultbitrate", m_view.comboBitrates->currentText()); + QStringList bitrateValues; + for (int i = 0; i < m_view.comboBitrates->count(); i++) + bitrateValues << m_view.comboBitrates->itemText(i); + profileElement.setAttribute("bitrates", bitrateValues.join(",")); + } + if (args.contains("%audiobitrate")) { + // profile has a variable bitrate + profileElement.setAttribute("defaultaudiobitrate", m_view.comboAudioBitrates->currentText()); + QStringList bitrateValues; + for (int i = 0; i < m_view.comboAudioBitrates->count(); i++) + bitrateValues << m_view.comboAudioBitrates->itemText(i); + profileElement.setAttribute("audiobitrates", bitrateValues.join(",")); + } + profiles.appendChild(profileElement); //QCString save = doc.toString().utf8(); @@ -706,7 +776,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"; } @@ -716,6 +786,14 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const if (!scriptExport) render_process_args << "-erase"; if (KdenliveSettings::usekuiserver()) render_process_args << "-kuiserver"; + // get process id + render_process_args << QString("-pid:%1").arg(QCoreApplication::applicationPid()); + + // Set locale for render process if required + if (QLocale().decimalPoint() != QLocale::system().decimalPoint()) { + render_process_args << QString("-locale:%1").arg(QLocale().name()); + } + double guideStart = 0; double guideEnd = 0; @@ -724,12 +802,16 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const 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(" "); - render_process_args << KdenliveSettings::rendererpath() << m_profile.path << item->data(RenderRole).toString(); + if (scriptExport) + render_process_args << "$MELT"; + else + render_process_args << KdenliveSettings::rendererpath(); + render_process_args << m_profile.path << item->data(RenderRole).toString(); if (m_view.play_after->isChecked()) render_process_args << KdenliveSettings::KdenliveSettings::defaultplayerapp(); else render_process_args << "-"; @@ -745,7 +827,9 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const 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)); // Adjust scanning if (m_view.scanning_list->currentIndex() == 1) renderArgs.append(" progressive=1"); @@ -754,6 +838,12 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const // disable audio if requested if (!exportAudio) renderArgs.append(" an=1 "); + // Set the thread counts + if (!renderArgs.contains("threads=")) { + 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 +852,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(); @@ -773,25 +863,37 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const } 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("audiobitrate", m_view.comboAudioBitrates->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(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:" + 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" : KUrl(dest).url()); render_process_args << paramsList; QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); - QStringList renderParameters; - renderParameters << dest << item->data(RenderRole).toString() << renderArgs.simplified(); - renderParameters << QString::number(zoneIn) << QString::number(zoneOut) << QString::number(m_view.play_after->isChecked()); - renderParameters << QString::number(guideStart) << QString::number(guideEnd) << QString::number(resizeProfile); - QString scriptName; if (scriptExport) { // Generate script file @@ -803,11 +905,11 @@ 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 << "MELT=" << "\"" + KdenliveSettings::rendererpath() + "\"" << "\n"; outStream << "PARAMETERS=" << "\"" + render_process_args.join(" ") + "\"" << "\n"; - outStream << "$RENDERER $MELT $PARAMETERS" << "\n" << "\n"; + outStream << "$RENDERER $PARAMETERS" << "\n" << "\n"; if (file.error() != QFile::NoError) { KMessageBox::error(this, i18n("Cannot write to file %1", scriptPath)); file.close(); @@ -820,10 +922,33 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const m_view.tabWidget->setCurrentIndex(2); return; } - 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())); + renderProps.insert("rendertwopass", QString::number(m_view.checkTwoPass->isChecked())); + + emit selectedRenderProfile(renderProps); // insert item in running jobs list QTreeWidgetItem *renderItem; @@ -848,9 +973,9 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const 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); @@ -904,7 +1029,9 @@ void RenderWidget::startRendering(QTreeWidgetItem *item) item->setData(1, Qt::UserRole, i18n("Rendering crashed")); item->setIcon(0, KIcon("dialog-close")); item->setData(2, Qt::UserRole, 100); - } else KNotification::event("RenderStarted", i18n("Rendering %1 started", item->text(1)), QPixmap(), this); + } else { + KNotification::event("RenderStarted", i18n("Rendering %1 started", item->text(1)), QPixmap(), this); + } } else { // Script item if (QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString()) == false) { @@ -930,9 +1057,6 @@ int RenderWidget::waitingJobsCount() const void RenderWidget::setProfile(MltVideoProfile profile) { m_profile = profile; - //WARNING: this way to tell the video standard is a bit hackish... - if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) m_view.format_selection->setCurrentIndex(0); - else m_view.format_selection->setCurrentIndex(1); m_view.scanning_list->setCurrentIndex(0); m_view.rescale_width->setValue(KdenliveSettings::defaultrescalewidth()); if (!m_view.rescale_keep->isChecked()) { @@ -984,7 +1108,9 @@ void RenderWidget::refreshCategory() } if (!item) { m_view.format_list->setEnabled(false); + m_view.format_list->clear(); m_view.size_list->setEnabled(false); + m_view.size_list->clear(); m_view.size_list->blockSignals(false); m_view.format_list->blockSignals(false); return; @@ -1012,6 +1138,7 @@ void RenderWidget::refreshView() if (m_view.destination_list->currentIndex() > 0) destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); KIcon brokenIcon("dialog-close"); + KIcon warningIcon("dialog-warning"); const QStringList formatsList = KdenliveSettings::supportedformats(); const QStringList vcodecsList = KdenliveSettings::videocodecs(); @@ -1021,23 +1148,38 @@ void RenderWidget::refreshView() const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color(); const QColor disabledbg = scheme.background(KColorScheme::NegativeBackground).color(); - + double project_framerate = (double) m_profile.frame_rate_num / m_profile.frame_rate_den; for (int i = 0; i < m_renderItems.count(); i++) { sizeItem = m_renderItems.at(i); QListWidgetItem *dupItem = NULL; if ((sizeItem->data(GroupRole).toString() == group || sizeItem->data(GroupRole).toString().isEmpty()) && sizeItem->data(MetaGroupRole).toString() == destination) { std = sizeItem->data(StandardRole).toString(); if (!std.isEmpty()) { - if (std.contains("PAL", Qt::CaseInsensitive) && m_view.format_selection->currentIndex() == 0) dupItem = sizeItem->clone(); - else if (std.contains("NTSC", Qt::CaseInsensitive) && m_view.format_selection->currentIndex() == 1) dupItem = sizeItem->clone(); + if ((std.contains("PAL", Qt::CaseInsensitive) && m_profile.frame_rate_num == 25 && m_profile.frame_rate_den == 1) || + (std.contains("NTSC", Qt::CaseInsensitive) && m_profile.frame_rate_num == 30000 && m_profile.frame_rate_den == 1001)) + dupItem = sizeItem->clone(); } else { dupItem = sizeItem->clone(); } if (dupItem) { m_view.size_list->addItem(dupItem); - // Make sure the selected profile uses an installed avformat codec / format std = dupItem->data(ParamsRole).toString(); + // Make sure the selected profile uses the same frame rate as project profile + 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 ((int) (1000.0 * profile_rate) != (int) (1000.0 * project_framerate)) { + dupItem->setToolTip(i18n("Frame rate (%1) not compatible with project profile (%2)", profile_rate, project_framerate)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); + } + } + } + + // Make sure the selected profile uses an installed avformat codec / format if (!formatsList.isEmpty()) { QString format; if (std.startsWith("f=")) format = std.section("f=", 1, 1); @@ -1047,7 +1189,7 @@ void RenderWidget::refreshView() if (!formatsList.contains(format)) { kDebug() << "***** UNSUPPORTED F: " << format; //sizeItem->setHidden(true); - //sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem-item>setFlags(Qt::ItemIsSelectable); dupItem->setToolTip(i18n("Unsupported video format: %1", format)); dupItem->setIcon(brokenIcon); dupItem->setForeground(disabled); @@ -1087,14 +1229,24 @@ void RenderWidget::refreshView() } } } + 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.
Unless you know what you are doing you will probably have to change it to 'mlt_profile'.")); + dupItem->setIcon(warningIcon); + } } } } // m_view.size_list->sortItems(); focusFirstVisibleItem(); + m_view.size_list->setVisible(m_view.size_list->count() > 1 || m_view.format_list->count() <= 1); m_view.size_list->blockSignals(false); m_view.format_list->blockSignals(false); - refreshParams(); + if (m_view.size_list->count() > 0) + refreshParams(); + else + m_view.advanced_params->clear(); } KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension) @@ -1130,6 +1282,7 @@ void RenderWidget::refreshParams() m_view.buttonGenerateScript->setEnabled(false); return; } + errorMessage(item->toolTip()); QString params = item->data(ParamsRole).toString(); QString extension = item->data(ExtensionRole).toString(); m_view.advanced_params->setPlainText(params); @@ -1163,6 +1316,44 @@ void RenderWidget::refreshParams() m_view.buttonEdit->setEnabled(true); } + // setup comboBox with bitrates + m_view.comboBitrates->clear(); + if (params.contains("bitrate")) { + m_view.comboBitrates->setEnabled(true); + m_view.bitrateLabel->setEnabled(true); + if ( item->data(BitratesRole).canConvert(QVariant::StringList) && item->data(BitratesRole).toStringList().count()) { + QStringList bitrates = item->data(BitratesRole).toStringList(); + foreach (QString bitrate, bitrates) + m_view.comboBitrates->addItem(bitrate); + if (item->data(DefaultBitrateRole).canConvert(QVariant::String)) + m_view.comboBitrates->setCurrentIndex(bitrates.indexOf(item->data(DefaultBitrateRole).toString())); + } + } else { + m_view.comboBitrates->setEnabled(false); + m_view.bitrateLabel->setEnabled(false); + } + + // setup comboBox with audiobitrates + m_view.comboAudioBitrates->clear(); + if (params.contains("audiobitrate")) { + m_view.comboAudioBitrates->setEnabled(true); + m_view.audiobitrateLabel->setEnabled(true); + if ( item->data(AudioBitratesRole).canConvert(QVariant::StringList) && item->data(AudioBitratesRole).toStringList().count()) { + QStringList audiobitrates = item->data(AudioBitratesRole).toStringList(); + foreach (QString bitrate, audiobitrates) + m_view.comboAudioBitrates->addItem(bitrate); + if (item->data(DefaultAudioBitrateRole).canConvert(QVariant::String)) + m_view.comboAudioBitrates->setCurrentIndex(audiobitrates.indexOf(item->data(DefaultAudioBitrateRole).toString())); + } + } else { + m_view.comboAudioBitrates->setEnabled(false); + m_view.audiobitrateLabel->setEnabled(false); + } + + m_view.checkTwoPass->setEnabled(params.contains("passes")); + + m_view.encoder_threads->setEnabled(!params.contains("threads=")); + m_view.buttonRender->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); m_view.buttonGenerateScript->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); } @@ -1205,7 +1396,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 +1453,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 +1498,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; @@ -1345,6 +1536,10 @@ void RenderWidget::parseFile(QString exportFile, bool editable) item->setData(RenderRole, "avformat"); item->setData(StandardRole, standard); item->setData(ParamsRole, params); + item->setData(BitratesRole, profile.attribute("bitrates").split(',', QString::SkipEmptyParts)); + item->setData(DefaultBitrateRole, profile.attribute("defaultbitrate")); + item->setData(AudioBitratesRole, profile.attribute("audiobitrates").split(',', QString::SkipEmptyParts)); + item->setData(DefaultAudioBitrateRole, profile.attribute("defaultaudiobitrate")); if (profile.hasAttribute("url")) item->setData(ExtraRole, profile.attribute("url")); if (editable) { item->setData(EditableRole, exportFile); @@ -1366,6 +1561,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) QString renderer; QString params; QString standard; + QString bitrates, defaultBitrate, audioBitrates, defaultAudioBitrate; KIcon icon; while (!groups.item(i).isNull()) { @@ -1387,7 +1583,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; @@ -1412,6 +1608,10 @@ void RenderWidget::parseFile(QString exportFile, bool editable) profileElement = n.toElement(); profileName = profileElement.attribute("name"); standard = profileElement.attribute("standard"); + bitrates = profileElement.attribute("bitrates"); + defaultBitrate = profileElement.attribute("defaultbitrate"); + audioBitrates = profileElement.attribute("audiobitrates"); + defaultAudioBitrate = profileElement.attribute("defaultaudiobitrate"); params = profileElement.attribute("args"); if (replaceVorbisCodec && params.contains("acodec=vorbis")) { @@ -1432,6 +1632,10 @@ void RenderWidget::parseFile(QString exportFile, bool editable) item->setData(RenderRole, renderer); item->setData(StandardRole, standard); item->setData(ParamsRole, params); + item->setData(BitratesRole, bitrates.split(',', QString::SkipEmptyParts)); + item->setData(DefaultBitrateRole, defaultBitrate); + item->setData(AudioBitratesRole, audioBitrates.split(',', QString::SkipEmptyParts)); + item->setData(DefaultAudioBitrateRole, defaultAudioBitrate); if (profileElement.hasAttribute("url")) item->setData(ExtraRole, profileElement.attribute("url")); if (editable) item->setData(EditableRole, exportFile); m_renderItems.append(item); @@ -1590,17 +1794,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,15 +1822,15 @@ 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; +// bool activate = false; QTreeWidgetItem *script = m_view.scripts_list->topLevelItem(0); if (script) { - script->setSelected(true); m_view.scripts_list->setCurrentItem(script); - activate = true; + script->setSelected(true); +// activate = true; } // m_view.start_script->setEnabled(activate); // m_view.delete_script->setEnabled(activate); @@ -1697,23 +1902,45 @@ 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.contains("rendertwopass")) m_view.checkTwoPass->setChecked(props.value("rendertwopass").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 +1948,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 +1959,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 +2027,46 @@ 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::errorMessage(const QString &message) +{ + if (!message.isEmpty()) { +#if KDE_IS_VERSION(4,7,0) + m_infoMessage->setMessageType(KMessageWidget::Warning); + m_infoMessage->setText(message); + m_infoMessage->animatedShow(); +#else + m_view.errorLabel->setText(message); + m_view.errorBox->setHidden(false); +#endif + } + else { +#if KDE_IS_VERSION(4,7,0) + m_infoMessage->animatedHide(); +#else + m_view.errorBox->setHidden(true); + m_view.errorLabel->setText(QString()); +#endif + + } +} + + +void RenderWidget::slotUpdateEncodeThreads(int val) +{ + KdenliveSettings::setEncodethreads(val); } void RenderWidget::slotUpdateRescaleWidth(int val) @@ -1856,3 +2113,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(); +}