Cleanup data processing framework

[kdenlive] / src / projecttree / meltjob.cpp

diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp
index 19d29e144ad24246dff213d91de5444f4ec8e4b9..ed170fdbe132fe3a4d71a41f0d9e7d946a1cbd39 100644 (file)
--- a/src/projecttree/meltjob.cpp
+++ b/src/projecttree/meltjob.cpp
@@ -23,6 +23,7 @@
 #include "kdenlivedoc.h"
 
 #include <KDebug>
+#include <KUrl>
 #include <KLocale>
 
 #include <mlt++/Mlt.h>
@@ -34,12 +35,14 @@ static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame /*fram
     self->emitFrameNumber();
 }
 
-MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters) : AbstractClipJob(MLTJOB, cType, id, parameters), 
+MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QStringList extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
+    addClipToProject(0),
     m_producer(NULL),
     m_profile(NULL),
     m_consumer(NULL),
     m_showFrameEvent(NULL),
-    m_length(0)
+    m_length(0),
+    m_extra(extraParams)
 {
     jobStatus = JOBWAITING;
     m_params = parameters;
@@ -48,9 +51,12 @@ MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters) : Ab
     if (consum.contains(':')) m_dest = consum.section(':', 1);
 }
 
-void MeltJob::setProducer(Mlt::Producer *producer)
+void MeltJob::setProducer(Mlt::Producer *producer, KUrl url)
 {
     m_producer = producer;
+    m_url = QString::fromUtf8(m_producer->get("resource"));
+    if (m_url == "<playlist>" || m_url == "<tractor>" || m_url == "<producer>")
+       m_url == url.path();
 }
 
 void MeltJob::startJob()
@@ -66,13 +72,10 @@ void MeltJob::startJob()
     QString filter = m_params.takeFirst();
     QString filterParams = m_params.takeFirst();
     QString consumer = m_params.takeFirst();
-    kDebug()<<"consumer: "<<consumer;
     if (consumer.contains(':')) m_dest = consumer.section(':', 1);
     QString consumerParams = m_params.takeFirst();
     
     // optional params
-    QString properties;
-    if (!m_params.isEmpty()) properties = m_params.takeFirst();
     int startPos = -1;
     if (!m_params.isEmpty()) startPos = m_params.takeFirst().toInt();
     int track = -1;
@@ -81,28 +84,47 @@ void MeltJob::startJob()
     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 (out != -1 && out <= in) {
         m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out));
         setStatus(JOBCRASHED);
         return;
     }
-    
-    m_profile = m_producer->profile();
-
-    Mlt::Producer *prod;
+    Mlt::Producer *prod ;
+    if (m_extra.contains("producer_profile")) {
+       m_profile = new Mlt::Profile;
+       m_profile->set_explicit(false);
+    }
+    else {
+       m_profile = new Mlt::Profile(KdenliveSettings::current_profile().toUtf8().constData());
+    }
     if (out == -1) {
-        QString url = QString::fromUtf8(m_producer->get("resource"));
-        prod = new Mlt::Producer(*m_profile,  url.toUtf8().constData());
+       prod = new Mlt::Producer(*m_profile,  m_url.toUtf8().constData());
+    }
+    else {
+       Mlt::Producer *tmp = new Mlt::Producer(*m_profile,  m_url.toUtf8().constData());
+        prod = tmp->cut(in, out);
+       delete tmp;
+    }
+    if (m_extra.contains("prducer_profile")) {
+       m_profile->from_producer(*prod);
+       m_profile->set_explicit(true);
     }
-    else 
-        prod = m_producer->cut(in, out);
     QStringList list = producerParams.split(' ', QString::SkipEmptyParts);
     foreach(const QString &data, list) {
         if (data.contains('=')) {
             prod->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
         }
     }
-
     if (consumer.contains(":")) {
         m_consumer = new Mlt::Consumer(*m_profile, consumer.section(':', 0, 0).toUtf8().constData(), consumer.section(':', 1).toUtf8().constData());
     }
@@ -119,6 +141,7 @@ void MeltJob::startJob()
     //m_consumer->set("eof", "pause" );
     m_consumer->set("real_time", -KdenliveSettings::mltthreads() );
 
+
     list = consumerParams.split(' ', QString::SkipEmptyParts);
     foreach(const QString &data, list) {
         if (data.contains('=')) {
@@ -135,10 +158,12 @@ void MeltJob::startJob()
             mltFilter.set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
         }
     }
+    Mlt::Tractor tractor;
     Mlt::Playlist playlist;
     playlist.append(*prod);
+    tractor.set_track(playlist, 0);
     m_length = prod->get_length();
-    m_consumer->connect(playlist);
+    m_consumer->connect(tractor);
     prod->set_speed(0);
     prod->seek(0);
     prod->attach(mltFilter);
@@ -155,7 +180,7 @@ void MeltJob::startJob()
         QString value = mltFilter.get(key.toUtf8().constData());
         jobResults.insert(key, value);
     }
-    if (!jobResults.isEmpty()) emit gotFilterJobResults(m_clipId, startPos, track, finalFilter, jobResults);
+    if (!jobResults.isEmpty() && jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, finalFilter, jobResults, m_extra);
     setStatus(JOBDONE);
     delete m_consumer;
     delete prod;
@@ -201,3 +226,10 @@ void MeltJob::emitFrameNumber()
     }
 }
 
+bool MeltJob::isProjectFilter() const
+{
+    return m_extra.contains("projecttreefilter");
+}
+
+
+