X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=0a8083a750f08bbb58c579a6632ddcb4a581e2ce;hb=0bd6bcac38586a437a5b5e7b51ff7e6459187cf7;hp=99acb330d2f8e30247ce5b2b8105afbff3c7967d;hpb=cc7155342057775fde9166e999498a6c6d0a409a;p=kdenlive

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 99acb330..0a8083a7 100644
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -25,6 +25,8 @@
 #include "kdenlivedoc.h"
 #include "abstractclipitem.h"
 #include "abstractgroupitem.h"
+#include "titledocument.h"
+#include "kthumb.h"
 
 #include <mlt++/Mlt.h>
 
@@ -35,53 +37,144 @@
 #include <kio/netaccess.h>
 
 #include <QGraphicsItemGroup>
+#include <QtConcurrentRun>
+
+#include <KFileMetaInfo>
 
 ClipManager::ClipManager(KdenliveDoc *doc) :
-        QObject(),
-        m_audioThumbsQueue(),
-        m_doc(doc),
-        m_audioThumbsEnabled(false),
-        m_generatingAudioId()
+    QObject(),
+    m_audioThumbsQueue(),
+    m_doc(doc),
+    m_generatingAudioId(),
+    m_abortThumb(false)
 {
     m_clipIdCounter = 1;
     m_folderIdCounter = 1;
+    m_modifiedTimer.setInterval(1500);
     connect(&m_fileWatcher, SIGNAL(dirty(const QString &)), this, SLOT(slotClipModified(const QString &)));
     connect(&m_fileWatcher, SIGNAL(deleted(const QString &)), this, SLOT(slotClipMissing(const QString &)));
     connect(&m_fileWatcher, SIGNAL(created(const QString &)), this, SLOT(slotClipAvailable(const QString &)));
+    connect(&m_modifiedTimer, SIGNAL(timeout()), this, SLOT(slotProcessModifiedClips()));
+
+#if KDE_IS_VERSION(4,5,0)
+    KImageCache::deleteCache("kdenlive-thumbs");
+    pixmapCache = new KImageCache("kdenlive-thumbs", 1000000);
+    pixmapCache->setEvictionPolicy(KSharedDataCache::EvictOldest);
+#endif
 }
 
 ClipManager::~ClipManager()
 {
-    qDeleteAll(m_clipList);
-    m_clipList.clear();
+    m_abortThumb = true;
+    m_thumbsThread.waitForFinished();
+    m_thumbsMutex.lock();
+    m_requestedThumbs.clear();
+    m_thumbsMutex.unlock();
     m_audioThumbsQueue.clear();
     m_generatingAudioId.clear();
+    m_thumbsMutex.lock();
+    m_requestedThumbs.clear();
+    m_thumbsMutex.unlock();
+    qDeleteAll(m_clipList);
+    m_clipList.clear();
+#if KDE_IS_VERSION(4,5,0)
+    delete pixmapCache;
+#endif
 }
 
 void ClipManager::clear()
 {
+    m_abortThumb = true;
+    m_thumbsThread.waitForFinished();
+    m_thumbsMutex.lock();
+    m_requestedThumbs.clear();
+    m_thumbsMutex.unlock();
+    m_abortThumb = false;
+    m_folderList.clear();
+    m_audioThumbsQueue.clear();
+    m_modifiedClips.clear();
     qDeleteAll(m_clipList);
     m_clipList.clear();
     m_clipIdCounter = 1;
     m_folderIdCounter = 1;
-    m_folderList.clear();
-    m_audioThumbsQueue.clear();
+#if KDE_IS_VERSION(4,5,0)
+    pixmapCache->clear();
+#endif
 }
 
