]> git.sesse.net Git - kdenlive/blobdiff - src/renderer.cpp
Check that the proxy has same length as original clip, otherwise mark it as "crashed...
[kdenlive] / src / renderer.cpp
index 203cef2b2cdfdbf2fa0764eb91619957c108046c..646c5611802a116faeca0bdfc81dbb2fa00d1d08 100644 (file)
@@ -96,8 +96,8 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_
 Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
     QObject(parent),
     m_isBlocked(0),
-    sendFrameForAnalysis(false),
     analyseAudio(KdenliveSettings::monitor_audio()),
+    sendFrameForAnalysis(false),
     m_name(rendererName),
     m_mltConsumer(NULL),
     m_mltProducer(NULL),
@@ -122,6 +122,7 @@ Render::~Render()
 {
     m_isBlocked = 1;
     closeMlt();
+    delete m_mltProfile;
 }
 
 
@@ -145,7 +146,6 @@ void Render::closeMlt()
                 nextservicetodisconnect = nextservice;
                 nextservice = mlt_service_producer(nextservice);
                 mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
-                nextservice = mlt_service_producer(nextservice);
                 if (nextservice == NULL) break;
                 properties = MLT_SERVICE_PROPERTIES(nextservice);
                 mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -157,6 +157,8 @@ void Render::closeMlt()
                 Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
                 if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
             }
+            delete field;
+            field = NULL;
         }
         mlt_service_unlock(service.get_service());
     }
@@ -182,7 +184,9 @@ void Render::buildConsumer(const QString profileName)
     m_blackClip = NULL;
 
     //TODO: uncomment following line when everything is clean
-    //if (m_mltProfile) delete m_mltProfile;
+    // uncommented Feb 2011 --Granjow
+    if (m_mltProfile) delete m_mltProfile;
+
     m_mltProfile = new Mlt::Profile(tmp);
     m_mltProfile->get_profile()->is_explicit = 1;
     delete[] tmp;
@@ -194,19 +198,25 @@ void Render::buildConsumer(const QString profileName)
     if (KdenliveSettings::external_display() && m_name != "clip") {
         // Use blackmagic card for video output
         QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName);
-        if (BMInterface::isSupportedProfile(KdenliveSettings::blackmagic_output_device(), profileProperties)) {
-            QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
-            tmp = qstrdup(decklink.toUtf8().constData());
-            m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
-            delete[] tmp;
-            if (m_mltConsumer) {
-                m_externalConsumer = true;
-                m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
-                m_mltConsumer->set("terminate_on_pause", 0);
-                mlt_log_set_callback(kdenlive_callback);
-            }
-            if (m_mltConsumer && m_mltConsumer->is_valid()) return;
-        } else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
+        int device = KdenliveSettings::blackmagic_output_device();
+        if (device >= 0) {
+            if (BMInterface::isSupportedProfile(device, profileProperties)) {
+                QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
+                tmp = qstrdup(decklink.toUtf8().constData());
+                m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
+                delete[] tmp;
+                if (m_mltConsumer->is_valid()) {
+                    m_externalConsumer = true;
+                    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+                    m_mltConsumer->set("terminate_on_pause", 0);
+                    m_mltConsumer->set("buffer", 12);
+                    m_mltConsumer->set("deinterlace_method", "onefield");
+                    m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
+                    mlt_log_set_callback(kdenlive_callback);
+                }
+                if (m_mltConsumer && m_mltConsumer->is_valid()) return;
+            } else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
+        }
     }
     m_externalConsumer = false;
     QString videoDriver = KdenliveSettings::videodrivername();
@@ -260,6 +270,7 @@ void Render::buildConsumer(const QString profileName)
     m_mltConsumer->set("progressive", 1);
     m_mltConsumer->set("audio_buffer", 1024);
     m_mltConsumer->set("frequency", 48000);
+    m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
 }
 
 Mlt::Producer *Render::invalidProducer(const QString &id)
@@ -353,6 +364,15 @@ void Render::seek(GenTime time)
     refresh();
 }
 
