Fix proxy creation sometimes blocked

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index cac5eda2b4690f0c6f683d3588161c1a903ece7a..086aa7c6108a32d9a310d974bd30ea54808ce195 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -573,7 +573,7 @@ void ClipItem::slotFetchThumbs()
         frames.append((int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1);
     }
 
-    m_clip->slotExtractImage(frames);
+    if (!frames.isEmpty()) m_clip->slotExtractImage(frames);
 }
 
 void ClipItem::slotGetStartThumb()

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index d28a11892ea6b104212ebf2176ea0589c3594131..04abe1c88bcefaa3a384ed85bd49860ee46bcb34 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1188,7 +1188,7 @@ void ProjectList::slotGotProxy(const QString &proxyPath)
 
 void ProjectList::slotGotProxy(ProjectItem *item)
 {
-    if (item == NULL || !m_refreshed) return;
+    if (item == NULL) return;
     DocClipBase *clip = item->referencedClip();
     if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) {
         // Clip is being reprocessed, abort
@@ -2348,18 +2348,18 @@ void ProjectList::slotCreateProxy(const QString id)
     if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return;
     QString path = item->referencedClip()->getProperty("proxy");
     if (path.isEmpty()) {
-        setProxyStatus(path, PROXYCRASHED);
+        setProxyStatus(item, PROXYCRASHED);
         return;
     }
-    setProxyStatus(path, PROXYWAITING);
+    setProxyStatus(item, PROXYWAITING);
     if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path);
     if (m_processingProxy.contains(path)) {
         // Proxy is already being generated
         return;
     }
-    if (QFile::exists(path)) {
+    if (QFileInfo(path).size() > 0) {
         // Proxy already created
-        setProxyStatus(path, PROXYDONE);
+        setProxyStatus(item, PROXYDONE);
         slotGotProxy(path);
         return;
     }
@@ -2371,6 +2371,15 @@ void ProjectList::slotCreateProxy(const QString id)
     info.type = item->clipType();
     info.exif = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt();
     m_proxyList.append(info);
+    if (!m_proxyThreads.futures().isEmpty()) {
+        // Remove inactive threads
+        QList <QFuture<void> > futures = m_proxyThreads.futures();
+        m_proxyThreads.clearFutures();
+        for (int i = 0; i < futures.count(); i++)
+            if (!futures.at(i).isFinished()) {
+                m_proxyThreads.addFuture(futures.at(i));
+            }
+    }
     if (m_proxyThreads.futures().isEmpty() || m_proxyThreads.futures().count() < KdenliveSettings::proxythreads()) m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy));
 }
 
@@ -2382,7 +2391,7 @@ void ProjectList::slotAbortProxy(const QString id, const QString path)
     slotGotProxy(item);
     if (!path.isEmpty() && m_processingProxy.contains(path)) {
         m_abortProxy << path;
-        setProxyStatus(path, NOPROXY);
+        setProxyStatus(item, NOPROXY);
     }
 }
 
@@ -2393,21 +2402,8 @@ void ProjectList::slotGenerateProxy()
         PROXYINFO info = m_proxyList.takeFirst();
         if (m_abortProxy.contains(info.dest)) {
             m_abortProxy.removeAll(info.dest);
-            return;
-        }
-
-        // Make sure proxy path is writable
-        QFile file(info.dest);
-        if (!file.open(QIODevice::WriteOnly)) {
-            setProxyStatus(info.dest, PROXYCRASHED);
-            m_processingProxy.removeAll(info.dest);
-            return;
-        }
-        file.close();
-        QFile::remove(info.dest);
-    
-        setProxyStatus(info.dest, CREATINGPROXY);
-    
+            continue;
+        }        
         // Get the list of clips that will need to get progress info
         QTreeWidgetItemIterator it(m_listView);
         QList <ProjectItem *> processingItems;
@@ -2421,6 +2417,20 @@ void ProjectList::slotGenerateProxy()
             ++it;
         }
 
+        // Make sure proxy path is writable
+        QFile file(info.dest);
+        if (!file.open(QIODevice::WriteOnly)) {
+            for (int i = 0; i < processingItems.count(); i++)
+                setProxyStatus(processingItems.at(i), PROXYCRASHED);
+            m_processingProxy.removeAll(info.dest);
+            continue;
+        }
+        file.close();
+        QFile::remove(info.dest);
+    
+        for (int i = 0; i < processingItems.count(); i++)
+            setProxyStatus(processingItems.at(i), CREATINGPROXY);
+
         // Special case: playlist clips (.mlt or .kdenlive project files)
         if (info.type == PLAYLIST) {
             // change FFmpeg params to MLT format
@@ -2459,7 +2469,8 @@ void ProjectList::slotGenerateProxy()
                     QFile::remove(info.dest);
                     m_abortProxy.removeAll(info.dest);
                     m_processingProxy.removeAll(info.dest);
-                    setProxyStatus(info.dest, NOPROXY);
+                    for (int i = 0; i < processingItems.count(); i++)
+                        setProxyStatus(processingItems.at(i), NOPROXY);
                     result = -2;
                 }
                 else {
@@ -2473,13 +2484,15 @@ void ProjectList::slotGenerateProxy()
             if (result == -1) result = myProcess.exitStatus();
             if (result == 0) {
                 // proxy successfully created
-                setProxyStatus(info.dest, PROXYDONE);
+                for (int i = 0; i < processingItems.count(); i++)
+                    setProxyStatus(processingItems.at(i), PROXYDONE);
                 slotGotProxy(info.dest);
             }
             else if (result == 1) {
                 // Proxy process crashed
                 QFile::remove(info.dest);
-                setProxyStatus(info.dest, PROXYCRASHED);
+                for (int i = 0; i < processingItems.count(); i++)
+                    setProxyStatus(processingItems.at(i), PROXYCRASHED);
             }
             continue;
         }
