Enable proxies for playlist clips (*.mlt, *.kdenlive)

svn path=/trunk/kdenlive/; revision=5661

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 0d00dacf291ba28bedf9093daa63c81de52d6d15..b33eccc3887f56d41c364c184ac2591a5a7e2822 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -1553,5 +1553,28 @@ QStringList KdenliveDoc::getExpandedFolders()
     return result;
 }
 
+// static
+double KdenliveDoc::getDisplayRatio(const QString &path)
+{
+    QFile file(path);
+    QDomDocument doc;
+    if (!file.open(QIODevice::ReadOnly)) {
+        kWarning() << "ERROR, CANNOT READ: " << path;
+        return 0;
+    }
+    if (!doc.setContent(&file)) {
+        kWarning() << "ERROR, CANNOT READ: " << path;
+        file.close();
+        return 0;
+    }
+    file.close();
+    QDomNodeList list = doc.elementsByTagName("profile");
+    if (list.isEmpty()) return 0;
+    QDomElement profile = list.at(0).toElement();
+    double den = profile.attribute("display_aspect_den").toDouble();
+    if (den > 0) return profile.attribute("display_aspect_num").toDouble() / den;
+    return 0;
+}
+
 #include "kdenlivedoc.moc"
 

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 806bb4f2798d3c5dbb13027187a20b2b7474b11d..3392519afc8bfba011ae6773dff2689ec44089fa 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -159,6 +159,8 @@ Q_OBJECT public:
     QDomElement getTrackEffect(int trackIndex, int effectIndex) const;
     /** @brief Get a list of folder id's that were opened on last save. */
     QStringList getExpandedFolders();
+    /** @brief Read the display ratio from an xml project file. */
+    static double getDisplayRatio(const QString &path);
     
 private:
     KUrl m_url;

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 49f4f10df125180b77549668ad7c91f674c2ce97..2a2f51db52abc18d69b7031226b74c2915e9eabb 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -608,7 +608,7 @@ void ProjectList::slotClipSelected()
 
 void ProjectList::adjustProxyActions(ProjectItem *clip) const
 {
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) {
+    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) {
         m_proxyAction->setEnabled(false);
         return;
     }
@@ -1609,7 +1609,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
             CLIPTYPE t = item->clipType();
             if (t == IMAGE) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt();
             else maxSize = m_doc->getDocumentProperty("proxyminsize").toInt();
-            if (((t == AV || t == VIDEO) && generateProxy() && size.section('x', 0, 0).toInt() > maxSize) || (t == IMAGE && generateImageProxy() && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize))) {
+            if ((size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize) && (((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy()))) {
                 if (clip->getProperty("proxy").isEmpty()) {
                     KUrl proxyPath = m_doc->projectFolder();
                     proxyPath.addPath("proxy/");
@@ -2126,8 +2126,6 @@ void ProjectList::slotGenerateProxy(const QString id)
         return;
     }
 
-    QString url = item->clipUrl().path();
-    
     if (QFile::exists(path)) {
         setProxyStatus(id, PROXYDONE);
         slotGotProxy(id);
@@ -2143,6 +2141,63 @@ void ProjectList::slotGenerateProxy(const QString id)
         file.close();
         QFile::remove(path);
     }
+
+    QString url = item->clipUrl().path();
+
+    // Special case: playlist clips (.mlt or .kdenlive project files)
+    if (item->clipType() == PLAYLIST) {
+        // change FFmpeg params to MLT format
+        QStringList parameters;
+        parameters << url;
+        parameters << "-consumer" << "avformat:" + path;
+        QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts);
+        
+        foreach(QString s, params) {
+            s = s.simplified();
+            if (s.count(' ') == 0) {
+                s.append("=1");
+            }
+            else s.replace(' ', '=');
+            parameters << s;
+        }
+
+        // currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy
+        double display_ratio = KdenliveDoc::getDisplayRatio(url);
+        parameters << "aspect=" + QString::number(display_ratio);
+
+        //kDebug()<<"TRANSCOD: "<<parameters;
+        QProcess myProcess;
+        myProcess.start(KdenliveSettings::rendererpath(), parameters);
+        myProcess.waitForStarted();
+        int result = -1;
+        while (myProcess.state() != QProcess::NotRunning) {
+            // building proxy file
+            if (m_abortProxyId.contains(id)) {
+                myProcess.close();
+                myProcess.waitForFinished();
+                m_abortProxyId.removeAll(id);
+                QFile::remove(path);
+                setProxyStatus(id, NOPROXY);
+                result = -2;
+
+            }
+            myProcess.waitForFinished(500);
+        }
+        myProcess.waitForFinished();
+        if (result == -1) result = myProcess.exitStatus();
+        if (result == 0) {
+            // proxy successfully created
+            setProxyStatus(id, PROXYDONE);
+            slotGotProxy(id);
+        }
+        else if (result == 1) {
+            // Proxy process crashed
+            QFile::remove(path);
+            setProxyStatus(id, PROXYCRASHED);
+        }   
+
+    }
+    
     if (item->clipType() == IMAGE) {
         // Image proxy
         QImage i(url);
@@ -2334,7 +2389,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy)
         if (listItem->type() == PROJECTCLIPTYPE) {
             ProjectItem *item = static_cast <ProjectItem*>(listItem);
             CLIPTYPE t = item->clipType();
-            if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE) && item->referencedClip()) {
+            if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) {
                 oldProps = item->referencedClip()->properties();
                 if (doProxy) {
                     newProps.clear();