#include "ui_templateclip_ui.h"
#include "ui_cutjobdialog_ui.h"
+#include "ui_scenecutdialog_ui.h"
#include <KDebug>
#include <KAction>
connect(m_listView, SIGNAL(projectModified()), this, SIGNAL(projectModified()));
connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
connect(m_listView, SIGNAL(focusMonitor()), this, SIGNAL(raiseClipMonitor()));
- connect(m_listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor()));
+ connect(m_listView, SIGNAL(pauseMonitor()), this, SIGNAL(pauseMonitor()));
connect(m_listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
+ connect(m_listView, SIGNAL(addClip()), this, SIGNAL(pauseMonitor()));
connect(m_listView, SIGNAL(addClip()), this, SLOT(slotAddClip()));
connect(m_listView, SIGNAL(addClip(const QList <QUrl>, const QString &, const QString &)), this, SLOT(slotAddClip(const QList <QUrl>, const QString &, const QString &)));
connect(this, SIGNAL(addClip(const QString, const QString &, const QString &)), this, SLOT(slotAddClip(const QString, const QString &, const QString &)));
transcodeMenu->setEnabled(false);
m_transcodeAction = transcodeMenu;
}
- if (menus.contains("stabilizeMenu") && menus.value("stabilizeMenu") ){
- QMenu* stabilizeMenu=menus.value("stabilizeMenu");
+ if (menus.contains("clipActionsMenu") && menus.value("clipActionsMenu") ){
+ QMenu* stabilizeMenu=menus.value("clipActionsMenu");
m_menu->addMenu(stabilizeMenu);
if (stabilizeMenu->isEmpty())
stabilizeMenu->setEnabled(false);
kDebug() << "Result: " << p.key() << " = " << p.value();
}*/
if (clipList.isEmpty()) {
- emit displayMessage(i18n("No available clip selected"), -2);
+ emit displayMessage(i18n("No available clip selected"), -2);
}
else emit showClipProperties(clipList, commonproperties);
}
void ProjectList::adjustStabilizeActions(ProjectItem *clip) const
{
- if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
+ if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW) {
m_stabilizeAction->setEnabled(false);
return;
}
QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/mlt-playlist" << "text/plain";
// Video mimes
- mimeTypes << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "video/mp4" << "video/quicktime" << "video/webm" << "video/3gpp";
+ mimeTypes << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "video/mp4" << "video/quicktime" << "video/webm" << "video/3gpp" << "video/mp2t";
// Audio mimes
mimeTypes << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "audio/x-aiff" << "audio/aiff" << "application/ogg" << "application/mxf" << "application/x-shockwave-flash" << "audio/ac3";
{
ProjectItem *item = getItemById(clipId);
if (item && !img.isNull()) {
- QPixmap pix = QPixmap::fromImage(img);
+ QPixmap pix(img.width(), img.height());
+ pix.fill(Qt::transparent);
+ QPainter p(&pix);
+ p.setRenderHint(QPainter::Antialiasing, true);
+ QPainterPath path;
+ path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2);
+ p.setClipPath(path);
+ p.drawImage(0, 0, img);
+ p.end();
processThumbOverlays(item, pix);
monitorItemEditing(false);
item->setData(0, Qt::DecorationRole, pix);
slotGotProxy(path);
return;
}
-
- ProxyJob *job = new ProxyJob(item->clipType(), id, QStringList() << path << item->clipUrl().path() << item->referencedClip()->producerProperty("_exif_orientation") << m_doc->getDocumentProperty("proxyparams").simplified() << QString::number(m_render->frameRenderWidth()) << QString::number(m_render->renderHeight()));
+ QString sourcePath = item->clipUrl().path();
+ if (item->clipType() == PLAYLIST) {
+ // Special case: playlists use the special 'consumer' producer to support resizing
+ sourcePath.prepend("consumer:");
+ }
+ ProxyJob *job = new ProxyJob(item->clipType(), id, QStringList() << path << sourcePath << item->referencedClip()->producerProperty("_exif_orientation") << m_doc->getDocumentProperty("proxyparams").simplified() << QString::number(m_render->frameRenderWidth()) << QString::number(m_render->renderHeight()));
if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
delete job;
return;
}
connect(job, SIGNAL(jobProgress(QString, int, int)), this, SIGNAL(processLog(QString, int, int)));
connect(job, SIGNAL(cancelRunningJob(const QString, stringMap)), this, SIGNAL(cancelRunningJob(const QString, stringMap)));
- connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)));
if (job->jobType == MLTJOB) {
MeltJob *jb = static_cast<MeltJob *> (job);
jb->setProducer(currentClip->getProducer(), currentClip->fileURL());
+ if (jb->isProjectFilter())
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap,QStringList)), this, SLOT(slotGotFilterJobResults(QString,int, int, QString,stringMap,QStringList)));
+ else
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap,QStringList)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap,QStringList)));
}
job->startJob();
if (job->jobStatus == JOBDONE) {
}
}
-void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QString&properties)
+void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QStringList &extraParams)
{
ProjectItem *item = getItemById(id);
if (!item) return;
QStringList jobParams;
jobParams << QString::number(info.cropStart.frames(m_fps)) << QString::number((info.cropStart + info.cropDuration).frames(m_fps));
- jobParams << QString() << filterName << filterParams << consumer << consumerParams << properties << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track) << finalFilterName;
- MeltJob *job = new MeltJob(item->clipType(), id, jobParams);
+ jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track) << finalFilterName;
+ MeltJob *job = new MeltJob(item->clipType(), id, jobParams, extraParams);
if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
delete job;
return;
else {
destination = item->clipUrl().directory();
}
- QPointer<ClipStabilize> d = new ClipStabilize(destination, ids.count(), filterName);
- if (d->exec() == QDialog::Accepted) {
- processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc());
+ if (filterName == "motion_est") {
+ // Show config dialog
+ QPointer<QDialog> d = new QDialog(this);
+ Ui::SceneCutDialog_UI ui;
+ ui.setupUi(d);
+ // Set up categories
+ for (int i = 0; i < 5; ++i) {
+ ui.marker_type->insertItem(i, i18n("Category %1", i));
+ ui.marker_type->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole);
+ }
+ ui.marker_type->setCurrentIndex(KdenliveSettings::default_marker_type());
+ if (d->exec() != QDialog::Accepted) {
+ delete d;
+ return;
+ }
+ // Autosplit filter
+ QStringList jobParams;
+ // Producer params
+ jobParams << QString();
+ // Filter params, use a smaller region of the image to speed up operation
+ jobParams << filterName << "bounding=\"25%x25%:25%x25\" shot_change_list=0";
+ // Consumer
+ jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1";
+ QStringList extraParams;
+ extraParams << "key:shot_change_list";
+ extraParams << "projecttreefilter";
+ if (ui.add_markers->isChecked()) {
+ // We want to create markers
+ extraParams << QString("addmarkers:%1").arg(ui.marker_type->currentIndex());
+ }
+ if (ui.cut_scenes->isChecked()) {
+ // We want to cut scenes
+ extraParams << "cutscenes";
+ }
+ delete d;
+ processClipJob(ids, QString(), false, jobParams, i18n("Auto split"), extraParams);
+ }
+ else {
+ QPointer<ClipStabilize> d = new ClipStabilize(destination, ids.count(), filterName);
+ if (d->exec() == QDialog::Accepted) {
+ QStringList extraParams;
+ extraParams << "producer_profile";
+ processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams);
+ }
+ delete d;
}
- delete d;
}
-void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description)
+void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QStringList extraParams)
{
QStringList preParams;
// in and out
}
jobArgs << jobParams;
- MeltJob *job = new MeltJob(item->clipType(), id, jobArgs);
+ MeltJob *job = new MeltJob(item->clipType(), id, jobArgs, extraParams);
if (autoAdd) {
job->setAddClipToProject(true);
kDebug()<<"// ADDING TRUE";
}
else kDebug()<<"// ADDING FALSE!!!";
+
if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
delete job;
return;
m_errorLog.clear();
}
+void ProjectList::slotGotFilterJobResults(QString id, int , int , QString filter, stringMap results, QStringList extra)
+{
+ ProjectItem *clip = getItemById(id);
+ if (!clip) return;
+ // Check for return value
+ QString returnKey;
+ int markersType = -1;
+ for (int i = 0; i < extra.count(); i++) {
+ if (extra.at(i).startsWith("key:"))
+ returnKey = extra.at(i).section(':', 1);
+ if (extra.at(i).startsWith("addmarkers:")) {
+ markersType = extra.at(i).section(':', 1).toInt();
+ }
+ }
+ if (returnKey.isEmpty()) {
+ emit displayMessage(i18n("No data returned from clip analysis"), ErrorMessage);
+ return;
+ }
+ QStringList returnData = results.value(returnKey).split(';', QString::SkipEmptyParts);
+ if (returnData.isEmpty()) {
+ emit displayMessage(i18n("No data returned from clip analysis"), ErrorMessage);
+ return;
+ }
+ emit displayMessage(i18n("Processing data analysis"), InformationMessage);
+ bool dataProcessed = false;
+ if (extra.contains("cutscenes")) {
+ // Check if we want to cut scenes from returned data
+ dataProcessed = true;
+ int cutPos = 0;
+ QUndoCommand *command = new QUndoCommand();
+ command->setText(i18n("Auto Split Clip"));
+ foreach (QString pos, returnData) {
+ if (!pos.contains("=")) continue;
+ int newPos = pos.section("=", 0, 0).toInt();
+ // Don't use scenes shorter than 1 second
+ if (newPos - cutPos < 24) continue;
+ (void) new AddClipCutCommand(this, id, cutPos, newPos, QString(), true, false, command);
+ cutPos = newPos;
+ }
+ if (command->childCount() == 0)
+ delete command;
+ else m_commandStack->push(command);
+ }
+ if (markersType >= 0) {
+ // Add markers from returned data
+ dataProcessed = true;
+ int cutPos = 0;
+ QUndoCommand *command = new QUndoCommand();
+ command->setText(i18n("Add Markers"));
+ QList <CommentedTime> markersList;
+ int index = 1;
+ foreach (QString pos, returnData) {
+ if (!pos.contains("=")) continue;
+ int newPos = pos.section("=", 0, 0).toInt();
+ // Don't use scenes shorter than 1 second
+ if (newPos - cutPos < 24) continue;
+ CommentedTime m(GenTime(newPos, m_fps), QString::number(index), markersType);
+ markersList << m;
+ index++;
+ cutPos = newPos;
+ }
+ emit addMarkers(id, markersList);
+ }
+ if (!dataProcessed || extra.contains("storedata")) {
+ // Store returned data as clip extra data
+
+ clip->referencedClip()->setAnalysisData(i18n("Motion vectors"), results.value(returnKey));
+ emit updateAnalysisData(clip->referencedClip());
+ }
+}
+
#include "projectlist.moc"
projects / kdenlive / blobdiff