Fix freeze / crash introduced by recent commit when seeking outside clip range

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 849dd873f1a3bef8cd5cf05ba838429d0ac0d044..96c22f5b301c23efee3fcd876024e596e5a9e242 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -421,12 +421,15 @@ void Render::seek(GenTime time)
 void Render::seek(int time)
 {
     resetZoneMode();
+    time = qMax(0, time);
+    time = qMin(m_mltProducer->get_playtime(), time);
     if (requestedSeekPosition == SEEK_INACTIVE) {
        requestedSeekPosition = time;
        m_mltProducer->seek(time);
        //m_mltConsumer->purge();
        if (m_paused && !externalConsumer) {
-           refresh();
+           m_mltConsumer->set("refresh", 1);
+           //refresh();
        }
     }
     else requestedSeekPosition = time;
@@ -590,7 +593,7 @@ void Render::slotSplitView(bool doit)
                 screen++;
             }
         }
-        m_mltConsumer->set("refresh", 1);
+        refreshConsumerDisplay();
     } else {
         mlt_service serv = m_mltProducer->parent().get_service();
         mlt_service nextservice = mlt_service_get_producer(serv);
@@ -611,21 +614,31 @@ void Render::slotSplitView(bool doit)
             properties = MLT_SERVICE_PROPERTIES(nextservice);
             mlt_type = mlt_properties_get(properties, "mlt_type");
             resource = mlt_properties_get(properties, "mlt_service");
-            m_mltConsumer->set("refresh", 1);
+            refreshConsumerDisplay();
         }
     }
 }
 
 void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer)
 {
+    // Make sure we don't request the info for same clip twice
+    m_infoMutex.lock();
+    if (m_processingClipId.contains(clipId)) {
+       m_infoMutex.unlock();
+       return;
+    }
+    for (int i = 0; i < m_requestList.count(); i++) {
+       if (m_requestList.at(i).clipId == clipId) {
+           // Clip is already queued
+           m_infoMutex.unlock();
+           return;
+       }
+    }
     requestClipInfo info;
     info.xml = xml;
     info.clipId = clipId;
     info.imageHeight = imageHeight;
     info.replaceProducer = replaceProducer;
-    // Make sure we don't request the info for same clip twice
-    m_infoMutex.lock();
-    m_requestList.removeAll(info);
     m_requestList.append(info);
     m_infoMutex.unlock();
     if (!m_infoThread.isRunning()) {
@@ -635,7 +648,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, in
 
 void Render::forceProcessing(const QString &id)
 {
-    if (m_processingClipId == id) return;
+    if (m_processingClipId.contains(id)) return;
     QMutexLocker lock(&m_infoMutex);
     for (int i = 0; i < m_requestList.count(); i++) {
         requestClipInfo info = m_requestList.at(i);
@@ -653,21 +666,22 @@ void Render::forceProcessing(const QString &id)
 int Render::processingItems()
 {
     QMutexLocker lock(&m_infoMutex);
-    int count = m_requestList.count();
-    if (!m_processingClipId.isEmpty()) {
-        // one clip is currently processed
-        count++;
-    }
+    int count = m_requestList.count() + m_processingClipId.count();
     return count;
 }
 
+void Render::processingDone(const QString &id)
+{
+    QMutexLocker lock(&m_infoMutex);
+    m_processingClipId.removeAll(id);
+}
+
 bool Render::isProcessing(const QString &id)
 {
-    if (m_processingClipId == id) return true;
+    if (m_processingClipId.contains(id)) return true;
     QMutexLocker lock(&m_infoMutex);
     for (int i = 0; i < m_requestList.count(); i++) {
-        requestClipInfo info = m_requestList.at(i);
-        if (info.clipId == id) {
+        if (m_requestList.at(i).clipId == id) {
             return true;
         }
     }
@@ -681,7 +695,7 @@ void Render::processFileProperties()
     while (!m_requestList.isEmpty()) {
         m_infoMutex.lock();
         info = m_requestList.takeFirst();
-        m_processingClipId = info.clipId;
+        m_processingClipId.append(info.clipId);
         m_infoMutex.unlock();
 
         QString path;
@@ -732,7 +746,7 @@ void Render::processFileProperties()
 
         if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
             kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<<path;
-            m_processingClipId.clear();
+            m_processingClipId.removeAll(info.clipId);
             if (proxyProducer) {
                 // Proxy file is corrupted
                 emit removeInvalidProxy(info.clipId, false);
@@ -747,7 +761,7 @@ void Render::processFileProperties()
             producer->set("out", info.xml.attribute("proxy_out").toInt());
             if (producer->get_out() != info.xml.attribute("proxy_out").toInt()) {
                 // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
-                m_processingClipId.clear();
+                m_processingClipId.removeAll(info.clipId);
                 emit removeInvalidProxy(info.clipId, true);
                 delete producer;
                 continue;
@@ -815,9 +829,17 @@ void Render::processFileProperties()
                 length = info.xml.attribute("length").toInt();
                 clipOut = length - 1;
             }
-            else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt();
-            producer->set("length", length);
-           duration = length;
+            else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt() + 1;
+           // Pass duration if it was forced
+           if (info.xml.hasAttribute("duration")) {
+               duration = info.xml.attribute("duration").toInt();
+               if (length < duration) {
+                   length = duration;
+                   if (clipOut > 0) clipOut = length - 1;
+               }
+           }
+           if (duration == 0) duration = length;
+           producer->set("length", length);
         }
 
         if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut);
@@ -843,7 +865,6 @@ void Render::processFileProperties()
                 }
                 if (frame) delete frame;
             }
-            m_processingClipId.clear();
             emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer);
             continue;
         }
@@ -1066,10 +1087,8 @@ void Render::processFileProperties()
                 metadataPropertyMap[ name.section('.', 0, -2)] = value;
         }
         producer->seek(0);
-        m_processingClipId.clear();
         emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer);
     }
