X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=860b9b4383889b941964b48f3d576cc9265221dd;hb=a41bc84cad7d706f246fab2837bae42a328a0b93;hp=022b1971b9eb8c2a4fd17c27b8664c41ff4c67aa;hpb=71e41ad0c197e2e2eb033dff7800427f64d3428f;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 022b1971..860b9b43 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -219,22 +219,24 @@ QStringList InvalidDialog::getIds() const ProjectList::ProjectList(QWidget *parent) : - QWidget(parent), - m_render(NULL), - m_fps(-1), - m_commandStack(NULL), - m_openAction(NULL), - m_reloadAction(NULL), - m_extractAudioAction(NULL), - m_transcodeAction(NULL), - m_stabilizeAction(NULL), - m_doc(NULL), - m_refreshed(false), - m_allClipsProcessed(false), - m_thumbnailQueue(), - m_abortAllJobs(false), - m_closing(false), - m_invalidClipDialog(NULL) + QWidget(parent) + , m_render(NULL) + , m_fps(-1) + , m_menu(NULL) + , m_commandStack(NULL) + , m_openAction(NULL) + , m_reloadAction(NULL) + , m_extractAudioAction(NULL) + , m_transcodeAction(NULL) + , m_clipsActionsMenu(NULL) + , m_doc(NULL) + , m_refreshed(false) + , m_allClipsProcessed(false) + , m_thumbnailQueue() + , m_proxyAction(NULL) + , m_abortAllJobs(false) + , m_closing(false) + , m_invalidClipDialog(NULL) { qRegisterMetaType ("stringMap"); QVBoxLayout *layout = new QVBoxLayout; @@ -310,7 +312,7 @@ ProjectList::ProjectList(QWidget *parent) : 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())); @@ -353,7 +355,7 @@ ProjectList::~ProjectList() m_jobThreads.clearFutures(); if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); m_jobList.clear(); - delete m_menu; + if (m_menu) delete m_menu; m_listView->blockSignals(true); m_listView->clear(); delete m_listViewDelegate; @@ -404,6 +406,10 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) void ProjectList::setupGeneratorMenu(const QHash& menus) { + if (!m_menu) { + kDebug()<<"Warning, menu was not created, something is wrong"; + return; + } if (!menus.contains("addMenu") && ! menus.value("addMenu") ) return; QMenu *menu = m_addButton->menu(); @@ -431,11 +437,11 @@ void ProjectList::setupGeneratorMenu(const QHash& menus) m_menu->addMenu(stabilizeMenu); if (stabilizeMenu->isEmpty()) stabilizeMenu->setEnabled(false); - m_stabilizeAction=stabilizeMenu; + m_clipsActionsMenu = stabilizeMenu; } - m_menu->addAction(m_reloadAction); - m_menu->addAction(m_proxyAction); + if (m_reloadAction) m_menu->addAction(m_reloadAction); + if (m_proxyAction) m_menu->addAction(m_proxyAction); if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){ QMenu* inTimelineMenu=menus.value("inTimelineMenu"); m_menu->addMenu(inTimelineMenu); @@ -587,7 +593,7 @@ void ProjectList::editClipSelection(QList list) 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); } @@ -715,10 +721,11 @@ void ProjectList::slotReloadClip(const QString &id) QDomElement e = item->toXml(); // Make sure we get the correct producer length if it was adjusted in timeline if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { - int length = QString(clip->producerProperty("length")).toInt(); - if (length > 0 && !e.hasAttribute("length")) { - e.setAttribute("length", length); - } + int length = QString(clip->producerProperty("length")).toInt(); + if (length > 0 && !e.hasAttribute("length")) { + e.setAttribute("length", length); + } + e.setAttribute("duration", clip->getProperty("duration")); } resetThumbsProducer(clip); m_render->getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true); @@ -739,7 +746,7 @@ void ProjectList::slotModifiedClip(const QString &id) } else { pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize()); } - item->setData(0, Qt::DecorationRole, pixmap); + item->setPixmap(pixmap); } } @@ -763,7 +770,7 @@ void ProjectList::slotMissingClip(const QString &id) 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); @@ -778,7 +785,7 @@ void ProjectList::slotMissingClip(const QString &id) } } update(); - emit displayMessage(i18n("Check missing clips"), -2); + emit displayMessage(i18n("Check missing clips"), -2, ErrorMessage); emit updateRenderStatus(); } @@ -834,18 +841,22 @@ void ProjectList::slotClipSelected() m_reloadAction->setEnabled(false); m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); } else { if (item->type() == PROJECTSUBCLIPTYPE) { // this is a sub item, use base clip m_deleteButton->defaultAction()->setEnabled(true); clip = static_cast (item->parent()); - if (clip == NULL) kDebug() << "-----------ERROR"; + if (clip == NULL) { + kDebug() << "-----------ERROR"; + return; + } SubProjectItem *sub = static_cast (item); + if (clip->referencedClip()->getProducer() == NULL) m_render->getFileProperties(clip->referencedClip()->toXML(), clip->clipId(), m_listView->iconSize().height(), true); emit clipSelected(clip->referencedClip(), sub->zone()); m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); m_reloadAction->setEnabled(false); adjustProxyActions(clip); return; @@ -853,12 +864,13 @@ void ProjectList::slotClipSelected() clip = static_cast (item); if (clip && clip->referencedClip()) emit clipSelected(clip->referencedClip()); + if (clip->referencedClip()->getProducer() == NULL) m_render->getFileProperties(clip->referencedClip()->toXML(), clip->clipId(), m_listView->iconSize().height(), true); m_editButton->defaultAction()->setEnabled(true); m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_extractAudioAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_stabilizeAction->setEnabled(true); + m_clipsActionsMenu->setEnabled(true); if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -882,13 +894,14 @@ void ProjectList::slotClipSelected() m_reloadAction->setEnabled(false); m_extractAudioAction->setEnabled(true); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); } adjustProxyActions(clip); } void ProjectList::adjustProxyActions(ProjectItem *clip) const { + if (!m_proxyAction) return; if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { m_proxyAction->setEnabled(false); return; @@ -905,10 +918,10 @@ void ProjectList::adjustStabilizeActions(ProjectItem *clip) const { if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW) { - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); return; } - m_stabilizeAction->setEnabled(true); + m_clipsActionsMenu->setEnabled(true); } @@ -948,7 +961,7 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap type() == PROJECTFOLDERTYPE) { if (column == 0) { FolderProjectItem *folder = static_cast (item); + if (item->text(0) == folder->groupName()) return; editFolder(item->text(0), folder->groupName(), folder->clipId()); folder->setGroupName(item->text(0)); m_doc->clipManager()->addFolder(folder->clipId(), item->text(0)); @@ -1067,20 +1081,24 @@ void ProjectList::slotCheckScrolling() void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) { + if (!m_menu) { + kDebug()<<"Warning, menu was not created, something is wrong"; + return; + } bool enable = item ? true : false; m_editButton->defaultAction()->setEnabled(enable); m_deleteButton->defaultAction()->setEnabled(enable); m_reloadAction->setEnabled(enable); m_extractAudioAction->setEnabled(enable); m_transcodeAction->setEnabled(enable); - m_stabilizeAction->setEnabled(enable); + m_clipsActionsMenu->setEnabled(enable); if (enable) { ProjectItem *clip = NULL; if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { clip = static_cast (item->parent()); m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); adjustProxyActions(clip); } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) { clip = static_cast (item); @@ -1093,7 +1111,7 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) } else { m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); } if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); @@ -1171,7 +1189,7 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_stabilizeAction->setEnabled(true); + m_clipsActionsMenu->setEnabled(true); return; } else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { @@ -1180,10 +1198,10 @@ void ProjectList::updateButtons() const else m_editButton->defaultAction()->setEnabled(false); } m_openAction->setEnabled(false); - m_reloadAction->setEnabled(false); + if (m_reloadAction) m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); - m_proxyAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); + if (m_proxyAction) m_proxyAction->setEnabled(false); } void ProjectList::selectItemById(const QString &clipId) @@ -1294,6 +1312,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) //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()) { @@ -1307,19 +1326,16 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) } 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(); @@ -1459,7 +1475,9 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) { if (!item) return; DocClipBase *clip = item->referencedClip(); - if (!clip) return; + if (!clip) { + return; + } QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png"; if (QFile::exists(cachedPixmap)) { QPixmap pix(cachedPixmap); @@ -1468,8 +1486,9 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) requestClipThumbnail(item->clipId()); } else { - processThumbOverlays(item, pix); - item->setData(0, Qt::DecorationRole, pix); + QPixmap result = roundedPixmap(pix); + processThumbOverlays(item, result); + item->setPixmap(result); } } else { @@ -1477,6 +1496,34 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) } } +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; @@ -1550,6 +1597,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr } if (clip->isPlaceHolder() == false && !hasPendingJob(item, PROXYJOB)) { QDomElement xml = clip->toXML(); + getCachedThumbnail(item); if (fpsChanged) { xml.removeAttribute("out"); xml.removeAttribute("file_hash"); @@ -1559,27 +1607,31 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr xml.removeAttribute("_replaceproxy"); if (replace) { resetThumbsProducer(clip); + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); } - m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); + else if (item->numReferences() > 0) { + // In some cases, like slowmotion clips, the producer is not loaded automatically be MLT + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); + } } 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(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()) { @@ -1594,7 +1646,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr 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()); @@ -1817,7 +1869,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) 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"); @@ -2012,8 +2064,11 @@ void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img) if (item && item->parent()) pItem = static_cast (item->parent()); if (!item && framePos == 0) pItem = getItemById(id); if (!item && !pItem) return; - if (item) item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); - else if (pItem) pItem->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); + if (item) { + if (item->type() == PROJECTCLIPTYPE) static_cast(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); @@ -2123,26 +2178,22 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) 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(); @@ -2159,12 +2210,87 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } } +void ProjectList::extractMetadata(DocClipBase *clip) +{ + CLIPTYPE t = clip->clipType(); + if (t != AV && t != VIDEO) { + // Currently, we only use exiftool on video files + return; + } + QMap props = clip->properties(); + if (KdenliveSettings::use_exiftool() && !props.contains("exiftool")) { + QMap meta; + QString url = clip->fileURL().path(); + //Check for Canon THM file + url = url.section('.', 0, -2) + ".THM"; + if (QFile::exists(url)) { + // Read the exif metadata embeded in the THM file + QProcess p; + QStringList args; + args << "-g" << "-args" << url; + p.start("exiftool", args); + p.waitForFinished(); + QString res = p.readAllStandardOutput(); + QStringList list = res.split("\n"); + foreach(QString tagline, list) { + if (tagline.startsWith("-File") || tagline.startsWith("-ExifTool")) continue; + QString tag = tagline.section(':', 1).simplified(); + if (tag.startsWith("ImageWidth") || tag.startsWith("ImageHeight")) continue; + if (!tag.section('=', 0, 0).isEmpty() && !tag.section('=', 1).simplified().isEmpty()) + meta.insert(tag.section('=', 0, 0), tag.section('=', 1).simplified()); + } + } else { + QString codecid = props.value("videocodecid").simplified(); + if (codecid == "h264") { + QProcess p; + QStringList args; + args << "-g" << "-args" << clip->fileURL().encodedPathAndQuery(); + p.start("exiftool", args); + p.waitForFinished(); + QString res = p.readAllStandardOutput(); + QStringList list = res.split("\n"); + foreach(QString tagline, list) { + if (!tagline.startsWith("-H264")) continue; + QString tag = tagline.section(':', 1); + if (tag.startsWith("ImageWidth") || tag.startsWith("ImageHeight")) continue; + meta.insert(tag.section('=', 0, 0), tag.section('=', 1)); + } + } + } + clip->setProperty("exiftool", "1"); + if (!meta.isEmpty()) { + clip->setMetadata(meta, "ExifTool"); + //checkCamcorderFilters(clip, meta); + } + } + if (KdenliveSettings::use_magicLantern() && !props.contains("magiclantern")) { + QMap meta; + QString url = clip->fileURL().path(); + url = url.section('.', 0, -2) + ".LOG"; + if (QFile::exists(url)) { + QFile file(url); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + while (!file.atEnd()) { + QString line = file.readLine().simplified(); + if (line.startsWith('#') || line.isEmpty() || !line.contains(':')) continue; + if (line.startsWith("CSV data")) break; + meta.insert(line.section(':', 0, 0).simplified(), line.section(':', 1).simplified()); + } + } + } + + if (!meta.isEmpty()) + clip->setMetadata(meta, "Magic Lantern"); + clip->setProperty("magiclantern", "1"); + } +} + void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace) { + QMutexLocker lock(&m_processMutex); QString toReload; ProjectItem *item = getItemById(clipId); - int queue = m_render->processingItems(); if (item && producer) { monitorItemEditing(false); DocClipBase *clip = item->referencedClip(); @@ -2177,6 +2303,8 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } item->setProperties(properties, metadata); clip->setProducer(producer, replace); + extractMetadata(clip); + m_render->processingDone(clipId); // Proxy stuff QString size = properties.value("frame_size"); @@ -2211,12 +2339,16 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } } - if (!replace && m_allClipsProcessed && item->data(0, Qt::DecorationRole).isNull()) { + if (!replace && m_allClipsProcessed && !item->hasPixmap()) { getCachedThumbnail(item); } if (!toReload.isEmpty()) item->slotSetToolTip(); - } else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; + } else { + kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; + m_render->processingDone(clipId); + } + int queue = m_render->processingItems(); if (queue == 0) { monitorItemEditing(true); if (item && m_thumbnailQueue.isEmpty()) { @@ -2229,6 +2361,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) { // this is the first clip loaded in project, check if we want to adjust project settings to the clip updatedProfile = adjustProjectProfileToItem(item); + if (updatedProfile == false) { + emit clipSelected(item->referencedClip()); + } } if (updatedProfile == false) { //emit clipSelected(item->referencedClip()); @@ -2245,8 +2380,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce return; } if (replace) toReload = clipId; - if (!toReload.isEmpty()) + if (!toReload.isEmpty()) { emit clipNeedsReload(toReload); + } } bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) @@ -2334,18 +2470,10 @@ void ProjectList::slotReplyGetImage(const QString &clipId, const QImage &img) { 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); @@ -2456,7 +2584,7 @@ void ProjectList::slotSelectClip(const QString &ix) m_reloadAction->setEnabled(true); m_extractAudioAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_stabilizeAction->setEnabled(true); + m_clipsActionsMenu->setEnabled(true); if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -2512,9 +2640,9 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const return result; } -QStringList ProjectList::getConditionalIds(const QString &condition) const +QMap ProjectList::getConditionalIds(const QString &condition) const { - QStringList result; + QMap result; ProjectItem *item; QList list = m_listView->selectedItems(); for (int i = 0; i < list.count(); i++) { @@ -2535,7 +2663,7 @@ QStringList ProjectList::getConditionalIds(const QString &condition) const else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section('=', 1, 1))) continue; } - result.append(item->clipId()); + result.insert(item->clipId(), item->clipUrl().path()); } return result; } @@ -2600,7 +2728,7 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d m_listView->scrollToItem(sub); m_listView->editItem(sub, 1); } - m_doc->clipManager()->requestThumbs(QString('#' + id), QList () << in); + m_doc->clipManager()->slotRequestThumbs(QString('#' + id), QList () << in); monitorItemEditing(true); } emit projectModified(); @@ -2707,7 +2835,7 @@ void ProjectList::slotAddOrUpdateSequence(const QString frameName) 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 ProjectList::getProxies() @@ -2841,14 +2969,14 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, QString desc) { QStringList existingFiles; - QStringList ids = getConditionalIds(condition); + QMap ids = getConditionalIds(condition); + QMap::const_iterator i = ids.constBegin(); QStringList destinations; - foreach(const QString &id, ids) { - ProjectItem *item = getItemById(id); - if (!item) continue; - QString newFile = params.section(' ', -1).replace("%1", item->clipUrl().path()); - destinations << newFile; + while (i != ids.constEnd()) { + QString newFile = params.section(' ', -1).replace("%1", i.value()); + destinations << newFile; if (QFile::exists(newFile)) existingFiles << newFile; + ++i; } if (!existingFiles.isEmpty()) { if (KMessageBox::warningContinueCancelList(this, i18n("The transcoding job will overwrite the following files:"), existingFiles) == KMessageBox::Cancel) return; @@ -2881,10 +3009,11 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, params = ui.extra_params->toPlainText().simplified(); KdenliveSettings::setAdd_new_clip(ui.add_clip->isChecked()); int index = 0; - foreach(const QString &id, ids) { - ProjectItem *item = getItemById(id); + i = ids.constBegin(); + while (i != ids.constEnd()) { + ProjectItem *item = getItemById(i.key()); if (!item || !item->referencedClip()) continue; - QString src = item->clipUrl().path(); + QString src = i.value(); QString dest; if (ids.count() > 1) { dest = destinations.at(index); @@ -2900,13 +3029,14 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, jobParams << duration; jobParams << QString::number(KdenliveSettings::add_new_clip()); jobParams << params; - CutClipJob *job = new CutClipJob(item->clipType(), id, jobParams); + CutClipJob *job = new CutClipJob(item->clipType(), i.key(), jobParams); if (job->isExclusive() && hasPendingJob(item, job->jobType)) { delete job; continue; } m_jobList.append(job); setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + ++i; } delete d; slotCheckJobProcess(); @@ -2925,22 +3055,21 @@ void ProjectList::slotCheckJobProcess() } } if (m_jobList.isEmpty()) return; - int count = 0; + m_jobMutex.lock(); + int count = 0; for (int i = 0; i < m_jobList.count(); i++) { - if (m_jobList.at(i)->jobStatus == JOBWORKING || m_jobList.at(i)->jobStatus == JOBWAITING) + if (m_jobList.at(i)->status() == JOBWORKING || m_jobList.at(i)->status() == JOBWAITING) count ++; else { // remove finished jobs AbstractClipJob *job = m_jobList.takeAt(i); - delete job; + job->deleteLater(); i--; } } - - emit jobCount(count); + emit jobCount(count); m_jobMutex.unlock(); - if (m_jobThreads.futures().isEmpty() || m_jobThreads.futures().count() < KdenliveSettings::proxythreads()) m_jobThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotProcessJobs)); } @@ -2963,14 +3092,14 @@ void ProjectList::slotProcessJobs() int count = 0; m_jobMutex.lock(); for (int i = 0; i < m_jobList.count(); i++) { - if (m_jobList.at(i)->jobStatus == JOBWAITING) { + if (m_jobList.at(i)->status() == JOBWAITING) { if (job == NULL) { - m_jobList.at(i)->jobStatus = JOBWORKING; + m_jobList.at(i)->setStatus(JOBWORKING); job = m_jobList.at(i); } count++; } - else if (m_jobList.at(i)->jobStatus == JOBWORKING) + else if (m_jobList.at(i)->status() == JOBWORKING) count ++; } // Set jobs count @@ -3009,20 +3138,20 @@ void ProjectList::slotProcessJobs() MeltJob *jb = static_cast (job); jb->setProducer(currentClip->getProducer(), currentClip->fileURL()); if (jb->isProjectFilter()) - connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int, int,stringMap,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, stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int,stringMap,stringMap))); } job->startJob(); - if (job->jobStatus == JOBDONE) { + if (job->status() == JOBDONE) { emit updateJobStatus(job->clipId(), job->jobType, JOBDONE); //TODO: replace with more generic clip replacement framework if (job->jobType == PROXYJOB) emit gotProxy(job->clipId()); if (job->addClipToProject()) { emit addClip(destination, QString(), QString()); } - } else if (job->jobStatus == JOBCRASHED || job->jobStatus == JOBABORTED) { - emit updateJobStatus(job->clipId(), job->jobType, job->jobStatus, job->errorMessage(), QString(), job->logDetails()); + } else if (job->status() == JOBCRASHED || job->status() == JOBABORTED) { + emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails()); } } // Thread finished, cleanup & update count @@ -3326,7 +3455,7 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) for (int i = 0; i < m_jobList.count(); i++) { if (m_abortAllJobs) break; job = m_jobList.at(i); - if (job->clipId() == item->clipId() && job->jobType == type && (job->jobStatus == JOBWAITING || job->jobStatus == JOBWORKING)) return true; + if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JOBWAITING || job->status() == JOBWORKING)) return true; } return false; @@ -3418,7 +3547,7 @@ QStringList ProjectList::getPendingJobs(const QString &id) QStringList result; QMutexLocker lock(&m_jobMutex); for (int i = 0; i < m_jobList.count(); i++) { - if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobStatus == JOBWAITING || m_jobList.at(i)->jobStatus == JOBWORKING)) { + if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JOBWAITING || m_jobList.at(i)->status() == JOBWORKING)) { // discard this job result << m_jobList.at(i)->description; } @@ -3441,8 +3570,8 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr 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 << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track); + jobParams << QString::number((int) info.cropStart.frames(m_fps)) << QString::number((int) (info.cropStart + info.cropDuration).frames(m_fps)); + jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number((int) 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; @@ -3456,19 +3585,25 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr void ProjectList::startClipFilterJob(const QString &filterName, const QString &condition) { - QStringList ids = getConditionalIds(condition); - QString destination; - ProjectItem *item = getItemById(ids.at(0)); + QMap ids = getConditionalIds(condition); + QStringList destination; + QMap::const_iterator first = ids.constBegin(); + if (first == ids.constEnd()) { + emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage); + return; + } + ProjectItem *item = getItemById(first.key()); 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().path(); + destination << item->clipUrl().path(); } else { - destination = item->clipUrl().directory(); + destination = ids.values(); } + if (filterName == "motion_est") { // Show config dialog QPointer d = new QDialog(this); @@ -3489,12 +3624,24 @@ void ProjectList::startClipFilterJob(const QString &filterName, const QString &c // 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"; + // In fact, it's faster to rescale whole image than using part of it (bounding=\"25%x25%:15%x15\") + jobParams << filterName << "shot_change_list=0 denoise=0"; // Consumer - jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1"; + jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1 rescale=nearest deinterlace_method=onefield top_field_first=-1"; QMap extraParams; extraParams.insert("key", "shot_change_list"); extraParams.insert("projecttreefilter", "1"); + QString keyword("%count"); + extraParams.insert("resultmessage", i18n("Found %1 scenes.", keyword)); + extraParams.insert("resize_profile", "160"); + 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())); @@ -3504,14 +3651,14 @@ void ProjectList::startClipFilterJob(const QString &filterName, const QString &c extraParams.insert("cutscenes", "1"); } delete d; - processClipJob(ids, QString(), false, jobParams, i18n("Auto split"), extraParams); + processClipJob(ids.keys(), QString(), false, jobParams, i18n("Auto split"), extraParams); } else { - QPointer d = new ClipStabilize(destination, ids.count(), filterName); + QPointer d = new ClipStabilize(destination, filterName); if (d->exec() == QDialog::Accepted) { QMap extraParams; extraParams.insert("producer_profile", "1"); - processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams); + processClipJob(ids.keys(), d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams); } delete d; } @@ -3535,6 +3682,13 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo 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; @@ -3558,9 +3712,10 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo job->description = description; m_jobList.append(job); setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + slotCheckJobProcess(); } - slotCheckJobProcess(); } + void ProjectList::slotPrepareJobsMenu() { @@ -3614,21 +3769,28 @@ void ProjectList::slotClosePopup() void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo) { // Currently, only the first value of results is used - kDebug()<<"// FILTER RES:\n"<childCount() == 0) @@ -3660,7 +3822,7 @@ void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap resu 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); + CommentedTime m(GenTime(newPos + offset, m_fps), QString::number(index), markersType); markersList << m; index++; cutPos = newPos; @@ -3669,10 +3831,26 @@ void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap resu } 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)); + clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key), filterInfo.value("offset").toInt()); emit updateAnalysisData(clip->referencedClip()); } } +/* +// Work in progress: apply filter based on clip's camcorder +void ProjectList::checkCamcorderFilters(DocClipBase *clip, QMap meta) +{ + KConfig conf("camcorderfilters.rc", KConfig::CascadeConfig, "appdata"); + QStringList groups = conf.groupList(); + foreach(QString grp, groups) { + if (!meta.contains(grp)) continue; + KConfigGroup group(&conf, grp); + QString value = group.readEntry(meta.value(grp)); + if (value.isEmpty()) continue; + clip->setProperty(value.section(' ', 0, 0), value.section(' ', 1)); + break; + } +}*/ + #include "projectlist.moc"