#include "ui_templateclip_ui.h"
#include "ui_cutjobdialog_ui.h"
+#include "ui_scenecutdialog_ui.h"
#include <KDebug>
#include <KAction>
connect(this, SIGNAL(processNextThumbnail()), this, SLOT(slotProcessNextThumbnail()));
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(focusMonitor(bool)), this, SIGNAL(raiseClipMonitor(bool)));
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()));
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, ErrorMessage);
}
else emit showClipProperties(clipList, commonproperties);
}
} else {
pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize());
}
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
}
QPainter p(&pixmap);
p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6));
p.end();
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
if (item->referencedClip()) {
item->referencedClip()->setPlaceHolder(true);
Mlt::Producer *newProd = m_render->invalidProducer(id);
}
}
update();
- emit displayMessage(i18n("Check missing clips"), -2);
+ emit displayMessage(i18n("Check missing clips"), -2, ErrorMessage);
emit updateRenderStatus();
}
properties.contains("xmldata") ||
properties.contains("force_aspect_num") ||
properties.contains("force_aspect_den") ||
+ properties.contains("full_luma") ||
properties.contains("templatetext")) {
slotRefreshClipThumbnail(item);
emit refreshClip(id, true);
- } else if (properties.contains("full_luma") || properties.contains("force_colorspace") || properties.contains("loop")) {
+ } else if (properties.contains("force_colorspace") || properties.contains("loop")) {
emit refreshClip(id, false);
}
}
//m_listView->setEnabled(false);
const QString parent = clip->getProperty("groupid");
QString groupName = clip->getProperty("groupname");
+ QSize pixelSize((int)(m_listView->iconSize().height() * m_render->dar()), m_listView->iconSize().height());
ProjectItem *item = NULL;
monitorItemEditing(false);
if (!parent.isEmpty()) {
}
if (parentitem)
- item = new ProjectItem(parentitem, clip);
+ item = new ProjectItem(parentitem, clip, pixelSize);
}
if (item == NULL) {
- item = new ProjectItem(m_listView, clip);
+ item = new ProjectItem(m_listView, clip, pixelSize);
}
if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading"));
connect(clip, SIGNAL(createProxy(const QString &)), this, SLOT(slotCreateProxy(const QString &)));
connect(clip, SIGNAL(abortProxy(const QString &, const QString &)), this, SLOT(slotAbortProxy(const QString, const QString)));
+
if (getProperties) {
- int height = m_listView->iconSize().height();
- int width = (int)(height * m_render->dar());
- QPixmap pix = KIcon("video-x-generic").pixmap(QSize(width, height));
- item->setData(0, Qt::DecorationRole, pix);
//item->setFlags(Qt::ItemIsSelectable);
m_listView->processLayout();
QDomElement e = clip->toXML().cloneNode().toElement();
QList <CutZoneInfo> cuts = clip->cutZones();
if (!cuts.isEmpty()) {
for (int i = 0; i < cuts.count(); i++) {
- SubProjectItem *sub = new SubProjectItem(item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
+ SubProjectItem *sub = new SubProjectItem(m_render->dar(), item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
if (!clip->getClipHash().isEmpty()) {
QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).zone.x()) + ".png";
if (QFile::exists(cachedPixmap)) {
requestClipThumbnail(item->clipId());
}
else {
- processThumbOverlays(item, pix);
- item->setData(0, Qt::DecorationRole, pix);
+ QPixmap result = roundedPixmap(pix);
+ processThumbOverlays(item, result);
+ item->setPixmap(result);
}
}
else {
}
}
+QPixmap ProjectList::roundedPixmap(QImage 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();
+ return pix;
+}
+
+QPixmap ProjectList::roundedPixmap(QPixmap source)
+{
+ QPixmap pix(source.width(), source.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.drawPixmap(0, 0, source);
+ p.end();
+ return pix;
+}
+
void ProjectList::getCachedThumbnail(SubProjectItem *item)
{
if (!item) return;
}
else if (clip->isPlaceHolder()) {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
- if (item->data(0, Qt::DecorationRole).isNull()) {
- item->setData(0, Qt::DecorationRole, missingPixmap);
+ if (!item->hasPixmap()) {
+ item->setPixmap(missingPixmap);
}
else {
QPixmap pixmap = qVariantValue<QPixmap>(item->data(0, Qt::DecorationRole));
QPainter p(&pixmap);
p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6));
p.end();
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
}
} else {
if (displayRatioChanged) {
requestClipThumbnail(clip->getId());
}
- else if (item->data(0, Qt::DecorationRole).isNull()) {
+ else if (!item->hasPixmap()) {
getCachedThumbnail(item);
}
if (item->data(0, DurationRole).toString().isEmpty()) {
QPainter p(&pixmap);
p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6));
p.end();
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
else if (clip->getProperty("_replaceproxy") == "1") {
clip->setProperty("_replaceproxy", QString());
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
if (durationError) {
kDebug() << "Proxy duration is wrong, try changing transcoding parameters.";
- emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2);
+ emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2, ErrorMessage);
}
slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
QString path = item->referencedClip()->getProperty("proxy");
connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &)));
connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &)));
connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList)));
+ connect(m_doc->clipManager(), SIGNAL(thumbReady(const QString &, int, QImage)), this, SLOT(slotSetThumbnail(const QString &, int, QImage)));
+}
+
+void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img)
+{
+ QString fullid = id + '#' + QString::number(framePos);
+ ProjectItem *pItem = NULL;
+ QTreeWidgetItem *item = getAnyItemById(fullid);
+ if (item && item->parent()) pItem = static_cast <ProjectItem *>(item->parent());
+ if (!item && framePos == 0) pItem = getItemById(id);
+ if (!item && !pItem) return;
+ if (item) {
+ if (item->type() == PROJECTCLIPTYPE) static_cast<ProjectItem*>(item)->setPixmap(QPixmap::fromImage(img));
+ else item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
+ }
+ else if (pItem) pItem->setPixmap(QPixmap::fromImage(img));
+ if (pItem) {
+ QString hash = pItem->getClipHash();
+ if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(framePos), img);
+ }
}
QList <DocClipBase*> ProjectList::documentClipList() const
slotProcessNextThumbnail();
return;
}
- QPixmap pix;
QImage img;
int height = m_listView->iconSize().height();
int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5);
int dwidth = (int)(height * m_render->dar() + 0.5);
- if (clip->clipType() == AUDIO)
- pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height));
- else if (clip->clipType() == IMAGE) {
+ if (clip->clipType() == IMAGE) {
img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height);
}
- else {
+ else if (clip->clipType() != AUDIO) {
img = item->referencedClip()->extractImage(frame, dwidth, height);
}
- if (!pix.isNull() || !img.isNull()) {
+ if (!img.isNull()) {
monitorItemEditing(false);
- if (!img.isNull()) {
- pix = QPixmap::fromImage(img);
- processThumbOverlays(item, pix);
- }
- it->setData(0, Qt::DecorationRole, pix);
+ QPixmap pix = roundedPixmap(img);
+ processThumbOverlays(item, pix);
+ if (isSubItem) it->setData(0, Qt::DecorationRole, pix);
+ else item->setPixmap(pix);
monitorItemEditing(true);
QString hash = item->getClipHash();
}
}
- if (!replace && m_allClipsProcessed && item->data(0, Qt::DecorationRole).isNull()) {
+ if (!replace && m_allClipsProcessed && !item->hasPixmap()) {
getCachedThumbnail(item);
}
if (!toReload.isEmpty())
{
ProjectItem *item = getItemById(clipId);
if (item && !img.isNull()) {
- 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();
+ QPixmap pix = roundedPixmap(img);
processThumbOverlays(item, pix);
monitorItemEditing(false);
- item->setData(0, Qt::DecorationRole, pix);
+ item->setPixmap(pix);
monitorItemEditing(true);
QString hash = item->getClipHash();
if (!hash.isEmpty()) m_doc->cacheImage(hash, img);
DocClipBase *base = clip->referencedClip();
base->addCutZone(in, out);
monitorItemEditing(false);
- SubProjectItem *sub = new SubProjectItem(clip, in, out, desc);
+ SubProjectItem *sub = new SubProjectItem(m_render->dar(), clip, in, out, desc);
if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) {
if (!clip->isExpanded())
clip->setExpanded(true);
m_listView->scrollToItem(sub);
m_listView->editItem(sub, 1);
}
- QImage img = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2);
- sub->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
- QString hash = clip->getClipHash();
- if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(in), img);
+ m_doc->clipManager()->requestThumbs(QString('#' + id), QList <int>() << in);
monitorItemEditing(true);
}
emit projectModified();
m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
}
- } else emit displayMessage(i18n("Sequence not found"), -2);
+ } else emit displayMessage(i18n("Sequence not found"), -2, ErrorMessage);
}
QMap <QString, QString> ProjectList::getProxies()
MeltJob *jb = static_cast<MeltJob *> (job);
jb->setProducer(currentClip->getProducer(), currentClip->fileURL());
if (jb->isProjectFilter())
- connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int, int, QString,stringMap)));
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int, int,stringMap,stringMap)));
else
- connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)));
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int,stringMap,stringMap)));
}
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&consumer, const QString&consumerParams, const QMap <QString, QString> &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);
+ MeltJob *job = new MeltJob(item->clipType(), id, jobParams, extraParams);
if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
delete job;
return;
}
- job->description = i18n("Filter %1", finalFilterName);
+ job->description = i18n("Filter %1", extraParams.value("finalfilter"));
m_jobList.append(job);
setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
slotCheckJobProcess();
QString destination;
ProjectItem *item = getItemById(ids.at(0));
if (!item) {
- emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2);
+ emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage);
return;
}
if (ids.count() == 1) {
destination = item->clipUrl().directory();
}
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\" _scene_cuts=0";
+ jobParams << filterName << "bounding=\"25%x25%:15%x15\" shot_change_list=0 denoise=0";
// Consumer
jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1";
- // Keys
- jobParams << "_scene_cuts";
- QStringList extraParams;
- extraParams << "projecttreefilter" << "project_profile";
+ QMap <QString, QString> extraParams;
+ extraParams.insert("key", "shot_change_list");
+ extraParams.insert("projecttreefilter", "1");
+ QString keyword("%count");
+ extraParams.insert("resultmessage", i18n("Found %1 scenes.", keyword));
+ if (ui.store_data->isChecked()) {
+ // We want to save result as clip metadata
+ extraParams.insert("storedata", "1");
+ }
+ if (ui.zone_only->isChecked()) {
+ // We want to analyze only clip zone
+ extraParams.insert("zoneonly", "1");
+ }
+ if (ui.add_markers->isChecked()) {
+ // We want to create markers
+ extraParams.insert("addmarkers", QString::number(ui.marker_type->currentIndex()));
+ }
+ if (ui.cut_scenes->isChecked()) {
+ // We want to cut scenes
+ extraParams.insert("cutscenes", "1");
+ }
+ 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) {
- processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc());
+ QMap <QString, QString> extraParams;
+ extraParams.insert("producer_profile", "1");
+ processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams);
}
delete d;
}
}
-void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QStringList extraParams)
+void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString> extraParams)
{
QStringList preParams;
// in and out
ProjectItem *item = getItemById(id);
if (!item) continue;
QStringList jobArgs;
+ if (extraParams.contains("zoneonly")) {
+ // Analyse clip zone only, remove in / out and replace with zone
+ preParams.takeFirst();
+ preParams.takeFirst();
+ QPoint zone = item->referencedClip()->zone();
+ jobArgs << QString::number(zone.x()) << QString::number(zone.y());
+ }
jobArgs << preParams;
if (ids.count() == 1) {
jobArgs << consumer + ':' + destination;
m_errorLog.clear();
}
-void ProjectList::slotGotFilterJobResults(QString id, int , int , QString filter, stringMap results)
+void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo)
{
- if (filter == "motion_est") {
- // Autosplit filter, add sub zones
- QStringList cuts = results.value("_scene_cuts").split(':', QString::SkipEmptyParts);
+ // Currently, only the first value of results is used
+ kDebug()<<"// FILTER RES:\n"<<filterInfo<<"\n--------------\n"<<results;
+ ProjectItem *clip = getItemById(id);
+ if (!clip) return;
+ // Check for return value
+ int markersType = -1;
+ if (filterInfo.contains("addmarkers")) markersType = filterInfo.value("addmarkers").toInt();
+ if (results.isEmpty()) {
+ emit displayMessage(i18n("No data returned from clip analysis"), 0, ErrorMessage);
+ return;
+ }
+ bool dataProcessed = false;
+ QString key = filterInfo.value("key");
+ int offset = filterInfo.value("offset").toInt();
+ QStringList value = results.value(key).split(';', QString::SkipEmptyParts);
+ kDebug()<<"// RESULT; "<<key<<" = "<<value;
+ if (filterInfo.contains("resultmessage")) {
+ QString mess = filterInfo.value("resultmessage");
+ mess.replace("%count", QString::number(value.count()));
+ emit displayMessage(mess, 0, InformationMessage);
+ }
+ else emit displayMessage(i18n("Processing data analysis"), 0, InformationMessage);
+ if (filterInfo.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 (const QString &pos, cuts) {
- int newPos = pos.toInt();
+ foreach (QString pos, value) {
+ 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);
+ (void) new AddClipCutCommand(this, id, cutPos + offset, newPos + offset, 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, value) {
+ 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 + offset, m_fps), QString::number(index), markersType);
+ markersList << m;
+ index++;
+ cutPos = newPos;
+ }
+ emit addMarkers(id, markersList);
+ }
+ if (!dataProcessed || filterInfo.contains("storedata")) {
+ // Store returned data as clip extra data
+ clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key), filterInfo.value("offset").toInt());
+ emit updateAnalysisData(clip->referencedClip());
+ }
}
+
#include "projectlist.moc"