Cleanup & fix melt job (like video stab) not keeping original clip profile

[kdenlive] / src / projecttree / meltjob.cpp

diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp
index 14760724531890d223bf0b0aa7ffa1223cf257a2..605ad342709f14e2c9c0c6446ff19997d9ebc144 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,22 +35,27 @@ 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) : AbstractClipJob(MLTJOB, cType, id, parameters),
+    addClipToProject(0),
     m_producer(NULL),
     m_profile(NULL),
     m_consumer(NULL),
+    m_showFrameEvent(NULL),
     m_length(0)
 {
     jobStatus = JOBWAITING;
     m_params = parameters;
     description = i18n("Process clip");
     QString consum = m_params.at(5);
-    if (consum.contains(":")) m_dest = consum.section(":", 1);
+    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,7 +72,7 @@ void MeltJob::startJob()
     QString filterParams = m_params.takeFirst();
     QString consumer = m_params.takeFirst();
     kDebug()<<"consumer: "<<consumer;
-    if (consumer.contains(":")) m_dest = consumer.section(":", 1);
+    if (consumer.contains(':')) m_dest = consumer.section(':', 1);
     QString consumerParams = m_params.takeFirst();
     
     // optional params
@@ -85,25 +91,27 @@ void MeltJob::startJob()
         setStatus(JOBCRASHED);
         return;
     }
-    
-    m_profile = m_producer->profile();
-
-    Mlt::Producer *prod;
+    Mlt::Producer *prod ;
+    m_profile = new Mlt::Profile;
+    m_profile->set_explicit(false);
     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 
-        prod = m_producer->cut(in, out);
+    else {
+       Mlt::Producer *tmp = new Mlt::Producer(*m_profile,  m_url.toUtf8().constData());
+        prod = tmp->cut(in, out);
+       delete tmp;
+    }
+    m_profile->from_producer(*prod);
+    m_profile->set_explicit(true);
     QStringList list = producerParams.split(' ', QString::SkipEmptyParts);
-    foreach(QString data, list) {
+    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());
+        m_consumer = new Mlt::Consumer(*m_profile, consumer.section(':', 0, 0).toUtf8().constData(), consumer.section(':', 1).toUtf8().constData());
     }
     else {
         m_consumer = new Mlt::Consumer(*m_profile, consumer.toUtf8().constData());
@@ -119,7 +127,7 @@ void MeltJob::startJob()
     m_consumer->set("real_time", -KdenliveSettings::mltthreads() );
 
     list = consumerParams.split(' ', QString::SkipEmptyParts);
-    foreach(QString data, list) {
+    foreach(const QString &data, list) {
         if (data.contains('=')) {
             kDebug()<<"// filter con: "<<data;
             m_consumer->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
@@ -128,16 +136,18 @@ void MeltJob::startJob()
     
     Mlt::Filter mltFilter(*m_profile, filter.toUtf8().data());
     list = filterParams.split(' ', QString::SkipEmptyParts);
-    foreach(QString data, list) {
+    foreach(const QString &data, list) {
         if (data.contains('=')) {
             kDebug()<<"// filter p: "<<data;
             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);
@@ -150,7 +160,7 @@ void MeltJob::startJob()
     m_consumer->stop();
     QStringList wanted = properties.split(',', QString::SkipEmptyParts);
     stringMap jobResults;
-    foreach(const QString key, wanted) {
+    foreach(const QString &key, wanted) {
         QString value = mltFilter.get(key.toUtf8().constData());
         jobResults.insert(key, value);
     }