+void Render::seek(int time)
+{
+    if (!m_mltProducer)
+        return;
+    m_isBlocked = false;
+    m_mltProducer->seek(time);
+    refresh();
+}
+
 //static
 /*QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border) {
     QPixmap pix(width, height);
@@ -452,6 +472,10 @@ double Render::dar() const
     return m_mltProfile->dar();
 }
 
+double Render::sar() const
+{
+    return m_mltProfile->sar();
+}
 
 void Render::slotSplitView(bool doit)
 {
@@ -518,12 +542,23 @@ void Render::slotSplitView(bool doit)
     }
 }
 
-void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer)
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip)
 {
-    KUrl url = KUrl(xml.attribute("resource", QString()));
+    QString path;
+    bool proxyProducer;
+    if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") {
+        path = xml.attribute("proxy");
+        proxyProducer = true;
+    }
+    else {
+        path = xml.attribute("resource");
+        proxyProducer = false;
+    }
+
+
+    KUrl url = KUrl(path);
     Mlt::Producer *producer = NULL;
     CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt();
-
     //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n";
     /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
         emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
@@ -548,13 +583,23 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         producer = new Mlt::Producer(*m_mltProfile, url.path().toUtf8().constData());
     }
 
+
     if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
         kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
-        emit removeInvalidClip(clipId, replaceProducer);
+        if (proxyProducer) {
+            // Proxy file is corrupted
+            emit removeInvalidProxy(clipId, false);
+        }
+        else emit removeInvalidClip(clipId, replaceProducer);
         delete producer;
         return;
     }
 
+    if (proxyProducer && xml.hasAttribute("proxy_out") && producer->get_out() != xml.attribute("proxy_out").toInt()) {
+        // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
+        emit removeInvalidProxy(clipId, true);
+    }
+
     if (xml.hasAttribute("force_aspect_ratio")) {
         double aspect = xml.attribute("force_aspect_ratio").toDouble();
         if (aspect > 0) producer->set("force_aspect_ratio", aspect);
@@ -605,21 +650,32 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
     }
 
+    int clipOut = 0;
+    int duration = 0;
+    if (xml.hasAttribute("out")) clipOut = xml.attribute("out").toInt();
+
     // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger
-    if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW)
-        producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1);
+    if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
+        int length;
+        if (xml.hasAttribute("length")) {
+            if (clipOut > 0) duration = clipOut + 1;
+            length = xml.attribute("length").toInt();
+            clipOut = length - 1;
+        }
+        else length = xml.attribute("out").toInt() - xml.attribute("in").toInt();
+        producer->set("length", length);
+    }
 
-    if (xml.hasAttribute("out"))
-        producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
+    if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut);
 
     producer->set("id", clipId.toUtf8().constData());
 
     if (xml.hasAttribute("templatetext"))
         producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
 
-    if (!replaceProducer && xml.hasAttribute("file_hash")) {
+    if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) {
         // Clip  already has all properties
-        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
+        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
         return;
     }
 
@@ -630,8 +686,8 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
     int frameNumber = xml.attribute("thumbnail", "0").toInt();
     if (frameNumber != 0) producer->seek(frameNumber);
 
-    filePropertyMap["duration"] = QString::number(producer->get_playtime());
-    //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
+    filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime());
+    //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer->get_playtime();
 
     Mlt::Frame *frame = producer->get_frame();
 
@@ -700,22 +756,35 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
             else
                 filePropertyMap["type"] = "video";
 
+            int variance;
             mlt_image_format format = mlt_image_rgb24a;
             int frame_width = width;
             int frame_height = imageHeight;
-            uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
-            QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied);
             QPixmap pix;
-
-            if (!image.isNull()) {
-                if (frame_width > (2 * width)) {
-                    // there was a scaling problem, do it manually
-                    QImage scaled = image.scaled(width, imageHeight);
-                    pix = QPixmap::fromImage(scaled.rgbSwapped());
-                } else pix = QPixmap::fromImage(image.rgbSwapped());
-            } else
-                pix.fill(Qt::black);
-
+            do {
+                variance = 100;
+                uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
+                QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied);
+
+                if (!image.isNull()) {
+                    if (frame_width > (2 * width)) {
+                        // there was a scaling problem, do it manually
+                        QImage scaled = image.scaled(width, imageHeight);
+                        pix = QPixmap::fromImage(scaled.rgbSwapped());
+                    } else pix = QPixmap::fromImage(image.rgbSwapped());
+                    variance = KThumb::imageVariance(image);
+                } else
+                    pix.fill(Qt::black);
+
+                if (frameNumber == 0 && variance < 6) {
+                    // Thumbnail is not interesting (for example all black, seek to fetch better thumb
+                    frameNumber = 100;
+                    producer->seek(frameNumber);
+                    delete frame;
+                    frame = producer->get_frame();
+                    variance = -1;
+                }
+            } while (variance == -1);
             emit replyGetImage(clipId, pix);
 
         } else if (frame->get_int("test_audio") == 0) {
@@ -795,7 +864,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
             metadataPropertyMap[ name.section('.', 0, -2)] = value;
     }
     producer->seek(0);
-    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
+    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip);
     // FIXME: should delete this to avoid a leak...
     //delete producer;
 }
@@ -889,6 +958,13 @@ int Render::setSceneList(QString playlist, int position)
 
     //kDebug() << "//////  RENDER, SET SCENE LIST: " << playlist;
 
+    // Remove previous profile info
+    QDomDocument doc;
+    doc.setContent(playlist);
+    QDomElement profile = doc.documentElement().firstChildElement("profile");
+    doc.documentElement().removeChild(profile);
+    playlist = doc.toString();
+
     if (m_mltConsumer) {
         if (!m_mltConsumer->is_stopped()) {
             m_mltConsumer->stop();
@@ -903,7 +979,6 @@ int Render::setSceneList(QString playlist, int position)
         m_mltProducer->set_speed(0);
         //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
 
-
         Mlt::Service service(m_mltProducer->parent().get_service());
         mlt_service_lock(service.get_service());
 
@@ -944,7 +1019,6 @@ int Render::setSceneList(QString playlist, int position)
     }
 
     blockSignals(true);
-
     // TODO: Better way to do this
     if (KdenliveSettings::projectloading_avformatnovalidate())
         playlist.replace(">avformat</property>", ">avformat-novalidate</property>");
@@ -952,7 +1026,6 @@ int Render::setSceneList(QString playlist, int position)
         playlist.replace(">avformat-novalidate</property>", ">avformat</property>");
 
     m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
-
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData();
         m_mltProducer = m_blackClip->cut(0, 50);
@@ -1351,8 +1424,8 @@ void Render::refresh()
 void Render::setDropFrames(bool show)
 {
     if (m_mltConsumer) {
-        int dropFrames = 1;
-        if (show == false) dropFrames = 0;
+        int dropFrames = KdenliveSettings::mltthreads();
+        if (show == false) dropFrames = -dropFrames;
         m_mltConsumer->stop();
         if (m_winid == 0)
             m_mltConsumer->set("real_time", dropFrames);
@@ -1764,7 +1837,8 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
         mlt_service_unlock(service.get_service());
         return false;
     }
-    Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps));
+
+    Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps) - 1);
     trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1);
     delete clip2;
 
@@ -1919,10 +1993,9 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
                 }
                 int position = trackPlaylist.clip_start(clipIndex);
                 int blankDuration = trackPlaylist.clip_length(clipIndex);
-                diff = -diff;
-                if (blankDuration - diff == 0) {
+                if (blankDuration + diff == 0) {
                     trackPlaylist.remove(clipIndex);
-                } else trackPlaylist.remove_region(position, diff);
+                } else trackPlaylist.remove_region(position, -diff);
             }
             trackPlaylist.consolidate_blanks(0);
         }
@@ -2306,7 +2379,7 @@ bool Render::mltAddTrackEffect(int track, EffectsParameterList params)
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     Mlt::Service trackService(trackProducer.get_service()); //trackPlaylist
-    return mltAddEffect(trackService, params, 15000, true);
+    return mltAddEffect(trackService, params, trackProducer.get_playtime() - 1, true);
 }
 
 
@@ -2571,10 +2644,12 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
         // This is a keyframe effect, to edit it, we remove it and re-add it.
         bool success = mltRemoveEffect(track, position, index, false);
-        if (!success) kDebug() << "// ERROR Removing effect : " << index;
-        if (position < GenTime()) success = mltAddTrackEffect(track, params);
-        else success = mltAddEffect(track, position, params);
-        if (!success) kDebug() << "// ERROR Adding effect : " << index;
+//         if (!success) kDebug() << "// ERROR Removing effect : " << index;
+        if (position < GenTime())
+            success = mltAddTrackEffect(track, params);
+        else
+            success = mltAddEffect(track, position, params);
+//         if (!success) kDebug() << "// ERROR Adding effect : " << index;
         return success;
     }
     if (position < GenTime()) {
@@ -2593,33 +2668,22 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         return false;
     }
 
-    Mlt::Service clipService(clip->get_service());
     int duration = clip->get_playtime();
     bool doRefresh = true;
     // Check if clip is visible in monitor
     int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
-    if (diff < 0 || diff > duration) doRefresh = false;
-    delete clip;
+    if (diff < 0 || diff > duration)
+        doRefresh = false;
     m_isBlocked = true;
     int ct = 0;
-    /* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
-    kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
-    while (filter) {
-        kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
-        ct++;
-        filter = clipService.filter(ct);
-    }
-    kDebug() << "++++++++++++++++++++++++++";
-    ct = 0;
-    filter = clipService.filter(ct); */
 
