Fix crash on scene cut analysis: http://kdenlive.org/mantis/view.php?id=2873

[kdenlive] / src / projecttree / meltjob.cpp

diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp
index ed170fdbe132fe3a4d71a41f0d9e7d946a1cbd39..0500bf5ea5551980dac68fc213a5272922f9b5d9 100644 (file)
--- a/src/projecttree/meltjob.cpp
+++ b/src/projecttree/meltjob.cpp
@@ -29,22 +29,20 @@
 #include <mlt++/Mlt.h>
 
 
-static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame /*frame_ptr*/)
+static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame frame_ptr)
 {
     // detect if the producer has finished playing. Is there a better way to do it?
-    self->emitFrameNumber();
+    Mlt::Frame frame(frame_ptr);
+    self->emitFrameNumber((int) frame.get_position());
 }
 
-MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QStringList extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
+MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters,  QMap <QString, QString>extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
     addClipToProject(0),
-    m_producer(NULL),
-    m_profile(NULL),
     m_consumer(NULL),
-    m_showFrameEvent(NULL),
     m_length(0),
     m_extra(extraParams)
 {
-    jobStatus = JOBWAITING;
+    m_jobStatus = JOBWAITING;
     m_params = parameters;
     description = i18n("Process clip");
     QString consum = m_params.at(5);
@@ -53,20 +51,20 @@ MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QStr
 
 void MeltJob::setProducer(Mlt::Producer *producer, KUrl url)
 {
-    m_producer = producer;
-    m_url = QString::fromUtf8(m_producer->get("resource"));
+    m_url = QString::fromUtf8(producer->get("resource"));
     if (m_url == "<playlist>" || m_url == "<tractor>" || m_url == "<producer>")
        m_url == url.path();
 }
 
 void MeltJob::startJob()
 {
-    if (!m_producer) {
+    if (m_url.isEmpty()) {
         m_errorMessage.append(i18n("No producer for this clip."));
         setStatus(JOBCRASHED);
         return;
     }
     int in = m_params.takeFirst().toInt();
+    if (in > 0 && !m_extra.contains("offset")) m_extra.insert("offset", QString::number(in));
     int out = m_params.takeFirst().toInt();
     QString producerParams =m_params.takeFirst(); 
     QString filter = m_params.takeFirst();
@@ -80,19 +78,7 @@ void MeltJob::startJob()
     if (!m_params.isEmpty()) startPos = m_params.takeFirst().toInt();
     int track = -1;
     if (!m_params.isEmpty()) track = m_params.takeFirst().toInt();
-    QString finalFilter;
-    if (!m_params.isEmpty()) finalFilter = m_params.takeFirst();
-    else finalFilter = filter;
-
-    // Check if we want to return analysis data
-    QString properties;
-    for (int i = 0; i < m_extra.count(); i++) {
-       if (m_extra.at(i).startsWith("key:")) {
-           properties = m_extra.at(i).section(':', 1);
-           break;
-       }
-    }
-
+    if (!m_extra.contains("finalfilter")) m_extra.insert("finalfilter", filter);
 
     if (out != -1 && out <= in) {
         m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out));
@@ -107,15 +93,21 @@ void MeltJob::startJob()
     else {
        m_profile = new Mlt::Profile(KdenliveSettings::current_profile().toUtf8().constData());
     }
+    if (m_extra.contains("resize_profile")) {  
+       m_profile->set_height(m_extra.value("resize_profile").toInt());
+       m_profile->set_width(m_profile->height() * m_profile->sar());
+    }
     if (out == -1) {
        prod = new Mlt::Producer(*m_profile,  m_url.toUtf8().constData());
+       m_length = prod->get_length();
     }
     else {
        Mlt::Producer *tmp = new Mlt::Producer(*m_profile,  m_url.toUtf8().constData());
         prod = tmp->cut(in, out);
        delete tmp;
+       m_length = prod->get_playtime();
     }
-    if (m_extra.contains("prducer_profile")) {
+    if (m_extra.contains("producer_profile")) {
        m_profile->from_producer(*prod);
        m_profile->set_explicit(true);
     }
@@ -151,6 +143,13 @@ void MeltJob::startJob()
     }
     
     Mlt::Filter mltFilter(*m_profile, filter.toUtf8().data());
+    if (!mltFilter.is_valid()) {
+       m_errorMessage = i18n("Filter %1 crashed", filter);
+        setStatus(JOBCRASHED);
+       delete m_consumer;
+       delete prod;
+       return;
+    }
     list = filterParams.split(' ', QString::SkipEmptyParts);
     foreach(const QString &data, list) {
         if (data.contains('=')) {
@@ -162,34 +161,31 @@ void MeltJob::startJob()
     Mlt::Playlist playlist;
     playlist.append(*prod);
     tractor.set_track(playlist, 0);
-    m_length = prod->get_length();
     m_consumer->connect(tractor);
     prod->set_speed(0);
     prod->seek(0);
     prod->attach(mltFilter);
-    m_showFrameEvent = m_consumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_render);
-    m_consumer->start();
+    Mlt::Event *showFrameEvent = m_consumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_render);
     prod->set_speed(1);
-    while (jobStatus != JOBABORTED && !m_consumer->is_stopped()) {
-        
-    }
-    m_consumer->stop();
-    QStringList wanted = properties.split(',', QString::SkipEmptyParts);
-    stringMap jobResults;
-    foreach(const QString &key, wanted) {
-        QString value = mltFilter.get(key.toUtf8().constData());
-        jobResults.insert(key, value);
+
+    m_consumer->run();
+    QMap <QString, QString> jobResults;
+    if (m_jobStatus != JOBABORTED && m_extra.contains("key")) {
+       QString result = mltFilter.get(m_extra.value("key").toUtf8().constData());
+       jobResults.insert(m_extra.value("key"), result);
     }
-    if (!jobResults.isEmpty() && jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, finalFilter, jobResults, m_extra);
     setStatus(JOBDONE);
-    delete m_consumer;
     delete prod;
+    delete showFrameEvent;
+    if (!jobResults.isEmpty() && m_jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra);
     return;
 }
 
 
 MeltJob::~MeltJob()
 {
+    delete m_consumer;
+    delete m_profile;
 }
 
 const QString MeltJob::destination() const
@@ -206,7 +202,7 @@ stringMap MeltJob::cancelProperties()
 const QString MeltJob::statusMessage()
 {
     QString statusInfo;
-    switch (jobStatus) {
+    switch (m_jobStatus) {
         case JOBWORKING:
             statusInfo = description;
             break;
@@ -219,10 +215,10 @@ const QString MeltJob::statusMessage()
     return statusInfo;
 }
 
-void MeltJob::emitFrameNumber()
+void MeltJob::emitFrameNumber(int pos)
 {
-    if (m_consumer && m_length > 0) {
-        emit jobProgress(m_clipId, (int) (100 * m_consumer->position() / m_length), jobType);
+    if (m_length > 0) {
+        emit jobProgress(m_clipId, (int) (100 * pos / m_length), jobType);
     }
 }
 
@@ -231,5 +227,10 @@ bool MeltJob::isProjectFilter() const
     return m_extra.contains("projecttreefilter");
 }
 
+void MeltJob::setStatus(CLIPJOBSTATUS status)
+{
+    m_jobStatus = status;
+    if (status == JOBABORTED && m_consumer) m_consumer->stop();
+}