X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=14730eda81d67eed6ec45e9c0801b7c3546d1904;hb=8057b2842a6aa46dc60cba6e0c15fb3281e10d3b;hp=239a8e06a8b1646189a8707609e2488f923a47c6;hpb=6859d22b9666e99ce1f15f86f4233afa8af371ff;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 239a8e06..14730eda 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -28,6 +28,8 @@ #include "kthumb.h" #include "definitions.h" #include "slideshowclip.h" +#include "profilesdialog.h" +#include "blackmagic/devices.h" #include @@ -45,7 +47,7 @@ #include #include - +#include static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl) { @@ -66,7 +68,7 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr if (self->sendFrameForAnalysis && frame_ptr->convert_image) { self->emitFrameUpdated(frame); } - 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) { @@ -93,11 +95,13 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget QObject(parent), m_isBlocked(0), sendFrameForAnalysis(false), + analyseAudio(KdenliveSettings::monitor_audio()), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltProfile(NULL), m_framePosition(0), + m_externalConsumer(false), m_isZoneMode(false), m_isLoopMode(false), m_isSplitView(false), @@ -181,6 +185,28 @@ void Render::buildConsumer(const QString profileName) m_mltProfile->get_profile()->is_explicit = 1; delete[] tmp; + m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); + m_blackClip->set("id", "black"); + m_blackClip->set("mlt_type", "producer"); + + if (KdenliveSettings::external_display() && m_name != "clip") { + // Use blackmagic card for video output + QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName); + if (BMInterface::isSupportedProfile(KdenliveSettings::blackmagic_output_device(), profileProperties)) { + QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device()); + tmp = qstrdup(decklink.toUtf8().constData()); + 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); + 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") { @@ -232,10 +258,6 @@ void Render::buildConsumer(const QString profileName) m_mltConsumer->set("progressive", 1); m_mltConsumer->set("audio_buffer", 1024); m_mltConsumer->set("frequency", 48000); - - m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); - m_blackClip->set("id", "black"); - m_blackClip->set("mlt_type", "producer"); } Mlt::Producer *Render::invalidProducer(const QString &id) @@ -249,14 +271,17 @@ Mlt::Producer *Render::invalidProducer(const QString &id) int Render::resetProfile(const QString profileName) { if (m_mltConsumer) { - 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); @@ -495,14 +520,17 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int { KUrl url = KUrl(xml.attribute("resource", QString())); Mlt::Producer *producer = NULL; + CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt(); + //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n"; /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); return; }*/ - if (xml.attribute("type").toInt() == COLOR) { + + if (type == COLOR) { producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData()); - } else if (xml.attribute("type").toInt() == TEXT) { + } else if (type == TEXT) { producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + xml.attribute("resource")).toUtf8().constData()); if (producer && producer->is_valid() && xml.hasAttribute("xmldata")) producer->set("xmldata", xml.attribute("xmldata").toUtf8().constData()); @@ -536,7 +564,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int 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 ); + producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width); } if (xml.hasAttribute("force_fps")) { @@ -549,6 +577,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); @@ -571,8 +604,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int } // 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 - || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW) + if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1); if (xml.hasAttribute("out")) @@ -601,7 +633,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int Mlt::Frame *frame = producer->get_frame(); - if (xml.attribute("type").toInt() == SLIDESHOW) { + if (type == SLIDESHOW) { int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0; if (ttl) producer->set("ttl", ttl); if (!xml.attribute("animation").isEmpty()) { @@ -735,17 +767,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 @@ -772,7 +793,6 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); - kDebug() << "REquested fuile info for: " << url.path(); emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); // FIXME: should delete this to avoid a leak... //delete producer; @@ -837,10 +857,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; @@ -1442,7 +1458,7 @@ void Render::showFrame(Mlt::Frame& frame) QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); memcpy(qimage.scanLine(0), image, width * height * 4); emit showImageSignal(qimage); - showAudio(frame); + if (analyseAudio) showAudio(frame); if (sendFrameForAnalysis && frame.get_frame()->convert_image) { emit frameUpdated(qimage.rgbSwapped()); } @@ -1456,23 +1472,19 @@ void Render::showAudio(Mlt::Frame& frame) 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 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); + } } /* @@ -2082,6 +2094,8 @@ 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"); @@ -2157,6 +2171,8 @@ 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");