-void ClipManager::checkAudioThumbs()
+void ClipManager::clearCache()
 {
-    if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
-    m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
-    for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_audioThumbsEnabled) m_audioThumbsQueue.append(m_clipList.at(i)->getId());
-        else m_clipList.at(i)->slotClearAudioCache();
+#if KDE_IS_VERSION(4,5,0)
+    pixmapCache->clear();
+#endif
+}
+
+void ClipManager::requestThumbs(const QString id, QList <int> frames)
+{
+    m_thumbsMutex.lock();
+    foreach (int frame, frames) {
+        m_requestedThumbs.insertMulti(id, frame);
     }
-    if (m_audioThumbsEnabled) {
-        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
-    } else {
+    m_thumbsMutex.unlock();
+    if (!m_thumbsThread.isRunning() && !m_abortThumb) {
+        m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
+    }
+}
+
+void ClipManager::stopThumbs(const QString &id)
+{
+    m_abortThumb = true;
+    m_thumbsThread.waitForFinished();
+    m_thumbsMutex.lock();
+    m_requestedThumbs.remove(id);
+    m_thumbsMutex.unlock();
+    m_abortThumb = false;
+    if (!m_thumbsThread.isRunning()) {
+        m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
+    }
+}
+
+void ClipManager::slotGetThumbs()
+{
+    QMap<QString, int>::iterator i = m_requestedThumbs.begin();
+    while (i != m_requestedThumbs.end() && !m_abortThumb) {
+        QString producerId = i.key();
+        m_thumbsMutex.lock();
+        QList<int> values = m_requestedThumbs.values(producerId);
+        i = m_requestedThumbs.erase(i);
+        m_thumbsMutex.unlock();
+        qSort(values);
+        DocClipBase *clip = getClipById(producerId);
+        if (!clip) continue;
+        while (!values.isEmpty() && clip->thumbProducer() && !m_abortThumb) {
+            clip->thumbProducer()->getThumb(values.takeFirst());
+        }
+        if (m_abortThumb) {
+            // keep the requested frames that were not processed
+            m_thumbsMutex.lock();
+            foreach (int frame, values)
+                m_requestedThumbs.insertMulti(producerId, frame);
+            m_thumbsMutex.unlock();
+        }
+    }
+}
+
+void ClipManager::checkAudioThumbs()
+{
+    if (!KdenliveSettings::audiothumbnails()) {
+        if (!m_generatingAudioId.isEmpty()) {
+            DocClipBase *clip = getClipById(m_generatingAudioId);
+            if (clip) clip->slotClearAudioCache();
+        }
         m_audioThumbsQueue.clear();
         m_generatingAudioId.clear();
+        return;
+    }
+
+    for (int i = 0; i < m_clipList.count(); i++) {
+        m_audioThumbsQueue.append(m_clipList.at(i)->getId());
     }
+    if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
 }
 
 void ClipManager::askForAudioThumb(const QString &id)
@@ -208,32 +301,18 @@ const QList <DocClipBase *> ClipManager::getClipByResource(QString resource)
 {
     QList <DocClipBase *> list;
     QString clipResource;
+    QString proxyResource;
     for (int i = 0; i < m_clipList.count(); i++) {
         clipResource = m_clipList.at(i)->getProperty("resource");
+        proxyResource = m_clipList.at(i)->getProperty("proxy");
         if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour");
-        if (clipResource == resource) {
+        if (clipResource == resource || proxyResource == resource) {
             list.append(m_clipList.at(i));
         }
     }
     return list;
 }
 
-void ClipManager::updatePreviewSettings()
-{
-    for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_clipList.at(i)->clipType() == AV || m_clipList.at(i)->clipType() == VIDEO) {
-            if (m_clipList.at(i)->producerProperty("meta.media.0.codec.name") && strcmp(m_clipList.at(i)->producerProperty("meta.media.0.codec.name"), "h264") == 0) {
-                if (KdenliveSettings::dropbframes()) {
-                    m_clipList[i]->setProducerProperty("skip_loop_filter", "all");
-                    m_clipList[i]->setProducerProperty("skip_frame", "bidir");
-                } else {
-                    m_clipList[i]->setProducerProperty("skip_loop_filter", "");
-                    m_clipList[i]->setProducerProperty("skip_frame", "");
-                }
-            }
-        }
-    }
-}
 
 void ClipManager::clearUnusedProducers()
 {
@@ -242,52 +321,60 @@ void ClipManager::clearUnusedProducers()
     }
 }
 
-void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods)
+void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods, bool displayRatioChanged, bool fpsChanged)
 {
     for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_clipList.at(i)->numReferences() > 0) {
-            m_clipList.at(i)->clearProducers();
+        if (m_clipList.at(i)->numReferences() > 0 || displayRatioChanged || fpsChanged) {
+            m_clipList.at(i)->deleteProducers();
         }
     }
     QString id;
     for (int i = 0; i < prods.count(); i++) {
         id = prods.at(i)->get("id");
-        kDebug() << "// // // REPLACE CLIP: " << id;
         if (id.contains('_')) id = id.section('_', 0, 0);
         DocClipBase *clip = getClipById(id);
         if (clip) {
-            clip->setProducer(prods.at(i));
+            clip->setProducer(prods.at(i), false, true);
         }
     }
-    emit checkAllClips();
+    emit checkAllClips(displayRatioChanged, fpsChanged);
 }
 