@@ -2489,7 +2502,8 @@ void ProjectList::slotGenerateProxy()
             QImage i(info.src);
             if (i.isNull()) {
                 // Cannot load image
-                setProxyStatus(info.dest, PROXYCRASHED);
+                for (int i = 0; i < processingItems.count(); i++)
+                    setProxyStatus(processingItems.at(i), PROXYCRASHED);
                 continue;
             }
             QImage proxy;
@@ -2531,7 +2545,8 @@ void ProjectList::slotGenerateProxy()
                 processed.save(info.dest);
             }
             else proxy.save(info.dest);
-            setProxyStatus(info.dest, PROXYDONE);
+            for (int i = 0; i < processingItems.count(); i++)
+                setProxyStatus(processingItems.at(i), PROXYDONE);
             slotGotProxy(info.dest);
             m_abortProxy.removeAll(info.dest);
             m_processingProxy.removeAll(info.dest);
@@ -2562,7 +2577,11 @@ void ProjectList::slotGenerateProxy()
                 m_abortProxy.removeAll(info.dest);
                 m_processingProxy.removeAll(info.dest);
                 QFile::remove(info.dest);
-                if (!m_abortAllProxies) setProxyStatus(info.dest, NOPROXY);
+                if (!m_abortAllProxies) {
+                    for (int i = 0; i < processingItems.count(); i++)
+                        setProxyStatus(processingItems.at(i), NOPROXY);
+                }
+                else continue;
                 result = -2;
             
             }
@@ -2575,16 +2594,26 @@ void ProjectList::slotGenerateProxy()
         myProcess.waitForFinished();
         m_abortProxy.removeAll(info.dest);
         m_processingProxy.removeAll(info.dest);
-        if (result == -1) result = myProcess.exitStatus();
-        if (result == 0) {
+        if (result == -1) {
+            result = myProcess.exitStatus();
+        }
+        
+        // FFmpeg process terminated normally, but make sure proxy clip exists
+        if (QFileInfo(info.dest).size() == 0) {
+            result = QProcess::CrashExit;
+        }
+
+        if (result == QProcess::NormalExit) {
             // proxy successfully created
-            setProxyStatus(info.dest, PROXYDONE);
+            for (int i = 0; i < processingItems.count(); i++)
+                setProxyStatus(processingItems.at(i), PROXYDONE);
             slotGotProxy(info.dest);
         }
-        else if (result == 1) {
+        else if (result == QProcess::CrashExit) {
             // Proxy process crashed
             QFile::remove(info.dest);
-            setProxyStatus(info.dest, PROXYCRASHED);
+            for (int i = 0; i < processingItems.count(); i++)
+                setProxyStatus(processingItems.at(i), PROXYCRASHED);
         }
     }
 }
@@ -2775,27 +2804,23 @@ void ProjectList::slotDeleteProxy(const QString proxyPath)
     QFile::remove(proxyPath);
 }
 
-void ProjectList::setProxyStatus(const QString proxyPath, PROXYSTATUS status, int progress)
-{
-    if (proxyPath.isEmpty() || m_abortAllProxies) return;
-    QTreeWidgetItemIterator it(m_listView);
-    ProjectItem *item;
-    while (*it && !m_abortAllProxies) {
-        if ((*it)->type() == PROJECTCLIPTYPE) {
-            item = static_cast <ProjectItem *>(*it);
-            if (item->referencedClip()->getProperty("proxy") == proxyPath) {
-                setProxyStatus(item, status, progress);
-            }
-        }
-        ++it;
-    }
-}
-
 void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress)
 {
-    if (item == NULL) return;
+    if (item == NULL || m_abortAllProxies) return;
     monitorItemEditing(false);
     item->setProxyStatus(status, progress);
+    if (status == PROXYCRASHED) {
+        DocClipBase *clip = item->referencedClip();
+        if (!clip) {
+            kDebug()<<"// PROXY CRASHED";
+        }
+        else if (clip->getProducer() == NULL && !clip->isPlaceHolder()) {
+            // disable proxy and fetch real clip
+            clip->setProperty("proxy", "-");
+            QDomElement xml = clip->toXML();
+            m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), true);
+        }
+    }
     monitorItemEditing(true);
 }
 

diff --git a/src/projectlist.h b/src/projectlist.h
index 24d1ba0cbfff2103d1a57fab19dda27b741ad0e3..423b3df9f96c00b230ad879e3e3b692f0c59f2ed 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -339,7 +339,6 @@ private:
     /** @brief Set the Proxy status on a clip. 
      * @param item The clip item to set status
      * @param status The proxy status (see definitions.h) */
-    void setProxyStatus(const QString proxyPath, PROXYSTATUS status, int progress = 0);
     void setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress = 0);
     /** @brief Process ffmpeg output to find out process progress. */
     void processLogInfo(QList <ProjectItem *>items, int *duration, const QString &log);