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 e686eacf43c41b80b41637f4ecbfa61cfe564f09..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);
@@ -421,12 +421,21 @@ void Render::seek(GenTime time)
 void Render::seek(int time)
 {
     resetZoneMode();
+    time = qMax(0, time);
+    time = qMin(m_mltProducer->get_playtime(), time);
     if (requestedSeekPosition == SEEK_INACTIVE) {
        requestedSeekPosition = time;
+       m_mltConsumer->purge();
        m_mltProducer->seek(time);
-       //m_mltConsumer->purge();
        if (m_paused && !externalConsumer) {
-           refresh();
+           m_mltConsumer->set("refresh", 1);
+           m_paused = false;
+       }
+       else if (m_winid != 0 && m_mltProducer->get_speed() == 0) {
+           // workaround specific bug in MLT's SDL consumer
+           m_mltConsumer->stop();
+           m_mltConsumer->start();
+           m_mltConsumer->set("refresh", 1);
        }
     }
     else requestedSeekPosition = time;
@@ -976,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";
@@ -1127,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();
@@ -1228,11 +1248,6 @@ void Render::startConsumer() {
         return;
     }
     m_mltConsumer->set("refresh", 1);
-    // Make sure the first frame is displayed, otherwise if we change producer too fast
-    // We can crash the avformat producer
-    Mlt::Event *ev = m_mltConsumer->setup_wait_for("consumer-frame-show");
-    m_mltConsumer->wait_for(ev);
-    delete ev;
 }
 
 int Render::setSceneList(QDomDocument list, int position)
@@ -1321,6 +1336,7 @@ int Render::setSceneList(QString playlist, int position)
         m_mltProducer = m_blackClip->cut(0, 1);
         error = -1;
     }
+    m_mltProducer->set("eof", "pause");
     checkMaxThreads();
     int volume = KdenliveSettings::volume();
     m_mltProducer->set("meta.volume", (double)volume / 100);
@@ -1552,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();
     }
 
@@ -1605,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();
+       }
     }
 }
 
@@ -1656,8 +1684,8 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_paused = false;
     m_mltProducer->set_speed(1.0);
-    m_mltConsumer->set("refresh", 1);
     if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+    m_mltConsumer->set("refresh", 1);
     m_isZoneMode = true;
 }
 
@@ -1665,7 +1693,6 @@ void Render::resetZoneMode()
 {
     if (!m_isZoneMode && !m_isLoopMode) return;
     m_mltProducer->set("out", m_mltProducer->get_length());
-    //m_mltProducer->set("eof", "pause");
     m_isZoneMode = false;
     m_isLoopMode = false;
 }
@@ -1700,13 +1727,14 @@ void Render::doRefresh()
 
 void Render::refresh()
 {
+    m_refreshTimer.stop();
     QMutexLocker locker(&m_mutex);
     if (!m_mltProducer)
         return;
     if (m_mltConsumer) {
         if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+       m_mltConsumer->set("refresh", 1);
         //m_mltConsumer->purge();
-        m_mltConsumer->set("refresh", 1);
     }
 }
 
@@ -1766,15 +1794,23 @@ 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();
     if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
     emit rendererPosition(currentPos);
     if (requestedSeekPosition != SEEK_INACTIVE) {
+       m_mltConsumer->purge();
        m_mltProducer->seek(requestedSeekPosition);
-       if (m_paused) {
-           refresh();
+       if (m_mltProducer->get_speed() == 0 && m_paused) {
+           m_paused = false;
+           m_mltConsumer->set("refresh", 1);
        }
        requestedSeekPosition = SEEK_INACTIVE;
     }
@@ -1949,6 +1985,10 @@ void Render::mltCheckLength(Mlt::Tractor *tractor)
         }
 
         delete blackclip;
+       if (m_mltConsumer->position() > duration) {
+           m_mltConsumer->purge();
+           m_mltProducer->seek(duration);
+       }
         m_mltProducer->set("out", duration);
         emit durationChanged(duration);
     }
@@ -3297,7 +3337,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
     refresh();
 }
 
-bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
+bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration, bool refresh)
 {
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
@@ -3375,7 +3415,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
         transpinfo.track = info.track;
         mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
     }*/
-    m_mltConsumer->set("refresh", 1);
+    if (refresh) m_mltConsumer->set("refresh", 1);
     return true;
 }
 
@@ -4697,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"