-void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId)
+void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId)
 {
     QUndoCommand *addClips = new QUndoCommand();
-    addClips->setText(i18n("Add clips"));
 
-    foreach(const KUrl &file, urls) {
+    foreach(const KUrl & file, urls) {
         if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
+            if (!getClipByResource(file.path()).empty()) {
+                if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel)
+                    continue;
+            }
+            kDebug() << "Adding clip: " << file.path();
             QDomDocument doc;
             QDomElement prod = doc.createElement("producer");
             doc.appendChild(prod);
+            prod.setAttribute("resource", file.path());
+            uint id = m_clipIdCounter++;
+            prod.setAttribute("id", QString::number(id));
             if (!group.isEmpty()) {
                 prod.setAttribute("groupname", group);
                 prod.setAttribute("groupid", groupId);
             }
-            prod.setAttribute("resource", file.path());
-            if (!getClipByResource(prod.attribute("resource")).empty()) {
-                if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", prod.attribute("resource")), i18n("Clip already exists")) == KMessageBox::Cancel)
-                    continue;
-            }
-            uint id = m_clipIdCounter++;
-            prod.setAttribute("id", QString::number(id));
             KMimeType::Ptr type = KMimeType::findByUrl(file);
             if (type->name().startsWith("image/")) {
                 prod.setAttribute("type", (int) IMAGE);
                 prod.setAttribute("in", 0);
-                prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+                prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()));
+                if (KdenliveSettings::autoimagetransparency()) prod.setAttribute("transparency", 1);
+                // Read EXIF metadata for JPEG
+                if (type->is("image/jpeg")) {
+                    KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo);
+                    const QHash<QString, KFileMetaInfoItem> metaInfoItems = metaInfo.items();
+                    foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) {
+                        prod.setAttribute("meta.attr." + metaInfoItem.name().section("#", 1), metaInfoItem.value().toString());
+                    }
+                }
             } else if (type->is("application/x-kdenlivetitle")) {
                 // opening a title file
                 QDomDocument txtdoc("titledocument");
@@ -295,66 +382,63 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co
                 if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
                     txtfile.close();
                     prod.setAttribute("type", (int) TEXT);
-                    prod.setAttribute("resource", file.path());
-                    prod.setAttribute("xmldata", txtdoc.toString());
+                    // extract embeded images
+                    QDomNodeList items = txtdoc.elementsByTagName("content");
+                    for (int i = 0; i < items.count() ; i++) {
+                        QDomElement content = items.item(i).toElement();
+                        if (content.hasAttribute("base64")) {
+                            QString titlesFolder = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
+                            QString path = TitleDocument::extractBase64Image(titlesFolder, content.attribute("base64"));
+                            if (!path.isEmpty()) {
+                                content.setAttribute("url", path);
+                                content.removeAttribute("base64");
+                            }
+                        }
+                    }
+                    QString titleData = txtdoc.toString();
+                    prod.setAttribute("xmldata", titleData);
                     prod.setAttribute("transparency", 1);
                     prod.setAttribute("in", 0);
                     int out = txtdoc.documentElement().attribute("out").toInt();
-                    if (out > 0) prod.setAttribute("out", out);
-                    else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
-                } else txtfile.close();
+                    if (out > 0)
+                        prod.setAttribute("out", out);
+                    else
+                        prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()));
+                } else
+                    txtfile.close();
             }
             new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips);
         }
     }
-    m_doc->commandStack()->push(addClips);
+    if (addClips->childCount() > 0) {
+        addClips->setText(i18np("Add clip", "Add clips", addClips->childCount()));
+        m_doc->commandStack()->push(addClips);
+    }
+}
+
+void ClipManager::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId)
+{
+    slotAddClipList(KUrl::List(url), group, groupId);
 }
 
-void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QString &groupId)
+void ClipManager::slotAddXmlClipFile(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId)
 {
-    kDebug() << "/////  CLIP MANAGER, ADDING CLIP: " << url;
     QDomDocument doc;
-    QDomElement prod = doc.createElement("producer");
-    doc.appendChild(prod);
-    prod.setAttribute("resource", url.path());
-    if (!getClipByResource(prod.attribute("resource")).empty()) {
-        if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", prod.attribute("resource")), i18n("Clip already exists")) == KMessageBox::Cancel)
-            return;
-    }
+    doc.appendChild(doc.importNode(xml, true));
+    QDomElement prod = doc.documentElement();
+    prod.setAttribute("type", (int) PLAYLIST);
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
+    prod.setAttribute("name", name);
     if (!group.isEmpty()) {
         prod.setAttribute("groupname", group);
         prod.setAttribute("groupid", groupId);
     }
-    KMimeType::Ptr type = KMimeType::findByUrl(url);
-    if (type->name().startsWith("image/")) {
-        prod.setAttribute("type", (int) IMAGE);
-        prod.setAttribute("in", "0");
-        prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
-    } else if (type->name() == "application/x-kdenlivetitle") {
-        // opening a title file
-        QDomDocument txtdoc("titledocument");
-        QFile txtfile(url.path());
-        if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
-            txtfile.close();
-            prod.setAttribute("type", (int) TEXT);
-            prod.setAttribute("resource", QString());
-            prod.setAttribute("xmldata", txtdoc.toString());
-            GenTime outPos(txtdoc.documentElement().attribute("out").toDouble() / 1000.0);
-            prod.setAttribute("transparency", 1);
-            prod.setAttribute("in", 0);
-            int out = (int) outPos.frames(m_doc->fps());
-            if (out > 0) prod.setAttribute("out", out);
-            else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
-        } else txtfile.close();
-    }
     AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
