Initial support for keyframes in track effects (WIP)

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index d48e8c94c037f661c9a3b108a8df30e609d2da8a..5f888ca9512dd7688d30dd5a33e6f624c533f279 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -47,6 +47,7 @@
 #include <cstdlib>
 #include <cstdarg>
 
+#include <QDebug>
 
 static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
 {
@@ -67,7 +68,9 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr
     if (self->sendFrameForAnalysis && frame_ptr->convert_image) {
         self->emitFrameUpdated(frame);
     }
-    if (self->analyseAudio) self->showAudio(frame);
+    if (self->analyseAudio) {
+        self->showAudio(frame);
+    }
     if (frame.get_double("_speed") == 0.0) {
         self->emitConsumerStopped();
     } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
@@ -100,6 +103,7 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget
     m_mltProducer(NULL),
     m_mltProfile(NULL),
     m_framePosition(0),
+    m_externalConsumer(false),
     m_isZoneMode(false),
     m_isLoopMode(false),
     m_isSplitView(false),
@@ -196,16 +200,15 @@ void Render::buildConsumer(const QString profileName)
             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);
-                m_mltConsumer->set("audio_buffer", 1024);
-                m_mltConsumer->set("frequency", 48000);
                 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();
     if (!videoDriver.isEmpty()) {
         if (videoDriver == "x11_noaccel") {
@@ -270,15 +273,17 @@ Mlt::Producer *Render::invalidProducer(const QString &id)
 int Render::resetProfile(const QString profileName)
 {
     if (m_mltConsumer) {
-        if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
-        QString videoDriver = KdenliveSettings::videodrivername();
-        QString currentDriver = m_mltConsumer->get("video_driver");
-        if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
-        QString background = KdenliveSettings::window_background().name();
-        QString currentBackground = m_mltConsumer->get("window_background");
-        if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
-            kDebug() << "reset to same profile, nothing to do";
-            return 1;
+        if (m_externalConsumer == KdenliveSettings::external_display()) {
+            if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
+            QString videoDriver = KdenliveSettings::videodrivername();
+            QString currentDriver = m_mltConsumer->get("video_driver");
+            if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
+            QString background = KdenliveSettings::window_background().name();
+            QString currentBackground = m_mltConsumer->get("window_background");
+            if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
+                kDebug() << "reset to same profile, nothing to do";
+                return 1;
+            }
         }
 
         if (m_isSplitView) slotSplitView(false);
@@ -1463,29 +1468,27 @@ void Render::showFrame(Mlt::Frame& frame)
 
 void Render::showAudio(Mlt::Frame& frame)
 {
-    if (!frame.is_valid() || frame.get_int("test_audio") != 0) return;
+    if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
+        return;
+    }
     mlt_audio_format audio_format = mlt_audio_s16;
     int freq = 0;
     int num_channels = 0;
     int samples = 0;
     int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples);
-    if (!data)
+
+    if (!data) {
         return;
-    int num_samples = samples > 200 ? 200 : samples;
-    QByteArray channels;
-    for (int i = 0; i < num_channels; i++) {
-        long val = 0;
-        for (int s = 0; s < num_samples; s ++) {
-            val += abs(data[i+s*num_channels] / 128);
-        }
-        channels.append(val / num_samples);
     }
 
+    // Data format: [ c00 c10 c01 c11 c02 c12 c03 c13 ... c0{samples-1} c1{samples-1} for 2 channels.
+    // So the vector is of size samples*channels.
+    QVector<int16_t> sampleVector(samples*num_channels);
+    memcpy(sampleVector.data(), data, samples*num_channels*sizeof(int16_t));
 
-    if (samples > 0)
-        emit showAudioSignal(channels);
-    else
-        emit showAudioSignal(QByteArray());
+    if (samples > 0) {
+        emit audioSamplesSignal(sampleVector, freq, num_channels, samples);
+    }
 }
 
 /*
@@ -2303,7 +2306,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);
 }