-    Mlt::Filter *filter = clipService.filter(ct);
+    Mlt::Filter *filter = clip->filter(ct);
     while (filter) {
         if (filter->get_int("kdenlive_ix") == index.toInt()) {
             break;
         }
         ct++;
-        filter = clipService.filter(ct);
+        filter = clip->filter(ct);
     }
 
     if (!filter) {
@@ -2637,6 +2701,11 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     for (int j = 0; j < params.count(); j++) {
         filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
     }
+
+    if (params.paramValue("id") == "pan_zoom")
+        filter->set_in_and_out(clip->get_in(), clip->get_out() + 1);
+
+    delete clip;
     mlt_service_unlock(service.get_service());
 
     m_isBlocked = false;
@@ -2918,6 +2987,18 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
 
+    // Make sure muting will not produce problems with our audio mixing transition,
+    // because audio mixing is done between each track and the lowest one
+    bool audioMixingBroken = false;
+    if (mute && trackProducer.get_int("hide") < 2 ) {
+            // We mute a track with sound
+            if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+    }
+    else if (!mute && trackProducer.get_int("hide") > 1 ) {
+            // We un-mute a previously muted track
+            if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+    }
+
     if (mute) {
         if (blind) trackProducer.set("hide", 3);
         else trackProducer.set("hide", 2);
@@ -2926,11 +3007,63 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     } else {
         trackProducer.set("hide", 0);
     }
+    if (audioMixingBroken) fixAudioMixing(tractor);
+    
     tractor.multitrack()->refresh();
     tractor.refresh();
     refresh();
 }
 
