Get rid of buggy "drop B frame" speedup feature

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index a47b3cda227e31674b66e0bff7261e468ad35730..d785dec093dd3185541add7cd4b6cdfbb07b739b 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -178,6 +178,7 @@ void Render::buildConsumer(const QString profileName)
     //TODO: uncomment following line when everything is clean
     //if (m_mltProfile) delete m_mltProfile;
     m_mltProfile = new Mlt::Profile(tmp);
+    m_mltProfile->get_profile()->is_explicit = 1;
     delete[] tmp;
 
     QString videoDriver = KdenliveSettings::videodrivername();
@@ -529,6 +530,15 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         if (aspect > 0) producer->set("force_aspect_ratio", aspect);
     }
 
+    if (xml.hasAttribute("force_aspect_num") && xml.hasAttribute("force_aspect_den")) {
+        int width = xml.attribute("frame_size").section('x', 0, 0).toInt();
+        int height = xml.attribute("frame_size").section('x', 1, 1).toInt();
+        int aspectNumerator = xml.attribute("force_aspect_num").toInt();
+        int aspectDenominator = xml.attribute("force_aspect_den").toInt();
+        if (aspectDenominator != 0 && width != 0)
+            producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width );
+    }
+
     if (xml.hasAttribute("force_fps")) {
         double fps = xml.attribute("force_fps").toDouble();
         if (fps > 0) producer->set("force_fps", fps);
@@ -539,6 +549,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         int progressive = xml.attribute("force_progressive").toInt(&ok);
         if (ok) producer->set("force_progressive", progressive);
     }
+    if (xml.hasAttribute("force_tff")) {
+        bool ok;
+        int fieldOrder = xml.attribute("force_tff").toInt(&ok);
+        if (ok) producer->set("force_tff", fieldOrder);
+    }
     if (xml.hasAttribute("threads")) {
         int threads = xml.attribute("threads").toInt();
         if (threads != 1) producer->set("threads", threads);
@@ -551,6 +566,14 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         int aindex = xml.attribute("audio_index").toInt();
         if (aindex != 0) producer->set("audio_index", aindex);
     }
+    if (xml.hasAttribute("force_colorspace")) {
+        int colorspace = xml.attribute("force_colorspace").toInt();
+        if (colorspace != 0) producer->set("force_colorspace", colorspace);
+    }
+    if (xml.hasAttribute("full_luma")) {
+        int full_luma = xml.attribute("full_luma").toInt();
+        if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
+    }
 
     // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger
     if (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT
@@ -717,17 +740,6 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData());
         filePropertyMap["colorspace"] = producer->get("meta.media.colorspace");
 
-        if (KdenliveSettings::dropbframes()) {
-            kDebug() << "// LOOKING FOR H264 on: " << default_video;
-            snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
-            kDebug() << "PROP: " << property << " = " << producer->get(property);
-            if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) {
-                kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
-                producer->set("skip_loop_filter", "all");
-                producer->set("skip_frame", "bidir");
-            }
-        }
-
     } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
     if (producer->get_int("audio_index") > -1) {
         // Get the audio_index
@@ -819,10 +831,6 @@ int Render::setProducer(Mlt::Producer *producer, int position)
         m_mltProducer = new Mlt::Producer(producer->get_producer());
     } else m_mltProducer = m_blackClip->cut(0, 50);
 
-    /*if (KdenliveSettings::dropbframes()) {
-    m_mltProducer->set("skip_loop_filter", "all");
-        m_mltProducer->set("skip_frame", "bidir");
-    }*/
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
         return -1;
@@ -851,7 +859,7 @@ int Render::setSceneList(QString playlist, int position)
     m_isBlocked = true;
     int error = 0;
 
-    kDebug() << "//////  RENDER, SET SCENE LIST: " << playlist;
+    //kDebug() << "//////  RENDER, SET SCENE LIST: " << playlist;
 
     if (m_mltConsumer) {
         if (!m_mltConsumer->is_stopped()) {
@@ -908,6 +916,13 @@ 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>");
+    else
+        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()) {
@@ -2036,7 +2051,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
     QString id = clipparent.get("id");
     if (speed <= 0 && speed > -1) speed = 1.0;
     //kDebug() << "CLIP SERVICE: " << serv;
-    if (serv == "avformat" && (speed != 1.0 || strobe > 1)) {
+    if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) {
         mlt_service_lock(service.get_service());
         QString url = QString::fromUtf8(clipparent.get("resource"));
         url.append('?' + QString::number(speed));
@@ -2057,8 +2072,14 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
             if (threads != 0) slowprod->set("threads", threads);
             if (original->parent().get("force_progressive"))
                 slowprod->set("force_progressive", original->parent().get_int("force_progressive"));
+            if (original->parent().get("force_tff"))
+                slowprod->set("force_tff", original->parent().get_int("force_tff"));
             int ix = original->parent().get_int("video_index");
             if (ix != 0) slowprod->set("video_index", ix);
+            int colorspace = original->parent().get_int("force_colorspace");
+            if (colorspace != 0) slowprod->set("force_colorspace", colorspace);
+            int full_luma = original->parent().get_int("set.force_full_luma");
+            if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma);
             m_slowmotionProducers.insert(url, slowprod);
         }
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
@@ -2128,10 +2149,16 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
             if (fps != 0.0) slowprod->set("force_fps", fps);
             if (original->parent().get("force_progressive"))
                 slowprod->set("force_progressive", original->parent().get_int("force_progressive"));
+            if (original->parent().get("force_tff"))
+                slowprod->set("force_tff", original->parent().get_int("force_tff"));
             int threads = original->parent().get_int("threads");
             if (threads != 0) slowprod->set("threads", threads);
             int ix = original->parent().get_int("video_index");
             if (ix != 0) slowprod->set("video_index", ix);
+            int colorspace = original->parent().get_int("force_colorspace");
+            if (colorspace != 0) slowprod->set("force_colorspace", colorspace);
+            int full_luma = original->parent().get_int("set.force_full_luma");
+            if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma);
             m_slowmotionProducers.insert(url, slowprod);
         }
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);