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;
m_view.shutdown->setEnabled(false);
focusFirstVisibleItem();
+ adjustSize();
+
+#if KDE_IS_VERSION(4,7,0)
+ m_infoMessage = new KMessageWidget;
+ QGridLayout *s = static_cast <QGridLayout*> (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()
}
}
-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();
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();
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());
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);
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();
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;
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 << "-";
if (!exportAudio) renderArgs.append(" an=1 ");
// Set the thread counts
- renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads()));
+ 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,
// Add current size parameter
renderArgs.append(subsize);
}
+ bool resizeProfile = (subsize != currentSize);
QStringList paramsList = renderArgs.split(" ", QString::SkipEmptyParts);
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<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();
sEngine.globalObject().setProperty(paramName.toUtf8().constData(), paramValue);
}
- render_process_args << (scriptExport ? "$SOURCE" : playlistPath);
+ 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;
outStream << "SOURCE=" << "\"" + playlistPath + "\"" << "\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();
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 <i>%1</i> started", item->text(1)), QPixmap(), this);
+ } else {
+ KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", item->text(1)), QPixmap(), this);
+ }
} else {
// Script item
if (QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString()) == false) {
}
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;
}
// 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);
if (m_view.size_list->count() > 0)
{
// Format not available (e.g. codec not installed); Disable start button
QListWidgetItem *item = m_view.size_list->currentItem();
- errorMessage(item->toolTip());
if (!item || item->isHidden()) {
m_view.advanced_params->clear();
m_view.buttonRender->setEnabled(false);
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);
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)
}
} 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());
}
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);
QString renderer;
QString params;
QString standard;
- QString bitrates, defaultBitrate;
+ QString bitrates, defaultBitrate, audioBitrates, defaultAudioBitrate;
KIcon icon;
while (!groups.item(i).isNull()) {
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")) {
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);
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
+
}
}
projects / kdenlive / blobdiff