X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=816d19ae42f5276931bc04393b07b8f0af499bf2;hb=f8b94e4037e9eea645fabfddc2e373ace81dafed;hp=79873c2ba5eb1e28fd9400409d9268c3a62485b4;hpb=1f5c19bcf720efb573fd7320a149fe6c17cf4fd7;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 79873c2b..816d19ae 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -127,7 +127,8 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi m_isSplitView(false), m_blackClip(NULL), m_winid(winid), - m_paused(true) + m_paused(true), + m_isActive(false) { qRegisterMetaType ("stringMap"); analyseAudio = KdenliveSettings::monitor_audio(); @@ -222,7 +223,7 @@ void Render::buildConsumer(const QString &profileName) setenv("MLT_PROFILE", m_activeProfile.toUtf8().constData(), 1); m_mltProfile->set_explicit(true); - m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); + 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 != Kdenlive::clipMonitor && m_winid != 0) { @@ -238,8 +239,8 @@ void Render::buildConsumer(const QString &profileName) if (m_mltConsumer->is_valid()) { externalConsumer = true; m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("deinterlace_method", "onefield"); - m_mltConsumer->set("rescale", "nearest"); + m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData()); + m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData()); m_mltConsumer->set("buffer", "1"); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); } @@ -273,7 +274,7 @@ void Render::buildConsumer(const QString &profileName) // Set defaults for decklink consumer if (m_mltConsumer) { m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("deinterlace_method", "onefield"); + m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData()); externalConsumer = true; } } @@ -299,7 +300,7 @@ void Render::buildConsumer(const QString &profileName) } //m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData()); - m_mltConsumer->set("rescale", "nearest"); + m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData()); mlt_log_set_callback(kdenlive_callback); QString audioDevice = KdenliveSettings::audiodevicename(); @@ -412,7 +413,7 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) void Render::seek(GenTime time) { - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; int pos = time.frames(m_fps); seek(pos); @@ -1062,10 +1063,10 @@ void Render::processFileProperties() snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex); if (producer->get(property)) { filePropertyMap["videocodec"] = producer->get(property); - } else { - snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); - if (producer->get(property)) - filePropertyMap["videocodec"] = producer->get(property); + } + snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); + if (producer->get(property)) { + filePropertyMap["videocodecid"] = producer->get(property); } QString query; query = QString("meta.media.%1.codec.pix_fmt").arg(vindex); @@ -1094,7 +1095,7 @@ void Render::processFileProperties() for (int i = 0; i < count; i ++) { QString name = metadata.get_name(i); QString value = QString::fromUtf8(metadata.get(i)); - if (name.endsWith("markup") && !value.isEmpty()) + if (name.endsWith(".markup") && !value.isEmpty()) metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); @@ -1248,6 +1249,7 @@ void Render::startConsumer() { return; } m_mltConsumer->set("refresh", 1); + m_isActive = true; } int Render::setSceneList(QDomDocument list, int position) @@ -1550,7 +1552,10 @@ void Render::start() kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } - if (!m_mltConsumer) return; + if (!m_mltConsumer) { + kDebug()<<" / - - - STARTED BEFORE CONSUMER!!!"; + return; + } if (m_mltConsumer->is_stopped()) { if (m_mltConsumer->start() == -1) { //KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); @@ -1567,6 +1572,7 @@ void Render::stop() requestedSeekPosition = SEEK_INACTIVE; m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); + m_isActive = false; if (m_mltProducer == NULL) return; if (m_mltConsumer) { m_mltConsumer->set("refresh", 0); @@ -1585,6 +1591,7 @@ void Render::stop(const GenTime & startTime) requestedSeekPosition = SEEK_INACTIVE; m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); + m_isActive = false; if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); @@ -1596,7 +1603,7 @@ void Render::stop(const GenTime & startTime) void Render::pause() { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; m_paused = true; m_mltProducer->set_speed(0.0); @@ -1605,11 +1612,16 @@ void Render::pause() m_mltProducer->seek(m_mltConsumer->position());*/ } +void Render::setActiveMonitor() +{ + if (!m_isActive) emit activateMonitor(m_name); +} + void Render::switchPlay(bool play) { QMutexLocker locker(&m_mutex); requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; if (m_isZoneMode) resetZoneMode(); if (play && m_paused) { @@ -1640,7 +1652,7 @@ void Render::switchPlay(bool play) void Render::play(double speed) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer) return; + if (!m_mltProducer || !m_isActive) return; double current_speed = m_mltProducer->get_speed(); if (current_speed == speed) return; if (m_isZoneMode) resetZoneMode(); @@ -1656,7 +1668,7 @@ void Render::play(double speed) void Render::play(const GenTime & startTime) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; m_paused = false; m_mltProducer->seek((int)(startTime.frames(m_fps))); @@ -1667,7 +1679,7 @@ void Render::play(const GenTime & startTime) void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; //m_mltProducer->set("eof", "loop"); m_isLoopMode = true; @@ -1678,7 +1690,7 @@ void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; m_mltProducer->set("out", (int)(stopTime.frames(m_fps))); m_mltProducer->seek((int)(startTime.frames(m_fps))); @@ -1699,7 +1711,7 @@ void Render::resetZoneMode() void Render::seekToFrame(int pos) { - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; resetZoneMode(); seek(pos); @@ -1707,7 +1719,7 @@ void Render::seekToFrame(int pos) void Render::seekToFrameDiff(int diff) { - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; resetZoneMode(); if (requestedSeekPosition == SEEK_INACTIVE) @@ -1717,19 +1729,19 @@ void Render::seekToFrameDiff(int diff) void Render::refreshIfActive() { - if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused) m_refreshTimer.start(); + if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused && m_isActive) m_refreshTimer.start(); } void Render::doRefresh() { - if (m_mltProducer && m_paused) m_refreshTimer.start(); + if (m_mltProducer && m_paused && m_isActive) m_refreshTimer.start(); } void Render::refresh() { m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; if (m_mltConsumer) { if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); @@ -1745,11 +1757,7 @@ void Render::setDropFrames(bool show) int dropFrames = KdenliveSettings::mltthreads(); if (show == false) dropFrames = -dropFrames; m_mltConsumer->stop(); - if (m_winid == 0) - m_mltConsumer->set("real_time", dropFrames); - else - m_mltConsumer->set("play.real_time", dropFrames); - + m_mltConsumer->set("real_time", dropFrames); if (m_mltConsumer->start() == -1) { kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; } @@ -1757,6 +1765,19 @@ void Render::setDropFrames(bool show) } } +void Render::setConsumerProperty(const QString &name, const QString &value) +{ + QMutexLocker locker(&m_mutex); + if (m_mltConsumer) { + m_mltConsumer->stop(); + m_mltConsumer->set(name.toUtf8().constData(), value.toUtf8().constData()); + if (m_isActive && m_mltConsumer->start() == -1) { + kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; + } + + } +} + bool Render::isPlaying() const { if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false; @@ -1785,13 +1806,13 @@ int Render::seekFramePosition() const void Render::emitFrameUpdated(Mlt::Frame& frame) { - mlt_image_format format = mlt_image_rgb24a; + mlt_image_format format = mlt_image_rgb24; int width = 0; int height = 0; const uchar* image = frame.get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); - memcpy(qimage.scanLine(0), image, width * height * 4); - emit frameUpdated(qimage.rgbSwapped()); + QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied); + memcpy(qimage.scanLine(0), image, width * height * 3); + emit frameUpdated(qimage); } int Render::getCurrentSeekPosition() const @@ -1803,13 +1824,15 @@ int Render::getCurrentSeekPosition() const void Render::emitFrameNumber() { int currentPos = m_mltConsumer->position(); - if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; + if (currentPos == requestedSeekPosition) { + requestedSeekPosition = SEEK_INACTIVE; + m_paused = true; + } emit rendererPosition(currentPos); if (requestedSeekPosition != SEEK_INACTIVE) { m_mltConsumer->purge(); m_mltProducer->seek(requestedSeekPosition); - if (m_mltProducer->get_speed() == 0 && m_paused) { - m_paused = false; + if (m_mltProducer->get_speed() == 0 && !m_paused) { m_mltConsumer->set("refresh", 1); } requestedSeekPosition = SEEK_INACTIVE; @@ -1866,17 +1889,17 @@ void Render::showFrame(Mlt::Frame* frame) if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; emit rendererPosition(currentPos); if (frame->is_valid()) { - mlt_image_format format = mlt_image_rgb24a; + mlt_image_format format = mlt_image_rgb24; int width = 0; int height = 0; const uchar* image = frame->get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); - memcpy(qimage.scanLine(0), image, width * height * 4); + QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied); + memcpy(qimage.scanLine(0), image, width * height * 3); if (analyseAudio) showAudio(*frame); delete frame; emit showImageSignal(qimage); if (sendFrameForAnalysis) { - emit frameUpdated(qimage.rgbSwapped()); + emit frameUpdated(qimage);//.rgbSwapped()); } } else delete frame; showFrameSemaphore.release(); @@ -2251,12 +2274,13 @@ bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement ele bool Render::mltRemoveClip(int track, GenTime position) { m_refreshTimer.stop(); + Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; return false; } - //service.lock(); + service.lock(); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -2264,7 +2288,7 @@ bool Render::mltRemoveClip(int track, GenTime position) if (trackPlaylist.is_blank(clipIndex)) { kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(m_fps); - //service.unlock(); + service.unlock(); return false; } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); @@ -2280,7 +2304,7 @@ bool Render::mltRemoveClip(int track, GenTime position) if (trackPlaylist.is_blank(i)) blk = "(blank)"; kDebug()<<"CLIP "< 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"