+int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor)
+{
+    for (int i = 1; i < tractor.count(); i++) {
+        Mlt::Producer trackProducer(tractor.track(i));
+        if (trackProducer.get_int("hide") < 2) return i;
+    }
+    return tractor.count() - 1;
+}
+
+void Render::fixAudioMixing(Mlt::Tractor tractor)
+{
+    // Make sure the audio mixing transitions are applied to the lowest audible (non muted) track
+    int lowestTrack = getLowestNonMutedAudioTrack(tractor);
+
+    mlt_service serv = m_mltProducer->parent().get_service();
+    Mlt::Field *field = tractor.field();
+    mlt_service_lock(serv);
+    m_isBlocked++;
+
+    mlt_service nextservice = mlt_service_get_producer(serv);
+    mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+    QString mlt_type = mlt_properties_get(properties, "mlt_type");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+
+    mlt_service nextservicetodisconnect;
+     // Delete all audio mixing transitions
+    while (mlt_type == "transition") {
+        if (resource == "mix") {
+            nextservicetodisconnect = nextservice;
+            nextservice = mlt_service_producer(nextservice);
+            mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
+        }
+        else nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
+
+    // Re-add correct audio transitions
+    for (int i = lowestTrack + 1; i < tractor.count(); i++) {
+        Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
+        transition->set("always_active", 1);
+        transition->set("combine", 1);
+        transition->set("internal_added", 237);
+        field->plant_transition(*transition, lowestTrack, i);
+    }
+    mlt_service_unlock(serv);
+    m_isBlocked--;    
+}
 
 bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
 {
@@ -2988,6 +3121,12 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
     m_isBlocked = true;
     previousStart += moveFrame;
 
+    if (previousStart < 0) {
+        // this is possible for images and color clips
+        previousOut -= previousStart;
+        previousStart = 0;
+    }
+
     int length = previousOut + 1;
     if (length > clip->get_length()) {
         clip->parent().set("length", length + 1);
@@ -3318,12 +3457,11 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-
     field->plant_transition(tr, a_track, b_track);
 
     // re-add upper transitions
-    for (int i = 0; i < trList.count(); i++) {
-        // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
+    for (int i = trList.count() - 1; i >= 0; i--) {
+        //kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
         field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
     }
 }
@@ -3332,6 +3470,7 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b
 {
     if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
+        kDebug()<<"// DELETING TRANS: "<<a_track<<"-"<<b_track;
         mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
         mltAddTransition(tag, a_track, b_track, in, out, xml, false);
     }
@@ -3464,8 +3603,8 @@ QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
         if (!e.attribute("value").isEmpty()) {
             map[name] = e.attribute("value");
         }
-        if (!e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
-            map[name] = QString::number(map[name].toDouble() / e.attribute("factor").toDouble());
+        if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
+            map[name] = QString::number(map.value(name).toDouble() / e.attribute("factor").toDouble());
             //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
         }
 
@@ -3656,8 +3795,12 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
         //kDebug() << " ------  ADDING TRANS PARAM: " << key << ": " << it.value();
     }
     // attach transition
+    m_isBlocked++;
+    mlt_service_lock(service.get_service());
     mltPlantTransition(field, *transition, a_track, b_track);
     // field->plant_transition(*transition, a_track, b_track);
+    mlt_service_unlock(service.get_service());
+    m_isBlocked--;
     if (do_refresh) refresh();
     return true;
 }