-
-void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId)
+void ClipManager::slotAddColorClipFile(const QString &name, const QString &color, QString duration, const QString &group, const QString &groupId)
 {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
@@ -365,7 +449,7 @@ void ClipManager::slotAddColorClipFile(const QString name, const QString color,
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
     prod.setAttribute("in", "0");
-    prod.setAttribute("out", m_doc->getFramePos(duration) - 1);
+    prod.setAttribute("out", m_doc->getFramePos(duration));
     prod.setAttribute("name", name);
     if (!group.isEmpty()) {
         prod.setAttribute("groupname", group);
@@ -375,7 +459,10 @@ void ClipManager::slotAddColorClipFile(const QString name, const QString color,
     m_doc->commandStack()->push(command);
 }
 
-void ClipManager::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, QString group, const QString &groupId)
+void ClipManager::slotAddSlideshowClipFile(const QString &name, const QString &path, int count, const QString &duration,
+        const bool loop, const bool crop, const bool fade,
+        const QString &luma_duration, const QString &luma_file, const int softness,
+        const QString &animation, const QString &group, const QString &groupId)
 {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
@@ -385,14 +472,16 @@ void ClipManager::slotAddSlideshowClipFile(const QString name, const QString pat
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
     prod.setAttribute("in", "0");
-    prod.setAttribute("out", m_doc->getFramePos(duration) * count - 1);
+    prod.setAttribute("out", m_doc->getFramePos(duration) * count);
     prod.setAttribute("ttl", m_doc->getFramePos(duration));
     prod.setAttribute("luma_duration", m_doc->getFramePos(luma_duration));
     prod.setAttribute("name", name);
     prod.setAttribute("loop", loop);
+    prod.setAttribute("crop", crop);
     prod.setAttribute("fade", fade);
     prod.setAttribute("softness", QString::number(softness));
     prod.setAttribute("luma_file", luma_file);
+    prod.setAttribute("animation", animation);
     if (!group.isEmpty()) {
         prod.setAttribute("groupname", group);
         prod.setAttribute("groupid", groupId);
@@ -403,7 +492,7 @@ void ClipManager::slotAddSlideshowClipFile(const QString name, const QString pat
 
 
 
-void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QString xml, const QString group, const QString &groupId)
+void ClipManager::slotAddTextClipFile(const QString &titleName, int out, const QString &xml, const QString &group, const QString &groupId)
 {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
@@ -425,7 +514,7 @@ void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QS
     m_doc->commandStack()->push(command);
 }
 
-void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl path, const QString group, const QString &groupId)
+void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl &path, const QString &group, const QString &groupId)
 {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
@@ -450,7 +539,7 @@ void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl path, co
         out = titledoc.documentElement().attribute("out").toInt();
     } else txtfile.close();
 
-    if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration()) - 1;
+    if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration());
     prod.setAttribute("out", out);
 
     AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
@@ -532,12 +621,34 @@ QDomElement ClipManager::groupsXml() const
 
 void ClipManager::slotClipModified(const QString &path)
 {
-    // kDebug() << "// CLIP: " << path << " WAS MODIFIED";
+    //kDebug() << "// CLIP: " << path << " WAS MODIFIED";
     const QList <DocClipBase *> list = getClipByResource(path);
     for (int i = 0; i < list.count(); i++) {
         DocClipBase *clip = list.at(i);
-        if (clip != NULL) emit reloadClip(clip->getId());
+        if (clip != NULL) {
+            QString id = clip->getId();
+            if (!m_modifiedClips.contains(id))
+                emit modifiedClip(id);
+            m_modifiedClips[id] = QTime::currentTime();
+        }
+    }
+    if (!m_modifiedTimer.isActive()) m_modifiedTimer.start();
+}
+
+void ClipManager::slotProcessModifiedClips()
+{
+    if (!m_modifiedClips.isEmpty()) {
+        QMapIterator<QString, QTime> i(m_modifiedClips);
+        while (i.hasNext()) {
+            i.next();
+            if (QTime::currentTime().msecsTo(i.value()) <= -1500) {
+                emit reloadClip(i.key());
+                m_modifiedClips.remove(i.key());
+                break;
+            }
+        }
     }
+    if (m_modifiedClips.isEmpty()) m_modifiedTimer.stop();
 }
 
 void ClipManager::slotClipMissing(const QString &path)