-    m_processingClipId.clear();
 }
 
 
@@ -1211,12 +1230,15 @@ void Render::startConsumer() {
         m_mltConsumer = NULL;
         return;
     }
+    refreshConsumerDisplay();
+}
+
+void Render::refreshConsumerDisplay()
+{
     m_mltConsumer->set("refresh", 1);
     // Make sure the first frame is displayed, otherwise if we change producer too fast
     // We can crash the avformat producer
-    Mlt::Event *ev = m_mltConsumer->setup_wait_for("consumer-frame-show");
-    m_mltConsumer->wait_for(ev);
-    delete ev;
+    m_mltConsumer->wait_for("consumer-frame-show");
 }
 
 int Render::setSceneList(QDomDocument list, int position)
@@ -1305,6 +1327,7 @@ int Render::setSceneList(QString playlist, int position)
         m_mltProducer = m_blackClip->cut(0, 1);
         error = -1;
     }
+    m_mltProducer->set("eof", "pause");
     checkMaxThreads();
     int volume = KdenliveSettings::volume();
     m_mltProducer->set("meta.volume", (double)volume / 100);
@@ -1525,7 +1548,7 @@ void Render::start()
             kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR";
         } else {
             m_mltConsumer->purge();
-            m_mltConsumer->set("refresh", 1);
+            refreshConsumerDisplay();
         }
     }
 }
@@ -1586,11 +1609,10 @@ void Render::switchPlay(bool play)
         if (m_mltConsumer->is_stopped()) {
             m_mltConsumer->start();
         }
-        m_mltConsumer->set("refresh", 1);
+        refreshConsumerDisplay();
     } else if (!play) {
        m_paused = true;
        m_mltProducer->set_speed(0.0);
-       //m_mltProducer->pause();
     }
 }
 
@@ -1607,7 +1629,7 @@ void Render::play(double speed)
        m_mltConsumer->start();
     }
     m_paused = speed == 0;
-    if (current_speed == 0 && speed != 0) m_mltConsumer->set("refresh", 1);
+    if (current_speed == 0 && speed != 0) refreshConsumerDisplay();
 }
 
 void Render::play(const GenTime & startTime)
@@ -1618,7 +1640,7 @@ void Render::play(const GenTime & startTime)
     m_paused = false;
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_mltProducer->set_speed(1.0);
-    m_mltConsumer->set("refresh", 1);
+    refreshConsumerDisplay();
 }
 
 void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
@@ -1641,8 +1663,8 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_paused = false;
     m_mltProducer->set_speed(1.0);
-    m_mltConsumer->set("refresh", 1);
     if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+    refreshConsumerDisplay();
     m_isZoneMode = true;
 }
 
@@ -1690,8 +1712,8 @@ void Render::refresh()
         return;
     if (m_mltConsumer) {
         if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+       refreshConsumerDisplay();
         //m_mltConsumer->purge();
-        m_mltConsumer->set("refresh", 1);
     }
 }
 
@@ -1758,9 +1780,6 @@ void Render::emitFrameNumber()
     emit rendererPosition(currentPos);
     if (requestedSeekPosition != SEEK_INACTIVE) {
        m_mltProducer->seek(requestedSeekPosition);
-       if (m_paused) {
-           refresh();
-       }
        requestedSeekPosition = SEEK_INACTIVE;
     }
 }
@@ -2196,6 +2215,7 @@ bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement ele
 bool Render::mltRemoveClip(int track, GenTime position)
 {
     m_refreshTimer.stop();
+    
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
@@ -2413,7 +2433,7 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
     }
     service.unlock();
     mltCheckLength(&tractor);
-    m_mltConsumer->set("refresh", 1);
+    refreshConsumerDisplay();
 }
 
 
@@ -3360,7 +3380,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
         transpinfo.track = info.track;
         mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
     }*/
-    m_mltConsumer->set("refresh", 1);
+    refreshConsumerDisplay();
     return true;
 }
 
@@ -3477,7 +3497,7 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime newCropStart)
     int frameOffset = newCropFrame - previousStart;
     trackPlaylist.resize_clip(clipIndex, newCropFrame, previousOut + frameOffset);
     service.unlock();
-    m_mltConsumer->set("refresh", 1);
+    refreshConsumerDisplay();
     return true;
 }
 
@@ -3549,7 +3569,7 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
     }*/
     //m_mltConsumer->set("refresh", 1);
     service.unlock();
-    m_mltConsumer->set("refresh", 1);
+    refreshConsumerDisplay();
     return true;
 }