Disable screen grab if FFmpeg does not support it: http://kdenlive.org/mantis/view...

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 4d146bf5430ef8ac879224511740dd348d3d9a3d..15673b70086f6e5a0ea35fee0a47fa41dd5c5a3d 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -53,8 +53,8 @@
 
 static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
 {
-//     kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified();
     if (level > MLT_LOG_ERROR) return;
+    //kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified();
     QString error;
     QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
     va_end(vl);
@@ -429,8 +429,9 @@ void Render::seek(int time)
        m_mltProducer->seek(time);
        if (m_paused && !externalConsumer) {
            m_mltConsumer->set("refresh", 1);
+           m_paused = false;
        }
-       else if (m_mltProducer->get_speed() == 0) {
+       else if (m_winid != 0 && m_mltProducer->get_speed() == 0) {
            // workaround specific bug in MLT's SDL consumer
            m_mltConsumer->stop();
            m_mltConsumer->start();
@@ -984,15 +985,20 @@ void Render::processFileProperties()
         Mlt::Frame *frame = producer->get_frame();
         if (frame && frame->is_valid()) {
             filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
-            filePropertyMap["frequency"] = QString::number(frame->get_int("frequency"));
-            filePropertyMap["channels"] = QString::number(frame->get_int("channels"));
+           int af = frame->get_int("audio_frequency");
+           int ac = frame->get_int("audio_channels");
+           // keep for compatibility with MLT <= 0.8.6
+           if (af == 0) af = frame->get_int("frequency");
+           if (ac == 0) ac = frame->get_int("channels");
+            if (af > 0) filePropertyMap["frequency"] = QString::number(af);
+            if (ac > 0) filePropertyMap["channels"] = QString::number(ac);
             if (!filePropertyMap.contains("aspect_ratio")) filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
 
             if (frame->get_int("test_image") == 0) {
                 if (mltService == "xml" || mltService == "consumer") {
                     filePropertyMap["type"] = "playlist";
                     metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
-                } else if (frame->get_int("test_audio") == 0)
+                } else if (!mlt_frame_is_test_audio(frame->get_frame()))
                     filePropertyMap["type"] = "av";
                 else
                     filePropertyMap["type"] = "video";
@@ -1135,6 +1141,12 @@ void Render::initSceneList()
 }
 #endif
 
+void Render::loadUrl(const QString &url)
+{
+    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, url.toUtf8().constData());
+    setProducer(producer, 0);
+}
+
 int Render::setProducer(Mlt::Producer *producer, int position)
 {
     m_refreshTimer.stop();
@@ -1556,8 +1568,9 @@ void Render::stop()
     m_refreshTimer.stop();
     QMutexLocker locker(&m_mutex);
     if (m_mltProducer == NULL) return;
-    if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
-        m_mltConsumer->stop();
+    if (m_mltConsumer) {
+       m_mltConsumer->set("refresh", 0);
+        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
         m_mltConsumer->purge();
     }
 
@@ -1609,7 +1622,18 @@ void Render::switchPlay(bool play)
         m_mltConsumer->set("refresh", 1);
     } else if (!play) {
        m_paused = true;
-       m_mltProducer->set_speed(0.0);
+       if (m_winid == 0) {
+           // OpenGL consumer
+           m_mltProducer->set_speed(0.0);
+       }
+       else {
+           // SDL consumer, hack to allow pausing near the end of the playlist
+           m_mltConsumer->set("refresh", 0);
+           m_mltConsumer->stop();
+           m_mltProducer->set_speed(0.0);
+           m_mltProducer->seek(m_mltConsumer->position());
+           m_mltConsumer->start();
+       }
     }
 }
 
@@ -1770,6 +1794,12 @@ void Render::emitFrameUpdated(Mlt::Frame& frame)
     emit frameUpdated(qimage.rgbSwapped());
 }
 
+int Render::getCurrentSeekPosition() const
+{
+    if (requestedSeekPosition != SEEK_INACTIVE) return requestedSeekPosition;
+    return (int) m_mltProducer->position();
+}
+
 void Render::emitFrameNumber()
 {
     int currentPos = m_mltConsumer->position();
@@ -1778,7 +1808,10 @@ void Render::emitFrameNumber()
     if (requestedSeekPosition != SEEK_INACTIVE) {
        m_mltConsumer->purge();
        m_mltProducer->seek(requestedSeekPosition);
-       if (m_mltProducer->get_speed() == 0) m_mltConsumer->set("refresh", 1);
+       if (m_mltProducer->get_speed() == 0 && m_paused) {
+           m_paused = false;
+           m_mltConsumer->set("refresh", 1);
+       }
        requestedSeekPosition = SEEK_INACTIVE;
     }
 }
@@ -4704,5 +4737,19 @@ void Render::slotMultiStreamProducerFound(const QString path, QList<int> audio_l
     }
 }
 
+//static 
+bool Render::checkX11Grab()
+{
+    if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::ffmpegpath().isEmpty()) return false;
+    QProcess p;
+    QStringList args;
+    args << "avformat:f-list";
+    p.start(KdenliveSettings::rendererpath(), args);
+    if (!p.waitForStarted()) return false;
+    if (!p.waitForFinished()) return false;
+    QByteArray result = p.readAllStandardError();
+    return result.contains("x11grab");
+}
+
 #include "renderer.moc"